From 912b2f7013b96158ca1695b9a82e68aff9a6e97b Mon Sep 17 00:00:00 2001
From: Ritesh Patel <patelrit@gmail.com>
Date: Wed, 1 Apr 2015 17:32:56 -0700
Subject: [PATCH 0001/1272] Add docker stats support

Add docker stats support for 1.5+
---
 .../github/dockerjava/api/DockerClient.java   |   2 +
 .../api/command/DockerCmdExecFactory.java     |   3 +
 .../dockerjava/api/command/StatsCallback.java |  13 ++
 .../dockerjava/api/command/StatsCmd.java      |  22 +++
 .../dockerjava/api/model/Statistics.java      |  51 +++++++
 .../dockerjava/core/DockerClientImpl.java     |   6 +
 .../dockerjava/core/command/StatsCmdImpl.java |  61 ++++++++
 .../jaxrs/DockerCmdExecFactoryImpl.java       |   5 +
 .../github/dockerjava/jaxrs/StatsCmdExec.java |  90 ++++++++++++
 .../client/AbstractDockerClientTest.java      |   2 +-
 .../core/TestDockerCmdExecFactory.java        |   5 +
 .../core/command/StatsCmdImplTest.java        | 133 ++++++++++++++++++
 12 files changed, 392 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/command/StatsCallback.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/StatsCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/Statistics.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 9e275eb35..723c1bad3 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -114,6 +114,8 @@ public CopyFileFromContainerCmd copyFileFromContainerCmd(
 
 	public EventsCmd eventsCmd(EventCallback eventCallback);
 
+	public StatsCmd statsCmd(StatsCallback statsCallback);
+
 	@Override
 	public void close() throws IOException;
 
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index 8b9880747..294d50994 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -78,6 +78,9 @@ public interface DockerCmdExecFactory extends Closeable {
 	public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec();
 
 	public EventsCmd.Exec createEventsCmdExec();
+	
+	public StatsCmd.Exec createStatsCmdExec();
+
 
 	@Override
 	public void close() throws IOException;
diff --git a/src/main/java/com/github/dockerjava/api/command/StatsCallback.java b/src/main/java/com/github/dockerjava/api/command/StatsCallback.java
new file mode 100644
index 000000000..610c0f831
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/StatsCallback.java
@@ -0,0 +1,13 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.model.Statistics;
+
+/**
+ * Stats callback
+ */
+public interface StatsCallback {
+    public void onStats(Statistics stats);
+    public void onException(Throwable throwable);
+    public void onCompletion(int numStats);
+    public boolean isReceiving();
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/StatsCmd.java b/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
new file mode 100644
index 000000000..a605d4267
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
@@ -0,0 +1,22 @@
+package com.github.dockerjava.api.command;
+
+import java.util.concurrent.ExecutorService;
+
+
+/**
+ * Get stats
+ *
+ */
+public interface StatsCmd extends DockerCmd<ExecutorService> {
+    public StatsCmd withContainerId(String containerId);
+    
+    public String getContainerId();
+    
+    public StatsCmd withStatsCallback(StatsCallback statsCallback);
+    
+    public StatsCallback getStatsCallback();
+
+    public static interface Exec extends DockerCmdExec<StatsCmd, ExecutorService> {
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/Statistics.java b/src/main/java/com/github/dockerjava/api/model/Statistics.java
new file mode 100644
index 000000000..ff1d6dc95
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/Statistics.java
@@ -0,0 +1,51 @@
+package com.github.dockerjava.api.model;
+
+import java.util.Map;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Representation of a Docker statistics.
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Statistics {
+    
+    @JsonProperty("read")
+    private String read;
+    
+    @JsonProperty("network")
+    private Map<String,Object> networkStats;
+
+    @JsonProperty("memory_stats")
+    private Map<String,Object> memoryStats;
+    
+    @JsonProperty("blkio_stats")
+    private Map<String,Object> blkioStats;
+    
+    @JsonProperty("cpu_stats")
+    private Map<String,Object> cpuStats;
+
+    public Map<String,Object> getNetworkStats() {
+        return networkStats;
+    }
+    
+    public Map<String,Object> getCpuStats() {
+        return cpuStats;
+    }
+    
+    public Map<String,Object> getMemoryStats() {
+        return memoryStats;
+    }
+    
+    public Map<String,Object> getBlkioStats() {
+        return blkioStats;
+    }
+    
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 534c58ebf..db64d2843 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -336,6 +336,12 @@ public EventsCmd eventsCmd(EventCallback eventCallback) {
 		return new EventsCmdImpl(getDockerCmdExecFactory()
 				.createEventsCmdExec(), eventCallback);
 	}
+	
+	@Override
+    public StatsCmd statsCmd(StatsCallback statsCallback) {
+	    return new StatsCmdImpl(getDockerCmdExecFactory()
+	            .createStatsCmdExec(), statsCallback);
+	}
 
 	@Override
 	public void close() throws IOException {
diff --git a/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
new file mode 100644
index 000000000..33fcf6371
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
@@ -0,0 +1,61 @@
+package com.github.dockerjava.core.command;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.util.concurrent.ExecutorService;
+
+import com.github.dockerjava.api.command.EventCallback;
+import com.github.dockerjava.api.command.EventsCmd;
+import com.github.dockerjava.api.command.StatsCallback;
+import com.github.dockerjava.api.command.StatsCmd;
+import com.github.dockerjava.api.command.TopContainerCmd;
+
+/**
+ * Stream docker stats
+ */
+public class StatsCmdImpl extends AbstrDockerCmd<StatsCmd, ExecutorService> implements StatsCmd {
+
+    private String containerId;
+    private StatsCallback statsCallback;
+
+    public StatsCmdImpl(StatsCmd.Exec exec, StatsCallback statsCallback) {
+        super(exec);
+        withStatsCallback(statsCallback);
+    }
+
+    @Override
+    public StatsCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
+    
+    @Override
+    public String getContainerId() {
+        return containerId;
+    }
+    
+    @Override
+    public StatsCmd withStatsCallback(StatsCallback statsCallback) {
+        this.statsCallback = statsCallback;
+        return this;
+    }
+
+  
+    @Override
+    public StatsCallback getStatsCallback() {
+        return statsCallback;
+    }
+
+    @Override
+    public ExecutorService exec() {
+        return super.exec();
+    }
+
+    @Override
+    public String toString() {
+        return new StringBuilder("stats")
+                .append(containerId != null ? " --id=" + containerId : "")
+                .toString();
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index bc3afecad..10c039188 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -312,6 +312,11 @@ public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
 	public EventsCmd.Exec createEventsCmdExec() {
 		return new EventsCmdExec(getBaseResource());
 	}
+	
+	@Override
+    public StatsCmd.Exec createStatsCmdExec() {
+	    return new StatsCmdExec(getBaseResource());
+	}
 
 	@Override
 	public void close() throws IOException {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
new file mode 100644
index 000000000..97b9a2754
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
@@ -0,0 +1,90 @@
+package com.github.dockerjava.jaxrs;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.io.InputStream;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Response;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.command.StatsCallback;
+import com.github.dockerjava.api.command.StatsCmd;
+import com.github.dockerjava.api.model.Statistics;
+import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
+
+public class StatsCmdExec extends AbstrDockerCmdExec<StatsCmd, ExecutorService> implements StatsCmd.Exec {
+    private static final Logger LOGGER = LoggerFactory.getLogger(StatsCmdExec.class);
+    
+    public StatsCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected ExecutorService execute(StatsCmd command) {
+    	ExecutorService executorService = Executors.newSingleThreadExecutor();
+    	
+        WebTarget webResource = getBaseResource().path("/containers/{id}/stats")
+            .resolveTemplate("id", command.getContainerId());
+
+        LOGGER.trace("GET: {}", webResource);
+        StatsNotifier eventNotifier = StatsNotifier.create(command.getStatsCallback(), webResource);
+        executorService.submit(eventNotifier);
+        return executorService;
+    }
+    
+    private static class StatsNotifier implements Callable<Void> {
+        private static final JsonFactory JSON_FACTORY = new JsonFactory();
+        private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+        private final StatsCallback statsCallback;
+        private final WebTarget webTarget;
+
+        private StatsNotifier(StatsCallback statsCallback, WebTarget webTarget) {
+            this.statsCallback = statsCallback;
+            this.webTarget = webTarget;
+        }
+
+        public static StatsNotifier create(StatsCallback statsCallback, WebTarget webTarget) {
+            checkNotNull(statsCallback, "An StatsCallback must be provided");
+            checkNotNull(webTarget, "An WebTarget must be provided");
+            return new StatsNotifier(statsCallback, webTarget);
+        }
+
+        @Override
+        public Void call() throws Exception {
+            int numStats=0;
+            Response response = null;
+            try {
+                response = webTarget.request().get(Response.class);
+                InputStream inputStream = new WrappedResponseInputStream(response);
+                JsonParser jp = JSON_FACTORY.createParser(inputStream);
+                while (jp.nextToken() != JsonToken.END_OBJECT && !jp.isClosed() && statsCallback.isReceiving()) {
+                    statsCallback.onStats(OBJECT_MAPPER.readValue(jp, Statistics.class));
+                    numStats++;
+                }
+                statsCallback.onCompletion(numStats);
+                LOGGER.info("Finished collecting stats");
+                return null ;
+            }
+            catch(Throwable t) {
+                statsCallback.onException(t);
+            }
+            finally {                
+                if (response != null) {
+                    response.close();
+                }
+            }
+            return null ;
+        }
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 1e61b9a7d..b04ff63ba 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -60,7 +60,7 @@ private DockerClientConfig config() {
 
     protected DockerClientConfig config(String password) {
         DockerClientConfig.DockerClientConfigBuilder builder = DockerClientConfig.createDefaultConfigBuilder()
-                .withServerAddress("https://index.docker.io/v1/");
+                .withServerAddress("https://index.docker.io/v1/").withMaxTotalConnections(5).withMaxPerRouteConnections(5);
         if (password!=null) {
             builder = builder.withPassword(password);
         }
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index 869a12fcf..fb764474f 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -258,6 +258,11 @@ public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
 	public EventsCmd.Exec createEventsCmdExec() {
 		return delegate.createEventsCmdExec();
 	}
+	
+	@Override
+    public StatsCmd.Exec createStatsCmdExec() {
+	    return delegate.createStatsCmdExec();
+	}
 
 	public List<String> getContainerNames() {
 		return new ArrayList<String>(containerNames);
diff --git a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
new file mode 100644
index 000000000..c5e575373
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
@@ -0,0 +1,133 @@
+package com.github.dockerjava.core.command;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.StatsCallback;
+import com.github.dockerjava.api.command.StatsCmd;
+import com.github.dockerjava.api.model.Statistics;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.security.SecureRandom;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+@Test(groups = "integration")
+public class StatsCmdImplTest extends AbstractDockerClientTest {
+
+	private static int NUM_STATS = 5;
+
+	@BeforeTest
+	public void beforeTest() throws DockerException {
+		super.beforeTest();
+	}
+
+	@AfterTest
+	public void afterTest() {
+		super.afterTest();
+	}
+
+	@BeforeMethod
+	public void beforeMethod(Method method) {
+		super.beforeMethod(method);
+	}
+
+	@AfterMethod
+	public void afterMethod(ITestResult result) {
+		super.afterMethod(result);
+	}
+
+	@Test
+	public void testStatsStreaming() throws InterruptedException, IOException {
+		TimeUnit.SECONDS.sleep(1);
+
+		CountDownLatch countDownLatch = new CountDownLatch(NUM_STATS);
+		StatsCallbackTest statsCallback = new StatsCallbackTest(countDownLatch);
+		
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+		 CreateContainerResponse container = dockerClient
+             .createContainerCmd("busybox")
+             .withCmd("top")
+             .withName(containerName).exec();
+		 LOG.info("Created container {}", container.toString());
+		 assertThat(container.getId(), not(isEmptyString()));
+
+	     dockerClient.startContainerCmd(container.getId()).exec();
+
+		StatsCmd statsCmd = dockerClient.statsCmd(statsCallback).withContainerId(container.getId());
+		ExecutorService executorService = statsCmd.exec();
+
+		countDownLatch.await(3, TimeUnit.SECONDS);
+		boolean gotStats = statsCallback.gotStats();
+		
+        LOG.info("Stop stats collection");
+		executorService.shutdown();
+	    statsCallback.close();
+
+        LOG.info("Stopping container");
+        dockerClient.stopContainerCmd(container.getId()).exec();
+        dockerClient.removeContainerCmd(container.getId()).exec();
+        
+        LOG.info("Completed test");
+        assertTrue(gotStats, "Expected true");
+
+	}
+
+	private class StatsCallbackTest implements StatsCallback {
+		private final CountDownLatch countDownLatch;
+		private final AtomicBoolean isReceiving = new AtomicBoolean(true);
+		private boolean gotStats = false;
+
+		public StatsCallbackTest(CountDownLatch countDownLatch) {
+			this.countDownLatch = countDownLatch;
+		}
+
+		public void close() {
+	        LOG.info("Closing StatsCallback");
+			isReceiving.set(false);
+		}
+
+		@Override
+		public void onStats(Statistics stats) {
+			LOG.info("Received stats #{}: {}", countDownLatch.getCount(), stats);
+			if(stats != null) {
+			    gotStats = true;
+			}
+			countDownLatch.countDown();
+		}
+
+		@Override
+		public void onException(Throwable throwable) {
+			LOG.error("Error occurred: {}", throwable.getMessage());
+		}
+
+		@Override
+		public void onCompletion(int numStats) {
+			LOG.info("Number of stats received: {}", numStats);
+		}
+
+		@Override
+		public boolean isReceiving() {
+			return isReceiving.get();
+		}
+		
+	    public boolean gotStats() {
+	            return gotStats;
+	    }
+	}
+}

From ccd56e90022f01a34b480d84be08d1a291e808f8 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 5 Apr 2015 15:27:36 +0200
Subject: [PATCH 0002/1272] Switch to 1.1.0-SNAPSHOT according to semantic
 versioning

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ba60602ad..c0905b776 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>

From ed1fba471788a46acf462e1193c727730ee7ebfc Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 5 Apr 2015 15:31:01 +0200
Subject: [PATCH 0003/1272] [maven-release-plugin] prepare release
 docker-java-1.1.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c0905b776..e8f612e87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.1.0</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>docker-java-1.1.0</tag>
 	</scm>
 
 	<developers>

From a3bbeae15d3f5dab5ab8a6c0f09b208a02f10642 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 5 Apr 2015 15:31:06 +0200
Subject: [PATCH 0004/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e8f612e87..957c157c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>1.1.0</version>
+	<version>1.1.1-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>docker-java-1.1.0</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 52cb771b0c81852da1fc30973312318f05268cd9 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Sun, 5 Apr 2015 15:36:04 +0200
Subject: [PATCH 0005/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a033ccb4f..0892535a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Change Log
 ===
 Latest SNAPSHOT
+---
+
+v1.1.0
 ---
  
  * [#186](https://github.com/docker-java/docker-java/pull/186) Added withPull method to BuilImageCmd 

From bdedec016ef62783970dda2ff9d336273a3ccf65 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Sun, 5 Apr 2015 16:38:01 +0200
Subject: [PATCH 0006/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0892535a4..62f76dd10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@ Change Log
 Latest SNAPSHOT
 ---
 
+* [#192](https://github.com/docker-java/docker-java/pull/192) Added withPull method to BuilImageCmd Added a Links constructor accepting a List object
+
 v1.1.0
 ---
  

From 3b4c34631cc5a7d0dadbe8cc29cbe7055427d24c Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Sun, 5 Apr 2015 16:38:22 +0200
Subject: [PATCH 0007/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62f76dd10..c1b319a7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@ Change Log
 Latest SNAPSHOT
 ---
 
-* [#192](https://github.com/docker-java/docker-java/pull/192) Added withPull method to BuilImageCmd Added a Links constructor accepting a List object
+* [#192](https://github.com/docker-java/docker-java/pull/192) Added a Links constructor accepting a List object
 
 v1.1.0
 ---

From b42a3e1f9b74f75126bf3b2dff981b05f92abcb3 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 7 Apr 2015 21:06:16 +0200
Subject: [PATCH 0008/1272] Fix issue #164

---
 .../api/command/CreateContainerCmd.java       | 233 ++++--
 .../api/command/StartContainerCmd.java        | 134 +--
 .../dockerjava/api/model/HostConfig.java      |  34 +-
 .../github/dockerjava/api/model/Ports.java    |  16 +
 .../core/command/CreateContainerCmdImpl.java  | 766 +++++++++++-------
 .../command/CreateContainerCmdImplTest.java   | 192 ++++-
 .../command/StartContainerCmdImplTest.java    |  69 +-
 7 files changed, 989 insertions(+), 455 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index c6a1234cb..a2a6dc85f 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -2,111 +2,115 @@
 
 import com.github.dockerjava.api.ConflictException;
 import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Capability;
+import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.HostConfig;
+import com.github.dockerjava.api.model.Link;
+import com.github.dockerjava.api.model.LxcConf;
+import com.github.dockerjava.api.model.PortBinding;
+import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
 
 public interface CreateContainerCmd extends DockerCmd<CreateContainerResponse>{
 
-	public CreateContainerCmd withName(String name);
-
-	public String getName();
-
-	public CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts);
-
-	public ExposedPort[] getExposedPorts();
+	public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateContainerResponse> {
+	}
 
-	public boolean isDisableNetwork();
+	/**
+	 * @throws NotFoundException No such container
+	 * @throws ConflictException Named container already exists
+	 */
+    @Override
+	public CreateContainerResponse exec() throws NotFoundException,
+			ConflictException;
 
-	public String getWorkingDir();
+	public Bind[] getBinds();
 
-	public CreateContainerCmd withWorkingDir(String workingDir);
+	public Capability[] getCapAdd();
 
-	public String getHostName();
+	public Capability[] getCapDrop();
 
-	public CreateContainerCmd withDisableNetwork(boolean disableNetwork);
+	public String[] getCmd();
 
-	public CreateContainerCmd withHostName(String hostName);
+	public String getCpuset();
 
-	public String[] getPortSpecs();
+	public int getCpuShares();
 
-	public CreateContainerCmd withPortSpecs(String... portSpecs);
+	public Device[] getDevices();
 
-	public String getUser();
+	public String[] getDns();
+	
+	public String[] getDnsSearch();
 
-	public CreateContainerCmd withUser(String user);
+	public String[] getEntrypoint();
 
-	public boolean isTty();
+	public String[] getEnv();
 
-	public CreateContainerCmd withTty(boolean tty);
+	public ExposedPort[] getExposedPorts();
+	
+	public String[] getExtraHosts();
 
-	public boolean isStdinOpen();
+	public HostConfig getHostConfig();
 
-	public CreateContainerCmd withStdinOpen(boolean stdinOpen);
+	public String getHostName();
 
-	public boolean isStdInOnce();
+	public String getImage();
 
-	public CreateContainerCmd withStdInOnce(boolean stdInOnce);
+	public Link[] getLinks();
+	
+	public LxcConf[] getLxcConf();
 
 	public long getMemoryLimit();
 
-	public CreateContainerCmd withMemoryLimit(long memoryLimit);
-
 	public long getMemorySwap();
 
-	public CreateContainerCmd withMemorySwap(long memorySwap);
-
-	public int getCpuShares();
-
-	public CreateContainerCmd withCpuShares(int cpuShares);
-
-	public String getCpuset();
+	public String getName();
+	
+	public String getNetworkMode();
+	
+	public Ports getPortBindings();
 
-	public CreateContainerCmd withCpuset(String cpuset);
+	public String[] getPortSpecs();
+	
+	public RestartPolicy getRestartPolicy();
 
-	public boolean isAttachStdin();
+	public String getUser();
 
-	public CreateContainerCmd withAttachStdin(boolean attachStdin);
+	public Volume[] getVolumes();
 
-	public boolean isAttachStdout();
+	public VolumesFrom[] getVolumesFrom();
 
-	public CreateContainerCmd withAttachStdout(boolean attachStdout);
+	public String getWorkingDir();
 
 	public boolean isAttachStderr();
 
-	public CreateContainerCmd withAttachStderr(boolean attachStderr);
-
-	public String[] getEnv();
-
-	public CreateContainerCmd withEnv(String... env);
-
-	public String[] getCmd();
-
-	public CreateContainerCmd withCmd(String... cmd);
-
-	public String[] getDns();
+	public boolean isAttachStdin();
 
-	public CreateContainerCmd withDns(String... dns);
+	public boolean isAttachStdout();
 
-	public String getImage();
+	public boolean isDisableNetwork();
+	
+	public Boolean isPrivileged();
+	
+	public Boolean isPublishAllPorts();
 
-	public CreateContainerCmd withImage(String image);
+	public boolean isStdInOnce();
 
-	public Volume[] getVolumes();
+	public boolean isStdinOpen();
 
-	public CreateContainerCmd withVolumes(Volume... volumes);
+	public boolean isTty();
 
-	public VolumesFrom[] getVolumesFrom();
+	public CreateContainerCmd withAttachStderr(boolean attachStderr);
 
-	public CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom);
+	public CreateContainerCmd withAttachStdin(boolean attachStdin);
 	
-	public HostConfig getHostConfig();
+	public CreateContainerCmd withAttachStdout(boolean attachStdout);
 	
-	public CreateContainerCmd withHostConfig(HostConfig hostConfig);
-
-	public Capability[] getCapAdd();
+	public CreateContainerCmd withBinds(Bind... binds);
 
 	/**
 	 * Add linux <a
@@ -116,8 +120,6 @@ public interface CreateContainerCmd extends DockerCmd<CreateContainerResponse>{
 	 */
 	public CreateContainerCmd withCapAdd(Capability... capAdd);
 
-	public Capability[] getCapDrop();
-
 	/**
 	 * Drop linux <a
 	 * href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel
@@ -125,21 +127,114 @@ public interface CreateContainerCmd extends DockerCmd<CreateContainerResponse>{
 	 * prevents the container from changing the owner of any files.
 	 */
 	public CreateContainerCmd withCapDrop(Capability... capDrop);
+
+	public CreateContainerCmd withCmd(String... cmd);
+
+	public CreateContainerCmd withCpuset(String cpuset);
 	
+	public CreateContainerCmd withCpuShares(int cpuShares);
 	
-	public String[] getEntrypoint();
+	/**
+	 * Add host devices to the container
+	 */
+	public CreateContainerCmd withDevices(Device... devices);
+
+	public CreateContainerCmd withDisableNetwork(boolean disableNetwork);
+
+	/**
+	 * Set custom DNS servers
+	 */
+	public CreateContainerCmd withDns(String... dns);
 	
+	/**
+	 * Set custom DNS search domains
+	 */
+	public CreateContainerCmd withDnsSearch(String... dnsSearch);
+
 	public CreateContainerCmd withEntrypoint(String... entrypoint);
+
+	public CreateContainerCmd withEnv(String... env);
+	
+	public CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts);
 	
 	/**
-	 * @throws NotFoundException No such container
-	 * @throws ConflictException Named container already exists
+	 * Add hostnames to /etc/hosts in the container
 	 */
-    @Override
-	public CreateContainerResponse exec() throws NotFoundException,
-			ConflictException;
+	public CreateContainerCmd withExtraHosts(String... extraHosts);
 	
-	public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateContainerResponse> {
-	}
+	public CreateContainerCmd withHostConfig(HostConfig hostConfig);
+
+	public CreateContainerCmd withHostName(String hostName);
+
+	public CreateContainerCmd withImage(String image);
+
+	/**
+	 * Add link to another container.
+	 */
+	public CreateContainerCmd withLinks(Link... links);
+	
+	public CreateContainerCmd withLxcConf(LxcConf... lxcConf);
+
+	public CreateContainerCmd withMemoryLimit(long memoryLimit);
+	
+	public CreateContainerCmd withMemorySwap(long memorySwap);
+	
+	public CreateContainerCmd withName(String name);
+	
+
+	/**
+	 * Set the Network mode for the container
+	 * <ul>
+	 * <li>'bridge': creates a new network stack for the container on the docker
+	 * bridge</li>
+	 * <li>'none': no networking for this container</li>
+	 * <li>'container:<name|id>': reuses another container network stack</li>
+	 * <li>'host': use the host network stack inside the container. Note: the
+	 * host mode gives the container full access to local system services such
+	 * as D-bus and is therefore considered insecure.</li>
+	 * </ul>
+	 */
+	public CreateContainerCmd withNetworkMode(String networkMode);
+	
+	/**
+	 * Add one or more {@link PortBinding}s.
+	 * This corresponds to the <code>--publish</code> (<code>-p</code>)
+	 * option of the <code>docker run</code> CLI command.
+	 */
+	public CreateContainerCmd withPortBindings(PortBinding... portBindings);
+	
+	/**
+	 * Add the port bindings that are contained in the given {@link Ports}
+	 * object.
+	 * 
+	 * @see #withPortBindings(PortBinding...)
+	 */
+	public CreateContainerCmd withPortBindings(Ports portBindings);
+
+	public CreateContainerCmd withPortSpecs(String... portSpecs);
+	
+	public CreateContainerCmd withPrivileged(boolean privileged);
+	
+	public CreateContainerCmd withPublishAllPorts(boolean publishAllPorts);
+	
+	/**
+	 * Set custom {@link RestartPolicy} for the container. Defaults to
+	 * {@link RestartPolicy#noRestart()}
+	 */
+	public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy);
+
+	public CreateContainerCmd withStdInOnce(boolean stdInOnce);
+
+	public CreateContainerCmd withStdinOpen(boolean stdinOpen);
+
+	public CreateContainerCmd withTty(boolean tty);
+		
+	public CreateContainerCmd withUser(String user);
+	
+	public CreateContainerCmd withVolumes(Volume... volumes);
+	
+	public CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom);
+	
+	public CreateContainerCmd withWorkingDir(String workingDir);
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
index de70b97cb..e76598e3e 100644
--- a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
@@ -18,72 +18,79 @@
  */
 public interface StartContainerCmd extends DockerCmd<Void> {
 
-	public Bind[] getBinds();
+	public static interface Exec extends DockerCmdExec<StartContainerCmd, Void> {
+	}
 
-	public Link[] getLinks();
+	/**
+	 * @throws NotFoundException
+	 *             No such container
+	 * @throws NotModifiedException
+	 *             Container already started
+	 */
+	@Override
+	public Void exec() throws NotFoundException, NotModifiedException;
 
-	public LxcConf[] getLxcConf();
+	public Bind[] getBinds();
 
-	public Ports getPortBindings();
+	public Capability[] getCapAdd();
 
-	public Boolean isPublishAllPorts();
+	public Capability[] getCapDrop();
 
-	public Boolean isPrivileged();
+	public String getContainerId();
+
+	public Device[] getDevices();
 
 	public String[] getDns();
 
 	public String[] getDnsSearch();
 
-	public String getVolumesFrom();
+	public String[] getExtraHosts();
 
-	public String getContainerId();
+	public Link[] getLinks();
 
-	public String getNetworkMode();
+	public LxcConf[] getLxcConf();
 
-	public Device[] getDevices();
+	public String getNetworkMode();
 
-	public String[] getExtraHosts();
+	public Ports getPortBindings();
 
 	public RestartPolicy getRestartPolicy();
 
-	public Capability[] getCapAdd();
-
-	public Capability[] getCapDrop();
+	public String getVolumesFrom();
 
-	@Deprecated
-	public StartContainerCmd withBinds(Bind... binds);
+	public Boolean isPrivileged();
 
-	/**
-	 * Add link to another container.
-	 */
-	@Deprecated
-	public StartContainerCmd withLinks(Link... links);
+	public Boolean isPublishAllPorts();
 
 	@Deprecated
-	public StartContainerCmd withLxcConf(LxcConf... lxcConf);
+	public StartContainerCmd withBinds(Bind... binds);
 
 	/**
-	 * Add the port bindings that are contained in the given {@link Ports}
-	 * object.
-	 * 
-	 * @see #withPortBindings(PortBinding...)
+	 * Add linux <a
+	 * href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel
+	 * capability</a> to the container. For example: adding {@link Capability#MKNOD}
+	 * allows the container to create special files using the 'mknod' command.
 	 */
 	@Deprecated
-	public StartContainerCmd withPortBindings(Ports portBindings);
+	public StartContainerCmd withCapAdd(Capability... capAdd);
 
 	/**
-	 * Add one or more {@link PortBinding}s.
-	 * This corresponds to the <code>--publish</code> (<code>-p</code>)
-	 * option of the <code>docker run</code> CLI command.
+	 * Drop linux <a
+	 * href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel
+	 * capability</a> from the container. For example: dropping {@link Capability#CHOWN}
+	 * prevents the container from changing the owner of any files.
 	 */
 	@Deprecated
-	public StartContainerCmd withPortBindings(PortBinding... portBindings);
+	public StartContainerCmd withCapDrop(Capability... capDrop);
 
 	@Deprecated
-	public StartContainerCmd withPrivileged(Boolean privileged);
+	public StartContainerCmd withContainerId(String containerId);
 
+	/**
+	 * Add host devices to the container
+	 */
 	@Deprecated
-	public StartContainerCmd withPublishAllPorts(Boolean publishAllPorts);
+	public StartContainerCmd withDevices(Device... devices);
 
 	/**
 	 * Set custom DNS servers
@@ -97,11 +104,20 @@ public interface StartContainerCmd extends DockerCmd<Void> {
 	@Deprecated
 	public StartContainerCmd withDnsSearch(String... dnsSearch);
 
+	/**
+	 * Add hostnames to /etc/hosts in the container
+	 */
 	@Deprecated
-	public StartContainerCmd withVolumesFrom(String volumesFrom);
+	public StartContainerCmd withExtraHosts(String... extraHosts);
 
+	/**
+	 * Add link to another container.
+	 */
 	@Deprecated
-	public StartContainerCmd withContainerId(String containerId);
+	public StartContainerCmd withLinks(Link... links);
+
+	@Deprecated
+	public StartContainerCmd withLxcConf(LxcConf... lxcConf);
 
 	/**
 	 * Set the Network mode for the container
@@ -119,52 +135,36 @@ public interface StartContainerCmd extends DockerCmd<Void> {
 	public StartContainerCmd withNetworkMode(String networkMode);
 
 	/**
-	 * Add host devices to the container
+	 * Add one or more {@link PortBinding}s.
+	 * This corresponds to the <code>--publish</code> (<code>-p</code>)
+	 * option of the <code>docker run</code> CLI command.
 	 */
 	@Deprecated
-	public StartContainerCmd withDevices(Device... devices);
+	public StartContainerCmd withPortBindings(PortBinding... portBindings);
 
 	/**
-	 * Add hostnames to /etc/hosts in the container
+	 * Add the port bindings that are contained in the given {@link Ports}
+	 * object.
+	 * 
+	 * @see #withPortBindings(PortBinding...)
 	 */
 	@Deprecated
-	public StartContainerCmd withExtraHosts(String... extraHosts);
+	public StartContainerCmd withPortBindings(Ports portBindings);
 
-	/**
-	 * Set custom {@link RestartPolicy} for the container. Defaults to
-	 * {@link RestartPolicy#noRestart()}
-	 */
 	@Deprecated
-	public StartContainerCmd withRestartPolicy(RestartPolicy restartPolicy);
+	public StartContainerCmd withPrivileged(Boolean privileged);
 
-	/**
-	 * Add linux <a
-	 * href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel
-	 * capability</a> to the container. For example: adding {@link Capability#MKNOD}
-	 * allows the container to create special files using the 'mknod' command.
-	 */
 	@Deprecated
-	public StartContainerCmd withCapAdd(Capability... capAdd);
+	public StartContainerCmd withPublishAllPorts(Boolean publishAllPorts);
 
 	/**
-	 * Drop linux <a
-	 * href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel
-	 * capability</a> from the container. For example: dropping {@link Capability#CHOWN}
-	 * prevents the container from changing the owner of any files.
+	 * Set custom {@link RestartPolicy} for the container. Defaults to
+	 * {@link RestartPolicy#noRestart()}
 	 */
 	@Deprecated
-	public StartContainerCmd withCapDrop(Capability... capDrop);
-
-	/**
-	 * @throws NotFoundException
-	 *             No such container
-	 * @throws NotModifiedException
-	 *             Container already started
-	 */
-	@Override
-	public Void exec() throws NotFoundException, NotModifiedException;
+	public StartContainerCmd withRestartPolicy(RestartPolicy restartPolicy);
 
-	public static interface Exec extends DockerCmdExec<StartContainerCmd, Void> {
-	}
+	@Deprecated
+	public StartContainerCmd withVolumesFrom(String volumesFrom);
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index c72d078b1..18fd34073 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -1,7 +1,10 @@
 package com.github.dockerjava.api.model;
 
+import java.util.Map;
+
 import org.apache.commons.lang.builder.ToStringBuilder;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -9,7 +12,7 @@
 public class HostConfig {
 
 	@JsonProperty("Binds")
-	private String[] binds;
+	private Binds binds;
 
 	@JsonProperty("Links")
 	private Links links;
@@ -59,12 +62,12 @@ public class HostConfig {
 	public HostConfig() {
 	}
 
-	public HostConfig(String[] binds, Links links, LxcConf[] lxcConf, Ports portBindings, boolean publishAllPorts,
+	public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, Ports portBindings, boolean publishAllPorts,
 			boolean privileged, String[] dns, String[] dnsSearch, VolumesFrom[] volumesFrom, String containerIDFile,
 			Capability[] capAdd, Capability[] capDrop, RestartPolicy restartPolicy, String networkMode, Device[] devices,
             String[] extraHosts) {
-		this.binds = binds;
-		this.links = links;
+		this.binds = new Binds(binds);
+		this.links = new Links(links);
 		this.lxcConf = lxcConf;
 		this.portBindings = portBindings;
 		this.publishAllPorts = publishAllPorts;
@@ -81,14 +84,16 @@ public HostConfig(String[] binds, Links links, LxcConf[] lxcConf, Ports portBind
 		this.extraHosts = extraHosts;
 	}
 
-	public String[] getBinds() {
-		return binds;
+
+	@JsonIgnore
+	public Bind[] getBinds() {
+		return (binds == null) ? new Bind[0] : binds.getBinds();
 	}
 
 	public LxcConf[] getLxcConf() {
 		return lxcConf;
 	}
-
+	
 	public Ports getPortBindings() {
 		return portBindings;
 	}
@@ -117,8 +122,9 @@ public String[] getDnsSearch() {
 		return dnsSearch;
 	}
 
-	public Links getLinks() {
-		return links;
+	@JsonIgnore
+	public Link[] getLinks() {
+		return (links == null) ? new Link[0] : links.getLinks();
 	}
 
 	public String getNetworkMode() {
@@ -145,12 +151,14 @@ public Capability[] getCapDrop() {
 		return capDrop;
 	}
 
-	public void setBinds(String[] binds) {
-		this.binds = binds;
+	@JsonIgnore
+	public void setBinds(Bind... binds) {
+		this.binds = new Binds(binds);
 	}
 
-	public void setLinks(Links links) {
-		this.links = links;
+	@JsonIgnore
+	public void setLinks(Link... links) {
+		this.links = new Links(links);
 	}
 
 	public void setLxcConf(LxcConf[] lxcConf) {
diff --git a/src/main/java/com/github/dockerjava/api/model/Ports.java b/src/main/java/com/github/dockerjava/api/model/Ports.java
index e0f3c0806..d7c8a3245 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -3,8 +3,10 @@
 import static org.apache.commons.lang.StringUtils.isEmpty;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -59,6 +61,10 @@ public Ports() { }
     public Ports(ExposedPort exposedPort, Binding host) {
     	bind(exposedPort, host);
     }
+    
+    public Ports(PortBinding... portBindings) {
+    	add(portBindings);
+    }
 
     /**
      * Adds a new {@link PortBinding} for the specified {@link ExposedPort} and
@@ -97,6 +103,16 @@ public String toString(){
     public Map<ExposedPort, Binding[]> getBindings(){
         return ports;
     }
+    
+//    public PortBinding[] getBindingsAsArray() {
+//    	List<PortBinding> bindings = new ArrayList<>();
+//    	for(Map.Entry<ExposedPort, Ports.Binding[]> entry: ports.entrySet()) {
+//    		for(Ports.Binding binding : entry.getValue()) {
+//    			bindings.add(new PortBinding(binding, entry.getKey()));
+//    		}
+//    	}
+//    	return bindings.toArray(new PortBinding[bindings.size()]);
+//    }
 
     /**
      * Creates a {@link Binding} for the given IP address and port number.
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index ac32960a9..5afd0dbb8 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -10,370 +10,546 @@
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Capability;
+import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.ExposedPorts;
 import com.github.dockerjava.api.model.HostConfig;
+import com.github.dockerjava.api.model.Link;
+import com.github.dockerjava.api.model.LxcConf;
+import com.github.dockerjava.api.model.PortBinding;
+import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.api.model.Volumes;
 
 /**
- *
+ * 
  * Creates a new container.
- *
+ * 
  */
-public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, CreateContainerResponse> implements CreateContainerCmd  {
+public class CreateContainerCmdImpl extends
+		AbstrDockerCmd<CreateContainerCmd, CreateContainerResponse> implements
+		CreateContainerCmd {
 
 	private String name;
-	
-	@JsonProperty("Hostname")     private String    hostName = "";
-    @JsonProperty("User")         private String    user = "";
-    @JsonProperty("Memory")       private long      memoryLimit = 0;
-    @JsonProperty("MemorySwap")   private long      memorySwap = 0;
-    @JsonProperty("CpuShares")    private int       cpuShares = 0;
-    @JsonProperty("Cpuset")       private String    cpuset;
-    @JsonProperty("AttachStdin")  private boolean   attachStdin = false;
-    @JsonProperty("AttachStdout") private boolean   attachStdout = false;
-    @JsonProperty("AttachStderr") private boolean   attachStderr = false;
-    @JsonProperty("PortSpecs")    private String[]  portSpecs;
-    @JsonProperty("Tty")          private boolean   tty = false;
-    @JsonProperty("OpenStdin")    private boolean   stdinOpen = false;
-    @JsonProperty("StdinOnce")    private boolean   stdInOnce = false;
-    @JsonProperty("Env")          private String[]  env;
-    @JsonProperty("Cmd")          private String[]  cmd;
-    @JsonProperty("Entrypoint")   private String[]  entrypoint;
-    @JsonProperty("Image")        private String    image;
-    @JsonProperty("Volumes")      private Volumes volumes = new Volumes();
-    @JsonProperty("WorkingDir")   private String workingDir = "";
-    @JsonProperty("DisableNetwork") private boolean disableNetwork = false;
-    @JsonProperty("ExposedPorts")   private ExposedPorts exposedPorts = new ExposedPorts();
-    @JsonProperty("HostConfig")   private HostConfig hostConfig = new HostConfig();
-	
+
+	@JsonProperty("Hostname")
+	private String hostName = "";
+	@JsonProperty("User")
+	private String user = "";
+	@JsonProperty("Memory")
+	private long memoryLimit = 0;
+	@JsonProperty("MemorySwap")
+	private long memorySwap = 0;
+	@JsonProperty("CpuShares")
+	private int cpuShares = 0;
+	@JsonProperty("Cpuset")
+	private String cpuset;
+	@JsonProperty("AttachStdin")
+	private boolean attachStdin = false;
+	@JsonProperty("AttachStdout")
+	private boolean attachStdout = false;
+	@JsonProperty("AttachStderr")
+	private boolean attachStderr = false;
+	@JsonProperty("PortSpecs")
+	private String[] portSpecs;
+	@JsonProperty("Tty")
+	private boolean tty = false;
+	@JsonProperty("OpenStdin")
+	private boolean stdinOpen = false;
+	@JsonProperty("StdinOnce")
+	private boolean stdInOnce = false;
+	@JsonProperty("Env")
+	private String[] env;
+	@JsonProperty("Cmd")
+	private String[] cmd;
+	@JsonProperty("Entrypoint")
+	private String[] entrypoint;
+	@JsonProperty("Image")
+	private String image;
+	@JsonProperty("Volumes")
+	private Volumes volumes = new Volumes();
+	@JsonProperty("WorkingDir")
+	private String workingDir = "";
+	@JsonProperty("DisableNetwork")
+	private boolean disableNetwork = false;
+	@JsonProperty("ExposedPorts")
+	private ExposedPorts exposedPorts = new ExposedPorts();
+	@JsonProperty("HostConfig")
+	private HostConfig hostConfig = new HostConfig();
+
 	public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, String image) {
 		super(exec);
 		checkNotNull(image, "image was not specified");
 		withImage(image);
 	}
 
+	/**
+	 * @throws NotFoundException
+	 *             No such container
+	 * @throws ConflictException
+	 *             Named container already exists
+	 */
 	@Override
-	public CreateContainerCmdImpl withName(String name) {
-		checkNotNull(name, "name was not specified");
-        this.name = name;
-        return this;
-    }
+	public CreateContainerResponse exec() throws NotFoundException,
+			ConflictException {
+		return super.exec();
+	}
 
-    @Override
-	public String getName() {
-        return name;
-    }
+	@Override
+	@JsonIgnore
+	public Bind[] getBinds() {
+		return hostConfig.getBinds();
+	}
 
-    @Override
-	public CreateContainerCmdImpl withExposedPorts(ExposedPort... exposedPorts) {
-        this.exposedPorts = new ExposedPorts(exposedPorts);
-        return this;
-    }
+	@Override
+	public Capability[] getCapAdd() {
+		return hostConfig.getCapAdd();
+	}
+
+	@Override
+	public Capability[] getCapDrop() {
+		return hostConfig.getCapDrop();
+	}
+
+	@Override
+	public String[] getCmd() {
+		return cmd;
+	}
+
+	@Override
+	public String getCpuset() {
+		return cpuset;
+	}
+
+	@Override
+	public int getCpuShares() {
+		return cpuShares;
+	}
 
-    @Override
+	@Override
 	@JsonIgnore
-    public ExposedPort[] getExposedPorts() {
-        return exposedPorts.getExposedPorts();
-    }
+	public Device[] getDevices() {
+		return hostConfig.getDevices();
+	}
 
+	@Override
+	@JsonIgnore
+	public String[] getDns() {
+		return hostConfig.getDns();
+	}
 
-    @Override
-	public boolean isDisableNetwork() {
-        return disableNetwork;
-    }
+	@Override
+	@JsonIgnore
+	public String[] getDnsSearch() {
+		return hostConfig.getDnsSearch();
+	}
 
-    @Override
-	public String getWorkingDir() { 
-    	return workingDir;
-    }
+	@Override
+	public String[] getEntrypoint() {
+		return entrypoint;
+	}
 
-    @Override
-	public CreateContainerCmdImpl withWorkingDir(String workingDir) {
-        this.workingDir = workingDir;
-        return this;
-    }
+	@Override
+	public String[] getEnv() {
+		return env;
+	}
+
+	@Override
+	@JsonIgnore
+	public ExposedPort[] getExposedPorts() {
+		return exposedPorts.getExposedPorts();
+	}
 
+	@Override
+	@JsonIgnore
+	public String[] getExtraHosts() {
+		return hostConfig.getExtraHosts();
+	}
+
+	@Override
+	public HostConfig getHostConfig() {
+		return hostConfig;
+	}
 
-    @Override
+	@Override
 	public String getHostName() {
-        return hostName;
-    }
+		return hostName;
+	}
 
-    @Override
-	public CreateContainerCmdImpl withDisableNetwork(boolean disableNetwork) {
-        this.disableNetwork = disableNetwork;
-        return this;
-    }
+	@Override
+	public String getImage() {
+		return image;
+	}
 
-    @Override
-	public CreateContainerCmdImpl withHostName(String hostName) {
-        this.hostName = hostName;
-        return this;
-    }
+	@Override
+	@JsonIgnore
+	public Link[] getLinks() {
+		return hostConfig.getLinks();
+	}
+
+	@Override
+	@JsonIgnore
+	public LxcConf[] getLxcConf() {
+		return hostConfig.getLxcConf();
+	}
+
+	@Override
+	public long getMemoryLimit() {
+		return memoryLimit;
+	}
+
+	@Override
+	public long getMemorySwap() {
+		return memorySwap;
+	}
+
+	@Override
+	public String getName() {
+		return name;
+	}
 
-    @Override
+	@Override
+	@JsonIgnore
+	public String getNetworkMode() {
+		return hostConfig.getNetworkMode();
+	}
+
+	@Override
+	@JsonIgnore
+	public Ports getPortBindings() {
+		return hostConfig.getPortBindings();
+	}
+
+	@Override
 	public String[] getPortSpecs() {
-        return portSpecs;
-    }
+		return portSpecs;
+	}
 
-    @Override
-	public CreateContainerCmdImpl withPortSpecs(String... portSpecs) {
-        this.portSpecs = portSpecs;
-        return this;
-    }
+	@Override
+	@JsonIgnore
+	public RestartPolicy getRestartPolicy() {
+		return hostConfig.getRestartPolicy();
+	}
 
-    @Override
+	@Override
 	public String getUser() {
-        return user;
-    }
+		return user;
+	}
 
-    @Override
-	public CreateContainerCmdImpl withUser(String user) {
-        this.user = user;
-        return this;
-    }
+	@Override
+	@JsonIgnore
+	public Volume[] getVolumes() {
+		return volumes.getVolumes();
+	}
 
-    @Override
-	public boolean isTty() {
-        return tty;
-    }
+	@Override
+	@JsonIgnore
+	public VolumesFrom[] getVolumesFrom() {
+		return hostConfig.getVolumesFrom();
+	}
 
-    @Override
-	public CreateContainerCmdImpl withTty(boolean tty) {
-        this.tty = tty;
-        return this;
-    }
+	@Override
+	public String getWorkingDir() {
+		return workingDir;
+	}
 
-    @Override
-	public boolean isStdinOpen() {
-        return stdinOpen;
-    }
+	@Override
+	public boolean isAttachStderr() {
+		return attachStderr;
+	}
 
-    @Override
-	public CreateContainerCmdImpl withStdinOpen(boolean stdinOpen) {
-        this.stdinOpen = stdinOpen;
-        return this;
-    }
+	@Override
+	public boolean isAttachStdin() {
+		return attachStdin;
+	}
 
-    @Override
+	@Override
+	public boolean isAttachStdout() {
+		return attachStdout;
+	}
+
+	@Override
+	public boolean isDisableNetwork() {
+		return disableNetwork;
+	}
+
+	@Override
+	@JsonIgnore
+	public Boolean isPrivileged() {
+		return hostConfig.isPrivileged();
+	}
+
+	@Override
+	@JsonIgnore
+	public Boolean isPublishAllPorts() {
+		return hostConfig.isPublishAllPorts();
+	}
+
+	@Override
 	public boolean isStdInOnce() {
-        return stdInOnce;
-    }
+		return stdInOnce;
+	}
 
-    @Override
-	public CreateContainerCmdImpl withStdInOnce(boolean stdInOnce) {
-        this.stdInOnce = stdInOnce;
-        return this;
-    }
+	@Override
+	public boolean isStdinOpen() {
+		return stdinOpen;
+	}
 
-    @Override
-	public long getMemoryLimit() {
-        return memoryLimit;
-    }
+	@Override
+	public boolean isTty() {
+		return tty;
+	}
 
-    @Override
-	public CreateContainerCmdImpl withMemoryLimit(long memoryLimit) {
-        this.memoryLimit = memoryLimit;
-        return this;
-    }
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this).append("create container ")
+				.append(name != null ? "name=" + name + " " : "").append(this)
+				.toString();
+	}
 
-    @Override
-	public long getMemorySwap() {
-        return memorySwap;
-    }
+	@Override
+	public CreateContainerCmdImpl withAttachStderr(boolean attachStderr) {
+		this.attachStderr = attachStderr;
+		return this;
+	}
 
-    @Override
-	public CreateContainerCmdImpl withMemorySwap(long memorySwap) {
-        this.memorySwap = memorySwap;
-        return this;
-    }
+	@Override
+	public CreateContainerCmdImpl withAttachStdin(boolean attachStdin) {
+		this.attachStdin = attachStdin;
+		return this;
+	}
 
-    @Override
-	public int getCpuShares() {
-        return cpuShares;
-    }
+	@Override
+	public CreateContainerCmdImpl withAttachStdout(boolean attachStdout) {
+		this.attachStdout = attachStdout;
+		return this;
+	}
 
-    @Override
-	public CreateContainerCmdImpl withCpuShares(int cpuShares) {
-        this.cpuShares = cpuShares;
-        return this;
-    }
+	@Override
+	public CreateContainerCmd withBinds(Bind... binds) {
+		hostConfig.setBinds(binds);
+		return this;
+	}
 
-    @Override
-	public String getCpuset() {
-        return cpuset;
-    }
+	@Override
+	public CreateContainerCmd withCapAdd(Capability... capAdd) {
+		hostConfig.setCapAdd(capAdd);
+		return this;
+	}
 
-    @Override
-	public CreateContainerCmdImpl withCpuset(String cpuset) {
-        this.cpuset = cpuset;
-        return this;
-    }
+	@Override
+	public CreateContainerCmd withCapDrop(Capability... capDrop) {
+		hostConfig.setCapDrop(capDrop);
+		return this;
+	}
 
-    @Override
-	public boolean isAttachStdin() {
-        return attachStdin;
-    }
+	@Override
+	public CreateContainerCmdImpl withCmd(String... cmd) {
+		this.cmd = cmd;
+		return this;
+	}
 
-    @Override
-	public CreateContainerCmdImpl withAttachStdin(boolean attachStdin) {
-        this.attachStdin = attachStdin;
-        return this;
-    }
+	@Override
+	public CreateContainerCmdImpl withCpuset(String cpuset) {
+		this.cpuset = cpuset;
+		return this;
+	}
 
-    @Override
-	public boolean isAttachStdout() {
-        return attachStdout;
-    }
+	@Override
+	public CreateContainerCmdImpl withCpuShares(int cpuShares) {
+		this.cpuShares = cpuShares;
+		return this;
+	}
 
-    @Override
-	public CreateContainerCmdImpl withAttachStdout(boolean attachStdout) {
-        this.attachStdout = attachStdout;
-        return this;
-    }
+	@Override
+	public CreateContainerCmd withDevices(Device... devices) {
+		this.hostConfig.setDevices(devices);
+		return this;
+	}
 
-    @Override
-	public boolean isAttachStderr() {
-        return attachStderr;
-    }
+	@Override
+	public CreateContainerCmdImpl withDisableNetwork(boolean disableNetwork) {
+		this.disableNetwork = disableNetwork;
+		return this;
+	}
 
-    @Override
-	public CreateContainerCmdImpl withAttachStderr(boolean attachStderr) {
-        this.attachStderr = attachStderr;
-        return this;
-    }
+	@Override
+	public CreateContainerCmdImpl withDns(String... dns) {
+		this.hostConfig.setDns(dns);
+		return this;
+	}
 
-    @Override
-	public String[] getEnv() {
-        return env;
-    }
+	@Override
+	public CreateContainerCmd withDnsSearch(String... dnsSearch) {
+		this.hostConfig.setDnsSearch(dnsSearch);
+		return this;
+	}
 
-    @Override
+	@Override
+	public CreateContainerCmdImpl withEntrypoint(String... entrypoint) {
+		this.entrypoint = entrypoint;
+		return this;
+	}
+
+	@Override
 	public CreateContainerCmdImpl withEnv(String... env) {
-        this.env = env;
-        return this;
-    }
+		this.env = env;
+		return this;
+	}
 
-    @Override
-	public String[] getCmd() {
-        return cmd;
-    }
+	@Override
+	public CreateContainerCmdImpl withExposedPorts(ExposedPort... exposedPorts) {
+		this.exposedPorts = new ExposedPorts(exposedPorts);
+		return this;
+	}
 
-    @Override
-	public CreateContainerCmdImpl withCmd(String... cmd) {
-        this.cmd = cmd;
-        return this;
-    }
-    
-    @Override
-    public String[] getEntrypoint() {
-    	return entrypoint;
-    }
-    
-    @Override
-	public CreateContainerCmdImpl withEntrypoint(String... entrypoint) {
-        this.entrypoint = entrypoint;
-        return this;
-    }
-
-    @Override
-    public String[] getDns() {
-        return hostConfig.getDns();
-    }
-
-    @Override
-    public CreateContainerCmdImpl withDns(String... dns) {
-        hostConfig.setDns(dns);
-        return this;
-    }
-
-    @Override
-	public String getImage() {
-        return image;
-    }
+	@Override
+	public CreateContainerCmd withExtraHosts(String... extraHosts) {
+		this.hostConfig.setExtraHosts(extraHosts);
+		return this;
+	}
+
+	@Override
+	public CreateContainerCmd withHostConfig(HostConfig hostConfig) {
+		checkNotNull(hostConfig, "no host config was specified");
+		this.hostConfig = hostConfig;
+		return this;
+	}
+
+	@Override
+	public CreateContainerCmdImpl withHostName(String hostName) {
+		this.hostName = hostName;
+		return this;
+	}
 
-    @Override
+	@Override
 	public CreateContainerCmdImpl withImage(String image) {
-        this.image = image;
-        return this;
-    }
+		this.image = image;
+		return this;
+	}
 
-    @Override
-	@JsonIgnore
-    public Volume[] getVolumes() {
-        return volumes.getVolumes();
-    }
+	@Override
+	public CreateContainerCmdImpl withLinks(Link... links) {
+		checkNotNull(links, "links was not specified");
+		this.hostConfig.setLinks(links);
+		return this;
+	}
 
-    @Override
-	public CreateContainerCmdImpl withVolumes(Volume... volumes) {
-        this.volumes = new Volumes(volumes);
-        return this;
-    }
+	@Override
+	public CreateContainerCmd withLxcConf(LxcConf... lxcConf) {
+		checkNotNull(lxcConf, "lxcConf was not specified");
+		this.hostConfig.setLxcConf(lxcConf);
+		return this;
+	}
 
-    @Override
-	public VolumesFrom[] getVolumesFrom() {
-        return hostConfig.getVolumesFrom();
-    }
+	@Override
+	public CreateContainerCmdImpl withMemoryLimit(long memoryLimit) {
+		this.memoryLimit = memoryLimit;
+		return this;
+	}
+
+	@Override
+	public CreateContainerCmdImpl withMemorySwap(long memorySwap) {
+		this.memorySwap = memorySwap;
+		return this;
+	}
+
+	@Override
+	public CreateContainerCmdImpl withName(String name) {
+		checkNotNull(name, "name was not specified");
+		this.name = name;
+		return this;
+	}
+
+	@Override
+	public CreateContainerCmd withNetworkMode(String networkMode) {
+		checkNotNull(networkMode, "networkMode was not specified");
+		this.hostConfig.setNetworkMode(networkMode);
+		return this;
+	}
+
+	@Override
+	public CreateContainerCmd withPortBindings(PortBinding... portBindings) {
+		checkNotNull(portBindings, "portBindings was not specified");
+		this.hostConfig.setPortBindings(new Ports(portBindings));
+		return this;
+	}
+
+	@Override
+	public CreateContainerCmd withPortBindings(Ports portBindings) {
+		checkNotNull(portBindings, "portBindings was not specified");
+		this.hostConfig.setPortBindings(portBindings);
+		return this;
+	}
+
+	@Override
+	public CreateContainerCmdImpl withPortSpecs(String... portSpecs) {
+		this.portSpecs = portSpecs;
+		return this;
+	}
+
+	@Override
+	public CreateContainerCmd withPrivileged(boolean privileged) {
+		this.hostConfig.setPrivileged(privileged);
+		return this;
+	}
+
+	@Override
+	public CreateContainerCmd withPublishAllPorts(boolean publishAllPorts) {
+		this.hostConfig.setPublishAllPorts(publishAllPorts);
+		return this;
+	}
+	
+	@Override
+	public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) {
+		this.hostConfig.setRestartPolicy(restartPolicy);
+		return this;
+	}
+
+	@Override
+	public CreateContainerCmdImpl withStdInOnce(boolean stdInOnce) {
+		this.stdInOnce = stdInOnce;
+		return this;
+	}
 
-    @Override
+	@Override
+	public CreateContainerCmdImpl withStdinOpen(boolean stdinOpen) {
+		this.stdinOpen = stdinOpen;
+		return this;
+	}
+
+	@Override
+	public CreateContainerCmdImpl withTty(boolean tty) {
+		this.tty = tty;
+		return this;
+	}
+
+	@Override
+	public CreateContainerCmdImpl withUser(String user) {
+		this.user = user;
+		return this;
+	}
+
+	@Override
+	public CreateContainerCmdImpl withVolumes(Volume... volumes) {
+		this.volumes = new Volumes(volumes);
+		return this;
+	}
+
+	@Override
 	public CreateContainerCmdImpl withVolumesFrom(VolumesFrom... volumesFrom) {
-        this.hostConfig.setVolumesFrom(volumesFrom);
-        return this;
-    }
-
-    @Override
-    public HostConfig getHostConfig() {
-    	return hostConfig;
-    }
-    
-    @Override
-    public CreateContainerCmd withHostConfig(HostConfig hostConfig) {
-    	checkNotNull(hostConfig, "no host config was specified");
-    	this.hostConfig = hostConfig;
-    	return this;
-    }
-    
-    @Override
-    public Capability[] getCapAdd() {
-        return hostConfig.getCapAdd();
-    }
-
-    @Override
-    public CreateContainerCmd withCapAdd(Capability... capAdd) {
-        hostConfig.setCapAdd(capAdd);
-        return this;
-    }
-
-    @Override
-    public Capability[] getCapDrop() {
-        return hostConfig.getCapDrop();
-    }
-
-    @Override
-    public CreateContainerCmd withCapDrop(Capability... capDrop) {
-        hostConfig.setCapDrop(capDrop);
-        return this;
-    }
-
-	@Override
-    public String toString() {
-        return new ToStringBuilder(this).append("create container ")
-            .append(name != null ? "name=" + name + " " : "")
-            .append(this)
-            .toString();
-    }
-    
-    /**
-     * @throws NotFoundException No such container
-     * @throws ConflictException Named container already exists
-     */
-	@Override
-    public CreateContainerResponse exec() throws NotFoundException, ConflictException {
-    	return super.exec();
-    }
-
-}    
+		this.hostConfig.setVolumesFrom(volumesFrom);
+		return this;
+	}
+
+	@Override
+	public CreateContainerCmdImpl withWorkingDir(String workingDir) {
+		this.workingDir = workingDir;
+		return this;
+	}
+
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index ba05b2687..f652c5700 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.api.model.Capability.*;
+import static com.github.dockerjava.api.model.Capability.MKNOD;
+import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
@@ -10,6 +11,8 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.startsWith;
 
 import java.lang.reflect.Method;
 import java.security.SecureRandom;
@@ -28,9 +31,12 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.Device;
+import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Link;
-import com.github.dockerjava.api.model.Links;
+import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.client.AbstractDockerClientTest;
@@ -99,7 +105,7 @@ public void createContainerWithVolume() throws DockerException {
 		assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(),
 				contains("/var/log"));
 	}
-
+	
 	@Test
 	public void createContainerWithVolumesFrom() throws DockerException {
 
@@ -111,11 +117,12 @@ public void createContainerWithVolumesFrom() throws DockerException {
 		// create a running container with bind mounts
 		CreateContainerResponse container1 = dockerClient
 				.createContainerCmd("busybox").withCmd("sleep", "9999")
-				.withName(container1Name).exec();
+				.withName(container1Name)
+				.withBinds(new Bind("/src/webapp1", volume1), new Bind("/src/webapp2", volume2))
+				.exec();
 		LOG.info("Created container1 {}", container1.toString());
 
-		dockerClient.startContainerCmd(container1.getId()).withBinds(
-				new Bind("/src/webapp1", volume1), new Bind("/src/webapp2", volume2)).exec();
+		dockerClient.startContainerCmd(container1.getId()).exec();
 		LOG.info("Started container1 {}", container1.toString());
 
 		InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(
@@ -238,7 +245,7 @@ public void createContainerWithLink() throws DockerException {
 		assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
 
 		HostConfig hostConfig = new HostConfig();
-		hostConfig.setLinks(new Links(new Link("container1", "container1Link")));
+		hostConfig.setLinks(new Link("container1", "container1Link"));
 		CreateContainerResponse container2 = dockerClient
 				.createContainerCmd("busybox").withName("container2").withHostConfig(hostConfig)
 				.withCmd("env").exec();
@@ -247,7 +254,7 @@ public void createContainerWithLink() throws DockerException {
 
 		InspectContainerResponse inspectContainerResponse2 = dockerClient
 				.inspectContainerCmd(container2.getId()).exec();
-		assertThat(inspectContainerResponse2.getHostConfig().getLinks().getLinks(), equalTo(new Link[] {new Link("container1","container1Link")}));
+		assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link("container1","container1Link")}));
 	}
 
 	@Test
@@ -333,5 +340,174 @@ public void createContainerWithExtraHosts() throws DockerException {
 		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getExtraHosts()),
 				containsInAnyOrder("dockerhost:127.0.0.1", "otherhost:10.0.0.1"));
 	}
+	
+	@Test
+	public void createContainerWithDevices() throws DockerException {
+
+		CreateContainerResponse container = dockerClient
+				.createContainerCmd("busybox").withCmd("sleep", "9999")
+				.withDevices(new Device("rwm", "/dev/nulo", "/dev/zero"))
+				.exec();
+
+		LOG.info("Created container {}", container.toString());
+
+		assertThat(container.getId(), not(isEmptyString()));
+
+		InspectContainerResponse inspectContainerResponse = dockerClient
+				.inspectContainerCmd(container.getId()).exec();
+
+		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig()
+				.getDevices()), contains(new Device("rwm", "/dev/nulo",
+				"/dev/zero")));
+	}
+	
+	@Test
+	public void createContainerWithPortBindings() throws DockerException {
+
+		ExposedPort tcp22 = ExposedPort.tcp(22);
+		ExposedPort tcp23 = ExposedPort.tcp(23);
+		
+		Ports portBindings = new Ports();
+		portBindings.bind(tcp22, Ports.Binding(11022));
+		portBindings.bind(tcp23, Ports.Binding(11023));
+		portBindings.bind(tcp23, Ports.Binding(11024));
+
+		CreateContainerResponse container = dockerClient
+				.createContainerCmd("busybox").withCmd("true")
+				.withExposedPorts(tcp22, tcp23)
+				.withPortBindings(portBindings)
+				.exec();
+
+		LOG.info("Created container {}", container.toString());
+
+		assertThat(container.getId(), not(isEmptyString()));
+
+		InspectContainerResponse inspectContainerResponse = dockerClient
+				.inspectContainerCmd(container.getId()).exec();
+
+		assertThat(Arrays.asList(inspectContainerResponse.getConfig()
+				.getExposedPorts()), contains(tcp22, tcp23));
+
+		assertThat(inspectContainerResponse.getHostConfig().getPortBindings()
+				.getBindings().get(tcp22)[0], is(equalTo(Ports.Binding(11022))));
+
+		assertThat(inspectContainerResponse.getHostConfig().getPortBindings()
+				.getBindings().get(tcp23)[0], is(equalTo(Ports.Binding(11023))));
+
+		assertThat(inspectContainerResponse.getHostConfig().getPortBindings()
+				.getBindings().get(tcp23)[1], is(equalTo(Ports.Binding(11024))));
+
+	}
+	
+	@Test
+	public void createContainerWithLinking() throws DockerException {
+
+		CreateContainerResponse container1 = dockerClient
+				.createContainerCmd("busybox")
+				.withCmd("sleep", "9999")
+				.withName("container1").exec();
+
+		LOG.info("Created container1 {}", container1.toString());
+		assertThat(container1.getId(), not(isEmptyString()));
+
+		dockerClient.startContainerCmd(container1.getId()).exec();
+
+		InspectContainerResponse inspectContainerResponse1 = dockerClient
+				.inspectContainerCmd(container1.getId()).exec();
+		LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
+
+		assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
+		assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
+		assertThat(inspectContainerResponse1.getId(),
+				startsWith(container1.getId()));
+		assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
+		assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
+		assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
+		assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
+
+		if (!inspectContainerResponse1.getState().isRunning()) {
+			assertThat(inspectContainerResponse1.getState().getExitCode(),
+					is(equalTo(0)));
+		}
+
+		CreateContainerResponse container2 = dockerClient
+				.createContainerCmd("busybox").withCmd("sleep", "9999")
+				.withName("container2")
+				.withLinks(new Link("container1", "container1Link"))
+				.exec();
+
+		LOG.info("Created container2 {}", container2.toString());
+		assertThat(container2.getId(), not(isEmptyString()));
+		
+		InspectContainerResponse inspectContainerResponse2 = dockerClient
+				.inspectContainerCmd(container2.getId()).exec();
+		LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
+
+		assertThat(inspectContainerResponse2.getConfig(), is(notNullValue()));
+		assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
+		assertThat(inspectContainerResponse2.getHostConfig(),
+				is(notNullValue()));
+		assertThat(inspectContainerResponse2.getHostConfig().getLinks(),
+				is(notNullValue()));
+		assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
+				"container1Link") }));
+		assertThat(inspectContainerResponse2.getId(),
+				startsWith(container2.getId()));
+		assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
+		assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
+		
+
+	}
+	
+	@Test
+	public void createContainerWithRestartPolicy() throws DockerException {
+
+		RestartPolicy restartPolicy = RestartPolicy.onFailureRestart(5);
+		
+		CreateContainerResponse container = dockerClient
+				.createContainerCmd("busybox")
+				.withCmd("sleep", "9999")
+				.withRestartPolicy(restartPolicy)
+				.exec();
+
+		LOG.info("Created container {}", container.toString());
+
+		assertThat(container.getId(), not(isEmptyString()));
+
+		InspectContainerResponse inspectContainerResponse = dockerClient
+				.inspectContainerCmd(container.getId()).exec();
+
+		assertThat(inspectContainerResponse.getHostConfig().getRestartPolicy(),
+				is(equalTo(restartPolicy)));
+	}
+
+	/**
+	 * This tests support for --net option for the docker run command:
+	 * --net="bridge" Set the Network mode for the container 'bridge': creates a
+	 * new network stack for the container on the docker bridge 'none': no
+	 * networking for this container 'container:': reuses another container
+	 * network stack 'host': use the host network stack inside the container.
+	 * Note: the host mode gives the container full access to local system
+	 * services such as D-bus and is therefore considered insecure.
+	 */
+	@Test
+	public void createContainerWithNetworkMode() throws DockerException {
 
+		CreateContainerResponse container = dockerClient
+				.createContainerCmd("busybox")
+				.withCmd("true")
+				.withNetworkMode("host")
+				.exec();
+
+		LOG.info("Created container {}", container.toString());
+
+		assertThat(container.getId(), not(isEmptyString()));
+
+		InspectContainerResponse inspectContainerResponse = dockerClient
+				.inspectContainerCmd(container.getId()).exec();
+
+		assertThat(inspectContainerResponse.getHostConfig().getNetworkMode(),
+				is(equalTo("host")));
+	}
+	
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index 37d805aa2..f7cbe20c3 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -253,7 +253,7 @@ public void startContainerWithConflictingPortBindings()
 	}
 
 	@Test
-	public void startContainerWithLinking() throws DockerException {
+	public void startContainerWithLinkingDeprecated() throws DockerException {
 
 		CreateContainerResponse container1 = dockerClient
 				.createContainerCmd("busybox").withCmd("sleep", "9999")
@@ -302,8 +302,71 @@ public void startContainerWithLinking() throws DockerException {
 				is(notNullValue()));
 		assertThat(inspectContainerResponse2.getHostConfig().getLinks(),
 				is(notNullValue()));
-		assertThat(inspectContainerResponse2.getHostConfig().getLinks()
-				.getLinks(), equalTo(new Link[] { new Link("container1",
+		assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
+				"container1Link") }));
+		assertThat(inspectContainerResponse2.getId(),
+				startsWith(container2.getId()));
+		assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
+		assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
+		assertThat(inspectContainerResponse2.getState(), is(notNullValue()));
+		assertThat(inspectContainerResponse2.getState().isRunning(), is(true));
+
+	}
+	
+	
+	@Test
+	public void startContainerWithLinking() throws DockerException {
+
+		CreateContainerResponse container1 = dockerClient
+				.createContainerCmd("busybox").withCmd("sleep", "9999")
+				.withName("container1").exec();
+
+		LOG.info("Created container1 {}", container1.toString());
+		assertThat(container1.getId(), not(isEmptyString()));
+
+		dockerClient.startContainerCmd(container1.getId()).exec();
+
+		InspectContainerResponse inspectContainerResponse1 = dockerClient
+				.inspectContainerCmd(container1.getId()).exec();
+		LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
+
+		assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
+		assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
+		assertThat(inspectContainerResponse1.getId(),
+				startsWith(container1.getId()));
+		assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
+		assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
+		assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
+		assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
+
+		if (!inspectContainerResponse1.getState().isRunning()) {
+			assertThat(inspectContainerResponse1.getState().getExitCode(),
+					is(equalTo(0)));
+		}
+
+		CreateContainerResponse container2 = dockerClient
+				.createContainerCmd("busybox").withCmd("sleep", "9999")
+				.withName("container2")
+				.withLinks(new Link("container1", "container1Link"))
+				.exec();
+
+		LOG.info("Created container2 {}", container2.toString());
+		assertThat(container2.getId(), not(isEmptyString()));
+
+		dockerClient.startContainerCmd(container2.getId())
+				.exec();
+
+		InspectContainerResponse inspectContainerResponse2 = dockerClient
+				.inspectContainerCmd(container2.getId()).exec();
+		LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
+
+		assertThat(inspectContainerResponse2.getConfig(), is(notNullValue()));
+		assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
+		assertThat(inspectContainerResponse2.getHostConfig(),
+				is(notNullValue()));
+		assertThat(inspectContainerResponse2.getHostConfig().getLinks(),
+				is(notNullValue()));
+		assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
 				"container1Link") }));
 		assertThat(inspectContainerResponse2.getId(),
 				startsWith(container2.getId()));

From d26024ca1a3a907b56b01425ba4cae9e13086ff7 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 7 Apr 2015 21:25:13 +0200
Subject: [PATCH 0009/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1b319a7d..9be899ace 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@ Change Log
 ===
 Latest SNAPSHOT
 ---
-
+* [#193](https://github.com/docker-java/docker-java/pull/193) Add HostConfig related methods from start command to create command
 * [#192](https://github.com/docker-java/docker-java/pull/192) Added a Links constructor accepting a List object
 
 v1.1.0

From 2549f57afad7282691c3abad9df4baf449ba18c6 Mon Sep 17 00:00:00 2001
From: Emir Dizdarevic <emirr.dizdarevic@gmail.com>
Date: Tue, 7 Apr 2015 22:50:50 +0200
Subject: [PATCH 0010/1272]  * Fixed remove intermediate containers bug on
 build goal - it was always set to true

---
 .../java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index f67b1f9d8..b5ea85ed2 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -46,8 +46,8 @@ protected ResponseImpl execute(BuildImageCmd command) {
 		if (command.hasNoCacheEnabled()) {
 			webResource = webResource.queryParam("nocache", "true");
 		}
-		if (command.hasRemoveEnabled()) {
-			webResource = webResource.queryParam("rm", "true");
+		if (!command.hasRemoveEnabled()) {
+			webResource = webResource.queryParam("rm", "false");
 		}
 		if (command.isQuiet()) {
 			webResource = webResource.queryParam("q", "true");

From 0f847c929535dfe73349e31c75a8604f39bc3eeb Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Wed, 8 Apr 2015 19:58:37 +0200
Subject: [PATCH 0011/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9be899ace..b38c17d14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@ Change Log
 ===
 Latest SNAPSHOT
 ---
+* [#194](https://github.com/docker-java/docker-java/pull/194) Fixed remove intermediate containers bug on build goal
 * [#193](https://github.com/docker-java/docker-java/pull/193) Add HostConfig related methods from start command to create command
 * [#192](https://github.com/docker-java/docker-java/pull/192) Added a Links constructor accepting a List object
 

From 6ab93b4337e9e489d92abc9cd25f782d0b17c870 Mon Sep 17 00:00:00 2001
From: Chun Chen <chenchun.feed@gmail.com>
Date: Mon, 13 Apr 2015 12:58:55 +0800
Subject: [PATCH 0012/1272] Allow for null bindings

---
 .../github/dockerjava/api/model/Ports.java    | 40 ++++++++++++-------
 .../api/model/Ports_SerializingTest.java      | 17 ++++++++
 .../api/model/Ports_addBindingsTest.java      |  9 +++++
 3 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/Ports.java b/src/main/java/com/github/dockerjava/api/model/Ports.java
index d7c8a3245..0c2df94ad 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -75,7 +75,11 @@ public void bind(ExposedPort exposedPort, Binding binding) {
             Binding[] bindings = ports.get(exposedPort);
             ports.put(exposedPort, (Binding[]) ArrayUtils.add(bindings, binding));
         } else {
-            ports.put(exposedPort, new Binding[]{binding});
+            if (binding == null) {
+                ports.put(exposedPort, null);
+            } else {
+                ports.put(exposedPort, new Binding[]{binding});
+            }
         }
     }
 
@@ -282,12 +286,16 @@ public Ports deserialize(JsonParser jsonParser, DeserializationContext deseriali
 
                 Map.Entry<String, JsonNode> portNode = it.next();
                 JsonNode bindingsArray = portNode.getValue();
-                for (int i = 0; i < bindingsArray.size(); i++) {
-                    JsonNode bindingNode = bindingsArray.get(i);
-                    if (!bindingNode.equals(NullNode.getInstance())) {
-                        String hostIp = bindingNode.get("HostIp").textValue();
-                        int hostPort = bindingNode.get("HostPort").asInt();
-                        out.bind(ExposedPort.parse(portNode.getKey()), new Binding(hostIp, hostPort));
+                if (bindingsArray.equals(NullNode.getInstance())) {
+                    out.bind(ExposedPort.parse(portNode.getKey()), null);
+                } else {
+                    for (int i = 0; i < bindingsArray.size(); i++) {
+                        JsonNode bindingNode = bindingsArray.get(i);
+                        if (!bindingNode.equals(NullNode.getInstance())) {
+                            String hostIp = bindingNode.get("HostIp").textValue();
+                            int hostPort = bindingNode.get("HostPort").asInt();
+                            out.bind(ExposedPort.parse(portNode.getKey()), new Binding(hostIp, hostPort));
+                        }
                     }
                 }
             }
@@ -304,14 +312,18 @@ public void serialize(Ports portBindings, JsonGenerator jsonGen,
             jsonGen.writeStartObject();
             for(Entry<ExposedPort, Binding[]> entry : portBindings.getBindings().entrySet()){
                 jsonGen.writeFieldName(entry.getKey().toString());
-                jsonGen.writeStartArray();
-                for (Binding binding : entry.getValue()) {
-                    jsonGen.writeStartObject();
-                    jsonGen.writeStringField("HostIp", binding.getHostIp() == null ? "" : binding.getHostIp());
-                    jsonGen.writeStringField("HostPort", binding.getHostPort() == null ? "" : binding.getHostPort().toString());
-                    jsonGen.writeEndObject();
+                if (entry.getValue() != null) {
+                    jsonGen.writeStartArray();
+                    for (Binding binding : entry.getValue()) {
+                        jsonGen.writeStartObject();
+                        jsonGen.writeStringField("HostIp", binding.getHostIp() == null ? "" : binding.getHostIp());
+                        jsonGen.writeStringField("HostPort", binding.getHostPort() == null ? "" : binding.getHostPort().toString());
+                        jsonGen.writeEndObject();
+                    }
+                    jsonGen.writeEndArray();
+                } else {
+                    jsonGen.writeNull();
                 }
-                jsonGen.writeEndArray();
             }
             jsonGen.writeEndObject();
         }
diff --git a/src/test/java/com/github/dockerjava/api/model/Ports_SerializingTest.java b/src/test/java/com/github/dockerjava/api/model/Ports_SerializingTest.java
index 259310698..9190eefd2 100644
--- a/src/test/java/com/github/dockerjava/api/model/Ports_SerializingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/Ports_SerializingTest.java
@@ -13,6 +13,7 @@ public class Ports_SerializingTest {
 	private final ObjectMapper objectMapper = new ObjectMapper();
 	private final String jsonWithDoubleBindingForOnePort = 
 			"{\"80/tcp\":[{\"HostIp\":\"10.0.0.1\",\"HostPort\":\"80\"},{\"HostIp\":\"10.0.0.2\",\"HostPort\":\"80\"}]}";
+	private final String jsonWithNullBindingForOnePort = "{\"80/tcp\":null}";
 
 	@Test
 	public void deserializingPortWithMultipleBindings() throws Exception {
@@ -39,4 +40,20 @@ public void serializingEmptyBinding() throws Exception {
 		Ports ports = new Ports(ExposedPort.tcp(80), new Binding(null, null));
 		assertEquals(objectMapper.writeValueAsString(ports), "{\"80/tcp\":[{\"HostIp\":\"\",\"HostPort\":\"\"}]}");
 	}
+
+	@Test
+	public void deserializingPortWithNullBindings() throws Exception {
+		Ports ports = objectMapper.readValue(jsonWithNullBindingForOnePort, Ports.class);
+		Map<ExposedPort, Binding[]> map = ports.getBindings();
+		assertEquals(map.size(), 1);
+
+		assertEquals(map.get(ExposedPort.tcp(80)), null);
+	}
+
+	@Test
+	public void serializingWithNullBindings() throws Exception {
+		Ports ports = new Ports();
+		ports.bind(ExposedPort.tcp(80), null);
+		assertEquals(objectMapper.writeValueAsString(ports), jsonWithNullBindingForOnePort);
+	}
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java b/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
index 20e47df9a..18c7f0f09 100644
--- a/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.model;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
 
 import java.util.Map;
 
@@ -54,4 +55,12 @@ public void addTwoBindingsForSameExposedPort() {
 		assertEquals(bindings.get(TCP_80), new Binding[] { BINDING_8080, BINDING_9090 });
 	}
 
+	@Test
+	public void addNullBindings() {
+		ports.add(new PortBinding(null, TCP_80));
+		Map<ExposedPort, Binding[]> bindings = ports.getBindings();
+		// one key with two values
+		assertEquals(bindings.size(), 1);
+		assertEquals(bindings.get(TCP_80), null);
+	}
 }

From 80093ca8e74503d5e34c393d138da9c97c47f540 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 14 Apr 2015 21:42:33 +0200
Subject: [PATCH 0013/1272] Set to version 1.2.0-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 957c157c6..1dae4be51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>

From 8e2f6b3842209580a8f38592c80bde32f599821e Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 14 Apr 2015 21:44:14 +0200
Subject: [PATCH 0014/1272] [maven-release-plugin] prepare release
 docker-java-1.2.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1dae4be51..95938ea66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.2.0</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>docker-java-1.2.0</tag>
 	</scm>
 
 	<developers>

From 33b0ff5a5fec004c3392326383de8e03ed6e69cf Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 14 Apr 2015 21:44:20 +0200
Subject: [PATCH 0015/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 95938ea66..1279f9c11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>1.2.0</version>
+	<version>1.2.1-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>docker-java-1.2.0</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 065cd78ca16173657830ea8b72d6c13d6defdb5b Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 14 Apr 2015 21:52:18 +0200
Subject: [PATCH 0016/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b38c17d14..b7a386469 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@ Change Log
 ===
 Latest SNAPSHOT
 ---
+
+v1.2.0
+---
 * [#194](https://github.com/docker-java/docker-java/pull/194) Fixed remove intermediate containers bug on build goal
 * [#193](https://github.com/docker-java/docker-java/pull/193) Add HostConfig related methods from start command to create command
 * [#192](https://github.com/docker-java/docker-java/pull/192) Added a Links constructor accepting a List object

From bcdfd46c5728b0a51686727725236eb2d1c31720 Mon Sep 17 00:00:00 2001
From: Alex Collins <alex.e.c@gmail.com>
Date: Sat, 25 Apr 2015 12:51:21 +0100
Subject: [PATCH 0017/1272] Created FrameReader to assist reading frames from
 attach commands.

---
 .../github/dockerjava/api/model/Frame.java    | 47 ++++++++++++++
 .../dockerjava/api/model/StreamType.java      |  7 +++
 .../dockerjava/core/command/FrameReader.java  | 62 +++++++++++++++++++
 .../core/command/FrameReaderTest.java         | 57 +++++++++++++++++
 4 files changed, 173 insertions(+)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/Frame.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/StreamType.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/FrameReader.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java

diff --git a/src/main/java/com/github/dockerjava/api/model/Frame.java b/src/main/java/com/github/dockerjava/api/model/Frame.java
new file mode 100644
index 000000000..bf77a1334
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/Frame.java
@@ -0,0 +1,47 @@
+package com.github.dockerjava.api.model;
+
+import java.util.Arrays;
+
+/**
+ * Represents a logging frame.
+ */
+public class Frame {
+    private final StreamType streamType;
+    private final byte[] payload;
+
+    public Frame(StreamType streamType, byte[] payload) {
+        this.streamType = streamType;
+        this.payload = payload;
+    }
+
+    public StreamType getStreamType() {
+        return streamType;
+    }
+
+    public byte[] getPayload() {
+        return payload;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("%s %s", streamType, new String(payload));
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Frame frame = (Frame) o;
+
+        return Arrays.equals(payload, frame.payload) && streamType == frame.streamType;
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = streamType.hashCode();
+        result = 31 * result + Arrays.hashCode(payload);
+        return result;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/StreamType.java b/src/main/java/com/github/dockerjava/api/model/StreamType.java
new file mode 100644
index 000000000..eb11c5536
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/StreamType.java
@@ -0,0 +1,7 @@
+package com.github.dockerjava.api.model;
+
+public enum StreamType {
+    STDIN,
+    STDOUT,
+    STDERR
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
new file mode 100644
index 000000000..22a76de12
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
@@ -0,0 +1,62 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.StreamType;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Breaks the input into frame. Similar to how a buffered reader would readLies.
+ * <p/>
+ * See:  {@link }http://docs.docker.com/v1.6/reference/api/docker_remote_api_v1.13/#attach-to-a-container}
+ */
+public class FrameReader {
+
+    private static final int HEADER_SIZE = 8;
+    private final InputStream inputStream;
+
+    public FrameReader(InputStream inputStream) {
+        this.inputStream = inputStream;
+    }
+
+    private static StreamType streamType(byte streamType) {
+        switch (streamType) {
+            case 0:
+                return StreamType.STDIN;
+            case 1:
+                return StreamType.STDOUT;
+            case 2:
+                return StreamType.STDERR;
+            default:
+                throw new IllegalArgumentException("invalid streamType");
+        }
+    }
+
+    /**
+     * @return A frame, or null if no more frames.
+     */
+    public Frame readFrame() throws IOException {
+        byte[] header = new byte[HEADER_SIZE];
+        int headerSize = inputStream.read(header);
+
+        if (headerSize == -1) {
+            return null;
+        }
+
+        if (headerSize != HEADER_SIZE) {
+            throw new IOException(String.format("header must be %d bytes long, but was %d", HEADER_SIZE, headerSize));
+        }
+
+        int frameSize = (header[4] << 24) + (header[5] << 16) + (header[6] << HEADER_SIZE) + header[7];
+        int payloadSize = frameSize - header.length;
+
+        byte[] payload = new byte[payloadSize];
+        int actualPayloadSize = inputStream.read(payload);
+        if (actualPayloadSize != payloadSize) {
+            throw new IOException(String.format("payload must be %d bytes long, but was %d", payloadSize, actualPayloadSize));
+        }
+
+        return new Frame(streamType(header[0]), payload);
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
new file mode 100644
index 000000000..dc2d4c8fc
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
@@ -0,0 +1,57 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.StreamType;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+
+public class FrameReaderTest {
+    public static final int HEADER_SIZE = 8;
+    private final List<Integer> bytes = new ArrayList<>();
+    private final InputStream inputStream = new InputStream() {
+        @Override
+        public int read() throws IOException {
+            return bytes.isEmpty() ? -1 : bytes.remove(0);
+        }
+    };
+    private final FrameReader frameReader = new FrameReader(inputStream);
+
+    @Test
+    public void endOfStreamReturnsNull() throws Exception {
+        assertNull(nextFrame());
+    }
+
+    @Test
+    public void stdInBytesFrameReturnsFrame() throws Exception {
+        assertEquals(nextFrame(0, 0, 0, 0, 0, 0, 0, HEADER_SIZE), new Frame(StreamType.STDIN, new byte[0]));
+    }
+
+    private Frame nextFrame(int... bytes) throws IOException {
+        setBytes(bytes);
+        return frameReader.readFrame();
+    }
+
+    @Test
+    public void stdOutBytesFrameReturnsFrame() throws Exception {
+        assertEquals(nextFrame(1, 0, 0, 0, 0, 0, 0, HEADER_SIZE), new Frame(StreamType.STDOUT, new byte[0]));
+    }
+
+    @Test
+    public void stdErrBytesFrameReturnsFrame() throws Exception {
+        assertEquals(nextFrame(2, 0, 0, 0, 0, 0, 0, HEADER_SIZE), new Frame(StreamType.STDERR, new byte[0]));
+    }
+
+    private void setBytes(int... bytes) {
+        this.bytes.clear();
+        for (int aByte : bytes) {
+            this.bytes.add(aByte);
+        }
+    }
+}
\ No newline at end of file

From 2b4d5ff0026b3e4739f94a9ca57c4a620c21c709 Mon Sep 17 00:00:00 2001
From: Alex Collins <alex.e.c@gmail.com>
Date: Sat, 25 Apr 2015 13:11:56 +0100
Subject: [PATCH 0018/1272] Created FrameReader to assist reading frames from
 attach commands.

---
 .../github/dockerjava/api/command/LogContainerCmd.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
index 74512b390..05e108550 100644
--- a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -1,9 +1,9 @@
 package com.github.dockerjava.api.command;
 
-import java.io.InputStream;
-
 import com.github.dockerjava.api.NotFoundException;
 
+import java.io.InputStream;
+
 /**
  * Get container logs
  *
@@ -18,6 +18,10 @@
  *            Defaults to false.
  * @param tail
  * 			  - `all` or `<number>`, Output specified number of lines at the end of logs
+ *
+ * Consider wrapping any input stream you get with a frame reader to make reading frame easier.
+ *
+ * @see com.github.dockerjava.core.command.FrameReader
  */
 public interface LogContainerCmd extends DockerCmd<InputStream>{
 

From 83943eb420b51c26802e05f386f7937249be908d Mon Sep 17 00:00:00 2001
From: Alex Collins <alex.e.c@gmail.com>
Date: Sat, 25 Apr 2015 13:25:41 +0100
Subject: [PATCH 0019/1272] Make FrameReader Closable.

---
 .../com/github/dockerjava/core/command/FrameReader.java  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
index 22a76de12..3dae2dd51 100644
--- a/src/main/java/com/github/dockerjava/core/command/FrameReader.java
+++ b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
@@ -11,7 +11,7 @@
  * <p/>
  * See:  {@link }http://docs.docker.com/v1.6/reference/api/docker_remote_api_v1.13/#attach-to-a-container}
  */
-public class FrameReader {
+public class FrameReader implements AutoCloseable {
 
     private static final int HEADER_SIZE = 8;
     private final InputStream inputStream;
@@ -48,7 +48,7 @@ public Frame readFrame() throws IOException {
             throw new IOException(String.format("header must be %d bytes long, but was %d", HEADER_SIZE, headerSize));
         }
 
-        int frameSize = (header[4] << 24) + (header[5] << 16) + (header[6] << HEADER_SIZE) + header[7];
+        int frameSize = (header[4] << 24) + (header[5] << 16) + (header[6] << 8) + header[7];
         int payloadSize = frameSize - header.length;
 
         byte[] payload = new byte[payloadSize];
@@ -59,4 +59,9 @@ public Frame readFrame() throws IOException {
 
         return new Frame(streamType(header[0]), payload);
     }
+
+    @Override
+    public void close() throws Exception {
+        inputStream.close();
+    }
 }

From 538d465d4bdf65997907a73c4825f83eded7d005 Mon Sep 17 00:00:00 2001
From: Alex Collins <alex.e.c@gmail.com>
Date: Sat, 25 Apr 2015 13:37:18 +0100
Subject: [PATCH 0020/1272] Made exception more specifi

---
 .../java/com/github/dockerjava/core/command/FrameReader.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
index 3dae2dd51..ac356da30 100644
--- a/src/main/java/com/github/dockerjava/core/command/FrameReader.java
+++ b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
@@ -61,7 +61,7 @@ public Frame readFrame() throws IOException {
     }
 
     @Override
-    public void close() throws Exception {
+    public void close() throws IOException {
         inputStream.close();
     }
 }

From 42514449ba9f343282125368fe3466109bed9601 Mon Sep 17 00:00:00 2001
From: Alex Collins <alex.e.c@gmail.com>
Date: Sat, 25 Apr 2015 23:56:59 +0100
Subject: [PATCH 0021/1272] Trim toString.

---
 src/main/java/com/github/dockerjava/api/model/Frame.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/Frame.java b/src/main/java/com/github/dockerjava/api/model/Frame.java
index bf77a1334..3860a5dba 100644
--- a/src/main/java/com/github/dockerjava/api/model/Frame.java
+++ b/src/main/java/com/github/dockerjava/api/model/Frame.java
@@ -24,7 +24,7 @@ public byte[] getPayload() {
 
     @Override
     public String toString() {
-        return String.format("%s %s", streamType, new String(payload));
+        return String.format("%s: %s", streamType, new String(payload).trim());
     }
 
     @Override

From 559e6c18d1051e2a4329f1e2b1d43bb965ced43f Mon Sep 17 00:00:00 2001
From: Alex Collins <alex.e.c@gmail.com>
Date: Sat, 25 Apr 2015 23:57:53 +0100
Subject: [PATCH 0022/1272] Fixed bug in header.

---
 .../java/com/github/dockerjava/core/command/FrameReader.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
index ac356da30..c39791460 100644
--- a/src/main/java/com/github/dockerjava/core/command/FrameReader.java
+++ b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
@@ -48,8 +48,7 @@ public Frame readFrame() throws IOException {
             throw new IOException(String.format("header must be %d bytes long, but was %d", HEADER_SIZE, headerSize));
         }
 
-        int frameSize = (header[4] << 24) + (header[5] << 16) + (header[6] << 8) + header[7];
-        int payloadSize = frameSize - header.length;
+        int payloadSize = ((header[4] & 0xff) << 24) + ((header[5] & 0xff) << 16) + ((header[6] & 0xff) << 8) + (header[7] & 0xff);
 
         byte[] payload = new byte[payloadSize];
         int actualPayloadSize = inputStream.read(payload);

From 1e1e7e87b249ee524e9d22cb28d67739089ba1ca Mon Sep 17 00:00:00 2001
From: Alex Collins <alex.e.c@gmail.com>
Date: Sun, 26 Apr 2015 00:02:14 +0100
Subject: [PATCH 0023/1272] Updated FrameReaderTest.

---
 .../com/github/dockerjava/core/command/FrameReaderTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
index dc2d4c8fc..2b5e2b644 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
@@ -30,7 +30,7 @@ public void endOfStreamReturnsNull() throws Exception {
 
     @Test
     public void stdInBytesFrameReturnsFrame() throws Exception {
-        assertEquals(nextFrame(0, 0, 0, 0, 0, 0, 0, HEADER_SIZE), new Frame(StreamType.STDIN, new byte[0]));
+        assertEquals(nextFrame(0, 0, 0, 0, 0, 0, 0, 0), new Frame(StreamType.STDIN, new byte[0]));
     }
 
     private Frame nextFrame(int... bytes) throws IOException {
@@ -40,12 +40,12 @@ private Frame nextFrame(int... bytes) throws IOException {
 
     @Test
     public void stdOutBytesFrameReturnsFrame() throws Exception {
-        assertEquals(nextFrame(1, 0, 0, 0, 0, 0, 0, HEADER_SIZE), new Frame(StreamType.STDOUT, new byte[0]));
+        assertEquals(nextFrame(1, 0, 0, 0, 0, 0, 0, 0), new Frame(StreamType.STDOUT, new byte[0]));
     }
 
     @Test
     public void stdErrBytesFrameReturnsFrame() throws Exception {
-        assertEquals(nextFrame(2, 0, 0, 0, 0, 0, 0, HEADER_SIZE), new Frame(StreamType.STDERR, new byte[0]));
+        assertEquals(nextFrame(2, 0, 0, 0, 0, 0, 0, 0), new Frame(StreamType.STDERR, new byte[0]));
     }
 
     private void setBytes(int... bytes) {

From 15b388ea15255d9d69baea83093fd8f83acf59d6 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Mon, 27 Apr 2015 21:29:56 +0200
Subject: [PATCH 0024/1272] Added 'MacAddress' option to create command

---
 .../api/command/CreateContainerCmd.java       |  9 +++++--
 .../core/command/CreateContainerCmdImpl.java  | 24 ++++++++++++++-----
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index a2a6dc85f..708e3139a 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -14,6 +14,7 @@
 import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
+import com.github.dockerjava.core.command.CreateContainerCmdImpl;
 
 public interface CreateContainerCmd extends DockerCmd<CreateContainerResponse>{
 
@@ -63,6 +64,8 @@ public CreateContainerResponse exec() throws NotFoundException,
 	public Link[] getLinks();
 	
 	public LxcConf[] getLxcConf();
+	
+	public String getMacAddress();
 
 	public long getMemoryLimit();
 
@@ -92,7 +95,7 @@ public CreateContainerResponse exec() throws NotFoundException,
 
 	public boolean isAttachStdout();
 
-	public boolean isDisableNetwork();
+	public boolean isNetworkDisabled();
 	
 	public Boolean isPrivileged();
 	
@@ -139,7 +142,7 @@ public CreateContainerResponse exec() throws NotFoundException,
 	 */
 	public CreateContainerCmd withDevices(Device... devices);
 
-	public CreateContainerCmd withDisableNetwork(boolean disableNetwork);
+	public CreateContainerCmd withNetworkDisabled(boolean disableNetwork);
 
 	/**
 	 * Set custom DNS servers
@@ -237,4 +240,6 @@ public CreateContainerResponse exec() throws NotFoundException,
 	
 	public CreateContainerCmd withWorkingDir(String workingDir);
 
+	public CreateContainerCmd withMacAddress(String macAddress);
+
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 5afd0dbb8..18b089d4d 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -74,8 +74,10 @@ public class CreateContainerCmdImpl extends
 	private Volumes volumes = new Volumes();
 	@JsonProperty("WorkingDir")
 	private String workingDir = "";
-	@JsonProperty("DisableNetwork")
-	private boolean disableNetwork = false;
+	@JsonProperty("MacAddress")
+	private String macAddress;
+	@JsonProperty("NetworkDisabled")
+	private boolean networkDisabled = false;
 	@JsonProperty("ExposedPorts")
 	private ExposedPorts exposedPorts = new ExposedPorts();
 	@JsonProperty("HostConfig")
@@ -196,6 +198,10 @@ public Link[] getLinks() {
 	public LxcConf[] getLxcConf() {
 		return hostConfig.getLxcConf();
 	}
+	
+	public String getMacAddress() {
+		return macAddress;
+	}
 
 	@Override
 	public long getMemoryLimit() {
@@ -273,8 +279,8 @@ public boolean isAttachStdout() {
 	}
 
 	@Override
-	public boolean isDisableNetwork() {
-		return disableNetwork;
+	public boolean isNetworkDisabled() {
+		return networkDisabled;
 	}
 
 	@Override
@@ -372,8 +378,8 @@ public CreateContainerCmd withDevices(Device... devices) {
 	}
 
 	@Override
-	public CreateContainerCmdImpl withDisableNetwork(boolean disableNetwork) {
-		this.disableNetwork = disableNetwork;
+	public CreateContainerCmdImpl withNetworkDisabled(boolean disableNetwork) {
+		this.networkDisabled = disableNetwork;
 		return this;
 	}
 
@@ -445,6 +451,12 @@ public CreateContainerCmd withLxcConf(LxcConf... lxcConf) {
 		this.hostConfig.setLxcConf(lxcConf);
 		return this;
 	}
+	
+	@Override
+	public CreateContainerCmdImpl withMacAddress(String macAddress) {
+		this.macAddress = macAddress;
+		return this;
+	}
 
 	@Override
 	public CreateContainerCmdImpl withMemoryLimit(long memoryLimit) {

From e3e6ce87ff59616347008398a6daa8b8beeae063 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Mon, 27 Apr 2015 21:42:02 +0200
Subject: [PATCH 0025/1272] Added 'MacAddress' to inspect container response.

---
 .../dockerjava/api/model/ContainerConfig.java |  7 +++++++
 .../command/CreateContainerCmdImplTest.java   | 20 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
index b15d5ca86..dcb1256b0 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
@@ -51,6 +51,9 @@ public class ContainerConfig {
 	@JsonProperty("Image")
 	private String image;
 
+	@JsonProperty("MacAddress")
+	private String macAddress;
+	
 	@JsonProperty("Memory")
 	private long memoryLimit = 0;
 
@@ -124,6 +127,10 @@ public boolean isStdinOpen() {
 	public boolean isStdInOnce() {
 		return stdInOnce;
 	}
+	
+	public String getMacAddress() {
+		return macAddress;
+	}
 
 	public long getMemoryLimit() {
 		return memoryLimit;
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index f652c5700..53337129d 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -510,4 +510,24 @@ public void createContainerWithNetworkMode() throws DockerException {
 				is(equalTo("host")));
 	}
 	
+	@Test
+	public void createContainerWithMacAddress() throws DockerException {
+
+		CreateContainerResponse container = dockerClient
+				.createContainerCmd("busybox")
+				.withMacAddress("00:80:41:ae:fd:7e")
+				.withCmd("true")
+				.exec();
+
+		LOG.info("Created container {}", container.toString());
+
+		assertThat(container.getId(), not(isEmptyString()));
+
+		InspectContainerResponse inspectContainerResponse = dockerClient
+				.inspectContainerCmd(container.getId()).exec();
+
+		assertEquals(inspectContainerResponse.getConfig().getMacAddress(),
+				"00:80:41:ae:fd:7e");
+	}
+	
 }

From 8534b78f68653196f441c9c756df5bb3c47e8b4e Mon Sep 17 00:00:00 2001
From: Emir Dizdarevic <emirr.dizdarevic@gmail.com>
Date: Tue, 28 Apr 2015 13:55:02 +0200
Subject: [PATCH 0026/1272]  * Added support to use Auth for mutiple repos
 during build

---
 .../dockerjava/core/AuthConfigFile.java       | 10 +++++++
 .../dockerjava/core/DockerClientConfig.java   | 19 +++++++++++++
 .../dockerjava/core/DockerClientImpl.java     | 28 +++++++++++++------
 3 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
index 24c7aa5cf..862259a8e 100644
--- a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
+++ b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
@@ -7,6 +7,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.github.dockerjava.api.model.AuthConfigurations;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
@@ -50,6 +51,15 @@ public AuthConfig resolveAuthConfig(String hostname) {
         return null;
     }
 
+    public AuthConfigurations getAuthConfigurations() {
+        final AuthConfigurations authConfigurations = new AuthConfigurations();
+        for(Map.Entry<String, AuthConfig> authConfigEntry : authConfigMap.entrySet()) {
+            authConfigurations.addConfig(authConfigEntry.getValue());
+        }
+
+        return authConfigurations;
+    }
+
     @Override
     public int hashCode() {
         final int prime = 31;
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index 05491ec6f..7e0b57b0e 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -14,6 +14,7 @@
 
 import com.github.dockerjava.api.DockerClientException;
 import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.core.NameParser.HostnameReposName;
 import com.github.dockerjava.core.NameParser.ReposTag;
 
@@ -310,6 +311,24 @@ public AuthConfig effectiveAuthConfig(String imageName) {
 		return authConfig;
 	}
 
+    public AuthConfigurations getAuthConfigurations() {
+        String dockerCfgFile = getDockerCfgPath();
+        if (dockerCfgFile != null) {
+            AuthConfigFile authConfigFile;
+            try {
+                authConfigFile = AuthConfigFile.loadConfig(new File(
+                        dockerCfgFile));
+            } catch (IOException e) {
+                throw new DockerClientException(
+                        "Failed to parse dockerCfgFile", e);
+            }
+
+            return authConfigFile.getAuthConfigurations();
+        }
+
+        return new AuthConfigurations();
+    }
+
   @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 534c58ebf..7e96225f8 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -10,12 +10,13 @@
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.*;
 import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.api.model.Identifier;
 import com.github.dockerjava.core.command.*;
 
 /**
  * @author Konstantin Pelykh (kpelykh@gmail.com)
- * 
+ *
  * @see "https://github.com/docker/docker/blob/master/api/client/commands.go"
  */
 public class DockerClientImpl implements Closeable, DockerClient {
@@ -291,20 +292,29 @@ public CommitCmd commitCmd(String containerId) {
 
     @Override
     public BuildImageCmd buildImageCmd() {
-        return new BuildImageCmdImpl(getDockerCmdExecFactory()
-                .createBuildImageCmdExec());
+        return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory()
+                .createBuildImageCmdExec()));
     }
 
 	@Override
 	public BuildImageCmd buildImageCmd(File dockerFileOrFolder) {
-		return new BuildImageCmdImpl(getDockerCmdExecFactory()
-				.createBuildImageCmdExec(), dockerFileOrFolder);
+		return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory()
+				.createBuildImageCmdExec(), dockerFileOrFolder));
 	}
 
-	@Override
-	public BuildImageCmd buildImageCmd(InputStream tarInputStream) {
-		return new BuildImageCmdImpl(getDockerCmdExecFactory()
-				.createBuildImageCmdExec(), tarInputStream);
+    @Override
+    public BuildImageCmd buildImageCmd(InputStream tarInputStream) {
+        return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory()
+				.createBuildImageCmdExec(), tarInputStream));
+    }
+
+	private BuildImageCmd augmentBuildImageCmd(BuildImageCmd buildImageCmd) {
+		final AuthConfigurations authConfigurations = dockerClientConfig.getAuthConfigurations();
+		if (!authConfigurations.getConfigs().isEmpty()) {
+			buildImageCmd.withBuildAuthConfigs(authConfigurations);
+		}
+
+		return buildImageCmd;
 	}
 
 	@Override

From 2bc290dd962e32c0c3c1222248311f134ec5a1b9 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 28 Apr 2015 17:36:45 +0200
Subject: [PATCH 0027/1272] Fix createContainerWithEnv test

---
 .../dockerjava/core/command/CreateContainerCmdImplTest.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 53337129d..752f0aefc 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -172,8 +172,7 @@ public void createContainerWithEnv() throws DockerException {
 
 		assertThat(
 				Arrays.asList(inspectContainerResponse.getConfig().getEnv()),
-				containsInAnyOrder("VARIABLE=success",
-						"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"));
+				containsInAnyOrder("VARIABLE=success"));
 
 		dockerClient.startContainerCmd(container.getId()).exec();
 

From 0d9e8a44a67bf59c4359af81528b2c7262aef4ac Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 28 Apr 2015 17:40:29 +0200
Subject: [PATCH 0028/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7a386469..6ee13f6af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@ Change Log
 ===
 Latest SNAPSHOT
 ---
+* [#203](https://github.com/docker-java/docker-java/issues/203) Missing 'MacAddress' option in create container command
+* [#197](https://github.com/docker-java/docker-java/pull/197) Allow for null bindings
 
 v1.2.0
 ---

From db7040fd0d549771afe550d3a61fafd2714fb8d3 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 28 Apr 2015 21:43:11 +0200
Subject: [PATCH 0029/1272] Fix issue #202

---
 .../java/com/github/dockerjava/core/DockerClientBuilder.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
index 155b36bed..4aa7d5ac7 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
@@ -36,6 +36,9 @@ public static DockerClientBuilder getInstance(String serverUrl) {
 	}
 
 	public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() {
+		// clearing the cache is needed because otherwise we will get
+		// the same DockerCmdExecFactory instance each time
+		serviceLoader.reload();
 		if(!serviceLoader.iterator().hasNext()) {
 			throw new RuntimeException("Fatal: Can't find any implementation of '" + DockerCmdExecFactory.class.getName() +  "' in the current classpath.");
 		}

From fdb9e77ef0c1aee95293f9f17a896a59747b380c Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sat, 2 May 2015 00:33:14 +0200
Subject: [PATCH 0030/1272] Fix issue #205

---
 .../api/command/InspectContainerResponse.java |   6 +-
 .../dockerjava/api/model/AccessMode.java      |   8 ++
 .../com/github/dockerjava/api/model/Bind.java |   6 +-
 .../github/dockerjava/api/model/Volume.java   |  62 +---------
 .../github/dockerjava/api/model/VolumeRW.java | 115 ++++++++++++++++++
 .../github/dockerjava/api/model/Volumes.java  |   7 +-
 .../dockerjava/api/model/VolumesRW.java       |  57 +++++++++
 .../dockerjava/api/model/VolumeTest.java      |   4 +-
 .../command/CreateContainerCmdImplTest.java   |  38 +++++-
 .../command/StartContainerCmdImplTest.java    |   5 +-
 10 files changed, 235 insertions(+), 73 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/VolumeRW.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/VolumesRW.java

diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index c86e13c54..f95656899 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -77,7 +77,7 @@ public class InspectContainerResponse {
     private VolumeBinds volumes;
 
     @JsonProperty("VolumesRW")
-    private Volumes volumesRW;
+    private VolumesRW volumesRW;
 
     public String getId() {
         return id;
@@ -125,8 +125,8 @@ public VolumeBind[] getVolumes() {
     }
 
     @JsonIgnore
-    public Volume[] getVolumesRW() {
-        return volumesRW.getVolumes();
+    public VolumeRW[] getVolumesRW() {
+        return volumesRW.getVolumesRW();
     }
 
     public String getHostnamePath() {
diff --git a/src/main/java/com/github/dockerjava/api/model/AccessMode.java b/src/main/java/com/github/dockerjava/api/model/AccessMode.java
index a1f53f57b..a893e7f38 100644
--- a/src/main/java/com/github/dockerjava/api/model/AccessMode.java
+++ b/src/main/java/com/github/dockerjava/api/model/AccessMode.java
@@ -15,6 +15,14 @@ public enum AccessMode {
 	 * The default {@link AccessMode}: {@link #rw}
 	 */
 	public static final AccessMode DEFAULT = rw;
+	
+	public static final AccessMode fromBoolean(boolean accessMode) {
+		return accessMode ? rw : ro;
+	}
+	
+	public final boolean toBoolean() {
+		return this.equals(AccessMode.rw) ? true: false;
+	}
 
 	
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Bind.java b/src/main/java/com/github/dockerjava/api/model/Bind.java
index eb0b8fd43..0071bff97 100644
--- a/src/main/java/com/github/dockerjava/api/model/Bind.java
+++ b/src/main/java/com/github/dockerjava/api/model/Bind.java
@@ -53,11 +53,11 @@ public static Bind parse(String serialized) {
 			String[] parts = serialized.split(":");
 			switch (parts.length) {
 			case 2: {
-				return new Bind(parts[0], Volume.parse(parts[1]));
+				return new Bind(parts[0], new Volume(parts[1]));
 			}
 			case 3: {
 				AccessMode accessMode = AccessMode.valueOf(parts[2].toLowerCase());
-				return new Bind(parts[0], Volume.parse(parts[1]), accessMode);
+				return new Bind(parts[0], new Volume(parts[1]), accessMode);
 			}
 			default: {
 				throw new IllegalArgumentException();
@@ -96,7 +96,7 @@ public int hashCode() {
 	 */
 	@Override
 	public String toString() {
-		return path + ":" + volume.toString() + ":" + accessMode.toString();
+		return path + ":" + volume.getPath() + ":" + accessMode.toString();
 	}
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Volume.java b/src/main/java/com/github/dockerjava/api/model/Volume.java
index 3ec5e24c7..131a9a56f 100644
--- a/src/main/java/com/github/dockerjava/api/model/Volume.java
+++ b/src/main/java/com/github/dockerjava/api/model/Volume.java
@@ -24,42 +24,18 @@
  * 
  * @see Bind
  */
-@JsonDeserialize(using = Volume.Deserializer.class)
-@JsonSerialize(using = Volume.Serializer.class)
 public class Volume {
 
 	private String path;
 	
-	private AccessMode accessMode = AccessMode.rw;
-
 	public Volume(String path) {
 		this.path = path;
 	}
-	
-	public Volume(String path, AccessMode accessMode) {
-		this.path = path;
-		this.accessMode = accessMode;
-	}
 
 	public String getPath() {
 		return path;
 	}
-	
-	public AccessMode getAccessMode() {
-		return accessMode;
-	}
 
-	public static Volume parse(String serialized) {
-		return new Volume(serialized);
-	}
-	
-	/**
-	 * Returns a string representation of this {@link Volume} suitable
-	 * for inclusion in a JSON message.
-	 * The returned String is simply the container path, {@link #getPath()}. 
-	 * 
-	 * @return a string representation of this {@link Volume}
-	 */
 	@Override
 	public String toString() {
 		return getPath();
@@ -69,48 +45,14 @@ public String toString() {
 	public boolean equals(Object obj) {
 		if (obj instanceof Volume) {
 			Volume other = (Volume) obj;
-			return new EqualsBuilder().append(path, other.getPath()).append(accessMode, other.getAccessMode())
-					.isEquals();
+			return new EqualsBuilder().append(path, other.getPath()).isEquals();
 		} else
 			return super.equals(obj);
 	}
 
 	@Override
 	public int hashCode() {
-		return new HashCodeBuilder().append(path).append(accessMode).toHashCode();
+		return new HashCodeBuilder().append(path).toHashCode();
 	}
-	
-	public static class Serializer extends JsonSerializer<Volume> {
-
-		@Override
-		public void serialize(Volume volume, JsonGenerator jsonGen,
-				SerializerProvider serProvider) throws IOException,
-				JsonProcessingException {
-
-			jsonGen.writeStartObject();
-			jsonGen.writeFieldName(volume.getPath());
-			jsonGen.writeString(Boolean.toString(volume.getAccessMode().equals(AccessMode.rw) ? true: false));
-			jsonGen.writeEndObject();
-		}
-
-	}
-
-	public static class Deserializer extends JsonDeserializer<Volume> {
-		@Override
-		public Volume deserialize(JsonParser jsonParser,
-				DeserializationContext deserializationContext)
-				throws IOException, JsonProcessingException {
-			ObjectCodec oc = jsonParser.getCodec();
-			JsonNode node = oc.readTree(jsonParser);
-			if (!node.equals(NullNode.getInstance())) {
-				Entry<String, JsonNode> field = node.fields().next();
-				return Volume.parse(field.getKey());
-			} else {
-				return null;
-			}
-		}
-	}
-
-	
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeRW.java b/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
new file mode 100644
index 000000000..717385d9e
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
@@ -0,0 +1,115 @@
+package com.github.dockerjava.api.model;
+
+import java.io.IOException;
+import java.util.Map.Entry;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.ObjectCodec;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.node.NullNode;
+
+/**
+ * Represents a bind mounted volume in a Docker container.
+ * 
+ * @see Bind
+ */
+@JsonDeserialize(using = VolumeRW.Deserializer.class)
+@JsonSerialize(using = VolumeRW.Serializer.class)
+public class VolumeRW {
+
+	private Volume volume;
+	
+	private AccessMode accessMode = AccessMode.rw;
+
+	public VolumeRW(Volume volume) {
+		this.volume = volume;
+	}
+	
+	public VolumeRW(Volume volume, AccessMode accessMode) {
+		this.volume = volume;
+		this.accessMode = accessMode;
+	}
+
+	public Volume getVolume() {
+		return volume;
+	}
+	
+	public AccessMode getAccessMode() {
+		return accessMode;
+	}
+
+	
+	/**
+	 * Returns a string representation of this {@link VolumeRW} suitable
+	 * for inclusion in a JSON message.
+	 * The returned String is simply the container path, {@link #getPath()}. 
+	 * 
+	 * @return a string representation of this {@link VolumeRW}
+	 */
+	@Override
+	public String toString() {
+		return getVolume() + ":" + getAccessMode();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (obj instanceof VolumeRW) {
+			VolumeRW other = (VolumeRW) obj;
+			return new EqualsBuilder().append(getVolume(), other.getVolume()).append(accessMode, other.getAccessMode())
+					.isEquals();
+		} else
+			return super.equals(obj);
+	}
+
+	@Override
+	public int hashCode() {
+		return new HashCodeBuilder().append(getVolume()).append(getAccessMode()).toHashCode();
+	}
+	
+	public static class Serializer extends JsonSerializer<VolumeRW> {
+
+		@Override
+		public void serialize(VolumeRW volumeRW, JsonGenerator jsonGen,
+				SerializerProvider serProvider) throws IOException,
+				JsonProcessingException {
+
+			jsonGen.writeStartObject();
+			jsonGen.writeFieldName(volumeRW.getVolume().getPath());
+			jsonGen.writeString(Boolean.toString(volumeRW.getAccessMode().toBoolean()));
+			jsonGen.writeEndObject();
+		}
+
+	}
+
+	public static class Deserializer extends JsonDeserializer<VolumeRW> {
+		@Override
+		public VolumeRW deserialize(JsonParser jsonParser,
+				DeserializationContext deserializationContext)
+				throws IOException, JsonProcessingException {
+			ObjectCodec oc = jsonParser.getCodec();
+			JsonNode node = oc.readTree(jsonParser);
+			if (!node.equals(NullNode.getInstance())) {
+				Entry<String, JsonNode> field = node.fields().next();
+				String volume = field.getKey();
+				AccessMode accessMode = AccessMode.fromBoolean(field.getValue().asBoolean());
+				return new VolumeRW(new Volume(volume), accessMode);
+			} else {
+				return null;
+			}
+		}
+	}
+
+	
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/Volumes.java b/src/main/java/com/github/dockerjava/api/model/Volumes.java
index 69753d6a8..b85536e10 100644
--- a/src/main/java/com/github/dockerjava/api/model/Volumes.java
+++ b/src/main/java/com/github/dockerjava/api/model/Volumes.java
@@ -48,7 +48,9 @@ public void serialize(Volumes volumes, JsonGenerator jsonGen,
 			jsonGen.writeStartObject();
 			for (Volume volume : volumes.getVolumes()) {
 				jsonGen.writeFieldName(volume.getPath());
-				jsonGen.writeString(Boolean.toString(volume.getAccessMode().equals(AccessMode.rw) ? true: false));
+				jsonGen.writeStartObject();
+				jsonGen.writeEndObject();
+				//jsonGen.writeString(Boolean.toString(volume.getAccessMode().equals(AccessMode.rw) ? true: false));
 			}
 			jsonGen.writeEndObject();
 		}
@@ -66,7 +68,8 @@ public Volumes deserialize(JsonParser jsonParser, DeserializationContext deseria
 
                 Map.Entry<String, JsonNode> field = it.next();
                 if (!field.getValue().equals(NullNode.getInstance())) {
-                	Volume volume = Volume.parse(field.getKey());
+                	String path = field.getKey();
+                	Volume volume = new Volume(path);
                 	volumes.add(volume);
                 }
             }
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumesRW.java b/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
new file mode 100644
index 000000000..223f518cf
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
@@ -0,0 +1,57 @@
+package com.github.dockerjava.api.model;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.ObjectCodec;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.node.NullNode;
+
+// This is not going to be serialized
+@JsonDeserialize(using = VolumesRW.Deserializer.class)
+public class VolumesRW {
+    private final VolumeRW[] volumesRW;
+
+    public VolumesRW(VolumeRW... binds) {
+        this.volumesRW = binds;
+    }
+
+    public VolumeRW[] getVolumesRW() {
+        return volumesRW;
+    }
+
+    public static final class Deserializer extends JsonDeserializer<VolumesRW> {
+        @Override
+        public VolumesRW deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+
+            List<VolumeRW> volumesRW = new ArrayList<VolumeRW>();
+            ObjectCodec oc = jsonParser.getCodec();
+            JsonNode node = oc.readTree(jsonParser);
+            
+            
+            for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
+                Map.Entry<String, JsonNode> field = it.next();
+                JsonNode value = field.getValue();
+                
+                if (!value.equals(NullNode.getInstance())) {
+                    if (!value.isBoolean()){
+                        throw deserializationContext.mappingException("Expected access mode for '"+field.getKey()+"' in host but got '"+ value+"'.");
+                    }
+                    
+                    VolumeRW bind = new VolumeRW(new Volume(field.getKey()), AccessMode.fromBoolean(value.asBoolean()));
+                    volumesRW.add(bind);
+                }
+            }
+            return new VolumesRW(volumesRW.toArray(new VolumeRW[volumesRW.size()]));
+        }
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/api/model/VolumeTest.java b/src/test/java/com/github/dockerjava/api/model/VolumeTest.java
index 8fdf19975..7419e5dc9 100644
--- a/src/test/java/com/github/dockerjava/api/model/VolumeTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/VolumeTest.java
@@ -6,7 +6,7 @@
 
 public class VolumeTest {
 	@Test
-	public void stringify() {
-		assertEquals(Volume.parse("/path").toString(), "/path");
+	public void getPath() {
+		assertEquals(new Volume("/path").getPath(), "/path");
 	}
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 752f0aefc..4feadc6b4 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -30,6 +30,7 @@
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.AccessMode;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
@@ -38,6 +39,8 @@
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Volume;
+import com.github.dockerjava.api.model.VolumeRW;
+import com.github.dockerjava.api.model.Volumes;
 import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
@@ -88,9 +91,11 @@ public void createContainerWithExistingName() throws DockerException {
 	@Test
 	public void createContainerWithVolume() throws DockerException {
 
+		Volume volume = new Volume("/var/log");
+		
 		CreateContainerResponse container = dockerClient
 				.createContainerCmd("busybox")
-				.withVolumes(new Volume("/var/log")).withCmd("true").exec();
+				.withVolumes(volume).withCmd("true").exec();
 
 		LOG.info("Created container {}", container.toString());
 
@@ -104,6 +109,37 @@ public void createContainerWithVolume() throws DockerException {
 
 		assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(),
 				contains("/var/log"));
+		
+		assertThat(inspectContainerResponse.getVolumesRW(),
+				hasItemInArray(new VolumeRW(volume, AccessMode.rw)));
+	}
+	
+	@Test
+	public void createContainerWithReadOnlyVolume() throws DockerException {
+
+		Volume volume = new Volume("/srv/test");
+		
+		CreateContainerResponse container = dockerClient
+				.createContainerCmd("busybox")
+				.withVolumes(volume)
+				.withCmd("true")
+				.exec();
+
+		LOG.info("Created container {}", container.toString());
+
+		assertThat(container.getId(), not(isEmptyString()));
+
+		InspectContainerResponse inspectContainerResponse = dockerClient
+				.inspectContainerCmd(container.getId()).exec();
+
+		LOG.info("Inspect container {}", inspectContainerResponse.getConfig()
+				.getVolumes());
+
+		assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(),
+				contains("/srv/test"));
+		
+		assertThat(Arrays.asList(inspectContainerResponse.getVolumesRW()),
+				contains(new VolumeRW(volume)));
 	}
 	
 	@Test
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index f7cbe20c3..9a3071653 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -65,7 +65,8 @@ public void startContainerWithVolumes() throws DockerException {
 		Volume volume2 = new Volume("/opt/webapp2");
 
 		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withVolumes(volume1, volume2)
+				.createContainerCmd("busybox")
+				.withVolumes(volume1, volume2)
 				.withCmd("true").exec();
 
 		LOG.info("Created container {}", container.toString());
@@ -91,7 +92,7 @@ public void startContainerWithVolumes() throws DockerException {
 		assertContainerHasVolumes(inspectContainerResponse, volume1, volume2);
 
 		assertThat(Arrays.asList(inspectContainerResponse.getVolumesRW()),
-				contains(volume1, volume2));
+				contains(new VolumeRW(volume1, AccessMode.ro), new VolumeRW(volume2)));
 
 	}
 

From 6cd5f46e266e4351098679877bc477840281062c Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Sat, 2 May 2015 00:34:58 +0200
Subject: [PATCH 0031/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ee13f6af..ea8bdf048 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@ Change Log
 ===
 Latest SNAPSHOT
 ---
+* [#205](https://github.com/docker-java/docker-java/issues/205) Access mode of VolumesRW incorrectly deserialized
 * [#203](https://github.com/docker-java/docker-java/issues/203) Missing 'MacAddress' option in create container command
 * [#197](https://github.com/docker-java/docker-java/pull/197) Allow for null bindings
 

From cfc3a9a1df239f401b0554f7f2a15cad514f9c30 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Sat, 2 May 2015 00:44:41 +0200
Subject: [PATCH 0032/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea8bdf048..33607c66c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,9 @@ Change Log
 ===
 Latest SNAPSHOT
 ---
+
 * [#205](https://github.com/docker-java/docker-java/issues/205) Access mode of VolumesRW incorrectly deserialized
+* [#204] (https://github.com/docker-java/docker-java/pull/204) Added support to use the credentials from .dockercfg during build
 * [#203](https://github.com/docker-java/docker-java/issues/203) Missing 'MacAddress' option in create container command
 * [#197](https://github.com/docker-java/docker-java/pull/197) Allow for null bindings
 

From 7675400a68af3e77f32179947471279fb36f2324 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Sat, 2 May 2015 00:47:12 +0200
Subject: [PATCH 0033/1272] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index b7e9c6217..bbafd8a6a 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 Java API client for [Docker](http://docs.docker.io/ "Docker")
 
-Supports a subset of the Docker Client API v1.16, Docker Server version 1.4.1
+Supports a subset of the Docker Client API v1.17, Docker Server version 1.5.0
 
 <b>The current implementation is based on Jersey 2.x and therefore classpath incompatible with older Jersey 1.x dependent libraries!</b>
 
@@ -64,7 +64,7 @@ Run build without integration tests:
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>1.0.0</version>
+          <version>1.2.0</version>
     </dependency>
 
 ### Latest SNAPSHOT version
@@ -74,7 +74,7 @@ You can find the latest SNAPSHOT version including javadoc and source files on [
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>1.0.1-SNAPSHOT</version>
+          <version>1.2.1-SNAPSHOT</version>
     </dependency>
 
 ## Documentation

From 42c1892b07f216dca2882bdfb6f7d86eb405964f Mon Sep 17 00:00:00 2001
From: Alex Collins <alex.e.c@gmail.com>
Date: Sun, 3 May 2015 08:57:41 +0100
Subject: [PATCH 0034/1272] Updated to jersey 2.17.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1279f9c11..010165a8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
 		<jdk.source>1.7</jdk.source>
 		<jdk.target>1.7</jdk.target>
 
-		<jersey.version>2.11</jersey.version>
+		<jersey.version>2.17</jersey.version>
 		<jackson-jaxrs.version>2.1.2</jackson-jaxrs.version>
 		<httpclient.version>4.3.1</httpclient.version>
 		<commons-compress.version>1.5</commons-compress.version>

From 92b2002224425235707228dd51657f172693b5cb Mon Sep 17 00:00:00 2001
From: Alex Collins <alex.e.c@gmail.com>
Date: Sun, 3 May 2015 09:01:13 +0100
Subject: [PATCH 0035/1272] Flipped expressions for minor perf issue.

---
 src/main/java/com/github/dockerjava/api/model/Frame.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/Frame.java b/src/main/java/com/github/dockerjava/api/model/Frame.java
index 3860a5dba..175b56830 100644
--- a/src/main/java/com/github/dockerjava/api/model/Frame.java
+++ b/src/main/java/com/github/dockerjava/api/model/Frame.java
@@ -34,7 +34,7 @@ public boolean equals(Object o) {
 
         Frame frame = (Frame) o;
 
-        return Arrays.equals(payload, frame.payload) && streamType == frame.streamType;
+        return streamType == frame.streamType && Arrays.equals(payload, frame.payload);
 
     }
 

From 9dc9b3c2d26aa25536a60db815934dd7a6c69982 Mon Sep 17 00:00:00 2001
From: Alex Collins <alex.e.c@gmail.com>
Date: Sun, 3 May 2015 09:41:42 +0100
Subject: [PATCH 0036/1272] Reverted jersey 2.11 -> 2.17

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 010165a8b..1279f9c11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
 		<jdk.source>1.7</jdk.source>
 		<jdk.target>1.7</jdk.target>
 
-		<jersey.version>2.17</jersey.version>
+		<jersey.version>2.11</jersey.version>
 		<jackson-jaxrs.version>2.1.2</jackson-jaxrs.version>
 		<httpclient.version>4.3.1</httpclient.version>
 		<commons-compress.version>1.5</commons-compress.version>

From ebaba3588bd6545bb698a529d553d25d5fe9aec8 Mon Sep 17 00:00:00 2001
From: Alex Collins <alex.e.c@gmail.com>
Date: Sun, 3 May 2015 09:43:24 +0100
Subject: [PATCH 0037/1272] Created integration test for FrameReader.

---
 .../core/command/DockerfileFixture.java       | 63 +++++++++++++++++++
 .../core/command/FrameReaderITest.java        | 58 +++++++++++++++++
 .../frameReaderDockerfile/Dockerfile          | 10 +++
 3 files changed, 131 insertions(+)
 create mode 100644 src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
 create mode 100644 src/test/resources/frameReaderDockerfile/Dockerfile

diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
new file mode 100644
index 000000000..d6a034f6d
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -0,0 +1,63 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.DockerClient;
+
+import java.io.File;
+
+/**
+ * Start and stop a single container for testing.
+ */
+public class DockerfileFixture implements AutoCloseable {
+
+    private final DockerClient dockerClient;
+    private String directory;
+    private String repository;
+    private String containerId;
+
+    public DockerfileFixture(DockerClient dockerClient, String directory) {
+        this.dockerClient = dockerClient;
+        this.directory = directory;
+    }
+
+    public void open() throws Exception {
+
+        dockerClient
+                .buildImageCmd(new File("src/test/resources", directory))
+                .withNoCache() // remove alternatives, cause problems
+                .exec()
+                .close();
+
+        repository = dockerClient
+                .listImagesCmd()
+                .exec()
+                .get(0)
+                .getRepoTags()[0];
+
+        containerId = dockerClient
+                .createContainerCmd(repository)
+                .exec()
+                .getId();
+
+        dockerClient
+                .startContainerCmd(containerId)
+                .exec();
+    }
+
+    @Override
+    public void close() throws Exception {
+
+        dockerClient
+                .removeContainerCmd(containerId)
+                .withForce() // stop too
+                .exec();
+
+        dockerClient
+                .removeImageCmd(repository)
+                .withForce()
+                .exec();
+    }
+
+    public String getContainerId() {
+        return containerId;
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
new file mode 100644
index 000000000..61a5fb88b
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -0,0 +1,58 @@
+package com.github.dockerjava.core.command;
+
+
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.StreamType;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.io.InputStream;
+
+@Test(groups = "integration")
+public class FrameReaderITest extends AbstractDockerClientTest {
+
+    private DockerfileFixture dockerfileFixture;
+
+    @BeforeMethod
+    @Override
+    public void beforeTest() {
+        super.beforeTest();
+        dockerfileFixture = new DockerfileFixture(dockerClient, "frameReaderDockerfile");
+    }
+
+    @BeforeMethod
+    public void createAndStartDockerContainer() throws Exception {
+        dockerfileFixture.open();
+    }
+
+    @AfterMethod
+    public void deleteDockerContainerImage() throws Exception {
+        dockerfileFixture.close();
+    }
+
+    @AfterMethod
+    @Override
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @Test
+    public void canCloseFrameReaderAndReadExpectedLinens() throws Exception {
+
+        InputStream log = dockerClient
+                .logContainerCmd(dockerfileFixture.getContainerId())
+                .withStdOut()
+                .withStdErr()
+                .withFollowStream()
+                .withTailAll()
+                .exec();
+
+        try (FrameReader reader = new FrameReader(log)) {
+            assertEquals(reader.readFrame(), new Frame(StreamType.STDOUT, String.format("to stdout%n").getBytes()));
+            assertEquals(reader.readFrame(), new Frame(StreamType.STDERR, String.format("to stderr%n").getBytes()));
+            assertNull(reader.readFrame());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/frameReaderDockerfile/Dockerfile b/src/test/resources/frameReaderDockerfile/Dockerfile
new file mode 100644
index 000000000..c4d74fc55
--- /dev/null
+++ b/src/test/resources/frameReaderDockerfile/Dockerfile
@@ -0,0 +1,10 @@
+FROM busybox:latest
+
+# log to stdout and stderr so we can make sure logging with FrameReader works
+
+RUN echo '#! /bin/sh' > cmd.sh
+RUN echo 'echo "to stdout"' >> cmd.sh
+RUN echo 'echo "to stderr" > /dev/stderr' >> cmd.sh
+RUN chmod +x cmd.sh
+
+CMD ["./cmd.sh"]
\ No newline at end of file

From 6a7f1d268db292a058b9425b117de02031db8cd0 Mon Sep 17 00:00:00 2001
From: Alex Collins <alex.e.c@gmail.com>
Date: Sun, 3 May 2015 09:46:13 +0100
Subject: [PATCH 0038/1272] Created integration test for FrameReader.

---
 .../github/dockerjava/core/command/FrameReaderITest.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index 61a5fb88b..936cd8b4b 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -5,7 +5,9 @@
 import com.github.dockerjava.api.model.StreamType;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
 import java.io.InputStream;
@@ -15,7 +17,7 @@ public class FrameReaderITest extends AbstractDockerClientTest {
 
     private DockerfileFixture dockerfileFixture;
 
-    @BeforeMethod
+    @BeforeTest
     @Override
     public void beforeTest() {
         super.beforeTest();
@@ -32,7 +34,7 @@ public void deleteDockerContainerImage() throws Exception {
         dockerfileFixture.close();
     }
 
-    @AfterMethod
+    @AfterTest
     @Override
     public void afterTest() {
         super.afterTest();

From 5e8cfc606c25e61dcefd793090effb8a7a6a2855 Mon Sep 17 00:00:00 2001
From: Alex Collins <alex.e.c@gmail.com>
Date: Sun, 3 May 2015 10:28:26 +0100
Subject: [PATCH 0039/1272] Mad Dockerfile more robust.

---
 .../core/command/DockerfileFixture.java       | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
index d6a034f6d..599c88480 100644
--- a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
+++ b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -1,6 +1,8 @@
 package com.github.dockerjava.core.command;
 
 import com.github.dockerjava.api.DockerClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 
@@ -9,6 +11,7 @@
  */
 public class DockerfileFixture implements AutoCloseable {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(DockerfileFixture.class);
     private final DockerClient dockerClient;
     private String directory;
     private String repository;
@@ -21,6 +24,7 @@ public DockerfileFixture(DockerClient dockerClient, String directory) {
 
     public void open() throws Exception {
 
+        LOGGER.info("building {}", directory);
         dockerClient
                 .buildImageCmd(new File("src/test/resources", directory))
                 .withNoCache() // remove alternatives, cause problems
@@ -33,11 +37,15 @@ public void open() throws Exception {
                 .get(0)
                 .getRepoTags()[0];
 
+        LOGGER.info("created {}", repository);
+
         containerId = dockerClient
                 .createContainerCmd(repository)
                 .exec()
                 .getId();
 
+        LOGGER.info("starting {}", containerId);
+
         dockerClient
                 .startContainerCmd(containerId)
                 .exec();
@@ -46,15 +54,23 @@ public void open() throws Exception {
     @Override
     public void close() throws Exception {
 
-        dockerClient
-                .removeContainerCmd(containerId)
-                .withForce() // stop too
-                .exec();
+        if (containerId != null) {
+            LOGGER.info("removing container {}", containerId);
+            dockerClient
+                    .removeContainerCmd(containerId)
+                    .withForce() // stop too
+                    .exec();
+            containerId = null;
+        }
 
-        dockerClient
-                .removeImageCmd(repository)
-                .withForce()
-                .exec();
+        if (repository != null) {
+            LOGGER.info("removing repostiory {}", repository);
+            dockerClient
+                    .removeImageCmd(repository)
+                    .withForce()
+                    .exec();
+            repository = null;
+        }
     }
 
     public String getContainerId() {

From e29e7da45b8453c22a625f4ef4a09699240ee42f Mon Sep 17 00:00:00 2001
From: Alex Collins <alex.e.c@gmail.com>
Date: Sun, 3 May 2015 10:35:02 +0100
Subject: [PATCH 0040/1272] Ignore container removal error.

---
 .../core/command/DockerfileFixture.java           | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
index 599c88480..4970a2931 100644
--- a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
+++ b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.core.command;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.NotFoundException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -56,15 +57,19 @@ public void close() throws Exception {
 
         if (containerId != null) {
             LOGGER.info("removing container {}", containerId);
-            dockerClient
-                    .removeContainerCmd(containerId)
-                    .withForce() // stop too
-                    .exec();
+            try {
+                dockerClient
+                        .removeContainerCmd(containerId)
+                        .withForce() // stop too
+                        .exec();
+            } catch (NotFoundException ignored) {
+                LOGGER.info("ignoring {}", ignored.getMessage());
+            }
             containerId = null;
         }
 
         if (repository != null) {
-            LOGGER.info("removing repostiory {}", repository);
+            LOGGER.info("removing repository {}", repository);
             dockerClient
                     .removeImageCmd(repository)
                     .withForce()

From 09220689a83cf06f90d866acac329463b811d952 Mon Sep 17 00:00:00 2001
From: Alex Collins <alex.e.c@gmail.com>
Date: Sun, 3 May 2015 11:44:18 +0100
Subject: [PATCH 0041/1272] Fixed connection leak.

---
 .../dockerjava/jaxrs/BuildImageCmdExec.java   | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index b5ea85ed2..3bdfb006c 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -1,21 +1,5 @@
 package com.github.dockerjava.jaxrs;
 
-import static javax.ws.rs.client.Entity.entity;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.glassfish.jersey.client.ClientProperties;
-import org.glassfish.jersey.client.RequestEntityProcessing;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.github.dockerjava.api.command.BuildImageCmd;
@@ -23,6 +7,20 @@
 import com.github.dockerjava.api.model.EventStreamItem;
 import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
 import com.google.common.collect.ImmutableList;
+import org.glassfish.jersey.client.ClientProperties;
+import org.glassfish.jersey.client.RequestEntityProcessing;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+
+import static javax.ws.rs.client.Entity.entity;
 
 public class BuildImageCmdExec extends
 		AbstrDockerCmdExec<BuildImageCmd, BuildImageCmd.Response> implements
@@ -112,5 +110,11 @@ public Iterable<EventStreamItem> getItems() throws IOException {
 		public int read() throws IOException {
 			return proxy.read();
 		}
+
+		@Override
+		public void close() throws IOException {
+			proxy.close();
+			super.close();
+		}
 	}
 }

From 92aa1bbfe6b416c160dc4dc1eef66f9a40d015e1 Mon Sep 17 00:00:00 2001
From: Alex Collins <alex.e.c@gmail.com>
Date: Sun, 3 May 2015 11:50:06 +0100
Subject: [PATCH 0042/1272] Updated test.

---
 .../core/command/DockerfileFixture.java       | 11 +++--
 .../core/command/FrameReaderITest.java        | 47 ++++++++++++++++---
 .../resources/busyboxDockerfile/Dockerfile    |  3 ++
 .../frameReaderDockerfile/Dockerfile          |  3 ++
 4 files changed, 53 insertions(+), 11 deletions(-)
 create mode 100644 src/test/resources/busyboxDockerfile/Dockerfile

diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
index 4970a2931..b3bdf4ea6 100644
--- a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
+++ b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -2,6 +2,7 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.model.Image;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,16 +33,18 @@ public void open() throws Exception {
                 .exec()
                 .close();
 
-        repository = dockerClient
+        Image lastCreatedImage = dockerClient
                 .listImagesCmd()
                 .exec()
-                .get(0)
+                .get(0);
+
+        repository = lastCreatedImage
                 .getRepoTags()[0];
 
-        LOGGER.info("created {}", repository);
+        LOGGER.info("created {} {}", lastCreatedImage.getId(), repository);
 
         containerId = dockerClient
-                .createContainerCmd(repository)
+                .createContainerCmd(lastCreatedImage.getId())
                 .exec()
                 .getId();
 
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index 936cd8b4b..4654d83dd 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -10,6 +10,7 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import java.io.IOException;
 import java.io.InputStream;
 
 @Test(groups = "integration")
@@ -41,20 +42,52 @@ public void afterTest() {
     }
 
     @Test
-    public void canCloseFrameReaderAndReadExpectedLinens() throws Exception {
+    public void canCloseFrameReaderAndReadExpectedLines() throws Exception {
 
-        InputStream log = dockerClient
+        try (FrameReader reader = new FrameReader(getLoggerStream())) {
+            assertEquals(reader.readFrame(), new Frame(StreamType.STDOUT, String.format("to stdout%n").getBytes()));
+            assertEquals(reader.readFrame(), new Frame(StreamType.STDERR, String.format("to stderr%n").getBytes()));
+            assertNull(reader.readFrame());
+        }
+    }
+
+    private InputStream getLoggerStream() {
+        return dockerClient
                 .logContainerCmd(dockerfileFixture.getContainerId())
                 .withStdOut()
                 .withStdErr()
-                .withFollowStream()
                 .withTailAll()
+                .withTail(10)
+                .withFollowStream()
                 .exec();
+    }
 
-        try (FrameReader reader = new FrameReader(log)) {
-            assertEquals(reader.readFrame(), new Frame(StreamType.STDOUT, String.format("to stdout%n").getBytes()));
-            assertEquals(reader.readFrame(), new Frame(StreamType.STDERR, String.format("to stderr%n").getBytes()));
-            assertNull(reader.readFrame());
+    @Test
+    public void canLogInOneThreadAndExecuteCommandsInAnother() throws Exception {
+
+        Thread thread = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    try (FrameReader reader = new FrameReader(getLoggerStream())) {
+                        //noinspection StatementWithEmptyBody
+                        while (reader.readFrame() != null) {
+                            // nop
+                        }
+                    }
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        });
+
+        thread.start();
+
+        try (DockerfileFixture busyboxDockerfile = new DockerfileFixture(dockerClient, "busyboxDockerfile")) {
+            busyboxDockerfile.open();
         }
+
+        thread.join();
+
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/busyboxDockerfile/Dockerfile b/src/test/resources/busyboxDockerfile/Dockerfile
new file mode 100644
index 000000000..5377ac8a6
--- /dev/null
+++ b/src/test/resources/busyboxDockerfile/Dockerfile
@@ -0,0 +1,3 @@
+FROM busybox:latest
+
+CMD ["cat"]
\ No newline at end of file
diff --git a/src/test/resources/frameReaderDockerfile/Dockerfile b/src/test/resources/frameReaderDockerfile/Dockerfile
index c4d74fc55..8d9b553e1 100644
--- a/src/test/resources/frameReaderDockerfile/Dockerfile
+++ b/src/test/resources/frameReaderDockerfile/Dockerfile
@@ -3,8 +3,11 @@ FROM busybox:latest
 # log to stdout and stderr so we can make sure logging with FrameReader works
 
 RUN echo '#! /bin/sh' > cmd.sh
+RUN echo 'sleep 1' >> cmd.sh
 RUN echo 'echo "to stdout"' >> cmd.sh
 RUN echo 'echo "to stderr" > /dev/stderr' >> cmd.sh
+# block for ever
+RUN echo 'cat' >> cmd.sh
 RUN chmod +x cmd.sh
 
 CMD ["./cmd.sh"]
\ No newline at end of file

From 6942c4fc9fe085915d4e791758a1ce27ca1179ca Mon Sep 17 00:00:00 2001
From: Alex Collins <alex.e.c@gmail.com>
Date: Sun, 3 May 2015 12:02:41 +0100
Subject: [PATCH 0043/1272] Ignore error when removing image (e.g. due to brtfs
 on CircleCI).

---
 .../dockerjava/core/command/DockerfileFixture.java  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
index b3bdf4ea6..500a6263b 100644
--- a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
+++ b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.core.command;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.InternalServerErrorException;
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.model.Image;
 import org.slf4j.Logger;
@@ -73,10 +74,14 @@ public void close() throws Exception {
 
         if (repository != null) {
             LOGGER.info("removing repository {}", repository);
-            dockerClient
-                    .removeImageCmd(repository)
-                    .withForce()
-                    .exec();
+            try {
+                dockerClient
+                        .removeImageCmd(repository)
+                        .withForce()
+                        .exec();
+            } catch (InternalServerErrorException e) {
+                LOGGER.info("ignoring {}", e.getMessage());
+            }
             repository = null;
         }
     }

From 33d66dab953956e8af2102853d4599256b08b7ce Mon Sep 17 00:00:00 2001
From: Alex Collins <alex.e.c@gmail.com>
Date: Sun, 3 May 2015 12:33:31 +0100
Subject: [PATCH 0044/1272] Ignore error when removing image (e.g. due to brtfs
 on CircleCI).

---
 .../com/github/dockerjava/core/command/DockerfileFixture.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
index 500a6263b..2d7ca7c8d 100644
--- a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
+++ b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -66,7 +66,7 @@ public void close() throws Exception {
                         .removeContainerCmd(containerId)
                         .withForce() // stop too
                         .exec();
-            } catch (NotFoundException ignored) {
+            } catch (NotFoundException | InternalServerErrorException ignored) {
                 LOGGER.info("ignoring {}", ignored.getMessage());
             }
             containerId = null;

From f05294d51ec3448552e79712058ed4f5ef6c9db9 Mon Sep 17 00:00:00 2001
From: Alex Collins <alex.e.c@gmail.com>
Date: Sun, 3 May 2015 13:25:37 +0100
Subject: [PATCH 0045/1272] Added PullEventStreamItem and EventStreamReader to
 stream the reading of events.

---
 .../dockerjava/api/command/BuildImageCmd.java |  9 ++-
 .../dockerjava/api/command/PullImageCmd.java  |  3 +
 .../dockerjava/api/command/PushImageCmd.java  | 10 ++-
 .../api/model/PullEventStreamItem.java        | 59 +++++++++++++++
 .../core/command/EventStreamReader.java       | 35 +++++++++
 .../core/command/EventStreamReaderITest.java  | 72 +++++++++++++++++++
 .../core/command/FrameReaderITest.java        | 28 +++-----
 .../eventStreamReaderDockerfile/Dockerfile    |  5 ++
 8 files changed, 197 insertions(+), 24 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/PullEventStreamItem.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/EventStreamReader.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
 create mode 100644 src/test/resources/eventStreamReaderDockerfile/Dockerfile

diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index ec013d424..925946db4 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -1,12 +1,12 @@
 package com.github.dockerjava.api.command;
 
+import com.github.dockerjava.api.model.AuthConfigurations;
+import com.github.dockerjava.api.model.EventStreamItem;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.github.dockerjava.api.model.AuthConfigurations;
-import com.github.dockerjava.api.model.EventStreamItem;
-
 /**
  * 
  * Build an image from Dockerfile.
@@ -61,6 +61,9 @@ public interface BuildImageCmd extends DockerCmd<BuildImageCmd.Response>{
 	public static interface Exec extends DockerCmdExec<BuildImageCmd, BuildImageCmd.Response> {
 	}
 
+	/**
+	 * @see  {@link com.github.dockerjava.core.command.EventStreamReader}
+	 */
   public static abstract class Response extends InputStream {
     public abstract Iterable<EventStreamItem> getItems() throws IOException;
   }
diff --git a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java b/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
index c39617dde..4b5fc4c32 100644
--- a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.core.command.EventStreamReader;
 
 import java.io.InputStream;
 
@@ -33,6 +34,8 @@ public static interface Exec extends DockerCmdExec<PullImageCmd, InputStream> {
     /**
      * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent
 	 * connection leaks.
+     *
+     * @see {@link EventStreamReader}
      */
     @Override
     public InputStream exec();
diff --git a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java b/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
index 80e16c6d9..9ed38beb7 100644
--- a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
@@ -1,11 +1,12 @@
 package com.github.dockerjava.api.command;
 
-import java.io.IOException;
-import java.io.InputStream;
-
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PushEventStreamItem;
+import com.github.dockerjava.core.command.EventStreamReader;
+
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * Push the latest image to the repository.
@@ -40,6 +41,9 @@ public interface PushImageCmd extends DockerCmd<PushImageCmd.Response>{
 	public static interface Exec extends DockerCmdExec<PushImageCmd, Response> {
 	}
 
+	/**
+	 * @see {@link EventStreamReader}
+	 */
   	public static abstract class Response extends InputStream {
 	  public abstract Iterable<PushEventStreamItem> getItems() throws IOException;
 	}
diff --git a/src/main/java/com/github/dockerjava/api/model/PullEventStreamItem.java b/src/main/java/com/github/dockerjava/api/model/PullEventStreamItem.java
new file mode 100644
index 000000000..4a3a0b507
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/PullEventStreamItem.java
@@ -0,0 +1,59 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Objects;
+
+import java.io.Serializable;
+
+/**
+ * Represents an item returned from pull
+ */
+@JsonIgnoreProperties(ignoreUnknown=true)
+public class PullEventStreamItem implements Serializable {
+
+	private static final long serialVersionUID = -5187169652557467828L;
+
+	@JsonProperty("status")
+    private String status;
+
+    @JsonProperty("progress")
+    private String progress;
+
+    @JsonProperty("progressDetail")
+    private ProgressDetail progressDetail;
+
+
+    public String getStatus() {
+        return status;
+    }
+
+    public String getProgress() {
+        return progress;
+    }
+
+    public ProgressDetail getProgressDetail() {
+        return progressDetail;
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown=true)
+    public static class ProgressDetail implements Serializable {
+        @JsonProperty("current")
+        int current;
+
+
+        @Override
+        public String toString() {
+            return "current " + current;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return Objects.toStringHelper(this)
+                .add("status", status)
+                .add("progress", progress)
+                .add("progressDetail", progressDetail)
+                .toString();
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/EventStreamReader.java b/src/main/java/com/github/dockerjava/core/command/EventStreamReader.java
new file mode 100644
index 000000000..b8975224f
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/EventStreamReader.java
@@ -0,0 +1,35 @@
+package com.github.dockerjava.core.command;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class EventStreamReader<I> implements AutoCloseable {
+
+    private final ObjectMapper objectMapper = new ObjectMapper();
+    private final Class<I> type;
+    private final InputStream inputStream;
+
+    public EventStreamReader(InputStream inputStream, Class<I> type) {
+        this.inputStream = inputStream;
+        this.type = type;
+    }
+
+    public I readItem() throws IOException {
+        try {
+            return objectMapper.readValue(inputStream, type);
+        } catch (IOException e) {
+            // dirty, but works
+            if (e.getMessage().equals("Stream closed")) {
+                return null;
+            }
+            throw e;
+        }
+    }
+
+    @Override
+    public void close() throws IOException {
+        inputStream.close();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java b/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
new file mode 100644
index 000000000..dfc330d9e
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
@@ -0,0 +1,72 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.model.EventStreamItem;
+import com.github.dockerjava.api.model.PullEventStreamItem;
+import com.github.dockerjava.core.DockerClientBuilder;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.io.File;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.beans.HasPropertyWithValue.hasProperty;
+import static org.hamcrest.core.AllOf.allOf;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.testng.AssertJUnit.assertNull;
+
+
+@Test(groups = "integration")
+public class EventStreamReaderITest  {
+
+    private DockerClient dockerClient;
+
+    @BeforeTest
+    public void setUp() throws Exception {
+        dockerClient = DockerClientBuilder.getInstance().build();
+    }
+
+    @AfterTest
+    public void tearDown() throws Exception {
+        dockerClient.close();
+    }
+
+    @Test
+    public void pullCanBeStreamed() throws Exception {
+
+        try (EventStreamReader<PullEventStreamItem> reader = new EventStreamReader<>(
+                dockerClient.pullImageCmd("busybox:latest").exec(),
+                PullEventStreamItem.class)
+        ) {;
+            assertThat(reader.readItem(),
+                    allOf(
+                            hasProperty("status", equalTo("Pulling repository busybox")),
+                            hasProperty("progress", nullValue()),
+                            hasProperty("progressDetail", nullValue())
+                    )
+                );
+            assertNull(reader.readItem());
+        }
+    }
+
+    @Test
+    public void buildCanBeStreamed() throws Exception {
+
+        try (EventStreamReader<EventStreamItem> reader = new EventStreamReader<>(
+                dockerClient.buildImageCmd(new File("src/test/resources/eventStreamReaderDockerfile")).exec(),
+                EventStreamItem.class)
+        ) {
+            assertThat(reader.readItem(),
+                    allOf(
+                            hasProperty("stream", equalTo("Step 0 : FROM busybox:latest\n")),
+                            hasProperty("error", nullValue()),
+                            hasProperty("errorDetail", nullValue())
+                    )
+            );
+            assertNull(reader.readItem());
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index 4654d83dd..3aee3cb45 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -1,44 +1,36 @@
 package com.github.dockerjava.core.command;
 
 
+import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.StreamType;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import org.testng.annotations.AfterMethod;
+import com.github.dockerjava.core.DockerClientBuilder;
 import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.io.InputStream;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+
 @Test(groups = "integration")
-public class FrameReaderITest extends AbstractDockerClientTest {
+public class FrameReaderITest  {
 
+    private DockerClient dockerClient;
     private DockerfileFixture dockerfileFixture;
 
     @BeforeTest
-    @Override
     public void beforeTest() {
-        super.beforeTest();
+        dockerClient = DockerClientBuilder.getInstance().build();
         dockerfileFixture = new DockerfileFixture(dockerClient, "frameReaderDockerfile");
     }
 
-    @BeforeMethod
-    public void createAndStartDockerContainer() throws Exception {
-        dockerfileFixture.open();
-    }
-
-    @AfterMethod
+    @AfterTest
     public void deleteDockerContainerImage() throws Exception {
         dockerfileFixture.close();
-    }
-
-    @AfterTest
-    @Override
-    public void afterTest() {
-        super.afterTest();
+        dockerClient.close();
     }
 
     @Test
diff --git a/src/test/resources/eventStreamReaderDockerfile/Dockerfile b/src/test/resources/eventStreamReaderDockerfile/Dockerfile
new file mode 100644
index 000000000..cdd3bba79
--- /dev/null
+++ b/src/test/resources/eventStreamReaderDockerfile/Dockerfile
@@ -0,0 +1,5 @@
+FROM busybox:latest
+
+RUN true
+
+CMD ["true"]
\ No newline at end of file

From 8a35bd692ba9fe5090bbb6db789279befa929b5f Mon Sep 17 00:00:00 2001
From: Alex Collins <alex.e.c@gmail.com>
Date: Sun, 3 May 2015 16:49:55 +0100
Subject: [PATCH 0046/1272] Corrected bug in test.

---
 .../com/github/dockerjava/core/command/FrameReaderITest.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index 3aee3cb45..e8e6bcc65 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -25,6 +25,7 @@ public class FrameReaderITest  {
     public void beforeTest() {
         dockerClient = DockerClientBuilder.getInstance().build();
         dockerfileFixture = new DockerfileFixture(dockerClient, "frameReaderDockerfile");
+        dockerfileFixture.open();
     }
 
     @AfterTest

From 86c9f0aa93cb3aa2a64747c303e6756828f5e0e3 Mon Sep 17 00:00:00 2001
From: Alex Collins <alex.e.c@gmail.com>
Date: Sun, 3 May 2015 16:51:54 +0100
Subject: [PATCH 0047/1272] Added PullEventStreamItem and EventStreamReader to
 stream the reading of events.

---
 .../github/dockerjava/core/command/DockerfileFixture.java    | 5 +++--
 .../com/github/dockerjava/core/command/FrameReaderITest.java | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
index 2d7ca7c8d..840f63da4 100644
--- a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
+++ b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -8,6 +8,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
+import java.io.IOException;
 
 /**
  * Start and stop a single container for testing.
@@ -25,7 +26,7 @@ public DockerfileFixture(DockerClient dockerClient, String directory) {
         this.directory = directory;
     }
 
-    public void open() throws Exception {
+    public void open() throws IOException {
 
         LOGGER.info("building {}", directory);
         dockerClient
@@ -79,7 +80,7 @@ public void close() throws Exception {
                         .removeImageCmd(repository)
                         .withForce()
                         .exec();
-            } catch (InternalServerErrorException e) {
+            } catch (NotFoundException | InternalServerErrorException e) {
                 LOGGER.info("ignoring {}", e.getMessage());
             }
             repository = null;
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index e8e6bcc65..0cf08e953 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -22,7 +22,7 @@ public class FrameReaderITest  {
     private DockerfileFixture dockerfileFixture;
 
     @BeforeTest
-    public void beforeTest() {
+    public void beforeTest() throws Exception {
         dockerClient = DockerClientBuilder.getInstance().build();
         dockerfileFixture = new DockerfileFixture(dockerClient, "frameReaderDockerfile");
         dockerfileFixture.open();

From c577bf9cb77b523a2ebbdc14f6edd9d661bda250 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev <o.v.nenashev@gmail.com>
Date: Wed, 6 May 2015 00:42:19 +0300
Subject: [PATCH 0048/1272] Add public constructor and Javadoc to
 api.model.Event

---
 .../github/dockerjava/api/model/Event.java    | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/Event.java b/src/main/java/com/github/dockerjava/api/model/Event.java
index 674cb66de..cb961f97d 100644
--- a/src/main/java/com/github/dockerjava/api/model/Event.java
+++ b/src/main/java/com/github/dockerjava/api/model/Event.java
@@ -14,18 +14,59 @@ public class Event {
 
     private long time;
 
+    /**
+     * Default constructor for the deserialization.
+     */
+    public Event() {
+    }
+
+    /**
+     * Constructor.
+     * @param id Container ID
+     * @param status Status string. 
+     *        List of statuses is available in <a href="https://docs.docker.com/reference/api/docker_remote_api_v1.16/#monitor-dockers-events">Docker API v.1.16</a>
+     * @param from Image, from which the container has been created
+     * @param time Event time
+     *      The time is specified in milliseconds since January 1, 1970, 00:00:00 GMT
+     * @since TODO
+     */
+    public Event(String status, String id, String from, long time) {
+        this.status = status;
+        this.id = id;
+        this.from = from;
+        this.time = time;
+    }
+    
+    /**
+     * Status of docker image or container. 
+     * List of statuses is available in <a href="https://docs.docker.com/reference/api/docker_remote_api_v1.16/#monitor-dockers-events">Docker API v.1.16</a>
+     * @return Status string
+     */
     public String getStatus() {
         return status;
     }
 
+    /**
+     * Get ID of docker container.
+     * @return Container ID
+     */
     public String getId() {
         return id;
     }
 
+    /**
+     * Get source image of the container.
+     * @return Name of the parent container
+     */
     public String getFrom() {
         return from;
     }
 
+    /**
+     * Get the event time.
+     * The time is specified in milliseconds since January 1, 1970, 00:00:00 GMT
+     * @return Event time in the specified format.
+     */
     public long getTime() {
         return time;
     }

From 8042fc9ea04359600519d2877ab176e447da5a57 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Wed, 6 May 2015 23:05:46 +0200
Subject: [PATCH 0049/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33607c66c..e6fca225d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@ Change Log
 ===
 Latest SNAPSHOT
 ---
-
+* [#208](https://github.com/docker-java/docker-java/pull/208) Added PullEventStreamItem and EventStreamReader to stream the reading of events
 * [#205](https://github.com/docker-java/docker-java/issues/205) Access mode of VolumesRW incorrectly deserialized
 * [#204] (https://github.com/docker-java/docker-java/pull/204) Added support to use the credentials from .dockercfg during build
 * [#203](https://github.com/docker-java/docker-java/issues/203) Missing 'MacAddress' option in create container command

From 5697c60bc4581eff46cc79f735f26b8c658ab2d5 Mon Sep 17 00:00:00 2001
From: "alex.collins" <alex.collins@gamesys.co.uk>
Date: Wed, 6 May 2015 22:57:07 +0100
Subject: [PATCH 0050/1272] Quietly catch IndexOutOfBoundsException.

---
 .../github/dockerjava/core/command/EventStreamReaderITest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java b/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
index dfc330d9e..b7d86de07 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
@@ -39,7 +39,7 @@ public void pullCanBeStreamed() throws Exception {
         try (EventStreamReader<PullEventStreamItem> reader = new EventStreamReader<>(
                 dockerClient.pullImageCmd("busybox:latest").exec(),
                 PullEventStreamItem.class)
-        ) {;
+        ) {
             assertThat(reader.readItem(),
                     allOf(
                             hasProperty("status", equalTo("Pulling repository busybox")),

From f4d5a4dd2cb51934e61dff5d7df213b0130e8532 Mon Sep 17 00:00:00 2001
From: "alex.collins" <alex.collins@gamesys.co.uk>
Date: Wed, 6 May 2015 23:04:29 +0100
Subject: [PATCH 0051/1272] Revert "Quietly catch IndexOutOfBoundsException."

This reverts commit 5697c60bc4581eff46cc79f735f26b8c658ab2d5.
---
 .../github/dockerjava/core/command/EventStreamReaderITest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java b/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
index b7d86de07..dfc330d9e 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
@@ -39,7 +39,7 @@ public void pullCanBeStreamed() throws Exception {
         try (EventStreamReader<PullEventStreamItem> reader = new EventStreamReader<>(
                 dockerClient.pullImageCmd("busybox:latest").exec(),
                 PullEventStreamItem.class)
-        ) {
+        ) {;
             assertThat(reader.readItem(),
                     allOf(
                             hasProperty("status", equalTo("Pulling repository busybox")),

From 6fa074ba40cf54e9043dc6a80db142c76968bb9b Mon Sep 17 00:00:00 2001
From: Vangie Du <duwan@live.com>
Date: Thu, 7 May 2015 15:51:01 +0800
Subject: [PATCH 0052/1272] Add ulimit support

---
 .../dockerjava/api/model/HostConfig.java      | 20 +++--
 .../github/dockerjava/api/model/Ulimit.java   | 64 ++++++++++++++++
 .../command/CreateContainerCmdImplTest.java   | 73 +++++++++----------
 3 files changed, 115 insertions(+), 42 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/Ulimit.java

diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 18fd34073..9973e6252 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -1,12 +1,10 @@
 package com.github.dockerjava.api.model;
 
-import java.util.Map;
-
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class HostConfig {
@@ -59,13 +57,16 @@ public class HostConfig {
 	@JsonProperty("ExtraHosts")
 	private String[] extraHosts;
 
+	@JsonProperty("Ulimits")
+	private Ulimit[] ulimits;
+
 	public HostConfig() {
 	}
 
 	public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, Ports portBindings, boolean publishAllPorts,
 			boolean privileged, String[] dns, String[] dnsSearch, VolumesFrom[] volumesFrom, String containerIDFile,
 			Capability[] capAdd, Capability[] capDrop, RestartPolicy restartPolicy, String networkMode, Device[] devices,
-            String[] extraHosts) {
+            String[] extraHosts, Ulimit[] ulimits) {
 		this.binds = new Binds(binds);
 		this.links = new Links(links);
 		this.lxcConf = lxcConf;
@@ -82,6 +83,7 @@ public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, Ports portBindi
 		this.networkMode = networkMode;
 		this.devices = devices;
 		this.extraHosts = extraHosts;
+		this.ulimits = ulimits;
 	}
 
 
@@ -151,6 +153,10 @@ public Capability[] getCapDrop() {
 		return capDrop;
 	}
 
+	public Ulimit[] getUlimits() {
+		return ulimits;
+	}
+
 	@JsonIgnore
 	public void setBinds(Bind... binds) {
 		this.binds = new Binds(binds);
@@ -217,6 +223,10 @@ public void setExtraHosts(String[] extraHosts) {
 		this.extraHosts = extraHosts;
 	}
 
+	public void setUlimits(Ulimit[] ulimits) {
+		this.ulimits = ulimits;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);
diff --git a/src/main/java/com/github/dockerjava/api/model/Ulimit.java b/src/main/java/com/github/dockerjava/api/model/Ulimit.java
new file mode 100644
index 000000000..d5fac09c1
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/Ulimit.java
@@ -0,0 +1,64 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * @author Vangie Du (duwan@live.com)
+ */
+public class Ulimit {
+
+    @JsonProperty("Name")
+    private String name ;
+
+    @JsonProperty("Soft")
+    private int soft;
+
+    @JsonProperty("Hard")
+    private int hard;
+
+    public Ulimit() {
+
+    }
+
+    public Ulimit(String name, int soft, int hard) {
+        checkNotNull(name, "Name is null");
+
+        this.name = name;
+        this.soft = soft;
+        this.hard = hard;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getSoft() {
+        return soft;
+    }
+
+    public int getHard() {
+        return hard;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof Ulimit) {
+            Ulimit other = (Ulimit) obj;
+            return new EqualsBuilder()
+                    .append(name, other.getName())
+                    .append(soft, other.getSoft())
+                    .append(hard, other.getHard()).isEquals();
+        } else
+            return super.equals(obj);
+
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(name).append(soft).append(hard).toHashCode();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 4feadc6b4..c37f48484 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -1,48 +1,23 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.api.model.Capability.MKNOD;
-import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasItemInArray;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.startsWith;
+import com.github.dockerjava.api.ConflictException;
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.*;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+import org.testng.ITestResult;
+import org.testng.annotations.*;
 
 import java.lang.reflect.Method;
 import java.security.SecureRandom;
 import java.util.Arrays;
 import java.util.UUID;
 
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.ConflictException;
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.AccessMode;
-import com.github.dockerjava.api.model.Bind;
-import com.github.dockerjava.api.model.Device;
-import com.github.dockerjava.api.model.ExposedPort;
-import com.github.dockerjava.api.model.HostConfig;
-import com.github.dockerjava.api.model.Link;
-import com.github.dockerjava.api.model.Ports;
-import com.github.dockerjava.api.model.RestartPolicy;
-import com.github.dockerjava.api.model.Volume;
-import com.github.dockerjava.api.model.VolumeRW;
-import com.github.dockerjava.api.model.Volumes;
-import com.github.dockerjava.api.model.VolumesFrom;
-import com.github.dockerjava.client.AbstractDockerClientTest;
+import static com.github.dockerjava.api.model.Capability.MKNOD;
+import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
 
 @Test(groups = "integration")
 public class CreateContainerCmdImplTest extends AbstractDockerClientTest {
@@ -564,5 +539,29 @@ public void createContainerWithMacAddress() throws DockerException {
 		assertEquals(inspectContainerResponse.getConfig().getMacAddress(),
 				"00:80:41:ae:fd:7e");
 	}
+
+	@Test
+	public void createContainerWithULimits() throws DockerException {
+
+		Ulimit[] ulimits = {new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096)};
+
+		HostConfig hostConfig = new HostConfig();
+		hostConfig.setUlimits(ulimits);
+
+		CreateContainerResponse container = dockerClient
+				.createContainerCmd("busybox").withName("container")
+				.withHostConfig(hostConfig).exec();
+
+		LOG.info("Created container {}", container.toString());
+
+		assertThat(container.getId(), not(isEmptyString()));
+
+		InspectContainerResponse inspectContainerResponse = dockerClient
+				.inspectContainerCmd(container.getId()).exec();
+
+		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getUlimits()),
+				containsInAnyOrder(new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096)));
+
+	}
 	
 }

From bdbdd7521b39945c64c3c75535f16aa18e0cc4ea Mon Sep 17 00:00:00 2001
From: Oleg Nenashev <o.v.nenashev@gmail.com>
Date: Thu, 7 May 2015 11:53:12 +0300
Subject: [PATCH 0053/1272] Added framework classes for JSON
 serialization-deserialization tests

---
 .../test/serdes/AbstractJSONResourceRef.java  |  31 +++++
 .../test/serdes/JSONResourceRef.java          |  37 ++++++
 .../test/serdes/JSONTestHelper.java           | 110 ++++++++++++++++++
 3 files changed, 178 insertions(+)
 create mode 100644 src/test/java/com/github/dockerjava/test/serdes/AbstractJSONResourceRef.java
 create mode 100644 src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java
 create mode 100644 src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java

diff --git a/src/test/java/com/github/dockerjava/test/serdes/AbstractJSONResourceRef.java b/src/test/java/com/github/dockerjava/test/serdes/AbstractJSONResourceRef.java
new file mode 100644
index 000000000..882b3b012
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/test/serdes/AbstractJSONResourceRef.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2015 CloudBees Inc., Oleg Nenashev.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.dockerjava.test.serdes;
+
+/**
+ * Default implementation of the Resource reference.
+ * @author Oleg Nenashev
+ */
+public abstract class AbstractJSONResourceRef implements JSONResourceRef {
+    /**
+     * Gets a class which stores resources.
+     * @return Reference class by default.
+     */
+    @Override
+    public Class<?> getResourceClass() {
+        return this.getClass();
+    }   
+}
diff --git a/src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java b/src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java
new file mode 100644
index 000000000..96e5df726
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015 Oleg Nenashev.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.dockerjava.test.serdes;
+
+import java.io.IOException;
+
+/**
+ * References JSON resources, which 
+ * @author Oleg Nenashev
+ */
+public interface JSONResourceRef {
+
+    /**
+     * Gets the resource file name under the class.
+     * @return File name, which is stored under the resource class
+     */
+    String getFileName();
+
+    /**
+     * Gets a class which stores resources.
+     * @return Class to be used as a resource source
+     */
+    Class<?> getResourceClass();    
+}
diff --git a/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java b/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
new file mode 100644
index 000000000..b465b2aac
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2015 Oleg Nenashev.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.dockerjava.test.serdes;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.command.CommandJSONSamples;
+import java.io.IOException;
+import java.io.InputStream;
+import org.apache.commons.io.IOUtils;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
+/**
+ * Provides helper methods for serialization-deserialization tests
+ * @author Oleg Nenashev
+ * @since TODO
+ */
+public class JSONTestHelper {
+    
+    /**
+     * Reads JSON String from the specified resource
+     * @param resource JSON File
+     * @return JSON String 
+     * @throws IOException JSON Conversion error 
+     */
+    public static String readString(JSONResourceRef resource) throws IOException {
+        InputStream istream = CommandJSONSamples.class.getResourceAsStream(resource.getFileName());
+        if (istream == null) {
+            throw new IOException("Cannot retrieve resource " + resource.getFileName());
+        }
+        return IOUtils.toString(istream, "UTF-8");
+    }
+    
+    /**
+     * Reads item from the resource.
+     * @param <TClass> Data class to be read
+     * @param resource Resource reference
+     * @param tclass Class entry
+     * @return Item
+     * @throws IOException JSON conversion error
+     */
+    public static <TClass> TClass readObject(JSONResourceRef resource, Class<TClass> tclass) throws IOException {
+        ObjectMapper mapper = new ObjectMapper();
+        String str = readString(resource);
+        return mapper.readValue(str, tclass);
+    }
+    
+    /**
+     * Basic serialization-deserialization consistency test for the resource.
+     * @param <TClass> Data class
+     * @param resource Resource reference
+     * @param tclass Class entry
+     * @throws IOException JSON conversion error
+     * @throws AssertionError Validation error
+     * @return Deserialized object after the roundtrip
+     */
+    public static <TClass> TClass testRoundTrip(JSONResourceRef resource, Class<TClass> tclass) 
+            throws IOException, AssertionError {
+        TClass item = readObject(resource, tclass);
+        assertNotNull(item);
+        return testRoundTrip(item, tclass);
+    }
+    
+    /**
+     * Performs roundtrip test for the specified class.
+     * @param <TClass> Item class
+     * @param item Item to be checked
+     * @return Deserialized object after the roundtrip
+     * @throws IOException JSON Conversion error
+     * @throws AssertionError Validation error
+     */
+    @SuppressWarnings("unchecked")
+    public static <TClass> TClass testRoundTrip(TClass item) 
+            throws IOException, AssertionError {
+        return testRoundTrip(item, (Class<TClass>)item.getClass());
+    }
+    
+    /**
+     * Performs roundtrip test for the specified class.
+     * @param <TClass> Item class
+     * @param item Item to be checked
+     * @param asclass Class to be used during conversions
+     * @return Deserialized object after the roundtrip
+     * @throws IOException JSON Conversion error
+     * @throws AssertionError Validation error
+     */
+    public static <TClass> TClass testRoundTrip(TClass item, Class<TClass> asclass) 
+            throws IOException, AssertionError {
+        ObjectMapper mapper = new ObjectMapper();
+       
+        String inputItemString = mapper.writeValueAsString(item);
+        TClass convertedItem = mapper.readValue(inputItemString, asclass);
+        String convertedItemString = mapper.writeValueAsString(convertedItem);
+        assertEquals(convertedItemString, inputItemString, "JSONs must be equal after the second roundtrip");
+        return convertedItem;
+    }
+}

From a221a94edb8018321b5c49160a5c51df23a9541d Mon Sep 17 00:00:00 2001
From: Oleg Nenashev <o.v.nenashev@gmail.com>
Date: Thu, 7 May 2015 11:53:50 +0300
Subject: [PATCH 0054/1272] Direct unit tests for
 https://github.com/docker-java/docker-java/issues/211

---
 .../api/command/CommandJSONSamples.java       |  45 ++++++
 .../command/InspectContainerResponseTest.java |  51 ++++++
 .../inspectContainerResponse_empty.json       | 115 +++++++++++++
 .../inspectContainerResponse_full.json        | 153 ++++++++++++++++++
 4 files changed, 364 insertions(+)
 create mode 100644 src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
 create mode 100644 src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
 create mode 100644 src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_empty.json
 create mode 100644 src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full.json

diff --git a/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java b/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
new file mode 100644
index 000000000..500919fdc
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015 CloudBees Inc., Oleg Nenashev.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.dockerjava.api.command;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.test.serdes.AbstractJSONResourceRef;
+import com.github.dockerjava.test.serdes.JSONResourceRef;
+import java.io.IOException;
+import java.io.InputStream;
+import org.apache.commons.io.IOUtils;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
+/**
+ * References test resources and provides basic tests functionality.
+ * @author Oleg Nenashev
+ */
+public enum CommandJSONSamples implements JSONResourceRef {
+    
+    inspectContainerResponse_full,
+    inspectContainerResponse_empty;
+    
+    @Override
+    public String getFileName() {
+        return this + ".json";
+    } 
+
+    @Override
+    public Class<?> getResourceClass() {
+        return CommandJSONSamples.class;
+    }  
+}
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
new file mode 100644
index 000000000..2e294b146
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015 CloudBees Inc., Oleg Nenashev.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.dockerjava.api.command;
+
+import static com.github.dockerjava.test.serdes.JSONTestHelper.testRoundTrip;
+import java.io.IOException;
+import static org.testng.Assert.*;
+import org.testng.annotations.Test;
+
+/**
+ * Tests for {@link InspectContainerResponse}.
+ * @author Oleg Nenashev
+ */
+public class InspectContainerResponseTest {
+    
+    @Test
+    public void roundTrip_full() throws IOException {
+        InspectContainerResponse[] responses = testRoundTrip(
+                        CommandJSONSamples.inspectContainerResponse_full, 
+                        InspectContainerResponse[].class);   
+        assertEquals(1, responses.length);
+        final InspectContainerResponse response = responses[0];
+        
+        // Check volumes: https://github.com/docker-java/docker-java/issues/211
+        assertEquals(response.getVolumes().length, 2);
+        assertEquals(response.getVolumesRW().length, 2);
+        assertEquals(response.getVolumes()[1].getContainerPath(), "/bar/foo/myvol2");
+        assertEquals(response.getVolumes()[1].getHostPath(), "/path2");
+        assertEquals(response.getVolumesRW()[1].getVolume().getPath(), "/bar/foo/myvol2");
+        assertFalse(response.getVolumesRW()[1].getAccessMode().toBoolean());
+        assertTrue(response.getVolumesRW()[0].getAccessMode().toBoolean());
+    }
+    
+    @Test
+    public void roundTrip_empty() throws IOException {
+        testRoundTrip(CommandJSONSamples.inspectContainerResponse_empty, InspectContainerResponse[].class);
+    }
+}
diff --git a/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_empty.json b/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_empty.json
new file mode 100644
index 000000000..ea31d6f33
--- /dev/null
+++ b/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_empty.json
@@ -0,0 +1,115 @@
+[{
+    "AppArmorProfile": "",
+    "Args": [ ],
+    "Config": {
+        "AttachStderr": true,
+        "AttachStdin": true,
+        "AttachStdout": true,
+        "Cmd": [ ],
+        "CpuShares": 0,
+        "Cpuset": "",
+        "Domainname": "",
+        "Entrypoint": null,
+        "Env": [ ],
+        "ExposedPorts": { },
+        "Hostname": "469e5edd8d5b",
+        "Image": "jenkinsci/workflow-demo",
+        "Labels": {},
+        "MacAddress": "",
+        "Memory": 0,
+        "MemorySwap": 0,
+        "NetworkDisabled": false,
+        "OnBuild": null,
+        "OpenStdin": true,
+        "PortSpecs": null,
+        "StdinOnce": true,
+        "Tty": true,
+        "User": "",
+        "Volumes": null,
+        "WorkingDir": "/var/lib/jenkins/workflow-plugin-pipeline-demo"
+    },
+    "Created": "2015-04-29T11:55:42.968262967Z",
+    "Driver": "aufs",
+    "ExecDriver": "native-0.2",
+    "ExecIDs": null,
+    "HostConfig": {
+        "Binds": null,
+        "CapAdd": null,
+        "CapDrop": null,
+        "CgroupParent": "",
+        "ContainerIDFile": "",
+        "CpuShares": 0,
+        "CpusetCpus": "",
+        "Devices": [],
+        "Dns": null,
+        "DnsSearch": null,
+        "ExtraHosts": null,
+        "IpcMode": "",
+        "Links": null,
+        "LogConfig": {
+            "Config": null,
+            "Type": "json-file"
+        },
+        "LxcConf": [],
+        "Memory": 0,
+        "MemorySwap": 0,
+        "NetworkMode": "bridge",
+        "PidMode": "",
+        "PortBindings": {
+            "8080/tcp": [ ]
+        },
+        "Privileged": false,
+        "PublishAllPorts": false,
+        "ReadonlyRootfs": false,
+        "RestartPolicy": {
+            "MaximumRetryCount": 0,
+            "Name": ""
+        },
+        "SecurityOpt": null,
+        "Ulimits": null,
+        "VolumesFrom": null
+    },
+    "HostnamePath": "/mnt/sda1/var/lib/docker/containers/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1/hostname",
+    "HostsPath": "/mnt/sda1/var/lib/docker/containers/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1/hosts",
+    "Id": "469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1",
+    "Image": "4300417211ebb75b48b06ed5640d641778f312072d24b37978682345cbb362b1",
+    "LogPath": "/mnt/sda1/var/lib/docker/containers/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1-json.log",
+    "MountLabel": "",
+    "Name": "/desperate_babbage",
+    "NetworkSettings": {
+        "Bridge": "docker0",
+        "Gateway": "172.17.42.1",
+        "GlobalIPv6Address": "",
+        "GlobalIPv6PrefixLen": 0,
+        "IPAddress": "172.17.0.2",
+        "IPPrefixLen": 16,
+        "IPv6Gateway": "",
+        "LinkLocalIPv6Address": "fe80::42:acff:fe11:2",
+        "LinkLocalIPv6PrefixLen": 64,
+        "MacAddress": "02:42:ac:11:00:02",
+        "PortMapping": null,
+        "Ports": {
+            "22/tcp": null,
+            "8080/tcp": [ ]
+        }
+    },
+    "Path": "/bin/sh",
+    "ProcessLabel": "",
+    "ResolvConfPath": "/mnt/sda1/var/lib/docker/containers/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1/resolv.conf",
+    "RestartCount": 0,
+    "State": {
+        "Dead": false,
+        "Error": "",
+        "ExitCode": 0,
+        "FinishedAt": "0001-01-01T00:00:00Z",
+        "OOMKilled": false,
+        "Paused": false,
+        "Pid": 898,
+        "Restarting": false,
+        "Running": true,
+        "StartedAt": "2015-04-29T11:55:43.464717907Z"
+    },
+    "Volumes": {},
+    "VolumesRW": {}
+}
+]
diff --git a/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full.json b/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full.json
new file mode 100644
index 000000000..c4383ef14
--- /dev/null
+++ b/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full.json
@@ -0,0 +1,153 @@
+[{
+    "AppArmorProfile": "",
+    "Args": [
+        "-c",
+        "/var/lib/jenkins/run.sh"
+    ],
+    "Config": {
+        "AttachStderr": true,
+        "AttachStdin": true,
+        "AttachStdout": true,
+        "Cmd": [
+            "/bin/sh",
+            "-c",
+            "/var/lib/jenkins/run.sh"
+        ],
+        "CpuShares": 0,
+        "Cpuset": "",
+        "Domainname": "",
+        "Entrypoint": null,
+        "Env": [
+            "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+            "MAVEN_VERSION=3.3.1",
+            "JETTY_VERSION=9.2.9.v20150224",
+            "REV=107ea141f5c7581056c6eb53d2ccd222cdf0d58c"
+        ],
+        "ExposedPorts": {
+            "22/tcp": {},
+            "8080/tcp": {},
+            "8081/tcp": {}
+        },
+        "Hostname": "469e5edd8d5b",
+        "Image": "jenkinsci/workflow-demo",
+        "Labels": {},
+        "MacAddress": "",
+        "Memory": 0,
+        "MemorySwap": 0,
+        "NetworkDisabled": false,
+        "OnBuild": null,
+        "OpenStdin": true,
+        "PortSpecs": null,
+        "StdinOnce": true,
+        "Tty": true,
+        "User": "",
+        "Volumes": null,
+        "WorkingDir": "/var/lib/jenkins/workflow-plugin-pipeline-demo"
+    },
+    "Created": "2015-04-29T11:55:42.968262967Z",
+    "Driver": "aufs",
+    "ExecDriver": "native-0.2",
+    "ExecIDs": null,
+    "HostConfig": {
+        "Binds": null,
+        "CapAdd": null,
+        "CapDrop": null,
+        "CgroupParent": "",
+        "ContainerIDFile": "",
+        "CpuShares": 0,
+        "CpusetCpus": "",
+        "Devices": [],
+        "Dns": null,
+        "DnsSearch": null,
+        "ExtraHosts": null,
+        "IpcMode": "",
+        "Links": null,
+        "LogConfig": {
+            "Config": null,
+            "Type": "json-file"
+        },
+        "LxcConf": [],
+        "Memory": 0,
+        "MemorySwap": 0,
+        "NetworkMode": "bridge",
+        "PidMode": "",
+        "PortBindings": {
+            "8080/tcp": [
+                {
+                    "HostIp": "",
+                    "HostPort": "8080"
+                }
+            ],
+            "8081/tcp": [
+                {
+                    "HostIp": "",
+                    "HostPort": "8081"
+                }
+            ]
+        },
+        "Privileged": false,
+        "PublishAllPorts": false,
+        "ReadonlyRootfs": false,
+        "RestartPolicy": {
+            "MaximumRetryCount": 0,
+            "Name": ""
+        },
+        "SecurityOpt": null,
+        "Ulimits": null,
+        "VolumesFrom": null
+    },
+    "HostnamePath": "/mnt/sda1/var/lib/docker/containers/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1/hostname",
+    "HostsPath": "/mnt/sda1/var/lib/docker/containers/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1/hosts",
+    "Id": "469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1",
+    "Image": "4300417211ebb75b48b06ed5640d641778f312072d24b37978682345cbb362b1",
+    "LogPath": "/mnt/sda1/var/lib/docker/containers/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1-json.log",
+    "MountLabel": "",
+    "Name": "/desperate_babbage",
+    "NetworkSettings": {
+        "Bridge": "docker0",
+        "Gateway": "172.17.42.1",
+        "GlobalIPv6Address": "",
+        "GlobalIPv6PrefixLen": 0,
+        "IPAddress": "172.17.0.2",
+        "IPPrefixLen": 16,
+        "IPv6Gateway": "",
+        "LinkLocalIPv6Address": "fe80::42:acff:fe11:2",
+        "LinkLocalIPv6PrefixLen": 64,
+        "MacAddress": "02:42:ac:11:00:02",
+        "PortMapping": null,
+        "Ports": {
+            "22/tcp": null,
+            "8080/tcp": [
+                {
+                    "HostIp": "0.0.0.0",
+                    "HostPort": "8080"
+                }
+            ],
+            "8081/tcp": [
+                {
+                    "HostIp": "0.0.0.0",
+                    "HostPort": "8081"
+                }
+            ]
+        }
+    },
+    "Path": "/bin/sh",
+    "ProcessLabel": "",
+    "ResolvConfPath": "/mnt/sda1/var/lib/docker/containers/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1/resolv.conf",
+    "RestartCount": 0,
+    "State": {
+        "Dead": false,
+        "Error": "",
+        "ExitCode": 0,
+        "FinishedAt": "0001-01-01T00:00:00Z",
+        "OOMKilled": false,
+        "Paused": false,
+        "Pid": 898,
+        "Restarting": false,
+        "Running": true,
+        "StartedAt": "2015-04-29T11:55:43.464717907Z"
+    },
+    "Volumes": { "/foo/bar/myvol":"/path1", "/bar/foo/myvol2":"/path2" },
+    "VolumesRW": { "/foo/bar/myvol": true, "/bar/foo/myvol2": false }
+}
+]

From c31c4aceba8a883bb5d11a9e8a78c0f15f87fd65 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev <o.v.nenashev@gmail.com>
Date: Thu, 7 May 2015 11:54:20 +0300
Subject: [PATCH 0055/1272] Add missing serializers to resolve
 https://github.com/docker-java/docker-java/issues/211

Resolves #211
---
 .../dockerjava/api/model/VolumeBinds.java      | 17 +++++++++++++++++
 .../github/dockerjava/api/model/VolumesRW.java | 18 ++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java b/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
index 62ebc1181..e23ddc9e8 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.core.JsonGenerator;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -12,11 +13,15 @@
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.node.NullNode;
 
 // This is not going to be serialized
 @JsonDeserialize(using = VolumeBinds.Deserializer.class)
+@JsonSerialize(using = VolumeBinds.Serializer.class)
 public class VolumeBinds {
     private final VolumeBind[] binds;
 
@@ -28,6 +33,18 @@ public VolumeBind[] getBinds() {
         return binds;
     }
 
+    public static final class Serializer extends JsonSerializer<VolumeBinds> {
+
+        @Override
+        public void serialize(VolumeBinds value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
+            jgen.writeStartObject();
+            for (final VolumeBind bind : value.binds) {
+                jgen.writeStringField(bind.getContainerPath(), bind.getHostPath());
+            }
+            jgen.writeEndObject();
+        }    
+    }
+    
     public static final class Deserializer extends JsonDeserializer<VolumeBinds> {
         @Override
         public VolumeBinds deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumesRW.java b/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
index 223f518cf..a898ed57f 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.core.JsonGenerator;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -12,10 +13,14 @@
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.node.NullNode;
 
 // This is not going to be serialized
+@JsonSerialize(using = VolumesRW.Serializer.class)
 @JsonDeserialize(using = VolumesRW.Deserializer.class)
 public class VolumesRW {
     private final VolumeRW[] volumesRW;
@@ -28,6 +33,19 @@ public VolumeRW[] getVolumesRW() {
         return volumesRW;
     }
 
+    public static final class Serializer extends JsonSerializer<VolumesRW> {
+
+        @Override
+        public void serialize(VolumesRW value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
+            jgen.writeStartObject();
+            for (final VolumeRW volumeRW : value.volumesRW) {
+                jgen.writeBooleanField(volumeRW.getVolume().getPath(), volumeRW.getAccessMode().toBoolean());
+            }
+            jgen.writeEndObject();
+        }
+        
+    }
+    
     public static final class Deserializer extends JsonDeserializer<VolumesRW> {
         @Override
         public VolumesRW deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {

From d6e8be31202830302b1ab5d00b20a6f7e8d73872 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev <o.v.nenashev@gmail.com>
Date: Thu, 7 May 2015 12:00:45 +0300
Subject: [PATCH 0056/1272] Add roundtrip spotcheck to InspectExecCmdImplTest

---
 .../dockerjava/core/command/InspectExecCmdImplTest.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
index 2deddca09..f1270f4e6 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
@@ -3,8 +3,11 @@
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.ExecCreateCmdResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.command.InspectExecResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
+import java.io.IOException;
 
 import org.testng.ITestResult;
 import org.testng.annotations.*;
@@ -41,7 +44,7 @@ public void afterMethod(ITestResult result) {
     }
 
     @Test(groups = "ignoreInCircleCi")
-    public void inspectExecTest() {
+    public void inspectExecTest() throws IOException {
         String containerName = "generated_" + new SecureRandom().nextInt();
 
         CreateContainerResponse container = dockerClient
@@ -93,5 +96,9 @@ public void inspectExecTest() {
         InspectExecResponse third = dockerClient.inspectExecCmd(checkFileCmdCreateResponse.getId()).exec();
         assertThat(third.getExitCode(), is(0));
 
+        // Get container info and check its roundtrip to ensure the consistency
+        InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(container.getId()).exec();
+        assertEquals(containerInfo.getId(), container.getId());
+        JSONTestHelper.testRoundTrip(containerInfo);
     }
 }

From 390b2f9442eee2014fd1b48df8876582dfef4856 Mon Sep 17 00:00:00 2001
From: Xavier Fournet <xavier.fournet@gmail.com>
Date: Sat, 9 May 2015 00:35:59 +0200
Subject: [PATCH 0057/1272] Use a common path relativize method to fix
 testDockerIgnore and testNonstandard2 * testDockerIgnore was failing if your
 source checkout directory contains a 'b' char. stripStart function was
 misused here * testNonstandard2 was failing on Windows * other usage of
 relativize has been changed to this relativize method (extract from
 CompressArchiveUtil)

---
 .../dockerjava/core/CompressArchiveUtil.java  |  9 +++----
 .../github/dockerjava/core/FilePathUtil.java  | 24 +++++++++++++++++++
 .../core/GoLangMatchFileFilter.java           |  5 +---
 .../core/command/BuildImageCmdImpl.java       |  5 ++--
 .../core/dockerfile/Dockerfile.java           |  5 ++--
 5 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/core/FilePathUtil.java

diff --git a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
index f07fa1b25..297adc766 100644
--- a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
+++ b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
@@ -6,6 +6,8 @@
 
 import java.io.*;
 
+import static com.github.dockerjava.core.FilePathUtil.relativize;
+
 public class CompressArchiveUtil {
 
     public static File archiveTARFiles(File base, Iterable<File> files, String archiveNameWithOutExtension) throws IOException {
@@ -15,7 +17,7 @@ public static File archiveTARFiles(File base, Iterable<File> files, String archi
             tos.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
             for (File file : files) {
                 TarArchiveEntry tarEntry = new TarArchiveEntry(file);
-                tarEntry.setName(relativize(base.getCanonicalFile(), file.getCanonicalFile()));
+                tarEntry.setName(relativize(base, file));
 
                 if (!file.isDirectory()) {
                     if (file.canExecute()) {
@@ -36,9 +38,4 @@ public static File archiveTARFiles(File base, Iterable<File> files, String archi
 
         return tarFile;
     }
-
-    public static String relativize(File base, File absolute) {
-        String relative = base.toURI().relativize(absolute.toURI()).getPath();
-        return relative;
-    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/FilePathUtil.java b/src/main/java/com/github/dockerjava/core/FilePathUtil.java
new file mode 100644
index 000000000..3fc910217
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/FilePathUtil.java
@@ -0,0 +1,24 @@
+package com.github.dockerjava.core;
+
+import java.io.*;
+import com.github.dockerjava.api.DockerClientException;
+
+public class FilePathUtil {
+
+    /**
+     * Return the relative path. Path elements are separated with / char. 
+     * @param baseDir a parent directory of {@code file}
+     * @param file the file to get the relative path
+     * @return the relative path
+     */
+    public static String relativize(File baseDir, File file) {
+        try {
+            baseDir = baseDir.getCanonicalFile();
+            file = file.getCanonicalFile();
+
+            return baseDir.toURI().relativize(file.toURI()).getPath();
+        } catch (IOException e) {
+            throw new DockerClientException(e.getMessage(), e);
+        }
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java b/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
index aa88287b4..33e0f2a47 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
@@ -3,8 +3,6 @@
  */
 package com.github.dockerjava.core;
 
-import static org.apache.commons.lang.StringUtils.stripStart;
-
 import java.io.File;
 import java.util.List;
 
@@ -25,8 +23,7 @@ public GoLangMatchFileFilter(File base, List<String> patterns) {
 
     @Override
     public boolean accept(File file) {
-        String basePath = base.getAbsolutePath() + File.separatorChar;
-        String relativePath = stripStart(file.getAbsolutePath(), basePath);
+        String relativePath = FilePathUtil.relativize(base, file);
         
         boolean match = GoLangFileMatch.match(patterns, relativePath);
         return !match;
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index 046565d3f..dbccda5fc 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -8,8 +8,8 @@
 
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.model.AuthConfigurations;
+import com.github.dockerjava.core.FilePathUtil;
 import com.github.dockerjava.core.dockerfile.Dockerfile;
-import com.google.common.base.Optional;
 
 /**
  * 
@@ -125,8 +125,7 @@ public boolean hasPullEnabled() {
 
     @Override
     public String getPathToDockerfile() {
-        int baseLen = baseDirectory.getAbsolutePath().length();
-        return dockerFile.getAbsolutePath().substring(baseLen+1);
+        return FilePathUtil.relativize(baseDirectory, dockerFile);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 21d938ffd..f5b25f2b3 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -2,6 +2,7 @@
 
 import com.github.dockerjava.api.DockerClientException;
 import com.github.dockerjava.core.CompressArchiveUtil;
+import com.github.dockerjava.core.FilePathUtil;
 import com.github.dockerjava.core.GoLangFileMatch;
 import com.github.dockerjava.core.GoLangFileMatchException;
 import com.github.dockerjava.core.GoLangMatchFileFilter;
@@ -23,7 +24,6 @@
 import com.google.common.base.Function;
 import com.google.common.base.Objects;
 import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 
 /**
@@ -209,8 +209,7 @@ private void processAddStatement(DockerfileStatement.Add add) throws IOException
         } else if (!src.exists()) {
           filesToAdd.addAll(resolveWildcards(src, ignores));
         } else if (!GoLangFileMatch.match(ignores,
-                                          CompressArchiveUtil.relativize(dockerFolder,
-                                                                         src))) {
+                                          FilePathUtil.relativize(dockerFolder, src))) {
           filesToAdd.add(src);
         } else {
           throw new DockerClientException(

From 3bdb89994e7fe35b532ef26efd16ff9f00faac0a Mon Sep 17 00:00:00 2001
From: Xavier Fournet <xavier.fournet@gmail.com>
Date: Sat, 9 May 2015 01:18:44 +0200
Subject: [PATCH 0058/1272] Fix testDockerBuilderAddFilesViaWildcard on Windows
 However i'm quite skeptical on the Dockerfile.resolveWildcards method

---
 .../core/dockerfile/Dockerfile.java           | 32 +++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index f5b25f2b3..802299a7c 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -189,33 +189,25 @@ private void processAddStatement(DockerfileStatement.Add add) throws IOException
 
         File src = new File(resource);
         if (!src.isAbsolute()) {
-          src = new File(dockerFolder, resource)
-              .getCanonicalFile();
+          src = new File(dockerFolder, resource);
         } else {
           throw new DockerClientException(String.format(
               "Source file %s must be relative to %s",
               src, dockerFolder));
         }
 
-        // if (!src.exists()) {
-        // throw new DockerClientException(String.format(
-        // "Source file %s doesn't exist", src));
-        // }
-        if (src.isDirectory()) {
-          Collection<File> files = FileUtils.listFiles(src,
-                                                       new GoLangMatchFileFilter(src, ignores),
-                                                       TrueFileFilter.INSTANCE);
-          filesToAdd.addAll(files);
-        } else if (!src.exists()) {
-          filesToAdd.addAll(resolveWildcards(src, ignores));
-        } else if (!GoLangFileMatch.match(ignores,
-                                          FilePathUtil.relativize(dockerFolder, src))) {
-          filesToAdd.add(src);
+        if (src.exists()) {
+          src = src.getCanonicalFile();
+          if (src.isDirectory()) {
+            Collection<File> files = FileUtils.listFiles(src, new GoLangMatchFileFilter(src, ignores), TrueFileFilter.INSTANCE);
+            filesToAdd.addAll(files);
+          } else if (!GoLangFileMatch.match(ignores, FilePathUtil.relativize(dockerFolder, src))) {
+            filesToAdd.add(src);
+          } else {
+            throw new DockerClientException(String.format("Source file %s is excluded by .dockerignore file", src));
+          }            
         } else {
-          throw new DockerClientException(
-              String.format(
-                  "Source file %s is excluded by .dockerignore file",
-                  src));
+          filesToAdd.addAll(resolveWildcards(src, ignores));
         }
       }
     }

From 0e52d21471f82368b1ad950e6e49916fc133c8b3 Mon Sep 17 00:00:00 2001
From: Xavier Fournet <xavier.fournet@gmail.com>
Date: Sat, 9 May 2015 01:27:44 +0200
Subject: [PATCH 0059/1272] Fix canCloseFrameReaderAndReadExpectedLines test on
 Windows

---
 .../github/dockerjava/core/command/FrameReaderITest.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index 0cf08e953..0c22fc085 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -38,8 +38,8 @@ public void deleteDockerContainerImage() throws Exception {
     public void canCloseFrameReaderAndReadExpectedLines() throws Exception {
 
         try (FrameReader reader = new FrameReader(getLoggerStream())) {
-            assertEquals(reader.readFrame(), new Frame(StreamType.STDOUT, String.format("to stdout%n").getBytes()));
-            assertEquals(reader.readFrame(), new Frame(StreamType.STDERR, String.format("to stderr%n").getBytes()));
+            assertEquals(reader.readFrame(), new Frame(StreamType.STDOUT, "to stdout\n".getBytes()));
+            assertEquals(reader.readFrame(), new Frame(StreamType.STDERR, "to stderr\n".getBytes()));
             assertNull(reader.readFrame());
         }
     }
@@ -83,4 +83,4 @@ public void run() {
         thread.join();
 
     }
-}
\ No newline at end of file
+}

From d61b7c4af08cfcc9bbdc59e450345673dada35dc Mon Sep 17 00:00:00 2001
From: Xavier Fournet <xavier.fournet@gmail.com>
Date: Sat, 9 May 2015 12:54:10 +0200
Subject: [PATCH 0060/1272] Fix regression when building an image from a TAR
 input stream

---
 .../core/command/BuildImageCmdImpl.java       |  6 +-
 .../core/command/BuildImageCmdImplTest.java   | 63 ++++++++++++-------
 2 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index dbccda5fc..ef0242857 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -125,7 +125,11 @@ public boolean hasPullEnabled() {
 
     @Override
     public String getPathToDockerfile() {
-        return FilePathUtil.relativize(baseDirectory, dockerFile);
+        if (baseDirectory != null && dockerFile != null) {
+            return FilePathUtil.relativize(baseDirectory, dockerFile);
+        } else {
+            return null;
+        }
     }
 
     @Override
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index bd8a56d2d..c9bd51b90 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -9,10 +9,15 @@
 import static org.hamcrest.Matchers.nullValue;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.UUID;
 
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.filefilter.TrueFileFilter;
 import org.apache.commons.lang.StringUtils;
 
 import org.testng.ITestResult;
@@ -24,12 +29,13 @@
 
 import com.github.dockerjava.api.DockerClientException;
 import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.command.InspectImageResponse;
 import com.github.dockerjava.api.model.EventStreamItem;
 import com.github.dockerjava.client.AbstractDockerClientTest;
-
+import com.github.dockerjava.core.CompressArchiveUtil;
 
 @Test(groups = "integration")
 public class BuildImageCmdImplTest extends AbstractDockerClientTest {
@@ -105,7 +111,16 @@ public void testNonstandard2() {
         assertThat(fullLog, containsString("Successfully built"));
     }
 
-	@Test
+    @Test
+    public void testDockerBuilderFromTar() throws IOException {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddFile").getFile());
+        Collection<File> files = FileUtils.listFiles(baseDir, TrueFileFilter.INSTANCE, TrueFileFilter.INSTANCE);
+        File tarFile = CompressArchiveUtil.archiveTARFiles(baseDir, files, UUID.randomUUID().toString());
+        String response = dockerfileBuild(new FileInputStream(tarFile));
+        assertThat(response, containsString("Successfully executed testrun.sh"));
+    }
+
+    @Test
 	public void testDockerBuilderAddUrl()  {
 		File baseDir = new File(Thread.currentThread().getContextClassLoader()
 				.getResource("testAddUrl").getFile());
@@ -150,37 +165,39 @@ public void testDockerBuilderEnv() throws DockerException,
 		assertThat(response, containsString("Successfully executed testrun.sh"));
 	}
 
+    private String dockerfileBuild(InputStream tarInputStream) {
+        return execBuild(dockerClient.buildImageCmd().withTarInputStream(tarInputStream));
+    }
 
-	private String dockerfileBuild(File baseDir) {
-
-		// Build image
-		InputStream response = dockerClient.buildImageCmd(baseDir).withNoCache().exec();
+    private String dockerfileBuild(File baseDir) {
+        return execBuild(dockerClient.buildImageCmd(baseDir));
+	}
 
-		String fullLog = asString(response);
-		assertThat(fullLog, containsString("Successfully built"));
+    private String execBuild(BuildImageCmd buildImageCmd) {
+        // Build image
+        InputStream response = buildImageCmd.withNoCache().exec();
 
-		String imageId = StringUtils.substringBetween(fullLog,
-				"Successfully built ", "\\n\"}").trim();
+        String fullLog = asString(response);
+        assertThat(fullLog, containsString("Successfully built"));
 
-		// Create container based on image
-		CreateContainerResponse container = dockerClient.createContainerCmd(
-				imageId).exec();
+        String imageId = StringUtils.substringBetween(fullLog, "Successfully built ", "\\n\"}").trim();
 
-		LOG.info("Created container: {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
+        // Create container based on image
+        CreateContainerResponse container = dockerClient.createContainerCmd(imageId).exec();
 
-		dockerClient.startContainerCmd(container.getId()).exec();
-		dockerClient.waitContainerCmd(container.getId()).exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
 
-		// Log container
-		InputStream logResponse = logContainer(container
-				.getId());
+        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerClient.waitContainerCmd(container.getId()).exec();
 
-		//assertThat(asString(logResponse), containsString(expectedText));
+        // Log container
+        InputStream logResponse = logContainer(container.getId());
 
-		return asString(logResponse);
-	}
+        //assertThat(asString(logResponse), containsString(expectedText));
 
+        return asString(logResponse);
+    }
 
 	private InputStream logContainer(String containerId) {
 		return dockerClient.logContainerCmd(containerId).withStdErr().withStdOut().exec();

From 5ee09ba4ae06a90761c7027477cef433a4ca45ce Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 10 May 2015 18:33:03 +0200
Subject: [PATCH 0061/1272] Fix issue #201

---
 .../java/com/github/dockerjava/jaxrs/EventsCmdExec.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
index 78d26fead..32ab45f2a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -70,7 +70,11 @@ public Void call() throws Exception {
                 InputStream inputStream = new WrappedResponseInputStream(response);
                 JsonParser jp = JSON_FACTORY.createParser(inputStream);
                 while (jp.nextToken() != JsonToken.END_OBJECT && !jp.isClosed() && eventCallback.isReceiving()) {
-                    eventCallback.onEvent(OBJECT_MAPPER.readValue(jp, Event.class));
+                    try {
+                    	eventCallback.onEvent(OBJECT_MAPPER.readValue(jp, Event.class));
+                    } catch(Exception e) {
+                    	eventCallback.onException(e);
+                    }
                     numEvents++;
                 }
             }

From 72a61dd7834367e99524e5a91a47397d8970b0d7 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 10 May 2015 18:33:29 +0200
Subject: [PATCH 0062/1272] Fix test expectation

---
 .../github/dockerjava/core/command/EventStreamReaderITest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java b/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
index dfc330d9e..7d4f9d4ef 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
@@ -42,7 +42,7 @@ public void pullCanBeStreamed() throws Exception {
         ) {;
             assertThat(reader.readItem(),
                     allOf(
-                            hasProperty("status", equalTo("Pulling repository busybox")),
+                            hasProperty("status", equalTo("Pulling from busybox")),
                             hasProperty("progress", nullValue()),
                             hasProperty("progressDetail", nullValue())
                     )

From 355e649b66b5792bb8401fabf2b6743040ebf99d Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 10 May 2015 18:37:33 +0200
Subject: [PATCH 0063/1272] Call onCompletetion callback before close because
 of https://github.com/docker-java/docker-java/issues/196

---
 .../dockerjava/jaxrs/EventsCmdExec.java       | 148 ++++++++++--------
 1 file changed, 80 insertions(+), 68 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
index 32ab45f2a..924fdaedd 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -22,72 +22,84 @@
 import com.github.dockerjava.api.model.Event;
 import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
 
-public class EventsCmdExec extends AbstrDockerCmdExec<EventsCmd, ExecutorService> implements EventsCmd.Exec {
-    private static final Logger LOGGER = LoggerFactory.getLogger(EventsCmdExec.class);
-    
-    public EventsCmdExec(WebTarget baseResource) {
-        super(baseResource);
-    }
-
-    @Override
-    protected ExecutorService execute(EventsCmd command) {
-    	ExecutorService executorService = Executors.newSingleThreadExecutor();
-    	
-        WebTarget webResource = getBaseResource().path("/events")
-                .queryParam("since", command.getSince())
-                .queryParam("until", command.getUntil());
-
-        LOGGER.trace("GET: {}", webResource);
-        EventNotifier eventNotifier = EventNotifier.create(command.getEventCallback(), webResource);
-        executorService.submit(eventNotifier);
-        return executorService;
-    }
-    
-    private static class EventNotifier implements Callable<Void> {
-        private static final JsonFactory JSON_FACTORY = new JsonFactory();
-        private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-
-        private final EventCallback eventCallback;
-        private final WebTarget webTarget;
-
-        private EventNotifier(EventCallback eventCallback, WebTarget webTarget) {
-            this.eventCallback = eventCallback;
-            this.webTarget = webTarget;
-        }
-
-        public static EventNotifier create(EventCallback eventCallback, WebTarget webTarget) {
-            checkNotNull(eventCallback, "An EventCallback must be provided");
-            checkNotNull(webTarget, "An WebTarget must be provided");
-            return new EventNotifier(eventCallback, webTarget);
-        }
-
-        @Override
-        public Void call() throws Exception {
-            int numEvents=0;
-            Response response = null;
-            try {
-                response = webTarget.request().get(Response.class);
-                InputStream inputStream = new WrappedResponseInputStream(response);
-                JsonParser jp = JSON_FACTORY.createParser(inputStream);
-                while (jp.nextToken() != JsonToken.END_OBJECT && !jp.isClosed() && eventCallback.isReceiving()) {
-                    try {
-                    	eventCallback.onEvent(OBJECT_MAPPER.readValue(jp, Event.class));
-                    } catch(Exception e) {
-                    	eventCallback.onException(e);
-                    }
-                    numEvents++;
-                }
-            }
-            catch(Exception e) {
-                eventCallback.onException(e);
-            }
-            finally {
-                if (response != null) {
-                    response.close();
-                }
-            }
-            eventCallback.onCompletion(numEvents);
-            return null;
-        }
-    }
+public class EventsCmdExec extends
+		AbstrDockerCmdExec<EventsCmd, ExecutorService> implements
+		EventsCmd.Exec {
+	private static final Logger LOGGER = LoggerFactory
+			.getLogger(EventsCmdExec.class);
+
+	public EventsCmdExec(WebTarget baseResource) {
+		super(baseResource);
+	}
+
+	@Override
+	protected ExecutorService execute(EventsCmd command) {
+		ExecutorService executorService = Executors.newSingleThreadExecutor();
+
+		WebTarget webResource = getBaseResource().path("/events")
+				.queryParam("since", command.getSince())
+				.queryParam("until", command.getUntil());
+
+		LOGGER.trace("GET: {}", webResource);
+		EventNotifier eventNotifier = EventNotifier.create(
+				command.getEventCallback(), webResource);
+		executorService.submit(eventNotifier);
+		return executorService;
+	}
+
+	private static class EventNotifier implements Callable<Void> {
+		private static final JsonFactory JSON_FACTORY = new JsonFactory();
+		private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+		private final EventCallback eventCallback;
+		private final WebTarget webTarget;
+
+		private EventNotifier(EventCallback eventCallback, WebTarget webTarget) {
+			this.eventCallback = eventCallback;
+			this.webTarget = webTarget;
+		}
+
+		public static EventNotifier create(EventCallback eventCallback,
+				WebTarget webTarget) {
+			checkNotNull(eventCallback, "An EventCallback must be provided");
+			checkNotNull(webTarget, "An WebTarget must be provided");
+			return new EventNotifier(eventCallback, webTarget);
+		}
+
+		@Override
+		public Void call() throws Exception {
+			int numEvents = 0;
+			Response response = null;
+			try {
+				response = webTarget.request().get(Response.class);
+				InputStream inputStream = new WrappedResponseInputStream(
+						response);
+				JsonParser jp = JSON_FACTORY.createParser(inputStream);
+				while (jp.nextToken() != JsonToken.END_OBJECT && !jp.isClosed()
+						&& eventCallback.isReceiving()) {
+					try {
+						eventCallback.onEvent(OBJECT_MAPPER.readValue(jp,
+								Event.class));
+					} catch (Exception e) {
+						eventCallback.onException(e);
+					}
+					numEvents++;
+				}
+			} catch (Exception e) {
+				eventCallback.onException(e);
+			} finally {
+				// call onCompletion before close because of https://github.com/docker-java/docker-java/issues/196
+				try {
+					eventCallback.onCompletion(numEvents);
+				} catch (Exception e) {
+					eventCallback.onException(e);
+				}
+				if (response != null) {
+					response.close();
+				}
+			}
+
+			return null;
+		}
+	}
 }

From 1d52a47266e78db5769b61bcd6e3612c655b8869 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 10 May 2015 19:21:05 +0200
Subject: [PATCH 0064/1272] Fix issue #214

---
 .../java/com/github/dockerjava/api/model/ContainerConfig.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
index dcb1256b0..ce8c6b88f 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
@@ -64,7 +64,7 @@ public class ContainerConfig {
 	private boolean networkDisabled = false;
 
 	@JsonProperty("OnBuild")
-	private int[] onBuild;
+	private String[] onBuild;
 
 	@JsonProperty("OpenStdin")
 	private boolean stdinOpen = false;
@@ -180,7 +180,7 @@ public String[] getEntrypoint() {
 		return entrypoint;
 	}
 
-	public int[] getOnBuild() {
+	public String[] getOnBuild() {
 		return onBuild;
 	}
 

From 8652329036eeb5ac583584b27a04c4261aca7b8e Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Sun, 10 May 2015 19:22:32 +0200
Subject: [PATCH 0065/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6fca225d..3d3cb24d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@ Change Log
 ===
 Latest SNAPSHOT
 ---
+* [#213](https://github.com/docker-java/docker-java/pull/213) Add ulimit support
 * [#208](https://github.com/docker-java/docker-java/pull/208) Added PullEventStreamItem and EventStreamReader to stream the reading of events
 * [#205](https://github.com/docker-java/docker-java/issues/205) Access mode of VolumesRW incorrectly deserialized
 * [#204] (https://github.com/docker-java/docker-java/pull/204) Added support to use the credentials from .dockercfg during build

From 5e268e50343dfebf461b1e71dec8600881c9c3de Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Sun, 10 May 2015 19:23:04 +0200
Subject: [PATCH 0066/1272] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bbafd8a6a..6516793d2 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 Java API client for [Docker](http://docs.docker.io/ "Docker")
 
-Supports a subset of the Docker Client API v1.17, Docker Server version 1.5.0
+Supports a subset of the Docker Client API v1.18, Docker Server version 1.6.0
 
 <b>The current implementation is based on Jersey 2.x and therefore classpath incompatible with older Jersey 1.x dependent libraries!</b>
 

From 9954713fbbae4828bc0aea3e154ca8a8b7dec810 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 10 May 2015 20:07:36 +0200
Subject: [PATCH 0067/1272] Exclude from CircleCI integration tests

---
 .../dockerjava/core/command/CreateContainerCmdImplTest.java    | 3 ++-
 .../github/dockerjava/core/command/EventStreamReaderITest.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index c37f48484..c652f51d7 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -6,6 +6,7 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.*;
 import com.github.dockerjava.client.AbstractDockerClientTest;
+
 import org.testng.ITestResult;
 import org.testng.annotations.*;
 
@@ -540,7 +541,7 @@ public void createContainerWithMacAddress() throws DockerException {
 				"00:80:41:ae:fd:7e");
 	}
 
-	@Test
+	@Test(groups = "ignoreInCircleCi")
 	public void createContainerWithULimits() throws DockerException {
 
 		Ulimit[] ulimits = {new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096)};
diff --git a/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java b/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
index 7d4f9d4ef..07bca25b5 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
@@ -33,7 +33,7 @@ public void tearDown() throws Exception {
         dockerClient.close();
     }
 
-    @Test
+    @Test(groups = "ignoreInCircleCi")
     public void pullCanBeStreamed() throws Exception {
 
         try (EventStreamReader<PullEventStreamItem> reader = new EventStreamReader<>(

From ebcb85c15ba72278b3dae6c425e0804374767e9b Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 10 May 2015 20:09:54 +0200
Subject: [PATCH 0068/1272] Set new semver version

---
 README.md | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6516793d2..9584fdcb6 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ You can find the latest SNAPSHOT version including javadoc and source files on [
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>1.2.1-SNAPSHOT</version>
+          <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
 ## Documentation
diff --git a/pom.xml b/pom.xml
index 1279f9c11..d9aa194da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>

From 3a0e734148b6786c1fde4021fe1db6b3ba5cb8fe Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 10 May 2015 20:52:29 +0200
Subject: [PATCH 0069/1272] [maven-release-plugin] prepare release
 docker-java-1.3.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d9aa194da..0b28d5dd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>1.3.0-SNAPSHOT</version>
+	<version>1.3.0</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>docker-java-1.3.0</tag>
 	</scm>
 
 	<developers>

From f4f8b5616c28688dbb97fa494df47b91b4738525 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 10 May 2015 20:52:32 +0200
Subject: [PATCH 0070/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0b28d5dd6..f8eb34ced 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>1.3.0</version>
+	<version>1.3.1-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>docker-java-1.3.0</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 9daa3733233c2733fce2599ff884c1e091cb4993 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Sun, 10 May 2015 20:56:21 +0200
Subject: [PATCH 0071/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d3cb24d7..ea3118178 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@ Change Log
 ===
 Latest SNAPSHOT
 ---
+
+v1.3.0
+---
 * [#213](https://github.com/docker-java/docker-java/pull/213) Add ulimit support
 * [#208](https://github.com/docker-java/docker-java/pull/208) Added PullEventStreamItem and EventStreamReader to stream the reading of events
 * [#205](https://github.com/docker-java/docker-java/issues/205) Access mode of VolumesRW incorrectly deserialized

From c5ba01b72951096a4c8088a96eedc1a4697da7cb Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Sun, 10 May 2015 20:56:47 +0200
Subject: [PATCH 0072/1272] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9584fdcb6..4c77e896c 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ Run build without integration tests:
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>1.2.0</version>
+          <version>1.3.0</version>
     </dependency>
 
 ### Latest SNAPSHOT version
@@ -74,7 +74,7 @@ You can find the latest SNAPSHOT version including javadoc and source files on [
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>1.3.0-SNAPSHOT</version>
+          <version>1.3.1-SNAPSHOT</version>
     </dependency>
 
 ## Documentation

From e34638a9b38a29eca8242e0aaa910b09d9f019ec Mon Sep 17 00:00:00 2001
From: James Nord <jnord+github@cloudbees.com>
Date: Wed, 13 May 2015 10:52:45 +0100
Subject: [PATCH 0073/1272] Do not wait for another event before exiting.

It the callback decideds it is no longer interested in receiving events
whilst it handles either an event or an exception then it should not have to
wait until the next event from Docker is received to exit the loop.

This adds a check before the event is received and leaves the check after
the event has received as the event may take a long time to come and the
callback may have decided during that time that it wants to shutdown.
---
 .../java/com/github/dockerjava/jaxrs/EventsCmdExec.java  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
index 924fdaedd..db14ab21b 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -75,8 +75,13 @@ public Void call() throws Exception {
 				InputStream inputStream = new WrappedResponseInputStream(
 						response);
 				JsonParser jp = JSON_FACTORY.createParser(inputStream);
-				while (jp.nextToken() != JsonToken.END_OBJECT && !jp.isClosed()
-						&& eventCallback.isReceiving()) {
+				// The following condition looks strange but jp.nextToken() will block until there is an
+				// event from the docker server or the connection is terminated.
+				// therefore we want to check before getting an event (to prevent a blocking operation
+				// and after the event to make sure that the eventCallback is still interested in getting notified.
+				while (eventCallback.isReceiving() && 
+				       jp.nextToken() != JsonToken.END_OBJECT && !jp.isClosed() &&
+				       eventCallback.isReceiving()) {
 					try {
 						eventCallback.onEvent(OBJECT_MAPPER.readValue(jp,
 								Event.class));

From a9b92e383c600cafc03d24b811b7176cb7982ff3 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 14 May 2015 19:57:01 +0200
Subject: [PATCH 0074/1272] Fix roundtrip test

---
 .../dockerjava/test/serdes/JSONTestHelper.java | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java b/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
index b465b2aac..b6a33b722 100644
--- a/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
+++ b/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
@@ -15,11 +15,15 @@
  */
 package com.github.dockerjava.test.serdes;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.command.CommandJSONSamples;
+
 import java.io.IOException;
 import java.io.InputStream;
+
 import org.apache.commons.io.IOUtils;
+
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
@@ -101,10 +105,14 @@ public static <TClass> TClass testRoundTrip(TClass item, Class<TClass> asclass)
             throws IOException, AssertionError {
         ObjectMapper mapper = new ObjectMapper();
        
-        String inputItemString = mapper.writeValueAsString(item);
-        TClass convertedItem = mapper.readValue(inputItemString, asclass);
-        String convertedItemString = mapper.writeValueAsString(convertedItem);
-        assertEquals(convertedItemString, inputItemString, "JSONs must be equal after the second roundtrip");
-        return convertedItem;
+        String serialized1 = mapper.writeValueAsString(item);
+        JsonNode json1 = mapper.readTree(serialized1);
+        TClass deserialized1 = mapper.readValue(serialized1, asclass);
+        String serialized2 = mapper.writeValueAsString(deserialized1);
+        JsonNode json2 = mapper.readTree(serialized2);
+        TClass deserialized2 = mapper.readValue(serialized2, asclass);
+        
+        assertEquals(json2, json1, "JSONs must be equal after the second roundtrip");
+        return deserialized2;
     }
 }

From a072d62104d03d53cf2f9a41b95fd527fb6acbb9 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 14 May 2015 20:58:49 +0200
Subject: [PATCH 0075/1272] Workaround for issue #196

---
 .../jaxrs/DockerCmdExecFactoryImpl.java       |   5 +-
 .../jaxrs/connector/ApacheConnector.java      | 698 ++++++++++++++++++
 .../ApacheConnectorClientResponse.java        |  52 ++
 .../connector/ApacheConnectorProvider.java    | 151 ++++
 .../dockerjava/jaxrs/connector/README.txt     |   3 +
 .../core/command/EventsCmdImplTest.java       |  34 +-
 6 files changed, 939 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/connector/README.txt

diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index bc3afecad..3636bfd06 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -22,7 +22,9 @@
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.glassfish.jersey.CommonProperties;
 import org.glassfish.jersey.apache.connector.ApacheClientProperties;
-import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
+//import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
+// see https://github.com/docker-java/docker-java/issues/196
+import com.github.dockerjava.jaxrs.connector.ApacheConnectorProvider;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
 
@@ -34,6 +36,7 @@
 import com.github.dockerjava.core.util.ResponseStatusExceptionFilter;
 import com.github.dockerjava.core.util.SelectiveLoggingFilter;
 
+
 public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
 
 	private static final Logger LOGGER = LoggerFactory
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
new file mode 100644
index 000000000..651db983d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
@@ -0,0 +1,698 @@
+package com.github.dockerjava.jaxrs.connector;
+
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2010-2014 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.core.Configuration;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+
+import org.glassfish.jersey.SslConfigurator;
+import org.glassfish.jersey.apache.connector.ApacheClientProperties;
+import org.glassfish.jersey.apache.connector.LocalizationMessages;
+import org.glassfish.jersey.client.ClientProperties;
+import org.glassfish.jersey.client.ClientRequest;
+import org.glassfish.jersey.client.ClientResponse;
+import org.glassfish.jersey.client.RequestEntityProcessing;
+import org.glassfish.jersey.client.spi.AsyncConnectorCallback;
+import org.glassfish.jersey.client.spi.Connector;
+import org.glassfish.jersey.internal.util.PropertiesHelper;
+import org.glassfish.jersey.message.internal.HeaderUtils;
+import org.glassfish.jersey.message.internal.OutboundMessageContext;
+import org.glassfish.jersey.message.internal.ReaderWriter;
+import org.glassfish.jersey.message.internal.Statuses;
+import org.apache.http.Header;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.AuthCache;
+import org.apache.http.client.CookieStore;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.CookieSpecs;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.client.methods.RequestBuilder;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.config.ConnectionConfig;
+import org.apache.http.config.Registry;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.HttpClientConnectionManager;
+import org.apache.http.conn.ManagedHttpClientConnection;
+import org.apache.http.conn.routing.HttpRoute;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLContexts;
+import org.apache.http.conn.ssl.X509HostnameVerifier;
+import org.apache.http.entity.AbstractHttpEntity;
+import org.apache.http.entity.BufferedHttpEntity;
+import org.apache.http.entity.ContentLengthStrategy;
+import org.apache.http.impl.auth.BasicScheme;
+import org.apache.http.impl.client.BasicAuthCache;
+import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.DefaultManagedHttpClientConnection;
+import org.apache.http.impl.conn.ManagedHttpClientConnectionFactory;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.impl.io.ChunkedOutputStream;
+import org.apache.http.io.SessionOutputBuffer;
+import org.apache.http.util.TextUtils;
+import org.apache.http.util.VersionInfo;
+
+import jersey.repackaged.com.google.common.util.concurrent.MoreExecutors;
+
+/**
+ * A {@link Connector} that utilizes the Apache HTTP Client to send and receive
+ * HTTP request and responses.
+ * <p/>
+ * The following properties are only supported at construction of this class:
+ * <ul>
+ * <li>{@link ApacheClientProperties#CONNECTION_MANAGER}</li>
+ * <li>{@link ApacheClientProperties#REQUEST_CONFIG}</li>
+ * <li>{@link ApacheClientProperties#CREDENTIALS_PROVIDER}</li>
+ * <li>{@link ApacheClientProperties#DISABLE_COOKIES}</li>
+ * <li>{@link ClientProperties#PROXY_URI}</li>
+ * <li>{@link ClientProperties#PROXY_USERNAME}</li>
+ * <li>{@link ClientProperties#PROXY_PASSWORD}</li>
+ * <li>{@link ClientProperties#REQUEST_ENTITY_PROCESSING} - default value is {@link RequestEntityProcessing#CHUNKED}</li>
+ * <li>{@link ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION}</li>
+ * <li>{@link ApacheClientProperties#SSL_CONFIG}</li>
+ * </ul>
+ * <p>
+ * This connector uses {@link RequestEntityProcessing#CHUNKED chunked encoding} as a default setting. This can
+ * be overridden by the {@link ClientProperties#REQUEST_ENTITY_PROCESSING}. By default the
+ * {@link ClientProperties#CHUNKED_ENCODING_SIZE} property is only supported by using default connection manager. If custom
+ * connection manager needs to be used then chunked encoding size can be set by providing a custom
+ * {@link org.apache.http.HttpClientConnection} (via custom {@link org.apache.http.impl.conn.ManagedHttpClientConnectionFactory})
+ * and overriding {@code createOutputStream} method.
+ * </p>
+ * <p>
+ * Using of authorization is dependent on the chunk encoding setting. If the entity
+ * buffering is enabled, the entity is buffered and authorization can be performed
+ * automatically in response to a 401 by sending the request again. When entity buffering
+ * is disabled (chunked encoding is used) then the property
+ * {@link org.glassfish.jersey.apache.connector.ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION} must
+ * be set to {@code true}.
+ * </p>
+ * <p>
+ * If a {@link org.glassfish.jersey.client.ClientResponse} is obtained and an
+ * entity is not read from the response then
+ * {@link org.glassfish.jersey.client.ClientResponse#close()} MUST be called
+ * after processing the response to release connection-based resources.
+ * </p>
+ * <p>
+ * Client operations are thread safe, the HTTP connection may
+ * be shared between different threads.
+ * </p>
+ * <p>
+ * If a response entity is obtained that is an instance of {@link Closeable}
+ * then the instance MUST be closed after processing the entity to release
+ * connection-based resources.
+ * </p>
+ * <p>
+ * The following methods are currently supported: HEAD, GET, POST, PUT, DELETE, OPTIONS, PATCH and TRACE.
+ * </p>
+ *
+ * @author jorgeluisw@mac.com
+ * @author Paul Sandoz (paul.sandoz at oracle.com)
+ * @author Pavel Bucek (pavel.bucek at oracle.com)
+ * @author Arul Dhesiaseelan (aruld at acm.org)
+ * @see ApacheClientProperties#CONNECTION_MANAGER
+ */
+@SuppressWarnings("deprecation")
+class ApacheConnector implements Connector {
+
+    private final static Logger LOGGER = Logger.getLogger(ApacheConnector.class.getName());
+
+    private static final VersionInfo vi;
+    private static final String release;
+
+    static {
+        vi = VersionInfo.loadVersionInfo("org.apache.http.client", HttpClientBuilder.class.getClassLoader());
+        release = (vi != null) ? vi.getRelease() : VersionInfo.UNAVAILABLE;
+    }
+
+    private final CloseableHttpClient client;
+    private final CookieStore cookieStore;
+    private final boolean preemptiveBasicAuth;
+    private final RequestConfig requestConfig;
+
+    /**
+     * Create the new Apache HTTP Client connector.
+     *
+     * @param config client configuration.
+     */
+    ApacheConnector(Configuration config) {
+        Object reqConfig = null;
+
+        if (config != null) {
+            final Object connectionManager = config.getProperties().get(ApacheClientProperties.CONNECTION_MANAGER);
+
+            if (connectionManager != null) {
+                if (!(connectionManager instanceof HttpClientConnectionManager)) {
+                    LOGGER.log(
+                            Level.WARNING,
+                            LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
+                                    ApacheClientProperties.CONNECTION_MANAGER,
+                                    connectionManager.getClass().getName(),
+                                    HttpClientConnectionManager.class.getName())
+                    );
+                }
+            }
+
+            reqConfig = config.getProperties().get(ApacheClientProperties.REQUEST_CONFIG);
+            if (reqConfig != null) {
+                if (!(reqConfig instanceof RequestConfig)) {
+                    LOGGER.log(
+                            Level.WARNING,
+                            LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
+                                    ApacheClientProperties.REQUEST_CONFIG,
+                                    reqConfig.getClass().getName(),
+                                    RequestConfig.class.getName())
+                    );
+                    reqConfig = null;
+                }
+            }
+        }
+
+        final SSLContext sslContext = getSslContext(config);
+        final HttpClientBuilder clientBuilder = HttpClientBuilder.create();
+
+        clientBuilder.setConnectionManager(getConnectionManager(config, sslContext));
+        clientBuilder.setSslcontext(sslContext);
+
+        final RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
+
+        int connectTimeout = 0;
+        int socketTimeout = 0;
+        boolean ignoreCookies = false;
+        if (config != null) {
+            connectTimeout = ClientProperties.getValue(config.getProperties(), ClientProperties.CONNECT_TIMEOUT, 0);
+            socketTimeout = ClientProperties.getValue(config.getProperties(), ClientProperties.READ_TIMEOUT, 0);
+            ignoreCookies = PropertiesHelper.isProperty(config.getProperties(), ApacheClientProperties.DISABLE_COOKIES);
+
+            final Object credentialsProvider = config.getProperty(ApacheClientProperties.CREDENTIALS_PROVIDER);
+            if (credentialsProvider != null && (credentialsProvider instanceof CredentialsProvider)) {
+                clientBuilder.setDefaultCredentialsProvider((CredentialsProvider) credentialsProvider);
+            }
+
+            Object proxyUri;
+            proxyUri = config.getProperty(ClientProperties.PROXY_URI);
+            if (proxyUri != null) {
+                final URI u = getProxyUri(proxyUri);
+                final HttpHost proxy = new HttpHost(u.getHost(), u.getPort(), u.getScheme());
+                String userName;
+                userName = ClientProperties.getValue(config.getProperties(), ClientProperties.PROXY_USERNAME, String.class);
+                if (userName != null) {
+                    String password;
+                    password = ClientProperties.getValue(config.getProperties(), ClientProperties.PROXY_PASSWORD, String.class);
+
+                    if (password != null) {
+                        final CredentialsProvider credsProvider = new BasicCredentialsProvider();
+                        credsProvider.setCredentials(
+                                new AuthScope(u.getHost(), u.getPort()),
+                                new UsernamePasswordCredentials(userName, password)
+                        );
+                        clientBuilder.setDefaultCredentialsProvider(credsProvider);
+                    }
+                }
+                clientBuilder.setProxy(proxy);
+            }
+
+            final Boolean preemptiveBasicAuthProperty = (Boolean) config.getProperties()
+                    .get(ApacheClientProperties.PREEMPTIVE_BASIC_AUTHENTICATION);
+            this.preemptiveBasicAuth = (preemptiveBasicAuthProperty != null) ? preemptiveBasicAuthProperty : false;
+        } else {
+            this.preemptiveBasicAuth = false;
+        }
+
+
+        if (reqConfig != null) {
+            RequestConfig.Builder reqConfigBuilder = RequestConfig.copy((RequestConfig) reqConfig);
+            if (connectTimeout > 0) {
+                reqConfigBuilder.setConnectTimeout(connectTimeout);
+            }
+            if (socketTimeout > 0) {
+                reqConfigBuilder.setSocketTimeout(socketTimeout);
+            }
+            if (ignoreCookies) {
+                reqConfigBuilder.setCookieSpec(CookieSpecs.IGNORE_COOKIES);
+            }
+            requestConfig = reqConfigBuilder.build();
+        } else {
+            requestConfigBuilder.setConnectTimeout(connectTimeout);
+            requestConfigBuilder.setSocketTimeout(socketTimeout);
+            if (ignoreCookies) {
+                requestConfigBuilder.setCookieSpec(CookieSpecs.IGNORE_COOKIES);
+            }
+            requestConfig = requestConfigBuilder.build();
+        }
+
+        if (requestConfig.getCookieSpec() == null || !requestConfig.getCookieSpec().equals(CookieSpecs.IGNORE_COOKIES)) {
+            this.cookieStore = new BasicCookieStore();
+            clientBuilder.setDefaultCookieStore(cookieStore);
+        } else {
+            this.cookieStore = null;
+        }
+        clientBuilder.setDefaultRequestConfig(requestConfig);
+        this.client = clientBuilder.build();
+    }
+
+    private SSLContext getSslContext(final Configuration config) {
+        final SslConfigurator sslConfigurator = ApacheClientProperties.getValue(
+                config.getProperties(),
+                ApacheClientProperties.SSL_CONFIG,
+                SslConfigurator.class);
+
+        return sslConfigurator != null ? sslConfigurator.createSSLContext() : null;
+    }
+
+    HttpClientConnectionManager getConnectionManager(final Configuration config, final SSLContext sslContext) {
+        final Object cmObject = config.getProperties().get(ApacheClientProperties.CONNECTION_MANAGER);
+
+        // Connection manager from configuration.
+        if (cmObject != null) {
+            if (cmObject instanceof HttpClientConnectionManager) {
+                return (HttpClientConnectionManager) cmObject;
+            } else {
+                LOGGER.log(
+                        Level.WARNING,
+                        LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
+                                ApacheClientProperties.CONNECTION_MANAGER,
+                                cmObject.getClass().getName(),
+                                HttpClientConnectionManager.class.getName())
+                );
+            }
+        }
+
+        // Create custom connection manager.
+        return createConnectionManager(
+                config,
+                sslContext,
+                null,
+                false);
+    }
+
+    private HttpClientConnectionManager createConnectionManager(
+            final Configuration config,
+            final SSLContext sslContext,
+            X509HostnameVerifier hostnameVerifier,
+            final boolean useSystemProperties) {
+
+        final String[] supportedProtocols = useSystemProperties ? split(
+                System.getProperty("https.protocols")) : null;
+        final String[] supportedCipherSuites = useSystemProperties ? split(
+                System.getProperty("https.cipherSuites")) : null;
+
+        if (hostnameVerifier == null) {
+            hostnameVerifier = SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER;
+        }
+
+        final LayeredConnectionSocketFactory sslSocketFactory;
+        if (sslContext != null) {
+            sslSocketFactory = new SSLConnectionSocketFactory(
+                    sslContext, supportedProtocols, supportedCipherSuites, hostnameVerifier);
+        } else {
+            if (useSystemProperties) {
+                sslSocketFactory = new SSLConnectionSocketFactory(
+                        (SSLSocketFactory) SSLSocketFactory.getDefault(),
+                        supportedProtocols, supportedCipherSuites, hostnameVerifier);
+            } else {
+                sslSocketFactory = new SSLConnectionSocketFactory(
+                        SSLContexts.createDefault(),
+                        hostnameVerifier);
+            }
+        }
+
+        final Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory>create()
+                .register("http", PlainConnectionSocketFactory.getSocketFactory())
+                .register("https", sslSocketFactory)
+                .build();
+
+        final Integer chunkSize = ClientProperties.getValue(config.getProperties(),
+                ClientProperties.CHUNKED_ENCODING_SIZE, 4096, Integer.class);
+
+        final PoolingHttpClientConnectionManager connectionManager =
+                new PoolingHttpClientConnectionManager(registry, new ConnectionFactory(chunkSize));
+
+        if (useSystemProperties) {
+            String s = System.getProperty("http.keepAlive", "true");
+            if ("true".equalsIgnoreCase(s)) {
+                s = System.getProperty("http.maxConnections", "5");
+                final int max = Integer.parseInt(s);
+                connectionManager.setDefaultMaxPerRoute(max);
+                connectionManager.setMaxTotal(2 * max);
+            }
+        }
+
+        return connectionManager;
+    }
+
+    private static String[] split(final String s) {
+        if (TextUtils.isBlank(s)) {
+            return null;
+        }
+        return s.split(" *, *");
+    }
+
+    /**
+     * Get the {@link HttpClient}.
+     *
+     * @return the {@link HttpClient}.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public HttpClient getHttpClient() {
+        return client;
+    }
+
+    /**
+     * Get the {@link CookieStore}.
+     *
+     * @return the {@link CookieStore} instance or {@code null} when {@value ApacheClientProperties#DISABLE_COOKIES} set to
+     * {@code true}.
+     */
+    public CookieStore getCookieStore() {
+        return cookieStore;
+    }
+
+    private static URI getProxyUri(final Object proxy) {
+        if (proxy instanceof URI) {
+            return (URI) proxy;
+        } else if (proxy instanceof String) {
+            return URI.create((String) proxy);
+        } else {
+            throw new ProcessingException(LocalizationMessages.WRONG_PROXY_URI_TYPE(ClientProperties.PROXY_URI));
+        }
+    }
+
+    @Override
+    public ClientResponse apply(final ClientRequest clientRequest) throws ProcessingException {
+        final HttpUriRequest request = getUriHttpRequest(clientRequest);
+        final Map<String, String> clientHeadersSnapshot = writeOutBoundHeaders(clientRequest.getHeaders(), request);
+
+        try {
+            final CloseableHttpResponse response;
+            final HttpClientContext context = HttpClientContext.create();
+            if (preemptiveBasicAuth) {
+                final AuthCache authCache = new BasicAuthCache();
+                final BasicScheme basicScheme = new BasicScheme();
+                authCache.put(getHost(request), basicScheme);
+                context.setAuthCache(authCache);
+            }
+            response = client.execute(getHost(request), request, context);
+            HeaderUtils.checkHeaderChanges(clientHeadersSnapshot, clientRequest.getHeaders(),
+                    this.getClass().getName());
+
+            final Response.StatusType status = response.getStatusLine().getReasonPhrase() == null ?
+                    Statuses.from(response.getStatusLine().getStatusCode()) :
+                    Statuses.from(response.getStatusLine().getStatusCode(), response.getStatusLine().getReasonPhrase());
+
+            final ClientResponse responseContext = new ApacheConnectorClientResponse(status, clientRequest, response);
+            final List<URI> redirectLocations = context.getRedirectLocations();
+            if (redirectLocations != null && !redirectLocations.isEmpty()) {
+                responseContext.setResolvedRequestUri(redirectLocations.get(redirectLocations.size() - 1));
+            }
+
+            final Header[] respHeaders = response.getAllHeaders();
+            final MultivaluedMap<String, String> headers = responseContext.getHeaders();
+            for (final Header header : respHeaders) {
+                final String headerName = header.getName();
+                List<String> list = headers.get(headerName);
+                if (list == null) {
+                    list = new ArrayList<String>();
+                }
+                list.add(header.getValue());
+                headers.put(headerName, list);
+            }
+
+            final HttpEntity entity = response.getEntity();
+
+            if (entity != null) {
+                if (headers.get(HttpHeaders.CONTENT_LENGTH) == null) {
+                    headers.add(HttpHeaders.CONTENT_LENGTH, String.valueOf(entity.getContentLength()));
+                }
+
+                final Header contentEncoding = entity.getContentEncoding();
+                if (headers.get(HttpHeaders.CONTENT_ENCODING) == null && contentEncoding != null) {
+                    headers.add(HttpHeaders.CONTENT_ENCODING, contentEncoding.getValue());
+                }
+            }
+
+
+            try {
+                responseContext.setEntityStream(new HttpClientResponseInputStream(response));
+            } catch (final IOException e) {
+                LOGGER.log(Level.SEVERE, null, e);
+            }
+
+            return responseContext;
+        } catch (final Exception e) {
+            throw new ProcessingException(e);
+        }
+    }
+
+    @Override
+    public Future<?> apply(final ClientRequest request, final AsyncConnectorCallback callback) {
+        return MoreExecutors.sameThreadExecutor().submit(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    callback.response(apply(request));
+                } catch (final ProcessingException ex) {
+                    callback.failure(ex);
+                } catch (final Throwable t) {
+                    callback.failure(t);
+                }
+            }
+        });
+    }
+
+    @Override
+    public String getName() {
+        return "Apache HttpClient " + release;
+    }
+
+    @Override
+    public void close() {
+        try {
+            client.close();
+        } catch (final IOException e) {
+            throw new ProcessingException(LocalizationMessages.FAILED_TO_STOP_CLIENT(), e);
+        }
+    }
+
+    private HttpHost getHost(final HttpUriRequest request) {
+        return new HttpHost(request.getURI().getHost(), request.getURI().getPort(), request.getURI().getScheme());
+    }
+
+    private HttpUriRequest getUriHttpRequest(final ClientRequest clientRequest) {
+        final Boolean redirectsEnabled =
+                clientRequest.resolveProperty(ClientProperties.FOLLOW_REDIRECTS, requestConfig.isRedirectsEnabled());
+        final RequestConfig config = RequestConfig.copy(requestConfig).setRedirectsEnabled(redirectsEnabled).build();
+
+        final Boolean bufferingEnabled = clientRequest.resolveProperty(ClientProperties.REQUEST_ENTITY_PROCESSING,
+                RequestEntityProcessing.class) == RequestEntityProcessing.BUFFERED;
+        final HttpEntity entity = getHttpEntity(clientRequest, bufferingEnabled);
+
+        return RequestBuilder
+                .create(clientRequest.getMethod())
+                .setUri(clientRequest.getUri())
+                .setConfig(config)
+                .setEntity(entity)
+                .build();
+    }
+
+
+    private HttpEntity getHttpEntity(final ClientRequest clientRequest, final boolean bufferingEnabled) {
+        final Object entity = clientRequest.getEntity();
+
+        if (entity == null) {
+            return null;
+        }
+
+        final AbstractHttpEntity httpEntity = new AbstractHttpEntity() {
+            @Override
+            public boolean isRepeatable() {
+                return false;
+            }
+
+            @Override
+            public long getContentLength() {
+                return -1;
+            }
+
+            @Override
+            public InputStream getContent() throws IOException, IllegalStateException {
+                if (bufferingEnabled) {
+                    final ByteArrayOutputStream buffer = new ByteArrayOutputStream(512);
+                    writeTo(buffer);
+                    return new ByteArrayInputStream(buffer.toByteArray());
+                } else {
+                    return null;
+                }
+            }
+
+            @Override
+            public void writeTo(final OutputStream outputStream) throws IOException {
+                clientRequest.setStreamProvider(new OutboundMessageContext.StreamProvider() {
+                    @Override
+                    public OutputStream getOutputStream(final int contentLength) throws IOException {
+                        return outputStream;
+                    }
+                });
+                clientRequest.writeEntity();
+            }
+
+            @Override
+            public boolean isStreaming() {
+                return false;
+            }
+        };
+
+        if (bufferingEnabled) {
+            try {
+                return new BufferedHttpEntity(httpEntity);
+            } catch (final IOException e) {
+                throw new ProcessingException(LocalizationMessages.ERROR_BUFFERING_ENTITY(), e);
+            }
+        } else {
+            return httpEntity;
+        }
+    }
+
+    private static Map<String, String> writeOutBoundHeaders(final MultivaluedMap<String, Object> headers, final HttpUriRequest request) {
+        Map<String, String> stringHeaders = HeaderUtils.asStringHeadersSingleValue(headers);
+
+        for (Map.Entry<String, String> e : stringHeaders.entrySet()) {
+            request.addHeader(e.getKey(), e.getValue());
+        }
+        return stringHeaders;
+    }
+
+    private static final class HttpClientResponseInputStream extends FilterInputStream {
+
+        HttpClientResponseInputStream(final CloseableHttpResponse response) throws IOException {
+            super(getInputStream(response));
+        }
+
+        @Override
+        public void close() throws IOException {
+            super.close();
+        }
+    }
+
+    private static InputStream getInputStream(final CloseableHttpResponse response) throws IOException {
+
+        if (response.getEntity() == null) {
+            return new ByteArrayInputStream(new byte[0]);
+        } else {
+            final InputStream i = response.getEntity().getContent();
+            if (i.markSupported()) {
+                return i;
+            }
+            return new BufferedInputStream(i, ReaderWriter.BUFFER_SIZE);
+        }
+    }
+
+    private static class ConnectionFactory extends ManagedHttpClientConnectionFactory {
+
+        private static final AtomicLong COUNTER = new AtomicLong();
+
+        private final int chunkSize;
+
+        private ConnectionFactory(final int chunkSize) {
+            this.chunkSize = chunkSize;
+        }
+
+        @Override
+        public ManagedHttpClientConnection create(final HttpRoute route, final ConnectionConfig config) {
+            final String id = "http-outgoing-" + Long.toString(COUNTER.getAndIncrement());
+
+            return new HttpClientConnection(id, config.getBufferSize(), chunkSize);
+        }
+    }
+
+    private static class HttpClientConnection extends DefaultManagedHttpClientConnection {
+
+        private final int chunkSize;
+
+        private HttpClientConnection(final String id, final int buffersize, final int chunkSize) {
+            super(id, buffersize);
+
+            this.chunkSize = chunkSize;
+        }
+
+        @Override
+        protected OutputStream createOutputStream(final long len, final SessionOutputBuffer outbuffer) {
+            if (len == ContentLengthStrategy.CHUNKED) {
+                return new ChunkedOutputStream(chunkSize, outbuffer);
+            }
+            return super.createOutputStream(len, outbuffer);
+        }
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java
new file mode 100644
index 000000000..7ba9d8abd
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java
@@ -0,0 +1,52 @@
+package com.github.dockerjava.jaxrs.connector;
+
+import java.io.IOException;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.StatusType;
+
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.glassfish.jersey.client.ClientRequest;
+import org.glassfish.jersey.client.ClientResponse;
+
+/**
+ * Fix for https://github.com/docker-java/docker-java/issues/196
+ * 
+ * https://java.net/jira/browse/JERSEY-2852
+ * 
+ * @author marcus
+ *
+ */
+public class ApacheConnectorClientResponse extends ClientResponse {
+	
+	private CloseableHttpResponse closeableHttpResponse;
+
+	public ApacheConnectorClientResponse(ClientRequest requestContext,
+			Response response) {
+		super(requestContext, response);
+	}
+
+	public ApacheConnectorClientResponse(StatusType status,
+			ClientRequest requestContext, CloseableHttpResponse closeableHttpResponse) {
+		super(status, requestContext);
+		this.closeableHttpResponse = closeableHttpResponse;
+	}
+
+	public ApacheConnectorClientResponse(StatusType status,
+			ClientRequest requestContext) {
+		super(status, requestContext);
+	}
+	
+	@Override
+	public void close() {
+		try {
+			closeableHttpResponse.close();
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+		super.close();
+	}
+	
+	
+
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java
new file mode 100644
index 000000000..fbde136ff
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java
@@ -0,0 +1,151 @@
+package com.github.dockerjava.jaxrs.connector;
+
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2013-2014 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+import javax.ws.rs.client.Client;
+import javax.ws.rs.core.Configurable;
+import javax.ws.rs.core.Configuration;
+
+import org.glassfish.jersey.apache.connector.LocalizationMessages;
+import org.glassfish.jersey.client.Initializable;
+import org.glassfish.jersey.client.spi.Connector;
+import org.glassfish.jersey.client.spi.ConnectorProvider;
+import org.apache.http.client.HttpClient;
+
+/**
+ * Connector provider for Jersey {@link Connector connectors} that utilize
+ * Apache HTTP Client to send and receive HTTP request and responses.
+ * <p>
+ * The following connector configuration properties are supported:
+ * <ul>
+ * <li>{@link ApacheClientProperties#CONNECTION_MANAGER}</li>
+ * <li>{@link ApacheClientProperties#REQUEST_CONFIG}</li>
+ * <li>{@link ApacheClientProperties#CREDENTIALS_PROVIDER}</li>
+ * <li>{@link ApacheClientProperties#DISABLE_COOKIES}</li>
+ * <li>{@link org.glassfish.jersey.client.ClientProperties#PROXY_URI}</li>
+ * <li>{@link org.glassfish.jersey.client.ClientProperties#PROXY_USERNAME}</li>
+ * <li>{@link org.glassfish.jersey.client.ClientProperties#PROXY_PASSWORD}</li>
+ * <li>{@link org.glassfish.jersey.client.ClientProperties#REQUEST_ENTITY_PROCESSING}
+ * - default value is {@link org.glassfish.jersey.client.RequestEntityProcessing#CHUNKED}</li>
+ * <li>{@link ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION}</li>
+ * <li>{@link ApacheClientProperties#SSL_CONFIG}</li>
+ * </ul>
+ * </p>
+ * <p>
+ * Connector instances created via this connector provider use
+ * {@link org.glassfish.jersey.client.RequestEntityProcessing#CHUNKED chunked encoding} as a default setting.
+ * This can be overridden by the {@link org.glassfish.jersey.client.ClientProperties#REQUEST_ENTITY_PROCESSING}.
+ * By default the {@link org.glassfish.jersey.client.ClientProperties#CHUNKED_ENCODING_SIZE} property is only supported
+ * when using the default {@code org.apache.http.conn.HttpClientConnectionManager} instance. If custom
+ * connection manager is used, then chunked encoding size can be set by providing a custom
+ * {@code org.apache.http.HttpClientConnection} (via custom {@code org.apache.http.impl.conn.ManagedHttpClientConnectionFactory})
+ * and overriding it's {@code createOutputStream} method.
+ * </p>
+ * <p>
+ * Use of authorization by the AHC-based connectors is dependent on the chunk encoding setting.
+ * If the entity buffering is enabled, the entity is buffered and authorization can be performed
+ * automatically in response to a 401 by sending the request again. When entity buffering
+ * is disabled (chunked encoding is used) then the property
+ * {@link org.glassfish.jersey.apache.connector.ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION} must
+ * be set to {@code true}.
+ * </p>
+ * <p>
+ * If a {@link org.glassfish.jersey.client.ClientResponse} is obtained and an entity is not read from the response then
+ * {@link org.glassfish.jersey.client.ClientResponse#close()} MUST be called after processing the response to release
+ * connection-based resources.
+ * </p>
+ * <p>
+ * If a response entity is obtained that is an instance of {@link java.io.Closeable}
+ * then the instance MUST be closed after processing the entity to release
+ * connection-based resources.
+ * <p/>
+ * <p>
+ * The following methods are currently supported: HEAD, GET, POST, PUT, DELETE, OPTIONS, PATCH and TRACE.
+ * <p/>
+ *
+ * @author Pavel Bucek (pavel.bucek at oracle.com)
+ * @author Arul Dhesiaseelan (aruld at acm.org)
+ * @author jorgeluisw at mac.com
+ * @author Marek Potociar (marek.potociar at oracle.com)
+ * @author Paul Sandoz (paul.sandoz at oracle.com)
+ * @since 2.5
+ */
+public class ApacheConnectorProvider implements ConnectorProvider {
+
+    @Override
+    public Connector getConnector(Client client, Configuration runtimeConfig) {
+        return new ApacheConnector(runtimeConfig);
+    }
+
+    /**
+     * Retrieve the underlying Apache {@link HttpClient} instance from
+     * {@link org.glassfish.jersey.client.JerseyClient} or {@link org.glassfish.jersey.client.JerseyWebTarget}
+     * configured to use {@code ApacheConnectorProvider}.
+     *
+     * @param component {@code JerseyClient} or {@code JerseyWebTarget} instance that is configured to use
+     *                  {@code ApacheConnectorProvider}.
+     * @return underlying Apache {@code HttpClient} instance.
+     *
+     * @throws java.lang.IllegalArgumentException in case the {@code component} is neither {@code JerseyClient}
+     *                                            nor {@code JerseyWebTarget} instance or in case the component
+     *                                            is not configured to use a {@code ApacheConnectorProvider}.
+     * @since 2.8
+     */
+    public static HttpClient getHttpClient(Configurable<?> component) {
+        if (!(component instanceof Initializable)) {
+            throw new IllegalArgumentException(
+                    LocalizationMessages.INVALID_CONFIGURABLE_COMPONENT_TYPE(component.getClass().getName()));
+        }
+
+        final Initializable<?> initializable = (Initializable<?>) component;
+        Connector connector = initializable.getConfiguration().getConnector();
+        if (connector == null) {
+            initializable.preInitialize();
+            connector = initializable.getConfiguration().getConnector();
+        }
+
+        if (connector instanceof ApacheConnector) {
+            return ((ApacheConnector) connector).getHttpClient();
+        }
+
+        throw new IllegalArgumentException(LocalizationMessages.EXPECTED_CONNECTOR_PROVIDER_NOT_USED());
+    }
+}
+
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/README.txt b/src/main/java/com/github/dockerjava/jaxrs/connector/README.txt
new file mode 100644
index 000000000..c3c1415f1
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/README.txt
@@ -0,0 +1,3 @@
+This package exists as a workaround to https://java.net/jira/browse/JERSEY-2852.
+It introduces ApacheConnectorClientResponse which extends ClientResponse and closes
+the underlying CloseableHttpResponse when close() is called.
\ No newline at end of file
diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
index f92949294..569283ce7 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -16,6 +16,8 @@
 
 import java.io.IOException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -66,17 +68,37 @@ public void testEventStreamTimeBound() throws InterruptedException,
 		EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback)
 				.withSince(startTime).withUntil(endTime);
 		ExecutorService executorService = eventsCmd.exec();
-
+		
 		boolean zeroCount = countDownLatch.await(5, TimeUnit.SECONDS);
-
+		
 		executorService.shutdown();
 		eventCallback.close();
 
+		assertTrue(zeroCount, "" + eventCallback.getEvents());
+	}
+
+	@Test
+	public void testEventStreaming1() throws InterruptedException, IOException {
+		// Don't include other tests events
+		TimeUnit.SECONDS.sleep(1);
+
+		CountDownLatch countDownLatch = new CountDownLatch(KNOWN_NUM_EVENTS);
+		EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
+
+		EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback).withSince(
+				getEpochTime());
+		ExecutorService executorService = eventsCmd.exec();
+
+		generateEvents();
+
+		boolean zeroCount = countDownLatch.await(5, TimeUnit.SECONDS);
+		executorService.shutdown();
+		eventCallback.close();
 		assertTrue(zeroCount, "Expected 4 events, [create, start, die, stop]");
 	}
 
 	@Test
-	public void testEventStreaming() throws InterruptedException, IOException {
+	public void testEventStreaming2() throws InterruptedException, IOException {
 		// Don't include other tests events
 		TimeUnit.SECONDS.sleep(1);
 
@@ -111,6 +133,7 @@ private int generateEvents() {
 	private class EventCallbackTest implements EventCallback {
 		private final CountDownLatch countDownLatch;
 		private final AtomicBoolean isReceiving = new AtomicBoolean(true);
+		private final List<Event> events = new ArrayList<Event>();
 
 		public EventCallbackTest(CountDownLatch countDownLatch) {
 			this.countDownLatch = countDownLatch;
@@ -124,6 +147,7 @@ public void close() {
 		public void onEvent(Event event) {
 			LOG.info("Received event #{}: {}", countDownLatch.getCount(), event);
 			countDownLatch.countDown();
+			events.add(event);
 		}
 
 		@Override
@@ -140,5 +164,9 @@ public void onCompletion(int numEvents) {
 		public boolean isReceiving() {
 			return isReceiving.get();
 		}
+
+		public List<Event> getEvents() {
+			return new ArrayList<Event>(events);
+		}
 	}
 }

From 1ed6fbfe5ae6fd1ddd27e80375a3e94b56436de3 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 15 May 2015 15:30:20 +0200
Subject: [PATCH 0076/1272] Warning comment on 'followStream'

---
 .../api/command/AttachContainerCmd.java       | 26 ++++++++----
 .../api/command/LogContainerCmd.java          | 41 ++++++++++++-------
 2 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
index abdec8f58..0fb72d452 100644
--- a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
@@ -2,6 +2,7 @@
 
 import java.io.InputStream;
 
+import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.NotFoundException;
 
 /**
@@ -20,7 +21,7 @@
  *            - true or false, if true, print timestamps for every log line.
  *            Defaults to false.
  */
-public interface AttachContainerCmd extends DockerCmd<InputStream>{
+public interface AttachContainerCmd extends DockerCmd<InputStream> {
 
 	public String getContainerId();
 
@@ -36,8 +37,17 @@ public interface AttachContainerCmd extends DockerCmd<InputStream>{
 
 	public AttachContainerCmd withContainerId(String containerId);
 
+	/**
+	 * See {@link #withFollowStream(boolean)}
+	 */
 	public AttachContainerCmd withFollowStream();
 
+	/**
+	 * Following the stream means the resulting {@link InputStream} returned by
+	 * {@link #exec()} reads infinitely. So a {@link InputStream#read()} MAY
+	 * BLOCK FOREVER as long as no data is streamed from the docker host to
+	 * {@link DockerClient}!
+	 */
 	public AttachContainerCmd withFollowStream(boolean followStream);
 
 	public AttachContainerCmd withTimestamps(boolean timestamps);
@@ -51,19 +61,21 @@ public interface AttachContainerCmd extends DockerCmd<InputStream>{
 	public AttachContainerCmd withStdErr(boolean stderr);
 
 	public AttachContainerCmd withLogs(boolean logs);
-	
+
 	public AttachContainerCmd withLogs();
 
 	/**
-	 * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent
-	 * connection leaks.
+	 * Its the responsibility of the caller to consume and/or close the
+	 * {@link InputStream} to prevent connection leaks.
 	 * 
-	 * @throws NotFoundException No such container 
+	 * @throws NotFoundException
+	 *             No such container
 	 */
 	@Override
 	public InputStream exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<AttachContainerCmd, InputStream> {
+
+	public static interface Exec extends
+			DockerCmdExec<AttachContainerCmd, InputStream> {
 	}
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
index 05e108550..c966ef953 100644
--- a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -1,12 +1,13 @@
 package com.github.dockerjava.api.command;
 
+import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.NotFoundException;
 
 import java.io.InputStream;
 
 /**
  * Get container logs
- *
+ * 
  * @param followStream
  *            - true or false, return stream. Defaults to false.
  * @param stdout
@@ -17,13 +18,15 @@
  *            - true or false, if true, print timestamps for every log line.
  *            Defaults to false.
  * @param tail
- * 			  - `all` or `<number>`, Output specified number of lines at the end of logs
- *
- * Consider wrapping any input stream you get with a frame reader to make reading frame easier.
- *
+ *            - `all` or `<number>`, Output specified number of lines at the end
+ *            of logs
+ * 
+ *            Consider wrapping any input stream you get with a frame reader to
+ *            make reading frame easier.
+ * 
  * @see com.github.dockerjava.core.command.FrameReader
  */
-public interface LogContainerCmd extends DockerCmd<InputStream>{
+public interface LogContainerCmd extends DockerCmd<InputStream> {
 
 	public String getContainerId();
 
@@ -39,12 +42,21 @@ public interface LogContainerCmd extends DockerCmd<InputStream>{
 
 	public LogContainerCmd withContainerId(String containerId);
 
+	/**
+	 * See {@link #withFollowStream(boolean)}
+	 */
 	public LogContainerCmd withFollowStream();
 
+	/**
+	 * Following the stream means the resulting {@link InputStream} returned by
+	 * {@link #exec()} reads infinitely. So a {@link InputStream#read()} MAY
+	 * BLOCK FOREVER as long as no data is streamed from the docker host to
+	 * {@link DockerClient}!
+	 */
 	public LogContainerCmd withFollowStream(boolean followStream);
 
 	public LogContainerCmd withTimestamps();
-	
+
 	public LogContainerCmd withTimestamps(boolean timestamps);
 
 	public LogContainerCmd withStdOut();
@@ -60,16 +72,17 @@ public interface LogContainerCmd extends DockerCmd<InputStream>{
 	public LogContainerCmd withTail(int tail);
 
 	/**
-	 * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent
-	 * connection leaks.
-	 *  
-	 * @throws NotFoundException No such container
+	 * Its the responsibility of the caller to consume and/or close the
+	 * {@link InputStream} to prevent connection leaks.
+	 * 
+	 * @throws NotFoundException
+	 *             No such container
 	 */
 	@Override
 	public InputStream exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<LogContainerCmd, InputStream> {
-	}
 
+	public static interface Exec extends
+			DockerCmdExec<LogContainerCmd, InputStream> {
+	}
 
 }
\ No newline at end of file

From 2df09cdca8bd41cb5be0b28e00fbd72632d4f33c Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 15 May 2015 15:30:48 +0200
Subject: [PATCH 0077/1272] Make FrameReaderITest work again

---
 .../client/AbstractDockerClientTest.java      |   8 +-
 .../core/command/DockerfileFixture.java       |  15 +-
 .../core/command/FrameReaderITest.java        | 163 ++++++++++--------
 .../frameReaderDockerfile/Dockerfile          |   4 +-
 4 files changed, 106 insertions(+), 84 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 1e61b9a7d..802166a00 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -104,8 +104,12 @@ public void afterMethod(ITestResult result) {
 				"################################## END OF {} ##################################\n",
 				result.getName());
 	}
+	
+	protected String asString(InputStream response) {
+		return consumeAsString(response);
+	}
 
-	protected String asString(InputStream response)  {
+	public static String consumeAsString(InputStream response)  {
 
 		StringWriter logwriter = new StringWriter();
 
@@ -116,7 +120,7 @@ protected String asString(InputStream response)  {
 			while (itr.hasNext()) {
 				String line = itr.next();
 				logwriter.write(line + (itr.hasNext() ? "\n" : ""));
-				//LOG.info("line: "+line);
+				LOG.info("line: "+line);
 			}
 			response.close();
 			
diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
index 840f63da4..53131c611 100644
--- a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
+++ b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -1,14 +1,20 @@
 package com.github.dockerjava.core.command;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.InternalServerErrorException;
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.model.Image;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * Start and stop a single container for testing.
@@ -29,11 +35,14 @@ public DockerfileFixture(DockerClient dockerClient, String directory) {
     public void open() throws IOException {
 
         LOGGER.info("building {}", directory);
-        dockerClient
+        InputStream response = dockerClient
                 .buildImageCmd(new File("src/test/resources", directory))
                 .withNoCache() // remove alternatives, cause problems
-                .exec()
-                .close();
+                .exec();
+        
+        String log = AbstractDockerClientTest.consumeAsString(response);
+        
+        assertThat(log, containsString("Successfully built"));
 
         Image lastCreatedImage = dockerClient
                 .listImagesCmd()
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index 0c22fc085..24c833559 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -1,86 +1,97 @@
 package com.github.dockerjava.core.command;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+
+import java.io.IOException;
+import java.io.InputStream;
 
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.api.model.StreamType;
-import com.github.dockerjava.core.DockerClientBuilder;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import java.io.IOException;
-import java.io.InputStream;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.StreamType;
+import com.github.dockerjava.core.DockerClientBuilder;
 
 @Test(groups = "integration")
-public class FrameReaderITest  {
-
-    private DockerClient dockerClient;
-    private DockerfileFixture dockerfileFixture;
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        dockerClient = DockerClientBuilder.getInstance().build();
-        dockerfileFixture = new DockerfileFixture(dockerClient, "frameReaderDockerfile");
-        dockerfileFixture.open();
-    }
-
-    @AfterTest
-    public void deleteDockerContainerImage() throws Exception {
-        dockerfileFixture.close();
-        dockerClient.close();
-    }
-
-    @Test
-    public void canCloseFrameReaderAndReadExpectedLines() throws Exception {
-
-        try (FrameReader reader = new FrameReader(getLoggerStream())) {
-            assertEquals(reader.readFrame(), new Frame(StreamType.STDOUT, "to stdout\n".getBytes()));
-            assertEquals(reader.readFrame(), new Frame(StreamType.STDERR, "to stderr\n".getBytes()));
-            assertNull(reader.readFrame());
-        }
-    }
-
-    private InputStream getLoggerStream() {
-        return dockerClient
-                .logContainerCmd(dockerfileFixture.getContainerId())
-                .withStdOut()
-                .withStdErr()
-                .withTailAll()
-                .withTail(10)
-                .withFollowStream()
-                .exec();
-    }
-
-    @Test
-    public void canLogInOneThreadAndExecuteCommandsInAnother() throws Exception {
-
-        Thread thread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    try (FrameReader reader = new FrameReader(getLoggerStream())) {
-                        //noinspection StatementWithEmptyBody
-                        while (reader.readFrame() != null) {
-                            // nop
-                        }
-                    }
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        });
-
-        thread.start();
-
-        try (DockerfileFixture busyboxDockerfile = new DockerfileFixture(dockerClient, "busyboxDockerfile")) {
-            busyboxDockerfile.open();
-        }
-
-        thread.join();
-
-    }
+public class FrameReaderITest {
+
+	private DockerClient dockerClient;
+	private DockerfileFixture dockerfileFixture;
+
+	@BeforeTest
+	public void beforeTest() throws Exception {
+		dockerClient = DockerClientBuilder.getInstance().build();
+		dockerfileFixture = new DockerfileFixture(dockerClient,
+				"frameReaderDockerfile");
+		dockerfileFixture.open();
+	}
+
+	@AfterTest
+	public void deleteDockerContainerImage() throws Exception {
+		dockerfileFixture.close();
+		dockerClient.close();
+	}
+
+	@Test
+	public void canCloseFrameReaderAndReadExpectedLines() throws Exception {
+
+		// wait for the container to be successfully executed 
+		int exitCode = dockerClient.waitContainerCmd(
+				dockerfileFixture.getContainerId()).exec();
+		assertEquals(0, exitCode);
+		
+		InputStream response = getLoggerStream();
+
+		try (FrameReader reader = new FrameReader(response)) {
+			assertEquals(reader.readFrame(), new Frame(StreamType.STDOUT,
+					"to stdout\n".getBytes()));
+			assertEquals(reader.readFrame(), new Frame(StreamType.STDERR,
+					"to stderr\n".getBytes()));
+			assertNull(reader.readFrame());
+		}
+	}
+
+	private InputStream getLoggerStream() {
+
+		return dockerClient.logContainerCmd(dockerfileFixture.getContainerId())
+				.withStdOut()
+				.withStdErr()
+				.withTailAll()
+				// we can't follow stream here as it blocks reading from resulting InputStream infinitely
+				//.withFollowStream()
+				.exec();
+	}
+
+	@Test
+	public void canLogInOneThreadAndExecuteCommandsInAnother() throws Exception {
+
+		Thread thread = new Thread(new Runnable() {
+			@Override
+			public void run() {
+				try {
+					try (FrameReader reader = new FrameReader(getLoggerStream())) {
+						// noinspection StatementWithEmptyBody
+						while (reader.readFrame() != null) {
+							// nop
+						}
+					}
+				} catch (IOException e) {
+					throw new RuntimeException(e);
+				}
+			}
+		});
+
+		thread.start();
+
+		try (DockerfileFixture busyboxDockerfile = new DockerfileFixture(
+				dockerClient, "busyboxDockerfile")) {
+			busyboxDockerfile.open();
+		}
+
+		thread.join();
+
+	}
 }
diff --git a/src/test/resources/frameReaderDockerfile/Dockerfile b/src/test/resources/frameReaderDockerfile/Dockerfile
index 8d9b553e1..9aa6b9847 100644
--- a/src/test/resources/frameReaderDockerfile/Dockerfile
+++ b/src/test/resources/frameReaderDockerfile/Dockerfile
@@ -3,11 +3,9 @@ FROM busybox:latest
 # log to stdout and stderr so we can make sure logging with FrameReader works
 
 RUN echo '#! /bin/sh' > cmd.sh
-RUN echo 'sleep 1' >> cmd.sh
 RUN echo 'echo "to stdout"' >> cmd.sh
 RUN echo 'echo "to stderr" > /dev/stderr' >> cmd.sh
-# block for ever
-RUN echo 'cat' >> cmd.sh
+RUN echo 'sleep 1' >> cmd.sh
 RUN chmod +x cmd.sh
 
 CMD ["./cmd.sh"]
\ No newline at end of file

From 02e8cc1aaa448db064c3d9aa4d8e0b0af9415495 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 17 May 2015 20:55:28 +0200
Subject: [PATCH 0078/1272] Refactor streaming API

---
 .../github/dockerjava/api/DockerClient.java   |  3 +-
 .../dockerjava/api/command/EventCallback.java | 13 ---
 .../dockerjava/api/command/EventsCmd.java     | 20 +++-
 .../api/stream/ObjectStreamCallback.java      | 18 ++++
 .../dockerjava/core/DockerClientImpl.java     |  3 +-
 .../core/command/EventsCmdImpl.java           | 21 ++--
 .../dockerjava/jaxrs/EventsCmdExec.java       | 79 +++++----------
 .../dockerjava/jaxrs/util/Streaming.java      | 52 ++++++++++
 .../util/WrappedResponseInputStream.java      |  2 +-
 .../core/command/EventsCmdImplTest.java       | 95 +++++++++++--------
 10 files changed, 174 insertions(+), 132 deletions(-)
 delete mode 100644 src/main/java/com/github/dockerjava/api/command/EventCallback.java
 create mode 100644 src/main/java/com/github/dockerjava/api/stream/ObjectStreamCallback.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/util/Streaming.java

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 9e275eb35..1cd3e0760 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -3,6 +3,7 @@
 import java.io.*;
 
 import com.github.dockerjava.api.command.*;
+import com.github.dockerjava.api.command.EventsCmd.EventStreamCallback;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Identifier;
 
@@ -112,7 +113,7 @@ public CopyFileFromContainerCmd copyFileFromContainerCmd(
 	
 	public UnpauseContainerCmd unpauseContainerCmd(String containerId);
 
-	public EventsCmd eventsCmd(EventCallback eventCallback);
+	public EventsCmd eventsCmd(EventStreamCallback eventCallback);
 
 	@Override
 	public void close() throws IOException;
diff --git a/src/main/java/com/github/dockerjava/api/command/EventCallback.java b/src/main/java/com/github/dockerjava/api/command/EventCallback.java
deleted file mode 100644
index 18b8669ea..000000000
--- a/src/main/java/com/github/dockerjava/api/command/EventCallback.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.github.dockerjava.api.command;
-
-import com.github.dockerjava.api.model.Event;
-
-/**
- * Event callback
- */
-public interface EventCallback {
-    public void onEvent(Event event);
-    public void onException(Throwable throwable);
-    public void onCompletion(int numEvents);
-    public boolean isReceiving();
-}
diff --git a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java b/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
index cfdb23a64..c3016a7ff 100644
--- a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
-import java.util.concurrent.ExecutorService;
+import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.api.stream.ObjectStreamCallback;
 
 
 /**
@@ -9,7 +10,7 @@
  * @param since - Show all events created since timestamp
  * @param until - Stream events until this timestamp
  */
-public interface EventsCmd extends DockerCmd<ExecutorService> {
+public interface EventsCmd extends DockerCmd<Void> {
     public EventsCmd withSince(String since);
 
     public EventsCmd withUntil(String until);
@@ -18,10 +19,19 @@ public interface EventsCmd extends DockerCmd<ExecutorService> {
 
     public String getUntil();
 
-    public EventCallback getEventCallback();
+    public EventStreamCallback getEventCallback();
     
-    public EventsCmd withEventCallback(EventCallback eventCallback);
+    public EventsCmd withEventCallback(EventStreamCallback eventCallback);
 
-    public static interface Exec extends DockerCmdExec<EventsCmd, ExecutorService> {
+    public static interface Exec extends DockerCmdExec<EventsCmd, Void> {
     }
+    
+    /**
+     * {@link Event} stream callback
+     */
+    public interface EventStreamCallback extends ObjectStreamCallback<Event>{
+    	
+        
+    }
+
 }
diff --git a/src/main/java/com/github/dockerjava/api/stream/ObjectStreamCallback.java b/src/main/java/com/github/dockerjava/api/stream/ObjectStreamCallback.java
new file mode 100644
index 000000000..c636c06cf
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/stream/ObjectStreamCallback.java
@@ -0,0 +1,18 @@
+package com.github.dockerjava.api.stream;
+
+import java.io.Closeable;
+
+/**
+ * Object stream callback
+ */
+public interface ObjectStreamCallback<T> {
+	/** Called when the stream starts. The passed {@link Closeable} can be used to close/interrupt the stream */
+	void streamStarted(Closeable stream);
+	/** Called when a stream event occurs */
+    void onStream(T object);
+    /** Called when an exception occurs while processing the stream */
+    void onError(Throwable throwable);
+    /** Called when streaming was finished either by reaching the end of the stream or by aborting it */
+    void streamFinished();
+    
+}
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 7e96225f8..599db377a 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -9,6 +9,7 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.*;
+import com.github.dockerjava.api.command.EventsCmd.EventStreamCallback;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.api.model.Identifier;
@@ -342,7 +343,7 @@ public UnpauseContainerCmd unpauseContainerCmd(String containerId) {
 	}
 
 	@Override
-	public EventsCmd eventsCmd(EventCallback eventCallback) {
+	public EventsCmd eventsCmd(EventStreamCallback eventCallback) {
 		return new EventsCmdImpl(getDockerCmdExecFactory()
 				.createEventsCmdExec(), eventCallback);
 	}
diff --git a/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
index ac55de714..07180bdf9 100644
--- a/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
@@ -1,20 +1,17 @@
 package com.github.dockerjava.core.command;
 
-import java.util.concurrent.ExecutorService;
-
-import com.github.dockerjava.api.command.EventCallback;
 import com.github.dockerjava.api.command.EventsCmd;
 
 /**
  * Stream docker events
  */
-public class EventsCmdImpl extends AbstrDockerCmd<EventsCmd, ExecutorService> implements EventsCmd {
+public class EventsCmdImpl extends AbstrDockerCmd<EventsCmd, Void> implements EventsCmd {
 
     private String since;
     private String until;
-    private EventCallback eventCallback;
+    private EventStreamCallback eventCallback;
 
-    public EventsCmdImpl(EventsCmd.Exec exec, EventCallback eventCallback) {
+    public EventsCmdImpl(EventsCmd.Exec exec, EventStreamCallback eventCallback) {
         super(exec);
         withEventCallback(eventCallback);
     }
@@ -32,7 +29,7 @@ public EventsCmd withUntil(String until) {
     }
     
     @Override
-    public EventsCmd withEventCallback(EventCallback eventCallback) {
+    public EventsCmd withEventCallback(EventStreamCallback eventCallback) {
         this.eventCallback = eventCallback;
         return this;
     }
@@ -48,14 +45,14 @@ public String getUntil() {
     }
 
     @Override
-    public EventCallback getEventCallback() {
+    public EventStreamCallback getEventCallback() {
         return eventCallback;
     }
 
-    @Override
-    public ExecutorService exec() {
-        return super.exec();
-    }
+//    @Override
+//    public InputStream exec() {
+//        return super.exec();
+//    }
 
     @Override
     public String toString() {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
index db14ab21b..37c048fa1 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -2,7 +2,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.InputStream;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -13,18 +12,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.command.EventCallback;
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.model.Event;
-import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
+import com.github.dockerjava.jaxrs.util.Streaming;
 
-public class EventsCmdExec extends
-		AbstrDockerCmdExec<EventsCmd, ExecutorService> implements
-		EventsCmd.Exec {
+public class EventsCmdExec extends AbstrDockerCmdExec<EventsCmd, Void>
+		implements EventsCmd.Exec {
 	private static final Logger LOGGER = LoggerFactory
 			.getLogger(EventsCmdExec.class);
 
@@ -33,33 +26,35 @@ public EventsCmdExec(WebTarget baseResource) {
 	}
 
 	@Override
-	protected ExecutorService execute(EventsCmd command) {
-		ExecutorService executorService = Executors.newSingleThreadExecutor();
+	protected Void execute(EventsCmd command) {
+		
 
-		WebTarget webResource = getBaseResource().path("/events")
+		WebTarget webTarget = getBaseResource().path("/events")
 				.queryParam("since", command.getSince())
 				.queryParam("until", command.getUntil());
 
-		LOGGER.trace("GET: {}", webResource);
+		LOGGER.trace("GET: {}", webTarget);
+		ExecutorService executorService = Executors.newSingleThreadExecutor();
 		EventNotifier eventNotifier = EventNotifier.create(
-				command.getEventCallback(), webResource);
+				command.getEventCallback(), webTarget);
 		executorService.submit(eventNotifier);
-		return executorService;
+		executorService.shutdown();
+
+		return null;
 	}
 
 	private static class EventNotifier implements Callable<Void> {
-		private static final JsonFactory JSON_FACTORY = new JsonFactory();
-		private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
-		private final EventCallback eventCallback;
+		private final EventsCmd.EventStreamCallback eventCallback;
 		private final WebTarget webTarget;
 
-		private EventNotifier(EventCallback eventCallback, WebTarget webTarget) {
+		private EventNotifier(EventsCmd.EventStreamCallback eventCallback,
+				WebTarget webTarget) {
 			this.eventCallback = eventCallback;
 			this.webTarget = webTarget;
 		}
 
-		public static EventNotifier create(EventCallback eventCallback,
+		public static EventNotifier create(EventsCmd.EventStreamCallback eventCallback,
 				WebTarget webTarget) {
 			checkNotNull(eventCallback, "An EventCallback must be provided");
 			checkNotNull(webTarget, "An WebTarget must be provided");
@@ -68,43 +63,13 @@ public static EventNotifier create(EventCallback eventCallback,
 
 		@Override
 		public Void call() throws Exception {
-			int numEvents = 0;
-			Response response = null;
-			try {
-				response = webTarget.request().get(Response.class);
-				InputStream inputStream = new WrappedResponseInputStream(
-						response);
-				JsonParser jp = JSON_FACTORY.createParser(inputStream);
-				// The following condition looks strange but jp.nextToken() will block until there is an
-				// event from the docker server or the connection is terminated.
-				// therefore we want to check before getting an event (to prevent a blocking operation
-				// and after the event to make sure that the eventCallback is still interested in getting notified.
-				while (eventCallback.isReceiving() && 
-				       jp.nextToken() != JsonToken.END_OBJECT && !jp.isClosed() &&
-				       eventCallback.isReceiving()) {
-					try {
-						eventCallback.onEvent(OBJECT_MAPPER.readValue(jp,
-								Event.class));
-					} catch (Exception e) {
-						eventCallback.onException(e);
-					}
-					numEvents++;
-				}
-			} catch (Exception e) {
-				eventCallback.onException(e);
-			} finally {
-				// call onCompletion before close because of https://github.com/docker-java/docker-java/issues/196
-				try {
-					eventCallback.onCompletion(numEvents);
-				} catch (Exception e) {
-					eventCallback.onException(e);
-				}
-				if (response != null) {
-					response.close();
-				}
-			}
-
+			Response response = webTarget.request().get(Response.class);
+						
+			Streaming.processJsonStream(response, eventCallback, Event.class);
+			
 			return null;
 		}
 	}
+
+	
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/util/Streaming.java b/src/main/java/com/github/dockerjava/jaxrs/util/Streaming.java
new file mode 100644
index 000000000..5f68ab09b
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/util/Streaming.java
@@ -0,0 +1,52 @@
+package com.github.dockerjava.jaxrs.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.ws.rs.core.Response;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.stream.ObjectStreamCallback;
+
+public class Streaming {
+	
+	private static final JsonFactory JSON_FACTORY = new JsonFactory();
+	private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+	
+	public static <T> void processJsonStream(Response response,
+			ObjectStreamCallback<T> objectStreamCallback, Class<T> clazz) {
+		
+		InputStream inputStream = new WrappedResponseInputStream(
+				response);
+		
+		objectStreamCallback.streamStarted(inputStream);
+		
+		try {
+			JsonParser jp = JSON_FACTORY.createParser(inputStream);
+			while (!jp.isClosed() && jp.nextToken() != JsonToken.END_OBJECT) {
+				try {
+					objectStreamCallback.onStream(OBJECT_MAPPER.readValue(jp,
+							clazz));
+				} catch (Exception e) {
+					objectStreamCallback.onError(e);
+				}
+			}
+		} catch (Throwable t) {
+			objectStreamCallback.onError(t);
+		} finally {
+			try {
+				inputStream.close();
+			} catch (IOException e) {
+				objectStreamCallback.onError(e);
+			} finally {
+				objectStreamCallback.streamFinished();
+			}
+		}
+	}
+	
+
+
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java b/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
index bf40dbfc0..752ff3423 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
@@ -8,7 +8,7 @@
 /**
  * This is a wrapper around {@link Response} that acts as a {@link InputStream}.
  * When this {@link WrappedResponseInputStream} is closed it closes the 
- * underlying {@link Response} object also to prevent connection leaks.
+ * underlying {@link Response} object also to prevent blocking/hanging connections.
  * 
  * @author marcus
  */
diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
index 569283ce7..ab3e5c30b 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -1,11 +1,12 @@
 package com.github.dockerjava.core.command;
 
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.EventCallback;
-import com.github.dockerjava.api.command.EventsCmd;
-import com.github.dockerjava.api.model.Event;
-import com.github.dockerjava.client.AbstractDockerClientTest;
+import java.io.Closeable;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
@@ -14,14 +15,11 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.EventsCmd.EventStreamCallback;
+import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.client.AbstractDockerClientTest;
 
 @Test(groups = "integration")
 public class EventsCmdImplTest extends AbstractDockerClientTest {
@@ -65,54 +63,60 @@ public void testEventStreamTimeBound() throws InterruptedException,
 		CountDownLatch countDownLatch = new CountDownLatch(expectedEvents);
 		EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
 
-		EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback)
-				.withSince(startTime).withUntil(endTime);
-		ExecutorService executorService = eventsCmd.exec();
+		dockerClient.eventsCmd(eventCallback)
+				.withSince(startTime)
+				.withUntil(endTime)
+				.exec();
 		
 		boolean zeroCount = countDownLatch.await(5, TimeUnit.SECONDS);
 		
-		executorService.shutdown();
 		eventCallback.close();
+		
+		LOG.debug("events: " + eventCallback.getEvents());
 
 		assertTrue(zeroCount, "" + eventCallback.getEvents());
 	}
 
 	@Test
-	public void testEventStreaming1() throws InterruptedException, IOException {
+	public void testEventStreamingUnbound() throws InterruptedException, IOException {
 		// Don't include other tests events
 		TimeUnit.SECONDS.sleep(1);
 
 		CountDownLatch countDownLatch = new CountDownLatch(KNOWN_NUM_EVENTS);
 		EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
 
-		EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback).withSince(
-				getEpochTime());
-		ExecutorService executorService = eventsCmd.exec();
+		dockerClient.eventsCmd(eventCallback)
+			.withSince(getEpochTime())
+			.exec();
 
 		generateEvents();
 
 		boolean zeroCount = countDownLatch.await(5, TimeUnit.SECONDS);
-		executorService.shutdown();
+
+		System.out.println("close callback");
+		
 		eventCallback.close();
 		assertTrue(zeroCount, "Expected 4 events, [create, start, die, stop]");
+		
+		assertTrue(eventCallback.getErrors().isEmpty(), "At least on Exception was thrown: " + eventCallback.getErrors());
 	}
 
 	@Test
-	public void testEventStreaming2() throws InterruptedException, IOException {
+	public void testEventStreamingUnbound2() throws InterruptedException, IOException {
 		// Don't include other tests events
 		TimeUnit.SECONDS.sleep(1);
 
 		CountDownLatch countDownLatch = new CountDownLatch(KNOWN_NUM_EVENTS);
 		EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
 
-		EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback).withSince(
-				getEpochTime());
-		ExecutorService executorService = eventsCmd.exec();
+		dockerClient.eventsCmd(eventCallback)
+			.withSince(getEpochTime())
+			.exec();
 
 		generateEvents();
 
 		boolean zeroCount = countDownLatch.await(5, TimeUnit.SECONDS);
-		executorService.shutdown();
+
 		eventCallback.close();
 		assertTrue(zeroCount, "Expected 4 events, [create, start, die, stop]");
 	}
@@ -130,43 +134,50 @@ private int generateEvents() {
 		return KNOWN_NUM_EVENTS;
 	}
 
-	private class EventCallbackTest implements EventCallback {
+	private class EventCallbackTest implements EventStreamCallback, Closeable {
 		private final CountDownLatch countDownLatch;
-		private final AtomicBoolean isReceiving = new AtomicBoolean(true);
 		private final List<Event> events = new ArrayList<Event>();
+		private final List<Throwable> errors = new ArrayList<Throwable>();
+		private Closeable closeable;
 
 		public EventCallbackTest(CountDownLatch countDownLatch) {
 			this.countDownLatch = countDownLatch;
 		}
 
-		public void close() {
-			isReceiving.set(false);
+		@Override
+		public void close() throws IOException {
+			closeable.close();
+		}
+		
+		@Override
+		public void streamStarted(Closeable closeable) {
+			this.closeable = closeable;
 		}
 
 		@Override
-		public void onEvent(Event event) {
+		public void onStream(Event event) {
 			LOG.info("Received event #{}: {}", countDownLatch.getCount(), event);
 			countDownLatch.countDown();
 			events.add(event);
 		}
 
 		@Override
-		public void onException(Throwable throwable) {
+		public void onError(Throwable throwable) {
 			LOG.error("Error occurred: {}", throwable.getMessage());
+			errors.add(throwable);
 		}
-
-		@Override
-		public void onCompletion(int numEvents) {
-			LOG.info("Number of events received: {}", numEvents);
-		}
-
+		
 		@Override
-		public boolean isReceiving() {
-			return isReceiving.get();
+		public void streamFinished() {
+			LOG.info("Event stream finished");
 		}
 
 		public List<Event> getEvents() {
 			return new ArrayList<Event>(events);
 		}
+		
+		public List<Throwable> getErrors() {
+			return errors;
+		}
 	}
 }

From bff4291ebb6ce99e1132199876af77208956c60d Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 22 May 2015 23:29:43 +0200
Subject: [PATCH 0079/1272] Added test for starting container with auto
 assigned port binding

---
 .../command/StartContainerCmdImplTest.java    | 66 ++++++++++++++-----
 1 file changed, 50 insertions(+), 16 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index 9a3071653..045c008e1 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -65,8 +65,7 @@ public void startContainerWithVolumes() throws DockerException {
 		Volume volume2 = new Volume("/opt/webapp2");
 
 		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox")
-				.withVolumes(volume1, volume2)
+				.createContainerCmd("busybox").withVolumes(volume1, volume2)
 				.withCmd("true").exec();
 
 		LOG.info("Created container {}", container.toString());
@@ -91,8 +90,10 @@ public void startContainerWithVolumes() throws DockerException {
 
 		assertContainerHasVolumes(inspectContainerResponse, volume1, volume2);
 
-		assertThat(Arrays.asList(inspectContainerResponse.getVolumesRW()),
-				contains(new VolumeRW(volume1, AccessMode.ro), new VolumeRW(volume2)));
+		assertThat(
+				Arrays.asList(inspectContainerResponse.getVolumesRW()),
+				contains(new VolumeRW(volume1, AccessMode.ro), new VolumeRW(
+						volume2)));
 
 	}
 
@@ -224,6 +225,41 @@ public void startContainerWithPortBindings() throws DockerException {
 
 	}
 
+	@Test
+	public void startContainerWithRandomPortBindings() throws DockerException {
+
+		ExposedPort tcp22 = ExposedPort.tcp(22);
+		ExposedPort tcp23 = ExposedPort.tcp(23);
+
+		Ports portBindings = new Ports();
+		portBindings.bind(tcp22, Ports.Binding(null));
+		portBindings.bind(tcp23, Ports.Binding(null));
+
+		CreateContainerResponse container = dockerClient
+				.createContainerCmd("busybox").withCmd("sleep", "9999")
+				.withExposedPorts(tcp22, tcp23).withPortBindings(portBindings)
+				.withPublishAllPorts(true).exec();
+
+		LOG.info("Created container {}", container.toString());
+
+		assertThat(container.getId(), not(isEmptyString()));
+
+		dockerClient.startContainerCmd(container.getId()).exec();
+
+		InspectContainerResponse inspectContainerResponse = dockerClient
+				.inspectContainerCmd(container.getId()).exec();
+
+		assertThat(Arrays.asList(inspectContainerResponse.getConfig()
+				.getExposedPorts()), contains(tcp22, tcp23));
+
+		assertThat(inspectContainerResponse.getNetworkSettings().getPorts()
+				.getBindings().get(tcp22)[0].getHostPort(), is(notNullValue()));
+
+		assertThat(inspectContainerResponse.getNetworkSettings().getPorts()
+				.getBindings().get(tcp23)[0], is(notNullValue()));
+
+	}
+
 	@Test
 	public void startContainerWithConflictingPortBindings()
 			throws DockerException {
@@ -303,8 +339,9 @@ public void startContainerWithLinkingDeprecated() throws DockerException {
 				is(notNullValue()));
 		assertThat(inspectContainerResponse2.getHostConfig().getLinks(),
 				is(notNullValue()));
-		assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
-				"container1Link") }));
+		assertThat(
+				inspectContainerResponse2.getHostConfig().getLinks(),
+				equalTo(new Link[] { new Link("container1", "container1Link") }));
 		assertThat(inspectContainerResponse2.getId(),
 				startsWith(container2.getId()));
 		assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
@@ -313,8 +350,7 @@ public void startContainerWithLinkingDeprecated() throws DockerException {
 		assertThat(inspectContainerResponse2.getState().isRunning(), is(true));
 
 	}
-	
-	
+
 	@Test
 	public void startContainerWithLinking() throws DockerException {
 
@@ -348,14 +384,12 @@ public void startContainerWithLinking() throws DockerException {
 		CreateContainerResponse container2 = dockerClient
 				.createContainerCmd("busybox").withCmd("sleep", "9999")
 				.withName("container2")
-				.withLinks(new Link("container1", "container1Link"))
-				.exec();
+				.withLinks(new Link("container1", "container1Link")).exec();
 
 		LOG.info("Created container2 {}", container2.toString());
 		assertThat(container2.getId(), not(isEmptyString()));
 
-		dockerClient.startContainerCmd(container2.getId())
-				.exec();
+		dockerClient.startContainerCmd(container2.getId()).exec();
 
 		InspectContainerResponse inspectContainerResponse2 = dockerClient
 				.inspectContainerCmd(container2.getId()).exec();
@@ -367,8 +401,9 @@ public void startContainerWithLinking() throws DockerException {
 				is(notNullValue()));
 		assertThat(inspectContainerResponse2.getHostConfig().getLinks(),
 				is(notNullValue()));
-		assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
-				"container1Link") }));
+		assertThat(
+				inspectContainerResponse2.getHostConfig().getLinks(),
+				equalTo(new Link[] { new Link("container1", "container1Link") }));
 		assertThat(inspectContainerResponse2.getId(),
 				startsWith(container2.getId()));
 		assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
@@ -512,8 +547,7 @@ public void startContainerWithExtraHosts() throws DockerException {
 		assertThat(container.getId(), not(isEmptyString()));
 
 		dockerClient.startContainerCmd(container.getId())
-				.withExtraHosts("dockerhost:127.0.0.1")
-				.exec();
+				.withExtraHosts("dockerhost:127.0.0.1").exec();
 
 		InspectContainerResponse inspectContainerResponse = dockerClient
 				.inspectContainerCmd(container.getId()).exec();

From dac0be3c89039667ea3149bfb2fde46c34d619df Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 28 May 2015 23:16:36 +0200
Subject: [PATCH 0080/1272] Modify stats implementation according to events
 command

---
 .../dockerjava/jaxrs/EventsCmdExec.java       |  9 ++--
 .../github/dockerjava/jaxrs/StatsCmdExec.java | 47 ++++++++++++-------
 .../core/command/StatsCmdImplTest.java        |  8 ++--
 3 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
index db14ab21b..a601ea90c 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -79,7 +79,7 @@ public Void call() throws Exception {
 				// event from the docker server or the connection is terminated.
 				// therefore we want to check before getting an event (to prevent a blocking operation
 				// and after the event to make sure that the eventCallback is still interested in getting notified.
-				while (eventCallback.isReceiving() && 
+				while (eventCallback.isReceiving() &&
 				       jp.nextToken() != JsonToken.END_OBJECT && !jp.isClosed() &&
 				       eventCallback.isReceiving()) {
 					try {
@@ -93,15 +93,14 @@ public Void call() throws Exception {
 			} catch (Exception e) {
 				eventCallback.onException(e);
 			} finally {
-				// call onCompletion before close because of https://github.com/docker-java/docker-java/issues/196
+			    if (response != null) {
+                    response.close();
+                }
 				try {
 					eventCallback.onCompletion(numEvents);
 				} catch (Exception e) {
 					eventCallback.onException(e);
 				}
-				if (response != null) {
-					response.close();
-				}
 			}
 
 			return null;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
index 97b9a2754..c0c6f36c1 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
@@ -24,7 +24,7 @@
 
 public class StatsCmdExec extends AbstrDockerCmdExec<StatsCmd, ExecutorService> implements StatsCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(StatsCmdExec.class);
-    
+
     public StatsCmdExec(WebTarget baseResource) {
         super(baseResource);
     }
@@ -32,7 +32,7 @@ public StatsCmdExec(WebTarget baseResource) {
     @Override
     protected ExecutorService execute(StatsCmd command) {
     	ExecutorService executorService = Executors.newSingleThreadExecutor();
-    	
+
         WebTarget webResource = getBaseResource().path("/containers/{id}/stats")
             .resolveTemplate("id", command.getContainerId());
 
@@ -41,7 +41,7 @@ protected ExecutorService execute(StatsCmd command) {
         executorService.submit(eventNotifier);
         return executorService;
     }
-    
+
     private static class StatsNotifier implements Callable<Void> {
         private static final JsonFactory JSON_FACTORY = new JsonFactory();
         private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
@@ -62,29 +62,42 @@ public static StatsNotifier create(StatsCallback statsCallback, WebTarget webTar
 
         @Override
         public Void call() throws Exception {
-            int numStats=0;
+            int numEvents = 0;
             Response response = null;
             try {
                 response = webTarget.request().get(Response.class);
-                InputStream inputStream = new WrappedResponseInputStream(response);
+                InputStream inputStream = new WrappedResponseInputStream(
+                        response);
                 JsonParser jp = JSON_FACTORY.createParser(inputStream);
-                while (jp.nextToken() != JsonToken.END_OBJECT && !jp.isClosed() && statsCallback.isReceiving()) {
-                    statsCallback.onStats(OBJECT_MAPPER.readValue(jp, Statistics.class));
-                    numStats++;
+                // The following condition looks strange but jp.nextToken() will block until there is an
+                // event from the docker server or the connection is terminated.
+                // therefore we want to check before getting an event (to prevent a blocking operation
+                // and after the event to make sure that the eventCallback is still interested in getting notified.
+                while (statsCallback.isReceiving() &&
+                       jp.nextToken() != JsonToken.END_OBJECT && !jp.isClosed() &&
+                               statsCallback.isReceiving()) {
+                    try {
+                        statsCallback.onStats(OBJECT_MAPPER.readValue(jp,
+                                Statistics.class));
+                    } catch (Exception e) {
+                        statsCallback.onException(e);
+                    }
+                    numEvents++;
                 }
-                statsCallback.onCompletion(numStats);
-                LOGGER.info("Finished collecting stats");
-                return null ;
-            }
-            catch(Throwable t) {
-                statsCallback.onException(t);
-            }
-            finally {                
+            } catch (Exception e) {
+                statsCallback.onException(e);
+            } finally {
                 if (response != null) {
                     response.close();
                 }
+                try {
+                    statsCallback.onCompletion(numEvents);
+                } catch (Exception e) {
+                    statsCallback.onException(e);
+                }
             }
-            return null ;
+
+            return null;
         }
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
index c5e575373..1e6baffd2 100644
--- a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
@@ -57,7 +57,7 @@ public void testStatsStreaming() throws InterruptedException, IOException {
 
 		CountDownLatch countDownLatch = new CountDownLatch(NUM_STATS);
 		StatsCallbackTest statsCallback = new StatsCallbackTest(countDownLatch);
-		
+
         String containerName = "generated_" + new SecureRandom().nextInt();
 
 		 CreateContainerResponse container = dockerClient
@@ -74,7 +74,7 @@ public void testStatsStreaming() throws InterruptedException, IOException {
 
 		countDownLatch.await(3, TimeUnit.SECONDS);
 		boolean gotStats = statsCallback.gotStats();
-		
+
         LOG.info("Stop stats collection");
 		executorService.shutdown();
 	    statsCallback.close();
@@ -82,7 +82,7 @@ public void testStatsStreaming() throws InterruptedException, IOException {
         LOG.info("Stopping container");
         dockerClient.stopContainerCmd(container.getId()).exec();
         dockerClient.removeContainerCmd(container.getId()).exec();
-        
+
         LOG.info("Completed test");
         assertTrue(gotStats, "Expected true");
 
@@ -125,7 +125,7 @@ public void onCompletion(int numStats) {
 		public boolean isReceiving() {
 			return isReceiving.get();
 		}
-		
+
 	    public boolean gotStats() {
 	            return gotStats;
 	    }

From 4bec0ec31eec8eedcf8b82cfbc7aa389772a32ff Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 28 May 2015 23:20:02 +0200
Subject: [PATCH 0081/1272] Fix test setup

---
 .../dockerjava/client/AbstractDockerClientTest.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 80c22cd69..373680471 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -39,7 +39,7 @@ public abstract class AbstractDockerClientTest extends Assert {
 	protected TestDockerCmdExecFactory dockerCmdExecFactory = new TestDockerCmdExecFactory(DockerClientBuilder.getDefaultDockerCmdExecFactory());
 
 	public void beforeTest()  {
-				
+
 		LOG.info("======================= BEFORETEST =======================");
 		LOG.info("Connecting to Docker server");
 		dockerClient = DockerClientBuilder.getInstance(config())
@@ -60,7 +60,7 @@ private DockerClientConfig config() {
 
     protected DockerClientConfig config(String password) {
         DockerClientConfig.DockerClientConfigBuilder builder = DockerClientConfig.createDefaultConfigBuilder()
-                .withServerAddress("https://index.docker.io/v1/").withMaxTotalConnections(5).withMaxPerRouteConnections(5);
+                .withServerAddress("https://index.docker.io/v1/");
         if (password!=null) {
             builder = builder.withPassword(password);
         }
@@ -104,7 +104,7 @@ public void afterMethod(ITestResult result) {
 				"################################## END OF {} ##################################\n",
 				result.getName());
 	}
-	
+
 	protected String asString(InputStream response) {
 		return consumeAsString(response);
 	}
@@ -123,7 +123,7 @@ public static String consumeAsString(InputStream response)  {
 				LOG.info("line: "+line);
 			}
 			response.close();
-			
+
 			return logwriter.toString();
 		} catch (IOException e) {
 			throw new RuntimeException(e);
@@ -175,11 +175,11 @@ public static boolean available(int port) {
 	 * Asserts that {@link InspectContainerResponse#getVolumes()} (<code>.Volumes</code>)
 	 * has {@link VolumeBind}s for the given {@link Volume}s
 	 */
-	public static void assertContainerHasVolumes(InspectContainerResponse inspectContainerResponse, 
+	public static void assertContainerHasVolumes(InspectContainerResponse inspectContainerResponse,
 			Volume ... expectedVolumes) {
 		VolumeBind[] volumeBinds = inspectContainerResponse.getVolumes();
 		LOG.info("Inspect .Volumes = [{}]", Joiner.on(", ").join(volumeBinds));
-	
+
 		List<Volume> volumes = new ArrayList<Volume>();
 		for (VolumeBind bind : volumeBinds) {
 			volumes.add(new Volume(bind.getContainerPath()));

From 679cb8d8691857317dfd323e85e9920e32709a11 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 28 May 2015 23:34:44 +0200
Subject: [PATCH 0082/1272] Ignore with CirecleCI

---
 .../com/github/dockerjava/core/command/StatsCmdImplTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
index 1e6baffd2..b82f2f75c 100644
--- a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
@@ -51,7 +51,7 @@ public void afterMethod(ITestResult result) {
 		super.afterMethod(result);
 	}
 
-	@Test
+	@Test(groups = "ignoreInCircleCi")
 	public void testStatsStreaming() throws InterruptedException, IOException {
 		TimeUnit.SECONDS.sleep(1);
 

From 16c17767051b7aba2dbb22ecd7e5e483ae43447d Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 29 May 2015 06:50:20 +0200
Subject: [PATCH 0083/1272] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4c77e896c..7948c6776 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 Java API client for [Docker](http://docs.docker.io/ "Docker")
 
-Supports a subset of the Docker Client API v1.18, Docker Server version 1.6.0
+Supports a subset of the Docker Remote API [v1.18](https://github.com/docker/docker/blob/master/docs/sources/reference/api/docker_remote_api_v1.18.md), Docker Server version 1.6.x
 
 <b>The current implementation is based on Jersey 2.x and therefore classpath incompatible with older Jersey 1.x dependent libraries!</b>
 

From ad50bfdfb50f82bc4c2fb62dcc7d07857e5de3fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Spasi=C4=87?= <igor@jodd.org>
Date: Fri, 29 May 2015 15:43:28 +0200
Subject: [PATCH 0084/1272] Labels are array of Strings (fixes #232)

---
 src/main/java/com/github/dockerjava/api/model/Info.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/Info.java b/src/main/java/com/github/dockerjava/api/model/Info.java
index fb63f2ff0..bf96b9fc1 100644
--- a/src/main/java/com/github/dockerjava/api/model/Info.java
+++ b/src/main/java/com/github/dockerjava/api/model/Info.java
@@ -60,7 +60,7 @@ public class Info {
 	private String kernelVersion;
 	
 	@JsonProperty("Labels")
-	private String Labels;
+	private String[] Labels;
 
 	@JsonProperty("MemoryLimit")
 	private boolean memoryLimit;
@@ -140,7 +140,7 @@ public String getKernelVersion() {
 		return kernelVersion;
 	}
 	
-	public String getLabels() {
+	public String[] getLabels() {
 		return Labels;
 	}
 

From cdb2d5f5637ca4fac0ea3762372576a91673703d Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 29 May 2015 21:46:59 +0200
Subject: [PATCH 0085/1272] Modify test timing

---
 .../core/command/EventsCmdImplTest.java          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
index 569283ce7..46600a160 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -68,13 +68,13 @@ public void testEventStreamTimeBound() throws InterruptedException,
 		EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback)
 				.withSince(startTime).withUntil(endTime);
 		ExecutorService executorService = eventsCmd.exec();
-		
-		boolean zeroCount = countDownLatch.await(5, TimeUnit.SECONDS);
-		
+
+		boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
+
 		executorService.shutdown();
 		eventCallback.close();
 
-		assertTrue(zeroCount, "" + eventCallback.getEvents());
+		assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
 	}
 
 	@Test
@@ -91,10 +91,10 @@ public void testEventStreaming1() throws InterruptedException, IOException {
 
 		generateEvents();
 
-		boolean zeroCount = countDownLatch.await(5, TimeUnit.SECONDS);
+		boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
 		executorService.shutdown();
 		eventCallback.close();
-		assertTrue(zeroCount, "Expected 4 events, [create, start, die, stop]");
+		assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
 	}
 
 	@Test
@@ -111,10 +111,10 @@ public void testEventStreaming2() throws InterruptedException, IOException {
 
 		generateEvents();
 
-		boolean zeroCount = countDownLatch.await(5, TimeUnit.SECONDS);
+		boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
 		executorService.shutdown();
 		eventCallback.close();
-		assertTrue(zeroCount, "Expected 4 events, [create, start, die, stop]");
+		assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
 	}
 
 	/**

From 3923cd1ce0182ae0284ba5d3770451e3363ca1b5 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 29 May 2015 22:03:29 +0200
Subject: [PATCH 0086/1272] Debug log connection pool

---
 pom.xml                        | 17 ++++++++++++-----
 src/test/resources/logback.xml |  2 ++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index f8eb34ced..ee80a9c9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -84,7 +85,7 @@
 			<version>${jackson-jaxrs.version}</version>
 		</dependency>
 		<dependency>
-	 		<groupId>org.glassfish.jersey.connectors</groupId>
+			<groupId>org.glassfish.jersey.connectors</groupId>
 			<artifactId>jersey-apache-connector</artifactId>
 			<version>${jersey.version}</version>
 		</dependency>
@@ -100,8 +101,8 @@
 		</dependency>
 		<dependency>
 			<groupId>de.gesellix</groupId>
-			 <artifactId>unix-socket-factory</artifactId>
-		 	<version>${unix-socket-factory.version}</version>
+			<artifactId>unix-socket-factory</artifactId>
+			<version>${unix-socket-factory.version}</version>
 		</dependency>
 
 		<dependency>
@@ -129,6 +130,12 @@
 			<artifactId>slf4j-api</artifactId>
 			<version>${slf4j-api.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<version>1.7.12</version>
+		</dependency>
+
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
@@ -189,7 +196,7 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	
+
 	<distributionManagement>
 		<snapshotRepository>
 			<id>ossrh</id>
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
index bdb0ee75a..bea30de0e 100644
--- a/src/test/resources/logback.xml
+++ b/src/test/resources/logback.xml
@@ -8,6 +8,8 @@
 
     <logger name="com.github.dockerjava" level="INFO"/>
     <logger name="com.github.dockerjava.jaxrs" level="DEBUG"/>
+    <logger name="org.apache.http.impl.conn" level="DEBUG"/>
+
 
     <root level="INFO">
         <appender-ref ref="STDOUT" />

From a28cabb62ecf4dd1271eac92e26e83cd87f152ac Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 29 May 2015 22:13:43 +0200
Subject: [PATCH 0087/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea3118178..b71f4e928 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@ Change Log
 ===
 Latest SNAPSHOT
 ---
+* [#233](https://github.com/docker-java/docker-java/pull/233) Labels are array of Strings (fixes #232) 
+* [#189](https://github.com/docker-java/docker-java/pull/189) Add docker stats support  
 
 v1.3.0
 ---

From 99f46efbcd09da305f8df2215e6d1ef6cdf1b2c3 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <Kanstantsin_Shautsou@epam.com>
Date: Sat, 30 May 2015 00:21:00 +0300
Subject: [PATCH 0088/1272] VolumesFrom is an array

---
 .../github/dockerjava/api/command/StartContainerCmd.java   | 5 +++--
 .../dockerjava/core/command/StartContainerCmdImpl.java     | 7 ++++---
 .../dockerjava/core/command/StartContainerCmdImplTest.java | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
index e76598e3e..aeddfd0bd 100644
--- a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
@@ -10,6 +10,7 @@
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.RestartPolicy;
+import com.github.dockerjava.api.model.VolumesFrom;
 
 /**
  * Start a container.
@@ -56,7 +57,7 @@ public static interface Exec extends DockerCmdExec<StartContainerCmd, Void> {
 
 	public RestartPolicy getRestartPolicy();
 
-	public String getVolumesFrom();
+	public VolumesFrom[] getVolumesFrom();
 
 	public Boolean isPrivileged();
 
@@ -165,6 +166,6 @@ public static interface Exec extends DockerCmdExec<StartContainerCmd, Void> {
 	public StartContainerCmd withRestartPolicy(RestartPolicy restartPolicy);
 
 	@Deprecated
-	public StartContainerCmd withVolumesFrom(String volumesFrom);
+	public StartContainerCmd withVolumesFrom(VolumesFrom... volumesFrom);
 
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
index dba35fb99..27fca12f8 100644
--- a/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
@@ -21,6 +21,7 @@
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.RestartPolicy;
+import com.github.dockerjava.api.model.VolumesFrom;
 
 
 /**
@@ -57,7 +58,7 @@ public class StartContainerCmdImpl extends AbstrDockerCmd<StartContainerCmd, Voi
 	private String[] dnsSearch;
 
 	@JsonProperty("VolumesFrom")
-	private String volumesFrom;
+	private VolumesFrom[] volumesFrom;
 	
 	@JsonProperty("NetworkMode")          
     private String networkMode;
@@ -125,7 +126,7 @@ public String[] getDnsSearch() {
 	}
 
 	@Override
-	public String getVolumesFrom() {
+	public VolumesFrom[] getVolumesFrom() {
 		return volumesFrom;
 	}
 
@@ -232,7 +233,7 @@ public StartContainerCmd withDnsSearch(String... dnsSearch) {
 	}
 
 	@Override
-	public StartContainerCmd withVolumesFrom(String volumesFrom) {
+	public StartContainerCmd withVolumesFrom(VolumesFrom... volumesFrom) {
 		checkNotNull(volumesFrom, "volumesFrom was not specified");
 		this.volumesFrom = volumesFrom;
 		return this;
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index 045c008e1..70108ae68 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -126,7 +126,7 @@ public void startContainerWithVolumesFrom() throws DockerException {
 		LOG.info("Created container2 {}", container2.toString());
 
 		dockerClient.startContainerCmd(container2.getId())
-				.withVolumesFrom(container1Name).exec();
+				.withVolumesFrom(new VolumesFrom(container1Name)).exec();
 		LOG.info("Started container2 {}", container2.toString());
 
 		InspectContainerResponse inspectContainerResponse2 = dockerClient

From fb6d50b32f9a21188fea945dcf29a07a591cf4b8 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 5 Jun 2015 18:58:11 +0200
Subject: [PATCH 0089/1272] Fix auto bind test

---
 .../dockerjava/core/command/StartContainerCmdImplTest.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index 70108ae68..640839915 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -253,10 +253,10 @@ public void startContainerWithRandomPortBindings() throws DockerException {
 				.getExposedPorts()), contains(tcp22, tcp23));
 
 		assertThat(inspectContainerResponse.getNetworkSettings().getPorts()
-				.getBindings().get(tcp22)[0].getHostPort(), is(notNullValue()));
+				.getBindings().get(tcp22)[0].getHostPort(), is(not(equalTo(tcp22.getPort()))));
 
 		assertThat(inspectContainerResponse.getNetworkSettings().getPorts()
-				.getBindings().get(tcp23)[0], is(notNullValue()));
+				.getBindings().get(tcp23)[0].getHostPort(), is(not(equalTo(tcp23.getPort()))));
 
 	}
 

From 43a77ba567be3f366fec11e7f459c9aadf418813 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 5 Jun 2015 20:18:19 +0200
Subject: [PATCH 0090/1272] Add pool timeout

---
 .../github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index b7469a43d..58f85e7ea 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -4,6 +4,7 @@
 
 import java.io.IOException;
 import java.net.URI;
+import java.util.concurrent.TimeUnit;
 
 import com.github.dockerjava.api.command.*;
 
@@ -22,9 +23,11 @@
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.glassfish.jersey.CommonProperties;
 import org.glassfish.jersey.apache.connector.ApacheClientProperties;
+
 //import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 // see https://github.com/docker-java/docker-java/issues/196
 import com.github.dockerjava.jaxrs.connector.ApacheConnectorProvider;
+
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
 
@@ -84,7 +87,8 @@ public void init(DockerClientConfig dockerClientConfig) {
 		}
 
 		PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager(
-				getSchemeRegistry(originalUri, sslContext));
+				getSchemeRegistry(originalUri, sslContext), null, null, null, 10, TimeUnit.SECONDS);
+
 
 		if (dockerClientConfig.getMaxTotalConnections() != null)
 			connManager
@@ -315,7 +319,7 @@ public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
 	public EventsCmd.Exec createEventsCmdExec() {
 		return new EventsCmdExec(getBaseResource());
 	}
-	
+
 	@Override
     public StatsCmd.Exec createStatsCmdExec() {
 	    return new StatsCmdExec(getBaseResource());

From 21b7c06b6c04af2d44ed578081d6dce6f98aa952 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 5 Jun 2015 20:50:39 +0200
Subject: [PATCH 0091/1272] Connect timeout of 10 seconds

---
 .../com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index 58f85e7ea..9e375f24a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -72,6 +72,7 @@ public void init(DockerClientConfig dockerClientConfig) {
 			int readTimeout = dockerClientConfig.getReadTimeout();
 			clientConfig.property(ClientProperties.READ_TIMEOUT, readTimeout);
 		}
+		clientConfig.property(ClientProperties.CONNECT_TIMEOUT, 10000);
 
 		URI originalUri = dockerClientConfig.getUri();
 

From 4c3e96466e8a45a8cb50122833417dfdad16a9a3 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 5 Jun 2015 21:39:38 +0200
Subject: [PATCH 0092/1272] Added connection request timeout

---
 .../com/github/dockerjava/jaxrs/connector/ApacheConnector.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
index 651db983d..d785bff7c 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
@@ -464,6 +464,9 @@ public ClientResponse apply(final ClientRequest clientRequest) throws Processing
                 authCache.put(getHost(request), basicScheme);
                 context.setAuthCache(authCache);
             }
+
+            context.setRequestConfig(RequestConfig.custom().setConnectionRequestTimeout(10).build());
+
             response = client.execute(getHost(request), request, context);
             HeaderUtils.checkHeaderChanges(clientHeadersSnapshot, clientRequest.getHeaders(),
                     this.getClass().getName());

From 5c4b0b0fc42c9d0d070ad6dbd131ceec8d4346dc Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 5 Jun 2015 22:08:07 +0200
Subject: [PATCH 0093/1272] Connection request timeout

---
 .../github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java | 8 +++++++-
 .../dockerjava/jaxrs/connector/ApacheConnector.java       | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index 9e375f24a..1e77e5b26 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -16,6 +16,7 @@
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.WebTarget;
 
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.conn.socket.PlainConnectionSocketFactory;
@@ -24,6 +25,7 @@
 import org.glassfish.jersey.CommonProperties;
 import org.glassfish.jersey.apache.connector.ApacheClientProperties;
 
+
 //import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 // see https://github.com/docker-java/docker-java/issues/196
 import com.github.dockerjava.jaxrs.connector.ApacheConnectorProvider;
@@ -72,7 +74,8 @@ public void init(DockerClientConfig dockerClientConfig) {
 			int readTimeout = dockerClientConfig.getReadTimeout();
 			clientConfig.property(ClientProperties.READ_TIMEOUT, readTimeout);
 		}
-		clientConfig.property(ClientProperties.CONNECT_TIMEOUT, 10000);
+
+		//clientConfig.property(ClientProperties.CONNECT_TIMEOUT, 10000);
 
 		URI originalUri = dockerClientConfig.getUri();
 
@@ -101,6 +104,9 @@ public void init(DockerClientConfig dockerClientConfig) {
 		clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER,
 				connManager);
 
+		clientConfig.property(ApacheClientProperties.REQUEST_CONFIG,
+                RequestConfig.custom().setConnectionRequestTimeout(10).build());
+
 		ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(
 				clientConfig);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
index d785bff7c..63fea0954 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
@@ -465,7 +465,7 @@ public ClientResponse apply(final ClientRequest clientRequest) throws Processing
                 context.setAuthCache(authCache);
             }
 
-            context.setRequestConfig(RequestConfig.custom().setConnectionRequestTimeout(10).build());
+            //context.setRequestConfig(RequestConfig.custom().setConnectionRequestTimeout(10).build());
 
             response = client.execute(getHost(request), request, context);
             HeaderUtils.checkHeaderChanges(clientHeadersSnapshot, clientRequest.getHeaders(),

From 2c9e12c3541550cfd983f478fcec93a1666718df Mon Sep 17 00:00:00 2001
From: Zach Marshall <Zach.Marshall@sas.com>
Date: Fri, 12 Jun 2015 15:27:23 -0400
Subject: [PATCH 0094/1272] Remove temp tar files created by
 CompressArchiveUtil

CompressArchiveUtil creates tar files in a temporary directory, but
does not clean them up after. Call deleteOnExit on this file so that
they are automatically cleaned up when the JVM terminates.
---
 .../java/com/github/dockerjava/core/CompressArchiveUtil.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
index 297adc766..0afd5171d 100644
--- a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
+++ b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
@@ -12,6 +12,7 @@ public class CompressArchiveUtil {
 
     public static File archiveTARFiles(File base, Iterable<File> files, String archiveNameWithOutExtension) throws IOException {
         File tarFile = new File(FileUtils.getTempDirectoryPath(), archiveNameWithOutExtension + ".tar");
+        tarFile.deleteOnExit();
         TarArchiveOutputStream tos = new TarArchiveOutputStream(new FileOutputStream(tarFile));
         try {
             tos.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);

From d6aef1bc03e7cc64c2771314c607977d59996e4f Mon Sep 17 00:00:00 2001
From: scadge <scadgek@live.com>
Date: Mon, 15 Jun 2015 16:46:45 +0300
Subject: [PATCH 0095/1272] Added ReadonlyFs option.

---
 .../github/dockerjava/api/model/HostConfig.java  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 9973e6252..6b8cdcd45 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -27,6 +27,9 @@ public class HostConfig {
 	@JsonProperty("Privileged")
 	private boolean privileged;
 
+	@JsonProperty("ReadonlyRootfs")
+	private boolean readonlyRootfs;
+
 	@JsonProperty("Dns")
 	private String[] dns;
 
@@ -64,7 +67,7 @@ public HostConfig() {
 	}
 
 	public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, Ports portBindings, boolean publishAllPorts,
-			boolean privileged, String[] dns, String[] dnsSearch, VolumesFrom[] volumesFrom, String containerIDFile,
+			boolean privileged, boolean readonlyRootfs, String[] dns, String[] dnsSearch, VolumesFrom[] volumesFrom, String containerIDFile,
 			Capability[] capAdd, Capability[] capDrop, RestartPolicy restartPolicy, String networkMode, Device[] devices,
             String[] extraHosts, Ulimit[] ulimits) {
 		this.binds = new Binds(binds);
@@ -73,6 +76,7 @@ public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, Ports portBindi
 		this.portBindings = portBindings;
 		this.publishAllPorts = publishAllPorts;
 		this.privileged = privileged;
+		this.readonlyRootfs = readonlyRootfs;
 		this.dns = dns;
 		this.dnsSearch = dnsSearch;
 		this.volumesFrom = volumesFrom;
@@ -95,7 +99,7 @@ public Bind[] getBinds() {
 	public LxcConf[] getLxcConf() {
 		return lxcConf;
 	}
-	
+
 	public Ports getPortBindings() {
 		return portBindings;
 	}
@@ -108,6 +112,10 @@ public boolean isPrivileged() {
 		return privileged;
 	}
 
+	public boolean isReadonlyRootfs() {
+		return readonlyRootfs;
+	}
+
 	public String[] getDns() {
 		return dns;
 	}
@@ -183,6 +191,10 @@ public void setPrivileged(boolean privileged) {
 		this.privileged = privileged;
 	}
 
+	public void setReadonlyRootfs(boolean readonlyRootfs) {
+		this.readonlyRootfs = readonlyRootfs;
+	}
+
 	public void setDns(String[] dns) {
 		this.dns = dns;
 	}

From 3c4b71bd42ec82cc6829dfad41eb6160f8f69e6e Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 16 Jun 2015 21:11:13 +0200
Subject: [PATCH 0096/1272] Adjust timeout

---
 .../com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index 1e77e5b26..8a5d5d879 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -105,7 +105,7 @@ public void init(DockerClientConfig dockerClientConfig) {
 				connManager);
 
 		clientConfig.property(ApacheClientProperties.REQUEST_CONFIG,
-                RequestConfig.custom().setConnectionRequestTimeout(10).build());
+                RequestConfig.custom().setConnectionRequestTimeout(1000).build());
 
 		ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(
 				clientConfig);

From eb8be7593f583e9a31b71cc49f7abc1431c283af Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 16 Jun 2015 21:14:20 +0200
Subject: [PATCH 0097/1272] Ignore test in CircleCI

---
 .../com/github/dockerjava/core/command/EventsCmdImplTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
index 46600a160..0d61c8f59 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -97,7 +97,7 @@ public void testEventStreaming1() throws InterruptedException, IOException {
 		assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
 	}
 
-	@Test
+	@Test(groups = "ignoreInCircleCi")
 	public void testEventStreaming2() throws InterruptedException, IOException {
 		// Don't include other tests events
 		TimeUnit.SECONDS.sleep(1);

From 480a7fefc3205b4483ce0cabf21852e936fef365 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 16 Jun 2015 21:28:37 +0200
Subject: [PATCH 0098/1272] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7948c6776..a4c18a0ce 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 Java API client for [Docker](http://docs.docker.io/ "Docker")
 
-Supports a subset of the Docker Remote API [v1.18](https://github.com/docker/docker/blob/master/docs/sources/reference/api/docker_remote_api_v1.18.md), Docker Server version 1.6.x
+Supports a subset of the Docker Remote API [v1.18](https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.18.md), Docker Server version 1.6.x
 
 <b>The current implementation is based on Jersey 2.x and therefore classpath incompatible with older Jersey 1.x dependent libraries!</b>
 

From 591e871e09288a6484f6cb3f4cb9349b4237f96e Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 16 Jun 2015 21:35:52 +0200
Subject: [PATCH 0099/1272] Add Domainname attribute on create command

---
 .../api/command/CreateContainerCmd.java       | 66 ++++++++++---------
 .../core/command/CreateContainerCmdImpl.java  | 23 +++++--
 2 files changed, 53 insertions(+), 36 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 708e3139a..fa8f40f33 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -44,7 +44,7 @@ public CreateContainerResponse exec() throws NotFoundException,
 	public Device[] getDevices();
 
 	public String[] getDns();
-	
+
 	public String[] getDnsSearch();
 
 	public String[] getEntrypoint();
@@ -52,19 +52,21 @@ public CreateContainerResponse exec() throws NotFoundException,
 	public String[] getEnv();
 
 	public ExposedPort[] getExposedPorts();
-	
+
 	public String[] getExtraHosts();
 
 	public HostConfig getHostConfig();
 
 	public String getHostName();
 
+	public String getDomainName();
+
 	public String getImage();
 
 	public Link[] getLinks();
-	
+
 	public LxcConf[] getLxcConf();
-	
+
 	public String getMacAddress();
 
 	public long getMemoryLimit();
@@ -72,13 +74,13 @@ public CreateContainerResponse exec() throws NotFoundException,
 	public long getMemorySwap();
 
 	public String getName();
-	
+
 	public String getNetworkMode();
-	
+
 	public Ports getPortBindings();
 
 	public String[] getPortSpecs();
-	
+
 	public RestartPolicy getRestartPolicy();
 
 	public String getUser();
@@ -96,9 +98,9 @@ public CreateContainerResponse exec() throws NotFoundException,
 	public boolean isAttachStdout();
 
 	public boolean isNetworkDisabled();
-	
+
 	public Boolean isPrivileged();
-	
+
 	public Boolean isPublishAllPorts();
 
 	public boolean isStdInOnce();
@@ -110,9 +112,9 @@ public CreateContainerResponse exec() throws NotFoundException,
 	public CreateContainerCmd withAttachStderr(boolean attachStderr);
 
 	public CreateContainerCmd withAttachStdin(boolean attachStdin);
-	
+
 	public CreateContainerCmd withAttachStdout(boolean attachStdout);
-	
+
 	public CreateContainerCmd withBinds(Bind... binds);
 
 	/**
@@ -134,9 +136,9 @@ public CreateContainerResponse exec() throws NotFoundException,
 	public CreateContainerCmd withCmd(String... cmd);
 
 	public CreateContainerCmd withCpuset(String cpuset);
-	
+
 	public CreateContainerCmd withCpuShares(int cpuShares);
-	
+
 	/**
 	 * Add host devices to the container
 	 */
@@ -148,7 +150,7 @@ public CreateContainerResponse exec() throws NotFoundException,
 	 * Set custom DNS servers
 	 */
 	public CreateContainerCmd withDns(String... dns);
-	
+
 	/**
 	 * Set custom DNS search domains
 	 */
@@ -157,33 +159,35 @@ public CreateContainerResponse exec() throws NotFoundException,
 	public CreateContainerCmd withEntrypoint(String... entrypoint);
 
 	public CreateContainerCmd withEnv(String... env);
-	
+
 	public CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts);
-	
+
 	/**
 	 * Add hostnames to /etc/hosts in the container
 	 */
 	public CreateContainerCmd withExtraHosts(String... extraHosts);
-	
+
 	public CreateContainerCmd withHostConfig(HostConfig hostConfig);
 
 	public CreateContainerCmd withHostName(String hostName);
 
+	public CreateContainerCmd withDomainName(String domainName);
+
 	public CreateContainerCmd withImage(String image);
 
 	/**
 	 * Add link to another container.
 	 */
 	public CreateContainerCmd withLinks(Link... links);
-	
+
 	public CreateContainerCmd withLxcConf(LxcConf... lxcConf);
 
 	public CreateContainerCmd withMemoryLimit(long memoryLimit);
-	
+
 	public CreateContainerCmd withMemorySwap(long memorySwap);
-	
+
 	public CreateContainerCmd withName(String name);
-	
+
 
 	/**
 	 * Set the Network mode for the container
@@ -198,28 +202,28 @@ public CreateContainerResponse exec() throws NotFoundException,
 	 * </ul>
 	 */
 	public CreateContainerCmd withNetworkMode(String networkMode);
-	
+
 	/**
 	 * Add one or more {@link PortBinding}s.
 	 * This corresponds to the <code>--publish</code> (<code>-p</code>)
 	 * option of the <code>docker run</code> CLI command.
 	 */
 	public CreateContainerCmd withPortBindings(PortBinding... portBindings);
-	
+
 	/**
 	 * Add the port bindings that are contained in the given {@link Ports}
 	 * object.
-	 * 
+	 *
 	 * @see #withPortBindings(PortBinding...)
 	 */
 	public CreateContainerCmd withPortBindings(Ports portBindings);
 
 	public CreateContainerCmd withPortSpecs(String... portSpecs);
-	
+
 	public CreateContainerCmd withPrivileged(boolean privileged);
-	
+
 	public CreateContainerCmd withPublishAllPorts(boolean publishAllPorts);
-	
+
 	/**
 	 * Set custom {@link RestartPolicy} for the container. Defaults to
 	 * {@link RestartPolicy#noRestart()}
@@ -231,13 +235,13 @@ public CreateContainerResponse exec() throws NotFoundException,
 	public CreateContainerCmd withStdinOpen(boolean stdinOpen);
 
 	public CreateContainerCmd withTty(boolean tty);
-		
+
 	public CreateContainerCmd withUser(String user);
-	
+
 	public CreateContainerCmd withVolumes(Volume... volumes);
-	
+
 	public CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom);
-	
+
 	public CreateContainerCmd withWorkingDir(String workingDir);
 
 	public CreateContainerCmd withMacAddress(String macAddress);
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 18b089d4d..4b3f064e2 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -26,9 +26,9 @@
 import com.github.dockerjava.api.model.Volumes;
 
 /**
- * 
+ *
  * Creates a new container.
- * 
+ *
  */
 public class CreateContainerCmdImpl extends
 		AbstrDockerCmd<CreateContainerCmd, CreateContainerResponse> implements
@@ -38,6 +38,8 @@ public class CreateContainerCmdImpl extends
 
 	@JsonProperty("Hostname")
 	private String hostName = "";
+	@JsonProperty("Domainname")
+    private String domainName = "";
 	@JsonProperty("User")
 	private String user = "";
 	@JsonProperty("Memory")
@@ -182,6 +184,11 @@ public String getHostName() {
 		return hostName;
 	}
 
+	@Override
+	public String getDomainName() {
+        return domainName;
+    }
+
 	@Override
 	public String getImage() {
 		return image;
@@ -198,7 +205,7 @@ public Link[] getLinks() {
 	public LxcConf[] getLxcConf() {
 		return hostConfig.getLxcConf();
 	}
-	
+
 	public String getMacAddress() {
 		return macAddress;
 	}
@@ -432,6 +439,12 @@ public CreateContainerCmdImpl withHostName(String hostName) {
 		return this;
 	}
 
+	@Override
+    public CreateContainerCmdImpl withDomainName(String domainName) {
+        this.domainName = domainName;
+        return this;
+    }
+
 	@Override
 	public CreateContainerCmdImpl withImage(String image) {
 		this.image = image;
@@ -451,7 +464,7 @@ public CreateContainerCmd withLxcConf(LxcConf... lxcConf) {
 		this.hostConfig.setLxcConf(lxcConf);
 		return this;
 	}
-	
+
 	@Override
 	public CreateContainerCmdImpl withMacAddress(String macAddress) {
 		this.macAddress = macAddress;
@@ -515,7 +528,7 @@ public CreateContainerCmd withPublishAllPorts(boolean publishAllPorts) {
 		this.hostConfig.setPublishAllPorts(publishAllPorts);
 		return this;
 	}
-	
+
 	@Override
 	public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) {
 		this.hostConfig.setRestartPolicy(restartPolicy);

From f3900a3c76ea53c51283a3130d81eab5d106f29c Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 16 Jun 2015 21:40:56 +0200
Subject: [PATCH 0100/1272] code formatting

---
 .../core/command/CreateContainerCmdImpl.java  | 1090 +++++++++--------
 1 file changed, 555 insertions(+), 535 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 4b3f064e2..cc082b61f 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -30,551 +30,571 @@
  * Creates a new container.
  *
  */
-public class CreateContainerCmdImpl extends
-		AbstrDockerCmd<CreateContainerCmd, CreateContainerResponse> implements
-		CreateContainerCmd {
+public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, CreateContainerResponse> implements
+        CreateContainerCmd {
 
-	private String name;
+    private String name;
 
-	@JsonProperty("Hostname")
-	private String hostName = "";
-	@JsonProperty("Domainname")
+    @JsonProperty("Hostname")
+    private String hostName = "";
+
+    @JsonProperty("Domainname")
     private String domainName = "";
-	@JsonProperty("User")
-	private String user = "";
-	@JsonProperty("Memory")
-	private long memoryLimit = 0;
-	@JsonProperty("MemorySwap")
-	private long memorySwap = 0;
-	@JsonProperty("CpuShares")
-	private int cpuShares = 0;
-	@JsonProperty("Cpuset")
-	private String cpuset;
-	@JsonProperty("AttachStdin")
-	private boolean attachStdin = false;
-	@JsonProperty("AttachStdout")
-	private boolean attachStdout = false;
-	@JsonProperty("AttachStderr")
-	private boolean attachStderr = false;
-	@JsonProperty("PortSpecs")
-	private String[] portSpecs;
-	@JsonProperty("Tty")
-	private boolean tty = false;
-	@JsonProperty("OpenStdin")
-	private boolean stdinOpen = false;
-	@JsonProperty("StdinOnce")
-	private boolean stdInOnce = false;
-	@JsonProperty("Env")
-	private String[] env;
-	@JsonProperty("Cmd")
-	private String[] cmd;
-	@JsonProperty("Entrypoint")
-	private String[] entrypoint;
-	@JsonProperty("Image")
-	private String image;
-	@JsonProperty("Volumes")
-	private Volumes volumes = new Volumes();
-	@JsonProperty("WorkingDir")
-	private String workingDir = "";
-	@JsonProperty("MacAddress")
-	private String macAddress;
-	@JsonProperty("NetworkDisabled")
-	private boolean networkDisabled = false;
-	@JsonProperty("ExposedPorts")
-	private ExposedPorts exposedPorts = new ExposedPorts();
-	@JsonProperty("HostConfig")
-	private HostConfig hostConfig = new HostConfig();
-
-	public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, String image) {
-		super(exec);
-		checkNotNull(image, "image was not specified");
-		withImage(image);
-	}
-
-	/**
-	 * @throws NotFoundException
-	 *             No such container
-	 * @throws ConflictException
-	 *             Named container already exists
-	 */
-	@Override
-	public CreateContainerResponse exec() throws NotFoundException,
-			ConflictException {
-		return super.exec();
-	}
-
-	@Override
-	@JsonIgnore
-	public Bind[] getBinds() {
-		return hostConfig.getBinds();
-	}
-
-	@Override
-	public Capability[] getCapAdd() {
-		return hostConfig.getCapAdd();
-	}
-
-	@Override
-	public Capability[] getCapDrop() {
-		return hostConfig.getCapDrop();
-	}
-
-	@Override
-	public String[] getCmd() {
-		return cmd;
-	}
-
-	@Override
-	public String getCpuset() {
-		return cpuset;
-	}
-
-	@Override
-	public int getCpuShares() {
-		return cpuShares;
-	}
-
-	@Override
-	@JsonIgnore
-	public Device[] getDevices() {
-		return hostConfig.getDevices();
-	}
-
-	@Override
-	@JsonIgnore
-	public String[] getDns() {
-		return hostConfig.getDns();
-	}
-
-	@Override
-	@JsonIgnore
-	public String[] getDnsSearch() {
-		return hostConfig.getDnsSearch();
-	}
-
-	@Override
-	public String[] getEntrypoint() {
-		return entrypoint;
-	}
-
-	@Override
-	public String[] getEnv() {
-		return env;
-	}
-
-	@Override
-	@JsonIgnore
-	public ExposedPort[] getExposedPorts() {
-		return exposedPorts.getExposedPorts();
-	}
-
-	@Override
-	@JsonIgnore
-	public String[] getExtraHosts() {
-		return hostConfig.getExtraHosts();
-	}
-
-	@Override
-	public HostConfig getHostConfig() {
-		return hostConfig;
-	}
-
-	@Override
-	public String getHostName() {
-		return hostName;
-	}
-
-	@Override
-	public String getDomainName() {
+
+    @JsonProperty("User")
+    private String user = "";
+
+    @JsonProperty("Memory")
+    private long memoryLimit = 0;
+
+    @JsonProperty("MemorySwap")
+    private long memorySwap = 0;
+
+    @JsonProperty("CpuShares")
+    private int cpuShares = 0;
+
+    @JsonProperty("Cpuset")
+    private String cpuset;
+
+    @JsonProperty("AttachStdin")
+    private boolean attachStdin = false;
+
+    @JsonProperty("AttachStdout")
+    private boolean attachStdout = false;
+
+    @JsonProperty("AttachStderr")
+    private boolean attachStderr = false;
+
+    @JsonProperty("PortSpecs")
+    private String[] portSpecs;
+
+    @JsonProperty("Tty")
+    private boolean tty = false;
+
+    @JsonProperty("OpenStdin")
+    private boolean stdinOpen = false;
+
+    @JsonProperty("StdinOnce")
+    private boolean stdInOnce = false;
+
+    @JsonProperty("Env")
+    private String[] env;
+
+    @JsonProperty("Cmd")
+    private String[] cmd;
+
+    @JsonProperty("Entrypoint")
+    private String[] entrypoint;
+
+    @JsonProperty("Image")
+    private String image;
+
+    @JsonProperty("Volumes")
+    private Volumes volumes = new Volumes();
+
+    @JsonProperty("WorkingDir")
+    private String workingDir = "";
+
+    @JsonProperty("MacAddress")
+    private String macAddress;
+
+    @JsonProperty("NetworkDisabled")
+    private boolean networkDisabled = false;
+
+    @JsonProperty("ExposedPorts")
+    private ExposedPorts exposedPorts = new ExposedPorts();
+
+    @JsonProperty("HostConfig")
+    private HostConfig hostConfig = new HostConfig();
+
+    public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, String image) {
+        super(exec);
+        checkNotNull(image, "image was not specified");
+        withImage(image);
+    }
+
+    /**
+     * @throws NotFoundException
+     *             No such container
+     * @throws ConflictException
+     *             Named container already exists
+     */
+    @Override
+    public CreateContainerResponse exec() throws NotFoundException, ConflictException {
+        return super.exec();
+    }
+
+    @Override
+    @JsonIgnore
+    public Bind[] getBinds() {
+        return hostConfig.getBinds();
+    }
+
+    @Override
+    public Capability[] getCapAdd() {
+        return hostConfig.getCapAdd();
+    }
+
+    @Override
+    public Capability[] getCapDrop() {
+        return hostConfig.getCapDrop();
+    }
+
+    @Override
+    public String[] getCmd() {
+        return cmd;
+    }
+
+    @Override
+    public String getCpuset() {
+        return cpuset;
+    }
+
+    @Override
+    public int getCpuShares() {
+        return cpuShares;
+    }
+
+    @Override
+    @JsonIgnore
+    public Device[] getDevices() {
+        return hostConfig.getDevices();
+    }
+
+    @Override
+    @JsonIgnore
+    public String[] getDns() {
+        return hostConfig.getDns();
+    }
+
+    @Override
+    @JsonIgnore
+    public String[] getDnsSearch() {
+        return hostConfig.getDnsSearch();
+    }
+
+    @Override
+    public String[] getEntrypoint() {
+        return entrypoint;
+    }
+
+    @Override
+    public String[] getEnv() {
+        return env;
+    }
+
+    @Override
+    @JsonIgnore
+    public ExposedPort[] getExposedPorts() {
+        return exposedPorts.getExposedPorts();
+    }
+
+    @Override
+    @JsonIgnore
+    public String[] getExtraHosts() {
+        return hostConfig.getExtraHosts();
+    }
+
+    @Override
+    public HostConfig getHostConfig() {
+        return hostConfig;
+    }
+
+    @Override
+    public String getHostName() {
+        return hostName;
+    }
+
+    @Override
+    public String getDomainName() {
         return domainName;
     }
 
-	@Override
-	public String getImage() {
-		return image;
-	}
-
-	@Override
-	@JsonIgnore
-	public Link[] getLinks() {
-		return hostConfig.getLinks();
-	}
-
-	@Override
-	@JsonIgnore
-	public LxcConf[] getLxcConf() {
-		return hostConfig.getLxcConf();
-	}
-
-	public String getMacAddress() {
-		return macAddress;
-	}
-
-	@Override
-	public long getMemoryLimit() {
-		return memoryLimit;
-	}
-
-	@Override
-	public long getMemorySwap() {
-		return memorySwap;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	@JsonIgnore
-	public String getNetworkMode() {
-		return hostConfig.getNetworkMode();
-	}
-
-	@Override
-	@JsonIgnore
-	public Ports getPortBindings() {
-		return hostConfig.getPortBindings();
-	}
-
-	@Override
-	public String[] getPortSpecs() {
-		return portSpecs;
-	}
-
-	@Override
-	@JsonIgnore
-	public RestartPolicy getRestartPolicy() {
-		return hostConfig.getRestartPolicy();
-	}
-
-	@Override
-	public String getUser() {
-		return user;
-	}
-
-	@Override
-	@JsonIgnore
-	public Volume[] getVolumes() {
-		return volumes.getVolumes();
-	}
-
-	@Override
-	@JsonIgnore
-	public VolumesFrom[] getVolumesFrom() {
-		return hostConfig.getVolumesFrom();
-	}
-
-	@Override
-	public String getWorkingDir() {
-		return workingDir;
-	}
-
-	@Override
-	public boolean isAttachStderr() {
-		return attachStderr;
-	}
-
-	@Override
-	public boolean isAttachStdin() {
-		return attachStdin;
-	}
-
-	@Override
-	public boolean isAttachStdout() {
-		return attachStdout;
-	}
-
-	@Override
-	public boolean isNetworkDisabled() {
-		return networkDisabled;
-	}
-
-	@Override
-	@JsonIgnore
-	public Boolean isPrivileged() {
-		return hostConfig.isPrivileged();
-	}
-
-	@Override
-	@JsonIgnore
-	public Boolean isPublishAllPorts() {
-		return hostConfig.isPublishAllPorts();
-	}
-
-	@Override
-	public boolean isStdInOnce() {
-		return stdInOnce;
-	}
-
-	@Override
-	public boolean isStdinOpen() {
-		return stdinOpen;
-	}
-
-	@Override
-	public boolean isTty() {
-		return tty;
-	}
-
-	@Override
-	public String toString() {
-		return new ToStringBuilder(this).append("create container ")
-				.append(name != null ? "name=" + name + " " : "").append(this)
-				.toString();
-	}
-
-	@Override
-	public CreateContainerCmdImpl withAttachStderr(boolean attachStderr) {
-		this.attachStderr = attachStderr;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withAttachStdin(boolean attachStdin) {
-		this.attachStdin = attachStdin;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withAttachStdout(boolean attachStdout) {
-		this.attachStdout = attachStdout;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withBinds(Bind... binds) {
-		hostConfig.setBinds(binds);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withCapAdd(Capability... capAdd) {
-		hostConfig.setCapAdd(capAdd);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withCapDrop(Capability... capDrop) {
-		hostConfig.setCapDrop(capDrop);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withCmd(String... cmd) {
-		this.cmd = cmd;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withCpuset(String cpuset) {
-		this.cpuset = cpuset;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withCpuShares(int cpuShares) {
-		this.cpuShares = cpuShares;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withDevices(Device... devices) {
-		this.hostConfig.setDevices(devices);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withNetworkDisabled(boolean disableNetwork) {
-		this.networkDisabled = disableNetwork;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withDns(String... dns) {
-		this.hostConfig.setDns(dns);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withDnsSearch(String... dnsSearch) {
-		this.hostConfig.setDnsSearch(dnsSearch);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withEntrypoint(String... entrypoint) {
-		this.entrypoint = entrypoint;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withEnv(String... env) {
-		this.env = env;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withExposedPorts(ExposedPort... exposedPorts) {
-		this.exposedPorts = new ExposedPorts(exposedPorts);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withExtraHosts(String... extraHosts) {
-		this.hostConfig.setExtraHosts(extraHosts);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withHostConfig(HostConfig hostConfig) {
-		checkNotNull(hostConfig, "no host config was specified");
-		this.hostConfig = hostConfig;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withHostName(String hostName) {
-		this.hostName = hostName;
-		return this;
-	}
-
-	@Override
+    @Override
+    public String getImage() {
+        return image;
+    }
+
+    @Override
+    @JsonIgnore
+    public Link[] getLinks() {
+        return hostConfig.getLinks();
+    }
+
+    @Override
+    @JsonIgnore
+    public LxcConf[] getLxcConf() {
+        return hostConfig.getLxcConf();
+    }
+
+    public String getMacAddress() {
+        return macAddress;
+    }
+
+    @Override
+    public long getMemoryLimit() {
+        return memoryLimit;
+    }
+
+    @Override
+    public long getMemorySwap() {
+        return memorySwap;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    @JsonIgnore
+    public String getNetworkMode() {
+        return hostConfig.getNetworkMode();
+    }
+
+    @Override
+    @JsonIgnore
+    public Ports getPortBindings() {
+        return hostConfig.getPortBindings();
+    }
+
+    @Override
+    public String[] getPortSpecs() {
+        return portSpecs;
+    }
+
+    @Override
+    @JsonIgnore
+    public RestartPolicy getRestartPolicy() {
+        return hostConfig.getRestartPolicy();
+    }
+
+    @Override
+    public String getUser() {
+        return user;
+    }
+
+    @Override
+    @JsonIgnore
+    public Volume[] getVolumes() {
+        return volumes.getVolumes();
+    }
+
+    @Override
+    @JsonIgnore
+    public VolumesFrom[] getVolumesFrom() {
+        return hostConfig.getVolumesFrom();
+    }
+
+    @Override
+    public String getWorkingDir() {
+        return workingDir;
+    }
+
+    @Override
+    public boolean isAttachStderr() {
+        return attachStderr;
+    }
+
+    @Override
+    public boolean isAttachStdin() {
+        return attachStdin;
+    }
+
+    @Override
+    public boolean isAttachStdout() {
+        return attachStdout;
+    }
+
+    @Override
+    public boolean isNetworkDisabled() {
+        return networkDisabled;
+    }
+
+    @Override
+    @JsonIgnore
+    public Boolean isPrivileged() {
+        return hostConfig.isPrivileged();
+    }
+
+    @Override
+    @JsonIgnore
+    public Boolean isPublishAllPorts() {
+        return hostConfig.isPublishAllPorts();
+    }
+
+    @Override
+    public boolean isStdInOnce() {
+        return stdInOnce;
+    }
+
+    @Override
+    public boolean isStdinOpen() {
+        return stdinOpen;
+    }
+
+    @Override
+    public boolean isTty() {
+        return tty;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this).append("create container ").append(name != null ? "name=" + name + " " : "")
+                .append(this).toString();
+    }
+
+    @Override
+    public CreateContainerCmdImpl withAttachStderr(boolean attachStderr) {
+        this.attachStderr = attachStderr;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withAttachStdin(boolean attachStdin) {
+        this.attachStdin = attachStdin;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withAttachStdout(boolean attachStdout) {
+        this.attachStdout = attachStdout;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withBinds(Bind... binds) {
+        hostConfig.setBinds(binds);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withCapAdd(Capability... capAdd) {
+        hostConfig.setCapAdd(capAdd);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withCapDrop(Capability... capDrop) {
+        hostConfig.setCapDrop(capDrop);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withCmd(String... cmd) {
+        this.cmd = cmd;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withCpuset(String cpuset) {
+        this.cpuset = cpuset;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withCpuShares(int cpuShares) {
+        this.cpuShares = cpuShares;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withDevices(Device... devices) {
+        this.hostConfig.setDevices(devices);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withNetworkDisabled(boolean disableNetwork) {
+        this.networkDisabled = disableNetwork;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withDns(String... dns) {
+        this.hostConfig.setDns(dns);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withDnsSearch(String... dnsSearch) {
+        this.hostConfig.setDnsSearch(dnsSearch);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withEntrypoint(String... entrypoint) {
+        this.entrypoint = entrypoint;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withEnv(String... env) {
+        this.env = env;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withExposedPorts(ExposedPort... exposedPorts) {
+        this.exposedPorts = new ExposedPorts(exposedPorts);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withExtraHosts(String... extraHosts) {
+        this.hostConfig.setExtraHosts(extraHosts);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withHostConfig(HostConfig hostConfig) {
+        checkNotNull(hostConfig, "no host config was specified");
+        this.hostConfig = hostConfig;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withHostName(String hostName) {
+        this.hostName = hostName;
+        return this;
+    }
+
+    @Override
     public CreateContainerCmdImpl withDomainName(String domainName) {
         this.domainName = domainName;
         return this;
     }
 
-	@Override
-	public CreateContainerCmdImpl withImage(String image) {
-		this.image = image;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withLinks(Link... links) {
-		checkNotNull(links, "links was not specified");
-		this.hostConfig.setLinks(links);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withLxcConf(LxcConf... lxcConf) {
-		checkNotNull(lxcConf, "lxcConf was not specified");
-		this.hostConfig.setLxcConf(lxcConf);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withMacAddress(String macAddress) {
-		this.macAddress = macAddress;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withMemoryLimit(long memoryLimit) {
-		this.memoryLimit = memoryLimit;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withMemorySwap(long memorySwap) {
-		this.memorySwap = memorySwap;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withName(String name) {
-		checkNotNull(name, "name was not specified");
-		this.name = name;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withNetworkMode(String networkMode) {
-		checkNotNull(networkMode, "networkMode was not specified");
-		this.hostConfig.setNetworkMode(networkMode);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withPortBindings(PortBinding... portBindings) {
-		checkNotNull(portBindings, "portBindings was not specified");
-		this.hostConfig.setPortBindings(new Ports(portBindings));
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withPortBindings(Ports portBindings) {
-		checkNotNull(portBindings, "portBindings was not specified");
-		this.hostConfig.setPortBindings(portBindings);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withPortSpecs(String... portSpecs) {
-		this.portSpecs = portSpecs;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withPrivileged(boolean privileged) {
-		this.hostConfig.setPrivileged(privileged);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withPublishAllPorts(boolean publishAllPorts) {
-		this.hostConfig.setPublishAllPorts(publishAllPorts);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) {
-		this.hostConfig.setRestartPolicy(restartPolicy);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withStdInOnce(boolean stdInOnce) {
-		this.stdInOnce = stdInOnce;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withStdinOpen(boolean stdinOpen) {
-		this.stdinOpen = stdinOpen;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withTty(boolean tty) {
-		this.tty = tty;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withUser(String user) {
-		this.user = user;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withVolumes(Volume... volumes) {
-		this.volumes = new Volumes(volumes);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withVolumesFrom(VolumesFrom... volumesFrom) {
-		this.hostConfig.setVolumesFrom(volumesFrom);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withWorkingDir(String workingDir) {
-		this.workingDir = workingDir;
-		return this;
-	}
+    @Override
+    public CreateContainerCmdImpl withImage(String image) {
+        this.image = image;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withLinks(Link... links) {
+        checkNotNull(links, "links was not specified");
+        this.hostConfig.setLinks(links);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withLxcConf(LxcConf... lxcConf) {
+        checkNotNull(lxcConf, "lxcConf was not specified");
+        this.hostConfig.setLxcConf(lxcConf);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withMacAddress(String macAddress) {
+        this.macAddress = macAddress;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withMemoryLimit(long memoryLimit) {
+        this.memoryLimit = memoryLimit;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withMemorySwap(long memorySwap) {
+        this.memorySwap = memorySwap;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withName(String name) {
+        checkNotNull(name, "name was not specified");
+        this.name = name;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withNetworkMode(String networkMode) {
+        checkNotNull(networkMode, "networkMode was not specified");
+        this.hostConfig.setNetworkMode(networkMode);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withPortBindings(PortBinding... portBindings) {
+        checkNotNull(portBindings, "portBindings was not specified");
+        this.hostConfig.setPortBindings(new Ports(portBindings));
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withPortBindings(Ports portBindings) {
+        checkNotNull(portBindings, "portBindings was not specified");
+        this.hostConfig.setPortBindings(portBindings);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withPortSpecs(String... portSpecs) {
+        this.portSpecs = portSpecs;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withPrivileged(boolean privileged) {
+        this.hostConfig.setPrivileged(privileged);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withPublishAllPorts(boolean publishAllPorts) {
+        this.hostConfig.setPublishAllPorts(publishAllPorts);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) {
+        this.hostConfig.setRestartPolicy(restartPolicy);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withStdInOnce(boolean stdInOnce) {
+        this.stdInOnce = stdInOnce;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withStdinOpen(boolean stdinOpen) {
+        this.stdinOpen = stdinOpen;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withTty(boolean tty) {
+        this.tty = tty;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withUser(String user) {
+        this.user = user;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withVolumes(Volume... volumes) {
+        this.volumes = new Volumes(volumes);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withVolumesFrom(VolumesFrom... volumesFrom) {
+        this.hostConfig.setVolumesFrom(volumesFrom);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withWorkingDir(String workingDir) {
+        this.workingDir = workingDir;
+        return this;
+    }
 
 }

From 36a17bfdbfc9bcfb148253fb9469365fd1ecc2c2 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 16 Jun 2015 21:40:56 +0200
Subject: [PATCH 0101/1272] code formatting

---
 .../api/command/CreateContainerCmd.java       |  283 +++--
 .../core/command/CreateContainerCmdImpl.java  | 1090 +++++++++--------
 2 files changed, 693 insertions(+), 680 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index fa8f40f33..be6e83adf 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -16,234 +16,227 @@
 import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.core.command.CreateContainerCmdImpl;
 
-public interface CreateContainerCmd extends DockerCmd<CreateContainerResponse>{
+public interface CreateContainerCmd extends DockerCmd<CreateContainerResponse> {
 
-	public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateContainerResponse> {
-	}
+    public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateContainerResponse> {
+    }
 
-	/**
-	 * @throws NotFoundException No such container
-	 * @throws ConflictException Named container already exists
-	 */
+    /**
+     * @throws NotFoundException
+     *             No such container
+     * @throws ConflictException
+     *             Named container already exists
+     */
     @Override
-	public CreateContainerResponse exec() throws NotFoundException,
-			ConflictException;
+    public CreateContainerResponse exec() throws NotFoundException, ConflictException;
 
-	public Bind[] getBinds();
+    public Bind[] getBinds();
 
-	public Capability[] getCapAdd();
+    public Capability[] getCapAdd();
 
-	public Capability[] getCapDrop();
+    public Capability[] getCapDrop();
 
-	public String[] getCmd();
+    public String[] getCmd();
 
-	public String getCpuset();
+    public String getCpuset();
 
-	public int getCpuShares();
+    public int getCpuShares();
 
-	public Device[] getDevices();
+    public Device[] getDevices();
 
-	public String[] getDns();
+    public String[] getDns();
 
-	public String[] getDnsSearch();
+    public String[] getDnsSearch();
 
-	public String[] getEntrypoint();
+    public String[] getEntrypoint();
 
-	public String[] getEnv();
+    public String[] getEnv();
 
-	public ExposedPort[] getExposedPorts();
+    public ExposedPort[] getExposedPorts();
 
-	public String[] getExtraHosts();
+    public String[] getExtraHosts();
 
-	public HostConfig getHostConfig();
+    public HostConfig getHostConfig();
 
-	public String getHostName();
+    public String getHostName();
 
-	public String getDomainName();
+    public String getDomainName();
 
-	public String getImage();
+    public String getImage();
 
-	public Link[] getLinks();
+    public Link[] getLinks();
 
-	public LxcConf[] getLxcConf();
+    public LxcConf[] getLxcConf();
 
-	public String getMacAddress();
+    public String getMacAddress();
 
-	public long getMemoryLimit();
+    public long getMemoryLimit();
 
-	public long getMemorySwap();
+    public long getMemorySwap();
 
-	public String getName();
+    public String getName();
 
-	public String getNetworkMode();
+    public String getNetworkMode();
 
-	public Ports getPortBindings();
+    public Ports getPortBindings();
 
-	public String[] getPortSpecs();
+    public String[] getPortSpecs();
 
-	public RestartPolicy getRestartPolicy();
+    public RestartPolicy getRestartPolicy();
 
-	public String getUser();
+    public String getUser();
 
-	public Volume[] getVolumes();
+    public Volume[] getVolumes();
 
-	public VolumesFrom[] getVolumesFrom();
+    public VolumesFrom[] getVolumesFrom();
 
-	public String getWorkingDir();
+    public String getWorkingDir();
 
-	public boolean isAttachStderr();
+    public boolean isAttachStderr();
 
-	public boolean isAttachStdin();
+    public boolean isAttachStdin();
 
-	public boolean isAttachStdout();
+    public boolean isAttachStdout();
 
-	public boolean isNetworkDisabled();
+    public boolean isNetworkDisabled();
 
-	public Boolean isPrivileged();
+    public Boolean isPrivileged();
 
-	public Boolean isPublishAllPorts();
+    public Boolean isPublishAllPorts();
 
-	public boolean isStdInOnce();
+    public boolean isStdInOnce();
 
-	public boolean isStdinOpen();
+    public boolean isStdinOpen();
 
-	public boolean isTty();
+    public boolean isTty();
 
-	public CreateContainerCmd withAttachStderr(boolean attachStderr);
+    public CreateContainerCmd withAttachStderr(boolean attachStderr);
 
-	public CreateContainerCmd withAttachStdin(boolean attachStdin);
+    public CreateContainerCmd withAttachStdin(boolean attachStdin);
 
-	public CreateContainerCmd withAttachStdout(boolean attachStdout);
+    public CreateContainerCmd withAttachStdout(boolean attachStdout);
 
-	public CreateContainerCmd withBinds(Bind... binds);
+    public CreateContainerCmd withBinds(Bind... binds);
 
-	/**
-	 * Add linux <a
-	 * href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel
-	 * capability</a> to the container. For example: adding {@link Capability#MKNOD}
-	 * allows the container to create special files using the 'mknod' command.
-	 */
-	public CreateContainerCmd withCapAdd(Capability... capAdd);
+    /**
+     * Add linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> to the
+     * container. For example: adding {@link Capability#MKNOD} allows the container to create special files using the
+     * 'mknod' command.
+     */
+    public CreateContainerCmd withCapAdd(Capability... capAdd);
 
-	/**
-	 * Drop linux <a
-	 * href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel
-	 * capability</a> from the container. For example: dropping {@link Capability#CHOWN}
-	 * prevents the container from changing the owner of any files.
-	 */
-	public CreateContainerCmd withCapDrop(Capability... capDrop);
+    /**
+     * Drop linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> from the
+     * container. For example: dropping {@link Capability#CHOWN} prevents the container from changing the owner of any
+     * files.
+     */
+    public CreateContainerCmd withCapDrop(Capability... capDrop);
 
-	public CreateContainerCmd withCmd(String... cmd);
+    public CreateContainerCmd withCmd(String... cmd);
 
-	public CreateContainerCmd withCpuset(String cpuset);
+    public CreateContainerCmd withCpuset(String cpuset);
 
-	public CreateContainerCmd withCpuShares(int cpuShares);
+    public CreateContainerCmd withCpuShares(int cpuShares);
 
-	/**
-	 * Add host devices to the container
-	 */
-	public CreateContainerCmd withDevices(Device... devices);
+    /**
+     * Add host devices to the container
+     */
+    public CreateContainerCmd withDevices(Device... devices);
 
-	public CreateContainerCmd withNetworkDisabled(boolean disableNetwork);
+    public CreateContainerCmd withNetworkDisabled(boolean disableNetwork);
 
-	/**
-	 * Set custom DNS servers
-	 */
-	public CreateContainerCmd withDns(String... dns);
+    /**
+     * Set custom DNS servers
+     */
+    public CreateContainerCmd withDns(String... dns);
 
-	/**
-	 * Set custom DNS search domains
-	 */
-	public CreateContainerCmd withDnsSearch(String... dnsSearch);
+    /**
+     * Set custom DNS search domains
+     */
+    public CreateContainerCmd withDnsSearch(String... dnsSearch);
 
-	public CreateContainerCmd withEntrypoint(String... entrypoint);
+    public CreateContainerCmd withEntrypoint(String... entrypoint);
 
-	public CreateContainerCmd withEnv(String... env);
+    public CreateContainerCmd withEnv(String... env);
 
-	public CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts);
+    public CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts);
 
-	/**
-	 * Add hostnames to /etc/hosts in the container
-	 */
-	public CreateContainerCmd withExtraHosts(String... extraHosts);
+    /**
+     * Add hostnames to /etc/hosts in the container
+     */
+    public CreateContainerCmd withExtraHosts(String... extraHosts);
 
-	public CreateContainerCmd withHostConfig(HostConfig hostConfig);
+    public CreateContainerCmd withHostConfig(HostConfig hostConfig);
 
-	public CreateContainerCmd withHostName(String hostName);
+    public CreateContainerCmd withHostName(String hostName);
 
-	public CreateContainerCmd withDomainName(String domainName);
+    public CreateContainerCmd withDomainName(String domainName);
 
-	public CreateContainerCmd withImage(String image);
+    public CreateContainerCmd withImage(String image);
 
-	/**
-	 * Add link to another container.
-	 */
-	public CreateContainerCmd withLinks(Link... links);
+    /**
+     * Add link to another container.
+     */
+    public CreateContainerCmd withLinks(Link... links);
 
-	public CreateContainerCmd withLxcConf(LxcConf... lxcConf);
+    public CreateContainerCmd withLxcConf(LxcConf... lxcConf);
 
-	public CreateContainerCmd withMemoryLimit(long memoryLimit);
+    public CreateContainerCmd withMemoryLimit(long memoryLimit);
 
-	public CreateContainerCmd withMemorySwap(long memorySwap);
+    public CreateContainerCmd withMemorySwap(long memorySwap);
 
-	public CreateContainerCmd withName(String name);
+    public CreateContainerCmd withName(String name);
 
+    /**
+     * Set the Network mode for the container
+     * <ul>
+     * <li>'bridge': creates a new network stack for the container on the docker bridge</li>
+     * <li>'none': no networking for this container</li>
+     * <li>'container:<name|id>': reuses another container network stack</li>
+     * <li>'host': use the host network stack inside the container. Note: the host mode gives the container full access
+     * to local system services such as D-bus and is therefore considered insecure.</li>
+     * </ul>
+     */
+    public CreateContainerCmd withNetworkMode(String networkMode);
 
-	/**
-	 * Set the Network mode for the container
-	 * <ul>
-	 * <li>'bridge': creates a new network stack for the container on the docker
-	 * bridge</li>
-	 * <li>'none': no networking for this container</li>
-	 * <li>'container:<name|id>': reuses another container network stack</li>
-	 * <li>'host': use the host network stack inside the container. Note: the
-	 * host mode gives the container full access to local system services such
-	 * as D-bus and is therefore considered insecure.</li>
-	 * </ul>
-	 */
-	public CreateContainerCmd withNetworkMode(String networkMode);
+    /**
+     * Add one or more {@link PortBinding}s. This corresponds to the <code>--publish</code> (<code>-p</code>) option of
+     * the <code>docker run</code> CLI command.
+     */
+    public CreateContainerCmd withPortBindings(PortBinding... portBindings);
 
-	/**
-	 * Add one or more {@link PortBinding}s.
-	 * This corresponds to the <code>--publish</code> (<code>-p</code>)
-	 * option of the <code>docker run</code> CLI command.
-	 */
-	public CreateContainerCmd withPortBindings(PortBinding... portBindings);
+    /**
+     * Add the port bindings that are contained in the given {@link Ports} object.
+     *
+     * @see #withPortBindings(PortBinding...)
+     */
+    public CreateContainerCmd withPortBindings(Ports portBindings);
 
-	/**
-	 * Add the port bindings that are contained in the given {@link Ports}
-	 * object.
-	 *
-	 * @see #withPortBindings(PortBinding...)
-	 */
-	public CreateContainerCmd withPortBindings(Ports portBindings);
+    public CreateContainerCmd withPortSpecs(String... portSpecs);
 
-	public CreateContainerCmd withPortSpecs(String... portSpecs);
+    public CreateContainerCmd withPrivileged(boolean privileged);
 
-	public CreateContainerCmd withPrivileged(boolean privileged);
+    public CreateContainerCmd withPublishAllPorts(boolean publishAllPorts);
 
-	public CreateContainerCmd withPublishAllPorts(boolean publishAllPorts);
+    /**
+     * Set custom {@link RestartPolicy} for the container. Defaults to {@link RestartPolicy#noRestart()}
+     */
+    public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy);
 
-	/**
-	 * Set custom {@link RestartPolicy} for the container. Defaults to
-	 * {@link RestartPolicy#noRestart()}
-	 */
-	public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy);
+    public CreateContainerCmd withStdInOnce(boolean stdInOnce);
 
-	public CreateContainerCmd withStdInOnce(boolean stdInOnce);
+    public CreateContainerCmd withStdinOpen(boolean stdinOpen);
 
-	public CreateContainerCmd withStdinOpen(boolean stdinOpen);
+    public CreateContainerCmd withTty(boolean tty);
 
-	public CreateContainerCmd withTty(boolean tty);
+    public CreateContainerCmd withUser(String user);
 
-	public CreateContainerCmd withUser(String user);
+    public CreateContainerCmd withVolumes(Volume... volumes);
 
-	public CreateContainerCmd withVolumes(Volume... volumes);
+    public CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom);
 
-	public CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom);
+    public CreateContainerCmd withWorkingDir(String workingDir);
 
-	public CreateContainerCmd withWorkingDir(String workingDir);
-
-	public CreateContainerCmd withMacAddress(String macAddress);
+    public CreateContainerCmd withMacAddress(String macAddress);
 
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 4b3f064e2..cc082b61f 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -30,551 +30,571 @@
  * Creates a new container.
  *
  */
-public class CreateContainerCmdImpl extends
-		AbstrDockerCmd<CreateContainerCmd, CreateContainerResponse> implements
-		CreateContainerCmd {
+public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, CreateContainerResponse> implements
+        CreateContainerCmd {
 
-	private String name;
+    private String name;
 
-	@JsonProperty("Hostname")
-	private String hostName = "";
-	@JsonProperty("Domainname")
+    @JsonProperty("Hostname")
+    private String hostName = "";
+
+    @JsonProperty("Domainname")
     private String domainName = "";
-	@JsonProperty("User")
-	private String user = "";
-	@JsonProperty("Memory")
-	private long memoryLimit = 0;
-	@JsonProperty("MemorySwap")
-	private long memorySwap = 0;
-	@JsonProperty("CpuShares")
-	private int cpuShares = 0;
-	@JsonProperty("Cpuset")
-	private String cpuset;
-	@JsonProperty("AttachStdin")
-	private boolean attachStdin = false;
-	@JsonProperty("AttachStdout")
-	private boolean attachStdout = false;
-	@JsonProperty("AttachStderr")
-	private boolean attachStderr = false;
-	@JsonProperty("PortSpecs")
-	private String[] portSpecs;
-	@JsonProperty("Tty")
-	private boolean tty = false;
-	@JsonProperty("OpenStdin")
-	private boolean stdinOpen = false;
-	@JsonProperty("StdinOnce")
-	private boolean stdInOnce = false;
-	@JsonProperty("Env")
-	private String[] env;
-	@JsonProperty("Cmd")
-	private String[] cmd;
-	@JsonProperty("Entrypoint")
-	private String[] entrypoint;
-	@JsonProperty("Image")
-	private String image;
-	@JsonProperty("Volumes")
-	private Volumes volumes = new Volumes();
-	@JsonProperty("WorkingDir")
-	private String workingDir = "";
-	@JsonProperty("MacAddress")
-	private String macAddress;
-	@JsonProperty("NetworkDisabled")
-	private boolean networkDisabled = false;
-	@JsonProperty("ExposedPorts")
-	private ExposedPorts exposedPorts = new ExposedPorts();
-	@JsonProperty("HostConfig")
-	private HostConfig hostConfig = new HostConfig();
-
-	public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, String image) {
-		super(exec);
-		checkNotNull(image, "image was not specified");
-		withImage(image);
-	}
-
-	/**
-	 * @throws NotFoundException
-	 *             No such container
-	 * @throws ConflictException
-	 *             Named container already exists
-	 */
-	@Override
-	public CreateContainerResponse exec() throws NotFoundException,
-			ConflictException {
-		return super.exec();
-	}
-
-	@Override
-	@JsonIgnore
-	public Bind[] getBinds() {
-		return hostConfig.getBinds();
-	}
-
-	@Override
-	public Capability[] getCapAdd() {
-		return hostConfig.getCapAdd();
-	}
-
-	@Override
-	public Capability[] getCapDrop() {
-		return hostConfig.getCapDrop();
-	}
-
-	@Override
-	public String[] getCmd() {
-		return cmd;
-	}
-
-	@Override
-	public String getCpuset() {
-		return cpuset;
-	}
-
-	@Override
-	public int getCpuShares() {
-		return cpuShares;
-	}
-
-	@Override
-	@JsonIgnore
-	public Device[] getDevices() {
-		return hostConfig.getDevices();
-	}
-
-	@Override
-	@JsonIgnore
-	public String[] getDns() {
-		return hostConfig.getDns();
-	}
-
-	@Override
-	@JsonIgnore
-	public String[] getDnsSearch() {
-		return hostConfig.getDnsSearch();
-	}
-
-	@Override
-	public String[] getEntrypoint() {
-		return entrypoint;
-	}
-
-	@Override
-	public String[] getEnv() {
-		return env;
-	}
-
-	@Override
-	@JsonIgnore
-	public ExposedPort[] getExposedPorts() {
-		return exposedPorts.getExposedPorts();
-	}
-
-	@Override
-	@JsonIgnore
-	public String[] getExtraHosts() {
-		return hostConfig.getExtraHosts();
-	}
-
-	@Override
-	public HostConfig getHostConfig() {
-		return hostConfig;
-	}
-
-	@Override
-	public String getHostName() {
-		return hostName;
-	}
-
-	@Override
-	public String getDomainName() {
+
+    @JsonProperty("User")
+    private String user = "";
+
+    @JsonProperty("Memory")
+    private long memoryLimit = 0;
+
+    @JsonProperty("MemorySwap")
+    private long memorySwap = 0;
+
+    @JsonProperty("CpuShares")
+    private int cpuShares = 0;
+
+    @JsonProperty("Cpuset")
+    private String cpuset;
+
+    @JsonProperty("AttachStdin")
+    private boolean attachStdin = false;
+
+    @JsonProperty("AttachStdout")
+    private boolean attachStdout = false;
+
+    @JsonProperty("AttachStderr")
+    private boolean attachStderr = false;
+
+    @JsonProperty("PortSpecs")
+    private String[] portSpecs;
+
+    @JsonProperty("Tty")
+    private boolean tty = false;
+
+    @JsonProperty("OpenStdin")
+    private boolean stdinOpen = false;
+
+    @JsonProperty("StdinOnce")
+    private boolean stdInOnce = false;
+
+    @JsonProperty("Env")
+    private String[] env;
+
+    @JsonProperty("Cmd")
+    private String[] cmd;
+
+    @JsonProperty("Entrypoint")
+    private String[] entrypoint;
+
+    @JsonProperty("Image")
+    private String image;
+
+    @JsonProperty("Volumes")
+    private Volumes volumes = new Volumes();
+
+    @JsonProperty("WorkingDir")
+    private String workingDir = "";
+
+    @JsonProperty("MacAddress")
+    private String macAddress;
+
+    @JsonProperty("NetworkDisabled")
+    private boolean networkDisabled = false;
+
+    @JsonProperty("ExposedPorts")
+    private ExposedPorts exposedPorts = new ExposedPorts();
+
+    @JsonProperty("HostConfig")
+    private HostConfig hostConfig = new HostConfig();
+
+    public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, String image) {
+        super(exec);
+        checkNotNull(image, "image was not specified");
+        withImage(image);
+    }
+
+    /**
+     * @throws NotFoundException
+     *             No such container
+     * @throws ConflictException
+     *             Named container already exists
+     */
+    @Override
+    public CreateContainerResponse exec() throws NotFoundException, ConflictException {
+        return super.exec();
+    }
+
+    @Override
+    @JsonIgnore
+    public Bind[] getBinds() {
+        return hostConfig.getBinds();
+    }
+
+    @Override
+    public Capability[] getCapAdd() {
+        return hostConfig.getCapAdd();
+    }
+
+    @Override
+    public Capability[] getCapDrop() {
+        return hostConfig.getCapDrop();
+    }
+
+    @Override
+    public String[] getCmd() {
+        return cmd;
+    }
+
+    @Override
+    public String getCpuset() {
+        return cpuset;
+    }
+
+    @Override
+    public int getCpuShares() {
+        return cpuShares;
+    }
+
+    @Override
+    @JsonIgnore
+    public Device[] getDevices() {
+        return hostConfig.getDevices();
+    }
+
+    @Override
+    @JsonIgnore
+    public String[] getDns() {
+        return hostConfig.getDns();
+    }
+
+    @Override
+    @JsonIgnore
+    public String[] getDnsSearch() {
+        return hostConfig.getDnsSearch();
+    }
+
+    @Override
+    public String[] getEntrypoint() {
+        return entrypoint;
+    }
+
+    @Override
+    public String[] getEnv() {
+        return env;
+    }
+
+    @Override
+    @JsonIgnore
+    public ExposedPort[] getExposedPorts() {
+        return exposedPorts.getExposedPorts();
+    }
+
+    @Override
+    @JsonIgnore
+    public String[] getExtraHosts() {
+        return hostConfig.getExtraHosts();
+    }
+
+    @Override
+    public HostConfig getHostConfig() {
+        return hostConfig;
+    }
+
+    @Override
+    public String getHostName() {
+        return hostName;
+    }
+
+    @Override
+    public String getDomainName() {
         return domainName;
     }
 
-	@Override
-	public String getImage() {
-		return image;
-	}
-
-	@Override
-	@JsonIgnore
-	public Link[] getLinks() {
-		return hostConfig.getLinks();
-	}
-
-	@Override
-	@JsonIgnore
-	public LxcConf[] getLxcConf() {
-		return hostConfig.getLxcConf();
-	}
-
-	public String getMacAddress() {
-		return macAddress;
-	}
-
-	@Override
-	public long getMemoryLimit() {
-		return memoryLimit;
-	}
-
-	@Override
-	public long getMemorySwap() {
-		return memorySwap;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	@JsonIgnore
-	public String getNetworkMode() {
-		return hostConfig.getNetworkMode();
-	}
-
-	@Override
-	@JsonIgnore
-	public Ports getPortBindings() {
-		return hostConfig.getPortBindings();
-	}
-
-	@Override
-	public String[] getPortSpecs() {
-		return portSpecs;
-	}
-
-	@Override
-	@JsonIgnore
-	public RestartPolicy getRestartPolicy() {
-		return hostConfig.getRestartPolicy();
-	}
-
-	@Override
-	public String getUser() {
-		return user;
-	}
-
-	@Override
-	@JsonIgnore
-	public Volume[] getVolumes() {
-		return volumes.getVolumes();
-	}
-
-	@Override
-	@JsonIgnore
-	public VolumesFrom[] getVolumesFrom() {
-		return hostConfig.getVolumesFrom();
-	}
-
-	@Override
-	public String getWorkingDir() {
-		return workingDir;
-	}
-
-	@Override
-	public boolean isAttachStderr() {
-		return attachStderr;
-	}
-
-	@Override
-	public boolean isAttachStdin() {
-		return attachStdin;
-	}
-
-	@Override
-	public boolean isAttachStdout() {
-		return attachStdout;
-	}
-
-	@Override
-	public boolean isNetworkDisabled() {
-		return networkDisabled;
-	}
-
-	@Override
-	@JsonIgnore
-	public Boolean isPrivileged() {
-		return hostConfig.isPrivileged();
-	}
-
-	@Override
-	@JsonIgnore
-	public Boolean isPublishAllPorts() {
-		return hostConfig.isPublishAllPorts();
-	}
-
-	@Override
-	public boolean isStdInOnce() {
-		return stdInOnce;
-	}
-
-	@Override
-	public boolean isStdinOpen() {
-		return stdinOpen;
-	}
-
-	@Override
-	public boolean isTty() {
-		return tty;
-	}
-
-	@Override
-	public String toString() {
-		return new ToStringBuilder(this).append("create container ")
-				.append(name != null ? "name=" + name + " " : "").append(this)
-				.toString();
-	}
-
-	@Override
-	public CreateContainerCmdImpl withAttachStderr(boolean attachStderr) {
-		this.attachStderr = attachStderr;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withAttachStdin(boolean attachStdin) {
-		this.attachStdin = attachStdin;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withAttachStdout(boolean attachStdout) {
-		this.attachStdout = attachStdout;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withBinds(Bind... binds) {
-		hostConfig.setBinds(binds);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withCapAdd(Capability... capAdd) {
-		hostConfig.setCapAdd(capAdd);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withCapDrop(Capability... capDrop) {
-		hostConfig.setCapDrop(capDrop);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withCmd(String... cmd) {
-		this.cmd = cmd;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withCpuset(String cpuset) {
-		this.cpuset = cpuset;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withCpuShares(int cpuShares) {
-		this.cpuShares = cpuShares;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withDevices(Device... devices) {
-		this.hostConfig.setDevices(devices);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withNetworkDisabled(boolean disableNetwork) {
-		this.networkDisabled = disableNetwork;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withDns(String... dns) {
-		this.hostConfig.setDns(dns);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withDnsSearch(String... dnsSearch) {
-		this.hostConfig.setDnsSearch(dnsSearch);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withEntrypoint(String... entrypoint) {
-		this.entrypoint = entrypoint;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withEnv(String... env) {
-		this.env = env;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withExposedPorts(ExposedPort... exposedPorts) {
-		this.exposedPorts = new ExposedPorts(exposedPorts);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withExtraHosts(String... extraHosts) {
-		this.hostConfig.setExtraHosts(extraHosts);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withHostConfig(HostConfig hostConfig) {
-		checkNotNull(hostConfig, "no host config was specified");
-		this.hostConfig = hostConfig;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withHostName(String hostName) {
-		this.hostName = hostName;
-		return this;
-	}
-
-	@Override
+    @Override
+    public String getImage() {
+        return image;
+    }
+
+    @Override
+    @JsonIgnore
+    public Link[] getLinks() {
+        return hostConfig.getLinks();
+    }
+
+    @Override
+    @JsonIgnore
+    public LxcConf[] getLxcConf() {
+        return hostConfig.getLxcConf();
+    }
+
+    public String getMacAddress() {
+        return macAddress;
+    }
+
+    @Override
+    public long getMemoryLimit() {
+        return memoryLimit;
+    }
+
+    @Override
+    public long getMemorySwap() {
+        return memorySwap;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    @JsonIgnore
+    public String getNetworkMode() {
+        return hostConfig.getNetworkMode();
+    }
+
+    @Override
+    @JsonIgnore
+    public Ports getPortBindings() {
+        return hostConfig.getPortBindings();
+    }
+
+    @Override
+    public String[] getPortSpecs() {
+        return portSpecs;
+    }
+
+    @Override
+    @JsonIgnore
+    public RestartPolicy getRestartPolicy() {
+        return hostConfig.getRestartPolicy();
+    }
+
+    @Override
+    public String getUser() {
+        return user;
+    }
+
+    @Override
+    @JsonIgnore
+    public Volume[] getVolumes() {
+        return volumes.getVolumes();
+    }
+
+    @Override
+    @JsonIgnore
+    public VolumesFrom[] getVolumesFrom() {
+        return hostConfig.getVolumesFrom();
+    }
+
+    @Override
+    public String getWorkingDir() {
+        return workingDir;
+    }
+
+    @Override
+    public boolean isAttachStderr() {
+        return attachStderr;
+    }
+
+    @Override
+    public boolean isAttachStdin() {
+        return attachStdin;
+    }
+
+    @Override
+    public boolean isAttachStdout() {
+        return attachStdout;
+    }
+
+    @Override
+    public boolean isNetworkDisabled() {
+        return networkDisabled;
+    }
+
+    @Override
+    @JsonIgnore
+    public Boolean isPrivileged() {
+        return hostConfig.isPrivileged();
+    }
+
+    @Override
+    @JsonIgnore
+    public Boolean isPublishAllPorts() {
+        return hostConfig.isPublishAllPorts();
+    }
+
+    @Override
+    public boolean isStdInOnce() {
+        return stdInOnce;
+    }
+
+    @Override
+    public boolean isStdinOpen() {
+        return stdinOpen;
+    }
+
+    @Override
+    public boolean isTty() {
+        return tty;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this).append("create container ").append(name != null ? "name=" + name + " " : "")
+                .append(this).toString();
+    }
+
+    @Override
+    public CreateContainerCmdImpl withAttachStderr(boolean attachStderr) {
+        this.attachStderr = attachStderr;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withAttachStdin(boolean attachStdin) {
+        this.attachStdin = attachStdin;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withAttachStdout(boolean attachStdout) {
+        this.attachStdout = attachStdout;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withBinds(Bind... binds) {
+        hostConfig.setBinds(binds);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withCapAdd(Capability... capAdd) {
+        hostConfig.setCapAdd(capAdd);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withCapDrop(Capability... capDrop) {
+        hostConfig.setCapDrop(capDrop);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withCmd(String... cmd) {
+        this.cmd = cmd;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withCpuset(String cpuset) {
+        this.cpuset = cpuset;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withCpuShares(int cpuShares) {
+        this.cpuShares = cpuShares;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withDevices(Device... devices) {
+        this.hostConfig.setDevices(devices);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withNetworkDisabled(boolean disableNetwork) {
+        this.networkDisabled = disableNetwork;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withDns(String... dns) {
+        this.hostConfig.setDns(dns);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withDnsSearch(String... dnsSearch) {
+        this.hostConfig.setDnsSearch(dnsSearch);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withEntrypoint(String... entrypoint) {
+        this.entrypoint = entrypoint;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withEnv(String... env) {
+        this.env = env;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withExposedPorts(ExposedPort... exposedPorts) {
+        this.exposedPorts = new ExposedPorts(exposedPorts);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withExtraHosts(String... extraHosts) {
+        this.hostConfig.setExtraHosts(extraHosts);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withHostConfig(HostConfig hostConfig) {
+        checkNotNull(hostConfig, "no host config was specified");
+        this.hostConfig = hostConfig;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withHostName(String hostName) {
+        this.hostName = hostName;
+        return this;
+    }
+
+    @Override
     public CreateContainerCmdImpl withDomainName(String domainName) {
         this.domainName = domainName;
         return this;
     }
 
-	@Override
-	public CreateContainerCmdImpl withImage(String image) {
-		this.image = image;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withLinks(Link... links) {
-		checkNotNull(links, "links was not specified");
-		this.hostConfig.setLinks(links);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withLxcConf(LxcConf... lxcConf) {
-		checkNotNull(lxcConf, "lxcConf was not specified");
-		this.hostConfig.setLxcConf(lxcConf);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withMacAddress(String macAddress) {
-		this.macAddress = macAddress;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withMemoryLimit(long memoryLimit) {
-		this.memoryLimit = memoryLimit;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withMemorySwap(long memorySwap) {
-		this.memorySwap = memorySwap;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withName(String name) {
-		checkNotNull(name, "name was not specified");
-		this.name = name;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withNetworkMode(String networkMode) {
-		checkNotNull(networkMode, "networkMode was not specified");
-		this.hostConfig.setNetworkMode(networkMode);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withPortBindings(PortBinding... portBindings) {
-		checkNotNull(portBindings, "portBindings was not specified");
-		this.hostConfig.setPortBindings(new Ports(portBindings));
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withPortBindings(Ports portBindings) {
-		checkNotNull(portBindings, "portBindings was not specified");
-		this.hostConfig.setPortBindings(portBindings);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withPortSpecs(String... portSpecs) {
-		this.portSpecs = portSpecs;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withPrivileged(boolean privileged) {
-		this.hostConfig.setPrivileged(privileged);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withPublishAllPorts(boolean publishAllPorts) {
-		this.hostConfig.setPublishAllPorts(publishAllPorts);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) {
-		this.hostConfig.setRestartPolicy(restartPolicy);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withStdInOnce(boolean stdInOnce) {
-		this.stdInOnce = stdInOnce;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withStdinOpen(boolean stdinOpen) {
-		this.stdinOpen = stdinOpen;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withTty(boolean tty) {
-		this.tty = tty;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withUser(String user) {
-		this.user = user;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withVolumes(Volume... volumes) {
-		this.volumes = new Volumes(volumes);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withVolumesFrom(VolumesFrom... volumesFrom) {
-		this.hostConfig.setVolumesFrom(volumesFrom);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withWorkingDir(String workingDir) {
-		this.workingDir = workingDir;
-		return this;
-	}
+    @Override
+    public CreateContainerCmdImpl withImage(String image) {
+        this.image = image;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withLinks(Link... links) {
+        checkNotNull(links, "links was not specified");
+        this.hostConfig.setLinks(links);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withLxcConf(LxcConf... lxcConf) {
+        checkNotNull(lxcConf, "lxcConf was not specified");
+        this.hostConfig.setLxcConf(lxcConf);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withMacAddress(String macAddress) {
+        this.macAddress = macAddress;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withMemoryLimit(long memoryLimit) {
+        this.memoryLimit = memoryLimit;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withMemorySwap(long memorySwap) {
+        this.memorySwap = memorySwap;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withName(String name) {
+        checkNotNull(name, "name was not specified");
+        this.name = name;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withNetworkMode(String networkMode) {
+        checkNotNull(networkMode, "networkMode was not specified");
+        this.hostConfig.setNetworkMode(networkMode);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withPortBindings(PortBinding... portBindings) {
+        checkNotNull(portBindings, "portBindings was not specified");
+        this.hostConfig.setPortBindings(new Ports(portBindings));
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withPortBindings(Ports portBindings) {
+        checkNotNull(portBindings, "portBindings was not specified");
+        this.hostConfig.setPortBindings(portBindings);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withPortSpecs(String... portSpecs) {
+        this.portSpecs = portSpecs;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withPrivileged(boolean privileged) {
+        this.hostConfig.setPrivileged(privileged);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withPublishAllPorts(boolean publishAllPorts) {
+        this.hostConfig.setPublishAllPorts(publishAllPorts);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) {
+        this.hostConfig.setRestartPolicy(restartPolicy);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withStdInOnce(boolean stdInOnce) {
+        this.stdInOnce = stdInOnce;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withStdinOpen(boolean stdinOpen) {
+        this.stdinOpen = stdinOpen;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withTty(boolean tty) {
+        this.tty = tty;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withUser(String user) {
+        this.user = user;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withVolumes(Volume... volumes) {
+        this.volumes = new Volumes(volumes);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withVolumesFrom(VolumesFrom... volumesFrom) {
+        this.hostConfig.setVolumesFrom(volumesFrom);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withWorkingDir(String workingDir) {
+        this.workingDir = workingDir;
+        return this;
+    }
 
 }

From d22fe533358dc74bfa2988f529a0c627130cfadd Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 16 Jun 2015 21:52:21 +0200
Subject: [PATCH 0102/1272] Fix imports

---
 .../com/github/dockerjava/api/command/CreateContainerCmd.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index be6e83adf..3b558b6d9 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -14,7 +14,6 @@
 import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
-import com.github.dockerjava.core.command.CreateContainerCmdImpl;
 
 public interface CreateContainerCmd extends DockerCmd<CreateContainerResponse> {
 

From 651446b7a6da43eb1a96699cab7868b25ddc1f48 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 16 Jun 2015 23:05:35 +0200
Subject: [PATCH 0103/1272] Removed deprecated start options

---
 .../api/command/StartContainerCmd.java        | 170 +---
 .../core/command/StartContainerCmdImpl.java   | 298 +------
 .../command/StartContainerCmdImplTest.java    | 830 ++++++++----------
 3 files changed, 401 insertions(+), 897 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
index aeddfd0bd..2195e1eca 100644
--- a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
@@ -2,170 +2,26 @@
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.NotModifiedException;
-import com.github.dockerjava.api.model.Bind;
-import com.github.dockerjava.api.model.Capability;
-import com.github.dockerjava.api.model.Device;
-import com.github.dockerjava.api.model.Link;
-import com.github.dockerjava.api.model.LxcConf;
-import com.github.dockerjava.api.model.PortBinding;
-import com.github.dockerjava.api.model.Ports;
-import com.github.dockerjava.api.model.RestartPolicy;
-import com.github.dockerjava.api.model.VolumesFrom;
 
 /**
  * Start a container.
- * 
- * TODO: Almost all methods are deprecated as they have corresponding siblings in {@link CreateContainerCmd} now.
+ *
  */
 public interface StartContainerCmd extends DockerCmd<Void> {
 
-	public static interface Exec extends DockerCmdExec<StartContainerCmd, Void> {
-	}
+    public static interface Exec extends DockerCmdExec<StartContainerCmd, Void> {
+    }
 
-	/**
-	 * @throws NotFoundException
-	 *             No such container
-	 * @throws NotModifiedException
-	 *             Container already started
-	 */
-	@Override
-	public Void exec() throws NotFoundException, NotModifiedException;
+    String getContainerId();
 
-	public Bind[] getBinds();
-
-	public Capability[] getCapAdd();
-
-	public Capability[] getCapDrop();
-
-	public String getContainerId();
-
-	public Device[] getDevices();
-
-	public String[] getDns();
-
-	public String[] getDnsSearch();
-
-	public String[] getExtraHosts();
-
-	public Link[] getLinks();
-
-	public LxcConf[] getLxcConf();
-
-	public String getNetworkMode();
-
-	public Ports getPortBindings();
-
-	public RestartPolicy getRestartPolicy();
-
-	public VolumesFrom[] getVolumesFrom();
-
-	public Boolean isPrivileged();
-
-	public Boolean isPublishAllPorts();
-
-	@Deprecated
-	public StartContainerCmd withBinds(Bind... binds);
-
-	/**
-	 * Add linux <a
-	 * href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel
-	 * capability</a> to the container. For example: adding {@link Capability#MKNOD}
-	 * allows the container to create special files using the 'mknod' command.
-	 */
-	@Deprecated
-	public StartContainerCmd withCapAdd(Capability... capAdd);
-
-	/**
-	 * Drop linux <a
-	 * href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel
-	 * capability</a> from the container. For example: dropping {@link Capability#CHOWN}
-	 * prevents the container from changing the owner of any files.
-	 */
-	@Deprecated
-	public StartContainerCmd withCapDrop(Capability... capDrop);
-
-	@Deprecated
-	public StartContainerCmd withContainerId(String containerId);
-
-	/**
-	 * Add host devices to the container
-	 */
-	@Deprecated
-	public StartContainerCmd withDevices(Device... devices);
-
-	/**
-	 * Set custom DNS servers
-	 */
-	@Deprecated
-	public StartContainerCmd withDns(String... dns);
-
-	/**
-	 * Set custom DNS search domains
-	 */
-	@Deprecated
-	public StartContainerCmd withDnsSearch(String... dnsSearch);
-
-	/**
-	 * Add hostnames to /etc/hosts in the container
-	 */
-	@Deprecated
-	public StartContainerCmd withExtraHosts(String... extraHosts);
-
-	/**
-	 * Add link to another container.
-	 */
-	@Deprecated
-	public StartContainerCmd withLinks(Link... links);
-
-	@Deprecated
-	public StartContainerCmd withLxcConf(LxcConf... lxcConf);
-
-	/**
-	 * Set the Network mode for the container
-	 * <ul>
-	 * <li>'bridge': creates a new network stack for the container on the docker
-	 * bridge</li>
-	 * <li>'none': no networking for this container</li>
-	 * <li>'container:<name|id>': reuses another container network stack</li>
-	 * <li>'host': use the host network stack inside the container. Note: the
-	 * host mode gives the container full access to local system services such
-	 * as D-bus and is therefore considered insecure.</li>
-	 * </ul>
-	 */
-	@Deprecated
-	public StartContainerCmd withNetworkMode(String networkMode);
-
-	/**
-	 * Add one or more {@link PortBinding}s.
-	 * This corresponds to the <code>--publish</code> (<code>-p</code>)
-	 * option of the <code>docker run</code> CLI command.
-	 */
-	@Deprecated
-	public StartContainerCmd withPortBindings(PortBinding... portBindings);
-
-	/**
-	 * Add the port bindings that are contained in the given {@link Ports}
-	 * object.
-	 * 
-	 * @see #withPortBindings(PortBinding...)
-	 */
-	@Deprecated
-	public StartContainerCmd withPortBindings(Ports portBindings);
-
-	@Deprecated
-	public StartContainerCmd withPrivileged(Boolean privileged);
-
-	@Deprecated
-	public StartContainerCmd withPublishAllPorts(Boolean publishAllPorts);
-
-	/**
-	 * Set custom {@link RestartPolicy} for the container. Defaults to
-	 * {@link RestartPolicy#noRestart()}
-	 */
-	@Deprecated
-	public StartContainerCmd withRestartPolicy(RestartPolicy restartPolicy);
-
-	@Deprecated
-	public StartContainerCmd withVolumesFrom(VolumesFrom... volumesFrom);
+    StartContainerCmd withContainerId(String containerId);
 
+    /**
+     * @throws NotFoundException
+     *             No such container
+     * @throws NotModifiedException
+     *             Container already started
+     */
+    @Override
+    public Void exec() throws NotFoundException, NotModifiedException;
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
index 27fca12f8..6fe60734d 100644
--- a/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
@@ -7,22 +7,9 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.NotModifiedException;
 import com.github.dockerjava.api.command.StartContainerCmd;
-import com.github.dockerjava.api.model.Bind;
-import com.github.dockerjava.api.model.Binds;
-import com.github.dockerjava.api.model.Capability;
-import com.github.dockerjava.api.model.Device;
-import com.github.dockerjava.api.model.Link;
-import com.github.dockerjava.api.model.Links;
-import com.github.dockerjava.api.model.LxcConf;
-import com.github.dockerjava.api.model.PortBinding;
-import com.github.dockerjava.api.model.Ports;
-import com.github.dockerjava.api.model.RestartPolicy;
-import com.github.dockerjava.api.model.VolumesFrom;
-
 
 /**
  * Start a container
@@ -30,276 +17,39 @@
 @JsonInclude(NON_EMPTY)
 public class StartContainerCmdImpl extends AbstrDockerCmd<StartContainerCmd, Void> implements StartContainerCmd {
 
-	@JsonIgnore
-	private String containerId;
-
-	@JsonProperty("Binds")
-	private Binds binds;
-
-	@JsonProperty("Links")
-	private Links links;
-
-	@JsonProperty("LxcConf")
-	private LxcConf[] lxcConf;
-
-	@JsonProperty("PortBindings")
-	private Ports portBindings;
-
-	@JsonProperty("PublishAllPorts")
-	private Boolean publishAllPorts;
-
-	@JsonProperty("Privileged")
-	private Boolean privileged;
-
-	@JsonProperty("Dns")
-	private String[] dns;
-	
-	@JsonProperty("DnsSearch")
-	private String[] dnsSearch;
-
-	@JsonProperty("VolumesFrom")
-	private VolumesFrom[] volumesFrom;
-	
-	@JsonProperty("NetworkMode")          
-    private String networkMode;
-	
-	@JsonProperty("Devices")
-	private Device[] devices;
-	
-	@JsonProperty("ExtraHosts")
-	private String[] extraHosts;
-	
-	@JsonProperty("RestartPolicy")
-	private RestartPolicy restartPolicy;
-	
-	@JsonProperty("CapAdd")
-	private Capability[] capAdd;
-	
-	@JsonProperty("CapDrop")
-	private Capability[] capDrop;
-	
-	public StartContainerCmdImpl(StartContainerCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
-
-	@Override
-	@JsonIgnore
-	public Bind[] getBinds() {
-		return (binds == null) ? new Bind[0] : binds.getBinds();
-	}
-
-	@Override
-	@JsonIgnore
-	public Link[] getLinks() {
-		return (links == null) ? new Link[0] : links.getLinks();
-	}
+    @JsonIgnore
+    private String containerId;
 
-	@Override
-	public LxcConf[] getLxcConf() {
-		return lxcConf;
-	}
-
-	@Override
-	public Ports getPortBindings() {
-		return portBindings;
-	}
-
-	@Override
-	public Boolean isPublishAllPorts() {
-		return publishAllPorts;
-	}
-
-	@Override
-	public Boolean isPrivileged() {
-		return privileged;
-	}
-
-	@Override
-	public String[] getDns() {
-		return dns;
-	}
-	
-	@Override
-	public String[] getDnsSearch() {
-		return dnsSearch;
-	}
-
-	@Override
-	public VolumesFrom[] getVolumesFrom() {
-		return volumesFrom;
-	}
-
-	@Override
-	public String getContainerId() {
-		return containerId;
-	}
-	   
-    @Override
-	public String getNetworkMode() {        
-        return networkMode;
-    }
-    
-    @Override
-    public Device[] getDevices() {
-		return devices;
-	}
-    
-    @Override
-    public String[] getExtraHosts() {
-		return extraHosts;
-	}
-    
-    @Override
-    public RestartPolicy getRestartPolicy() {
-    	return restartPolicy;
+    public StartContainerCmdImpl(StartContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
     }
-    
-    @Override
-    public Capability[] getCapAdd() {
-    	return capAdd;
-    }
-    
+
     @Override
-    public Capability[] getCapDrop() {
-    	return capDrop;
+    public StartContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
     }
 
-	@Override
-	@JsonIgnore
-	public StartContainerCmd withBinds(Bind... binds) {
-		checkNotNull(binds, "binds was not specified");
-		this.binds = new Binds(binds);
-		return this;
-	}
-
-	@Override
-	@JsonIgnore
-	public StartContainerCmd withLinks(Link... links) {
-		checkNotNull(links, "links was not specified");
-		this.links = new Links(links);
-		return this;
-	}
-
-	@Override
-	public StartContainerCmd withLxcConf(LxcConf... lxcConf) {
-		checkNotNull(lxcConf, "lxcConf was not specified");
-		this.lxcConf = lxcConf;
-		return this;
-	}
-
-	@Override
-	public StartContainerCmd withPortBindings(Ports portBindings) {
-		checkNotNull(portBindings,
-				"portBindings was not specified");
-		this.portBindings = portBindings;
-		return this;
-	}
-
-	@Override
-	public StartContainerCmd withPortBindings(PortBinding... portBindings) {
-		checkNotNull(portBindings, "portBindings was not specified");
-		if (this.portBindings == null) {
-			this.portBindings = new Ports();
-		}
-		this.portBindings.add(portBindings);
-		return this;
-	}
-
-	@Override
-	public StartContainerCmd withPrivileged(Boolean privileged) {
-		this.privileged = privileged;
-		return this;
-	}
-
-	@Override
-	public StartContainerCmd withPublishAllPorts(Boolean publishAllPorts) {
-		this.publishAllPorts = publishAllPorts;
-		return this;
-	}
-
-	@Override
-	public StartContainerCmd withDns(String... dns) {
-		checkNotNull(dns, "dns was not specified");
-		this.dns = dns;
-		return this;
-	}
-	
-	@Override
-	public StartContainerCmd withDnsSearch(String... dnsSearch) {
-		checkNotNull(dnsSearch, "dnsSearch was not specified");
-		this.dnsSearch = dnsSearch;
-		return this;
-	}
-
-	@Override
-	public StartContainerCmd withVolumesFrom(VolumesFrom... volumesFrom) {
-		checkNotNull(volumesFrom, "volumesFrom was not specified");
-		this.volumesFrom = volumesFrom;
-		return this;
-	}
-
-	@Override
-	public StartContainerCmd withContainerId(String containerId) {
-	    checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
+    @Override
+    public String getContainerId() {
+        return containerId;
     }
 
     @Override
-	public StartContainerCmd withNetworkMode(String networkMode) {
-        checkNotNull(networkMode, "networkMode was not specified");
-        this.networkMode = networkMode;
-        return this;
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this).toString();
     }
-    
-    @Override
-	public StartContainerCmd withDevices(Device... devices) {
-		checkNotNull(devices, "devices was not specified");
-		this.devices = devices;
-		return this;
-	}
 
+    /**
+     * @throws NotFoundException
+     *             No such container
+     * @throws NotModifiedException
+     *             Container already started
+     */
     @Override
-	public StartContainerCmd withExtraHosts(String... extraHosts) {
-		checkNotNull(extraHosts, "extraHosts was not specified");
-		this.extraHosts = extraHosts;
-		return this;
-	}
-    
-    
-    @Override
-   	public StartContainerCmd withRestartPolicy(RestartPolicy restartPolicy) {
-   		checkNotNull(restartPolicy, "restartPolicy was not specified");
-   		this.restartPolicy = restartPolicy;
-   		return this;
-   	}
-    
-    @Override
-	public StartContainerCmd withCapAdd(Capability... capAdd) {
-		checkNotNull(capAdd, "capAdd was not specified");
-		this.capAdd = capAdd;
-		return this;
-	}
-    
-    @Override
-	public StartContainerCmd withCapDrop(Capability... capDrop) {
-		checkNotNull(capDrop, "capDrop was not specified");
-		this.capDrop = capDrop;
-		return this;
-	}
-
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this).toString();
-	}
-	
-	/**
-	 * @throws NotFoundException No such container
-	 * @throws NotModifiedException Container already started
-	 */
-	@Override
-	public Void exec() throws NotFoundException, NotModifiedException {
-		return super.exec();
-	}
+    public Void exec() throws NotFoundException, NotModifiedException {
+        return super.exec();
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index 640839915..d690f4e13 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -1,8 +1,8 @@
 package com.github.dockerjava.core.command;
 
 import static com.github.dockerjava.api.model.AccessMode.ro;
-import static com.github.dockerjava.api.model.Capability.*;
-import static org.hamcrest.CoreMatchers.nullValue;
+import static com.github.dockerjava.api.model.Capability.MKNOD;
+import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.equalTo;
@@ -13,16 +13,8 @@
 import static org.hamcrest.Matchers.startsWith;
 
 import java.lang.reflect.Method;
-import java.util.*;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.InternalServerErrorException;
-import com.github.dockerjava.api.NotFoundException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.command.StartContainerCmd;
-import com.github.dockerjava.api.model.*;
+import java.util.Arrays;
+import java.util.UUID;
 
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
@@ -31,624 +23,530 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.InternalServerErrorException;
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.command.StartContainerCmd;
+import com.github.dockerjava.api.model.AccessMode;
+import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.Device;
+import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.Link;
+import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.RestartPolicy;
+import com.github.dockerjava.api.model.Volume;
+import com.github.dockerjava.api.model.VolumeRW;
+import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
 @Test(groups = "integration")
 public class StartContainerCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void startContainerWithVolumes() throws DockerException {
+
+        // see http://docs.docker.io/use/working_with_volumes/
+        Volume volume1 = new Volume("/opt/webapp1");
+
+        Volume volume2 = new Volume("/opt/webapp2");
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withVolumes(volume1, volume2)
+                .withCmd("true").withBinds(new Bind("/src/webapp1", volume1, ro), new Bind("/src/webapp2", volume2))
+                .exec();
 
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
+        LOG.info("Created container {}", container.toString());
 
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
+        assertThat(container.getId(), not(isEmptyString()));
 
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-	@Test
-	public void startContainerWithVolumes() throws DockerException {
+        assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(), contains("/opt/webapp1", "/opt/webapp2"));
 
-		// see http://docs.docker.io/use/working_with_volumes/
-		Volume volume1 = new Volume("/opt/webapp1");
+        dockerClient.startContainerCmd(container.getId()).exec();
 
-		Volume volume2 = new Volume("/opt/webapp2");
+        dockerClient.waitContainerCmd(container.getId()).exec();
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withVolumes(volume1, volume2)
-				.withCmd("true").exec();
+        inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		LOG.info("Created container {}", container.toString());
+        assertContainerHasVolumes(inspectContainerResponse, volume1, volume2);
 
-		assertThat(container.getId(), not(isEmptyString()));
+        assertThat(Arrays.asList(inspectContainerResponse.getVolumesRW()),
+                contains(new VolumeRW(volume1, AccessMode.ro), new VolumeRW(volume2)));
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+    }
 
-		assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(),
-				contains("/opt/webapp1", "/opt/webapp2"));
+    @Test
+    public void startContainerWithVolumesFrom() throws DockerException {
 
-		dockerClient
-				.startContainerCmd(container.getId())
-				.withBinds(new Bind("/src/webapp1", volume1, ro),
-						new Bind("/src/webapp2", volume2)).exec();
+        Volume volume1 = new Volume("/opt/webapp1");
+        Volume volume2 = new Volume("/opt/webapp2");
 
-		dockerClient.waitContainerCmd(container.getId()).exec();
+        String container1Name = UUID.randomUUID().toString();
 
-		inspectContainerResponse = dockerClient.inspectContainerCmd(
-				container.getId()).exec();
+        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName(container1Name)
+                .withBinds(new Bind("/src/webapp1", volume1), new Bind("/src/webapp2", volume2)).exec();
+        LOG.info("Created container1 {}", container1.toString());
 
-		assertContainerHasVolumes(inspectContainerResponse, volume1, volume2);
+        dockerClient.startContainerCmd(container1.getId()).exec();
+        LOG.info("Started container1 {}", container1.toString());
 
-		assertThat(
-				Arrays.asList(inspectContainerResponse.getVolumesRW()),
-				contains(new VolumeRW(volume1, AccessMode.ro), new VolumeRW(
-						volume2)));
+        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+                .exec();
 
-	}
+        assertContainerHasVolumes(inspectContainerResponse1, volume1, volume2);
 
-	@Test
-	public void startContainerWithVolumesFrom() throws DockerException {
+        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withVolumesFrom(new VolumesFrom(container1Name)).exec();
+        LOG.info("Created container2 {}", container2.toString());
 
-		Volume volume1 = new Volume("/opt/webapp1");
-		Volume volume2 = new Volume("/opt/webapp2");
+        dockerClient.startContainerCmd(container2.getId()).exec();
+        LOG.info("Started container2 {}", container2.toString());
 
-		String container1Name = UUID.randomUUID().toString();
+        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+                .exec();
 
-		CreateContainerResponse container1 = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999")
-				.withName(container1Name).exec();
-		LOG.info("Created container1 {}", container1.toString());
+        assertContainerHasVolumes(inspectContainerResponse2, volume1, volume2);
+    }
 
-		dockerClient
-				.startContainerCmd(container1.getId())
-				.withBinds(new Bind("/src/webapp1", volume1),
-						new Bind("/src/webapp2", volume2)).exec();
-		LOG.info("Started container1 {}", container1.toString());
+    @Test
+    public void startContainerWithDns() throws DockerException {
 
-		InspectContainerResponse inspectContainerResponse1 = dockerClient
-				.inspectContainerCmd(container1.getId()).exec();
+        String aDnsServer = "8.8.8.8";
+        String anotherDnsServer = "8.8.4.4";
 
-		assertContainerHasVolumes(inspectContainerResponse1, volume1, volume2);
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withDns(aDnsServer, anotherDnsServer).exec();
 
-		CreateContainerResponse container2 = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-		LOG.info("Created container2 {}", container2.toString());
+        LOG.info("Created container {}", container.toString());
 
-		dockerClient.startContainerCmd(container2.getId())
-				.withVolumesFrom(new VolumesFrom(container1Name)).exec();
-		LOG.info("Started container2 {}", container2.toString());
+        assertThat(container.getId(), not(isEmptyString()));
 
-		InspectContainerResponse inspectContainerResponse2 = dockerClient
-				.inspectContainerCmd(container2.getId()).exec();
+        dockerClient.startContainerCmd(container.getId()).exec();
 
-		assertContainerHasVolumes(inspectContainerResponse2, volume1, volume2);
-	}
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-	@Test
-	public void startContainerWithDns() throws DockerException {
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()),
+                contains(aDnsServer, anotherDnsServer));
+    }
 
-		String aDnsServer = "8.8.8.8";
-		String anotherDnsServer = "8.8.4.4";
+    @Test
+    public void startContainerWithDnsSearch() throws DockerException {
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("true").exec();
+        String dnsSearch = "example.com";
 
-		LOG.info("Created container {}", container.toString());
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withDnsSearch(dnsSearch).exec();
 
-		assertThat(container.getId(), not(isEmptyString()));
+        LOG.info("Created container {}", container.toString());
 
-		dockerClient.startContainerCmd(container.getId())
-				.withDns(aDnsServer, anotherDnsServer).exec();
+        assertThat(container.getId(), not(isEmptyString()));
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig()
-				.getDns()), contains(aDnsServer, anotherDnsServer));
-	}
+        dockerClient.startContainerCmd(container.getId()).exec();
 
-	@Test
-	public void startContainerWithDnsSearch() throws DockerException {
+        inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		String dnsSearch = "example.com";
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDnsSearch()), contains(dnsSearch));
+    }
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("true").exec();
+    @Test
+    public void startContainerWithPortBindings() throws DockerException {
 
-		LOG.info("Created container {}", container.toString());
+        ExposedPort tcp22 = ExposedPort.tcp(22);
+        ExposedPort tcp23 = ExposedPort.tcp(23);
 
-		assertThat(container.getId(), not(isEmptyString()));
+        Ports portBindings = new Ports();
+        portBindings.bind(tcp22, Ports.Binding(11022));
+        portBindings.bind(tcp23, Ports.Binding(11023));
+        portBindings.bind(tcp23, Ports.Binding(11024));
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
 
-		dockerClient.startContainerCmd(container.getId())
-				.withDnsSearch(dnsSearch).exec();
+        LOG.info("Created container {}", container.toString());
 
-		inspectContainerResponse = dockerClient.inspectContainerCmd(
-				container.getId()).exec();
+        assertThat(container.getId(), not(isEmptyString()));
 
-		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig()
-				.getDnsSearch()), contains(dnsSearch));
-	}
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-	@Test
-	public void startContainerWithPortBindings() throws DockerException {
+        dockerClient.startContainerCmd(container.getId()).exec();
 
-		ExposedPort tcp22 = ExposedPort.tcp(22);
-		ExposedPort tcp23 = ExposedPort.tcp(23);
+        inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("true")
-				.withExposedPorts(tcp22, tcp23).exec();
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
-		LOG.info("Created container {}", container.toString());
+        assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
+                is(equalTo(Ports.Binding(11022))));
 
-		assertThat(container.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
+                is(equalTo(Ports.Binding(11023))));
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
+                is(equalTo(Ports.Binding(11024))));
 
-		Ports portBindings = new Ports();
-		portBindings.bind(tcp22, Ports.Binding(11022));
-		portBindings.bind(tcp23, Ports.Binding(11023));
-		portBindings.bind(tcp23, Ports.Binding(11024));
+    }
 
-		dockerClient.startContainerCmd(container.getId())
-				.withPortBindings(portBindings).exec();
+    @Test
+    public void startContainerWithRandomPortBindings() throws DockerException {
 
-		inspectContainerResponse = dockerClient.inspectContainerCmd(
-				container.getId()).exec();
+        ExposedPort tcp22 = ExposedPort.tcp(22);
+        ExposedPort tcp23 = ExposedPort.tcp(23);
 
-		assertThat(Arrays.asList(inspectContainerResponse.getConfig()
-				.getExposedPorts()), contains(tcp22, tcp23));
+        Ports portBindings = new Ports();
+        portBindings.bind(tcp22, Ports.Binding(null));
+        portBindings.bind(tcp23, Ports.Binding(null));
 
-		assertThat(inspectContainerResponse.getHostConfig().getPortBindings()
-				.getBindings().get(tcp22)[0], is(equalTo(Ports.Binding(11022))));
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).withPublishAllPorts(true).exec();
 
-		assertThat(inspectContainerResponse.getHostConfig().getPortBindings()
-				.getBindings().get(tcp23)[0], is(equalTo(Ports.Binding(11023))));
+        LOG.info("Created container {}", container.toString());
 
-		assertThat(inspectContainerResponse.getHostConfig().getPortBindings()
-				.getBindings().get(tcp23)[1], is(equalTo(Ports.Binding(11024))));
+        assertThat(container.getId(), not(isEmptyString()));
 
-	}
+        dockerClient.startContainerCmd(container.getId()).exec();
 
-	@Test
-	public void startContainerWithRandomPortBindings() throws DockerException {
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		ExposedPort tcp22 = ExposedPort.tcp(22);
-		ExposedPort tcp23 = ExposedPort.tcp(23);
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
-		Ports portBindings = new Ports();
-		portBindings.bind(tcp22, Ports.Binding(null));
-		portBindings.bind(tcp23, Ports.Binding(null));
+        assertThat(inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(tcp22)[0].getHostPort(),
+                is(not(equalTo(tcp22.getPort()))));
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999")
-				.withExposedPorts(tcp22, tcp23).withPortBindings(portBindings)
-				.withPublishAllPorts(true).exec();
+        assertThat(inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(tcp23)[0].getHostPort(),
+                is(not(equalTo(tcp23.getPort()))));
 
-		LOG.info("Created container {}", container.toString());
+    }
 
-		assertThat(container.getId(), not(isEmptyString()));
+    @Test
+    public void startContainerWithConflictingPortBindings() throws DockerException {
 
-		dockerClient.startContainerCmd(container.getId()).exec();
+        ExposedPort tcp22 = ExposedPort.tcp(22);
+        ExposedPort tcp23 = ExposedPort.tcp(23);
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        Ports portBindings = new Ports();
+        portBindings.bind(tcp22, Ports.Binding(11022));
+        portBindings.bind(tcp23, Ports.Binding(11022));
 
-		assertThat(Arrays.asList(inspectContainerResponse.getConfig()
-				.getExposedPorts()), contains(tcp22, tcp23));
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
 
-		assertThat(inspectContainerResponse.getNetworkSettings().getPorts()
-				.getBindings().get(tcp22)[0].getHostPort(), is(not(equalTo(tcp22.getPort()))));
+        LOG.info("Created container {}", container.toString());
 
-		assertThat(inspectContainerResponse.getNetworkSettings().getPorts()
-				.getBindings().get(tcp23)[0].getHostPort(), is(not(equalTo(tcp23.getPort()))));
+        assertThat(container.getId(), not(isEmptyString()));
 
-	}
+        try {
+            dockerClient.startContainerCmd(container.getId()).exec();
+            fail("expected InternalServerErrorException");
+        } catch (InternalServerErrorException e) {
 
-	@Test
-	public void startContainerWithConflictingPortBindings()
-			throws DockerException {
+        }
 
-		ExposedPort tcp22 = ExposedPort.tcp(22);
-		ExposedPort tcp23 = ExposedPort.tcp(23);
+    }
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("true")
-				.withExposedPorts(tcp22, tcp23).exec();
+    @Test
+    public void startContainerWithLinkingDeprecated() throws DockerException {
 
-		LOG.info("Created container {}", container.toString());
+        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName("container1").exec();
 
-		assertThat(container.getId(), not(isEmptyString()));
+        LOG.info("Created container1 {}", container1.toString());
+        assertThat(container1.getId(), not(isEmptyString()));
 
-		Ports portBindings = new Ports();
-		portBindings.bind(tcp22, Ports.Binding(11022));
-		portBindings.bind(tcp23, Ports.Binding(11022));
+        dockerClient.startContainerCmd(container1.getId()).exec();
 
-		try {
-			dockerClient.startContainerCmd(container.getId())
-					.withPortBindings(portBindings).exec();
-			fail("expected InternalServerErrorException");
-		} catch (InternalServerErrorException e) {
+        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+                .exec();
+        LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
 
-		}
+        assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId()));
+        assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
+        assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
+        assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
 
-	}
+        if (!inspectContainerResponse1.getState().isRunning()) {
+            assertThat(inspectContainerResponse1.getState().getExitCode(), is(equalTo(0)));
+        }
 
-	@Test
-	public void startContainerWithLinkingDeprecated() throws DockerException {
+        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName("container2").withLinks(new Link("container1", "container1Link")).exec();
 
-		CreateContainerResponse container1 = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999")
-				.withName("container1").exec();
+        LOG.info("Created container2 {}", container2.toString());
+        assertThat(container2.getId(), not(isEmptyString()));
 
-		LOG.info("Created container1 {}", container1.toString());
-		assertThat(container1.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container2.getId()).exec();
 
-		dockerClient.startContainerCmd(container1.getId()).exec();
+        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+                .exec();
+        LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
 
-		InspectContainerResponse inspectContainerResponse1 = dockerClient
-				.inspectContainerCmd(container1.getId()).exec();
-		LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
+        assertThat(inspectContainerResponse2.getConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
+                "container1Link") }));
+        assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
+        assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
+        assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse2.getState(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getState().isRunning(), is(true));
 
-		assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
-		assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
-		assertThat(inspectContainerResponse1.getId(),
-				startsWith(container1.getId()));
-		assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
-		assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
-		assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
-		assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
+    }
 
-		if (!inspectContainerResponse1.getState().isRunning()) {
-			assertThat(inspectContainerResponse1.getState().getExitCode(),
-					is(equalTo(0)));
-		}
+    @Test
+    public void startContainerWithLinking() throws DockerException {
 
-		CreateContainerResponse container2 = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999")
-				.withName("container2").exec();
+        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName("container1").exec();
 
-		LOG.info("Created container2 {}", container2.toString());
-		assertThat(container2.getId(), not(isEmptyString()));
+        LOG.info("Created container1 {}", container1.toString());
+        assertThat(container1.getId(), not(isEmptyString()));
 
-		dockerClient.startContainerCmd(container2.getId())
-				.withLinks(new Link("container1", "container1Link")).exec();
+        dockerClient.startContainerCmd(container1.getId()).exec();
 
-		InspectContainerResponse inspectContainerResponse2 = dockerClient
-				.inspectContainerCmd(container2.getId()).exec();
-		LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
+        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+                .exec();
+        LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
 
-		assertThat(inspectContainerResponse2.getConfig(), is(notNullValue()));
-		assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
-		assertThat(inspectContainerResponse2.getHostConfig(),
-				is(notNullValue()));
-		assertThat(inspectContainerResponse2.getHostConfig().getLinks(),
-				is(notNullValue()));
-		assertThat(
-				inspectContainerResponse2.getHostConfig().getLinks(),
-				equalTo(new Link[] { new Link("container1", "container1Link") }));
-		assertThat(inspectContainerResponse2.getId(),
-				startsWith(container2.getId()));
-		assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
-		assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
-		assertThat(inspectContainerResponse2.getState(), is(notNullValue()));
-		assertThat(inspectContainerResponse2.getState().isRunning(), is(true));
+        assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId()));
+        assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
+        assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
+        assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
 
-	}
-
-	@Test
-	public void startContainerWithLinking() throws DockerException {
-
-		CreateContainerResponse container1 = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999")
-				.withName("container1").exec();
-
-		LOG.info("Created container1 {}", container1.toString());
-		assertThat(container1.getId(), not(isEmptyString()));
-
-		dockerClient.startContainerCmd(container1.getId()).exec();
-
-		InspectContainerResponse inspectContainerResponse1 = dockerClient
-				.inspectContainerCmd(container1.getId()).exec();
-		LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
-
-		assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
-		assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
-		assertThat(inspectContainerResponse1.getId(),
-				startsWith(container1.getId()));
-		assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
-		assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
-		assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
-		assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
-
-		if (!inspectContainerResponse1.getState().isRunning()) {
-			assertThat(inspectContainerResponse1.getState().getExitCode(),
-					is(equalTo(0)));
-		}
-
-		CreateContainerResponse container2 = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999")
-				.withName("container2")
-				.withLinks(new Link("container1", "container1Link")).exec();
-
-		LOG.info("Created container2 {}", container2.toString());
-		assertThat(container2.getId(), not(isEmptyString()));
-
-		dockerClient.startContainerCmd(container2.getId()).exec();
-
-		InspectContainerResponse inspectContainerResponse2 = dockerClient
-				.inspectContainerCmd(container2.getId()).exec();
-		LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
-
-		assertThat(inspectContainerResponse2.getConfig(), is(notNullValue()));
-		assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
-		assertThat(inspectContainerResponse2.getHostConfig(),
-				is(notNullValue()));
-		assertThat(inspectContainerResponse2.getHostConfig().getLinks(),
-				is(notNullValue()));
-		assertThat(
-				inspectContainerResponse2.getHostConfig().getLinks(),
-				equalTo(new Link[] { new Link("container1", "container1Link") }));
-		assertThat(inspectContainerResponse2.getId(),
-				startsWith(container2.getId()));
-		assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
-		assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
-		assertThat(inspectContainerResponse2.getState(), is(notNullValue()));
-		assertThat(inspectContainerResponse2.getState().isRunning(), is(true));
-
-	}
-
-	@Test
-	public void startContainer() throws DockerException {
-
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd(new String[] { "top" })
-				.exec();
+        if (!inspectContainerResponse1.getState().isRunning()) {
+            assertThat(inspectContainerResponse1.getState().getExitCode(), is(equalTo(0)));
+        }
 
-		LOG.info("Created container {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
+        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName("container2").withLinks(new Link("container1", "container1Link")).exec();
 
-		dockerClient.startContainerCmd(container.getId()).exec();
+        LOG.info("Created container2 {}", container2.toString());
+        assertThat(container2.getId(), not(isEmptyString()));
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
-		LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+        dockerClient.startContainerCmd(container2.getId()).exec();
 
-		assertThat(inspectContainerResponse.getConfig(), is(notNullValue()));
-		assertThat(inspectContainerResponse.getId(), not(isEmptyString()));
+        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+                .exec();
+        LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
 
-		assertThat(inspectContainerResponse.getId(),
-				startsWith(container.getId()));
+        assertThat(inspectContainerResponse2.getConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
+                "container1Link") }));
+        assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
+        assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
+        assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse2.getState(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getState().isRunning(), is(true));
 
-		assertThat(inspectContainerResponse.getImageId(), not(isEmptyString()));
-		assertThat(inspectContainerResponse.getState(), is(notNullValue()));
+    }
 
-		assertThat(inspectContainerResponse.getState().isRunning(), is(true));
+    @Test
+    public void startContainer() throws DockerException {
 
-		if (!inspectContainerResponse.getState().isRunning()) {
-			assertThat(inspectContainerResponse.getState().getExitCode(),
-					is(equalTo(0)));
-		}
-	}
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd(new String[] { "top" })
+                .exec();
 
-	@Test
-	public void testStartNonExistingContainer() throws DockerException {
-		try {
-			dockerClient.startContainerCmd("non-existing").exec();
-			fail("expected NotFoundException");
-		} catch (NotFoundException e) {
-		}
-	}
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
 
-	/**
-	 * This tests support for --net option for the docker run command:
-	 * --net="bridge" Set the Network mode for the container 'bridge': creates a
-	 * new network stack for the container on the docker bridge 'none': no
-	 * networking for this container 'container:': reuses another container
-	 * network stack 'host': use the host network stack inside the container.
-	 * Note: the host mode gives the container full access to local system
-	 * services such as D-bus and is therefore considered insecure.
-	 */
-	@Test
-	public void startContainerWithNetworkMode() throws DockerException {
+        dockerClient.startContainerCmd(container.getId()).exec();
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("true").exec();
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
 
-		LOG.info("Created container {}", container.toString());
+        assertThat(inspectContainerResponse.getConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse.getId(), not(isEmptyString()));
 
-		assertThat(container.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse.getId(), startsWith(container.getId()));
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        assertThat(inspectContainerResponse.getImageId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse.getState(), is(notNullValue()));
 
-		dockerClient.startContainerCmd(container.getId())
-				.withNetworkMode("host").exec();
+        assertThat(inspectContainerResponse.getState().isRunning(), is(true));
 
-		inspectContainerResponse = dockerClient.inspectContainerCmd(
-				container.getId()).exec();
+        if (!inspectContainerResponse.getState().isRunning()) {
+            assertThat(inspectContainerResponse.getState().getExitCode(), is(equalTo(0)));
+        }
+    }
 
-		assertThat(inspectContainerResponse.getHostConfig().getNetworkMode(),
-				is(equalTo("host")));
-	}
+    @Test
+    public void testStartNonExistingContainer() throws DockerException {
+        try {
+            dockerClient.startContainerCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
 
-	@Test
-	public void startContainerWithCapAddAndCapDrop() throws DockerException {
+    /**
+     * This tests support for --net option for the docker run command: --net="bridge" Set the Network mode for the
+     * container 'bridge': creates a new network stack for the container on the docker bridge 'none': no networking for
+     * this container 'container:': reuses another container network stack 'host': use the host network stack inside the
+     * container. Note: the host mode gives the container full access to local system services such as D-bus and is
+     * therefore considered insecure.
+     */
+    @Test
+    public void startContainerWithNetworkMode() throws DockerException {
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withNetworkMode("host").exec();
 
-		LOG.info("Created container {}", container.toString());
+        LOG.info("Created container {}", container.toString());
 
-		assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(isEmptyString()));
 
-		dockerClient.startContainerCmd(container.getId()).withCapAdd(NET_ADMIN)
-				.withCapDrop(MKNOD).exec();
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        dockerClient.startContainerCmd(container.getId()).exec();
 
-		assertThat(inspectContainerResponse.getState().isRunning(), is(true));
+        inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig()
-				.getCapAdd()), contains(NET_ADMIN));
+        assertThat(inspectContainerResponse.getHostConfig().getNetworkMode(), is(equalTo("host")));
+    }
 
-		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig()
-				.getCapDrop()), contains(MKNOD));
-	}
+    @Test
+    public void startContainerWithCapAddAndCapDrop() throws DockerException {
 
-	@Test
-	public void startContainerWithDevices() throws DockerException {
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withCapAdd(NET_ADMIN).withCapDrop(MKNOD).exec();
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container {}", container.toString());
 
-		LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
 
-		assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
 
-		dockerClient.startContainerCmd(container.getId())
-				.withDevices(new Device("rwm", "/dev/nulo", "/dev/zero"))
-				.exec();
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        assertThat(inspectContainerResponse.getState().isRunning(), is(true));
 
-		assertThat(inspectContainerResponse.getState().isRunning(), is(true));
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getCapAdd()), contains(NET_ADMIN));
 
-		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig()
-				.getDevices()), contains(new Device("rwm", "/dev/nulo",
-				"/dev/zero")));
-	}
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getCapDrop()), contains(MKNOD));
+    }
 
-	@Test
-	public void startContainerWithExtraHosts() throws DockerException {
+    @Test
+    public void startContainerWithDevices() throws DockerException {
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withDevices(new Device("rwm", "/dev/nulo", "/dev/zero")).exec();
 
-		LOG.info("Created container {}", container.toString());
+        LOG.info("Created container {}", container.toString());
 
-		assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(isEmptyString()));
 
-		dockerClient.startContainerCmd(container.getId())
-				.withExtraHosts("dockerhost:127.0.0.1").exec();
+        dockerClient.startContainerCmd(container.getId()).exec();
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		assertThat(inspectContainerResponse.getState().isRunning(), is(true));
+        assertThat(inspectContainerResponse.getState().isRunning(), is(true));
 
-		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig()
-				.getExtraHosts()), contains("dockerhost:127.0.0.1"));
-	}
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDevices()), contains(new Device("rwm",
+                "/dev/nulo", "/dev/zero")));
+    }
 
-	@Test
-	public void startContainerWithRestartPolicy() throws DockerException {
+    @Test
+    public void startContainerWithExtraHosts() throws DockerException {
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withExtraHosts("dockerhost:127.0.0.1").exec();
 
-		LOG.info("Created container {}", container.toString());
+        LOG.info("Created container {}", container.toString());
 
-		assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(isEmptyString()));
 
-		RestartPolicy restartPolicy = RestartPolicy.onFailureRestart(5);
+        dockerClient.startContainerCmd(container.getId()).exec();
 
-		dockerClient.startContainerCmd(container.getId())
-				.withRestartPolicy(restartPolicy).exec();
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        assertThat(inspectContainerResponse.getState().isRunning(), is(true));
 
-		assertThat(inspectContainerResponse.getState().isRunning(), is(true));
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getExtraHosts()),
+                contains("dockerhost:127.0.0.1"));
+    }
 
-		assertThat(inspectContainerResponse.getHostConfig().getRestartPolicy(),
-				is(equalTo(restartPolicy)));
-	}
+    @Test
+    public void startContainerWithRestartPolicy() throws DockerException {
 
-	@Test
-	public void existingHostConfigIsPreservedByBlankStartCmd()
-			throws DockerException {
+        RestartPolicy restartPolicy = RestartPolicy.onFailureRestart(5);
 
-		String dnsServer = "8.8.8.8";
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withRestartPolicy(restartPolicy).exec();
 
-		// prepare a container with custom DNS
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withDns(dnsServer)
-				.withCmd("true").exec();
+        LOG.info("Created container {}", container.toString());
 
-		LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
 
-		assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
 
-		// start container _without_any_customization_ (important!)
-		dockerClient.startContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        assertThat(inspectContainerResponse.getState().isRunning(), is(true));
 
-		// The DNS setting survived.
-		assertThat(inspectContainerResponse.getHostConfig().getDns(),
-				is(notNullValue()));
-		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig()
-				.getDns()), contains(dnsServer));
-	}
+        assertThat(inspectContainerResponse.getHostConfig().getRestartPolicy(), is(equalTo(restartPolicy)));
+    }
 
-	@Test
-	public void existingHostConfigIsResetByConfiguredStartCmd()
-			throws DockerException {
-		// As of version 1.3.2, Docker assumes that you either configure a
-		// container
-		// when creating it or when starting it, but not mixing both.
-		// See https://github.com/docker-java/docker-java/pull/111
-		// If this test starts to fail, this behavior changed and a review of
-		// implementation
-		// and documentation might be needed.
+    @Test
+    public void existingHostConfigIsPreservedByBlankStartCmd() throws DockerException {
 
-		String dnsServer = "8.8.8.8";
+        String dnsServer = "8.8.8.8";
 
-		// prepare a container with custom DNS
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withDns(dnsServer)
-				.withCmd("true").exec();
+        // prepare a container with custom DNS
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withDns(dnsServer)
+                .withCmd("true").exec();
 
-		LOG.info("Created container {}", container.toString());
+        LOG.info("Created container {}", container.toString());
 
-		assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(isEmptyString()));
 
-		// modify another setting in start command. Leave DNS unchanged.
-		dockerClient.startContainerCmd(container.getId())
-				.withPublishAllPorts(true).exec();
+        // start container _without_any_customization_ (important!)
+        dockerClient.startContainerCmd(container.getId()).exec();
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		// although start did not modify DNS Settings, they were reset to their
-		// default.
-		assertThat(inspectContainerResponse.getHostConfig().getDns(),
-				is(nullValue(String[].class)));
-	}
+        // The DNS setting survived.
+        assertThat(inspectContainerResponse.getHostConfig().getDns(), is(notNullValue()));
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()), contains(dnsServer));
+    }
 
-	@Test
-	public void anUnconfiguredCommandSerializesToEmptyJson() throws Exception {
-		ObjectMapper objectMapper = new ObjectMapper();
-		StartContainerCmd command = dockerClient.startContainerCmd("");
-		assertThat(objectMapper.writeValueAsString(command), is("{}"));
-	}
+    @Test
+    public void anUnconfiguredCommandSerializesToEmptyJson() throws Exception {
+        ObjectMapper objectMapper = new ObjectMapper();
+        StartContainerCmd command = dockerClient.startContainerCmd("");
+        assertThat(objectMapper.writeValueAsString(command), is("{}"));
+    }
 }

From 8cefba38e675fcdac985081e777450b7f545566c Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 16 Jun 2015 23:10:30 +0200
Subject: [PATCH 0104/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b71f4e928..b76a052d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@ Change Log
 ===
 Latest SNAPSHOT
 ---
+* [#248](https://github.com/docker-java/docker-java/pull/233) Removed deprecated start options
+* [#247](https://github.com/docker-java/docker-java/pull/247) Add Domainname attribute on create command
+* [#245](https://github.com/docker-java/docker-java/pull/245) Added ReadonlyRootfs option
 * [#233](https://github.com/docker-java/docker-java/pull/233) Labels are array of Strings (fixes #232) 
 * [#189](https://github.com/docker-java/docker-java/pull/189) Add docker stats support  
 

From f557ea4fa810c1b3c630aa4b184de4f5629f53ce Mon Sep 17 00:00:00 2001
From: Chris Pheby <chris@jadira.co.uk>
Date: Tue, 16 Jun 2015 22:12:26 +0100
Subject: [PATCH 0105/1272] Fixing execution on Windows platforms

---
 .../dockerjava/core/command/FrameReader.java  | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
index c39791460..bb36c1764 100644
--- a/src/main/java/com/github/dockerjava/core/command/FrameReader.java
+++ b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
@@ -38,23 +38,34 @@ private static StreamType streamType(byte streamType) {
      */
     public Frame readFrame() throws IOException {
         byte[] header = new byte[HEADER_SIZE];
-        int headerSize = inputStream.read(header);
 
-        if (headerSize == -1) {
-            return null;
-        }
+        int actualHeaderSize = 0;
 
-        if (headerSize != HEADER_SIZE) {
-            throw new IOException(String.format("header must be %d bytes long, but was %d", HEADER_SIZE, headerSize));
-        }
+        do {
+            int headerCount = inputStream.read(header, actualHeaderSize, HEADER_SIZE - actualHeaderSize);
+
+            if (headerCount == -1) {
+                return null;
+            }
+            actualHeaderSize += headerCount;
+        } while (actualHeaderSize < HEADER_SIZE);
 
         int payloadSize = ((header[4] & 0xff) << 24) + ((header[5] & 0xff) << 16) + ((header[6] & 0xff) << 8) + (header[7] & 0xff);
 
         byte[] payload = new byte[payloadSize];
-        int actualPayloadSize = inputStream.read(payload);
-        if (actualPayloadSize != payloadSize) {
-            throw new IOException(String.format("payload must be %d bytes long, but was %d", payloadSize, actualPayloadSize));
-        }
+        int actualPayloadSize = 0;
+
+        do {
+            int count = inputStream.read(payload, actualPayloadSize, payloadSize - actualPayloadSize);
+
+            if (count == -1) {
+                if (actualPayloadSize != payloadSize) {
+                    throw new IOException(String.format("payload must be %d bytes long, but was %d", payloadSize, actualPayloadSize));
+                }
+                break;
+            }
+            actualPayloadSize += count;
+        } while (actualPayloadSize < payloadSize);
 
         return new Frame(streamType(header[0]), payload);
     }

From 6d98872847e3f33b534bbc94e6264aad31aaedbf Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <Kanstantsin_Shautsou@epam.com>
Date: Wed, 17 Jun 2015 00:32:06 +0300
Subject: [PATCH 0106/1272] Update CreateContainer with 1.19 changes

---
 .../api/command/CreateContainerCmd.java       | 40 +++++++++++++
 .../core/command/CreateContainerCmdImpl.java  | 56 +++++++++++++++++++
 2 files changed, 96 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 3b558b6d9..136b5aecc 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -41,6 +41,26 @@ public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateCon
 
     public int getCpuShares();
 
+    /**
+     * @since 1.19
+     */
+    public Integer getCpuPeriod();
+
+    /**
+     * @since 1.19
+     */
+    public String getCpusetMems();
+
+    /**
+     * @since 1.19
+     */
+    public Integer getBlkioWeight();
+
+    /**
+     * @since 1.19
+     */
+    public Boolean isOomKillDisable();
+
     public Device[] getDevices();
 
     public String[] getDns();
@@ -137,6 +157,26 @@ public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateCon
 
     public CreateContainerCmd withCpuShares(int cpuShares);
 
+    /**
+     * @since 1.19
+     */
+    public CreateContainerCmd withCpuPeriod(Integer cpuPeriod);
+
+    /**
+     * @since 1.19
+     */
+    public CreateContainerCmd withCpusetMems(String cpusetMems);
+
+    /**
+     * @since 1.19
+     */
+    public CreateContainerCmd withBlkioWeight(Integer blkioWeight);
+
+    /**
+     * @since 1.19
+     */
+    public CreateContainerCmd withOomKillDisable(Boolean oomKillDisable);
+
     /**
      * Add host devices to the container
      */
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index cc082b61f..eb57dfff4 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -53,6 +53,9 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     @JsonProperty("CpuShares")
     private int cpuShares = 0;
 
+    @JsonProperty("CpuPeriod")
+    private Integer cpuPeriod;
+
     @JsonProperty("Cpuset")
     private String cpuset;
 
@@ -107,6 +110,15 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     @JsonProperty("HostConfig")
     private HostConfig hostConfig = new HostConfig();
 
+    @JsonProperty("CpusetMems")
+    private String cpusetMems;
+
+    @JsonProperty("BlkioWeight")
+    private Integer blkioWeight;
+
+    @JsonProperty("OomKillDisable")
+    private Boolean oomKillDisable;
+
     public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, String image) {
         super(exec);
         checkNotNull(image, "image was not specified");
@@ -155,6 +167,26 @@ public int getCpuShares() {
         return cpuShares;
     }
 
+    @Override
+    public Integer getCpuPeriod() {
+        return cpuPeriod;
+    }
+
+    @Override
+    public String getCpusetMems() {
+        return cpusetMems;
+    }
+
+    @Override
+    public Integer getBlkioWeight() {
+        return blkioWeight;
+    }
+
+    @Override
+    public Boolean isOomKillDisable() {
+        return oomKillDisable;
+    }
+
     @Override
     @JsonIgnore
     public Device[] getDevices() {
@@ -398,6 +430,30 @@ public CreateContainerCmdImpl withCpuShares(int cpuShares) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withCpuPeriod(Integer cpuPeriod) {
+        this.cpuPeriod = cpuPeriod;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withCpusetMems(String cpusetMems) {
+        this.cpusetMems = cpusetMems;
+        return null;
+    }
+
+    @Override
+    public CreateContainerCmd withBlkioWeight(Integer blkioWeight) {
+        this.blkioWeight = blkioWeight;
+        return null;
+    }
+
+    @Override
+    public CreateContainerCmd withOomKillDisable(Boolean oomKillDisable) {
+        this.oomKillDisable = oomKillDisable;
+        return null;
+    }
+
     @Override
     public CreateContainerCmd withDevices(Device... devices) {
         this.hostConfig.setDevices(devices);

From 6a312c73f7aca9922c04e0dad0d23ff3e3a54fe1 Mon Sep 17 00:00:00 2001
From: Christian Beedgen <christian@sumologic.com>
Date: Sat, 20 Jun 2015 19:35:39 -0700
Subject: [PATCH 0107/1272] Adding Node type for Swarm support:

---
 .../github/dockerjava/api/model/Event.java    |  9 +++++
 .../com/github/dockerjava/api/model/Node.java | 37 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/Node.java

diff --git a/src/main/java/com/github/dockerjava/api/model/Event.java b/src/main/java/com/github/dockerjava/api/model/Event.java
index cb961f97d..b68d5b9a6 100644
--- a/src/main/java/com/github/dockerjava/api/model/Event.java
+++ b/src/main/java/com/github/dockerjava/api/model/Event.java
@@ -1,10 +1,12 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 /**
  * Representation of a Docker event.
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Event {
     private String status;
 
@@ -14,6 +16,9 @@ public class Event {
 
     private long time;
 
+    @JsonIgnoreProperties
+    private Node node;
+
     /**
      * Default constructor for the deserialization.
      */
@@ -71,6 +76,10 @@ public long getTime() {
         return time;
     }
 
+    public Node getNode() {
+        return node;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
diff --git a/src/main/java/com/github/dockerjava/api/model/Node.java b/src/main/java/com/github/dockerjava/api/model/Node.java
new file mode 100644
index 000000000..4fcf04e69
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/Node.java
@@ -0,0 +1,37 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * A node as returned by the /events API, for instance, when Swarm is used.
+ */
+public class Node {
+
+  @JsonProperty("Name")
+  private String name;
+
+  @JsonProperty("Id")
+  private String id;
+
+  @JsonProperty("Addr")
+  private String addr;
+
+  @JsonProperty("Ip")
+  private String ip;
+
+  public String getName() {
+    return name;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  public String getAddr() {
+    return addr;
+  }
+
+  public String getIp() {
+    return ip;
+  }
+}

From 10e246728806f9363a6fe663748b60a52992f925 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 17 Jun 2015 08:33:38 +0200
Subject: [PATCH 0108/1272] Refactored streaming API's

---
 .../github/dockerjava/api/DockerClient.java   | 174 ++--
 .../dockerjava/api/async/ResultCallback.java  |  18 +
 .../dockerjava/api/async/StreamCallback.java  |  18 -
 .../api/command/AsyncDockerCmd.java           |  20 +
 .../api/command/AttachContainerCmd.java       |  13 +-
 .../dockerjava/api/command/EventsCmd.java     |  14 +-
 .../api/command/LogContainerCmd.java          |  17 +-
 .../dockerjava/api/command/StatsCmd.java      |  19 +-
 .../dockerjava/core/DockerClientImpl.java     | 625 ++++++++-------
 .../core/async/FrameStreamProcessor.java      |  51 ++
 .../core/async/JsonStreamProcessor.java       |  59 ++
 .../core/async/ResponseStreamProcessor.java   |  20 +
 .../core/async/ResultCallbackTemplate.java    |  70 ++
 .../core/command/AttachContainerCmdImpl.java  |  34 +-
 .../core/command/EventsCmdImpl.java           |  31 +-
 .../core/command/LogContainerCmdImpl.java     |  30 +-
 .../dockerjava/core/command/StatsCmdImpl.java |  18 +-
 .../jaxrs/AttachContainerCmdExec.java         |  30 +-
 .../dockerjava/jaxrs/EventsCmdExec.java       |  77 +-
 .../dockerjava/jaxrs/LogContainerCmdExec.java |  26 +-
 .../github/dockerjava/jaxrs/StatsCmdExec.java |  50 +-
 .../jaxrs/async/AbstractCallbackNotifier.java |  78 ++
 .../jaxrs/async/GETCallbackNotifier.java      |  29 +
 .../jaxrs/async/POSTCallbackNotifier.java     |  29 +
 .../dockerjava/jaxrs/util/Streaming.java      |  52 --
 .../client/AbstractDockerClientTest.java      |  35 +
 .../command/AttachContainerCmdImplTest.java   |  70 ++
 .../core/command/BuildImageCmdImplTest.java   |  52 +-
 .../command/CreateContainerCmdImplTest.java   | 758 ++++++++----------
 .../core/command/EventsCmdImplTest.java       |  17 +-
 .../core/command/ExecStartCmdImplTest.java    |  30 +-
 .../core/command/FrameReaderITest.java        | 159 ++--
 .../core/command/LogContainerCmdImplTest.java | 169 ++--
 .../core/command/StatsCmdImplTest.java        |   7 +-
 34 files changed, 1648 insertions(+), 1251 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/async/ResultCallback.java
 delete mode 100644 src/main/java/com/github/dockerjava/api/async/StreamCallback.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java
 create mode 100644 src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
 create mode 100644 src/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java
 create mode 100644 src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java
 delete mode 100644 src/main/java/com/github/dockerjava/jaxrs/util/Streaming.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 82f727355..ef16085bb 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -1,124 +1,158 @@
 package com.github.dockerjava.api;
 
-import java.io.*;
-
-import com.github.dockerjava.api.command.*;
-import com.github.dockerjava.api.command.EventsCmd.EventStreamCallback;
-import com.github.dockerjava.api.command.StatsCmd.StatisticsCallback;
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.AttachContainerCmd;
+import com.github.dockerjava.api.command.AuthCmd;
+import com.github.dockerjava.api.command.BuildImageCmd;
+import com.github.dockerjava.api.command.CommitCmd;
+import com.github.dockerjava.api.command.ContainerDiffCmd;
+import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.api.command.CreateContainerCmd;
+import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.EventsCmd;
+import com.github.dockerjava.api.command.ExecCreateCmd;
+import com.github.dockerjava.api.command.ExecStartCmd;
+import com.github.dockerjava.api.command.InfoCmd;
+import com.github.dockerjava.api.command.InspectContainerCmd;
+import com.github.dockerjava.api.command.InspectExecCmd;
+import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.KillContainerCmd;
+import com.github.dockerjava.api.command.ListContainersCmd;
+import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.LogContainerCmd;
+import com.github.dockerjava.api.command.PauseContainerCmd;
+import com.github.dockerjava.api.command.PingCmd;
+import com.github.dockerjava.api.command.PullImageCmd;
+import com.github.dockerjava.api.command.PushImageCmd;
+import com.github.dockerjava.api.command.RemoveContainerCmd;
+import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.api.command.RestartContainerCmd;
+import com.github.dockerjava.api.command.SaveImageCmd;
+import com.github.dockerjava.api.command.SearchImagesCmd;
+import com.github.dockerjava.api.command.StartContainerCmd;
+import com.github.dockerjava.api.command.StatsCmd;
+import com.github.dockerjava.api.command.StopContainerCmd;
+import com.github.dockerjava.api.command.TagImageCmd;
+import com.github.dockerjava.api.command.TopContainerCmd;
+import com.github.dockerjava.api.command.UnpauseContainerCmd;
+import com.github.dockerjava.api.command.VersionCmd;
+import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.Identifier;
+import com.github.dockerjava.api.model.Statistics;
 
 // https://godoc.org/github.com/fsouza/go-dockerclient
 public interface DockerClient extends Closeable {
 
-	public AuthConfig authConfig() throws DockerException;
+    public AuthConfig authConfig() throws DockerException;
 
-	/**
-	 * Authenticate with the server, useful for checking authentication.
-	 */
-	public AuthCmd authCmd();
+    /**
+     * Authenticate with the server, useful for checking authentication.
+     */
+    public AuthCmd authCmd();
 
-	public InfoCmd infoCmd();
+    public InfoCmd infoCmd();
 
-	public PingCmd pingCmd();
+    public PingCmd pingCmd();
 
-	public VersionCmd versionCmd();
+    public VersionCmd versionCmd();
 
-	/**
-	 * * IMAGE API *
-	 */
+    /**
+     * * IMAGE API *
+     */
 
-	public PullImageCmd pullImageCmd(String repository);
+    public PullImageCmd pullImageCmd(String repository);
 
-	public PushImageCmd pushImageCmd(String name);
+    public PushImageCmd pushImageCmd(String name);
 
-        public PushImageCmd pushImageCmd(Identifier identifier);
+    public PushImageCmd pushImageCmd(Identifier identifier);
 
-	public CreateImageCmd createImageCmd(String repository,
-			InputStream imageStream);
+    public CreateImageCmd createImageCmd(String repository, InputStream imageStream);
 
-	public SearchImagesCmd searchImagesCmd(String term);
+    public SearchImagesCmd searchImagesCmd(String term);
 
-	public RemoveImageCmd removeImageCmd(String imageId);
+    public RemoveImageCmd removeImageCmd(String imageId);
 
-	public ListImagesCmd listImagesCmd();
+    public ListImagesCmd listImagesCmd();
 
-	public InspectImageCmd inspectImageCmd(String imageId);
+    public InspectImageCmd inspectImageCmd(String imageId);
 
     public SaveImageCmd saveImageCmd(String name);
 
-	/**
-	 * * CONTAINER API *
-	 */
-
-	public ListContainersCmd listContainersCmd();
-
-	public CreateContainerCmd createContainerCmd(String image);
-
-	/**
-	 * Creates a new {@link StartContainerCmd} for the container with the
-	 * given ID.
-	 * The command can then be further customized by using builder
-	 * methods on it like {@link StartContainerCmd#withDns(String...)}.
-	 * <p>
-	 * <b>If you customize the command, any existing configuration of the
-	 * target container will get reset to its default before applying the
-	 * new configuration. To preserve the existing configuration, use an
-	 * unconfigured {@link StartContainerCmd}.</b>
-	 * <p>
-	 * This command corresponds to the <code>/containers/{id}/start</code>
-	 * endpoint of the Docker Remote API.
-	 */
-	public StartContainerCmd startContainerCmd(String containerId);
+    /**
+     * * CONTAINER API *
+     */
+
+    public ListContainersCmd listContainersCmd();
+
+    public CreateContainerCmd createContainerCmd(String image);
+
+    /**
+     * Creates a new {@link StartContainerCmd} for the container with the given ID. The command can then be further
+     * customized by using builder methods on it like {@link StartContainerCmd#withDns(String...)}.
+     * <p>
+     * <b>If you customize the command, any existing configuration of the target container will get reset to its default
+     * before applying the new configuration. To preserve the existing configuration, use an unconfigured
+     * {@link StartContainerCmd}.</b>
+     * <p>
+     * This command corresponds to the <code>/containers/{id}/start</code> endpoint of the Docker Remote API.
+     */
+    public StartContainerCmd startContainerCmd(String containerId);
 
     public ExecCreateCmd execCreateCmd(String containerId);
 
-	public InspectContainerCmd inspectContainerCmd(String containerId);
+    public InspectContainerCmd inspectContainerCmd(String containerId);
 
-	public RemoveContainerCmd removeContainerCmd(String containerId);
+    public RemoveContainerCmd removeContainerCmd(String containerId);
 
-	public WaitContainerCmd waitContainerCmd(String containerId);
+    public WaitContainerCmd waitContainerCmd(String containerId);
 
-	public AttachContainerCmd attachContainerCmd(String containerId);
+    public AttachContainerCmd attachContainerCmd(String containerId, ResultCallback<Frame> resultCallback);
 
     public ExecStartCmd execStartCmd(String containerId);
 
     public InspectExecCmd inspectExecCmd(String execId);
 
-	public LogContainerCmd logContainerCmd(String containerId);
+    public LogContainerCmd logContainerCmd(String containerId, ResultCallback<Frame> resultCallback);
 
-	public CopyFileFromContainerCmd copyFileFromContainerCmd(
-			String containerId, String resource);
+    public CopyFileFromContainerCmd copyFileFromContainerCmd(String containerId, String resource);
 
-	public ContainerDiffCmd containerDiffCmd(String containerId);
+    public ContainerDiffCmd containerDiffCmd(String containerId);
 
-	public StopContainerCmd stopContainerCmd(String containerId);
+    public StopContainerCmd stopContainerCmd(String containerId);
 
-	public KillContainerCmd killContainerCmd(String containerId);
+    public KillContainerCmd killContainerCmd(String containerId);
 
-	public RestartContainerCmd restartContainerCmd(String containerId);
+    public RestartContainerCmd restartContainerCmd(String containerId);
 
-	public CommitCmd commitCmd(String containerId);
+    public CommitCmd commitCmd(String containerId);
 
     public BuildImageCmd buildImageCmd();
 
-	public BuildImageCmd buildImageCmd(File dockerFileOrFolder);
+    public BuildImageCmd buildImageCmd(File dockerFileOrFolder);
 
-	public BuildImageCmd buildImageCmd(InputStream tarInputStream);
+    public BuildImageCmd buildImageCmd(InputStream tarInputStream);
 
-	public TopContainerCmd topContainerCmd(String containerId);
+    public TopContainerCmd topContainerCmd(String containerId);
 
-	public TagImageCmd tagImageCmd(String imageId, String repository, String tag);
+    public TagImageCmd tagImageCmd(String imageId, String repository, String tag);
 
-	public PauseContainerCmd pauseContainerCmd(String containerId);
+    public PauseContainerCmd pauseContainerCmd(String containerId);
 
-	public UnpauseContainerCmd unpauseContainerCmd(String containerId);
+    public UnpauseContainerCmd unpauseContainerCmd(String containerId);
 
-	public EventsCmd eventsCmd(EventStreamCallback eventCallback);
+    public EventsCmd eventsCmd(ResultCallback<Event> resultCallback);
 
-	public StatsCmd statsCmd(StatisticsCallback statisticsCallback);
+    public StatsCmd statsCmd(ResultCallback<Statistics> resultCallback);
 
-	@Override
-	public void close() throws IOException;
+    @Override
+    public void close() throws IOException;
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/async/ResultCallback.java b/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
new file mode 100644
index 000000000..f4f519d3e
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
@@ -0,0 +1,18 @@
+package com.github.dockerjava.api.async;
+
+import java.io.Closeable;
+
+/**
+ * Result callback
+ */
+public interface ResultCallback<RES_T> {
+	/** Called when the async processing starts. The passed {@link Closeable} can be used to close/interrupt the processing */
+	void onStart(Closeable closeable);
+	/** Called when an async result event occurs */
+    void onResult(RES_T object);
+    /** Called when an exception occurs while processing */
+    void onError(Throwable throwable);
+    /** Called when processing was finished either by reaching the end or by aborting it */
+    void onFinish();
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/async/StreamCallback.java b/src/main/java/com/github/dockerjava/api/async/StreamCallback.java
deleted file mode 100644
index b719c227c..000000000
--- a/src/main/java/com/github/dockerjava/api/async/StreamCallback.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.github.dockerjava.api.async;
-
-import java.io.Closeable;
-
-/**
- * Stream callback
- */
-public interface StreamCallback<T> {
-	/** Called when the stream starts. The passed {@link Closeable} can be used to close/interrupt the stream */
-	void onStart(Closeable stream);
-	/** Called when a stream event occurs */
-    void onStream(T object);
-    /** Called when an exception occurs while processing the stream */
-    void onError(Throwable throwable);
-    /** Called when streaming was finished either by reaching the end of the stream or by aborting it */
-    void onFinish();
-
-}
diff --git a/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java b/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
new file mode 100644
index 000000000..4745fae18
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
@@ -0,0 +1,20 @@
+/*
+ * Created on 17.06.2015
+ */
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.async.ResultCallback;
+
+/**
+ *
+ *
+ * @author marcus
+ *
+ */
+public interface AsyncDockerCmd<CMD_T extends DockerCmd<RES_T>, A_RES_T, RES_T> extends DockerCmd<RES_T> {
+
+    public ResultCallback<A_RES_T> getResultCallback();
+
+    public CMD_T withResultCallback(ResultCallback<A_RES_T> resultCallback);
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
index 0fb72d452..ffb282095 100644
--- a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
@@ -4,13 +4,14 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.model.Frame;
 
 /**
  * Attach to container
- * 
+ *
  * @param logs
  *            - true or false, includes logs. Defaults to false.
- * 
+ *
  * @param followStream
  *            - true or false, return stream. Defaults to false.
  * @param stdout
@@ -21,7 +22,7 @@
  *            - true or false, if true, print timestamps for every log line.
  *            Defaults to false.
  */
-public interface AttachContainerCmd extends DockerCmd<InputStream> {
+public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, Frame, Void> {
 
 	public String getContainerId();
 
@@ -67,15 +68,15 @@ public interface AttachContainerCmd extends DockerCmd<InputStream> {
 	/**
 	 * Its the responsibility of the caller to consume and/or close the
 	 * {@link InputStream} to prevent connection leaks.
-	 * 
+	 *
 	 * @throws NotFoundException
 	 *             No such container
 	 */
 	@Override
-	public InputStream exec() throws NotFoundException;
+	public Void exec() throws NotFoundException;
 
 	public static interface Exec extends
-			DockerCmdExec<AttachContainerCmd, InputStream> {
+			DockerCmdExec<AttachContainerCmd, Void> {
 	}
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java b/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
index fdab3700e..17ec37248 100644
--- a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.command;
 
-import com.github.dockerjava.api.async.StreamCallback;
 import com.github.dockerjava.api.model.Event;
 
 
@@ -10,7 +9,7 @@
  * @param since - Show all events created since timestamp
  * @param until - Stream events until this timestamp
  */
-public interface EventsCmd extends DockerCmd<Void> {
+public interface EventsCmd extends AsyncDockerCmd<EventsCmd, Event, Void> {
     public EventsCmd withSince(String since);
 
     public EventsCmd withUntil(String until);
@@ -19,17 +18,6 @@ public interface EventsCmd extends DockerCmd<Void> {
 
     public String getUntil();
 
-    public EventStreamCallback getEventCallback();
-
-    public EventsCmd withEventCallback(EventStreamCallback eventCallback);
-
     public static interface Exec extends DockerCmdExec<EventsCmd, Void> {
     }
-
-    /**
-     * {@link Event} stream callback
-     */
-    public interface EventStreamCallback extends StreamCallback<Event> {
-    }
-
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
index c966ef953..2eff3c217 100644
--- a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -2,12 +2,14 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.model.Frame;
 
 import java.io.InputStream;
+import java.util.concurrent.Future;
 
 /**
  * Get container logs
- * 
+ *
  * @param followStream
  *            - true or false, return stream. Defaults to false.
  * @param stdout
@@ -20,13 +22,12 @@
  * @param tail
  *            - `all` or `<number>`, Output specified number of lines at the end
  *            of logs
- * 
+ *
  *            Consider wrapping any input stream you get with a frame reader to
  *            make reading frame easier.
- * 
- * @see com.github.dockerjava.core.command.FrameReader
+ *
  */
-public interface LogContainerCmd extends DockerCmd<InputStream> {
+public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame, Void> {
 
 	public String getContainerId();
 
@@ -74,15 +75,15 @@ public interface LogContainerCmd extends DockerCmd<InputStream> {
 	/**
 	 * Its the responsibility of the caller to consume and/or close the
 	 * {@link InputStream} to prevent connection leaks.
-	 * 
+	 *
 	 * @throws NotFoundException
 	 *             No such container
 	 */
 	@Override
-	public InputStream exec() throws NotFoundException;
+	public Void exec() throws NotFoundException;
 
 	public static interface Exec extends
-			DockerCmdExec<LogContainerCmd, InputStream> {
+			DockerCmdExec<LogContainerCmd, Void> {
 	}
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/StatsCmd.java b/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
index d06d09835..0547cc616 100644
--- a/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
@@ -1,28 +1,17 @@
 package com.github.dockerjava.api.command;
 
-import com.github.dockerjava.api.async.StreamCallback;
 import com.github.dockerjava.api.model.Statistics;
 
 /**
- * Get stats
- *
+ * Get container stats. The result of {@link Statistics} is handled asynchronously because
+ * the docker remote API will block when a container is stopped until
+ * the container is up again.
  */
-public interface StatsCmd extends DockerCmd<Void> {
+public interface StatsCmd extends AsyncDockerCmd<StatsCmd, Statistics, Void> {
     public StatsCmd withContainerId(String containerId);
 
     public String getContainerId();
 
-    public StatsCmd withStatisticsCallback(StatisticsCallback callback);
-
-    public StatisticsCallback getStatisticsCallback();
-
     public static interface Exec extends DockerCmdExec<StatsCmd, Void> {
     }
-
-    /**
-     * {@link Statistics} stream callback
-     */
-    public interface StatisticsCallback extends StreamCallback<Statistics> {
-    }
-
 }
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 4503e4f17..b9bdb7edc 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -8,13 +8,86 @@
 import java.io.InputStream;
 
 import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.command.*;
-import com.github.dockerjava.api.command.EventsCmd.EventStreamCallback;
-import com.github.dockerjava.api.command.StatsCmd.StatisticsCallback;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.AttachContainerCmd;
+import com.github.dockerjava.api.command.AuthCmd;
+import com.github.dockerjava.api.command.BuildImageCmd;
+import com.github.dockerjava.api.command.CommitCmd;
+import com.github.dockerjava.api.command.ContainerDiffCmd;
+import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.api.command.CreateContainerCmd;
+import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.DockerCmdExecFactory;
+import com.github.dockerjava.api.command.EventsCmd;
+import com.github.dockerjava.api.command.ExecCreateCmd;
+import com.github.dockerjava.api.command.ExecStartCmd;
+import com.github.dockerjava.api.command.InfoCmd;
+import com.github.dockerjava.api.command.InspectContainerCmd;
+import com.github.dockerjava.api.command.InspectExecCmd;
+import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.KillContainerCmd;
+import com.github.dockerjava.api.command.ListContainersCmd;
+import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.LogContainerCmd;
+import com.github.dockerjava.api.command.PauseContainerCmd;
+import com.github.dockerjava.api.command.PingCmd;
+import com.github.dockerjava.api.command.PullImageCmd;
+import com.github.dockerjava.api.command.PushImageCmd;
+import com.github.dockerjava.api.command.RemoveContainerCmd;
+import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.api.command.RestartContainerCmd;
+import com.github.dockerjava.api.command.SaveImageCmd;
+import com.github.dockerjava.api.command.SearchImagesCmd;
+import com.github.dockerjava.api.command.StartContainerCmd;
+import com.github.dockerjava.api.command.StatsCmd;
+import com.github.dockerjava.api.command.StopContainerCmd;
+import com.github.dockerjava.api.command.TagImageCmd;
+import com.github.dockerjava.api.command.TopContainerCmd;
+import com.github.dockerjava.api.command.UnpauseContainerCmd;
+import com.github.dockerjava.api.command.VersionCmd;
+import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
+import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.Identifier;
-import com.github.dockerjava.core.command.*;
+import com.github.dockerjava.api.model.Statistics;
+import com.github.dockerjava.core.command.AttachContainerCmdImpl;
+import com.github.dockerjava.core.command.AuthCmdImpl;
+import com.github.dockerjava.core.command.BuildImageCmdImpl;
+import com.github.dockerjava.core.command.CommitCmdImpl;
+import com.github.dockerjava.core.command.ContainerDiffCmdImpl;
+import com.github.dockerjava.core.command.CopyFileFromContainerCmdImpl;
+import com.github.dockerjava.core.command.CreateContainerCmdImpl;
+import com.github.dockerjava.core.command.CreateImageCmdImpl;
+import com.github.dockerjava.core.command.EventsCmdImpl;
+import com.github.dockerjava.core.command.ExecCreateCmdImpl;
+import com.github.dockerjava.core.command.ExecStartCmdImpl;
+import com.github.dockerjava.core.command.InfoCmdImpl;
+import com.github.dockerjava.core.command.InspectContainerCmdImpl;
+import com.github.dockerjava.core.command.InspectExecCmdImpl;
+import com.github.dockerjava.core.command.InspectImageCmdImpl;
+import com.github.dockerjava.core.command.KillContainerCmdImpl;
+import com.github.dockerjava.core.command.ListContainersCmdImpl;
+import com.github.dockerjava.core.command.ListImagesCmdImpl;
+import com.github.dockerjava.core.command.LogContainerCmdImpl;
+import com.github.dockerjava.core.command.PauseContainerCmdImpl;
+import com.github.dockerjava.core.command.PingCmdImpl;
+import com.github.dockerjava.core.command.PullImageCmdImpl;
+import com.github.dockerjava.core.command.PushImageCmdImpl;
+import com.github.dockerjava.core.command.RemoveContainerCmdImpl;
+import com.github.dockerjava.core.command.RemoveImageCmdImpl;
+import com.github.dockerjava.core.command.RestartContainerCmdImpl;
+import com.github.dockerjava.core.command.SaveImageCmdImpl;
+import com.github.dockerjava.core.command.SearchImagesCmdImpl;
+import com.github.dockerjava.core.command.StartContainerCmdImpl;
+import com.github.dockerjava.core.command.StatsCmdImpl;
+import com.github.dockerjava.core.command.StopContainerCmdImpl;
+import com.github.dockerjava.core.command.TagImageCmdImpl;
+import com.github.dockerjava.core.command.TopContainerCmdImpl;
+import com.github.dockerjava.core.command.UnpauseContainerCmdImpl;
+import com.github.dockerjava.core.command.VersionCmdImpl;
+import com.github.dockerjava.core.command.WaitContainerCmdImpl;
 
 /**
  * @author Konstantin Pelykh (kpelykh@gmail.com)
@@ -23,221 +96,197 @@
  */
 public class DockerClientImpl implements Closeable, DockerClient {
 
-	private final DockerClientConfig dockerClientConfig;
-
-	private DockerCmdExecFactory dockerCmdExecFactory;
-
-	private DockerClientImpl() {
-		this(DockerClientConfig.createDefaultConfigBuilder().build());
-	}
-
-	private DockerClientImpl(String serverUrl) {
-		this(configWithServerUrl(serverUrl));
-	}
-
-	private DockerClientImpl(DockerClientConfig dockerClientConfig) {
-		checkNotNull(dockerClientConfig,
-				"config was not specified");
-		this.dockerClientConfig = dockerClientConfig;
-	}
-
-	private static DockerClientConfig configWithServerUrl(String serverUrl) {
-		return DockerClientConfig.createDefaultConfigBuilder()
-				.withUri(serverUrl).build();
-	}
-
-	public static DockerClientImpl getInstance() {
-		return new DockerClientImpl();
-	}
-
-	public static DockerClientImpl getInstance(
-			DockerClientConfig dockerClientConfig) {
-		return new DockerClientImpl(dockerClientConfig);
-	}
-
-	public static DockerClientImpl getInstance(String serverUrl) {
-		return new DockerClientImpl(serverUrl);
-	}
-
-	public DockerClientImpl withDockerCmdExecFactory(
-			DockerCmdExecFactory dockerCmdExecFactory) {
-		checkNotNull(dockerCmdExecFactory,
-				"dockerCmdExecFactory was not specified");
-		this.dockerCmdExecFactory = dockerCmdExecFactory;
-		this.dockerCmdExecFactory.init(dockerClientConfig);
-		return this;
-	}
-
-	private DockerCmdExecFactory getDockerCmdExecFactory() {
-		checkNotNull(dockerCmdExecFactory,
-				"dockerCmdExecFactory was not specified");
-		return dockerCmdExecFactory;
-	}
-
-	@Override
-	public AuthConfig authConfig() {
-		checkNotNull(dockerClientConfig.getUsername(),
-				"Configured username is null.");
-		checkNotNull(dockerClientConfig.getServerAddress(),
-				"Configured serverAddress is null.");
-
-		AuthConfig authConfig = new AuthConfig();
-		authConfig.setUsername(dockerClientConfig.getUsername());
-		authConfig.setPassword(dockerClientConfig.getPassword());
-		authConfig.setEmail(dockerClientConfig.getEmail());
-		authConfig.setServerAddress(dockerClientConfig.getServerAddress());
-
-		return authConfig;
-	}
-
-	/**
-	 * * MISC API *
-	 */
-
-	/**
-	 * Authenticate with the server, useful for checking authentication.
-	 */
-	@Override
-	public AuthCmd authCmd() {
-		return new AuthCmdImpl(getDockerCmdExecFactory().createAuthCmdExec(),
-				authConfig());
-	}
-
-	@Override
-	public InfoCmd infoCmd() {
-		return new InfoCmdImpl(getDockerCmdExecFactory().createInfoCmdExec());
-	}
-
-	@Override
-	public PingCmd pingCmd() {
-		return new PingCmdImpl(getDockerCmdExecFactory().createPingCmdExec());
-	}
-
-	@Override
-	public VersionCmd versionCmd() {
-		return new VersionCmdImpl(getDockerCmdExecFactory()
-				.createVersionCmdExec());
-	}
-
-	/**
-	 * * IMAGE API *
-	 */
-	@Override
-	public PullImageCmd pullImageCmd(String repository) {
-		return new PullImageCmdImpl(getDockerCmdExecFactory()
-				.createPullImageCmdExec(), dockerClientConfig.effectiveAuthConfig(repository), repository);
-	}
-
-	@Override
-	public PushImageCmd pushImageCmd(String name) {
-          PushImageCmd cmd = new PushImageCmdImpl(getDockerCmdExecFactory()
-				.createPushImageCmdExec(), name);
-
-          AuthConfig cfg = dockerClientConfig.effectiveAuthConfig(name);
-          if( cfg != null )
+    private final DockerClientConfig dockerClientConfig;
+
+    private DockerCmdExecFactory dockerCmdExecFactory;
+
+    private DockerClientImpl() {
+        this(DockerClientConfig.createDefaultConfigBuilder().build());
+    }
+
+    private DockerClientImpl(String serverUrl) {
+        this(configWithServerUrl(serverUrl));
+    }
+
+    private DockerClientImpl(DockerClientConfig dockerClientConfig) {
+        checkNotNull(dockerClientConfig, "config was not specified");
+        this.dockerClientConfig = dockerClientConfig;
+    }
+
+    private static DockerClientConfig configWithServerUrl(String serverUrl) {
+        return DockerClientConfig.createDefaultConfigBuilder().withUri(serverUrl).build();
+    }
+
+    public static DockerClientImpl getInstance() {
+        return new DockerClientImpl();
+    }
+
+    public static DockerClientImpl getInstance(DockerClientConfig dockerClientConfig) {
+        return new DockerClientImpl(dockerClientConfig);
+    }
+
+    public static DockerClientImpl getInstance(String serverUrl) {
+        return new DockerClientImpl(serverUrl);
+    }
+
+    public DockerClientImpl withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) {
+        checkNotNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified");
+        this.dockerCmdExecFactory = dockerCmdExecFactory;
+        this.dockerCmdExecFactory.init(dockerClientConfig);
+        return this;
+    }
+
+    private DockerCmdExecFactory getDockerCmdExecFactory() {
+        checkNotNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified");
+        return dockerCmdExecFactory;
+    }
+
+    @Override
+    public AuthConfig authConfig() {
+        checkNotNull(dockerClientConfig.getUsername(), "Configured username is null.");
+        checkNotNull(dockerClientConfig.getServerAddress(), "Configured serverAddress is null.");
+
+        AuthConfig authConfig = new AuthConfig();
+        authConfig.setUsername(dockerClientConfig.getUsername());
+        authConfig.setPassword(dockerClientConfig.getPassword());
+        authConfig.setEmail(dockerClientConfig.getEmail());
+        authConfig.setServerAddress(dockerClientConfig.getServerAddress());
+
+        return authConfig;
+    }
+
+    /**
+     * * MISC API *
+     */
+
+    /**
+     * Authenticate with the server, useful for checking authentication.
+     */
+    @Override
+    public AuthCmd authCmd() {
+        return new AuthCmdImpl(getDockerCmdExecFactory().createAuthCmdExec(), authConfig());
+    }
+
+    @Override
+    public InfoCmd infoCmd() {
+        return new InfoCmdImpl(getDockerCmdExecFactory().createInfoCmdExec());
+    }
+
+    @Override
+    public PingCmd pingCmd() {
+        return new PingCmdImpl(getDockerCmdExecFactory().createPingCmdExec());
+    }
+
+    @Override
+    public VersionCmd versionCmd() {
+        return new VersionCmdImpl(getDockerCmdExecFactory().createVersionCmdExec());
+    }
+
+    /**
+     * * IMAGE API *
+     */
+    @Override
+    public PullImageCmd pullImageCmd(String repository) {
+        return new PullImageCmdImpl(getDockerCmdExecFactory().createPullImageCmdExec(),
+                dockerClientConfig.effectiveAuthConfig(repository), repository);
+    }
+
+    @Override
+    public PushImageCmd pushImageCmd(String name) {
+        PushImageCmd cmd = new PushImageCmdImpl(getDockerCmdExecFactory().createPushImageCmdExec(), name);
+
+        AuthConfig cfg = dockerClientConfig.effectiveAuthConfig(name);
+        if (cfg != null)
             cmd.withAuthConfig(cfg);
-          return cmd;
-	}
+        return cmd;
+    }
 
-        @Override
-        public PushImageCmd pushImageCmd(Identifier identifier) {
-          PushImageCmd cmd = pushImageCmd(identifier.repository.name);
-          if( identifier.tag.isPresent() )
+    @Override
+    public PushImageCmd pushImageCmd(Identifier identifier) {
+        PushImageCmd cmd = pushImageCmd(identifier.repository.name);
+        if (identifier.tag.isPresent())
             cmd.withTag(identifier.tag.get());
 
-          AuthConfig cfg = dockerClientConfig.effectiveAuthConfig(identifier.repository.name);
-          if( cfg != null )
+        AuthConfig cfg = dockerClientConfig.effectiveAuthConfig(identifier.repository.name);
+        if (cfg != null)
             cmd.withAuthConfig(cfg);
 
-          return cmd;
-        }
+        return cmd;
+    }
 
-        @Override
+    @Override
     public SaveImageCmd saveImageCmd(String name) {
         return new SaveImageCmdImpl(getDockerCmdExecFactory().createSaveImageCmdExec(), name);
     }
 
-	@Override
-	public CreateImageCmd createImageCmd(String repository,
-			InputStream imageStream) {
-		return new CreateImageCmdImpl(getDockerCmdExecFactory()
-				.createCreateImageCmdExec(), repository, imageStream);
-	}
-
-	@Override
-	public SearchImagesCmd searchImagesCmd(String term) {
-		return new SearchImagesCmdImpl(getDockerCmdExecFactory()
-				.createSearchImagesCmdExec(), term);
-	}
-
-	@Override
-	public RemoveImageCmd removeImageCmd(String imageId) {
-		return new RemoveImageCmdImpl(getDockerCmdExecFactory()
-				.createRemoveImageCmdExec(), imageId);
-	}
-
-	@Override
-	public ListImagesCmd listImagesCmd() {
-		return new ListImagesCmdImpl(getDockerCmdExecFactory()
-				.createListImagesCmdExec());
-	}
-
-	@Override
-	public InspectImageCmd inspectImageCmd(String imageId) {
-		return new InspectImageCmdImpl(getDockerCmdExecFactory()
-				.createInspectImageCmdExec(), imageId);
-	}
-
-	/**
-	 * * CONTAINER API *
-	 */
-
-	@Override
-	public ListContainersCmd listContainersCmd() {
-		return new ListContainersCmdImpl(getDockerCmdExecFactory()
-				.createListContainersCmdExec());
-	}
-
-	@Override
-	public CreateContainerCmd createContainerCmd(String image) {
-		return new CreateContainerCmdImpl(getDockerCmdExecFactory()
-				.createCreateContainerCmdExec(), image);
-	}
-
-	@Override
-	public StartContainerCmd startContainerCmd(String containerId) {
-		return new StartContainerCmdImpl(getDockerCmdExecFactory()
-				.createStartContainerCmdExec(), containerId);
-	}
-
-	@Override
-	public InspectContainerCmd inspectContainerCmd(String containerId) {
-		return new InspectContainerCmdImpl(getDockerCmdExecFactory()
-				.createInspectContainerCmdExec(), containerId);
-	}
+    @Override
+    public CreateImageCmd createImageCmd(String repository, InputStream imageStream) {
+        return new CreateImageCmdImpl(getDockerCmdExecFactory().createCreateImageCmdExec(), repository, imageStream);
+    }
+
+    @Override
+    public SearchImagesCmd searchImagesCmd(String term) {
+        return new SearchImagesCmdImpl(getDockerCmdExecFactory().createSearchImagesCmdExec(), term);
+    }
+
+    @Override
+    public RemoveImageCmd removeImageCmd(String imageId) {
+        return new RemoveImageCmdImpl(getDockerCmdExecFactory().createRemoveImageCmdExec(), imageId);
+    }
+
+    @Override
+    public ListImagesCmd listImagesCmd() {
+        return new ListImagesCmdImpl(getDockerCmdExecFactory().createListImagesCmdExec());
+    }
+
+    @Override
+    public InspectImageCmd inspectImageCmd(String imageId) {
+        return new InspectImageCmdImpl(getDockerCmdExecFactory().createInspectImageCmdExec(), imageId);
+    }
+
+    /**
+     * * CONTAINER API *
+     */
+
+    @Override
+    public ListContainersCmd listContainersCmd() {
+        return new ListContainersCmdImpl(getDockerCmdExecFactory().createListContainersCmdExec());
+    }
+
+    @Override
+    public CreateContainerCmd createContainerCmd(String image) {
+        return new CreateContainerCmdImpl(getDockerCmdExecFactory().createCreateContainerCmdExec(), image);
+    }
+
+    @Override
+    public StartContainerCmd startContainerCmd(String containerId) {
+        return new StartContainerCmdImpl(getDockerCmdExecFactory().createStartContainerCmdExec(), containerId);
+    }
+
+    @Override
+    public InspectContainerCmd inspectContainerCmd(String containerId) {
+        return new InspectContainerCmdImpl(getDockerCmdExecFactory().createInspectContainerCmdExec(), containerId);
+    }
 
     @Override
     public ExecCreateCmd execCreateCmd(String containerId) {
         return new ExecCreateCmdImpl(getDockerCmdExecFactory().createExecCmdExec(), containerId);
     }
 
-	@Override
-	public RemoveContainerCmd removeContainerCmd(String containerId) {
-		return new RemoveContainerCmdImpl(getDockerCmdExecFactory()
-				.createRemoveContainerCmdExec(), containerId);
-	}
+    @Override
+    public RemoveContainerCmd removeContainerCmd(String containerId) {
+        return new RemoveContainerCmdImpl(getDockerCmdExecFactory().createRemoveContainerCmdExec(), containerId);
+    }
 
-	@Override
-	public WaitContainerCmd waitContainerCmd(String containerId) {
-		return new WaitContainerCmdImpl(getDockerCmdExecFactory()
-				.createWaitContainerCmdExec(), containerId);
-	}
+    @Override
+    public WaitContainerCmd waitContainerCmd(String containerId) {
+        return new WaitContainerCmdImpl(getDockerCmdExecFactory().createWaitContainerCmdExec(), containerId);
+    }
 
-	@Override
-	public AttachContainerCmd attachContainerCmd(String containerId) {
-		return new AttachContainerCmdImpl(getDockerCmdExecFactory()
-				.createAttachContainerCmdExec(), containerId);
-	}
+    @Override
+    public AttachContainerCmd attachContainerCmd(String containerId, ResultCallback<Frame> resultCallback) {
+        return new AttachContainerCmdImpl(getDockerCmdExecFactory().createAttachContainerCmdExec(), containerId, resultCallback);
+    }
 
     @Override
     public ExecStartCmd execStartCmd(String containerId) {
@@ -250,114 +299,100 @@ public InspectExecCmd inspectExecCmd(String execId) {
     }
 
     @Override
-	public LogContainerCmd logContainerCmd(String containerId) {
-		return new LogContainerCmdImpl(getDockerCmdExecFactory()
-				.createLogContainerCmdExec(), containerId);
-	}
+    public LogContainerCmd logContainerCmd(String containerId, ResultCallback<Frame> resultCallback) {
+        return new LogContainerCmdImpl(getDockerCmdExecFactory().createLogContainerCmdExec(), containerId, resultCallback);
+    }
 
-	@Override
-	public CopyFileFromContainerCmd copyFileFromContainerCmd(
-			String containerId, String resource) {
-		return new CopyFileFromContainerCmdImpl(getDockerCmdExecFactory()
-				.createCopyFileFromContainerCmdExec(), containerId, resource);
-	}
+    @Override
+    public CopyFileFromContainerCmd copyFileFromContainerCmd(String containerId, String resource) {
+        return new CopyFileFromContainerCmdImpl(getDockerCmdExecFactory().createCopyFileFromContainerCmdExec(),
+                containerId, resource);
+    }
 
-	@Override
-	public ContainerDiffCmd containerDiffCmd(String containerId) {
-		return new ContainerDiffCmdImpl(getDockerCmdExecFactory()
-				.createContainerDiffCmdExec(), containerId);
-	}
+    @Override
+    public ContainerDiffCmd containerDiffCmd(String containerId) {
+        return new ContainerDiffCmdImpl(getDockerCmdExecFactory().createContainerDiffCmdExec(), containerId);
+    }
 
-	@Override
-	public StopContainerCmd stopContainerCmd(String containerId) {
-		return new StopContainerCmdImpl(getDockerCmdExecFactory()
-				.createStopContainerCmdExec(), containerId);
-	}
+    @Override
+    public StopContainerCmd stopContainerCmd(String containerId) {
+        return new StopContainerCmdImpl(getDockerCmdExecFactory().createStopContainerCmdExec(), containerId);
+    }
 
-	@Override
-	public KillContainerCmd killContainerCmd(String containerId) {
-		return new KillContainerCmdImpl(getDockerCmdExecFactory()
-				.createKillContainerCmdExec(), containerId);
-	}
+    @Override
+    public KillContainerCmd killContainerCmd(String containerId) {
+        return new KillContainerCmdImpl(getDockerCmdExecFactory().createKillContainerCmdExec(), containerId);
+    }
 
-	@Override
-	public RestartContainerCmd restartContainerCmd(String containerId) {
-		return new RestartContainerCmdImpl(getDockerCmdExecFactory()
-				.createRestartContainerCmdExec(), containerId);
-	}
+    @Override
+    public RestartContainerCmd restartContainerCmd(String containerId) {
+        return new RestartContainerCmdImpl(getDockerCmdExecFactory().createRestartContainerCmdExec(), containerId);
+    }
 
-	@Override
-	public CommitCmd commitCmd(String containerId) {
-		return new CommitCmdImpl(getDockerCmdExecFactory()
-				.createCommitCmdExec(), containerId);
-	}
+    @Override
+    public CommitCmd commitCmd(String containerId) {
+        return new CommitCmdImpl(getDockerCmdExecFactory().createCommitCmdExec(), containerId);
+    }
 
     @Override
     public BuildImageCmd buildImageCmd() {
-        return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory()
-                .createBuildImageCmdExec()));
+        return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec()));
     }
 
-	@Override
-	public BuildImageCmd buildImageCmd(File dockerFileOrFolder) {
-		return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory()
-				.createBuildImageCmdExec(), dockerFileOrFolder));
-	}
+    @Override
+    public BuildImageCmd buildImageCmd(File dockerFileOrFolder) {
+        return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(),
+                dockerFileOrFolder));
+    }
 
     @Override
     public BuildImageCmd buildImageCmd(InputStream tarInputStream) {
-        return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory()
-				.createBuildImageCmdExec(), tarInputStream));
-    }
-
-	private BuildImageCmd augmentBuildImageCmd(BuildImageCmd buildImageCmd) {
-		final AuthConfigurations authConfigurations = dockerClientConfig.getAuthConfigurations();
-		if (!authConfigurations.getConfigs().isEmpty()) {
-			buildImageCmd.withBuildAuthConfigs(authConfigurations);
-		}
-
-		return buildImageCmd;
-	}
-
-	@Override
-	public TopContainerCmd topContainerCmd(String containerId) {
-		return new TopContainerCmdImpl(getDockerCmdExecFactory()
-				.createTopContainerCmdExec(), containerId);
-	}
-
-	@Override
-	public TagImageCmd tagImageCmd(String imageId, String repository, String tag) {
-		return new TagImageCmdImpl(getDockerCmdExecFactory()
-				.createTagImageCmdExec(), imageId, repository, tag);
-	}
-
-	@Override
-	public PauseContainerCmd pauseContainerCmd(String containerId) {
-		return new PauseContainerCmdImpl(getDockerCmdExecFactory()
-				.createPauseContainerCmdExec(), containerId);
-	}
-
-	@Override
-	public UnpauseContainerCmd unpauseContainerCmd(String containerId) {
-		return new UnpauseContainerCmdImpl(getDockerCmdExecFactory()
-				.createUnpauseContainerCmdExec(), containerId);
-	}
-
-	@Override
-	public EventsCmd eventsCmd(EventStreamCallback eventCallback) {
-		return new EventsCmdImpl(getDockerCmdExecFactory()
-				.createEventsCmdExec(), eventCallback);
-	}
-
-	@Override
-    public StatsCmd statsCmd(StatisticsCallback statisticsCallback) {
-	    return new StatsCmdImpl(getDockerCmdExecFactory()
-	            .createStatsCmdExec(), statisticsCallback);
-	}
-
-	@Override
-	public void close() throws IOException {
-		getDockerCmdExecFactory().close();
-	}
+        return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(),
+                tarInputStream));
+    }
+
+    private BuildImageCmd augmentBuildImageCmd(BuildImageCmd buildImageCmd) {
+        final AuthConfigurations authConfigurations = dockerClientConfig.getAuthConfigurations();
+        if (!authConfigurations.getConfigs().isEmpty()) {
+            buildImageCmd.withBuildAuthConfigs(authConfigurations);
+        }
+
+        return buildImageCmd;
+    }
+
+    @Override
+    public TopContainerCmd topContainerCmd(String containerId) {
+        return new TopContainerCmdImpl(getDockerCmdExecFactory().createTopContainerCmdExec(), containerId);
+    }
+
+    @Override
+    public TagImageCmd tagImageCmd(String imageId, String repository, String tag) {
+        return new TagImageCmdImpl(getDockerCmdExecFactory().createTagImageCmdExec(), imageId, repository, tag);
+    }
+
+    @Override
+    public PauseContainerCmd pauseContainerCmd(String containerId) {
+        return new PauseContainerCmdImpl(getDockerCmdExecFactory().createPauseContainerCmdExec(), containerId);
+    }
+
+    @Override
+    public UnpauseContainerCmd unpauseContainerCmd(String containerId) {
+        return new UnpauseContainerCmdImpl(getDockerCmdExecFactory().createUnpauseContainerCmdExec(), containerId);
+    }
+
+    @Override
+    public EventsCmd eventsCmd(ResultCallback<Event> eventCallback) {
+        return new EventsCmdImpl(getDockerCmdExecFactory().createEventsCmdExec(), eventCallback);
+    }
+
+    @Override
+    public StatsCmd statsCmd(ResultCallback<Statistics> statisticsCallback) {
+        return new StatsCmdImpl(getDockerCmdExecFactory().createStatsCmdExec(), statisticsCallback);
+    }
+
+    @Override
+    public void close() throws IOException {
+        getDockerCmdExecFactory().close();
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java b/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java
new file mode 100644
index 000000000..cc6474d09
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java
@@ -0,0 +1,51 @@
+/*
+ * Created on 23.06.2015
+ */
+package com.github.dockerjava.core.async;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.command.FrameReader;
+
+/**
+ *
+ *
+ * @author marcus
+ *
+ */
+public class FrameStreamProcessor implements ResponseStreamProcessor<Frame> {
+
+    @Override
+    public void processResponseStream(InputStream response, ResultCallback<Frame> resultCallback) {
+        resultCallback.onStart(response);
+
+        FrameReader frameReader = new FrameReader(response);
+        try {
+
+            Frame frame = frameReader.readFrame();
+            while (frame != null) {
+                try {
+                    resultCallback.onResult(frame);
+                } catch (Exception e) {
+                    resultCallback.onError(e);
+                } finally {
+                    frame = frameReader.readFrame();
+                }
+            }
+        } catch (Throwable t) {
+            resultCallback.onError(t);
+        } finally {
+            try {
+                frameReader.close();
+                response.close();
+            } catch (IOException e) {
+                resultCallback.onError(e);
+            } finally {
+                resultCallback.onFinish();
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
new file mode 100644
index 000000000..24d83b129
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
@@ -0,0 +1,59 @@
+/*
+ * Created on 18.06.2015
+ */
+package com.github.dockerjava.core.async;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.async.ResultCallback;
+
+/**
+ *
+ * @author marcus
+ *
+ */
+public class JsonStreamProcessor<T> implements ResponseStreamProcessor<T> {
+
+    private static final JsonFactory JSON_FACTORY = new JsonFactory();
+
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+    private final Class<T> clazz;
+
+    public JsonStreamProcessor(Class<T> clazz) {
+        this.clazz = clazz;
+    }
+
+    @Override
+    public void processResponseStream(InputStream response, ResultCallback<T> resultCallback) {
+
+        resultCallback.onStart(response);
+
+        try {
+            JsonParser jp = JSON_FACTORY.createParser(response);
+            while (!jp.isClosed() && jp.nextToken() != JsonToken.END_OBJECT) {
+                try {
+                    resultCallback.onResult(OBJECT_MAPPER.readValue(jp, clazz));
+                } catch (Exception e) {
+                    resultCallback.onError(e);
+                }
+            }
+        } catch (Throwable t) {
+            resultCallback.onError(t);
+        } finally {
+            try {
+                response.close();
+            } catch (IOException e) {
+                resultCallback.onError(e);
+            } finally {
+                resultCallback.onFinish();
+            }
+        }
+
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java b/src/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java
new file mode 100644
index 000000000..c88575889
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java
@@ -0,0 +1,20 @@
+/*
+ * Created on 18.06.2015
+ */
+package com.github.dockerjava.core.async;
+
+import java.io.InputStream;
+
+import com.github.dockerjava.api.async.ResultCallback;
+
+/**
+ *
+ * @author marcus
+ *
+ */
+public interface ResponseStreamProcessor<T> {
+
+    void processResponseStream(InputStream response,
+            ResultCallback<T> resultCallback);
+
+}
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
new file mode 100644
index 000000000..c98cddf4c
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -0,0 +1,70 @@
+/*
+ * Created on 16.06.2015
+ */
+package com.github.dockerjava.core.async;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import com.github.dockerjava.api.async.ResultCallback;
+
+/**
+ * Template implementation of {@link ResultCallback}
+ *
+ * @author marcus
+ *
+ */
+public class ResultCallbackTemplate<T> implements ResultCallback<T>, Closeable {
+
+    private final CountDownLatch finished = new CountDownLatch(1);
+
+    private Closeable stream;
+
+    @Override
+    public void onStart(Closeable stream) {
+        this.stream = stream;
+    }
+
+    @Override
+    public void onResult(T object) {
+    }
+
+    @Override
+    public void onError(Throwable throwable) {
+        try {
+            throw new RuntimeException(throwable);
+        } finally {
+            try {
+                close();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    @Override
+    public void onFinish() {
+        try {
+            close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void close() throws IOException {
+        if(stream != null)
+            stream.close();
+        finished.countDown();
+    }
+
+    public void awaitFinish() throws InterruptedException {
+        finished.await();
+    }
+
+    public void awaitFinish(long timeout, TimeUnit timeUnit) throws InterruptedException {
+        finished.await(timeout, timeUnit);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
index fc38ae7d9..749f61500 100644
--- a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
@@ -2,17 +2,17 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.InputStream;
-
 import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.AttachContainerCmd;
+import com.github.dockerjava.api.model.Frame;
 
 /**
  * Attach to container
- * 
+ *
  * @param logs
  *            - true or false, includes logs. Defaults to false.
- * 
+ *
  * @param followStream
  *            - true or false, return stream. Defaults to false.
  * @param stdout
@@ -23,17 +23,31 @@
  *            - true or false, if true, print timestamps for every log line.
  *            Defaults to false.
  */
-public class AttachContainerCmdImpl extends	AbstrDockerCmd<AttachContainerCmd, InputStream> implements AttachContainerCmd {
+public class AttachContainerCmdImpl extends	AbstrDockerCmd<AttachContainerCmd, Void> implements AttachContainerCmd {
+
+    private ResultCallback<Frame> resultCallback;
 
 	private String containerId;
 
 	private boolean logs, followStream, timestamps, stdout, stderr;
 
-	public AttachContainerCmdImpl(AttachContainerCmd.Exec exec, String containerId) {
+	public AttachContainerCmdImpl(AttachContainerCmd.Exec exec, String containerId, ResultCallback<Frame> resultCallback) {
 		super(exec);
 		withContainerId(containerId);
+		withResultCallback(resultCallback);
 	}
 
+	public ResultCallback<Frame> getResultCallback() {
+        return resultCallback;
+    }
+
+    @Override
+    public AttachContainerCmd withResultCallback(ResultCallback<Frame> resultCallback) {
+        checkNotNull(resultCallback, "resultCallback was not specified");
+        this.resultCallback = resultCallback;
+        return this;
+    }
+
 	@Override
 	public String getContainerId() {
 		return containerId;
@@ -115,17 +129,17 @@ public AttachContainerCmd withLogs(boolean logs) {
 		this.logs = logs;
 		return this;
 	}
-	
+
 	@Override
 	public AttachContainerCmd withLogs() {
 		return withLogs(true);
 	}
-	
+
 	/**
-	 * @throws NotFoundException No such container 
+	 * @throws NotFoundException No such container
 	 */
 	@Override
-	public InputStream exec() throws NotFoundException {
+	public Void exec() throws NotFoundException {
 		return super.exec();
 	}
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
index 07180bdf9..d1de2e60f 100644
--- a/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
@@ -1,6 +1,8 @@
 package com.github.dockerjava.core.command;
 
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.EventsCmd;
+import com.github.dockerjava.api.model.Event;
 
 /**
  * Stream docker events
@@ -8,12 +10,14 @@
 public class EventsCmdImpl extends AbstrDockerCmd<EventsCmd, Void> implements EventsCmd {
 
     private String since;
+
     private String until;
-    private EventStreamCallback eventCallback;
 
-    public EventsCmdImpl(EventsCmd.Exec exec, EventStreamCallback eventCallback) {
+    private ResultCallback<Event> resultCallback;
+
+    public EventsCmdImpl(EventsCmd.Exec exec, ResultCallback<Event> resultCallback) {
         super(exec);
-        withEventCallback(eventCallback);
+        withResultCallback(resultCallback);
     }
 
     @Override
@@ -27,10 +31,10 @@ public EventsCmd withUntil(String until) {
         this.until = until;
         return this;
     }
-    
+
     @Override
-    public EventsCmd withEventCallback(EventStreamCallback eventCallback) {
-        this.eventCallback = eventCallback;
+    public EventsCmd withResultCallback(ResultCallback<Event> resultCallback) {
+        this.resultCallback = resultCallback;
         return this;
     }
 
@@ -45,20 +49,13 @@ public String getUntil() {
     }
 
     @Override
-    public EventStreamCallback getEventCallback() {
-        return eventCallback;
+    public ResultCallback<Event> getResultCallback() {
+        return resultCallback;
     }
 
-//    @Override
-//    public InputStream exec() {
-//        return super.exec();
-//    }
-
     @Override
     public String toString() {
-        return new StringBuilder("events")
-                .append(since != null ? " --since=" + since : "")
-                .append(until != null ? " --until=" + until : "")
-                .toString();
+        return new StringBuilder("events").append(since != null ? " --since=" + since : "")
+                .append(until != null ? " --until=" + until : "").toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
index d405a8026..bd518ddb7 100644
--- a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -3,9 +3,12 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.InputStream;
+import java.util.concurrent.Future;
 
 import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.LogContainerCmd;
+import com.github.dockerjava.api.model.Frame;
 
 /**
  * Get container logs
@@ -22,7 +25,9 @@
  * @param tail
  * 			  - `all` or `<number>`, Output specified number of lines at the end of logs
  */
-public class LogContainerCmdImpl extends AbstrDockerCmd<LogContainerCmd, InputStream> implements LogContainerCmd {
+public class LogContainerCmdImpl extends AbstrDockerCmd<LogContainerCmd, Void> implements LogContainerCmd {
+
+    private ResultCallback<Frame> resultCallback;
 
 	private String containerId;
 
@@ -30,9 +35,10 @@ public class LogContainerCmdImpl extends AbstrDockerCmd<LogContainerCmd, InputSt
 
 	private boolean followStream, timestamps, stdout, stderr;
 
-	public LogContainerCmdImpl(LogContainerCmd.Exec exec, String containerId) {
+	public LogContainerCmdImpl(LogContainerCmd.Exec exec, String containerId, ResultCallback<Frame> resultCallback) {
 		super(exec);
 		withContainerId(containerId);
+		withResultCallback(resultCallback);
 	}
 
     @Override
@@ -40,6 +46,18 @@ public String getContainerId() {
         return containerId;
     }
 
+    @Override
+    public ResultCallback<Frame> getResultCallback() {
+        return resultCallback;
+    }
+
+    @Override
+    public LogContainerCmd withResultCallback(ResultCallback<Frame> resultCallback) {
+        checkNotNull(resultCallback, "resultCallback was not specified");
+        this.resultCallback = resultCallback;
+        return this;
+    }
+
     @Override
 	public int getTail() {
         return tail;
@@ -82,7 +100,7 @@ public LogContainerCmd withFollowStream(boolean followStream) {
 		this.followStream = followStream;
 		return this;
 	}
-	
+
 	@Override
 	public LogContainerCmd withTimestamps() {
 		return withTimestamps(true);
@@ -137,12 +155,14 @@ public String toString() {
             .append(containerId)
             .toString();
     }
-    
+
     /**
      * @throws NotFoundException No such container
      */
 	@Override
-    public InputStream exec() throws NotFoundException {
+    public Void exec() throws NotFoundException {
     	return super.exec();
     }
+
+
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
index c10f00e57..678a9ef49 100644
--- a/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
@@ -2,20 +2,22 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.StatsCmd;
+import com.github.dockerjava.api.model.Statistics;
 
 /**
- * Stream docker stats
+ * Container stats
  */
 public class StatsCmdImpl extends AbstrDockerCmd<StatsCmd, Void> implements StatsCmd {
 
     private String containerId;
 
-    private StatisticsCallback statisticsCallback;
+    private ResultCallback<Statistics> resultCallback;
 
-    public StatsCmdImpl(StatsCmd.Exec exec, StatisticsCallback statisticsCallback) {
+    public StatsCmdImpl(StatsCmd.Exec exec, ResultCallback<Statistics> resultCallback) {
         super(exec);
-        withStatisticsCallback(statisticsCallback);
+        withResultCallback(resultCallback);
     }
 
     @Override
@@ -31,14 +33,14 @@ public String getContainerId() {
     }
 
     @Override
-    public StatsCmd withStatisticsCallback(StatisticsCallback statisticsCallback) {
-        this.statisticsCallback = statisticsCallback;
+    public StatsCmd withResultCallback(ResultCallback<Statistics> resultCallback) {
+        this.resultCallback = resultCallback;
         return this;
     }
 
     @Override
-    public StatisticsCallback getStatisticsCallback() {
-        return statisticsCallback;
+    public ResultCallback<Statistics> getResultCallback() {
+        return resultCallback;
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
index de4bb3f0c..29f331a2f 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
@@ -1,19 +1,19 @@
 package com.github.dockerjava.jaxrs;
 
-import java.io.InputStream;
-
 import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.command.AttachContainerCmd;
-import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.async.FrameStreamProcessor;
+import com.github.dockerjava.core.async.JsonStreamProcessor;
+import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
+import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
 
 public class AttachContainerCmdExec extends
-		AbstrDockerCmdExec<AttachContainerCmd, InputStream> implements
+		AbstrDockerCmdExec<AttachContainerCmd, Void> implements
 		AttachContainerCmd.Exec {
 
 	private static final Logger LOGGER = LoggerFactory
@@ -24,8 +24,8 @@ public AttachContainerCmdExec(WebTarget baseResource) {
 	}
 
 	@Override
-	protected InputStream execute(AttachContainerCmd command) {
-		WebTarget webResource = getBaseResource()
+	protected Void execute(AttachContainerCmd command) {
+		WebTarget webTarget = getBaseResource()
 				.path("/containers/{id}/attach")
 				.resolveTemplate("id", command.getContainerId())
 				.queryParam("logs", command.hasLogsEnabled() ? "1" : "0")
@@ -35,13 +35,15 @@ protected InputStream execute(AttachContainerCmd command) {
 				.queryParam("stream",
 						command.hasFollowStreamEnabled() ? "1" : "0");
 
-		LOGGER.trace("POST: {}", webResource);
+		LOGGER.trace("POST: {}", webTarget);
+
+		POSTCallbackNotifier<Frame> callbackNotifier = new POSTCallbackNotifier<Frame>(
+                new FrameStreamProcessor(), command.getResultCallback(), webTarget);
+
+        AbstractCallbackNotifier.startAsyncProcessing(callbackNotifier);
+
+        return null;
 
-		Response response = webResource.request()
-				.accept(MediaType.APPLICATION_OCTET_STREAM_TYPE)
-				.post(null, Response.class);
-		
-		return new WrappedResponseInputStream(response);
 	}
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
index aa60ef60a..98b93fd48 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -1,76 +1,37 @@
 package com.github.dockerjava.jaxrs;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
 import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Response;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.model.Event;
-import com.github.dockerjava.jaxrs.util.Streaming;
-
-public class EventsCmdExec extends AbstrDockerCmdExec<EventsCmd, Void>
-		implements EventsCmd.Exec {
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(EventsCmdExec.class);
-
-	public EventsCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected Void execute(EventsCmd command) {
-
-
-		WebTarget webTarget = getBaseResource().path("/events")
-				.queryParam("since", command.getSince())
-				.queryParam("until", command.getUntil());
-
-		LOGGER.trace("GET: {}", webTarget);
-		ExecutorService executorService = Executors.newSingleThreadExecutor();
-		EventNotifier eventNotifier = EventNotifier.create(
-				command.getEventCallback(), webTarget);
-		executorService.submit(eventNotifier);
-		executorService.shutdown();
-
-		return null;
-	}
-
-	private static class EventNotifier implements Callable<Void> {
-
-		private final EventsCmd.EventStreamCallback eventCallback;
-		private final WebTarget webTarget;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.async.JsonStreamProcessor;
+import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
+import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
 
-		private EventNotifier(EventsCmd.EventStreamCallback eventCallback,
-				WebTarget webTarget) {
-			this.eventCallback = eventCallback;
-			this.webTarget = webTarget;
-		}
+public class EventsCmdExec extends AbstrDockerCmdExec<EventsCmd, Void> implements EventsCmd.Exec {
+    private static final Logger LOGGER = LoggerFactory.getLogger(EventsCmdExec.class);
 
-		public static EventNotifier create(EventsCmd.EventStreamCallback eventCallback,
-				WebTarget webTarget) {
-			checkNotNull(eventCallback, "An EventCallback must be provided");
-			checkNotNull(webTarget, "An WebTarget must be provided");
-			return new EventNotifier(eventCallback, webTarget);
-		}
+    public EventsCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-		@Override
-		public Void call() throws Exception {
+    @Override
+    protected Void execute(EventsCmd command) {
 
-			Response response = webTarget.request().get(Response.class);
+        WebTarget webTarget = getBaseResource().path("/events").queryParam("since", command.getSince())
+                .queryParam("until", command.getUntil());
 
-			Streaming.processJsonStream(response, eventCallback, Event.class);
+        LOGGER.trace("GET: {}", webTarget);
 
-			return null;
-		}
-	}
+        GETCallbackNotifier<Event> callbackNotifier = new GETCallbackNotifier<Event>(
+                new JsonStreamProcessor<Event>(Event.class), command.getResultCallback(), webTarget);
 
+        AbstractCallbackNotifier.startAsyncProcessing(callbackNotifier);
 
+        return null;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
index 7d031bddd..a738ef976 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
@@ -1,16 +1,18 @@
 package com.github.dockerjava.jaxrs;
 
-import java.io.InputStream;
-
 import javax.ws.rs.client.WebTarget;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.command.LogContainerCmd;
-import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.async.FrameStreamProcessor;
+import com.github.dockerjava.core.async.JsonStreamProcessor;
+import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
+import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
 
-public class LogContainerCmdExec extends AbstrDockerCmdExec<LogContainerCmd, InputStream> implements LogContainerCmd.Exec {
+public class LogContainerCmdExec extends AbstrDockerCmdExec<LogContainerCmd, Void> implements LogContainerCmd.Exec {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(LogContainerCmdExec.class);
 
@@ -19,8 +21,8 @@ public LogContainerCmdExec(WebTarget baseResource) {
 	}
 
 	@Override
-	protected InputStream execute(LogContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/{id}/logs")
+	protected Void execute(LogContainerCmd command) {
+		WebTarget webTarget = getBaseResource().path("/containers/{id}/logs")
 				.resolveTemplate("id", command.getContainerId())
 				.queryParam("timestamps", command.hasTimestampsEnabled() ? "1" : "0")
 				.queryParam("stdout", command.hasStdoutEnabled() ? "1" : "0")
@@ -28,9 +30,15 @@ protected InputStream execute(LogContainerCmd command) {
 				.queryParam("follow", command.hasFollowStreamEnabled() ? "1" : "0")
 				.queryParam("tail", command.getTail() < 0 ? "all" : "" + command.getTail());
 
-		LOGGER.trace("GET: {}", webResource);
-		
-		return new WrappedResponseInputStream(webResource.request().get());
+		LOGGER.trace("GET: {}", webTarget);
+
+		GETCallbackNotifier<Frame> callbackNotifier = new GETCallbackNotifier<Frame>(
+                new FrameStreamProcessor(), command.getResultCallback(), webTarget);
+
+        AbstractCallbackNotifier.startAsyncProcessing(callbackNotifier);
+
+        return null;
 	}
 
+
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
index 9749a21da..908b2522d 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
@@ -1,21 +1,15 @@
 package com.github.dockerjava.jaxrs;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
 import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Response;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.command.StatsCmd;
-import com.github.dockerjava.api.command.StatsCmd.StatisticsCallback;
 import com.github.dockerjava.api.model.Statistics;
-import com.github.dockerjava.jaxrs.util.Streaming;
+import com.github.dockerjava.core.async.JsonStreamProcessor;
+import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
+import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
 
 public class StatsCmdExec extends AbstrDockerCmdExec<StatsCmd, Void> implements StatsCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(StatsCmdExec.class);
@@ -26,41 +20,17 @@ public StatsCmdExec(WebTarget baseResource) {
 
     @Override
     protected Void execute(StatsCmd command) {
-        ExecutorService executorService = Executors.newSingleThreadExecutor();
-
-        WebTarget webResource = getBaseResource().path("/containers/{id}/stats").resolveTemplate("id",
+        WebTarget webTarget = getBaseResource().path("/containers/{id}/stats").resolveTemplate("id",
                 command.getContainerId());
 
-        LOGGER.trace("GET: {}", webResource);
-        StatsNotifier eventNotifier = StatsNotifier.create(command.getStatisticsCallback(), webResource);
-        executorService.submit(eventNotifier);
-        executorService.shutdown();
-
-        return null;
-    }
+        LOGGER.trace("GET: {}", webTarget);
 
-    private static class StatsNotifier implements Callable<Void> {
-        private final StatisticsCallback statisticsCallback;
-        private final WebTarget webTarget;
+        GETCallbackNotifier<Statistics> callbackNotifier = new GETCallbackNotifier<Statistics>(
+                new JsonStreamProcessor<Statistics>(Statistics.class), command.getResultCallback(), webTarget);
 
-        private StatsNotifier(StatisticsCallback statisticsCallback, WebTarget webTarget) {
-            this.statisticsCallback = statisticsCallback;
-            this.webTarget = webTarget;
-        }
+        AbstractCallbackNotifier.startAsyncProcessing(callbackNotifier);
 
-        public static StatsNotifier create(StatisticsCallback statisticsCallback, WebTarget webTarget) {
-            checkNotNull(statisticsCallback, "An StatsCallback must be provided");
-            checkNotNull(webTarget, "An WebTarget must be provided");
-            return new StatsNotifier(statisticsCallback, webTarget);
-        }
-
-        @Override
-        public Void call() throws Exception {
-            Response response = webTarget.request().get(Response.class);
-
-            Streaming.processJsonStream(response, statisticsCallback, Statistics.class);
-
-            return null;
-        }
+        return null;
     }
+
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java b/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
new file mode 100644
index 000000000..f8baeef98
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
@@ -0,0 +1,78 @@
+/*
+ * Created on 17.06.2015
+ */
+package com.github.dockerjava.jaxrs.async;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.io.InputStream;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Response;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.core.async.ResponseStreamProcessor;
+import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
+
+public abstract class AbstractCallbackNotifier<T> implements Callable<Void> {
+
+    private final ResponseStreamProcessor<T> responseStreamProcessor;
+
+    private final ResultCallback<T> resultCallback;
+
+    protected final WebTarget webTarget;
+
+    protected AbstractCallbackNotifier(ResponseStreamProcessor<T> responseStreamProcessor, ResultCallback<T> resultCallback,
+            WebTarget webTarget) {
+        checkNotNull(webTarget, "An WebTarget must be provided");
+        checkNotNull(responseStreamProcessor, "A ResponseStreamProcessor must be provided");
+        this.responseStreamProcessor = responseStreamProcessor;
+        this.resultCallback = resultCallback;
+        this.webTarget = webTarget;
+    }
+
+    @Override
+    public Void call() throws Exception {
+
+        Response response = null;
+
+        try {
+            response = response();
+        } catch (ProcessingException e) {
+            if (resultCallback != null) {
+                resultCallback.onError(e.getCause());
+            }
+            return null;
+        }
+
+        try {
+            InputStream inputStream = new WrappedResponseInputStream(response);
+
+            if (resultCallback != null)
+                responseStreamProcessor.processResponseStream(inputStream, resultCallback);
+
+            return null;
+        } catch (Exception e) {
+            if (resultCallback != null) {
+                resultCallback.onError(e);
+            }
+
+            return null;
+        }
+    }
+
+    protected abstract Response response();
+
+    public static <T> Future<Void> startAsyncProcessing(AbstractCallbackNotifier<T> callbackNotifier) {
+
+        ExecutorService executorService = Executors.newSingleThreadExecutor();
+        Future<Void> response = executorService.submit(callbackNotifier);
+        executorService.shutdown();
+        return response;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java b/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java
new file mode 100644
index 000000000..cddfe49ed
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java
@@ -0,0 +1,29 @@
+/*
+ * Created on 23.06.2015
+ */
+package com.github.dockerjava.jaxrs.async;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Response;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.core.async.ResponseStreamProcessor;
+
+/**
+ * <TODO: class description>
+ *
+ * @author marcus
+ *
+ */
+public class GETCallbackNotifier<T> extends AbstractCallbackNotifier<T> {
+
+    public GETCallbackNotifier(ResponseStreamProcessor<T> responseStreamProcessor, ResultCallback<T> resultCallback,
+            WebTarget webTarget) {
+        super(responseStreamProcessor, resultCallback, webTarget);
+    }
+
+    protected Response response() {
+        return webTarget.request().get(Response.class);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java b/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java
new file mode 100644
index 000000000..0d380b5db
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java
@@ -0,0 +1,29 @@
+/*
+ * Created on 23.06.2015
+ */
+package com.github.dockerjava.jaxrs.async;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Response;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.core.async.ResponseStreamProcessor;
+
+/**
+ * <TODO: class description>
+ *
+ * @author marcus
+ *
+ */
+public class POSTCallbackNotifier<T> extends AbstractCallbackNotifier<T> {
+
+    public POSTCallbackNotifier(ResponseStreamProcessor<T> responseStreamProcessor, ResultCallback<T> resultCallback,
+            WebTarget webTarget) {
+        super(responseStreamProcessor, resultCallback, webTarget);
+    }
+
+    protected Response response() {
+        return webTarget.request().post(null, Response.class);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/util/Streaming.java b/src/main/java/com/github/dockerjava/jaxrs/util/Streaming.java
deleted file mode 100644
index 73990bf51..000000000
--- a/src/main/java/com/github/dockerjava/jaxrs/util/Streaming.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.github.dockerjava.jaxrs.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.ws.rs.core.Response;
-
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.async.StreamCallback;
-
-public class Streaming {
-	
-	private static final JsonFactory JSON_FACTORY = new JsonFactory();
-	private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-	
-	public static <T> void processJsonStream(Response response,
-			StreamCallback<T> objectStreamCallback, Class<T> clazz) {
-		
-		InputStream inputStream = new WrappedResponseInputStream(
-				response);
-		
-		objectStreamCallback.onStart(inputStream);
-		
-		try {
-			JsonParser jp = JSON_FACTORY.createParser(inputStream);
-			while (!jp.isClosed() && jp.nextToken() != JsonToken.END_OBJECT) {
-				try {
-					objectStreamCallback.onStream(OBJECT_MAPPER.readValue(jp,
-							clazz));
-				} catch (Exception e) {
-					objectStreamCallback.onError(e);
-				}
-			}
-		} catch (Throwable t) {
-			objectStreamCallback.onError(t);
-		} finally {
-			try {
-				inputStream.close();
-			} catch (IOException e) {
-				objectStreamCallback.onError(e);
-			} finally {
-				objectStreamCallback.onFinish();
-			}
-		}
-	}
-	
-
-
-}
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 373680471..9eda0cbc5 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -6,11 +6,13 @@
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumeBind;
 import com.github.dockerjava.core.DockerClientBuilder;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.TestDockerCmdExecFactory;
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
 import com.google.common.base.Joiner;
 
 import org.apache.commons.io.IOUtils;
@@ -187,4 +189,37 @@ public static void assertContainerHasVolumes(InspectContainerResponse inspectCon
 		assertThat(volumes, contains(expectedVolumes));
 	}
 
+	public static class CollectFramesCallback extends ResultCallbackTemplate<Frame> {
+        public final List<Frame> frames = new ArrayList<Frame>();
+        private final StringBuffer log = new StringBuffer();
+
+        @Override
+        public void onError(Throwable throwable) {
+            throwable.printStackTrace();
+            super.onError(throwable);
+        }
+
+        @Override
+        public void onResult(Frame frame) {
+            frames.add(frame);
+            log.append(new String(frame.getPayload()).trim());
+        }
+
+        @Override
+        public String toString() {
+            return log.toString();
+        }
+    }
+
+	protected String containerLog(String containerId) throws Exception {
+
+        CollectFramesCallback collectFramesCallback = new CollectFramesCallback();
+
+        dockerClient.logContainerCmd(containerId, collectFramesCallback).withStdOut().exec();
+
+        collectFramesCallback.awaitFinish();
+
+        return collectFramesCallback.toString();
+    }
+
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
new file mode 100644
index 000000000..dec4a3b3b
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
@@ -0,0 +1,70 @@
+package com.github.dockerjava.core.command;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.endsWith;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+import java.lang.reflect.Method;
+import java.util.concurrent.TimeUnit;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class AttachContainerCmdImplTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void attachContainer() throws Exception {
+
+        String snippet = "hello world";
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top").exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        CollectFramesCallback collectFramesCallback = new CollectFramesCallback();
+
+        dockerClient.attachContainerCmd(container.getId(), collectFramesCallback).withStdErr().withStdOut()
+                .withFollowStream().withLogs().exec();
+
+        collectFramesCallback.awaitFinish(10, TimeUnit.SECONDS);
+
+        collectFramesCallback.close();
+
+        // LOG.info("resonse: " + log);
+
+        assertThat(collectFramesCallback.toString(), endsWith(snippet));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index c9bd51b90..a94209fea 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -19,7 +19,6 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.TrueFileFilter;
 import org.apache.commons.lang.StringUtils;
-
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -59,7 +58,7 @@ public void beforeMethod(Method method) {
 	public void afterMethod(ITestResult result) {
 		super.afterMethod(result);
 	}
-	
+
 	@Test
 	public void testNginxDockerfileBuilder() {
 		File baseDir = new File(Thread.currentThread().getContextClassLoader()
@@ -77,7 +76,7 @@ public void testNginxDockerfileBuilder() {
 				.inspectImageCmd(imageId).exec();
 		assertThat(inspectImageResponse, not(nullValue()));
 		LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-		
+
 		assertThat(inspectImageResponse.getAuthor(),
 				equalTo("Guillaume J. Charmes \"guillaume@dotcloud.com\""));
 	}
@@ -112,7 +111,7 @@ public void testNonstandard2() {
     }
 
     @Test
-    public void testDockerBuilderFromTar() throws IOException {
+    public void testDockerBuilderFromTar() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddFile").getFile());
         Collection<File> files = FileUtils.listFiles(baseDir, TrueFileFilter.INSTANCE, TrueFileFilter.INSTANCE);
         File tarFile = CompressArchiveUtil.archiveTARFiles(baseDir, files, UUID.randomUUID().toString());
@@ -121,7 +120,7 @@ public void testDockerBuilderFromTar() throws IOException {
     }
 
     @Test
-	public void testDockerBuilderAddUrl()  {
+	public void testDockerBuilderAddUrl() throws Exception {
 		File baseDir = new File(Thread.currentThread().getContextClassLoader()
 				.getResource("testAddUrl").getFile());
 		String response = dockerfileBuild(baseDir);
@@ -129,17 +128,15 @@ public void testDockerBuilderAddUrl()  {
 	}
 
 	@Test
-	public void testDockerBuilderAddFileInSubfolder() throws DockerException,
-			IOException {
+	public void testDockerBuilderAddFileInSubfolder() throws Exception {
 		File baseDir = new File(Thread.currentThread().getContextClassLoader()
 				.getResource("testAddFileInSubfolder").getFile());
 		String response = dockerfileBuild(baseDir);
 		assertThat(response, containsString("Successfully executed testrun.sh"));
 	}
-	
+
 	@Test
-	public void testDockerBuilderAddFilesViaWildcard() throws DockerException,
-			IOException {
+	public void testDockerBuilderAddFilesViaWildcard() throws Exception {
 		File baseDir = new File(Thread.currentThread().getContextClassLoader()
 				.getResource("testAddFilesViaWildcard").getFile());
 		String response = dockerfileBuild(baseDir);
@@ -148,32 +145,30 @@ public void testDockerBuilderAddFilesViaWildcard() throws DockerException,
 	}
 
 	@Test
-	public void testDockerBuilderAddFolder() throws DockerException,
-			IOException {
+	public void testDockerBuilderAddFolder() throws Exception {
 		File baseDir = new File(Thread.currentThread().getContextClassLoader()
 				.getResource("testAddFolder").getFile());
 		String response = dockerfileBuild(baseDir);
 		assertThat(response, containsString("Successfully executed testAddFolder.sh"));
 	}
-	
+
 	@Test
-	public void testDockerBuilderEnv() throws DockerException,
-			IOException {
+	public void testDockerBuilderEnv() throws Exception {
 		File baseDir = new File(Thread.currentThread().getContextClassLoader()
 				.getResource("testEnv").getFile());
 		String response = dockerfileBuild(baseDir);
 		assertThat(response, containsString("Successfully executed testrun.sh"));
 	}
 
-    private String dockerfileBuild(InputStream tarInputStream) {
+    private String dockerfileBuild(InputStream tarInputStream) throws Exception {
         return execBuild(dockerClient.buildImageCmd().withTarInputStream(tarInputStream));
     }
 
-    private String dockerfileBuild(File baseDir) {
+    private String dockerfileBuild(File baseDir) throws Exception {
         return execBuild(dockerClient.buildImageCmd(baseDir));
 	}
 
-    private String execBuild(BuildImageCmd buildImageCmd) {
+    private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
         // Build image
         InputStream response = buildImageCmd.withNoCache().exec();
 
@@ -191,17 +186,11 @@ private String execBuild(BuildImageCmd buildImageCmd) {
         dockerClient.startContainerCmd(container.getId()).exec();
         dockerClient.waitContainerCmd(container.getId()).exec();
 
-        // Log container
-        InputStream logResponse = logContainer(container.getId());
-
-        //assertThat(asString(logResponse), containsString(expectedText));
+        return containerLog(container.getId());
 
-        return asString(logResponse);
     }
 
-	private InputStream logContainer(String containerId) {
-		return dockerClient.logContainerCmd(containerId).withStdErr().withStdOut().exec();
-	}
+
 
 	@Test(expectedExceptions={DockerClientException.class})
 	public void testDockerfileIgnored() {
@@ -218,8 +207,7 @@ public void testInvalidDockerIgnorePattern() {
 		}
 
 	@Test(groups = "ignoreInCircleCi")
-	public void testDockerIgnore() throws DockerException,
-			IOException {
+	public void testDockerIgnore() throws Exception {
 		File baseDir = new File(Thread.currentThread().getContextClassLoader()
 				.getResource("testDockerignore").getFile());
 		String response = dockerfileBuild(baseDir);
@@ -242,7 +230,7 @@ public void testNetCatDockerfileBuilder() throws InterruptedException, IOExcepti
 				"Successfully built ", "\n").trim();
                   }
                 }
-		
+
 		assertNotNull(imageId, "Not successful in build");
 
 
@@ -251,12 +239,12 @@ public void testNetCatDockerfileBuilder() throws InterruptedException, IOExcepti
 		assertThat(inspectImageResponse, not(nullValue()));
 		assertThat(inspectImageResponse.getId(), not(nullValue()));
 		LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-		
+
 		CreateContainerResponse container = dockerClient.createContainerCmd(
 				inspectImageResponse.getId()).exec();
 		assertThat(container.getId(), not(isEmptyString()));
 		dockerClient.startContainerCmd(container.getId()).exec();
-		
+
 		InspectContainerResponse inspectContainerResponse = dockerClient
 				.inspectContainerCmd(container.getId()).exec();
 
@@ -275,7 +263,7 @@ public void testNetCatDockerfileBuilder() throws InterruptedException, IOExcepti
 	}
 
 	@Test
-	public void testAddAndCopySubstitution () throws DockerException, IOException {
+	public void testAddAndCopySubstitution () throws Exception {
 			File baseDir = new File(Thread.currentThread().getContextClassLoader()
 					.getResource("testENVSubstitution").getFile());
 			String response = dockerfileBuild(baseDir);
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index c652f51d7..94d4cff62 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -23,153 +23,138 @@
 @Test(groups = "integration")
 public class CreateContainerCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
 
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
 
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
 
-	@Test
-	public void createContainerWithExistingName() throws DockerException {
+    @Test
+    public void createContainerWithExistingName() throws DockerException {
 
-		String containerName = "generated_" + new SecureRandom().nextInt();
+        String containerName = "generated_" + new SecureRandom().nextInt();
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("env")
-				.withName(containerName).exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("env")
+                .withName(containerName).exec();
 
-		LOG.info("Created container {}", container.toString());
+        LOG.info("Created container {}", container.toString());
 
-		assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(isEmptyString()));
 
-		try {
-			dockerClient.createContainerCmd("busybox").withCmd("env")
-					.withName(containerName).exec();
-			fail("expected ConflictException");
-		} catch (ConflictException e) {
-		}
-	}
+        try {
+            dockerClient.createContainerCmd("busybox").withCmd("env").withName(containerName).exec();
+            fail("expected ConflictException");
+        } catch (ConflictException e) {
+        }
+    }
 
-	@Test
-	public void createContainerWithVolume() throws DockerException {
+    @Test
+    public void createContainerWithVolume() throws DockerException {
 
-		Volume volume = new Volume("/var/log");
-		
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox")
-				.withVolumes(volume).withCmd("true").exec();
+        Volume volume = new Volume("/var/log");
 
-		LOG.info("Created container {}", container.toString());
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withVolumes(volume)
+                .withCmd("true").exec();
 
-		assertThat(container.getId(), not(isEmptyString()));
+        LOG.info("Created container {}", container.toString());
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        assertThat(container.getId(), not(isEmptyString()));
 
-		LOG.info("Inspect container {}", inspectContainerResponse.getConfig()
-				.getVolumes());
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(),
-				contains("/var/log"));
-		
-		assertThat(inspectContainerResponse.getVolumesRW(),
-				hasItemInArray(new VolumeRW(volume, AccessMode.rw)));
-	}
-	
-	@Test
-	public void createContainerWithReadOnlyVolume() throws DockerException {
+        LOG.info("Inspect container {}", inspectContainerResponse.getConfig().getVolumes());
 
-		Volume volume = new Volume("/srv/test");
-		
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox")
-				.withVolumes(volume)
-				.withCmd("true")
-				.exec();
+        assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(), contains("/var/log"));
 
-		LOG.info("Created container {}", container.toString());
+        assertThat(inspectContainerResponse.getVolumesRW(), hasItemInArray(new VolumeRW(volume, AccessMode.rw)));
+    }
 
-		assertThat(container.getId(), not(isEmptyString()));
+    @Test
+    public void createContainerWithReadOnlyVolume() throws DockerException {
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        Volume volume = new Volume("/srv/test");
 
-		LOG.info("Inspect container {}", inspectContainerResponse.getConfig()
-				.getVolumes());
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withVolumes(volume)
+                .withCmd("true").exec();
 
-		assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(),
-				contains("/srv/test"));
-		
-		assertThat(Arrays.asList(inspectContainerResponse.getVolumesRW()),
-				contains(new VolumeRW(volume)));
-	}
-	
-	@Test
-	public void createContainerWithVolumesFrom() throws DockerException {
-
-		Volume volume1 = new Volume("/opt/webapp1");
-		Volume volume2 = new Volume("/opt/webapp2");
-
-		String container1Name = UUID.randomUUID().toString();
-		
-		// create a running container with bind mounts
-		CreateContainerResponse container1 = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999")
-				.withName(container1Name)
-				.withBinds(new Bind("/src/webapp1", volume1), new Bind("/src/webapp2", volume2))
-				.exec();
-		LOG.info("Created container1 {}", container1.toString());
-
-		dockerClient.startContainerCmd(container1.getId()).exec();
-		LOG.info("Started container1 {}", container1.toString());
-
-		InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(
-				container1.getId()).exec();
-
-		assertContainerHasVolumes(inspectContainerResponse1, volume1, volume2);
-
-		// create a second container with volumes from first container
-		CreateContainerResponse container2 = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999")
-				.withVolumesFrom(new VolumesFrom(container1Name)).exec();
-		LOG.info("Created container2 {}", container2.toString());
-
-		InspectContainerResponse inspectContainerResponse2 = dockerClient
-				.inspectContainerCmd(container2.getId()).exec();
-
-		// No volumes are created, the information is just stored in .HostConfig.VolumesFrom
-		assertThat(inspectContainerResponse2.getHostConfig().getVolumesFrom(), hasItemInArray(new VolumesFrom(container1Name)));
-
-		// To ensure that the information stored in VolumesFrom really is considered
-		// when starting the container, we start it and verify that it has the same 
-		// bind mounts as the first container.
-		// This is somehow out of scope here, but it helped me to understand how the
-		// VolumesFrom feature really works.
-		dockerClient.startContainerCmd(container2.getId()).exec();
-		LOG.info("Started container2 {}", container2.toString());
-		
-		inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId()).exec();
-
-		assertThat(inspectContainerResponse2.getHostConfig().getVolumesFrom(), hasItemInArray(new VolumesFrom(container1Name)));
-		assertContainerHasVolumes(inspectContainerResponse2, volume1, volume2);
-	}
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        LOG.info("Inspect container {}", inspectContainerResponse.getConfig().getVolumes());
+
+        assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(), contains("/srv/test"));
+
+        assertThat(Arrays.asList(inspectContainerResponse.getVolumesRW()), contains(new VolumeRW(volume)));
+    }
+
+    @Test
+    public void createContainerWithVolumesFrom() throws DockerException {
+
+        Volume volume1 = new Volume("/opt/webapp1");
+        Volume volume2 = new Volume("/opt/webapp2");
+
+        String container1Name = UUID.randomUUID().toString();
+
+        // create a running container with bind mounts
+        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName(container1Name)
+                .withBinds(new Bind("/src/webapp1", volume1), new Bind("/src/webapp2", volume2)).exec();
+        LOG.info("Created container1 {}", container1.toString());
+
+        dockerClient.startContainerCmd(container1.getId()).exec();
+        LOG.info("Started container1 {}", container1.toString());
+
+        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+                .exec();
+
+        assertContainerHasVolumes(inspectContainerResponse1, volume1, volume2);
+
+        // create a second container with volumes from first container
+        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withVolumesFrom(new VolumesFrom(container1Name)).exec();
+        LOG.info("Created container2 {}", container2.toString());
+
+        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+                .exec();
+
+        // No volumes are created, the information is just stored in .HostConfig.VolumesFrom
+        assertThat(inspectContainerResponse2.getHostConfig().getVolumesFrom(), hasItemInArray(new VolumesFrom(
+                container1Name)));
 
-	@Test
-	public void createContainerWithEnv() throws DockerException {
+        // To ensure that the information stored in VolumesFrom really is considered
+        // when starting the container, we start it and verify that it has the same
+        // bind mounts as the first container.
+        // This is somehow out of scope here, but it helped me to understand how the
+        // VolumesFrom feature really works.
+        dockerClient.startContainerCmd(container2.getId()).exec();
+        LOG.info("Started container2 {}", container2.toString());
+
+        inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId()).exec();
+
+        assertThat(inspectContainerResponse2.getHostConfig().getVolumesFrom(), hasItemInArray(new VolumesFrom(
+                container1Name)));
+        assertContainerHasVolumes(inspectContainerResponse2, volume1, volume2);
+    }
+
+    @Test
+	public void createContainerWithEnv() throws Exception {
 
 		CreateContainerResponse container = dockerClient
 				.createContainerCmd("busybox").withEnv("VARIABLE=success")
@@ -188,381 +173,324 @@ public void createContainerWithEnv() throws DockerException {
 
 		dockerClient.startContainerCmd(container.getId()).exec();
 
-		assertThat(asString(dockerClient.logContainerCmd(container.getId())
-				.withStdOut().exec()), containsString("VARIABLE=success"));
+		assertThat(containerLog(container.getId()), containsString("VARIABLE=success"));
 	}
 
-	@Test
-	public void createContainerWithHostname() throws DockerException {
+    @Test
+    public void createContainerWithHostname() throws Exception {
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withHostName("docker-java")
-				.withCmd("env").exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withHostName("docker-java")
+                .withCmd("env").exec();
 
-		LOG.info("Created container {}", container.toString());
+        LOG.info("Created container {}", container.toString());
 
-		assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(isEmptyString()));
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		assertThat(inspectContainerResponse.getConfig().getHostName(),
-				equalTo("docker-java"));
+        assertThat(inspectContainerResponse.getConfig().getHostName(), equalTo("docker-java"));
 
-		dockerClient.startContainerCmd(container.getId()).exec();
+        dockerClient.startContainerCmd(container.getId()).exec();
 
-		assertThat(asString(dockerClient.logContainerCmd(container.getId())
-				.withStdOut().exec()), containsString("HOSTNAME=docker-java"));
-	}
+        assertThat(containerLog(container.getId()),
+                containsString("HOSTNAME=docker-java"));
+    }
 
-	@Test
-	public void createContainerWithName() throws DockerException {
+    @Test
+    public void createContainerWithName() throws DockerException {
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withName("container")
-				.withCmd("env").exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
+                .withCmd("env").exec();
 
-		LOG.info("Created container {}", container.toString());
+        LOG.info("Created container {}", container.toString());
 
-		assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(isEmptyString()));
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		assertThat(inspectContainerResponse.getName(), equalTo("/container"));
+        assertThat(inspectContainerResponse.getName(), equalTo("/container"));
 
-		try {
-			dockerClient.createContainerCmd("busybox").withName("container")
-					.withCmd("env").exec();
-			fail("Expected ConflictException");
-		} catch (ConflictException e) {
-		}
+        try {
+            dockerClient.createContainerCmd("busybox").withName("container").withCmd("env").exec();
+            fail("Expected ConflictException");
+        } catch (ConflictException e) {
+        }
 
-	}
-	
-	@Test
-	public void createContainerWithLink() throws DockerException {
-	    
-		CreateContainerResponse container1 = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999").withName("container1").exec();
-		LOG.info("Created container1 {}", container1.toString());
-		assertThat(container1.getId(), not(isEmptyString()));
-		
-		dockerClient.startContainerCmd(container1.getId()).exec();
-
-		InspectContainerResponse inspectContainerResponse1 = dockerClient
-				.inspectContainerCmd(container1.getId()).exec();
-		LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
-		assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
-
-		HostConfig hostConfig = new HostConfig();
-		hostConfig.setLinks(new Link("container1", "container1Link"));
-		CreateContainerResponse container2 = dockerClient
-				.createContainerCmd("busybox").withName("container2").withHostConfig(hostConfig)
-				.withCmd("env").exec();
-		LOG.info("Created container {}", container2.toString());
-		assertThat(container2.getId(), not(isEmptyString()));
+    }
 
-		InspectContainerResponse inspectContainerResponse2 = dockerClient
-				.inspectContainerCmd(container2.getId()).exec();
-		assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link("container1","container1Link")}));
-	}
+    @Test
+    public void createContainerWithLink() throws DockerException {
 
-	@Test
-	public void createContainerWithCapAddAndCapDrop() throws DockerException {
+        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName("container1").exec();
+        LOG.info("Created container1 {}", container1.toString());
+        assertThat(container1.getId(), not(isEmptyString()));
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox")
-				.withCapAdd(NET_ADMIN)
-				.withCapDrop(MKNOD).exec();
+        dockerClient.startContainerCmd(container1.getId()).exec();
 
-		LOG.info("Created container {}", container.toString());
+        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+                .exec();
+        LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
+        assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
 
-		assertThat(container.getId(), not(isEmptyString()));
+        HostConfig hostConfig = new HostConfig();
+        hostConfig.setLinks(new Link("container1", "container1Link"));
+        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withName("container2")
+                .withHostConfig(hostConfig).withCmd("env").exec();
+        LOG.info("Created container {}", container2.toString());
+        assertThat(container2.getId(), not(isEmptyString()));
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+                .exec();
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
+                "container1Link") }));
+    }
 
-		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig()
-				.getCapAdd()), contains(NET_ADMIN));
+    @Test
+    public void createContainerWithCapAddAndCapDrop() throws DockerException {
 
-		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig()
-				.getCapDrop()), contains(MKNOD));
-	}
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCapAdd(NET_ADMIN)
+                .withCapDrop(MKNOD).exec();
 
-	@Test
-	public void createContainerWithDns() throws DockerException {
+        LOG.info("Created container {}", container.toString());
 
-		String aDnsServer = "8.8.8.8";
-		String anotherDnsServer = "8.8.4.4";
+        assertThat(container.getId(), not(isEmptyString()));
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox")
-				.withCmd("true").withDns(aDnsServer, anotherDnsServer).exec();
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		LOG.info("Created container {}", container.toString());
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getCapAdd()), contains(NET_ADMIN));
 
-		assertThat(container.getId(), not(isEmptyString()));
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getCapDrop()), contains(MKNOD));
+    }
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+    @Test
+    public void createContainerWithDns() throws DockerException {
 
-		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()),
-				contains(aDnsServer, anotherDnsServer));
-	}
-	
-	@Test
-	public void createContainerWithEntrypoint() throws DockerException {
+        String aDnsServer = "8.8.8.8";
+        String anotherDnsServer = "8.8.4.4";
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withName("container")
-				.withEntrypoint("sleep", "9999").exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withDns(aDnsServer, anotherDnsServer).exec();
 
-		LOG.info("Created container {}", container.toString());
+        LOG.info("Created container {}", container.toString());
 
-		assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(isEmptyString()));
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEntrypoint()), contains("sleep", "9999"));
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()),
+                contains(aDnsServer, anotherDnsServer));
+    }
 
-	}
+    @Test
+    public void createContainerWithEntrypoint() throws DockerException {
 
-	@Test
-	public void createContainerWithExtraHosts() throws DockerException {
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
+                .withEntrypoint("sleep", "9999").exec();
 
-		String[] extraHosts = {"dockerhost:127.0.0.1", "otherhost:10.0.0.1"};
+        LOG.info("Created container {}", container.toString());
 
-		HostConfig hostConfig = new HostConfig();
-		hostConfig.setExtraHosts(extraHosts);
+        assertThat(container.getId(), not(isEmptyString()));
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withName("container")
-				.withHostConfig(hostConfig).exec();
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		LOG.info("Created container {}", container.toString());
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEntrypoint()), contains("sleep", "9999"));
 
-		assertThat(container.getId(), not(isEmptyString()));
+    }
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+    @Test
+    public void createContainerWithExtraHosts() throws DockerException {
 
-		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getExtraHosts()),
-				containsInAnyOrder("dockerhost:127.0.0.1", "otherhost:10.0.0.1"));
-	}
-	
-	@Test
-	public void createContainerWithDevices() throws DockerException {
+        String[] extraHosts = { "dockerhost:127.0.0.1", "otherhost:10.0.0.1" };
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999")
-				.withDevices(new Device("rwm", "/dev/nulo", "/dev/zero"))
-				.exec();
+        HostConfig hostConfig = new HostConfig();
+        hostConfig.setExtraHosts(extraHosts);
 
-		LOG.info("Created container {}", container.toString());
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
+                .withHostConfig(hostConfig).exec();
 
-		assertThat(container.getId(), not(isEmptyString()));
+        LOG.info("Created container {}", container.toString());
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        assertThat(container.getId(), not(isEmptyString()));
 
-		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig()
-				.getDevices()), contains(new Device("rwm", "/dev/nulo",
-				"/dev/zero")));
-	}
-	
-	@Test
-	public void createContainerWithPortBindings() throws DockerException {
-
-		ExposedPort tcp22 = ExposedPort.tcp(22);
-		ExposedPort tcp23 = ExposedPort.tcp(23);
-		
-		Ports portBindings = new Ports();
-		portBindings.bind(tcp22, Ports.Binding(11022));
-		portBindings.bind(tcp23, Ports.Binding(11023));
-		portBindings.bind(tcp23, Ports.Binding(11024));
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("true")
-				.withExposedPorts(tcp22, tcp23)
-				.withPortBindings(portBindings)
-				.exec();
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getExtraHosts()),
+                containsInAnyOrder("dockerhost:127.0.0.1", "otherhost:10.0.0.1"));
+    }
 
-		LOG.info("Created container {}", container.toString());
+    @Test
+    public void createContainerWithDevices() throws DockerException {
 
-		assertThat(container.getId(), not(isEmptyString()));
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withDevices(new Device("rwm", "/dev/nulo", "/dev/zero")).exec();
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Created container {}", container.toString());
 
-		assertThat(Arrays.asList(inspectContainerResponse.getConfig()
-				.getExposedPorts()), contains(tcp22, tcp23));
+        assertThat(container.getId(), not(isEmptyString()));
 
-		assertThat(inspectContainerResponse.getHostConfig().getPortBindings()
-				.getBindings().get(tcp22)[0], is(equalTo(Ports.Binding(11022))));
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		assertThat(inspectContainerResponse.getHostConfig().getPortBindings()
-				.getBindings().get(tcp23)[0], is(equalTo(Ports.Binding(11023))));
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDevices()), contains(new Device("rwm",
+                "/dev/nulo", "/dev/zero")));
+    }
 
-		assertThat(inspectContainerResponse.getHostConfig().getPortBindings()
-				.getBindings().get(tcp23)[1], is(equalTo(Ports.Binding(11024))));
+    @Test
+    public void createContainerWithPortBindings() throws DockerException {
 
-	}
-	
-	@Test
-	public void createContainerWithLinking() throws DockerException {
-
-		CreateContainerResponse container1 = dockerClient
-				.createContainerCmd("busybox")
-				.withCmd("sleep", "9999")
-				.withName("container1").exec();
-
-		LOG.info("Created container1 {}", container1.toString());
-		assertThat(container1.getId(), not(isEmptyString()));
-
-		dockerClient.startContainerCmd(container1.getId()).exec();
-
-		InspectContainerResponse inspectContainerResponse1 = dockerClient
-				.inspectContainerCmd(container1.getId()).exec();
-		LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
-
-		assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
-		assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
-		assertThat(inspectContainerResponse1.getId(),
-				startsWith(container1.getId()));
-		assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
-		assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
-		assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
-		assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
-
-		if (!inspectContainerResponse1.getState().isRunning()) {
-			assertThat(inspectContainerResponse1.getState().getExitCode(),
-					is(equalTo(0)));
-		}
-
-		CreateContainerResponse container2 = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999")
-				.withName("container2")
-				.withLinks(new Link("container1", "container1Link"))
-				.exec();
-
-		LOG.info("Created container2 {}", container2.toString());
-		assertThat(container2.getId(), not(isEmptyString()));
-		
-		InspectContainerResponse inspectContainerResponse2 = dockerClient
-				.inspectContainerCmd(container2.getId()).exec();
-		LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
-
-		assertThat(inspectContainerResponse2.getConfig(), is(notNullValue()));
-		assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
-		assertThat(inspectContainerResponse2.getHostConfig(),
-				is(notNullValue()));
-		assertThat(inspectContainerResponse2.getHostConfig().getLinks(),
-				is(notNullValue()));
-		assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
-				"container1Link") }));
-		assertThat(inspectContainerResponse2.getId(),
-				startsWith(container2.getId()));
-		assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
-		assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
-		
+        ExposedPort tcp22 = ExposedPort.tcp(22);
+        ExposedPort tcp23 = ExposedPort.tcp(23);
 
-	}
-	
-	@Test
-	public void createContainerWithRestartPolicy() throws DockerException {
+        Ports portBindings = new Ports();
+        portBindings.bind(tcp22, Ports.Binding(11022));
+        portBindings.bind(tcp23, Ports.Binding(11023));
+        portBindings.bind(tcp23, Ports.Binding(11024));
 
-		RestartPolicy restartPolicy = RestartPolicy.onFailureRestart(5);
-		
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox")
-				.withCmd("sleep", "9999")
-				.withRestartPolicy(restartPolicy)
-				.exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
 
-		LOG.info("Created container {}", container.toString());
+        LOG.info("Created container {}", container.toString());
 
-		assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(isEmptyString()));
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		assertThat(inspectContainerResponse.getHostConfig().getRestartPolicy(),
-				is(equalTo(restartPolicy)));
-	}
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
-	/**
-	 * This tests support for --net option for the docker run command:
-	 * --net="bridge" Set the Network mode for the container 'bridge': creates a
-	 * new network stack for the container on the docker bridge 'none': no
-	 * networking for this container 'container:': reuses another container
-	 * network stack 'host': use the host network stack inside the container.
-	 * Note: the host mode gives the container full access to local system
-	 * services such as D-bus and is therefore considered insecure.
-	 */
-	@Test
-	public void createContainerWithNetworkMode() throws DockerException {
+        assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
+                is(equalTo(Ports.Binding(11022))));
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox")
-				.withCmd("true")
-				.withNetworkMode("host")
-				.exec();
+        assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
+                is(equalTo(Ports.Binding(11023))));
 
-		LOG.info("Created container {}", container.toString());
+        assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
+                is(equalTo(Ports.Binding(11024))));
 
-		assertThat(container.getId(), not(isEmptyString()));
+    }
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+    @Test
+    public void createContainerWithLinking() throws DockerException {
 
-		assertThat(inspectContainerResponse.getHostConfig().getNetworkMode(),
-				is(equalTo("host")));
-	}
-	
-	@Test
-	public void createContainerWithMacAddress() throws DockerException {
+        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName("container1").exec();
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox")
-				.withMacAddress("00:80:41:ae:fd:7e")
-				.withCmd("true")
-				.exec();
+        LOG.info("Created container1 {}", container1.toString());
+        assertThat(container1.getId(), not(isEmptyString()));
 
-		LOG.info("Created container {}", container.toString());
+        dockerClient.startContainerCmd(container1.getId()).exec();
 
-		assertThat(container.getId(), not(isEmptyString()));
+        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+                .exec();
+        LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId()));
+        assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
+        assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
+        assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
 
-		assertEquals(inspectContainerResponse.getConfig().getMacAddress(),
-				"00:80:41:ae:fd:7e");
-	}
+        if (!inspectContainerResponse1.getState().isRunning()) {
+            assertThat(inspectContainerResponse1.getState().getExitCode(), is(equalTo(0)));
+        }
 
-	@Test(groups = "ignoreInCircleCi")
-	public void createContainerWithULimits() throws DockerException {
+        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName("container2").withLinks(new Link("container1", "container1Link")).exec();
 
-		Ulimit[] ulimits = {new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096)};
+        LOG.info("Created container2 {}", container2.toString());
+        assertThat(container2.getId(), not(isEmptyString()));
 
-		HostConfig hostConfig = new HostConfig();
-		hostConfig.setUlimits(ulimits);
+        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+                .exec();
+        LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withName("container")
-				.withHostConfig(hostConfig).exec();
+        assertThat(inspectContainerResponse2.getConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
+                "container1Link") }));
+        assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
+        assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
+        assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
 
-		LOG.info("Created container {}", container.toString());
+    }
 
-		assertThat(container.getId(), not(isEmptyString()));
+    @Test
+    public void createContainerWithRestartPolicy() throws DockerException {
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        RestartPolicy restartPolicy = RestartPolicy.onFailureRestart(5);
 
-		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getUlimits()),
-				containsInAnyOrder(new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096)));
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withRestartPolicy(restartPolicy).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getHostConfig().getRestartPolicy(), is(equalTo(restartPolicy)));
+    }
+
+    /**
+     * This tests support for --net option for the docker run command: --net="bridge" Set the Network mode for the
+     * container 'bridge': creates a new network stack for the container on the docker bridge 'none': no networking for
+     * this container 'container:': reuses another container network stack 'host': use the host network stack inside the
+     * container. Note: the host mode gives the container full access to local system services such as D-bus and is
+     * therefore considered insecure.
+     */
+    @Test
+    public void createContainerWithNetworkMode() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withNetworkMode("host").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getHostConfig().getNetworkMode(), is(equalTo("host")));
+    }
+
+    @Test
+    public void createContainerWithMacAddress() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withMacAddress("00:80:41:ae:fd:7e").withCmd("true").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertEquals(inspectContainerResponse.getConfig().getMacAddress(), "00:80:41:ae:fd:7e");
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void createContainerWithULimits() throws DockerException {
+
+        Ulimit[] ulimits = { new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096) };
+
+        HostConfig hostConfig = new HostConfig();
+        hostConfig.setUlimits(ulimits);
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
+                .withHostConfig(hostConfig).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getUlimits()),
+                containsInAnyOrder(new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096)));
+
+    }
 
-	}
-	
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
index 34a74ad80..ecb7ab66c 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -1,14 +1,11 @@
 package com.github.dockerjava.core.command;
 
-import java.io.Closeable;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
@@ -20,10 +17,9 @@
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.EventsCmd;
-import com.github.dockerjava.api.command.EventsCmd.EventStreamCallback;
 import com.github.dockerjava.api.model.Event;
 import com.github.dockerjava.client.AbstractDockerClientTest;
-import com.github.dockerjava.core.async.DefaultCallback;
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
 
 @Test(groups = "integration")
 public class EventsCmdImplTest extends AbstractDockerClientTest {
@@ -54,6 +50,9 @@ public void afterMethod(ITestResult result) {
 		super.afterMethod(result);
 	}
 
+	/*
+	 * This specific test may fail with boot2docker as time may not in sync with host system
+	 */
 	@Test
 	public void testEventStreamTimeBound() throws InterruptedException,
 			IOException {
@@ -132,7 +131,7 @@ private int generateEvents() {
 		return KNOWN_NUM_EVENTS;
 	}
 
-	private class EventCallbackTest extends DefaultCallback<Event> implements EventStreamCallback {
+	private class EventCallbackTest extends ResultCallbackTemplate<Event> {
 
 		private final CountDownLatch countDownLatch;
 
@@ -142,16 +141,12 @@ public EventCallbackTest(CountDownLatch countDownLatch) {
 			this.countDownLatch = countDownLatch;
 		}
 
-		public void onStream(Event event) {
+		public void onResult(Event event) {
 		    LOG.info("Received event #{}: {}", countDownLatch.getCount(), event);
             countDownLatch.countDown();
             events.add(event);
 	    }
 
-		public void onError(Throwable throwable) {
-		    LOG.error("Error occurred: {}", throwable.getMessage());
-	    }
-
 		public List<Event> getEvents() {
 			return new ArrayList<Event>(events);
 		}
diff --git a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
index 80619efeb..a62a5bd9a 100644
--- a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
@@ -38,7 +38,7 @@ public void afterMethod(ITestResult result) {
     }
 
     @Test(groups = "ignoreInCircleCi")
-    public void execStartTest() throws Exception {
+    public void execStart() throws Exception {
         String containerName = "generated_" + new SecureRandom().nextInt();
 
         CreateContainerResponse container = dockerClient
@@ -64,4 +64,32 @@ public void execStartTest() throws Exception {
         assertNotNull(responseAsString);
         assertTrue(responseAsString.length() > 0);
     }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void execStartAttached() throws Exception {
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerClient
+                .createContainerCmd("busybox")
+                .withCmd("sleep", "9999")
+                .withName(containerName).exec();
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
+            .withAttachStdout(true)
+            .withCmd("touch", "/execStartTest.log").exec();
+        dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true).exec();
+
+        InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "/execStartTest.log").exec();
+        boolean bytesAvailable = response.available() > 0;
+        assertTrue(bytesAvailable, "The file was not copied from the container.");
+
+        // read the stream fully. Otherwise, the underlying stream will not be closed.
+        String responseAsString = asString(response);
+        assertNotNull(responseAsString);
+        assertTrue(responseAsString.length() > 0);
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index 24c833559..6f847ebed 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -1,10 +1,10 @@
 package com.github.dockerjava.core.command;
 
 import static org.testng.Assert.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
+import static org.testng.Assert.assertFalse;
 
-import java.io.IOException;
-import java.io.InputStream;
+import java.util.Iterator;
+import java.util.List;
 
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
@@ -13,85 +13,86 @@
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.StreamType;
+import com.github.dockerjava.client.AbstractDockerClientTest;
 import com.github.dockerjava.core.DockerClientBuilder;
 
 @Test(groups = "integration")
 public class FrameReaderITest {
 
-	private DockerClient dockerClient;
-	private DockerfileFixture dockerfileFixture;
-
-	@BeforeTest
-	public void beforeTest() throws Exception {
-		dockerClient = DockerClientBuilder.getInstance().build();
-		dockerfileFixture = new DockerfileFixture(dockerClient,
-				"frameReaderDockerfile");
-		dockerfileFixture.open();
-	}
-
-	@AfterTest
-	public void deleteDockerContainerImage() throws Exception {
-		dockerfileFixture.close();
-		dockerClient.close();
-	}
-
-	@Test
-	public void canCloseFrameReaderAndReadExpectedLines() throws Exception {
-
-		// wait for the container to be successfully executed 
-		int exitCode = dockerClient.waitContainerCmd(
-				dockerfileFixture.getContainerId()).exec();
-		assertEquals(0, exitCode);
-		
-		InputStream response = getLoggerStream();
-
-		try (FrameReader reader = new FrameReader(response)) {
-			assertEquals(reader.readFrame(), new Frame(StreamType.STDOUT,
-					"to stdout\n".getBytes()));
-			assertEquals(reader.readFrame(), new Frame(StreamType.STDERR,
-					"to stderr\n".getBytes()));
-			assertNull(reader.readFrame());
-		}
-	}
-
-	private InputStream getLoggerStream() {
-
-		return dockerClient.logContainerCmd(dockerfileFixture.getContainerId())
-				.withStdOut()
-				.withStdErr()
-				.withTailAll()
-				// we can't follow stream here as it blocks reading from resulting InputStream infinitely
-				//.withFollowStream()
-				.exec();
-	}
-
-	@Test
-	public void canLogInOneThreadAndExecuteCommandsInAnother() throws Exception {
-
-		Thread thread = new Thread(new Runnable() {
-			@Override
-			public void run() {
-				try {
-					try (FrameReader reader = new FrameReader(getLoggerStream())) {
-						// noinspection StatementWithEmptyBody
-						while (reader.readFrame() != null) {
-							// nop
-						}
-					}
-				} catch (IOException e) {
-					throw new RuntimeException(e);
-				}
-			}
-		});
-
-		thread.start();
-
-		try (DockerfileFixture busyboxDockerfile = new DockerfileFixture(
-				dockerClient, "busyboxDockerfile")) {
-			busyboxDockerfile.open();
-		}
-
-		thread.join();
-
-	}
+    private DockerClient dockerClient;
+
+    private DockerfileFixture dockerfileFixture;
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        dockerClient = DockerClientBuilder.getInstance().build();
+        dockerfileFixture = new DockerfileFixture(dockerClient, "frameReaderDockerfile");
+        dockerfileFixture.open();
+    }
+
+    @AfterTest
+    public void deleteDockerContainerImage() throws Exception {
+        dockerfileFixture.close();
+        dockerClient.close();
+    }
+
+    @Test
+    public void canCloseFrameReaderAndReadExpectedLines() throws Exception {
+
+        // wait for the container to be successfully executed
+        int exitCode = dockerClient.waitContainerCmd(dockerfileFixture.getContainerId()).exec();
+        assertEquals(0, exitCode);
+
+        Iterator<Frame> response = getLoggingFrames().iterator();
+
+        assertEquals(response.next(), new Frame(StreamType.STDOUT, "to stdout\n".getBytes()));
+        assertEquals(response.next(), new Frame(StreamType.STDERR, "to stderr\n".getBytes()));
+        assertFalse(response.hasNext());
+
+    }
+
+    private List<Frame> getLoggingFrames() throws Exception {
+
+        AbstractDockerClientTest.CollectFramesCallback collectFramesCallback = new AbstractDockerClientTest.CollectFramesCallback();
+
+        dockerClient.logContainerCmd(dockerfileFixture.getContainerId(), collectFramesCallback).withStdOut()
+                .withStdErr().withTailAll()
+                // we can't follow stream here as it blocks reading from resulting InputStream infinitely
+                // .withFollowStream()
+                .exec();
+
+        collectFramesCallback.awaitFinish();
+
+        return collectFramesCallback.frames;
+    }
+
+    @Test
+    public void canLogInOneThreadAndExecuteCommandsInAnother() throws Exception {
+
+        Thread thread = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+
+                    Iterator<Frame> frames = getLoggingFrames().iterator();
+
+                    while (frames.hasNext()) {
+                        frames.next();
+                    }
+
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        });
+
+        thread.start();
+
+        try (DockerfileFixture busyboxDockerfile = new DockerfileFixture(dockerClient, "busyboxDockerfile")) {
+            busyboxDockerfile.open();
+        }
+
+        thread.join();
+
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
index 94a27b1d3..7b43e1312 100644
--- a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
@@ -1,13 +1,14 @@
 package com.github.dockerjava.core.command;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
 
-import java.io.InputStream;
+import java.io.IOException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
@@ -19,101 +20,127 @@
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.client.AbstractDockerClientTest;
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
 
 @Test(groups = "integration")
 public class LogContainerCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
 
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
 
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
 
-	@Test
-	public void logContainer() throws Exception {
+    @Test
+    public void asyncLogContainer() throws Exception {
 
-		String snippet = "hello world";
+        String snippet = "hello world";
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("/bin/echo", snippet).exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("/bin/echo", snippet)
+                .exec();
 
-		LOG.info("Created container: {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
 
-		dockerClient.startContainerCmd(container.getId()).exec();
-		
-		int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
+        dockerClient.startContainerCmd(container.getId()).exec();
 
-		assertThat(exitCode, equalTo(0));
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
 
-		InputStream response = dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec();
+        assertThat(exitCode, equalTo(0));
 
-		String log = asString(response);
-		
-		//LOG.info("resonse: " + log);
-		
-		assertThat(log, endsWith(snippet));
-	}
-	
-	@Test
-	public void logNonExistingContainer() throws Exception {
+        CollectFramesCallback loggingCallback = new CollectFramesCallback();
 
-		try {
-			dockerClient.logContainerCmd("non-existing").withStdErr().withStdOut().exec();
-			fail("expected NotFoundException");
-		} catch (NotFoundException e) {
-		}
-	}
-	
-	@Test
-	public void multipleLogContainer() throws Exception {
+        dockerClient.logContainerCmd(container.getId(), loggingCallback).withStdErr().withStdOut().exec();
 
-		String snippet = "hello world";
+        loggingCallback.awaitFinish();
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("/bin/echo", snippet).exec();
+        assertTrue(loggingCallback.toString().contains(snippet));
+    }
 
-		LOG.info("Created container: {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
+    @Test
+    public void asyncLogNonExistingContainer() throws Exception {
 
-		dockerClient.startContainerCmd(container.getId()).exec();
-		
-		int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
+        CollectFramesCallback loggingCallback = new CollectFramesCallback() {
+            @Override
+            public void onError(Throwable throwable) {
 
-		assertThat(exitCode, equalTo(0));
+                assertEquals(throwable.getClass().getName(), NotFoundException.class.getName());
 
-		InputStream response = dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec();
+                try {
+                    // close the callback to prevent the call to onFinish
+                    close();
+                } catch (IOException e) {
+                    throw new RuntimeException();
+                }
 
-		response.close();
-		
-		//String log = asString(response);
-		
-		response = dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec();
+                super.onError(throwable);
+            }
 
-		//log = asString(response);
-		response.close();
-		
-		response = dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec();
+            public void onFinish() {
+                super.onFinish();
+                fail("expected NotFoundException");
+            };
+        };
+
+        dockerClient.logContainerCmd("non-existing", loggingCallback).withStdErr().withStdOut().exec();
+
+        loggingCallback.awaitFinish();
+    }
+
+    @Test
+    public void asyncMultipleLogContainer() throws Exception {
+
+        String snippet = "hello world";
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("/bin/echo", snippet)
+                .exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
+
+        assertThat(exitCode, equalTo(0));
+
+        CollectFramesCallback loggingCallback = new CollectFramesCallback();
+
+        dockerClient.logContainerCmd(container.getId(), loggingCallback).withStdErr().withStdOut().exec();
+
+        loggingCallback.close();
+
+        loggingCallback = new CollectFramesCallback();
+
+        dockerClient.logContainerCmd(container.getId(), loggingCallback).withStdErr().withStdOut().exec();
+
+        loggingCallback.close();
+
+        loggingCallback = new CollectFramesCallback();
+
+        dockerClient.logContainerCmd(container.getId(), loggingCallback).withStdErr().withStdOut().exec();
+
+        loggingCallback.awaitFinish();
+
+        assertTrue(loggingCallback.toString().contains(snippet));
+    }
 
-		String log = asString(response);
-		
-		assertThat(log, endsWith(snippet));
-	}
 
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
index e809e25e3..845f8f9c1 100644
--- a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
@@ -20,10 +20,9 @@
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.StatsCmd;
-import com.github.dockerjava.api.command.StatsCmd.StatisticsCallback;
 import com.github.dockerjava.api.model.Statistics;
 import com.github.dockerjava.client.AbstractDockerClientTest;
-import com.github.dockerjava.core.async.DefaultCallback;
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
 
 @Test(groups = "integration")
 public class StatsCmdImplTest extends AbstractDockerClientTest {
@@ -85,7 +84,7 @@ public void testStatsStreaming() throws InterruptedException, IOException {
 
     }
 
-    private class StatsCallbackTest extends DefaultCallback<Statistics> implements StatisticsCallback {
+    private class StatsCallbackTest extends ResultCallbackTemplate<Statistics> {
         private final CountDownLatch countDownLatch;
 
         private boolean gotStats = false;
@@ -95,7 +94,7 @@ public StatsCallbackTest(CountDownLatch countDownLatch) {
         }
 
         @Override
-        public void onStream(Statistics stats) {
+        public void onResult(Statistics stats) {
             LOG.info("Received stats #{}: {}", countDownLatch.getCount(), stats);
             if (stats != null) {
                 gotStats = true;

From be236cc0935369bd33c36c1954e457cb0b71f26e Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 26 Jun 2015 20:41:26 +0200
Subject: [PATCH 0109/1272] Refact streaming

---
 .../dockerjava/api/async/ResultCallback.java  |  6 +-
 .../dockerjava/api/model/StreamType.java      |  3 +-
 .../core/async/FrameStreamProcessor.java      |  4 +-
 .../core/async/JsonStreamProcessor.java       |  4 +-
 .../core/async/ResultCallbackTemplate.java    |  6 +-
 .../dockerjava/core/command/FrameReader.java  | 79 +++++++++++--------
 .../client/AbstractDockerClientTest.java      |  4 +-
 .../command/AttachContainerCmdImplTest.java   | 69 ++++++++++++++--
 .../core/command/EventsCmdImplTest.java       |  2 +-
 .../core/command/LogContainerCmdImplTest.java |  4 +-
 .../core/command/StatsCmdImplTest.java        |  2 +-
 .../attachContainerTestDockerfile/Dockerfile  |  8 ++
 .../attachContainerTestDockerfile/echo.sh     |  2 +
 13 files changed, 137 insertions(+), 56 deletions(-)
 create mode 100644 src/test/resources/attachContainerTestDockerfile/Dockerfile
 create mode 100644 src/test/resources/attachContainerTestDockerfile/echo.sh

diff --git a/src/main/java/com/github/dockerjava/api/async/ResultCallback.java b/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
index f4f519d3e..2954b9242 100644
--- a/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
+++ b/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
@@ -5,14 +5,14 @@
 /**
  * Result callback
  */
-public interface ResultCallback<RES_T> {
+public interface ResultCallback<RES_T> extends Closeable {
 	/** Called when the async processing starts. The passed {@link Closeable} can be used to close/interrupt the processing */
 	void onStart(Closeable closeable);
 	/** Called when an async result event occurs */
-    void onResult(RES_T object);
+    void onNext(RES_T object);
     /** Called when an exception occurs while processing */
     void onError(Throwable throwable);
     /** Called when processing was finished either by reaching the end or by aborting it */
-    void onFinish();
+    void onComplete();
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/StreamType.java b/src/main/java/com/github/dockerjava/api/model/StreamType.java
index eb11c5536..0040c1bc8 100644
--- a/src/main/java/com/github/dockerjava/api/model/StreamType.java
+++ b/src/main/java/com/github/dockerjava/api/model/StreamType.java
@@ -3,5 +3,6 @@
 public enum StreamType {
     STDIN,
     STDOUT,
-    STDERR
+    STDERR,
+    RAW
 }
diff --git a/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java b/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java
index cc6474d09..220cd80ef 100644
--- a/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java
+++ b/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java
@@ -28,7 +28,7 @@ public void processResponseStream(InputStream response, ResultCallback<Frame> re
             Frame frame = frameReader.readFrame();
             while (frame != null) {
                 try {
-                    resultCallback.onResult(frame);
+                    resultCallback.onNext(frame);
                 } catch (Exception e) {
                     resultCallback.onError(e);
                 } finally {
@@ -44,7 +44,7 @@ public void processResponseStream(InputStream response, ResultCallback<Frame> re
             } catch (IOException e) {
                 resultCallback.onError(e);
             } finally {
-                resultCallback.onFinish();
+                resultCallback.onComplete();
             }
         }
     }
diff --git a/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
index 24d83b129..5339b3ed0 100644
--- a/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
+++ b/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
@@ -38,7 +38,7 @@ public void processResponseStream(InputStream response, ResultCallback<T> result
             JsonParser jp = JSON_FACTORY.createParser(response);
             while (!jp.isClosed() && jp.nextToken() != JsonToken.END_OBJECT) {
                 try {
-                    resultCallback.onResult(OBJECT_MAPPER.readValue(jp, clazz));
+                    resultCallback.onNext(OBJECT_MAPPER.readValue(jp, clazz));
                 } catch (Exception e) {
                     resultCallback.onError(e);
                 }
@@ -51,7 +51,7 @@ public void processResponseStream(InputStream response, ResultCallback<T> result
             } catch (IOException e) {
                 resultCallback.onError(e);
             } finally {
-                resultCallback.onFinish();
+                resultCallback.onComplete();
             }
         }
 
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index c98cddf4c..f56db8db4 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -16,7 +16,7 @@
  * @author marcus
  *
  */
-public class ResultCallbackTemplate<T> implements ResultCallback<T>, Closeable {
+public class ResultCallbackTemplate<T> implements ResultCallback<T> {
 
     private final CountDownLatch finished = new CountDownLatch(1);
 
@@ -28,7 +28,7 @@ public void onStart(Closeable stream) {
     }
 
     @Override
-    public void onResult(T object) {
+    public void onNext(T object) {
     }
 
     @Override
@@ -45,7 +45,7 @@ public void onError(Throwable throwable) {
     }
 
     @Override
-    public void onFinish() {
+    public void onComplete() {
         try {
             close();
         } catch (IOException e) {
diff --git a/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
index bb36c1764..69114dae8 100644
--- a/src/main/java/com/github/dockerjava/core/command/FrameReader.java
+++ b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
@@ -1,35 +1,43 @@
 package com.github.dockerjava.core.command;
 
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.api.model.StreamType;
-
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Arrays;
+
+import org.apache.commons.io.HexDump;
+
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.StreamType;
 
 /**
  * Breaks the input into frame. Similar to how a buffered reader would readLies.
  * <p/>
- * See:  {@link }http://docs.docker.com/v1.6/reference/api/docker_remote_api_v1.13/#attach-to-a-container}
+ * See: {@link }http://docs.docker.com/v1.6/reference/api/docker_remote_api_v1.13/#attach-to-a-container}
  */
 public class FrameReader implements AutoCloseable {
 
+    private static final int BUFFER_SIZE = 100;
+
     private static final int HEADER_SIZE = 8;
+
     private final InputStream inputStream;
 
+    private boolean rawDetected = false;
+
     public FrameReader(InputStream inputStream) {
         this.inputStream = inputStream;
     }
 
     private static StreamType streamType(byte streamType) {
         switch (streamType) {
-            case 0:
-                return StreamType.STDIN;
-            case 1:
-                return StreamType.STDOUT;
-            case 2:
-                return StreamType.STDERR;
-            default:
-                throw new IllegalArgumentException("invalid streamType");
+        case 0:
+            return StreamType.STDIN;
+        case 1:
+            return StreamType.STDOUT;
+        case 2:
+            return StreamType.STDERR;
+        default:
+            throw new IllegalArgumentException("invalid streamType");
         }
     }
 
@@ -37,41 +45,44 @@ private static StreamType streamType(byte streamType) {
      * @return A frame, or null if no more frames.
      */
     public Frame readFrame() throws IOException {
-        byte[] header = new byte[HEADER_SIZE];
 
-        int actualHeaderSize = 0;
+        byte[] buffer = new byte[BUFFER_SIZE];
 
-        do {
-            int headerCount = inputStream.read(header, actualHeaderSize, HEADER_SIZE - actualHeaderSize);
+        int readBytes = inputStream.read(buffer);
 
-            if (headerCount == -1) {
-                return null;
-            }
-            actualHeaderSize += headerCount;
-        } while (actualHeaderSize < HEADER_SIZE);
+        if (readBytes == -1) {
+            return null;
+        }
+
+        if (rawDetected || readBytes != HEADER_SIZE) {
+            rawDetected = true;
 
-        int payloadSize = ((header[4] & 0xff) << 24) + ((header[5] & 0xff) << 16) + ((header[6] & 0xff) << 8) + (header[7] & 0xff);
+            byte[] read = Arrays.copyOfRange(buffer, 0, readBytes);
 
-        byte[] payload = new byte[payloadSize];
-        int actualPayloadSize = 0;
+            return new Frame(StreamType.RAW, read);
+        } else {
 
-        do {
-            int count = inputStream.read(payload, actualPayloadSize, payloadSize - actualPayloadSize);
+            int payloadSize = ((buffer[4] & 0xff) << 24) + ((buffer[5] & 0xff) << 16) + ((buffer[6] & 0xff) << 8)
+                    + (buffer[7] & 0xff);
 
-            if (count == -1) {
-                if (actualPayloadSize != payloadSize) {
-                    throw new IOException(String.format("payload must be %d bytes long, but was %d", payloadSize, actualPayloadSize));
-                }
-                break;
+            byte[] payload = new byte[payloadSize];
+            int actualPayloadSize = inputStream.read(payload);
+            if (actualPayloadSize != payloadSize) {
+                throw new IOException(String.format("payload must be %d bytes long, but was %d", payloadSize,
+                        actualPayloadSize));
             }
-            actualPayloadSize += count;
-        } while (actualPayloadSize < payloadSize);
 
-        return new Frame(streamType(header[0]), payload);
+            return new Frame(streamType(buffer[0]), payload);
+
+        }
+
     }
 
     @Override
     public void close() throws IOException {
         inputStream.close();
     }
+
+
+
 }
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 9eda0cbc5..ec70de4c7 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -200,9 +200,9 @@ public void onError(Throwable throwable) {
         }
 
         @Override
-        public void onResult(Frame frame) {
+        public void onNext(Frame frame) {
             frames.add(frame);
-            log.append(new String(frame.getPayload()).trim());
+            log.append(new String(frame.getPayload()));
         }
 
         @Override
diff --git a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
index dec4a3b3b..c4147f1a5 100644
--- a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
@@ -1,13 +1,19 @@
 package com.github.dockerjava.core.command;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.containsString;
 
+import java.io.File;
+import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.commons.io.HexDump;
+import org.apache.commons.lang.StringUtils;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -17,6 +23,8 @@
 
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.StreamType;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
 @Test(groups = "integration")
@@ -43,28 +51,79 @@ public void afterMethod(ITestResult result) {
     }
 
     @Test
-    public void attachContainer() throws Exception {
+    public void attachContainerWithoutTTY() throws Exception {
 
         String snippet = "hello world";
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top").exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("echo", snippet)
+                .withTty(false).exec();
 
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        CollectFramesCallback collectFramesCallback = new CollectFramesCallback();
+        CollectFramesCallback collectFramesCallback = new CollectFramesCallback() {
+            @Override
+            public void onNext(Frame frame) {
+                assertEquals(frame.getStreamType(), StreamType.RAW);
+                super.onNext(frame);
+            };
+        };
 
         dockerClient.attachContainerCmd(container.getId(), collectFramesCallback).withStdErr().withStdOut()
                 .withFollowStream().withLogs().exec();
 
+        collectFramesCallback.awaitFinish(30, TimeUnit.SECONDS);
+
+        collectFramesCallback.close();
+
+        assertThat(collectFramesCallback.toString(), endsWith(snippet));
+    }
+
+
+    @Test
+    public void attachContainerWithTTY() throws Exception {
+
+        File baseDir = new File(Thread.currentThread().getContextClassLoader()
+                .getResource("attachContainerTestDockerfile").getFile());
+
+        InputStream response = dockerClient.buildImageCmd(baseDir).withNoCache().exec();
+
+        String fullLog = asString(response);
+        assertThat(fullLog, containsString("Successfully built"));
+
+        String imageId = StringUtils.substringBetween(fullLog,
+                "Successfully built ", "\\n\"}").trim();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd(imageId)
+                .withTty(true).exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        CollectFramesCallback collectFramesCallback = new CollectFramesCallback() {
+            @Override
+            public void onNext(Frame frame) {
+                assertEquals(frame.getStreamType(), StreamType.RAW);
+                super.onNext(frame);
+            };
+        };
+
+        dockerClient.attachContainerCmd(container.getId(), collectFramesCallback).withStdErr().withStdOut()
+                .withFollowStream().exec();
+
         collectFramesCallback.awaitFinish(10, TimeUnit.SECONDS);
 
         collectFramesCallback.close();
 
-        // LOG.info("resonse: " + log);
+        System.out.println("log: " + collectFramesCallback.toString());
 
-        assertThat(collectFramesCallback.toString(), endsWith(snippet));
+
+        HexDump.dump(collectFramesCallback.toString().getBytes(), 0, System.out, 0);
+
+        assertThat(collectFramesCallback.toString(), containsString("stdout\r\nstderr"));
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
index ecb7ab66c..baaeb8ca3 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -141,7 +141,7 @@ public EventCallbackTest(CountDownLatch countDownLatch) {
 			this.countDownLatch = countDownLatch;
 		}
 
-		public void onResult(Event event) {
+		public void onNext(Event event) {
 		    LOG.info("Received event #{}: {}", countDownLatch.getCount(), event);
             countDownLatch.countDown();
             events.add(event);
diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
index 7b43e1312..18c001c5f 100644
--- a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
@@ -92,8 +92,8 @@ public void onError(Throwable throwable) {
                 super.onError(throwable);
             }
 
-            public void onFinish() {
-                super.onFinish();
+            public void onComplete() {
+                super.onComplete();
                 fail("expected NotFoundException");
             };
         };
diff --git a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
index 845f8f9c1..5ccb01038 100644
--- a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
@@ -94,7 +94,7 @@ public StatsCallbackTest(CountDownLatch countDownLatch) {
         }
 
         @Override
-        public void onResult(Statistics stats) {
+        public void onNext(Statistics stats) {
             LOG.info("Received stats #{}: {}", countDownLatch.getCount(), stats);
             if (stats != null) {
                 gotStats = true;
diff --git a/src/test/resources/attachContainerTestDockerfile/Dockerfile b/src/test/resources/attachContainerTestDockerfile/Dockerfile
new file mode 100644
index 000000000..90cca5e64
--- /dev/null
+++ b/src/test/resources/attachContainerTestDockerfile/Dockerfile
@@ -0,0 +1,8 @@
+FROM ubuntu:latest
+
+ADD	./echo.sh /tmp/
+
+RUN cp /tmp/echo.sh /usr/local/bin/ && chmod +x /usr/local/bin/echo.sh
+
+CMD ["echo.sh"]
+
diff --git a/src/test/resources/attachContainerTestDockerfile/echo.sh b/src/test/resources/attachContainerTestDockerfile/echo.sh
new file mode 100644
index 000000000..88b444bf0
--- /dev/null
+++ b/src/test/resources/attachContainerTestDockerfile/echo.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+while sleep 2; do echo stdout && echo stderr >&2; done
\ No newline at end of file

From e60e7de743492c1b1181f99ec702f0e8616b01a7 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 26 Jun 2015 20:44:26 +0200
Subject: [PATCH 0110/1272] Formatting sources

---
 .../dockerjava/api/BadRequestException.java   |  13 +-
 .../dockerjava/api/ConflictException.java     |  13 +-
 .../github/dockerjava/api/DockerClient.java   | 130 ++-
 .../dockerjava/api/DockerClientException.java |   4 +-
 .../dockerjava/api/DockerException.java       |  15 +-
 .../api/InternalServerErrorException.java     |  12 +-
 .../api/NotAcceptableException.java           |  12 +-
 .../dockerjava/api/NotFoundException.java     |  12 +-
 .../dockerjava/api/NotModifiedException.java  |  12 +-
 .../dockerjava/api/UnauthorizedException.java |  12 +-
 .../api/command/AttachContainerCmd.java       |  74 +-
 .../dockerjava/api/command/AuthCmd.java       |  21 +-
 .../dockerjava/api/command/BuildImageCmd.java |  82 +-
 .../dockerjava/api/command/CommitCmd.java     | 121 +--
 .../api/command/ContainerDiffCmd.java         |  37 +-
 .../api/command/CopyFileFromContainerCmd.java |  34 +-
 .../api/command/CreateImageCmd.java           |  54 +-
 .../dockerjava/api/command/DockerCmd.java     |   2 +-
 .../dockerjava/api/command/DockerCmdExec.java |   4 +-
 .../api/command/DockerCmdExecFactory.java     |  73 +-
 .../dockerjava/api/command/EventCallback.java |   3 +
 .../dockerjava/api/command/EventsCmd.java     |   9 +-
 .../dockerjava/api/command/ExecCreateCmd.java |  18 +-
 .../dockerjava/api/command/ExecStartCmd.java  |  42 +-
 .../dockerjava/api/command/InfoCmd.java       |   4 +-
 .../api/command/InspectContainerCmd.java      |  21 +-
 .../api/command/InspectContainerResponse.java | 189 ++--
 .../api/command/InspectExecCmd.java           |   7 +-
 .../api/command/InspectImageCmd.java          |  23 +-
 .../api/command/InspectImageResponse.java     |  18 +-
 .../api/command/KillContainerCmd.java         |  25 +-
 .../api/command/ListContainersCmd.java        |  43 +-
 .../dockerjava/api/command/ListImagesCmd.java |  18 +-
 .../api/command/LogContainerCmd.java          |  82 +-
 .../api/command/PauseContainerCmd.java        |  26 +-
 .../dockerjava/api/command/PingCmd.java       |   7 +-
 .../dockerjava/api/command/PullImageCmd.java  |  27 +-
 .../dockerjava/api/command/PushImageCmd.java  |  58 +-
 .../api/command/RemoveContainerCmd.java       |  37 +-
 .../api/command/RemoveImageCmd.java           |  87 +-
 .../api/command/RestartContainerCmd.java      |  28 +-
 .../dockerjava/api/command/SaveImageCmd.java  |  17 +-
 .../api/command/SearchImagesCmd.java          |  13 +-
 .../dockerjava/api/command/StatsCallback.java |   3 +
 .../dockerjava/api/command/StatsCmd.java      |   7 +-
 .../api/command/StopContainerCmd.java         |  34 +-
 .../dockerjava/api/command/TagImageCmd.java   |  34 +-
 .../api/command/TopContainerCmd.java          |  25 +-
 .../api/command/TopContainerResponse.java     |  42 +-
 .../api/command/UnpauseContainerCmd.java      |  24 +-
 .../dockerjava/api/command/VersionCmd.java    |   6 +-
 .../api/command/WaitContainerCmd.java         |  23 +-
 .../dockerjava/api/model/AccessMode.java      |  40 +-
 .../dockerjava/api/model/AuthConfig.java      | 222 +++--
 .../api/model/AuthConfigurations.java         |  22 +-
 .../com/github/dockerjava/api/model/Bind.java | 176 ++--
 .../github/dockerjava/api/model/Binds.java    |  55 +-
 .../dockerjava/api/model/Capability.java      | 612 ++++++-------
 .../dockerjava/api/model/Container.java       |  29 +-
 .../dockerjava/api/model/ContainerConfig.java | 260 +++---
 .../github/dockerjava/api/model/Device.java   | 100 +-
 .../dockerjava/api/model/ErrorResponse.java   |   1 +
 .../github/dockerjava/api/model/Event.java    |  31 +-
 .../dockerjava/api/model/EventStreamItem.java |  21 +-
 .../dockerjava/api/model/ExposedPort.java     | 316 +++----
 .../dockerjava/api/model/ExposedPorts.java    |  63 +-
 .../github/dockerjava/api/model/Frame.java    |   7 +-
 .../dockerjava/api/model/HostConfig.java      | 420 +++++----
 .../dockerjava/api/model/Identifier.java      |  34 +-
 .../github/dockerjava/api/model/Image.java    |  12 +-
 .../com/github/dockerjava/api/model/Info.java | 334 +++----
 .../api/model/InternetProtocol.java           |  70 +-
 .../com/github/dockerjava/api/model/Link.java | 168 ++--
 .../github/dockerjava/api/model/Links.java    |  82 +-
 .../github/dockerjava/api/model/LxcConf.java  |  48 +-
 .../dockerjava/api/model/PortBinding.java     | 115 ++-
 .../github/dockerjava/api/model/Ports.java    | 160 ++--
 .../api/model/PullEventStreamItem.java        |  17 +-
 .../api/model/PushEventStreamItem.java        |  17 +-
 .../dockerjava/api/model/Repository.java      |  17 +-
 .../dockerjava/api/model/RestartPolicy.java   | 228 ++---
 .../dockerjava/api/model/Statistics.java      |  32 +-
 .../dockerjava/api/model/StreamType.java      |   4 +-
 .../github/dockerjava/api/model/Ulimit.java   |   6 +-
 .../github/dockerjava/api/model/Version.java  |  32 +-
 .../github/dockerjava/api/model/Volume.java   |  56 +-
 .../dockerjava/api/model/VolumeBind.java      |   3 +-
 .../dockerjava/api/model/VolumeBinds.java     |  17 +-
 .../github/dockerjava/api/model/VolumeRW.java | 160 ++--
 .../github/dockerjava/api/model/Volumes.java  |  69 +-
 .../dockerjava/api/model/VolumesFrom.java     | 203 ++---
 .../dockerjava/api/model/VolumesRW.java       |  22 +-
 .../dockerjava/core/AuthConfigFile.java       |   8 +-
 .../dockerjava/core/CertificateUtils.java     | 103 +--
 .../dockerjava/core/CompressArchiveUtil.java  |   3 +-
 .../dockerjava/core/DockerClientBuilder.java  | 119 ++-
 .../dockerjava/core/DockerClientConfig.java   | 259 +++---
 .../dockerjava/core/DockerClientImpl.java     | 542 ++++++-----
 .../github/dockerjava/core/FilePathUtil.java  |   9 +-
 .../dockerjava/core/GoLangFileMatch.java      |   9 +-
 .../core/GoLangMatchFileFilter.java           |   8 +-
 .../dockerjava/core/KeystoreSSLConfig.java    | 195 ++--
 .../core/LocalDirectorySSLConfig.java         | 111 ++-
 .../github/dockerjava/core/NameParser.java    |  20 +-
 .../com/github/dockerjava/core/SSLConfig.java |  14 +-
 .../core/command/AbstrAuthCfgDockerCmd.java   |  71 +-
 .../core/command/AbstrDockerCmd.java          |  25 +-
 .../core/command/AttachContainerCmdImpl.java  | 215 ++---
 .../dockerjava/core/command/AuthCmdImpl.java  |  24 +-
 .../core/command/BuildImageCmdImpl.java       | 272 +++---
 .../core/command/CommitCmdImpl.java           | 285 +++---
 .../core/command/ContainerDiffCmdImpl.java    |  42 +-
 .../command/CopyFileFromContainerCmdImpl.java |  91 +-
 .../core/command/CreateImageCmdImpl.java      |  99 +-
 .../core/command/EventStreamReader.java       |   2 +
 .../core/command/EventsCmdImpl.java           |  10 +-
 .../core/command/ExecCreateCmdImpl.java       |  50 +-
 .../core/command/ExecStartCmdImpl.java        |  59 +-
 .../dockerjava/core/command/FrameReader.java  |  25 +-
 .../dockerjava/core/command/InfoCmdImpl.java  |  12 +-
 .../core/command/InspectContainerCmdImpl.java |  34 +-
 .../core/command/InspectExecCmdImpl.java      |   3 +-
 .../core/command/InspectImageCmdImpl.java     |  35 +-
 .../core/command/KillContainerCmdImpl.java    |  48 +-
 .../core/command/ListContainersCmdImpl.java   | 122 +--
 .../core/command/ListImagesCmdImpl.java       |  50 +-
 .../core/command/LogContainerCmdImpl.java     | 170 ++--
 .../core/command/PauseContainerCmdImpl.java   |  48 +-
 .../dockerjava/core/command/PingCmdImpl.java  |   6 +-
 .../core/command/PullImageCmdImpl.java        |  53 +-
 .../core/command/PushImageCmdImpl.java        |  44 +-
 .../core/command/RemoveContainerCmdImpl.java  | 111 +--
 .../core/command/RemoveImageCmdImpl.java      |  88 +-
 .../core/command/RestartContainerCmdImpl.java |  55 +-
 .../core/command/SaveImageCmdImpl.java        |  14 +-
 .../core/command/SearchImagesCmdImpl.java     |  31 +-
 .../dockerjava/core/command/StatsCmdImpl.java |  10 +-
 .../core/command/StopContainerCmdImpl.java    |  67 +-
 .../core/command/TagImageCmdImpl.java         | 105 ++-
 .../core/command/TopContainerCmdImpl.java     |  54 +-
 .../core/command/UnpauseContainerCmdImpl.java |  48 +-
 .../core/command/VersionCmdImpl.java          |  12 +-
 .../core/command/WaitContainerCmdImpl.java    |  22 +-
 .../core/dockerfile/Dockerfile.java           | 320 ++++---
 .../core/dockerfile/DockerfileStatement.java  | 267 +++---
 .../core/util/FollowRedirectsFilter.java      |  17 +-
 .../core/util/JsonClientFilter.java           |   5 +-
 .../dockerjava/core/util/LoggingFilter.java   |  91 +-
 .../util/ResponseStatusExceptionFilter.java   | 114 ++-
 .../core/util/SelectiveLoggingFilter.java     |  17 +-
 .../dockerjava/jaxrs/AbstrDockerCmdExec.java  | 100 +-
 .../dockerjava/jaxrs/ApacheUnixSocket.java    | 567 ++++++------
 .../jaxrs/AttachContainerCmdExec.java         |  57 +-
 .../github/dockerjava/jaxrs/AuthCmdExec.java  |  40 +-
 .../dockerjava/jaxrs/BuildImageCmdExec.java   | 181 ++--
 .../dockerjava/jaxrs/CommitCmdExec.java       |  39 +-
 .../jaxrs/ContainerDiffCmdExec.java           |  34 +-
 .../jaxrs/CopyFileFromContainerCmdExec.java   |  42 +-
 .../jaxrs/CreateContainerCmdExec.java         |  31 +-
 .../dockerjava/jaxrs/CreateImageCmdExec.java  |  39 +-
 .../jaxrs/DockerCmdExecFactoryImpl.java       | 573 ++++++------
 .../dockerjava/jaxrs/EventsCmdExec.java       | 157 ++--
 .../dockerjava/jaxrs/ExecCreateCmdExec.java   |  15 +-
 .../dockerjava/jaxrs/ExecStartCmdExec.java    |  11 +-
 .../github/dockerjava/jaxrs/InfoCmdExec.java  |  29 +-
 .../jaxrs/InspectContainerCmdExec.java        |  34 +-
 .../dockerjava/jaxrs/InspectExecCmdExec.java  |   3 +-
 .../dockerjava/jaxrs/InspectImageCmdExec.java |  32 +-
 .../jaxrs/KillContainerCmdExec.java           |  35 +-
 .../jaxrs/ListContainersCmdExec.java          |  39 +-
 .../dockerjava/jaxrs/ListImagesCmdExec.java   |  41 +-
 .../dockerjava/jaxrs/LogContainerCmdExec.java |  45 +-
 .../jaxrs/PauseContainerCmdExec.java          |  31 +-
 .../github/dockerjava/jaxrs/PingCmdExec.java  |  20 +-
 .../dockerjava/jaxrs/PullImageCmdExec.java    |  61 +-
 .../dockerjava/jaxrs/PushImageCmdExec.java    | 104 +--
 .../jaxrs/RemoveContainerCmdExec.java         |  31 +-
 .../dockerjava/jaxrs/RemoveImageCmdExec.java  |  34 +-
 .../jaxrs/RestartContainerCmdExec.java        |  32 +-
 .../dockerjava/jaxrs/SaveImageCmdExec.java    |  12 +-
 .../dockerjava/jaxrs/SearchImagesCmdExec.java |  31 +-
 .../jaxrs/StartContainerCmdExec.java          |  29 +-
 .../github/dockerjava/jaxrs/StatsCmdExec.java |  19 +-
 .../jaxrs/StopContainerCmdExec.java           |  30 +-
 .../dockerjava/jaxrs/TagImageCmdExec.java     |  34 +-
 .../dockerjava/jaxrs/TopContainerCmdExec.java |  31 +-
 .../jaxrs/UnixConnectionSocketFactory.java    |  63 +-
 .../jaxrs/UnpauseContainerCmdExec.java        |  30 +-
 .../dockerjava/jaxrs/VersionCmdExec.java      |  22 +-
 .../jaxrs/WaitContainerCmdExec.java           |  29 +-
 .../jaxrs/connector/ApacheConnector.java      | 176 ++--
 .../ApacheConnectorClientResponse.java        |  56 +-
 .../connector/ApacheConnectorProvider.java    |  59 +-
 .../util/WrappedResponseInputStream.java      | 115 +--
 .../api/command/CommandJSONSamples.java       |  12 +-
 .../command/InspectContainerResponseTest.java |  12 +-
 .../dockerjava/api/model/AccessModeTest.java  |  39 +-
 .../github/dockerjava/api/model/BindTest.java |  97 +-
 .../dockerjava/api/model/BindingTest.java     |  90 +-
 .../dockerjava/api/model/CapabilityTest.java  |  30 +-
 .../dockerjava/api/model/ExposedPortTest.java |  54 +-
 .../dockerjava/api/model/IdentifierTest.java  |  48 +-
 .../api/model/InternetProtocolTest.java       |  60 +-
 .../github/dockerjava/api/model/LinkTest.java |  58 +-
 .../dockerjava/api/model/PortBindingTest.java |  93 +-
 .../api/model/Ports_SerializingTest.java      |  93 +-
 .../api/model/Ports_addBindingsTest.java      |  97 +-
 .../dockerjava/api/model/RepositoryTest.java  |  18 +-
 .../api/model/RestartPolicy_ParsingTest.java  |  60 +-
 .../model/RestartPolicy_SerializingTest.java  |  61 +-
 .../api/model/RestartPolicy_toStringTest.java |  21 +-
 .../dockerjava/api/model/VolumeBindsTest.java |   5 +-
 .../api/model/VolumeFrom_SerializingTest.java |  29 +-
 .../dockerjava/api/model/VolumeTest.java      |   8 +-
 .../client/AbstractDockerClientTest.java      | 262 +++---
 .../dockerjava/client/DockerClientTest.java   |  68 +-
 .../core/CompressArchiveUtilTest.java         |  75 +-
 .../core/DockerClientConfigTest.java          |  12 +-
 .../dockerjava/core/DockerClientImplTest.java |   3 +-
 .../dockerjava/core/GoLangFileMatchTest.java  |  10 +-
 .../core/TestDockerCmdExecFactory.java        | 484 +++++-----
 .../core/command/AuthCmdImplTest.java         |  58 +-
 .../core/command/BuildImageCmdImplTest.java   | 326 ++++---
 .../core/command/CommitCmdImplTest.java       | 109 ++-
 .../command/ContainerDiffCmdImplTest.java     |  97 +-
 .../CopyFileFromContainerCmdImplTest.java     |   6 +-
 .../command/CreateContainerCmdImplTest.java   | 853 ++++++++----------
 .../core/command/DockerfileFixture.java       |  41 +-
 .../core/command/EventStreamReaderITest.java  |  38 +-
 .../core/command/EventsCmdImplTest.java       | 283 +++---
 .../core/command/ExecCreateCmdImplTest.java   |   6 +-
 .../core/command/ExecStartCmdImplTest.java    |   7 +-
 .../core/command/FrameReaderITest.java        | 145 ++-
 .../core/command/FrameReaderTest.java         |   3 +
 .../core/command/InfoCmdImplTest.java         |  74 +-
 .../core/command/InspectExecCmdImplTest.java  |  23 +-
 .../command/KillContainerCmdImplTest.java     | 105 +--
 .../command/ListContainersCmdImplTest.java    |  98 +-
 .../core/command/ListImagesCmdImplTest.java   | 145 ++-
 .../core/command/LogContainerCmdImplTest.java | 137 ++-
 .../core/command/PullImageCmdImplTest.java    | 136 ++-
 .../core/command/PushImageCmdImplTest.java    |  74 +-
 .../command/RemoveContainerCmdImplTest.java   |  98 +-
 .../core/command/RemoveImageCmdImplTest.java  |  88 +-
 .../command/RestartContainerCmdImplTest.java  | 116 ++-
 .../core/command/SaveImageCmdImplTest.java    |   7 +-
 .../core/command/SearchImagesCmdImplTest.java |  63 +-
 .../core/command/StatsCmdImplTest.java        | 158 ++--
 .../command/StopContainerCmdImplTest.java     | 101 +--
 .../core/command/TagImageCmdImplTest.java     |  71 +-
 .../core/command/VersionCmdImplTest.java      |  61 +-
 .../command/WaitContainerCmdImplTest.java     | 102 +--
 .../core/dockerfile/DockerfileTest.java       |  49 +-
 .../test/serdes/AbstractJSONResourceRef.java  |   4 +-
 .../test/serdes/JSONResourceRef.java          |   7 +-
 .../test/serdes/JSONTestHelper.java           |  94 +-
 256 files changed, 9586 insertions(+), 10050 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/BadRequestException.java b/src/main/java/com/github/dockerjava/api/BadRequestException.java
index 1e04bcb3b..2696c5bc1 100644
--- a/src/main/java/com/github/dockerjava/api/BadRequestException.java
+++ b/src/main/java/com/github/dockerjava/api/BadRequestException.java
@@ -1,22 +1,21 @@
 package com.github.dockerjava.api;
 
-
 /**
  *
  */
 public class BadRequestException extends DockerException {
 
-	private static final long serialVersionUID = -2450396075981100160L;
+    private static final long serialVersionUID = -2450396075981100160L;
 
-	public BadRequestException(String message, Throwable cause) {
+    public BadRequestException(String message, Throwable cause) {
         super(message, 400, cause);
     }
-	
-	public BadRequestException(String message) {
+
+    public BadRequestException(String message) {
         this(message, null);
     }
-	
-	public BadRequestException(Throwable cause) {
+
+    public BadRequestException(Throwable cause) {
         this(cause.getMessage(), cause);
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/ConflictException.java b/src/main/java/com/github/dockerjava/api/ConflictException.java
index bed2a375e..6a84fdee3 100644
--- a/src/main/java/com/github/dockerjava/api/ConflictException.java
+++ b/src/main/java/com/github/dockerjava/api/ConflictException.java
@@ -1,22 +1,21 @@
 package com.github.dockerjava.api;
 
-
 /**
  *
  */
 public class ConflictException extends DockerException {
 
-	private static final long serialVersionUID = -290093024775500239L;
+    private static final long serialVersionUID = -290093024775500239L;
 
-	public ConflictException(String message, Throwable cause) {
+    public ConflictException(String message, Throwable cause) {
         super(message, 409, cause);
     }
-	
-	public ConflictException(String message) {
+
+    public ConflictException(String message) {
         this(message, null);
     }
-	
-	public ConflictException(Throwable cause) {
+
+    public ConflictException(Throwable cause) {
         this(cause.getMessage(), cause);
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 723c1bad3..2e0543ae9 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -9,114 +9,108 @@
 // https://godoc.org/github.com/fsouza/go-dockerclient
 public interface DockerClient extends Closeable {
 
-	public AuthConfig authConfig() throws DockerException;
+    public AuthConfig authConfig() throws DockerException;
 
-	/**
-	 * Authenticate with the server, useful for checking authentication.
-	 */
-	public AuthCmd authCmd();
+    /**
+     * Authenticate with the server, useful for checking authentication.
+     */
+    public AuthCmd authCmd();
 
-	public InfoCmd infoCmd();
+    public InfoCmd infoCmd();
 
-	public PingCmd pingCmd();
+    public PingCmd pingCmd();
 
-	public VersionCmd versionCmd();
+    public VersionCmd versionCmd();
 
-	/**
-	 * * IMAGE API *
-	 */
+    /**
+     * * IMAGE API *
+     */
 
-	public PullImageCmd pullImageCmd(String repository);
+    public PullImageCmd pullImageCmd(String repository);
 
-	public PushImageCmd pushImageCmd(String name);
+    public PushImageCmd pushImageCmd(String name);
 
-        public PushImageCmd pushImageCmd(Identifier identifier);
+    public PushImageCmd pushImageCmd(Identifier identifier);
 
-	public CreateImageCmd createImageCmd(String repository,
-			InputStream imageStream);
+    public CreateImageCmd createImageCmd(String repository, InputStream imageStream);
 
-	public SearchImagesCmd searchImagesCmd(String term);
+    public SearchImagesCmd searchImagesCmd(String term);
 
-	public RemoveImageCmd removeImageCmd(String imageId);
+    public RemoveImageCmd removeImageCmd(String imageId);
 
-	public ListImagesCmd listImagesCmd();
+    public ListImagesCmd listImagesCmd();
+
+    public InspectImageCmd inspectImageCmd(String imageId);
 
-	public InspectImageCmd inspectImageCmd(String imageId);
-    
     public SaveImageCmd saveImageCmd(String name);
 
-	/**
-	 * * CONTAINER API *
-	 */
-
-	public ListContainersCmd listContainersCmd();
-
-	public CreateContainerCmd createContainerCmd(String image);
-
-	/**
-	 * Creates a new {@link StartContainerCmd} for the container with the
-	 * given ID.
-	 * The command can then be further customized by using builder
-	 * methods on it like {@link StartContainerCmd#withDns(String...)}.
-	 * <p>
-	 * <b>If you customize the command, any existing configuration of the
-	 * target container will get reset to its default before applying the
-	 * new configuration. To preserve the existing configuration, use an 
-	 * unconfigured {@link StartContainerCmd}.</b> 
-	 * <p>
-	 * This command corresponds to the <code>/containers/{id}/start</code>
-	 * endpoint of the Docker Remote API.
-	 */
-	public StartContainerCmd startContainerCmd(String containerId);
+    /**
+     * * CONTAINER API *
+     */
+
+    public ListContainersCmd listContainersCmd();
+
+    public CreateContainerCmd createContainerCmd(String image);
+
+    /**
+     * Creates a new {@link StartContainerCmd} for the container with the given ID. The command can then be further
+     * customized by using builder methods on it like {@link StartContainerCmd#withDns(String...)}.
+     * <p>
+     * <b>If you customize the command, any existing configuration of the target container will get reset to its default
+     * before applying the new configuration. To preserve the existing configuration, use an unconfigured
+     * {@link StartContainerCmd}.</b>
+     * <p>
+     * This command corresponds to the <code>/containers/{id}/start</code> endpoint of the Docker Remote API.
+     */
+    public StartContainerCmd startContainerCmd(String containerId);
 
     public ExecCreateCmd execCreateCmd(String containerId);
 
-	public InspectContainerCmd inspectContainerCmd(String containerId);
+    public InspectContainerCmd inspectContainerCmd(String containerId);
 
-	public RemoveContainerCmd removeContainerCmd(String containerId);
+    public RemoveContainerCmd removeContainerCmd(String containerId);
 
-	public WaitContainerCmd waitContainerCmd(String containerId);
+    public WaitContainerCmd waitContainerCmd(String containerId);
 
-	public AttachContainerCmd attachContainerCmd(String containerId);
+    public AttachContainerCmd attachContainerCmd(String containerId);
 
     public ExecStartCmd execStartCmd(String containerId);
 
     public InspectExecCmd inspectExecCmd(String execId);
 
-	public LogContainerCmd logContainerCmd(String containerId);
+    public LogContainerCmd logContainerCmd(String containerId);
 
-	public CopyFileFromContainerCmd copyFileFromContainerCmd(
-			String containerId, String resource);
+    public CopyFileFromContainerCmd copyFileFromContainerCmd(String containerId, String resource);
 
-	public ContainerDiffCmd containerDiffCmd(String containerId);
+    public ContainerDiffCmd containerDiffCmd(String containerId);
 
-	public StopContainerCmd stopContainerCmd(String containerId);
+    public StopContainerCmd stopContainerCmd(String containerId);
 
-	public KillContainerCmd killContainerCmd(String containerId);
+    public KillContainerCmd killContainerCmd(String containerId);
 
-	public RestartContainerCmd restartContainerCmd(String containerId);
+    public RestartContainerCmd restartContainerCmd(String containerId);
 
-	public CommitCmd commitCmd(String containerId);
+    public CommitCmd commitCmd(String containerId);
 
     public BuildImageCmd buildImageCmd();
 
-	public BuildImageCmd buildImageCmd(File dockerFileOrFolder);
+    public BuildImageCmd buildImageCmd(File dockerFileOrFolder);
+
+    public BuildImageCmd buildImageCmd(InputStream tarInputStream);
+
+    public TopContainerCmd topContainerCmd(String containerId);
 
-	public BuildImageCmd buildImageCmd(InputStream tarInputStream);
+    public TagImageCmd tagImageCmd(String imageId, String repository, String tag);
 
-	public TopContainerCmd topContainerCmd(String containerId);
+    public PauseContainerCmd pauseContainerCmd(String containerId);
 
-	public TagImageCmd tagImageCmd(String imageId, String repository, String tag);
-	
-	public PauseContainerCmd pauseContainerCmd(String containerId);
-	
-	public UnpauseContainerCmd unpauseContainerCmd(String containerId);
+    public UnpauseContainerCmd unpauseContainerCmd(String containerId);
 
-	public EventsCmd eventsCmd(EventCallback eventCallback);
+    public EventsCmd eventsCmd(EventCallback eventCallback);
 
-	public StatsCmd statsCmd(StatsCallback statsCallback);
+    public StatsCmd statsCmd(StatsCallback statsCallback);
 
-	@Override
-	public void close() throws IOException;
+    @Override
+    public void close() throws IOException;
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/DockerClientException.java b/src/main/java/com/github/dockerjava/api/DockerClientException.java
index 85efc3498..538698bb6 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClientException.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClientException.java
@@ -6,8 +6,8 @@
  */
 public class DockerClientException extends RuntimeException {
 
-private static final long serialVersionUID = 7667768099261650608L;
-	
+    private static final long serialVersionUID = 7667768099261650608L;
+
     public DockerClientException(String message) {
         super(message);
     }
diff --git a/src/main/java/com/github/dockerjava/api/DockerException.java b/src/main/java/com/github/dockerjava/api/DockerException.java
index 673bf2ccc..48bb2dd90 100644
--- a/src/main/java/com/github/dockerjava/api/DockerException.java
+++ b/src/main/java/com/github/dockerjava/api/DockerException.java
@@ -1,8 +1,5 @@
 package com.github.dockerjava.api;
 
-
-
-
 /**
  *
  * @author Konstantin Pelykh (kpelykh@gmail.com)
@@ -11,9 +8,9 @@
 
 public class DockerException extends RuntimeException {
 
-private static final long serialVersionUID = 7667768099261650608L;
-	
-	private int httpStatus = 0;
+    private static final long serialVersionUID = 7667768099261650608L;
+
+    private int httpStatus = 0;
 
     public DockerException(String message, int httpStatus) {
         super(message);
@@ -23,8 +20,8 @@ public DockerException(String message, int httpStatus) {
     public DockerException(String message, int httpStatus, Throwable cause) {
         super(message, cause);
     }
-    
+
     public int getHttpStatus() {
-		return httpStatus;
-	}
+        return httpStatus;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/InternalServerErrorException.java b/src/main/java/com/github/dockerjava/api/InternalServerErrorException.java
index 366484e53..cda5602ed 100644
--- a/src/main/java/com/github/dockerjava/api/InternalServerErrorException.java
+++ b/src/main/java/com/github/dockerjava/api/InternalServerErrorException.java
@@ -5,17 +5,17 @@
  */
 public class InternalServerErrorException extends DockerException {
 
-	private static final long serialVersionUID = -2450396075981100160L;
+    private static final long serialVersionUID = -2450396075981100160L;
 
-	public InternalServerErrorException(String message, Throwable cause) {
+    public InternalServerErrorException(String message, Throwable cause) {
         super(message, 500, cause);
     }
-	
-	public InternalServerErrorException(String message) {
+
+    public InternalServerErrorException(String message) {
         this(message, null);
     }
-	
-	public InternalServerErrorException(Throwable cause) {
+
+    public InternalServerErrorException(Throwable cause) {
         this(cause.getMessage(), cause);
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/NotAcceptableException.java b/src/main/java/com/github/dockerjava/api/NotAcceptableException.java
index affa4ce9b..78345a68b 100644
--- a/src/main/java/com/github/dockerjava/api/NotAcceptableException.java
+++ b/src/main/java/com/github/dockerjava/api/NotAcceptableException.java
@@ -5,17 +5,17 @@
  */
 public class NotAcceptableException extends DockerException {
 
-	private static final long serialVersionUID = -1771212181727204375L;
+    private static final long serialVersionUID = -1771212181727204375L;
 
-	public NotAcceptableException(String message, Throwable cause) {
+    public NotAcceptableException(String message, Throwable cause) {
         super(message, 406, cause);
     }
-	
-	public NotAcceptableException(String message) {
+
+    public NotAcceptableException(String message) {
         this(message, null);
     }
-	
-	public NotAcceptableException(Throwable cause) {
+
+    public NotAcceptableException(Throwable cause) {
         this(cause.getMessage(), cause);
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/NotFoundException.java b/src/main/java/com/github/dockerjava/api/NotFoundException.java
index 10f328cdc..67e6f18bf 100644
--- a/src/main/java/com/github/dockerjava/api/NotFoundException.java
+++ b/src/main/java/com/github/dockerjava/api/NotFoundException.java
@@ -7,17 +7,17 @@
  */
 public class NotFoundException extends DockerException {
 
-	private static final long serialVersionUID = -2450396075981100160L;
+    private static final long serialVersionUID = -2450396075981100160L;
 
-	public NotFoundException(String message, Throwable cause) {
+    public NotFoundException(String message, Throwable cause) {
         super(message, 404, cause);
     }
-	
-	public NotFoundException(String message) {
+
+    public NotFoundException(String message) {
         this(message, null);
     }
-	
-	public NotFoundException(Throwable cause) {
+
+    public NotFoundException(Throwable cause) {
         this(cause.getMessage(), cause);
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/NotModifiedException.java b/src/main/java/com/github/dockerjava/api/NotModifiedException.java
index d521bae2d..fa0aa459f 100644
--- a/src/main/java/com/github/dockerjava/api/NotModifiedException.java
+++ b/src/main/java/com/github/dockerjava/api/NotModifiedException.java
@@ -5,17 +5,17 @@
  */
 public class NotModifiedException extends DockerException {
 
-	private static final long serialVersionUID = -290093024775500239L;
+    private static final long serialVersionUID = -290093024775500239L;
 
-	public NotModifiedException(String message, Throwable cause) {
+    public NotModifiedException(String message, Throwable cause) {
         super(message, 304, cause);
     }
-	
-	public NotModifiedException(String message) {
+
+    public NotModifiedException(String message) {
         this(message, null);
     }
-	
-	public NotModifiedException(Throwable cause) {
+
+    public NotModifiedException(Throwable cause) {
         this(cause.getMessage(), cause);
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/UnauthorizedException.java b/src/main/java/com/github/dockerjava/api/UnauthorizedException.java
index 5d48d2163..b097d6523 100644
--- a/src/main/java/com/github/dockerjava/api/UnauthorizedException.java
+++ b/src/main/java/com/github/dockerjava/api/UnauthorizedException.java
@@ -5,17 +5,17 @@
  */
 public class UnauthorizedException extends DockerException {
 
-	private static final long serialVersionUID = 8257731964780578278L;
+    private static final long serialVersionUID = 8257731964780578278L;
 
-	public UnauthorizedException(String message, Throwable cause) {
+    public UnauthorizedException(String message, Throwable cause) {
         super(message, 401, cause);
     }
-	
-	public UnauthorizedException(String message) {
+
+    public UnauthorizedException(String message) {
         this(message, null);
     }
-	
-	public UnauthorizedException(Throwable cause) {
+
+    public UnauthorizedException(Throwable cause) {
         this(cause.getMessage(), cause);
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
index 0fb72d452..c45a73247 100644
--- a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
@@ -18,64 +18,60 @@
  * @param stderr
  *            - true or false, includes stderr log. Defaults to false.
  * @param timestamps
- *            - true or false, if true, print timestamps for every log line.
- *            Defaults to false.
+ *            - true or false, if true, print timestamps for every log line. Defaults to false.
  */
 public interface AttachContainerCmd extends DockerCmd<InputStream> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public boolean hasLogsEnabled();
+    public boolean hasLogsEnabled();
 
-	public boolean hasFollowStreamEnabled();
+    public boolean hasFollowStreamEnabled();
 
-	public boolean hasTimestampsEnabled();
+    public boolean hasTimestampsEnabled();
 
-	public boolean hasStdoutEnabled();
+    public boolean hasStdoutEnabled();
 
-	public boolean hasStderrEnabled();
+    public boolean hasStderrEnabled();
 
-	public AttachContainerCmd withContainerId(String containerId);
+    public AttachContainerCmd withContainerId(String containerId);
 
-	/**
-	 * See {@link #withFollowStream(boolean)}
-	 */
-	public AttachContainerCmd withFollowStream();
+    /**
+     * See {@link #withFollowStream(boolean)}
+     */
+    public AttachContainerCmd withFollowStream();
 
-	/**
-	 * Following the stream means the resulting {@link InputStream} returned by
-	 * {@link #exec()} reads infinitely. So a {@link InputStream#read()} MAY
-	 * BLOCK FOREVER as long as no data is streamed from the docker host to
-	 * {@link DockerClient}!
-	 */
-	public AttachContainerCmd withFollowStream(boolean followStream);
+    /**
+     * Following the stream means the resulting {@link InputStream} returned by {@link #exec()} reads infinitely. So a
+     * {@link InputStream#read()} MAY BLOCK FOREVER as long as no data is streamed from the docker host to
+     * {@link DockerClient}!
+     */
+    public AttachContainerCmd withFollowStream(boolean followStream);
 
-	public AttachContainerCmd withTimestamps(boolean timestamps);
+    public AttachContainerCmd withTimestamps(boolean timestamps);
 
-	public AttachContainerCmd withStdOut();
+    public AttachContainerCmd withStdOut();
 
-	public AttachContainerCmd withStdOut(boolean stdout);
+    public AttachContainerCmd withStdOut(boolean stdout);
 
-	public AttachContainerCmd withStdErr();
+    public AttachContainerCmd withStdErr();
 
-	public AttachContainerCmd withStdErr(boolean stderr);
+    public AttachContainerCmd withStdErr(boolean stderr);
 
-	public AttachContainerCmd withLogs(boolean logs);
+    public AttachContainerCmd withLogs(boolean logs);
 
-	public AttachContainerCmd withLogs();
+    public AttachContainerCmd withLogs();
 
-	/**
-	 * Its the responsibility of the caller to consume and/or close the
-	 * {@link InputStream} to prevent connection leaks.
-	 * 
-	 * @throws NotFoundException
-	 *             No such container
-	 */
-	@Override
-	public InputStream exec() throws NotFoundException;
+    /**
+     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
+     * 
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public InputStream exec() throws NotFoundException;
 
-	public static interface Exec extends
-			DockerCmdExec<AttachContainerCmd, InputStream> {
-	}
+    public static interface Exec extends DockerCmdExec<AttachContainerCmd, InputStream> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
index 3c5922583..c84fcb3b9 100644
--- a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
@@ -10,20 +10,21 @@
  * 
  */
 public interface AuthCmd extends DockerCmd<AuthResponse> {
-	
-	public AuthConfig getAuthConfig();
 
-	public AuthCmd withAuthConfig(AuthConfig authConfig);
+    public AuthConfig getAuthConfig();
+
+    public AuthCmd withAuthConfig(AuthConfig authConfig);
 
     /**
      * @return The status. Based on it's value you may mean you need to authorise your account, e.g.:
-     *  "Account created. Please see the documentation of the registry http://localhost:5000/v1/ for instructions how to activate it."
-     * @throws UnauthorizedException If you're not authorised (e.g. bad password).
+     *         "Account created. Please see the documentation of the registry http://localhost:5000/v1/ for instructions how to activate it."
+     * @throws UnauthorizedException
+     *             If you're not authorised (e.g. bad password).
      */
-	@Override
-	public AuthResponse exec() throws UnauthorizedException;
-	
-	public static interface Exec extends DockerCmdExec<AuthCmd, AuthResponse> {
-	}
+    @Override
+    public AuthResponse exec() throws UnauthorizedException;
+
+    public static interface Exec extends DockerCmdExec<AuthCmd, AuthResponse> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 925946db4..5dd1cc177 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -14,58 +14,58 @@
  * TODO: http://docs.docker.com/reference/builder/#dockerignore
  * 
  */
-public interface BuildImageCmd extends DockerCmd<BuildImageCmd.Response>{
+public interface BuildImageCmd extends DockerCmd<BuildImageCmd.Response> {
 
-	public BuildImageCmd withTag(String tag);
+    public BuildImageCmd withTag(String tag);
 
-	public InputStream getTarInputStream();
+    public InputStream getTarInputStream();
 
-	public String getTag();
+    public String getTag();
 
-	public boolean hasNoCacheEnabled();
+    public boolean hasNoCacheEnabled();
 
-	public boolean hasRemoveEnabled();
-	
-	public boolean isQuiet();
-	
-	public boolean hasPullEnabled();
+    public boolean hasRemoveEnabled();
+
+    public boolean isQuiet();
+
+    public boolean hasPullEnabled();
 
     public String getPathToDockerfile();
 
-	public AuthConfigurations getBuildAuthConfigs();
+    public AuthConfigurations getBuildAuthConfigs();
 
     public BuildImageCmd withBaseDirectory(File baseDirectory);
 
     public BuildImageCmd withDockerfile(File dockerfile);
-	
-	public BuildImageCmd withTarInputStream(InputStream tarInputStream);
-
-	public BuildImageCmd withNoCache();
-
-	public BuildImageCmd withNoCache(boolean noCache);
-	
-	public BuildImageCmd withRemove();
-
-	public BuildImageCmd withRemove(boolean rm);
-	
-	public BuildImageCmd withQuiet();
-
-	public BuildImageCmd withQuiet(boolean quiet);
-	
-	public BuildImageCmd withPull();
-
-	public BuildImageCmd withPull(boolean pull);
-	
-  	public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfig);
-	
-	public static interface Exec extends DockerCmdExec<BuildImageCmd, BuildImageCmd.Response> {
-	}
-
-	/**
-	 * @see  {@link com.github.dockerjava.core.command.EventStreamReader}
-	 */
-  public static abstract class Response extends InputStream {
-    public abstract Iterable<EventStreamItem> getItems() throws IOException;
-  }
+
+    public BuildImageCmd withTarInputStream(InputStream tarInputStream);
+
+    public BuildImageCmd withNoCache();
+
+    public BuildImageCmd withNoCache(boolean noCache);
+
+    public BuildImageCmd withRemove();
+
+    public BuildImageCmd withRemove(boolean rm);
+
+    public BuildImageCmd withQuiet();
+
+    public BuildImageCmd withQuiet(boolean quiet);
+
+    public BuildImageCmd withPull();
+
+    public BuildImageCmd withPull(boolean pull);
+
+    public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfig);
+
+    public static interface Exec extends DockerCmdExec<BuildImageCmd, BuildImageCmd.Response> {
+    }
+
+    /**
+     * @see {@link com.github.dockerjava.core.command.EventStreamReader}
+     */
+    public static abstract class Response extends InputStream {
+        public abstract Iterable<EventStreamItem> getItems() throws IOException;
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
index ac0a7bb5e..2c24a0f42 100644
--- a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
@@ -5,111 +5,112 @@
 import com.github.dockerjava.api.model.Volumes;
 
 /**
-*
-* Create a new image from a container's changes. Returns the new image ID.
-*
-*/
-public interface CommitCmd extends DockerCmd<String>{
+ *
+ * Create a new image from a container's changes. Returns the new image ID.
+ *
+ */
+public interface CommitCmd extends DockerCmd<String> {
 
-	public String getContainerId();
-	
-	public CommitCmd withContainerId(String containerId);
+    public String getContainerId();
 
-	public String getRepository();
+    public CommitCmd withContainerId(String containerId);
 
-	public String getTag();
+    public String getRepository();
 
-	public String getMessage();
+    public String getTag();
 
-	public String getAuthor();
+    public String getMessage();
 
-	public boolean hasPauseEnabled();
+    public String getAuthor();
 
-	public CommitCmd withAttachStderr(boolean attachStderr);
+    public boolean hasPauseEnabled();
 
-	public CommitCmd withAttachStderr();
+    public CommitCmd withAttachStderr(boolean attachStderr);
 
-	public CommitCmd withAttachStdin(boolean attachStdin);
+    public CommitCmd withAttachStderr();
 
-	public CommitCmd withAttachStdin();
+    public CommitCmd withAttachStdin(boolean attachStdin);
 
-	public CommitCmd withAttachStdout(boolean attachStdout);
+    public CommitCmd withAttachStdin();
 
-	public CommitCmd withAttachStdout();
+    public CommitCmd withAttachStdout(boolean attachStdout);
 
-	public CommitCmd withCmd(String... cmd);
+    public CommitCmd withAttachStdout();
 
-	public CommitCmd withDisableNetwork(boolean disableNetwork);
+    public CommitCmd withCmd(String... cmd);
 
-	public CommitCmd withAuthor(String author);
+    public CommitCmd withDisableNetwork(boolean disableNetwork);
 
-	public CommitCmd withMessage(String message);
+    public CommitCmd withAuthor(String author);
 
-	public CommitCmd withTag(String tag);
+    public CommitCmd withMessage(String message);
 
-	public CommitCmd withRepository(String repository);
+    public CommitCmd withTag(String tag);
 
-	public CommitCmd withPause(boolean pause);
+    public CommitCmd withRepository(String repository);
 
-	public String[] getEnv();
+    public CommitCmd withPause(boolean pause);
 
-	public CommitCmd withEnv(String... env);
+    public String[] getEnv();
 
-	public ExposedPorts getExposedPorts();
+    public CommitCmd withEnv(String... env);
 
-	public CommitCmd withExposedPorts(ExposedPorts exposedPorts);
+    public ExposedPorts getExposedPorts();
 
-	public String getHostname();
+    public CommitCmd withExposedPorts(ExposedPorts exposedPorts);
 
-	public CommitCmd withHostname(String hostname);
+    public String getHostname();
 
-	public Integer getMemory();
+    public CommitCmd withHostname(String hostname);
 
-	public CommitCmd withMemory(Integer memory);
+    public Integer getMemory();
 
-	public Integer getMemorySwap();
+    public CommitCmd withMemory(Integer memory);
 
-	public CommitCmd withMemorySwap(Integer memorySwap);
+    public Integer getMemorySwap();
 
-	public boolean isOpenStdin();
+    public CommitCmd withMemorySwap(Integer memorySwap);
 
-	public CommitCmd withOpenStdin(boolean openStdin);
+    public boolean isOpenStdin();
 
-	public String[] getPortSpecs();
+    public CommitCmd withOpenStdin(boolean openStdin);
 
-	public CommitCmd withPortSpecs(String... portSpecs);
+    public String[] getPortSpecs();
 
-	public boolean isStdinOnce();
+    public CommitCmd withPortSpecs(String... portSpecs);
 
-	public CommitCmd withStdinOnce(boolean stdinOnce);
+    public boolean isStdinOnce();
 
-	public CommitCmd withStdinOnce();
+    public CommitCmd withStdinOnce(boolean stdinOnce);
 
-	public boolean isTty();
+    public CommitCmd withStdinOnce();
 
-	public CommitCmd withTty(boolean tty);
+    public boolean isTty();
 
-	public CommitCmd withTty();
+    public CommitCmd withTty(boolean tty);
 
-	public String getUser();
+    public CommitCmd withTty();
 
-	public CommitCmd withUser(String user);
+    public String getUser();
 
-	public Volumes getVolumes();
+    public CommitCmd withUser(String user);
 
-	public CommitCmd withVolumes(Volumes volumes);
+    public Volumes getVolumes();
 
-	public String getWorkingDir();
+    public CommitCmd withVolumes(Volumes volumes);
 
-	public CommitCmd withWorkingDir(String workingDir);
+    public String getWorkingDir();
 
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public String exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<CommitCmd, String> {
-	}
+    public CommitCmd withWorkingDir(String workingDir);
+
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public String exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<CommitCmd, String> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java b/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
index 21d99045d..ed7028460 100644
--- a/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
@@ -9,22 +9,25 @@
 
 public interface ContainerDiffCmd extends DockerCmd<List<ChangeLog>> {
 
-	public String getContainerId();
-
-	public ContainerDiffCmd withContainerId(String containerId);
-
-	@Override
-	public String toString();
-
-	/**
-	 * @throws NotFoundException No such container
-	 * @throws InternalServerErrorException server error
-	 * @throws DockerException unexpected http status code
-	 */
-	@Override
-	public List<ChangeLog> exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<ContainerDiffCmd, List<ChangeLog>> {
-	}
+    public String getContainerId();
+
+    public ContainerDiffCmd withContainerId(String containerId);
+
+    @Override
+    public String toString();
+
+    /**
+     * @throws NotFoundException
+     *             No such container
+     * @throws InternalServerErrorException
+     *             server error
+     * @throws DockerException
+     *             unexpected http status code
+     */
+    @Override
+    public List<ChangeLog> exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<ContainerDiffCmd, List<ChangeLog>> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
index 5e85d9984..eb67dfbd9 100644
--- a/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
@@ -6,28 +6,28 @@
 
 public interface CopyFileFromContainerCmd extends DockerCmd<InputStream> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public String getResource();
+    public String getResource();
 
-	public CopyFileFromContainerCmd withContainerId(String containerId);
+    public CopyFileFromContainerCmd withContainerId(String containerId);
 
-	public CopyFileFromContainerCmd withResource(String resource);
+    public CopyFileFromContainerCmd withResource(String resource);
 
-	public String getHostPath();
+    public String getHostPath();
 
-	public CopyFileFromContainerCmd withHostPath(String hostPath);
+    public CopyFileFromContainerCmd withHostPath(String hostPath);
 
-	/**
-	 * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent
-	 * connection leaks.
-	 * 
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public InputStream exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<CopyFileFromContainerCmd, InputStream> {
-	}
+    /**
+     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
+     * 
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public InputStream exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<CopyFileFromContainerCmd, InputStream> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
index d26824715..a25535d5b 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
@@ -4,31 +4,33 @@
 
 public interface CreateImageCmd extends DockerCmd<CreateImageResponse> {
 
-	public String getRepository();
-
-	// TODO remove method
-	public String getTag();
-	
-	public InputStream getImageStream();
-
-	/**
-	 * @param repository        the repository to import to
-	 */
-	public CreateImageCmd withRepository(String repository);
-
-	/**
-	 * @param imageStream       the InputStream of the tar file
-	 */
-	public CreateImageCmd withImageStream(InputStream imageStream);
-
-	/**
-	 * @param tag               any tag for this image
-	 * @deprecated 				use repo:tag format for repository
-	 */
-	public CreateImageCmd withTag(String tag);
-	
-	public static interface Exec extends DockerCmdExec<CreateImageCmd, CreateImageResponse> {
-	}
-
+    public String getRepository();
+
+    // TODO remove method
+    public String getTag();
+
+    public InputStream getImageStream();
+
+    /**
+     * @param repository
+     *            the repository to import to
+     */
+    public CreateImageCmd withRepository(String repository);
+
+    /**
+     * @param imageStream
+     *            the InputStream of the tar file
+     */
+    public CreateImageCmd withImageStream(InputStream imageStream);
+
+    /**
+     * @param tag
+     *            any tag for this image
+     * @deprecated use repo:tag format for repository
+     */
+    public CreateImageCmd withTag(String tag);
+
+    public static interface Exec extends DockerCmdExec<CreateImageCmd, CreateImageResponse> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmd.java b/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
index 89c31666f..79236b890 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
@@ -4,6 +4,6 @@
 
 public interface DockerCmd<RES_T> extends Closeable {
 
-	public RES_T exec();
+    public RES_T exec();
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExec.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExec.java
index 8cf13e7bb..635395ed0 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExec.java
@@ -1,7 +1,7 @@
 package com.github.dockerjava.api.command;
 
 public interface DockerCmdExec<CMD_T extends DockerCmd<RES_T>, RES_T> {
-	
-	public RES_T exec(CMD_T command);	
+
+    public RES_T exec(CMD_T command);
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index 294d50994..fc750a743 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -7,82 +7,81 @@
 
 public interface DockerCmdExecFactory extends Closeable {
 
-	public void init(DockerClientConfig dockerClientConfig);
+    public void init(DockerClientConfig dockerClientConfig);
 
-	public AuthCmd.Exec createAuthCmdExec();
+    public AuthCmd.Exec createAuthCmdExec();
 
-	public InfoCmd.Exec createInfoCmdExec();
+    public InfoCmd.Exec createInfoCmdExec();
 
-	public PingCmd.Exec createPingCmdExec();
+    public PingCmd.Exec createPingCmdExec();
 
     public ExecCreateCmd.Exec createExecCmdExec();
 
-	public VersionCmd.Exec createVersionCmdExec();
+    public VersionCmd.Exec createVersionCmdExec();
 
-	public PullImageCmd.Exec createPullImageCmdExec();
+    public PullImageCmd.Exec createPullImageCmdExec();
+
+    public PushImageCmd.Exec createPushImageCmdExec();
 
-	public PushImageCmd.Exec createPushImageCmdExec();
-    
     public SaveImageCmd.Exec createSaveImageCmdExec();
 
-	public CreateImageCmd.Exec createCreateImageCmdExec();
+    public CreateImageCmd.Exec createCreateImageCmdExec();
 
-	public SearchImagesCmd.Exec createSearchImagesCmdExec();
+    public SearchImagesCmd.Exec createSearchImagesCmdExec();
 
-	public RemoveImageCmd.Exec createRemoveImageCmdExec();
+    public RemoveImageCmd.Exec createRemoveImageCmdExec();
 
-	public ListImagesCmd.Exec createListImagesCmdExec();
+    public ListImagesCmd.Exec createListImagesCmdExec();
 
-	public InspectImageCmd.Exec createInspectImageCmdExec();
+    public InspectImageCmd.Exec createInspectImageCmdExec();
 
-	public ListContainersCmd.Exec createListContainersCmdExec();
+    public ListContainersCmd.Exec createListContainersCmdExec();
 
-	public CreateContainerCmd.Exec createCreateContainerCmdExec();
+    public CreateContainerCmd.Exec createCreateContainerCmdExec();
 
-	public StartContainerCmd.Exec createStartContainerCmdExec();
+    public StartContainerCmd.Exec createStartContainerCmdExec();
 
-	public InspectContainerCmd.Exec createInspectContainerCmdExec();
+    public InspectContainerCmd.Exec createInspectContainerCmdExec();
 
-	public RemoveContainerCmd.Exec createRemoveContainerCmdExec();
+    public RemoveContainerCmd.Exec createRemoveContainerCmdExec();
 
-	public WaitContainerCmd.Exec createWaitContainerCmdExec();
+    public WaitContainerCmd.Exec createWaitContainerCmdExec();
 
-	public AttachContainerCmd.Exec createAttachContainerCmdExec();
+    public AttachContainerCmd.Exec createAttachContainerCmdExec();
 
     public ExecStartCmd.Exec createExecStartCmdExec();
 
     public InspectExecCmd.Exec createInspectExecCmdExec();
 
-	public LogContainerCmd.Exec createLogContainerCmdExec();
+    public LogContainerCmd.Exec createLogContainerCmdExec();
 
-	public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec();
+    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec();
 
-	public StopContainerCmd.Exec createStopContainerCmdExec();
+    public StopContainerCmd.Exec createStopContainerCmdExec();
 
-	public ContainerDiffCmd.Exec createContainerDiffCmdExec();
+    public ContainerDiffCmd.Exec createContainerDiffCmdExec();
 
-	public KillContainerCmd.Exec createKillContainerCmdExec();
+    public KillContainerCmd.Exec createKillContainerCmdExec();
 
-	public RestartContainerCmd.Exec createRestartContainerCmdExec();
+    public RestartContainerCmd.Exec createRestartContainerCmdExec();
 
-	public CommitCmd.Exec createCommitCmdExec();
+    public CommitCmd.Exec createCommitCmdExec();
 
-	public BuildImageCmd.Exec createBuildImageCmdExec();
+    public BuildImageCmd.Exec createBuildImageCmdExec();
 
-	public TopContainerCmd.Exec createTopContainerCmdExec();
+    public TopContainerCmd.Exec createTopContainerCmdExec();
 
-	public TagImageCmd.Exec createTagImageCmdExec();
+    public TagImageCmd.Exec createTagImageCmdExec();
 
-	public PauseContainerCmd.Exec createPauseContainerCmdExec();
+    public PauseContainerCmd.Exec createPauseContainerCmdExec();
 
-	public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec();
+    public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec();
 
-	public EventsCmd.Exec createEventsCmdExec();
-	
-	public StatsCmd.Exec createStatsCmdExec();
+    public EventsCmd.Exec createEventsCmdExec();
 
+    public StatsCmd.Exec createStatsCmdExec();
 
-	@Override
-	public void close() throws IOException;
+    @Override
+    public void close() throws IOException;
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/EventCallback.java b/src/main/java/com/github/dockerjava/api/command/EventCallback.java
index 18b8669ea..867f186cd 100644
--- a/src/main/java/com/github/dockerjava/api/command/EventCallback.java
+++ b/src/main/java/com/github/dockerjava/api/command/EventCallback.java
@@ -7,7 +7,10 @@
  */
 public interface EventCallback {
     public void onEvent(Event event);
+
     public void onException(Throwable throwable);
+
     public void onCompletion(int numEvents);
+
     public boolean isReceiving();
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java b/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
index cfdb23a64..5a7c2e275 100644
--- a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
@@ -2,12 +2,13 @@
 
 import java.util.concurrent.ExecutorService;
 
-
 /**
  * Get events
  *
- * @param since - Show all events created since timestamp
- * @param until - Stream events until this timestamp
+ * @param since
+ *            - Show all events created since timestamp
+ * @param until
+ *            - Stream events until this timestamp
  */
 public interface EventsCmd extends DockerCmd<ExecutorService> {
     public EventsCmd withSince(String since);
@@ -19,7 +20,7 @@ public interface EventsCmd extends DockerCmd<ExecutorService> {
     public String getUntil();
 
     public EventCallback getEventCallback();
-    
+
     public EventsCmd withEventCallback(EventCallback eventCallback);
 
     public static interface Exec extends DockerCmdExec<EventsCmd, ExecutorService> {
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
index c1f32e293..ffeef0153 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
@@ -3,33 +3,33 @@
 public interface ExecCreateCmd extends DockerCmd<ExecCreateCmdResponse> {
 
     public String getContainerId();
-    
+
     public ExecCreateCmd withContainerId(String containerId);
 
     public ExecCreateCmd withCmd(String... cmd);
 
     public ExecCreateCmd withAttachStdin(boolean attachStdin);
-    
+
     public ExecCreateCmd withAttachStdin();
-    
+
     public boolean hasAttachStdinEnabled();
 
     public ExecCreateCmd withAttachStdout(boolean attachStdout);
-    
+
     public ExecCreateCmd withAttachStdout();
-    
+
     public boolean hasAttachStdoutEnabled();
 
     public ExecCreateCmd withAttachStderr(boolean attachStderr);
-    
+
     public ExecCreateCmd withAttachStderr();
-    
+
     public boolean hasAttachStderrEnabled();
 
     public ExecCreateCmd withTty(boolean tty);
-    
+
     public ExecCreateCmd withTty();
-    
+
     public boolean hasTtyEnabled();
 
     public static interface Exec extends DockerCmdExec<ExecCreateCmd, ExecCreateCmdResponse> {
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
index 7ccb90cff..339e2c9a0 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
@@ -6,33 +6,31 @@
 
 public interface ExecStartCmd extends DockerCmd<InputStream> {
 
-	public String getExecId();
+    public String getExecId();
 
-	public ExecStartCmd withExecId(String execId);
+    public ExecStartCmd withExecId(String execId);
 
-	public boolean hasDetachEnabled();
+    public boolean hasDetachEnabled();
 
-	public ExecStartCmd withDetach(boolean detach);
-	
-	public ExecStartCmd withDetach();
+    public ExecStartCmd withDetach(boolean detach);
 
-	public boolean hasTtyEnabled();
+    public ExecStartCmd withDetach();
 
-	public ExecStartCmd withTty(boolean tty);
-	
-	public ExecStartCmd withTty();
+    public boolean hasTtyEnabled();
 
-	/**
-	 * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent
-	 * connection leaks.
-	 * 
-	 * @throws com.github.dockerjava.api.NotFoundException
-	 *             No such exec instance
-	 */
-	@Override
-	public InputStream exec() throws NotFoundException;
+    public ExecStartCmd withTty(boolean tty);
 
-	public static interface Exec extends
-			DockerCmdExec<ExecStartCmd, InputStream> {
-	}
+    public ExecStartCmd withTty();
+
+    /**
+     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
+     * 
+     * @throws com.github.dockerjava.api.NotFoundException
+     *             No such exec instance
+     */
+    @Override
+    public InputStream exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<ExecStartCmd, InputStream> {
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/InfoCmd.java b/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
index d340fe268..10e3597e6 100644
--- a/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
@@ -4,7 +4,7 @@
 
 public interface InfoCmd extends DockerCmd<Info> {
 
-	public static interface Exec extends DockerCmdExec<InfoCmd, Info> {
-	}
+    public static interface Exec extends DockerCmdExec<InfoCmd, Info> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
index f67fe4aea..e0d087847 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
@@ -4,17 +4,18 @@
 
 public interface InspectContainerCmd extends DockerCmd<InspectContainerResponse> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public InspectContainerCmd withContainerId(String containerId);
+    public InspectContainerCmd withContainerId(String containerId);
 
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public InspectContainerResponse exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<InspectContainerCmd, InspectContainerResponse> {
-	}
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public InspectContainerResponse exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<InspectContainerCmd, InspectContainerResponse> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index f95656899..dc0507e50 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.command;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -19,58 +18,58 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class InspectContainerResponse {
 
-	@JsonProperty("Args")
-	private String[] args;
+    @JsonProperty("Args")
+    private String[] args;
 
-	@JsonProperty("Config")
-	private ContainerConfig config;
+    @JsonProperty("Config")
+    private ContainerConfig config;
 
-	@JsonProperty("Created")
-	private String created;
+    @JsonProperty("Created")
+    private String created;
 
-	@JsonProperty("Driver")
-	private String driver;
+    @JsonProperty("Driver")
+    private String driver;
 
-	@JsonProperty("ExecDriver")
-	private String execDriver;
+    @JsonProperty("ExecDriver")
+    private String execDriver;
 
-	@JsonProperty("HostConfig")
-	private HostConfig hostConfig;
+    @JsonProperty("HostConfig")
+    private HostConfig hostConfig;
 
-	@JsonProperty("HostnamePath")
-	private String hostnamePath;
+    @JsonProperty("HostnamePath")
+    private String hostnamePath;
 
-	@JsonProperty("HostsPath")
-	private String hostsPath;
+    @JsonProperty("HostsPath")
+    private String hostsPath;
 
-	@JsonProperty("Id")
+    @JsonProperty("Id")
     private String id;
 
-	@JsonProperty("Image")
-	private String imageId;
+    @JsonProperty("Image")
+    private String imageId;
 
-	@JsonProperty("MountLabel")
-	private String mountLabel;
+    @JsonProperty("MountLabel")
+    private String mountLabel;
 
-	@JsonProperty("Name")
-	private String name;
+    @JsonProperty("Name")
+    private String name;
 
-	@JsonProperty("NetworkSettings")
-	private NetworkSettings networkSettings;
+    @JsonProperty("NetworkSettings")
+    private NetworkSettings networkSettings;
 
-	@JsonProperty("Path")
+    @JsonProperty("Path")
     private String path;
 
-	@JsonProperty("ProcessLabel")
+    @JsonProperty("ProcessLabel")
     private String processLabel;
 
-	@JsonProperty("ResolvConfPath")
-	private String resolvConfPath;
+    @JsonProperty("ResolvConfPath")
+    private String resolvConfPath;
 
     @JsonProperty("ExecIDs")
     private List<String> execIds;
 
-	@JsonProperty("State")
+    @JsonProperty("State")
     private ContainerState state;
 
     @JsonProperty("Volumes")
@@ -92,8 +91,8 @@ public String getPath() {
     }
 
     public String getProcessLabel() {
-		return processLabel;
-	}
+        return processLabel;
+    }
 
     public String[] getArgs() {
         return args;
@@ -150,12 +149,12 @@ public HostConfig getHostConfig() {
     }
 
     public String getExecDriver() {
-		return execDriver;
-	}
+        return execDriver;
+    }
 
     public String getMountLabel() {
-		return mountLabel;
-	}
+        return mountLabel;
+    }
 
     public List<String> getExecIds() {
         return execIds;
@@ -169,37 +168,47 @@ public String toString() {
     @JsonIgnoreProperties(ignoreUnknown = true)
     public class NetworkSettings {
 
-        @JsonProperty("IPAddress") private String ipAddress;
-        @JsonProperty("IPPrefixLen") private int ipPrefixLen;
-        @JsonProperty("Gateway") private String gateway;
-        @JsonProperty("Bridge") private String bridge;
-        @JsonProperty("PortMapping") private Map<String,Map<String, String>> portMapping;
-        @JsonProperty("Ports") private Ports ports;
+        @JsonProperty("IPAddress")
+        private String ipAddress;
 
-        public String getIpAddress() {
-			return ipAddress;
-		}
+        @JsonProperty("IPPrefixLen")
+        private int ipPrefixLen;
+
+        @JsonProperty("Gateway")
+        private String gateway;
+
+        @JsonProperty("Bridge")
+        private String bridge;
 
-		public int getIpPrefixLen() {
-			return ipPrefixLen;
-		}
+        @JsonProperty("PortMapping")
+        private Map<String, Map<String, String>> portMapping;
 
-		public String getGateway() {
-			return gateway;
-		}
+        @JsonProperty("Ports")
+        private Ports ports;
 
-		public String getBridge() {
-			return bridge;
-		}
+        public String getIpAddress() {
+            return ipAddress;
+        }
+
+        public int getIpPrefixLen() {
+            return ipPrefixLen;
+        }
 
-		public Map<String, Map<String, String>> getPortMapping() {
-			return portMapping;
-		}
+        public String getGateway() {
+            return gateway;
+        }
+
+        public String getBridge() {
+            return bridge;
+        }
 
-		public Ports getPorts() {
-			return ports;
-		}
+        public Map<String, Map<String, String>> getPortMapping() {
+            return portMapping;
+        }
 
+        public Ports getPorts() {
+            return ports;
+        }
 
         @Override
         public String toString() {
@@ -210,36 +219,47 @@ public String toString() {
     @JsonIgnoreProperties(ignoreUnknown = true)
     public class ContainerState {
 
-        @JsonProperty("Running") private boolean running;
-        @JsonProperty("Paused") private boolean paused;
-        @JsonProperty("Pid") private int pid;
-        @JsonProperty("ExitCode") private int exitCode;
-        @JsonProperty("StartedAt") private String startedAt;
-        @JsonProperty("FinishedAt") private String finishedAt;
+        @JsonProperty("Running")
+        private boolean running;
+
+        @JsonProperty("Paused")
+        private boolean paused;
+
+        @JsonProperty("Pid")
+        private int pid;
+
+        @JsonProperty("ExitCode")
+        private int exitCode;
+
+        @JsonProperty("StartedAt")
+        private String startedAt;
+
+        @JsonProperty("FinishedAt")
+        private String finishedAt;
 
         public boolean isRunning() {
-			return running;
-		}
+            return running;
+        }
 
-		public boolean isPaused() {
-			return paused;
-		}
+        public boolean isPaused() {
+            return paused;
+        }
 
-		public int getPid() {
-			return pid;
-		}
+        public int getPid() {
+            return pid;
+        }
 
-		public int getExitCode() {
-			return exitCode;
-		}
+        public int getExitCode() {
+            return exitCode;
+        }
 
-		public String getStartedAt() {
-			return startedAt;
-		}
+        public String getStartedAt() {
+            return startedAt;
+        }
 
-		public String getFinishedAt() {
-			return finishedAt;
-		}
+        public String getFinishedAt() {
+            return finishedAt;
+        }
 
         @Override
         public String toString() {
@@ -248,4 +268,3 @@ public String toString() {
     }
 
 }
-
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
index 13882b8f7..82243614c 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
@@ -4,13 +4,16 @@
 
 public interface InspectExecCmd extends DockerCmd<InspectExecResponse> {
     public String getExecId();
+
     public InspectExecCmd withExecId(String execId);
 
     /**
-     * @throws NotFoundException if no such exec has been found
+     * @throws NotFoundException
+     *             if no such exec has been found
      */
     @Override
     public InspectExecResponse exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<InspectExecCmd, InspectExecResponse> {}
+    public static interface Exec extends DockerCmdExec<InspectExecCmd, InspectExecResponse> {
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
index d064badba..ebf6550d2 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
@@ -5,19 +5,20 @@
 /**
  * Inspect the details of an image.
  */
-public interface InspectImageCmd extends DockerCmd<InspectImageResponse>{
+public interface InspectImageCmd extends DockerCmd<InspectImageResponse> {
 
-	public String getImageId();
+    public String getImageId();
 
-	public InspectImageCmd withImageId(String imageId);
+    public InspectImageCmd withImageId(String imageId);
 
-	/**
-	 * @throws NotFoundException No such image
-	 */
-	@Override
-	public InspectImageResponse exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<InspectImageCmd, InspectImageResponse> {
-	}
+    /**
+     * @throws NotFoundException
+     *             No such image
+     */
+    @Override
+    public InspectImageResponse exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<InspectImageCmd, InspectImageResponse> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
index b5b6432d7..63f5e49c6 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
@@ -14,28 +14,28 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class InspectImageResponse {
 
-	@JsonProperty("Architecture")
+    @JsonProperty("Architecture")
     private String arch;
 
-	@JsonProperty("Author")
+    @JsonProperty("Author")
     private String author;
 
-	@JsonProperty("Comment")
+    @JsonProperty("Comment")
     private String comment;
 
-	@JsonProperty("Config")
+    @JsonProperty("Config")
     private ContainerConfig config;
 
-	@JsonProperty("Container")
+    @JsonProperty("Container")
     private String container;
 
-	@JsonProperty("ContainerConfig")
+    @JsonProperty("ContainerConfig")
     private ContainerConfig containerConfig;
 
-	@JsonProperty("Created")
-	private String created;
+    @JsonProperty("Created")
+    private String created;
 
-	@JsonProperty("DockerVersion")
+    @JsonProperty("DockerVersion")
     private String dockerVersion;
 
     @JsonProperty("Id")
diff --git a/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
index b9522cb8c..33fceba3b 100644
--- a/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
@@ -7,21 +7,22 @@
  */
 public interface KillContainerCmd extends DockerCmd<Void> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public String getSignal();
+    public String getSignal();
 
-	public KillContainerCmd withContainerId(String containerId);
+    public KillContainerCmd withContainerId(String containerId);
 
-	public KillContainerCmd withSignal(String signal);
+    public KillContainerCmd withSignal(String signal);
 
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public Void exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<KillContainerCmd, Void> {
-	}
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public Void exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<KillContainerCmd, Void> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
index ed457dab7..6d641f2e3 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
@@ -7,36 +7,41 @@
 /**
  * List containers
  *
- * @param showAll - true or false, Show all containers. Only running containers are shown by default.
- * @param showSize - true or false, Show the containers sizes. This is false by default.
- * @param limit - Show `limit` last created containers, include non-running ones. There is no limit by default.
- * @param sinceId - Show only containers created since Id, include non-running ones.
- * @param beforeId - Show only containers created before Id, include non-running ones.
+ * @param showAll
+ *            - true or false, Show all containers. Only running containers are shown by default.
+ * @param showSize
+ *            - true or false, Show the containers sizes. This is false by default.
+ * @param limit
+ *            - Show `limit` last created containers, include non-running ones. There is no limit by default.
+ * @param sinceId
+ *            - Show only containers created since Id, include non-running ones.
+ * @param beforeId
+ *            - Show only containers created before Id, include non-running ones.
  *
  */
-public interface ListContainersCmd extends DockerCmd<List<Container>>{
+public interface ListContainersCmd extends DockerCmd<List<Container>> {
 
-	public int getLimit();
+    public int getLimit();
 
-	public boolean hasShowSizeEnabled();
+    public boolean hasShowSizeEnabled();
 
-	public boolean hasShowAllEnabled();
+    public boolean hasShowAllEnabled();
 
-	public String getSinceId();
+    public String getSinceId();
 
-	public String getBeforeId();
+    public String getBeforeId();
 
-	public ListContainersCmd withShowAll(boolean showAll);
+    public ListContainersCmd withShowAll(boolean showAll);
 
-	public ListContainersCmd withShowSize(boolean showSize);
+    public ListContainersCmd withShowSize(boolean showSize);
 
-	public ListContainersCmd withLimit(int limit);
+    public ListContainersCmd withLimit(int limit);
 
-	public ListContainersCmd withSince(String since);
+    public ListContainersCmd withSince(String since);
 
-	public ListContainersCmd withBefore(String before);
-	
-	public static interface Exec extends DockerCmdExec<ListContainersCmd, List<Container>> {
-	}
+    public ListContainersCmd withBefore(String before);
+
+    public static interface Exec extends DockerCmdExec<ListContainersCmd, List<Container>> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java b/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
index fad6d1da7..4c6a899cf 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
@@ -7,20 +7,22 @@
 /**
  * List images
  *
- * @param showAll - Show all images (by default filter out the intermediate images used to build)
- * @param filters - a json encoded value of the filters (a map[string][]string) to process on the images list.
+ * @param showAll
+ *            - Show all images (by default filter out the intermediate images used to build)
+ * @param filters
+ *            - a json encoded value of the filters (a map[string][]string) to process on the images list.
  */
 public interface ListImagesCmd extends DockerCmd<List<Image>> {
 
-	public String getFilters();
+    public String getFilters();
 
-	public boolean hasShowAllEnabled();
+    public boolean hasShowAllEnabled();
 
-	public ListImagesCmd withShowAll(boolean showAll);
+    public ListImagesCmd withShowAll(boolean showAll);
 
-	public ListImagesCmd withFilters(String filters);
+    public ListImagesCmd withFilters(String filters);
 
-	public static interface Exec extends DockerCmdExec<ListImagesCmd, List<Image>> {
-	}
+    public static interface Exec extends DockerCmdExec<ListImagesCmd, List<Image>> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
index c966ef953..ae93b7b21 100644
--- a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -15,74 +15,68 @@
  * @param stderr
  *            - true or false, includes stderr log. Defaults to false.
  * @param timestamps
- *            - true or false, if true, print timestamps for every log line.
- *            Defaults to false.
+ *            - true or false, if true, print timestamps for every log line. Defaults to false.
  * @param tail
- *            - `all` or `<number>`, Output specified number of lines at the end
- *            of logs
+ *            - `all` or `<number>`, Output specified number of lines at the end of logs
  * 
- *            Consider wrapping any input stream you get with a frame reader to
- *            make reading frame easier.
+ *            Consider wrapping any input stream you get with a frame reader to make reading frame easier.
  * 
  * @see com.github.dockerjava.core.command.FrameReader
  */
 public interface LogContainerCmd extends DockerCmd<InputStream> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public int getTail();
+    public int getTail();
 
-	public boolean hasFollowStreamEnabled();
+    public boolean hasFollowStreamEnabled();
 
-	public boolean hasTimestampsEnabled();
+    public boolean hasTimestampsEnabled();
 
-	public boolean hasStdoutEnabled();
+    public boolean hasStdoutEnabled();
 
-	public boolean hasStderrEnabled();
+    public boolean hasStderrEnabled();
 
-	public LogContainerCmd withContainerId(String containerId);
+    public LogContainerCmd withContainerId(String containerId);
 
-	/**
-	 * See {@link #withFollowStream(boolean)}
-	 */
-	public LogContainerCmd withFollowStream();
+    /**
+     * See {@link #withFollowStream(boolean)}
+     */
+    public LogContainerCmd withFollowStream();
 
-	/**
-	 * Following the stream means the resulting {@link InputStream} returned by
-	 * {@link #exec()} reads infinitely. So a {@link InputStream#read()} MAY
-	 * BLOCK FOREVER as long as no data is streamed from the docker host to
-	 * {@link DockerClient}!
-	 */
-	public LogContainerCmd withFollowStream(boolean followStream);
+    /**
+     * Following the stream means the resulting {@link InputStream} returned by {@link #exec()} reads infinitely. So a
+     * {@link InputStream#read()} MAY BLOCK FOREVER as long as no data is streamed from the docker host to
+     * {@link DockerClient}!
+     */
+    public LogContainerCmd withFollowStream(boolean followStream);
 
-	public LogContainerCmd withTimestamps();
+    public LogContainerCmd withTimestamps();
 
-	public LogContainerCmd withTimestamps(boolean timestamps);
+    public LogContainerCmd withTimestamps(boolean timestamps);
 
-	public LogContainerCmd withStdOut();
+    public LogContainerCmd withStdOut();
 
-	public LogContainerCmd withStdOut(boolean stdout);
+    public LogContainerCmd withStdOut(boolean stdout);
 
-	public LogContainerCmd withStdErr();
+    public LogContainerCmd withStdErr();
 
-	public LogContainerCmd withStdErr(boolean stderr);
+    public LogContainerCmd withStdErr(boolean stderr);
 
-	public LogContainerCmd withTailAll();
+    public LogContainerCmd withTailAll();
 
-	public LogContainerCmd withTail(int tail);
+    public LogContainerCmd withTail(int tail);
 
-	/**
-	 * Its the responsibility of the caller to consume and/or close the
-	 * {@link InputStream} to prevent connection leaks.
-	 * 
-	 * @throws NotFoundException
-	 *             No such container
-	 */
-	@Override
-	public InputStream exec() throws NotFoundException;
+    /**
+     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
+     * 
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public InputStream exec() throws NotFoundException;
 
-	public static interface Exec extends
-			DockerCmdExec<LogContainerCmd, InputStream> {
-	}
+    public static interface Exec extends DockerCmdExec<LogContainerCmd, InputStream> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
index 652d433e4..a052c8bcf 100644
--- a/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
@@ -5,22 +5,24 @@
 /**
  * Pause a container.
  *
- * @param containerId - Id of the container
+ * @param containerId
+ *            - Id of the container
  *
  */
-public interface PauseContainerCmd extends DockerCmd<Void>{
+public interface PauseContainerCmd extends DockerCmd<Void> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public PauseContainerCmd withContainerId(String containerId);
+    public PauseContainerCmd withContainerId(String containerId);
 
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public Void exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<PauseContainerCmd, Void> {
-	}
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public Void exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<PauseContainerCmd, Void> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/PingCmd.java b/src/main/java/com/github/dockerjava/api/command/PingCmd.java
index 7d5af1e35..a5d88056a 100644
--- a/src/main/java/com/github/dockerjava/api/command/PingCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PingCmd.java
@@ -1,13 +1,12 @@
 package com.github.dockerjava.api.command;
 
-
 /**
  * Ping the Docker server
  * 
  */
 public interface PingCmd extends DockerCmd<Void> {
-	
-	public static interface Exec extends DockerCmdExec<PingCmd, Void> {
-	}
+
+    public static interface Exec extends DockerCmdExec<PingCmd, Void> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java b/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
index 4b5fc4c32..b3e6db6aa 100644
--- a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
@@ -6,34 +6,33 @@
 import java.io.InputStream;
 
 /**
-*
-* Pull image from repository.
-*
-*/
-public interface PullImageCmd extends DockerCmd<InputStream>{
+ *
+ * Pull image from repository.
+ *
+ */
+public interface PullImageCmd extends DockerCmd<InputStream> {
 
-	public String getRepository();
+    public String getRepository();
 
-	public String getTag();
+    public String getTag();
 
-	public String getRegistry();
+    public String getRegistry();
 
     public AuthConfig getAuthConfig();
 
     public PullImageCmd withRepository(String repository);
 
-	public PullImageCmd withTag(String tag);
+    public PullImageCmd withTag(String tag);
 
-	public PullImageCmd withRegistry(String registry);
+    public PullImageCmd withRegistry(String registry);
 
     public PullImageCmd withAuthConfig(AuthConfig authConfig);
 
     public static interface Exec extends DockerCmdExec<PullImageCmd, InputStream> {
-	}
-    
+    }
+
     /**
-     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent
-	 * connection leaks.
+     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
      *
      * @see {@link EventStreamReader}
      */
diff --git a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java b/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
index 9ed38beb7..6b9a67ebe 100644
--- a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
@@ -11,41 +11,45 @@
 /**
  * Push the latest image to the repository.
  *
- * @param name The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
+ * @param name
+ *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
  */
-public interface PushImageCmd extends DockerCmd<PushImageCmd.Response>{
+public interface PushImageCmd extends DockerCmd<PushImageCmd.Response> {
 
-	public String getName();
+    public String getName();
 
-	public String getTag();
+    public String getTag();
 
-	/**
-	 * @param name The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
-	 */
-	public PushImageCmd withName(String name);
-	
     /**
-     * @param tag The image's tag. Not null.
+     * @param name
+     *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
+     */
+    public PushImageCmd withName(String name);
+
+    /**
+     * @param tag
+     *            The image's tag. Not null.
      */
     public PushImageCmd withTag(String tag);
 
     public AuthConfig getAuthConfig();
-	
-	public PushImageCmd withAuthConfig(AuthConfig authConfig);
-
-	/**
-	 * @throws NotFoundException No such image
-	 */
-	public Response exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<PushImageCmd, Response> {
-	}
-
-	/**
-	 * @see {@link EventStreamReader}
-	 */
-  	public static abstract class Response extends InputStream {
-	  public abstract Iterable<PushEventStreamItem> getItems() throws IOException;
-	}
+
+    public PushImageCmd withAuthConfig(AuthConfig authConfig);
+
+    /**
+     * @throws NotFoundException
+     *             No such image
+     */
+    public Response exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<PushImageCmd, Response> {
+    }
+
+    /**
+     * @see {@link EventStreamReader}
+     */
+    public static abstract class Response extends InputStream {
+        public abstract Iterable<PushEventStreamItem> getItems() throws IOException;
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
index b9c1f9437..9f917a327 100644
--- a/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
@@ -5,32 +5,35 @@
 /**
  * Remove a container.
  * 
- * @param removeVolumes - true or false, Remove the volumes associated to the container. Defaults to false
- * @param force - true or false, Removes the container even if it was running. Defaults to false
+ * @param removeVolumes
+ *            - true or false, Remove the volumes associated to the container. Defaults to false
+ * @param force
+ *            - true or false, Removes the container even if it was running. Defaults to false
  */
 public interface RemoveContainerCmd extends DockerCmd<Void> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public boolean hasRemoveVolumesEnabled();
+    public boolean hasRemoveVolumesEnabled();
 
-	public boolean hasForceEnabled();
+    public boolean hasForceEnabled();
 
-	public RemoveContainerCmd withContainerId(String containerId);
+    public RemoveContainerCmd withContainerId(String containerId);
 
-	public RemoveContainerCmd withRemoveVolumes(boolean removeVolumes);
+    public RemoveContainerCmd withRemoveVolumes(boolean removeVolumes);
 
-	public RemoveContainerCmd withForce();
+    public RemoveContainerCmd withForce();
 
-	public RemoveContainerCmd withForce(boolean force);
+    public RemoveContainerCmd withForce(boolean force);
 
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public Void exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<RemoveContainerCmd, Void> {
-	}
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public Void exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<RemoveContainerCmd, Void> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
index be65ca41e..1ce1cd210 100644
--- a/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
@@ -3,48 +3,49 @@
 import com.github.dockerjava.api.NotFoundException;
 
 /**
-*
-* Remove an image, deleting any tags it might have.
-*
-*/
-public interface RemoveImageCmd extends DockerCmd<Void>{
-
-	public String getImageId();
-
-	public boolean hasForceEnabled();
-
-	public boolean hasNoPruneEnabled();
-
-	public RemoveImageCmd withImageId(String imageId);
-	
-	/**
-	 * force delete of an image, even if it's tagged in multiple repositories
-	 */
-	public RemoveImageCmd withForce();
-
-	/**
-	 * force parameter to force delete of an image, even if it's tagged in multiple repositories
-	 */
-	public RemoveImageCmd withForce(boolean force);
-
-	/**
-	 * prevent the deletion of parent images
-	 */
-	public RemoveImageCmd withNoPrune();
-	
-	/**
-	 * noprune parameter to prevent the deletion of parent images
-	 * 
-	 */
-	public RemoveImageCmd withNoPrune(boolean noPrune);
-
-	/**
-	 * @throws NotFoundException No such image
-	 */
-	@Override
-	public Void exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<RemoveImageCmd, Void> {
-	}
+ *
+ * Remove an image, deleting any tags it might have.
+ *
+ */
+public interface RemoveImageCmd extends DockerCmd<Void> {
+
+    public String getImageId();
+
+    public boolean hasForceEnabled();
+
+    public boolean hasNoPruneEnabled();
+
+    public RemoveImageCmd withImageId(String imageId);
+
+    /**
+     * force delete of an image, even if it's tagged in multiple repositories
+     */
+    public RemoveImageCmd withForce();
+
+    /**
+     * force parameter to force delete of an image, even if it's tagged in multiple repositories
+     */
+    public RemoveImageCmd withForce(boolean force);
+
+    /**
+     * prevent the deletion of parent images
+     */
+    public RemoveImageCmd withNoPrune();
+
+    /**
+     * noprune parameter to prevent the deletion of parent images
+     * 
+     */
+    public RemoveImageCmd withNoPrune(boolean noPrune);
+
+    /**
+     * @throws NotFoundException
+     *             No such image
+     */
+    @Override
+    public Void exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<RemoveImageCmd, Void> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
index 8da41d38a..aa07fffd1 100644
--- a/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
@@ -5,26 +5,28 @@
 /**
  * Restart a running container.
  *
- * @param timeout - Timeout in seconds before killing the container. Defaults to 10 seconds.
+ * @param timeout
+ *            - Timeout in seconds before killing the container. Defaults to 10 seconds.
  *
  */
 public interface RestartContainerCmd extends DockerCmd<Void> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public int getTimeout();
+    public int getTimeout();
 
-	public RestartContainerCmd withContainerId(String containerId);
+    public RestartContainerCmd withContainerId(String containerId);
 
-	public RestartContainerCmd withtTimeout(int timeout);
+    public RestartContainerCmd withtTimeout(int timeout);
 
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public Void exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<RestartContainerCmd, Void> {
-	}
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public Void exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<RestartContainerCmd, Void> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java b/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
index 48c5f3191..67425ab66 100644
--- a/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
@@ -4,32 +4,33 @@
 
 import java.io.InputStream;
 
-public interface SaveImageCmd extends DockerCmd<InputStream>{
+public interface SaveImageCmd extends DockerCmd<InputStream> {
 
     public String getName();
 
     public String getTag();
 
     /**
-     * @param name The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
+     * @param name
+     *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
      */
     public SaveImageCmd withName(String name);
 
     /**
-     * @param tag The image's tag. Not null.
+     * @param tag
+     *            The image's tag. Not null.
      */
     public SaveImageCmd withTag(String tag);
 
     /**
-     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent
-	 * connection leaks.
-	 * 
-     * @throws com.github.dockerjava.api.NotFoundException No such image
+     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
+     * 
+     * @throws com.github.dockerjava.api.NotFoundException
+     *             No such image
      */
     public InputStream exec() throws NotFoundException;
 
     public static interface Exec extends DockerCmdExec<SaveImageCmd, InputStream> {
     }
 
-
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java b/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
index c609e6e8e..9279272d3 100644
--- a/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
@@ -7,16 +7,17 @@
 /**
  * Search images
  *
- * @param term - search term
+ * @param term
+ *            - search term
  *
  */
 public interface SearchImagesCmd extends DockerCmd<List<SearchItem>> {
 
-	public String getTerm();
+    public String getTerm();
 
-	public SearchImagesCmd withTerm(String term);
-	
-	public static interface Exec extends DockerCmdExec<SearchImagesCmd, List<SearchItem>> {
-	}
+    public SearchImagesCmd withTerm(String term);
+
+    public static interface Exec extends DockerCmdExec<SearchImagesCmd, List<SearchItem>> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/StatsCallback.java b/src/main/java/com/github/dockerjava/api/command/StatsCallback.java
index 610c0f831..af263f8ef 100644
--- a/src/main/java/com/github/dockerjava/api/command/StatsCallback.java
+++ b/src/main/java/com/github/dockerjava/api/command/StatsCallback.java
@@ -7,7 +7,10 @@
  */
 public interface StatsCallback {
     public void onStats(Statistics stats);
+
     public void onException(Throwable throwable);
+
     public void onCompletion(int numStats);
+
     public boolean isReceiving();
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/StatsCmd.java b/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
index a605d4267..02d8bcf90 100644
--- a/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
@@ -2,18 +2,17 @@
 
 import java.util.concurrent.ExecutorService;
 
-
 /**
  * Get stats
  *
  */
 public interface StatsCmd extends DockerCmd<ExecutorService> {
     public StatsCmd withContainerId(String containerId);
-    
+
     public String getContainerId();
-    
+
     public StatsCmd withStatsCallback(StatsCallback statsCallback);
-    
+
     public StatsCallback getStatsCallback();
 
     public static interface Exec extends DockerCmdExec<StatsCmd, ExecutorService> {
diff --git a/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
index 19c248552..d5bf2e610 100644
--- a/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
@@ -6,28 +6,32 @@
 /**
  * Stop a running container.
  *
- * @param containerId - Id of the container
- * @param timeout - Timeout in seconds before killing the container. Defaults to 10 seconds.
+ * @param containerId
+ *            - Id of the container
+ * @param timeout
+ *            - Timeout in seconds before killing the container. Defaults to 10 seconds.
  *
  */
 public interface StopContainerCmd extends DockerCmd<Void> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public int getTimeout();
+    public int getTimeout();
 
-	public StopContainerCmd withContainerId(String containerId);
+    public StopContainerCmd withContainerId(String containerId);
 
-	public StopContainerCmd withTimeout(int timeout);
+    public StopContainerCmd withTimeout(int timeout);
 
-	/**
-	 * @throws NotFoundException No such container
-	 * @throws NotModifiedException Container already stopped
-	 */
-	@Override
-	public Void exec() throws NotFoundException, NotModifiedException;
-	
-	public static interface Exec extends DockerCmdExec<StopContainerCmd, Void> {
-	}
+    /**
+     * @throws NotFoundException
+     *             No such container
+     * @throws NotModifiedException
+     *             Container already stopped
+     */
+    @Override
+    public Void exec() throws NotFoundException, NotModifiedException;
+
+    public static interface Exec extends DockerCmdExec<StopContainerCmd, Void> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java b/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
index ace84996e..44fd588f1 100644
--- a/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
@@ -1,35 +1,37 @@
 package com.github.dockerjava.api.command;
 
-
 /**
  * Tag an image into a repository
  *
- * @param image			The local image to tag (either a name or an id)
- * @param repository 	The repository to tag in
- * @param force         (not documented)
+ * @param image
+ *            The local image to tag (either a name or an id)
+ * @param repository
+ *            The repository to tag in
+ * @param force
+ *            (not documented)
  * 
  */
 public interface TagImageCmd extends DockerCmd<Void> {
 
-	public String getImageId();
+    public String getImageId();
+
+    public String getRepository();
 
-	public String getRepository();
+    public String getTag();
 
-	public String getTag();
+    public boolean hasForceEnabled();
 
-	public boolean hasForceEnabled();
+    public TagImageCmd withImageId(String imageId);
 
-	public TagImageCmd withImageId(String imageId);
+    public TagImageCmd withRepository(String repository);
 
-	public TagImageCmd withRepository(String repository);
+    public TagImageCmd withTag(String tag);
 
-	public TagImageCmd withTag(String tag);
+    public TagImageCmd withForce();
 
-	public TagImageCmd withForce();
+    public TagImageCmd withForce(boolean force);
 
-	public TagImageCmd withForce(boolean force);
-	
-	public static interface Exec extends DockerCmdExec<TagImageCmd, Void> {
-	}
+    public static interface Exec extends DockerCmdExec<TagImageCmd, Void> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
index 63865c2a6..cc7e33aa3 100644
--- a/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
@@ -7,21 +7,22 @@
  */
 public interface TopContainerCmd extends DockerCmd<TopContainerResponse> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public String getPsArgs();
+    public String getPsArgs();
 
-	public TopContainerCmd withContainerId(String containerId);
+    public TopContainerCmd withContainerId(String containerId);
 
-	public TopContainerCmd withPsArgs(String psArgs);
+    public TopContainerCmd withPsArgs(String psArgs);
 
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public TopContainerResponse exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<TopContainerCmd, TopContainerResponse> {
-	}
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public TopContainerResponse exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<TopContainerCmd, TopContainerResponse> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
index c92ffa4ce..8864167f3 100644
--- a/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
@@ -12,32 +12,30 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class TopContainerResponse {
 
-	@JsonProperty("Titles")
-	private String[] titles;
+    @JsonProperty("Titles")
+    private String[] titles;
 
-	@JsonProperty("Processes")
-	private String[][] processes;
+    @JsonProperty("Processes")
+    private String[][] processes;
 
-	public String[] getTitles() {
-		return titles;
-	}
+    public String[] getTitles() {
+        return titles;
+    }
 
-	public String[][] getProcesses() {
-		return processes;
-	}
+    public String[][] getProcesses() {
+        return processes;
+    }
 
-	@Override
+    @Override
     public String toString() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("[");
-		for(String[] fields: processes) {
-			buffer.append("[" + Joiner.on("; ").skipNulls().join(fields) + "]");
-		}
-		buffer.append("]");
-
-        return "TopContainerResponse{" +
-                "titles=" + Joiner.on("; ").skipNulls().join(titles) +
-                ", processes=" + buffer.toString() +
-                '}';
+        StringBuffer buffer = new StringBuffer();
+        buffer.append("[");
+        for (String[] fields : processes) {
+            buffer.append("[" + Joiner.on("; ").skipNulls().join(fields) + "]");
+        }
+        buffer.append("]");
+
+        return "TopContainerResponse{" + "titles=" + Joiner.on("; ").skipNulls().join(titles) + ", processes="
+                + buffer.toString() + '}';
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
index 166bfa6a8..442191416 100644
--- a/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
@@ -5,22 +5,24 @@
 /**
  * Unpause a container.
  *
- * @param containerId - Id of the container
+ * @param containerId
+ *            - Id of the container
  *
  */
 public interface UnpauseContainerCmd extends DockerCmd<Void> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public UnpauseContainerCmd withContainerId(String containerId);
+    public UnpauseContainerCmd withContainerId(String containerId);
 
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public Void exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<UnpauseContainerCmd, Void> {
-	}
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public Void exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<UnpauseContainerCmd, Void> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/VersionCmd.java b/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
index 740a335e9..703524623 100644
--- a/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
@@ -6,8 +6,8 @@
  * Returns the Docker version info.
  */
 public interface VersionCmd extends DockerCmd<Version> {
-	
-	public static interface Exec extends DockerCmdExec<VersionCmd, Version> {
-	}
+
+    public static interface Exec extends DockerCmdExec<VersionCmd, Version> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
index e71831559..8841b08a3 100644
--- a/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
@@ -9,17 +9,18 @@
  */
 public interface WaitContainerCmd extends DockerCmd<Integer> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public WaitContainerCmd withContainerId(String containerId);
-	
-	/**
-	 * @throws NotFoundException container not found
-	 */
-	@Override
-	public Integer exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<WaitContainerCmd, Integer> {
-	}
+    public WaitContainerCmd withContainerId(String containerId);
+
+    /**
+     * @throws NotFoundException
+     *             container not found
+     */
+    @Override
+    public Integer exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<WaitContainerCmd, Integer> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/model/AccessMode.java b/src/main/java/com/github/dockerjava/api/model/AccessMode.java
index a893e7f38..e87494215 100644
--- a/src/main/java/com/github/dockerjava/api/model/AccessMode.java
+++ b/src/main/java/com/github/dockerjava/api/model/AccessMode.java
@@ -1,28 +1,26 @@
 package com.github.dockerjava.api.model;
 
 /**
- * The access mode of a file system or file: <code>read-write</code>
- * or <code>read-only</code>.
+ * The access mode of a file system or file: <code>read-write</code> or <code>read-only</code>.
  */
 public enum AccessMode {
-	/** read-write */
-	rw,
-	
-	/** read-only */
-	ro;
-	
-	/**
-	 * The default {@link AccessMode}: {@link #rw}
-	 */
-	public static final AccessMode DEFAULT = rw;
-	
-	public static final AccessMode fromBoolean(boolean accessMode) {
-		return accessMode ? rw : ro;
-	}
-	
-	public final boolean toBoolean() {
-		return this.equals(AccessMode.rw) ? true: false;
-	}
+    /** read-write */
+    rw,
+
+    /** read-only */
+    ro;
+
+    /**
+     * The default {@link AccessMode}: {@link #rw}
+     */
+    public static final AccessMode DEFAULT = rw;
+
+    public static final AccessMode fromBoolean(boolean accessMode) {
+        return accessMode ? rw : ro;
+    }
+
+    public final boolean toBoolean() {
+        return this.equals(AccessMode.rw) ? true : false;
+    }
 
-	
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
index 42c49bce0..c7ee0af7f 100644
--- a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -13,117 +13,113 @@ public class AuthConfig {
     public static final String DEFAULT_SERVER_ADDRESS = "https://index.docker.io/v1/";
 
     @JsonProperty
-	private String username;
-	
-	@JsonProperty
-	private String password;
-	
-	@JsonProperty
-	private String email;
-	
-	@JsonProperty("serveraddress")
-	private String serverAddress = DEFAULT_SERVER_ADDRESS;
-
-	private String auth;
-
-	public String getUsername() {
-		return username;
-	}
-
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public String getEmail() {
-		return email;
-	}
-
-	public void setEmail(String email) {
-		this.email = email;
-	}
-
-	public String getServerAddress() {
-		return serverAddress;
-	}
-
-	public void setServerAddress(String serverAddress) {
-		this.serverAddress = serverAddress;
-	}
-
-	@JsonIgnore
-	public String getAuth() {
-		return auth;
-	}
-
-	@JsonProperty("auth")
-	public void setAuth(String auth) {
-		this.auth = auth;
-	}
-
-	@Override
-	public String toString() {
-		return "AuthConfig{" +
-				"username='" + username + '\'' +
-				", password='" + password + '\'' +
-				", email='" + email + '\'' +
-				", serverAddress='" + serverAddress + '\'' +
-				'}';
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((auth == null) ? 0 : auth.hashCode());
-		result = prime * result + ((email == null) ? 0 : email.hashCode());
-		result = prime * result + ((password == null) ? 0 : password.hashCode());
-		result = prime * result + ((serverAddress == null) ? 0 : serverAddress.hashCode());
-		result = prime * result + ((username == null) ? 0 : username.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		AuthConfig other = (AuthConfig) obj;
-		if (auth == null) {
-			if (other.auth != null)
-				return false;
-		} else if (!auth.equals(other.auth))
-			return false;
-		if (email == null) {
-			if (other.email != null)
-				return false;
-		} else if (!email.equals(other.email))
-			return false;
-		if (password == null) {
-			if (other.password != null)
-				return false;
-		} else if (!password.equals(other.password))
-			return false;
-		if (serverAddress == null) {
-			if (other.serverAddress != null)
-				return false;
-		} else if (!serverAddress.equals(other.serverAddress))
-			return false;
-		if (username == null) {
-			if (other.username != null)
-				return false;
-		} else if (!username.equals(other.username))
-			return false;
-		return true;
-	}
+    private String username;
+
+    @JsonProperty
+    private String password;
+
+    @JsonProperty
+    private String email;
+
+    @JsonProperty("serveraddress")
+    private String serverAddress = DEFAULT_SERVER_ADDRESS;
+
+    private String auth;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getServerAddress() {
+        return serverAddress;
+    }
+
+    public void setServerAddress(String serverAddress) {
+        this.serverAddress = serverAddress;
+    }
+
+    @JsonIgnore
+    public String getAuth() {
+        return auth;
+    }
+
+    @JsonProperty("auth")
+    public void setAuth(String auth) {
+        this.auth = auth;
+    }
+
+    @Override
+    public String toString() {
+        return "AuthConfig{" + "username='" + username + '\'' + ", password='" + password + '\'' + ", email='" + email
+                + '\'' + ", serverAddress='" + serverAddress + '\'' + '}';
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((auth == null) ? 0 : auth.hashCode());
+        result = prime * result + ((email == null) ? 0 : email.hashCode());
+        result = prime * result + ((password == null) ? 0 : password.hashCode());
+        result = prime * result + ((serverAddress == null) ? 0 : serverAddress.hashCode());
+        result = prime * result + ((username == null) ? 0 : username.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        AuthConfig other = (AuthConfig) obj;
+        if (auth == null) {
+            if (other.auth != null)
+                return false;
+        } else if (!auth.equals(other.auth))
+            return false;
+        if (email == null) {
+            if (other.email != null)
+                return false;
+        } else if (!email.equals(other.email))
+            return false;
+        if (password == null) {
+            if (other.password != null)
+                return false;
+        } else if (!password.equals(other.password))
+            return false;
+        if (serverAddress == null) {
+            if (other.serverAddress != null)
+                return false;
+        } else if (!serverAddress.equals(other.serverAddress))
+            return false;
+        if (username == null) {
+            if (other.username != null)
+                return false;
+        } else if (!username.equals(other.username))
+            return false;
+        return true;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java b/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
index 5a62c7587..21451e64b 100644
--- a/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
+++ b/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
@@ -7,15 +7,15 @@
 
 public class AuthConfigurations {
 
-	@JsonProperty("configs")
-	private Map<String, AuthConfig> configs = new TreeMap<>();
-	
-	public void addConfig(AuthConfig authConfig){
-		configs.put(authConfig.getServerAddress(), authConfig);
-	}
-	
-	public Map<String, AuthConfig> getConfigs(){
-		return this.configs;
-	}
-	
+    @JsonProperty("configs")
+    private Map<String, AuthConfig> configs = new TreeMap<>();
+
+    public void addConfig(AuthConfig authConfig) {
+        configs.put(authConfig.getServerAddress(), authConfig);
+    }
+
+    public Map<String, AuthConfig> getConfigs() {
+        return this.configs;
+    }
+
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Bind.java b/src/main/java/com/github/dockerjava/api/model/Bind.java
index 0071bff97..60c64d096 100644
--- a/src/main/java/com/github/dockerjava/api/model/Bind.java
+++ b/src/main/java/com/github/dockerjava/api/model/Bind.java
@@ -1,102 +1,96 @@
 package com.github.dockerjava.api.model;
 
-
-
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
 /**
- * Represents a host path being bind mounted as a {@link Volume}
- * in a Docker container.
- * The Bind can be in read only or read write access mode.
+ * Represents a host path being bind mounted as a {@link Volume} in a Docker container. The Bind can be in read only or
+ * read write access mode.
  */
 public class Bind {
 
-	private String path;
-
-	private Volume volume;
-
-	private AccessMode accessMode;
-
-	public Bind(String path, Volume volume) {
-		this(path, volume, AccessMode.DEFAULT);
-	}
-
-	public Bind(String path, Volume volume, AccessMode accessMode) {
-		this.path = path;
-		this.volume = volume;
-		this.accessMode = accessMode;
-	}
-
-	public String getPath() {
-		return path;
-	}
-
-	public Volume getVolume() {
-		return volume;
-	}
-	
-	public AccessMode getAccessMode() {
-		return accessMode;
-	}
-
-
-	/**
-	 * Parses a bind mount specification to a {@link Bind}.
-	 * 
-	 * @param serialized the specification, e.g. <code>/host:/container:ro</code>
-	 * @return a {@link Bind} matching the specification
-	 * @throws IllegalArgumentException if the specification cannot be parsed
-	 */
-	public static Bind parse(String serialized) {
-		try {
-			String[] parts = serialized.split(":");
-			switch (parts.length) {
-			case 2: {
-				return new Bind(parts[0], new Volume(parts[1]));
-			}
-			case 3: {
-				AccessMode accessMode = AccessMode.valueOf(parts[2].toLowerCase());
-				return new Bind(parts[0], new Volume(parts[1]), accessMode);
-			}
-			default: {
-				throw new IllegalArgumentException();
-			}
-			}
-		} catch (Exception e) {
-			throw new IllegalArgumentException("Error parsing Bind '" + serialized
-					+ "'");
-		}
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof Bind) {
-			Bind other = (Bind) obj;
-			return new EqualsBuilder().append(path, other.getPath())
-					.append(volume, other.getVolume())
-					.append(accessMode, other.getAccessMode()).isEquals();
-		} else
-			return super.equals(obj);
-	}
-
-	@Override
-	public int hashCode() {
-		return new HashCodeBuilder().append(path).append(volume)
-				.append(accessMode).toHashCode();
-	}
-
-	/**
-	 * Returns a string representation of this {@link Bind} suitable
-	 * for inclusion in a JSON message.
-	 * The format is <code>&lt;host path&gt;:&lt;container path&gt;:&lt;access mode&gt;</code>,
-	 * like the argument in {@link #parse(String)}.
-	 * 
-	 * @return a string representation of this {@link Bind}
-	 */
-	@Override
-	public String toString() {
-		return path + ":" + volume.getPath() + ":" + accessMode.toString();
-	}
+    private String path;
+
+    private Volume volume;
+
+    private AccessMode accessMode;
+
+    public Bind(String path, Volume volume) {
+        this(path, volume, AccessMode.DEFAULT);
+    }
+
+    public Bind(String path, Volume volume, AccessMode accessMode) {
+        this.path = path;
+        this.volume = volume;
+        this.accessMode = accessMode;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public Volume getVolume() {
+        return volume;
+    }
+
+    public AccessMode getAccessMode() {
+        return accessMode;
+    }
+
+    /**
+     * Parses a bind mount specification to a {@link Bind}.
+     * 
+     * @param serialized
+     *            the specification, e.g. <code>/host:/container:ro</code>
+     * @return a {@link Bind} matching the specification
+     * @throws IllegalArgumentException
+     *             if the specification cannot be parsed
+     */
+    public static Bind parse(String serialized) {
+        try {
+            String[] parts = serialized.split(":");
+            switch (parts.length) {
+            case 2: {
+                return new Bind(parts[0], new Volume(parts[1]));
+            }
+            case 3: {
+                AccessMode accessMode = AccessMode.valueOf(parts[2].toLowerCase());
+                return new Bind(parts[0], new Volume(parts[1]), accessMode);
+            }
+            default: {
+                throw new IllegalArgumentException();
+            }
+            }
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Error parsing Bind '" + serialized + "'");
+        }
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof Bind) {
+            Bind other = (Bind) obj;
+            return new EqualsBuilder().append(path, other.getPath()).append(volume, other.getVolume())
+                    .append(accessMode, other.getAccessMode()).isEquals();
+        } else
+            return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(path).append(volume).append(accessMode).toHashCode();
+    }
+
+    /**
+     * Returns a string representation of this {@link Bind} suitable for inclusion in a JSON message. The format is
+     * <code>&lt;host path&gt;:&lt;container path&gt;:&lt;access mode&gt;</code>, like the argument in
+     * {@link #parse(String)}.
+     * 
+     * @return a string representation of this {@link Bind}
+     */
+    @Override
+    public String toString() {
+        return path + ":" + volume.getPath() + ":" + accessMode.toString();
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Binds.java b/src/main/java/com/github/dockerjava/api/model/Binds.java
index bfc8dbf2d..1824ca77b 100644
--- a/src/main/java/com/github/dockerjava/api/model/Binds.java
+++ b/src/main/java/com/github/dockerjava/api/model/Binds.java
@@ -19,51 +19,50 @@
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.node.NullNode;
 
-
 @JsonSerialize(using = Binds.Serializer.class)
 @JsonDeserialize(using = Binds.Deserializer.class)
 public class Binds {
 
-	private Bind[] binds;
+    private Bind[] binds;
 
-	public Binds(Bind... binds) {
-		this.binds = binds;
-	}
+    public Binds(Bind... binds) {
+        this.binds = binds;
+    }
 
-	public Bind[] getBinds() {
-		return binds;
-	}
+    public Bind[] getBinds() {
+        return binds;
+    }
 
-	public static class Serializer extends JsonSerializer<Binds> {
+    public static class Serializer extends JsonSerializer<Binds> {
+
+        @Override
+        public void serialize(Binds binds, JsonGenerator jsonGen, SerializerProvider serProvider) throws IOException,
+                JsonProcessingException {
 
-		@Override
-		public void serialize(Binds binds, JsonGenerator jsonGen,
-				SerializerProvider serProvider) throws IOException,
-				JsonProcessingException {
-			
-			//
-			jsonGen.writeStartArray();
-			for (Bind bind : binds.getBinds()) {
-				jsonGen.writeString(bind.toString());
-			}
-			jsonGen.writeEndArray();
-			//
-		}
+            //
+            jsonGen.writeStartArray();
+            for (Bind bind : binds.getBinds()) {
+                jsonGen.writeString(bind.toString());
+            }
+            jsonGen.writeEndArray();
+            //
+        }
+
+    }
 
-	}
-	
-	public static class Deserializer extends JsonDeserializer<Binds> {
+    public static class Deserializer extends JsonDeserializer<Binds> {
         @Override
-        public Binds deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+        public Binds deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+                throws IOException, JsonProcessingException {
 
-        	List<Bind> binds = new ArrayList<Bind>();
+            List<Bind> binds = new ArrayList<Bind>();
             ObjectCodec oc = jsonParser.getCodec();
             JsonNode node = oc.readTree(jsonParser);
             for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
 
                 Map.Entry<String, JsonNode> field = it.next();
                 if (!field.getValue().equals(NullNode.getInstance())) {
-                	binds.add(Bind.parse(field.getKey()));
+                    binds.add(Bind.parse(field.getKey()));
                 }
             }
             return new Binds(binds.toArray(new Bind[0]));
diff --git a/src/main/java/com/github/dockerjava/api/model/Capability.java b/src/main/java/com/github/dockerjava/api/model/Capability.java
index c86c07961..b17827553 100644
--- a/src/main/java/com/github/dockerjava/api/model/Capability.java
+++ b/src/main/java/com/github/dockerjava/api/model/Capability.java
@@ -1,329 +1,297 @@
 package com.github.dockerjava.api.model;
 
 /**
- * The Linux capabilities supported by Docker.
- * The list of capabilities is defined in Docker's types.go,
- * {@link #ALL} was added manually.
+ * The Linux capabilities supported by Docker. The list of capabilities is defined in Docker's types.go, {@link #ALL}
+ * was added manually.
  * 
- * @see <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">http://man7.org/linux/man-pages/man7/capabilities.7.html</a>
+ * @see <a
+ *      href="http://man7.org/linux/man-pages/man7/capabilities.7.html">http://man7.org/linux/man-pages/man7/capabilities.7.html</a>
  */
 public enum Capability {
-	/**
-	 * This meta capability includes all Linux capabilities.
-	 */
-	ALL,
-	/**
-	 * <ul>
-	 *   <li>Enable and disable kernel auditing.
-	 *   <li>Change auditing filter rules.
-	 *   <li>Retrieve auditing status and filtering rules.
-	 * </ul>
-	 */
-	AUDIT_CONTROL,
-	/**
-	 * Write records to kernel auditing log.
-	 */
-	AUDIT_WRITE,
-	/**
-	 * Employ features that can block system suspend.
-	 */
-	BLOCK_SUSPEND,
-	/**
-	 * Make arbitrary changes to file UIDs and GIDs (see chown(2)).
-	 */
-	CHOWN,
-	/**
-	 * Bypass file read, write, and execute permission checks.
-	 * (DAC is an abbreviation of "discretionary access control".)
-	 */
-	DAC_OVERRIDE,
-	/**
-	 * Bypass file read permission checks and directory read and
-	 * execute permission checks.
-	 */
-	DAC_READ_SEARCH,
-	/**
-	 * <ul>
-	 *   <li>Bypass permission checks on operations that normally require
-	 *     the file system UID of the process to match the UID of the file
-	 *     (e.g., chmod(2), utime(2)), excluding those operations covered
-	 *     by the {@link #DAC_OVERRIDE} and{@link #DAC_READ_SEARCH}.
-	 *   <li>Set extended file attributes (see chattr(1)) on arbitrary files.
-	 *   <li>Set Access Control Lists (ACLs) on arbitrary files.
-	 *   <li>Ignore directory sticky bit on file deletion.
-	 *   <li>Specify O_NOATIME for arbitrary files in open(2)and fcntl(2).
-	 * </ul>
-	 */
-	FOWNER,
-	/**
-	 * <ul>
-	 *   <li>Don't clear set-user-ID and set-group-ID permission bits when
-	 *     a file is modified.
-	 *   <li>Set the set-group-ID bit for a file whose GID does not match
-	 *     the file system or any of the supplementary GIDs of the calling
-	 *     process.
-	 * </ul>
-	 */
-	FSETID,
-	/**
-	 * Permit memory locking (mlock(2), mlockall(2), mmap(2), shmctl(2)).
-	 */
-	IPC_LOCK,
-	/**
-	 * Bypass permission checks for operations on System V IPC objects.
-	 */
-	IPC_OWNER,
-	/**
-	 * Bypass permission checks for sending signals (see kill(2)).
-	 * This includes use of the ioctl(2) KDSIGACCEPT operation.
-	 */
-	KILL,
-	/**
-	 * Establish leases on arbitrary files (see fcntl(2)).
-	 */
-	LEASE,
-	/**
-	 * Set the FS_APPEND_FL and FS_IMMUTABLE_FL i-node flags (see chattr(1)).
-	 */
-	LINUX_IMMUTABLE,
-	/**
-	 * Override Mandatory Access Control (MAC).
-	 * Implemented for the Smack Linux Security Module (LSM).
-	 */
-	MAC_ADMIN,
-	/**
-	 * Allow MAC configuration or state changes. Implemented for the Smack LSM.
-	 */
-	MAC_OVERRIDE,
-	/**
-	 * Create special files using mknod(2).
-	 */
-	MKNOD,
-	/**
-	 * Perform various network-related operations:
-	 * <ul>
-	 *   <li>Interface configuration.
-	 *   <li>Administration of IP firewall, masquerading, and accounting.
-	 *   <li>Modify routing tables.
-	 *   <li>Bind to any address for transparent proxying.
-	 *   <li>Set type-of-service (TOS).
-	 *   <li>Clear driver statistics.
-	 *   <li>Set promiscuous mode.
-	 *   <li>Enabling multicasting.
-	 *   <li>Use setsockopt(2) to set the following socket options: SO_DEBUG,
-	 *     SO_MARK, SO_PRIORITY (for a priority outside the range 0 to 6),
-	 *     SO_RCVBUFFORCE, and SO_SNDBUFFORCE.
-	 * </ul>
-	 */
-	NET_ADMIN,
-	/**
-	 * Bind a socket to Internet domain privileged ports (port numbers less
-	 * than 1024).
-	 */
-	NET_BIND_SERVICE,
-	/**
-	 * (Unused) Make socket broadcasts, and listen to multicasts.
-	 */
-	NET_BROADCAST,
-	/**
-	 * <ul>
-	 *   <li>Use RAW and PACKET sockets.
-	 *   <li>Bind to any address for transparent proxying.
-	 * </ul>
-	 */
-	NET_RAW,
-	/**
-	 * Set file capabilities.
-	 */
-	SETFCAP,
-	/**
-	 * <ul>
-	 *   <li>Make arbitrary manipulations of process GIDs and supplementary
-	 *     GID list.
-	 *   <li>Forge GID when passing socket credentials via UNIX domain
-	 *     sockets.
-	 * </ul>
-	 */
-	SETGID,
-	/**
-	 * If file capabilities are not supported:
-	 * <ul>
-	 *   <li>grant or remove any capability in the caller's permitted
-	 *     capability set to or from any other process. (This property of
-	 *     CAP_SETPCAP is not available when the kernel is configured to
-	 *     support file capabilities, since CAP_SETPCAP has entirely different
-	 *     semantics for such kernels.)
-	 * </ul>
-	 * <p>
-	 * If file capabilities are supported:
-	 * <ul>
-	 *   <li>Add any capability from the calling thread's bounding set to its
-	 *     inheritable set.
-	 *   <li>Drop capabilities from the bounding set (via prctl(2)
-	 *     PR_CAPBSET_DROP).
-	 *   <li>Make changes to the securebits flags.
-	 * </ul>
-	 */
-	SETPCAP,
-	/**
-	 * <ul>
-	 *   <li>Make arbitrary manipulations of process UIDs (setuid(2),
-	 *     setreuid(2), setresuid(2), setfsuid(2)).
-	 *   <li>Make forged UID when passing socket credentials via UNIX domain
-	 *     sockets.
-	 * </ul>
-	 */
-	SETUID,
-	/**
-	 * <ul>
-	 *   <li>Perform a range of system administration operations including:
-	 *     quotactl(2), mount(2), umount(2), swapon(2), swapoff(2), sethostname(2),
-	 *     and setdomainname(2).
-	 *   <li>Perform privileged syslog(2) operations (since Linux 2.6.37,
-	 *     CAP_SYSLOG should be used to permit such operations).
-	 *   <li>Perform VM86_REQUEST_IRQ vm86(2) command.
-	 *   <li>Perform IPC_SET and IPC_RMID operations on arbitrary System V IPC objects.
-	 *   <li>Perform operations on trusted and security Extended Attributes
-	 *     (see attr(5)).
-	 *   <li>Use lookup_dcookie(2)
-	 *   <li>Use ioprio_set(2) to assign IOPRIO_CLASS_RT and (before Linux 2.6.25)
-	 *     IOPRIO_CLASS_IDLE I/O scheduling classes.
-	 *   <li>Forge UID when passing socket credentials.
-	 *   <li>Exceed /proc/sys/fs/file-max, the system-wide limit on the number of
-	 *     open files, in system calls that open files (e.g., accept(2), execve(2),
-	 *     open(2), pipe(2)).
-	 *   <li>Employ CLONE_* flags that create new namespaces with clone(2) and
-	 *     unshare(2).
-	 *   <li>Call perf_event_open(2).
-	 *   <li>Access privileged perf event information.
-	 *   <li>Call setns(2).
-	 *   <li>Call fanotify_init(2).
-	 *   <li>Perform KEYCTL_CHOWN and KEYCTL_SETPERM keyctl(2) operations.
-	 *   <li>Perform madvise(2) MADV_HWPOISON operation.
-	 *   <li>Employ the TIOCSTI ioctl(2) to insert characters into the input queue
-	 *     of a terminal other than the caller's controlling terminal.
-	 *   <li>Employ the obsolete nfsservctl(2) system call.
-	 *   <li>Employ the obsolete bdflush(2) system call.
-	 *   <li>Perform various privileged block-device ioctl(2) operations.
-	 *   <li>Perform various privileged file-system ioctl(2) operations.
-	 *   <li>Perform administrative operations on many device drivers.
-	 * </ul>
-	 */
-	SYS_ADMIN,
-	/**
-	 * Use reboot(2) and kexec_load(2).
-	 */
-	SYS_BOOT,
-	/**
-	 * Use chroot(2).
-	 */
-	SYS_CHROOT,
-	/**
-	 * <ul>
-	 *   <li>Perform privileged syslog(2) operations. See syslog(2) for information
-	 *     on which operations require privilege.
-	 *   <li>View kernel addresses exposed via /proc and other interfaces when
-	 *     /proc/sys/kernel/kptr_restrict has the value 1. (See the discussion of the
-	 *      kptr_restrict in proc(5).)
-	 * </ul>
-	 */
-	SYSLOG,
-	/**
-	 * <ul>
-	 *   <li>Load and unload kernel modules (see init_module(2) and delete_module(2))
-	 *   <li>In kernels before 2.6.25: drop capabilities from the system-wide
-	 *     capability bounding set.
-	 * </ul>
-	 */
-	SYS_MODULE,
-	/**
-	 * <ul>
-	 *   <li>Raise process nice value (nice(2), setpriority(2)) and change the nice
-	 *     value for arbitrary processes.
-	 *   <li>Set real-time scheduling policies for calling process, and set scheduling
-	 *     policies and priorities for arbitrary processes (sched_setscheduler(2),
-	 *     sched_setparam(2)).
-	 *   <li>Set CPU affinity for arbitrary processes (sched_setaffinity(2)).
-	 *   <li>Set I/O scheduling class and priority for arbitrary processes
-	 *     (ioprio_set(2)).
-	 *   <li>Apply migrate_pages(2) to arbitrary processes and allow processes to be
-	 *     migrated to arbitrary nodes.
-	 *   <li>Apply move_pages(2) to arbitrary processes.
-	 *   <li>Use the MPOL_MF_MOVE_ALL flag with mbind(2) and move_pages(2).
-	 * </ul>
-	 */
-	SYS_NICE,
-	/**
-	 * Use acct(2).
-	 */
-	SYS_PACCT,
-	/**
-	 * <ul>
-	 *   <li>Trace arbitrary processes using ptrace(2).
-	 *   <li>Apply get_robust_list(2) to arbitrary processes.
-	 *   <li>Inspect processes using kcmp(2).
-	 * </ul>
-	 */
-	SYS_PTRACE,
-	/**
-	 * <ul>
-	 *   <li>Perform I/O port operations (iopl(2) and ioperm(2)).
-	 *   <li>Access /proc/kcore.
-	 *   <li>Employ the FIBMAP ioctl(2) operation.
-	 *   <li>Open devices for accessing x86 model-specific registers (MSRs, see
-	 *     msr(4)).
-	 *   <li>Update /proc/sys/vm/mmap_min_addr.
-	 *   <li>Create memory mappings at addresses below the value specified by
-	 *     /proc/sys/vm/mmap_min_addr.
-	 *   <li>Map files in /proc/pci/bus.
-	 *   <li>Open /dev/mem and /dev/kmem.
-	 *   <li>Perform various SCSI device commands.
-	 *   <li>Perform certain operations on hpsa(4) and cciss(4) devices.
-	 *   <li>Perform a range of device-specific operations on other devices.
-	 * </ul>
-	 */
-	SYS_RAWIO,
-	/**
-	 * <ul>
-	 *   <li>Use reserved space on ext2 file systems.
-	 *   <li>Make ioctl(2) calls controlling ext3 journaling.
-	 *   <li>Override disk quota limits.
-	 *   <li>Increase resource limits (see setrlimit(2)).
-	 *   <li>Override RLIMIT_NPROC resource limit.
-	 *   <li>Override maximum number of consoles on console allocation.
-	 *   <li>Override maximum number of keymaps.
-	 *   <li>Allow more than 64hz interrupts from the real-time clock.
-	 *   <li>Raise msg_qbytes limit for a System V message queue above the limit
-	 *     in /proc/sys/kernel/msgmnb (see msgop(2) and msgctl(2)).
-	 *   <li>Override the /proc/sys/fs/pipe-size-max limit when setting the capacity
-	 *     of a pipe using the F_SETPIPE_SZ fcntl(2) command.
-	 *   <li>Use F_SETPIPE_SZ to increase the capacity of a pipe above the limit
-	 *     specified by /proc/sys/fs/pipe-max-size.
-	 *   <li>Override /proc/sys/fs/mqueue/queues_max limit when creating POSIX
-	 *     message queues (see mq_overview(7)).
-	 *   <li>Employ prctl(2) PR_SET_MM operation.
-	 *   <li>Set /proc/PID/oom_score_adj to a value lower than the value last set
-	 *     by a process with CAP_SYS_RESOURCE.
-	 * </ul>
-	 */
-	SYS_RESOURCE,
-	/**
-	 * <ul>
-	 *   <li>Set system clock (settimeofday(2), stime(2), adjtimex(2)).
-	 *   <li>Set real-time (hardware) clock.
-	 * </ul>
-	 */
-	SYS_TIME,
-	/**
-	 * <ul>
-	 *   <li>Use vhangup(2).
-	 *   <li>Employ various privileged ioctl(2) operations on virtual terminals.
-	 * </ul>
-	 */
-	SYS_TTY_CONFIG,
-	/**
-	 * Trigger something that will wake up the system (set CLOCK_REALTIME_ALARM and
-	 * CLOCK_BOOTTIME_ALARM timers).
-	 */
-	WAKE_ALARM
+    /**
+     * This meta capability includes all Linux capabilities.
+     */
+    ALL,
+    /**
+     * <ul>
+     * <li>Enable and disable kernel auditing.
+     * <li>Change auditing filter rules.
+     * <li>Retrieve auditing status and filtering rules.
+     * </ul>
+     */
+    AUDIT_CONTROL,
+    /**
+     * Write records to kernel auditing log.
+     */
+    AUDIT_WRITE,
+    /**
+     * Employ features that can block system suspend.
+     */
+    BLOCK_SUSPEND,
+    /**
+     * Make arbitrary changes to file UIDs and GIDs (see chown(2)).
+     */
+    CHOWN,
+    /**
+     * Bypass file read, write, and execute permission checks. (DAC is an abbreviation of
+     * "discretionary access control".)
+     */
+    DAC_OVERRIDE,
+    /**
+     * Bypass file read permission checks and directory read and execute permission checks.
+     */
+    DAC_READ_SEARCH,
+    /**
+     * <ul>
+     * <li>Bypass permission checks on operations that normally require the file system UID of the process to match the
+     * UID of the file (e.g., chmod(2), utime(2)), excluding those operations covered by the {@link #DAC_OVERRIDE} and
+     * {@link #DAC_READ_SEARCH}.
+     * <li>Set extended file attributes (see chattr(1)) on arbitrary files.
+     * <li>Set Access Control Lists (ACLs) on arbitrary files.
+     * <li>Ignore directory sticky bit on file deletion.
+     * <li>Specify O_NOATIME for arbitrary files in open(2)and fcntl(2).
+     * </ul>
+     */
+    FOWNER,
+    /**
+     * <ul>
+     * <li>Don't clear set-user-ID and set-group-ID permission bits when a file is modified.
+     * <li>Set the set-group-ID bit for a file whose GID does not match the file system or any of the supplementary GIDs
+     * of the calling process.
+     * </ul>
+     */
+    FSETID,
+    /**
+     * Permit memory locking (mlock(2), mlockall(2), mmap(2), shmctl(2)).
+     */
+    IPC_LOCK,
+    /**
+     * Bypass permission checks for operations on System V IPC objects.
+     */
+    IPC_OWNER,
+    /**
+     * Bypass permission checks for sending signals (see kill(2)). This includes use of the ioctl(2) KDSIGACCEPT
+     * operation.
+     */
+    KILL,
+    /**
+     * Establish leases on arbitrary files (see fcntl(2)).
+     */
+    LEASE,
+    /**
+     * Set the FS_APPEND_FL and FS_IMMUTABLE_FL i-node flags (see chattr(1)).
+     */
+    LINUX_IMMUTABLE,
+    /**
+     * Override Mandatory Access Control (MAC). Implemented for the Smack Linux Security Module (LSM).
+     */
+    MAC_ADMIN,
+    /**
+     * Allow MAC configuration or state changes. Implemented for the Smack LSM.
+     */
+    MAC_OVERRIDE,
+    /**
+     * Create special files using mknod(2).
+     */
+    MKNOD,
+    /**
+     * Perform various network-related operations:
+     * <ul>
+     * <li>Interface configuration.
+     * <li>Administration of IP firewall, masquerading, and accounting.
+     * <li>Modify routing tables.
+     * <li>Bind to any address for transparent proxying.
+     * <li>Set type-of-service (TOS).
+     * <li>Clear driver statistics.
+     * <li>Set promiscuous mode.
+     * <li>Enabling multicasting.
+     * <li>Use setsockopt(2) to set the following socket options: SO_DEBUG, SO_MARK, SO_PRIORITY (for a priority outside
+     * the range 0 to 6), SO_RCVBUFFORCE, and SO_SNDBUFFORCE.
+     * </ul>
+     */
+    NET_ADMIN,
+    /**
+     * Bind a socket to Internet domain privileged ports (port numbers less than 1024).
+     */
+    NET_BIND_SERVICE,
+    /**
+     * (Unused) Make socket broadcasts, and listen to multicasts.
+     */
+    NET_BROADCAST,
+    /**
+     * <ul>
+     * <li>Use RAW and PACKET sockets.
+     * <li>Bind to any address for transparent proxying.
+     * </ul>
+     */
+    NET_RAW,
+    /**
+     * Set file capabilities.
+     */
+    SETFCAP,
+    /**
+     * <ul>
+     * <li>Make arbitrary manipulations of process GIDs and supplementary GID list.
+     * <li>Forge GID when passing socket credentials via UNIX domain sockets.
+     * </ul>
+     */
+    SETGID,
+    /**
+     * If file capabilities are not supported:
+     * <ul>
+     * <li>grant or remove any capability in the caller's permitted capability set to or from any other process. (This
+     * property of CAP_SETPCAP is not available when the kernel is configured to support file capabilities, since
+     * CAP_SETPCAP has entirely different semantics for such kernels.)
+     * </ul>
+     * <p>
+     * If file capabilities are supported:
+     * <ul>
+     * <li>Add any capability from the calling thread's bounding set to its inheritable set.
+     * <li>Drop capabilities from the bounding set (via prctl(2) PR_CAPBSET_DROP).
+     * <li>Make changes to the securebits flags.
+     * </ul>
+     */
+    SETPCAP,
+    /**
+     * <ul>
+     * <li>Make arbitrary manipulations of process UIDs (setuid(2), setreuid(2), setresuid(2), setfsuid(2)).
+     * <li>Make forged UID when passing socket credentials via UNIX domain sockets.
+     * </ul>
+     */
+    SETUID,
+    /**
+     * <ul>
+     * <li>Perform a range of system administration operations including: quotactl(2), mount(2), umount(2), swapon(2),
+     * swapoff(2), sethostname(2), and setdomainname(2).
+     * <li>Perform privileged syslog(2) operations (since Linux 2.6.37, CAP_SYSLOG should be used to permit such
+     * operations).
+     * <li>Perform VM86_REQUEST_IRQ vm86(2) command.
+     * <li>Perform IPC_SET and IPC_RMID operations on arbitrary System V IPC objects.
+     * <li>Perform operations on trusted and security Extended Attributes (see attr(5)).
+     * <li>Use lookup_dcookie(2)
+     * <li>Use ioprio_set(2) to assign IOPRIO_CLASS_RT and (before Linux 2.6.25) IOPRIO_CLASS_IDLE I/O scheduling
+     * classes.
+     * <li>Forge UID when passing socket credentials.
+     * <li>Exceed /proc/sys/fs/file-max, the system-wide limit on the number of open files, in system calls that open
+     * files (e.g., accept(2), execve(2), open(2), pipe(2)).
+     * <li>Employ CLONE_* flags that create new namespaces with clone(2) and unshare(2).
+     * <li>Call perf_event_open(2).
+     * <li>Access privileged perf event information.
+     * <li>Call setns(2).
+     * <li>Call fanotify_init(2).
+     * <li>Perform KEYCTL_CHOWN and KEYCTL_SETPERM keyctl(2) operations.
+     * <li>Perform madvise(2) MADV_HWPOISON operation.
+     * <li>Employ the TIOCSTI ioctl(2) to insert characters into the input queue of a terminal other than the caller's
+     * controlling terminal.
+     * <li>Employ the obsolete nfsservctl(2) system call.
+     * <li>Employ the obsolete bdflush(2) system call.
+     * <li>Perform various privileged block-device ioctl(2) operations.
+     * <li>Perform various privileged file-system ioctl(2) operations.
+     * <li>Perform administrative operations on many device drivers.
+     * </ul>
+     */
+    SYS_ADMIN,
+    /**
+     * Use reboot(2) and kexec_load(2).
+     */
+    SYS_BOOT,
+    /**
+     * Use chroot(2).
+     */
+    SYS_CHROOT,
+    /**
+     * <ul>
+     * <li>Perform privileged syslog(2) operations. See syslog(2) for information on which operations require privilege.
+     * <li>View kernel addresses exposed via /proc and other interfaces when /proc/sys/kernel/kptr_restrict has the
+     * value 1. (See the discussion of the kptr_restrict in proc(5).)
+     * </ul>
+     */
+    SYSLOG,
+    /**
+     * <ul>
+     * <li>Load and unload kernel modules (see init_module(2) and delete_module(2))
+     * <li>In kernels before 2.6.25: drop capabilities from the system-wide capability bounding set.
+     * </ul>
+     */
+    SYS_MODULE,
+    /**
+     * <ul>
+     * <li>Raise process nice value (nice(2), setpriority(2)) and change the nice value for arbitrary processes.
+     * <li>Set real-time scheduling policies for calling process, and set scheduling policies and priorities for
+     * arbitrary processes (sched_setscheduler(2), sched_setparam(2)).
+     * <li>Set CPU affinity for arbitrary processes (sched_setaffinity(2)).
+     * <li>Set I/O scheduling class and priority for arbitrary processes (ioprio_set(2)).
+     * <li>Apply migrate_pages(2) to arbitrary processes and allow processes to be migrated to arbitrary nodes.
+     * <li>Apply move_pages(2) to arbitrary processes.
+     * <li>Use the MPOL_MF_MOVE_ALL flag with mbind(2) and move_pages(2).
+     * </ul>
+     */
+    SYS_NICE,
+    /**
+     * Use acct(2).
+     */
+    SYS_PACCT,
+    /**
+     * <ul>
+     * <li>Trace arbitrary processes using ptrace(2).
+     * <li>Apply get_robust_list(2) to arbitrary processes.
+     * <li>Inspect processes using kcmp(2).
+     * </ul>
+     */
+    SYS_PTRACE,
+    /**
+     * <ul>
+     * <li>Perform I/O port operations (iopl(2) and ioperm(2)).
+     * <li>Access /proc/kcore.
+     * <li>Employ the FIBMAP ioctl(2) operation.
+     * <li>Open devices for accessing x86 model-specific registers (MSRs, see msr(4)).
+     * <li>Update /proc/sys/vm/mmap_min_addr.
+     * <li>Create memory mappings at addresses below the value specified by /proc/sys/vm/mmap_min_addr.
+     * <li>Map files in /proc/pci/bus.
+     * <li>Open /dev/mem and /dev/kmem.
+     * <li>Perform various SCSI device commands.
+     * <li>Perform certain operations on hpsa(4) and cciss(4) devices.
+     * <li>Perform a range of device-specific operations on other devices.
+     * </ul>
+     */
+    SYS_RAWIO,
+    /**
+     * <ul>
+     * <li>Use reserved space on ext2 file systems.
+     * <li>Make ioctl(2) calls controlling ext3 journaling.
+     * <li>Override disk quota limits.
+     * <li>Increase resource limits (see setrlimit(2)).
+     * <li>Override RLIMIT_NPROC resource limit.
+     * <li>Override maximum number of consoles on console allocation.
+     * <li>Override maximum number of keymaps.
+     * <li>Allow more than 64hz interrupts from the real-time clock.
+     * <li>Raise msg_qbytes limit for a System V message queue above the limit in /proc/sys/kernel/msgmnb (see msgop(2)
+     * and msgctl(2)).
+     * <li>Override the /proc/sys/fs/pipe-size-max limit when setting the capacity of a pipe using the F_SETPIPE_SZ
+     * fcntl(2) command.
+     * <li>Use F_SETPIPE_SZ to increase the capacity of a pipe above the limit specified by /proc/sys/fs/pipe-max-size.
+     * <li>Override /proc/sys/fs/mqueue/queues_max limit when creating POSIX message queues (see mq_overview(7)).
+     * <li>Employ prctl(2) PR_SET_MM operation.
+     * <li>Set /proc/PID/oom_score_adj to a value lower than the value last set by a process with CAP_SYS_RESOURCE.
+     * </ul>
+     */
+    SYS_RESOURCE,
+    /**
+     * <ul>
+     * <li>Set system clock (settimeofday(2), stime(2), adjtimex(2)).
+     * <li>Set real-time (hardware) clock.
+     * </ul>
+     */
+    SYS_TIME,
+    /**
+     * <ul>
+     * <li>Use vhangup(2).
+     * <li>Employ various privileged ioctl(2) operations on virtual terminals.
+     * </ul>
+     */
+    SYS_TTY_CONFIG,
+    /**
+     * Trigger something that will wake up the system (set CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM timers).
+     */
+    WAKE_ALARM
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Container.java b/src/main/java/com/github/dockerjava/api/model/Container.java
index 5b38ce48c..6a97e20b9 100644
--- a/src/main/java/com/github/dockerjava/api/model/Container.java
+++ b/src/main/java/com/github/dockerjava/api/model/Container.java
@@ -10,16 +10,16 @@
  * @author Konstantin Pelykh (kpelykh@gmail.com)
  *
  */
-@JsonIgnoreProperties(ignoreUnknown=true)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Container {
 
-	@JsonProperty("Command")
-	private String command;
+    @JsonProperty("Command")
+    private String command;
 
-	@JsonProperty("Created")
-	private long created;
+    @JsonProperty("Created")
+    private long created;
 
-	@JsonProperty("Id")
+    @JsonProperty("Id")
     private String id;
 
     @JsonProperty("Image")
@@ -62,7 +62,6 @@ public String[] getNames() {
         return names;
     }
 
-
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
@@ -84,20 +83,20 @@ public static class Port {
         private String type;
 
         public String getIp() {
-			return ip;
-		}
+            return ip;
+        }
 
         public Integer getPrivatePort() {
-			return privatePort;
-		}
+            return privatePort;
+        }
 
         public Integer getPublicPort() {
-			return publicPort;
-		}
+            return publicPort;
+        }
 
         public String getType() {
-			return type;
-		}
+            return type;
+        }
 
         @Override
         public String toString() {
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
index ce8c6b88f..8ea673a36 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
@@ -15,177 +15,177 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ContainerConfig {
 
-	@JsonProperty("AttachStderr")
-	private boolean attachStderr = false;
+    @JsonProperty("AttachStderr")
+    private boolean attachStderr = false;
 
-	@JsonProperty("AttachStdin")
-	private boolean attachStdin = false;
+    @JsonProperty("AttachStdin")
+    private boolean attachStdin = false;
 
-	@JsonProperty("AttachStdout")
-	private boolean attachStdout = false;
+    @JsonProperty("AttachStdout")
+    private boolean attachStdout = false;
 
-	@JsonProperty("Cmd")
-	private String[] cmd;
+    @JsonProperty("Cmd")
+    private String[] cmd;
 
-	@JsonProperty("CpuShares")
-	private int cpuShares = 0;
+    @JsonProperty("CpuShares")
+    private int cpuShares = 0;
 
-	@JsonProperty("Cpuset")
-	private String cpuset = "";
+    @JsonProperty("Cpuset")
+    private String cpuset = "";
 
-	@JsonProperty("Domainname")
-	private String domainName = "";
+    @JsonProperty("Domainname")
+    private String domainName = "";
 
-	@JsonProperty("Entrypoint")
-	private String[] entrypoint = new String[] {};
+    @JsonProperty("Entrypoint")
+    private String[] entrypoint = new String[] {};
 
-	@JsonProperty("Env")
-	private String[] env;
+    @JsonProperty("Env")
+    private String[] env;
 
-	@JsonProperty("ExposedPorts")
-	private ExposedPorts exposedPorts;
+    @JsonProperty("ExposedPorts")
+    private ExposedPorts exposedPorts;
 
-	@JsonProperty("Hostname")
-	private String hostName = "";
+    @JsonProperty("Hostname")
+    private String hostName = "";
 
-	@JsonProperty("Image")
-	private String image;
+    @JsonProperty("Image")
+    private String image;
 
-	@JsonProperty("MacAddress")
-	private String macAddress;
-	
-	@JsonProperty("Memory")
-	private long memoryLimit = 0;
+    @JsonProperty("MacAddress")
+    private String macAddress;
 
-	@JsonProperty("MemorySwap")
-	private long memorySwap = 0;
+    @JsonProperty("Memory")
+    private long memoryLimit = 0;
 
-	@JsonProperty("NetworkDisabled")
-	private boolean networkDisabled = false;
+    @JsonProperty("MemorySwap")
+    private long memorySwap = 0;
 
-	@JsonProperty("OnBuild")
-	private String[] onBuild;
+    @JsonProperty("NetworkDisabled")
+    private boolean networkDisabled = false;
 
-	@JsonProperty("OpenStdin")
-	private boolean stdinOpen = false;
+    @JsonProperty("OnBuild")
+    private String[] onBuild;
 
-	@JsonProperty("PortSpecs")
-	private String[] portSpecs;
+    @JsonProperty("OpenStdin")
+    private boolean stdinOpen = false;
 
-	@JsonProperty("StdinOnce")
-	private boolean stdInOnce = false;
+    @JsonProperty("PortSpecs")
+    private String[] portSpecs;
 
-	@JsonProperty("Tty")
-	private boolean tty = false;
+    @JsonProperty("StdinOnce")
+    private boolean stdInOnce = false;
 
-	@JsonProperty("User")
-	private String user = "";
+    @JsonProperty("Tty")
+    private boolean tty = false;
 
-	@JsonProperty("Volumes")
-	private Map<String, ?> volumes;
+    @JsonProperty("User")
+    private String user = "";
 
-	@JsonProperty("WorkingDir")
-	private String workingDir = "";
+    @JsonProperty("Volumes")
+    private Map<String, ?> volumes;
 
-	@JsonIgnore
-	public ExposedPort[] getExposedPorts() {
-		return exposedPorts.getExposedPorts();
-	}
+    @JsonProperty("WorkingDir")
+    private String workingDir = "";
 
-	public boolean isNetworkDisabled() {
-		return networkDisabled;
-	}
+    @JsonIgnore
+    public ExposedPort[] getExposedPorts() {
+        return exposedPorts.getExposedPorts();
+    }
 
-	public String getDomainName() {
-		return domainName;
-	}
+    public boolean isNetworkDisabled() {
+        return networkDisabled;
+    }
 
-	public String getWorkingDir() {
-		return workingDir;
-	}
+    public String getDomainName() {
+        return domainName;
+    }
 
-	public String getHostName() {
-		return hostName;
-	}
+    public String getWorkingDir() {
+        return workingDir;
+    }
 
-	public String[] getPortSpecs() {
-		return portSpecs;
-	}
+    public String getHostName() {
+        return hostName;
+    }
 
-	public String getUser() {
-		return user;
-	}
+    public String[] getPortSpecs() {
+        return portSpecs;
+    }
 
-	public boolean isTty() {
-		return tty;
-	}
+    public String getUser() {
+        return user;
+    }
 
-	public boolean isStdinOpen() {
-		return stdinOpen;
-	}
+    public boolean isTty() {
+        return tty;
+    }
 
-	public boolean isStdInOnce() {
-		return stdInOnce;
-	}
-	
-	public String getMacAddress() {
-		return macAddress;
-	}
+    public boolean isStdinOpen() {
+        return stdinOpen;
+    }
 
-	public long getMemoryLimit() {
-		return memoryLimit;
-	}
+    public boolean isStdInOnce() {
+        return stdInOnce;
+    }
 
-	public long getMemorySwap() {
-		return memorySwap;
-	}
+    public String getMacAddress() {
+        return macAddress;
+    }
 
-	public int getCpuShares() {
-		return cpuShares;
-	}
+    public long getMemoryLimit() {
+        return memoryLimit;
+    }
 
-	public String getCpuset() {
-		return cpuset;
-	}
+    public long getMemorySwap() {
+        return memorySwap;
+    }
 
-	public boolean isAttachStdin() {
-		return attachStdin;
-	}
+    public int getCpuShares() {
+        return cpuShares;
+    }
 
-	public boolean isAttachStdout() {
-		return attachStdout;
-	}
+    public String getCpuset() {
+        return cpuset;
+    }
 
-	public boolean isAttachStderr() {
-		return attachStderr;
-	}
+    public boolean isAttachStdin() {
+        return attachStdin;
+    }
 
-	public String[] getEnv() {
-		return env;
-	}
+    public boolean isAttachStdout() {
+        return attachStdout;
+    }
 
-	public String[] getCmd() {
-		return cmd;
-	}
+    public boolean isAttachStderr() {
+        return attachStderr;
+    }
 
-	public String getImage() {
-		return image;
-	}
+    public String[] getEnv() {
+        return env;
+    }
 
-	public Map<String, ?> getVolumes() {
-		return volumes;
-	}
-
-	public String[] getEntrypoint() {
-		return entrypoint;
-	}
-
-	public String[] getOnBuild() {
-		return onBuild;
-	}
-
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
+    public String[] getCmd() {
+        return cmd;
+    }
+
+    public String getImage() {
+        return image;
+    }
+
+    public Map<String, ?> getVolumes() {
+        return volumes;
+    }
+
+    public String[] getEntrypoint() {
+        return entrypoint;
+    }
+
+    public String[] getOnBuild() {
+        return onBuild;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Device.java b/src/main/java/com/github/dockerjava/api/model/Device.java
index 574d1ad56..713c0d61a 100644
--- a/src/main/java/com/github/dockerjava/api/model/Device.java
+++ b/src/main/java/com/github/dockerjava/api/model/Device.java
@@ -9,57 +9,53 @@
 
 public class Device {
 
-	@JsonProperty("CgroupPermissions")
-	private String cGroupPermissions = "";
-
-	@JsonProperty("PathOnHost")
-	private String pathOnHost = null;
-
-	@JsonProperty("PathInContainer")
-	private String pathInContainer = null;
-
-	public Device() {
-	}
-
-	public Device(String cGroupPermissions, String pathInContainer,
-			String pathOnHost) {
-		checkNotNull(cGroupPermissions,
-				"cGroupPermissions is null");
-		checkNotNull(pathInContainer, "pathInContainer is null");
-		checkNotNull(pathOnHost, "pathOnHost is null");
-		this.cGroupPermissions = cGroupPermissions;
-		this.pathInContainer = pathInContainer;
-		this.pathOnHost = pathOnHost;
-	}
-
-	public String getcGroupPermissions() {
-		return cGroupPermissions;
-	}
-
-	public String getPathInContainer() {
-		return pathInContainer;
-	}
-
-	public String getPathOnHost() {
-		return pathOnHost;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof Device) {
-			Device other = (Device) obj;
-			return new EqualsBuilder()
-					.append(cGroupPermissions, other.getcGroupPermissions())
-					.append(pathInContainer, other.getPathInContainer())
-					.append(pathOnHost, other.getPathOnHost()).isEquals();
-		} else
-			return super.equals(obj);
-	}
-
-	@Override
-	public int hashCode() {
-		return new HashCodeBuilder().append(cGroupPermissions)
-				.append(pathInContainer).append(pathOnHost).toHashCode();
-	}
+    @JsonProperty("CgroupPermissions")
+    private String cGroupPermissions = "";
+
+    @JsonProperty("PathOnHost")
+    private String pathOnHost = null;
+
+    @JsonProperty("PathInContainer")
+    private String pathInContainer = null;
+
+    public Device() {
+    }
+
+    public Device(String cGroupPermissions, String pathInContainer, String pathOnHost) {
+        checkNotNull(cGroupPermissions, "cGroupPermissions is null");
+        checkNotNull(pathInContainer, "pathInContainer is null");
+        checkNotNull(pathOnHost, "pathOnHost is null");
+        this.cGroupPermissions = cGroupPermissions;
+        this.pathInContainer = pathInContainer;
+        this.pathOnHost = pathOnHost;
+    }
+
+    public String getcGroupPermissions() {
+        return cGroupPermissions;
+    }
+
+    public String getPathInContainer() {
+        return pathInContainer;
+    }
+
+    public String getPathOnHost() {
+        return pathOnHost;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof Device) {
+            Device other = (Device) obj;
+            return new EqualsBuilder().append(cGroupPermissions, other.getcGroupPermissions())
+                    .append(pathInContainer, other.getPathInContainer()).append(pathOnHost, other.getPathOnHost())
+                    .isEquals();
+        } else
+            return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(cGroupPermissions).append(pathInContainer).append(pathOnHost).toHashCode();
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java b/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
index 87d9b0d7f..d589a31d1 100644
--- a/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
+++ b/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
@@ -5,6 +5,7 @@
 public class ErrorResponse {
     @JsonProperty
     private ErrorDetail errorDetail;
+
     @JsonProperty
     private String error;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Event.java b/src/main/java/com/github/dockerjava/api/model/Event.java
index cb961f97d..27eb22216 100644
--- a/src/main/java/com/github/dockerjava/api/model/Event.java
+++ b/src/main/java/com/github/dockerjava/api/model/Event.java
@@ -22,12 +22,17 @@ public Event() {
 
     /**
      * Constructor.
-     * @param id Container ID
-     * @param status Status string. 
-     *        List of statuses is available in <a href="https://docs.docker.com/reference/api/docker_remote_api_v1.16/#monitor-dockers-events">Docker API v.1.16</a>
-     * @param from Image, from which the container has been created
-     * @param time Event time
-     *      The time is specified in milliseconds since January 1, 1970, 00:00:00 GMT
+     * 
+     * @param id
+     *            Container ID
+     * @param status
+     *            Status string. List of statuses is available in <a
+     *            href="https://docs.docker.com/reference/api/docker_remote_api_v1.16/#monitor-dockers-events">Docker
+     *            API v.1.16</a>
+     * @param from
+     *            Image, from which the container has been created
+     * @param time
+     *            Event time The time is specified in milliseconds since January 1, 1970, 00:00:00 GMT
      * @since TODO
      */
     public Event(String status, String id, String from, long time) {
@@ -36,10 +41,12 @@ public Event(String status, String id, String from, long time) {
         this.from = from;
         this.time = time;
     }
-    
+
     /**
-     * Status of docker image or container. 
-     * List of statuses is available in <a href="https://docs.docker.com/reference/api/docker_remote_api_v1.16/#monitor-dockers-events">Docker API v.1.16</a>
+     * Status of docker image or container. List of statuses is available in <a
+     * href="https://docs.docker.com/reference/api/docker_remote_api_v1.16/#monitor-dockers-events">Docker API
+     * v.1.16</a>
+     * 
      * @return Status string
      */
     public String getStatus() {
@@ -48,6 +55,7 @@ public String getStatus() {
 
     /**
      * Get ID of docker container.
+     * 
      * @return Container ID
      */
     public String getId() {
@@ -56,6 +64,7 @@ public String getId() {
 
     /**
      * Get source image of the container.
+     * 
      * @return Name of the parent container
      */
     public String getFrom() {
@@ -63,8 +72,8 @@ public String getFrom() {
     }
 
     /**
-     * Get the event time.
-     * The time is specified in milliseconds since January 1, 1970, 00:00:00 GMT
+     * Get the event time. The time is specified in milliseconds since January 1, 1970, 00:00:00 GMT
+     * 
      * @return Event time in the specified format.
      */
     public long getTime() {
diff --git a/src/main/java/com/github/dockerjava/api/model/EventStreamItem.java b/src/main/java/com/github/dockerjava/api/model/EventStreamItem.java
index 010ed9af7..9c7489812 100644
--- a/src/main/java/com/github/dockerjava/api/model/EventStreamItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/EventStreamItem.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -12,12 +10,12 @@
 /**
  * Represents an event stream
  */
-@JsonIgnoreProperties(ignoreUnknown=true)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class EventStreamItem implements Serializable {
 
-	private static final long serialVersionUID = 638778515773898651L;
+    private static final long serialVersionUID = 638778515773898651L;
 
-	@JsonProperty("stream")
+    @JsonProperty("stream")
     private String stream;
 
     // {"error":"Error...", "errorDetail":{"code": 123, "message": "Error..."}}
@@ -39,28 +37,23 @@ public ErrorDetail getErrorDetail() {
         return errorDetail;
     }
 
-    @JsonIgnoreProperties(ignoreUnknown=true)
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class ErrorDetail implements Serializable {
         @JsonProperty("code")
         String code;
+
         @JsonProperty("message")
         String message;
 
         @Override
         public String toString() {
-            return Objects.toStringHelper(this)
-                    .add("code", code)
-                    .add("message", message)
-                    .toString();
+            return Objects.toStringHelper(this).add("code", code).add("message", message).toString();
         }
     }
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
-                .add("stream", stream)
-                .add("error", error)
-                .add("errorDetail", errorDetail)
+        return Objects.toStringHelper(this).add("stream", stream).add("error", error).add("errorDetail", errorDetail)
                 .toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/ExposedPort.java b/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
index 30f7ce384..23510e50a 100644
--- a/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
+++ b/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
@@ -24,168 +24,168 @@
 import com.github.dockerjava.api.model.Ports.Binding;
 
 /**
- * Represents a container port that Docker exposes to external clients.
- * The port is defined by its {@link #getPort() port number} and an
- * {@link InternetProtocol}.
- * It can be published by Docker by {@link Ports#bind(ExposedPort, Binding) binding}
- * it to a host port, represented by a {@link Binding}.
+ * Represents a container port that Docker exposes to external clients. The port is defined by its {@link #getPort()
+ * port number} and an {@link InternetProtocol}. It can be published by Docker by
+ * {@link Ports#bind(ExposedPort, Binding) binding} it to a host port, represented by a {@link Binding}.
  */
 @JsonDeserialize(using = ExposedPort.Deserializer.class)
 @JsonSerialize(using = ExposedPort.Serializer.class)
 public class ExposedPort {
 
-	private final InternetProtocol protocol;
-	private final int port;
-
-	/**
-	 * Creates an {@link ExposedPort} for the given parameters.
-	 * 
-	 * @param port the {@link #getPort() port number}
-	 * @param protocol the {@link InternetProtocol}
-	 */
-	public ExposedPort(int port, InternetProtocol protocol) {
-		this.port = port;
-		this.protocol = protocol;
-	}
-
-	/**
-	 * Creates an {@link ExposedPort} for the given 
-	 * {@link #getPort() port number} and {@link InternetProtocol#DEFAULT}.
-	 * 
-	 * @param port the {@link #getPort() port number}
-	 */
-	public ExposedPort(int port) {
-		this(port, InternetProtocol.DEFAULT);
-	}
-
-	/**
-	 * Creates an {@link ExposedPort} for the given parameters.
-	 * 
-	 * @param scheme the {@link #getScheme() scheme}, <code>tcp</code> or 
-	 *        <code>udp</code>
-	 * @param port the {@link #getPort() port number}
-	 * @deprecated use {@link #ExposedPort(int, InternetProtocol)}
-	 */
-	@Deprecated
-	public ExposedPort(String scheme, int port) {
-		this(port, InternetProtocol.valueOf(scheme));
-	}
-
-	/** @return the {@link InternetProtocol} of the {@link #getPort() port}
-	 *          that the container exposes */
-	public InternetProtocol getProtocol() {
-		return protocol;
-	}
-	
-	/**
-	 * @return the scheme (internet protocol), <code>tcp</code> or <code>udp</code>
-	 * @deprecated use {@link #getProtocol()}
-	 */
-	@Deprecated
-	public String getScheme() {
-		return protocol.toString();
-	}
-
-	/** @return the port number that the container exposes */
-	public int getPort() {
-		return port;
-	}
-
-	/**
-	 * Creates an {@link ExposedPort} for {@link InternetProtocol#TCP}.
-	 * This is a shortcut for <code>new ExposedPort(port, {@link InternetProtocol#TCP})</code>  
-	 */
-	public static ExposedPort tcp(int port) {
-		return new ExposedPort(port, TCP);
-	}
-
-	/**
-	 * Creates an {@link ExposedPort} for {@link InternetProtocol#UDP}.
-	 * This is a shortcut for <code>new ExposedPort(port, {@link InternetProtocol#UDP})</code>  
-	 */
-	public static ExposedPort udp(int port) {
-		return new ExposedPort(port, UDP);
-	}
-
-	/**
-	 * Parses a textual port specification (as used by the Docker CLI) to an 
-	 * {@link ExposedPort}.
-	 * 
-	 * @param serialized the specification, e.g. <code>80/tcp</code>
-	 * @return an {@link ExposedPort} matching the specification
-	 * @throws IllegalArgumentException if the specification cannot be parsed
-	 */
-	public static ExposedPort parse(String serialized) throws IllegalArgumentException {
-		try {
-			String[] parts = serialized.split("/");
-			switch (parts.length) {
-			case 1:
-				return new ExposedPort(Integer.valueOf(parts[0]));
-			case 2:
-				return new ExposedPort(Integer.valueOf(parts[0]), InternetProtocol.parse(parts[1]));
-			default:
-				throw new IllegalArgumentException();
-			}
-		} catch (Exception e) {
-			throw new IllegalArgumentException("Error parsing ExposedPort '" + serialized + "'");
-		}
-	}
-	
-	/**
-	 * Returns a string representation of this {@link ExposedPort} suitable
-	 * for inclusion in a JSON message.
-	 * The format is <code>port/protocol</code>, like the argument in {@link #parse(String)}.
-	 * 
-	 * @return a string representation of this {@link ExposedPort}
-	 */
-	@Override
-	public String toString() {
-		return port + "/" + protocol.toString();
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof ExposedPort) {
-			ExposedPort other = (ExposedPort) obj;
-			return new EqualsBuilder().append(protocol, other.getProtocol())
-					.append(port, other.getPort()).isEquals();
-		} else
-			return super.equals(obj);
-	}
-
-	@Override
-	public int hashCode() {
-		return new HashCodeBuilder().append(protocol).append(port).toHashCode();
-	}
-
-	public static class Deserializer extends JsonDeserializer<ExposedPort> {
-		@Override
-		public ExposedPort deserialize(JsonParser jsonParser,
-				DeserializationContext deserializationContext)
-				throws IOException, JsonProcessingException {
-			ObjectCodec oc = jsonParser.getCodec();
-			JsonNode node = oc.readTree(jsonParser);
-			if (!node.equals(NullNode.getInstance())) {
-				Entry<String, JsonNode> field = node.fields().next();
-				return ExposedPort.parse(field.getKey());
-			} else {
-				return null;
-			}
-		}
-	}
-
-	public static class Serializer extends JsonSerializer<ExposedPort> {
-
-		@Override
-		public void serialize(ExposedPort exposedPort, JsonGenerator jsonGen,
-				SerializerProvider serProvider) throws IOException,
-				JsonProcessingException {
-
-			jsonGen.writeStartObject();
-			jsonGen.writeFieldName(exposedPort.toString());
-			jsonGen.writeEndObject();
-		}
-
-	}
+    private final InternetProtocol protocol;
+
+    private final int port;
+
+    /**
+     * Creates an {@link ExposedPort} for the given parameters.
+     * 
+     * @param port
+     *            the {@link #getPort() port number}
+     * @param protocol
+     *            the {@link InternetProtocol}
+     */
+    public ExposedPort(int port, InternetProtocol protocol) {
+        this.port = port;
+        this.protocol = protocol;
+    }
+
+    /**
+     * Creates an {@link ExposedPort} for the given {@link #getPort() port number} and {@link InternetProtocol#DEFAULT}.
+     * 
+     * @param port
+     *            the {@link #getPort() port number}
+     */
+    public ExposedPort(int port) {
+        this(port, InternetProtocol.DEFAULT);
+    }
+
+    /**
+     * Creates an {@link ExposedPort} for the given parameters.
+     * 
+     * @param scheme
+     *            the {@link #getScheme() scheme}, <code>tcp</code> or <code>udp</code>
+     * @param port
+     *            the {@link #getPort() port number}
+     * @deprecated use {@link #ExposedPort(int, InternetProtocol)}
+     */
+    @Deprecated
+    public ExposedPort(String scheme, int port) {
+        this(port, InternetProtocol.valueOf(scheme));
+    }
+
+    /**
+     * @return the {@link InternetProtocol} of the {@link #getPort() port} that the container exposes
+     */
+    public InternetProtocol getProtocol() {
+        return protocol;
+    }
+
+    /**
+     * @return the scheme (internet protocol), <code>tcp</code> or <code>udp</code>
+     * @deprecated use {@link #getProtocol()}
+     */
+    @Deprecated
+    public String getScheme() {
+        return protocol.toString();
+    }
+
+    /** @return the port number that the container exposes */
+    public int getPort() {
+        return port;
+    }
+
+    /**
+     * Creates an {@link ExposedPort} for {@link InternetProtocol#TCP}. This is a shortcut for
+     * <code>new ExposedPort(port, {@link InternetProtocol#TCP})</code>
+     */
+    public static ExposedPort tcp(int port) {
+        return new ExposedPort(port, TCP);
+    }
+
+    /**
+     * Creates an {@link ExposedPort} for {@link InternetProtocol#UDP}. This is a shortcut for
+     * <code>new ExposedPort(port, {@link InternetProtocol#UDP})</code>
+     */
+    public static ExposedPort udp(int port) {
+        return new ExposedPort(port, UDP);
+    }
+
+    /**
+     * Parses a textual port specification (as used by the Docker CLI) to an {@link ExposedPort}.
+     * 
+     * @param serialized
+     *            the specification, e.g. <code>80/tcp</code>
+     * @return an {@link ExposedPort} matching the specification
+     * @throws IllegalArgumentException
+     *             if the specification cannot be parsed
+     */
+    public static ExposedPort parse(String serialized) throws IllegalArgumentException {
+        try {
+            String[] parts = serialized.split("/");
+            switch (parts.length) {
+            case 1:
+                return new ExposedPort(Integer.valueOf(parts[0]));
+            case 2:
+                return new ExposedPort(Integer.valueOf(parts[0]), InternetProtocol.parse(parts[1]));
+            default:
+                throw new IllegalArgumentException();
+            }
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Error parsing ExposedPort '" + serialized + "'");
+        }
+    }
+
+    /**
+     * Returns a string representation of this {@link ExposedPort} suitable for inclusion in a JSON message. The format
+     * is <code>port/protocol</code>, like the argument in {@link #parse(String)}.
+     * 
+     * @return a string representation of this {@link ExposedPort}
+     */
+    @Override
+    public String toString() {
+        return port + "/" + protocol.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof ExposedPort) {
+            ExposedPort other = (ExposedPort) obj;
+            return new EqualsBuilder().append(protocol, other.getProtocol()).append(port, other.getPort()).isEquals();
+        } else
+            return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(protocol).append(port).toHashCode();
+    }
+
+    public static class Deserializer extends JsonDeserializer<ExposedPort> {
+        @Override
+        public ExposedPort deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+                throws IOException, JsonProcessingException {
+            ObjectCodec oc = jsonParser.getCodec();
+            JsonNode node = oc.readTree(jsonParser);
+            if (!node.equals(NullNode.getInstance())) {
+                Entry<String, JsonNode> field = node.fields().next();
+                return ExposedPort.parse(field.getKey());
+            } else {
+                return null;
+            }
+        }
+    }
+
+    public static class Serializer extends JsonSerializer<ExposedPort> {
+
+        @Override
+        public void serialize(ExposedPort exposedPort, JsonGenerator jsonGen, SerializerProvider serProvider)
+                throws IOException, JsonProcessingException {
+
+            jsonGen.writeStartObject();
+            jsonGen.writeFieldName(exposedPort.toString());
+            jsonGen.writeEndObject();
+        }
+
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java b/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
index 983ad3c36..0ecb879b6 100644
--- a/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
+++ b/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
@@ -19,55 +19,54 @@
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.node.NullNode;
 
-
 @JsonSerialize(using = ExposedPorts.Serializer.class)
 @JsonDeserialize(using = ExposedPorts.Deserializer.class)
 public class ExposedPorts {
 
-	private ExposedPort[] exposedPorts;
+    private ExposedPort[] exposedPorts;
+
+    public ExposedPorts(ExposedPort... exposedPorts) {
+        this.exposedPorts = exposedPorts;
+    }
 
-	public ExposedPorts(ExposedPort... exposedPorts) {
-		this.exposedPorts = exposedPorts;
-	}
-	
-	public ExposedPorts(List<ExposedPort> exposedPorts) {
-		this.exposedPorts = exposedPorts.toArray(new ExposedPort[exposedPorts.size()]);
-	}
+    public ExposedPorts(List<ExposedPort> exposedPorts) {
+        this.exposedPorts = exposedPorts.toArray(new ExposedPort[exposedPorts.size()]);
+    }
 
-	public ExposedPort[] getExposedPorts() {
-		return exposedPorts;
-	}
+    public ExposedPort[] getExposedPorts() {
+        return exposedPorts;
+    }
 
-	public static class Serializer extends JsonSerializer<ExposedPorts> {
+    public static class Serializer extends JsonSerializer<ExposedPorts> {
 
-		@Override
-		public void serialize(ExposedPorts exposedPorts, JsonGenerator jsonGen,
-				SerializerProvider serProvider) throws IOException,
-				JsonProcessingException {
-			
-			jsonGen.writeStartObject();
-			for (ExposedPort exposedPort : exposedPorts.getExposedPorts()) {
-				jsonGen.writeFieldName(exposedPort.toString());
-				jsonGen.writeStartObject();
-				jsonGen.writeEndObject();
-			}
-			jsonGen.writeEndObject();
-		}
+        @Override
+        public void serialize(ExposedPorts exposedPorts, JsonGenerator jsonGen, SerializerProvider serProvider)
+                throws IOException, JsonProcessingException {
+
+            jsonGen.writeStartObject();
+            for (ExposedPort exposedPort : exposedPorts.getExposedPorts()) {
+                jsonGen.writeFieldName(exposedPort.toString());
+                jsonGen.writeStartObject();
+                jsonGen.writeEndObject();
+            }
+            jsonGen.writeEndObject();
+        }
+
+    }
 
-	}
-	
-	public static class Deserializer extends JsonDeserializer<ExposedPorts> {
+    public static class Deserializer extends JsonDeserializer<ExposedPorts> {
         @Override
-        public ExposedPorts deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+        public ExposedPorts deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+                throws IOException, JsonProcessingException {
 
-        	List<ExposedPort> exposedPorts = new ArrayList<ExposedPort>();
+            List<ExposedPort> exposedPorts = new ArrayList<ExposedPort>();
             ObjectCodec oc = jsonParser.getCodec();
             JsonNode node = oc.readTree(jsonParser);
             for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
 
                 Map.Entry<String, JsonNode> field = it.next();
                 if (!field.getValue().equals(NullNode.getInstance())) {
-                	exposedPorts.add(ExposedPort.parse(field.getKey()));
+                    exposedPorts.add(ExposedPort.parse(field.getKey()));
                 }
             }
             return new ExposedPorts(exposedPorts.toArray(new ExposedPort[0]));
diff --git a/src/main/java/com/github/dockerjava/api/model/Frame.java b/src/main/java/com/github/dockerjava/api/model/Frame.java
index 175b56830..1be92f9b6 100644
--- a/src/main/java/com/github/dockerjava/api/model/Frame.java
+++ b/src/main/java/com/github/dockerjava/api/model/Frame.java
@@ -7,6 +7,7 @@
  */
 public class Frame {
     private final StreamType streamType;
+
     private final byte[] payload;
 
     public Frame(StreamType streamType, byte[] payload) {
@@ -29,8 +30,10 @@ public String toString() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
 
         Frame frame = (Frame) o;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 6b8cdcd45..19da56517 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -5,243 +5,241 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
-
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class HostConfig {
 
-	@JsonProperty("Binds")
-	private Binds binds;
-
-	@JsonProperty("Links")
-	private Links links;
-
-	@JsonProperty("LxcConf")
-	private LxcConf[] lxcConf;
+    @JsonProperty("Binds")
+    private Binds binds;
 
-	@JsonProperty("PortBindings")
-	private Ports portBindings;
+    @JsonProperty("Links")
+    private Links links;
 
-	@JsonProperty("PublishAllPorts")
-	private boolean publishAllPorts;
+    @JsonProperty("LxcConf")
+    private LxcConf[] lxcConf;
 
-	@JsonProperty("Privileged")
-	private boolean privileged;
+    @JsonProperty("PortBindings")
+    private Ports portBindings;
 
-	@JsonProperty("ReadonlyRootfs")
-	private boolean readonlyRootfs;
+    @JsonProperty("PublishAllPorts")
+    private boolean publishAllPorts;
 
-	@JsonProperty("Dns")
-	private String[] dns;
+    @JsonProperty("Privileged")
+    private boolean privileged;
 
-	@JsonProperty("DnsSearch")
-	private String[] dnsSearch;
+    @JsonProperty("ReadonlyRootfs")
+    private boolean readonlyRootfs;
 
-	@JsonProperty("VolumesFrom")
-	private VolumesFrom[] volumesFrom;
+    @JsonProperty("Dns")
+    private String[] dns;
 
-	@JsonProperty("ContainerIDFile")
-	private String containerIDFile;
+    @JsonProperty("DnsSearch")
+    private String[] dnsSearch;
 
-	@JsonProperty("CapAdd")
-	private Capability[] capAdd;
+    @JsonProperty("VolumesFrom")
+    private VolumesFrom[] volumesFrom;
 
-	@JsonProperty("CapDrop")
-	private Capability[] capDrop;
+    @JsonProperty("ContainerIDFile")
+    private String containerIDFile;
 
-	@JsonProperty("RestartPolicy")
-	private RestartPolicy restartPolicy;
+    @JsonProperty("CapAdd")
+    private Capability[] capAdd;
 
-	@JsonProperty("NetworkMode")
-	private String networkMode;
+    @JsonProperty("CapDrop")
+    private Capability[] capDrop;
 
-	@JsonProperty("Devices")
-	private Device[] devices;
+    @JsonProperty("RestartPolicy")
+    private RestartPolicy restartPolicy;
 
-	@JsonProperty("ExtraHosts")
-	private String[] extraHosts;
+    @JsonProperty("NetworkMode")
+    private String networkMode;
 
-	@JsonProperty("Ulimits")
-	private Ulimit[] ulimits;
+    @JsonProperty("Devices")
+    private Device[] devices;
 
-	public HostConfig() {
-	}
+    @JsonProperty("ExtraHosts")
+    private String[] extraHosts;
 
-	public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, Ports portBindings, boolean publishAllPorts,
-			boolean privileged, boolean readonlyRootfs, String[] dns, String[] dnsSearch, VolumesFrom[] volumesFrom, String containerIDFile,
-			Capability[] capAdd, Capability[] capDrop, RestartPolicy restartPolicy, String networkMode, Device[] devices,
-            String[] extraHosts, Ulimit[] ulimits) {
-		this.binds = new Binds(binds);
-		this.links = new Links(links);
-		this.lxcConf = lxcConf;
-		this.portBindings = portBindings;
-		this.publishAllPorts = publishAllPorts;
-		this.privileged = privileged;
-		this.readonlyRootfs = readonlyRootfs;
-		this.dns = dns;
-		this.dnsSearch = dnsSearch;
-		this.volumesFrom = volumesFrom;
-		this.containerIDFile = containerIDFile;
-		this.capAdd = capAdd;
-		this.capDrop = capDrop;
-		this.restartPolicy = restartPolicy;
-		this.networkMode = networkMode;
-		this.devices = devices;
-		this.extraHosts = extraHosts;
-		this.ulimits = ulimits;
-	}
+    @JsonProperty("Ulimits")
+    private Ulimit[] ulimits;
 
+    public HostConfig() {
+    }
 
-	@JsonIgnore
-	public Bind[] getBinds() {
-		return (binds == null) ? new Bind[0] : binds.getBinds();
-	}
+    public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, Ports portBindings, boolean publishAllPorts,
+            boolean privileged, boolean readonlyRootfs, String[] dns, String[] dnsSearch, VolumesFrom[] volumesFrom,
+            String containerIDFile, Capability[] capAdd, Capability[] capDrop, RestartPolicy restartPolicy,
+            String networkMode, Device[] devices, String[] extraHosts, Ulimit[] ulimits) {
+        this.binds = new Binds(binds);
+        this.links = new Links(links);
+        this.lxcConf = lxcConf;
+        this.portBindings = portBindings;
+        this.publishAllPorts = publishAllPorts;
+        this.privileged = privileged;
+        this.readonlyRootfs = readonlyRootfs;
+        this.dns = dns;
+        this.dnsSearch = dnsSearch;
+        this.volumesFrom = volumesFrom;
+        this.containerIDFile = containerIDFile;
+        this.capAdd = capAdd;
+        this.capDrop = capDrop;
+        this.restartPolicy = restartPolicy;
+        this.networkMode = networkMode;
+        this.devices = devices;
+        this.extraHosts = extraHosts;
+        this.ulimits = ulimits;
+    }
 
-	public LxcConf[] getLxcConf() {
-		return lxcConf;
-	}
+    @JsonIgnore
+    public Bind[] getBinds() {
+        return (binds == null) ? new Bind[0] : binds.getBinds();
+    }
 
-	public Ports getPortBindings() {
-		return portBindings;
-	}
+    public LxcConf[] getLxcConf() {
+        return lxcConf;
+    }
 
-	public boolean isPublishAllPorts() {
-		return publishAllPorts;
-	}
+    public Ports getPortBindings() {
+        return portBindings;
+    }
 
-	public boolean isPrivileged() {
-		return privileged;
-	}
+    public boolean isPublishAllPorts() {
+        return publishAllPorts;
+    }
 
-	public boolean isReadonlyRootfs() {
-		return readonlyRootfs;
-	}
-
-	public String[] getDns() {
-		return dns;
-	}
-
-	public VolumesFrom[] getVolumesFrom() {
-		return volumesFrom;
-	}
-
-	public String getContainerIDFile() {
-		return containerIDFile;
-	}
-
-	public String[] getDnsSearch() {
-		return dnsSearch;
-	}
-
-	@JsonIgnore
-	public Link[] getLinks() {
-		return (links == null) ? new Link[0] : links.getLinks();
-	}
-
-	public String getNetworkMode() {
-		return networkMode;
-	}
-
-	public Device[] getDevices() {
-		return devices;
-	}
-
-	public String[] getExtraHosts() {
-		return extraHosts;
-	}
-
-	public RestartPolicy getRestartPolicy() {
-		return restartPolicy;
-	}
-
-	public Capability[] getCapAdd() {
-		return capAdd;
-	}
-
-	public Capability[] getCapDrop() {
-		return capDrop;
-	}
-
-	public Ulimit[] getUlimits() {
-		return ulimits;
-	}
-
-	@JsonIgnore
-	public void setBinds(Bind... binds) {
-		this.binds = new Binds(binds);
-	}
-
-	@JsonIgnore
-	public void setLinks(Link... links) {
-		this.links = new Links(links);
-	}
-
-	public void setLxcConf(LxcConf[] lxcConf) {
-		this.lxcConf = lxcConf;
-	}
-
-	public void setPortBindings(Ports portBindings) {
-		this.portBindings = portBindings;
-	}
-
-	public void setPublishAllPorts(boolean publishAllPorts) {
-		this.publishAllPorts = publishAllPorts;
-	}
-
-	public void setPrivileged(boolean privileged) {
-		this.privileged = privileged;
-	}
-
-	public void setReadonlyRootfs(boolean readonlyRootfs) {
-		this.readonlyRootfs = readonlyRootfs;
-	}
-
-	public void setDns(String[] dns) {
-		this.dns = dns;
-	}
-
-	public void setDnsSearch(String[] dnsSearch) {
-		this.dnsSearch = dnsSearch;
-	}
-
-	public void setVolumesFrom(VolumesFrom[] volumesFrom) {
-		this.volumesFrom = volumesFrom;
-	}
-
-	public void setContainerIDFile(String containerIDFile) {
-		this.containerIDFile = containerIDFile;
-	}
-
-	public void setCapAdd(Capability[] capAdd) {
-		this.capAdd = capAdd;
-	}
-
-	public void setCapDrop(Capability[] capDrop) {
-		this.capDrop = capDrop;
-	}
-
-	public void setRestartPolicy(RestartPolicy restartPolicy) {
-		this.restartPolicy = restartPolicy;
-	}
-
-	public void setNetworkMode(String networkMode) {
-		this.networkMode = networkMode;
-	}
-
-	public void setDevices(Device[] devices) {
-		this.devices = devices;
-	}
-
-	public void setExtraHosts(String[] extraHosts) {
-		this.extraHosts = extraHosts;
-	}
-
-	public void setUlimits(Ulimit[] ulimits) {
-		this.ulimits = ulimits;
-	}
-
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
+    public boolean isPrivileged() {
+        return privileged;
+    }
+
+    public boolean isReadonlyRootfs() {
+        return readonlyRootfs;
+    }
+
+    public String[] getDns() {
+        return dns;
+    }
+
+    public VolumesFrom[] getVolumesFrom() {
+        return volumesFrom;
+    }
+
+    public String getContainerIDFile() {
+        return containerIDFile;
+    }
+
+    public String[] getDnsSearch() {
+        return dnsSearch;
+    }
+
+    @JsonIgnore
+    public Link[] getLinks() {
+        return (links == null) ? new Link[0] : links.getLinks();
+    }
+
+    public String getNetworkMode() {
+        return networkMode;
+    }
+
+    public Device[] getDevices() {
+        return devices;
+    }
+
+    public String[] getExtraHosts() {
+        return extraHosts;
+    }
+
+    public RestartPolicy getRestartPolicy() {
+        return restartPolicy;
+    }
+
+    public Capability[] getCapAdd() {
+        return capAdd;
+    }
+
+    public Capability[] getCapDrop() {
+        return capDrop;
+    }
+
+    public Ulimit[] getUlimits() {
+        return ulimits;
+    }
+
+    @JsonIgnore
+    public void setBinds(Bind... binds) {
+        this.binds = new Binds(binds);
+    }
+
+    @JsonIgnore
+    public void setLinks(Link... links) {
+        this.links = new Links(links);
+    }
+
+    public void setLxcConf(LxcConf[] lxcConf) {
+        this.lxcConf = lxcConf;
+    }
+
+    public void setPortBindings(Ports portBindings) {
+        this.portBindings = portBindings;
+    }
+
+    public void setPublishAllPorts(boolean publishAllPorts) {
+        this.publishAllPorts = publishAllPorts;
+    }
+
+    public void setPrivileged(boolean privileged) {
+        this.privileged = privileged;
+    }
+
+    public void setReadonlyRootfs(boolean readonlyRootfs) {
+        this.readonlyRootfs = readonlyRootfs;
+    }
+
+    public void setDns(String[] dns) {
+        this.dns = dns;
+    }
+
+    public void setDnsSearch(String[] dnsSearch) {
+        this.dnsSearch = dnsSearch;
+    }
+
+    public void setVolumesFrom(VolumesFrom[] volumesFrom) {
+        this.volumesFrom = volumesFrom;
+    }
+
+    public void setContainerIDFile(String containerIDFile) {
+        this.containerIDFile = containerIDFile;
+    }
+
+    public void setCapAdd(Capability[] capAdd) {
+        this.capAdd = capAdd;
+    }
+
+    public void setCapDrop(Capability[] capDrop) {
+        this.capDrop = capDrop;
+    }
+
+    public void setRestartPolicy(RestartPolicy restartPolicy) {
+        this.restartPolicy = restartPolicy;
+    }
+
+    public void setNetworkMode(String networkMode) {
+        this.networkMode = networkMode;
+    }
+
+    public void setDevices(Device[] devices) {
+        this.devices = devices;
+    }
+
+    public void setExtraHosts(String[] extraHosts) {
+        this.extraHosts = extraHosts;
+    }
+
+    public void setUlimits(Ulimit[] ulimits) {
+        this.ulimits = ulimits;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Identifier.java b/src/main/java/com/github/dockerjava/api/model/Identifier.java
index 498104e29..96daab11a 100644
--- a/src/main/java/com/github/dockerjava/api/model/Identifier.java
+++ b/src/main/java/com/github/dockerjava/api/model/Identifier.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-
 import com.google.common.base.Objects;
 import com.google.common.base.Optional;
 
@@ -9,51 +8,46 @@
  */
 public class Identifier {
     public final Repository repository;
+
     public final Optional<String> tag;
 
     public Identifier(Repository repository, String tag) {
         this.repository = repository;
 
-        if( tag == null )
+        if (tag == null)
             this.tag = Optional.absent();
         else
             this.tag = Optional.of(tag);
     }
 
-
     /**
-     * Return an identifier that correctly splits up the repository and tag.
-     * There can be &gt; 1 ":"
-     * fred/jim     --&gt; fred/jim, []
-     * fred/jim:123 --&gt;  fred/jim, 123
-     * fred:123/jim:123 --&gt; fred:123/jim, 123
+     * Return an identifier that correctly splits up the repository and tag. There can be &gt; 1 ":" fred/jim --&gt;
+     * fred/jim, [] fred/jim:123 --&gt; fred/jim, 123 fred:123/jim:123 --&gt; fred:123/jim, 123
      *
      *
-     * @param identifier as a string
+     * @param identifier
+     *            as a string
      * @return parsed identifier.
      */
     public static Identifier fromCompoundString(String identifier) {
         String[] parts = identifier.split("/");
-        if( parts.length != 2 ) {
+        if (parts.length != 2) {
             String[] rhs = identifier.split(":");
-            if( rhs.length != 2 )
-                return new Identifier( new Repository(identifier), null);
+            if (rhs.length != 2)
+                return new Identifier(new Repository(identifier), null);
             else
-                return new Identifier( new Repository(rhs[0]), rhs[1]);
+                return new Identifier(new Repository(rhs[0]), rhs[1]);
         }
 
         String[] rhs = parts[1].split(":");
-        if( rhs.length != 2 )
-            return new Identifier( new Repository(identifier), null);
+        if (rhs.length != 2)
+            return new Identifier(new Repository(identifier), null);
 
-        return new Identifier( new Repository(parts[0] + "/" + rhs[0]), rhs[1]);
+        return new Identifier(new Repository(parts[0] + "/" + rhs[0]), rhs[1]);
     }
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
-                .add("repository", repository)
-                .add("tag", tag)
-                .toString();
+        return Objects.toStringHelper(this).add("repository", repository).add("tag", tag).toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Image.java b/src/main/java/com/github/dockerjava/api/model/Image.java
index 8c694daba..9df8aacef 100644
--- a/src/main/java/com/github/dockerjava/api/model/Image.java
+++ b/src/main/java/com/github/dockerjava/api/model/Image.java
@@ -13,16 +13,16 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Image {
 
-	@JsonProperty("Created")
-	private long created;
+    @JsonProperty("Created")
+    private long created;
 
-	@JsonProperty("Id")
+    @JsonProperty("Id")
     private String id;
 
-	@JsonProperty("ParentId")
-	private String parentId;
+    @JsonProperty("ParentId")
+    private String parentId;
 
-	@JsonProperty("RepoTags")
+    @JsonProperty("RepoTags")
     private String[] repoTags;
 
     @JsonProperty("Size")
diff --git a/src/main/java/com/github/dockerjava/api/model/Info.java b/src/main/java/com/github/dockerjava/api/model/Info.java
index bf96b9fc1..5ff53a597 100644
--- a/src/main/java/com/github/dockerjava/api/model/Info.java
+++ b/src/main/java/com/github/dockerjava/api/model/Info.java
@@ -20,173 +20,173 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Info {
 
-	@JsonProperty("Containers")
-	private int containers;
-
-	@JsonProperty("Debug")
-	private boolean debug;
-	
-	@JsonProperty("DockerRootDir")
-	private String DockerRootDir;
-
-	@JsonProperty("Driver")
-	private String driver;
-
-	@JsonProperty("DriverStatus")
-	private List<Object> driverStatuses;
-
-	@JsonProperty("ExecutionDriver")
-	private String executionDriver;
-	
-	@JsonProperty("ID")
-	private String ID;
-
-	@JsonProperty("IPv4Forwarding")
-	private boolean IPv4Forwarding;
-
-	@JsonProperty("Images")
-	private int images;
-
-	@JsonProperty("IndexServerAddress")
-	private String IndexServerAddress;
-
-	@JsonProperty("InitPath")
-	private String initPath;
-
-	@JsonProperty("InitSha1")
-	private String initSha1;
-
-	@JsonProperty("KernelVersion")
-	private String kernelVersion;
-	
-	@JsonProperty("Labels")
-	private String[] Labels;
-
-	@JsonProperty("MemoryLimit")
-	private boolean memoryLimit;
-	
-	@JsonProperty("MemTotal")
-	private long memTotal;
-		
-	@JsonProperty("Name")
-	private String name;
-	
-	@JsonProperty("NCPU")
-	private int NCPU;
-
-	@JsonProperty("NEventsListener")
-	private long nEventListener;
-
-	@JsonProperty("NFd")
-	private int NFd;
-
-	@JsonProperty("NGoroutines")
-	private int NGoroutines;
-	
-	@JsonProperty("OperatingSystem")
-	private String OperatingSystem;
-
-	@JsonProperty("Sockets")
-	private String[] sockets;
-
-	@JsonProperty("SwapLimit")
-	private boolean swapLimit;
-
-	public boolean isDebug() {
-		return debug;
-	}
-
-	public int getContainers() {
-		return containers;
-	}
-	
-	public String getDockerRootDir() {
-		return DockerRootDir;
-	}
-
-	public String getDriver() {
-		return driver;
-	}
-
-	public List<Object> getDriverStatuses() {
-		return driverStatuses;
-	}
-
-	public int getImages() {
-		return images;
-	}
-	
-	public String getID() {
-		return ID;
-	}
-
-	public boolean getIPv4Forwarding() {
-		return IPv4Forwarding;
-	}
-
-	public String getIndexServerAddress() {
-		return IndexServerAddress;
-	}
-
-	public String getInitPath() {
-		return initPath;
-	}
-
-	public String getInitSha1() {
-		return initSha1;
-	}
-
-	public String getKernelVersion() {
-		return kernelVersion;
-	}
-	
-	public String[] getLabels() {
-		return Labels;
-	}
-
-	public String[] getSockets() {
-		return sockets;
-	}
-
-	public boolean isMemoryLimit() {
-		return memoryLimit;
-	}
-
-	public long getnEventListener() {
-		return nEventListener;
-	}
-	
-	public long getMemTotal() {
-		return memTotal;
-	}
-	
-	public String getName() {
-		return name;
-	}
-	
-	public int getNCPU() {
-		return NCPU;
-	}
-
-	public int getNFd() {
-		return NFd;
-	}
-
-	public int getNGoroutines() {
-		return NGoroutines;
-	}
-	
-	public String getOperatingSystem() {
-		return OperatingSystem;
-	}
-
-	public boolean getSwapLimit() {
-		return swapLimit;
-	}
-
-	public String getExecutionDriver() {
-		return executionDriver;
-	}
+    @JsonProperty("Containers")
+    private int containers;
+
+    @JsonProperty("Debug")
+    private boolean debug;
+
+    @JsonProperty("DockerRootDir")
+    private String DockerRootDir;
+
+    @JsonProperty("Driver")
+    private String driver;
+
+    @JsonProperty("DriverStatus")
+    private List<Object> driverStatuses;
+
+    @JsonProperty("ExecutionDriver")
+    private String executionDriver;
+
+    @JsonProperty("ID")
+    private String ID;
+
+    @JsonProperty("IPv4Forwarding")
+    private boolean IPv4Forwarding;
+
+    @JsonProperty("Images")
+    private int images;
+
+    @JsonProperty("IndexServerAddress")
+    private String IndexServerAddress;
+
+    @JsonProperty("InitPath")
+    private String initPath;
+
+    @JsonProperty("InitSha1")
+    private String initSha1;
+
+    @JsonProperty("KernelVersion")
+    private String kernelVersion;
+
+    @JsonProperty("Labels")
+    private String[] Labels;
+
+    @JsonProperty("MemoryLimit")
+    private boolean memoryLimit;
+
+    @JsonProperty("MemTotal")
+    private long memTotal;
+
+    @JsonProperty("Name")
+    private String name;
+
+    @JsonProperty("NCPU")
+    private int NCPU;
+
+    @JsonProperty("NEventsListener")
+    private long nEventListener;
+
+    @JsonProperty("NFd")
+    private int NFd;
+
+    @JsonProperty("NGoroutines")
+    private int NGoroutines;
+
+    @JsonProperty("OperatingSystem")
+    private String OperatingSystem;
+
+    @JsonProperty("Sockets")
+    private String[] sockets;
+
+    @JsonProperty("SwapLimit")
+    private boolean swapLimit;
+
+    public boolean isDebug() {
+        return debug;
+    }
+
+    public int getContainers() {
+        return containers;
+    }
+
+    public String getDockerRootDir() {
+        return DockerRootDir;
+    }
+
+    public String getDriver() {
+        return driver;
+    }
+
+    public List<Object> getDriverStatuses() {
+        return driverStatuses;
+    }
+
+    public int getImages() {
+        return images;
+    }
+
+    public String getID() {
+        return ID;
+    }
+
+    public boolean getIPv4Forwarding() {
+        return IPv4Forwarding;
+    }
+
+    public String getIndexServerAddress() {
+        return IndexServerAddress;
+    }
+
+    public String getInitPath() {
+        return initPath;
+    }
+
+    public String getInitSha1() {
+        return initSha1;
+    }
+
+    public String getKernelVersion() {
+        return kernelVersion;
+    }
+
+    public String[] getLabels() {
+        return Labels;
+    }
+
+    public String[] getSockets() {
+        return sockets;
+    }
+
+    public boolean isMemoryLimit() {
+        return memoryLimit;
+    }
+
+    public long getnEventListener() {
+        return nEventListener;
+    }
+
+    public long getMemTotal() {
+        return memTotal;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getNCPU() {
+        return NCPU;
+    }
+
+    public int getNFd() {
+        return NFd;
+    }
+
+    public int getNGoroutines() {
+        return NGoroutines;
+    }
+
+    public String getOperatingSystem() {
+        return OperatingSystem;
+    }
+
+    public boolean getSwapLimit() {
+        return swapLimit;
+    }
+
+    public String getExecutionDriver() {
+        return executionDriver;
+    }
 
     @Override
     public String toString() {
diff --git a/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java b/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
index 96c215245..65df8cf6f 100644
--- a/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
+++ b/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-
 /**
  * The IP protocols supported by Docker.
  * 
@@ -8,42 +7,43 @@
  * @see #UDP
  */
 public enum InternetProtocol {
-	/** The <i>Transmission Control Protocol</i> */
-	TCP, 
+    /** The <i>Transmission Control Protocol</i> */
+    TCP,
+
+    /** The <i>User Datagram Protocol</i> */
+    UDP;
 
-	/** The <i>User Datagram Protocol</i> */
-	UDP;
-	
-	/**
-	 * The default {@link InternetProtocol}: {@link #TCP}
-	 */
-	public static final InternetProtocol DEFAULT = TCP;
+    /**
+     * The default {@link InternetProtocol}: {@link #TCP}
+     */
+    public static final InternetProtocol DEFAULT = TCP;
 
-	/**
-	 * Returns a string representation of this {@link InternetProtocol} suitable
-	 * for inclusion in a JSON message.
-	 * The output is the lowercased name of the Protocol, e.g. <code>tcp</code>.
-	 * 
-	 * @return a string representation of this {@link InternetProtocol}
-	 */
-	@Override
-	public String toString() {
-		return super.toString().toLowerCase();
-	}
+    /**
+     * Returns a string representation of this {@link InternetProtocol} suitable for inclusion in a JSON message. The
+     * output is the lowercased name of the Protocol, e.g. <code>tcp</code>.
+     * 
+     * @return a string representation of this {@link InternetProtocol}
+     */
+    @Override
+    public String toString() {
+        return super.toString().toLowerCase();
+    }
 
-	/**
-	 * Parses a string to an {@link InternetProtocol}.
-	 * 
-	 * @param serialized the protocol, e.g. <code>tcp</code> or <code>TCP</code>
-	 * @return an {@link InternetProtocol} described by the string
-	 * @throws IllegalArgumentException if the argument cannot be parsed
-	 */
-	public static InternetProtocol parse(String serialized) throws IllegalArgumentException {
-		try {
-			return valueOf(serialized.toUpperCase());
-		} catch (Exception e) {
-			throw new IllegalArgumentException("Error parsing Protocol '" + serialized + "'");
-		}
-	}
+    /**
+     * Parses a string to an {@link InternetProtocol}.
+     * 
+     * @param serialized
+     *            the protocol, e.g. <code>tcp</code> or <code>TCP</code>
+     * @return an {@link InternetProtocol} described by the string
+     * @throws IllegalArgumentException
+     *             if the argument cannot be parsed
+     */
+    public static InternetProtocol parse(String serialized) throws IllegalArgumentException {
+        try {
+            return valueOf(serialized.toUpperCase());
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Error parsing Protocol '" + serialized + "'");
+        }
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Link.java b/src/main/java/com/github/dockerjava/api/model/Link.java
index ab8485a36..0b2c828f3 100644
--- a/src/main/java/com/github/dockerjava/api/model/Link.java
+++ b/src/main/java/com/github/dockerjava/api/model/Link.java
@@ -4,104 +4,94 @@
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
 /**
- * Represents a network link between two Docker containers.
- * The container with the name {@link #getName()} is made available in the
- * target container with the aliased name {@link #getAlias()}.
- * This involves creating an entry in <code>/etc/hosts</code> and some environment
- * variables in the target container as well as creating a network bridge between
- * both containers.
+ * Represents a network link between two Docker containers. The container with the name {@link #getName()} is made
+ * available in the target container with the aliased name {@link #getAlias()}. This involves creating an entry in
+ * <code>/etc/hosts</code> and some environment variables in the target container as well as creating a network bridge
+ * between both containers.
  */
-public class Link
-{
+public class Link {
 
-	private final String name;
+    private final String name;
 
-	private final String alias;
+    private final String alias;
 
-	/**
-	 * Creates a {@link Link} for the container with the given name and an aliased
-	 * name for use in the target container.
-	 * 
-	 * @param name the name of the container that you want to link into the target
-	 *        container
-	 * @param alias the aliased name under which the linked container will be available
-	 *        in the target container
-	 */
-	public Link(final String name, final String alias)
-	{
-		this.name = name;
-		this.alias = alias;
-	}
+    /**
+     * Creates a {@link Link} for the container with the given name and an aliased name for use in the target container.
+     * 
+     * @param name
+     *            the name of the container that you want to link into the target container
+     * @param alias
+     *            the aliased name under which the linked container will be available in the target container
+     */
+    public Link(final String name, final String alias) {
+        this.name = name;
+        this.alias = alias;
+    }
 
-	/**
-	 * @return the name of the container that is linked into the target container
-	 */
-	public String getName()
-	{
-		return name;
-	}
+    /**
+     * @return the name of the container that is linked into the target container
+     */
+    public String getName() {
+        return name;
+    }
 
-	/**
-	 * @return the aliased name under which the linked container will be available
-	 *         in the target container  
-	 */
-	public String getAlias()
-	{
-		return alias;
-	}
+    /**
+     * @return the aliased name under which the linked container will be available in the target container
+     */
+    public String getAlias() {
+        return alias;
+    }
 
-	/**
-	 * Parses a textual link specification (as used by the Docker CLI) to a {@link Link}.
-	 * 
-	 * @param serialized the specification, e.g. <code>name:alias</code> or <code>/name1:/name2/alias</code>
-	 * @return a {@link Link} matching the specification
-	 * @throws IllegalArgumentException if the specification cannot be parsed
-	 */
-	public static Link parse(final String serialized) throws IllegalArgumentException
-	{
-		try {
-			final String[] parts = serialized.split(":");
-			switch (parts.length) {
-			case 2: {
-				String[] nameSplit = parts[0].split("/");
-				String[] aliasSplit = parts[1].split("/");
-				return new Link(nameSplit[nameSplit.length - 1], aliasSplit[aliasSplit.length - 1]);
-			}
-			default: {
-				throw new IllegalArgumentException();
-			}
-			}
-		} catch (final Exception e) {
-			throw new IllegalArgumentException("Error parsing Link '" + serialized + "'");
-		}
-	}
+    /**
+     * Parses a textual link specification (as used by the Docker CLI) to a {@link Link}.
+     * 
+     * @param serialized
+     *            the specification, e.g. <code>name:alias</code> or <code>/name1:/name2/alias</code>
+     * @return a {@link Link} matching the specification
+     * @throws IllegalArgumentException
+     *             if the specification cannot be parsed
+     */
+    public static Link parse(final String serialized) throws IllegalArgumentException {
+        try {
+            final String[] parts = serialized.split(":");
+            switch (parts.length) {
+            case 2: {
+                String[] nameSplit = parts[0].split("/");
+                String[] aliasSplit = parts[1].split("/");
+                return new Link(nameSplit[nameSplit.length - 1], aliasSplit[aliasSplit.length - 1]);
+            }
+            default: {
+                throw new IllegalArgumentException();
+            }
+            }
+        } catch (final Exception e) {
+            throw new IllegalArgumentException("Error parsing Link '" + serialized + "'");
+        }
+    }
 
-	@Override
-	public boolean equals(final Object obj)
-	{
-		if (obj instanceof Link) {
-			final Link other = (Link) obj;
-			return new EqualsBuilder().append(name, other.getName()).append(alias, other.getAlias()).isEquals();
-		} else
-			return super.equals(obj);
-	}
+    @Override
+    public boolean equals(final Object obj) {
+        if (obj instanceof Link) {
+            final Link other = (Link) obj;
+            return new EqualsBuilder().append(name, other.getName()).append(alias, other.getAlias()).isEquals();
+        } else
+            return super.equals(obj);
+    }
 
-	@Override
-	public int hashCode()
-	{
-		return new HashCodeBuilder().append(name).append(alias).toHashCode();
-	}
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(name).append(alias).toHashCode();
+    }
 
-	/**
-	 * Returns a string representation of this {@link Link} suitable
-	 * for inclusion in a JSON message.
-	 * The format is <code>name:alias</code>, like the argument in {@link #parse(String)}.
-	 * 
-	 * @return a string representation of this {@link Link}
-	 */
-	@Override
-	public String toString() {
-		return name + ":" + alias;
-	}
+    /**
+     * Returns a string representation of this {@link Link} suitable for inclusion in a JSON message. The format is
+     * <code>name:alias</code>, like the argument in {@link #parse(String)}.
+     * 
+     * @return a string representation of this {@link Link}
+     */
+    @Override
+    public String toString() {
+        return name + ":" + alias;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Links.java b/src/main/java/com/github/dockerjava/api/model/Links.java
index 888c0aa2c..2d678b3a3 100644
--- a/src/main/java/com/github/dockerjava/api/model/Links.java
+++ b/src/main/java/com/github/dockerjava/api/model/Links.java
@@ -1,4 +1,3 @@
-
 package com.github.dockerjava.api.model;
 
 import java.io.IOException;
@@ -21,58 +20,53 @@
 
 @JsonSerialize(using = Links.Serializer.class)
 @JsonDeserialize(using = Links.Deserializer.class)
-public class Links
-{
+public class Links {
 
-	private final Link[] links;
+    private final Link[] links;
 
-	public Links(final Link... links)
-	{
-		this.links = links;
-	}
+    public Links(final Link... links) {
+        this.links = links;
+    }
 
-	public Links(final List<Link> links) {
-		this.links = links.toArray(new Link[links.size()]);
-	}
+    public Links(final List<Link> links) {
+        this.links = links.toArray(new Link[links.size()]);
+    }
 
-	public Link[] getLinks()
-	{
-		return links;
-	}
+    public Link[] getLinks() {
+        return links;
+    }
 
-	public static class Serializer extends JsonSerializer<Links>
-	{
+    public static class Serializer extends JsonSerializer<Links> {
 
-		@Override
-		public void serialize(final Links links, final JsonGenerator jsonGen, final SerializerProvider serProvider) throws IOException, JsonProcessingException
-		{
-			jsonGen.writeStartArray();
-			for (final Link link : links.getLinks()) {
-				jsonGen.writeString(link.toString());
-			}
-			jsonGen.writeEndArray();
-		}
+        @Override
+        public void serialize(final Links links, final JsonGenerator jsonGen, final SerializerProvider serProvider)
+                throws IOException, JsonProcessingException {
+            jsonGen.writeStartArray();
+            for (final Link link : links.getLinks()) {
+                jsonGen.writeString(link.toString());
+            }
+            jsonGen.writeEndArray();
+        }
 
-	}
+    }
 
-	public static class Deserializer extends JsonDeserializer<Links>
-	{
+    public static class Deserializer extends JsonDeserializer<Links> {
 
-		@Override
-		public Links deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException
-		{
-			final List<Link> binds = new ArrayList<Link>();
-			final ObjectCodec oc = jsonParser.getCodec();
-			final JsonNode node = oc.readTree(jsonParser);
-			for (final Iterator<JsonNode> it = node.elements(); it.hasNext();) {
+        @Override
+        public Links deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext)
+                throws IOException, JsonProcessingException {
+            final List<Link> binds = new ArrayList<Link>();
+            final ObjectCodec oc = jsonParser.getCodec();
+            final JsonNode node = oc.readTree(jsonParser);
+            for (final Iterator<JsonNode> it = node.elements(); it.hasNext();) {
 
-				final JsonNode element = it.next();
-				if (!element.equals(NullNode.getInstance())) {
-					binds.add(Link.parse(element.asText()));
-				}
-			}
-			return new Links(binds.toArray(new Link[0]));
-		}
-	}
+                final JsonNode element = it.next();
+                if (!element.equals(NullNode.getInstance())) {
+                    binds.add(Link.parse(element.asText()));
+                }
+            }
+            return new Links(binds.toArray(new Link[0]));
+        }
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/LxcConf.java b/src/main/java/com/github/dockerjava/api/model/LxcConf.java
index 67ce00cac..f97588308 100644
--- a/src/main/java/com/github/dockerjava/api/model/LxcConf.java
+++ b/src/main/java/com/github/dockerjava/api/model/LxcConf.java
@@ -3,36 +3,36 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class LxcConf {
-	@JsonProperty("Key")
-	public String key;
+    @JsonProperty("Key")
+    public String key;
 
-	@JsonProperty("Value")
-	public String value;
+    @JsonProperty("Value")
+    public String value;
 
-	public LxcConf(String key, String value) {
-		this.key = key;
-		this.value = value;
-	}
+    public LxcConf(String key, String value) {
+        this.key = key;
+        this.value = value;
+    }
 
-	public LxcConf() {
-	}
+    public LxcConf() {
+    }
 
-	public String getKey() {
-		return key;
-	}
+    public String getKey() {
+        return key;
+    }
 
-	public LxcConf setKey(String key) {
-		this.key = key;
-		return this;
-	}
+    public LxcConf setKey(String key) {
+        this.key = key;
+        return this;
+    }
 
-	public String getValue() {
-		return value;
-	}
+    public String getValue() {
+        return value;
+    }
 
-	public LxcConf setValue(String value) {
-		this.value = value;
-		return this;
-	}
+    public LxcConf setValue(String value) {
+        this.value = value;
+        return this;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/PortBinding.java b/src/main/java/com/github/dockerjava/api/model/PortBinding.java
index 13c91bdb1..355e83aa3 100644
--- a/src/main/java/com/github/dockerjava/api/model/PortBinding.java
+++ b/src/main/java/com/github/dockerjava/api/model/PortBinding.java
@@ -8,75 +8,70 @@
 import com.github.dockerjava.api.model.Ports.Binding;
 
 /**
- * In a {@link PortBinding}, a network socket on the Docker host, expressed 
- * as a {@link Binding}, is bound to an {@link ExposedPort} of a container.
- * A {@link PortBinding} corresponds to the <code>--publish</code>
- * (<code>-p</code>) option of the <code>docker run</code> (and similar)
- * CLI command for adding port bindings to a container.
+ * In a {@link PortBinding}, a network socket on the Docker host, expressed as a {@link Binding}, is bound to an
+ * {@link ExposedPort} of a container. A {@link PortBinding} corresponds to the <code>--publish</code> (<code>-p</code>)
+ * option of the <code>docker run</code> (and similar) CLI command for adding port bindings to a container.
  * <p>
- * <i>Note: This is an abstraction used for creating new port bindings.
- * It is not to be confused with the abstraction used for querying existing
- * port bindings from a container configuration in 
- * {@link NetworkSettings#getPorts()} and {@link HostConfig#getPortBindings()}.
- * In that context, a <code>Map&lt;ExposedPort, Binding[]&gt;</code> is used.</i>
+ * <i>Note: This is an abstraction used for creating new port bindings. It is not to be confused with the abstraction
+ * used for querying existing port bindings from a container configuration in {@link NetworkSettings#getPorts()} and
+ * {@link HostConfig#getPortBindings()}. In that context, a <code>Map&lt;ExposedPort, Binding[]&gt;</code> is used.</i>
  */
 public class PortBinding {
-	private final Binding binding;
-	private final ExposedPort exposedPort;
+    private final Binding binding;
 
-	public PortBinding(Binding binding, ExposedPort exposedPort) {
-		this.binding = binding;
-		this.exposedPort = exposedPort;
-	}
+    private final ExposedPort exposedPort;
 
-	public Binding getBinding() {
-		return binding;
-	}
+    public PortBinding(Binding binding, ExposedPort exposedPort) {
+        this.binding = binding;
+        this.exposedPort = exposedPort;
+    }
 
-	public ExposedPort getExposedPort() {
-		return exposedPort;
-	}
+    public Binding getBinding() {
+        return binding;
+    }
 
-	public static PortBinding parse(String serialized) throws IllegalArgumentException {
-		try {
-			String[] parts = StringUtils.splitByWholeSeparator(serialized, ":");
-			switch (parts.length) {
-			case 3:
-				// 127.0.0.1:80:8080/tcp
-				return createFromSubstrings(parts[0] + ":" + parts[1], parts[2]);
-			case 2:
-				// 80:8080 // 127.0.0.1::8080
-				return createFromSubstrings(parts[0], parts[1]);
-			case 1:
-				// 8080
-				return createFromSubstrings("", parts[0]);
-			default:
-				throw new IllegalArgumentException();
-			}
-		} catch (Exception e) {
-			throw new IllegalArgumentException("Error parsing PortBinding '" 
-					+ serialized + "'", e);
-		}
-	}
+    public ExposedPort getExposedPort() {
+        return exposedPort;
+    }
 
-	private static PortBinding createFromSubstrings(String binding, String exposedPort)
-			throws IllegalArgumentException {
-		return new PortBinding(Binding.parse(binding), ExposedPort.parse(exposedPort));
-	}
+    public static PortBinding parse(String serialized) throws IllegalArgumentException {
+        try {
+            String[] parts = StringUtils.splitByWholeSeparator(serialized, ":");
+            switch (parts.length) {
+            case 3:
+                // 127.0.0.1:80:8080/tcp
+                return createFromSubstrings(parts[0] + ":" + parts[1], parts[2]);
+            case 2:
+                // 80:8080 // 127.0.0.1::8080
+                return createFromSubstrings(parts[0], parts[1]);
+            case 1:
+                // 8080
+                return createFromSubstrings("", parts[0]);
+            default:
+                throw new IllegalArgumentException();
+            }
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Error parsing PortBinding '" + serialized + "'", e);
+        }
+    }
 
-	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof PortBinding) {
-			PortBinding other = (PortBinding) obj;
-			return new EqualsBuilder().append(binding, other.getBinding())
-					.append(exposedPort, other.getExposedPort()).isEquals();
-		} else
-			return super.equals(obj);
-	}
+    private static PortBinding createFromSubstrings(String binding, String exposedPort) throws IllegalArgumentException {
+        return new PortBinding(Binding.parse(binding), ExposedPort.parse(exposedPort));
+    }
 
-	@Override
-	public int hashCode() {
-		return new HashCodeBuilder().append(binding).append(exposedPort).toHashCode();
-	}
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof PortBinding) {
+            PortBinding other = (PortBinding) obj;
+            return new EqualsBuilder().append(binding, other.getBinding()).append(exposedPort, other.getExposedPort())
+                    .isEquals();
+        } else
+            return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(binding).append(exposedPort).toHashCode();
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Ports.java b/src/main/java/com/github/dockerjava/api/model/Ports.java
index 0c2df94ad..13c6ff649 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -28,13 +28,10 @@
 import com.github.dockerjava.api.command.InspectContainerResponse.NetworkSettings;
 
 /**
- * A container for port bindings, made available as a {@link Map} via its
- * {@link #getBindings()} method.
- * <p> 
- * <i>Note: This is an abstraction used for querying existing port bindings from 
- * a container configuration.
- * It is not to be confused with the {@link PortBinding} abstraction used for
- * adding new port bindings to a container.</i>
+ * A container for port bindings, made available as a {@link Map} via its {@link #getBindings()} method.
+ * <p>
+ * <i>Note: This is an abstraction used for querying existing port bindings from a container configuration. It is not to
+ * be confused with the {@link PortBinding} abstraction used for adding new port bindings to a container.</i>
  * 
  * @see HostConfig#getPortBindings()
  * @see NetworkSettings#getPorts()
@@ -46,29 +43,27 @@ public class Ports {
     private final Map<ExposedPort, Binding[]> ports = new HashMap<ExposedPort, Binding[]>();
 
     /**
-     * Creates a {@link Ports} object with no {@link PortBinding}s.
-     * Use {@link #bind(ExposedPort, Binding)} or {@link #add(PortBinding...)}
-     * to add {@link PortBinding}s.
+     * Creates a {@link Ports} object with no {@link PortBinding}s. Use {@link #bind(ExposedPort, Binding)} or
+     * {@link #add(PortBinding...)} to add {@link PortBinding}s.
      */
-    public Ports() { }
+    public Ports() {
+    }
 
     /**
-     * Creates a {@link Ports} object with an initial {@link PortBinding} for 
-     * the specified {@link ExposedPort} and {@link Binding}.
-     * Use {@link #bind(ExposedPort, Binding)} or {@link #add(PortBinding...)}
-     * to add more {@link PortBinding}s.
+     * Creates a {@link Ports} object with an initial {@link PortBinding} for the specified {@link ExposedPort} and
+     * {@link Binding}. Use {@link #bind(ExposedPort, Binding)} or {@link #add(PortBinding...)} to add more
+     * {@link PortBinding}s.
      */
     public Ports(ExposedPort exposedPort, Binding host) {
-    	bind(exposedPort, host);
+        bind(exposedPort, host);
     }
-    
+
     public Ports(PortBinding... portBindings) {
-    	add(portBindings);
+        add(portBindings);
     }
 
     /**
-     * Adds a new {@link PortBinding} for the specified {@link ExposedPort} and
-     * {@link Binding} to the current bindings.
+     * Adds a new {@link PortBinding} for the specified {@link ExposedPort} and {@link Binding} to the current bindings.
      */
     public void bind(ExposedPort exposedPort, Binding binding) {
         if (ports.containsKey(exposedPort)) {
@@ -78,13 +73,13 @@ public void bind(ExposedPort exposedPort, Binding binding) {
             if (binding == null) {
                 ports.put(exposedPort, null);
             } else {
-                ports.put(exposedPort, new Binding[]{binding});
+                ports.put(exposedPort, new Binding[] { binding });
             }
         }
     }
 
     /**
-     * Adds the specified {@link PortBinding}(s) to the list of {@link PortBinding}s. 
+     * Adds the specified {@link PortBinding}(s) to the list of {@link PortBinding}s.
      */
     public void add(PortBinding... portBindings) {
         for (PortBinding binding : portBindings) {
@@ -93,54 +88,48 @@ public void add(PortBinding... portBindings) {
     }
 
     @Override
-    public String toString(){
+    public String toString() {
         return ports.toString();
     }
 
     /**
-     * Returns the port bindings in the format used by the Docker remote API,
-     * i.e. the {@link Binding}s grouped by {@link ExposedPort}.
+     * Returns the port bindings in the format used by the Docker remote API, i.e. the {@link Binding}s grouped by
+     * {@link ExposedPort}.
      * 
-     * @return the port bindings as a {@link Map} that contains one or more
-     *         {@link Binding}s per {@link ExposedPort}.
+     * @return the port bindings as a {@link Map} that contains one or more {@link Binding}s per {@link ExposedPort}.
      */
-    public Map<ExposedPort, Binding[]> getBindings(){
+    public Map<ExposedPort, Binding[]> getBindings() {
         return ports;
     }
-    
-//    public PortBinding[] getBindingsAsArray() {
-//    	List<PortBinding> bindings = new ArrayList<>();
-//    	for(Map.Entry<ExposedPort, Ports.Binding[]> entry: ports.entrySet()) {
-//    		for(Ports.Binding binding : entry.getValue()) {
-//    			bindings.add(new PortBinding(binding, entry.getKey()));
-//    		}
-//    	}
-//    	return bindings.toArray(new PortBinding[bindings.size()]);
-//    }
+
+    // public PortBinding[] getBindingsAsArray() {
+    // List<PortBinding> bindings = new ArrayList<>();
+    // for(Map.Entry<ExposedPort, Ports.Binding[]> entry: ports.entrySet()) {
+    // for(Ports.Binding binding : entry.getValue()) {
+    // bindings.add(new PortBinding(binding, entry.getKey()));
+    // }
+    // }
+    // return bindings.toArray(new PortBinding[bindings.size()]);
+    // }
 
     /**
      * Creates a {@link Binding} for the given IP address and port number.
      */
     public static Binding Binding(String hostIp, Integer hostPort) {
-    	return new Binding(hostIp, hostPort);
+        return new Binding(hostIp, hostPort);
     }
 
     /**
-     * Creates a {@link Binding} for the given port number, leaving the
-     * IP address undefined.
+     * Creates a {@link Binding} for the given port number, leaving the IP address undefined.
      */
     public static Binding Binding(Integer hostPort) {
-    	return new Binding(hostPort);
+        return new Binding(hostPort);
     }
 
-
     /**
-     * A {@link Binding} represents a socket on the Docker host that is
-     * used in a {@link PortBinding}.
-     * It is characterized by an {@link #getHostIp() IP address} and a
-     * {@link #getHostPort() port number}.
-     * Both properties may be <code>null</code> in order to let Docker assign
-     * them dynamically/using defaults.
+     * A {@link Binding} represents a socket on the Docker host that is used in a {@link PortBinding}. It is
+     * characterized by an {@link #getHostIp() IP address} and a {@link #getHostPort() port number}. Both properties may
+     * be <code>null</code> in order to let Docker assign them dynamically/using defaults.
      * 
      * @see Ports#bind(ExposedPort, Binding)
      * @see ExposedPort
@@ -152,8 +141,8 @@ public static class Binding {
         private final Integer hostPort;
 
         /**
-         * Creates a {@link Binding} for the given {@link #getHostIp() IP address}
-         * and {@link #getHostPort() port number}.
+         * Creates a {@link Binding} for the given {@link #getHostIp() IP address} and {@link #getHostPort() port
+         * number}.
          * 
          * @see Ports#bind(ExposedPort, Binding)
          * @see ExposedPort
@@ -164,8 +153,8 @@ public Binding(String hostIp, Integer hostPort) {
         }
 
         /**
-         * Creates a {@link Binding} for the given {@link #getHostPort() port number},
-         * leaving the {@link #getHostIp() IP address} undefined.
+         * Creates a {@link Binding} for the given {@link #getHostPort() port number}, leaving the {@link #getHostIp()
+         * IP address} undefined.
          * 
          * @see Ports#bind(ExposedPort, Binding)
          * @see ExposedPort
@@ -175,33 +164,31 @@ public Binding(Integer hostPort) {
         }
 
         /**
-         * Creates a {@link Binding} for the given {@link #getHostIp() IP address},
-         * leaving the {@link #getHostPort() port number} undefined.
+         * Creates a {@link Binding} for the given {@link #getHostIp() IP address}, leaving the {@link #getHostPort()
+         * port number} undefined.
          */
         public Binding(String hostIp) {
             this(hostIp, null);
         }
 
         /**
-         * Creates a {@link Binding} with both {@link #getHostIp() IP address} and
-         * {@link #getHostPort() port number} undefined.
+         * Creates a {@link Binding} with both {@link #getHostIp() IP address} and {@link #getHostPort() port number}
+         * undefined.
          */
         public Binding() {
             this(null, null);
         }
 
         /**
-         * @return the IP address on the Docker host. 
-         *         May be <code>null</code>, in which case Docker will bind the
-         *         port to all interfaces (<code>0.0.0.0</code>).
+         * @return the IP address on the Docker host. May be <code>null</code>, in which case Docker will bind the port
+         *         to all interfaces (<code>0.0.0.0</code>).
          */
         public String getHostIp() {
             return hostIp;
         }
 
         /**
-         * @return the port number on the Docker host.
-         *         May be <code>null</code>, in which case Docker will dynamically
+         * @return the port number on the Docker host. May be <code>null</code>, in which case Docker will dynamically
          *         assign a port.
          */
         public Integer getHostPort() {
@@ -209,15 +196,15 @@ public Integer getHostPort() {
         }
 
         /**
-         * Parses a textual host and port specification (as used by the Docker CLI) 
-         * to a {@link Binding}.
+         * Parses a textual host and port specification (as used by the Docker CLI) to a {@link Binding}.
          * <p>
          * Legal syntax: <code>IP|IP:port|port</code>
          * 
-         * @param serialized serialized the specification, e.g. 
-         *        <code>127.0.0.1:80</code>
+         * @param serialized
+         *            serialized the specification, e.g. <code>127.0.0.1:80</code>
          * @return a {@link Binding} matching the specification
-         * @throws IllegalArgumentException if the specification cannot be parsed
+         * @throws IllegalArgumentException
+         *             if the specification cannot be parsed
          */
         public static Binding parse(String serialized) throws IllegalArgumentException {
             try {
@@ -231,23 +218,20 @@ public static Binding parse(String serialized) throws IllegalArgumentException {
                     return new Binding(parts[0], Integer.valueOf(parts[1]));
                 }
                 case 1: {
-                    return parts[0].contains(".") ? new Binding(parts[0]) 
-                        : new Binding(Integer.valueOf(parts[0]));
+                    return parts[0].contains(".") ? new Binding(parts[0]) : new Binding(Integer.valueOf(parts[0]));
                 }
                 default: {
                     throw new IllegalArgumentException();
                 }
                 }
             } catch (Exception e) {
-                throw new IllegalArgumentException("Error parsing Binding '"
-                        + serialized + "'");
+                throw new IllegalArgumentException("Error parsing Binding '" + serialized + "'");
             }
         }
 
         /**
-         * Returns a string representation of this {@link Binding} suitable
-         * for inclusion in a JSON message.
-         * The format is <code>[IP:]Port</code>, like the argument in {@link #parse(String)}.
+         * Returns a string representation of this {@link Binding} suitable for inclusion in a JSON message. The format
+         * is <code>[IP:]Port</code>, like the argument in {@link #parse(String)}.
          * 
          * @return a string representation of this {@link Binding}
          */
@@ -256,7 +240,7 @@ public String toString() {
             if (isEmpty(hostIp)) {
                 return Integer.toString(hostPort);
             } else if (hostPort == null) {
-            	return hostIp;
+                return hostIp;
             } else {
                 return hostIp + ":" + hostPort;
             }
@@ -264,20 +248,19 @@ public String toString() {
 
         @Override
         public boolean equals(Object obj) {
-        	if(obj instanceof Binding) {
-        		Binding other = (Binding) obj;
-        		return new EqualsBuilder()
-        			.append(hostIp, other.getHostIp())
-        			.append(hostPort, other.getHostPort()).isEquals();
-        	} else
-        		return super.equals(obj);
+            if (obj instanceof Binding) {
+                Binding other = (Binding) obj;
+                return new EqualsBuilder().append(hostIp, other.getHostIp()).append(hostPort, other.getHostPort())
+                        .isEquals();
+            } else
+                return super.equals(obj);
         }
     }
 
-
     public static class Deserializer extends JsonDeserializer<Ports> {
         @Override
-        public Ports deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+        public Ports deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+                throws IOException, JsonProcessingException {
 
             Ports out = new Ports();
             ObjectCodec oc = jsonParser.getCodec();
@@ -306,18 +289,19 @@ public Ports deserialize(JsonParser jsonParser, DeserializationContext deseriali
     public static class Serializer extends JsonSerializer<Ports> {
 
         @Override
-        public void serialize(Ports portBindings, JsonGenerator jsonGen,
-                              SerializerProvider serProvider) throws IOException, JsonProcessingException {
+        public void serialize(Ports portBindings, JsonGenerator jsonGen, SerializerProvider serProvider)
+                throws IOException, JsonProcessingException {
 
             jsonGen.writeStartObject();
-            for(Entry<ExposedPort, Binding[]> entry : portBindings.getBindings().entrySet()){
+            for (Entry<ExposedPort, Binding[]> entry : portBindings.getBindings().entrySet()) {
                 jsonGen.writeFieldName(entry.getKey().toString());
                 if (entry.getValue() != null) {
                     jsonGen.writeStartArray();
                     for (Binding binding : entry.getValue()) {
                         jsonGen.writeStartObject();
                         jsonGen.writeStringField("HostIp", binding.getHostIp() == null ? "" : binding.getHostIp());
-                        jsonGen.writeStringField("HostPort", binding.getHostPort() == null ? "" : binding.getHostPort().toString());
+                        jsonGen.writeStringField("HostPort", binding.getHostPort() == null ? "" : binding.getHostPort()
+                                .toString());
                         jsonGen.writeEndObject();
                     }
                     jsonGen.writeEndArray();
diff --git a/src/main/java/com/github/dockerjava/api/model/PullEventStreamItem.java b/src/main/java/com/github/dockerjava/api/model/PullEventStreamItem.java
index 4a3a0b507..cd49e846e 100644
--- a/src/main/java/com/github/dockerjava/api/model/PullEventStreamItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/PullEventStreamItem.java
@@ -9,12 +9,12 @@
 /**
  * Represents an item returned from pull
  */
-@JsonIgnoreProperties(ignoreUnknown=true)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class PullEventStreamItem implements Serializable {
 
-	private static final long serialVersionUID = -5187169652557467828L;
+    private static final long serialVersionUID = -5187169652557467828L;
 
-	@JsonProperty("status")
+    @JsonProperty("status")
     private String status;
 
     @JsonProperty("progress")
@@ -23,7 +23,6 @@ public class PullEventStreamItem implements Serializable {
     @JsonProperty("progressDetail")
     private ProgressDetail progressDetail;
 
-
     public String getStatus() {
         return status;
     }
@@ -36,12 +35,11 @@ public ProgressDetail getProgressDetail() {
         return progressDetail;
     }
 
-    @JsonIgnoreProperties(ignoreUnknown=true)
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class ProgressDetail implements Serializable {
         @JsonProperty("current")
         int current;
 
-
         @Override
         public String toString() {
             return "current " + current;
@@ -50,10 +48,7 @@ public String toString() {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
-                .add("status", status)
-                .add("progress", progress)
-                .add("progressDetail", progressDetail)
-                .toString();
+        return Objects.toStringHelper(this).add("status", status).add("progress", progress)
+                .add("progressDetail", progressDetail).toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java b/src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java
index c8aac4c9c..e022f0c1a 100644
--- a/src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java
@@ -10,12 +10,12 @@
 /**
  * Represents an item returned from push
  */
-@JsonIgnoreProperties(ignoreUnknown=true)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class PushEventStreamItem implements Serializable {
 
-	private static final long serialVersionUID = -5187169652557467828L;
+    private static final long serialVersionUID = -5187169652557467828L;
 
-	@JsonProperty("status")
+    @JsonProperty("status")
     private String status;
 
     @JsonProperty("progress")
@@ -24,7 +24,6 @@ public class PushEventStreamItem implements Serializable {
     @JsonProperty("progressDetail")
     private ProgressDetail progressDetail;
 
-
     public String getStatus() {
         return status;
     }
@@ -37,12 +36,11 @@ public ProgressDetail getProgressDetail() {
         return progressDetail;
     }
 
-    @JsonIgnoreProperties(ignoreUnknown=true)
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class ProgressDetail implements Serializable {
         @JsonProperty("current")
         int current;
 
-
         @Override
         public String toString() {
             return "current " + current;
@@ -51,10 +49,7 @@ public String toString() {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
-                .add("status", status)
-                .add("progress", progress)
-                .add("progressDetail", progressDetail)
-                .toString();
+        return Objects.toStringHelper(this).add("status", status).add("progress", progress)
+                .add("progressDetail", progressDetail).toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Repository.java b/src/main/java/com/github/dockerjava/api/model/Repository.java
index 673eabee2..cdfead739 100644
--- a/src/main/java/com/github/dockerjava/api/model/Repository.java
+++ b/src/main/java/com/github/dockerjava/api/model/Repository.java
@@ -13,15 +13,17 @@ public class Repository {
 
     /**
      * Name may be eg. 'busybox' or '10.0.0.1:5000/fred'
-     * @param name Repository name
+     * 
+     * @param name
+     *            Repository name
      */
     public Repository(String name) {
         this.name = name;
     }
 
     /**
-     * Return the URL portion (repository).
-     * Note that this might not actually BE a repository location.
+     * Return the URL portion (repository). Note that this might not actually BE a repository location.
+     * 
      * @return
      * @throws java.net.MalformedURLException
      */
@@ -31,16 +33,13 @@ public URL getURL() throws MalformedURLException {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
-                .add("name", name)
-                .toString();
+        return Objects.toStringHelper(this).add("name", name).toString();
     }
 
-
     public String getPath() {
-        if( !name.contains("/") )
+        if (!name.contains("/"))
             return name;
 
-        return name.substring(name.indexOf("/") + 1 );
+        return name.substring(name.indexOf("/") + 1);
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
index bb933f18a..e96821cf1 100644
--- a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
+++ b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
@@ -11,15 +11,17 @@
  * Container restart policy
  * 
  * <dl>
- *   <dt>no</dt>
- *   <dd>Do not restart the container if it dies. (default)</dd>
- *   
- *   <dt>on-failure</dt>
- *   <dd>Restart the container if it exits with a non-zero exit code.
- *       Can also accept an optional maximum restart count (e.g. on-failure:5).<dd>
- *   
- *   <dt>always</dt>
- *   <dd>Always restart the container no matter what exit code is returned.<dd>
+ * <dt>no</dt>
+ * <dd>Do not restart the container if it dies. (default)</dd>
+ * 
+ * <dt>on-failure</dt>
+ * <dd>Restart the container if it exits with a non-zero exit code. Can also accept an optional maximum restart count
+ * (e.g. on-failure:5).
+ * <dd>
+ * 
+ * <dt>always</dt>
+ * <dd>Always restart the container no matter what exit code is returned.
+ * <dd>
  * </dl>
  *
  * @author marcus
@@ -27,110 +29,108 @@
  */
 public class RestartPolicy {
 
-	@JsonProperty("MaximumRetryCount")
-	private int maximumRetryCount = 0;
-
-	@JsonProperty("Name")
-	private String name = "";
-
-	public RestartPolicy() {
-	}
-
-	private RestartPolicy(int maximumRetryCount, String name) {
-		checkNotNull(name, "name is null");
-		this.maximumRetryCount = maximumRetryCount;
-		this.name = name;
-	}
-
-	/**
-	 * Do not restart the container if it dies. (default)
-	 */
-	public static RestartPolicy noRestart() {
-		return new RestartPolicy();
-	}
-
-	/**
-	 * Always restart the container no matter what exit code is returned.
-	 */
-	public static RestartPolicy alwaysRestart() {
-		return new RestartPolicy(0, "always");
-	}
-
-	/**
-	 * Restart the container if it exits with a non-zero exit code.
-	 * 
-	 * @param maximumRetryCount the maximum number of restarts.
-	 *        Set to <code>0</code> for unlimited retries.
-	 */
-	public static RestartPolicy onFailureRestart(int maximumRetryCount) {
-		return new RestartPolicy(maximumRetryCount, "on-failure");
-	}
-
-	public int getMaximumRetryCount() {
-		return maximumRetryCount;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Parses a textual restart polixy specification (as used by the Docker CLI) 
-	 * to a {@link RestartPolicy}.
-	 * 
-	 * @param serialized the specification, e.g. <code>on-failure:2</code>
-	 * @return a {@link RestartPolicy} matching the specification
-	 * @throws IllegalArgumentException if the specification cannot be parsed
-	 */
-	public static RestartPolicy parse(String serialized) throws IllegalArgumentException {
-		try {
-			String[] parts = serialized.split(":");
-			String name = parts[0];
-			if ("no".equals(name))
-				return noRestart();
-			if ("always".equals(name))
-				return alwaysRestart();
-			if ("on-failure".equals(name)) {
-				int count = 0;
-				if (parts.length == 2) {
-					count = Integer.parseInt(parts[1]);
-				}
-				return onFailureRestart(count);
-			}
-			throw new IllegalArgumentException();
-		} catch (Exception e) {
-			throw new IllegalArgumentException("Error parsing RestartPolicy '" + serialized + "'");
-		}
-	}
-
-	/**
-	 * Returns a string representation of this {@link RestartPolicy}.
-	 * The format is <code>name[:count]</code>, like the argument in {@link #parse(String)}.
-	 * 
-	 * @return a string representation of this {@link RestartPolicy}
-	 */
-	@Override
-	public String toString() {
-		String result = name.isEmpty() ? "no" : name;
-		return maximumRetryCount > 0 ? result + ":" + maximumRetryCount : result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof RestartPolicy) {
-			RestartPolicy other = (RestartPolicy) obj;
-			return new EqualsBuilder()
-					.append(maximumRetryCount, other.getMaximumRetryCount())
-					.append(name, other.getName())
-					.isEquals();
-		} else
-			return super.equals(obj);
-	}
-
-	@Override
-	public int hashCode() {
-		return new HashCodeBuilder().append(maximumRetryCount)
-				.append(name).toHashCode();
-	}
+    @JsonProperty("MaximumRetryCount")
+    private int maximumRetryCount = 0;
+
+    @JsonProperty("Name")
+    private String name = "";
+
+    public RestartPolicy() {
+    }
+
+    private RestartPolicy(int maximumRetryCount, String name) {
+        checkNotNull(name, "name is null");
+        this.maximumRetryCount = maximumRetryCount;
+        this.name = name;
+    }
+
+    /**
+     * Do not restart the container if it dies. (default)
+     */
+    public static RestartPolicy noRestart() {
+        return new RestartPolicy();
+    }
+
+    /**
+     * Always restart the container no matter what exit code is returned.
+     */
+    public static RestartPolicy alwaysRestart() {
+        return new RestartPolicy(0, "always");
+    }
+
+    /**
+     * Restart the container if it exits with a non-zero exit code.
+     * 
+     * @param maximumRetryCount
+     *            the maximum number of restarts. Set to <code>0</code> for unlimited retries.
+     */
+    public static RestartPolicy onFailureRestart(int maximumRetryCount) {
+        return new RestartPolicy(maximumRetryCount, "on-failure");
+    }
+
+    public int getMaximumRetryCount() {
+        return maximumRetryCount;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Parses a textual restart polixy specification (as used by the Docker CLI) to a {@link RestartPolicy}.
+     * 
+     * @param serialized
+     *            the specification, e.g. <code>on-failure:2</code>
+     * @return a {@link RestartPolicy} matching the specification
+     * @throws IllegalArgumentException
+     *             if the specification cannot be parsed
+     */
+    public static RestartPolicy parse(String serialized) throws IllegalArgumentException {
+        try {
+            String[] parts = serialized.split(":");
+            String name = parts[0];
+            if ("no".equals(name))
+                return noRestart();
+            if ("always".equals(name))
+                return alwaysRestart();
+            if ("on-failure".equals(name)) {
+                int count = 0;
+                if (parts.length == 2) {
+                    count = Integer.parseInt(parts[1]);
+                }
+                return onFailureRestart(count);
+            }
+            throw new IllegalArgumentException();
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Error parsing RestartPolicy '" + serialized + "'");
+        }
+    }
+
+    /**
+     * Returns a string representation of this {@link RestartPolicy}. The format is <code>name[:count]</code>, like the
+     * argument in {@link #parse(String)}.
+     * 
+     * @return a string representation of this {@link RestartPolicy}
+     */
+    @Override
+    public String toString() {
+        String result = name.isEmpty() ? "no" : name;
+        return maximumRetryCount > 0 ? result + ":" + maximumRetryCount : result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof RestartPolicy) {
+            RestartPolicy other = (RestartPolicy) obj;
+            return new EqualsBuilder().append(maximumRetryCount, other.getMaximumRetryCount())
+                    .append(name, other.getName()).isEquals();
+        } else
+            return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(maximumRetryCount).append(name).toHashCode();
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Statistics.java b/src/main/java/com/github/dockerjava/api/model/Statistics.java
index ff1d6dc95..f6acf16ee 100644
--- a/src/main/java/com/github/dockerjava/api/model/Statistics.java
+++ b/src/main/java/com/github/dockerjava/api/model/Statistics.java
@@ -12,38 +12,38 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Statistics {
-    
+
     @JsonProperty("read")
     private String read;
-    
+
     @JsonProperty("network")
-    private Map<String,Object> networkStats;
+    private Map<String, Object> networkStats;
 
     @JsonProperty("memory_stats")
-    private Map<String,Object> memoryStats;
-    
+    private Map<String, Object> memoryStats;
+
     @JsonProperty("blkio_stats")
-    private Map<String,Object> blkioStats;
-    
+    private Map<String, Object> blkioStats;
+
     @JsonProperty("cpu_stats")
-    private Map<String,Object> cpuStats;
+    private Map<String, Object> cpuStats;
 
-    public Map<String,Object> getNetworkStats() {
+    public Map<String, Object> getNetworkStats() {
         return networkStats;
     }
-    
-    public Map<String,Object> getCpuStats() {
+
+    public Map<String, Object> getCpuStats() {
         return cpuStats;
     }
-    
-    public Map<String,Object> getMemoryStats() {
+
+    public Map<String, Object> getMemoryStats() {
         return memoryStats;
     }
-    
-    public Map<String,Object> getBlkioStats() {
+
+    public Map<String, Object> getBlkioStats() {
         return blkioStats;
     }
-    
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
diff --git a/src/main/java/com/github/dockerjava/api/model/StreamType.java b/src/main/java/com/github/dockerjava/api/model/StreamType.java
index eb11c5536..3f8167b05 100644
--- a/src/main/java/com/github/dockerjava/api/model/StreamType.java
+++ b/src/main/java/com/github/dockerjava/api/model/StreamType.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
 public enum StreamType {
-    STDIN,
-    STDOUT,
-    STDERR
+    STDIN, STDOUT, STDERR
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Ulimit.java b/src/main/java/com/github/dockerjava/api/model/Ulimit.java
index d5fac09c1..3d8fc432f 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ulimit.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ulimit.java
@@ -12,7 +12,7 @@
 public class Ulimit {
 
     @JsonProperty("Name")
-    private String name ;
+    private String name;
 
     @JsonProperty("Soft")
     private int soft;
@@ -48,9 +48,7 @@ public int getHard() {
     public boolean equals(Object obj) {
         if (obj instanceof Ulimit) {
             Ulimit other = (Ulimit) obj;
-            return new EqualsBuilder()
-                    .append(name, other.getName())
-                    .append(soft, other.getSoft())
+            return new EqualsBuilder().append(name, other.getName()).append(soft, other.getSoft())
                     .append(hard, other.getHard()).isEquals();
         } else
             return super.equals(obj);
diff --git a/src/main/java/com/github/dockerjava/api/model/Version.java b/src/main/java/com/github/dockerjava/api/model/Version.java
index 4e02e2c05..3318fc5b1 100644
--- a/src/main/java/com/github/dockerjava/api/model/Version.java
+++ b/src/main/java/com/github/dockerjava/api/model/Version.java
@@ -12,25 +12,25 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Version {
 
-	@JsonProperty("ApiVersion")
-	private String apiVersion;
+    @JsonProperty("ApiVersion")
+    private String apiVersion;
 
-	@JsonProperty("Arch")
-	private String  arch;
+    @JsonProperty("Arch")
+    private String arch;
 
-	@JsonProperty("GitCommit")
-	private String  gitCommit;
+    @JsonProperty("GitCommit")
+    private String gitCommit;
 
-	@JsonProperty("GoVersion")
-	private String  goVersion;
+    @JsonProperty("GoVersion")
+    private String goVersion;
 
-	@JsonProperty("KernelVersion")
-	private String kernelVersion;
+    @JsonProperty("KernelVersion")
+    private String kernelVersion;
 
-	@JsonProperty("Os")
-	private String operatingSystem;
+    @JsonProperty("Os")
+    private String operatingSystem;
 
-	@JsonProperty("Version")
+    @JsonProperty("Version")
     private String version;
 
     public String getVersion() {
@@ -53,13 +53,13 @@ public String getArch() {
         return arch;
     }
 
-   public String getOperatingSystem() {
+    public String getOperatingSystem() {
         return operatingSystem;
     }
 
     public String getApiVersion() {
-		return apiVersion;
-	}
+        return apiVersion;
+    }
 
     @Override
     public String toString() {
diff --git a/src/main/java/com/github/dockerjava/api/model/Volume.java b/src/main/java/com/github/dockerjava/api/model/Volume.java
index 131a9a56f..8bc7f2fba 100644
--- a/src/main/java/com/github/dockerjava/api/model/Volume.java
+++ b/src/main/java/com/github/dockerjava/api/model/Volume.java
@@ -26,33 +26,33 @@
  */
 public class Volume {
 
-	private String path;
-	
-	public Volume(String path) {
-		this.path = path;
-	}
-
-	public String getPath() {
-		return path;
-	}
-
-	@Override
-	public String toString() {
-		return getPath();
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof Volume) {
-			Volume other = (Volume) obj;
-			return new EqualsBuilder().append(path, other.getPath()).isEquals();
-		} else
-			return super.equals(obj);
-	}
-
-	@Override
-	public int hashCode() {
-		return new HashCodeBuilder().append(path).toHashCode();
-	}
+    private String path;
+
+    public Volume(String path) {
+        this.path = path;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    @Override
+    public String toString() {
+        return getPath();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof Volume) {
+            Volume other = (Volume) obj;
+            return new EqualsBuilder().append(path, other.getPath()).isEquals();
+        } else
+            return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(path).toHashCode();
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeBind.java b/src/main/java/com/github/dockerjava/api/model/VolumeBind.java
index 41028b6dc..cf9c077ab 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumeBind.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumeBind.java
@@ -2,9 +2,10 @@
 
 public class VolumeBind {
     private final String hostPath;
+
     private final String containerPath;
 
-    public VolumeBind(String hostPath, String containerPath){
+    public VolumeBind(String hostPath, String containerPath) {
         this.hostPath = hostPath;
         this.containerPath = containerPath;
     }
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java b/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
index e23ddc9e8..3d2abee45 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
@@ -36,18 +36,20 @@ public VolumeBind[] getBinds() {
     public static final class Serializer extends JsonSerializer<VolumeBinds> {
 
         @Override
-        public void serialize(VolumeBinds value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
+        public void serialize(VolumeBinds value, JsonGenerator jgen, SerializerProvider provider) throws IOException,
+                JsonProcessingException {
             jgen.writeStartObject();
             for (final VolumeBind bind : value.binds) {
                 jgen.writeStringField(bind.getContainerPath(), bind.getHostPath());
             }
             jgen.writeEndObject();
-        }    
+        }
     }
-    
+
     public static final class Deserializer extends JsonDeserializer<VolumeBinds> {
         @Override
-        public VolumeBinds deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+        public VolumeBinds deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+                throws IOException, JsonProcessingException {
 
             List<VolumeBind> binds = new ArrayList<VolumeBind>();
             ObjectCodec oc = jsonParser.getCodec();
@@ -56,10 +58,11 @@ public VolumeBinds deserialize(JsonParser jsonParser, DeserializationContext des
                 Map.Entry<String, JsonNode> field = it.next();
                 JsonNode value = field.getValue();
                 if (!value.equals(NullNode.getInstance())) {
-                    if (!value.isTextual()){
-                        throw deserializationContext.mappingException("Expected path for '"+field.getKey()+"'in host but got '"+ value+"'.");
+                    if (!value.isTextual()) {
+                        throw deserializationContext.mappingException("Expected path for '" + field.getKey()
+                                + "'in host but got '" + value + "'.");
                     }
-                    VolumeBind bind = new VolumeBind(value.asText(),field.getKey());
+                    VolumeBind bind = new VolumeBind(value.asText(), field.getKey());
                     binds.add(bind);
                 }
             }
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeRW.java b/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
index 717385d9e..09a2d8d6a 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
@@ -28,88 +28,82 @@
 @JsonSerialize(using = VolumeRW.Serializer.class)
 public class VolumeRW {
 
-	private Volume volume;
-	
-	private AccessMode accessMode = AccessMode.rw;
-
-	public VolumeRW(Volume volume) {
-		this.volume = volume;
-	}
-	
-	public VolumeRW(Volume volume, AccessMode accessMode) {
-		this.volume = volume;
-		this.accessMode = accessMode;
-	}
-
-	public Volume getVolume() {
-		return volume;
-	}
-	
-	public AccessMode getAccessMode() {
-		return accessMode;
-	}
-
-	
-	/**
-	 * Returns a string representation of this {@link VolumeRW} suitable
-	 * for inclusion in a JSON message.
-	 * The returned String is simply the container path, {@link #getPath()}. 
-	 * 
-	 * @return a string representation of this {@link VolumeRW}
-	 */
-	@Override
-	public String toString() {
-		return getVolume() + ":" + getAccessMode();
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof VolumeRW) {
-			VolumeRW other = (VolumeRW) obj;
-			return new EqualsBuilder().append(getVolume(), other.getVolume()).append(accessMode, other.getAccessMode())
-					.isEquals();
-		} else
-			return super.equals(obj);
-	}
-
-	@Override
-	public int hashCode() {
-		return new HashCodeBuilder().append(getVolume()).append(getAccessMode()).toHashCode();
-	}
-	
-	public static class Serializer extends JsonSerializer<VolumeRW> {
-
-		@Override
-		public void serialize(VolumeRW volumeRW, JsonGenerator jsonGen,
-				SerializerProvider serProvider) throws IOException,
-				JsonProcessingException {
-
-			jsonGen.writeStartObject();
-			jsonGen.writeFieldName(volumeRW.getVolume().getPath());
-			jsonGen.writeString(Boolean.toString(volumeRW.getAccessMode().toBoolean()));
-			jsonGen.writeEndObject();
-		}
-
-	}
-
-	public static class Deserializer extends JsonDeserializer<VolumeRW> {
-		@Override
-		public VolumeRW deserialize(JsonParser jsonParser,
-				DeserializationContext deserializationContext)
-				throws IOException, JsonProcessingException {
-			ObjectCodec oc = jsonParser.getCodec();
-			JsonNode node = oc.readTree(jsonParser);
-			if (!node.equals(NullNode.getInstance())) {
-				Entry<String, JsonNode> field = node.fields().next();
-				String volume = field.getKey();
-				AccessMode accessMode = AccessMode.fromBoolean(field.getValue().asBoolean());
-				return new VolumeRW(new Volume(volume), accessMode);
-			} else {
-				return null;
-			}
-		}
-	}
-
-	
+    private Volume volume;
+
+    private AccessMode accessMode = AccessMode.rw;
+
+    public VolumeRW(Volume volume) {
+        this.volume = volume;
+    }
+
+    public VolumeRW(Volume volume, AccessMode accessMode) {
+        this.volume = volume;
+        this.accessMode = accessMode;
+    }
+
+    public Volume getVolume() {
+        return volume;
+    }
+
+    public AccessMode getAccessMode() {
+        return accessMode;
+    }
+
+    /**
+     * Returns a string representation of this {@link VolumeRW} suitable for inclusion in a JSON message. The returned
+     * String is simply the container path, {@link #getPath()}.
+     * 
+     * @return a string representation of this {@link VolumeRW}
+     */
+    @Override
+    public String toString() {
+        return getVolume() + ":" + getAccessMode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof VolumeRW) {
+            VolumeRW other = (VolumeRW) obj;
+            return new EqualsBuilder().append(getVolume(), other.getVolume()).append(accessMode, other.getAccessMode())
+                    .isEquals();
+        } else
+            return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(getVolume()).append(getAccessMode()).toHashCode();
+    }
+
+    public static class Serializer extends JsonSerializer<VolumeRW> {
+
+        @Override
+        public void serialize(VolumeRW volumeRW, JsonGenerator jsonGen, SerializerProvider serProvider)
+                throws IOException, JsonProcessingException {
+
+            jsonGen.writeStartObject();
+            jsonGen.writeFieldName(volumeRW.getVolume().getPath());
+            jsonGen.writeString(Boolean.toString(volumeRW.getAccessMode().toBoolean()));
+            jsonGen.writeEndObject();
+        }
+
+    }
+
+    public static class Deserializer extends JsonDeserializer<VolumeRW> {
+        @Override
+        public VolumeRW deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+                throws IOException, JsonProcessingException {
+            ObjectCodec oc = jsonParser.getCodec();
+            JsonNode node = oc.readTree(jsonParser);
+            if (!node.equals(NullNode.getInstance())) {
+                Entry<String, JsonNode> field = node.fields().next();
+                String volume = field.getKey();
+                AccessMode accessMode = AccessMode.fromBoolean(field.getValue().asBoolean());
+                return new VolumeRW(new Volume(volume), accessMode);
+            } else {
+                return null;
+            }
+        }
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Volumes.java b/src/main/java/com/github/dockerjava/api/model/Volumes.java
index b85536e10..434a0edad 100644
--- a/src/main/java/com/github/dockerjava/api/model/Volumes.java
+++ b/src/main/java/com/github/dockerjava/api/model/Volumes.java
@@ -19,58 +19,57 @@
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.node.NullNode;
 
-
 @JsonSerialize(using = Volumes.Serializer.class)
 @JsonDeserialize(using = Volumes.Deserializer.class)
 public class Volumes {
 
-	private Volume[] volumes;
+    private Volume[] volumes;
+
+    public Volumes(Volume... volumes) {
+        this.volumes = volumes;
+    }
 
-	public Volumes(Volume... volumes) {
-		this.volumes = volumes;
-	}
-	
-	public Volumes(List<Volume> volumes) {
-		this.volumes = volumes.toArray(new Volume[volumes.size()]);
-	}
+    public Volumes(List<Volume> volumes) {
+        this.volumes = volumes.toArray(new Volume[volumes.size()]);
+    }
 
-	public Volume[] getVolumes() {
-		return volumes;
-	}
+    public Volume[] getVolumes() {
+        return volumes;
+    }
 
-	public static class Serializer extends JsonSerializer<Volumes> {
+    public static class Serializer extends JsonSerializer<Volumes> {
 
-		@Override
-		public void serialize(Volumes volumes, JsonGenerator jsonGen,
-				SerializerProvider serProvider) throws IOException,
-				JsonProcessingException {
-			
-			jsonGen.writeStartObject();
-			for (Volume volume : volumes.getVolumes()) {
-				jsonGen.writeFieldName(volume.getPath());
-				jsonGen.writeStartObject();
-				jsonGen.writeEndObject();
-				//jsonGen.writeString(Boolean.toString(volume.getAccessMode().equals(AccessMode.rw) ? true: false));
-			}
-			jsonGen.writeEndObject();
-		}
+        @Override
+        public void serialize(Volumes volumes, JsonGenerator jsonGen, SerializerProvider serProvider)
+                throws IOException, JsonProcessingException {
+
+            jsonGen.writeStartObject();
+            for (Volume volume : volumes.getVolumes()) {
+                jsonGen.writeFieldName(volume.getPath());
+                jsonGen.writeStartObject();
+                jsonGen.writeEndObject();
+                // jsonGen.writeString(Boolean.toString(volume.getAccessMode().equals(AccessMode.rw) ? true: false));
+            }
+            jsonGen.writeEndObject();
+        }
+
+    }
 
-	}
-	
-	public static class Deserializer extends JsonDeserializer<Volumes> {
+    public static class Deserializer extends JsonDeserializer<Volumes> {
         @Override
-        public Volumes deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+        public Volumes deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+                throws IOException, JsonProcessingException {
 
-        	List<Volume> volumes = new ArrayList<Volume>();
+            List<Volume> volumes = new ArrayList<Volume>();
             ObjectCodec oc = jsonParser.getCodec();
             JsonNode node = oc.readTree(jsonParser);
             for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
 
                 Map.Entry<String, JsonNode> field = it.next();
                 if (!field.getValue().equals(NullNode.getInstance())) {
-                	String path = field.getKey();
-                	Volume volume = new Volume(path);
-                	volumes.add(volume);
+                    String path = field.getKey();
+                    Volume volume = new Volume(path);
+                    volumes.add(volume);
                 }
             }
             return new Volumes(volumes.toArray(new Volume[0]));
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java b/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
index 9aae9f30b..c884a633e 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
@@ -21,109 +21,104 @@
 @JsonDeserialize(using = VolumesFrom.Deserializer.class)
 public class VolumesFrom {
 
-	private String container;
-
-	private AccessMode accessMode;
-
-	public VolumesFrom(String container) {
-		this(container, AccessMode.DEFAULT);
-	}
-
-	public VolumesFrom(String container, AccessMode accessMode) {
-		this.container = container;
-		this.accessMode = accessMode;
-	}
-	
-	public String getContainer() {
-		return container;
-	}
-	
-	public AccessMode getAccessMode() {
-		return accessMode;
-	}
-
-
-	/**
-	 * Parses a volume from specification to a {@link VolumesFrom}.
-	 * 
-	 * @param serialized the specification, e.g. <code>container:ro</code>
-	 * @return a {@link VolumesFrom} matching the specification
-	 * @throws IllegalArgumentException if the specification cannot be parsed
-	 */
-	public static VolumesFrom parse(String serialized) {
-		try {
-			String[] parts = serialized.split(":");
-			switch (parts.length) {
-			case 1: {
-				return new VolumesFrom(parts[0]);
-			}
-			case 2: {
-				return new VolumesFrom(parts[0], AccessMode.valueOf(parts[1]));
-			}
-			
-			default: {
-				throw new IllegalArgumentException();
-			}
-			}
-		} catch (Exception e) {
-			throw new IllegalArgumentException("Error parsing Bind '" + serialized
-					+ "'");
-		}
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof VolumesFrom) {
-			VolumesFrom other = (VolumesFrom) obj;
-			return new EqualsBuilder().append(container, other.getContainer())
-					.append(accessMode, other.getAccessMode()).isEquals();
-		} else
-			return super.equals(obj);
-	}
-
-	@Override
-	public int hashCode() {
-		return new HashCodeBuilder().append(container)
-				.append(accessMode).toHashCode();
-	}
-
-	/**
-	 * Returns a string representation of this {@link VolumesFrom} suitable
-	 * for inclusion in a JSON message.
-	 * The format is <code>&lt;container&gt;:&lt;access mode&gt;</code>,
-	 * like the argument in {@link #parse(String)}.
-	 * 
-	 * @return a string representation of this {@link VolumesFrom}
-	 */
-	@Override
-	public String toString() {
-		return container + ":" + accessMode.toString();
-	}
-	
-	public static class Serializer extends JsonSerializer<VolumesFrom> {
-
-		@Override
-		public void serialize(VolumesFrom volumeFrom, JsonGenerator jsonGen,
-				SerializerProvider serProvider) throws IOException,
-				JsonProcessingException {
-
-			jsonGen.writeString(volumeFrom.toString());
-			
-		}
-
-	}
-
-	public static class Deserializer extends JsonDeserializer<VolumesFrom> {
-		@Override
-		public VolumesFrom deserialize(JsonParser jsonParser,
-				DeserializationContext deserializationContext)
-				throws IOException, JsonProcessingException {
-
-			ObjectCodec oc = jsonParser.getCodec();
-			JsonNode node = oc.readTree(jsonParser);
-			return VolumesFrom.parse(node.asText());
-			
-		}
-	}
+    private String container;
+
+    private AccessMode accessMode;
+
+    public VolumesFrom(String container) {
+        this(container, AccessMode.DEFAULT);
+    }
+
+    public VolumesFrom(String container, AccessMode accessMode) {
+        this.container = container;
+        this.accessMode = accessMode;
+    }
+
+    public String getContainer() {
+        return container;
+    }
+
+    public AccessMode getAccessMode() {
+        return accessMode;
+    }
+
+    /**
+     * Parses a volume from specification to a {@link VolumesFrom}.
+     * 
+     * @param serialized
+     *            the specification, e.g. <code>container:ro</code>
+     * @return a {@link VolumesFrom} matching the specification
+     * @throws IllegalArgumentException
+     *             if the specification cannot be parsed
+     */
+    public static VolumesFrom parse(String serialized) {
+        try {
+            String[] parts = serialized.split(":");
+            switch (parts.length) {
+            case 1: {
+                return new VolumesFrom(parts[0]);
+            }
+            case 2: {
+                return new VolumesFrom(parts[0], AccessMode.valueOf(parts[1]));
+            }
+
+            default: {
+                throw new IllegalArgumentException();
+            }
+            }
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Error parsing Bind '" + serialized + "'");
+        }
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof VolumesFrom) {
+            VolumesFrom other = (VolumesFrom) obj;
+            return new EqualsBuilder().append(container, other.getContainer())
+                    .append(accessMode, other.getAccessMode()).isEquals();
+        } else
+            return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(container).append(accessMode).toHashCode();
+    }
+
+    /**
+     * Returns a string representation of this {@link VolumesFrom} suitable for inclusion in a JSON message. The format
+     * is <code>&lt;container&gt;:&lt;access mode&gt;</code>, like the argument in {@link #parse(String)}.
+     * 
+     * @return a string representation of this {@link VolumesFrom}
+     */
+    @Override
+    public String toString() {
+        return container + ":" + accessMode.toString();
+    }
+
+    public static class Serializer extends JsonSerializer<VolumesFrom> {
+
+        @Override
+        public void serialize(VolumesFrom volumeFrom, JsonGenerator jsonGen, SerializerProvider serProvider)
+                throws IOException, JsonProcessingException {
+
+            jsonGen.writeString(volumeFrom.toString());
+
+        }
+
+    }
+
+    public static class Deserializer extends JsonDeserializer<VolumesFrom> {
+        @Override
+        public VolumesFrom deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+                throws IOException, JsonProcessingException {
+
+            ObjectCodec oc = jsonParser.getCodec();
+            JsonNode node = oc.readTree(jsonParser);
+            return VolumesFrom.parse(node.asText());
+
+        }
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumesRW.java b/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
index a898ed57f..4a017d162 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
@@ -36,34 +36,36 @@ public VolumeRW[] getVolumesRW() {
     public static final class Serializer extends JsonSerializer<VolumesRW> {
 
         @Override
-        public void serialize(VolumesRW value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
+        public void serialize(VolumesRW value, JsonGenerator jgen, SerializerProvider provider) throws IOException,
+                JsonProcessingException {
             jgen.writeStartObject();
             for (final VolumeRW volumeRW : value.volumesRW) {
                 jgen.writeBooleanField(volumeRW.getVolume().getPath(), volumeRW.getAccessMode().toBoolean());
             }
             jgen.writeEndObject();
         }
-        
+
     }
-    
+
     public static final class Deserializer extends JsonDeserializer<VolumesRW> {
         @Override
-        public VolumesRW deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+        public VolumesRW deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+                throws IOException, JsonProcessingException {
 
             List<VolumeRW> volumesRW = new ArrayList<VolumeRW>();
             ObjectCodec oc = jsonParser.getCodec();
             JsonNode node = oc.readTree(jsonParser);
-            
-            
+
             for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
                 Map.Entry<String, JsonNode> field = it.next();
                 JsonNode value = field.getValue();
-                
+
                 if (!value.equals(NullNode.getInstance())) {
-                    if (!value.isBoolean()){
-                        throw deserializationContext.mappingException("Expected access mode for '"+field.getKey()+"' in host but got '"+ value+"'.");
+                    if (!value.isBoolean()) {
+                        throw deserializationContext.mappingException("Expected access mode for '" + field.getKey()
+                                + "' in host but got '" + value + "'.");
                     }
-                    
+
                     VolumeRW bind = new VolumeRW(new Volume(field.getKey()), AccessMode.fromBoolean(value.asBoolean()));
                     volumesRW.add(bind);
                 }
diff --git a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
index 862259a8e..6b5bdb055 100644
--- a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
+++ b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
@@ -18,7 +18,10 @@
 
 public class AuthConfigFile {
     private static final ObjectMapper MAPPER = new ObjectMapper();
-    private static final TypeReference<Map<String, AuthConfig>> CONFIG_MAP_TYPE = new TypeReference<Map<String, AuthConfig>>() {};
+
+    private static final TypeReference<Map<String, AuthConfig>> CONFIG_MAP_TYPE = new TypeReference<Map<String, AuthConfig>>() {
+    };
+
     private final Map<String, AuthConfig> authConfigMap;
 
     public AuthConfigFile() {
@@ -53,7 +56,7 @@ public AuthConfig resolveAuthConfig(String hostname) {
 
     public AuthConfigurations getAuthConfigurations() {
         final AuthConfigurations authConfigurations = new AuthConfigurations();
-        for(Map.Entry<String, AuthConfig> authConfigEntry : authConfigMap.entrySet()) {
+        for (Map.Entry<String, AuthConfig> authConfigEntry : authConfigMap.entrySet()) {
             authConfigurations.addConfig(authConfigEntry.getValue());
         }
 
@@ -90,7 +93,6 @@ public String toString() {
         return "AuthConfigFile [authConfigMap=" + authConfigMap + "]";
     }
 
-
     public static AuthConfigFile loadConfig(File confFile) throws IOException {
         AuthConfigFile configFile = new AuthConfigFile();
         if (!confFile.exists()) {
diff --git a/src/main/java/com/github/dockerjava/core/CertificateUtils.java b/src/main/java/com/github/dockerjava/core/CertificateUtils.java
index 6b19a201f..5abb82bd7 100644
--- a/src/main/java/com/github/dockerjava/core/CertificateUtils.java
+++ b/src/main/java/com/github/dockerjava/core/CertificateUtils.java
@@ -25,117 +25,118 @@
 import org.bouncycastle.openssl.PEMParser;
 
 public class CertificateUtils {
-    
+
     public static boolean verifyCertificatesExist(String dockerCertPath) {
-        String[] files = {"ca.pem", "cert.pem", "key.pem"};
+        String[] files = { "ca.pem", "cert.pem", "key.pem" };
         for (String file : files) {
             File path = new File(dockerCertPath, file);
             boolean exists = path.exists();
-            if(!exists) {
+            if (!exists) {
                 return false;
             }
         }
-        
+
         return true;
     }
-    
-    public static KeyStore createKeyStore(final String dockerCertPath) throws NoSuchAlgorithmException, InvalidKeySpecException, IOException, CertificateException, KeyStoreException {
+
+    public static KeyStore createKeyStore(final String dockerCertPath) throws NoSuchAlgorithmException,
+            InvalidKeySpecException, IOException, CertificateException, KeyStoreException {
         KeyPair keyPair = loadPrivateKey(dockerCertPath);
         Certificate privateCertificate = loadCertificate(dockerCertPath);
 
         KeyStore keyStore = KeyStore.getInstance("JKS");
         keyStore.load(null);
 
-        keyStore.setKeyEntry("docker", keyPair.getPrivate(), "docker".toCharArray(), new Certificate[]{privateCertificate});
+        keyStore.setKeyEntry("docker", keyPair.getPrivate(), "docker".toCharArray(),
+                new Certificate[] { privateCertificate });
         return keyStore;
     }
-    
-    public static KeyStore createTrustStore(final String dockerCertPath) throws IOException, CertificateException, KeyStoreException, NoSuchAlgorithmException {
+
+    public static KeyStore createTrustStore(final String dockerCertPath) throws IOException, CertificateException,
+            KeyStoreException, NoSuchAlgorithmException {
         File caPath = new File(dockerCertPath, "ca.pem");
         BufferedReader reader = new BufferedReader(new FileReader(caPath));
         PEMParser pemParser = null;
-        
+
         try {
             pemParser = new PEMParser(reader);
             X509CertificateHolder certificateHolder = (X509CertificateHolder) pemParser.readObject();
-            Certificate caCertificate = new JcaX509CertificateConverter().setProvider("BC").getCertificate(certificateHolder);
-            
+            Certificate caCertificate = new JcaX509CertificateConverter().setProvider("BC").getCertificate(
+                    certificateHolder);
+
             KeyStore trustStore = KeyStore.getInstance("JKS");
             trustStore.load(null);
             trustStore.setCertificateEntry("ca", caCertificate);
             return trustStore;
-            
-        }
-        finally {
-            if(pemParser != null) {
+
+        } finally {
+            if (pemParser != null) {
                 IOUtils.closeQuietly(pemParser);
             }
 
-            if(reader != null) {
+            if (reader != null) {
                 IOUtils.closeQuietly(reader);
             }
         }
-        
+
     }
-    
+
     private static Certificate loadCertificate(final String dockerCertPath) throws IOException, CertificateException {
         File certificate = new File(dockerCertPath, "cert.pem");
         BufferedReader reader = new BufferedReader(new FileReader(certificate));
         PEMParser pemParser = null;
-        
+
         try {
-           pemParser = new PEMParser(reader);
-           X509CertificateHolder certificateHolder = (X509CertificateHolder) pemParser.readObject();
-           return new JcaX509CertificateConverter().setProvider("BC").getCertificate(certificateHolder);
-        }
-        finally {
-            if(pemParser != null) {
+            pemParser = new PEMParser(reader);
+            X509CertificateHolder certificateHolder = (X509CertificateHolder) pemParser.readObject();
+            return new JcaX509CertificateConverter().setProvider("BC").getCertificate(certificateHolder);
+        } finally {
+            if (pemParser != null) {
                 IOUtils.closeQuietly(pemParser);
             }
-            
-            if(reader != null) {
+
+            if (reader != null) {
                 IOUtils.closeQuietly(reader);
             }
         }
-        
+
     }
-    
-    private static KeyPair loadPrivateKey(final String dockerCertPath) throws IOException, NoSuchAlgorithmException, InvalidKeySpecException {
+
+    private static KeyPair loadPrivateKey(final String dockerCertPath) throws IOException, NoSuchAlgorithmException,
+            InvalidKeySpecException {
         File certificate = new File(dockerCertPath, "key.pem");
         BufferedReader reader = new BufferedReader(new FileReader(certificate));
 
         PEMParser pemParser = null;
-        
+
         try {
-           pemParser = new PEMParser(reader);
-           
-           PEMKeyPair pemKeyPair = (PEMKeyPair) pemParser.readObject();
-          
-           byte[] pemPrivateKeyEncoded = pemKeyPair.getPrivateKeyInfo().getEncoded();
-           byte[] pemPublicKeyEncoded = pemKeyPair.getPublicKeyInfo().getEncoded();
+            pemParser = new PEMParser(reader);
 
-           KeyFactory factory = KeyFactory.getInstance("RSA");
+            PEMKeyPair pemKeyPair = (PEMKeyPair) pemParser.readObject();
 
-           X509EncodedKeySpec publicKeySpec = new X509EncodedKeySpec(pemPublicKeyEncoded);
-           PublicKey publicKey = factory.generatePublic(publicKeySpec);
+            byte[] pemPrivateKeyEncoded = pemKeyPair.getPrivateKeyInfo().getEncoded();
+            byte[] pemPublicKeyEncoded = pemKeyPair.getPublicKeyInfo().getEncoded();
 
-           PKCS8EncodedKeySpec privateKeySpec = new PKCS8EncodedKeySpec(pemPrivateKeyEncoded);
-           PrivateKey privateKey = factory.generatePrivate(privateKeySpec);
+            KeyFactory factory = KeyFactory.getInstance("RSA");
 
-           return new KeyPair(publicKey, privateKey);
-        
-        }
-        finally {
-            if(pemParser != null) {
+            X509EncodedKeySpec publicKeySpec = new X509EncodedKeySpec(pemPublicKeyEncoded);
+            PublicKey publicKey = factory.generatePublic(publicKeySpec);
+
+            PKCS8EncodedKeySpec privateKeySpec = new PKCS8EncodedKeySpec(pemPrivateKeyEncoded);
+            PrivateKey privateKey = factory.generatePrivate(privateKeySpec);
+
+            return new KeyPair(publicKey, privateKey);
+
+        } finally {
+            if (pemParser != null) {
                 IOUtils.closeQuietly(pemParser);
             }
-            
-            if(reader != null) {
+
+            if (reader != null) {
                 IOUtils.closeQuietly(reader);
             }
         }
 
-        
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
index 0afd5171d..b40294487 100644
--- a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
+++ b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
@@ -10,7 +10,8 @@
 
 public class CompressArchiveUtil {
 
-    public static File archiveTARFiles(File base, Iterable<File> files, String archiveNameWithOutExtension) throws IOException {
+    public static File archiveTARFiles(File base, Iterable<File> files, String archiveNameWithOutExtension)
+            throws IOException {
         File tarFile = new File(FileUtils.getTempDirectoryPath(), archiveNameWithOutExtension + ".tar");
         tarFile.deleteOnExit();
         TarArchiveOutputStream tos = new TarArchiveOutputStream(new FileOutputStream(tarFile));
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
index 4aa7d5ac7..f906f43d5 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
@@ -7,65 +7,62 @@
 import com.github.dockerjava.core.DockerClientConfig.DockerClientConfigBuilder;
 
 public class DockerClientBuilder {
-	
-	private static ServiceLoader<DockerCmdExecFactory> serviceLoader = ServiceLoader.load(DockerCmdExecFactory.class);
-
-	private DockerClientImpl dockerClient = null;
-	private DockerCmdExecFactory dockerCmdExecFactory = null;
-
-	private DockerClientBuilder(DockerClientImpl dockerClient) {
-		this.dockerClient = dockerClient;
-	}
-
-	public static DockerClientBuilder getInstance() {
-		return new DockerClientBuilder(DockerClientImpl.getInstance());
-	}
-	
-	public static DockerClientBuilder getInstance(DockerClientConfigBuilder dockerClientConfigBuilder) {
-		return getInstance(dockerClientConfigBuilder.build());
-	}
-
-	public static DockerClientBuilder getInstance(DockerClientConfig dockerClientConfig) {
-		return new DockerClientBuilder(DockerClientImpl
-				.getInstance(dockerClientConfig));
-	}
-
-	public static DockerClientBuilder getInstance(String serverUrl) {
-		return new DockerClientBuilder(DockerClientImpl
-				.getInstance(serverUrl));
-	}
-
-	public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() {
-		// clearing the cache is needed because otherwise we will get
-		// the same DockerCmdExecFactory instance each time
-		serviceLoader.reload();
-		if(!serviceLoader.iterator().hasNext()) {
-			throw new RuntimeException("Fatal: Can't find any implementation of '" + DockerCmdExecFactory.class.getName() +  "' in the current classpath.");
-		}
-		
-		return serviceLoader.iterator().next();
-	}
-
-	public DockerClientBuilder withDockerCmdExecFactory(
-			DockerCmdExecFactory dockerCmdExecFactory) {
-		this.dockerCmdExecFactory = dockerCmdExecFactory;
-		return this;
-	}
-		
-	public DockerClientBuilder withServiceLoaderClassLoader(ClassLoader classLoader)
-	{
-		 serviceLoader = ServiceLoader.load(DockerCmdExecFactory.class, classLoader);
-		 return this;
-	}
-
-	public DockerClient build() {
-	        if(dockerCmdExecFactory != null) {
-	            dockerClient.withDockerCmdExecFactory(dockerCmdExecFactory);
-	        }
-	        else {
-	            dockerClient.withDockerCmdExecFactory(getDefaultDockerCmdExecFactory());
-	        }
-	        
-		return dockerClient;
-	}
+
+    private static ServiceLoader<DockerCmdExecFactory> serviceLoader = ServiceLoader.load(DockerCmdExecFactory.class);
+
+    private DockerClientImpl dockerClient = null;
+
+    private DockerCmdExecFactory dockerCmdExecFactory = null;
+
+    private DockerClientBuilder(DockerClientImpl dockerClient) {
+        this.dockerClient = dockerClient;
+    }
+
+    public static DockerClientBuilder getInstance() {
+        return new DockerClientBuilder(DockerClientImpl.getInstance());
+    }
+
+    public static DockerClientBuilder getInstance(DockerClientConfigBuilder dockerClientConfigBuilder) {
+        return getInstance(dockerClientConfigBuilder.build());
+    }
+
+    public static DockerClientBuilder getInstance(DockerClientConfig dockerClientConfig) {
+        return new DockerClientBuilder(DockerClientImpl.getInstance(dockerClientConfig));
+    }
+
+    public static DockerClientBuilder getInstance(String serverUrl) {
+        return new DockerClientBuilder(DockerClientImpl.getInstance(serverUrl));
+    }
+
+    public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() {
+        // clearing the cache is needed because otherwise we will get
+        // the same DockerCmdExecFactory instance each time
+        serviceLoader.reload();
+        if (!serviceLoader.iterator().hasNext()) {
+            throw new RuntimeException("Fatal: Can't find any implementation of '"
+                    + DockerCmdExecFactory.class.getName() + "' in the current classpath.");
+        }
+
+        return serviceLoader.iterator().next();
+    }
+
+    public DockerClientBuilder withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) {
+        this.dockerCmdExecFactory = dockerCmdExecFactory;
+        return this;
+    }
+
+    public DockerClientBuilder withServiceLoaderClassLoader(ClassLoader classLoader) {
+        serviceLoader = ServiceLoader.load(DockerCmdExecFactory.class, classLoader);
+        return this;
+    }
+
+    public DockerClient build() {
+        if (dockerCmdExecFactory != null) {
+            dockerClient.withDockerCmdExecFactory(dockerCmdExecFactory);
+        } else {
+            dockerClient.withDockerCmdExecFactory(getDefaultDockerCmdExecFactory());
+        }
+
+        return dockerClient;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index 7e0b57b0e..a96f61556 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -20,26 +20,42 @@
 
 public class DockerClientConfig implements Serializable {
 
-	private static final long serialVersionUID = -4307357472441531489L;
-	
-	private static final String DOCKER_HOST_PROPERTY = "DOCKER_HOST";
+    private static final long serialVersionUID = -4307357472441531489L;
+
+    private static final String DOCKER_HOST_PROPERTY = "DOCKER_HOST";
+
     private static final String DOCKER_CERT_PATH_PROPERTY = "DOCKER_CERT_PATH";
+
     private static final String DOCKER_VERIFY_TLS_PROPERTY = "DOCKER_TLS_VERIFY";
+
     private static final String DOCKER_IO_URL_PROPERTY = "docker.io.url";
+
     private static final String DOCKER_IO_VERSION_PROPERTY = "docker.io.version";
+
     private static final String DOCKER_IO_USERNAME_PROPERTY = "docker.io.username";
+
     private static final String DOCKER_IO_PASSWORD_PROPERTY = "docker.io.password";
+
     private static final String DOCKER_IO_EMAIL_PROPERTY = "docker.io.email";
+
     private static final String DOCKER_IO_SERVER_ADDRESS_PROPERTY = "docker.io.serverAddress";
+
     private static final String DOCKER_IO_READ_TIMEOUT_PROPERTY = "docker.io.readTimeout";
+
     // this is really confusing, as there are two ways to spell it
     private static final String DOCKER_IO_ENABLE_LOGGING_FILTER_PROPERTY = "docker.io.enableLoggingFilter";
+
     private static final String DOCKER_IO_FOLLOW_REDIRECTS_FILTER_PROPERTY = "docker.io.followRedirectsFilter";
+
     private static final String DOCKER_IO_DOCKER_CERT_PATH_PROPERTY = "docker.io.dockerCertPath";
+
     private static final String DOCKER_IO_DOCKER_CFG_PATH_PROPERTY = "docker.io.dockerCfgPath";
+
     // connection pooling properties
     private static final String DOCKER_IO_MAX_PER_ROUTE_PROPERTY = "docker.io.perRouteConnections";
+
     private static final String DOCKER_IO_MAX_TOTAL_PROPERTY = "docker.io.totalConnections";
+
     /**
      * A map from the environment name to the interval name.
      */
@@ -62,19 +78,26 @@ public class DockerClientConfig implements Serializable {
     }
 
     private static final String DOCKER_IO_PROPERTIES_PROPERTY = "docker.io.properties";
+
     private URI uri;
+
     private final String version, username, password, email, serverAddress, dockerCfgPath;
+
     private final Integer readTimeout;
+
     private final boolean loggingFilterEnabled;
+
     private final boolean followRedirectsFilterEnabled;
+
     private final SSLConfig sslConfig;
-    
+
     private final Integer maxTotalConnections;
+
     private final Integer maxPerRouteConnections;
 
     DockerClientConfig(URI uri, String version, String username, String password, String email, String serverAddress,
-                       String dockerCfgPath, Integer readTimeout, boolean loggingFilterEnabled, boolean followRedirectsFilterEnabled, 
-                       SSLConfig sslConfig, Integer maxTotalConns, Integer maxPerRouteConns) {
+            String dockerCfgPath, Integer readTimeout, boolean loggingFilterEnabled,
+            boolean followRedirectsFilterEnabled, SSLConfig sslConfig, Integer maxTotalConns, Integer maxPerRouteConns) {
         this.uri = uri;
         this.version = version;
         this.username = username;
@@ -121,14 +144,16 @@ private static String replaceProperties(String s, Properties replacements) {
     /**
      * Creates a new Properties object containing values overridden from ${user.home}/.docker.io.properties
      *
-     * @param p The original set of properties to override
+     * @param p
+     *            The original set of properties to override
      * @return A copy of the original Properties with overridden values
      */
     private static Properties overrideDockerPropertiesWithSettingsFromUserHome(Properties p, Properties systemProperties) {
         Properties overriddenProperties = new Properties();
         overriddenProperties.putAll(p);
 
-        final File usersDockerPropertiesFile = new File(systemProperties.getProperty("user.home"), "." + DOCKER_IO_PROPERTIES_PROPERTY);
+        final File usersDockerPropertiesFile = new File(systemProperties.getProperty("user.home"), "."
+                + DOCKER_IO_PROPERTIES_PROPERTY);
         if (usersDockerPropertiesFile.isFile()) {
             try {
                 final FileInputStream in = new FileInputStream(usersDockerPropertiesFile);
@@ -150,7 +175,8 @@ private static Properties overrideDockerPropertiesWithEnv(Properties properties,
 
         // special case which is a sensible default
         if (env.containsKey(DOCKER_HOST_PROPERTY)) {
-            overriddenProperties.setProperty(DOCKER_IO_URL_PROPERTY, env.get(DOCKER_HOST_PROPERTY).replace("tcp", protocol(env)));
+            overriddenProperties.setProperty(DOCKER_IO_URL_PROPERTY,
+                    env.get(DOCKER_HOST_PROPERTY).replace("tcp", protocol(env)));
         }
 
         for (Map.Entry<String, String> envEntry : env.entrySet()) {
@@ -165,32 +191,26 @@ private static Properties overrideDockerPropertiesWithEnv(Properties properties,
 
     private static String protocol(Map<String, String> env) {
         // if this is set, we assume we need SSL
-        return env.containsKey(DOCKER_CERT_PATH_PROPERTY) || "1".equals(env.get(DOCKER_VERIFY_TLS_PROPERTY)) ? "https" : "http";
+        return env.containsKey(DOCKER_CERT_PATH_PROPERTY) || "1".equals(env.get(DOCKER_VERIFY_TLS_PROPERTY)) ? "https"
+                : "http";
     }
 
     /**
      * Creates a new Properties object containing values overridden from the System properties
      *
-     * @param p The original set of properties to override
+     * @param p
+     *            The original set of properties to override
      * @return A copy of the original Properties with overridden values
      */
     private static Properties overrideDockerPropertiesWithSystemProperties(Properties p, Properties systemProperties) {
         Properties overriddenProperties = new Properties();
         overriddenProperties.putAll(p);
 
-        for (String key : new String[]{
-                DOCKER_IO_URL_PROPERTY,
-                DOCKER_IO_VERSION_PROPERTY,
-                DOCKER_IO_USERNAME_PROPERTY,
-                DOCKER_IO_PASSWORD_PROPERTY,
-                DOCKER_IO_EMAIL_PROPERTY,
-                DOCKER_IO_SERVER_ADDRESS_PROPERTY,
-                DOCKER_IO_READ_TIMEOUT_PROPERTY,
-                DOCKER_IO_ENABLE_LOGGING_FILTER_PROPERTY,
-                DOCKER_IO_FOLLOW_REDIRECTS_FILTER_PROPERTY,
-                DOCKER_IO_DOCKER_CERT_PATH_PROPERTY,
-                DOCKER_IO_DOCKER_CFG_PATH_PROPERTY,
-        }) {
+        for (String key : new String[] { DOCKER_IO_URL_PROPERTY, DOCKER_IO_VERSION_PROPERTY,
+                DOCKER_IO_USERNAME_PROPERTY, DOCKER_IO_PASSWORD_PROPERTY, DOCKER_IO_EMAIL_PROPERTY,
+                DOCKER_IO_SERVER_ADDRESS_PROPERTY, DOCKER_IO_READ_TIMEOUT_PROPERTY,
+                DOCKER_IO_ENABLE_LOGGING_FILTER_PROPERTY, DOCKER_IO_FOLLOW_REDIRECTS_FILTER_PROPERTY,
+                DOCKER_IO_DOCKER_CERT_PATH_PROPERTY, DOCKER_IO_DOCKER_CFG_PATH_PROPERTY, }) {
             if (systemProperties.containsKey(key)) {
                 overriddenProperties.setProperty(key, systemProperties.getProperty(key));
             }
@@ -218,8 +238,8 @@ public URI getUri() {
     }
 
     public void setUri(URI uri) {
-		this.uri = uri;
-	}
+        this.uri = uri;
+    }
 
     public String getVersion() {
         return version;
@@ -254,73 +274,67 @@ public boolean followRedirectsFilterEnabled() {
     }
 
     public SSLConfig getSslConfig() {
-      return sslConfig;
+        return sslConfig;
     }
 
     public String getDockerCfgPath() {
         return dockerCfgPath;
     }
-    
+
     public Integer getMaxTotalConnections() {
-      return maxTotalConnections;
+        return maxTotalConnections;
     }
 
     public Integer getMaxPerRoutConnections() {
-      return maxPerRouteConnections;
+        return maxPerRouteConnections;
     }
-    
+
     private AuthConfig getAuthConfig() {
-    	AuthConfig authConfig = null;
-    	if (getUsername() != null && getPassword() != null && getEmail() != null
-    			&& getServerAddress() != null) {
-    		authConfig = new AuthConfig();
-    		authConfig.setUsername(getUsername());
-    		authConfig.setPassword(getPassword());
-    		authConfig.setEmail(getEmail());
-    		authConfig.setServerAddress(getServerAddress());
-    	} 
-    	return authConfig;
-    }
-    
+        AuthConfig authConfig = null;
+        if (getUsername() != null && getPassword() != null && getEmail() != null && getServerAddress() != null) {
+            authConfig = new AuthConfig();
+            authConfig.setUsername(getUsername());
+            authConfig.setPassword(getPassword());
+            authConfig.setEmail(getEmail());
+            authConfig.setServerAddress(getServerAddress());
+        }
+        return authConfig;
+    }
+
     public AuthConfig effectiveAuthConfig(String imageName) {
-		AuthConfig authConfig = null;
-
-		String dockerCfgFile = getDockerCfgPath();
-
-		if (dockerCfgFile != null && imageName != null) {
-			AuthConfigFile authConfigFile;
-			try {
-				authConfigFile = AuthConfigFile.loadConfig(new File(
-						dockerCfgFile));
-			} catch (IOException e) {
-				throw new DockerClientException(
-						"Failed to parse dockerCfgFile", e);
-			}
-			ReposTag reposTag = NameParser.parseRepositoryTag(imageName);
-			HostnameReposName hostnameReposName = NameParser
-					.resolveRepositoryName(reposTag.repos);
-			
-			authConfig = authConfigFile
-					.resolveAuthConfig(hostnameReposName.hostname);	
-		}
-		
-		AuthConfig _authConfig = getAuthConfig();
-		
-		if(_authConfig != null) authConfig = _authConfig;
-		
-		return authConfig;
-	}
+        AuthConfig authConfig = null;
+
+        String dockerCfgFile = getDockerCfgPath();
+
+        if (dockerCfgFile != null && imageName != null) {
+            AuthConfigFile authConfigFile;
+            try {
+                authConfigFile = AuthConfigFile.loadConfig(new File(dockerCfgFile));
+            } catch (IOException e) {
+                throw new DockerClientException("Failed to parse dockerCfgFile", e);
+            }
+            ReposTag reposTag = NameParser.parseRepositoryTag(imageName);
+            HostnameReposName hostnameReposName = NameParser.resolveRepositoryName(reposTag.repos);
+
+            authConfig = authConfigFile.resolveAuthConfig(hostnameReposName.hostname);
+        }
+
+        AuthConfig _authConfig = getAuthConfig();
+
+        if (_authConfig != null)
+            authConfig = _authConfig;
+
+        return authConfig;
+    }
 
     public AuthConfigurations getAuthConfigurations() {
         String dockerCfgFile = getDockerCfgPath();
         if (dockerCfgFile != null) {
             AuthConfigFile authConfigFile;
             try {
-                authConfigFile = AuthConfigFile.loadConfig(new File(
-                        dockerCfgFile));
+                authConfigFile = AuthConfigFile.loadConfig(new File(dockerCfgFile));
             } catch (IOException e) {
-                throw new DockerClientException(
-                        "Failed to parse dockerCfgFile", e);
+                throw new DockerClientException("Failed to parse dockerCfgFile", e);
             }
 
             return authConfigFile.getAuthConfigurations();
@@ -329,26 +343,35 @@ public AuthConfigurations getAuthConfigurations() {
         return new AuthConfigurations();
     }
 
-  @Override
+    @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
 
         DockerClientConfig that = (DockerClientConfig) o;
 
-        if (loggingFilterEnabled != that.loggingFilterEnabled) return false;
+        if (loggingFilterEnabled != that.loggingFilterEnabled)
+            return false;
         if (sslConfig != null ? !sslConfig.equals(that.sslConfig) : that.sslConfig != null)
             return false;
         if (dockerCfgPath != null ? !dockerCfgPath.equals(that.dockerCfgPath) : that.dockerCfgPath != null)
             return false;
-        if (email != null ? !email.equals(that.email) : that.email != null) return false;
-        if (password != null ? !password.equals(that.password) : that.password != null) return false;
-        if (readTimeout != null ? !readTimeout.equals(that.readTimeout) : that.readTimeout != null) return false;
+        if (email != null ? !email.equals(that.email) : that.email != null)
+            return false;
+        if (password != null ? !password.equals(that.password) : that.password != null)
+            return false;
+        if (readTimeout != null ? !readTimeout.equals(that.readTimeout) : that.readTimeout != null)
+            return false;
         if (serverAddress != null ? !serverAddress.equals(that.serverAddress) : that.serverAddress != null)
             return false;
-        if (uri != null ? !uri.equals(that.uri) : that.uri != null) return false;
-        if (username != null ? !username.equals(that.username) : that.username != null) return false;
-        if (version != null ? !version.equals(that.version) : that.version != null) return false;
+        if (uri != null ? !uri.equals(that.uri) : that.uri != null)
+            return false;
+        if (username != null ? !username.equals(that.username) : that.username != null)
+            return false;
+        if (version != null ? !version.equals(that.version) : that.version != null)
+            return false;
 
         return true;
     }
@@ -370,33 +393,29 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "DockerClientConfig{" +
-                "uri=" + uri +
-                ", version='" + version + '\'' +
-                ", username='" + username + '\'' +
-                ", password='" + password + '\'' +
-                ", email='" + email + '\'' +
-                ", serverAddress='" + serverAddress + '\'' +
-                ", dockerCfgPath='" + dockerCfgPath + '\'' +
-                ", sslConfig='" + sslConfig + '\'' +
-                ", readTimeout=" + readTimeout +
-                ", loggingFilterEnabled=" + loggingFilterEnabled +
-                ", followRedirectsFilterEnabled=" + followRedirectsFilterEnabled +
-                '}';
+        return "DockerClientConfig{" + "uri=" + uri + ", version='" + version + '\'' + ", username='" + username + '\''
+                + ", password='" + password + '\'' + ", email='" + email + '\'' + ", serverAddress='" + serverAddress
+                + '\'' + ", dockerCfgPath='" + dockerCfgPath + '\'' + ", sslConfig='" + sslConfig + '\''
+                + ", readTimeout=" + readTimeout + ", loggingFilterEnabled=" + loggingFilterEnabled
+                + ", followRedirectsFilterEnabled=" + followRedirectsFilterEnabled + '}';
     }
 
     public static class DockerClientConfigBuilder {
         private URI uri;
+
         private String version, username, password, email, serverAddress, dockerCfgPath;
+
         private Integer readTimeout, maxTotalConnections, maxPerRouteConnections;
+
         private boolean loggingFilterEnabled, followRedirectsFilterEnabled;
+
         private SSLConfig sslConfig;
 
         /**
          * This will set all fields in the builder to those contained in the Properties object. The Properties object
          * should contain the following docker.io.* keys: url, version, username, password, email, dockerCertPath, and
          * dockerCfgPath. If docker.io.readTimeout or docker.io.enableLoggingFilter are not contained, they will be set
-         *  to 1000 and true, respectively.
+         * to 1000 and true, respectively.
          */
         public DockerClientConfigBuilder withProperties(Properties p) {
             return withUri(p.getProperty(DOCKER_IO_URL_PROPERTY))
@@ -407,18 +426,19 @@ public DockerClientConfigBuilder withProperties(Properties p) {
                     .withServerAddress(p.getProperty(DOCKER_IO_SERVER_ADDRESS_PROPERTY))
                     .withReadTimeout(Integer.valueOf(p.getProperty(DOCKER_IO_READ_TIMEOUT_PROPERTY, "0")))
                     .withLoggingFilter(Boolean.valueOf(p.getProperty(DOCKER_IO_ENABLE_LOGGING_FILTER_PROPERTY, "true")))
-                    .withFollowRedirectsFilter(Boolean.valueOf(p.getProperty(DOCKER_IO_FOLLOW_REDIRECTS_FILTER_PROPERTY, "false")))
+                    .withFollowRedirectsFilter(
+                            Boolean.valueOf(p.getProperty(DOCKER_IO_FOLLOW_REDIRECTS_FILTER_PROPERTY, "false")))
                     .withDockerCertPath(p.getProperty(DOCKER_IO_DOCKER_CERT_PATH_PROPERTY))
                     .withDockerCfgPath(p.getProperty(DOCKER_IO_DOCKER_CFG_PATH_PROPERTY))
                     .withMaxPerRouteConnections(integerValue(p.getProperty(DOCKER_IO_MAX_PER_ROUTE_PROPERTY)))
                     .withMaxTotalConnections(integerValue(p.getProperty(DOCKER_IO_MAX_TOTAL_PROPERTY)));
         }
-        
+
         private Integer integerValue(String value) {
-        	if(value != null)
-        		return Integer.valueOf(value);
-        	else 
-        		return null;
+            if (value != null)
+                return Integer.valueOf(value);
+            else
+                return null;
         }
 
         public final DockerClientConfigBuilder withUri(String uri) {
@@ -456,12 +476,12 @@ public final DockerClientConfigBuilder withReadTimeout(Integer readTimeout) {
             this.readTimeout = readTimeout;
             return this;
         }
-        
+
         public final DockerClientConfigBuilder withMaxTotalConnections(Integer maxTotalConnections) {
             this.maxTotalConnections = maxTotalConnections;
             return this;
         }
-        
+
         public final DockerClientConfigBuilder withMaxPerRouteConnections(Integer maxPerRouteConnections) {
             this.maxPerRouteConnections = maxPerRouteConnections;
             return this;
@@ -478,9 +498,9 @@ public final DockerClientConfigBuilder withFollowRedirectsFilter(boolean followR
         }
 
         public final DockerClientConfigBuilder withDockerCertPath(String dockerCertPath) {
-        	if(dockerCertPath != null) {
-        		this.sslConfig = new LocalDirectorySSLConfig(dockerCertPath);
-        	}
+            if (dockerCertPath != null) {
+                this.sslConfig = new LocalDirectorySSLConfig(dockerCertPath);
+            }
             return this;
         }
 
@@ -489,30 +509,17 @@ public final DockerClientConfigBuilder withDockerCfgPath(String dockerCfgPath) {
             return this;
         }
 
-
         public final DockerClientConfigBuilder withSSLConfig(SSLConfig config) {
             this.sslConfig = config;
             return this;
         }
 
         public DockerClientConfig build() {
-            return new DockerClientConfig(
-                    uri,
-                    version,
-                    username,
-                    password,
-                    email,
-                    serverAddress,
-                    dockerCfgPath,
-                    readTimeout,
-                    loggingFilterEnabled,
-                    followRedirectsFilterEnabled,
-                    sslConfig,
-                    maxTotalConnections,
-                    maxPerRouteConnections
-            );
+            return new DockerClientConfig(uri, version, username, password, email, serverAddress, dockerCfgPath,
+                    readTimeout, loggingFilterEnabled, followRedirectsFilterEnabled, sslConfig, maxTotalConnections,
+                    maxPerRouteConnections);
         }
     }
 
-//   
+    //
 }
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index cf27650a6..01d40760a 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -21,221 +21,197 @@
  */
 public class DockerClientImpl implements Closeable, DockerClient {
 
-	private final DockerClientConfig dockerClientConfig;
-
-	private DockerCmdExecFactory dockerCmdExecFactory;
-
-	private DockerClientImpl() {
-		this(DockerClientConfig.createDefaultConfigBuilder().build());
-	}
-
-	private DockerClientImpl(String serverUrl) {
-		this(configWithServerUrl(serverUrl));
-	}
-
-	private DockerClientImpl(DockerClientConfig dockerClientConfig) {
-		checkNotNull(dockerClientConfig,
-				"config was not specified");
-		this.dockerClientConfig = dockerClientConfig;
-	}
-
-	private static DockerClientConfig configWithServerUrl(String serverUrl) {
-		return DockerClientConfig.createDefaultConfigBuilder()
-				.withUri(serverUrl).build();
-	}
-
-	public static DockerClientImpl getInstance() {
-		return new DockerClientImpl();
-	}
-
-	public static DockerClientImpl getInstance(
-			DockerClientConfig dockerClientConfig) {
-		return new DockerClientImpl(dockerClientConfig);
-	}
-
-	public static DockerClientImpl getInstance(String serverUrl) {
-		return new DockerClientImpl(serverUrl);
-	}
-
-	public DockerClientImpl withDockerCmdExecFactory(
-			DockerCmdExecFactory dockerCmdExecFactory) {
-		checkNotNull(dockerCmdExecFactory,
-				"dockerCmdExecFactory was not specified");
-		this.dockerCmdExecFactory = dockerCmdExecFactory;
-		this.dockerCmdExecFactory.init(dockerClientConfig);
-		return this;
-	}
-
-	private DockerCmdExecFactory getDockerCmdExecFactory() {
-		checkNotNull(dockerCmdExecFactory,
-				"dockerCmdExecFactory was not specified");
-		return dockerCmdExecFactory;
-	}
-
-	@Override
-	public AuthConfig authConfig() {
-		checkNotNull(dockerClientConfig.getUsername(),
-				"Configured username is null.");
-		checkNotNull(dockerClientConfig.getServerAddress(),
-				"Configured serverAddress is null.");
-
-		AuthConfig authConfig = new AuthConfig();
-		authConfig.setUsername(dockerClientConfig.getUsername());
-		authConfig.setPassword(dockerClientConfig.getPassword());
-		authConfig.setEmail(dockerClientConfig.getEmail());
-		authConfig.setServerAddress(dockerClientConfig.getServerAddress());
-
-		return authConfig;
-	}
-
-	/**
-	 * * MISC API *
-	 */
-
-	/**
-	 * Authenticate with the server, useful for checking authentication.
-	 */
-	@Override
-	public AuthCmd authCmd() {
-		return new AuthCmdImpl(getDockerCmdExecFactory().createAuthCmdExec(),
-				authConfig());
-	}
-
-	@Override
-	public InfoCmd infoCmd() {
-		return new InfoCmdImpl(getDockerCmdExecFactory().createInfoCmdExec());
-	}
-
-	@Override
-	public PingCmd pingCmd() {
-		return new PingCmdImpl(getDockerCmdExecFactory().createPingCmdExec());
-	}
-
-	@Override
-	public VersionCmd versionCmd() {
-		return new VersionCmdImpl(getDockerCmdExecFactory()
-				.createVersionCmdExec());
-	}
-
-	/**
-	 * * IMAGE API *
-	 */
-	@Override
-	public PullImageCmd pullImageCmd(String repository) {
-		return new PullImageCmdImpl(getDockerCmdExecFactory()
-				.createPullImageCmdExec(), dockerClientConfig.effectiveAuthConfig(repository), repository);
-	}
-
-	@Override
-	public PushImageCmd pushImageCmd(String name) {
-          PushImageCmd cmd = new PushImageCmdImpl(getDockerCmdExecFactory()
-				.createPushImageCmdExec(), name);
-
-          AuthConfig cfg = dockerClientConfig.effectiveAuthConfig(name);
-          if( cfg != null )
+    private final DockerClientConfig dockerClientConfig;
+
+    private DockerCmdExecFactory dockerCmdExecFactory;
+
+    private DockerClientImpl() {
+        this(DockerClientConfig.createDefaultConfigBuilder().build());
+    }
+
+    private DockerClientImpl(String serverUrl) {
+        this(configWithServerUrl(serverUrl));
+    }
+
+    private DockerClientImpl(DockerClientConfig dockerClientConfig) {
+        checkNotNull(dockerClientConfig, "config was not specified");
+        this.dockerClientConfig = dockerClientConfig;
+    }
+
+    private static DockerClientConfig configWithServerUrl(String serverUrl) {
+        return DockerClientConfig.createDefaultConfigBuilder().withUri(serverUrl).build();
+    }
+
+    public static DockerClientImpl getInstance() {
+        return new DockerClientImpl();
+    }
+
+    public static DockerClientImpl getInstance(DockerClientConfig dockerClientConfig) {
+        return new DockerClientImpl(dockerClientConfig);
+    }
+
+    public static DockerClientImpl getInstance(String serverUrl) {
+        return new DockerClientImpl(serverUrl);
+    }
+
+    public DockerClientImpl withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) {
+        checkNotNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified");
+        this.dockerCmdExecFactory = dockerCmdExecFactory;
+        this.dockerCmdExecFactory.init(dockerClientConfig);
+        return this;
+    }
+
+    private DockerCmdExecFactory getDockerCmdExecFactory() {
+        checkNotNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified");
+        return dockerCmdExecFactory;
+    }
+
+    @Override
+    public AuthConfig authConfig() {
+        checkNotNull(dockerClientConfig.getUsername(), "Configured username is null.");
+        checkNotNull(dockerClientConfig.getServerAddress(), "Configured serverAddress is null.");
+
+        AuthConfig authConfig = new AuthConfig();
+        authConfig.setUsername(dockerClientConfig.getUsername());
+        authConfig.setPassword(dockerClientConfig.getPassword());
+        authConfig.setEmail(dockerClientConfig.getEmail());
+        authConfig.setServerAddress(dockerClientConfig.getServerAddress());
+
+        return authConfig;
+    }
+
+    /**
+     * * MISC API *
+     */
+
+    /**
+     * Authenticate with the server, useful for checking authentication.
+     */
+    @Override
+    public AuthCmd authCmd() {
+        return new AuthCmdImpl(getDockerCmdExecFactory().createAuthCmdExec(), authConfig());
+    }
+
+    @Override
+    public InfoCmd infoCmd() {
+        return new InfoCmdImpl(getDockerCmdExecFactory().createInfoCmdExec());
+    }
+
+    @Override
+    public PingCmd pingCmd() {
+        return new PingCmdImpl(getDockerCmdExecFactory().createPingCmdExec());
+    }
+
+    @Override
+    public VersionCmd versionCmd() {
+        return new VersionCmdImpl(getDockerCmdExecFactory().createVersionCmdExec());
+    }
+
+    /**
+     * * IMAGE API *
+     */
+    @Override
+    public PullImageCmd pullImageCmd(String repository) {
+        return new PullImageCmdImpl(getDockerCmdExecFactory().createPullImageCmdExec(),
+                dockerClientConfig.effectiveAuthConfig(repository), repository);
+    }
+
+    @Override
+    public PushImageCmd pushImageCmd(String name) {
+        PushImageCmd cmd = new PushImageCmdImpl(getDockerCmdExecFactory().createPushImageCmdExec(), name);
+
+        AuthConfig cfg = dockerClientConfig.effectiveAuthConfig(name);
+        if (cfg != null)
             cmd.withAuthConfig(cfg);
-          return cmd;
-	}
+        return cmd;
+    }
 
-        @Override
-        public PushImageCmd pushImageCmd(Identifier identifier) {
-          PushImageCmd cmd = pushImageCmd(identifier.repository.name);
-          if( identifier.tag.isPresent() )
+    @Override
+    public PushImageCmd pushImageCmd(Identifier identifier) {
+        PushImageCmd cmd = pushImageCmd(identifier.repository.name);
+        if (identifier.tag.isPresent())
             cmd.withTag(identifier.tag.get());
 
-          AuthConfig cfg = dockerClientConfig.effectiveAuthConfig(identifier.repository.name);
-          if( cfg != null )
+        AuthConfig cfg = dockerClientConfig.effectiveAuthConfig(identifier.repository.name);
+        if (cfg != null)
             cmd.withAuthConfig(cfg);
 
-          return cmd;
-        }
+        return cmd;
+    }
 
-        @Override
+    @Override
     public SaveImageCmd saveImageCmd(String name) {
         return new SaveImageCmdImpl(getDockerCmdExecFactory().createSaveImageCmdExec(), name);
     }
 
-	@Override
-	public CreateImageCmd createImageCmd(String repository,
-			InputStream imageStream) {
-		return new CreateImageCmdImpl(getDockerCmdExecFactory()
-				.createCreateImageCmdExec(), repository, imageStream);
-	}
-
-	@Override
-	public SearchImagesCmd searchImagesCmd(String term) {
-		return new SearchImagesCmdImpl(getDockerCmdExecFactory()
-				.createSearchImagesCmdExec(), term);
-	}
-
-	@Override
-	public RemoveImageCmd removeImageCmd(String imageId) {
-		return new RemoveImageCmdImpl(getDockerCmdExecFactory()
-				.createRemoveImageCmdExec(), imageId);
-	}
-
-	@Override
-	public ListImagesCmd listImagesCmd() {
-		return new ListImagesCmdImpl(getDockerCmdExecFactory()
-				.createListImagesCmdExec());
-	}
-
-	@Override
-	public InspectImageCmd inspectImageCmd(String imageId) {
-		return new InspectImageCmdImpl(getDockerCmdExecFactory()
-				.createInspectImageCmdExec(), imageId);
-	}
-
-	/**
-	 * * CONTAINER API *
-	 */
-
-	@Override
-	public ListContainersCmd listContainersCmd() {
-		return new ListContainersCmdImpl(getDockerCmdExecFactory()
-				.createListContainersCmdExec());
-	}
-
-	@Override
-	public CreateContainerCmd createContainerCmd(String image) {
-		return new CreateContainerCmdImpl(getDockerCmdExecFactory()
-				.createCreateContainerCmdExec(), image);
-	}
-
-	@Override
-	public StartContainerCmd startContainerCmd(String containerId) {
-		return new StartContainerCmdImpl(getDockerCmdExecFactory()
-				.createStartContainerCmdExec(), containerId);
-	}
-
-	@Override
-	public InspectContainerCmd inspectContainerCmd(String containerId) {
-		return new InspectContainerCmdImpl(getDockerCmdExecFactory()
-				.createInspectContainerCmdExec(), containerId);
-	}
+    @Override
+    public CreateImageCmd createImageCmd(String repository, InputStream imageStream) {
+        return new CreateImageCmdImpl(getDockerCmdExecFactory().createCreateImageCmdExec(), repository, imageStream);
+    }
+
+    @Override
+    public SearchImagesCmd searchImagesCmd(String term) {
+        return new SearchImagesCmdImpl(getDockerCmdExecFactory().createSearchImagesCmdExec(), term);
+    }
+
+    @Override
+    public RemoveImageCmd removeImageCmd(String imageId) {
+        return new RemoveImageCmdImpl(getDockerCmdExecFactory().createRemoveImageCmdExec(), imageId);
+    }
+
+    @Override
+    public ListImagesCmd listImagesCmd() {
+        return new ListImagesCmdImpl(getDockerCmdExecFactory().createListImagesCmdExec());
+    }
+
+    @Override
+    public InspectImageCmd inspectImageCmd(String imageId) {
+        return new InspectImageCmdImpl(getDockerCmdExecFactory().createInspectImageCmdExec(), imageId);
+    }
+
+    /**
+     * * CONTAINER API *
+     */
+
+    @Override
+    public ListContainersCmd listContainersCmd() {
+        return new ListContainersCmdImpl(getDockerCmdExecFactory().createListContainersCmdExec());
+    }
+
+    @Override
+    public CreateContainerCmd createContainerCmd(String image) {
+        return new CreateContainerCmdImpl(getDockerCmdExecFactory().createCreateContainerCmdExec(), image);
+    }
+
+    @Override
+    public StartContainerCmd startContainerCmd(String containerId) {
+        return new StartContainerCmdImpl(getDockerCmdExecFactory().createStartContainerCmdExec(), containerId);
+    }
+
+    @Override
+    public InspectContainerCmd inspectContainerCmd(String containerId) {
+        return new InspectContainerCmdImpl(getDockerCmdExecFactory().createInspectContainerCmdExec(), containerId);
+    }
 
     @Override
     public ExecCreateCmd execCreateCmd(String containerId) {
         return new ExecCreateCmdImpl(getDockerCmdExecFactory().createExecCmdExec(), containerId);
     }
 
-	@Override
-	public RemoveContainerCmd removeContainerCmd(String containerId) {
-		return new RemoveContainerCmdImpl(getDockerCmdExecFactory()
-				.createRemoveContainerCmdExec(), containerId);
-	}
+    @Override
+    public RemoveContainerCmd removeContainerCmd(String containerId) {
+        return new RemoveContainerCmdImpl(getDockerCmdExecFactory().createRemoveContainerCmdExec(), containerId);
+    }
 
-	@Override
-	public WaitContainerCmd waitContainerCmd(String containerId) {
-		return new WaitContainerCmdImpl(getDockerCmdExecFactory()
-				.createWaitContainerCmdExec(), containerId);
-	}
+    @Override
+    public WaitContainerCmd waitContainerCmd(String containerId) {
+        return new WaitContainerCmdImpl(getDockerCmdExecFactory().createWaitContainerCmdExec(), containerId);
+    }
 
-	@Override
-	public AttachContainerCmd attachContainerCmd(String containerId) {
-		return new AttachContainerCmdImpl(getDockerCmdExecFactory()
-				.createAttachContainerCmdExec(), containerId);
-	}
+    @Override
+    public AttachContainerCmd attachContainerCmd(String containerId) {
+        return new AttachContainerCmdImpl(getDockerCmdExecFactory().createAttachContainerCmdExec(), containerId);
+    }
 
     @Override
     public ExecStartCmd execStartCmd(String containerId) {
@@ -248,114 +224,100 @@ public InspectExecCmd inspectExecCmd(String execId) {
     }
 
     @Override
-	public LogContainerCmd logContainerCmd(String containerId) {
-		return new LogContainerCmdImpl(getDockerCmdExecFactory()
-				.createLogContainerCmdExec(), containerId);
-	}
+    public LogContainerCmd logContainerCmd(String containerId) {
+        return new LogContainerCmdImpl(getDockerCmdExecFactory().createLogContainerCmdExec(), containerId);
+    }
 
-	@Override
-	public CopyFileFromContainerCmd copyFileFromContainerCmd(
-			String containerId, String resource) {
-		return new CopyFileFromContainerCmdImpl(getDockerCmdExecFactory()
-				.createCopyFileFromContainerCmdExec(), containerId, resource);
-	}
+    @Override
+    public CopyFileFromContainerCmd copyFileFromContainerCmd(String containerId, String resource) {
+        return new CopyFileFromContainerCmdImpl(getDockerCmdExecFactory().createCopyFileFromContainerCmdExec(),
+                containerId, resource);
+    }
 
-	@Override
-	public ContainerDiffCmd containerDiffCmd(String containerId) {
-		return new ContainerDiffCmdImpl(getDockerCmdExecFactory()
-				.createContainerDiffCmdExec(), containerId);
-	}
+    @Override
+    public ContainerDiffCmd containerDiffCmd(String containerId) {
+        return new ContainerDiffCmdImpl(getDockerCmdExecFactory().createContainerDiffCmdExec(), containerId);
+    }
 
-	@Override
-	public StopContainerCmd stopContainerCmd(String containerId) {
-		return new StopContainerCmdImpl(getDockerCmdExecFactory()
-				.createStopContainerCmdExec(), containerId);
-	}
+    @Override
+    public StopContainerCmd stopContainerCmd(String containerId) {
+        return new StopContainerCmdImpl(getDockerCmdExecFactory().createStopContainerCmdExec(), containerId);
+    }
 
-	@Override
-	public KillContainerCmd killContainerCmd(String containerId) {
-		return new KillContainerCmdImpl(getDockerCmdExecFactory()
-				.createKillContainerCmdExec(), containerId);
-	}
+    @Override
+    public KillContainerCmd killContainerCmd(String containerId) {
+        return new KillContainerCmdImpl(getDockerCmdExecFactory().createKillContainerCmdExec(), containerId);
+    }
 
-	@Override
-	public RestartContainerCmd restartContainerCmd(String containerId) {
-		return new RestartContainerCmdImpl(getDockerCmdExecFactory()
-				.createRestartContainerCmdExec(), containerId);
-	}
+    @Override
+    public RestartContainerCmd restartContainerCmd(String containerId) {
+        return new RestartContainerCmdImpl(getDockerCmdExecFactory().createRestartContainerCmdExec(), containerId);
+    }
 
-	@Override
-	public CommitCmd commitCmd(String containerId) {
-		return new CommitCmdImpl(getDockerCmdExecFactory()
-				.createCommitCmdExec(), containerId);
-	}
+    @Override
+    public CommitCmd commitCmd(String containerId) {
+        return new CommitCmdImpl(getDockerCmdExecFactory().createCommitCmdExec(), containerId);
+    }
 
     @Override
     public BuildImageCmd buildImageCmd() {
-        return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory()
-                .createBuildImageCmdExec()));
+        return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec()));
     }
 
-	@Override
-	public BuildImageCmd buildImageCmd(File dockerFileOrFolder) {
-		return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory()
-				.createBuildImageCmdExec(), dockerFileOrFolder));
-	}
+    @Override
+    public BuildImageCmd buildImageCmd(File dockerFileOrFolder) {
+        return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(),
+                dockerFileOrFolder));
+    }
 
     @Override
     public BuildImageCmd buildImageCmd(InputStream tarInputStream) {
-        return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory()
-				.createBuildImageCmdExec(), tarInputStream));
-    }
-
-	private BuildImageCmd augmentBuildImageCmd(BuildImageCmd buildImageCmd) {
-		final AuthConfigurations authConfigurations = dockerClientConfig.getAuthConfigurations();
-		if (!authConfigurations.getConfigs().isEmpty()) {
-			buildImageCmd.withBuildAuthConfigs(authConfigurations);
-		}
-
-		return buildImageCmd;
-	}
-
-	@Override
-	public TopContainerCmd topContainerCmd(String containerId) {
-		return new TopContainerCmdImpl(getDockerCmdExecFactory()
-				.createTopContainerCmdExec(), containerId);
-	}
-
-	@Override
-	public TagImageCmd tagImageCmd(String imageId, String repository, String tag) {
-		return new TagImageCmdImpl(getDockerCmdExecFactory()
-				.createTagImageCmdExec(), imageId, repository, tag);
-	}
-
-	@Override
-	public PauseContainerCmd pauseContainerCmd(String containerId) {
-		return new PauseContainerCmdImpl(getDockerCmdExecFactory()
-				.createPauseContainerCmdExec(), containerId);
-	}
-
-	@Override
-	public UnpauseContainerCmd unpauseContainerCmd(String containerId) {
-		return new UnpauseContainerCmdImpl(getDockerCmdExecFactory()
-				.createUnpauseContainerCmdExec(), containerId);
-	}
-
-	@Override
-	public EventsCmd eventsCmd(EventCallback eventCallback) {
-		return new EventsCmdImpl(getDockerCmdExecFactory()
-				.createEventsCmdExec(), eventCallback);
-	}
-	
-	@Override
+        return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(),
+                tarInputStream));
+    }
+
+    private BuildImageCmd augmentBuildImageCmd(BuildImageCmd buildImageCmd) {
+        final AuthConfigurations authConfigurations = dockerClientConfig.getAuthConfigurations();
+        if (!authConfigurations.getConfigs().isEmpty()) {
+            buildImageCmd.withBuildAuthConfigs(authConfigurations);
+        }
+
+        return buildImageCmd;
+    }
+
+    @Override
+    public TopContainerCmd topContainerCmd(String containerId) {
+        return new TopContainerCmdImpl(getDockerCmdExecFactory().createTopContainerCmdExec(), containerId);
+    }
+
+    @Override
+    public TagImageCmd tagImageCmd(String imageId, String repository, String tag) {
+        return new TagImageCmdImpl(getDockerCmdExecFactory().createTagImageCmdExec(), imageId, repository, tag);
+    }
+
+    @Override
+    public PauseContainerCmd pauseContainerCmd(String containerId) {
+        return new PauseContainerCmdImpl(getDockerCmdExecFactory().createPauseContainerCmdExec(), containerId);
+    }
+
+    @Override
+    public UnpauseContainerCmd unpauseContainerCmd(String containerId) {
+        return new UnpauseContainerCmdImpl(getDockerCmdExecFactory().createUnpauseContainerCmdExec(), containerId);
+    }
+
+    @Override
+    public EventsCmd eventsCmd(EventCallback eventCallback) {
+        return new EventsCmdImpl(getDockerCmdExecFactory().createEventsCmdExec(), eventCallback);
+    }
+
+    @Override
     public StatsCmd statsCmd(StatsCallback statsCallback) {
-	    return new StatsCmdImpl(getDockerCmdExecFactory()
-	            .createStatsCmdExec(), statsCallback);
-	}
-
-	@Override
-	public void close() throws IOException {
-		getDockerCmdExecFactory().close();
-	}
+        return new StatsCmdImpl(getDockerCmdExecFactory().createStatsCmdExec(), statsCallback);
+    }
+
+    @Override
+    public void close() throws IOException {
+        getDockerCmdExecFactory().close();
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/core/FilePathUtil.java b/src/main/java/com/github/dockerjava/core/FilePathUtil.java
index 3fc910217..317a55ed6 100644
--- a/src/main/java/com/github/dockerjava/core/FilePathUtil.java
+++ b/src/main/java/com/github/dockerjava/core/FilePathUtil.java
@@ -6,9 +6,12 @@
 public class FilePathUtil {
 
     /**
-     * Return the relative path. Path elements are separated with / char. 
-     * @param baseDir a parent directory of {@code file}
-     * @param file the file to get the relative path
+     * Return the relative path. Path elements are separated with / char.
+     * 
+     * @param baseDir
+     *            a parent directory of {@code file}
+     * @param file
+     *            the file to get the relative path
      * @return the relative path
      */
     public static String relativize(File baseDir, File file) {
diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index a84bce5bb..469beb40b 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -23,16 +23,16 @@
  *                  character class (must be non-empty)
  *       c           matches character c (c != '*', '?', '\\', '[')
  *       '\\' c      matches character c
- *
+ * 
  *   character-range:
  *       c           matches character c (c != '\\', '-', ']')
  *       '\\' c      matches character c
  *       lo '-' hi   matches character c for lo <= c <= hi
- *
+ * 
  *  Match requires pattern to match all of name, not just a substring.
  *  The only possible returned error is ErrBadPattern, when pattern
  *  is malformed.
- *
+ * 
  * On Windows, escaping is disabled. Instead, '\\' is treated as
  *  path separator.
  * </pre>
@@ -234,7 +234,9 @@ static GetEscResult getEsc(String chunk, int chunkOffset, int chunkLength) {
 
     private static final class ScanResult {
         public boolean star;
+
         public String chunk;
+
         public String pattern;
 
         public ScanResult(boolean star, String chunk, String pattern) {
@@ -246,6 +248,7 @@ public ScanResult(boolean star, String chunk, String pattern) {
 
     private static final class GetEscResult {
         public char lo;
+
         public int chunkOffset;
 
         public GetEscResult(char lo, int chunkOffset) {
diff --git a/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java b/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
index 33e0f2a47..c8d8e1044 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
@@ -10,10 +10,9 @@
 
 public class GoLangMatchFileFilter extends AbstractFileFilter {
 
-	private final File base;
-	
-    private final List<String> patterns;
+    private final File base;
 
+    private final List<String> patterns;
 
     public GoLangMatchFileFilter(File base, List<String> patterns) {
         super();
@@ -24,10 +23,9 @@ public GoLangMatchFileFilter(File base, List<String> patterns) {
     @Override
     public boolean accept(File file) {
         String relativePath = FilePathUtil.relativize(base, file);
-        
+
         boolean match = GoLangFileMatch.match(patterns, relativePath);
         return !match;
     }
 
-
 }
diff --git a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
index ec5a2ba8a..d7a17cfab 100644
--- a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
@@ -25,110 +25,109 @@
  */
 public class KeystoreSSLConfig implements SSLConfig, Serializable {
 
-  private final KeyStore keystore;
-  private final String keystorePassword;
-
-  /**
-   * @param keystore a KeyStore
-   * @param keystorePassword key password
-   */
-  public KeystoreSSLConfig(KeyStore keystore, String keystorePassword) {
-    this.keystorePassword = keystorePassword;
-    checkNotNull(keystore);
-    this.keystore = keystore;
-  }
-
-  /**
-   *
-   * @param pfxFile a PKCS12 file
-   * @param password Password for the keystore
-   * @throws KeyStoreException
-   * @throws IOException
-   * @throws CertificateException
-   * @throws NoSuchAlgorithmException
-   */
-  public KeystoreSSLConfig(File pfxFile, String password)
-      throws KeyStoreException, IOException, CertificateException, NoSuchAlgorithmException {
-    checkNotNull(pfxFile);
-    checkNotNull(password);
-    keystore = KeyStore.getInstance("pkcs12");
-    keystore.load(new FileInputStream(pfxFile), password.toCharArray());
-    keystorePassword = password;
-  }
-
-
-  /**
-   * Get the SSL Context out of the keystore.
-   * @return java SSLContext
-   * @throws KeyManagementException
-   * @throws UnrecoverableKeyException
-   * @throws NoSuchAlgorithmException
-   * @throws KeyStoreException
-   */
-  @Override
-  public SSLContext getSSLContext()
-      throws KeyManagementException, UnrecoverableKeyException, NoSuchAlgorithmException,
-             KeyStoreException {
-
-    final SSLContext context = SSLContext.getInstance("TLS");
-
-    String httpProtocols = System.getProperty("https.protocols");
-    System.setProperty("https.protocols", "TLSv1");
-
-    if (httpProtocols != null)
-      System.setProperty("https.protocols", httpProtocols);
-
-    final KeyManagerFactory
-        keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-    keyManagerFactory.init(keystore, keystorePassword.toCharArray());
-    context.init(keyManagerFactory.getKeyManagers(), new TrustManager[]{
-        new X509TrustManager() {
-          @Override
-          public X509Certificate[] getAcceptedIssuers() {
-            return new X509Certificate[]{};
-          }
-
-          @Override
-          public void checkClientTrusted(final X509Certificate[] arg0, final String arg1) {
-
-          }
-
-          @Override
-          public void checkServerTrusted(final X509Certificate[] arg0, final String arg1) {
-
-          }
-        }
-    }, new SecureRandom());
-
-    return context;
-  }
+    private final KeyStore keystore;
+
+    private final String keystorePassword;
+
+    /**
+     * @param keystore
+     *            a KeyStore
+     * @param keystorePassword
+     *            key password
+     */
+    public KeystoreSSLConfig(KeyStore keystore, String keystorePassword) {
+        this.keystorePassword = keystorePassword;
+        checkNotNull(keystore);
+        this.keystore = keystore;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    /**
+     *
+     * @param pfxFile
+     *            a PKCS12 file
+     * @param password
+     *            Password for the keystore
+     * @throws KeyStoreException
+     * @throws IOException
+     * @throws CertificateException
+     * @throws NoSuchAlgorithmException
+     */
+    public KeystoreSSLConfig(File pfxFile, String password) throws KeyStoreException, IOException,
+            CertificateException, NoSuchAlgorithmException {
+        checkNotNull(pfxFile);
+        checkNotNull(password);
+        keystore = KeyStore.getInstance("pkcs12");
+        keystore.load(new FileInputStream(pfxFile), password.toCharArray());
+        keystorePassword = password;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    /**
+     * Get the SSL Context out of the keystore.
+     * 
+     * @return java SSLContext
+     * @throws KeyManagementException
+     * @throws UnrecoverableKeyException
+     * @throws NoSuchAlgorithmException
+     * @throws KeyStoreException
+     */
+    @Override
+    public SSLContext getSSLContext() throws KeyManagementException, UnrecoverableKeyException,
+            NoSuchAlgorithmException, KeyStoreException {
+
+        final SSLContext context = SSLContext.getInstance("TLS");
+
+        String httpProtocols = System.getProperty("https.protocols");
+        System.setProperty("https.protocols", "TLSv1");
+
+        if (httpProtocols != null)
+            System.setProperty("https.protocols", httpProtocols);
+
+        final KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory
+                .getDefaultAlgorithm());
+        keyManagerFactory.init(keystore, keystorePassword.toCharArray());
+        context.init(keyManagerFactory.getKeyManagers(), new TrustManager[] { new X509TrustManager() {
+            @Override
+            public X509Certificate[] getAcceptedIssuers() {
+                return new X509Certificate[] {};
+            }
+
+            @Override
+            public void checkClientTrusted(final X509Certificate[] arg0, final String arg1) {
+
+            }
+
+            @Override
+            public void checkServerTrusted(final X509Certificate[] arg0, final String arg1) {
+
+            }
+        } }, new SecureRandom());
+
+        return context;
     }
 
-    KeystoreSSLConfig that = (KeystoreSSLConfig) o;
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 
-    return keystore.equals(that.keystore);
+        KeystoreSSLConfig that = (KeystoreSSLConfig) o;
 
-  }
+        return keystore.equals(that.keystore);
 
-  @Override
-  public int hashCode() {
-    return keystore.hashCode();
-  }
+    }
+
+    @Override
+    public int hashCode() {
+        return keystore.hashCode();
+    }
 
-  @Override
-  public String toString() {
-    return new StringBuilder()
-        .append(this.getClass().getSimpleName()).append("{")
-            .append("keystore=").append(keystore)
-        .append("}")
-        .toString();
-  }
+    @Override
+    public String toString() {
+        return new StringBuilder().append(this.getClass().getSimpleName()).append("{").append("keystore=")
+                .append(keystore).append("}").toString();
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
index bafe62212..44310e9ce 100644
--- a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
@@ -12,88 +12,83 @@
 
 import com.github.dockerjava.api.DockerClientException;
 
-
 /**
  * SSL Config from local files.
  */
 public class LocalDirectorySSLConfig implements SSLConfig, Serializable {
 
-  private final String dockerCertPath;
+    private final String dockerCertPath;
 
-  public LocalDirectorySSLConfig(String dockerCertPath) {
-    checkNotNull(dockerCertPath);
-    this.dockerCertPath = dockerCertPath;
-  }
+    public LocalDirectorySSLConfig(String dockerCertPath) {
+        checkNotNull(dockerCertPath);
+        this.dockerCertPath = dockerCertPath;
+    }
 
-  public String getDockerCertPath() {
-    return dockerCertPath;
-  }
+    public String getDockerCertPath() {
+        return dockerCertPath;
+    }
 
-  @Override
-  public SSLContext getSSLContext() {
+    @Override
+    public SSLContext getSSLContext() {
 
-    boolean certificatesExist = CertificateUtils.verifyCertificatesExist(dockerCertPath);
+        boolean certificatesExist = CertificateUtils.verifyCertificatesExist(dockerCertPath);
 
-    if (certificatesExist) {
+        if (certificatesExist) {
 
-      try {
+            try {
 
-        Security.addProvider(new BouncyCastleProvider());
+                Security.addProvider(new BouncyCastleProvider());
 
-        // properties acrobatics not needed for java > 1.6
-        String httpProtocols = System.getProperty("https.protocols");
-        System.setProperty("https.protocols", "TLSv1");
-        SslConfigurator sslConfig = SslConfigurator.newInstance(true);
-        if (httpProtocols != null) {
-          System.setProperty("https.protocols", httpProtocols);
-        }
+                // properties acrobatics not needed for java > 1.6
+                String httpProtocols = System.getProperty("https.protocols");
+                System.setProperty("https.protocols", "TLSv1");
+                SslConfigurator sslConfig = SslConfigurator.newInstance(true);
+                if (httpProtocols != null) {
+                    System.setProperty("https.protocols", httpProtocols);
+                }
 
-        sslConfig.keyStore(CertificateUtils.createKeyStore(dockerCertPath));
-        sslConfig.keyStorePassword("docker");
-        sslConfig.trustStore(CertificateUtils.createTrustStore(dockerCertPath));
+                sslConfig.keyStore(CertificateUtils.createKeyStore(dockerCertPath));
+                sslConfig.keyStorePassword("docker");
+                sslConfig.trustStore(CertificateUtils.createTrustStore(dockerCertPath));
 
-        return sslConfig.createSSLContext();
+                return sslConfig.createSSLContext();
 
+            } catch (Exception e) {
+                throw new DockerClientException(e.getMessage(), e);
+            }
 
-      } catch (Exception e) {
-        throw new DockerClientException(e.getMessage(), e);
-      }
+        }
+
+        return null;
 
     }
 
-    return null;
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 
-  }
+        LocalDirectorySSLConfig that = (LocalDirectorySSLConfig) o;
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
+        if (!dockerCertPath.equals(that.dockerCertPath)) {
+            return false;
+        }
 
-    LocalDirectorySSLConfig that = (LocalDirectorySSLConfig) o;
+        return true;
+    }
 
-    if (!dockerCertPath.equals(that.dockerCertPath)) {
-      return false;
+    @Override
+    public int hashCode() {
+        return dockerCertPath.hashCode();
     }
 
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return dockerCertPath.hashCode();
-  }
-
-  @Override
-  public String toString() {
-    return new StringBuilder()
-        .append(this.getClass().getSimpleName()).append("{")
-            .append("dockerCertPath=").append(dockerCertPath)
-        .append("}")
-        .toString();
-  }
+    @Override
+    public String toString() {
+        return new StringBuilder().append(this.getClass().getSimpleName()).append("{").append("dockerCertPath=")
+                .append(dockerCertPath).append("}").toString();
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/NameParser.java b/src/main/java/com/github/dockerjava/core/NameParser.java
index 6b1654081..2bd99bf31 100644
--- a/src/main/java/com/github/dockerjava/core/NameParser.java
+++ b/src/main/java/com/github/dockerjava/core/NameParser.java
@@ -10,7 +10,9 @@
 public class NameParser {
 
     private static final Pattern VALID_HEX_PATTERN = Pattern.compile("^([a-f0-9]{64})$");
+
     private static final Pattern VALID_NAMESPACE_PATTERN = Pattern.compile("^([a-z0-9_]{4,30})$");
+
     private static final Pattern VALID_REPO_PATTERN = Pattern.compile("^([a-z0-9-_.]+)$");
 
     public static ReposTag parseRepositoryTag(String name) {
@@ -27,6 +29,7 @@ public static ReposTag parseRepositoryTag(String name) {
 
     public static class ReposTag {
         public final String repos;
+
         public final String tag;
 
         public ReposTag(String repos, String tag) {
@@ -44,18 +47,15 @@ public static void validateRepositoryName(String repositoryName) {
             name = nameParts[0];
             if (VALID_HEX_PATTERN.matcher(name).matches()) {
                 throw new InvalidRepositoryNameException(String.format(
-                        "Invalid repository name (%s), cannot specify 64-byte hexadecimal strings",
-                        name));
+                        "Invalid repository name (%s), cannot specify 64-byte hexadecimal strings", name));
             }
         } else {
             namespace = nameParts[0];
             name = nameParts[1];
         }
         if (!VALID_NAMESPACE_PATTERN.matcher(namespace).matches()) {
-            throw new InvalidRepositoryNameException(
-                    String.format(
-                            "Invalid namespace name (%s), only [a-z0-9_] are allowed, size between 4 and 30",
-                            namespace));
+            throw new InvalidRepositoryNameException(String.format(
+                    "Invalid namespace name (%s), only [a-z0-9_] are allowed, size between 4 and 30", namespace));
         }
         if (!VALID_REPO_PATTERN.matcher(name).matches()) {
             throw new InvalidRepositoryNameException(String.format(
@@ -71,16 +71,15 @@ public static HostnameReposName resolveRepositoryName(String reposName) {
 
         String[] nameParts = reposName.split("/", 2);
         if (nameParts.length == 1
-                || (!nameParts[0].contains(".") && !nameParts[0].contains(":") && !nameParts[0]
-                        .equals("localhost"))) {
+                || (!nameParts[0].contains(".") && !nameParts[0].contains(":") && !nameParts[0].equals("localhost"))) {
             return new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, reposName);
         }
 
         String hostname = nameParts[0];
         reposName = nameParts[1];
         if (hostname.contains("index.docker.io")) {
-            throw new InvalidRepositoryNameException(String.format(
-                    "Invalid repository name, try \"%s\" instead", reposName));
+            throw new InvalidRepositoryNameException(String.format("Invalid repository name, try \"%s\" instead",
+                    reposName));
         }
 
         validateRepositoryName(reposName);
@@ -89,6 +88,7 @@ public static HostnameReposName resolveRepositoryName(String reposName) {
 
     public static class HostnameReposName {
         public final String hostname;
+
         public final String reposName;
 
         public HostnameReposName(String hostname, String reposName) {
diff --git a/src/main/java/com/github/dockerjava/core/SSLConfig.java b/src/main/java/com/github/dockerjava/core/SSLConfig.java
index ab6394890..247e21b1f 100644
--- a/src/main/java/com/github/dockerjava/core/SSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/SSLConfig.java
@@ -9,11 +9,11 @@
  */
 public interface SSLConfig {
 
-  /**
-   * Get the SSL Context, from wherever it comes (file, keystore).
-   * @return an SSL context.
-   */
-  SSLContext getSSLContext()
-      throws KeyManagementException, UnrecoverableKeyException, NoSuchAlgorithmException,
-             KeyStoreException;
+    /**
+     * Get the SSL Context, from wherever it comes (file, keystore).
+     * 
+     * @return an SSL context.
+     */
+    SSLContext getSSLContext() throws KeyManagementException, UnrecoverableKeyException, NoSuchAlgorithmException,
+            KeyStoreException;
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
index 31259f1f0..7e9957cbf 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
@@ -11,41 +11,40 @@
 import com.github.dockerjava.api.command.DockerCmdExec;
 import com.github.dockerjava.api.model.AuthConfig;
 
-public abstract class AbstrAuthCfgDockerCmd<T extends DockerCmd<RES_T>, RES_T> extends
-		AbstrDockerCmd<T, RES_T> {
-
-	public AbstrAuthCfgDockerCmd(DockerCmdExec<T, RES_T> execution, AuthConfig authConfig) {
-		super(execution);
-		withOptionalAuthConfig(authConfig);
-	}
-
-	public AbstrAuthCfgDockerCmd(DockerCmdExec<T, RES_T> execution) {
-		super(execution);
-	}
-
-	private AuthConfig authConfig;
-	
-	public AuthConfig getAuthConfig() {
-		return authConfig;
-	}
-
-	public T withAuthConfig(AuthConfig authConfig) {
-		checkNotNull(authConfig, "authConfig was not specified");
-		return withOptionalAuthConfig(authConfig);
-	}
-
-	@SuppressWarnings("unchecked")
-	private T withOptionalAuthConfig(AuthConfig authConfig) {
-		this.authConfig = authConfig;
-		return (T)this;
-	}
-	
-	protected String registryAuth() {
-		try {
-			return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfig).getBytes());
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
+public abstract class AbstrAuthCfgDockerCmd<T extends DockerCmd<RES_T>, RES_T> extends AbstrDockerCmd<T, RES_T> {
+
+    public AbstrAuthCfgDockerCmd(DockerCmdExec<T, RES_T> execution, AuthConfig authConfig) {
+        super(execution);
+        withOptionalAuthConfig(authConfig);
+    }
+
+    public AbstrAuthCfgDockerCmd(DockerCmdExec<T, RES_T> execution) {
+        super(execution);
+    }
+
+    private AuthConfig authConfig;
+
+    public AuthConfig getAuthConfig() {
+        return authConfig;
+    }
+
+    public T withAuthConfig(AuthConfig authConfig) {
+        checkNotNull(authConfig, "authConfig was not specified");
+        return withOptionalAuthConfig(authConfig);
+    }
+
+    @SuppressWarnings("unchecked")
+    private T withOptionalAuthConfig(AuthConfig authConfig) {
+        this.authConfig = authConfig;
+        return (T) this;
+    }
+
+    protected String registryAuth() {
+        try {
+            return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfig).getBytes());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
index 751b02cb6..069fba09e 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
@@ -12,23 +12,24 @@
 import com.github.dockerjava.api.command.DockerCmdExec;
 
 public abstract class AbstrDockerCmd<CMD_T extends DockerCmd<RES_T>, RES_T> implements DockerCmd<RES_T> {
-    
+
     private final static Logger LOGGER = LoggerFactory.getLogger(AbstrDockerCmd.class);
 
-	protected DockerCmdExec<CMD_T, RES_T> execution;
-	
-	public AbstrDockerCmd(DockerCmdExec<CMD_T, RES_T> execution) {
-		checkNotNull(execution, "execution was not specified");
-		this.execution = execution;
-	}
+    protected DockerCmdExec<CMD_T, RES_T> execution;
+
+    public AbstrDockerCmd(DockerCmdExec<CMD_T, RES_T> execution) {
+        checkNotNull(execution, "execution was not specified");
+        this.execution = execution;
+    }
 
     @Override
     @SuppressWarnings("unchecked")
-	public RES_T exec() throws DockerException {
-		LOGGER.debug("Cmd: {}", this);
-		return execution.exec((CMD_T)this);
-	}
+    public RES_T exec() throws DockerException {
+        LOGGER.debug("Cmd: {}", this);
+        return execution.exec((CMD_T) this);
+    }
 
     @Override
-	public void close() throws IOException {}
+    public void close() throws IOException {
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
index fc38ae7d9..e2e7a3516 100644
--- a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
@@ -20,112 +20,113 @@
  * @param stderr
  *            - true or false, includes stderr log. Defaults to false.
  * @param timestamps
- *            - true or false, if true, print timestamps for every log line.
- *            Defaults to false.
+ *            - true or false, if true, print timestamps for every log line. Defaults to false.
  */
-public class AttachContainerCmdImpl extends	AbstrDockerCmd<AttachContainerCmd, InputStream> implements AttachContainerCmd {
-
-	private String containerId;
-
-	private boolean logs, followStream, timestamps, stdout, stderr;
-
-	public AttachContainerCmdImpl(AttachContainerCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
-
-	@Override
-	public String getContainerId() {
-		return containerId;
-	}
-
-	@Override
-	public boolean hasLogsEnabled() {
-		return logs;
-	}
-
-	@Override
-	public boolean hasFollowStreamEnabled() {
-		return followStream;
-	}
-
-	@Override
-	public boolean hasTimestampsEnabled() {
-		return timestamps;
-	}
-
-	@Override
-	public boolean hasStdoutEnabled() {
-		return stdout;
-	}
-
-	@Override
-	public boolean hasStderrEnabled() {
-		return stderr;
-	}
-
-	@Override
-	public AttachContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
-
-	@Override
-	public AttachContainerCmd withFollowStream() {
-		return withFollowStream(true);
-	}
-
-	@Override
-	public AttachContainerCmd withFollowStream(boolean followStream) {
-		this.followStream = followStream;
-		return this;
-	}
-
-	@Override
-	public AttachContainerCmd withTimestamps(boolean timestamps) {
-		this.timestamps = timestamps;
-		return this;
-	}
-
-	@Override
-	public AttachContainerCmd withStdOut() {
-		return withStdOut(true);
-	}
-
-	@Override
-	public AttachContainerCmd withStdOut(boolean stdout) {
-		this.stdout = stdout;
-		return this;
-	}
-
-	@Override
-	public AttachContainerCmd withStdErr() {
-		return withStdErr(true);
-	}
-
-	@Override
-	public AttachContainerCmd withStdErr(boolean stderr) {
-		this.stderr = stderr;
-		return this;
-	}
-
-	@Override
-	public AttachContainerCmd withLogs(boolean logs) {
-		this.logs = logs;
-		return this;
-	}
-	
-	@Override
-	public AttachContainerCmd withLogs() {
-		return withLogs(true);
-	}
-	
-	/**
-	 * @throws NotFoundException No such container 
-	 */
-	@Override
-	public InputStream exec() throws NotFoundException {
-		return super.exec();
-	}
+public class AttachContainerCmdImpl extends AbstrDockerCmd<AttachContainerCmd, InputStream> implements
+        AttachContainerCmd {
+
+    private String containerId;
+
+    private boolean logs, followStream, timestamps, stdout, stderr;
+
+    public AttachContainerCmdImpl(AttachContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
+
+    @Override
+    public String getContainerId() {
+        return containerId;
+    }
+
+    @Override
+    public boolean hasLogsEnabled() {
+        return logs;
+    }
+
+    @Override
+    public boolean hasFollowStreamEnabled() {
+        return followStream;
+    }
+
+    @Override
+    public boolean hasTimestampsEnabled() {
+        return timestamps;
+    }
+
+    @Override
+    public boolean hasStdoutEnabled() {
+        return stdout;
+    }
+
+    @Override
+    public boolean hasStderrEnabled() {
+        return stderr;
+    }
+
+    @Override
+    public AttachContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
+
+    @Override
+    public AttachContainerCmd withFollowStream() {
+        return withFollowStream(true);
+    }
+
+    @Override
+    public AttachContainerCmd withFollowStream(boolean followStream) {
+        this.followStream = followStream;
+        return this;
+    }
+
+    @Override
+    public AttachContainerCmd withTimestamps(boolean timestamps) {
+        this.timestamps = timestamps;
+        return this;
+    }
+
+    @Override
+    public AttachContainerCmd withStdOut() {
+        return withStdOut(true);
+    }
+
+    @Override
+    public AttachContainerCmd withStdOut(boolean stdout) {
+        this.stdout = stdout;
+        return this;
+    }
+
+    @Override
+    public AttachContainerCmd withStdErr() {
+        return withStdErr(true);
+    }
+
+    @Override
+    public AttachContainerCmd withStdErr(boolean stderr) {
+        this.stderr = stderr;
+        return this;
+    }
+
+    @Override
+    public AttachContainerCmd withLogs(boolean logs) {
+        this.logs = logs;
+        return this;
+    }
+
+    @Override
+    public AttachContainerCmd withLogs() {
+        return withLogs(true);
+    }
+
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public InputStream exec() throws NotFoundException {
+        return super.exec();
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
index 0da0da3c3..73c716c14 100644
--- a/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
@@ -12,18 +12,18 @@
  */
 public class AuthCmdImpl extends AbstrAuthCfgDockerCmd<AuthCmd, AuthResponse> implements AuthCmd {
 
-	public AuthCmdImpl(AuthCmd.Exec exec, AuthConfig authConfig) {
-		super(exec);
-		withAuthConfig(authConfig);
-	}
+    public AuthCmdImpl(AuthCmd.Exec exec, AuthConfig authConfig) {
+        super(exec);
+        withAuthConfig(authConfig);
+    }
 
-	@Override
-	public AuthResponse exec() throws UnauthorizedException {
-		return super.exec();
-	}
+    @Override
+    public AuthResponse exec() throws UnauthorizedException {
+        return super.exec();
+    }
 
-	@Override
-	public String toString() {
-		return "authenticate using " + this.getAuthConfig();
-	}
+    @Override
+    public String toString() {
+        return "authenticate using " + this.getAuthConfig();
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index ef0242857..f61d3b7ac 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -18,16 +18,22 @@
  */
 public class BuildImageCmdImpl extends AbstrDockerCmd<BuildImageCmd, BuildImageCmd.Response> implements BuildImageCmd {
 
+    private InputStream tarInputStream = null;
+
+    private String tag;
+
+    private boolean noCache;
+
+    private boolean remove = true;
+
+    private boolean quiet;
+
+    private boolean pull;
+
+    private AuthConfigurations buildAuthConfigs;
 
-	private InputStream tarInputStream = null;
-	private String tag;
-	private boolean noCache;
-	private boolean remove = true;
-	private boolean quiet;
-	private boolean pull;
-	
-	private AuthConfigurations buildAuthConfigs;
     private File dockerFile;
+
     private File baseDirectory;
 
     public BuildImageCmdImpl(BuildImageCmd.Exec exec) {
@@ -35,48 +41,43 @@ public BuildImageCmdImpl(BuildImageCmd.Exec exec) {
     }
 
     public BuildImageCmdImpl(BuildImageCmd.Exec exec, File dockerFileOrFolder) {
-		super(exec);
-		checkNotNull(dockerFileOrFolder, "dockerFolder is null");
+        super(exec);
+        checkNotNull(dockerFileOrFolder, "dockerFolder is null");
 
-        if( dockerFileOrFolder.isDirectory() ) {
+        if (dockerFileOrFolder.isDirectory()) {
             withBaseDirectory(dockerFileOrFolder);
             withDockerfile(new File(dockerFileOrFolder, "Dockerfile"));
-        }
-        else {
+        } else {
             withDockerfile(dockerFileOrFolder);
         }
-	}
+    }
 
-	public BuildImageCmdImpl(BuildImageCmd.Exec exec, InputStream tarInputStream) {
-		super(exec);
-		checkNotNull(tarInputStream, "tarInputStream is null");
-		withTarInputStream(tarInputStream);
-	}
+    public BuildImageCmdImpl(BuildImageCmd.Exec exec, InputStream tarInputStream) {
+        super(exec);
+        checkNotNull(tarInputStream, "tarInputStream is null");
+        withTarInputStream(tarInputStream);
+    }
 
-	@Override
-	public InputStream getTarInputStream() {
-		return tarInputStream;
-	}
+    @Override
+    public InputStream getTarInputStream() {
+        return tarInputStream;
+    }
 
     @Override
     public BuildImageCmdImpl withDockerfile(File dockerfile) {
         checkNotNull(dockerfile);
-        if( !dockerfile.exists() )
+        if (!dockerfile.exists())
             throw new IllegalArgumentException("Dockerfile does not exist");
-        if( !dockerfile.isFile() )
+        if (!dockerfile.isFile())
             throw new IllegalArgumentException("Not a directory");
 
-        if( baseDirectory == null )
+        if (baseDirectory == null)
             withBaseDirectory(dockerfile.getParentFile());
 
-
         this.dockerFile = dockerfile;
 
         try {
-            withTarInputStream(
-                    new Dockerfile(dockerfile)
-                            .parse()
-                            .buildDockerFolderTar(baseDirectory) );
+            withTarInputStream(new Dockerfile(dockerfile).parse().buildDockerFolderTar(baseDirectory));
         } catch (IOException e) {
             // we just created the file this should never happen.
             throw new RuntimeException(e);
@@ -84,44 +85,44 @@ public BuildImageCmdImpl withDockerfile(File dockerfile) {
         return this;
     }
 
-	@Override
-	public BuildImageCmdImpl withTarInputStream(InputStream tarInputStream) {
-		checkNotNull(tarInputStream, "tarInputStream is null");
-		this.tarInputStream = tarInputStream;
-		return this;
-	}
-
-	@Override
-	public BuildImageCmdImpl withTag(String tag) {
-		checkNotNull(tag, "Tag is null");
-		this.tag = tag;
-		return this;
-	}
-
-	@Override
-	public String getTag() {
-		return tag;
-	}
-
-	@Override
-	public boolean hasNoCacheEnabled() {
-		return noCache;
-	}
-
-	@Override
-	public boolean hasRemoveEnabled() {
-		return remove;
-	}
-
-	@Override
-	public boolean isQuiet() {
-		return quiet;
-	}
-	
-	@Override
-	public boolean hasPullEnabled() {
-		return pull;
-	}
+    @Override
+    public BuildImageCmdImpl withTarInputStream(InputStream tarInputStream) {
+        checkNotNull(tarInputStream, "tarInputStream is null");
+        this.tarInputStream = tarInputStream;
+        return this;
+    }
+
+    @Override
+    public BuildImageCmdImpl withTag(String tag) {
+        checkNotNull(tag, "Tag is null");
+        this.tag = tag;
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return tag;
+    }
+
+    @Override
+    public boolean hasNoCacheEnabled() {
+        return noCache;
+    }
+
+    @Override
+    public boolean hasRemoveEnabled() {
+        return remove;
+    }
+
+    @Override
+    public boolean isQuiet() {
+        return quiet;
+    }
+
+    @Override
+    public boolean hasPullEnabled() {
+        return pull;
+    }
 
     @Override
     public String getPathToDockerfile() {
@@ -133,9 +134,9 @@ public String getPathToDockerfile() {
     }
 
     @Override
-	public AuthConfigurations getBuildAuthConfigs() {
-		return buildAuthConfigs;
-	}
+    public AuthConfigurations getBuildAuthConfigs() {
+        return buildAuthConfigs;
+    }
 
     @Override
     public BuildImageCmd withBaseDirectory(File baseDirectory) {
@@ -144,71 +145,68 @@ public BuildImageCmd withBaseDirectory(File baseDirectory) {
     }
 
     @Override
-	public BuildImageCmdImpl withNoCache() {
-		return withNoCache(true);
-	}
-
-	@Override
-	public BuildImageCmdImpl withNoCache(boolean noCache) {
-		this.noCache = noCache;
-		return this;
-	}
-
-	@Override
-	public BuildImageCmdImpl withRemove() {
-		return withRemove(true);
-	}
-
-	@Override
-	public BuildImageCmdImpl withRemove(boolean rm) {
-		this.remove = rm;
-		return this;
-	}
-
-	@Override
-	public BuildImageCmdImpl withQuiet() {
-		return withQuiet(true);
-	}
-
-	@Override
-	public BuildImageCmdImpl withQuiet(boolean quiet) {
-		this.quiet = quiet;
-		return this;
-	}
-	
-	@Override
-	public BuildImageCmdImpl withPull() {
-		return withPull(true);
-	}
-
-	@Override
-	public BuildImageCmdImpl withPull(boolean pull) {
-		this.pull = pull;
-		return this;
-	}
-
-	@Override
-	public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfigs) {
-		checkNotNull(authConfigs, "authConfig is null");
-		this.buildAuthConfigs = authConfigs;
-		return this;
-	}
-
-	@Override
-	public void close() throws IOException {
-		super.close();
-
-		tarInputStream.close();
-	}
-
-	@Override
-	public String toString() {
-		return new StringBuilder("build ")
-				.append(tag != null ? "-t " + tag + " " : "")
-				.append(noCache ? "--nocache=true " : "")
-				.append(quiet ? "--quiet=true " : "")
-				.append(!remove ? "--rm=false " : "").toString();
-	}
+    public BuildImageCmdImpl withNoCache() {
+        return withNoCache(true);
+    }
+
+    @Override
+    public BuildImageCmdImpl withNoCache(boolean noCache) {
+        this.noCache = noCache;
+        return this;
+    }
+
+    @Override
+    public BuildImageCmdImpl withRemove() {
+        return withRemove(true);
+    }
 
+    @Override
+    public BuildImageCmdImpl withRemove(boolean rm) {
+        this.remove = rm;
+        return this;
+    }
+
+    @Override
+    public BuildImageCmdImpl withQuiet() {
+        return withQuiet(true);
+    }
+
+    @Override
+    public BuildImageCmdImpl withQuiet(boolean quiet) {
+        this.quiet = quiet;
+        return this;
+    }
+
+    @Override
+    public BuildImageCmdImpl withPull() {
+        return withPull(true);
+    }
+
+    @Override
+    public BuildImageCmdImpl withPull(boolean pull) {
+        this.pull = pull;
+        return this;
+    }
+
+    @Override
+    public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfigs) {
+        checkNotNull(authConfigs, "authConfig is null");
+        this.buildAuthConfigs = authConfigs;
+        return this;
+    }
+
+    @Override
+    public void close() throws IOException {
+        super.close();
+
+        tarInputStream.close();
+    }
+
+    @Override
+    public String toString() {
+        return new StringBuilder("build ").append(tag != null ? "-t " + tag + " " : "")
+                .append(noCache ? "--nocache=true " : "").append(quiet ? "--quiet=true " : "")
+                .append(!remove ? "--rm=false " : "").toString();
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
index 55fe5e2e2..497d08c3f 100644
--- a/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
@@ -10,7 +10,6 @@
 import com.github.dockerjava.api.model.ExposedPorts;
 import com.github.dockerjava.api.model.Volumes;
 
-
 /**
  *
  * Create a new image from a container's changes. Returns the new image ID.
@@ -18,11 +17,11 @@
  */
 public class CommitCmdImpl extends AbstrDockerCmd<CommitCmd, String> implements CommitCmd {
 
-	private String containerId, repository, tag, message, author;
+    private String containerId, repository, tag, message, author;
 
-	private boolean pause = true;
+    private boolean pause = true;
 
-	@JsonProperty("AttachStdin")
+    @JsonProperty("AttachStdin")
     private boolean attachStdin;
 
     @JsonProperty("AttachStdout")
@@ -73,299 +72,293 @@ public class CommitCmdImpl extends AbstrDockerCmd<CommitCmd, String> implements
     @JsonProperty("WorkingDir")
     private String workingDir;
 
-
-	public CommitCmdImpl(CommitCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public CommitCmdImpl(CommitCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public CommitCmdImpl withContainerId(String containerId) {
+    public CommitCmdImpl withContainerId(String containerId) {
         checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
-
+        this.containerId = containerId;
+        return this;
+    }
 
     @Override
-	public String getRepository() {
+    public String getRepository() {
         return repository;
     }
 
     @Override
-	public String getTag() {
+    public String getTag() {
         return tag;
     }
 
     @Override
-	public String getMessage() {
+    public String getMessage() {
         return message;
     }
 
     @Override
-	public String getAuthor() {
+    public String getAuthor() {
         return author;
     }
 
     @Override
-	public boolean hasPauseEnabled() {
+    public boolean hasPauseEnabled() {
         return pause;
     }
 
-	@Override
-	public CommitCmdImpl withAttachStderr(boolean attachStderr) {
-		this.attachStderr = attachStderr;
-		return this;
-	}
-
-	@Override
-	public CommitCmdImpl withAttachStderr() {
-		return withAttachStderr(true);
-	}
-
-	@Override
-	public CommitCmdImpl withAttachStdin(boolean attachStdin) {
-		this.attachStdin = attachStdin;
-		return this;
-	}
-
-	@Override
-	public CommitCmdImpl withAttachStdin() {
-		return withAttachStdin(true);
-	}
-
-	@Override
-	public CommitCmdImpl withAttachStdout(boolean attachStdout) {
-		this.attachStdout = attachStdout;
-		return this;
-	}
-
-	@Override
-	public CommitCmdImpl withAttachStdout() {
-		return withAttachStdout(true);
-	}
-
-	@Override
-	public CommitCmdImpl withCmd(String... cmd) {
+    @Override
+    public CommitCmdImpl withAttachStderr(boolean attachStderr) {
+        this.attachStderr = attachStderr;
+        return this;
+    }
+
+    @Override
+    public CommitCmdImpl withAttachStderr() {
+        return withAttachStderr(true);
+    }
+
+    @Override
+    public CommitCmdImpl withAttachStdin(boolean attachStdin) {
+        this.attachStdin = attachStdin;
+        return this;
+    }
+
+    @Override
+    public CommitCmdImpl withAttachStdin() {
+        return withAttachStdin(true);
+    }
+
+    @Override
+    public CommitCmdImpl withAttachStdout(boolean attachStdout) {
+        this.attachStdout = attachStdout;
+        return this;
+    }
+
+    @Override
+    public CommitCmdImpl withAttachStdout() {
+        return withAttachStdout(true);
+    }
+
+    @Override
+    public CommitCmdImpl withCmd(String... cmd) {
         checkNotNull(cmd, "cmd was not specified");
-		this.cmd = cmd;
-		return this;
-	}
-
-	@Override
-	public CommitCmdImpl withDisableNetwork(boolean disableNetwork) {
-		this.disableNetwork = disableNetwork;
-		return this;
-	}
-
-	@Override
-	public CommitCmdImpl withAuthor(String author) {
+        this.cmd = cmd;
+        return this;
+    }
+
+    @Override
+    public CommitCmdImpl withDisableNetwork(boolean disableNetwork) {
+        this.disableNetwork = disableNetwork;
+        return this;
+    }
+
+    @Override
+    public CommitCmdImpl withAuthor(String author) {
         checkNotNull(author, "author was not specified");
-		this.author = author;
-		return this;
-	}
+        this.author = author;
+        return this;
+    }
 
-	@Override
-	public CommitCmdImpl withMessage(String message) {
+    @Override
+    public CommitCmdImpl withMessage(String message) {
         checkNotNull(message, "message was not specified");
-		this.message = message;
-		return this;
-	}
+        this.message = message;
+        return this;
+    }
 
-	@Override
-	public CommitCmdImpl withTag(String tag) {
+    @Override
+    public CommitCmdImpl withTag(String tag) {
         checkNotNull(tag, "tag was not specified");
-		this.tag = tag;
-		return this;
-	}
+        this.tag = tag;
+        return this;
+    }
 
-	@Override
-	public CommitCmdImpl withRepository(String repository) {
+    @Override
+    public CommitCmdImpl withRepository(String repository) {
         checkNotNull(repository, "repository was not specified");
-		this.repository = repository;
-		return this;
-	}
-
-	@Override
-	public CommitCmdImpl withPause(boolean pause) {
-		this.pause = pause;
-		return this;
-	}
-	
-	@Override
-	public String[] getEnv() {
+        this.repository = repository;
+        return this;
+    }
+
+    @Override
+    public CommitCmdImpl withPause(boolean pause) {
+        this.pause = pause;
+        return this;
+    }
+
+    @Override
+    public String[] getEnv() {
         return env;
     }
 
     @Override
-	public CommitCmdImpl withEnv(String... env) {
+    public CommitCmdImpl withEnv(String... env) {
         checkNotNull(env, "env was not specified");
         this.env = env;
         return this;
     }
 
     @Override
-	public ExposedPorts getExposedPorts() {
+    public ExposedPorts getExposedPorts() {
         return exposedPorts;
     }
 
     @Override
-	public CommitCmdImpl withExposedPorts(ExposedPorts exposedPorts) {
+    public CommitCmdImpl withExposedPorts(ExposedPorts exposedPorts) {
         checkNotNull(exposedPorts, "exposedPorts was not specified");
         this.exposedPorts = exposedPorts;
         return this;
     }
 
     @Override
-	public String getHostname() {
+    public String getHostname() {
         return hostname;
     }
 
     @Override
-	public CommitCmdImpl withHostname(String hostname) {
+    public CommitCmdImpl withHostname(String hostname) {
         checkNotNull(hostname, "hostname was not specified");
         this.hostname = hostname;
         return this;
     }
 
     @Override
-	public Integer getMemory() {
+    public Integer getMemory() {
         return memory;
     }
 
     @Override
-	public CommitCmdImpl withMemory(Integer memory) {
+    public CommitCmdImpl withMemory(Integer memory) {
         checkNotNull(memory, "memory was not specified");
         this.memory = memory;
         return this;
     }
 
     @Override
-	public Integer getMemorySwap() {
+    public Integer getMemorySwap() {
         return memorySwap;
     }
 
     @Override
-	public CommitCmdImpl withMemorySwap(Integer memorySwap) {
+    public CommitCmdImpl withMemorySwap(Integer memorySwap) {
         checkNotNull(memorySwap, "memorySwap was not specified");
         this.memorySwap = memorySwap;
         return this;
     }
 
     @Override
-	public boolean isOpenStdin() {
+    public boolean isOpenStdin() {
         return openStdin;
     }
 
     @Override
-	public CommitCmdImpl withOpenStdin(boolean openStdin) {
-    	checkNotNull(openStdin, "openStdin was not specified");
+    public CommitCmdImpl withOpenStdin(boolean openStdin) {
+        checkNotNull(openStdin, "openStdin was not specified");
         this.openStdin = openStdin;
         return this;
     }
-    
+
     @Override
-	public String[] getPortSpecs() {
+    public String[] getPortSpecs() {
         return portSpecs;
     }
 
     @Override
-	public CommitCmdImpl withPortSpecs(String... portSpecs) {
-    	checkNotNull(portSpecs, "portSpecs was not specified");
+    public CommitCmdImpl withPortSpecs(String... portSpecs) {
+        checkNotNull(portSpecs, "portSpecs was not specified");
         this.portSpecs = portSpecs;
         return this;
     }
 
     @Override
-	public boolean isStdinOnce() {
+    public boolean isStdinOnce() {
         return stdinOnce;
     }
 
     @Override
-	public CommitCmdImpl withStdinOnce(boolean stdinOnce) {
+    public CommitCmdImpl withStdinOnce(boolean stdinOnce) {
         this.stdinOnce = stdinOnce;
         return this;
     }
-    
+
     @Override
-	public CommitCmdImpl withStdinOnce() {
-    	return withStdinOnce(true);
+    public CommitCmdImpl withStdinOnce() {
+        return withStdinOnce(true);
     }
 
     @Override
-	public boolean isTty() {
+    public boolean isTty() {
         return tty;
     }
 
     @Override
-	public CommitCmdImpl withTty(boolean tty) {
+    public CommitCmdImpl withTty(boolean tty) {
         this.tty = tty;
         return this;
     }
-    
+
     @Override
-	public CommitCmdImpl withTty() {
-    	return withTty(true);
+    public CommitCmdImpl withTty() {
+        return withTty(true);
     }
 
     @Override
-	public String getUser() {
+    public String getUser() {
         return user;
     }
 
     @Override
-	public CommitCmdImpl withUser(String user) {
-    	checkNotNull(user, "user was not specified");
+    public CommitCmdImpl withUser(String user) {
+        checkNotNull(user, "user was not specified");
         this.user = user;
         return this;
     }
 
     @Override
-	public Volumes getVolumes() {
+    public Volumes getVolumes() {
         return volumes;
     }
 
     @Override
-	public CommitCmdImpl withVolumes(Volumes volumes) {
-    	checkNotNull(volumes, "volumes was not specified");
+    public CommitCmdImpl withVolumes(Volumes volumes) {
+        checkNotNull(volumes, "volumes was not specified");
         this.volumes = volumes;
         return this;
     }
 
     @Override
-	public String getWorkingDir() {
+    public String getWorkingDir() {
         return workingDir;
     }
 
     @Override
-	public CommitCmdImpl withWorkingDir(String workingDir) {
-    	checkNotNull(workingDir, "workingDir was not specified");
+    public CommitCmdImpl withWorkingDir(String workingDir) {
+        checkNotNull(workingDir, "workingDir was not specified");
         this.workingDir = workingDir;
         return this;
     }
 
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this).append("commit ").append(author != null ? "--author " + author + " " : "")
+                .append(message != null ? "--message " + message + " " : "").append(containerId)
+                .append(repository != null ? " " + repository + ":" : " ").append(tag != null ? tag : "").toString();
+    }
 
-	@Override
-	public String toString() {
-		return new ToStringBuilder(this).append("commit ")
-			.append(author != null ? "--author " + author + " " : "")
-			.append(message != null ? "--message " + message + " " : "")
-			.append(containerId)
-			.append(repository != null ?  " " + repository + ":" : " ")
-			.append(tag != null ?  tag : "")
-			.toString();
-	}
-	
-	/**
-     * @throws NotFoundException No such container
+    /**
+     * @throws NotFoundException
+     *             No such container
      */
-	@Override
-	public String exec() throws NotFoundException {
-		return super.exec();
-	}
+    @Override
+    public String exec() throws NotFoundException {
+        return super.exec();
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
index 36286423c..a394c535c 100644
--- a/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
@@ -13,42 +13,46 @@
 /**
  * Inspect changes on a container's filesystem
  *
- * @param containerId - Id of the container
+ * @param containerId
+ *            - Id of the container
  *
  */
 public class ContainerDiffCmdImpl extends AbstrDockerCmd<ContainerDiffCmd, List<ChangeLog>> implements ContainerDiffCmd {
 
-	private String containerId;
+    private String containerId;
 
-	public ContainerDiffCmdImpl(ContainerDiffCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public ContainerDiffCmdImpl(ContainerDiffCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public ContainerDiffCmdImpl withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
+    public ContainerDiffCmdImpl withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
 
-	@Override
+    @Override
     public String toString() {
         return new StringBuilder("diff ").append(containerId).toString();
     }
-    
+
     /**
-     * @throws NotFoundException No such container
-     * @throws InternalServerErrorException server error
-     * @throws DockerException unexpected http status code
+     * @throws NotFoundException
+     *             No such container
+     * @throws InternalServerErrorException
+     *             server error
+     * @throws DockerException
+     *             unexpected http status code
      */
-	@Override
+    @Override
     public List<ChangeLog> exec() throws NotFoundException {
-    	return super.exec();
+        return super.exec();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
index f4f2ae548..ef5f86a7a 100644
--- a/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
@@ -10,78 +10,75 @@
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
 
-
 /**
  *
  * Copy files or folders from a container.
  *
  */
-public class CopyFileFromContainerCmdImpl extends AbstrDockerCmd<CopyFileFromContainerCmd, InputStream> implements CopyFileFromContainerCmd {
+public class CopyFileFromContainerCmdImpl extends AbstrDockerCmd<CopyFileFromContainerCmd, InputStream> implements
+        CopyFileFromContainerCmd {
+
+    private String containerId;
 
-	private String containerId;
-	
-	@JsonProperty("HostPath")
+    @JsonProperty("HostPath")
     private String hostPath = ".";
 
     @JsonProperty("Resource")
     private String resource;
 
-	public CopyFileFromContainerCmdImpl(CopyFileFromContainerCmd.Exec exec, String containerId, String resource) {
-		super(exec);
-		withContainerId(containerId);
-		withResource(resource);
-	}
+    public CopyFileFromContainerCmdImpl(CopyFileFromContainerCmd.Exec exec, String containerId, String resource) {
+        super(exec);
+        withContainerId(containerId);
+        withResource(resource);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public String getResource() {
+    public String getResource() {
         return resource;
     }
 
     @Override
-	public CopyFileFromContainerCmdImpl withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
-
-	@Override
-	public CopyFileFromContainerCmdImpl withResource(String resource) {
-		checkNotNull(resource, "resource was not specified");
-		this.resource = resource;
-		return this;
-	}
-	
-	@Override
-	public String getHostPath() {
-		return hostPath;
-	}
-	
-	@Override
-	public CopyFileFromContainerCmdImpl withHostPath(String hostPath) {
-		checkNotNull(hostPath, "hostPath was not specified");
-		this.hostPath = hostPath;
-		return this;
-	}
-
-	@Override
+    public CopyFileFromContainerCmdImpl withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
+
+    @Override
+    public CopyFileFromContainerCmdImpl withResource(String resource) {
+        checkNotNull(resource, "resource was not specified");
+        this.resource = resource;
+        return this;
+    }
+
+    @Override
+    public String getHostPath() {
+        return hostPath;
+    }
+
+    @Override
+    public CopyFileFromContainerCmdImpl withHostPath(String hostPath) {
+        checkNotNull(hostPath, "hostPath was not specified");
+        this.hostPath = hostPath;
+        return this;
+    }
+
+    @Override
     public String toString() {
-        return new ToStringBuilder(this).append("cp ")
-            .append(containerId)
-            .append(":")
-            .append(resource)
-            .toString();
+        return new ToStringBuilder(this).append("cp ").append(containerId).append(":").append(resource).toString();
     }
-    
+
     /**
-     * @throws NotFoundException No such container
+     * @throws NotFoundException
+     *             No such container
      */
-	@Override
+    @Override
     public InputStream exec() throws NotFoundException {
-    	return super.exec();
+        return super.exec();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
index daa883f94..3ed2f912e 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
@@ -12,72 +12,75 @@
 /**
  * Create an image by importing the given stream of a tar file.
  */
-public class CreateImageCmdImpl extends	AbstrDockerCmd<CreateImageCmd, CreateImageResponse> implements CreateImageCmd {
+public class CreateImageCmdImpl extends AbstrDockerCmd<CreateImageCmd, CreateImageResponse> implements CreateImageCmd {
 
-	private String repository, tag;
-	
-	private InputStream imageStream;
+    private String repository, tag;
 
-	/**
-	 * @param repository        the repository to import to
-	 * @param imageStream       the InputStream of the tar file
-	 */
-	public CreateImageCmdImpl(CreateImageCmd.Exec exec, String repository, InputStream imageStream) {
-		super(exec);
-		withRepository(repository);
-		withImageStream(imageStream);
-	}
+    private InputStream imageStream;
+
+    /**
+     * @param repository
+     *            the repository to import to
+     * @param imageStream
+     *            the InputStream of the tar file
+     */
+    public CreateImageCmdImpl(CreateImageCmd.Exec exec, String repository, InputStream imageStream) {
+        super(exec);
+        withRepository(repository);
+        withImageStream(imageStream);
+    }
 
     @Override
-	public String getRepository() {
+    public String getRepository() {
         return repository;
     }
 
     @Override
-	public String getTag() {
+    public String getTag() {
         return tag;
     }
-    
+
     @Override
     public InputStream getImageStream() {
-    	return imageStream;
+        return imageStream;
     }
 
     /**
-	 * @param repository        the repository to import to
-	 */
-	@Override
-	public CreateImageCmdImpl withRepository(String repository) {
-		checkNotNull(repository, "repository was not specified");
-		this.repository = repository;
-		return this;
-	}
+     * @param repository
+     *            the repository to import to
+     */
+    @Override
+    public CreateImageCmdImpl withRepository(String repository) {
+        checkNotNull(repository, "repository was not specified");
+        this.repository = repository;
+        return this;
+    }
 
-	/**
-	 * @param imageStream       the InputStream of the tar file
-	 */
-	@Override
-	public CreateImageCmdImpl withImageStream(InputStream imageStream) {
-		checkNotNull(imageStream, "imageStream was not specified");
-		this.imageStream = imageStream;
-		return this;
-	}
+    /**
+     * @param imageStream
+     *            the InputStream of the tar file
+     */
+    @Override
+    public CreateImageCmdImpl withImageStream(InputStream imageStream) {
+        checkNotNull(imageStream, "imageStream was not specified");
+        this.imageStream = imageStream;
+        return this;
+    }
 
-	/**
-	 * @param tag               any tag for this image
-	 */
-	@Override
-	public CreateImageCmdImpl withTag(String tag) {
-		checkNotNull(tag, "tag was not specified");
-		this.tag = tag;
-		return this;
-	}
+    /**
+     * @param tag
+     *            any tag for this image
+     */
+    @Override
+    public CreateImageCmdImpl withTag(String tag) {
+        checkNotNull(tag, "tag was not specified");
+        this.tag = tag;
+        return this;
+    }
 
-	@Override
+    @Override
     public String toString() {
-        return new ToStringBuilder(this).append("import - ")
-            .append(repository != null ? repository + ":" : "")
-            .append(tag != null ? tag : "")
-            .toString();
+        return new ToStringBuilder(this).append("import - ").append(repository != null ? repository + ":" : "")
+                .append(tag != null ? tag : "").toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/EventStreamReader.java b/src/main/java/com/github/dockerjava/core/command/EventStreamReader.java
index b8975224f..ffa71d6c9 100644
--- a/src/main/java/com/github/dockerjava/core/command/EventStreamReader.java
+++ b/src/main/java/com/github/dockerjava/core/command/EventStreamReader.java
@@ -8,7 +8,9 @@
 public class EventStreamReader<I> implements AutoCloseable {
 
     private final ObjectMapper objectMapper = new ObjectMapper();
+
     private final Class<I> type;
+
     private final InputStream inputStream;
 
     public EventStreamReader(InputStream inputStream, Class<I> type) {
diff --git a/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
index ac55de714..3faa525d1 100644
--- a/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
@@ -11,7 +11,9 @@
 public class EventsCmdImpl extends AbstrDockerCmd<EventsCmd, ExecutorService> implements EventsCmd {
 
     private String since;
+
     private String until;
+
     private EventCallback eventCallback;
 
     public EventsCmdImpl(EventsCmd.Exec exec, EventCallback eventCallback) {
@@ -30,7 +32,7 @@ public EventsCmd withUntil(String until) {
         this.until = until;
         return this;
     }
-    
+
     @Override
     public EventsCmd withEventCallback(EventCallback eventCallback) {
         this.eventCallback = eventCallback;
@@ -59,9 +61,7 @@ public ExecutorService exec() {
 
     @Override
     public String toString() {
-        return new StringBuilder("events")
-                .append(since != null ? " --since=" + since : "")
-                .append(until != null ? " --until=" + until : "")
-                .toString();
+        return new StringBuilder("events").append(since != null ? " --since=" + since : "")
+                .append(until != null ? " --until=" + until : "").toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
index 65b86ed9a..3b00d22c5 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
@@ -30,10 +30,10 @@ public ExecCreateCmdImpl(ExecCreateCmd.Exec exec, String containerId) {
         super(exec);
         withContainerId(containerId);
     }
-    
+
     @Override
     public ExecCreateCmd withContainerId(String containerId) {
-    	checkNotNull(containerId, "containerId was not specified");
+        checkNotNull(containerId, "containerId was not specified");
         this.containerId = containerId;
         return this;
     }
@@ -43,7 +43,7 @@ public ExecCreateCmd withAttachStdin(boolean attachStdin) {
         this.attachStdin = attachStdin;
         return this;
     }
-    
+
     @Override
     public ExecCreateCmd withAttachStdin() {
         return withAttachStdin(true);
@@ -54,7 +54,7 @@ public ExecCreateCmd withAttachStdout(boolean attachStdout) {
         this.attachStdout = attachStdout;
         return this;
     }
-    
+
     @Override
     public ExecCreateCmd withAttachStdout() {
         return withAttachStdout(true);
@@ -65,18 +65,18 @@ public ExecCreateCmd withAttachStderr(boolean attachStderr) {
         this.attachStderr = attachStderr;
         return this;
     }
-    
+
     @Override
     public ExecCreateCmd withAttachStderr() {
         return withAttachStderr(true);
     }
-    
+
     @Override
     public ExecCreateCmd withTty(boolean tty) {
         this.tty = tty;
         return this;
     }
-    
+
     @Override
     public ExecCreateCmd withTty() {
         return withTty(true);
@@ -92,34 +92,34 @@ public ExecCreateCmd withCmd(String... cmd) {
     public String getContainerId() {
         return containerId;
     }
-    
+
     @Override
-	public boolean hasAttachStdinEnabled() {
-		return attachStdin;
-	}
+    public boolean hasAttachStdinEnabled() {
+        return attachStdin;
+    }
 
-	@Override
-	public boolean hasAttachStdoutEnabled() {
-		return attachStdout;
-	}
+    @Override
+    public boolean hasAttachStdoutEnabled() {
+        return attachStdout;
+    }
 
-	@Override
-	public boolean hasAttachStderrEnabled() {
-		return attachStderr;
-	}
+    @Override
+    public boolean hasAttachStderrEnabled() {
+        return attachStderr;
+    }
 
-	@Override
-	public boolean hasTtyEnabled() {
-		return tty;
-	}
+    @Override
+    public boolean hasTtyEnabled() {
+        return tty;
+    }
 
     /**
-     * @throws NotFoundException No such container
+     * @throws NotFoundException
+     *             No such container
      */
     @Override
     public ExecCreateCmdResponse exec() throws NotFoundException {
         return super.exec();
     }
 
-	
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
index 193a2cb69..a479a91f2 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
@@ -22,13 +22,13 @@ public ExecStartCmdImpl(ExecStartCmd.Exec exec, String execId) {
     public String getExecId() {
         return execId;
     }
-    
+
     @Override
-	public ExecStartCmd withExecId(String execId) {
-    	checkNotNull(execId, "execId was not specified");
-		this.execId = execId;
-		return this;
-	}
+    public ExecStartCmd withExecId(String execId) {
+        checkNotNull(execId, "execId was not specified");
+        this.execId = execId;
+        return this;
+    }
 
     @Override
     public boolean hasDetachEnabled() {
@@ -41,33 +41,34 @@ public boolean hasTtyEnabled() {
     }
 
     @Override
-	public ExecStartCmd withDetach(boolean detach) {
-		this.detach = detach;
-		return this;
-	}
-
-	@Override
-	public ExecStartCmd withTty(boolean tty) {
-		this.tty = tty;
-		return this;
-	}
-	
-	@Override
-	public ExecStartCmd withDetach() {
-		return withDetach(true);
-	}
-
-	@Override
-	public ExecStartCmd withTty() {
-		return withTty(true);
-	}
-    
+    public ExecStartCmd withDetach(boolean detach) {
+        this.detach = detach;
+        return this;
+    }
+
+    @Override
+    public ExecStartCmd withTty(boolean tty) {
+        this.tty = tty;
+        return this;
+    }
+
+    @Override
+    public ExecStartCmd withDetach() {
+        return withDetach(true);
+    }
+
+    @Override
+    public ExecStartCmd withTty() {
+        return withTty(true);
+    }
+
     /**
-     * @throws com.github.dockerjava.api.NotFoundException No such exec instance
+     * @throws com.github.dockerjava.api.NotFoundException
+     *             No such exec instance
      */
     @Override
     public InputStream exec() throws NotFoundException {
         return super.exec();
     }
-    
+
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
index bb36c1764..a5df3de8a 100644
--- a/src/main/java/com/github/dockerjava/core/command/FrameReader.java
+++ b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
@@ -9,11 +9,12 @@
 /**
  * Breaks the input into frame. Similar to how a buffered reader would readLies.
  * <p/>
- * See:  {@link }http://docs.docker.com/v1.6/reference/api/docker_remote_api_v1.13/#attach-to-a-container}
+ * See: {@link }http://docs.docker.com/v1.6/reference/api/docker_remote_api_v1.13/#attach-to-a-container}
  */
 public class FrameReader implements AutoCloseable {
 
     private static final int HEADER_SIZE = 8;
+
     private final InputStream inputStream;
 
     public FrameReader(InputStream inputStream) {
@@ -22,14 +23,14 @@ public FrameReader(InputStream inputStream) {
 
     private static StreamType streamType(byte streamType) {
         switch (streamType) {
-            case 0:
-                return StreamType.STDIN;
-            case 1:
-                return StreamType.STDOUT;
-            case 2:
-                return StreamType.STDERR;
-            default:
-                throw new IllegalArgumentException("invalid streamType");
+        case 0:
+            return StreamType.STDIN;
+        case 1:
+            return StreamType.STDOUT;
+        case 2:
+            return StreamType.STDERR;
+        default:
+            throw new IllegalArgumentException("invalid streamType");
         }
     }
 
@@ -50,7 +51,8 @@ public Frame readFrame() throws IOException {
             actualHeaderSize += headerCount;
         } while (actualHeaderSize < HEADER_SIZE);
 
-        int payloadSize = ((header[4] & 0xff) << 24) + ((header[5] & 0xff) << 16) + ((header[6] & 0xff) << 8) + (header[7] & 0xff);
+        int payloadSize = ((header[4] & 0xff) << 24) + ((header[5] & 0xff) << 16) + ((header[6] & 0xff) << 8)
+                + (header[7] & 0xff);
 
         byte[] payload = new byte[payloadSize];
         int actualPayloadSize = 0;
@@ -60,7 +62,8 @@ public Frame readFrame() throws IOException {
 
             if (count == -1) {
                 if (actualPayloadSize != payloadSize) {
-                    throw new IOException(String.format("payload must be %d bytes long, but was %d", payloadSize, actualPayloadSize));
+                    throw new IOException(String.format("payload must be %d bytes long, but was %d", payloadSize,
+                            actualPayloadSize));
                 }
                 break;
             }
diff --git a/src/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java
index 767da2049..f2dd3ca82 100644
--- a/src/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java
@@ -6,13 +6,13 @@
 /**
  * Return Docker server info
  */
-public class InfoCmdImpl extends AbstrDockerCmd<InfoCmd, Info> implements InfoCmd  {
+public class InfoCmdImpl extends AbstrDockerCmd<InfoCmd, Info> implements InfoCmd {
 
-	public InfoCmdImpl(InfoCmd.Exec exec) {
-		super(exec);
-	}
-	
-	@Override
+    public InfoCmdImpl(InfoCmd.Exec exec) {
+        super(exec);
+    }
+
+    @Override
     public String toString() {
         return "info";
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
index 9215f233a..c3fe5f6d5 100644
--- a/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
@@ -9,37 +9,39 @@
 /**
  * Inspect the details of a container.
  */
-public class InspectContainerCmdImpl extends AbstrDockerCmd<InspectContainerCmd, InspectContainerResponse> implements InspectContainerCmd {
+public class InspectContainerCmdImpl extends AbstrDockerCmd<InspectContainerCmd, InspectContainerResponse> implements
+        InspectContainerCmd {
 
-	private String containerId;
+    private String containerId;
 
-	public InspectContainerCmdImpl(InspectContainerCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public InspectContainerCmdImpl(InspectContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public InspectContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
+    public InspectContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
 
     @Override
     public String toString() {
         return "inspect " + containerId;
     }
-    
+
     /**
-     * @throws NotFoundException No such container
+     * @throws NotFoundException
+     *             No such container
      */
-	@Override
+    @Override
     public InspectContainerResponse exec() throws NotFoundException {
-    	return super.exec();
+        return super.exec();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
index 1fd728622..55fad8c9c 100644
--- a/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
@@ -32,7 +32,8 @@ public String toString() {
     }
 
     /**
-     * @throws NotFoundException No such exec
+     * @throws NotFoundException
+     *             No such exec
      */
     @Override
     public InspectExecResponse exec() throws NotFoundException {
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
index 0b477e80e..3e28bd488 100644
--- a/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
@@ -6,41 +6,42 @@
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectImageResponse;
 
-
 /**
  * Inspect the details of an image.
  */
-public class InspectImageCmdImpl extends AbstrDockerCmd<InspectImageCmd, InspectImageResponse> implements InspectImageCmd  {
+public class InspectImageCmdImpl extends AbstrDockerCmd<InspectImageCmd, InspectImageResponse> implements
+        InspectImageCmd {
 
-	private String imageId;
+    private String imageId;
 
-	public InspectImageCmdImpl(InspectImageCmd.Exec exec, String imageId) {
-		super(exec);
-		withImageId(imageId);
-	}
+    public InspectImageCmdImpl(InspectImageCmd.Exec exec, String imageId) {
+        super(exec);
+        withImageId(imageId);
+    }
 
     @Override
-	public String getImageId() {
+    public String getImageId() {
         return imageId;
     }
 
     @Override
-	public InspectImageCmd withImageId(String imageId) {
-		checkNotNull(imageId, "imageId was not specified");
-		this.imageId = imageId;
-		return this;
-	}
+    public InspectImageCmd withImageId(String imageId) {
+        checkNotNull(imageId, "imageId was not specified");
+        this.imageId = imageId;
+        return this;
+    }
 
     @Override
     public String toString() {
         return "inspect " + imageId;
     }
-    
+
     /**
-     * @throws NotFoundException No such image
+     * @throws NotFoundException
+     *             No such image
      */
-	@Override
+    @Override
     public InspectImageResponse exec() throws NotFoundException {
-    	return super.exec();
+        return super.exec();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
index c6175a8a6..05e709f37 100644
--- a/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
@@ -5,53 +5,53 @@
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.KillContainerCmd;
 
-
 /**
  * Kill a running container.
  */
 public class KillContainerCmdImpl extends AbstrDockerCmd<KillContainerCmd, Void> implements KillContainerCmd {
 
-	private String containerId, signal;
+    private String containerId, signal;
 
-	public KillContainerCmdImpl(KillContainerCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public KillContainerCmdImpl(KillContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public String getSignal() {
+    public String getSignal() {
         return signal;
     }
 
     @Override
-	public KillContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
-
-	@Override
-	public KillContainerCmd withSignal(String signal) {
-		checkNotNull(signal, "signal was not specified");
-		this.signal = signal;
-		return this;
-	}
+    public KillContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
+
+    @Override
+    public KillContainerCmd withSignal(String signal) {
+        checkNotNull(signal, "signal was not specified");
+        this.signal = signal;
+        return this;
+    }
 
     @Override
     public String toString() {
         return "kill " + containerId;
     }
-    
+
     /**
-     * @throws NotFoundException No such container
+     * @throws NotFoundException
+     *             No such container
      */
-	@Override
+    @Override
     public Void exec() throws NotFoundException {
-    	return super.exec();
+        return super.exec();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
index 7144e767f..13bb02cfb 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
@@ -8,95 +8,97 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.model.Container;
 
-
 /**
  * List containers
  *
- * @param showAll - true or false, Show all containers. Only running containers are shown by default.
- * @param showSize - true or false, Show the containers sizes. This is false by default.
- * @param limit - Show `limit` last created containers, include non-running ones. There is no limit by default.
- * @param sinceId - Show only containers created since Id, include non-running ones.
- * @param beforeId - Show only containers created before Id, include non-running ones.
+ * @param showAll
+ *            - true or false, Show all containers. Only running containers are shown by default.
+ * @param showSize
+ *            - true or false, Show the containers sizes. This is false by default.
+ * @param limit
+ *            - Show `limit` last created containers, include non-running ones. There is no limit by default.
+ * @param sinceId
+ *            - Show only containers created since Id, include non-running ones.
+ * @param beforeId
+ *            - Show only containers created before Id, include non-running ones.
  *
  */
-public class ListContainersCmdImpl extends AbstrDockerCmd<ListContainersCmd, List<Container>> implements ListContainersCmd  {
-
-	private int limit = -1;
-	
-	private boolean showSize, showAll = false;
-	
-	private String sinceId, beforeId;
-	
-	public ListContainersCmdImpl(ListContainersCmd.Exec exec) {
-		super(exec);
-	}
+public class ListContainersCmdImpl extends AbstrDockerCmd<ListContainersCmd, List<Container>> implements
+        ListContainersCmd {
+
+    private int limit = -1;
+
+    private boolean showSize, showAll = false;
+
+    private String sinceId, beforeId;
+
+    public ListContainersCmdImpl(ListContainersCmd.Exec exec) {
+        super(exec);
+    }
 
     @Override
-	public int getLimit() {
+    public int getLimit() {
         return limit;
     }
 
     @Override
-	public boolean hasShowSizeEnabled() {
+    public boolean hasShowSizeEnabled() {
         return showSize;
     }
 
     @Override
-	public boolean hasShowAllEnabled() {
+    public boolean hasShowAllEnabled() {
         return showAll;
     }
 
     @Override
-	public String getSinceId() {
+    public String getSinceId() {
         return sinceId;
     }
 
     @Override
-	public String getBeforeId() {
+    public String getBeforeId() {
         return beforeId;
     }
 
     @Override
-	public ListContainersCmd withShowAll(boolean showAll) {
-		this.showAll = showAll;
-		return this;
-	}
-
-	@Override
-	public ListContainersCmd withShowSize(boolean showSize) {
-		this.showSize = showSize;
-		return this;
-	}
-
-	@Override
-	public ListContainersCmd withLimit(int limit) {
-		checkArgument(limit > 0, "limit must be greater 0");
-		this.limit = limit;
-		return this;
-	}
-
-	@Override
-	public ListContainersCmd withSince(String since) {
-		checkNotNull(since, "since was not specified");
-		this.sinceId = since;
-		return this;
-	}
-
-	@Override
-	public ListContainersCmd withBefore(String before) {
-		checkNotNull(before, "before was not specified");
-		this.beforeId = before;
-		return this;
-	}
+    public ListContainersCmd withShowAll(boolean showAll) {
+        this.showAll = showAll;
+        return this;
+    }
+
+    @Override
+    public ListContainersCmd withShowSize(boolean showSize) {
+        this.showSize = showSize;
+        return this;
+    }
+
+    @Override
+    public ListContainersCmd withLimit(int limit) {
+        checkArgument(limit > 0, "limit must be greater 0");
+        this.limit = limit;
+        return this;
+    }
+
+    @Override
+    public ListContainersCmd withSince(String since) {
+        checkNotNull(since, "since was not specified");
+        this.sinceId = since;
+        return this;
+    }
+
+    @Override
+    public ListContainersCmd withBefore(String before) {
+        checkNotNull(before, "before was not specified");
+        this.beforeId = before;
+        return this;
+    }
 
     @Override
     public String toString() {
-        return new StringBuilder("ps ")
-            .append(showAll ? "--all=true" : "")
-            .append(showSize ? "--size=true" : "")
-            .append(sinceId != null ? "--since " + sinceId : "")
-            .append(beforeId != null ? "--before " + beforeId : "")
-            .append(limit != -1 ? "-n " + limit : "")
-            .toString();
+        return new StringBuilder("ps ").append(showAll ? "--all=true" : "").append(showSize ? "--size=true" : "")
+                .append(sinceId != null ? "--since " + sinceId : "")
+                .append(beforeId != null ? "--before " + beforeId : "").append(limit != -1 ? "-n " + limit : "")
+                .toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
index 998dded5d..ddd4dc79f 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
@@ -10,47 +10,47 @@
 /**
  * List images
  *
- * @param showAll - Show all images (by default filter out the intermediate images used to build)
- * @param filters - a json encoded value of the filters (a map[string][]string) to process on the images list.
+ * @param showAll
+ *            - Show all images (by default filter out the intermediate images used to build)
+ * @param filters
+ *            - a json encoded value of the filters (a map[string][]string) to process on the images list.
  */
-public class ListImagesCmdImpl extends AbstrDockerCmd<ListImagesCmd, List<Image>> implements ListImagesCmd  {
+public class ListImagesCmdImpl extends AbstrDockerCmd<ListImagesCmd, List<Image>> implements ListImagesCmd {
 
-	private String filters;
+    private String filters;
 
-	private boolean showAll = false;
+    private boolean showAll = false;
 
-	public ListImagesCmdImpl(ListImagesCmd.Exec exec) {
-		super(exec);
-	}
+    public ListImagesCmdImpl(ListImagesCmd.Exec exec) {
+        super(exec);
+    }
 
     @Override
-	public String getFilters() {
+    public String getFilters() {
         return filters;
     }
 
     @Override
-	public boolean hasShowAllEnabled() {
+    public boolean hasShowAllEnabled() {
         return showAll;
     }
 
     @Override
-	public ListImagesCmd withShowAll(boolean showAll) {
-		this.showAll = showAll;
-		return this;
-	}
-
-	@Override
-	public ListImagesCmd withFilters(String filter) {
-		checkNotNull(filter, "filters have not been specified");
-		this.filters = filter;
-		return this;
-	}
+    public ListImagesCmd withShowAll(boolean showAll) {
+        this.showAll = showAll;
+        return this;
+    }
+
+    @Override
+    public ListImagesCmd withFilters(String filter) {
+        checkNotNull(filter, "filters have not been specified");
+        this.filters = filter;
+        return this;
+    }
 
     @Override
     public String toString() {
-        return new StringBuilder("images ")
-            .append(showAll ? "--all=true" : "")
-            .append(filters != null ? "--filter " + filters : "")
-            .toString();
+        return new StringBuilder("images ").append(showAll ? "--all=true" : "")
+                .append(filters != null ? "--filter " + filters : "").toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
index d405a8026..2a6232554 100644
--- a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -17,132 +17,128 @@
  * @param stderr
  *            - true or false, includes stderr log. Defaults to false.
  * @param timestamps
- *            - true or false, if true, print timestamps for every log line.
- *            Defaults to false.
+ *            - true or false, if true, print timestamps for every log line. Defaults to false.
  * @param tail
- * 			  - `all` or `<number>`, Output specified number of lines at the end of logs
+ *            - `all` or `<number>`, Output specified number of lines at the end of logs
  */
 public class LogContainerCmdImpl extends AbstrDockerCmd<LogContainerCmd, InputStream> implements LogContainerCmd {
 
-	private String containerId;
+    private String containerId;
 
-	private int tail = -1;
+    private int tail = -1;
 
-	private boolean followStream, timestamps, stdout, stderr;
+    private boolean followStream, timestamps, stdout, stderr;
 
-	public LogContainerCmdImpl(LogContainerCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public LogContainerCmdImpl(LogContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public int getTail() {
+    public int getTail() {
         return tail;
     }
 
     @Override
-	public boolean hasFollowStreamEnabled() {
+    public boolean hasFollowStreamEnabled() {
         return followStream;
     }
 
     @Override
-	public boolean hasTimestampsEnabled() {
+    public boolean hasTimestampsEnabled() {
         return timestamps;
     }
 
     @Override
-	public boolean hasStdoutEnabled() {
+    public boolean hasStdoutEnabled() {
         return stdout;
     }
 
     @Override
-	public boolean hasStderrEnabled() {
+    public boolean hasStderrEnabled() {
         return stderr;
     }
 
     @Override
-	public LogContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
-
-	@Override
-	public LogContainerCmd withFollowStream() {
-		return withFollowStream(true);
-	}
-
-	@Override
-	public LogContainerCmd withFollowStream(boolean followStream) {
-		this.followStream = followStream;
-		return this;
-	}
-	
-	@Override
-	public LogContainerCmd withTimestamps() {
-		return withTimestamps(true);
-	}
-
-	@Override
-	public LogContainerCmd withTimestamps(boolean timestamps) {
-		this.timestamps = timestamps;
-		return this;
-	}
-
-	@Override
-	public LogContainerCmd withStdOut() {
-		return withStdOut(true);
-	}
-
-	@Override
-	public LogContainerCmd withStdOut(boolean stdout) {
-		this.stdout = stdout;
-		return this;
-	}
-
-	@Override
-	public LogContainerCmd withStdErr() {
-		return withStdErr(true);
-	}
-
-	@Override
-	public LogContainerCmd withStdErr(boolean stderr) {
-		this.stderr = stderr;
-		return this;
-	}
-
-	@Override
-	public LogContainerCmd withTailAll() {
-		this.tail = -1;
-		return this;
-	}
-
-
-	@Override
-	public LogContainerCmd withTail(int tail) {
-		this.tail = tail;
-		return this;
-	}
+    public LogContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
+
+    @Override
+    public LogContainerCmd withFollowStream() {
+        return withFollowStream(true);
+    }
+
+    @Override
+    public LogContainerCmd withFollowStream(boolean followStream) {
+        this.followStream = followStream;
+        return this;
+    }
+
+    @Override
+    public LogContainerCmd withTimestamps() {
+        return withTimestamps(true);
+    }
+
+    @Override
+    public LogContainerCmd withTimestamps(boolean timestamps) {
+        this.timestamps = timestamps;
+        return this;
+    }
+
+    @Override
+    public LogContainerCmd withStdOut() {
+        return withStdOut(true);
+    }
+
+    @Override
+    public LogContainerCmd withStdOut(boolean stdout) {
+        this.stdout = stdout;
+        return this;
+    }
+
+    @Override
+    public LogContainerCmd withStdErr() {
+        return withStdErr(true);
+    }
+
+    @Override
+    public LogContainerCmd withStdErr(boolean stderr) {
+        this.stderr = stderr;
+        return this;
+    }
+
+    @Override
+    public LogContainerCmd withTailAll() {
+        this.tail = -1;
+        return this;
+    }
+
+    @Override
+    public LogContainerCmd withTail(int tail) {
+        this.tail = tail;
+        return this;
+    }
 
     @Override
     public String toString() {
-        return new StringBuilder("logs ")
-            .append(followStream ? "--follow=true" : "")
-            .append(timestamps ? "--timestamps=true" : "")
-            .append(containerId)
-            .toString();
+        return new StringBuilder("logs ").append(followStream ? "--follow=true" : "")
+                .append(timestamps ? "--timestamps=true" : "").append(containerId).toString();
     }
-    
+
     /**
-     * @throws NotFoundException No such container
+     * @throws NotFoundException
+     *             No such container
      */
-	@Override
+    @Override
     public InputStream exec() throws NotFoundException {
-    	return super.exec();
+        return super.exec();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
index 5ea60fe86..81a30dcde 100644
--- a/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
@@ -8,42 +8,42 @@
 /**
  * Pause a container.
  *
- * @param containerId - Id of the container
+ * @param containerId
+ *            - Id of the container
  *
  */
 public class PauseContainerCmdImpl extends AbstrDockerCmd<PauseContainerCmd, Void> implements PauseContainerCmd {
 
-	private String containerId;
+    private String containerId;
 
-	public PauseContainerCmdImpl(PauseContainerCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public PauseContainerCmdImpl(PauseContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public PauseContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
+    public PauseContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
 
-	@Override
+    @Override
     public String toString() {
-        return new StringBuilder("pause ")
-            .append(containerId)
-            .toString();
+        return new StringBuilder("pause ").append(containerId).toString();
+    }
+
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public Void exec() throws NotFoundException {
+        return super.exec();
     }
-	
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public Void exec() throws NotFoundException {
-		return super.exec();
-	}
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java
index 15cc1f5b3..c9118a095 100644
--- a/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java
@@ -8,7 +8,7 @@
  */
 public class PingCmdImpl extends AbstrDockerCmd<PingCmd, Void> implements PingCmd {
 
-	public PingCmdImpl(PingCmd.Exec exec) {
-		super(exec);
-	}
+    public PingCmdImpl(PingCmd.Exec exec) {
+        super(exec);
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
index d1d4ee026..488562b99 100644
--- a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
@@ -16,52 +16,49 @@ public class PullImageCmdImpl extends AbstrAuthCfgDockerCmd<PullImageCmd, InputS
 
     private String repository, tag, registry;
 
-	public PullImageCmdImpl(PullImageCmd.Exec exec, AuthConfig authConfig, String repository) {
-		super(exec, authConfig);
-		withRepository(repository);
-	}
+    public PullImageCmdImpl(PullImageCmd.Exec exec, AuthConfig authConfig, String repository) {
+        super(exec, authConfig);
+        withRepository(repository);
+    }
 
     @Override
-	public String getRepository() {
+    public String getRepository() {
         return repository;
     }
 
     @Override
-	public String getTag() {
+    public String getTag() {
         return tag;
     }
 
     @Override
-	public String getRegistry() {
+    public String getRegistry() {
         return registry;
     }
 
     @Override
-	public PullImageCmd withRepository(String repository) {
-		checkNotNull(repository, "repository was not specified");
-		this.repository = repository;
-		return this;
-	}
+    public PullImageCmd withRepository(String repository) {
+        checkNotNull(repository, "repository was not specified");
+        this.repository = repository;
+        return this;
+    }
 
-	@Override
-	public PullImageCmd withTag(String tag) {
-		checkNotNull(tag, "tag was not specified");
-		this.tag = tag;
-		return this;
-	}
+    @Override
+    public PullImageCmd withTag(String tag) {
+        checkNotNull(tag, "tag was not specified");
+        this.tag = tag;
+        return this;
+    }
 
-	@Override
-	public PullImageCmd withRegistry(String registry) {
-		checkNotNull(registry, "registry was not specified");
-		this.registry = registry;
-		return this;
-	}
+    @Override
+    public PullImageCmd withRegistry(String registry) {
+        checkNotNull(registry, "registry was not specified");
+        this.registry = registry;
+        return this;
+    }
 
     @Override
     public String toString() {
-        return new StringBuilder("pull ")
-            .append(repository)
-            .append(tag != null ? ":" + tag : "")
-            .toString();
+        return new StringBuilder("pull ").append(repository).append(tag != null ? ":" + tag : "").toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
index a775bffd5..76bbe46b6 100644
--- a/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
@@ -8,20 +8,23 @@
 /**
  * Push the latest image to the repository.
  *
- * @param name The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
+ * @param name
+ *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
  */
-public class PushImageCmdImpl extends AbstrAuthCfgDockerCmd<PushImageCmd, PushImageCmd.Response> implements PushImageCmd  {
+public class PushImageCmdImpl extends AbstrAuthCfgDockerCmd<PushImageCmd, PushImageCmd.Response> implements
+        PushImageCmd {
 
     private String name;
+
     private String tag;
 
     public PushImageCmdImpl(PushImageCmd.Exec exec, String name) {
-    	super(exec);
-    	withName(name);
+        super(exec);
+        withName(name);
     }
 
     @Override
-	public String getName() {
+    public String getName() {
         return name;
     }
 
@@ -31,17 +34,19 @@ public String getTag() {
     }
 
     /**
-	 * @param name The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
-	 */
-	@Override
-	public PushImageCmd withName(String name) {
-		checkNotNull(name, "name was not specified");
-		this.name = name;
-		return this;
-	}
+     * @param name
+     *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
+     */
+    @Override
+    public PushImageCmd withName(String name) {
+        checkNotNull(name, "name was not specified");
+        this.name = name;
+        return this;
+    }
 
     /**
-     * @param tag The image's tag. Can be null or empty.
+     * @param tag
+     *            The image's tag. Can be null or empty.
      */
     @Override
     public PushImageCmd withTag(String tag) {
@@ -52,16 +57,15 @@ public PushImageCmd withTag(String tag) {
 
     @Override
     public String toString() {
-        return new StringBuilder("push ")
-            .append(name)
-            .toString();
+        return new StringBuilder("push ").append(name).toString();
     }
-   
+
     /**
-     * @throws NotFoundException No such image
+     * @throws NotFoundException
+     *             No such image
      */
     @Override
     public Response exec() throws NotFoundException {
-    	return super.exec();
+        return super.exec();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
index 7cd063956..ff23023d2 100644
--- a/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
@@ -8,72 +8,73 @@
 /**
  * Remove a container.
  * 
- * @param removeVolumes - true or false, Remove the volumes associated to the container. Defaults to false
- * @param force - true or false, Removes the container even if it was running. Defaults to false
+ * @param removeVolumes
+ *            - true or false, Remove the volumes associated to the container. Defaults to false
+ * @param force
+ *            - true or false, Removes the container even if it was running. Defaults to false
  */
-public class RemoveContainerCmdImpl extends	AbstrDockerCmd<RemoveContainerCmd, Void> implements RemoveContainerCmd {
+public class RemoveContainerCmdImpl extends AbstrDockerCmd<RemoveContainerCmd, Void> implements RemoveContainerCmd {
 
-	private String containerId;
+    private String containerId;
 
-	private boolean removeVolumes, force;
+    private boolean removeVolumes, force;
 
-	public RemoveContainerCmdImpl(RemoveContainerCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public RemoveContainerCmdImpl(RemoveContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
-	@Override
-	public String getContainerId() {
-		return containerId;
-	}
+    @Override
+    public String getContainerId() {
+        return containerId;
+    }
 
-	@Override
-	public boolean hasRemoveVolumesEnabled() {
-		return removeVolumes;
-	}
+    @Override
+    public boolean hasRemoveVolumesEnabled() {
+        return removeVolumes;
+    }
 
-	@Override
-	public boolean hasForceEnabled() {
-		return force;
-	}
+    @Override
+    public boolean hasForceEnabled() {
+        return force;
+    }
 
-	@Override
-	public RemoveContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
+    @Override
+    public RemoveContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
 
-	@Override
-	public RemoveContainerCmd withRemoveVolumes(boolean removeVolumes) {
-		this.removeVolumes = removeVolumes;
-		return this;
-	}
+    @Override
+    public RemoveContainerCmd withRemoveVolumes(boolean removeVolumes) {
+        this.removeVolumes = removeVolumes;
+        return this;
+    }
 
-	@Override
-	public RemoveContainerCmd withForce() {
-		return withForce(true);
-	}
+    @Override
+    public RemoveContainerCmd withForce() {
+        return withForce(true);
+    }
 
-	@Override
-	public RemoveContainerCmd withForce(boolean force) {
-		this.force = force;
-		return this;
-	}
+    @Override
+    public RemoveContainerCmd withForce(boolean force) {
+        this.force = force;
+        return this;
+    }
 
-	@Override
-	public String toString() {
-		return new StringBuilder("rm ")
-				.append(removeVolumes ? "--volumes=true" : "")
-				.append(force ? "--force=true" : "").append(containerId)
-				.toString();
-	}
+    @Override
+    public String toString() {
+        return new StringBuilder("rm ").append(removeVolumes ? "--volumes=true" : "")
+                .append(force ? "--force=true" : "").append(containerId).toString();
+    }
 
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public Void exec() throws NotFoundException {
-		return super.exec();
-	}
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public Void exec() throws NotFoundException {
+        return super.exec();
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
index 87e096aae..ee9e7f33b 100644
--- a/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
@@ -12,73 +12,71 @@
  */
 public class RemoveImageCmdImpl extends AbstrDockerCmd<RemoveImageCmd, Void> implements RemoveImageCmd {
 
-	private String imageId;
+    private String imageId;
 
-	private boolean force, noPrune;
+    private boolean force, noPrune;
 
-	public RemoveImageCmdImpl(RemoveImageCmd.Exec exec, String imageId) {
-		super(exec);
-		withImageId(imageId);
-	}
+    public RemoveImageCmdImpl(RemoveImageCmd.Exec exec, String imageId) {
+        super(exec);
+        withImageId(imageId);
+    }
 
     @Override
-	public String getImageId() {
+    public String getImageId() {
         return imageId;
     }
 
     @Override
-	public boolean hasForceEnabled() {
+    public boolean hasForceEnabled() {
         return force;
     }
 
     @Override
-	public boolean hasNoPruneEnabled() {
+    public boolean hasNoPruneEnabled() {
         return noPrune;
     }
 
     @Override
-	public RemoveImageCmd withImageId(String imageId) {
-		checkNotNull(imageId, "imageId was not specified");
-		this.imageId = imageId;
-		return this;
-	}
-
-	@Override
-	public RemoveImageCmd withForce() {
-		return withForce(true);
-	}
-
-	@Override
-	public RemoveImageCmd withForce(boolean force) {
-		this.force = force;
-		return this;
-	}
-	
-	@Override
-	public RemoveImageCmd withNoPrune() {
-		return withNoPrune(true);
-	}
-
-	@Override
-	public RemoveImageCmd withNoPrune(boolean noPrune) {
-		this.noPrune = noPrune;
-		return this;
-	}
+    public RemoveImageCmd withImageId(String imageId) {
+        checkNotNull(imageId, "imageId was not specified");
+        this.imageId = imageId;
+        return this;
+    }
+
+    @Override
+    public RemoveImageCmd withForce() {
+        return withForce(true);
+    }
+
+    @Override
+    public RemoveImageCmd withForce(boolean force) {
+        this.force = force;
+        return this;
+    }
+
+    @Override
+    public RemoveImageCmd withNoPrune() {
+        return withNoPrune(true);
+    }
+
+    @Override
+    public RemoveImageCmd withNoPrune(boolean noPrune) {
+        this.noPrune = noPrune;
+        return this;
+    }
 
     @Override
     public String toString() {
-        return new StringBuilder("rmi ")
-            .append(noPrune ? "--no-prune=true" : "")
-            .append(force ? "--force=true" : "")
-            .append(imageId)
-            .toString();
+        return new StringBuilder("rmi ").append(noPrune ? "--no-prune=true" : "").append(force ? "--force=true" : "")
+                .append(imageId).toString();
     }
-    
+
     /**
-     * @throws NotFoundException No such image
+     * @throws NotFoundException
+     *             No such image
      */
-	@Override
+    @Override
     public Void exec() throws NotFoundException {
-    	return super.exec();
+        return super.exec();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
index adcac9b4c..4766dfdb4 100644
--- a/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
@@ -9,57 +9,56 @@
 /**
  * Restart a running container.
  *
- * @param timeout - Timeout in seconds before killing the container. Defaults to 10 seconds.
+ * @param timeout
+ *            - Timeout in seconds before killing the container. Defaults to 10 seconds.
  *
  */
 public class RestartContainerCmdImpl extends AbstrDockerCmd<RestartContainerCmd, Void> implements RestartContainerCmd {
 
-	private String containerId;
+    private String containerId;
 
-	private int timeout = 10;
+    private int timeout = 10;
 
-	public RestartContainerCmdImpl(RestartContainerCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public RestartContainerCmdImpl(RestartContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public int getTimeout() {
+    public int getTimeout() {
         return timeout;
     }
 
     @Override
-	public RestartContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
+    public RestartContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
 
-	@Override
-	public RestartContainerCmd withtTimeout(int timeout) {
-		checkArgument(timeout >= 0, "timeout must be greater or equal 0");
-		this.timeout = timeout;
-		return this;
-	}
+    @Override
+    public RestartContainerCmd withtTimeout(int timeout) {
+        checkArgument(timeout >= 0, "timeout must be greater or equal 0");
+        this.timeout = timeout;
+        return this;
+    }
 
     @Override
     public String toString() {
-        return new StringBuilder("restart ")
-            .append("--time=" + timeout + " ")
-            .append(containerId)
-            .toString();
+        return new StringBuilder("restart ").append("--time=" + timeout + " ").append(containerId).toString();
     }
-    
+
     /**
-     * @throws NotFoundException No such container
+     * @throws NotFoundException
+     *             No such container
      */
-	@Override
+    @Override
     public Void exec() throws NotFoundException {
-    	return super.exec();
+        return super.exec();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
index 30bb13b2f..ab87c2ea8 100644
--- a/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
@@ -9,6 +9,7 @@
 
 public class SaveImageCmdImpl extends AbstrDockerCmd<SaveImageCmd, InputStream> implements SaveImageCmd {
     private String name;
+
     private String tag;
 
     public SaveImageCmdImpl(SaveImageCmd.Exec exec, String name) {
@@ -27,7 +28,8 @@ public String getTag() {
     }
 
     /**
-     * @param name The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
+     * @param name
+     *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
      */
     @Override
     public SaveImageCmd withName(String name) {
@@ -37,7 +39,8 @@ public SaveImageCmd withName(String name) {
     }
 
     /**
-     * @param tag The image's tag. Can be null or empty.
+     * @param tag
+     *            The image's tag. Can be null or empty.
      */
     @Override
     public SaveImageCmd withTag(String tag) {
@@ -48,13 +51,12 @@ public SaveImageCmd withTag(String tag) {
 
     @Override
     public String toString() {
-        return new StringBuilder("get ")
-                .append(name)
-                .toString();
+        return new StringBuilder("get ").append(name).toString();
     }
 
     /**
-     * @throws com.github.dockerjava.api.NotFoundException No such image
+     * @throws com.github.dockerjava.api.NotFoundException
+     *             No such image
      */
     @Override
     public InputStream exec() throws NotFoundException {
diff --git a/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
index 82c94e49f..6630377c8 100644
--- a/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
@@ -10,34 +10,33 @@
 /**
  * Search images
  *
- * @param term - search term
+ * @param term
+ *            - search term
  *
  */
-public class SearchImagesCmdImpl extends AbstrDockerCmd<SearchImagesCmd, List<SearchItem>> implements SearchImagesCmd  {
+public class SearchImagesCmdImpl extends AbstrDockerCmd<SearchImagesCmd, List<SearchItem>> implements SearchImagesCmd {
 
-	private String term;
+    private String term;
 
-	public SearchImagesCmdImpl(SearchImagesCmd.Exec exec, String term) {
-		super(exec);
-		withTerm(term);
-	}
+    public SearchImagesCmdImpl(SearchImagesCmd.Exec exec, String term) {
+        super(exec);
+        withTerm(term);
+    }
 
     @Override
-	public String getTerm() {
+    public String getTerm() {
         return term;
     }
 
     @Override
-	public SearchImagesCmd withTerm(String term) {
-		checkNotNull(term, "term was not specified");
-		this.term = term;
-		return this;
-	}
+    public SearchImagesCmd withTerm(String term) {
+        checkNotNull(term, "term was not specified");
+        this.term = term;
+        return this;
+    }
 
     @Override
     public String toString() {
-        return new StringBuilder("search ")
-            .append(term)
-            .toString();
+        return new StringBuilder("search ").append(term).toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
index 33fcf6371..2672056f2 100644
--- a/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
@@ -16,6 +16,7 @@
 public class StatsCmdImpl extends AbstrDockerCmd<StatsCmd, ExecutorService> implements StatsCmd {
 
     private String containerId;
+
     private StatsCallback statsCallback;
 
     public StatsCmdImpl(StatsCmd.Exec exec, StatsCallback statsCallback) {
@@ -29,19 +30,18 @@ public StatsCmd withContainerId(String containerId) {
         this.containerId = containerId;
         return this;
     }
-    
+
     @Override
     public String getContainerId() {
         return containerId;
     }
-    
+
     @Override
     public StatsCmd withStatsCallback(StatsCallback statsCallback) {
         this.statsCallback = statsCallback;
         return this;
     }
 
-  
     @Override
     public StatsCallback getStatsCallback() {
         return statsCallback;
@@ -54,8 +54,6 @@ public ExecutorService exec() {
 
     @Override
     public String toString() {
-        return new StringBuilder("stats")
-                .append(containerId != null ? " --id=" + containerId : "")
-                .toString();
+        return new StringBuilder("stats").append(containerId != null ? " --id=" + containerId : "").toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
index e961bf8ba..28373e2ce 100644
--- a/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
@@ -10,59 +10,60 @@
 /**
  * Stop a running container.
  *
- * @param containerId - Id of the container
- * @param timeout - Timeout in seconds before killing the container. Defaults to 10 seconds.
+ * @param containerId
+ *            - Id of the container
+ * @param timeout
+ *            - Timeout in seconds before killing the container. Defaults to 10 seconds.
  *
  */
 public class StopContainerCmdImpl extends AbstrDockerCmd<StopContainerCmd, Void> implements StopContainerCmd {
 
-	private String containerId;
+    private String containerId;
 
-	private int timeout = 10;
+    private int timeout = 10;
 
-	public StopContainerCmdImpl(StopContainerCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public StopContainerCmdImpl(StopContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public int getTimeout() {
+    public int getTimeout() {
         return timeout;
     }
 
     @Override
-	public StopContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
+    public StopContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
 
-	@Override
-	public StopContainerCmd withTimeout(int timeout) {
-		checkArgument(timeout >= 0, "timeout must be greater or equal 0");
-		this.timeout = timeout;
-		return this;
-	}
+    @Override
+    public StopContainerCmd withTimeout(int timeout) {
+        checkArgument(timeout >= 0, "timeout must be greater or equal 0");
+        this.timeout = timeout;
+        return this;
+    }
 
     @Override
     public String toString() {
-        return new StringBuilder("stop ")
-            .append("--time=" + timeout + " ")
-            .append(containerId)
-            .toString();
+        return new StringBuilder("stop ").append("--time=" + timeout + " ").append(containerId).toString();
     }
-    
+
     /**
-	 * @throws NotFoundException No such container
-	 * @throws NotModifiedException Container already stopped
-	 */
-	@Override
-	public Void exec() throws NotFoundException, NotModifiedException {
-		return super.exec();
-	}
+     * @throws NotFoundException
+     *             No such container
+     * @throws NotModifiedException
+     *             Container already stopped
+     */
+    @Override
+    public Void exec() throws NotFoundException, NotModifiedException {
+        return super.exec();
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
index 8655ddfe8..e31151147 100644
--- a/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
@@ -4,87 +4,86 @@
 
 import com.github.dockerjava.api.command.TagImageCmd;
 
-
 /**
  * Tag an image into a repository
  *
- * @param image			The local image to tag (either a name or an id)
- * @param repository 	The repository to tag in
- * @param force         (not documented)
+ * @param image
+ *            The local image to tag (either a name or an id)
+ * @param repository
+ *            The repository to tag in
+ * @param force
+ *            (not documented)
  * 
  */
-public class TagImageCmdImpl extends AbstrDockerCmd<TagImageCmd, Void> implements TagImageCmd  {
+public class TagImageCmdImpl extends AbstrDockerCmd<TagImageCmd, Void> implements TagImageCmd {
 
-	private String imageId, repository, tag;
+    private String imageId, repository, tag;
 
-	private boolean force;
+    private boolean force;
 
-	public TagImageCmdImpl(TagImageCmd.Exec exec, String imageId, String repository, String tag) {
-		super(exec);
-		withImageId(imageId);
-		withRepository(repository);
-		withTag(tag);
-	}
+    public TagImageCmdImpl(TagImageCmd.Exec exec, String imageId, String repository, String tag) {
+        super(exec);
+        withImageId(imageId);
+        withRepository(repository);
+        withTag(tag);
+    }
 
     @Override
-	public String getImageId() {
+    public String getImageId() {
         return imageId;
     }
 
     @Override
-	public String getRepository() {
+    public String getRepository() {
         return repository;
     }
 
     @Override
-	public String getTag() {
+    public String getTag() {
         return tag;
     }
 
     @Override
-	public boolean hasForceEnabled() {
+    public boolean hasForceEnabled() {
         return force;
     }
 
     @Override
-	public TagImageCmd withImageId(String imageId) {
-		checkNotNull(imageId, "imageId was not specified");
-		this.imageId = imageId;
-		return this;
-	}
-
-	@Override
-	public TagImageCmd withRepository(String repository) {
-		checkNotNull(repository, "repository was not specified");
-		this.repository = repository;
-		return this;
-	}
-
-	@Override
-	public TagImageCmd withTag(String tag) {
-		checkNotNull(tag, "tag was not specified");
-		this.tag = tag;
-		return this;
-	}
-
-	@Override
-	public TagImageCmd withForce() {
-		return withForce(true);
-	}
-
-	@Override
-	public TagImageCmd withForce(boolean force) {
-		this.force = force;
-		return this;
-	}
+    public TagImageCmd withImageId(String imageId) {
+        checkNotNull(imageId, "imageId was not specified");
+        this.imageId = imageId;
+        return this;
+    }
+
+    @Override
+    public TagImageCmd withRepository(String repository) {
+        checkNotNull(repository, "repository was not specified");
+        this.repository = repository;
+        return this;
+    }
+
+    @Override
+    public TagImageCmd withTag(String tag) {
+        checkNotNull(tag, "tag was not specified");
+        this.tag = tag;
+        return this;
+    }
+
+    @Override
+    public TagImageCmd withForce() {
+        return withForce(true);
+    }
+
+    @Override
+    public TagImageCmd withForce(boolean force) {
+        this.force = force;
+        return this;
+    }
 
     @Override
     public String toString() {
-        return new StringBuilder("tag ")
-            .append(force ? "--force=true " : "")
-            .append(repository != null ? repository + "/" : "")
-            .append(imageId)
-            .append(tag != null ? ":" + tag : "")
-            .toString();
+        return new StringBuilder("tag ").append(force ? "--force=true " : "")
+                .append(repository != null ? repository + "/" : "").append(imageId)
+                .append(tag != null ? ":" + tag : "").toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
index 5f7190fb4..b4414f29e 100644
--- a/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
@@ -9,55 +9,53 @@
 /**
  * List processes running inside a container
  */
-public class TopContainerCmdImpl extends AbstrDockerCmd<TopContainerCmd, TopContainerResponse> implements TopContainerCmd {
+public class TopContainerCmdImpl extends AbstrDockerCmd<TopContainerCmd, TopContainerResponse> implements
+        TopContainerCmd {
 
-	private String containerId;
+    private String containerId;
 
-	private String psArgs;
+    private String psArgs;
 
-	public TopContainerCmdImpl(TopContainerCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public TopContainerCmdImpl(TopContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public String getPsArgs() {
+    public String getPsArgs() {
         return psArgs;
     }
 
     @Override
-	public TopContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
-
+    public TopContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
 
-	@Override
-	public TopContainerCmd withPsArgs(String psArgs) {
-		checkNotNull(psArgs, "psArgs was not specified");
-		this.psArgs = psArgs;
-		return this;
-	}
+    @Override
+    public TopContainerCmd withPsArgs(String psArgs) {
+        checkNotNull(psArgs, "psArgs was not specified");
+        this.psArgs = psArgs;
+        return this;
+    }
 
     @Override
     public String toString() {
-        return new StringBuilder("top ")
-            .append(containerId)
-            .append(psArgs != null ? " " + psArgs : "")
-            .toString();
+        return new StringBuilder("top ").append(containerId).append(psArgs != null ? " " + psArgs : "").toString();
     }
 
     /**
-     * @throws NotFoundException No such container
+     * @throws NotFoundException
+     *             No such container
      */
-	@Override
+    @Override
     public TopContainerResponse exec() throws NotFoundException {
-    	return super.exec();
+        return super.exec();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
index 92d715bcc..583d519c8 100644
--- a/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
@@ -8,42 +8,42 @@
 /**
  * Unpause a container.
  *
- * @param containerId - Id of the container
+ * @param containerId
+ *            - Id of the container
  *
  */
 public class UnpauseContainerCmdImpl extends AbstrDockerCmd<UnpauseContainerCmd, Void> implements UnpauseContainerCmd {
 
-	private String containerId;
+    private String containerId;
 
-	public UnpauseContainerCmdImpl(UnpauseContainerCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public UnpauseContainerCmdImpl(UnpauseContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public UnpauseContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
+    public UnpauseContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
 
-	@Override
+    @Override
     public String toString() {
-        return new StringBuilder("pause ")
-            .append(containerId)
-            .toString();
+        return new StringBuilder("pause ").append(containerId).toString();
+    }
+
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public Void exec() throws NotFoundException {
+        return super.exec();
     }
-	
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public Void exec() throws NotFoundException {
-		return super.exec();
-	}
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java
index 211ed1406..67f46ce3a 100644
--- a/src/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java
@@ -6,14 +6,14 @@
 /**
  * Returns the Docker version info.
  */
-public class VersionCmdImpl extends AbstrDockerCmd<VersionCmd, Version> implements VersionCmd  {
+public class VersionCmdImpl extends AbstrDockerCmd<VersionCmd, Version> implements VersionCmd {
 
-	 @Override
+    @Override
     public String toString() {
         return "version";
-    }   
-    
+    }
+
     public VersionCmdImpl(VersionCmd.Exec exec) {
-    	super(exec);
-	}
+        super(exec);
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
index d6250cc6f..702eebd33 100644
--- a/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
@@ -11,24 +11,24 @@
  */
 public class WaitContainerCmdImpl extends AbstrDockerCmd<WaitContainerCmd, Integer> implements WaitContainerCmd {
 
-	private String containerId;
+    private String containerId;
 
-	public WaitContainerCmdImpl(WaitContainerCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public WaitContainerCmdImpl(WaitContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public WaitContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
+    public WaitContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
 
     @Override
     public String toString() {
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 802299a7c..5997bbefa 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -31,213 +31,201 @@
  */
 public class Dockerfile {
 
-  public final File dockerFile;
+    public final File dockerFile;
 
-  public Dockerfile(File dockerFile) {
+    public Dockerfile(File dockerFile) {
 
-    if (!dockerFile.exists()) {
-      throw new IllegalStateException(
-          String.format("Dockerfile %s does not exist", dockerFile.getAbsolutePath()));
-    }
-
-    if (!dockerFile.isFile()) {
-      throw new IllegalStateException(
-          String.format("Dockerfile %s is not a file", dockerFile.getAbsolutePath()));
-    }
-
-    this.dockerFile = dockerFile;
-
-  }
-
-  private static class LineTransformer
-      implements Function<String, Optional<? extends DockerfileStatement>> {
+        if (!dockerFile.exists()) {
+            throw new IllegalStateException(String.format("Dockerfile %s does not exist", dockerFile.getAbsolutePath()));
+        }
 
-    private int line = 0;
+        if (!dockerFile.isFile()) {
+            throw new IllegalStateException(String.format("Dockerfile %s is not a file", dockerFile.getAbsolutePath()));
+        }
 
-    @Override
-    public Optional<? extends DockerfileStatement> apply(String input) {
-      try {
-        line++;
-        return DockerfileStatement.createFromLine(input);
+        this.dockerFile = dockerFile;
 
-      } catch (Exception ex) {
-        throw new DockerClientException("Error on dockerfile line " + line);
-      }
     }
-  }
 
-  public Iterable<DockerfileStatement> getStatements() throws IOException {
-    Collection<String> dockerFileContent = FileUtils.readLines(dockerFile);
+    private static class LineTransformer implements Function<String, Optional<? extends DockerfileStatement>> {
 
-    if (dockerFileContent.size() <= 0) {
-      throw new DockerClientException(String.format(
-          "Dockerfile %s is empty", dockerFile));
-    }
+        private int line = 0;
 
-    Collection<Optional<? extends DockerfileStatement>> optionals = Collections2
-        .transform(dockerFileContent, new LineTransformer());
-
-    return Optional.presentInstances(optionals);
-  }
-
-  public List<String> getIgnores() throws IOException {
-    List<String> ignores = new ArrayList<String>();
-    File dockerIgnoreFile = new File(getDockerFolder(), ".dockerignore");
-    if (dockerIgnoreFile.exists()) {
-      int lineNumber = 0;
-      List<String> dockerIgnoreFileContent = FileUtils.readLines(dockerIgnoreFile);
-      for (String pattern : dockerIgnoreFileContent) {
-        lineNumber++;
-        pattern = pattern.trim();
-        if (pattern.isEmpty()) {
-          continue; // skip empty lines
-        }
-        pattern = FilenameUtils.normalize(pattern);
-        try {
-          // validate pattern and make sure we aren't excluding Dockerfile
-          if (GoLangFileMatch.match(pattern, "Dockerfile")) {
-            throw new DockerClientException(
-                String.format(
-                    "Dockerfile is excluded by pattern '%s' on line %s in .dockerignore file",
-                    pattern, lineNumber));
-          }
-          ignores.add(pattern);
-        } catch (GoLangFileMatchException e) {
-          throw new DockerClientException(String.format(
-              "Invalid pattern '%s' on line %s in .dockerignore file", pattern, lineNumber));
+        @Override
+        public Optional<? extends DockerfileStatement> apply(String input) {
+            try {
+                line++;
+                return DockerfileStatement.createFromLine(input);
+
+            } catch (Exception ex) {
+                throw new DockerClientException("Error on dockerfile line " + line);
+            }
         }
-      }
     }
-    return ignores;
-  }
 
+    public Iterable<DockerfileStatement> getStatements() throws IOException {
+        Collection<String> dockerFileContent = FileUtils.readLines(dockerFile);
 
-  public ScannedResult parse() throws IOException {
-    return new ScannedResult();
-  }
-
+        if (dockerFileContent.size() <= 0) {
+            throw new DockerClientException(String.format("Dockerfile %s is empty", dockerFile));
+        }
 
-  public File getDockerFolder() {
-    return dockerFile.getParentFile();
-  }
+        Collection<Optional<? extends DockerfileStatement>> optionals = Collections2.transform(dockerFileContent,
+                new LineTransformer());
 
+        return Optional.presentInstances(optionals);
+    }
 
-  /**
-   * Result of scanning / parsing a docker file.
-   */
-  public class ScannedResult {
+    public List<String> getIgnores() throws IOException {
+        List<String> ignores = new ArrayList<String>();
+        File dockerIgnoreFile = new File(getDockerFolder(), ".dockerignore");
+        if (dockerIgnoreFile.exists()) {
+            int lineNumber = 0;
+            List<String> dockerIgnoreFileContent = FileUtils.readLines(dockerIgnoreFile);
+            for (String pattern : dockerIgnoreFileContent) {
+                lineNumber++;
+                pattern = pattern.trim();
+                if (pattern.isEmpty()) {
+                    continue; // skip empty lines
+                }
+                pattern = FilenameUtils.normalize(pattern);
+                try {
+                    // validate pattern and make sure we aren't excluding Dockerfile
+                    if (GoLangFileMatch.match(pattern, "Dockerfile")) {
+                        throw new DockerClientException(String.format(
+                                "Dockerfile is excluded by pattern '%s' on line %s in .dockerignore file", pattern,
+                                lineNumber));
+                    }
+                    ignores.add(pattern);
+                } catch (GoLangFileMatchException e) {
+                    throw new DockerClientException(String.format(
+                            "Invalid pattern '%s' on line %s in .dockerignore file", pattern, lineNumber));
+                }
+            }
+        }
+        return ignores;
+    }
 
-    final List<String> ignores;
-    final Map<String, String> environmentMap = new HashMap<String, String>();
-    final List<File> filesToAdd = new ArrayList<File>();
+    public ScannedResult parse() throws IOException {
+        return new ScannedResult();
+    }
 
-    public InputStream buildDockerFolderTar() {
-        return buildDockerFolderTar(getDockerFolder());
+    public File getDockerFolder() {
+        return dockerFile.getParentFile();
     }
 
-    public InputStream buildDockerFolderTar(File directory) {
+    /**
+     * Result of scanning / parsing a docker file.
+     */
+    public class ScannedResult {
 
-      // ARCHIVE TAR
-      File dockerFolderTar = null;
+        final List<String> ignores;
 
-      try {
-        String archiveNameWithOutExtension = UUID.randomUUID().toString();
+        final Map<String, String> environmentMap = new HashMap<String, String>();
 
-        dockerFolderTar = CompressArchiveUtil.archiveTARFiles(directory,
-                                                              filesToAdd,
-                                                              archiveNameWithOutExtension);
-        return FileUtils.openInputStream(dockerFolderTar);
+        final List<File> filesToAdd = new ArrayList<File>();
 
-      } catch (IOException ex) {
-        FileUtils.deleteQuietly(dockerFolderTar);
-        throw new DockerClientException(
-            "Error occurred while preparing Docker context folder.", ex);
-      }
-    }
+        public InputStream buildDockerFolderTar() {
+            return buildDockerFolderTar(getDockerFolder());
+        }
 
-    @Override
-    public String toString() {
-      return Objects.toStringHelper(this)
-          .add("ignores", ignores)
-          .add("environmentMap", environmentMap)
-          .add("filesToAdd", filesToAdd)
-          .toString();
-    }
+        public InputStream buildDockerFolderTar(File directory) {
 
-    public ScannedResult() throws IOException {
+            // ARCHIVE TAR
+            File dockerFolderTar = null;
 
-      ignores = getIgnores();
-      filesToAdd.add(dockerFile);
+            try {
+                String archiveNameWithOutExtension = UUID.randomUUID().toString();
 
-      for (DockerfileStatement statement : getStatements()) {
-        if (statement instanceof DockerfileStatement.Env) {
-          processEnvStatement((DockerfileStatement.Env) statement);
-        } else if (statement instanceof DockerfileStatement.Add) {
-          processAddStatement((DockerfileStatement.Add) statement);
-        }
-      }
-    }
+                dockerFolderTar = CompressArchiveUtil.archiveTARFiles(directory, filesToAdd,
+                        archiveNameWithOutExtension);
+                return FileUtils.openInputStream(dockerFolderTar);
 
-    private void processAddStatement(DockerfileStatement.Add add) throws IOException {
+            } catch (IOException ex) {
+                FileUtils.deleteQuietly(dockerFolderTar);
+                throw new DockerClientException("Error occurred while preparing Docker context folder.", ex);
+            }
+        }
 
-      add = add.transform(environmentMap);
+        @Override
+        public String toString() {
+            return Objects.toStringHelper(this).add("ignores", ignores).add("environmentMap", environmentMap)
+                    .add("filesToAdd", filesToAdd).toString();
+        }
 
-      if (add.isFileResource()) {
+        public ScannedResult() throws IOException {
 
-        File dockerFolder = getDockerFolder();
-        String resource = add.source;
+            ignores = getIgnores();
+            filesToAdd.add(dockerFile);
 
-        File src = new File(resource);
-        if (!src.isAbsolute()) {
-          src = new File(dockerFolder, resource);
-        } else {
-          throw new DockerClientException(String.format(
-              "Source file %s must be relative to %s",
-              src, dockerFolder));
+            for (DockerfileStatement statement : getStatements()) {
+                if (statement instanceof DockerfileStatement.Env) {
+                    processEnvStatement((DockerfileStatement.Env) statement);
+                } else if (statement instanceof DockerfileStatement.Add) {
+                    processAddStatement((DockerfileStatement.Add) statement);
+                }
+            }
         }
 
-        if (src.exists()) {
-          src = src.getCanonicalFile();
-          if (src.isDirectory()) {
-            Collection<File> files = FileUtils.listFiles(src, new GoLangMatchFileFilter(src, ignores), TrueFileFilter.INSTANCE);
-            filesToAdd.addAll(files);
-          } else if (!GoLangFileMatch.match(ignores, FilePathUtil.relativize(dockerFolder, src))) {
-            filesToAdd.add(src);
-          } else {
-            throw new DockerClientException(String.format("Source file %s is excluded by .dockerignore file", src));
-          }            
-        } else {
-          filesToAdd.addAll(resolveWildcards(src, ignores));
+        private void processAddStatement(DockerfileStatement.Add add) throws IOException {
+
+            add = add.transform(environmentMap);
+
+            if (add.isFileResource()) {
+
+                File dockerFolder = getDockerFolder();
+                String resource = add.source;
+
+                File src = new File(resource);
+                if (!src.isAbsolute()) {
+                    src = new File(dockerFolder, resource);
+                } else {
+                    throw new DockerClientException(String.format("Source file %s must be relative to %s", src,
+                            dockerFolder));
+                }
+
+                if (src.exists()) {
+                    src = src.getCanonicalFile();
+                    if (src.isDirectory()) {
+                        Collection<File> files = FileUtils.listFiles(src, new GoLangMatchFileFilter(src, ignores),
+                                TrueFileFilter.INSTANCE);
+                        filesToAdd.addAll(files);
+                    } else if (!GoLangFileMatch.match(ignores, FilePathUtil.relativize(dockerFolder, src))) {
+                        filesToAdd.add(src);
+                    } else {
+                        throw new DockerClientException(String.format(
+                                "Source file %s is excluded by .dockerignore file", src));
+                    }
+                } else {
+                    filesToAdd.addAll(resolveWildcards(src, ignores));
+                }
+            }
         }
-      }
-    }
 
-    private Collection<File> resolveWildcards(File file, List<String> ignores) {
-      List<File> filesToAdd = new ArrayList<File>();
-
-      File parent = file.getParentFile();
-      if (parent != null) {
-        if (parent.isDirectory()) {
-          Collection<File> files = FileUtils.listFiles(parent,
-                                                       new GoLangMatchFileFilter(parent, ignores),
-                                                       TrueFileFilter.INSTANCE);
-          filesToAdd.addAll(files);
-        } else {
-          filesToAdd.addAll(resolveWildcards(parent, ignores));
+        private Collection<File> resolveWildcards(File file, List<String> ignores) {
+            List<File> filesToAdd = new ArrayList<File>();
+
+            File parent = file.getParentFile();
+            if (parent != null) {
+                if (parent.isDirectory()) {
+                    Collection<File> files = FileUtils.listFiles(parent, new GoLangMatchFileFilter(parent, ignores),
+                            TrueFileFilter.INSTANCE);
+                    filesToAdd.addAll(files);
+                } else {
+                    filesToAdd.addAll(resolveWildcards(parent, ignores));
+                }
+            } else {
+                throw new DockerClientException(String.format("Source file %s doesn't exist", file));
+            }
+
+            return filesToAdd;
         }
-      } else {
-        throw new DockerClientException(String.format(
-            "Source file %s doesn't exist", file));
-      }
 
-      return filesToAdd;
-    }
+        private void processEnvStatement(DockerfileStatement.Env env) {
 
-    private void processEnvStatement(DockerfileStatement.Env env) {
+            environmentMap.put(env.variable, env.value);
+        }
 
-      environmentMap.put(env.variable, env.value);
     }
 
-  }
-
 }
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java b/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
index c048f77dd..7b6581e42 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
@@ -16,191 +16,182 @@
  */
 public abstract class DockerfileStatement<T extends DockerfileStatement> {
 
-  private DockerfileStatement() {
-  }
+    private DockerfileStatement() {
+    }
 
-  public T transform(Map<String, String> env) {
-    return (T) this;
-  }
+    public T transform(Map<String, String> env) {
+        return (T) this;
+    }
 
-  protected String filterForEnvironmentVars(Map<String, String> environmentMap,
-                                            String extractedResource) {
+    protected String filterForEnvironmentVars(Map<String, String> environmentMap, String extractedResource) {
 
-    if (environmentMap.size() > 0) {
+        if (environmentMap.size() > 0) {
 
-      String currentResourceContent = extractedResource;
+            String currentResourceContent = extractedResource;
 
-      for (Map.Entry<String, String> entry : environmentMap.entrySet()) {
+            for (Map.Entry<String, String> entry : environmentMap.entrySet()) {
 
-        String variable = entry.getKey();
+                String variable = entry.getKey();
 
-        String replacementValue = entry.getValue();
+                String replacementValue = entry.getValue();
 
-        // handle: $VARIABLE case
-        currentResourceContent = currentResourceContent.replaceAll(
-            "\\$" + variable, Matcher.quoteReplacement(replacementValue));
+                // handle: $VARIABLE case
+                currentResourceContent = currentResourceContent.replaceAll("\\$" + variable,
+                        Matcher.quoteReplacement(replacementValue));
 
-        // handle ${VARIABLE} case
-        currentResourceContent = currentResourceContent.replaceAll(
-            "\\$\\{" + variable + "\\}", Matcher.quoteReplacement(replacementValue));
+                // handle ${VARIABLE} case
+                currentResourceContent = currentResourceContent.replaceAll("\\$\\{" + variable + "\\}",
+                        Matcher.quoteReplacement(replacementValue));
 
-      }
+            }
 
-      return currentResourceContent;
-    } else {
-      return extractedResource;
+            return currentResourceContent;
+        } else {
+            return extractedResource;
+        }
     }
-  }
 
+    /**
+     * A statement that we don't particularly care about.
+     */
+    public static class OtherLine extends DockerfileStatement {
 
-  /**
-   * A statement that we don't particularly care about.
-   */
-  public static class OtherLine extends DockerfileStatement {
+        public final String statement;
 
-    public final String statement;
+        public OtherLine(String statement) {
+            this.statement = statement;
+        }
 
-    public OtherLine(String statement) {
-      this.statement = statement;
+        @Override
+        public String toString() {
+            return statement;
+        }
     }
 
-    @Override
-    public String toString() {
-      return statement;
-    }
-  }
+    /**
+     * An ADD or a COPY
+     */
+    public static class Add extends DockerfileStatement<Add> {
 
-  /**
-   * An ADD or a COPY
-   */
-  public static class Add extends DockerfileStatement<Add> {
+        private static final Pattern ADD_OR_COPY_PATTERN = Pattern.compile("^(ADD|COPY)\\s+(.*)\\s+(.*)$");
 
-    private static final Pattern ADD_OR_COPY_PATTERN = Pattern
-        .compile("^(ADD|COPY)\\s+(.*)\\s+(.*)$");
+        public final String source;
 
-    public final String source;
-    public final String destination;
+        public final String destination;
 
-    private Add(String source, String destination) {
-      this.source = source;
-      this.destination = destination;
-    }
+        private Add(String source, String destination) {
+            this.source = source;
+            this.destination = destination;
+        }
 
-    private Add(final Matcher matcher) {
-      source = matcher.group(2);
-      destination = matcher.group(3);
-    }
+        private Add(final Matcher matcher) {
+            source = matcher.group(2);
+            destination = matcher.group(3);
+        }
 
-    @Override
-    public Add transform(Map<String, String> env) {
-      String resource = filterForEnvironmentVars(env, source).trim();
-      return new Add(resource, destination);
-    }
+        @Override
+        public Add transform(Map<String, String> env) {
+            String resource = filterForEnvironmentVars(env, source).trim();
+            return new Add(resource, destination);
+        }
 
-    public boolean isFileResource() {
-      URI uri;
-      try {
-        uri = new URI(source);
-      } catch (URISyntaxException e) {
-        return false;
-      }
-      return uri.getScheme() == null || "file".equals(uri.getScheme());
-    }
+        public boolean isFileResource() {
+            URI uri;
+            try {
+                uri = new URI(source);
+            } catch (URISyntaxException e) {
+                return false;
+            }
+            return uri.getScheme() == null || "file".equals(uri.getScheme());
+        }
 
-    /**
-     * Createa an Add if it matches, or missing if not.
-     *
-     * @param statement statement that may be an ADD or a COPY
-     * @return optional typed item.
-     */
-    public static Optional<Add> create(String statement) {
-      Matcher matcher = ADD_OR_COPY_PATTERN.matcher(statement.trim());
-      if (!matcher.find()) {
-        return Optional.absent();
-      }
+        /**
+         * Createa an Add if it matches, or missing if not.
+         *
+         * @param statement
+         *            statement that may be an ADD or a COPY
+         * @return optional typed item.
+         */
+        public static Optional<Add> create(String statement) {
+            Matcher matcher = ADD_OR_COPY_PATTERN.matcher(statement.trim());
+            if (!matcher.find()) {
+                return Optional.absent();
+            }
 
-      if (matcher.groupCount() != 3) {
-        throw new DockerClientException("Wrong ADD or COPY format");
-      }
-
-      return Optional.of(new Add(matcher));
-    }
+            if (matcher.groupCount() != 3) {
+                throw new DockerClientException("Wrong ADD or COPY format");
+            }
 
+            return Optional.of(new Add(matcher));
+        }
 
-    @Override
-    public String toString() {
-      return Objects.toStringHelper(this)
-          .add("source", source)
-          .add("destination", destination)
-          .toString();
+        @Override
+        public String toString() {
+            return Objects.toStringHelper(this).add("source", source).add("destination", destination).toString();
+        }
     }
-  }
 
-  public static class Env extends DockerfileStatement<Env> {
+    public static class Env extends DockerfileStatement<Env> {
 
-    private static final Pattern ENV_PATTERN = Pattern
-        .compile("^ENV\\s+(.*)\\s+(.*)$");
+        private static final Pattern ENV_PATTERN = Pattern.compile("^ENV\\s+(.*)\\s+(.*)$");
 
-    public final String variable;
-    public final String value;
+        public final String variable;
 
-    private Env(String variable, String value) {
-      this.variable = variable;
-      this.value = value;
-    }
+        public final String value;
 
-    private Env(Matcher envMatcher) {
-      this.variable = envMatcher.group(1).trim();
-      this.value = envMatcher.group(2).trim();
-    }
+        private Env(String variable, String value) {
+            this.variable = variable;
+            this.value = value;
+        }
 
-    public static Optional<Env> create(String statement) {
-      Matcher matcher = ENV_PATTERN.matcher(statement.trim());
-      if (!matcher.find()) {
-        return Optional.absent();
-      }
+        private Env(Matcher envMatcher) {
+            this.variable = envMatcher.group(1).trim();
+            this.value = envMatcher.group(2).trim();
+        }
 
-      if (matcher.groupCount() != 2) {
-        throw new DockerClientException("Wrong ENV format");
-      }
+        public static Optional<Env> create(String statement) {
+            Matcher matcher = ENV_PATTERN.matcher(statement.trim());
+            if (!matcher.find()) {
+                return Optional.absent();
+            }
 
-      return Optional.of(new Env(matcher));
-    }
+            if (matcher.groupCount() != 2) {
+                throw new DockerClientException("Wrong ENV format");
+            }
 
-    @Override
-    public String toString() {
-      return Objects.toStringHelper(this)
-          .add("variable", variable)
-          .add("value", value)
-          .toString();
-    }
-  }
-
-  /**
-   * Return a dockerfile statement
-   */
-  public static Optional<? extends DockerfileStatement> createFromLine(String cmd) {
-    if (cmd.trim().isEmpty() || cmd.startsWith("#")) {
-      return Optional.absent();
+            return Optional.of(new Env(matcher));
+        }
+
+        @Override
+        public String toString() {
+            return Objects.toStringHelper(this).add("variable", variable).add("value", value).toString();
+        }
     }
 
-    Optional<? extends DockerfileStatement> line;
+    /**
+     * Return a dockerfile statement
+     */
+    public static Optional<? extends DockerfileStatement> createFromLine(String cmd) {
+        if (cmd.trim().isEmpty() || cmd.startsWith("#")) {
+            return Optional.absent();
+        }
 
-    line = Add.create(cmd);
+        Optional<? extends DockerfileStatement> line;
 
-    if (line.isPresent()) {
-      return line;
-    }
+        line = Add.create(cmd);
 
-    line = Env.create(cmd);
+        if (line.isPresent()) {
+            return line;
+        }
 
-    if (line.isPresent()) {
-      return line;
-    }
+        line = Env.create(cmd);
 
-    return Optional.of(new OtherLine(cmd));
+        if (line.isPresent()) {
+            return line;
+        }
 
+        return Optional.of(new OtherLine(cmd));
 
-  }
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/core/util/FollowRedirectsFilter.java b/src/main/java/com/github/dockerjava/core/util/FollowRedirectsFilter.java
index b4431b1f4..e4ba60f90 100644
--- a/src/main/java/com/github/dockerjava/core/util/FollowRedirectsFilter.java
+++ b/src/main/java/com/github/dockerjava/core/util/FollowRedirectsFilter.java
@@ -9,27 +9,24 @@
 import javax.ws.rs.core.Response;
 
 /**
- * Default implementation of RedirectStrategy honors the restrictions
- * on automatic redirection of entity enclosing methods such as POST
- * and PUT imposed by the HTTP specification. 302 Moved Temporarily,
- * 301 Moved Permanently and 307 Temporary Redirect status codes will
- * result in an automatic redirect of HEAD and GET methods only.
+ * Default implementation of RedirectStrategy honors the restrictions on automatic redirection of entity enclosing
+ * methods such as POST and PUT imposed by the HTTP specification. 302 Moved Temporarily, 301 Moved Permanently and 307
+ * Temporary Redirect status codes will result in an automatic redirect of HEAD and GET methods only.
  * 
  * {@link org.apache.http.impl.client.DefaultRedirectStrategy}
  *
- * This filter allows arbitrary redirection for other methods.  
+ * This filter allows arbitrary redirection for other methods.
  */
 public class FollowRedirectsFilter implements ClientResponseFilter {
 
     @Override
-    public void filter(ClientRequestContext requestContext,
-            ClientResponseContext responseContext) throws IOException {
+    public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException {
         if (!responseContext.getStatusInfo().getFamily().equals(Response.Status.Family.REDIRECTION)) {
             return;
         }
 
-        Response resp = requestContext.getClient().target(responseContext.getLocation())
-                .request().method(requestContext.getMethod());
+        Response resp = requestContext.getClient().target(responseContext.getLocation()).request()
+                .method(requestContext.getMethod());
         responseContext.setEntityStream((InputStream) resp.getEntity());
         responseContext.setStatusInfo(resp.getStatusInfo());
         responseContext.setStatus(resp.getStatus());
diff --git a/src/main/java/com/github/dockerjava/core/util/JsonClientFilter.java b/src/main/java/com/github/dockerjava/core/util/JsonClientFilter.java
index f2911d961..19befc4b2 100644
--- a/src/main/java/com/github/dockerjava/core/util/JsonClientFilter.java
+++ b/src/main/java/com/github/dockerjava/core/util/JsonClientFilter.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.core.util;
 
-
 import javax.ws.rs.client.ClientRequestContext;
 import javax.ws.rs.client.ClientResponseContext;
 import javax.ws.rs.client.ClientResponseFilter;
@@ -14,10 +13,10 @@
  */
 public class JsonClientFilter implements ClientResponseFilter {
 
-
     @Override
     public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException {
-        if (responseContext.getMediaType() != null && responseContext.getMediaType().isCompatible(MediaType.TEXT_PLAIN_TYPE)) {
+        if (responseContext.getMediaType() != null
+                && responseContext.getMediaType().isCompatible(MediaType.TEXT_PLAIN_TYPE)) {
             String newContentType = "application/json" + responseContext.getMediaType().toString().substring(10);
             responseContext.getHeaders().putSingle("Content-Type", newContentType);
         }
diff --git a/src/main/java/com/github/dockerjava/core/util/LoggingFilter.java b/src/main/java/com/github/dockerjava/core/util/LoggingFilter.java
index 5a72ba237..f7314109b 100644
--- a/src/main/java/com/github/dockerjava/core/util/LoggingFilter.java
+++ b/src/main/java/com/github/dockerjava/core/util/LoggingFilter.java
@@ -40,7 +40,6 @@
  * holder.
  */
 
-
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -72,7 +71,6 @@
 import javax.ws.rs.ext.WriterInterceptorContext;
 import javax.annotation.Priority;
 
-
 /**
  * Universal logging filter.
  *
@@ -88,44 +86,50 @@ public class LoggingFilter implements ContainerRequestFilter, ClientRequestFilte
         ClientResponseFilter, WriterInterceptor {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LoggingFilter.class.getName());
+
     private static final String NOTIFICATION_PREFIX = "* ";
+
     private static final String REQUEST_PREFIX = "> ";
+
     private static final String RESPONSE_PREFIX = "< ";
+
     private static final String ENTITY_LOGGER_PROPERTY = LoggingFilter.class.getName() + ".entityLogger";
 
-    private static final Comparator<Map.Entry<String, List<String>>> COMPARATOR =
-            new Comparator<Map.Entry<String, List<String>>>() {
+    private static final Comparator<Map.Entry<String, List<String>>> COMPARATOR = new Comparator<Map.Entry<String, List<String>>>() {
 
-                @Override
-                public int compare(final Map.Entry<String, List<String>> o1, final Map.Entry<String, List<String>> o2) {
-                    return o1.getKey().compareToIgnoreCase(o2.getKey());
-                }
-            };
+        @Override
+        public int compare(final Map.Entry<String, List<String>> o1, final Map.Entry<String, List<String>> o2) {
+            return o1.getKey().compareToIgnoreCase(o2.getKey());
+        }
+    };
 
     private static final int DEFAULT_MAX_ENTITY_SIZE = 8 * 1024;
 
     //
     @SuppressWarnings("NonConstantLogger")
     private final Logger logger;
+
     private final AtomicLong _id = new AtomicLong(0);
+
     private final boolean printEntity;
+
     private final int maxEntitySize;
 
     /**
-     * Create a logging filter logging the request and response to a default JDK
-     * logger, named as the fully qualified class name of this class. Entity
-     * logging is turned off by default.
+     * Create a logging filter logging the request and response to a default JDK logger, named as the fully qualified
+     * class name of this class. Entity logging is turned off by default.
      */
     public LoggingFilter() {
         this(LOGGER, false);
     }
 
     /**
-     * Create a logging filter with custom logger and custom settings of entity
-     * logging.
+     * Create a logging filter with custom logger and custom settings of entity logging.
      *
-     * @param logger      the logger to log requests and responses.
-     * @param printEntity if true, entity will be logged as well up to the default maxEntitySize, which is 8KB
+     * @param logger
+     *            the logger to log requests and responses.
+     * @param printEntity
+     *            if true, entity will be logged as well up to the default maxEntitySize, which is 8KB
      */
     @SuppressWarnings("BooleanParameter")
     public LoggingFilter(final Logger logger, final boolean printEntity) {
@@ -135,13 +139,15 @@ public LoggingFilter(final Logger logger, final boolean printEntity) {
     }
 
     /**
-     * Creates a logging filter with custom logger and entity logging turned on, but potentially limiting the size
-     * of entity to be buffered and logged.
+     * Creates a logging filter with custom logger and entity logging turned on, but potentially limiting the size of
+     * entity to be buffered and logged.
      *
-     * @param logger        the logger to log requests and responses.
-     * @param maxEntitySize maximum number of entity bytes to be logged (and buffered) - if the entity is larger,
-     *                      logging filter will print (and buffer in memory) only the specified number of bytes
-     *                      and print "...more..." string at the end.
+     * @param logger
+     *            the logger to log requests and responses.
+     * @param maxEntitySize
+     *            maximum number of entity bytes to be logged (and buffered) - if the entity is larger, logging filter
+     *            will print (and buffer in memory) only the specified number of bytes and print "...more..." string at
+     *            the end.
      */
     public LoggingFilter(final Logger logger, final int maxEntitySize) {
         this.logger = logger;
@@ -160,25 +166,21 @@ private StringBuilder prefixId(final StringBuilder b, final long id) {
         return b;
     }
 
-    private void printRequestLine(final StringBuilder b, final String note, final long id, final String method, final URI uri) {
-        prefixId(b, id).append(NOTIFICATION_PREFIX)
-                .append(note)
-                .append(" on thread ").append(Thread.currentThread().getName())
-                .append("\n");
-        prefixId(b, id).append(REQUEST_PREFIX).append(method).append(" ").
-                append(uri.toASCIIString()).append("\n");
+    private void printRequestLine(final StringBuilder b, final String note, final long id, final String method,
+            final URI uri) {
+        prefixId(b, id).append(NOTIFICATION_PREFIX).append(note).append(" on thread ")
+                .append(Thread.currentThread().getName()).append("\n");
+        prefixId(b, id).append(REQUEST_PREFIX).append(method).append(" ").append(uri.toASCIIString()).append("\n");
     }
 
     private void printResponseLine(final StringBuilder b, final String note, final long id, final int status) {
-        prefixId(b, id).append(NOTIFICATION_PREFIX)
-                .append(note)
-                .append(" on thread ").append(Thread.currentThread().getName()).append("\n");
-        prefixId(b, id).append(RESPONSE_PREFIX).
-                append(Integer.toString(status)).
-                append("\n");
+        prefixId(b, id).append(NOTIFICATION_PREFIX).append(note).append(" on thread ")
+                .append(Thread.currentThread().getName()).append("\n");
+        prefixId(b, id).append(RESPONSE_PREFIX).append(Integer.toString(status)).append("\n");
     }
 
-    private void printPrefixedHeaders(final StringBuilder b, final long id, final String prefix, final MultivaluedMap<String, String> headers) {
+    private void printPrefixedHeaders(final StringBuilder b, final long id, final String prefix,
+            final MultivaluedMap<String, String> headers) {
         for (final Map.Entry<String, List<String>> headerEntry : getSortedHeaders(headers.entrySet())) {
             final List<?> val = headerEntry.getValue();
             final String header = headerEntry.getKey();
@@ -201,7 +203,8 @@ private void printPrefixedHeaders(final StringBuilder b, final long id, final St
     }
 
     private Set<Map.Entry<String, List<String>>> getSortedHeaders(final Set<Map.Entry<String, List<String>>> headers) {
-        final TreeSet<Map.Entry<String, List<String>>> sortedHeaders = new TreeSet<Map.Entry<String, List<String>>>(COMPARATOR);
+        final TreeSet<Map.Entry<String, List<String>>> sortedHeaders = new TreeSet<Map.Entry<String, List<String>>>(
+                COMPARATOR);
         sortedHeaders.addAll(headers);
         return sortedHeaders;
     }
@@ -241,7 +244,8 @@ public void filter(final ClientRequestContext context) throws IOException {
     }
 
     @Override
-    public void filter(final ClientRequestContext requestContext, final ClientResponseContext responseContext) throws IOException {
+    public void filter(final ClientRequestContext requestContext, final ClientResponseContext responseContext)
+            throws IOException {
         final long id = this._id.incrementAndGet();
         final StringBuilder b = new StringBuilder();
 
@@ -260,7 +264,8 @@ public void filter(final ContainerRequestContext context) throws IOException {
         final long id = this._id.incrementAndGet();
         final StringBuilder b = new StringBuilder();
 
-        printRequestLine(b, "Server has received a request", id, context.getMethod(), context.getUriInfo().getRequestUri());
+        printRequestLine(b, "Server has received a request", id, context.getMethod(), context.getUriInfo()
+                .getRequestUri());
         printPrefixedHeaders(b, id, REQUEST_PREFIX, context.getHeaders());
 
         if (printEntity && context.hasEntity()) {
@@ -271,7 +276,8 @@ public void filter(final ContainerRequestContext context) throws IOException {
     }
 
     @Override
-    public void filter(final ContainerRequestContext requestContext, final ContainerResponseContext responseContext) throws IOException {
+    public void filter(final ContainerRequestContext requestContext, final ContainerResponseContext responseContext)
+            throws IOException {
         final long id = this._id.incrementAndGet();
         final StringBuilder b = new StringBuilder();
 
@@ -289,7 +295,8 @@ public void filter(final ContainerRequestContext requestContext, final Container
     }
 
     @Override
-    public void aroundWriteTo(final WriterInterceptorContext writerInterceptorContext) throws IOException, WebApplicationException {
+    public void aroundWriteTo(final WriterInterceptorContext writerInterceptorContext) throws IOException,
+            WebApplicationException {
         final LoggingStream stream = (LoggingStream) writerInterceptorContext.getProperty(ENTITY_LOGGER_PROPERTY);
         writerInterceptorContext.proceed();
         if (stream != null) {
@@ -299,7 +306,9 @@ public void aroundWriteTo(final WriterInterceptorContext writerInterceptorContex
 
     private class LoggingStream extends OutputStream {
         private final StringBuilder b;
+
         private final OutputStream inner;
+
         private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
         LoggingStream(final StringBuilder b, final OutputStream inner) {
diff --git a/src/main/java/com/github/dockerjava/core/util/ResponseStatusExceptionFilter.java b/src/main/java/com/github/dockerjava/core/util/ResponseStatusExceptionFilter.java
index 7e9708564..24f31fb14 100644
--- a/src/main/java/com/github/dockerjava/core/util/ResponseStatusExceptionFilter.java
+++ b/src/main/java/com/github/dockerjava/core/util/ResponseStatusExceptionFilter.java
@@ -22,75 +22,71 @@
 import com.github.dockerjava.api.UnauthorizedException;
 
 /**
- * This {@link ClientResponseFilter} implementation detects http status codes and throws {@link DockerException}s 
+ * This {@link ClientResponseFilter} implementation detects http status codes and throws {@link DockerException}s
  *
  * @author marcus
  *
  */
 public class ResponseStatusExceptionFilter implements ClientResponseFilter {
 
-
     @Override
     public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException {
-    	int status = responseContext.getStatus();
-		switch (status) {
-		case 200:
-		case 201:	
-		case 204:
-			return;
-		case 304:
-			throw new NotModifiedException(getBodyAsMessage(responseContext));
-		case 400:
-			throw new BadRequestException(getBodyAsMessage(responseContext));
-		case 401:
-			throw new UnauthorizedException(getBodyAsMessage(responseContext));	
-		case 404:
-			throw new NotFoundException(getBodyAsMessage(responseContext));
-		case 406:
-			throw new NotAcceptableException(getBodyAsMessage(responseContext));
-		case 409:
-			throw new ConflictException(getBodyAsMessage(responseContext));
-		case 500:
-			throw new InternalServerErrorException(getBodyAsMessage(responseContext));
-		default:
-			throw new DockerException(getBodyAsMessage(responseContext), status);
-		}
+        int status = responseContext.getStatus();
+        switch (status) {
+        case 200:
+        case 201:
+        case 204:
+            return;
+        case 304:
+            throw new NotModifiedException(getBodyAsMessage(responseContext));
+        case 400:
+            throw new BadRequestException(getBodyAsMessage(responseContext));
+        case 401:
+            throw new UnauthorizedException(getBodyAsMessage(responseContext));
+        case 404:
+            throw new NotFoundException(getBodyAsMessage(responseContext));
+        case 406:
+            throw new NotAcceptableException(getBodyAsMessage(responseContext));
+        case 409:
+            throw new ConflictException(getBodyAsMessage(responseContext));
+        case 500:
+            throw new InternalServerErrorException(getBodyAsMessage(responseContext));
+        default:
+            throw new DockerException(getBodyAsMessage(responseContext), status);
+        }
     }
 
-	private String getBodyAsMessage(ClientResponseContext responseContext)
-			throws IOException {
-	    if (responseContext.hasEntity()) {
-	        int contentLength = responseContext.getLength();
-	        if (contentLength != -1) {
-	            byte[] buffer = new byte[contentLength];
-	            try {
-	                InputStream entityStream = responseContext.getEntityStream();
-                  IOUtils.readFully(entityStream, buffer);
-                  entityStream.close();
-	            }
-	            catch (EOFException e) {
-	                return null;
-	            }
-	            Charset charset = null;
-	            MediaType mediaType = responseContext.getMediaType();
-	            if (mediaType != null) {
-	                String charsetName = mediaType.getParameters().get("charset");
-	                if (charsetName != null) {
-	                    try {
-	                        charset = Charset.forName(charsetName);
-                        }
-                        catch (Exception e) {
-                            //Do noting...
+    private String getBodyAsMessage(ClientResponseContext responseContext) throws IOException {
+        if (responseContext.hasEntity()) {
+            int contentLength = responseContext.getLength();
+            if (contentLength != -1) {
+                byte[] buffer = new byte[contentLength];
+                try {
+                    InputStream entityStream = responseContext.getEntityStream();
+                    IOUtils.readFully(entityStream, buffer);
+                    entityStream.close();
+                } catch (EOFException e) {
+                    return null;
+                }
+                Charset charset = null;
+                MediaType mediaType = responseContext.getMediaType();
+                if (mediaType != null) {
+                    String charsetName = mediaType.getParameters().get("charset");
+                    if (charsetName != null) {
+                        try {
+                            charset = Charset.forName(charsetName);
+                        } catch (Exception e) {
+                            // Do noting...
                         }
-	                }
-	            }
-	            if (charset == null) {
+                    }
+                }
+                if (charset == null) {
                     charset = Charset.defaultCharset();
-	            }
-	            String message = new String(buffer, charset);
-	            return message;
-	        }
-	    }
-	    return null;
-	}
+                }
+                String message = new String(buffer, charset);
+                return message;
+            }
+        }
+        return null;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/util/SelectiveLoggingFilter.java b/src/main/java/com/github/dockerjava/core/util/SelectiveLoggingFilter.java
index 8cfe88b73..d4c9b8400 100644
--- a/src/main/java/com/github/dockerjava/core/util/SelectiveLoggingFilter.java
+++ b/src/main/java/com/github/dockerjava/core/util/SelectiveLoggingFilter.java
@@ -11,18 +11,16 @@
 
 import org.slf4j.Logger;
 
-
 /**
- * A version of the logging filter that will avoid trying to log entities which can cause
- * issues with the console.
+ * A version of the logging filter that will avoid trying to log entities which can cause issues with the console.
  * 
  * @author sfitts
  *
  */
 public class SelectiveLoggingFilter extends LoggingFilter {
-    
+
     // Immutable'ish
-    private static final Set<String> SKIPPED_CONTENT; 
+    private static final Set<String> SKIPPED_CONTENT;
     static {
         Set<String> s = new HashSet<String>();
         s.add(MediaType.APPLICATION_OCTET_STREAM);
@@ -30,12 +28,11 @@ public class SelectiveLoggingFilter extends LoggingFilter {
         SKIPPED_CONTENT = Collections.unmodifiableSet(s);
     }
 
-
     public SelectiveLoggingFilter(Logger logger, boolean b) {
-		super(logger, b);
-	}
+        super(logger, b);
+    }
 
-	@Override
+    @Override
     public void filter(ClientRequestContext context) throws IOException {
         // Unless the content type is in the list of those we want to ellide, then just have
         // our super-class handle things.
@@ -44,5 +41,5 @@ public void filter(ClientRequestContext context) throws IOException {
             super.filter(context);
         }
     }
-    
+
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
index 840395105..7ce68eed8 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
@@ -16,62 +16,58 @@
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
 
-public abstract class AbstrDockerCmdExec<CMD_T extends DockerCmd<RES_T>, RES_T>
-		implements DockerCmdExec<CMD_T, RES_T> {
+public abstract class AbstrDockerCmdExec<CMD_T extends DockerCmd<RES_T>, RES_T> implements DockerCmdExec<CMD_T, RES_T> {
 
-	private WebTarget baseResource;
+    private WebTarget baseResource;
 
-	public AbstrDockerCmdExec(WebTarget baseResource) {
-		checkNotNull(baseResource,
-				"baseResource was not specified");
-		this.baseResource = baseResource;
-	}
+    public AbstrDockerCmdExec(WebTarget baseResource) {
+        checkNotNull(baseResource, "baseResource was not specified");
+        this.baseResource = baseResource;
+    }
 
-	protected WebTarget getBaseResource() {
-		return baseResource;
-	}
+    protected WebTarget getBaseResource() {
+        return baseResource;
+    }
 
-	protected String registryAuth(AuthConfig authConfig) {
-		try {
-			return Base64.encodeBase64String(new ObjectMapper()
-					.writeValueAsString(authConfig).getBytes());
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
+    protected String registryAuth(AuthConfig authConfig) {
+        try {
+            return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfig).getBytes());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
-	protected String registryConfigs(AuthConfigurations authConfigs) {
-		try {
-			return Base64.encodeBase64String(new ObjectMapper()
-					.writeValueAsString(authConfigs).getBytes());
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-	
-	@Override
-	public RES_T exec(CMD_T command) {
-		// this hack works because of ResponseStatusExceptionFilter
-		RES_T result;
-		try {
-			result = execute(command);
-			
-		} catch (ProcessingException e) {
-			if(e.getCause() instanceof DockerException) {
-				throw (DockerException)e.getCause();
-			} else {
-				throw e;
-			}
-		} finally {
-			try {
-				command.close();
-			} catch (IOException e) {
-				throw new RuntimeException(e);
-			}
-		}
-		
-		return result;
-	}
+    protected String registryConfigs(AuthConfigurations authConfigs) {
+        try {
+            return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfigs).getBytes());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
-	protected abstract RES_T execute(CMD_T command);
+    @Override
+    public RES_T exec(CMD_T command) {
+        // this hack works because of ResponseStatusExceptionFilter
+        RES_T result;
+        try {
+            result = execute(command);
+
+        } catch (ProcessingException e) {
+            if (e.getCause() instanceof DockerException) {
+                throw (DockerException) e.getCause();
+            } else {
+                throw e;
+            }
+        } finally {
+            try {
+                command.close();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        return result;
+    }
+
+    protected abstract RES_T execute(CMD_T command);
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java b/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
index 23d6d1ab9..e30028f34 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
@@ -1,4 +1,5 @@
 package com.github.dockerjava.jaxrs;
+
 /*
  * Copyright (c) 2014 Spotify AB.
  *
@@ -20,8 +21,6 @@
  * under the License.
  */
 
-
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -36,291 +35,289 @@
 import org.newsclub.net.unix.AFUNIXSocket;
 
 /**
- * Provides a socket that wraps an org.newsclub.net.unix.AFUNIXSocket and delays setting options
- * until the socket is connected. This is necessary because the Apache HTTP client attempts to
- * set options prior to connecting the socket, which doesn't work for Unix sockets since options
- * are being set on the underlying file descriptor. Until the socket is connected, the file
- * descriptor doesn't exist.
+ * Provides a socket that wraps an org.newsclub.net.unix.AFUNIXSocket and delays setting options until the socket is
+ * connected. This is necessary because the Apache HTTP client attempts to set options prior to connecting the socket,
+ * which doesn't work for Unix sockets since options are being set on the underlying file descriptor. Until the socket
+ * is connected, the file descriptor doesn't exist.
  *
- * This class also noop's any calls to setReuseAddress, which is called by the Apache client but
- * isn't supported by AFUnixSocket.
+ * This class also noop's any calls to setReuseAddress, which is called by the Apache client but isn't supported by
+ * AFUnixSocket.
  */
 public class ApacheUnixSocket extends Socket {
 
-  private final AFUNIXSocket inner;
-
-  private final Queue<SocketOptionSetter> optionsToSet = new ArrayDeque<SocketOptionSetter>();
-
-  public ApacheUnixSocket() throws IOException {
-    this.inner = AFUNIXSocket.newInstance();
-  }
-
-  @Override
-  public void connect(final SocketAddress endpoint) throws IOException {
-    inner.connect(endpoint);
-    setAllSocketOptions();
-  }
-
-  @Override
-  public void connect(final SocketAddress endpoint, final int timeout) throws IOException {
-    inner.connect(endpoint, timeout);
-    setAllSocketOptions();
-  }
-
-  @Override
-  public void bind(final SocketAddress bindpoint) throws IOException {
-    inner.bind(bindpoint);
-    setAllSocketOptions();
-  }
-
-  @Override
-  public InetAddress getInetAddress() {
-    return inner.getInetAddress();
-  }
-
-  @Override
-  public InetAddress getLocalAddress() {
-    return inner.getLocalAddress();
-  }
-
-  @Override
-  public int getPort() {
-    return inner.getPort();
-  }
-
-  @Override
-  public int getLocalPort() {
-    return inner.getLocalPort();
-  }
-
-  @Override
-  public SocketAddress getRemoteSocketAddress() {
-    return inner.getRemoteSocketAddress();
-  }
-
-  @Override
-  public SocketAddress getLocalSocketAddress() {
-    return inner.getLocalSocketAddress();
-  }
-
-  @Override
-  public SocketChannel getChannel() {
-    return inner.getChannel();
-  }
-
-  @Override
-  public InputStream getInputStream() throws IOException {
-    return inner.getInputStream();
-  }
-
-  @Override
-  public OutputStream getOutputStream() throws IOException {
-    return inner.getOutputStream();
-  }
-
-  private void setSocketOption(final SocketOptionSetter s) throws SocketException {
-    if (inner.isConnected()) {
-      s.run();
-    } else {
-      if (!optionsToSet.offer(s)) {
-        throw new SocketException("Failed to queue option");
-      }
-    }
-  }
-
-  private void setAllSocketOptions() throws SocketException {
-    for (SocketOptionSetter s : optionsToSet) {
-      s.run();
-    }
-  }
-
-  @Override
-  public void setTcpNoDelay(final boolean on) throws SocketException {
-    setSocketOption(new SocketOptionSetter() {
-      @Override
-      public void run() throws SocketException {
-        inner.setTcpNoDelay(on);
-      }
-    });
-  }
-
-  @Override
-  public boolean getTcpNoDelay() throws SocketException {
-    return inner.getTcpNoDelay();
-  }
-
-  @Override
-  public void setSoLinger(final boolean on, final int linger) throws SocketException {
-    setSocketOption(new SocketOptionSetter() {
-      @Override
-      public void run() throws SocketException {
-        inner.setSoLinger(on, linger);
-      }
-    });
-  }
-
-  @Override
-  public int getSoLinger() throws SocketException {
-    return inner.getSoLinger();
-  }
-
-  @Override
-  public void sendUrgentData(final int data) throws IOException {
-    inner.sendUrgentData(data);
-  }
-
-  @Override
-  public void setOOBInline(final boolean on) throws SocketException {
-    setSocketOption(new SocketOptionSetter() {
-      @Override
-      public void run() throws SocketException {
-        inner.setOOBInline(on);
-      }
-    });
-  }
-
-  @Override
-  public boolean getOOBInline() throws SocketException {
-    return inner.getOOBInline();
-  }
-
-  @Override
-  public synchronized void setSoTimeout(final int timeout) throws SocketException {
-    setSocketOption(new SocketOptionSetter() {
-      @Override
-      public void run() throws SocketException {
-        inner.setSoTimeout(timeout);
-      }
-    });
-  }
-
-  @Override
-  public synchronized int getSoTimeout() throws SocketException {
-    return inner.getSoTimeout();
-  }
-
-  @Override
-  public synchronized void setSendBufferSize(final int size) throws SocketException {
-    setSocketOption(new SocketOptionSetter() {
-      @Override
-      public void run() throws SocketException {
-        inner.setSendBufferSize(size);
-      }
-    });
-  }
-
-  @Override
-  public synchronized int getSendBufferSize() throws SocketException {
-    return inner.getSendBufferSize();
-  }
-
-  @Override
-  public synchronized void setReceiveBufferSize(final int size) throws SocketException {
-    setSocketOption(new SocketOptionSetter() {
-      @Override
-      public void run() throws SocketException {
-        inner.setReceiveBufferSize(size);
-      }
-    });
-  }
-
-  @Override
-  public synchronized int getReceiveBufferSize() throws SocketException {
-    return inner.getReceiveBufferSize();
-  }
-
-  @Override
-  public void setKeepAlive(final boolean on) throws SocketException {
-    setSocketOption(new SocketOptionSetter() {
-      @Override
-      public void run() throws SocketException {
-        inner.setKeepAlive(on);
-      }
-    });
-  }
-
-  @Override
-  public boolean getKeepAlive() throws SocketException {
-    return inner.getKeepAlive();
-  }
-
-  @Override
-  public void setTrafficClass(final int tc) throws SocketException {
-    setSocketOption(new SocketOptionSetter() {
-      @Override
-      public void run() throws SocketException {
-        inner.setTrafficClass(tc);
-      }
-    });
-  }
-
-  @Override
-  public int getTrafficClass() throws SocketException {
-    return inner.getTrafficClass();
-  }
-
-  @Override
-  public void setReuseAddress(final boolean on) throws SocketException {
-    // not supported: Apache client tries to set it, but we want to just ignore it
-  }
-
-  @Override
-  public boolean getReuseAddress() throws SocketException {
-    return inner.getReuseAddress();
-  }
-
-  @Override
-  public synchronized void close() throws IOException {
-    inner.close();
-  }
-
-  @Override
-  public void shutdownInput() throws IOException {
-    inner.shutdownInput();
-  }
-
-  @Override
-  public void shutdownOutput() throws IOException {
-    inner.shutdownOutput();
-  }
-
-  @Override
-  public String toString() {
-    return inner.toString();
-  }
-
-  @Override
-  public boolean isConnected() {
-    return inner.isConnected();
-  }
-
-  @Override
-  public boolean isBound() {
-    return inner.isBound();
-  }
-
-  @Override
-  public boolean isClosed() {
-    return inner.isClosed();
-  }
-
-  @Override
-  public boolean isInputShutdown() {
-    return inner.isInputShutdown();
-  }
-
-  @Override
-  public boolean isOutputShutdown() {
-    return inner.isOutputShutdown();
-  }
-
-  @Override
-  public void setPerformancePreferences(final int connectionTime, final int latency,
-                                        final int bandwidth) {
-    inner.setPerformancePreferences(connectionTime, latency, bandwidth);
-  }
-
-  interface SocketOptionSetter {
-    void run() throws SocketException;
-  }
+    private final AFUNIXSocket inner;
+
+    private final Queue<SocketOptionSetter> optionsToSet = new ArrayDeque<SocketOptionSetter>();
+
+    public ApacheUnixSocket() throws IOException {
+        this.inner = AFUNIXSocket.newInstance();
+    }
+
+    @Override
+    public void connect(final SocketAddress endpoint) throws IOException {
+        inner.connect(endpoint);
+        setAllSocketOptions();
+    }
+
+    @Override
+    public void connect(final SocketAddress endpoint, final int timeout) throws IOException {
+        inner.connect(endpoint, timeout);
+        setAllSocketOptions();
+    }
+
+    @Override
+    public void bind(final SocketAddress bindpoint) throws IOException {
+        inner.bind(bindpoint);
+        setAllSocketOptions();
+    }
+
+    @Override
+    public InetAddress getInetAddress() {
+        return inner.getInetAddress();
+    }
+
+    @Override
+    public InetAddress getLocalAddress() {
+        return inner.getLocalAddress();
+    }
+
+    @Override
+    public int getPort() {
+        return inner.getPort();
+    }
+
+    @Override
+    public int getLocalPort() {
+        return inner.getLocalPort();
+    }
+
+    @Override
+    public SocketAddress getRemoteSocketAddress() {
+        return inner.getRemoteSocketAddress();
+    }
+
+    @Override
+    public SocketAddress getLocalSocketAddress() {
+        return inner.getLocalSocketAddress();
+    }
+
+    @Override
+    public SocketChannel getChannel() {
+        return inner.getChannel();
+    }
+
+    @Override
+    public InputStream getInputStream() throws IOException {
+        return inner.getInputStream();
+    }
+
+    @Override
+    public OutputStream getOutputStream() throws IOException {
+        return inner.getOutputStream();
+    }
+
+    private void setSocketOption(final SocketOptionSetter s) throws SocketException {
+        if (inner.isConnected()) {
+            s.run();
+        } else {
+            if (!optionsToSet.offer(s)) {
+                throw new SocketException("Failed to queue option");
+            }
+        }
+    }
+
+    private void setAllSocketOptions() throws SocketException {
+        for (SocketOptionSetter s : optionsToSet) {
+            s.run();
+        }
+    }
+
+    @Override
+    public void setTcpNoDelay(final boolean on) throws SocketException {
+        setSocketOption(new SocketOptionSetter() {
+            @Override
+            public void run() throws SocketException {
+                inner.setTcpNoDelay(on);
+            }
+        });
+    }
+
+    @Override
+    public boolean getTcpNoDelay() throws SocketException {
+        return inner.getTcpNoDelay();
+    }
+
+    @Override
+    public void setSoLinger(final boolean on, final int linger) throws SocketException {
+        setSocketOption(new SocketOptionSetter() {
+            @Override
+            public void run() throws SocketException {
+                inner.setSoLinger(on, linger);
+            }
+        });
+    }
+
+    @Override
+    public int getSoLinger() throws SocketException {
+        return inner.getSoLinger();
+    }
+
+    @Override
+    public void sendUrgentData(final int data) throws IOException {
+        inner.sendUrgentData(data);
+    }
+
+    @Override
+    public void setOOBInline(final boolean on) throws SocketException {
+        setSocketOption(new SocketOptionSetter() {
+            @Override
+            public void run() throws SocketException {
+                inner.setOOBInline(on);
+            }
+        });
+    }
+
+    @Override
+    public boolean getOOBInline() throws SocketException {
+        return inner.getOOBInline();
+    }
+
+    @Override
+    public synchronized void setSoTimeout(final int timeout) throws SocketException {
+        setSocketOption(new SocketOptionSetter() {
+            @Override
+            public void run() throws SocketException {
+                inner.setSoTimeout(timeout);
+            }
+        });
+    }
+
+    @Override
+    public synchronized int getSoTimeout() throws SocketException {
+        return inner.getSoTimeout();
+    }
+
+    @Override
+    public synchronized void setSendBufferSize(final int size) throws SocketException {
+        setSocketOption(new SocketOptionSetter() {
+            @Override
+            public void run() throws SocketException {
+                inner.setSendBufferSize(size);
+            }
+        });
+    }
+
+    @Override
+    public synchronized int getSendBufferSize() throws SocketException {
+        return inner.getSendBufferSize();
+    }
+
+    @Override
+    public synchronized void setReceiveBufferSize(final int size) throws SocketException {
+        setSocketOption(new SocketOptionSetter() {
+            @Override
+            public void run() throws SocketException {
+                inner.setReceiveBufferSize(size);
+            }
+        });
+    }
+
+    @Override
+    public synchronized int getReceiveBufferSize() throws SocketException {
+        return inner.getReceiveBufferSize();
+    }
+
+    @Override
+    public void setKeepAlive(final boolean on) throws SocketException {
+        setSocketOption(new SocketOptionSetter() {
+            @Override
+            public void run() throws SocketException {
+                inner.setKeepAlive(on);
+            }
+        });
+    }
+
+    @Override
+    public boolean getKeepAlive() throws SocketException {
+        return inner.getKeepAlive();
+    }
+
+    @Override
+    public void setTrafficClass(final int tc) throws SocketException {
+        setSocketOption(new SocketOptionSetter() {
+            @Override
+            public void run() throws SocketException {
+                inner.setTrafficClass(tc);
+            }
+        });
+    }
+
+    @Override
+    public int getTrafficClass() throws SocketException {
+        return inner.getTrafficClass();
+    }
+
+    @Override
+    public void setReuseAddress(final boolean on) throws SocketException {
+        // not supported: Apache client tries to set it, but we want to just ignore it
+    }
+
+    @Override
+    public boolean getReuseAddress() throws SocketException {
+        return inner.getReuseAddress();
+    }
+
+    @Override
+    public synchronized void close() throws IOException {
+        inner.close();
+    }
+
+    @Override
+    public void shutdownInput() throws IOException {
+        inner.shutdownInput();
+    }
+
+    @Override
+    public void shutdownOutput() throws IOException {
+        inner.shutdownOutput();
+    }
+
+    @Override
+    public String toString() {
+        return inner.toString();
+    }
+
+    @Override
+    public boolean isConnected() {
+        return inner.isConnected();
+    }
+
+    @Override
+    public boolean isBound() {
+        return inner.isBound();
+    }
+
+    @Override
+    public boolean isClosed() {
+        return inner.isClosed();
+    }
+
+    @Override
+    public boolean isInputShutdown() {
+        return inner.isInputShutdown();
+    }
+
+    @Override
+    public boolean isOutputShutdown() {
+        return inner.isOutputShutdown();
+    }
+
+    @Override
+    public void setPerformancePreferences(final int connectionTime, final int latency, final int bandwidth) {
+        inner.setPerformancePreferences(connectionTime, latency, bandwidth);
+    }
+
+    interface SocketOptionSetter {
+        void run() throws SocketException;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
index de4bb3f0c..342fe710f 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
@@ -12,36 +12,31 @@
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
 
-public class AttachContainerCmdExec extends
-		AbstrDockerCmdExec<AttachContainerCmd, InputStream> implements
-		AttachContainerCmd.Exec {
-
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(AttachContainerCmdExec.class);
-
-	public AttachContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected InputStream execute(AttachContainerCmd command) {
-		WebTarget webResource = getBaseResource()
-				.path("/containers/{id}/attach")
-				.resolveTemplate("id", command.getContainerId())
-				.queryParam("logs", command.hasLogsEnabled() ? "1" : "0")
-				// .queryParam("stdin", command.hasStdinEnabled() ? "1" : "0")
-				.queryParam("stdout", command.hasStdoutEnabled() ? "1" : "0")
-				.queryParam("stderr", command.hasStderrEnabled() ? "1" : "0")
-				.queryParam("stream",
-						command.hasFollowStreamEnabled() ? "1" : "0");
-
-		LOGGER.trace("POST: {}", webResource);
-
-		Response response = webResource.request()
-				.accept(MediaType.APPLICATION_OCTET_STREAM_TYPE)
-				.post(null, Response.class);
-		
-		return new WrappedResponseInputStream(response);
-	}
+public class AttachContainerCmdExec extends AbstrDockerCmdExec<AttachContainerCmd, InputStream> implements
+        AttachContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AttachContainerCmdExec.class);
+
+    public AttachContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected InputStream execute(AttachContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/attach")
+                .resolveTemplate("id", command.getContainerId())
+                .queryParam("logs", command.hasLogsEnabled() ? "1" : "0")
+                // .queryParam("stdin", command.hasStdinEnabled() ? "1" : "0")
+                .queryParam("stdout", command.hasStdoutEnabled() ? "1" : "0")
+                .queryParam("stderr", command.hasStderrEnabled() ? "1" : "0")
+                .queryParam("stream", command.hasFollowStreamEnabled() ? "1" : "0");
+
+        LOGGER.trace("POST: {}", webResource);
+
+        Response response = webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE)
+                .post(null, Response.class);
+
+        return new WrappedResponseInputStream(response);
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
index 3552d9742..8ceca593e 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
@@ -12,28 +12,26 @@
 
 import static javax.ws.rs.client.Entity.entity;
 
-public class AuthCmdExec extends AbstrDockerCmdExec<AuthCmd,AuthResponse> implements AuthCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(AuthCmdExec.class);
-	
-	public AuthCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected AuthResponse execute(AuthCmd command) {
-		WebTarget webResource = getBaseResource().path("/auth");
-		LOGGER.trace("POST: {}", webResource);
-		Response response = webResource
-                .request()
-                .accept(MediaType.APPLICATION_JSON).post(entity(command.getAuthConfig(), MediaType.APPLICATION_JSON));
-		
-		if(response.getStatus() == 401) {
-			throw new UnauthorizedException("Unauthorized");
-		}
+public class AuthCmdExec extends AbstrDockerCmdExec<AuthCmd, AuthResponse> implements AuthCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AuthCmdExec.class);
+
+    public AuthCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected AuthResponse execute(AuthCmd command) {
+        WebTarget webResource = getBaseResource().path("/auth");
+        LOGGER.trace("POST: {}", webResource);
+        Response response = webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(entity(command.getAuthConfig(), MediaType.APPLICATION_JSON));
+
+        if (response.getStatus() == 401) {
+            throw new UnauthorizedException("Unauthorized");
+        }
 
         return response.readEntity(AuthResponse.class);
-	}
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index 3bdfb006c..3380832ec 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -22,99 +22,90 @@
 
 import static javax.ws.rs.client.Entity.entity;
 
-public class BuildImageCmdExec extends
-		AbstrDockerCmdExec<BuildImageCmd, BuildImageCmd.Response> implements
-		BuildImageCmd.Exec {
-
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(BuildImageCmdExec.class);
-
-	public BuildImageCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected ResponseImpl execute(BuildImageCmd command) {
-		WebTarget webResource = getBaseResource().path("/build");
-		String dockerFilePath = command.getPathToDockerfile();
-
-		if (command.getTag() != null) {
-			webResource = webResource.queryParam("t", command.getTag());
-		}
-		if (command.hasNoCacheEnabled()) {
-			webResource = webResource.queryParam("nocache", "true");
-		}
-		if (!command.hasRemoveEnabled()) {
-			webResource = webResource.queryParam("rm", "false");
-		}
-		if (command.isQuiet()) {
-			webResource = webResource.queryParam("q", "true");
-		}
-		if (command.hasPullEnabled()) {
-			webResource = webResource.queryParam("pull", "true");
-		}
-		if (dockerFilePath != null && !"Dockerfile".equals(dockerFilePath)) {
-			webResource = webResource.queryParam("dockerfile", dockerFilePath);
-		}
-
-		webResource.property(ClientProperties.REQUEST_ENTITY_PROCESSING,
-				RequestEntityProcessing.CHUNKED);
-		webResource.property(ClientProperties.CHUNKED_ENCODING_SIZE,
-				1024 * 1024);
-
-		LOGGER.debug("POST: {}", webResource);
-		Response response = resourceWithOptionalAuthConfig(command,
-				webResource.request())
-				.accept(MediaType.TEXT_PLAIN)
-				.post(entity(command.getTarInputStream(), "application/tar"),
-						Response.class);
-
-		return new ResponseImpl(new WrappedResponseInputStream(response));
-
-	}
-
-	private Invocation.Builder resourceWithOptionalAuthConfig(
-			BuildImageCmd command, Invocation.Builder request) {
-		AuthConfigurations authConfigs = command.getBuildAuthConfigs();
-		if (authConfigs != null) {
-			request = request.header("X-Registry-Config",
-					registryConfigs(authConfigs));
-		}
-		return request;
-	}
-
-	public static class ResponseImpl extends BuildImageCmd.Response {
-
-		private final InputStream proxy;
-
-		public ResponseImpl(InputStream proxy) {
-			this.proxy = proxy;
-		}
-
-		@Override
-		public Iterable<EventStreamItem> getItems() throws IOException {
-			ObjectMapper mapper = new ObjectMapper();
-			// we'll be reading instances of MyBean
-			ObjectReader reader = mapper.reader(EventStreamItem.class);
-			// and then do other configuration, if any, and read:
-			Iterator<EventStreamItem> items = reader.readValues(proxy);
-
-			try {
-				return ImmutableList.copyOf(items);
-			} finally {
-				proxy.close();
-			}
-		}
-
-		@Override
-		public int read() throws IOException {
-			return proxy.read();
-		}
-
-		@Override
-		public void close() throws IOException {
-			proxy.close();
-			super.close();
-		}
-	}
+public class BuildImageCmdExec extends AbstrDockerCmdExec<BuildImageCmd, BuildImageCmd.Response> implements
+        BuildImageCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageCmdExec.class);
+
+    public BuildImageCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected ResponseImpl execute(BuildImageCmd command) {
+        WebTarget webResource = getBaseResource().path("/build");
+        String dockerFilePath = command.getPathToDockerfile();
+
+        if (command.getTag() != null) {
+            webResource = webResource.queryParam("t", command.getTag());
+        }
+        if (command.hasNoCacheEnabled()) {
+            webResource = webResource.queryParam("nocache", "true");
+        }
+        if (!command.hasRemoveEnabled()) {
+            webResource = webResource.queryParam("rm", "false");
+        }
+        if (command.isQuiet()) {
+            webResource = webResource.queryParam("q", "true");
+        }
+        if (command.hasPullEnabled()) {
+            webResource = webResource.queryParam("pull", "true");
+        }
+        if (dockerFilePath != null && !"Dockerfile".equals(dockerFilePath)) {
+            webResource = webResource.queryParam("dockerfile", dockerFilePath);
+        }
+
+        webResource.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED);
+        webResource.property(ClientProperties.CHUNKED_ENCODING_SIZE, 1024 * 1024);
+
+        LOGGER.debug("POST: {}", webResource);
+        Response response = resourceWithOptionalAuthConfig(command, webResource.request()).accept(MediaType.TEXT_PLAIN)
+                .post(entity(command.getTarInputStream(), "application/tar"), Response.class);
+
+        return new ResponseImpl(new WrappedResponseInputStream(response));
+
+    }
+
+    private Invocation.Builder resourceWithOptionalAuthConfig(BuildImageCmd command, Invocation.Builder request) {
+        AuthConfigurations authConfigs = command.getBuildAuthConfigs();
+        if (authConfigs != null) {
+            request = request.header("X-Registry-Config", registryConfigs(authConfigs));
+        }
+        return request;
+    }
+
+    public static class ResponseImpl extends BuildImageCmd.Response {
+
+        private final InputStream proxy;
+
+        public ResponseImpl(InputStream proxy) {
+            this.proxy = proxy;
+        }
+
+        @Override
+        public Iterable<EventStreamItem> getItems() throws IOException {
+            ObjectMapper mapper = new ObjectMapper();
+            // we'll be reading instances of MyBean
+            ObjectReader reader = mapper.reader(EventStreamItem.class);
+            // and then do other configuration, if any, and read:
+            Iterator<EventStreamItem> items = reader.readValues(proxy);
+
+            try {
+                return ImmutableList.copyOf(items);
+            } finally {
+                proxy.close();
+            }
+        }
+
+        @Override
+        public int read() throws IOException {
+            return proxy.read();
+        }
+
+        @Override
+        public void close() throws IOException {
+            proxy.close();
+            super.close();
+        }
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
index f1f4fe33a..b07f5e338 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
@@ -12,27 +12,24 @@
 import com.github.dockerjava.api.command.CommitCmd;
 
 public class CommitCmdExec extends AbstrDockerCmdExec<CommitCmd, String> implements CommitCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(CommitCmdExec.class);
-	
-	public CommitCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected String execute(CommitCmd command) {
-		WebTarget webResource = getBaseResource().path("/commit")
-                .queryParam("container", command.getContainerId())
-                .queryParam("repo", command.getRepository())
-                .queryParam("tag", command.getTag())
-                .queryParam("m", command.getMessage())
-                .queryParam("author", command.getAuthor())
-                .queryParam("pause",  command.hasPauseEnabled() ? "1" : "0");
-		
-		LOGGER.trace("POST: {}", webResource);
-		ObjectNode objectNode = webResource.request().accept("application/vnd.docker.raw-stream").post(entity(command, MediaType.APPLICATION_JSON), ObjectNode.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CommitCmdExec.class);
+
+    public CommitCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected String execute(CommitCmd command) {
+        WebTarget webResource = getBaseResource().path("/commit").queryParam("container", command.getContainerId())
+                .queryParam("repo", command.getRepository()).queryParam("tag", command.getTag())
+                .queryParam("m", command.getMessage()).queryParam("author", command.getAuthor())
+                .queryParam("pause", command.hasPauseEnabled() ? "1" : "0");
+
+        LOGGER.trace("POST: {}", webResource);
+        ObjectNode objectNode = webResource.request().accept("application/vnd.docker.raw-stream")
+                .post(entity(command, MediaType.APPLICATION_JSON), ObjectNode.class);
         return objectNode.get("Id").asText();
-	}
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java
index 2b7059b33..c7c8c293a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java
@@ -12,23 +12,23 @@
 import com.github.dockerjava.api.command.ContainerDiffCmd;
 import com.github.dockerjava.api.model.ChangeLog;
 
-public class ContainerDiffCmdExec extends AbstrDockerCmdExec<ContainerDiffCmd, List<ChangeLog>> implements ContainerDiffCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(ContainerDiffCmdExec.class);
-	
-	public ContainerDiffCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected List<ChangeLog> execute(ContainerDiffCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/{id}/changes").resolveTemplate("id", command.getContainerId());
-		
-		LOGGER.trace("GET: {}", webResource);
-		return webResource.request().accept(MediaType.APPLICATION_JSON)
-				.get(new GenericType<List<ChangeLog>>() {
+public class ContainerDiffCmdExec extends AbstrDockerCmdExec<ContainerDiffCmd, List<ChangeLog>> implements
+        ContainerDiffCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ContainerDiffCmdExec.class);
+
+    public ContainerDiffCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected List<ChangeLog> execute(ContainerDiffCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/changes").resolveTemplate("id",
+                command.getContainerId());
+
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(new GenericType<List<ChangeLog>>() {
         });
-	}
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
index 0a738be83..88e8c3086 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
@@ -14,26 +14,26 @@
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
 import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
 
-public class CopyFileFromContainerCmdExec extends AbstrDockerCmdExec<CopyFileFromContainerCmd, InputStream> implements CopyFileFromContainerCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(CopyFileFromContainerCmdExec.class);
-	
-	public CopyFileFromContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected InputStream execute(CopyFileFromContainerCmd command) {
-		WebTarget webResource = getBaseResource()
-				.path("/containers/{id}/copy")
-				.resolveTemplate("id", command.getContainerId());
-
-		LOGGER.trace("POST: " + webResource.toString());
-		
-		Response response = webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE).post(entity(command, MediaType.APPLICATION_JSON));
-		
-		return new WrappedResponseInputStream(response);
-	}
+public class CopyFileFromContainerCmdExec extends AbstrDockerCmdExec<CopyFileFromContainerCmd, InputStream> implements
+        CopyFileFromContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CopyFileFromContainerCmdExec.class);
+
+    public CopyFileFromContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected InputStream execute(CopyFileFromContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/copy").resolveTemplate("id",
+                command.getContainerId());
+
+        LOGGER.trace("POST: " + webResource.toString());
+
+        Response response = webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE)
+                .post(entity(command, MediaType.APPLICATION_JSON));
+
+        return new WrappedResponseInputStream(response);
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
index 26dc25cd2..c02b9f4b7 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
@@ -11,25 +11,26 @@
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 
-public class CreateContainerCmdExec extends AbstrDockerCmdExec<CreateContainerCmd, CreateContainerResponse> implements CreateContainerCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(CreateContainerCmdExec.class);
-	
-	public CreateContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected CreateContainerResponse execute(CreateContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/create");
+public class CreateContainerCmdExec extends AbstrDockerCmdExec<CreateContainerCmd, CreateContainerResponse> implements
+        CreateContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateContainerCmdExec.class);
+
+    public CreateContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected CreateContainerResponse execute(CreateContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/create");
 
         if (command.getName() != null) {
             webResource = webResource.queryParam("name", command.getName());
         }
 
-		LOGGER.trace("POST: {} ", webResource);
-		return webResource.request().accept(MediaType.APPLICATION_JSON)
-				.post(entity(command, MediaType.APPLICATION_JSON), CreateContainerResponse.class);
-	}
+        LOGGER.trace("POST: {} ", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(entity(command, MediaType.APPLICATION_JSON), CreateContainerResponse.class);
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
index 4c7bae8b0..c5733241d 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
@@ -11,25 +11,22 @@
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.CreateImageResponse;
 
-public class CreateImageCmdExec extends AbstrDockerCmdExec<CreateImageCmd, CreateImageResponse> implements CreateImageCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(CreateImageCmdExec.class);
-	
-	public CreateImageCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected CreateImageResponse execute(CreateImageCmd command) {
-		WebTarget webResource = getBaseResource()
-                .path("/images/create")
-                .queryParam("repo", command.getRepository())
-                .queryParam("tag", command.getTag())
-                .queryParam("fromSrc", "-");
-		
-		LOGGER.trace("POST: {}", webResource);
-		return webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE)
-				.post(entity(command.getImageStream(), MediaType.APPLICATION_OCTET_STREAM), CreateImageResponse.class);
-	}
+public class CreateImageCmdExec extends AbstrDockerCmdExec<CreateImageCmd, CreateImageResponse> implements
+        CreateImageCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateImageCmdExec.class);
+
+    public CreateImageCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected CreateImageResponse execute(CreateImageCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/create").queryParam("repo", command.getRepository())
+                .queryParam("tag", command.getTag()).queryParam("fromSrc", "-");
+
+        LOGGER.trace("POST: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE)
+                .post(entity(command.getImageStream(), MediaType.APPLICATION_OCTET_STREAM), CreateImageResponse.class);
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index 8a5d5d879..77712fdeb 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -25,7 +25,6 @@
 import org.glassfish.jersey.CommonProperties;
 import org.glassfish.jersey.apache.connector.ApacheClientProperties;
 
-
 //import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 // see https://github.com/docker-java/docker-java/issues/196
 import com.github.dockerjava.jaxrs.connector.ApacheConnectorProvider;
@@ -41,302 +40,286 @@
 import com.github.dockerjava.core.util.ResponseStatusExceptionFilter;
 import com.github.dockerjava.core.util.SelectiveLoggingFilter;
 
-
 public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
 
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(DockerCmdExecFactoryImpl.class.getName());
-	private Client client;
-	private WebTarget baseResource;
-
-	@Override
-	public void init(DockerClientConfig dockerClientConfig) {
-		checkNotNull(dockerClientConfig, "config was not specified");
-
-		ClientConfig clientConfig = new ClientConfig();
-		clientConfig.connectorProvider(new ApacheConnectorProvider());
-		clientConfig.property(CommonProperties.FEATURE_AUTO_DISCOVERY_DISABLE,
-				true);
-
-		clientConfig.register(ResponseStatusExceptionFilter.class);
-		clientConfig.register(JsonClientFilter.class);
-		clientConfig.register(JacksonJsonProvider.class);
-
-		if (dockerClientConfig.followRedirectsFilterEnabled()) {
-			clientConfig.register(FollowRedirectsFilter.class);
-		}
-
-		if (dockerClientConfig.isLoggingFilterEnabled()) {
-			clientConfig.register(new SelectiveLoggingFilter(LOGGER, true));
-		}
-
-		if (dockerClientConfig.getReadTimeout() != null) {
-			int readTimeout = dockerClientConfig.getReadTimeout();
-			clientConfig.property(ClientProperties.READ_TIMEOUT, readTimeout);
-		}
-
-		//clientConfig.property(ClientProperties.CONNECT_TIMEOUT, 10000);
-
-		URI originalUri = dockerClientConfig.getUri();
-
-		SSLContext sslContext = null;
-
-		if (dockerClientConfig.getSslConfig() != null) {
-			try {
-				sslContext = dockerClientConfig.getSslConfig().getSSLContext();
-			} catch (Exception ex) {
-				throw new DockerClientException("Error in SSL Configuration",
-						ex);
-			}
-		}
-
-		PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager(
-				getSchemeRegistry(originalUri, sslContext), null, null, null, 10, TimeUnit.SECONDS);
-
-
-		if (dockerClientConfig.getMaxTotalConnections() != null)
-			connManager
-					.setMaxTotal(dockerClientConfig.getMaxTotalConnections());
-		if (dockerClientConfig.getMaxPerRoutConnections() != null)
-			connManager.setDefaultMaxPerRoute(dockerClientConfig
-					.getMaxPerRoutConnections());
-
-		clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER,
-				connManager);
-
-		clientConfig.property(ApacheClientProperties.REQUEST_CONFIG,
-                RequestConfig.custom().setConnectionRequestTimeout(1000).build());
-
-		ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(
-				clientConfig);
-
-		if (sslContext != null) {
-			clientBuilder.sslContext(sslContext);
-		}
-
-		client = clientBuilder.build();
-
-		if (originalUri.getScheme().equals("unix")) {
-			dockerClientConfig.setUri(UnixConnectionSocketFactory
-					.sanitizeUri(originalUri));
-		}
-		WebTarget webResource = client.target(dockerClientConfig.getUri());
-
-		if (dockerClientConfig.getVersion() == null
-				|| dockerClientConfig.getVersion().isEmpty()) {
-			baseResource = webResource;
-		} else {
-			baseResource = webResource.path("v"
-					+ dockerClientConfig.getVersion());
-		}
-	}
-
-	private org.apache.http.config.Registry<ConnectionSocketFactory> getSchemeRegistry(
-			final URI originalUri, SSLContext sslContext) {
-		RegistryBuilder<ConnectionSocketFactory> registryBuilder = RegistryBuilder
-				.create();
-		registryBuilder.register("http",
-				PlainConnectionSocketFactory.getSocketFactory());
-		if (sslContext != null) {
-			registryBuilder.register("https", new SSLConnectionSocketFactory(
-					sslContext));
-		}
-		registryBuilder.register("unix", new UnixConnectionSocketFactory(
-				originalUri));
-		return registryBuilder.build();
-	}
-
-	protected WebTarget getBaseResource() {
-		checkNotNull(baseResource,
-				"Factory not initialized. You probably forgot to call init()!");
-		return baseResource;
-	}
-
-	@Override
-	public AuthCmd.Exec createAuthCmdExec() {
-		return new AuthCmdExec(getBaseResource());
-	}
-
-	@Override
-	public InfoCmd.Exec createInfoCmdExec() {
-		return new InfoCmdExec(getBaseResource());
-	}
-
-	@Override
-	public PingCmd.Exec createPingCmdExec() {
-		return new PingCmdExec(getBaseResource());
-	}
-
-	@Override
-	public VersionCmd.Exec createVersionCmdExec() {
-		return new VersionCmdExec(getBaseResource());
-	}
-
-	@Override
-	public PullImageCmd.Exec createPullImageCmdExec() {
-		return new PullImageCmdExec(getBaseResource());
-	}
-
-	@Override
-	public PushImageCmd.Exec createPushImageCmdExec() {
-		return new PushImageCmdExec(getBaseResource());
-	}
-
-	@Override
-	public SaveImageCmd.Exec createSaveImageCmdExec() {
-		return new SaveImageCmdExec(getBaseResource());
-	}
-
-	@Override
-	public CreateImageCmd.Exec createCreateImageCmdExec() {
-		return new CreateImageCmdExec(getBaseResource());
-	}
-
-	@Override
-	public SearchImagesCmd.Exec createSearchImagesCmdExec() {
-		return new SearchImagesCmdExec(getBaseResource());
-	}
-
-	@Override
-	public RemoveImageCmd.Exec createRemoveImageCmdExec() {
-		return new RemoveImageCmdExec(getBaseResource());
-	}
-
-	@Override
-	public ListImagesCmd.Exec createListImagesCmdExec() {
-		return new ListImagesCmdExec(getBaseResource());
-	}
-
-	@Override
-	public InspectImageCmd.Exec createInspectImageCmdExec() {
-		return new InspectImageCmdExec(getBaseResource());
-	}
-
-	@Override
-	public ListContainersCmd.Exec createListContainersCmdExec() {
-		return new ListContainersCmdExec(getBaseResource());
-	}
-
-	@Override
-	public CreateContainerCmd.Exec createCreateContainerCmdExec() {
-		return new CreateContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public StartContainerCmd.Exec createStartContainerCmdExec() {
-		return new StartContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public InspectContainerCmd.Exec createInspectContainerCmdExec() {
-		return new InspectContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public ExecCreateCmd.Exec createExecCmdExec() {
-		return new ExecCreateCmdExec(getBaseResource());
-	}
-
-	@Override
-	public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
-		return new RemoveContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public WaitContainerCmd.Exec createWaitContainerCmdExec() {
-		return new WaitContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public AttachContainerCmd.Exec createAttachContainerCmdExec() {
-		return new AttachContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public ExecStartCmd.Exec createExecStartCmdExec() {
-		return new ExecStartCmdExec(getBaseResource());
-	}
-
-	@Override
-	public InspectExecCmd.Exec createInspectExecCmdExec() {
-		return new InspectExecCmdExec(getBaseResource());
-	}
-
-	@Override
-	public LogContainerCmd.Exec createLogContainerCmdExec() {
-		return new LogContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
-		return new CopyFileFromContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public StopContainerCmd.Exec createStopContainerCmdExec() {
-		return new StopContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
-		return new ContainerDiffCmdExec(getBaseResource());
-	}
-
-	@Override
-	public KillContainerCmd.Exec createKillContainerCmdExec() {
-		return new KillContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public RestartContainerCmd.Exec createRestartContainerCmdExec() {
-		return new RestartContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public CommitCmd.Exec createCommitCmdExec() {
-		return new CommitCmdExec(getBaseResource());
-	}
-
-	@Override
-	public BuildImageCmd.Exec createBuildImageCmdExec() {
-		return new BuildImageCmdExec(getBaseResource());
-	}
-
-	@Override
-	public TopContainerCmd.Exec createTopContainerCmdExec() {
-		return new TopContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public TagImageCmd.Exec createTagImageCmdExec() {
-		return new TagImageCmdExec(getBaseResource());
-	}
-
-	@Override
-	public PauseContainerCmd.Exec createPauseContainerCmdExec() {
-		return new PauseContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
-		return new UnpauseContainerCmdExec(baseResource);
-	}
-
-	@Override
-	public EventsCmd.Exec createEventsCmdExec() {
-		return new EventsCmdExec(getBaseResource());
-	}
-
-	@Override
+    private static final Logger LOGGER = LoggerFactory.getLogger(DockerCmdExecFactoryImpl.class.getName());
+
+    private Client client;
+
+    private WebTarget baseResource;
+
+    @Override
+    public void init(DockerClientConfig dockerClientConfig) {
+        checkNotNull(dockerClientConfig, "config was not specified");
+
+        ClientConfig clientConfig = new ClientConfig();
+        clientConfig.connectorProvider(new ApacheConnectorProvider());
+        clientConfig.property(CommonProperties.FEATURE_AUTO_DISCOVERY_DISABLE, true);
+
+        clientConfig.register(ResponseStatusExceptionFilter.class);
+        clientConfig.register(JsonClientFilter.class);
+        clientConfig.register(JacksonJsonProvider.class);
+
+        if (dockerClientConfig.followRedirectsFilterEnabled()) {
+            clientConfig.register(FollowRedirectsFilter.class);
+        }
+
+        if (dockerClientConfig.isLoggingFilterEnabled()) {
+            clientConfig.register(new SelectiveLoggingFilter(LOGGER, true));
+        }
+
+        if (dockerClientConfig.getReadTimeout() != null) {
+            int readTimeout = dockerClientConfig.getReadTimeout();
+            clientConfig.property(ClientProperties.READ_TIMEOUT, readTimeout);
+        }
+
+        // clientConfig.property(ClientProperties.CONNECT_TIMEOUT, 10000);
+
+        URI originalUri = dockerClientConfig.getUri();
+
+        SSLContext sslContext = null;
+
+        if (dockerClientConfig.getSslConfig() != null) {
+            try {
+                sslContext = dockerClientConfig.getSslConfig().getSSLContext();
+            } catch (Exception ex) {
+                throw new DockerClientException("Error in SSL Configuration", ex);
+            }
+        }
+
+        PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(
+                originalUri, sslContext), null, null, null, 10, TimeUnit.SECONDS);
+
+        if (dockerClientConfig.getMaxTotalConnections() != null)
+            connManager.setMaxTotal(dockerClientConfig.getMaxTotalConnections());
+        if (dockerClientConfig.getMaxPerRoutConnections() != null)
+            connManager.setDefaultMaxPerRoute(dockerClientConfig.getMaxPerRoutConnections());
+
+        clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER, connManager);
+
+        clientConfig.property(ApacheClientProperties.REQUEST_CONFIG, RequestConfig.custom()
+                .setConnectionRequestTimeout(1000).build());
+
+        ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(clientConfig);
+
+        if (sslContext != null) {
+            clientBuilder.sslContext(sslContext);
+        }
+
+        client = clientBuilder.build();
+
+        if (originalUri.getScheme().equals("unix")) {
+            dockerClientConfig.setUri(UnixConnectionSocketFactory.sanitizeUri(originalUri));
+        }
+        WebTarget webResource = client.target(dockerClientConfig.getUri());
+
+        if (dockerClientConfig.getVersion() == null || dockerClientConfig.getVersion().isEmpty()) {
+            baseResource = webResource;
+        } else {
+            baseResource = webResource.path("v" + dockerClientConfig.getVersion());
+        }
+    }
+
+    private org.apache.http.config.Registry<ConnectionSocketFactory> getSchemeRegistry(final URI originalUri,
+            SSLContext sslContext) {
+        RegistryBuilder<ConnectionSocketFactory> registryBuilder = RegistryBuilder.create();
+        registryBuilder.register("http", PlainConnectionSocketFactory.getSocketFactory());
+        if (sslContext != null) {
+            registryBuilder.register("https", new SSLConnectionSocketFactory(sslContext));
+        }
+        registryBuilder.register("unix", new UnixConnectionSocketFactory(originalUri));
+        return registryBuilder.build();
+    }
+
+    protected WebTarget getBaseResource() {
+        checkNotNull(baseResource, "Factory not initialized. You probably forgot to call init()!");
+        return baseResource;
+    }
+
+    @Override
+    public AuthCmd.Exec createAuthCmdExec() {
+        return new AuthCmdExec(getBaseResource());
+    }
+
+    @Override
+    public InfoCmd.Exec createInfoCmdExec() {
+        return new InfoCmdExec(getBaseResource());
+    }
+
+    @Override
+    public PingCmd.Exec createPingCmdExec() {
+        return new PingCmdExec(getBaseResource());
+    }
+
+    @Override
+    public VersionCmd.Exec createVersionCmdExec() {
+        return new VersionCmdExec(getBaseResource());
+    }
+
+    @Override
+    public PullImageCmd.Exec createPullImageCmdExec() {
+        return new PullImageCmdExec(getBaseResource());
+    }
+
+    @Override
+    public PushImageCmd.Exec createPushImageCmdExec() {
+        return new PushImageCmdExec(getBaseResource());
+    }
+
+    @Override
+    public SaveImageCmd.Exec createSaveImageCmdExec() {
+        return new SaveImageCmdExec(getBaseResource());
+    }
+
+    @Override
+    public CreateImageCmd.Exec createCreateImageCmdExec() {
+        return new CreateImageCmdExec(getBaseResource());
+    }
+
+    @Override
+    public SearchImagesCmd.Exec createSearchImagesCmdExec() {
+        return new SearchImagesCmdExec(getBaseResource());
+    }
+
+    @Override
+    public RemoveImageCmd.Exec createRemoveImageCmdExec() {
+        return new RemoveImageCmdExec(getBaseResource());
+    }
+
+    @Override
+    public ListImagesCmd.Exec createListImagesCmdExec() {
+        return new ListImagesCmdExec(getBaseResource());
+    }
+
+    @Override
+    public InspectImageCmd.Exec createInspectImageCmdExec() {
+        return new InspectImageCmdExec(getBaseResource());
+    }
+
+    @Override
+    public ListContainersCmd.Exec createListContainersCmdExec() {
+        return new ListContainersCmdExec(getBaseResource());
+    }
+
+    @Override
+    public CreateContainerCmd.Exec createCreateContainerCmdExec() {
+        return new CreateContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public StartContainerCmd.Exec createStartContainerCmdExec() {
+        return new StartContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public InspectContainerCmd.Exec createInspectContainerCmdExec() {
+        return new InspectContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public ExecCreateCmd.Exec createExecCmdExec() {
+        return new ExecCreateCmdExec(getBaseResource());
+    }
+
+    @Override
+    public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
+        return new RemoveContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public WaitContainerCmd.Exec createWaitContainerCmdExec() {
+        return new WaitContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public AttachContainerCmd.Exec createAttachContainerCmdExec() {
+        return new AttachContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public ExecStartCmd.Exec createExecStartCmdExec() {
+        return new ExecStartCmdExec(getBaseResource());
+    }
+
+    @Override
+    public InspectExecCmd.Exec createInspectExecCmdExec() {
+        return new InspectExecCmdExec(getBaseResource());
+    }
+
+    @Override
+    public LogContainerCmd.Exec createLogContainerCmdExec() {
+        return new LogContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
+        return new CopyFileFromContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public StopContainerCmd.Exec createStopContainerCmdExec() {
+        return new StopContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
+        return new ContainerDiffCmdExec(getBaseResource());
+    }
+
+    @Override
+    public KillContainerCmd.Exec createKillContainerCmdExec() {
+        return new KillContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public RestartContainerCmd.Exec createRestartContainerCmdExec() {
+        return new RestartContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public CommitCmd.Exec createCommitCmdExec() {
+        return new CommitCmdExec(getBaseResource());
+    }
+
+    @Override
+    public BuildImageCmd.Exec createBuildImageCmdExec() {
+        return new BuildImageCmdExec(getBaseResource());
+    }
+
+    @Override
+    public TopContainerCmd.Exec createTopContainerCmdExec() {
+        return new TopContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public TagImageCmd.Exec createTagImageCmdExec() {
+        return new TagImageCmdExec(getBaseResource());
+    }
+
+    @Override
+    public PauseContainerCmd.Exec createPauseContainerCmdExec() {
+        return new PauseContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
+        return new UnpauseContainerCmdExec(baseResource);
+    }
+
+    @Override
+    public EventsCmd.Exec createEventsCmdExec() {
+        return new EventsCmdExec(getBaseResource());
+    }
+
+    @Override
     public StatsCmd.Exec createStatsCmdExec() {
-	    return new StatsCmdExec(getBaseResource());
-	}
-
-	@Override
-	public void close() throws IOException {
-		checkNotNull(client,
-				"Factory not initialized. You probably forgot to call init()!");
-		client.close();
-	}
+        return new StatsCmdExec(getBaseResource());
+    }
+
+    @Override
+    public void close() throws IOException {
+        checkNotNull(client, "Factory not initialized. You probably forgot to call init()!");
+        client.close();
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
index a601ea90c..1a60a5ae3 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -22,88 +22,81 @@
 import com.github.dockerjava.api.model.Event;
 import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
 
-public class EventsCmdExec extends
-		AbstrDockerCmdExec<EventsCmd, ExecutorService> implements
-		EventsCmd.Exec {
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(EventsCmdExec.class);
-
-	public EventsCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected ExecutorService execute(EventsCmd command) {
-		ExecutorService executorService = Executors.newSingleThreadExecutor();
-
-		WebTarget webResource = getBaseResource().path("/events")
-				.queryParam("since", command.getSince())
-				.queryParam("until", command.getUntil());
-
-		LOGGER.trace("GET: {}", webResource);
-		EventNotifier eventNotifier = EventNotifier.create(
-				command.getEventCallback(), webResource);
-		executorService.submit(eventNotifier);
-		return executorService;
-	}
-
-	private static class EventNotifier implements Callable<Void> {
-		private static final JsonFactory JSON_FACTORY = new JsonFactory();
-		private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-
-		private final EventCallback eventCallback;
-		private final WebTarget webTarget;
-
-		private EventNotifier(EventCallback eventCallback, WebTarget webTarget) {
-			this.eventCallback = eventCallback;
-			this.webTarget = webTarget;
-		}
-
-		public static EventNotifier create(EventCallback eventCallback,
-				WebTarget webTarget) {
-			checkNotNull(eventCallback, "An EventCallback must be provided");
-			checkNotNull(webTarget, "An WebTarget must be provided");
-			return new EventNotifier(eventCallback, webTarget);
-		}
-
-		@Override
-		public Void call() throws Exception {
-			int numEvents = 0;
-			Response response = null;
-			try {
-				response = webTarget.request().get(Response.class);
-				InputStream inputStream = new WrappedResponseInputStream(
-						response);
-				JsonParser jp = JSON_FACTORY.createParser(inputStream);
-				// The following condition looks strange but jp.nextToken() will block until there is an
-				// event from the docker server or the connection is terminated.
-				// therefore we want to check before getting an event (to prevent a blocking operation
-				// and after the event to make sure that the eventCallback is still interested in getting notified.
-				while (eventCallback.isReceiving() &&
-				       jp.nextToken() != JsonToken.END_OBJECT && !jp.isClosed() &&
-				       eventCallback.isReceiving()) {
-					try {
-						eventCallback.onEvent(OBJECT_MAPPER.readValue(jp,
-								Event.class));
-					} catch (Exception e) {
-						eventCallback.onException(e);
-					}
-					numEvents++;
-				}
-			} catch (Exception e) {
-				eventCallback.onException(e);
-			} finally {
-			    if (response != null) {
+public class EventsCmdExec extends AbstrDockerCmdExec<EventsCmd, ExecutorService> implements EventsCmd.Exec {
+    private static final Logger LOGGER = LoggerFactory.getLogger(EventsCmdExec.class);
+
+    public EventsCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected ExecutorService execute(EventsCmd command) {
+        ExecutorService executorService = Executors.newSingleThreadExecutor();
+
+        WebTarget webResource = getBaseResource().path("/events").queryParam("since", command.getSince())
+                .queryParam("until", command.getUntil());
+
+        LOGGER.trace("GET: {}", webResource);
+        EventNotifier eventNotifier = EventNotifier.create(command.getEventCallback(), webResource);
+        executorService.submit(eventNotifier);
+        return executorService;
+    }
+
+    private static class EventNotifier implements Callable<Void> {
+        private static final JsonFactory JSON_FACTORY = new JsonFactory();
+
+        private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+        private final EventCallback eventCallback;
+
+        private final WebTarget webTarget;
+
+        private EventNotifier(EventCallback eventCallback, WebTarget webTarget) {
+            this.eventCallback = eventCallback;
+            this.webTarget = webTarget;
+        }
+
+        public static EventNotifier create(EventCallback eventCallback, WebTarget webTarget) {
+            checkNotNull(eventCallback, "An EventCallback must be provided");
+            checkNotNull(webTarget, "An WebTarget must be provided");
+            return new EventNotifier(eventCallback, webTarget);
+        }
+
+        @Override
+        public Void call() throws Exception {
+            int numEvents = 0;
+            Response response = null;
+            try {
+                response = webTarget.request().get(Response.class);
+                InputStream inputStream = new WrappedResponseInputStream(response);
+                JsonParser jp = JSON_FACTORY.createParser(inputStream);
+                // The following condition looks strange but jp.nextToken() will block until there is an
+                // event from the docker server or the connection is terminated.
+                // therefore we want to check before getting an event (to prevent a blocking operation
+                // and after the event to make sure that the eventCallback is still interested in getting notified.
+                while (eventCallback.isReceiving() && jp.nextToken() != JsonToken.END_OBJECT && !jp.isClosed()
+                        && eventCallback.isReceiving()) {
+                    try {
+                        eventCallback.onEvent(OBJECT_MAPPER.readValue(jp, Event.class));
+                    } catch (Exception e) {
+                        eventCallback.onException(e);
+                    }
+                    numEvents++;
+                }
+            } catch (Exception e) {
+                eventCallback.onException(e);
+            } finally {
+                if (response != null) {
                     response.close();
                 }
-				try {
-					eventCallback.onCompletion(numEvents);
-				} catch (Exception e) {
-					eventCallback.onException(e);
-				}
-			}
-
-			return null;
-		}
-	}
+                try {
+                    eventCallback.onCompletion(numEvents);
+                } catch (Exception e) {
+                    eventCallback.onException(e);
+                }
+            }
+
+            return null;
+        }
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
index 02ea4d8ae..e2d986bbf 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
@@ -10,10 +10,10 @@
 
 import static javax.ws.rs.client.Entity.entity;
 
-public class ExecCreateCmdExec extends AbstrDockerCmdExec<ExecCreateCmd, ExecCreateCmdResponse> implements ExecCreateCmd.Exec {
+public class ExecCreateCmdExec extends AbstrDockerCmdExec<ExecCreateCmd, ExecCreateCmdResponse> implements
+        ExecCreateCmd.Exec {
 
-    private static final Logger LOGGER = LoggerFactory
-            .getLogger(VersionCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(VersionCmdExec.class);
 
     public ExecCreateCmdExec(WebTarget baseResource) {
         super(baseResource);
@@ -21,13 +21,12 @@ public ExecCreateCmdExec(WebTarget baseResource) {
 
     @Override
     protected ExecCreateCmdResponse execute(ExecCreateCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/exec").resolveTemplate("id", command.getContainerId());
+        WebTarget webResource = getBaseResource().path("/containers/{id}/exec").resolveTemplate("id",
+                command.getContainerId());
 
         LOGGER.trace("POST: {}", webResource);
 
-		return webResource
-				.request()
-				.accept(MediaType.APPLICATION_JSON)
-				.post(entity(command, MediaType.APPLICATION_JSON), ExecCreateCmdResponse.class);
+        return webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(entity(command, MediaType.APPLICATION_JSON), ExecCreateCmdResponse.class);
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
index cbac951d3..46d0e2d29 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
@@ -22,18 +22,15 @@ public ExecStartCmdExec(WebTarget baseResource) {
         super(baseResource);
     }
 
-
     @Override
     protected InputStream execute(ExecStartCmd command) {
         WebTarget webResource = getBaseResource().path("/exec/{id}/start").resolveTemplate("id", command.getExecId());
 
         LOGGER.trace("POST: {}", webResource);
 
-		Response response = webResource
-				.request()
-				.accept(MediaType.APPLICATION_JSON)
-				.post(entity(command, MediaType.APPLICATION_JSON), Response.class);
-		
-		return new WrappedResponseInputStream(response);
+        Response response = webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(entity(command, MediaType.APPLICATION_JSON), Response.class);
+
+        return new WrappedResponseInputStream(response);
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
index c585f31c9..eafb87b98 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
@@ -10,20 +10,19 @@
 import com.github.dockerjava.api.model.Info;
 
 public class InfoCmdExec extends AbstrDockerCmdExec<InfoCmd, Info> implements InfoCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(InfoCmdExec.class);
-	
-	public InfoCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected Info execute(InfoCmd command) {
-		WebTarget webResource = getBaseResource().path("/info");
-
-		LOGGER.trace("GET: {}", webResource);
-		return webResource.request().accept(MediaType.APPLICATION_JSON).get(Info.class);
-	}
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InfoCmdExec.class);
+
+    public InfoCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected Info execute(InfoCmd command) {
+        WebTarget webResource = getBaseResource().path("/info");
+
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(Info.class);
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
index 664a67c59..a06e46e7c 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
@@ -3,28 +3,28 @@
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 
-public class InspectContainerCmdExec extends AbstrDockerCmdExec<InspectContainerCmd, InspectContainerResponse> implements InspectContainerCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(InspectContainerCmdExec.class);
-	
-	public InspectContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected InspectContainerResponse execute(InspectContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/{id}/json").resolveTemplate("id", command.getContainerId());
-		
-		LOGGER.debug("GET: {}", webResource);
-		return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectContainerResponse.class);
-	}
+public class InspectContainerCmdExec extends AbstrDockerCmdExec<InspectContainerCmd, InspectContainerResponse>
+        implements InspectContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InspectContainerCmdExec.class);
+
+    public InspectContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected InspectContainerResponse execute(InspectContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/json").resolveTemplate("id",
+                command.getContainerId());
+
+        LOGGER.debug("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectContainerResponse.class);
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
index b9ee33d61..a58a520cd 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
@@ -8,7 +8,8 @@
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
-public class InspectExecCmdExec extends AbstrDockerCmdExec<InspectExecCmd, InspectExecResponse> implements InspectExecCmd.Exec {
+public class InspectExecCmdExec extends AbstrDockerCmdExec<InspectExecCmd, InspectExecResponse> implements
+        InspectExecCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(InspectExecCmdExec.class);
 
     public InspectExecCmdExec(WebTarget baseResource) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java
index 784266091..b03cdd799 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java
@@ -9,21 +9,21 @@
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectImageResponse;
 
-public class InspectImageCmdExec extends AbstrDockerCmdExec<InspectImageCmd, InspectImageResponse> implements InspectImageCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(InspectImageCmdExec.class);
-	
-	public InspectImageCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected InspectImageResponse execute(InspectImageCmd command) {
-		WebTarget webResource = getBaseResource().path("/images/{id}/json").resolveTemplate("id", command.getImageId());
-
-		LOGGER.trace("GET: {}", webResource);
-		return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectImageResponse.class);
-	}
+public class InspectImageCmdExec extends AbstrDockerCmdExec<InspectImageCmd, InspectImageResponse> implements
+        InspectImageCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InspectImageCmdExec.class);
+
+    public InspectImageCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected InspectImageResponse execute(InspectImageCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/{id}/json").resolveTemplate("id", command.getImageId());
+
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectImageResponse.class);
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
index 6164064c9..bbfd0dbee 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
@@ -8,30 +8,27 @@
 
 import com.github.dockerjava.api.command.KillContainerCmd;
 
-public class KillContainerCmdExec extends
-		AbstrDockerCmdExec<KillContainerCmd, Void> implements
-		KillContainerCmd.Exec {
+public class KillContainerCmdExec extends AbstrDockerCmdExec<KillContainerCmd, Void> implements KillContainerCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(KillContainerCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(KillContainerCmdExec.class);
 
-	public KillContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public KillContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected Void execute(KillContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/{id}/kill")
-				.resolveTemplate("id", command.getContainerId());
+    @Override
+    protected Void execute(KillContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/kill").resolveTemplate("id",
+                command.getContainerId());
 
-		if (command.getSignal() != null) {
-			webResource = webResource.queryParam("signal", command.getSignal());
-		}
+        if (command.getSignal() != null) {
+            webResource = webResource.queryParam("signal", command.getSignal());
+        }
 
-		LOGGER.trace("POST: {}", webResource);
-		webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
 
-		return null;
-	}
+        return null;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
index 018db9a56..5bb905b56 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
@@ -12,19 +12,19 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.model.Container;
 
-public class ListContainersCmdExec extends AbstrDockerCmdExec<ListContainersCmd, List<Container>> implements ListContainersCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(ListContainersCmdExec.class);
-	
-	public ListContainersCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected List<Container> execute(ListContainersCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/json")
-                .queryParam("all", command.hasShowAllEnabled() ? "1" : "0")
-                .queryParam("since", command.getSinceId())
+public class ListContainersCmdExec extends AbstrDockerCmdExec<ListContainersCmd, List<Container>> implements
+        ListContainersCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ListContainersCmdExec.class);
+
+    public ListContainersCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected List<Container> execute(ListContainersCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/json")
+                .queryParam("all", command.hasShowAllEnabled() ? "1" : "0").queryParam("since", command.getSinceId())
                 .queryParam("before", command.getBeforeId())
                 .queryParam("size", command.hasShowSizeEnabled() ? "1" : "0");
 
@@ -32,12 +32,13 @@ protected List<Container> execute(ListContainersCmd command) {
             webResource = webResource.queryParam("limit", String.valueOf(command.getLimit()));
         }
 
-		LOGGER.trace("GET: {}", webResource);
-		List<Container> containers = webResource.request().accept(MediaType.APPLICATION_JSON).get(new GenericType<List<Container>>() {
-        });
-		LOGGER.trace("Response: {}", containers);
+        LOGGER.trace("GET: {}", webResource);
+        List<Container> containers = webResource.request().accept(MediaType.APPLICATION_JSON)
+                .get(new GenericType<List<Container>>() {
+                });
+        LOGGER.trace("Response: {}", containers);
 
-		return containers;
-	}
+        return containers;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
index 59e08fb60..b18470e12 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
@@ -14,35 +14,30 @@
 
 import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
 
-public class ListImagesCmdExec extends
-		AbstrDockerCmdExec<ListImagesCmd, List<Image>> implements
-		ListImagesCmd.Exec {
+public class ListImagesCmdExec extends AbstrDockerCmdExec<ListImagesCmd, List<Image>> implements ListImagesCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(ListImagesCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ListImagesCmdExec.class);
 
-	public ListImagesCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public ListImagesCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected List<Image> execute(ListImagesCmd command) {
-		WebTarget webResource = getBaseResource().path("/images/json")
-				.queryParam("all", command.hasShowAllEnabled() ? "1" : "0");
+    @Override
+    protected List<Image> execute(ListImagesCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/json").queryParam("all",
+                command.hasShowAllEnabled() ? "1" : "0");
 
-		if (command.getFilters() != null)
-			webResource = webResource.queryParam("filters",
-					urlPathSegmentEscaper().escape(command.getFilters()));
+        if (command.getFilters() != null)
+            webResource = webResource.queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters()));
 
-		LOGGER.trace("GET: {}", webResource);
+        LOGGER.trace("GET: {}", webResource);
 
-		List<Image> images = webResource.request()
-				.accept(MediaType.APPLICATION_JSON)
-				.get(new GenericType<List<Image>>() {
-				});
-		LOGGER.trace("Response: {}", images);
+        List<Image> images = webResource.request().accept(MediaType.APPLICATION_JSON)
+                .get(new GenericType<List<Image>>() {
+                });
+        LOGGER.trace("Response: {}", images);
 
-		return images;
-	}
+        return images;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
index 7d031bddd..39e1dbd3f 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
@@ -10,27 +10,28 @@
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
 
-public class LogContainerCmdExec extends AbstrDockerCmdExec<LogContainerCmd, InputStream> implements LogContainerCmd.Exec {
-
-	private static final Logger LOGGER = LoggerFactory.getLogger(LogContainerCmdExec.class);
-
-	public LogContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected InputStream execute(LogContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/{id}/logs")
-				.resolveTemplate("id", command.getContainerId())
-				.queryParam("timestamps", command.hasTimestampsEnabled() ? "1" : "0")
-				.queryParam("stdout", command.hasStdoutEnabled() ? "1" : "0")
-				.queryParam("stderr", command.hasStderrEnabled() ? "1" : "0")
-				.queryParam("follow", command.hasFollowStreamEnabled() ? "1" : "0")
-				.queryParam("tail", command.getTail() < 0 ? "all" : "" + command.getTail());
-
-		LOGGER.trace("GET: {}", webResource);
-		
-		return new WrappedResponseInputStream(webResource.request().get());
-	}
+public class LogContainerCmdExec extends AbstrDockerCmdExec<LogContainerCmd, InputStream> implements
+        LogContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(LogContainerCmdExec.class);
+
+    public LogContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected InputStream execute(LogContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/logs")
+                .resolveTemplate("id", command.getContainerId())
+                .queryParam("timestamps", command.hasTimestampsEnabled() ? "1" : "0")
+                .queryParam("stdout", command.hasStdoutEnabled() ? "1" : "0")
+                .queryParam("stderr", command.hasStderrEnabled() ? "1" : "0")
+                .queryParam("follow", command.hasFollowStreamEnabled() ? "1" : "0")
+                .queryParam("tail", command.getTail() < 0 ? "all" : "" + command.getTail());
+
+        LOGGER.trace("GET: {}", webResource);
+
+        return new WrappedResponseInputStream(webResource.request().get());
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
index 429c61edb..4bd8ddd9a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
@@ -8,27 +8,24 @@
 
 import com.github.dockerjava.api.command.PauseContainerCmd;
 
-public class PauseContainerCmdExec extends
-		AbstrDockerCmdExec<PauseContainerCmd, Void> implements
-		PauseContainerCmd.Exec {
+public class PauseContainerCmdExec extends AbstrDockerCmdExec<PauseContainerCmd, Void> implements
+        PauseContainerCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(PauseContainerCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PauseContainerCmdExec.class);
 
-	public PauseContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public PauseContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected Void execute(PauseContainerCmd command) {
-		WebTarget webResource = getBaseResource()
-				.path("/containers/{id}/pause").resolveTemplate("id",
-						command.getContainerId());
+    @Override
+    protected Void execute(PauseContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/pause").resolveTemplate("id",
+                command.getContainerId());
 
-		LOGGER.trace("POST: {}", webResource);
-		webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
 
-		return null;
-	}
+        return null;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
index 65bdc04b1..9e2677e58 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
@@ -9,20 +9,20 @@
 
 public class PingCmdExec extends AbstrDockerCmdExec<PingCmd, Void> implements PingCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(PingCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PingCmdExec.class);
 
-	public PingCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public PingCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected Void execute(PingCmd command) {
+        WebTarget webResource = getBaseResource().path("/_ping");
 
-	@Override
-	protected Void execute(PingCmd command) {
-		WebTarget webResource = getBaseResource().path("/_ping");
-	       
         LOGGER.trace("GET: {}", webResource);
         webResource.request().get().close();
-        
+
         return null;
-	}
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
index bd89d22f6..c317aa1c9 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
@@ -14,39 +14,32 @@
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
 
-public class PullImageCmdExec extends
-		AbstrDockerCmdExec<PullImageCmd, InputStream> implements
-		PullImageCmd.Exec {
-
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(PullImageCmdExec.class);
-
-	public PullImageCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected InputStream execute(PullImageCmd command) {
-		WebTarget webResource = getBaseResource().path("/images/create")
-				.queryParam("tag", command.getTag())
-				.queryParam("fromImage", command.getRepository())
-				.queryParam("registry", command.getRegistry());
-
-		LOGGER.trace("POST: {}", webResource);
-		Response response =  resourceWithOptionalAuthConfig(command, webResource.request())
-				.accept(MediaType.APPLICATION_OCTET_STREAM_TYPE).post(null);
-		
-		return new WrappedResponseInputStream(response);
-	}
-
-	private Invocation.Builder resourceWithOptionalAuthConfig(
-			PullImageCmd command, Invocation.Builder request) {
-		AuthConfig authConfig = command.getAuthConfig();
-		if (authConfig != null) {
-			request = request.header("X-Registry-Auth",
-					registryAuth(authConfig));
-		}
-		return request;
-	}
+public class PullImageCmdExec extends AbstrDockerCmdExec<PullImageCmd, InputStream> implements PullImageCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PullImageCmdExec.class);
+
+    public PullImageCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected InputStream execute(PullImageCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/create").queryParam("tag", command.getTag())
+                .queryParam("fromImage", command.getRepository()).queryParam("registry", command.getRegistry());
+
+        LOGGER.trace("POST: {}", webResource);
+        Response response = resourceWithOptionalAuthConfig(command, webResource.request()).accept(
+                MediaType.APPLICATION_OCTET_STREAM_TYPE).post(null);
+
+        return new WrappedResponseInputStream(response);
+    }
+
+    private Invocation.Builder resourceWithOptionalAuthConfig(PullImageCmd command, Invocation.Builder request) {
+        AuthConfig authConfig = command.getAuthConfig();
+        if (authConfig != null) {
+            request = request.header("X-Registry-Auth", registryAuth(authConfig));
+        }
+        return request;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
index 7fc88d91b..4f5ca5d0a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.jaxrs;
 
-
-
 import static javax.ws.rs.client.Entity.entity;
 
 import java.io.IOException;
@@ -26,64 +24,58 @@
 import com.google.common.collect.ImmutableList;
 
 public class PushImageCmdExec extends AbstrDockerCmdExec<PushImageCmd, Response> implements PushImageCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(PushImageCmdExec.class);
-	
-	public PushImageCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected ResponseImpl execute(PushImageCmd command) {
-		WebTarget webResource = getBaseResource().path("/images/" + name(command) + "/push")
-		    .queryParam("tag", command.getTag());
-
-		final String registryAuth = registryAuth(command.getAuthConfig());
-		LOGGER.trace("POST: {}", webResource);
-		javax.ws.rs.core.Response response =  webResource
-                .request()
-				.header("X-Registry-Auth", registryAuth)
-				.accept(MediaType.APPLICATION_JSON)
-				.post(
-				    entity(Response.class, MediaType.APPLICATION_JSON));
-
-	  return new ResponseImpl(new WrappedResponseInputStream(response));
-	}
-	
-	private String name(PushImageCmd command) {
-		String name = command.getName();
-		AuthConfig authConfig = command.getAuthConfig();
-		return name.contains("/") ? name : authConfig.getUsername();
-	}
-
-
-  public static class ResponseImpl extends Response {
-
-    private final InputStream proxy;
-
-    ResponseImpl(InputStream proxy) {
-      this.proxy = proxy;
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PushImageCmdExec.class);
+
+    public PushImageCmdExec(WebTarget baseResource) {
+        super(baseResource);
     }
 
     @Override
-    public Iterable<PushEventStreamItem> getItems() throws IOException {
-      ObjectMapper mapper = new ObjectMapper();
-      // we'll be reading instances of MyBean
-      ObjectReader reader = mapper.reader(PushEventStreamItem.class);
-      // and then do other configuration, if any, and read:
-      Iterator<PushEventStreamItem> items = reader.readValues(proxy);
-
-        try {
-            return ImmutableList.copyOf(items);
-        } finally {
-            proxy.close();
-        }
+    protected ResponseImpl execute(PushImageCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/" + name(command) + "/push").queryParam("tag",
+                command.getTag());
+
+        final String registryAuth = registryAuth(command.getAuthConfig());
+        LOGGER.trace("POST: {}", webResource);
+        javax.ws.rs.core.Response response = webResource.request().header("X-Registry-Auth", registryAuth)
+                .accept(MediaType.APPLICATION_JSON).post(entity(Response.class, MediaType.APPLICATION_JSON));
+
+        return new ResponseImpl(new WrappedResponseInputStream(response));
     }
 
-    @Override
-    public int read() throws IOException {
-      return proxy.read();
+    private String name(PushImageCmd command) {
+        String name = command.getName();
+        AuthConfig authConfig = command.getAuthConfig();
+        return name.contains("/") ? name : authConfig.getUsername();
+    }
+
+    public static class ResponseImpl extends Response {
+
+        private final InputStream proxy;
+
+        ResponseImpl(InputStream proxy) {
+            this.proxy = proxy;
+        }
+
+        @Override
+        public Iterable<PushEventStreamItem> getItems() throws IOException {
+            ObjectMapper mapper = new ObjectMapper();
+            // we'll be reading instances of MyBean
+            ObjectReader reader = mapper.reader(PushEventStreamItem.class);
+            // and then do other configuration, if any, and read:
+            Iterator<PushEventStreamItem> items = reader.readValues(proxy);
+
+            try {
+                return ImmutableList.copyOf(items);
+            } finally {
+                proxy.close();
+            }
+        }
+
+        @Override
+        public int read() throws IOException {
+            return proxy.read();
+        }
     }
-  }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
index d2ff1b837..ebd98fc6f 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
@@ -8,24 +8,25 @@
 
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 
-public class RemoveContainerCmdExec extends AbstrDockerCmdExec<RemoveContainerCmd, Void> implements RemoveContainerCmd.Exec {
+public class RemoveContainerCmdExec extends AbstrDockerCmdExec<RemoveContainerCmd, Void> implements
+        RemoveContainerCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(RemoveContainerCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveContainerCmdExec.class);
 
-	public RemoveContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public RemoveContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected Void execute(RemoveContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/" + command.getContainerId())
-				.queryParam("v", command.hasRemoveVolumesEnabled() ? "1" : "0")
-				.queryParam("force", command.hasForceEnabled() ? "1" : "0");
-		
-		LOGGER.trace("DELETE: {}", webResource);
-		webResource.request().accept(MediaType.APPLICATION_JSON).delete().close();
+    @Override
+    protected Void execute(RemoveContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/" + command.getContainerId())
+                .queryParam("v", command.hasRemoveVolumesEnabled() ? "1" : "0")
+                .queryParam("force", command.hasForceEnabled() ? "1" : "0");
 
-		return null;
-	}
+        LOGGER.trace("DELETE: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).delete().close();
+
+        return null;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
index d5d7b8000..8db23112b 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
@@ -9,22 +9,22 @@
 
 public class RemoveImageCmdExec extends AbstrDockerCmdExec<RemoveImageCmd, Void> implements RemoveImageCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(RemoveImageCmdExec.class);
-
-	public RemoveImageCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected Void execute(RemoveImageCmd command) {
-		WebTarget webResource = getBaseResource().path("/images/" + command.getImageId())
-				.queryParam("force", command.hasForceEnabled() ? "1" : "0")
-				.queryParam("noprune", command.hasNoPruneEnabled() ? "1" : "0");
-
-		LOGGER.trace("DELETE: {}", webResource);
-		webResource.request().delete().close();
-		
-		return null;
-	}
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveImageCmdExec.class);
+
+    public RemoveImageCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected Void execute(RemoveImageCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/" + command.getImageId())
+                .queryParam("force", command.hasForceEnabled() ? "1" : "0")
+                .queryParam("noprune", command.hasNoPruneEnabled() ? "1" : "0");
+
+        LOGGER.trace("DELETE: {}", webResource);
+        webResource.request().delete().close();
+
+        return null;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
index 9ac76a36a..f640945a2 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
@@ -8,28 +8,24 @@
 
 import com.github.dockerjava.api.command.RestartContainerCmd;
 
-public class RestartContainerCmdExec extends
-		AbstrDockerCmdExec<RestartContainerCmd, Void> implements
-		RestartContainerCmd.Exec {
+public class RestartContainerCmdExec extends AbstrDockerCmdExec<RestartContainerCmd, Void> implements
+        RestartContainerCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(RestartContainerCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(RestartContainerCmdExec.class);
 
-	public RestartContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public RestartContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected Void execute(RestartContainerCmd command) {
-		WebTarget webResource = getBaseResource()
-				.path("/containers/{id}/restart")
-				.resolveTemplate("id", command.getContainerId())
-				.queryParam("t", String.valueOf(command.getTimeout()));
+    @Override
+    protected Void execute(RestartContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/restart")
+                .resolveTemplate("id", command.getContainerId()).queryParam("t", String.valueOf(command.getTimeout()));
 
-		LOGGER.trace("POST: {}", webResource);
-		webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
 
-		return null;
-	}
+        return null;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
index 8d70e2f6f..de56a39b6 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
@@ -13,8 +13,7 @@
 import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
 
 public class SaveImageCmdExec extends AbstrDockerCmdExec<SaveImageCmd, InputStream> implements SaveImageCmd.Exec {
-    private static final Logger LOGGER = LoggerFactory
-            .getLogger(SaveImageCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SaveImageCmdExec.class);
 
     public SaveImageCmdExec(WebTarget baseResource) {
         super(baseResource);
@@ -22,14 +21,11 @@ public SaveImageCmdExec(WebTarget baseResource) {
 
     @Override
     protected InputStream execute(SaveImageCmd command) {
-        WebTarget webResource = getBaseResource().path("/images/" + command.getName() + "/get")
-                .queryParam("tag", command.getTag());
+        WebTarget webResource = getBaseResource().path("/images/" + command.getName() + "/get").queryParam("tag",
+                command.getTag());
 
         LOGGER.trace("GET: {}", webResource);
-        Response response =  webResource
-                .request()
-                .accept(MediaType.APPLICATION_JSON)
-                .get();
+        Response response = webResource.request().accept(MediaType.APPLICATION_JSON).get();
 
         return new WrappedResponseInputStream(response);
     }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java
index a7b6ddbc2..00aeb91ec 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java
@@ -12,21 +12,22 @@
 import com.github.dockerjava.api.command.SearchImagesCmd;
 import com.github.dockerjava.api.model.SearchItem;
 
-public class SearchImagesCmdExec extends AbstrDockerCmdExec<SearchImagesCmd, List<SearchItem>> implements SearchImagesCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(SearchImagesCmdExec.class);
-	
-	public SearchImagesCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected List<SearchItem> execute(SearchImagesCmd command) {
-		WebTarget webResource = getBaseResource().path("/images/search").queryParam("term", command.getTerm());
-		
-		LOGGER.trace("GET: {}", webResource);
-		return webResource.request().accept(MediaType.APPLICATION_JSON).get(new GenericType<List<SearchItem>>() {
+public class SearchImagesCmdExec extends AbstrDockerCmdExec<SearchImagesCmd, List<SearchItem>> implements
+        SearchImagesCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(SearchImagesCmdExec.class);
+
+    public SearchImagesCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected List<SearchItem> execute(SearchImagesCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/search").queryParam("term", command.getTerm());
+
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(new GenericType<List<SearchItem>>() {
         });
-	}
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
index 8ca1a42fc..c90f5e1cc 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
@@ -10,22 +10,25 @@
 
 import com.github.dockerjava.api.command.StartContainerCmd;
 
-public class StartContainerCmdExec extends AbstrDockerCmdExec<StartContainerCmd, Void> implements StartContainerCmd.Exec {
+public class StartContainerCmdExec extends AbstrDockerCmdExec<StartContainerCmd, Void> implements
+        StartContainerCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(StartContainerCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(StartContainerCmdExec.class);
 
-	public StartContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public StartContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected Void execute(StartContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/{id}/start").resolveTemplate("id", command.getContainerId());
+    @Override
+    protected Void execute(StartContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/start").resolveTemplate("id",
+                command.getContainerId());
 
-		LOGGER.trace("POST: {}", webResource);
-		webResource.request().accept(MediaType.APPLICATION_JSON).post(entity(command, MediaType.APPLICATION_JSON)).close();
-		
-		return null;
-	}
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(entity(command, MediaType.APPLICATION_JSON))
+                .close();
+
+        return null;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
index c0c6f36c1..f63e609cb 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
@@ -31,10 +31,10 @@ public StatsCmdExec(WebTarget baseResource) {
 
     @Override
     protected ExecutorService execute(StatsCmd command) {
-    	ExecutorService executorService = Executors.newSingleThreadExecutor();
+        ExecutorService executorService = Executors.newSingleThreadExecutor();
 
-        WebTarget webResource = getBaseResource().path("/containers/{id}/stats")
-            .resolveTemplate("id", command.getContainerId());
+        WebTarget webResource = getBaseResource().path("/containers/{id}/stats").resolveTemplate("id",
+                command.getContainerId());
 
         LOGGER.trace("GET: {}", webResource);
         StatsNotifier eventNotifier = StatsNotifier.create(command.getStatsCallback(), webResource);
@@ -44,9 +44,11 @@ protected ExecutorService execute(StatsCmd command) {
 
     private static class StatsNotifier implements Callable<Void> {
         private static final JsonFactory JSON_FACTORY = new JsonFactory();
+
         private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
         private final StatsCallback statsCallback;
+
         private final WebTarget webTarget;
 
         private StatsNotifier(StatsCallback statsCallback, WebTarget webTarget) {
@@ -66,19 +68,16 @@ public Void call() throws Exception {
             Response response = null;
             try {
                 response = webTarget.request().get(Response.class);
-                InputStream inputStream = new WrappedResponseInputStream(
-                        response);
+                InputStream inputStream = new WrappedResponseInputStream(response);
                 JsonParser jp = JSON_FACTORY.createParser(inputStream);
                 // The following condition looks strange but jp.nextToken() will block until there is an
                 // event from the docker server or the connection is terminated.
                 // therefore we want to check before getting an event (to prevent a blocking operation
                 // and after the event to make sure that the eventCallback is still interested in getting notified.
-                while (statsCallback.isReceiving() &&
-                       jp.nextToken() != JsonToken.END_OBJECT && !jp.isClosed() &&
-                               statsCallback.isReceiving()) {
+                while (statsCallback.isReceiving() && jp.nextToken() != JsonToken.END_OBJECT && !jp.isClosed()
+                        && statsCallback.isReceiving()) {
                     try {
-                        statsCallback.onStats(OBJECT_MAPPER.readValue(jp,
-                                Statistics.class));
+                        statsCallback.onStats(OBJECT_MAPPER.readValue(jp, Statistics.class));
                     } catch (Exception e) {
                         statsCallback.onException(e);
                     }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
index bf683be59..3197e0c0e 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
@@ -8,26 +8,22 @@
 
 import com.github.dockerjava.api.command.StopContainerCmd;
 
-public class StopContainerCmdExec extends
-		AbstrDockerCmdExec<StopContainerCmd, Void> implements
-		StopContainerCmd.Exec {
+public class StopContainerCmdExec extends AbstrDockerCmdExec<StopContainerCmd, Void> implements StopContainerCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(StopContainerCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(StopContainerCmdExec.class);
 
-	public StopContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public StopContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected Void execute(StopContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/{id}/stop")
-				.resolveTemplate("id", command.getContainerId())
-				.queryParam("t", String.valueOf(command.getTimeout()));
+    @Override
+    protected Void execute(StopContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/stop")
+                .resolveTemplate("id", command.getContainerId()).queryParam("t", String.valueOf(command.getTimeout()));
 
-		LOGGER.trace("POST: {}", webResource);
-		webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
 
-		return null;
-	}
+        return null;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
index dfbeba072..3cddd63f2 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
@@ -8,26 +8,22 @@
 import com.github.dockerjava.api.command.TagImageCmd;
 
 public class TagImageCmdExec extends AbstrDockerCmdExec<TagImageCmd, Void> implements TagImageCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(TagImageCmdExec.class);
-	
-	public TagImageCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected Void execute(TagImageCmd command) {
-		WebTarget webResource = getBaseResource().path("/images/" + command.getImageId() + "/tag")
-                .queryParam("repo", command.getRepository())
-                .queryParam("tag", command.getTag())
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(TagImageCmdExec.class);
+
+    public TagImageCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected Void execute(TagImageCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/" + command.getImageId() + "/tag")
+                .queryParam("repo", command.getRepository()).queryParam("tag", command.getTag())
                 .queryParam("force", command.hasForceEnabled() ? "1" : "0");
 
-		LOGGER.trace("POST: {}", webResource);
-		webResource.request().post(null).close();
-		return null;
-	}
-	
-	
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().post(null).close();
+        return null;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
index 55c431ccd..daff2224b 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
@@ -11,24 +11,25 @@
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.TopContainerResponse;
 
-public class TopContainerCmdExec extends AbstrDockerCmdExec<TopContainerCmd, TopContainerResponse> implements TopContainerCmd.Exec {
+public class TopContainerCmdExec extends AbstrDockerCmdExec<TopContainerCmd, TopContainerResponse> implements
+        TopContainerCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(TopContainerCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TopContainerCmdExec.class);
 
-	public TopContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public TopContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected TopContainerResponse execute(TopContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/{id}/top")
-				.resolveTemplate("id", command.getContainerId());
+    @Override
+    protected TopContainerResponse execute(TopContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/top").resolveTemplate("id",
+                command.getContainerId());
 
-		if(!StringUtils.isEmpty(command.getPsArgs()))
-			webResource = webResource.queryParam("ps_args", command.getPsArgs());
-		
-		LOGGER.trace("GET: {}", webResource);
-		return webResource.request().accept(MediaType.APPLICATION_JSON).get(TopContainerResponse.class);
-	}
+        if (!StringUtils.isEmpty(command.getPsArgs()))
+            webResource = webResource.queryParam("ps_args", command.getPsArgs());
+
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(TopContainerResponse.class);
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java b/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
index 4b6cfbba3..3fea92126 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
@@ -1,4 +1,5 @@
 package com.github.dockerjava.jaxrs;
+
 /*
  * Copyright (c) 2014 Spotify AB.
  *
@@ -20,8 +21,6 @@
  * under the License.
  */
 
-
-
 import org.apache.http.HttpHost;
 import org.apache.http.annotation.Immutable;
 import org.apache.http.conn.ConnectTimeoutException;
@@ -42,44 +41,40 @@
 @Immutable
 public class UnixConnectionSocketFactory implements ConnectionSocketFactory {
 
-  private File socketFile;
-
-  public UnixConnectionSocketFactory(final URI socketUri) {
-    super();
+    private File socketFile;
 
-    final String filename = socketUri.toString()
-        .replaceAll("^unix:///", "unix://localhost/")
-        .replaceAll("^unix://localhost", "");
+    public UnixConnectionSocketFactory(final URI socketUri) {
+        super();
 
-    this.socketFile = new File(filename);
-  }
+        final String filename = socketUri.toString().replaceAll("^unix:///", "unix://localhost/")
+                .replaceAll("^unix://localhost", "");
 
-  public static URI sanitizeUri(final URI uri) {
-    if (uri.getScheme().equals("unix")) {
-      return URI.create("unix://localhost:80");
-    } else {
-      return uri;
+        this.socketFile = new File(filename);
     }
-  }
 
-  @Override
-  public Socket createSocket(final HttpContext context) throws IOException {
-    return new ApacheUnixSocket();
-  }
+    public static URI sanitizeUri(final URI uri) {
+        if (uri.getScheme().equals("unix")) {
+            return URI.create("unix://localhost:80");
+        } else {
+            return uri;
+        }
+    }
 
-  @Override
-  public Socket connectSocket(final int connectTimeout,
-                              final Socket socket,
-                              final HttpHost host,
-                              final InetSocketAddress remoteAddress,
-                              final InetSocketAddress localAddress,
-                              final HttpContext context) throws IOException {
-    try {
-      socket.connect(new AFUNIXSocketAddress(socketFile), connectTimeout);
-    } catch (SocketTimeoutException e) {
-      throw new ConnectTimeoutException(e, null, remoteAddress.getAddress());
+    @Override
+    public Socket createSocket(final HttpContext context) throws IOException {
+        return new ApacheUnixSocket();
     }
 
-    return socket;
-  }
+    @Override
+    public Socket connectSocket(final int connectTimeout, final Socket socket, final HttpHost host,
+            final InetSocketAddress remoteAddress, final InetSocketAddress localAddress, final HttpContext context)
+            throws IOException {
+        try {
+            socket.connect(new AFUNIXSocketAddress(socketFile), connectTimeout);
+        } catch (SocketTimeoutException e) {
+            throw new ConnectTimeoutException(e, null, remoteAddress.getAddress());
+        }
+
+        return socket;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
index 7fed603a5..de507e8ff 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
@@ -8,24 +8,24 @@
 
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 
-public class UnpauseContainerCmdExec extends AbstrDockerCmdExec<UnpauseContainerCmd, Void> implements UnpauseContainerCmd.Exec {
+public class UnpauseContainerCmdExec extends AbstrDockerCmdExec<UnpauseContainerCmd, Void> implements
+        UnpauseContainerCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(UnpauseContainerCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(UnpauseContainerCmdExec.class);
 
-	public UnpauseContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public UnpauseContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected Void execute(UnpauseContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/{id}/unpause")
-				.resolveTemplate("id", command.getContainerId());
-		
-		LOGGER.trace("POST: {}", webResource);
-		webResource.request().accept(MediaType.APPLICATION_JSON)
-				.post(null).close();
+    @Override
+    protected Void execute(UnpauseContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/unpause").resolveTemplate("id",
+                command.getContainerId());
 
-		return null;
-	}
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
+
+        return null;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java
index 9b4ac817a..e8af1cb29 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java
@@ -11,20 +11,18 @@
 
 public class VersionCmdExec extends AbstrDockerCmdExec<VersionCmd, Version> implements VersionCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(VersionCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(VersionCmdExec.class);
 
-	public VersionCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public VersionCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected Version execute(VersionCmd command) {
-		WebTarget webResource = getBaseResource().path("/version");
+    @Override
+    protected Version execute(VersionCmd command) {
+        WebTarget webResource = getBaseResource().path("/version");
 
-		LOGGER.trace("GET: {}", webResource);
-		return webResource.request().accept(MediaType.APPLICATION_JSON)
-				.get(Version.class);
-	}
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(Version.class);
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
index 1b81eee33..47af2bcfa 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
@@ -9,25 +9,24 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 
-public class WaitContainerCmdExec extends AbstrDockerCmdExec<WaitContainerCmd, Integer> implements WaitContainerCmd.Exec {
+public class WaitContainerCmdExec extends AbstrDockerCmdExec<WaitContainerCmd, Integer> implements
+        WaitContainerCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(WaitContainerCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(WaitContainerCmdExec.class);
 
-	public WaitContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public WaitContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected Integer execute(WaitContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/{id}/wait")
-				.resolveTemplate("id", command.getContainerId());
+    @Override
+    protected Integer execute(WaitContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/wait").resolveTemplate("id",
+                command.getContainerId());
+
+        LOGGER.trace("POST: {}", webResource);
+        ObjectNode ObjectNode = webResource.request().accept(MediaType.APPLICATION_JSON).post(null, ObjectNode.class);
 
-		LOGGER.trace("POST: {}", webResource);
-		ObjectNode ObjectNode = webResource.request().accept(MediaType.APPLICATION_JSON)
-				.post(null, ObjectNode.class);
-		
         return ObjectNode.get("StatusCode").asInt();
-	}
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
index 63fea0954..d11cdd7a0 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
@@ -40,7 +40,6 @@
  * holder.
  */
 
-
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -127,8 +126,7 @@
 import jersey.repackaged.com.google.common.util.concurrent.MoreExecutors;
 
 /**
- * A {@link Connector} that utilizes the Apache HTTP Client to send and receive
- * HTTP request and responses.
+ * A {@link Connector} that utilizes the Apache HTTP Client to send and receive HTTP request and responses.
  * <p/>
  * The following properties are only supported at construction of this class:
  * <ul>
@@ -144,35 +142,32 @@
  * <li>{@link ApacheClientProperties#SSL_CONFIG}</li>
  * </ul>
  * <p>
- * This connector uses {@link RequestEntityProcessing#CHUNKED chunked encoding} as a default setting. This can
- * be overridden by the {@link ClientProperties#REQUEST_ENTITY_PROCESSING}. By default the
- * {@link ClientProperties#CHUNKED_ENCODING_SIZE} property is only supported by using default connection manager. If custom
- * connection manager needs to be used then chunked encoding size can be set by providing a custom
- * {@link org.apache.http.HttpClientConnection} (via custom {@link org.apache.http.impl.conn.ManagedHttpClientConnectionFactory})
- * and overriding {@code createOutputStream} method.
+ * This connector uses {@link RequestEntityProcessing#CHUNKED chunked encoding} as a default setting. This can be
+ * overridden by the {@link ClientProperties#REQUEST_ENTITY_PROCESSING}. By default the
+ * {@link ClientProperties#CHUNKED_ENCODING_SIZE} property is only supported by using default connection manager. If
+ * custom connection manager needs to be used then chunked encoding size can be set by providing a custom
+ * {@link org.apache.http.HttpClientConnection} (via custom
+ * {@link org.apache.http.impl.conn.ManagedHttpClientConnectionFactory}) and overriding {@code createOutputStream}
+ * method.
  * </p>
  * <p>
- * Using of authorization is dependent on the chunk encoding setting. If the entity
- * buffering is enabled, the entity is buffered and authorization can be performed
- * automatically in response to a 401 by sending the request again. When entity buffering
- * is disabled (chunked encoding is used) then the property
- * {@link org.glassfish.jersey.apache.connector.ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION} must
- * be set to {@code true}.
+ * Using of authorization is dependent on the chunk encoding setting. If the entity buffering is enabled, the entity is
+ * buffered and authorization can be performed automatically in response to a 401 by sending the request again. When
+ * entity buffering is disabled (chunked encoding is used) then the property
+ * {@link org.glassfish.jersey.apache.connector.ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION} must be set to
+ * {@code true}.
  * </p>
  * <p>
- * If a {@link org.glassfish.jersey.client.ClientResponse} is obtained and an
- * entity is not read from the response then
- * {@link org.glassfish.jersey.client.ClientResponse#close()} MUST be called
- * after processing the response to release connection-based resources.
+ * If a {@link org.glassfish.jersey.client.ClientResponse} is obtained and an entity is not read from the response then
+ * {@link org.glassfish.jersey.client.ClientResponse#close()} MUST be called after processing the response to release
+ * connection-based resources.
  * </p>
  * <p>
- * Client operations are thread safe, the HTTP connection may
- * be shared between different threads.
+ * Client operations are thread safe, the HTTP connection may be shared between different threads.
  * </p>
  * <p>
- * If a response entity is obtained that is an instance of {@link Closeable}
- * then the instance MUST be closed after processing the entity to release
- * connection-based resources.
+ * If a response entity is obtained that is an instance of {@link Closeable} then the instance MUST be closed after
+ * processing the entity to release connection-based resources.
  * </p>
  * <p>
  * The following methods are currently supported: HEAD, GET, POST, PUT, DELETE, OPTIONS, PATCH and TRACE.
@@ -190,6 +185,7 @@ class ApacheConnector implements Connector {
     private final static Logger LOGGER = Logger.getLogger(ApacheConnector.class.getName());
 
     private static final VersionInfo vi;
+
     private static final String release;
 
     static {
@@ -198,14 +194,18 @@ class ApacheConnector implements Connector {
     }
 
     private final CloseableHttpClient client;
+
     private final CookieStore cookieStore;
+
     private final boolean preemptiveBasicAuth;
+
     private final RequestConfig requestConfig;
 
     /**
      * Create the new Apache HTTP Client connector.
      *
-     * @param config client configuration.
+     * @param config
+     *            client configuration.
      */
     ApacheConnector(Configuration config) {
         Object reqConfig = null;
@@ -215,26 +215,18 @@ class ApacheConnector implements Connector {
 
             if (connectionManager != null) {
                 if (!(connectionManager instanceof HttpClientConnectionManager)) {
-                    LOGGER.log(
-                            Level.WARNING,
-                            LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
-                                    ApacheClientProperties.CONNECTION_MANAGER,
-                                    connectionManager.getClass().getName(),
-                                    HttpClientConnectionManager.class.getName())
-                    );
+                    LOGGER.log(Level.WARNING, LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
+                            ApacheClientProperties.CONNECTION_MANAGER, connectionManager.getClass().getName(),
+                            HttpClientConnectionManager.class.getName()));
                 }
             }
 
             reqConfig = config.getProperties().get(ApacheClientProperties.REQUEST_CONFIG);
             if (reqConfig != null) {
                 if (!(reqConfig instanceof RequestConfig)) {
-                    LOGGER.log(
-                            Level.WARNING,
-                            LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
-                                    ApacheClientProperties.REQUEST_CONFIG,
-                                    reqConfig.getClass().getName(),
-                                    RequestConfig.class.getName())
-                    );
+                    LOGGER.log(Level.WARNING, LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
+                            ApacheClientProperties.REQUEST_CONFIG, reqConfig.getClass().getName(),
+                            RequestConfig.class.getName()));
                     reqConfig = null;
                 }
             }
@@ -267,31 +259,30 @@ class ApacheConnector implements Connector {
                 final URI u = getProxyUri(proxyUri);
                 final HttpHost proxy = new HttpHost(u.getHost(), u.getPort(), u.getScheme());
                 String userName;
-                userName = ClientProperties.getValue(config.getProperties(), ClientProperties.PROXY_USERNAME, String.class);
+                userName = ClientProperties.getValue(config.getProperties(), ClientProperties.PROXY_USERNAME,
+                        String.class);
                 if (userName != null) {
                     String password;
-                    password = ClientProperties.getValue(config.getProperties(), ClientProperties.PROXY_PASSWORD, String.class);
+                    password = ClientProperties.getValue(config.getProperties(), ClientProperties.PROXY_PASSWORD,
+                            String.class);
 
                     if (password != null) {
                         final CredentialsProvider credsProvider = new BasicCredentialsProvider();
-                        credsProvider.setCredentials(
-                                new AuthScope(u.getHost(), u.getPort()),
-                                new UsernamePasswordCredentials(userName, password)
-                        );
+                        credsProvider.setCredentials(new AuthScope(u.getHost(), u.getPort()),
+                                new UsernamePasswordCredentials(userName, password));
                         clientBuilder.setDefaultCredentialsProvider(credsProvider);
                     }
                 }
                 clientBuilder.setProxy(proxy);
             }
 
-            final Boolean preemptiveBasicAuthProperty = (Boolean) config.getProperties()
-                    .get(ApacheClientProperties.PREEMPTIVE_BASIC_AUTHENTICATION);
+            final Boolean preemptiveBasicAuthProperty = (Boolean) config.getProperties().get(
+                    ApacheClientProperties.PREEMPTIVE_BASIC_AUTHENTICATION);
             this.preemptiveBasicAuth = (preemptiveBasicAuthProperty != null) ? preemptiveBasicAuthProperty : false;
         } else {
             this.preemptiveBasicAuth = false;
         }
 
-
         if (reqConfig != null) {
             RequestConfig.Builder reqConfigBuilder = RequestConfig.copy((RequestConfig) reqConfig);
             if (connectTimeout > 0) {
@@ -324,10 +315,8 @@ class ApacheConnector implements Connector {
     }
 
     private SSLContext getSslContext(final Configuration config) {
-        final SslConfigurator sslConfigurator = ApacheClientProperties.getValue(
-                config.getProperties(),
-                ApacheClientProperties.SSL_CONFIG,
-                SslConfigurator.class);
+        final SslConfigurator sslConfigurator = ApacheClientProperties.getValue(config.getProperties(),
+                ApacheClientProperties.SSL_CONFIG, SslConfigurator.class);
 
         return sslConfigurator != null ? sslConfigurator.createSSLContext() : null;
     }
@@ -340,34 +329,22 @@ HttpClientConnectionManager getConnectionManager(final Configuration config, fin
             if (cmObject instanceof HttpClientConnectionManager) {
                 return (HttpClientConnectionManager) cmObject;
             } else {
-                LOGGER.log(
-                        Level.WARNING,
-                        LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
-                                ApacheClientProperties.CONNECTION_MANAGER,
-                                cmObject.getClass().getName(),
-                                HttpClientConnectionManager.class.getName())
-                );
+                LOGGER.log(Level.WARNING, LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
+                        ApacheClientProperties.CONNECTION_MANAGER, cmObject.getClass().getName(),
+                        HttpClientConnectionManager.class.getName()));
             }
         }
 
         // Create custom connection manager.
-        return createConnectionManager(
-                config,
-                sslContext,
-                null,
-                false);
+        return createConnectionManager(config, sslContext, null, false);
     }
 
-    private HttpClientConnectionManager createConnectionManager(
-            final Configuration config,
-            final SSLContext sslContext,
-            X509HostnameVerifier hostnameVerifier,
-            final boolean useSystemProperties) {
+    private HttpClientConnectionManager createConnectionManager(final Configuration config,
+            final SSLContext sslContext, X509HostnameVerifier hostnameVerifier, final boolean useSystemProperties) {
 
-        final String[] supportedProtocols = useSystemProperties ? split(
-                System.getProperty("https.protocols")) : null;
-        final String[] supportedCipherSuites = useSystemProperties ? split(
-                System.getProperty("https.cipherSuites")) : null;
+        final String[] supportedProtocols = useSystemProperties ? split(System.getProperty("https.protocols")) : null;
+        final String[] supportedCipherSuites = useSystemProperties ? split(System.getProperty("https.cipherSuites"))
+                : null;
 
         if (hostnameVerifier == null) {
             hostnameVerifier = SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER;
@@ -375,30 +352,26 @@ private HttpClientConnectionManager createConnectionManager(
 
         final LayeredConnectionSocketFactory sslSocketFactory;
         if (sslContext != null) {
-            sslSocketFactory = new SSLConnectionSocketFactory(
-                    sslContext, supportedProtocols, supportedCipherSuites, hostnameVerifier);
+            sslSocketFactory = new SSLConnectionSocketFactory(sslContext, supportedProtocols, supportedCipherSuites,
+                    hostnameVerifier);
         } else {
             if (useSystemProperties) {
-                sslSocketFactory = new SSLConnectionSocketFactory(
-                        (SSLSocketFactory) SSLSocketFactory.getDefault(),
+                sslSocketFactory = new SSLConnectionSocketFactory((SSLSocketFactory) SSLSocketFactory.getDefault(),
                         supportedProtocols, supportedCipherSuites, hostnameVerifier);
             } else {
-                sslSocketFactory = new SSLConnectionSocketFactory(
-                        SSLContexts.createDefault(),
-                        hostnameVerifier);
+                sslSocketFactory = new SSLConnectionSocketFactory(SSLContexts.createDefault(), hostnameVerifier);
             }
         }
 
-        final Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory>create()
-                .register("http", PlainConnectionSocketFactory.getSocketFactory())
-                .register("https", sslSocketFactory)
+        final Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory> create()
+                .register("http", PlainConnectionSocketFactory.getSocketFactory()).register("https", sslSocketFactory)
                 .build();
 
         final Integer chunkSize = ClientProperties.getValue(config.getProperties(),
                 ClientProperties.CHUNKED_ENCODING_SIZE, 4096, Integer.class);
 
-        final PoolingHttpClientConnectionManager connectionManager =
-                new PoolingHttpClientConnectionManager(registry, new ConnectionFactory(chunkSize));
+        final PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(registry,
+                new ConnectionFactory(chunkSize));
 
         if (useSystemProperties) {
             String s = System.getProperty("http.keepAlive", "true");
@@ -433,8 +406,8 @@ public HttpClient getHttpClient() {
     /**
      * Get the {@link CookieStore}.
      *
-     * @return the {@link CookieStore} instance or {@code null} when {@value ApacheClientProperties#DISABLE_COOKIES} set to
-     * {@code true}.
+     * @return the {@link CookieStore} instance or {@code null} when {@value ApacheClientProperties#DISABLE_COOKIES} set
+     *         to {@code true}.
      */
     public CookieStore getCookieStore() {
         return cookieStore;
@@ -465,15 +438,15 @@ public ClientResponse apply(final ClientRequest clientRequest) throws Processing
                 context.setAuthCache(authCache);
             }
 
-            //context.setRequestConfig(RequestConfig.custom().setConnectionRequestTimeout(10).build());
+            // context.setRequestConfig(RequestConfig.custom().setConnectionRequestTimeout(10).build());
 
             response = client.execute(getHost(request), request, context);
-            HeaderUtils.checkHeaderChanges(clientHeadersSnapshot, clientRequest.getHeaders(),
-                    this.getClass().getName());
+            HeaderUtils
+                    .checkHeaderChanges(clientHeadersSnapshot, clientRequest.getHeaders(), this.getClass().getName());
 
-            final Response.StatusType status = response.getStatusLine().getReasonPhrase() == null ?
-                    Statuses.from(response.getStatusLine().getStatusCode()) :
-                    Statuses.from(response.getStatusLine().getStatusCode(), response.getStatusLine().getReasonPhrase());
+            final Response.StatusType status = response.getStatusLine().getReasonPhrase() == null ? Statuses
+                    .from(response.getStatusLine().getStatusCode()) : Statuses.from(response.getStatusLine()
+                    .getStatusCode(), response.getStatusLine().getReasonPhrase());
 
             final ClientResponse responseContext = new ApacheConnectorClientResponse(status, clientRequest, response);
             final List<URI> redirectLocations = context.getRedirectLocations();
@@ -506,7 +479,6 @@ public ClientResponse apply(final ClientRequest clientRequest) throws Processing
                 }
             }
 
-
             try {
                 responseContext.setEntityStream(new HttpClientResponseInputStream(response));
             } catch (final IOException e) {
@@ -554,23 +526,18 @@ private HttpHost getHost(final HttpUriRequest request) {
     }
 
     private HttpUriRequest getUriHttpRequest(final ClientRequest clientRequest) {
-        final Boolean redirectsEnabled =
-                clientRequest.resolveProperty(ClientProperties.FOLLOW_REDIRECTS, requestConfig.isRedirectsEnabled());
+        final Boolean redirectsEnabled = clientRequest.resolveProperty(ClientProperties.FOLLOW_REDIRECTS,
+                requestConfig.isRedirectsEnabled());
         final RequestConfig config = RequestConfig.copy(requestConfig).setRedirectsEnabled(redirectsEnabled).build();
 
         final Boolean bufferingEnabled = clientRequest.resolveProperty(ClientProperties.REQUEST_ENTITY_PROCESSING,
                 RequestEntityProcessing.class) == RequestEntityProcessing.BUFFERED;
         final HttpEntity entity = getHttpEntity(clientRequest, bufferingEnabled);
 
-        return RequestBuilder
-                .create(clientRequest.getMethod())
-                .setUri(clientRequest.getUri())
-                .setConfig(config)
-                .setEntity(entity)
-                .build();
+        return RequestBuilder.create(clientRequest.getMethod()).setUri(clientRequest.getUri()).setConfig(config)
+                .setEntity(entity).build();
     }
 
-
     private HttpEntity getHttpEntity(final ClientRequest clientRequest, final boolean bufferingEnabled) {
         final Object entity = clientRequest.getEntity();
 
@@ -628,7 +595,8 @@ public boolean isStreaming() {
         }
     }
 
-    private static Map<String, String> writeOutBoundHeaders(final MultivaluedMap<String, Object> headers, final HttpUriRequest request) {
+    private static Map<String, String> writeOutBoundHeaders(final MultivaluedMap<String, Object> headers,
+            final HttpUriRequest request) {
         Map<String, String> stringHeaders = HeaderUtils.asStringHeadersSingleValue(headers);
 
         for (Map.Entry<String, String> e : stringHeaders.entrySet()) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java
index 7ba9d8abd..a4d68e202 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java
@@ -18,35 +18,31 @@
  *
  */
 public class ApacheConnectorClientResponse extends ClientResponse {
-	
-	private CloseableHttpResponse closeableHttpResponse;
-
-	public ApacheConnectorClientResponse(ClientRequest requestContext,
-			Response response) {
-		super(requestContext, response);
-	}
-
-	public ApacheConnectorClientResponse(StatusType status,
-			ClientRequest requestContext, CloseableHttpResponse closeableHttpResponse) {
-		super(status, requestContext);
-		this.closeableHttpResponse = closeableHttpResponse;
-	}
-
-	public ApacheConnectorClientResponse(StatusType status,
-			ClientRequest requestContext) {
-		super(status, requestContext);
-	}
-	
-	@Override
-	public void close() {
-		try {
-			closeableHttpResponse.close();
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		super.close();
-	}
-	
-	
+
+    private CloseableHttpResponse closeableHttpResponse;
+
+    public ApacheConnectorClientResponse(ClientRequest requestContext, Response response) {
+        super(requestContext, response);
+    }
+
+    public ApacheConnectorClientResponse(StatusType status, ClientRequest requestContext,
+            CloseableHttpResponse closeableHttpResponse) {
+        super(status, requestContext);
+        this.closeableHttpResponse = closeableHttpResponse;
+    }
+
+    public ApacheConnectorClientResponse(StatusType status, ClientRequest requestContext) {
+        super(status, requestContext);
+    }
+
+    @Override
+    public void close() {
+        try {
+            closeableHttpResponse.close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        super.close();
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java
index fbde136ff..90600b608 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java
@@ -50,8 +50,8 @@
 import org.apache.http.client.HttpClient;
 
 /**
- * Connector provider for Jersey {@link Connector connectors} that utilize
- * Apache HTTP Client to send and receive HTTP request and responses.
+ * Connector provider for Jersey {@link Connector connectors} that utilize Apache HTTP Client to send and receive HTTP
+ * request and responses.
  * <p>
  * The following connector configuration properties are supported:
  * <ul>
@@ -62,29 +62,28 @@
  * <li>{@link org.glassfish.jersey.client.ClientProperties#PROXY_URI}</li>
  * <li>{@link org.glassfish.jersey.client.ClientProperties#PROXY_USERNAME}</li>
  * <li>{@link org.glassfish.jersey.client.ClientProperties#PROXY_PASSWORD}</li>
- * <li>{@link org.glassfish.jersey.client.ClientProperties#REQUEST_ENTITY_PROCESSING}
- * - default value is {@link org.glassfish.jersey.client.RequestEntityProcessing#CHUNKED}</li>
+ * <li>{@link org.glassfish.jersey.client.ClientProperties#REQUEST_ENTITY_PROCESSING} - default value is
+ * {@link org.glassfish.jersey.client.RequestEntityProcessing#CHUNKED}</li>
  * <li>{@link ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION}</li>
  * <li>{@link ApacheClientProperties#SSL_CONFIG}</li>
  * </ul>
  * </p>
  * <p>
  * Connector instances created via this connector provider use
- * {@link org.glassfish.jersey.client.RequestEntityProcessing#CHUNKED chunked encoding} as a default setting.
- * This can be overridden by the {@link org.glassfish.jersey.client.ClientProperties#REQUEST_ENTITY_PROCESSING}.
- * By default the {@link org.glassfish.jersey.client.ClientProperties#CHUNKED_ENCODING_SIZE} property is only supported
- * when using the default {@code org.apache.http.conn.HttpClientConnectionManager} instance. If custom
- * connection manager is used, then chunked encoding size can be set by providing a custom
- * {@code org.apache.http.HttpClientConnection} (via custom {@code org.apache.http.impl.conn.ManagedHttpClientConnectionFactory})
- * and overriding it's {@code createOutputStream} method.
+ * {@link org.glassfish.jersey.client.RequestEntityProcessing#CHUNKED chunked encoding} as a default setting. This can
+ * be overridden by the {@link org.glassfish.jersey.client.ClientProperties#REQUEST_ENTITY_PROCESSING}. By default the
+ * {@link org.glassfish.jersey.client.ClientProperties#CHUNKED_ENCODING_SIZE} property is only supported when using the
+ * default {@code org.apache.http.conn.HttpClientConnectionManager} instance. If custom connection manager is used, then
+ * chunked encoding size can be set by providing a custom {@code org.apache.http.HttpClientConnection} (via custom
+ * {@code org.apache.http.impl.conn.ManagedHttpClientConnectionFactory}) and overriding it's {@code createOutputStream}
+ * method.
  * </p>
  * <p>
- * Use of authorization by the AHC-based connectors is dependent on the chunk encoding setting.
- * If the entity buffering is enabled, the entity is buffered and authorization can be performed
- * automatically in response to a 401 by sending the request again. When entity buffering
- * is disabled (chunked encoding is used) then the property
- * {@link org.glassfish.jersey.apache.connector.ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION} must
- * be set to {@code true}.
+ * Use of authorization by the AHC-based connectors is dependent on the chunk encoding setting. If the entity buffering
+ * is enabled, the entity is buffered and authorization can be performed automatically in response to a 401 by sending
+ * the request again. When entity buffering is disabled (chunked encoding is used) then the property
+ * {@link org.glassfish.jersey.apache.connector.ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION} must be set to
+ * {@code true}.
  * </p>
  * <p>
  * If a {@link org.glassfish.jersey.client.ClientResponse} is obtained and an entity is not read from the response then
@@ -92,9 +91,8 @@
  * connection-based resources.
  * </p>
  * <p>
- * If a response entity is obtained that is an instance of {@link java.io.Closeable}
- * then the instance MUST be closed after processing the entity to release
- * connection-based resources.
+ * If a response entity is obtained that is an instance of {@link java.io.Closeable} then the instance MUST be closed
+ * after processing the entity to release connection-based resources.
  * <p/>
  * <p>
  * The following methods are currently supported: HEAD, GET, POST, PUT, DELETE, OPTIONS, PATCH and TRACE.
@@ -115,23 +113,23 @@ public Connector getConnector(Client client, Configuration runtimeConfig) {
     }
 
     /**
-     * Retrieve the underlying Apache {@link HttpClient} instance from
-     * {@link org.glassfish.jersey.client.JerseyClient} or {@link org.glassfish.jersey.client.JerseyWebTarget}
-     * configured to use {@code ApacheConnectorProvider}.
+     * Retrieve the underlying Apache {@link HttpClient} instance from {@link org.glassfish.jersey.client.JerseyClient}
+     * or {@link org.glassfish.jersey.client.JerseyWebTarget} configured to use {@code ApacheConnectorProvider}.
      *
-     * @param component {@code JerseyClient} or {@code JerseyWebTarget} instance that is configured to use
-     *                  {@code ApacheConnectorProvider}.
+     * @param component
+     *            {@code JerseyClient} or {@code JerseyWebTarget} instance that is configured to use
+     *            {@code ApacheConnectorProvider}.
      * @return underlying Apache {@code HttpClient} instance.
      *
-     * @throws java.lang.IllegalArgumentException in case the {@code component} is neither {@code JerseyClient}
-     *                                            nor {@code JerseyWebTarget} instance or in case the component
-     *                                            is not configured to use a {@code ApacheConnectorProvider}.
+     * @throws java.lang.IllegalArgumentException
+     *             in case the {@code component} is neither {@code JerseyClient} nor {@code JerseyWebTarget} instance or
+     *             in case the component is not configured to use a {@code ApacheConnectorProvider}.
      * @since 2.8
      */
     public static HttpClient getHttpClient(Configurable<?> component) {
         if (!(component instanceof Initializable)) {
-            throw new IllegalArgumentException(
-                    LocalizationMessages.INVALID_CONFIGURABLE_COMPONENT_TYPE(component.getClass().getName()));
+            throw new IllegalArgumentException(LocalizationMessages.INVALID_CONFIGURABLE_COMPONENT_TYPE(component
+                    .getClass().getName()));
         }
 
         final Initializable<?> initializable = (Initializable<?>) component;
@@ -148,4 +146,3 @@ public static HttpClient getHttpClient(Configurable<?> component) {
         throw new IllegalArgumentException(LocalizationMessages.EXPECTED_CONNECTOR_PROVIDER_NOT_USED());
     }
 }
-
diff --git a/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java b/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
index bf40dbfc0..5eeef6867 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
@@ -6,65 +6,66 @@
 import javax.ws.rs.core.Response;
 
 /**
- * This is a wrapper around {@link Response} that acts as a {@link InputStream}.
- * When this {@link WrappedResponseInputStream} is closed it closes the 
- * underlying {@link Response} object also to prevent connection leaks.
+ * This is a wrapper around {@link Response} that acts as a {@link InputStream}. When this
+ * {@link WrappedResponseInputStream} is closed it closes the underlying {@link Response} object also to prevent
+ * connection leaks.
  * 
  * @author marcus
  */
 public class WrappedResponseInputStream extends InputStream {
-	
-	private Response response;
-	private InputStream delegate;
-
-	public WrappedResponseInputStream(Response response) {
-		this.response = response;
-		this.delegate = response.readEntity(InputStream.class);
-	}
-
-	public int read() throws IOException {
-		return delegate.read();
-	}
-
-	public int hashCode() {
-		return delegate.hashCode();
-	}
-
-	public int read(byte[] b) throws IOException {
-		return delegate.read(b);
-	}
-
-	public boolean equals(Object obj) {
-		return delegate.equals(obj);
-	}
-
-	public int read(byte[] b, int off, int len) throws IOException {
-		return delegate.read(b, off, len);
-	}
-
-	public long skip(long n) throws IOException {
-		return delegate.skip(n);
-	}
-
-	public int available() throws IOException {
-		return delegate.available();
-	}
-
-	public void close() throws IOException {
-		response.close();
-		delegate.close();
-	}
-
-	public void mark(int readlimit) {
-		delegate.mark(readlimit);
-	}
-
-	public void reset() throws IOException {
-		delegate.reset();
-	}
-
-	public boolean markSupported() {
-		return delegate.markSupported();
-	}
-	
+
+    private Response response;
+
+    private InputStream delegate;
+
+    public WrappedResponseInputStream(Response response) {
+        this.response = response;
+        this.delegate = response.readEntity(InputStream.class);
+    }
+
+    public int read() throws IOException {
+        return delegate.read();
+    }
+
+    public int hashCode() {
+        return delegate.hashCode();
+    }
+
+    public int read(byte[] b) throws IOException {
+        return delegate.read(b);
+    }
+
+    public boolean equals(Object obj) {
+        return delegate.equals(obj);
+    }
+
+    public int read(byte[] b, int off, int len) throws IOException {
+        return delegate.read(b, off, len);
+    }
+
+    public long skip(long n) throws IOException {
+        return delegate.skip(n);
+    }
+
+    public int available() throws IOException {
+        return delegate.available();
+    }
+
+    public void close() throws IOException {
+        response.close();
+        delegate.close();
+    }
+
+    public void mark(int readlimit) {
+        delegate.mark(readlimit);
+    }
+
+    public void reset() throws IOException {
+        delegate.reset();
+    }
+
+    public boolean markSupported() {
+        return delegate.markSupported();
+    }
+
 }
diff --git a/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java b/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
index 500919fdc..8eed37b62 100644
--- a/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
+++ b/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
@@ -26,20 +26,20 @@
 
 /**
  * References test resources and provides basic tests functionality.
+ * 
  * @author Oleg Nenashev
  */
 public enum CommandJSONSamples implements JSONResourceRef {
-    
-    inspectContainerResponse_full,
-    inspectContainerResponse_empty;
-    
+
+    inspectContainerResponse_full, inspectContainerResponse_empty;
+
     @Override
     public String getFileName() {
         return this + ".json";
-    } 
+    }
 
     @Override
     public Class<?> getResourceClass() {
         return CommandJSONSamples.class;
-    }  
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
index 2e294b146..bbe0a06f5 100644
--- a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
+++ b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
@@ -22,18 +22,18 @@
 
 /**
  * Tests for {@link InspectContainerResponse}.
+ * 
  * @author Oleg Nenashev
  */
 public class InspectContainerResponseTest {
-    
+
     @Test
     public void roundTrip_full() throws IOException {
-        InspectContainerResponse[] responses = testRoundTrip(
-                        CommandJSONSamples.inspectContainerResponse_full, 
-                        InspectContainerResponse[].class);   
+        InspectContainerResponse[] responses = testRoundTrip(CommandJSONSamples.inspectContainerResponse_full,
+                InspectContainerResponse[].class);
         assertEquals(1, responses.length);
         final InspectContainerResponse response = responses[0];
-        
+
         // Check volumes: https://github.com/docker-java/docker-java/issues/211
         assertEquals(response.getVolumes().length, 2);
         assertEquals(response.getVolumesRW().length, 2);
@@ -43,7 +43,7 @@ public void roundTrip_full() throws IOException {
         assertFalse(response.getVolumesRW()[1].getAccessMode().toBoolean());
         assertTrue(response.getVolumesRW()[0].getAccessMode().toBoolean());
     }
-    
+
     @Test
     public void roundTrip_empty() throws IOException {
         testRoundTrip(CommandJSONSamples.inspectContainerResponse_empty, InspectContainerResponse[].class);
diff --git a/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java b/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java
index 432f7b00f..bdbc2e225 100644
--- a/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java
@@ -7,25 +7,24 @@
 
 public class AccessModeTest {
 
-	@Test
-	public void defaultAccessMode() {
-		assertEquals(AccessMode.DEFAULT, rw);
-	}
-	
-	@Test
-	public void stringify() {
-		assertEquals(AccessMode.rw.toString(), "rw");
-	}
-	
-	@Test
-	public void fromString() {
-		assertEquals(AccessMode.valueOf("rw"), rw);
-	}
-	
-	@Test(expectedExceptions = IllegalArgumentException.class, 
-			expectedExceptionsMessageRegExp = "No enum const.*")
-	public void fromIllegalString() {
-		AccessMode.valueOf("xx");
-	}
+    @Test
+    public void defaultAccessMode() {
+        assertEquals(AccessMode.DEFAULT, rw);
+    }
+
+    @Test
+    public void stringify() {
+        assertEquals(AccessMode.rw.toString(), "rw");
+    }
+
+    @Test
+    public void fromString() {
+        assertEquals(AccessMode.valueOf("rw"), rw);
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "No enum const.*")
+    public void fromIllegalString() {
+        AccessMode.valueOf("xx");
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/BindTest.java b/src/test/java/com/github/dockerjava/api/model/BindTest.java
index 50a41fc38..db5aec212 100644
--- a/src/test/java/com/github/dockerjava/api/model/BindTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/BindTest.java
@@ -7,62 +7,59 @@
 import org.testng.annotations.Test;
 
 public class BindTest {
-	
-	@Test
-	public void parseUsingDefaultAccessMode() {
-		Bind bind = Bind.parse("/host:/container");
-		assertEquals(bind.getPath(), "/host");
-		assertEquals(bind.getVolume().getPath(), "/container");
-		assertEquals(bind.getAccessMode(), AccessMode.DEFAULT);
-	}
 
-	@Test
-	public void parseReadWrite() {
-		Bind bind = Bind.parse("/host:/container:rw");
-		assertEquals(bind.getPath(), "/host");
-		assertEquals(bind.getVolume().getPath(), "/container");
-		assertEquals(bind.getAccessMode(), rw);
-	}
-	
-	@Test
-	public void parseReadOnly() {
-		Bind bind = Bind.parse("/host:/container:ro");
-		assertEquals(bind.getPath(), "/host");
-		assertEquals(bind.getVolume().getPath(), "/container");
-		assertEquals(bind.getAccessMode(), ro);
-	}
+    @Test
+    public void parseUsingDefaultAccessMode() {
+        Bind bind = Bind.parse("/host:/container");
+        assertEquals(bind.getPath(), "/host");
+        assertEquals(bind.getVolume().getPath(), "/container");
+        assertEquals(bind.getAccessMode(), AccessMode.DEFAULT);
+    }
 
-	@Test(expectedExceptions = IllegalArgumentException.class,
-			expectedExceptionsMessageRegExp = "Error parsing Bind.*")
-	public void parseInvalidAccessMode() {
-		Bind.parse("/host:/container:xx");
-	}
+    @Test
+    public void parseReadWrite() {
+        Bind bind = Bind.parse("/host:/container:rw");
+        assertEquals(bind.getPath(), "/host");
+        assertEquals(bind.getVolume().getPath(), "/container");
+        assertEquals(bind.getAccessMode(), rw);
+    }
 
-	@Test(expectedExceptions = IllegalArgumentException.class, 
-			expectedExceptionsMessageRegExp = "Error parsing Bind 'nonsense'")
-	public void parseInvalidInput() {
-		Bind.parse("nonsense");
-	}
+    @Test
+    public void parseReadOnly() {
+        Bind bind = Bind.parse("/host:/container:ro");
+        assertEquals(bind.getPath(), "/host");
+        assertEquals(bind.getVolume().getPath(), "/container");
+        assertEquals(bind.getAccessMode(), ro);
+    }
 
-	@Test(expectedExceptions = IllegalArgumentException.class, 
-			expectedExceptionsMessageRegExp = "Error parsing Bind 'null'")
-	public void parseNull() {
-		Bind.parse(null);
-	}
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Bind.*")
+    public void parseInvalidAccessMode() {
+        Bind.parse("/host:/container:xx");
+    }
 
-	@Test
-	public void toStringReadOnly() {
-		assertEquals(Bind.parse("/host:/container:ro").toString(), "/host:/container:ro");
-	}
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Bind 'nonsense'")
+    public void parseInvalidInput() {
+        Bind.parse("nonsense");
+    }
 
-	@Test
-	public void toStringReadWrite() {
-		assertEquals(Bind.parse("/host:/container:rw").toString(), "/host:/container:rw");
-	}
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Bind 'null'")
+    public void parseNull() {
+        Bind.parse(null);
+    }
 
-	@Test
-	public void toStringDefaultAccessMode() {
-		assertEquals(Bind.parse("/host:/container").toString(), "/host:/container:rw");
-	}
+    @Test
+    public void toStringReadOnly() {
+        assertEquals(Bind.parse("/host:/container:ro").toString(), "/host:/container:ro");
+    }
+
+    @Test
+    public void toStringReadWrite() {
+        assertEquals(Bind.parse("/host:/container:rw").toString(), "/host:/container:rw");
+    }
+
+    @Test
+    public void toStringDefaultAccessMode() {
+        assertEquals(Bind.parse("/host:/container").toString(), "/host:/container:rw");
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/BindingTest.java b/src/test/java/com/github/dockerjava/api/model/BindingTest.java
index 0379dcdb0..3309a8904 100644
--- a/src/test/java/com/github/dockerjava/api/model/BindingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/BindingTest.java
@@ -8,51 +8,49 @@
 
 public class BindingTest {
 
-	@Test
-	public void parseIpAndPort() {
-		assertEquals(Binding.parse("127.0.0.1:80"), Ports.Binding("127.0.0.1", 80));
-	}
-
-	@Test
-	public void parsePortOnly() {
-		assertEquals(Binding.parse("80"), Ports.Binding(null, 80));
-	}
-
-	@Test
-	public void parseIPOnly() {
-		assertEquals(Binding.parse("127.0.0.1"), Ports.Binding("127.0.0.1", null));
-	}
-
-	@Test
-	public void parseEmptyString() {
-		assertEquals(Binding.parse(""), Ports.Binding(null, null));
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class,
-			expectedExceptionsMessageRegExp = "Error parsing Binding 'nonsense'")
-	public void parseInvalidInput() {
-		Binding.parse("nonsense");
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class, 
-			expectedExceptionsMessageRegExp = "Error parsing Binding 'null'")
-	public void parseNull() {
-		Binding.parse(null);
-	}
-
-	@Test
-	public void toStringIpAndHost() {
-		assertEquals(Binding.parse("127.0.0.1:80").toString(), "127.0.0.1:80");
-	}
-
-	@Test
-	public void toStringPortOnly() {
-		assertEquals(Binding.parse("80").toString(), "80");
-	}
-
-	@Test
-	public void toStringIpOnly() {
-		assertEquals(Binding.parse("127.0.0.1").toString(), "127.0.0.1");
-	}
+    @Test
+    public void parseIpAndPort() {
+        assertEquals(Binding.parse("127.0.0.1:80"), Ports.Binding("127.0.0.1", 80));
+    }
+
+    @Test
+    public void parsePortOnly() {
+        assertEquals(Binding.parse("80"), Ports.Binding(null, 80));
+    }
+
+    @Test
+    public void parseIPOnly() {
+        assertEquals(Binding.parse("127.0.0.1"), Ports.Binding("127.0.0.1", null));
+    }
+
+    @Test
+    public void parseEmptyString() {
+        assertEquals(Binding.parse(""), Ports.Binding(null, null));
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Binding 'nonsense'")
+    public void parseInvalidInput() {
+        Binding.parse("nonsense");
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Binding 'null'")
+    public void parseNull() {
+        Binding.parse(null);
+    }
+
+    @Test
+    public void toStringIpAndHost() {
+        assertEquals(Binding.parse("127.0.0.1:80").toString(), "127.0.0.1:80");
+    }
+
+    @Test
+    public void toStringPortOnly() {
+        assertEquals(Binding.parse("80").toString(), "80");
+    }
+
+    @Test
+    public void toStringIpOnly() {
+        assertEquals(Binding.parse("127.0.0.1").toString(), "127.0.0.1");
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java b/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
index eb6e2a542..e45ad2e8e 100644
--- a/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
@@ -8,22 +8,22 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class CapabilityTest {
-	private final ObjectMapper objectMapper = new ObjectMapper();
+    private final ObjectMapper objectMapper = new ObjectMapper();
 
-	@Test
-	public void serializeCapability() throws Exception {
-		String json = objectMapper.writeValueAsString(Capability.ALL);
-		assertEquals(json, "\"ALL\"");
-	}
+    @Test
+    public void serializeCapability() throws Exception {
+        String json = objectMapper.writeValueAsString(Capability.ALL);
+        assertEquals(json, "\"ALL\"");
+    }
 
-	@Test
-	public void deserializeCapability() throws Exception {
-		Capability capability = objectMapper.readValue("\"ALL\"", Capability.class);
-		assertEquals(capability, Capability.ALL);
-	}
+    @Test
+    public void deserializeCapability() throws Exception {
+        Capability capability = objectMapper.readValue("\"ALL\"", Capability.class);
+        assertEquals(capability, Capability.ALL);
+    }
 
-	@Test(expectedExceptions = JsonMappingException.class)
-	public void deserializeInvalidCapability() throws Exception {
-		objectMapper.readValue("\"nonsense\"", Capability.class);
-	}
+    @Test(expectedExceptions = JsonMappingException.class)
+    public void deserializeInvalidCapability() throws Exception {
+        objectMapper.readValue("\"nonsense\"", Capability.class);
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java b/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java
index de1d23c21..086613045 100644
--- a/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java
@@ -8,33 +8,31 @@
 
 public class ExposedPortTest {
 
-	@Test
-	public void parsePortAndProtocol() {
-		ExposedPort exposedPort = ExposedPort.parse("80/tcp");
-		assertEquals(exposedPort, new ExposedPort(80, TCP));
-	}
-
-	@Test
-	public void parsePortOnly() {
-		ExposedPort exposedPort = ExposedPort.parse("80");
-		assertEquals(exposedPort, new ExposedPort(80, DEFAULT));
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class,
-			expectedExceptionsMessageRegExp = "Error parsing ExposedPort 'nonsense'")
-	public void parseInvalidInput() {
-		ExposedPort.parse("nonsense");
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class, 
-			expectedExceptionsMessageRegExp = "Error parsing ExposedPort 'null'")
-	public void parseNull() {
-		ExposedPort.parse(null);
-	}
-
-	@Test
-	public void stringify() {
-		assertEquals(ExposedPort.parse("80/tcp").toString(), "80/tcp");
-	}
+    @Test
+    public void parsePortAndProtocol() {
+        ExposedPort exposedPort = ExposedPort.parse("80/tcp");
+        assertEquals(exposedPort, new ExposedPort(80, TCP));
+    }
+
+    @Test
+    public void parsePortOnly() {
+        ExposedPort exposedPort = ExposedPort.parse("80");
+        assertEquals(exposedPort, new ExposedPort(80, DEFAULT));
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing ExposedPort 'nonsense'")
+    public void parseInvalidInput() {
+        ExposedPort.parse("nonsense");
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing ExposedPort 'null'")
+    public void parseNull() {
+        ExposedPort.parse(null);
+    }
+
+    @Test
+    public void stringify() {
+        assertEquals(ExposedPort.parse("80/tcp").toString(), "80/tcp");
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java b/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
index d57c0b572..14325bd12 100644
--- a/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
@@ -2,38 +2,36 @@
 
 import junit.framework.TestCase;
 
-
 public class IdentifierTest extends TestCase {
 
-  public void testFromCompoundString() throws Exception {
-
-    Identifier i1 = Identifier.fromCompoundString("10.0.0.1/jim");
-    Identifier i2 = Identifier.fromCompoundString("10.0.0.1/jim:123");
-    Identifier i3 = Identifier.fromCompoundString("10.0.0.1:123/jim:124");
-    Identifier i3A = Identifier.fromCompoundString("10.0.0.1:123/jim:latest");
+    public void testFromCompoundString() throws Exception {
 
-    assertTrue(!i1.tag.isPresent());
-    assertEquals(i1.repository.name, "10.0.0.1/jim");
+        Identifier i1 = Identifier.fromCompoundString("10.0.0.1/jim");
+        Identifier i2 = Identifier.fromCompoundString("10.0.0.1/jim:123");
+        Identifier i3 = Identifier.fromCompoundString("10.0.0.1:123/jim:124");
+        Identifier i3A = Identifier.fromCompoundString("10.0.0.1:123/jim:latest");
 
-    assertTrue(i2.tag.isPresent());
-    assertEquals(i2.tag.get(), "123");
-    assertEquals(i2.repository.name, "10.0.0.1/jim");
+        assertTrue(!i1.tag.isPresent());
+        assertEquals(i1.repository.name, "10.0.0.1/jim");
 
-    assertTrue(i3.tag.isPresent());
-    assertEquals(i3.tag.get(), "124");
-    assertEquals(i3.repository.name, "10.0.0.1:123/jim");
-    assertEquals(i3.repository.getURL().getPort(), 123);
-    assertEquals(i3A.tag.get(), "latest");
+        assertTrue(i2.tag.isPresent());
+        assertEquals(i2.tag.get(), "123");
+        assertEquals(i2.repository.name, "10.0.0.1/jim");
 
+        assertTrue(i3.tag.isPresent());
+        assertEquals(i3.tag.get(), "124");
+        assertEquals(i3.repository.name, "10.0.0.1:123/jim");
+        assertEquals(i3.repository.getURL().getPort(), 123);
+        assertEquals(i3A.tag.get(), "latest");
 
-    Identifier i4 = Identifier.fromCompoundString("centos:latest");
-    assertTrue(i4.tag.isPresent());
-    assertEquals(i4.tag.get(), "latest");
+        Identifier i4 = Identifier.fromCompoundString("centos:latest");
+        assertTrue(i4.tag.isPresent());
+        assertEquals(i4.tag.get(), "latest");
 
-    Identifier i5 = Identifier.fromCompoundString("busybox");
-    assertTrue(!i5.tag.isPresent());
+        Identifier i5 = Identifier.fromCompoundString("busybox");
+        assertTrue(!i5.tag.isPresent());
 
-    Identifier i6 = Identifier.fromCompoundString("10.0.0.1:5000/my-test-image:1234");
-    assertEquals(i6.repository.getPath(), "my-test-image");
-  }
+        Identifier i6 = Identifier.fromCompoundString("10.0.0.1:5000/my-test-image:1234");
+        assertEquals(i6.repository.getPath(), "my-test-image");
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java b/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java
index ea0b20d73..25da40d74 100644
--- a/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java
@@ -7,36 +7,34 @@
 
 public class InternetProtocolTest {
 
-	@Test
-	public void defaultProtocol() {
-		assertEquals(InternetProtocol.DEFAULT, TCP);
-	}
-
-	@Test
-	public void stringify() {
-		assertEquals(TCP.toString(), "tcp");
-	}
-
-	@Test
-	public void parseUpperCase() {
-		assertEquals(InternetProtocol.parse("TCP"), TCP);
-	}
-
-	@Test
-	public void parseLowerCase() {
-		assertEquals(InternetProtocol.parse("tcp"), TCP);
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class, 
-			expectedExceptionsMessageRegExp = "Error parsing Protocol.*")
-	public void parseInvalidInput() {
-		InternetProtocol.parse("xx");
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class, 
-			expectedExceptionsMessageRegExp = "Error parsing Protocol 'null'")
-	public void parseNull() {
-		InternetProtocol.parse(null);
-	}
+    @Test
+    public void defaultProtocol() {
+        assertEquals(InternetProtocol.DEFAULT, TCP);
+    }
+
+    @Test
+    public void stringify() {
+        assertEquals(TCP.toString(), "tcp");
+    }
+
+    @Test
+    public void parseUpperCase() {
+        assertEquals(InternetProtocol.parse("TCP"), TCP);
+    }
+
+    @Test
+    public void parseLowerCase() {
+        assertEquals(InternetProtocol.parse("tcp"), TCP);
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Protocol.*")
+    public void parseInvalidInput() {
+        InternetProtocol.parse("xx");
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Protocol 'null'")
+    public void parseNull() {
+        InternetProtocol.parse(null);
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/LinkTest.java b/src/test/java/com/github/dockerjava/api/model/LinkTest.java
index 2f6df0c5e..208e9f363 100644
--- a/src/test/java/com/github/dockerjava/api/model/LinkTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/LinkTest.java
@@ -6,35 +6,33 @@
 
 public class LinkTest {
 
-	@Test
-	public void parse() {
-		Link link = Link.parse("name:alias");
-		assertEquals(link.getName(), "name");
-		assertEquals(link.getAlias(), "alias");
-	}
-	
-	@Test
-	public void parseWithContainerNames() {
-		Link link = Link.parse("/name:/conatiner/alias");
-		assertEquals(link.getName(), "name");
-		assertEquals(link.getAlias(), "alias");
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class,
-			expectedExceptionsMessageRegExp = "Error parsing Link 'nonsense'")
-	public void parseInvalidInput() {
-		Link.parse("nonsense");
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class, 
-			expectedExceptionsMessageRegExp = "Error parsing Link 'null'")
-	public void parseNull() {
-		Link.parse(null);
-	}
-
-	@Test
-	public void stringify() {
-		assertEquals(Link.parse("name:alias").toString(), "name:alias");
-	}
+    @Test
+    public void parse() {
+        Link link = Link.parse("name:alias");
+        assertEquals(link.getName(), "name");
+        assertEquals(link.getAlias(), "alias");
+    }
+
+    @Test
+    public void parseWithContainerNames() {
+        Link link = Link.parse("/name:/conatiner/alias");
+        assertEquals(link.getName(), "name");
+        assertEquals(link.getAlias(), "alias");
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Link 'nonsense'")
+    public void parseInvalidInput() {
+        Link.parse("nonsense");
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Link 'null'")
+    public void parseNull() {
+        Link.parse(null);
+    }
+
+    @Test
+    public void stringify() {
+        assertEquals(Link.parse("name:alias").toString(), "name:alias");
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java b/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
index 2aeb768f6..e5f5f4c1b 100644
--- a/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
@@ -7,55 +7,48 @@
 import com.github.dockerjava.api.model.Ports.Binding;
 
 public class PortBindingTest {
-	
-	private static final ExposedPort TCP_8080 = ExposedPort.tcp(8080);
-
-	@Test
-	public void fullDefinition() {
-		assertEquals(PortBinding.parse("127.0.0.1:80:8080/tcp"),
-				new PortBinding(new Binding("127.0.0.1", 80), TCP_8080));
-	}
-
-	@Test
-	public void noProtocol() {
-		assertEquals(PortBinding.parse("127.0.0.1:80:8080"),
-				new PortBinding(new Binding("127.0.0.1", 80), TCP_8080));
-	}
-
-	@Test
-	public void noHostIp() {
-		assertEquals(PortBinding.parse("80:8080/tcp"),
-				new PortBinding(new Binding(80), TCP_8080));
-	}
-
-	@Test
-	public void portsOnly() {
-		assertEquals(PortBinding.parse("80:8080"),
-				new PortBinding(new Binding(80), TCP_8080));
-	}
-
-	@Test
-	public void exposedPortOnly() {
-		assertEquals(PortBinding.parse("8080"),
-				new PortBinding(new Binding(), TCP_8080));
-	}
-
-	@Test
-	public void dynamicHostPort() {
-		assertEquals(PortBinding.parse("127.0.0.1::8080"),
-				new PortBinding(new Binding("127.0.0.1"), TCP_8080));
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class,
-			expectedExceptionsMessageRegExp = "Error parsing PortBinding 'nonsense'")
-	public void parseInvalidInput() {
-		PortBinding.parse("nonsense");
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class, 
-			expectedExceptionsMessageRegExp = "Error parsing PortBinding 'null'")
-	public void parseNull() {
-		PortBinding.parse(null);
-	}
+
+    private static final ExposedPort TCP_8080 = ExposedPort.tcp(8080);
+
+    @Test
+    public void fullDefinition() {
+        assertEquals(PortBinding.parse("127.0.0.1:80:8080/tcp"),
+                new PortBinding(new Binding("127.0.0.1", 80), TCP_8080));
+    }
+
+    @Test
+    public void noProtocol() {
+        assertEquals(PortBinding.parse("127.0.0.1:80:8080"), new PortBinding(new Binding("127.0.0.1", 80), TCP_8080));
+    }
+
+    @Test
+    public void noHostIp() {
+        assertEquals(PortBinding.parse("80:8080/tcp"), new PortBinding(new Binding(80), TCP_8080));
+    }
+
+    @Test
+    public void portsOnly() {
+        assertEquals(PortBinding.parse("80:8080"), new PortBinding(new Binding(80), TCP_8080));
+    }
+
+    @Test
+    public void exposedPortOnly() {
+        assertEquals(PortBinding.parse("8080"), new PortBinding(new Binding(), TCP_8080));
+    }
+
+    @Test
+    public void dynamicHostPort() {
+        assertEquals(PortBinding.parse("127.0.0.1::8080"), new PortBinding(new Binding("127.0.0.1"), TCP_8080));
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing PortBinding 'nonsense'")
+    public void parseInvalidInput() {
+        PortBinding.parse("nonsense");
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing PortBinding 'null'")
+    public void parseNull() {
+        PortBinding.parse(null);
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/Ports_SerializingTest.java b/src/test/java/com/github/dockerjava/api/model/Ports_SerializingTest.java
index 9190eefd2..8c8d2014f 100644
--- a/src/test/java/com/github/dockerjava/api/model/Ports_SerializingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/Ports_SerializingTest.java
@@ -10,50 +10,51 @@
 import com.github.dockerjava.api.model.Ports.Binding;
 
 public class Ports_SerializingTest {
-	private final ObjectMapper objectMapper = new ObjectMapper();
-	private final String jsonWithDoubleBindingForOnePort = 
-			"{\"80/tcp\":[{\"HostIp\":\"10.0.0.1\",\"HostPort\":\"80\"},{\"HostIp\":\"10.0.0.2\",\"HostPort\":\"80\"}]}";
-	private final String jsonWithNullBindingForOnePort = "{\"80/tcp\":null}";
-
-	@Test
-	public void deserializingPortWithMultipleBindings() throws Exception {
-		Ports ports = objectMapper.readValue(jsonWithDoubleBindingForOnePort, Ports.class);
-		Map<ExposedPort, Binding[]> map = ports.getBindings();
-		assertEquals(map.size(), 1);
-
-		Binding[] bindings = map.get(ExposedPort.tcp(80));
-		assertEquals(bindings.length, 2);
-		assertEquals(bindings[0], new Binding("10.0.0.1", 80));
-		assertEquals(bindings[1], new Binding("10.0.0.2", 80));
-	}
-	
-	@Test
-	public void serializingPortWithMultipleBindings() throws Exception {
-		Ports ports = new Ports();
-		ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.1", 80));
-		ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.2", 80));
-		assertEquals(objectMapper.writeValueAsString(ports), jsonWithDoubleBindingForOnePort);
-	}
-	
-	@Test
-	public void serializingEmptyBinding() throws Exception {
-		Ports ports = new Ports(ExposedPort.tcp(80), new Binding(null, null));
-		assertEquals(objectMapper.writeValueAsString(ports), "{\"80/tcp\":[{\"HostIp\":\"\",\"HostPort\":\"\"}]}");
-	}
-
-	@Test
-	public void deserializingPortWithNullBindings() throws Exception {
-		Ports ports = objectMapper.readValue(jsonWithNullBindingForOnePort, Ports.class);
-		Map<ExposedPort, Binding[]> map = ports.getBindings();
-		assertEquals(map.size(), 1);
-
-		assertEquals(map.get(ExposedPort.tcp(80)), null);
-	}
-
-	@Test
-	public void serializingWithNullBindings() throws Exception {
-		Ports ports = new Ports();
-		ports.bind(ExposedPort.tcp(80), null);
-		assertEquals(objectMapper.writeValueAsString(ports), jsonWithNullBindingForOnePort);
-	}
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    private final String jsonWithDoubleBindingForOnePort = "{\"80/tcp\":[{\"HostIp\":\"10.0.0.1\",\"HostPort\":\"80\"},{\"HostIp\":\"10.0.0.2\",\"HostPort\":\"80\"}]}";
+
+    private final String jsonWithNullBindingForOnePort = "{\"80/tcp\":null}";
+
+    @Test
+    public void deserializingPortWithMultipleBindings() throws Exception {
+        Ports ports = objectMapper.readValue(jsonWithDoubleBindingForOnePort, Ports.class);
+        Map<ExposedPort, Binding[]> map = ports.getBindings();
+        assertEquals(map.size(), 1);
+
+        Binding[] bindings = map.get(ExposedPort.tcp(80));
+        assertEquals(bindings.length, 2);
+        assertEquals(bindings[0], new Binding("10.0.0.1", 80));
+        assertEquals(bindings[1], new Binding("10.0.0.2", 80));
+    }
+
+    @Test
+    public void serializingPortWithMultipleBindings() throws Exception {
+        Ports ports = new Ports();
+        ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.1", 80));
+        ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.2", 80));
+        assertEquals(objectMapper.writeValueAsString(ports), jsonWithDoubleBindingForOnePort);
+    }
+
+    @Test
+    public void serializingEmptyBinding() throws Exception {
+        Ports ports = new Ports(ExposedPort.tcp(80), new Binding(null, null));
+        assertEquals(objectMapper.writeValueAsString(ports), "{\"80/tcp\":[{\"HostIp\":\"\",\"HostPort\":\"\"}]}");
+    }
+
+    @Test
+    public void deserializingPortWithNullBindings() throws Exception {
+        Ports ports = objectMapper.readValue(jsonWithNullBindingForOnePort, Ports.class);
+        Map<ExposedPort, Binding[]> map = ports.getBindings();
+        assertEquals(map.size(), 1);
+
+        assertEquals(map.get(ExposedPort.tcp(80)), null);
+    }
+
+    @Test
+    public void serializingWithNullBindings() throws Exception {
+        Ports ports = new Ports();
+        ports.bind(ExposedPort.tcp(80), null);
+        assertEquals(objectMapper.writeValueAsString(ports), jsonWithNullBindingForOnePort);
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java b/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
index 18c7f0f09..7b22bd039 100644
--- a/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
@@ -11,56 +11,53 @@
 import com.github.dockerjava.api.model.Ports.Binding;
 
 /**
- * As there may be several {@link Binding}s per {@link ExposedPort},
- * it makes a difference if you add {@link PortBinding}s for the
- * same or different {@link ExposedPort}s to {@link Ports}.
- * This test verifies that the Map in {@link Ports} is populated 
- * correctly in both cases.
+ * As there may be several {@link Binding}s per {@link ExposedPort}, it makes a difference if you add
+ * {@link PortBinding}s for the same or different {@link ExposedPort}s to {@link Ports}. This test verifies that the Map
+ * in {@link Ports} is populated correctly in both cases.
  */
 public class Ports_addBindingsTest {
-	private static final ExposedPort TCP_80 = ExposedPort.tcp(80);
-	private static final ExposedPort TCP_90 = ExposedPort.tcp(90);
-	private static final Binding BINDING_8080 = Ports.Binding(8080);
-	private static final Binding BINDING_9090 = Ports.Binding(9090);
-
-	private Ports ports;
-
-	@BeforeMethod
-	public void setup() {
-		ports = new Ports();
-	}
-	
-	@Test
-	public void addTwoBindingsForDifferentExposedPorts() {
-		ports.add(
-				new PortBinding(BINDING_8080, TCP_80), 
-				new PortBinding(BINDING_9090, TCP_90));
-
-		Map<ExposedPort, Binding[]> bindings = ports.getBindings();
-		// two keys with one value each
-		assertEquals(bindings.size(), 2);
-		assertEquals(bindings.get(TCP_80), new Binding[] { BINDING_8080 });
-		assertEquals(bindings.get(TCP_90), new Binding[] { BINDING_9090 });
-	}
-
-	@Test
-	public void addTwoBindingsForSameExposedPort() {
-		ports.add(
-				new PortBinding(BINDING_8080, TCP_80), 
-				new PortBinding(BINDING_9090, TCP_80));
-
-		Map<ExposedPort, Binding[]> bindings = ports.getBindings();
-		// one key with two values
-		assertEquals(bindings.size(), 1);
-		assertEquals(bindings.get(TCP_80), new Binding[] { BINDING_8080, BINDING_9090 });
-	}
-
-	@Test
-	public void addNullBindings() {
-		ports.add(new PortBinding(null, TCP_80));
-		Map<ExposedPort, Binding[]> bindings = ports.getBindings();
-		// one key with two values
-		assertEquals(bindings.size(), 1);
-		assertEquals(bindings.get(TCP_80), null);
-	}
+    private static final ExposedPort TCP_80 = ExposedPort.tcp(80);
+
+    private static final ExposedPort TCP_90 = ExposedPort.tcp(90);
+
+    private static final Binding BINDING_8080 = Ports.Binding(8080);
+
+    private static final Binding BINDING_9090 = Ports.Binding(9090);
+
+    private Ports ports;
+
+    @BeforeMethod
+    public void setup() {
+        ports = new Ports();
+    }
+
+    @Test
+    public void addTwoBindingsForDifferentExposedPorts() {
+        ports.add(new PortBinding(BINDING_8080, TCP_80), new PortBinding(BINDING_9090, TCP_90));
+
+        Map<ExposedPort, Binding[]> bindings = ports.getBindings();
+        // two keys with one value each
+        assertEquals(bindings.size(), 2);
+        assertEquals(bindings.get(TCP_80), new Binding[] { BINDING_8080 });
+        assertEquals(bindings.get(TCP_90), new Binding[] { BINDING_9090 });
+    }
+
+    @Test
+    public void addTwoBindingsForSameExposedPort() {
+        ports.add(new PortBinding(BINDING_8080, TCP_80), new PortBinding(BINDING_9090, TCP_80));
+
+        Map<ExposedPort, Binding[]> bindings = ports.getBindings();
+        // one key with two values
+        assertEquals(bindings.size(), 1);
+        assertEquals(bindings.get(TCP_80), new Binding[] { BINDING_8080, BINDING_9090 });
+    }
+
+    @Test
+    public void addNullBindings() {
+        ports.add(new PortBinding(null, TCP_80));
+        Map<ExposedPort, Binding[]> bindings = ports.getBindings();
+        // one key with two values
+        assertEquals(bindings.size(), 1);
+        assertEquals(bindings.get(TCP_80), null);
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/RepositoryTest.java b/src/test/java/com/github/dockerjava/api/model/RepositoryTest.java
index 8a40de28b..8db0273df 100644
--- a/src/test/java/com/github/dockerjava/api/model/RepositoryTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/RepositoryTest.java
@@ -3,16 +3,16 @@
 import junit.framework.TestCase;
 
 public class RepositoryTest extends TestCase {
-  public void testRepository() throws Exception {
+    public void testRepository() throws Exception {
 
-    Repository repo = new Repository("10.0.0.1/jim");
-    Repository repo1 = new Repository("10.0.0.1:1234/jim");
-    Repository repo2 = new Repository("busybox");
+        Repository repo = new Repository("10.0.0.1/jim");
+        Repository repo1 = new Repository("10.0.0.1:1234/jim");
+        Repository repo2 = new Repository("busybox");
 
-    assertEquals("jim", repo.getPath());
-    assertEquals("jim", repo1.getPath());
-    assertEquals("busybox", repo2.getPath());
+        assertEquals("jim", repo.getPath());
+        assertEquals("jim", repo1.getPath());
+        assertEquals("busybox", repo2.getPath());
 
-    assertEquals(1234, repo1.getURL().getPort());
-  }
+        assertEquals(1234, repo1.getURL().getPort());
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_ParsingTest.java b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_ParsingTest.java
index 04823db24..3bc22c00e 100644
--- a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_ParsingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_ParsingTest.java
@@ -6,35 +6,33 @@
 
 public class RestartPolicy_ParsingTest {
 
-	@Test
-	public void noRestart() throws Exception {
-		assertEquals(RestartPolicy.parse("no"), RestartPolicy.noRestart());
-	}
-	
-	@Test
-	public void alwaysRestart() throws Exception {
-		assertEquals(RestartPolicy.parse("always"), RestartPolicy.alwaysRestart());
-	}
-
-	@Test
-	public void onFailureRestart() throws Exception {
-		assertEquals(RestartPolicy.parse("on-failure"), RestartPolicy.onFailureRestart(0));
-	}
-
-	@Test
-	public void onFailureRestartWithCount() throws Exception {
-		assertEquals(RestartPolicy.parse("on-failure:2"), RestartPolicy.onFailureRestart(2));
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class,
-			expectedExceptionsMessageRegExp = "Error parsing RestartPolicy 'nonsense'")
-	public void illegalSyntax() throws Exception {
-		RestartPolicy.parse("nonsense");
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class,
-			expectedExceptionsMessageRegExp = "Error parsing RestartPolicy 'on-failure:X'")
-	public void illegalRetryCount() throws Exception {
-		RestartPolicy.parse("on-failure:X");
-	}
+    @Test
+    public void noRestart() throws Exception {
+        assertEquals(RestartPolicy.parse("no"), RestartPolicy.noRestart());
+    }
+
+    @Test
+    public void alwaysRestart() throws Exception {
+        assertEquals(RestartPolicy.parse("always"), RestartPolicy.alwaysRestart());
+    }
+
+    @Test
+    public void onFailureRestart() throws Exception {
+        assertEquals(RestartPolicy.parse("on-failure"), RestartPolicy.onFailureRestart(0));
+    }
+
+    @Test
+    public void onFailureRestartWithCount() throws Exception {
+        assertEquals(RestartPolicy.parse("on-failure:2"), RestartPolicy.onFailureRestart(2));
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing RestartPolicy 'nonsense'")
+    public void illegalSyntax() throws Exception {
+        RestartPolicy.parse("nonsense");
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing RestartPolicy 'on-failure:X'")
+    public void illegalRetryCount() throws Exception {
+        RestartPolicy.parse("on-failure:X");
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_SerializingTest.java b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_SerializingTest.java
index 7b13a3958..b4a9a746a 100644
--- a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_SerializingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_SerializingTest.java
@@ -7,35 +7,38 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
- * Compares serialization results of various {@link RestartPolicy}s with
- * what Docker (as of 1.3.3) actually sends when executing 
- * <code>docker run --restart xxx</code>.
+ * Compares serialization results of various {@link RestartPolicy}s with what Docker (as of 1.3.3) actually sends when
+ * executing <code>docker run --restart xxx</code>.
  */
 public class RestartPolicy_SerializingTest {
-	private final ObjectMapper objectMapper = new ObjectMapper();
-
-	@Test  // --restart no
-	public void noRestart() throws Exception {
-		String json = objectMapper.writeValueAsString(RestartPolicy.noRestart());
-		assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"\"}");
-	}
-	
-	@Test  // --restart always
-	public void alwaysRestart() throws Exception {
-		String json = objectMapper.writeValueAsString(RestartPolicy.alwaysRestart());
-		assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"always\"}");
-	}
-
-	@Test  // --restart on-failure
-	public void onFailureRestart() throws Exception {
-		String json = objectMapper.writeValueAsString(RestartPolicy.onFailureRestart(0));
-		assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"on-failure\"}");
-	}
-	
-	@Test  // --restart on-failure:2
-	public void onFailureRestartWithCount() throws Exception {
-		String json = objectMapper.writeValueAsString(RestartPolicy.onFailureRestart(2));
-		assertEquals(json, "{\"MaximumRetryCount\":2,\"Name\":\"on-failure\"}");
-	}
-	
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    @Test
+    // --restart no
+    public void noRestart() throws Exception {
+        String json = objectMapper.writeValueAsString(RestartPolicy.noRestart());
+        assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"\"}");
+    }
+
+    @Test
+    // --restart always
+    public void alwaysRestart() throws Exception {
+        String json = objectMapper.writeValueAsString(RestartPolicy.alwaysRestart());
+        assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"always\"}");
+    }
+
+    @Test
+    // --restart on-failure
+    public void onFailureRestart() throws Exception {
+        String json = objectMapper.writeValueAsString(RestartPolicy.onFailureRestart(0));
+        assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"on-failure\"}");
+    }
+
+    @Test
+    // --restart on-failure:2
+    public void onFailureRestartWithCount() throws Exception {
+        String json = objectMapper.writeValueAsString(RestartPolicy.onFailureRestart(2));
+        assertEquals(json, "{\"MaximumRetryCount\":2,\"Name\":\"on-failure\"}");
+    }
+
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java
index a52441d63..a2d99ce9c 100644
--- a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java
@@ -7,19 +7,14 @@
 
 public class RestartPolicy_toStringTest {
 
-	@DataProvider(name = "input")
-	public Object[][] restartPolicies() {
-		return new Object[][] { 
-				{ "no" },
-				{ "always" },
-				{ "on-failure" },
-				{ "on-failure:2" }
-				};
-	}
+    @DataProvider(name = "input")
+    public Object[][] restartPolicies() {
+        return new Object[][] { { "no" }, { "always" }, { "on-failure" }, { "on-failure:2" } };
+    }
 
-	@Test(dataProvider = "input")
-	public void serializationWithoutCount(String policy) throws Exception {
-		assertEquals(RestartPolicy.parse(policy).toString(), policy);
-	}
+    @Test(dataProvider = "input")
+    public void serializationWithoutCount(String policy) throws Exception {
+        assertEquals(RestartPolicy.parse(policy).toString(), policy);
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java b/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
index e8bafc460..41abaf99d 100644
--- a/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
@@ -16,8 +16,8 @@ public void t() throws IOException {
         ObjectMapper objectMapper = new ObjectMapper();
         VolumeBinds volumeBinds = objectMapper.readValue(s, VolumeBinds.class);
         VolumeBind[] binds = volumeBinds.getBinds();
-        assertEquals(binds.length,1);
-        assertEquals(binds[0].getHostPath(),"/some/path");
+        assertEquals(binds.length, 1);
+        assertEquals(binds[0].getHostPath(), "/some/path");
         assertEquals(binds[0].getContainerPath(), "/data");
     }
 
@@ -28,5 +28,4 @@ public void t1() throws IOException {
         objectMapper.readValue(s, VolumeBinds.class);
     }
 
-
 }
\ No newline at end of file
diff --git a/src/test/java/com/github/dockerjava/api/model/VolumeFrom_SerializingTest.java b/src/test/java/com/github/dockerjava/api/model/VolumeFrom_SerializingTest.java
index b7c3bbff5..55c7088c4 100644
--- a/src/test/java/com/github/dockerjava/api/model/VolumeFrom_SerializingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/VolumeFrom_SerializingTest.java
@@ -7,19 +7,20 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class VolumeFrom_SerializingTest {
-	private final ObjectMapper objectMapper = new ObjectMapper();
-	private final String json = "\"container1:ro\"";
-
-	@Test
-	public void deserializing() throws Exception {
-		VolumesFrom volumeFrom = objectMapper.readValue(json, VolumesFrom.class);
-		assertEquals(volumeFrom, new VolumesFrom("container1", AccessMode.ro));
-	}
-
-	@Test
-	public void serializing() throws Exception {
-		VolumesFrom volumeFrom = new VolumesFrom("container1", AccessMode.ro);
-		assertEquals(objectMapper.writeValueAsString(volumeFrom), json);
-	}
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    private final String json = "\"container1:ro\"";
+
+    @Test
+    public void deserializing() throws Exception {
+        VolumesFrom volumeFrom = objectMapper.readValue(json, VolumesFrom.class);
+        assertEquals(volumeFrom, new VolumesFrom("container1", AccessMode.ro));
+    }
+
+    @Test
+    public void serializing() throws Exception {
+        VolumesFrom volumeFrom = new VolumesFrom("container1", AccessMode.ro);
+        assertEquals(objectMapper.writeValueAsString(volumeFrom), json);
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/VolumeTest.java b/src/test/java/com/github/dockerjava/api/model/VolumeTest.java
index 7419e5dc9..5b8311425 100644
--- a/src/test/java/com/github/dockerjava/api/model/VolumeTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/VolumeTest.java
@@ -5,8 +5,8 @@
 import org.testng.annotations.Test;
 
 public class VolumeTest {
-	@Test
-	public void getPath() {
-		assertEquals(new Volume("/path").getPath(), "/path");
-	}
+    @Test
+    public void getPath() {
+        assertEquals(new Volume("/path").getPath(), "/path");
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 373680471..ba72b492e 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -31,28 +31,26 @@
 
 public abstract class AbstractDockerClientTest extends Assert {
 
-	public static final Logger LOG = LoggerFactory
-			.getLogger(AbstractDockerClientTest.class);
+    public static final Logger LOG = LoggerFactory.getLogger(AbstractDockerClientTest.class);
 
     protected DockerClient dockerClient;
 
-	protected TestDockerCmdExecFactory dockerCmdExecFactory = new TestDockerCmdExecFactory(DockerClientBuilder.getDefaultDockerCmdExecFactory());
+    protected TestDockerCmdExecFactory dockerCmdExecFactory = new TestDockerCmdExecFactory(
+            DockerClientBuilder.getDefaultDockerCmdExecFactory());
 
-	public void beforeTest()  {
+    public void beforeTest() {
 
-		LOG.info("======================= BEFORETEST =======================");
-		LOG.info("Connecting to Docker server");
-		dockerClient = DockerClientBuilder.getInstance(config())
-				.withDockerCmdExecFactory(dockerCmdExecFactory)
-				.build();
+        LOG.info("======================= BEFORETEST =======================");
+        LOG.info("Connecting to Docker server");
+        dockerClient = DockerClientBuilder.getInstance(config()).withDockerCmdExecFactory(dockerCmdExecFactory).build();
 
-		LOG.info("Pulling image 'busybox'");
-		// need to block until image is pulled completely
-		asString(dockerClient.pullImageCmd("busybox").withTag("latest").exec());
+        LOG.info("Pulling image 'busybox'");
+        // need to block until image is pulled completely
+        asString(dockerClient.pullImageCmd("busybox").withTag("latest").exec());
 
-		assertNotNull(dockerClient);
-		LOG.info("======================= END OF BEFORETEST =======================\n\n");
-	}
+        assertNotNull(dockerClient);
+        LOG.info("======================= END OF BEFORETEST =======================\n\n");
+    }
 
     private DockerClientConfig config() {
         return config(null);
@@ -61,130 +59,124 @@ private DockerClientConfig config() {
     protected DockerClientConfig config(String password) {
         DockerClientConfig.DockerClientConfigBuilder builder = DockerClientConfig.createDefaultConfigBuilder()
                 .withServerAddress("https://index.docker.io/v1/");
-        if (password!=null) {
+        if (password != null) {
             builder = builder.withPassword(password);
         }
-        return builder
-                .build();
+        return builder.build();
     }
 
     public void afterTest() {
-		LOG.info("======================= END OF AFTERTEST =======================");
-	}
-
-
-	public void beforeMethod(Method method) {
-		LOG.info(String
-				.format("################################## STARTING %s ##################################",
-						method.getName()));
-	}
-
-	public void afterMethod(ITestResult result) {
-
-		for (String container : dockerCmdExecFactory.getContainerNames()) {
-			LOG.info("Cleaning up temporary container {}", container);
-
-			try {
-				dockerClient.removeContainerCmd(container).withForce().exec();
-			} catch (DockerException ignore) {
-				//ignore.printStackTrace();
-			}
-		}
-
-		for (String image : dockerCmdExecFactory.getImageNames()) {
-			LOG.info("Cleaning up temporary image with {}", image);
-			try {
-				dockerClient.removeImageCmd(image).withForce().exec();
-			} catch (DockerException ignore) {
-				//ignore.printStackTrace();
-			}
-		}
-
-		LOG.info(
-				"################################## END OF {} ##################################\n",
-				result.getName());
-	}
-
-	protected String asString(InputStream response) {
-		return consumeAsString(response);
-	}
-
-	public static String consumeAsString(InputStream response)  {
-
-		StringWriter logwriter = new StringWriter();
-
-		try {
-			LineIterator itr = IOUtils.lineIterator(
-					response, "UTF-8");
-
-			while (itr.hasNext()) {
-				String line = itr.next();
-				logwriter.write(line + (itr.hasNext() ? "\n" : ""));
-				LOG.info("line: "+line);
-			}
-			response.close();
-
-			return logwriter.toString();
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		} finally {
-			IOUtils.closeQuietly(response);
-		}
-	}
-
-	// UTIL
-
-	/**
-	 * Checks to see if a specific port is available.
-	 *
-	 * @param port
-	 *            the port to check for availability
-	 */
-	public static boolean available(int port) {
-		if (port < 1100 || port > 60000) {
-			throw new IllegalArgumentException("Invalid start port: " + port);
-		}
-
-		ServerSocket ss = null;
-		DatagramSocket ds = null;
-		try {
-			ss = new ServerSocket(port);
-			ss.setReuseAddress(true);
-			ds = new DatagramSocket(port);
-			ds.setReuseAddress(true);
-			return true;
-		} catch (IOException ignored) {
-		} finally {
-			if (ds != null) {
-				ds.close();
-			}
-
-			if (ss != null) {
-				try {
-					ss.close();
-				} catch (IOException e) {
-					/* should not be thrown */
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Asserts that {@link InspectContainerResponse#getVolumes()} (<code>.Volumes</code>)
-	 * has {@link VolumeBind}s for the given {@link Volume}s
-	 */
-	public static void assertContainerHasVolumes(InspectContainerResponse inspectContainerResponse,
-			Volume ... expectedVolumes) {
-		VolumeBind[] volumeBinds = inspectContainerResponse.getVolumes();
-		LOG.info("Inspect .Volumes = [{}]", Joiner.on(", ").join(volumeBinds));
-
-		List<Volume> volumes = new ArrayList<Volume>();
-		for (VolumeBind bind : volumeBinds) {
-			volumes.add(new Volume(bind.getContainerPath()));
-		}
-		assertThat(volumes, contains(expectedVolumes));
-	}
+        LOG.info("======================= END OF AFTERTEST =======================");
+    }
+
+    public void beforeMethod(Method method) {
+        LOG.info(String.format("################################## STARTING %s ##################################",
+                method.getName()));
+    }
+
+    public void afterMethod(ITestResult result) {
+
+        for (String container : dockerCmdExecFactory.getContainerNames()) {
+            LOG.info("Cleaning up temporary container {}", container);
+
+            try {
+                dockerClient.removeContainerCmd(container).withForce().exec();
+            } catch (DockerException ignore) {
+                // ignore.printStackTrace();
+            }
+        }
+
+        for (String image : dockerCmdExecFactory.getImageNames()) {
+            LOG.info("Cleaning up temporary image with {}", image);
+            try {
+                dockerClient.removeImageCmd(image).withForce().exec();
+            } catch (DockerException ignore) {
+                // ignore.printStackTrace();
+            }
+        }
+
+        LOG.info("################################## END OF {} ##################################\n", result.getName());
+    }
+
+    protected String asString(InputStream response) {
+        return consumeAsString(response);
+    }
+
+    public static String consumeAsString(InputStream response) {
+
+        StringWriter logwriter = new StringWriter();
+
+        try {
+            LineIterator itr = IOUtils.lineIterator(response, "UTF-8");
+
+            while (itr.hasNext()) {
+                String line = itr.next();
+                logwriter.write(line + (itr.hasNext() ? "\n" : ""));
+                LOG.info("line: " + line);
+            }
+            response.close();
+
+            return logwriter.toString();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } finally {
+            IOUtils.closeQuietly(response);
+        }
+    }
+
+    // UTIL
+
+    /**
+     * Checks to see if a specific port is available.
+     *
+     * @param port
+     *            the port to check for availability
+     */
+    public static boolean available(int port) {
+        if (port < 1100 || port > 60000) {
+            throw new IllegalArgumentException("Invalid start port: " + port);
+        }
+
+        ServerSocket ss = null;
+        DatagramSocket ds = null;
+        try {
+            ss = new ServerSocket(port);
+            ss.setReuseAddress(true);
+            ds = new DatagramSocket(port);
+            ds.setReuseAddress(true);
+            return true;
+        } catch (IOException ignored) {
+        } finally {
+            if (ds != null) {
+                ds.close();
+            }
+
+            if (ss != null) {
+                try {
+                    ss.close();
+                } catch (IOException e) {
+                    /* should not be thrown */
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Asserts that {@link InspectContainerResponse#getVolumes()} (<code>.Volumes</code>) has {@link VolumeBind}s for
+     * the given {@link Volume}s
+     */
+    public static void assertContainerHasVolumes(InspectContainerResponse inspectContainerResponse,
+            Volume... expectedVolumes) {
+        VolumeBind[] volumeBinds = inspectContainerResponse.getVolumes();
+        LOG.info("Inspect .Volumes = [{}]", Joiner.on(", ").join(volumeBinds));
+
+        List<Volume> volumes = new ArrayList<Volume>();
+        for (VolumeBind bind : volumeBinds) {
+            volumes.add(new Volume(bind.getContainerPath()));
+        }
+        assertThat(volumes, contains(expectedVolumes));
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/client/DockerClientTest.java b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
index e5bef57d3..85ee0d7ac 100644
--- a/src/test/java/com/github/dockerjava/client/DockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
@@ -24,50 +24,46 @@
  */
 @Test(groups = "integration")
 public class DockerClientTest extends AbstractDockerClientTest {
-	public static final Logger LOG = LoggerFactory
-			.getLogger(DockerClientTest.class);
+    public static final Logger LOG = LoggerFactory.getLogger(DockerClientTest.class);
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
 
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
 
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
 
-	@Test
-	public void testRunShlex() throws DockerException {
+    @Test
+    public void testRunShlex() throws DockerException {
 
-		String[] commands = new String[] {
-				"true",
-				"echo \"The Young Descendant of Tepes & Septette for the Dead Princess\"",
-				"echo -n 'The Young Descendant of Tepes & Septette for the Dead Princess'",
-				"/bin/sh -c echo Hello World", "/bin/sh -c echo 'Hello World'",
-				"echo 'Night of Nights'", "true && echo 'Night of Nights'" };
+        String[] commands = new String[] { "true",
+                "echo \"The Young Descendant of Tepes & Septette for the Dead Princess\"",
+                "echo -n 'The Young Descendant of Tepes & Septette for the Dead Princess'",
+                "/bin/sh -c echo Hello World", "/bin/sh -c echo 'Hello World'", "echo 'Night of Nights'",
+                "true && echo 'Night of Nights'" };
 
-		for (String command : commands) {
-			LOG.info("Running command: [{}]", command);
+        for (String command : commands) {
+            LOG.info("Running command: [{}]", command);
 
-			CreateContainerResponse container = dockerClient
-					.createContainerCmd("busybox").withCmd(commands).exec();
-			dockerClient.startContainerCmd(container.getId());
-			
-			int exitcode = dockerClient.waitContainerCmd(container.getId()).exec();
-			assertThat(exitcode, equalTo(0));
-		}
-	}
+            CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd(commands).exec();
+            dockerClient.startContainerCmd(container.getId());
 
+            int exitcode = dockerClient.waitContainerCmd(container.getId()).exec();
+            assertThat(exitcode, equalTo(0));
+        }
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java b/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
index 5212fe50d..8c93df20a 100644
--- a/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
+++ b/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
@@ -18,42 +18,43 @@
 
 public class CompressArchiveUtilTest {
 
-  @Test
-  public void testExecutableFlagIsPreserved() throws Exception {
-    File executableFile = createExecutableFile();
-    File archive = CompressArchiveUtil.archiveTARFiles(executableFile.getParentFile(), asList(executableFile), "archive");
-    File expectedFile = extractFileByName(archive, "executableFile.sh.result");
-
-    assertThat("should be executable", expectedFile.canExecute());
-  }
-
-  private File createExecutableFile() throws IOException {
-    File baseDir = new File(FileUtils.getTempDirectoryPath());
-    File executableFile = new File(baseDir, "executableFile.sh");
-    executableFile.createNewFile();
-    executableFile.setExecutable(true);
-    assertThat(executableFile.canExecute(), is(true));
-    return executableFile;
-  }
-
-  private File extractFileByName(File archive, String filenameToExtract) throws IOException {
-    File baseDir = new File(FileUtils.getTempDirectoryPath());
-    File expectedFile = new File(baseDir, filenameToExtract);
-    expectedFile.delete();
-    assertThat(expectedFile.exists(), is(false));
-
-    TarArchiveInputStream tarArchiveInputStream = new TarArchiveInputStream(new FileInputStream(archive));
-    TarArchiveEntry entry;
-    while ((entry = tarArchiveInputStream.getNextTarEntry()) != null) {
-      String individualFiles = entry.getName();
-      // there should be only one file in this archive
-      assertThat(individualFiles, equalTo("executableFile.sh"));
-      IOUtils.copy(tarArchiveInputStream, new FileOutputStream(expectedFile));
-      if ((entry.getMode() & 0755) == 0755) {
-        expectedFile.setExecutable(true);
-      }
+    @Test
+    public void testExecutableFlagIsPreserved() throws Exception {
+        File executableFile = createExecutableFile();
+        File archive = CompressArchiveUtil.archiveTARFiles(executableFile.getParentFile(), asList(executableFile),
+                "archive");
+        File expectedFile = extractFileByName(archive, "executableFile.sh.result");
+
+        assertThat("should be executable", expectedFile.canExecute());
+    }
+
+    private File createExecutableFile() throws IOException {
+        File baseDir = new File(FileUtils.getTempDirectoryPath());
+        File executableFile = new File(baseDir, "executableFile.sh");
+        executableFile.createNewFile();
+        executableFile.setExecutable(true);
+        assertThat(executableFile.canExecute(), is(true));
+        return executableFile;
+    }
+
+    private File extractFileByName(File archive, String filenameToExtract) throws IOException {
+        File baseDir = new File(FileUtils.getTempDirectoryPath());
+        File expectedFile = new File(baseDir, filenameToExtract);
+        expectedFile.delete();
+        assertThat(expectedFile.exists(), is(false));
+
+        TarArchiveInputStream tarArchiveInputStream = new TarArchiveInputStream(new FileInputStream(archive));
+        TarArchiveEntry entry;
+        while ((entry = tarArchiveInputStream.getNextTarEntry()) != null) {
+            String individualFiles = entry.getName();
+            // there should be only one file in this archive
+            assertThat(individualFiles, equalTo("executableFile.sh"));
+            IOUtils.copy(tarArchiveInputStream, new FileOutputStream(expectedFile));
+            if ((entry.getMode() & 0755) == 0755) {
+                expectedFile.setExecutable(true);
+            }
+        }
+        tarArchiveInputStream.close();
+        return expectedFile;
     }
-    tarArchiveInputStream.close();
-    return expectedFile;
-  }
 }
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
index 64ab912d0..634d0e9a5 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
@@ -16,12 +16,14 @@ public class DockerClientConfigTest {
     public static final DockerClientConfig EXAMPLE_CONFIG = newExampleConfig();
 
     private static DockerClientConfig newExampleConfig() {
-        return new DockerClientConfig(URI.create("http://foo"), "bar", "baz", "qux", "blam", "wham", "flam", 877, false, false, new LocalDirectorySSLConfig("flim"), 20, 2);
+        return new DockerClientConfig(URI.create("http://foo"), "bar", "baz", "qux", "blam", "wham", "flam", 877,
+                false, false, new LocalDirectorySSLConfig("flim"), 20, 2);
     }
 
     @Test
     public void string() throws Exception {
-        assertEquals("DockerClientConfig{uri=http://foo, version='bar', username='baz', password='qux', email='blam', serverAddress='wham', dockerCfgPath='flam', sslConfig='LocalDirectorySSLConfig{dockerCertPath=flim}', readTimeout=877, loggingFilterEnabled=false, followRedirectsFilterEnabled=false}",
+        assertEquals(
+                "DockerClientConfig{uri=http://foo, version='bar', username='baz', password='qux', email='blam', serverAddress='wham', dockerCfgPath='flam', sslConfig='LocalDirectorySSLConfig{dockerCertPath=flim}', readTimeout=877, loggingFilterEnabled=false, followRedirectsFilterEnabled=false}",
                 EXAMPLE_CONFIG.toString());
     }
 
@@ -150,7 +152,7 @@ public void defaults() throws Exception {
         systemProperties.setProperty("user.home", "someHomeDir");
 
         // when you build config
-        DockerClientConfig config = buildConfig(Collections.<String, String>emptyMap(), systemProperties);
+        DockerClientConfig config = buildConfig(Collections.<String, String> emptyMap(), systemProperties);
 
         // then the cert path is as expected
         assertEquals(config.getUri(), URI.create("https://localhost:2376"));
@@ -159,7 +161,7 @@ public void defaults() throws Exception {
         assertEquals(config.getVersion(), null);
         assertEquals(config.isLoggingFilterEnabled(), true);
         assertEquals(config.getDockerCfgPath(), "someHomeDir/.dockercfg");
-        assertEquals( ((LocalDirectorySSLConfig)config.getSslConfig()).getDockerCertPath(), "someHomeDir/.docker");
+        assertEquals(((LocalDirectorySSLConfig) config.getSslConfig()).getDockerCertPath(), "someHomeDir/.docker");
     }
 
     @Test
@@ -179,7 +181,7 @@ public void systemProperties() throws Exception {
         systemProperties.setProperty("docker.io.enableLoggingFilter", "false");
 
         // when you build new config
-        DockerClientConfig config = buildConfig(Collections.<String, String>emptyMap(), systemProperties);
+        DockerClientConfig config = buildConfig(Collections.<String, String> emptyMap(), systemProperties);
 
         // then it is the same as the example
         assertEquals(config, EXAMPLE_CONFIG);
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
index 2a961e3b8..eac3bb725 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
@@ -10,7 +10,8 @@ public class DockerClientImplTest {
     @Test
     public void configuredInstanceAuthConfig() throws Exception {
         // given a config with null serverAddress
-        DockerClientConfig dockerClientConfig = new DockerClientConfig(null, null, "", "", "", null, null,  0, false, false, null, 20, 2);
+        DockerClientConfig dockerClientConfig = new DockerClientConfig(null, null, "", "", "", null, null, 0, false,
+                false, null, 20, 2);
         DockerClientImpl dockerClient = DockerClientImpl.getInstance(dockerClientConfig);
 
         // when we get the auth config
diff --git a/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java b/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
index 215926a56..cf5b03188 100644
--- a/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
+++ b/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
@@ -40,8 +40,7 @@ public void testMatch(MatchTestCase testCase) throws IOException {
 
     @DataProvider
     public Object[][] getTestData() {
-        return new Object[][] {
-                new Object[] { new MatchTestCase("abc", "abc", true, false) },
+        return new Object[][] { new Object[] { new MatchTestCase("abc", "abc", true, false) },
                 new Object[] { new MatchTestCase("*", "abc", true, false) },
                 new Object[] { new MatchTestCase("*c", "abc", true, false) },
                 new Object[] { new MatchTestCase("a*", "a", true, false) },
@@ -99,8 +98,11 @@ public Object[][] getTestData() {
 
     private final class MatchTestCase {
         private final String pattern;
+
         private final String s;
+
         private final boolean matches;
+
         private final boolean expectException;
 
         public MatchTestCase(String pattern, String s, boolean matches, boolean expectException) {
@@ -113,8 +115,8 @@ public MatchTestCase(String pattern, String s, boolean matches, boolean expectEx
 
         @Override
         public String toString() {
-            return "MatchTestCase [pattern=" + pattern + ", s=" + s + ", matches=" + matches
-                    + ", expectException=" + expectException + "]";
+            return "MatchTestCase [pattern=" + pattern + ", s=" + s + ", matches=" + matches + ", expectException="
+                    + expectException + "]";
         }
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index fb764474f..380f5dd9f 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -11,188 +11,184 @@
 import com.github.dockerjava.jaxrs.BuildImageCmdExec;
 
 /**
- * Special {@link DockerCmdExecFactory} implementation that collects container
- * and image creations while test execution for the purpose of automatically
- * cleanup.
+ * Special {@link DockerCmdExecFactory} implementation that collects container and image creations while test execution
+ * for the purpose of automatically cleanup.
  * 
  * @author marcus
  * 
  */
 public class TestDockerCmdExecFactory implements DockerCmdExecFactory {
 
-	private List<String> containerNames = new ArrayList<String>();
-
-	private List<String> imageNames = new ArrayList<String>();
-
-	private DockerCmdExecFactory delegate;
-
-	public TestDockerCmdExecFactory(DockerCmdExecFactory delegate) {
-		this.delegate = delegate;
-	}
-
-	@Override
-	public void init(DockerClientConfig dockerClientConfig) {
-		delegate.init(dockerClientConfig);
-	}
-
-	@Override
-	public void close() throws IOException {
-		delegate.close();
-	}
-
-	@Override
-	public CreateContainerCmd.Exec createCreateContainerCmdExec() {
-		return new CreateContainerCmd.Exec() {
-			@Override
-			public CreateContainerResponse exec(CreateContainerCmd command) {
-				CreateContainerResponse createContainerResponse = delegate
-						.createCreateContainerCmdExec().exec(command);
-				containerNames.add(createContainerResponse.getId());
-				return createContainerResponse;
-			}
-		};
-	}
-
-	@Override
-	public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
-		return new RemoveContainerCmd.Exec() {
-			@Override
-			public Void exec(RemoveContainerCmd command) {
-				delegate.createRemoveContainerCmdExec().exec(command);
-				containerNames.remove(command.getContainerId());
-				return null;
-			}
-		};
-	}
-
-	@Override
-	public CreateImageCmd.Exec createCreateImageCmdExec() {
-		return new CreateImageCmd.Exec() {
-			@Override
-			public CreateImageResponse exec(CreateImageCmd command) {
-				CreateImageResponse createImageResponse = delegate
-						.createCreateImageCmdExec().exec(command);
-				imageNames.add(createImageResponse.getId());
-				return createImageResponse;
-			}
-		};
-	}
-
-	@Override
-	public RemoveImageCmd.Exec createRemoveImageCmdExec() {
-		return new RemoveImageCmd.Exec() {
-			@Override
-			public Void exec(RemoveImageCmd command) {
-				delegate.createRemoveImageCmdExec().exec(command);
-				imageNames.remove(command.getImageId());
-				return null;
-			}
-		};
-	}
-
-	@Override
-	public BuildImageCmd.Exec createBuildImageCmdExec() {
-		return new BuildImageCmd.Exec() {
-			@Override
-			public BuildImageCmd.Response exec(BuildImageCmd command) {
-				// can't detect image id here so tagging it
-				String tag = command.getTag();
-				if (tag == null || "".equals(tag.trim())) {
-					tag = "" + new SecureRandom().nextInt(Integer.MAX_VALUE);
-					command.withTag(tag);
-				}
-				InputStream inputStream = delegate.createBuildImageCmdExec()
-						.exec(command);
-				imageNames.add(tag);
-				return new BuildImageCmdExec.ResponseImpl(inputStream);
-			}
-		};
-	}
-
-	@Override
-	public Exec createAuthCmdExec() {
-		return delegate.createAuthCmdExec();
-	}
-
-	@Override
-	public InfoCmd.Exec createInfoCmdExec() {
-		return delegate.createInfoCmdExec();
-	}
-
-	@Override
-	public PingCmd.Exec createPingCmdExec() {
-		return delegate.createPingCmdExec();
-	}
-
-	@Override
-	public ExecCreateCmd.Exec createExecCmdExec() {
-		return delegate.createExecCmdExec();
-	}
-
-	@Override
-	public VersionCmd.Exec createVersionCmdExec() {
-		return delegate.createVersionCmdExec();
-	}
-
-	@Override
-	public PullImageCmd.Exec createPullImageCmdExec() {
-		return delegate.createPullImageCmdExec();
-	}
-
-	@Override
-	public PushImageCmd.Exec createPushImageCmdExec() {
-		return delegate.createPushImageCmdExec();
-	}
-
-	@Override
-	public SaveImageCmd.Exec createSaveImageCmdExec() {
-		return delegate.createSaveImageCmdExec();
-	}
-
-	@Override
-	public SearchImagesCmd.Exec createSearchImagesCmdExec() {
-		return delegate.createSearchImagesCmdExec();
-	}
-
-	@Override
-	public ListImagesCmd.Exec createListImagesCmdExec() {
-		return delegate.createListImagesCmdExec();
-	}
-
-	@Override
-	public InspectImageCmd.Exec createInspectImageCmdExec() {
-		return delegate.createInspectImageCmdExec();
-	}
-
-	@Override
-	public ListContainersCmd.Exec createListContainersCmdExec() {
-		return delegate.createListContainersCmdExec();
-	}
-
-	@Override
-	public StartContainerCmd.Exec createStartContainerCmdExec() {
-		return delegate.createStartContainerCmdExec();
-	}
-
-	@Override
-	public InspectContainerCmd.Exec createInspectContainerCmdExec() {
-		return delegate.createInspectContainerCmdExec();
-	}
-
-	@Override
-	public WaitContainerCmd.Exec createWaitContainerCmdExec() {
-		return delegate.createWaitContainerCmdExec();
-	}
-
-	@Override
-	public AttachContainerCmd.Exec createAttachContainerCmdExec() {
-		return delegate.createAttachContainerCmdExec();
-	}
-
-	@Override
-	public ExecStartCmd.Exec createExecStartCmdExec() {
-		return delegate.createExecStartCmdExec();
-	}
+    private List<String> containerNames = new ArrayList<String>();
+
+    private List<String> imageNames = new ArrayList<String>();
+
+    private DockerCmdExecFactory delegate;
+
+    public TestDockerCmdExecFactory(DockerCmdExecFactory delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public void init(DockerClientConfig dockerClientConfig) {
+        delegate.init(dockerClientConfig);
+    }
+
+    @Override
+    public void close() throws IOException {
+        delegate.close();
+    }
+
+    @Override
+    public CreateContainerCmd.Exec createCreateContainerCmdExec() {
+        return new CreateContainerCmd.Exec() {
+            @Override
+            public CreateContainerResponse exec(CreateContainerCmd command) {
+                CreateContainerResponse createContainerResponse = delegate.createCreateContainerCmdExec().exec(command);
+                containerNames.add(createContainerResponse.getId());
+                return createContainerResponse;
+            }
+        };
+    }
+
+    @Override
+    public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
+        return new RemoveContainerCmd.Exec() {
+            @Override
+            public Void exec(RemoveContainerCmd command) {
+                delegate.createRemoveContainerCmdExec().exec(command);
+                containerNames.remove(command.getContainerId());
+                return null;
+            }
+        };
+    }
+
+    @Override
+    public CreateImageCmd.Exec createCreateImageCmdExec() {
+        return new CreateImageCmd.Exec() {
+            @Override
+            public CreateImageResponse exec(CreateImageCmd command) {
+                CreateImageResponse createImageResponse = delegate.createCreateImageCmdExec().exec(command);
+                imageNames.add(createImageResponse.getId());
+                return createImageResponse;
+            }
+        };
+    }
+
+    @Override
+    public RemoveImageCmd.Exec createRemoveImageCmdExec() {
+        return new RemoveImageCmd.Exec() {
+            @Override
+            public Void exec(RemoveImageCmd command) {
+                delegate.createRemoveImageCmdExec().exec(command);
+                imageNames.remove(command.getImageId());
+                return null;
+            }
+        };
+    }
+
+    @Override
+    public BuildImageCmd.Exec createBuildImageCmdExec() {
+        return new BuildImageCmd.Exec() {
+            @Override
+            public BuildImageCmd.Response exec(BuildImageCmd command) {
+                // can't detect image id here so tagging it
+                String tag = command.getTag();
+                if (tag == null || "".equals(tag.trim())) {
+                    tag = "" + new SecureRandom().nextInt(Integer.MAX_VALUE);
+                    command.withTag(tag);
+                }
+                InputStream inputStream = delegate.createBuildImageCmdExec().exec(command);
+                imageNames.add(tag);
+                return new BuildImageCmdExec.ResponseImpl(inputStream);
+            }
+        };
+    }
+
+    @Override
+    public Exec createAuthCmdExec() {
+        return delegate.createAuthCmdExec();
+    }
+
+    @Override
+    public InfoCmd.Exec createInfoCmdExec() {
+        return delegate.createInfoCmdExec();
+    }
+
+    @Override
+    public PingCmd.Exec createPingCmdExec() {
+        return delegate.createPingCmdExec();
+    }
+
+    @Override
+    public ExecCreateCmd.Exec createExecCmdExec() {
+        return delegate.createExecCmdExec();
+    }
+
+    @Override
+    public VersionCmd.Exec createVersionCmdExec() {
+        return delegate.createVersionCmdExec();
+    }
+
+    @Override
+    public PullImageCmd.Exec createPullImageCmdExec() {
+        return delegate.createPullImageCmdExec();
+    }
+
+    @Override
+    public PushImageCmd.Exec createPushImageCmdExec() {
+        return delegate.createPushImageCmdExec();
+    }
+
+    @Override
+    public SaveImageCmd.Exec createSaveImageCmdExec() {
+        return delegate.createSaveImageCmdExec();
+    }
+
+    @Override
+    public SearchImagesCmd.Exec createSearchImagesCmdExec() {
+        return delegate.createSearchImagesCmdExec();
+    }
+
+    @Override
+    public ListImagesCmd.Exec createListImagesCmdExec() {
+        return delegate.createListImagesCmdExec();
+    }
+
+    @Override
+    public InspectImageCmd.Exec createInspectImageCmdExec() {
+        return delegate.createInspectImageCmdExec();
+    }
+
+    @Override
+    public ListContainersCmd.Exec createListContainersCmdExec() {
+        return delegate.createListContainersCmdExec();
+    }
+
+    @Override
+    public StartContainerCmd.Exec createStartContainerCmdExec() {
+        return delegate.createStartContainerCmdExec();
+    }
+
+    @Override
+    public InspectContainerCmd.Exec createInspectContainerCmdExec() {
+        return delegate.createInspectContainerCmdExec();
+    }
+
+    @Override
+    public WaitContainerCmd.Exec createWaitContainerCmdExec() {
+        return delegate.createWaitContainerCmdExec();
+    }
+
+    @Override
+    public AttachContainerCmd.Exec createAttachContainerCmdExec() {
+        return delegate.createAttachContainerCmdExec();
+    }
+
+    @Override
+    public ExecStartCmd.Exec createExecStartCmdExec() {
+        return delegate.createExecStartCmdExec();
+    }
 
     @Override
     public InspectExecCmd.Exec createInspectExecCmdExec() {
@@ -200,76 +196,76 @@ public InspectExecCmd.Exec createInspectExecCmdExec() {
     }
 
     @Override
-	public LogContainerCmd.Exec createLogContainerCmdExec() {
-		return delegate.createLogContainerCmdExec();
-	}
-
-	@Override
-	public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
-		return delegate.createCopyFileFromContainerCmdExec();
-	}
-
-	@Override
-	public StopContainerCmd.Exec createStopContainerCmdExec() {
-		return delegate.createStopContainerCmdExec();
-	}
-
-	@Override
-	public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
-		return delegate.createContainerDiffCmdExec();
-	}
-
-	@Override
-	public KillContainerCmd.Exec createKillContainerCmdExec() {
-		return delegate.createKillContainerCmdExec();
-	}
-
-	@Override
-	public RestartContainerCmd.Exec createRestartContainerCmdExec() {
-		return delegate.createRestartContainerCmdExec();
-	}
-
-	@Override
-	public CommitCmd.Exec createCommitCmdExec() {
-		return delegate.createCommitCmdExec();
-	}
-
-	@Override
-	public TopContainerCmd.Exec createTopContainerCmdExec() {
-		return delegate.createTopContainerCmdExec();
-	}
-
-	@Override
-	public TagImageCmd.Exec createTagImageCmdExec() {
-		return delegate.createTagImageCmdExec();
-	}
-
-	@Override
-	public PauseContainerCmd.Exec createPauseContainerCmdExec() {
-		return delegate.createPauseContainerCmdExec();
-	}
-
-	@Override
-	public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
-		return delegate.createUnpauseContainerCmdExec();
-	}
-
-	@Override
-	public EventsCmd.Exec createEventsCmdExec() {
-		return delegate.createEventsCmdExec();
-	}
-	
-	@Override
+    public LogContainerCmd.Exec createLogContainerCmdExec() {
+        return delegate.createLogContainerCmdExec();
+    }
+
+    @Override
+    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
+        return delegate.createCopyFileFromContainerCmdExec();
+    }
+
+    @Override
+    public StopContainerCmd.Exec createStopContainerCmdExec() {
+        return delegate.createStopContainerCmdExec();
+    }
+
+    @Override
+    public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
+        return delegate.createContainerDiffCmdExec();
+    }
+
+    @Override
+    public KillContainerCmd.Exec createKillContainerCmdExec() {
+        return delegate.createKillContainerCmdExec();
+    }
+
+    @Override
+    public RestartContainerCmd.Exec createRestartContainerCmdExec() {
+        return delegate.createRestartContainerCmdExec();
+    }
+
+    @Override
+    public CommitCmd.Exec createCommitCmdExec() {
+        return delegate.createCommitCmdExec();
+    }
+
+    @Override
+    public TopContainerCmd.Exec createTopContainerCmdExec() {
+        return delegate.createTopContainerCmdExec();
+    }
+
+    @Override
+    public TagImageCmd.Exec createTagImageCmdExec() {
+        return delegate.createTagImageCmdExec();
+    }
+
+    @Override
+    public PauseContainerCmd.Exec createPauseContainerCmdExec() {
+        return delegate.createPauseContainerCmdExec();
+    }
+
+    @Override
+    public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
+        return delegate.createUnpauseContainerCmdExec();
+    }
+
+    @Override
+    public EventsCmd.Exec createEventsCmdExec() {
+        return delegate.createEventsCmdExec();
+    }
+
+    @Override
     public StatsCmd.Exec createStatsCmdExec() {
-	    return delegate.createStatsCmdExec();
-	}
+        return delegate.createStatsCmdExec();
+    }
 
-	public List<String> getContainerNames() {
-		return new ArrayList<String>(containerNames);
-	}
+    public List<String> getContainerNames() {
+        return new ArrayList<String>(containerNames);
+    }
 
-	public List<String> getImageNames() {
-		return new ArrayList<String>(imageNames);
-	}
+    public List<String> getImageNames() {
+        return new ArrayList<String>(imageNames);
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
index 950111497..3c60cada2 100644
--- a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
@@ -13,41 +13,41 @@
 @Test(groups = "integration")
 public class AuthCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException  {
-		super.beforeTest();
-	}
-	
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-
-	@Test
-	public void testAuth() throws Exception {
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void testAuth() throws Exception {
         AuthResponse response = dockerClient.authCmd().exec();
 
         assertEquals(response.getStatus(), "Login Succeeded");
     }
 
-	@Test
-	public void testAuthInvalid() throws Exception {
+    @Test
+    public void testAuthInvalid() throws Exception {
 
         try {
-			DockerClientBuilder.getInstance(config("garbage")).build().authCmd().exec();
+            DockerClientBuilder.getInstance(config("garbage")).build().authCmd().exec();
             fail("Expected a UnauthorizedException caused by a bad password.");
-		} catch (UnauthorizedException e) {
-			assertEquals(e.getMessage(), "Wrong login/password, please try again\n");
-		} 
-	}
+        } catch (UnauthorizedException e) {
+            assertEquals(e.getMessage(), "Wrong login/password, please try again\n");
+        }
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index c9bd51b90..f61b61e69 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -40,48 +40,43 @@
 @Test(groups = "integration")
 public class BuildImageCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-	
-	@Test
-	public void testNginxDockerfileBuilder() {
-		File baseDir = new File(Thread.currentThread().getContextClassLoader()
-				.getResource("nginx").getFile());
-
-		InputStream response = dockerClient.buildImageCmd(baseDir).withNoCache().exec();
-
-		String fullLog = asString(response);
-		assertThat(fullLog, containsString("Successfully built"));
-
-		String imageId = StringUtils.substringBetween(fullLog,
-				"Successfully built ", "\\n\"}").trim();
-
-		InspectImageResponse inspectImageResponse = dockerClient
-				.inspectImageCmd(imageId).exec();
-		assertThat(inspectImageResponse, not(nullValue()));
-		LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-		
-		assertThat(inspectImageResponse.getAuthor(),
-				equalTo("Guillaume J. Charmes \"guillaume@dotcloud.com\""));
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void testNginxDockerfileBuilder() {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("nginx").getFile());
+
+        InputStream response = dockerClient.buildImageCmd(baseDir).withNoCache().exec();
+
+        String fullLog = asString(response);
+        assertThat(fullLog, containsString("Successfully built"));
+
+        String imageId = StringUtils.substringBetween(fullLog, "Successfully built ", "\\n\"}").trim();
 
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        assertThat(inspectImageResponse, not(nullValue()));
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+        assertThat(inspectImageResponse.getAuthor(), equalTo("Guillaume J. Charmes \"guillaume@dotcloud.com\""));
+    }
 
     @Test(groups = "ignoreInCircleCi")
     public void testNonstandard1() {
@@ -96,16 +91,12 @@ public void testNonstandard1() {
 
     @Test(groups = "ignoreInCircleCi")
     public void testNonstandard2() {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader()
-                .getResource("nonstandard").getFile());
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("nonstandard").getFile());
         File dockerFile = new File(Thread.currentThread().getContextClassLoader()
                 .getResource("nonstandard/subdirectory/Dockerfile-nonstandard").getFile());
 
-
-            InputStream response = dockerClient.buildImageCmd()
-                    .withBaseDirectory(baseDir)
-                    .withDockerfile(dockerFile)
-                    .withNoCache().exec();
+        InputStream response = dockerClient.buildImageCmd().withBaseDirectory(baseDir).withDockerfile(dockerFile)
+                .withNoCache().exec();
 
         String fullLog = asString(response);
         assertThat(fullLog, containsString("Successfully built"));
@@ -121,49 +112,42 @@ public void testDockerBuilderFromTar() throws IOException {
     }
 
     @Test
-	public void testDockerBuilderAddUrl()  {
-		File baseDir = new File(Thread.currentThread().getContextClassLoader()
-				.getResource("testAddUrl").getFile());
-		String response = dockerfileBuild(baseDir);
-		assertThat(response, containsString("Docker"));
-	}
-
-	@Test
-	public void testDockerBuilderAddFileInSubfolder() throws DockerException,
-			IOException {
-		File baseDir = new File(Thread.currentThread().getContextClassLoader()
-				.getResource("testAddFileInSubfolder").getFile());
-		String response = dockerfileBuild(baseDir);
-		assertThat(response, containsString("Successfully executed testrun.sh"));
-	}
-	
-	@Test
-	public void testDockerBuilderAddFilesViaWildcard() throws DockerException,
-			IOException {
-		File baseDir = new File(Thread.currentThread().getContextClassLoader()
-				.getResource("testAddFilesViaWildcard").getFile());
-		String response = dockerfileBuild(baseDir);
-		assertThat(response, containsString("Successfully executed testinclude1.sh"));
-		assertThat(response, not(containsString("Successfully executed testinclude2.sh")));
-	}
-
-	@Test
-	public void testDockerBuilderAddFolder() throws DockerException,
-			IOException {
-		File baseDir = new File(Thread.currentThread().getContextClassLoader()
-				.getResource("testAddFolder").getFile());
-		String response = dockerfileBuild(baseDir);
-		assertThat(response, containsString("Successfully executed testAddFolder.sh"));
-	}
-	
-	@Test
-	public void testDockerBuilderEnv() throws DockerException,
-			IOException {
-		File baseDir = new File(Thread.currentThread().getContextClassLoader()
-				.getResource("testEnv").getFile());
-		String response = dockerfileBuild(baseDir);
-		assertThat(response, containsString("Successfully executed testrun.sh"));
-	}
+    public void testDockerBuilderAddUrl() {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddUrl").getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("Docker"));
+    }
+
+    @Test
+    public void testDockerBuilderAddFileInSubfolder() throws DockerException, IOException {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddFileInSubfolder")
+                .getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("Successfully executed testrun.sh"));
+    }
+
+    @Test
+    public void testDockerBuilderAddFilesViaWildcard() throws DockerException, IOException {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddFilesViaWildcard")
+                .getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("Successfully executed testinclude1.sh"));
+        assertThat(response, not(containsString("Successfully executed testinclude2.sh")));
+    }
+
+    @Test
+    public void testDockerBuilderAddFolder() throws DockerException, IOException {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddFolder").getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("Successfully executed testAddFolder.sh"));
+    }
+
+    @Test
+    public void testDockerBuilderEnv() throws DockerException, IOException {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testEnv").getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("Successfully executed testrun.sh"));
+    }
 
     private String dockerfileBuild(InputStream tarInputStream) {
         return execBuild(dockerClient.buildImageCmd().withTarInputStream(tarInputStream));
@@ -171,7 +155,7 @@ private String dockerfileBuild(InputStream tarInputStream) {
 
     private String dockerfileBuild(File baseDir) {
         return execBuild(dockerClient.buildImageCmd(baseDir));
-	}
+    }
 
     private String execBuild(BuildImageCmd buildImageCmd) {
         // Build image
@@ -194,91 +178,83 @@ private String execBuild(BuildImageCmd buildImageCmd) {
         // Log container
         InputStream logResponse = logContainer(container.getId());
 
-        //assertThat(asString(logResponse), containsString(expectedText));
+        // assertThat(asString(logResponse), containsString(expectedText));
 
         return asString(logResponse);
     }
 
-	private InputStream logContainer(String containerId) {
-		return dockerClient.logContainerCmd(containerId).withStdErr().withStdOut().exec();
-	}
-
-	@Test(expectedExceptions={DockerClientException.class})
-	public void testDockerfileIgnored() {
-		File baseDir = new File(Thread.currentThread().getContextClassLoader()
-				.getResource("testDockerfileIgnored").getFile());
-		dockerClient.buildImageCmd(baseDir).withNoCache().exec();
-	}
-
-	@Test(expectedExceptions={DockerClientException.class})
-		public void testInvalidDockerIgnorePattern() {
-			File baseDir = new File(Thread.currentThread().getContextClassLoader()
-					.getResource("testInvalidDockerignorePattern").getFile());
-			dockerClient.buildImageCmd(baseDir).withNoCache().exec();
-		}
-
-	@Test(groups = "ignoreInCircleCi")
-	public void testDockerIgnore() throws DockerException,
-			IOException {
-		File baseDir = new File(Thread.currentThread().getContextClassLoader()
-				.getResource("testDockerignore").getFile());
-		String response = dockerfileBuild(baseDir);
-		assertThat(response, containsString("/tmp/a/a /tmp/a/c /tmp/a/d"));
-	}
-
-	@Test
-	public void testNetCatDockerfileBuilder() throws InterruptedException, IOException {
-		File baseDir = new File(Thread.currentThread().getContextClassLoader()
-				.getResource("netcat").getFile());
-
-		Iterable<EventStreamItem> response = dockerClient.buildImageCmd(baseDir).withNoCache().exec().getItems();
-
-                String imageId = null;
-
-		for(EventStreamItem item : response) {
-                  String text = item.getStream();
-                  if( text.startsWith("Successfully built ")) {
-                    imageId = StringUtils.substringBetween(text,
-				"Successfully built ", "\n").trim();
-                  }
-                }
-		
-		assertNotNull(imageId, "Not successful in build");
-
-
-		InspectImageResponse inspectImageResponse = dockerClient
-				.inspectImageCmd(imageId).exec();
-		assertThat(inspectImageResponse, not(nullValue()));
-		assertThat(inspectImageResponse.getId(), not(nullValue()));
-		LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-		
-		CreateContainerResponse container = dockerClient.createContainerCmd(
-				inspectImageResponse.getId()).exec();
-		assertThat(container.getId(), not(isEmptyString()));
-		dockerClient.startContainerCmd(container.getId()).exec();
-		
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
-
-		assertThat(inspectContainerResponse.getId(), notNullValue());
-		assertThat(inspectContainerResponse.getNetworkSettings().getPorts(),
-				notNullValue());
-
-		// No use as such if not running on the server
-//		for (Ports.Port p : inspectContainerResponse.getNetworkSettings().getPorts().getAllPorts()) {
-//			int port = Integer.valueOf(p.getHostPort());
-//			LOG.info("Checking port {} is open", port);
-//			assertThat(available(port), is(false));
-//		}
-		dockerClient.stopContainerCmd(container.getId()).withTimeout(0).exec();
-
-	}
-
-	@Test
-	public void testAddAndCopySubstitution () throws DockerException, IOException {
-			File baseDir = new File(Thread.currentThread().getContextClassLoader()
-					.getResource("testENVSubstitution").getFile());
-			String response = dockerfileBuild(baseDir);
-			assertThat(response, containsString("testENVSubstitution successfully completed"));
-	}
+    private InputStream logContainer(String containerId) {
+        return dockerClient.logContainerCmd(containerId).withStdErr().withStdOut().exec();
+    }
+
+    @Test(expectedExceptions = { DockerClientException.class })
+    public void testDockerfileIgnored() {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerfileIgnored")
+                .getFile());
+        dockerClient.buildImageCmd(baseDir).withNoCache().exec();
+    }
+
+    @Test(expectedExceptions = { DockerClientException.class })
+    public void testInvalidDockerIgnorePattern() {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader()
+                .getResource("testInvalidDockerignorePattern").getFile());
+        dockerClient.buildImageCmd(baseDir).withNoCache().exec();
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void testDockerIgnore() throws DockerException, IOException {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerignore")
+                .getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("/tmp/a/a /tmp/a/c /tmp/a/d"));
+    }
+
+    @Test
+    public void testNetCatDockerfileBuilder() throws InterruptedException, IOException {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("netcat").getFile());
+
+        Iterable<EventStreamItem> response = dockerClient.buildImageCmd(baseDir).withNoCache().exec().getItems();
+
+        String imageId = null;
+
+        for (EventStreamItem item : response) {
+            String text = item.getStream();
+            if (text.startsWith("Successfully built ")) {
+                imageId = StringUtils.substringBetween(text, "Successfully built ", "\n").trim();
+            }
+        }
+
+        assertNotNull(imageId, "Not successful in build");
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        assertThat(inspectImageResponse, not(nullValue()));
+        assertThat(inspectImageResponse.getId(), not(nullValue()));
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+        CreateContainerResponse container = dockerClient.createContainerCmd(inspectImageResponse.getId()).exec();
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getId(), notNullValue());
+        assertThat(inspectContainerResponse.getNetworkSettings().getPorts(), notNullValue());
+
+        // No use as such if not running on the server
+        // for (Ports.Port p : inspectContainerResponse.getNetworkSettings().getPorts().getAllPorts()) {
+        // int port = Integer.valueOf(p.getHostPort());
+        // LOG.info("Checking port {} is open", port);
+        // assertThat(available(port), is(false));
+        // }
+        dockerClient.stopContainerCmd(container.getId()).withTimeout(0).exec();
+
+    }
+
+    @Test
+    public void testAddAndCopySubstitution() throws DockerException, IOException {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testENVSubstitution")
+                .getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("testENVSubstitution successfully completed"));
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
index ea5f6128d..415ca8f0b 100644
--- a/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
@@ -25,63 +25,56 @@
 @Test(groups = "integration")
 public class CommitCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-
-	@Test
-	public void commit() throws DockerException {
-
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("touch", "/test").exec();
-		
-		LOG.info("Created container: {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
-		dockerClient.startContainerCmd(container.getId()).exec();
-
-		LOG.info("Commiting container: {}", container.toString());
-		String imageId = dockerClient
-				.commitCmd(container.getId()).exec();
-
-		InspectImageResponse inspectImageResponse = dockerClient
-				.inspectImageCmd(imageId).exec();
-		LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-
-		assertThat(inspectImageResponse,
-				hasField("container", startsWith(container.getId())));
-		assertThat(inspectImageResponse.getContainerConfig().getImage(),
-				equalTo("busybox"));
-
-		InspectImageResponse busyboxImg = dockerClient.inspectImageCmd("busybox").exec();
-
-		assertThat(inspectImageResponse.getParent(),
-				equalTo(busyboxImg.getId()));
-	}
-	
-	
-	@Test
-	public void commitNonExistingContainer() throws DockerException {
-		try {
-			dockerClient.commitCmd("non-existent").exec();
-			fail("expected NotFoundException");
-		} catch (NotFoundException e) {
-		}
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void commit() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("touch", "/test").exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        LOG.info("Commiting container: {}", container.toString());
+        String imageId = dockerClient.commitCmd(container.getId()).exec();
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+        assertThat(inspectImageResponse, hasField("container", startsWith(container.getId())));
+        assertThat(inspectImageResponse.getContainerConfig().getImage(), equalTo("busybox"));
+
+        InspectImageResponse busyboxImg = dockerClient.inspectImageCmd("busybox").exec();
+
+        assertThat(inspectImageResponse.getParent(), equalTo(busyboxImg.getId()));
+    }
+
+    @Test
+    public void commitNonExistingContainer() throws DockerException {
+        try {
+            dockerClient.commitCmd("non-existent").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
index 58c95486c..e94c8c6c2 100644
--- a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
@@ -26,56 +26,53 @@
 @Test(groups = "integration")
 public class ContainerDiffCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-
-	@Test(groups = "ignoreInCircleCi")
-	public void testContainerDiff() throws DockerException {
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("touch", "/test" ).exec();
-		LOG.info("Created container: {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
-		dockerClient.startContainerCmd(container.getId()).exec();
-		
-		int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
-		assertThat(exitCode, equalTo(0));
-
-		List<ChangeLog> filesystemDiff = dockerClient.containerDiffCmd(container.getId()).exec();
-		LOG.info("Container DIFF: {}", filesystemDiff.toString());
-
-		assertThat(filesystemDiff.size(), equalTo(1));
-		ChangeLog testChangeLog = selectUnique(filesystemDiff,
-				hasField("path", equalTo("/test")));
-
-		assertThat(testChangeLog, hasField("path", equalTo("/test")));
-		assertThat(testChangeLog, hasField("kind", equalTo(1)));
-	}
-	
-	@Test
-	public void testContainerDiffWithNonExistingContainer() throws DockerException {
-		try {
-			dockerClient.containerDiffCmd("non-existing").exec();
-			fail("expected NotFoundException");
-		} catch (NotFoundException e) {
-		}
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void testContainerDiff() throws DockerException {
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("touch", "/test").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
+        assertThat(exitCode, equalTo(0));
+
+        List<ChangeLog> filesystemDiff = dockerClient.containerDiffCmd(container.getId()).exec();
+        LOG.info("Container DIFF: {}", filesystemDiff.toString());
+
+        assertThat(filesystemDiff.size(), equalTo(1));
+        ChangeLog testChangeLog = selectUnique(filesystemDiff, hasField("path", equalTo("/test")));
+
+        assertThat(testChangeLog, hasField("path", equalTo("/test")));
+        assertThat(testChangeLog, hasField("kind", equalTo(1)));
+    }
+
+    @Test
+    public void testContainerDiffWithNonExistingContainer() throws DockerException {
+        try {
+            dockerClient.containerDiffCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
index 193b787ce..72a97d04c 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
@@ -40,9 +40,7 @@ public void afterMethod(ITestResult result) {
     public void copyFromContainer() throws Exception {
         // TODO extract this into a shared method
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withName("docker-java-itest-copyFromContainer")
-                .withCmd("touch", "/copyFromContainer")
-                .exec();
+                .withName("docker-java-itest-copyFromContainer").withCmd("touch", "/copyFromContainer").exec();
 
         LOG.info("Created container: {}", container);
         assertThat(container.getId(), not(isEmptyOrNullString()));
@@ -58,7 +56,7 @@ public void copyFromContainer() throws Exception {
         assertNotNull(responseAsString);
         assertTrue(responseAsString.length() > 0);
     }
-    
+
     @Test
     public void copyFromNonExistingContainer() throws Exception {
         try {
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index c652f51d7..a33cfddfe 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -23,546 +23,471 @@
 @Test(groups = "integration")
 public class CreateContainerCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-
-	@Test
-	public void createContainerWithExistingName() throws DockerException {
-
-		String containerName = "generated_" + new SecureRandom().nextInt();
-
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("env")
-				.withName(containerName).exec();
-
-		LOG.info("Created container {}", container.toString());
-
-		assertThat(container.getId(), not(isEmptyString()));
-
-		try {
-			dockerClient.createContainerCmd("busybox").withCmd("env")
-					.withName(containerName).exec();
-			fail("expected ConflictException");
-		} catch (ConflictException e) {
-		}
-	}
-
-	@Test
-	public void createContainerWithVolume() throws DockerException {
-
-		Volume volume = new Volume("/var/log");
-		
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox")
-				.withVolumes(volume).withCmd("true").exec();
-
-		LOG.info("Created container {}", container.toString());
-
-		assertThat(container.getId(), not(isEmptyString()));
-
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
-
-		LOG.info("Inspect container {}", inspectContainerResponse.getConfig()
-				.getVolumes());
-
-		assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(),
-				contains("/var/log"));
-		
-		assertThat(inspectContainerResponse.getVolumesRW(),
-				hasItemInArray(new VolumeRW(volume, AccessMode.rw)));
-	}
-	
-	@Test
-	public void createContainerWithReadOnlyVolume() throws DockerException {
-
-		Volume volume = new Volume("/srv/test");
-		
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox")
-				.withVolumes(volume)
-				.withCmd("true")
-				.exec();
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
-		LOG.info("Created container {}", container.toString());
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
 
-		assertThat(container.getId(), not(isEmptyString()));
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
 
-		LOG.info("Inspect container {}", inspectContainerResponse.getConfig()
-				.getVolumes());
+    @Test
+    public void createContainerWithExistingName() throws DockerException {
 
-		assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(),
-				contains("/srv/test"));
-		
-		assertThat(Arrays.asList(inspectContainerResponse.getVolumesRW()),
-				contains(new VolumeRW(volume)));
-	}
-	
-	@Test
-	public void createContainerWithVolumesFrom() throws DockerException {
+        String containerName = "generated_" + new SecureRandom().nextInt();
 
-		Volume volume1 = new Volume("/opt/webapp1");
-		Volume volume2 = new Volume("/opt/webapp2");
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("env")
+                .withName(containerName).exec();
 
-		String container1Name = UUID.randomUUID().toString();
-		
-		// create a running container with bind mounts
-		CreateContainerResponse container1 = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999")
-				.withName(container1Name)
-				.withBinds(new Bind("/src/webapp1", volume1), new Bind("/src/webapp2", volume2))
-				.exec();
-		LOG.info("Created container1 {}", container1.toString());
+        LOG.info("Created container {}", container.toString());
 
-		dockerClient.startContainerCmd(container1.getId()).exec();
-		LOG.info("Started container1 {}", container1.toString());
+        assertThat(container.getId(), not(isEmptyString()));
 
-		InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(
-				container1.getId()).exec();
+        try {
+            dockerClient.createContainerCmd("busybox").withCmd("env").withName(containerName).exec();
+            fail("expected ConflictException");
+        } catch (ConflictException e) {
+        }
+    }
 
-		assertContainerHasVolumes(inspectContainerResponse1, volume1, volume2);
+    @Test
+    public void createContainerWithVolume() throws DockerException {
 
-		// create a second container with volumes from first container
-		CreateContainerResponse container2 = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999")
-				.withVolumesFrom(new VolumesFrom(container1Name)).exec();
-		LOG.info("Created container2 {}", container2.toString());
+        Volume volume = new Volume("/var/log");
 
-		InspectContainerResponse inspectContainerResponse2 = dockerClient
-				.inspectContainerCmd(container2.getId()).exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withVolumes(volume)
+                .withCmd("true").exec();
 
-		// No volumes are created, the information is just stored in .HostConfig.VolumesFrom
-		assertThat(inspectContainerResponse2.getHostConfig().getVolumesFrom(), hasItemInArray(new VolumesFrom(container1Name)));
+        LOG.info("Created container {}", container.toString());
 
-		// To ensure that the information stored in VolumesFrom really is considered
-		// when starting the container, we start it and verify that it has the same 
-		// bind mounts as the first container.
-		// This is somehow out of scope here, but it helped me to understand how the
-		// VolumesFrom feature really works.
-		dockerClient.startContainerCmd(container2.getId()).exec();
-		LOG.info("Started container2 {}", container2.toString());
-		
-		inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId()).exec();
+        assertThat(container.getId(), not(isEmptyString()));
 
-		assertThat(inspectContainerResponse2.getHostConfig().getVolumesFrom(), hasItemInArray(new VolumesFrom(container1Name)));
-		assertContainerHasVolumes(inspectContainerResponse2, volume1, volume2);
-	}
-
-	@Test
-	public void createContainerWithEnv() throws DockerException {
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withEnv("VARIABLE=success")
-				.withCmd("env").exec();
-
-		LOG.info("Created container {}", container.toString());
-
-		assertThat(container.getId(), not(isEmptyString()));
-
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
-
-		assertThat(
-				Arrays.asList(inspectContainerResponse.getConfig().getEnv()),
-				containsInAnyOrder("VARIABLE=success"));
+        LOG.info("Inspect container {}", inspectContainerResponse.getConfig().getVolumes());
 
-		dockerClient.startContainerCmd(container.getId()).exec();
+        assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(), contains("/var/log"));
 
-		assertThat(asString(dockerClient.logContainerCmd(container.getId())
-				.withStdOut().exec()), containsString("VARIABLE=success"));
-	}
+        assertThat(inspectContainerResponse.getVolumesRW(), hasItemInArray(new VolumeRW(volume, AccessMode.rw)));
+    }
 
-	@Test
-	public void createContainerWithHostname() throws DockerException {
+    @Test
+    public void createContainerWithReadOnlyVolume() throws DockerException {
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withHostName("docker-java")
-				.withCmd("env").exec();
+        Volume volume = new Volume("/srv/test");
 
-		LOG.info("Created container {}", container.toString());
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withVolumes(volume)
+                .withCmd("true").exec();
 
-		assertThat(container.getId(), not(isEmptyString()));
+        LOG.info("Created container {}", container.toString());
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        assertThat(container.getId(), not(isEmptyString()));
 
-		assertThat(inspectContainerResponse.getConfig().getHostName(),
-				equalTo("docker-java"));
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		dockerClient.startContainerCmd(container.getId()).exec();
+        LOG.info("Inspect container {}", inspectContainerResponse.getConfig().getVolumes());
 
-		assertThat(asString(dockerClient.logContainerCmd(container.getId())
-				.withStdOut().exec()), containsString("HOSTNAME=docker-java"));
-	}
+        assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(), contains("/srv/test"));
 
-	@Test
-	public void createContainerWithName() throws DockerException {
+        assertThat(Arrays.asList(inspectContainerResponse.getVolumesRW()), contains(new VolumeRW(volume)));
+    }
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withName("container")
-				.withCmd("env").exec();
+    @Test
+    public void createContainerWithVolumesFrom() throws DockerException {
 
-		LOG.info("Created container {}", container.toString());
+        Volume volume1 = new Volume("/opt/webapp1");
+        Volume volume2 = new Volume("/opt/webapp2");
 
-		assertThat(container.getId(), not(isEmptyString()));
+        String container1Name = UUID.randomUUID().toString();
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        // create a running container with bind mounts
+        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName(container1Name)
+                .withBinds(new Bind("/src/webapp1", volume1), new Bind("/src/webapp2", volume2)).exec();
+        LOG.info("Created container1 {}", container1.toString());
 
-		assertThat(inspectContainerResponse.getName(), equalTo("/container"));
+        dockerClient.startContainerCmd(container1.getId()).exec();
+        LOG.info("Started container1 {}", container1.toString());
 
-		try {
-			dockerClient.createContainerCmd("busybox").withName("container")
-					.withCmd("env").exec();
-			fail("Expected ConflictException");
-		} catch (ConflictException e) {
-		}
+        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+                .exec();
 
-	}
-	
-	@Test
-	public void createContainerWithLink() throws DockerException {
-	    
-		CreateContainerResponse container1 = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999").withName("container1").exec();
-		LOG.info("Created container1 {}", container1.toString());
-		assertThat(container1.getId(), not(isEmptyString()));
-		
-		dockerClient.startContainerCmd(container1.getId()).exec();
+        assertContainerHasVolumes(inspectContainerResponse1, volume1, volume2);
 
-		InspectContainerResponse inspectContainerResponse1 = dockerClient
-				.inspectContainerCmd(container1.getId()).exec();
-		LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
-		assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
+        // create a second container with volumes from first container
+        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withVolumesFrom(new VolumesFrom(container1Name)).exec();
+        LOG.info("Created container2 {}", container2.toString());
 
-		HostConfig hostConfig = new HostConfig();
-		hostConfig.setLinks(new Link("container1", "container1Link"));
-		CreateContainerResponse container2 = dockerClient
-				.createContainerCmd("busybox").withName("container2").withHostConfig(hostConfig)
-				.withCmd("env").exec();
-		LOG.info("Created container {}", container2.toString());
-		assertThat(container2.getId(), not(isEmptyString()));
+        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+                .exec();
 
-		InspectContainerResponse inspectContainerResponse2 = dockerClient
-				.inspectContainerCmd(container2.getId()).exec();
-		assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link("container1","container1Link")}));
-	}
+        // No volumes are created, the information is just stored in .HostConfig.VolumesFrom
+        assertThat(inspectContainerResponse2.getHostConfig().getVolumesFrom(), hasItemInArray(new VolumesFrom(
+                container1Name)));
 
-	@Test
-	public void createContainerWithCapAddAndCapDrop() throws DockerException {
+        // To ensure that the information stored in VolumesFrom really is considered
+        // when starting the container, we start it and verify that it has the same
+        // bind mounts as the first container.
+        // This is somehow out of scope here, but it helped me to understand how the
+        // VolumesFrom feature really works.
+        dockerClient.startContainerCmd(container2.getId()).exec();
+        LOG.info("Started container2 {}", container2.toString());
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox")
-				.withCapAdd(NET_ADMIN)
-				.withCapDrop(MKNOD).exec();
+        inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId()).exec();
 
-		LOG.info("Created container {}", container.toString());
+        assertThat(inspectContainerResponse2.getHostConfig().getVolumesFrom(), hasItemInArray(new VolumesFrom(
+                container1Name)));
+        assertContainerHasVolumes(inspectContainerResponse2, volume1, volume2);
+    }
 
-		assertThat(container.getId(), not(isEmptyString()));
+    @Test
+    public void createContainerWithEnv() throws DockerException {
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withEnv("VARIABLE=success")
+                .withCmd("env").exec();
 
-		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig()
-				.getCapAdd()), contains(NET_ADMIN));
+        LOG.info("Created container {}", container.toString());
 
-		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig()
-				.getCapDrop()), contains(MKNOD));
-	}
+        assertThat(container.getId(), not(isEmptyString()));
 
-	@Test
-	public void createContainerWithDns() throws DockerException {
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		String aDnsServer = "8.8.8.8";
-		String anotherDnsServer = "8.8.4.4";
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), containsInAnyOrder("VARIABLE=success"));
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox")
-				.withCmd("true").withDns(aDnsServer, anotherDnsServer).exec();
+        dockerClient.startContainerCmd(container.getId()).exec();
 
-		LOG.info("Created container {}", container.toString());
+        assertThat(asString(dockerClient.logContainerCmd(container.getId()).withStdOut().exec()),
+                containsString("VARIABLE=success"));
+    }
 
-		assertThat(container.getId(), not(isEmptyString()));
+    @Test
+    public void createContainerWithHostname() throws DockerException {
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withHostName("docker-java")
+                .withCmd("env").exec();
 
-		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()),
-				contains(aDnsServer, anotherDnsServer));
-	}
-	
-	@Test
-	public void createContainerWithEntrypoint() throws DockerException {
+        LOG.info("Created container {}", container.toString());
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withName("container")
-				.withEntrypoint("sleep", "9999").exec();
+        assertThat(container.getId(), not(isEmptyString()));
 
-		LOG.info("Created container {}", container.toString());
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		assertThat(container.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse.getConfig().getHostName(), equalTo("docker-java"));
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        dockerClient.startContainerCmd(container.getId()).exec();
 
-		assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEntrypoint()), contains("sleep", "9999"));
+        assertThat(asString(dockerClient.logContainerCmd(container.getId()).withStdOut().exec()),
+                containsString("HOSTNAME=docker-java"));
+    }
 
-	}
+    @Test
+    public void createContainerWithName() throws DockerException {
 
-	@Test
-	public void createContainerWithExtraHosts() throws DockerException {
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
+                .withCmd("env").exec();
 
-		String[] extraHosts = {"dockerhost:127.0.0.1", "otherhost:10.0.0.1"};
+        LOG.info("Created container {}", container.toString());
 
-		HostConfig hostConfig = new HostConfig();
-		hostConfig.setExtraHosts(extraHosts);
+        assertThat(container.getId(), not(isEmptyString()));
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withName("container")
-				.withHostConfig(hostConfig).exec();
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		LOG.info("Created container {}", container.toString());
+        assertThat(inspectContainerResponse.getName(), equalTo("/container"));
 
-		assertThat(container.getId(), not(isEmptyString()));
+        try {
+            dockerClient.createContainerCmd("busybox").withName("container").withCmd("env").exec();
+            fail("Expected ConflictException");
+        } catch (ConflictException e) {
+        }
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+    }
 
-		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getExtraHosts()),
-				containsInAnyOrder("dockerhost:127.0.0.1", "otherhost:10.0.0.1"));
-	}
-	
-	@Test
-	public void createContainerWithDevices() throws DockerException {
+    @Test
+    public void createContainerWithLink() throws DockerException {
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999")
-				.withDevices(new Device("rwm", "/dev/nulo", "/dev/zero"))
-				.exec();
+        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName("container1").exec();
+        LOG.info("Created container1 {}", container1.toString());
+        assertThat(container1.getId(), not(isEmptyString()));
 
-		LOG.info("Created container {}", container.toString());
+        dockerClient.startContainerCmd(container1.getId()).exec();
 
-		assertThat(container.getId(), not(isEmptyString()));
+        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+                .exec();
+        LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
+        assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        HostConfig hostConfig = new HostConfig();
+        hostConfig.setLinks(new Link("container1", "container1Link"));
+        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withName("container2")
+                .withHostConfig(hostConfig).withCmd("env").exec();
+        LOG.info("Created container {}", container2.toString());
+        assertThat(container2.getId(), not(isEmptyString()));
 
-		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig()
-				.getDevices()), contains(new Device("rwm", "/dev/nulo",
-				"/dev/zero")));
-	}
-	
-	@Test
-	public void createContainerWithPortBindings() throws DockerException {
+        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+                .exec();
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
+                "container1Link") }));
+    }
 
-		ExposedPort tcp22 = ExposedPort.tcp(22);
-		ExposedPort tcp23 = ExposedPort.tcp(23);
-		
-		Ports portBindings = new Ports();
-		portBindings.bind(tcp22, Ports.Binding(11022));
-		portBindings.bind(tcp23, Ports.Binding(11023));
-		portBindings.bind(tcp23, Ports.Binding(11024));
+    @Test
+    public void createContainerWithCapAddAndCapDrop() throws DockerException {
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("true")
-				.withExposedPorts(tcp22, tcp23)
-				.withPortBindings(portBindings)
-				.exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCapAdd(NET_ADMIN)
+                .withCapDrop(MKNOD).exec();
 
-		LOG.info("Created container {}", container.toString());
+        LOG.info("Created container {}", container.toString());
 
-		assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(isEmptyString()));
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		assertThat(Arrays.asList(inspectContainerResponse.getConfig()
-				.getExposedPorts()), contains(tcp22, tcp23));
-
-		assertThat(inspectContainerResponse.getHostConfig().getPortBindings()
-				.getBindings().get(tcp22)[0], is(equalTo(Ports.Binding(11022))));
-
-		assertThat(inspectContainerResponse.getHostConfig().getPortBindings()
-				.getBindings().get(tcp23)[0], is(equalTo(Ports.Binding(11023))));
-
-		assertThat(inspectContainerResponse.getHostConfig().getPortBindings()
-				.getBindings().get(tcp23)[1], is(equalTo(Ports.Binding(11024))));
-
-	}
-	
-	@Test
-	public void createContainerWithLinking() throws DockerException {
-
-		CreateContainerResponse container1 = dockerClient
-				.createContainerCmd("busybox")
-				.withCmd("sleep", "9999")
-				.withName("container1").exec();
-
-		LOG.info("Created container1 {}", container1.toString());
-		assertThat(container1.getId(), not(isEmptyString()));
-
-		dockerClient.startContainerCmd(container1.getId()).exec();
-
-		InspectContainerResponse inspectContainerResponse1 = dockerClient
-				.inspectContainerCmd(container1.getId()).exec();
-		LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
-
-		assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
-		assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
-		assertThat(inspectContainerResponse1.getId(),
-				startsWith(container1.getId()));
-		assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
-		assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
-		assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
-		assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
-
-		if (!inspectContainerResponse1.getState().isRunning()) {
-			assertThat(inspectContainerResponse1.getState().getExitCode(),
-					is(equalTo(0)));
-		}
-
-		CreateContainerResponse container2 = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999")
-				.withName("container2")
-				.withLinks(new Link("container1", "container1Link"))
-				.exec();
-
-		LOG.info("Created container2 {}", container2.toString());
-		assertThat(container2.getId(), not(isEmptyString()));
-		
-		InspectContainerResponse inspectContainerResponse2 = dockerClient
-				.inspectContainerCmd(container2.getId()).exec();
-		LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
-
-		assertThat(inspectContainerResponse2.getConfig(), is(notNullValue()));
-		assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
-		assertThat(inspectContainerResponse2.getHostConfig(),
-				is(notNullValue()));
-		assertThat(inspectContainerResponse2.getHostConfig().getLinks(),
-				is(notNullValue()));
-		assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
-				"container1Link") }));
-		assertThat(inspectContainerResponse2.getId(),
-				startsWith(container2.getId()));
-		assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
-		assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
-		
-
-	}
-	
-	@Test
-	public void createContainerWithRestartPolicy() throws DockerException {
-
-		RestartPolicy restartPolicy = RestartPolicy.onFailureRestart(5);
-		
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox")
-				.withCmd("sleep", "9999")
-				.withRestartPolicy(restartPolicy)
-				.exec();
-
-		LOG.info("Created container {}", container.toString());
-
-		assertThat(container.getId(), not(isEmptyString()));
-
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
-
-		assertThat(inspectContainerResponse.getHostConfig().getRestartPolicy(),
-				is(equalTo(restartPolicy)));
-	}
-
-	/**
-	 * This tests support for --net option for the docker run command:
-	 * --net="bridge" Set the Network mode for the container 'bridge': creates a
-	 * new network stack for the container on the docker bridge 'none': no
-	 * networking for this container 'container:': reuses another container
-	 * network stack 'host': use the host network stack inside the container.
-	 * Note: the host mode gives the container full access to local system
-	 * services such as D-bus and is therefore considered insecure.
-	 */
-	@Test
-	public void createContainerWithNetworkMode() throws DockerException {
-
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox")
-				.withCmd("true")
-				.withNetworkMode("host")
-				.exec();
-
-		LOG.info("Created container {}", container.toString());
-
-		assertThat(container.getId(), not(isEmptyString()));
-
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
-
-		assertThat(inspectContainerResponse.getHostConfig().getNetworkMode(),
-				is(equalTo("host")));
-	}
-	
-	@Test
-	public void createContainerWithMacAddress() throws DockerException {
-
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox")
-				.withMacAddress("00:80:41:ae:fd:7e")
-				.withCmd("true")
-				.exec();
-
-		LOG.info("Created container {}", container.toString());
-
-		assertThat(container.getId(), not(isEmptyString()));
-
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
-
-		assertEquals(inspectContainerResponse.getConfig().getMacAddress(),
-				"00:80:41:ae:fd:7e");
-	}
-
-	@Test(groups = "ignoreInCircleCi")
-	public void createContainerWithULimits() throws DockerException {
-
-		Ulimit[] ulimits = {new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096)};
-
-		HostConfig hostConfig = new HostConfig();
-		hostConfig.setUlimits(ulimits);
-
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withName("container")
-				.withHostConfig(hostConfig).exec();
-
-		LOG.info("Created container {}", container.toString());
-
-		assertThat(container.getId(), not(isEmptyString()));
-
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getCapAdd()), contains(NET_ADMIN));
 
-		assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getUlimits()),
-				containsInAnyOrder(new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096)));
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getCapDrop()), contains(MKNOD));
+    }
+
+    @Test
+    public void createContainerWithDns() throws DockerException {
+
+        String aDnsServer = "8.8.8.8";
+        String anotherDnsServer = "8.8.4.4";
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withDns(aDnsServer, anotherDnsServer).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()),
+                contains(aDnsServer, anotherDnsServer));
+    }
+
+    @Test
+    public void createContainerWithEntrypoint() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
+                .withEntrypoint("sleep", "9999").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEntrypoint()), contains("sleep", "9999"));
+
+    }
+
+    @Test
+    public void createContainerWithExtraHosts() throws DockerException {
+
+        String[] extraHosts = { "dockerhost:127.0.0.1", "otherhost:10.0.0.1" };
+
+        HostConfig hostConfig = new HostConfig();
+        hostConfig.setExtraHosts(extraHosts);
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
+                .withHostConfig(hostConfig).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getExtraHosts()),
+                containsInAnyOrder("dockerhost:127.0.0.1", "otherhost:10.0.0.1"));
+    }
+
+    @Test
+    public void createContainerWithDevices() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withDevices(new Device("rwm", "/dev/nulo", "/dev/zero")).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDevices()), contains(new Device("rwm",
+                "/dev/nulo", "/dev/zero")));
+    }
+
+    @Test
+    public void createContainerWithPortBindings() throws DockerException {
+
+        ExposedPort tcp22 = ExposedPort.tcp(22);
+        ExposedPort tcp23 = ExposedPort.tcp(23);
+
+        Ports portBindings = new Ports();
+        portBindings.bind(tcp22, Ports.Binding(11022));
+        portBindings.bind(tcp23, Ports.Binding(11023));
+        portBindings.bind(tcp23, Ports.Binding(11024));
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
+
+        assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
+                is(equalTo(Ports.Binding(11022))));
+
+        assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
+                is(equalTo(Ports.Binding(11023))));
+
+        assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
+                is(equalTo(Ports.Binding(11024))));
+
+    }
+
+    @Test
+    public void createContainerWithLinking() throws DockerException {
+
+        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName("container1").exec();
+
+        LOG.info("Created container1 {}", container1.toString());
+        assertThat(container1.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container1.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+                .exec();
+        LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
+
+        assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId()));
+        assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
+        assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
+        assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
+
+        if (!inspectContainerResponse1.getState().isRunning()) {
+            assertThat(inspectContainerResponse1.getState().getExitCode(), is(equalTo(0)));
+        }
+
+        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName("container2").withLinks(new Link("container1", "container1Link")).exec();
+
+        LOG.info("Created container2 {}", container2.toString());
+        assertThat(container2.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+                .exec();
+        LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
+
+        assertThat(inspectContainerResponse2.getConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
+                "container1Link") }));
+        assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
+        assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
+        assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
+
+    }
+
+    @Test
+    public void createContainerWithRestartPolicy() throws DockerException {
+
+        RestartPolicy restartPolicy = RestartPolicy.onFailureRestart(5);
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withRestartPolicy(restartPolicy).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getHostConfig().getRestartPolicy(), is(equalTo(restartPolicy)));
+    }
+
+    /**
+     * This tests support for --net option for the docker run command: --net="bridge" Set the Network mode for the
+     * container 'bridge': creates a new network stack for the container on the docker bridge 'none': no networking for
+     * this container 'container:': reuses another container network stack 'host': use the host network stack inside the
+     * container. Note: the host mode gives the container full access to local system services such as D-bus and is
+     * therefore considered insecure.
+     */
+    @Test
+    public void createContainerWithNetworkMode() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withNetworkMode("host").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getHostConfig().getNetworkMode(), is(equalTo("host")));
+    }
+
+    @Test
+    public void createContainerWithMacAddress() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withMacAddress("00:80:41:ae:fd:7e").withCmd("true").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertEquals(inspectContainerResponse.getConfig().getMacAddress(), "00:80:41:ae:fd:7e");
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void createContainerWithULimits() throws DockerException {
+
+        Ulimit[] ulimits = { new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096) };
+
+        HostConfig hostConfig = new HostConfig();
+        hostConfig.setUlimits(ulimits);
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
+                .withHostConfig(hostConfig).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getUlimits()),
+                containsInAnyOrder(new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096)));
+
+    }
 
-	}
-	
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
index 53131c611..2d6ec9522 100644
--- a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
+++ b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -22,9 +22,13 @@
 public class DockerfileFixture implements AutoCloseable {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DockerfileFixture.class);
+
     private final DockerClient dockerClient;
+
     private String directory;
+
     private String repository;
+
     private String containerId;
 
     public DockerfileFixture(DockerClient dockerClient, String directory) {
@@ -35,35 +39,27 @@ public DockerfileFixture(DockerClient dockerClient, String directory) {
     public void open() throws IOException {
 
         LOGGER.info("building {}", directory);
-        InputStream response = dockerClient
-                .buildImageCmd(new File("src/test/resources", directory))
-                .withNoCache() // remove alternatives, cause problems
+        InputStream response = dockerClient.buildImageCmd(new File("src/test/resources", directory)).withNoCache() // remove
+                                                                                                                   // alternatives,
+                                                                                                                   // cause
+                                                                                                                   // problems
                 .exec();
-        
+
         String log = AbstractDockerClientTest.consumeAsString(response);
-        
+
         assertThat(log, containsString("Successfully built"));
 
-        Image lastCreatedImage = dockerClient
-                .listImagesCmd()
-                .exec()
-                .get(0);
+        Image lastCreatedImage = dockerClient.listImagesCmd().exec().get(0);
 
-        repository = lastCreatedImage
-                .getRepoTags()[0];
+        repository = lastCreatedImage.getRepoTags()[0];
 
         LOGGER.info("created {} {}", lastCreatedImage.getId(), repository);
 
-        containerId = dockerClient
-                .createContainerCmd(lastCreatedImage.getId())
-                .exec()
-                .getId();
+        containerId = dockerClient.createContainerCmd(lastCreatedImage.getId()).exec().getId();
 
         LOGGER.info("starting {}", containerId);
 
-        dockerClient
-                .startContainerCmd(containerId)
-                .exec();
+        dockerClient.startContainerCmd(containerId).exec();
     }
 
     @Override
@@ -72,9 +68,7 @@ public void close() throws Exception {
         if (containerId != null) {
             LOGGER.info("removing container {}", containerId);
             try {
-                dockerClient
-                        .removeContainerCmd(containerId)
-                        .withForce() // stop too
+                dockerClient.removeContainerCmd(containerId).withForce() // stop too
                         .exec();
             } catch (NotFoundException | InternalServerErrorException ignored) {
                 LOGGER.info("ignoring {}", ignored.getMessage());
@@ -85,10 +79,7 @@ public void close() throws Exception {
         if (repository != null) {
             LOGGER.info("removing repository {}", repository);
             try {
-                dockerClient
-                        .removeImageCmd(repository)
-                        .withForce()
-                        .exec();
+                dockerClient.removeImageCmd(repository).withForce().exec();
             } catch (NotFoundException | InternalServerErrorException e) {
                 LOGGER.info("ignoring {}", e.getMessage());
             }
diff --git a/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java b/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
index 07bca25b5..c311540b1 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
@@ -17,9 +17,8 @@
 import static org.hamcrest.core.IsNull.nullValue;
 import static org.testng.AssertJUnit.assertNull;
 
-
 @Test(groups = "integration")
-public class EventStreamReaderITest  {
+public class EventStreamReaderITest {
 
     private DockerClient dockerClient;
 
@@ -36,17 +35,13 @@ public void tearDown() throws Exception {
     @Test(groups = "ignoreInCircleCi")
     public void pullCanBeStreamed() throws Exception {
 
-        try (EventStreamReader<PullEventStreamItem> reader = new EventStreamReader<>(
-                dockerClient.pullImageCmd("busybox:latest").exec(),
-                PullEventStreamItem.class)
-        ) {;
-            assertThat(reader.readItem(),
-                    allOf(
-                            hasProperty("status", equalTo("Pulling from busybox")),
-                            hasProperty("progress", nullValue()),
-                            hasProperty("progressDetail", nullValue())
-                    )
-                );
+        try (EventStreamReader<PullEventStreamItem> reader = new EventStreamReader<>(dockerClient.pullImageCmd(
+                "busybox:latest").exec(), PullEventStreamItem.class)) {
+            ;
+            assertThat(
+                    reader.readItem(),
+                    allOf(hasProperty("status", equalTo("Pulling from busybox")), hasProperty("progress", nullValue()),
+                            hasProperty("progressDetail", nullValue())));
             assertNull(reader.readItem());
         }
     }
@@ -54,17 +49,12 @@ public void pullCanBeStreamed() throws Exception {
     @Test
     public void buildCanBeStreamed() throws Exception {
 
-        try (EventStreamReader<EventStreamItem> reader = new EventStreamReader<>(
-                dockerClient.buildImageCmd(new File("src/test/resources/eventStreamReaderDockerfile")).exec(),
-                EventStreamItem.class)
-        ) {
-            assertThat(reader.readItem(),
-                    allOf(
-                            hasProperty("stream", equalTo("Step 0 : FROM busybox:latest\n")),
-                            hasProperty("error", nullValue()),
-                            hasProperty("errorDetail", nullValue())
-                    )
-            );
+        try (EventStreamReader<EventStreamItem> reader = new EventStreamReader<>(dockerClient.buildImageCmd(
+                new File("src/test/resources/eventStreamReaderDockerfile")).exec(), EventStreamItem.class)) {
+            assertThat(
+                    reader.readItem(),
+                    allOf(hasProperty("stream", equalTo("Step 0 : FROM busybox:latest\n")),
+                            hasProperty("error", nullValue()), hasProperty("errorDetail", nullValue())));
             assertNull(reader.readItem());
 
         }
diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
index 0d61c8f59..e19d4f1fc 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -26,147 +26,144 @@
 @Test(groups = "integration")
 public class EventsCmdImplTest extends AbstractDockerClientTest {
 
-	private static int KNOWN_NUM_EVENTS = 4;
-
-	private static String getEpochTime() {
-		return String.valueOf(System.currentTimeMillis() / 1000);
-	}
-
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-
-	@Test
-	public void testEventStreamTimeBound() throws InterruptedException,
-			IOException {
-		// Don't include other tests events
-		TimeUnit.SECONDS.sleep(1);
-
-		String startTime = getEpochTime();
-		int expectedEvents = generateEvents();
-		String endTime = getEpochTime();
-
-		CountDownLatch countDownLatch = new CountDownLatch(expectedEvents);
-		EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
-
-		EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback)
-				.withSince(startTime).withUntil(endTime);
-		ExecutorService executorService = eventsCmd.exec();
-
-		boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
-
-		executorService.shutdown();
-		eventCallback.close();
-
-		assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
-	}
-
-	@Test
-	public void testEventStreaming1() throws InterruptedException, IOException {
-		// Don't include other tests events
-		TimeUnit.SECONDS.sleep(1);
-
-		CountDownLatch countDownLatch = new CountDownLatch(KNOWN_NUM_EVENTS);
-		EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
-
-		EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback).withSince(
-				getEpochTime());
-		ExecutorService executorService = eventsCmd.exec();
-
-		generateEvents();
-
-		boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
-		executorService.shutdown();
-		eventCallback.close();
-		assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
-	}
-
-	@Test(groups = "ignoreInCircleCi")
-	public void testEventStreaming2() throws InterruptedException, IOException {
-		// Don't include other tests events
-		TimeUnit.SECONDS.sleep(1);
-
-		CountDownLatch countDownLatch = new CountDownLatch(KNOWN_NUM_EVENTS);
-		EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
-
-		EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback).withSince(
-				getEpochTime());
-		ExecutorService executorService = eventsCmd.exec();
-
-		generateEvents();
-
-		boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
-		executorService.shutdown();
-		eventCallback.close();
-		assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
-	}
-
-	/**
-	 * This method generates {#link KNOWN_NUM_EVENTS} events
-	 */
-	private int generateEvents() {
-		String testImage = "busybox";
-		asString(dockerClient.pullImageCmd(testImage).exec());
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd(testImage).withCmd("sleep", "9999").exec();
-		dockerClient.startContainerCmd(container.getId()).exec();
-		dockerClient.stopContainerCmd(container.getId()).exec();
-		return KNOWN_NUM_EVENTS;
-	}
-
-	private class EventCallbackTest implements EventCallback {
-		private final CountDownLatch countDownLatch;
-		private final AtomicBoolean isReceiving = new AtomicBoolean(true);
-		private final List<Event> events = new ArrayList<Event>();
-
-		public EventCallbackTest(CountDownLatch countDownLatch) {
-			this.countDownLatch = countDownLatch;
-		}
-
-		public void close() {
-			isReceiving.set(false);
-		}
-
-		@Override
-		public void onEvent(Event event) {
-			LOG.info("Received event #{}: {}", countDownLatch.getCount(), event);
-			countDownLatch.countDown();
-			events.add(event);
-		}
-
-		@Override
-		public void onException(Throwable throwable) {
-			LOG.error("Error occurred: {}", throwable.getMessage());
-		}
-
-		@Override
-		public void onCompletion(int numEvents) {
-			LOG.info("Number of events received: {}", numEvents);
-		}
-
-		@Override
-		public boolean isReceiving() {
-			return isReceiving.get();
-		}
-
-		public List<Event> getEvents() {
-			return new ArrayList<Event>(events);
-		}
-	}
+    private static int KNOWN_NUM_EVENTS = 4;
+
+    private static String getEpochTime() {
+        return String.valueOf(System.currentTimeMillis() / 1000);
+    }
+
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void testEventStreamTimeBound() throws InterruptedException, IOException {
+        // Don't include other tests events
+        TimeUnit.SECONDS.sleep(1);
+
+        String startTime = getEpochTime();
+        int expectedEvents = generateEvents();
+        String endTime = getEpochTime();
+
+        CountDownLatch countDownLatch = new CountDownLatch(expectedEvents);
+        EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
+
+        EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback).withSince(startTime).withUntil(endTime);
+        ExecutorService executorService = eventsCmd.exec();
+
+        boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
+
+        executorService.shutdown();
+        eventCallback.close();
+
+        assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
+    }
+
+    @Test
+    public void testEventStreaming1() throws InterruptedException, IOException {
+        // Don't include other tests events
+        TimeUnit.SECONDS.sleep(1);
+
+        CountDownLatch countDownLatch = new CountDownLatch(KNOWN_NUM_EVENTS);
+        EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
+
+        EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback).withSince(getEpochTime());
+        ExecutorService executorService = eventsCmd.exec();
+
+        generateEvents();
+
+        boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
+        executorService.shutdown();
+        eventCallback.close();
+        assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void testEventStreaming2() throws InterruptedException, IOException {
+        // Don't include other tests events
+        TimeUnit.SECONDS.sleep(1);
+
+        CountDownLatch countDownLatch = new CountDownLatch(KNOWN_NUM_EVENTS);
+        EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
+
+        EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback).withSince(getEpochTime());
+        ExecutorService executorService = eventsCmd.exec();
+
+        generateEvents();
+
+        boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
+        executorService.shutdown();
+        eventCallback.close();
+        assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
+    }
+
+    /**
+     * This method generates {#link KNOWN_NUM_EVENTS} events
+     */
+    private int generateEvents() {
+        String testImage = "busybox";
+        asString(dockerClient.pullImageCmd(testImage).exec());
+        CreateContainerResponse container = dockerClient.createContainerCmd(testImage).withCmd("sleep", "9999").exec();
+        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerClient.stopContainerCmd(container.getId()).exec();
+        return KNOWN_NUM_EVENTS;
+    }
+
+    private class EventCallbackTest implements EventCallback {
+        private final CountDownLatch countDownLatch;
+
+        private final AtomicBoolean isReceiving = new AtomicBoolean(true);
+
+        private final List<Event> events = new ArrayList<Event>();
+
+        public EventCallbackTest(CountDownLatch countDownLatch) {
+            this.countDownLatch = countDownLatch;
+        }
+
+        public void close() {
+            isReceiving.set(false);
+        }
+
+        @Override
+        public void onEvent(Event event) {
+            LOG.info("Received event #{}: {}", countDownLatch.getCount(), event);
+            countDownLatch.countDown();
+            events.add(event);
+        }
+
+        @Override
+        public void onException(Throwable throwable) {
+            LOG.error("Error occurred: {}", throwable.getMessage());
+        }
+
+        @Override
+        public void onCompletion(int numEvents) {
+            LOG.info("Number of events received: {}", numEvents);
+        }
+
+        @Override
+        public boolean isReceiving() {
+            return isReceiving.get();
+        }
+
+        public List<Event> getEvents() {
+            return new ArrayList<Event>(events);
+        }
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java
index 028f4cac1..d5ec79307 100644
--- a/src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java
@@ -40,8 +40,7 @@ public void afterMethod(ITestResult result) {
     public void execCreateTest() {
         String containerName = "generated_" + new SecureRandom().nextInt();
 
-        CreateContainerResponse container = dockerClient
-                .createContainerCmd("busybox").withCmd("top")
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
                 .withName(containerName).exec();
 
         LOG.info("Created container {}", container.toString());
@@ -50,7 +49,8 @@ public void execCreateTest() {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId()).withCmd("touch","file.log").exec();
+        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
+                .withCmd("touch", "file.log").exec();
 
         assertThat(execCreateCmdResponse.getId(), not(isEmptyString()));
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
index 80619efeb..a80f0c86e 100644
--- a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
@@ -41,9 +41,7 @@ public void afterMethod(ITestResult result) {
     public void execStartTest() throws Exception {
         String containerName = "generated_" + new SecureRandom().nextInt();
 
-        CreateContainerResponse container = dockerClient
-                .createContainerCmd("busybox")
-                .withCmd("top")
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
                 .withName(containerName).exec();
         LOG.info("Created container {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
@@ -51,8 +49,7 @@ public void execStartTest() throws Exception {
         dockerClient.startContainerCmd(container.getId()).exec();
 
         ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
-            .withAttachStdout(true)
-            .withCmd("touch", "/execStartTest.log").exec();
+                .withAttachStdout(true).withCmd("touch", "/execStartTest.log").exec();
         dockerClient.execStartCmd(execCreateCmdResponse.getId()).exec();
 
         InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "/execStartTest.log").exec();
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index 24c833559..fca8ae3a2 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -18,80 +18,73 @@
 @Test(groups = "integration")
 public class FrameReaderITest {
 
-	private DockerClient dockerClient;
-	private DockerfileFixture dockerfileFixture;
-
-	@BeforeTest
-	public void beforeTest() throws Exception {
-		dockerClient = DockerClientBuilder.getInstance().build();
-		dockerfileFixture = new DockerfileFixture(dockerClient,
-				"frameReaderDockerfile");
-		dockerfileFixture.open();
-	}
-
-	@AfterTest
-	public void deleteDockerContainerImage() throws Exception {
-		dockerfileFixture.close();
-		dockerClient.close();
-	}
-
-	@Test
-	public void canCloseFrameReaderAndReadExpectedLines() throws Exception {
-
-		// wait for the container to be successfully executed 
-		int exitCode = dockerClient.waitContainerCmd(
-				dockerfileFixture.getContainerId()).exec();
-		assertEquals(0, exitCode);
-		
-		InputStream response = getLoggerStream();
-
-		try (FrameReader reader = new FrameReader(response)) {
-			assertEquals(reader.readFrame(), new Frame(StreamType.STDOUT,
-					"to stdout\n".getBytes()));
-			assertEquals(reader.readFrame(), new Frame(StreamType.STDERR,
-					"to stderr\n".getBytes()));
-			assertNull(reader.readFrame());
-		}
-	}
-
-	private InputStream getLoggerStream() {
-
-		return dockerClient.logContainerCmd(dockerfileFixture.getContainerId())
-				.withStdOut()
-				.withStdErr()
-				.withTailAll()
-				// we can't follow stream here as it blocks reading from resulting InputStream infinitely
-				//.withFollowStream()
-				.exec();
-	}
-
-	@Test
-	public void canLogInOneThreadAndExecuteCommandsInAnother() throws Exception {
-
-		Thread thread = new Thread(new Runnable() {
-			@Override
-			public void run() {
-				try {
-					try (FrameReader reader = new FrameReader(getLoggerStream())) {
-						// noinspection StatementWithEmptyBody
-						while (reader.readFrame() != null) {
-							// nop
-						}
-					}
-				} catch (IOException e) {
-					throw new RuntimeException(e);
-				}
-			}
-		});
-
-		thread.start();
-
-		try (DockerfileFixture busyboxDockerfile = new DockerfileFixture(
-				dockerClient, "busyboxDockerfile")) {
-			busyboxDockerfile.open();
-		}
-
-		thread.join();
-
-	}
+    private DockerClient dockerClient;
+
+    private DockerfileFixture dockerfileFixture;
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        dockerClient = DockerClientBuilder.getInstance().build();
+        dockerfileFixture = new DockerfileFixture(dockerClient, "frameReaderDockerfile");
+        dockerfileFixture.open();
+    }
+
+    @AfterTest
+    public void deleteDockerContainerImage() throws Exception {
+        dockerfileFixture.close();
+        dockerClient.close();
+    }
+
+    @Test
+    public void canCloseFrameReaderAndReadExpectedLines() throws Exception {
+
+        // wait for the container to be successfully executed
+        int exitCode = dockerClient.waitContainerCmd(dockerfileFixture.getContainerId()).exec();
+        assertEquals(0, exitCode);
+
+        InputStream response = getLoggerStream();
+
+        try (FrameReader reader = new FrameReader(response)) {
+            assertEquals(reader.readFrame(), new Frame(StreamType.STDOUT, "to stdout\n".getBytes()));
+            assertEquals(reader.readFrame(), new Frame(StreamType.STDERR, "to stderr\n".getBytes()));
+            assertNull(reader.readFrame());
+        }
+    }
+
+    private InputStream getLoggerStream() {
+
+        return dockerClient.logContainerCmd(dockerfileFixture.getContainerId()).withStdOut().withStdErr().withTailAll()
+        // we can't follow stream here as it blocks reading from resulting InputStream infinitely
+        // .withFollowStream()
+                .exec();
+    }
+
+    @Test
+    public void canLogInOneThreadAndExecuteCommandsInAnother() throws Exception {
+
+        Thread thread = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    try (FrameReader reader = new FrameReader(getLoggerStream())) {
+                        // noinspection StatementWithEmptyBody
+                        while (reader.readFrame() != null) {
+                            // nop
+                        }
+                    }
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        });
+
+        thread.start();
+
+        try (DockerfileFixture busyboxDockerfile = new DockerfileFixture(dockerClient, "busyboxDockerfile")) {
+            busyboxDockerfile.open();
+        }
+
+        thread.join();
+
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
index 2b5e2b644..10210c281 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
@@ -14,13 +14,16 @@
 
 public class FrameReaderTest {
     public static final int HEADER_SIZE = 8;
+
     private final List<Integer> bytes = new ArrayList<>();
+
     private final InputStream inputStream = new InputStream() {
         @Override
         public int read() throws IOException {
             return bytes.isEmpty() ? -1 : bytes.remove(0);
         }
     };
+
     private final FrameReader frameReader = new FrameReader(inputStream);
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
index 7170c12f3..19e275078 100644
--- a/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
@@ -21,53 +21,51 @@
 @Test(groups = "integration")
 public class InfoCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
 
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
 
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
 
-	@Test
-	public void info() throws DockerException {
+    @Test
+    public void info() throws DockerException {
         // Make sure that there is at least one container for the assertion
         // TODO extract this into a shared method
-    if (dockerClient.listContainersCmd().withShowAll(true).exec().size() == 0) {
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withName("docker-java-itest-info")
-                .withCmd("touch", "/test")
-                .exec();
+        if (dockerClient.listContainersCmd().withShowAll(true).exec().size() == 0) {
+            CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                    .withName("docker-java-itest-info").withCmd("touch", "/test").exec();
 
-        LOG.info("Created container: {}", container);
-        assertThat(container.getId(), not(isEmptyOrNullString()));
+            LOG.info("Created container: {}", container);
+            assertThat(container.getId(), not(isEmptyOrNullString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
-    }
+            dockerClient.startContainerCmd(container.getId()).exec();
+        }
 
-		Info dockerInfo = dockerClient.infoCmd().exec();
-		LOG.info(dockerInfo.toString());
+        Info dockerInfo = dockerClient.infoCmd().exec();
+        LOG.info(dockerInfo.toString());
 
-		assertTrue(dockerInfo.toString().contains("containers"));
-		assertTrue(dockerInfo.toString().contains("images"));
-		assertTrue(dockerInfo.toString().contains("debug"));
+        assertTrue(dockerInfo.toString().contains("containers"));
+        assertTrue(dockerInfo.toString().contains("images"));
+        assertTrue(dockerInfo.toString().contains("debug"));
 
-		assertTrue(dockerInfo.getContainers() > 0);
-		assertTrue(dockerInfo.getImages() > 0);
-		assertTrue(dockerInfo.getNFd() > 0);
-		assertTrue(dockerInfo.getNGoroutines() > 0);
-		assertTrue(dockerInfo.getNCPU() > 0);
-	}
+        assertTrue(dockerInfo.getContainers() > 0);
+        assertTrue(dockerInfo.getImages() > 0);
+        assertTrue(dockerInfo.getNFd() > 0);
+        assertTrue(dockerInfo.getNGoroutines() > 0);
+        assertTrue(dockerInfo.getNCPU() > 0);
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
index f1270f4e6..69f4d78e1 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
@@ -47,9 +47,7 @@ public void afterMethod(ITestResult result) {
     public void inspectExecTest() throws IOException {
         String containerName = "generated_" + new SecureRandom().nextInt();
 
-        CreateContainerResponse container = dockerClient
-                .createContainerCmd("busybox")
-                .withCmd("top")
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
                 .withName(containerName).exec();
         LOG.info("Created container {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
@@ -57,31 +55,25 @@ public void inspectExecTest() throws IOException {
         dockerClient.startContainerCmd(container.getId()).exec();
 
         ExecCreateCmdResponse touchFileCmdCreateResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout()
-                .withAttachStderr()
-                .withCmd("touch", "/marker").exec();
+                .withAttachStdout().withAttachStderr().withCmd("touch", "/marker").exec();
         LOG.info("Created exec {}", touchFileCmdCreateResponse.toString());
         assertThat(touchFileCmdCreateResponse.getId(), not(isEmptyString()));
         ExecCreateCmdResponse checkFileCmdCreateResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout()
-                .withAttachStderr()
-                .withCmd("test", "-e", "/marker").exec();
+                .withAttachStdout().withAttachStderr().withCmd("test", "-e", "/marker").exec();
         LOG.info("Created exec {}", checkFileCmdCreateResponse.toString());
         assertThat(checkFileCmdCreateResponse.getId(), not(isEmptyString()));
 
         // Check that file does not exist
         InputStream response1 = dockerClient.execStartCmd(container.getId())
-                .withExecId(checkFileCmdCreateResponse.getId())
-                .exec();
-        asString(response1);  // consume
+                .withExecId(checkFileCmdCreateResponse.getId()).exec();
+        asString(response1); // consume
 
         InspectExecResponse first = dockerClient.inspectExecCmd(checkFileCmdCreateResponse.getId()).exec();
         assertThat(first.getExitCode(), is(1));
 
         // Create the file
         InputStream response2 = dockerClient.execStartCmd(container.getId())
-                .withExecId(touchFileCmdCreateResponse.getId())
-                .exec();
+                .withExecId(touchFileCmdCreateResponse.getId()).exec();
         asString(response2);
 
         InspectExecResponse second = dockerClient.inspectExecCmd(touchFileCmdCreateResponse.getId()).exec();
@@ -89,8 +81,7 @@ public void inspectExecTest() throws IOException {
 
         // Check that file does exist now
         InputStream response3 = dockerClient.execStartCmd(container.getId())
-                .withExecId(checkFileCmdCreateResponse.getId())
-                .exec();
+                .withExecId(checkFileCmdCreateResponse.getId()).exec();
         asString(response3);
 
         InspectExecResponse third = dockerClient.inspectExecCmd(checkFileCmdCreateResponse.getId()).exec();
diff --git a/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
index 33d80ef2d..e60930d88 100644
--- a/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
@@ -26,60 +26,55 @@
 @Test(groups = "integration")
 public class KillContainerCmdImplTest extends AbstractDockerClientTest {
 
-	public static final Logger LOG = LoggerFactory
-			.getLogger(KillContainerCmdImplTest.class);
-
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-
-	@Test(groups = "ignoreInCircleCi")
-	public void killContainer() throws DockerException {
-
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-		LOG.info("Created container: {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
-		dockerClient.startContainerCmd(container.getId()).exec();
-
-		LOG.info("Killing container: {}", container.getId());
-		dockerClient.killContainerCmd(container.getId()).exec();
-
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
-		LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-		assertThat(inspectContainerResponse.getState().isRunning(),
-				is(equalTo(false)));
-		assertThat(inspectContainerResponse.getState().getExitCode(),
-				not(equalTo(0)));
-
-	}
-	
-	@Test
-	public void killNonExistingContainer() throws DockerException {
-
-		try {
-			dockerClient.killContainerCmd("non-existing").exec();
-			fail("expected NotFoundException");
-		} catch (NotFoundException e) {
-		}
-	}
+    public static final Logger LOG = LoggerFactory.getLogger(KillContainerCmdImplTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void killContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        LOG.info("Killing container: {}", container.getId());
+        dockerClient.killContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        assertThat(inspectContainerResponse.getState().isRunning(), is(equalTo(false)));
+        assertThat(inspectContainerResponse.getState().getExitCode(), not(equalTo(0)));
+
+    }
+
+    @Test
+    public void killNonExistingContainer() throws DockerException {
+
+        try {
+            dockerClient.killContainerCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
index f73ac5e4b..b074409bd 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
@@ -31,76 +31,72 @@
 @Test(groups = "integration")
 public class ListContainersCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
 
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
 
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
 
-	@Test
-	public void testListContainers() throws DockerException {
+    @Test
+    public void testListContainers() throws DockerException {
 
-		String testImage = "busybox";
+        String testImage = "busybox";
 
-		// need to block until image is pulled completely
-		asString(dockerClient.pullImageCmd(testImage).exec());
+        // need to block until image is pulled completely
+        asString(dockerClient.pullImageCmd(testImage).exec());
 
-		List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
-		assertThat(containers, notNullValue());
-		LOG.info("Container List: {}", containers);
+        List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
+        assertThat(containers, notNullValue());
+        LOG.info("Container List: {}", containers);
 
-		int size = containers.size();
+        int size = containers.size();
 
-		CreateContainerResponse container1 = dockerClient
-				.createContainerCmd(testImage).withCmd("echo").exec();
+        CreateContainerResponse container1 = dockerClient.createContainerCmd(testImage).withCmd("echo").exec();
 
-		assertThat(container1.getId(), not(isEmptyString()));
+        assertThat(container1.getId(), not(isEmptyString()));
 
-		InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container1.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container1.getId()).exec();
 
-		assertThat(inspectContainerResponse.getConfig().getImage(), is(equalTo(testImage)));
+        assertThat(inspectContainerResponse.getConfig().getImage(), is(equalTo(testImage)));
 
-		dockerClient.startContainerCmd(container1.getId()).exec();
+        dockerClient.startContainerCmd(container1.getId()).exec();
 
-		LOG.info("container id: " + container1.getId());
+        LOG.info("container id: " + container1.getId());
 
-		List<Container> containers2 = dockerClient.listContainersCmd().withShowAll(true).exec();
+        List<Container> containers2 = dockerClient.listContainersCmd().withShowAll(true).exec();
 
-		for(Container container: containers2) {
-			LOG.info("listContainer: id=" + container.getId() +" image=" + container.getImage());
-		}
+        for (Container container : containers2) {
+            LOG.info("listContainer: id=" + container.getId() + " image=" + container.getImage());
+        }
 
-		assertThat(size + 1, is(equalTo(containers2.size())));
-		Matcher matcher = hasItem(hasField("id", startsWith(container1.getId())));
-		assertThat(containers2, matcher);
+        assertThat(size + 1, is(equalTo(containers2.size())));
+        Matcher matcher = hasItem(hasField("id", startsWith(container1.getId())));
+        assertThat(containers2, matcher);
 
-		List<Container> filteredContainers = filter(
-				hasField("id", startsWith(container1.getId())), containers2);
-		assertThat(filteredContainers.size(), is(equalTo(1)));
-
-		for(Container container: filteredContainers) {
-			LOG.info("filteredContainer: " + container);
-		}
-
-		Container container2 = filteredContainers.get(0);
-		assertThat(container2.getCommand(), not(isEmptyString()));
-		assertThat(container2.getImage(), startsWith(testImage + ":"));
-	}
+        List<Container> filteredContainers = filter(hasField("id", startsWith(container1.getId())), containers2);
+        assertThat(filteredContainers.size(), is(equalTo(1)));
 
+        for (Container container : filteredContainers) {
+            LOG.info("filteredContainer: " + container);
+        }
 
+        Container container2 = filteredContainers.get(0);
+        assertThat(container2.getCommand(), not(isEmptyString()));
+        assertThat(container2.getImage(), startsWith(testImage + ":"));
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
index 05bf94837..e91641eeb 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
@@ -22,78 +22,75 @@
 @Test(groups = "integration")
 public class ListImagesCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-
-	@Test
-	public void listImages() throws DockerException {
-		List<Image> images = dockerClient.listImagesCmd().withShowAll(true).exec();
-		assertThat(images, notNullValue());
-		LOG.info("Images List: {}", images);
-		Info info = dockerClient.infoCmd().exec();
-
-		assertThat(images.size(), equalTo(info.getImages()));
-
-		Image img = images.get(0);
-		assertThat(img.getCreated(), is(greaterThan(0L)));
-		assertThat(img.getVirtualSize(), is(greaterThan(0L)));
-		assertThat(img.getId(), not(isEmptyString()));
-		assertThat(img.getRepoTags(), not(emptyArray()));
-	}
-
-	@Test(groups = "ignoreInCircleCi")
-	public void listDanglingImages() throws DockerException {
-		String imageId = createDanglingImage();
-		List<Image> images = dockerClient.listImagesCmd()
-				.withFilters("{\"dangling\":[\"true\"]}")
-				.withShowAll(true).exec();
-		assertThat(images, notNullValue());
-		LOG.info("Images List: {}", images);
-		assertThat(images.size(), is(greaterThan(0)));
-		boolean imageInFilteredList = isImageInFilteredList(images, imageId);
-		assertTrue(imageInFilteredList);
-	}
-
-	private boolean isImageInFilteredList(List<Image> images, String expectedImageId) {
-		for (Image image : images) {
-			if (expectedImageId.equals(image.getId())) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private String createDanglingImage() {
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "5").exec();
-		LOG.info("Created container: {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
-		dockerClient.startContainerCmd(container.getId()).exec();
-
-		LOG.info("Committing container {}", container.toString());
-		String imageId = dockerClient
-				.commitCmd(container.getId()).exec();
-
-		dockerClient.stopContainerCmd(container.getId()).exec();
-		dockerClient.killContainerCmd(container.getId()).exec();
-		dockerClient.removeContainerCmd(container.getId()).exec();
-		return imageId;
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void listImages() throws DockerException {
+        List<Image> images = dockerClient.listImagesCmd().withShowAll(true).exec();
+        assertThat(images, notNullValue());
+        LOG.info("Images List: {}", images);
+        Info info = dockerClient.infoCmd().exec();
+
+        assertThat(images.size(), equalTo(info.getImages()));
+
+        Image img = images.get(0);
+        assertThat(img.getCreated(), is(greaterThan(0L)));
+        assertThat(img.getVirtualSize(), is(greaterThan(0L)));
+        assertThat(img.getId(), not(isEmptyString()));
+        assertThat(img.getRepoTags(), not(emptyArray()));
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void listDanglingImages() throws DockerException {
+        String imageId = createDanglingImage();
+        List<Image> images = dockerClient.listImagesCmd().withFilters("{\"dangling\":[\"true\"]}").withShowAll(true)
+                .exec();
+        assertThat(images, notNullValue());
+        LOG.info("Images List: {}", images);
+        assertThat(images.size(), is(greaterThan(0)));
+        boolean imageInFilteredList = isImageInFilteredList(images, imageId);
+        assertTrue(imageInFilteredList);
+    }
+
+    private boolean isImageInFilteredList(List<Image> images, String expectedImageId) {
+        for (Image image : images) {
+            if (expectedImageId.equals(image.getId())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private String createDanglingImage() {
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "5").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        LOG.info("Committing container {}", container.toString());
+        String imageId = dockerClient.commitCmd(container.getId()).exec();
+
+        dockerClient.stopContainerCmd(container.getId()).exec();
+        dockerClient.killContainerCmd(container.getId()).exec();
+        dockerClient.removeContainerCmd(container.getId()).exec();
+        return imageId;
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
index 94a27b1d3..1f00c1524 100644
--- a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
@@ -24,96 +24,95 @@
 @Test(groups = "integration")
 public class LogContainerCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
 
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
 
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
 
-	@Test
-	public void logContainer() throws Exception {
+    @Test
+    public void logContainer() throws Exception {
 
-		String snippet = "hello world";
+        String snippet = "hello world";
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("/bin/echo", snippet).exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("/bin/echo", snippet)
+                .exec();
 
-		LOG.info("Created container: {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
 
-		dockerClient.startContainerCmd(container.getId()).exec();
-		
-		int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
+        dockerClient.startContainerCmd(container.getId()).exec();
 
-		assertThat(exitCode, equalTo(0));
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
 
-		InputStream response = dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec();
+        assertThat(exitCode, equalTo(0));
 
-		String log = asString(response);
-		
-		//LOG.info("resonse: " + log);
-		
-		assertThat(log, endsWith(snippet));
-	}
-	
-	@Test
-	public void logNonExistingContainer() throws Exception {
+        InputStream response = dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec();
 
-		try {
-			dockerClient.logContainerCmd("non-existing").withStdErr().withStdOut().exec();
-			fail("expected NotFoundException");
-		} catch (NotFoundException e) {
-		}
-	}
-	
-	@Test
-	public void multipleLogContainer() throws Exception {
+        String log = asString(response);
 
-		String snippet = "hello world";
+        // LOG.info("resonse: " + log);
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("/bin/echo", snippet).exec();
+        assertThat(log, endsWith(snippet));
+    }
 
-		LOG.info("Created container: {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
+    @Test
+    public void logNonExistingContainer() throws Exception {
 
-		dockerClient.startContainerCmd(container.getId()).exec();
-		
-		int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
+        try {
+            dockerClient.logContainerCmd("non-existing").withStdErr().withStdOut().exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
 
-		assertThat(exitCode, equalTo(0));
+    @Test
+    public void multipleLogContainer() throws Exception {
 
-		InputStream response = dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec();
+        String snippet = "hello world";
 
-		response.close();
-		
-		//String log = asString(response);
-		
-		response = dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("/bin/echo", snippet)
+                .exec();
 
-		//log = asString(response);
-		response.close();
-		
-		response = dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
 
-		String log = asString(response);
-		
-		assertThat(log, endsWith(snippet));
-	}
+        dockerClient.startContainerCmd(container.getId()).exec();
 
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
+
+        assertThat(exitCode, equalTo(0));
+
+        InputStream response = dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec();
+
+        response.close();
+
+        // String log = asString(response);
+
+        response = dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec();
+
+        // log = asString(response);
+        response.close();
+
+        response = dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec();
+
+        String log = asString(response);
+
+        assertThat(log, endsWith(snippet));
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
index f9968a449..f3871e042 100644
--- a/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
@@ -28,24 +28,24 @@ public InputStream exec(PullImageCmd command) {
     };
 
     @BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
 
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
 
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
 
     @Test
     public void nullAuthConfig() throws Exception {
@@ -59,59 +59,57 @@ public void nullAuthConfig() throws Exception {
     }
 
     @Test
-	public void testPullImage() throws DockerException, IOException {
-		Info info = dockerClient.infoCmd().exec();
-		LOG.info("Client info: {}", info.toString());
-
-		int imgCount = info.getImages();
-		LOG.info("imgCount1: {}", imgCount);
-
-		// This should be an image that is not used by other repositories
-		// already
-		// pulled down, preferably small in size. If tag is not used pull will
-		// download all images in that repository but tmpImgs will only
-		// deleted 'latest' image but not images with other tags
-		String testImage = "hackmann/empty";
-
-		LOG.info("Removing image: {}", testImage);
-		
-		try {
-			dockerClient.removeImageCmd(testImage).withForce().exec();
-		} catch (NotFoundException e) {
-			// just ignore if not exist
-		}
-		
-
-		info = dockerClient.infoCmd().exec();
-		LOG.info("Client info: {}", info.toString());
-
-		imgCount = info.getImages();
-		LOG.info("imgCount2: {}", imgCount);
-
-		LOG.info("Pulling image: {}", testImage);
-
-		InputStream response = dockerClient.pullImageCmd(testImage).exec();
-
-		assertThat(asString(response), containsString("Download complete"));
-
-		info = dockerClient.infoCmd().exec();
-		LOG.info("Client info after pull, {}", info.toString());
-
-		assertThat(imgCount, lessThanOrEqualTo(info.getImages()));
-
-		InspectImageResponse inspectImageResponse = dockerClient
-				.inspectImageCmd(testImage).exec();
-		LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-		assertThat(inspectImageResponse, notNullValue());
-	}
-
-	@Test
-	public void testPullNonExistingImage() throws DockerException, IOException {
-		
-		// does not throw an exception
-		InputStream is = dockerClient.pullImageCmd("xvxcv/foo").exec();
-		// stream needs to be fully read in order to close the underlying connection
-		asString(is);
-	}
+    public void testPullImage() throws DockerException, IOException {
+        Info info = dockerClient.infoCmd().exec();
+        LOG.info("Client info: {}", info.toString());
+
+        int imgCount = info.getImages();
+        LOG.info("imgCount1: {}", imgCount);
+
+        // This should be an image that is not used by other repositories
+        // already
+        // pulled down, preferably small in size. If tag is not used pull will
+        // download all images in that repository but tmpImgs will only
+        // deleted 'latest' image but not images with other tags
+        String testImage = "hackmann/empty";
+
+        LOG.info("Removing image: {}", testImage);
+
+        try {
+            dockerClient.removeImageCmd(testImage).withForce().exec();
+        } catch (NotFoundException e) {
+            // just ignore if not exist
+        }
+
+        info = dockerClient.infoCmd().exec();
+        LOG.info("Client info: {}", info.toString());
+
+        imgCount = info.getImages();
+        LOG.info("imgCount2: {}", imgCount);
+
+        LOG.info("Pulling image: {}", testImage);
+
+        InputStream response = dockerClient.pullImageCmd(testImage).exec();
+
+        assertThat(asString(response), containsString("Download complete"));
+
+        info = dockerClient.infoCmd().exec();
+        LOG.info("Client info after pull, {}", info.toString());
+
+        assertThat(imgCount, lessThanOrEqualTo(info.getImages()));
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(testImage).exec();
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+        assertThat(inspectImageResponse, notNullValue());
+    }
+
+    @Test
+    public void testPullNonExistingImage() throws DockerException, IOException {
+
+        // does not throw an exception
+        InputStream is = dockerClient.pullImageCmd("xvxcv/foo").exec();
+        // stream needs to be fully read in order to close the underlying connection
+        asString(is);
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
index f409aebf7..8498256a8 100644
--- a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
@@ -16,60 +16,58 @@
 @Test(groups = "integration")
 public class PushImageCmdImplTest extends AbstractDockerClientTest {
 
-	public static final Logger LOG = LoggerFactory
-			.getLogger(PushImageCmdImplTest.class);
+    public static final Logger LOG = LoggerFactory.getLogger(PushImageCmdImplTest.class);
 
     String username;
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
         username = dockerClient.authConfig().getUsername();
-	}
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
+    }
 
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
 
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
 
-	@Test
-	public void pushLatest() throws Exception {
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("true").exec();
+    @Test
+    public void pushLatest() throws Exception {
 
-		LOG.info("Created container {}", container.toString());
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true").exec();
 
-		assertThat(container.getId(), not(isEmptyString()));
+        LOG.info("Created container {}", container.toString());
 
-		LOG.info("Committing container: {}", container.toString());
-		String imageId = dockerClient.commitCmd(container.getId()).withRepository(username + "/busybox").exec();
+        assertThat(container.getId(), not(isEmptyString()));
 
-		// we have to block until image is pushed
-		asString(dockerClient.pushImageCmd(username + "/busybox").exec());
+        LOG.info("Committing container: {}", container.toString());
+        String imageId = dockerClient.commitCmd(container.getId()).withRepository(username + "/busybox").exec();
+
+        // we have to block until image is pushed
+        asString(dockerClient.pushImageCmd(username + "/busybox").exec());
 
         LOG.info("Removing image: {}", imageId);
-		dockerClient.removeImageCmd(imageId).exec();
-		
-		String response = asString(dockerClient.pullImageCmd(username + "/busybox").exec());
+        dockerClient.removeImageCmd(imageId).exec();
 
-		assertThat(response, not(containsString("HTTP code: 404")));
-	}
+        String response = asString(dockerClient.pullImageCmd(username + "/busybox").exec());
 
-	@Test
-	public void pushExistentImage() throws Exception {
+        assertThat(response, not(containsString("HTTP code: 404")));
+    }
 
-		assertThat(asString(dockerClient.pushImageCmd(username + "/xxx").exec()), containsString("error"));
-	}
+    @Test
+    public void pushExistentImage() throws Exception {
 
-}
+        assertThat(asString(dockerClient.pushImageCmd(username + "/xxx").exec()), containsString("error"));
+    }
 
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
index b6fe173ae..22fbb096c 100644
--- a/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
@@ -28,57 +28,53 @@
 @Test(groups = "integration")
 public class RemoveContainerCmdImplTest extends AbstractDockerClientTest {
 
-	public static final Logger LOG = LoggerFactory
-			.getLogger(RemoveContainerCmdImplTest.class);
-
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-
-	@Test(groups = "ignoreInCircleCi")
-	public void removeContainer() throws DockerException {
-
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("true").exec();
-
-		dockerClient.startContainerCmd(container.getId()).exec();
-		dockerClient.waitContainerCmd(container.getId()).exec();
-
-		LOG.info("Removing container: {}", container.getId());
-		dockerClient.removeContainerCmd(container.getId()).exec();
-
-		List<Container> containers2 = dockerClient.listContainersCmd().withShowAll(true).exec();
-		
-		Matcher matcher = not(hasItem(hasField("id",
-				startsWith(container.getId()))));
-		assertThat(containers2, matcher);
-
-	}
-	
-	@Test
-	public void removeNonExistingContainer() throws DockerException {
-		try {
-			dockerClient.removeContainerCmd("non-existing").exec();
-			fail("expected NotFoundException");			
-		} catch (NotFoundException e) {
-		}
-	}
+    public static final Logger LOG = LoggerFactory.getLogger(RemoveContainerCmdImplTest.class);
 
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
-}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void removeContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true").exec();
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerClient.waitContainerCmd(container.getId()).exec();
 
+        LOG.info("Removing container: {}", container.getId());
+        dockerClient.removeContainerCmd(container.getId()).exec();
+
+        List<Container> containers2 = dockerClient.listContainersCmd().withShowAll(true).exec();
+
+        Matcher matcher = not(hasItem(hasField("id", startsWith(container.getId()))));
+        assertThat(containers2, matcher);
+
+    }
+
+    @Test
+    public void removeNonExistingContainer() throws DockerException {
+        try {
+            dockerClient.removeContainerCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
index af6bc39cc..1c0f3db1c 100644
--- a/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
@@ -29,64 +29,60 @@
 @Test(groups = "integration")
 public class RemoveImageCmdImplTest extends AbstractDockerClientTest {
 
-	public static final Logger LOG = LoggerFactory
-			.getLogger(RemoveImageCmdImplTest.class);
+    public static final Logger LOG = LoggerFactory.getLogger(RemoveImageCmdImplTest.class);
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
 
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
 
-	@Test(groups = "ignoreInCircleCi")
-	public void removeImage() throws DockerException, InterruptedException {
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-		LOG.info("Created container: {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
-		dockerClient.startContainerCmd(container.getId()).exec();
+    @Test(groups = "ignoreInCircleCi")
+    public void removeImage() throws DockerException, InterruptedException {
 
-		LOG.info("Committing container {}", container.toString());
-		String imageId = dockerClient
-				.commitCmd(container.getId()).exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
 
-		dockerClient.stopContainerCmd(container.getId()).exec();
-		dockerClient.killContainerCmd(container.getId()).exec();
-		dockerClient.removeContainerCmd(container.getId()).exec();
+        LOG.info("Committing container {}", container.toString());
+        String imageId = dockerClient.commitCmd(container.getId()).exec();
 
-		LOG.info("Removing image: {}", imageId);
-		dockerClient.removeImageCmd(imageId).exec();
+        dockerClient.stopContainerCmd(container.getId()).exec();
+        dockerClient.killContainerCmd(container.getId()).exec();
+        dockerClient.removeContainerCmd(container.getId()).exec();
 
-		List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
+        LOG.info("Removing image: {}", imageId);
+        dockerClient.removeImageCmd(imageId).exec();
 
-		Matcher matcher = not(hasItem(hasField("id", startsWith(imageId))));
-		assertThat(containers, matcher);
-	}
+        List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
 
-	@Test
-	public void removeNonExistingImage() throws DockerException, InterruptedException {
-		try {
-			dockerClient.removeImageCmd("non-existing").exec();
-			fail("expected NotFoundException");
-		} catch (NotFoundException e) {
-		}
+        Matcher matcher = not(hasItem(hasField("id", startsWith(imageId))));
+        assertThat(containers, matcher);
+    }
 
-	}
+    @Test
+    public void removeNonExistingImage() throws DockerException, InterruptedException {
+        try {
+            dockerClient.removeImageCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
 
+    }
 
 }
-
diff --git a/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
index b6040a0ff..866800163 100644
--- a/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
@@ -24,67 +24,61 @@
 @Test(groups = "integration")
 public class RestartContainerCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-
-	@Test
-	public void restartContainer() throws DockerException {
-
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-		LOG.info("Created container: {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
-		dockerClient.startContainerCmd(container.getId()).exec();
-		
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
-		LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-		String startTime = inspectContainerResponse.getState().getStartedAt();
-
-		dockerClient.restartContainerCmd(container.getId()).withtTimeout(2).exec();
-
-		InspectContainerResponse inspectContainerResponse2 = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
-		LOG.info("Container Inspect After Restart: {}",
-				inspectContainerResponse2.toString());
-
-		String startTime2 = inspectContainerResponse2.getState().getStartedAt();
-
-		assertThat(startTime, not(equalTo(startTime2)));
-
-		assertThat(inspectContainerResponse.getState().isRunning(),
-				is(equalTo(true)));
-
-		dockerClient.killContainerCmd(container.getId()).exec();
-	}
-	
-	@Test
-	public void restartNonExistingContainer() throws DockerException, InterruptedException {
-		try {
-			dockerClient.restartContainerCmd("non-existing").exec();
-			fail("expected NotFoundException");
-		} catch (NotFoundException e) {
-		}
-
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void restartContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        String startTime = inspectContainerResponse.getState().getStartedAt();
+
+        dockerClient.restartContainerCmd(container.getId()).withtTimeout(2).exec();
+
+        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect After Restart: {}", inspectContainerResponse2.toString());
+
+        String startTime2 = inspectContainerResponse2.getState().getStartedAt();
+
+        assertThat(startTime, not(equalTo(startTime2)));
+
+        assertThat(inspectContainerResponse.getState().isRunning(), is(equalTo(true)));
+
+        dockerClient.killContainerCmd(container.getId()).exec();
+    }
+
+    @Test
+    public void restartNonExistingContainer() throws DockerException, InterruptedException {
+        try {
+            dockerClient.restartContainerCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/SaveImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/SaveImageCmdImplTest.java
index 859a76cc2..9facdc2d9 100644
--- a/src/test/java/com/github/dockerjava/core/command/SaveImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/SaveImageCmdImplTest.java
@@ -26,8 +26,7 @@
 
 @Test(groups = "integration")
 public class SaveImageCmdImplTest extends AbstractDockerClientTest {
-    public static final Logger LOG = LoggerFactory
-            .getLogger(SaveImageCmdImplTest.class);
+    public static final Logger LOG = LoggerFactory.getLogger(SaveImageCmdImplTest.class);
 
     String username;
 
@@ -35,6 +34,7 @@ public class SaveImageCmdImplTest extends AbstractDockerClientTest {
     public void beforeTest() throws DockerException {
         super.beforeTest();
     }
+
     @AfterTest
     public void afterTest() {
         super.afterTest();
@@ -53,8 +53,7 @@ public void afterMethod(ITestResult result) {
     @Test
     public void saveImage() throws Exception {
 
-        InputStream image = IOUtils.toBufferedInputStream(dockerClient
-                .saveImageCmd("busybox").exec());
+        InputStream image = IOUtils.toBufferedInputStream(dockerClient.saveImageCmd("busybox").exec());
         assertThat(image.available(), greaterThan(0));
 
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java
index 5c2393534..f61ff078a 100644
--- a/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java
@@ -25,38 +25,35 @@
 @Test(groups = "integration")
 public class SearchImagesCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-	
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-	
-	@Test
-	public void searchImages() throws DockerException {
-		List<SearchItem> dockerSearch = dockerClient.searchImagesCmd("busybox").exec();
-		LOG.info("Search returned {}", dockerSearch.toString());
-
-		Matcher matcher = hasItem(hasField("name", equalTo("busybox")));
-		assertThat(dockerSearch, matcher);
-
-		assertThat(
-				filter(hasField("name", is("busybox")), dockerSearch).size(),
-				equalTo(1));
-	}
-
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void searchImages() throws DockerException {
+        List<SearchItem> dockerSearch = dockerClient.searchImagesCmd("busybox").exec();
+        LOG.info("Search returned {}", dockerSearch.toString());
+
+        Matcher matcher = hasItem(hasField("name", equalTo("busybox")));
+        assertThat(dockerSearch, matcher);
+
+        assertThat(filter(hasField("name", is("busybox")), dockerSearch).size(), equalTo(1));
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
index b82f2f75c..248189d15 100644
--- a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
@@ -29,55 +29,53 @@
 @Test(groups = "integration")
 public class StatsCmdImplTest extends AbstractDockerClientTest {
 
-	private static int NUM_STATS = 5;
+    private static int NUM_STATS = 5;
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
 
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
 
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
 
-	@Test(groups = "ignoreInCircleCi")
-	public void testStatsStreaming() throws InterruptedException, IOException {
-		TimeUnit.SECONDS.sleep(1);
+    @Test(groups = "ignoreInCircleCi")
+    public void testStatsStreaming() throws InterruptedException, IOException {
+        TimeUnit.SECONDS.sleep(1);
 
-		CountDownLatch countDownLatch = new CountDownLatch(NUM_STATS);
-		StatsCallbackTest statsCallback = new StatsCallbackTest(countDownLatch);
+        CountDownLatch countDownLatch = new CountDownLatch(NUM_STATS);
+        StatsCallbackTest statsCallback = new StatsCallbackTest(countDownLatch);
 
         String containerName = "generated_" + new SecureRandom().nextInt();
 
-		 CreateContainerResponse container = dockerClient
-             .createContainerCmd("busybox")
-             .withCmd("top")
-             .withName(containerName).exec();
-		 LOG.info("Created container {}", container.toString());
-		 assertThat(container.getId(), not(isEmptyString()));
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
+                .withName(containerName).exec();
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
 
-	     dockerClient.startContainerCmd(container.getId()).exec();
+        dockerClient.startContainerCmd(container.getId()).exec();
 
-		StatsCmd statsCmd = dockerClient.statsCmd(statsCallback).withContainerId(container.getId());
-		ExecutorService executorService = statsCmd.exec();
+        StatsCmd statsCmd = dockerClient.statsCmd(statsCallback).withContainerId(container.getId());
+        ExecutorService executorService = statsCmd.exec();
 
-		countDownLatch.await(3, TimeUnit.SECONDS);
-		boolean gotStats = statsCallback.gotStats();
+        countDownLatch.await(3, TimeUnit.SECONDS);
+        boolean gotStats = statsCallback.gotStats();
 
         LOG.info("Stop stats collection");
-		executorService.shutdown();
-	    statsCallback.close();
+        executorService.shutdown();
+        statsCallback.close();
 
         LOG.info("Stopping container");
         dockerClient.stopContainerCmd(container.getId()).exec();
@@ -86,48 +84,50 @@ public void testStatsStreaming() throws InterruptedException, IOException {
         LOG.info("Completed test");
         assertTrue(gotStats, "Expected true");
 
-	}
-
-	private class StatsCallbackTest implements StatsCallback {
-		private final CountDownLatch countDownLatch;
-		private final AtomicBoolean isReceiving = new AtomicBoolean(true);
-		private boolean gotStats = false;
-
-		public StatsCallbackTest(CountDownLatch countDownLatch) {
-			this.countDownLatch = countDownLatch;
-		}
-
-		public void close() {
-	        LOG.info("Closing StatsCallback");
-			isReceiving.set(false);
-		}
-
-		@Override
-		public void onStats(Statistics stats) {
-			LOG.info("Received stats #{}: {}", countDownLatch.getCount(), stats);
-			if(stats != null) {
-			    gotStats = true;
-			}
-			countDownLatch.countDown();
-		}
-
-		@Override
-		public void onException(Throwable throwable) {
-			LOG.error("Error occurred: {}", throwable.getMessage());
-		}
-
-		@Override
-		public void onCompletion(int numStats) {
-			LOG.info("Number of stats received: {}", numStats);
-		}
-
-		@Override
-		public boolean isReceiving() {
-			return isReceiving.get();
-		}
-
-	    public boolean gotStats() {
-	            return gotStats;
-	    }
-	}
+    }
+
+    private class StatsCallbackTest implements StatsCallback {
+        private final CountDownLatch countDownLatch;
+
+        private final AtomicBoolean isReceiving = new AtomicBoolean(true);
+
+        private boolean gotStats = false;
+
+        public StatsCallbackTest(CountDownLatch countDownLatch) {
+            this.countDownLatch = countDownLatch;
+        }
+
+        public void close() {
+            LOG.info("Closing StatsCallback");
+            isReceiving.set(false);
+        }
+
+        @Override
+        public void onStats(Statistics stats) {
+            LOG.info("Received stats #{}: {}", countDownLatch.getCount(), stats);
+            if (stats != null) {
+                gotStats = true;
+            }
+            countDownLatch.countDown();
+        }
+
+        @Override
+        public void onException(Throwable throwable) {
+            LOG.error("Error occurred: {}", throwable.getMessage());
+        }
+
+        @Override
+        public void onCompletion(int numStats) {
+            LOG.info("Number of stats received: {}", numStats);
+        }
+
+        @Override
+        public boolean isReceiving() {
+            return isReceiving.get();
+        }
+
+        public boolean gotStats() {
+            return gotStats;
+        }
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
index 3cf643c4e..8a2a2f13e 100644
--- a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
@@ -26,57 +26,54 @@
 @Test(groups = "integration")
 public class StopContainerCmdImplTest extends AbstractDockerClientTest {
 
-	public static final Logger LOG = LoggerFactory
-			.getLogger(StopContainerCmdImplTest.class);
-
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-
-	@Test(groups = "ignoreInCircleCi")
-	public void testStopContainer() throws DockerException {
-
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-		LOG.info("Created container: {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
-		dockerClient.startContainerCmd(container.getId()).exec();
-		
-		LOG.info("Stopping container: {}", container.getId());
-		dockerClient.stopContainerCmd(container.getId()).withTimeout(2).exec();
-
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
-		LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-		assertThat(inspectContainerResponse.getState().isRunning(),	is(equalTo(false)));
-		assertThat(inspectContainerResponse.getState().getExitCode(), not(equalTo(0)));
-	}
-	
-	@Test
-	public void testStopNonExistingContainer() throws DockerException {
-		try {
-			dockerClient.stopContainerCmd("non-existing").withTimeout(2).exec();
-			fail("expected NotFoundException");
-		} catch (NotFoundException e) {
-			
-		}
-	}
+    public static final Logger LOG = LoggerFactory.getLogger(StopContainerCmdImplTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void testStopContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        LOG.info("Stopping container: {}", container.getId());
+        dockerClient.stopContainerCmd(container.getId()).withTimeout(2).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        assertThat(inspectContainerResponse.getState().isRunning(), is(equalTo(false)));
+        assertThat(inspectContainerResponse.getState().getExitCode(), not(equalTo(0)));
+    }
+
+    @Test
+    public void testStopNonExistingContainer() throws DockerException {
+        try {
+            dockerClient.stopContainerCmd("non-existing").withTimeout(2).exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+
+        }
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java
index 97f422f28..b7c8bc4ff 100644
--- a/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java
@@ -19,47 +19,46 @@
 @Test(groups = "integration")
 public class TagImageCmdImplTest extends AbstractDockerClientTest {
 
-	public static final Logger LOG = LoggerFactory
-			.getLogger(TagImageCmdImplTest.class);
+    public static final Logger LOG = LoggerFactory.getLogger(TagImageCmdImplTest.class);
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
 
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
 
-	@Test
-	public void tagImage() throws Exception {
-		String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
 
-		dockerClient.tagImageCmd("busybox:latest", "docker-java/busybox", tag).exec();
+    @Test
+    public void tagImage() throws Exception {
+        String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
 
-		dockerClient.removeImageCmd("docker-java/busybox:" + tag).exec();
-	}
-	
-	@Test
-	public void tagNonExistingImage() throws Exception {
-		String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
-		
-		try {
-			dockerClient.tagImageCmd("non-existing", "docker-java/busybox", tag).exec();
-			fail("expected NotFoundException");
-		} catch (NotFoundException e) {
-		}	
-	}
+        dockerClient.tagImageCmd("busybox:latest", "docker-java/busybox", tag).exec();
 
-}
+        dockerClient.removeImageCmd("docker-java/busybox:" + tag).exec();
+    }
+
+    @Test
+    public void tagNonExistingImage() throws Exception {
+        String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
 
+        try {
+            dockerClient.tagImageCmd("non-existing", "docker-java/busybox", tag).exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java
index 8c9064346..edb5560e6 100644
--- a/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java
@@ -17,37 +17,36 @@
 @Test(groups = "integration")
 public class VersionCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-	
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-	
-	@Test
-	public void version() throws DockerException {
-		Version version = dockerClient.versionCmd().exec();
-		LOG.info(version.toString());
-
-		assertTrue(version.getGoVersion().length() > 0);
-		assertTrue(version.getVersion().length() > 0);
-
-		assertEquals(StringUtils.split(version.getVersion(), ".").length, 3);
-
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void version() throws DockerException {
+        Version version = dockerClient.versionCmd().exec();
+        LOG.info(version.toString());
+
+        assertTrue(version.getGoVersion().length() > 0);
+        assertTrue(version.getVersion().length() > 0);
+
+        assertEquals(StringUtils.split(version.getVersion(), ".").length, 3);
+
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
index 19c7057d2..576506498 100644
--- a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
@@ -24,56 +24,54 @@
 @Test(groups = "integration")
 public class WaitContainerCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-
-	@Test
-	public void testWaitContainer() throws DockerException {
-
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("true").exec();
-
-		LOG.info("Created container: {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
-		
-		dockerClient.startContainerCmd(container.getId()).exec();
-
-		int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
-		LOG.info("Container exit code: {}", exitCode);
-
-		assertThat(exitCode, equalTo(0));
-
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
-		LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-		assertThat(inspectContainerResponse.getState().isRunning(),	is(equalTo(false)));
-		assertThat(inspectContainerResponse.getState().getExitCode(), is(equalTo(exitCode)));
-	}
-	
-	@Test
-	public void testWaitNonExistingContainer() throws DockerException {
-		try {
-			dockerClient.waitContainerCmd("non-existing").exec();
-			fail("expected NotFoundException");
-		} catch (NotFoundException e) {
-		}
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void testWaitContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true").exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
+        LOG.info("Container exit code: {}", exitCode);
+
+        assertThat(exitCode, equalTo(0));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        assertThat(inspectContainerResponse.getState().isRunning(), is(equalTo(false)));
+        assertThat(inspectContainerResponse.getState().getExitCode(), is(equalTo(exitCode)));
+    }
+
+    @Test
+    public void testWaitNonExistingContainer() throws DockerException {
+        try {
+            dockerClient.waitContainerCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java
index 428511c2e..8b5e3c7e4 100644
--- a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java
+++ b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java
@@ -13,38 +13,37 @@
 
 public class DockerfileTest extends TestCase {
 
-  private static final Logger log = LoggerFactory.getLogger(DockerfileTest.class);
+    private static final Logger log = LoggerFactory.getLogger(DockerfileTest.class);
 
-  @Test
-  public void testAllItems() throws IOException {
-    File baseDir = new File(Thread.currentThread().getContextClassLoader()
-                                .getResource("netcat").getFile());
+    @Test
+    public void testAllItems() throws IOException {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("netcat").getFile());
 
-    File root = baseDir.getParentFile();
+        File root = baseDir.getParentFile();
 
-    Map<String, Dockerfile> dockerfiles = new HashMap<String, Dockerfile>();
-    Map<String, Dockerfile.ScannedResult> results = new HashMap<String, Dockerfile.ScannedResult>();
+        Map<String, Dockerfile> dockerfiles = new HashMap<String, Dockerfile>();
+        Map<String, Dockerfile.ScannedResult> results = new HashMap<String, Dockerfile.ScannedResult>();
 
-    for (File child : root.listFiles()) {
-      if (new File(child, "Dockerfile").exists()) {
-        Dockerfile dockerfile = new Dockerfile(new File(child, "Dockerfile"));
-        dockerfiles.put(child.getName(), dockerfile);
-      }
-    }
+        for (File child : root.listFiles()) {
+            if (new File(child, "Dockerfile").exists()) {
+                Dockerfile dockerfile = new Dockerfile(new File(child, "Dockerfile"));
+                dockerfiles.put(child.getName(), dockerfile);
+            }
+        }
 
-    for (String name : dockerfiles.keySet()) {
-      log.info("Scanning {}", name);
-      try {
-        results.put(name, dockerfiles.get(name).parse());
-      } catch (Exception ex) {
-        log.error("Error in {}", name, ex);
-      }
+        for (String name : dockerfiles.keySet()) {
+            log.info("Scanning {}", name);
+            try {
+                results.put(name, dockerfiles.get(name).parse());
+            } catch (Exception ex) {
+                log.error("Error in {}", name, ex);
+            }
 
-    }
+        }
 
-    for (String name : results.keySet()) {
-      log.info("Name: {} = {}", name, results.get(name));
+        for (String name : results.keySet()) {
+            log.info("Name: {} = {}", name, results.get(name));
+        }
     }
-  }
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/github/dockerjava/test/serdes/AbstractJSONResourceRef.java b/src/test/java/com/github/dockerjava/test/serdes/AbstractJSONResourceRef.java
index 882b3b012..1d5f43a6f 100644
--- a/src/test/java/com/github/dockerjava/test/serdes/AbstractJSONResourceRef.java
+++ b/src/test/java/com/github/dockerjava/test/serdes/AbstractJSONResourceRef.java
@@ -17,15 +17,17 @@
 
 /**
  * Default implementation of the Resource reference.
+ * 
  * @author Oleg Nenashev
  */
 public abstract class AbstractJSONResourceRef implements JSONResourceRef {
     /**
      * Gets a class which stores resources.
+     * 
      * @return Reference class by default.
      */
     @Override
     public Class<?> getResourceClass() {
         return this.getClass();
-    }   
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java b/src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java
index 96e5df726..662b9b216 100644
--- a/src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java
+++ b/src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java
@@ -18,20 +18,23 @@
 import java.io.IOException;
 
 /**
- * References JSON resources, which 
+ * References JSON resources, which
+ * 
  * @author Oleg Nenashev
  */
 public interface JSONResourceRef {
 
     /**
      * Gets the resource file name under the class.
+     * 
      * @return File name, which is stored under the resource class
      */
     String getFileName();
 
     /**
      * Gets a class which stores resources.
+     * 
      * @return Class to be used as a resource source
      */
-    Class<?> getResourceClass();    
+    Class<?> getResourceClass();
 }
diff --git a/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java b/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
index b6a33b722..c83851370 100644
--- a/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
+++ b/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
@@ -29,16 +29,20 @@
 
 /**
  * Provides helper methods for serialization-deserialization tests
+ * 
  * @author Oleg Nenashev
  * @since TODO
  */
 public class JSONTestHelper {
-    
+
     /**
      * Reads JSON String from the specified resource
-     * @param resource JSON File
-     * @return JSON String 
-     * @throws IOException JSON Conversion error 
+     * 
+     * @param resource
+     *            JSON File
+     * @return JSON String
+     * @throws IOException
+     *             JSON Conversion error
      */
     public static String readString(JSONResourceRef resource) throws IOException {
         InputStream istream = CommandJSONSamples.class.getResourceAsStream(resource.getFileName());
@@ -47,71 +51,91 @@ public static String readString(JSONResourceRef resource) throws IOException {
         }
         return IOUtils.toString(istream, "UTF-8");
     }
-    
+
     /**
      * Reads item from the resource.
-     * @param <TClass> Data class to be read
-     * @param resource Resource reference
-     * @param tclass Class entry
+     * 
+     * @param <TClass>
+     *            Data class to be read
+     * @param resource
+     *            Resource reference
+     * @param tclass
+     *            Class entry
      * @return Item
-     * @throws IOException JSON conversion error
+     * @throws IOException
+     *             JSON conversion error
      */
     public static <TClass> TClass readObject(JSONResourceRef resource, Class<TClass> tclass) throws IOException {
         ObjectMapper mapper = new ObjectMapper();
         String str = readString(resource);
         return mapper.readValue(str, tclass);
     }
-    
+
     /**
      * Basic serialization-deserialization consistency test for the resource.
-     * @param <TClass> Data class
-     * @param resource Resource reference
-     * @param tclass Class entry
-     * @throws IOException JSON conversion error
-     * @throws AssertionError Validation error
+     * 
+     * @param <TClass>
+     *            Data class
+     * @param resource
+     *            Resource reference
+     * @param tclass
+     *            Class entry
+     * @throws IOException
+     *             JSON conversion error
+     * @throws AssertionError
+     *             Validation error
      * @return Deserialized object after the roundtrip
      */
-    public static <TClass> TClass testRoundTrip(JSONResourceRef resource, Class<TClass> tclass) 
-            throws IOException, AssertionError {
+    public static <TClass> TClass testRoundTrip(JSONResourceRef resource, Class<TClass> tclass) throws IOException,
+            AssertionError {
         TClass item = readObject(resource, tclass);
         assertNotNull(item);
         return testRoundTrip(item, tclass);
     }
-    
+
     /**
      * Performs roundtrip test for the specified class.
-     * @param <TClass> Item class
-     * @param item Item to be checked
+     * 
+     * @param <TClass>
+     *            Item class
+     * @param item
+     *            Item to be checked
      * @return Deserialized object after the roundtrip
-     * @throws IOException JSON Conversion error
-     * @throws AssertionError Validation error
+     * @throws IOException
+     *             JSON Conversion error
+     * @throws AssertionError
+     *             Validation error
      */
     @SuppressWarnings("unchecked")
-    public static <TClass> TClass testRoundTrip(TClass item) 
-            throws IOException, AssertionError {
-        return testRoundTrip(item, (Class<TClass>)item.getClass());
+    public static <TClass> TClass testRoundTrip(TClass item) throws IOException, AssertionError {
+        return testRoundTrip(item, (Class<TClass>) item.getClass());
     }
-    
+
     /**
      * Performs roundtrip test for the specified class.
-     * @param <TClass> Item class
-     * @param item Item to be checked
-     * @param asclass Class to be used during conversions
+     * 
+     * @param <TClass>
+     *            Item class
+     * @param item
+     *            Item to be checked
+     * @param asclass
+     *            Class to be used during conversions
      * @return Deserialized object after the roundtrip
-     * @throws IOException JSON Conversion error
-     * @throws AssertionError Validation error
+     * @throws IOException
+     *             JSON Conversion error
+     * @throws AssertionError
+     *             Validation error
      */
-    public static <TClass> TClass testRoundTrip(TClass item, Class<TClass> asclass) 
-            throws IOException, AssertionError {
+    public static <TClass> TClass testRoundTrip(TClass item, Class<TClass> asclass) throws IOException, AssertionError {
         ObjectMapper mapper = new ObjectMapper();
-       
+
         String serialized1 = mapper.writeValueAsString(item);
         JsonNode json1 = mapper.readTree(serialized1);
         TClass deserialized1 = mapper.readValue(serialized1, asclass);
         String serialized2 = mapper.writeValueAsString(deserialized1);
         JsonNode json2 = mapper.readTree(serialized2);
         TClass deserialized2 = mapper.readValue(serialized2, asclass);
-        
+
         assertEquals(json2, json1, "JSONs must be equal after the second roundtrip");
         return deserialized2;
     }

From a9112e3ca9b309434d7e4e053837e84406b9c6ee Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 26 Jun 2015 20:46:57 +0200
Subject: [PATCH 0111/1272] Formatting sources

---
 .../dockerjava/api/BadRequestException.java   |  13 +-
 .../dockerjava/api/ConflictException.java     |  13 +-
 .../dockerjava/api/DockerClientException.java |   4 +-
 .../dockerjava/api/DockerException.java       |  15 +-
 .../api/InternalServerErrorException.java     |  12 +-
 .../api/NotAcceptableException.java           |  12 +-
 .../dockerjava/api/NotFoundException.java     |  12 +-
 .../dockerjava/api/NotModifiedException.java  |  12 +-
 .../dockerjava/api/UnauthorizedException.java |  12 +-
 .../dockerjava/api/async/ResultCallback.java  |  12 +-
 .../api/command/AttachContainerCmd.java       |  74 +--
 .../dockerjava/api/command/AuthCmd.java       |  21 +-
 .../dockerjava/api/command/BuildImageCmd.java |  82 +--
 .../dockerjava/api/command/CommitCmd.java     | 121 ++--
 .../api/command/ContainerDiffCmd.java         |  37 +-
 .../api/command/CopyFileFromContainerCmd.java |  34 +-
 .../api/command/CreateImageCmd.java           |  54 +-
 .../dockerjava/api/command/DockerCmd.java     |   2 +-
 .../dockerjava/api/command/DockerCmdExec.java |   4 +-
 .../api/command/DockerCmdExecFactory.java     |  73 ++-
 .../dockerjava/api/command/EventsCmd.java     |   7 +-
 .../dockerjava/api/command/ExecCreateCmd.java |  18 +-
 .../dockerjava/api/command/ExecStartCmd.java  |  42 +-
 .../dockerjava/api/command/InfoCmd.java       |   4 +-
 .../api/command/InspectContainerCmd.java      |  21 +-
 .../api/command/InspectContainerResponse.java | 189 +++---
 .../api/command/InspectExecCmd.java           |   7 +-
 .../api/command/InspectImageCmd.java          |  23 +-
 .../api/command/InspectImageResponse.java     |  18 +-
 .../api/command/KillContainerCmd.java         |  25 +-
 .../api/command/ListContainersCmd.java        |  43 +-
 .../dockerjava/api/command/ListImagesCmd.java |  18 +-
 .../api/command/LogContainerCmd.java          |  82 ++-
 .../api/command/PauseContainerCmd.java        |  26 +-
 .../dockerjava/api/command/PingCmd.java       |   7 +-
 .../dockerjava/api/command/PullImageCmd.java  |  27 +-
 .../dockerjava/api/command/PushImageCmd.java  |  58 +-
 .../api/command/RemoveContainerCmd.java       |  37 +-
 .../api/command/RemoveImageCmd.java           |  87 +--
 .../api/command/RestartContainerCmd.java      |  28 +-
 .../dockerjava/api/command/SaveImageCmd.java  |  17 +-
 .../api/command/SearchImagesCmd.java          |  13 +-
 .../dockerjava/api/command/StatsCmd.java      |   5 +-
 .../api/command/StopContainerCmd.java         |  34 +-
 .../dockerjava/api/command/TagImageCmd.java   |  34 +-
 .../api/command/TopContainerCmd.java          |  25 +-
 .../api/command/TopContainerResponse.java     |  42 +-
 .../api/command/UnpauseContainerCmd.java      |  24 +-
 .../dockerjava/api/command/VersionCmd.java    |   6 +-
 .../api/command/WaitContainerCmd.java         |  23 +-
 .../dockerjava/api/model/AccessMode.java      |  40 +-
 .../dockerjava/api/model/AuthConfig.java      | 222 ++++---
 .../api/model/AuthConfigurations.java         |  22 +-
 .../com/github/dockerjava/api/model/Bind.java | 176 +++--
 .../github/dockerjava/api/model/Binds.java    |  55 +-
 .../dockerjava/api/model/Capability.java      | 612 +++++++++---------
 .../dockerjava/api/model/Container.java       |  29 +-
 .../dockerjava/api/model/ContainerConfig.java | 260 ++++----
 .../github/dockerjava/api/model/Device.java   | 100 ++-
 .../dockerjava/api/model/ErrorResponse.java   |   1 +
 .../github/dockerjava/api/model/Event.java    |  31 +-
 .../dockerjava/api/model/EventStreamItem.java |  21 +-
 .../dockerjava/api/model/ExposedPort.java     | 316 ++++-----
 .../dockerjava/api/model/ExposedPorts.java    |  63 +-
 .../github/dockerjava/api/model/Frame.java    |   7 +-
 .../dockerjava/api/model/HostConfig.java      | 420 ++++++------
 .../dockerjava/api/model/Identifier.java      |  34 +-
 .../github/dockerjava/api/model/Image.java    |  12 +-
 .../com/github/dockerjava/api/model/Info.java | 334 +++++-----
 .../api/model/InternetProtocol.java           |  70 +-
 .../com/github/dockerjava/api/model/Link.java | 168 +++--
 .../github/dockerjava/api/model/Links.java    |  82 ++-
 .../github/dockerjava/api/model/LxcConf.java  |  48 +-
 .../dockerjava/api/model/PortBinding.java     | 115 ++--
 .../github/dockerjava/api/model/Ports.java    | 160 +++--
 .../api/model/PullEventStreamItem.java        |  17 +-
 .../api/model/PushEventStreamItem.java        |  17 +-
 .../dockerjava/api/model/Repository.java      |  17 +-
 .../dockerjava/api/model/RestartPolicy.java   | 228 +++----
 .../dockerjava/api/model/Statistics.java      |  32 +-
 .../dockerjava/api/model/StreamType.java      |   5 +-
 .../github/dockerjava/api/model/Ulimit.java   |   6 +-
 .../github/dockerjava/api/model/Version.java  |  32 +-
 .../github/dockerjava/api/model/Volume.java   |  56 +-
 .../dockerjava/api/model/VolumeBind.java      |   3 +-
 .../dockerjava/api/model/VolumeBinds.java     |  17 +-
 .../github/dockerjava/api/model/VolumeRW.java | 160 +++--
 .../github/dockerjava/api/model/Volumes.java  |  69 +-
 .../dockerjava/api/model/VolumesFrom.java     | 203 +++---
 .../dockerjava/api/model/VolumesRW.java       |  22 +-
 .../dockerjava/core/AuthConfigFile.java       |   8 +-
 .../dockerjava/core/CertificateUtils.java     | 103 +--
 .../dockerjava/core/CompressArchiveUtil.java  |   3 +-
 .../dockerjava/core/DockerClientBuilder.java  | 119 ++--
 .../dockerjava/core/DockerClientConfig.java   | 259 ++++----
 .../dockerjava/core/DockerClientImpl.java     |   6 +-
 .../github/dockerjava/core/FilePathUtil.java  |   9 +-
 .../dockerjava/core/GoLangFileMatch.java      |   9 +-
 .../core/GoLangMatchFileFilter.java           |   8 +-
 .../dockerjava/core/KeystoreSSLConfig.java    | 195 +++---
 .../core/LocalDirectorySSLConfig.java         | 111 ++--
 .../github/dockerjava/core/NameParser.java    |  20 +-
 .../com/github/dockerjava/core/SSLConfig.java |  14 +-
 .../core/async/ResponseStreamProcessor.java   |   3 +-
 .../core/async/ResultCallbackTemplate.java    |   2 +-
 .../core/command/AbstrAuthCfgDockerCmd.java   |  71 +-
 .../core/command/AbstrDockerCmd.java          |  25 +-
 .../core/command/AttachContainerCmdImpl.java  | 210 +++---
 .../dockerjava/core/command/AuthCmdImpl.java  |  24 +-
 .../core/command/BuildImageCmdImpl.java       | 272 ++++----
 .../core/command/CommitCmdImpl.java           | 285 ++++----
 .../core/command/ContainerDiffCmdImpl.java    |  42 +-
 .../command/CopyFileFromContainerCmdImpl.java |  91 ++-
 .../core/command/CreateImageCmdImpl.java      |  99 +--
 .../core/command/EventStreamReader.java       |   2 +
 .../core/command/ExecCreateCmdImpl.java       |  50 +-
 .../core/command/ExecStartCmdImpl.java        |  59 +-
 .../dockerjava/core/command/FrameReader.java  |   2 -
 .../dockerjava/core/command/InfoCmdImpl.java  |  12 +-
 .../core/command/InspectContainerCmdImpl.java |  34 +-
 .../core/command/InspectExecCmdImpl.java      |   3 +-
 .../core/command/InspectImageCmdImpl.java     |  35 +-
 .../core/command/KillContainerCmdImpl.java    |  48 +-
 .../core/command/ListContainersCmdImpl.java   | 122 ++--
 .../core/command/ListImagesCmdImpl.java       |  50 +-
 .../core/command/LogContainerCmdImpl.java     | 151 +++--
 .../core/command/PauseContainerCmdImpl.java   |  48 +-
 .../dockerjava/core/command/PingCmdImpl.java  |   6 +-
 .../core/command/PullImageCmdImpl.java        |  53 +-
 .../core/command/PushImageCmdImpl.java        |  44 +-
 .../core/command/RemoveContainerCmdImpl.java  | 111 ++--
 .../core/command/RemoveImageCmdImpl.java      |  88 ++-
 .../core/command/RestartContainerCmdImpl.java |  55 +-
 .../core/command/SaveImageCmdImpl.java        |  14 +-
 .../core/command/SearchImagesCmdImpl.java     |  31 +-
 .../core/command/StopContainerCmdImpl.java    |  67 +-
 .../core/command/TagImageCmdImpl.java         | 105 ++-
 .../core/command/TopContainerCmdImpl.java     |  54 +-
 .../core/command/UnpauseContainerCmdImpl.java |  48 +-
 .../core/command/VersionCmdImpl.java          |  12 +-
 .../core/command/WaitContainerCmdImpl.java    |  22 +-
 .../core/dockerfile/Dockerfile.java           | 320 +++++----
 .../core/dockerfile/DockerfileStatement.java  | 267 ++++----
 .../core/util/FollowRedirectsFilter.java      |  17 +-
 .../core/util/JsonClientFilter.java           |   5 +-
 .../dockerjava/core/util/LoggingFilter.java   |  91 +--
 .../util/ResponseStatusExceptionFilter.java   | 114 ++--
 .../core/util/SelectiveLoggingFilter.java     |  17 +-
 .../dockerjava/jaxrs/AbstrDockerCmdExec.java  | 100 ++-
 .../dockerjava/jaxrs/ApacheUnixSocket.java    | 567 ++++++++--------
 .../jaxrs/AttachContainerCmdExec.java         |  52 +-
 .../github/dockerjava/jaxrs/AuthCmdExec.java  |  40 +-
 .../dockerjava/jaxrs/BuildImageCmdExec.java   | 181 +++---
 .../dockerjava/jaxrs/CommitCmdExec.java       |  39 +-
 .../jaxrs/ContainerDiffCmdExec.java           |  34 +-
 .../jaxrs/CopyFileFromContainerCmdExec.java   |  42 +-
 .../jaxrs/CreateContainerCmdExec.java         |  31 +-
 .../dockerjava/jaxrs/CreateImageCmdExec.java  |  39 +-
 .../jaxrs/DockerCmdExecFactoryImpl.java       | 573 ++++++++--------
 .../dockerjava/jaxrs/EventsCmdExec.java       |   4 +-
 .../dockerjava/jaxrs/ExecCreateCmdExec.java   |  15 +-
 .../dockerjava/jaxrs/ExecStartCmdExec.java    |  11 +-
 .../github/dockerjava/jaxrs/InfoCmdExec.java  |  29 +-
 .../jaxrs/InspectContainerCmdExec.java        |  34 +-
 .../dockerjava/jaxrs/InspectExecCmdExec.java  |   3 +-
 .../dockerjava/jaxrs/InspectImageCmdExec.java |  32 +-
 .../jaxrs/KillContainerCmdExec.java           |  35 +-
 .../jaxrs/ListContainersCmdExec.java          |  39 +-
 .../dockerjava/jaxrs/ListImagesCmdExec.java   |  41 +-
 .../dockerjava/jaxrs/LogContainerCmdExec.java |  35 +-
 .../jaxrs/PauseContainerCmdExec.java          |  31 +-
 .../github/dockerjava/jaxrs/PingCmdExec.java  |  20 +-
 .../dockerjava/jaxrs/PullImageCmdExec.java    |  61 +-
 .../dockerjava/jaxrs/PushImageCmdExec.java    | 104 ++-
 .../jaxrs/RemoveContainerCmdExec.java         |  31 +-
 .../dockerjava/jaxrs/RemoveImageCmdExec.java  |  34 +-
 .../jaxrs/RestartContainerCmdExec.java        |  32 +-
 .../dockerjava/jaxrs/SaveImageCmdExec.java    |  12 +-
 .../dockerjava/jaxrs/SearchImagesCmdExec.java |  31 +-
 .../jaxrs/StartContainerCmdExec.java          |  29 +-
 .../jaxrs/StopContainerCmdExec.java           |  30 +-
 .../dockerjava/jaxrs/TagImageCmdExec.java     |  34 +-
 .../dockerjava/jaxrs/TopContainerCmdExec.java |  31 +-
 .../jaxrs/UnixConnectionSocketFactory.java    |  63 +-
 .../jaxrs/UnpauseContainerCmdExec.java        |  30 +-
 .../dockerjava/jaxrs/VersionCmdExec.java      |  22 +-
 .../jaxrs/WaitContainerCmdExec.java           |  29 +-
 .../jaxrs/async/AbstractCallbackNotifier.java |   4 +-
 .../jaxrs/connector/ApacheConnector.java      | 176 +++--
 .../ApacheConnectorClientResponse.java        |  56 +-
 .../connector/ApacheConnectorProvider.java    |  59 +-
 .../util/WrappedResponseInputStream.java      | 115 ++--
 .../api/command/CommandJSONSamples.java       |  12 +-
 .../command/InspectContainerResponseTest.java |  12 +-
 .../dockerjava/api/model/AccessModeTest.java  |  39 +-
 .../github/dockerjava/api/model/BindTest.java |  97 ++-
 .../dockerjava/api/model/BindingTest.java     |  90 ++-
 .../dockerjava/api/model/CapabilityTest.java  |  30 +-
 .../dockerjava/api/model/ExposedPortTest.java |  54 +-
 .../dockerjava/api/model/IdentifierTest.java  |  48 +-
 .../api/model/InternetProtocolTest.java       |  60 +-
 .../github/dockerjava/api/model/LinkTest.java |  58 +-
 .../dockerjava/api/model/PortBindingTest.java |  93 ++-
 .../api/model/Ports_SerializingTest.java      |  93 +--
 .../api/model/Ports_addBindingsTest.java      |  97 ++-
 .../dockerjava/api/model/RepositoryTest.java  |  18 +-
 .../api/model/RestartPolicy_ParsingTest.java  |  60 +-
 .../model/RestartPolicy_SerializingTest.java  |  61 +-
 .../api/model/RestartPolicy_toStringTest.java |  21 +-
 .../dockerjava/api/model/VolumeBindsTest.java |   5 +-
 .../api/model/VolumeFrom_SerializingTest.java |  29 +-
 .../dockerjava/api/model/VolumeTest.java      |   8 +-
 .../client/AbstractDockerClientTest.java      | 269 ++++----
 .../dockerjava/client/DockerClientTest.java   |  68 +-
 .../core/CompressArchiveUtilTest.java         |  75 +--
 .../core/DockerClientConfigTest.java          |  12 +-
 .../dockerjava/core/DockerClientImplTest.java |   3 +-
 .../dockerjava/core/GoLangFileMatchTest.java  |  10 +-
 .../core/TestDockerCmdExecFactory.java        | 484 +++++++-------
 .../command/AttachContainerCmdImplTest.java   |   8 +-
 .../core/command/AuthCmdImplTest.java         |  58 +-
 .../core/command/BuildImageCmdImplTest.java   | 293 ++++-----
 .../core/command/CommitCmdImplTest.java       | 109 ++--
 .../command/ContainerDiffCmdImplTest.java     |  97 ++-
 .../CopyFileFromContainerCmdImplTest.java     |   6 +-
 .../command/CreateContainerCmdImplTest.java   |  27 +-
 .../core/command/DockerfileFixture.java       |  41 +-
 .../core/command/EventStreamReaderITest.java  |  38 +-
 .../core/command/EventsCmdImplTest.java       | 182 +++---
 .../core/command/ExecCreateCmdImplTest.java   |   6 +-
 .../core/command/ExecStartCmdImplTest.java    |  14 +-
 .../core/command/FrameReaderTest.java         |   3 +
 .../core/command/InfoCmdImplTest.java         |  74 ++-
 .../core/command/InspectExecCmdImplTest.java  |  23 +-
 .../command/KillContainerCmdImplTest.java     | 105 ++-
 .../command/ListContainersCmdImplTest.java    |  98 ++-
 .../core/command/ListImagesCmdImplTest.java   | 145 ++---
 .../core/command/LogContainerCmdImplTest.java |   2 -
 .../core/command/PullImageCmdImplTest.java    | 136 ++--
 .../core/command/PushImageCmdImplTest.java    |  74 ++-
 .../command/RemoveContainerCmdImplTest.java   |  98 ++-
 .../core/command/RemoveImageCmdImplTest.java  |  88 ++-
 .../command/RestartContainerCmdImplTest.java  | 116 ++--
 .../core/command/SaveImageCmdImplTest.java    |   7 +-
 .../core/command/SearchImagesCmdImplTest.java |  63 +-
 .../command/StopContainerCmdImplTest.java     | 101 ++-
 .../core/command/TagImageCmdImplTest.java     |  71 +-
 .../core/command/VersionCmdImplTest.java      |  61 +-
 .../command/WaitContainerCmdImplTest.java     | 102 ++-
 .../core/dockerfile/DockerfileTest.java       |  49 +-
 .../test/serdes/AbstractJSONResourceRef.java  |   4 +-
 .../test/serdes/JSONResourceRef.java          |   7 +-
 .../test/serdes/JSONTestHelper.java           |  94 ++-
 253 files changed, 8502 insertions(+), 8850 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/BadRequestException.java b/src/main/java/com/github/dockerjava/api/BadRequestException.java
index 1e04bcb3b..2696c5bc1 100644
--- a/src/main/java/com/github/dockerjava/api/BadRequestException.java
+++ b/src/main/java/com/github/dockerjava/api/BadRequestException.java
@@ -1,22 +1,21 @@
 package com.github.dockerjava.api;
 
-
 /**
  *
  */
 public class BadRequestException extends DockerException {
 
-	private static final long serialVersionUID = -2450396075981100160L;
+    private static final long serialVersionUID = -2450396075981100160L;
 
-	public BadRequestException(String message, Throwable cause) {
+    public BadRequestException(String message, Throwable cause) {
         super(message, 400, cause);
     }
-	
-	public BadRequestException(String message) {
+
+    public BadRequestException(String message) {
         this(message, null);
     }
-	
-	public BadRequestException(Throwable cause) {
+
+    public BadRequestException(Throwable cause) {
         this(cause.getMessage(), cause);
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/ConflictException.java b/src/main/java/com/github/dockerjava/api/ConflictException.java
index bed2a375e..6a84fdee3 100644
--- a/src/main/java/com/github/dockerjava/api/ConflictException.java
+++ b/src/main/java/com/github/dockerjava/api/ConflictException.java
@@ -1,22 +1,21 @@
 package com.github.dockerjava.api;
 
-
 /**
  *
  */
 public class ConflictException extends DockerException {
 
-	private static final long serialVersionUID = -290093024775500239L;
+    private static final long serialVersionUID = -290093024775500239L;
 
-	public ConflictException(String message, Throwable cause) {
+    public ConflictException(String message, Throwable cause) {
         super(message, 409, cause);
     }
-	
-	public ConflictException(String message) {
+
+    public ConflictException(String message) {
         this(message, null);
     }
-	
-	public ConflictException(Throwable cause) {
+
+    public ConflictException(Throwable cause) {
         this(cause.getMessage(), cause);
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/DockerClientException.java b/src/main/java/com/github/dockerjava/api/DockerClientException.java
index 85efc3498..538698bb6 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClientException.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClientException.java
@@ -6,8 +6,8 @@
  */
 public class DockerClientException extends RuntimeException {
 
-private static final long serialVersionUID = 7667768099261650608L;
-	
+    private static final long serialVersionUID = 7667768099261650608L;
+
     public DockerClientException(String message) {
         super(message);
     }
diff --git a/src/main/java/com/github/dockerjava/api/DockerException.java b/src/main/java/com/github/dockerjava/api/DockerException.java
index 673bf2ccc..48bb2dd90 100644
--- a/src/main/java/com/github/dockerjava/api/DockerException.java
+++ b/src/main/java/com/github/dockerjava/api/DockerException.java
@@ -1,8 +1,5 @@
 package com.github.dockerjava.api;
 
-
-
-
 /**
  *
  * @author Konstantin Pelykh (kpelykh@gmail.com)
@@ -11,9 +8,9 @@
 
 public class DockerException extends RuntimeException {
 
-private static final long serialVersionUID = 7667768099261650608L;
-	
-	private int httpStatus = 0;
+    private static final long serialVersionUID = 7667768099261650608L;
+
+    private int httpStatus = 0;
 
     public DockerException(String message, int httpStatus) {
         super(message);
@@ -23,8 +20,8 @@ public DockerException(String message, int httpStatus) {
     public DockerException(String message, int httpStatus, Throwable cause) {
         super(message, cause);
     }
-    
+
     public int getHttpStatus() {
-		return httpStatus;
-	}
+        return httpStatus;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/InternalServerErrorException.java b/src/main/java/com/github/dockerjava/api/InternalServerErrorException.java
index 366484e53..cda5602ed 100644
--- a/src/main/java/com/github/dockerjava/api/InternalServerErrorException.java
+++ b/src/main/java/com/github/dockerjava/api/InternalServerErrorException.java
@@ -5,17 +5,17 @@
  */
 public class InternalServerErrorException extends DockerException {
 
-	private static final long serialVersionUID = -2450396075981100160L;
+    private static final long serialVersionUID = -2450396075981100160L;
 
-	public InternalServerErrorException(String message, Throwable cause) {
+    public InternalServerErrorException(String message, Throwable cause) {
         super(message, 500, cause);
     }
-	
-	public InternalServerErrorException(String message) {
+
+    public InternalServerErrorException(String message) {
         this(message, null);
     }
-	
-	public InternalServerErrorException(Throwable cause) {
+
+    public InternalServerErrorException(Throwable cause) {
         this(cause.getMessage(), cause);
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/NotAcceptableException.java b/src/main/java/com/github/dockerjava/api/NotAcceptableException.java
index affa4ce9b..78345a68b 100644
--- a/src/main/java/com/github/dockerjava/api/NotAcceptableException.java
+++ b/src/main/java/com/github/dockerjava/api/NotAcceptableException.java
@@ -5,17 +5,17 @@
  */
 public class NotAcceptableException extends DockerException {
 
-	private static final long serialVersionUID = -1771212181727204375L;
+    private static final long serialVersionUID = -1771212181727204375L;
 
-	public NotAcceptableException(String message, Throwable cause) {
+    public NotAcceptableException(String message, Throwable cause) {
         super(message, 406, cause);
     }
-	
-	public NotAcceptableException(String message) {
+
+    public NotAcceptableException(String message) {
         this(message, null);
     }
-	
-	public NotAcceptableException(Throwable cause) {
+
+    public NotAcceptableException(Throwable cause) {
         this(cause.getMessage(), cause);
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/NotFoundException.java b/src/main/java/com/github/dockerjava/api/NotFoundException.java
index 10f328cdc..67e6f18bf 100644
--- a/src/main/java/com/github/dockerjava/api/NotFoundException.java
+++ b/src/main/java/com/github/dockerjava/api/NotFoundException.java
@@ -7,17 +7,17 @@
  */
 public class NotFoundException extends DockerException {
 
-	private static final long serialVersionUID = -2450396075981100160L;
+    private static final long serialVersionUID = -2450396075981100160L;
 
-	public NotFoundException(String message, Throwable cause) {
+    public NotFoundException(String message, Throwable cause) {
         super(message, 404, cause);
     }
-	
-	public NotFoundException(String message) {
+
+    public NotFoundException(String message) {
         this(message, null);
     }
-	
-	public NotFoundException(Throwable cause) {
+
+    public NotFoundException(Throwable cause) {
         this(cause.getMessage(), cause);
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/NotModifiedException.java b/src/main/java/com/github/dockerjava/api/NotModifiedException.java
index d521bae2d..fa0aa459f 100644
--- a/src/main/java/com/github/dockerjava/api/NotModifiedException.java
+++ b/src/main/java/com/github/dockerjava/api/NotModifiedException.java
@@ -5,17 +5,17 @@
  */
 public class NotModifiedException extends DockerException {
 
-	private static final long serialVersionUID = -290093024775500239L;
+    private static final long serialVersionUID = -290093024775500239L;
 
-	public NotModifiedException(String message, Throwable cause) {
+    public NotModifiedException(String message, Throwable cause) {
         super(message, 304, cause);
     }
-	
-	public NotModifiedException(String message) {
+
+    public NotModifiedException(String message) {
         this(message, null);
     }
-	
-	public NotModifiedException(Throwable cause) {
+
+    public NotModifiedException(Throwable cause) {
         this(cause.getMessage(), cause);
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/UnauthorizedException.java b/src/main/java/com/github/dockerjava/api/UnauthorizedException.java
index 5d48d2163..b097d6523 100644
--- a/src/main/java/com/github/dockerjava/api/UnauthorizedException.java
+++ b/src/main/java/com/github/dockerjava/api/UnauthorizedException.java
@@ -5,17 +5,17 @@
  */
 public class UnauthorizedException extends DockerException {
 
-	private static final long serialVersionUID = 8257731964780578278L;
+    private static final long serialVersionUID = 8257731964780578278L;
 
-	public UnauthorizedException(String message, Throwable cause) {
+    public UnauthorizedException(String message, Throwable cause) {
         super(message, 401, cause);
     }
-	
-	public UnauthorizedException(String message) {
+
+    public UnauthorizedException(String message) {
         this(message, null);
     }
-	
-	public UnauthorizedException(Throwable cause) {
+
+    public UnauthorizedException(Throwable cause) {
         this(cause.getMessage(), cause);
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/async/ResultCallback.java b/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
index 2954b9242..fc3e5985e 100644
--- a/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
+++ b/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
@@ -6,12 +6,18 @@
  * Result callback
  */
 public interface ResultCallback<RES_T> extends Closeable {
-	/** Called when the async processing starts. The passed {@link Closeable} can be used to close/interrupt the processing */
-	void onStart(Closeable closeable);
-	/** Called when an async result event occurs */
+    /**
+     * Called when the async processing starts. The passed {@link Closeable} can be used to close/interrupt the
+     * processing
+     */
+    void onStart(Closeable closeable);
+
+    /** Called when an async result event occurs */
     void onNext(RES_T object);
+
     /** Called when an exception occurs while processing */
     void onError(Throwable throwable);
+
     /** Called when processing was finished either by reaching the end or by aborting it */
     void onComplete();
 
diff --git a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
index ffb282095..c414947fe 100644
--- a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
@@ -19,64 +19,60 @@
  * @param stderr
  *            - true or false, includes stderr log. Defaults to false.
  * @param timestamps
- *            - true or false, if true, print timestamps for every log line.
- *            Defaults to false.
+ *            - true or false, if true, print timestamps for every log line. Defaults to false.
  */
 public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, Frame, Void> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public boolean hasLogsEnabled();
+    public boolean hasLogsEnabled();
 
-	public boolean hasFollowStreamEnabled();
+    public boolean hasFollowStreamEnabled();
 
-	public boolean hasTimestampsEnabled();
+    public boolean hasTimestampsEnabled();
 
-	public boolean hasStdoutEnabled();
+    public boolean hasStdoutEnabled();
 
-	public boolean hasStderrEnabled();
+    public boolean hasStderrEnabled();
 
-	public AttachContainerCmd withContainerId(String containerId);
+    public AttachContainerCmd withContainerId(String containerId);
 
-	/**
-	 * See {@link #withFollowStream(boolean)}
-	 */
-	public AttachContainerCmd withFollowStream();
+    /**
+     * See {@link #withFollowStream(boolean)}
+     */
+    public AttachContainerCmd withFollowStream();
 
-	/**
-	 * Following the stream means the resulting {@link InputStream} returned by
-	 * {@link #exec()} reads infinitely. So a {@link InputStream#read()} MAY
-	 * BLOCK FOREVER as long as no data is streamed from the docker host to
-	 * {@link DockerClient}!
-	 */
-	public AttachContainerCmd withFollowStream(boolean followStream);
+    /**
+     * Following the stream means the resulting {@link InputStream} returned by {@link #exec()} reads infinitely. So a
+     * {@link InputStream#read()} MAY BLOCK FOREVER as long as no data is streamed from the docker host to
+     * {@link DockerClient}!
+     */
+    public AttachContainerCmd withFollowStream(boolean followStream);
 
-	public AttachContainerCmd withTimestamps(boolean timestamps);
+    public AttachContainerCmd withTimestamps(boolean timestamps);
 
-	public AttachContainerCmd withStdOut();
+    public AttachContainerCmd withStdOut();
 
-	public AttachContainerCmd withStdOut(boolean stdout);
+    public AttachContainerCmd withStdOut(boolean stdout);
 
-	public AttachContainerCmd withStdErr();
+    public AttachContainerCmd withStdErr();
 
-	public AttachContainerCmd withStdErr(boolean stderr);
+    public AttachContainerCmd withStdErr(boolean stderr);
 
-	public AttachContainerCmd withLogs(boolean logs);
+    public AttachContainerCmd withLogs(boolean logs);
 
-	public AttachContainerCmd withLogs();
+    public AttachContainerCmd withLogs();
 
-	/**
-	 * Its the responsibility of the caller to consume and/or close the
-	 * {@link InputStream} to prevent connection leaks.
-	 *
-	 * @throws NotFoundException
-	 *             No such container
-	 */
-	@Override
-	public Void exec() throws NotFoundException;
+    /**
+     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
+     *
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public Void exec() throws NotFoundException;
 
-	public static interface Exec extends
-			DockerCmdExec<AttachContainerCmd, Void> {
-	}
+    public static interface Exec extends DockerCmdExec<AttachContainerCmd, Void> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
index 3c5922583..c84fcb3b9 100644
--- a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
@@ -10,20 +10,21 @@
  * 
  */
 public interface AuthCmd extends DockerCmd<AuthResponse> {
-	
-	public AuthConfig getAuthConfig();
 
-	public AuthCmd withAuthConfig(AuthConfig authConfig);
+    public AuthConfig getAuthConfig();
+
+    public AuthCmd withAuthConfig(AuthConfig authConfig);
 
     /**
      * @return The status. Based on it's value you may mean you need to authorise your account, e.g.:
-     *  "Account created. Please see the documentation of the registry http://localhost:5000/v1/ for instructions how to activate it."
-     * @throws UnauthorizedException If you're not authorised (e.g. bad password).
+     *         "Account created. Please see the documentation of the registry http://localhost:5000/v1/ for instructions how to activate it."
+     * @throws UnauthorizedException
+     *             If you're not authorised (e.g. bad password).
      */
-	@Override
-	public AuthResponse exec() throws UnauthorizedException;
-	
-	public static interface Exec extends DockerCmdExec<AuthCmd, AuthResponse> {
-	}
+    @Override
+    public AuthResponse exec() throws UnauthorizedException;
+
+    public static interface Exec extends DockerCmdExec<AuthCmd, AuthResponse> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 925946db4..5dd1cc177 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -14,58 +14,58 @@
  * TODO: http://docs.docker.com/reference/builder/#dockerignore
  * 
  */
-public interface BuildImageCmd extends DockerCmd<BuildImageCmd.Response>{
+public interface BuildImageCmd extends DockerCmd<BuildImageCmd.Response> {
 
-	public BuildImageCmd withTag(String tag);
+    public BuildImageCmd withTag(String tag);
 
-	public InputStream getTarInputStream();
+    public InputStream getTarInputStream();
 
-	public String getTag();
+    public String getTag();
 
-	public boolean hasNoCacheEnabled();
+    public boolean hasNoCacheEnabled();
 
-	public boolean hasRemoveEnabled();
-	
-	public boolean isQuiet();
-	
-	public boolean hasPullEnabled();
+    public boolean hasRemoveEnabled();
+
+    public boolean isQuiet();
+
+    public boolean hasPullEnabled();
 
     public String getPathToDockerfile();
 
-	public AuthConfigurations getBuildAuthConfigs();
+    public AuthConfigurations getBuildAuthConfigs();
 
     public BuildImageCmd withBaseDirectory(File baseDirectory);
 
     public BuildImageCmd withDockerfile(File dockerfile);
-	
-	public BuildImageCmd withTarInputStream(InputStream tarInputStream);
-
-	public BuildImageCmd withNoCache();
-
-	public BuildImageCmd withNoCache(boolean noCache);
-	
-	public BuildImageCmd withRemove();
-
-	public BuildImageCmd withRemove(boolean rm);
-	
-	public BuildImageCmd withQuiet();
-
-	public BuildImageCmd withQuiet(boolean quiet);
-	
-	public BuildImageCmd withPull();
-
-	public BuildImageCmd withPull(boolean pull);
-	
-  	public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfig);
-	
-	public static interface Exec extends DockerCmdExec<BuildImageCmd, BuildImageCmd.Response> {
-	}
-
-	/**
-	 * @see  {@link com.github.dockerjava.core.command.EventStreamReader}
-	 */
-  public static abstract class Response extends InputStream {
-    public abstract Iterable<EventStreamItem> getItems() throws IOException;
-  }
+
+    public BuildImageCmd withTarInputStream(InputStream tarInputStream);
+
+    public BuildImageCmd withNoCache();
+
+    public BuildImageCmd withNoCache(boolean noCache);
+
+    public BuildImageCmd withRemove();
+
+    public BuildImageCmd withRemove(boolean rm);
+
+    public BuildImageCmd withQuiet();
+
+    public BuildImageCmd withQuiet(boolean quiet);
+
+    public BuildImageCmd withPull();
+
+    public BuildImageCmd withPull(boolean pull);
+
+    public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfig);
+
+    public static interface Exec extends DockerCmdExec<BuildImageCmd, BuildImageCmd.Response> {
+    }
+
+    /**
+     * @see {@link com.github.dockerjava.core.command.EventStreamReader}
+     */
+    public static abstract class Response extends InputStream {
+        public abstract Iterable<EventStreamItem> getItems() throws IOException;
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
index ac0a7bb5e..2c24a0f42 100644
--- a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
@@ -5,111 +5,112 @@
 import com.github.dockerjava.api.model.Volumes;
 
 /**
-*
-* Create a new image from a container's changes. Returns the new image ID.
-*
-*/
-public interface CommitCmd extends DockerCmd<String>{
+ *
+ * Create a new image from a container's changes. Returns the new image ID.
+ *
+ */
+public interface CommitCmd extends DockerCmd<String> {
 
-	public String getContainerId();
-	
-	public CommitCmd withContainerId(String containerId);
+    public String getContainerId();
 
-	public String getRepository();
+    public CommitCmd withContainerId(String containerId);
 
-	public String getTag();
+    public String getRepository();
 
-	public String getMessage();
+    public String getTag();
 
-	public String getAuthor();
+    public String getMessage();
 
-	public boolean hasPauseEnabled();
+    public String getAuthor();
 
-	public CommitCmd withAttachStderr(boolean attachStderr);
+    public boolean hasPauseEnabled();
 
-	public CommitCmd withAttachStderr();
+    public CommitCmd withAttachStderr(boolean attachStderr);
 
-	public CommitCmd withAttachStdin(boolean attachStdin);
+    public CommitCmd withAttachStderr();
 
-	public CommitCmd withAttachStdin();
+    public CommitCmd withAttachStdin(boolean attachStdin);
 
-	public CommitCmd withAttachStdout(boolean attachStdout);
+    public CommitCmd withAttachStdin();
 
-	public CommitCmd withAttachStdout();
+    public CommitCmd withAttachStdout(boolean attachStdout);
 
-	public CommitCmd withCmd(String... cmd);
+    public CommitCmd withAttachStdout();
 
-	public CommitCmd withDisableNetwork(boolean disableNetwork);
+    public CommitCmd withCmd(String... cmd);
 
-	public CommitCmd withAuthor(String author);
+    public CommitCmd withDisableNetwork(boolean disableNetwork);
 
-	public CommitCmd withMessage(String message);
+    public CommitCmd withAuthor(String author);
 
-	public CommitCmd withTag(String tag);
+    public CommitCmd withMessage(String message);
 
-	public CommitCmd withRepository(String repository);
+    public CommitCmd withTag(String tag);
 
-	public CommitCmd withPause(boolean pause);
+    public CommitCmd withRepository(String repository);
 
-	public String[] getEnv();
+    public CommitCmd withPause(boolean pause);
 
-	public CommitCmd withEnv(String... env);
+    public String[] getEnv();
 
-	public ExposedPorts getExposedPorts();
+    public CommitCmd withEnv(String... env);
 
-	public CommitCmd withExposedPorts(ExposedPorts exposedPorts);
+    public ExposedPorts getExposedPorts();
 
-	public String getHostname();
+    public CommitCmd withExposedPorts(ExposedPorts exposedPorts);
 
-	public CommitCmd withHostname(String hostname);
+    public String getHostname();
 
-	public Integer getMemory();
+    public CommitCmd withHostname(String hostname);
 
-	public CommitCmd withMemory(Integer memory);
+    public Integer getMemory();
 
-	public Integer getMemorySwap();
+    public CommitCmd withMemory(Integer memory);
 
-	public CommitCmd withMemorySwap(Integer memorySwap);
+    public Integer getMemorySwap();
 
-	public boolean isOpenStdin();
+    public CommitCmd withMemorySwap(Integer memorySwap);
 
-	public CommitCmd withOpenStdin(boolean openStdin);
+    public boolean isOpenStdin();
 
-	public String[] getPortSpecs();
+    public CommitCmd withOpenStdin(boolean openStdin);
 
-	public CommitCmd withPortSpecs(String... portSpecs);
+    public String[] getPortSpecs();
 
-	public boolean isStdinOnce();
+    public CommitCmd withPortSpecs(String... portSpecs);
 
-	public CommitCmd withStdinOnce(boolean stdinOnce);
+    public boolean isStdinOnce();
 
-	public CommitCmd withStdinOnce();
+    public CommitCmd withStdinOnce(boolean stdinOnce);
 
-	public boolean isTty();
+    public CommitCmd withStdinOnce();
 
-	public CommitCmd withTty(boolean tty);
+    public boolean isTty();
 
-	public CommitCmd withTty();
+    public CommitCmd withTty(boolean tty);
 
-	public String getUser();
+    public CommitCmd withTty();
 
-	public CommitCmd withUser(String user);
+    public String getUser();
 
-	public Volumes getVolumes();
+    public CommitCmd withUser(String user);
 
-	public CommitCmd withVolumes(Volumes volumes);
+    public Volumes getVolumes();
 
-	public String getWorkingDir();
+    public CommitCmd withVolumes(Volumes volumes);
 
-	public CommitCmd withWorkingDir(String workingDir);
+    public String getWorkingDir();
 
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public String exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<CommitCmd, String> {
-	}
+    public CommitCmd withWorkingDir(String workingDir);
+
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public String exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<CommitCmd, String> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java b/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
index 21d99045d..ed7028460 100644
--- a/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
@@ -9,22 +9,25 @@
 
 public interface ContainerDiffCmd extends DockerCmd<List<ChangeLog>> {
 
-	public String getContainerId();
-
-	public ContainerDiffCmd withContainerId(String containerId);
-
-	@Override
-	public String toString();
-
-	/**
-	 * @throws NotFoundException No such container
-	 * @throws InternalServerErrorException server error
-	 * @throws DockerException unexpected http status code
-	 */
-	@Override
-	public List<ChangeLog> exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<ContainerDiffCmd, List<ChangeLog>> {
-	}
+    public String getContainerId();
+
+    public ContainerDiffCmd withContainerId(String containerId);
+
+    @Override
+    public String toString();
+
+    /**
+     * @throws NotFoundException
+     *             No such container
+     * @throws InternalServerErrorException
+     *             server error
+     * @throws DockerException
+     *             unexpected http status code
+     */
+    @Override
+    public List<ChangeLog> exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<ContainerDiffCmd, List<ChangeLog>> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
index 5e85d9984..eb67dfbd9 100644
--- a/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
@@ -6,28 +6,28 @@
 
 public interface CopyFileFromContainerCmd extends DockerCmd<InputStream> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public String getResource();
+    public String getResource();
 
-	public CopyFileFromContainerCmd withContainerId(String containerId);
+    public CopyFileFromContainerCmd withContainerId(String containerId);
 
-	public CopyFileFromContainerCmd withResource(String resource);
+    public CopyFileFromContainerCmd withResource(String resource);
 
-	public String getHostPath();
+    public String getHostPath();
 
-	public CopyFileFromContainerCmd withHostPath(String hostPath);
+    public CopyFileFromContainerCmd withHostPath(String hostPath);
 
-	/**
-	 * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent
-	 * connection leaks.
-	 * 
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public InputStream exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<CopyFileFromContainerCmd, InputStream> {
-	}
+    /**
+     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
+     * 
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public InputStream exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<CopyFileFromContainerCmd, InputStream> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
index d26824715..a25535d5b 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
@@ -4,31 +4,33 @@
 
 public interface CreateImageCmd extends DockerCmd<CreateImageResponse> {
 
-	public String getRepository();
-
-	// TODO remove method
-	public String getTag();
-	
-	public InputStream getImageStream();
-
-	/**
-	 * @param repository        the repository to import to
-	 */
-	public CreateImageCmd withRepository(String repository);
-
-	/**
-	 * @param imageStream       the InputStream of the tar file
-	 */
-	public CreateImageCmd withImageStream(InputStream imageStream);
-
-	/**
-	 * @param tag               any tag for this image
-	 * @deprecated 				use repo:tag format for repository
-	 */
-	public CreateImageCmd withTag(String tag);
-	
-	public static interface Exec extends DockerCmdExec<CreateImageCmd, CreateImageResponse> {
-	}
-
+    public String getRepository();
+
+    // TODO remove method
+    public String getTag();
+
+    public InputStream getImageStream();
+
+    /**
+     * @param repository
+     *            the repository to import to
+     */
+    public CreateImageCmd withRepository(String repository);
+
+    /**
+     * @param imageStream
+     *            the InputStream of the tar file
+     */
+    public CreateImageCmd withImageStream(InputStream imageStream);
+
+    /**
+     * @param tag
+     *            any tag for this image
+     * @deprecated use repo:tag format for repository
+     */
+    public CreateImageCmd withTag(String tag);
+
+    public static interface Exec extends DockerCmdExec<CreateImageCmd, CreateImageResponse> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmd.java b/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
index 89c31666f..79236b890 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
@@ -4,6 +4,6 @@
 
 public interface DockerCmd<RES_T> extends Closeable {
 
-	public RES_T exec();
+    public RES_T exec();
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExec.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExec.java
index 8cf13e7bb..635395ed0 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExec.java
@@ -1,7 +1,7 @@
 package com.github.dockerjava.api.command;
 
 public interface DockerCmdExec<CMD_T extends DockerCmd<RES_T>, RES_T> {
-	
-	public RES_T exec(CMD_T command);	
+
+    public RES_T exec(CMD_T command);
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index 294d50994..fc750a743 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -7,82 +7,81 @@
 
 public interface DockerCmdExecFactory extends Closeable {
 
-	public void init(DockerClientConfig dockerClientConfig);
+    public void init(DockerClientConfig dockerClientConfig);
 
-	public AuthCmd.Exec createAuthCmdExec();
+    public AuthCmd.Exec createAuthCmdExec();
 
-	public InfoCmd.Exec createInfoCmdExec();
+    public InfoCmd.Exec createInfoCmdExec();
 
-	public PingCmd.Exec createPingCmdExec();
+    public PingCmd.Exec createPingCmdExec();
 
     public ExecCreateCmd.Exec createExecCmdExec();
 
-	public VersionCmd.Exec createVersionCmdExec();
+    public VersionCmd.Exec createVersionCmdExec();
 
-	public PullImageCmd.Exec createPullImageCmdExec();
+    public PullImageCmd.Exec createPullImageCmdExec();
+
+    public PushImageCmd.Exec createPushImageCmdExec();
 
-	public PushImageCmd.Exec createPushImageCmdExec();
-    
     public SaveImageCmd.Exec createSaveImageCmdExec();
 
-	public CreateImageCmd.Exec createCreateImageCmdExec();
+    public CreateImageCmd.Exec createCreateImageCmdExec();
 
-	public SearchImagesCmd.Exec createSearchImagesCmdExec();
+    public SearchImagesCmd.Exec createSearchImagesCmdExec();
 
-	public RemoveImageCmd.Exec createRemoveImageCmdExec();
+    public RemoveImageCmd.Exec createRemoveImageCmdExec();
 
-	public ListImagesCmd.Exec createListImagesCmdExec();
+    public ListImagesCmd.Exec createListImagesCmdExec();
 
-	public InspectImageCmd.Exec createInspectImageCmdExec();
+    public InspectImageCmd.Exec createInspectImageCmdExec();
 
-	public ListContainersCmd.Exec createListContainersCmdExec();
+    public ListContainersCmd.Exec createListContainersCmdExec();
 
-	public CreateContainerCmd.Exec createCreateContainerCmdExec();
+    public CreateContainerCmd.Exec createCreateContainerCmdExec();
 
-	public StartContainerCmd.Exec createStartContainerCmdExec();
+    public StartContainerCmd.Exec createStartContainerCmdExec();
 
-	public InspectContainerCmd.Exec createInspectContainerCmdExec();
+    public InspectContainerCmd.Exec createInspectContainerCmdExec();
 
-	public RemoveContainerCmd.Exec createRemoveContainerCmdExec();
+    public RemoveContainerCmd.Exec createRemoveContainerCmdExec();
 
-	public WaitContainerCmd.Exec createWaitContainerCmdExec();
+    public WaitContainerCmd.Exec createWaitContainerCmdExec();
 
-	public AttachContainerCmd.Exec createAttachContainerCmdExec();
+    public AttachContainerCmd.Exec createAttachContainerCmdExec();
 
     public ExecStartCmd.Exec createExecStartCmdExec();
 
     public InspectExecCmd.Exec createInspectExecCmdExec();
 
-	public LogContainerCmd.Exec createLogContainerCmdExec();
+    public LogContainerCmd.Exec createLogContainerCmdExec();
 
-	public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec();
+    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec();
 
-	public StopContainerCmd.Exec createStopContainerCmdExec();
+    public StopContainerCmd.Exec createStopContainerCmdExec();
 
-	public ContainerDiffCmd.Exec createContainerDiffCmdExec();
+    public ContainerDiffCmd.Exec createContainerDiffCmdExec();
 
-	public KillContainerCmd.Exec createKillContainerCmdExec();
+    public KillContainerCmd.Exec createKillContainerCmdExec();
 
-	public RestartContainerCmd.Exec createRestartContainerCmdExec();
+    public RestartContainerCmd.Exec createRestartContainerCmdExec();
 
-	public CommitCmd.Exec createCommitCmdExec();
+    public CommitCmd.Exec createCommitCmdExec();
 
-	public BuildImageCmd.Exec createBuildImageCmdExec();
+    public BuildImageCmd.Exec createBuildImageCmdExec();
 
-	public TopContainerCmd.Exec createTopContainerCmdExec();
+    public TopContainerCmd.Exec createTopContainerCmdExec();
 
-	public TagImageCmd.Exec createTagImageCmdExec();
+    public TagImageCmd.Exec createTagImageCmdExec();
 
-	public PauseContainerCmd.Exec createPauseContainerCmdExec();
+    public PauseContainerCmd.Exec createPauseContainerCmdExec();
 
-	public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec();
+    public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec();
 
-	public EventsCmd.Exec createEventsCmdExec();
-	
-	public StatsCmd.Exec createStatsCmdExec();
+    public EventsCmd.Exec createEventsCmdExec();
 
+    public StatsCmd.Exec createStatsCmdExec();
 
-	@Override
-	public void close() throws IOException;
+    @Override
+    public void close() throws IOException;
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java b/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
index 17ec37248..057bed644 100644
--- a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
@@ -2,12 +2,13 @@
 
 import com.github.dockerjava.api.model.Event;
 
-
 /**
  * Get events
  *
- * @param since - Show all events created since timestamp
- * @param until - Stream events until this timestamp
+ * @param since
+ *            - Show all events created since timestamp
+ * @param until
+ *            - Stream events until this timestamp
  */
 public interface EventsCmd extends AsyncDockerCmd<EventsCmd, Event, Void> {
     public EventsCmd withSince(String since);
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
index c1f32e293..ffeef0153 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
@@ -3,33 +3,33 @@
 public interface ExecCreateCmd extends DockerCmd<ExecCreateCmdResponse> {
 
     public String getContainerId();
-    
+
     public ExecCreateCmd withContainerId(String containerId);
 
     public ExecCreateCmd withCmd(String... cmd);
 
     public ExecCreateCmd withAttachStdin(boolean attachStdin);
-    
+
     public ExecCreateCmd withAttachStdin();
-    
+
     public boolean hasAttachStdinEnabled();
 
     public ExecCreateCmd withAttachStdout(boolean attachStdout);
-    
+
     public ExecCreateCmd withAttachStdout();
-    
+
     public boolean hasAttachStdoutEnabled();
 
     public ExecCreateCmd withAttachStderr(boolean attachStderr);
-    
+
     public ExecCreateCmd withAttachStderr();
-    
+
     public boolean hasAttachStderrEnabled();
 
     public ExecCreateCmd withTty(boolean tty);
-    
+
     public ExecCreateCmd withTty();
-    
+
     public boolean hasTtyEnabled();
 
     public static interface Exec extends DockerCmdExec<ExecCreateCmd, ExecCreateCmdResponse> {
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
index 7ccb90cff..339e2c9a0 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
@@ -6,33 +6,31 @@
 
 public interface ExecStartCmd extends DockerCmd<InputStream> {
 
-	public String getExecId();
+    public String getExecId();
 
-	public ExecStartCmd withExecId(String execId);
+    public ExecStartCmd withExecId(String execId);
 
-	public boolean hasDetachEnabled();
+    public boolean hasDetachEnabled();
 
-	public ExecStartCmd withDetach(boolean detach);
-	
-	public ExecStartCmd withDetach();
+    public ExecStartCmd withDetach(boolean detach);
 
-	public boolean hasTtyEnabled();
+    public ExecStartCmd withDetach();
 
-	public ExecStartCmd withTty(boolean tty);
-	
-	public ExecStartCmd withTty();
+    public boolean hasTtyEnabled();
 
-	/**
-	 * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent
-	 * connection leaks.
-	 * 
-	 * @throws com.github.dockerjava.api.NotFoundException
-	 *             No such exec instance
-	 */
-	@Override
-	public InputStream exec() throws NotFoundException;
+    public ExecStartCmd withTty(boolean tty);
 
-	public static interface Exec extends
-			DockerCmdExec<ExecStartCmd, InputStream> {
-	}
+    public ExecStartCmd withTty();
+
+    /**
+     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
+     * 
+     * @throws com.github.dockerjava.api.NotFoundException
+     *             No such exec instance
+     */
+    @Override
+    public InputStream exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<ExecStartCmd, InputStream> {
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/InfoCmd.java b/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
index d340fe268..10e3597e6 100644
--- a/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
@@ -4,7 +4,7 @@
 
 public interface InfoCmd extends DockerCmd<Info> {
 
-	public static interface Exec extends DockerCmdExec<InfoCmd, Info> {
-	}
+    public static interface Exec extends DockerCmdExec<InfoCmd, Info> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
index f67fe4aea..e0d087847 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
@@ -4,17 +4,18 @@
 
 public interface InspectContainerCmd extends DockerCmd<InspectContainerResponse> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public InspectContainerCmd withContainerId(String containerId);
+    public InspectContainerCmd withContainerId(String containerId);
 
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public InspectContainerResponse exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<InspectContainerCmd, InspectContainerResponse> {
-	}
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public InspectContainerResponse exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<InspectContainerCmd, InspectContainerResponse> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index f95656899..dc0507e50 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.command;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -19,58 +18,58 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class InspectContainerResponse {
 
-	@JsonProperty("Args")
-	private String[] args;
+    @JsonProperty("Args")
+    private String[] args;
 
-	@JsonProperty("Config")
-	private ContainerConfig config;
+    @JsonProperty("Config")
+    private ContainerConfig config;
 
-	@JsonProperty("Created")
-	private String created;
+    @JsonProperty("Created")
+    private String created;
 
-	@JsonProperty("Driver")
-	private String driver;
+    @JsonProperty("Driver")
+    private String driver;
 
-	@JsonProperty("ExecDriver")
-	private String execDriver;
+    @JsonProperty("ExecDriver")
+    private String execDriver;
 
-	@JsonProperty("HostConfig")
-	private HostConfig hostConfig;
+    @JsonProperty("HostConfig")
+    private HostConfig hostConfig;
 
-	@JsonProperty("HostnamePath")
-	private String hostnamePath;
+    @JsonProperty("HostnamePath")
+    private String hostnamePath;
 
-	@JsonProperty("HostsPath")
-	private String hostsPath;
+    @JsonProperty("HostsPath")
+    private String hostsPath;
 
-	@JsonProperty("Id")
+    @JsonProperty("Id")
     private String id;
 
-	@JsonProperty("Image")
-	private String imageId;
+    @JsonProperty("Image")
+    private String imageId;
 
-	@JsonProperty("MountLabel")
-	private String mountLabel;
+    @JsonProperty("MountLabel")
+    private String mountLabel;
 
-	@JsonProperty("Name")
-	private String name;
+    @JsonProperty("Name")
+    private String name;
 
-	@JsonProperty("NetworkSettings")
-	private NetworkSettings networkSettings;
+    @JsonProperty("NetworkSettings")
+    private NetworkSettings networkSettings;
 
-	@JsonProperty("Path")
+    @JsonProperty("Path")
     private String path;
 
-	@JsonProperty("ProcessLabel")
+    @JsonProperty("ProcessLabel")
     private String processLabel;
 
-	@JsonProperty("ResolvConfPath")
-	private String resolvConfPath;
+    @JsonProperty("ResolvConfPath")
+    private String resolvConfPath;
 
     @JsonProperty("ExecIDs")
     private List<String> execIds;
 
-	@JsonProperty("State")
+    @JsonProperty("State")
     private ContainerState state;
 
     @JsonProperty("Volumes")
@@ -92,8 +91,8 @@ public String getPath() {
     }
 
     public String getProcessLabel() {
-		return processLabel;
-	}
+        return processLabel;
+    }
 
     public String[] getArgs() {
         return args;
@@ -150,12 +149,12 @@ public HostConfig getHostConfig() {
     }
 
     public String getExecDriver() {
-		return execDriver;
-	}
+        return execDriver;
+    }
 
     public String getMountLabel() {
-		return mountLabel;
-	}
+        return mountLabel;
+    }
 
     public List<String> getExecIds() {
         return execIds;
@@ -169,37 +168,47 @@ public String toString() {
     @JsonIgnoreProperties(ignoreUnknown = true)
     public class NetworkSettings {
 
-        @JsonProperty("IPAddress") private String ipAddress;
-        @JsonProperty("IPPrefixLen") private int ipPrefixLen;
-        @JsonProperty("Gateway") private String gateway;
-        @JsonProperty("Bridge") private String bridge;
-        @JsonProperty("PortMapping") private Map<String,Map<String, String>> portMapping;
-        @JsonProperty("Ports") private Ports ports;
+        @JsonProperty("IPAddress")
+        private String ipAddress;
 
-        public String getIpAddress() {
-			return ipAddress;
-		}
+        @JsonProperty("IPPrefixLen")
+        private int ipPrefixLen;
+
+        @JsonProperty("Gateway")
+        private String gateway;
+
+        @JsonProperty("Bridge")
+        private String bridge;
 
-		public int getIpPrefixLen() {
-			return ipPrefixLen;
-		}
+        @JsonProperty("PortMapping")
+        private Map<String, Map<String, String>> portMapping;
 
-		public String getGateway() {
-			return gateway;
-		}
+        @JsonProperty("Ports")
+        private Ports ports;
 
-		public String getBridge() {
-			return bridge;
-		}
+        public String getIpAddress() {
+            return ipAddress;
+        }
+
+        public int getIpPrefixLen() {
+            return ipPrefixLen;
+        }
 
-		public Map<String, Map<String, String>> getPortMapping() {
-			return portMapping;
-		}
+        public String getGateway() {
+            return gateway;
+        }
+
+        public String getBridge() {
+            return bridge;
+        }
 
-		public Ports getPorts() {
-			return ports;
-		}
+        public Map<String, Map<String, String>> getPortMapping() {
+            return portMapping;
+        }
 
+        public Ports getPorts() {
+            return ports;
+        }
 
         @Override
         public String toString() {
@@ -210,36 +219,47 @@ public String toString() {
     @JsonIgnoreProperties(ignoreUnknown = true)
     public class ContainerState {
 
-        @JsonProperty("Running") private boolean running;
-        @JsonProperty("Paused") private boolean paused;
-        @JsonProperty("Pid") private int pid;
-        @JsonProperty("ExitCode") private int exitCode;
-        @JsonProperty("StartedAt") private String startedAt;
-        @JsonProperty("FinishedAt") private String finishedAt;
+        @JsonProperty("Running")
+        private boolean running;
+
+        @JsonProperty("Paused")
+        private boolean paused;
+
+        @JsonProperty("Pid")
+        private int pid;
+
+        @JsonProperty("ExitCode")
+        private int exitCode;
+
+        @JsonProperty("StartedAt")
+        private String startedAt;
+
+        @JsonProperty("FinishedAt")
+        private String finishedAt;
 
         public boolean isRunning() {
-			return running;
-		}
+            return running;
+        }
 
-		public boolean isPaused() {
-			return paused;
-		}
+        public boolean isPaused() {
+            return paused;
+        }
 
-		public int getPid() {
-			return pid;
-		}
+        public int getPid() {
+            return pid;
+        }
 
-		public int getExitCode() {
-			return exitCode;
-		}
+        public int getExitCode() {
+            return exitCode;
+        }
 
-		public String getStartedAt() {
-			return startedAt;
-		}
+        public String getStartedAt() {
+            return startedAt;
+        }
 
-		public String getFinishedAt() {
-			return finishedAt;
-		}
+        public String getFinishedAt() {
+            return finishedAt;
+        }
 
         @Override
         public String toString() {
@@ -248,4 +268,3 @@ public String toString() {
     }
 
 }
-
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
index 13882b8f7..82243614c 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
@@ -4,13 +4,16 @@
 
 public interface InspectExecCmd extends DockerCmd<InspectExecResponse> {
     public String getExecId();
+
     public InspectExecCmd withExecId(String execId);
 
     /**
-     * @throws NotFoundException if no such exec has been found
+     * @throws NotFoundException
+     *             if no such exec has been found
      */
     @Override
     public InspectExecResponse exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<InspectExecCmd, InspectExecResponse> {}
+    public static interface Exec extends DockerCmdExec<InspectExecCmd, InspectExecResponse> {
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
index d064badba..ebf6550d2 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
@@ -5,19 +5,20 @@
 /**
  * Inspect the details of an image.
  */
-public interface InspectImageCmd extends DockerCmd<InspectImageResponse>{
+public interface InspectImageCmd extends DockerCmd<InspectImageResponse> {
 
-	public String getImageId();
+    public String getImageId();
 
-	public InspectImageCmd withImageId(String imageId);
+    public InspectImageCmd withImageId(String imageId);
 
-	/**
-	 * @throws NotFoundException No such image
-	 */
-	@Override
-	public InspectImageResponse exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<InspectImageCmd, InspectImageResponse> {
-	}
+    /**
+     * @throws NotFoundException
+     *             No such image
+     */
+    @Override
+    public InspectImageResponse exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<InspectImageCmd, InspectImageResponse> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
index b5b6432d7..63f5e49c6 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
@@ -14,28 +14,28 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class InspectImageResponse {
 
-	@JsonProperty("Architecture")
+    @JsonProperty("Architecture")
     private String arch;
 
-	@JsonProperty("Author")
+    @JsonProperty("Author")
     private String author;
 
-	@JsonProperty("Comment")
+    @JsonProperty("Comment")
     private String comment;
 
-	@JsonProperty("Config")
+    @JsonProperty("Config")
     private ContainerConfig config;
 
-	@JsonProperty("Container")
+    @JsonProperty("Container")
     private String container;
 
-	@JsonProperty("ContainerConfig")
+    @JsonProperty("ContainerConfig")
     private ContainerConfig containerConfig;
 
-	@JsonProperty("Created")
-	private String created;
+    @JsonProperty("Created")
+    private String created;
 
-	@JsonProperty("DockerVersion")
+    @JsonProperty("DockerVersion")
     private String dockerVersion;
 
     @JsonProperty("Id")
diff --git a/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
index b9522cb8c..33fceba3b 100644
--- a/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
@@ -7,21 +7,22 @@
  */
 public interface KillContainerCmd extends DockerCmd<Void> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public String getSignal();
+    public String getSignal();
 
-	public KillContainerCmd withContainerId(String containerId);
+    public KillContainerCmd withContainerId(String containerId);
 
-	public KillContainerCmd withSignal(String signal);
+    public KillContainerCmd withSignal(String signal);
 
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public Void exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<KillContainerCmd, Void> {
-	}
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public Void exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<KillContainerCmd, Void> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
index ed457dab7..6d641f2e3 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
@@ -7,36 +7,41 @@
 /**
  * List containers
  *
- * @param showAll - true or false, Show all containers. Only running containers are shown by default.
- * @param showSize - true or false, Show the containers sizes. This is false by default.
- * @param limit - Show `limit` last created containers, include non-running ones. There is no limit by default.
- * @param sinceId - Show only containers created since Id, include non-running ones.
- * @param beforeId - Show only containers created before Id, include non-running ones.
+ * @param showAll
+ *            - true or false, Show all containers. Only running containers are shown by default.
+ * @param showSize
+ *            - true or false, Show the containers sizes. This is false by default.
+ * @param limit
+ *            - Show `limit` last created containers, include non-running ones. There is no limit by default.
+ * @param sinceId
+ *            - Show only containers created since Id, include non-running ones.
+ * @param beforeId
+ *            - Show only containers created before Id, include non-running ones.
  *
  */
-public interface ListContainersCmd extends DockerCmd<List<Container>>{
+public interface ListContainersCmd extends DockerCmd<List<Container>> {
 
-	public int getLimit();
+    public int getLimit();
 
-	public boolean hasShowSizeEnabled();
+    public boolean hasShowSizeEnabled();
 
-	public boolean hasShowAllEnabled();
+    public boolean hasShowAllEnabled();
 
-	public String getSinceId();
+    public String getSinceId();
 
-	public String getBeforeId();
+    public String getBeforeId();
 
-	public ListContainersCmd withShowAll(boolean showAll);
+    public ListContainersCmd withShowAll(boolean showAll);
 
-	public ListContainersCmd withShowSize(boolean showSize);
+    public ListContainersCmd withShowSize(boolean showSize);
 
-	public ListContainersCmd withLimit(int limit);
+    public ListContainersCmd withLimit(int limit);
 
-	public ListContainersCmd withSince(String since);
+    public ListContainersCmd withSince(String since);
 
-	public ListContainersCmd withBefore(String before);
-	
-	public static interface Exec extends DockerCmdExec<ListContainersCmd, List<Container>> {
-	}
+    public ListContainersCmd withBefore(String before);
+
+    public static interface Exec extends DockerCmdExec<ListContainersCmd, List<Container>> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java b/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
index fad6d1da7..4c6a899cf 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
@@ -7,20 +7,22 @@
 /**
  * List images
  *
- * @param showAll - Show all images (by default filter out the intermediate images used to build)
- * @param filters - a json encoded value of the filters (a map[string][]string) to process on the images list.
+ * @param showAll
+ *            - Show all images (by default filter out the intermediate images used to build)
+ * @param filters
+ *            - a json encoded value of the filters (a map[string][]string) to process on the images list.
  */
 public interface ListImagesCmd extends DockerCmd<List<Image>> {
 
-	public String getFilters();
+    public String getFilters();
 
-	public boolean hasShowAllEnabled();
+    public boolean hasShowAllEnabled();
 
-	public ListImagesCmd withShowAll(boolean showAll);
+    public ListImagesCmd withShowAll(boolean showAll);
 
-	public ListImagesCmd withFilters(String filters);
+    public ListImagesCmd withFilters(String filters);
 
-	public static interface Exec extends DockerCmdExec<ListImagesCmd, List<Image>> {
-	}
+    public static interface Exec extends DockerCmdExec<ListImagesCmd, List<Image>> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
index 2eff3c217..48a3b8976 100644
--- a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -17,73 +17,67 @@
  * @param stderr
  *            - true or false, includes stderr log. Defaults to false.
  * @param timestamps
- *            - true or false, if true, print timestamps for every log line.
- *            Defaults to false.
+ *            - true or false, if true, print timestamps for every log line. Defaults to false.
  * @param tail
- *            - `all` or `<number>`, Output specified number of lines at the end
- *            of logs
+ *            - `all` or `<number>`, Output specified number of lines at the end of logs
  *
- *            Consider wrapping any input stream you get with a frame reader to
- *            make reading frame easier.
+ *            Consider wrapping any input stream you get with a frame reader to make reading frame easier.
  *
  */
 public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame, Void> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public int getTail();
+    public int getTail();
 
-	public boolean hasFollowStreamEnabled();
+    public boolean hasFollowStreamEnabled();
 
-	public boolean hasTimestampsEnabled();
+    public boolean hasTimestampsEnabled();
 
-	public boolean hasStdoutEnabled();
+    public boolean hasStdoutEnabled();
 
-	public boolean hasStderrEnabled();
+    public boolean hasStderrEnabled();
 
-	public LogContainerCmd withContainerId(String containerId);
+    public LogContainerCmd withContainerId(String containerId);
 
-	/**
-	 * See {@link #withFollowStream(boolean)}
-	 */
-	public LogContainerCmd withFollowStream();
+    /**
+     * See {@link #withFollowStream(boolean)}
+     */
+    public LogContainerCmd withFollowStream();
 
-	/**
-	 * Following the stream means the resulting {@link InputStream} returned by
-	 * {@link #exec()} reads infinitely. So a {@link InputStream#read()} MAY
-	 * BLOCK FOREVER as long as no data is streamed from the docker host to
-	 * {@link DockerClient}!
-	 */
-	public LogContainerCmd withFollowStream(boolean followStream);
+    /**
+     * Following the stream means the resulting {@link InputStream} returned by {@link #exec()} reads infinitely. So a
+     * {@link InputStream#read()} MAY BLOCK FOREVER as long as no data is streamed from the docker host to
+     * {@link DockerClient}!
+     */
+    public LogContainerCmd withFollowStream(boolean followStream);
 
-	public LogContainerCmd withTimestamps();
+    public LogContainerCmd withTimestamps();
 
-	public LogContainerCmd withTimestamps(boolean timestamps);
+    public LogContainerCmd withTimestamps(boolean timestamps);
 
-	public LogContainerCmd withStdOut();
+    public LogContainerCmd withStdOut();
 
-	public LogContainerCmd withStdOut(boolean stdout);
+    public LogContainerCmd withStdOut(boolean stdout);
 
-	public LogContainerCmd withStdErr();
+    public LogContainerCmd withStdErr();
 
-	public LogContainerCmd withStdErr(boolean stderr);
+    public LogContainerCmd withStdErr(boolean stderr);
 
-	public LogContainerCmd withTailAll();
+    public LogContainerCmd withTailAll();
 
-	public LogContainerCmd withTail(int tail);
+    public LogContainerCmd withTail(int tail);
 
-	/**
-	 * Its the responsibility of the caller to consume and/or close the
-	 * {@link InputStream} to prevent connection leaks.
-	 *
-	 * @throws NotFoundException
-	 *             No such container
-	 */
-	@Override
-	public Void exec() throws NotFoundException;
+    /**
+     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
+     *
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public Void exec() throws NotFoundException;
 
-	public static interface Exec extends
-			DockerCmdExec<LogContainerCmd, Void> {
-	}
+    public static interface Exec extends DockerCmdExec<LogContainerCmd, Void> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
index 652d433e4..a052c8bcf 100644
--- a/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
@@ -5,22 +5,24 @@
 /**
  * Pause a container.
  *
- * @param containerId - Id of the container
+ * @param containerId
+ *            - Id of the container
  *
  */
-public interface PauseContainerCmd extends DockerCmd<Void>{
+public interface PauseContainerCmd extends DockerCmd<Void> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public PauseContainerCmd withContainerId(String containerId);
+    public PauseContainerCmd withContainerId(String containerId);
 
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public Void exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<PauseContainerCmd, Void> {
-	}
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public Void exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<PauseContainerCmd, Void> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/PingCmd.java b/src/main/java/com/github/dockerjava/api/command/PingCmd.java
index 7d5af1e35..a5d88056a 100644
--- a/src/main/java/com/github/dockerjava/api/command/PingCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PingCmd.java
@@ -1,13 +1,12 @@
 package com.github.dockerjava.api.command;
 
-
 /**
  * Ping the Docker server
  * 
  */
 public interface PingCmd extends DockerCmd<Void> {
-	
-	public static interface Exec extends DockerCmdExec<PingCmd, Void> {
-	}
+
+    public static interface Exec extends DockerCmdExec<PingCmd, Void> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java b/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
index 4b5fc4c32..b3e6db6aa 100644
--- a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
@@ -6,34 +6,33 @@
 import java.io.InputStream;
 
 /**
-*
-* Pull image from repository.
-*
-*/
-public interface PullImageCmd extends DockerCmd<InputStream>{
+ *
+ * Pull image from repository.
+ *
+ */
+public interface PullImageCmd extends DockerCmd<InputStream> {
 
-	public String getRepository();
+    public String getRepository();
 
-	public String getTag();
+    public String getTag();
 
-	public String getRegistry();
+    public String getRegistry();
 
     public AuthConfig getAuthConfig();
 
     public PullImageCmd withRepository(String repository);
 
-	public PullImageCmd withTag(String tag);
+    public PullImageCmd withTag(String tag);
 
-	public PullImageCmd withRegistry(String registry);
+    public PullImageCmd withRegistry(String registry);
 
     public PullImageCmd withAuthConfig(AuthConfig authConfig);
 
     public static interface Exec extends DockerCmdExec<PullImageCmd, InputStream> {
-	}
-    
+    }
+
     /**
-     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent
-	 * connection leaks.
+     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
      *
      * @see {@link EventStreamReader}
      */
diff --git a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java b/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
index 9ed38beb7..6b9a67ebe 100644
--- a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
@@ -11,41 +11,45 @@
 /**
  * Push the latest image to the repository.
  *
- * @param name The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
+ * @param name
+ *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
  */
-public interface PushImageCmd extends DockerCmd<PushImageCmd.Response>{
+public interface PushImageCmd extends DockerCmd<PushImageCmd.Response> {
 
-	public String getName();
+    public String getName();
 
-	public String getTag();
+    public String getTag();
 
-	/**
-	 * @param name The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
-	 */
-	public PushImageCmd withName(String name);
-	
     /**
-     * @param tag The image's tag. Not null.
+     * @param name
+     *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
+     */
+    public PushImageCmd withName(String name);
+
+    /**
+     * @param tag
+     *            The image's tag. Not null.
      */
     public PushImageCmd withTag(String tag);
 
     public AuthConfig getAuthConfig();
-	
-	public PushImageCmd withAuthConfig(AuthConfig authConfig);
-
-	/**
-	 * @throws NotFoundException No such image
-	 */
-	public Response exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<PushImageCmd, Response> {
-	}
-
-	/**
-	 * @see {@link EventStreamReader}
-	 */
-  	public static abstract class Response extends InputStream {
-	  public abstract Iterable<PushEventStreamItem> getItems() throws IOException;
-	}
+
+    public PushImageCmd withAuthConfig(AuthConfig authConfig);
+
+    /**
+     * @throws NotFoundException
+     *             No such image
+     */
+    public Response exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<PushImageCmd, Response> {
+    }
+
+    /**
+     * @see {@link EventStreamReader}
+     */
+    public static abstract class Response extends InputStream {
+        public abstract Iterable<PushEventStreamItem> getItems() throws IOException;
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
index b9c1f9437..9f917a327 100644
--- a/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
@@ -5,32 +5,35 @@
 /**
  * Remove a container.
  * 
- * @param removeVolumes - true or false, Remove the volumes associated to the container. Defaults to false
- * @param force - true or false, Removes the container even if it was running. Defaults to false
+ * @param removeVolumes
+ *            - true or false, Remove the volumes associated to the container. Defaults to false
+ * @param force
+ *            - true or false, Removes the container even if it was running. Defaults to false
  */
 public interface RemoveContainerCmd extends DockerCmd<Void> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public boolean hasRemoveVolumesEnabled();
+    public boolean hasRemoveVolumesEnabled();
 
-	public boolean hasForceEnabled();
+    public boolean hasForceEnabled();
 
-	public RemoveContainerCmd withContainerId(String containerId);
+    public RemoveContainerCmd withContainerId(String containerId);
 
-	public RemoveContainerCmd withRemoveVolumes(boolean removeVolumes);
+    public RemoveContainerCmd withRemoveVolumes(boolean removeVolumes);
 
-	public RemoveContainerCmd withForce();
+    public RemoveContainerCmd withForce();
 
-	public RemoveContainerCmd withForce(boolean force);
+    public RemoveContainerCmd withForce(boolean force);
 
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public Void exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<RemoveContainerCmd, Void> {
-	}
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public Void exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<RemoveContainerCmd, Void> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
index be65ca41e..1ce1cd210 100644
--- a/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
@@ -3,48 +3,49 @@
 import com.github.dockerjava.api.NotFoundException;
 
 /**
-*
-* Remove an image, deleting any tags it might have.
-*
-*/
-public interface RemoveImageCmd extends DockerCmd<Void>{
-
-	public String getImageId();
-
-	public boolean hasForceEnabled();
-
-	public boolean hasNoPruneEnabled();
-
-	public RemoveImageCmd withImageId(String imageId);
-	
-	/**
-	 * force delete of an image, even if it's tagged in multiple repositories
-	 */
-	public RemoveImageCmd withForce();
-
-	/**
-	 * force parameter to force delete of an image, even if it's tagged in multiple repositories
-	 */
-	public RemoveImageCmd withForce(boolean force);
-
-	/**
-	 * prevent the deletion of parent images
-	 */
-	public RemoveImageCmd withNoPrune();
-	
-	/**
-	 * noprune parameter to prevent the deletion of parent images
-	 * 
-	 */
-	public RemoveImageCmd withNoPrune(boolean noPrune);
-
-	/**
-	 * @throws NotFoundException No such image
-	 */
-	@Override
-	public Void exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<RemoveImageCmd, Void> {
-	}
+ *
+ * Remove an image, deleting any tags it might have.
+ *
+ */
+public interface RemoveImageCmd extends DockerCmd<Void> {
+
+    public String getImageId();
+
+    public boolean hasForceEnabled();
+
+    public boolean hasNoPruneEnabled();
+
+    public RemoveImageCmd withImageId(String imageId);
+
+    /**
+     * force delete of an image, even if it's tagged in multiple repositories
+     */
+    public RemoveImageCmd withForce();
+
+    /**
+     * force parameter to force delete of an image, even if it's tagged in multiple repositories
+     */
+    public RemoveImageCmd withForce(boolean force);
+
+    /**
+     * prevent the deletion of parent images
+     */
+    public RemoveImageCmd withNoPrune();
+
+    /**
+     * noprune parameter to prevent the deletion of parent images
+     * 
+     */
+    public RemoveImageCmd withNoPrune(boolean noPrune);
+
+    /**
+     * @throws NotFoundException
+     *             No such image
+     */
+    @Override
+    public Void exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<RemoveImageCmd, Void> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
index 8da41d38a..aa07fffd1 100644
--- a/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
@@ -5,26 +5,28 @@
 /**
  * Restart a running container.
  *
- * @param timeout - Timeout in seconds before killing the container. Defaults to 10 seconds.
+ * @param timeout
+ *            - Timeout in seconds before killing the container. Defaults to 10 seconds.
  *
  */
 public interface RestartContainerCmd extends DockerCmd<Void> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public int getTimeout();
+    public int getTimeout();
 
-	public RestartContainerCmd withContainerId(String containerId);
+    public RestartContainerCmd withContainerId(String containerId);
 
-	public RestartContainerCmd withtTimeout(int timeout);
+    public RestartContainerCmd withtTimeout(int timeout);
 
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public Void exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<RestartContainerCmd, Void> {
-	}
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public Void exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<RestartContainerCmd, Void> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java b/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
index 48c5f3191..67425ab66 100644
--- a/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
@@ -4,32 +4,33 @@
 
 import java.io.InputStream;
 
-public interface SaveImageCmd extends DockerCmd<InputStream>{
+public interface SaveImageCmd extends DockerCmd<InputStream> {
 
     public String getName();
 
     public String getTag();
 
     /**
-     * @param name The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
+     * @param name
+     *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
      */
     public SaveImageCmd withName(String name);
 
     /**
-     * @param tag The image's tag. Not null.
+     * @param tag
+     *            The image's tag. Not null.
      */
     public SaveImageCmd withTag(String tag);
 
     /**
-     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent
-	 * connection leaks.
-	 * 
-     * @throws com.github.dockerjava.api.NotFoundException No such image
+     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
+     * 
+     * @throws com.github.dockerjava.api.NotFoundException
+     *             No such image
      */
     public InputStream exec() throws NotFoundException;
 
     public static interface Exec extends DockerCmdExec<SaveImageCmd, InputStream> {
     }
 
-
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java b/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
index c609e6e8e..9279272d3 100644
--- a/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
@@ -7,16 +7,17 @@
 /**
  * Search images
  *
- * @param term - search term
+ * @param term
+ *            - search term
  *
  */
 public interface SearchImagesCmd extends DockerCmd<List<SearchItem>> {
 
-	public String getTerm();
+    public String getTerm();
 
-	public SearchImagesCmd withTerm(String term);
-	
-	public static interface Exec extends DockerCmdExec<SearchImagesCmd, List<SearchItem>> {
-	}
+    public SearchImagesCmd withTerm(String term);
+
+    public static interface Exec extends DockerCmdExec<SearchImagesCmd, List<SearchItem>> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/StatsCmd.java b/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
index 0547cc616..f394d7f3e 100644
--- a/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
@@ -3,9 +3,8 @@
 import com.github.dockerjava.api.model.Statistics;
 
 /**
- * Get container stats. The result of {@link Statistics} is handled asynchronously because
- * the docker remote API will block when a container is stopped until
- * the container is up again.
+ * Get container stats. The result of {@link Statistics} is handled asynchronously because the docker remote API will
+ * block when a container is stopped until the container is up again.
  */
 public interface StatsCmd extends AsyncDockerCmd<StatsCmd, Statistics, Void> {
     public StatsCmd withContainerId(String containerId);
diff --git a/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
index 19c248552..d5bf2e610 100644
--- a/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
@@ -6,28 +6,32 @@
 /**
  * Stop a running container.
  *
- * @param containerId - Id of the container
- * @param timeout - Timeout in seconds before killing the container. Defaults to 10 seconds.
+ * @param containerId
+ *            - Id of the container
+ * @param timeout
+ *            - Timeout in seconds before killing the container. Defaults to 10 seconds.
  *
  */
 public interface StopContainerCmd extends DockerCmd<Void> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public int getTimeout();
+    public int getTimeout();
 
-	public StopContainerCmd withContainerId(String containerId);
+    public StopContainerCmd withContainerId(String containerId);
 
-	public StopContainerCmd withTimeout(int timeout);
+    public StopContainerCmd withTimeout(int timeout);
 
-	/**
-	 * @throws NotFoundException No such container
-	 * @throws NotModifiedException Container already stopped
-	 */
-	@Override
-	public Void exec() throws NotFoundException, NotModifiedException;
-	
-	public static interface Exec extends DockerCmdExec<StopContainerCmd, Void> {
-	}
+    /**
+     * @throws NotFoundException
+     *             No such container
+     * @throws NotModifiedException
+     *             Container already stopped
+     */
+    @Override
+    public Void exec() throws NotFoundException, NotModifiedException;
+
+    public static interface Exec extends DockerCmdExec<StopContainerCmd, Void> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java b/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
index ace84996e..44fd588f1 100644
--- a/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
@@ -1,35 +1,37 @@
 package com.github.dockerjava.api.command;
 
-
 /**
  * Tag an image into a repository
  *
- * @param image			The local image to tag (either a name or an id)
- * @param repository 	The repository to tag in
- * @param force         (not documented)
+ * @param image
+ *            The local image to tag (either a name or an id)
+ * @param repository
+ *            The repository to tag in
+ * @param force
+ *            (not documented)
  * 
  */
 public interface TagImageCmd extends DockerCmd<Void> {
 
-	public String getImageId();
+    public String getImageId();
+
+    public String getRepository();
 
-	public String getRepository();
+    public String getTag();
 
-	public String getTag();
+    public boolean hasForceEnabled();
 
-	public boolean hasForceEnabled();
+    public TagImageCmd withImageId(String imageId);
 
-	public TagImageCmd withImageId(String imageId);
+    public TagImageCmd withRepository(String repository);
 
-	public TagImageCmd withRepository(String repository);
+    public TagImageCmd withTag(String tag);
 
-	public TagImageCmd withTag(String tag);
+    public TagImageCmd withForce();
 
-	public TagImageCmd withForce();
+    public TagImageCmd withForce(boolean force);
 
-	public TagImageCmd withForce(boolean force);
-	
-	public static interface Exec extends DockerCmdExec<TagImageCmd, Void> {
-	}
+    public static interface Exec extends DockerCmdExec<TagImageCmd, Void> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
index 63865c2a6..cc7e33aa3 100644
--- a/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
@@ -7,21 +7,22 @@
  */
 public interface TopContainerCmd extends DockerCmd<TopContainerResponse> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public String getPsArgs();
+    public String getPsArgs();
 
-	public TopContainerCmd withContainerId(String containerId);
+    public TopContainerCmd withContainerId(String containerId);
 
-	public TopContainerCmd withPsArgs(String psArgs);
+    public TopContainerCmd withPsArgs(String psArgs);
 
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public TopContainerResponse exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<TopContainerCmd, TopContainerResponse> {
-	}
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public TopContainerResponse exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<TopContainerCmd, TopContainerResponse> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
index c92ffa4ce..8864167f3 100644
--- a/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
@@ -12,32 +12,30 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class TopContainerResponse {
 
-	@JsonProperty("Titles")
-	private String[] titles;
+    @JsonProperty("Titles")
+    private String[] titles;
 
-	@JsonProperty("Processes")
-	private String[][] processes;
+    @JsonProperty("Processes")
+    private String[][] processes;
 
-	public String[] getTitles() {
-		return titles;
-	}
+    public String[] getTitles() {
+        return titles;
+    }
 
-	public String[][] getProcesses() {
-		return processes;
-	}
+    public String[][] getProcesses() {
+        return processes;
+    }
 
-	@Override
+    @Override
     public String toString() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("[");
-		for(String[] fields: processes) {
-			buffer.append("[" + Joiner.on("; ").skipNulls().join(fields) + "]");
-		}
-		buffer.append("]");
-
-        return "TopContainerResponse{" +
-                "titles=" + Joiner.on("; ").skipNulls().join(titles) +
-                ", processes=" + buffer.toString() +
-                '}';
+        StringBuffer buffer = new StringBuffer();
+        buffer.append("[");
+        for (String[] fields : processes) {
+            buffer.append("[" + Joiner.on("; ").skipNulls().join(fields) + "]");
+        }
+        buffer.append("]");
+
+        return "TopContainerResponse{" + "titles=" + Joiner.on("; ").skipNulls().join(titles) + ", processes="
+                + buffer.toString() + '}';
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
index 166bfa6a8..442191416 100644
--- a/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
@@ -5,22 +5,24 @@
 /**
  * Unpause a container.
  *
- * @param containerId - Id of the container
+ * @param containerId
+ *            - Id of the container
  *
  */
 public interface UnpauseContainerCmd extends DockerCmd<Void> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public UnpauseContainerCmd withContainerId(String containerId);
+    public UnpauseContainerCmd withContainerId(String containerId);
 
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public Void exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<UnpauseContainerCmd, Void> {
-	}
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public Void exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<UnpauseContainerCmd, Void> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/VersionCmd.java b/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
index 740a335e9..703524623 100644
--- a/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
@@ -6,8 +6,8 @@
  * Returns the Docker version info.
  */
 public interface VersionCmd extends DockerCmd<Version> {
-	
-	public static interface Exec extends DockerCmdExec<VersionCmd, Version> {
-	}
+
+    public static interface Exec extends DockerCmdExec<VersionCmd, Version> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
index e71831559..8841b08a3 100644
--- a/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
@@ -9,17 +9,18 @@
  */
 public interface WaitContainerCmd extends DockerCmd<Integer> {
 
-	public String getContainerId();
+    public String getContainerId();
 
-	public WaitContainerCmd withContainerId(String containerId);
-	
-	/**
-	 * @throws NotFoundException container not found
-	 */
-	@Override
-	public Integer exec() throws NotFoundException;
-	
-	public static interface Exec extends DockerCmdExec<WaitContainerCmd, Integer> {
-	}
+    public WaitContainerCmd withContainerId(String containerId);
+
+    /**
+     * @throws NotFoundException
+     *             container not found
+     */
+    @Override
+    public Integer exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdExec<WaitContainerCmd, Integer> {
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/model/AccessMode.java b/src/main/java/com/github/dockerjava/api/model/AccessMode.java
index a893e7f38..e87494215 100644
--- a/src/main/java/com/github/dockerjava/api/model/AccessMode.java
+++ b/src/main/java/com/github/dockerjava/api/model/AccessMode.java
@@ -1,28 +1,26 @@
 package com.github.dockerjava.api.model;
 
 /**
- * The access mode of a file system or file: <code>read-write</code>
- * or <code>read-only</code>.
+ * The access mode of a file system or file: <code>read-write</code> or <code>read-only</code>.
  */
 public enum AccessMode {
-	/** read-write */
-	rw,
-	
-	/** read-only */
-	ro;
-	
-	/**
-	 * The default {@link AccessMode}: {@link #rw}
-	 */
-	public static final AccessMode DEFAULT = rw;
-	
-	public static final AccessMode fromBoolean(boolean accessMode) {
-		return accessMode ? rw : ro;
-	}
-	
-	public final boolean toBoolean() {
-		return this.equals(AccessMode.rw) ? true: false;
-	}
+    /** read-write */
+    rw,
+
+    /** read-only */
+    ro;
+
+    /**
+     * The default {@link AccessMode}: {@link #rw}
+     */
+    public static final AccessMode DEFAULT = rw;
+
+    public static final AccessMode fromBoolean(boolean accessMode) {
+        return accessMode ? rw : ro;
+    }
+
+    public final boolean toBoolean() {
+        return this.equals(AccessMode.rw) ? true : false;
+    }
 
-	
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
index 42c49bce0..c7ee0af7f 100644
--- a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -13,117 +13,113 @@ public class AuthConfig {
     public static final String DEFAULT_SERVER_ADDRESS = "https://index.docker.io/v1/";
 
     @JsonProperty
-	private String username;
-	
-	@JsonProperty
-	private String password;
-	
-	@JsonProperty
-	private String email;
-	
-	@JsonProperty("serveraddress")
-	private String serverAddress = DEFAULT_SERVER_ADDRESS;
-
-	private String auth;
-
-	public String getUsername() {
-		return username;
-	}
-
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public String getEmail() {
-		return email;
-	}
-
-	public void setEmail(String email) {
-		this.email = email;
-	}
-
-	public String getServerAddress() {
-		return serverAddress;
-	}
-
-	public void setServerAddress(String serverAddress) {
-		this.serverAddress = serverAddress;
-	}
-
-	@JsonIgnore
-	public String getAuth() {
-		return auth;
-	}
-
-	@JsonProperty("auth")
-	public void setAuth(String auth) {
-		this.auth = auth;
-	}
-
-	@Override
-	public String toString() {
-		return "AuthConfig{" +
-				"username='" + username + '\'' +
-				", password='" + password + '\'' +
-				", email='" + email + '\'' +
-				", serverAddress='" + serverAddress + '\'' +
-				'}';
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((auth == null) ? 0 : auth.hashCode());
-		result = prime * result + ((email == null) ? 0 : email.hashCode());
-		result = prime * result + ((password == null) ? 0 : password.hashCode());
-		result = prime * result + ((serverAddress == null) ? 0 : serverAddress.hashCode());
-		result = prime * result + ((username == null) ? 0 : username.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		AuthConfig other = (AuthConfig) obj;
-		if (auth == null) {
-			if (other.auth != null)
-				return false;
-		} else if (!auth.equals(other.auth))
-			return false;
-		if (email == null) {
-			if (other.email != null)
-				return false;
-		} else if (!email.equals(other.email))
-			return false;
-		if (password == null) {
-			if (other.password != null)
-				return false;
-		} else if (!password.equals(other.password))
-			return false;
-		if (serverAddress == null) {
-			if (other.serverAddress != null)
-				return false;
-		} else if (!serverAddress.equals(other.serverAddress))
-			return false;
-		if (username == null) {
-			if (other.username != null)
-				return false;
-		} else if (!username.equals(other.username))
-			return false;
-		return true;
-	}
+    private String username;
+
+    @JsonProperty
+    private String password;
+
+    @JsonProperty
+    private String email;
+
+    @JsonProperty("serveraddress")
+    private String serverAddress = DEFAULT_SERVER_ADDRESS;
+
+    private String auth;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getServerAddress() {
+        return serverAddress;
+    }
+
+    public void setServerAddress(String serverAddress) {
+        this.serverAddress = serverAddress;
+    }
+
+    @JsonIgnore
+    public String getAuth() {
+        return auth;
+    }
+
+    @JsonProperty("auth")
+    public void setAuth(String auth) {
+        this.auth = auth;
+    }
+
+    @Override
+    public String toString() {
+        return "AuthConfig{" + "username='" + username + '\'' + ", password='" + password + '\'' + ", email='" + email
+                + '\'' + ", serverAddress='" + serverAddress + '\'' + '}';
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((auth == null) ? 0 : auth.hashCode());
+        result = prime * result + ((email == null) ? 0 : email.hashCode());
+        result = prime * result + ((password == null) ? 0 : password.hashCode());
+        result = prime * result + ((serverAddress == null) ? 0 : serverAddress.hashCode());
+        result = prime * result + ((username == null) ? 0 : username.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        AuthConfig other = (AuthConfig) obj;
+        if (auth == null) {
+            if (other.auth != null)
+                return false;
+        } else if (!auth.equals(other.auth))
+            return false;
+        if (email == null) {
+            if (other.email != null)
+                return false;
+        } else if (!email.equals(other.email))
+            return false;
+        if (password == null) {
+            if (other.password != null)
+                return false;
+        } else if (!password.equals(other.password))
+            return false;
+        if (serverAddress == null) {
+            if (other.serverAddress != null)
+                return false;
+        } else if (!serverAddress.equals(other.serverAddress))
+            return false;
+        if (username == null) {
+            if (other.username != null)
+                return false;
+        } else if (!username.equals(other.username))
+            return false;
+        return true;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java b/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
index 5a62c7587..21451e64b 100644
--- a/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
+++ b/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
@@ -7,15 +7,15 @@
 
 public class AuthConfigurations {
 
-	@JsonProperty("configs")
-	private Map<String, AuthConfig> configs = new TreeMap<>();
-	
-	public void addConfig(AuthConfig authConfig){
-		configs.put(authConfig.getServerAddress(), authConfig);
-	}
-	
-	public Map<String, AuthConfig> getConfigs(){
-		return this.configs;
-	}
-	
+    @JsonProperty("configs")
+    private Map<String, AuthConfig> configs = new TreeMap<>();
+
+    public void addConfig(AuthConfig authConfig) {
+        configs.put(authConfig.getServerAddress(), authConfig);
+    }
+
+    public Map<String, AuthConfig> getConfigs() {
+        return this.configs;
+    }
+
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Bind.java b/src/main/java/com/github/dockerjava/api/model/Bind.java
index 0071bff97..60c64d096 100644
--- a/src/main/java/com/github/dockerjava/api/model/Bind.java
+++ b/src/main/java/com/github/dockerjava/api/model/Bind.java
@@ -1,102 +1,96 @@
 package com.github.dockerjava.api.model;
 
-
-
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
 /**
- * Represents a host path being bind mounted as a {@link Volume}
- * in a Docker container.
- * The Bind can be in read only or read write access mode.
+ * Represents a host path being bind mounted as a {@link Volume} in a Docker container. The Bind can be in read only or
+ * read write access mode.
  */
 public class Bind {
 
-	private String path;
-
-	private Volume volume;
-
-	private AccessMode accessMode;
-
-	public Bind(String path, Volume volume) {
-		this(path, volume, AccessMode.DEFAULT);
-	}
-
-	public Bind(String path, Volume volume, AccessMode accessMode) {
-		this.path = path;
-		this.volume = volume;
-		this.accessMode = accessMode;
-	}
-
-	public String getPath() {
-		return path;
-	}
-
-	public Volume getVolume() {
-		return volume;
-	}
-	
-	public AccessMode getAccessMode() {
-		return accessMode;
-	}
-
-
-	/**
-	 * Parses a bind mount specification to a {@link Bind}.
-	 * 
-	 * @param serialized the specification, e.g. <code>/host:/container:ro</code>
-	 * @return a {@link Bind} matching the specification
-	 * @throws IllegalArgumentException if the specification cannot be parsed
-	 */
-	public static Bind parse(String serialized) {
-		try {
-			String[] parts = serialized.split(":");
-			switch (parts.length) {
-			case 2: {
-				return new Bind(parts[0], new Volume(parts[1]));
-			}
-			case 3: {
-				AccessMode accessMode = AccessMode.valueOf(parts[2].toLowerCase());
-				return new Bind(parts[0], new Volume(parts[1]), accessMode);
-			}
-			default: {
-				throw new IllegalArgumentException();
-			}
-			}
-		} catch (Exception e) {
-			throw new IllegalArgumentException("Error parsing Bind '" + serialized
-					+ "'");
-		}
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof Bind) {
-			Bind other = (Bind) obj;
-			return new EqualsBuilder().append(path, other.getPath())
-					.append(volume, other.getVolume())
-					.append(accessMode, other.getAccessMode()).isEquals();
-		} else
-			return super.equals(obj);
-	}
-
-	@Override
-	public int hashCode() {
-		return new HashCodeBuilder().append(path).append(volume)
-				.append(accessMode).toHashCode();
-	}
-
-	/**
-	 * Returns a string representation of this {@link Bind} suitable
-	 * for inclusion in a JSON message.
-	 * The format is <code>&lt;host path&gt;:&lt;container path&gt;:&lt;access mode&gt;</code>,
-	 * like the argument in {@link #parse(String)}.
-	 * 
-	 * @return a string representation of this {@link Bind}
-	 */
-	@Override
-	public String toString() {
-		return path + ":" + volume.getPath() + ":" + accessMode.toString();
-	}
+    private String path;
+
+    private Volume volume;
+
+    private AccessMode accessMode;
+
+    public Bind(String path, Volume volume) {
+        this(path, volume, AccessMode.DEFAULT);
+    }
+
+    public Bind(String path, Volume volume, AccessMode accessMode) {
+        this.path = path;
+        this.volume = volume;
+        this.accessMode = accessMode;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public Volume getVolume() {
+        return volume;
+    }
+
+    public AccessMode getAccessMode() {
+        return accessMode;
+    }
+
+    /**
+     * Parses a bind mount specification to a {@link Bind}.
+     * 
+     * @param serialized
+     *            the specification, e.g. <code>/host:/container:ro</code>
+     * @return a {@link Bind} matching the specification
+     * @throws IllegalArgumentException
+     *             if the specification cannot be parsed
+     */
+    public static Bind parse(String serialized) {
+        try {
+            String[] parts = serialized.split(":");
+            switch (parts.length) {
+            case 2: {
+                return new Bind(parts[0], new Volume(parts[1]));
+            }
+            case 3: {
+                AccessMode accessMode = AccessMode.valueOf(parts[2].toLowerCase());
+                return new Bind(parts[0], new Volume(parts[1]), accessMode);
+            }
+            default: {
+                throw new IllegalArgumentException();
+            }
+            }
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Error parsing Bind '" + serialized + "'");
+        }
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof Bind) {
+            Bind other = (Bind) obj;
+            return new EqualsBuilder().append(path, other.getPath()).append(volume, other.getVolume())
+                    .append(accessMode, other.getAccessMode()).isEquals();
+        } else
+            return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(path).append(volume).append(accessMode).toHashCode();
+    }
+
+    /**
+     * Returns a string representation of this {@link Bind} suitable for inclusion in a JSON message. The format is
+     * <code>&lt;host path&gt;:&lt;container path&gt;:&lt;access mode&gt;</code>, like the argument in
+     * {@link #parse(String)}.
+     * 
+     * @return a string representation of this {@link Bind}
+     */
+    @Override
+    public String toString() {
+        return path + ":" + volume.getPath() + ":" + accessMode.toString();
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Binds.java b/src/main/java/com/github/dockerjava/api/model/Binds.java
index bfc8dbf2d..1824ca77b 100644
--- a/src/main/java/com/github/dockerjava/api/model/Binds.java
+++ b/src/main/java/com/github/dockerjava/api/model/Binds.java
@@ -19,51 +19,50 @@
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.node.NullNode;
 
-
 @JsonSerialize(using = Binds.Serializer.class)
 @JsonDeserialize(using = Binds.Deserializer.class)
 public class Binds {
 
-	private Bind[] binds;
+    private Bind[] binds;
 
-	public Binds(Bind... binds) {
-		this.binds = binds;
-	}
+    public Binds(Bind... binds) {
+        this.binds = binds;
+    }
 
-	public Bind[] getBinds() {
-		return binds;
-	}
+    public Bind[] getBinds() {
+        return binds;
+    }
 
-	public static class Serializer extends JsonSerializer<Binds> {
+    public static class Serializer extends JsonSerializer<Binds> {
+
+        @Override
+        public void serialize(Binds binds, JsonGenerator jsonGen, SerializerProvider serProvider) throws IOException,
+                JsonProcessingException {
 
-		@Override
-		public void serialize(Binds binds, JsonGenerator jsonGen,
-				SerializerProvider serProvider) throws IOException,
-				JsonProcessingException {
-			
-			//
-			jsonGen.writeStartArray();
-			for (Bind bind : binds.getBinds()) {
-				jsonGen.writeString(bind.toString());
-			}
-			jsonGen.writeEndArray();
-			//
-		}
+            //
+            jsonGen.writeStartArray();
+            for (Bind bind : binds.getBinds()) {
+                jsonGen.writeString(bind.toString());
+            }
+            jsonGen.writeEndArray();
+            //
+        }
+
+    }
 
-	}
-	
-	public static class Deserializer extends JsonDeserializer<Binds> {
+    public static class Deserializer extends JsonDeserializer<Binds> {
         @Override
-        public Binds deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+        public Binds deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+                throws IOException, JsonProcessingException {
 
-        	List<Bind> binds = new ArrayList<Bind>();
+            List<Bind> binds = new ArrayList<Bind>();
             ObjectCodec oc = jsonParser.getCodec();
             JsonNode node = oc.readTree(jsonParser);
             for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
 
                 Map.Entry<String, JsonNode> field = it.next();
                 if (!field.getValue().equals(NullNode.getInstance())) {
-                	binds.add(Bind.parse(field.getKey()));
+                    binds.add(Bind.parse(field.getKey()));
                 }
             }
             return new Binds(binds.toArray(new Bind[0]));
diff --git a/src/main/java/com/github/dockerjava/api/model/Capability.java b/src/main/java/com/github/dockerjava/api/model/Capability.java
index c86c07961..b17827553 100644
--- a/src/main/java/com/github/dockerjava/api/model/Capability.java
+++ b/src/main/java/com/github/dockerjava/api/model/Capability.java
@@ -1,329 +1,297 @@
 package com.github.dockerjava.api.model;
 
 /**
- * The Linux capabilities supported by Docker.
- * The list of capabilities is defined in Docker's types.go,
- * {@link #ALL} was added manually.
+ * The Linux capabilities supported by Docker. The list of capabilities is defined in Docker's types.go, {@link #ALL}
+ * was added manually.
  * 
- * @see <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">http://man7.org/linux/man-pages/man7/capabilities.7.html</a>
+ * @see <a
+ *      href="http://man7.org/linux/man-pages/man7/capabilities.7.html">http://man7.org/linux/man-pages/man7/capabilities.7.html</a>
  */
 public enum Capability {
-	/**
-	 * This meta capability includes all Linux capabilities.
-	 */
-	ALL,
-	/**
-	 * <ul>
-	 *   <li>Enable and disable kernel auditing.
-	 *   <li>Change auditing filter rules.
-	 *   <li>Retrieve auditing status and filtering rules.
-	 * </ul>
-	 */
-	AUDIT_CONTROL,
-	/**
-	 * Write records to kernel auditing log.
-	 */
-	AUDIT_WRITE,
-	/**
-	 * Employ features that can block system suspend.
-	 */
-	BLOCK_SUSPEND,
-	/**
-	 * Make arbitrary changes to file UIDs and GIDs (see chown(2)).
-	 */
-	CHOWN,
-	/**
-	 * Bypass file read, write, and execute permission checks.
-	 * (DAC is an abbreviation of "discretionary access control".)
-	 */
-	DAC_OVERRIDE,
-	/**
-	 * Bypass file read permission checks and directory read and
-	 * execute permission checks.
-	 */
-	DAC_READ_SEARCH,
-	/**
-	 * <ul>
-	 *   <li>Bypass permission checks on operations that normally require
-	 *     the file system UID of the process to match the UID of the file
-	 *     (e.g., chmod(2), utime(2)), excluding those operations covered
-	 *     by the {@link #DAC_OVERRIDE} and{@link #DAC_READ_SEARCH}.
-	 *   <li>Set extended file attributes (see chattr(1)) on arbitrary files.
-	 *   <li>Set Access Control Lists (ACLs) on arbitrary files.
-	 *   <li>Ignore directory sticky bit on file deletion.
-	 *   <li>Specify O_NOATIME for arbitrary files in open(2)and fcntl(2).
-	 * </ul>
-	 */
-	FOWNER,
-	/**
-	 * <ul>
-	 *   <li>Don't clear set-user-ID and set-group-ID permission bits when
-	 *     a file is modified.
-	 *   <li>Set the set-group-ID bit for a file whose GID does not match
-	 *     the file system or any of the supplementary GIDs of the calling
-	 *     process.
-	 * </ul>
-	 */
-	FSETID,
-	/**
-	 * Permit memory locking (mlock(2), mlockall(2), mmap(2), shmctl(2)).
-	 */
-	IPC_LOCK,
-	/**
-	 * Bypass permission checks for operations on System V IPC objects.
-	 */
-	IPC_OWNER,
-	/**
-	 * Bypass permission checks for sending signals (see kill(2)).
-	 * This includes use of the ioctl(2) KDSIGACCEPT operation.
-	 */
-	KILL,
-	/**
-	 * Establish leases on arbitrary files (see fcntl(2)).
-	 */
-	LEASE,
-	/**
-	 * Set the FS_APPEND_FL and FS_IMMUTABLE_FL i-node flags (see chattr(1)).
-	 */
-	LINUX_IMMUTABLE,
-	/**
-	 * Override Mandatory Access Control (MAC).
-	 * Implemented for the Smack Linux Security Module (LSM).
-	 */
-	MAC_ADMIN,
-	/**
-	 * Allow MAC configuration or state changes. Implemented for the Smack LSM.
-	 */
-	MAC_OVERRIDE,
-	/**
-	 * Create special files using mknod(2).
-	 */
-	MKNOD,
-	/**
-	 * Perform various network-related operations:
-	 * <ul>
-	 *   <li>Interface configuration.
-	 *   <li>Administration of IP firewall, masquerading, and accounting.
-	 *   <li>Modify routing tables.
-	 *   <li>Bind to any address for transparent proxying.
-	 *   <li>Set type-of-service (TOS).
-	 *   <li>Clear driver statistics.
-	 *   <li>Set promiscuous mode.
-	 *   <li>Enabling multicasting.
-	 *   <li>Use setsockopt(2) to set the following socket options: SO_DEBUG,
-	 *     SO_MARK, SO_PRIORITY (for a priority outside the range 0 to 6),
-	 *     SO_RCVBUFFORCE, and SO_SNDBUFFORCE.
-	 * </ul>
-	 */
-	NET_ADMIN,
-	/**
-	 * Bind a socket to Internet domain privileged ports (port numbers less
-	 * than 1024).
-	 */
-	NET_BIND_SERVICE,
-	/**
-	 * (Unused) Make socket broadcasts, and listen to multicasts.
-	 */
-	NET_BROADCAST,
-	/**
-	 * <ul>
-	 *   <li>Use RAW and PACKET sockets.
-	 *   <li>Bind to any address for transparent proxying.
-	 * </ul>
-	 */
-	NET_RAW,
-	/**
-	 * Set file capabilities.
-	 */
-	SETFCAP,
-	/**
-	 * <ul>
-	 *   <li>Make arbitrary manipulations of process GIDs and supplementary
-	 *     GID list.
-	 *   <li>Forge GID when passing socket credentials via UNIX domain
-	 *     sockets.
-	 * </ul>
-	 */
-	SETGID,
-	/**
-	 * If file capabilities are not supported:
-	 * <ul>
-	 *   <li>grant or remove any capability in the caller's permitted
-	 *     capability set to or from any other process. (This property of
-	 *     CAP_SETPCAP is not available when the kernel is configured to
-	 *     support file capabilities, since CAP_SETPCAP has entirely different
-	 *     semantics for such kernels.)
-	 * </ul>
-	 * <p>
-	 * If file capabilities are supported:
-	 * <ul>
-	 *   <li>Add any capability from the calling thread's bounding set to its
-	 *     inheritable set.
-	 *   <li>Drop capabilities from the bounding set (via prctl(2)
-	 *     PR_CAPBSET_DROP).
-	 *   <li>Make changes to the securebits flags.
-	 * </ul>
-	 */
-	SETPCAP,
-	/**
-	 * <ul>
-	 *   <li>Make arbitrary manipulations of process UIDs (setuid(2),
-	 *     setreuid(2), setresuid(2), setfsuid(2)).
-	 *   <li>Make forged UID when passing socket credentials via UNIX domain
-	 *     sockets.
-	 * </ul>
-	 */
-	SETUID,
-	/**
-	 * <ul>
-	 *   <li>Perform a range of system administration operations including:
-	 *     quotactl(2), mount(2), umount(2), swapon(2), swapoff(2), sethostname(2),
-	 *     and setdomainname(2).
-	 *   <li>Perform privileged syslog(2) operations (since Linux 2.6.37,
-	 *     CAP_SYSLOG should be used to permit such operations).
-	 *   <li>Perform VM86_REQUEST_IRQ vm86(2) command.
-	 *   <li>Perform IPC_SET and IPC_RMID operations on arbitrary System V IPC objects.
-	 *   <li>Perform operations on trusted and security Extended Attributes
-	 *     (see attr(5)).
-	 *   <li>Use lookup_dcookie(2)
-	 *   <li>Use ioprio_set(2) to assign IOPRIO_CLASS_RT and (before Linux 2.6.25)
-	 *     IOPRIO_CLASS_IDLE I/O scheduling classes.
-	 *   <li>Forge UID when passing socket credentials.
-	 *   <li>Exceed /proc/sys/fs/file-max, the system-wide limit on the number of
-	 *     open files, in system calls that open files (e.g., accept(2), execve(2),
-	 *     open(2), pipe(2)).
-	 *   <li>Employ CLONE_* flags that create new namespaces with clone(2) and
-	 *     unshare(2).
-	 *   <li>Call perf_event_open(2).
-	 *   <li>Access privileged perf event information.
-	 *   <li>Call setns(2).
-	 *   <li>Call fanotify_init(2).
-	 *   <li>Perform KEYCTL_CHOWN and KEYCTL_SETPERM keyctl(2) operations.
-	 *   <li>Perform madvise(2) MADV_HWPOISON operation.
-	 *   <li>Employ the TIOCSTI ioctl(2) to insert characters into the input queue
-	 *     of a terminal other than the caller's controlling terminal.
-	 *   <li>Employ the obsolete nfsservctl(2) system call.
-	 *   <li>Employ the obsolete bdflush(2) system call.
-	 *   <li>Perform various privileged block-device ioctl(2) operations.
-	 *   <li>Perform various privileged file-system ioctl(2) operations.
-	 *   <li>Perform administrative operations on many device drivers.
-	 * </ul>
-	 */
-	SYS_ADMIN,
-	/**
-	 * Use reboot(2) and kexec_load(2).
-	 */
-	SYS_BOOT,
-	/**
-	 * Use chroot(2).
-	 */
-	SYS_CHROOT,
-	/**
-	 * <ul>
-	 *   <li>Perform privileged syslog(2) operations. See syslog(2) for information
-	 *     on which operations require privilege.
-	 *   <li>View kernel addresses exposed via /proc and other interfaces when
-	 *     /proc/sys/kernel/kptr_restrict has the value 1. (See the discussion of the
-	 *      kptr_restrict in proc(5).)
-	 * </ul>
-	 */
-	SYSLOG,
-	/**
-	 * <ul>
-	 *   <li>Load and unload kernel modules (see init_module(2) and delete_module(2))
-	 *   <li>In kernels before 2.6.25: drop capabilities from the system-wide
-	 *     capability bounding set.
-	 * </ul>
-	 */
-	SYS_MODULE,
-	/**
-	 * <ul>
-	 *   <li>Raise process nice value (nice(2), setpriority(2)) and change the nice
-	 *     value for arbitrary processes.
-	 *   <li>Set real-time scheduling policies for calling process, and set scheduling
-	 *     policies and priorities for arbitrary processes (sched_setscheduler(2),
-	 *     sched_setparam(2)).
-	 *   <li>Set CPU affinity for arbitrary processes (sched_setaffinity(2)).
-	 *   <li>Set I/O scheduling class and priority for arbitrary processes
-	 *     (ioprio_set(2)).
-	 *   <li>Apply migrate_pages(2) to arbitrary processes and allow processes to be
-	 *     migrated to arbitrary nodes.
-	 *   <li>Apply move_pages(2) to arbitrary processes.
-	 *   <li>Use the MPOL_MF_MOVE_ALL flag with mbind(2) and move_pages(2).
-	 * </ul>
-	 */
-	SYS_NICE,
-	/**
-	 * Use acct(2).
-	 */
-	SYS_PACCT,
-	/**
-	 * <ul>
-	 *   <li>Trace arbitrary processes using ptrace(2).
-	 *   <li>Apply get_robust_list(2) to arbitrary processes.
-	 *   <li>Inspect processes using kcmp(2).
-	 * </ul>
-	 */
-	SYS_PTRACE,
-	/**
-	 * <ul>
-	 *   <li>Perform I/O port operations (iopl(2) and ioperm(2)).
-	 *   <li>Access /proc/kcore.
-	 *   <li>Employ the FIBMAP ioctl(2) operation.
-	 *   <li>Open devices for accessing x86 model-specific registers (MSRs, see
-	 *     msr(4)).
-	 *   <li>Update /proc/sys/vm/mmap_min_addr.
-	 *   <li>Create memory mappings at addresses below the value specified by
-	 *     /proc/sys/vm/mmap_min_addr.
-	 *   <li>Map files in /proc/pci/bus.
-	 *   <li>Open /dev/mem and /dev/kmem.
-	 *   <li>Perform various SCSI device commands.
-	 *   <li>Perform certain operations on hpsa(4) and cciss(4) devices.
-	 *   <li>Perform a range of device-specific operations on other devices.
-	 * </ul>
-	 */
-	SYS_RAWIO,
-	/**
-	 * <ul>
-	 *   <li>Use reserved space on ext2 file systems.
-	 *   <li>Make ioctl(2) calls controlling ext3 journaling.
-	 *   <li>Override disk quota limits.
-	 *   <li>Increase resource limits (see setrlimit(2)).
-	 *   <li>Override RLIMIT_NPROC resource limit.
-	 *   <li>Override maximum number of consoles on console allocation.
-	 *   <li>Override maximum number of keymaps.
-	 *   <li>Allow more than 64hz interrupts from the real-time clock.
-	 *   <li>Raise msg_qbytes limit for a System V message queue above the limit
-	 *     in /proc/sys/kernel/msgmnb (see msgop(2) and msgctl(2)).
-	 *   <li>Override the /proc/sys/fs/pipe-size-max limit when setting the capacity
-	 *     of a pipe using the F_SETPIPE_SZ fcntl(2) command.
-	 *   <li>Use F_SETPIPE_SZ to increase the capacity of a pipe above the limit
-	 *     specified by /proc/sys/fs/pipe-max-size.
-	 *   <li>Override /proc/sys/fs/mqueue/queues_max limit when creating POSIX
-	 *     message queues (see mq_overview(7)).
-	 *   <li>Employ prctl(2) PR_SET_MM operation.
-	 *   <li>Set /proc/PID/oom_score_adj to a value lower than the value last set
-	 *     by a process with CAP_SYS_RESOURCE.
-	 * </ul>
-	 */
-	SYS_RESOURCE,
-	/**
-	 * <ul>
-	 *   <li>Set system clock (settimeofday(2), stime(2), adjtimex(2)).
-	 *   <li>Set real-time (hardware) clock.
-	 * </ul>
-	 */
-	SYS_TIME,
-	/**
-	 * <ul>
-	 *   <li>Use vhangup(2).
-	 *   <li>Employ various privileged ioctl(2) operations on virtual terminals.
-	 * </ul>
-	 */
-	SYS_TTY_CONFIG,
-	/**
-	 * Trigger something that will wake up the system (set CLOCK_REALTIME_ALARM and
-	 * CLOCK_BOOTTIME_ALARM timers).
-	 */
-	WAKE_ALARM
+    /**
+     * This meta capability includes all Linux capabilities.
+     */
+    ALL,
+    /**
+     * <ul>
+     * <li>Enable and disable kernel auditing.
+     * <li>Change auditing filter rules.
+     * <li>Retrieve auditing status and filtering rules.
+     * </ul>
+     */
+    AUDIT_CONTROL,
+    /**
+     * Write records to kernel auditing log.
+     */
+    AUDIT_WRITE,
+    /**
+     * Employ features that can block system suspend.
+     */
+    BLOCK_SUSPEND,
+    /**
+     * Make arbitrary changes to file UIDs and GIDs (see chown(2)).
+     */
+    CHOWN,
+    /**
+     * Bypass file read, write, and execute permission checks. (DAC is an abbreviation of
+     * "discretionary access control".)
+     */
+    DAC_OVERRIDE,
+    /**
+     * Bypass file read permission checks and directory read and execute permission checks.
+     */
+    DAC_READ_SEARCH,
+    /**
+     * <ul>
+     * <li>Bypass permission checks on operations that normally require the file system UID of the process to match the
+     * UID of the file (e.g., chmod(2), utime(2)), excluding those operations covered by the {@link #DAC_OVERRIDE} and
+     * {@link #DAC_READ_SEARCH}.
+     * <li>Set extended file attributes (see chattr(1)) on arbitrary files.
+     * <li>Set Access Control Lists (ACLs) on arbitrary files.
+     * <li>Ignore directory sticky bit on file deletion.
+     * <li>Specify O_NOATIME for arbitrary files in open(2)and fcntl(2).
+     * </ul>
+     */
+    FOWNER,
+    /**
+     * <ul>
+     * <li>Don't clear set-user-ID and set-group-ID permission bits when a file is modified.
+     * <li>Set the set-group-ID bit for a file whose GID does not match the file system or any of the supplementary GIDs
+     * of the calling process.
+     * </ul>
+     */
+    FSETID,
+    /**
+     * Permit memory locking (mlock(2), mlockall(2), mmap(2), shmctl(2)).
+     */
+    IPC_LOCK,
+    /**
+     * Bypass permission checks for operations on System V IPC objects.
+     */
+    IPC_OWNER,
+    /**
+     * Bypass permission checks for sending signals (see kill(2)). This includes use of the ioctl(2) KDSIGACCEPT
+     * operation.
+     */
+    KILL,
+    /**
+     * Establish leases on arbitrary files (see fcntl(2)).
+     */
+    LEASE,
+    /**
+     * Set the FS_APPEND_FL and FS_IMMUTABLE_FL i-node flags (see chattr(1)).
+     */
+    LINUX_IMMUTABLE,
+    /**
+     * Override Mandatory Access Control (MAC). Implemented for the Smack Linux Security Module (LSM).
+     */
+    MAC_ADMIN,
+    /**
+     * Allow MAC configuration or state changes. Implemented for the Smack LSM.
+     */
+    MAC_OVERRIDE,
+    /**
+     * Create special files using mknod(2).
+     */
+    MKNOD,
+    /**
+     * Perform various network-related operations:
+     * <ul>
+     * <li>Interface configuration.
+     * <li>Administration of IP firewall, masquerading, and accounting.
+     * <li>Modify routing tables.
+     * <li>Bind to any address for transparent proxying.
+     * <li>Set type-of-service (TOS).
+     * <li>Clear driver statistics.
+     * <li>Set promiscuous mode.
+     * <li>Enabling multicasting.
+     * <li>Use setsockopt(2) to set the following socket options: SO_DEBUG, SO_MARK, SO_PRIORITY (for a priority outside
+     * the range 0 to 6), SO_RCVBUFFORCE, and SO_SNDBUFFORCE.
+     * </ul>
+     */
+    NET_ADMIN,
+    /**
+     * Bind a socket to Internet domain privileged ports (port numbers less than 1024).
+     */
+    NET_BIND_SERVICE,
+    /**
+     * (Unused) Make socket broadcasts, and listen to multicasts.
+     */
+    NET_BROADCAST,
+    /**
+     * <ul>
+     * <li>Use RAW and PACKET sockets.
+     * <li>Bind to any address for transparent proxying.
+     * </ul>
+     */
+    NET_RAW,
+    /**
+     * Set file capabilities.
+     */
+    SETFCAP,
+    /**
+     * <ul>
+     * <li>Make arbitrary manipulations of process GIDs and supplementary GID list.
+     * <li>Forge GID when passing socket credentials via UNIX domain sockets.
+     * </ul>
+     */
+    SETGID,
+    /**
+     * If file capabilities are not supported:
+     * <ul>
+     * <li>grant or remove any capability in the caller's permitted capability set to or from any other process. (This
+     * property of CAP_SETPCAP is not available when the kernel is configured to support file capabilities, since
+     * CAP_SETPCAP has entirely different semantics for such kernels.)
+     * </ul>
+     * <p>
+     * If file capabilities are supported:
+     * <ul>
+     * <li>Add any capability from the calling thread's bounding set to its inheritable set.
+     * <li>Drop capabilities from the bounding set (via prctl(2) PR_CAPBSET_DROP).
+     * <li>Make changes to the securebits flags.
+     * </ul>
+     */
+    SETPCAP,
+    /**
+     * <ul>
+     * <li>Make arbitrary manipulations of process UIDs (setuid(2), setreuid(2), setresuid(2), setfsuid(2)).
+     * <li>Make forged UID when passing socket credentials via UNIX domain sockets.
+     * </ul>
+     */
+    SETUID,
+    /**
+     * <ul>
+     * <li>Perform a range of system administration operations including: quotactl(2), mount(2), umount(2), swapon(2),
+     * swapoff(2), sethostname(2), and setdomainname(2).
+     * <li>Perform privileged syslog(2) operations (since Linux 2.6.37, CAP_SYSLOG should be used to permit such
+     * operations).
+     * <li>Perform VM86_REQUEST_IRQ vm86(2) command.
+     * <li>Perform IPC_SET and IPC_RMID operations on arbitrary System V IPC objects.
+     * <li>Perform operations on trusted and security Extended Attributes (see attr(5)).
+     * <li>Use lookup_dcookie(2)
+     * <li>Use ioprio_set(2) to assign IOPRIO_CLASS_RT and (before Linux 2.6.25) IOPRIO_CLASS_IDLE I/O scheduling
+     * classes.
+     * <li>Forge UID when passing socket credentials.
+     * <li>Exceed /proc/sys/fs/file-max, the system-wide limit on the number of open files, in system calls that open
+     * files (e.g., accept(2), execve(2), open(2), pipe(2)).
+     * <li>Employ CLONE_* flags that create new namespaces with clone(2) and unshare(2).
+     * <li>Call perf_event_open(2).
+     * <li>Access privileged perf event information.
+     * <li>Call setns(2).
+     * <li>Call fanotify_init(2).
+     * <li>Perform KEYCTL_CHOWN and KEYCTL_SETPERM keyctl(2) operations.
+     * <li>Perform madvise(2) MADV_HWPOISON operation.
+     * <li>Employ the TIOCSTI ioctl(2) to insert characters into the input queue of a terminal other than the caller's
+     * controlling terminal.
+     * <li>Employ the obsolete nfsservctl(2) system call.
+     * <li>Employ the obsolete bdflush(2) system call.
+     * <li>Perform various privileged block-device ioctl(2) operations.
+     * <li>Perform various privileged file-system ioctl(2) operations.
+     * <li>Perform administrative operations on many device drivers.
+     * </ul>
+     */
+    SYS_ADMIN,
+    /**
+     * Use reboot(2) and kexec_load(2).
+     */
+    SYS_BOOT,
+    /**
+     * Use chroot(2).
+     */
+    SYS_CHROOT,
+    /**
+     * <ul>
+     * <li>Perform privileged syslog(2) operations. See syslog(2) for information on which operations require privilege.
+     * <li>View kernel addresses exposed via /proc and other interfaces when /proc/sys/kernel/kptr_restrict has the
+     * value 1. (See the discussion of the kptr_restrict in proc(5).)
+     * </ul>
+     */
+    SYSLOG,
+    /**
+     * <ul>
+     * <li>Load and unload kernel modules (see init_module(2) and delete_module(2))
+     * <li>In kernels before 2.6.25: drop capabilities from the system-wide capability bounding set.
+     * </ul>
+     */
+    SYS_MODULE,
+    /**
+     * <ul>
+     * <li>Raise process nice value (nice(2), setpriority(2)) and change the nice value for arbitrary processes.
+     * <li>Set real-time scheduling policies for calling process, and set scheduling policies and priorities for
+     * arbitrary processes (sched_setscheduler(2), sched_setparam(2)).
+     * <li>Set CPU affinity for arbitrary processes (sched_setaffinity(2)).
+     * <li>Set I/O scheduling class and priority for arbitrary processes (ioprio_set(2)).
+     * <li>Apply migrate_pages(2) to arbitrary processes and allow processes to be migrated to arbitrary nodes.
+     * <li>Apply move_pages(2) to arbitrary processes.
+     * <li>Use the MPOL_MF_MOVE_ALL flag with mbind(2) and move_pages(2).
+     * </ul>
+     */
+    SYS_NICE,
+    /**
+     * Use acct(2).
+     */
+    SYS_PACCT,
+    /**
+     * <ul>
+     * <li>Trace arbitrary processes using ptrace(2).
+     * <li>Apply get_robust_list(2) to arbitrary processes.
+     * <li>Inspect processes using kcmp(2).
+     * </ul>
+     */
+    SYS_PTRACE,
+    /**
+     * <ul>
+     * <li>Perform I/O port operations (iopl(2) and ioperm(2)).
+     * <li>Access /proc/kcore.
+     * <li>Employ the FIBMAP ioctl(2) operation.
+     * <li>Open devices for accessing x86 model-specific registers (MSRs, see msr(4)).
+     * <li>Update /proc/sys/vm/mmap_min_addr.
+     * <li>Create memory mappings at addresses below the value specified by /proc/sys/vm/mmap_min_addr.
+     * <li>Map files in /proc/pci/bus.
+     * <li>Open /dev/mem and /dev/kmem.
+     * <li>Perform various SCSI device commands.
+     * <li>Perform certain operations on hpsa(4) and cciss(4) devices.
+     * <li>Perform a range of device-specific operations on other devices.
+     * </ul>
+     */
+    SYS_RAWIO,
+    /**
+     * <ul>
+     * <li>Use reserved space on ext2 file systems.
+     * <li>Make ioctl(2) calls controlling ext3 journaling.
+     * <li>Override disk quota limits.
+     * <li>Increase resource limits (see setrlimit(2)).
+     * <li>Override RLIMIT_NPROC resource limit.
+     * <li>Override maximum number of consoles on console allocation.
+     * <li>Override maximum number of keymaps.
+     * <li>Allow more than 64hz interrupts from the real-time clock.
+     * <li>Raise msg_qbytes limit for a System V message queue above the limit in /proc/sys/kernel/msgmnb (see msgop(2)
+     * and msgctl(2)).
+     * <li>Override the /proc/sys/fs/pipe-size-max limit when setting the capacity of a pipe using the F_SETPIPE_SZ
+     * fcntl(2) command.
+     * <li>Use F_SETPIPE_SZ to increase the capacity of a pipe above the limit specified by /proc/sys/fs/pipe-max-size.
+     * <li>Override /proc/sys/fs/mqueue/queues_max limit when creating POSIX message queues (see mq_overview(7)).
+     * <li>Employ prctl(2) PR_SET_MM operation.
+     * <li>Set /proc/PID/oom_score_adj to a value lower than the value last set by a process with CAP_SYS_RESOURCE.
+     * </ul>
+     */
+    SYS_RESOURCE,
+    /**
+     * <ul>
+     * <li>Set system clock (settimeofday(2), stime(2), adjtimex(2)).
+     * <li>Set real-time (hardware) clock.
+     * </ul>
+     */
+    SYS_TIME,
+    /**
+     * <ul>
+     * <li>Use vhangup(2).
+     * <li>Employ various privileged ioctl(2) operations on virtual terminals.
+     * </ul>
+     */
+    SYS_TTY_CONFIG,
+    /**
+     * Trigger something that will wake up the system (set CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM timers).
+     */
+    WAKE_ALARM
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Container.java b/src/main/java/com/github/dockerjava/api/model/Container.java
index 5b38ce48c..6a97e20b9 100644
--- a/src/main/java/com/github/dockerjava/api/model/Container.java
+++ b/src/main/java/com/github/dockerjava/api/model/Container.java
@@ -10,16 +10,16 @@
  * @author Konstantin Pelykh (kpelykh@gmail.com)
  *
  */
-@JsonIgnoreProperties(ignoreUnknown=true)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Container {
 
-	@JsonProperty("Command")
-	private String command;
+    @JsonProperty("Command")
+    private String command;
 
-	@JsonProperty("Created")
-	private long created;
+    @JsonProperty("Created")
+    private long created;
 
-	@JsonProperty("Id")
+    @JsonProperty("Id")
     private String id;
 
     @JsonProperty("Image")
@@ -62,7 +62,6 @@ public String[] getNames() {
         return names;
     }
 
-
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
@@ -84,20 +83,20 @@ public static class Port {
         private String type;
 
         public String getIp() {
-			return ip;
-		}
+            return ip;
+        }
 
         public Integer getPrivatePort() {
-			return privatePort;
-		}
+            return privatePort;
+        }
 
         public Integer getPublicPort() {
-			return publicPort;
-		}
+            return publicPort;
+        }
 
         public String getType() {
-			return type;
-		}
+            return type;
+        }
 
         @Override
         public String toString() {
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
index ce8c6b88f..8ea673a36 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
@@ -15,177 +15,177 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ContainerConfig {
 
-	@JsonProperty("AttachStderr")
-	private boolean attachStderr = false;
+    @JsonProperty("AttachStderr")
+    private boolean attachStderr = false;
 
-	@JsonProperty("AttachStdin")
-	private boolean attachStdin = false;
+    @JsonProperty("AttachStdin")
+    private boolean attachStdin = false;
 
-	@JsonProperty("AttachStdout")
-	private boolean attachStdout = false;
+    @JsonProperty("AttachStdout")
+    private boolean attachStdout = false;
 
-	@JsonProperty("Cmd")
-	private String[] cmd;
+    @JsonProperty("Cmd")
+    private String[] cmd;
 
-	@JsonProperty("CpuShares")
-	private int cpuShares = 0;
+    @JsonProperty("CpuShares")
+    private int cpuShares = 0;
 
-	@JsonProperty("Cpuset")
-	private String cpuset = "";
+    @JsonProperty("Cpuset")
+    private String cpuset = "";
 
-	@JsonProperty("Domainname")
-	private String domainName = "";
+    @JsonProperty("Domainname")
+    private String domainName = "";
 
-	@JsonProperty("Entrypoint")
-	private String[] entrypoint = new String[] {};
+    @JsonProperty("Entrypoint")
+    private String[] entrypoint = new String[] {};
 
-	@JsonProperty("Env")
-	private String[] env;
+    @JsonProperty("Env")
+    private String[] env;
 
-	@JsonProperty("ExposedPorts")
-	private ExposedPorts exposedPorts;
+    @JsonProperty("ExposedPorts")
+    private ExposedPorts exposedPorts;
 
-	@JsonProperty("Hostname")
-	private String hostName = "";
+    @JsonProperty("Hostname")
+    private String hostName = "";
 
-	@JsonProperty("Image")
-	private String image;
+    @JsonProperty("Image")
+    private String image;
 
-	@JsonProperty("MacAddress")
-	private String macAddress;
-	
-	@JsonProperty("Memory")
-	private long memoryLimit = 0;
+    @JsonProperty("MacAddress")
+    private String macAddress;
 
-	@JsonProperty("MemorySwap")
-	private long memorySwap = 0;
+    @JsonProperty("Memory")
+    private long memoryLimit = 0;
 
-	@JsonProperty("NetworkDisabled")
-	private boolean networkDisabled = false;
+    @JsonProperty("MemorySwap")
+    private long memorySwap = 0;
 
-	@JsonProperty("OnBuild")
-	private String[] onBuild;
+    @JsonProperty("NetworkDisabled")
+    private boolean networkDisabled = false;
 
-	@JsonProperty("OpenStdin")
-	private boolean stdinOpen = false;
+    @JsonProperty("OnBuild")
+    private String[] onBuild;
 
-	@JsonProperty("PortSpecs")
-	private String[] portSpecs;
+    @JsonProperty("OpenStdin")
+    private boolean stdinOpen = false;
 
-	@JsonProperty("StdinOnce")
-	private boolean stdInOnce = false;
+    @JsonProperty("PortSpecs")
+    private String[] portSpecs;
 
-	@JsonProperty("Tty")
-	private boolean tty = false;
+    @JsonProperty("StdinOnce")
+    private boolean stdInOnce = false;
 
-	@JsonProperty("User")
-	private String user = "";
+    @JsonProperty("Tty")
+    private boolean tty = false;
 
-	@JsonProperty("Volumes")
-	private Map<String, ?> volumes;
+    @JsonProperty("User")
+    private String user = "";
 
-	@JsonProperty("WorkingDir")
-	private String workingDir = "";
+    @JsonProperty("Volumes")
+    private Map<String, ?> volumes;
 
-	@JsonIgnore
-	public ExposedPort[] getExposedPorts() {
-		return exposedPorts.getExposedPorts();
-	}
+    @JsonProperty("WorkingDir")
+    private String workingDir = "";
 
-	public boolean isNetworkDisabled() {
-		return networkDisabled;
-	}
+    @JsonIgnore
+    public ExposedPort[] getExposedPorts() {
+        return exposedPorts.getExposedPorts();
+    }
 
-	public String getDomainName() {
-		return domainName;
-	}
+    public boolean isNetworkDisabled() {
+        return networkDisabled;
+    }
 
-	public String getWorkingDir() {
-		return workingDir;
-	}
+    public String getDomainName() {
+        return domainName;
+    }
 
-	public String getHostName() {
-		return hostName;
-	}
+    public String getWorkingDir() {
+        return workingDir;
+    }
 
-	public String[] getPortSpecs() {
-		return portSpecs;
-	}
+    public String getHostName() {
+        return hostName;
+    }
 
-	public String getUser() {
-		return user;
-	}
+    public String[] getPortSpecs() {
+        return portSpecs;
+    }
 
-	public boolean isTty() {
-		return tty;
-	}
+    public String getUser() {
+        return user;
+    }
 
-	public boolean isStdinOpen() {
-		return stdinOpen;
-	}
+    public boolean isTty() {
+        return tty;
+    }
 
-	public boolean isStdInOnce() {
-		return stdInOnce;
-	}
-	
-	public String getMacAddress() {
-		return macAddress;
-	}
+    public boolean isStdinOpen() {
+        return stdinOpen;
+    }
 
-	public long getMemoryLimit() {
-		return memoryLimit;
-	}
+    public boolean isStdInOnce() {
+        return stdInOnce;
+    }
 
-	public long getMemorySwap() {
-		return memorySwap;
-	}
+    public String getMacAddress() {
+        return macAddress;
+    }
 
-	public int getCpuShares() {
-		return cpuShares;
-	}
+    public long getMemoryLimit() {
+        return memoryLimit;
+    }
 
-	public String getCpuset() {
-		return cpuset;
-	}
+    public long getMemorySwap() {
+        return memorySwap;
+    }
 
-	public boolean isAttachStdin() {
-		return attachStdin;
-	}
+    public int getCpuShares() {
+        return cpuShares;
+    }
 
-	public boolean isAttachStdout() {
-		return attachStdout;
-	}
+    public String getCpuset() {
+        return cpuset;
+    }
 
-	public boolean isAttachStderr() {
-		return attachStderr;
-	}
+    public boolean isAttachStdin() {
+        return attachStdin;
+    }
 
-	public String[] getEnv() {
-		return env;
-	}
+    public boolean isAttachStdout() {
+        return attachStdout;
+    }
 
-	public String[] getCmd() {
-		return cmd;
-	}
+    public boolean isAttachStderr() {
+        return attachStderr;
+    }
 
-	public String getImage() {
-		return image;
-	}
+    public String[] getEnv() {
+        return env;
+    }
 
-	public Map<String, ?> getVolumes() {
-		return volumes;
-	}
-
-	public String[] getEntrypoint() {
-		return entrypoint;
-	}
-
-	public String[] getOnBuild() {
-		return onBuild;
-	}
-
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
+    public String[] getCmd() {
+        return cmd;
+    }
+
+    public String getImage() {
+        return image;
+    }
+
+    public Map<String, ?> getVolumes() {
+        return volumes;
+    }
+
+    public String[] getEntrypoint() {
+        return entrypoint;
+    }
+
+    public String[] getOnBuild() {
+        return onBuild;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Device.java b/src/main/java/com/github/dockerjava/api/model/Device.java
index 574d1ad56..713c0d61a 100644
--- a/src/main/java/com/github/dockerjava/api/model/Device.java
+++ b/src/main/java/com/github/dockerjava/api/model/Device.java
@@ -9,57 +9,53 @@
 
 public class Device {
 
-	@JsonProperty("CgroupPermissions")
-	private String cGroupPermissions = "";
-
-	@JsonProperty("PathOnHost")
-	private String pathOnHost = null;
-
-	@JsonProperty("PathInContainer")
-	private String pathInContainer = null;
-
-	public Device() {
-	}
-
-	public Device(String cGroupPermissions, String pathInContainer,
-			String pathOnHost) {
-		checkNotNull(cGroupPermissions,
-				"cGroupPermissions is null");
-		checkNotNull(pathInContainer, "pathInContainer is null");
-		checkNotNull(pathOnHost, "pathOnHost is null");
-		this.cGroupPermissions = cGroupPermissions;
-		this.pathInContainer = pathInContainer;
-		this.pathOnHost = pathOnHost;
-	}
-
-	public String getcGroupPermissions() {
-		return cGroupPermissions;
-	}
-
-	public String getPathInContainer() {
-		return pathInContainer;
-	}
-
-	public String getPathOnHost() {
-		return pathOnHost;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof Device) {
-			Device other = (Device) obj;
-			return new EqualsBuilder()
-					.append(cGroupPermissions, other.getcGroupPermissions())
-					.append(pathInContainer, other.getPathInContainer())
-					.append(pathOnHost, other.getPathOnHost()).isEquals();
-		} else
-			return super.equals(obj);
-	}
-
-	@Override
-	public int hashCode() {
-		return new HashCodeBuilder().append(cGroupPermissions)
-				.append(pathInContainer).append(pathOnHost).toHashCode();
-	}
+    @JsonProperty("CgroupPermissions")
+    private String cGroupPermissions = "";
+
+    @JsonProperty("PathOnHost")
+    private String pathOnHost = null;
+
+    @JsonProperty("PathInContainer")
+    private String pathInContainer = null;
+
+    public Device() {
+    }
+
+    public Device(String cGroupPermissions, String pathInContainer, String pathOnHost) {
+        checkNotNull(cGroupPermissions, "cGroupPermissions is null");
+        checkNotNull(pathInContainer, "pathInContainer is null");
+        checkNotNull(pathOnHost, "pathOnHost is null");
+        this.cGroupPermissions = cGroupPermissions;
+        this.pathInContainer = pathInContainer;
+        this.pathOnHost = pathOnHost;
+    }
+
+    public String getcGroupPermissions() {
+        return cGroupPermissions;
+    }
+
+    public String getPathInContainer() {
+        return pathInContainer;
+    }
+
+    public String getPathOnHost() {
+        return pathOnHost;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof Device) {
+            Device other = (Device) obj;
+            return new EqualsBuilder().append(cGroupPermissions, other.getcGroupPermissions())
+                    .append(pathInContainer, other.getPathInContainer()).append(pathOnHost, other.getPathOnHost())
+                    .isEquals();
+        } else
+            return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(cGroupPermissions).append(pathInContainer).append(pathOnHost).toHashCode();
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java b/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
index 87d9b0d7f..d589a31d1 100644
--- a/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
+++ b/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
@@ -5,6 +5,7 @@
 public class ErrorResponse {
     @JsonProperty
     private ErrorDetail errorDetail;
+
     @JsonProperty
     private String error;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Event.java b/src/main/java/com/github/dockerjava/api/model/Event.java
index cb961f97d..27eb22216 100644
--- a/src/main/java/com/github/dockerjava/api/model/Event.java
+++ b/src/main/java/com/github/dockerjava/api/model/Event.java
@@ -22,12 +22,17 @@ public Event() {
 
     /**
      * Constructor.
-     * @param id Container ID
-     * @param status Status string. 
-     *        List of statuses is available in <a href="https://docs.docker.com/reference/api/docker_remote_api_v1.16/#monitor-dockers-events">Docker API v.1.16</a>
-     * @param from Image, from which the container has been created
-     * @param time Event time
-     *      The time is specified in milliseconds since January 1, 1970, 00:00:00 GMT
+     * 
+     * @param id
+     *            Container ID
+     * @param status
+     *            Status string. List of statuses is available in <a
+     *            href="https://docs.docker.com/reference/api/docker_remote_api_v1.16/#monitor-dockers-events">Docker
+     *            API v.1.16</a>
+     * @param from
+     *            Image, from which the container has been created
+     * @param time
+     *            Event time The time is specified in milliseconds since January 1, 1970, 00:00:00 GMT
      * @since TODO
      */
     public Event(String status, String id, String from, long time) {
@@ -36,10 +41,12 @@ public Event(String status, String id, String from, long time) {
         this.from = from;
         this.time = time;
     }
-    
+
     /**
-     * Status of docker image or container. 
-     * List of statuses is available in <a href="https://docs.docker.com/reference/api/docker_remote_api_v1.16/#monitor-dockers-events">Docker API v.1.16</a>
+     * Status of docker image or container. List of statuses is available in <a
+     * href="https://docs.docker.com/reference/api/docker_remote_api_v1.16/#monitor-dockers-events">Docker API
+     * v.1.16</a>
+     * 
      * @return Status string
      */
     public String getStatus() {
@@ -48,6 +55,7 @@ public String getStatus() {
 
     /**
      * Get ID of docker container.
+     * 
      * @return Container ID
      */
     public String getId() {
@@ -56,6 +64,7 @@ public String getId() {
 
     /**
      * Get source image of the container.
+     * 
      * @return Name of the parent container
      */
     public String getFrom() {
@@ -63,8 +72,8 @@ public String getFrom() {
     }
 
     /**
-     * Get the event time.
-     * The time is specified in milliseconds since January 1, 1970, 00:00:00 GMT
+     * Get the event time. The time is specified in milliseconds since January 1, 1970, 00:00:00 GMT
+     * 
      * @return Event time in the specified format.
      */
     public long getTime() {
diff --git a/src/main/java/com/github/dockerjava/api/model/EventStreamItem.java b/src/main/java/com/github/dockerjava/api/model/EventStreamItem.java
index 010ed9af7..9c7489812 100644
--- a/src/main/java/com/github/dockerjava/api/model/EventStreamItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/EventStreamItem.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -12,12 +10,12 @@
 /**
  * Represents an event stream
  */
-@JsonIgnoreProperties(ignoreUnknown=true)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class EventStreamItem implements Serializable {
 
-	private static final long serialVersionUID = 638778515773898651L;
+    private static final long serialVersionUID = 638778515773898651L;
 
-	@JsonProperty("stream")
+    @JsonProperty("stream")
     private String stream;
 
     // {"error":"Error...", "errorDetail":{"code": 123, "message": "Error..."}}
@@ -39,28 +37,23 @@ public ErrorDetail getErrorDetail() {
         return errorDetail;
     }
 
-    @JsonIgnoreProperties(ignoreUnknown=true)
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class ErrorDetail implements Serializable {
         @JsonProperty("code")
         String code;
+
         @JsonProperty("message")
         String message;
 
         @Override
         public String toString() {
-            return Objects.toStringHelper(this)
-                    .add("code", code)
-                    .add("message", message)
-                    .toString();
+            return Objects.toStringHelper(this).add("code", code).add("message", message).toString();
         }
     }
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
-                .add("stream", stream)
-                .add("error", error)
-                .add("errorDetail", errorDetail)
+        return Objects.toStringHelper(this).add("stream", stream).add("error", error).add("errorDetail", errorDetail)
                 .toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/ExposedPort.java b/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
index 30f7ce384..23510e50a 100644
--- a/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
+++ b/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
@@ -24,168 +24,168 @@
 import com.github.dockerjava.api.model.Ports.Binding;
 
 /**
- * Represents a container port that Docker exposes to external clients.
- * The port is defined by its {@link #getPort() port number} and an
- * {@link InternetProtocol}.
- * It can be published by Docker by {@link Ports#bind(ExposedPort, Binding) binding}
- * it to a host port, represented by a {@link Binding}.
+ * Represents a container port that Docker exposes to external clients. The port is defined by its {@link #getPort()
+ * port number} and an {@link InternetProtocol}. It can be published by Docker by
+ * {@link Ports#bind(ExposedPort, Binding) binding} it to a host port, represented by a {@link Binding}.
  */
 @JsonDeserialize(using = ExposedPort.Deserializer.class)
 @JsonSerialize(using = ExposedPort.Serializer.class)
 public class ExposedPort {
 
-	private final InternetProtocol protocol;
-	private final int port;
-
-	/**
-	 * Creates an {@link ExposedPort} for the given parameters.
-	 * 
-	 * @param port the {@link #getPort() port number}
-	 * @param protocol the {@link InternetProtocol}
-	 */
-	public ExposedPort(int port, InternetProtocol protocol) {
-		this.port = port;
-		this.protocol = protocol;
-	}
-
-	/**
-	 * Creates an {@link ExposedPort} for the given 
-	 * {@link #getPort() port number} and {@link InternetProtocol#DEFAULT}.
-	 * 
-	 * @param port the {@link #getPort() port number}
-	 */
-	public ExposedPort(int port) {
-		this(port, InternetProtocol.DEFAULT);
-	}
-
-	/**
-	 * Creates an {@link ExposedPort} for the given parameters.
-	 * 
-	 * @param scheme the {@link #getScheme() scheme}, <code>tcp</code> or 
-	 *        <code>udp</code>
-	 * @param port the {@link #getPort() port number}
-	 * @deprecated use {@link #ExposedPort(int, InternetProtocol)}
-	 */
-	@Deprecated
-	public ExposedPort(String scheme, int port) {
-		this(port, InternetProtocol.valueOf(scheme));
-	}
-
-	/** @return the {@link InternetProtocol} of the {@link #getPort() port}
-	 *          that the container exposes */
-	public InternetProtocol getProtocol() {
-		return protocol;
-	}
-	
-	/**
-	 * @return the scheme (internet protocol), <code>tcp</code> or <code>udp</code>
-	 * @deprecated use {@link #getProtocol()}
-	 */
-	@Deprecated
-	public String getScheme() {
-		return protocol.toString();
-	}
-
-	/** @return the port number that the container exposes */
-	public int getPort() {
-		return port;
-	}
-
-	/**
-	 * Creates an {@link ExposedPort} for {@link InternetProtocol#TCP}.
-	 * This is a shortcut for <code>new ExposedPort(port, {@link InternetProtocol#TCP})</code>  
-	 */
-	public static ExposedPort tcp(int port) {
-		return new ExposedPort(port, TCP);
-	}
-
-	/**
-	 * Creates an {@link ExposedPort} for {@link InternetProtocol#UDP}.
-	 * This is a shortcut for <code>new ExposedPort(port, {@link InternetProtocol#UDP})</code>  
-	 */
-	public static ExposedPort udp(int port) {
-		return new ExposedPort(port, UDP);
-	}
-
-	/**
-	 * Parses a textual port specification (as used by the Docker CLI) to an 
-	 * {@link ExposedPort}.
-	 * 
-	 * @param serialized the specification, e.g. <code>80/tcp</code>
-	 * @return an {@link ExposedPort} matching the specification
-	 * @throws IllegalArgumentException if the specification cannot be parsed
-	 */
-	public static ExposedPort parse(String serialized) throws IllegalArgumentException {
-		try {
-			String[] parts = serialized.split("/");
-			switch (parts.length) {
-			case 1:
-				return new ExposedPort(Integer.valueOf(parts[0]));
-			case 2:
-				return new ExposedPort(Integer.valueOf(parts[0]), InternetProtocol.parse(parts[1]));
-			default:
-				throw new IllegalArgumentException();
-			}
-		} catch (Exception e) {
-			throw new IllegalArgumentException("Error parsing ExposedPort '" + serialized + "'");
-		}
-	}
-	
-	/**
-	 * Returns a string representation of this {@link ExposedPort} suitable
-	 * for inclusion in a JSON message.
-	 * The format is <code>port/protocol</code>, like the argument in {@link #parse(String)}.
-	 * 
-	 * @return a string representation of this {@link ExposedPort}
-	 */
-	@Override
-	public String toString() {
-		return port + "/" + protocol.toString();
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof ExposedPort) {
-			ExposedPort other = (ExposedPort) obj;
-			return new EqualsBuilder().append(protocol, other.getProtocol())
-					.append(port, other.getPort()).isEquals();
-		} else
-			return super.equals(obj);
-	}
-
-	@Override
-	public int hashCode() {
-		return new HashCodeBuilder().append(protocol).append(port).toHashCode();
-	}
-
-	public static class Deserializer extends JsonDeserializer<ExposedPort> {
-		@Override
-		public ExposedPort deserialize(JsonParser jsonParser,
-				DeserializationContext deserializationContext)
-				throws IOException, JsonProcessingException {
-			ObjectCodec oc = jsonParser.getCodec();
-			JsonNode node = oc.readTree(jsonParser);
-			if (!node.equals(NullNode.getInstance())) {
-				Entry<String, JsonNode> field = node.fields().next();
-				return ExposedPort.parse(field.getKey());
-			} else {
-				return null;
-			}
-		}
-	}
-
-	public static class Serializer extends JsonSerializer<ExposedPort> {
-
-		@Override
-		public void serialize(ExposedPort exposedPort, JsonGenerator jsonGen,
-				SerializerProvider serProvider) throws IOException,
-				JsonProcessingException {
-
-			jsonGen.writeStartObject();
-			jsonGen.writeFieldName(exposedPort.toString());
-			jsonGen.writeEndObject();
-		}
-
-	}
+    private final InternetProtocol protocol;
+
+    private final int port;
+
+    /**
+     * Creates an {@link ExposedPort} for the given parameters.
+     * 
+     * @param port
+     *            the {@link #getPort() port number}
+     * @param protocol
+     *            the {@link InternetProtocol}
+     */
+    public ExposedPort(int port, InternetProtocol protocol) {
+        this.port = port;
+        this.protocol = protocol;
+    }
+
+    /**
+     * Creates an {@link ExposedPort} for the given {@link #getPort() port number} and {@link InternetProtocol#DEFAULT}.
+     * 
+     * @param port
+     *            the {@link #getPort() port number}
+     */
+    public ExposedPort(int port) {
+        this(port, InternetProtocol.DEFAULT);
+    }
+
+    /**
+     * Creates an {@link ExposedPort} for the given parameters.
+     * 
+     * @param scheme
+     *            the {@link #getScheme() scheme}, <code>tcp</code> or <code>udp</code>
+     * @param port
+     *            the {@link #getPort() port number}
+     * @deprecated use {@link #ExposedPort(int, InternetProtocol)}
+     */
+    @Deprecated
+    public ExposedPort(String scheme, int port) {
+        this(port, InternetProtocol.valueOf(scheme));
+    }
+
+    /**
+     * @return the {@link InternetProtocol} of the {@link #getPort() port} that the container exposes
+     */
+    public InternetProtocol getProtocol() {
+        return protocol;
+    }
+
+    /**
+     * @return the scheme (internet protocol), <code>tcp</code> or <code>udp</code>
+     * @deprecated use {@link #getProtocol()}
+     */
+    @Deprecated
+    public String getScheme() {
+        return protocol.toString();
+    }
+
+    /** @return the port number that the container exposes */
+    public int getPort() {
+        return port;
+    }
+
+    /**
+     * Creates an {@link ExposedPort} for {@link InternetProtocol#TCP}. This is a shortcut for
+     * <code>new ExposedPort(port, {@link InternetProtocol#TCP})</code>
+     */
+    public static ExposedPort tcp(int port) {
+        return new ExposedPort(port, TCP);
+    }
+
+    /**
+     * Creates an {@link ExposedPort} for {@link InternetProtocol#UDP}. This is a shortcut for
+     * <code>new ExposedPort(port, {@link InternetProtocol#UDP})</code>
+     */
+    public static ExposedPort udp(int port) {
+        return new ExposedPort(port, UDP);
+    }
+
+    /**
+     * Parses a textual port specification (as used by the Docker CLI) to an {@link ExposedPort}.
+     * 
+     * @param serialized
+     *            the specification, e.g. <code>80/tcp</code>
+     * @return an {@link ExposedPort} matching the specification
+     * @throws IllegalArgumentException
+     *             if the specification cannot be parsed
+     */
+    public static ExposedPort parse(String serialized) throws IllegalArgumentException {
+        try {
+            String[] parts = serialized.split("/");
+            switch (parts.length) {
+            case 1:
+                return new ExposedPort(Integer.valueOf(parts[0]));
+            case 2:
+                return new ExposedPort(Integer.valueOf(parts[0]), InternetProtocol.parse(parts[1]));
+            default:
+                throw new IllegalArgumentException();
+            }
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Error parsing ExposedPort '" + serialized + "'");
+        }
+    }
+
+    /**
+     * Returns a string representation of this {@link ExposedPort} suitable for inclusion in a JSON message. The format
+     * is <code>port/protocol</code>, like the argument in {@link #parse(String)}.
+     * 
+     * @return a string representation of this {@link ExposedPort}
+     */
+    @Override
+    public String toString() {
+        return port + "/" + protocol.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof ExposedPort) {
+            ExposedPort other = (ExposedPort) obj;
+            return new EqualsBuilder().append(protocol, other.getProtocol()).append(port, other.getPort()).isEquals();
+        } else
+            return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(protocol).append(port).toHashCode();
+    }
+
+    public static class Deserializer extends JsonDeserializer<ExposedPort> {
+        @Override
+        public ExposedPort deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+                throws IOException, JsonProcessingException {
+            ObjectCodec oc = jsonParser.getCodec();
+            JsonNode node = oc.readTree(jsonParser);
+            if (!node.equals(NullNode.getInstance())) {
+                Entry<String, JsonNode> field = node.fields().next();
+                return ExposedPort.parse(field.getKey());
+            } else {
+                return null;
+            }
+        }
+    }
+
+    public static class Serializer extends JsonSerializer<ExposedPort> {
+
+        @Override
+        public void serialize(ExposedPort exposedPort, JsonGenerator jsonGen, SerializerProvider serProvider)
+                throws IOException, JsonProcessingException {
+
+            jsonGen.writeStartObject();
+            jsonGen.writeFieldName(exposedPort.toString());
+            jsonGen.writeEndObject();
+        }
+
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java b/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
index 983ad3c36..0ecb879b6 100644
--- a/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
+++ b/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
@@ -19,55 +19,54 @@
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.node.NullNode;
 
-
 @JsonSerialize(using = ExposedPorts.Serializer.class)
 @JsonDeserialize(using = ExposedPorts.Deserializer.class)
 public class ExposedPorts {
 
-	private ExposedPort[] exposedPorts;
+    private ExposedPort[] exposedPorts;
+
+    public ExposedPorts(ExposedPort... exposedPorts) {
+        this.exposedPorts = exposedPorts;
+    }
 
-	public ExposedPorts(ExposedPort... exposedPorts) {
-		this.exposedPorts = exposedPorts;
-	}
-	
-	public ExposedPorts(List<ExposedPort> exposedPorts) {
-		this.exposedPorts = exposedPorts.toArray(new ExposedPort[exposedPorts.size()]);
-	}
+    public ExposedPorts(List<ExposedPort> exposedPorts) {
+        this.exposedPorts = exposedPorts.toArray(new ExposedPort[exposedPorts.size()]);
+    }
 
-	public ExposedPort[] getExposedPorts() {
-		return exposedPorts;
-	}
+    public ExposedPort[] getExposedPorts() {
+        return exposedPorts;
+    }
 
-	public static class Serializer extends JsonSerializer<ExposedPorts> {
+    public static class Serializer extends JsonSerializer<ExposedPorts> {
 
-		@Override
-		public void serialize(ExposedPorts exposedPorts, JsonGenerator jsonGen,
-				SerializerProvider serProvider) throws IOException,
-				JsonProcessingException {
-			
-			jsonGen.writeStartObject();
-			for (ExposedPort exposedPort : exposedPorts.getExposedPorts()) {
-				jsonGen.writeFieldName(exposedPort.toString());
-				jsonGen.writeStartObject();
-				jsonGen.writeEndObject();
-			}
-			jsonGen.writeEndObject();
-		}
+        @Override
+        public void serialize(ExposedPorts exposedPorts, JsonGenerator jsonGen, SerializerProvider serProvider)
+                throws IOException, JsonProcessingException {
+
+            jsonGen.writeStartObject();
+            for (ExposedPort exposedPort : exposedPorts.getExposedPorts()) {
+                jsonGen.writeFieldName(exposedPort.toString());
+                jsonGen.writeStartObject();
+                jsonGen.writeEndObject();
+            }
+            jsonGen.writeEndObject();
+        }
+
+    }
 
-	}
-	
-	public static class Deserializer extends JsonDeserializer<ExposedPorts> {
+    public static class Deserializer extends JsonDeserializer<ExposedPorts> {
         @Override
-        public ExposedPorts deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+        public ExposedPorts deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+                throws IOException, JsonProcessingException {
 
-        	List<ExposedPort> exposedPorts = new ArrayList<ExposedPort>();
+            List<ExposedPort> exposedPorts = new ArrayList<ExposedPort>();
             ObjectCodec oc = jsonParser.getCodec();
             JsonNode node = oc.readTree(jsonParser);
             for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
 
                 Map.Entry<String, JsonNode> field = it.next();
                 if (!field.getValue().equals(NullNode.getInstance())) {
-                	exposedPorts.add(ExposedPort.parse(field.getKey()));
+                    exposedPorts.add(ExposedPort.parse(field.getKey()));
                 }
             }
             return new ExposedPorts(exposedPorts.toArray(new ExposedPort[0]));
diff --git a/src/main/java/com/github/dockerjava/api/model/Frame.java b/src/main/java/com/github/dockerjava/api/model/Frame.java
index 175b56830..1be92f9b6 100644
--- a/src/main/java/com/github/dockerjava/api/model/Frame.java
+++ b/src/main/java/com/github/dockerjava/api/model/Frame.java
@@ -7,6 +7,7 @@
  */
 public class Frame {
     private final StreamType streamType;
+
     private final byte[] payload;
 
     public Frame(StreamType streamType, byte[] payload) {
@@ -29,8 +30,10 @@ public String toString() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
 
         Frame frame = (Frame) o;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 6b8cdcd45..19da56517 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -5,243 +5,241 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
-
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class HostConfig {
 
-	@JsonProperty("Binds")
-	private Binds binds;
-
-	@JsonProperty("Links")
-	private Links links;
-
-	@JsonProperty("LxcConf")
-	private LxcConf[] lxcConf;
+    @JsonProperty("Binds")
+    private Binds binds;
 
-	@JsonProperty("PortBindings")
-	private Ports portBindings;
+    @JsonProperty("Links")
+    private Links links;
 
-	@JsonProperty("PublishAllPorts")
-	private boolean publishAllPorts;
+    @JsonProperty("LxcConf")
+    private LxcConf[] lxcConf;
 
-	@JsonProperty("Privileged")
-	private boolean privileged;
+    @JsonProperty("PortBindings")
+    private Ports portBindings;
 
-	@JsonProperty("ReadonlyRootfs")
-	private boolean readonlyRootfs;
+    @JsonProperty("PublishAllPorts")
+    private boolean publishAllPorts;
 
-	@JsonProperty("Dns")
-	private String[] dns;
+    @JsonProperty("Privileged")
+    private boolean privileged;
 
-	@JsonProperty("DnsSearch")
-	private String[] dnsSearch;
+    @JsonProperty("ReadonlyRootfs")
+    private boolean readonlyRootfs;
 
-	@JsonProperty("VolumesFrom")
-	private VolumesFrom[] volumesFrom;
+    @JsonProperty("Dns")
+    private String[] dns;
 
-	@JsonProperty("ContainerIDFile")
-	private String containerIDFile;
+    @JsonProperty("DnsSearch")
+    private String[] dnsSearch;
 
-	@JsonProperty("CapAdd")
-	private Capability[] capAdd;
+    @JsonProperty("VolumesFrom")
+    private VolumesFrom[] volumesFrom;
 
-	@JsonProperty("CapDrop")
-	private Capability[] capDrop;
+    @JsonProperty("ContainerIDFile")
+    private String containerIDFile;
 
-	@JsonProperty("RestartPolicy")
-	private RestartPolicy restartPolicy;
+    @JsonProperty("CapAdd")
+    private Capability[] capAdd;
 
-	@JsonProperty("NetworkMode")
-	private String networkMode;
+    @JsonProperty("CapDrop")
+    private Capability[] capDrop;
 
-	@JsonProperty("Devices")
-	private Device[] devices;
+    @JsonProperty("RestartPolicy")
+    private RestartPolicy restartPolicy;
 
-	@JsonProperty("ExtraHosts")
-	private String[] extraHosts;
+    @JsonProperty("NetworkMode")
+    private String networkMode;
 
-	@JsonProperty("Ulimits")
-	private Ulimit[] ulimits;
+    @JsonProperty("Devices")
+    private Device[] devices;
 
-	public HostConfig() {
-	}
+    @JsonProperty("ExtraHosts")
+    private String[] extraHosts;
 
-	public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, Ports portBindings, boolean publishAllPorts,
-			boolean privileged, boolean readonlyRootfs, String[] dns, String[] dnsSearch, VolumesFrom[] volumesFrom, String containerIDFile,
-			Capability[] capAdd, Capability[] capDrop, RestartPolicy restartPolicy, String networkMode, Device[] devices,
-            String[] extraHosts, Ulimit[] ulimits) {
-		this.binds = new Binds(binds);
-		this.links = new Links(links);
-		this.lxcConf = lxcConf;
-		this.portBindings = portBindings;
-		this.publishAllPorts = publishAllPorts;
-		this.privileged = privileged;
-		this.readonlyRootfs = readonlyRootfs;
-		this.dns = dns;
-		this.dnsSearch = dnsSearch;
-		this.volumesFrom = volumesFrom;
-		this.containerIDFile = containerIDFile;
-		this.capAdd = capAdd;
-		this.capDrop = capDrop;
-		this.restartPolicy = restartPolicy;
-		this.networkMode = networkMode;
-		this.devices = devices;
-		this.extraHosts = extraHosts;
-		this.ulimits = ulimits;
-	}
+    @JsonProperty("Ulimits")
+    private Ulimit[] ulimits;
 
+    public HostConfig() {
+    }
 
-	@JsonIgnore
-	public Bind[] getBinds() {
-		return (binds == null) ? new Bind[0] : binds.getBinds();
-	}
+    public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, Ports portBindings, boolean publishAllPorts,
+            boolean privileged, boolean readonlyRootfs, String[] dns, String[] dnsSearch, VolumesFrom[] volumesFrom,
+            String containerIDFile, Capability[] capAdd, Capability[] capDrop, RestartPolicy restartPolicy,
+            String networkMode, Device[] devices, String[] extraHosts, Ulimit[] ulimits) {
+        this.binds = new Binds(binds);
+        this.links = new Links(links);
+        this.lxcConf = lxcConf;
+        this.portBindings = portBindings;
+        this.publishAllPorts = publishAllPorts;
+        this.privileged = privileged;
+        this.readonlyRootfs = readonlyRootfs;
+        this.dns = dns;
+        this.dnsSearch = dnsSearch;
+        this.volumesFrom = volumesFrom;
+        this.containerIDFile = containerIDFile;
+        this.capAdd = capAdd;
+        this.capDrop = capDrop;
+        this.restartPolicy = restartPolicy;
+        this.networkMode = networkMode;
+        this.devices = devices;
+        this.extraHosts = extraHosts;
+        this.ulimits = ulimits;
+    }
 
-	public LxcConf[] getLxcConf() {
-		return lxcConf;
-	}
+    @JsonIgnore
+    public Bind[] getBinds() {
+        return (binds == null) ? new Bind[0] : binds.getBinds();
+    }
 
-	public Ports getPortBindings() {
-		return portBindings;
-	}
+    public LxcConf[] getLxcConf() {
+        return lxcConf;
+    }
 
-	public boolean isPublishAllPorts() {
-		return publishAllPorts;
-	}
+    public Ports getPortBindings() {
+        return portBindings;
+    }
 
-	public boolean isPrivileged() {
-		return privileged;
-	}
+    public boolean isPublishAllPorts() {
+        return publishAllPorts;
+    }
 
-	public boolean isReadonlyRootfs() {
-		return readonlyRootfs;
-	}
-
-	public String[] getDns() {
-		return dns;
-	}
-
-	public VolumesFrom[] getVolumesFrom() {
-		return volumesFrom;
-	}
-
-	public String getContainerIDFile() {
-		return containerIDFile;
-	}
-
-	public String[] getDnsSearch() {
-		return dnsSearch;
-	}
-
-	@JsonIgnore
-	public Link[] getLinks() {
-		return (links == null) ? new Link[0] : links.getLinks();
-	}
-
-	public String getNetworkMode() {
-		return networkMode;
-	}
-
-	public Device[] getDevices() {
-		return devices;
-	}
-
-	public String[] getExtraHosts() {
-		return extraHosts;
-	}
-
-	public RestartPolicy getRestartPolicy() {
-		return restartPolicy;
-	}
-
-	public Capability[] getCapAdd() {
-		return capAdd;
-	}
-
-	public Capability[] getCapDrop() {
-		return capDrop;
-	}
-
-	public Ulimit[] getUlimits() {
-		return ulimits;
-	}
-
-	@JsonIgnore
-	public void setBinds(Bind... binds) {
-		this.binds = new Binds(binds);
-	}
-
-	@JsonIgnore
-	public void setLinks(Link... links) {
-		this.links = new Links(links);
-	}
-
-	public void setLxcConf(LxcConf[] lxcConf) {
-		this.lxcConf = lxcConf;
-	}
-
-	public void setPortBindings(Ports portBindings) {
-		this.portBindings = portBindings;
-	}
-
-	public void setPublishAllPorts(boolean publishAllPorts) {
-		this.publishAllPorts = publishAllPorts;
-	}
-
-	public void setPrivileged(boolean privileged) {
-		this.privileged = privileged;
-	}
-
-	public void setReadonlyRootfs(boolean readonlyRootfs) {
-		this.readonlyRootfs = readonlyRootfs;
-	}
-
-	public void setDns(String[] dns) {
-		this.dns = dns;
-	}
-
-	public void setDnsSearch(String[] dnsSearch) {
-		this.dnsSearch = dnsSearch;
-	}
-
-	public void setVolumesFrom(VolumesFrom[] volumesFrom) {
-		this.volumesFrom = volumesFrom;
-	}
-
-	public void setContainerIDFile(String containerIDFile) {
-		this.containerIDFile = containerIDFile;
-	}
-
-	public void setCapAdd(Capability[] capAdd) {
-		this.capAdd = capAdd;
-	}
-
-	public void setCapDrop(Capability[] capDrop) {
-		this.capDrop = capDrop;
-	}
-
-	public void setRestartPolicy(RestartPolicy restartPolicy) {
-		this.restartPolicy = restartPolicy;
-	}
-
-	public void setNetworkMode(String networkMode) {
-		this.networkMode = networkMode;
-	}
-
-	public void setDevices(Device[] devices) {
-		this.devices = devices;
-	}
-
-	public void setExtraHosts(String[] extraHosts) {
-		this.extraHosts = extraHosts;
-	}
-
-	public void setUlimits(Ulimit[] ulimits) {
-		this.ulimits = ulimits;
-	}
-
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
+    public boolean isPrivileged() {
+        return privileged;
+    }
+
+    public boolean isReadonlyRootfs() {
+        return readonlyRootfs;
+    }
+
+    public String[] getDns() {
+        return dns;
+    }
+
+    public VolumesFrom[] getVolumesFrom() {
+        return volumesFrom;
+    }
+
+    public String getContainerIDFile() {
+        return containerIDFile;
+    }
+
+    public String[] getDnsSearch() {
+        return dnsSearch;
+    }
+
+    @JsonIgnore
+    public Link[] getLinks() {
+        return (links == null) ? new Link[0] : links.getLinks();
+    }
+
+    public String getNetworkMode() {
+        return networkMode;
+    }
+
+    public Device[] getDevices() {
+        return devices;
+    }
+
+    public String[] getExtraHosts() {
+        return extraHosts;
+    }
+
+    public RestartPolicy getRestartPolicy() {
+        return restartPolicy;
+    }
+
+    public Capability[] getCapAdd() {
+        return capAdd;
+    }
+
+    public Capability[] getCapDrop() {
+        return capDrop;
+    }
+
+    public Ulimit[] getUlimits() {
+        return ulimits;
+    }
+
+    @JsonIgnore
+    public void setBinds(Bind... binds) {
+        this.binds = new Binds(binds);
+    }
+
+    @JsonIgnore
+    public void setLinks(Link... links) {
+        this.links = new Links(links);
+    }
+
+    public void setLxcConf(LxcConf[] lxcConf) {
+        this.lxcConf = lxcConf;
+    }
+
+    public void setPortBindings(Ports portBindings) {
+        this.portBindings = portBindings;
+    }
+
+    public void setPublishAllPorts(boolean publishAllPorts) {
+        this.publishAllPorts = publishAllPorts;
+    }
+
+    public void setPrivileged(boolean privileged) {
+        this.privileged = privileged;
+    }
+
+    public void setReadonlyRootfs(boolean readonlyRootfs) {
+        this.readonlyRootfs = readonlyRootfs;
+    }
+
+    public void setDns(String[] dns) {
+        this.dns = dns;
+    }
+
+    public void setDnsSearch(String[] dnsSearch) {
+        this.dnsSearch = dnsSearch;
+    }
+
+    public void setVolumesFrom(VolumesFrom[] volumesFrom) {
+        this.volumesFrom = volumesFrom;
+    }
+
+    public void setContainerIDFile(String containerIDFile) {
+        this.containerIDFile = containerIDFile;
+    }
+
+    public void setCapAdd(Capability[] capAdd) {
+        this.capAdd = capAdd;
+    }
+
+    public void setCapDrop(Capability[] capDrop) {
+        this.capDrop = capDrop;
+    }
+
+    public void setRestartPolicy(RestartPolicy restartPolicy) {
+        this.restartPolicy = restartPolicy;
+    }
+
+    public void setNetworkMode(String networkMode) {
+        this.networkMode = networkMode;
+    }
+
+    public void setDevices(Device[] devices) {
+        this.devices = devices;
+    }
+
+    public void setExtraHosts(String[] extraHosts) {
+        this.extraHosts = extraHosts;
+    }
+
+    public void setUlimits(Ulimit[] ulimits) {
+        this.ulimits = ulimits;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Identifier.java b/src/main/java/com/github/dockerjava/api/model/Identifier.java
index 498104e29..96daab11a 100644
--- a/src/main/java/com/github/dockerjava/api/model/Identifier.java
+++ b/src/main/java/com/github/dockerjava/api/model/Identifier.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-
 import com.google.common.base.Objects;
 import com.google.common.base.Optional;
 
@@ -9,51 +8,46 @@
  */
 public class Identifier {
     public final Repository repository;
+
     public final Optional<String> tag;
 
     public Identifier(Repository repository, String tag) {
         this.repository = repository;
 
-        if( tag == null )
+        if (tag == null)
             this.tag = Optional.absent();
         else
             this.tag = Optional.of(tag);
     }
 
-
     /**
-     * Return an identifier that correctly splits up the repository and tag.
-     * There can be &gt; 1 ":"
-     * fred/jim     --&gt; fred/jim, []
-     * fred/jim:123 --&gt;  fred/jim, 123
-     * fred:123/jim:123 --&gt; fred:123/jim, 123
+     * Return an identifier that correctly splits up the repository and tag. There can be &gt; 1 ":" fred/jim --&gt;
+     * fred/jim, [] fred/jim:123 --&gt; fred/jim, 123 fred:123/jim:123 --&gt; fred:123/jim, 123
      *
      *
-     * @param identifier as a string
+     * @param identifier
+     *            as a string
      * @return parsed identifier.
      */
     public static Identifier fromCompoundString(String identifier) {
         String[] parts = identifier.split("/");
-        if( parts.length != 2 ) {
+        if (parts.length != 2) {
             String[] rhs = identifier.split(":");
-            if( rhs.length != 2 )
-                return new Identifier( new Repository(identifier), null);
+            if (rhs.length != 2)
+                return new Identifier(new Repository(identifier), null);
             else
-                return new Identifier( new Repository(rhs[0]), rhs[1]);
+                return new Identifier(new Repository(rhs[0]), rhs[1]);
         }
 
         String[] rhs = parts[1].split(":");
-        if( rhs.length != 2 )
-            return new Identifier( new Repository(identifier), null);
+        if (rhs.length != 2)
+            return new Identifier(new Repository(identifier), null);
 
-        return new Identifier( new Repository(parts[0] + "/" + rhs[0]), rhs[1]);
+        return new Identifier(new Repository(parts[0] + "/" + rhs[0]), rhs[1]);
     }
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
-                .add("repository", repository)
-                .add("tag", tag)
-                .toString();
+        return Objects.toStringHelper(this).add("repository", repository).add("tag", tag).toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Image.java b/src/main/java/com/github/dockerjava/api/model/Image.java
index 8c694daba..9df8aacef 100644
--- a/src/main/java/com/github/dockerjava/api/model/Image.java
+++ b/src/main/java/com/github/dockerjava/api/model/Image.java
@@ -13,16 +13,16 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Image {
 
-	@JsonProperty("Created")
-	private long created;
+    @JsonProperty("Created")
+    private long created;
 
-	@JsonProperty("Id")
+    @JsonProperty("Id")
     private String id;
 
-	@JsonProperty("ParentId")
-	private String parentId;
+    @JsonProperty("ParentId")
+    private String parentId;
 
-	@JsonProperty("RepoTags")
+    @JsonProperty("RepoTags")
     private String[] repoTags;
 
     @JsonProperty("Size")
diff --git a/src/main/java/com/github/dockerjava/api/model/Info.java b/src/main/java/com/github/dockerjava/api/model/Info.java
index bf96b9fc1..5ff53a597 100644
--- a/src/main/java/com/github/dockerjava/api/model/Info.java
+++ b/src/main/java/com/github/dockerjava/api/model/Info.java
@@ -20,173 +20,173 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Info {
 
-	@JsonProperty("Containers")
-	private int containers;
-
-	@JsonProperty("Debug")
-	private boolean debug;
-	
-	@JsonProperty("DockerRootDir")
-	private String DockerRootDir;
-
-	@JsonProperty("Driver")
-	private String driver;
-
-	@JsonProperty("DriverStatus")
-	private List<Object> driverStatuses;
-
-	@JsonProperty("ExecutionDriver")
-	private String executionDriver;
-	
-	@JsonProperty("ID")
-	private String ID;
-
-	@JsonProperty("IPv4Forwarding")
-	private boolean IPv4Forwarding;
-
-	@JsonProperty("Images")
-	private int images;
-
-	@JsonProperty("IndexServerAddress")
-	private String IndexServerAddress;
-
-	@JsonProperty("InitPath")
-	private String initPath;
-
-	@JsonProperty("InitSha1")
-	private String initSha1;
-
-	@JsonProperty("KernelVersion")
-	private String kernelVersion;
-	
-	@JsonProperty("Labels")
-	private String[] Labels;
-
-	@JsonProperty("MemoryLimit")
-	private boolean memoryLimit;
-	
-	@JsonProperty("MemTotal")
-	private long memTotal;
-		
-	@JsonProperty("Name")
-	private String name;
-	
-	@JsonProperty("NCPU")
-	private int NCPU;
-
-	@JsonProperty("NEventsListener")
-	private long nEventListener;
-
-	@JsonProperty("NFd")
-	private int NFd;
-
-	@JsonProperty("NGoroutines")
-	private int NGoroutines;
-	
-	@JsonProperty("OperatingSystem")
-	private String OperatingSystem;
-
-	@JsonProperty("Sockets")
-	private String[] sockets;
-
-	@JsonProperty("SwapLimit")
-	private boolean swapLimit;
-
-	public boolean isDebug() {
-		return debug;
-	}
-
-	public int getContainers() {
-		return containers;
-	}
-	
-	public String getDockerRootDir() {
-		return DockerRootDir;
-	}
-
-	public String getDriver() {
-		return driver;
-	}
-
-	public List<Object> getDriverStatuses() {
-		return driverStatuses;
-	}
-
-	public int getImages() {
-		return images;
-	}
-	
-	public String getID() {
-		return ID;
-	}
-
-	public boolean getIPv4Forwarding() {
-		return IPv4Forwarding;
-	}
-
-	public String getIndexServerAddress() {
-		return IndexServerAddress;
-	}
-
-	public String getInitPath() {
-		return initPath;
-	}
-
-	public String getInitSha1() {
-		return initSha1;
-	}
-
-	public String getKernelVersion() {
-		return kernelVersion;
-	}
-	
-	public String[] getLabels() {
-		return Labels;
-	}
-
-	public String[] getSockets() {
-		return sockets;
-	}
-
-	public boolean isMemoryLimit() {
-		return memoryLimit;
-	}
-
-	public long getnEventListener() {
-		return nEventListener;
-	}
-	
-	public long getMemTotal() {
-		return memTotal;
-	}
-	
-	public String getName() {
-		return name;
-	}
-	
-	public int getNCPU() {
-		return NCPU;
-	}
-
-	public int getNFd() {
-		return NFd;
-	}
-
-	public int getNGoroutines() {
-		return NGoroutines;
-	}
-	
-	public String getOperatingSystem() {
-		return OperatingSystem;
-	}
-
-	public boolean getSwapLimit() {
-		return swapLimit;
-	}
-
-	public String getExecutionDriver() {
-		return executionDriver;
-	}
+    @JsonProperty("Containers")
+    private int containers;
+
+    @JsonProperty("Debug")
+    private boolean debug;
+
+    @JsonProperty("DockerRootDir")
+    private String DockerRootDir;
+
+    @JsonProperty("Driver")
+    private String driver;
+
+    @JsonProperty("DriverStatus")
+    private List<Object> driverStatuses;
+
+    @JsonProperty("ExecutionDriver")
+    private String executionDriver;
+
+    @JsonProperty("ID")
+    private String ID;
+
+    @JsonProperty("IPv4Forwarding")
+    private boolean IPv4Forwarding;
+
+    @JsonProperty("Images")
+    private int images;
+
+    @JsonProperty("IndexServerAddress")
+    private String IndexServerAddress;
+
+    @JsonProperty("InitPath")
+    private String initPath;
+
+    @JsonProperty("InitSha1")
+    private String initSha1;
+
+    @JsonProperty("KernelVersion")
+    private String kernelVersion;
+
+    @JsonProperty("Labels")
+    private String[] Labels;
+
+    @JsonProperty("MemoryLimit")
+    private boolean memoryLimit;
+
+    @JsonProperty("MemTotal")
+    private long memTotal;
+
+    @JsonProperty("Name")
+    private String name;
+
+    @JsonProperty("NCPU")
+    private int NCPU;
+
+    @JsonProperty("NEventsListener")
+    private long nEventListener;
+
+    @JsonProperty("NFd")
+    private int NFd;
+
+    @JsonProperty("NGoroutines")
+    private int NGoroutines;
+
+    @JsonProperty("OperatingSystem")
+    private String OperatingSystem;
+
+    @JsonProperty("Sockets")
+    private String[] sockets;
+
+    @JsonProperty("SwapLimit")
+    private boolean swapLimit;
+
+    public boolean isDebug() {
+        return debug;
+    }
+
+    public int getContainers() {
+        return containers;
+    }
+
+    public String getDockerRootDir() {
+        return DockerRootDir;
+    }
+
+    public String getDriver() {
+        return driver;
+    }
+
+    public List<Object> getDriverStatuses() {
+        return driverStatuses;
+    }
+
+    public int getImages() {
+        return images;
+    }
+
+    public String getID() {
+        return ID;
+    }
+
+    public boolean getIPv4Forwarding() {
+        return IPv4Forwarding;
+    }
+
+    public String getIndexServerAddress() {
+        return IndexServerAddress;
+    }
+
+    public String getInitPath() {
+        return initPath;
+    }
+
+    public String getInitSha1() {
+        return initSha1;
+    }
+
+    public String getKernelVersion() {
+        return kernelVersion;
+    }
+
+    public String[] getLabels() {
+        return Labels;
+    }
+
+    public String[] getSockets() {
+        return sockets;
+    }
+
+    public boolean isMemoryLimit() {
+        return memoryLimit;
+    }
+
+    public long getnEventListener() {
+        return nEventListener;
+    }
+
+    public long getMemTotal() {
+        return memTotal;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getNCPU() {
+        return NCPU;
+    }
+
+    public int getNFd() {
+        return NFd;
+    }
+
+    public int getNGoroutines() {
+        return NGoroutines;
+    }
+
+    public String getOperatingSystem() {
+        return OperatingSystem;
+    }
+
+    public boolean getSwapLimit() {
+        return swapLimit;
+    }
+
+    public String getExecutionDriver() {
+        return executionDriver;
+    }
 
     @Override
     public String toString() {
diff --git a/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java b/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
index 96c215245..65df8cf6f 100644
--- a/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
+++ b/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-
 /**
  * The IP protocols supported by Docker.
  * 
@@ -8,42 +7,43 @@
  * @see #UDP
  */
 public enum InternetProtocol {
-	/** The <i>Transmission Control Protocol</i> */
-	TCP, 
+    /** The <i>Transmission Control Protocol</i> */
+    TCP,
+
+    /** The <i>User Datagram Protocol</i> */
+    UDP;
 
-	/** The <i>User Datagram Protocol</i> */
-	UDP;
-	
-	/**
-	 * The default {@link InternetProtocol}: {@link #TCP}
-	 */
-	public static final InternetProtocol DEFAULT = TCP;
+    /**
+     * The default {@link InternetProtocol}: {@link #TCP}
+     */
+    public static final InternetProtocol DEFAULT = TCP;
 
-	/**
-	 * Returns a string representation of this {@link InternetProtocol} suitable
-	 * for inclusion in a JSON message.
-	 * The output is the lowercased name of the Protocol, e.g. <code>tcp</code>.
-	 * 
-	 * @return a string representation of this {@link InternetProtocol}
-	 */
-	@Override
-	public String toString() {
-		return super.toString().toLowerCase();
-	}
+    /**
+     * Returns a string representation of this {@link InternetProtocol} suitable for inclusion in a JSON message. The
+     * output is the lowercased name of the Protocol, e.g. <code>tcp</code>.
+     * 
+     * @return a string representation of this {@link InternetProtocol}
+     */
+    @Override
+    public String toString() {
+        return super.toString().toLowerCase();
+    }
 
-	/**
-	 * Parses a string to an {@link InternetProtocol}.
-	 * 
-	 * @param serialized the protocol, e.g. <code>tcp</code> or <code>TCP</code>
-	 * @return an {@link InternetProtocol} described by the string
-	 * @throws IllegalArgumentException if the argument cannot be parsed
-	 */
-	public static InternetProtocol parse(String serialized) throws IllegalArgumentException {
-		try {
-			return valueOf(serialized.toUpperCase());
-		} catch (Exception e) {
-			throw new IllegalArgumentException("Error parsing Protocol '" + serialized + "'");
-		}
-	}
+    /**
+     * Parses a string to an {@link InternetProtocol}.
+     * 
+     * @param serialized
+     *            the protocol, e.g. <code>tcp</code> or <code>TCP</code>
+     * @return an {@link InternetProtocol} described by the string
+     * @throws IllegalArgumentException
+     *             if the argument cannot be parsed
+     */
+    public static InternetProtocol parse(String serialized) throws IllegalArgumentException {
+        try {
+            return valueOf(serialized.toUpperCase());
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Error parsing Protocol '" + serialized + "'");
+        }
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Link.java b/src/main/java/com/github/dockerjava/api/model/Link.java
index ab8485a36..0b2c828f3 100644
--- a/src/main/java/com/github/dockerjava/api/model/Link.java
+++ b/src/main/java/com/github/dockerjava/api/model/Link.java
@@ -4,104 +4,94 @@
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
 /**
- * Represents a network link between two Docker containers.
- * The container with the name {@link #getName()} is made available in the
- * target container with the aliased name {@link #getAlias()}.
- * This involves creating an entry in <code>/etc/hosts</code> and some environment
- * variables in the target container as well as creating a network bridge between
- * both containers.
+ * Represents a network link between two Docker containers. The container with the name {@link #getName()} is made
+ * available in the target container with the aliased name {@link #getAlias()}. This involves creating an entry in
+ * <code>/etc/hosts</code> and some environment variables in the target container as well as creating a network bridge
+ * between both containers.
  */
-public class Link
-{
+public class Link {
 
-	private final String name;
+    private final String name;
 
-	private final String alias;
+    private final String alias;
 
-	/**
-	 * Creates a {@link Link} for the container with the given name and an aliased
-	 * name for use in the target container.
-	 * 
-	 * @param name the name of the container that you want to link into the target
-	 *        container
-	 * @param alias the aliased name under which the linked container will be available
-	 *        in the target container
-	 */
-	public Link(final String name, final String alias)
-	{
-		this.name = name;
-		this.alias = alias;
-	}
+    /**
+     * Creates a {@link Link} for the container with the given name and an aliased name for use in the target container.
+     * 
+     * @param name
+     *            the name of the container that you want to link into the target container
+     * @param alias
+     *            the aliased name under which the linked container will be available in the target container
+     */
+    public Link(final String name, final String alias) {
+        this.name = name;
+        this.alias = alias;
+    }
 
-	/**
-	 * @return the name of the container that is linked into the target container
-	 */
-	public String getName()
-	{
-		return name;
-	}
+    /**
+     * @return the name of the container that is linked into the target container
+     */
+    public String getName() {
+        return name;
+    }
 
-	/**
-	 * @return the aliased name under which the linked container will be available
-	 *         in the target container  
-	 */
-	public String getAlias()
-	{
-		return alias;
-	}
+    /**
+     * @return the aliased name under which the linked container will be available in the target container
+     */
+    public String getAlias() {
+        return alias;
+    }
 
-	/**
-	 * Parses a textual link specification (as used by the Docker CLI) to a {@link Link}.
-	 * 
-	 * @param serialized the specification, e.g. <code>name:alias</code> or <code>/name1:/name2/alias</code>
-	 * @return a {@link Link} matching the specification
-	 * @throws IllegalArgumentException if the specification cannot be parsed
-	 */
-	public static Link parse(final String serialized) throws IllegalArgumentException
-	{
-		try {
-			final String[] parts = serialized.split(":");
-			switch (parts.length) {
-			case 2: {
-				String[] nameSplit = parts[0].split("/");
-				String[] aliasSplit = parts[1].split("/");
-				return new Link(nameSplit[nameSplit.length - 1], aliasSplit[aliasSplit.length - 1]);
-			}
-			default: {
-				throw new IllegalArgumentException();
-			}
-			}
-		} catch (final Exception e) {
-			throw new IllegalArgumentException("Error parsing Link '" + serialized + "'");
-		}
-	}
+    /**
+     * Parses a textual link specification (as used by the Docker CLI) to a {@link Link}.
+     * 
+     * @param serialized
+     *            the specification, e.g. <code>name:alias</code> or <code>/name1:/name2/alias</code>
+     * @return a {@link Link} matching the specification
+     * @throws IllegalArgumentException
+     *             if the specification cannot be parsed
+     */
+    public static Link parse(final String serialized) throws IllegalArgumentException {
+        try {
+            final String[] parts = serialized.split(":");
+            switch (parts.length) {
+            case 2: {
+                String[] nameSplit = parts[0].split("/");
+                String[] aliasSplit = parts[1].split("/");
+                return new Link(nameSplit[nameSplit.length - 1], aliasSplit[aliasSplit.length - 1]);
+            }
+            default: {
+                throw new IllegalArgumentException();
+            }
+            }
+        } catch (final Exception e) {
+            throw new IllegalArgumentException("Error parsing Link '" + serialized + "'");
+        }
+    }
 
-	@Override
-	public boolean equals(final Object obj)
-	{
-		if (obj instanceof Link) {
-			final Link other = (Link) obj;
-			return new EqualsBuilder().append(name, other.getName()).append(alias, other.getAlias()).isEquals();
-		} else
-			return super.equals(obj);
-	}
+    @Override
+    public boolean equals(final Object obj) {
+        if (obj instanceof Link) {
+            final Link other = (Link) obj;
+            return new EqualsBuilder().append(name, other.getName()).append(alias, other.getAlias()).isEquals();
+        } else
+            return super.equals(obj);
+    }
 
-	@Override
-	public int hashCode()
-	{
-		return new HashCodeBuilder().append(name).append(alias).toHashCode();
-	}
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(name).append(alias).toHashCode();
+    }
 
-	/**
-	 * Returns a string representation of this {@link Link} suitable
-	 * for inclusion in a JSON message.
-	 * The format is <code>name:alias</code>, like the argument in {@link #parse(String)}.
-	 * 
-	 * @return a string representation of this {@link Link}
-	 */
-	@Override
-	public String toString() {
-		return name + ":" + alias;
-	}
+    /**
+     * Returns a string representation of this {@link Link} suitable for inclusion in a JSON message. The format is
+     * <code>name:alias</code>, like the argument in {@link #parse(String)}.
+     * 
+     * @return a string representation of this {@link Link}
+     */
+    @Override
+    public String toString() {
+        return name + ":" + alias;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Links.java b/src/main/java/com/github/dockerjava/api/model/Links.java
index 888c0aa2c..2d678b3a3 100644
--- a/src/main/java/com/github/dockerjava/api/model/Links.java
+++ b/src/main/java/com/github/dockerjava/api/model/Links.java
@@ -1,4 +1,3 @@
-
 package com.github.dockerjava.api.model;
 
 import java.io.IOException;
@@ -21,58 +20,53 @@
 
 @JsonSerialize(using = Links.Serializer.class)
 @JsonDeserialize(using = Links.Deserializer.class)
-public class Links
-{
+public class Links {
 
-	private final Link[] links;
+    private final Link[] links;
 
-	public Links(final Link... links)
-	{
-		this.links = links;
-	}
+    public Links(final Link... links) {
+        this.links = links;
+    }
 
-	public Links(final List<Link> links) {
-		this.links = links.toArray(new Link[links.size()]);
-	}
+    public Links(final List<Link> links) {
+        this.links = links.toArray(new Link[links.size()]);
+    }
 
-	public Link[] getLinks()
-	{
-		return links;
-	}
+    public Link[] getLinks() {
+        return links;
+    }
 
-	public static class Serializer extends JsonSerializer<Links>
-	{
+    public static class Serializer extends JsonSerializer<Links> {
 
-		@Override
-		public void serialize(final Links links, final JsonGenerator jsonGen, final SerializerProvider serProvider) throws IOException, JsonProcessingException
-		{
-			jsonGen.writeStartArray();
-			for (final Link link : links.getLinks()) {
-				jsonGen.writeString(link.toString());
-			}
-			jsonGen.writeEndArray();
-		}
+        @Override
+        public void serialize(final Links links, final JsonGenerator jsonGen, final SerializerProvider serProvider)
+                throws IOException, JsonProcessingException {
+            jsonGen.writeStartArray();
+            for (final Link link : links.getLinks()) {
+                jsonGen.writeString(link.toString());
+            }
+            jsonGen.writeEndArray();
+        }
 
-	}
+    }
 
-	public static class Deserializer extends JsonDeserializer<Links>
-	{
+    public static class Deserializer extends JsonDeserializer<Links> {
 
-		@Override
-		public Links deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException
-		{
-			final List<Link> binds = new ArrayList<Link>();
-			final ObjectCodec oc = jsonParser.getCodec();
-			final JsonNode node = oc.readTree(jsonParser);
-			for (final Iterator<JsonNode> it = node.elements(); it.hasNext();) {
+        @Override
+        public Links deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext)
+                throws IOException, JsonProcessingException {
+            final List<Link> binds = new ArrayList<Link>();
+            final ObjectCodec oc = jsonParser.getCodec();
+            final JsonNode node = oc.readTree(jsonParser);
+            for (final Iterator<JsonNode> it = node.elements(); it.hasNext();) {
 
-				final JsonNode element = it.next();
-				if (!element.equals(NullNode.getInstance())) {
-					binds.add(Link.parse(element.asText()));
-				}
-			}
-			return new Links(binds.toArray(new Link[0]));
-		}
-	}
+                final JsonNode element = it.next();
+                if (!element.equals(NullNode.getInstance())) {
+                    binds.add(Link.parse(element.asText()));
+                }
+            }
+            return new Links(binds.toArray(new Link[0]));
+        }
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/LxcConf.java b/src/main/java/com/github/dockerjava/api/model/LxcConf.java
index 67ce00cac..f97588308 100644
--- a/src/main/java/com/github/dockerjava/api/model/LxcConf.java
+++ b/src/main/java/com/github/dockerjava/api/model/LxcConf.java
@@ -3,36 +3,36 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class LxcConf {
-	@JsonProperty("Key")
-	public String key;
+    @JsonProperty("Key")
+    public String key;
 
-	@JsonProperty("Value")
-	public String value;
+    @JsonProperty("Value")
+    public String value;
 
-	public LxcConf(String key, String value) {
-		this.key = key;
-		this.value = value;
-	}
+    public LxcConf(String key, String value) {
+        this.key = key;
+        this.value = value;
+    }
 
-	public LxcConf() {
-	}
+    public LxcConf() {
+    }
 
-	public String getKey() {
-		return key;
-	}
+    public String getKey() {
+        return key;
+    }
 
-	public LxcConf setKey(String key) {
-		this.key = key;
-		return this;
-	}
+    public LxcConf setKey(String key) {
+        this.key = key;
+        return this;
+    }
 
-	public String getValue() {
-		return value;
-	}
+    public String getValue() {
+        return value;
+    }
 
-	public LxcConf setValue(String value) {
-		this.value = value;
-		return this;
-	}
+    public LxcConf setValue(String value) {
+        this.value = value;
+        return this;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/PortBinding.java b/src/main/java/com/github/dockerjava/api/model/PortBinding.java
index 13c91bdb1..355e83aa3 100644
--- a/src/main/java/com/github/dockerjava/api/model/PortBinding.java
+++ b/src/main/java/com/github/dockerjava/api/model/PortBinding.java
@@ -8,75 +8,70 @@
 import com.github.dockerjava.api.model.Ports.Binding;
 
 /**
- * In a {@link PortBinding}, a network socket on the Docker host, expressed 
- * as a {@link Binding}, is bound to an {@link ExposedPort} of a container.
- * A {@link PortBinding} corresponds to the <code>--publish</code>
- * (<code>-p</code>) option of the <code>docker run</code> (and similar)
- * CLI command for adding port bindings to a container.
+ * In a {@link PortBinding}, a network socket on the Docker host, expressed as a {@link Binding}, is bound to an
+ * {@link ExposedPort} of a container. A {@link PortBinding} corresponds to the <code>--publish</code> (<code>-p</code>)
+ * option of the <code>docker run</code> (and similar) CLI command for adding port bindings to a container.
  * <p>
- * <i>Note: This is an abstraction used for creating new port bindings.
- * It is not to be confused with the abstraction used for querying existing
- * port bindings from a container configuration in 
- * {@link NetworkSettings#getPorts()} and {@link HostConfig#getPortBindings()}.
- * In that context, a <code>Map&lt;ExposedPort, Binding[]&gt;</code> is used.</i>
+ * <i>Note: This is an abstraction used for creating new port bindings. It is not to be confused with the abstraction
+ * used for querying existing port bindings from a container configuration in {@link NetworkSettings#getPorts()} and
+ * {@link HostConfig#getPortBindings()}. In that context, a <code>Map&lt;ExposedPort, Binding[]&gt;</code> is used.</i>
  */
 public class PortBinding {
-	private final Binding binding;
-	private final ExposedPort exposedPort;
+    private final Binding binding;
 
-	public PortBinding(Binding binding, ExposedPort exposedPort) {
-		this.binding = binding;
-		this.exposedPort = exposedPort;
-	}
+    private final ExposedPort exposedPort;
 
-	public Binding getBinding() {
-		return binding;
-	}
+    public PortBinding(Binding binding, ExposedPort exposedPort) {
+        this.binding = binding;
+        this.exposedPort = exposedPort;
+    }
 
-	public ExposedPort getExposedPort() {
-		return exposedPort;
-	}
+    public Binding getBinding() {
+        return binding;
+    }
 
-	public static PortBinding parse(String serialized) throws IllegalArgumentException {
-		try {
-			String[] parts = StringUtils.splitByWholeSeparator(serialized, ":");
-			switch (parts.length) {
-			case 3:
-				// 127.0.0.1:80:8080/tcp
-				return createFromSubstrings(parts[0] + ":" + parts[1], parts[2]);
-			case 2:
-				// 80:8080 // 127.0.0.1::8080
-				return createFromSubstrings(parts[0], parts[1]);
-			case 1:
-				// 8080
-				return createFromSubstrings("", parts[0]);
-			default:
-				throw new IllegalArgumentException();
-			}
-		} catch (Exception e) {
-			throw new IllegalArgumentException("Error parsing PortBinding '" 
-					+ serialized + "'", e);
-		}
-	}
+    public ExposedPort getExposedPort() {
+        return exposedPort;
+    }
 
-	private static PortBinding createFromSubstrings(String binding, String exposedPort)
-			throws IllegalArgumentException {
-		return new PortBinding(Binding.parse(binding), ExposedPort.parse(exposedPort));
-	}
+    public static PortBinding parse(String serialized) throws IllegalArgumentException {
+        try {
+            String[] parts = StringUtils.splitByWholeSeparator(serialized, ":");
+            switch (parts.length) {
+            case 3:
+                // 127.0.0.1:80:8080/tcp
+                return createFromSubstrings(parts[0] + ":" + parts[1], parts[2]);
+            case 2:
+                // 80:8080 // 127.0.0.1::8080
+                return createFromSubstrings(parts[0], parts[1]);
+            case 1:
+                // 8080
+                return createFromSubstrings("", parts[0]);
+            default:
+                throw new IllegalArgumentException();
+            }
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Error parsing PortBinding '" + serialized + "'", e);
+        }
+    }
 
-	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof PortBinding) {
-			PortBinding other = (PortBinding) obj;
-			return new EqualsBuilder().append(binding, other.getBinding())
-					.append(exposedPort, other.getExposedPort()).isEquals();
-		} else
-			return super.equals(obj);
-	}
+    private static PortBinding createFromSubstrings(String binding, String exposedPort) throws IllegalArgumentException {
+        return new PortBinding(Binding.parse(binding), ExposedPort.parse(exposedPort));
+    }
 
-	@Override
-	public int hashCode() {
-		return new HashCodeBuilder().append(binding).append(exposedPort).toHashCode();
-	}
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof PortBinding) {
+            PortBinding other = (PortBinding) obj;
+            return new EqualsBuilder().append(binding, other.getBinding()).append(exposedPort, other.getExposedPort())
+                    .isEquals();
+        } else
+            return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(binding).append(exposedPort).toHashCode();
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Ports.java b/src/main/java/com/github/dockerjava/api/model/Ports.java
index 0c2df94ad..13c6ff649 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -28,13 +28,10 @@
 import com.github.dockerjava.api.command.InspectContainerResponse.NetworkSettings;
 
 /**
- * A container for port bindings, made available as a {@link Map} via its
- * {@link #getBindings()} method.
- * <p> 
- * <i>Note: This is an abstraction used for querying existing port bindings from 
- * a container configuration.
- * It is not to be confused with the {@link PortBinding} abstraction used for
- * adding new port bindings to a container.</i>
+ * A container for port bindings, made available as a {@link Map} via its {@link #getBindings()} method.
+ * <p>
+ * <i>Note: This is an abstraction used for querying existing port bindings from a container configuration. It is not to
+ * be confused with the {@link PortBinding} abstraction used for adding new port bindings to a container.</i>
  * 
  * @see HostConfig#getPortBindings()
  * @see NetworkSettings#getPorts()
@@ -46,29 +43,27 @@ public class Ports {
     private final Map<ExposedPort, Binding[]> ports = new HashMap<ExposedPort, Binding[]>();
 
     /**
-     * Creates a {@link Ports} object with no {@link PortBinding}s.
-     * Use {@link #bind(ExposedPort, Binding)} or {@link #add(PortBinding...)}
-     * to add {@link PortBinding}s.
+     * Creates a {@link Ports} object with no {@link PortBinding}s. Use {@link #bind(ExposedPort, Binding)} or
+     * {@link #add(PortBinding...)} to add {@link PortBinding}s.
      */
-    public Ports() { }
+    public Ports() {
+    }
 
     /**
-     * Creates a {@link Ports} object with an initial {@link PortBinding} for 
-     * the specified {@link ExposedPort} and {@link Binding}.
-     * Use {@link #bind(ExposedPort, Binding)} or {@link #add(PortBinding...)}
-     * to add more {@link PortBinding}s.
+     * Creates a {@link Ports} object with an initial {@link PortBinding} for the specified {@link ExposedPort} and
+     * {@link Binding}. Use {@link #bind(ExposedPort, Binding)} or {@link #add(PortBinding...)} to add more
+     * {@link PortBinding}s.
      */
     public Ports(ExposedPort exposedPort, Binding host) {
-    	bind(exposedPort, host);
+        bind(exposedPort, host);
     }
-    
+
     public Ports(PortBinding... portBindings) {
-    	add(portBindings);
+        add(portBindings);
     }
 
     /**
-     * Adds a new {@link PortBinding} for the specified {@link ExposedPort} and
-     * {@link Binding} to the current bindings.
+     * Adds a new {@link PortBinding} for the specified {@link ExposedPort} and {@link Binding} to the current bindings.
      */
     public void bind(ExposedPort exposedPort, Binding binding) {
         if (ports.containsKey(exposedPort)) {
@@ -78,13 +73,13 @@ public void bind(ExposedPort exposedPort, Binding binding) {
             if (binding == null) {
                 ports.put(exposedPort, null);
             } else {
-                ports.put(exposedPort, new Binding[]{binding});
+                ports.put(exposedPort, new Binding[] { binding });
             }
         }
     }
 
     /**
-     * Adds the specified {@link PortBinding}(s) to the list of {@link PortBinding}s. 
+     * Adds the specified {@link PortBinding}(s) to the list of {@link PortBinding}s.
      */
     public void add(PortBinding... portBindings) {
         for (PortBinding binding : portBindings) {
@@ -93,54 +88,48 @@ public void add(PortBinding... portBindings) {
     }
 
     @Override
-    public String toString(){
+    public String toString() {
         return ports.toString();
     }
 
     /**
-     * Returns the port bindings in the format used by the Docker remote API,
-     * i.e. the {@link Binding}s grouped by {@link ExposedPort}.
+     * Returns the port bindings in the format used by the Docker remote API, i.e. the {@link Binding}s grouped by
+     * {@link ExposedPort}.
      * 
-     * @return the port bindings as a {@link Map} that contains one or more
-     *         {@link Binding}s per {@link ExposedPort}.
+     * @return the port bindings as a {@link Map} that contains one or more {@link Binding}s per {@link ExposedPort}.
      */
-    public Map<ExposedPort, Binding[]> getBindings(){
+    public Map<ExposedPort, Binding[]> getBindings() {
         return ports;
     }
-    
-//    public PortBinding[] getBindingsAsArray() {
-//    	List<PortBinding> bindings = new ArrayList<>();
-//    	for(Map.Entry<ExposedPort, Ports.Binding[]> entry: ports.entrySet()) {
-//    		for(Ports.Binding binding : entry.getValue()) {
-//    			bindings.add(new PortBinding(binding, entry.getKey()));
-//    		}
-//    	}
-//    	return bindings.toArray(new PortBinding[bindings.size()]);
-//    }
+
+    // public PortBinding[] getBindingsAsArray() {
+    // List<PortBinding> bindings = new ArrayList<>();
+    // for(Map.Entry<ExposedPort, Ports.Binding[]> entry: ports.entrySet()) {
+    // for(Ports.Binding binding : entry.getValue()) {
+    // bindings.add(new PortBinding(binding, entry.getKey()));
+    // }
+    // }
+    // return bindings.toArray(new PortBinding[bindings.size()]);
+    // }
 
     /**
      * Creates a {@link Binding} for the given IP address and port number.
      */
     public static Binding Binding(String hostIp, Integer hostPort) {
-    	return new Binding(hostIp, hostPort);
+        return new Binding(hostIp, hostPort);
     }
 
     /**
-     * Creates a {@link Binding} for the given port number, leaving the
-     * IP address undefined.
+     * Creates a {@link Binding} for the given port number, leaving the IP address undefined.
      */
     public static Binding Binding(Integer hostPort) {
-    	return new Binding(hostPort);
+        return new Binding(hostPort);
     }
 
-
     /**
-     * A {@link Binding} represents a socket on the Docker host that is
-     * used in a {@link PortBinding}.
-     * It is characterized by an {@link #getHostIp() IP address} and a
-     * {@link #getHostPort() port number}.
-     * Both properties may be <code>null</code> in order to let Docker assign
-     * them dynamically/using defaults.
+     * A {@link Binding} represents a socket on the Docker host that is used in a {@link PortBinding}. It is
+     * characterized by an {@link #getHostIp() IP address} and a {@link #getHostPort() port number}. Both properties may
+     * be <code>null</code> in order to let Docker assign them dynamically/using defaults.
      * 
      * @see Ports#bind(ExposedPort, Binding)
      * @see ExposedPort
@@ -152,8 +141,8 @@ public static class Binding {
         private final Integer hostPort;
 
         /**
-         * Creates a {@link Binding} for the given {@link #getHostIp() IP address}
-         * and {@link #getHostPort() port number}.
+         * Creates a {@link Binding} for the given {@link #getHostIp() IP address} and {@link #getHostPort() port
+         * number}.
          * 
          * @see Ports#bind(ExposedPort, Binding)
          * @see ExposedPort
@@ -164,8 +153,8 @@ public Binding(String hostIp, Integer hostPort) {
         }
 
         /**
-         * Creates a {@link Binding} for the given {@link #getHostPort() port number},
-         * leaving the {@link #getHostIp() IP address} undefined.
+         * Creates a {@link Binding} for the given {@link #getHostPort() port number}, leaving the {@link #getHostIp()
+         * IP address} undefined.
          * 
          * @see Ports#bind(ExposedPort, Binding)
          * @see ExposedPort
@@ -175,33 +164,31 @@ public Binding(Integer hostPort) {
         }
 
         /**
-         * Creates a {@link Binding} for the given {@link #getHostIp() IP address},
-         * leaving the {@link #getHostPort() port number} undefined.
+         * Creates a {@link Binding} for the given {@link #getHostIp() IP address}, leaving the {@link #getHostPort()
+         * port number} undefined.
          */
         public Binding(String hostIp) {
             this(hostIp, null);
         }
 
         /**
-         * Creates a {@link Binding} with both {@link #getHostIp() IP address} and
-         * {@link #getHostPort() port number} undefined.
+         * Creates a {@link Binding} with both {@link #getHostIp() IP address} and {@link #getHostPort() port number}
+         * undefined.
          */
         public Binding() {
             this(null, null);
         }
 
         /**
-         * @return the IP address on the Docker host. 
-         *         May be <code>null</code>, in which case Docker will bind the
-         *         port to all interfaces (<code>0.0.0.0</code>).
+         * @return the IP address on the Docker host. May be <code>null</code>, in which case Docker will bind the port
+         *         to all interfaces (<code>0.0.0.0</code>).
          */
         public String getHostIp() {
             return hostIp;
         }
 
         /**
-         * @return the port number on the Docker host.
-         *         May be <code>null</code>, in which case Docker will dynamically
+         * @return the port number on the Docker host. May be <code>null</code>, in which case Docker will dynamically
          *         assign a port.
          */
         public Integer getHostPort() {
@@ -209,15 +196,15 @@ public Integer getHostPort() {
         }
 
         /**
-         * Parses a textual host and port specification (as used by the Docker CLI) 
-         * to a {@link Binding}.
+         * Parses a textual host and port specification (as used by the Docker CLI) to a {@link Binding}.
          * <p>
          * Legal syntax: <code>IP|IP:port|port</code>
          * 
-         * @param serialized serialized the specification, e.g. 
-         *        <code>127.0.0.1:80</code>
+         * @param serialized
+         *            serialized the specification, e.g. <code>127.0.0.1:80</code>
          * @return a {@link Binding} matching the specification
-         * @throws IllegalArgumentException if the specification cannot be parsed
+         * @throws IllegalArgumentException
+         *             if the specification cannot be parsed
          */
         public static Binding parse(String serialized) throws IllegalArgumentException {
             try {
@@ -231,23 +218,20 @@ public static Binding parse(String serialized) throws IllegalArgumentException {
                     return new Binding(parts[0], Integer.valueOf(parts[1]));
                 }
                 case 1: {
-                    return parts[0].contains(".") ? new Binding(parts[0]) 
-                        : new Binding(Integer.valueOf(parts[0]));
+                    return parts[0].contains(".") ? new Binding(parts[0]) : new Binding(Integer.valueOf(parts[0]));
                 }
                 default: {
                     throw new IllegalArgumentException();
                 }
                 }
             } catch (Exception e) {
-                throw new IllegalArgumentException("Error parsing Binding '"
-                        + serialized + "'");
+                throw new IllegalArgumentException("Error parsing Binding '" + serialized + "'");
             }
         }
 
         /**
-         * Returns a string representation of this {@link Binding} suitable
-         * for inclusion in a JSON message.
-         * The format is <code>[IP:]Port</code>, like the argument in {@link #parse(String)}.
+         * Returns a string representation of this {@link Binding} suitable for inclusion in a JSON message. The format
+         * is <code>[IP:]Port</code>, like the argument in {@link #parse(String)}.
          * 
          * @return a string representation of this {@link Binding}
          */
@@ -256,7 +240,7 @@ public String toString() {
             if (isEmpty(hostIp)) {
                 return Integer.toString(hostPort);
             } else if (hostPort == null) {
-            	return hostIp;
+                return hostIp;
             } else {
                 return hostIp + ":" + hostPort;
             }
@@ -264,20 +248,19 @@ public String toString() {
 
         @Override
         public boolean equals(Object obj) {
-        	if(obj instanceof Binding) {
-        		Binding other = (Binding) obj;
-        		return new EqualsBuilder()
-        			.append(hostIp, other.getHostIp())
-        			.append(hostPort, other.getHostPort()).isEquals();
-        	} else
-        		return super.equals(obj);
+            if (obj instanceof Binding) {
+                Binding other = (Binding) obj;
+                return new EqualsBuilder().append(hostIp, other.getHostIp()).append(hostPort, other.getHostPort())
+                        .isEquals();
+            } else
+                return super.equals(obj);
         }
     }
 
-
     public static class Deserializer extends JsonDeserializer<Ports> {
         @Override
-        public Ports deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+        public Ports deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+                throws IOException, JsonProcessingException {
 
             Ports out = new Ports();
             ObjectCodec oc = jsonParser.getCodec();
@@ -306,18 +289,19 @@ public Ports deserialize(JsonParser jsonParser, DeserializationContext deseriali
     public static class Serializer extends JsonSerializer<Ports> {
 
         @Override
-        public void serialize(Ports portBindings, JsonGenerator jsonGen,
-                              SerializerProvider serProvider) throws IOException, JsonProcessingException {
+        public void serialize(Ports portBindings, JsonGenerator jsonGen, SerializerProvider serProvider)
+                throws IOException, JsonProcessingException {
 
             jsonGen.writeStartObject();
-            for(Entry<ExposedPort, Binding[]> entry : portBindings.getBindings().entrySet()){
+            for (Entry<ExposedPort, Binding[]> entry : portBindings.getBindings().entrySet()) {
                 jsonGen.writeFieldName(entry.getKey().toString());
                 if (entry.getValue() != null) {
                     jsonGen.writeStartArray();
                     for (Binding binding : entry.getValue()) {
                         jsonGen.writeStartObject();
                         jsonGen.writeStringField("HostIp", binding.getHostIp() == null ? "" : binding.getHostIp());
-                        jsonGen.writeStringField("HostPort", binding.getHostPort() == null ? "" : binding.getHostPort().toString());
+                        jsonGen.writeStringField("HostPort", binding.getHostPort() == null ? "" : binding.getHostPort()
+                                .toString());
                         jsonGen.writeEndObject();
                     }
                     jsonGen.writeEndArray();
diff --git a/src/main/java/com/github/dockerjava/api/model/PullEventStreamItem.java b/src/main/java/com/github/dockerjava/api/model/PullEventStreamItem.java
index 4a3a0b507..cd49e846e 100644
--- a/src/main/java/com/github/dockerjava/api/model/PullEventStreamItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/PullEventStreamItem.java
@@ -9,12 +9,12 @@
 /**
  * Represents an item returned from pull
  */
-@JsonIgnoreProperties(ignoreUnknown=true)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class PullEventStreamItem implements Serializable {
 
-	private static final long serialVersionUID = -5187169652557467828L;
+    private static final long serialVersionUID = -5187169652557467828L;
 
-	@JsonProperty("status")
+    @JsonProperty("status")
     private String status;
 
     @JsonProperty("progress")
@@ -23,7 +23,6 @@ public class PullEventStreamItem implements Serializable {
     @JsonProperty("progressDetail")
     private ProgressDetail progressDetail;
 
-
     public String getStatus() {
         return status;
     }
@@ -36,12 +35,11 @@ public ProgressDetail getProgressDetail() {
         return progressDetail;
     }
 
-    @JsonIgnoreProperties(ignoreUnknown=true)
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class ProgressDetail implements Serializable {
         @JsonProperty("current")
         int current;
 
-
         @Override
         public String toString() {
             return "current " + current;
@@ -50,10 +48,7 @@ public String toString() {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
-                .add("status", status)
-                .add("progress", progress)
-                .add("progressDetail", progressDetail)
-                .toString();
+        return Objects.toStringHelper(this).add("status", status).add("progress", progress)
+                .add("progressDetail", progressDetail).toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java b/src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java
index c8aac4c9c..e022f0c1a 100644
--- a/src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java
@@ -10,12 +10,12 @@
 /**
  * Represents an item returned from push
  */
-@JsonIgnoreProperties(ignoreUnknown=true)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class PushEventStreamItem implements Serializable {
 
-	private static final long serialVersionUID = -5187169652557467828L;
+    private static final long serialVersionUID = -5187169652557467828L;
 
-	@JsonProperty("status")
+    @JsonProperty("status")
     private String status;
 
     @JsonProperty("progress")
@@ -24,7 +24,6 @@ public class PushEventStreamItem implements Serializable {
     @JsonProperty("progressDetail")
     private ProgressDetail progressDetail;
 
-
     public String getStatus() {
         return status;
     }
@@ -37,12 +36,11 @@ public ProgressDetail getProgressDetail() {
         return progressDetail;
     }
 
-    @JsonIgnoreProperties(ignoreUnknown=true)
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class ProgressDetail implements Serializable {
         @JsonProperty("current")
         int current;
 
-
         @Override
         public String toString() {
             return "current " + current;
@@ -51,10 +49,7 @@ public String toString() {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
-                .add("status", status)
-                .add("progress", progress)
-                .add("progressDetail", progressDetail)
-                .toString();
+        return Objects.toStringHelper(this).add("status", status).add("progress", progress)
+                .add("progressDetail", progressDetail).toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Repository.java b/src/main/java/com/github/dockerjava/api/model/Repository.java
index 673eabee2..cdfead739 100644
--- a/src/main/java/com/github/dockerjava/api/model/Repository.java
+++ b/src/main/java/com/github/dockerjava/api/model/Repository.java
@@ -13,15 +13,17 @@ public class Repository {
 
     /**
      * Name may be eg. 'busybox' or '10.0.0.1:5000/fred'
-     * @param name Repository name
+     * 
+     * @param name
+     *            Repository name
      */
     public Repository(String name) {
         this.name = name;
     }
 
     /**
-     * Return the URL portion (repository).
-     * Note that this might not actually BE a repository location.
+     * Return the URL portion (repository). Note that this might not actually BE a repository location.
+     * 
      * @return
      * @throws java.net.MalformedURLException
      */
@@ -31,16 +33,13 @@ public URL getURL() throws MalformedURLException {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
-                .add("name", name)
-                .toString();
+        return Objects.toStringHelper(this).add("name", name).toString();
     }
 
-
     public String getPath() {
-        if( !name.contains("/") )
+        if (!name.contains("/"))
             return name;
 
-        return name.substring(name.indexOf("/") + 1 );
+        return name.substring(name.indexOf("/") + 1);
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
index bb933f18a..e96821cf1 100644
--- a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
+++ b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
@@ -11,15 +11,17 @@
  * Container restart policy
  * 
  * <dl>
- *   <dt>no</dt>
- *   <dd>Do not restart the container if it dies. (default)</dd>
- *   
- *   <dt>on-failure</dt>
- *   <dd>Restart the container if it exits with a non-zero exit code.
- *       Can also accept an optional maximum restart count (e.g. on-failure:5).<dd>
- *   
- *   <dt>always</dt>
- *   <dd>Always restart the container no matter what exit code is returned.<dd>
+ * <dt>no</dt>
+ * <dd>Do not restart the container if it dies. (default)</dd>
+ * 
+ * <dt>on-failure</dt>
+ * <dd>Restart the container if it exits with a non-zero exit code. Can also accept an optional maximum restart count
+ * (e.g. on-failure:5).
+ * <dd>
+ * 
+ * <dt>always</dt>
+ * <dd>Always restart the container no matter what exit code is returned.
+ * <dd>
  * </dl>
  *
  * @author marcus
@@ -27,110 +29,108 @@
  */
 public class RestartPolicy {
 
-	@JsonProperty("MaximumRetryCount")
-	private int maximumRetryCount = 0;
-
-	@JsonProperty("Name")
-	private String name = "";
-
-	public RestartPolicy() {
-	}
-
-	private RestartPolicy(int maximumRetryCount, String name) {
-		checkNotNull(name, "name is null");
-		this.maximumRetryCount = maximumRetryCount;
-		this.name = name;
-	}
-
-	/**
-	 * Do not restart the container if it dies. (default)
-	 */
-	public static RestartPolicy noRestart() {
-		return new RestartPolicy();
-	}
-
-	/**
-	 * Always restart the container no matter what exit code is returned.
-	 */
-	public static RestartPolicy alwaysRestart() {
-		return new RestartPolicy(0, "always");
-	}
-
-	/**
-	 * Restart the container if it exits with a non-zero exit code.
-	 * 
-	 * @param maximumRetryCount the maximum number of restarts.
-	 *        Set to <code>0</code> for unlimited retries.
-	 */
-	public static RestartPolicy onFailureRestart(int maximumRetryCount) {
-		return new RestartPolicy(maximumRetryCount, "on-failure");
-	}
-
-	public int getMaximumRetryCount() {
-		return maximumRetryCount;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Parses a textual restart polixy specification (as used by the Docker CLI) 
-	 * to a {@link RestartPolicy}.
-	 * 
-	 * @param serialized the specification, e.g. <code>on-failure:2</code>
-	 * @return a {@link RestartPolicy} matching the specification
-	 * @throws IllegalArgumentException if the specification cannot be parsed
-	 */
-	public static RestartPolicy parse(String serialized) throws IllegalArgumentException {
-		try {
-			String[] parts = serialized.split(":");
-			String name = parts[0];
-			if ("no".equals(name))
-				return noRestart();
-			if ("always".equals(name))
-				return alwaysRestart();
-			if ("on-failure".equals(name)) {
-				int count = 0;
-				if (parts.length == 2) {
-					count = Integer.parseInt(parts[1]);
-				}
-				return onFailureRestart(count);
-			}
-			throw new IllegalArgumentException();
-		} catch (Exception e) {
-			throw new IllegalArgumentException("Error parsing RestartPolicy '" + serialized + "'");
-		}
-	}
-
-	/**
-	 * Returns a string representation of this {@link RestartPolicy}.
-	 * The format is <code>name[:count]</code>, like the argument in {@link #parse(String)}.
-	 * 
-	 * @return a string representation of this {@link RestartPolicy}
-	 */
-	@Override
-	public String toString() {
-		String result = name.isEmpty() ? "no" : name;
-		return maximumRetryCount > 0 ? result + ":" + maximumRetryCount : result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof RestartPolicy) {
-			RestartPolicy other = (RestartPolicy) obj;
-			return new EqualsBuilder()
-					.append(maximumRetryCount, other.getMaximumRetryCount())
-					.append(name, other.getName())
-					.isEquals();
-		} else
-			return super.equals(obj);
-	}
-
-	@Override
-	public int hashCode() {
-		return new HashCodeBuilder().append(maximumRetryCount)
-				.append(name).toHashCode();
-	}
+    @JsonProperty("MaximumRetryCount")
+    private int maximumRetryCount = 0;
+
+    @JsonProperty("Name")
+    private String name = "";
+
+    public RestartPolicy() {
+    }
+
+    private RestartPolicy(int maximumRetryCount, String name) {
+        checkNotNull(name, "name is null");
+        this.maximumRetryCount = maximumRetryCount;
+        this.name = name;
+    }
+
+    /**
+     * Do not restart the container if it dies. (default)
+     */
+    public static RestartPolicy noRestart() {
+        return new RestartPolicy();
+    }
+
+    /**
+     * Always restart the container no matter what exit code is returned.
+     */
+    public static RestartPolicy alwaysRestart() {
+        return new RestartPolicy(0, "always");
+    }
+
+    /**
+     * Restart the container if it exits with a non-zero exit code.
+     * 
+     * @param maximumRetryCount
+     *            the maximum number of restarts. Set to <code>0</code> for unlimited retries.
+     */
+    public static RestartPolicy onFailureRestart(int maximumRetryCount) {
+        return new RestartPolicy(maximumRetryCount, "on-failure");
+    }
+
+    public int getMaximumRetryCount() {
+        return maximumRetryCount;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Parses a textual restart polixy specification (as used by the Docker CLI) to a {@link RestartPolicy}.
+     * 
+     * @param serialized
+     *            the specification, e.g. <code>on-failure:2</code>
+     * @return a {@link RestartPolicy} matching the specification
+     * @throws IllegalArgumentException
+     *             if the specification cannot be parsed
+     */
+    public static RestartPolicy parse(String serialized) throws IllegalArgumentException {
+        try {
+            String[] parts = serialized.split(":");
+            String name = parts[0];
+            if ("no".equals(name))
+                return noRestart();
+            if ("always".equals(name))
+                return alwaysRestart();
+            if ("on-failure".equals(name)) {
+                int count = 0;
+                if (parts.length == 2) {
+                    count = Integer.parseInt(parts[1]);
+                }
+                return onFailureRestart(count);
+            }
+            throw new IllegalArgumentException();
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Error parsing RestartPolicy '" + serialized + "'");
+        }
+    }
+
+    /**
+     * Returns a string representation of this {@link RestartPolicy}. The format is <code>name[:count]</code>, like the
+     * argument in {@link #parse(String)}.
+     * 
+     * @return a string representation of this {@link RestartPolicy}
+     */
+    @Override
+    public String toString() {
+        String result = name.isEmpty() ? "no" : name;
+        return maximumRetryCount > 0 ? result + ":" + maximumRetryCount : result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof RestartPolicy) {
+            RestartPolicy other = (RestartPolicy) obj;
+            return new EqualsBuilder().append(maximumRetryCount, other.getMaximumRetryCount())
+                    .append(name, other.getName()).isEquals();
+        } else
+            return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(maximumRetryCount).append(name).toHashCode();
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Statistics.java b/src/main/java/com/github/dockerjava/api/model/Statistics.java
index ff1d6dc95..f6acf16ee 100644
--- a/src/main/java/com/github/dockerjava/api/model/Statistics.java
+++ b/src/main/java/com/github/dockerjava/api/model/Statistics.java
@@ -12,38 +12,38 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Statistics {
-    
+
     @JsonProperty("read")
     private String read;
-    
+
     @JsonProperty("network")
-    private Map<String,Object> networkStats;
+    private Map<String, Object> networkStats;
 
     @JsonProperty("memory_stats")
-    private Map<String,Object> memoryStats;
-    
+    private Map<String, Object> memoryStats;
+
     @JsonProperty("blkio_stats")
-    private Map<String,Object> blkioStats;
-    
+    private Map<String, Object> blkioStats;
+
     @JsonProperty("cpu_stats")
-    private Map<String,Object> cpuStats;
+    private Map<String, Object> cpuStats;
 
-    public Map<String,Object> getNetworkStats() {
+    public Map<String, Object> getNetworkStats() {
         return networkStats;
     }
-    
-    public Map<String,Object> getCpuStats() {
+
+    public Map<String, Object> getCpuStats() {
         return cpuStats;
     }
-    
-    public Map<String,Object> getMemoryStats() {
+
+    public Map<String, Object> getMemoryStats() {
         return memoryStats;
     }
-    
-    public Map<String,Object> getBlkioStats() {
+
+    public Map<String, Object> getBlkioStats() {
         return blkioStats;
     }
-    
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
diff --git a/src/main/java/com/github/dockerjava/api/model/StreamType.java b/src/main/java/com/github/dockerjava/api/model/StreamType.java
index 0040c1bc8..5dd648109 100644
--- a/src/main/java/com/github/dockerjava/api/model/StreamType.java
+++ b/src/main/java/com/github/dockerjava/api/model/StreamType.java
@@ -1,8 +1,5 @@
 package com.github.dockerjava.api.model;
 
 public enum StreamType {
-    STDIN,
-    STDOUT,
-    STDERR,
-    RAW
+    STDIN, STDOUT, STDERR, RAW
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Ulimit.java b/src/main/java/com/github/dockerjava/api/model/Ulimit.java
index d5fac09c1..3d8fc432f 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ulimit.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ulimit.java
@@ -12,7 +12,7 @@
 public class Ulimit {
 
     @JsonProperty("Name")
-    private String name ;
+    private String name;
 
     @JsonProperty("Soft")
     private int soft;
@@ -48,9 +48,7 @@ public int getHard() {
     public boolean equals(Object obj) {
         if (obj instanceof Ulimit) {
             Ulimit other = (Ulimit) obj;
-            return new EqualsBuilder()
-                    .append(name, other.getName())
-                    .append(soft, other.getSoft())
+            return new EqualsBuilder().append(name, other.getName()).append(soft, other.getSoft())
                     .append(hard, other.getHard()).isEquals();
         } else
             return super.equals(obj);
diff --git a/src/main/java/com/github/dockerjava/api/model/Version.java b/src/main/java/com/github/dockerjava/api/model/Version.java
index 4e02e2c05..3318fc5b1 100644
--- a/src/main/java/com/github/dockerjava/api/model/Version.java
+++ b/src/main/java/com/github/dockerjava/api/model/Version.java
@@ -12,25 +12,25 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Version {
 
-	@JsonProperty("ApiVersion")
-	private String apiVersion;
+    @JsonProperty("ApiVersion")
+    private String apiVersion;
 
-	@JsonProperty("Arch")
-	private String  arch;
+    @JsonProperty("Arch")
+    private String arch;
 
-	@JsonProperty("GitCommit")
-	private String  gitCommit;
+    @JsonProperty("GitCommit")
+    private String gitCommit;
 
-	@JsonProperty("GoVersion")
-	private String  goVersion;
+    @JsonProperty("GoVersion")
+    private String goVersion;
 
-	@JsonProperty("KernelVersion")
-	private String kernelVersion;
+    @JsonProperty("KernelVersion")
+    private String kernelVersion;
 
-	@JsonProperty("Os")
-	private String operatingSystem;
+    @JsonProperty("Os")
+    private String operatingSystem;
 
-	@JsonProperty("Version")
+    @JsonProperty("Version")
     private String version;
 
     public String getVersion() {
@@ -53,13 +53,13 @@ public String getArch() {
         return arch;
     }
 
-   public String getOperatingSystem() {
+    public String getOperatingSystem() {
         return operatingSystem;
     }
 
     public String getApiVersion() {
-		return apiVersion;
-	}
+        return apiVersion;
+    }
 
     @Override
     public String toString() {
diff --git a/src/main/java/com/github/dockerjava/api/model/Volume.java b/src/main/java/com/github/dockerjava/api/model/Volume.java
index 131a9a56f..8bc7f2fba 100644
--- a/src/main/java/com/github/dockerjava/api/model/Volume.java
+++ b/src/main/java/com/github/dockerjava/api/model/Volume.java
@@ -26,33 +26,33 @@
  */
 public class Volume {
 
-	private String path;
-	
-	public Volume(String path) {
-		this.path = path;
-	}
-
-	public String getPath() {
-		return path;
-	}
-
-	@Override
-	public String toString() {
-		return getPath();
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof Volume) {
-			Volume other = (Volume) obj;
-			return new EqualsBuilder().append(path, other.getPath()).isEquals();
-		} else
-			return super.equals(obj);
-	}
-
-	@Override
-	public int hashCode() {
-		return new HashCodeBuilder().append(path).toHashCode();
-	}
+    private String path;
+
+    public Volume(String path) {
+        this.path = path;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    @Override
+    public String toString() {
+        return getPath();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof Volume) {
+            Volume other = (Volume) obj;
+            return new EqualsBuilder().append(path, other.getPath()).isEquals();
+        } else
+            return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(path).toHashCode();
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeBind.java b/src/main/java/com/github/dockerjava/api/model/VolumeBind.java
index 41028b6dc..cf9c077ab 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumeBind.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumeBind.java
@@ -2,9 +2,10 @@
 
 public class VolumeBind {
     private final String hostPath;
+
     private final String containerPath;
 
-    public VolumeBind(String hostPath, String containerPath){
+    public VolumeBind(String hostPath, String containerPath) {
         this.hostPath = hostPath;
         this.containerPath = containerPath;
     }
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java b/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
index e23ddc9e8..3d2abee45 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
@@ -36,18 +36,20 @@ public VolumeBind[] getBinds() {
     public static final class Serializer extends JsonSerializer<VolumeBinds> {
 
         @Override
-        public void serialize(VolumeBinds value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
+        public void serialize(VolumeBinds value, JsonGenerator jgen, SerializerProvider provider) throws IOException,
+                JsonProcessingException {
             jgen.writeStartObject();
             for (final VolumeBind bind : value.binds) {
                 jgen.writeStringField(bind.getContainerPath(), bind.getHostPath());
             }
             jgen.writeEndObject();
-        }    
+        }
     }
-    
+
     public static final class Deserializer extends JsonDeserializer<VolumeBinds> {
         @Override
-        public VolumeBinds deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+        public VolumeBinds deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+                throws IOException, JsonProcessingException {
 
             List<VolumeBind> binds = new ArrayList<VolumeBind>();
             ObjectCodec oc = jsonParser.getCodec();
@@ -56,10 +58,11 @@ public VolumeBinds deserialize(JsonParser jsonParser, DeserializationContext des
                 Map.Entry<String, JsonNode> field = it.next();
                 JsonNode value = field.getValue();
                 if (!value.equals(NullNode.getInstance())) {
-                    if (!value.isTextual()){
-                        throw deserializationContext.mappingException("Expected path for '"+field.getKey()+"'in host but got '"+ value+"'.");
+                    if (!value.isTextual()) {
+                        throw deserializationContext.mappingException("Expected path for '" + field.getKey()
+                                + "'in host but got '" + value + "'.");
                     }
-                    VolumeBind bind = new VolumeBind(value.asText(),field.getKey());
+                    VolumeBind bind = new VolumeBind(value.asText(), field.getKey());
                     binds.add(bind);
                 }
             }
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeRW.java b/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
index 717385d9e..09a2d8d6a 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
@@ -28,88 +28,82 @@
 @JsonSerialize(using = VolumeRW.Serializer.class)
 public class VolumeRW {
 
-	private Volume volume;
-	
-	private AccessMode accessMode = AccessMode.rw;
-
-	public VolumeRW(Volume volume) {
-		this.volume = volume;
-	}
-	
-	public VolumeRW(Volume volume, AccessMode accessMode) {
-		this.volume = volume;
-		this.accessMode = accessMode;
-	}
-
-	public Volume getVolume() {
-		return volume;
-	}
-	
-	public AccessMode getAccessMode() {
-		return accessMode;
-	}
-
-	
-	/**
-	 * Returns a string representation of this {@link VolumeRW} suitable
-	 * for inclusion in a JSON message.
-	 * The returned String is simply the container path, {@link #getPath()}. 
-	 * 
-	 * @return a string representation of this {@link VolumeRW}
-	 */
-	@Override
-	public String toString() {
-		return getVolume() + ":" + getAccessMode();
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof VolumeRW) {
-			VolumeRW other = (VolumeRW) obj;
-			return new EqualsBuilder().append(getVolume(), other.getVolume()).append(accessMode, other.getAccessMode())
-					.isEquals();
-		} else
-			return super.equals(obj);
-	}
-
-	@Override
-	public int hashCode() {
-		return new HashCodeBuilder().append(getVolume()).append(getAccessMode()).toHashCode();
-	}
-	
-	public static class Serializer extends JsonSerializer<VolumeRW> {
-
-		@Override
-		public void serialize(VolumeRW volumeRW, JsonGenerator jsonGen,
-				SerializerProvider serProvider) throws IOException,
-				JsonProcessingException {
-
-			jsonGen.writeStartObject();
-			jsonGen.writeFieldName(volumeRW.getVolume().getPath());
-			jsonGen.writeString(Boolean.toString(volumeRW.getAccessMode().toBoolean()));
-			jsonGen.writeEndObject();
-		}
-
-	}
-
-	public static class Deserializer extends JsonDeserializer<VolumeRW> {
-		@Override
-		public VolumeRW deserialize(JsonParser jsonParser,
-				DeserializationContext deserializationContext)
-				throws IOException, JsonProcessingException {
-			ObjectCodec oc = jsonParser.getCodec();
-			JsonNode node = oc.readTree(jsonParser);
-			if (!node.equals(NullNode.getInstance())) {
-				Entry<String, JsonNode> field = node.fields().next();
-				String volume = field.getKey();
-				AccessMode accessMode = AccessMode.fromBoolean(field.getValue().asBoolean());
-				return new VolumeRW(new Volume(volume), accessMode);
-			} else {
-				return null;
-			}
-		}
-	}
-
-	
+    private Volume volume;
+
+    private AccessMode accessMode = AccessMode.rw;
+
+    public VolumeRW(Volume volume) {
+        this.volume = volume;
+    }
+
+    public VolumeRW(Volume volume, AccessMode accessMode) {
+        this.volume = volume;
+        this.accessMode = accessMode;
+    }
+
+    public Volume getVolume() {
+        return volume;
+    }
+
+    public AccessMode getAccessMode() {
+        return accessMode;
+    }
+
+    /**
+     * Returns a string representation of this {@link VolumeRW} suitable for inclusion in a JSON message. The returned
+     * String is simply the container path, {@link #getPath()}.
+     * 
+     * @return a string representation of this {@link VolumeRW}
+     */
+    @Override
+    public String toString() {
+        return getVolume() + ":" + getAccessMode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof VolumeRW) {
+            VolumeRW other = (VolumeRW) obj;
+            return new EqualsBuilder().append(getVolume(), other.getVolume()).append(accessMode, other.getAccessMode())
+                    .isEquals();
+        } else
+            return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(getVolume()).append(getAccessMode()).toHashCode();
+    }
+
+    public static class Serializer extends JsonSerializer<VolumeRW> {
+
+        @Override
+        public void serialize(VolumeRW volumeRW, JsonGenerator jsonGen, SerializerProvider serProvider)
+                throws IOException, JsonProcessingException {
+
+            jsonGen.writeStartObject();
+            jsonGen.writeFieldName(volumeRW.getVolume().getPath());
+            jsonGen.writeString(Boolean.toString(volumeRW.getAccessMode().toBoolean()));
+            jsonGen.writeEndObject();
+        }
+
+    }
+
+    public static class Deserializer extends JsonDeserializer<VolumeRW> {
+        @Override
+        public VolumeRW deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+                throws IOException, JsonProcessingException {
+            ObjectCodec oc = jsonParser.getCodec();
+            JsonNode node = oc.readTree(jsonParser);
+            if (!node.equals(NullNode.getInstance())) {
+                Entry<String, JsonNode> field = node.fields().next();
+                String volume = field.getKey();
+                AccessMode accessMode = AccessMode.fromBoolean(field.getValue().asBoolean());
+                return new VolumeRW(new Volume(volume), accessMode);
+            } else {
+                return null;
+            }
+        }
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Volumes.java b/src/main/java/com/github/dockerjava/api/model/Volumes.java
index b85536e10..434a0edad 100644
--- a/src/main/java/com/github/dockerjava/api/model/Volumes.java
+++ b/src/main/java/com/github/dockerjava/api/model/Volumes.java
@@ -19,58 +19,57 @@
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.node.NullNode;
 
-
 @JsonSerialize(using = Volumes.Serializer.class)
 @JsonDeserialize(using = Volumes.Deserializer.class)
 public class Volumes {
 
-	private Volume[] volumes;
+    private Volume[] volumes;
+
+    public Volumes(Volume... volumes) {
+        this.volumes = volumes;
+    }
 
-	public Volumes(Volume... volumes) {
-		this.volumes = volumes;
-	}
-	
-	public Volumes(List<Volume> volumes) {
-		this.volumes = volumes.toArray(new Volume[volumes.size()]);
-	}
+    public Volumes(List<Volume> volumes) {
+        this.volumes = volumes.toArray(new Volume[volumes.size()]);
+    }
 
-	public Volume[] getVolumes() {
-		return volumes;
-	}
+    public Volume[] getVolumes() {
+        return volumes;
+    }
 
-	public static class Serializer extends JsonSerializer<Volumes> {
+    public static class Serializer extends JsonSerializer<Volumes> {
 
-		@Override
-		public void serialize(Volumes volumes, JsonGenerator jsonGen,
-				SerializerProvider serProvider) throws IOException,
-				JsonProcessingException {
-			
-			jsonGen.writeStartObject();
-			for (Volume volume : volumes.getVolumes()) {
-				jsonGen.writeFieldName(volume.getPath());
-				jsonGen.writeStartObject();
-				jsonGen.writeEndObject();
-				//jsonGen.writeString(Boolean.toString(volume.getAccessMode().equals(AccessMode.rw) ? true: false));
-			}
-			jsonGen.writeEndObject();
-		}
+        @Override
+        public void serialize(Volumes volumes, JsonGenerator jsonGen, SerializerProvider serProvider)
+                throws IOException, JsonProcessingException {
+
+            jsonGen.writeStartObject();
+            for (Volume volume : volumes.getVolumes()) {
+                jsonGen.writeFieldName(volume.getPath());
+                jsonGen.writeStartObject();
+                jsonGen.writeEndObject();
+                // jsonGen.writeString(Boolean.toString(volume.getAccessMode().equals(AccessMode.rw) ? true: false));
+            }
+            jsonGen.writeEndObject();
+        }
+
+    }
 
-	}
-	
-	public static class Deserializer extends JsonDeserializer<Volumes> {
+    public static class Deserializer extends JsonDeserializer<Volumes> {
         @Override
-        public Volumes deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+        public Volumes deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+                throws IOException, JsonProcessingException {
 
-        	List<Volume> volumes = new ArrayList<Volume>();
+            List<Volume> volumes = new ArrayList<Volume>();
             ObjectCodec oc = jsonParser.getCodec();
             JsonNode node = oc.readTree(jsonParser);
             for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
 
                 Map.Entry<String, JsonNode> field = it.next();
                 if (!field.getValue().equals(NullNode.getInstance())) {
-                	String path = field.getKey();
-                	Volume volume = new Volume(path);
-                	volumes.add(volume);
+                    String path = field.getKey();
+                    Volume volume = new Volume(path);
+                    volumes.add(volume);
                 }
             }
             return new Volumes(volumes.toArray(new Volume[0]));
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java b/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
index 9aae9f30b..c884a633e 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
@@ -21,109 +21,104 @@
 @JsonDeserialize(using = VolumesFrom.Deserializer.class)
 public class VolumesFrom {
 
-	private String container;
-
-	private AccessMode accessMode;
-
-	public VolumesFrom(String container) {
-		this(container, AccessMode.DEFAULT);
-	}
-
-	public VolumesFrom(String container, AccessMode accessMode) {
-		this.container = container;
-		this.accessMode = accessMode;
-	}
-	
-	public String getContainer() {
-		return container;
-	}
-	
-	public AccessMode getAccessMode() {
-		return accessMode;
-	}
-
-
-	/**
-	 * Parses a volume from specification to a {@link VolumesFrom}.
-	 * 
-	 * @param serialized the specification, e.g. <code>container:ro</code>
-	 * @return a {@link VolumesFrom} matching the specification
-	 * @throws IllegalArgumentException if the specification cannot be parsed
-	 */
-	public static VolumesFrom parse(String serialized) {
-		try {
-			String[] parts = serialized.split(":");
-			switch (parts.length) {
-			case 1: {
-				return new VolumesFrom(parts[0]);
-			}
-			case 2: {
-				return new VolumesFrom(parts[0], AccessMode.valueOf(parts[1]));
-			}
-			
-			default: {
-				throw new IllegalArgumentException();
-			}
-			}
-		} catch (Exception e) {
-			throw new IllegalArgumentException("Error parsing Bind '" + serialized
-					+ "'");
-		}
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof VolumesFrom) {
-			VolumesFrom other = (VolumesFrom) obj;
-			return new EqualsBuilder().append(container, other.getContainer())
-					.append(accessMode, other.getAccessMode()).isEquals();
-		} else
-			return super.equals(obj);
-	}
-
-	@Override
-	public int hashCode() {
-		return new HashCodeBuilder().append(container)
-				.append(accessMode).toHashCode();
-	}
-
-	/**
-	 * Returns a string representation of this {@link VolumesFrom} suitable
-	 * for inclusion in a JSON message.
-	 * The format is <code>&lt;container&gt;:&lt;access mode&gt;</code>,
-	 * like the argument in {@link #parse(String)}.
-	 * 
-	 * @return a string representation of this {@link VolumesFrom}
-	 */
-	@Override
-	public String toString() {
-		return container + ":" + accessMode.toString();
-	}
-	
-	public static class Serializer extends JsonSerializer<VolumesFrom> {
-
-		@Override
-		public void serialize(VolumesFrom volumeFrom, JsonGenerator jsonGen,
-				SerializerProvider serProvider) throws IOException,
-				JsonProcessingException {
-
-			jsonGen.writeString(volumeFrom.toString());
-			
-		}
-
-	}
-
-	public static class Deserializer extends JsonDeserializer<VolumesFrom> {
-		@Override
-		public VolumesFrom deserialize(JsonParser jsonParser,
-				DeserializationContext deserializationContext)
-				throws IOException, JsonProcessingException {
-
-			ObjectCodec oc = jsonParser.getCodec();
-			JsonNode node = oc.readTree(jsonParser);
-			return VolumesFrom.parse(node.asText());
-			
-		}
-	}
+    private String container;
+
+    private AccessMode accessMode;
+
+    public VolumesFrom(String container) {
+        this(container, AccessMode.DEFAULT);
+    }
+
+    public VolumesFrom(String container, AccessMode accessMode) {
+        this.container = container;
+        this.accessMode = accessMode;
+    }
+
+    public String getContainer() {
+        return container;
+    }
+
+    public AccessMode getAccessMode() {
+        return accessMode;
+    }
+
+    /**
+     * Parses a volume from specification to a {@link VolumesFrom}.
+     * 
+     * @param serialized
+     *            the specification, e.g. <code>container:ro</code>
+     * @return a {@link VolumesFrom} matching the specification
+     * @throws IllegalArgumentException
+     *             if the specification cannot be parsed
+     */
+    public static VolumesFrom parse(String serialized) {
+        try {
+            String[] parts = serialized.split(":");
+            switch (parts.length) {
+            case 1: {
+                return new VolumesFrom(parts[0]);
+            }
+            case 2: {
+                return new VolumesFrom(parts[0], AccessMode.valueOf(parts[1]));
+            }
+
+            default: {
+                throw new IllegalArgumentException();
+            }
+            }
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Error parsing Bind '" + serialized + "'");
+        }
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof VolumesFrom) {
+            VolumesFrom other = (VolumesFrom) obj;
+            return new EqualsBuilder().append(container, other.getContainer())
+                    .append(accessMode, other.getAccessMode()).isEquals();
+        } else
+            return super.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(container).append(accessMode).toHashCode();
+    }
+
+    /**
+     * Returns a string representation of this {@link VolumesFrom} suitable for inclusion in a JSON message. The format
+     * is <code>&lt;container&gt;:&lt;access mode&gt;</code>, like the argument in {@link #parse(String)}.
+     * 
+     * @return a string representation of this {@link VolumesFrom}
+     */
+    @Override
+    public String toString() {
+        return container + ":" + accessMode.toString();
+    }
+
+    public static class Serializer extends JsonSerializer<VolumesFrom> {
+
+        @Override
+        public void serialize(VolumesFrom volumeFrom, JsonGenerator jsonGen, SerializerProvider serProvider)
+                throws IOException, JsonProcessingException {
+
+            jsonGen.writeString(volumeFrom.toString());
+
+        }
+
+    }
+
+    public static class Deserializer extends JsonDeserializer<VolumesFrom> {
+        @Override
+        public VolumesFrom deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+                throws IOException, JsonProcessingException {
+
+            ObjectCodec oc = jsonParser.getCodec();
+            JsonNode node = oc.readTree(jsonParser);
+            return VolumesFrom.parse(node.asText());
+
+        }
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumesRW.java b/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
index a898ed57f..4a017d162 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
@@ -36,34 +36,36 @@ public VolumeRW[] getVolumesRW() {
     public static final class Serializer extends JsonSerializer<VolumesRW> {
 
         @Override
-        public void serialize(VolumesRW value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
+        public void serialize(VolumesRW value, JsonGenerator jgen, SerializerProvider provider) throws IOException,
+                JsonProcessingException {
             jgen.writeStartObject();
             for (final VolumeRW volumeRW : value.volumesRW) {
                 jgen.writeBooleanField(volumeRW.getVolume().getPath(), volumeRW.getAccessMode().toBoolean());
             }
             jgen.writeEndObject();
         }
-        
+
     }
-    
+
     public static final class Deserializer extends JsonDeserializer<VolumesRW> {
         @Override
-        public VolumesRW deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+        public VolumesRW deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+                throws IOException, JsonProcessingException {
 
             List<VolumeRW> volumesRW = new ArrayList<VolumeRW>();
             ObjectCodec oc = jsonParser.getCodec();
             JsonNode node = oc.readTree(jsonParser);
-            
-            
+
             for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
                 Map.Entry<String, JsonNode> field = it.next();
                 JsonNode value = field.getValue();
-                
+
                 if (!value.equals(NullNode.getInstance())) {
-                    if (!value.isBoolean()){
-                        throw deserializationContext.mappingException("Expected access mode for '"+field.getKey()+"' in host but got '"+ value+"'.");
+                    if (!value.isBoolean()) {
+                        throw deserializationContext.mappingException("Expected access mode for '" + field.getKey()
+                                + "' in host but got '" + value + "'.");
                     }
-                    
+
                     VolumeRW bind = new VolumeRW(new Volume(field.getKey()), AccessMode.fromBoolean(value.asBoolean()));
                     volumesRW.add(bind);
                 }
diff --git a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
index 862259a8e..6b5bdb055 100644
--- a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
+++ b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
@@ -18,7 +18,10 @@
 
 public class AuthConfigFile {
     private static final ObjectMapper MAPPER = new ObjectMapper();
-    private static final TypeReference<Map<String, AuthConfig>> CONFIG_MAP_TYPE = new TypeReference<Map<String, AuthConfig>>() {};
+
+    private static final TypeReference<Map<String, AuthConfig>> CONFIG_MAP_TYPE = new TypeReference<Map<String, AuthConfig>>() {
+    };
+
     private final Map<String, AuthConfig> authConfigMap;
 
     public AuthConfigFile() {
@@ -53,7 +56,7 @@ public AuthConfig resolveAuthConfig(String hostname) {
 
     public AuthConfigurations getAuthConfigurations() {
         final AuthConfigurations authConfigurations = new AuthConfigurations();
-        for(Map.Entry<String, AuthConfig> authConfigEntry : authConfigMap.entrySet()) {
+        for (Map.Entry<String, AuthConfig> authConfigEntry : authConfigMap.entrySet()) {
             authConfigurations.addConfig(authConfigEntry.getValue());
         }
 
@@ -90,7 +93,6 @@ public String toString() {
         return "AuthConfigFile [authConfigMap=" + authConfigMap + "]";
     }
 
-
     public static AuthConfigFile loadConfig(File confFile) throws IOException {
         AuthConfigFile configFile = new AuthConfigFile();
         if (!confFile.exists()) {
diff --git a/src/main/java/com/github/dockerjava/core/CertificateUtils.java b/src/main/java/com/github/dockerjava/core/CertificateUtils.java
index 6b19a201f..5abb82bd7 100644
--- a/src/main/java/com/github/dockerjava/core/CertificateUtils.java
+++ b/src/main/java/com/github/dockerjava/core/CertificateUtils.java
@@ -25,117 +25,118 @@
 import org.bouncycastle.openssl.PEMParser;
 
 public class CertificateUtils {
-    
+
     public static boolean verifyCertificatesExist(String dockerCertPath) {
-        String[] files = {"ca.pem", "cert.pem", "key.pem"};
+        String[] files = { "ca.pem", "cert.pem", "key.pem" };
         for (String file : files) {
             File path = new File(dockerCertPath, file);
             boolean exists = path.exists();
-            if(!exists) {
+            if (!exists) {
                 return false;
             }
         }
-        
+
         return true;
     }
-    
-    public static KeyStore createKeyStore(final String dockerCertPath) throws NoSuchAlgorithmException, InvalidKeySpecException, IOException, CertificateException, KeyStoreException {
+
+    public static KeyStore createKeyStore(final String dockerCertPath) throws NoSuchAlgorithmException,
+            InvalidKeySpecException, IOException, CertificateException, KeyStoreException {
         KeyPair keyPair = loadPrivateKey(dockerCertPath);
         Certificate privateCertificate = loadCertificate(dockerCertPath);
 
         KeyStore keyStore = KeyStore.getInstance("JKS");
         keyStore.load(null);
 
-        keyStore.setKeyEntry("docker", keyPair.getPrivate(), "docker".toCharArray(), new Certificate[]{privateCertificate});
+        keyStore.setKeyEntry("docker", keyPair.getPrivate(), "docker".toCharArray(),
+                new Certificate[] { privateCertificate });
         return keyStore;
     }
-    
-    public static KeyStore createTrustStore(final String dockerCertPath) throws IOException, CertificateException, KeyStoreException, NoSuchAlgorithmException {
+
+    public static KeyStore createTrustStore(final String dockerCertPath) throws IOException, CertificateException,
+            KeyStoreException, NoSuchAlgorithmException {
         File caPath = new File(dockerCertPath, "ca.pem");
         BufferedReader reader = new BufferedReader(new FileReader(caPath));
         PEMParser pemParser = null;
-        
+
         try {
             pemParser = new PEMParser(reader);
             X509CertificateHolder certificateHolder = (X509CertificateHolder) pemParser.readObject();
-            Certificate caCertificate = new JcaX509CertificateConverter().setProvider("BC").getCertificate(certificateHolder);
-            
+            Certificate caCertificate = new JcaX509CertificateConverter().setProvider("BC").getCertificate(
+                    certificateHolder);
+
             KeyStore trustStore = KeyStore.getInstance("JKS");
             trustStore.load(null);
             trustStore.setCertificateEntry("ca", caCertificate);
             return trustStore;
-            
-        }
-        finally {
-            if(pemParser != null) {
+
+        } finally {
+            if (pemParser != null) {
                 IOUtils.closeQuietly(pemParser);
             }
 
-            if(reader != null) {
+            if (reader != null) {
                 IOUtils.closeQuietly(reader);
             }
         }
-        
+
     }
-    
+
     private static Certificate loadCertificate(final String dockerCertPath) throws IOException, CertificateException {
         File certificate = new File(dockerCertPath, "cert.pem");
         BufferedReader reader = new BufferedReader(new FileReader(certificate));
         PEMParser pemParser = null;
-        
+
         try {
-           pemParser = new PEMParser(reader);
-           X509CertificateHolder certificateHolder = (X509CertificateHolder) pemParser.readObject();
-           return new JcaX509CertificateConverter().setProvider("BC").getCertificate(certificateHolder);
-        }
-        finally {
-            if(pemParser != null) {
+            pemParser = new PEMParser(reader);
+            X509CertificateHolder certificateHolder = (X509CertificateHolder) pemParser.readObject();
+            return new JcaX509CertificateConverter().setProvider("BC").getCertificate(certificateHolder);
+        } finally {
+            if (pemParser != null) {
                 IOUtils.closeQuietly(pemParser);
             }
-            
-            if(reader != null) {
+
+            if (reader != null) {
                 IOUtils.closeQuietly(reader);
             }
         }
-        
+
     }
-    
-    private static KeyPair loadPrivateKey(final String dockerCertPath) throws IOException, NoSuchAlgorithmException, InvalidKeySpecException {
+
+    private static KeyPair loadPrivateKey(final String dockerCertPath) throws IOException, NoSuchAlgorithmException,
+            InvalidKeySpecException {
         File certificate = new File(dockerCertPath, "key.pem");
         BufferedReader reader = new BufferedReader(new FileReader(certificate));
 
         PEMParser pemParser = null;
-        
+
         try {
-           pemParser = new PEMParser(reader);
-           
-           PEMKeyPair pemKeyPair = (PEMKeyPair) pemParser.readObject();
-          
-           byte[] pemPrivateKeyEncoded = pemKeyPair.getPrivateKeyInfo().getEncoded();
-           byte[] pemPublicKeyEncoded = pemKeyPair.getPublicKeyInfo().getEncoded();
+            pemParser = new PEMParser(reader);
 
-           KeyFactory factory = KeyFactory.getInstance("RSA");
+            PEMKeyPair pemKeyPair = (PEMKeyPair) pemParser.readObject();
 
-           X509EncodedKeySpec publicKeySpec = new X509EncodedKeySpec(pemPublicKeyEncoded);
-           PublicKey publicKey = factory.generatePublic(publicKeySpec);
+            byte[] pemPrivateKeyEncoded = pemKeyPair.getPrivateKeyInfo().getEncoded();
+            byte[] pemPublicKeyEncoded = pemKeyPair.getPublicKeyInfo().getEncoded();
 
-           PKCS8EncodedKeySpec privateKeySpec = new PKCS8EncodedKeySpec(pemPrivateKeyEncoded);
-           PrivateKey privateKey = factory.generatePrivate(privateKeySpec);
+            KeyFactory factory = KeyFactory.getInstance("RSA");
 
-           return new KeyPair(publicKey, privateKey);
-        
-        }
-        finally {
-            if(pemParser != null) {
+            X509EncodedKeySpec publicKeySpec = new X509EncodedKeySpec(pemPublicKeyEncoded);
+            PublicKey publicKey = factory.generatePublic(publicKeySpec);
+
+            PKCS8EncodedKeySpec privateKeySpec = new PKCS8EncodedKeySpec(pemPrivateKeyEncoded);
+            PrivateKey privateKey = factory.generatePrivate(privateKeySpec);
+
+            return new KeyPair(publicKey, privateKey);
+
+        } finally {
+            if (pemParser != null) {
                 IOUtils.closeQuietly(pemParser);
             }
-            
-            if(reader != null) {
+
+            if (reader != null) {
                 IOUtils.closeQuietly(reader);
             }
         }
 
-        
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
index 0afd5171d..b40294487 100644
--- a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
+++ b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
@@ -10,7 +10,8 @@
 
 public class CompressArchiveUtil {
 
-    public static File archiveTARFiles(File base, Iterable<File> files, String archiveNameWithOutExtension) throws IOException {
+    public static File archiveTARFiles(File base, Iterable<File> files, String archiveNameWithOutExtension)
+            throws IOException {
         File tarFile = new File(FileUtils.getTempDirectoryPath(), archiveNameWithOutExtension + ".tar");
         tarFile.deleteOnExit();
         TarArchiveOutputStream tos = new TarArchiveOutputStream(new FileOutputStream(tarFile));
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
index 4aa7d5ac7..f906f43d5 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
@@ -7,65 +7,62 @@
 import com.github.dockerjava.core.DockerClientConfig.DockerClientConfigBuilder;
 
 public class DockerClientBuilder {
-	
-	private static ServiceLoader<DockerCmdExecFactory> serviceLoader = ServiceLoader.load(DockerCmdExecFactory.class);
-
-	private DockerClientImpl dockerClient = null;
-	private DockerCmdExecFactory dockerCmdExecFactory = null;
-
-	private DockerClientBuilder(DockerClientImpl dockerClient) {
-		this.dockerClient = dockerClient;
-	}
-
-	public static DockerClientBuilder getInstance() {
-		return new DockerClientBuilder(DockerClientImpl.getInstance());
-	}
-	
-	public static DockerClientBuilder getInstance(DockerClientConfigBuilder dockerClientConfigBuilder) {
-		return getInstance(dockerClientConfigBuilder.build());
-	}
-
-	public static DockerClientBuilder getInstance(DockerClientConfig dockerClientConfig) {
-		return new DockerClientBuilder(DockerClientImpl
-				.getInstance(dockerClientConfig));
-	}
-
-	public static DockerClientBuilder getInstance(String serverUrl) {
-		return new DockerClientBuilder(DockerClientImpl
-				.getInstance(serverUrl));
-	}
-
-	public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() {
-		// clearing the cache is needed because otherwise we will get
-		// the same DockerCmdExecFactory instance each time
-		serviceLoader.reload();
-		if(!serviceLoader.iterator().hasNext()) {
-			throw new RuntimeException("Fatal: Can't find any implementation of '" + DockerCmdExecFactory.class.getName() +  "' in the current classpath.");
-		}
-		
-		return serviceLoader.iterator().next();
-	}
-
-	public DockerClientBuilder withDockerCmdExecFactory(
-			DockerCmdExecFactory dockerCmdExecFactory) {
-		this.dockerCmdExecFactory = dockerCmdExecFactory;
-		return this;
-	}
-		
-	public DockerClientBuilder withServiceLoaderClassLoader(ClassLoader classLoader)
-	{
-		 serviceLoader = ServiceLoader.load(DockerCmdExecFactory.class, classLoader);
-		 return this;
-	}
-
-	public DockerClient build() {
-	        if(dockerCmdExecFactory != null) {
-	            dockerClient.withDockerCmdExecFactory(dockerCmdExecFactory);
-	        }
-	        else {
-	            dockerClient.withDockerCmdExecFactory(getDefaultDockerCmdExecFactory());
-	        }
-	        
-		return dockerClient;
-	}
+
+    private static ServiceLoader<DockerCmdExecFactory> serviceLoader = ServiceLoader.load(DockerCmdExecFactory.class);
+
+    private DockerClientImpl dockerClient = null;
+
+    private DockerCmdExecFactory dockerCmdExecFactory = null;
+
+    private DockerClientBuilder(DockerClientImpl dockerClient) {
+        this.dockerClient = dockerClient;
+    }
+
+    public static DockerClientBuilder getInstance() {
+        return new DockerClientBuilder(DockerClientImpl.getInstance());
+    }
+
+    public static DockerClientBuilder getInstance(DockerClientConfigBuilder dockerClientConfigBuilder) {
+        return getInstance(dockerClientConfigBuilder.build());
+    }
+
+    public static DockerClientBuilder getInstance(DockerClientConfig dockerClientConfig) {
+        return new DockerClientBuilder(DockerClientImpl.getInstance(dockerClientConfig));
+    }
+
+    public static DockerClientBuilder getInstance(String serverUrl) {
+        return new DockerClientBuilder(DockerClientImpl.getInstance(serverUrl));
+    }
+
+    public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() {
+        // clearing the cache is needed because otherwise we will get
+        // the same DockerCmdExecFactory instance each time
+        serviceLoader.reload();
+        if (!serviceLoader.iterator().hasNext()) {
+            throw new RuntimeException("Fatal: Can't find any implementation of '"
+                    + DockerCmdExecFactory.class.getName() + "' in the current classpath.");
+        }
+
+        return serviceLoader.iterator().next();
+    }
+
+    public DockerClientBuilder withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) {
+        this.dockerCmdExecFactory = dockerCmdExecFactory;
+        return this;
+    }
+
+    public DockerClientBuilder withServiceLoaderClassLoader(ClassLoader classLoader) {
+        serviceLoader = ServiceLoader.load(DockerCmdExecFactory.class, classLoader);
+        return this;
+    }
+
+    public DockerClient build() {
+        if (dockerCmdExecFactory != null) {
+            dockerClient.withDockerCmdExecFactory(dockerCmdExecFactory);
+        } else {
+            dockerClient.withDockerCmdExecFactory(getDefaultDockerCmdExecFactory());
+        }
+
+        return dockerClient;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index 7e0b57b0e..a96f61556 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -20,26 +20,42 @@
 
 public class DockerClientConfig implements Serializable {
 
-	private static final long serialVersionUID = -4307357472441531489L;
-	
-	private static final String DOCKER_HOST_PROPERTY = "DOCKER_HOST";
+    private static final long serialVersionUID = -4307357472441531489L;
+
+    private static final String DOCKER_HOST_PROPERTY = "DOCKER_HOST";
+
     private static final String DOCKER_CERT_PATH_PROPERTY = "DOCKER_CERT_PATH";
+
     private static final String DOCKER_VERIFY_TLS_PROPERTY = "DOCKER_TLS_VERIFY";
+
     private static final String DOCKER_IO_URL_PROPERTY = "docker.io.url";
+
     private static final String DOCKER_IO_VERSION_PROPERTY = "docker.io.version";
+
     private static final String DOCKER_IO_USERNAME_PROPERTY = "docker.io.username";
+
     private static final String DOCKER_IO_PASSWORD_PROPERTY = "docker.io.password";
+
     private static final String DOCKER_IO_EMAIL_PROPERTY = "docker.io.email";
+
     private static final String DOCKER_IO_SERVER_ADDRESS_PROPERTY = "docker.io.serverAddress";
+
     private static final String DOCKER_IO_READ_TIMEOUT_PROPERTY = "docker.io.readTimeout";
+
     // this is really confusing, as there are two ways to spell it
     private static final String DOCKER_IO_ENABLE_LOGGING_FILTER_PROPERTY = "docker.io.enableLoggingFilter";
+
     private static final String DOCKER_IO_FOLLOW_REDIRECTS_FILTER_PROPERTY = "docker.io.followRedirectsFilter";
+
     private static final String DOCKER_IO_DOCKER_CERT_PATH_PROPERTY = "docker.io.dockerCertPath";
+
     private static final String DOCKER_IO_DOCKER_CFG_PATH_PROPERTY = "docker.io.dockerCfgPath";
+
     // connection pooling properties
     private static final String DOCKER_IO_MAX_PER_ROUTE_PROPERTY = "docker.io.perRouteConnections";
+
     private static final String DOCKER_IO_MAX_TOTAL_PROPERTY = "docker.io.totalConnections";
+
     /**
      * A map from the environment name to the interval name.
      */
@@ -62,19 +78,26 @@ public class DockerClientConfig implements Serializable {
     }
 
     private static final String DOCKER_IO_PROPERTIES_PROPERTY = "docker.io.properties";
+
     private URI uri;
+
     private final String version, username, password, email, serverAddress, dockerCfgPath;
+
     private final Integer readTimeout;
+
     private final boolean loggingFilterEnabled;
+
     private final boolean followRedirectsFilterEnabled;
+
     private final SSLConfig sslConfig;
-    
+
     private final Integer maxTotalConnections;
+
     private final Integer maxPerRouteConnections;
 
     DockerClientConfig(URI uri, String version, String username, String password, String email, String serverAddress,
-                       String dockerCfgPath, Integer readTimeout, boolean loggingFilterEnabled, boolean followRedirectsFilterEnabled, 
-                       SSLConfig sslConfig, Integer maxTotalConns, Integer maxPerRouteConns) {
+            String dockerCfgPath, Integer readTimeout, boolean loggingFilterEnabled,
+            boolean followRedirectsFilterEnabled, SSLConfig sslConfig, Integer maxTotalConns, Integer maxPerRouteConns) {
         this.uri = uri;
         this.version = version;
         this.username = username;
@@ -121,14 +144,16 @@ private static String replaceProperties(String s, Properties replacements) {
     /**
      * Creates a new Properties object containing values overridden from ${user.home}/.docker.io.properties
      *
-     * @param p The original set of properties to override
+     * @param p
+     *            The original set of properties to override
      * @return A copy of the original Properties with overridden values
      */
     private static Properties overrideDockerPropertiesWithSettingsFromUserHome(Properties p, Properties systemProperties) {
         Properties overriddenProperties = new Properties();
         overriddenProperties.putAll(p);
 
-        final File usersDockerPropertiesFile = new File(systemProperties.getProperty("user.home"), "." + DOCKER_IO_PROPERTIES_PROPERTY);
+        final File usersDockerPropertiesFile = new File(systemProperties.getProperty("user.home"), "."
+                + DOCKER_IO_PROPERTIES_PROPERTY);
         if (usersDockerPropertiesFile.isFile()) {
             try {
                 final FileInputStream in = new FileInputStream(usersDockerPropertiesFile);
@@ -150,7 +175,8 @@ private static Properties overrideDockerPropertiesWithEnv(Properties properties,
 
         // special case which is a sensible default
         if (env.containsKey(DOCKER_HOST_PROPERTY)) {
-            overriddenProperties.setProperty(DOCKER_IO_URL_PROPERTY, env.get(DOCKER_HOST_PROPERTY).replace("tcp", protocol(env)));
+            overriddenProperties.setProperty(DOCKER_IO_URL_PROPERTY,
+                    env.get(DOCKER_HOST_PROPERTY).replace("tcp", protocol(env)));
         }
 
         for (Map.Entry<String, String> envEntry : env.entrySet()) {
@@ -165,32 +191,26 @@ private static Properties overrideDockerPropertiesWithEnv(Properties properties,
 
     private static String protocol(Map<String, String> env) {
         // if this is set, we assume we need SSL
-        return env.containsKey(DOCKER_CERT_PATH_PROPERTY) || "1".equals(env.get(DOCKER_VERIFY_TLS_PROPERTY)) ? "https" : "http";
+        return env.containsKey(DOCKER_CERT_PATH_PROPERTY) || "1".equals(env.get(DOCKER_VERIFY_TLS_PROPERTY)) ? "https"
+                : "http";
     }
 
     /**
      * Creates a new Properties object containing values overridden from the System properties
      *
-     * @param p The original set of properties to override
+     * @param p
+     *            The original set of properties to override
      * @return A copy of the original Properties with overridden values
      */
     private static Properties overrideDockerPropertiesWithSystemProperties(Properties p, Properties systemProperties) {
         Properties overriddenProperties = new Properties();
         overriddenProperties.putAll(p);
 
-        for (String key : new String[]{
-                DOCKER_IO_URL_PROPERTY,
-                DOCKER_IO_VERSION_PROPERTY,
-                DOCKER_IO_USERNAME_PROPERTY,
-                DOCKER_IO_PASSWORD_PROPERTY,
-                DOCKER_IO_EMAIL_PROPERTY,
-                DOCKER_IO_SERVER_ADDRESS_PROPERTY,
-                DOCKER_IO_READ_TIMEOUT_PROPERTY,
-                DOCKER_IO_ENABLE_LOGGING_FILTER_PROPERTY,
-                DOCKER_IO_FOLLOW_REDIRECTS_FILTER_PROPERTY,
-                DOCKER_IO_DOCKER_CERT_PATH_PROPERTY,
-                DOCKER_IO_DOCKER_CFG_PATH_PROPERTY,
-        }) {
+        for (String key : new String[] { DOCKER_IO_URL_PROPERTY, DOCKER_IO_VERSION_PROPERTY,
+                DOCKER_IO_USERNAME_PROPERTY, DOCKER_IO_PASSWORD_PROPERTY, DOCKER_IO_EMAIL_PROPERTY,
+                DOCKER_IO_SERVER_ADDRESS_PROPERTY, DOCKER_IO_READ_TIMEOUT_PROPERTY,
+                DOCKER_IO_ENABLE_LOGGING_FILTER_PROPERTY, DOCKER_IO_FOLLOW_REDIRECTS_FILTER_PROPERTY,
+                DOCKER_IO_DOCKER_CERT_PATH_PROPERTY, DOCKER_IO_DOCKER_CFG_PATH_PROPERTY, }) {
             if (systemProperties.containsKey(key)) {
                 overriddenProperties.setProperty(key, systemProperties.getProperty(key));
             }
@@ -218,8 +238,8 @@ public URI getUri() {
     }
 
     public void setUri(URI uri) {
-		this.uri = uri;
-	}
+        this.uri = uri;
+    }
 
     public String getVersion() {
         return version;
@@ -254,73 +274,67 @@ public boolean followRedirectsFilterEnabled() {
     }
 
     public SSLConfig getSslConfig() {
-      return sslConfig;
+        return sslConfig;
     }
 
     public String getDockerCfgPath() {
         return dockerCfgPath;
     }
-    
+
     public Integer getMaxTotalConnections() {
-      return maxTotalConnections;
+        return maxTotalConnections;
     }
 
     public Integer getMaxPerRoutConnections() {
-      return maxPerRouteConnections;
+        return maxPerRouteConnections;
     }
-    
+
     private AuthConfig getAuthConfig() {
-    	AuthConfig authConfig = null;
-    	if (getUsername() != null && getPassword() != null && getEmail() != null
-    			&& getServerAddress() != null) {
-    		authConfig = new AuthConfig();
-    		authConfig.setUsername(getUsername());
-    		authConfig.setPassword(getPassword());
-    		authConfig.setEmail(getEmail());
-    		authConfig.setServerAddress(getServerAddress());
-    	} 
-    	return authConfig;
-    }
-    
+        AuthConfig authConfig = null;
+        if (getUsername() != null && getPassword() != null && getEmail() != null && getServerAddress() != null) {
+            authConfig = new AuthConfig();
+            authConfig.setUsername(getUsername());
+            authConfig.setPassword(getPassword());
+            authConfig.setEmail(getEmail());
+            authConfig.setServerAddress(getServerAddress());
+        }
+        return authConfig;
+    }
+
     public AuthConfig effectiveAuthConfig(String imageName) {
-		AuthConfig authConfig = null;
-
-		String dockerCfgFile = getDockerCfgPath();
-
-		if (dockerCfgFile != null && imageName != null) {
-			AuthConfigFile authConfigFile;
-			try {
-				authConfigFile = AuthConfigFile.loadConfig(new File(
-						dockerCfgFile));
-			} catch (IOException e) {
-				throw new DockerClientException(
-						"Failed to parse dockerCfgFile", e);
-			}
-			ReposTag reposTag = NameParser.parseRepositoryTag(imageName);
-			HostnameReposName hostnameReposName = NameParser
-					.resolveRepositoryName(reposTag.repos);
-			
-			authConfig = authConfigFile
-					.resolveAuthConfig(hostnameReposName.hostname);	
-		}
-		
-		AuthConfig _authConfig = getAuthConfig();
-		
-		if(_authConfig != null) authConfig = _authConfig;
-		
-		return authConfig;
-	}
+        AuthConfig authConfig = null;
+
+        String dockerCfgFile = getDockerCfgPath();
+
+        if (dockerCfgFile != null && imageName != null) {
+            AuthConfigFile authConfigFile;
+            try {
+                authConfigFile = AuthConfigFile.loadConfig(new File(dockerCfgFile));
+            } catch (IOException e) {
+                throw new DockerClientException("Failed to parse dockerCfgFile", e);
+            }
+            ReposTag reposTag = NameParser.parseRepositoryTag(imageName);
+            HostnameReposName hostnameReposName = NameParser.resolveRepositoryName(reposTag.repos);
+
+            authConfig = authConfigFile.resolveAuthConfig(hostnameReposName.hostname);
+        }
+
+        AuthConfig _authConfig = getAuthConfig();
+
+        if (_authConfig != null)
+            authConfig = _authConfig;
+
+        return authConfig;
+    }
 
     public AuthConfigurations getAuthConfigurations() {
         String dockerCfgFile = getDockerCfgPath();
         if (dockerCfgFile != null) {
             AuthConfigFile authConfigFile;
             try {
-                authConfigFile = AuthConfigFile.loadConfig(new File(
-                        dockerCfgFile));
+                authConfigFile = AuthConfigFile.loadConfig(new File(dockerCfgFile));
             } catch (IOException e) {
-                throw new DockerClientException(
-                        "Failed to parse dockerCfgFile", e);
+                throw new DockerClientException("Failed to parse dockerCfgFile", e);
             }
 
             return authConfigFile.getAuthConfigurations();
@@ -329,26 +343,35 @@ public AuthConfigurations getAuthConfigurations() {
         return new AuthConfigurations();
     }
 
-  @Override
+    @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
 
         DockerClientConfig that = (DockerClientConfig) o;
 
-        if (loggingFilterEnabled != that.loggingFilterEnabled) return false;
+        if (loggingFilterEnabled != that.loggingFilterEnabled)
+            return false;
         if (sslConfig != null ? !sslConfig.equals(that.sslConfig) : that.sslConfig != null)
             return false;
         if (dockerCfgPath != null ? !dockerCfgPath.equals(that.dockerCfgPath) : that.dockerCfgPath != null)
             return false;
-        if (email != null ? !email.equals(that.email) : that.email != null) return false;
-        if (password != null ? !password.equals(that.password) : that.password != null) return false;
-        if (readTimeout != null ? !readTimeout.equals(that.readTimeout) : that.readTimeout != null) return false;
+        if (email != null ? !email.equals(that.email) : that.email != null)
+            return false;
+        if (password != null ? !password.equals(that.password) : that.password != null)
+            return false;
+        if (readTimeout != null ? !readTimeout.equals(that.readTimeout) : that.readTimeout != null)
+            return false;
         if (serverAddress != null ? !serverAddress.equals(that.serverAddress) : that.serverAddress != null)
             return false;
-        if (uri != null ? !uri.equals(that.uri) : that.uri != null) return false;
-        if (username != null ? !username.equals(that.username) : that.username != null) return false;
-        if (version != null ? !version.equals(that.version) : that.version != null) return false;
+        if (uri != null ? !uri.equals(that.uri) : that.uri != null)
+            return false;
+        if (username != null ? !username.equals(that.username) : that.username != null)
+            return false;
+        if (version != null ? !version.equals(that.version) : that.version != null)
+            return false;
 
         return true;
     }
@@ -370,33 +393,29 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "DockerClientConfig{" +
-                "uri=" + uri +
-                ", version='" + version + '\'' +
-                ", username='" + username + '\'' +
-                ", password='" + password + '\'' +
-                ", email='" + email + '\'' +
-                ", serverAddress='" + serverAddress + '\'' +
-                ", dockerCfgPath='" + dockerCfgPath + '\'' +
-                ", sslConfig='" + sslConfig + '\'' +
-                ", readTimeout=" + readTimeout +
-                ", loggingFilterEnabled=" + loggingFilterEnabled +
-                ", followRedirectsFilterEnabled=" + followRedirectsFilterEnabled +
-                '}';
+        return "DockerClientConfig{" + "uri=" + uri + ", version='" + version + '\'' + ", username='" + username + '\''
+                + ", password='" + password + '\'' + ", email='" + email + '\'' + ", serverAddress='" + serverAddress
+                + '\'' + ", dockerCfgPath='" + dockerCfgPath + '\'' + ", sslConfig='" + sslConfig + '\''
+                + ", readTimeout=" + readTimeout + ", loggingFilterEnabled=" + loggingFilterEnabled
+                + ", followRedirectsFilterEnabled=" + followRedirectsFilterEnabled + '}';
     }
 
     public static class DockerClientConfigBuilder {
         private URI uri;
+
         private String version, username, password, email, serverAddress, dockerCfgPath;
+
         private Integer readTimeout, maxTotalConnections, maxPerRouteConnections;
+
         private boolean loggingFilterEnabled, followRedirectsFilterEnabled;
+
         private SSLConfig sslConfig;
 
         /**
          * This will set all fields in the builder to those contained in the Properties object. The Properties object
          * should contain the following docker.io.* keys: url, version, username, password, email, dockerCertPath, and
          * dockerCfgPath. If docker.io.readTimeout or docker.io.enableLoggingFilter are not contained, they will be set
-         *  to 1000 and true, respectively.
+         * to 1000 and true, respectively.
          */
         public DockerClientConfigBuilder withProperties(Properties p) {
             return withUri(p.getProperty(DOCKER_IO_URL_PROPERTY))
@@ -407,18 +426,19 @@ public DockerClientConfigBuilder withProperties(Properties p) {
                     .withServerAddress(p.getProperty(DOCKER_IO_SERVER_ADDRESS_PROPERTY))
                     .withReadTimeout(Integer.valueOf(p.getProperty(DOCKER_IO_READ_TIMEOUT_PROPERTY, "0")))
                     .withLoggingFilter(Boolean.valueOf(p.getProperty(DOCKER_IO_ENABLE_LOGGING_FILTER_PROPERTY, "true")))
-                    .withFollowRedirectsFilter(Boolean.valueOf(p.getProperty(DOCKER_IO_FOLLOW_REDIRECTS_FILTER_PROPERTY, "false")))
+                    .withFollowRedirectsFilter(
+                            Boolean.valueOf(p.getProperty(DOCKER_IO_FOLLOW_REDIRECTS_FILTER_PROPERTY, "false")))
                     .withDockerCertPath(p.getProperty(DOCKER_IO_DOCKER_CERT_PATH_PROPERTY))
                     .withDockerCfgPath(p.getProperty(DOCKER_IO_DOCKER_CFG_PATH_PROPERTY))
                     .withMaxPerRouteConnections(integerValue(p.getProperty(DOCKER_IO_MAX_PER_ROUTE_PROPERTY)))
                     .withMaxTotalConnections(integerValue(p.getProperty(DOCKER_IO_MAX_TOTAL_PROPERTY)));
         }
-        
+
         private Integer integerValue(String value) {
-        	if(value != null)
-        		return Integer.valueOf(value);
-        	else 
-        		return null;
+            if (value != null)
+                return Integer.valueOf(value);
+            else
+                return null;
         }
 
         public final DockerClientConfigBuilder withUri(String uri) {
@@ -456,12 +476,12 @@ public final DockerClientConfigBuilder withReadTimeout(Integer readTimeout) {
             this.readTimeout = readTimeout;
             return this;
         }
-        
+
         public final DockerClientConfigBuilder withMaxTotalConnections(Integer maxTotalConnections) {
             this.maxTotalConnections = maxTotalConnections;
             return this;
         }
-        
+
         public final DockerClientConfigBuilder withMaxPerRouteConnections(Integer maxPerRouteConnections) {
             this.maxPerRouteConnections = maxPerRouteConnections;
             return this;
@@ -478,9 +498,9 @@ public final DockerClientConfigBuilder withFollowRedirectsFilter(boolean followR
         }
 
         public final DockerClientConfigBuilder withDockerCertPath(String dockerCertPath) {
-        	if(dockerCertPath != null) {
-        		this.sslConfig = new LocalDirectorySSLConfig(dockerCertPath);
-        	}
+            if (dockerCertPath != null) {
+                this.sslConfig = new LocalDirectorySSLConfig(dockerCertPath);
+            }
             return this;
         }
 
@@ -489,30 +509,17 @@ public final DockerClientConfigBuilder withDockerCfgPath(String dockerCfgPath) {
             return this;
         }
 
-
         public final DockerClientConfigBuilder withSSLConfig(SSLConfig config) {
             this.sslConfig = config;
             return this;
         }
 
         public DockerClientConfig build() {
-            return new DockerClientConfig(
-                    uri,
-                    version,
-                    username,
-                    password,
-                    email,
-                    serverAddress,
-                    dockerCfgPath,
-                    readTimeout,
-                    loggingFilterEnabled,
-                    followRedirectsFilterEnabled,
-                    sslConfig,
-                    maxTotalConnections,
-                    maxPerRouteConnections
-            );
+            return new DockerClientConfig(uri, version, username, password, email, serverAddress, dockerCfgPath,
+                    readTimeout, loggingFilterEnabled, followRedirectsFilterEnabled, sslConfig, maxTotalConnections,
+                    maxPerRouteConnections);
         }
     }
 
-//   
+    //
 }
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index b9bdb7edc..810910393 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -285,7 +285,8 @@ public WaitContainerCmd waitContainerCmd(String containerId) {
 
     @Override
     public AttachContainerCmd attachContainerCmd(String containerId, ResultCallback<Frame> resultCallback) {
-        return new AttachContainerCmdImpl(getDockerCmdExecFactory().createAttachContainerCmdExec(), containerId, resultCallback);
+        return new AttachContainerCmdImpl(getDockerCmdExecFactory().createAttachContainerCmdExec(), containerId,
+                resultCallback);
     }
 
     @Override
@@ -300,7 +301,8 @@ public InspectExecCmd inspectExecCmd(String execId) {
 
     @Override
     public LogContainerCmd logContainerCmd(String containerId, ResultCallback<Frame> resultCallback) {
-        return new LogContainerCmdImpl(getDockerCmdExecFactory().createLogContainerCmdExec(), containerId, resultCallback);
+        return new LogContainerCmdImpl(getDockerCmdExecFactory().createLogContainerCmdExec(), containerId,
+                resultCallback);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/FilePathUtil.java b/src/main/java/com/github/dockerjava/core/FilePathUtil.java
index 3fc910217..317a55ed6 100644
--- a/src/main/java/com/github/dockerjava/core/FilePathUtil.java
+++ b/src/main/java/com/github/dockerjava/core/FilePathUtil.java
@@ -6,9 +6,12 @@
 public class FilePathUtil {
 
     /**
-     * Return the relative path. Path elements are separated with / char. 
-     * @param baseDir a parent directory of {@code file}
-     * @param file the file to get the relative path
+     * Return the relative path. Path elements are separated with / char.
+     * 
+     * @param baseDir
+     *            a parent directory of {@code file}
+     * @param file
+     *            the file to get the relative path
      * @return the relative path
      */
     public static String relativize(File baseDir, File file) {
diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index a84bce5bb..469beb40b 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -23,16 +23,16 @@
  *                  character class (must be non-empty)
  *       c           matches character c (c != '*', '?', '\\', '[')
  *       '\\' c      matches character c
- *
+ * 
  *   character-range:
  *       c           matches character c (c != '\\', '-', ']')
  *       '\\' c      matches character c
  *       lo '-' hi   matches character c for lo <= c <= hi
- *
+ * 
  *  Match requires pattern to match all of name, not just a substring.
  *  The only possible returned error is ErrBadPattern, when pattern
  *  is malformed.
- *
+ * 
  * On Windows, escaping is disabled. Instead, '\\' is treated as
  *  path separator.
  * </pre>
@@ -234,7 +234,9 @@ static GetEscResult getEsc(String chunk, int chunkOffset, int chunkLength) {
 
     private static final class ScanResult {
         public boolean star;
+
         public String chunk;
+
         public String pattern;
 
         public ScanResult(boolean star, String chunk, String pattern) {
@@ -246,6 +248,7 @@ public ScanResult(boolean star, String chunk, String pattern) {
 
     private static final class GetEscResult {
         public char lo;
+
         public int chunkOffset;
 
         public GetEscResult(char lo, int chunkOffset) {
diff --git a/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java b/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
index 33e0f2a47..c8d8e1044 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
@@ -10,10 +10,9 @@
 
 public class GoLangMatchFileFilter extends AbstractFileFilter {
 
-	private final File base;
-	
-    private final List<String> patterns;
+    private final File base;
 
+    private final List<String> patterns;
 
     public GoLangMatchFileFilter(File base, List<String> patterns) {
         super();
@@ -24,10 +23,9 @@ public GoLangMatchFileFilter(File base, List<String> patterns) {
     @Override
     public boolean accept(File file) {
         String relativePath = FilePathUtil.relativize(base, file);
-        
+
         boolean match = GoLangFileMatch.match(patterns, relativePath);
         return !match;
     }
 
-
 }
diff --git a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
index ec5a2ba8a..d7a17cfab 100644
--- a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
@@ -25,110 +25,109 @@
  */
 public class KeystoreSSLConfig implements SSLConfig, Serializable {
 
-  private final KeyStore keystore;
-  private final String keystorePassword;
-
-  /**
-   * @param keystore a KeyStore
-   * @param keystorePassword key password
-   */
-  public KeystoreSSLConfig(KeyStore keystore, String keystorePassword) {
-    this.keystorePassword = keystorePassword;
-    checkNotNull(keystore);
-    this.keystore = keystore;
-  }
-
-  /**
-   *
-   * @param pfxFile a PKCS12 file
-   * @param password Password for the keystore
-   * @throws KeyStoreException
-   * @throws IOException
-   * @throws CertificateException
-   * @throws NoSuchAlgorithmException
-   */
-  public KeystoreSSLConfig(File pfxFile, String password)
-      throws KeyStoreException, IOException, CertificateException, NoSuchAlgorithmException {
-    checkNotNull(pfxFile);
-    checkNotNull(password);
-    keystore = KeyStore.getInstance("pkcs12");
-    keystore.load(new FileInputStream(pfxFile), password.toCharArray());
-    keystorePassword = password;
-  }
-
-
-  /**
-   * Get the SSL Context out of the keystore.
-   * @return java SSLContext
-   * @throws KeyManagementException
-   * @throws UnrecoverableKeyException
-   * @throws NoSuchAlgorithmException
-   * @throws KeyStoreException
-   */
-  @Override
-  public SSLContext getSSLContext()
-      throws KeyManagementException, UnrecoverableKeyException, NoSuchAlgorithmException,
-             KeyStoreException {
-
-    final SSLContext context = SSLContext.getInstance("TLS");
-
-    String httpProtocols = System.getProperty("https.protocols");
-    System.setProperty("https.protocols", "TLSv1");
-
-    if (httpProtocols != null)
-      System.setProperty("https.protocols", httpProtocols);
-
-    final KeyManagerFactory
-        keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-    keyManagerFactory.init(keystore, keystorePassword.toCharArray());
-    context.init(keyManagerFactory.getKeyManagers(), new TrustManager[]{
-        new X509TrustManager() {
-          @Override
-          public X509Certificate[] getAcceptedIssuers() {
-            return new X509Certificate[]{};
-          }
-
-          @Override
-          public void checkClientTrusted(final X509Certificate[] arg0, final String arg1) {
-
-          }
-
-          @Override
-          public void checkServerTrusted(final X509Certificate[] arg0, final String arg1) {
-
-          }
-        }
-    }, new SecureRandom());
-
-    return context;
-  }
+    private final KeyStore keystore;
+
+    private final String keystorePassword;
+
+    /**
+     * @param keystore
+     *            a KeyStore
+     * @param keystorePassword
+     *            key password
+     */
+    public KeystoreSSLConfig(KeyStore keystore, String keystorePassword) {
+        this.keystorePassword = keystorePassword;
+        checkNotNull(keystore);
+        this.keystore = keystore;
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
+    /**
+     *
+     * @param pfxFile
+     *            a PKCS12 file
+     * @param password
+     *            Password for the keystore
+     * @throws KeyStoreException
+     * @throws IOException
+     * @throws CertificateException
+     * @throws NoSuchAlgorithmException
+     */
+    public KeystoreSSLConfig(File pfxFile, String password) throws KeyStoreException, IOException,
+            CertificateException, NoSuchAlgorithmException {
+        checkNotNull(pfxFile);
+        checkNotNull(password);
+        keystore = KeyStore.getInstance("pkcs12");
+        keystore.load(new FileInputStream(pfxFile), password.toCharArray());
+        keystorePassword = password;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
+
+    /**
+     * Get the SSL Context out of the keystore.
+     * 
+     * @return java SSLContext
+     * @throws KeyManagementException
+     * @throws UnrecoverableKeyException
+     * @throws NoSuchAlgorithmException
+     * @throws KeyStoreException
+     */
+    @Override
+    public SSLContext getSSLContext() throws KeyManagementException, UnrecoverableKeyException,
+            NoSuchAlgorithmException, KeyStoreException {
+
+        final SSLContext context = SSLContext.getInstance("TLS");
+
+        String httpProtocols = System.getProperty("https.protocols");
+        System.setProperty("https.protocols", "TLSv1");
+
+        if (httpProtocols != null)
+            System.setProperty("https.protocols", httpProtocols);
+
+        final KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory
+                .getDefaultAlgorithm());
+        keyManagerFactory.init(keystore, keystorePassword.toCharArray());
+        context.init(keyManagerFactory.getKeyManagers(), new TrustManager[] { new X509TrustManager() {
+            @Override
+            public X509Certificate[] getAcceptedIssuers() {
+                return new X509Certificate[] {};
+            }
+
+            @Override
+            public void checkClientTrusted(final X509Certificate[] arg0, final String arg1) {
+
+            }
+
+            @Override
+            public void checkServerTrusted(final X509Certificate[] arg0, final String arg1) {
+
+            }
+        } }, new SecureRandom());
+
+        return context;
     }
 
-    KeystoreSSLConfig that = (KeystoreSSLConfig) o;
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 
-    return keystore.equals(that.keystore);
+        KeystoreSSLConfig that = (KeystoreSSLConfig) o;
 
-  }
+        return keystore.equals(that.keystore);
 
-  @Override
-  public int hashCode() {
-    return keystore.hashCode();
-  }
+    }
+
+    @Override
+    public int hashCode() {
+        return keystore.hashCode();
+    }
 
-  @Override
-  public String toString() {
-    return new StringBuilder()
-        .append(this.getClass().getSimpleName()).append("{")
-            .append("keystore=").append(keystore)
-        .append("}")
-        .toString();
-  }
+    @Override
+    public String toString() {
+        return new StringBuilder().append(this.getClass().getSimpleName()).append("{").append("keystore=")
+                .append(keystore).append("}").toString();
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
index bafe62212..44310e9ce 100644
--- a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
@@ -12,88 +12,83 @@
 
 import com.github.dockerjava.api.DockerClientException;
 
-
 /**
  * SSL Config from local files.
  */
 public class LocalDirectorySSLConfig implements SSLConfig, Serializable {
 
-  private final String dockerCertPath;
+    private final String dockerCertPath;
 
-  public LocalDirectorySSLConfig(String dockerCertPath) {
-    checkNotNull(dockerCertPath);
-    this.dockerCertPath = dockerCertPath;
-  }
+    public LocalDirectorySSLConfig(String dockerCertPath) {
+        checkNotNull(dockerCertPath);
+        this.dockerCertPath = dockerCertPath;
+    }
 
-  public String getDockerCertPath() {
-    return dockerCertPath;
-  }
+    public String getDockerCertPath() {
+        return dockerCertPath;
+    }
 
-  @Override
-  public SSLContext getSSLContext() {
+    @Override
+    public SSLContext getSSLContext() {
 
-    boolean certificatesExist = CertificateUtils.verifyCertificatesExist(dockerCertPath);
+        boolean certificatesExist = CertificateUtils.verifyCertificatesExist(dockerCertPath);
 
-    if (certificatesExist) {
+        if (certificatesExist) {
 
-      try {
+            try {
 
-        Security.addProvider(new BouncyCastleProvider());
+                Security.addProvider(new BouncyCastleProvider());
 
-        // properties acrobatics not needed for java > 1.6
-        String httpProtocols = System.getProperty("https.protocols");
-        System.setProperty("https.protocols", "TLSv1");
-        SslConfigurator sslConfig = SslConfigurator.newInstance(true);
-        if (httpProtocols != null) {
-          System.setProperty("https.protocols", httpProtocols);
-        }
+                // properties acrobatics not needed for java > 1.6
+                String httpProtocols = System.getProperty("https.protocols");
+                System.setProperty("https.protocols", "TLSv1");
+                SslConfigurator sslConfig = SslConfigurator.newInstance(true);
+                if (httpProtocols != null) {
+                    System.setProperty("https.protocols", httpProtocols);
+                }
 
-        sslConfig.keyStore(CertificateUtils.createKeyStore(dockerCertPath));
-        sslConfig.keyStorePassword("docker");
-        sslConfig.trustStore(CertificateUtils.createTrustStore(dockerCertPath));
+                sslConfig.keyStore(CertificateUtils.createKeyStore(dockerCertPath));
+                sslConfig.keyStorePassword("docker");
+                sslConfig.trustStore(CertificateUtils.createTrustStore(dockerCertPath));
 
-        return sslConfig.createSSLContext();
+                return sslConfig.createSSLContext();
 
+            } catch (Exception e) {
+                throw new DockerClientException(e.getMessage(), e);
+            }
 
-      } catch (Exception e) {
-        throw new DockerClientException(e.getMessage(), e);
-      }
+        }
+
+        return null;
 
     }
 
-    return null;
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 
-  }
+        LocalDirectorySSLConfig that = (LocalDirectorySSLConfig) o;
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
+        if (!dockerCertPath.equals(that.dockerCertPath)) {
+            return false;
+        }
 
-    LocalDirectorySSLConfig that = (LocalDirectorySSLConfig) o;
+        return true;
+    }
 
-    if (!dockerCertPath.equals(that.dockerCertPath)) {
-      return false;
+    @Override
+    public int hashCode() {
+        return dockerCertPath.hashCode();
     }
 
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return dockerCertPath.hashCode();
-  }
-
-  @Override
-  public String toString() {
-    return new StringBuilder()
-        .append(this.getClass().getSimpleName()).append("{")
-            .append("dockerCertPath=").append(dockerCertPath)
-        .append("}")
-        .toString();
-  }
+    @Override
+    public String toString() {
+        return new StringBuilder().append(this.getClass().getSimpleName()).append("{").append("dockerCertPath=")
+                .append(dockerCertPath).append("}").toString();
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/NameParser.java b/src/main/java/com/github/dockerjava/core/NameParser.java
index 6b1654081..2bd99bf31 100644
--- a/src/main/java/com/github/dockerjava/core/NameParser.java
+++ b/src/main/java/com/github/dockerjava/core/NameParser.java
@@ -10,7 +10,9 @@
 public class NameParser {
 
     private static final Pattern VALID_HEX_PATTERN = Pattern.compile("^([a-f0-9]{64})$");
+
     private static final Pattern VALID_NAMESPACE_PATTERN = Pattern.compile("^([a-z0-9_]{4,30})$");
+
     private static final Pattern VALID_REPO_PATTERN = Pattern.compile("^([a-z0-9-_.]+)$");
 
     public static ReposTag parseRepositoryTag(String name) {
@@ -27,6 +29,7 @@ public static ReposTag parseRepositoryTag(String name) {
 
     public static class ReposTag {
         public final String repos;
+
         public final String tag;
 
         public ReposTag(String repos, String tag) {
@@ -44,18 +47,15 @@ public static void validateRepositoryName(String repositoryName) {
             name = nameParts[0];
             if (VALID_HEX_PATTERN.matcher(name).matches()) {
                 throw new InvalidRepositoryNameException(String.format(
-                        "Invalid repository name (%s), cannot specify 64-byte hexadecimal strings",
-                        name));
+                        "Invalid repository name (%s), cannot specify 64-byte hexadecimal strings", name));
             }
         } else {
             namespace = nameParts[0];
             name = nameParts[1];
         }
         if (!VALID_NAMESPACE_PATTERN.matcher(namespace).matches()) {
-            throw new InvalidRepositoryNameException(
-                    String.format(
-                            "Invalid namespace name (%s), only [a-z0-9_] are allowed, size between 4 and 30",
-                            namespace));
+            throw new InvalidRepositoryNameException(String.format(
+                    "Invalid namespace name (%s), only [a-z0-9_] are allowed, size between 4 and 30", namespace));
         }
         if (!VALID_REPO_PATTERN.matcher(name).matches()) {
             throw new InvalidRepositoryNameException(String.format(
@@ -71,16 +71,15 @@ public static HostnameReposName resolveRepositoryName(String reposName) {
 
         String[] nameParts = reposName.split("/", 2);
         if (nameParts.length == 1
-                || (!nameParts[0].contains(".") && !nameParts[0].contains(":") && !nameParts[0]
-                        .equals("localhost"))) {
+                || (!nameParts[0].contains(".") && !nameParts[0].contains(":") && !nameParts[0].equals("localhost"))) {
             return new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, reposName);
         }
 
         String hostname = nameParts[0];
         reposName = nameParts[1];
         if (hostname.contains("index.docker.io")) {
-            throw new InvalidRepositoryNameException(String.format(
-                    "Invalid repository name, try \"%s\" instead", reposName));
+            throw new InvalidRepositoryNameException(String.format("Invalid repository name, try \"%s\" instead",
+                    reposName));
         }
 
         validateRepositoryName(reposName);
@@ -89,6 +88,7 @@ public static HostnameReposName resolveRepositoryName(String reposName) {
 
     public static class HostnameReposName {
         public final String hostname;
+
         public final String reposName;
 
         public HostnameReposName(String hostname, String reposName) {
diff --git a/src/main/java/com/github/dockerjava/core/SSLConfig.java b/src/main/java/com/github/dockerjava/core/SSLConfig.java
index ab6394890..247e21b1f 100644
--- a/src/main/java/com/github/dockerjava/core/SSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/SSLConfig.java
@@ -9,11 +9,11 @@
  */
 public interface SSLConfig {
 
-  /**
-   * Get the SSL Context, from wherever it comes (file, keystore).
-   * @return an SSL context.
-   */
-  SSLContext getSSLContext()
-      throws KeyManagementException, UnrecoverableKeyException, NoSuchAlgorithmException,
-             KeyStoreException;
+    /**
+     * Get the SSL Context, from wherever it comes (file, keystore).
+     * 
+     * @return an SSL context.
+     */
+    SSLContext getSSLContext() throws KeyManagementException, UnrecoverableKeyException, NoSuchAlgorithmException,
+            KeyStoreException;
 }
diff --git a/src/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java b/src/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java
index c88575889..879a8c305 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java
@@ -14,7 +14,6 @@
  */
 public interface ResponseStreamProcessor<T> {
 
-    void processResponseStream(InputStream response,
-            ResultCallback<T> resultCallback);
+    void processResponseStream(InputStream response, ResultCallback<T> resultCallback);
 
 }
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index f56db8db4..d9a408c35 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -55,7 +55,7 @@ public void onComplete() {
 
     @Override
     public void close() throws IOException {
-        if(stream != null)
+        if (stream != null)
             stream.close();
         finished.countDown();
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
index 31259f1f0..7e9957cbf 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
@@ -11,41 +11,40 @@
 import com.github.dockerjava.api.command.DockerCmdExec;
 import com.github.dockerjava.api.model.AuthConfig;
 
-public abstract class AbstrAuthCfgDockerCmd<T extends DockerCmd<RES_T>, RES_T> extends
-		AbstrDockerCmd<T, RES_T> {
-
-	public AbstrAuthCfgDockerCmd(DockerCmdExec<T, RES_T> execution, AuthConfig authConfig) {
-		super(execution);
-		withOptionalAuthConfig(authConfig);
-	}
-
-	public AbstrAuthCfgDockerCmd(DockerCmdExec<T, RES_T> execution) {
-		super(execution);
-	}
-
-	private AuthConfig authConfig;
-	
-	public AuthConfig getAuthConfig() {
-		return authConfig;
-	}
-
-	public T withAuthConfig(AuthConfig authConfig) {
-		checkNotNull(authConfig, "authConfig was not specified");
-		return withOptionalAuthConfig(authConfig);
-	}
-
-	@SuppressWarnings("unchecked")
-	private T withOptionalAuthConfig(AuthConfig authConfig) {
-		this.authConfig = authConfig;
-		return (T)this;
-	}
-	
-	protected String registryAuth() {
-		try {
-			return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfig).getBytes());
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
+public abstract class AbstrAuthCfgDockerCmd<T extends DockerCmd<RES_T>, RES_T> extends AbstrDockerCmd<T, RES_T> {
+
+    public AbstrAuthCfgDockerCmd(DockerCmdExec<T, RES_T> execution, AuthConfig authConfig) {
+        super(execution);
+        withOptionalAuthConfig(authConfig);
+    }
+
+    public AbstrAuthCfgDockerCmd(DockerCmdExec<T, RES_T> execution) {
+        super(execution);
+    }
+
+    private AuthConfig authConfig;
+
+    public AuthConfig getAuthConfig() {
+        return authConfig;
+    }
+
+    public T withAuthConfig(AuthConfig authConfig) {
+        checkNotNull(authConfig, "authConfig was not specified");
+        return withOptionalAuthConfig(authConfig);
+    }
+
+    @SuppressWarnings("unchecked")
+    private T withOptionalAuthConfig(AuthConfig authConfig) {
+        this.authConfig = authConfig;
+        return (T) this;
+    }
+
+    protected String registryAuth() {
+        try {
+            return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfig).getBytes());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
index 751b02cb6..069fba09e 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
@@ -12,23 +12,24 @@
 import com.github.dockerjava.api.command.DockerCmdExec;
 
 public abstract class AbstrDockerCmd<CMD_T extends DockerCmd<RES_T>, RES_T> implements DockerCmd<RES_T> {
-    
+
     private final static Logger LOGGER = LoggerFactory.getLogger(AbstrDockerCmd.class);
 
-	protected DockerCmdExec<CMD_T, RES_T> execution;
-	
-	public AbstrDockerCmd(DockerCmdExec<CMD_T, RES_T> execution) {
-		checkNotNull(execution, "execution was not specified");
-		this.execution = execution;
-	}
+    protected DockerCmdExec<CMD_T, RES_T> execution;
+
+    public AbstrDockerCmd(DockerCmdExec<CMD_T, RES_T> execution) {
+        checkNotNull(execution, "execution was not specified");
+        this.execution = execution;
+    }
 
     @Override
     @SuppressWarnings("unchecked")
-	public RES_T exec() throws DockerException {
-		LOGGER.debug("Cmd: {}", this);
-		return execution.exec((CMD_T)this);
-	}
+    public RES_T exec() throws DockerException {
+        LOGGER.debug("Cmd: {}", this);
+        return execution.exec((CMD_T) this);
+    }
 
     @Override
-	public void close() throws IOException {}
+    public void close() throws IOException {
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
index 749f61500..eabbb8488 100644
--- a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
@@ -20,24 +20,23 @@
  * @param stderr
  *            - true or false, includes stderr log. Defaults to false.
  * @param timestamps
- *            - true or false, if true, print timestamps for every log line.
- *            Defaults to false.
+ *            - true or false, if true, print timestamps for every log line. Defaults to false.
  */
-public class AttachContainerCmdImpl extends	AbstrDockerCmd<AttachContainerCmd, Void> implements AttachContainerCmd {
+public class AttachContainerCmdImpl extends AbstrDockerCmd<AttachContainerCmd, Void> implements AttachContainerCmd {
 
     private ResultCallback<Frame> resultCallback;
 
-	private String containerId;
+    private String containerId;
 
-	private boolean logs, followStream, timestamps, stdout, stderr;
+    private boolean logs, followStream, timestamps, stdout, stderr;
 
-	public AttachContainerCmdImpl(AttachContainerCmd.Exec exec, String containerId, ResultCallback<Frame> resultCallback) {
-		super(exec);
-		withContainerId(containerId);
-		withResultCallback(resultCallback);
-	}
+    public AttachContainerCmdImpl(AttachContainerCmd.Exec exec, String containerId, ResultCallback<Frame> resultCallback) {
+        super(exec);
+        withContainerId(containerId);
+        withResultCallback(resultCallback);
+    }
 
-	public ResultCallback<Frame> getResultCallback() {
+    public ResultCallback<Frame> getResultCallback() {
         return resultCallback;
     }
 
@@ -48,98 +47,99 @@ public AttachContainerCmd withResultCallback(ResultCallback<Frame> resultCallbac
         return this;
     }
 
-	@Override
-	public String getContainerId() {
-		return containerId;
-	}
-
-	@Override
-	public boolean hasLogsEnabled() {
-		return logs;
-	}
-
-	@Override
-	public boolean hasFollowStreamEnabled() {
-		return followStream;
-	}
-
-	@Override
-	public boolean hasTimestampsEnabled() {
-		return timestamps;
-	}
-
-	@Override
-	public boolean hasStdoutEnabled() {
-		return stdout;
-	}
-
-	@Override
-	public boolean hasStderrEnabled() {
-		return stderr;
-	}
-
-	@Override
-	public AttachContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
-
-	@Override
-	public AttachContainerCmd withFollowStream() {
-		return withFollowStream(true);
-	}
-
-	@Override
-	public AttachContainerCmd withFollowStream(boolean followStream) {
-		this.followStream = followStream;
-		return this;
-	}
-
-	@Override
-	public AttachContainerCmd withTimestamps(boolean timestamps) {
-		this.timestamps = timestamps;
-		return this;
-	}
-
-	@Override
-	public AttachContainerCmd withStdOut() {
-		return withStdOut(true);
-	}
-
-	@Override
-	public AttachContainerCmd withStdOut(boolean stdout) {
-		this.stdout = stdout;
-		return this;
-	}
-
-	@Override
-	public AttachContainerCmd withStdErr() {
-		return withStdErr(true);
-	}
-
-	@Override
-	public AttachContainerCmd withStdErr(boolean stderr) {
-		this.stderr = stderr;
-		return this;
-	}
-
-	@Override
-	public AttachContainerCmd withLogs(boolean logs) {
-		this.logs = logs;
-		return this;
-	}
-
-	@Override
-	public AttachContainerCmd withLogs() {
-		return withLogs(true);
-	}
-
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public Void exec() throws NotFoundException {
-		return super.exec();
-	}
+    @Override
+    public String getContainerId() {
+        return containerId;
+    }
+
+    @Override
+    public boolean hasLogsEnabled() {
+        return logs;
+    }
+
+    @Override
+    public boolean hasFollowStreamEnabled() {
+        return followStream;
+    }
+
+    @Override
+    public boolean hasTimestampsEnabled() {
+        return timestamps;
+    }
+
+    @Override
+    public boolean hasStdoutEnabled() {
+        return stdout;
+    }
+
+    @Override
+    public boolean hasStderrEnabled() {
+        return stderr;
+    }
+
+    @Override
+    public AttachContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
+
+    @Override
+    public AttachContainerCmd withFollowStream() {
+        return withFollowStream(true);
+    }
+
+    @Override
+    public AttachContainerCmd withFollowStream(boolean followStream) {
+        this.followStream = followStream;
+        return this;
+    }
+
+    @Override
+    public AttachContainerCmd withTimestamps(boolean timestamps) {
+        this.timestamps = timestamps;
+        return this;
+    }
+
+    @Override
+    public AttachContainerCmd withStdOut() {
+        return withStdOut(true);
+    }
+
+    @Override
+    public AttachContainerCmd withStdOut(boolean stdout) {
+        this.stdout = stdout;
+        return this;
+    }
+
+    @Override
+    public AttachContainerCmd withStdErr() {
+        return withStdErr(true);
+    }
+
+    @Override
+    public AttachContainerCmd withStdErr(boolean stderr) {
+        this.stderr = stderr;
+        return this;
+    }
+
+    @Override
+    public AttachContainerCmd withLogs(boolean logs) {
+        this.logs = logs;
+        return this;
+    }
+
+    @Override
+    public AttachContainerCmd withLogs() {
+        return withLogs(true);
+    }
+
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public Void exec() throws NotFoundException {
+        return super.exec();
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
index 0da0da3c3..73c716c14 100644
--- a/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
@@ -12,18 +12,18 @@
  */
 public class AuthCmdImpl extends AbstrAuthCfgDockerCmd<AuthCmd, AuthResponse> implements AuthCmd {
 
-	public AuthCmdImpl(AuthCmd.Exec exec, AuthConfig authConfig) {
-		super(exec);
-		withAuthConfig(authConfig);
-	}
+    public AuthCmdImpl(AuthCmd.Exec exec, AuthConfig authConfig) {
+        super(exec);
+        withAuthConfig(authConfig);
+    }
 
-	@Override
-	public AuthResponse exec() throws UnauthorizedException {
-		return super.exec();
-	}
+    @Override
+    public AuthResponse exec() throws UnauthorizedException {
+        return super.exec();
+    }
 
-	@Override
-	public String toString() {
-		return "authenticate using " + this.getAuthConfig();
-	}
+    @Override
+    public String toString() {
+        return "authenticate using " + this.getAuthConfig();
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index ef0242857..f61d3b7ac 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -18,16 +18,22 @@
  */
 public class BuildImageCmdImpl extends AbstrDockerCmd<BuildImageCmd, BuildImageCmd.Response> implements BuildImageCmd {
 
+    private InputStream tarInputStream = null;
+
+    private String tag;
+
+    private boolean noCache;
+
+    private boolean remove = true;
+
+    private boolean quiet;
+
+    private boolean pull;
+
+    private AuthConfigurations buildAuthConfigs;
 
-	private InputStream tarInputStream = null;
-	private String tag;
-	private boolean noCache;
-	private boolean remove = true;
-	private boolean quiet;
-	private boolean pull;
-	
-	private AuthConfigurations buildAuthConfigs;
     private File dockerFile;
+
     private File baseDirectory;
 
     public BuildImageCmdImpl(BuildImageCmd.Exec exec) {
@@ -35,48 +41,43 @@ public BuildImageCmdImpl(BuildImageCmd.Exec exec) {
     }
 
     public BuildImageCmdImpl(BuildImageCmd.Exec exec, File dockerFileOrFolder) {
-		super(exec);
-		checkNotNull(dockerFileOrFolder, "dockerFolder is null");
+        super(exec);
+        checkNotNull(dockerFileOrFolder, "dockerFolder is null");
 
-        if( dockerFileOrFolder.isDirectory() ) {
+        if (dockerFileOrFolder.isDirectory()) {
             withBaseDirectory(dockerFileOrFolder);
             withDockerfile(new File(dockerFileOrFolder, "Dockerfile"));
-        }
-        else {
+        } else {
             withDockerfile(dockerFileOrFolder);
         }
-	}
+    }
 
-	public BuildImageCmdImpl(BuildImageCmd.Exec exec, InputStream tarInputStream) {
-		super(exec);
-		checkNotNull(tarInputStream, "tarInputStream is null");
-		withTarInputStream(tarInputStream);
-	}
+    public BuildImageCmdImpl(BuildImageCmd.Exec exec, InputStream tarInputStream) {
+        super(exec);
+        checkNotNull(tarInputStream, "tarInputStream is null");
+        withTarInputStream(tarInputStream);
+    }
 
-	@Override
-	public InputStream getTarInputStream() {
-		return tarInputStream;
-	}
+    @Override
+    public InputStream getTarInputStream() {
+        return tarInputStream;
+    }
 
     @Override
     public BuildImageCmdImpl withDockerfile(File dockerfile) {
         checkNotNull(dockerfile);
-        if( !dockerfile.exists() )
+        if (!dockerfile.exists())
             throw new IllegalArgumentException("Dockerfile does not exist");
-        if( !dockerfile.isFile() )
+        if (!dockerfile.isFile())
             throw new IllegalArgumentException("Not a directory");
 
-        if( baseDirectory == null )
+        if (baseDirectory == null)
             withBaseDirectory(dockerfile.getParentFile());
 
-
         this.dockerFile = dockerfile;
 
         try {
-            withTarInputStream(
-                    new Dockerfile(dockerfile)
-                            .parse()
-                            .buildDockerFolderTar(baseDirectory) );
+            withTarInputStream(new Dockerfile(dockerfile).parse().buildDockerFolderTar(baseDirectory));
         } catch (IOException e) {
             // we just created the file this should never happen.
             throw new RuntimeException(e);
@@ -84,44 +85,44 @@ public BuildImageCmdImpl withDockerfile(File dockerfile) {
         return this;
     }
 
-	@Override
-	public BuildImageCmdImpl withTarInputStream(InputStream tarInputStream) {
-		checkNotNull(tarInputStream, "tarInputStream is null");
-		this.tarInputStream = tarInputStream;
-		return this;
-	}
-
-	@Override
-	public BuildImageCmdImpl withTag(String tag) {
-		checkNotNull(tag, "Tag is null");
-		this.tag = tag;
-		return this;
-	}
-
-	@Override
-	public String getTag() {
-		return tag;
-	}
-
-	@Override
-	public boolean hasNoCacheEnabled() {
-		return noCache;
-	}
-
-	@Override
-	public boolean hasRemoveEnabled() {
-		return remove;
-	}
-
-	@Override
-	public boolean isQuiet() {
-		return quiet;
-	}
-	
-	@Override
-	public boolean hasPullEnabled() {
-		return pull;
-	}
+    @Override
+    public BuildImageCmdImpl withTarInputStream(InputStream tarInputStream) {
+        checkNotNull(tarInputStream, "tarInputStream is null");
+        this.tarInputStream = tarInputStream;
+        return this;
+    }
+
+    @Override
+    public BuildImageCmdImpl withTag(String tag) {
+        checkNotNull(tag, "Tag is null");
+        this.tag = tag;
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return tag;
+    }
+
+    @Override
+    public boolean hasNoCacheEnabled() {
+        return noCache;
+    }
+
+    @Override
+    public boolean hasRemoveEnabled() {
+        return remove;
+    }
+
+    @Override
+    public boolean isQuiet() {
+        return quiet;
+    }
+
+    @Override
+    public boolean hasPullEnabled() {
+        return pull;
+    }
 
     @Override
     public String getPathToDockerfile() {
@@ -133,9 +134,9 @@ public String getPathToDockerfile() {
     }
 
     @Override
-	public AuthConfigurations getBuildAuthConfigs() {
-		return buildAuthConfigs;
-	}
+    public AuthConfigurations getBuildAuthConfigs() {
+        return buildAuthConfigs;
+    }
 
     @Override
     public BuildImageCmd withBaseDirectory(File baseDirectory) {
@@ -144,71 +145,68 @@ public BuildImageCmd withBaseDirectory(File baseDirectory) {
     }
 
     @Override
-	public BuildImageCmdImpl withNoCache() {
-		return withNoCache(true);
-	}
-
-	@Override
-	public BuildImageCmdImpl withNoCache(boolean noCache) {
-		this.noCache = noCache;
-		return this;
-	}
-
-	@Override
-	public BuildImageCmdImpl withRemove() {
-		return withRemove(true);
-	}
-
-	@Override
-	public BuildImageCmdImpl withRemove(boolean rm) {
-		this.remove = rm;
-		return this;
-	}
-
-	@Override
-	public BuildImageCmdImpl withQuiet() {
-		return withQuiet(true);
-	}
-
-	@Override
-	public BuildImageCmdImpl withQuiet(boolean quiet) {
-		this.quiet = quiet;
-		return this;
-	}
-	
-	@Override
-	public BuildImageCmdImpl withPull() {
-		return withPull(true);
-	}
-
-	@Override
-	public BuildImageCmdImpl withPull(boolean pull) {
-		this.pull = pull;
-		return this;
-	}
-
-	@Override
-	public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfigs) {
-		checkNotNull(authConfigs, "authConfig is null");
-		this.buildAuthConfigs = authConfigs;
-		return this;
-	}
-
-	@Override
-	public void close() throws IOException {
-		super.close();
-
-		tarInputStream.close();
-	}
-
-	@Override
-	public String toString() {
-		return new StringBuilder("build ")
-				.append(tag != null ? "-t " + tag + " " : "")
-				.append(noCache ? "--nocache=true " : "")
-				.append(quiet ? "--quiet=true " : "")
-				.append(!remove ? "--rm=false " : "").toString();
-	}
+    public BuildImageCmdImpl withNoCache() {
+        return withNoCache(true);
+    }
+
+    @Override
+    public BuildImageCmdImpl withNoCache(boolean noCache) {
+        this.noCache = noCache;
+        return this;
+    }
+
+    @Override
+    public BuildImageCmdImpl withRemove() {
+        return withRemove(true);
+    }
 
+    @Override
+    public BuildImageCmdImpl withRemove(boolean rm) {
+        this.remove = rm;
+        return this;
+    }
+
+    @Override
+    public BuildImageCmdImpl withQuiet() {
+        return withQuiet(true);
+    }
+
+    @Override
+    public BuildImageCmdImpl withQuiet(boolean quiet) {
+        this.quiet = quiet;
+        return this;
+    }
+
+    @Override
+    public BuildImageCmdImpl withPull() {
+        return withPull(true);
+    }
+
+    @Override
+    public BuildImageCmdImpl withPull(boolean pull) {
+        this.pull = pull;
+        return this;
+    }
+
+    @Override
+    public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfigs) {
+        checkNotNull(authConfigs, "authConfig is null");
+        this.buildAuthConfigs = authConfigs;
+        return this;
+    }
+
+    @Override
+    public void close() throws IOException {
+        super.close();
+
+        tarInputStream.close();
+    }
+
+    @Override
+    public String toString() {
+        return new StringBuilder("build ").append(tag != null ? "-t " + tag + " " : "")
+                .append(noCache ? "--nocache=true " : "").append(quiet ? "--quiet=true " : "")
+                .append(!remove ? "--rm=false " : "").toString();
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
index 55fe5e2e2..497d08c3f 100644
--- a/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
@@ -10,7 +10,6 @@
 import com.github.dockerjava.api.model.ExposedPorts;
 import com.github.dockerjava.api.model.Volumes;
 
-
 /**
  *
  * Create a new image from a container's changes. Returns the new image ID.
@@ -18,11 +17,11 @@
  */
 public class CommitCmdImpl extends AbstrDockerCmd<CommitCmd, String> implements CommitCmd {
 
-	private String containerId, repository, tag, message, author;
+    private String containerId, repository, tag, message, author;
 
-	private boolean pause = true;
+    private boolean pause = true;
 
-	@JsonProperty("AttachStdin")
+    @JsonProperty("AttachStdin")
     private boolean attachStdin;
 
     @JsonProperty("AttachStdout")
@@ -73,299 +72,293 @@ public class CommitCmdImpl extends AbstrDockerCmd<CommitCmd, String> implements
     @JsonProperty("WorkingDir")
     private String workingDir;
 
-
-	public CommitCmdImpl(CommitCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public CommitCmdImpl(CommitCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public CommitCmdImpl withContainerId(String containerId) {
+    public CommitCmdImpl withContainerId(String containerId) {
         checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
-
+        this.containerId = containerId;
+        return this;
+    }
 
     @Override
-	public String getRepository() {
+    public String getRepository() {
         return repository;
     }
 
     @Override
-	public String getTag() {
+    public String getTag() {
         return tag;
     }
 
     @Override
-	public String getMessage() {
+    public String getMessage() {
         return message;
     }
 
     @Override
-	public String getAuthor() {
+    public String getAuthor() {
         return author;
     }
 
     @Override
-	public boolean hasPauseEnabled() {
+    public boolean hasPauseEnabled() {
         return pause;
     }
 
-	@Override
-	public CommitCmdImpl withAttachStderr(boolean attachStderr) {
-		this.attachStderr = attachStderr;
-		return this;
-	}
-
-	@Override
-	public CommitCmdImpl withAttachStderr() {
-		return withAttachStderr(true);
-	}
-
-	@Override
-	public CommitCmdImpl withAttachStdin(boolean attachStdin) {
-		this.attachStdin = attachStdin;
-		return this;
-	}
-
-	@Override
-	public CommitCmdImpl withAttachStdin() {
-		return withAttachStdin(true);
-	}
-
-	@Override
-	public CommitCmdImpl withAttachStdout(boolean attachStdout) {
-		this.attachStdout = attachStdout;
-		return this;
-	}
-
-	@Override
-	public CommitCmdImpl withAttachStdout() {
-		return withAttachStdout(true);
-	}
-
-	@Override
-	public CommitCmdImpl withCmd(String... cmd) {
+    @Override
+    public CommitCmdImpl withAttachStderr(boolean attachStderr) {
+        this.attachStderr = attachStderr;
+        return this;
+    }
+
+    @Override
+    public CommitCmdImpl withAttachStderr() {
+        return withAttachStderr(true);
+    }
+
+    @Override
+    public CommitCmdImpl withAttachStdin(boolean attachStdin) {
+        this.attachStdin = attachStdin;
+        return this;
+    }
+
+    @Override
+    public CommitCmdImpl withAttachStdin() {
+        return withAttachStdin(true);
+    }
+
+    @Override
+    public CommitCmdImpl withAttachStdout(boolean attachStdout) {
+        this.attachStdout = attachStdout;
+        return this;
+    }
+
+    @Override
+    public CommitCmdImpl withAttachStdout() {
+        return withAttachStdout(true);
+    }
+
+    @Override
+    public CommitCmdImpl withCmd(String... cmd) {
         checkNotNull(cmd, "cmd was not specified");
-		this.cmd = cmd;
-		return this;
-	}
-
-	@Override
-	public CommitCmdImpl withDisableNetwork(boolean disableNetwork) {
-		this.disableNetwork = disableNetwork;
-		return this;
-	}
-
-	@Override
-	public CommitCmdImpl withAuthor(String author) {
+        this.cmd = cmd;
+        return this;
+    }
+
+    @Override
+    public CommitCmdImpl withDisableNetwork(boolean disableNetwork) {
+        this.disableNetwork = disableNetwork;
+        return this;
+    }
+
+    @Override
+    public CommitCmdImpl withAuthor(String author) {
         checkNotNull(author, "author was not specified");
-		this.author = author;
-		return this;
-	}
+        this.author = author;
+        return this;
+    }
 
-	@Override
-	public CommitCmdImpl withMessage(String message) {
+    @Override
+    public CommitCmdImpl withMessage(String message) {
         checkNotNull(message, "message was not specified");
-		this.message = message;
-		return this;
-	}
+        this.message = message;
+        return this;
+    }
 
-	@Override
-	public CommitCmdImpl withTag(String tag) {
+    @Override
+    public CommitCmdImpl withTag(String tag) {
         checkNotNull(tag, "tag was not specified");
-		this.tag = tag;
-		return this;
-	}
+        this.tag = tag;
+        return this;
+    }
 
-	@Override
-	public CommitCmdImpl withRepository(String repository) {
+    @Override
+    public CommitCmdImpl withRepository(String repository) {
         checkNotNull(repository, "repository was not specified");
-		this.repository = repository;
-		return this;
-	}
-
-	@Override
-	public CommitCmdImpl withPause(boolean pause) {
-		this.pause = pause;
-		return this;
-	}
-	
-	@Override
-	public String[] getEnv() {
+        this.repository = repository;
+        return this;
+    }
+
+    @Override
+    public CommitCmdImpl withPause(boolean pause) {
+        this.pause = pause;
+        return this;
+    }
+
+    @Override
+    public String[] getEnv() {
         return env;
     }
 
     @Override
-	public CommitCmdImpl withEnv(String... env) {
+    public CommitCmdImpl withEnv(String... env) {
         checkNotNull(env, "env was not specified");
         this.env = env;
         return this;
     }
 
     @Override
-	public ExposedPorts getExposedPorts() {
+    public ExposedPorts getExposedPorts() {
         return exposedPorts;
     }
 
     @Override
-	public CommitCmdImpl withExposedPorts(ExposedPorts exposedPorts) {
+    public CommitCmdImpl withExposedPorts(ExposedPorts exposedPorts) {
         checkNotNull(exposedPorts, "exposedPorts was not specified");
         this.exposedPorts = exposedPorts;
         return this;
     }
 
     @Override
-	public String getHostname() {
+    public String getHostname() {
         return hostname;
     }
 
     @Override
-	public CommitCmdImpl withHostname(String hostname) {
+    public CommitCmdImpl withHostname(String hostname) {
         checkNotNull(hostname, "hostname was not specified");
         this.hostname = hostname;
         return this;
     }
 
     @Override
-	public Integer getMemory() {
+    public Integer getMemory() {
         return memory;
     }
 
     @Override
-	public CommitCmdImpl withMemory(Integer memory) {
+    public CommitCmdImpl withMemory(Integer memory) {
         checkNotNull(memory, "memory was not specified");
         this.memory = memory;
         return this;
     }
 
     @Override
-	public Integer getMemorySwap() {
+    public Integer getMemorySwap() {
         return memorySwap;
     }
 
     @Override
-	public CommitCmdImpl withMemorySwap(Integer memorySwap) {
+    public CommitCmdImpl withMemorySwap(Integer memorySwap) {
         checkNotNull(memorySwap, "memorySwap was not specified");
         this.memorySwap = memorySwap;
         return this;
     }
 
     @Override
-	public boolean isOpenStdin() {
+    public boolean isOpenStdin() {
         return openStdin;
     }
 
     @Override
-	public CommitCmdImpl withOpenStdin(boolean openStdin) {
-    	checkNotNull(openStdin, "openStdin was not specified");
+    public CommitCmdImpl withOpenStdin(boolean openStdin) {
+        checkNotNull(openStdin, "openStdin was not specified");
         this.openStdin = openStdin;
         return this;
     }
-    
+
     @Override
-	public String[] getPortSpecs() {
+    public String[] getPortSpecs() {
         return portSpecs;
     }
 
     @Override
-	public CommitCmdImpl withPortSpecs(String... portSpecs) {
-    	checkNotNull(portSpecs, "portSpecs was not specified");
+    public CommitCmdImpl withPortSpecs(String... portSpecs) {
+        checkNotNull(portSpecs, "portSpecs was not specified");
         this.portSpecs = portSpecs;
         return this;
     }
 
     @Override
-	public boolean isStdinOnce() {
+    public boolean isStdinOnce() {
         return stdinOnce;
     }
 
     @Override
-	public CommitCmdImpl withStdinOnce(boolean stdinOnce) {
+    public CommitCmdImpl withStdinOnce(boolean stdinOnce) {
         this.stdinOnce = stdinOnce;
         return this;
     }
-    
+
     @Override
-	public CommitCmdImpl withStdinOnce() {
-    	return withStdinOnce(true);
+    public CommitCmdImpl withStdinOnce() {
+        return withStdinOnce(true);
     }
 
     @Override
-	public boolean isTty() {
+    public boolean isTty() {
         return tty;
     }
 
     @Override
-	public CommitCmdImpl withTty(boolean tty) {
+    public CommitCmdImpl withTty(boolean tty) {
         this.tty = tty;
         return this;
     }
-    
+
     @Override
-	public CommitCmdImpl withTty() {
-    	return withTty(true);
+    public CommitCmdImpl withTty() {
+        return withTty(true);
     }
 
     @Override
-	public String getUser() {
+    public String getUser() {
         return user;
     }
 
     @Override
-	public CommitCmdImpl withUser(String user) {
-    	checkNotNull(user, "user was not specified");
+    public CommitCmdImpl withUser(String user) {
+        checkNotNull(user, "user was not specified");
         this.user = user;
         return this;
     }
 
     @Override
-	public Volumes getVolumes() {
+    public Volumes getVolumes() {
         return volumes;
     }
 
     @Override
-	public CommitCmdImpl withVolumes(Volumes volumes) {
-    	checkNotNull(volumes, "volumes was not specified");
+    public CommitCmdImpl withVolumes(Volumes volumes) {
+        checkNotNull(volumes, "volumes was not specified");
         this.volumes = volumes;
         return this;
     }
 
     @Override
-	public String getWorkingDir() {
+    public String getWorkingDir() {
         return workingDir;
     }
 
     @Override
-	public CommitCmdImpl withWorkingDir(String workingDir) {
-    	checkNotNull(workingDir, "workingDir was not specified");
+    public CommitCmdImpl withWorkingDir(String workingDir) {
+        checkNotNull(workingDir, "workingDir was not specified");
         this.workingDir = workingDir;
         return this;
     }
 
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this).append("commit ").append(author != null ? "--author " + author + " " : "")
+                .append(message != null ? "--message " + message + " " : "").append(containerId)
+                .append(repository != null ? " " + repository + ":" : " ").append(tag != null ? tag : "").toString();
+    }
 
-	@Override
-	public String toString() {
-		return new ToStringBuilder(this).append("commit ")
-			.append(author != null ? "--author " + author + " " : "")
-			.append(message != null ? "--message " + message + " " : "")
-			.append(containerId)
-			.append(repository != null ?  " " + repository + ":" : " ")
-			.append(tag != null ?  tag : "")
-			.toString();
-	}
-	
-	/**
-     * @throws NotFoundException No such container
+    /**
+     * @throws NotFoundException
+     *             No such container
      */
-	@Override
-	public String exec() throws NotFoundException {
-		return super.exec();
-	}
+    @Override
+    public String exec() throws NotFoundException {
+        return super.exec();
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
index 36286423c..a394c535c 100644
--- a/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
@@ -13,42 +13,46 @@
 /**
  * Inspect changes on a container's filesystem
  *
- * @param containerId - Id of the container
+ * @param containerId
+ *            - Id of the container
  *
  */
 public class ContainerDiffCmdImpl extends AbstrDockerCmd<ContainerDiffCmd, List<ChangeLog>> implements ContainerDiffCmd {
 
-	private String containerId;
+    private String containerId;
 
-	public ContainerDiffCmdImpl(ContainerDiffCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public ContainerDiffCmdImpl(ContainerDiffCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public ContainerDiffCmdImpl withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
+    public ContainerDiffCmdImpl withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
 
-	@Override
+    @Override
     public String toString() {
         return new StringBuilder("diff ").append(containerId).toString();
     }
-    
+
     /**
-     * @throws NotFoundException No such container
-     * @throws InternalServerErrorException server error
-     * @throws DockerException unexpected http status code
+     * @throws NotFoundException
+     *             No such container
+     * @throws InternalServerErrorException
+     *             server error
+     * @throws DockerException
+     *             unexpected http status code
      */
-	@Override
+    @Override
     public List<ChangeLog> exec() throws NotFoundException {
-    	return super.exec();
+        return super.exec();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
index f4f2ae548..ef5f86a7a 100644
--- a/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
@@ -10,78 +10,75 @@
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
 
-
 /**
  *
  * Copy files or folders from a container.
  *
  */
-public class CopyFileFromContainerCmdImpl extends AbstrDockerCmd<CopyFileFromContainerCmd, InputStream> implements CopyFileFromContainerCmd {
+public class CopyFileFromContainerCmdImpl extends AbstrDockerCmd<CopyFileFromContainerCmd, InputStream> implements
+        CopyFileFromContainerCmd {
+
+    private String containerId;
 
-	private String containerId;
-	
-	@JsonProperty("HostPath")
+    @JsonProperty("HostPath")
     private String hostPath = ".";
 
     @JsonProperty("Resource")
     private String resource;
 
-	public CopyFileFromContainerCmdImpl(CopyFileFromContainerCmd.Exec exec, String containerId, String resource) {
-		super(exec);
-		withContainerId(containerId);
-		withResource(resource);
-	}
+    public CopyFileFromContainerCmdImpl(CopyFileFromContainerCmd.Exec exec, String containerId, String resource) {
+        super(exec);
+        withContainerId(containerId);
+        withResource(resource);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public String getResource() {
+    public String getResource() {
         return resource;
     }
 
     @Override
-	public CopyFileFromContainerCmdImpl withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
-
-	@Override
-	public CopyFileFromContainerCmdImpl withResource(String resource) {
-		checkNotNull(resource, "resource was not specified");
-		this.resource = resource;
-		return this;
-	}
-	
-	@Override
-	public String getHostPath() {
-		return hostPath;
-	}
-	
-	@Override
-	public CopyFileFromContainerCmdImpl withHostPath(String hostPath) {
-		checkNotNull(hostPath, "hostPath was not specified");
-		this.hostPath = hostPath;
-		return this;
-	}
-
-	@Override
+    public CopyFileFromContainerCmdImpl withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
+
+    @Override
+    public CopyFileFromContainerCmdImpl withResource(String resource) {
+        checkNotNull(resource, "resource was not specified");
+        this.resource = resource;
+        return this;
+    }
+
+    @Override
+    public String getHostPath() {
+        return hostPath;
+    }
+
+    @Override
+    public CopyFileFromContainerCmdImpl withHostPath(String hostPath) {
+        checkNotNull(hostPath, "hostPath was not specified");
+        this.hostPath = hostPath;
+        return this;
+    }
+
+    @Override
     public String toString() {
-        return new ToStringBuilder(this).append("cp ")
-            .append(containerId)
-            .append(":")
-            .append(resource)
-            .toString();
+        return new ToStringBuilder(this).append("cp ").append(containerId).append(":").append(resource).toString();
     }
-    
+
     /**
-     * @throws NotFoundException No such container
+     * @throws NotFoundException
+     *             No such container
      */
-	@Override
+    @Override
     public InputStream exec() throws NotFoundException {
-    	return super.exec();
+        return super.exec();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
index daa883f94..3ed2f912e 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
@@ -12,72 +12,75 @@
 /**
  * Create an image by importing the given stream of a tar file.
  */
-public class CreateImageCmdImpl extends	AbstrDockerCmd<CreateImageCmd, CreateImageResponse> implements CreateImageCmd {
+public class CreateImageCmdImpl extends AbstrDockerCmd<CreateImageCmd, CreateImageResponse> implements CreateImageCmd {
 
-	private String repository, tag;
-	
-	private InputStream imageStream;
+    private String repository, tag;
 
-	/**
-	 * @param repository        the repository to import to
-	 * @param imageStream       the InputStream of the tar file
-	 */
-	public CreateImageCmdImpl(CreateImageCmd.Exec exec, String repository, InputStream imageStream) {
-		super(exec);
-		withRepository(repository);
-		withImageStream(imageStream);
-	}
+    private InputStream imageStream;
+
+    /**
+     * @param repository
+     *            the repository to import to
+     * @param imageStream
+     *            the InputStream of the tar file
+     */
+    public CreateImageCmdImpl(CreateImageCmd.Exec exec, String repository, InputStream imageStream) {
+        super(exec);
+        withRepository(repository);
+        withImageStream(imageStream);
+    }
 
     @Override
-	public String getRepository() {
+    public String getRepository() {
         return repository;
     }
 
     @Override
-	public String getTag() {
+    public String getTag() {
         return tag;
     }
-    
+
     @Override
     public InputStream getImageStream() {
-    	return imageStream;
+        return imageStream;
     }
 
     /**
-	 * @param repository        the repository to import to
-	 */
-	@Override
-	public CreateImageCmdImpl withRepository(String repository) {
-		checkNotNull(repository, "repository was not specified");
-		this.repository = repository;
-		return this;
-	}
+     * @param repository
+     *            the repository to import to
+     */
+    @Override
+    public CreateImageCmdImpl withRepository(String repository) {
+        checkNotNull(repository, "repository was not specified");
+        this.repository = repository;
+        return this;
+    }
 
-	/**
-	 * @param imageStream       the InputStream of the tar file
-	 */
-	@Override
-	public CreateImageCmdImpl withImageStream(InputStream imageStream) {
-		checkNotNull(imageStream, "imageStream was not specified");
-		this.imageStream = imageStream;
-		return this;
-	}
+    /**
+     * @param imageStream
+     *            the InputStream of the tar file
+     */
+    @Override
+    public CreateImageCmdImpl withImageStream(InputStream imageStream) {
+        checkNotNull(imageStream, "imageStream was not specified");
+        this.imageStream = imageStream;
+        return this;
+    }
 
-	/**
-	 * @param tag               any tag for this image
-	 */
-	@Override
-	public CreateImageCmdImpl withTag(String tag) {
-		checkNotNull(tag, "tag was not specified");
-		this.tag = tag;
-		return this;
-	}
+    /**
+     * @param tag
+     *            any tag for this image
+     */
+    @Override
+    public CreateImageCmdImpl withTag(String tag) {
+        checkNotNull(tag, "tag was not specified");
+        this.tag = tag;
+        return this;
+    }
 
-	@Override
+    @Override
     public String toString() {
-        return new ToStringBuilder(this).append("import - ")
-            .append(repository != null ? repository + ":" : "")
-            .append(tag != null ? tag : "")
-            .toString();
+        return new ToStringBuilder(this).append("import - ").append(repository != null ? repository + ":" : "")
+                .append(tag != null ? tag : "").toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/EventStreamReader.java b/src/main/java/com/github/dockerjava/core/command/EventStreamReader.java
index b8975224f..ffa71d6c9 100644
--- a/src/main/java/com/github/dockerjava/core/command/EventStreamReader.java
+++ b/src/main/java/com/github/dockerjava/core/command/EventStreamReader.java
@@ -8,7 +8,9 @@
 public class EventStreamReader<I> implements AutoCloseable {
 
     private final ObjectMapper objectMapper = new ObjectMapper();
+
     private final Class<I> type;
+
     private final InputStream inputStream;
 
     public EventStreamReader(InputStream inputStream, Class<I> type) {
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
index 65b86ed9a..3b00d22c5 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
@@ -30,10 +30,10 @@ public ExecCreateCmdImpl(ExecCreateCmd.Exec exec, String containerId) {
         super(exec);
         withContainerId(containerId);
     }
-    
+
     @Override
     public ExecCreateCmd withContainerId(String containerId) {
-    	checkNotNull(containerId, "containerId was not specified");
+        checkNotNull(containerId, "containerId was not specified");
         this.containerId = containerId;
         return this;
     }
@@ -43,7 +43,7 @@ public ExecCreateCmd withAttachStdin(boolean attachStdin) {
         this.attachStdin = attachStdin;
         return this;
     }
-    
+
     @Override
     public ExecCreateCmd withAttachStdin() {
         return withAttachStdin(true);
@@ -54,7 +54,7 @@ public ExecCreateCmd withAttachStdout(boolean attachStdout) {
         this.attachStdout = attachStdout;
         return this;
     }
-    
+
     @Override
     public ExecCreateCmd withAttachStdout() {
         return withAttachStdout(true);
@@ -65,18 +65,18 @@ public ExecCreateCmd withAttachStderr(boolean attachStderr) {
         this.attachStderr = attachStderr;
         return this;
     }
-    
+
     @Override
     public ExecCreateCmd withAttachStderr() {
         return withAttachStderr(true);
     }
-    
+
     @Override
     public ExecCreateCmd withTty(boolean tty) {
         this.tty = tty;
         return this;
     }
-    
+
     @Override
     public ExecCreateCmd withTty() {
         return withTty(true);
@@ -92,34 +92,34 @@ public ExecCreateCmd withCmd(String... cmd) {
     public String getContainerId() {
         return containerId;
     }
-    
+
     @Override
-	public boolean hasAttachStdinEnabled() {
-		return attachStdin;
-	}
+    public boolean hasAttachStdinEnabled() {
+        return attachStdin;
+    }
 
-	@Override
-	public boolean hasAttachStdoutEnabled() {
-		return attachStdout;
-	}
+    @Override
+    public boolean hasAttachStdoutEnabled() {
+        return attachStdout;
+    }
 
-	@Override
-	public boolean hasAttachStderrEnabled() {
-		return attachStderr;
-	}
+    @Override
+    public boolean hasAttachStderrEnabled() {
+        return attachStderr;
+    }
 
-	@Override
-	public boolean hasTtyEnabled() {
-		return tty;
-	}
+    @Override
+    public boolean hasTtyEnabled() {
+        return tty;
+    }
 
     /**
-     * @throws NotFoundException No such container
+     * @throws NotFoundException
+     *             No such container
      */
     @Override
     public ExecCreateCmdResponse exec() throws NotFoundException {
         return super.exec();
     }
 
-	
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
index 193a2cb69..a479a91f2 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
@@ -22,13 +22,13 @@ public ExecStartCmdImpl(ExecStartCmd.Exec exec, String execId) {
     public String getExecId() {
         return execId;
     }
-    
+
     @Override
-	public ExecStartCmd withExecId(String execId) {
-    	checkNotNull(execId, "execId was not specified");
-		this.execId = execId;
-		return this;
-	}
+    public ExecStartCmd withExecId(String execId) {
+        checkNotNull(execId, "execId was not specified");
+        this.execId = execId;
+        return this;
+    }
 
     @Override
     public boolean hasDetachEnabled() {
@@ -41,33 +41,34 @@ public boolean hasTtyEnabled() {
     }
 
     @Override
-	public ExecStartCmd withDetach(boolean detach) {
-		this.detach = detach;
-		return this;
-	}
-
-	@Override
-	public ExecStartCmd withTty(boolean tty) {
-		this.tty = tty;
-		return this;
-	}
-	
-	@Override
-	public ExecStartCmd withDetach() {
-		return withDetach(true);
-	}
-
-	@Override
-	public ExecStartCmd withTty() {
-		return withTty(true);
-	}
-    
+    public ExecStartCmd withDetach(boolean detach) {
+        this.detach = detach;
+        return this;
+    }
+
+    @Override
+    public ExecStartCmd withTty(boolean tty) {
+        this.tty = tty;
+        return this;
+    }
+
+    @Override
+    public ExecStartCmd withDetach() {
+        return withDetach(true);
+    }
+
+    @Override
+    public ExecStartCmd withTty() {
+        return withTty(true);
+    }
+
     /**
-     * @throws com.github.dockerjava.api.NotFoundException No such exec instance
+     * @throws com.github.dockerjava.api.NotFoundException
+     *             No such exec instance
      */
     @Override
     public InputStream exec() throws NotFoundException {
         return super.exec();
     }
-    
+
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
index 69114dae8..3f8aad9e8 100644
--- a/src/main/java/com/github/dockerjava/core/command/FrameReader.java
+++ b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
@@ -83,6 +83,4 @@ public void close() throws IOException {
         inputStream.close();
     }
 
-
-
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java
index 767da2049..f2dd3ca82 100644
--- a/src/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java
@@ -6,13 +6,13 @@
 /**
  * Return Docker server info
  */
-public class InfoCmdImpl extends AbstrDockerCmd<InfoCmd, Info> implements InfoCmd  {
+public class InfoCmdImpl extends AbstrDockerCmd<InfoCmd, Info> implements InfoCmd {
 
-	public InfoCmdImpl(InfoCmd.Exec exec) {
-		super(exec);
-	}
-	
-	@Override
+    public InfoCmdImpl(InfoCmd.Exec exec) {
+        super(exec);
+    }
+
+    @Override
     public String toString() {
         return "info";
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
index 9215f233a..c3fe5f6d5 100644
--- a/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
@@ -9,37 +9,39 @@
 /**
  * Inspect the details of a container.
  */
-public class InspectContainerCmdImpl extends AbstrDockerCmd<InspectContainerCmd, InspectContainerResponse> implements InspectContainerCmd {
+public class InspectContainerCmdImpl extends AbstrDockerCmd<InspectContainerCmd, InspectContainerResponse> implements
+        InspectContainerCmd {
 
-	private String containerId;
+    private String containerId;
 
-	public InspectContainerCmdImpl(InspectContainerCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public InspectContainerCmdImpl(InspectContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public InspectContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
+    public InspectContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
 
     @Override
     public String toString() {
         return "inspect " + containerId;
     }
-    
+
     /**
-     * @throws NotFoundException No such container
+     * @throws NotFoundException
+     *             No such container
      */
-	@Override
+    @Override
     public InspectContainerResponse exec() throws NotFoundException {
-    	return super.exec();
+        return super.exec();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
index 1fd728622..55fad8c9c 100644
--- a/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
@@ -32,7 +32,8 @@ public String toString() {
     }
 
     /**
-     * @throws NotFoundException No such exec
+     * @throws NotFoundException
+     *             No such exec
      */
     @Override
     public InspectExecResponse exec() throws NotFoundException {
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
index 0b477e80e..3e28bd488 100644
--- a/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
@@ -6,41 +6,42 @@
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectImageResponse;
 
-
 /**
  * Inspect the details of an image.
  */
-public class InspectImageCmdImpl extends AbstrDockerCmd<InspectImageCmd, InspectImageResponse> implements InspectImageCmd  {
+public class InspectImageCmdImpl extends AbstrDockerCmd<InspectImageCmd, InspectImageResponse> implements
+        InspectImageCmd {
 
-	private String imageId;
+    private String imageId;
 
-	public InspectImageCmdImpl(InspectImageCmd.Exec exec, String imageId) {
-		super(exec);
-		withImageId(imageId);
-	}
+    public InspectImageCmdImpl(InspectImageCmd.Exec exec, String imageId) {
+        super(exec);
+        withImageId(imageId);
+    }
 
     @Override
-	public String getImageId() {
+    public String getImageId() {
         return imageId;
     }
 
     @Override
-	public InspectImageCmd withImageId(String imageId) {
-		checkNotNull(imageId, "imageId was not specified");
-		this.imageId = imageId;
-		return this;
-	}
+    public InspectImageCmd withImageId(String imageId) {
+        checkNotNull(imageId, "imageId was not specified");
+        this.imageId = imageId;
+        return this;
+    }
 
     @Override
     public String toString() {
         return "inspect " + imageId;
     }
-    
+
     /**
-     * @throws NotFoundException No such image
+     * @throws NotFoundException
+     *             No such image
      */
-	@Override
+    @Override
     public InspectImageResponse exec() throws NotFoundException {
-    	return super.exec();
+        return super.exec();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
index c6175a8a6..05e709f37 100644
--- a/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
@@ -5,53 +5,53 @@
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.KillContainerCmd;
 
-
 /**
  * Kill a running container.
  */
 public class KillContainerCmdImpl extends AbstrDockerCmd<KillContainerCmd, Void> implements KillContainerCmd {
 
-	private String containerId, signal;
+    private String containerId, signal;
 
-	public KillContainerCmdImpl(KillContainerCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public KillContainerCmdImpl(KillContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public String getSignal() {
+    public String getSignal() {
         return signal;
     }
 
     @Override
-	public KillContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
-
-	@Override
-	public KillContainerCmd withSignal(String signal) {
-		checkNotNull(signal, "signal was not specified");
-		this.signal = signal;
-		return this;
-	}
+    public KillContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
+
+    @Override
+    public KillContainerCmd withSignal(String signal) {
+        checkNotNull(signal, "signal was not specified");
+        this.signal = signal;
+        return this;
+    }
 
     @Override
     public String toString() {
         return "kill " + containerId;
     }
-    
+
     /**
-     * @throws NotFoundException No such container
+     * @throws NotFoundException
+     *             No such container
      */
-	@Override
+    @Override
     public Void exec() throws NotFoundException {
-    	return super.exec();
+        return super.exec();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
index 7144e767f..13bb02cfb 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
@@ -8,95 +8,97 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.model.Container;
 
-
 /**
  * List containers
  *
- * @param showAll - true or false, Show all containers. Only running containers are shown by default.
- * @param showSize - true or false, Show the containers sizes. This is false by default.
- * @param limit - Show `limit` last created containers, include non-running ones. There is no limit by default.
- * @param sinceId - Show only containers created since Id, include non-running ones.
- * @param beforeId - Show only containers created before Id, include non-running ones.
+ * @param showAll
+ *            - true or false, Show all containers. Only running containers are shown by default.
+ * @param showSize
+ *            - true or false, Show the containers sizes. This is false by default.
+ * @param limit
+ *            - Show `limit` last created containers, include non-running ones. There is no limit by default.
+ * @param sinceId
+ *            - Show only containers created since Id, include non-running ones.
+ * @param beforeId
+ *            - Show only containers created before Id, include non-running ones.
  *
  */
-public class ListContainersCmdImpl extends AbstrDockerCmd<ListContainersCmd, List<Container>> implements ListContainersCmd  {
-
-	private int limit = -1;
-	
-	private boolean showSize, showAll = false;
-	
-	private String sinceId, beforeId;
-	
-	public ListContainersCmdImpl(ListContainersCmd.Exec exec) {
-		super(exec);
-	}
+public class ListContainersCmdImpl extends AbstrDockerCmd<ListContainersCmd, List<Container>> implements
+        ListContainersCmd {
+
+    private int limit = -1;
+
+    private boolean showSize, showAll = false;
+
+    private String sinceId, beforeId;
+
+    public ListContainersCmdImpl(ListContainersCmd.Exec exec) {
+        super(exec);
+    }
 
     @Override
-	public int getLimit() {
+    public int getLimit() {
         return limit;
     }
 
     @Override
-	public boolean hasShowSizeEnabled() {
+    public boolean hasShowSizeEnabled() {
         return showSize;
     }
 
     @Override
-	public boolean hasShowAllEnabled() {
+    public boolean hasShowAllEnabled() {
         return showAll;
     }
 
     @Override
-	public String getSinceId() {
+    public String getSinceId() {
         return sinceId;
     }
 
     @Override
-	public String getBeforeId() {
+    public String getBeforeId() {
         return beforeId;
     }
 
     @Override
-	public ListContainersCmd withShowAll(boolean showAll) {
-		this.showAll = showAll;
-		return this;
-	}
-
-	@Override
-	public ListContainersCmd withShowSize(boolean showSize) {
-		this.showSize = showSize;
-		return this;
-	}
-
-	@Override
-	public ListContainersCmd withLimit(int limit) {
-		checkArgument(limit > 0, "limit must be greater 0");
-		this.limit = limit;
-		return this;
-	}
-
-	@Override
-	public ListContainersCmd withSince(String since) {
-		checkNotNull(since, "since was not specified");
-		this.sinceId = since;
-		return this;
-	}
-
-	@Override
-	public ListContainersCmd withBefore(String before) {
-		checkNotNull(before, "before was not specified");
-		this.beforeId = before;
-		return this;
-	}
+    public ListContainersCmd withShowAll(boolean showAll) {
+        this.showAll = showAll;
+        return this;
+    }
+
+    @Override
+    public ListContainersCmd withShowSize(boolean showSize) {
+        this.showSize = showSize;
+        return this;
+    }
+
+    @Override
+    public ListContainersCmd withLimit(int limit) {
+        checkArgument(limit > 0, "limit must be greater 0");
+        this.limit = limit;
+        return this;
+    }
+
+    @Override
+    public ListContainersCmd withSince(String since) {
+        checkNotNull(since, "since was not specified");
+        this.sinceId = since;
+        return this;
+    }
+
+    @Override
+    public ListContainersCmd withBefore(String before) {
+        checkNotNull(before, "before was not specified");
+        this.beforeId = before;
+        return this;
+    }
 
     @Override
     public String toString() {
-        return new StringBuilder("ps ")
-            .append(showAll ? "--all=true" : "")
-            .append(showSize ? "--size=true" : "")
-            .append(sinceId != null ? "--since " + sinceId : "")
-            .append(beforeId != null ? "--before " + beforeId : "")
-            .append(limit != -1 ? "-n " + limit : "")
-            .toString();
+        return new StringBuilder("ps ").append(showAll ? "--all=true" : "").append(showSize ? "--size=true" : "")
+                .append(sinceId != null ? "--since " + sinceId : "")
+                .append(beforeId != null ? "--before " + beforeId : "").append(limit != -1 ? "-n " + limit : "")
+                .toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
index 998dded5d..ddd4dc79f 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
@@ -10,47 +10,47 @@
 /**
  * List images
  *
- * @param showAll - Show all images (by default filter out the intermediate images used to build)
- * @param filters - a json encoded value of the filters (a map[string][]string) to process on the images list.
+ * @param showAll
+ *            - Show all images (by default filter out the intermediate images used to build)
+ * @param filters
+ *            - a json encoded value of the filters (a map[string][]string) to process on the images list.
  */
-public class ListImagesCmdImpl extends AbstrDockerCmd<ListImagesCmd, List<Image>> implements ListImagesCmd  {
+public class ListImagesCmdImpl extends AbstrDockerCmd<ListImagesCmd, List<Image>> implements ListImagesCmd {
 
-	private String filters;
+    private String filters;
 
-	private boolean showAll = false;
+    private boolean showAll = false;
 
-	public ListImagesCmdImpl(ListImagesCmd.Exec exec) {
-		super(exec);
-	}
+    public ListImagesCmdImpl(ListImagesCmd.Exec exec) {
+        super(exec);
+    }
 
     @Override
-	public String getFilters() {
+    public String getFilters() {
         return filters;
     }
 
     @Override
-	public boolean hasShowAllEnabled() {
+    public boolean hasShowAllEnabled() {
         return showAll;
     }
 
     @Override
-	public ListImagesCmd withShowAll(boolean showAll) {
-		this.showAll = showAll;
-		return this;
-	}
-
-	@Override
-	public ListImagesCmd withFilters(String filter) {
-		checkNotNull(filter, "filters have not been specified");
-		this.filters = filter;
-		return this;
-	}
+    public ListImagesCmd withShowAll(boolean showAll) {
+        this.showAll = showAll;
+        return this;
+    }
+
+    @Override
+    public ListImagesCmd withFilters(String filter) {
+        checkNotNull(filter, "filters have not been specified");
+        this.filters = filter;
+        return this;
+    }
 
     @Override
     public String toString() {
-        return new StringBuilder("images ")
-            .append(showAll ? "--all=true" : "")
-            .append(filters != null ? "--filter " + filters : "")
-            .toString();
+        return new StringBuilder("images ").append(showAll ? "--all=true" : "")
+                .append(filters != null ? "--filter " + filters : "").toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
index bd518ddb7..01d1e6494 100644
--- a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -20,29 +20,28 @@
  * @param stderr
  *            - true or false, includes stderr log. Defaults to false.
  * @param timestamps
- *            - true or false, if true, print timestamps for every log line.
- *            Defaults to false.
+ *            - true or false, if true, print timestamps for every log line. Defaults to false.
  * @param tail
- * 			  - `all` or `<number>`, Output specified number of lines at the end of logs
+ *            - `all` or `<number>`, Output specified number of lines at the end of logs
  */
 public class LogContainerCmdImpl extends AbstrDockerCmd<LogContainerCmd, Void> implements LogContainerCmd {
 
     private ResultCallback<Frame> resultCallback;
 
-	private String containerId;
+    private String containerId;
 
-	private int tail = -1;
+    private int tail = -1;
 
-	private boolean followStream, timestamps, stdout, stderr;
+    private boolean followStream, timestamps, stdout, stderr;
 
-	public LogContainerCmdImpl(LogContainerCmd.Exec exec, String containerId, ResultCallback<Frame> resultCallback) {
-		super(exec);
-		withContainerId(containerId);
-		withResultCallback(resultCallback);
-	}
+    public LogContainerCmdImpl(LogContainerCmd.Exec exec, String containerId, ResultCallback<Frame> resultCallback) {
+        super(exec);
+        withContainerId(containerId);
+        withResultCallback(resultCallback);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
@@ -59,110 +58,106 @@ public LogContainerCmd withResultCallback(ResultCallback<Frame> resultCallback)
     }
 
     @Override
-	public int getTail() {
+    public int getTail() {
         return tail;
     }
 
     @Override
-	public boolean hasFollowStreamEnabled() {
+    public boolean hasFollowStreamEnabled() {
         return followStream;
     }
 
     @Override
-	public boolean hasTimestampsEnabled() {
+    public boolean hasTimestampsEnabled() {
         return timestamps;
     }
 
     @Override
-	public boolean hasStdoutEnabled() {
+    public boolean hasStdoutEnabled() {
         return stdout;
     }
 
     @Override
-	public boolean hasStderrEnabled() {
+    public boolean hasStderrEnabled() {
         return stderr;
     }
 
     @Override
-	public LogContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
-
-	@Override
-	public LogContainerCmd withFollowStream() {
-		return withFollowStream(true);
-	}
+    public LogContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
 
-	@Override
-	public LogContainerCmd withFollowStream(boolean followStream) {
-		this.followStream = followStream;
-		return this;
-	}
+    @Override
+    public LogContainerCmd withFollowStream() {
+        return withFollowStream(true);
+    }
 
-	@Override
-	public LogContainerCmd withTimestamps() {
-		return withTimestamps(true);
-	}
+    @Override
+    public LogContainerCmd withFollowStream(boolean followStream) {
+        this.followStream = followStream;
+        return this;
+    }
 
-	@Override
-	public LogContainerCmd withTimestamps(boolean timestamps) {
-		this.timestamps = timestamps;
-		return this;
-	}
+    @Override
+    public LogContainerCmd withTimestamps() {
+        return withTimestamps(true);
+    }
 
-	@Override
-	public LogContainerCmd withStdOut() {
-		return withStdOut(true);
-	}
+    @Override
+    public LogContainerCmd withTimestamps(boolean timestamps) {
+        this.timestamps = timestamps;
+        return this;
+    }
 
-	@Override
-	public LogContainerCmd withStdOut(boolean stdout) {
-		this.stdout = stdout;
-		return this;
-	}
+    @Override
+    public LogContainerCmd withStdOut() {
+        return withStdOut(true);
+    }
 
-	@Override
-	public LogContainerCmd withStdErr() {
-		return withStdErr(true);
-	}
+    @Override
+    public LogContainerCmd withStdOut(boolean stdout) {
+        this.stdout = stdout;
+        return this;
+    }
 
-	@Override
-	public LogContainerCmd withStdErr(boolean stderr) {
-		this.stderr = stderr;
-		return this;
-	}
+    @Override
+    public LogContainerCmd withStdErr() {
+        return withStdErr(true);
+    }
 
-	@Override
-	public LogContainerCmd withTailAll() {
-		this.tail = -1;
-		return this;
-	}
+    @Override
+    public LogContainerCmd withStdErr(boolean stderr) {
+        this.stderr = stderr;
+        return this;
+    }
 
+    @Override
+    public LogContainerCmd withTailAll() {
+        this.tail = -1;
+        return this;
+    }
 
-	@Override
-	public LogContainerCmd withTail(int tail) {
-		this.tail = tail;
-		return this;
-	}
+    @Override
+    public LogContainerCmd withTail(int tail) {
+        this.tail = tail;
+        return this;
+    }
 
     @Override
     public String toString() {
-        return new StringBuilder("logs ")
-            .append(followStream ? "--follow=true" : "")
-            .append(timestamps ? "--timestamps=true" : "")
-            .append(containerId)
-            .toString();
+        return new StringBuilder("logs ").append(followStream ? "--follow=true" : "")
+                .append(timestamps ? "--timestamps=true" : "").append(containerId).toString();
     }
 
     /**
-     * @throws NotFoundException No such container
+     * @throws NotFoundException
+     *             No such container
      */
-	@Override
+    @Override
     public Void exec() throws NotFoundException {
-    	return super.exec();
+        return super.exec();
     }
 
-
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
index 5ea60fe86..81a30dcde 100644
--- a/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
@@ -8,42 +8,42 @@
 /**
  * Pause a container.
  *
- * @param containerId - Id of the container
+ * @param containerId
+ *            - Id of the container
  *
  */
 public class PauseContainerCmdImpl extends AbstrDockerCmd<PauseContainerCmd, Void> implements PauseContainerCmd {
 
-	private String containerId;
+    private String containerId;
 
-	public PauseContainerCmdImpl(PauseContainerCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public PauseContainerCmdImpl(PauseContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public PauseContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
+    public PauseContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
 
-	@Override
+    @Override
     public String toString() {
-        return new StringBuilder("pause ")
-            .append(containerId)
-            .toString();
+        return new StringBuilder("pause ").append(containerId).toString();
+    }
+
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public Void exec() throws NotFoundException {
+        return super.exec();
     }
-	
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public Void exec() throws NotFoundException {
-		return super.exec();
-	}
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java
index 15cc1f5b3..c9118a095 100644
--- a/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java
@@ -8,7 +8,7 @@
  */
 public class PingCmdImpl extends AbstrDockerCmd<PingCmd, Void> implements PingCmd {
 
-	public PingCmdImpl(PingCmd.Exec exec) {
-		super(exec);
-	}
+    public PingCmdImpl(PingCmd.Exec exec) {
+        super(exec);
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
index d1d4ee026..488562b99 100644
--- a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
@@ -16,52 +16,49 @@ public class PullImageCmdImpl extends AbstrAuthCfgDockerCmd<PullImageCmd, InputS
 
     private String repository, tag, registry;
 
-	public PullImageCmdImpl(PullImageCmd.Exec exec, AuthConfig authConfig, String repository) {
-		super(exec, authConfig);
-		withRepository(repository);
-	}
+    public PullImageCmdImpl(PullImageCmd.Exec exec, AuthConfig authConfig, String repository) {
+        super(exec, authConfig);
+        withRepository(repository);
+    }
 
     @Override
-	public String getRepository() {
+    public String getRepository() {
         return repository;
     }
 
     @Override
-	public String getTag() {
+    public String getTag() {
         return tag;
     }
 
     @Override
-	public String getRegistry() {
+    public String getRegistry() {
         return registry;
     }
 
     @Override
-	public PullImageCmd withRepository(String repository) {
-		checkNotNull(repository, "repository was not specified");
-		this.repository = repository;
-		return this;
-	}
+    public PullImageCmd withRepository(String repository) {
+        checkNotNull(repository, "repository was not specified");
+        this.repository = repository;
+        return this;
+    }
 
-	@Override
-	public PullImageCmd withTag(String tag) {
-		checkNotNull(tag, "tag was not specified");
-		this.tag = tag;
-		return this;
-	}
+    @Override
+    public PullImageCmd withTag(String tag) {
+        checkNotNull(tag, "tag was not specified");
+        this.tag = tag;
+        return this;
+    }
 
-	@Override
-	public PullImageCmd withRegistry(String registry) {
-		checkNotNull(registry, "registry was not specified");
-		this.registry = registry;
-		return this;
-	}
+    @Override
+    public PullImageCmd withRegistry(String registry) {
+        checkNotNull(registry, "registry was not specified");
+        this.registry = registry;
+        return this;
+    }
 
     @Override
     public String toString() {
-        return new StringBuilder("pull ")
-            .append(repository)
-            .append(tag != null ? ":" + tag : "")
-            .toString();
+        return new StringBuilder("pull ").append(repository).append(tag != null ? ":" + tag : "").toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
index a775bffd5..76bbe46b6 100644
--- a/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
@@ -8,20 +8,23 @@
 /**
  * Push the latest image to the repository.
  *
- * @param name The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
+ * @param name
+ *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
  */
-public class PushImageCmdImpl extends AbstrAuthCfgDockerCmd<PushImageCmd, PushImageCmd.Response> implements PushImageCmd  {
+public class PushImageCmdImpl extends AbstrAuthCfgDockerCmd<PushImageCmd, PushImageCmd.Response> implements
+        PushImageCmd {
 
     private String name;
+
     private String tag;
 
     public PushImageCmdImpl(PushImageCmd.Exec exec, String name) {
-    	super(exec);
-    	withName(name);
+        super(exec);
+        withName(name);
     }
 
     @Override
-	public String getName() {
+    public String getName() {
         return name;
     }
 
@@ -31,17 +34,19 @@ public String getTag() {
     }
 
     /**
-	 * @param name The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
-	 */
-	@Override
-	public PushImageCmd withName(String name) {
-		checkNotNull(name, "name was not specified");
-		this.name = name;
-		return this;
-	}
+     * @param name
+     *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
+     */
+    @Override
+    public PushImageCmd withName(String name) {
+        checkNotNull(name, "name was not specified");
+        this.name = name;
+        return this;
+    }
 
     /**
-     * @param tag The image's tag. Can be null or empty.
+     * @param tag
+     *            The image's tag. Can be null or empty.
      */
     @Override
     public PushImageCmd withTag(String tag) {
@@ -52,16 +57,15 @@ public PushImageCmd withTag(String tag) {
 
     @Override
     public String toString() {
-        return new StringBuilder("push ")
-            .append(name)
-            .toString();
+        return new StringBuilder("push ").append(name).toString();
     }
-   
+
     /**
-     * @throws NotFoundException No such image
+     * @throws NotFoundException
+     *             No such image
      */
     @Override
     public Response exec() throws NotFoundException {
-    	return super.exec();
+        return super.exec();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
index 7cd063956..ff23023d2 100644
--- a/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
@@ -8,72 +8,73 @@
 /**
  * Remove a container.
  * 
- * @param removeVolumes - true or false, Remove the volumes associated to the container. Defaults to false
- * @param force - true or false, Removes the container even if it was running. Defaults to false
+ * @param removeVolumes
+ *            - true or false, Remove the volumes associated to the container. Defaults to false
+ * @param force
+ *            - true or false, Removes the container even if it was running. Defaults to false
  */
-public class RemoveContainerCmdImpl extends	AbstrDockerCmd<RemoveContainerCmd, Void> implements RemoveContainerCmd {
+public class RemoveContainerCmdImpl extends AbstrDockerCmd<RemoveContainerCmd, Void> implements RemoveContainerCmd {
 
-	private String containerId;
+    private String containerId;
 
-	private boolean removeVolumes, force;
+    private boolean removeVolumes, force;
 
-	public RemoveContainerCmdImpl(RemoveContainerCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public RemoveContainerCmdImpl(RemoveContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
-	@Override
-	public String getContainerId() {
-		return containerId;
-	}
+    @Override
+    public String getContainerId() {
+        return containerId;
+    }
 
-	@Override
-	public boolean hasRemoveVolumesEnabled() {
-		return removeVolumes;
-	}
+    @Override
+    public boolean hasRemoveVolumesEnabled() {
+        return removeVolumes;
+    }
 
-	@Override
-	public boolean hasForceEnabled() {
-		return force;
-	}
+    @Override
+    public boolean hasForceEnabled() {
+        return force;
+    }
 
-	@Override
-	public RemoveContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
+    @Override
+    public RemoveContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
 
-	@Override
-	public RemoveContainerCmd withRemoveVolumes(boolean removeVolumes) {
-		this.removeVolumes = removeVolumes;
-		return this;
-	}
+    @Override
+    public RemoveContainerCmd withRemoveVolumes(boolean removeVolumes) {
+        this.removeVolumes = removeVolumes;
+        return this;
+    }
 
-	@Override
-	public RemoveContainerCmd withForce() {
-		return withForce(true);
-	}
+    @Override
+    public RemoveContainerCmd withForce() {
+        return withForce(true);
+    }
 
-	@Override
-	public RemoveContainerCmd withForce(boolean force) {
-		this.force = force;
-		return this;
-	}
+    @Override
+    public RemoveContainerCmd withForce(boolean force) {
+        this.force = force;
+        return this;
+    }
 
-	@Override
-	public String toString() {
-		return new StringBuilder("rm ")
-				.append(removeVolumes ? "--volumes=true" : "")
-				.append(force ? "--force=true" : "").append(containerId)
-				.toString();
-	}
+    @Override
+    public String toString() {
+        return new StringBuilder("rm ").append(removeVolumes ? "--volumes=true" : "")
+                .append(force ? "--force=true" : "").append(containerId).toString();
+    }
 
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public Void exec() throws NotFoundException {
-		return super.exec();
-	}
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public Void exec() throws NotFoundException {
+        return super.exec();
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
index 87e096aae..ee9e7f33b 100644
--- a/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
@@ -12,73 +12,71 @@
  */
 public class RemoveImageCmdImpl extends AbstrDockerCmd<RemoveImageCmd, Void> implements RemoveImageCmd {
 
-	private String imageId;
+    private String imageId;
 
-	private boolean force, noPrune;
+    private boolean force, noPrune;
 
-	public RemoveImageCmdImpl(RemoveImageCmd.Exec exec, String imageId) {
-		super(exec);
-		withImageId(imageId);
-	}
+    public RemoveImageCmdImpl(RemoveImageCmd.Exec exec, String imageId) {
+        super(exec);
+        withImageId(imageId);
+    }
 
     @Override
-	public String getImageId() {
+    public String getImageId() {
         return imageId;
     }
 
     @Override
-	public boolean hasForceEnabled() {
+    public boolean hasForceEnabled() {
         return force;
     }
 
     @Override
-	public boolean hasNoPruneEnabled() {
+    public boolean hasNoPruneEnabled() {
         return noPrune;
     }
 
     @Override
-	public RemoveImageCmd withImageId(String imageId) {
-		checkNotNull(imageId, "imageId was not specified");
-		this.imageId = imageId;
-		return this;
-	}
-
-	@Override
-	public RemoveImageCmd withForce() {
-		return withForce(true);
-	}
-
-	@Override
-	public RemoveImageCmd withForce(boolean force) {
-		this.force = force;
-		return this;
-	}
-	
-	@Override
-	public RemoveImageCmd withNoPrune() {
-		return withNoPrune(true);
-	}
-
-	@Override
-	public RemoveImageCmd withNoPrune(boolean noPrune) {
-		this.noPrune = noPrune;
-		return this;
-	}
+    public RemoveImageCmd withImageId(String imageId) {
+        checkNotNull(imageId, "imageId was not specified");
+        this.imageId = imageId;
+        return this;
+    }
+
+    @Override
+    public RemoveImageCmd withForce() {
+        return withForce(true);
+    }
+
+    @Override
+    public RemoveImageCmd withForce(boolean force) {
+        this.force = force;
+        return this;
+    }
+
+    @Override
+    public RemoveImageCmd withNoPrune() {
+        return withNoPrune(true);
+    }
+
+    @Override
+    public RemoveImageCmd withNoPrune(boolean noPrune) {
+        this.noPrune = noPrune;
+        return this;
+    }
 
     @Override
     public String toString() {
-        return new StringBuilder("rmi ")
-            .append(noPrune ? "--no-prune=true" : "")
-            .append(force ? "--force=true" : "")
-            .append(imageId)
-            .toString();
+        return new StringBuilder("rmi ").append(noPrune ? "--no-prune=true" : "").append(force ? "--force=true" : "")
+                .append(imageId).toString();
     }
-    
+
     /**
-     * @throws NotFoundException No such image
+     * @throws NotFoundException
+     *             No such image
      */
-	@Override
+    @Override
     public Void exec() throws NotFoundException {
-    	return super.exec();
+        return super.exec();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
index adcac9b4c..4766dfdb4 100644
--- a/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
@@ -9,57 +9,56 @@
 /**
  * Restart a running container.
  *
- * @param timeout - Timeout in seconds before killing the container. Defaults to 10 seconds.
+ * @param timeout
+ *            - Timeout in seconds before killing the container. Defaults to 10 seconds.
  *
  */
 public class RestartContainerCmdImpl extends AbstrDockerCmd<RestartContainerCmd, Void> implements RestartContainerCmd {
 
-	private String containerId;
+    private String containerId;
 
-	private int timeout = 10;
+    private int timeout = 10;
 
-	public RestartContainerCmdImpl(RestartContainerCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public RestartContainerCmdImpl(RestartContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public int getTimeout() {
+    public int getTimeout() {
         return timeout;
     }
 
     @Override
-	public RestartContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
+    public RestartContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
 
-	@Override
-	public RestartContainerCmd withtTimeout(int timeout) {
-		checkArgument(timeout >= 0, "timeout must be greater or equal 0");
-		this.timeout = timeout;
-		return this;
-	}
+    @Override
+    public RestartContainerCmd withtTimeout(int timeout) {
+        checkArgument(timeout >= 0, "timeout must be greater or equal 0");
+        this.timeout = timeout;
+        return this;
+    }
 
     @Override
     public String toString() {
-        return new StringBuilder("restart ")
-            .append("--time=" + timeout + " ")
-            .append(containerId)
-            .toString();
+        return new StringBuilder("restart ").append("--time=" + timeout + " ").append(containerId).toString();
     }
-    
+
     /**
-     * @throws NotFoundException No such container
+     * @throws NotFoundException
+     *             No such container
      */
-	@Override
+    @Override
     public Void exec() throws NotFoundException {
-    	return super.exec();
+        return super.exec();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
index 30bb13b2f..ab87c2ea8 100644
--- a/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
@@ -9,6 +9,7 @@
 
 public class SaveImageCmdImpl extends AbstrDockerCmd<SaveImageCmd, InputStream> implements SaveImageCmd {
     private String name;
+
     private String tag;
 
     public SaveImageCmdImpl(SaveImageCmd.Exec exec, String name) {
@@ -27,7 +28,8 @@ public String getTag() {
     }
 
     /**
-     * @param name The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
+     * @param name
+     *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
      */
     @Override
     public SaveImageCmd withName(String name) {
@@ -37,7 +39,8 @@ public SaveImageCmd withName(String name) {
     }
 
     /**
-     * @param tag The image's tag. Can be null or empty.
+     * @param tag
+     *            The image's tag. Can be null or empty.
      */
     @Override
     public SaveImageCmd withTag(String tag) {
@@ -48,13 +51,12 @@ public SaveImageCmd withTag(String tag) {
 
     @Override
     public String toString() {
-        return new StringBuilder("get ")
-                .append(name)
-                .toString();
+        return new StringBuilder("get ").append(name).toString();
     }
 
     /**
-     * @throws com.github.dockerjava.api.NotFoundException No such image
+     * @throws com.github.dockerjava.api.NotFoundException
+     *             No such image
      */
     @Override
     public InputStream exec() throws NotFoundException {
diff --git a/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
index 82c94e49f..6630377c8 100644
--- a/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
@@ -10,34 +10,33 @@
 /**
  * Search images
  *
- * @param term - search term
+ * @param term
+ *            - search term
  *
  */
-public class SearchImagesCmdImpl extends AbstrDockerCmd<SearchImagesCmd, List<SearchItem>> implements SearchImagesCmd  {
+public class SearchImagesCmdImpl extends AbstrDockerCmd<SearchImagesCmd, List<SearchItem>> implements SearchImagesCmd {
 
-	private String term;
+    private String term;
 
-	public SearchImagesCmdImpl(SearchImagesCmd.Exec exec, String term) {
-		super(exec);
-		withTerm(term);
-	}
+    public SearchImagesCmdImpl(SearchImagesCmd.Exec exec, String term) {
+        super(exec);
+        withTerm(term);
+    }
 
     @Override
-	public String getTerm() {
+    public String getTerm() {
         return term;
     }
 
     @Override
-	public SearchImagesCmd withTerm(String term) {
-		checkNotNull(term, "term was not specified");
-		this.term = term;
-		return this;
-	}
+    public SearchImagesCmd withTerm(String term) {
+        checkNotNull(term, "term was not specified");
+        this.term = term;
+        return this;
+    }
 
     @Override
     public String toString() {
-        return new StringBuilder("search ")
-            .append(term)
-            .toString();
+        return new StringBuilder("search ").append(term).toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
index e961bf8ba..28373e2ce 100644
--- a/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
@@ -10,59 +10,60 @@
 /**
  * Stop a running container.
  *
- * @param containerId - Id of the container
- * @param timeout - Timeout in seconds before killing the container. Defaults to 10 seconds.
+ * @param containerId
+ *            - Id of the container
+ * @param timeout
+ *            - Timeout in seconds before killing the container. Defaults to 10 seconds.
  *
  */
 public class StopContainerCmdImpl extends AbstrDockerCmd<StopContainerCmd, Void> implements StopContainerCmd {
 
-	private String containerId;
+    private String containerId;
 
-	private int timeout = 10;
+    private int timeout = 10;
 
-	public StopContainerCmdImpl(StopContainerCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public StopContainerCmdImpl(StopContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public int getTimeout() {
+    public int getTimeout() {
         return timeout;
     }
 
     @Override
-	public StopContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
+    public StopContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
 
-	@Override
-	public StopContainerCmd withTimeout(int timeout) {
-		checkArgument(timeout >= 0, "timeout must be greater or equal 0");
-		this.timeout = timeout;
-		return this;
-	}
+    @Override
+    public StopContainerCmd withTimeout(int timeout) {
+        checkArgument(timeout >= 0, "timeout must be greater or equal 0");
+        this.timeout = timeout;
+        return this;
+    }
 
     @Override
     public String toString() {
-        return new StringBuilder("stop ")
-            .append("--time=" + timeout + " ")
-            .append(containerId)
-            .toString();
+        return new StringBuilder("stop ").append("--time=" + timeout + " ").append(containerId).toString();
     }
-    
+
     /**
-	 * @throws NotFoundException No such container
-	 * @throws NotModifiedException Container already stopped
-	 */
-	@Override
-	public Void exec() throws NotFoundException, NotModifiedException {
-		return super.exec();
-	}
+     * @throws NotFoundException
+     *             No such container
+     * @throws NotModifiedException
+     *             Container already stopped
+     */
+    @Override
+    public Void exec() throws NotFoundException, NotModifiedException {
+        return super.exec();
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
index 8655ddfe8..e31151147 100644
--- a/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
@@ -4,87 +4,86 @@
 
 import com.github.dockerjava.api.command.TagImageCmd;
 
-
 /**
  * Tag an image into a repository
  *
- * @param image			The local image to tag (either a name or an id)
- * @param repository 	The repository to tag in
- * @param force         (not documented)
+ * @param image
+ *            The local image to tag (either a name or an id)
+ * @param repository
+ *            The repository to tag in
+ * @param force
+ *            (not documented)
  * 
  */
-public class TagImageCmdImpl extends AbstrDockerCmd<TagImageCmd, Void> implements TagImageCmd  {
+public class TagImageCmdImpl extends AbstrDockerCmd<TagImageCmd, Void> implements TagImageCmd {
 
-	private String imageId, repository, tag;
+    private String imageId, repository, tag;
 
-	private boolean force;
+    private boolean force;
 
-	public TagImageCmdImpl(TagImageCmd.Exec exec, String imageId, String repository, String tag) {
-		super(exec);
-		withImageId(imageId);
-		withRepository(repository);
-		withTag(tag);
-	}
+    public TagImageCmdImpl(TagImageCmd.Exec exec, String imageId, String repository, String tag) {
+        super(exec);
+        withImageId(imageId);
+        withRepository(repository);
+        withTag(tag);
+    }
 
     @Override
-	public String getImageId() {
+    public String getImageId() {
         return imageId;
     }
 
     @Override
-	public String getRepository() {
+    public String getRepository() {
         return repository;
     }
 
     @Override
-	public String getTag() {
+    public String getTag() {
         return tag;
     }
 
     @Override
-	public boolean hasForceEnabled() {
+    public boolean hasForceEnabled() {
         return force;
     }
 
     @Override
-	public TagImageCmd withImageId(String imageId) {
-		checkNotNull(imageId, "imageId was not specified");
-		this.imageId = imageId;
-		return this;
-	}
-
-	@Override
-	public TagImageCmd withRepository(String repository) {
-		checkNotNull(repository, "repository was not specified");
-		this.repository = repository;
-		return this;
-	}
-
-	@Override
-	public TagImageCmd withTag(String tag) {
-		checkNotNull(tag, "tag was not specified");
-		this.tag = tag;
-		return this;
-	}
-
-	@Override
-	public TagImageCmd withForce() {
-		return withForce(true);
-	}
-
-	@Override
-	public TagImageCmd withForce(boolean force) {
-		this.force = force;
-		return this;
-	}
+    public TagImageCmd withImageId(String imageId) {
+        checkNotNull(imageId, "imageId was not specified");
+        this.imageId = imageId;
+        return this;
+    }
+
+    @Override
+    public TagImageCmd withRepository(String repository) {
+        checkNotNull(repository, "repository was not specified");
+        this.repository = repository;
+        return this;
+    }
+
+    @Override
+    public TagImageCmd withTag(String tag) {
+        checkNotNull(tag, "tag was not specified");
+        this.tag = tag;
+        return this;
+    }
+
+    @Override
+    public TagImageCmd withForce() {
+        return withForce(true);
+    }
+
+    @Override
+    public TagImageCmd withForce(boolean force) {
+        this.force = force;
+        return this;
+    }
 
     @Override
     public String toString() {
-        return new StringBuilder("tag ")
-            .append(force ? "--force=true " : "")
-            .append(repository != null ? repository + "/" : "")
-            .append(imageId)
-            .append(tag != null ? ":" + tag : "")
-            .toString();
+        return new StringBuilder("tag ").append(force ? "--force=true " : "")
+                .append(repository != null ? repository + "/" : "").append(imageId)
+                .append(tag != null ? ":" + tag : "").toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
index 5f7190fb4..b4414f29e 100644
--- a/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
@@ -9,55 +9,53 @@
 /**
  * List processes running inside a container
  */
-public class TopContainerCmdImpl extends AbstrDockerCmd<TopContainerCmd, TopContainerResponse> implements TopContainerCmd {
+public class TopContainerCmdImpl extends AbstrDockerCmd<TopContainerCmd, TopContainerResponse> implements
+        TopContainerCmd {
 
-	private String containerId;
+    private String containerId;
 
-	private String psArgs;
+    private String psArgs;
 
-	public TopContainerCmdImpl(TopContainerCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public TopContainerCmdImpl(TopContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public String getPsArgs() {
+    public String getPsArgs() {
         return psArgs;
     }
 
     @Override
-	public TopContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
-
+    public TopContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
 
-	@Override
-	public TopContainerCmd withPsArgs(String psArgs) {
-		checkNotNull(psArgs, "psArgs was not specified");
-		this.psArgs = psArgs;
-		return this;
-	}
+    @Override
+    public TopContainerCmd withPsArgs(String psArgs) {
+        checkNotNull(psArgs, "psArgs was not specified");
+        this.psArgs = psArgs;
+        return this;
+    }
 
     @Override
     public String toString() {
-        return new StringBuilder("top ")
-            .append(containerId)
-            .append(psArgs != null ? " " + psArgs : "")
-            .toString();
+        return new StringBuilder("top ").append(containerId).append(psArgs != null ? " " + psArgs : "").toString();
     }
 
     /**
-     * @throws NotFoundException No such container
+     * @throws NotFoundException
+     *             No such container
      */
-	@Override
+    @Override
     public TopContainerResponse exec() throws NotFoundException {
-    	return super.exec();
+        return super.exec();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
index 92d715bcc..583d519c8 100644
--- a/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
@@ -8,42 +8,42 @@
 /**
  * Unpause a container.
  *
- * @param containerId - Id of the container
+ * @param containerId
+ *            - Id of the container
  *
  */
 public class UnpauseContainerCmdImpl extends AbstrDockerCmd<UnpauseContainerCmd, Void> implements UnpauseContainerCmd {
 
-	private String containerId;
+    private String containerId;
 
-	public UnpauseContainerCmdImpl(UnpauseContainerCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public UnpauseContainerCmdImpl(UnpauseContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public UnpauseContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
+    public UnpauseContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
 
-	@Override
+    @Override
     public String toString() {
-        return new StringBuilder("pause ")
-            .append(containerId)
-            .toString();
+        return new StringBuilder("pause ").append(containerId).toString();
+    }
+
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public Void exec() throws NotFoundException {
+        return super.exec();
     }
-	
-	/**
-	 * @throws NotFoundException No such container
-	 */
-	@Override
-	public Void exec() throws NotFoundException {
-		return super.exec();
-	}
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java
index 211ed1406..67f46ce3a 100644
--- a/src/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java
@@ -6,14 +6,14 @@
 /**
  * Returns the Docker version info.
  */
-public class VersionCmdImpl extends AbstrDockerCmd<VersionCmd, Version> implements VersionCmd  {
+public class VersionCmdImpl extends AbstrDockerCmd<VersionCmd, Version> implements VersionCmd {
 
-	 @Override
+    @Override
     public String toString() {
         return "version";
-    }   
-    
+    }
+
     public VersionCmdImpl(VersionCmd.Exec exec) {
-    	super(exec);
-	}
+        super(exec);
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
index d6250cc6f..702eebd33 100644
--- a/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
@@ -11,24 +11,24 @@
  */
 public class WaitContainerCmdImpl extends AbstrDockerCmd<WaitContainerCmd, Integer> implements WaitContainerCmd {
 
-	private String containerId;
+    private String containerId;
 
-	public WaitContainerCmdImpl(WaitContainerCmd.Exec exec, String containerId) {
-		super(exec);
-		withContainerId(containerId);
-	}
+    public WaitContainerCmdImpl(WaitContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
 
     @Override
-	public String getContainerId() {
+    public String getContainerId() {
         return containerId;
     }
 
     @Override
-	public WaitContainerCmd withContainerId(String containerId) {
-		checkNotNull(containerId, "containerId was not specified");
-		this.containerId = containerId;
-		return this;
-	}
+    public WaitContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
 
     @Override
     public String toString() {
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 802299a7c..5997bbefa 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -31,213 +31,201 @@
  */
 public class Dockerfile {
 
-  public final File dockerFile;
+    public final File dockerFile;
 
-  public Dockerfile(File dockerFile) {
+    public Dockerfile(File dockerFile) {
 
-    if (!dockerFile.exists()) {
-      throw new IllegalStateException(
-          String.format("Dockerfile %s does not exist", dockerFile.getAbsolutePath()));
-    }
-
-    if (!dockerFile.isFile()) {
-      throw new IllegalStateException(
-          String.format("Dockerfile %s is not a file", dockerFile.getAbsolutePath()));
-    }
-
-    this.dockerFile = dockerFile;
-
-  }
-
-  private static class LineTransformer
-      implements Function<String, Optional<? extends DockerfileStatement>> {
+        if (!dockerFile.exists()) {
+            throw new IllegalStateException(String.format("Dockerfile %s does not exist", dockerFile.getAbsolutePath()));
+        }
 
-    private int line = 0;
+        if (!dockerFile.isFile()) {
+            throw new IllegalStateException(String.format("Dockerfile %s is not a file", dockerFile.getAbsolutePath()));
+        }
 
-    @Override
-    public Optional<? extends DockerfileStatement> apply(String input) {
-      try {
-        line++;
-        return DockerfileStatement.createFromLine(input);
+        this.dockerFile = dockerFile;
 
-      } catch (Exception ex) {
-        throw new DockerClientException("Error on dockerfile line " + line);
-      }
     }
-  }
 
-  public Iterable<DockerfileStatement> getStatements() throws IOException {
-    Collection<String> dockerFileContent = FileUtils.readLines(dockerFile);
+    private static class LineTransformer implements Function<String, Optional<? extends DockerfileStatement>> {
 
-    if (dockerFileContent.size() <= 0) {
-      throw new DockerClientException(String.format(
-          "Dockerfile %s is empty", dockerFile));
-    }
+        private int line = 0;
 
-    Collection<Optional<? extends DockerfileStatement>> optionals = Collections2
-        .transform(dockerFileContent, new LineTransformer());
-
-    return Optional.presentInstances(optionals);
-  }
-
-  public List<String> getIgnores() throws IOException {
-    List<String> ignores = new ArrayList<String>();
-    File dockerIgnoreFile = new File(getDockerFolder(), ".dockerignore");
-    if (dockerIgnoreFile.exists()) {
-      int lineNumber = 0;
-      List<String> dockerIgnoreFileContent = FileUtils.readLines(dockerIgnoreFile);
-      for (String pattern : dockerIgnoreFileContent) {
-        lineNumber++;
-        pattern = pattern.trim();
-        if (pattern.isEmpty()) {
-          continue; // skip empty lines
-        }
-        pattern = FilenameUtils.normalize(pattern);
-        try {
-          // validate pattern and make sure we aren't excluding Dockerfile
-          if (GoLangFileMatch.match(pattern, "Dockerfile")) {
-            throw new DockerClientException(
-                String.format(
-                    "Dockerfile is excluded by pattern '%s' on line %s in .dockerignore file",
-                    pattern, lineNumber));
-          }
-          ignores.add(pattern);
-        } catch (GoLangFileMatchException e) {
-          throw new DockerClientException(String.format(
-              "Invalid pattern '%s' on line %s in .dockerignore file", pattern, lineNumber));
+        @Override
+        public Optional<? extends DockerfileStatement> apply(String input) {
+            try {
+                line++;
+                return DockerfileStatement.createFromLine(input);
+
+            } catch (Exception ex) {
+                throw new DockerClientException("Error on dockerfile line " + line);
+            }
         }
-      }
     }
-    return ignores;
-  }
 
+    public Iterable<DockerfileStatement> getStatements() throws IOException {
+        Collection<String> dockerFileContent = FileUtils.readLines(dockerFile);
 
-  public ScannedResult parse() throws IOException {
-    return new ScannedResult();
-  }
-
+        if (dockerFileContent.size() <= 0) {
+            throw new DockerClientException(String.format("Dockerfile %s is empty", dockerFile));
+        }
 
-  public File getDockerFolder() {
-    return dockerFile.getParentFile();
-  }
+        Collection<Optional<? extends DockerfileStatement>> optionals = Collections2.transform(dockerFileContent,
+                new LineTransformer());
 
+        return Optional.presentInstances(optionals);
+    }
 
-  /**
-   * Result of scanning / parsing a docker file.
-   */
-  public class ScannedResult {
+    public List<String> getIgnores() throws IOException {
+        List<String> ignores = new ArrayList<String>();
+        File dockerIgnoreFile = new File(getDockerFolder(), ".dockerignore");
+        if (dockerIgnoreFile.exists()) {
+            int lineNumber = 0;
+            List<String> dockerIgnoreFileContent = FileUtils.readLines(dockerIgnoreFile);
+            for (String pattern : dockerIgnoreFileContent) {
+                lineNumber++;
+                pattern = pattern.trim();
+                if (pattern.isEmpty()) {
+                    continue; // skip empty lines
+                }
+                pattern = FilenameUtils.normalize(pattern);
+                try {
+                    // validate pattern and make sure we aren't excluding Dockerfile
+                    if (GoLangFileMatch.match(pattern, "Dockerfile")) {
+                        throw new DockerClientException(String.format(
+                                "Dockerfile is excluded by pattern '%s' on line %s in .dockerignore file", pattern,
+                                lineNumber));
+                    }
+                    ignores.add(pattern);
+                } catch (GoLangFileMatchException e) {
+                    throw new DockerClientException(String.format(
+                            "Invalid pattern '%s' on line %s in .dockerignore file", pattern, lineNumber));
+                }
+            }
+        }
+        return ignores;
+    }
 
-    final List<String> ignores;
-    final Map<String, String> environmentMap = new HashMap<String, String>();
-    final List<File> filesToAdd = new ArrayList<File>();
+    public ScannedResult parse() throws IOException {
+        return new ScannedResult();
+    }
 
-    public InputStream buildDockerFolderTar() {
-        return buildDockerFolderTar(getDockerFolder());
+    public File getDockerFolder() {
+        return dockerFile.getParentFile();
     }
 
-    public InputStream buildDockerFolderTar(File directory) {
+    /**
+     * Result of scanning / parsing a docker file.
+     */
+    public class ScannedResult {
 
-      // ARCHIVE TAR
-      File dockerFolderTar = null;
+        final List<String> ignores;
 
-      try {
-        String archiveNameWithOutExtension = UUID.randomUUID().toString();
+        final Map<String, String> environmentMap = new HashMap<String, String>();
 
-        dockerFolderTar = CompressArchiveUtil.archiveTARFiles(directory,
-                                                              filesToAdd,
-                                                              archiveNameWithOutExtension);
-        return FileUtils.openInputStream(dockerFolderTar);
+        final List<File> filesToAdd = new ArrayList<File>();
 
-      } catch (IOException ex) {
-        FileUtils.deleteQuietly(dockerFolderTar);
-        throw new DockerClientException(
-            "Error occurred while preparing Docker context folder.", ex);
-      }
-    }
+        public InputStream buildDockerFolderTar() {
+            return buildDockerFolderTar(getDockerFolder());
+        }
 
-    @Override
-    public String toString() {
-      return Objects.toStringHelper(this)
-          .add("ignores", ignores)
-          .add("environmentMap", environmentMap)
-          .add("filesToAdd", filesToAdd)
-          .toString();
-    }
+        public InputStream buildDockerFolderTar(File directory) {
 
-    public ScannedResult() throws IOException {
+            // ARCHIVE TAR
+            File dockerFolderTar = null;
 
-      ignores = getIgnores();
-      filesToAdd.add(dockerFile);
+            try {
+                String archiveNameWithOutExtension = UUID.randomUUID().toString();
 
-      for (DockerfileStatement statement : getStatements()) {
-        if (statement instanceof DockerfileStatement.Env) {
-          processEnvStatement((DockerfileStatement.Env) statement);
-        } else if (statement instanceof DockerfileStatement.Add) {
-          processAddStatement((DockerfileStatement.Add) statement);
-        }
-      }
-    }
+                dockerFolderTar = CompressArchiveUtil.archiveTARFiles(directory, filesToAdd,
+                        archiveNameWithOutExtension);
+                return FileUtils.openInputStream(dockerFolderTar);
 
-    private void processAddStatement(DockerfileStatement.Add add) throws IOException {
+            } catch (IOException ex) {
+                FileUtils.deleteQuietly(dockerFolderTar);
+                throw new DockerClientException("Error occurred while preparing Docker context folder.", ex);
+            }
+        }
 
-      add = add.transform(environmentMap);
+        @Override
+        public String toString() {
+            return Objects.toStringHelper(this).add("ignores", ignores).add("environmentMap", environmentMap)
+                    .add("filesToAdd", filesToAdd).toString();
+        }
 
-      if (add.isFileResource()) {
+        public ScannedResult() throws IOException {
 
-        File dockerFolder = getDockerFolder();
-        String resource = add.source;
+            ignores = getIgnores();
+            filesToAdd.add(dockerFile);
 
-        File src = new File(resource);
-        if (!src.isAbsolute()) {
-          src = new File(dockerFolder, resource);
-        } else {
-          throw new DockerClientException(String.format(
-              "Source file %s must be relative to %s",
-              src, dockerFolder));
+            for (DockerfileStatement statement : getStatements()) {
+                if (statement instanceof DockerfileStatement.Env) {
+                    processEnvStatement((DockerfileStatement.Env) statement);
+                } else if (statement instanceof DockerfileStatement.Add) {
+                    processAddStatement((DockerfileStatement.Add) statement);
+                }
+            }
         }
 
-        if (src.exists()) {
-          src = src.getCanonicalFile();
-          if (src.isDirectory()) {
-            Collection<File> files = FileUtils.listFiles(src, new GoLangMatchFileFilter(src, ignores), TrueFileFilter.INSTANCE);
-            filesToAdd.addAll(files);
-          } else if (!GoLangFileMatch.match(ignores, FilePathUtil.relativize(dockerFolder, src))) {
-            filesToAdd.add(src);
-          } else {
-            throw new DockerClientException(String.format("Source file %s is excluded by .dockerignore file", src));
-          }            
-        } else {
-          filesToAdd.addAll(resolveWildcards(src, ignores));
+        private void processAddStatement(DockerfileStatement.Add add) throws IOException {
+
+            add = add.transform(environmentMap);
+
+            if (add.isFileResource()) {
+
+                File dockerFolder = getDockerFolder();
+                String resource = add.source;
+
+                File src = new File(resource);
+                if (!src.isAbsolute()) {
+                    src = new File(dockerFolder, resource);
+                } else {
+                    throw new DockerClientException(String.format("Source file %s must be relative to %s", src,
+                            dockerFolder));
+                }
+
+                if (src.exists()) {
+                    src = src.getCanonicalFile();
+                    if (src.isDirectory()) {
+                        Collection<File> files = FileUtils.listFiles(src, new GoLangMatchFileFilter(src, ignores),
+                                TrueFileFilter.INSTANCE);
+                        filesToAdd.addAll(files);
+                    } else if (!GoLangFileMatch.match(ignores, FilePathUtil.relativize(dockerFolder, src))) {
+                        filesToAdd.add(src);
+                    } else {
+                        throw new DockerClientException(String.format(
+                                "Source file %s is excluded by .dockerignore file", src));
+                    }
+                } else {
+                    filesToAdd.addAll(resolveWildcards(src, ignores));
+                }
+            }
         }
-      }
-    }
 
-    private Collection<File> resolveWildcards(File file, List<String> ignores) {
-      List<File> filesToAdd = new ArrayList<File>();
-
-      File parent = file.getParentFile();
-      if (parent != null) {
-        if (parent.isDirectory()) {
-          Collection<File> files = FileUtils.listFiles(parent,
-                                                       new GoLangMatchFileFilter(parent, ignores),
-                                                       TrueFileFilter.INSTANCE);
-          filesToAdd.addAll(files);
-        } else {
-          filesToAdd.addAll(resolveWildcards(parent, ignores));
+        private Collection<File> resolveWildcards(File file, List<String> ignores) {
+            List<File> filesToAdd = new ArrayList<File>();
+
+            File parent = file.getParentFile();
+            if (parent != null) {
+                if (parent.isDirectory()) {
+                    Collection<File> files = FileUtils.listFiles(parent, new GoLangMatchFileFilter(parent, ignores),
+                            TrueFileFilter.INSTANCE);
+                    filesToAdd.addAll(files);
+                } else {
+                    filesToAdd.addAll(resolveWildcards(parent, ignores));
+                }
+            } else {
+                throw new DockerClientException(String.format("Source file %s doesn't exist", file));
+            }
+
+            return filesToAdd;
         }
-      } else {
-        throw new DockerClientException(String.format(
-            "Source file %s doesn't exist", file));
-      }
 
-      return filesToAdd;
-    }
+        private void processEnvStatement(DockerfileStatement.Env env) {
 
-    private void processEnvStatement(DockerfileStatement.Env env) {
+            environmentMap.put(env.variable, env.value);
+        }
 
-      environmentMap.put(env.variable, env.value);
     }
 
-  }
-
 }
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java b/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
index c048f77dd..7b6581e42 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
@@ -16,191 +16,182 @@
  */
 public abstract class DockerfileStatement<T extends DockerfileStatement> {
 
-  private DockerfileStatement() {
-  }
+    private DockerfileStatement() {
+    }
 
-  public T transform(Map<String, String> env) {
-    return (T) this;
-  }
+    public T transform(Map<String, String> env) {
+        return (T) this;
+    }
 
-  protected String filterForEnvironmentVars(Map<String, String> environmentMap,
-                                            String extractedResource) {
+    protected String filterForEnvironmentVars(Map<String, String> environmentMap, String extractedResource) {
 
-    if (environmentMap.size() > 0) {
+        if (environmentMap.size() > 0) {
 
-      String currentResourceContent = extractedResource;
+            String currentResourceContent = extractedResource;
 
-      for (Map.Entry<String, String> entry : environmentMap.entrySet()) {
+            for (Map.Entry<String, String> entry : environmentMap.entrySet()) {
 
-        String variable = entry.getKey();
+                String variable = entry.getKey();
 
-        String replacementValue = entry.getValue();
+                String replacementValue = entry.getValue();
 
-        // handle: $VARIABLE case
-        currentResourceContent = currentResourceContent.replaceAll(
-            "\\$" + variable, Matcher.quoteReplacement(replacementValue));
+                // handle: $VARIABLE case
+                currentResourceContent = currentResourceContent.replaceAll("\\$" + variable,
+                        Matcher.quoteReplacement(replacementValue));
 
-        // handle ${VARIABLE} case
-        currentResourceContent = currentResourceContent.replaceAll(
-            "\\$\\{" + variable + "\\}", Matcher.quoteReplacement(replacementValue));
+                // handle ${VARIABLE} case
+                currentResourceContent = currentResourceContent.replaceAll("\\$\\{" + variable + "\\}",
+                        Matcher.quoteReplacement(replacementValue));
 
-      }
+            }
 
-      return currentResourceContent;
-    } else {
-      return extractedResource;
+            return currentResourceContent;
+        } else {
+            return extractedResource;
+        }
     }
-  }
 
+    /**
+     * A statement that we don't particularly care about.
+     */
+    public static class OtherLine extends DockerfileStatement {
 
-  /**
-   * A statement that we don't particularly care about.
-   */
-  public static class OtherLine extends DockerfileStatement {
+        public final String statement;
 
-    public final String statement;
+        public OtherLine(String statement) {
+            this.statement = statement;
+        }
 
-    public OtherLine(String statement) {
-      this.statement = statement;
+        @Override
+        public String toString() {
+            return statement;
+        }
     }
 
-    @Override
-    public String toString() {
-      return statement;
-    }
-  }
+    /**
+     * An ADD or a COPY
+     */
+    public static class Add extends DockerfileStatement<Add> {
 
-  /**
-   * An ADD or a COPY
-   */
-  public static class Add extends DockerfileStatement<Add> {
+        private static final Pattern ADD_OR_COPY_PATTERN = Pattern.compile("^(ADD|COPY)\\s+(.*)\\s+(.*)$");
 
-    private static final Pattern ADD_OR_COPY_PATTERN = Pattern
-        .compile("^(ADD|COPY)\\s+(.*)\\s+(.*)$");
+        public final String source;
 
-    public final String source;
-    public final String destination;
+        public final String destination;
 
-    private Add(String source, String destination) {
-      this.source = source;
-      this.destination = destination;
-    }
+        private Add(String source, String destination) {
+            this.source = source;
+            this.destination = destination;
+        }
 
-    private Add(final Matcher matcher) {
-      source = matcher.group(2);
-      destination = matcher.group(3);
-    }
+        private Add(final Matcher matcher) {
+            source = matcher.group(2);
+            destination = matcher.group(3);
+        }
 
-    @Override
-    public Add transform(Map<String, String> env) {
-      String resource = filterForEnvironmentVars(env, source).trim();
-      return new Add(resource, destination);
-    }
+        @Override
+        public Add transform(Map<String, String> env) {
+            String resource = filterForEnvironmentVars(env, source).trim();
+            return new Add(resource, destination);
+        }
 
-    public boolean isFileResource() {
-      URI uri;
-      try {
-        uri = new URI(source);
-      } catch (URISyntaxException e) {
-        return false;
-      }
-      return uri.getScheme() == null || "file".equals(uri.getScheme());
-    }
+        public boolean isFileResource() {
+            URI uri;
+            try {
+                uri = new URI(source);
+            } catch (URISyntaxException e) {
+                return false;
+            }
+            return uri.getScheme() == null || "file".equals(uri.getScheme());
+        }
 
-    /**
-     * Createa an Add if it matches, or missing if not.
-     *
-     * @param statement statement that may be an ADD or a COPY
-     * @return optional typed item.
-     */
-    public static Optional<Add> create(String statement) {
-      Matcher matcher = ADD_OR_COPY_PATTERN.matcher(statement.trim());
-      if (!matcher.find()) {
-        return Optional.absent();
-      }
+        /**
+         * Createa an Add if it matches, or missing if not.
+         *
+         * @param statement
+         *            statement that may be an ADD or a COPY
+         * @return optional typed item.
+         */
+        public static Optional<Add> create(String statement) {
+            Matcher matcher = ADD_OR_COPY_PATTERN.matcher(statement.trim());
+            if (!matcher.find()) {
+                return Optional.absent();
+            }
 
-      if (matcher.groupCount() != 3) {
-        throw new DockerClientException("Wrong ADD or COPY format");
-      }
-
-      return Optional.of(new Add(matcher));
-    }
+            if (matcher.groupCount() != 3) {
+                throw new DockerClientException("Wrong ADD or COPY format");
+            }
 
+            return Optional.of(new Add(matcher));
+        }
 
-    @Override
-    public String toString() {
-      return Objects.toStringHelper(this)
-          .add("source", source)
-          .add("destination", destination)
-          .toString();
+        @Override
+        public String toString() {
+            return Objects.toStringHelper(this).add("source", source).add("destination", destination).toString();
+        }
     }
-  }
 
-  public static class Env extends DockerfileStatement<Env> {
+    public static class Env extends DockerfileStatement<Env> {
 
-    private static final Pattern ENV_PATTERN = Pattern
-        .compile("^ENV\\s+(.*)\\s+(.*)$");
+        private static final Pattern ENV_PATTERN = Pattern.compile("^ENV\\s+(.*)\\s+(.*)$");
 
-    public final String variable;
-    public final String value;
+        public final String variable;
 
-    private Env(String variable, String value) {
-      this.variable = variable;
-      this.value = value;
-    }
+        public final String value;
 
-    private Env(Matcher envMatcher) {
-      this.variable = envMatcher.group(1).trim();
-      this.value = envMatcher.group(2).trim();
-    }
+        private Env(String variable, String value) {
+            this.variable = variable;
+            this.value = value;
+        }
 
-    public static Optional<Env> create(String statement) {
-      Matcher matcher = ENV_PATTERN.matcher(statement.trim());
-      if (!matcher.find()) {
-        return Optional.absent();
-      }
+        private Env(Matcher envMatcher) {
+            this.variable = envMatcher.group(1).trim();
+            this.value = envMatcher.group(2).trim();
+        }
 
-      if (matcher.groupCount() != 2) {
-        throw new DockerClientException("Wrong ENV format");
-      }
+        public static Optional<Env> create(String statement) {
+            Matcher matcher = ENV_PATTERN.matcher(statement.trim());
+            if (!matcher.find()) {
+                return Optional.absent();
+            }
 
-      return Optional.of(new Env(matcher));
-    }
+            if (matcher.groupCount() != 2) {
+                throw new DockerClientException("Wrong ENV format");
+            }
 
-    @Override
-    public String toString() {
-      return Objects.toStringHelper(this)
-          .add("variable", variable)
-          .add("value", value)
-          .toString();
-    }
-  }
-
-  /**
-   * Return a dockerfile statement
-   */
-  public static Optional<? extends DockerfileStatement> createFromLine(String cmd) {
-    if (cmd.trim().isEmpty() || cmd.startsWith("#")) {
-      return Optional.absent();
+            return Optional.of(new Env(matcher));
+        }
+
+        @Override
+        public String toString() {
+            return Objects.toStringHelper(this).add("variable", variable).add("value", value).toString();
+        }
     }
 
-    Optional<? extends DockerfileStatement> line;
+    /**
+     * Return a dockerfile statement
+     */
+    public static Optional<? extends DockerfileStatement> createFromLine(String cmd) {
+        if (cmd.trim().isEmpty() || cmd.startsWith("#")) {
+            return Optional.absent();
+        }
 
-    line = Add.create(cmd);
+        Optional<? extends DockerfileStatement> line;
 
-    if (line.isPresent()) {
-      return line;
-    }
+        line = Add.create(cmd);
 
-    line = Env.create(cmd);
+        if (line.isPresent()) {
+            return line;
+        }
 
-    if (line.isPresent()) {
-      return line;
-    }
+        line = Env.create(cmd);
 
-    return Optional.of(new OtherLine(cmd));
+        if (line.isPresent()) {
+            return line;
+        }
 
+        return Optional.of(new OtherLine(cmd));
 
-  }
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/core/util/FollowRedirectsFilter.java b/src/main/java/com/github/dockerjava/core/util/FollowRedirectsFilter.java
index b4431b1f4..e4ba60f90 100644
--- a/src/main/java/com/github/dockerjava/core/util/FollowRedirectsFilter.java
+++ b/src/main/java/com/github/dockerjava/core/util/FollowRedirectsFilter.java
@@ -9,27 +9,24 @@
 import javax.ws.rs.core.Response;
 
 /**
- * Default implementation of RedirectStrategy honors the restrictions
- * on automatic redirection of entity enclosing methods such as POST
- * and PUT imposed by the HTTP specification. 302 Moved Temporarily,
- * 301 Moved Permanently and 307 Temporary Redirect status codes will
- * result in an automatic redirect of HEAD and GET methods only.
+ * Default implementation of RedirectStrategy honors the restrictions on automatic redirection of entity enclosing
+ * methods such as POST and PUT imposed by the HTTP specification. 302 Moved Temporarily, 301 Moved Permanently and 307
+ * Temporary Redirect status codes will result in an automatic redirect of HEAD and GET methods only.
  * 
  * {@link org.apache.http.impl.client.DefaultRedirectStrategy}
  *
- * This filter allows arbitrary redirection for other methods.  
+ * This filter allows arbitrary redirection for other methods.
  */
 public class FollowRedirectsFilter implements ClientResponseFilter {
 
     @Override
-    public void filter(ClientRequestContext requestContext,
-            ClientResponseContext responseContext) throws IOException {
+    public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException {
         if (!responseContext.getStatusInfo().getFamily().equals(Response.Status.Family.REDIRECTION)) {
             return;
         }
 
-        Response resp = requestContext.getClient().target(responseContext.getLocation())
-                .request().method(requestContext.getMethod());
+        Response resp = requestContext.getClient().target(responseContext.getLocation()).request()
+                .method(requestContext.getMethod());
         responseContext.setEntityStream((InputStream) resp.getEntity());
         responseContext.setStatusInfo(resp.getStatusInfo());
         responseContext.setStatus(resp.getStatus());
diff --git a/src/main/java/com/github/dockerjava/core/util/JsonClientFilter.java b/src/main/java/com/github/dockerjava/core/util/JsonClientFilter.java
index f2911d961..19befc4b2 100644
--- a/src/main/java/com/github/dockerjava/core/util/JsonClientFilter.java
+++ b/src/main/java/com/github/dockerjava/core/util/JsonClientFilter.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.core.util;
 
-
 import javax.ws.rs.client.ClientRequestContext;
 import javax.ws.rs.client.ClientResponseContext;
 import javax.ws.rs.client.ClientResponseFilter;
@@ -14,10 +13,10 @@
  */
 public class JsonClientFilter implements ClientResponseFilter {
 
-
     @Override
     public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException {
-        if (responseContext.getMediaType() != null && responseContext.getMediaType().isCompatible(MediaType.TEXT_PLAIN_TYPE)) {
+        if (responseContext.getMediaType() != null
+                && responseContext.getMediaType().isCompatible(MediaType.TEXT_PLAIN_TYPE)) {
             String newContentType = "application/json" + responseContext.getMediaType().toString().substring(10);
             responseContext.getHeaders().putSingle("Content-Type", newContentType);
         }
diff --git a/src/main/java/com/github/dockerjava/core/util/LoggingFilter.java b/src/main/java/com/github/dockerjava/core/util/LoggingFilter.java
index 5a72ba237..f7314109b 100644
--- a/src/main/java/com/github/dockerjava/core/util/LoggingFilter.java
+++ b/src/main/java/com/github/dockerjava/core/util/LoggingFilter.java
@@ -40,7 +40,6 @@
  * holder.
  */
 
-
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -72,7 +71,6 @@
 import javax.ws.rs.ext.WriterInterceptorContext;
 import javax.annotation.Priority;
 
-
 /**
  * Universal logging filter.
  *
@@ -88,44 +86,50 @@ public class LoggingFilter implements ContainerRequestFilter, ClientRequestFilte
         ClientResponseFilter, WriterInterceptor {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LoggingFilter.class.getName());
+
     private static final String NOTIFICATION_PREFIX = "* ";
+
     private static final String REQUEST_PREFIX = "> ";
+
     private static final String RESPONSE_PREFIX = "< ";
+
     private static final String ENTITY_LOGGER_PROPERTY = LoggingFilter.class.getName() + ".entityLogger";
 
-    private static final Comparator<Map.Entry<String, List<String>>> COMPARATOR =
-            new Comparator<Map.Entry<String, List<String>>>() {
+    private static final Comparator<Map.Entry<String, List<String>>> COMPARATOR = new Comparator<Map.Entry<String, List<String>>>() {
 
-                @Override
-                public int compare(final Map.Entry<String, List<String>> o1, final Map.Entry<String, List<String>> o2) {
-                    return o1.getKey().compareToIgnoreCase(o2.getKey());
-                }
-            };
+        @Override
+        public int compare(final Map.Entry<String, List<String>> o1, final Map.Entry<String, List<String>> o2) {
+            return o1.getKey().compareToIgnoreCase(o2.getKey());
+        }
+    };
 
     private static final int DEFAULT_MAX_ENTITY_SIZE = 8 * 1024;
 
     //
     @SuppressWarnings("NonConstantLogger")
     private final Logger logger;
+
     private final AtomicLong _id = new AtomicLong(0);
+
     private final boolean printEntity;
+
     private final int maxEntitySize;
 
     /**
-     * Create a logging filter logging the request and response to a default JDK
-     * logger, named as the fully qualified class name of this class. Entity
-     * logging is turned off by default.
+     * Create a logging filter logging the request and response to a default JDK logger, named as the fully qualified
+     * class name of this class. Entity logging is turned off by default.
      */
     public LoggingFilter() {
         this(LOGGER, false);
     }
 
     /**
-     * Create a logging filter with custom logger and custom settings of entity
-     * logging.
+     * Create a logging filter with custom logger and custom settings of entity logging.
      *
-     * @param logger      the logger to log requests and responses.
-     * @param printEntity if true, entity will be logged as well up to the default maxEntitySize, which is 8KB
+     * @param logger
+     *            the logger to log requests and responses.
+     * @param printEntity
+     *            if true, entity will be logged as well up to the default maxEntitySize, which is 8KB
      */
     @SuppressWarnings("BooleanParameter")
     public LoggingFilter(final Logger logger, final boolean printEntity) {
@@ -135,13 +139,15 @@ public LoggingFilter(final Logger logger, final boolean printEntity) {
     }
 
     /**
-     * Creates a logging filter with custom logger and entity logging turned on, but potentially limiting the size
-     * of entity to be buffered and logged.
+     * Creates a logging filter with custom logger and entity logging turned on, but potentially limiting the size of
+     * entity to be buffered and logged.
      *
-     * @param logger        the logger to log requests and responses.
-     * @param maxEntitySize maximum number of entity bytes to be logged (and buffered) - if the entity is larger,
-     *                      logging filter will print (and buffer in memory) only the specified number of bytes
-     *                      and print "...more..." string at the end.
+     * @param logger
+     *            the logger to log requests and responses.
+     * @param maxEntitySize
+     *            maximum number of entity bytes to be logged (and buffered) - if the entity is larger, logging filter
+     *            will print (and buffer in memory) only the specified number of bytes and print "...more..." string at
+     *            the end.
      */
     public LoggingFilter(final Logger logger, final int maxEntitySize) {
         this.logger = logger;
@@ -160,25 +166,21 @@ private StringBuilder prefixId(final StringBuilder b, final long id) {
         return b;
     }
 
-    private void printRequestLine(final StringBuilder b, final String note, final long id, final String method, final URI uri) {
-        prefixId(b, id).append(NOTIFICATION_PREFIX)
-                .append(note)
-                .append(" on thread ").append(Thread.currentThread().getName())
-                .append("\n");
-        prefixId(b, id).append(REQUEST_PREFIX).append(method).append(" ").
-                append(uri.toASCIIString()).append("\n");
+    private void printRequestLine(final StringBuilder b, final String note, final long id, final String method,
+            final URI uri) {
+        prefixId(b, id).append(NOTIFICATION_PREFIX).append(note).append(" on thread ")
+                .append(Thread.currentThread().getName()).append("\n");
+        prefixId(b, id).append(REQUEST_PREFIX).append(method).append(" ").append(uri.toASCIIString()).append("\n");
     }
 
     private void printResponseLine(final StringBuilder b, final String note, final long id, final int status) {
-        prefixId(b, id).append(NOTIFICATION_PREFIX)
-                .append(note)
-                .append(" on thread ").append(Thread.currentThread().getName()).append("\n");
-        prefixId(b, id).append(RESPONSE_PREFIX).
-                append(Integer.toString(status)).
-                append("\n");
+        prefixId(b, id).append(NOTIFICATION_PREFIX).append(note).append(" on thread ")
+                .append(Thread.currentThread().getName()).append("\n");
+        prefixId(b, id).append(RESPONSE_PREFIX).append(Integer.toString(status)).append("\n");
     }
 
-    private void printPrefixedHeaders(final StringBuilder b, final long id, final String prefix, final MultivaluedMap<String, String> headers) {
+    private void printPrefixedHeaders(final StringBuilder b, final long id, final String prefix,
+            final MultivaluedMap<String, String> headers) {
         for (final Map.Entry<String, List<String>> headerEntry : getSortedHeaders(headers.entrySet())) {
             final List<?> val = headerEntry.getValue();
             final String header = headerEntry.getKey();
@@ -201,7 +203,8 @@ private void printPrefixedHeaders(final StringBuilder b, final long id, final St
     }
 
     private Set<Map.Entry<String, List<String>>> getSortedHeaders(final Set<Map.Entry<String, List<String>>> headers) {
-        final TreeSet<Map.Entry<String, List<String>>> sortedHeaders = new TreeSet<Map.Entry<String, List<String>>>(COMPARATOR);
+        final TreeSet<Map.Entry<String, List<String>>> sortedHeaders = new TreeSet<Map.Entry<String, List<String>>>(
+                COMPARATOR);
         sortedHeaders.addAll(headers);
         return sortedHeaders;
     }
@@ -241,7 +244,8 @@ public void filter(final ClientRequestContext context) throws IOException {
     }
 
     @Override
-    public void filter(final ClientRequestContext requestContext, final ClientResponseContext responseContext) throws IOException {
+    public void filter(final ClientRequestContext requestContext, final ClientResponseContext responseContext)
+            throws IOException {
         final long id = this._id.incrementAndGet();
         final StringBuilder b = new StringBuilder();
 
@@ -260,7 +264,8 @@ public void filter(final ContainerRequestContext context) throws IOException {
         final long id = this._id.incrementAndGet();
         final StringBuilder b = new StringBuilder();
 
-        printRequestLine(b, "Server has received a request", id, context.getMethod(), context.getUriInfo().getRequestUri());
+        printRequestLine(b, "Server has received a request", id, context.getMethod(), context.getUriInfo()
+                .getRequestUri());
         printPrefixedHeaders(b, id, REQUEST_PREFIX, context.getHeaders());
 
         if (printEntity && context.hasEntity()) {
@@ -271,7 +276,8 @@ public void filter(final ContainerRequestContext context) throws IOException {
     }
 
     @Override
-    public void filter(final ContainerRequestContext requestContext, final ContainerResponseContext responseContext) throws IOException {
+    public void filter(final ContainerRequestContext requestContext, final ContainerResponseContext responseContext)
+            throws IOException {
         final long id = this._id.incrementAndGet();
         final StringBuilder b = new StringBuilder();
 
@@ -289,7 +295,8 @@ public void filter(final ContainerRequestContext requestContext, final Container
     }
 
     @Override
-    public void aroundWriteTo(final WriterInterceptorContext writerInterceptorContext) throws IOException, WebApplicationException {
+    public void aroundWriteTo(final WriterInterceptorContext writerInterceptorContext) throws IOException,
+            WebApplicationException {
         final LoggingStream stream = (LoggingStream) writerInterceptorContext.getProperty(ENTITY_LOGGER_PROPERTY);
         writerInterceptorContext.proceed();
         if (stream != null) {
@@ -299,7 +306,9 @@ public void aroundWriteTo(final WriterInterceptorContext writerInterceptorContex
 
     private class LoggingStream extends OutputStream {
         private final StringBuilder b;
+
         private final OutputStream inner;
+
         private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
         LoggingStream(final StringBuilder b, final OutputStream inner) {
diff --git a/src/main/java/com/github/dockerjava/core/util/ResponseStatusExceptionFilter.java b/src/main/java/com/github/dockerjava/core/util/ResponseStatusExceptionFilter.java
index 7e9708564..24f31fb14 100644
--- a/src/main/java/com/github/dockerjava/core/util/ResponseStatusExceptionFilter.java
+++ b/src/main/java/com/github/dockerjava/core/util/ResponseStatusExceptionFilter.java
@@ -22,75 +22,71 @@
 import com.github.dockerjava.api.UnauthorizedException;
 
 /**
- * This {@link ClientResponseFilter} implementation detects http status codes and throws {@link DockerException}s 
+ * This {@link ClientResponseFilter} implementation detects http status codes and throws {@link DockerException}s
  *
  * @author marcus
  *
  */
 public class ResponseStatusExceptionFilter implements ClientResponseFilter {
 
-
     @Override
     public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException {
-    	int status = responseContext.getStatus();
-		switch (status) {
-		case 200:
-		case 201:	
-		case 204:
-			return;
-		case 304:
-			throw new NotModifiedException(getBodyAsMessage(responseContext));
-		case 400:
-			throw new BadRequestException(getBodyAsMessage(responseContext));
-		case 401:
-			throw new UnauthorizedException(getBodyAsMessage(responseContext));	
-		case 404:
-			throw new NotFoundException(getBodyAsMessage(responseContext));
-		case 406:
-			throw new NotAcceptableException(getBodyAsMessage(responseContext));
-		case 409:
-			throw new ConflictException(getBodyAsMessage(responseContext));
-		case 500:
-			throw new InternalServerErrorException(getBodyAsMessage(responseContext));
-		default:
-			throw new DockerException(getBodyAsMessage(responseContext), status);
-		}
+        int status = responseContext.getStatus();
+        switch (status) {
+        case 200:
+        case 201:
+        case 204:
+            return;
+        case 304:
+            throw new NotModifiedException(getBodyAsMessage(responseContext));
+        case 400:
+            throw new BadRequestException(getBodyAsMessage(responseContext));
+        case 401:
+            throw new UnauthorizedException(getBodyAsMessage(responseContext));
+        case 404:
+            throw new NotFoundException(getBodyAsMessage(responseContext));
+        case 406:
+            throw new NotAcceptableException(getBodyAsMessage(responseContext));
+        case 409:
+            throw new ConflictException(getBodyAsMessage(responseContext));
+        case 500:
+            throw new InternalServerErrorException(getBodyAsMessage(responseContext));
+        default:
+            throw new DockerException(getBodyAsMessage(responseContext), status);
+        }
     }
 
-	private String getBodyAsMessage(ClientResponseContext responseContext)
-			throws IOException {
-	    if (responseContext.hasEntity()) {
-	        int contentLength = responseContext.getLength();
-	        if (contentLength != -1) {
-	            byte[] buffer = new byte[contentLength];
-	            try {
-	                InputStream entityStream = responseContext.getEntityStream();
-                  IOUtils.readFully(entityStream, buffer);
-                  entityStream.close();
-	            }
-	            catch (EOFException e) {
-	                return null;
-	            }
-	            Charset charset = null;
-	            MediaType mediaType = responseContext.getMediaType();
-	            if (mediaType != null) {
-	                String charsetName = mediaType.getParameters().get("charset");
-	                if (charsetName != null) {
-	                    try {
-	                        charset = Charset.forName(charsetName);
-                        }
-                        catch (Exception e) {
-                            //Do noting...
+    private String getBodyAsMessage(ClientResponseContext responseContext) throws IOException {
+        if (responseContext.hasEntity()) {
+            int contentLength = responseContext.getLength();
+            if (contentLength != -1) {
+                byte[] buffer = new byte[contentLength];
+                try {
+                    InputStream entityStream = responseContext.getEntityStream();
+                    IOUtils.readFully(entityStream, buffer);
+                    entityStream.close();
+                } catch (EOFException e) {
+                    return null;
+                }
+                Charset charset = null;
+                MediaType mediaType = responseContext.getMediaType();
+                if (mediaType != null) {
+                    String charsetName = mediaType.getParameters().get("charset");
+                    if (charsetName != null) {
+                        try {
+                            charset = Charset.forName(charsetName);
+                        } catch (Exception e) {
+                            // Do noting...
                         }
-	                }
-	            }
-	            if (charset == null) {
+                    }
+                }
+                if (charset == null) {
                     charset = Charset.defaultCharset();
-	            }
-	            String message = new String(buffer, charset);
-	            return message;
-	        }
-	    }
-	    return null;
-	}
+                }
+                String message = new String(buffer, charset);
+                return message;
+            }
+        }
+        return null;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/util/SelectiveLoggingFilter.java b/src/main/java/com/github/dockerjava/core/util/SelectiveLoggingFilter.java
index 8cfe88b73..d4c9b8400 100644
--- a/src/main/java/com/github/dockerjava/core/util/SelectiveLoggingFilter.java
+++ b/src/main/java/com/github/dockerjava/core/util/SelectiveLoggingFilter.java
@@ -11,18 +11,16 @@
 
 import org.slf4j.Logger;
 
-
 /**
- * A version of the logging filter that will avoid trying to log entities which can cause
- * issues with the console.
+ * A version of the logging filter that will avoid trying to log entities which can cause issues with the console.
  * 
  * @author sfitts
  *
  */
 public class SelectiveLoggingFilter extends LoggingFilter {
-    
+
     // Immutable'ish
-    private static final Set<String> SKIPPED_CONTENT; 
+    private static final Set<String> SKIPPED_CONTENT;
     static {
         Set<String> s = new HashSet<String>();
         s.add(MediaType.APPLICATION_OCTET_STREAM);
@@ -30,12 +28,11 @@ public class SelectiveLoggingFilter extends LoggingFilter {
         SKIPPED_CONTENT = Collections.unmodifiableSet(s);
     }
 
-
     public SelectiveLoggingFilter(Logger logger, boolean b) {
-		super(logger, b);
-	}
+        super(logger, b);
+    }
 
-	@Override
+    @Override
     public void filter(ClientRequestContext context) throws IOException {
         // Unless the content type is in the list of those we want to ellide, then just have
         // our super-class handle things.
@@ -44,5 +41,5 @@ public void filter(ClientRequestContext context) throws IOException {
             super.filter(context);
         }
     }
-    
+
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
index 840395105..7ce68eed8 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
@@ -16,62 +16,58 @@
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
 
-public abstract class AbstrDockerCmdExec<CMD_T extends DockerCmd<RES_T>, RES_T>
-		implements DockerCmdExec<CMD_T, RES_T> {
+public abstract class AbstrDockerCmdExec<CMD_T extends DockerCmd<RES_T>, RES_T> implements DockerCmdExec<CMD_T, RES_T> {
 
-	private WebTarget baseResource;
+    private WebTarget baseResource;
 
-	public AbstrDockerCmdExec(WebTarget baseResource) {
-		checkNotNull(baseResource,
-				"baseResource was not specified");
-		this.baseResource = baseResource;
-	}
+    public AbstrDockerCmdExec(WebTarget baseResource) {
+        checkNotNull(baseResource, "baseResource was not specified");
+        this.baseResource = baseResource;
+    }
 
-	protected WebTarget getBaseResource() {
-		return baseResource;
-	}
+    protected WebTarget getBaseResource() {
+        return baseResource;
+    }
 
-	protected String registryAuth(AuthConfig authConfig) {
-		try {
-			return Base64.encodeBase64String(new ObjectMapper()
-					.writeValueAsString(authConfig).getBytes());
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
+    protected String registryAuth(AuthConfig authConfig) {
+        try {
+            return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfig).getBytes());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
-	protected String registryConfigs(AuthConfigurations authConfigs) {
-		try {
-			return Base64.encodeBase64String(new ObjectMapper()
-					.writeValueAsString(authConfigs).getBytes());
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-	
-	@Override
-	public RES_T exec(CMD_T command) {
-		// this hack works because of ResponseStatusExceptionFilter
-		RES_T result;
-		try {
-			result = execute(command);
-			
-		} catch (ProcessingException e) {
-			if(e.getCause() instanceof DockerException) {
-				throw (DockerException)e.getCause();
-			} else {
-				throw e;
-			}
-		} finally {
-			try {
-				command.close();
-			} catch (IOException e) {
-				throw new RuntimeException(e);
-			}
-		}
-		
-		return result;
-	}
+    protected String registryConfigs(AuthConfigurations authConfigs) {
+        try {
+            return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfigs).getBytes());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
-	protected abstract RES_T execute(CMD_T command);
+    @Override
+    public RES_T exec(CMD_T command) {
+        // this hack works because of ResponseStatusExceptionFilter
+        RES_T result;
+        try {
+            result = execute(command);
+
+        } catch (ProcessingException e) {
+            if (e.getCause() instanceof DockerException) {
+                throw (DockerException) e.getCause();
+            } else {
+                throw e;
+            }
+        } finally {
+            try {
+                command.close();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        return result;
+    }
+
+    protected abstract RES_T execute(CMD_T command);
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java b/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
index 23d6d1ab9..e30028f34 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
@@ -1,4 +1,5 @@
 package com.github.dockerjava.jaxrs;
+
 /*
  * Copyright (c) 2014 Spotify AB.
  *
@@ -20,8 +21,6 @@
  * under the License.
  */
 
-
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -36,291 +35,289 @@
 import org.newsclub.net.unix.AFUNIXSocket;
 
 /**
- * Provides a socket that wraps an org.newsclub.net.unix.AFUNIXSocket and delays setting options
- * until the socket is connected. This is necessary because the Apache HTTP client attempts to
- * set options prior to connecting the socket, which doesn't work for Unix sockets since options
- * are being set on the underlying file descriptor. Until the socket is connected, the file
- * descriptor doesn't exist.
+ * Provides a socket that wraps an org.newsclub.net.unix.AFUNIXSocket and delays setting options until the socket is
+ * connected. This is necessary because the Apache HTTP client attempts to set options prior to connecting the socket,
+ * which doesn't work for Unix sockets since options are being set on the underlying file descriptor. Until the socket
+ * is connected, the file descriptor doesn't exist.
  *
- * This class also noop's any calls to setReuseAddress, which is called by the Apache client but
- * isn't supported by AFUnixSocket.
+ * This class also noop's any calls to setReuseAddress, which is called by the Apache client but isn't supported by
+ * AFUnixSocket.
  */
 public class ApacheUnixSocket extends Socket {
 
-  private final AFUNIXSocket inner;
-
-  private final Queue<SocketOptionSetter> optionsToSet = new ArrayDeque<SocketOptionSetter>();
-
-  public ApacheUnixSocket() throws IOException {
-    this.inner = AFUNIXSocket.newInstance();
-  }
-
-  @Override
-  public void connect(final SocketAddress endpoint) throws IOException {
-    inner.connect(endpoint);
-    setAllSocketOptions();
-  }
-
-  @Override
-  public void connect(final SocketAddress endpoint, final int timeout) throws IOException {
-    inner.connect(endpoint, timeout);
-    setAllSocketOptions();
-  }
-
-  @Override
-  public void bind(final SocketAddress bindpoint) throws IOException {
-    inner.bind(bindpoint);
-    setAllSocketOptions();
-  }
-
-  @Override
-  public InetAddress getInetAddress() {
-    return inner.getInetAddress();
-  }
-
-  @Override
-  public InetAddress getLocalAddress() {
-    return inner.getLocalAddress();
-  }
-
-  @Override
-  public int getPort() {
-    return inner.getPort();
-  }
-
-  @Override
-  public int getLocalPort() {
-    return inner.getLocalPort();
-  }
-
-  @Override
-  public SocketAddress getRemoteSocketAddress() {
-    return inner.getRemoteSocketAddress();
-  }
-
-  @Override
-  public SocketAddress getLocalSocketAddress() {
-    return inner.getLocalSocketAddress();
-  }
-
-  @Override
-  public SocketChannel getChannel() {
-    return inner.getChannel();
-  }
-
-  @Override
-  public InputStream getInputStream() throws IOException {
-    return inner.getInputStream();
-  }
-
-  @Override
-  public OutputStream getOutputStream() throws IOException {
-    return inner.getOutputStream();
-  }
-
-  private void setSocketOption(final SocketOptionSetter s) throws SocketException {
-    if (inner.isConnected()) {
-      s.run();
-    } else {
-      if (!optionsToSet.offer(s)) {
-        throw new SocketException("Failed to queue option");
-      }
-    }
-  }
-
-  private void setAllSocketOptions() throws SocketException {
-    for (SocketOptionSetter s : optionsToSet) {
-      s.run();
-    }
-  }
-
-  @Override
-  public void setTcpNoDelay(final boolean on) throws SocketException {
-    setSocketOption(new SocketOptionSetter() {
-      @Override
-      public void run() throws SocketException {
-        inner.setTcpNoDelay(on);
-      }
-    });
-  }
-
-  @Override
-  public boolean getTcpNoDelay() throws SocketException {
-    return inner.getTcpNoDelay();
-  }
-
-  @Override
-  public void setSoLinger(final boolean on, final int linger) throws SocketException {
-    setSocketOption(new SocketOptionSetter() {
-      @Override
-      public void run() throws SocketException {
-        inner.setSoLinger(on, linger);
-      }
-    });
-  }
-
-  @Override
-  public int getSoLinger() throws SocketException {
-    return inner.getSoLinger();
-  }
-
-  @Override
-  public void sendUrgentData(final int data) throws IOException {
-    inner.sendUrgentData(data);
-  }
-
-  @Override
-  public void setOOBInline(final boolean on) throws SocketException {
-    setSocketOption(new SocketOptionSetter() {
-      @Override
-      public void run() throws SocketException {
-        inner.setOOBInline(on);
-      }
-    });
-  }
-
-  @Override
-  public boolean getOOBInline() throws SocketException {
-    return inner.getOOBInline();
-  }
-
-  @Override
-  public synchronized void setSoTimeout(final int timeout) throws SocketException {
-    setSocketOption(new SocketOptionSetter() {
-      @Override
-      public void run() throws SocketException {
-        inner.setSoTimeout(timeout);
-      }
-    });
-  }
-
-  @Override
-  public synchronized int getSoTimeout() throws SocketException {
-    return inner.getSoTimeout();
-  }
-
-  @Override
-  public synchronized void setSendBufferSize(final int size) throws SocketException {
-    setSocketOption(new SocketOptionSetter() {
-      @Override
-      public void run() throws SocketException {
-        inner.setSendBufferSize(size);
-      }
-    });
-  }
-
-  @Override
-  public synchronized int getSendBufferSize() throws SocketException {
-    return inner.getSendBufferSize();
-  }
-
-  @Override
-  public synchronized void setReceiveBufferSize(final int size) throws SocketException {
-    setSocketOption(new SocketOptionSetter() {
-      @Override
-      public void run() throws SocketException {
-        inner.setReceiveBufferSize(size);
-      }
-    });
-  }
-
-  @Override
-  public synchronized int getReceiveBufferSize() throws SocketException {
-    return inner.getReceiveBufferSize();
-  }
-
-  @Override
-  public void setKeepAlive(final boolean on) throws SocketException {
-    setSocketOption(new SocketOptionSetter() {
-      @Override
-      public void run() throws SocketException {
-        inner.setKeepAlive(on);
-      }
-    });
-  }
-
-  @Override
-  public boolean getKeepAlive() throws SocketException {
-    return inner.getKeepAlive();
-  }
-
-  @Override
-  public void setTrafficClass(final int tc) throws SocketException {
-    setSocketOption(new SocketOptionSetter() {
-      @Override
-      public void run() throws SocketException {
-        inner.setTrafficClass(tc);
-      }
-    });
-  }
-
-  @Override
-  public int getTrafficClass() throws SocketException {
-    return inner.getTrafficClass();
-  }
-
-  @Override
-  public void setReuseAddress(final boolean on) throws SocketException {
-    // not supported: Apache client tries to set it, but we want to just ignore it
-  }
-
-  @Override
-  public boolean getReuseAddress() throws SocketException {
-    return inner.getReuseAddress();
-  }
-
-  @Override
-  public synchronized void close() throws IOException {
-    inner.close();
-  }
-
-  @Override
-  public void shutdownInput() throws IOException {
-    inner.shutdownInput();
-  }
-
-  @Override
-  public void shutdownOutput() throws IOException {
-    inner.shutdownOutput();
-  }
-
-  @Override
-  public String toString() {
-    return inner.toString();
-  }
-
-  @Override
-  public boolean isConnected() {
-    return inner.isConnected();
-  }
-
-  @Override
-  public boolean isBound() {
-    return inner.isBound();
-  }
-
-  @Override
-  public boolean isClosed() {
-    return inner.isClosed();
-  }
-
-  @Override
-  public boolean isInputShutdown() {
-    return inner.isInputShutdown();
-  }
-
-  @Override
-  public boolean isOutputShutdown() {
-    return inner.isOutputShutdown();
-  }
-
-  @Override
-  public void setPerformancePreferences(final int connectionTime, final int latency,
-                                        final int bandwidth) {
-    inner.setPerformancePreferences(connectionTime, latency, bandwidth);
-  }
-
-  interface SocketOptionSetter {
-    void run() throws SocketException;
-  }
+    private final AFUNIXSocket inner;
+
+    private final Queue<SocketOptionSetter> optionsToSet = new ArrayDeque<SocketOptionSetter>();
+
+    public ApacheUnixSocket() throws IOException {
+        this.inner = AFUNIXSocket.newInstance();
+    }
+
+    @Override
+    public void connect(final SocketAddress endpoint) throws IOException {
+        inner.connect(endpoint);
+        setAllSocketOptions();
+    }
+
+    @Override
+    public void connect(final SocketAddress endpoint, final int timeout) throws IOException {
+        inner.connect(endpoint, timeout);
+        setAllSocketOptions();
+    }
+
+    @Override
+    public void bind(final SocketAddress bindpoint) throws IOException {
+        inner.bind(bindpoint);
+        setAllSocketOptions();
+    }
+
+    @Override
+    public InetAddress getInetAddress() {
+        return inner.getInetAddress();
+    }
+
+    @Override
+    public InetAddress getLocalAddress() {
+        return inner.getLocalAddress();
+    }
+
+    @Override
+    public int getPort() {
+        return inner.getPort();
+    }
+
+    @Override
+    public int getLocalPort() {
+        return inner.getLocalPort();
+    }
+
+    @Override
+    public SocketAddress getRemoteSocketAddress() {
+        return inner.getRemoteSocketAddress();
+    }
+
+    @Override
+    public SocketAddress getLocalSocketAddress() {
+        return inner.getLocalSocketAddress();
+    }
+
+    @Override
+    public SocketChannel getChannel() {
+        return inner.getChannel();
+    }
+
+    @Override
+    public InputStream getInputStream() throws IOException {
+        return inner.getInputStream();
+    }
+
+    @Override
+    public OutputStream getOutputStream() throws IOException {
+        return inner.getOutputStream();
+    }
+
+    private void setSocketOption(final SocketOptionSetter s) throws SocketException {
+        if (inner.isConnected()) {
+            s.run();
+        } else {
+            if (!optionsToSet.offer(s)) {
+                throw new SocketException("Failed to queue option");
+            }
+        }
+    }
+
+    private void setAllSocketOptions() throws SocketException {
+        for (SocketOptionSetter s : optionsToSet) {
+            s.run();
+        }
+    }
+
+    @Override
+    public void setTcpNoDelay(final boolean on) throws SocketException {
+        setSocketOption(new SocketOptionSetter() {
+            @Override
+            public void run() throws SocketException {
+                inner.setTcpNoDelay(on);
+            }
+        });
+    }
+
+    @Override
+    public boolean getTcpNoDelay() throws SocketException {
+        return inner.getTcpNoDelay();
+    }
+
+    @Override
+    public void setSoLinger(final boolean on, final int linger) throws SocketException {
+        setSocketOption(new SocketOptionSetter() {
+            @Override
+            public void run() throws SocketException {
+                inner.setSoLinger(on, linger);
+            }
+        });
+    }
+
+    @Override
+    public int getSoLinger() throws SocketException {
+        return inner.getSoLinger();
+    }
+
+    @Override
+    public void sendUrgentData(final int data) throws IOException {
+        inner.sendUrgentData(data);
+    }
+
+    @Override
+    public void setOOBInline(final boolean on) throws SocketException {
+        setSocketOption(new SocketOptionSetter() {
+            @Override
+            public void run() throws SocketException {
+                inner.setOOBInline(on);
+            }
+        });
+    }
+
+    @Override
+    public boolean getOOBInline() throws SocketException {
+        return inner.getOOBInline();
+    }
+
+    @Override
+    public synchronized void setSoTimeout(final int timeout) throws SocketException {
+        setSocketOption(new SocketOptionSetter() {
+            @Override
+            public void run() throws SocketException {
+                inner.setSoTimeout(timeout);
+            }
+        });
+    }
+
+    @Override
+    public synchronized int getSoTimeout() throws SocketException {
+        return inner.getSoTimeout();
+    }
+
+    @Override
+    public synchronized void setSendBufferSize(final int size) throws SocketException {
+        setSocketOption(new SocketOptionSetter() {
+            @Override
+            public void run() throws SocketException {
+                inner.setSendBufferSize(size);
+            }
+        });
+    }
+
+    @Override
+    public synchronized int getSendBufferSize() throws SocketException {
+        return inner.getSendBufferSize();
+    }
+
+    @Override
+    public synchronized void setReceiveBufferSize(final int size) throws SocketException {
+        setSocketOption(new SocketOptionSetter() {
+            @Override
+            public void run() throws SocketException {
+                inner.setReceiveBufferSize(size);
+            }
+        });
+    }
+
+    @Override
+    public synchronized int getReceiveBufferSize() throws SocketException {
+        return inner.getReceiveBufferSize();
+    }
+
+    @Override
+    public void setKeepAlive(final boolean on) throws SocketException {
+        setSocketOption(new SocketOptionSetter() {
+            @Override
+            public void run() throws SocketException {
+                inner.setKeepAlive(on);
+            }
+        });
+    }
+
+    @Override
+    public boolean getKeepAlive() throws SocketException {
+        return inner.getKeepAlive();
+    }
+
+    @Override
+    public void setTrafficClass(final int tc) throws SocketException {
+        setSocketOption(new SocketOptionSetter() {
+            @Override
+            public void run() throws SocketException {
+                inner.setTrafficClass(tc);
+            }
+        });
+    }
+
+    @Override
+    public int getTrafficClass() throws SocketException {
+        return inner.getTrafficClass();
+    }
+
+    @Override
+    public void setReuseAddress(final boolean on) throws SocketException {
+        // not supported: Apache client tries to set it, but we want to just ignore it
+    }
+
+    @Override
+    public boolean getReuseAddress() throws SocketException {
+        return inner.getReuseAddress();
+    }
+
+    @Override
+    public synchronized void close() throws IOException {
+        inner.close();
+    }
+
+    @Override
+    public void shutdownInput() throws IOException {
+        inner.shutdownInput();
+    }
+
+    @Override
+    public void shutdownOutput() throws IOException {
+        inner.shutdownOutput();
+    }
+
+    @Override
+    public String toString() {
+        return inner.toString();
+    }
+
+    @Override
+    public boolean isConnected() {
+        return inner.isConnected();
+    }
+
+    @Override
+    public boolean isBound() {
+        return inner.isBound();
+    }
+
+    @Override
+    public boolean isClosed() {
+        return inner.isClosed();
+    }
+
+    @Override
+    public boolean isInputShutdown() {
+        return inner.isInputShutdown();
+    }
+
+    @Override
+    public boolean isOutputShutdown() {
+        return inner.isOutputShutdown();
+    }
+
+    @Override
+    public void setPerformancePreferences(final int connectionTime, final int latency, final int bandwidth) {
+        inner.setPerformancePreferences(connectionTime, latency, bandwidth);
+    }
+
+    interface SocketOptionSetter {
+        void run() throws SocketException;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
index 29f331a2f..6827b4164 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
@@ -12,38 +12,34 @@
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
 
-public class AttachContainerCmdExec extends
-		AbstrDockerCmdExec<AttachContainerCmd, Void> implements
-		AttachContainerCmd.Exec {
-
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(AttachContainerCmdExec.class);
-
-	public AttachContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected Void execute(AttachContainerCmd command) {
-		WebTarget webTarget = getBaseResource()
-				.path("/containers/{id}/attach")
-				.resolveTemplate("id", command.getContainerId())
-				.queryParam("logs", command.hasLogsEnabled() ? "1" : "0")
-				// .queryParam("stdin", command.hasStdinEnabled() ? "1" : "0")
-				.queryParam("stdout", command.hasStdoutEnabled() ? "1" : "0")
-				.queryParam("stderr", command.hasStderrEnabled() ? "1" : "0")
-				.queryParam("stream",
-						command.hasFollowStreamEnabled() ? "1" : "0");
-
-		LOGGER.trace("POST: {}", webTarget);
-
-		POSTCallbackNotifier<Frame> callbackNotifier = new POSTCallbackNotifier<Frame>(
-                new FrameStreamProcessor(), command.getResultCallback(), webTarget);
+public class AttachContainerCmdExec extends AbstrDockerCmdExec<AttachContainerCmd, Void> implements
+        AttachContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AttachContainerCmdExec.class);
+
+    public AttachContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected Void execute(AttachContainerCmd command) {
+        WebTarget webTarget = getBaseResource().path("/containers/{id}/attach")
+                .resolveTemplate("id", command.getContainerId())
+                .queryParam("logs", command.hasLogsEnabled() ? "1" : "0")
+                // .queryParam("stdin", command.hasStdinEnabled() ? "1" : "0")
+                .queryParam("stdout", command.hasStdoutEnabled() ? "1" : "0")
+                .queryParam("stderr", command.hasStderrEnabled() ? "1" : "0")
+                .queryParam("stream", command.hasFollowStreamEnabled() ? "1" : "0");
+
+        LOGGER.trace("POST: {}", webTarget);
+
+        POSTCallbackNotifier<Frame> callbackNotifier = new POSTCallbackNotifier<Frame>(new FrameStreamProcessor(),
+                command.getResultCallback(), webTarget);
 
         AbstractCallbackNotifier.startAsyncProcessing(callbackNotifier);
 
         return null;
 
-	}
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
index 3552d9742..8ceca593e 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
@@ -12,28 +12,26 @@
 
 import static javax.ws.rs.client.Entity.entity;
 
-public class AuthCmdExec extends AbstrDockerCmdExec<AuthCmd,AuthResponse> implements AuthCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(AuthCmdExec.class);
-	
-	public AuthCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected AuthResponse execute(AuthCmd command) {
-		WebTarget webResource = getBaseResource().path("/auth");
-		LOGGER.trace("POST: {}", webResource);
-		Response response = webResource
-                .request()
-                .accept(MediaType.APPLICATION_JSON).post(entity(command.getAuthConfig(), MediaType.APPLICATION_JSON));
-		
-		if(response.getStatus() == 401) {
-			throw new UnauthorizedException("Unauthorized");
-		}
+public class AuthCmdExec extends AbstrDockerCmdExec<AuthCmd, AuthResponse> implements AuthCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AuthCmdExec.class);
+
+    public AuthCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected AuthResponse execute(AuthCmd command) {
+        WebTarget webResource = getBaseResource().path("/auth");
+        LOGGER.trace("POST: {}", webResource);
+        Response response = webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(entity(command.getAuthConfig(), MediaType.APPLICATION_JSON));
+
+        if (response.getStatus() == 401) {
+            throw new UnauthorizedException("Unauthorized");
+        }
 
         return response.readEntity(AuthResponse.class);
-	}
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index 3bdfb006c..3380832ec 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -22,99 +22,90 @@
 
 import static javax.ws.rs.client.Entity.entity;
 
-public class BuildImageCmdExec extends
-		AbstrDockerCmdExec<BuildImageCmd, BuildImageCmd.Response> implements
-		BuildImageCmd.Exec {
-
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(BuildImageCmdExec.class);
-
-	public BuildImageCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected ResponseImpl execute(BuildImageCmd command) {
-		WebTarget webResource = getBaseResource().path("/build");
-		String dockerFilePath = command.getPathToDockerfile();
-
-		if (command.getTag() != null) {
-			webResource = webResource.queryParam("t", command.getTag());
-		}
-		if (command.hasNoCacheEnabled()) {
-			webResource = webResource.queryParam("nocache", "true");
-		}
-		if (!command.hasRemoveEnabled()) {
-			webResource = webResource.queryParam("rm", "false");
-		}
-		if (command.isQuiet()) {
-			webResource = webResource.queryParam("q", "true");
-		}
-		if (command.hasPullEnabled()) {
-			webResource = webResource.queryParam("pull", "true");
-		}
-		if (dockerFilePath != null && !"Dockerfile".equals(dockerFilePath)) {
-			webResource = webResource.queryParam("dockerfile", dockerFilePath);
-		}
-
-		webResource.property(ClientProperties.REQUEST_ENTITY_PROCESSING,
-				RequestEntityProcessing.CHUNKED);
-		webResource.property(ClientProperties.CHUNKED_ENCODING_SIZE,
-				1024 * 1024);
-
-		LOGGER.debug("POST: {}", webResource);
-		Response response = resourceWithOptionalAuthConfig(command,
-				webResource.request())
-				.accept(MediaType.TEXT_PLAIN)
-				.post(entity(command.getTarInputStream(), "application/tar"),
-						Response.class);
-
-		return new ResponseImpl(new WrappedResponseInputStream(response));
-
-	}
-
-	private Invocation.Builder resourceWithOptionalAuthConfig(
-			BuildImageCmd command, Invocation.Builder request) {
-		AuthConfigurations authConfigs = command.getBuildAuthConfigs();
-		if (authConfigs != null) {
-			request = request.header("X-Registry-Config",
-					registryConfigs(authConfigs));
-		}
-		return request;
-	}
-
-	public static class ResponseImpl extends BuildImageCmd.Response {
-
-		private final InputStream proxy;
-
-		public ResponseImpl(InputStream proxy) {
-			this.proxy = proxy;
-		}
-
-		@Override
-		public Iterable<EventStreamItem> getItems() throws IOException {
-			ObjectMapper mapper = new ObjectMapper();
-			// we'll be reading instances of MyBean
-			ObjectReader reader = mapper.reader(EventStreamItem.class);
-			// and then do other configuration, if any, and read:
-			Iterator<EventStreamItem> items = reader.readValues(proxy);
-
-			try {
-				return ImmutableList.copyOf(items);
-			} finally {
-				proxy.close();
-			}
-		}
-
-		@Override
-		public int read() throws IOException {
-			return proxy.read();
-		}
-
-		@Override
-		public void close() throws IOException {
-			proxy.close();
-			super.close();
-		}
-	}
+public class BuildImageCmdExec extends AbstrDockerCmdExec<BuildImageCmd, BuildImageCmd.Response> implements
+        BuildImageCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageCmdExec.class);
+
+    public BuildImageCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected ResponseImpl execute(BuildImageCmd command) {
+        WebTarget webResource = getBaseResource().path("/build");
+        String dockerFilePath = command.getPathToDockerfile();
+
+        if (command.getTag() != null) {
+            webResource = webResource.queryParam("t", command.getTag());
+        }
+        if (command.hasNoCacheEnabled()) {
+            webResource = webResource.queryParam("nocache", "true");
+        }
+        if (!command.hasRemoveEnabled()) {
+            webResource = webResource.queryParam("rm", "false");
+        }
+        if (command.isQuiet()) {
+            webResource = webResource.queryParam("q", "true");
+        }
+        if (command.hasPullEnabled()) {
+            webResource = webResource.queryParam("pull", "true");
+        }
+        if (dockerFilePath != null && !"Dockerfile".equals(dockerFilePath)) {
+            webResource = webResource.queryParam("dockerfile", dockerFilePath);
+        }
+
+        webResource.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED);
+        webResource.property(ClientProperties.CHUNKED_ENCODING_SIZE, 1024 * 1024);
+
+        LOGGER.debug("POST: {}", webResource);
+        Response response = resourceWithOptionalAuthConfig(command, webResource.request()).accept(MediaType.TEXT_PLAIN)
+                .post(entity(command.getTarInputStream(), "application/tar"), Response.class);
+
+        return new ResponseImpl(new WrappedResponseInputStream(response));
+
+    }
+
+    private Invocation.Builder resourceWithOptionalAuthConfig(BuildImageCmd command, Invocation.Builder request) {
+        AuthConfigurations authConfigs = command.getBuildAuthConfigs();
+        if (authConfigs != null) {
+            request = request.header("X-Registry-Config", registryConfigs(authConfigs));
+        }
+        return request;
+    }
+
+    public static class ResponseImpl extends BuildImageCmd.Response {
+
+        private final InputStream proxy;
+
+        public ResponseImpl(InputStream proxy) {
+            this.proxy = proxy;
+        }
+
+        @Override
+        public Iterable<EventStreamItem> getItems() throws IOException {
+            ObjectMapper mapper = new ObjectMapper();
+            // we'll be reading instances of MyBean
+            ObjectReader reader = mapper.reader(EventStreamItem.class);
+            // and then do other configuration, if any, and read:
+            Iterator<EventStreamItem> items = reader.readValues(proxy);
+
+            try {
+                return ImmutableList.copyOf(items);
+            } finally {
+                proxy.close();
+            }
+        }
+
+        @Override
+        public int read() throws IOException {
+            return proxy.read();
+        }
+
+        @Override
+        public void close() throws IOException {
+            proxy.close();
+            super.close();
+        }
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
index f1f4fe33a..b07f5e338 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
@@ -12,27 +12,24 @@
 import com.github.dockerjava.api.command.CommitCmd;
 
 public class CommitCmdExec extends AbstrDockerCmdExec<CommitCmd, String> implements CommitCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(CommitCmdExec.class);
-	
-	public CommitCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected String execute(CommitCmd command) {
-		WebTarget webResource = getBaseResource().path("/commit")
-                .queryParam("container", command.getContainerId())
-                .queryParam("repo", command.getRepository())
-                .queryParam("tag", command.getTag())
-                .queryParam("m", command.getMessage())
-                .queryParam("author", command.getAuthor())
-                .queryParam("pause",  command.hasPauseEnabled() ? "1" : "0");
-		
-		LOGGER.trace("POST: {}", webResource);
-		ObjectNode objectNode = webResource.request().accept("application/vnd.docker.raw-stream").post(entity(command, MediaType.APPLICATION_JSON), ObjectNode.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CommitCmdExec.class);
+
+    public CommitCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected String execute(CommitCmd command) {
+        WebTarget webResource = getBaseResource().path("/commit").queryParam("container", command.getContainerId())
+                .queryParam("repo", command.getRepository()).queryParam("tag", command.getTag())
+                .queryParam("m", command.getMessage()).queryParam("author", command.getAuthor())
+                .queryParam("pause", command.hasPauseEnabled() ? "1" : "0");
+
+        LOGGER.trace("POST: {}", webResource);
+        ObjectNode objectNode = webResource.request().accept("application/vnd.docker.raw-stream")
+                .post(entity(command, MediaType.APPLICATION_JSON), ObjectNode.class);
         return objectNode.get("Id").asText();
-	}
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java
index 2b7059b33..c7c8c293a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java
@@ -12,23 +12,23 @@
 import com.github.dockerjava.api.command.ContainerDiffCmd;
 import com.github.dockerjava.api.model.ChangeLog;
 
-public class ContainerDiffCmdExec extends AbstrDockerCmdExec<ContainerDiffCmd, List<ChangeLog>> implements ContainerDiffCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(ContainerDiffCmdExec.class);
-	
-	public ContainerDiffCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected List<ChangeLog> execute(ContainerDiffCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/{id}/changes").resolveTemplate("id", command.getContainerId());
-		
-		LOGGER.trace("GET: {}", webResource);
-		return webResource.request().accept(MediaType.APPLICATION_JSON)
-				.get(new GenericType<List<ChangeLog>>() {
+public class ContainerDiffCmdExec extends AbstrDockerCmdExec<ContainerDiffCmd, List<ChangeLog>> implements
+        ContainerDiffCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ContainerDiffCmdExec.class);
+
+    public ContainerDiffCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected List<ChangeLog> execute(ContainerDiffCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/changes").resolveTemplate("id",
+                command.getContainerId());
+
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(new GenericType<List<ChangeLog>>() {
         });
-	}
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
index 0a738be83..88e8c3086 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
@@ -14,26 +14,26 @@
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
 import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
 
-public class CopyFileFromContainerCmdExec extends AbstrDockerCmdExec<CopyFileFromContainerCmd, InputStream> implements CopyFileFromContainerCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(CopyFileFromContainerCmdExec.class);
-	
-	public CopyFileFromContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected InputStream execute(CopyFileFromContainerCmd command) {
-		WebTarget webResource = getBaseResource()
-				.path("/containers/{id}/copy")
-				.resolveTemplate("id", command.getContainerId());
-
-		LOGGER.trace("POST: " + webResource.toString());
-		
-		Response response = webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE).post(entity(command, MediaType.APPLICATION_JSON));
-		
-		return new WrappedResponseInputStream(response);
-	}
+public class CopyFileFromContainerCmdExec extends AbstrDockerCmdExec<CopyFileFromContainerCmd, InputStream> implements
+        CopyFileFromContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CopyFileFromContainerCmdExec.class);
+
+    public CopyFileFromContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected InputStream execute(CopyFileFromContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/copy").resolveTemplate("id",
+                command.getContainerId());
+
+        LOGGER.trace("POST: " + webResource.toString());
+
+        Response response = webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE)
+                .post(entity(command, MediaType.APPLICATION_JSON));
+
+        return new WrappedResponseInputStream(response);
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
index 26dc25cd2..c02b9f4b7 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
@@ -11,25 +11,26 @@
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 
-public class CreateContainerCmdExec extends AbstrDockerCmdExec<CreateContainerCmd, CreateContainerResponse> implements CreateContainerCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(CreateContainerCmdExec.class);
-	
-	public CreateContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected CreateContainerResponse execute(CreateContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/create");
+public class CreateContainerCmdExec extends AbstrDockerCmdExec<CreateContainerCmd, CreateContainerResponse> implements
+        CreateContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateContainerCmdExec.class);
+
+    public CreateContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected CreateContainerResponse execute(CreateContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/create");
 
         if (command.getName() != null) {
             webResource = webResource.queryParam("name", command.getName());
         }
 
-		LOGGER.trace("POST: {} ", webResource);
-		return webResource.request().accept(MediaType.APPLICATION_JSON)
-				.post(entity(command, MediaType.APPLICATION_JSON), CreateContainerResponse.class);
-	}
+        LOGGER.trace("POST: {} ", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(entity(command, MediaType.APPLICATION_JSON), CreateContainerResponse.class);
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
index 4c7bae8b0..c5733241d 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
@@ -11,25 +11,22 @@
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.CreateImageResponse;
 
-public class CreateImageCmdExec extends AbstrDockerCmdExec<CreateImageCmd, CreateImageResponse> implements CreateImageCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(CreateImageCmdExec.class);
-	
-	public CreateImageCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected CreateImageResponse execute(CreateImageCmd command) {
-		WebTarget webResource = getBaseResource()
-                .path("/images/create")
-                .queryParam("repo", command.getRepository())
-                .queryParam("tag", command.getTag())
-                .queryParam("fromSrc", "-");
-		
-		LOGGER.trace("POST: {}", webResource);
-		return webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE)
-				.post(entity(command.getImageStream(), MediaType.APPLICATION_OCTET_STREAM), CreateImageResponse.class);
-	}
+public class CreateImageCmdExec extends AbstrDockerCmdExec<CreateImageCmd, CreateImageResponse> implements
+        CreateImageCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateImageCmdExec.class);
+
+    public CreateImageCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected CreateImageResponse execute(CreateImageCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/create").queryParam("repo", command.getRepository())
+                .queryParam("tag", command.getTag()).queryParam("fromSrc", "-");
+
+        LOGGER.trace("POST: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE)
+                .post(entity(command.getImageStream(), MediaType.APPLICATION_OCTET_STREAM), CreateImageResponse.class);
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index 8a5d5d879..77712fdeb 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -25,7 +25,6 @@
 import org.glassfish.jersey.CommonProperties;
 import org.glassfish.jersey.apache.connector.ApacheClientProperties;
 
-
 //import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 // see https://github.com/docker-java/docker-java/issues/196
 import com.github.dockerjava.jaxrs.connector.ApacheConnectorProvider;
@@ -41,302 +40,286 @@
 import com.github.dockerjava.core.util.ResponseStatusExceptionFilter;
 import com.github.dockerjava.core.util.SelectiveLoggingFilter;
 
-
 public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
 
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(DockerCmdExecFactoryImpl.class.getName());
-	private Client client;
-	private WebTarget baseResource;
-
-	@Override
-	public void init(DockerClientConfig dockerClientConfig) {
-		checkNotNull(dockerClientConfig, "config was not specified");
-
-		ClientConfig clientConfig = new ClientConfig();
-		clientConfig.connectorProvider(new ApacheConnectorProvider());
-		clientConfig.property(CommonProperties.FEATURE_AUTO_DISCOVERY_DISABLE,
-				true);
-
-		clientConfig.register(ResponseStatusExceptionFilter.class);
-		clientConfig.register(JsonClientFilter.class);
-		clientConfig.register(JacksonJsonProvider.class);
-
-		if (dockerClientConfig.followRedirectsFilterEnabled()) {
-			clientConfig.register(FollowRedirectsFilter.class);
-		}
-
-		if (dockerClientConfig.isLoggingFilterEnabled()) {
-			clientConfig.register(new SelectiveLoggingFilter(LOGGER, true));
-		}
-
-		if (dockerClientConfig.getReadTimeout() != null) {
-			int readTimeout = dockerClientConfig.getReadTimeout();
-			clientConfig.property(ClientProperties.READ_TIMEOUT, readTimeout);
-		}
-
-		//clientConfig.property(ClientProperties.CONNECT_TIMEOUT, 10000);
-
-		URI originalUri = dockerClientConfig.getUri();
-
-		SSLContext sslContext = null;
-
-		if (dockerClientConfig.getSslConfig() != null) {
-			try {
-				sslContext = dockerClientConfig.getSslConfig().getSSLContext();
-			} catch (Exception ex) {
-				throw new DockerClientException("Error in SSL Configuration",
-						ex);
-			}
-		}
-
-		PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager(
-				getSchemeRegistry(originalUri, sslContext), null, null, null, 10, TimeUnit.SECONDS);
-
-
-		if (dockerClientConfig.getMaxTotalConnections() != null)
-			connManager
-					.setMaxTotal(dockerClientConfig.getMaxTotalConnections());
-		if (dockerClientConfig.getMaxPerRoutConnections() != null)
-			connManager.setDefaultMaxPerRoute(dockerClientConfig
-					.getMaxPerRoutConnections());
-
-		clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER,
-				connManager);
-
-		clientConfig.property(ApacheClientProperties.REQUEST_CONFIG,
-                RequestConfig.custom().setConnectionRequestTimeout(1000).build());
-
-		ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(
-				clientConfig);
-
-		if (sslContext != null) {
-			clientBuilder.sslContext(sslContext);
-		}
-
-		client = clientBuilder.build();
-
-		if (originalUri.getScheme().equals("unix")) {
-			dockerClientConfig.setUri(UnixConnectionSocketFactory
-					.sanitizeUri(originalUri));
-		}
-		WebTarget webResource = client.target(dockerClientConfig.getUri());
-
-		if (dockerClientConfig.getVersion() == null
-				|| dockerClientConfig.getVersion().isEmpty()) {
-			baseResource = webResource;
-		} else {
-			baseResource = webResource.path("v"
-					+ dockerClientConfig.getVersion());
-		}
-	}
-
-	private org.apache.http.config.Registry<ConnectionSocketFactory> getSchemeRegistry(
-			final URI originalUri, SSLContext sslContext) {
-		RegistryBuilder<ConnectionSocketFactory> registryBuilder = RegistryBuilder
-				.create();
-		registryBuilder.register("http",
-				PlainConnectionSocketFactory.getSocketFactory());
-		if (sslContext != null) {
-			registryBuilder.register("https", new SSLConnectionSocketFactory(
-					sslContext));
-		}
-		registryBuilder.register("unix", new UnixConnectionSocketFactory(
-				originalUri));
-		return registryBuilder.build();
-	}
-
-	protected WebTarget getBaseResource() {
-		checkNotNull(baseResource,
-				"Factory not initialized. You probably forgot to call init()!");
-		return baseResource;
-	}
-
-	@Override
-	public AuthCmd.Exec createAuthCmdExec() {
-		return new AuthCmdExec(getBaseResource());
-	}
-
-	@Override
-	public InfoCmd.Exec createInfoCmdExec() {
-		return new InfoCmdExec(getBaseResource());
-	}
-
-	@Override
-	public PingCmd.Exec createPingCmdExec() {
-		return new PingCmdExec(getBaseResource());
-	}
-
-	@Override
-	public VersionCmd.Exec createVersionCmdExec() {
-		return new VersionCmdExec(getBaseResource());
-	}
-
-	@Override
-	public PullImageCmd.Exec createPullImageCmdExec() {
-		return new PullImageCmdExec(getBaseResource());
-	}
-
-	@Override
-	public PushImageCmd.Exec createPushImageCmdExec() {
-		return new PushImageCmdExec(getBaseResource());
-	}
-
-	@Override
-	public SaveImageCmd.Exec createSaveImageCmdExec() {
-		return new SaveImageCmdExec(getBaseResource());
-	}
-
-	@Override
-	public CreateImageCmd.Exec createCreateImageCmdExec() {
-		return new CreateImageCmdExec(getBaseResource());
-	}
-
-	@Override
-	public SearchImagesCmd.Exec createSearchImagesCmdExec() {
-		return new SearchImagesCmdExec(getBaseResource());
-	}
-
-	@Override
-	public RemoveImageCmd.Exec createRemoveImageCmdExec() {
-		return new RemoveImageCmdExec(getBaseResource());
-	}
-
-	@Override
-	public ListImagesCmd.Exec createListImagesCmdExec() {
-		return new ListImagesCmdExec(getBaseResource());
-	}
-
-	@Override
-	public InspectImageCmd.Exec createInspectImageCmdExec() {
-		return new InspectImageCmdExec(getBaseResource());
-	}
-
-	@Override
-	public ListContainersCmd.Exec createListContainersCmdExec() {
-		return new ListContainersCmdExec(getBaseResource());
-	}
-
-	@Override
-	public CreateContainerCmd.Exec createCreateContainerCmdExec() {
-		return new CreateContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public StartContainerCmd.Exec createStartContainerCmdExec() {
-		return new StartContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public InspectContainerCmd.Exec createInspectContainerCmdExec() {
-		return new InspectContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public ExecCreateCmd.Exec createExecCmdExec() {
-		return new ExecCreateCmdExec(getBaseResource());
-	}
-
-	@Override
-	public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
-		return new RemoveContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public WaitContainerCmd.Exec createWaitContainerCmdExec() {
-		return new WaitContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public AttachContainerCmd.Exec createAttachContainerCmdExec() {
-		return new AttachContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public ExecStartCmd.Exec createExecStartCmdExec() {
-		return new ExecStartCmdExec(getBaseResource());
-	}
-
-	@Override
-	public InspectExecCmd.Exec createInspectExecCmdExec() {
-		return new InspectExecCmdExec(getBaseResource());
-	}
-
-	@Override
-	public LogContainerCmd.Exec createLogContainerCmdExec() {
-		return new LogContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
-		return new CopyFileFromContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public StopContainerCmd.Exec createStopContainerCmdExec() {
-		return new StopContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
-		return new ContainerDiffCmdExec(getBaseResource());
-	}
-
-	@Override
-	public KillContainerCmd.Exec createKillContainerCmdExec() {
-		return new KillContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public RestartContainerCmd.Exec createRestartContainerCmdExec() {
-		return new RestartContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public CommitCmd.Exec createCommitCmdExec() {
-		return new CommitCmdExec(getBaseResource());
-	}
-
-	@Override
-	public BuildImageCmd.Exec createBuildImageCmdExec() {
-		return new BuildImageCmdExec(getBaseResource());
-	}
-
-	@Override
-	public TopContainerCmd.Exec createTopContainerCmdExec() {
-		return new TopContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public TagImageCmd.Exec createTagImageCmdExec() {
-		return new TagImageCmdExec(getBaseResource());
-	}
-
-	@Override
-	public PauseContainerCmd.Exec createPauseContainerCmdExec() {
-		return new PauseContainerCmdExec(getBaseResource());
-	}
-
-	@Override
-	public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
-		return new UnpauseContainerCmdExec(baseResource);
-	}
-
-	@Override
-	public EventsCmd.Exec createEventsCmdExec() {
-		return new EventsCmdExec(getBaseResource());
-	}
-
-	@Override
+    private static final Logger LOGGER = LoggerFactory.getLogger(DockerCmdExecFactoryImpl.class.getName());
+
+    private Client client;
+
+    private WebTarget baseResource;
+
+    @Override
+    public void init(DockerClientConfig dockerClientConfig) {
+        checkNotNull(dockerClientConfig, "config was not specified");
+
+        ClientConfig clientConfig = new ClientConfig();
+        clientConfig.connectorProvider(new ApacheConnectorProvider());
+        clientConfig.property(CommonProperties.FEATURE_AUTO_DISCOVERY_DISABLE, true);
+
+        clientConfig.register(ResponseStatusExceptionFilter.class);
+        clientConfig.register(JsonClientFilter.class);
+        clientConfig.register(JacksonJsonProvider.class);
+
+        if (dockerClientConfig.followRedirectsFilterEnabled()) {
+            clientConfig.register(FollowRedirectsFilter.class);
+        }
+
+        if (dockerClientConfig.isLoggingFilterEnabled()) {
+            clientConfig.register(new SelectiveLoggingFilter(LOGGER, true));
+        }
+
+        if (dockerClientConfig.getReadTimeout() != null) {
+            int readTimeout = dockerClientConfig.getReadTimeout();
+            clientConfig.property(ClientProperties.READ_TIMEOUT, readTimeout);
+        }
+
+        // clientConfig.property(ClientProperties.CONNECT_TIMEOUT, 10000);
+
+        URI originalUri = dockerClientConfig.getUri();
+
+        SSLContext sslContext = null;
+
+        if (dockerClientConfig.getSslConfig() != null) {
+            try {
+                sslContext = dockerClientConfig.getSslConfig().getSSLContext();
+            } catch (Exception ex) {
+                throw new DockerClientException("Error in SSL Configuration", ex);
+            }
+        }
+
+        PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(
+                originalUri, sslContext), null, null, null, 10, TimeUnit.SECONDS);
+
+        if (dockerClientConfig.getMaxTotalConnections() != null)
+            connManager.setMaxTotal(dockerClientConfig.getMaxTotalConnections());
+        if (dockerClientConfig.getMaxPerRoutConnections() != null)
+            connManager.setDefaultMaxPerRoute(dockerClientConfig.getMaxPerRoutConnections());
+
+        clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER, connManager);
+
+        clientConfig.property(ApacheClientProperties.REQUEST_CONFIG, RequestConfig.custom()
+                .setConnectionRequestTimeout(1000).build());
+
+        ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(clientConfig);
+
+        if (sslContext != null) {
+            clientBuilder.sslContext(sslContext);
+        }
+
+        client = clientBuilder.build();
+
+        if (originalUri.getScheme().equals("unix")) {
+            dockerClientConfig.setUri(UnixConnectionSocketFactory.sanitizeUri(originalUri));
+        }
+        WebTarget webResource = client.target(dockerClientConfig.getUri());
+
+        if (dockerClientConfig.getVersion() == null || dockerClientConfig.getVersion().isEmpty()) {
+            baseResource = webResource;
+        } else {
+            baseResource = webResource.path("v" + dockerClientConfig.getVersion());
+        }
+    }
+
+    private org.apache.http.config.Registry<ConnectionSocketFactory> getSchemeRegistry(final URI originalUri,
+            SSLContext sslContext) {
+        RegistryBuilder<ConnectionSocketFactory> registryBuilder = RegistryBuilder.create();
+        registryBuilder.register("http", PlainConnectionSocketFactory.getSocketFactory());
+        if (sslContext != null) {
+            registryBuilder.register("https", new SSLConnectionSocketFactory(sslContext));
+        }
+        registryBuilder.register("unix", new UnixConnectionSocketFactory(originalUri));
+        return registryBuilder.build();
+    }
+
+    protected WebTarget getBaseResource() {
+        checkNotNull(baseResource, "Factory not initialized. You probably forgot to call init()!");
+        return baseResource;
+    }
+
+    @Override
+    public AuthCmd.Exec createAuthCmdExec() {
+        return new AuthCmdExec(getBaseResource());
+    }
+
+    @Override
+    public InfoCmd.Exec createInfoCmdExec() {
+        return new InfoCmdExec(getBaseResource());
+    }
+
+    @Override
+    public PingCmd.Exec createPingCmdExec() {
+        return new PingCmdExec(getBaseResource());
+    }
+
+    @Override
+    public VersionCmd.Exec createVersionCmdExec() {
+        return new VersionCmdExec(getBaseResource());
+    }
+
+    @Override
+    public PullImageCmd.Exec createPullImageCmdExec() {
+        return new PullImageCmdExec(getBaseResource());
+    }
+
+    @Override
+    public PushImageCmd.Exec createPushImageCmdExec() {
+        return new PushImageCmdExec(getBaseResource());
+    }
+
+    @Override
+    public SaveImageCmd.Exec createSaveImageCmdExec() {
+        return new SaveImageCmdExec(getBaseResource());
+    }
+
+    @Override
+    public CreateImageCmd.Exec createCreateImageCmdExec() {
+        return new CreateImageCmdExec(getBaseResource());
+    }
+
+    @Override
+    public SearchImagesCmd.Exec createSearchImagesCmdExec() {
+        return new SearchImagesCmdExec(getBaseResource());
+    }
+
+    @Override
+    public RemoveImageCmd.Exec createRemoveImageCmdExec() {
+        return new RemoveImageCmdExec(getBaseResource());
+    }
+
+    @Override
+    public ListImagesCmd.Exec createListImagesCmdExec() {
+        return new ListImagesCmdExec(getBaseResource());
+    }
+
+    @Override
+    public InspectImageCmd.Exec createInspectImageCmdExec() {
+        return new InspectImageCmdExec(getBaseResource());
+    }
+
+    @Override
+    public ListContainersCmd.Exec createListContainersCmdExec() {
+        return new ListContainersCmdExec(getBaseResource());
+    }
+
+    @Override
+    public CreateContainerCmd.Exec createCreateContainerCmdExec() {
+        return new CreateContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public StartContainerCmd.Exec createStartContainerCmdExec() {
+        return new StartContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public InspectContainerCmd.Exec createInspectContainerCmdExec() {
+        return new InspectContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public ExecCreateCmd.Exec createExecCmdExec() {
+        return new ExecCreateCmdExec(getBaseResource());
+    }
+
+    @Override
+    public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
+        return new RemoveContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public WaitContainerCmd.Exec createWaitContainerCmdExec() {
+        return new WaitContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public AttachContainerCmd.Exec createAttachContainerCmdExec() {
+        return new AttachContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public ExecStartCmd.Exec createExecStartCmdExec() {
+        return new ExecStartCmdExec(getBaseResource());
+    }
+
+    @Override
+    public InspectExecCmd.Exec createInspectExecCmdExec() {
+        return new InspectExecCmdExec(getBaseResource());
+    }
+
+    @Override
+    public LogContainerCmd.Exec createLogContainerCmdExec() {
+        return new LogContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
+        return new CopyFileFromContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public StopContainerCmd.Exec createStopContainerCmdExec() {
+        return new StopContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
+        return new ContainerDiffCmdExec(getBaseResource());
+    }
+
+    @Override
+    public KillContainerCmd.Exec createKillContainerCmdExec() {
+        return new KillContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public RestartContainerCmd.Exec createRestartContainerCmdExec() {
+        return new RestartContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public CommitCmd.Exec createCommitCmdExec() {
+        return new CommitCmdExec(getBaseResource());
+    }
+
+    @Override
+    public BuildImageCmd.Exec createBuildImageCmdExec() {
+        return new BuildImageCmdExec(getBaseResource());
+    }
+
+    @Override
+    public TopContainerCmd.Exec createTopContainerCmdExec() {
+        return new TopContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public TagImageCmd.Exec createTagImageCmdExec() {
+        return new TagImageCmdExec(getBaseResource());
+    }
+
+    @Override
+    public PauseContainerCmd.Exec createPauseContainerCmdExec() {
+        return new PauseContainerCmdExec(getBaseResource());
+    }
+
+    @Override
+    public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
+        return new UnpauseContainerCmdExec(baseResource);
+    }
+
+    @Override
+    public EventsCmd.Exec createEventsCmdExec() {
+        return new EventsCmdExec(getBaseResource());
+    }
+
+    @Override
     public StatsCmd.Exec createStatsCmdExec() {
-	    return new StatsCmdExec(getBaseResource());
-	}
-
-	@Override
-	public void close() throws IOException {
-		checkNotNull(client,
-				"Factory not initialized. You probably forgot to call init()!");
-		client.close();
-	}
+        return new StatsCmdExec(getBaseResource());
+    }
+
+    @Override
+    public void close() throws IOException {
+        checkNotNull(client, "Factory not initialized. You probably forgot to call init()!");
+        client.close();
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
index 98b93fd48..69578a533 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -27,8 +27,8 @@ protected Void execute(EventsCmd command) {
 
         LOGGER.trace("GET: {}", webTarget);
 
-        GETCallbackNotifier<Event> callbackNotifier = new GETCallbackNotifier<Event>(
-                new JsonStreamProcessor<Event>(Event.class), command.getResultCallback(), webTarget);
+        GETCallbackNotifier<Event> callbackNotifier = new GETCallbackNotifier<Event>(new JsonStreamProcessor<Event>(
+                Event.class), command.getResultCallback(), webTarget);
 
         AbstractCallbackNotifier.startAsyncProcessing(callbackNotifier);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
index 02ea4d8ae..e2d986bbf 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
@@ -10,10 +10,10 @@
 
 import static javax.ws.rs.client.Entity.entity;
 
-public class ExecCreateCmdExec extends AbstrDockerCmdExec<ExecCreateCmd, ExecCreateCmdResponse> implements ExecCreateCmd.Exec {
+public class ExecCreateCmdExec extends AbstrDockerCmdExec<ExecCreateCmd, ExecCreateCmdResponse> implements
+        ExecCreateCmd.Exec {
 
-    private static final Logger LOGGER = LoggerFactory
-            .getLogger(VersionCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(VersionCmdExec.class);
 
     public ExecCreateCmdExec(WebTarget baseResource) {
         super(baseResource);
@@ -21,13 +21,12 @@ public ExecCreateCmdExec(WebTarget baseResource) {
 
     @Override
     protected ExecCreateCmdResponse execute(ExecCreateCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/exec").resolveTemplate("id", command.getContainerId());
+        WebTarget webResource = getBaseResource().path("/containers/{id}/exec").resolveTemplate("id",
+                command.getContainerId());
 
         LOGGER.trace("POST: {}", webResource);
 
-		return webResource
-				.request()
-				.accept(MediaType.APPLICATION_JSON)
-				.post(entity(command, MediaType.APPLICATION_JSON), ExecCreateCmdResponse.class);
+        return webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(entity(command, MediaType.APPLICATION_JSON), ExecCreateCmdResponse.class);
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
index cbac951d3..46d0e2d29 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
@@ -22,18 +22,15 @@ public ExecStartCmdExec(WebTarget baseResource) {
         super(baseResource);
     }
 
-
     @Override
     protected InputStream execute(ExecStartCmd command) {
         WebTarget webResource = getBaseResource().path("/exec/{id}/start").resolveTemplate("id", command.getExecId());
 
         LOGGER.trace("POST: {}", webResource);
 
-		Response response = webResource
-				.request()
-				.accept(MediaType.APPLICATION_JSON)
-				.post(entity(command, MediaType.APPLICATION_JSON), Response.class);
-		
-		return new WrappedResponseInputStream(response);
+        Response response = webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(entity(command, MediaType.APPLICATION_JSON), Response.class);
+
+        return new WrappedResponseInputStream(response);
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
index c585f31c9..eafb87b98 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
@@ -10,20 +10,19 @@
 import com.github.dockerjava.api.model.Info;
 
 public class InfoCmdExec extends AbstrDockerCmdExec<InfoCmd, Info> implements InfoCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(InfoCmdExec.class);
-	
-	public InfoCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected Info execute(InfoCmd command) {
-		WebTarget webResource = getBaseResource().path("/info");
-
-		LOGGER.trace("GET: {}", webResource);
-		return webResource.request().accept(MediaType.APPLICATION_JSON).get(Info.class);
-	}
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InfoCmdExec.class);
+
+    public InfoCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected Info execute(InfoCmd command) {
+        WebTarget webResource = getBaseResource().path("/info");
+
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(Info.class);
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
index 664a67c59..a06e46e7c 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
@@ -3,28 +3,28 @@
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 
-public class InspectContainerCmdExec extends AbstrDockerCmdExec<InspectContainerCmd, InspectContainerResponse> implements InspectContainerCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(InspectContainerCmdExec.class);
-	
-	public InspectContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected InspectContainerResponse execute(InspectContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/{id}/json").resolveTemplate("id", command.getContainerId());
-		
-		LOGGER.debug("GET: {}", webResource);
-		return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectContainerResponse.class);
-	}
+public class InspectContainerCmdExec extends AbstrDockerCmdExec<InspectContainerCmd, InspectContainerResponse>
+        implements InspectContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InspectContainerCmdExec.class);
+
+    public InspectContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected InspectContainerResponse execute(InspectContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/json").resolveTemplate("id",
+                command.getContainerId());
+
+        LOGGER.debug("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectContainerResponse.class);
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
index b9ee33d61..a58a520cd 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
@@ -8,7 +8,8 @@
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
-public class InspectExecCmdExec extends AbstrDockerCmdExec<InspectExecCmd, InspectExecResponse> implements InspectExecCmd.Exec {
+public class InspectExecCmdExec extends AbstrDockerCmdExec<InspectExecCmd, InspectExecResponse> implements
+        InspectExecCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(InspectExecCmdExec.class);
 
     public InspectExecCmdExec(WebTarget baseResource) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java
index 784266091..b03cdd799 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java
@@ -9,21 +9,21 @@
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectImageResponse;
 
-public class InspectImageCmdExec extends AbstrDockerCmdExec<InspectImageCmd, InspectImageResponse> implements InspectImageCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(InspectImageCmdExec.class);
-	
-	public InspectImageCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected InspectImageResponse execute(InspectImageCmd command) {
-		WebTarget webResource = getBaseResource().path("/images/{id}/json").resolveTemplate("id", command.getImageId());
-
-		LOGGER.trace("GET: {}", webResource);
-		return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectImageResponse.class);
-	}
+public class InspectImageCmdExec extends AbstrDockerCmdExec<InspectImageCmd, InspectImageResponse> implements
+        InspectImageCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InspectImageCmdExec.class);
+
+    public InspectImageCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected InspectImageResponse execute(InspectImageCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/{id}/json").resolveTemplate("id", command.getImageId());
+
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectImageResponse.class);
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
index 6164064c9..bbfd0dbee 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
@@ -8,30 +8,27 @@
 
 import com.github.dockerjava.api.command.KillContainerCmd;
 
-public class KillContainerCmdExec extends
-		AbstrDockerCmdExec<KillContainerCmd, Void> implements
-		KillContainerCmd.Exec {
+public class KillContainerCmdExec extends AbstrDockerCmdExec<KillContainerCmd, Void> implements KillContainerCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(KillContainerCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(KillContainerCmdExec.class);
 
-	public KillContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public KillContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected Void execute(KillContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/{id}/kill")
-				.resolveTemplate("id", command.getContainerId());
+    @Override
+    protected Void execute(KillContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/kill").resolveTemplate("id",
+                command.getContainerId());
 
-		if (command.getSignal() != null) {
-			webResource = webResource.queryParam("signal", command.getSignal());
-		}
+        if (command.getSignal() != null) {
+            webResource = webResource.queryParam("signal", command.getSignal());
+        }
 
-		LOGGER.trace("POST: {}", webResource);
-		webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
 
-		return null;
-	}
+        return null;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
index 018db9a56..5bb905b56 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
@@ -12,19 +12,19 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.model.Container;
 
-public class ListContainersCmdExec extends AbstrDockerCmdExec<ListContainersCmd, List<Container>> implements ListContainersCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(ListContainersCmdExec.class);
-	
-	public ListContainersCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected List<Container> execute(ListContainersCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/json")
-                .queryParam("all", command.hasShowAllEnabled() ? "1" : "0")
-                .queryParam("since", command.getSinceId())
+public class ListContainersCmdExec extends AbstrDockerCmdExec<ListContainersCmd, List<Container>> implements
+        ListContainersCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ListContainersCmdExec.class);
+
+    public ListContainersCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected List<Container> execute(ListContainersCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/json")
+                .queryParam("all", command.hasShowAllEnabled() ? "1" : "0").queryParam("since", command.getSinceId())
                 .queryParam("before", command.getBeforeId())
                 .queryParam("size", command.hasShowSizeEnabled() ? "1" : "0");
 
@@ -32,12 +32,13 @@ protected List<Container> execute(ListContainersCmd command) {
             webResource = webResource.queryParam("limit", String.valueOf(command.getLimit()));
         }
 
-		LOGGER.trace("GET: {}", webResource);
-		List<Container> containers = webResource.request().accept(MediaType.APPLICATION_JSON).get(new GenericType<List<Container>>() {
-        });
-		LOGGER.trace("Response: {}", containers);
+        LOGGER.trace("GET: {}", webResource);
+        List<Container> containers = webResource.request().accept(MediaType.APPLICATION_JSON)
+                .get(new GenericType<List<Container>>() {
+                });
+        LOGGER.trace("Response: {}", containers);
 
-		return containers;
-	}
+        return containers;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
index 59e08fb60..b18470e12 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
@@ -14,35 +14,30 @@
 
 import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
 
-public class ListImagesCmdExec extends
-		AbstrDockerCmdExec<ListImagesCmd, List<Image>> implements
-		ListImagesCmd.Exec {
+public class ListImagesCmdExec extends AbstrDockerCmdExec<ListImagesCmd, List<Image>> implements ListImagesCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(ListImagesCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ListImagesCmdExec.class);
 
-	public ListImagesCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public ListImagesCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected List<Image> execute(ListImagesCmd command) {
-		WebTarget webResource = getBaseResource().path("/images/json")
-				.queryParam("all", command.hasShowAllEnabled() ? "1" : "0");
+    @Override
+    protected List<Image> execute(ListImagesCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/json").queryParam("all",
+                command.hasShowAllEnabled() ? "1" : "0");
 
-		if (command.getFilters() != null)
-			webResource = webResource.queryParam("filters",
-					urlPathSegmentEscaper().escape(command.getFilters()));
+        if (command.getFilters() != null)
+            webResource = webResource.queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters()));
 
-		LOGGER.trace("GET: {}", webResource);
+        LOGGER.trace("GET: {}", webResource);
 
-		List<Image> images = webResource.request()
-				.accept(MediaType.APPLICATION_JSON)
-				.get(new GenericType<List<Image>>() {
-				});
-		LOGGER.trace("Response: {}", images);
+        List<Image> images = webResource.request().accept(MediaType.APPLICATION_JSON)
+                .get(new GenericType<List<Image>>() {
+                });
+        LOGGER.trace("Response: {}", images);
 
-		return images;
-	}
+        return images;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
index a738ef976..83a20bce1 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
@@ -14,31 +14,30 @@
 
 public class LogContainerCmdExec extends AbstrDockerCmdExec<LogContainerCmd, Void> implements LogContainerCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(LogContainerCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(LogContainerCmdExec.class);
 
-	public LogContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public LogContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected Void execute(LogContainerCmd command) {
-		WebTarget webTarget = getBaseResource().path("/containers/{id}/logs")
-				.resolveTemplate("id", command.getContainerId())
-				.queryParam("timestamps", command.hasTimestampsEnabled() ? "1" : "0")
-				.queryParam("stdout", command.hasStdoutEnabled() ? "1" : "0")
-				.queryParam("stderr", command.hasStderrEnabled() ? "1" : "0")
-				.queryParam("follow", command.hasFollowStreamEnabled() ? "1" : "0")
-				.queryParam("tail", command.getTail() < 0 ? "all" : "" + command.getTail());
+    @Override
+    protected Void execute(LogContainerCmd command) {
+        WebTarget webTarget = getBaseResource().path("/containers/{id}/logs")
+                .resolveTemplate("id", command.getContainerId())
+                .queryParam("timestamps", command.hasTimestampsEnabled() ? "1" : "0")
+                .queryParam("stdout", command.hasStdoutEnabled() ? "1" : "0")
+                .queryParam("stderr", command.hasStderrEnabled() ? "1" : "0")
+                .queryParam("follow", command.hasFollowStreamEnabled() ? "1" : "0")
+                .queryParam("tail", command.getTail() < 0 ? "all" : "" + command.getTail());
 
-		LOGGER.trace("GET: {}", webTarget);
+        LOGGER.trace("GET: {}", webTarget);
 
-		GETCallbackNotifier<Frame> callbackNotifier = new GETCallbackNotifier<Frame>(
-                new FrameStreamProcessor(), command.getResultCallback(), webTarget);
+        GETCallbackNotifier<Frame> callbackNotifier = new GETCallbackNotifier<Frame>(new FrameStreamProcessor(),
+                command.getResultCallback(), webTarget);
 
         AbstractCallbackNotifier.startAsyncProcessing(callbackNotifier);
 
         return null;
-	}
-
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
index 429c61edb..4bd8ddd9a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
@@ -8,27 +8,24 @@
 
 import com.github.dockerjava.api.command.PauseContainerCmd;
 
-public class PauseContainerCmdExec extends
-		AbstrDockerCmdExec<PauseContainerCmd, Void> implements
-		PauseContainerCmd.Exec {
+public class PauseContainerCmdExec extends AbstrDockerCmdExec<PauseContainerCmd, Void> implements
+        PauseContainerCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(PauseContainerCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PauseContainerCmdExec.class);
 
-	public PauseContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public PauseContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected Void execute(PauseContainerCmd command) {
-		WebTarget webResource = getBaseResource()
-				.path("/containers/{id}/pause").resolveTemplate("id",
-						command.getContainerId());
+    @Override
+    protected Void execute(PauseContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/pause").resolveTemplate("id",
+                command.getContainerId());
 
-		LOGGER.trace("POST: {}", webResource);
-		webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
 
-		return null;
-	}
+        return null;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
index 65bdc04b1..9e2677e58 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
@@ -9,20 +9,20 @@
 
 public class PingCmdExec extends AbstrDockerCmdExec<PingCmd, Void> implements PingCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(PingCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PingCmdExec.class);
 
-	public PingCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public PingCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected Void execute(PingCmd command) {
+        WebTarget webResource = getBaseResource().path("/_ping");
 
-	@Override
-	protected Void execute(PingCmd command) {
-		WebTarget webResource = getBaseResource().path("/_ping");
-	       
         LOGGER.trace("GET: {}", webResource);
         webResource.request().get().close();
-        
+
         return null;
-	}
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
index bd89d22f6..c317aa1c9 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
@@ -14,39 +14,32 @@
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
 
-public class PullImageCmdExec extends
-		AbstrDockerCmdExec<PullImageCmd, InputStream> implements
-		PullImageCmd.Exec {
-
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(PullImageCmdExec.class);
-
-	public PullImageCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected InputStream execute(PullImageCmd command) {
-		WebTarget webResource = getBaseResource().path("/images/create")
-				.queryParam("tag", command.getTag())
-				.queryParam("fromImage", command.getRepository())
-				.queryParam("registry", command.getRegistry());
-
-		LOGGER.trace("POST: {}", webResource);
-		Response response =  resourceWithOptionalAuthConfig(command, webResource.request())
-				.accept(MediaType.APPLICATION_OCTET_STREAM_TYPE).post(null);
-		
-		return new WrappedResponseInputStream(response);
-	}
-
-	private Invocation.Builder resourceWithOptionalAuthConfig(
-			PullImageCmd command, Invocation.Builder request) {
-		AuthConfig authConfig = command.getAuthConfig();
-		if (authConfig != null) {
-			request = request.header("X-Registry-Auth",
-					registryAuth(authConfig));
-		}
-		return request;
-	}
+public class PullImageCmdExec extends AbstrDockerCmdExec<PullImageCmd, InputStream> implements PullImageCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PullImageCmdExec.class);
+
+    public PullImageCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected InputStream execute(PullImageCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/create").queryParam("tag", command.getTag())
+                .queryParam("fromImage", command.getRepository()).queryParam("registry", command.getRegistry());
+
+        LOGGER.trace("POST: {}", webResource);
+        Response response = resourceWithOptionalAuthConfig(command, webResource.request()).accept(
+                MediaType.APPLICATION_OCTET_STREAM_TYPE).post(null);
+
+        return new WrappedResponseInputStream(response);
+    }
+
+    private Invocation.Builder resourceWithOptionalAuthConfig(PullImageCmd command, Invocation.Builder request) {
+        AuthConfig authConfig = command.getAuthConfig();
+        if (authConfig != null) {
+            request = request.header("X-Registry-Auth", registryAuth(authConfig));
+        }
+        return request;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
index 7fc88d91b..4f5ca5d0a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.jaxrs;
 
-
-
 import static javax.ws.rs.client.Entity.entity;
 
 import java.io.IOException;
@@ -26,64 +24,58 @@
 import com.google.common.collect.ImmutableList;
 
 public class PushImageCmdExec extends AbstrDockerCmdExec<PushImageCmd, Response> implements PushImageCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(PushImageCmdExec.class);
-	
-	public PushImageCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected ResponseImpl execute(PushImageCmd command) {
-		WebTarget webResource = getBaseResource().path("/images/" + name(command) + "/push")
-		    .queryParam("tag", command.getTag());
-
-		final String registryAuth = registryAuth(command.getAuthConfig());
-		LOGGER.trace("POST: {}", webResource);
-		javax.ws.rs.core.Response response =  webResource
-                .request()
-				.header("X-Registry-Auth", registryAuth)
-				.accept(MediaType.APPLICATION_JSON)
-				.post(
-				    entity(Response.class, MediaType.APPLICATION_JSON));
-
-	  return new ResponseImpl(new WrappedResponseInputStream(response));
-	}
-	
-	private String name(PushImageCmd command) {
-		String name = command.getName();
-		AuthConfig authConfig = command.getAuthConfig();
-		return name.contains("/") ? name : authConfig.getUsername();
-	}
-
-
-  public static class ResponseImpl extends Response {
-
-    private final InputStream proxy;
-
-    ResponseImpl(InputStream proxy) {
-      this.proxy = proxy;
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PushImageCmdExec.class);
+
+    public PushImageCmdExec(WebTarget baseResource) {
+        super(baseResource);
     }
 
     @Override
-    public Iterable<PushEventStreamItem> getItems() throws IOException {
-      ObjectMapper mapper = new ObjectMapper();
-      // we'll be reading instances of MyBean
-      ObjectReader reader = mapper.reader(PushEventStreamItem.class);
-      // and then do other configuration, if any, and read:
-      Iterator<PushEventStreamItem> items = reader.readValues(proxy);
-
-        try {
-            return ImmutableList.copyOf(items);
-        } finally {
-            proxy.close();
-        }
+    protected ResponseImpl execute(PushImageCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/" + name(command) + "/push").queryParam("tag",
+                command.getTag());
+
+        final String registryAuth = registryAuth(command.getAuthConfig());
+        LOGGER.trace("POST: {}", webResource);
+        javax.ws.rs.core.Response response = webResource.request().header("X-Registry-Auth", registryAuth)
+                .accept(MediaType.APPLICATION_JSON).post(entity(Response.class, MediaType.APPLICATION_JSON));
+
+        return new ResponseImpl(new WrappedResponseInputStream(response));
     }
 
-    @Override
-    public int read() throws IOException {
-      return proxy.read();
+    private String name(PushImageCmd command) {
+        String name = command.getName();
+        AuthConfig authConfig = command.getAuthConfig();
+        return name.contains("/") ? name : authConfig.getUsername();
+    }
+
+    public static class ResponseImpl extends Response {
+
+        private final InputStream proxy;
+
+        ResponseImpl(InputStream proxy) {
+            this.proxy = proxy;
+        }
+
+        @Override
+        public Iterable<PushEventStreamItem> getItems() throws IOException {
+            ObjectMapper mapper = new ObjectMapper();
+            // we'll be reading instances of MyBean
+            ObjectReader reader = mapper.reader(PushEventStreamItem.class);
+            // and then do other configuration, if any, and read:
+            Iterator<PushEventStreamItem> items = reader.readValues(proxy);
+
+            try {
+                return ImmutableList.copyOf(items);
+            } finally {
+                proxy.close();
+            }
+        }
+
+        @Override
+        public int read() throws IOException {
+            return proxy.read();
+        }
     }
-  }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
index d2ff1b837..ebd98fc6f 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
@@ -8,24 +8,25 @@
 
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 
-public class RemoveContainerCmdExec extends AbstrDockerCmdExec<RemoveContainerCmd, Void> implements RemoveContainerCmd.Exec {
+public class RemoveContainerCmdExec extends AbstrDockerCmdExec<RemoveContainerCmd, Void> implements
+        RemoveContainerCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(RemoveContainerCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveContainerCmdExec.class);
 
-	public RemoveContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public RemoveContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected Void execute(RemoveContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/" + command.getContainerId())
-				.queryParam("v", command.hasRemoveVolumesEnabled() ? "1" : "0")
-				.queryParam("force", command.hasForceEnabled() ? "1" : "0");
-		
-		LOGGER.trace("DELETE: {}", webResource);
-		webResource.request().accept(MediaType.APPLICATION_JSON).delete().close();
+    @Override
+    protected Void execute(RemoveContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/" + command.getContainerId())
+                .queryParam("v", command.hasRemoveVolumesEnabled() ? "1" : "0")
+                .queryParam("force", command.hasForceEnabled() ? "1" : "0");
 
-		return null;
-	}
+        LOGGER.trace("DELETE: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).delete().close();
+
+        return null;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
index d5d7b8000..8db23112b 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
@@ -9,22 +9,22 @@
 
 public class RemoveImageCmdExec extends AbstrDockerCmdExec<RemoveImageCmd, Void> implements RemoveImageCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(RemoveImageCmdExec.class);
-
-	public RemoveImageCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected Void execute(RemoveImageCmd command) {
-		WebTarget webResource = getBaseResource().path("/images/" + command.getImageId())
-				.queryParam("force", command.hasForceEnabled() ? "1" : "0")
-				.queryParam("noprune", command.hasNoPruneEnabled() ? "1" : "0");
-
-		LOGGER.trace("DELETE: {}", webResource);
-		webResource.request().delete().close();
-		
-		return null;
-	}
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveImageCmdExec.class);
+
+    public RemoveImageCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected Void execute(RemoveImageCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/" + command.getImageId())
+                .queryParam("force", command.hasForceEnabled() ? "1" : "0")
+                .queryParam("noprune", command.hasNoPruneEnabled() ? "1" : "0");
+
+        LOGGER.trace("DELETE: {}", webResource);
+        webResource.request().delete().close();
+
+        return null;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
index 9ac76a36a..f640945a2 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
@@ -8,28 +8,24 @@
 
 import com.github.dockerjava.api.command.RestartContainerCmd;
 
-public class RestartContainerCmdExec extends
-		AbstrDockerCmdExec<RestartContainerCmd, Void> implements
-		RestartContainerCmd.Exec {
+public class RestartContainerCmdExec extends AbstrDockerCmdExec<RestartContainerCmd, Void> implements
+        RestartContainerCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(RestartContainerCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(RestartContainerCmdExec.class);
 
-	public RestartContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public RestartContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected Void execute(RestartContainerCmd command) {
-		WebTarget webResource = getBaseResource()
-				.path("/containers/{id}/restart")
-				.resolveTemplate("id", command.getContainerId())
-				.queryParam("t", String.valueOf(command.getTimeout()));
+    @Override
+    protected Void execute(RestartContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/restart")
+                .resolveTemplate("id", command.getContainerId()).queryParam("t", String.valueOf(command.getTimeout()));
 
-		LOGGER.trace("POST: {}", webResource);
-		webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
 
-		return null;
-	}
+        return null;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
index 8d70e2f6f..de56a39b6 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
@@ -13,8 +13,7 @@
 import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
 
 public class SaveImageCmdExec extends AbstrDockerCmdExec<SaveImageCmd, InputStream> implements SaveImageCmd.Exec {
-    private static final Logger LOGGER = LoggerFactory
-            .getLogger(SaveImageCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SaveImageCmdExec.class);
 
     public SaveImageCmdExec(WebTarget baseResource) {
         super(baseResource);
@@ -22,14 +21,11 @@ public SaveImageCmdExec(WebTarget baseResource) {
 
     @Override
     protected InputStream execute(SaveImageCmd command) {
-        WebTarget webResource = getBaseResource().path("/images/" + command.getName() + "/get")
-                .queryParam("tag", command.getTag());
+        WebTarget webResource = getBaseResource().path("/images/" + command.getName() + "/get").queryParam("tag",
+                command.getTag());
 
         LOGGER.trace("GET: {}", webResource);
-        Response response =  webResource
-                .request()
-                .accept(MediaType.APPLICATION_JSON)
-                .get();
+        Response response = webResource.request().accept(MediaType.APPLICATION_JSON).get();
 
         return new WrappedResponseInputStream(response);
     }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java
index a7b6ddbc2..00aeb91ec 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java
@@ -12,21 +12,22 @@
 import com.github.dockerjava.api.command.SearchImagesCmd;
 import com.github.dockerjava.api.model.SearchItem;
 
-public class SearchImagesCmdExec extends AbstrDockerCmdExec<SearchImagesCmd, List<SearchItem>> implements SearchImagesCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(SearchImagesCmdExec.class);
-	
-	public SearchImagesCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected List<SearchItem> execute(SearchImagesCmd command) {
-		WebTarget webResource = getBaseResource().path("/images/search").queryParam("term", command.getTerm());
-		
-		LOGGER.trace("GET: {}", webResource);
-		return webResource.request().accept(MediaType.APPLICATION_JSON).get(new GenericType<List<SearchItem>>() {
+public class SearchImagesCmdExec extends AbstrDockerCmdExec<SearchImagesCmd, List<SearchItem>> implements
+        SearchImagesCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(SearchImagesCmdExec.class);
+
+    public SearchImagesCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected List<SearchItem> execute(SearchImagesCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/search").queryParam("term", command.getTerm());
+
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(new GenericType<List<SearchItem>>() {
         });
-	}
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
index 8ca1a42fc..c90f5e1cc 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
@@ -10,22 +10,25 @@
 
 import com.github.dockerjava.api.command.StartContainerCmd;
 
-public class StartContainerCmdExec extends AbstrDockerCmdExec<StartContainerCmd, Void> implements StartContainerCmd.Exec {
+public class StartContainerCmdExec extends AbstrDockerCmdExec<StartContainerCmd, Void> implements
+        StartContainerCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(StartContainerCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(StartContainerCmdExec.class);
 
-	public StartContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public StartContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected Void execute(StartContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/{id}/start").resolveTemplate("id", command.getContainerId());
+    @Override
+    protected Void execute(StartContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/start").resolveTemplate("id",
+                command.getContainerId());
 
-		LOGGER.trace("POST: {}", webResource);
-		webResource.request().accept(MediaType.APPLICATION_JSON).post(entity(command, MediaType.APPLICATION_JSON)).close();
-		
-		return null;
-	}
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(entity(command, MediaType.APPLICATION_JSON))
+                .close();
+
+        return null;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
index bf683be59..3197e0c0e 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
@@ -8,26 +8,22 @@
 
 import com.github.dockerjava.api.command.StopContainerCmd;
 
-public class StopContainerCmdExec extends
-		AbstrDockerCmdExec<StopContainerCmd, Void> implements
-		StopContainerCmd.Exec {
+public class StopContainerCmdExec extends AbstrDockerCmdExec<StopContainerCmd, Void> implements StopContainerCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(StopContainerCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(StopContainerCmdExec.class);
 
-	public StopContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public StopContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected Void execute(StopContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/{id}/stop")
-				.resolveTemplate("id", command.getContainerId())
-				.queryParam("t", String.valueOf(command.getTimeout()));
+    @Override
+    protected Void execute(StopContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/stop")
+                .resolveTemplate("id", command.getContainerId()).queryParam("t", String.valueOf(command.getTimeout()));
 
-		LOGGER.trace("POST: {}", webResource);
-		webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
 
-		return null;
-	}
+        return null;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
index dfbeba072..3cddd63f2 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
@@ -8,26 +8,22 @@
 import com.github.dockerjava.api.command.TagImageCmd;
 
 public class TagImageCmdExec extends AbstrDockerCmdExec<TagImageCmd, Void> implements TagImageCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(TagImageCmdExec.class);
-	
-	public TagImageCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
-
-	@Override
-	protected Void execute(TagImageCmd command) {
-		WebTarget webResource = getBaseResource().path("/images/" + command.getImageId() + "/tag")
-                .queryParam("repo", command.getRepository())
-                .queryParam("tag", command.getTag())
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(TagImageCmdExec.class);
+
+    public TagImageCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    protected Void execute(TagImageCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/" + command.getImageId() + "/tag")
+                .queryParam("repo", command.getRepository()).queryParam("tag", command.getTag())
                 .queryParam("force", command.hasForceEnabled() ? "1" : "0");
 
-		LOGGER.trace("POST: {}", webResource);
-		webResource.request().post(null).close();
-		return null;
-	}
-	
-	
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().post(null).close();
+        return null;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
index 55c431ccd..daff2224b 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
@@ -11,24 +11,25 @@
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.TopContainerResponse;
 
-public class TopContainerCmdExec extends AbstrDockerCmdExec<TopContainerCmd, TopContainerResponse> implements TopContainerCmd.Exec {
+public class TopContainerCmdExec extends AbstrDockerCmdExec<TopContainerCmd, TopContainerResponse> implements
+        TopContainerCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(TopContainerCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TopContainerCmdExec.class);
 
-	public TopContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public TopContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected TopContainerResponse execute(TopContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/{id}/top")
-				.resolveTemplate("id", command.getContainerId());
+    @Override
+    protected TopContainerResponse execute(TopContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/top").resolveTemplate("id",
+                command.getContainerId());
 
-		if(!StringUtils.isEmpty(command.getPsArgs()))
-			webResource = webResource.queryParam("ps_args", command.getPsArgs());
-		
-		LOGGER.trace("GET: {}", webResource);
-		return webResource.request().accept(MediaType.APPLICATION_JSON).get(TopContainerResponse.class);
-	}
+        if (!StringUtils.isEmpty(command.getPsArgs()))
+            webResource = webResource.queryParam("ps_args", command.getPsArgs());
+
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(TopContainerResponse.class);
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java b/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
index 4b6cfbba3..3fea92126 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
@@ -1,4 +1,5 @@
 package com.github.dockerjava.jaxrs;
+
 /*
  * Copyright (c) 2014 Spotify AB.
  *
@@ -20,8 +21,6 @@
  * under the License.
  */
 
-
-
 import org.apache.http.HttpHost;
 import org.apache.http.annotation.Immutable;
 import org.apache.http.conn.ConnectTimeoutException;
@@ -42,44 +41,40 @@
 @Immutable
 public class UnixConnectionSocketFactory implements ConnectionSocketFactory {
 
-  private File socketFile;
-
-  public UnixConnectionSocketFactory(final URI socketUri) {
-    super();
+    private File socketFile;
 
-    final String filename = socketUri.toString()
-        .replaceAll("^unix:///", "unix://localhost/")
-        .replaceAll("^unix://localhost", "");
+    public UnixConnectionSocketFactory(final URI socketUri) {
+        super();
 
-    this.socketFile = new File(filename);
-  }
+        final String filename = socketUri.toString().replaceAll("^unix:///", "unix://localhost/")
+                .replaceAll("^unix://localhost", "");
 
-  public static URI sanitizeUri(final URI uri) {
-    if (uri.getScheme().equals("unix")) {
-      return URI.create("unix://localhost:80");
-    } else {
-      return uri;
+        this.socketFile = new File(filename);
     }
-  }
 
-  @Override
-  public Socket createSocket(final HttpContext context) throws IOException {
-    return new ApacheUnixSocket();
-  }
+    public static URI sanitizeUri(final URI uri) {
+        if (uri.getScheme().equals("unix")) {
+            return URI.create("unix://localhost:80");
+        } else {
+            return uri;
+        }
+    }
 
-  @Override
-  public Socket connectSocket(final int connectTimeout,
-                              final Socket socket,
-                              final HttpHost host,
-                              final InetSocketAddress remoteAddress,
-                              final InetSocketAddress localAddress,
-                              final HttpContext context) throws IOException {
-    try {
-      socket.connect(new AFUNIXSocketAddress(socketFile), connectTimeout);
-    } catch (SocketTimeoutException e) {
-      throw new ConnectTimeoutException(e, null, remoteAddress.getAddress());
+    @Override
+    public Socket createSocket(final HttpContext context) throws IOException {
+        return new ApacheUnixSocket();
     }
 
-    return socket;
-  }
+    @Override
+    public Socket connectSocket(final int connectTimeout, final Socket socket, final HttpHost host,
+            final InetSocketAddress remoteAddress, final InetSocketAddress localAddress, final HttpContext context)
+            throws IOException {
+        try {
+            socket.connect(new AFUNIXSocketAddress(socketFile), connectTimeout);
+        } catch (SocketTimeoutException e) {
+            throw new ConnectTimeoutException(e, null, remoteAddress.getAddress());
+        }
+
+        return socket;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
index 7fed603a5..de507e8ff 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
@@ -8,24 +8,24 @@
 
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 
-public class UnpauseContainerCmdExec extends AbstrDockerCmdExec<UnpauseContainerCmd, Void> implements UnpauseContainerCmd.Exec {
+public class UnpauseContainerCmdExec extends AbstrDockerCmdExec<UnpauseContainerCmd, Void> implements
+        UnpauseContainerCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(UnpauseContainerCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(UnpauseContainerCmdExec.class);
 
-	public UnpauseContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public UnpauseContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected Void execute(UnpauseContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/{id}/unpause")
-				.resolveTemplate("id", command.getContainerId());
-		
-		LOGGER.trace("POST: {}", webResource);
-		webResource.request().accept(MediaType.APPLICATION_JSON)
-				.post(null).close();
+    @Override
+    protected Void execute(UnpauseContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/unpause").resolveTemplate("id",
+                command.getContainerId());
 
-		return null;
-	}
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
+
+        return null;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java
index 9b4ac817a..e8af1cb29 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java
@@ -11,20 +11,18 @@
 
 public class VersionCmdExec extends AbstrDockerCmdExec<VersionCmd, Version> implements VersionCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(VersionCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(VersionCmdExec.class);
 
-	public VersionCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public VersionCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected Version execute(VersionCmd command) {
-		WebTarget webResource = getBaseResource().path("/version");
+    @Override
+    protected Version execute(VersionCmd command) {
+        WebTarget webResource = getBaseResource().path("/version");
 
-		LOGGER.trace("GET: {}", webResource);
-		return webResource.request().accept(MediaType.APPLICATION_JSON)
-				.get(Version.class);
-	}
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(Version.class);
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
index 1b81eee33..47af2bcfa 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
@@ -9,25 +9,24 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 
-public class WaitContainerCmdExec extends AbstrDockerCmdExec<WaitContainerCmd, Integer> implements WaitContainerCmd.Exec {
+public class WaitContainerCmdExec extends AbstrDockerCmdExec<WaitContainerCmd, Integer> implements
+        WaitContainerCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(WaitContainerCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(WaitContainerCmdExec.class);
 
-	public WaitContainerCmdExec(WebTarget baseResource) {
-		super(baseResource);
-	}
+    public WaitContainerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
 
-	@Override
-	protected Integer execute(WaitContainerCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/{id}/wait")
-				.resolveTemplate("id", command.getContainerId());
+    @Override
+    protected Integer execute(WaitContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/wait").resolveTemplate("id",
+                command.getContainerId());
+
+        LOGGER.trace("POST: {}", webResource);
+        ObjectNode ObjectNode = webResource.request().accept(MediaType.APPLICATION_JSON).post(null, ObjectNode.class);
 
-		LOGGER.trace("POST: {}", webResource);
-		ObjectNode ObjectNode = webResource.request().accept(MediaType.APPLICATION_JSON)
-				.post(null, ObjectNode.class);
-		
         return ObjectNode.get("StatusCode").asInt();
-	}
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java b/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
index f8baeef98..6cfc7a76e 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
@@ -27,8 +27,8 @@ public abstract class AbstractCallbackNotifier<T> implements Callable<Void> {
 
     protected final WebTarget webTarget;
 
-    protected AbstractCallbackNotifier(ResponseStreamProcessor<T> responseStreamProcessor, ResultCallback<T> resultCallback,
-            WebTarget webTarget) {
+    protected AbstractCallbackNotifier(ResponseStreamProcessor<T> responseStreamProcessor,
+            ResultCallback<T> resultCallback, WebTarget webTarget) {
         checkNotNull(webTarget, "An WebTarget must be provided");
         checkNotNull(responseStreamProcessor, "A ResponseStreamProcessor must be provided");
         this.responseStreamProcessor = responseStreamProcessor;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
index 63fea0954..d11cdd7a0 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
@@ -40,7 +40,6 @@
  * holder.
  */
 
-
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -127,8 +126,7 @@
 import jersey.repackaged.com.google.common.util.concurrent.MoreExecutors;
 
 /**
- * A {@link Connector} that utilizes the Apache HTTP Client to send and receive
- * HTTP request and responses.
+ * A {@link Connector} that utilizes the Apache HTTP Client to send and receive HTTP request and responses.
  * <p/>
  * The following properties are only supported at construction of this class:
  * <ul>
@@ -144,35 +142,32 @@
  * <li>{@link ApacheClientProperties#SSL_CONFIG}</li>
  * </ul>
  * <p>
- * This connector uses {@link RequestEntityProcessing#CHUNKED chunked encoding} as a default setting. This can
- * be overridden by the {@link ClientProperties#REQUEST_ENTITY_PROCESSING}. By default the
- * {@link ClientProperties#CHUNKED_ENCODING_SIZE} property is only supported by using default connection manager. If custom
- * connection manager needs to be used then chunked encoding size can be set by providing a custom
- * {@link org.apache.http.HttpClientConnection} (via custom {@link org.apache.http.impl.conn.ManagedHttpClientConnectionFactory})
- * and overriding {@code createOutputStream} method.
+ * This connector uses {@link RequestEntityProcessing#CHUNKED chunked encoding} as a default setting. This can be
+ * overridden by the {@link ClientProperties#REQUEST_ENTITY_PROCESSING}. By default the
+ * {@link ClientProperties#CHUNKED_ENCODING_SIZE} property is only supported by using default connection manager. If
+ * custom connection manager needs to be used then chunked encoding size can be set by providing a custom
+ * {@link org.apache.http.HttpClientConnection} (via custom
+ * {@link org.apache.http.impl.conn.ManagedHttpClientConnectionFactory}) and overriding {@code createOutputStream}
+ * method.
  * </p>
  * <p>
- * Using of authorization is dependent on the chunk encoding setting. If the entity
- * buffering is enabled, the entity is buffered and authorization can be performed
- * automatically in response to a 401 by sending the request again. When entity buffering
- * is disabled (chunked encoding is used) then the property
- * {@link org.glassfish.jersey.apache.connector.ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION} must
- * be set to {@code true}.
+ * Using of authorization is dependent on the chunk encoding setting. If the entity buffering is enabled, the entity is
+ * buffered and authorization can be performed automatically in response to a 401 by sending the request again. When
+ * entity buffering is disabled (chunked encoding is used) then the property
+ * {@link org.glassfish.jersey.apache.connector.ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION} must be set to
+ * {@code true}.
  * </p>
  * <p>
- * If a {@link org.glassfish.jersey.client.ClientResponse} is obtained and an
- * entity is not read from the response then
- * {@link org.glassfish.jersey.client.ClientResponse#close()} MUST be called
- * after processing the response to release connection-based resources.
+ * If a {@link org.glassfish.jersey.client.ClientResponse} is obtained and an entity is not read from the response then
+ * {@link org.glassfish.jersey.client.ClientResponse#close()} MUST be called after processing the response to release
+ * connection-based resources.
  * </p>
  * <p>
- * Client operations are thread safe, the HTTP connection may
- * be shared between different threads.
+ * Client operations are thread safe, the HTTP connection may be shared between different threads.
  * </p>
  * <p>
- * If a response entity is obtained that is an instance of {@link Closeable}
- * then the instance MUST be closed after processing the entity to release
- * connection-based resources.
+ * If a response entity is obtained that is an instance of {@link Closeable} then the instance MUST be closed after
+ * processing the entity to release connection-based resources.
  * </p>
  * <p>
  * The following methods are currently supported: HEAD, GET, POST, PUT, DELETE, OPTIONS, PATCH and TRACE.
@@ -190,6 +185,7 @@ class ApacheConnector implements Connector {
     private final static Logger LOGGER = Logger.getLogger(ApacheConnector.class.getName());
 
     private static final VersionInfo vi;
+
     private static final String release;
 
     static {
@@ -198,14 +194,18 @@ class ApacheConnector implements Connector {
     }
 
     private final CloseableHttpClient client;
+
     private final CookieStore cookieStore;
+
     private final boolean preemptiveBasicAuth;
+
     private final RequestConfig requestConfig;
 
     /**
      * Create the new Apache HTTP Client connector.
      *
-     * @param config client configuration.
+     * @param config
+     *            client configuration.
      */
     ApacheConnector(Configuration config) {
         Object reqConfig = null;
@@ -215,26 +215,18 @@ class ApacheConnector implements Connector {
 
             if (connectionManager != null) {
                 if (!(connectionManager instanceof HttpClientConnectionManager)) {
-                    LOGGER.log(
-                            Level.WARNING,
-                            LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
-                                    ApacheClientProperties.CONNECTION_MANAGER,
-                                    connectionManager.getClass().getName(),
-                                    HttpClientConnectionManager.class.getName())
-                    );
+                    LOGGER.log(Level.WARNING, LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
+                            ApacheClientProperties.CONNECTION_MANAGER, connectionManager.getClass().getName(),
+                            HttpClientConnectionManager.class.getName()));
                 }
             }
 
             reqConfig = config.getProperties().get(ApacheClientProperties.REQUEST_CONFIG);
             if (reqConfig != null) {
                 if (!(reqConfig instanceof RequestConfig)) {
-                    LOGGER.log(
-                            Level.WARNING,
-                            LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
-                                    ApacheClientProperties.REQUEST_CONFIG,
-                                    reqConfig.getClass().getName(),
-                                    RequestConfig.class.getName())
-                    );
+                    LOGGER.log(Level.WARNING, LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
+                            ApacheClientProperties.REQUEST_CONFIG, reqConfig.getClass().getName(),
+                            RequestConfig.class.getName()));
                     reqConfig = null;
                 }
             }
@@ -267,31 +259,30 @@ class ApacheConnector implements Connector {
                 final URI u = getProxyUri(proxyUri);
                 final HttpHost proxy = new HttpHost(u.getHost(), u.getPort(), u.getScheme());
                 String userName;
-                userName = ClientProperties.getValue(config.getProperties(), ClientProperties.PROXY_USERNAME, String.class);
+                userName = ClientProperties.getValue(config.getProperties(), ClientProperties.PROXY_USERNAME,
+                        String.class);
                 if (userName != null) {
                     String password;
-                    password = ClientProperties.getValue(config.getProperties(), ClientProperties.PROXY_PASSWORD, String.class);
+                    password = ClientProperties.getValue(config.getProperties(), ClientProperties.PROXY_PASSWORD,
+                            String.class);
 
                     if (password != null) {
                         final CredentialsProvider credsProvider = new BasicCredentialsProvider();
-                        credsProvider.setCredentials(
-                                new AuthScope(u.getHost(), u.getPort()),
-                                new UsernamePasswordCredentials(userName, password)
-                        );
+                        credsProvider.setCredentials(new AuthScope(u.getHost(), u.getPort()),
+                                new UsernamePasswordCredentials(userName, password));
                         clientBuilder.setDefaultCredentialsProvider(credsProvider);
                     }
                 }
                 clientBuilder.setProxy(proxy);
             }
 
-            final Boolean preemptiveBasicAuthProperty = (Boolean) config.getProperties()
-                    .get(ApacheClientProperties.PREEMPTIVE_BASIC_AUTHENTICATION);
+            final Boolean preemptiveBasicAuthProperty = (Boolean) config.getProperties().get(
+                    ApacheClientProperties.PREEMPTIVE_BASIC_AUTHENTICATION);
             this.preemptiveBasicAuth = (preemptiveBasicAuthProperty != null) ? preemptiveBasicAuthProperty : false;
         } else {
             this.preemptiveBasicAuth = false;
         }
 
-
         if (reqConfig != null) {
             RequestConfig.Builder reqConfigBuilder = RequestConfig.copy((RequestConfig) reqConfig);
             if (connectTimeout > 0) {
@@ -324,10 +315,8 @@ class ApacheConnector implements Connector {
     }
 
     private SSLContext getSslContext(final Configuration config) {
-        final SslConfigurator sslConfigurator = ApacheClientProperties.getValue(
-                config.getProperties(),
-                ApacheClientProperties.SSL_CONFIG,
-                SslConfigurator.class);
+        final SslConfigurator sslConfigurator = ApacheClientProperties.getValue(config.getProperties(),
+                ApacheClientProperties.SSL_CONFIG, SslConfigurator.class);
 
         return sslConfigurator != null ? sslConfigurator.createSSLContext() : null;
     }
@@ -340,34 +329,22 @@ HttpClientConnectionManager getConnectionManager(final Configuration config, fin
             if (cmObject instanceof HttpClientConnectionManager) {
                 return (HttpClientConnectionManager) cmObject;
             } else {
-                LOGGER.log(
-                        Level.WARNING,
-                        LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
-                                ApacheClientProperties.CONNECTION_MANAGER,
-                                cmObject.getClass().getName(),
-                                HttpClientConnectionManager.class.getName())
-                );
+                LOGGER.log(Level.WARNING, LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
+                        ApacheClientProperties.CONNECTION_MANAGER, cmObject.getClass().getName(),
+                        HttpClientConnectionManager.class.getName()));
             }
         }
 
         // Create custom connection manager.
-        return createConnectionManager(
-                config,
-                sslContext,
-                null,
-                false);
+        return createConnectionManager(config, sslContext, null, false);
     }
 
-    private HttpClientConnectionManager createConnectionManager(
-            final Configuration config,
-            final SSLContext sslContext,
-            X509HostnameVerifier hostnameVerifier,
-            final boolean useSystemProperties) {
+    private HttpClientConnectionManager createConnectionManager(final Configuration config,
+            final SSLContext sslContext, X509HostnameVerifier hostnameVerifier, final boolean useSystemProperties) {
 
-        final String[] supportedProtocols = useSystemProperties ? split(
-                System.getProperty("https.protocols")) : null;
-        final String[] supportedCipherSuites = useSystemProperties ? split(
-                System.getProperty("https.cipherSuites")) : null;
+        final String[] supportedProtocols = useSystemProperties ? split(System.getProperty("https.protocols")) : null;
+        final String[] supportedCipherSuites = useSystemProperties ? split(System.getProperty("https.cipherSuites"))
+                : null;
 
         if (hostnameVerifier == null) {
             hostnameVerifier = SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER;
@@ -375,30 +352,26 @@ private HttpClientConnectionManager createConnectionManager(
 
         final LayeredConnectionSocketFactory sslSocketFactory;
         if (sslContext != null) {
-            sslSocketFactory = new SSLConnectionSocketFactory(
-                    sslContext, supportedProtocols, supportedCipherSuites, hostnameVerifier);
+            sslSocketFactory = new SSLConnectionSocketFactory(sslContext, supportedProtocols, supportedCipherSuites,
+                    hostnameVerifier);
         } else {
             if (useSystemProperties) {
-                sslSocketFactory = new SSLConnectionSocketFactory(
-                        (SSLSocketFactory) SSLSocketFactory.getDefault(),
+                sslSocketFactory = new SSLConnectionSocketFactory((SSLSocketFactory) SSLSocketFactory.getDefault(),
                         supportedProtocols, supportedCipherSuites, hostnameVerifier);
             } else {
-                sslSocketFactory = new SSLConnectionSocketFactory(
-                        SSLContexts.createDefault(),
-                        hostnameVerifier);
+                sslSocketFactory = new SSLConnectionSocketFactory(SSLContexts.createDefault(), hostnameVerifier);
             }
         }
 
-        final Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory>create()
-                .register("http", PlainConnectionSocketFactory.getSocketFactory())
-                .register("https", sslSocketFactory)
+        final Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory> create()
+                .register("http", PlainConnectionSocketFactory.getSocketFactory()).register("https", sslSocketFactory)
                 .build();
 
         final Integer chunkSize = ClientProperties.getValue(config.getProperties(),
                 ClientProperties.CHUNKED_ENCODING_SIZE, 4096, Integer.class);
 
-        final PoolingHttpClientConnectionManager connectionManager =
-                new PoolingHttpClientConnectionManager(registry, new ConnectionFactory(chunkSize));
+        final PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(registry,
+                new ConnectionFactory(chunkSize));
 
         if (useSystemProperties) {
             String s = System.getProperty("http.keepAlive", "true");
@@ -433,8 +406,8 @@ public HttpClient getHttpClient() {
     /**
      * Get the {@link CookieStore}.
      *
-     * @return the {@link CookieStore} instance or {@code null} when {@value ApacheClientProperties#DISABLE_COOKIES} set to
-     * {@code true}.
+     * @return the {@link CookieStore} instance or {@code null} when {@value ApacheClientProperties#DISABLE_COOKIES} set
+     *         to {@code true}.
      */
     public CookieStore getCookieStore() {
         return cookieStore;
@@ -465,15 +438,15 @@ public ClientResponse apply(final ClientRequest clientRequest) throws Processing
                 context.setAuthCache(authCache);
             }
 
-            //context.setRequestConfig(RequestConfig.custom().setConnectionRequestTimeout(10).build());
+            // context.setRequestConfig(RequestConfig.custom().setConnectionRequestTimeout(10).build());
 
             response = client.execute(getHost(request), request, context);
-            HeaderUtils.checkHeaderChanges(clientHeadersSnapshot, clientRequest.getHeaders(),
-                    this.getClass().getName());
+            HeaderUtils
+                    .checkHeaderChanges(clientHeadersSnapshot, clientRequest.getHeaders(), this.getClass().getName());
 
-            final Response.StatusType status = response.getStatusLine().getReasonPhrase() == null ?
-                    Statuses.from(response.getStatusLine().getStatusCode()) :
-                    Statuses.from(response.getStatusLine().getStatusCode(), response.getStatusLine().getReasonPhrase());
+            final Response.StatusType status = response.getStatusLine().getReasonPhrase() == null ? Statuses
+                    .from(response.getStatusLine().getStatusCode()) : Statuses.from(response.getStatusLine()
+                    .getStatusCode(), response.getStatusLine().getReasonPhrase());
 
             final ClientResponse responseContext = new ApacheConnectorClientResponse(status, clientRequest, response);
             final List<URI> redirectLocations = context.getRedirectLocations();
@@ -506,7 +479,6 @@ public ClientResponse apply(final ClientRequest clientRequest) throws Processing
                 }
             }
 
-
             try {
                 responseContext.setEntityStream(new HttpClientResponseInputStream(response));
             } catch (final IOException e) {
@@ -554,23 +526,18 @@ private HttpHost getHost(final HttpUriRequest request) {
     }
 
     private HttpUriRequest getUriHttpRequest(final ClientRequest clientRequest) {
-        final Boolean redirectsEnabled =
-                clientRequest.resolveProperty(ClientProperties.FOLLOW_REDIRECTS, requestConfig.isRedirectsEnabled());
+        final Boolean redirectsEnabled = clientRequest.resolveProperty(ClientProperties.FOLLOW_REDIRECTS,
+                requestConfig.isRedirectsEnabled());
         final RequestConfig config = RequestConfig.copy(requestConfig).setRedirectsEnabled(redirectsEnabled).build();
 
         final Boolean bufferingEnabled = clientRequest.resolveProperty(ClientProperties.REQUEST_ENTITY_PROCESSING,
                 RequestEntityProcessing.class) == RequestEntityProcessing.BUFFERED;
         final HttpEntity entity = getHttpEntity(clientRequest, bufferingEnabled);
 
-        return RequestBuilder
-                .create(clientRequest.getMethod())
-                .setUri(clientRequest.getUri())
-                .setConfig(config)
-                .setEntity(entity)
-                .build();
+        return RequestBuilder.create(clientRequest.getMethod()).setUri(clientRequest.getUri()).setConfig(config)
+                .setEntity(entity).build();
     }
 
-
     private HttpEntity getHttpEntity(final ClientRequest clientRequest, final boolean bufferingEnabled) {
         final Object entity = clientRequest.getEntity();
 
@@ -628,7 +595,8 @@ public boolean isStreaming() {
         }
     }
 
-    private static Map<String, String> writeOutBoundHeaders(final MultivaluedMap<String, Object> headers, final HttpUriRequest request) {
+    private static Map<String, String> writeOutBoundHeaders(final MultivaluedMap<String, Object> headers,
+            final HttpUriRequest request) {
         Map<String, String> stringHeaders = HeaderUtils.asStringHeadersSingleValue(headers);
 
         for (Map.Entry<String, String> e : stringHeaders.entrySet()) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java
index 7ba9d8abd..a4d68e202 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java
@@ -18,35 +18,31 @@
  *
  */
 public class ApacheConnectorClientResponse extends ClientResponse {
-	
-	private CloseableHttpResponse closeableHttpResponse;
-
-	public ApacheConnectorClientResponse(ClientRequest requestContext,
-			Response response) {
-		super(requestContext, response);
-	}
-
-	public ApacheConnectorClientResponse(StatusType status,
-			ClientRequest requestContext, CloseableHttpResponse closeableHttpResponse) {
-		super(status, requestContext);
-		this.closeableHttpResponse = closeableHttpResponse;
-	}
-
-	public ApacheConnectorClientResponse(StatusType status,
-			ClientRequest requestContext) {
-		super(status, requestContext);
-	}
-	
-	@Override
-	public void close() {
-		try {
-			closeableHttpResponse.close();
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		super.close();
-	}
-	
-	
+
+    private CloseableHttpResponse closeableHttpResponse;
+
+    public ApacheConnectorClientResponse(ClientRequest requestContext, Response response) {
+        super(requestContext, response);
+    }
+
+    public ApacheConnectorClientResponse(StatusType status, ClientRequest requestContext,
+            CloseableHttpResponse closeableHttpResponse) {
+        super(status, requestContext);
+        this.closeableHttpResponse = closeableHttpResponse;
+    }
+
+    public ApacheConnectorClientResponse(StatusType status, ClientRequest requestContext) {
+        super(status, requestContext);
+    }
+
+    @Override
+    public void close() {
+        try {
+            closeableHttpResponse.close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        super.close();
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java
index fbde136ff..90600b608 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java
@@ -50,8 +50,8 @@
 import org.apache.http.client.HttpClient;
 
 /**
- * Connector provider for Jersey {@link Connector connectors} that utilize
- * Apache HTTP Client to send and receive HTTP request and responses.
+ * Connector provider for Jersey {@link Connector connectors} that utilize Apache HTTP Client to send and receive HTTP
+ * request and responses.
  * <p>
  * The following connector configuration properties are supported:
  * <ul>
@@ -62,29 +62,28 @@
  * <li>{@link org.glassfish.jersey.client.ClientProperties#PROXY_URI}</li>
  * <li>{@link org.glassfish.jersey.client.ClientProperties#PROXY_USERNAME}</li>
  * <li>{@link org.glassfish.jersey.client.ClientProperties#PROXY_PASSWORD}</li>
- * <li>{@link org.glassfish.jersey.client.ClientProperties#REQUEST_ENTITY_PROCESSING}
- * - default value is {@link org.glassfish.jersey.client.RequestEntityProcessing#CHUNKED}</li>
+ * <li>{@link org.glassfish.jersey.client.ClientProperties#REQUEST_ENTITY_PROCESSING} - default value is
+ * {@link org.glassfish.jersey.client.RequestEntityProcessing#CHUNKED}</li>
  * <li>{@link ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION}</li>
  * <li>{@link ApacheClientProperties#SSL_CONFIG}</li>
  * </ul>
  * </p>
  * <p>
  * Connector instances created via this connector provider use
- * {@link org.glassfish.jersey.client.RequestEntityProcessing#CHUNKED chunked encoding} as a default setting.
- * This can be overridden by the {@link org.glassfish.jersey.client.ClientProperties#REQUEST_ENTITY_PROCESSING}.
- * By default the {@link org.glassfish.jersey.client.ClientProperties#CHUNKED_ENCODING_SIZE} property is only supported
- * when using the default {@code org.apache.http.conn.HttpClientConnectionManager} instance. If custom
- * connection manager is used, then chunked encoding size can be set by providing a custom
- * {@code org.apache.http.HttpClientConnection} (via custom {@code org.apache.http.impl.conn.ManagedHttpClientConnectionFactory})
- * and overriding it's {@code createOutputStream} method.
+ * {@link org.glassfish.jersey.client.RequestEntityProcessing#CHUNKED chunked encoding} as a default setting. This can
+ * be overridden by the {@link org.glassfish.jersey.client.ClientProperties#REQUEST_ENTITY_PROCESSING}. By default the
+ * {@link org.glassfish.jersey.client.ClientProperties#CHUNKED_ENCODING_SIZE} property is only supported when using the
+ * default {@code org.apache.http.conn.HttpClientConnectionManager} instance. If custom connection manager is used, then
+ * chunked encoding size can be set by providing a custom {@code org.apache.http.HttpClientConnection} (via custom
+ * {@code org.apache.http.impl.conn.ManagedHttpClientConnectionFactory}) and overriding it's {@code createOutputStream}
+ * method.
  * </p>
  * <p>
- * Use of authorization by the AHC-based connectors is dependent on the chunk encoding setting.
- * If the entity buffering is enabled, the entity is buffered and authorization can be performed
- * automatically in response to a 401 by sending the request again. When entity buffering
- * is disabled (chunked encoding is used) then the property
- * {@link org.glassfish.jersey.apache.connector.ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION} must
- * be set to {@code true}.
+ * Use of authorization by the AHC-based connectors is dependent on the chunk encoding setting. If the entity buffering
+ * is enabled, the entity is buffered and authorization can be performed automatically in response to a 401 by sending
+ * the request again. When entity buffering is disabled (chunked encoding is used) then the property
+ * {@link org.glassfish.jersey.apache.connector.ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION} must be set to
+ * {@code true}.
  * </p>
  * <p>
  * If a {@link org.glassfish.jersey.client.ClientResponse} is obtained and an entity is not read from the response then
@@ -92,9 +91,8 @@
  * connection-based resources.
  * </p>
  * <p>
- * If a response entity is obtained that is an instance of {@link java.io.Closeable}
- * then the instance MUST be closed after processing the entity to release
- * connection-based resources.
+ * If a response entity is obtained that is an instance of {@link java.io.Closeable} then the instance MUST be closed
+ * after processing the entity to release connection-based resources.
  * <p/>
  * <p>
  * The following methods are currently supported: HEAD, GET, POST, PUT, DELETE, OPTIONS, PATCH and TRACE.
@@ -115,23 +113,23 @@ public Connector getConnector(Client client, Configuration runtimeConfig) {
     }
 
     /**
-     * Retrieve the underlying Apache {@link HttpClient} instance from
-     * {@link org.glassfish.jersey.client.JerseyClient} or {@link org.glassfish.jersey.client.JerseyWebTarget}
-     * configured to use {@code ApacheConnectorProvider}.
+     * Retrieve the underlying Apache {@link HttpClient} instance from {@link org.glassfish.jersey.client.JerseyClient}
+     * or {@link org.glassfish.jersey.client.JerseyWebTarget} configured to use {@code ApacheConnectorProvider}.
      *
-     * @param component {@code JerseyClient} or {@code JerseyWebTarget} instance that is configured to use
-     *                  {@code ApacheConnectorProvider}.
+     * @param component
+     *            {@code JerseyClient} or {@code JerseyWebTarget} instance that is configured to use
+     *            {@code ApacheConnectorProvider}.
      * @return underlying Apache {@code HttpClient} instance.
      *
-     * @throws java.lang.IllegalArgumentException in case the {@code component} is neither {@code JerseyClient}
-     *                                            nor {@code JerseyWebTarget} instance or in case the component
-     *                                            is not configured to use a {@code ApacheConnectorProvider}.
+     * @throws java.lang.IllegalArgumentException
+     *             in case the {@code component} is neither {@code JerseyClient} nor {@code JerseyWebTarget} instance or
+     *             in case the component is not configured to use a {@code ApacheConnectorProvider}.
      * @since 2.8
      */
     public static HttpClient getHttpClient(Configurable<?> component) {
         if (!(component instanceof Initializable)) {
-            throw new IllegalArgumentException(
-                    LocalizationMessages.INVALID_CONFIGURABLE_COMPONENT_TYPE(component.getClass().getName()));
+            throw new IllegalArgumentException(LocalizationMessages.INVALID_CONFIGURABLE_COMPONENT_TYPE(component
+                    .getClass().getName()));
         }
 
         final Initializable<?> initializable = (Initializable<?>) component;
@@ -148,4 +146,3 @@ public static HttpClient getHttpClient(Configurable<?> component) {
         throw new IllegalArgumentException(LocalizationMessages.EXPECTED_CONNECTOR_PROVIDER_NOT_USED());
     }
 }
-
diff --git a/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java b/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
index 752ff3423..b782667fe 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
@@ -6,65 +6,66 @@
 import javax.ws.rs.core.Response;
 
 /**
- * This is a wrapper around {@link Response} that acts as a {@link InputStream}.
- * When this {@link WrappedResponseInputStream} is closed it closes the 
- * underlying {@link Response} object also to prevent blocking/hanging connections.
+ * This is a wrapper around {@link Response} that acts as a {@link InputStream}. When this
+ * {@link WrappedResponseInputStream} is closed it closes the underlying {@link Response} object also to prevent
+ * blocking/hanging connections.
  * 
  * @author marcus
  */
 public class WrappedResponseInputStream extends InputStream {
-	
-	private Response response;
-	private InputStream delegate;
-
-	public WrappedResponseInputStream(Response response) {
-		this.response = response;
-		this.delegate = response.readEntity(InputStream.class);
-	}
-
-	public int read() throws IOException {
-		return delegate.read();
-	}
-
-	public int hashCode() {
-		return delegate.hashCode();
-	}
-
-	public int read(byte[] b) throws IOException {
-		return delegate.read(b);
-	}
-
-	public boolean equals(Object obj) {
-		return delegate.equals(obj);
-	}
-
-	public int read(byte[] b, int off, int len) throws IOException {
-		return delegate.read(b, off, len);
-	}
-
-	public long skip(long n) throws IOException {
-		return delegate.skip(n);
-	}
-
-	public int available() throws IOException {
-		return delegate.available();
-	}
-
-	public void close() throws IOException {
-		response.close();
-		delegate.close();
-	}
-
-	public void mark(int readlimit) {
-		delegate.mark(readlimit);
-	}
-
-	public void reset() throws IOException {
-		delegate.reset();
-	}
-
-	public boolean markSupported() {
-		return delegate.markSupported();
-	}
-	
+
+    private Response response;
+
+    private InputStream delegate;
+
+    public WrappedResponseInputStream(Response response) {
+        this.response = response;
+        this.delegate = response.readEntity(InputStream.class);
+    }
+
+    public int read() throws IOException {
+        return delegate.read();
+    }
+
+    public int hashCode() {
+        return delegate.hashCode();
+    }
+
+    public int read(byte[] b) throws IOException {
+        return delegate.read(b);
+    }
+
+    public boolean equals(Object obj) {
+        return delegate.equals(obj);
+    }
+
+    public int read(byte[] b, int off, int len) throws IOException {
+        return delegate.read(b, off, len);
+    }
+
+    public long skip(long n) throws IOException {
+        return delegate.skip(n);
+    }
+
+    public int available() throws IOException {
+        return delegate.available();
+    }
+
+    public void close() throws IOException {
+        response.close();
+        delegate.close();
+    }
+
+    public void mark(int readlimit) {
+        delegate.mark(readlimit);
+    }
+
+    public void reset() throws IOException {
+        delegate.reset();
+    }
+
+    public boolean markSupported() {
+        return delegate.markSupported();
+    }
+
 }
diff --git a/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java b/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
index 500919fdc..8eed37b62 100644
--- a/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
+++ b/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
@@ -26,20 +26,20 @@
 
 /**
  * References test resources and provides basic tests functionality.
+ * 
  * @author Oleg Nenashev
  */
 public enum CommandJSONSamples implements JSONResourceRef {
-    
-    inspectContainerResponse_full,
-    inspectContainerResponse_empty;
-    
+
+    inspectContainerResponse_full, inspectContainerResponse_empty;
+
     @Override
     public String getFileName() {
         return this + ".json";
-    } 
+    }
 
     @Override
     public Class<?> getResourceClass() {
         return CommandJSONSamples.class;
-    }  
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
index 2e294b146..bbe0a06f5 100644
--- a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
+++ b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
@@ -22,18 +22,18 @@
 
 /**
  * Tests for {@link InspectContainerResponse}.
+ * 
  * @author Oleg Nenashev
  */
 public class InspectContainerResponseTest {
-    
+
     @Test
     public void roundTrip_full() throws IOException {
-        InspectContainerResponse[] responses = testRoundTrip(
-                        CommandJSONSamples.inspectContainerResponse_full, 
-                        InspectContainerResponse[].class);   
+        InspectContainerResponse[] responses = testRoundTrip(CommandJSONSamples.inspectContainerResponse_full,
+                InspectContainerResponse[].class);
         assertEquals(1, responses.length);
         final InspectContainerResponse response = responses[0];
-        
+
         // Check volumes: https://github.com/docker-java/docker-java/issues/211
         assertEquals(response.getVolumes().length, 2);
         assertEquals(response.getVolumesRW().length, 2);
@@ -43,7 +43,7 @@ public void roundTrip_full() throws IOException {
         assertFalse(response.getVolumesRW()[1].getAccessMode().toBoolean());
         assertTrue(response.getVolumesRW()[0].getAccessMode().toBoolean());
     }
-    
+
     @Test
     public void roundTrip_empty() throws IOException {
         testRoundTrip(CommandJSONSamples.inspectContainerResponse_empty, InspectContainerResponse[].class);
diff --git a/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java b/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java
index 432f7b00f..bdbc2e225 100644
--- a/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java
@@ -7,25 +7,24 @@
 
 public class AccessModeTest {
 
-	@Test
-	public void defaultAccessMode() {
-		assertEquals(AccessMode.DEFAULT, rw);
-	}
-	
-	@Test
-	public void stringify() {
-		assertEquals(AccessMode.rw.toString(), "rw");
-	}
-	
-	@Test
-	public void fromString() {
-		assertEquals(AccessMode.valueOf("rw"), rw);
-	}
-	
-	@Test(expectedExceptions = IllegalArgumentException.class, 
-			expectedExceptionsMessageRegExp = "No enum const.*")
-	public void fromIllegalString() {
-		AccessMode.valueOf("xx");
-	}
+    @Test
+    public void defaultAccessMode() {
+        assertEquals(AccessMode.DEFAULT, rw);
+    }
+
+    @Test
+    public void stringify() {
+        assertEquals(AccessMode.rw.toString(), "rw");
+    }
+
+    @Test
+    public void fromString() {
+        assertEquals(AccessMode.valueOf("rw"), rw);
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "No enum const.*")
+    public void fromIllegalString() {
+        AccessMode.valueOf("xx");
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/BindTest.java b/src/test/java/com/github/dockerjava/api/model/BindTest.java
index 50a41fc38..db5aec212 100644
--- a/src/test/java/com/github/dockerjava/api/model/BindTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/BindTest.java
@@ -7,62 +7,59 @@
 import org.testng.annotations.Test;
 
 public class BindTest {
-	
-	@Test
-	public void parseUsingDefaultAccessMode() {
-		Bind bind = Bind.parse("/host:/container");
-		assertEquals(bind.getPath(), "/host");
-		assertEquals(bind.getVolume().getPath(), "/container");
-		assertEquals(bind.getAccessMode(), AccessMode.DEFAULT);
-	}
 
-	@Test
-	public void parseReadWrite() {
-		Bind bind = Bind.parse("/host:/container:rw");
-		assertEquals(bind.getPath(), "/host");
-		assertEquals(bind.getVolume().getPath(), "/container");
-		assertEquals(bind.getAccessMode(), rw);
-	}
-	
-	@Test
-	public void parseReadOnly() {
-		Bind bind = Bind.parse("/host:/container:ro");
-		assertEquals(bind.getPath(), "/host");
-		assertEquals(bind.getVolume().getPath(), "/container");
-		assertEquals(bind.getAccessMode(), ro);
-	}
+    @Test
+    public void parseUsingDefaultAccessMode() {
+        Bind bind = Bind.parse("/host:/container");
+        assertEquals(bind.getPath(), "/host");
+        assertEquals(bind.getVolume().getPath(), "/container");
+        assertEquals(bind.getAccessMode(), AccessMode.DEFAULT);
+    }
 
-	@Test(expectedExceptions = IllegalArgumentException.class,
-			expectedExceptionsMessageRegExp = "Error parsing Bind.*")
-	public void parseInvalidAccessMode() {
-		Bind.parse("/host:/container:xx");
-	}
+    @Test
+    public void parseReadWrite() {
+        Bind bind = Bind.parse("/host:/container:rw");
+        assertEquals(bind.getPath(), "/host");
+        assertEquals(bind.getVolume().getPath(), "/container");
+        assertEquals(bind.getAccessMode(), rw);
+    }
 
-	@Test(expectedExceptions = IllegalArgumentException.class, 
-			expectedExceptionsMessageRegExp = "Error parsing Bind 'nonsense'")
-	public void parseInvalidInput() {
-		Bind.parse("nonsense");
-	}
+    @Test
+    public void parseReadOnly() {
+        Bind bind = Bind.parse("/host:/container:ro");
+        assertEquals(bind.getPath(), "/host");
+        assertEquals(bind.getVolume().getPath(), "/container");
+        assertEquals(bind.getAccessMode(), ro);
+    }
 
-	@Test(expectedExceptions = IllegalArgumentException.class, 
-			expectedExceptionsMessageRegExp = "Error parsing Bind 'null'")
-	public void parseNull() {
-		Bind.parse(null);
-	}
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Bind.*")
+    public void parseInvalidAccessMode() {
+        Bind.parse("/host:/container:xx");
+    }
 
-	@Test
-	public void toStringReadOnly() {
-		assertEquals(Bind.parse("/host:/container:ro").toString(), "/host:/container:ro");
-	}
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Bind 'nonsense'")
+    public void parseInvalidInput() {
+        Bind.parse("nonsense");
+    }
 
-	@Test
-	public void toStringReadWrite() {
-		assertEquals(Bind.parse("/host:/container:rw").toString(), "/host:/container:rw");
-	}
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Bind 'null'")
+    public void parseNull() {
+        Bind.parse(null);
+    }
 
-	@Test
-	public void toStringDefaultAccessMode() {
-		assertEquals(Bind.parse("/host:/container").toString(), "/host:/container:rw");
-	}
+    @Test
+    public void toStringReadOnly() {
+        assertEquals(Bind.parse("/host:/container:ro").toString(), "/host:/container:ro");
+    }
+
+    @Test
+    public void toStringReadWrite() {
+        assertEquals(Bind.parse("/host:/container:rw").toString(), "/host:/container:rw");
+    }
+
+    @Test
+    public void toStringDefaultAccessMode() {
+        assertEquals(Bind.parse("/host:/container").toString(), "/host:/container:rw");
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/BindingTest.java b/src/test/java/com/github/dockerjava/api/model/BindingTest.java
index 0379dcdb0..3309a8904 100644
--- a/src/test/java/com/github/dockerjava/api/model/BindingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/BindingTest.java
@@ -8,51 +8,49 @@
 
 public class BindingTest {
 
-	@Test
-	public void parseIpAndPort() {
-		assertEquals(Binding.parse("127.0.0.1:80"), Ports.Binding("127.0.0.1", 80));
-	}
-
-	@Test
-	public void parsePortOnly() {
-		assertEquals(Binding.parse("80"), Ports.Binding(null, 80));
-	}
-
-	@Test
-	public void parseIPOnly() {
-		assertEquals(Binding.parse("127.0.0.1"), Ports.Binding("127.0.0.1", null));
-	}
-
-	@Test
-	public void parseEmptyString() {
-		assertEquals(Binding.parse(""), Ports.Binding(null, null));
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class,
-			expectedExceptionsMessageRegExp = "Error parsing Binding 'nonsense'")
-	public void parseInvalidInput() {
-		Binding.parse("nonsense");
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class, 
-			expectedExceptionsMessageRegExp = "Error parsing Binding 'null'")
-	public void parseNull() {
-		Binding.parse(null);
-	}
-
-	@Test
-	public void toStringIpAndHost() {
-		assertEquals(Binding.parse("127.0.0.1:80").toString(), "127.0.0.1:80");
-	}
-
-	@Test
-	public void toStringPortOnly() {
-		assertEquals(Binding.parse("80").toString(), "80");
-	}
-
-	@Test
-	public void toStringIpOnly() {
-		assertEquals(Binding.parse("127.0.0.1").toString(), "127.0.0.1");
-	}
+    @Test
+    public void parseIpAndPort() {
+        assertEquals(Binding.parse("127.0.0.1:80"), Ports.Binding("127.0.0.1", 80));
+    }
+
+    @Test
+    public void parsePortOnly() {
+        assertEquals(Binding.parse("80"), Ports.Binding(null, 80));
+    }
+
+    @Test
+    public void parseIPOnly() {
+        assertEquals(Binding.parse("127.0.0.1"), Ports.Binding("127.0.0.1", null));
+    }
+
+    @Test
+    public void parseEmptyString() {
+        assertEquals(Binding.parse(""), Ports.Binding(null, null));
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Binding 'nonsense'")
+    public void parseInvalidInput() {
+        Binding.parse("nonsense");
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Binding 'null'")
+    public void parseNull() {
+        Binding.parse(null);
+    }
+
+    @Test
+    public void toStringIpAndHost() {
+        assertEquals(Binding.parse("127.0.0.1:80").toString(), "127.0.0.1:80");
+    }
+
+    @Test
+    public void toStringPortOnly() {
+        assertEquals(Binding.parse("80").toString(), "80");
+    }
+
+    @Test
+    public void toStringIpOnly() {
+        assertEquals(Binding.parse("127.0.0.1").toString(), "127.0.0.1");
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java b/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
index eb6e2a542..e45ad2e8e 100644
--- a/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
@@ -8,22 +8,22 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class CapabilityTest {
-	private final ObjectMapper objectMapper = new ObjectMapper();
+    private final ObjectMapper objectMapper = new ObjectMapper();
 
-	@Test
-	public void serializeCapability() throws Exception {
-		String json = objectMapper.writeValueAsString(Capability.ALL);
-		assertEquals(json, "\"ALL\"");
-	}
+    @Test
+    public void serializeCapability() throws Exception {
+        String json = objectMapper.writeValueAsString(Capability.ALL);
+        assertEquals(json, "\"ALL\"");
+    }
 
-	@Test
-	public void deserializeCapability() throws Exception {
-		Capability capability = objectMapper.readValue("\"ALL\"", Capability.class);
-		assertEquals(capability, Capability.ALL);
-	}
+    @Test
+    public void deserializeCapability() throws Exception {
+        Capability capability = objectMapper.readValue("\"ALL\"", Capability.class);
+        assertEquals(capability, Capability.ALL);
+    }
 
-	@Test(expectedExceptions = JsonMappingException.class)
-	public void deserializeInvalidCapability() throws Exception {
-		objectMapper.readValue("\"nonsense\"", Capability.class);
-	}
+    @Test(expectedExceptions = JsonMappingException.class)
+    public void deserializeInvalidCapability() throws Exception {
+        objectMapper.readValue("\"nonsense\"", Capability.class);
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java b/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java
index de1d23c21..086613045 100644
--- a/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java
@@ -8,33 +8,31 @@
 
 public class ExposedPortTest {
 
-	@Test
-	public void parsePortAndProtocol() {
-		ExposedPort exposedPort = ExposedPort.parse("80/tcp");
-		assertEquals(exposedPort, new ExposedPort(80, TCP));
-	}
-
-	@Test
-	public void parsePortOnly() {
-		ExposedPort exposedPort = ExposedPort.parse("80");
-		assertEquals(exposedPort, new ExposedPort(80, DEFAULT));
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class,
-			expectedExceptionsMessageRegExp = "Error parsing ExposedPort 'nonsense'")
-	public void parseInvalidInput() {
-		ExposedPort.parse("nonsense");
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class, 
-			expectedExceptionsMessageRegExp = "Error parsing ExposedPort 'null'")
-	public void parseNull() {
-		ExposedPort.parse(null);
-	}
-
-	@Test
-	public void stringify() {
-		assertEquals(ExposedPort.parse("80/tcp").toString(), "80/tcp");
-	}
+    @Test
+    public void parsePortAndProtocol() {
+        ExposedPort exposedPort = ExposedPort.parse("80/tcp");
+        assertEquals(exposedPort, new ExposedPort(80, TCP));
+    }
+
+    @Test
+    public void parsePortOnly() {
+        ExposedPort exposedPort = ExposedPort.parse("80");
+        assertEquals(exposedPort, new ExposedPort(80, DEFAULT));
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing ExposedPort 'nonsense'")
+    public void parseInvalidInput() {
+        ExposedPort.parse("nonsense");
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing ExposedPort 'null'")
+    public void parseNull() {
+        ExposedPort.parse(null);
+    }
+
+    @Test
+    public void stringify() {
+        assertEquals(ExposedPort.parse("80/tcp").toString(), "80/tcp");
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java b/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
index d57c0b572..14325bd12 100644
--- a/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
@@ -2,38 +2,36 @@
 
 import junit.framework.TestCase;
 
-
 public class IdentifierTest extends TestCase {
 
-  public void testFromCompoundString() throws Exception {
-
-    Identifier i1 = Identifier.fromCompoundString("10.0.0.1/jim");
-    Identifier i2 = Identifier.fromCompoundString("10.0.0.1/jim:123");
-    Identifier i3 = Identifier.fromCompoundString("10.0.0.1:123/jim:124");
-    Identifier i3A = Identifier.fromCompoundString("10.0.0.1:123/jim:latest");
+    public void testFromCompoundString() throws Exception {
 
-    assertTrue(!i1.tag.isPresent());
-    assertEquals(i1.repository.name, "10.0.0.1/jim");
+        Identifier i1 = Identifier.fromCompoundString("10.0.0.1/jim");
+        Identifier i2 = Identifier.fromCompoundString("10.0.0.1/jim:123");
+        Identifier i3 = Identifier.fromCompoundString("10.0.0.1:123/jim:124");
+        Identifier i3A = Identifier.fromCompoundString("10.0.0.1:123/jim:latest");
 
-    assertTrue(i2.tag.isPresent());
-    assertEquals(i2.tag.get(), "123");
-    assertEquals(i2.repository.name, "10.0.0.1/jim");
+        assertTrue(!i1.tag.isPresent());
+        assertEquals(i1.repository.name, "10.0.0.1/jim");
 
-    assertTrue(i3.tag.isPresent());
-    assertEquals(i3.tag.get(), "124");
-    assertEquals(i3.repository.name, "10.0.0.1:123/jim");
-    assertEquals(i3.repository.getURL().getPort(), 123);
-    assertEquals(i3A.tag.get(), "latest");
+        assertTrue(i2.tag.isPresent());
+        assertEquals(i2.tag.get(), "123");
+        assertEquals(i2.repository.name, "10.0.0.1/jim");
 
+        assertTrue(i3.tag.isPresent());
+        assertEquals(i3.tag.get(), "124");
+        assertEquals(i3.repository.name, "10.0.0.1:123/jim");
+        assertEquals(i3.repository.getURL().getPort(), 123);
+        assertEquals(i3A.tag.get(), "latest");
 
-    Identifier i4 = Identifier.fromCompoundString("centos:latest");
-    assertTrue(i4.tag.isPresent());
-    assertEquals(i4.tag.get(), "latest");
+        Identifier i4 = Identifier.fromCompoundString("centos:latest");
+        assertTrue(i4.tag.isPresent());
+        assertEquals(i4.tag.get(), "latest");
 
-    Identifier i5 = Identifier.fromCompoundString("busybox");
-    assertTrue(!i5.tag.isPresent());
+        Identifier i5 = Identifier.fromCompoundString("busybox");
+        assertTrue(!i5.tag.isPresent());
 
-    Identifier i6 = Identifier.fromCompoundString("10.0.0.1:5000/my-test-image:1234");
-    assertEquals(i6.repository.getPath(), "my-test-image");
-  }
+        Identifier i6 = Identifier.fromCompoundString("10.0.0.1:5000/my-test-image:1234");
+        assertEquals(i6.repository.getPath(), "my-test-image");
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java b/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java
index ea0b20d73..25da40d74 100644
--- a/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java
@@ -7,36 +7,34 @@
 
 public class InternetProtocolTest {
 
-	@Test
-	public void defaultProtocol() {
-		assertEquals(InternetProtocol.DEFAULT, TCP);
-	}
-
-	@Test
-	public void stringify() {
-		assertEquals(TCP.toString(), "tcp");
-	}
-
-	@Test
-	public void parseUpperCase() {
-		assertEquals(InternetProtocol.parse("TCP"), TCP);
-	}
-
-	@Test
-	public void parseLowerCase() {
-		assertEquals(InternetProtocol.parse("tcp"), TCP);
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class, 
-			expectedExceptionsMessageRegExp = "Error parsing Protocol.*")
-	public void parseInvalidInput() {
-		InternetProtocol.parse("xx");
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class, 
-			expectedExceptionsMessageRegExp = "Error parsing Protocol 'null'")
-	public void parseNull() {
-		InternetProtocol.parse(null);
-	}
+    @Test
+    public void defaultProtocol() {
+        assertEquals(InternetProtocol.DEFAULT, TCP);
+    }
+
+    @Test
+    public void stringify() {
+        assertEquals(TCP.toString(), "tcp");
+    }
+
+    @Test
+    public void parseUpperCase() {
+        assertEquals(InternetProtocol.parse("TCP"), TCP);
+    }
+
+    @Test
+    public void parseLowerCase() {
+        assertEquals(InternetProtocol.parse("tcp"), TCP);
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Protocol.*")
+    public void parseInvalidInput() {
+        InternetProtocol.parse("xx");
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Protocol 'null'")
+    public void parseNull() {
+        InternetProtocol.parse(null);
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/LinkTest.java b/src/test/java/com/github/dockerjava/api/model/LinkTest.java
index 2f6df0c5e..208e9f363 100644
--- a/src/test/java/com/github/dockerjava/api/model/LinkTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/LinkTest.java
@@ -6,35 +6,33 @@
 
 public class LinkTest {
 
-	@Test
-	public void parse() {
-		Link link = Link.parse("name:alias");
-		assertEquals(link.getName(), "name");
-		assertEquals(link.getAlias(), "alias");
-	}
-	
-	@Test
-	public void parseWithContainerNames() {
-		Link link = Link.parse("/name:/conatiner/alias");
-		assertEquals(link.getName(), "name");
-		assertEquals(link.getAlias(), "alias");
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class,
-			expectedExceptionsMessageRegExp = "Error parsing Link 'nonsense'")
-	public void parseInvalidInput() {
-		Link.parse("nonsense");
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class, 
-			expectedExceptionsMessageRegExp = "Error parsing Link 'null'")
-	public void parseNull() {
-		Link.parse(null);
-	}
-
-	@Test
-	public void stringify() {
-		assertEquals(Link.parse("name:alias").toString(), "name:alias");
-	}
+    @Test
+    public void parse() {
+        Link link = Link.parse("name:alias");
+        assertEquals(link.getName(), "name");
+        assertEquals(link.getAlias(), "alias");
+    }
+
+    @Test
+    public void parseWithContainerNames() {
+        Link link = Link.parse("/name:/conatiner/alias");
+        assertEquals(link.getName(), "name");
+        assertEquals(link.getAlias(), "alias");
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Link 'nonsense'")
+    public void parseInvalidInput() {
+        Link.parse("nonsense");
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Link 'null'")
+    public void parseNull() {
+        Link.parse(null);
+    }
+
+    @Test
+    public void stringify() {
+        assertEquals(Link.parse("name:alias").toString(), "name:alias");
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java b/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
index 2aeb768f6..e5f5f4c1b 100644
--- a/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
@@ -7,55 +7,48 @@
 import com.github.dockerjava.api.model.Ports.Binding;
 
 public class PortBindingTest {
-	
-	private static final ExposedPort TCP_8080 = ExposedPort.tcp(8080);
-
-	@Test
-	public void fullDefinition() {
-		assertEquals(PortBinding.parse("127.0.0.1:80:8080/tcp"),
-				new PortBinding(new Binding("127.0.0.1", 80), TCP_8080));
-	}
-
-	@Test
-	public void noProtocol() {
-		assertEquals(PortBinding.parse("127.0.0.1:80:8080"),
-				new PortBinding(new Binding("127.0.0.1", 80), TCP_8080));
-	}
-
-	@Test
-	public void noHostIp() {
-		assertEquals(PortBinding.parse("80:8080/tcp"),
-				new PortBinding(new Binding(80), TCP_8080));
-	}
-
-	@Test
-	public void portsOnly() {
-		assertEquals(PortBinding.parse("80:8080"),
-				new PortBinding(new Binding(80), TCP_8080));
-	}
-
-	@Test
-	public void exposedPortOnly() {
-		assertEquals(PortBinding.parse("8080"),
-				new PortBinding(new Binding(), TCP_8080));
-	}
-
-	@Test
-	public void dynamicHostPort() {
-		assertEquals(PortBinding.parse("127.0.0.1::8080"),
-				new PortBinding(new Binding("127.0.0.1"), TCP_8080));
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class,
-			expectedExceptionsMessageRegExp = "Error parsing PortBinding 'nonsense'")
-	public void parseInvalidInput() {
-		PortBinding.parse("nonsense");
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class, 
-			expectedExceptionsMessageRegExp = "Error parsing PortBinding 'null'")
-	public void parseNull() {
-		PortBinding.parse(null);
-	}
+
+    private static final ExposedPort TCP_8080 = ExposedPort.tcp(8080);
+
+    @Test
+    public void fullDefinition() {
+        assertEquals(PortBinding.parse("127.0.0.1:80:8080/tcp"),
+                new PortBinding(new Binding("127.0.0.1", 80), TCP_8080));
+    }
+
+    @Test
+    public void noProtocol() {
+        assertEquals(PortBinding.parse("127.0.0.1:80:8080"), new PortBinding(new Binding("127.0.0.1", 80), TCP_8080));
+    }
+
+    @Test
+    public void noHostIp() {
+        assertEquals(PortBinding.parse("80:8080/tcp"), new PortBinding(new Binding(80), TCP_8080));
+    }
+
+    @Test
+    public void portsOnly() {
+        assertEquals(PortBinding.parse("80:8080"), new PortBinding(new Binding(80), TCP_8080));
+    }
+
+    @Test
+    public void exposedPortOnly() {
+        assertEquals(PortBinding.parse("8080"), new PortBinding(new Binding(), TCP_8080));
+    }
+
+    @Test
+    public void dynamicHostPort() {
+        assertEquals(PortBinding.parse("127.0.0.1::8080"), new PortBinding(new Binding("127.0.0.1"), TCP_8080));
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing PortBinding 'nonsense'")
+    public void parseInvalidInput() {
+        PortBinding.parse("nonsense");
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing PortBinding 'null'")
+    public void parseNull() {
+        PortBinding.parse(null);
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/Ports_SerializingTest.java b/src/test/java/com/github/dockerjava/api/model/Ports_SerializingTest.java
index 9190eefd2..8c8d2014f 100644
--- a/src/test/java/com/github/dockerjava/api/model/Ports_SerializingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/Ports_SerializingTest.java
@@ -10,50 +10,51 @@
 import com.github.dockerjava.api.model.Ports.Binding;
 
 public class Ports_SerializingTest {
-	private final ObjectMapper objectMapper = new ObjectMapper();
-	private final String jsonWithDoubleBindingForOnePort = 
-			"{\"80/tcp\":[{\"HostIp\":\"10.0.0.1\",\"HostPort\":\"80\"},{\"HostIp\":\"10.0.0.2\",\"HostPort\":\"80\"}]}";
-	private final String jsonWithNullBindingForOnePort = "{\"80/tcp\":null}";
-
-	@Test
-	public void deserializingPortWithMultipleBindings() throws Exception {
-		Ports ports = objectMapper.readValue(jsonWithDoubleBindingForOnePort, Ports.class);
-		Map<ExposedPort, Binding[]> map = ports.getBindings();
-		assertEquals(map.size(), 1);
-
-		Binding[] bindings = map.get(ExposedPort.tcp(80));
-		assertEquals(bindings.length, 2);
-		assertEquals(bindings[0], new Binding("10.0.0.1", 80));
-		assertEquals(bindings[1], new Binding("10.0.0.2", 80));
-	}
-	
-	@Test
-	public void serializingPortWithMultipleBindings() throws Exception {
-		Ports ports = new Ports();
-		ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.1", 80));
-		ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.2", 80));
-		assertEquals(objectMapper.writeValueAsString(ports), jsonWithDoubleBindingForOnePort);
-	}
-	
-	@Test
-	public void serializingEmptyBinding() throws Exception {
-		Ports ports = new Ports(ExposedPort.tcp(80), new Binding(null, null));
-		assertEquals(objectMapper.writeValueAsString(ports), "{\"80/tcp\":[{\"HostIp\":\"\",\"HostPort\":\"\"}]}");
-	}
-
-	@Test
-	public void deserializingPortWithNullBindings() throws Exception {
-		Ports ports = objectMapper.readValue(jsonWithNullBindingForOnePort, Ports.class);
-		Map<ExposedPort, Binding[]> map = ports.getBindings();
-		assertEquals(map.size(), 1);
-
-		assertEquals(map.get(ExposedPort.tcp(80)), null);
-	}
-
-	@Test
-	public void serializingWithNullBindings() throws Exception {
-		Ports ports = new Ports();
-		ports.bind(ExposedPort.tcp(80), null);
-		assertEquals(objectMapper.writeValueAsString(ports), jsonWithNullBindingForOnePort);
-	}
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    private final String jsonWithDoubleBindingForOnePort = "{\"80/tcp\":[{\"HostIp\":\"10.0.0.1\",\"HostPort\":\"80\"},{\"HostIp\":\"10.0.0.2\",\"HostPort\":\"80\"}]}";
+
+    private final String jsonWithNullBindingForOnePort = "{\"80/tcp\":null}";
+
+    @Test
+    public void deserializingPortWithMultipleBindings() throws Exception {
+        Ports ports = objectMapper.readValue(jsonWithDoubleBindingForOnePort, Ports.class);
+        Map<ExposedPort, Binding[]> map = ports.getBindings();
+        assertEquals(map.size(), 1);
+
+        Binding[] bindings = map.get(ExposedPort.tcp(80));
+        assertEquals(bindings.length, 2);
+        assertEquals(bindings[0], new Binding("10.0.0.1", 80));
+        assertEquals(bindings[1], new Binding("10.0.0.2", 80));
+    }
+
+    @Test
+    public void serializingPortWithMultipleBindings() throws Exception {
+        Ports ports = new Ports();
+        ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.1", 80));
+        ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.2", 80));
+        assertEquals(objectMapper.writeValueAsString(ports), jsonWithDoubleBindingForOnePort);
+    }
+
+    @Test
+    public void serializingEmptyBinding() throws Exception {
+        Ports ports = new Ports(ExposedPort.tcp(80), new Binding(null, null));
+        assertEquals(objectMapper.writeValueAsString(ports), "{\"80/tcp\":[{\"HostIp\":\"\",\"HostPort\":\"\"}]}");
+    }
+
+    @Test
+    public void deserializingPortWithNullBindings() throws Exception {
+        Ports ports = objectMapper.readValue(jsonWithNullBindingForOnePort, Ports.class);
+        Map<ExposedPort, Binding[]> map = ports.getBindings();
+        assertEquals(map.size(), 1);
+
+        assertEquals(map.get(ExposedPort.tcp(80)), null);
+    }
+
+    @Test
+    public void serializingWithNullBindings() throws Exception {
+        Ports ports = new Ports();
+        ports.bind(ExposedPort.tcp(80), null);
+        assertEquals(objectMapper.writeValueAsString(ports), jsonWithNullBindingForOnePort);
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java b/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
index 18c7f0f09..7b22bd039 100644
--- a/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
@@ -11,56 +11,53 @@
 import com.github.dockerjava.api.model.Ports.Binding;
 
 /**
- * As there may be several {@link Binding}s per {@link ExposedPort},
- * it makes a difference if you add {@link PortBinding}s for the
- * same or different {@link ExposedPort}s to {@link Ports}.
- * This test verifies that the Map in {@link Ports} is populated 
- * correctly in both cases.
+ * As there may be several {@link Binding}s per {@link ExposedPort}, it makes a difference if you add
+ * {@link PortBinding}s for the same or different {@link ExposedPort}s to {@link Ports}. This test verifies that the Map
+ * in {@link Ports} is populated correctly in both cases.
  */
 public class Ports_addBindingsTest {
-	private static final ExposedPort TCP_80 = ExposedPort.tcp(80);
-	private static final ExposedPort TCP_90 = ExposedPort.tcp(90);
-	private static final Binding BINDING_8080 = Ports.Binding(8080);
-	private static final Binding BINDING_9090 = Ports.Binding(9090);
-
-	private Ports ports;
-
-	@BeforeMethod
-	public void setup() {
-		ports = new Ports();
-	}
-	
-	@Test
-	public void addTwoBindingsForDifferentExposedPorts() {
-		ports.add(
-				new PortBinding(BINDING_8080, TCP_80), 
-				new PortBinding(BINDING_9090, TCP_90));
-
-		Map<ExposedPort, Binding[]> bindings = ports.getBindings();
-		// two keys with one value each
-		assertEquals(bindings.size(), 2);
-		assertEquals(bindings.get(TCP_80), new Binding[] { BINDING_8080 });
-		assertEquals(bindings.get(TCP_90), new Binding[] { BINDING_9090 });
-	}
-
-	@Test
-	public void addTwoBindingsForSameExposedPort() {
-		ports.add(
-				new PortBinding(BINDING_8080, TCP_80), 
-				new PortBinding(BINDING_9090, TCP_80));
-
-		Map<ExposedPort, Binding[]> bindings = ports.getBindings();
-		// one key with two values
-		assertEquals(bindings.size(), 1);
-		assertEquals(bindings.get(TCP_80), new Binding[] { BINDING_8080, BINDING_9090 });
-	}
-
-	@Test
-	public void addNullBindings() {
-		ports.add(new PortBinding(null, TCP_80));
-		Map<ExposedPort, Binding[]> bindings = ports.getBindings();
-		// one key with two values
-		assertEquals(bindings.size(), 1);
-		assertEquals(bindings.get(TCP_80), null);
-	}
+    private static final ExposedPort TCP_80 = ExposedPort.tcp(80);
+
+    private static final ExposedPort TCP_90 = ExposedPort.tcp(90);
+
+    private static final Binding BINDING_8080 = Ports.Binding(8080);
+
+    private static final Binding BINDING_9090 = Ports.Binding(9090);
+
+    private Ports ports;
+
+    @BeforeMethod
+    public void setup() {
+        ports = new Ports();
+    }
+
+    @Test
+    public void addTwoBindingsForDifferentExposedPorts() {
+        ports.add(new PortBinding(BINDING_8080, TCP_80), new PortBinding(BINDING_9090, TCP_90));
+
+        Map<ExposedPort, Binding[]> bindings = ports.getBindings();
+        // two keys with one value each
+        assertEquals(bindings.size(), 2);
+        assertEquals(bindings.get(TCP_80), new Binding[] { BINDING_8080 });
+        assertEquals(bindings.get(TCP_90), new Binding[] { BINDING_9090 });
+    }
+
+    @Test
+    public void addTwoBindingsForSameExposedPort() {
+        ports.add(new PortBinding(BINDING_8080, TCP_80), new PortBinding(BINDING_9090, TCP_80));
+
+        Map<ExposedPort, Binding[]> bindings = ports.getBindings();
+        // one key with two values
+        assertEquals(bindings.size(), 1);
+        assertEquals(bindings.get(TCP_80), new Binding[] { BINDING_8080, BINDING_9090 });
+    }
+
+    @Test
+    public void addNullBindings() {
+        ports.add(new PortBinding(null, TCP_80));
+        Map<ExposedPort, Binding[]> bindings = ports.getBindings();
+        // one key with two values
+        assertEquals(bindings.size(), 1);
+        assertEquals(bindings.get(TCP_80), null);
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/RepositoryTest.java b/src/test/java/com/github/dockerjava/api/model/RepositoryTest.java
index 8a40de28b..8db0273df 100644
--- a/src/test/java/com/github/dockerjava/api/model/RepositoryTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/RepositoryTest.java
@@ -3,16 +3,16 @@
 import junit.framework.TestCase;
 
 public class RepositoryTest extends TestCase {
-  public void testRepository() throws Exception {
+    public void testRepository() throws Exception {
 
-    Repository repo = new Repository("10.0.0.1/jim");
-    Repository repo1 = new Repository("10.0.0.1:1234/jim");
-    Repository repo2 = new Repository("busybox");
+        Repository repo = new Repository("10.0.0.1/jim");
+        Repository repo1 = new Repository("10.0.0.1:1234/jim");
+        Repository repo2 = new Repository("busybox");
 
-    assertEquals("jim", repo.getPath());
-    assertEquals("jim", repo1.getPath());
-    assertEquals("busybox", repo2.getPath());
+        assertEquals("jim", repo.getPath());
+        assertEquals("jim", repo1.getPath());
+        assertEquals("busybox", repo2.getPath());
 
-    assertEquals(1234, repo1.getURL().getPort());
-  }
+        assertEquals(1234, repo1.getURL().getPort());
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_ParsingTest.java b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_ParsingTest.java
index 04823db24..3bc22c00e 100644
--- a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_ParsingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_ParsingTest.java
@@ -6,35 +6,33 @@
 
 public class RestartPolicy_ParsingTest {
 
-	@Test
-	public void noRestart() throws Exception {
-		assertEquals(RestartPolicy.parse("no"), RestartPolicy.noRestart());
-	}
-	
-	@Test
-	public void alwaysRestart() throws Exception {
-		assertEquals(RestartPolicy.parse("always"), RestartPolicy.alwaysRestart());
-	}
-
-	@Test
-	public void onFailureRestart() throws Exception {
-		assertEquals(RestartPolicy.parse("on-failure"), RestartPolicy.onFailureRestart(0));
-	}
-
-	@Test
-	public void onFailureRestartWithCount() throws Exception {
-		assertEquals(RestartPolicy.parse("on-failure:2"), RestartPolicy.onFailureRestart(2));
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class,
-			expectedExceptionsMessageRegExp = "Error parsing RestartPolicy 'nonsense'")
-	public void illegalSyntax() throws Exception {
-		RestartPolicy.parse("nonsense");
-	}
-
-	@Test(expectedExceptions = IllegalArgumentException.class,
-			expectedExceptionsMessageRegExp = "Error parsing RestartPolicy 'on-failure:X'")
-	public void illegalRetryCount() throws Exception {
-		RestartPolicy.parse("on-failure:X");
-	}
+    @Test
+    public void noRestart() throws Exception {
+        assertEquals(RestartPolicy.parse("no"), RestartPolicy.noRestart());
+    }
+
+    @Test
+    public void alwaysRestart() throws Exception {
+        assertEquals(RestartPolicy.parse("always"), RestartPolicy.alwaysRestart());
+    }
+
+    @Test
+    public void onFailureRestart() throws Exception {
+        assertEquals(RestartPolicy.parse("on-failure"), RestartPolicy.onFailureRestart(0));
+    }
+
+    @Test
+    public void onFailureRestartWithCount() throws Exception {
+        assertEquals(RestartPolicy.parse("on-failure:2"), RestartPolicy.onFailureRestart(2));
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing RestartPolicy 'nonsense'")
+    public void illegalSyntax() throws Exception {
+        RestartPolicy.parse("nonsense");
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing RestartPolicy 'on-failure:X'")
+    public void illegalRetryCount() throws Exception {
+        RestartPolicy.parse("on-failure:X");
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_SerializingTest.java b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_SerializingTest.java
index 7b13a3958..b4a9a746a 100644
--- a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_SerializingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_SerializingTest.java
@@ -7,35 +7,38 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
- * Compares serialization results of various {@link RestartPolicy}s with
- * what Docker (as of 1.3.3) actually sends when executing 
- * <code>docker run --restart xxx</code>.
+ * Compares serialization results of various {@link RestartPolicy}s with what Docker (as of 1.3.3) actually sends when
+ * executing <code>docker run --restart xxx</code>.
  */
 public class RestartPolicy_SerializingTest {
-	private final ObjectMapper objectMapper = new ObjectMapper();
-
-	@Test  // --restart no
-	public void noRestart() throws Exception {
-		String json = objectMapper.writeValueAsString(RestartPolicy.noRestart());
-		assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"\"}");
-	}
-	
-	@Test  // --restart always
-	public void alwaysRestart() throws Exception {
-		String json = objectMapper.writeValueAsString(RestartPolicy.alwaysRestart());
-		assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"always\"}");
-	}
-
-	@Test  // --restart on-failure
-	public void onFailureRestart() throws Exception {
-		String json = objectMapper.writeValueAsString(RestartPolicy.onFailureRestart(0));
-		assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"on-failure\"}");
-	}
-	
-	@Test  // --restart on-failure:2
-	public void onFailureRestartWithCount() throws Exception {
-		String json = objectMapper.writeValueAsString(RestartPolicy.onFailureRestart(2));
-		assertEquals(json, "{\"MaximumRetryCount\":2,\"Name\":\"on-failure\"}");
-	}
-	
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    @Test
+    // --restart no
+    public void noRestart() throws Exception {
+        String json = objectMapper.writeValueAsString(RestartPolicy.noRestart());
+        assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"\"}");
+    }
+
+    @Test
+    // --restart always
+    public void alwaysRestart() throws Exception {
+        String json = objectMapper.writeValueAsString(RestartPolicy.alwaysRestart());
+        assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"always\"}");
+    }
+
+    @Test
+    // --restart on-failure
+    public void onFailureRestart() throws Exception {
+        String json = objectMapper.writeValueAsString(RestartPolicy.onFailureRestart(0));
+        assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"on-failure\"}");
+    }
+
+    @Test
+    // --restart on-failure:2
+    public void onFailureRestartWithCount() throws Exception {
+        String json = objectMapper.writeValueAsString(RestartPolicy.onFailureRestart(2));
+        assertEquals(json, "{\"MaximumRetryCount\":2,\"Name\":\"on-failure\"}");
+    }
+
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java
index a52441d63..a2d99ce9c 100644
--- a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java
@@ -7,19 +7,14 @@
 
 public class RestartPolicy_toStringTest {
 
-	@DataProvider(name = "input")
-	public Object[][] restartPolicies() {
-		return new Object[][] { 
-				{ "no" },
-				{ "always" },
-				{ "on-failure" },
-				{ "on-failure:2" }
-				};
-	}
+    @DataProvider(name = "input")
+    public Object[][] restartPolicies() {
+        return new Object[][] { { "no" }, { "always" }, { "on-failure" }, { "on-failure:2" } };
+    }
 
-	@Test(dataProvider = "input")
-	public void serializationWithoutCount(String policy) throws Exception {
-		assertEquals(RestartPolicy.parse(policy).toString(), policy);
-	}
+    @Test(dataProvider = "input")
+    public void serializationWithoutCount(String policy) throws Exception {
+        assertEquals(RestartPolicy.parse(policy).toString(), policy);
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java b/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
index e8bafc460..41abaf99d 100644
--- a/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
@@ -16,8 +16,8 @@ public void t() throws IOException {
         ObjectMapper objectMapper = new ObjectMapper();
         VolumeBinds volumeBinds = objectMapper.readValue(s, VolumeBinds.class);
         VolumeBind[] binds = volumeBinds.getBinds();
-        assertEquals(binds.length,1);
-        assertEquals(binds[0].getHostPath(),"/some/path");
+        assertEquals(binds.length, 1);
+        assertEquals(binds[0].getHostPath(), "/some/path");
         assertEquals(binds[0].getContainerPath(), "/data");
     }
 
@@ -28,5 +28,4 @@ public void t1() throws IOException {
         objectMapper.readValue(s, VolumeBinds.class);
     }
 
-
 }
\ No newline at end of file
diff --git a/src/test/java/com/github/dockerjava/api/model/VolumeFrom_SerializingTest.java b/src/test/java/com/github/dockerjava/api/model/VolumeFrom_SerializingTest.java
index b7c3bbff5..55c7088c4 100644
--- a/src/test/java/com/github/dockerjava/api/model/VolumeFrom_SerializingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/VolumeFrom_SerializingTest.java
@@ -7,19 +7,20 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class VolumeFrom_SerializingTest {
-	private final ObjectMapper objectMapper = new ObjectMapper();
-	private final String json = "\"container1:ro\"";
-
-	@Test
-	public void deserializing() throws Exception {
-		VolumesFrom volumeFrom = objectMapper.readValue(json, VolumesFrom.class);
-		assertEquals(volumeFrom, new VolumesFrom("container1", AccessMode.ro));
-	}
-
-	@Test
-	public void serializing() throws Exception {
-		VolumesFrom volumeFrom = new VolumesFrom("container1", AccessMode.ro);
-		assertEquals(objectMapper.writeValueAsString(volumeFrom), json);
-	}
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    private final String json = "\"container1:ro\"";
+
+    @Test
+    public void deserializing() throws Exception {
+        VolumesFrom volumeFrom = objectMapper.readValue(json, VolumesFrom.class);
+        assertEquals(volumeFrom, new VolumesFrom("container1", AccessMode.ro));
+    }
+
+    @Test
+    public void serializing() throws Exception {
+        VolumesFrom volumeFrom = new VolumesFrom("container1", AccessMode.ro);
+        assertEquals(objectMapper.writeValueAsString(volumeFrom), json);
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/VolumeTest.java b/src/test/java/com/github/dockerjava/api/model/VolumeTest.java
index 7419e5dc9..5b8311425 100644
--- a/src/test/java/com/github/dockerjava/api/model/VolumeTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/VolumeTest.java
@@ -5,8 +5,8 @@
 import org.testng.annotations.Test;
 
 public class VolumeTest {
-	@Test
-	public void getPath() {
-		assertEquals(new Volume("/path").getPath(), "/path");
-	}
+    @Test
+    public void getPath() {
+        assertEquals(new Volume("/path").getPath(), "/path");
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index ec70de4c7..bae718acb 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -33,28 +33,26 @@
 
 public abstract class AbstractDockerClientTest extends Assert {
 
-	public static final Logger LOG = LoggerFactory
-			.getLogger(AbstractDockerClientTest.class);
+    public static final Logger LOG = LoggerFactory.getLogger(AbstractDockerClientTest.class);
 
     protected DockerClient dockerClient;
 
-	protected TestDockerCmdExecFactory dockerCmdExecFactory = new TestDockerCmdExecFactory(DockerClientBuilder.getDefaultDockerCmdExecFactory());
+    protected TestDockerCmdExecFactory dockerCmdExecFactory = new TestDockerCmdExecFactory(
+            DockerClientBuilder.getDefaultDockerCmdExecFactory());
 
-	public void beforeTest()  {
+    public void beforeTest() {
 
-		LOG.info("======================= BEFORETEST =======================");
-		LOG.info("Connecting to Docker server");
-		dockerClient = DockerClientBuilder.getInstance(config())
-				.withDockerCmdExecFactory(dockerCmdExecFactory)
-				.build();
+        LOG.info("======================= BEFORETEST =======================");
+        LOG.info("Connecting to Docker server");
+        dockerClient = DockerClientBuilder.getInstance(config()).withDockerCmdExecFactory(dockerCmdExecFactory).build();
 
-		LOG.info("Pulling image 'busybox'");
-		// need to block until image is pulled completely
-		asString(dockerClient.pullImageCmd("busybox").withTag("latest").exec());
+        LOG.info("Pulling image 'busybox'");
+        // need to block until image is pulled completely
+        asString(dockerClient.pullImageCmd("busybox").withTag("latest").exec());
 
-		assertNotNull(dockerClient);
-		LOG.info("======================= END OF BEFORETEST =======================\n\n");
-	}
+        assertNotNull(dockerClient);
+        LOG.info("======================= END OF BEFORETEST =======================\n\n");
+    }
 
     private DockerClientConfig config() {
         return config(null);
@@ -63,134 +61,129 @@ private DockerClientConfig config() {
     protected DockerClientConfig config(String password) {
         DockerClientConfig.DockerClientConfigBuilder builder = DockerClientConfig.createDefaultConfigBuilder()
                 .withServerAddress("https://index.docker.io/v1/");
-        if (password!=null) {
+        if (password != null) {
             builder = builder.withPassword(password);
         }
-        return builder
-                .build();
+        return builder.build();
     }
 
     public void afterTest() {
-		LOG.info("======================= END OF AFTERTEST =======================");
-	}
-
-
-	public void beforeMethod(Method method) {
-		LOG.info(String
-				.format("################################## STARTING %s ##################################",
-						method.getName()));
-	}
-
-	public void afterMethod(ITestResult result) {
-
-		for (String container : dockerCmdExecFactory.getContainerNames()) {
-			LOG.info("Cleaning up temporary container {}", container);
-
-			try {
-				dockerClient.removeContainerCmd(container).withForce().exec();
-			} catch (DockerException ignore) {
-				//ignore.printStackTrace();
-			}
-		}
-
-		for (String image : dockerCmdExecFactory.getImageNames()) {
-			LOG.info("Cleaning up temporary image with {}", image);
-			try {
-				dockerClient.removeImageCmd(image).withForce().exec();
-			} catch (DockerException ignore) {
-				//ignore.printStackTrace();
-			}
-		}
-
-		LOG.info(
-				"################################## END OF {} ##################################\n",
-				result.getName());
-	}
-
-	protected String asString(InputStream response) {
-		return consumeAsString(response);
-	}
-
-	public static String consumeAsString(InputStream response)  {
-
-		StringWriter logwriter = new StringWriter();
-
-		try {
-			LineIterator itr = IOUtils.lineIterator(
-					response, "UTF-8");
-
-			while (itr.hasNext()) {
-				String line = itr.next();
-				logwriter.write(line + (itr.hasNext() ? "\n" : ""));
-				LOG.info("line: "+line);
-			}
-			response.close();
-
-			return logwriter.toString();
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		} finally {
-			IOUtils.closeQuietly(response);
-		}
-	}
-
-	// UTIL
-
-	/**
-	 * Checks to see if a specific port is available.
-	 *
-	 * @param port
-	 *            the port to check for availability
-	 */
-	public static boolean available(int port) {
-		if (port < 1100 || port > 60000) {
-			throw new IllegalArgumentException("Invalid start port: " + port);
-		}
-
-		ServerSocket ss = null;
-		DatagramSocket ds = null;
-		try {
-			ss = new ServerSocket(port);
-			ss.setReuseAddress(true);
-			ds = new DatagramSocket(port);
-			ds.setReuseAddress(true);
-			return true;
-		} catch (IOException ignored) {
-		} finally {
-			if (ds != null) {
-				ds.close();
-			}
-
-			if (ss != null) {
-				try {
-					ss.close();
-				} catch (IOException e) {
-					/* should not be thrown */
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Asserts that {@link InspectContainerResponse#getVolumes()} (<code>.Volumes</code>)
-	 * has {@link VolumeBind}s for the given {@link Volume}s
-	 */
-	public static void assertContainerHasVolumes(InspectContainerResponse inspectContainerResponse,
-			Volume ... expectedVolumes) {
-		VolumeBind[] volumeBinds = inspectContainerResponse.getVolumes();
-		LOG.info("Inspect .Volumes = [{}]", Joiner.on(", ").join(volumeBinds));
-
-		List<Volume> volumes = new ArrayList<Volume>();
-		for (VolumeBind bind : volumeBinds) {
-			volumes.add(new Volume(bind.getContainerPath()));
-		}
-		assertThat(volumes, contains(expectedVolumes));
-	}
-
-	public static class CollectFramesCallback extends ResultCallbackTemplate<Frame> {
+        LOG.info("======================= END OF AFTERTEST =======================");
+    }
+
+    public void beforeMethod(Method method) {
+        LOG.info(String.format("################################## STARTING %s ##################################",
+                method.getName()));
+    }
+
+    public void afterMethod(ITestResult result) {
+
+        for (String container : dockerCmdExecFactory.getContainerNames()) {
+            LOG.info("Cleaning up temporary container {}", container);
+
+            try {
+                dockerClient.removeContainerCmd(container).withForce().exec();
+            } catch (DockerException ignore) {
+                // ignore.printStackTrace();
+            }
+        }
+
+        for (String image : dockerCmdExecFactory.getImageNames()) {
+            LOG.info("Cleaning up temporary image with {}", image);
+            try {
+                dockerClient.removeImageCmd(image).withForce().exec();
+            } catch (DockerException ignore) {
+                // ignore.printStackTrace();
+            }
+        }
+
+        LOG.info("################################## END OF {} ##################################\n", result.getName());
+    }
+
+    protected String asString(InputStream response) {
+        return consumeAsString(response);
+    }
+
+    public static String consumeAsString(InputStream response) {
+
+        StringWriter logwriter = new StringWriter();
+
+        try {
+            LineIterator itr = IOUtils.lineIterator(response, "UTF-8");
+
+            while (itr.hasNext()) {
+                String line = itr.next();
+                logwriter.write(line + (itr.hasNext() ? "\n" : ""));
+                LOG.info("line: " + line);
+            }
+            response.close();
+
+            return logwriter.toString();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } finally {
+            IOUtils.closeQuietly(response);
+        }
+    }
+
+    // UTIL
+
+    /**
+     * Checks to see if a specific port is available.
+     *
+     * @param port
+     *            the port to check for availability
+     */
+    public static boolean available(int port) {
+        if (port < 1100 || port > 60000) {
+            throw new IllegalArgumentException("Invalid start port: " + port);
+        }
+
+        ServerSocket ss = null;
+        DatagramSocket ds = null;
+        try {
+            ss = new ServerSocket(port);
+            ss.setReuseAddress(true);
+            ds = new DatagramSocket(port);
+            ds.setReuseAddress(true);
+            return true;
+        } catch (IOException ignored) {
+        } finally {
+            if (ds != null) {
+                ds.close();
+            }
+
+            if (ss != null) {
+                try {
+                    ss.close();
+                } catch (IOException e) {
+                    /* should not be thrown */
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Asserts that {@link InspectContainerResponse#getVolumes()} (<code>.Volumes</code>) has {@link VolumeBind}s for
+     * the given {@link Volume}s
+     */
+    public static void assertContainerHasVolumes(InspectContainerResponse inspectContainerResponse,
+            Volume... expectedVolumes) {
+        VolumeBind[] volumeBinds = inspectContainerResponse.getVolumes();
+        LOG.info("Inspect .Volumes = [{}]", Joiner.on(", ").join(volumeBinds));
+
+        List<Volume> volumes = new ArrayList<Volume>();
+        for (VolumeBind bind : volumeBinds) {
+            volumes.add(new Volume(bind.getContainerPath()));
+        }
+        assertThat(volumes, contains(expectedVolumes));
+    }
+
+    public static class CollectFramesCallback extends ResultCallbackTemplate<Frame> {
         public final List<Frame> frames = new ArrayList<Frame>();
+
         private final StringBuffer log = new StringBuffer();
 
         @Override
@@ -211,7 +204,7 @@ public String toString() {
         }
     }
 
-	protected String containerLog(String containerId) throws Exception {
+    protected String containerLog(String containerId) throws Exception {
 
         CollectFramesCallback collectFramesCallback = new CollectFramesCallback();
 
diff --git a/src/test/java/com/github/dockerjava/client/DockerClientTest.java b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
index e5bef57d3..85ee0d7ac 100644
--- a/src/test/java/com/github/dockerjava/client/DockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
@@ -24,50 +24,46 @@
  */
 @Test(groups = "integration")
 public class DockerClientTest extends AbstractDockerClientTest {
-	public static final Logger LOG = LoggerFactory
-			.getLogger(DockerClientTest.class);
+    public static final Logger LOG = LoggerFactory.getLogger(DockerClientTest.class);
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
 
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
 
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
 
-	@Test
-	public void testRunShlex() throws DockerException {
+    @Test
+    public void testRunShlex() throws DockerException {
 
-		String[] commands = new String[] {
-				"true",
-				"echo \"The Young Descendant of Tepes & Septette for the Dead Princess\"",
-				"echo -n 'The Young Descendant of Tepes & Septette for the Dead Princess'",
-				"/bin/sh -c echo Hello World", "/bin/sh -c echo 'Hello World'",
-				"echo 'Night of Nights'", "true && echo 'Night of Nights'" };
+        String[] commands = new String[] { "true",
+                "echo \"The Young Descendant of Tepes & Septette for the Dead Princess\"",
+                "echo -n 'The Young Descendant of Tepes & Septette for the Dead Princess'",
+                "/bin/sh -c echo Hello World", "/bin/sh -c echo 'Hello World'", "echo 'Night of Nights'",
+                "true && echo 'Night of Nights'" };
 
-		for (String command : commands) {
-			LOG.info("Running command: [{}]", command);
+        for (String command : commands) {
+            LOG.info("Running command: [{}]", command);
 
-			CreateContainerResponse container = dockerClient
-					.createContainerCmd("busybox").withCmd(commands).exec();
-			dockerClient.startContainerCmd(container.getId());
-			
-			int exitcode = dockerClient.waitContainerCmd(container.getId()).exec();
-			assertThat(exitcode, equalTo(0));
-		}
-	}
+            CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd(commands).exec();
+            dockerClient.startContainerCmd(container.getId());
 
+            int exitcode = dockerClient.waitContainerCmd(container.getId()).exec();
+            assertThat(exitcode, equalTo(0));
+        }
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java b/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
index 5212fe50d..8c93df20a 100644
--- a/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
+++ b/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
@@ -18,42 +18,43 @@
 
 public class CompressArchiveUtilTest {
 
-  @Test
-  public void testExecutableFlagIsPreserved() throws Exception {
-    File executableFile = createExecutableFile();
-    File archive = CompressArchiveUtil.archiveTARFiles(executableFile.getParentFile(), asList(executableFile), "archive");
-    File expectedFile = extractFileByName(archive, "executableFile.sh.result");
-
-    assertThat("should be executable", expectedFile.canExecute());
-  }
-
-  private File createExecutableFile() throws IOException {
-    File baseDir = new File(FileUtils.getTempDirectoryPath());
-    File executableFile = new File(baseDir, "executableFile.sh");
-    executableFile.createNewFile();
-    executableFile.setExecutable(true);
-    assertThat(executableFile.canExecute(), is(true));
-    return executableFile;
-  }
-
-  private File extractFileByName(File archive, String filenameToExtract) throws IOException {
-    File baseDir = new File(FileUtils.getTempDirectoryPath());
-    File expectedFile = new File(baseDir, filenameToExtract);
-    expectedFile.delete();
-    assertThat(expectedFile.exists(), is(false));
-
-    TarArchiveInputStream tarArchiveInputStream = new TarArchiveInputStream(new FileInputStream(archive));
-    TarArchiveEntry entry;
-    while ((entry = tarArchiveInputStream.getNextTarEntry()) != null) {
-      String individualFiles = entry.getName();
-      // there should be only one file in this archive
-      assertThat(individualFiles, equalTo("executableFile.sh"));
-      IOUtils.copy(tarArchiveInputStream, new FileOutputStream(expectedFile));
-      if ((entry.getMode() & 0755) == 0755) {
-        expectedFile.setExecutable(true);
-      }
+    @Test
+    public void testExecutableFlagIsPreserved() throws Exception {
+        File executableFile = createExecutableFile();
+        File archive = CompressArchiveUtil.archiveTARFiles(executableFile.getParentFile(), asList(executableFile),
+                "archive");
+        File expectedFile = extractFileByName(archive, "executableFile.sh.result");
+
+        assertThat("should be executable", expectedFile.canExecute());
+    }
+
+    private File createExecutableFile() throws IOException {
+        File baseDir = new File(FileUtils.getTempDirectoryPath());
+        File executableFile = new File(baseDir, "executableFile.sh");
+        executableFile.createNewFile();
+        executableFile.setExecutable(true);
+        assertThat(executableFile.canExecute(), is(true));
+        return executableFile;
+    }
+
+    private File extractFileByName(File archive, String filenameToExtract) throws IOException {
+        File baseDir = new File(FileUtils.getTempDirectoryPath());
+        File expectedFile = new File(baseDir, filenameToExtract);
+        expectedFile.delete();
+        assertThat(expectedFile.exists(), is(false));
+
+        TarArchiveInputStream tarArchiveInputStream = new TarArchiveInputStream(new FileInputStream(archive));
+        TarArchiveEntry entry;
+        while ((entry = tarArchiveInputStream.getNextTarEntry()) != null) {
+            String individualFiles = entry.getName();
+            // there should be only one file in this archive
+            assertThat(individualFiles, equalTo("executableFile.sh"));
+            IOUtils.copy(tarArchiveInputStream, new FileOutputStream(expectedFile));
+            if ((entry.getMode() & 0755) == 0755) {
+                expectedFile.setExecutable(true);
+            }
+        }
+        tarArchiveInputStream.close();
+        return expectedFile;
     }
-    tarArchiveInputStream.close();
-    return expectedFile;
-  }
 }
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
index 64ab912d0..634d0e9a5 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
@@ -16,12 +16,14 @@ public class DockerClientConfigTest {
     public static final DockerClientConfig EXAMPLE_CONFIG = newExampleConfig();
 
     private static DockerClientConfig newExampleConfig() {
-        return new DockerClientConfig(URI.create("http://foo"), "bar", "baz", "qux", "blam", "wham", "flam", 877, false, false, new LocalDirectorySSLConfig("flim"), 20, 2);
+        return new DockerClientConfig(URI.create("http://foo"), "bar", "baz", "qux", "blam", "wham", "flam", 877,
+                false, false, new LocalDirectorySSLConfig("flim"), 20, 2);
     }
 
     @Test
     public void string() throws Exception {
-        assertEquals("DockerClientConfig{uri=http://foo, version='bar', username='baz', password='qux', email='blam', serverAddress='wham', dockerCfgPath='flam', sslConfig='LocalDirectorySSLConfig{dockerCertPath=flim}', readTimeout=877, loggingFilterEnabled=false, followRedirectsFilterEnabled=false}",
+        assertEquals(
+                "DockerClientConfig{uri=http://foo, version='bar', username='baz', password='qux', email='blam', serverAddress='wham', dockerCfgPath='flam', sslConfig='LocalDirectorySSLConfig{dockerCertPath=flim}', readTimeout=877, loggingFilterEnabled=false, followRedirectsFilterEnabled=false}",
                 EXAMPLE_CONFIG.toString());
     }
 
@@ -150,7 +152,7 @@ public void defaults() throws Exception {
         systemProperties.setProperty("user.home", "someHomeDir");
 
         // when you build config
-        DockerClientConfig config = buildConfig(Collections.<String, String>emptyMap(), systemProperties);
+        DockerClientConfig config = buildConfig(Collections.<String, String> emptyMap(), systemProperties);
 
         // then the cert path is as expected
         assertEquals(config.getUri(), URI.create("https://localhost:2376"));
@@ -159,7 +161,7 @@ public void defaults() throws Exception {
         assertEquals(config.getVersion(), null);
         assertEquals(config.isLoggingFilterEnabled(), true);
         assertEquals(config.getDockerCfgPath(), "someHomeDir/.dockercfg");
-        assertEquals( ((LocalDirectorySSLConfig)config.getSslConfig()).getDockerCertPath(), "someHomeDir/.docker");
+        assertEquals(((LocalDirectorySSLConfig) config.getSslConfig()).getDockerCertPath(), "someHomeDir/.docker");
     }
 
     @Test
@@ -179,7 +181,7 @@ public void systemProperties() throws Exception {
         systemProperties.setProperty("docker.io.enableLoggingFilter", "false");
 
         // when you build new config
-        DockerClientConfig config = buildConfig(Collections.<String, String>emptyMap(), systemProperties);
+        DockerClientConfig config = buildConfig(Collections.<String, String> emptyMap(), systemProperties);
 
         // then it is the same as the example
         assertEquals(config, EXAMPLE_CONFIG);
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
index 2a961e3b8..eac3bb725 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
@@ -10,7 +10,8 @@ public class DockerClientImplTest {
     @Test
     public void configuredInstanceAuthConfig() throws Exception {
         // given a config with null serverAddress
-        DockerClientConfig dockerClientConfig = new DockerClientConfig(null, null, "", "", "", null, null,  0, false, false, null, 20, 2);
+        DockerClientConfig dockerClientConfig = new DockerClientConfig(null, null, "", "", "", null, null, 0, false,
+                false, null, 20, 2);
         DockerClientImpl dockerClient = DockerClientImpl.getInstance(dockerClientConfig);
 
         // when we get the auth config
diff --git a/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java b/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
index 215926a56..cf5b03188 100644
--- a/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
+++ b/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
@@ -40,8 +40,7 @@ public void testMatch(MatchTestCase testCase) throws IOException {
 
     @DataProvider
     public Object[][] getTestData() {
-        return new Object[][] {
-                new Object[] { new MatchTestCase("abc", "abc", true, false) },
+        return new Object[][] { new Object[] { new MatchTestCase("abc", "abc", true, false) },
                 new Object[] { new MatchTestCase("*", "abc", true, false) },
                 new Object[] { new MatchTestCase("*c", "abc", true, false) },
                 new Object[] { new MatchTestCase("a*", "a", true, false) },
@@ -99,8 +98,11 @@ public Object[][] getTestData() {
 
     private final class MatchTestCase {
         private final String pattern;
+
         private final String s;
+
         private final boolean matches;
+
         private final boolean expectException;
 
         public MatchTestCase(String pattern, String s, boolean matches, boolean expectException) {
@@ -113,8 +115,8 @@ public MatchTestCase(String pattern, String s, boolean matches, boolean expectEx
 
         @Override
         public String toString() {
-            return "MatchTestCase [pattern=" + pattern + ", s=" + s + ", matches=" + matches
-                    + ", expectException=" + expectException + "]";
+            return "MatchTestCase [pattern=" + pattern + ", s=" + s + ", matches=" + matches + ", expectException="
+                    + expectException + "]";
         }
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index fb764474f..380f5dd9f 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -11,188 +11,184 @@
 import com.github.dockerjava.jaxrs.BuildImageCmdExec;
 
 /**
- * Special {@link DockerCmdExecFactory} implementation that collects container
- * and image creations while test execution for the purpose of automatically
- * cleanup.
+ * Special {@link DockerCmdExecFactory} implementation that collects container and image creations while test execution
+ * for the purpose of automatically cleanup.
  * 
  * @author marcus
  * 
  */
 public class TestDockerCmdExecFactory implements DockerCmdExecFactory {
 
-	private List<String> containerNames = new ArrayList<String>();
-
-	private List<String> imageNames = new ArrayList<String>();
-
-	private DockerCmdExecFactory delegate;
-
-	public TestDockerCmdExecFactory(DockerCmdExecFactory delegate) {
-		this.delegate = delegate;
-	}
-
-	@Override
-	public void init(DockerClientConfig dockerClientConfig) {
-		delegate.init(dockerClientConfig);
-	}
-
-	@Override
-	public void close() throws IOException {
-		delegate.close();
-	}
-
-	@Override
-	public CreateContainerCmd.Exec createCreateContainerCmdExec() {
-		return new CreateContainerCmd.Exec() {
-			@Override
-			public CreateContainerResponse exec(CreateContainerCmd command) {
-				CreateContainerResponse createContainerResponse = delegate
-						.createCreateContainerCmdExec().exec(command);
-				containerNames.add(createContainerResponse.getId());
-				return createContainerResponse;
-			}
-		};
-	}
-
-	@Override
-	public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
-		return new RemoveContainerCmd.Exec() {
-			@Override
-			public Void exec(RemoveContainerCmd command) {
-				delegate.createRemoveContainerCmdExec().exec(command);
-				containerNames.remove(command.getContainerId());
-				return null;
-			}
-		};
-	}
-
-	@Override
-	public CreateImageCmd.Exec createCreateImageCmdExec() {
-		return new CreateImageCmd.Exec() {
-			@Override
-			public CreateImageResponse exec(CreateImageCmd command) {
-				CreateImageResponse createImageResponse = delegate
-						.createCreateImageCmdExec().exec(command);
-				imageNames.add(createImageResponse.getId());
-				return createImageResponse;
-			}
-		};
-	}
-
-	@Override
-	public RemoveImageCmd.Exec createRemoveImageCmdExec() {
-		return new RemoveImageCmd.Exec() {
-			@Override
-			public Void exec(RemoveImageCmd command) {
-				delegate.createRemoveImageCmdExec().exec(command);
-				imageNames.remove(command.getImageId());
-				return null;
-			}
-		};
-	}
-
-	@Override
-	public BuildImageCmd.Exec createBuildImageCmdExec() {
-		return new BuildImageCmd.Exec() {
-			@Override
-			public BuildImageCmd.Response exec(BuildImageCmd command) {
-				// can't detect image id here so tagging it
-				String tag = command.getTag();
-				if (tag == null || "".equals(tag.trim())) {
-					tag = "" + new SecureRandom().nextInt(Integer.MAX_VALUE);
-					command.withTag(tag);
-				}
-				InputStream inputStream = delegate.createBuildImageCmdExec()
-						.exec(command);
-				imageNames.add(tag);
-				return new BuildImageCmdExec.ResponseImpl(inputStream);
-			}
-		};
-	}
-
-	@Override
-	public Exec createAuthCmdExec() {
-		return delegate.createAuthCmdExec();
-	}
-
-	@Override
-	public InfoCmd.Exec createInfoCmdExec() {
-		return delegate.createInfoCmdExec();
-	}
-
-	@Override
-	public PingCmd.Exec createPingCmdExec() {
-		return delegate.createPingCmdExec();
-	}
-
-	@Override
-	public ExecCreateCmd.Exec createExecCmdExec() {
-		return delegate.createExecCmdExec();
-	}
-
-	@Override
-	public VersionCmd.Exec createVersionCmdExec() {
-		return delegate.createVersionCmdExec();
-	}
-
-	@Override
-	public PullImageCmd.Exec createPullImageCmdExec() {
-		return delegate.createPullImageCmdExec();
-	}
-
-	@Override
-	public PushImageCmd.Exec createPushImageCmdExec() {
-		return delegate.createPushImageCmdExec();
-	}
-
-	@Override
-	public SaveImageCmd.Exec createSaveImageCmdExec() {
-		return delegate.createSaveImageCmdExec();
-	}
-
-	@Override
-	public SearchImagesCmd.Exec createSearchImagesCmdExec() {
-		return delegate.createSearchImagesCmdExec();
-	}
-
-	@Override
-	public ListImagesCmd.Exec createListImagesCmdExec() {
-		return delegate.createListImagesCmdExec();
-	}
-
-	@Override
-	public InspectImageCmd.Exec createInspectImageCmdExec() {
-		return delegate.createInspectImageCmdExec();
-	}
-
-	@Override
-	public ListContainersCmd.Exec createListContainersCmdExec() {
-		return delegate.createListContainersCmdExec();
-	}
-
-	@Override
-	public StartContainerCmd.Exec createStartContainerCmdExec() {
-		return delegate.createStartContainerCmdExec();
-	}
-
-	@Override
-	public InspectContainerCmd.Exec createInspectContainerCmdExec() {
-		return delegate.createInspectContainerCmdExec();
-	}
-
-	@Override
-	public WaitContainerCmd.Exec createWaitContainerCmdExec() {
-		return delegate.createWaitContainerCmdExec();
-	}
-
-	@Override
-	public AttachContainerCmd.Exec createAttachContainerCmdExec() {
-		return delegate.createAttachContainerCmdExec();
-	}
-
-	@Override
-	public ExecStartCmd.Exec createExecStartCmdExec() {
-		return delegate.createExecStartCmdExec();
-	}
+    private List<String> containerNames = new ArrayList<String>();
+
+    private List<String> imageNames = new ArrayList<String>();
+
+    private DockerCmdExecFactory delegate;
+
+    public TestDockerCmdExecFactory(DockerCmdExecFactory delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public void init(DockerClientConfig dockerClientConfig) {
+        delegate.init(dockerClientConfig);
+    }
+
+    @Override
+    public void close() throws IOException {
+        delegate.close();
+    }
+
+    @Override
+    public CreateContainerCmd.Exec createCreateContainerCmdExec() {
+        return new CreateContainerCmd.Exec() {
+            @Override
+            public CreateContainerResponse exec(CreateContainerCmd command) {
+                CreateContainerResponse createContainerResponse = delegate.createCreateContainerCmdExec().exec(command);
+                containerNames.add(createContainerResponse.getId());
+                return createContainerResponse;
+            }
+        };
+    }
+
+    @Override
+    public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
+        return new RemoveContainerCmd.Exec() {
+            @Override
+            public Void exec(RemoveContainerCmd command) {
+                delegate.createRemoveContainerCmdExec().exec(command);
+                containerNames.remove(command.getContainerId());
+                return null;
+            }
+        };
+    }
+
+    @Override
+    public CreateImageCmd.Exec createCreateImageCmdExec() {
+        return new CreateImageCmd.Exec() {
+            @Override
+            public CreateImageResponse exec(CreateImageCmd command) {
+                CreateImageResponse createImageResponse = delegate.createCreateImageCmdExec().exec(command);
+                imageNames.add(createImageResponse.getId());
+                return createImageResponse;
+            }
+        };
+    }
+
+    @Override
+    public RemoveImageCmd.Exec createRemoveImageCmdExec() {
+        return new RemoveImageCmd.Exec() {
+            @Override
+            public Void exec(RemoveImageCmd command) {
+                delegate.createRemoveImageCmdExec().exec(command);
+                imageNames.remove(command.getImageId());
+                return null;
+            }
+        };
+    }
+
+    @Override
+    public BuildImageCmd.Exec createBuildImageCmdExec() {
+        return new BuildImageCmd.Exec() {
+            @Override
+            public BuildImageCmd.Response exec(BuildImageCmd command) {
+                // can't detect image id here so tagging it
+                String tag = command.getTag();
+                if (tag == null || "".equals(tag.trim())) {
+                    tag = "" + new SecureRandom().nextInt(Integer.MAX_VALUE);
+                    command.withTag(tag);
+                }
+                InputStream inputStream = delegate.createBuildImageCmdExec().exec(command);
+                imageNames.add(tag);
+                return new BuildImageCmdExec.ResponseImpl(inputStream);
+            }
+        };
+    }
+
+    @Override
+    public Exec createAuthCmdExec() {
+        return delegate.createAuthCmdExec();
+    }
+
+    @Override
+    public InfoCmd.Exec createInfoCmdExec() {
+        return delegate.createInfoCmdExec();
+    }
+
+    @Override
+    public PingCmd.Exec createPingCmdExec() {
+        return delegate.createPingCmdExec();
+    }
+
+    @Override
+    public ExecCreateCmd.Exec createExecCmdExec() {
+        return delegate.createExecCmdExec();
+    }
+
+    @Override
+    public VersionCmd.Exec createVersionCmdExec() {
+        return delegate.createVersionCmdExec();
+    }
+
+    @Override
+    public PullImageCmd.Exec createPullImageCmdExec() {
+        return delegate.createPullImageCmdExec();
+    }
+
+    @Override
+    public PushImageCmd.Exec createPushImageCmdExec() {
+        return delegate.createPushImageCmdExec();
+    }
+
+    @Override
+    public SaveImageCmd.Exec createSaveImageCmdExec() {
+        return delegate.createSaveImageCmdExec();
+    }
+
+    @Override
+    public SearchImagesCmd.Exec createSearchImagesCmdExec() {
+        return delegate.createSearchImagesCmdExec();
+    }
+
+    @Override
+    public ListImagesCmd.Exec createListImagesCmdExec() {
+        return delegate.createListImagesCmdExec();
+    }
+
+    @Override
+    public InspectImageCmd.Exec createInspectImageCmdExec() {
+        return delegate.createInspectImageCmdExec();
+    }
+
+    @Override
+    public ListContainersCmd.Exec createListContainersCmdExec() {
+        return delegate.createListContainersCmdExec();
+    }
+
+    @Override
+    public StartContainerCmd.Exec createStartContainerCmdExec() {
+        return delegate.createStartContainerCmdExec();
+    }
+
+    @Override
+    public InspectContainerCmd.Exec createInspectContainerCmdExec() {
+        return delegate.createInspectContainerCmdExec();
+    }
+
+    @Override
+    public WaitContainerCmd.Exec createWaitContainerCmdExec() {
+        return delegate.createWaitContainerCmdExec();
+    }
+
+    @Override
+    public AttachContainerCmd.Exec createAttachContainerCmdExec() {
+        return delegate.createAttachContainerCmdExec();
+    }
+
+    @Override
+    public ExecStartCmd.Exec createExecStartCmdExec() {
+        return delegate.createExecStartCmdExec();
+    }
 
     @Override
     public InspectExecCmd.Exec createInspectExecCmdExec() {
@@ -200,76 +196,76 @@ public InspectExecCmd.Exec createInspectExecCmdExec() {
     }
 
     @Override
-	public LogContainerCmd.Exec createLogContainerCmdExec() {
-		return delegate.createLogContainerCmdExec();
-	}
-
-	@Override
-	public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
-		return delegate.createCopyFileFromContainerCmdExec();
-	}
-
-	@Override
-	public StopContainerCmd.Exec createStopContainerCmdExec() {
-		return delegate.createStopContainerCmdExec();
-	}
-
-	@Override
-	public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
-		return delegate.createContainerDiffCmdExec();
-	}
-
-	@Override
-	public KillContainerCmd.Exec createKillContainerCmdExec() {
-		return delegate.createKillContainerCmdExec();
-	}
-
-	@Override
-	public RestartContainerCmd.Exec createRestartContainerCmdExec() {
-		return delegate.createRestartContainerCmdExec();
-	}
-
-	@Override
-	public CommitCmd.Exec createCommitCmdExec() {
-		return delegate.createCommitCmdExec();
-	}
-
-	@Override
-	public TopContainerCmd.Exec createTopContainerCmdExec() {
-		return delegate.createTopContainerCmdExec();
-	}
-
-	@Override
-	public TagImageCmd.Exec createTagImageCmdExec() {
-		return delegate.createTagImageCmdExec();
-	}
-
-	@Override
-	public PauseContainerCmd.Exec createPauseContainerCmdExec() {
-		return delegate.createPauseContainerCmdExec();
-	}
-
-	@Override
-	public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
-		return delegate.createUnpauseContainerCmdExec();
-	}
-
-	@Override
-	public EventsCmd.Exec createEventsCmdExec() {
-		return delegate.createEventsCmdExec();
-	}
-	
-	@Override
+    public LogContainerCmd.Exec createLogContainerCmdExec() {
+        return delegate.createLogContainerCmdExec();
+    }
+
+    @Override
+    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
+        return delegate.createCopyFileFromContainerCmdExec();
+    }
+
+    @Override
+    public StopContainerCmd.Exec createStopContainerCmdExec() {
+        return delegate.createStopContainerCmdExec();
+    }
+
+    @Override
+    public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
+        return delegate.createContainerDiffCmdExec();
+    }
+
+    @Override
+    public KillContainerCmd.Exec createKillContainerCmdExec() {
+        return delegate.createKillContainerCmdExec();
+    }
+
+    @Override
+    public RestartContainerCmd.Exec createRestartContainerCmdExec() {
+        return delegate.createRestartContainerCmdExec();
+    }
+
+    @Override
+    public CommitCmd.Exec createCommitCmdExec() {
+        return delegate.createCommitCmdExec();
+    }
+
+    @Override
+    public TopContainerCmd.Exec createTopContainerCmdExec() {
+        return delegate.createTopContainerCmdExec();
+    }
+
+    @Override
+    public TagImageCmd.Exec createTagImageCmdExec() {
+        return delegate.createTagImageCmdExec();
+    }
+
+    @Override
+    public PauseContainerCmd.Exec createPauseContainerCmdExec() {
+        return delegate.createPauseContainerCmdExec();
+    }
+
+    @Override
+    public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
+        return delegate.createUnpauseContainerCmdExec();
+    }
+
+    @Override
+    public EventsCmd.Exec createEventsCmdExec() {
+        return delegate.createEventsCmdExec();
+    }
+
+    @Override
     public StatsCmd.Exec createStatsCmdExec() {
-	    return delegate.createStatsCmdExec();
-	}
+        return delegate.createStatsCmdExec();
+    }
 
-	public List<String> getContainerNames() {
-		return new ArrayList<String>(containerNames);
-	}
+    public List<String> getContainerNames() {
+        return new ArrayList<String>(containerNames);
+    }
 
-	public List<String> getImageNames() {
-		return new ArrayList<String>(imageNames);
-	}
+    public List<String> getImageNames() {
+        return new ArrayList<String>(imageNames);
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
index c4147f1a5..3a1c70c8f 100644
--- a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
@@ -81,7 +81,6 @@ public void onNext(Frame frame) {
         assertThat(collectFramesCallback.toString(), endsWith(snippet));
     }
 
-
     @Test
     public void attachContainerWithTTY() throws Exception {
 
@@ -93,11 +92,9 @@ public void attachContainerWithTTY() throws Exception {
         String fullLog = asString(response);
         assertThat(fullLog, containsString("Successfully built"));
 
-        String imageId = StringUtils.substringBetween(fullLog,
-                "Successfully built ", "\\n\"}").trim();
+        String imageId = StringUtils.substringBetween(fullLog, "Successfully built ", "\\n\"}").trim();
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(imageId)
-                .withTty(true).exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd(imageId).withTty(true).exec();
 
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
@@ -121,7 +118,6 @@ public void onNext(Frame frame) {
 
         System.out.println("log: " + collectFramesCallback.toString());
 
-
         HexDump.dump(collectFramesCallback.toString().getBytes(), 0, System.out, 0);
 
         assertThat(collectFramesCallback.toString(), containsString("stdout\r\nstderr"));
diff --git a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
index 950111497..3c60cada2 100644
--- a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
@@ -13,41 +13,41 @@
 @Test(groups = "integration")
 public class AuthCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException  {
-		super.beforeTest();
-	}
-	
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-
-	@Test
-	public void testAuth() throws Exception {
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void testAuth() throws Exception {
         AuthResponse response = dockerClient.authCmd().exec();
 
         assertEquals(response.getStatus(), "Login Succeeded");
     }
 
-	@Test
-	public void testAuthInvalid() throws Exception {
+    @Test
+    public void testAuthInvalid() throws Exception {
 
         try {
-			DockerClientBuilder.getInstance(config("garbage")).build().authCmd().exec();
+            DockerClientBuilder.getInstance(config("garbage")).build().authCmd().exec();
             fail("Expected a UnauthorizedException caused by a bad password.");
-		} catch (UnauthorizedException e) {
-			assertEquals(e.getMessage(), "Wrong login/password, please try again\n");
-		} 
-	}
+        } catch (UnauthorizedException e) {
+            assertEquals(e.getMessage(), "Wrong login/password, please try again\n");
+        }
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index a94209fea..f90250ea3 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -39,48 +39,43 @@
 @Test(groups = "integration")
 public class BuildImageCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
 
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
 
-	@Test
-	public void testNginxDockerfileBuilder() {
-		File baseDir = new File(Thread.currentThread().getContextClassLoader()
-				.getResource("nginx").getFile());
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
 
-		InputStream response = dockerClient.buildImageCmd(baseDir).withNoCache().exec();
+    @Test
+    public void testNginxDockerfileBuilder() {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("nginx").getFile());
 
-		String fullLog = asString(response);
-		assertThat(fullLog, containsString("Successfully built"));
+        InputStream response = dockerClient.buildImageCmd(baseDir).withNoCache().exec();
 
-		String imageId = StringUtils.substringBetween(fullLog,
-				"Successfully built ", "\\n\"}").trim();
+        String fullLog = asString(response);
+        assertThat(fullLog, containsString("Successfully built"));
 
-		InspectImageResponse inspectImageResponse = dockerClient
-				.inspectImageCmd(imageId).exec();
-		assertThat(inspectImageResponse, not(nullValue()));
-		LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+        String imageId = StringUtils.substringBetween(fullLog, "Successfully built ", "\\n\"}").trim();
 
-		assertThat(inspectImageResponse.getAuthor(),
-				equalTo("Guillaume J. Charmes \"guillaume@dotcloud.com\""));
-	}
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        assertThat(inspectImageResponse, not(nullValue()));
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
 
+        assertThat(inspectImageResponse.getAuthor(), equalTo("Guillaume J. Charmes \"guillaume@dotcloud.com\""));
+    }
 
     @Test(groups = "ignoreInCircleCi")
     public void testNonstandard1() {
@@ -95,16 +90,12 @@ public void testNonstandard1() {
 
     @Test(groups = "ignoreInCircleCi")
     public void testNonstandard2() {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader()
-                .getResource("nonstandard").getFile());
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("nonstandard").getFile());
         File dockerFile = new File(Thread.currentThread().getContextClassLoader()
                 .getResource("nonstandard/subdirectory/Dockerfile-nonstandard").getFile());
 
-
-            InputStream response = dockerClient.buildImageCmd()
-                    .withBaseDirectory(baseDir)
-                    .withDockerfile(dockerFile)
-                    .withNoCache().exec();
+        InputStream response = dockerClient.buildImageCmd().withBaseDirectory(baseDir).withDockerfile(dockerFile)
+                .withNoCache().exec();
 
         String fullLog = asString(response);
         assertThat(fullLog, containsString("Successfully built"));
@@ -120,45 +111,42 @@ public void testDockerBuilderFromTar() throws Exception {
     }
 
     @Test
-	public void testDockerBuilderAddUrl() throws Exception {
-		File baseDir = new File(Thread.currentThread().getContextClassLoader()
-				.getResource("testAddUrl").getFile());
-		String response = dockerfileBuild(baseDir);
-		assertThat(response, containsString("Docker"));
-	}
-
-	@Test
-	public void testDockerBuilderAddFileInSubfolder() throws Exception {
-		File baseDir = new File(Thread.currentThread().getContextClassLoader()
-				.getResource("testAddFileInSubfolder").getFile());
-		String response = dockerfileBuild(baseDir);
-		assertThat(response, containsString("Successfully executed testrun.sh"));
-	}
-
-	@Test
-	public void testDockerBuilderAddFilesViaWildcard() throws Exception {
-		File baseDir = new File(Thread.currentThread().getContextClassLoader()
-				.getResource("testAddFilesViaWildcard").getFile());
-		String response = dockerfileBuild(baseDir);
-		assertThat(response, containsString("Successfully executed testinclude1.sh"));
-		assertThat(response, not(containsString("Successfully executed testinclude2.sh")));
-	}
-
-	@Test
-	public void testDockerBuilderAddFolder() throws Exception {
-		File baseDir = new File(Thread.currentThread().getContextClassLoader()
-				.getResource("testAddFolder").getFile());
-		String response = dockerfileBuild(baseDir);
-		assertThat(response, containsString("Successfully executed testAddFolder.sh"));
-	}
-
-	@Test
-	public void testDockerBuilderEnv() throws Exception {
-		File baseDir = new File(Thread.currentThread().getContextClassLoader()
-				.getResource("testEnv").getFile());
-		String response = dockerfileBuild(baseDir);
-		assertThat(response, containsString("Successfully executed testrun.sh"));
-	}
+    public void testDockerBuilderAddUrl() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddUrl").getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("Docker"));
+    }
+
+    @Test
+    public void testDockerBuilderAddFileInSubfolder() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddFileInSubfolder")
+                .getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("Successfully executed testrun.sh"));
+    }
+
+    @Test
+    public void testDockerBuilderAddFilesViaWildcard() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddFilesViaWildcard")
+                .getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("Successfully executed testinclude1.sh"));
+        assertThat(response, not(containsString("Successfully executed testinclude2.sh")));
+    }
+
+    @Test
+    public void testDockerBuilderAddFolder() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddFolder").getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("Successfully executed testAddFolder.sh"));
+    }
+
+    @Test
+    public void testDockerBuilderEnv() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testEnv").getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("Successfully executed testrun.sh"));
+    }
 
     private String dockerfileBuild(InputStream tarInputStream) throws Exception {
         return execBuild(dockerClient.buildImageCmd().withTarInputStream(tarInputStream));
@@ -166,7 +154,7 @@ private String dockerfileBuild(InputStream tarInputStream) throws Exception {
 
     private String dockerfileBuild(File baseDir) throws Exception {
         return execBuild(dockerClient.buildImageCmd(baseDir));
-	}
+    }
 
     private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
         // Build image
@@ -190,83 +178,74 @@ private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
 
     }
 
+    @Test(expectedExceptions = { DockerClientException.class })
+    public void testDockerfileIgnored() {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerfileIgnored")
+                .getFile());
+        dockerClient.buildImageCmd(baseDir).withNoCache().exec();
+    }
+
+    @Test(expectedExceptions = { DockerClientException.class })
+    public void testInvalidDockerIgnorePattern() {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader()
+                .getResource("testInvalidDockerignorePattern").getFile());
+        dockerClient.buildImageCmd(baseDir).withNoCache().exec();
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void testDockerIgnore() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerignore")
+                .getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("/tmp/a/a /tmp/a/c /tmp/a/d"));
+    }
+
+    @Test
+    public void testNetCatDockerfileBuilder() throws InterruptedException, IOException {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("netcat").getFile());
+
+        Iterable<EventStreamItem> response = dockerClient.buildImageCmd(baseDir).withNoCache().exec().getItems();
 
+        String imageId = null;
 
-	@Test(expectedExceptions={DockerClientException.class})
-	public void testDockerfileIgnored() {
-		File baseDir = new File(Thread.currentThread().getContextClassLoader()
-				.getResource("testDockerfileIgnored").getFile());
-		dockerClient.buildImageCmd(baseDir).withNoCache().exec();
-	}
-
-	@Test(expectedExceptions={DockerClientException.class})
-		public void testInvalidDockerIgnorePattern() {
-			File baseDir = new File(Thread.currentThread().getContextClassLoader()
-					.getResource("testInvalidDockerignorePattern").getFile());
-			dockerClient.buildImageCmd(baseDir).withNoCache().exec();
-		}
-
-	@Test(groups = "ignoreInCircleCi")
-	public void testDockerIgnore() throws Exception {
-		File baseDir = new File(Thread.currentThread().getContextClassLoader()
-				.getResource("testDockerignore").getFile());
-		String response = dockerfileBuild(baseDir);
-		assertThat(response, containsString("/tmp/a/a /tmp/a/c /tmp/a/d"));
-	}
-
-	@Test
-	public void testNetCatDockerfileBuilder() throws InterruptedException, IOException {
-		File baseDir = new File(Thread.currentThread().getContextClassLoader()
-				.getResource("netcat").getFile());
-
-		Iterable<EventStreamItem> response = dockerClient.buildImageCmd(baseDir).withNoCache().exec().getItems();
-
-                String imageId = null;
-
-		for(EventStreamItem item : response) {
-                  String text = item.getStream();
-                  if( text.startsWith("Successfully built ")) {
-                    imageId = StringUtils.substringBetween(text,
-				"Successfully built ", "\n").trim();
-                  }
-                }
-
-		assertNotNull(imageId, "Not successful in build");
-
-
-		InspectImageResponse inspectImageResponse = dockerClient
-				.inspectImageCmd(imageId).exec();
-		assertThat(inspectImageResponse, not(nullValue()));
-		assertThat(inspectImageResponse.getId(), not(nullValue()));
-		LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-
-		CreateContainerResponse container = dockerClient.createContainerCmd(
-				inspectImageResponse.getId()).exec();
-		assertThat(container.getId(), not(isEmptyString()));
-		dockerClient.startContainerCmd(container.getId()).exec();
-
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
-
-		assertThat(inspectContainerResponse.getId(), notNullValue());
-		assertThat(inspectContainerResponse.getNetworkSettings().getPorts(),
-				notNullValue());
-
-		// No use as such if not running on the server
-//		for (Ports.Port p : inspectContainerResponse.getNetworkSettings().getPorts().getAllPorts()) {
-//			int port = Integer.valueOf(p.getHostPort());
-//			LOG.info("Checking port {} is open", port);
-//			assertThat(available(port), is(false));
-//		}
-		dockerClient.stopContainerCmd(container.getId()).withTimeout(0).exec();
-
-	}
-
-	@Test
-	public void testAddAndCopySubstitution () throws Exception {
-			File baseDir = new File(Thread.currentThread().getContextClassLoader()
-					.getResource("testENVSubstitution").getFile());
-			String response = dockerfileBuild(baseDir);
-			assertThat(response, containsString("testENVSubstitution successfully completed"));
-	}
+        for (EventStreamItem item : response) {
+            String text = item.getStream();
+            if (text.startsWith("Successfully built ")) {
+                imageId = StringUtils.substringBetween(text, "Successfully built ", "\n").trim();
+            }
+        }
+
+        assertNotNull(imageId, "Not successful in build");
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        assertThat(inspectImageResponse, not(nullValue()));
+        assertThat(inspectImageResponse.getId(), not(nullValue()));
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+        CreateContainerResponse container = dockerClient.createContainerCmd(inspectImageResponse.getId()).exec();
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getId(), notNullValue());
+        assertThat(inspectContainerResponse.getNetworkSettings().getPorts(), notNullValue());
+
+        // No use as such if not running on the server
+        // for (Ports.Port p : inspectContainerResponse.getNetworkSettings().getPorts().getAllPorts()) {
+        // int port = Integer.valueOf(p.getHostPort());
+        // LOG.info("Checking port {} is open", port);
+        // assertThat(available(port), is(false));
+        // }
+        dockerClient.stopContainerCmd(container.getId()).withTimeout(0).exec();
+
+    }
+
+    @Test
+    public void testAddAndCopySubstitution() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testENVSubstitution")
+                .getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("testENVSubstitution successfully completed"));
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
index ea5f6128d..415ca8f0b 100644
--- a/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
@@ -25,63 +25,56 @@
 @Test(groups = "integration")
 public class CommitCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-
-	@Test
-	public void commit() throws DockerException {
-
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("touch", "/test").exec();
-		
-		LOG.info("Created container: {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
-		dockerClient.startContainerCmd(container.getId()).exec();
-
-		LOG.info("Commiting container: {}", container.toString());
-		String imageId = dockerClient
-				.commitCmd(container.getId()).exec();
-
-		InspectImageResponse inspectImageResponse = dockerClient
-				.inspectImageCmd(imageId).exec();
-		LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-
-		assertThat(inspectImageResponse,
-				hasField("container", startsWith(container.getId())));
-		assertThat(inspectImageResponse.getContainerConfig().getImage(),
-				equalTo("busybox"));
-
-		InspectImageResponse busyboxImg = dockerClient.inspectImageCmd("busybox").exec();
-
-		assertThat(inspectImageResponse.getParent(),
-				equalTo(busyboxImg.getId()));
-	}
-	
-	
-	@Test
-	public void commitNonExistingContainer() throws DockerException {
-		try {
-			dockerClient.commitCmd("non-existent").exec();
-			fail("expected NotFoundException");
-		} catch (NotFoundException e) {
-		}
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void commit() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("touch", "/test").exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        LOG.info("Commiting container: {}", container.toString());
+        String imageId = dockerClient.commitCmd(container.getId()).exec();
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+        assertThat(inspectImageResponse, hasField("container", startsWith(container.getId())));
+        assertThat(inspectImageResponse.getContainerConfig().getImage(), equalTo("busybox"));
+
+        InspectImageResponse busyboxImg = dockerClient.inspectImageCmd("busybox").exec();
+
+        assertThat(inspectImageResponse.getParent(), equalTo(busyboxImg.getId()));
+    }
+
+    @Test
+    public void commitNonExistingContainer() throws DockerException {
+        try {
+            dockerClient.commitCmd("non-existent").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
index 58c95486c..e94c8c6c2 100644
--- a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
@@ -26,56 +26,53 @@
 @Test(groups = "integration")
 public class ContainerDiffCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-
-	@Test(groups = "ignoreInCircleCi")
-	public void testContainerDiff() throws DockerException {
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("touch", "/test" ).exec();
-		LOG.info("Created container: {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
-		dockerClient.startContainerCmd(container.getId()).exec();
-		
-		int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
-		assertThat(exitCode, equalTo(0));
-
-		List<ChangeLog> filesystemDiff = dockerClient.containerDiffCmd(container.getId()).exec();
-		LOG.info("Container DIFF: {}", filesystemDiff.toString());
-
-		assertThat(filesystemDiff.size(), equalTo(1));
-		ChangeLog testChangeLog = selectUnique(filesystemDiff,
-				hasField("path", equalTo("/test")));
-
-		assertThat(testChangeLog, hasField("path", equalTo("/test")));
-		assertThat(testChangeLog, hasField("kind", equalTo(1)));
-	}
-	
-	@Test
-	public void testContainerDiffWithNonExistingContainer() throws DockerException {
-		try {
-			dockerClient.containerDiffCmd("non-existing").exec();
-			fail("expected NotFoundException");
-		} catch (NotFoundException e) {
-		}
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void testContainerDiff() throws DockerException {
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("touch", "/test").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
+        assertThat(exitCode, equalTo(0));
+
+        List<ChangeLog> filesystemDiff = dockerClient.containerDiffCmd(container.getId()).exec();
+        LOG.info("Container DIFF: {}", filesystemDiff.toString());
+
+        assertThat(filesystemDiff.size(), equalTo(1));
+        ChangeLog testChangeLog = selectUnique(filesystemDiff, hasField("path", equalTo("/test")));
+
+        assertThat(testChangeLog, hasField("path", equalTo("/test")));
+        assertThat(testChangeLog, hasField("kind", equalTo(1)));
+    }
+
+    @Test
+    public void testContainerDiffWithNonExistingContainer() throws DockerException {
+        try {
+            dockerClient.containerDiffCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
index 193b787ce..72a97d04c 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
@@ -40,9 +40,7 @@ public void afterMethod(ITestResult result) {
     public void copyFromContainer() throws Exception {
         // TODO extract this into a shared method
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withName("docker-java-itest-copyFromContainer")
-                .withCmd("touch", "/copyFromContainer")
-                .exec();
+                .withName("docker-java-itest-copyFromContainer").withCmd("touch", "/copyFromContainer").exec();
 
         LOG.info("Created container: {}", container);
         assertThat(container.getId(), not(isEmptyOrNullString()));
@@ -58,7 +56,7 @@ public void copyFromContainer() throws Exception {
         assertNotNull(responseAsString);
         assertTrue(responseAsString.length() > 0);
     }
-    
+
     @Test
     public void copyFromNonExistingContainer() throws Exception {
         try {
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 94d4cff62..1b372d245 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -154,27 +154,23 @@ public void createContainerWithVolumesFrom() throws DockerException {
     }
 
     @Test
-	public void createContainerWithEnv() throws Exception {
+    public void createContainerWithEnv() throws Exception {
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withEnv("VARIABLE=success")
-				.withCmd("env").exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withEnv("VARIABLE=success")
+                .withCmd("env").exec();
 
-		LOG.info("Created container {}", container.toString());
+        LOG.info("Created container {}", container.toString());
 
-		assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(isEmptyString()));
 
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-		assertThat(
-				Arrays.asList(inspectContainerResponse.getConfig().getEnv()),
-				containsInAnyOrder("VARIABLE=success"));
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), containsInAnyOrder("VARIABLE=success"));
 
-		dockerClient.startContainerCmd(container.getId()).exec();
+        dockerClient.startContainerCmd(container.getId()).exec();
 
-		assertThat(containerLog(container.getId()), containsString("VARIABLE=success"));
-	}
+        assertThat(containerLog(container.getId()), containsString("VARIABLE=success"));
+    }
 
     @Test
     public void createContainerWithHostname() throws Exception {
@@ -192,8 +188,7 @@ public void createContainerWithHostname() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        assertThat(containerLog(container.getId()),
-                containsString("HOSTNAME=docker-java"));
+        assertThat(containerLog(container.getId()), containsString("HOSTNAME=docker-java"));
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
index 53131c611..2d6ec9522 100644
--- a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
+++ b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -22,9 +22,13 @@
 public class DockerfileFixture implements AutoCloseable {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DockerfileFixture.class);
+
     private final DockerClient dockerClient;
+
     private String directory;
+
     private String repository;
+
     private String containerId;
 
     public DockerfileFixture(DockerClient dockerClient, String directory) {
@@ -35,35 +39,27 @@ public DockerfileFixture(DockerClient dockerClient, String directory) {
     public void open() throws IOException {
 
         LOGGER.info("building {}", directory);
-        InputStream response = dockerClient
-                .buildImageCmd(new File("src/test/resources", directory))
-                .withNoCache() // remove alternatives, cause problems
+        InputStream response = dockerClient.buildImageCmd(new File("src/test/resources", directory)).withNoCache() // remove
+                                                                                                                   // alternatives,
+                                                                                                                   // cause
+                                                                                                                   // problems
                 .exec();
-        
+
         String log = AbstractDockerClientTest.consumeAsString(response);
-        
+
         assertThat(log, containsString("Successfully built"));
 
-        Image lastCreatedImage = dockerClient
-                .listImagesCmd()
-                .exec()
-                .get(0);
+        Image lastCreatedImage = dockerClient.listImagesCmd().exec().get(0);
 
-        repository = lastCreatedImage
-                .getRepoTags()[0];
+        repository = lastCreatedImage.getRepoTags()[0];
 
         LOGGER.info("created {} {}", lastCreatedImage.getId(), repository);
 
-        containerId = dockerClient
-                .createContainerCmd(lastCreatedImage.getId())
-                .exec()
-                .getId();
+        containerId = dockerClient.createContainerCmd(lastCreatedImage.getId()).exec().getId();
 
         LOGGER.info("starting {}", containerId);
 
-        dockerClient
-                .startContainerCmd(containerId)
-                .exec();
+        dockerClient.startContainerCmd(containerId).exec();
     }
 
     @Override
@@ -72,9 +68,7 @@ public void close() throws Exception {
         if (containerId != null) {
             LOGGER.info("removing container {}", containerId);
             try {
-                dockerClient
-                        .removeContainerCmd(containerId)
-                        .withForce() // stop too
+                dockerClient.removeContainerCmd(containerId).withForce() // stop too
                         .exec();
             } catch (NotFoundException | InternalServerErrorException ignored) {
                 LOGGER.info("ignoring {}", ignored.getMessage());
@@ -85,10 +79,7 @@ public void close() throws Exception {
         if (repository != null) {
             LOGGER.info("removing repository {}", repository);
             try {
-                dockerClient
-                        .removeImageCmd(repository)
-                        .withForce()
-                        .exec();
+                dockerClient.removeImageCmd(repository).withForce().exec();
             } catch (NotFoundException | InternalServerErrorException e) {
                 LOGGER.info("ignoring {}", e.getMessage());
             }
diff --git a/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java b/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
index 07bca25b5..c311540b1 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
@@ -17,9 +17,8 @@
 import static org.hamcrest.core.IsNull.nullValue;
 import static org.testng.AssertJUnit.assertNull;
 
-
 @Test(groups = "integration")
-public class EventStreamReaderITest  {
+public class EventStreamReaderITest {
 
     private DockerClient dockerClient;
 
@@ -36,17 +35,13 @@ public void tearDown() throws Exception {
     @Test(groups = "ignoreInCircleCi")
     public void pullCanBeStreamed() throws Exception {
 
-        try (EventStreamReader<PullEventStreamItem> reader = new EventStreamReader<>(
-                dockerClient.pullImageCmd("busybox:latest").exec(),
-                PullEventStreamItem.class)
-        ) {;
-            assertThat(reader.readItem(),
-                    allOf(
-                            hasProperty("status", equalTo("Pulling from busybox")),
-                            hasProperty("progress", nullValue()),
-                            hasProperty("progressDetail", nullValue())
-                    )
-                );
+        try (EventStreamReader<PullEventStreamItem> reader = new EventStreamReader<>(dockerClient.pullImageCmd(
+                "busybox:latest").exec(), PullEventStreamItem.class)) {
+            ;
+            assertThat(
+                    reader.readItem(),
+                    allOf(hasProperty("status", equalTo("Pulling from busybox")), hasProperty("progress", nullValue()),
+                            hasProperty("progressDetail", nullValue())));
             assertNull(reader.readItem());
         }
     }
@@ -54,17 +49,12 @@ public void pullCanBeStreamed() throws Exception {
     @Test
     public void buildCanBeStreamed() throws Exception {
 
-        try (EventStreamReader<EventStreamItem> reader = new EventStreamReader<>(
-                dockerClient.buildImageCmd(new File("src/test/resources/eventStreamReaderDockerfile")).exec(),
-                EventStreamItem.class)
-        ) {
-            assertThat(reader.readItem(),
-                    allOf(
-                            hasProperty("stream", equalTo("Step 0 : FROM busybox:latest\n")),
-                            hasProperty("error", nullValue()),
-                            hasProperty("errorDetail", nullValue())
-                    )
-            );
+        try (EventStreamReader<EventStreamItem> reader = new EventStreamReader<>(dockerClient.buildImageCmd(
+                new File("src/test/resources/eventStreamReaderDockerfile")).exec(), EventStreamItem.class)) {
+            assertThat(
+                    reader.readItem(),
+                    allOf(hasProperty("stream", equalTo("Step 0 : FROM busybox:latest\n")),
+                            hasProperty("error", nullValue()), hasProperty("errorDetail", nullValue())));
             assertNull(reader.readItem());
 
         }
diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
index baaeb8ca3..eb490d7e9 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -24,131 +24,125 @@
 @Test(groups = "integration")
 public class EventsCmdImplTest extends AbstractDockerClientTest {
 
-	private static int KNOWN_NUM_EVENTS = 4;
+    private static int KNOWN_NUM_EVENTS = 4;
 
-	private static String getEpochTime() {
-		return String.valueOf(System.currentTimeMillis() / 1000);
-	}
+    private static String getEpochTime() {
+        return String.valueOf(System.currentTimeMillis() / 1000);
+    }
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
 
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
 
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
 
-	/*
-	 * This specific test may fail with boot2docker as time may not in sync with host system
-	 */
-	@Test
-	public void testEventStreamTimeBound() throws InterruptedException,
-			IOException {
-		// Don't include other tests events
-		TimeUnit.SECONDS.sleep(1);
+    /*
+     * This specific test may fail with boot2docker as time may not in sync with host system
+     */
+    @Test
+    public void testEventStreamTimeBound() throws InterruptedException, IOException {
+        // Don't include other tests events
+        TimeUnit.SECONDS.sleep(1);
 
-		String startTime = getEpochTime();
-		int expectedEvents = generateEvents();
-		String endTime = getEpochTime();
+        String startTime = getEpochTime();
+        int expectedEvents = generateEvents();
+        String endTime = getEpochTime();
 
-		CountDownLatch countDownLatch = new CountDownLatch(expectedEvents);
-		EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
+        CountDownLatch countDownLatch = new CountDownLatch(expectedEvents);
+        EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
 
-		EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback)
-				.withSince(startTime).withUntil(endTime);
-		eventsCmd.exec();
+        EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback).withSince(startTime).withUntil(endTime);
+        eventsCmd.exec();
 
-		boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
+        boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
 
+        eventCallback.close();
 
-		eventCallback.close();
+        assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
+    }
 
-		assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
-	}
+    @Test
+    public void testEventStreaming1() throws InterruptedException, IOException {
+        // Don't include other tests events
+        TimeUnit.SECONDS.sleep(1);
 
-	@Test
-	public void testEventStreaming1() throws InterruptedException, IOException {
-		// Don't include other tests events
-		TimeUnit.SECONDS.sleep(1);
+        CountDownLatch countDownLatch = new CountDownLatch(KNOWN_NUM_EVENTS);
+        EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
 
-		CountDownLatch countDownLatch = new CountDownLatch(KNOWN_NUM_EVENTS);
-		EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
+        EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback).withSince(getEpochTime());
+        eventsCmd.exec();
 
-		EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback).withSince(
-				getEpochTime());
-		eventsCmd.exec();
+        generateEvents();
 
-		generateEvents();
+        boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
 
-		boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
+        eventCallback.close();
+        assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
+    }
 
-		eventCallback.close();
-		assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
-	}
+    @Test
+    public void testEventStreaming2() throws InterruptedException, IOException {
+        // Don't include other tests events
+        TimeUnit.SECONDS.sleep(1);
 
-	@Test
-	public void testEventStreaming2() throws InterruptedException, IOException {
-		// Don't include other tests events
-		TimeUnit.SECONDS.sleep(1);
+        CountDownLatch countDownLatch = new CountDownLatch(KNOWN_NUM_EVENTS);
+        EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
 
-		CountDownLatch countDownLatch = new CountDownLatch(KNOWN_NUM_EVENTS);
-		EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
+        EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback).withSince(getEpochTime());
+        eventsCmd.exec();
 
-		EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback).withSince(
-				getEpochTime());
-		eventsCmd.exec();
+        generateEvents();
 
-		generateEvents();
+        boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
 
-		boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
+        eventCallback.close();
+        assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
+    }
 
-		eventCallback.close();
-		assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
-	}
+    /**
+     * This method generates {#link KNOWN_NUM_EVENTS} events
+     */
+    private int generateEvents() {
+        String testImage = "busybox";
+        asString(dockerClient.pullImageCmd(testImage).exec());
+        CreateContainerResponse container = dockerClient.createContainerCmd(testImage).withCmd("sleep", "9999").exec();
+        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerClient.stopContainerCmd(container.getId()).exec();
+        return KNOWN_NUM_EVENTS;
+    }
 
-	/**
-	 * This method generates {#link KNOWN_NUM_EVENTS} events
-	 */
-	private int generateEvents() {
-		String testImage = "busybox";
-		asString(dockerClient.pullImageCmd(testImage).exec());
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd(testImage).withCmd("sleep", "9999").exec();
-		dockerClient.startContainerCmd(container.getId()).exec();
-		dockerClient.stopContainerCmd(container.getId()).exec();
-		return KNOWN_NUM_EVENTS;
-	}
+    private class EventCallbackTest extends ResultCallbackTemplate<Event> {
 
-	private class EventCallbackTest extends ResultCallbackTemplate<Event> {
+        private final CountDownLatch countDownLatch;
 
-		private final CountDownLatch countDownLatch;
+        private final List<Event> events = new ArrayList<Event>();
 
-		private final List<Event> events = new ArrayList<Event>();
+        public EventCallbackTest(CountDownLatch countDownLatch) {
+            this.countDownLatch = countDownLatch;
+        }
 
-		public EventCallbackTest(CountDownLatch countDownLatch) {
-			this.countDownLatch = countDownLatch;
-		}
-
-		public void onNext(Event event) {
-		    LOG.info("Received event #{}: {}", countDownLatch.getCount(), event);
+        public void onNext(Event event) {
+            LOG.info("Received event #{}: {}", countDownLatch.getCount(), event);
             countDownLatch.countDown();
             events.add(event);
-	    }
+        }
 
-		public List<Event> getEvents() {
-			return new ArrayList<Event>(events);
-		}
-	}
+        public List<Event> getEvents() {
+            return new ArrayList<Event>(events);
+        }
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java
index 028f4cac1..d5ec79307 100644
--- a/src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java
@@ -40,8 +40,7 @@ public void afterMethod(ITestResult result) {
     public void execCreateTest() {
         String containerName = "generated_" + new SecureRandom().nextInt();
 
-        CreateContainerResponse container = dockerClient
-                .createContainerCmd("busybox").withCmd("top")
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
                 .withName(containerName).exec();
 
         LOG.info("Created container {}", container.toString());
@@ -50,7 +49,8 @@ public void execCreateTest() {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId()).withCmd("touch","file.log").exec();
+        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
+                .withCmd("touch", "file.log").exec();
 
         assertThat(execCreateCmdResponse.getId(), not(isEmptyString()));
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
index a62a5bd9a..c3586a965 100644
--- a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
@@ -41,9 +41,7 @@ public void afterMethod(ITestResult result) {
     public void execStart() throws Exception {
         String containerName = "generated_" + new SecureRandom().nextInt();
 
-        CreateContainerResponse container = dockerClient
-                .createContainerCmd("busybox")
-                .withCmd("top")
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
                 .withName(containerName).exec();
         LOG.info("Created container {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
@@ -51,8 +49,7 @@ public void execStart() throws Exception {
         dockerClient.startContainerCmd(container.getId()).exec();
 
         ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
-            .withAttachStdout(true)
-            .withCmd("touch", "/execStartTest.log").exec();
+                .withAttachStdout(true).withCmd("touch", "/execStartTest.log").exec();
         dockerClient.execStartCmd(execCreateCmdResponse.getId()).exec();
 
         InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "/execStartTest.log").exec();
@@ -69,9 +66,7 @@ public void execStart() throws Exception {
     public void execStartAttached() throws Exception {
         String containerName = "generated_" + new SecureRandom().nextInt();
 
-        CreateContainerResponse container = dockerClient
-                .createContainerCmd("busybox")
-                .withCmd("sleep", "9999")
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withName(containerName).exec();
         LOG.info("Created container {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
@@ -79,8 +74,7 @@ public void execStartAttached() throws Exception {
         dockerClient.startContainerCmd(container.getId()).exec();
 
         ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
-            .withAttachStdout(true)
-            .withCmd("touch", "/execStartTest.log").exec();
+                .withAttachStdout(true).withCmd("touch", "/execStartTest.log").exec();
         dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true).exec();
 
         InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "/execStartTest.log").exec();
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
index 2b5e2b644..10210c281 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
@@ -14,13 +14,16 @@
 
 public class FrameReaderTest {
     public static final int HEADER_SIZE = 8;
+
     private final List<Integer> bytes = new ArrayList<>();
+
     private final InputStream inputStream = new InputStream() {
         @Override
         public int read() throws IOException {
             return bytes.isEmpty() ? -1 : bytes.remove(0);
         }
     };
+
     private final FrameReader frameReader = new FrameReader(inputStream);
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
index 7170c12f3..19e275078 100644
--- a/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
@@ -21,53 +21,51 @@
 @Test(groups = "integration")
 public class InfoCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
 
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
 
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
 
-	@Test
-	public void info() throws DockerException {
+    @Test
+    public void info() throws DockerException {
         // Make sure that there is at least one container for the assertion
         // TODO extract this into a shared method
-    if (dockerClient.listContainersCmd().withShowAll(true).exec().size() == 0) {
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withName("docker-java-itest-info")
-                .withCmd("touch", "/test")
-                .exec();
+        if (dockerClient.listContainersCmd().withShowAll(true).exec().size() == 0) {
+            CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                    .withName("docker-java-itest-info").withCmd("touch", "/test").exec();
 
-        LOG.info("Created container: {}", container);
-        assertThat(container.getId(), not(isEmptyOrNullString()));
+            LOG.info("Created container: {}", container);
+            assertThat(container.getId(), not(isEmptyOrNullString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
-    }
+            dockerClient.startContainerCmd(container.getId()).exec();
+        }
 
-		Info dockerInfo = dockerClient.infoCmd().exec();
-		LOG.info(dockerInfo.toString());
+        Info dockerInfo = dockerClient.infoCmd().exec();
+        LOG.info(dockerInfo.toString());
 
-		assertTrue(dockerInfo.toString().contains("containers"));
-		assertTrue(dockerInfo.toString().contains("images"));
-		assertTrue(dockerInfo.toString().contains("debug"));
+        assertTrue(dockerInfo.toString().contains("containers"));
+        assertTrue(dockerInfo.toString().contains("images"));
+        assertTrue(dockerInfo.toString().contains("debug"));
 
-		assertTrue(dockerInfo.getContainers() > 0);
-		assertTrue(dockerInfo.getImages() > 0);
-		assertTrue(dockerInfo.getNFd() > 0);
-		assertTrue(dockerInfo.getNGoroutines() > 0);
-		assertTrue(dockerInfo.getNCPU() > 0);
-	}
+        assertTrue(dockerInfo.getContainers() > 0);
+        assertTrue(dockerInfo.getImages() > 0);
+        assertTrue(dockerInfo.getNFd() > 0);
+        assertTrue(dockerInfo.getNGoroutines() > 0);
+        assertTrue(dockerInfo.getNCPU() > 0);
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
index f1270f4e6..69f4d78e1 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
@@ -47,9 +47,7 @@ public void afterMethod(ITestResult result) {
     public void inspectExecTest() throws IOException {
         String containerName = "generated_" + new SecureRandom().nextInt();
 
-        CreateContainerResponse container = dockerClient
-                .createContainerCmd("busybox")
-                .withCmd("top")
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
                 .withName(containerName).exec();
         LOG.info("Created container {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
@@ -57,31 +55,25 @@ public void inspectExecTest() throws IOException {
         dockerClient.startContainerCmd(container.getId()).exec();
 
         ExecCreateCmdResponse touchFileCmdCreateResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout()
-                .withAttachStderr()
-                .withCmd("touch", "/marker").exec();
+                .withAttachStdout().withAttachStderr().withCmd("touch", "/marker").exec();
         LOG.info("Created exec {}", touchFileCmdCreateResponse.toString());
         assertThat(touchFileCmdCreateResponse.getId(), not(isEmptyString()));
         ExecCreateCmdResponse checkFileCmdCreateResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout()
-                .withAttachStderr()
-                .withCmd("test", "-e", "/marker").exec();
+                .withAttachStdout().withAttachStderr().withCmd("test", "-e", "/marker").exec();
         LOG.info("Created exec {}", checkFileCmdCreateResponse.toString());
         assertThat(checkFileCmdCreateResponse.getId(), not(isEmptyString()));
 
         // Check that file does not exist
         InputStream response1 = dockerClient.execStartCmd(container.getId())
-                .withExecId(checkFileCmdCreateResponse.getId())
-                .exec();
-        asString(response1);  // consume
+                .withExecId(checkFileCmdCreateResponse.getId()).exec();
+        asString(response1); // consume
 
         InspectExecResponse first = dockerClient.inspectExecCmd(checkFileCmdCreateResponse.getId()).exec();
         assertThat(first.getExitCode(), is(1));
 
         // Create the file
         InputStream response2 = dockerClient.execStartCmd(container.getId())
-                .withExecId(touchFileCmdCreateResponse.getId())
-                .exec();
+                .withExecId(touchFileCmdCreateResponse.getId()).exec();
         asString(response2);
 
         InspectExecResponse second = dockerClient.inspectExecCmd(touchFileCmdCreateResponse.getId()).exec();
@@ -89,8 +81,7 @@ public void inspectExecTest() throws IOException {
 
         // Check that file does exist now
         InputStream response3 = dockerClient.execStartCmd(container.getId())
-                .withExecId(checkFileCmdCreateResponse.getId())
-                .exec();
+                .withExecId(checkFileCmdCreateResponse.getId()).exec();
         asString(response3);
 
         InspectExecResponse third = dockerClient.inspectExecCmd(checkFileCmdCreateResponse.getId()).exec();
diff --git a/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
index 33d80ef2d..e60930d88 100644
--- a/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
@@ -26,60 +26,55 @@
 @Test(groups = "integration")
 public class KillContainerCmdImplTest extends AbstractDockerClientTest {
 
-	public static final Logger LOG = LoggerFactory
-			.getLogger(KillContainerCmdImplTest.class);
-
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-
-	@Test(groups = "ignoreInCircleCi")
-	public void killContainer() throws DockerException {
-
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-		LOG.info("Created container: {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
-		dockerClient.startContainerCmd(container.getId()).exec();
-
-		LOG.info("Killing container: {}", container.getId());
-		dockerClient.killContainerCmd(container.getId()).exec();
-
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
-		LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-		assertThat(inspectContainerResponse.getState().isRunning(),
-				is(equalTo(false)));
-		assertThat(inspectContainerResponse.getState().getExitCode(),
-				not(equalTo(0)));
-
-	}
-	
-	@Test
-	public void killNonExistingContainer() throws DockerException {
-
-		try {
-			dockerClient.killContainerCmd("non-existing").exec();
-			fail("expected NotFoundException");
-		} catch (NotFoundException e) {
-		}
-	}
+    public static final Logger LOG = LoggerFactory.getLogger(KillContainerCmdImplTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void killContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        LOG.info("Killing container: {}", container.getId());
+        dockerClient.killContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        assertThat(inspectContainerResponse.getState().isRunning(), is(equalTo(false)));
+        assertThat(inspectContainerResponse.getState().getExitCode(), not(equalTo(0)));
+
+    }
+
+    @Test
+    public void killNonExistingContainer() throws DockerException {
+
+        try {
+            dockerClient.killContainerCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
index f73ac5e4b..b074409bd 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
@@ -31,76 +31,72 @@
 @Test(groups = "integration")
 public class ListContainersCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
 
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
 
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
 
-	@Test
-	public void testListContainers() throws DockerException {
+    @Test
+    public void testListContainers() throws DockerException {
 
-		String testImage = "busybox";
+        String testImage = "busybox";
 
-		// need to block until image is pulled completely
-		asString(dockerClient.pullImageCmd(testImage).exec());
+        // need to block until image is pulled completely
+        asString(dockerClient.pullImageCmd(testImage).exec());
 
-		List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
-		assertThat(containers, notNullValue());
-		LOG.info("Container List: {}", containers);
+        List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
+        assertThat(containers, notNullValue());
+        LOG.info("Container List: {}", containers);
 
-		int size = containers.size();
+        int size = containers.size();
 
-		CreateContainerResponse container1 = dockerClient
-				.createContainerCmd(testImage).withCmd("echo").exec();
+        CreateContainerResponse container1 = dockerClient.createContainerCmd(testImage).withCmd("echo").exec();
 
-		assertThat(container1.getId(), not(isEmptyString()));
+        assertThat(container1.getId(), not(isEmptyString()));
 
-		InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container1.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container1.getId()).exec();
 
-		assertThat(inspectContainerResponse.getConfig().getImage(), is(equalTo(testImage)));
+        assertThat(inspectContainerResponse.getConfig().getImage(), is(equalTo(testImage)));
 
-		dockerClient.startContainerCmd(container1.getId()).exec();
+        dockerClient.startContainerCmd(container1.getId()).exec();
 
-		LOG.info("container id: " + container1.getId());
+        LOG.info("container id: " + container1.getId());
 
-		List<Container> containers2 = dockerClient.listContainersCmd().withShowAll(true).exec();
+        List<Container> containers2 = dockerClient.listContainersCmd().withShowAll(true).exec();
 
-		for(Container container: containers2) {
-			LOG.info("listContainer: id=" + container.getId() +" image=" + container.getImage());
-		}
+        for (Container container : containers2) {
+            LOG.info("listContainer: id=" + container.getId() + " image=" + container.getImage());
+        }
 
-		assertThat(size + 1, is(equalTo(containers2.size())));
-		Matcher matcher = hasItem(hasField("id", startsWith(container1.getId())));
-		assertThat(containers2, matcher);
+        assertThat(size + 1, is(equalTo(containers2.size())));
+        Matcher matcher = hasItem(hasField("id", startsWith(container1.getId())));
+        assertThat(containers2, matcher);
 
-		List<Container> filteredContainers = filter(
-				hasField("id", startsWith(container1.getId())), containers2);
-		assertThat(filteredContainers.size(), is(equalTo(1)));
-
-		for(Container container: filteredContainers) {
-			LOG.info("filteredContainer: " + container);
-		}
-
-		Container container2 = filteredContainers.get(0);
-		assertThat(container2.getCommand(), not(isEmptyString()));
-		assertThat(container2.getImage(), startsWith(testImage + ":"));
-	}
+        List<Container> filteredContainers = filter(hasField("id", startsWith(container1.getId())), containers2);
+        assertThat(filteredContainers.size(), is(equalTo(1)));
 
+        for (Container container : filteredContainers) {
+            LOG.info("filteredContainer: " + container);
+        }
 
+        Container container2 = filteredContainers.get(0);
+        assertThat(container2.getCommand(), not(isEmptyString()));
+        assertThat(container2.getImage(), startsWith(testImage + ":"));
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
index 05bf94837..e91641eeb 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
@@ -22,78 +22,75 @@
 @Test(groups = "integration")
 public class ListImagesCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-
-	@Test
-	public void listImages() throws DockerException {
-		List<Image> images = dockerClient.listImagesCmd().withShowAll(true).exec();
-		assertThat(images, notNullValue());
-		LOG.info("Images List: {}", images);
-		Info info = dockerClient.infoCmd().exec();
-
-		assertThat(images.size(), equalTo(info.getImages()));
-
-		Image img = images.get(0);
-		assertThat(img.getCreated(), is(greaterThan(0L)));
-		assertThat(img.getVirtualSize(), is(greaterThan(0L)));
-		assertThat(img.getId(), not(isEmptyString()));
-		assertThat(img.getRepoTags(), not(emptyArray()));
-	}
-
-	@Test(groups = "ignoreInCircleCi")
-	public void listDanglingImages() throws DockerException {
-		String imageId = createDanglingImage();
-		List<Image> images = dockerClient.listImagesCmd()
-				.withFilters("{\"dangling\":[\"true\"]}")
-				.withShowAll(true).exec();
-		assertThat(images, notNullValue());
-		LOG.info("Images List: {}", images);
-		assertThat(images.size(), is(greaterThan(0)));
-		boolean imageInFilteredList = isImageInFilteredList(images, imageId);
-		assertTrue(imageInFilteredList);
-	}
-
-	private boolean isImageInFilteredList(List<Image> images, String expectedImageId) {
-		for (Image image : images) {
-			if (expectedImageId.equals(image.getId())) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private String createDanglingImage() {
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "5").exec();
-		LOG.info("Created container: {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
-		dockerClient.startContainerCmd(container.getId()).exec();
-
-		LOG.info("Committing container {}", container.toString());
-		String imageId = dockerClient
-				.commitCmd(container.getId()).exec();
-
-		dockerClient.stopContainerCmd(container.getId()).exec();
-		dockerClient.killContainerCmd(container.getId()).exec();
-		dockerClient.removeContainerCmd(container.getId()).exec();
-		return imageId;
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void listImages() throws DockerException {
+        List<Image> images = dockerClient.listImagesCmd().withShowAll(true).exec();
+        assertThat(images, notNullValue());
+        LOG.info("Images List: {}", images);
+        Info info = dockerClient.infoCmd().exec();
+
+        assertThat(images.size(), equalTo(info.getImages()));
+
+        Image img = images.get(0);
+        assertThat(img.getCreated(), is(greaterThan(0L)));
+        assertThat(img.getVirtualSize(), is(greaterThan(0L)));
+        assertThat(img.getId(), not(isEmptyString()));
+        assertThat(img.getRepoTags(), not(emptyArray()));
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void listDanglingImages() throws DockerException {
+        String imageId = createDanglingImage();
+        List<Image> images = dockerClient.listImagesCmd().withFilters("{\"dangling\":[\"true\"]}").withShowAll(true)
+                .exec();
+        assertThat(images, notNullValue());
+        LOG.info("Images List: {}", images);
+        assertThat(images.size(), is(greaterThan(0)));
+        boolean imageInFilteredList = isImageInFilteredList(images, imageId);
+        assertTrue(imageInFilteredList);
+    }
+
+    private boolean isImageInFilteredList(List<Image> images, String expectedImageId) {
+        for (Image image : images) {
+            if (expectedImageId.equals(image.getId())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private String createDanglingImage() {
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "5").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        LOG.info("Committing container {}", container.toString());
+        String imageId = dockerClient.commitCmd(container.getId()).exec();
+
+        dockerClient.stopContainerCmd(container.getId()).exec();
+        dockerClient.killContainerCmd(container.getId()).exec();
+        dockerClient.removeContainerCmd(container.getId()).exec();
+        return imageId;
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
index 18c001c5f..ec61a53db 100644
--- a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
@@ -141,6 +141,4 @@ public void asyncMultipleLogContainer() throws Exception {
         assertTrue(loggingCallback.toString().contains(snippet));
     }
 
-
-
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
index f9968a449..f3871e042 100644
--- a/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
@@ -28,24 +28,24 @@ public InputStream exec(PullImageCmd command) {
     };
 
     @BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
 
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
 
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
 
     @Test
     public void nullAuthConfig() throws Exception {
@@ -59,59 +59,57 @@ public void nullAuthConfig() throws Exception {
     }
 
     @Test
-	public void testPullImage() throws DockerException, IOException {
-		Info info = dockerClient.infoCmd().exec();
-		LOG.info("Client info: {}", info.toString());
-
-		int imgCount = info.getImages();
-		LOG.info("imgCount1: {}", imgCount);
-
-		// This should be an image that is not used by other repositories
-		// already
-		// pulled down, preferably small in size. If tag is not used pull will
-		// download all images in that repository but tmpImgs will only
-		// deleted 'latest' image but not images with other tags
-		String testImage = "hackmann/empty";
-
-		LOG.info("Removing image: {}", testImage);
-		
-		try {
-			dockerClient.removeImageCmd(testImage).withForce().exec();
-		} catch (NotFoundException e) {
-			// just ignore if not exist
-		}
-		
-
-		info = dockerClient.infoCmd().exec();
-		LOG.info("Client info: {}", info.toString());
-
-		imgCount = info.getImages();
-		LOG.info("imgCount2: {}", imgCount);
-
-		LOG.info("Pulling image: {}", testImage);
-
-		InputStream response = dockerClient.pullImageCmd(testImage).exec();
-
-		assertThat(asString(response), containsString("Download complete"));
-
-		info = dockerClient.infoCmd().exec();
-		LOG.info("Client info after pull, {}", info.toString());
-
-		assertThat(imgCount, lessThanOrEqualTo(info.getImages()));
-
-		InspectImageResponse inspectImageResponse = dockerClient
-				.inspectImageCmd(testImage).exec();
-		LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-		assertThat(inspectImageResponse, notNullValue());
-	}
-
-	@Test
-	public void testPullNonExistingImage() throws DockerException, IOException {
-		
-		// does not throw an exception
-		InputStream is = dockerClient.pullImageCmd("xvxcv/foo").exec();
-		// stream needs to be fully read in order to close the underlying connection
-		asString(is);
-	}
+    public void testPullImage() throws DockerException, IOException {
+        Info info = dockerClient.infoCmd().exec();
+        LOG.info("Client info: {}", info.toString());
+
+        int imgCount = info.getImages();
+        LOG.info("imgCount1: {}", imgCount);
+
+        // This should be an image that is not used by other repositories
+        // already
+        // pulled down, preferably small in size. If tag is not used pull will
+        // download all images in that repository but tmpImgs will only
+        // deleted 'latest' image but not images with other tags
+        String testImage = "hackmann/empty";
+
+        LOG.info("Removing image: {}", testImage);
+
+        try {
+            dockerClient.removeImageCmd(testImage).withForce().exec();
+        } catch (NotFoundException e) {
+            // just ignore if not exist
+        }
+
+        info = dockerClient.infoCmd().exec();
+        LOG.info("Client info: {}", info.toString());
+
+        imgCount = info.getImages();
+        LOG.info("imgCount2: {}", imgCount);
+
+        LOG.info("Pulling image: {}", testImage);
+
+        InputStream response = dockerClient.pullImageCmd(testImage).exec();
+
+        assertThat(asString(response), containsString("Download complete"));
+
+        info = dockerClient.infoCmd().exec();
+        LOG.info("Client info after pull, {}", info.toString());
+
+        assertThat(imgCount, lessThanOrEqualTo(info.getImages()));
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(testImage).exec();
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+        assertThat(inspectImageResponse, notNullValue());
+    }
+
+    @Test
+    public void testPullNonExistingImage() throws DockerException, IOException {
+
+        // does not throw an exception
+        InputStream is = dockerClient.pullImageCmd("xvxcv/foo").exec();
+        // stream needs to be fully read in order to close the underlying connection
+        asString(is);
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
index f409aebf7..8498256a8 100644
--- a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
@@ -16,60 +16,58 @@
 @Test(groups = "integration")
 public class PushImageCmdImplTest extends AbstractDockerClientTest {
 
-	public static final Logger LOG = LoggerFactory
-			.getLogger(PushImageCmdImplTest.class);
+    public static final Logger LOG = LoggerFactory.getLogger(PushImageCmdImplTest.class);
 
     String username;
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
         username = dockerClient.authConfig().getUsername();
-	}
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
+    }
 
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
 
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
 
-	@Test
-	public void pushLatest() throws Exception {
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("true").exec();
+    @Test
+    public void pushLatest() throws Exception {
 
-		LOG.info("Created container {}", container.toString());
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true").exec();
 
-		assertThat(container.getId(), not(isEmptyString()));
+        LOG.info("Created container {}", container.toString());
 
-		LOG.info("Committing container: {}", container.toString());
-		String imageId = dockerClient.commitCmd(container.getId()).withRepository(username + "/busybox").exec();
+        assertThat(container.getId(), not(isEmptyString()));
 
-		// we have to block until image is pushed
-		asString(dockerClient.pushImageCmd(username + "/busybox").exec());
+        LOG.info("Committing container: {}", container.toString());
+        String imageId = dockerClient.commitCmd(container.getId()).withRepository(username + "/busybox").exec();
+
+        // we have to block until image is pushed
+        asString(dockerClient.pushImageCmd(username + "/busybox").exec());
 
         LOG.info("Removing image: {}", imageId);
-		dockerClient.removeImageCmd(imageId).exec();
-		
-		String response = asString(dockerClient.pullImageCmd(username + "/busybox").exec());
+        dockerClient.removeImageCmd(imageId).exec();
 
-		assertThat(response, not(containsString("HTTP code: 404")));
-	}
+        String response = asString(dockerClient.pullImageCmd(username + "/busybox").exec());
 
-	@Test
-	public void pushExistentImage() throws Exception {
+        assertThat(response, not(containsString("HTTP code: 404")));
+    }
 
-		assertThat(asString(dockerClient.pushImageCmd(username + "/xxx").exec()), containsString("error"));
-	}
+    @Test
+    public void pushExistentImage() throws Exception {
 
-}
+        assertThat(asString(dockerClient.pushImageCmd(username + "/xxx").exec()), containsString("error"));
+    }
 
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
index b6fe173ae..22fbb096c 100644
--- a/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
@@ -28,57 +28,53 @@
 @Test(groups = "integration")
 public class RemoveContainerCmdImplTest extends AbstractDockerClientTest {
 
-	public static final Logger LOG = LoggerFactory
-			.getLogger(RemoveContainerCmdImplTest.class);
-
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-
-	@Test(groups = "ignoreInCircleCi")
-	public void removeContainer() throws DockerException {
-
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("true").exec();
-
-		dockerClient.startContainerCmd(container.getId()).exec();
-		dockerClient.waitContainerCmd(container.getId()).exec();
-
-		LOG.info("Removing container: {}", container.getId());
-		dockerClient.removeContainerCmd(container.getId()).exec();
-
-		List<Container> containers2 = dockerClient.listContainersCmd().withShowAll(true).exec();
-		
-		Matcher matcher = not(hasItem(hasField("id",
-				startsWith(container.getId()))));
-		assertThat(containers2, matcher);
-
-	}
-	
-	@Test
-	public void removeNonExistingContainer() throws DockerException {
-		try {
-			dockerClient.removeContainerCmd("non-existing").exec();
-			fail("expected NotFoundException");			
-		} catch (NotFoundException e) {
-		}
-	}
+    public static final Logger LOG = LoggerFactory.getLogger(RemoveContainerCmdImplTest.class);
 
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
-}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void removeContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true").exec();
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerClient.waitContainerCmd(container.getId()).exec();
 
+        LOG.info("Removing container: {}", container.getId());
+        dockerClient.removeContainerCmd(container.getId()).exec();
+
+        List<Container> containers2 = dockerClient.listContainersCmd().withShowAll(true).exec();
+
+        Matcher matcher = not(hasItem(hasField("id", startsWith(container.getId()))));
+        assertThat(containers2, matcher);
+
+    }
+
+    @Test
+    public void removeNonExistingContainer() throws DockerException {
+        try {
+            dockerClient.removeContainerCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
index af6bc39cc..1c0f3db1c 100644
--- a/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
@@ -29,64 +29,60 @@
 @Test(groups = "integration")
 public class RemoveImageCmdImplTest extends AbstractDockerClientTest {
 
-	public static final Logger LOG = LoggerFactory
-			.getLogger(RemoveImageCmdImplTest.class);
+    public static final Logger LOG = LoggerFactory.getLogger(RemoveImageCmdImplTest.class);
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
 
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
 
-	@Test(groups = "ignoreInCircleCi")
-	public void removeImage() throws DockerException, InterruptedException {
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
 
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-		LOG.info("Created container: {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
-		dockerClient.startContainerCmd(container.getId()).exec();
+    @Test(groups = "ignoreInCircleCi")
+    public void removeImage() throws DockerException, InterruptedException {
 
-		LOG.info("Committing container {}", container.toString());
-		String imageId = dockerClient
-				.commitCmd(container.getId()).exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
 
-		dockerClient.stopContainerCmd(container.getId()).exec();
-		dockerClient.killContainerCmd(container.getId()).exec();
-		dockerClient.removeContainerCmd(container.getId()).exec();
+        LOG.info("Committing container {}", container.toString());
+        String imageId = dockerClient.commitCmd(container.getId()).exec();
 
-		LOG.info("Removing image: {}", imageId);
-		dockerClient.removeImageCmd(imageId).exec();
+        dockerClient.stopContainerCmd(container.getId()).exec();
+        dockerClient.killContainerCmd(container.getId()).exec();
+        dockerClient.removeContainerCmd(container.getId()).exec();
 
-		List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
+        LOG.info("Removing image: {}", imageId);
+        dockerClient.removeImageCmd(imageId).exec();
 
-		Matcher matcher = not(hasItem(hasField("id", startsWith(imageId))));
-		assertThat(containers, matcher);
-	}
+        List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
 
-	@Test
-	public void removeNonExistingImage() throws DockerException, InterruptedException {
-		try {
-			dockerClient.removeImageCmd("non-existing").exec();
-			fail("expected NotFoundException");
-		} catch (NotFoundException e) {
-		}
+        Matcher matcher = not(hasItem(hasField("id", startsWith(imageId))));
+        assertThat(containers, matcher);
+    }
 
-	}
+    @Test
+    public void removeNonExistingImage() throws DockerException, InterruptedException {
+        try {
+            dockerClient.removeImageCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
 
+    }
 
 }
-
diff --git a/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
index b6040a0ff..866800163 100644
--- a/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
@@ -24,67 +24,61 @@
 @Test(groups = "integration")
 public class RestartContainerCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-
-	@Test
-	public void restartContainer() throws DockerException {
-
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-		LOG.info("Created container: {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
-		dockerClient.startContainerCmd(container.getId()).exec();
-		
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
-		LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-		String startTime = inspectContainerResponse.getState().getStartedAt();
-
-		dockerClient.restartContainerCmd(container.getId()).withtTimeout(2).exec();
-
-		InspectContainerResponse inspectContainerResponse2 = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
-		LOG.info("Container Inspect After Restart: {}",
-				inspectContainerResponse2.toString());
-
-		String startTime2 = inspectContainerResponse2.getState().getStartedAt();
-
-		assertThat(startTime, not(equalTo(startTime2)));
-
-		assertThat(inspectContainerResponse.getState().isRunning(),
-				is(equalTo(true)));
-
-		dockerClient.killContainerCmd(container.getId()).exec();
-	}
-	
-	@Test
-	public void restartNonExistingContainer() throws DockerException, InterruptedException {
-		try {
-			dockerClient.restartContainerCmd("non-existing").exec();
-			fail("expected NotFoundException");
-		} catch (NotFoundException e) {
-		}
-
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void restartContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        String startTime = inspectContainerResponse.getState().getStartedAt();
+
+        dockerClient.restartContainerCmd(container.getId()).withtTimeout(2).exec();
+
+        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect After Restart: {}", inspectContainerResponse2.toString());
+
+        String startTime2 = inspectContainerResponse2.getState().getStartedAt();
+
+        assertThat(startTime, not(equalTo(startTime2)));
+
+        assertThat(inspectContainerResponse.getState().isRunning(), is(equalTo(true)));
+
+        dockerClient.killContainerCmd(container.getId()).exec();
+    }
+
+    @Test
+    public void restartNonExistingContainer() throws DockerException, InterruptedException {
+        try {
+            dockerClient.restartContainerCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/SaveImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/SaveImageCmdImplTest.java
index 859a76cc2..9facdc2d9 100644
--- a/src/test/java/com/github/dockerjava/core/command/SaveImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/SaveImageCmdImplTest.java
@@ -26,8 +26,7 @@
 
 @Test(groups = "integration")
 public class SaveImageCmdImplTest extends AbstractDockerClientTest {
-    public static final Logger LOG = LoggerFactory
-            .getLogger(SaveImageCmdImplTest.class);
+    public static final Logger LOG = LoggerFactory.getLogger(SaveImageCmdImplTest.class);
 
     String username;
 
@@ -35,6 +34,7 @@ public class SaveImageCmdImplTest extends AbstractDockerClientTest {
     public void beforeTest() throws DockerException {
         super.beforeTest();
     }
+
     @AfterTest
     public void afterTest() {
         super.afterTest();
@@ -53,8 +53,7 @@ public void afterMethod(ITestResult result) {
     @Test
     public void saveImage() throws Exception {
 
-        InputStream image = IOUtils.toBufferedInputStream(dockerClient
-                .saveImageCmd("busybox").exec());
+        InputStream image = IOUtils.toBufferedInputStream(dockerClient.saveImageCmd("busybox").exec());
         assertThat(image.available(), greaterThan(0));
 
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java
index 5c2393534..f61ff078a 100644
--- a/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java
@@ -25,38 +25,35 @@
 @Test(groups = "integration")
 public class SearchImagesCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-	
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-	
-	@Test
-	public void searchImages() throws DockerException {
-		List<SearchItem> dockerSearch = dockerClient.searchImagesCmd("busybox").exec();
-		LOG.info("Search returned {}", dockerSearch.toString());
-
-		Matcher matcher = hasItem(hasField("name", equalTo("busybox")));
-		assertThat(dockerSearch, matcher);
-
-		assertThat(
-				filter(hasField("name", is("busybox")), dockerSearch).size(),
-				equalTo(1));
-	}
-
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void searchImages() throws DockerException {
+        List<SearchItem> dockerSearch = dockerClient.searchImagesCmd("busybox").exec();
+        LOG.info("Search returned {}", dockerSearch.toString());
+
+        Matcher matcher = hasItem(hasField("name", equalTo("busybox")));
+        assertThat(dockerSearch, matcher);
+
+        assertThat(filter(hasField("name", is("busybox")), dockerSearch).size(), equalTo(1));
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
index 3cf643c4e..8a2a2f13e 100644
--- a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
@@ -26,57 +26,54 @@
 @Test(groups = "integration")
 public class StopContainerCmdImplTest extends AbstractDockerClientTest {
 
-	public static final Logger LOG = LoggerFactory
-			.getLogger(StopContainerCmdImplTest.class);
-
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-
-	@Test(groups = "ignoreInCircleCi")
-	public void testStopContainer() throws DockerException {
-
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-		LOG.info("Created container: {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
-		dockerClient.startContainerCmd(container.getId()).exec();
-		
-		LOG.info("Stopping container: {}", container.getId());
-		dockerClient.stopContainerCmd(container.getId()).withTimeout(2).exec();
-
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
-		LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-		assertThat(inspectContainerResponse.getState().isRunning(),	is(equalTo(false)));
-		assertThat(inspectContainerResponse.getState().getExitCode(), not(equalTo(0)));
-	}
-	
-	@Test
-	public void testStopNonExistingContainer() throws DockerException {
-		try {
-			dockerClient.stopContainerCmd("non-existing").withTimeout(2).exec();
-			fail("expected NotFoundException");
-		} catch (NotFoundException e) {
-			
-		}
-	}
+    public static final Logger LOG = LoggerFactory.getLogger(StopContainerCmdImplTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void testStopContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        LOG.info("Stopping container: {}", container.getId());
+        dockerClient.stopContainerCmd(container.getId()).withTimeout(2).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        assertThat(inspectContainerResponse.getState().isRunning(), is(equalTo(false)));
+        assertThat(inspectContainerResponse.getState().getExitCode(), not(equalTo(0)));
+    }
+
+    @Test
+    public void testStopNonExistingContainer() throws DockerException {
+        try {
+            dockerClient.stopContainerCmd("non-existing").withTimeout(2).exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+
+        }
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java
index 97f422f28..b7c8bc4ff 100644
--- a/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java
@@ -19,47 +19,46 @@
 @Test(groups = "integration")
 public class TagImageCmdImplTest extends AbstractDockerClientTest {
 
-	public static final Logger LOG = LoggerFactory
-			.getLogger(TagImageCmdImplTest.class);
+    public static final Logger LOG = LoggerFactory.getLogger(TagImageCmdImplTest.class);
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
 
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
 
-	@Test
-	public void tagImage() throws Exception {
-		String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
 
-		dockerClient.tagImageCmd("busybox:latest", "docker-java/busybox", tag).exec();
+    @Test
+    public void tagImage() throws Exception {
+        String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
 
-		dockerClient.removeImageCmd("docker-java/busybox:" + tag).exec();
-	}
-	
-	@Test
-	public void tagNonExistingImage() throws Exception {
-		String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
-		
-		try {
-			dockerClient.tagImageCmd("non-existing", "docker-java/busybox", tag).exec();
-			fail("expected NotFoundException");
-		} catch (NotFoundException e) {
-		}	
-	}
+        dockerClient.tagImageCmd("busybox:latest", "docker-java/busybox", tag).exec();
 
-}
+        dockerClient.removeImageCmd("docker-java/busybox:" + tag).exec();
+    }
+
+    @Test
+    public void tagNonExistingImage() throws Exception {
+        String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
 
+        try {
+            dockerClient.tagImageCmd("non-existing", "docker-java/busybox", tag).exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java
index 8c9064346..edb5560e6 100644
--- a/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java
@@ -17,37 +17,36 @@
 @Test(groups = "integration")
 public class VersionCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-	
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-	    super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-	
-	@Test
-	public void version() throws DockerException {
-		Version version = dockerClient.versionCmd().exec();
-		LOG.info(version.toString());
-
-		assertTrue(version.getGoVersion().length() > 0);
-		assertTrue(version.getVersion().length() > 0);
-
-		assertEquals(StringUtils.split(version.getVersion(), ".").length, 3);
-
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
 
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void version() throws DockerException {
+        Version version = dockerClient.versionCmd().exec();
+        LOG.info(version.toString());
+
+        assertTrue(version.getGoVersion().length() > 0);
+        assertTrue(version.getVersion().length() > 0);
+
+        assertEquals(StringUtils.split(version.getVersion(), ".").length, 3);
+
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
index 19c7057d2..576506498 100644
--- a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
@@ -24,56 +24,54 @@
 @Test(groups = "integration")
 public class WaitContainerCmdImplTest extends AbstractDockerClientTest {
 
-	@BeforeTest
-	public void beforeTest() throws DockerException {
-		super.beforeTest();
-	}
-
-	@AfterTest
-	public void afterTest() {
-		super.afterTest();
-	}
-
-	@BeforeMethod
-	public void beforeMethod(Method method) {
-		super.beforeMethod(method);
-	}
-
-	@AfterMethod
-	public void afterMethod(ITestResult result) {
-		super.afterMethod(result);
-	}
-
-	@Test
-	public void testWaitContainer() throws DockerException {
-
-		CreateContainerResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("true").exec();
-
-		LOG.info("Created container: {}", container.toString());
-		assertThat(container.getId(), not(isEmptyString()));
-		
-		dockerClient.startContainerCmd(container.getId()).exec();
-
-		int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
-		LOG.info("Container exit code: {}", exitCode);
-
-		assertThat(exitCode, equalTo(0));
-
-		InspectContainerResponse inspectContainerResponse = dockerClient
-				.inspectContainerCmd(container.getId()).exec();
-		LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-		assertThat(inspectContainerResponse.getState().isRunning(),	is(equalTo(false)));
-		assertThat(inspectContainerResponse.getState().getExitCode(), is(equalTo(exitCode)));
-	}
-	
-	@Test
-	public void testWaitNonExistingContainer() throws DockerException {
-		try {
-			dockerClient.waitContainerCmd("non-existing").exec();
-			fail("expected NotFoundException");
-		} catch (NotFoundException e) {
-		}
-	}
+    @BeforeTest
+    public void beforeTest() throws DockerException {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void testWaitContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true").exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
+        LOG.info("Container exit code: {}", exitCode);
+
+        assertThat(exitCode, equalTo(0));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        assertThat(inspectContainerResponse.getState().isRunning(), is(equalTo(false)));
+        assertThat(inspectContainerResponse.getState().getExitCode(), is(equalTo(exitCode)));
+    }
+
+    @Test
+    public void testWaitNonExistingContainer() throws DockerException {
+        try {
+            dockerClient.waitContainerCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java
index 428511c2e..8b5e3c7e4 100644
--- a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java
+++ b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java
@@ -13,38 +13,37 @@
 
 public class DockerfileTest extends TestCase {
 
-  private static final Logger log = LoggerFactory.getLogger(DockerfileTest.class);
+    private static final Logger log = LoggerFactory.getLogger(DockerfileTest.class);
 
-  @Test
-  public void testAllItems() throws IOException {
-    File baseDir = new File(Thread.currentThread().getContextClassLoader()
-                                .getResource("netcat").getFile());
+    @Test
+    public void testAllItems() throws IOException {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("netcat").getFile());
 
-    File root = baseDir.getParentFile();
+        File root = baseDir.getParentFile();
 
-    Map<String, Dockerfile> dockerfiles = new HashMap<String, Dockerfile>();
-    Map<String, Dockerfile.ScannedResult> results = new HashMap<String, Dockerfile.ScannedResult>();
+        Map<String, Dockerfile> dockerfiles = new HashMap<String, Dockerfile>();
+        Map<String, Dockerfile.ScannedResult> results = new HashMap<String, Dockerfile.ScannedResult>();
 
-    for (File child : root.listFiles()) {
-      if (new File(child, "Dockerfile").exists()) {
-        Dockerfile dockerfile = new Dockerfile(new File(child, "Dockerfile"));
-        dockerfiles.put(child.getName(), dockerfile);
-      }
-    }
+        for (File child : root.listFiles()) {
+            if (new File(child, "Dockerfile").exists()) {
+                Dockerfile dockerfile = new Dockerfile(new File(child, "Dockerfile"));
+                dockerfiles.put(child.getName(), dockerfile);
+            }
+        }
 
-    for (String name : dockerfiles.keySet()) {
-      log.info("Scanning {}", name);
-      try {
-        results.put(name, dockerfiles.get(name).parse());
-      } catch (Exception ex) {
-        log.error("Error in {}", name, ex);
-      }
+        for (String name : dockerfiles.keySet()) {
+            log.info("Scanning {}", name);
+            try {
+                results.put(name, dockerfiles.get(name).parse());
+            } catch (Exception ex) {
+                log.error("Error in {}", name, ex);
+            }
 
-    }
+        }
 
-    for (String name : results.keySet()) {
-      log.info("Name: {} = {}", name, results.get(name));
+        for (String name : results.keySet()) {
+            log.info("Name: {} = {}", name, results.get(name));
+        }
     }
-  }
 
 }
\ No newline at end of file
diff --git a/src/test/java/com/github/dockerjava/test/serdes/AbstractJSONResourceRef.java b/src/test/java/com/github/dockerjava/test/serdes/AbstractJSONResourceRef.java
index 882b3b012..1d5f43a6f 100644
--- a/src/test/java/com/github/dockerjava/test/serdes/AbstractJSONResourceRef.java
+++ b/src/test/java/com/github/dockerjava/test/serdes/AbstractJSONResourceRef.java
@@ -17,15 +17,17 @@
 
 /**
  * Default implementation of the Resource reference.
+ * 
  * @author Oleg Nenashev
  */
 public abstract class AbstractJSONResourceRef implements JSONResourceRef {
     /**
      * Gets a class which stores resources.
+     * 
      * @return Reference class by default.
      */
     @Override
     public Class<?> getResourceClass() {
         return this.getClass();
-    }   
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java b/src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java
index 96e5df726..662b9b216 100644
--- a/src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java
+++ b/src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java
@@ -18,20 +18,23 @@
 import java.io.IOException;
 
 /**
- * References JSON resources, which 
+ * References JSON resources, which
+ * 
  * @author Oleg Nenashev
  */
 public interface JSONResourceRef {
 
     /**
      * Gets the resource file name under the class.
+     * 
      * @return File name, which is stored under the resource class
      */
     String getFileName();
 
     /**
      * Gets a class which stores resources.
+     * 
      * @return Class to be used as a resource source
      */
-    Class<?> getResourceClass();    
+    Class<?> getResourceClass();
 }
diff --git a/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java b/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
index b6a33b722..c83851370 100644
--- a/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
+++ b/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
@@ -29,16 +29,20 @@
 
 /**
  * Provides helper methods for serialization-deserialization tests
+ * 
  * @author Oleg Nenashev
  * @since TODO
  */
 public class JSONTestHelper {
-    
+
     /**
      * Reads JSON String from the specified resource
-     * @param resource JSON File
-     * @return JSON String 
-     * @throws IOException JSON Conversion error 
+     * 
+     * @param resource
+     *            JSON File
+     * @return JSON String
+     * @throws IOException
+     *             JSON Conversion error
      */
     public static String readString(JSONResourceRef resource) throws IOException {
         InputStream istream = CommandJSONSamples.class.getResourceAsStream(resource.getFileName());
@@ -47,71 +51,91 @@ public static String readString(JSONResourceRef resource) throws IOException {
         }
         return IOUtils.toString(istream, "UTF-8");
     }
-    
+
     /**
      * Reads item from the resource.
-     * @param <TClass> Data class to be read
-     * @param resource Resource reference
-     * @param tclass Class entry
+     * 
+     * @param <TClass>
+     *            Data class to be read
+     * @param resource
+     *            Resource reference
+     * @param tclass
+     *            Class entry
      * @return Item
-     * @throws IOException JSON conversion error
+     * @throws IOException
+     *             JSON conversion error
      */
     public static <TClass> TClass readObject(JSONResourceRef resource, Class<TClass> tclass) throws IOException {
         ObjectMapper mapper = new ObjectMapper();
         String str = readString(resource);
         return mapper.readValue(str, tclass);
     }
-    
+
     /**
      * Basic serialization-deserialization consistency test for the resource.
-     * @param <TClass> Data class
-     * @param resource Resource reference
-     * @param tclass Class entry
-     * @throws IOException JSON conversion error
-     * @throws AssertionError Validation error
+     * 
+     * @param <TClass>
+     *            Data class
+     * @param resource
+     *            Resource reference
+     * @param tclass
+     *            Class entry
+     * @throws IOException
+     *             JSON conversion error
+     * @throws AssertionError
+     *             Validation error
      * @return Deserialized object after the roundtrip
      */
-    public static <TClass> TClass testRoundTrip(JSONResourceRef resource, Class<TClass> tclass) 
-            throws IOException, AssertionError {
+    public static <TClass> TClass testRoundTrip(JSONResourceRef resource, Class<TClass> tclass) throws IOException,
+            AssertionError {
         TClass item = readObject(resource, tclass);
         assertNotNull(item);
         return testRoundTrip(item, tclass);
     }
-    
+
     /**
      * Performs roundtrip test for the specified class.
-     * @param <TClass> Item class
-     * @param item Item to be checked
+     * 
+     * @param <TClass>
+     *            Item class
+     * @param item
+     *            Item to be checked
      * @return Deserialized object after the roundtrip
-     * @throws IOException JSON Conversion error
-     * @throws AssertionError Validation error
+     * @throws IOException
+     *             JSON Conversion error
+     * @throws AssertionError
+     *             Validation error
      */
     @SuppressWarnings("unchecked")
-    public static <TClass> TClass testRoundTrip(TClass item) 
-            throws IOException, AssertionError {
-        return testRoundTrip(item, (Class<TClass>)item.getClass());
+    public static <TClass> TClass testRoundTrip(TClass item) throws IOException, AssertionError {
+        return testRoundTrip(item, (Class<TClass>) item.getClass());
     }
-    
+
     /**
      * Performs roundtrip test for the specified class.
-     * @param <TClass> Item class
-     * @param item Item to be checked
-     * @param asclass Class to be used during conversions
+     * 
+     * @param <TClass>
+     *            Item class
+     * @param item
+     *            Item to be checked
+     * @param asclass
+     *            Class to be used during conversions
      * @return Deserialized object after the roundtrip
-     * @throws IOException JSON Conversion error
-     * @throws AssertionError Validation error
+     * @throws IOException
+     *             JSON Conversion error
+     * @throws AssertionError
+     *             Validation error
      */
-    public static <TClass> TClass testRoundTrip(TClass item, Class<TClass> asclass) 
-            throws IOException, AssertionError {
+    public static <TClass> TClass testRoundTrip(TClass item, Class<TClass> asclass) throws IOException, AssertionError {
         ObjectMapper mapper = new ObjectMapper();
-       
+
         String serialized1 = mapper.writeValueAsString(item);
         JsonNode json1 = mapper.readTree(serialized1);
         TClass deserialized1 = mapper.readValue(serialized1, asclass);
         String serialized2 = mapper.writeValueAsString(deserialized1);
         JsonNode json2 = mapper.readTree(serialized2);
         TClass deserialized2 = mapper.readValue(serialized2, asclass);
-        
+
         assertEquals(json2, json1, "JSONs must be equal after the second roundtrip");
         return deserialized2;
     }

From 022a2a6df1eb90d88a51cfe462a8a5dcff0cac9d Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 26 Jun 2015 21:39:24 +0200
Subject: [PATCH 0112/1272] Merge from master

---
 .../dockerjava/api/command/AttachContainerCmd.java       | 2 +-
 .../github/dockerjava/api/command/LogContainerCmd.java   | 9 ++++++++-
 .../com/github/dockerjava/core/command/FrameReader.java  | 3 ---
 .../java/com/github/dockerjava/jaxrs/EventsCmdExec.java  | 1 -
 .../com/github/dockerjava/jaxrs/LogContainerCmdExec.java | 1 -
 .../jaxrs/util/WrappedResponseInputStream.java           | 2 +-
 .../core/command/AttachContainerCmdImplTest.java         | 2 +-
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
index c414947fe..3261be28c 100644
--- a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
@@ -75,4 +75,4 @@ public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, F
     public static interface Exec extends DockerCmdExec<AttachContainerCmd, Void> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
index 48a3b8976..43d6466d8 100644
--- a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -20,9 +20,16 @@
  *            - true or false, if true, print timestamps for every log line. Defaults to false.
  * @param tail
  *            - `all` or `<number>`, Output specified number of lines at the end of logs
+<<<<<<< HEAD
  *
  *            Consider wrapping any input stream you get with a frame reader to make reading frame easier.
  *
+=======
+ *
+ *            Consider wrapping any input stream you get with a frame reader to make reading frame easier.
+ *
+ * @see com.github.dockerjava.core.command.FrameReader
+>>>>>>> refs/heads/master
  */
 public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame, Void> {
 
@@ -80,4 +87,4 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame,
     public static interface Exec extends DockerCmdExec<LogContainerCmd, Void> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
index 3f8aad9e8..d8f0cd7f6 100644
--- a/src/main/java/com/github/dockerjava/core/command/FrameReader.java
+++ b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
@@ -4,8 +4,6 @@
 import java.io.InputStream;
 import java.util.Arrays;
 
-import org.apache.commons.io.HexDump;
-
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.StreamType;
 
@@ -75,7 +73,6 @@ public Frame readFrame() throws IOException {
             return new Frame(streamType(buffer[0]), payload);
 
         }
-
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
index 69578a533..115c7c3d3 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -7,7 +7,6 @@
 
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.model.Event;
-import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.core.async.JsonStreamProcessor;
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
index 83a20bce1..e50ef610a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
@@ -8,7 +8,6 @@
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.core.async.FrameStreamProcessor;
-import com.github.dockerjava.core.async.JsonStreamProcessor;
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java b/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
index b782667fe..fe4514273 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
@@ -9,7 +9,7 @@
  * This is a wrapper around {@link Response} that acts as a {@link InputStream}. When this
  * {@link WrappedResponseInputStream} is closed it closes the underlying {@link Response} object also to prevent
  * blocking/hanging connections.
- * 
+ *
  * @author marcus
  */
 public class WrappedResponseInputStream extends InputStream {
diff --git a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
index 3a1c70c8f..fa5ec44ae 100644
--- a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
@@ -78,7 +78,7 @@ public void onNext(Frame frame) {
 
         collectFramesCallback.close();
 
-        assertThat(collectFramesCallback.toString(), endsWith(snippet));
+        assertThat(collectFramesCallback.toString(), containsString(snippet));
     }
 
     @Test

From 1407b7f4e1d69c8c8c0fbf8a43afee062068812e Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 3 Jul 2015 19:55:03 +0200
Subject: [PATCH 0113/1272] Add eclipse formatting rules

---
 etc/code-style.epf | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 etc/code-style.epf

diff --git a/etc/code-style.epf b/etc/code-style.epf
new file mode 100644
index 000000000..abd8a9364
--- /dev/null
+++ b/etc/code-style.epf
@@ -0,0 +1,23 @@
+#Mon Jun 29 09:34:24 CEST 2015
+/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.overrideannotation=true
+/instance/org.eclipse.jdt.ui/formatter_settings_version=12
+/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.formatterprofiles.version=12
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">\t\t\t\n\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*\n * Created on ${date}\n */\n${package_declaration}\n\n/**\n * &lt;TODO\: class description&gt;\n *\n * @author ${user}\n *\n */\n${type_declaration}</template></templates>
+\!/=
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.localSuffixes=
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.localPrefixes=
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.gettersetter.use.is=true
+/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.exception.name=e
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.formatterprofiles=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\n<profiles version\="12">\n<profile kind\="CodeFormatterProfile" name\="na" version\="12">\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value\="1"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.indentation.size" value\="4"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.disabling_tag" value\="@formatter\:off"/>\n<setting id\="org.eclipse.jdt.core.formatter.continuation_indentation" value\="2"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value\="0"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value\="1"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_after_package" value\="1"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.enabling_tag" value\="@formatter\:on"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value\="1"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value\="false"/>\n<setting id\="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value\="error"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.line_length" value\="120"/>\n<setting id\="org.eclipse.jdt.core.formatter.use_on_off_tags" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value\="0"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_block" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.compact_else_if" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value\="16"/>\n<setting id\="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value\="error"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value\="1"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.format_line_comments" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_assignment" value\="0"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value\="0"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value\="80"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.format_header" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value\="enabled"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value\="0"/>\n<setting id\="org.eclipse.jdt.core.formatter.join_wrapped_lines" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value\="80"/>\n<setting id\="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value\="false"/>\n<setting id\="org.eclipse.jdt.core.compiler.source" value\="1.8"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.tabulation.size" value\="4"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.format_source_code" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_before_field" value\="1"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value\="2"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_before_method" value\="1"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value\="1.8"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_switch" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.format_html" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.indent_empty_lines" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value\="0"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value\="1"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value\="1"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.format_block_comments" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.compiler.compliance" value\="1.8"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_before_package" value\="0"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.join_lines_in_comments" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.tabulation.char" value\="space"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value\="1"/>\n<setting id\="org.eclipse.jdt.core.formatter.lineSplit" value\="120"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value\="insert"/>\n</profile>\n</profiles>\n
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+@org.eclipse.jdt.ui=3.9.50.v20140317-1811
+/instance/org.eclipse.jdt.ui/formatter_profile=_na
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+file_export_version=3.0
+@org.eclipse.jdt.core=3.9.50.xx-201502282108-e43j8

From 74a0048979c7f4c5d4a94062edd548c3a170770f Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 3 Jul 2015 19:56:15 +0200
Subject: [PATCH 0114/1272] Increment minor version according to semver

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ee80a9c9e..30ece10af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>1.3.1-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>

From bcd08a4f4f21dbf166e4539e105de1990cb1cb4a Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Mon, 6 Jul 2015 20:03:14 +0200
Subject: [PATCH 0115/1272] [maven-release-plugin] prepare release
 docker-java-1.4.0

---
 pom.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 30ece10af..7abbe23e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -11,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>1.4.0-SNAPSHOT</version>
+	<version>1.4.0</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -29,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>docker-java-1.4.0</tag>
 	</scm>
 
 	<developers>

From 809b1adee8761c1f87e2d8c571ab653608a77efa Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Mon, 6 Jul 2015 20:03:18 +0200
Subject: [PATCH 0116/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7abbe23e0..7618263ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>1.4.0</version>
+	<version>1.4.1-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>docker-java-1.4.0</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 2d3174528c59d2ebe2255fc3596fc1d1adac2cdb Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <carlos@apache.org>
Date: Mon, 6 Jul 2015 20:11:45 +0200
Subject: [PATCH 0117/1272] Add labels to create and inspect container

---
 .../api/command/CreateContainerCmd.java       |  9 ++++++++
 .../dockerjava/api/model/ContainerConfig.java |  7 ++++++
 .../core/command/CreateContainerCmdImpl.java  | 18 +++++++++++++++
 .../command/CreateContainerCmdImplTest.java   | 22 +++++++++++++++++++
 4 files changed, 56 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 3b558b6d9..3e31321ee 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.api.command;
 
+import java.util.Map;
+
 import com.github.dockerjava.api.ConflictException;
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.model.Bind;
@@ -173,6 +175,8 @@ public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateCon
 
     public CreateContainerCmd withImage(String image);
 
+    public CreateContainerCmd withLabels(Map<String, String> labels);
+
     /**
      * Add link to another container.
      */
@@ -238,4 +242,9 @@ public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateCon
 
     public CreateContainerCmd withMacAddress(String macAddress);
 
+    /**
+     * @return
+     */
+    Map<String, String> getLabels();
+
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
index 8ea673a36..0478e5ef0 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
@@ -51,6 +51,9 @@ public class ContainerConfig {
     @JsonProperty("Image")
     private String image;
 
+    @JsonProperty("Labels")
+    private Map<String, String> labels;
+
     @JsonProperty("MacAddress")
     private String macAddress;
 
@@ -184,6 +187,10 @@ public String[] getOnBuild() {
         return onBuild;
     }
 
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index cc082b61f..3caf3c1bc 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -2,6 +2,8 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.util.Map;
+
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -107,6 +109,9 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     @JsonProperty("HostConfig")
     private HostConfig hostConfig = new HostConfig();
 
+    @JsonProperty("Labels")
+    private Map<String, String> labels;
+
     public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, String image) {
         super(exec);
         checkNotNull(image, "image was not specified");
@@ -221,6 +226,12 @@ public Link[] getLinks() {
         return hostConfig.getLinks();
     }
 
+    @Override
+    @JsonIgnore
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
     @Override
     @JsonIgnore
     public LxcConf[] getLxcConf() {
@@ -471,6 +482,13 @@ public CreateContainerCmdImpl withImage(String image) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmdImpl withLabels(Map<String, String> labels) {
+        checkNotNull(labels, "labels was not specified");
+        this.labels = labels;
+        return this;
+    }
+
     @Override
     public CreateContainerCmdImpl withLinks(Link... links) {
         checkNotNull(links, "links was not specified");
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index a33cfddfe..efeed530a 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -13,6 +13,8 @@
 import java.lang.reflect.Method;
 import java.security.SecureRandom;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.UUID;
 
 import static com.github.dockerjava.api.model.Capability.MKNOD;
@@ -490,4 +492,24 @@ public void createContainerWithULimits() throws DockerException {
 
     }
 
+    @Test
+    public void createContainerWithLabels() throws DockerException {
+
+        Map<String, String> labels = new HashMap<String, String>();
+        labels.put("com.github.dockerjava.null", null);
+        labels.put("com.github.dockerjava.boolean", "true");
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withLabels(labels).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        // null becomes empty string
+        labels.put("com.github.dockerjava.null", "");
+        assertThat(inspectContainerResponse.getConfig().getLabels(), is(equalTo(labels)));
+    }
 }

From 9419799ebc60650684e93aa47fe845a8d0917167 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 7 Jul 2015 08:15:15 +0200
Subject: [PATCH 0118/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b76a052d8..506a18250 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,11 @@
 Change Log
 ===
+
 Latest SNAPSHOT
 ---
+
+v.1.4.0
+---
 * [#248](https://github.com/docker-java/docker-java/pull/233) Removed deprecated start options
 * [#247](https://github.com/docker-java/docker-java/pull/247) Add Domainname attribute on create command
 * [#245](https://github.com/docker-java/docker-java/pull/245) Added ReadonlyRootfs option

From 8f3de2109103f665b59cd663c2f290e4491dce4b Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 7 Jul 2015 08:15:47 +0200
Subject: [PATCH 0119/1272] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a4c18a0ce..52d791923 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ Run build without integration tests:
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>1.3.0</version>
+          <version>1.4.0</version>
     </dependency>
 
 ### Latest SNAPSHOT version
@@ -74,7 +74,7 @@ You can find the latest SNAPSHOT version including javadoc and source files on [
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>1.3.1-SNAPSHOT</version>
+          <version>1.4.1-SNAPSHOT</version>
     </dependency>
 
 ## Documentation

From 4725809a72ab5c95a44888085193caa420e8c33a Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <carlos@apache.org>
Date: Tue, 7 Jul 2015 12:09:49 +0200
Subject: [PATCH 0120/1272] Add filters option to list containers

---
 .../api/command/ListContainersCmd.java        |  5 ++
 .../github/dockerjava/api/model/Filters.java  | 90 +++++++++++++++++++
 .../core/command/ListContainersCmdImpl.java   | 20 ++++-
 .../jaxrs/ListContainersCmdExec.java          |  7 ++
 .../command/ListContainersCmdImplTest.java    | 22 ++++-
 5 files changed, 139 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/Filters.java

diff --git a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
index 6d641f2e3..c2a116bed 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
@@ -3,6 +3,7 @@
 import java.util.List;
 
 import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.api.model.Filters;
 
 /**
  * List containers
@@ -31,6 +32,8 @@ public interface ListContainersCmd extends DockerCmd<List<Container>> {
 
     public String getBeforeId();
 
+    public Filters getFilters();
+
     public ListContainersCmd withShowAll(boolean showAll);
 
     public ListContainersCmd withShowSize(boolean showSize);
@@ -41,6 +44,8 @@ public interface ListContainersCmd extends DockerCmd<List<Container>> {
 
     public ListContainersCmd withBefore(String before);
 
+    public ListContainersCmd withFilters(Filters filters);
+
     public static interface Exec extends DockerCmdExec<ListContainersCmd, List<Container>> {
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Filters.java b/src/main/java/com/github/dockerjava/api/model/Filters.java
new file mode 100644
index 000000000..4555acdbf
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/Filters.java
@@ -0,0 +1,90 @@
+package com.github.dockerjava.api.model;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.ws.rs.core.MediaType;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
+
+/**
+ * Representation of Docker filters.
+ *
+ * @author Carlos Sanchez <carlos@apache.org>
+ *
+ */
+public class Filters {
+
+    private static ObjectMapper OBJECT_MAPPER = new JacksonJaxbJsonProvider().locateMapper(Map.class,
+            MediaType.APPLICATION_JSON_TYPE);
+
+    private Map<String, String[]> filters = new HashMap<String, String[]>();
+
+    public Filters() {
+    }
+
+    /**
+     * Constructor.
+     * 
+     * @param image
+     *            image to filter
+     * @param container
+     *            container to filter
+     */
+    public Filters(String image, String container) {
+        withImage(image);
+        withContainer(container);
+    }
+
+    public Filters withFilter(String key, String... value) {
+        filters.put(key, value);
+        return this;
+    }
+
+    public String[] getFilter(String key) {
+        return filters.get(key);
+    }
+
+    public Filters withImage(String... image) {
+        filters.put("image", image);
+        return this;
+    }
+
+    public String[] getImage() {
+        return getFilter("image");
+    }
+
+    public Filters withContainer(String... container) {
+        filters.put("container", container);
+        return this;
+    }
+
+    public String[] getContainer() {
+        return getFilter("container");
+    }
+
+    public Filters withLabel(String label) {
+        return withLabel(label, (String[]) null);
+    }
+
+    public Filters withLabel(String label, String... value) {
+        if (value != null) {
+            filters.put(label, value);
+        } else {
+            filters.put("label", new String[] { label });
+        }
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        try {
+            return OBJECT_MAPPER.writeValueAsString(filters);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
index 13bb02cfb..f810798cf 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
@@ -1,12 +1,12 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.*;
 
 import java.util.List;
 
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.api.model.Filters;
 
 /**
  * List containers
@@ -32,6 +32,8 @@ public class ListContainersCmdImpl extends AbstrDockerCmd<ListContainersCmd, Lis
 
     private String sinceId, beforeId;
 
+    private Filters filters;
+
     public ListContainersCmdImpl(ListContainersCmd.Exec exec) {
         super(exec);
     }
@@ -61,6 +63,11 @@ public String getBeforeId() {
         return beforeId;
     }
 
+    @Override
+    public Filters getFilters() {
+        return filters;
+    }
+
     @Override
     public ListContainersCmd withShowAll(boolean showAll) {
         this.showAll = showAll;
@@ -94,11 +101,18 @@ public ListContainersCmd withBefore(String before) {
         return this;
     }
 
+    @Override
+    public ListContainersCmd withFilters(Filters filters) {
+        checkNotNull(filters, "filters was not specified");
+        this.filters = filters;
+        return this;
+    }
+
     @Override
     public String toString() {
         return new StringBuilder("ps ").append(showAll ? "--all=true" : "").append(showSize ? "--size=true" : "")
                 .append(sinceId != null ? "--since " + sinceId : "")
                 .append(beforeId != null ? "--before " + beforeId : "").append(limit != -1 ? "-n " + limit : "")
-                .toString();
+                .append(filters != null ? "--filters " + filters : "").toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
index 5bb905b56..5feb5bdac 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.jaxrs;
 
+import static com.google.common.net.UrlEscapers.*;
+
 import java.util.List;
 
 import javax.ws.rs.client.WebTarget;
@@ -32,6 +34,11 @@ protected List<Container> execute(ListContainersCmd command) {
             webResource = webResource.queryParam("limit", String.valueOf(command.getLimit()));
         }
 
+        if (command.getFilters() != null) {
+            webResource = webResource.queryParam("filters",
+                    urlPathSegmentEscaper().escape(command.getFilters().toString()));
+        }
+
         LOGGER.trace("GET: {}", webResource);
         List<Container> containers = webResource.request().accept(MediaType.APPLICATION_JSON)
                 .get(new GenericType<List<Container>>() {
diff --git a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
index b074409bd..f99abaa94 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
@@ -26,7 +26,9 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.api.model.Filters;
 import com.github.dockerjava.client.AbstractDockerClientTest;
+import com.google.common.collect.ImmutableMap;
 
 @Test(groups = "integration")
 public class ListContainersCmdImplTest extends AbstractDockerClientTest {
@@ -65,7 +67,8 @@ public void testListContainers() throws DockerException {
 
         int size = containers.size();
 
-        CreateContainerResponse container1 = dockerClient.createContainerCmd(testImage).withCmd("echo").exec();
+        CreateContainerResponse container1 = dockerClient.createContainerCmd(testImage).withCmd("echo")
+                .withLabels(ImmutableMap.of("test", "docker-java")).exec();
 
         assertThat(container1.getId(), not(isEmptyString()));
 
@@ -96,7 +99,22 @@ public void testListContainers() throws DockerException {
 
         Container container2 = filteredContainers.get(0);
         assertThat(container2.getCommand(), not(isEmptyString()));
-        assertThat(container2.getImage(), startsWith(testImage + ":"));
+        assertThat(container2.getImage(), startsWith(testImage));
+
+        // list with filter by label
+        filteredContainers = dockerClient.listContainersCmd().withShowAll(true)
+                .withFilters(new Filters().withLabel("test", "docker-java")).exec();
+        assertThat(filteredContainers.size(), is(equalTo(1)));
+        Container container3 = filteredContainers.get(0);
+        assertThat(container3.getCommand(), not(isEmptyString()));
+        assertThat(container3.getImage(), startsWith(testImage));
+
+        filteredContainers = dockerClient.listContainersCmd().withShowAll(true)
+                .withFilters(new Filters().withLabel("test")).exec();
+        assertThat(filteredContainers.size(), is(equalTo(1)));
+        container3 = filteredContainers.get(0);
+        assertThat(container3.getCommand(), not(isEmptyString()));
+        assertThat(container3.getImage(), startsWith(testImage));
     }
 
 }

From 89a2c04484e8103c903eeed7658fad533f7259e9 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 7 Jul 2015 21:45:28 +0200
Subject: [PATCH 0121/1272] Temporarily disabled test

---
 .../com/github/dockerjava/core/command/AuthCmdImplTest.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
index 3c60cada2..ba8c1dacb 100644
--- a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
@@ -40,7 +40,8 @@ public void testAuth() throws Exception {
         assertEquals(response.getStatus(), "Login Succeeded");
     }
 
-    @Test
+    // Disabled because of 500/InternalServerException
+    @Test(enabled=false)
     public void testAuthInvalid() throws Exception {
 
         try {

From 6f54ec40a750d40432db40ae79e9bfb5e13c754c Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 7 Jul 2015 21:55:37 +0200
Subject: [PATCH 0122/1272] Make callback template abstract

---
 .../github/dockerjava/core/async/ResultCallbackTemplate.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index d9a408c35..50cc1fd91 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -11,12 +11,12 @@
 import com.github.dockerjava.api.async.ResultCallback;
 
 /**
- * Template implementation of {@link ResultCallback}
+ * Abstract template implementation of {@link ResultCallback}
  *
  * @author marcus
  *
  */
-public class ResultCallbackTemplate<T> implements ResultCallback<T> {
+public abstract class ResultCallbackTemplate<T> implements ResultCallback<T> {
 
     private final CountDownLatch finished = new CountDownLatch(1);
 

From 734b58f0f49261ed325857cefd187bf48bd35bd5 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 7 Jul 2015 22:58:18 +0200
Subject: [PATCH 0123/1272] Fix FrameReader

---
 .../dockerjava/core/command/FrameReader.java  | 65 ++++++++++++-------
 .../command/AttachContainerCmdImplTest.java   |  4 +-
 2 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
index d8f0cd7f6..a6db922db 100644
--- a/src/main/java/com/github/dockerjava/core/command/FrameReader.java
+++ b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
@@ -14,13 +14,13 @@
  */
 public class FrameReader implements AutoCloseable {
 
-    private static final int BUFFER_SIZE = 100;
-
     private static final int HEADER_SIZE = 8;
 
     private final InputStream inputStream;
 
-    private boolean rawDetected = false;
+    private boolean rawStreamDetected = false;
+
+    private final byte[] rawBuffer = new byte[1000];
 
     public FrameReader(InputStream inputStream) {
         this.inputStream = inputStream;
@@ -35,7 +35,7 @@ private static StreamType streamType(byte streamType) {
         case 2:
             return StreamType.STDERR;
         default:
-            throw new IllegalArgumentException("invalid streamType");
+            return StreamType.RAW;
         }
     }
 
@@ -44,34 +44,55 @@ private static StreamType streamType(byte streamType) {
      */
     public Frame readFrame() throws IOException {
 
-        byte[] buffer = new byte[BUFFER_SIZE];
+        if (rawStreamDetected) {
 
-        int readBytes = inputStream.read(buffer);
 
-        if (readBytes == -1) {
-            return null;
-        }
+            int read = inputStream.read(rawBuffer);
 
-        if (rawDetected || readBytes != HEADER_SIZE) {
-            rawDetected = true;
+            return new Frame(StreamType.RAW, Arrays.copyOf(rawBuffer, read));
 
-            byte[] read = Arrays.copyOfRange(buffer, 0, readBytes);
-
-            return new Frame(StreamType.RAW, read);
         } else {
 
-            int payloadSize = ((buffer[4] & 0xff) << 24) + ((buffer[5] & 0xff) << 16) + ((buffer[6] & 0xff) << 8)
-                    + (buffer[7] & 0xff);
+            byte[] header = new byte[HEADER_SIZE];
 
-            byte[] payload = new byte[payloadSize];
-            int actualPayloadSize = inputStream.read(payload);
-            if (actualPayloadSize != payloadSize) {
-                throw new IOException(String.format("payload must be %d bytes long, but was %d", payloadSize,
-                        actualPayloadSize));
+            int actualHeaderSize = 0;
+
+            do {
+                int headerCount = inputStream.read(header, actualHeaderSize, HEADER_SIZE - actualHeaderSize);
+
+                if (headerCount == -1) {
+                    return null;
+                }
+                actualHeaderSize += headerCount;
+            } while (actualHeaderSize < HEADER_SIZE);
+
+            StreamType streamType = streamType(header[0]);
+
+            if(streamType.equals(StreamType.RAW)) {
+                rawStreamDetected = true;
+                return new Frame(StreamType.RAW, Arrays.copyOf(header, HEADER_SIZE));
             }
 
-            return new Frame(streamType(buffer[0]), payload);
+            int payloadSize = ((header[4] & 0xff) << 24) + ((header[5] & 0xff) << 16) + ((header[6] & 0xff) << 8)
+                    + (header[7] & 0xff);
 
+            byte[] payload = new byte[payloadSize];
+            int actualPayloadSize = 0;
+
+            do {
+                int count = inputStream.read(payload, actualPayloadSize, payloadSize - actualPayloadSize);
+
+                if (count == -1) {
+                    if (actualPayloadSize != payloadSize) {
+                        throw new IOException(String.format("payload must be %d bytes long, but was %d", payloadSize,
+                                actualPayloadSize));
+                    }
+                    break;
+                }
+                actualPayloadSize += count;
+            } while (actualPayloadSize < payloadSize);
+
+            return new Frame(streamType, payload);
         }
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
index fa5ec44ae..9c5c5c691 100644
--- a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
@@ -2,10 +2,8 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.containsString;
 
 import java.io.File;
 import java.io.InputStream;
@@ -66,7 +64,7 @@ public void attachContainerWithoutTTY() throws Exception {
         CollectFramesCallback collectFramesCallback = new CollectFramesCallback() {
             @Override
             public void onNext(Frame frame) {
-                assertEquals(frame.getStreamType(), StreamType.RAW);
+                assertEquals(frame.getStreamType(), StreamType.STDOUT);
                 super.onNext(frame);
             };
         };

From b23d858dca7faf1a8b0d4eb838f369cf8f2607b2 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 7 Jul 2015 23:17:20 +0200
Subject: [PATCH 0124/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 506a18250..ab3c373e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ Change Log
 Latest SNAPSHOT
 ---
 
+* [#263](https://github.com/docker-java/docker-java/pull/263) Refactoring of streaming commands APIs (event, stats, log, attach)
+* [#260](https://github.com/docker-java/docker-java/pull/260) Add labels to create and inspect container
+
 v.1.4.0
 ---
 * [#248](https://github.com/docker-java/docker-java/pull/233) Removed deprecated start options

From 299fa5e4e825a0abff8ddc32707c46f7cb11a7be Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 7 Jul 2015 23:23:17 +0200
Subject: [PATCH 0125/1272] Added comment about Event node

---
 .../java/com/github/dockerjava/api/model/Event.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/Event.java b/src/main/java/com/github/dockerjava/api/model/Event.java
index c4050e93f..14637d6e7 100644
--- a/src/main/java/com/github/dockerjava/api/model/Event.java
+++ b/src/main/java/com/github/dockerjava/api/model/Event.java
@@ -27,7 +27,7 @@ public Event() {
 
     /**
      * Constructor.
-     * 
+     *
      * @param id
      *            Container ID
      * @param status
@@ -51,7 +51,7 @@ public Event(String status, String id, String from, long time) {
      * Status of docker image or container. List of statuses is available in <a
      * href="https://docs.docker.com/reference/api/docker_remote_api_v1.16/#monitor-dockers-events">Docker API
      * v.1.16</a>
-     * 
+     *
      * @return Status string
      */
     public String getStatus() {
@@ -60,7 +60,7 @@ public String getStatus() {
 
     /**
      * Get ID of docker container.
-     * 
+     *
      * @return Container ID
      */
     public String getId() {
@@ -69,7 +69,7 @@ public String getId() {
 
     /**
      * Get source image of the container.
-     * 
+     *
      * @return Name of the parent container
      */
     public String getFrom() {
@@ -78,13 +78,16 @@ public String getFrom() {
 
     /**
      * Get the event time. The time is specified in milliseconds since January 1, 1970, 00:00:00 GMT
-     * 
+     *
      * @return Event time in the specified format.
      */
     public long getTime() {
         return time;
     }
 
+    /**
+     * Returns the node when working against docker swarm
+     */
     public Node getNode() {
         return node;
     }

From 9366a9d9c7b1cf19a986e94c980595fe84773dc5 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 7 Jul 2015 23:30:39 +0200
Subject: [PATCH 0126/1272] Ignore test in CircleCI

---
 .../dockerjava/core/command/CreateContainerCmdImplTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 09d184061..9876e43d5 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -490,7 +490,7 @@ public void createContainerWithULimits() throws DockerException {
 
     }
 
-    @Test
+    @Test(groups = "ignoreInCircleCi")
     public void createContainerWithLabels() throws DockerException {
 
         Map<String, String> labels = new HashMap<String, String>();

From 769f176777d878b7872f715da73bce1eef75f157 Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <carlos@apache.org>
Date: Fri, 10 Jul 2015 11:36:30 +0200
Subject: [PATCH 0127/1272] Filtering by labels always needs the "label" key

---
 .../github/dockerjava/api/model/Filters.java  | 36 +++++++++----------
 .../core/command/ListContainersCmdImpl.java   |  6 ++--
 .../command/ListContainersCmdImplTest.java    |  7 ++--
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/Filters.java b/src/main/java/com/github/dockerjava/api/model/Filters.java
index 4555acdbf..a226c60c2 100644
--- a/src/main/java/com/github/dockerjava/api/model/Filters.java
+++ b/src/main/java/com/github/dockerjava/api/model/Filters.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.model;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -21,7 +22,7 @@ public class Filters {
     private static ObjectMapper OBJECT_MAPPER = new JacksonJaxbJsonProvider().locateMapper(Map.class,
             MediaType.APPLICATION_JSON_TYPE);
 
-    private Map<String, String[]> filters = new HashMap<String, String[]>();
+    private Map<String, List<String>> filters = new HashMap<String, List<String>>();
 
     public Filters() {
     }
@@ -40,42 +41,41 @@ public Filters(String image, String container) {
     }
 
     public Filters withFilter(String key, String... value) {
-        filters.put(key, value);
+        filters.put(key, Arrays.asList(value));
         return this;
     }
 
-    public String[] getFilter(String key) {
+    public List<String> getFilter(String key) {
         return filters.get(key);
     }
 
     public Filters withImage(String... image) {
-        filters.put("image", image);
+        filters.put("image", Arrays.asList(image));
         return this;
     }
 
-    public String[] getImage() {
+    public List<String> getImage() {
         return getFilter("image");
     }
 
     public Filters withContainer(String... container) {
-        filters.put("container", container);
+        filters.put("container", Arrays.asList(container));
         return this;
     }
 
-    public String[] getContainer() {
+    public List<String> getContainer() {
         return getFilter("container");
     }
 
-    public Filters withLabel(String label) {
-        return withLabel(label, (String[]) null);
-    }
-
-    public Filters withLabel(String label, String... value) {
-        if (value != null) {
-            filters.put(label, value);
-        } else {
-            filters.put("label", new String[] { label });
-        }
+    /**
+     * Filter by labels
+     * 
+     * @param labels
+     *            string array in the form ["key"] or ["key=value"] or a mix of both
+     * @return
+     */
+    public Filters withLabel(String... labels) {
+        filters.put("label", Arrays.asList(labels));
         return this;
     }
 
@@ -87,4 +87,4 @@ public String toString() {
             throw new RuntimeException(e);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
index f810798cf..b957a3bd6 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
@@ -111,8 +111,8 @@ public ListContainersCmd withFilters(Filters filters) {
     @Override
     public String toString() {
         return new StringBuilder("ps ").append(showAll ? "--all=true" : "").append(showSize ? "--size=true" : "")
-                .append(sinceId != null ? "--since " + sinceId : "")
-                .append(beforeId != null ? "--before " + beforeId : "").append(limit != -1 ? "-n " + limit : "")
-                .append(filters != null ? "--filters " + filters : "").toString();
+                .append(sinceId != null ? " --since " + sinceId : "")
+                .append(beforeId != null ? " --before " + beforeId : "").append(limit != -1 ? "-n " + limit : "")
+                .append(filters != null ? " --filters " + filters : "").toString();
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
index f99abaa94..da049488b 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
@@ -67,8 +67,7 @@ public void testListContainers() throws DockerException {
 
         int size = containers.size();
 
-        CreateContainerResponse container1 = dockerClient.createContainerCmd(testImage).withCmd("echo")
-                .withLabels(ImmutableMap.of("test", "docker-java")).exec();
+        CreateContainerResponse container1 = dockerClient.createContainerCmd(testImage).withCmd("echo").exec();
 
         assertThat(container1.getId(), not(isEmptyString()));
 
@@ -102,8 +101,10 @@ public void testListContainers() throws DockerException {
         assertThat(container2.getImage(), startsWith(testImage));
 
         // list with filter by label
+        dockerClient.createContainerCmd(testImage).withCmd("echo").withLabels(ImmutableMap.of("test", "docker-java"))
+                .exec();
         filteredContainers = dockerClient.listContainersCmd().withShowAll(true)
-                .withFilters(new Filters().withLabel("test", "docker-java")).exec();
+                .withFilters(new Filters().withLabel("test=docker-java")).exec();
         assertThat(filteredContainers.size(), is(equalTo(1)));
         Container container3 = filteredContainers.get(0);
         assertThat(container3.getCommand(), not(isEmptyString()));

From d2b618ba96463ae1f51ef23fa0130e8f06ad6322 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sat, 11 Jul 2015 10:47:34 +0200
Subject: [PATCH 0128/1272] Add labels to list container command result

---
 .../dockerjava/api/model/Container.java       |  9 +++
 .../github/dockerjava/api/model/Filters.java  | 54 ++++++++++-------
 .../command/ListContainersCmdImplTest.java    | 60 +++++++++++++++++--
 3 files changed, 99 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/Container.java b/src/main/java/com/github/dockerjava/api/model/Container.java
index 6a97e20b9..8152974e3 100644
--- a/src/main/java/com/github/dockerjava/api/model/Container.java
+++ b/src/main/java/com/github/dockerjava/api/model/Container.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.api.model;
 
+import java.util.Map;
+
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -31,6 +33,9 @@ public class Container {
     @JsonProperty("Ports")
     public Port[] ports;
 
+    @JsonProperty("Labels")
+    public Map<String, String> labels;
+
     @JsonProperty("Status")
     private String status;
 
@@ -58,6 +63,10 @@ public Port[] getPorts() {
         return ports;
     }
 
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
     public String[] getNames() {
         return names;
     }
diff --git a/src/main/java/com/github/dockerjava/api/model/Filters.java b/src/main/java/com/github/dockerjava/api/model/Filters.java
index a226c60c2..6e29491c3 100644
--- a/src/main/java/com/github/dockerjava/api/model/Filters.java
+++ b/src/main/java/com/github/dockerjava/api/model/Filters.java
@@ -1,9 +1,11 @@
 package com.github.dockerjava.api.model;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import javax.ws.rs.core.MediaType;
 
@@ -27,19 +29,6 @@ public class Filters {
     public Filters() {
     }
 
-    /**
-     * Constructor.
-     * 
-     * @param image
-     *            image to filter
-     * @param container
-     *            container to filter
-     */
-    public Filters(String image, String container) {
-        withImage(image);
-        withContainer(container);
-    }
-
     public Filters withFilter(String key, String... value) {
         filters.put(key, Arrays.asList(value));
         return this;
@@ -49,8 +38,8 @@ public List<String> getFilter(String key) {
         return filters.get(key);
     }
 
-    public Filters withImage(String... image) {
-        filters.put("image", Arrays.asList(image));
+    public Filters withImages(String... image) {
+        withFilter("image", image);
         return this;
     }
 
@@ -58,8 +47,8 @@ public List<String> getImage() {
         return getFilter("image");
     }
 
-    public Filters withContainer(String... container) {
-        filters.put("container", Arrays.asList(container));
+    public Filters withContainers(String... container) {
+        withFilter("container", container);
         return this;
     }
 
@@ -69,16 +58,41 @@ public List<String> getContainer() {
 
     /**
      * Filter by labels
-     * 
+     *
      * @param labels
      *            string array in the form ["key"] or ["key=value"] or a mix of both
      * @return
      */
-    public Filters withLabel(String... labels) {
-        filters.put("label", Arrays.asList(labels));
+    public Filters withLabels(String... labels) {
+        withFilter("label", labels);
         return this;
     }
 
+    /**
+     * Filter by labels
+     *
+     * @param labels
+     *            {@link Map} of labels that contains label keys and values
+     * @return
+     */
+    public Filters withLabels(Map<String, String> labels) {
+        withFilter("label", labelsMapToList(labels).toArray(new String[labels.size()]));
+        return this;
+    }
+
+    private static List<String> labelsMapToList(Map<String, String> labels) {
+        List<String> result = new ArrayList<String>();
+        for (Entry<String, String> entry : labels.entrySet()) {
+            String rest = (entry.getValue() != null & !entry.getValue().isEmpty()) ? "=" + entry.getValue()
+                    : "";
+
+            String label = entry.getKey() + rest;
+
+            result.add(label);
+        }
+        return result;
+    }
+
     @Override
     public String toString() {
         try {
diff --git a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
index da049488b..ae8e52b19 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
@@ -13,6 +13,7 @@
 
 import java.lang.reflect.Method;
 import java.util.List;
+import java.util.Map;
 
 import org.hamcrest.Matcher;
 import org.testng.ITestResult;
@@ -53,7 +54,6 @@ public void afterMethod(ITestResult result) {
         super.afterMethod(result);
     }
 
-    @Test
     public void testListContainers() throws DockerException {
 
         String testImage = "busybox";
@@ -99,23 +99,75 @@ public void testListContainers() throws DockerException {
         Container container2 = filteredContainers.get(0);
         assertThat(container2.getCommand(), not(isEmptyString()));
         assertThat(container2.getImage(), startsWith(testImage));
+    }
+
+    @Test
+    public void testListContainersWithLabelsFilter() throws DockerException {
+
+        String testImage = "busybox";
+
+        // need to block until image is pulled completely
+        asString(dockerClient.pullImageCmd(testImage).exec());
+
+        List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
+        assertThat(containers, notNullValue());
+        LOG.info("Container List: {}", containers);
+
+        int size = containers.size();
+
+        CreateContainerResponse container1 = dockerClient.createContainerCmd(testImage).withCmd("echo").exec();
+
+        assertThat(container1.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container1.getId()).exec();
+
+        assertThat(inspectContainerResponse.getConfig().getImage(), is(equalTo(testImage)));
+
+        dockerClient.startContainerCmd(container1.getId()).exec();
+
+        LOG.info("container id: " + container1.getId());
+
+        List<Container> containers2 = dockerClient.listContainersCmd().withShowAll(true).exec();
+
+        for (Container container : containers2) {
+            LOG.info("listContainer: id=" + container.getId() + " image=" + container.getImage());
+        }
+
+        assertThat(size + 1, is(equalTo(containers2.size())));
+        Matcher matcher = hasItem(hasField("id", startsWith(container1.getId())));
+        assertThat(containers2, matcher);
+
+        List<Container> filteredContainers = filter(hasField("id", startsWith(container1.getId())), containers2);
+        assertThat(filteredContainers.size(), is(equalTo(1)));
+
+        for (Container container : filteredContainers) {
+            LOG.info("filteredContainer: " + container);
+        }
+
+        Container container2 = filteredContainers.get(0);
+        assertThat(container2.getCommand(), not(isEmptyString()));
+        assertThat(container2.getImage(), startsWith(testImage));
+
+
+        Map<String, String> labels = ImmutableMap.of("test", "docker-java");
 
         // list with filter by label
-        dockerClient.createContainerCmd(testImage).withCmd("echo").withLabels(ImmutableMap.of("test", "docker-java"))
+        dockerClient.createContainerCmd(testImage).withCmd("echo").withLabels(labels)
                 .exec();
         filteredContainers = dockerClient.listContainersCmd().withShowAll(true)
-                .withFilters(new Filters().withLabel("test=docker-java")).exec();
+                .withFilters(new Filters().withLabels(labels)).exec();
         assertThat(filteredContainers.size(), is(equalTo(1)));
         Container container3 = filteredContainers.get(0);
         assertThat(container3.getCommand(), not(isEmptyString()));
         assertThat(container3.getImage(), startsWith(testImage));
 
         filteredContainers = dockerClient.listContainersCmd().withShowAll(true)
-                .withFilters(new Filters().withLabel("test")).exec();
+                .withFilters(new Filters().withLabels("test")).exec();
         assertThat(filteredContainers.size(), is(equalTo(1)));
         container3 = filteredContainers.get(0);
         assertThat(container3.getCommand(), not(isEmptyString()));
         assertThat(container3.getImage(), startsWith(testImage));
+        assertEquals(container3.getLabels(), labels);
     }
 
 }

From db06b33fa31f8b294f35cda4a0e43a26ac3c8b76 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sat, 11 Jul 2015 10:49:48 +0200
Subject: [PATCH 0129/1272] format sources

---
 .../com/github/dockerjava/api/model/Node.java | 40 +++++++++----------
 .../dockerjava/core/command/FrameReader.java  |  3 +-
 .../client/AbstractDockerClientTest.java      |  1 -
 .../core/command/AuthCmdImplTest.java         |  2 +-
 4 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/Node.java b/src/main/java/com/github/dockerjava/api/model/Node.java
index 4fcf04e69..4bbeeec38 100644
--- a/src/main/java/com/github/dockerjava/api/model/Node.java
+++ b/src/main/java/com/github/dockerjava/api/model/Node.java
@@ -7,31 +7,31 @@
  */
 public class Node {
 
-  @JsonProperty("Name")
-  private String name;
+    @JsonProperty("Name")
+    private String name;
 
-  @JsonProperty("Id")
-  private String id;
+    @JsonProperty("Id")
+    private String id;
 
-  @JsonProperty("Addr")
-  private String addr;
+    @JsonProperty("Addr")
+    private String addr;
 
-  @JsonProperty("Ip")
-  private String ip;
+    @JsonProperty("Ip")
+    private String ip;
 
-  public String getName() {
-    return name;
-  }
+    public String getName() {
+        return name;
+    }
 
-  public String getId() {
-    return id;
-  }
+    public String getId() {
+        return id;
+    }
 
-  public String getAddr() {
-    return addr;
-  }
+    public String getAddr() {
+        return addr;
+    }
 
-  public String getIp() {
-    return ip;
-  }
+    public String getIp() {
+        return ip;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
index a6db922db..bb5a5d17a 100644
--- a/src/main/java/com/github/dockerjava/core/command/FrameReader.java
+++ b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
@@ -46,7 +46,6 @@ public Frame readFrame() throws IOException {
 
         if (rawStreamDetected) {
 
-
             int read = inputStream.read(rawBuffer);
 
             return new Frame(StreamType.RAW, Arrays.copyOf(rawBuffer, read));
@@ -68,7 +67,7 @@ public Frame readFrame() throws IOException {
 
             StreamType streamType = streamType(header[0]);
 
-            if(streamType.equals(StreamType.RAW)) {
+            if (streamType.equals(StreamType.RAW)) {
                 rawStreamDetected = true;
                 return new Frame(StreamType.RAW, Arrays.copyOf(header, HEADER_SIZE));
             }
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index e96e5bcc6..7faca0370 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -181,7 +181,6 @@ public static void assertContainerHasVolumes(InspectContainerResponse inspectCon
         assertThat(volumes, contains(expectedVolumes));
     }
 
-
     public static class CollectFramesCallback extends ResultCallbackTemplate<Frame> {
         public final List<Frame> frames = new ArrayList<Frame>();
 
diff --git a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
index ba8c1dacb..180d835b6 100644
--- a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
@@ -41,7 +41,7 @@ public void testAuth() throws Exception {
     }
 
     // Disabled because of 500/InternalServerException
-    @Test(enabled=false)
+    @Test(enabled = false)
     public void testAuthInvalid() throws Exception {
 
         try {

From 4e9aa64c5ec34559f6dcdc13df623e5de065dfa0 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Sat, 11 Jul 2015 10:54:01 +0200
Subject: [PATCH 0130/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab3c373e4..6cfb35ea0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ Latest SNAPSHOT
 ---
 
 * [#263](https://github.com/docker-java/docker-java/pull/263) Refactoring of streaming commands APIs (event, stats, log, attach)
+* [#262](https://github.com/docker-java/docker-java/pull/262) Accept filters in list containers 
 * [#260](https://github.com/docker-java/docker-java/pull/260) Add labels to create and inspect container
 
 v.1.4.0

From f5f1b6615606542ce71e0da1f2c7c02a404a637a Mon Sep 17 00:00:00 2001
From: Tobias Gesellchen <tobias@gesellix.de>
Date: Sat, 11 Jul 2015 11:14:25 +0200
Subject: [PATCH 0131/1272] fix link to issue

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6cfb35ea0..808cae3c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ Latest SNAPSHOT
 
 v.1.4.0
 ---
-* [#248](https://github.com/docker-java/docker-java/pull/233) Removed deprecated start options
+* [#248](https://github.com/docker-java/docker-java/pull/248) Removed deprecated start options
 * [#247](https://github.com/docker-java/docker-java/pull/247) Add Domainname attribute on create command
 * [#245](https://github.com/docker-java/docker-java/pull/245) Added ReadonlyRootfs option
 * [#233](https://github.com/docker-java/docker-java/pull/233) Labels are array of Strings (fixes #232) 

From c9cdda6ab1aef31d869594775844784775bce17e Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Sat, 11 Jul 2015 14:04:53 +0200
Subject: [PATCH 0132/1272] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 52d791923..5c6c55d31 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 Java API client for [Docker](http://docs.docker.io/ "Docker")
 
-Supports a subset of the Docker Remote API [v1.18](https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.18.md), Docker Server version 1.6.x
+Supports a subset of the Docker Remote API [v1.19](https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.19.md), Docker Server version 1.7.x
 
 <b>The current implementation is based on Jersey 2.x and therefore classpath incompatible with older Jersey 1.x dependent libraries!</b>
 

From db9da85d6219f3dd31143d322d25ea5f3c45f389 Mon Sep 17 00:00:00 2001
From: Kindrat <legioner@pp-ua.org>
Date: Sat, 11 Jul 2015 22:00:55 +0300
Subject: [PATCH 0133/1272] #266 Concurrent
 DockerCmdExecFactory.getDefaultDockerCmdExecFactory fails on reload - test &
 fix

---
 .../dockerjava/core/DockerClientBuilder.java  | 34 ++++---
 .../core/DockerClientBuilderTest.java         | 93 +++++++++++++++++++
 2 files changed, 116 insertions(+), 11 deletions(-)
 create mode 100644 src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java

diff --git a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
index f906f43d5..7524679bb 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
@@ -1,15 +1,28 @@
 package com.github.dockerjava.core;
 
-import java.util.ServiceLoader;
-
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
 import com.github.dockerjava.core.DockerClientConfig.DockerClientConfigBuilder;
 
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
 public class DockerClientBuilder {
 
+    private static Class<? extends DockerCmdExecFactory> factoryClass;
     private static ServiceLoader<DockerCmdExecFactory> serviceLoader = ServiceLoader.load(DockerCmdExecFactory.class);
 
+    static {
+        serviceLoader.reload();
+        Iterator<DockerCmdExecFactory> iterator = serviceLoader.iterator();
+        if (!iterator.hasNext()) {
+           throw new RuntimeException("Fatal: Can't find any implementation of '"
+                 + DockerCmdExecFactory.class.getName() + "' in the current classpath.");
+        }
+
+        factoryClass = iterator.next().getClass();
+    }
+
     private DockerClientImpl dockerClient = null;
 
     private DockerCmdExecFactory dockerCmdExecFactory = null;
@@ -35,15 +48,14 @@ public static DockerClientBuilder getInstance(String serverUrl) {
     }
 
     public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() {
-        // clearing the cache is needed because otherwise we will get
-        // the same DockerCmdExecFactory instance each time
-        serviceLoader.reload();
-        if (!serviceLoader.iterator().hasNext()) {
-            throw new RuntimeException("Fatal: Can't find any implementation of '"
-                    + DockerCmdExecFactory.class.getName() + "' in the current classpath.");
-        }
-
-        return serviceLoader.iterator().next();
+       try
+       {
+          return factoryClass.newInstance();
+       }
+       catch (InstantiationException | IllegalAccessException e)
+       {
+          throw new RuntimeException("Fatal: Can't create new instance of '" + factoryClass.getName() + "'");
+       }
     }
 
     public DockerClientBuilder withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) {
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java b/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
new file mode 100644
index 000000000..9b23e3b62
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
@@ -0,0 +1,93 @@
+package com.github.dockerjava.core;
+
+import com.github.dockerjava.api.command.DockerCmdExecFactory;
+import org.testng.annotations.Test;
+
+import java.util.*;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+
+public class DockerClientBuilderTest
+{
+   // Amount of instances created in test
+   private static final int AMOUNT = 100;
+
+   @Test
+   public void testConcurrentClientBuilding() throws Exception
+   {
+      // we use it to check instance uniqueness
+      final Set<DockerCmdExecFactory> instances = Collections.synchronizedSet(new HashSet<DockerCmdExecFactory>());
+
+      Runnable runnable = new Runnable()
+      {
+         @Override
+         public void run()
+         {
+            DockerCmdExecFactory factory = DockerClientBuilder.getDefaultDockerCmdExecFactory();
+            // factory created
+            assertNotNull(factory);
+            // and is unique
+            assertFalse(instances.contains(factory));
+            instances.add(factory);
+         }
+      };
+
+      parallel(AMOUNT, runnable);
+      // set contains all required unique instances
+      assertEquals(instances.size(), AMOUNT);
+   }
+
+   public static void parallel(int threads, final Runnable task) throws Exception
+   {
+      final ExceptionListener exceptionListener = new ExceptionListener();
+      Runnable runnable = new Runnable()
+      {
+         @Override
+         public void run()
+         {
+            try
+            {
+               task.run();
+            }
+            catch (Throwable e)
+            {
+               exceptionListener.onException(e);
+            }
+         }
+      };
+
+      List<Thread> threadList = new ArrayList<>(threads);
+      for (int i = 0; i < threads; i++)
+      {
+         Thread thread = new Thread(runnable);
+         thread.start();
+         threadList.add(thread);
+      }
+      for (Thread thread : threadList)
+      {
+         thread.join();
+      }
+      Throwable exception = exceptionListener.getException();
+      if (exception != null)
+      {
+         throw new RuntimeException(exception);
+      }
+   }
+
+   private static class ExceptionListener
+   {
+      private Throwable exception;
+
+      private synchronized void onException(Throwable e)
+      {
+         exception = e;
+      }
+
+      private synchronized Throwable getException()
+      {
+         return exception;
+      }
+   }
+}

From e3a08471a86036552a311f9a1a521692f0c00601 Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <carlos@apache.org>
Date: Tue, 7 Jul 2015 12:09:49 +0200
Subject: [PATCH 0134/1272] Add filters option to events operation

---
 .../dockerjava/api/command/EventsCmd.java     |  5 +++
 .../dockerjava/api/model/EventFilters.java    | 37 +++++++++++++++++++
 .../core/command/EventsCmdImpl.java           | 20 +++++++++-
 .../dockerjava/jaxrs/EventsCmdExec.java       |  7 ++++
 .../core/command/EventsCmdImplTest.java       | 20 ++++++++++
 5 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/EventFilters.java

diff --git a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java b/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
index 057bed644..e691bbc94 100644
--- a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.api.model.Filters;
 
 /**
  * Get events
@@ -19,6 +20,10 @@ public interface EventsCmd extends AsyncDockerCmd<EventsCmd, Event, Void> {
 
     public String getUntil();
 
+    public Filters getFilters();
+
+    public EventsCmd withFilters(Filters filters);
+
     public static interface Exec extends DockerCmdExec<EventsCmd, Void> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/EventFilters.java b/src/main/java/com/github/dockerjava/api/model/EventFilters.java
new file mode 100644
index 000000000..08cb7ad11
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/EventFilters.java
@@ -0,0 +1,37 @@
+package com.github.dockerjava.api.model;
+
+import java.util.List;
+
+/**
+ * Representation of a Docker event filter.
+ *
+ * @author Carlos Sanchez <carlos@apache.org>
+ * 
+ */
+public class EventFilters extends Filters {
+
+    /**
+     * Default constructor for the deserialization.
+     */
+    public EventFilters() {
+    }
+
+    /**
+     * Constructor.
+     * 
+     * @param event
+     *            event to filter
+     */
+    public EventFilters(String... event) {
+        super();
+        withEvent(event);
+    }
+
+    public Filters withEvent(String... event) {
+        return withFilter("event", event);
+    }
+
+    public List<String> getEvent() {
+        return getFilter("event");
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
index d1de2e60f..50cf34ff3 100644
--- a/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
@@ -1,8 +1,11 @@
 package com.github.dockerjava.core.command;
 
+import static com.google.common.base.Preconditions.*;
+
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.api.model.Filters;
 
 /**
  * Stream docker events
@@ -13,6 +16,8 @@ public class EventsCmdImpl extends AbstrDockerCmd<EventsCmd, Void> implements Ev
 
     private String until;
 
+    private Filters filters;
+
     private ResultCallback<Event> resultCallback;
 
     public EventsCmdImpl(EventsCmd.Exec exec, ResultCallback<Event> resultCallback) {
@@ -38,6 +43,13 @@ public EventsCmd withResultCallback(ResultCallback<Event> resultCallback) {
         return this;
     }
 
+    @Override
+    public EventsCmd withFilters(Filters filters) {
+        checkNotNull(filters, "filters have not been specified");
+        this.filters = filters;
+        return this;
+    }
+
     @Override
     public String getSince() {
         return since;
@@ -53,9 +65,15 @@ public ResultCallback<Event> getResultCallback() {
         return resultCallback;
     }
 
+    @Override
+    public Filters getFilters() {
+        return filters;
+    }
+
     @Override
     public String toString() {
         return new StringBuilder("events").append(since != null ? " --since=" + since : "")
-                .append(until != null ? " --until=" + until : "").toString();
+                .append(until != null ? " --until=" + until : "")
+                .append(filters != null ? " --filters=" + filters : "").toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
index e6f27ae69..0b3d998ac 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.jaxrs;
 
+import static com.google.common.net.UrlEscapers.*;
+
 import javax.ws.rs.client.WebTarget;
 
 import org.slf4j.Logger;
@@ -25,6 +27,11 @@ protected Void execute(EventsCmd command) {
         WebTarget webTarget = getBaseResource().path("/events").queryParam("since", command.getSince())
                 .queryParam("until", command.getUntil());
 
+        if (command.getFilters() != null) {
+            webTarget = webTarget.queryParam("filters",
+                    urlPathSegmentEscaper().escape(command.getFilters().toString()));
+        }
+
         LOGGER.trace("GET: {}", webTarget);
 
         GETCallbackNotifier<Event> callbackNotifier = new GETCallbackNotifier<Event>(new JsonStreamProcessor<Event>(
diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
index eb490d7e9..7da6a100f 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -18,6 +18,7 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.api.model.EventFilters;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
 
@@ -94,6 +95,25 @@ public void testEventStreaming1() throws InterruptedException, IOException {
         assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
     }
 
+    @Test
+    public void testEventStreamingWithFilter() throws InterruptedException, IOException {
+        // Don't include other tests events
+        TimeUnit.SECONDS.sleep(1);
+
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
+
+        EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback).withFilters(new EventFilters().withEvent("start"));
+        eventsCmd.exec();
+
+        generateEvents();
+
+        boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
+
+        eventCallback.close();
+        assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
+    }
+
     @Test
     public void testEventStreaming2() throws InterruptedException, IOException {
         // Don't include other tests events

From 87e9c19729a7267f45b2856e6c9c1c861418ba81 Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <carlos@apache.org>
Date: Tue, 7 Jul 2015 12:10:15 +0200
Subject: [PATCH 0135/1272] Ensure errors in callback are processed and logged

---
 .../dockerjava/core/async/ResultCallbackTemplate.java       | 6 ++++++
 .../dockerjava/jaxrs/async/AbstractCallbackNotifier.java    | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index 50cc1fd91..94d199a6f 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -8,6 +8,9 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.github.dockerjava.api.async.ResultCallback;
 
 /**
@@ -18,6 +21,8 @@
  */
 public abstract class ResultCallbackTemplate<T> implements ResultCallback<T> {
 
+    private final static Logger LOGGER = LoggerFactory.getLogger(ResultCallbackTemplate.class);
+
     private final CountDownLatch finished = new CountDownLatch(1);
 
     private Closeable stream;
@@ -34,6 +39,7 @@ public void onNext(T object) {
     @Override
     public void onError(Throwable throwable) {
         try {
+            LOGGER.error("Error during callback", throwable);
             throw new RuntimeException(throwable);
         } finally {
             try {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java b/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
index 6cfc7a76e..a010a87ad 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
@@ -48,6 +48,11 @@ public Void call() throws Exception {
                 resultCallback.onError(e.getCause());
             }
             return null;
+        } catch (Exception e) {
+            if (resultCallback != null) {
+                resultCallback.onError(e);
+            }
+            return null;
         }
 
         try {

From f65b03f05e48e15b637dfebb4c0a6473008662e7 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 14 Jul 2015 23:40:46 +0200
Subject: [PATCH 0136/1272] Refactored build, push & pull commands APIs (async
 / callback driven)

---
 .../github/dockerjava/api/DockerClient.java   |  15 ++-
 .../api/command/AsyncDockerCmd.java           |   2 +-
 .../api/command/AttachContainerCmd.java       |   4 +-
 .../dockerjava/api/command/BuildImageCmd.java |  24 ++--
 .../api/command/LogContainerCmd.java          |   3 +-
 .../dockerjava/api/command/PullImageCmd.java  |  12 +-
 .../dockerjava/api/command/PushImageCmd.java  |  20 +--
 .../api/model/BuildResponseItem.java          |  20 +++
 .../dockerjava/api/model/EventStreamItem.java |  59 ---------
 .../api/model/PullEventStreamItem.java        |  54 ---------
 .../api/model/PullResponseItem.java           |  13 ++
 .../api/model/PushEventStreamItem.java        |  55 ---------
 .../api/model/PushResponseItem.java           |  12 ++
 .../dockerjava/api/model/ResponseItem.java    |  89 ++++++++++++++
 .../dockerjava/core/DockerClientImpl.java     |  28 +++--
 .../core/async/JsonStreamProcessor.java       |  12 +-
 .../core/command/AbstrAsyncDockerCmd.java     |  38 ++++++
 .../core/command/AbstrAuthCfgDockerCmd.java   |   8 +-
 .../core/command/AbstrDockerCmd.java          |  11 ++
 .../core/command/AttachContainerCmdImpl.java  |  18 +--
 .../core/command/BuildImageCmdImpl.java       |  20 +--
 .../core/command/EventsCmdImpl.java           |  18 +--
 .../core/command/LogContainerCmdImpl.java     |  19 +--
 .../core/command/PullImageCmdImpl.java        |  28 ++++-
 .../core/command/PushImageCmdImpl.java        |  28 ++++-
 .../dockerjava/core/command/StatsCmdImpl.java |  18 +--
 .../jaxrs/AbstrAsyncDockerCmdExec.java        |  90 ++++++++++++++
 .../jaxrs/AttachContainerCmdExec.java         |  15 ++-
 .../dockerjava/jaxrs/BuildImageCmdExec.java   | 114 ++++++------------
 .../dockerjava/jaxrs/EventsCmdExec.java       |  14 +--
 .../dockerjava/jaxrs/LogContainerCmdExec.java |  15 ++-
 .../dockerjava/jaxrs/PullImageCmdExec.java    |  39 +++---
 .../dockerjava/jaxrs/PushImageCmdExec.java    |  68 +++--------
 .../github/dockerjava/jaxrs/StatsCmdExec.java |  14 +--
 .../jaxrs/async/AbstractCallbackNotifier.java |  10 +-
 .../jaxrs/async/GETCallbackNotifier.java      |   9 +-
 .../jaxrs/async/POSTCallbackNotifier.java     |  13 +-
 .../client/AbstractDockerClientTest.java      |  68 +++++++++--
 .../dockerjava/client/DockerClientTest.java   |   2 +-
 .../core/TestDockerCmdExecFactory.java        |  10 +-
 .../command/AttachContainerCmdImplTest.java   |  17 +--
 .../core/command/AuthCmdImplTest.java         |  16 ++-
 .../core/command/BuildImageCmdImplTest.java   |  65 +++++-----
 .../core/command/CommitCmdImplTest.java       |   2 +-
 .../command/ContainerDiffCmdImplTest.java     |   2 +-
 .../CopyFileFromContainerCmdImplTest.java     |   2 +-
 .../command/CreateContainerCmdImplTest.java   |   2 +-
 .../core/command/DockerfileFixture.java       |  11 +-
 .../core/command/EventStreamReaderITest.java  |  62 ----------
 .../core/command/EventsCmdImplTest.java       |  15 ++-
 .../core/command/ExecCreateCmdImplTest.java   |  24 ++--
 .../core/command/ExecStartCmdImplTest.java    |  24 ++--
 .../core/command/FrameReaderITest.java        |   2 +-
 .../core/command/InfoCmdImplTest.java         |  10 +-
 .../core/command/InspectExecCmdImplTest.java  |  33 ++---
 .../command/KillContainerCmdImplTest.java     |   2 +-
 .../command/ListContainersCmdImplTest.java    |  14 ++-
 .../core/command/ListImagesCmdImplTest.java   |   2 +-
 .../core/command/LogContainerCmdImplTest.java |   7 +-
 .../core/command/PullImageCmdImplTest.java    |  52 +++++---
 .../core/command/PushImageCmdImplTest.java    |  54 ++++++---
 .../command/RemoveContainerCmdImplTest.java   |   2 +-
 .../core/command/RemoveImageCmdImplTest.java  |   2 +-
 .../command/RestartContainerCmdImplTest.java  |   2 +-
 .../core/command/SaveImageCmdImplTest.java    |  22 ++--
 .../core/command/SearchImagesCmdImplTest.java |   2 +-
 .../command/StartContainerCmdImplTest.java    |   2 +-
 .../core/command/StatsCmdImplTest.java        |   3 +-
 .../command/StopContainerCmdImplTest.java     |   2 +-
 .../core/command/TagImageCmdImplTest.java     |   3 +-
 .../core/command/VersionCmdImplTest.java      |   2 +-
 .../command/WaitContainerCmdImplTest.java     |   2 +-
 72 files changed, 800 insertions(+), 771 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
 delete mode 100644 src/main/java/com/github/dockerjava/api/model/EventStreamItem.java
 delete mode 100644 src/main/java/com/github/dockerjava/api/model/PullEventStreamItem.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
 delete mode 100644 src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ResponseItem.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index ef16085bb..eff4529db 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -44,8 +44,11 @@
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.api.model.BuildResponseItem;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.Identifier;
+import com.github.dockerjava.api.model.PullResponseItem;
+import com.github.dockerjava.api.model.PushResponseItem;
 import com.github.dockerjava.api.model.Statistics;
 
 // https://godoc.org/github.com/fsouza/go-dockerclient
@@ -68,11 +71,11 @@ public interface DockerClient extends Closeable {
      * * IMAGE API *
      */
 
-    public PullImageCmd pullImageCmd(String repository);
+    public PullImageCmd pullImageCmd(String repository, ResultCallback<PullResponseItem> resultCallback);
 
-    public PushImageCmd pushImageCmd(String name);
+    public PushImageCmd pushImageCmd(String name, ResultCallback<PushResponseItem> resultCallback);
 
-    public PushImageCmd pushImageCmd(Identifier identifier);
+    public PushImageCmd pushImageCmd(Identifier identifier, ResultCallback<PushResponseItem> resultCallback);
 
     public CreateImageCmd createImageCmd(String repository, InputStream imageStream);
 
@@ -134,11 +137,11 @@ public interface DockerClient extends Closeable {
 
     public CommitCmd commitCmd(String containerId);
 
-    public BuildImageCmd buildImageCmd();
+    public BuildImageCmd buildImageCmd(ResultCallback<BuildResponseItem> resultCallback);
 
-    public BuildImageCmd buildImageCmd(File dockerFileOrFolder);
+    public BuildImageCmd buildImageCmd(File dockerFileOrFolder, ResultCallback<BuildResponseItem> resultCallback);
 
-    public BuildImageCmd buildImageCmd(InputStream tarInputStream);
+    public BuildImageCmd buildImageCmd(InputStream tarInputStream, ResultCallback<BuildResponseItem> resultCallback);
 
     public TopContainerCmd topContainerCmd(String containerId);
 
diff --git a/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java b/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
index 4745fae18..38c078898 100644
--- a/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
@@ -11,7 +11,7 @@
  * @author marcus
  *
  */
-public interface AsyncDockerCmd<CMD_T extends DockerCmd<RES_T>, A_RES_T, RES_T> extends DockerCmd<RES_T> {
+public interface AsyncDockerCmd<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T, RES_T>, A_RES_T, RES_T> extends DockerCmd<RES_T> {
 
     public ResultCallback<A_RES_T> getResultCallback();
 
diff --git a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
index 3261be28c..a06e97c0e 100644
--- a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
@@ -64,13 +64,11 @@ public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, F
     public AttachContainerCmd withLogs();
 
     /**
-     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
-     *
      * @throws NotFoundException
      *             No such container
      */
     @Override
-    public Void exec() throws NotFoundException;
+    public Void exec();
 
     public static interface Exec extends DockerCmdExec<AttachContainerCmd, Void> {
     }
diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 5dd1cc177..534645b86 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -1,20 +1,19 @@
 package com.github.dockerjava.api.command;
 
-import com.github.dockerjava.api.model.AuthConfigurations;
-import com.github.dockerjava.api.model.EventStreamItem;
-
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 
+import com.github.dockerjava.api.model.AuthConfigurations;
+import com.github.dockerjava.api.model.BuildResponseItem;
+
 /**
- * 
+ *
  * Build an image from Dockerfile.
- * 
+ *
  * TODO: http://docs.docker.com/reference/builder/#dockerignore
- * 
+ *
  */
-public interface BuildImageCmd extends DockerCmd<BuildImageCmd.Response> {
+public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildResponseItem, Void> {
 
     public BuildImageCmd withTag(String tag);
 
@@ -58,14 +57,9 @@ public interface BuildImageCmd extends DockerCmd<BuildImageCmd.Response> {
 
     public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfig);
 
-    public static interface Exec extends DockerCmdExec<BuildImageCmd, BuildImageCmd.Response> {
+    public static interface Exec extends DockerCmdExec<BuildImageCmd, Void> {
     }
 
-    /**
-     * @see {@link com.github.dockerjava.core.command.EventStreamReader}
-     */
-    public static abstract class Response extends InputStream {
-        public abstract Iterable<EventStreamItem> getItems() throws IOException;
-    }
+
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
index a0e9d6ba5..4abe86f5a 100644
--- a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -65,13 +65,12 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame,
     public LogContainerCmd withTail(int tail);
 
     /**
-     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
      *
      * @throws NotFoundException
      *             No such container
      */
     @Override
-    public Void exec() throws NotFoundException;
+    public Void exec();
 
     public static interface Exec extends DockerCmdExec<LogContainerCmd, Void> {
     }
diff --git a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java b/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
index b3e6db6aa..73ca9fec1 100644
--- a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.PullResponseItem;
 import com.github.dockerjava.core.command.EventStreamReader;
 
 import java.io.InputStream;
@@ -10,7 +11,7 @@
  * Pull image from repository.
  *
  */
-public interface PullImageCmd extends DockerCmd<InputStream> {
+public interface PullImageCmd extends AsyncDockerCmd<PullImageCmd, PullResponseItem, Void> {
 
     public String getRepository();
 
@@ -28,15 +29,10 @@ public interface PullImageCmd extends DockerCmd<InputStream> {
 
     public PullImageCmd withAuthConfig(AuthConfig authConfig);
 
-    public static interface Exec extends DockerCmdExec<PullImageCmd, InputStream> {
+    public static interface Exec extends DockerCmdExec<PullImageCmd, Void> {
     }
 
-    /**
-     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
-     *
-     * @see {@link EventStreamReader}
-     */
     @Override
-    public InputStream exec();
+    public Void exec();
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java b/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
index 6b9a67ebe..a4251d373 100644
--- a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
@@ -2,11 +2,7 @@
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.model.AuthConfig;
-import com.github.dockerjava.api.model.PushEventStreamItem;
-import com.github.dockerjava.core.command.EventStreamReader;
-
-import java.io.IOException;
-import java.io.InputStream;
+import com.github.dockerjava.api.model.PushResponseItem;
 
 /**
  * Push the latest image to the repository.
@@ -14,7 +10,7 @@
  * @param name
  *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
  */
-public interface PushImageCmd extends DockerCmd<PushImageCmd.Response> {
+public interface PushImageCmd extends AsyncDockerCmd<PushImageCmd, PushResponseItem, Void> {
 
     public String getName();
 
@@ -40,16 +36,8 @@ public interface PushImageCmd extends DockerCmd<PushImageCmd.Response> {
      * @throws NotFoundException
      *             No such image
      */
-    public Response exec() throws NotFoundException;
-
-    public static interface Exec extends DockerCmdExec<PushImageCmd, Response> {
-    }
+    public Void exec() throws NotFoundException;
 
-    /**
-     * @see {@link EventStreamReader}
-     */
-    public static abstract class Response extends InputStream {
-        public abstract Iterable<PushEventStreamItem> getItems() throws IOException;
+    public static interface Exec extends DockerCmdExec<PushImageCmd, Void> {
     }
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
new file mode 100644
index 000000000..c999652ec
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
@@ -0,0 +1,20 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Represents a build response stream item
+ */
+@JsonIgnoreProperties(ignoreUnknown = false)
+public class BuildResponseItem extends ResponseItem {
+
+    private static final long serialVersionUID = -1252904184236343612L;
+
+    @JsonProperty("stream")
+    private String stream;
+
+    public String getStream() {
+        return stream;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/EventStreamItem.java b/src/main/java/com/github/dockerjava/api/model/EventStreamItem.java
deleted file mode 100644
index 9c7489812..000000000
--- a/src/main/java/com/github/dockerjava/api/model/EventStreamItem.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.github.dockerjava.api.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-
-import com.google.common.base.Objects;
-
-/**
- * Represents an event stream
- */
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class EventStreamItem implements Serializable {
-
-    private static final long serialVersionUID = 638778515773898651L;
-
-    @JsonProperty("stream")
-    private String stream;
-
-    // {"error":"Error...", "errorDetail":{"code": 123, "message": "Error..."}}
-    @JsonProperty("error")
-    private String error;
-
-    @JsonProperty("errorDetail")
-    private ErrorDetail errorDetail;
-
-    public String getStream() {
-        return stream;
-    }
-
-    public String getError() {
-        return error;
-    }
-
-    public ErrorDetail getErrorDetail() {
-        return errorDetail;
-    }
-
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class ErrorDetail implements Serializable {
-        @JsonProperty("code")
-        String code;
-
-        @JsonProperty("message")
-        String message;
-
-        @Override
-        public String toString() {
-            return Objects.toStringHelper(this).add("code", code).add("message", message).toString();
-        }
-    }
-
-    @Override
-    public String toString() {
-        return Objects.toStringHelper(this).add("stream", stream).add("error", error).add("errorDetail", errorDetail)
-                .toString();
-    }
-}
diff --git a/src/main/java/com/github/dockerjava/api/model/PullEventStreamItem.java b/src/main/java/com/github/dockerjava/api/model/PullEventStreamItem.java
deleted file mode 100644
index cd49e846e..000000000
--- a/src/main/java/com/github/dockerjava/api/model/PullEventStreamItem.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.github.dockerjava.api.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Objects;
-
-import java.io.Serializable;
-
-/**
- * Represents an item returned from pull
- */
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class PullEventStreamItem implements Serializable {
-
-    private static final long serialVersionUID = -5187169652557467828L;
-
-    @JsonProperty("status")
-    private String status;
-
-    @JsonProperty("progress")
-    private String progress;
-
-    @JsonProperty("progressDetail")
-    private ProgressDetail progressDetail;
-
-    public String getStatus() {
-        return status;
-    }
-
-    public String getProgress() {
-        return progress;
-    }
-
-    public ProgressDetail getProgressDetail() {
-        return progressDetail;
-    }
-
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class ProgressDetail implements Serializable {
-        @JsonProperty("current")
-        int current;
-
-        @Override
-        public String toString() {
-            return "current " + current;
-        }
-    }
-
-    @Override
-    public String toString() {
-        return Objects.toStringHelper(this).add("status", status).add("progress", progress)
-                .add("progressDetail", progressDetail).toString();
-    }
-}
diff --git a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
new file mode 100644
index 000000000..cb856a115
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
@@ -0,0 +1,13 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+/**
+ * Represents a pull response stream item
+ */
+@JsonIgnoreProperties(ignoreUnknown = false)
+public class PullResponseItem extends ResponseItem {
+
+    private static final long serialVersionUID = 6316219017613249047L;
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java b/src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java
deleted file mode 100644
index e022f0c1a..000000000
--- a/src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.github.dockerjava.api.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-
-import com.google.common.base.Objects;
-
-/**
- * Represents an item returned from push
- */
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class PushEventStreamItem implements Serializable {
-
-    private static final long serialVersionUID = -5187169652557467828L;
-
-    @JsonProperty("status")
-    private String status;
-
-    @JsonProperty("progress")
-    private String progress;
-
-    @JsonProperty("progressDetail")
-    private ProgressDetail progressDetail;
-
-    public String getStatus() {
-        return status;
-    }
-
-    public String getProgress() {
-        return progress;
-    }
-
-    public ProgressDetail getProgressDetail() {
-        return progressDetail;
-    }
-
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class ProgressDetail implements Serializable {
-        @JsonProperty("current")
-        int current;
-
-        @Override
-        public String toString() {
-            return "current " + current;
-        }
-    }
-
-    @Override
-    public String toString() {
-        return Objects.toStringHelper(this).add("status", status).add("progress", progress)
-                .add("progressDetail", progressDetail).toString();
-    }
-}
diff --git a/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
new file mode 100644
index 000000000..b97042154
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
@@ -0,0 +1,12 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+/**
+ * Represents a push response stream item
+ */
+@JsonIgnoreProperties(ignoreUnknown = false)
+public class PushResponseItem extends ResponseItem {
+
+    private static final long serialVersionUID = 8256977108011295857L;
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
new file mode 100644
index 000000000..f7c4c502d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
@@ -0,0 +1,89 @@
+package com.github.dockerjava.api.model;
+
+import java.io.Serializable;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Represents a pull response stream item
+ */
+@JsonIgnoreProperties(ignoreUnknown = false)
+public class ResponseItem implements Serializable {
+
+    private static final long serialVersionUID = -5187169652557467828L;
+
+    @JsonProperty("status")
+    private String status;
+
+    @JsonProperty("progress")
+    private String progress;
+
+    @JsonProperty("progressDetail")
+    private ProgressDetail progressDetail;
+
+    @JsonProperty("error")
+    private String error;
+
+    @JsonProperty("errorDetail")
+    private ErrorDetail errorDetail;
+
+    @JsonProperty("id")
+    private String id;
+
+    public String getStatus() {
+        return status;
+    }
+
+    public String getProgress() {
+        return progress;
+    }
+
+    public ProgressDetail getProgressDetail() {
+        return progressDetail;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown = false)
+    public static class ProgressDetail implements Serializable {
+        private static final long serialVersionUID = -1954994695645715264L;
+
+        @JsonProperty("current")
+        int current;
+
+        @JsonProperty("total")
+        int total;
+
+        @Override
+        public String toString() {
+            return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();
+        }
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown = false)
+    public static class ErrorDetail implements Serializable {
+        private static final long serialVersionUID = -9136704865403084083L;
+
+        @JsonProperty("code")
+        String code;
+
+        @JsonProperty("message")
+        String message;
+
+        @Override
+        public String toString() {
+            return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();
+        }
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 810910393..f01ea0909 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -49,8 +49,11 @@
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.api.model.BuildResponseItem;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.Identifier;
+import com.github.dockerjava.api.model.PullResponseItem;
+import com.github.dockerjava.api.model.PushResponseItem;
 import com.github.dockerjava.api.model.Statistics;
 import com.github.dockerjava.core.command.AttachContainerCmdImpl;
 import com.github.dockerjava.core.command.AuthCmdImpl;
@@ -186,14 +189,14 @@ public VersionCmd versionCmd() {
      * * IMAGE API *
      */
     @Override
-    public PullImageCmd pullImageCmd(String repository) {
+    public PullImageCmd pullImageCmd(String repository, ResultCallback<PullResponseItem> resultCallback) {
         return new PullImageCmdImpl(getDockerCmdExecFactory().createPullImageCmdExec(),
-                dockerClientConfig.effectiveAuthConfig(repository), repository);
+                dockerClientConfig.effectiveAuthConfig(repository), repository, resultCallback);
     }
 
     @Override
-    public PushImageCmd pushImageCmd(String name) {
-        PushImageCmd cmd = new PushImageCmdImpl(getDockerCmdExecFactory().createPushImageCmdExec(), name);
+    public PushImageCmd pushImageCmd(String name, ResultCallback<PushResponseItem> resultCallback) {
+        PushImageCmd cmd = new PushImageCmdImpl(getDockerCmdExecFactory().createPushImageCmdExec(), name, resultCallback);
 
         AuthConfig cfg = dockerClientConfig.effectiveAuthConfig(name);
         if (cfg != null)
@@ -202,8 +205,8 @@ public PushImageCmd pushImageCmd(String name) {
     }
 
     @Override
-    public PushImageCmd pushImageCmd(Identifier identifier) {
-        PushImageCmd cmd = pushImageCmd(identifier.repository.name);
+    public PushImageCmd pushImageCmd(Identifier identifier, ResultCallback<PushResponseItem> resultCallback) {
+        PushImageCmd cmd = pushImageCmd(identifier.repository.name, resultCallback);
         if (identifier.tag.isPresent())
             cmd.withTag(identifier.tag.get());
 
@@ -337,20 +340,21 @@ public CommitCmd commitCmd(String containerId) {
     }
 
     @Override
-    public BuildImageCmd buildImageCmd() {
-        return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec()));
+    public BuildImageCmd buildImageCmd(ResultCallback<BuildResponseItem> resultCallback) {
+        return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(),
+                resultCallback));
     }
 
     @Override
-    public BuildImageCmd buildImageCmd(File dockerFileOrFolder) {
+    public BuildImageCmd buildImageCmd(File dockerFileOrFolder, ResultCallback<BuildResponseItem> resultCallback) {
         return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(),
-                dockerFileOrFolder));
+                dockerFileOrFolder, resultCallback));
     }
 
     @Override
-    public BuildImageCmd buildImageCmd(InputStream tarInputStream) {
+    public BuildImageCmd buildImageCmd(InputStream tarInputStream, ResultCallback<BuildResponseItem> resultCallback) {
         return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(),
-                tarInputStream));
+                tarInputStream, resultCallback));
     }
 
     private BuildImageCmd augmentBuildImageCmd(BuildImageCmd buildImageCmd) {
diff --git a/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
index 5339b3ed0..8c8cb8d3d 100644
--- a/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
+++ b/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
@@ -7,6 +7,7 @@
 import java.io.InputStream;
 
 import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonFactory.Feature;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -33,15 +34,22 @@ public JsonStreamProcessor(Class<T> clazz) {
     public void processResponseStream(InputStream response, ResultCallback<T> resultCallback) {
 
         resultCallback.onStart(response);
+        OBJECT_MAPPER.configure(com.fasterxml.jackson.core.JsonParser.Feature.AUTO_CLOSE_SOURCE, true);
 
         try {
             JsonParser jp = JSON_FACTORY.createParser(response);
-            while (!jp.isClosed() && jp.nextToken() != JsonToken.END_OBJECT) {
+            boolean closed = jp.isClosed();
+            JsonToken nextToken = jp.nextToken();
+            while (!closed && nextToken != null && nextToken != JsonToken.END_OBJECT) {
                 try {
-                    resultCallback.onNext(OBJECT_MAPPER.readValue(jp, clazz));
+                    T next = OBJECT_MAPPER.readValue(jp, clazz);
+                    resultCallback.onNext(next);
                 } catch (Exception e) {
                     resultCallback.onError(e);
                 }
+
+                closed = jp.isClosed();
+                nextToken = jp.nextToken();
             }
         } catch (Throwable t) {
             resultCallback.onError(t);
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
new file mode 100644
index 000000000..1bcac59ea
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
@@ -0,0 +1,38 @@
+package com.github.dockerjava.core.command;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.AsyncDockerCmd;
+import com.github.dockerjava.api.command.DockerCmdExec;
+
+public abstract class AbstrAsyncDockerCmd<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T, RES_T>, A_RES_T, RES_T>
+        extends AbstrDockerCmd<CMD_T, RES_T> implements AsyncDockerCmd<CMD_T, A_RES_T, RES_T>{
+
+    private final static Logger LOGGER = LoggerFactory.getLogger(AbstrAsyncDockerCmd.class);
+
+    private ResultCallback<A_RES_T> resultCallback;
+
+    public AbstrAsyncDockerCmd(DockerCmdExec<CMD_T, RES_T> execution, ResultCallback<A_RES_T> resultCallback) {
+        super(execution);
+        checkNotNull(resultCallback, "resultCallback was not specified");
+        withResultCallback(resultCallback);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public CMD_T withResultCallback(ResultCallback<A_RES_T> resultCallback) {
+        checkNotNull(resultCallback, "resultCallback was not specified");
+        this.resultCallback = resultCallback;
+        return ((CMD_T) this);
+    }
+
+    @Override
+    public ResultCallback<A_RES_T> getResultCallback() {
+        return resultCallback;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
index 7e9957cbf..c7c64b759 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
@@ -39,12 +39,6 @@ private T withOptionalAuthConfig(AuthConfig authConfig) {
         return (T) this;
     }
 
-    protected String registryAuth() {
-        try {
-            return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfig).getBytes());
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
+
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
index 069fba09e..3d30cb62c 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
@@ -4,12 +4,15 @@
 
 import java.io.IOException;
 
+import org.apache.commons.codec.binary.Base64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.command.DockerCmd;
 import com.github.dockerjava.api.command.DockerCmdExec;
+import com.github.dockerjava.api.model.AuthConfig;
 
 public abstract class AbstrDockerCmd<CMD_T extends DockerCmd<RES_T>, RES_T> implements DockerCmd<RES_T> {
 
@@ -32,4 +35,12 @@ public RES_T exec() throws DockerException {
     @Override
     public void close() throws IOException {
     }
+
+    protected String registryAuth(AuthConfig authConfig) {
+        try {
+            return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfig).getBytes());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
index eabbb8488..3bc5f4518 100644
--- a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
@@ -22,29 +22,15 @@
  * @param timestamps
  *            - true or false, if true, print timestamps for every log line. Defaults to false.
  */
-public class AttachContainerCmdImpl extends AbstrDockerCmd<AttachContainerCmd, Void> implements AttachContainerCmd {
-
-    private ResultCallback<Frame> resultCallback;
+public class AttachContainerCmdImpl extends AbstrAsyncDockerCmd<AttachContainerCmd, Frame, Void> implements AttachContainerCmd {
 
     private String containerId;
 
     private boolean logs, followStream, timestamps, stdout, stderr;
 
     public AttachContainerCmdImpl(AttachContainerCmd.Exec exec, String containerId, ResultCallback<Frame> resultCallback) {
-        super(exec);
+        super(exec, resultCallback);
         withContainerId(containerId);
-        withResultCallback(resultCallback);
-    }
-
-    public ResultCallback<Frame> getResultCallback() {
-        return resultCallback;
-    }
-
-    @Override
-    public AttachContainerCmd withResultCallback(ResultCallback<Frame> resultCallback) {
-        checkNotNull(resultCallback, "resultCallback was not specified");
-        this.resultCallback = resultCallback;
-        return this;
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index f61d3b7ac..51735c494 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -6,17 +6,19 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.model.AuthConfigurations;
+import com.github.dockerjava.api.model.BuildResponseItem;
 import com.github.dockerjava.core.FilePathUtil;
 import com.github.dockerjava.core.dockerfile.Dockerfile;
 
 /**
- * 
+ *
  * Build an image from Dockerfile.
- * 
+ *
  */
-public class BuildImageCmdImpl extends AbstrDockerCmd<BuildImageCmd, BuildImageCmd.Response> implements BuildImageCmd {
+public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildResponseItem, Void> implements BuildImageCmd {
 
     private InputStream tarInputStream = null;
 
@@ -36,12 +38,12 @@ public class BuildImageCmdImpl extends AbstrDockerCmd<BuildImageCmd, BuildImageC
 
     private File baseDirectory;
 
-    public BuildImageCmdImpl(BuildImageCmd.Exec exec) {
-        super(exec);
+    public BuildImageCmdImpl(BuildImageCmd.Exec exec, ResultCallback<BuildResponseItem> resultCallback) {
+        super(exec, resultCallback);
     }
 
-    public BuildImageCmdImpl(BuildImageCmd.Exec exec, File dockerFileOrFolder) {
-        super(exec);
+    public BuildImageCmdImpl(BuildImageCmd.Exec exec, File dockerFileOrFolder, ResultCallback<BuildResponseItem> resultCallback) {
+        super(exec, resultCallback);
         checkNotNull(dockerFileOrFolder, "dockerFolder is null");
 
         if (dockerFileOrFolder.isDirectory()) {
@@ -52,8 +54,8 @@ public BuildImageCmdImpl(BuildImageCmd.Exec exec, File dockerFileOrFolder) {
         }
     }
 
-    public BuildImageCmdImpl(BuildImageCmd.Exec exec, InputStream tarInputStream) {
-        super(exec);
+    public BuildImageCmdImpl(BuildImageCmd.Exec exec, InputStream tarInputStream, ResultCallback<BuildResponseItem> resultCallback) {
+        super(exec, resultCallback);
         checkNotNull(tarInputStream, "tarInputStream is null");
         withTarInputStream(tarInputStream);
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
index d1de2e60f..13d5c5427 100644
--- a/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
@@ -7,17 +7,14 @@
 /**
  * Stream docker events
  */
-public class EventsCmdImpl extends AbstrDockerCmd<EventsCmd, Void> implements EventsCmd {
+public class EventsCmdImpl extends AbstrAsyncDockerCmd<EventsCmd, Event, Void> implements EventsCmd {
 
     private String since;
 
     private String until;
 
-    private ResultCallback<Event> resultCallback;
-
     public EventsCmdImpl(EventsCmd.Exec exec, ResultCallback<Event> resultCallback) {
-        super(exec);
-        withResultCallback(resultCallback);
+        super(exec, resultCallback);
     }
 
     @Override
@@ -32,12 +29,6 @@ public EventsCmd withUntil(String until) {
         return this;
     }
 
-    @Override
-    public EventsCmd withResultCallback(ResultCallback<Event> resultCallback) {
-        this.resultCallback = resultCallback;
-        return this;
-    }
-
     @Override
     public String getSince() {
         return since;
@@ -48,11 +39,6 @@ public String getUntil() {
         return until;
     }
 
-    @Override
-    public ResultCallback<Event> getResultCallback() {
-        return resultCallback;
-    }
-
     @Override
     public String toString() {
         return new StringBuilder("events").append(since != null ? " --since=" + since : "")
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
index 9476ecc9b..98a0e723b 100644
--- a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -24,9 +24,7 @@
  * @param tail
  *            - `all` or `<number>`, Output specified number of lines at the end of logs
  */
-public class LogContainerCmdImpl extends AbstrDockerCmd<LogContainerCmd, Void> implements LogContainerCmd {
-
-    private ResultCallback<Frame> resultCallback;
+public class LogContainerCmdImpl extends AbstrAsyncDockerCmd<LogContainerCmd, Frame, Void> implements LogContainerCmd {
 
     private String containerId;
 
@@ -35,9 +33,8 @@ public class LogContainerCmdImpl extends AbstrDockerCmd<LogContainerCmd, Void> i
     private boolean followStream, timestamps, stdout, stderr;
 
     public LogContainerCmdImpl(LogContainerCmd.Exec exec, String containerId, ResultCallback<Frame> resultCallback) {
-        super(exec);
+        super(exec, resultCallback);
         withContainerId(containerId);
-        withResultCallback(resultCallback);
     }
 
     @Override
@@ -45,18 +42,6 @@ public String getContainerId() {
         return containerId;
     }
 
-    @Override
-    public ResultCallback<Frame> getResultCallback() {
-        return resultCallback;
-    }
-
-    @Override
-    public LogContainerCmd withResultCallback(ResultCallback<Frame> resultCallback) {
-        checkNotNull(resultCallback, "resultCallback was not specified");
-        this.resultCallback = resultCallback;
-        return this;
-    }
-
     @Override
     public int getTail() {
         return tail;
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
index 488562b99..e226fc628 100644
--- a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
@@ -2,25 +2,43 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.InputStream;
-
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.PullResponseItem;
 
 /**
  *
  * Pull image from repository.
  *
  */
-public class PullImageCmdImpl extends AbstrAuthCfgDockerCmd<PullImageCmd, InputStream> implements PullImageCmd {
+public class PullImageCmdImpl extends AbstrAsyncDockerCmd<PullImageCmd, PullResponseItem, Void> implements PullImageCmd {
 
     private String repository, tag, registry;
 
-    public PullImageCmdImpl(PullImageCmd.Exec exec, AuthConfig authConfig, String repository) {
-        super(exec, authConfig);
+    private AuthConfig authConfig;
+
+    public PullImageCmdImpl(PullImageCmd.Exec exec, AuthConfig authConfig, String repository,
+            ResultCallback<PullResponseItem> resultCallback) {
+        super(exec, resultCallback);
+        withAuthConfig(authConfig);
         withRepository(repository);
     }
 
+    public AuthConfig getAuthConfig() {
+        return authConfig;
+    }
+
+    public PullImageCmd withAuthConfig(AuthConfig authConfig) {
+        checkNotNull(authConfig, "authConfig was not specified");
+        return withOptionalAuthConfig(authConfig);
+    }
+
+    private PullImageCmd withOptionalAuthConfig(AuthConfig authConfig) {
+        this.authConfig = authConfig;
+        return this;
+    }
+
     @Override
     public String getRepository() {
         return repository;
diff --git a/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
index 76bbe46b6..d462ba6ce 100644
--- a/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
@@ -3,7 +3,10 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.PushImageCmd;
+import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.PushResponseItem;
 
 /**
  * Push the latest image to the repository.
@@ -11,15 +14,16 @@
  * @param name
  *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
  */
-public class PushImageCmdImpl extends AbstrAuthCfgDockerCmd<PushImageCmd, PushImageCmd.Response> implements
-        PushImageCmd {
+public class PushImageCmdImpl extends AbstrAsyncDockerCmd<PushImageCmd, PushResponseItem, Void> implements PushImageCmd {
 
     private String name;
 
     private String tag;
 
-    public PushImageCmdImpl(PushImageCmd.Exec exec, String name) {
-        super(exec);
+    private AuthConfig authConfig;
+
+    public PushImageCmdImpl(PushImageCmd.Exec exec, String name, ResultCallback<PushResponseItem> resultCallback) {
+        super(exec, resultCallback);
         withName(name);
     }
 
@@ -55,6 +59,20 @@ public PushImageCmd withTag(String tag) {
         return this;
     }
 
+    public AuthConfig getAuthConfig() {
+        return authConfig;
+    }
+
+    public PushImageCmd withAuthConfig(AuthConfig authConfig) {
+        checkNotNull(authConfig, "authConfig was not specified");
+        return withOptionalAuthConfig(authConfig);
+    }
+
+    private PushImageCmd withOptionalAuthConfig(AuthConfig authConfig) {
+        this.authConfig = authConfig;
+        return this;
+    }
+
     @Override
     public String toString() {
         return new StringBuilder("push ").append(name).toString();
@@ -65,7 +83,7 @@ public String toString() {
      *             No such image
      */
     @Override
-    public Response exec() throws NotFoundException {
+    public Void exec() throws NotFoundException {
         return super.exec();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
index 678a9ef49..901ad61a6 100644
--- a/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
@@ -9,15 +9,12 @@
 /**
  * Container stats
  */
-public class StatsCmdImpl extends AbstrDockerCmd<StatsCmd, Void> implements StatsCmd {
+public class StatsCmdImpl extends AbstrAsyncDockerCmd<StatsCmd, Statistics, Void> implements StatsCmd {
 
     private String containerId;
 
-    private ResultCallback<Statistics> resultCallback;
-
     public StatsCmdImpl(StatsCmd.Exec exec, ResultCallback<Statistics> resultCallback) {
-        super(exec);
-        withResultCallback(resultCallback);
+        super(exec, resultCallback);
     }
 
     @Override
@@ -32,17 +29,6 @@ public String getContainerId() {
         return containerId;
     }
 
-    @Override
-    public StatsCmd withResultCallback(ResultCallback<Statistics> resultCallback) {
-        this.resultCallback = resultCallback;
-        return this;
-    }
-
-    @Override
-    public ResultCallback<Statistics> getResultCallback() {
-        return resultCallback;
-    }
-
     @Override
     public Void exec() {
         return super.exec();
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
new file mode 100644
index 000000000..c6670c59a
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
@@ -0,0 +1,90 @@
+package com.github.dockerjava.jaxrs;
+
+import java.io.Closeable;
+import java.io.IOException;
+
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.client.WebTarget;
+
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.AsyncDockerCmd;
+import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
+
+public abstract class AbstrAsyncDockerCmdExec<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T, RES_T>, A_RES_T, RES_T>
+        extends AbstrDockerCmdExec<CMD_T, RES_T> {
+
+    public AbstrAsyncDockerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    public final RES_T exec(CMD_T command) {
+        // this hack works because of ResponseStatusExceptionFilter
+        RES_T result;
+        try {
+            result = execute(command);
+
+        } catch (ProcessingException e) {
+            if (e.getCause() instanceof DockerException) {
+                throw (DockerException) e.getCause();
+            } else {
+                throw e;
+            }
+        }
+
+        // do not close the command yet. this will be done when the stream is consumed
+
+        return result;
+    }
+
+    @Override
+    protected final RES_T execute(final CMD_T command) {
+
+        final ResultCallback<A_RES_T> resultCallback = command.getResultCallback();
+
+        ResultCallback<A_RES_T> delegatingResultCallback = new ResultCallback<A_RES_T>() {
+
+            @Override
+            public void close() throws IOException {
+                resultCallback.close();
+                command.close();
+            }
+
+            @Override
+            public void onStart(Closeable closeable) {
+                resultCallback.onStart(closeable);
+            }
+
+            @Override
+            public void onNext(A_RES_T object) {
+                resultCallback.onNext(object);
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                resultCallback.onError(throwable);
+            }
+
+            @Override
+            public void onComplete() {
+                resultCallback.onComplete();
+                try {
+                    command.close();
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        };
+
+        AbstractCallbackNotifier<A_RES_T> callbackNotifier = callbackNotifier(command, delegatingResultCallback);
+
+        AbstractCallbackNotifier.startAsyncProcessing(callbackNotifier);
+
+        return null;
+    }
+
+    protected abstract AbstractCallbackNotifier<A_RES_T> callbackNotifier(CMD_T command,
+            ResultCallback<A_RES_T> resultCallback);
+
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
index edf837d7f..312a2a8d7 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
@@ -5,13 +5,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.core.async.FrameStreamProcessor;
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
 
-public class AttachContainerCmdExec extends AbstrDockerCmdExec<AttachContainerCmd, Void> implements
+public class AttachContainerCmdExec extends AbstrAsyncDockerCmdExec<AttachContainerCmd, Frame, Void> implements
         AttachContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AttachContainerCmdExec.class);
@@ -21,7 +22,9 @@ public AttachContainerCmdExec(WebTarget baseResource) {
     }
 
     @Override
-    protected Void execute(AttachContainerCmd command) {
+    protected AbstractCallbackNotifier<Frame> callbackNotifier(AttachContainerCmd command,
+            ResultCallback<Frame> resultCallback) {
+
         WebTarget webTarget = getBaseResource().path("/containers/{id}/attach")
                 .resolveTemplate("id", command.getContainerId())
                 .queryParam("logs", command.hasLogsEnabled() ? "1" : "0")
@@ -32,11 +35,7 @@ protected Void execute(AttachContainerCmd command) {
 
         LOGGER.trace("POST: {}", webTarget);
 
-        POSTCallbackNotifier<Frame> callbackNotifier = new POSTCallbackNotifier<Frame>(new FrameStreamProcessor(),
-                command.getResultCallback(), webTarget);
-
-        AbstractCallbackNotifier.startAsyncProcessing(callbackNotifier);
-
-        return null;
+        return new POSTCallbackNotifier<Frame>(new FrameStreamProcessor(),
+                command.getResultCallback(), webTarget.request(), null);
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index 3380832ec..c1f0d8b79 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -1,28 +1,25 @@
 package com.github.dockerjava.jaxrs;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectReader;
-import com.github.dockerjava.api.command.BuildImageCmd;
-import com.github.dockerjava.api.model.AuthConfigurations;
-import com.github.dockerjava.api.model.EventStreamItem;
-import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
-import com.google.common.collect.ImmutableList;
-import org.glassfish.jersey.client.ClientProperties;
-import org.glassfish.jersey.client.RequestEntityProcessing;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static javax.ws.rs.client.Entity.entity;
 
 import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
 
-import static javax.ws.rs.client.Entity.entity;
+import org.glassfish.jersey.client.ClientProperties;
+import org.glassfish.jersey.client.RequestEntityProcessing;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class BuildImageCmdExec extends AbstrDockerCmdExec<BuildImageCmd, BuildImageCmd.Response> implements
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.BuildImageCmd;
+import com.github.dockerjava.api.model.AuthConfigurations;
+import com.github.dockerjava.api.model.BuildResponseItem;
+import com.github.dockerjava.core.async.JsonStreamProcessor;
+import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
+import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
+
+public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem, Void> implements
         BuildImageCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageCmdExec.class);
@@ -31,81 +28,48 @@ public BuildImageCmdExec(WebTarget baseResource) {
         super(baseResource);
     }
 
+    private Invocation.Builder resourceWithOptionalAuthConfig(BuildImageCmd command, Invocation.Builder request) {
+        AuthConfigurations authConfigs = command.getBuildAuthConfigs();
+        if (authConfigs != null) {
+            request = request.header("X-Registry-Config", registryConfigs(authConfigs));
+        }
+        return request;
+    }
+
     @Override
-    protected ResponseImpl execute(BuildImageCmd command) {
-        WebTarget webResource = getBaseResource().path("/build");
+    protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImageCmd command,
+            ResultCallback<BuildResponseItem> resultCallback) {
+
+        WebTarget webTarget = getBaseResource().path("/build");
         String dockerFilePath = command.getPathToDockerfile();
 
         if (command.getTag() != null) {
-            webResource = webResource.queryParam("t", command.getTag());
+            webTarget = webTarget.queryParam("t", command.getTag());
         }
         if (command.hasNoCacheEnabled()) {
-            webResource = webResource.queryParam("nocache", "true");
+            webTarget = webTarget.queryParam("nocache", "true");
         }
         if (!command.hasRemoveEnabled()) {
-            webResource = webResource.queryParam("rm", "false");
+            webTarget = webTarget.queryParam("rm", "false");
         }
         if (command.isQuiet()) {
-            webResource = webResource.queryParam("q", "true");
+            webTarget = webTarget.queryParam("q", "true");
         }
         if (command.hasPullEnabled()) {
-            webResource = webResource.queryParam("pull", "true");
+            webTarget = webTarget.queryParam("pull", "true");
         }
         if (dockerFilePath != null && !"Dockerfile".equals(dockerFilePath)) {
-            webResource = webResource.queryParam("dockerfile", dockerFilePath);
-        }
-
-        webResource.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED);
-        webResource.property(ClientProperties.CHUNKED_ENCODING_SIZE, 1024 * 1024);
-
-        LOGGER.debug("POST: {}", webResource);
-        Response response = resourceWithOptionalAuthConfig(command, webResource.request()).accept(MediaType.TEXT_PLAIN)
-                .post(entity(command.getTarInputStream(), "application/tar"), Response.class);
-
-        return new ResponseImpl(new WrappedResponseInputStream(response));
-
-    }
-
-    private Invocation.Builder resourceWithOptionalAuthConfig(BuildImageCmd command, Invocation.Builder request) {
-        AuthConfigurations authConfigs = command.getBuildAuthConfigs();
-        if (authConfigs != null) {
-            request = request.header("X-Registry-Config", registryConfigs(authConfigs));
+            webTarget = webTarget.queryParam("dockerfile", dockerFilePath);
         }
-        return request;
-    }
 
-    public static class ResponseImpl extends BuildImageCmd.Response {
-
-        private final InputStream proxy;
-
-        public ResponseImpl(InputStream proxy) {
-            this.proxy = proxy;
-        }
+        webTarget.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED);
+        webTarget.property(ClientProperties.CHUNKED_ENCODING_SIZE, 1024 * 1024);
 
-        @Override
-        public Iterable<EventStreamItem> getItems() throws IOException {
-            ObjectMapper mapper = new ObjectMapper();
-            // we'll be reading instances of MyBean
-            ObjectReader reader = mapper.reader(EventStreamItem.class);
-            // and then do other configuration, if any, and read:
-            Iterator<EventStreamItem> items = reader.readValues(proxy);
+        LOGGER.trace("POST: {}", webTarget);
 
-            try {
-                return ImmutableList.copyOf(items);
-            } finally {
-                proxy.close();
-            }
-        }
-
-        @Override
-        public int read() throws IOException {
-            return proxy.read();
-        }
-
-        @Override
-        public void close() throws IOException {
-            proxy.close();
-            super.close();
-        }
+        return new POSTCallbackNotifier<BuildResponseItem>(
+                new JsonStreamProcessor<BuildResponseItem>(BuildResponseItem.class), resultCallback,
+                resourceWithOptionalAuthConfig(command, webTarget.request()).accept(MediaType.TEXT_PLAIN), entity(
+                        command.getTarInputStream(), "application/tar"));
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
index e6f27ae69..5be60076a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -5,13 +5,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.model.Event;
 import com.github.dockerjava.core.async.JsonStreamProcessor;
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
 
-public class EventsCmdExec extends AbstrDockerCmdExec<EventsCmd, Void> implements EventsCmd.Exec {
+public class EventsCmdExec extends AbstrAsyncDockerCmdExec<EventsCmd, Event, Void> implements EventsCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(EventsCmdExec.class);
 
@@ -20,18 +21,13 @@ public EventsCmdExec(WebTarget baseResource) {
     }
 
     @Override
-    protected Void execute(EventsCmd command) {
-
+    protected AbstractCallbackNotifier<Event> callbackNotifier(EventsCmd command, ResultCallback<Event> resultCallback) {
         WebTarget webTarget = getBaseResource().path("/events").queryParam("since", command.getSince())
                 .queryParam("until", command.getUntil());
 
         LOGGER.trace("GET: {}", webTarget);
 
-        GETCallbackNotifier<Event> callbackNotifier = new GETCallbackNotifier<Event>(new JsonStreamProcessor<Event>(
-                Event.class), command.getResultCallback(), webTarget);
-
-        AbstractCallbackNotifier.startAsyncProcessing(callbackNotifier);
-
-        return null;
+        return new GETCallbackNotifier<Event>(new JsonStreamProcessor<Event>(
+                Event.class), command.getResultCallback(), webTarget.request());
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
index d6e62cd7a..b7769c792 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
@@ -5,13 +5,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.core.async.FrameStreamProcessor;
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
 
-public class LogContainerCmdExec extends AbstrDockerCmdExec<LogContainerCmd, Void> implements LogContainerCmd.Exec {
+public class LogContainerCmdExec extends AbstrAsyncDockerCmdExec<LogContainerCmd, Frame, Void> implements LogContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LogContainerCmdExec.class);
 
@@ -20,7 +21,9 @@ public LogContainerCmdExec(WebTarget baseResource) {
     }
 
     @Override
-    protected Void execute(LogContainerCmd command) {
+    protected AbstractCallbackNotifier<Frame> callbackNotifier(LogContainerCmd command,
+            ResultCallback<Frame> resultCallback) {
+
         WebTarget webTarget = getBaseResource().path("/containers/{id}/logs")
                 .resolveTemplate("id", command.getContainerId())
                 .queryParam("timestamps", command.hasTimestampsEnabled() ? "1" : "0")
@@ -31,11 +34,7 @@ protected Void execute(LogContainerCmd command) {
 
         LOGGER.trace("GET: {}", webTarget);
 
-        GETCallbackNotifier<Frame> callbackNotifier = new GETCallbackNotifier<Frame>(new FrameStreamProcessor(),
-                command.getResultCallback(), webTarget);
-
-        AbstractCallbackNotifier.startAsyncProcessing(callbackNotifier);
-
-        return null;
+        return new GETCallbackNotifier<Frame>(new FrameStreamProcessor(),
+                command.getResultCallback(), webTarget.request());
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
index c317aa1c9..224762a6b 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
@@ -1,20 +1,24 @@
 package com.github.dockerjava.jaxrs;
 
-import java.io.InputStream;
+import static javax.ws.rs.client.Entity.entity;
 
 import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.Invocation.Builder;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.model.AuthConfig;
-import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
+import com.github.dockerjava.api.model.PullResponseItem;
+import com.github.dockerjava.core.async.JsonStreamProcessor;
+import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
+import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
 
-public class PullImageCmdExec extends AbstrDockerCmdExec<PullImageCmd, InputStream> implements PullImageCmd.Exec {
+public class PullImageCmdExec extends AbstrAsyncDockerCmdExec<PullImageCmd, PullResponseItem, Void> implements PullImageCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PullImageCmdExec.class);
 
@@ -22,24 +26,29 @@ public PullImageCmdExec(WebTarget baseResource) {
         super(baseResource);
     }
 
+    private Invocation.Builder resourceWithOptionalAuthConfig(PullImageCmd command, Invocation.Builder request) {
+        AuthConfig authConfig = command.getAuthConfig();
+        if (authConfig != null) {
+            request = request.header("X-Registry-Auth", registryAuth(authConfig));
+        }
+        return request;
+    }
+
     @Override
-    protected InputStream execute(PullImageCmd command) {
+    protected AbstractCallbackNotifier<PullResponseItem> callbackNotifier(PullImageCmd command,
+            ResultCallback<PullResponseItem> resultCallback) {
+
         WebTarget webResource = getBaseResource().path("/images/create").queryParam("tag", command.getTag())
                 .queryParam("fromImage", command.getRepository()).queryParam("registry", command.getRegistry());
 
         LOGGER.trace("POST: {}", webResource);
-        Response response = resourceWithOptionalAuthConfig(command, webResource.request()).accept(
-                MediaType.APPLICATION_OCTET_STREAM_TYPE).post(null);
+        Builder builder = resourceWithOptionalAuthConfig(command, webResource.request()).accept(
+                MediaType.APPLICATION_OCTET_STREAM_TYPE);
 
-        return new WrappedResponseInputStream(response);
+        return new POSTCallbackNotifier<PullResponseItem>(new JsonStreamProcessor<PullResponseItem>(
+                PullResponseItem.class), resultCallback, builder, entity(null, MediaType.APPLICATION_JSON));
     }
 
-    private Invocation.Builder resourceWithOptionalAuthConfig(PullImageCmd command, Invocation.Builder request) {
-        AuthConfig authConfig = command.getAuthConfig();
-        if (authConfig != null) {
-            request = request.header("X-Registry-Auth", registryAuth(authConfig));
-        }
-        return request;
-    }
+
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
index 4f5ca5d0a..500bc7d47 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
@@ -2,28 +2,23 @@
 
 import static javax.ws.rs.client.Entity.entity;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-
+import javax.ws.rs.client.Invocation.Builder;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectReader;
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.PushImageCmd;
-import com.github.dockerjava.api.command.PushImageCmd.Response;
 import com.github.dockerjava.api.model.AuthConfig;
-import com.github.dockerjava.api.model.PushEventStreamItem;
-
-import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
-// Shaded, but imported
-import com.google.common.collect.ImmutableList;
+import com.github.dockerjava.api.model.PushResponseItem;
+import com.github.dockerjava.core.async.JsonStreamProcessor;
+import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
+import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
 
-public class PushImageCmdExec extends AbstrDockerCmdExec<PushImageCmd, Response> implements PushImageCmd.Exec {
+public class PushImageCmdExec extends AbstrAsyncDockerCmdExec<PushImageCmd, PushResponseItem, Void> implements
+        PushImageCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PushImageCmdExec.class);
 
@@ -31,51 +26,26 @@ public PushImageCmdExec(WebTarget baseResource) {
         super(baseResource);
     }
 
-    @Override
-    protected ResponseImpl execute(PushImageCmd command) {
-        WebTarget webResource = getBaseResource().path("/images/" + name(command) + "/push").queryParam("tag",
-                command.getTag());
-
-        final String registryAuth = registryAuth(command.getAuthConfig());
-        LOGGER.trace("POST: {}", webResource);
-        javax.ws.rs.core.Response response = webResource.request().header("X-Registry-Auth", registryAuth)
-                .accept(MediaType.APPLICATION_JSON).post(entity(Response.class, MediaType.APPLICATION_JSON));
-
-        return new ResponseImpl(new WrappedResponseInputStream(response));
-    }
-
     private String name(PushImageCmd command) {
         String name = command.getName();
         AuthConfig authConfig = command.getAuthConfig();
         return name.contains("/") ? name : authConfig.getUsername();
     }
 
-    public static class ResponseImpl extends Response {
-
-        private final InputStream proxy;
+    @Override
+    protected AbstractCallbackNotifier<PushResponseItem> callbackNotifier(PushImageCmd command,
+            ResultCallback<PushResponseItem> resultCallback) {
 
-        ResponseImpl(InputStream proxy) {
-            this.proxy = proxy;
-        }
+        WebTarget webResource = getBaseResource().path("/images/" + name(command) + "/push").queryParam("tag",
+                command.getTag());
 
-        @Override
-        public Iterable<PushEventStreamItem> getItems() throws IOException {
-            ObjectMapper mapper = new ObjectMapper();
-            // we'll be reading instances of MyBean
-            ObjectReader reader = mapper.reader(PushEventStreamItem.class);
-            // and then do other configuration, if any, and read:
-            Iterator<PushEventStreamItem> items = reader.readValues(proxy);
+        final String registryAuth = registryAuth(command.getAuthConfig());
+        LOGGER.trace("POST: {}", webResource);
 
-            try {
-                return ImmutableList.copyOf(items);
-            } finally {
-                proxy.close();
-            }
-        }
+        Builder builder = webResource.request().header("X-Registry-Auth", registryAuth)
+                .accept(MediaType.APPLICATION_JSON);
 
-        @Override
-        public int read() throws IOException {
-            return proxy.read();
-        }
+        return new POSTCallbackNotifier<PushResponseItem>(new JsonStreamProcessor<PushResponseItem>(
+                PushResponseItem.class), resultCallback, builder, entity(null, MediaType.APPLICATION_JSON));
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
index 683ecca46..c7e394b4b 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
@@ -5,13 +5,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.StatsCmd;
 import com.github.dockerjava.api.model.Statistics;
 import com.github.dockerjava.core.async.JsonStreamProcessor;
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
 
-public class StatsCmdExec extends AbstrDockerCmdExec<StatsCmd, Void> implements StatsCmd.Exec {
+public class StatsCmdExec extends AbstrAsyncDockerCmdExec<StatsCmd, Statistics, Void> implements StatsCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(StatsCmdExec.class);
 
     public StatsCmdExec(WebTarget baseResource) {
@@ -19,17 +20,16 @@ public StatsCmdExec(WebTarget baseResource) {
     }
 
     @Override
-    protected Void execute(StatsCmd command) {
+    protected AbstractCallbackNotifier<Statistics> callbackNotifier(StatsCmd command,
+            ResultCallback<Statistics> resultCallback) {
+
         WebTarget webTarget = getBaseResource().path("/containers/{id}/stats").resolveTemplate("id",
                 command.getContainerId());
 
         LOGGER.trace("GET: {}", webTarget);
 
-        GETCallbackNotifier<Statistics> callbackNotifier = new GETCallbackNotifier<Statistics>(
-                new JsonStreamProcessor<Statistics>(Statistics.class), command.getResultCallback(), webTarget);
-
-        AbstractCallbackNotifier.startAsyncProcessing(callbackNotifier);
+        return new GETCallbackNotifier<Statistics>(
+                new JsonStreamProcessor<Statistics>(Statistics.class), command.getResultCallback(), webTarget.request());
 
-        return null;
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java b/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
index 6cfc7a76e..3076b136a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
@@ -12,7 +12,7 @@
 import java.util.concurrent.Future;
 
 import javax.ws.rs.ProcessingException;
-import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.client.Invocation.Builder;
 import javax.ws.rs.core.Response;
 
 import com.github.dockerjava.api.async.ResultCallback;
@@ -25,15 +25,15 @@ public abstract class AbstractCallbackNotifier<T> implements Callable<Void> {
 
     private final ResultCallback<T> resultCallback;
 
-    protected final WebTarget webTarget;
+    protected final Builder requestBuilder;
 
     protected AbstractCallbackNotifier(ResponseStreamProcessor<T> responseStreamProcessor,
-            ResultCallback<T> resultCallback, WebTarget webTarget) {
-        checkNotNull(webTarget, "An WebTarget must be provided");
+            ResultCallback<T> resultCallback, Builder requestBuilder) {
+        checkNotNull(requestBuilder, "An WebTarget must be provided");
         checkNotNull(responseStreamProcessor, "A ResponseStreamProcessor must be provided");
         this.responseStreamProcessor = responseStreamProcessor;
         this.resultCallback = resultCallback;
-        this.webTarget = webTarget;
+        this.requestBuilder = requestBuilder;
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java b/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java
index cddfe49ed..996696479 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java
@@ -3,14 +3,13 @@
  */
 package com.github.dockerjava.jaxrs.async;
 
-import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.client.Invocation.Builder;
 import javax.ws.rs.core.Response;
 
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.core.async.ResponseStreamProcessor;
 
 /**
- * <TODO: class description>
  *
  * @author marcus
  *
@@ -18,12 +17,12 @@
 public class GETCallbackNotifier<T> extends AbstractCallbackNotifier<T> {
 
     public GETCallbackNotifier(ResponseStreamProcessor<T> responseStreamProcessor, ResultCallback<T> resultCallback,
-            WebTarget webTarget) {
-        super(responseStreamProcessor, resultCallback, webTarget);
+            Builder requestBuilder) {
+        super(responseStreamProcessor, resultCallback, requestBuilder);
     }
 
     protected Response response() {
-        return webTarget.request().get(Response.class);
+        return requestBuilder.get(Response.class);
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java b/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java
index 0d380b5db..9fe848950 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java
@@ -3,27 +3,30 @@
  */
 package com.github.dockerjava.jaxrs.async;
 
-import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.Invocation.Builder;
 import javax.ws.rs.core.Response;
 
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.core.async.ResponseStreamProcessor;
 
 /**
- * <TODO: class description>
  *
  * @author marcus
  *
  */
 public class POSTCallbackNotifier<T> extends AbstractCallbackNotifier<T> {
 
+    Entity<?> entity = null;
+
     public POSTCallbackNotifier(ResponseStreamProcessor<T> responseStreamProcessor, ResultCallback<T> resultCallback,
-            WebTarget webTarget) {
-        super(responseStreamProcessor, resultCallback, webTarget);
+            Builder requestBuilder, Entity<?> entity) {
+        super(responseStreamProcessor, resultCallback, requestBuilder);
+        this.entity = entity;
     }
 
     protected Response response() {
-        return webTarget.request().post(null, Response.class);
+        return requestBuilder.post(entity, Response.class);
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 7faca0370..362b8e21e 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -2,11 +2,14 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsString;
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.BuildResponseItem;
 import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.PullResponseItem;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumeBind;
 import com.github.dockerjava.core.DockerClientBuilder;
@@ -17,11 +20,13 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.LineIterator;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
 import org.testng.ITestResult;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
@@ -40,15 +45,18 @@ public abstract class AbstractDockerClientTest extends Assert {
     protected TestDockerCmdExecFactory dockerCmdExecFactory = new TestDockerCmdExecFactory(
             DockerClientBuilder.getDefaultDockerCmdExecFactory());
 
-    public void beforeTest() {
+    public void beforeTest() throws Exception {
 
         LOG.info("======================= BEFORETEST =======================");
         LOG.info("Connecting to Docker server");
         dockerClient = DockerClientBuilder.getInstance(config()).withDockerCmdExecFactory(dockerCmdExecFactory).build();
 
         LOG.info("Pulling image 'busybox'");
+
+        PullResponseCallback callback = new PullResponseCallback();
         // need to block until image is pulled completely
-        asString(dockerClient.pullImageCmd("busybox").withTag("latest").exec());
+        dockerClient.pullImageCmd("busybox", callback).withTag("latest").exec();
+        callback.awaitFinish();
 
         assertNotNull(dockerClient);
         LOG.info("======================= END OF BEFORETEST =======================\n\n");
@@ -181,10 +189,32 @@ public static void assertContainerHasVolumes(InspectContainerResponse inspectCon
         assertThat(volumes, contains(expectedVolumes));
     }
 
-    public static class CollectFramesCallback extends ResultCallbackTemplate<Frame> {
-        public final List<Frame> frames = new ArrayList<Frame>();
+    public static class CollectFramesCallback extends CollectStreamItemCallback<Frame> {
 
-        private final StringBuffer log = new StringBuffer();
+        @Override
+        public void onNext(Frame frame) {
+            items.add(frame);
+            log.append(new String(frame.getPayload()));
+        }
+
+    }
+
+    protected String containerLog(String containerId) throws Exception {
+
+        CollectFramesCallback collectFramesCallback = new CollectFramesCallback();
+
+        dockerClient.logContainerCmd(containerId, collectFramesCallback).withStdOut().exec();
+
+        collectFramesCallback.awaitFinish();
+
+        return collectFramesCallback.toString();
+    }
+
+
+    public static class CollectStreamItemCallback<T> extends ResultCallbackTemplate<T> {
+        public final List<T> items = new ArrayList<T>();
+
+        protected final StringBuffer log = new StringBuffer();
 
         @Override
         public void onError(Throwable throwable) {
@@ -193,9 +223,10 @@ public void onError(Throwable throwable) {
         }
 
         @Override
-        public void onNext(Frame frame) {
-            frames.add(frame);
-            log.append(new String(frame.getPayload()));
+        public void onNext(T item) {
+            items.add(item);
+            log.append("" + item);
+            LOG.info(item.toString());
         }
 
         @Override
@@ -204,14 +235,25 @@ public String toString() {
         }
     }
 
-    protected String containerLog(String containerId) throws Exception {
+    public static class BuildLogCallback extends CollectStreamItemCallback<BuildResponseItem> {
+        public String awaitImageId() throws Exception {
+            awaitFinish();
+            BuildResponseItem item = items.get(items.size() - 1);
+            assertThat(item.toString(), containsString("Successfully built"));
+            return item.getStream().replaceFirst("Successfully built", "").trim();
+        }
+    }
 
-        CollectFramesCallback collectFramesCallback = new CollectFramesCallback();
+    public static class PullResponseCallback extends CollectStreamItemCallback<PullResponseItem> {
 
-        dockerClient.logContainerCmd(containerId, collectFramesCallback).withStdOut().exec();
+    }
 
-        collectFramesCallback.awaitFinish();
+    protected String buildImage(File baseDir) throws Exception {
 
-        return collectFramesCallback.toString();
+        BuildLogCallback callback = new BuildLogCallback();
+
+        dockerClient.buildImageCmd(baseDir, callback).withNoCache().exec();
+
+        return callback.awaitImageId();
     }
 }
diff --git a/src/test/java/com/github/dockerjava/client/DockerClientTest.java b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
index 85ee0d7ac..120f4e823 100644
--- a/src/test/java/com/github/dockerjava/client/DockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
@@ -27,7 +27,7 @@ public class DockerClientTest extends AbstractDockerClientTest {
     public static final Logger LOG = LoggerFactory.getLogger(DockerClientTest.class);
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index 380f5dd9f..21294de21 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -13,9 +13,9 @@
 /**
  * Special {@link DockerCmdExecFactory} implementation that collects container and image creations while test execution
  * for the purpose of automatically cleanup.
- * 
+ *
  * @author marcus
- * 
+ *
  */
 public class TestDockerCmdExecFactory implements DockerCmdExecFactory {
 
@@ -91,16 +91,16 @@ public Void exec(RemoveImageCmd command) {
     public BuildImageCmd.Exec createBuildImageCmdExec() {
         return new BuildImageCmd.Exec() {
             @Override
-            public BuildImageCmd.Response exec(BuildImageCmd command) {
+            public Void exec(BuildImageCmd command) {
                 // can't detect image id here so tagging it
                 String tag = command.getTag();
                 if (tag == null || "".equals(tag.trim())) {
                     tag = "" + new SecureRandom().nextInt(Integer.MAX_VALUE);
                     command.withTag(tag);
                 }
-                InputStream inputStream = delegate.createBuildImageCmdExec().exec(command);
+                delegate.createBuildImageCmdExec().exec(command);
                 imageNames.add(tag);
-                return new BuildImageCmdExec.ResponseImpl(inputStream);
+                return null;
             }
         };
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
index 9c5c5c691..13456df88 100644
--- a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
@@ -6,12 +6,9 @@
 import static org.hamcrest.Matchers.not;
 
 import java.io.File;
-import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.commons.io.HexDump;
-import org.apache.commons.lang.StringUtils;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -19,7 +16,6 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.StreamType;
@@ -29,7 +25,7 @@
 public class AttachContainerCmdImplTest extends AbstractDockerClientTest {
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
@@ -85,12 +81,7 @@ public void attachContainerWithTTY() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader()
                 .getResource("attachContainerTestDockerfile").getFile());
 
-        InputStream response = dockerClient.buildImageCmd(baseDir).withNoCache().exec();
-
-        String fullLog = asString(response);
-        assertThat(fullLog, containsString("Successfully built"));
-
-        String imageId = StringUtils.substringBetween(fullLog, "Successfully built ", "\\n\"}").trim();
+        String imageId = buildImage(baseDir);
 
         CreateContainerResponse container = dockerClient.createContainerCmd(imageId).withTty(true).exec();
 
@@ -110,13 +101,13 @@ public void onNext(Frame frame) {
         dockerClient.attachContainerCmd(container.getId(), collectFramesCallback).withStdErr().withStdOut()
                 .withFollowStream().exec();
 
-        collectFramesCallback.awaitFinish(10, TimeUnit.SECONDS);
+        collectFramesCallback.awaitFinish(15, TimeUnit.SECONDS);
 
         collectFramesCallback.close();
 
         System.out.println("log: " + collectFramesCallback.toString());
 
-        HexDump.dump(collectFramesCallback.toString().getBytes(), 0, System.out, 0);
+        //HexDump.dump(collectFramesCallback.toString().getBytes(), 0, System.out, 0);
 
         assertThat(collectFramesCallback.toString(), containsString("stdout\r\nstderr"));
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
index 180d835b6..36211b205 100644
--- a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
@@ -1,20 +1,24 @@
 package com.github.dockerjava.core.command;
 
-import com.github.dockerjava.api.DockerException;
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
 import com.github.dockerjava.api.UnauthorizedException;
 import com.github.dockerjava.api.model.AuthResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import com.github.dockerjava.core.DockerClientBuilder;
-import org.testng.ITestResult;
-import org.testng.annotations.*;
-
-import java.lang.reflect.Method;
 
 @Test(groups = "integration")
 public class AuthCmdImplTest extends AbstractDockerClientTest {
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index f90250ea3..31b5089c2 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -27,12 +27,11 @@
 import org.testng.annotations.Test;
 
 import com.github.dockerjava.api.DockerClientException;
-import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.command.InspectImageResponse;
-import com.github.dockerjava.api.model.EventStreamItem;
+import com.github.dockerjava.api.model.BuildResponseItem;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import com.github.dockerjava.core.CompressArchiveUtil;
 
@@ -40,7 +39,7 @@
 public class BuildImageCmdImplTest extends AbstractDockerClientTest {
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
@@ -60,15 +59,10 @@ public void afterMethod(ITestResult result) {
     }
 
     @Test
-    public void testNginxDockerfileBuilder() {
+    public void testNginxDockerfileBuilder() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("nginx").getFile());
 
-        InputStream response = dockerClient.buildImageCmd(baseDir).withNoCache().exec();
-
-        String fullLog = asString(response);
-        assertThat(fullLog, containsString("Successfully built"));
-
-        String imageId = StringUtils.substringBetween(fullLog, "Successfully built ", "\\n\"}").trim();
+        String imageId = buildImage(baseDir);
 
         InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
         assertThat(inspectImageResponse, not(nullValue()));
@@ -78,27 +72,25 @@ public void testNginxDockerfileBuilder() {
     }
 
     @Test(groups = "ignoreInCircleCi")
-    public void testNonstandard1() {
+    public void testNonstandard1() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader()
                 .getResource("nonstandard/subdirectory/Dockerfile-nonstandard").getFile());
 
-        InputStream response = dockerClient.buildImageCmd(baseDir).withNoCache().exec();
-
-        String fullLog = asString(response);
-        assertThat(fullLog, containsString("Successfully built"));
+        buildImage(baseDir);
     }
 
     @Test(groups = "ignoreInCircleCi")
-    public void testNonstandard2() {
+    public void testNonstandard2() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("nonstandard").getFile());
         File dockerFile = new File(Thread.currentThread().getContextClassLoader()
                 .getResource("nonstandard/subdirectory/Dockerfile-nonstandard").getFile());
 
-        InputStream response = dockerClient.buildImageCmd().withBaseDirectory(baseDir).withDockerfile(dockerFile)
+        BuildLogCallback resultCallback = new BuildLogCallback();
+
+        dockerClient.buildImageCmd(resultCallback).withBaseDirectory(baseDir).withDockerfile(dockerFile)
                 .withNoCache().exec();
 
-        String fullLog = asString(response);
-        assertThat(fullLog, containsString("Successfully built"));
+        resultCallback.awaitImageId();
     }
 
     @Test
@@ -149,21 +141,22 @@ public void testDockerBuilderEnv() throws Exception {
     }
 
     private String dockerfileBuild(InputStream tarInputStream) throws Exception {
-        return execBuild(dockerClient.buildImageCmd().withTarInputStream(tarInputStream));
+        BuildLogCallback resultCallback = new BuildLogCallback();
+        return execBuild(dockerClient.buildImageCmd(resultCallback).withTarInputStream(tarInputStream));
     }
 
     private String dockerfileBuild(File baseDir) throws Exception {
-        return execBuild(dockerClient.buildImageCmd(baseDir));
+        BuildLogCallback resultCallback = new BuildLogCallback();
+        return execBuild(dockerClient.buildImageCmd(baseDir, resultCallback));
     }
 
     private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
-        // Build image
-        InputStream response = buildImageCmd.withNoCache().exec();
 
-        String fullLog = asString(response);
-        assertThat(fullLog, containsString("Successfully built"));
+        BuildLogCallback resultCallback = (BuildLogCallback) buildImageCmd.getResultCallback();
 
-        String imageId = StringUtils.substringBetween(fullLog, "Successfully built ", "\\n\"}").trim();
+        buildImageCmd.withNoCache().exec();
+
+        String imageId = resultCallback.awaitImageId();
 
         // Create container based on image
         CreateContainerResponse container = dockerClient.createContainerCmd(imageId).exec();
@@ -179,17 +172,22 @@ private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
     }
 
     @Test(expectedExceptions = { DockerClientException.class })
-    public void testDockerfileIgnored() {
+    public void testDockerfileIgnored() throws Exception{
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerfileIgnored")
                 .getFile());
-        dockerClient.buildImageCmd(baseDir).withNoCache().exec();
+        BuildLogCallback resultCallback = new BuildLogCallback();
+        dockerClient.buildImageCmd(baseDir, resultCallback).withNoCache().exec();
+        resultCallback.awaitImageId();
+
     }
 
     @Test(expectedExceptions = { DockerClientException.class })
-    public void testInvalidDockerIgnorePattern() {
+    public void testInvalidDockerIgnorePattern() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader()
                 .getResource("testInvalidDockerignorePattern").getFile());
-        dockerClient.buildImageCmd(baseDir).withNoCache().exec();
+        BuildLogCallback resultCallback = new BuildLogCallback();
+        dockerClient.buildImageCmd(baseDir, resultCallback).withNoCache().exec();
+        resultCallback.awaitImageId();
     }
 
     @Test(groups = "ignoreInCircleCi")
@@ -204,11 +202,14 @@ public void testDockerIgnore() throws Exception {
     public void testNetCatDockerfileBuilder() throws InterruptedException, IOException {
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("netcat").getFile());
 
-        Iterable<EventStreamItem> response = dockerClient.buildImageCmd(baseDir).withNoCache().exec().getItems();
+        BuildLogCallback resultCallback = new BuildLogCallback();
+        dockerClient.buildImageCmd(baseDir, resultCallback).withNoCache().exec();
+
+        resultCallback.awaitFinish();
 
         String imageId = null;
 
-        for (EventStreamItem item : response) {
+        for (BuildResponseItem item : resultCallback.items) {
             String text = item.getStream();
             if (text.startsWith("Successfully built ")) {
                 imageId = StringUtils.substringBetween(text, "Successfully built ", "\n").trim();
diff --git a/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
index 415ca8f0b..657edf8d7 100644
--- a/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
@@ -26,7 +26,7 @@
 public class CommitCmdImplTest extends AbstractDockerClientTest {
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
index e94c8c6c2..3db2b7282 100644
--- a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
@@ -27,7 +27,7 @@
 public class ContainerDiffCmdImplTest extends AbstractDockerClientTest {
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
index 72a97d04c..4f53bb774 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
@@ -17,7 +17,7 @@
 public class CopyFileFromContainerCmdImplTest extends AbstractDockerClientTest {
 
     @BeforeTest
-    public void beforeTest() {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 9876e43d5..d35efb636 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -26,7 +26,7 @@
 public class CreateContainerCmdImplTest extends AbstractDockerClientTest {
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
index 2d6ec9522..334bfa000 100644
--- a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
+++ b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -8,6 +8,7 @@
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.model.Image;
 import com.github.dockerjava.client.AbstractDockerClientTest;
+import com.github.dockerjava.client.AbstractDockerClientTest.BuildLogCallback;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,18 +37,18 @@ public DockerfileFixture(DockerClient dockerClient, String directory) {
         this.directory = directory;
     }
 
-    public void open() throws IOException {
+    public void open() throws Exception {
 
         LOGGER.info("building {}", directory);
-        InputStream response = dockerClient.buildImageCmd(new File("src/test/resources", directory)).withNoCache() // remove
+        BuildLogCallback resultCallback = new BuildLogCallback();
+
+        dockerClient.buildImageCmd(new File("src/test/resources", directory), resultCallback).withNoCache() // remove
                                                                                                                    // alternatives,
                                                                                                                    // cause
                                                                                                                    // problems
                 .exec();
 
-        String log = AbstractDockerClientTest.consumeAsString(response);
-
-        assertThat(log, containsString("Successfully built"));
+        resultCallback.awaitImageId();
 
         Image lastCreatedImage = dockerClient.listImagesCmd().exec().get(0);
 
diff --git a/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java b/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
deleted file mode 100644
index c311540b1..000000000
--- a/src/test/java/com/github/dockerjava/core/command/EventStreamReaderITest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.model.EventStreamItem;
-import com.github.dockerjava.api.model.PullEventStreamItem;
-import com.github.dockerjava.core.DockerClientBuilder;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.io.File;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.beans.HasPropertyWithValue.hasProperty;
-import static org.hamcrest.core.AllOf.allOf;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNull.nullValue;
-import static org.testng.AssertJUnit.assertNull;
-
-@Test(groups = "integration")
-public class EventStreamReaderITest {
-
-    private DockerClient dockerClient;
-
-    @BeforeTest
-    public void setUp() throws Exception {
-        dockerClient = DockerClientBuilder.getInstance().build();
-    }
-
-    @AfterTest
-    public void tearDown() throws Exception {
-        dockerClient.close();
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void pullCanBeStreamed() throws Exception {
-
-        try (EventStreamReader<PullEventStreamItem> reader = new EventStreamReader<>(dockerClient.pullImageCmd(
-                "busybox:latest").exec(), PullEventStreamItem.class)) {
-            ;
-            assertThat(
-                    reader.readItem(),
-                    allOf(hasProperty("status", equalTo("Pulling from busybox")), hasProperty("progress", nullValue()),
-                            hasProperty("progressDetail", nullValue())));
-            assertNull(reader.readItem());
-        }
-    }
-
-    @Test
-    public void buildCanBeStreamed() throws Exception {
-
-        try (EventStreamReader<EventStreamItem> reader = new EventStreamReader<>(dockerClient.buildImageCmd(
-                new File("src/test/resources/eventStreamReaderDockerfile")).exec(), EventStreamItem.class)) {
-            assertThat(
-                    reader.readItem(),
-                    allOf(hasProperty("stream", equalTo("Step 0 : FROM busybox:latest\n")),
-                            hasProperty("error", nullValue()), hasProperty("errorDetail", nullValue())));
-            assertNull(reader.readItem());
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
index eb490d7e9..17ad84c3b 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -31,7 +31,7 @@ private static String getEpochTime() {
     }
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
@@ -54,7 +54,7 @@ public void afterMethod(ITestResult result) {
      * This specific test may fail with boot2docker as time may not in sync with host system
      */
     @Test
-    public void testEventStreamTimeBound() throws InterruptedException, IOException {
+    public void testEventStreamTimeBound() throws Exception {
         // Don't include other tests events
         TimeUnit.SECONDS.sleep(1);
 
@@ -76,7 +76,7 @@ public void testEventStreamTimeBound() throws InterruptedException, IOException
     }
 
     @Test
-    public void testEventStreaming1() throws InterruptedException, IOException {
+    public void testEventStreaming1() throws Exception {
         // Don't include other tests events
         TimeUnit.SECONDS.sleep(1);
 
@@ -95,7 +95,7 @@ public void testEventStreaming1() throws InterruptedException, IOException {
     }
 
     @Test
-    public void testEventStreaming2() throws InterruptedException, IOException {
+    public void testEventStreaming2() throws Exception {
         // Don't include other tests events
         TimeUnit.SECONDS.sleep(1);
 
@@ -116,9 +116,12 @@ public void testEventStreaming2() throws InterruptedException, IOException {
     /**
      * This method generates {#link KNOWN_NUM_EVENTS} events
      */
-    private int generateEvents() {
+    private int generateEvents() throws Exception {
         String testImage = "busybox";
-        asString(dockerClient.pullImageCmd(testImage).exec());
+
+        PullResponseCallback callback = new PullResponseCallback();
+        dockerClient.pullImageCmd(testImage, callback).exec();
+        callback.awaitFinish();
         CreateContainerResponse container = dockerClient.createContainerCmd(testImage).withCmd("sleep", "9999").exec();
         dockerClient.startContainerCmd(container.getId()).exec();
         dockerClient.stopContainerCmd(container.getId()).exec();
diff --git a/src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java
index d5ec79307..139c81f56 100644
--- a/src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java
@@ -1,23 +1,27 @@
 package com.github.dockerjava.core.command;
 
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.ExecCreateCmdResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import org.testng.ITestResult;
-import org.testng.annotations.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
 
 import java.lang.reflect.Method;
 import java.security.SecureRandom;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.ExecCreateCmdResponse;
+import com.github.dockerjava.client.AbstractDockerClientTest;
 
 @Test(groups = "integration")
 public class ExecCreateCmdImplTest extends AbstractDockerClientTest {
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
index c3586a965..94934296b 100644
--- a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
@@ -1,24 +1,28 @@
 package com.github.dockerjava.core.command;
 
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.ExecCreateCmdResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import org.testng.ITestResult;
-import org.testng.annotations.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
 
 import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.security.SecureRandom;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.ExecCreateCmdResponse;
+import com.github.dockerjava.client.AbstractDockerClientTest;
 
 @Test(groups = "integration")
 public class ExecStartCmdImplTest extends AbstractDockerClientTest {
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index 6f847ebed..9863f4178 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -63,7 +63,7 @@ private List<Frame> getLoggingFrames() throws Exception {
 
         collectFramesCallback.awaitFinish();
 
-        return collectFramesCallback.frames;
+        return collectFramesCallback.items;
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
index 19e275078..f6551d573 100644
--- a/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
@@ -1,5 +1,9 @@
 package com.github.dockerjava.core.command;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.not;
+
 import java.lang.reflect.Method;
 
 import org.testng.ITestResult;
@@ -14,15 +18,11 @@
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyOrNullString;
-import static org.hamcrest.Matchers.not;
-
 @Test(groups = "integration")
 public class InfoCmdImplTest extends AbstractDockerClientTest {
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
index 69f4d78e1..62f530bf2 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
@@ -1,30 +1,33 @@
 package com.github.dockerjava.core.command;
 
-import com.github.dockerjava.api.DockerException;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.security.SecureRandom;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.ExecCreateCmdResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.command.InspectExecResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import com.github.dockerjava.test.serdes.JSONTestHelper;
-import java.io.IOException;
-
-import org.testng.ITestResult;
-import org.testng.annotations.*;
-
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.security.SecureRandom;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
 
 @Test(groups = "integration")
 public class InspectExecCmdImplTest extends AbstractDockerClientTest {
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
index e60930d88..6346ce165 100644
--- a/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
@@ -29,7 +29,7 @@ public class KillContainerCmdImplTest extends AbstractDockerClientTest {
     public static final Logger LOG = LoggerFactory.getLogger(KillContainerCmdImplTest.class);
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
index 2f052f841..79302bef8 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
@@ -35,7 +35,7 @@
 public class ListContainersCmdImplTest extends AbstractDockerClientTest {
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
@@ -54,12 +54,14 @@ public void afterMethod(ITestResult result) {
         super.afterMethod(result);
     }
 
-    public void testListContainers() throws DockerException {
+    public void testListContainers() throws Exception {
 
         String testImage = "busybox";
 
         // need to block until image is pulled completely
-        asString(dockerClient.pullImageCmd(testImage).exec());
+        PullResponseCallback callback = new PullResponseCallback();
+        dockerClient.pullImageCmd(testImage, callback).exec();
+        callback.awaitFinish();
 
         List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
         assertThat(containers, notNullValue());
@@ -102,12 +104,14 @@ public void testListContainers() throws DockerException {
     }
 
     @Test
-    public void testListContainersWithLabelsFilter() throws DockerException {
+    public void testListContainersWithLabelsFilter() throws Exception {
 
         String testImage = "busybox";
 
+        PullResponseCallback callback = new PullResponseCallback();
         // need to block until image is pulled completely
-        asString(dockerClient.pullImageCmd(testImage).exec());
+        dockerClient.pullImageCmd(testImage, callback).exec();
+        callback.awaitFinish();
 
         List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
         assertThat(containers, notNullValue());
diff --git a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
index e91641eeb..d47dbb50a 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
@@ -23,7 +23,7 @@
 public class ListImagesCmdImplTest extends AbstractDockerClientTest {
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
index 7453b3402..9df8f4c5a 100644
--- a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
@@ -7,8 +7,6 @@
 
 import java.io.IOException;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
 
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
@@ -17,18 +15,15 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.client.AbstractDockerClientTest;
-import com.github.dockerjava.core.async.ResultCallbackTemplate;
 
 @Test(groups = "integration")
 public class LogContainerCmdImplTest extends AbstractDockerClientTest {
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
index f3871e042..9761f1da8 100644
--- a/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
@@ -1,34 +1,37 @@
 package com.github.dockerjava.core.command;
 
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.InternalServerErrorException;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
+import static org.hamcrest.Matchers.notNullValue;
+
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.InspectImageResponse;
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.client.AbstractDockerClientTest;
-import org.testng.ITestResult;
-import org.testng.annotations.*;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
 
 @Test(groups = "integration")
 public class PullImageCmdImplTest extends AbstractDockerClientTest {
 
     private static final PullImageCmd.Exec NOP_EXEC = new PullImageCmd.Exec() {
         @Override
-        public InputStream exec(PullImageCmd command) {
+        public Void exec(PullImageCmd command) {
             return null;
         }
     };
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
@@ -49,17 +52,19 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void nullAuthConfig() throws Exception {
-        PullImageCmdImpl pullImageCmd = new PullImageCmdImpl(NOP_EXEC, null, "");
+        PullImageCmdImpl pullImageCmd = new PullImageCmdImpl(NOP_EXEC, null, "", new PullResponseCallback());
         try {
             pullImageCmd.withAuthConfig(null);
             fail();
         } catch (Exception e) {
             assertEquals(e.getMessage(), "authConfig was not specified");
+        } finally {
+            pullImageCmd.close();
         }
     }
 
     @Test
-    public void testPullImage() throws DockerException, IOException {
+    public void testPullImage() throws Exception {
         Info info = dockerClient.infoCmd().exec();
         LOG.info("Client info: {}", info.toString());
 
@@ -89,9 +94,13 @@ public void testPullImage() throws DockerException, IOException {
 
         LOG.info("Pulling image: {}", testImage);
 
-        InputStream response = dockerClient.pullImageCmd(testImage).exec();
+        PullResponseCallback callback = new PullResponseCallback();
+
+        dockerClient.pullImageCmd(testImage, callback).exec();
 
-        assertThat(asString(response), containsString("Download complete"));
+        callback.awaitFinish();
+
+        assertThat(callback.toString(), containsString("Download complete"));
 
         info = dockerClient.infoCmd().exec();
         LOG.info("Client info after pull, {}", info.toString());
@@ -104,12 +113,15 @@ public void testPullImage() throws DockerException, IOException {
     }
 
     @Test
-    public void testPullNonExistingImage() throws DockerException, IOException {
+    public void testPullNonExistingImage() throws Exception {
 
         // does not throw an exception
-        InputStream is = dockerClient.pullImageCmd("xvxcv/foo").exec();
+
+        PullResponseCallback callback = new PullResponseCallback();
+
+        dockerClient.pullImageCmd("xvxcv/foo", callback).exec();
         // stream needs to be fully read in order to close the underlying connection
-        asString(is);
+        callback.awaitFinish();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
index 8498256a8..1567ab3aa 100644
--- a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
@@ -1,17 +1,24 @@
 package com.github.dockerjava.core.command;
 
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+import java.lang.reflect.Method;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.ITestResult;
-import org.testng.annotations.*;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
 
-import java.lang.reflect.Method;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.model.PushResponseItem;
+import com.github.dockerjava.client.AbstractDockerClientTest;
 
 @Test(groups = "integration")
 public class PushImageCmdImplTest extends AbstractDockerClientTest {
@@ -21,7 +28,7 @@ public class PushImageCmdImplTest extends AbstractDockerClientTest {
     String username;
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
         username = dockerClient.authConfig().getUsername();
     }
@@ -53,21 +60,40 @@ public void pushLatest() throws Exception {
         LOG.info("Committing container: {}", container.toString());
         String imageId = dockerClient.commitCmd(container.getId()).withRepository(username + "/busybox").exec();
 
+
+        PushResponseCallback callback  = new PushResponseCallback();
+
         // we have to block until image is pushed
-        asString(dockerClient.pushImageCmd(username + "/busybox").exec());
+        dockerClient.pushImageCmd(username + "/busybox", callback).exec();
+
+        callback.awaitFinish();
 
         LOG.info("Removing image: {}", imageId);
         dockerClient.removeImageCmd(imageId).exec();
 
-        String response = asString(dockerClient.pullImageCmd(username + "/busybox").exec());
+        PullResponseCallback pushCallback = new PullResponseCallback();
 
-        assertThat(response, not(containsString("HTTP code: 404")));
+        dockerClient.pullImageCmd(username + "/busybox", pushCallback).exec();
+
+        pushCallback.awaitFinish();
+
+        assertThat(pushCallback.toString(), not(containsString("HTTP code: 404")));
     }
 
     @Test
-    public void pushExistentImage() throws Exception {
+    public void pushNonExistentImage() throws Exception {
+
+        PushResponseCallback callback  = new PushResponseCallback();
+
+        dockerClient.pushImageCmd(username + "/xxx", callback).exec();
+
+        callback.awaitFinish();
+
+        assertThat(callback.toString(), containsString("error"));
+    }
+
+    public static class PushResponseCallback extends CollectStreamItemCallback<PushResponseItem> {
 
-        assertThat(asString(dockerClient.pushImageCmd(username + "/xxx").exec()), containsString("error"));
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
index 22fbb096c..3241f0739 100644
--- a/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
@@ -31,7 +31,7 @@ public class RemoveContainerCmdImplTest extends AbstractDockerClientTest {
     public static final Logger LOG = LoggerFactory.getLogger(RemoveContainerCmdImplTest.class);
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
index 1c0f3db1c..75f58828b 100644
--- a/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
@@ -32,7 +32,7 @@ public class RemoveImageCmdImplTest extends AbstractDockerClientTest {
     public static final Logger LOG = LoggerFactory.getLogger(RemoveImageCmdImplTest.class);
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
index 866800163..1258cd7df 100644
--- a/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
@@ -25,7 +25,7 @@
 public class RestartContainerCmdImplTest extends AbstractDockerClientTest {
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/SaveImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/SaveImageCmdImplTest.java
index 9facdc2d9..ffc81d4e0 100644
--- a/src/test/java/com/github/dockerjava/core/command/SaveImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/SaveImageCmdImplTest.java
@@ -1,8 +1,11 @@
 package com.github.dockerjava.core.command;
 
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
+
+import java.io.InputStream;
+import java.lang.reflect.Method;
+
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,16 +16,7 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import java.io.BufferedInputStream;
-import java.io.DataInputStream;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
+import com.github.dockerjava.client.AbstractDockerClientTest;
 
 @Test(groups = "integration")
 public class SaveImageCmdImplTest extends AbstractDockerClientTest {
@@ -31,7 +25,7 @@ public class SaveImageCmdImplTest extends AbstractDockerClientTest {
     String username;
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java
index f61ff078a..6b3d2adb9 100644
--- a/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java
@@ -26,7 +26,7 @@
 public class SearchImagesCmdImplTest extends AbstractDockerClientTest {
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index d690f4e13..ae323c4c0 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -46,7 +46,7 @@
 public class StartContainerCmdImplTest extends AbstractDockerClientTest {
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
index 5ccb01038..641510d61 100644
--- a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
@@ -17,7 +17,6 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.StatsCmd;
 import com.github.dockerjava.api.model.Statistics;
@@ -30,7 +29,7 @@ public class StatsCmdImplTest extends AbstractDockerClientTest {
     private static int NUM_STATS = 5;
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
index 8a2a2f13e..1342471ca 100644
--- a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
@@ -29,7 +29,7 @@ public class StopContainerCmdImplTest extends AbstractDockerClientTest {
     public static final Logger LOG = LoggerFactory.getLogger(StopContainerCmdImplTest.class);
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java
index b7c8bc4ff..116d2b68d 100644
--- a/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java
@@ -12,7 +12,6 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
@@ -22,7 +21,7 @@ public class TagImageCmdImplTest extends AbstractDockerClientTest {
     public static final Logger LOG = LoggerFactory.getLogger(TagImageCmdImplTest.class);
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java
index edb5560e6..7bac10c6e 100644
--- a/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java
@@ -18,7 +18,7 @@
 public class VersionCmdImplTest extends AbstractDockerClientTest {
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
index 576506498..3b5172b9e 100644
--- a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
@@ -25,7 +25,7 @@
 public class WaitContainerCmdImplTest extends AbstractDockerClientTest {
 
     @BeforeTest
-    public void beforeTest() throws DockerException {
+    public void beforeTest() throws Exception {
         super.beforeTest();
     }
 

From 9b93299257fffb5cda262132d46a97c256adb375 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 15 Jul 2015 10:49:37 +0200
Subject: [PATCH 0137/1272] Refactored async commands for passing result
 callback into exec() method

---
 .../github/dockerjava/api/DockerClient.java   | 20 ++++----
 .../dockerjava/api/async/ResultCallback.java  |  4 +-
 .../api/command/AsyncDockerCmd.java           |  5 +-
 .../api/command/AttachContainerCmd.java       | 12 +----
 .../dockerjava/api/command/AuthCmd.java       |  8 ++--
 .../dockerjava/api/command/BuildImageCmd.java |  4 +-
 .../dockerjava/api/command/CommitCmd.java     |  4 +-
 .../api/command/ContainerDiffCmd.java         |  4 +-
 .../api/command/CopyFileFromContainerCmd.java |  6 +--
 .../api/command/CreateContainerCmd.java       |  4 +-
 .../api/command/CreateImageCmd.java           |  4 +-
 .../dockerjava/api/command/DockerCmd.java     |  2 +-
 .../api/command/DockerCmdAsyncExec.java       |  9 ++++
 ...kerCmdExec.java => DockerCmdSyncExec.java} |  2 +-
 .../dockerjava/api/command/EventsCmd.java     |  4 +-
 .../dockerjava/api/command/ExecCreateCmd.java |  4 +-
 .../dockerjava/api/command/ExecStartCmd.java  |  6 +--
 .../dockerjava/api/command/InfoCmd.java       |  4 +-
 .../api/command/InspectContainerCmd.java      |  4 +-
 .../api/command/InspectExecCmd.java           |  4 +-
 .../api/command/InspectImageCmd.java          |  4 +-
 .../api/command/KillContainerCmd.java         |  4 +-
 .../api/command/ListContainersCmd.java        |  4 +-
 .../dockerjava/api/command/ListImagesCmd.java |  4 +-
 .../api/command/LogContainerCmd.java          | 17 ++-----
 .../api/command/PauseContainerCmd.java        |  4 +-
 .../dockerjava/api/command/PingCmd.java       |  6 +--
 .../dockerjava/api/command/PullImageCmd.java  | 11 +----
 .../dockerjava/api/command/PushImageCmd.java  |  8 ++--
 .../api/command/RemoveContainerCmd.java       |  6 +--
 .../api/command/RemoveImageCmd.java           |  6 +--
 .../api/command/RestartContainerCmd.java      |  4 +-
 .../dockerjava/api/command/SaveImageCmd.java  |  6 +--
 .../api/command/SearchImagesCmd.java          |  4 +-
 .../api/command/StartContainerCmd.java        |  4 +-
 .../dockerjava/api/command/StatsCmd.java      |  4 +-
 .../api/command/StopContainerCmd.java         |  4 +-
 .../dockerjava/api/command/SyncDockerCmd.java |  8 ++++
 .../dockerjava/api/command/TagImageCmd.java   |  6 +--
 .../api/command/TopContainerCmd.java          |  4 +-
 .../api/command/UnpauseContainerCmd.java      |  4 +-
 .../dockerjava/api/command/VersionCmd.java    |  4 +-
 .../api/command/WaitContainerCmd.java         |  6 +--
 .../dockerjava/core/DockerClientImpl.java     | 43 ++++++++---------
 .../core/async/ResultCallbackTemplate.java    | 18 +++++--
 .../core/command/AbstrAsyncDockerCmd.java     | 30 ++++++------
 .../core/command/AbstrAuthCfgDockerCmd.java   |  6 +--
 .../core/command/AbstrDockerCmd.java          |  9 ++--
 .../core/command/AttachContainerCmdImpl.java  | 15 ++----
 .../core/command/BuildImageCmdImpl.java       | 15 +++---
 .../core/command/EventStreamReader.java       | 37 ---------------
 .../core/command/EventsCmdImpl.java           |  6 +--
 .../core/command/InspectExecCmdImpl.java      |  2 +-
 .../core/command/LogContainerCmdImpl.java     | 14 ++----
 .../core/command/PullImageCmdImpl.java        |  9 ++--
 .../core/command/PushImageCmdImpl.java        | 17 ++-----
 .../dockerjava/core/command/StatsCmdImpl.java | 11 ++---
 .../jaxrs/AbstrAsyncDockerCmdExec.java        | 31 +++---------
 .../dockerjava/jaxrs/AbstrDockerCmdExec.java  | 30 +-----------
 .../jaxrs/AbstrSyncDockerCmdExec.java         | 44 +++++++++++++++++
 .../jaxrs/AttachContainerCmdExec.java         |  4 +-
 .../github/dockerjava/jaxrs/AuthCmdExec.java  |  2 +-
 .../dockerjava/jaxrs/BuildImageCmdExec.java   |  2 +-
 .../dockerjava/jaxrs/CommitCmdExec.java       |  2 +-
 .../jaxrs/ContainerDiffCmdExec.java           |  2 +-
 .../jaxrs/CopyFileFromContainerCmdExec.java   |  2 +-
 .../jaxrs/CreateContainerCmdExec.java         |  2 +-
 .../dockerjava/jaxrs/CreateImageCmdExec.java  |  2 +-
 .../dockerjava/jaxrs/EventsCmdExec.java       |  4 +-
 .../dockerjava/jaxrs/ExecCreateCmdExec.java   |  2 +-
 .../dockerjava/jaxrs/ExecStartCmdExec.java    |  2 +-
 .../github/dockerjava/jaxrs/InfoCmdExec.java  |  2 +-
 .../jaxrs/InspectContainerCmdExec.java        |  2 +-
 .../dockerjava/jaxrs/InspectExecCmdExec.java  |  2 +-
 .../dockerjava/jaxrs/InspectImageCmdExec.java |  2 +-
 .../jaxrs/KillContainerCmdExec.java           |  2 +-
 .../jaxrs/ListContainersCmdExec.java          |  2 +-
 .../dockerjava/jaxrs/ListImagesCmdExec.java   |  2 +-
 .../dockerjava/jaxrs/LogContainerCmdExec.java |  6 +--
 .../jaxrs/PauseContainerCmdExec.java          |  2 +-
 .../github/dockerjava/jaxrs/PingCmdExec.java  |  2 +-
 .../dockerjava/jaxrs/PullImageCmdExec.java    |  6 +--
 .../dockerjava/jaxrs/PushImageCmdExec.java    |  2 +-
 .../jaxrs/RemoveContainerCmdExec.java         |  2 +-
 .../dockerjava/jaxrs/RemoveImageCmdExec.java  |  2 +-
 .../jaxrs/RestartContainerCmdExec.java        |  2 +-
 .../dockerjava/jaxrs/SaveImageCmdExec.java    |  2 +-
 .../dockerjava/jaxrs/SearchImagesCmdExec.java |  2 +-
 .../jaxrs/StartContainerCmdExec.java          |  2 +-
 .../github/dockerjava/jaxrs/StatsCmdExec.java |  7 ++-
 .../jaxrs/StopContainerCmdExec.java           |  2 +-
 .../dockerjava/jaxrs/TagImageCmdExec.java     |  2 +-
 .../dockerjava/jaxrs/TopContainerCmdExec.java |  2 +-
 .../jaxrs/UnpauseContainerCmdExec.java        |  2 +-
 .../dockerjava/jaxrs/VersionCmdExec.java      |  2 +-
 .../jaxrs/WaitContainerCmdExec.java           |  2 +-
 .../client/AbstractDockerClientTest.java      | 33 +++++--------
 .../core/TestDockerCmdExecFactory.java        | 47 +++++++++++++++++--
 .../command/AttachContainerCmdImplTest.java   | 12 ++---
 .../core/command/BuildImageCmdImplTest.java   | 33 +++++--------
 .../core/command/DockerfileFixture.java       | 10 +---
 .../core/command/EventsCmdImplTest.java       | 16 +++----
 .../core/command/FrameReaderITest.java        |  6 +--
 .../command/ListContainersCmdImplTest.java    |  8 +---
 .../core/command/LogContainerCmdImplTest.java | 16 +++----
 .../core/command/PullImageCmdImplTest.java    | 21 ++++-----
 .../core/command/PushImageCmdImplTest.java    | 23 +++------
 .../core/command/StatsCmdImplTest.java        |  6 +--
 108 files changed, 409 insertions(+), 494 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java
 rename src/main/java/com/github/dockerjava/api/command/{DockerCmdExec.java => DockerCmdSyncExec.java} (53%)
 create mode 100644 src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java
 delete mode 100644 src/main/java/com/github/dockerjava/core/command/EventStreamReader.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index eff4529db..cd276ec16 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -71,11 +71,11 @@ public interface DockerClient extends Closeable {
      * * IMAGE API *
      */
 
-    public PullImageCmd pullImageCmd(String repository, ResultCallback<PullResponseItem> resultCallback);
+    public PullImageCmd pullImageCmd(String repository);
 
-    public PushImageCmd pushImageCmd(String name, ResultCallback<PushResponseItem> resultCallback);
+    public PushImageCmd pushImageCmd(String name);
 
-    public PushImageCmd pushImageCmd(Identifier identifier, ResultCallback<PushResponseItem> resultCallback);
+    public PushImageCmd pushImageCmd(Identifier identifier);
 
     public CreateImageCmd createImageCmd(String repository, InputStream imageStream);
 
@@ -117,13 +117,13 @@ public interface DockerClient extends Closeable {
 
     public WaitContainerCmd waitContainerCmd(String containerId);
 
-    public AttachContainerCmd attachContainerCmd(String containerId, ResultCallback<Frame> resultCallback);
+    public AttachContainerCmd attachContainerCmd(String containerId);
 
     public ExecStartCmd execStartCmd(String containerId);
 
     public InspectExecCmd inspectExecCmd(String execId);
 
-    public LogContainerCmd logContainerCmd(String containerId, ResultCallback<Frame> resultCallback);
+    public LogContainerCmd logContainerCmd(String containerId);
 
     public CopyFileFromContainerCmd copyFileFromContainerCmd(String containerId, String resource);
 
@@ -137,11 +137,11 @@ public interface DockerClient extends Closeable {
 
     public CommitCmd commitCmd(String containerId);
 
-    public BuildImageCmd buildImageCmd(ResultCallback<BuildResponseItem> resultCallback);
+    public BuildImageCmd buildImageCmd();
 
-    public BuildImageCmd buildImageCmd(File dockerFileOrFolder, ResultCallback<BuildResponseItem> resultCallback);
+    public BuildImageCmd buildImageCmd(File dockerFileOrFolder);
 
-    public BuildImageCmd buildImageCmd(InputStream tarInputStream, ResultCallback<BuildResponseItem> resultCallback);
+    public BuildImageCmd buildImageCmd(InputStream tarInputStream);
 
     public TopContainerCmd topContainerCmd(String containerId);
 
@@ -151,9 +151,9 @@ public interface DockerClient extends Closeable {
 
     public UnpauseContainerCmd unpauseContainerCmd(String containerId);
 
-    public EventsCmd eventsCmd(ResultCallback<Event> resultCallback);
+    public EventsCmd eventsCmd();
 
-    public StatsCmd statsCmd(ResultCallback<Statistics> resultCallback);
+    public StatsCmd statsCmd();
 
     @Override
     public void close() throws IOException;
diff --git a/src/main/java/com/github/dockerjava/api/async/ResultCallback.java b/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
index fc3e5985e..1eb7ebce1 100644
--- a/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
+++ b/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
@@ -5,7 +5,7 @@
 /**
  * Result callback
  */
-public interface ResultCallback<RES_T> extends Closeable {
+public interface ResultCallback<A_RES_T> extends Closeable {
     /**
      * Called when the async processing starts. The passed {@link Closeable} can be used to close/interrupt the
      * processing
@@ -13,7 +13,7 @@ public interface ResultCallback<RES_T> extends Closeable {
     void onStart(Closeable closeable);
 
     /** Called when an async result event occurs */
-    void onNext(RES_T object);
+    void onNext(A_RES_T object);
 
     /** Called when an exception occurs while processing */
     void onError(Throwable throwable);
diff --git a/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java b/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
index 38c078898..fb1b894d0 100644
--- a/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
@@ -11,10 +11,9 @@
  * @author marcus
  *
  */
-public interface AsyncDockerCmd<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T, RES_T>, A_RES_T, RES_T> extends DockerCmd<RES_T> {
+public interface AsyncDockerCmd<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T>, A_RES_T> extends DockerCmd<Void> {
 
-    public ResultCallback<A_RES_T> getResultCallback();
 
-    public CMD_T withResultCallback(ResultCallback<A_RES_T> resultCallback);
+    public <T extends ResultCallback<A_RES_T>> T exec(T resultCallback);
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
index a06e97c0e..f837c89c5 100644
--- a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
@@ -3,7 +3,6 @@
 import java.io.InputStream;
 
 import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.model.Frame;
 
 /**
@@ -21,7 +20,7 @@
  * @param timestamps
  *            - true or false, if true, print timestamps for every log line. Defaults to false.
  */
-public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, Frame, Void> {
+public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, Frame> {
 
     public String getContainerId();
 
@@ -63,14 +62,7 @@ public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, F
 
     public AttachContainerCmd withLogs();
 
-    /**
-     * @throws NotFoundException
-     *             No such container
-     */
-    @Override
-    public Void exec();
-
-    public static interface Exec extends DockerCmdExec<AttachContainerCmd, Void> {
+    public static interface Exec extends DockerCmdAsyncExec<AttachContainerCmd, Frame> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
index c84fcb3b9..26e05c1e6 100644
--- a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
@@ -5,11 +5,11 @@
 import com.github.dockerjava.api.model.AuthResponse;
 
 /**
- * 
+ *
  * Authenticate with the server, useful for checking authentication.
- * 
+ *
  */
-public interface AuthCmd extends DockerCmd<AuthResponse> {
+public interface AuthCmd extends SyncDockerCmd<AuthResponse> {
 
     public AuthConfig getAuthConfig();
 
@@ -24,7 +24,7 @@ public interface AuthCmd extends DockerCmd<AuthResponse> {
     @Override
     public AuthResponse exec() throws UnauthorizedException;
 
-    public static interface Exec extends DockerCmdExec<AuthCmd, AuthResponse> {
+    public static interface Exec extends DockerCmdSyncExec<AuthCmd, AuthResponse> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 534645b86..5fd6015c3 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -13,7 +13,7 @@
  * TODO: http://docs.docker.com/reference/builder/#dockerignore
  *
  */
-public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildResponseItem, Void> {
+public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildResponseItem> {
 
     public BuildImageCmd withTag(String tag);
 
@@ -57,7 +57,7 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfig);
 
-    public static interface Exec extends DockerCmdExec<BuildImageCmd, Void> {
+    public static interface Exec extends DockerCmdAsyncExec<BuildImageCmd, BuildResponseItem> {
     }
 
 
diff --git a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
index 2c24a0f42..10de66459 100644
--- a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
@@ -9,7 +9,7 @@
  * Create a new image from a container's changes. Returns the new image ID.
  *
  */
-public interface CommitCmd extends DockerCmd<String> {
+public interface CommitCmd extends SyncDockerCmd<String> {
 
     public String getContainerId();
 
@@ -110,7 +110,7 @@ public interface CommitCmd extends DockerCmd<String> {
     @Override
     public String exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<CommitCmd, String> {
+    public static interface Exec extends DockerCmdSyncExec<CommitCmd, String> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java b/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
index ed7028460..968fb5c7c 100644
--- a/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
@@ -7,7 +7,7 @@
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.model.ChangeLog;
 
-public interface ContainerDiffCmd extends DockerCmd<List<ChangeLog>> {
+public interface ContainerDiffCmd extends SyncDockerCmd<List<ChangeLog>> {
 
     public String getContainerId();
 
@@ -27,7 +27,7 @@ public interface ContainerDiffCmd extends DockerCmd<List<ChangeLog>> {
     @Override
     public List<ChangeLog> exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<ContainerDiffCmd, List<ChangeLog>> {
+    public static interface Exec extends DockerCmdSyncExec<ContainerDiffCmd, List<ChangeLog>> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
index eb67dfbd9..1bc3ca909 100644
--- a/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
@@ -4,7 +4,7 @@
 
 import com.github.dockerjava.api.NotFoundException;
 
-public interface CopyFileFromContainerCmd extends DockerCmd<InputStream> {
+public interface CopyFileFromContainerCmd extends SyncDockerCmd<InputStream> {
 
     public String getContainerId();
 
@@ -20,14 +20,14 @@ public interface CopyFileFromContainerCmd extends DockerCmd<InputStream> {
 
     /**
      * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
-     * 
+     *
      * @throws NotFoundException
      *             No such container
      */
     @Override
     public InputStream exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<CopyFileFromContainerCmd, InputStream> {
+    public static interface Exec extends DockerCmdSyncExec<CopyFileFromContainerCmd, InputStream> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 9ad44b2c4..371774414 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -17,9 +17,9 @@
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
 
-public interface CreateContainerCmd extends DockerCmd<CreateContainerResponse> {
+public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerResponse> {
 
-    public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateContainerResponse> {
+    public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, CreateContainerResponse> {
     }
 
     /**
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
index a25535d5b..93b00efac 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
@@ -2,7 +2,7 @@
 
 import java.io.InputStream;
 
-public interface CreateImageCmd extends DockerCmd<CreateImageResponse> {
+public interface CreateImageCmd extends SyncDockerCmd<CreateImageResponse> {
 
     public String getRepository();
 
@@ -30,7 +30,7 @@ public interface CreateImageCmd extends DockerCmd<CreateImageResponse> {
      */
     public CreateImageCmd withTag(String tag);
 
-    public static interface Exec extends DockerCmdExec<CreateImageCmd, CreateImageResponse> {
+    public static interface Exec extends DockerCmdSyncExec<CreateImageCmd, CreateImageResponse> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmd.java b/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
index 79236b890..ba9992bed 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
@@ -4,6 +4,6 @@
 
 public interface DockerCmd<RES_T> extends Closeable {
 
-    public RES_T exec();
+
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java
new file mode 100644
index 000000000..dfd2a371e
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java
@@ -0,0 +1,9 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.async.ResultCallback;
+
+public interface DockerCmdAsyncExec<CMD_T extends DockerCmd<Void>, A_RES_T> {
+
+    public Void exec(CMD_T command, ResultCallback<A_RES_T> resultCallback);
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExec.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdSyncExec.java
similarity index 53%
rename from src/main/java/com/github/dockerjava/api/command/DockerCmdExec.java
rename to src/main/java/com/github/dockerjava/api/command/DockerCmdSyncExec.java
index 635395ed0..678b4afe1 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdSyncExec.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.api.command;
 
-public interface DockerCmdExec<CMD_T extends DockerCmd<RES_T>, RES_T> {
+public interface DockerCmdSyncExec<CMD_T extends DockerCmd<RES_T>, RES_T> {
 
     public RES_T exec(CMD_T command);
 
diff --git a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java b/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
index 057bed644..cbcd122a6 100644
--- a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
@@ -10,7 +10,7 @@
  * @param until
  *            - Stream events until this timestamp
  */
-public interface EventsCmd extends AsyncDockerCmd<EventsCmd, Event, Void> {
+public interface EventsCmd extends AsyncDockerCmd<EventsCmd, Event> {
     public EventsCmd withSince(String since);
 
     public EventsCmd withUntil(String until);
@@ -19,6 +19,6 @@ public interface EventsCmd extends AsyncDockerCmd<EventsCmd, Event, Void> {
 
     public String getUntil();
 
-    public static interface Exec extends DockerCmdExec<EventsCmd, Void> {
+    public static interface Exec extends DockerCmdAsyncExec<EventsCmd, Event> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
index ffeef0153..8094f371e 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.api.command;
 
-public interface ExecCreateCmd extends DockerCmd<ExecCreateCmdResponse> {
+public interface ExecCreateCmd extends SyncDockerCmd<ExecCreateCmdResponse> {
 
     public String getContainerId();
 
@@ -32,6 +32,6 @@ public interface ExecCreateCmd extends DockerCmd<ExecCreateCmdResponse> {
 
     public boolean hasTtyEnabled();
 
-    public static interface Exec extends DockerCmdExec<ExecCreateCmd, ExecCreateCmdResponse> {
+    public static interface Exec extends DockerCmdSyncExec<ExecCreateCmd, ExecCreateCmdResponse> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
index 339e2c9a0..cd9eaa017 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
@@ -4,7 +4,7 @@
 
 import java.io.InputStream;
 
-public interface ExecStartCmd extends DockerCmd<InputStream> {
+public interface ExecStartCmd extends SyncDockerCmd<InputStream> {
 
     public String getExecId();
 
@@ -24,13 +24,13 @@ public interface ExecStartCmd extends DockerCmd<InputStream> {
 
     /**
      * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
-     * 
+     *
      * @throws com.github.dockerjava.api.NotFoundException
      *             No such exec instance
      */
     @Override
     public InputStream exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<ExecStartCmd, InputStream> {
+    public static interface Exec extends DockerCmdSyncExec<ExecStartCmd, InputStream> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/InfoCmd.java b/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
index 10e3597e6..2fe7f2bf6 100644
--- a/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
@@ -2,9 +2,9 @@
 
 import com.github.dockerjava.api.model.Info;
 
-public interface InfoCmd extends DockerCmd<Info> {
+public interface InfoCmd extends SyncDockerCmd<Info> {
 
-    public static interface Exec extends DockerCmdExec<InfoCmd, Info> {
+    public static interface Exec extends DockerCmdSyncExec<InfoCmd, Info> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
index e0d087847..d9988085f 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
@@ -2,7 +2,7 @@
 
 import com.github.dockerjava.api.NotFoundException;
 
-public interface InspectContainerCmd extends DockerCmd<InspectContainerResponse> {
+public interface InspectContainerCmd extends SyncDockerCmd<InspectContainerResponse> {
 
     public String getContainerId();
 
@@ -15,7 +15,7 @@ public interface InspectContainerCmd extends DockerCmd<InspectContainerResponse>
     @Override
     public InspectContainerResponse exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<InspectContainerCmd, InspectContainerResponse> {
+    public static interface Exec extends DockerCmdSyncExec<InspectContainerCmd, InspectContainerResponse> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
index 82243614c..36ce45fc5 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
@@ -2,7 +2,7 @@
 
 import com.github.dockerjava.api.NotFoundException;
 
-public interface InspectExecCmd extends DockerCmd<InspectExecResponse> {
+public interface InspectExecCmd extends SyncDockerCmd<InspectExecResponse> {
     public String getExecId();
 
     public InspectExecCmd withExecId(String execId);
@@ -14,6 +14,6 @@ public interface InspectExecCmd extends DockerCmd<InspectExecResponse> {
     @Override
     public InspectExecResponse exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<InspectExecCmd, InspectExecResponse> {
+    public static interface Exec extends DockerCmdSyncExec<InspectExecCmd, InspectExecResponse> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
index ebf6550d2..6eaea9075 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
@@ -5,7 +5,7 @@
 /**
  * Inspect the details of an image.
  */
-public interface InspectImageCmd extends DockerCmd<InspectImageResponse> {
+public interface InspectImageCmd extends SyncDockerCmd<InspectImageResponse> {
 
     public String getImageId();
 
@@ -18,7 +18,7 @@ public interface InspectImageCmd extends DockerCmd<InspectImageResponse> {
     @Override
     public InspectImageResponse exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<InspectImageCmd, InspectImageResponse> {
+    public static interface Exec extends DockerCmdSyncExec<InspectImageCmd, InspectImageResponse> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
index 33fceba3b..513bf09c5 100644
--- a/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
@@ -5,7 +5,7 @@
 /**
  * Kill a running container.
  */
-public interface KillContainerCmd extends DockerCmd<Void> {
+public interface KillContainerCmd extends SyncDockerCmd<Void> {
 
     public String getContainerId();
 
@@ -22,7 +22,7 @@ public interface KillContainerCmd extends DockerCmd<Void> {
     @Override
     public Void exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<KillContainerCmd, Void> {
+    public static interface Exec extends DockerCmdSyncExec<KillContainerCmd, Void> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
index c2a116bed..5cba11755 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
@@ -20,7 +20,7 @@
  *            - Show only containers created before Id, include non-running ones.
  *
  */
-public interface ListContainersCmd extends DockerCmd<List<Container>> {
+public interface ListContainersCmd extends SyncDockerCmd<List<Container>> {
 
     public int getLimit();
 
@@ -46,7 +46,7 @@ public interface ListContainersCmd extends DockerCmd<List<Container>> {
 
     public ListContainersCmd withFilters(Filters filters);
 
-    public static interface Exec extends DockerCmdExec<ListContainersCmd, List<Container>> {
+    public static interface Exec extends DockerCmdSyncExec<ListContainersCmd, List<Container>> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java b/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
index 4c6a899cf..170ed8102 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
@@ -12,7 +12,7 @@
  * @param filters
  *            - a json encoded value of the filters (a map[string][]string) to process on the images list.
  */
-public interface ListImagesCmd extends DockerCmd<List<Image>> {
+public interface ListImagesCmd extends SyncDockerCmd<List<Image>> {
 
     public String getFilters();
 
@@ -22,7 +22,7 @@ public interface ListImagesCmd extends DockerCmd<List<Image>> {
 
     public ListImagesCmd withFilters(String filters);
 
-    public static interface Exec extends DockerCmdExec<ListImagesCmd, List<Image>> {
+    public static interface Exec extends DockerCmdSyncExec<ListImagesCmd, List<Image>> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
index 4abe86f5a..a97393aa5 100644
--- a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -1,11 +1,10 @@
 package com.github.dockerjava.api.command;
 
+import java.io.InputStream;
+
 import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.model.Frame;
 
-import java.io.InputStream;
-
 /**
  * Get container logs
  *
@@ -20,7 +19,7 @@
  * @param tail
  *            - `all` or `<number>`, Output specified number of lines at the end of logs
  */
-public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame, Void> {
+public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame> {
 
     public String getContainerId();
 
@@ -64,15 +63,7 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame,
 
     public LogContainerCmd withTail(int tail);
 
-    /**
-     *
-     * @throws NotFoundException
-     *             No such container
-     */
-    @Override
-    public Void exec();
-
-    public static interface Exec extends DockerCmdExec<LogContainerCmd, Void> {
+    public static interface Exec extends DockerCmdAsyncExec<LogContainerCmd, Frame> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
index a052c8bcf..21039bb42 100644
--- a/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
@@ -9,7 +9,7 @@
  *            - Id of the container
  *
  */
-public interface PauseContainerCmd extends DockerCmd<Void> {
+public interface PauseContainerCmd extends SyncDockerCmd<Void> {
 
     public String getContainerId();
 
@@ -22,7 +22,7 @@ public interface PauseContainerCmd extends DockerCmd<Void> {
     @Override
     public Void exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<PauseContainerCmd, Void> {
+    public static interface Exec extends DockerCmdSyncExec<PauseContainerCmd, Void> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/PingCmd.java b/src/main/java/com/github/dockerjava/api/command/PingCmd.java
index a5d88056a..0be834e9a 100644
--- a/src/main/java/com/github/dockerjava/api/command/PingCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PingCmd.java
@@ -2,11 +2,11 @@
 
 /**
  * Ping the Docker server
- * 
+ *
  */
-public interface PingCmd extends DockerCmd<Void> {
+public interface PingCmd extends SyncDockerCmd<Void> {
 
-    public static interface Exec extends DockerCmdExec<PingCmd, Void> {
+    public static interface Exec extends DockerCmdSyncExec<PingCmd, Void> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java b/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
index 73ca9fec1..53edbe9a4 100644
--- a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
@@ -2,16 +2,13 @@
 
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PullResponseItem;
-import com.github.dockerjava.core.command.EventStreamReader;
-
-import java.io.InputStream;
 
 /**
  *
  * Pull image from repository.
  *
  */
-public interface PullImageCmd extends AsyncDockerCmd<PullImageCmd, PullResponseItem, Void> {
+public interface PullImageCmd extends AsyncDockerCmd<PullImageCmd, PullResponseItem> {
 
     public String getRepository();
 
@@ -29,10 +26,6 @@ public interface PullImageCmd extends AsyncDockerCmd<PullImageCmd, PullResponseI
 
     public PullImageCmd withAuthConfig(AuthConfig authConfig);
 
-    public static interface Exec extends DockerCmdExec<PullImageCmd, Void> {
+    public static interface Exec extends DockerCmdAsyncExec<PullImageCmd, PullResponseItem> {
     }
-
-    @Override
-    public Void exec();
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java b/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
index a4251d373..9b8c55918 100644
--- a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PushResponseItem;
 
@@ -10,7 +11,7 @@
  * @param name
  *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
  */
-public interface PushImageCmd extends AsyncDockerCmd<PushImageCmd, PushResponseItem, Void> {
+public interface PushImageCmd extends AsyncDockerCmd<PushImageCmd, PushResponseItem> {
 
     public String getName();
 
@@ -36,8 +37,9 @@ public interface PushImageCmd extends AsyncDockerCmd<PushImageCmd, PushResponseI
      * @throws NotFoundException
      *             No such image
      */
-    public Void exec() throws NotFoundException;
+    @Override
+    public <T extends ResultCallback<PushResponseItem>> T exec(T resultCallback);
 
-    public static interface Exec extends DockerCmdExec<PushImageCmd, Void> {
+    public static interface Exec extends DockerCmdAsyncExec<PushImageCmd, PushResponseItem> {
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
index 9f917a327..fe5378dc2 100644
--- a/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
@@ -4,13 +4,13 @@
 
 /**
  * Remove a container.
- * 
+ *
  * @param removeVolumes
  *            - true or false, Remove the volumes associated to the container. Defaults to false
  * @param force
  *            - true or false, Removes the container even if it was running. Defaults to false
  */
-public interface RemoveContainerCmd extends DockerCmd<Void> {
+public interface RemoveContainerCmd extends SyncDockerCmd<Void> {
 
     public String getContainerId();
 
@@ -33,7 +33,7 @@ public interface RemoveContainerCmd extends DockerCmd<Void> {
     @Override
     public Void exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<RemoveContainerCmd, Void> {
+    public static interface Exec extends DockerCmdSyncExec<RemoveContainerCmd, Void> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
index 1ce1cd210..99f2835f8 100644
--- a/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
@@ -7,7 +7,7 @@
  * Remove an image, deleting any tags it might have.
  *
  */
-public interface RemoveImageCmd extends DockerCmd<Void> {
+public interface RemoveImageCmd extends SyncDockerCmd<Void> {
 
     public String getImageId();
 
@@ -34,7 +34,7 @@ public interface RemoveImageCmd extends DockerCmd<Void> {
 
     /**
      * noprune parameter to prevent the deletion of parent images
-     * 
+     *
      */
     public RemoveImageCmd withNoPrune(boolean noPrune);
 
@@ -45,7 +45,7 @@ public interface RemoveImageCmd extends DockerCmd<Void> {
     @Override
     public Void exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<RemoveImageCmd, Void> {
+    public static interface Exec extends DockerCmdSyncExec<RemoveImageCmd, Void> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
index aa07fffd1..c2a5219a8 100644
--- a/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
@@ -9,7 +9,7 @@
  *            - Timeout in seconds before killing the container. Defaults to 10 seconds.
  *
  */
-public interface RestartContainerCmd extends DockerCmd<Void> {
+public interface RestartContainerCmd extends SyncDockerCmd<Void> {
 
     public String getContainerId();
 
@@ -26,7 +26,7 @@ public interface RestartContainerCmd extends DockerCmd<Void> {
     @Override
     public Void exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<RestartContainerCmd, Void> {
+    public static interface Exec extends DockerCmdSyncExec<RestartContainerCmd, Void> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java b/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
index 67425ab66..0b027a764 100644
--- a/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
@@ -4,7 +4,7 @@
 
 import java.io.InputStream;
 
-public interface SaveImageCmd extends DockerCmd<InputStream> {
+public interface SaveImageCmd extends SyncDockerCmd<InputStream> {
 
     public String getName();
 
@@ -24,13 +24,13 @@ public interface SaveImageCmd extends DockerCmd<InputStream> {
 
     /**
      * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
-     * 
+     *
      * @throws com.github.dockerjava.api.NotFoundException
      *             No such image
      */
     public InputStream exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<SaveImageCmd, InputStream> {
+    public static interface Exec extends DockerCmdSyncExec<SaveImageCmd, InputStream> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java b/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
index 9279272d3..a1229da9c 100644
--- a/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
@@ -11,13 +11,13 @@
  *            - search term
  *
  */
-public interface SearchImagesCmd extends DockerCmd<List<SearchItem>> {
+public interface SearchImagesCmd extends SyncDockerCmd<List<SearchItem>> {
 
     public String getTerm();
 
     public SearchImagesCmd withTerm(String term);
 
-    public static interface Exec extends DockerCmdExec<SearchImagesCmd, List<SearchItem>> {
+    public static interface Exec extends DockerCmdSyncExec<SearchImagesCmd, List<SearchItem>> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
index 2195e1eca..0cfb3ea8e 100644
--- a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
@@ -7,9 +7,9 @@
  * Start a container.
  *
  */
-public interface StartContainerCmd extends DockerCmd<Void> {
+public interface StartContainerCmd extends SyncDockerCmd<Void> {
 
-    public static interface Exec extends DockerCmdExec<StartContainerCmd, Void> {
+    public static interface Exec extends DockerCmdSyncExec<StartContainerCmd, Void> {
     }
 
     String getContainerId();
diff --git a/src/main/java/com/github/dockerjava/api/command/StatsCmd.java b/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
index f394d7f3e..64b38d472 100644
--- a/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
@@ -6,11 +6,11 @@
  * Get container stats. The result of {@link Statistics} is handled asynchronously because the docker remote API will
  * block when a container is stopped until the container is up again.
  */
-public interface StatsCmd extends AsyncDockerCmd<StatsCmd, Statistics, Void> {
+public interface StatsCmd extends AsyncDockerCmd<StatsCmd, Statistics> {
     public StatsCmd withContainerId(String containerId);
 
     public String getContainerId();
 
-    public static interface Exec extends DockerCmdExec<StatsCmd, Void> {
+    public static interface Exec extends DockerCmdAsyncExec<StatsCmd, Statistics> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
index d5bf2e610..dc620b699 100644
--- a/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
@@ -12,7 +12,7 @@
  *            - Timeout in seconds before killing the container. Defaults to 10 seconds.
  *
  */
-public interface StopContainerCmd extends DockerCmd<Void> {
+public interface StopContainerCmd extends SyncDockerCmd<Void> {
 
     public String getContainerId();
 
@@ -31,7 +31,7 @@ public interface StopContainerCmd extends DockerCmd<Void> {
     @Override
     public Void exec() throws NotFoundException, NotModifiedException;
 
-    public static interface Exec extends DockerCmdExec<StopContainerCmd, Void> {
+    public static interface Exec extends DockerCmdSyncExec<StopContainerCmd, Void> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java b/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java
new file mode 100644
index 000000000..7192e46f3
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java
@@ -0,0 +1,8 @@
+package com.github.dockerjava.api.command;
+
+
+public interface SyncDockerCmd<RES_T> extends DockerCmd<RES_T> {
+
+    public RES_T exec();
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java b/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
index 44fd588f1..21895e358 100644
--- a/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
@@ -9,9 +9,9 @@
  *            The repository to tag in
  * @param force
  *            (not documented)
- * 
+ *
  */
-public interface TagImageCmd extends DockerCmd<Void> {
+public interface TagImageCmd extends SyncDockerCmd<Void> {
 
     public String getImageId();
 
@@ -31,7 +31,7 @@ public interface TagImageCmd extends DockerCmd<Void> {
 
     public TagImageCmd withForce(boolean force);
 
-    public static interface Exec extends DockerCmdExec<TagImageCmd, Void> {
+    public static interface Exec extends DockerCmdSyncExec<TagImageCmd, Void> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
index cc7e33aa3..3e1762f1d 100644
--- a/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
@@ -5,7 +5,7 @@
 /**
  * List processes running inside a container
  */
-public interface TopContainerCmd extends DockerCmd<TopContainerResponse> {
+public interface TopContainerCmd extends SyncDockerCmd<TopContainerResponse> {
 
     public String getContainerId();
 
@@ -22,7 +22,7 @@ public interface TopContainerCmd extends DockerCmd<TopContainerResponse> {
     @Override
     public TopContainerResponse exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<TopContainerCmd, TopContainerResponse> {
+    public static interface Exec extends DockerCmdSyncExec<TopContainerCmd, TopContainerResponse> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
index 442191416..44f5658e2 100644
--- a/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
@@ -9,7 +9,7 @@
  *            - Id of the container
  *
  */
-public interface UnpauseContainerCmd extends DockerCmd<Void> {
+public interface UnpauseContainerCmd extends SyncDockerCmd<Void> {
 
     public String getContainerId();
 
@@ -22,7 +22,7 @@ public interface UnpauseContainerCmd extends DockerCmd<Void> {
     @Override
     public Void exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<UnpauseContainerCmd, Void> {
+    public static interface Exec extends DockerCmdSyncExec<UnpauseContainerCmd, Void> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/VersionCmd.java b/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
index 703524623..5f823c6cb 100644
--- a/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
@@ -5,9 +5,9 @@
 /**
  * Returns the Docker version info.
  */
-public interface VersionCmd extends DockerCmd<Version> {
+public interface VersionCmd extends SyncDockerCmd<Version> {
 
-    public static interface Exec extends DockerCmdExec<VersionCmd, Version> {
+    public static interface Exec extends DockerCmdSyncExec<VersionCmd, Version> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
index 8841b08a3..2accc3af9 100644
--- a/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
@@ -4,10 +4,10 @@
 
 /**
  * Wait a container
- * 
+ *
  * Block until container stops, then returns its exit code
  */
-public interface WaitContainerCmd extends DockerCmd<Integer> {
+public interface WaitContainerCmd extends SyncDockerCmd<Integer> {
 
     public String getContainerId();
 
@@ -20,7 +20,7 @@ public interface WaitContainerCmd extends DockerCmd<Integer> {
     @Override
     public Integer exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdExec<WaitContainerCmd, Integer> {
+    public static interface Exec extends DockerCmdSyncExec<WaitContainerCmd, Integer> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index f01ea0909..947d42bf8 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -189,14 +189,14 @@ public VersionCmd versionCmd() {
      * * IMAGE API *
      */
     @Override
-    public PullImageCmd pullImageCmd(String repository, ResultCallback<PullResponseItem> resultCallback) {
+    public PullImageCmd pullImageCmd(String repository) {
         return new PullImageCmdImpl(getDockerCmdExecFactory().createPullImageCmdExec(),
-                dockerClientConfig.effectiveAuthConfig(repository), repository, resultCallback);
+                dockerClientConfig.effectiveAuthConfig(repository), repository);
     }
 
     @Override
-    public PushImageCmd pushImageCmd(String name, ResultCallback<PushResponseItem> resultCallback) {
-        PushImageCmd cmd = new PushImageCmdImpl(getDockerCmdExecFactory().createPushImageCmdExec(), name, resultCallback);
+    public PushImageCmd pushImageCmd(String name) {
+        PushImageCmd cmd = new PushImageCmdImpl(getDockerCmdExecFactory().createPushImageCmdExec(), name);
 
         AuthConfig cfg = dockerClientConfig.effectiveAuthConfig(name);
         if (cfg != null)
@@ -205,8 +205,8 @@ public PushImageCmd pushImageCmd(String name, ResultCallback<PushResponseItem> r
     }
 
     @Override
-    public PushImageCmd pushImageCmd(Identifier identifier, ResultCallback<PushResponseItem> resultCallback) {
-        PushImageCmd cmd = pushImageCmd(identifier.repository.name, resultCallback);
+    public PushImageCmd pushImageCmd(Identifier identifier) {
+        PushImageCmd cmd = pushImageCmd(identifier.repository.name);
         if (identifier.tag.isPresent())
             cmd.withTag(identifier.tag.get());
 
@@ -287,9 +287,8 @@ public WaitContainerCmd waitContainerCmd(String containerId) {
     }
 
     @Override
-    public AttachContainerCmd attachContainerCmd(String containerId, ResultCallback<Frame> resultCallback) {
-        return new AttachContainerCmdImpl(getDockerCmdExecFactory().createAttachContainerCmdExec(), containerId,
-                resultCallback);
+    public AttachContainerCmd attachContainerCmd(String containerId) {
+        return new AttachContainerCmdImpl(getDockerCmdExecFactory().createAttachContainerCmdExec(), containerId);
     }
 
     @Override
@@ -303,9 +302,8 @@ public InspectExecCmd inspectExecCmd(String execId) {
     }
 
     @Override
-    public LogContainerCmd logContainerCmd(String containerId, ResultCallback<Frame> resultCallback) {
-        return new LogContainerCmdImpl(getDockerCmdExecFactory().createLogContainerCmdExec(), containerId,
-                resultCallback);
+    public LogContainerCmd logContainerCmd(String containerId) {
+        return new LogContainerCmdImpl(getDockerCmdExecFactory().createLogContainerCmdExec(), containerId);
     }
 
     @Override
@@ -340,21 +338,20 @@ public CommitCmd commitCmd(String containerId) {
     }
 
     @Override
-    public BuildImageCmd buildImageCmd(ResultCallback<BuildResponseItem> resultCallback) {
-        return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(),
-                resultCallback));
+    public BuildImageCmd buildImageCmd() {
+        return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec()));
     }
 
     @Override
-    public BuildImageCmd buildImageCmd(File dockerFileOrFolder, ResultCallback<BuildResponseItem> resultCallback) {
+    public BuildImageCmd buildImageCmd(File dockerFileOrFolder) {
         return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(),
-                dockerFileOrFolder, resultCallback));
+                dockerFileOrFolder));
     }
 
     @Override
-    public BuildImageCmd buildImageCmd(InputStream tarInputStream, ResultCallback<BuildResponseItem> resultCallback) {
+    public BuildImageCmd buildImageCmd(InputStream tarInputStream) {
         return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(),
-                tarInputStream, resultCallback));
+                tarInputStream));
     }
 
     private BuildImageCmd augmentBuildImageCmd(BuildImageCmd buildImageCmd) {
@@ -387,13 +384,13 @@ public UnpauseContainerCmd unpauseContainerCmd(String containerId) {
     }
 
     @Override
-    public EventsCmd eventsCmd(ResultCallback<Event> eventCallback) {
-        return new EventsCmdImpl(getDockerCmdExecFactory().createEventsCmdExec(), eventCallback);
+    public EventsCmd eventsCmd() {
+        return new EventsCmdImpl(getDockerCmdExecFactory().createEventsCmdExec());
     }
 
     @Override
-    public StatsCmd statsCmd(ResultCallback<Statistics> statisticsCallback) {
-        return new StatsCmdImpl(getDockerCmdExecFactory().createStatsCmdExec(), statisticsCallback);
+    public StatsCmd statsCmd() {
+        return new StatsCmdImpl(getDockerCmdExecFactory().createStatsCmdExec());
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index 50cc1fd91..a4e08e5a9 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -16,7 +16,7 @@
  * @author marcus
  *
  */
-public abstract class ResultCallbackTemplate<T> implements ResultCallback<T> {
+public abstract class ResultCallbackTemplate<RC_T extends ResultCallback<A_RES_T>, A_RES_T> implements ResultCallback<A_RES_T> {
 
     private final CountDownLatch finished = new CountDownLatch(1);
 
@@ -28,7 +28,7 @@ public void onStart(Closeable stream) {
     }
 
     @Override
-    public void onNext(T object) {
+    public void onNext(A_RES_T object) {
     }
 
     @Override
@@ -60,11 +60,21 @@ public void close() throws IOException {
         finished.countDown();
     }
 
-    public void awaitFinish() throws InterruptedException {
+    /**
+     * Blocks until {@link ResultCallback#onComplete()} was called
+     */
+    @SuppressWarnings("unchecked")
+    public RC_T awaitCompletion() throws InterruptedException {
         finished.await();
+        return (RC_T) this;
     }
 
-    public void awaitFinish(long timeout, TimeUnit timeUnit) throws InterruptedException {
+    /**
+     * Blocks until {@link ResultCallback#onComplete()} was called or the given timeout occurs
+     */
+    @SuppressWarnings("unchecked")
+    public RC_T awaitCompletion(long timeout, TimeUnit timeUnit) throws InterruptedException {
         finished.await(timeout, timeUnit);
+        return (RC_T) this;
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
index 1bcac59ea..43293f3fe 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
@@ -2,37 +2,37 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.io.IOException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.AsyncDockerCmd;
-import com.github.dockerjava.api.command.DockerCmdExec;
+import com.github.dockerjava.api.command.DockerCmdAsyncExec;
 
-public abstract class AbstrAsyncDockerCmd<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T, RES_T>, A_RES_T, RES_T>
-        extends AbstrDockerCmd<CMD_T, RES_T> implements AsyncDockerCmd<CMD_T, A_RES_T, RES_T>{
+public abstract class AbstrAsyncDockerCmd<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T>, A_RES_T> implements
+        AsyncDockerCmd<CMD_T, A_RES_T> {
 
     private final static Logger LOGGER = LoggerFactory.getLogger(AbstrAsyncDockerCmd.class);
 
-    private ResultCallback<A_RES_T> resultCallback;
+    protected DockerCmdAsyncExec<CMD_T, A_RES_T> execution;
 
-    public AbstrAsyncDockerCmd(DockerCmdExec<CMD_T, RES_T> execution, ResultCallback<A_RES_T> resultCallback) {
-        super(execution);
-        checkNotNull(resultCallback, "resultCallback was not specified");
-        withResultCallback(resultCallback);
+    public AbstrAsyncDockerCmd(DockerCmdAsyncExec<CMD_T, A_RES_T> execution) {
+        checkNotNull(execution, "execution was not specified");
+        this.execution = execution;
     }
 
-    @SuppressWarnings("unchecked")
     @Override
-    public CMD_T withResultCallback(ResultCallback<A_RES_T> resultCallback) {
-        checkNotNull(resultCallback, "resultCallback was not specified");
-        this.resultCallback = resultCallback;
-        return ((CMD_T) this);
+    public <T extends ResultCallback<A_RES_T>> T exec(T resultCallback) {
+        execution.exec((CMD_T) this, resultCallback);
+        return resultCallback;
     }
 
     @Override
-    public ResultCallback<A_RES_T> getResultCallback() {
-        return resultCallback;
+    public void close() throws IOException {
     }
 
+
+
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
index c7c64b759..341b6a886 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
@@ -8,17 +8,17 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.command.DockerCmd;
-import com.github.dockerjava.api.command.DockerCmdExec;
+import com.github.dockerjava.api.command.DockerCmdSyncExec;
 import com.github.dockerjava.api.model.AuthConfig;
 
 public abstract class AbstrAuthCfgDockerCmd<T extends DockerCmd<RES_T>, RES_T> extends AbstrDockerCmd<T, RES_T> {
 
-    public AbstrAuthCfgDockerCmd(DockerCmdExec<T, RES_T> execution, AuthConfig authConfig) {
+    public AbstrAuthCfgDockerCmd(DockerCmdSyncExec<T, RES_T> execution, AuthConfig authConfig) {
         super(execution);
         withOptionalAuthConfig(authConfig);
     }
 
-    public AbstrAuthCfgDockerCmd(DockerCmdExec<T, RES_T> execution) {
+    public AbstrAuthCfgDockerCmd(DockerCmdSyncExec<T, RES_T> execution) {
         super(execution);
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
index 3d30cb62c..c4fedac58 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
@@ -11,16 +11,17 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.command.DockerCmd;
-import com.github.dockerjava.api.command.DockerCmdExec;
+import com.github.dockerjava.api.command.DockerCmdSyncExec;
+import com.github.dockerjava.api.command.SyncDockerCmd;
 import com.github.dockerjava.api.model.AuthConfig;
 
-public abstract class AbstrDockerCmd<CMD_T extends DockerCmd<RES_T>, RES_T> implements DockerCmd<RES_T> {
+public abstract class AbstrDockerCmd<CMD_T extends DockerCmd<RES_T>, RES_T> implements SyncDockerCmd<RES_T> {
 
     private final static Logger LOGGER = LoggerFactory.getLogger(AbstrDockerCmd.class);
 
-    protected DockerCmdExec<CMD_T, RES_T> execution;
+    protected DockerCmdSyncExec<CMD_T, RES_T> execution;
 
-    public AbstrDockerCmd(DockerCmdExec<CMD_T, RES_T> execution) {
+    public AbstrDockerCmd(DockerCmdSyncExec<CMD_T, RES_T> execution) {
         checkNotNull(execution, "execution was not specified");
         this.execution = execution;
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
index 3bc5f4518..222ea9b3b 100644
--- a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
@@ -22,14 +22,14 @@
  * @param timestamps
  *            - true or false, if true, print timestamps for every log line. Defaults to false.
  */
-public class AttachContainerCmdImpl extends AbstrAsyncDockerCmd<AttachContainerCmd, Frame, Void> implements AttachContainerCmd {
+public class AttachContainerCmdImpl extends AbstrAsyncDockerCmd<AttachContainerCmd, Frame> implements AttachContainerCmd {
 
     private String containerId;
 
     private boolean logs, followStream, timestamps, stdout, stderr;
 
-    public AttachContainerCmdImpl(AttachContainerCmd.Exec exec, String containerId, ResultCallback<Frame> resultCallback) {
-        super(exec, resultCallback);
+    public AttachContainerCmdImpl(AttachContainerCmd.Exec exec, String containerId) {
+        super(exec);
         withContainerId(containerId);
     }
 
@@ -119,13 +119,4 @@ public AttachContainerCmd withLogs(boolean logs) {
     public AttachContainerCmd withLogs() {
         return withLogs(true);
     }
-
-    /**
-     * @throws NotFoundException
-     *             No such container
-     */
-    @Override
-    public Void exec() throws NotFoundException {
-        return super.exec();
-    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index 51735c494..56ce8f78f 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -6,7 +6,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.api.model.BuildResponseItem;
@@ -18,7 +17,7 @@
  * Build an image from Dockerfile.
  *
  */
-public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildResponseItem, Void> implements BuildImageCmd {
+public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildResponseItem> implements BuildImageCmd {
 
     private InputStream tarInputStream = null;
 
@@ -38,12 +37,12 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR
 
     private File baseDirectory;
 
-    public BuildImageCmdImpl(BuildImageCmd.Exec exec, ResultCallback<BuildResponseItem> resultCallback) {
-        super(exec, resultCallback);
+    public BuildImageCmdImpl(BuildImageCmd.Exec exec) {
+        super(exec);
     }
 
-    public BuildImageCmdImpl(BuildImageCmd.Exec exec, File dockerFileOrFolder, ResultCallback<BuildResponseItem> resultCallback) {
-        super(exec, resultCallback);
+    public BuildImageCmdImpl(BuildImageCmd.Exec exec, File dockerFileOrFolder) {
+        super(exec);
         checkNotNull(dockerFileOrFolder, "dockerFolder is null");
 
         if (dockerFileOrFolder.isDirectory()) {
@@ -54,8 +53,8 @@ public BuildImageCmdImpl(BuildImageCmd.Exec exec, File dockerFileOrFolder, Resul
         }
     }
 
-    public BuildImageCmdImpl(BuildImageCmd.Exec exec, InputStream tarInputStream, ResultCallback<BuildResponseItem> resultCallback) {
-        super(exec, resultCallback);
+    public BuildImageCmdImpl(BuildImageCmd.Exec exec, InputStream tarInputStream) {
+        super(exec);
         checkNotNull(tarInputStream, "tarInputStream is null");
         withTarInputStream(tarInputStream);
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/EventStreamReader.java b/src/main/java/com/github/dockerjava/core/command/EventStreamReader.java
deleted file mode 100644
index ffa71d6c9..000000000
--- a/src/main/java/com/github/dockerjava/core/command/EventStreamReader.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-public class EventStreamReader<I> implements AutoCloseable {
-
-    private final ObjectMapper objectMapper = new ObjectMapper();
-
-    private final Class<I> type;
-
-    private final InputStream inputStream;
-
-    public EventStreamReader(InputStream inputStream, Class<I> type) {
-        this.inputStream = inputStream;
-        this.type = type;
-    }
-
-    public I readItem() throws IOException {
-        try {
-            return objectMapper.readValue(inputStream, type);
-        } catch (IOException e) {
-            // dirty, but works
-            if (e.getMessage().equals("Stream closed")) {
-                return null;
-            }
-            throw e;
-        }
-    }
-
-    @Override
-    public void close() throws IOException {
-        inputStream.close();
-    }
-}
diff --git a/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
index 13d5c5427..f371c5b7c 100644
--- a/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
@@ -7,14 +7,14 @@
 /**
  * Stream docker events
  */
-public class EventsCmdImpl extends AbstrAsyncDockerCmd<EventsCmd, Event, Void> implements EventsCmd {
+public class EventsCmdImpl extends AbstrAsyncDockerCmd<EventsCmd, Event> implements EventsCmd {
 
     private String since;
 
     private String until;
 
-    public EventsCmdImpl(EventsCmd.Exec exec, ResultCallback<Event> resultCallback) {
-        super(exec, resultCallback);
+    public EventsCmdImpl(EventsCmd.Exec exec) {
+        super(exec);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
index 55fad8c9c..ade3923f3 100644
--- a/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
@@ -1,7 +1,7 @@
 package com.github.dockerjava.core.command;
 
 import com.github.dockerjava.api.NotFoundException;
-import com.github.dockerjava.api.command.DockerCmdExec;
+import com.github.dockerjava.api.command.DockerCmdSyncExec;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectExecResponse;
 import com.google.common.base.Preconditions;
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
index 98a0e723b..490b6b1a1 100644
--- a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -24,7 +24,7 @@
  * @param tail
  *            - `all` or `<number>`, Output specified number of lines at the end of logs
  */
-public class LogContainerCmdImpl extends AbstrAsyncDockerCmd<LogContainerCmd, Frame, Void> implements LogContainerCmd {
+public class LogContainerCmdImpl extends AbstrAsyncDockerCmd<LogContainerCmd, Frame> implements LogContainerCmd {
 
     private String containerId;
 
@@ -32,8 +32,8 @@ public class LogContainerCmdImpl extends AbstrAsyncDockerCmd<LogContainerCmd, Fr
 
     private boolean followStream, timestamps, stdout, stderr;
 
-    public LogContainerCmdImpl(LogContainerCmd.Exec exec, String containerId, ResultCallback<Frame> resultCallback) {
-        super(exec, resultCallback);
+    public LogContainerCmdImpl(LogContainerCmd.Exec exec, String containerId) {
+        super(exec);
         withContainerId(containerId);
     }
 
@@ -136,12 +136,4 @@ public String toString() {
                 .append(timestamps ? "--timestamps=true" : "").append(containerId).toString();
     }
 
-    /**
-     * @throws NotFoundException
-     *             No such container
-     */
-    @Override
-    public Void exec() throws NotFoundException {
-        return super.exec();
-    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
index e226fc628..2fe46f12c 100644
--- a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
@@ -12,16 +12,15 @@
  * Pull image from repository.
  *
  */
-public class PullImageCmdImpl extends AbstrAsyncDockerCmd<PullImageCmd, PullResponseItem, Void> implements PullImageCmd {
+public class PullImageCmdImpl extends AbstrAsyncDockerCmd<PullImageCmd, PullResponseItem> implements PullImageCmd {
 
     private String repository, tag, registry;
 
     private AuthConfig authConfig;
 
-    public PullImageCmdImpl(PullImageCmd.Exec exec, AuthConfig authConfig, String repository,
-            ResultCallback<PullResponseItem> resultCallback) {
-        super(exec, resultCallback);
-        withAuthConfig(authConfig);
+    public PullImageCmdImpl(PullImageCmd.Exec exec, AuthConfig authConfig, String repository) {
+        super(exec);
+        withOptionalAuthConfig(authConfig);
         withRepository(repository);
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
index d462ba6ce..81f1262f1 100644
--- a/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
@@ -2,8 +2,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.github.dockerjava.api.NotFoundException;
-import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.PushImageCmd;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PushResponseItem;
@@ -14,7 +12,7 @@
  * @param name
  *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
  */
-public class PushImageCmdImpl extends AbstrAsyncDockerCmd<PushImageCmd, PushResponseItem, Void> implements PushImageCmd {
+public class PushImageCmdImpl extends AbstrAsyncDockerCmd<PushImageCmd, PushResponseItem> implements PushImageCmd {
 
     private String name;
 
@@ -22,8 +20,8 @@ public class PushImageCmdImpl extends AbstrAsyncDockerCmd<PushImageCmd, PushResp
 
     private AuthConfig authConfig;
 
-    public PushImageCmdImpl(PushImageCmd.Exec exec, String name, ResultCallback<PushResponseItem> resultCallback) {
-        super(exec, resultCallback);
+    public PushImageCmdImpl(PushImageCmd.Exec exec, String name) {
+        super(exec);
         withName(name);
     }
 
@@ -78,12 +76,5 @@ public String toString() {
         return new StringBuilder("push ").append(name).toString();
     }
 
-    /**
-     * @throws NotFoundException
-     *             No such image
-     */
-    @Override
-    public Void exec() throws NotFoundException {
-        return super.exec();
-    }
+
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
index 901ad61a6..205f619b7 100644
--- a/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
@@ -9,12 +9,12 @@
 /**
  * Container stats
  */
-public class StatsCmdImpl extends AbstrAsyncDockerCmd<StatsCmd, Statistics, Void> implements StatsCmd {
+public class StatsCmdImpl extends AbstrAsyncDockerCmd<StatsCmd, Statistics> implements StatsCmd {
 
     private String containerId;
 
-    public StatsCmdImpl(StatsCmd.Exec exec, ResultCallback<Statistics> resultCallback) {
-        super(exec, resultCallback);
+    public StatsCmdImpl(StatsCmd.Exec exec) {
+        super(exec);
     }
 
     @Override
@@ -29,11 +29,6 @@ public String getContainerId() {
         return containerId;
     }
 
-    @Override
-    public Void exec() {
-        return super.exec();
-    }
-
     @Override
     public String toString() {
         return new StringBuilder("stats").append(containerId != null ? " --id=" + containerId : "").toString();
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
index c6670c59a..cb91a56e7 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
@@ -3,45 +3,26 @@
 import java.io.Closeable;
 import java.io.IOException;
 
-import javax.ws.rs.ProcessingException;
 import javax.ws.rs.client.WebTarget;
 
-import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.AsyncDockerCmd;
+import com.github.dockerjava.api.command.DockerCmdAsyncExec;
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 
-public abstract class AbstrAsyncDockerCmdExec<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T, RES_T>, A_RES_T, RES_T>
-        extends AbstrDockerCmdExec<CMD_T, RES_T> {
+public abstract class AbstrAsyncDockerCmdExec<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T>, A_RES_T> extends
+        AbstrDockerCmdExec implements DockerCmdAsyncExec<CMD_T, A_RES_T> {
 
     public AbstrAsyncDockerCmdExec(WebTarget baseResource) {
         super(baseResource);
     }
 
     @Override
-    public final RES_T exec(CMD_T command) {
-        // this hack works because of ResponseStatusExceptionFilter
-        RES_T result;
-        try {
-            result = execute(command);
-
-        } catch (ProcessingException e) {
-            if (e.getCause() instanceof DockerException) {
-                throw (DockerException) e.getCause();
-            } else {
-                throw e;
-            }
-        }
-
-        // do not close the command yet. this will be done when the stream is consumed
-
-        return result;
+    public Void exec(CMD_T command, ResultCallback<A_RES_T> resultCallback) {
+        return execute(command, resultCallback);
     }
 
-    @Override
-    protected final RES_T execute(final CMD_T command) {
-
-        final ResultCallback<A_RES_T> resultCallback = command.getResultCallback();
+    protected final Void execute(final CMD_T command, final ResultCallback<A_RES_T> resultCallback) {
 
         ResultCallback<A_RES_T> delegatingResultCallback = new ResultCallback<A_RES_T>() {
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
index 7ce68eed8..beca08c13 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
@@ -4,19 +4,15 @@
 
 import java.io.IOException;
 
-import javax.ws.rs.ProcessingException;
 import javax.ws.rs.client.WebTarget;
 
 import org.apache.commons.codec.binary.Base64;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.command.DockerCmd;
-import com.github.dockerjava.api.command.DockerCmdExec;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
 
-public abstract class AbstrDockerCmdExec<CMD_T extends DockerCmd<RES_T>, RES_T> implements DockerCmdExec<CMD_T, RES_T> {
+public abstract class AbstrDockerCmdExec {
 
     private WebTarget baseResource;
 
@@ -45,29 +41,5 @@ protected String registryConfigs(AuthConfigurations authConfigs) {
         }
     }
 
-    @Override
-    public RES_T exec(CMD_T command) {
-        // this hack works because of ResponseStatusExceptionFilter
-        RES_T result;
-        try {
-            result = execute(command);
-
-        } catch (ProcessingException e) {
-            if (e.getCause() instanceof DockerException) {
-                throw (DockerException) e.getCause();
-            } else {
-                throw e;
-            }
-        } finally {
-            try {
-                command.close();
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        return result;
-    }
 
-    protected abstract RES_T execute(CMD_T command);
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
new file mode 100644
index 000000000..7e26c519e
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
@@ -0,0 +1,44 @@
+package com.github.dockerjava.jaxrs;
+
+import java.io.IOException;
+
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.client.WebTarget;
+
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.command.DockerCmd;
+import com.github.dockerjava.api.command.DockerCmdSyncExec;
+
+public abstract class AbstrSyncDockerCmdExec<CMD_T extends DockerCmd<RES_T>, RES_T> extends AbstrDockerCmdExec
+        implements DockerCmdSyncExec<CMD_T, RES_T> {
+
+    public AbstrSyncDockerCmdExec(WebTarget baseResource) {
+        super(baseResource);
+    }
+
+    @Override
+    public RES_T exec(CMD_T command) {
+        // this hack works because of ResponseStatusExceptionFilter
+        RES_T result;
+        try {
+            result = execute(command);
+
+        } catch (ProcessingException e) {
+            if (e.getCause() instanceof DockerException) {
+                throw (DockerException) e.getCause();
+            } else {
+                throw e;
+            }
+        } finally {
+            try {
+                command.close();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        return result;
+    }
+
+    protected abstract RES_T execute(CMD_T command);
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
index 312a2a8d7..36b904dd2 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
@@ -12,7 +12,7 @@
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
 
-public class AttachContainerCmdExec extends AbstrAsyncDockerCmdExec<AttachContainerCmd, Frame, Void> implements
+public class AttachContainerCmdExec extends AbstrAsyncDockerCmdExec<AttachContainerCmd, Frame> implements
         AttachContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AttachContainerCmdExec.class);
@@ -36,6 +36,6 @@ protected AbstractCallbackNotifier<Frame> callbackNotifier(AttachContainerCmd co
         LOGGER.trace("POST: {}", webTarget);
 
         return new POSTCallbackNotifier<Frame>(new FrameStreamProcessor(),
-                command.getResultCallback(), webTarget.request(), null);
+                resultCallback, webTarget.request(), null);
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
index 8ceca593e..9dfe9d118 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
@@ -12,7 +12,7 @@
 
 import static javax.ws.rs.client.Entity.entity;
 
-public class AuthCmdExec extends AbstrDockerCmdExec<AuthCmd, AuthResponse> implements AuthCmd.Exec {
+public class AuthCmdExec extends AbstrSyncDockerCmdExec<AuthCmd, AuthResponse> implements AuthCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AuthCmdExec.class);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index c1f0d8b79..00d907a43 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -19,7 +19,7 @@
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
 
-public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem, Void> implements
+public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem> implements
         BuildImageCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageCmdExec.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
index b07f5e338..fec4da6ac 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
@@ -11,7 +11,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.dockerjava.api.command.CommitCmd;
 
-public class CommitCmdExec extends AbstrDockerCmdExec<CommitCmd, String> implements CommitCmd.Exec {
+public class CommitCmdExec extends AbstrSyncDockerCmdExec<CommitCmd, String> implements CommitCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CommitCmdExec.class);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java
index c7c8c293a..aa7878a65 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java
@@ -12,7 +12,7 @@
 import com.github.dockerjava.api.command.ContainerDiffCmd;
 import com.github.dockerjava.api.model.ChangeLog;
 
-public class ContainerDiffCmdExec extends AbstrDockerCmdExec<ContainerDiffCmd, List<ChangeLog>> implements
+public class ContainerDiffCmdExec extends AbstrSyncDockerCmdExec<ContainerDiffCmd, List<ChangeLog>> implements
         ContainerDiffCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ContainerDiffCmdExec.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
index 88e8c3086..ec6d0b765 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
@@ -14,7 +14,7 @@
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
 import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
 
-public class CopyFileFromContainerCmdExec extends AbstrDockerCmdExec<CopyFileFromContainerCmd, InputStream> implements
+public class CopyFileFromContainerCmdExec extends AbstrSyncDockerCmdExec<CopyFileFromContainerCmd, InputStream> implements
         CopyFileFromContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CopyFileFromContainerCmdExec.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
index c02b9f4b7..265057c00 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
@@ -11,7 +11,7 @@
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 
-public class CreateContainerCmdExec extends AbstrDockerCmdExec<CreateContainerCmd, CreateContainerResponse> implements
+public class CreateContainerCmdExec extends AbstrSyncDockerCmdExec<CreateContainerCmd, CreateContainerResponse> implements
         CreateContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CreateContainerCmdExec.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
index c5733241d..baba39829 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
@@ -11,7 +11,7 @@
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.CreateImageResponse;
 
-public class CreateImageCmdExec extends AbstrDockerCmdExec<CreateImageCmd, CreateImageResponse> implements
+public class CreateImageCmdExec extends AbstrSyncDockerCmdExec<CreateImageCmd, CreateImageResponse> implements
         CreateImageCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CreateImageCmdExec.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
index 5be60076a..1bd38048a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -12,7 +12,7 @@
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
 
-public class EventsCmdExec extends AbstrAsyncDockerCmdExec<EventsCmd, Event, Void> implements EventsCmd.Exec {
+public class EventsCmdExec extends AbstrAsyncDockerCmdExec<EventsCmd, Event> implements EventsCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(EventsCmdExec.class);
 
@@ -28,6 +28,6 @@ protected AbstractCallbackNotifier<Event> callbackNotifier(EventsCmd command, Re
         LOGGER.trace("GET: {}", webTarget);
 
         return new GETCallbackNotifier<Event>(new JsonStreamProcessor<Event>(
-                Event.class), command.getResultCallback(), webTarget.request());
+                Event.class), resultCallback, webTarget.request());
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
index e2d986bbf..573d89470 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
@@ -10,7 +10,7 @@
 
 import static javax.ws.rs.client.Entity.entity;
 
-public class ExecCreateCmdExec extends AbstrDockerCmdExec<ExecCreateCmd, ExecCreateCmdResponse> implements
+public class ExecCreateCmdExec extends AbstrSyncDockerCmdExec<ExecCreateCmd, ExecCreateCmdResponse> implements
         ExecCreateCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(VersionCmdExec.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
index 46d0e2d29..58c19e55c 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
@@ -14,7 +14,7 @@
 
 import static javax.ws.rs.client.Entity.entity;
 
-public class ExecStartCmdExec extends AbstrDockerCmdExec<ExecStartCmd, InputStream> implements ExecStartCmd.Exec {
+public class ExecStartCmdExec extends AbstrSyncDockerCmdExec<ExecStartCmd, InputStream> implements ExecStartCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ExecStartCmdExec.class);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
index eafb87b98..141d7d1dd 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
@@ -9,7 +9,7 @@
 import com.github.dockerjava.api.command.InfoCmd;
 import com.github.dockerjava.api.model.Info;
 
-public class InfoCmdExec extends AbstrDockerCmdExec<InfoCmd, Info> implements InfoCmd.Exec {
+public class InfoCmdExec extends AbstrSyncDockerCmdExec<InfoCmd, Info> implements InfoCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(InfoCmdExec.class);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
index a06e46e7c..9c6e34a92 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
@@ -9,7 +9,7 @@
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 
-public class InspectContainerCmdExec extends AbstrDockerCmdExec<InspectContainerCmd, InspectContainerResponse>
+public class InspectContainerCmdExec extends AbstrSyncDockerCmdExec<InspectContainerCmd, InspectContainerResponse>
         implements InspectContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(InspectContainerCmdExec.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
index a58a520cd..0a99acc08 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
@@ -8,7 +8,7 @@
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
-public class InspectExecCmdExec extends AbstrDockerCmdExec<InspectExecCmd, InspectExecResponse> implements
+public class InspectExecCmdExec extends AbstrSyncDockerCmdExec<InspectExecCmd, InspectExecResponse> implements
         InspectExecCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(InspectExecCmdExec.class);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java
index b03cdd799..9148887ef 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java
@@ -9,7 +9,7 @@
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectImageResponse;
 
-public class InspectImageCmdExec extends AbstrDockerCmdExec<InspectImageCmd, InspectImageResponse> implements
+public class InspectImageCmdExec extends AbstrSyncDockerCmdExec<InspectImageCmd, InspectImageResponse> implements
         InspectImageCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(InspectImageCmdExec.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
index bbfd0dbee..9b132dee5 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
@@ -8,7 +8,7 @@
 
 import com.github.dockerjava.api.command.KillContainerCmd;
 
-public class KillContainerCmdExec extends AbstrDockerCmdExec<KillContainerCmd, Void> implements KillContainerCmd.Exec {
+public class KillContainerCmdExec extends AbstrSyncDockerCmdExec<KillContainerCmd, Void> implements KillContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(KillContainerCmdExec.class);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
index 5feb5bdac..ddd5d3211 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
@@ -14,7 +14,7 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.model.Container;
 
-public class ListContainersCmdExec extends AbstrDockerCmdExec<ListContainersCmd, List<Container>> implements
+public class ListContainersCmdExec extends AbstrSyncDockerCmdExec<ListContainersCmd, List<Container>> implements
         ListContainersCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ListContainersCmdExec.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
index b18470e12..df88cf1d9 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
@@ -14,7 +14,7 @@
 
 import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
 
-public class ListImagesCmdExec extends AbstrDockerCmdExec<ListImagesCmd, List<Image>> implements ListImagesCmd.Exec {
+public class ListImagesCmdExec extends AbstrSyncDockerCmdExec<ListImagesCmd, List<Image>> implements ListImagesCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ListImagesCmdExec.class);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
index b7769c792..0ab3da7a5 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
@@ -12,7 +12,8 @@
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
 
-public class LogContainerCmdExec extends AbstrAsyncDockerCmdExec<LogContainerCmd, Frame, Void> implements LogContainerCmd.Exec {
+public class LogContainerCmdExec extends AbstrAsyncDockerCmdExec<LogContainerCmd, Frame> implements
+        LogContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LogContainerCmdExec.class);
 
@@ -34,7 +35,6 @@ protected AbstractCallbackNotifier<Frame> callbackNotifier(LogContainerCmd comma
 
         LOGGER.trace("GET: {}", webTarget);
 
-        return new GETCallbackNotifier<Frame>(new FrameStreamProcessor(),
-                command.getResultCallback(), webTarget.request());
+        return new GETCallbackNotifier<Frame>(new FrameStreamProcessor(), resultCallback, webTarget.request());
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
index 4bd8ddd9a..04bb68a6f 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
@@ -8,7 +8,7 @@
 
 import com.github.dockerjava.api.command.PauseContainerCmd;
 
-public class PauseContainerCmdExec extends AbstrDockerCmdExec<PauseContainerCmd, Void> implements
+public class PauseContainerCmdExec extends AbstrSyncDockerCmdExec<PauseContainerCmd, Void> implements
         PauseContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PauseContainerCmdExec.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
index 9e2677e58..875155c96 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
@@ -7,7 +7,7 @@
 
 import com.github.dockerjava.api.command.PingCmd;
 
-public class PingCmdExec extends AbstrDockerCmdExec<PingCmd, Void> implements PingCmd.Exec {
+public class PingCmdExec extends AbstrSyncDockerCmdExec<PingCmd, Void> implements PingCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PingCmdExec.class);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
index 224762a6b..dfba3c1c6 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
@@ -18,7 +18,8 @@
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
 
-public class PullImageCmdExec extends AbstrAsyncDockerCmdExec<PullImageCmd, PullResponseItem, Void> implements PullImageCmd.Exec {
+public class PullImageCmdExec extends AbstrAsyncDockerCmdExec<PullImageCmd, PullResponseItem> implements
+        PullImageCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PullImageCmdExec.class);
 
@@ -48,7 +49,4 @@ protected AbstractCallbackNotifier<PullResponseItem> callbackNotifier(PullImageC
         return new POSTCallbackNotifier<PullResponseItem>(new JsonStreamProcessor<PullResponseItem>(
                 PullResponseItem.class), resultCallback, builder, entity(null, MediaType.APPLICATION_JSON));
     }
-
-
-
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
index 500bc7d47..8e79fc662 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
@@ -17,7 +17,7 @@
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
 
-public class PushImageCmdExec extends AbstrAsyncDockerCmdExec<PushImageCmd, PushResponseItem, Void> implements
+public class PushImageCmdExec extends AbstrAsyncDockerCmdExec<PushImageCmd, PushResponseItem> implements
         PushImageCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PushImageCmdExec.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
index ebd98fc6f..2e72c37bc 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
@@ -8,7 +8,7 @@
 
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 
-public class RemoveContainerCmdExec extends AbstrDockerCmdExec<RemoveContainerCmd, Void> implements
+public class RemoveContainerCmdExec extends AbstrSyncDockerCmdExec<RemoveContainerCmd, Void> implements
         RemoveContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(RemoveContainerCmdExec.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
index 8db23112b..18d477c51 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
@@ -7,7 +7,7 @@
 
 import com.github.dockerjava.api.command.RemoveImageCmd;
 
-public class RemoveImageCmdExec extends AbstrDockerCmdExec<RemoveImageCmd, Void> implements RemoveImageCmd.Exec {
+public class RemoveImageCmdExec extends AbstrSyncDockerCmdExec<RemoveImageCmd, Void> implements RemoveImageCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(RemoveImageCmdExec.class);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
index f640945a2..0a4fced89 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
@@ -8,7 +8,7 @@
 
 import com.github.dockerjava.api.command.RestartContainerCmd;
 
-public class RestartContainerCmdExec extends AbstrDockerCmdExec<RestartContainerCmd, Void> implements
+public class RestartContainerCmdExec extends AbstrSyncDockerCmdExec<RestartContainerCmd, Void> implements
         RestartContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(RestartContainerCmdExec.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
index de56a39b6..39a06f15a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
@@ -12,7 +12,7 @@
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
 
-public class SaveImageCmdExec extends AbstrDockerCmdExec<SaveImageCmd, InputStream> implements SaveImageCmd.Exec {
+public class SaveImageCmdExec extends AbstrSyncDockerCmdExec<SaveImageCmd, InputStream> implements SaveImageCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(SaveImageCmdExec.class);
 
     public SaveImageCmdExec(WebTarget baseResource) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java
index 00aeb91ec..1de9943d9 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java
@@ -12,7 +12,7 @@
 import com.github.dockerjava.api.command.SearchImagesCmd;
 import com.github.dockerjava.api.model.SearchItem;
 
-public class SearchImagesCmdExec extends AbstrDockerCmdExec<SearchImagesCmd, List<SearchItem>> implements
+public class SearchImagesCmdExec extends AbstrSyncDockerCmdExec<SearchImagesCmd, List<SearchItem>> implements
         SearchImagesCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SearchImagesCmdExec.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
index c90f5e1cc..8b41f2cd9 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
@@ -10,7 +10,7 @@
 
 import com.github.dockerjava.api.command.StartContainerCmd;
 
-public class StartContainerCmdExec extends AbstrDockerCmdExec<StartContainerCmd, Void> implements
+public class StartContainerCmdExec extends AbstrSyncDockerCmdExec<StartContainerCmd, Void> implements
         StartContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(StartContainerCmdExec.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
index c7e394b4b..10fbd1ca6 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
@@ -12,7 +12,7 @@
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
 
-public class StatsCmdExec extends AbstrAsyncDockerCmdExec<StatsCmd, Statistics, Void> implements StatsCmd.Exec {
+public class StatsCmdExec extends AbstrAsyncDockerCmdExec<StatsCmd, Statistics> implements StatsCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(StatsCmdExec.class);
 
     public StatsCmdExec(WebTarget baseResource) {
@@ -28,8 +28,7 @@ protected AbstractCallbackNotifier<Statistics> callbackNotifier(StatsCmd command
 
         LOGGER.trace("GET: {}", webTarget);
 
-        return new GETCallbackNotifier<Statistics>(
-                new JsonStreamProcessor<Statistics>(Statistics.class), command.getResultCallback(), webTarget.request());
-
+        return new GETCallbackNotifier<Statistics>(new JsonStreamProcessor<Statistics>(Statistics.class),
+                resultCallback, webTarget.request());
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
index 3197e0c0e..d881ce1c2 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
@@ -8,7 +8,7 @@
 
 import com.github.dockerjava.api.command.StopContainerCmd;
 
-public class StopContainerCmdExec extends AbstrDockerCmdExec<StopContainerCmd, Void> implements StopContainerCmd.Exec {
+public class StopContainerCmdExec extends AbstrSyncDockerCmdExec<StopContainerCmd, Void> implements StopContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(StopContainerCmdExec.class);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
index 3cddd63f2..f697b22b2 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
@@ -7,7 +7,7 @@
 
 import com.github.dockerjava.api.command.TagImageCmd;
 
-public class TagImageCmdExec extends AbstrDockerCmdExec<TagImageCmd, Void> implements TagImageCmd.Exec {
+public class TagImageCmdExec extends AbstrSyncDockerCmdExec<TagImageCmd, Void> implements TagImageCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TagImageCmdExec.class);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
index daff2224b..092e9548d 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
@@ -11,7 +11,7 @@
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.TopContainerResponse;
 
-public class TopContainerCmdExec extends AbstrDockerCmdExec<TopContainerCmd, TopContainerResponse> implements
+public class TopContainerCmdExec extends AbstrSyncDockerCmdExec<TopContainerCmd, TopContainerResponse> implements
         TopContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TopContainerCmdExec.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
index de507e8ff..3005f6630 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
@@ -8,7 +8,7 @@
 
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 
-public class UnpauseContainerCmdExec extends AbstrDockerCmdExec<UnpauseContainerCmd, Void> implements
+public class UnpauseContainerCmdExec extends AbstrSyncDockerCmdExec<UnpauseContainerCmd, Void> implements
         UnpauseContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(UnpauseContainerCmdExec.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java
index e8af1cb29..0c1611bc4 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java
@@ -9,7 +9,7 @@
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.model.Version;
 
-public class VersionCmdExec extends AbstrDockerCmdExec<VersionCmd, Version> implements VersionCmd.Exec {
+public class VersionCmdExec extends AbstrSyncDockerCmdExec<VersionCmd, Version> implements VersionCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(VersionCmdExec.class);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
index 47af2bcfa..a916e1b5b 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
@@ -9,7 +9,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 
-public class WaitContainerCmdExec extends AbstrDockerCmdExec<WaitContainerCmd, Integer> implements
+public class WaitContainerCmdExec extends AbstrSyncDockerCmdExec<WaitContainerCmd, Integer> implements
         WaitContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(WaitContainerCmdExec.class);
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 362b8e21e..d492c415b 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -6,6 +6,7 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.BuildResponseItem;
 import com.github.dockerjava.api.model.Frame;
@@ -53,10 +54,8 @@ public void beforeTest() throws Exception {
 
         LOG.info("Pulling image 'busybox'");
 
-        PullResponseCallback callback = new PullResponseCallback();
         // need to block until image is pulled completely
-        dockerClient.pullImageCmd("busybox", callback).withTag("latest").exec();
-        callback.awaitFinish();
+        dockerClient.pullImageCmd("busybox").withTag("latest").exec(new PullResponseCallback()).awaitCompletion();
 
         assertNotNull(dockerClient);
         LOG.info("======================= END OF BEFORETEST =======================\n\n");
@@ -189,7 +188,7 @@ public static void assertContainerHasVolumes(InspectContainerResponse inspectCon
         assertThat(volumes, contains(expectedVolumes));
     }
 
-    public static class CollectFramesCallback extends CollectStreamItemCallback<Frame> {
+    public static class CollectFramesCallback extends CollectStreamItemCallback<CollectFramesCallback, Frame> {
 
         @Override
         public void onNext(Frame frame) {
@@ -201,18 +200,16 @@ public void onNext(Frame frame) {
 
     protected String containerLog(String containerId) throws Exception {
 
-        CollectFramesCallback collectFramesCallback = new CollectFramesCallback();
+        CollectFramesCallback collectFramesCallback = dockerClient.logContainerCmd(containerId).withStdOut()
+                .exec(new CollectFramesCallback());
 
-        dockerClient.logContainerCmd(containerId, collectFramesCallback).withStdOut().exec();
-
-        collectFramesCallback.awaitFinish();
+        collectFramesCallback.awaitCompletion();
 
         return collectFramesCallback.toString();
     }
 
-
-    public static class CollectStreamItemCallback<T> extends ResultCallbackTemplate<T> {
-        public final List<T> items = new ArrayList<T>();
+    public static class CollectStreamItemCallback<RC_T extends ResultCallback<A_RES_T>, A_RES_T> extends ResultCallbackTemplate<RC_T, A_RES_T> {
+        public final List<A_RES_T> items = new ArrayList<A_RES_T>();
 
         protected final StringBuffer log = new StringBuffer();
 
@@ -223,7 +220,7 @@ public void onError(Throwable throwable) {
         }
 
         @Override
-        public void onNext(T item) {
+        public void onNext(A_RES_T item) {
             items.add(item);
             log.append("" + item);
             LOG.info(item.toString());
@@ -235,25 +232,21 @@ public String toString() {
         }
     }
 
-    public static class BuildLogCallback extends CollectStreamItemCallback<BuildResponseItem> {
+    public static class BuildLogCallback extends CollectStreamItemCallback<BuildLogCallback, BuildResponseItem> {
         public String awaitImageId() throws Exception {
-            awaitFinish();
+            awaitCompletion();
             BuildResponseItem item = items.get(items.size() - 1);
             assertThat(item.toString(), containsString("Successfully built"));
             return item.getStream().replaceFirst("Successfully built", "").trim();
         }
     }
 
-    public static class PullResponseCallback extends CollectStreamItemCallback<PullResponseItem> {
+    public static class PullResponseCallback extends CollectStreamItemCallback<PullResponseCallback, PullResponseItem> {
 
     }
 
     protected String buildImage(File baseDir) throws Exception {
 
-        BuildLogCallback callback = new BuildLogCallback();
-
-        dockerClient.buildImageCmd(baseDir, callback).withNoCache().exec();
-
-        return callback.awaitImageId();
+        return dockerClient.buildImageCmd(baseDir).withNoCache().exec(new BuildLogCallback()).awaitImageId();
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index 21294de21..fdc582083 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -1,14 +1,51 @@
 package com.github.dockerjava.core;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.github.dockerjava.api.command.*;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd.Exec;
-import com.github.dockerjava.jaxrs.BuildImageCmdExec;
+import com.github.dockerjava.api.command.BuildImageCmd;
+import com.github.dockerjava.api.command.CommitCmd;
+import com.github.dockerjava.api.command.ContainerDiffCmd;
+import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.api.command.CreateContainerCmd;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.CreateImageResponse;
+import com.github.dockerjava.api.command.DockerCmdExecFactory;
+import com.github.dockerjava.api.command.EventsCmd;
+import com.github.dockerjava.api.command.ExecCreateCmd;
+import com.github.dockerjava.api.command.ExecStartCmd;
+import com.github.dockerjava.api.command.InfoCmd;
+import com.github.dockerjava.api.command.InspectContainerCmd;
+import com.github.dockerjava.api.command.InspectExecCmd;
+import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.KillContainerCmd;
+import com.github.dockerjava.api.command.ListContainersCmd;
+import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.LogContainerCmd;
+import com.github.dockerjava.api.command.PauseContainerCmd;
+import com.github.dockerjava.api.command.PingCmd;
+import com.github.dockerjava.api.command.PullImageCmd;
+import com.github.dockerjava.api.command.PushImageCmd;
+import com.github.dockerjava.api.command.RemoveContainerCmd;
+import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.api.command.RestartContainerCmd;
+import com.github.dockerjava.api.command.SaveImageCmd;
+import com.github.dockerjava.api.command.SearchImagesCmd;
+import com.github.dockerjava.api.command.StartContainerCmd;
+import com.github.dockerjava.api.command.StatsCmd;
+import com.github.dockerjava.api.command.StopContainerCmd;
+import com.github.dockerjava.api.command.TagImageCmd;
+import com.github.dockerjava.api.command.TopContainerCmd;
+import com.github.dockerjava.api.command.UnpauseContainerCmd;
+import com.github.dockerjava.api.command.VersionCmd;
+import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.api.model.BuildResponseItem;
 
 /**
  * Special {@link DockerCmdExecFactory} implementation that collects container and image creations while test execution
@@ -91,14 +128,14 @@ public Void exec(RemoveImageCmd command) {
     public BuildImageCmd.Exec createBuildImageCmdExec() {
         return new BuildImageCmd.Exec() {
             @Override
-            public Void exec(BuildImageCmd command) {
+            public Void exec(BuildImageCmd command, ResultCallback<BuildResponseItem> resultCallback) {
                 // can't detect image id here so tagging it
                 String tag = command.getTag();
                 if (tag == null || "".equals(tag.trim())) {
                     tag = "" + new SecureRandom().nextInt(Integer.MAX_VALUE);
                     command.withTag(tag);
                 }
-                delegate.createBuildImageCmdExec().exec(command);
+                delegate.createBuildImageCmdExec().exec(command, resultCallback);
                 imageNames.add(tag);
                 return null;
             }
diff --git a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
index 13456df88..cb9fb794f 100644
--- a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
@@ -65,10 +65,10 @@ public void onNext(Frame frame) {
             };
         };
 
-        dockerClient.attachContainerCmd(container.getId(), collectFramesCallback).withStdErr().withStdOut()
-                .withFollowStream().withLogs().exec();
+        dockerClient.attachContainerCmd(container.getId()).withStdErr().withStdOut()
+                .withFollowStream().withLogs().exec(collectFramesCallback);
 
-        collectFramesCallback.awaitFinish(30, TimeUnit.SECONDS);
+        collectFramesCallback.awaitCompletion(30, TimeUnit.SECONDS);
 
         collectFramesCallback.close();
 
@@ -98,10 +98,10 @@ public void onNext(Frame frame) {
             };
         };
 
-        dockerClient.attachContainerCmd(container.getId(), collectFramesCallback).withStdErr().withStdOut()
-                .withFollowStream().exec();
+        dockerClient.attachContainerCmd(container.getId()).withStdErr().withStdOut()
+                .withFollowStream().exec(collectFramesCallback);
 
-        collectFramesCallback.awaitFinish(15, TimeUnit.SECONDS);
+        collectFramesCallback.awaitCompletion(15, TimeUnit.SECONDS);
 
         collectFramesCallback.close();
 
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 31b5089c2..51dfd37a0 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -85,12 +85,8 @@ public void testNonstandard2() throws Exception {
         File dockerFile = new File(Thread.currentThread().getContextClassLoader()
                 .getResource("nonstandard/subdirectory/Dockerfile-nonstandard").getFile());
 
-        BuildLogCallback resultCallback = new BuildLogCallback();
-
-        dockerClient.buildImageCmd(resultCallback).withBaseDirectory(baseDir).withDockerfile(dockerFile)
-                .withNoCache().exec();
-
-        resultCallback.awaitImageId();
+        dockerClient.buildImageCmd().withBaseDirectory(baseDir).withDockerfile(dockerFile)
+                .withNoCache().exec(new BuildLogCallback()).awaitImageId();
     }
 
     @Test
@@ -141,20 +137,20 @@ public void testDockerBuilderEnv() throws Exception {
     }
 
     private String dockerfileBuild(InputStream tarInputStream) throws Exception {
-        BuildLogCallback resultCallback = new BuildLogCallback();
-        return execBuild(dockerClient.buildImageCmd(resultCallback).withTarInputStream(tarInputStream));
+
+        return execBuild(dockerClient.buildImageCmd().withTarInputStream(tarInputStream));
     }
 
     private String dockerfileBuild(File baseDir) throws Exception {
-        BuildLogCallback resultCallback = new BuildLogCallback();
-        return execBuild(dockerClient.buildImageCmd(baseDir, resultCallback));
+
+        return execBuild(dockerClient.buildImageCmd(baseDir));
     }
 
     private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
 
-        BuildLogCallback resultCallback = (BuildLogCallback) buildImageCmd.getResultCallback();
+        BuildLogCallback resultCallback = new BuildLogCallback();;
 
-        buildImageCmd.withNoCache().exec();
+        buildImageCmd.withNoCache().exec(resultCallback);
 
         String imageId = resultCallback.awaitImageId();
 
@@ -175,19 +171,16 @@ private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
     public void testDockerfileIgnored() throws Exception{
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerfileIgnored")
                 .getFile());
-        BuildLogCallback resultCallback = new BuildLogCallback();
-        dockerClient.buildImageCmd(baseDir, resultCallback).withNoCache().exec();
-        resultCallback.awaitImageId();
 
+        dockerClient.buildImageCmd(baseDir).withNoCache().exec(new BuildLogCallback()).awaitImageId();
     }
 
     @Test(expectedExceptions = { DockerClientException.class })
     public void testInvalidDockerIgnorePattern() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader()
                 .getResource("testInvalidDockerignorePattern").getFile());
-        BuildLogCallback resultCallback = new BuildLogCallback();
-        dockerClient.buildImageCmd(baseDir, resultCallback).withNoCache().exec();
-        resultCallback.awaitImageId();
+
+        dockerClient.buildImageCmd(baseDir).withNoCache().exec( new BuildLogCallback()).awaitImageId();
     }
 
     @Test(groups = "ignoreInCircleCi")
@@ -203,9 +196,9 @@ public void testNetCatDockerfileBuilder() throws InterruptedException, IOExcepti
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("netcat").getFile());
 
         BuildLogCallback resultCallback = new BuildLogCallback();
-        dockerClient.buildImageCmd(baseDir, resultCallback).withNoCache().exec();
+        dockerClient.buildImageCmd(baseDir).withNoCache().exec(resultCallback);
 
-        resultCallback.awaitFinish();
+        resultCallback.awaitCompletion();
 
         String imageId = null;
 
diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
index 334bfa000..74ed3dae3 100644
--- a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
+++ b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -40,15 +40,9 @@ public DockerfileFixture(DockerClient dockerClient, String directory) {
     public void open() throws Exception {
 
         LOGGER.info("building {}", directory);
-        BuildLogCallback resultCallback = new BuildLogCallback();
 
-        dockerClient.buildImageCmd(new File("src/test/resources", directory), resultCallback).withNoCache() // remove
-                                                                                                                   // alternatives,
-                                                                                                                   // cause
-                                                                                                                   // problems
-                .exec();
-
-        resultCallback.awaitImageId();
+        dockerClient.buildImageCmd(new File("src/test/resources", directory)).withNoCache()
+                .exec(new BuildLogCallback()).awaitImageId();
 
         Image lastCreatedImage = dockerClient.listImagesCmd().exec().get(0);
 
diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
index 17ad84c3b..c3f2c0075 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -65,8 +65,7 @@ public void testEventStreamTimeBound() throws Exception {
         CountDownLatch countDownLatch = new CountDownLatch(expectedEvents);
         EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
 
-        EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback).withSince(startTime).withUntil(endTime);
-        eventsCmd.exec();
+        dockerClient.eventsCmd().withSince(startTime).withUntil(endTime).exec(eventCallback);
 
         boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
 
@@ -83,8 +82,7 @@ public void testEventStreaming1() throws Exception {
         CountDownLatch countDownLatch = new CountDownLatch(KNOWN_NUM_EVENTS);
         EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
 
-        EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback).withSince(getEpochTime());
-        eventsCmd.exec();
+        dockerClient.eventsCmd().withSince(getEpochTime()).exec(eventCallback);
 
         generateEvents();
 
@@ -102,8 +100,7 @@ public void testEventStreaming2() throws Exception {
         CountDownLatch countDownLatch = new CountDownLatch(KNOWN_NUM_EVENTS);
         EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
 
-        EventsCmd eventsCmd = dockerClient.eventsCmd(eventCallback).withSince(getEpochTime());
-        eventsCmd.exec();
+        dockerClient.eventsCmd().withSince(getEpochTime()).exec(eventCallback);
 
         generateEvents();
 
@@ -119,16 +116,15 @@ public void testEventStreaming2() throws Exception {
     private int generateEvents() throws Exception {
         String testImage = "busybox";
 
-        PullResponseCallback callback = new PullResponseCallback();
-        dockerClient.pullImageCmd(testImage, callback).exec();
-        callback.awaitFinish();
+        dockerClient.pullImageCmd(testImage).exec(new PullResponseCallback()).awaitCompletion();
+
         CreateContainerResponse container = dockerClient.createContainerCmd(testImage).withCmd("sleep", "9999").exec();
         dockerClient.startContainerCmd(container.getId()).exec();
         dockerClient.stopContainerCmd(container.getId()).exec();
         return KNOWN_NUM_EVENTS;
     }
 
-    private class EventCallbackTest extends ResultCallbackTemplate<Event> {
+    private class EventCallbackTest extends ResultCallbackTemplate<EventCallbackTest, Event> {
 
         private final CountDownLatch countDownLatch;
 
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index 9863f4178..5f647b1f5 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -55,13 +55,13 @@ private List<Frame> getLoggingFrames() throws Exception {
 
         AbstractDockerClientTest.CollectFramesCallback collectFramesCallback = new AbstractDockerClientTest.CollectFramesCallback();
 
-        dockerClient.logContainerCmd(dockerfileFixture.getContainerId(), collectFramesCallback).withStdOut()
+        dockerClient.logContainerCmd(dockerfileFixture.getContainerId()).withStdOut()
                 .withStdErr().withTailAll()
                 // we can't follow stream here as it blocks reading from resulting InputStream infinitely
                 // .withFollowStream()
-                .exec();
+                .exec(collectFramesCallback);
 
-        collectFramesCallback.awaitFinish();
+        collectFramesCallback.awaitCompletion();
 
         return collectFramesCallback.items;
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
index 79302bef8..1669728c9 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
@@ -59,9 +59,7 @@ public void testListContainers() throws Exception {
         String testImage = "busybox";
 
         // need to block until image is pulled completely
-        PullResponseCallback callback = new PullResponseCallback();
-        dockerClient.pullImageCmd(testImage, callback).exec();
-        callback.awaitFinish();
+        dockerClient.pullImageCmd(testImage).exec(new PullResponseCallback()).awaitCompletion();
 
         List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
         assertThat(containers, notNullValue());
@@ -108,10 +106,8 @@ public void testListContainersWithLabelsFilter() throws Exception {
 
         String testImage = "busybox";
 
-        PullResponseCallback callback = new PullResponseCallback();
         // need to block until image is pulled completely
-        dockerClient.pullImageCmd(testImage, callback).exec();
-        callback.awaitFinish();
+        dockerClient.pullImageCmd(testImage).exec(new PullResponseCallback()).awaitCompletion();
 
         List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
         assertThat(containers, notNullValue());
diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
index 9df8f4c5a..f3c8f0222 100644
--- a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
@@ -61,9 +61,9 @@ public void asyncLogContainer() throws Exception {
 
         CollectFramesCallback loggingCallback = new CollectFramesCallback();
 
-        dockerClient.logContainerCmd(container.getId(), loggingCallback).withStdErr().withStdOut().exec();
+        dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec(loggingCallback);
 
-        loggingCallback.awaitFinish();
+        loggingCallback.awaitCompletion();
 
         assertTrue(loggingCallback.toString().contains(snippet));
     }
@@ -93,9 +93,7 @@ public void onComplete() {
             };
         };
 
-        dockerClient.logContainerCmd("non-existing", loggingCallback).withStdErr().withStdOut().exec();
-
-        loggingCallback.awaitFinish();
+        dockerClient.logContainerCmd("non-existing").withStdErr().withStdOut().exec(loggingCallback).awaitCompletion();
     }
 
     @Test
@@ -117,21 +115,21 @@ public void asyncMultipleLogContainer() throws Exception {
 
         CollectFramesCallback loggingCallback = new CollectFramesCallback();
 
-        dockerClient.logContainerCmd(container.getId(), loggingCallback).withStdErr().withStdOut().exec();
+        dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec(loggingCallback);
 
         loggingCallback.close();
 
         loggingCallback = new CollectFramesCallback();
 
-        dockerClient.logContainerCmd(container.getId(), loggingCallback).withStdErr().withStdOut().exec();
+        dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec(loggingCallback);
 
         loggingCallback.close();
 
         loggingCallback = new CollectFramesCallback();
 
-        dockerClient.logContainerCmd(container.getId(), loggingCallback).withStdErr().withStdOut().exec();
+        dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec(loggingCallback);
 
-        loggingCallback.awaitFinish();
+        loggingCallback.awaitCompletion();
 
         assertTrue(loggingCallback.toString().contains(snippet));
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
index 9761f1da8..83c433775 100644
--- a/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
@@ -15,19 +15,20 @@
 import org.testng.annotations.Test;
 
 import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.InspectImageResponse;
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.model.Info;
+import com.github.dockerjava.api.model.PullResponseItem;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
 @Test(groups = "integration")
 public class PullImageCmdImplTest extends AbstractDockerClientTest {
 
     private static final PullImageCmd.Exec NOP_EXEC = new PullImageCmd.Exec() {
-        @Override
-        public Void exec(PullImageCmd command) {
+        public Void exec(PullImageCmd command, ResultCallback<PullResponseItem> resultCallback) {
             return null;
-        }
+        };
     };
 
     @BeforeTest
@@ -52,7 +53,7 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void nullAuthConfig() throws Exception {
-        PullImageCmdImpl pullImageCmd = new PullImageCmdImpl(NOP_EXEC, null, "", new PullResponseCallback());
+        PullImageCmdImpl pullImageCmd = new PullImageCmdImpl(NOP_EXEC, null, "");
         try {
             pullImageCmd.withAuthConfig(null);
             fail();
@@ -94,11 +95,9 @@ public void testPullImage() throws Exception {
 
         LOG.info("Pulling image: {}", testImage);
 
-        PullResponseCallback callback = new PullResponseCallback();
-
-        dockerClient.pullImageCmd(testImage, callback).exec();
+        PullResponseCallback callback = dockerClient.pullImageCmd(testImage).exec(new PullResponseCallback());
 
-        callback.awaitFinish();
+        callback.awaitCompletion();
 
         assertThat(callback.toString(), containsString("Download complete"));
 
@@ -116,12 +115,8 @@ public void testPullImage() throws Exception {
     public void testPullNonExistingImage() throws Exception {
 
         // does not throw an exception
-
-        PullResponseCallback callback = new PullResponseCallback();
-
-        dockerClient.pullImageCmd("xvxcv/foo", callback).exec();
         // stream needs to be fully read in order to close the underlying connection
-        callback.awaitFinish();
+        dockerClient.pullImageCmd("xvxcv/foo").exec(new PullResponseCallback()).awaitCompletion();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
index 1567ab3aa..23eff6db4 100644
--- a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
@@ -60,22 +60,14 @@ public void pushLatest() throws Exception {
         LOG.info("Committing container: {}", container.toString());
         String imageId = dockerClient.commitCmd(container.getId()).withRepository(username + "/busybox").exec();
 
-
-        PushResponseCallback callback  = new PushResponseCallback();
-
         // we have to block until image is pushed
-        dockerClient.pushImageCmd(username + "/busybox", callback).exec();
-
-        callback.awaitFinish();
+        dockerClient.pushImageCmd(username + "/busybox").exec(new PushResponseCallback()).awaitCompletion();
 
         LOG.info("Removing image: {}", imageId);
         dockerClient.removeImageCmd(imageId).exec();
 
-        PullResponseCallback pushCallback = new PullResponseCallback();
-
-        dockerClient.pullImageCmd(username + "/busybox", pushCallback).exec();
-
-        pushCallback.awaitFinish();
+        PullResponseCallback pushCallback = dockerClient.pullImageCmd(username + "/busybox")
+                .exec(new PullResponseCallback()).awaitCompletion();
 
         assertThat(pushCallback.toString(), not(containsString("HTTP code: 404")));
     }
@@ -83,16 +75,13 @@ public void pushLatest() throws Exception {
     @Test
     public void pushNonExistentImage() throws Exception {
 
-        PushResponseCallback callback  = new PushResponseCallback();
-
-        dockerClient.pushImageCmd(username + "/xxx", callback).exec();
-
-        callback.awaitFinish();
+        PushResponseCallback callback = dockerClient.pushImageCmd(username + "/xxx").exec(new PushResponseCallback())
+                .awaitCompletion();
 
         assertThat(callback.toString(), containsString("error"));
     }
 
-    public static class PushResponseCallback extends CollectStreamItemCallback<PushResponseItem> {
+    public static class PushResponseCallback extends CollectStreamItemCallback<PushResponseCallback, PushResponseItem> {
 
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
index 641510d61..cd6646e6b 100644
--- a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
@@ -53,7 +53,6 @@ public void testStatsStreaming() throws InterruptedException, IOException {
         TimeUnit.SECONDS.sleep(1);
 
         CountDownLatch countDownLatch = new CountDownLatch(NUM_STATS);
-        StatsCallbackTest statsCallback = new StatsCallbackTest(countDownLatch);
 
         String containerName = "generated_" + new SecureRandom().nextInt();
 
@@ -64,8 +63,7 @@ public void testStatsStreaming() throws InterruptedException, IOException {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        StatsCmd statsCmd = dockerClient.statsCmd(statsCallback).withContainerId(container.getId());
-        statsCmd.exec();
+        StatsCallbackTest statsCallback = dockerClient.statsCmd().withContainerId(container.getId()).exec(new StatsCallbackTest(countDownLatch));
 
         countDownLatch.await(3, TimeUnit.SECONDS);
         boolean gotStats = statsCallback.gotStats();
@@ -83,7 +81,7 @@ public void testStatsStreaming() throws InterruptedException, IOException {
 
     }
 
-    private class StatsCallbackTest extends ResultCallbackTemplate<Statistics> {
+    private class StatsCallbackTest extends ResultCallbackTemplate<StatsCallbackTest, Statistics> {
         private final CountDownLatch countDownLatch;
 
         private boolean gotStats = false;

From 8b0ef3a08ccf93c95b631859816fee9621d25d7f Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Wed, 15 Jul 2015 11:05:50 +0200
Subject: [PATCH 0138/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 808cae3c8..b795807fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@ Change Log
 
 Latest SNAPSHOT
 ---
-
+* [#270](https://github.com/docker-java/docker-java/pull/270) Passing result callbacks for async commands via commands exec()
 * [#263](https://github.com/docker-java/docker-java/pull/263) Refactoring of streaming commands APIs (event, stats, log, attach)
 * [#262](https://github.com/docker-java/docker-java/pull/262) Accept filters in list containers 
 * [#260](https://github.com/docker-java/docker-java/pull/260) Add labels to create and inspect container

From 47e070fecacda1ee218db498cdfbd8eaa062f67c Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 15 Jul 2015 11:16:37 +0200
Subject: [PATCH 0139/1272] Formatting sources

---
 .../github/dockerjava/api/DockerClient.java   |   7 -
 .../api/command/AsyncDockerCmd.java           |   1 -
 .../dockerjava/api/command/BuildImageCmd.java |   2 -
 .../api/command/CreateContainerResponse.java  |   3 +-
 .../api/command/CreateImageResponse.java      |   3 +-
 .../dockerjava/api/command/DockerCmd.java     |   2 -
 .../dockerjava/api/command/ExecStartCmd.java  |   4 +-
 .../api/command/InspectContainerResponse.java |   8 +-
 .../api/command/InspectExecResponse.java      |   7 +-
 .../api/command/InspectImageResponse.java     |   4 +-
 .../dockerjava/api/command/SaveImageCmd.java  |   4 +-
 .../dockerjava/api/command/SyncDockerCmd.java |   1 -
 .../dockerjava/api/model/ChangeLog.java       |   3 +-
 .../dockerjava/api/model/ContainerConfig.java |   3 +-
 .../dockerjava/api/model/DriverStatus.java    |   3 +-
 .../github/dockerjava/api/model/Event.java    |   3 +-
 .../dockerjava/api/model/HostConfig.java      |   3 +-
 .../github/dockerjava/api/model/Ports.java    |   2 -
 .../dockerjava/api/model/Repository.java      |   4 +-
 .../dockerjava/api/model/SearchItem.java      |   3 +-
 .../github/dockerjava/api/model/Ulimit.java   |   5 +-
 .../github/dockerjava/api/model/Version.java  |   3 +-
 .../github/dockerjava/api/model/Volume.java   |  16 --
 .../dockerjava/api/model/VolumeBinds.java     |   2 +-
 .../dockerjava/api/model/VolumesRW.java       |   2 +-
 .../dockerjava/core/AuthConfigFile.java       |   2 +-
 .../dockerjava/core/CertificateUtils.java     |   1 -
 .../dockerjava/core/CompressArchiveUtil.java  |  10 +-
 .../dockerjava/core/DockerClientBuilder.java  |  24 ++-
 .../dockerjava/core/DockerClientImpl.java     |   7 -
 .../github/dockerjava/core/FilePathUtil.java  |   4 +-
 .../com/github/dockerjava/core/SSLConfig.java |   5 +-
 .../core/async/JsonStreamProcessor.java       |   1 -
 .../core/async/ResultCallbackTemplate.java    |   3 +-
 .../core/command/AbstrAsyncDockerCmd.java     |   2 -
 .../core/command/AbstrAuthCfgDockerCmd.java   |   7 -
 .../core/command/AttachContainerCmdImpl.java  |   5 +-
 .../core/command/CreateContainerCmdImpl.java  |   2 +-
 .../core/command/EventsCmdImpl.java           |   1 -
 .../core/command/InspectExecCmdImpl.java      |   1 -
 .../core/command/ListContainersCmdImpl.java   |   3 +-
 .../core/command/LogContainerCmdImpl.java     |   5 -
 .../core/command/PullImageCmdImpl.java        |   1 -
 .../core/command/PushImageCmdImpl.java        |   1 -
 .../core/command/SaveImageCmdImpl.java        |   6 +-
 .../dockerjava/core/command/StatsCmdImpl.java |   1 -
 .../core/dockerfile/Dockerfile.java           |  21 ++-
 .../core/dockerfile/DockerfileStatement.java  |   3 +-
 .../core/util/JsonClientFilter.java           |   3 +-
 .../dockerjava/core/util/LoggingFilter.java   |   8 +-
 .../dockerjava/jaxrs/AbstrDockerCmdExec.java  |   1 -
 .../jaxrs/AttachContainerCmdExec.java         |   3 +-
 .../github/dockerjava/jaxrs/AuthCmdExec.java  |  13 +-
 .../dockerjava/jaxrs/BuildImageCmdExec.java   |   7 +-
 .../jaxrs/CopyFileFromContainerCmdExec.java   |   4 +-
 .../jaxrs/CreateContainerCmdExec.java         |   4 +-
 .../jaxrs/DockerCmdExecFactoryImpl.java       |  52 +++++--
 .../dockerjava/jaxrs/EventsCmdExec.java       |   4 +-
 .../dockerjava/jaxrs/ExecCreateCmdExec.java   |  11 +-
 .../dockerjava/jaxrs/ExecStartCmdExec.java    |  12 +-
 .../dockerjava/jaxrs/InspectExecCmdExec.java  |   9 +-
 .../jaxrs/KillContainerCmdExec.java           |   3 +-
 .../jaxrs/ListContainersCmdExec.java          |   2 +-
 .../dockerjava/jaxrs/ListImagesCmdExec.java   |   4 +-
 .../jaxrs/StopContainerCmdExec.java           |   3 +-
 .../dockerjava/jaxrs/TopContainerCmdExec.java |   1 -
 .../jaxrs/UnixConnectionSocketFactory.java    |  14 +-
 .../jaxrs/connector/ApacheConnector.java      |  36 ++---
 .../connector/ApacheConnectorProvider.java    |   3 +-
 .../api/command/CommandJSONSamples.java       |   7 -
 .../command/InspectContainerResponseTest.java |   6 +-
 .../dockerjava/api/model/AuthConfigTest.java  |   4 +-
 .../api/model/InternetProtocolTest.java       |   2 +-
 .../api/model/Ports_addBindingsTest.java      |   1 -
 .../dockerjava/api/model/VolumeBindsTest.java |  10 +-
 .../client/AbstractDockerClientTest.java      |  38 ++---
 .../dockerjava/client/DockerClientTest.java   |   6 +-
 .../core/CompressArchiveUtilTest.java         |  18 +--
 .../core/DockerClientBuilderTest.java         | 141 ++++++++----------
 .../core/DockerClientConfigTest.java          |   7 +-
 .../dockerjava/core/DockerClientImplTest.java |   4 +-
 .../command/AttachContainerCmdImplTest.java   |  10 +-
 .../core/command/BuildImageCmdImplTest.java   |  11 +-
 .../CopyFileFromContainerCmdImplTest.java     |  21 ++-
 .../command/CreateContainerCmdImplTest.java   |  50 +++++--
 .../core/command/DockerfileFixture.java       |  14 +-
 .../core/command/EventsCmdImplTest.java       |   3 -
 .../core/command/FrameReaderITest.java        |   7 +-
 .../core/command/FrameReaderTest.java         |  11 +-
 .../command/ListContainersCmdImplTest.java    |   1 -
 .../core/command/ListImagesCmdImplTest.java   |  10 +-
 .../core/command/StatsCmdImplTest.java        |   4 +-
 .../core/dockerfile/DockerfileTest.java       |  10 +-
 .../test/serdes/JSONResourceRef.java          |   1 -
 .../test/serdes/JSONTestHelper.java           |  10 +-
 95 files changed, 413 insertions(+), 405 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index cd276ec16..8b578f08e 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -5,7 +5,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd;
 import com.github.dockerjava.api.command.BuildImageCmd;
@@ -43,13 +42,7 @@
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.AuthConfig;
-import com.github.dockerjava.api.model.Event;
-import com.github.dockerjava.api.model.BuildResponseItem;
-import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.Identifier;
-import com.github.dockerjava.api.model.PullResponseItem;
-import com.github.dockerjava.api.model.PushResponseItem;
-import com.github.dockerjava.api.model.Statistics;
 
 // https://godoc.org/github.com/fsouza/go-dockerclient
 public interface DockerClient extends Closeable {
diff --git a/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java b/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
index fb1b894d0..78ee978fa 100644
--- a/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
@@ -13,7 +13,6 @@
  */
 public interface AsyncDockerCmd<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T>, A_RES_T> extends DockerCmd<Void> {
 
-
     public <T extends ResultCallback<A_RES_T>> T exec(T resultCallback);
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 5fd6015c3..5a41a61fb 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -60,6 +60,4 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     public static interface Exec extends DockerCmdAsyncExec<BuildImageCmd, BuildResponseItem> {
     }
 
-
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
index 5b0b5a538..65234945f 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
@@ -1,8 +1,9 @@
 package com.github.dockerjava.api.command;
 
+import org.apache.commons.lang.builder.ToStringBuilder;
+
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.ToStringBuilder;
 
 /**
  *
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java b/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
index 43731703e..1e8c8d2e9 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
@@ -1,8 +1,9 @@
 package com.github.dockerjava.api.command;
 
+import org.apache.commons.lang.builder.ToStringBuilder;
+
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.ToStringBuilder;
 
 /**
  * Parse reponses from /images/create
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmd.java b/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
index ba9992bed..a4e7e3a5e 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
@@ -4,6 +4,4 @@
 
 public interface DockerCmd<RES_T> extends Closeable {
 
-
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
index cd9eaa017..f769fb193 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
@@ -1,9 +1,9 @@
 package com.github.dockerjava.api.command;
 
-import com.github.dockerjava.api.NotFoundException;
-
 import java.io.InputStream;
 
+import com.github.dockerjava.api.NotFoundException;
+
 public interface ExecStartCmd extends SyncDockerCmd<InputStream> {
 
     public String getExecId();
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index dc0507e50..3f2fedd77 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -3,12 +3,18 @@
 import java.util.List;
 import java.util.Map;
 
-import com.github.dockerjava.api.model.*;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.ContainerConfig;
+import com.github.dockerjava.api.model.HostConfig;
+import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.VolumeBind;
+import com.github.dockerjava.api.model.VolumeBinds;
+import com.github.dockerjava.api.model.VolumeRW;
+import com.github.dockerjava.api.model.VolumesRW;
 
 /**
  *
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
index 1532f7d55..8a9a24a1b 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
@@ -1,10 +1,11 @@
 package com.github.dockerjava.api.command;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
 import org.apache.commons.lang.builder.ToStringBuilder;
 
-import java.util.List;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class InspectExecResponse {
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
index 63f5e49c6..5c1a0185e 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
@@ -1,11 +1,11 @@
 package com.github.dockerjava.api.command;
 
+import org.apache.commons.lang.builder.ToStringBuilder;
+
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.model.ContainerConfig;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 /**
  *
  * @author Konstantin Pelykh (kpelykh@gmail.com)
diff --git a/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java b/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
index 0b027a764..459beb047 100644
--- a/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
@@ -1,9 +1,9 @@
 package com.github.dockerjava.api.command;
 
-import com.github.dockerjava.api.NotFoundException;
-
 import java.io.InputStream;
 
+import com.github.dockerjava.api.NotFoundException;
+
 public interface SaveImageCmd extends SyncDockerCmd<InputStream> {
 
     public String getName();
diff --git a/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java b/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java
index 7192e46f3..0ac3cf819 100644
--- a/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.command;
 
-
 public interface SyncDockerCmd<RES_T> extends DockerCmd<RES_T> {
 
     public RES_T exec();
diff --git a/src/main/java/com/github/dockerjava/api/model/ChangeLog.java b/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
index 9bc910694..f565cfaa7 100644
--- a/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
+++ b/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
@@ -1,8 +1,9 @@
 package com.github.dockerjava.api.model;
 
+import org.apache.commons.lang.builder.ToStringBuilder;
+
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.ToStringBuilder;
 
 /**
  *
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
index 0478e5ef0..29b2af38e 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
@@ -2,10 +2,11 @@
 
 import java.util.Map;
 
+import org.apache.commons.lang.builder.ToStringBuilder;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.ToStringBuilder;
 
 /**
  *
diff --git a/src/main/java/com/github/dockerjava/api/model/DriverStatus.java b/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
index c1bb8b7d3..303e820ba 100644
--- a/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
+++ b/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
@@ -1,8 +1,9 @@
 package com.github.dockerjava.api.model;
 
+import org.apache.commons.lang.builder.ToStringBuilder;
+
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.ToStringBuilder;
 
 /**
  * Created by ben on 12/12/13.
diff --git a/src/main/java/com/github/dockerjava/api/model/Event.java b/src/main/java/com/github/dockerjava/api/model/Event.java
index 14637d6e7..8d3877ff2 100644
--- a/src/main/java/com/github/dockerjava/api/model/Event.java
+++ b/src/main/java/com/github/dockerjava/api/model/Event.java
@@ -1,8 +1,9 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 /**
  * Representation of a Docker event.
  */
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 19da56517..8e228fbbd 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -1,9 +1,10 @@
 package com.github.dockerjava.api.model;
 
+import org.apache.commons.lang.builder.ToStringBuilder;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.ToStringBuilder;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class HostConfig {
diff --git a/src/main/java/com/github/dockerjava/api/model/Ports.java b/src/main/java/com/github/dockerjava/api/model/Ports.java
index 13c6ff649..54aa8b226 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -3,10 +3,8 @@
 import static org.apache.commons.lang.StringUtils.isEmpty;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Repository.java b/src/main/java/com/github/dockerjava/api/model/Repository.java
index cdfead739..1c5b641ba 100644
--- a/src/main/java/com/github/dockerjava/api/model/Repository.java
+++ b/src/main/java/com/github/dockerjava/api/model/Repository.java
@@ -1,10 +1,10 @@
 package com.github.dockerjava.api.model;
 
-import com.google.common.base.Objects;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import com.google.common.base.Objects;
+
 /**
  * A repository or image name.
  */
diff --git a/src/main/java/com/github/dockerjava/api/model/SearchItem.java b/src/main/java/com/github/dockerjava/api/model/SearchItem.java
index cb4c5d7bc..5c5206616 100644
--- a/src/main/java/com/github/dockerjava/api/model/SearchItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/SearchItem.java
@@ -1,8 +1,9 @@
 package com.github.dockerjava.api.model;
 
+import org.apache.commons.lang.builder.ToStringBuilder;
+
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.ToStringBuilder;
 
 /**
  *
diff --git a/src/main/java/com/github/dockerjava/api/model/Ulimit.java b/src/main/java/com/github/dockerjava/api/model/Ulimit.java
index 3d8fc432f..d385adbe2 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ulimit.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ulimit.java
@@ -1,10 +1,11 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * @author Vangie Du (duwan@live.com)
diff --git a/src/main/java/com/github/dockerjava/api/model/Version.java b/src/main/java/com/github/dockerjava/api/model/Version.java
index 3318fc5b1..aca548987 100644
--- a/src/main/java/com/github/dockerjava/api/model/Version.java
+++ b/src/main/java/com/github/dockerjava/api/model/Version.java
@@ -1,8 +1,9 @@
 package com.github.dockerjava.api.model;
 
+import org.apache.commons.lang.builder.ToStringBuilder;
+
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.ToStringBuilder;
 
 /**
  *
diff --git a/src/main/java/com/github/dockerjava/api/model/Volume.java b/src/main/java/com/github/dockerjava/api/model/Volume.java
index 8bc7f2fba..f7ff8e288 100644
--- a/src/main/java/com/github/dockerjava/api/model/Volume.java
+++ b/src/main/java/com/github/dockerjava/api/model/Volume.java
@@ -1,24 +1,8 @@
 package com.github.dockerjava.api.model;
 
-import java.io.IOException;
-import java.util.Map.Entry;
-
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.ObjectCodec;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.node.NullNode;
-
 /**
  * Represents a bind mounted volume in a Docker container.
  * 
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java b/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
index 3d2abee45..d8303ec84 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
@@ -1,12 +1,12 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.core.JsonGenerator;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.ObjectCodec;
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumesRW.java b/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
index 4a017d162..f54f8242c 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
@@ -1,12 +1,12 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.core.JsonGenerator;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.ObjectCodec;
diff --git a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
index 6b5bdb055..78fd453ab 100644
--- a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
+++ b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
@@ -7,7 +7,6 @@
 import java.util.List;
 import java.util.Map;
 
-import com.github.dockerjava.api.model.AuthConfigurations;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
@@ -15,6 +14,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.AuthConfigurations;
 
 public class AuthConfigFile {
     private static final ObjectMapper MAPPER = new ObjectMapper();
diff --git a/src/main/java/com/github/dockerjava/core/CertificateUtils.java b/src/main/java/com/github/dockerjava/core/CertificateUtils.java
index 5abb82bd7..7490ba54e 100644
--- a/src/main/java/com/github/dockerjava/core/CertificateUtils.java
+++ b/src/main/java/com/github/dockerjava/core/CertificateUtils.java
@@ -4,7 +4,6 @@
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-
 import java.security.KeyFactory;
 import java.security.KeyPair;
 import java.security.KeyStore;
diff --git a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
index b40294487..6a1a54809 100644
--- a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
+++ b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
@@ -1,13 +1,15 @@
 package com.github.dockerjava.core;
 
+import static com.github.dockerjava.core.FilePathUtil.relativize;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 import org.apache.commons.io.FileUtils;
 
-import java.io.*;
-
-import static com.github.dockerjava.core.FilePathUtil.relativize;
-
 public class CompressArchiveUtil {
 
     public static File archiveTARFiles(File base, Iterable<File> files, String archiveNameWithOutExtension)
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
index 7524679bb..51f8c4dc7 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
@@ -1,23 +1,24 @@
 package com.github.dockerjava.core;
 
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
 import com.github.dockerjava.core.DockerClientConfig.DockerClientConfigBuilder;
 
-import java.util.Iterator;
-import java.util.ServiceLoader;
-
 public class DockerClientBuilder {
 
     private static Class<? extends DockerCmdExecFactory> factoryClass;
+
     private static ServiceLoader<DockerCmdExecFactory> serviceLoader = ServiceLoader.load(DockerCmdExecFactory.class);
 
     static {
         serviceLoader.reload();
         Iterator<DockerCmdExecFactory> iterator = serviceLoader.iterator();
         if (!iterator.hasNext()) {
-           throw new RuntimeException("Fatal: Can't find any implementation of '"
-                 + DockerCmdExecFactory.class.getName() + "' in the current classpath.");
+            throw new RuntimeException("Fatal: Can't find any implementation of '"
+                    + DockerCmdExecFactory.class.getName() + "' in the current classpath.");
         }
 
         factoryClass = iterator.next().getClass();
@@ -48,14 +49,11 @@ public static DockerClientBuilder getInstance(String serverUrl) {
     }
 
     public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() {
-       try
-       {
-          return factoryClass.newInstance();
-       }
-       catch (InstantiationException | IllegalAccessException e)
-       {
-          throw new RuntimeException("Fatal: Can't create new instance of '" + factoryClass.getName() + "'");
-       }
+        try {
+            return factoryClass.newInstance();
+        } catch (InstantiationException | IllegalAccessException e) {
+            throw new RuntimeException("Fatal: Can't create new instance of '" + factoryClass.getName() + "'");
+        }
     }
 
     public DockerClientBuilder withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) {
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 947d42bf8..206ce26fd 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -8,7 +8,6 @@
 import java.io.InputStream;
 
 import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd;
 import com.github.dockerjava.api.command.BuildImageCmd;
@@ -48,13 +47,7 @@
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
-import com.github.dockerjava.api.model.Event;
-import com.github.dockerjava.api.model.BuildResponseItem;
-import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.Identifier;
-import com.github.dockerjava.api.model.PullResponseItem;
-import com.github.dockerjava.api.model.PushResponseItem;
-import com.github.dockerjava.api.model.Statistics;
 import com.github.dockerjava.core.command.AttachContainerCmdImpl;
 import com.github.dockerjava.core.command.AuthCmdImpl;
 import com.github.dockerjava.core.command.BuildImageCmdImpl;
diff --git a/src/main/java/com/github/dockerjava/core/FilePathUtil.java b/src/main/java/com/github/dockerjava/core/FilePathUtil.java
index 317a55ed6..b02821bde 100644
--- a/src/main/java/com/github/dockerjava/core/FilePathUtil.java
+++ b/src/main/java/com/github/dockerjava/core/FilePathUtil.java
@@ -1,6 +1,8 @@
 package com.github.dockerjava.core;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+
 import com.github.dockerjava.api.DockerClientException;
 
 public class FilePathUtil {
diff --git a/src/main/java/com/github/dockerjava/core/SSLConfig.java b/src/main/java/com/github/dockerjava/core/SSLConfig.java
index 247e21b1f..6c7e5c353 100644
--- a/src/main/java/com/github/dockerjava/core/SSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/SSLConfig.java
@@ -1,6 +1,9 @@
 package com.github.dockerjava.core;
 
-import java.security.*;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
 
 import javax.net.ssl.SSLContext;
 
diff --git a/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
index 8c8cb8d3d..4e1ce6765 100644
--- a/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
+++ b/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
@@ -7,7 +7,6 @@
 import java.io.InputStream;
 
 import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonFactory.Feature;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index a4e08e5a9..b77a8c152 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -16,7 +16,8 @@
  * @author marcus
  *
  */
-public abstract class ResultCallbackTemplate<RC_T extends ResultCallback<A_RES_T>, A_RES_T> implements ResultCallback<A_RES_T> {
+public abstract class ResultCallbackTemplate<RC_T extends ResultCallback<A_RES_T>, A_RES_T> implements
+        ResultCallback<A_RES_T> {
 
     private final CountDownLatch finished = new CountDownLatch(1);
 
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
index 43293f3fe..522511e8f 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
@@ -33,6 +33,4 @@ public <T extends ResultCallback<A_RES_T>> T exec(T resultCallback) {
     public void close() throws IOException {
     }
 
-
-
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
index 341b6a886..626affae2 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
@@ -2,11 +2,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.IOException;
-
-import org.apache.commons.codec.binary.Base64;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.command.DockerCmd;
 import com.github.dockerjava.api.command.DockerCmdSyncExec;
 import com.github.dockerjava.api.model.AuthConfig;
@@ -39,6 +34,4 @@ private T withOptionalAuthConfig(AuthConfig authConfig) {
         return (T) this;
     }
 
-
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
index 222ea9b3b..d25517df1 100644
--- a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
@@ -2,8 +2,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.github.dockerjava.api.NotFoundException;
-import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.model.Frame;
 
@@ -22,7 +20,8 @@
  * @param timestamps
  *            - true or false, if true, print timestamps for every log line. Defaults to false.
  */
-public class AttachContainerCmdImpl extends AbstrAsyncDockerCmd<AttachContainerCmd, Frame> implements AttachContainerCmd {
+public class AttachContainerCmdImpl extends AbstrAsyncDockerCmd<AttachContainerCmd, Frame> implements
+        AttachContainerCmd {
 
     private String containerId;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 32835b301..328513211 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -24,8 +24,8 @@
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Volume;
-import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.api.model.Volumes;
+import com.github.dockerjava.api.model.VolumesFrom;
 
 /**
  *
diff --git a/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
index f371c5b7c..373e5e08c 100644
--- a/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.core.command;
 
-import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.model.Event;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
index ade3923f3..8ee8f79c3 100644
--- a/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.core.command;
 
 import com.github.dockerjava.api.NotFoundException;
-import com.github.dockerjava.api.command.DockerCmdSyncExec;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectExecResponse;
 import com.google.common.base.Preconditions;
diff --git a/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
index b957a3bd6..5759cfc53 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.*;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.List;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
index 490b6b1a1..a9d923635 100644
--- a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -2,11 +2,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.InputStream;
-import java.util.concurrent.Future;
-
-import com.github.dockerjava.api.NotFoundException;
-import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.model.Frame;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
index 2fe46f12c..2416401b0 100644
--- a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
@@ -2,7 +2,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PullResponseItem;
diff --git a/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
index 81f1262f1..709113a09 100644
--- a/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
@@ -76,5 +76,4 @@ public String toString() {
         return new StringBuilder("push ").append(name).toString();
     }
 
-
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
index ab87c2ea8..676b151af 100644
--- a/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
@@ -1,11 +1,11 @@
 package com.github.dockerjava.core.command;
 
-import com.github.dockerjava.api.NotFoundException;
-import com.github.dockerjava.api.command.SaveImageCmd;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.InputStream;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.command.SaveImageCmd;
 
 public class SaveImageCmdImpl extends AbstrDockerCmd<SaveImageCmd, InputStream> implements SaveImageCmd {
     private String name;
diff --git a/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
index 205f619b7..9f0e3a00a 100644
--- a/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
@@ -2,7 +2,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.StatsCmd;
 import com.github.dockerjava.api.model.Statistics;
 
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 5997bbefa..8c26c4932 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -1,16 +1,5 @@
 package com.github.dockerjava.core.dockerfile;
 
-import com.github.dockerjava.api.DockerClientException;
-import com.github.dockerjava.core.CompressArchiveUtil;
-import com.github.dockerjava.core.FilePathUtil;
-import com.github.dockerjava.core.GoLangFileMatch;
-import com.github.dockerjava.core.GoLangFileMatchException;
-import com.github.dockerjava.core.GoLangMatchFileFilter;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.io.filefilter.TrueFileFilter;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -21,6 +10,16 @@
 import java.util.Map;
 import java.util.UUID;
 
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.filefilter.TrueFileFilter;
+
+import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.core.CompressArchiveUtil;
+import com.github.dockerjava.core.FilePathUtil;
+import com.github.dockerjava.core.GoLangFileMatch;
+import com.github.dockerjava.core.GoLangFileMatchException;
+import com.github.dockerjava.core.GoLangMatchFileFilter;
 import com.google.common.base.Function;
 import com.google.common.base.Objects;
 import com.google.common.base.Optional;
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java b/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
index 7b6581e42..a3ceab2b9 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
@@ -1,13 +1,12 @@
 package com.github.dockerjava.core.dockerfile;
 
-import com.github.dockerjava.api.DockerClientException;
-
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.github.dockerjava.api.DockerClientException;
 import com.google.common.base.Objects;
 import com.google.common.base.Optional;
 
diff --git a/src/main/java/com/github/dockerjava/core/util/JsonClientFilter.java b/src/main/java/com/github/dockerjava/core/util/JsonClientFilter.java
index 19befc4b2..fe8207cd9 100644
--- a/src/main/java/com/github/dockerjava/core/util/JsonClientFilter.java
+++ b/src/main/java/com/github/dockerjava/core/util/JsonClientFilter.java
@@ -1,10 +1,11 @@
 package com.github.dockerjava.core.util;
 
+import java.io.IOException;
+
 import javax.ws.rs.client.ClientRequestContext;
 import javax.ws.rs.client.ClientResponseContext;
 import javax.ws.rs.client.ClientResponseFilter;
 import javax.ws.rs.core.MediaType;
-import java.io.IOException;
 
 /**
  *
diff --git a/src/main/java/com/github/dockerjava/core/util/LoggingFilter.java b/src/main/java/com/github/dockerjava/core/util/LoggingFilter.java
index f7314109b..96b028b5f 100644
--- a/src/main/java/com/github/dockerjava/core/util/LoggingFilter.java
+++ b/src/main/java/com/github/dockerjava/core/util/LoggingFilter.java
@@ -53,9 +53,7 @@
 import java.util.TreeSet;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import javax.annotation.Priority;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.client.ClientRequestContext;
 import javax.ws.rs.client.ClientRequestFilter;
@@ -69,7 +67,9 @@
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.ext.WriterInterceptor;
 import javax.ws.rs.ext.WriterInterceptorContext;
-import javax.annotation.Priority;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Universal logging filter.
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
index beca08c13..cd23dd8b1 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
@@ -41,5 +41,4 @@ protected String registryConfigs(AuthConfigurations authConfigs) {
         }
     }
 
-
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
index 36b904dd2..67da89284 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
@@ -35,7 +35,6 @@ protected AbstractCallbackNotifier<Frame> callbackNotifier(AttachContainerCmd co
 
         LOGGER.trace("POST: {}", webTarget);
 
-        return new POSTCallbackNotifier<Frame>(new FrameStreamProcessor(),
-                resultCallback, webTarget.request(), null);
+        return new POSTCallbackNotifier<Frame>(new FrameStreamProcessor(), resultCallback, webTarget.request(), null);
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
index 9dfe9d118..cd346fc78 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
@@ -1,16 +1,17 @@
 package com.github.dockerjava.jaxrs;
 
-import com.github.dockerjava.api.UnauthorizedException;
-import com.github.dockerjava.api.command.AuthCmd;
-import com.github.dockerjava.api.model.AuthResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static javax.ws.rs.client.Entity.entity;
 
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import static javax.ws.rs.client.Entity.entity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.UnauthorizedException;
+import com.github.dockerjava.api.command.AuthCmd;
+import com.github.dockerjava.api.model.AuthResponse;
 
 public class AuthCmdExec extends AbstrSyncDockerCmdExec<AuthCmd, AuthResponse> implements AuthCmd.Exec {
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index 00d907a43..7a259b5a1 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -67,9 +67,8 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
 
         LOGGER.trace("POST: {}", webTarget);
 
-        return new POSTCallbackNotifier<BuildResponseItem>(
-                new JsonStreamProcessor<BuildResponseItem>(BuildResponseItem.class), resultCallback,
-                resourceWithOptionalAuthConfig(command, webTarget.request()).accept(MediaType.TEXT_PLAIN), entity(
-                        command.getTarInputStream(), "application/tar"));
+        return new POSTCallbackNotifier<BuildResponseItem>(new JsonStreamProcessor<BuildResponseItem>(
+                BuildResponseItem.class), resultCallback, resourceWithOptionalAuthConfig(command, webTarget.request())
+                .accept(MediaType.TEXT_PLAIN), entity(command.getTarInputStream(), "application/tar"));
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
index ec6d0b765..cb31cb2f5 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
@@ -14,8 +14,8 @@
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
 import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
 
-public class CopyFileFromContainerCmdExec extends AbstrSyncDockerCmdExec<CopyFileFromContainerCmd, InputStream> implements
-        CopyFileFromContainerCmd.Exec {
+public class CopyFileFromContainerCmdExec extends AbstrSyncDockerCmdExec<CopyFileFromContainerCmd, InputStream>
+        implements CopyFileFromContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CopyFileFromContainerCmdExec.class);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
index 265057c00..ef42c43ff 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
@@ -11,8 +11,8 @@
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 
-public class CreateContainerCmdExec extends AbstrSyncDockerCmdExec<CreateContainerCmd, CreateContainerResponse> implements
-        CreateContainerCmd.Exec {
+public class CreateContainerCmdExec extends AbstrSyncDockerCmdExec<CreateContainerCmd, CreateContainerResponse>
+        implements CreateContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CreateContainerCmdExec.class);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index 77712fdeb..f1f196a03 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -6,11 +6,6 @@
 import java.net.URI;
 import java.util.concurrent.TimeUnit;
 
-import com.github.dockerjava.api.command.*;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import javax.net.ssl.SSLContext;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
@@ -24,21 +19,58 @@
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.glassfish.jersey.CommonProperties;
 import org.glassfish.jersey.apache.connector.ApacheClientProperties;
-
-//import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
-// see https://github.com/docker-java/docker-java/issues/196
-import com.github.dockerjava.jaxrs.connector.ApacheConnectorProvider;
-
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.command.AttachContainerCmd;
+import com.github.dockerjava.api.command.AuthCmd;
+import com.github.dockerjava.api.command.BuildImageCmd;
+import com.github.dockerjava.api.command.CommitCmd;
+import com.github.dockerjava.api.command.ContainerDiffCmd;
+import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.api.command.CreateContainerCmd;
+import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.DockerCmdExecFactory;
+import com.github.dockerjava.api.command.EventsCmd;
+import com.github.dockerjava.api.command.ExecCreateCmd;
+import com.github.dockerjava.api.command.ExecStartCmd;
+import com.github.dockerjava.api.command.InfoCmd;
+import com.github.dockerjava.api.command.InspectContainerCmd;
+import com.github.dockerjava.api.command.InspectExecCmd;
+import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.KillContainerCmd;
+import com.github.dockerjava.api.command.ListContainersCmd;
+import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.LogContainerCmd;
+import com.github.dockerjava.api.command.PauseContainerCmd;
+import com.github.dockerjava.api.command.PingCmd;
+import com.github.dockerjava.api.command.PullImageCmd;
+import com.github.dockerjava.api.command.PushImageCmd;
+import com.github.dockerjava.api.command.RemoveContainerCmd;
+import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.api.command.RestartContainerCmd;
+import com.github.dockerjava.api.command.SaveImageCmd;
+import com.github.dockerjava.api.command.SearchImagesCmd;
+import com.github.dockerjava.api.command.StartContainerCmd;
+import com.github.dockerjava.api.command.StatsCmd;
+import com.github.dockerjava.api.command.StopContainerCmd;
+import com.github.dockerjava.api.command.TagImageCmd;
+import com.github.dockerjava.api.command.TopContainerCmd;
+import com.github.dockerjava.api.command.UnpauseContainerCmd;
+import com.github.dockerjava.api.command.VersionCmd;
+import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.util.FollowRedirectsFilter;
 import com.github.dockerjava.core.util.JsonClientFilter;
 import com.github.dockerjava.core.util.ResponseStatusExceptionFilter;
 import com.github.dockerjava.core.util.SelectiveLoggingFilter;
+//import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
+// see https://github.com/docker-java/docker-java/issues/196
+import com.github.dockerjava.jaxrs.connector.ApacheConnectorProvider;
 
 public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
index 1bd38048a..1b6a89430 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -27,7 +27,7 @@ protected AbstractCallbackNotifier<Event> callbackNotifier(EventsCmd command, Re
 
         LOGGER.trace("GET: {}", webTarget);
 
-        return new GETCallbackNotifier<Event>(new JsonStreamProcessor<Event>(
-                Event.class), resultCallback, webTarget.request());
+        return new GETCallbackNotifier<Event>(new JsonStreamProcessor<Event>(Event.class), resultCallback,
+                webTarget.request());
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
index 573d89470..17b1d2c64 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
@@ -1,14 +1,15 @@
 package com.github.dockerjava.jaxrs;
 
-import com.github.dockerjava.api.command.ExecCreateCmd;
-import com.github.dockerjava.api.command.ExecCreateCmdResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static javax.ws.rs.client.Entity.entity;
 
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
-import static javax.ws.rs.client.Entity.entity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.command.ExecCreateCmd;
+import com.github.dockerjava.api.command.ExecCreateCmdResponse;
 
 public class ExecCreateCmdExec extends AbstrSyncDockerCmdExec<ExecCreateCmd, ExecCreateCmdResponse> implements
         ExecCreateCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
index 58c19e55c..fcae733e6 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
@@ -1,18 +1,18 @@
 package com.github.dockerjava.jaxrs;
 
-import com.github.dockerjava.api.command.ExecStartCmd;
-import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
+import static javax.ws.rs.client.Entity.entity;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.io.InputStream;
 
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import java.io.InputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import static javax.ws.rs.client.Entity.entity;
+import com.github.dockerjava.api.command.ExecStartCmd;
+import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
 
 public class ExecStartCmdExec extends AbstrSyncDockerCmdExec<ExecStartCmd, InputStream> implements ExecStartCmd.Exec {
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
index 0a99acc08..d8310bd3a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
@@ -1,12 +1,13 @@
 package com.github.dockerjava.jaxrs;
 
-import com.github.dockerjava.api.command.InspectExecCmd;
-import com.github.dockerjava.api.command.InspectExecResponse;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
+import com.github.dockerjava.api.command.InspectExecCmd;
+import com.github.dockerjava.api.command.InspectExecResponse;
 
 public class InspectExecCmdExec extends AbstrSyncDockerCmdExec<InspectExecCmd, InspectExecResponse> implements
         InspectExecCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
index 9b132dee5..f4d2680b9 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
@@ -8,7 +8,8 @@
 
 import com.github.dockerjava.api.command.KillContainerCmd;
 
-public class KillContainerCmdExec extends AbstrSyncDockerCmdExec<KillContainerCmd, Void> implements KillContainerCmd.Exec {
+public class KillContainerCmdExec extends AbstrSyncDockerCmdExec<KillContainerCmd, Void> implements
+        KillContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(KillContainerCmdExec.class);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
index ddd5d3211..e1e74eec9 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.jaxrs;
 
-import static com.google.common.net.UrlEscapers.*;
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
 
 import java.util.List;
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
index df88cf1d9..fa8409cb8 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.jaxrs;
 
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
 import java.util.List;
 
 import javax.ws.rs.client.WebTarget;
@@ -12,8 +14,6 @@
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.model.Image;
 
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
 public class ListImagesCmdExec extends AbstrSyncDockerCmdExec<ListImagesCmd, List<Image>> implements ListImagesCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ListImagesCmdExec.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
index d881ce1c2..ca6ad3537 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
@@ -8,7 +8,8 @@
 
 import com.github.dockerjava.api.command.StopContainerCmd;
 
-public class StopContainerCmdExec extends AbstrSyncDockerCmdExec<StopContainerCmd, Void> implements StopContainerCmd.Exec {
+public class StopContainerCmdExec extends AbstrSyncDockerCmdExec<StopContainerCmd, Void> implements
+        StopContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(StopContainerCmdExec.class);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
index 092e9548d..32c9cbc63 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
@@ -4,7 +4,6 @@
 import javax.ws.rs.core.MediaType;
 
 import org.apache.commons.lang.StringUtils;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java b/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
index 3fea92126..870e2fd04 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
@@ -21,13 +21,6 @@
  * under the License.
  */
 
-import org.apache.http.HttpHost;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.conn.ConnectTimeoutException;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.protocol.HttpContext;
-import org.newsclub.net.unix.AFUNIXSocketAddress;
-
 import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -35,6 +28,13 @@
 import java.net.SocketTimeoutException;
 import java.net.URI;
 
+import org.apache.http.HttpHost;
+import org.apache.http.annotation.Immutable;
+import org.apache.http.conn.ConnectTimeoutException;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.protocol.HttpContext;
+import org.newsclub.net.unix.AFUNIXSocketAddress;
+
 /**
  * Provides a ConnectionSocketFactory for connecting Apache HTTP clients to Unix sockets.
  */
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
index d11cdd7a0..f989133f7 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
@@ -57,28 +57,16 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
 import javax.ws.rs.ProcessingException;
 import javax.ws.rs.core.Configuration;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
 
-import org.glassfish.jersey.SslConfigurator;
-import org.glassfish.jersey.apache.connector.ApacheClientProperties;
-import org.glassfish.jersey.apache.connector.LocalizationMessages;
-import org.glassfish.jersey.client.ClientProperties;
-import org.glassfish.jersey.client.ClientRequest;
-import org.glassfish.jersey.client.ClientResponse;
-import org.glassfish.jersey.client.RequestEntityProcessing;
-import org.glassfish.jersey.client.spi.AsyncConnectorCallback;
-import org.glassfish.jersey.client.spi.Connector;
-import org.glassfish.jersey.internal.util.PropertiesHelper;
-import org.glassfish.jersey.message.internal.HeaderUtils;
-import org.glassfish.jersey.message.internal.OutboundMessageContext;
-import org.glassfish.jersey.message.internal.ReaderWriter;
-import org.glassfish.jersey.message.internal.Statuses;
+import jersey.repackaged.com.google.common.util.concurrent.MoreExecutors;
+
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
@@ -122,8 +110,20 @@
 import org.apache.http.io.SessionOutputBuffer;
 import org.apache.http.util.TextUtils;
 import org.apache.http.util.VersionInfo;
-
-import jersey.repackaged.com.google.common.util.concurrent.MoreExecutors;
+import org.glassfish.jersey.SslConfigurator;
+import org.glassfish.jersey.apache.connector.ApacheClientProperties;
+import org.glassfish.jersey.apache.connector.LocalizationMessages;
+import org.glassfish.jersey.client.ClientProperties;
+import org.glassfish.jersey.client.ClientRequest;
+import org.glassfish.jersey.client.ClientResponse;
+import org.glassfish.jersey.client.RequestEntityProcessing;
+import org.glassfish.jersey.client.spi.AsyncConnectorCallback;
+import org.glassfish.jersey.client.spi.Connector;
+import org.glassfish.jersey.internal.util.PropertiesHelper;
+import org.glassfish.jersey.message.internal.HeaderUtils;
+import org.glassfish.jersey.message.internal.OutboundMessageContext;
+import org.glassfish.jersey.message.internal.ReaderWriter;
+import org.glassfish.jersey.message.internal.Statuses;
 
 /**
  * A {@link Connector} that utilizes the Apache HTTP Client to send and receive HTTP request and responses.
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java
index 90600b608..00deefe85 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java
@@ -43,11 +43,12 @@
 import javax.ws.rs.core.Configurable;
 import javax.ws.rs.core.Configuration;
 
+import org.apache.http.client.HttpClient;
+import org.glassfish.jersey.apache.connector.ApacheClientProperties;
 import org.glassfish.jersey.apache.connector.LocalizationMessages;
 import org.glassfish.jersey.client.Initializable;
 import org.glassfish.jersey.client.spi.Connector;
 import org.glassfish.jersey.client.spi.ConnectorProvider;
-import org.apache.http.client.HttpClient;
 
 /**
  * Connector provider for Jersey {@link Connector connectors} that utilize Apache HTTP Client to send and receive HTTP
diff --git a/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java b/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
index 8eed37b62..104727896 100644
--- a/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
+++ b/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
@@ -15,14 +15,7 @@
  */
 package com.github.dockerjava.api.command;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.test.serdes.AbstractJSONResourceRef;
 import com.github.dockerjava.test.serdes.JSONResourceRef;
-import java.io.IOException;
-import java.io.InputStream;
-import org.apache.commons.io.IOUtils;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
 
 /**
  * References test resources and provides basic tests functionality.
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
index bbe0a06f5..2345b8825 100644
--- a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
+++ b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
@@ -16,8 +16,12 @@
 package com.github.dockerjava.api.command;
 
 import static com.github.dockerjava.test.serdes.JSONTestHelper.testRoundTrip;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
 import java.io.IOException;
-import static org.testng.Assert.*;
+
 import org.testng.annotations.Test;
 
 /**
diff --git a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
index 1ed618ed7..8aa132935 100644
--- a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
@@ -1,10 +1,10 @@
 package com.github.dockerjava.api.model;
 
+import static org.testng.Assert.assertEquals;
+
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import static org.testng.Assert.assertEquals;
-
 public class AuthConfigTest {
 
     private AuthConfig authConfig;
diff --git a/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java b/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java
index 25da40d74..e3e8ce17a 100644
--- a/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.api.model;
 
-import static com.github.dockerjava.api.model.InternetProtocol.*;
+import static com.github.dockerjava.api.model.InternetProtocol.TCP;
 import static org.testng.Assert.assertEquals;
 
 import org.testng.annotations.Test;
diff --git a/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java b/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
index 7b22bd039..da127b122 100644
--- a/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
 
 import java.util.Map;
 
diff --git a/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java b/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
index 41abaf99d..7a22d6587 100644
--- a/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
@@ -1,13 +1,13 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.testng.annotations.Test;
+import static org.testng.Assert.assertEquals;
 
 import java.io.IOException;
 
-import static org.testng.Assert.*;
+import org.testng.annotations.Test;
+
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class VolumeBindsTest {
     @Test
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index d492c415b..cc07540f0 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -4,6 +4,23 @@
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsString;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.lang.reflect.Method;
+import java.net.DatagramSocket;
+import java.net.ServerSocket;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.LineIterator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.ITestResult;
+
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.async.ResultCallback;
@@ -19,24 +36,6 @@
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
 import com.google.common.base.Joiner;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.LineIterator;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.ITestResult;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.lang.reflect.Method;
-import java.net.DatagramSocket;
-import java.net.ServerSocket;
-import java.util.ArrayList;
-import java.util.List;
-
 public abstract class AbstractDockerClientTest extends Assert {
 
     public static final Logger LOG = LoggerFactory.getLogger(AbstractDockerClientTest.class);
@@ -208,7 +207,8 @@ protected String containerLog(String containerId) throws Exception {
         return collectFramesCallback.toString();
     }
 
-    public static class CollectStreamItemCallback<RC_T extends ResultCallback<A_RES_T>, A_RES_T> extends ResultCallbackTemplate<RC_T, A_RES_T> {
+    public static class CollectStreamItemCallback<RC_T extends ResultCallback<A_RES_T>, A_RES_T> extends
+            ResultCallbackTemplate<RC_T, A_RES_T> {
         public final List<A_RES_T> items = new ArrayList<A_RES_T>();
 
         protected final StringBuffer log = new StringBuffer();
diff --git a/src/test/java/com/github/dockerjava/client/DockerClientTest.java b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
index 120f4e823..0141e01ac 100644
--- a/src/test/java/com/github/dockerjava/client/DockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
@@ -5,9 +5,6 @@
 
 import java.lang.reflect.Method;
 
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.ITestResult;
@@ -17,6 +14,9 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+
 /**
  * Unit test for DockerClient.
  *
diff --git a/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java b/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
index 8c93df20a..827f8d3be 100644
--- a/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
+++ b/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
@@ -1,20 +1,20 @@
 package com.github.dockerjava.core;
 
-import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
-import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.testng.annotations.Test;
+import static java.util.Arrays.asList;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-import static java.util.Arrays.asList;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.testng.annotations.Test;
 
 public class CompressArchiveUtilTest {
 
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java b/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
index 9b23e3b62..45623c5b5 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
@@ -1,93 +1,82 @@
 package com.github.dockerjava.core;
 
-import com.github.dockerjava.api.command.DockerCmdExecFactory;
-import org.testng.annotations.Test;
-
-import java.util.*;
-
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 
-public class DockerClientBuilderTest
-{
-   // Amount of instances created in test
-   private static final int AMOUNT = 100;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
-   @Test
-   public void testConcurrentClientBuilding() throws Exception
-   {
-      // we use it to check instance uniqueness
-      final Set<DockerCmdExecFactory> instances = Collections.synchronizedSet(new HashSet<DockerCmdExecFactory>());
+import org.testng.annotations.Test;
 
-      Runnable runnable = new Runnable()
-      {
-         @Override
-         public void run()
-         {
-            DockerCmdExecFactory factory = DockerClientBuilder.getDefaultDockerCmdExecFactory();
-            // factory created
-            assertNotNull(factory);
-            // and is unique
-            assertFalse(instances.contains(factory));
-            instances.add(factory);
-         }
-      };
+import com.github.dockerjava.api.command.DockerCmdExecFactory;
+
+public class DockerClientBuilderTest {
+    // Amount of instances created in test
+    private static final int AMOUNT = 100;
 
-      parallel(AMOUNT, runnable);
-      // set contains all required unique instances
-      assertEquals(instances.size(), AMOUNT);
-   }
+    @Test
+    public void testConcurrentClientBuilding() throws Exception {
+        // we use it to check instance uniqueness
+        final Set<DockerCmdExecFactory> instances = Collections.synchronizedSet(new HashSet<DockerCmdExecFactory>());
 
-   public static void parallel(int threads, final Runnable task) throws Exception
-   {
-      final ExceptionListener exceptionListener = new ExceptionListener();
-      Runnable runnable = new Runnable()
-      {
-         @Override
-         public void run()
-         {
-            try
-            {
-               task.run();
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {
+                DockerCmdExecFactory factory = DockerClientBuilder.getDefaultDockerCmdExecFactory();
+                // factory created
+                assertNotNull(factory);
+                // and is unique
+                assertFalse(instances.contains(factory));
+                instances.add(factory);
             }
-            catch (Throwable e)
-            {
-               exceptionListener.onException(e);
+        };
+
+        parallel(AMOUNT, runnable);
+        // set contains all required unique instances
+        assertEquals(instances.size(), AMOUNT);
+    }
+
+    public static void parallel(int threads, final Runnable task) throws Exception {
+        final ExceptionListener exceptionListener = new ExceptionListener();
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    task.run();
+                } catch (Throwable e) {
+                    exceptionListener.onException(e);
+                }
             }
-         }
-      };
+        };
 
-      List<Thread> threadList = new ArrayList<>(threads);
-      for (int i = 0; i < threads; i++)
-      {
-         Thread thread = new Thread(runnable);
-         thread.start();
-         threadList.add(thread);
-      }
-      for (Thread thread : threadList)
-      {
-         thread.join();
-      }
-      Throwable exception = exceptionListener.getException();
-      if (exception != null)
-      {
-         throw new RuntimeException(exception);
-      }
-   }
+        List<Thread> threadList = new ArrayList<>(threads);
+        for (int i = 0; i < threads; i++) {
+            Thread thread = new Thread(runnable);
+            thread.start();
+            threadList.add(thread);
+        }
+        for (Thread thread : threadList) {
+            thread.join();
+        }
+        Throwable exception = exceptionListener.getException();
+        if (exception != null) {
+            throw new RuntimeException(exception);
+        }
+    }
 
-   private static class ExceptionListener
-   {
-      private Throwable exception;
+    private static class ExceptionListener {
+        private Throwable exception;
 
-      private synchronized void onException(Throwable e)
-      {
-         exception = e;
-      }
+        private synchronized void onException(Throwable e) {
+            exception = e;
+        }
 
-      private synchronized Throwable getException()
-      {
-         return exception;
-      }
-   }
+        private synchronized Throwable getException() {
+            return exception;
+        }
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
index 634d0e9a5..d520e1d65 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.core;
 
-import com.github.dockerjava.api.model.AuthConfig;
-import org.testng.annotations.Test;
+import static org.testng.Assert.assertEquals;
 
 import java.net.URI;
 import java.util.Collections;
@@ -9,7 +8,9 @@
 import java.util.Map;
 import java.util.Properties;
 
-import static org.testng.Assert.assertEquals;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.model.AuthConfig;
 
 public class DockerClientConfigTest {
 
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
index eac3bb725..a2a77734f 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
@@ -1,10 +1,10 @@
 package com.github.dockerjava.core;
 
-import org.testng.annotations.Test;
-
 import static org.testng.Assert.assertEquals;
 import static org.testng.AssertJUnit.fail;
 
+import org.testng.annotations.Test;
+
 public class DockerClientImplTest {
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
index cb9fb794f..04e344056 100644
--- a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
@@ -65,8 +65,8 @@ public void onNext(Frame frame) {
             };
         };
 
-        dockerClient.attachContainerCmd(container.getId()).withStdErr().withStdOut()
-                .withFollowStream().withLogs().exec(collectFramesCallback);
+        dockerClient.attachContainerCmd(container.getId()).withStdErr().withStdOut().withFollowStream().withLogs()
+                .exec(collectFramesCallback);
 
         collectFramesCallback.awaitCompletion(30, TimeUnit.SECONDS);
 
@@ -98,8 +98,8 @@ public void onNext(Frame frame) {
             };
         };
 
-        dockerClient.attachContainerCmd(container.getId()).withStdErr().withStdOut()
-                .withFollowStream().exec(collectFramesCallback);
+        dockerClient.attachContainerCmd(container.getId()).withStdErr().withStdOut().withFollowStream()
+                .exec(collectFramesCallback);
 
         collectFramesCallback.awaitCompletion(15, TimeUnit.SECONDS);
 
@@ -107,7 +107,7 @@ public void onNext(Frame frame) {
 
         System.out.println("log: " + collectFramesCallback.toString());
 
-        //HexDump.dump(collectFramesCallback.toString().getBytes(), 0, System.out, 0);
+        // HexDump.dump(collectFramesCallback.toString().getBytes(), 0, System.out, 0);
 
         assertThat(collectFramesCallback.toString(), containsString("stdout\r\nstderr"));
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 51dfd37a0..597a90877 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -85,8 +85,8 @@ public void testNonstandard2() throws Exception {
         File dockerFile = new File(Thread.currentThread().getContextClassLoader()
                 .getResource("nonstandard/subdirectory/Dockerfile-nonstandard").getFile());
 
-        dockerClient.buildImageCmd().withBaseDirectory(baseDir).withDockerfile(dockerFile)
-                .withNoCache().exec(new BuildLogCallback()).awaitImageId();
+        dockerClient.buildImageCmd().withBaseDirectory(baseDir).withDockerfile(dockerFile).withNoCache()
+                .exec(new BuildLogCallback()).awaitImageId();
     }
 
     @Test
@@ -148,7 +148,8 @@ private String dockerfileBuild(File baseDir) throws Exception {
 
     private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
 
-        BuildLogCallback resultCallback = new BuildLogCallback();;
+        BuildLogCallback resultCallback = new BuildLogCallback();
+        ;
 
         buildImageCmd.withNoCache().exec(resultCallback);
 
@@ -168,7 +169,7 @@ private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
     }
 
     @Test(expectedExceptions = { DockerClientException.class })
-    public void testDockerfileIgnored() throws Exception{
+    public void testDockerfileIgnored() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerfileIgnored")
                 .getFile());
 
@@ -180,7 +181,7 @@ public void testInvalidDockerIgnorePattern() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader()
                 .getResource("testInvalidDockerignorePattern").getFile());
 
-        dockerClient.buildImageCmd(baseDir).withNoCache().exec( new BuildLogCallback()).awaitImageId();
+        dockerClient.buildImageCmd(baseDir).withNoCache().exec(new BuildLogCallback()).awaitImageId();
     }
 
     @Test(groups = "ignoreInCircleCi")
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
index 4f53bb774..b00034ad0 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
@@ -1,17 +1,22 @@
 package com.github.dockerjava.core.command;
 
-import com.github.dockerjava.api.NotFoundException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-import org.testng.ITestResult;
-import org.testng.annotations.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.not;
 
 import java.io.InputStream;
 import java.lang.reflect.Method;
 
-import static org.hamcrest.Matchers.*;
-import static org.hamcrest.MatcherAssert.assertThat;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.client.AbstractDockerClientTest;
 
 @Test(groups = "integration")
 public class CopyFileFromContainerCmdImplTest extends AbstractDockerClientTest {
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index d35efb636..00322bffa 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -1,14 +1,18 @@
 package com.github.dockerjava.core.command;
 
-import com.github.dockerjava.api.ConflictException;
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.*;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-import org.testng.ITestResult;
-import org.testng.annotations.*;
+import static com.github.dockerjava.api.model.Capability.MKNOD;
+import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItemInArray;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.startsWith;
 
 import java.lang.reflect.Method;
 import java.security.SecureRandom;
@@ -17,10 +21,30 @@
 import java.util.Map;
 import java.util.UUID;
 
-import static com.github.dockerjava.api.model.Capability.MKNOD;
-import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.ConflictException;
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.AccessMode;
+import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.Device;
+import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.HostConfig;
+import com.github.dockerjava.api.model.Link;
+import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.RestartPolicy;
+import com.github.dockerjava.api.model.Ulimit;
+import com.github.dockerjava.api.model.Volume;
+import com.github.dockerjava.api.model.VolumeRW;
+import com.github.dockerjava.api.model.VolumesFrom;
+import com.github.dockerjava.client.AbstractDockerClientTest;
 
 @Test(groups = "integration")
 public class CreateContainerCmdImplTest extends AbstractDockerClientTest {
diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
index 74ed3dae3..3d6df071d 100644
--- a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
+++ b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -1,22 +1,16 @@
 package com.github.dockerjava.core.command;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
+import java.io.File;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.InternalServerErrorException;
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.model.Image;
-import com.github.dockerjava.client.AbstractDockerClientTest;
 import com.github.dockerjava.client.AbstractDockerClientTest.BuildLogCallback;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
 /**
  * Start and stop a single container for testing.
  */
diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
index c3f2c0075..ad6b62aa4 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.core.command;
 
-import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
@@ -14,9 +13,7 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.model.Event;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index 5f647b1f5..6be9b2a49 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -55,10 +55,9 @@ private List<Frame> getLoggingFrames() throws Exception {
 
         AbstractDockerClientTest.CollectFramesCallback collectFramesCallback = new AbstractDockerClientTest.CollectFramesCallback();
 
-        dockerClient.logContainerCmd(dockerfileFixture.getContainerId()).withStdOut()
-                .withStdErr().withTailAll()
-                // we can't follow stream here as it blocks reading from resulting InputStream infinitely
-                // .withFollowStream()
+        dockerClient.logContainerCmd(dockerfileFixture.getContainerId()).withStdOut().withStdErr().withTailAll()
+        // we can't follow stream here as it blocks reading from resulting InputStream infinitely
+        // .withFollowStream()
                 .exec(collectFramesCallback);
 
         collectFramesCallback.awaitCompletion();
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
index 10210c281..1d21b8e95 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
@@ -1,16 +1,17 @@
 package com.github.dockerjava.core.command;
 
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.api.model.StreamType;
-import org.testng.annotations.Test;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.StreamType;
 
 public class FrameReaderTest {
     public static final int HEADER_SIZE = 8;
diff --git a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
index 1669728c9..033c7a709 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
@@ -23,7 +23,6 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Container;
diff --git a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
index d47dbb50a..221d36f36 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
@@ -1,12 +1,17 @@
 package com.github.dockerjava.core.command;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.emptyArray;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
 
 import java.lang.reflect.Method;
 import java.util.List;
 
-import com.github.dockerjava.api.command.CreateContainerResponse;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -15,6 +20,7 @@
 import org.testng.annotations.Test;
 
 import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.model.Image;
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.client.AbstractDockerClientTest;
diff --git a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
index cd6646e6b..299c694d4 100644
--- a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
@@ -18,7 +18,6 @@
 import org.testng.annotations.Test;
 
 import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.StatsCmd;
 import com.github.dockerjava.api.model.Statistics;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
@@ -63,7 +62,8 @@ public void testStatsStreaming() throws InterruptedException, IOException {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        StatsCallbackTest statsCallback = dockerClient.statsCmd().withContainerId(container.getId()).exec(new StatsCallbackTest(countDownLatch));
+        StatsCallbackTest statsCallback = dockerClient.statsCmd().withContainerId(container.getId())
+                .exec(new StatsCallbackTest(countDownLatch));
 
         countDownLatch.await(3, TimeUnit.SECONDS);
         boolean gotStats = statsCallback.gotStats();
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java
index 8b5e3c7e4..c69529d02 100644
--- a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java
+++ b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java
@@ -1,16 +1,16 @@
 package com.github.dockerjava.core.dockerfile;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
 import junit.framework.TestCase;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.Test;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
 public class DockerfileTest extends TestCase {
 
     private static final Logger log = LoggerFactory.getLogger(DockerfileTest.class);
diff --git a/src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java b/src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java
index 662b9b216..dfa856fca 100644
--- a/src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java
+++ b/src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java
@@ -15,7 +15,6 @@
  */
 package com.github.dockerjava.test.serdes;
 
-import java.io.IOException;
 
 /**
  * References JSON resources, which
diff --git a/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java b/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
index c83851370..602a6e76f 100644
--- a/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
+++ b/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
@@ -15,17 +15,17 @@
  */
 package com.github.dockerjava.test.serdes;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.command.CommandJSONSamples;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
 
 import java.io.IOException;
 import java.io.InputStream;
 
 import org.apache.commons.io.IOUtils;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.command.CommandJSONSamples;
 
 /**
  * Provides helper methods for serialization-deserialization tests

From da2b9d96c03c865cb933159b2911e7b2f603ccee Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Wed, 15 Jul 2015 12:06:09 +0200
Subject: [PATCH 0140/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b795807fe..34313506b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,10 @@ Change Log
 
 Latest SNAPSHOT
 ---
+
 * [#270](https://github.com/docker-java/docker-java/pull/270) Passing result callbacks for async commands via commands exec()
+* [#269](https://github.com/docker-java/docker-java/pull/269) Add filters option to events operation 
+* [#268](https://github.com/docker-java/docker-java/pull/268) Concurrent DockerCmdExecFactory.getDefaultDockerCmdExecFactory fails on reload
 * [#263](https://github.com/docker-java/docker-java/pull/263) Refactoring of streaming commands APIs (event, stats, log, attach)
 * [#262](https://github.com/docker-java/docker-java/pull/262) Accept filters in list containers 
 * [#260](https://github.com/docker-java/docker-java/pull/260) Add labels to create and inspect container

From ab9a242938eb1f582a580e89989038a99503ce48 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 16 Jul 2015 21:05:23 +0200
Subject: [PATCH 0141/1272] Remove connection pool timeout

---
 .../dockerjava/jaxrs/DockerCmdExecFactoryImpl.java       | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index f1f196a03..cb08f8d8b 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -4,14 +4,12 @@
 
 import java.io.IOException;
 import java.net.URI;
-import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.SSLContext;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.WebTarget;
 
-import org.apache.http.client.config.RequestConfig;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.conn.socket.PlainConnectionSocketFactory;
@@ -120,7 +118,7 @@ public void init(DockerClientConfig dockerClientConfig) {
         }
 
         PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(
-                originalUri, sslContext), null, null, null, 10, TimeUnit.SECONDS);
+                originalUri, sslContext));
 
         if (dockerClientConfig.getMaxTotalConnections() != null)
             connManager.setMaxTotal(dockerClientConfig.getMaxTotalConnections());
@@ -129,8 +127,9 @@ public void init(DockerClientConfig dockerClientConfig) {
 
         clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER, connManager);
 
-        clientConfig.property(ApacheClientProperties.REQUEST_CONFIG, RequestConfig.custom()
-                .setConnectionRequestTimeout(1000).build());
+        // Configure connection pool timeout
+        // clientConfig.property(ApacheClientProperties.REQUEST_CONFIG, RequestConfig.custom()
+        // .setConnectionRequestTimeout(1000).build());
 
         ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(clientConfig);
 

From edcc10efd4d5c04d12a5581dae8b9197bf3813bb Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 16 Jul 2015 22:32:03 +0200
Subject: [PATCH 0142/1272] remove withHostConfig() from create container
 command

---
 .../api/command/CreateContainerCmd.java       |  14 +-
 .../core/command/CreateContainerCmdImpl.java  | 172 +++++++++++-------
 .../command/CreateContainerCmdImplTest.java   |  14 +-
 3 files changed, 122 insertions(+), 78 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 371774414..ab4ac9fe8 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -8,12 +8,12 @@
 import com.github.dockerjava.api.model.Capability;
 import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
-import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Link;
 import com.github.dockerjava.api.model.LxcConf;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.RestartPolicy;
+import com.github.dockerjava.api.model.Ulimit;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
 
@@ -77,8 +77,6 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public String[] getExtraHosts();
 
-    public HostConfig getHostConfig();
-
     public String getHostName();
 
     public String getDomainName();
@@ -113,6 +111,8 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public String getWorkingDir();
 
+    public Ulimit[] getUlimits();
+
     public boolean isAttachStderr();
 
     public boolean isAttachStdin();
@@ -207,8 +207,6 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
      */
     public CreateContainerCmd withExtraHosts(String... extraHosts);
 
-    public CreateContainerCmd withHostConfig(HostConfig hostConfig);
-
     public CreateContainerCmd withHostName(String hostName);
 
     public CreateContainerCmd withDomainName(String domainName);
@@ -282,6 +280,12 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public CreateContainerCmd withMacAddress(String macAddress);
 
+    public CreateContainerCmd withUlimits(Ulimit[] ulimits);
+
+    public CreateContainerCmd withReadonlyRootfs(boolean readonlyRootfs);
+
+    public CreateContainerCmd withContainerIDFile(String containerIDFile);
+
     /**
      * @return
      */
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 328513211..11fb50b57 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -23,6 +23,7 @@
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.RestartPolicy;
+import com.github.dockerjava.api.model.Ulimit;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.Volumes;
 import com.github.dockerjava.api.model.VolumesFrom;
@@ -147,6 +148,11 @@ public Bind[] getBinds() {
         return hostConfig.getBinds();
     }
 
+    @Override
+    public Integer getBlkioWeight() {
+        return blkioWeight;
+    }
+
     @Override
     public Capability[] getCapAdd() {
         return hostConfig.getCapAdd();
@@ -162,14 +168,8 @@ public String[] getCmd() {
         return cmd;
     }
 
-    @Override
-    public String getCpuset() {
-        return cpuset;
-    }
-
-    @Override
-    public int getCpuShares() {
-        return cpuShares;
+    public String getContainerIDFile() {
+        return hostConfig.getContainerIDFile();
     }
 
     @Override
@@ -178,18 +178,18 @@ public Integer getCpuPeriod() {
     }
 
     @Override
-    public String getCpusetMems() {
-        return cpusetMems;
+    public String getCpuset() {
+        return cpuset;
     }
 
     @Override
-    public Integer getBlkioWeight() {
-        return blkioWeight;
+    public String getCpusetMems() {
+        return cpusetMems;
     }
 
     @Override
-    public Boolean isOomKillDisable() {
-        return oomKillDisable;
+    public int getCpuShares() {
+        return cpuShares;
     }
 
     @Override
@@ -210,6 +210,11 @@ public String[] getDnsSearch() {
         return hostConfig.getDnsSearch();
     }
 
+    @Override
+    public String getDomainName() {
+        return domainName;
+    }
+
     @Override
     public String[] getEntrypoint() {
         return entrypoint;
@@ -232,21 +237,11 @@ public String[] getExtraHosts() {
         return hostConfig.getExtraHosts();
     }
 
-    @Override
-    public HostConfig getHostConfig() {
-        return hostConfig;
-    }
-
     @Override
     public String getHostName() {
         return hostName;
     }
 
-    @Override
-    public String getDomainName() {
-        return domainName;
-    }
-
     @Override
     public String getImage() {
         return image;
@@ -254,14 +249,14 @@ public String getImage() {
 
     @Override
     @JsonIgnore
-    public Link[] getLinks() {
-        return hostConfig.getLinks();
+    public Map<String, String> getLabels() {
+        return labels;
     }
 
     @Override
     @JsonIgnore
-    public Map<String, String> getLabels() {
-        return labels;
+    public Link[] getLinks() {
+        return hostConfig.getLinks();
     }
 
     @Override
@@ -312,6 +307,11 @@ public RestartPolicy getRestartPolicy() {
         return hostConfig.getRestartPolicy();
     }
 
+    @Override
+    public Ulimit[] getUlimits() {
+        return hostConfig.getUlimits();
+    }
+
     @Override
     public String getUser() {
         return user;
@@ -354,6 +354,11 @@ public boolean isNetworkDisabled() {
         return networkDisabled;
     }
 
+    @Override
+    public Boolean isOomKillDisable() {
+        return oomKillDisable;
+    }
+
     @Override
     @JsonIgnore
     public Boolean isPrivileged() {
@@ -366,6 +371,10 @@ public Boolean isPublishAllPorts() {
         return hostConfig.isPublishAllPorts();
     }
 
+    public boolean isReadonlyRootfs() {
+        return hostConfig.isReadonlyRootfs();
+    }
+
     @Override
     public boolean isStdInOnce() {
         return stdInOnce;
@@ -407,133 +416,139 @@ public CreateContainerCmdImpl withAttachStdout(boolean attachStdout) {
 
     @Override
     public CreateContainerCmd withBinds(Bind... binds) {
+        checkNotNull(binds, "binds was not specified");
         hostConfig.setBinds(binds);
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withBlkioWeight(Integer blkioWeight) {
+        checkNotNull(blkioWeight, "blkioWeight was not specified");
+        this.blkioWeight = blkioWeight;
+        return null;
+    }
+
     @Override
     public CreateContainerCmd withCapAdd(Capability... capAdd) {
+        checkNotNull(capAdd, "capAdd was not specified");
         hostConfig.setCapAdd(capAdd);
         return this;
     }
 
     @Override
     public CreateContainerCmd withCapDrop(Capability... capDrop) {
+        checkNotNull(capDrop, "capDrop was not specified");
         hostConfig.setCapDrop(capDrop);
         return this;
     }
 
     @Override
     public CreateContainerCmdImpl withCmd(String... cmd) {
+        checkNotNull(cmd, "cmd was not specified");
         this.cmd = cmd;
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withCpuset(String cpuset) {
-        this.cpuset = cpuset;
+    public CreateContainerCmd withContainerIDFile(String containerIDFile) {
+        checkNotNull(containerIDFile, "no containerIDFile was specified");
+        hostConfig.setContainerIDFile(containerIDFile);
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withCpuShares(int cpuShares) {
-        this.cpuShares = cpuShares;
+    public CreateContainerCmd withCpuPeriod(Integer cpuPeriod) {
+        checkNotNull(cpuPeriod, "cpuPeriod was not specified");
+        this.cpuPeriod = cpuPeriod;
         return this;
     }
 
     @Override
-    public CreateContainerCmd withCpuPeriod(Integer cpuPeriod) {
-        this.cpuPeriod = cpuPeriod;
+    public CreateContainerCmdImpl withCpuset(String cpuset) {
+        checkNotNull(cpuset, "cpuset was not specified");
+        this.cpuset = cpuset;
         return this;
     }
 
     @Override
     public CreateContainerCmd withCpusetMems(String cpusetMems) {
+        checkNotNull(cpusetMems, "cpusetMems was not specified");
         this.cpusetMems = cpusetMems;
         return null;
     }
 
     @Override
-    public CreateContainerCmd withBlkioWeight(Integer blkioWeight) {
-        this.blkioWeight = blkioWeight;
-        return null;
-    }
-
-    @Override
-    public CreateContainerCmd withOomKillDisable(Boolean oomKillDisable) {
-        this.oomKillDisable = oomKillDisable;
-        return null;
+    public CreateContainerCmdImpl withCpuShares(int cpuShares) {
+        this.cpuShares = cpuShares;
+        return this;
     }
 
     @Override
     public CreateContainerCmd withDevices(Device... devices) {
+        checkNotNull(devices, "devices was not specified");
         this.hostConfig.setDevices(devices);
         return this;
     }
 
-    @Override
-    public CreateContainerCmdImpl withNetworkDisabled(boolean disableNetwork) {
-        this.networkDisabled = disableNetwork;
-        return this;
-    }
-
     @Override
     public CreateContainerCmdImpl withDns(String... dns) {
+        checkNotNull(dns, "dns was not specified");
         this.hostConfig.setDns(dns);
         return this;
     }
 
     @Override
     public CreateContainerCmd withDnsSearch(String... dnsSearch) {
+        checkNotNull(dnsSearch, "dnsSearch was not specified");
         this.hostConfig.setDnsSearch(dnsSearch);
         return this;
     }
 
+    @Override
+    public CreateContainerCmdImpl withDomainName(String domainName) {
+        checkNotNull(domainName, "no domainName was specified");
+        this.domainName = domainName;
+        return this;
+    }
+
     @Override
     public CreateContainerCmdImpl withEntrypoint(String... entrypoint) {
+        checkNotNull(entrypoint, "entrypoint was not specified");
         this.entrypoint = entrypoint;
         return this;
     }
 
     @Override
     public CreateContainerCmdImpl withEnv(String... env) {
+        checkNotNull(env, "env was not specified");
         this.env = env;
         return this;
     }
 
     @Override
     public CreateContainerCmdImpl withExposedPorts(ExposedPort... exposedPorts) {
+        checkNotNull(exposedPorts, "exposedPorts was not specified");
         this.exposedPorts = new ExposedPorts(exposedPorts);
         return this;
     }
 
     @Override
     public CreateContainerCmd withExtraHosts(String... extraHosts) {
+        checkNotNull(extraHosts, "extraHosts was not specified");
         this.hostConfig.setExtraHosts(extraHosts);
         return this;
     }
 
-    @Override
-    public CreateContainerCmd withHostConfig(HostConfig hostConfig) {
-        checkNotNull(hostConfig, "no host config was specified");
-        this.hostConfig = hostConfig;
-        return this;
-    }
-
     @Override
     public CreateContainerCmdImpl withHostName(String hostName) {
+        checkNotNull(hostConfig, "no hostName was specified");
         this.hostName = hostName;
         return this;
     }
 
-    @Override
-    public CreateContainerCmdImpl withDomainName(String domainName) {
-        this.domainName = domainName;
-        return this;
-    }
-
     @Override
     public CreateContainerCmdImpl withImage(String image) {
+        checkNotNull(image, "no image was specified");
         this.image = image;
         return this;
     }
@@ -561,6 +576,7 @@ public CreateContainerCmd withLxcConf(LxcConf... lxcConf) {
 
     @Override
     public CreateContainerCmdImpl withMacAddress(String macAddress) {
+        checkNotNull(macAddress, "macAddress was not specified");
         this.macAddress = macAddress;
         return this;
     }
@@ -584,6 +600,12 @@ public CreateContainerCmdImpl withName(String name) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmdImpl withNetworkDisabled(boolean disableNetwork) {
+        this.networkDisabled = disableNetwork;
+        return this;
+    }
+
     @Override
     public CreateContainerCmd withNetworkMode(String networkMode) {
         checkNotNull(networkMode, "networkMode was not specified");
@@ -591,6 +613,13 @@ public CreateContainerCmd withNetworkMode(String networkMode) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withOomKillDisable(Boolean oomKillDisable) {
+        checkNotNull(oomKillDisable, "oomKillDisable was not specified");
+        this.oomKillDisable = oomKillDisable;
+        return null;
+    }
+
     @Override
     public CreateContainerCmd withPortBindings(PortBinding... portBindings) {
         checkNotNull(portBindings, "portBindings was not specified");
@@ -607,6 +636,7 @@ public CreateContainerCmd withPortBindings(Ports portBindings) {
 
     @Override
     public CreateContainerCmdImpl withPortSpecs(String... portSpecs) {
+        checkNotNull(portSpecs, "portSpecs was not specified");
         this.portSpecs = portSpecs;
         return this;
     }
@@ -623,8 +653,15 @@ public CreateContainerCmd withPublishAllPorts(boolean publishAllPorts) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withReadonlyRootfs(boolean readonlyRootfs) {
+        hostConfig.setReadonlyRootfs(readonlyRootfs);
+        return this;
+    }
+
     @Override
     public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) {
+        checkNotNull(restartPolicy, "restartPolicy was not specified");
         this.hostConfig.setRestartPolicy(restartPolicy);
         return this;
     }
@@ -647,26 +684,37 @@ public CreateContainerCmdImpl withTty(boolean tty) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withUlimits(Ulimit[] ulimits) {
+        checkNotNull(ulimits, "no ulimits was specified");
+        hostConfig.setUlimits(ulimits);
+        return this;
+    }
+
     @Override
     public CreateContainerCmdImpl withUser(String user) {
+        checkNotNull(user, "user was not specified");
         this.user = user;
         return this;
     }
 
     @Override
     public CreateContainerCmdImpl withVolumes(Volume... volumes) {
+        checkNotNull(volumes, "volumes was not specified");
         this.volumes = new Volumes(volumes);
         return this;
     }
 
     @Override
     public CreateContainerCmdImpl withVolumesFrom(VolumesFrom... volumesFrom) {
+        checkNotNull(volumesFrom, "volumesFrom was not specified");
         this.hostConfig.setVolumesFrom(volumesFrom);
         return this;
     }
 
     @Override
     public CreateContainerCmdImpl withWorkingDir(String workingDir) {
+        checkNotNull(workingDir, "workingDir was not specified");
         this.workingDir = workingDir;
         return this;
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 00322bffa..9d682e248 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -254,10 +254,8 @@ public void createContainerWithLink() throws DockerException {
         LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
         assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
 
-        HostConfig hostConfig = new HostConfig();
-        hostConfig.setLinks(new Link("container1", "container1Link"));
         CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withName("container2")
-                .withHostConfig(hostConfig).withCmd("env").exec();
+                .withCmd("env").withLinks(new Link("container1", "container1Link")).exec();
         LOG.info("Created container {}", container2.toString());
         assertThat(container2.getId(), not(isEmptyString()));
 
@@ -324,11 +322,8 @@ public void createContainerWithExtraHosts() throws DockerException {
 
         String[] extraHosts = { "dockerhost:127.0.0.1", "otherhost:10.0.0.1" };
 
-        HostConfig hostConfig = new HostConfig();
-        hostConfig.setExtraHosts(extraHosts);
-
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
-                .withHostConfig(hostConfig).exec();
+                .withExtraHosts(extraHosts).exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -497,11 +492,8 @@ public void createContainerWithULimits() throws DockerException {
 
         Ulimit[] ulimits = { new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096) };
 
-        HostConfig hostConfig = new HostConfig();
-        hostConfig.setUlimits(ulimits);
-
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
-                .withHostConfig(hostConfig).exec();
+                .withUlimits(ulimits).exec();
 
         LOG.info("Created container {}", container.toString());
 

From 959f7cec4dcf88887839b1a1ce822b0a260d65dc Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 16 Jul 2015 22:35:18 +0200
Subject: [PATCH 0143/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34313506b..134b8d8c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@ Change Log
 
 Latest SNAPSHOT
 ---
-
+* [#272](https://github.com/docker-java/docker-java/pull/272) remove withHostConfig() from create container command
 * [#270](https://github.com/docker-java/docker-java/pull/270) Passing result callbacks for async commands via commands exec()
 * [#269](https://github.com/docker-java/docker-java/pull/269) Add filters option to events operation 
 * [#268](https://github.com/docker-java/docker-java/pull/268) Concurrent DockerCmdExecFactory.getDefaultDockerCmdExecFactory fails on reload

From dc8b02578905d761e3797b6d4fa07ba1cd17c9af Mon Sep 17 00:00:00 2001
From: Christopher Dancy <dancc@pega.com>
Date: Fri, 17 Jul 2015 16:36:42 -0400
Subject: [PATCH 0144/1272] Added support for HostConfig.LogConfig

---
 .../dockerjava/api/model/HostConfig.java      | 16 ++++++++-
 .../dockerjava/api/model/LogConfig.java       | 36 +++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/LogConfig.java

diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 8e228fbbd..6bced8395 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -17,6 +17,9 @@ public class HostConfig {
 
     @JsonProperty("LxcConf")
     private LxcConf[] lxcConf;
+    
+    @JsonProperty("LogConfig")
+    private LogConfig logConfig;
 
     @JsonProperty("PortBindings")
     private Ports portBindings;
@@ -66,13 +69,14 @@ public class HostConfig {
     public HostConfig() {
     }
 
-    public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, Ports portBindings, boolean publishAllPorts,
+    public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, LogConfig logConfig, Ports portBindings, boolean publishAllPorts,
             boolean privileged, boolean readonlyRootfs, String[] dns, String[] dnsSearch, VolumesFrom[] volumesFrom,
             String containerIDFile, Capability[] capAdd, Capability[] capDrop, RestartPolicy restartPolicy,
             String networkMode, Device[] devices, String[] extraHosts, Ulimit[] ulimits) {
         this.binds = new Binds(binds);
         this.links = new Links(links);
         this.lxcConf = lxcConf;
+        this.logConfig = logConfig;
         this.portBindings = portBindings;
         this.publishAllPorts = publishAllPorts;
         this.privileged = privileged;
@@ -98,6 +102,11 @@ public Bind[] getBinds() {
     public LxcConf[] getLxcConf() {
         return lxcConf;
     }
+    
+    @JsonIgnore
+    public LogConfig getLogConfig() {
+        return (logConfig == null) ? new LogConfig() : logConfig;
+    }
 
     public Ports getPortBindings() {
         return portBindings;
@@ -177,6 +186,11 @@ public void setLinks(Link... links) {
     public void setLxcConf(LxcConf[] lxcConf) {
         this.lxcConf = lxcConf;
     }
+    
+    @JsonIgnore
+    public void setLogConfig(LogConfig logConfig) {
+        this.logConfig = logConfig;
+    }
 
     public void setPortBindings(Ports portBindings) {
         this.portBindings = portBindings;
diff --git a/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
new file mode 100644
index 000000000..f7d6a648b
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
@@ -0,0 +1,36 @@
+package com.github.dockerjava.api.model;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class LogConfig {
+    
+    @JsonProperty("Type")
+    public String type = "json-file";
+    
+    @JsonProperty("Config")
+    public List<String> config = null;
+
+    public LogConfig(String type) {
+        this.type = type;
+    }
+
+    public LogConfig() {
+    }
+
+    public String getType() {
+        return type;
+    }
+    
+    @JsonIgnore
+    public List<String> getConfig() {
+    	return config;
+    }
+
+    public LogConfig setType(String type) {
+        this.type = type;
+        return this;
+    }
+}

From 3e00a59902e8c122e70112026576e37150e4de81 Mon Sep 17 00:00:00 2001
From: Christopher Dancy <dancc@pega.com>
Date: Sat, 18 Jul 2015 09:22:08 -0400
Subject: [PATCH 0145/1272] REMOVED: 'json-file' default as this is redundant.
 ADDED: documentation on how to use LogConfig and its available drivers.
 ADDED: fleshed out LogConfig support to be more in line with other options.

---
 .../api/command/CreateContainerCmd.java       |  5 +++
 .../dockerjava/api/model/LogConfig.java       | 41 +++++++++++++++----
 .../core/command/CreateContainerCmdImpl.java  | 14 +++++++
 3 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 371774414..4623167d0 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -10,6 +10,7 @@
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Link;
+import com.github.dockerjava.api.model.LogConfig;
 import com.github.dockerjava.api.model.LxcConf;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
@@ -88,6 +89,8 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
     public Link[] getLinks();
 
     public LxcConf[] getLxcConf();
+    
+    public LogConfig getLogConfig();
 
     public String getMacAddress();
 
@@ -224,6 +227,8 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public CreateContainerCmd withLxcConf(LxcConf... lxcConf);
 
+    public CreateContainerCmd withLogConfig(LogConfig logConfig);
+
     public CreateContainerCmd withMemoryLimit(long memoryLimit);
 
     public CreateContainerCmd withMemorySwap(long memorySwap);
diff --git a/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
index f7d6a648b..931d9cff9 100644
--- a/src/main/java/com/github/dockerjava/api/model/LogConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
@@ -1,20 +1,37 @@
 package com.github.dockerjava.api.model;
 
-import java.util.List;
+import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+/**
+ * Log driver to use for a created/running container. The
+ * available types are:
+ * 
+ *     json-file (default)
+ *     syslog
+ *     journald
+ *     none
+ *
+ * If a driver is specified that is NOT supported,docker
+ * will default to null. If configs are supplied that are
+ * not supported by the type docker will ignore them. In most 
+ * cases setting the config option to null will suffice. Consult 
+ * the docker remote API for a more detailed and up-to-date 
+ * explanation of the available types and their options.
+ */
 public class LogConfig {
     
     @JsonProperty("Type")
-    public String type = "json-file";
+    public String type;
     
     @JsonProperty("Config")
-    public List<String> config = null;
+    public Map<String, String> config;
 
-    public LogConfig(String type) {
+    public LogConfig(String type, Map<String, String> config) {
         this.type = type;
+        this.config = config;
     }
 
     public LogConfig() {
@@ -23,14 +40,20 @@ public LogConfig() {
     public String getType() {
         return type;
     }
-    
-    @JsonIgnore
-    public List<String> getConfig() {
-    	return config;
-    }
 
     public LogConfig setType(String type) {
         this.type = type;
         return this;
     }
+
+    @JsonIgnore
+    public Map<String, String> getConfig() {
+    	return config;
+    }
+    
+    @JsonIgnore
+    public LogConfig setConfig(Map<String, String> config) {
+    	this.config = config;
+    	return this;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 328513211..70177b57f 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -19,6 +19,7 @@
 import com.github.dockerjava.api.model.ExposedPorts;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Link;
+import com.github.dockerjava.api.model.LogConfig;
 import com.github.dockerjava.api.model.LxcConf;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
@@ -269,6 +270,12 @@ public Map<String, String> getLabels() {
     public LxcConf[] getLxcConf() {
         return hostConfig.getLxcConf();
     }
+    
+    @Override
+    @JsonIgnore
+    public LogConfig getLogConfig() {
+        return hostConfig.getLogConfig();
+    }
 
     public String getMacAddress() {
         return macAddress;
@@ -558,6 +565,13 @@ public CreateContainerCmd withLxcConf(LxcConf... lxcConf) {
         this.hostConfig.setLxcConf(lxcConf);
         return this;
     }
+    
+    @Override
+    public CreateContainerCmd withLogConfig(LogConfig logConfig) {
+        checkNotNull(logConfig, "logConfig was not specified");
+        this.hostConfig.setLogConfig(logConfig);
+        return this;
+    }
 
     @Override
     public CreateContainerCmdImpl withMacAddress(String macAddress) {

From 6dd3c764d2b504b9206477ce69a8e5f01b974cde Mon Sep 17 00:00:00 2001
From: Christopher Dancy <dancc@pega.com>
Date: Mon, 20 Jul 2015 10:18:31 -0400
Subject: [PATCH 0146/1272] ADDED: test 'createContainerWithLogConfig' to
 ensure LogConfig was properly set

---
 .../command/CreateContainerCmdImplTest.java    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 00322bffa..eb5d1a3f0 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -38,6 +38,7 @@
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Link;
+import com.github.dockerjava.api.model.LogConfig;
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Ulimit;
@@ -534,4 +535,21 @@ public void createContainerWithLabels() throws DockerException {
         labels.put("com.github.dockerjava.null", "");
         assertThat(inspectContainerResponse.getConfig().getLabels(), is(equalTo(labels)));
     }
+    
+    @Test(groups = "ignoreInCircleCi")
+    public void createContainerWithLogConfig() throws DockerException {
+
+    	LogConfig logConfig = new LogConfig("none", null);
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").
+        		withLogConfig(logConfig).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        // null becomes empty string
+        assertEquals(inspectContainerResponse.getHostConfig().getLogConfig().type, logConfig.type);
+    }
 }

From d2c942d6fec0c267b3036acd4ae63f71086e77b3 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Mon, 20 Jul 2015 20:42:37 +0200
Subject: [PATCH 0147/1272] Make LogConfig.type an enum

---
 .../api/command/CreateContainerCmd.java       |  2 +-
 .../dockerjava/api/model/HostConfig.java      | 14 +--
 .../dockerjava/api/model/LogConfig.java       | 96 ++++++++++++++-----
 .../core/command/CreateContainerCmdImpl.java  |  4 +-
 .../command/CreateContainerCmdImplTest.java   |  7 +-
 5 files changed, 86 insertions(+), 37 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 4623167d0..946ba5695 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -89,7 +89,7 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
     public Link[] getLinks();
 
     public LxcConf[] getLxcConf();
-    
+
     public LogConfig getLogConfig();
 
     public String getMacAddress();
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 6bced8395..5d4074eb9 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -17,7 +17,7 @@ public class HostConfig {
 
     @JsonProperty("LxcConf")
     private LxcConf[] lxcConf;
-    
+
     @JsonProperty("LogConfig")
     private LogConfig logConfig;
 
@@ -69,10 +69,10 @@ public class HostConfig {
     public HostConfig() {
     }
 
-    public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, LogConfig logConfig, Ports portBindings, boolean publishAllPorts,
-            boolean privileged, boolean readonlyRootfs, String[] dns, String[] dnsSearch, VolumesFrom[] volumesFrom,
-            String containerIDFile, Capability[] capAdd, Capability[] capDrop, RestartPolicy restartPolicy,
-            String networkMode, Device[] devices, String[] extraHosts, Ulimit[] ulimits) {
+    public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, LogConfig logConfig, Ports portBindings,
+            boolean publishAllPorts, boolean privileged, boolean readonlyRootfs, String[] dns, String[] dnsSearch,
+            VolumesFrom[] volumesFrom, String containerIDFile, Capability[] capAdd, Capability[] capDrop,
+            RestartPolicy restartPolicy, String networkMode, Device[] devices, String[] extraHosts, Ulimit[] ulimits) {
         this.binds = new Binds(binds);
         this.links = new Links(links);
         this.lxcConf = lxcConf;
@@ -102,7 +102,7 @@ public Bind[] getBinds() {
     public LxcConf[] getLxcConf() {
         return lxcConf;
     }
-    
+
     @JsonIgnore
     public LogConfig getLogConfig() {
         return (logConfig == null) ? new LogConfig() : logConfig;
@@ -186,7 +186,7 @@ public void setLinks(Link... links) {
     public void setLxcConf(LxcConf[] lxcConf) {
         this.lxcConf = lxcConf;
     }
-    
+
     @JsonIgnore
     public void setLogConfig(LogConfig logConfig) {
         this.logConfig = logConfig;
diff --git a/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
index 931d9cff9..37bb17a8e 100644
--- a/src/main/java/com/github/dockerjava/api/model/LogConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
@@ -1,59 +1,109 @@
 package com.github.dockerjava.api.model;
 
+import java.io.IOException;
 import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.ObjectCodec;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 /**
- * Log driver to use for a created/running container. The
- * available types are:
- * 
- *     json-file (default)
- *     syslog
- *     journald
- *     none
+ * Log driver to use for a created/running container. The available types are:
  *
- * If a driver is specified that is NOT supported,docker
- * will default to null. If configs are supplied that are
- * not supported by the type docker will ignore them. In most 
- * cases setting the config option to null will suffice. Consult 
- * the docker remote API for a more detailed and up-to-date 
- * explanation of the available types and their options.
+ * json-file (default) syslog journald none
+ *
+ * If a driver is specified that is NOT supported,docker will default to null. If configs are supplied that are not
+ * supported by the type docker will ignore them. In most cases setting the config option to null will suffice. Consult
+ * the docker remote API for a more detailed and up-to-date explanation of the available types and their options.
  */
 public class LogConfig {
-    
+
     @JsonProperty("Type")
-    public String type;
-    
+    public LoggingType type = null;
+
     @JsonProperty("Config")
     public Map<String, String> config;
 
-    public LogConfig(String type, Map<String, String> config) {
+    public LogConfig(LoggingType type, Map<String, String> config) {
         this.type = type;
         this.config = config;
     }
 
+    public LogConfig(LoggingType type) {
+        this(type, null);
+    }
+
     public LogConfig() {
     }
 
-    public String getType() {
+    public LoggingType getType() {
         return type;
     }
 
-    public LogConfig setType(String type) {
+    public LogConfig setType(LoggingType type) {
         this.type = type;
         return this;
     }
 
     @JsonIgnore
     public Map<String, String> getConfig() {
-    	return config;
+        return config;
     }
-    
+
     @JsonIgnore
     public LogConfig setConfig(Map<String, String> config) {
-    	this.config = config;
-    	return this;
+        this.config = config;
+        return this;
+    }
+
+    @JsonDeserialize(using = LoggingType.Deserializer.class)
+    @JsonSerialize(using = LoggingType.Serializer.class)
+    public static enum LoggingType {
+        DEFAULT("json-file"), JSON_FILE("json-file"), NONE("none"), SYSLOG("syslog"), JOURNALD("journald");
+
+        private String type;
+
+        private LoggingType(String type) {
+            this.type = type;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public static final class Serializer extends JsonSerializer<LoggingType> {
+            @Override
+            public void serialize(LoggingType value, JsonGenerator jgen, SerializerProvider provider)
+                    throws IOException, JsonProcessingException {
+                jgen.writeString(value.getType());
+            }
+        }
+
+        public static final class Deserializer extends JsonDeserializer<LoggingType> {
+            @Override
+            public LoggingType deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+                    throws IOException, JsonProcessingException {
+
+                ObjectCodec oc = jsonParser.getCodec();
+                JsonNode node = oc.readTree(jsonParser);
+
+                for (LoggingType loggingType : values()) {
+                    if (loggingType.getType().equals(node.asText()))
+                        return loggingType;
+                }
+
+                throw new IllegalArgumentException("No enum constant " + LoggingType.class + "." + node.asText());
+            }
+        }
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 70177b57f..ff65d5bbe 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -270,7 +270,7 @@ public Map<String, String> getLabels() {
     public LxcConf[] getLxcConf() {
         return hostConfig.getLxcConf();
     }
-    
+
     @Override
     @JsonIgnore
     public LogConfig getLogConfig() {
@@ -565,7 +565,7 @@ public CreateContainerCmd withLxcConf(LxcConf... lxcConf) {
         this.hostConfig.setLxcConf(lxcConf);
         return this;
     }
-    
+
     @Override
     public CreateContainerCmd withLogConfig(LogConfig logConfig) {
         checkNotNull(logConfig, "logConfig was not specified");
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index eb5d1a3f0..0a4b4050a 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -535,13 +535,12 @@ public void createContainerWithLabels() throws DockerException {
         labels.put("com.github.dockerjava.null", "");
         assertThat(inspectContainerResponse.getConfig().getLabels(), is(equalTo(labels)));
     }
-    
+
     @Test(groups = "ignoreInCircleCi")
     public void createContainerWithLogConfig() throws DockerException {
 
-    	LogConfig logConfig = new LogConfig("none", null);
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").
-        		withLogConfig(logConfig).exec();
+        LogConfig logConfig = new LogConfig(LogConfig.LoggingType.NONE, null);
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withLogConfig(logConfig).exec();
 
         LOG.info("Created container {}", container.toString());
 

From 60a88722c9365c2fdb5e0376a3b9aaa5c81cd46e Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Mon, 20 Jul 2015 20:49:00 +0200
Subject: [PATCH 0148/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 134b8d8c6..f6ec47070 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ Change Log
 
 Latest SNAPSHOT
 ---
+* [#275](https://github.com/docker-java/docker-java/pull/275) Implemented LogConfig (create and inspect containers) 
 * [#272](https://github.com/docker-java/docker-java/pull/272) remove withHostConfig() from create container command
 * [#270](https://github.com/docker-java/docker-java/pull/270) Passing result callbacks for async commands via commands exec()
 * [#269](https://github.com/docker-java/docker-java/pull/269) Add filters option to events operation 

From 80679f48c5fbb5165778ff0e05d59a8a7b6134b7 Mon Sep 17 00:00:00 2001
From: Marcus Thiesen <mt@hubrick.com>
Date: Tue, 21 Jul 2015 16:20:59 +0200
Subject: [PATCH 0149/1272] Stop leaking tar files in temporary folder

The temporary tar files generated from the docker folder are preserved after
the contents is send to the docker deamon. In order to prevent filling up the
temporary directory those files must be deleted.

As the API is based on InputStreams the easiest solution is to wrap the input
stream an delete the file on close.
---
 .../core/dockerfile/Dockerfile.java           | 48 ++++++++++++-------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 8c26c4932..fe1a18f68 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -1,19 +1,5 @@
 package com.github.dockerjava.core.dockerfile;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.io.filefilter.TrueFileFilter;
-
 import com.github.dockerjava.api.DockerClientException;
 import com.github.dockerjava.core.CompressArchiveUtil;
 import com.github.dockerjava.core.FilePathUtil;
@@ -24,6 +10,20 @@
 import com.google.common.base.Objects;
 import com.google.common.base.Optional;
 import com.google.common.collect.Collections2;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.filefilter.TrueFileFilter;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * Parse a Dockerfile.
@@ -130,15 +130,29 @@ public InputStream buildDockerFolderTar() {
 
         public InputStream buildDockerFolderTar(File directory) {
 
-            // ARCHIVE TAR
             File dockerFolderTar = null;
 
             try {
-                String archiveNameWithOutExtension = UUID.randomUUID().toString();
+                final String archiveNameWithOutExtension = UUID.randomUUID().toString();
 
                 dockerFolderTar = CompressArchiveUtil.archiveTARFiles(directory, filesToAdd,
                         archiveNameWithOutExtension);
-                return FileUtils.openInputStream(dockerFolderTar);
+
+                final InputStream tarInputStream = FileUtils.openInputStream(dockerFolderTar);
+                final File tarFile = dockerFolderTar;
+
+                return new InputStream() {
+                    @Override
+                    public int read() throws IOException {
+                        return tarInputStream.read();
+                    }
+
+                    @Override
+                    public void close() throws IOException {
+                        IOUtils.closeQuietly(tarInputStream);
+                        FileUtils.deleteQuietly(tarFile);
+                    }
+                };
 
             } catch (IOException ex) {
                 FileUtils.deleteQuietly(dockerFolderTar);

From d13d36403cdd324430f6d1d8862b503a9a992fe6 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 21 Jul 2015 20:51:32 +0200
Subject: [PATCH 0150/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6ec47070..35cdb4979 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ Change Log
 
 Latest SNAPSHOT
 ---
+* [#278](https://github.com/docker-java/docker-java/pull/278) Stop leaking tar files in temporary folder
 * [#275](https://github.com/docker-java/docker-java/pull/275) Implemented LogConfig (create and inspect containers) 
 * [#272](https://github.com/docker-java/docker-java/pull/272) remove withHostConfig() from create container command
 * [#270](https://github.com/docker-java/docker-java/pull/270) Passing result callbacks for async commands via commands exec()

From 4993c7154e0d6631451cc8e925cf95fa5d2c7387 Mon Sep 17 00:00:00 2001
From: Bernie Schelberg <bernie.schelberg@bomboratech.com.au>
Date: Thu, 23 Jul 2015 18:41:12 +1000
Subject: [PATCH 0151/1272] Fix for #279 Handle multiple source files in ADD
 command

---
 .../core/dockerfile/Dockerfile.java           |  3 +-
 .../core/dockerfile/DockerfileStatement.java  | 82 +++++++++++++------
 .../DockerfileAddMultipleFilesTest.java       | 36 ++++++++
 .../DockerfileStatementAddTest.java           | 47 +++++++++++
 .../resources/testAddMultipleFiles/Dockerfile |  5 ++
 src/test/resources/testAddMultipleFiles/src1  |  0
 src/test/resources/testAddMultipleFiles/src2  |  0
 7 files changed, 144 insertions(+), 29 deletions(-)
 create mode 100644 src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
 create mode 100644 src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
 create mode 100644 src/test/resources/testAddMultipleFiles/Dockerfile
 create mode 100644 src/test/resources/testAddMultipleFiles/src1
 create mode 100644 src/test/resources/testAddMultipleFiles/src2

diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index fe1a18f68..9513678d7 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -184,10 +184,9 @@ private void processAddStatement(DockerfileStatement.Add add) throws IOException
 
             add = add.transform(environmentMap);
 
-            if (add.isFileResource()) {
+            for (String resource : add.getFileResources()) {
 
                 File dockerFolder = getDockerFolder();
-                String resource = add.source;
 
                 File src = new File(resource);
                 if (!src.isAbsolute()) {
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java b/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
index a3ceab2b9..b37f5b4f7 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
@@ -2,13 +2,19 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import com.github.dockerjava.api.DockerClientException;
+import com.google.common.base.Function;
 import com.google.common.base.Objects;
 import com.google.common.base.Optional;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
+import org.apache.commons.lang.StringUtils;
 
 /**
  * A statement present in a dockerfile.
@@ -72,36 +78,42 @@ public String toString() {
      */
     public static class Add extends DockerfileStatement<Add> {
 
-        private static final Pattern ADD_OR_COPY_PATTERN = Pattern.compile("^(ADD|COPY)\\s+(.*)\\s+(.*)$");
+        private static final Pattern ARGUMENT_TOKENIZER = Pattern.compile("(?:\"[^\"]+\")|(\\S+)");
 
-        public final String source;
+        public final Collection<String> sources;
 
         public final String destination;
 
-        private Add(String source, String destination) {
-            this.source = source;
+        private Add(Collection<String> sources, String destination) {
+            this.sources = sources;
             this.destination = destination;
         }
 
-        private Add(final Matcher matcher) {
-            source = matcher.group(2);
-            destination = matcher.group(3);
-        }
-
         @Override
-        public Add transform(Map<String, String> env) {
-            String resource = filterForEnvironmentVars(env, source).trim();
-            return new Add(resource, destination);
-        }
-
-        public boolean isFileResource() {
-            URI uri;
-            try {
-                uri = new URI(source);
-            } catch (URISyntaxException e) {
-                return false;
-            }
-            return uri.getScheme() == null || "file".equals(uri.getScheme());
+        public Add transform(final Map<String, String> env) {
+            Collection<String> resources = Collections2.transform(sources, new Function<String, String>() {
+                @Override
+                public String apply(String source) {
+                    return filterForEnvironmentVars(env, source).trim();
+                }
+            });
+            return new Add(resources, destination);
+        }
+
+        public Iterable<String> getFileResources() {
+            return Collections2.filter(sources, new Predicate<String>() {
+
+                @Override
+                public boolean apply(String source) {
+                    URI uri;
+                    try {
+                        uri = new URI(source);
+                    } catch (URISyntaxException e) {
+                        return false;
+                    }
+                    return uri.getScheme() == null || "file".equals(uri.getScheme());
+                }
+            });
         }
 
         /**
@@ -112,21 +124,37 @@ public boolean isFileResource() {
          * @return optional typed item.
          */
         public static Optional<Add> create(String statement) {
-            Matcher matcher = ADD_OR_COPY_PATTERN.matcher(statement.trim());
-            if (!matcher.find()) {
+            Matcher argumentMatcher = ARGUMENT_TOKENIZER.matcher(statement.trim());
+
+            if (!argumentMatcher.find()) {
                 return Optional.absent();
             }
 
-            if (matcher.groupCount() != 3) {
+            String commandName = argumentMatcher.group();
+            if (!(StringUtils.equals(commandName, "ADD") || StringUtils.equals(commandName, "COPY"))) {
+                return Optional.absent();
+            }
+
+            String lastToken = null;
+            Collection<String> sources = new ArrayList<>();
+
+            while (argumentMatcher.find()) {
+                if (lastToken != null) {
+                    sources.add(lastToken);
+                }
+                lastToken = argumentMatcher.group().replaceAll("(^\")|(\"$)", "");
+            }
+
+            if (sources.isEmpty()) {
                 throw new DockerClientException("Wrong ADD or COPY format");
             }
 
-            return Optional.of(new Add(matcher));
+            return Optional.of(new Add(sources, lastToken));
         }
 
         @Override
         public String toString() {
-            return Objects.toStringHelper(this).add("source", source).add("destination", destination).toString();
+            return Objects.toStringHelper(this).add("sources", sources).add("destination", destination).toString();
         }
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
new file mode 100644
index 000000000..65af93774
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
@@ -0,0 +1,36 @@
+package com.github.dockerjava.core.dockerfile;
+
+import com.google.common.base.Function;
+import junit.framework.TestCase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+
+import static com.google.common.collect.Collections2.transform;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+
+public class DockerfileAddMultipleFilesTest extends TestCase {
+
+    private static final Logger log = LoggerFactory.getLogger(DockerfileAddMultipleFilesTest.class);
+    private static final Function<File, String> TO_FILE_NAMES = new Function<File, String>() {
+        @Override
+        public String apply(File file) {
+            return file.getName();
+        }
+    };
+
+    @Test
+    public void testAddMultipleFiles() throws IOException {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddMultipleFiles").getFile());
+        Dockerfile dockerfile = new Dockerfile(new File(baseDir, "Dockerfile"));
+        Dockerfile.ScannedResult result = dockerfile.parse();
+        Collection<String> filesToAdd = transform(result.filesToAdd, TO_FILE_NAMES);
+
+        assertThat(filesToAdd, containsInAnyOrder("Dockerfile", "src1", "src2"));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
new file mode 100644
index 000000000..691137afd
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
@@ -0,0 +1,47 @@
+package com.github.dockerjava.core.dockerfile;
+
+import com.github.dockerjava.api.DockerClientException;
+import com.google.common.base.Optional;
+import junit.framework.TestCase;
+import org.hamcrest.Matcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.is;
+
+public class DockerfileStatementAddTest extends TestCase {
+
+    private static final Logger log = LoggerFactory.getLogger(DockerfileStatementAddTest.class);
+
+    @DataProvider(name = "valid scenarios")
+    public Object[][] validScenarios() {
+        return new Object[][] {
+                {"ADD src dest", contains("src"), "dest"},
+                {"ADD \"src file\" \"dest\"", contains("src file"), "dest"},
+                {"ADD src\"file dest", contains("src\"file"), "dest"},
+                {"ADD src1 src2 dest", containsInAnyOrder("src1", "src2"), "dest"},
+                {"COPY src dest", contains("src"), "dest"},
+                {"COPY \"src file\" \"dest\"", contains("src file"), "dest"},
+                {"COPY src\"file dest", contains("src\"file"), "dest"},
+                {"COPY src1 src2 dest", containsInAnyOrder("src1", "src2"), "dest"}
+        };
+    }
+
+    @Test(dataProvider = "valid scenarios")
+    public void testAddOrCopyPattern(String command, Matcher matchesExpectation, String expectedDest) {
+        Optional<DockerfileStatement.Add> optionalAdd = DockerfileStatement.Add.create(command);
+        assertThat(optionalAdd.isPresent(), is(true));
+        assertThat(optionalAdd.get().sources, matchesExpectation);
+        assertThat(optionalAdd.get().destination, is(expectedDest));
+    }
+
+    @Test(expectedExceptions = { DockerClientException.class })
+    public void shouldThrowExceptionIfDestNotSpecified() {
+        DockerfileStatement.Add.create("ADD src");
+    }
+}
diff --git a/src/test/resources/testAddMultipleFiles/Dockerfile b/src/test/resources/testAddMultipleFiles/Dockerfile
new file mode 100644
index 000000000..52c5bfc6c
--- /dev/null
+++ b/src/test/resources/testAddMultipleFiles/Dockerfile
@@ -0,0 +1,5 @@
+FROM      ubuntu:latest
+
+# Copy multiple source files into the container
+
+ADD	src1 src2      /tmp/
diff --git a/src/test/resources/testAddMultipleFiles/src1 b/src/test/resources/testAddMultipleFiles/src1
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/testAddMultipleFiles/src2 b/src/test/resources/testAddMultipleFiles/src2
new file mode 100644
index 000000000..e69de29bb

From 6c9dbdb72d3ac39c4520fa378517c127f9b64d74 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 23 Jul 2015 20:39:40 +0200
Subject: [PATCH 0152/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35cdb4979..1c86c3cc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ Change Log
 
 Latest SNAPSHOT
 ---
+* [#280](https://github.com/docker-java/docker-java/pull/280) Handle multiple source files in ADD command 
 * [#278](https://github.com/docker-java/docker-java/pull/278) Stop leaking tar files in temporary folder
 * [#275](https://github.com/docker-java/docker-java/pull/275) Implemented LogConfig (create and inspect containers) 
 * [#272](https://github.com/docker-java/docker-java/pull/272) remove withHostConfig() from create container command

From 58720dce6c67d9f6d56993f544c4f583ca49b9a2 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 24 Jul 2015 22:40:09 +0200
Subject: [PATCH 0153/1272] Provide default callback implementations for
 various commands

---
 .../api/model/BuildResponseItem.java          | 20 ++++
 .../api/model/PullResponseItem.java           | 15 +++
 .../api/model/PushResponseItem.java           | 14 +++
 .../dockerjava/api/model/ResponseItem.java    |  8 ++
 .../core/async/ResultCallbackTemplate.java    | 18 ++--
 .../core/command/AbstrAsyncDockerCmd.java     |  5 -
 .../AttachContainerResultCallback.java        | 25 +++++
 .../command/BuildImageResultCallback.java     | 72 ++++++++++++++
 .../core/command/EventsResultCallback.java    | 25 +++++
 .../command/LogContainerResultCallback.java   | 25 +++++
 .../core/command/PullImageResultCallback.java | 47 +++++++++
 .../core/command/PushImageResultCallback.java | 47 +++++++++
 .../util/WrappedResponseInputStream.java      |  7 ++
 .../client/AbstractDockerClientTest.java      | 97 +++++++++----------
 .../command/AttachContainerCmdImplTest.java   | 35 ++++---
 .../core/command/BuildImageCmdImplTest.java   | 32 ++----
 .../core/command/DockerfileFixture.java       |  3 +-
 .../core/command/EventsCmdImplTest.java       | 17 ++--
 .../core/command/FrameReaderITest.java        | 21 +++-
 .../command/ListContainersCmdImplTest.java    |  4 +-
 .../core/command/LogContainerCmdImplTest.java | 13 ++-
 .../core/command/PullImageCmdImplTest.java    |  9 +-
 .../core/command/PushImageCmdImplTest.java    | 22 ++---
 src/test/resources/logback.xml                |  2 +-
 24 files changed, 437 insertions(+), 146 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java

diff --git a/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
index c999652ec..5fd4effc8 100644
--- a/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -11,10 +12,29 @@ public class BuildResponseItem extends ResponseItem {
 
     private static final long serialVersionUID = -1252904184236343612L;
 
+    private static final String BUILD_SUCCESS = "Successfully built";
+
     @JsonProperty("stream")
     private String stream;
 
     public String getStream() {
         return stream;
     }
+
+    /**
+     * Returns whether the stream field indicates a successful build operation
+     */
+    @JsonIgnore
+    public boolean isBuildSuccessIndicated() {
+        if(getStream() == null) return false;
+
+        return getStream().contains(BUILD_SUCCESS);
+    }
+
+    @JsonIgnore
+    public String getImageId() {
+        if(!isBuildSuccessIndicated()) return null;
+
+        return getStream().replaceFirst(BUILD_SUCCESS, "").trim();
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
index cb856a115..6b2d46e7f 100644
--- a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 /**
@@ -10,4 +11,18 @@ public class PullResponseItem extends ResponseItem {
 
     private static final long serialVersionUID = 6316219017613249047L;
 
+    /**
+     * Returns whether the status indicates a successful pull operation
+     *
+     * @returns true: status indicates that pull was successful, false: status doesn't indicate a successful pull
+     */
+    @JsonIgnore
+    public boolean isPullSuccessIndicated() {
+        if (getStatus() == null)
+            return false;
+
+        return (getStatus().contains("Download complete") || getStatus().contains("Image is up to date") || getStatus()
+                .contains("Downloaded newer image"));
+    }
+
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
index b97042154..2555271fd 100644
--- a/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 /**
@@ -9,4 +10,17 @@
 public class PushResponseItem extends ResponseItem {
 
     private static final long serialVersionUID = 8256977108011295857L;
+
+    /**
+     * Returns whether the error field indicates an error
+     *
+     * @returns true: the error field indicates an error, false: the error field doesn't indicate an error
+     */
+    @JsonIgnore
+    public boolean isErrorIndicated() {
+        if (getError() == null)
+            return false;
+
+        return true;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
index f7c4c502d..3ea625164 100644
--- a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
@@ -50,6 +50,14 @@ public String getId() {
         return id;
     }
 
+    public String getError() {
+        return error;
+    }
+
+    public ErrorDetail getErrorDetail() {
+        return errorDetail;
+    }
+
     @JsonIgnoreProperties(ignoreUnknown = false)
     public static class ProgressDetail implements Serializable {
         private static final long serialVersionUID = -1954994695645715264L;
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index 40354447f..d94ce1950 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -24,21 +24,22 @@ public abstract class ResultCallbackTemplate<RC_T extends ResultCallback<A_RES_T
 
     private final static Logger LOGGER = LoggerFactory.getLogger(ResultCallbackTemplate.class);
 
-    private final CountDownLatch finished = new CountDownLatch(1);
+    private final CountDownLatch completed = new CountDownLatch(1);
 
     private Closeable stream;
 
+    private boolean closed = false;
+
     @Override
     public void onStart(Closeable stream) {
         this.stream = stream;
-    }
-
-    @Override
-    public void onNext(A_RES_T object) {
+        this.closed = false;
     }
 
     @Override
     public void onError(Throwable throwable) {
+        if(closed) return;
+
         try {
             LOGGER.error("Error during callback", throwable);
             throw new RuntimeException(throwable);
@@ -64,7 +65,8 @@ public void onComplete() {
     public void close() throws IOException {
         if (stream != null)
             stream.close();
-        finished.countDown();
+        completed.countDown();
+        closed = true;
     }
 
     /**
@@ -72,7 +74,7 @@ public void close() throws IOException {
      */
     @SuppressWarnings("unchecked")
     public RC_T awaitCompletion() throws InterruptedException {
-        finished.await();
+        completed.await();
         return (RC_T) this;
     }
 
@@ -81,7 +83,7 @@ public RC_T awaitCompletion() throws InterruptedException {
      */
     @SuppressWarnings("unchecked")
     public RC_T awaitCompletion(long timeout, TimeUnit timeUnit) throws InterruptedException {
-        finished.await(timeout, timeUnit);
+        completed.await(timeout, timeUnit);
         return (RC_T) this;
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
index 522511e8f..04311e8c1 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
@@ -4,9 +4,6 @@
 
 import java.io.IOException;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.AsyncDockerCmd;
 import com.github.dockerjava.api.command.DockerCmdAsyncExec;
@@ -14,8 +11,6 @@
 public abstract class AbstrAsyncDockerCmd<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T>, A_RES_T> implements
         AsyncDockerCmd<CMD_T, A_RES_T> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(AbstrAsyncDockerCmd.class);
-
     protected DockerCmdAsyncExec<CMD_T, A_RES_T> execution;
 
     public AbstrAsyncDockerCmd(DockerCmdAsyncExec<CMD_T, A_RES_T> execution) {
diff --git a/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java b/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
new file mode 100644
index 000000000..2822b8e48
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
@@ -0,0 +1,25 @@
+/*
+ * Created on 21.07.2015
+ */
+package com.github.dockerjava.core.command;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
+
+/**
+ *
+ * @author marcus
+ *
+ */
+public class AttachContainerResultCallback extends ResultCallbackTemplate<AttachContainerResultCallback, Frame> {
+
+    private final static Logger LOGGER = LoggerFactory.getLogger(AttachContainerResultCallback.class);
+
+    @Override
+    public void onNext(Frame item) {
+        LOGGER.debug(item.toString());
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
new file mode 100644
index 000000000..9f33f81dc
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
@@ -0,0 +1,72 @@
+/*
+ * Created on 21.07.2015
+ */
+package com.github.dockerjava.core.command;
+
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.model.BuildResponseItem;
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
+
+/**
+ *
+ * @author marcus
+ *
+ */
+public class BuildImageResultCallback extends ResultCallbackTemplate<BuildImageResultCallback, BuildResponseItem> {
+
+    private final static Logger LOGGER = LoggerFactory.getLogger(BuildImageResultCallback.class);
+
+    private BuildResponseItem latestItem = null;
+
+    @Override
+    public void onNext(BuildResponseItem item) {
+        this.latestItem = item;
+        LOGGER.debug(item.toString());
+    }
+
+    /**
+     * Awaits the image id from the response stream.
+     *
+     * @throws DockerClientException
+     *             if the build fails.
+     */
+    public String awaitImageId() {
+        try {
+            awaitCompletion();
+        } catch (InterruptedException e) {
+            throw new DockerClientException("", e);
+        }
+
+        return getImageId();
+    }
+
+    /**
+     * Awaits the image id from the response stream.
+     *
+     * @throws DockerClientException
+     *             if the build fails or the timeout occurs.
+     */
+    public String awaitImageId(long timeout, TimeUnit timeUnit) {
+        try {
+            awaitCompletion(timeout, timeUnit);
+        } catch (InterruptedException e) {
+            throw new DockerClientException("", e);
+        }
+
+        return getImageId();
+    }
+
+    private String getImageId() {
+        if (latestItem == null || !latestItem.isBuildSuccessIndicated()) {
+            throw new DockerClientException("Could not build image: " + latestItem.getError());
+        } else {
+            return latestItem.getImageId();
+        }
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java b/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
new file mode 100644
index 000000000..29efac6ca
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
@@ -0,0 +1,25 @@
+/*
+ * Created on 21.07.2015
+ */
+package com.github.dockerjava.core.command;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
+
+/**
+ *
+ * @author marcus
+ *
+ */
+public class EventsResultCallback extends ResultCallbackTemplate<EventsResultCallback, Event> {
+
+    private final static Logger LOGGER = LoggerFactory.getLogger(EventsResultCallback.class);
+
+    @Override
+    public void onNext(Event item) {
+        LOGGER.debug(item.toString());
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java b/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
new file mode 100644
index 000000000..ffe46baf8
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
@@ -0,0 +1,25 @@
+/*
+ * Created on 21.07.2015
+ */
+package com.github.dockerjava.core.command;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
+
+/**
+ *
+ * @author marcus
+ *
+ */
+public class LogContainerResultCallback extends ResultCallbackTemplate<LogContainerResultCallback, Frame> {
+
+    private final static Logger LOGGER = LoggerFactory.getLogger(LogContainerResultCallback.class);
+
+    @Override
+    public void onNext(Frame item) {
+        LOGGER.debug(item.toString());
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
new file mode 100644
index 000000000..18c33f885
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
@@ -0,0 +1,47 @@
+/*
+ * Created on 21.07.2015
+ */
+package com.github.dockerjava.core.command;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.model.PullResponseItem;
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
+
+/**
+ *
+ * @author marcus
+ *
+ */
+public class PullImageResultCallback extends ResultCallbackTemplate<PullImageResultCallback, PullResponseItem> {
+
+    private final static Logger LOGGER = LoggerFactory.getLogger(PullImageResultCallback.class);
+
+    private PullResponseItem latestItem = null;
+
+    @Override
+    public void onNext(PullResponseItem item) {
+        this.latestItem = item;
+        LOGGER.debug(item.toString());
+    }
+
+    /**
+     * Awaits the image to be pulled successful.
+     *
+     * @throws DockerClientException
+     *             if the pull fails.
+     */
+    public void awaitSuccess() {
+        try {
+            awaitCompletion();
+        } catch (InterruptedException e) {
+            throw new DockerClientException("", e);
+        }
+
+        if (latestItem == null || !latestItem.isPullSuccessIndicated()) {
+            throw new DockerClientException("Could not pull image: " + latestItem.getError());
+        }
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
new file mode 100644
index 000000000..afcd16389
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
@@ -0,0 +1,47 @@
+/*
+ * Created on 21.07.2015
+ */
+package com.github.dockerjava.core.command;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.model.PushResponseItem;
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
+
+/**
+ *
+ * @author marcus
+ *
+ */
+public class PushImageResultCallback extends ResultCallbackTemplate<PushImageResultCallback, PushResponseItem> {
+
+    private final static Logger LOGGER = LoggerFactory.getLogger(PushImageResultCallback.class);
+
+    private PushResponseItem latestItem = null;
+
+    @Override
+    public void onNext(PushResponseItem item) {
+        this.latestItem = item;
+        LOGGER.debug(item.toString());
+    }
+
+    /**
+     * Awaits the image to be pulled successful.
+     *
+     * @throws DockerClientException
+     *             if the push fails.
+     */
+    public void awaitSuccess() {
+        try {
+            awaitCompletion();
+        } catch (InterruptedException e) {
+            throw new DockerClientException("", e);
+        }
+
+        if (latestItem == null || latestItem.isErrorIndicated()) {
+            throw new DockerClientException("Could not push image: " + latestItem.getError());
+        }
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java b/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
index fe4514273..05d4f9066 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
@@ -18,6 +18,8 @@ public class WrappedResponseInputStream extends InputStream {
 
     private InputStream delegate;
 
+    private boolean closed = false;
+
     public WrappedResponseInputStream(Response response) {
         this.response = response;
         this.delegate = response.readEntity(InputStream.class);
@@ -52,6 +54,7 @@ public int available() throws IOException {
     }
 
     public void close() throws IOException {
+        closed = true;
         response.close();
         delegate.close();
     }
@@ -68,4 +71,8 @@ public boolean markSupported() {
         return delegate.markSupported();
     }
 
+    public boolean isClosed() {
+        return closed;
+    }
+
 }
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index cc07540f0..6c7b4f860 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -2,7 +2,6 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsString;
 
 import java.io.File;
 import java.io.IOException;
@@ -25,7 +24,6 @@
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.BuildResponseItem;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.PullResponseItem;
 import com.github.dockerjava.api.model.Volume;
@@ -34,6 +32,9 @@
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.TestDockerCmdExecFactory;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
+import com.github.dockerjava.core.command.BuildImageResultCallback;
+import com.github.dockerjava.core.command.LogContainerResultCallback;
+import com.github.dockerjava.core.command.PullImageResultCallback;
 import com.google.common.base.Joiner;
 
 public abstract class AbstractDockerClientTest extends Assert {
@@ -54,7 +55,7 @@ public void beforeTest() throws Exception {
         LOG.info("Pulling image 'busybox'");
 
         // need to block until image is pulled completely
-        dockerClient.pullImageCmd("busybox").withTag("latest").exec(new PullResponseCallback()).awaitCompletion();
+        dockerClient.pullImageCmd("busybox").withTag("latest").exec(new PullImageResultCallback()).awaitSuccess();
 
         assertNotNull(dockerClient);
         LOG.info("======================= END OF BEFORETEST =======================\n\n");
@@ -187,43 +188,53 @@ public static void assertContainerHasVolumes(InspectContainerResponse inspectCon
         assertThat(volumes, contains(expectedVolumes));
     }
 
-    public static class CollectFramesCallback extends CollectStreamItemCallback<CollectFramesCallback, Frame> {
-
-        @Override
-        public void onNext(Frame frame) {
-            items.add(frame);
-            log.append(new String(frame.getPayload()));
-        }
-
-    }
+//    public static class CollectFramesCallback extends CollectStreamItemCallback<CollectFramesCallback, Frame> {
+//
+//        @Override
+//        public void onNext(Frame frame) {
+//            items.add(frame);
+//            log.append(new String(frame.getPayload()));
+//        }
+//
+//    }
 
     protected String containerLog(String containerId) throws Exception {
-
-        CollectFramesCallback collectFramesCallback = dockerClient.logContainerCmd(containerId).withStdOut()
-                .exec(new CollectFramesCallback());
-
-        collectFramesCallback.awaitCompletion();
-
-        return collectFramesCallback.toString();
-    }
-
-    public static class CollectStreamItemCallback<RC_T extends ResultCallback<A_RES_T>, A_RES_T> extends
-            ResultCallbackTemplate<RC_T, A_RES_T> {
-        public final List<A_RES_T> items = new ArrayList<A_RES_T>();
-
+        return dockerClient.logContainerCmd(containerId).withStdOut()
+                .exec(new LogContainerTestCallback()).awaitCompletion().toString();
+    }
+
+//    public static class CollectStreamItemCallback<RC_T extends ResultCallback<A_RES_T>, A_RES_T> extends
+//            ResultCallbackTemplate<RC_T, A_RES_T> {
+//        public final List<A_RES_T> items = new ArrayList<A_RES_T>();
+//
+//        protected final StringBuffer log = new StringBuffer();
+//
+//        @Override
+//        public void onError(Throwable throwable) {
+//            throwable.printStackTrace();
+//            super.onError(throwable);
+//        }
+//
+//        @Override
+//        public void onNext(A_RES_T item) {
+//            items.add(item);
+//            log.append("" + item);
+//            LOG.info(item.toString());
+//        }
+//
+//        @Override
+//        public String toString() {
+//            return log.toString();
+//        }
+//    }
+
+    public static class LogContainerTestCallback extends LogContainerResultCallback {
         protected final StringBuffer log = new StringBuffer();
 
         @Override
-        public void onError(Throwable throwable) {
-            throwable.printStackTrace();
-            super.onError(throwable);
-        }
-
-        @Override
-        public void onNext(A_RES_T item) {
-            items.add(item);
-            log.append("" + item);
-            LOG.info(item.toString());
+        public void onNext(Frame frame) {
+            log.append(new String(frame.getPayload()));
+            super.onNext(frame);
         }
 
         @Override
@@ -232,21 +243,9 @@ public String toString() {
         }
     }
 
-    public static class BuildLogCallback extends CollectStreamItemCallback<BuildLogCallback, BuildResponseItem> {
-        public String awaitImageId() throws Exception {
-            awaitCompletion();
-            BuildResponseItem item = items.get(items.size() - 1);
-            assertThat(item.toString(), containsString("Successfully built"));
-            return item.getStream().replaceFirst("Successfully built", "").trim();
-        }
-    }
-
-    public static class PullResponseCallback extends CollectStreamItemCallback<PullResponseCallback, PullResponseItem> {
-
-    }
-
     protected String buildImage(File baseDir) throws Exception {
 
-        return dockerClient.buildImageCmd(baseDir).withNoCache().exec(new BuildLogCallback()).awaitImageId();
+        return dockerClient.buildImageCmd(baseDir).withNoCache().exec(new BuildImageResultCallback()).awaitImageId();
     }
+
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
index 04e344056..8fa5b2269 100644
--- a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
@@ -57,7 +57,7 @@ public void attachContainerWithoutTTY() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        CollectFramesCallback collectFramesCallback = new CollectFramesCallback() {
+        AttachContainerTestCallback callback = new AttachContainerTestCallback() {
             @Override
             public void onNext(Frame frame) {
                 assertEquals(frame.getStreamType(), StreamType.STDOUT);
@@ -66,13 +66,9 @@ public void onNext(Frame frame) {
         };
 
         dockerClient.attachContainerCmd(container.getId()).withStdErr().withStdOut().withFollowStream().withLogs()
-                .exec(collectFramesCallback);
+                .exec(callback).awaitCompletion(30, TimeUnit.SECONDS).close();
 
-        collectFramesCallback.awaitCompletion(30, TimeUnit.SECONDS);
-
-        collectFramesCallback.close();
-
-        assertThat(collectFramesCallback.toString(), containsString(snippet));
+        assertThat(callback.toString(), containsString(snippet));
     }
 
     @Test
@@ -90,7 +86,7 @@ public void attachContainerWithTTY() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        CollectFramesCallback collectFramesCallback = new CollectFramesCallback() {
+        AttachContainerTestCallback callback = new AttachContainerTestCallback() {
             @Override
             public void onNext(Frame frame) {
                 assertEquals(frame.getStreamType(), StreamType.RAW);
@@ -99,16 +95,27 @@ public void onNext(Frame frame) {
         };
 
         dockerClient.attachContainerCmd(container.getId()).withStdErr().withStdOut().withFollowStream()
-                .exec(collectFramesCallback);
+                .exec(callback).awaitCompletion(15, TimeUnit.SECONDS).close();
+
+        System.out.println("log: " + callback.toString());
 
-        collectFramesCallback.awaitCompletion(15, TimeUnit.SECONDS);
+        // HexDump.dump(collectFramesCallback.toString().getBytes(), 0, System.out, 0);
 
-        collectFramesCallback.close();
+        assertThat(callback.toString(), containsString("stdout\r\nstderr"));
+    }
 
-        System.out.println("log: " + collectFramesCallback.toString());
+    public static class AttachContainerTestCallback extends AttachContainerResultCallback {
+        private StringBuffer log = new StringBuffer();
 
-        // HexDump.dump(collectFramesCallback.toString().getBytes(), 0, System.out, 0);
+        @Override
+        public void onNext(Frame item) {
+            log.append(new String(item.getPayload()));
+            super.onNext(item);
+        }
 
-        assertThat(collectFramesCallback.toString(), containsString("stdout\r\nstderr"));
+        @Override
+        public String toString() {
+            return log.toString();
+        }
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 597a90877..6d2b4c805 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -86,7 +86,7 @@ public void testNonstandard2() throws Exception {
                 .getResource("nonstandard/subdirectory/Dockerfile-nonstandard").getFile());
 
         dockerClient.buildImageCmd().withBaseDirectory(baseDir).withDockerfile(dockerFile).withNoCache()
-                .exec(new BuildLogCallback()).awaitImageId();
+                .exec(new BuildImageResultCallback()).awaitImageId();
     }
 
     @Test
@@ -147,13 +147,7 @@ private String dockerfileBuild(File baseDir) throws Exception {
     }
 
     private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
-
-        BuildLogCallback resultCallback = new BuildLogCallback();
-        ;
-
-        buildImageCmd.withNoCache().exec(resultCallback);
-
-        String imageId = resultCallback.awaitImageId();
+        String imageId = buildImageCmd.withNoCache().exec(new BuildImageResultCallback()).awaitImageId();
 
         // Create container based on image
         CreateContainerResponse container = dockerClient.createContainerCmd(imageId).exec();
@@ -165,7 +159,6 @@ private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
         dockerClient.waitContainerCmd(container.getId()).exec();
 
         return containerLog(container.getId());
-
     }
 
     @Test(expectedExceptions = { DockerClientException.class })
@@ -173,7 +166,7 @@ public void testDockerfileIgnored() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerfileIgnored")
                 .getFile());
 
-        dockerClient.buildImageCmd(baseDir).withNoCache().exec(new BuildLogCallback()).awaitImageId();
+        dockerClient.buildImageCmd(baseDir).withNoCache().exec(new BuildImageResultCallback()).awaitImageId();
     }
 
     @Test(expectedExceptions = { DockerClientException.class })
@@ -181,7 +174,7 @@ public void testInvalidDockerIgnorePattern() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader()
                 .getResource("testInvalidDockerignorePattern").getFile());
 
-        dockerClient.buildImageCmd(baseDir).withNoCache().exec(new BuildLogCallback()).awaitImageId();
+        dockerClient.buildImageCmd(baseDir).withNoCache().exec(new BuildImageResultCallback()).awaitImageId();
     }
 
     @Test(groups = "ignoreInCircleCi")
@@ -193,22 +186,11 @@ public void testDockerIgnore() throws Exception {
     }
 
     @Test
-    public void testNetCatDockerfileBuilder() throws InterruptedException, IOException {
+    public void testNetCatDockerfileBuilder() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("netcat").getFile());
 
-        BuildLogCallback resultCallback = new BuildLogCallback();
-        dockerClient.buildImageCmd(baseDir).withNoCache().exec(resultCallback);
-
-        resultCallback.awaitCompletion();
-
-        String imageId = null;
-
-        for (BuildResponseItem item : resultCallback.items) {
-            String text = item.getStream();
-            if (text.startsWith("Successfully built ")) {
-                imageId = StringUtils.substringBetween(text, "Successfully built ", "\n").trim();
-            }
-        }
+        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache().exec(new BuildImageResultCallback())
+                .awaitImageId();
 
         assertNotNull(imageId, "Not successful in build");
 
diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
index 3d6df071d..9d9b15fd1 100644
--- a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
+++ b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -9,7 +9,6 @@
 import com.github.dockerjava.api.InternalServerErrorException;
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.model.Image;
-import com.github.dockerjava.client.AbstractDockerClientTest.BuildLogCallback;
 
 /**
  * Start and stop a single container for testing.
@@ -36,7 +35,7 @@ public void open() throws Exception {
         LOGGER.info("building {}", directory);
 
         dockerClient.buildImageCmd(new File("src/test/resources", directory)).withNoCache()
-                .exec(new BuildLogCallback()).awaitImageId();
+                .exec(new BuildImageResultCallback()).awaitImageId();
 
         Image lastCreatedImage = dockerClient.listImagesCmd().exec().get(0);
 
diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
index 433940e2e..2d1be184a 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -17,7 +17,6 @@
 import com.github.dockerjava.api.model.Event;
 import com.github.dockerjava.api.model.EventFilters;
 import com.github.dockerjava.client.AbstractDockerClientTest;
-import com.github.dockerjava.core.async.ResultCallbackTemplate;
 
 @Test(groups = "integration")
 public class EventsCmdImplTest extends AbstractDockerClientTest {
@@ -61,7 +60,7 @@ public void testEventStreamTimeBound() throws Exception {
         String endTime = getEpochTime();
 
         CountDownLatch countDownLatch = new CountDownLatch(expectedEvents);
-        EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
+        EventsTestCallback eventCallback = new EventsTestCallback(countDownLatch);
 
         dockerClient.eventsCmd().withSince(startTime).withUntil(endTime).exec(eventCallback);
 
@@ -78,7 +77,7 @@ public void testEventStreaming1() throws Exception {
         TimeUnit.SECONDS.sleep(1);
 
         CountDownLatch countDownLatch = new CountDownLatch(KNOWN_NUM_EVENTS);
-        EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
+        EventsTestCallback eventCallback = new EventsTestCallback(countDownLatch);
 
         dockerClient.eventsCmd().withSince(getEpochTime()).exec(eventCallback);
 
@@ -96,7 +95,7 @@ public void testEventStreaming2() throws Exception {
         TimeUnit.SECONDS.sleep(1);
 
         CountDownLatch countDownLatch = new CountDownLatch(KNOWN_NUM_EVENTS);
-        EventCallbackTest eventCallback = new EventCallbackTest(countDownLatch);
+        EventsTestCallback eventCallback = new EventsTestCallback(countDownLatch);
 
         dockerClient.eventsCmd().withSince(getEpochTime()).exec(eventCallback);
 
@@ -113,8 +112,8 @@ public void testEventStreamingWithFilter() throws Exception {
         TimeUnit.SECONDS.sleep(1);
 
         CountDownLatch countDownLatch = new CountDownLatch(1);
-        EventCallbackTest eventCallback = dockerClient.eventsCmd().withFilters(new EventFilters().withEvent("start"))
-                .exec(new EventCallbackTest(countDownLatch));
+        EventsTestCallback eventCallback = dockerClient.eventsCmd().withFilters(new EventFilters().withEvent("start"))
+                .exec(new EventsTestCallback(countDownLatch));
 
         generateEvents();
 
@@ -130,7 +129,7 @@ public void testEventStreamingWithFilter() throws Exception {
     private int generateEvents() throws Exception {
         String testImage = "busybox";
 
-        dockerClient.pullImageCmd(testImage).exec(new PullResponseCallback()).awaitCompletion();
+        dockerClient.pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess();
 
         CreateContainerResponse container = dockerClient.createContainerCmd(testImage).withCmd("sleep", "9999").exec();
         dockerClient.startContainerCmd(container.getId()).exec();
@@ -138,13 +137,13 @@ private int generateEvents() throws Exception {
         return KNOWN_NUM_EVENTS;
     }
 
-    private class EventCallbackTest extends ResultCallbackTemplate<EventCallbackTest, Event> {
+    private class EventsTestCallback extends EventsResultCallback {
 
         private final CountDownLatch countDownLatch;
 
         private final List<Event> events = new ArrayList<Event>();
 
-        public EventCallbackTest(CountDownLatch countDownLatch) {
+        public EventsTestCallback(CountDownLatch countDownLatch) {
             this.countDownLatch = countDownLatch;
         }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index 6be9b2a49..5b1df2241 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -3,6 +3,7 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -53,16 +54,14 @@ public void canCloseFrameReaderAndReadExpectedLines() throws Exception {
 
     private List<Frame> getLoggingFrames() throws Exception {
 
-        AbstractDockerClientTest.CollectFramesCallback collectFramesCallback = new AbstractDockerClientTest.CollectFramesCallback();
+        FrameReaderITestCallback collectFramesCallback = new FrameReaderITestCallback();
 
         dockerClient.logContainerCmd(dockerfileFixture.getContainerId()).withStdOut().withStdErr().withTailAll()
         // we can't follow stream here as it blocks reading from resulting InputStream infinitely
         // .withFollowStream()
-                .exec(collectFramesCallback);
+                .exec(collectFramesCallback).awaitCompletion();
 
-        collectFramesCallback.awaitCompletion();
-
-        return collectFramesCallback.items;
+        return collectFramesCallback.frames;
     }
 
     @Test
@@ -94,4 +93,16 @@ public void run() {
         thread.join();
 
     }
+
+    public static class FrameReaderITestCallback extends LogContainerResultCallback {
+
+        public List<Frame> frames = new ArrayList<Frame>();
+
+        @Override
+        public void onNext(Frame item) {
+            frames.add(item);
+            super.onNext(item);
+        }
+
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
index 033c7a709..e41b7736f 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
@@ -58,7 +58,7 @@ public void testListContainers() throws Exception {
         String testImage = "busybox";
 
         // need to block until image is pulled completely
-        dockerClient.pullImageCmd(testImage).exec(new PullResponseCallback()).awaitCompletion();
+        dockerClient.pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess();
 
         List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
         assertThat(containers, notNullValue());
@@ -106,7 +106,7 @@ public void testListContainersWithLabelsFilter() throws Exception {
         String testImage = "busybox";
 
         // need to block until image is pulled completely
-        dockerClient.pullImageCmd(testImage).exec(new PullResponseCallback()).awaitCompletion();
+        dockerClient.pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitCompletion();
 
         List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
         assertThat(containers, notNullValue());
diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
index f3c8f0222..6d887f359 100644
--- a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
@@ -17,6 +17,7 @@
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
 @Test(groups = "integration")
@@ -59,7 +60,7 @@ public void asyncLogContainer() throws Exception {
 
         assertThat(exitCode, equalTo(0));
 
-        CollectFramesCallback loggingCallback = new CollectFramesCallback();
+        LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
 
         dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec(loggingCallback);
 
@@ -71,7 +72,7 @@ public void asyncLogContainer() throws Exception {
     @Test
     public void asyncLogNonExistingContainer() throws Exception {
 
-        CollectFramesCallback loggingCallback = new CollectFramesCallback() {
+        LogContainerTestCallback loggingCallback = new LogContainerTestCallback() {
             @Override
             public void onError(Throwable throwable) {
 
@@ -113,19 +114,19 @@ public void asyncMultipleLogContainer() throws Exception {
 
         assertThat(exitCode, equalTo(0));
 
-        CollectFramesCallback loggingCallback = new CollectFramesCallback();
+        LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
 
         dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec(loggingCallback);
 
         loggingCallback.close();
 
-        loggingCallback = new CollectFramesCallback();
+        loggingCallback = new LogContainerTestCallback();
 
         dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec(loggingCallback);
 
         loggingCallback.close();
 
-        loggingCallback = new CollectFramesCallback();
+        loggingCallback = new LogContainerTestCallback();
 
         dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec(loggingCallback);
 
@@ -133,4 +134,6 @@ public void asyncMultipleLogContainer() throws Exception {
 
         assertTrue(loggingCallback.toString().contains(snippet));
     }
+
+
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
index 83c433775..10e31e171 100644
--- a/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.core.command;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.lessThanOrEqualTo;
 import static org.hamcrest.Matchers.notNullValue;
 
@@ -95,11 +94,7 @@ public void testPullImage() throws Exception {
 
         LOG.info("Pulling image: {}", testImage);
 
-        PullResponseCallback callback = dockerClient.pullImageCmd(testImage).exec(new PullResponseCallback());
-
-        callback.awaitCompletion();
-
-        assertThat(callback.toString(), containsString("Download complete"));
+        dockerClient.pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess();
 
         info = dockerClient.infoCmd().exec();
         LOG.info("Client info after pull, {}", info.toString());
@@ -116,7 +111,7 @@ public void testPullNonExistingImage() throws Exception {
 
         // does not throw an exception
         // stream needs to be fully read in order to close the underlying connection
-        dockerClient.pullImageCmd("xvxcv/foo").exec(new PullResponseCallback()).awaitCompletion();
+        dockerClient.pullImageCmd("xvxcv/foo").exec(new PullImageResultCallback()).awaitCompletion();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
index 23eff6db4..bb42d5b4b 100644
--- a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.core.command;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
 
@@ -16,8 +15,8 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import com.github.dockerjava.api.DockerClientException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.model.PushResponseItem;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
 @Test(groups = "integration")
@@ -61,28 +60,23 @@ public void pushLatest() throws Exception {
         String imageId = dockerClient.commitCmd(container.getId()).withRepository(username + "/busybox").exec();
 
         // we have to block until image is pushed
-        dockerClient.pushImageCmd(username + "/busybox").exec(new PushResponseCallback()).awaitCompletion();
+        dockerClient.pushImageCmd(username + "/busybox").exec(new PushImageResultCallback()).awaitSuccess();
 
         LOG.info("Removing image: {}", imageId);
         dockerClient.removeImageCmd(imageId).exec();
 
-        PullResponseCallback pushCallback = dockerClient.pullImageCmd(username + "/busybox")
-                .exec(new PullResponseCallback()).awaitCompletion();
-
-        assertThat(pushCallback.toString(), not(containsString("HTTP code: 404")));
+        dockerClient.pullImageCmd(username + "/busybox")
+                .exec(new PullImageResultCallback()).awaitSuccess();
     }
 
-    @Test
+    @Test(expectedExceptions = DockerClientException.class)
     public void pushNonExistentImage() throws Exception {
 
-        PushResponseCallback callback = dockerClient.pushImageCmd(username + "/xxx").exec(new PushResponseCallback())
-                .awaitCompletion();
+        dockerClient.pushImageCmd(username + "/xxx").exec(new PushImageResultCallback())
+                .awaitSuccess();
 
-        assertThat(callback.toString(), containsString("error"));
-    }
-
-    public static class PushResponseCallback extends CollectStreamItemCallback<PushResponseCallback, PushResponseItem> {
 
     }
 
+
 }
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
index bea30de0e..c2d4557a4 100644
--- a/src/test/resources/logback.xml
+++ b/src/test/resources/logback.xml
@@ -6,7 +6,7 @@
         </encoder>
     </appender>
 
-    <logger name="com.github.dockerjava" level="INFO"/>
+    <logger name="com.github.dockerjava" level="DEBUG"/>
     <logger name="com.github.dockerjava.jaxrs" level="DEBUG"/>
     <logger name="org.apache.http.impl.conn" level="DEBUG"/>
 

From d54c5218dfdb0584280c7aaca4b5d04a3a44e05d Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 24 Jul 2015 22:49:35 +0200
Subject: [PATCH 0154/1272] Remove comments

---
 .../client/AbstractDockerClientTest.java      | 38 -------------------
 1 file changed, 38 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 6c7b4f860..8ed9164da 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -22,16 +22,13 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.api.model.PullResponseItem;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumeBind;
 import com.github.dockerjava.core.DockerClientBuilder;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.TestDockerCmdExecFactory;
-import com.github.dockerjava.core.async.ResultCallbackTemplate;
 import com.github.dockerjava.core.command.BuildImageResultCallback;
 import com.github.dockerjava.core.command.LogContainerResultCallback;
 import com.github.dockerjava.core.command.PullImageResultCallback;
@@ -188,46 +185,11 @@ public static void assertContainerHasVolumes(InspectContainerResponse inspectCon
         assertThat(volumes, contains(expectedVolumes));
     }
 
-//    public static class CollectFramesCallback extends CollectStreamItemCallback<CollectFramesCallback, Frame> {
-//
-//        @Override
-//        public void onNext(Frame frame) {
-//            items.add(frame);
-//            log.append(new String(frame.getPayload()));
-//        }
-//
-//    }
-
     protected String containerLog(String containerId) throws Exception {
         return dockerClient.logContainerCmd(containerId).withStdOut()
                 .exec(new LogContainerTestCallback()).awaitCompletion().toString();
     }
 
-//    public static class CollectStreamItemCallback<RC_T extends ResultCallback<A_RES_T>, A_RES_T> extends
-//            ResultCallbackTemplate<RC_T, A_RES_T> {
-//        public final List<A_RES_T> items = new ArrayList<A_RES_T>();
-//
-//        protected final StringBuffer log = new StringBuffer();
-//
-//        @Override
-//        public void onError(Throwable throwable) {
-//            throwable.printStackTrace();
-//            super.onError(throwable);
-//        }
-//
-//        @Override
-//        public void onNext(A_RES_T item) {
-//            items.add(item);
-//            log.append("" + item);
-//            LOG.info(item.toString());
-//        }
-//
-//        @Override
-//        public String toString() {
-//            return log.toString();
-//        }
-//    }
-
     public static class LogContainerTestCallback extends LogContainerResultCallback {
         protected final StringBuffer log = new StringBuffer();
 

From ec74b04c25ea89a16ca43493a2115fc8e1bcf3e3 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 24 Jul 2015 23:13:04 +0200
Subject: [PATCH 0155/1272] Fixing serialVersionId

---
 .../java/com/github/dockerjava/api/model/PullResponseItem.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
index 6b2d46e7f..b2bedca60 100644
--- a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
@@ -9,7 +9,7 @@
 @JsonIgnoreProperties(ignoreUnknown = false)
 public class PullResponseItem extends ResponseItem {
 
-    private static final long serialVersionUID = 6316219017613249047L;
+    private static final long serialVersionUID = -2575482839766823293L;
 
     /**
      * Returns whether the status indicates a successful pull operation

From ba9fe85a5536bb5c988452551550e255bbeca094 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 24 Jul 2015 23:13:31 +0200
Subject: [PATCH 0156/1272] Format source

---
 .../com/github/dockerjava/api/model/BuildResponseItem.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
index 5fd4effc8..37fae34e7 100644
--- a/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
@@ -26,14 +26,16 @@ public String getStream() {
      */
     @JsonIgnore
     public boolean isBuildSuccessIndicated() {
-        if(getStream() == null) return false;
+        if (getStream() == null)
+            return false;
 
         return getStream().contains(BUILD_SUCCESS);
     }
 
     @JsonIgnore
     public String getImageId() {
-        if(!isBuildSuccessIndicated()) return null;
+        if (!isBuildSuccessIndicated())
+            return null;
 
         return getStream().replaceFirst(BUILD_SUCCESS, "").trim();
     }

From 12ab37e3277064a899ee0550ab2f4b6fe6ddd6af Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 24 Jul 2015 23:13:49 +0200
Subject: [PATCH 0157/1272] Add exception message

---
 .../dockerjava/core/command/BuildImageResultCallback.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
index 9f33f81dc..4de6e280e 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
@@ -55,7 +55,7 @@ public String awaitImageId(long timeout, TimeUnit timeUnit) {
         try {
             awaitCompletion(timeout, timeUnit);
         } catch (InterruptedException e) {
-            throw new DockerClientException("", e);
+            throw new DockerClientException("Awaiting image id interrupted: ", e);
         }
 
         return getImageId();

From 2e315103591ab8cea58b218cb7b2804b58e18af9 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 26 Jul 2015 20:16:48 +0200
Subject: [PATCH 0158/1272] Remove JAXRS/ApacheConnector implementation
 specific properties from DockerClientConfig

---
 .../dockerjava/core/DockerClientConfig.java   | 112 +-----------------
 .../jaxrs/DockerCmdExecFactoryImpl.java       |  86 +++++++++++---
 .../filter}/FollowRedirectsFilter.java        |   2 +-
 .../filter}/JsonClientFilter.java             |   2 +-
 .../util => jaxrs/filter}/LoggingFilter.java  |   2 +-
 .../ResponseStatusExceptionFilter.java        |   2 +-
 .../filter}/SelectiveLoggingFilter.java       |   2 +-
 .../core/DockerClientConfigTest.java          |  11 +-
 .../dockerjava/core/DockerClientImplTest.java |   3 +-
 9 files changed, 85 insertions(+), 137 deletions(-)
 rename src/main/java/com/github/dockerjava/{core/util => jaxrs/filter}/FollowRedirectsFilter.java (96%)
 rename src/main/java/com/github/dockerjava/{core/util => jaxrs/filter}/JsonClientFilter.java (94%)
 rename src/main/java/com/github/dockerjava/{core/util => jaxrs/filter}/LoggingFilter.java (99%)
 rename src/main/java/com/github/dockerjava/{core/util => jaxrs/filter}/ResponseStatusExceptionFilter.java (98%)
 rename src/main/java/com/github/dockerjava/{core/util => jaxrs/filter}/SelectiveLoggingFilter.java (96%)

diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index a96f61556..800ed5772 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -40,22 +40,10 @@ public class DockerClientConfig implements Serializable {
 
     private static final String DOCKER_IO_SERVER_ADDRESS_PROPERTY = "docker.io.serverAddress";
 
-    private static final String DOCKER_IO_READ_TIMEOUT_PROPERTY = "docker.io.readTimeout";
-
-    // this is really confusing, as there are two ways to spell it
-    private static final String DOCKER_IO_ENABLE_LOGGING_FILTER_PROPERTY = "docker.io.enableLoggingFilter";
-
-    private static final String DOCKER_IO_FOLLOW_REDIRECTS_FILTER_PROPERTY = "docker.io.followRedirectsFilter";
-
     private static final String DOCKER_IO_DOCKER_CERT_PATH_PROPERTY = "docker.io.dockerCertPath";
 
     private static final String DOCKER_IO_DOCKER_CFG_PATH_PROPERTY = "docker.io.dockerCfgPath";
 
-    // connection pooling properties
-    private static final String DOCKER_IO_MAX_PER_ROUTE_PROPERTY = "docker.io.perRouteConnections";
-
-    private static final String DOCKER_IO_MAX_TOTAL_PROPERTY = "docker.io.totalConnections";
-
     /**
      * A map from the environment name to the interval name.
      */
@@ -69,9 +57,6 @@ public class DockerClientConfig implements Serializable {
         m.put("DOCKER_PASSWORD", DOCKER_IO_PASSWORD_PROPERTY);
         m.put("DOCKER_EMAIL", DOCKER_IO_EMAIL_PROPERTY);
         m.put("DOCKER_SERVER_ADDRESS", DOCKER_IO_SERVER_ADDRESS_PROPERTY);
-        m.put("DOCKER_READ_TIMEOUT", DOCKER_IO_READ_TIMEOUT_PROPERTY);
-        m.put("DOCKER_LOGGING_FILTER_ENABLED", DOCKER_IO_ENABLE_LOGGING_FILTER_PROPERTY);
-        m.put("DOCKER_FOLLOW_REDIRECTS_FILTER_ENABLED", DOCKER_IO_FOLLOW_REDIRECTS_FILTER_PROPERTY);
         m.put(DOCKER_CERT_PATH_PROPERTY, DOCKER_IO_DOCKER_CERT_PATH_PROPERTY);
         m.put("DOCKER_CFG_PATH", DOCKER_IO_DOCKER_CFG_PATH_PROPERTY);
         ENV_NAME_TO_IO_NAME = Collections.unmodifiableMap(m);
@@ -83,21 +68,10 @@ public class DockerClientConfig implements Serializable {
 
     private final String version, username, password, email, serverAddress, dockerCfgPath;
 
-    private final Integer readTimeout;
-
-    private final boolean loggingFilterEnabled;
-
-    private final boolean followRedirectsFilterEnabled;
-
     private final SSLConfig sslConfig;
 
-    private final Integer maxTotalConnections;
-
-    private final Integer maxPerRouteConnections;
-
     DockerClientConfig(URI uri, String version, String username, String password, String email, String serverAddress,
-            String dockerCfgPath, Integer readTimeout, boolean loggingFilterEnabled,
-            boolean followRedirectsFilterEnabled, SSLConfig sslConfig, Integer maxTotalConns, Integer maxPerRouteConns) {
+            String dockerCfgPath, SSLConfig sslConfig) {
         this.uri = uri;
         this.version = version;
         this.username = username;
@@ -105,12 +79,7 @@ public class DockerClientConfig implements Serializable {
         this.email = email;
         this.serverAddress = serverAddress;
         this.dockerCfgPath = dockerCfgPath;
-        this.readTimeout = readTimeout;
-        this.loggingFilterEnabled = loggingFilterEnabled;
-        this.followRedirectsFilterEnabled = followRedirectsFilterEnabled;
         this.sslConfig = sslConfig;
-        this.maxTotalConnections = maxTotalConns;
-        this.maxPerRouteConnections = maxPerRouteConns;
     }
 
     private static Properties loadIncludedDockerProperties(Properties systemProperties) {
@@ -208,8 +177,7 @@ private static Properties overrideDockerPropertiesWithSystemProperties(Propertie
 
         for (String key : new String[] { DOCKER_IO_URL_PROPERTY, DOCKER_IO_VERSION_PROPERTY,
                 DOCKER_IO_USERNAME_PROPERTY, DOCKER_IO_PASSWORD_PROPERTY, DOCKER_IO_EMAIL_PROPERTY,
-                DOCKER_IO_SERVER_ADDRESS_PROPERTY, DOCKER_IO_READ_TIMEOUT_PROPERTY,
-                DOCKER_IO_ENABLE_LOGGING_FILTER_PROPERTY, DOCKER_IO_FOLLOW_REDIRECTS_FILTER_PROPERTY,
+                DOCKER_IO_SERVER_ADDRESS_PROPERTY,
                 DOCKER_IO_DOCKER_CERT_PATH_PROPERTY, DOCKER_IO_DOCKER_CFG_PATH_PROPERTY, }) {
             if (systemProperties.containsKey(key)) {
                 overriddenProperties.setProperty(key, systemProperties.getProperty(key));
@@ -261,18 +229,6 @@ public String getServerAddress() {
         return serverAddress;
     }
 
-    public Integer getReadTimeout() {
-        return readTimeout;
-    }
-
-    public boolean isLoggingFilterEnabled() {
-        return loggingFilterEnabled;
-    }
-
-    public boolean followRedirectsFilterEnabled() {
-        return followRedirectsFilterEnabled;
-    }
-
     public SSLConfig getSslConfig() {
         return sslConfig;
     }
@@ -281,14 +237,6 @@ public String getDockerCfgPath() {
         return dockerCfgPath;
     }
 
-    public Integer getMaxTotalConnections() {
-        return maxTotalConnections;
-    }
-
-    public Integer getMaxPerRoutConnections() {
-        return maxPerRouteConnections;
-    }
-
     private AuthConfig getAuthConfig() {
         AuthConfig authConfig = null;
         if (getUsername() != null && getPassword() != null && getEmail() != null && getServerAddress() != null) {
@@ -352,8 +300,6 @@ public boolean equals(Object o) {
 
         DockerClientConfig that = (DockerClientConfig) o;
 
-        if (loggingFilterEnabled != that.loggingFilterEnabled)
-            return false;
         if (sslConfig != null ? !sslConfig.equals(that.sslConfig) : that.sslConfig != null)
             return false;
         if (dockerCfgPath != null ? !dockerCfgPath.equals(that.dockerCfgPath) : that.dockerCfgPath != null)
@@ -362,8 +308,6 @@ public boolean equals(Object o) {
             return false;
         if (password != null ? !password.equals(that.password) : that.password != null)
             return false;
-        if (readTimeout != null ? !readTimeout.equals(that.readTimeout) : that.readTimeout != null)
-            return false;
         if (serverAddress != null ? !serverAddress.equals(that.serverAddress) : that.serverAddress != null)
             return false;
         if (uri != null ? !uri.equals(that.uri) : that.uri != null)
@@ -386,8 +330,6 @@ public int hashCode() {
         result = 31 * result + (serverAddress != null ? serverAddress.hashCode() : 0);
         result = 31 * result + (dockerCfgPath != null ? dockerCfgPath.hashCode() : 0);
         result = 31 * result + (sslConfig != null ? sslConfig.hashCode() : 0);
-        result = 31 * result + (readTimeout != null ? readTimeout.hashCode() : 0);
-        result = 31 * result + (loggingFilterEnabled ? 1 : 0);
         return result;
     }
 
@@ -396,8 +338,7 @@ public String toString() {
         return "DockerClientConfig{" + "uri=" + uri + ", version='" + version + '\'' + ", username='" + username + '\''
                 + ", password='" + password + '\'' + ", email='" + email + '\'' + ", serverAddress='" + serverAddress
                 + '\'' + ", dockerCfgPath='" + dockerCfgPath + '\'' + ", sslConfig='" + sslConfig + '\''
-                + ", readTimeout=" + readTimeout + ", loggingFilterEnabled=" + loggingFilterEnabled
-                + ", followRedirectsFilterEnabled=" + followRedirectsFilterEnabled + '}';
+                + '}';
     }
 
     public static class DockerClientConfigBuilder {
@@ -405,10 +346,6 @@ public static class DockerClientConfigBuilder {
 
         private String version, username, password, email, serverAddress, dockerCfgPath;
 
-        private Integer readTimeout, maxTotalConnections, maxPerRouteConnections;
-
-        private boolean loggingFilterEnabled, followRedirectsFilterEnabled;
-
         private SSLConfig sslConfig;
 
         /**
@@ -424,21 +361,8 @@ public DockerClientConfigBuilder withProperties(Properties p) {
                     .withPassword(p.getProperty(DOCKER_IO_PASSWORD_PROPERTY))
                     .withEmail(p.getProperty(DOCKER_IO_EMAIL_PROPERTY))
                     .withServerAddress(p.getProperty(DOCKER_IO_SERVER_ADDRESS_PROPERTY))
-                    .withReadTimeout(Integer.valueOf(p.getProperty(DOCKER_IO_READ_TIMEOUT_PROPERTY, "0")))
-                    .withLoggingFilter(Boolean.valueOf(p.getProperty(DOCKER_IO_ENABLE_LOGGING_FILTER_PROPERTY, "true")))
-                    .withFollowRedirectsFilter(
-                            Boolean.valueOf(p.getProperty(DOCKER_IO_FOLLOW_REDIRECTS_FILTER_PROPERTY, "false")))
                     .withDockerCertPath(p.getProperty(DOCKER_IO_DOCKER_CERT_PATH_PROPERTY))
-                    .withDockerCfgPath(p.getProperty(DOCKER_IO_DOCKER_CFG_PATH_PROPERTY))
-                    .withMaxPerRouteConnections(integerValue(p.getProperty(DOCKER_IO_MAX_PER_ROUTE_PROPERTY)))
-                    .withMaxTotalConnections(integerValue(p.getProperty(DOCKER_IO_MAX_TOTAL_PROPERTY)));
-        }
-
-        private Integer integerValue(String value) {
-            if (value != null)
-                return Integer.valueOf(value);
-            else
-                return null;
+                    .withDockerCfgPath(p.getProperty(DOCKER_IO_DOCKER_CFG_PATH_PROPERTY));
         }
 
         public final DockerClientConfigBuilder withUri(String uri) {
@@ -472,31 +396,6 @@ public DockerClientConfigBuilder withServerAddress(String serverAddress) {
             return this;
         }
 
-        public final DockerClientConfigBuilder withReadTimeout(Integer readTimeout) {
-            this.readTimeout = readTimeout;
-            return this;
-        }
-
-        public final DockerClientConfigBuilder withMaxTotalConnections(Integer maxTotalConnections) {
-            this.maxTotalConnections = maxTotalConnections;
-            return this;
-        }
-
-        public final DockerClientConfigBuilder withMaxPerRouteConnections(Integer maxPerRouteConnections) {
-            this.maxPerRouteConnections = maxPerRouteConnections;
-            return this;
-        }
-
-        public final DockerClientConfigBuilder withLoggingFilter(boolean loggingFilterEnabled) {
-            this.loggingFilterEnabled = loggingFilterEnabled;
-            return this;
-        }
-
-        public final DockerClientConfigBuilder withFollowRedirectsFilter(boolean followRedirectsFilterEnabled) {
-            this.followRedirectsFilterEnabled = followRedirectsFilterEnabled;
-            return this;
-        }
-
         public final DockerClientConfigBuilder withDockerCertPath(String dockerCertPath) {
             if (dockerCertPath != null) {
                 this.sslConfig = new LocalDirectorySSLConfig(dockerCertPath);
@@ -516,8 +415,7 @@ public final DockerClientConfigBuilder withSSLConfig(SSLConfig config) {
 
         public DockerClientConfig build() {
             return new DockerClientConfig(uri, version, username, password, email, serverAddress, dockerCfgPath,
-                    readTimeout, loggingFilterEnabled, followRedirectsFilterEnabled, sslConfig, maxTotalConnections,
-                    maxPerRouteConnections);
+                     sslConfig);
         }
     }
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index cb08f8d8b..f3ad427f5 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -8,6 +8,8 @@
 import javax.net.ssl.SSLContext;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.client.ClientResponseFilter;
 import javax.ws.rs.client.WebTarget;
 
 import org.apache.http.config.RegistryBuilder;
@@ -62,13 +64,13 @@
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.util.FollowRedirectsFilter;
-import com.github.dockerjava.core.util.JsonClientFilter;
-import com.github.dockerjava.core.util.ResponseStatusExceptionFilter;
-import com.github.dockerjava.core.util.SelectiveLoggingFilter;
 //import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 // see https://github.com/docker-java/docker-java/issues/196
 import com.github.dockerjava.jaxrs.connector.ApacheConnectorProvider;
+import com.github.dockerjava.jaxrs.filter.FollowRedirectsFilter;
+import com.github.dockerjava.jaxrs.filter.JsonClientFilter;
+import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter;
+import com.github.dockerjava.jaxrs.filter.SelectiveLoggingFilter;
 
 public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
 
@@ -78,6 +80,18 @@ public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
 
     private WebTarget baseResource;
 
+    private Integer readTimeout = null;
+
+    private Integer connectTimeout = null;
+
+    private Integer maxTotalConnections = null;
+
+    private Integer maxPerRouteConnections = null;
+
+    private ClientRequestFilter[] clientRequestFilters = null;
+
+    private ClientResponseFilter[] clientResponseFilters = null;
+
     @Override
     public void init(DockerClientConfig dockerClientConfig) {
         checkNotNull(dockerClientConfig, "config was not specified");
@@ -90,20 +104,30 @@ public void init(DockerClientConfig dockerClientConfig) {
         clientConfig.register(JsonClientFilter.class);
         clientConfig.register(JacksonJsonProvider.class);
 
-        if (dockerClientConfig.followRedirectsFilterEnabled()) {
-            clientConfig.register(FollowRedirectsFilter.class);
+        // logging may disabled via log level
+        clientConfig.register(new SelectiveLoggingFilter(LOGGER, true));
+
+        if (readTimeout != null) {
+            clientConfig.property(ClientProperties.READ_TIMEOUT, readTimeout);
         }
 
-        if (dockerClientConfig.isLoggingFilterEnabled()) {
-            clientConfig.register(new SelectiveLoggingFilter(LOGGER, true));
+        if (connectTimeout != null) {
+            clientConfig.property(ClientProperties.CONNECT_TIMEOUT, connectTimeout);
         }
 
-        if (dockerClientConfig.getReadTimeout() != null) {
-            int readTimeout = dockerClientConfig.getReadTimeout();
-            clientConfig.property(ClientProperties.READ_TIMEOUT, readTimeout);
+        if (clientResponseFilters != null) {
+            for (ClientResponseFilter clientResponseFilter : clientResponseFilters) {
+                if (clientResponseFilter != null)
+                    clientConfig.register(clientResponseFilter);
+            }
         }
 
-        // clientConfig.property(ClientProperties.CONNECT_TIMEOUT, 10000);
+        if (clientRequestFilters != null) {
+            for (ClientRequestFilter clientRequestFilter : clientRequestFilters) {
+                if(clientRequestFilter != null)
+                clientConfig.register(clientRequestFilter);
+            }
+        }
 
         URI originalUri = dockerClientConfig.getUri();
 
@@ -120,10 +144,10 @@ public void init(DockerClientConfig dockerClientConfig) {
         PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(
                 originalUri, sslContext));
 
-        if (dockerClientConfig.getMaxTotalConnections() != null)
-            connManager.setMaxTotal(dockerClientConfig.getMaxTotalConnections());
-        if (dockerClientConfig.getMaxPerRoutConnections() != null)
-            connManager.setDefaultMaxPerRoute(dockerClientConfig.getMaxPerRoutConnections());
+        if (maxTotalConnections != null)
+            connManager.setMaxTotal(maxTotalConnections);
+        if (maxPerRouteConnections != null)
+            connManager.setDefaultMaxPerRoute(maxPerRouteConnections);
 
         clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER, connManager);
 
@@ -353,4 +377,34 @@ public void close() throws IOException {
         client.close();
     }
 
+    public DockerCmdExecFactoryImpl withReadTimeout(Integer readTimeout) {
+        this.readTimeout = readTimeout;
+        return this;
+    }
+
+    public DockerCmdExecFactoryImpl withConnectTimeout(Integer connectTimeout) {
+        this.connectTimeout = connectTimeout;
+        return this;
+    }
+
+    public DockerCmdExecFactoryImpl withMaxTotalConnections(Integer maxTotalConnections) {
+        this.maxTotalConnections = maxTotalConnections;
+        return this;
+    }
+
+    public DockerCmdExecFactoryImpl withMaxPerRouteConnections(Integer maxPerRouteConnections) {
+        this.maxPerRouteConnections = maxPerRouteConnections;
+        return this;
+    }
+
+    public DockerCmdExecFactoryImpl withClientResponseFilters(ClientResponseFilter... clientResponseFilter) {
+        this.clientResponseFilters = clientResponseFilter;
+        return this;
+    }
+
+    public DockerCmdExecFactoryImpl withClientRequestFilters(ClientRequestFilter... clientRequestFilters) {
+        this.clientRequestFilters = clientRequestFilters;
+        return this;
+    }
+
 }
diff --git a/src/main/java/com/github/dockerjava/core/util/FollowRedirectsFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java
similarity index 96%
rename from src/main/java/com/github/dockerjava/core/util/FollowRedirectsFilter.java
rename to src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java
index e4ba60f90..be079d430 100644
--- a/src/main/java/com/github/dockerjava/core/util/FollowRedirectsFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.core.util;
+package com.github.dockerjava.jaxrs.filter;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/com/github/dockerjava/core/util/JsonClientFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java
similarity index 94%
rename from src/main/java/com/github/dockerjava/core/util/JsonClientFilter.java
rename to src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java
index fe8207cd9..2abc20618 100644
--- a/src/main/java/com/github/dockerjava/core/util/JsonClientFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.core.util;
+package com.github.dockerjava.jaxrs.filter;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/github/dockerjava/core/util/LoggingFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
similarity index 99%
rename from src/main/java/com/github/dockerjava/core/util/LoggingFilter.java
rename to src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
index 96b028b5f..0ba33ec82 100644
--- a/src/main/java/com/github/dockerjava/core/util/LoggingFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.core.util;
+package com.github.dockerjava.jaxrs.filter;
 
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
diff --git a/src/main/java/com/github/dockerjava/core/util/ResponseStatusExceptionFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
similarity index 98%
rename from src/main/java/com/github/dockerjava/core/util/ResponseStatusExceptionFilter.java
rename to src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
index 24f31fb14..fc01327c2 100644
--- a/src/main/java/com/github/dockerjava/core/util/ResponseStatusExceptionFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.core.util;
+package com.github.dockerjava.jaxrs.filter;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/src/main/java/com/github/dockerjava/core/util/SelectiveLoggingFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
similarity index 96%
rename from src/main/java/com/github/dockerjava/core/util/SelectiveLoggingFilter.java
rename to src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
index d4c9b8400..a93085987 100644
--- a/src/main/java/com/github/dockerjava/core/util/SelectiveLoggingFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.core.util;
+package com.github.dockerjava.jaxrs.filter;
 
 import java.io.IOException;
 import java.util.Collections;
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
index d520e1d65..9597b97d7 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
@@ -17,15 +17,15 @@ public class DockerClientConfigTest {
     public static final DockerClientConfig EXAMPLE_CONFIG = newExampleConfig();
 
     private static DockerClientConfig newExampleConfig() {
-        return new DockerClientConfig(URI.create("http://foo"), "bar", "baz", "qux", "blam", "wham", "flam", 877,
-                false, false, new LocalDirectorySSLConfig("flim"), 20, 2);
+        return new DockerClientConfig(URI.create("http://foo"), "bar", "baz", "qux", "blam", "wham", "flam",
+                new LocalDirectorySSLConfig("flim"));
     }
 
     @Test
     public void string() throws Exception {
         assertEquals(
-                "DockerClientConfig{uri=http://foo, version='bar', username='baz', password='qux', email='blam', serverAddress='wham', dockerCfgPath='flam', sslConfig='LocalDirectorySSLConfig{dockerCertPath=flim}', readTimeout=877, loggingFilterEnabled=false, followRedirectsFilterEnabled=false}",
-                EXAMPLE_CONFIG.toString());
+                EXAMPLE_CONFIG.toString(),
+                "DockerClientConfig{uri=http://foo, version='bar', username='baz', password='qux', email='blam', serverAddress='wham', dockerCfgPath='flam', sslConfig='LocalDirectorySSLConfig{dockerCertPath=flim}'}");
     }
 
     @Test
@@ -160,7 +160,6 @@ public void defaults() throws Exception {
         assertEquals(config.getUsername(), "someUserName");
         assertEquals(config.getServerAddress(), AuthConfig.DEFAULT_SERVER_ADDRESS);
         assertEquals(config.getVersion(), null);
-        assertEquals(config.isLoggingFilterEnabled(), true);
         assertEquals(config.getDockerCfgPath(), "someHomeDir/.dockercfg");
         assertEquals(((LocalDirectorySSLConfig) config.getSslConfig()).getDockerCertPath(), "someHomeDir/.docker");
     }
@@ -178,8 +177,6 @@ public void systemProperties() throws Exception {
         systemProperties.setProperty("docker.io.serverAddress", "wham");
         systemProperties.setProperty("docker.io.dockerCertPath", "flim");
         systemProperties.setProperty("docker.io.dockerCfgPath", "flam");
-        systemProperties.setProperty("docker.io.readTimeout", "877");
-        systemProperties.setProperty("docker.io.enableLoggingFilter", "false");
 
         // when you build new config
         DockerClientConfig config = buildConfig(Collections.<String, String> emptyMap(), systemProperties);
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
index a2a77734f..8a9879470 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
@@ -10,8 +10,7 @@ public class DockerClientImplTest {
     @Test
     public void configuredInstanceAuthConfig() throws Exception {
         // given a config with null serverAddress
-        DockerClientConfig dockerClientConfig = new DockerClientConfig(null, null, "", "", "", null, null, 0, false,
-                false, null, 20, 2);
+        DockerClientConfig dockerClientConfig = new DockerClientConfig(null, null, "", "", "", null, null,null);
         DockerClientImpl dockerClient = DockerClientImpl.getInstance(dockerClientConfig);
 
         // when we get the auth config

From ae6027ce50718b43e9bee03fdce9097ebd97b4bf Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 28 Jul 2015 21:08:40 +0200
Subject: [PATCH 0159/1272] Added GZIP compression for build context creation

---
 .../github/dockerjava/core/CompressArchiveUtil.java |  5 ++++-
 .../core/async/ResultCallbackTemplate.java          |  2 +-
 .../dockerjava/core/CompressArchiveUtilTest.java    |  5 ++++-
 .../core/command/BuildImageCmdImplTest.java         | 13 +++++++++++++
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
index 6a1a54809..cf089e33c 100644
--- a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
+++ b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
@@ -2,9 +2,11 @@
 
 import static com.github.dockerjava.core.FilePathUtil.relativize;
 
+import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.zip.GZIPOutputStream;
 
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
@@ -16,7 +18,8 @@ public static File archiveTARFiles(File base, Iterable<File> files, String archi
             throws IOException {
         File tarFile = new File(FileUtils.getTempDirectoryPath(), archiveNameWithOutExtension + ".tar");
         tarFile.deleteOnExit();
-        TarArchiveOutputStream tos = new TarArchiveOutputStream(new FileOutputStream(tarFile));
+        TarArchiveOutputStream tos = new TarArchiveOutputStream(new GZIPOutputStream(
+                new BufferedOutputStream(new FileOutputStream(tarFile))));
         try {
             tos.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
             for (File file : files) {
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index d94ce1950..857ca9177 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -63,10 +63,10 @@ public void onComplete() {
 
     @Override
     public void close() throws IOException {
+        closed = true;
         if (stream != null)
             stream.close();
         completed.countDown();
-        closed = true;
     }
 
     /**
diff --git a/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java b/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
index 827f8d3be..90ca91fca 100644
--- a/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
+++ b/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
@@ -5,10 +5,12 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.zip.GZIPInputStream;
 
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
@@ -43,7 +45,8 @@ private File extractFileByName(File archive, String filenameToExtract) throws IO
         expectedFile.delete();
         assertThat(expectedFile.exists(), is(false));
 
-        TarArchiveInputStream tarArchiveInputStream = new TarArchiveInputStream(new FileInputStream(archive));
+        TarArchiveInputStream tarArchiveInputStream = new TarArchiveInputStream(new GZIPInputStream(
+                new BufferedInputStream(new FileInputStream(archive))));
         TarArchiveEntry entry;
         while ((entry = tarArchiveInputStream.getNextTarEntry()) != null) {
             String individualFiles = entry.getName();
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 6d2b4c805..5385287ef 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -225,4 +225,17 @@ public void testAddAndCopySubstitution() throws Exception {
         String response = dockerfileBuild(baseDir);
         assertThat(response, containsString("testENVSubstitution successfully completed"));
     }
+    
+    @Test
+    public void testBuilderPerformance() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("nginx").getFile());
+
+        String imageId = buildImage(baseDir);
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        assertThat(inspectImageResponse, not(nullValue()));
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+        assertThat(inspectImageResponse.getAuthor(), equalTo("Guillaume J. Charmes \"guillaume@dotcloud.com\""));
+    }
 }

From d8d394630d1baebf7da165236a22a2a2e070064f Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 30 Jul 2015 21:05:12 +0200
Subject: [PATCH 0160/1272] use try-with-resource

---
 .../com/github/dockerjava/core/CompressArchiveUtil.java    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
index cf089e33c..0a93af3d8 100644
--- a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
+++ b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
@@ -18,9 +18,8 @@ public static File archiveTARFiles(File base, Iterable<File> files, String archi
             throws IOException {
         File tarFile = new File(FileUtils.getTempDirectoryPath(), archiveNameWithOutExtension + ".tar");
         tarFile.deleteOnExit();
-        TarArchiveOutputStream tos = new TarArchiveOutputStream(new GZIPOutputStream(
-                new BufferedOutputStream(new FileOutputStream(tarFile))));
-        try {
+        try(TarArchiveOutputStream tos = new TarArchiveOutputStream(new GZIPOutputStream(
+                new BufferedOutputStream(new FileOutputStream(tarFile))))) {
             tos.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
             for (File file : files) {
                 TarArchiveEntry tarEntry = new TarArchiveEntry(file);
@@ -39,8 +38,6 @@ public static File archiveTARFiles(File base, Iterable<File> files, String archi
                 }
                 tos.closeArchiveEntry();
             }
-        } finally {
-            tos.close();
         }
 
         return tarFile;

From aef0aa8bd698071aa2ca9a3bfb839dec1b8078c5 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 30 Jul 2015 21:07:21 +0200
Subject: [PATCH 0161/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c86c3cc8..ea9156c2a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ Change Log
 
 Latest SNAPSHOT
 ---
+* [#284](https://github.com/docker-java/docker-java/pull/284) Added GZIP compression for build context creation
 * [#280](https://github.com/docker-java/docker-java/pull/280) Handle multiple source files in ADD command 
 * [#278](https://github.com/docker-java/docker-java/pull/278) Stop leaking tar files in temporary folder
 * [#275](https://github.com/docker-java/docker-java/pull/275) Implemented LogConfig (create and inspect containers) 

From 8eb28d3b66f8d0920fe22461bfc3e56f90fb9b30 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 31 Jul 2015 21:57:11 +0200
Subject: [PATCH 0162/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea9156c2a..455e2a8ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,9 @@ Change Log
 
 Latest SNAPSHOT
 ---
+
 * [#284](https://github.com/docker-java/docker-java/pull/284) Added GZIP compression for build context creation
+* [#282](https://github.com/docker-java/docker-java/pull/282) Remove JAXRS/ApacheConnector implementation specific properties from DockerClientConfig
 * [#280](https://github.com/docker-java/docker-java/pull/280) Handle multiple source files in ADD command 
 * [#278](https://github.com/docker-java/docker-java/pull/278) Stop leaking tar files in temporary folder
 * [#275](https://github.com/docker-java/docker-java/pull/275) Implemented LogConfig (create and inspect containers) 

From eebc1bf0f9a11774b5de03161e32abba2b3068a0 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 31 Jul 2015 22:26:00 +0200
Subject: [PATCH 0163/1272] Switch to version 2.0.0-SNAPSHOT due to
 incompatible API changes

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7618263ae..ecb4812af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>1.4.1-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>

From f27f113cb6d4cd482bc99de6bca76b5526e69ed7 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 31 Jul 2015 22:26:55 +0200
Subject: [PATCH 0164/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 455e2a8ba..b2d52c002 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Change Log
 ===
 
-Latest SNAPSHOT
+v.2.0.0
 ---
 
 * [#284](https://github.com/docker-java/docker-java/pull/284) Added GZIP compression for build context creation

From 5c4a5ccb6fe20762b5b3cb4144e0d883676bb40d Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 31 Jul 2015 22:30:41 +0200
Subject: [PATCH 0165/1272] [maven-release-plugin] prepare release
 docker-java-2.0.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ecb4812af..3be438999 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.0.0</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>docker-java-2.0.0</tag>
 	</scm>
 
 	<developers>

From 46077cfdd285709cba43168e63d69dbe2440e190 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 31 Jul 2015 22:30:45 +0200
Subject: [PATCH 0166/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3be438999..a6c343ce6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>2.0.0</version>
+	<version>2.0.1-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>docker-java-2.0.0</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From fdcd43d428f5247debb2cdaa5359cd0f703257cc Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 31 Jul 2015 22:40:33 +0200
Subject: [PATCH 0167/1272] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5c6c55d31..558b71f65 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 [![Build Status](https://travis-ci.org/docker-java/docker-java.svg?branch=master)](https://travis-ci.org/docker-java/docker-java)
-[![Circle CI](https://circleci.com/gh/docker-java/docker-java.svg?style=svg)](https://circleci.com/gh/docker-java/docker-java)
+<!--[![Circle CI](https://circleci.com/gh/docker-java/docker-java.svg?style=svg)](https://circleci.com/gh/docker-java/docker-java)-->
 # docker-java 
 
 Java API client for [Docker](http://docs.docker.io/ "Docker")

From 9a909e50bd5987c5e5e9099dd1f77ebcb88ac8de Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 31 Jul 2015 22:45:56 +0200
Subject: [PATCH 0168/1272] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 558b71f65..6c05fbc68 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ Run build without integration tests:
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>1.4.0</version>
+          <version>2.0.0</version>
     </dependency>
 
 ### Latest SNAPSHOT version
@@ -74,7 +74,7 @@ You can find the latest SNAPSHOT version including javadoc and source files on [
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>1.4.1-SNAPSHOT</version>
+          <version>2.0.1-SNAPSHOT</version>
     </dependency>
 
 ## Documentation

From 08e15d9fcaffacf59c47b3fecc5a027a2249dee1 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 31 Jul 2015 23:33:12 +0200
Subject: [PATCH 0169/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2d52c002..fe47ddcfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@ Change Log
 
 v.2.0.0
 ---
+Release notes
+
+* Some commands APIs has been changed to be callback-driven now to simplify the processing of the result streams for the client application. This affects namely the events, log, attach, build, push and pull commands. Look at the Wiki how to [process events](https://github.com/docker-java/docker-java/wiki#handle-events) or how to [build an image](https://github.com/docker-java/docker-java/wiki#build-image-from-dockerfile) from dockerfile for example.
+* The `DockerClientConfig` API has changed to free it from implementation specific configuration options like `readTimeout`, `maxTotalConnections`, `maxPerRouteConnections` and `enableLoggingFilter`. Most options can be configured via `DockerCmdExecFactoryImpl` [programmaticaly](https://github.com/docker-java/docker-java/wiki#intialize-docker-client-advanced) now. Logging is configurable via [logback](https://github.com/docker-java/docker-java/blob/master/src/test/resources/logback.xml) configuration file in the classpath.
+
+All changes
 
 * [#284](https://github.com/docker-java/docker-java/pull/284) Added GZIP compression for build context creation
 * [#282](https://github.com/docker-java/docker-java/pull/282) Remove JAXRS/ApacheConnector implementation specific properties from DockerClientConfig

From 8dce17cd43d903b145000e26b2e7ccb52df0e6d3 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 31 Jul 2015 23:34:02 +0200
Subject: [PATCH 0170/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe47ddcfa..016cff47e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ v.2.0.0
 Release notes
 
 * Some commands APIs has been changed to be callback-driven now to simplify the processing of the result streams for the client application. This affects namely the events, log, attach, build, push and pull commands. Look at the Wiki how to [process events](https://github.com/docker-java/docker-java/wiki#handle-events) or how to [build an image](https://github.com/docker-java/docker-java/wiki#build-image-from-dockerfile) from dockerfile for example.
-* The `DockerClientConfig` API has changed to free it from implementation specific configuration options like `readTimeout`, `maxTotalConnections`, `maxPerRouteConnections` and `enableLoggingFilter`. Most options can be configured via `DockerCmdExecFactoryImpl` [programmaticaly](https://github.com/docker-java/docker-java/wiki#intialize-docker-client-advanced) now. Logging is configurable via [logback](https://github.com/docker-java/docker-java/blob/master/src/test/resources/logback.xml) configuration file in the classpath.
+* The `DockerClientConfig` API has changed to free it from implementation specific configuration options like `readTimeout`, `maxTotalConnections`, `maxPerRouteConnections` and `enableLoggingFilter`. Most options can be configured via `DockerCmdExecFactoryImpl` [programmatically](https://github.com/docker-java/docker-java/wiki#intialize-docker-client-advanced) now. Logging is configurable via [logback](https://github.com/docker-java/docker-java/blob/master/src/test/resources/logback.xml) configuration file in the classpath.
 
 All changes
 

From 5d6d95ca76a810701174f5be048a130e846636f4 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 31 Jul 2015 23:36:44 +0200
Subject: [PATCH 0171/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 016cff47e..19af87f0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ v.2.0.0
 ---
 Release notes
 
-* Some commands APIs has been changed to be callback-driven now to simplify the processing of the result streams for the client application. This affects namely the events, log, attach, build, push and pull commands. Look at the Wiki how to [process events](https://github.com/docker-java/docker-java/wiki#handle-events) or how to [build an image](https://github.com/docker-java/docker-java/wiki#build-image-from-dockerfile) from dockerfile for example.
+* Some commands APIs has been changed to be callback-driven now to simplify the processing of the result streams for the client application. This affects namely the events, stats, log, attach, build, push and pull commands. Look at the Wiki how to [process events](https://github.com/docker-java/docker-java/wiki#handle-events) or how to [build an image](https://github.com/docker-java/docker-java/wiki#build-image-from-dockerfile) from dockerfile for example.
 * The `DockerClientConfig` API has changed to free it from implementation specific configuration options like `readTimeout`, `maxTotalConnections`, `maxPerRouteConnections` and `enableLoggingFilter`. Most options can be configured via `DockerCmdExecFactoryImpl` [programmatically](https://github.com/docker-java/docker-java/wiki#intialize-docker-client-advanced) now. Logging is configurable via [logback](https://github.com/docker-java/docker-java/blob/master/src/test/resources/logback.xml) configuration file in the classpath.
 
 All changes

From f7b902ffb59144039aa534c43ae7a14b7cfce866 Mon Sep 17 00:00:00 2001
From: Alex Tomovski <alext@wix.com>
Date: Tue, 4 Aug 2015 06:58:07 +0300
Subject: [PATCH 0172/1272] Using the oomKillDisable flag throws a null pointer
 exception.

---
 .../github/dockerjava/core/command/CreateContainerCmdImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index e522266c3..f29c5c05f 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -631,7 +631,7 @@ public CreateContainerCmd withNetworkMode(String networkMode) {
     public CreateContainerCmd withOomKillDisable(Boolean oomKillDisable) {
         checkNotNull(oomKillDisable, "oomKillDisable was not specified");
         this.oomKillDisable = oomKillDisable;
-        return null;
+        return this;
     }
 
     @Override

From 79a6b60597b451432defbd9217fa975bb0a6a2a4 Mon Sep 17 00:00:00 2001
From: Khva0 <roman@vasylyshyn.name>
Date: Mon, 10 Aug 2015 18:56:24 +0300
Subject: [PATCH 0173/1272] Add Memory, MemorySwap and CpuShares mappings to
 HostConfig

---
 .../dockerjava/api/model/HostConfig.java      | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 5d4074eb9..9b31e05a9 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -66,6 +66,15 @@ public class HostConfig {
     @JsonProperty("Ulimits")
     private Ulimit[] ulimits;
 
+    @JsonProperty("Memory")
+    private long memoryLimit = 0;
+
+    @JsonProperty("MemorySwap")
+    private long memorySwap = 0;
+
+    @JsonProperty("CpuShares")
+    private int cpuShares = 0;
+
     public HostConfig() {
     }
 
@@ -173,6 +182,18 @@ public Ulimit[] getUlimits() {
         return ulimits;
     }
 
+    public long getMemoryLimit() {
+        return memoryLimit;
+    }
+
+    public long getMemorySwap() {
+        return memorySwap;
+    }
+
+    public int getCpuShares() {
+        return cpuShares;
+    }
+
     @JsonIgnore
     public void setBinds(Bind... binds) {
         this.binds = new Binds(binds);

From 9cfdf0ca3939a220ea61779371d7dc3532d00f10 Mon Sep 17 00:00:00 2001
From: Khva0 <roman@vasylyshyn.name>
Date: Mon, 10 Aug 2015 18:56:49 +0300
Subject: [PATCH 0174/1272] Remove Memory, MemorySwap and CpuShares mappings
 from ContainerConfig

---
 .../dockerjava/api/model/ContainerConfig.java | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
index 29b2af38e..34cb71d4d 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
@@ -28,12 +28,6 @@ public class ContainerConfig {
     @JsonProperty("Cmd")
     private String[] cmd;
 
-    @JsonProperty("CpuShares")
-    private int cpuShares = 0;
-
-    @JsonProperty("Cpuset")
-    private String cpuset = "";
-
     @JsonProperty("Domainname")
     private String domainName = "";
 
@@ -58,12 +52,6 @@ public class ContainerConfig {
     @JsonProperty("MacAddress")
     private String macAddress;
 
-    @JsonProperty("Memory")
-    private long memoryLimit = 0;
-
-    @JsonProperty("MemorySwap")
-    private long memorySwap = 0;
-
     @JsonProperty("NetworkDisabled")
     private boolean networkDisabled = false;
 
@@ -136,22 +124,6 @@ public String getMacAddress() {
         return macAddress;
     }
 
-    public long getMemoryLimit() {
-        return memoryLimit;
-    }
-
-    public long getMemorySwap() {
-        return memorySwap;
-    }
-
-    public int getCpuShares() {
-        return cpuShares;
-    }
-
-    public String getCpuset() {
-        return cpuset;
-    }
-
     public boolean isAttachStdin() {
         return attachStdin;
     }

From d9dc93562c574d9f9f16fa9dbc1803ffa5caf09d Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 13 Aug 2015 18:25:57 +0200
Subject: [PATCH 0175/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19af87f0e..68cc7f8e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Change Log
 ===
 
+Latest SNAPSHOT
+---
+* [#287] (https://github.com/docker-java/docker-java/pull/287) Using the oomKillDisable flag throws a null pointer exception
+
 v.2.0.0
 ---
 Release notes

From 35c28ddda8dd6217a7fdfc2002e3ac5141229a9b Mon Sep 17 00:00:00 2001
From: Chris Barbara <cbarbara@okta.com>
Date: Thu, 13 Aug 2015 16:26:20 -0700
Subject: [PATCH 0176/1272] Support certificate chains in cert.pem

Issue 294
---
 .../dockerjava/core/CertificateUtils.java     | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/CertificateUtils.java b/src/main/java/com/github/dockerjava/core/CertificateUtils.java
index 7490ba54e..13482b0a1 100644
--- a/src/main/java/com/github/dockerjava/core/CertificateUtils.java
+++ b/src/main/java/com/github/dockerjava/core/CertificateUtils.java
@@ -1,5 +1,11 @@
 package com.github.dockerjava.core;
 
+import org.apache.commons.io.IOUtils;
+import org.bouncycastle.cert.X509CertificateHolder;
+import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
+import org.bouncycastle.openssl.PEMKeyPair;
+import org.bouncycastle.openssl.PEMParser;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -16,12 +22,8 @@
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
-
-import org.apache.commons.io.IOUtils;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.openssl.PEMKeyPair;
-import org.bouncycastle.openssl.PEMParser;
+import java.util.ArrayList;
+import java.util.List;
 
 public class CertificateUtils {
 
@@ -41,13 +43,13 @@ public static boolean verifyCertificatesExist(String dockerCertPath) {
     public static KeyStore createKeyStore(final String dockerCertPath) throws NoSuchAlgorithmException,
             InvalidKeySpecException, IOException, CertificateException, KeyStoreException {
         KeyPair keyPair = loadPrivateKey(dockerCertPath);
-        Certificate privateCertificate = loadCertificate(dockerCertPath);
+        List<Certificate> privateCertificates = loadCertificates(dockerCertPath);
 
         KeyStore keyStore = KeyStore.getInstance("JKS");
         keyStore.load(null);
 
         keyStore.setKeyEntry("docker", keyPair.getPrivate(), "docker".toCharArray(),
-                new Certificate[] { privateCertificate });
+                privateCertificates.toArray(new Certificate[privateCertificates.size()]) );
         return keyStore;
     }
 
@@ -80,15 +82,25 @@ public static KeyStore createTrustStore(final String dockerCertPath) throws IOEx
 
     }
 
-    private static Certificate loadCertificate(final String dockerCertPath) throws IOException, CertificateException {
+    private static List<Certificate> loadCertificates(final String dockerCertPath) throws IOException, CertificateException {
         File certificate = new File(dockerCertPath, "cert.pem");
         BufferedReader reader = new BufferedReader(new FileReader(certificate));
         PEMParser pemParser = null;
 
         try {
+            List<Certificate> certificates = new ArrayList<>();
             pemParser = new PEMParser(reader);
-            X509CertificateHolder certificateHolder = (X509CertificateHolder) pemParser.readObject();
-            return new JcaX509CertificateConverter().setProvider("BC").getCertificate(certificateHolder);
+            JcaX509CertificateConverter certificateConverter = new JcaX509CertificateConverter().setProvider("BC");
+            Object certObj = pemParser.readObject();
+
+            while (certObj != null) {
+                X509CertificateHolder certificateHolder = (X509CertificateHolder) certObj;
+                certificates.add(certificateConverter.getCertificate(certificateHolder));
+
+                certObj = pemParser.readObject();
+            }
+
+            return certificates;
         } finally {
             if (pemParser != null) {
                 IOUtils.closeQuietly(pemParser);

From 3cb87ac724f429dd931741d1733f980073659006 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 14 Aug 2015 18:21:50 +0200
Subject: [PATCH 0177/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68cc7f8e2..81639f894 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ Change Log
 
 Latest SNAPSHOT
 ---
+* [#295] (https://github.com/docker-java/docker-java/pull/295) Support certificate chains in cert.pem
 * [#287] (https://github.com/docker-java/docker-java/pull/287) Using the oomKillDisable flag throws a null pointer exception
 
 v.2.0.0

From 63688e056a569e8426a65880cbf5b383c1b7c2f7 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sat, 15 Aug 2015 19:09:06 +0200
Subject: [PATCH 0178/1272] Format sources

---
 .../dockerjava/core/CertificateUtils.java      |  5 +++--
 .../dockerjava/core/CompressArchiveUtil.java   |  4 ++--
 .../dockerjava/core/DockerClientConfig.java    |  9 ++++-----
 .../core/async/ResultCallbackTemplate.java     |  3 ++-
 .../dockerjava/jaxrs/AbstrDockerCmdExec.java   |  3 ++-
 .../jaxrs/DockerCmdExecFactoryImpl.java        |  4 ++--
 .../client/AbstractDockerClientTest.java       |  4 ++--
 .../dockerjava/core/DockerClientImplTest.java  |  2 +-
 .../command/AttachContainerCmdImplTest.java    |  4 ++--
 .../core/command/LogContainerCmdImplTest.java  |  1 -
 .../core/command/PushImageCmdImplTest.java     |  8 ++------
 .../DockerfileAddMultipleFilesTest.java        |  4 +++-
 .../dockerfile/DockerfileStatementAddTest.java | 18 ++++++++----------
 13 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/CertificateUtils.java b/src/main/java/com/github/dockerjava/core/CertificateUtils.java
index 13482b0a1..465b06460 100644
--- a/src/main/java/com/github/dockerjava/core/CertificateUtils.java
+++ b/src/main/java/com/github/dockerjava/core/CertificateUtils.java
@@ -49,7 +49,7 @@ public static KeyStore createKeyStore(final String dockerCertPath) throws NoSuch
         keyStore.load(null);
 
         keyStore.setKeyEntry("docker", keyPair.getPrivate(), "docker".toCharArray(),
-                privateCertificates.toArray(new Certificate[privateCertificates.size()]) );
+                privateCertificates.toArray(new Certificate[privateCertificates.size()]));
         return keyStore;
     }
 
@@ -82,7 +82,8 @@ public static KeyStore createTrustStore(final String dockerCertPath) throws IOEx
 
     }
 
-    private static List<Certificate> loadCertificates(final String dockerCertPath) throws IOException, CertificateException {
+    private static List<Certificate> loadCertificates(final String dockerCertPath) throws IOException,
+            CertificateException {
         File certificate = new File(dockerCertPath, "cert.pem");
         BufferedReader reader = new BufferedReader(new FileReader(certificate));
         PEMParser pemParser = null;
diff --git a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
index 0a93af3d8..59dec59ef 100644
--- a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
+++ b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
@@ -18,8 +18,8 @@ public static File archiveTARFiles(File base, Iterable<File> files, String archi
             throws IOException {
         File tarFile = new File(FileUtils.getTempDirectoryPath(), archiveNameWithOutExtension + ".tar");
         tarFile.deleteOnExit();
-        try(TarArchiveOutputStream tos = new TarArchiveOutputStream(new GZIPOutputStream(
-                new BufferedOutputStream(new FileOutputStream(tarFile))))) {
+        try (TarArchiveOutputStream tos = new TarArchiveOutputStream(new GZIPOutputStream(new BufferedOutputStream(
+                new FileOutputStream(tarFile))))) {
             tos.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
             for (File file : files) {
                 TarArchiveEntry tarEntry = new TarArchiveEntry(file);
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index 800ed5772..ae8156748 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -177,8 +177,8 @@ private static Properties overrideDockerPropertiesWithSystemProperties(Propertie
 
         for (String key : new String[] { DOCKER_IO_URL_PROPERTY, DOCKER_IO_VERSION_PROPERTY,
                 DOCKER_IO_USERNAME_PROPERTY, DOCKER_IO_PASSWORD_PROPERTY, DOCKER_IO_EMAIL_PROPERTY,
-                DOCKER_IO_SERVER_ADDRESS_PROPERTY,
-                DOCKER_IO_DOCKER_CERT_PATH_PROPERTY, DOCKER_IO_DOCKER_CFG_PATH_PROPERTY, }) {
+                DOCKER_IO_SERVER_ADDRESS_PROPERTY, DOCKER_IO_DOCKER_CERT_PATH_PROPERTY,
+                DOCKER_IO_DOCKER_CFG_PATH_PROPERTY, }) {
             if (systemProperties.containsKey(key)) {
                 overriddenProperties.setProperty(key, systemProperties.getProperty(key));
             }
@@ -337,8 +337,7 @@ public int hashCode() {
     public String toString() {
         return "DockerClientConfig{" + "uri=" + uri + ", version='" + version + '\'' + ", username='" + username + '\''
                 + ", password='" + password + '\'' + ", email='" + email + '\'' + ", serverAddress='" + serverAddress
-                + '\'' + ", dockerCfgPath='" + dockerCfgPath + '\'' + ", sslConfig='" + sslConfig + '\''
-                + '}';
+                + '\'' + ", dockerCfgPath='" + dockerCfgPath + '\'' + ", sslConfig='" + sslConfig + '\'' + '}';
     }
 
     public static class DockerClientConfigBuilder {
@@ -415,7 +414,7 @@ public final DockerClientConfigBuilder withSSLConfig(SSLConfig config) {
 
         public DockerClientConfig build() {
             return new DockerClientConfig(uri, version, username, password, email, serverAddress, dockerCfgPath,
-                     sslConfig);
+                    sslConfig);
         }
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index 857ca9177..b5387ede0 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -38,7 +38,8 @@ public void onStart(Closeable stream) {
 
     @Override
     public void onError(Throwable throwable) {
-        if(closed) return;
+        if (closed)
+            return;
 
         try {
             LOGGER.error("Error during callback", throwable);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
index cd23dd8b1..4c0d36eaa 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
@@ -35,7 +35,8 @@ protected String registryAuth(AuthConfig authConfig) {
 
     protected String registryConfigs(AuthConfigurations authConfigs) {
         try {
-            return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfigs).getBytes());
+            String json = new ObjectMapper().writeValueAsString(authConfigs.getConfigs());
+            return Base64.encodeBase64String(json.getBytes());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index f3ad427f5..ef8d4e4fb 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -124,8 +124,8 @@ public void init(DockerClientConfig dockerClientConfig) {
 
         if (clientRequestFilters != null) {
             for (ClientRequestFilter clientRequestFilter : clientRequestFilters) {
-                if(clientRequestFilter != null)
-                clientConfig.register(clientRequestFilter);
+                if (clientRequestFilter != null)
+                    clientConfig.register(clientRequestFilter);
             }
         }
 
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 8ed9164da..e8dfa9bd7 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -186,8 +186,8 @@ public static void assertContainerHasVolumes(InspectContainerResponse inspectCon
     }
 
     protected String containerLog(String containerId) throws Exception {
-        return dockerClient.logContainerCmd(containerId).withStdOut()
-                .exec(new LogContainerTestCallback()).awaitCompletion().toString();
+        return dockerClient.logContainerCmd(containerId).withStdOut().exec(new LogContainerTestCallback())
+                .awaitCompletion().toString();
     }
 
     public static class LogContainerTestCallback extends LogContainerResultCallback {
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
index 8a9879470..c5a1e841c 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
@@ -10,7 +10,7 @@ public class DockerClientImplTest {
     @Test
     public void configuredInstanceAuthConfig() throws Exception {
         // given a config with null serverAddress
-        DockerClientConfig dockerClientConfig = new DockerClientConfig(null, null, "", "", "", null, null,null);
+        DockerClientConfig dockerClientConfig = new DockerClientConfig(null, null, "", "", "", null, null, null);
         DockerClientImpl dockerClient = DockerClientImpl.getInstance(dockerClientConfig);
 
         // when we get the auth config
diff --git a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
index 8fa5b2269..11a65aa14 100644
--- a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
@@ -94,8 +94,8 @@ public void onNext(Frame frame) {
             };
         };
 
-        dockerClient.attachContainerCmd(container.getId()).withStdErr().withStdOut().withFollowStream()
-                .exec(callback).awaitCompletion(15, TimeUnit.SECONDS).close();
+        dockerClient.attachContainerCmd(container.getId()).withStdErr().withStdOut().withFollowStream().exec(callback)
+                .awaitCompletion(15, TimeUnit.SECONDS).close();
 
         System.out.println("log: " + callback.toString());
 
diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
index 6d887f359..2e2dedb45 100644
--- a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
@@ -135,5 +135,4 @@ public void asyncMultipleLogContainer() throws Exception {
         assertTrue(loggingCallback.toString().contains(snippet));
     }
 
-
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
index bb42d5b4b..2f7e1c391 100644
--- a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
@@ -65,18 +65,14 @@ public void pushLatest() throws Exception {
         LOG.info("Removing image: {}", imageId);
         dockerClient.removeImageCmd(imageId).exec();
 
-        dockerClient.pullImageCmd(username + "/busybox")
-                .exec(new PullImageResultCallback()).awaitSuccess();
+        dockerClient.pullImageCmd(username + "/busybox").exec(new PullImageResultCallback()).awaitSuccess();
     }
 
     @Test(expectedExceptions = DockerClientException.class)
     public void pushNonExistentImage() throws Exception {
 
-        dockerClient.pushImageCmd(username + "/xxx").exec(new PushImageResultCallback())
-                .awaitSuccess();
-
+        dockerClient.pushImageCmd(username + "/xxx").exec(new PushImageResultCallback()).awaitSuccess();
 
     }
 
-
 }
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
index 65af93774..0752aded5 100644
--- a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
+++ b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
@@ -17,6 +17,7 @@
 public class DockerfileAddMultipleFilesTest extends TestCase {
 
     private static final Logger log = LoggerFactory.getLogger(DockerfileAddMultipleFilesTest.class);
+
     private static final Function<File, String> TO_FILE_NAMES = new Function<File, String>() {
         @Override
         public String apply(File file) {
@@ -26,7 +27,8 @@ public String apply(File file) {
 
     @Test
     public void testAddMultipleFiles() throws IOException {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddMultipleFiles").getFile());
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddMultipleFiles")
+                .getFile());
         Dockerfile dockerfile = new Dockerfile(new File(baseDir, "Dockerfile"));
         Dockerfile.ScannedResult result = dockerfile.parse();
         Collection<String> filesToAdd = transform(result.filesToAdd, TO_FILE_NAMES);
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
index 691137afd..133ed2eae 100644
--- a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
+++ b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
@@ -20,16 +20,14 @@ public class DockerfileStatementAddTest extends TestCase {
 
     @DataProvider(name = "valid scenarios")
     public Object[][] validScenarios() {
-        return new Object[][] {
-                {"ADD src dest", contains("src"), "dest"},
-                {"ADD \"src file\" \"dest\"", contains("src file"), "dest"},
-                {"ADD src\"file dest", contains("src\"file"), "dest"},
-                {"ADD src1 src2 dest", containsInAnyOrder("src1", "src2"), "dest"},
-                {"COPY src dest", contains("src"), "dest"},
-                {"COPY \"src file\" \"dest\"", contains("src file"), "dest"},
-                {"COPY src\"file dest", contains("src\"file"), "dest"},
-                {"COPY src1 src2 dest", containsInAnyOrder("src1", "src2"), "dest"}
-        };
+        return new Object[][] { { "ADD src dest", contains("src"), "dest" },
+                { "ADD \"src file\" \"dest\"", contains("src file"), "dest" },
+                { "ADD src\"file dest", contains("src\"file"), "dest" },
+                { "ADD src1 src2 dest", containsInAnyOrder("src1", "src2"), "dest" },
+                { "COPY src dest", contains("src"), "dest" },
+                { "COPY \"src file\" \"dest\"", contains("src file"), "dest" },
+                { "COPY src\"file dest", contains("src\"file"), "dest" },
+                { "COPY src1 src2 dest", containsInAnyOrder("src1", "src2"), "dest" } };
     }
 
     @Test(dataProvider = "valid scenarios")

From e580ea81c8dcf6cddf79ece70b782b4fc1bffa09 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sat, 15 Aug 2015 19:09:33 +0200
Subject: [PATCH 0179/1272] Fix for issue #288

---
 .../core/command/BuildImageCmdImplTest.java   | 60 ++++++++++++++++---
 src/test/resources/privateRegistry/Dockerfile |  3 +
 .../resources/privateRegistry/auth/htpasswd   |  2 +
 .../privateRegistry/certs/README.txt          |  2 +
 .../privateRegistry/certs/domain.crt          | 35 +++++++++++
 .../privateRegistry/certs/domain.key          | 52 ++++++++++++++++
 .../testBuildFromPrivateRegistry/Dockerfile   |  1 +
 7 files changed, 148 insertions(+), 7 deletions(-)
 create mode 100644 src/test/resources/privateRegistry/Dockerfile
 create mode 100644 src/test/resources/privateRegistry/auth/htpasswd
 create mode 100644 src/test/resources/privateRegistry/certs/README.txt
 create mode 100644 src/test/resources/privateRegistry/certs/domain.crt
 create mode 100644 src/test/resources/privateRegistry/certs/domain.key
 create mode 100644 src/test/resources/testBuildFromPrivateRegistry/Dockerfile

diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 5385287ef..2fcc22c94 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -10,7 +10,6 @@
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.util.Collection;
@@ -18,7 +17,6 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.TrueFileFilter;
-import org.apache.commons.lang.StringUtils;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -31,7 +29,11 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.command.InspectImageResponse;
-import com.github.dockerjava.api.model.BuildResponseItem;
+import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.AuthConfigurations;
+import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.PortBinding;
+import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import com.github.dockerjava.core.CompressArchiveUtil;
 
@@ -225,10 +227,10 @@ public void testAddAndCopySubstitution() throws Exception {
         String response = dockerfileBuild(baseDir);
         assertThat(response, containsString("testENVSubstitution successfully completed"));
     }
-    
+
     @Test
-    public void testBuilderPerformance() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("nginx").getFile());
+    public void testBuildFromPrivateRegistry() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("privateRegistry").getFile());
 
         String imageId = buildImage(baseDir);
 
@@ -236,6 +238,50 @@ public void testBuilderPerformance() throws Exception {
         assertThat(inspectImageResponse, not(nullValue()));
         LOG.info("Image Inspect: {}", inspectImageResponse.toString());
 
-        assertThat(inspectImageResponse.getAuthor(), equalTo("Guillaume J. Charmes \"guillaume@dotcloud.com\""));
+        dockerClient.tagImageCmd(imageId, "testregistry", "2").withForce().exec();
+
+        // see https://github.com/docker/distribution/blob/master/docs/deploying.md#native-basic-auth
+        CreateContainerResponse testregistry = dockerClient
+                .createContainerCmd("testregistry:2")
+                .withName("registry")
+                .withPortBindings(new PortBinding(new Ports.Binding(5000), ExposedPort.tcp(5000)))
+                .withEnv("REGISTRY_AUTH=htpasswd", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm",
+                        "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "REGISTRY_LOG_LEVEL=debug",
+                        "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key")
+                .exec();
+
+        dockerClient.startContainerCmd(testregistry.getId()).exec();
+
+        AuthConfig authConfig = new AuthConfig();
+
+        // credentials as configured in /auth/htpasswd
+        authConfig.setUsername("testuser");
+        authConfig.setPassword("testpassword");
+        authConfig.setEmail("foo@bar.de");
+        authConfig.setServerAddress("localhost:5000");
+
+        dockerClient.authCmd().withAuthConfig(authConfig).exec();
+        dockerClient.tagImageCmd("busybox:latest", "localhost:5000/testuser/busybox", "latest").withForce().exec();
+
+        dockerClient.pushImageCmd("localhost:5000/testuser/busybox").withTag("latest").withAuthConfig(authConfig)
+                .exec(new PushImageResultCallback()).awaitSuccess();
+
+        dockerClient.removeImageCmd("busybox:latest").withForce().exec();
+
+        dockerClient.removeImageCmd("localhost:5000/testuser/busybox").withForce().exec();
+
+        baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testBuildFromPrivateRegistry")
+                .getFile());
+
+        AuthConfigurations authConfigurations = new AuthConfigurations();
+        authConfigurations.addConfig(authConfig);
+
+        imageId = dockerClient.buildImageCmd(baseDir).withNoCache().withBuildAuthConfigs(authConfigurations)
+                .exec(new BuildImageResultCallback()).awaitImageId();
+
+        inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        assertThat(inspectImageResponse, not(nullValue()));
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
     }
 }
diff --git a/src/test/resources/privateRegistry/Dockerfile b/src/test/resources/privateRegistry/Dockerfile
new file mode 100644
index 000000000..35046d980
--- /dev/null
+++ b/src/test/resources/privateRegistry/Dockerfile
@@ -0,0 +1,3 @@
+FROM registry:2
+ADD auth/htpasswd /auth/htpasswd
+ADD certs/* /certs/
\ No newline at end of file
diff --git a/src/test/resources/privateRegistry/auth/htpasswd b/src/test/resources/privateRegistry/auth/htpasswd
new file mode 100644
index 000000000..3835b5d08
--- /dev/null
+++ b/src/test/resources/privateRegistry/auth/htpasswd
@@ -0,0 +1,2 @@
+# testuser:testpasswd (see see https://github.com/docker/distribution/blob/master/docs/deploying.md#native-basic-auth)
+testuser:$2y$05$gI1hyzOYeLU92o5/DjVtOOHtdGymYbkjqJipZNqPET.ChzXMsz2KS
diff --git a/src/test/resources/privateRegistry/certs/README.txt b/src/test/resources/privateRegistry/certs/README.txt
new file mode 100644
index 000000000..7e2abff9c
--- /dev/null
+++ b/src/test/resources/privateRegistry/certs/README.txt
@@ -0,0 +1,2 @@
+This directory contains self signed certificate for docker registry with CN: "localhost". For testing purposes only.
+See https://github.com/docker/distribution/blob/master/docs/insecure.md#using-self-signed-certificates
diff --git a/src/test/resources/privateRegistry/certs/domain.crt b/src/test/resources/privateRegistry/certs/domain.crt
new file mode 100644
index 000000000..159cd1cf8
--- /dev/null
+++ b/src/test/resources/privateRegistry/certs/domain.crt
@@ -0,0 +1,35 @@
+-----BEGIN CERTIFICATE-----
+MIIGHzCCBAegAwIBAgIJALeUCTgohkuvMA0GCSqGSIb3DQEBCwUAMIGlMQswCQYD
+VQQGEwJERTEQMA4GA1UECAwHSGFtYnVyZzEQMA4GA1UEBwwHSGFtYnVyZzEUMBIG
+A1UECgwLZG9ja2VyLWphdmExFDASBgNVBAsMC2RvY2tlci1qYXZhMRIwEAYDVQQD
+DAlsb2NhbGhvc3QxMjAwBgkqhkiG9w0BCQEWI2RvY2tlci1qYXZhLW1haW50YWlu
+QGdvb2dsZW1haWwuY29tMB4XDTE1MDgxNDE3NDkyN1oXDTE2MDgxMzE3NDkyN1ow
+gaUxCzAJBgNVBAYTAkRFMRAwDgYDVQQIDAdIYW1idXJnMRAwDgYDVQQHDAdIYW1i
+dXJnMRQwEgYDVQQKDAtkb2NrZXItamF2YTEUMBIGA1UECwwLZG9ja2VyLWphdmEx
+EjAQBgNVBAMMCWxvY2FsaG9zdDEyMDAGCSqGSIb3DQEJARYjZG9ja2VyLWphdmEt
+bWFpbnRhaW5AZ29vZ2xlbWFpbC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQC/Y6Zn5H/K6nSfNDyNUL8Dl+h8/cLi4QAIRSTp5YIy1VtWbECPF5bj
+2TnIB8GK0r40OMbc2c0KYPPNjmeP47pUKPawkoIFQCe+ErvpYqSKD0C6L3Gn2BOp
+Cd/K6mgrsgAPaaGpm4p2+bBCLioLYSLFg3St3GSl+TkcylDzBlIDliWLyfqQletg
+a7C01RoAfzgcXD551TD+ShbB9ybUWnhZuAhj10WN4YajCBpxv1jBbEHj3JQlnmkG
+bOXLsA+nFrkFOyvyKTNz4Ncuj6FxmGs3eqP2FwWcowkAA8Eq2n2TSP4bVojlxWeX
+qdBbaejEcWvItGTQ3GyzQ0+4mGwyfghDACdx1dT3HdaXzS+Y+oP17ijcVkDhbKCo
+GFgwyN+t4fS2AsTaZ6LXfP9PXzwZd2usj6bMZ/DOMKgmVaK9eYXhP9vjwYYoQIiX
+Vh4Lh+O94SG2j6AQPbixEj/3yJLf9owBkUUc/mgOCVgLSNgzBpTXKUlLASh35DSQ
+xH6gJ87ljtHk+A8EVXFCDYf9T6b0y3okVBkbnliP/nr4TFbWr91+wHk/OyfTbZYY
+uIc288HbC5d2qUGnDV7vMn5Rh8a1gqdZ8onbVuX65D9WQ7WtMMwbAEsMYihmj2WC
+AzLHuWmDy6WBd8WRHSJLh+o5zqRi25YDJyNiKb/tXESf580OhqYL1QIDAQABo1Aw
+TjAdBgNVHQ4EFgQUWQykHhTnePyTnsym33ex9u+6CKQwHwYDVR0jBBgwFoAUWQyk
+HhTnePyTnsym33ex9u+6CKQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
+AgEAB9fdGw8lJ7tZWa54xcwUuAFiQJCpJ5D3arKv80Oy+uDWlp4+8ezUnytKj6u4
+G4T6jNFhgWM9GFaxeuKPIzx4WO0pFB6bSHQ6lXUOrcn8umFcPzzSyIAdzNYxIVv8
+HXvy450XQKVMZPp9EvTgKmF+cDGKrOXlHMpl4lDjUJTuoKFjNB/eA9ropLfD4mvY
+uaerHfJRlPUOvKrg0BwRVpaqZdPxULWmnaM5tmYSgQ8gpQab71w8J7Sere6+x+jc
+sI0pXVHvsSUOGWY8/Juc7yhV1uYmuA8FBgyn8p38HrErwQDyQJfw5YD9jY+oa+vK
+r6qqR9reaJtEipMT9aVY81cH040hZEKjm9Y5U3G+1YKWiHZYRL7pettzEaAh/PW1
+1SBgBg611BRrscR4MZ1AAbVh+Wn895Vpa61ZDsA/jIvaGQ1+EmikzWawBiOo4voX
+ftUK8nViSBtnwaZ1DwdcEtPKwD8YYWSoBC/tEc6ErjnVXjYBEZc+BaSu+LQUz12t
+IK6WvJf6uA+CTUuU9WvVTZtBI98p09ikGNjqM7scaP9BiOeRZQskVNU0MfCblgn/
+FugrJHHUzCNyOQpRktl7L2bULDfaHgjlNCbLc9e2NmW/pTTxBShESWxtNyFmPGGY
+eiv/xHjlgJzNvHAoHrFj7szAiDQOncRTYeW1k1fe4WVmli8=
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/src/test/resources/privateRegistry/certs/domain.key b/src/test/resources/privateRegistry/certs/domain.key
new file mode 100644
index 000000000..460a206e1
--- /dev/null
+++ b/src/test/resources/privateRegistry/certs/domain.key
@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+MIIJRAIBADANBgkqhkiG9w0BAQEFAASCCS4wggkqAgEAAoICAQC/Y6Zn5H/K6nSf
+NDyNUL8Dl+h8/cLi4QAIRSTp5YIy1VtWbECPF5bj2TnIB8GK0r40OMbc2c0KYPPN
+jmeP47pUKPawkoIFQCe+ErvpYqSKD0C6L3Gn2BOpCd/K6mgrsgAPaaGpm4p2+bBC
+LioLYSLFg3St3GSl+TkcylDzBlIDliWLyfqQletga7C01RoAfzgcXD551TD+ShbB
+9ybUWnhZuAhj10WN4YajCBpxv1jBbEHj3JQlnmkGbOXLsA+nFrkFOyvyKTNz4Ncu
+j6FxmGs3eqP2FwWcowkAA8Eq2n2TSP4bVojlxWeXqdBbaejEcWvItGTQ3GyzQ0+4
+mGwyfghDACdx1dT3HdaXzS+Y+oP17ijcVkDhbKCoGFgwyN+t4fS2AsTaZ6LXfP9P
+XzwZd2usj6bMZ/DOMKgmVaK9eYXhP9vjwYYoQIiXVh4Lh+O94SG2j6AQPbixEj/3
+yJLf9owBkUUc/mgOCVgLSNgzBpTXKUlLASh35DSQxH6gJ87ljtHk+A8EVXFCDYf9
+T6b0y3okVBkbnliP/nr4TFbWr91+wHk/OyfTbZYYuIc288HbC5d2qUGnDV7vMn5R
+h8a1gqdZ8onbVuX65D9WQ7WtMMwbAEsMYihmj2WCAzLHuWmDy6WBd8WRHSJLh+o5
+zqRi25YDJyNiKb/tXESf580OhqYL1QIDAQABAoICAQC/EuiubmTbG8mErC0L1KJv
+Hvjf2KT5xzI2D3nz/ctHntSKapblhOKC5XsXZg7m3tE/57M6CEP5aaPeA58G+48p
+uJ/Y1tvyDAPhcmiib3Xf06yGdRlePY4bRB1mQzHu9c2zlXztjLjnYQ6Ec/xL0hVZ
+5YzWiuL9BNztDltU1WmJ5Rvk/KgoM1SDtd/8GYjVGC3XuowxLBO2vBcOXQYqGYxv
+3hiaPPBW3uKA33UvPJ6KtN7vc2eASy+FV7Dv8v0djsT3IQUVxeZ1ePK7rG+8rjPU
+dp887+0NXYN9vUHb27hlFAmFF5ai9rseok2/BfR6MtYt0VOZZYcsTTZJD/ttSYBK
+T/S1sIu6pgb5Yb39ZjRDGEfWTop3iLC2euAhhY6NDOXHxPtPPye3W/qZu4uE+vpT
+nptw1/1yy4gg2gjkK63HDxNLHQqQODJSJv08gh9KY9gVFCLKxshbYwtSPFd6CpaW
+CHIT73D7/5yBTTX2uVnZfcRSKUXt9jrCNTYqXoSBGNrYDNzh9U1cZ/ZwTxVODaO2
+1cT6mzREIfuOvUqIaYLreSuM0TVBx68QZ8wNTI2SOijSDWzf8nOiKJhHe1yF3ybR
+Xtz2J9/rVeyYedYUSdcIu52o5VqcZMgcSVtWJe5hhe/rbfz9k6Iey8DkKFWxMr2y
+F2ID2kINOFL8D72I3/16nQKCAQEA8wI/2z2SC4zq8rbVqa2NXtvxIv8lzbc/D1PC
+X0xIw+jPW4FgfrmCkt0z/yofvKKLiVq71mIclBc9zFQKZlCEXMrVzxQh7x1bfu2V
+JxMKeiixqevrEt+tCc29ILqmhmH6TfbDEiSaSs3KvTaABpvbgC/iCLbpN6QRCnsu
+6qO/ViXiUAqsg6dDJixyerE+0KdKAS4fvXdAC0xNPtcXCfEXUEB0XriJDtn/8jhR
+9O+bZPesXCNH9l3PHhrfxE0qyxOAM/iZJtaQjnBJ+gMNxozqqnrwHZAQ9WL8xYZq
+B/5eQoYdpvlBLxJc5aWJuZInJZ/wnJo58WlaA5JwCeXTBqih3wKCAQEAyZ7zORsa
+7Yqxnr9ttdz5ASGQffcvYyQube8ADsNdj3B3BNeCjg9lT0pthEHZNrKdBDAfcFeE
+w9dmndeKEH9IC4CaYc7k364ndlyaVHu/YdhnV6HkoEv46WWLEss2neuGhHZ5T90p
+jO8Dv4EdciYhsGCj0HG/hNIqvIUd26KCfuFqEojuaoyGgLXLSGBWaO8bqL4Kt+ZP
+s9R/pIGXtzBJ08Fe9ZO5nEn6/P9LoR02M/HPXv3qJs0lvocemRLQjBb8CDe1vYV3
+d3Qt6FFdo9XvxS1DsQ8phTFQu0I70/8R6Jnaoo2QI0Z6AKVynSdC94+Y4JsGc/OW
+fqLXERAE7qhQywKCAQEAmz3Fo36a7QwSEAojRulbVc02KABNmzTEcTs2AgFOvvDc
+fv2QsoQ6WS49CHZVngFNGOtA8jztOuH6Fa1ek2w+krT1j/uxjfr4N4b5cOPmHpIe
+pYnUO9NuzMOFXgI/Xbv71pCcn9uIQd9j9Cp78TziJerxAFYxeN00EbkOCNGg6xz6
+jd2zxcs1x44/eAgBM/Sa/1QC7NvgqxcMheeMjUpadWcnsFc9H6K+snOuT8Y+RGtA
+zf+v+kCFjxrl9pbBjsgfb5QR6tDJumUbrT8ELuJZC53MBWbCnrClAF7VH9QtTVw2
+VzQGo1acyAxPhqBKp+ucH78a4xFFcuC6+Ge8vxU9iwKCAQBG/StAKRYDGzlM3rPf
+O62Ew2+fmn/Z1Wxvkp4flJQFpCCT2NmD8VHHaDpFPfYf9yWnytXW9UmuttHPs4tO
+IbKZMi+pTnJxe10zpIlGQ8fvyIUiasMX2YgLjZA5DsntMndLfndaMlGl6KYWMHzQ
+qzJjarNi+hnnxyP6+pe3tHFkATQa0JG5fD8DZH7tvdXO3pmLgVY+x926QJCsuGBV
+xK/J2iT4LIpGyBmSKMVVNfbWtUZBeP+Pp92pRuP0G5bILHOS5SKdVzfoHETprnRc
+8j+Y2kYiOmdxGRsGw9xS2VVR45ICd/uPIApm3doMET3X8nxuYMcV3mdXsTguLsi9
+yw+fAoIBAQC80GMgjuVk6nE8wSeahoWPMM9kxo8XDmBht//cXIzgKKGkvnUBbxPo
+G17lD4nBtmENYOTRAqvwlbO0WWLIeDFXoYfo3cvoGBk0VxnhlLph6i+Dyk8e7vYf
+DAkYESffS5pyt1Iza25u7XW9AvEoSojzSxVOQAZgejIwRohF4OqwHlGZwyl933Ne
+BVPTVqmMrNnFdD1u/zM5b5/hjJcSPpqP+ERokt/WSz5no4IV71F0C2JwNYw13wnN
+N5V/GhcifuEi9ZtSq+ydxSFvBbtgCdQOPXBDUfsFWvrBswknJ9xPv8K0KLCvvtVb
+mNBmSA/sL18D7k8x9HykstMQh0O2ZurT
+-----END PRIVATE KEY-----
\ No newline at end of file
diff --git a/src/test/resources/testBuildFromPrivateRegistry/Dockerfile b/src/test/resources/testBuildFromPrivateRegistry/Dockerfile
new file mode 100644
index 000000000..b3d914c6c
--- /dev/null
+++ b/src/test/resources/testBuildFromPrivateRegistry/Dockerfile
@@ -0,0 +1 @@
+FROM      localhost:5000/testuser/busybox:latest

From b34135d388f7cadd9445384c4cf756ce57121385 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sat, 15 Aug 2015 19:13:03 +0200
Subject: [PATCH 0180/1272] Fix wrong comment

---
 src/test/resources/privateRegistry/auth/htpasswd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/resources/privateRegistry/auth/htpasswd b/src/test/resources/privateRegistry/auth/htpasswd
index 3835b5d08..59a40620e 100644
--- a/src/test/resources/privateRegistry/auth/htpasswd
+++ b/src/test/resources/privateRegistry/auth/htpasswd
@@ -1,2 +1,2 @@
-# testuser:testpasswd (see see https://github.com/docker/distribution/blob/master/docs/deploying.md#native-basic-auth)
+# testuser:testpassword (see see https://github.com/docker/distribution/blob/master/docs/deploying.md#native-basic-auth)
 testuser:$2y$05$gI1hyzOYeLU92o5/DjVtOOHtdGymYbkjqJipZNqPET.ChzXMsz2KS

From 12818cc56f7659ff8912bffe2f3f14ea37c12bf9 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 16 Aug 2015 12:31:11 +0200
Subject: [PATCH 0181/1272] Fix test

---
 .../github/dockerjava/core/command/BuildImageCmdImplTest.java   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 2fcc22c94..2fb1c545b 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -266,8 +266,6 @@ public void testBuildFromPrivateRegistry() throws Exception {
         dockerClient.pushImageCmd("localhost:5000/testuser/busybox").withTag("latest").withAuthConfig(authConfig)
                 .exec(new PushImageResultCallback()).awaitSuccess();
 
-        dockerClient.removeImageCmd("busybox:latest").withForce().exec();
-
         dockerClient.removeImageCmd("localhost:5000/testuser/busybox").withForce().exec();
 
         baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testBuildFromPrivateRegistry")

From 4fe366a513c276b4e7178f4f51698068b4c35e3a Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Mon, 17 Aug 2015 19:33:34 +0200
Subject: [PATCH 0182/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81639f894..66195fc81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ Change Log
 
 Latest SNAPSHOT
 ---
+* [#296] (https://github.com/docker-java/docker-java/pull/296) Fix Build FROM private registry broken with docker 1.7.x 
 * [#295] (https://github.com/docker-java/docker-java/pull/295) Support certificate chains in cert.pem
 * [#287] (https://github.com/docker-java/docker-java/pull/287) Using the oomKillDisable flag throws a null pointer exception
 

From 7e56f36cdd1d128145b6867b7ebf10c19cf57940 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Mon, 17 Aug 2015 19:41:10 +0200
Subject: [PATCH 0183/1272] Fix issue #228

---
 src/main/java/com/github/dockerjava/core/DockerClientImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 206ce26fd..60776fda2 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -90,7 +90,7 @@
  *
  * @see "https://github.com/docker/docker/blob/master/api/client/commands.go"
  */
-public class DockerClientImpl implements Closeable, DockerClient {
+public class DockerClientImpl implements Closeable, AutoCloseable, DockerClient {
 
     private final DockerClientConfig dockerClientConfig;
 

From ae107a58150220fef96a774cb413c2ff380b4e83 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Mon, 17 Aug 2015 19:43:58 +0200
Subject: [PATCH 0184/1272] Fix issue #293

---
 src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
index 8e79fc662..2095fd3e2 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
@@ -29,7 +29,7 @@ public PushImageCmdExec(WebTarget baseResource) {
     private String name(PushImageCmd command) {
         String name = command.getName();
         AuthConfig authConfig = command.getAuthConfig();
-        return name.contains("/") ? name : authConfig.getUsername();
+        return (name.contains("/") || authConfig == null) ? name : authConfig.getUsername();
     }
 
     @Override

From 07640545695665eb996d90c59f4a29de464e72b8 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 18 Aug 2015 22:22:31 +0200
Subject: [PATCH 0185/1272] Fix issue #290

---
 .../github/dockerjava/core/NameParser.java    |  88 ++++++++----
 .../dockerjava/core/NameParserTest.java       | 126 ++++++++++++++++++
 2 files changed, 190 insertions(+), 24 deletions(-)
 create mode 100644 src/test/java/com/github/dockerjava/core/NameParserTest.java

diff --git a/src/main/java/com/github/dockerjava/core/NameParser.java b/src/main/java/com/github/dockerjava/core/NameParser.java
index 2bd99bf31..bff61e75f 100644
--- a/src/main/java/com/github/dockerjava/core/NameParser.java
+++ b/src/main/java/com/github/dockerjava/core/NameParser.java
@@ -5,15 +5,24 @@
 
 import java.util.regex.Pattern;
 
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
 import com.github.dockerjava.api.model.AuthConfig;
 
 public class NameParser {
 
-    private static final Pattern VALID_HEX_PATTERN = Pattern.compile("^([a-f0-9]{64})$");
+    private static final int RepositoryNameTotalLengthMax = 255;
+
+    private static final Pattern RepositoryNameComponentRegexp = Pattern.compile("[a-z0-9]+(?:[._-][a-z0-9]+)*");
 
-    private static final Pattern VALID_NAMESPACE_PATTERN = Pattern.compile("^([a-z0-9_]{4,30})$");
+    private static final Pattern RepositoryNameComponentAnchoredRegexp = Pattern.compile("^"
+            + RepositoryNameComponentRegexp.pattern() + "$");
 
-    private static final Pattern VALID_REPO_PATTERN = Pattern.compile("^([a-z0-9-_.]+)$");
+    // private static final Pattern RepositoryNameRegexp = Pattern.compile("(?:" +
+    // RepositoryNameComponentRegexp.pattern()
+    // + "/)*" + RepositoryNameComponentRegexp.pattern());
 
     public static ReposTag parseRepositoryTag(String name) {
         int n = name.lastIndexOf(':');
@@ -36,30 +45,44 @@ public ReposTag(String repos, String tag) {
             this.repos = repos;
             this.tag = tag;
         }
-    }
 
-    public static void validateRepositoryName(String repositoryName) {
-        String name;
-        String namespace;
-        String[] nameParts = repositoryName.split("/", 2);
-        if (nameParts.length < 2) {
-            namespace = "library";
-            name = nameParts[0];
-            if (VALID_HEX_PATTERN.matcher(name).matches()) {
-                throw new InvalidRepositoryNameException(String.format(
-                        "Invalid repository name (%s), cannot specify 64-byte hexadecimal strings", name));
+        @Override
+        public boolean equals(Object obj) {
+            if (obj instanceof ReposTag) {
+                ReposTag other = (ReposTag) obj;
+                return new EqualsBuilder().append(repos, other.repos).append(tag, other.tag).isEquals();
+
+            } else {
+                return false;
             }
-        } else {
-            namespace = nameParts[0];
-            name = nameParts[1];
         }
-        if (!VALID_NAMESPACE_PATTERN.matcher(namespace).matches()) {
-            throw new InvalidRepositoryNameException(String.format(
-                    "Invalid namespace name (%s), only [a-z0-9_] are allowed, size between 4 and 30", namespace));
+
+        @Override
+        public String toString() {
+            return ToStringBuilder.reflectionToString(this, ToStringStyle.SIMPLE_STYLE);
         }
-        if (!VALID_REPO_PATTERN.matcher(name).matches()) {
-            throw new InvalidRepositoryNameException(String.format(
-                    "Invalid repository name (%s), only [a-z0-9-_.] are allowed", name));
+    }
+
+    /*
+     * see https://github.com/docker/distribution/blob/master/registry/api/v2/names.go
+     */
+    public static void validateRepoName(String name) {
+        if (name.isEmpty()) {
+            throw new InvalidRepositoryNameException(String.format("Invalid empty repository name \"%s\"", name));
+        }
+
+        if (name.length() > RepositoryNameTotalLengthMax) {
+            throw new InvalidRepositoryNameException(String.format("Repository name \"%s\" is longer than "
+                    + RepositoryNameTotalLengthMax, name));
+        }
+
+        String[] components = name.split("/");
+
+        for (String component : components) {
+            if (!RepositoryNameComponentAnchoredRegexp.matcher(component).matches()) {
+                throw new InvalidRepositoryNameException(String.format(
+                        "Repository name \"%s\" is invalid. Component: %s", name, component));
+            }
         }
     }
 
@@ -82,7 +105,7 @@ public static HostnameReposName resolveRepositoryName(String reposName) {
                     reposName));
         }
 
-        validateRepositoryName(reposName);
+        validateRepoName(reposName);
         return new HostnameReposName(hostname, reposName);
     }
 
@@ -96,5 +119,22 @@ public HostnameReposName(String hostname, String reposName) {
             this.reposName = reposName;
         }
 
+        @Override
+        public boolean equals(Object obj) {
+            if (obj instanceof HostnameReposName) {
+                HostnameReposName other = (HostnameReposName) obj;
+                return new EqualsBuilder().append(hostname, other.hostname).append(reposName, other.reposName)
+                        .isEquals();
+
+            } else {
+                return false;
+            }
+        }
+
+        @Override
+        public String toString() {
+            return ToStringBuilder.reflectionToString(this, ToStringStyle.SIMPLE_STYLE);
+        }
+
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/NameParserTest.java b/src/test/java/com/github/dockerjava/core/NameParserTest.java
new file mode 100644
index 000000000..6b694753a
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/NameParserTest.java
@@ -0,0 +1,126 @@
+/*
+ * Created on 17.08.2015
+ */
+package com.github.dockerjava.core;
+
+import org.apache.commons.lang.StringUtils;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+
+import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.core.NameParser.HostnameReposName;
+import com.github.dockerjava.core.NameParser.ReposTag;
+
+/**
+ *
+ *
+ * @author marcus
+ *
+ */
+public class NameParserTest {
+
+    @Test
+    public void testValidateRepoName() throws Exception {
+        NameParser.validateRepoName("repository");
+        NameParser.validateRepoName("namespace/repository");
+        NameParser.validateRepoName("namespace-with-dashes/repository");
+        NameParser.validateRepoName("namespace/repository-with-dashes");
+        NameParser.validateRepoName("namespace.with.dots/repository");
+        NameParser.validateRepoName("namespace/repository.with.dots");
+        NameParser.validateRepoName("namespace_with_underscores/repository");
+        NameParser.validateRepoName("namespace/repository_with_underscores");
+    }
+
+    @Test(expectedExceptions = InvalidRepositoryNameException.class)
+    public void testValidateRepoNameEmpty() throws Exception {
+        NameParser.validateRepoName("");
+    }
+
+    @Test(expectedExceptions = InvalidRepositoryNameException.class)
+    public void testValidateRepoNameExceedsMaxLength() throws Exception {
+        NameParser.validateRepoName(StringUtils.repeat("repository", 255));
+    }
+
+    @Test(expectedExceptions = InvalidRepositoryNameException.class)
+    public void testValidateRepoNameEndWithDash() throws Exception {
+        NameParser.validateRepoName("repository-");
+    }
+
+    @Test(expectedExceptions = InvalidRepositoryNameException.class)
+    public void testValidateRepoNameStartWithDash() throws Exception {
+        NameParser.validateRepoName("-repository");
+    }
+
+    @Test(expectedExceptions = InvalidRepositoryNameException.class)
+    public void testValidateRepoNameEndWithDot() throws Exception {
+        NameParser.validateRepoName("repository.");
+    }
+
+    @Test(expectedExceptions = InvalidRepositoryNameException.class)
+    public void testValidateRepoNameStartWithDot() throws Exception {
+        NameParser.validateRepoName(".repository");
+    }
+
+    @Test(expectedExceptions = InvalidRepositoryNameException.class)
+    public void testValidateRepoNameEndWithUnderscore() throws Exception {
+        NameParser.validateRepoName("repository_");
+    }
+
+    @Test(expectedExceptions = InvalidRepositoryNameException.class)
+    public void testValidateRepoNameStartWithUnderscore() throws Exception {
+        NameParser.validateRepoName("_repository");
+    }
+
+    @Test(expectedExceptions = InvalidRepositoryNameException.class)
+    public void testValidateRepoNameWithColon() throws Exception {
+        NameParser.validateRepoName("repository:with:colon");
+    }
+
+    @Test
+    public void testResolveSimpleRepositoryName() throws Exception {
+        HostnameReposName resolved = NameParser.resolveRepositoryName("repository");
+        assertEquals(resolved, new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "repository"));
+    }
+
+    @Test
+    public void testResolveRepositoryNameWithNamespace() throws Exception {
+        HostnameReposName resolved = NameParser.resolveRepositoryName("namespace/repository");
+        assertEquals(resolved, new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "namespace/repository"));
+    }
+
+    @Test
+    public void testResolveRepositoryNameWithNamespaceAndHostname() throws Exception {
+        HostnameReposName resolved = NameParser.resolveRepositoryName("localhost:5000/namespace/repository");
+        assertEquals(resolved, new HostnameReposName("localhost:5000", "namespace/repository"));
+    }
+
+    @Test(expectedExceptions = InvalidRepositoryNameException.class)
+    public void testResolveRepositoryNameWithIndex() throws Exception {
+        NameParser.resolveRepositoryName("index.docker.io/repository");
+    }
+
+    @Test
+    public void testResolveReposTagWithoutTagSimple() throws Exception {
+        ReposTag resolved = NameParser.parseRepositoryTag("repository");
+        assertEquals(resolved, new ReposTag("repository", ""));
+
+        resolved = NameParser.parseRepositoryTag("namespace/repository");
+        assertEquals(resolved, new ReposTag("namespace/repository", ""));
+
+        resolved = NameParser.parseRepositoryTag("localhost:5000/namespace/repository");
+        assertEquals(resolved, new ReposTag("localhost:5000/namespace/repository", ""));
+    }
+
+    @Test
+    public void testResolveReposTagWithTag() throws Exception {
+        ReposTag resolved = NameParser.parseRepositoryTag("repository:tag");
+        assertEquals(resolved, new ReposTag("repository", "tag"));
+
+        resolved = NameParser.parseRepositoryTag("namespace/repository:tag");
+        assertEquals(resolved, new ReposTag("namespace/repository", "tag"));
+
+        resolved = NameParser.parseRepositoryTag("localhost:5000/namespace/repository:tag");
+        assertEquals(resolved, new ReposTag("localhost:5000/namespace/repository", "tag"));
+    }
+}

From 78f6caa85a39f92bfe69b649cc368e98c2182471 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 18 Aug 2015 22:41:01 +0200
Subject: [PATCH 0186/1272] Remove newlines

---
 src/main/java/com/github/dockerjava/core/NameParser.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/NameParser.java b/src/main/java/com/github/dockerjava/core/NameParser.java
index bff61e75f..49a550b1d 100644
--- a/src/main/java/com/github/dockerjava/core/NameParser.java
+++ b/src/main/java/com/github/dockerjava/core/NameParser.java
@@ -51,7 +51,6 @@ public boolean equals(Object obj) {
             if (obj instanceof ReposTag) {
                 ReposTag other = (ReposTag) obj;
                 return new EqualsBuilder().append(repos, other.repos).append(tag, other.tag).isEquals();
-
             } else {
                 return false;
             }
@@ -125,7 +124,6 @@ public boolean equals(Object obj) {
                 HostnameReposName other = (HostnameReposName) obj;
                 return new EqualsBuilder().append(hostname, other.hostname).append(reposName, other.reposName)
                         .isEquals();
-
             } else {
                 return false;
             }

From ad2a58d7944da64a4e3ef3eef0d7ea70e3c3bc45 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 18 Aug 2015 22:53:31 +0200
Subject: [PATCH 0187/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66195fc81..00c58b963 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ Change Log
 
 Latest SNAPSHOT
 ---
+* [#298] (https://github.com/docker-java/docker-java/pull/298) Fix repository name validation errors
 * [#296] (https://github.com/docker-java/docker-java/pull/296) Fix Build FROM private registry broken with docker 1.7.x 
 * [#295] (https://github.com/docker-java/docker-java/pull/295) Support certificate chains in cert.pem
 * [#287] (https://github.com/docker-java/docker-java/pull/287) Using the oomKillDisable flag throws a null pointer exception

From ea52b1d08019fefa6ca8eab13b29bf1a0deb9537 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 18 Aug 2015 22:54:57 +0200
Subject: [PATCH 0188/1272] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6c05fbc68..9b5191d32 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Developer forum for [docker-java](https://groups.google.com/forum/?hl=de#!forum/
 
 * Java 1.7
 * Maven 3.0.5
-* Docker daemon running
+* Docker 1.7.x
 
 If you need SSL, then you'll need to put your `*.pem` file into `~/.docker/`, if you're using boot2docker, do this: 
  

From f215929a6ed0883b584ff798bfadf4d679dadf9e Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 19 Aug 2015 23:09:13 +0200
Subject: [PATCH 0189/1272] Fix issue #286

---
 .../dockerjava/core/GoLangFileMatch.java      | 19 ++++--
 .../core/GoLangMatchFileFilter.java           |  3 +-
 .../core/dockerfile/Dockerfile.java           | 68 ++++++++++++++++---
 .../core/dockerfile/DockerfileStatement.java  |  2 +-
 .../core/command/BuildImageCmdImplTest.java   |  8 +++
 .../testDockerfileNotIgnored/.dockerignore    |  2 +
 .../testDockerfileNotIgnored/Dockerfile       |  9 +++
 7 files changed, 93 insertions(+), 18 deletions(-)
 create mode 100644 src/test/resources/testDockerfileNotIgnored/.dockerignore
 create mode 100644 src/test/resources/testDockerfileNotIgnored/Dockerfile

diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index 469beb40b..3e2d57485 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -4,6 +4,7 @@
 package com.github.dockerjava.core;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
@@ -23,16 +24,16 @@
  *                  character class (must be non-empty)
  *       c           matches character c (c != '*', '?', '\\', '[')
  *       '\\' c      matches character c
- * 
+ *
  *   character-range:
  *       c           matches character c (c != '\\', '-', ']')
  *       '\\' c      matches character c
  *       lo '-' hi   matches character c for lo <= c <= hi
- * 
+ *
  *  Match requires pattern to match all of name, not just a substring.
  *  The only possible returned error is ErrBadPattern, when pattern
  *  is malformed.
- * 
+ *
  * On Windows, escaping is disabled. Instead, '\\' is treated as
  *  path separator.
  * </pre>
@@ -45,20 +46,24 @@ public class GoLangFileMatch {
     public static final boolean IS_WINDOWS = File.separatorChar == '\\';
 
     public static boolean match(List<String> patterns, File file) {
-        return match(patterns, file.getPath());
+        return !match(patterns, file.getPath()).isEmpty();
     }
 
     public static boolean match(String pattern, File file) {
         return match(pattern, file.getPath());
     }
 
-    public static boolean match(List<String> patterns, String name) {
+    /**
+     * Returns the matching patterns for the given string
+     */
+    public static List<String> match(List<String> patterns, String name) {
+        List<String> matches = new ArrayList<String>();
         for (String pattern : patterns) {
             if (match(pattern, name)) {
-                return true;
+                matches.add(pattern);
             }
         }
-        return false;
+        return matches;
     }
 
     public static boolean match(String pattern, String name) {
diff --git a/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java b/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
index c8d8e1044..371c30fed 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
@@ -24,8 +24,7 @@ public GoLangMatchFileFilter(File base, List<String> patterns) {
     public boolean accept(File file) {
         String relativePath = FilePathUtil.relativize(base, file);
 
-        boolean match = GoLangFileMatch.match(patterns, relativePath);
-        return !match;
+        return GoLangFileMatch.match(patterns, relativePath).isEmpty();
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 9513678d7..4fe5ed466 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -10,6 +10,7 @@
 import com.google.common.base.Objects;
 import com.google.common.base.Optional;
 import com.google.common.collect.Collections2;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
@@ -89,12 +90,6 @@ public List<String> getIgnores() throws IOException {
                 }
                 pattern = FilenameUtils.normalize(pattern);
                 try {
-                    // validate pattern and make sure we aren't excluding Dockerfile
-                    if (GoLangFileMatch.match(pattern, "Dockerfile")) {
-                        throw new DockerClientException(String.format(
-                                "Dockerfile is excluded by pattern '%s' on line %s in .dockerignore file", pattern,
-                                lineNumber));
-                    }
                     ignores.add(pattern);
                 } catch (GoLangFileMatchException e) {
                     throw new DockerClientException(String.format(
@@ -169,7 +164,15 @@ public String toString() {
         public ScannedResult() throws IOException {
 
             ignores = getIgnores();
-            filesToAdd.add(dockerFile);
+
+            String matchingIgnorePattern = effectiveMatchingIgnorePattern(dockerFile);
+
+            if (matchingIgnorePattern == null) {
+                filesToAdd.add(dockerFile);
+            } else {
+                throw new DockerClientException(String.format(
+                        "Dockerfile is excluded by pattern '%s' in .dockerignore file", matchingIgnorePattern));
+            }
 
             for (DockerfileStatement statement : getStatements()) {
                 if (statement instanceof DockerfileStatement.Env) {
@@ -180,6 +183,55 @@ public ScannedResult() throws IOException {
             }
         }
 
+        /**
+         * Returns all matching ignore patterns for the given file name.
+         */
+        private List<String> matchingIgnorePatterns(String fileName) {
+            List<String> matches = new ArrayList<String>();
+            int lineNumber = 0;
+            for (String pattern : ignores) {
+                lineNumber++;
+                try {
+                    if (GoLangFileMatch.match(pattern, fileName)) {
+                        matches.add(pattern);
+                    }
+                } catch (GoLangFileMatchException e) {
+                    throw new DockerClientException(String.format(
+                            "Invalid pattern '%s' on line %s in .dockerignore file", pattern, lineNumber));
+                }
+
+            }
+            return matches;
+        }
+
+        /**
+         * Returns the matching ignore pattern for the given file or null if it should NOT be ignored.
+         * Exception rules like "!Dockerfile" will be respected.
+         */
+        private String effectiveMatchingIgnorePattern(File file) {
+            String relativeFilename = FilePathUtil.relativize(getDockerFolder(), file);
+
+            List<String> matchingPattern = matchingIgnorePatterns(relativeFilename);
+
+            if (matchingPattern.isEmpty())
+                return null;
+
+            String lastMatchingPattern = matchingPattern.get(matchingPattern.size() - 1);
+
+            int lastMatchingPatternIndex = ignores.lastIndexOf(lastMatchingPattern);
+
+            if(lastMatchingPatternIndex == ignores.size() - 1) return lastMatchingPattern;
+
+            List<String> remainingIgnorePattern = ignores.subList(lastMatchingPatternIndex + 1, ignores.size());
+
+            for (String ignorePattern : remainingIgnorePattern) {
+                if (ignorePattern.equals("!" + relativeFilename))
+                    return null;
+            }
+
+            return lastMatchingPattern;
+        }
+
         private void processAddStatement(DockerfileStatement.Add add) throws IOException {
 
             add = add.transform(environmentMap);
@@ -202,7 +254,7 @@ private void processAddStatement(DockerfileStatement.Add add) throws IOException
                         Collection<File> files = FileUtils.listFiles(src, new GoLangMatchFileFilter(src, ignores),
                                 TrueFileFilter.INSTANCE);
                         filesToAdd.addAll(files);
-                    } else if (!GoLangFileMatch.match(ignores, FilePathUtil.relativize(dockerFolder, src))) {
+                    } else if (effectiveMatchingIgnorePattern(src) == null) {
                         filesToAdd.add(src);
                     } else {
                         throw new DockerClientException(String.format(
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java b/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
index b37f5b4f7..2c06312a1 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
@@ -19,7 +19,7 @@
 /**
  * A statement present in a dockerfile.
  */
-public abstract class DockerfileStatement<T extends DockerfileStatement> {
+public abstract class DockerfileStatement<T extends DockerfileStatement<?>> {
 
     private DockerfileStatement() {
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 2fb1c545b..22030cc9f 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -171,6 +171,14 @@ public void testDockerfileIgnored() throws Exception {
         dockerClient.buildImageCmd(baseDir).withNoCache().exec(new BuildImageResultCallback()).awaitImageId();
     }
 
+    @Test
+    public void testDockerfileNotIgnored() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerfileNotIgnored")
+                .getFile());
+
+        dockerClient.buildImageCmd(baseDir).withNoCache().exec(new BuildImageResultCallback()).awaitImageId();
+    }
+
     @Test(expectedExceptions = { DockerClientException.class })
     public void testInvalidDockerIgnorePattern() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader()
diff --git a/src/test/resources/testDockerfileNotIgnored/.dockerignore b/src/test/resources/testDockerfileNotIgnored/.dockerignore
new file mode 100644
index 000000000..5c10f6256
--- /dev/null
+++ b/src/test/resources/testDockerfileNotIgnored/.dockerignore
@@ -0,0 +1,2 @@
+*
+!Dockerfile
\ No newline at end of file
diff --git a/src/test/resources/testDockerfileNotIgnored/Dockerfile b/src/test/resources/testDockerfileNotIgnored/Dockerfile
new file mode 100644
index 000000000..a50dffdd6
--- /dev/null
+++ b/src/test/resources/testDockerfileNotIgnored/Dockerfile
@@ -0,0 +1,9 @@
+FROM      ubuntu:latest
+
+# Copy testrun.sh files into the container
+
+RUN echo "Successful executed testrun.sh" >	/tmp/testrun.sh
+
+RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh
+
+CMD ["testrun.sh"]

From b27aac38a2f4a780f2da96e49d64d358a33f5b21 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 19 Aug 2015 23:42:07 +0200
Subject: [PATCH 0190/1272] Fix Dockerfile

---
 src/test/resources/testDockerfileNotIgnored/Dockerfile | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/test/resources/testDockerfileNotIgnored/Dockerfile b/src/test/resources/testDockerfileNotIgnored/Dockerfile
index a50dffdd6..6a8106b86 100644
--- a/src/test/resources/testDockerfileNotIgnored/Dockerfile
+++ b/src/test/resources/testDockerfileNotIgnored/Dockerfile
@@ -1,9 +1,3 @@
 FROM      ubuntu:latest
 
-# Copy testrun.sh files into the container
-
-RUN echo "Successful executed testrun.sh" >	/tmp/testrun.sh
-
-RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh
-
-CMD ["testrun.sh"]
+CMD ["echo", "Success"]

From 389a25ea7de0e2726db771ecc4ea1f1340134e39 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 19 Aug 2015 23:42:47 +0200
Subject: [PATCH 0191/1272] Beautify source

---
 .../com/github/dockerjava/core/dockerfile/Dockerfile.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 4fe5ed466..2e8ee8397 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -188,6 +188,7 @@ public ScannedResult() throws IOException {
          */
         private List<String> matchingIgnorePatterns(String fileName) {
             List<String> matches = new ArrayList<String>();
+
             int lineNumber = 0;
             for (String pattern : ignores) {
                 lineNumber++;
@@ -199,8 +200,8 @@ private List<String> matchingIgnorePatterns(String fileName) {
                     throw new DockerClientException(String.format(
                             "Invalid pattern '%s' on line %s in .dockerignore file", pattern, lineNumber));
                 }
-
             }
+
             return matches;
         }
 
@@ -286,10 +287,7 @@ private Collection<File> resolveWildcards(File file, List<String> ignores) {
         }
 
         private void processEnvStatement(DockerfileStatement.Env env) {
-
             environmentMap.put(env.variable, env.value);
         }
-
     }
-
 }

From c963c1fa9e85a49d43fb0987f6f8365b68162b3e Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 19 Aug 2015 04:08:32 +0300
Subject: [PATCH 0192/1272] Add FindBugs annotations

---
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index a6c343ce6..e0edc4943 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,6 +194,13 @@
 			<version>${hamcrest.jpa-matchers}</version>
 			<scope>test</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>com.google.code.findbugs</groupId>
+			<artifactId>annotations</artifactId>
+			<version>3.0.0</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<distributionManagement>

From 920dfe97cfd0cb64762ae31c706919b71f8752bf Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 19 Aug 2015 04:09:38 +0300
Subject: [PATCH 0193/1272] BuildImage sync to 1.20 API

Reordered fields according to 1.20 API for easier tracking
---
 .../dockerjava/api/command/BuildImageCmd.java |  99 +++++++-
 .../core/command/BuildImageCmdImpl.java       | 223 ++++++++++++++----
 .../dockerjava/jaxrs/BuildImageCmdExec.java   |  30 ++-
 3 files changed, 286 insertions(+), 66 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 5a41a61fb..5a2fdc7c7 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -1,44 +1,101 @@
 package com.github.dockerjava.api.command;
 
-import java.io.File;
-import java.io.InputStream;
-
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.api.model.BuildResponseItem;
 
+import javax.annotation.CheckForNull;
+import java.io.File;
+import java.io.InputStream;
+import java.net.URI;
+
 /**
- *
  * Build an image from Dockerfile.
- *
+ * <p>
  * TODO: http://docs.docker.com/reference/builder/#dockerignore
  *
+ * @see <a href="https://docs.docker.com/reference/api/docker_remote_api_v1.20/#build-image-from-a-dockerfile">build-image-from-a-dockerfile</a>
  */
 public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildResponseItem> {
 
-    public BuildImageCmd withTag(String tag);
+// lib specific
 
     public InputStream getTarInputStream();
 
-    public String getTag();
+    public AuthConfigurations getBuildAuthConfigs();
 
-    public boolean hasNoCacheEnabled();
+// getters
 
-    public boolean hasRemoveEnabled();
+    /**
+     * "t" in API
+     */
+    @CheckForNull
+    public String getTag();
 
+    /**
+     * "remote" in API
+     */
+    @CheckForNull
+    public URI getRemote();
+
+    /**
+     * "nocache" in API
+     */
+    @CheckForNull
+    public Boolean hasNoCacheEnabled();
+
+    /**
+     * "rm" in API
+     */
+    @CheckForNull
+    public Boolean hasRemoveEnabled();
+
+    /**
+     * "forcerm" in API
+     */
+    public boolean isForcerm();
+
+    @CheckForNull
+    public Boolean getForcerm();
+
+    /**
+     * "q" in API
+     */
     public boolean isQuiet();
 
-    public boolean hasPullEnabled();
+    @CheckForNull
+    public Boolean getQuiet();
 
+    /**
+     * "pull" in API
+     */
+    @CheckForNull
+    public Boolean hasPullEnabled();
+
+    @CheckForNull
     public String getPathToDockerfile();
 
-    public AuthConfigurations getBuildAuthConfigs();
+    @CheckForNull
+    public Long getMemory();
+
+    @CheckForNull
+    public Long getMemswap();
+
+    @CheckForNull
+    public String getCpushares();
+
+    @CheckForNull
+    public String getCpusetcpus();
+
+// setters
+
+    public BuildImageCmd withTag(String tag);
+
+    public BuildImageCmd withRemote(URI remote);
 
     public BuildImageCmd withBaseDirectory(File baseDirectory);
 
     public BuildImageCmd withDockerfile(File dockerfile);
 
-    public BuildImageCmd withTarInputStream(InputStream tarInputStream);
-
     public BuildImageCmd withNoCache();
 
     public BuildImageCmd withNoCache(boolean noCache);
@@ -47,6 +104,10 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     public BuildImageCmd withRemove(boolean rm);
 
+    public BuildImageCmd withForcerm();
+
+    public BuildImageCmd withForcerm(boolean forcerm);
+
     public BuildImageCmd withQuiet();
 
     public BuildImageCmd withQuiet(boolean quiet);
@@ -55,8 +116,20 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     public BuildImageCmd withPull(boolean pull);
 
+    public BuildImageCmd withMemory(long memory);
+
+    public BuildImageCmd withMemswap(long memswap);
+
+    public BuildImageCmd withCpushares(String cpushares);
+
+    public BuildImageCmd withCpusetcpus(String cpusetcpus);
+
+// setters lib specific
+
     public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfig);
 
+    public BuildImageCmd withTarInputStream(InputStream tarInputStream);
+
     public static interface Exec extends DockerCmdAsyncExec<BuildImageCmd, BuildResponseItem> {
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index 56ce8f78f..e270e1c55 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -5,6 +5,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.model.AuthConfigurations;
@@ -12,6 +13,8 @@
 import com.github.dockerjava.core.FilePathUtil;
 import com.github.dockerjava.core.dockerfile.Dockerfile;
 
+import javax.annotation.CheckForNull;
+
 /**
  *
  * Build an image from Dockerfile.
@@ -19,24 +22,51 @@
  */
 public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildResponseItem> implements BuildImageCmd {
 
-    private InputStream tarInputStream = null;
+    @CheckForNull
+    private InputStream tarInputStream;
 
+    @CheckForNull
     private String tag;
 
-    private boolean noCache;
+    @CheckForNull
+    private Boolean noCache;
 
-    private boolean remove = true;
+    @CheckForNull
+    private Boolean remove = true;
 
-    private boolean quiet;
+    @CheckForNull
+    private Boolean quiet;
 
-    private boolean pull;
+    @CheckForNull
+    private Boolean pull;
 
+    @CheckForNull
     private AuthConfigurations buildAuthConfigs;
 
+    @CheckForNull
     private File dockerFile;
 
+    @CheckForNull
     private File baseDirectory;
 
+    @CheckForNull
+    private String cpusetcpus;
+
+    @CheckForNull
+    private Long memory;
+
+    @CheckForNull
+    private String cpushares;
+
+    @CheckForNull
+    private Boolean forcerm;
+
+    @CheckForNull
+    private Long memswap;
+
+    @CheckForNull
+    private URI remote;
+
     public BuildImageCmdImpl(BuildImageCmd.Exec exec) {
         super(exec);
     }
@@ -59,69 +89,50 @@ public BuildImageCmdImpl(BuildImageCmd.Exec exec, InputStream tarInputStream) {
         withTarInputStream(tarInputStream);
     }
 
+// getters API
+
     @Override
-    public InputStream getTarInputStream() {
-        return tarInputStream;
+    public String getTag() {
+        return tag;
     }
 
     @Override
-    public BuildImageCmdImpl withDockerfile(File dockerfile) {
-        checkNotNull(dockerfile);
-        if (!dockerfile.exists())
-            throw new IllegalArgumentException("Dockerfile does not exist");
-        if (!dockerfile.isFile())
-            throw new IllegalArgumentException("Not a directory");
-
-        if (baseDirectory == null)
-            withBaseDirectory(dockerfile.getParentFile());
-
-        this.dockerFile = dockerfile;
-
-        try {
-            withTarInputStream(new Dockerfile(dockerfile).parse().buildDockerFolderTar(baseDirectory));
-        } catch (IOException e) {
-            // we just created the file this should never happen.
-            throw new RuntimeException(e);
-        }
-        return this;
+    public URI getRemote() {
+        return remote;
     }
 
     @Override
-    public BuildImageCmdImpl withTarInputStream(InputStream tarInputStream) {
-        checkNotNull(tarInputStream, "tarInputStream is null");
-        this.tarInputStream = tarInputStream;
-        return this;
+    public Boolean hasNoCacheEnabled() {
+        return noCache;
     }
 
     @Override
-    public BuildImageCmdImpl withTag(String tag) {
-        checkNotNull(tag, "Tag is null");
-        this.tag = tag;
-        return this;
+    public Boolean hasRemoveEnabled() {
+        return remove;
     }
 
     @Override
-    public String getTag() {
-        return tag;
+    public boolean isForcerm() {
+        return forcerm != null && forcerm;
     }
 
     @Override
-    public boolean hasNoCacheEnabled() {
-        return noCache;
+    public Boolean getForcerm() {
+        return forcerm;
     }
 
     @Override
-    public boolean hasRemoveEnabled() {
-        return remove;
+    public boolean isQuiet() {
+        return quiet != null && quiet;
     }
 
     @Override
-    public boolean isQuiet() {
+    public Boolean getQuiet() {
         return quiet;
     }
 
     @Override
-    public boolean hasPullEnabled() {
+    public Boolean hasPullEnabled() {
         return pull;
     }
 
@@ -134,14 +145,50 @@ public String getPathToDockerfile() {
         }
     }
 
+    @Override
+    public Long getMemory() {
+        return memory;
+    }
+
+    @Override
+    public Long getMemswap() {
+        return memswap;
+    }
+
+    @Override
+    public String getCpushares() {
+        return cpushares;
+    }
+
+    @Override
+    public String getCpusetcpus() {
+        return cpusetcpus;
+    }
+
+// getter lib specific
+
     @Override
     public AuthConfigurations getBuildAuthConfigs() {
         return buildAuthConfigs;
     }
 
     @Override
-    public BuildImageCmd withBaseDirectory(File baseDirectory) {
-        this.baseDirectory = baseDirectory;
+    public InputStream getTarInputStream() {
+        return tarInputStream;
+    }
+
+// setters
+
+    @Override
+    public BuildImageCmdImpl withTag(String tag) {
+        checkNotNull(tag, "Tag is null");
+        this.tag = tag;
+        return this;
+    }
+
+    @Override
+    public BuildImageCmd withRemote(URI remote) {
+        this.remote = remote;
         return this;
     }
 
@@ -167,6 +214,17 @@ public BuildImageCmdImpl withRemove(boolean rm) {
         return this;
     }
 
+    @Override
+    public BuildImageCmd withForcerm() {
+        return withForcerm(true);
+    }
+
+    @Override
+    public BuildImageCmd withForcerm(boolean forcerm) {
+        this.forcerm = forcerm;
+        return this;
+    }
+
     @Override
     public BuildImageCmdImpl withQuiet() {
         return withQuiet(true);
@@ -189,6 +247,67 @@ public BuildImageCmdImpl withPull(boolean pull) {
         return this;
     }
 
+    @Override
+    public BuildImageCmd withMemory(long memory) {
+        this.memory = memory;
+        return this;
+    }
+
+    @Override
+    public BuildImageCmd withMemswap(long memswap) {
+        this.memswap = memswap;
+        return this;
+    }
+
+    @Override
+    public BuildImageCmd withCpushares(String cpushares) {
+        this.cpushares = cpushares;
+        return this;
+    }
+
+    @Override
+    public BuildImageCmd withCpusetcpus(String cpusetcpus) {
+        this.cpusetcpus = cpusetcpus;
+        return this;
+    }
+
+// lib specific
+
+    @Override
+    public BuildImageCmd withBaseDirectory(File baseDirectory) {
+        this.baseDirectory = baseDirectory;
+        return this;
+    }
+
+    @Override
+    public BuildImageCmdImpl withDockerfile(File dockerfile) {
+        checkNotNull(dockerfile);
+        if (!dockerfile.exists())
+            throw new IllegalArgumentException("Dockerfile does not exist");
+        if (!dockerfile.isFile())
+            throw new IllegalArgumentException("Not a directory");
+
+        if (baseDirectory == null)
+            withBaseDirectory(dockerfile.getParentFile());
+
+        this.dockerFile = dockerfile;
+
+        try {
+            withTarInputStream(new Dockerfile(dockerfile).parse().buildDockerFolderTar(baseDirectory));
+        } catch (IOException e) {
+            // we just created the file this should never happen.
+            throw new RuntimeException(e);
+        }
+        return this;
+    }
+
+    @Override
+    public BuildImageCmdImpl withTarInputStream(InputStream tarInputStream) {
+        checkNotNull(tarInputStream, "tarInputStream is null");
+        this.tarInputStream = tarInputStream;
+        return this;
+    }
+
     @Override
     public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfigs) {
         checkNotNull(authConfigs, "authConfig is null");
@@ -205,9 +324,19 @@ public void close() throws IOException {
 
     @Override
     public String toString() {
-        return new StringBuilder("build ").append(tag != null ? "-t " + tag + " " : "")
-                .append(noCache ? "--nocache=true " : "").append(quiet ? "--quiet=true " : "")
-                .append(!remove ? "--rm=false " : "").toString();
+        return new StringBuilder("build ")
+                .append(tag != null ? "-t " + tag + " " : "")
+                .append(remote != null ? "--remote=" + remote.toString() + " " : "")
+                .append((quiet != null && quiet) ? "--quiet=true " : "")
+                .append((noCache != null && noCache) ? "--nocache=true " : "")
+                .append((pull != null && pull) ? "--pull=true" : "")
+                .append((remove != null && !remove) ? "--rm=false " : "")
+                .append((forcerm != null && forcerm) ? "--forcerm=true " : " ")
+                .append(memory != null ? "--memory=" + memory + " " : "")
+                .append(memswap != null ? "--memswap=" + memswap + " " : "")
+                .append(cpushares != null ? "--cpushares=" + cpushares + " " : "")
+                .append(cpusetcpus != null ? "--cpusetcpus=" + cpusetcpus + " " : "")
+                .toString();
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index 7a259b5a1..b28cec35c 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -43,23 +43,41 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
         WebTarget webTarget = getBaseResource().path("/build");
         String dockerFilePath = command.getPathToDockerfile();
 
+        if (dockerFilePath != null && command.getRemote() == null && !"Dockerfile".equals(dockerFilePath)) {
+            webTarget = webTarget.queryParam("dockerfile", dockerFilePath);
+        }
         if (command.getTag() != null) {
             webTarget = webTarget.queryParam("t", command.getTag());
         }
+        if (command.getRemote() != null) {
+            webTarget = webTarget.queryParam("remote", command.getRemote().toString());
+        }
+        if (command.isQuiet()) {
+            webTarget = webTarget.queryParam("q", "true");
+        }
         if (command.hasNoCacheEnabled()) {
             webTarget = webTarget.queryParam("nocache", "true");
         }
+        if (command.hasPullEnabled()) {
+            webTarget = webTarget.queryParam("pull", "true");
+        }
         if (!command.hasRemoveEnabled()) {
             webTarget = webTarget.queryParam("rm", "false");
         }
-        if (command.isQuiet()) {
-            webTarget = webTarget.queryParam("q", "true");
+        if (command.isForcerm()) {
+            webTarget = webTarget.queryParam("forcerm", "true");
         }
-        if (command.hasPullEnabled()) {
-            webTarget = webTarget.queryParam("pull", "true");
+        if (command.getMemory() != null) {
+            webTarget = webTarget.queryParam("memory", command.getMemory());
         }
-        if (dockerFilePath != null && !"Dockerfile".equals(dockerFilePath)) {
-            webTarget = webTarget.queryParam("dockerfile", dockerFilePath);
+        if (command.getMemswap() != null) {
+            webTarget = webTarget.queryParam("memswap", command.getMemswap());
+        }
+        if (command.getCpushares() != null) {
+            webTarget = webTarget.queryParam("cpushares", command.getCpushares());
+        }
+        if (command.getCpusetcpus() != null) {
+            webTarget = webTarget.queryParam("cpusetcpus", command.getCpusetcpus());
         }
 
         webTarget.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED);

From 67f1258411c8cd0dd2e4e8408caad170e7839651 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 20 Aug 2015 00:30:14 +0300
Subject: [PATCH 0194/1272] Diamonds <>

---
 .../com/github/dockerjava/jaxrs/BuildImageCmdExec.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index b28cec35c..465cd2869 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -85,8 +85,11 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
 
         LOGGER.trace("POST: {}", webTarget);
 
-        return new POSTCallbackNotifier<BuildResponseItem>(new JsonStreamProcessor<BuildResponseItem>(
-                BuildResponseItem.class), resultCallback, resourceWithOptionalAuthConfig(command, webTarget.request())
-                .accept(MediaType.TEXT_PLAIN), entity(command.getTarInputStream(), "application/tar"));
+        return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(BuildResponseItem.class),
+                resultCallback,
+                resourceWithOptionalAuthConfig(command, webTarget.request())
+                .accept(MediaType.TEXT_PLAIN),
+                entity(command.getTarInputStream(), "application/tar")
+        );
     }
 }

From 3ceac6135f6518577c9f17262ee8610426dec068 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 20 Aug 2015 00:30:37 +0300
Subject: [PATCH 0195/1272] Replace with auto-generated toString()

---
 .../core/command/BuildImageCmdImpl.java         | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index e270e1c55..3cd6bc755 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -12,6 +12,8 @@
 import com.github.dockerjava.api.model.BuildResponseItem;
 import com.github.dockerjava.core.FilePathUtil;
 import com.github.dockerjava.core.dockerfile.Dockerfile;
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
 
 import javax.annotation.CheckForNull;
 
@@ -324,19 +326,6 @@ public void close() throws IOException {
 
     @Override
     public String toString() {
-        return new StringBuilder("build ")
-                .append(tag != null ? "-t " + tag + " " : "")
-                .append(remote != null ? "--remote=" + remote.toString() + " " : "")
-                .append((quiet != null && quiet) ? "--quiet=true " : "")
-                .append((noCache != null && noCache) ? "--nocache=true " : "")
-                .append((pull != null && pull) ? "--pull=true" : "")
-                .append((remove != null && !remove) ? "--rm=false " : "")
-                .append((forcerm != null && forcerm) ? "--forcerm=true " : " ")
-                .append(memory != null ? "--memory=" + memory + " " : "")
-                .append(memswap != null ? "--memswap=" + memswap + " " : "")
-                .append(cpushares != null ? "--cpushares=" + cpushares + " " : "")
-                .append(cpusetcpus != null ? "--cpusetcpus=" + cpusetcpus + " " : "")
-                .toString();
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SIMPLE_STYLE);
     }
-
 }

From 18a0febdc16a1f7e9d26bf946994540af179c171 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 20 Aug 2015 00:31:28 +0300
Subject: [PATCH 0196/1272] Place logicaly linked words on new line

---
 .../java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index 465cd2869..53c3c5de0 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -19,9 +19,8 @@
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
 
-public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem> implements
-        BuildImageCmd.Exec {
-
+public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem>
+        implements BuildImageCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageCmdExec.class);
 
     public BuildImageCmdExec(WebTarget baseResource) {

From 33fdd7125f3be5aef33f12ca94df9ca28271d120 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 19 Aug 2015 23:46:03 +0200
Subject: [PATCH 0197/1272] Fix issue #286

---
 .../dockerjava/core/GoLangFileMatch.java      | 19 +++--
 .../core/GoLangMatchFileFilter.java           |  3 +-
 .../core/dockerfile/Dockerfile.java           | 72 ++++++++++++++++---
 .../core/dockerfile/DockerfileStatement.java  |  2 +-
 .../core/command/BuildImageCmdImplTest.java   |  8 +++
 .../testDockerfileNotIgnored/.dockerignore    |  2 +
 .../testDockerfileNotIgnored/Dockerfile       |  3 +
 7 files changed, 88 insertions(+), 21 deletions(-)
 create mode 100644 src/test/resources/testDockerfileNotIgnored/.dockerignore
 create mode 100644 src/test/resources/testDockerfileNotIgnored/Dockerfile

diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index 469beb40b..3e2d57485 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -4,6 +4,7 @@
 package com.github.dockerjava.core;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
@@ -23,16 +24,16 @@
  *                  character class (must be non-empty)
  *       c           matches character c (c != '*', '?', '\\', '[')
  *       '\\' c      matches character c
- * 
+ *
  *   character-range:
  *       c           matches character c (c != '\\', '-', ']')
  *       '\\' c      matches character c
  *       lo '-' hi   matches character c for lo <= c <= hi
- * 
+ *
  *  Match requires pattern to match all of name, not just a substring.
  *  The only possible returned error is ErrBadPattern, when pattern
  *  is malformed.
- * 
+ *
  * On Windows, escaping is disabled. Instead, '\\' is treated as
  *  path separator.
  * </pre>
@@ -45,20 +46,24 @@ public class GoLangFileMatch {
     public static final boolean IS_WINDOWS = File.separatorChar == '\\';
 
     public static boolean match(List<String> patterns, File file) {
-        return match(patterns, file.getPath());
+        return !match(patterns, file.getPath()).isEmpty();
     }
 
     public static boolean match(String pattern, File file) {
         return match(pattern, file.getPath());
     }
 
-    public static boolean match(List<String> patterns, String name) {
+    /**
+     * Returns the matching patterns for the given string
+     */
+    public static List<String> match(List<String> patterns, String name) {
+        List<String> matches = new ArrayList<String>();
         for (String pattern : patterns) {
             if (match(pattern, name)) {
-                return true;
+                matches.add(pattern);
             }
         }
-        return false;
+        return matches;
     }
 
     public static boolean match(String pattern, String name) {
diff --git a/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java b/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
index c8d8e1044..371c30fed 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
@@ -24,8 +24,7 @@ public GoLangMatchFileFilter(File base, List<String> patterns) {
     public boolean accept(File file) {
         String relativePath = FilePathUtil.relativize(base, file);
 
-        boolean match = GoLangFileMatch.match(patterns, relativePath);
-        return !match;
+        return GoLangFileMatch.match(patterns, relativePath).isEmpty();
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 9513678d7..2e8ee8397 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -10,6 +10,7 @@
 import com.google.common.base.Objects;
 import com.google.common.base.Optional;
 import com.google.common.collect.Collections2;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
@@ -89,12 +90,6 @@ public List<String> getIgnores() throws IOException {
                 }
                 pattern = FilenameUtils.normalize(pattern);
                 try {
-                    // validate pattern and make sure we aren't excluding Dockerfile
-                    if (GoLangFileMatch.match(pattern, "Dockerfile")) {
-                        throw new DockerClientException(String.format(
-                                "Dockerfile is excluded by pattern '%s' on line %s in .dockerignore file", pattern,
-                                lineNumber));
-                    }
                     ignores.add(pattern);
                 } catch (GoLangFileMatchException e) {
                     throw new DockerClientException(String.format(
@@ -169,7 +164,15 @@ public String toString() {
         public ScannedResult() throws IOException {
 
             ignores = getIgnores();
-            filesToAdd.add(dockerFile);
+
+            String matchingIgnorePattern = effectiveMatchingIgnorePattern(dockerFile);
+
+            if (matchingIgnorePattern == null) {
+                filesToAdd.add(dockerFile);
+            } else {
+                throw new DockerClientException(String.format(
+                        "Dockerfile is excluded by pattern '%s' in .dockerignore file", matchingIgnorePattern));
+            }
 
             for (DockerfileStatement statement : getStatements()) {
                 if (statement instanceof DockerfileStatement.Env) {
@@ -180,6 +183,56 @@ public ScannedResult() throws IOException {
             }
         }
 
+        /**
+         * Returns all matching ignore patterns for the given file name.
+         */
+        private List<String> matchingIgnorePatterns(String fileName) {
+            List<String> matches = new ArrayList<String>();
+
+            int lineNumber = 0;
+            for (String pattern : ignores) {
+                lineNumber++;
+                try {
+                    if (GoLangFileMatch.match(pattern, fileName)) {
+                        matches.add(pattern);
+                    }
+                } catch (GoLangFileMatchException e) {
+                    throw new DockerClientException(String.format(
+                            "Invalid pattern '%s' on line %s in .dockerignore file", pattern, lineNumber));
+                }
+            }
+
+            return matches;
+        }
+
+        /**
+         * Returns the matching ignore pattern for the given file or null if it should NOT be ignored.
+         * Exception rules like "!Dockerfile" will be respected.
+         */
+        private String effectiveMatchingIgnorePattern(File file) {
+            String relativeFilename = FilePathUtil.relativize(getDockerFolder(), file);
+
+            List<String> matchingPattern = matchingIgnorePatterns(relativeFilename);
+
+            if (matchingPattern.isEmpty())
+                return null;
+
+            String lastMatchingPattern = matchingPattern.get(matchingPattern.size() - 1);
+
+            int lastMatchingPatternIndex = ignores.lastIndexOf(lastMatchingPattern);
+
+            if(lastMatchingPatternIndex == ignores.size() - 1) return lastMatchingPattern;
+
+            List<String> remainingIgnorePattern = ignores.subList(lastMatchingPatternIndex + 1, ignores.size());
+
+            for (String ignorePattern : remainingIgnorePattern) {
+                if (ignorePattern.equals("!" + relativeFilename))
+                    return null;
+            }
+
+            return lastMatchingPattern;
+        }
+
         private void processAddStatement(DockerfileStatement.Add add) throws IOException {
 
             add = add.transform(environmentMap);
@@ -202,7 +255,7 @@ private void processAddStatement(DockerfileStatement.Add add) throws IOException
                         Collection<File> files = FileUtils.listFiles(src, new GoLangMatchFileFilter(src, ignores),
                                 TrueFileFilter.INSTANCE);
                         filesToAdd.addAll(files);
-                    } else if (!GoLangFileMatch.match(ignores, FilePathUtil.relativize(dockerFolder, src))) {
+                    } else if (effectiveMatchingIgnorePattern(src) == null) {
                         filesToAdd.add(src);
                     } else {
                         throw new DockerClientException(String.format(
@@ -234,10 +287,7 @@ private Collection<File> resolveWildcards(File file, List<String> ignores) {
         }
 
         private void processEnvStatement(DockerfileStatement.Env env) {
-
             environmentMap.put(env.variable, env.value);
         }
-
     }
-
 }
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java b/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
index b37f5b4f7..2c06312a1 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
@@ -19,7 +19,7 @@
 /**
  * A statement present in a dockerfile.
  */
-public abstract class DockerfileStatement<T extends DockerfileStatement> {
+public abstract class DockerfileStatement<T extends DockerfileStatement<?>> {
 
     private DockerfileStatement() {
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 2fb1c545b..22030cc9f 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -171,6 +171,14 @@ public void testDockerfileIgnored() throws Exception {
         dockerClient.buildImageCmd(baseDir).withNoCache().exec(new BuildImageResultCallback()).awaitImageId();
     }
 
+    @Test
+    public void testDockerfileNotIgnored() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerfileNotIgnored")
+                .getFile());
+
+        dockerClient.buildImageCmd(baseDir).withNoCache().exec(new BuildImageResultCallback()).awaitImageId();
+    }
+
     @Test(expectedExceptions = { DockerClientException.class })
     public void testInvalidDockerIgnorePattern() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader()
diff --git a/src/test/resources/testDockerfileNotIgnored/.dockerignore b/src/test/resources/testDockerfileNotIgnored/.dockerignore
new file mode 100644
index 000000000..5c10f6256
--- /dev/null
+++ b/src/test/resources/testDockerfileNotIgnored/.dockerignore
@@ -0,0 +1,2 @@
+*
+!Dockerfile
\ No newline at end of file
diff --git a/src/test/resources/testDockerfileNotIgnored/Dockerfile b/src/test/resources/testDockerfileNotIgnored/Dockerfile
new file mode 100644
index 000000000..6a8106b86
--- /dev/null
+++ b/src/test/resources/testDockerfileNotIgnored/Dockerfile
@@ -0,0 +1,3 @@
+FROM      ubuntu:latest
+
+CMD ["echo", "Success"]

From 96109c4cea8ccc2d31e8e833fc44f9aae8afb789 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 20 Aug 2015 00:09:19 +0200
Subject: [PATCH 0198/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00c58b963..c5fa79965 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ Change Log
 
 Latest SNAPSHOT
 ---
+* [#301] (https://github.com/docker-java/docker-java/pull/301) Respect exception rules in .dockerignore file while build images
 * [#298] (https://github.com/docker-java/docker-java/pull/298) Fix repository name validation errors
 * [#296] (https://github.com/docker-java/docker-java/pull/296) Fix Build FROM private registry broken with docker 1.7.x 
 * [#295] (https://github.com/docker-java/docker-java/pull/295) Support certificate chains in cert.pem

From 8184a90038a1e0c8f93b43fcd5054aa0c65f5d81 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 20 Aug 2015 21:53:52 +0200
Subject: [PATCH 0199/1272] [maven-release-plugin] prepare release
 docker-java-2.0.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a6c343ce6..52b54a592 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>2.0.1-SNAPSHOT</version>
+	<version>2.0.1</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>docker-java-2.0.1</tag>
 	</scm>
 
 	<developers>

From b7787ac858c8ade0ea35b69e0c3b3529c1357ff3 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 20 Aug 2015 21:53:55 +0200
Subject: [PATCH 0200/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 52b54a592..578953d9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>2.0.1</version>
+	<version>2.0.2-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>docker-java-2.0.1</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 2fe6186890a4bd54526414885d3db66b1c1a2f59 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 20 Aug 2015 21:59:39 +0200
Subject: [PATCH 0201/1272] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9b5191d32..4a89ab63d 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ Run build without integration tests:
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>2.0.0</version>
+          <version>2.0.1</version>
     </dependency>
 
 ### Latest SNAPSHOT version
@@ -74,7 +74,7 @@ You can find the latest SNAPSHOT version including javadoc and source files on [
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>2.0.1-SNAPSHOT</version>
+          <version>2.0.2-SNAPSHOT</version>
     </dependency>
 
 ## Documentation

From 41531ee9b5bdf0f44b67bd8ccdaf8fde70e50370 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 20 Aug 2015 22:23:00 +0200
Subject: [PATCH 0202/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5fa79965..a0cdb62d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,20 @@
 Change Log
 ===
 
-Latest SNAPSHOT
+v2.0.1
 ---
+Release notes
+* This is a bugfix release. With this release docker >= v1.7.0 is recommended.
+
+All changes
+
 * [#301] (https://github.com/docker-java/docker-java/pull/301) Respect exception rules in .dockerignore file while build images
 * [#298] (https://github.com/docker-java/docker-java/pull/298) Fix repository name validation errors
 * [#296] (https://github.com/docker-java/docker-java/pull/296) Fix Build FROM private registry broken with docker 1.7.x 
 * [#295] (https://github.com/docker-java/docker-java/pull/295) Support certificate chains in cert.pem
 * [#287] (https://github.com/docker-java/docker-java/pull/287) Using the oomKillDisable flag throws a null pointer exception
 
-v.2.0.0
+v2.0.0
 ---
 Release notes
 
@@ -31,7 +36,7 @@ All changes
 * [#262](https://github.com/docker-java/docker-java/pull/262) Accept filters in list containers 
 * [#260](https://github.com/docker-java/docker-java/pull/260) Add labels to create and inspect container
 
-v.1.4.0
+v1.4.0
 ---
 * [#248](https://github.com/docker-java/docker-java/pull/248) Removed deprecated start options
 * [#247](https://github.com/docker-java/docker-java/pull/247) Add Domainname attribute on create command

From 32d0f93d14b84243cf67b16cdb9cf532287052ae Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 21 Aug 2015 02:04:59 +0300
Subject: [PATCH 0203/1272] Restore backward compatibility

---
 .../dockerjava/api/command/BuildImageCmd.java | 14 +++--------
 .../core/command/BuildImageCmdImpl.java       | 25 ++++++-------------
 2 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 5a2fdc7c7..c737501fa 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -40,14 +40,12 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     /**
      * "nocache" in API
      */
-    @CheckForNull
-    public Boolean hasNoCacheEnabled();
+    public boolean hasNoCacheEnabled();
 
     /**
      * "rm" in API
      */
-    @CheckForNull
-    public Boolean hasRemoveEnabled();
+    public boolean hasRemoveEnabled();
 
     /**
      * "forcerm" in API
@@ -62,14 +60,10 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
      */
     public boolean isQuiet();
 
-    @CheckForNull
-    public Boolean getQuiet();
-
     /**
      * "pull" in API
      */
-    @CheckForNull
-    public Boolean hasPullEnabled();
+    public boolean hasPullEnabled();
 
     @CheckForNull
     public String getPathToDockerfile();
@@ -106,7 +100,7 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     public BuildImageCmd withForcerm();
 
-    public BuildImageCmd withForcerm(boolean forcerm);
+    public BuildImageCmd withForcerm(Boolean forcerm);
 
     public BuildImageCmd withQuiet();
 
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index 3cd6bc755..f516a1f17 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -30,17 +30,13 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR
     @CheckForNull
     private String tag;
 
-    @CheckForNull
-    private Boolean noCache;
+    private boolean noCache;
 
-    @CheckForNull
-    private Boolean remove = true;
+    private boolean remove = true;
 
-    @CheckForNull
-    private Boolean quiet;
+    private boolean quiet;
 
-    @CheckForNull
-    private Boolean pull;
+    private boolean pull;
 
     @CheckForNull
     private AuthConfigurations buildAuthConfigs;
@@ -104,12 +100,12 @@ public URI getRemote() {
     }
 
     @Override
-    public Boolean hasNoCacheEnabled() {
+    public boolean hasNoCacheEnabled() {
         return noCache;
     }
 
     @Override
-    public Boolean hasRemoveEnabled() {
+    public boolean hasRemoveEnabled() {
         return remove;
     }
 
@@ -125,16 +121,11 @@ public Boolean getForcerm() {
 
     @Override
     public boolean isQuiet() {
-        return quiet != null && quiet;
-    }
-
-    @Override
-    public Boolean getQuiet() {
         return quiet;
     }
 
     @Override
-    public Boolean hasPullEnabled() {
+    public boolean hasPullEnabled() {
         return pull;
     }
 
@@ -222,7 +213,7 @@ public BuildImageCmd withForcerm() {
     }
 
     @Override
-    public BuildImageCmd withForcerm(boolean forcerm) {
+    public BuildImageCmd withForcerm(Boolean forcerm) {
         this.forcerm = forcerm;
         return this;
     }

From 74caed563ec466465a1eb39335519f5d0b2351a4 Mon Sep 17 00:00:00 2001
From: Sebastian Menski <sebastian@menski.org>
Date: Sun, 23 Aug 2015 08:31:35 +0200
Subject: [PATCH 0204/1272] chore(core): do not expect default
 DockerCmdExecFactory service

Only fail for missing `DockerCmdExecFactory` service if
`getDefaultDockerCmdExecFactory` is called. Otherwise
`DockerClientBuilder` can't be used without a `DockerCmdExecFactory`
service on classpath.
---
 .../github/dockerjava/core/DockerClientBuilder.java  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
index 51f8c4dc7..f9fd4f2de 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
@@ -16,12 +16,9 @@ public class DockerClientBuilder {
     static {
         serviceLoader.reload();
         Iterator<DockerCmdExecFactory> iterator = serviceLoader.iterator();
-        if (!iterator.hasNext()) {
-            throw new RuntimeException("Fatal: Can't find any implementation of '"
-                    + DockerCmdExecFactory.class.getName() + "' in the current classpath.");
+        if (iterator.hasNext()) {
+            factoryClass = iterator.next().getClass();
         }
-
-        factoryClass = iterator.next().getClass();
     }
 
     private DockerClientImpl dockerClient = null;
@@ -49,6 +46,11 @@ public static DockerClientBuilder getInstance(String serverUrl) {
     }
 
     public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() {
+        if (factoryClass == null) {
+            throw new RuntimeException("Fatal: Can't find any implementation of '"
+                + DockerCmdExecFactory.class.getName() + "' in the current classpath.");
+        }
+
         try {
             return factoryClass.newInstance();
         } catch (InstantiationException | IllegalAccessException e) {

From 69221fe9bc12d35d95f0d3fdd5b7224c53f352fc Mon Sep 17 00:00:00 2001
From: Sebastian Menski <sebastian@menski.org>
Date: Sun, 23 Aug 2015 09:45:13 +0200
Subject: [PATCH 0205/1272] fix(core): fix NPE if latestItem is null in result
 callback

---
 .../dockerjava/core/command/BuildImageResultCallback.java     | 4 +++-
 .../dockerjava/core/command/PullImageResultCallback.java      | 4 +++-
 .../dockerjava/core/command/PushImageResultCallback.java      | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
index 4de6e280e..ae36a63d7 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
@@ -62,7 +62,9 @@ public String awaitImageId(long timeout, TimeUnit timeUnit) {
     }
 
     private String getImageId() {
-        if (latestItem == null || !latestItem.isBuildSuccessIndicated()) {
+        if (latestItem == null) {
+            throw new DockerClientException("Could not build image");
+        } else if (!latestItem.isBuildSuccessIndicated()) {
             throw new DockerClientException("Could not build image: " + latestItem.getError());
         } else {
             return latestItem.getImageId();
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
index 18c33f885..1924759bd 100644
--- a/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
@@ -40,7 +40,9 @@ public void awaitSuccess() {
             throw new DockerClientException("", e);
         }
 
-        if (latestItem == null || !latestItem.isPullSuccessIndicated()) {
+        if (latestItem == null) {
+            throw new DockerClientException("Could not pull image");
+        } else if (!latestItem.isPullSuccessIndicated()) {
             throw new DockerClientException("Could not pull image: " + latestItem.getError());
         }
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
index afcd16389..2b80a244e 100644
--- a/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
@@ -40,7 +40,9 @@ public void awaitSuccess() {
             throw new DockerClientException("", e);
         }
 
-        if (latestItem == null || latestItem.isErrorIndicated()) {
+        if (latestItem == null) {
+            throw new DockerClientException("Could not push image");
+        } else if (latestItem.isErrorIndicated()) {
             throw new DockerClientException("Could not push image: " + latestItem.getError());
         }
     }

From c231b8d09fa36a16d275df9b8432300301974224 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 21 Aug 2015 20:50:46 +0200
Subject: [PATCH 0206/1272] fix issue #303

---
 .../dockerjava/api/command/DockerCmd.java     |  3 +++
 .../core/command/AbstrAsyncDockerCmd.java     |  2 +-
 .../core/command/AbstrDockerCmd.java          |  2 +-
 .../core/command/BuildImageCmdImpl.java       |  8 +++++--
 .../jaxrs/AbstrAsyncDockerCmdExec.java        |  6 +----
 .../jaxrs/AbstrSyncDockerCmdExec.java         | 24 +++++++------------
 6 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmd.java b/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
index a4e7e3a5e..eafe34ae5 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
@@ -4,4 +4,7 @@
 
 public interface DockerCmd<RES_T> extends Closeable {
 
+    @Override
+    public void close();
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
index 04311e8c1..c49c0404c 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
@@ -25,7 +25,7 @@ public <T extends ResultCallback<A_RES_T>> T exec(T resultCallback) {
     }
 
     @Override
-    public void close() throws IOException {
+    public void close() {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
index c4fedac58..3594f960f 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
@@ -34,7 +34,7 @@ public RES_T exec() throws DockerException {
     }
 
     @Override
-    public void close() throws IOException {
+    public void close() {
     }
 
     protected String registryAuth(AuthConfig authConfig) {
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index 56ce8f78f..30857485b 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -197,10 +197,14 @@ public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfigs) {
     }
 
     @Override
-    public void close() throws IOException {
+    public void close() {
         super.close();
 
-        tarInputStream.close();
+        try {
+            tarInputStream.close();
+        } catch (IOException e) {
+           throw new RuntimeException(e);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
index cb91a56e7..c8cc954f3 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
@@ -50,11 +50,7 @@ public void onError(Throwable throwable) {
             @Override
             public void onComplete() {
                 resultCallback.onComplete();
-                try {
-                    command.close();
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
+                command.close();
             }
         };
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
index 7e26c519e..016184053 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
@@ -19,25 +19,17 @@ public AbstrSyncDockerCmdExec(WebTarget baseResource) {
     @Override
     public RES_T exec(CMD_T command) {
         // this hack works because of ResponseStatusExceptionFilter
-        RES_T result;
-        try {
-            result = execute(command);
-
-        } catch (ProcessingException e) {
-            if (e.getCause() instanceof DockerException) {
-                throw (DockerException) e.getCause();
-            } else {
-                throw e;
-            }
-        } finally {
+        try (CMD_T cmd = command) {
             try {
-                command.close();
-            } catch (IOException e) {
-                throw new RuntimeException(e);
+                return execute(cmd);
+            } catch (ProcessingException e) {
+                if (e.getCause() instanceof DockerException) {
+                    throw (DockerException) e.getCause();
+                } else {
+                    throw e;
+                }
             }
         }
-
-        return result;
     }
 
     protected abstract RES_T execute(CMD_T command);

From 10c104036169d595386ee50262aa26aa3f4d3f5e Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Mon, 24 Aug 2015 21:53:54 +0200
Subject: [PATCH 0207/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0cdb62d0..1d39620af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Change Log
 ===
 
+Latest SNAPSHOT
+---
+* [#304] (https://github.com/docker-java/docker-java/pull/304) Throw original exception when command.close() throws Exception too
+
 v2.0.1
 ---
 Release notes

From e3e0ed5d980987caf75d0f57df07fc2f0c071a60 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Mon, 24 Aug 2015 22:13:24 +0200
Subject: [PATCH 0208/1272] Format source

---
 .../java/com/github/dockerjava/core/GoLangFileMatch.java   | 6 +++---
 .../com/github/dockerjava/core/dockerfile/Dockerfile.java  | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index 3e2d57485..afe4b9843 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -24,16 +24,16 @@
  *                  character class (must be non-empty)
  *       c           matches character c (c != '*', '?', '\\', '[')
  *       '\\' c      matches character c
- *
+ * 
  *   character-range:
  *       c           matches character c (c != '\\', '-', ']')
  *       '\\' c      matches character c
  *       lo '-' hi   matches character c for lo <= c <= hi
- *
+ * 
  *  Match requires pattern to match all of name, not just a substring.
  *  The only possible returned error is ErrBadPattern, when pattern
  *  is malformed.
- *
+ * 
  * On Windows, escaping is disabled. Instead, '\\' is treated as
  *  path separator.
  * </pre>
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 2e8ee8397..9c8ef428d 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -206,8 +206,8 @@ private List<String> matchingIgnorePatterns(String fileName) {
         }
 
         /**
-         * Returns the matching ignore pattern for the given file or null if it should NOT be ignored.
-         * Exception rules like "!Dockerfile" will be respected.
+         * Returns the matching ignore pattern for the given file or null if it should NOT be ignored. Exception rules
+         * like "!Dockerfile" will be respected.
          */
         private String effectiveMatchingIgnorePattern(File file) {
             String relativeFilename = FilePathUtil.relativize(getDockerFolder(), file);
@@ -221,7 +221,8 @@ private String effectiveMatchingIgnorePattern(File file) {
 
             int lastMatchingPatternIndex = ignores.lastIndexOf(lastMatchingPattern);
 
-            if(lastMatchingPatternIndex == ignores.size() - 1) return lastMatchingPattern;
+            if (lastMatchingPatternIndex == ignores.size() - 1)
+                return lastMatchingPattern;
 
             List<String> remainingIgnorePattern = ignores.subList(lastMatchingPatternIndex + 1, ignores.size());
 

From 8ac9d443aacd09e305daadafce6f861aa27cd2d6 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Mon, 24 Aug 2015 22:16:35 +0200
Subject: [PATCH 0209/1272] Format sources

---
 .../java/com/github/dockerjava/core/DockerClientBuilder.java    | 2 +-
 .../com/github/dockerjava/core/command/BuildImageCmdImpl.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
index f9fd4f2de..28c84cab5 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
@@ -48,7 +48,7 @@ public static DockerClientBuilder getInstance(String serverUrl) {
     public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() {
         if (factoryClass == null) {
             throw new RuntimeException("Fatal: Can't find any implementation of '"
-                + DockerCmdExecFactory.class.getName() + "' in the current classpath.");
+                    + DockerCmdExecFactory.class.getName() + "' in the current classpath.");
         }
 
         try {
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index 30857485b..e6f3a909e 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -203,7 +203,7 @@ public void close() {
         try {
             tarInputStream.close();
         } catch (IOException e) {
-           throw new RuntimeException(e);
+            throw new RuntimeException(e);
         }
     }
 

From 11f5c7f07b1feef2f568c2b04b42c2ab66069d22 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Mon, 24 Aug 2015 22:33:51 +0200
Subject: [PATCH 0210/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d39620af..84733d058 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@ Change Log
 
 Latest SNAPSHOT
 ---
+* [#306] (https://github.com/docker-java/docker-java/pull/306) fix(core): fix NPE if latestItem is null in result callback
+* [#305] (https://github.com/docker-java/docker-java/pull/305) chore(core): do not expect default DockerCmdExecFactory service
 * [#304] (https://github.com/docker-java/docker-java/pull/304) Throw original exception when command.close() throws Exception too
 
 v2.0.1

From aa4fd08213528d61107246896ba01249ca433c58 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 25 Aug 2015 21:27:39 +0200
Subject: [PATCH 0211/1272] Format sources

---
 .../dockerjava/api/command/BuildImageCmd.java       | 11 ++++++-----
 .../dockerjava/core/command/BuildImageCmdImpl.java  |  8 ++++----
 .../github/dockerjava/jaxrs/BuildImageCmdExec.java  | 13 +++++--------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index c737501fa..dadaac4c5 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -13,17 +13,18 @@
  * <p>
  * TODO: http://docs.docker.com/reference/builder/#dockerignore
  *
- * @see <a href="https://docs.docker.com/reference/api/docker_remote_api_v1.20/#build-image-from-a-dockerfile">build-image-from-a-dockerfile</a>
+ * @see <a
+ *      href="https://docs.docker.com/reference/api/docker_remote_api_v1.20/#build-image-from-a-dockerfile">build-image-from-a-dockerfile</a>
  */
 public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildResponseItem> {
 
-// lib specific
+    // lib specific
 
     public InputStream getTarInputStream();
 
     public AuthConfigurations getBuildAuthConfigs();
 
-// getters
+    // getters
 
     /**
      * "t" in API
@@ -80,7 +81,7 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     @CheckForNull
     public String getCpusetcpus();
 
-// setters
+    // setters
 
     public BuildImageCmd withTag(String tag);
 
@@ -118,7 +119,7 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     public BuildImageCmd withCpusetcpus(String cpusetcpus);
 
-// setters lib specific
+    // setters lib specific
 
     public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfig);
 
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index 21c64903f..4be5a4ede 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -87,7 +87,7 @@ public BuildImageCmdImpl(BuildImageCmd.Exec exec, InputStream tarInputStream) {
         withTarInputStream(tarInputStream);
     }
 
-// getters API
+    // getters API
 
     @Override
     public String getTag() {
@@ -158,7 +158,7 @@ public String getCpusetcpus() {
         return cpusetcpus;
     }
 
-// getter lib specific
+    // getter lib specific
 
     @Override
     public AuthConfigurations getBuildAuthConfigs() {
@@ -170,7 +170,7 @@ public InputStream getTarInputStream() {
         return tarInputStream;
     }
 
-// setters
+    // setters
 
     @Override
     public BuildImageCmdImpl withTag(String tag) {
@@ -264,7 +264,7 @@ public BuildImageCmd withCpusetcpus(String cpusetcpus) {
         return this;
     }
 
-// lib specific
+    // lib specific
 
     @Override
     public BuildImageCmd withBaseDirectory(File baseDirectory) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index 53c3c5de0..8da1884b8 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -19,8 +19,8 @@
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
 
-public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem>
-        implements BuildImageCmd.Exec {
+public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem> implements
+        BuildImageCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageCmdExec.class);
 
     public BuildImageCmdExec(WebTarget baseResource) {
@@ -84,11 +84,8 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
 
         LOGGER.trace("POST: {}", webTarget);
 
-        return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(BuildResponseItem.class),
-                resultCallback,
-                resourceWithOptionalAuthConfig(command, webTarget.request())
-                .accept(MediaType.TEXT_PLAIN),
-                entity(command.getTarInputStream(), "application/tar")
-        );
+        return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(BuildResponseItem.class), resultCallback,
+                resourceWithOptionalAuthConfig(command, webTarget.request()).accept(MediaType.TEXT_PLAIN), entity(
+                        command.getTarInputStream(), "application/tar"));
     }
 }

From b82273e2e275608251e11a74f7c60456cc18cf44 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 25 Aug 2015 21:29:26 +0200
Subject: [PATCH 0212/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84733d058..6eb055b5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Latest SNAPSHOT
 * [#306] (https://github.com/docker-java/docker-java/pull/306) fix(core): fix NPE if latestItem is null in result callback
 * [#305] (https://github.com/docker-java/docker-java/pull/305) chore(core): do not expect default DockerCmdExecFactory service
 * [#304] (https://github.com/docker-java/docker-java/pull/304) Throw original exception when command.close() throws Exception too
+* [#299] (https://github.com/docker-java/docker-java/pull/299) BuildImage sync to 1.20 API
 
 v2.0.1
 ---

From 40089908ca1b0fe1cc2bf0c296c4e9a199920df9 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Wed, 26 Aug 2015 23:51:22 +0200
Subject: [PATCH 0213/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6eb055b5f..270f12d37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ Latest SNAPSHOT
 * [#305] (https://github.com/docker-java/docker-java/pull/305) chore(core): do not expect default DockerCmdExecFactory service
 * [#304] (https://github.com/docker-java/docker-java/pull/304) Throw original exception when command.close() throws Exception too
 * [#299] (https://github.com/docker-java/docker-java/pull/299) BuildImage sync to 1.20 API
+* [#291] (https://github.com/docker-java/docker-java/pull/291) Moved "Memory", "MemorySwap" and "CpuShares" mappings from ContainerConfig to HostConfig
 
 v2.0.1
 ---

From 73b79961c9b48702f0b2d747fbd44a90fe9088c0 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 27 Aug 2015 21:23:20 +0200
Subject: [PATCH 0214/1272] Don't use AutoCloseable as Closeable already
 inherits it

---
 src/main/java/com/github/dockerjava/core/DockerClientImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 60776fda2..206ce26fd 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -90,7 +90,7 @@
  *
  * @see "https://github.com/docker/docker/blob/master/api/client/commands.go"
  */
-public class DockerClientImpl implements Closeable, AutoCloseable, DockerClient {
+public class DockerClientImpl implements Closeable, DockerClient {
 
     private final DockerClientConfig dockerClientConfig;
 

From f0f8eb3a9eb5d5c6e598b0507cc97a01ed8ddfbc Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 27 Aug 2015 21:45:00 +0200
Subject: [PATCH 0215/1272] Prepare 2.1.0 release

---
 CHANGELOG.md | 2 +-
 README.md    | 2 +-
 pom.xml      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 270f12d37..149cad945 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Change Log
 ===
 
-Latest SNAPSHOT
+v2.1.0
 ---
 * [#306] (https://github.com/docker-java/docker-java/pull/306) fix(core): fix NPE if latestItem is null in result callback
 * [#305] (https://github.com/docker-java/docker-java/pull/305) chore(core): do not expect default DockerCmdExecFactory service
diff --git a/README.md b/README.md
index 4a89ab63d..770f0154e 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ You can find the latest SNAPSHOT version including javadoc and source files on [
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>2.0.2-SNAPSHOT</version>
+          <version>2.1.0-SNAPSHOT</version>
     </dependency>
 
 ## Documentation
diff --git a/pom.xml b/pom.xml
index edca264e7..ad712522e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>2.0.2-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>

From e2cce7646efdc8f06f55323117c80713316d31e5 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 27 Aug 2015 21:47:50 +0200
Subject: [PATCH 0216/1272] [maven-release-plugin] prepare release
 docker-java-2.1.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ad712522e..c238a3e2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>2.1.0-SNAPSHOT</version>
+	<version>2.1.0</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>docker-java-2.1.0</tag>
 	</scm>
 
 	<developers>

From cb73e57eede629623c0a0cf6522eef72d6b325f2 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 27 Aug 2015 21:47:54 +0200
Subject: [PATCH 0217/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c238a3e2b..75748be1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>2.1.0</version>
+	<version>2.1.1-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>docker-java-2.1.0</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From ee570eda20e4a278b082261a211b046913bd6a92 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 27 Aug 2015 21:50:49 +0200
Subject: [PATCH 0218/1272] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 770f0154e..a39363cb1 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ Run build without integration tests:
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>2.0.1</version>
+          <version>2.1.0</version>
     </dependency>
 
 ### Latest SNAPSHOT version
@@ -74,7 +74,7 @@ You can find the latest SNAPSHOT version including javadoc and source files on [
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>2.1.0-SNAPSHOT</version>
+          <version>2.1.1-SNAPSHOT</version>
     </dependency>
 
 ## Documentation

From cea03a6c6c013d90f71694c6f49f01ca65ab4b7b Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 26 Aug 2015 23:49:41 +0200
Subject: [PATCH 0219/1272] Fix issue #246

---
 CHANGELOG.md                                  |   2 +
 .../dockerjava/api/async/ResultCallback.java  |   2 +-
 .../api/command/AttachContainerCmd.java       |  22 +-
 .../dockerjava/api/command/BuildImageCmd.java |  22 +-
 .../dockerjava/api/command/CommitCmd.java     |  24 +-
 .../api/command/CreateContainerCmd.java       |  52 +--
 .../dockerjava/api/command/ExecCreateCmd.java |  16 +-
 .../dockerjava/api/command/ExecStartCmd.java  |   8 +-
 .../api/command/InspectContainerResponse.java |  20 +-
 .../api/command/InspectExecResponse.java      |  28 +-
 .../api/command/InspectImageResponse.java     |   4 +-
 .../api/command/ListContainersCmd.java        |  12 +-
 .../dockerjava/api/command/ListImagesCmd.java |   4 +-
 .../api/command/LogContainerCmd.java          |  22 +-
 .../api/command/RemoveContainerCmd.java       |   8 +-
 .../api/command/RemoveImageCmd.java           |   8 +-
 .../api/command/RestartContainerCmd.java      |   4 +-
 .../api/command/StopContainerCmd.java         |   4 +-
 .../dockerjava/api/command/TagImageCmd.java   |   4 +-
 .../dockerjava/api/model/AccessMode.java      |   4 +-
 .../dockerjava/api/model/AuthConfig.java      |   9 +-
 .../com/github/dockerjava/api/model/Bind.java |   4 +-
 .../api/model/BuildResponseItem.java          |   2 +-
 .../dockerjava/api/model/ChangeLog.java       |   4 +-
 .../dockerjava/api/model/Container.java       |   7 +-
 .../dockerjava/api/model/ContainerConfig.java |  31 +-
 .../github/dockerjava/api/model/Device.java   |   3 +
 .../dockerjava/api/model/DriverStatus.java    |   7 +-
 .../dockerjava/api/model/ErrorDetail.java     |   3 +
 .../dockerjava/api/model/ErrorResponse.java   |   3 +
 .../github/dockerjava/api/model/Event.java    |   9 +-
 .../dockerjava/api/model/ExposedPort.java     |  10 +-
 .../dockerjava/api/model/HostConfig.java      | 324 +++++++++++-------
 .../github/dockerjava/api/model/Image.java    |  15 +-
 .../com/github/dockerjava/api/model/Info.java |  46 ++-
 .../com/github/dockerjava/api/model/Link.java |   6 +-
 .../github/dockerjava/api/model/LxcConf.java  |   3 +
 .../com/github/dockerjava/api/model/Node.java |   3 +
 .../github/dockerjava/api/model/Ports.java    |  14 +-
 .../api/model/PullResponseItem.java           |   2 +-
 .../api/model/PushResponseItem.java           |   2 +-
 .../dockerjava/api/model/ResponseItem.java    |   4 +-
 .../dockerjava/api/model/RestartPolicy.java   |  16 +-
 .../dockerjava/api/model/SearchItem.java      |  12 +-
 .../dockerjava/api/model/Statistics.java      |   3 +
 .../github/dockerjava/api/model/Ulimit.java   |   8 +-
 .../github/dockerjava/api/model/Volume.java   |   2 +-
 .../github/dockerjava/api/model/VolumeRW.java |   4 +-
 .../dockerjava/api/model/VolumesFrom.java     |   4 +-
 .../dockerjava/core/CertificateUtils.java     |   4 +-
 .../dockerjava/core/GoLangFileMatch.java      |  20 +-
 .../core/LocalDirectorySSLConfig.java         |   4 +-
 .../core/async/JsonStreamProcessor.java       |   2 +-
 .../core/async/ResultCallbackTemplate.java    |   2 +-
 .../core/command/AbstrDockerCmd.java          |   7 +
 .../core/command/AttachContainerCmdImpl.java  |  22 +-
 .../dockerjava/core/command/AuthCmdImpl.java  |   9 +-
 .../core/command/BuildImageCmdImpl.java       |  41 +--
 .../core/command/CommitCmdImpl.java           |  49 ++-
 .../core/command/ContainerDiffCmdImpl.java    |   5 -
 .../command/CopyFileFromContainerCmdImpl.java |   7 -
 .../core/command/CreateContainerCmdImpl.java  | 167 ++++-----
 .../core/command/CreateImageCmdImpl.java      |   8 -
 .../core/command/EventsCmdImpl.java           |   6 -
 .../core/command/ExecCreateCmdImpl.java       |  27 +-
 .../core/command/ExecStartCmdImpl.java        |  10 +-
 .../dockerjava/core/command/FrameReader.java  |   2 +-
 .../dockerjava/core/command/InfoCmdImpl.java  |   4 -
 .../core/command/InspectContainerCmdImpl.java |   5 -
 .../core/command/InspectExecCmdImpl.java      |   5 -
 .../core/command/InspectImageCmdImpl.java     |   5 -
 .../core/command/KillContainerCmdImpl.java    |   5 -
 .../core/command/ListContainersCmdImpl.java   |  24 +-
 .../core/command/ListImagesCmdImpl.java       |  11 +-
 .../core/command/LogContainerCmdImpl.java     |  30 +-
 .../core/command/PauseContainerCmdImpl.java   |   5 -
 .../core/command/PullImageCmdImpl.java        |   4 -
 .../core/command/PullImageResultCallback.java |   3 +-
 .../core/command/PushImageCmdImpl.java        |   5 -
 .../core/command/RemoveContainerCmdImpl.java  |  21 +-
 .../core/command/RemoveImageCmdImpl.java      |  19 +-
 .../core/command/RestartContainerCmdImpl.java |  12 +-
 .../core/command/SaveImageCmdImpl.java        |   5 -
 .../core/command/SearchImagesCmdImpl.java     |   4 -
 .../core/command/StartContainerCmdImpl.java   |   5 -
 .../dockerjava/core/command/StatsCmdImpl.java |   4 -
 .../core/command/StopContainerCmdImpl.java    |  15 +-
 .../core/command/TagImageCmdImpl.java         |  17 +-
 .../core/command/TopContainerCmdImpl.java     |   8 +-
 .../core/command/UnpauseContainerCmdImpl.java |   5 -
 .../core/command/VersionCmdImpl.java          |   5 -
 .../core/command/WaitContainerCmdImpl.java    |   6 +-
 .../dockerjava/jaxrs/AbstrDockerCmdExec.java  |  12 +
 .../jaxrs/AttachContainerCmdExec.java         |  13 +-
 .../dockerjava/jaxrs/BuildImageCmdExec.java   |  23 +-
 .../dockerjava/jaxrs/CommitCmdExec.java       |  11 +-
 .../jaxrs/ListContainersCmdExec.java          |  21 +-
 .../dockerjava/jaxrs/ListImagesCmdExec.java   |  11 +-
 .../dockerjava/jaxrs/LogContainerCmdExec.java |  16 +-
 .../jaxrs/RemoveContainerCmdExec.java         |  11 +-
 .../dockerjava/jaxrs/RemoveImageCmdExec.java  |  11 +-
 .../jaxrs/RestartContainerCmdExec.java        |   6 +-
 .../jaxrs/StopContainerCmdExec.java           |   6 +-
 .../dockerjava/jaxrs/TagImageCmdExec.java     |  11 +-
 .../jaxrs/filter/LoggingFilter.java           |   6 +-
 .../jaxrs/filter/SelectiveLoggingFilter.java  |   2 +-
 .../client/AbstractDockerClientTest.java      |   2 +-
 .../dockerjava/core/GoLangFileMatchTest.java  |   8 +-
 .../CopyFileFromContainerCmdImplTest.java     |   2 +-
 .../command/CreateContainerCmdImplTest.java   |   2 +-
 .../core/command/EventsCmdImplTest.java       |   8 +-
 .../core/command/ExecStartCmdImplTest.java    |   4 +-
 .../core/command/ListImagesCmdImplTest.java   |   4 +-
 .../core/command/StatsCmdImplTest.java        |   6 +-
 114 files changed, 827 insertions(+), 823 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84733d058..270f12d37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ Latest SNAPSHOT
 * [#306] (https://github.com/docker-java/docker-java/pull/306) fix(core): fix NPE if latestItem is null in result callback
 * [#305] (https://github.com/docker-java/docker-java/pull/305) chore(core): do not expect default DockerCmdExecFactory service
 * [#304] (https://github.com/docker-java/docker-java/pull/304) Throw original exception when command.close() throws Exception too
+* [#299] (https://github.com/docker-java/docker-java/pull/299) BuildImage sync to 1.20 API
+* [#291] (https://github.com/docker-java/docker-java/pull/291) Moved "Memory", "MemorySwap" and "CpuShares" mappings from ContainerConfig to HostConfig
 
 v2.0.1
 ---
diff --git a/src/main/java/com/github/dockerjava/api/async/ResultCallback.java b/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
index 1eb7ebce1..8525f2478 100644
--- a/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
+++ b/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.async;
 
 import java.io.Closeable;
+import java.io.IOException;
 
 /**
  * Result callback
@@ -20,5 +21,4 @@ public interface ResultCallback<A_RES_T> extends Closeable {
 
     /** Called when processing was finished either by reaching the end or by aborting it */
     void onComplete();
-
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
index f837c89c5..0924fb008 100644
--- a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
@@ -24,20 +24,20 @@ public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, F
 
     public String getContainerId();
 
-    public boolean hasLogsEnabled();
+    public Boolean hasLogsEnabled();
 
-    public boolean hasFollowStreamEnabled();
+    public Boolean hasFollowStreamEnabled();
 
-    public boolean hasTimestampsEnabled();
+    public Boolean hasTimestampsEnabled();
 
-    public boolean hasStdoutEnabled();
+    public Boolean hasStdoutEnabled();
 
-    public boolean hasStderrEnabled();
+    public Boolean hasStderrEnabled();
 
     public AttachContainerCmd withContainerId(String containerId);
 
     /**
-     * See {@link #withFollowStream(boolean)}
+     * See {@link #withFollowStream(Boolean)}
      */
     public AttachContainerCmd withFollowStream();
 
@@ -46,19 +46,19 @@ public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, F
      * {@link InputStream#read()} MAY BLOCK FOREVER as long as no data is streamed from the docker host to
      * {@link DockerClient}!
      */
-    public AttachContainerCmd withFollowStream(boolean followStream);
+    public AttachContainerCmd withFollowStream(Boolean followStream);
 
-    public AttachContainerCmd withTimestamps(boolean timestamps);
+    public AttachContainerCmd withTimestamps(Boolean timestamps);
 
     public AttachContainerCmd withStdOut();
 
-    public AttachContainerCmd withStdOut(boolean stdout);
+    public AttachContainerCmd withStdOut(Boolean stdout);
 
     public AttachContainerCmd withStdErr();
 
-    public AttachContainerCmd withStdErr(boolean stderr);
+    public AttachContainerCmd withStdErr(Boolean stderr);
 
-    public AttachContainerCmd withLogs(boolean logs);
+    public AttachContainerCmd withLogs(Boolean logs);
 
     public AttachContainerCmd withLogs();
 
diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index dadaac4c5..903273872 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -41,17 +41,17 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     /**
      * "nocache" in API
      */
-    public boolean hasNoCacheEnabled();
+    public Boolean hasNoCacheEnabled();
 
     /**
      * "rm" in API
      */
-    public boolean hasRemoveEnabled();
+    public Boolean hasRemoveEnabled();
 
     /**
      * "forcerm" in API
      */
-    public boolean isForcerm();
+    public Boolean isForcerm();
 
     @CheckForNull
     public Boolean getForcerm();
@@ -59,12 +59,12 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     /**
      * "q" in API
      */
-    public boolean isQuiet();
+    public Boolean isQuiet();
 
     /**
      * "pull" in API
      */
-    public boolean hasPullEnabled();
+    public Boolean hasPullEnabled();
 
     @CheckForNull
     public String getPathToDockerfile();
@@ -93,11 +93,11 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     public BuildImageCmd withNoCache();
 
-    public BuildImageCmd withNoCache(boolean noCache);
+    public BuildImageCmd withNoCache(Boolean noCache);
 
     public BuildImageCmd withRemove();
 
-    public BuildImageCmd withRemove(boolean rm);
+    public BuildImageCmd withRemove(Boolean rm);
 
     public BuildImageCmd withForcerm();
 
@@ -105,15 +105,15 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     public BuildImageCmd withQuiet();
 
-    public BuildImageCmd withQuiet(boolean quiet);
+    public BuildImageCmd withQuiet(Boolean quiet);
 
     public BuildImageCmd withPull();
 
-    public BuildImageCmd withPull(boolean pull);
+    public BuildImageCmd withPull(Boolean pull);
 
-    public BuildImageCmd withMemory(long memory);
+    public BuildImageCmd withMemory(Long memory);
 
-    public BuildImageCmd withMemswap(long memswap);
+    public BuildImageCmd withMemswap(Long memswap);
 
     public BuildImageCmd withCpushares(String cpushares);
 
diff --git a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
index 10de66459..a932a3f70 100644
--- a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
@@ -23,23 +23,23 @@ public interface CommitCmd extends SyncDockerCmd<String> {
 
     public String getAuthor();
 
-    public boolean hasPauseEnabled();
+    public Boolean hasPauseEnabled();
 
-    public CommitCmd withAttachStderr(boolean attachStderr);
+    public CommitCmd withAttachStderr(Boolean attachStderr);
 
     public CommitCmd withAttachStderr();
 
-    public CommitCmd withAttachStdin(boolean attachStdin);
+    public CommitCmd withAttachStdin(Boolean attachStdin);
 
     public CommitCmd withAttachStdin();
 
-    public CommitCmd withAttachStdout(boolean attachStdout);
+    public CommitCmd withAttachStdout(Boolean attachStdout);
 
     public CommitCmd withAttachStdout();
 
     public CommitCmd withCmd(String... cmd);
 
-    public CommitCmd withDisableNetwork(boolean disableNetwork);
+    public CommitCmd withDisableNetwork(Boolean disableNetwork);
 
     public CommitCmd withAuthor(String author);
 
@@ -49,7 +49,7 @@ public interface CommitCmd extends SyncDockerCmd<String> {
 
     public CommitCmd withRepository(String repository);
 
-    public CommitCmd withPause(boolean pause);
+    public CommitCmd withPause(Boolean pause);
 
     public String[] getEnv();
 
@@ -71,23 +71,23 @@ public interface CommitCmd extends SyncDockerCmd<String> {
 
     public CommitCmd withMemorySwap(Integer memorySwap);
 
-    public boolean isOpenStdin();
+    public Boolean isOpenStdin();
 
-    public CommitCmd withOpenStdin(boolean openStdin);
+    public CommitCmd withOpenStdin(Boolean openStdin);
 
     public String[] getPortSpecs();
 
     public CommitCmd withPortSpecs(String... portSpecs);
 
-    public boolean isStdinOnce();
+    public Boolean isStdinOnce();
 
-    public CommitCmd withStdinOnce(boolean stdinOnce);
+    public CommitCmd withStdinOnce(Boolean stdinOnce);
 
     public CommitCmd withStdinOnce();
 
-    public boolean isTty();
+    public Boolean isTty();
 
-    public CommitCmd withTty(boolean tty);
+    public CommitCmd withTty(Boolean tty);
 
     public CommitCmd withTty();
 
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 638331240..c0a695426 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -40,9 +40,9 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public String[] getCmd();
 
-    public String getCpuset();
+    public String getCpusetCpus();
 
-    public int getCpuShares();
+    public Integer getCpuShares();
 
     /**
      * @since 1.19
@@ -92,9 +92,9 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public String getMacAddress();
 
-    public long getMemoryLimit();
+    public Long getMemory();
 
-    public long getMemorySwap();
+    public Long getMemorySwap();
 
     public String getName();
 
@@ -116,29 +116,31 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public Ulimit[] getUlimits();
 
-    public boolean isAttachStderr();
+    public Boolean isAttachStderr();
 
-    public boolean isAttachStdin();
+    public Boolean isAttachStdin();
 
-    public boolean isAttachStdout();
+    public Boolean isAttachStdout();
 
-    public boolean isNetworkDisabled();
+    public Boolean isNetworkDisabled();
 
     public Boolean isPrivileged();
 
     public Boolean isPublishAllPorts();
 
-    public boolean isStdInOnce();
+    public Boolean isReadonlyRootfs();
 
-    public boolean isStdinOpen();
+    public Boolean isStdInOnce();
 
-    public boolean isTty();
+    public Boolean isStdinOpen();
 
-    public CreateContainerCmd withAttachStderr(boolean attachStderr);
+    public Boolean isTty();
 
-    public CreateContainerCmd withAttachStdin(boolean attachStdin);
+    public CreateContainerCmd withAttachStderr(Boolean attachStderr);
 
-    public CreateContainerCmd withAttachStdout(boolean attachStdout);
+    public CreateContainerCmd withAttachStdin(Boolean attachStdin);
+
+    public CreateContainerCmd withAttachStdout(Boolean attachStdout);
 
     public CreateContainerCmd withBinds(Bind... binds);
 
@@ -158,9 +160,9 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public CreateContainerCmd withCmd(String... cmd);
 
-    public CreateContainerCmd withCpuset(String cpuset);
+    public CreateContainerCmd withCpusetCpus(String cpusetCpus);
 
-    public CreateContainerCmd withCpuShares(int cpuShares);
+    public CreateContainerCmd withCpuShares(Integer cpuShares);
 
     /**
      * @since 1.19
@@ -187,7 +189,7 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
      */
     public CreateContainerCmd withDevices(Device... devices);
 
-    public CreateContainerCmd withNetworkDisabled(boolean disableNetwork);
+    public CreateContainerCmd withNetworkDisabled(Boolean disableNetwork);
 
     /**
      * Set custom DNS servers
@@ -227,9 +229,9 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public CreateContainerCmd withLogConfig(LogConfig logConfig);
 
-    public CreateContainerCmd withMemoryLimit(long memoryLimit);
+    public CreateContainerCmd withMemory(Long memory);
 
-    public CreateContainerCmd withMemorySwap(long memorySwap);
+    public CreateContainerCmd withMemorySwap(Long memorySwap);
 
     public CreateContainerCmd withName(String name);
 
@@ -260,20 +262,20 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public CreateContainerCmd withPortSpecs(String... portSpecs);
 
-    public CreateContainerCmd withPrivileged(boolean privileged);
+    public CreateContainerCmd withPrivileged(Boolean privileged);
 
-    public CreateContainerCmd withPublishAllPorts(boolean publishAllPorts);
+    public CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts);
 
     /**
      * Set custom {@link RestartPolicy} for the container. Defaults to {@link RestartPolicy#noRestart()}
      */
     public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy);
 
-    public CreateContainerCmd withStdInOnce(boolean stdInOnce);
+    public CreateContainerCmd withStdInOnce(Boolean stdInOnce);
 
-    public CreateContainerCmd withStdinOpen(boolean stdinOpen);
+    public CreateContainerCmd withStdinOpen(Boolean stdinOpen);
 
-    public CreateContainerCmd withTty(boolean tty);
+    public CreateContainerCmd withTty(Boolean tty);
 
     public CreateContainerCmd withUser(String user);
 
@@ -287,7 +289,7 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public CreateContainerCmd withUlimits(Ulimit[] ulimits);
 
-    public CreateContainerCmd withReadonlyRootfs(boolean readonlyRootfs);
+    public CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs);
 
     public CreateContainerCmd withContainerIDFile(String containerIDFile);
 
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
index 8094f371e..6ff1b738e 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
@@ -8,29 +8,29 @@ public interface ExecCreateCmd extends SyncDockerCmd<ExecCreateCmdResponse> {
 
     public ExecCreateCmd withCmd(String... cmd);
 
-    public ExecCreateCmd withAttachStdin(boolean attachStdin);
+    public ExecCreateCmd withAttachStdin(Boolean attachStdin);
 
     public ExecCreateCmd withAttachStdin();
 
-    public boolean hasAttachStdinEnabled();
+    public Boolean hasAttachStdinEnabled();
 
-    public ExecCreateCmd withAttachStdout(boolean attachStdout);
+    public ExecCreateCmd withAttachStdout(Boolean attachStdout);
 
     public ExecCreateCmd withAttachStdout();
 
-    public boolean hasAttachStdoutEnabled();
+    public Boolean hasAttachStdoutEnabled();
 
-    public ExecCreateCmd withAttachStderr(boolean attachStderr);
+    public ExecCreateCmd withAttachStderr(Boolean attachStderr);
 
     public ExecCreateCmd withAttachStderr();
 
-    public boolean hasAttachStderrEnabled();
+    public Boolean hasAttachStderrEnabled();
 
-    public ExecCreateCmd withTty(boolean tty);
+    public ExecCreateCmd withTty(Boolean tty);
 
     public ExecCreateCmd withTty();
 
-    public boolean hasTtyEnabled();
+    public Boolean hasTtyEnabled();
 
     public static interface Exec extends DockerCmdSyncExec<ExecCreateCmd, ExecCreateCmdResponse> {
     }
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
index f769fb193..0d4ffa44a 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
@@ -10,15 +10,15 @@ public interface ExecStartCmd extends SyncDockerCmd<InputStream> {
 
     public ExecStartCmd withExecId(String execId);
 
-    public boolean hasDetachEnabled();
+    public Boolean hasDetachEnabled();
 
-    public ExecStartCmd withDetach(boolean detach);
+    public ExecStartCmd withDetach(Boolean detach);
 
     public ExecStartCmd withDetach();
 
-    public boolean hasTtyEnabled();
+    public Boolean hasTtyEnabled();
 
-    public ExecStartCmd withTty(boolean tty);
+    public ExecStartCmd withTty(Boolean tty);
 
     public ExecStartCmd withTty();
 
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index 3f2fedd77..e37e28471 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -178,7 +178,7 @@ public class NetworkSettings {
         private String ipAddress;
 
         @JsonProperty("IPPrefixLen")
-        private int ipPrefixLen;
+        private Integer ipPrefixLen;
 
         @JsonProperty("Gateway")
         private String gateway;
@@ -196,7 +196,7 @@ public String getIpAddress() {
             return ipAddress;
         }
 
-        public int getIpPrefixLen() {
+        public Integer getIpPrefixLen() {
             return ipPrefixLen;
         }
 
@@ -226,16 +226,16 @@ public String toString() {
     public class ContainerState {
 
         @JsonProperty("Running")
-        private boolean running;
+        private Boolean running;
 
         @JsonProperty("Paused")
-        private boolean paused;
+        private Boolean paused;
 
         @JsonProperty("Pid")
-        private int pid;
+        private Integer pid;
 
         @JsonProperty("ExitCode")
-        private int exitCode;
+        private Integer exitCode;
 
         @JsonProperty("StartedAt")
         private String startedAt;
@@ -243,19 +243,19 @@ public class ContainerState {
         @JsonProperty("FinishedAt")
         private String finishedAt;
 
-        public boolean isRunning() {
+        public Boolean isRunning() {
             return running;
         }
 
-        public boolean isPaused() {
+        public Boolean isPaused() {
             return paused;
         }
 
-        public int getPid() {
+        public Integer getPid() {
             return pid;
         }
 
-        public int getExitCode() {
+        public Integer getExitCode() {
             return exitCode;
         }
 
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
index 8a9a24a1b..b1cb09b20 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
@@ -13,41 +13,41 @@ public class InspectExecResponse {
     private String id;
 
     @JsonProperty("OpenStdin")
-    private boolean openStdin;
+    private Boolean openStdin;
 
     @JsonProperty("OpenStderr")
-    private boolean openStderr;
+    private Boolean openStderr;
 
     @JsonProperty("OpenStdout")
-    private boolean openStdout;
+    private Boolean openStdout;
 
     @JsonProperty("Running")
-    private boolean running;
+    private Boolean running;
 
     @JsonProperty("ExitCode")
-    private int exitCode;
+    private Integer exitCode;
 
     public String getId() {
         return id;
     }
 
-    public boolean isOpenStdin() {
+    public Boolean isOpenStdin() {
         return openStdin;
     }
 
-    public boolean isOpenStderr() {
+    public Boolean isOpenStderr() {
         return openStderr;
     }
 
-    public boolean isOpenStdout() {
+    public Boolean isOpenStdout() {
         return openStdout;
     }
 
-    public boolean isRunning() {
+    public Boolean isRunning() {
         return running;
     }
 
-    public int getExitCode() {
+    public Integer getExitCode() {
         return exitCode;
     }
 
@@ -65,10 +65,10 @@ public class ProcessConfig {
         private String entryPoint;
 
         @JsonProperty("privileged")
-        private boolean privileged;
+        private Boolean privileged;
 
         @JsonProperty("tty")
-        private boolean tty;
+        private Boolean tty;
 
         @JsonProperty("user")
         private String user;
@@ -81,11 +81,11 @@ public String getEntryPoint() {
             return entryPoint;
         }
 
-        public boolean isPrivileged() {
+        public Boolean isPrivileged() {
             return privileged;
         }
 
-        public boolean isTty() {
+        public Boolean isTty() {
             return tty;
         }
 
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
index 5c1a0185e..db9184c6d 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
@@ -48,7 +48,7 @@ public class InspectImageResponse {
     private String parent;
 
     @JsonProperty("Size")
-    private long size;
+    private Long size;
 
     public String getId() {
         return id;
@@ -70,7 +70,7 @@ public ContainerConfig getContainerConfig() {
         return containerConfig;
     }
 
-    public long getSize() {
+    public Long getSize() {
         return size;
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
index 5cba11755..2994fd9d6 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
@@ -22,11 +22,11 @@
  */
 public interface ListContainersCmd extends SyncDockerCmd<List<Container>> {
 
-    public int getLimit();
+    public Integer getLimit();
 
-    public boolean hasShowSizeEnabled();
+    public Boolean hasShowSizeEnabled();
 
-    public boolean hasShowAllEnabled();
+    public Boolean hasShowAllEnabled();
 
     public String getSinceId();
 
@@ -34,11 +34,11 @@ public interface ListContainersCmd extends SyncDockerCmd<List<Container>> {
 
     public Filters getFilters();
 
-    public ListContainersCmd withShowAll(boolean showAll);
+    public ListContainersCmd withShowAll(Boolean showAll);
 
-    public ListContainersCmd withShowSize(boolean showSize);
+    public ListContainersCmd withShowSize(Boolean showSize);
 
-    public ListContainersCmd withLimit(int limit);
+    public ListContainersCmd withLimit(Integer limit);
 
     public ListContainersCmd withSince(String since);
 
diff --git a/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java b/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
index 170ed8102..a9aa5b9d2 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
@@ -16,9 +16,9 @@ public interface ListImagesCmd extends SyncDockerCmd<List<Image>> {
 
     public String getFilters();
 
-    public boolean hasShowAllEnabled();
+    public Boolean hasShowAllEnabled();
 
-    public ListImagesCmd withShowAll(boolean showAll);
+    public ListImagesCmd withShowAll(Boolean showAll);
 
     public ListImagesCmd withFilters(String filters);
 
diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
index a97393aa5..bf46a7624 100644
--- a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -23,20 +23,20 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame>
 
     public String getContainerId();
 
-    public int getTail();
+    public Integer getTail();
 
-    public boolean hasFollowStreamEnabled();
+    public Boolean hasFollowStreamEnabled();
 
-    public boolean hasTimestampsEnabled();
+    public Boolean hasTimestampsEnabled();
 
-    public boolean hasStdoutEnabled();
+    public Boolean hasStdoutEnabled();
 
-    public boolean hasStderrEnabled();
+    public Boolean hasStderrEnabled();
 
     public LogContainerCmd withContainerId(String containerId);
 
     /**
-     * See {@link #withFollowStream(boolean)}
+     * See {@link #withFollowStream(Boolean)}
      */
     public LogContainerCmd withFollowStream();
 
@@ -45,23 +45,23 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame>
      * {@link InputStream#read()} MAY BLOCK FOREVER as long as no data is streamed from the docker host to
      * {@link DockerClient}!
      */
-    public LogContainerCmd withFollowStream(boolean followStream);
+    public LogContainerCmd withFollowStream(Boolean followStream);
 
     public LogContainerCmd withTimestamps();
 
-    public LogContainerCmd withTimestamps(boolean timestamps);
+    public LogContainerCmd withTimestamps(Boolean timestamps);
 
     public LogContainerCmd withStdOut();
 
-    public LogContainerCmd withStdOut(boolean stdout);
+    public LogContainerCmd withStdOut(Boolean stdout);
 
     public LogContainerCmd withStdErr();
 
-    public LogContainerCmd withStdErr(boolean stderr);
+    public LogContainerCmd withStdErr(Boolean stderr);
 
     public LogContainerCmd withTailAll();
 
-    public LogContainerCmd withTail(int tail);
+    public LogContainerCmd withTail(Integer tail);
 
     public static interface Exec extends DockerCmdAsyncExec<LogContainerCmd, Frame> {
     }
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
index fe5378dc2..08aced4ea 100644
--- a/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
@@ -14,17 +14,17 @@ public interface RemoveContainerCmd extends SyncDockerCmd<Void> {
 
     public String getContainerId();
 
-    public boolean hasRemoveVolumesEnabled();
+    public Boolean hasRemoveVolumesEnabled();
 
-    public boolean hasForceEnabled();
+    public Boolean hasForceEnabled();
 
     public RemoveContainerCmd withContainerId(String containerId);
 
-    public RemoveContainerCmd withRemoveVolumes(boolean removeVolumes);
+    public RemoveContainerCmd withRemoveVolumes(Boolean removeVolumes);
 
     public RemoveContainerCmd withForce();
 
-    public RemoveContainerCmd withForce(boolean force);
+    public RemoveContainerCmd withForce(Boolean force);
 
     /**
      * @throws NotFoundException
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
index 99f2835f8..8b56d5ae6 100644
--- a/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
@@ -11,9 +11,9 @@ public interface RemoveImageCmd extends SyncDockerCmd<Void> {
 
     public String getImageId();
 
-    public boolean hasForceEnabled();
+    public Boolean hasForceEnabled();
 
-    public boolean hasNoPruneEnabled();
+    public Boolean hasNoPruneEnabled();
 
     public RemoveImageCmd withImageId(String imageId);
 
@@ -25,7 +25,7 @@ public interface RemoveImageCmd extends SyncDockerCmd<Void> {
     /**
      * force parameter to force delete of an image, even if it's tagged in multiple repositories
      */
-    public RemoveImageCmd withForce(boolean force);
+    public RemoveImageCmd withForce(Boolean force);
 
     /**
      * prevent the deletion of parent images
@@ -36,7 +36,7 @@ public interface RemoveImageCmd extends SyncDockerCmd<Void> {
      * noprune parameter to prevent the deletion of parent images
      *
      */
-    public RemoveImageCmd withNoPrune(boolean noPrune);
+    public RemoveImageCmd withNoPrune(Boolean noPrune);
 
     /**
      * @throws NotFoundException
diff --git a/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
index c2a5219a8..f146269f3 100644
--- a/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
@@ -13,11 +13,11 @@ public interface RestartContainerCmd extends SyncDockerCmd<Void> {
 
     public String getContainerId();
 
-    public int getTimeout();
+    public Integer getTimeout();
 
     public RestartContainerCmd withContainerId(String containerId);
 
-    public RestartContainerCmd withtTimeout(int timeout);
+    public RestartContainerCmd withtTimeout(Integer timeout);
 
     /**
      * @throws NotFoundException
diff --git a/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
index dc620b699..a9f52d62d 100644
--- a/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
@@ -16,11 +16,11 @@ public interface StopContainerCmd extends SyncDockerCmd<Void> {
 
     public String getContainerId();
 
-    public int getTimeout();
+    public Integer getTimeout();
 
     public StopContainerCmd withContainerId(String containerId);
 
-    public StopContainerCmd withTimeout(int timeout);
+    public StopContainerCmd withTimeout(Integer timeout);
 
     /**
      * @throws NotFoundException
diff --git a/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java b/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
index 21895e358..569fddd5e 100644
--- a/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
@@ -19,7 +19,7 @@ public interface TagImageCmd extends SyncDockerCmd<Void> {
 
     public String getTag();
 
-    public boolean hasForceEnabled();
+    public Boolean hasForceEnabled();
 
     public TagImageCmd withImageId(String imageId);
 
@@ -29,7 +29,7 @@ public interface TagImageCmd extends SyncDockerCmd<Void> {
 
     public TagImageCmd withForce();
 
-    public TagImageCmd withForce(boolean force);
+    public TagImageCmd withForce(Boolean force);
 
     public static interface Exec extends DockerCmdSyncExec<TagImageCmd, Void> {
     }
diff --git a/src/main/java/com/github/dockerjava/api/model/AccessMode.java b/src/main/java/com/github/dockerjava/api/model/AccessMode.java
index e87494215..07098cbf2 100644
--- a/src/main/java/com/github/dockerjava/api/model/AccessMode.java
+++ b/src/main/java/com/github/dockerjava/api/model/AccessMode.java
@@ -15,11 +15,11 @@ public enum AccessMode {
      */
     public static final AccessMode DEFAULT = rw;
 
-    public static final AccessMode fromBoolean(boolean accessMode) {
+    public static final AccessMode fromBoolean(Boolean accessMode) {
         return accessMode ? rw : ro;
     }
 
-    public final boolean toBoolean() {
+    public final Boolean toBoolean() {
         return this.equals(AccessMode.rw) ? true : false;
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
index c7ee0af7f..45dabf894 100644
--- a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -1,8 +1,14 @@
 package com.github.dockerjava.api.model;
 
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
+@JsonInclude(Include.NON_NULL)
 public class AuthConfig {
 
     /**
@@ -70,8 +76,7 @@ public void setAuth(String auth) {
 
     @Override
     public String toString() {
-        return "AuthConfig{" + "username='" + username + '\'' + ", password='" + password + '\'' + ", email='" + email
-                + '\'' + ", serverAddress='" + serverAddress + '\'' + '}';
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SIMPLE_STYLE);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/Bind.java b/src/main/java/com/github/dockerjava/api/model/Bind.java
index 60c64d096..f7f6954f5 100644
--- a/src/main/java/com/github/dockerjava/api/model/Bind.java
+++ b/src/main/java/com/github/dockerjava/api/model/Bind.java
@@ -39,7 +39,7 @@ public AccessMode getAccessMode() {
 
     /**
      * Parses a bind mount specification to a {@link Bind}.
-     * 
+     *
      * @param serialized
      *            the specification, e.g. <code>/host:/container:ro</code>
      * @return a {@link Bind} matching the specification
@@ -85,7 +85,7 @@ public int hashCode() {
      * Returns a string representation of this {@link Bind} suitable for inclusion in a JSON message. The format is
      * <code>&lt;host path&gt;:&lt;container path&gt;:&lt;access mode&gt;</code>, like the argument in
      * {@link #parse(String)}.
-     * 
+     *
      * @return a string representation of this {@link Bind}
      */
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
index 37fae34e7..47e231164 100644
--- a/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
@@ -25,7 +25,7 @@ public String getStream() {
      * Returns whether the stream field indicates a successful build operation
      */
     @JsonIgnore
-    public boolean isBuildSuccessIndicated() {
+    public Boolean isBuildSuccessIndicated() {
         if (getStream() == null)
             return false;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/ChangeLog.java b/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
index f565cfaa7..36804362c 100644
--- a/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
+++ b/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
@@ -17,13 +17,13 @@ public class ChangeLog {
     private String path;
 
     @JsonProperty("Kind")
-    private int kind;
+    private Integer kind;
 
     public String getPath() {
         return path;
     }
 
-    public int getKind() {
+    public Integer getKind() {
         return kind;
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Container.java b/src/main/java/com/github/dockerjava/api/model/Container.java
index 8152974e3..f6a7dbfd2 100644
--- a/src/main/java/com/github/dockerjava/api/model/Container.java
+++ b/src/main/java/com/github/dockerjava/api/model/Container.java
@@ -5,7 +5,9 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
 /**
  *
@@ -13,13 +15,14 @@
  *
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(Include.NON_NULL)
 public class Container {
 
     @JsonProperty("Command")
     private String command;
 
     @JsonProperty("Created")
-    private long created;
+    private Long created;
 
     @JsonProperty("Id")
     private String id;
@@ -51,7 +54,7 @@ public String getImage() {
         return image;
     }
 
-    public long getCreated() {
+    public Long getCreated() {
         return created;
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
index 34cb71d4d..f119888f8 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
@@ -6,7 +6,9 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
 /**
  *
@@ -14,16 +16,17 @@
  *
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(Include.NON_NULL)
 public class ContainerConfig {
 
     @JsonProperty("AttachStderr")
-    private boolean attachStderr = false;
+    private Boolean attachStderr = false;
 
     @JsonProperty("AttachStdin")
-    private boolean attachStdin = false;
+    private Boolean attachStdin = false;
 
     @JsonProperty("AttachStdout")
-    private boolean attachStdout = false;
+    private Boolean attachStdout = false;
 
     @JsonProperty("Cmd")
     private String[] cmd;
@@ -53,22 +56,22 @@ public class ContainerConfig {
     private String macAddress;
 
     @JsonProperty("NetworkDisabled")
-    private boolean networkDisabled = false;
+    private Boolean networkDisabled = false;
 
     @JsonProperty("OnBuild")
     private String[] onBuild;
 
     @JsonProperty("OpenStdin")
-    private boolean stdinOpen = false;
+    private Boolean stdinOpen = false;
 
     @JsonProperty("PortSpecs")
     private String[] portSpecs;
 
     @JsonProperty("StdinOnce")
-    private boolean stdInOnce = false;
+    private Boolean stdInOnce = false;
 
     @JsonProperty("Tty")
-    private boolean tty = false;
+    private Boolean tty = false;
 
     @JsonProperty("User")
     private String user = "";
@@ -84,7 +87,7 @@ public ExposedPort[] getExposedPorts() {
         return exposedPorts.getExposedPorts();
     }
 
-    public boolean isNetworkDisabled() {
+    public Boolean isNetworkDisabled() {
         return networkDisabled;
     }
 
@@ -108,15 +111,15 @@ public String getUser() {
         return user;
     }
 
-    public boolean isTty() {
+    public Boolean isTty() {
         return tty;
     }
 
-    public boolean isStdinOpen() {
+    public Boolean isStdinOpen() {
         return stdinOpen;
     }
 
-    public boolean isStdInOnce() {
+    public Boolean isStdInOnce() {
         return stdInOnce;
     }
 
@@ -124,15 +127,15 @@ public String getMacAddress() {
         return macAddress;
     }
 
-    public boolean isAttachStdin() {
+    public Boolean isAttachStdin() {
         return attachStdin;
     }
 
-    public boolean isAttachStdout() {
+    public Boolean isAttachStdout() {
         return attachStdout;
     }
 
-    public boolean isAttachStderr() {
+    public Boolean isAttachStderr() {
         return attachStderr;
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Device.java b/src/main/java/com/github/dockerjava/api/model/Device.java
index 713c0d61a..71402dd68 100644
--- a/src/main/java/com/github/dockerjava/api/model/Device.java
+++ b/src/main/java/com/github/dockerjava/api/model/Device.java
@@ -5,8 +5,11 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
+@JsonInclude(Include.NON_NULL)
 public class Device {
 
     @JsonProperty("CgroupPermissions")
diff --git a/src/main/java/com/github/dockerjava/api/model/DriverStatus.java b/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
index 303e820ba..0bef3c28d 100644
--- a/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
+++ b/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
@@ -3,25 +3,28 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
 /**
  * Created by ben on 12/12/13.
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(Include.NON_NULL)
 public class DriverStatus {
 
     @JsonProperty("Root Dir")
     private String rootDir;
 
     @JsonProperty("Dirs")
-    private int dirs;
+    private Integer dirs;
 
     public String getRootDir() {
         return rootDir;
     }
 
-    public int getDirs() {
+    public Integer getDirs() {
         return dirs;
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java b/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
index 8abffe6c4..5f8c01670 100644
--- a/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
+++ b/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
@@ -1,7 +1,10 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
+@JsonInclude(Include.NON_NULL)
 public class ErrorDetail {
     @JsonProperty
     private String message;
diff --git a/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java b/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
index d589a31d1..6723cd070 100644
--- a/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
+++ b/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
@@ -1,7 +1,10 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
+@JsonInclude(Include.NON_NULL)
 public class ErrorResponse {
     @JsonProperty
     private ErrorDetail errorDetail;
diff --git a/src/main/java/com/github/dockerjava/api/model/Event.java b/src/main/java/com/github/dockerjava/api/model/Event.java
index 8d3877ff2..1ec0f433d 100644
--- a/src/main/java/com/github/dockerjava/api/model/Event.java
+++ b/src/main/java/com/github/dockerjava/api/model/Event.java
@@ -3,11 +3,14 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
 /**
  * Representation of a Docker event.
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(Include.NON_NULL)
 public class Event {
     private String status;
 
@@ -15,7 +18,7 @@ public class Event {
 
     private String from;
 
-    private long time;
+    private Long time;
 
     @JsonIgnoreProperties
     private Node node;
@@ -41,7 +44,7 @@ public Event() {
      *            Event time The time is specified in milliseconds since January 1, 1970, 00:00:00 GMT
      * @since TODO
      */
-    public Event(String status, String id, String from, long time) {
+    public Event(String status, String id, String from, Long time) {
         this.status = status;
         this.id = id;
         this.from = from;
@@ -82,7 +85,7 @@ public String getFrom() {
      *
      * @return Event time in the specified format.
      */
-    public long getTime() {
+    public Long getTime() {
         return time;
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/model/ExposedPort.java b/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
index 23510e50a..4dbdbe19b 100644
--- a/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
+++ b/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
@@ -38,7 +38,7 @@ public class ExposedPort {
 
     /**
      * Creates an {@link ExposedPort} for the given parameters.
-     * 
+     *
      * @param port
      *            the {@link #getPort() port number}
      * @param protocol
@@ -51,7 +51,7 @@ public ExposedPort(int port, InternetProtocol protocol) {
 
     /**
      * Creates an {@link ExposedPort} for the given {@link #getPort() port number} and {@link InternetProtocol#DEFAULT}.
-     * 
+     *
      * @param port
      *            the {@link #getPort() port number}
      */
@@ -61,7 +61,7 @@ public ExposedPort(int port) {
 
     /**
      * Creates an {@link ExposedPort} for the given parameters.
-     * 
+     *
      * @param scheme
      *            the {@link #getScheme() scheme}, <code>tcp</code> or <code>udp</code>
      * @param port
@@ -112,7 +112,7 @@ public static ExposedPort udp(int port) {
 
     /**
      * Parses a textual port specification (as used by the Docker CLI) to an {@link ExposedPort}.
-     * 
+     *
      * @param serialized
      *            the specification, e.g. <code>80/tcp</code>
      * @return an {@link ExposedPort} matching the specification
@@ -138,7 +138,7 @@ public static ExposedPort parse(String serialized) throws IllegalArgumentExcepti
     /**
      * Returns a string representation of this {@link ExposedPort} suitable for inclusion in a JSON message. The format
      * is <code>port/protocol</code>, like the argument in {@link #parse(String)}.
-     * 
+     *
      * @return a string representation of this {@link ExposedPort}
      */
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 9b31e05a9..36e9ee93d 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -4,34 +4,43 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(Include.NON_NULL)
 public class HostConfig {
 
     @JsonProperty("Binds")
     private Binds binds;
 
-    @JsonProperty("Links")
-    private Links links;
+    @JsonProperty("BlkioWeight")
+    private Integer blkioWeight;
 
-    @JsonProperty("LxcConf")
-    private LxcConf[] lxcConf;
+    @JsonProperty("CapAdd")
+    private Capability[] capAdd;
 
-    @JsonProperty("LogConfig")
-    private LogConfig logConfig;
+    @JsonProperty("CapDrop")
+    private Capability[] capDrop;
 
-    @JsonProperty("PortBindings")
-    private Ports portBindings;
+    @JsonProperty("ContainerIDFile")
+    private String containerIDFile;
 
-    @JsonProperty("PublishAllPorts")
-    private boolean publishAllPorts;
+    @JsonProperty("CpuPeriod")
+    private Integer cpuPeriod;
 
-    @JsonProperty("Privileged")
-    private boolean privileged;
+    @JsonProperty("CpuShares")
+    private Integer cpuShares;
 
-    @JsonProperty("ReadonlyRootfs")
-    private boolean readonlyRootfs;
+    @JsonProperty("CpusetCpus")
+    private String cpusetCpus;
+
+    @JsonProperty("CpusetMems")
+    private String cpusetMems;
+
+    @JsonProperty("Devices")
+    private Device[] devices;
 
     @JsonProperty("Dns")
     private String[] dns;
@@ -39,159 +48,188 @@ public class HostConfig {
     @JsonProperty("DnsSearch")
     private String[] dnsSearch;
 
-    @JsonProperty("VolumesFrom")
-    private VolumesFrom[] volumesFrom;
+    @JsonProperty("ExtraHosts")
+    private String[] extraHosts;
 
-    @JsonProperty("ContainerIDFile")
-    private String containerIDFile;
+    @JsonProperty("Links")
+    private Links links;
 
-    @JsonProperty("CapAdd")
-    private Capability[] capAdd;
+    @JsonProperty("LogConfig")
+    private LogConfig logConfig;
 
-    @JsonProperty("CapDrop")
-    private Capability[] capDrop;
+    @JsonProperty("LxcConf")
+    private LxcConf[] lxcConf;
 
-    @JsonProperty("RestartPolicy")
-    private RestartPolicy restartPolicy;
+    @JsonProperty("Memory")
+    private Long memory;
+
+    @JsonProperty("MemorySwap")
+    private Long memorySwap;
 
     @JsonProperty("NetworkMode")
     private String networkMode;
 
-    @JsonProperty("Devices")
-    private Device[] devices;
+    @JsonProperty("OomKillDisable")
+    private Boolean oomKillDisable;
 
-    @JsonProperty("ExtraHosts")
-    private String[] extraHosts;
+    @JsonProperty("PortBindings")
+    private Ports portBindings;
 
-    @JsonProperty("Ulimits")
-    private Ulimit[] ulimits;
+    @JsonProperty("Privileged")
+    private Boolean privileged;
 
-    @JsonProperty("Memory")
-    private long memoryLimit = 0;
+    @JsonProperty("PublishAllPorts")
+    private Boolean publishAllPorts;
 
-    @JsonProperty("MemorySwap")
-    private long memorySwap = 0;
+    @JsonProperty("ReadonlyRootfs")
+    private Boolean readonlyRootfs;
 
-    @JsonProperty("CpuShares")
-    private int cpuShares = 0;
+    @JsonProperty("RestartPolicy")
+    private RestartPolicy restartPolicy;
+
+    @JsonProperty("Ulimits")
+    private Ulimit[] ulimits;
+
+    @JsonProperty("VolumesFrom")
+    private VolumesFrom[] volumesFrom;
 
     public HostConfig() {
     }
 
-    public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, LogConfig logConfig, Ports portBindings,
-            boolean publishAllPorts, boolean privileged, boolean readonlyRootfs, String[] dns, String[] dnsSearch,
-            VolumesFrom[] volumesFrom, String containerIDFile, Capability[] capAdd, Capability[] capDrop,
-            RestartPolicy restartPolicy, String networkMode, Device[] devices, String[] extraHosts, Ulimit[] ulimits) {
-        this.binds = new Binds(binds);
-        this.links = new Links(links);
-        this.lxcConf = lxcConf;
-        this.logConfig = logConfig;
-        this.portBindings = portBindings;
-        this.publishAllPorts = publishAllPorts;
-        this.privileged = privileged;
-        this.readonlyRootfs = readonlyRootfs;
-        this.dns = dns;
-        this.dnsSearch = dnsSearch;
-        this.volumesFrom = volumesFrom;
-        this.containerIDFile = containerIDFile;
-        this.capAdd = capAdd;
-        this.capDrop = capDrop;
-        this.restartPolicy = restartPolicy;
-        this.networkMode = networkMode;
-        this.devices = devices;
-        this.extraHosts = extraHosts;
-        this.ulimits = ulimits;
-    }
+    // public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, LogConfig logConfig, Ports portBindings,
+    // Boolean publishAllPorts, Boolean privileged, Boolean readonlyRootfs, String[] dns, String[] dnsSearch,
+    // VolumesFrom[] volumesFrom, String containerIDFile, Capability[] capAdd, Capability[] capDrop,
+    // RestartPolicy restartPolicy, String networkMode, Device[] devices, String[] extraHosts, Ulimit[] ulimits) {
+    // this.binds = new Binds(binds);
+    // this.links = new Links(links);
+    // this.lxcConf = lxcConf;
+    // this.logConfig = logConfig;
+    // this.portBindings = portBindings;
+    // this.publishAllPorts = publishAllPorts;
+    // this.privileged = privileged;
+    // this.readonlyRootfs = readonlyRootfs;
+    // this.dns = dns;
+    // this.dnsSearch = dnsSearch;
+    // this.volumesFrom = volumesFrom;
+    // this.containerIDFile = containerIDFile;
+    // this.capAdd = capAdd;
+    // this.capDrop = capDrop;
+    // this.restartPolicy = restartPolicy;
+    // this.networkMode = networkMode;
+    // this.devices = devices;
+    // this.extraHosts = extraHosts;
+    // this.ulimits = ulimits;
+    // }
 
     @JsonIgnore
     public Bind[] getBinds() {
         return (binds == null) ? new Bind[0] : binds.getBinds();
     }
 
-    public LxcConf[] getLxcConf() {
-        return lxcConf;
+    public Integer getBlkioWeight() {
+        return blkioWeight;
     }
 
-    @JsonIgnore
-    public LogConfig getLogConfig() {
-        return (logConfig == null) ? new LogConfig() : logConfig;
+    public Capability[] getCapAdd() {
+        return capAdd;
     }
 
-    public Ports getPortBindings() {
-        return portBindings;
+    public Capability[] getCapDrop() {
+        return capDrop;
     }
 
-    public boolean isPublishAllPorts() {
-        return publishAllPorts;
+    public String getContainerIDFile() {
+        return containerIDFile;
     }
 
-    public boolean isPrivileged() {
-        return privileged;
+    public Integer getCpuPeriod() {
+        return cpuPeriod;
     }
 
-    public boolean isReadonlyRootfs() {
-        return readonlyRootfs;
+    public Integer getCpuShares() {
+        return cpuShares;
     }
 
-    public String[] getDns() {
-        return dns;
+    public String getCpusetCpus() {
+        return cpusetCpus;
     }
 
-    public VolumesFrom[] getVolumesFrom() {
-        return volumesFrom;
+    public String getCpusetMems() {
+        return cpusetMems;
     }
 
-    public String getContainerIDFile() {
-        return containerIDFile;
+    public Device[] getDevices() {
+        return devices;
+    }
+
+    public String[] getDns() {
+        return dns;
     }
 
     public String[] getDnsSearch() {
         return dnsSearch;
     }
 
+    public String[] getExtraHosts() {
+        return extraHosts;
+    }
+
     @JsonIgnore
     public Link[] getLinks() {
         return (links == null) ? new Link[0] : links.getLinks();
     }
 
-    public String getNetworkMode() {
-        return networkMode;
+    @JsonIgnore
+    public LogConfig getLogConfig() {
+        return (logConfig == null) ? new LogConfig() : logConfig;
     }
 
-    public Device[] getDevices() {
-        return devices;
+    public LxcConf[] getLxcConf() {
+        return lxcConf;
     }
 
-    public String[] getExtraHosts() {
-        return extraHosts;
+    public Long getMemory() {
+        return memory;
     }
 
-    public RestartPolicy getRestartPolicy() {
-        return restartPolicy;
+    public Long getMemorySwap() {
+        return memorySwap;
     }
 
-    public Capability[] getCapAdd() {
-        return capAdd;
+    public String getNetworkMode() {
+        return networkMode;
     }
 
-    public Capability[] getCapDrop() {
-        return capDrop;
+    public Ports getPortBindings() {
+        return portBindings;
+    }
+
+    public RestartPolicy getRestartPolicy() {
+        return restartPolicy;
     }
 
     public Ulimit[] getUlimits() {
         return ulimits;
     }
 
-    public long getMemoryLimit() {
-        return memoryLimit;
+    public VolumesFrom[] getVolumesFrom() {
+        return volumesFrom;
     }
 
-    public long getMemorySwap() {
-        return memorySwap;
+    public Boolean isOomKillDisable() {
+        return oomKillDisable;
     }
 
-    public int getCpuShares() {
-        return cpuShares;
+    public Boolean isPrivileged() {
+        return privileged;
+    }
+
+    public Boolean isPublishAllPorts() {
+        return publishAllPorts;
+    }
+
+    public Boolean isReadonlyRootfs() {
+        return readonlyRootfs;
     }
 
     @JsonIgnore
@@ -199,34 +237,40 @@ public void setBinds(Bind... binds) {
         this.binds = new Binds(binds);
     }
 
-    @JsonIgnore
-    public void setLinks(Link... links) {
-        this.links = new Links(links);
+    public void setBlkioWeight(Integer blkioWeight) {
+        this.blkioWeight = blkioWeight;
     }
 
-    public void setLxcConf(LxcConf[] lxcConf) {
-        this.lxcConf = lxcConf;
+    public void setCpuPeriod(Integer cpuPeriod) {
+        this.cpuPeriod = cpuPeriod;
     }
 
-    @JsonIgnore
-    public void setLogConfig(LogConfig logConfig) {
-        this.logConfig = logConfig;
+    public void setCpuShares(Integer cpuShares) {
+        this.cpuShares = cpuShares;
     }
 
-    public void setPortBindings(Ports portBindings) {
-        this.portBindings = portBindings;
+    public void setCpusetCpus(String cpusetCpus) {
+        this.cpusetCpus = cpusetCpus;
     }
 
-    public void setPublishAllPorts(boolean publishAllPorts) {
-        this.publishAllPorts = publishAllPorts;
+    public void setCpusetMems(String cpusetMems) {
+        this.cpusetMems = cpusetMems;
     }
 
-    public void setPrivileged(boolean privileged) {
-        this.privileged = privileged;
+    public void setCapAdd(Capability[] capAdd) {
+        this.capAdd = capAdd;
     }
 
-    public void setReadonlyRootfs(boolean readonlyRootfs) {
-        this.readonlyRootfs = readonlyRootfs;
+    public void setCapDrop(Capability[] capDrop) {
+        this.capDrop = capDrop;
+    }
+
+    public void setContainerIDFile(String containerIDFile) {
+        this.containerIDFile = containerIDFile;
+    }
+
+    public void setDevices(Device[] devices) {
+        this.devices = devices;
     }
 
     public void setDns(String[] dns) {
@@ -237,42 +281,68 @@ public void setDnsSearch(String[] dnsSearch) {
         this.dnsSearch = dnsSearch;
     }
 
-    public void setVolumesFrom(VolumesFrom[] volumesFrom) {
-        this.volumesFrom = volumesFrom;
+    public void setExtraHosts(String[] extraHosts) {
+        this.extraHosts = extraHosts;
     }
 
-    public void setContainerIDFile(String containerIDFile) {
-        this.containerIDFile = containerIDFile;
+    @JsonIgnore
+    public void setLinks(Link... links) {
+        this.links = new Links(links);
     }
 
-    public void setCapAdd(Capability[] capAdd) {
-        this.capAdd = capAdd;
+    @JsonIgnore
+    public void setLogConfig(LogConfig logConfig) {
+        this.logConfig = logConfig;
     }
 
-    public void setCapDrop(Capability[] capDrop) {
-        this.capDrop = capDrop;
+    public void setLxcConf(LxcConf[] lxcConf) {
+        this.lxcConf = lxcConf;
     }
 
-    public void setRestartPolicy(RestartPolicy restartPolicy) {
-        this.restartPolicy = restartPolicy;
+    public void setMemory(Long memory) {
+        this.memory = memory;
+    }
+
+    public void setMemorySwap(Long memorySwap) {
+        this.memorySwap = memorySwap;
     }
 
     public void setNetworkMode(String networkMode) {
         this.networkMode = networkMode;
     }
 
-    public void setDevices(Device[] devices) {
-        this.devices = devices;
+    public void setOomKillDisable(Boolean oomKillDisable) {
+        this.oomKillDisable = oomKillDisable;
     }
 
-    public void setExtraHosts(String[] extraHosts) {
-        this.extraHosts = extraHosts;
+    public void setPortBindings(Ports portBindings) {
+        this.portBindings = portBindings;
+    }
+
+    public void setPrivileged(Boolean privileged) {
+        this.privileged = privileged;
+    }
+
+    public void setPublishAllPorts(Boolean publishAllPorts) {
+        this.publishAllPorts = publishAllPorts;
+    }
+
+    public void setReadonlyRootfs(Boolean readonlyRootfs) {
+        this.readonlyRootfs = readonlyRootfs;
+    }
+
+    public void setRestartPolicy(RestartPolicy restartPolicy) {
+        this.restartPolicy = restartPolicy;
     }
 
     public void setUlimits(Ulimit[] ulimits) {
         this.ulimits = ulimits;
     }
 
+    public void setVolumesFrom(VolumesFrom[] volumesFrom) {
+        this.volumesFrom = volumesFrom;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
diff --git a/src/main/java/com/github/dockerjava/api/model/Image.java b/src/main/java/com/github/dockerjava/api/model/Image.java
index 9df8aacef..3c84c9584 100644
--- a/src/main/java/com/github/dockerjava/api/model/Image.java
+++ b/src/main/java/com/github/dockerjava/api/model/Image.java
@@ -3,7 +3,9 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
 /**
  *
@@ -11,10 +13,11 @@
  *
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(Include.NON_NULL)
 public class Image {
 
     @JsonProperty("Created")
-    private long created;
+    private Long created;
 
     @JsonProperty("Id")
     private String id;
@@ -26,10 +29,10 @@ public class Image {
     private String[] repoTags;
 
     @JsonProperty("Size")
-    private long size;
+    private Long size;
 
     @JsonProperty("VirtualSize")
-    private long virtualSize;
+    private Long virtualSize;
 
     public String getId() {
         return id;
@@ -43,15 +46,15 @@ public String getParentId() {
         return parentId;
     }
 
-    public long getCreated() {
+    public Long getCreated() {
         return created;
     }
 
-    public long getSize() {
+    public Long getSize() {
         return size;
     }
 
-    public long getVirtualSize() {
+    public Long getVirtualSize() {
         return virtualSize;
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Info.java b/src/main/java/com/github/dockerjava/api/model/Info.java
index 5ff53a597..d038df878 100644
--- a/src/main/java/com/github/dockerjava/api/model/Info.java
+++ b/src/main/java/com/github/dockerjava/api/model/Info.java
@@ -8,23 +8,21 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 /**
  *
  * @author Konstantin Pelykh (kpelykh@gmail.com)
  *
  */
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
 @JsonInclude(Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Info {
 
     @JsonProperty("Containers")
-    private int containers;
+    private Integer containers;
 
     @JsonProperty("Debug")
-    private boolean debug;
+    private Boolean debug;
 
     @JsonProperty("DockerRootDir")
     private String DockerRootDir;
@@ -42,10 +40,10 @@ public class Info {
     private String ID;
 
     @JsonProperty("IPv4Forwarding")
-    private boolean IPv4Forwarding;
+    private Boolean IPv4Forwarding;
 
     @JsonProperty("Images")
-    private int images;
+    private Integer images;
 
     @JsonProperty("IndexServerAddress")
     private String IndexServerAddress;
@@ -63,25 +61,25 @@ public class Info {
     private String[] Labels;
 
     @JsonProperty("MemoryLimit")
-    private boolean memoryLimit;
+    private Boolean memoryLimit;
 
     @JsonProperty("MemTotal")
-    private long memTotal;
+    private Long memTotal;
 
     @JsonProperty("Name")
     private String name;
 
     @JsonProperty("NCPU")
-    private int NCPU;
+    private Integer NCPU;
 
     @JsonProperty("NEventsListener")
-    private long nEventListener;
+    private Long nEventListener;
 
     @JsonProperty("NFd")
-    private int NFd;
+    private Integer NFd;
 
     @JsonProperty("NGoroutines")
-    private int NGoroutines;
+    private Integer NGoroutines;
 
     @JsonProperty("OperatingSystem")
     private String OperatingSystem;
@@ -90,13 +88,13 @@ public class Info {
     private String[] sockets;
 
     @JsonProperty("SwapLimit")
-    private boolean swapLimit;
+    private Boolean swapLimit;
 
-    public boolean isDebug() {
+    public Boolean isDebug() {
         return debug;
     }
 
-    public int getContainers() {
+    public Integer getContainers() {
         return containers;
     }
 
@@ -112,7 +110,7 @@ public List<Object> getDriverStatuses() {
         return driverStatuses;
     }
 
-    public int getImages() {
+    public Integer getImages() {
         return images;
     }
 
@@ -120,7 +118,7 @@ public String getID() {
         return ID;
     }
 
-    public boolean getIPv4Forwarding() {
+    public Boolean getIPv4Forwarding() {
         return IPv4Forwarding;
     }
 
@@ -148,15 +146,15 @@ public String[] getSockets() {
         return sockets;
     }
 
-    public boolean isMemoryLimit() {
+    public Boolean isMemoryLimit() {
         return memoryLimit;
     }
 
-    public long getnEventListener() {
+    public Long getnEventListener() {
         return nEventListener;
     }
 
-    public long getMemTotal() {
+    public Long getMemTotal() {
         return memTotal;
     }
 
@@ -164,15 +162,15 @@ public String getName() {
         return name;
     }
 
-    public int getNCPU() {
+    public Integer getNCPU() {
         return NCPU;
     }
 
-    public int getNFd() {
+    public Integer getNFd() {
         return NFd;
     }
 
-    public int getNGoroutines() {
+    public Integer getNGoroutines() {
         return NGoroutines;
     }
 
@@ -180,7 +178,7 @@ public String getOperatingSystem() {
         return OperatingSystem;
     }
 
-    public boolean getSwapLimit() {
+    public Boolean getSwapLimit() {
         return swapLimit;
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Link.java b/src/main/java/com/github/dockerjava/api/model/Link.java
index 0b2c828f3..43f9de65b 100644
--- a/src/main/java/com/github/dockerjava/api/model/Link.java
+++ b/src/main/java/com/github/dockerjava/api/model/Link.java
@@ -17,7 +17,7 @@ public class Link {
 
     /**
      * Creates a {@link Link} for the container with the given name and an aliased name for use in the target container.
-     * 
+     *
      * @param name
      *            the name of the container that you want to link into the target container
      * @param alias
@@ -44,7 +44,7 @@ public String getAlias() {
 
     /**
      * Parses a textual link specification (as used by the Docker CLI) to a {@link Link}.
-     * 
+     *
      * @param serialized
      *            the specification, e.g. <code>name:alias</code> or <code>/name1:/name2/alias</code>
      * @return a {@link Link} matching the specification
@@ -86,7 +86,7 @@ public int hashCode() {
     /**
      * Returns a string representation of this {@link Link} suitable for inclusion in a JSON message. The format is
      * <code>name:alias</code>, like the argument in {@link #parse(String)}.
-     * 
+     *
      * @return a string representation of this {@link Link}
      */
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/LxcConf.java b/src/main/java/com/github/dockerjava/api/model/LxcConf.java
index f97588308..779aa4c78 100644
--- a/src/main/java/com/github/dockerjava/api/model/LxcConf.java
+++ b/src/main/java/com/github/dockerjava/api/model/LxcConf.java
@@ -1,7 +1,10 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
+@JsonInclude(Include.NON_NULL)
 public class LxcConf {
     @JsonProperty("Key")
     public String key;
diff --git a/src/main/java/com/github/dockerjava/api/model/Node.java b/src/main/java/com/github/dockerjava/api/model/Node.java
index 4bbeeec38..902f805b8 100644
--- a/src/main/java/com/github/dockerjava/api/model/Node.java
+++ b/src/main/java/com/github/dockerjava/api/model/Node.java
@@ -1,10 +1,13 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
 /**
  * A node as returned by the /events API, for instance, when Swarm is used.
  */
+@JsonInclude(Include.NON_NULL)
 public class Node {
 
     @JsonProperty("Name")
diff --git a/src/main/java/com/github/dockerjava/api/model/Ports.java b/src/main/java/com/github/dockerjava/api/model/Ports.java
index 54aa8b226..a5f13977b 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -30,7 +30,7 @@
  * <p>
  * <i>Note: This is an abstraction used for querying existing port bindings from a container configuration. It is not to
  * be confused with the {@link PortBinding} abstraction used for adding new port bindings to a container.</i>
- * 
+ *
  * @see HostConfig#getPortBindings()
  * @see NetworkSettings#getPorts()
  */
@@ -93,7 +93,7 @@ public String toString() {
     /**
      * Returns the port bindings in the format used by the Docker remote API, i.e. the {@link Binding}s grouped by
      * {@link ExposedPort}.
-     * 
+     *
      * @return the port bindings as a {@link Map} that contains one or more {@link Binding}s per {@link ExposedPort}.
      */
     public Map<ExposedPort, Binding[]> getBindings() {
@@ -128,7 +128,7 @@ public static Binding Binding(Integer hostPort) {
      * A {@link Binding} represents a socket on the Docker host that is used in a {@link PortBinding}. It is
      * characterized by an {@link #getHostIp() IP address} and a {@link #getHostPort() port number}. Both properties may
      * be <code>null</code> in order to let Docker assign them dynamically/using defaults.
-     * 
+     *
      * @see Ports#bind(ExposedPort, Binding)
      * @see ExposedPort
      */
@@ -141,7 +141,7 @@ public static class Binding {
         /**
          * Creates a {@link Binding} for the given {@link #getHostIp() IP address} and {@link #getHostPort() port
          * number}.
-         * 
+         *
          * @see Ports#bind(ExposedPort, Binding)
          * @see ExposedPort
          */
@@ -153,7 +153,7 @@ public Binding(String hostIp, Integer hostPort) {
         /**
          * Creates a {@link Binding} for the given {@link #getHostPort() port number}, leaving the {@link #getHostIp()
          * IP address} undefined.
-         * 
+         *
          * @see Ports#bind(ExposedPort, Binding)
          * @see ExposedPort
          */
@@ -197,7 +197,7 @@ public Integer getHostPort() {
          * Parses a textual host and port specification (as used by the Docker CLI) to a {@link Binding}.
          * <p>
          * Legal syntax: <code>IP|IP:port|port</code>
-         * 
+         *
          * @param serialized
          *            serialized the specification, e.g. <code>127.0.0.1:80</code>
          * @return a {@link Binding} matching the specification
@@ -230,7 +230,7 @@ public static Binding parse(String serialized) throws IllegalArgumentException {
         /**
          * Returns a string representation of this {@link Binding} suitable for inclusion in a JSON message. The format
          * is <code>[IP:]Port</code>, like the argument in {@link #parse(String)}.
-         * 
+         *
          * @return a string representation of this {@link Binding}
          */
         @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
index b2bedca60..6da3f8e91 100644
--- a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
@@ -17,7 +17,7 @@ public class PullResponseItem extends ResponseItem {
      * @returns true: status indicates that pull was successful, false: status doesn't indicate a successful pull
      */
     @JsonIgnore
-    public boolean isPullSuccessIndicated() {
+    public Boolean isPullSuccessIndicated() {
         if (getStatus() == null)
             return false;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
index 2555271fd..f53c90842 100644
--- a/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
@@ -17,7 +17,7 @@ public class PushResponseItem extends ResponseItem {
      * @returns true: the error field indicates an error, false: the error field doesn't indicate an error
      */
     @JsonIgnore
-    public boolean isErrorIndicated() {
+    public Boolean isErrorIndicated() {
         if (getError() == null)
             return false;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
index 3ea625164..272defd52 100644
--- a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
@@ -63,10 +63,10 @@ public static class ProgressDetail implements Serializable {
         private static final long serialVersionUID = -1954994695645715264L;
 
         @JsonProperty("current")
-        int current;
+        Integer current;
 
         @JsonProperty("total")
-        int total;
+        Integer total;
 
         @Override
         public String toString() {
diff --git a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
index e96821cf1..cd437667f 100644
--- a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
+++ b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
@@ -9,16 +9,16 @@
 
 /**
  * Container restart policy
- * 
+ *
  * <dl>
  * <dt>no</dt>
  * <dd>Do not restart the container if it dies. (default)</dd>
- * 
+ *
  * <dt>on-failure</dt>
  * <dd>Restart the container if it exits with a non-zero exit code. Can also accept an optional maximum restart count
  * (e.g. on-failure:5).
  * <dd>
- * 
+ *
  * <dt>always</dt>
  * <dd>Always restart the container no matter what exit code is returned.
  * <dd>
@@ -30,7 +30,7 @@
 public class RestartPolicy {
 
     @JsonProperty("MaximumRetryCount")
-    private int maximumRetryCount = 0;
+    private Integer maximumRetryCount = 0;
 
     @JsonProperty("Name")
     private String name = "";
@@ -60,7 +60,7 @@ public static RestartPolicy alwaysRestart() {
 
     /**
      * Restart the container if it exits with a non-zero exit code.
-     * 
+     *
      * @param maximumRetryCount
      *            the maximum number of restarts. Set to <code>0</code> for unlimited retries.
      */
@@ -68,7 +68,7 @@ public static RestartPolicy onFailureRestart(int maximumRetryCount) {
         return new RestartPolicy(maximumRetryCount, "on-failure");
     }
 
-    public int getMaximumRetryCount() {
+    public Integer getMaximumRetryCount() {
         return maximumRetryCount;
     }
 
@@ -78,7 +78,7 @@ public String getName() {
 
     /**
      * Parses a textual restart polixy specification (as used by the Docker CLI) to a {@link RestartPolicy}.
-     * 
+     *
      * @param serialized
      *            the specification, e.g. <code>on-failure:2</code>
      * @return a {@link RestartPolicy} matching the specification
@@ -109,7 +109,7 @@ public static RestartPolicy parse(String serialized) throws IllegalArgumentExcep
     /**
      * Returns a string representation of this {@link RestartPolicy}. The format is <code>name[:count]</code>, like the
      * argument in {@link #parse(String)}.
-     * 
+     *
      * @return a string representation of this {@link RestartPolicy}
      */
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/SearchItem.java b/src/main/java/com/github/dockerjava/api/model/SearchItem.java
index 5c5206616..0a5843838 100644
--- a/src/main/java/com/github/dockerjava/api/model/SearchItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/SearchItem.java
@@ -14,13 +14,13 @@
 public class SearchItem {
 
     @JsonProperty("star_count")
-    private int starCount;
+    private Integer starCount;
 
     @JsonProperty("is_official")
-    private boolean isOfficial;
+    private Boolean isOfficial;
 
     @JsonProperty("is_trusted")
-    private boolean isTrusted;
+    private Boolean isTrusted;
 
     @JsonProperty("name")
     private String name;
@@ -28,15 +28,15 @@ public class SearchItem {
     @JsonProperty("description")
     private String description;
 
-    public int getStarCount() {
+    public Integer getStarCount() {
         return starCount;
     }
 
-    public boolean isOfficial() {
+    public Boolean isOfficial() {
         return isOfficial;
     }
 
-    public boolean isTrusted() {
+    public Boolean isTrusted() {
         return isTrusted;
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Statistics.java b/src/main/java/com/github/dockerjava/api/model/Statistics.java
index f6acf16ee..13747339b 100644
--- a/src/main/java/com/github/dockerjava/api/model/Statistics.java
+++ b/src/main/java/com/github/dockerjava/api/model/Statistics.java
@@ -5,12 +5,15 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
 /**
  * Representation of a Docker statistics.
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(Include.NON_NULL)
 public class Statistics {
 
     @JsonProperty("read")
diff --git a/src/main/java/com/github/dockerjava/api/model/Ulimit.java b/src/main/java/com/github/dockerjava/api/model/Ulimit.java
index d385adbe2..209eb22fe 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ulimit.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ulimit.java
@@ -16,10 +16,10 @@ public class Ulimit {
     private String name;
 
     @JsonProperty("Soft")
-    private int soft;
+    private Integer soft;
 
     @JsonProperty("Hard")
-    private int hard;
+    private Integer hard;
 
     public Ulimit() {
 
@@ -37,11 +37,11 @@ public String getName() {
         return name;
     }
 
-    public int getSoft() {
+    public Integer getSoft() {
         return soft;
     }
 
-    public int getHard() {
+    public Integer getHard() {
         return hard;
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Volume.java b/src/main/java/com/github/dockerjava/api/model/Volume.java
index f7ff8e288..93f7e4e4f 100644
--- a/src/main/java/com/github/dockerjava/api/model/Volume.java
+++ b/src/main/java/com/github/dockerjava/api/model/Volume.java
@@ -5,7 +5,7 @@
 
 /**
  * Represents a bind mounted volume in a Docker container.
- * 
+ *
  * @see Bind
  */
 public class Volume {
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeRW.java b/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
index 09a2d8d6a..46d4539b4 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
@@ -21,7 +21,7 @@
 
 /**
  * Represents a bind mounted volume in a Docker container.
- * 
+ *
  * @see Bind
  */
 @JsonDeserialize(using = VolumeRW.Deserializer.class)
@@ -52,7 +52,7 @@ public AccessMode getAccessMode() {
     /**
      * Returns a string representation of this {@link VolumeRW} suitable for inclusion in a JSON message. The returned
      * String is simply the container path, {@link #getPath()}.
-     * 
+     *
      * @return a string representation of this {@link VolumeRW}
      */
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java b/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
index c884a633e..01f80aba9 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
@@ -44,7 +44,7 @@ public AccessMode getAccessMode() {
 
     /**
      * Parses a volume from specification to a {@link VolumesFrom}.
-     * 
+     *
      * @param serialized
      *            the specification, e.g. <code>container:ro</code>
      * @return a {@link VolumesFrom} matching the specification
@@ -89,7 +89,7 @@ public int hashCode() {
     /**
      * Returns a string representation of this {@link VolumesFrom} suitable for inclusion in a JSON message. The format
      * is <code>&lt;container&gt;:&lt;access mode&gt;</code>, like the argument in {@link #parse(String)}.
-     * 
+     *
      * @return a string representation of this {@link VolumesFrom}
      */
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/CertificateUtils.java b/src/main/java/com/github/dockerjava/core/CertificateUtils.java
index 465b06460..56a818f72 100644
--- a/src/main/java/com/github/dockerjava/core/CertificateUtils.java
+++ b/src/main/java/com/github/dockerjava/core/CertificateUtils.java
@@ -27,11 +27,11 @@
 
 public class CertificateUtils {
 
-    public static boolean verifyCertificatesExist(String dockerCertPath) {
+    public static Boolean verifyCertificatesExist(String dockerCertPath) {
         String[] files = { "ca.pem", "cert.pem", "key.pem" };
         for (String file : files) {
             File path = new File(dockerCertPath, file);
-            boolean exists = path.exists();
+            Boolean exists = path.exists();
             if (!exists) {
                 return false;
             }
diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index afe4b9843..c9067b431 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -43,13 +43,13 @@
  */
 public class GoLangFileMatch {
 
-    public static final boolean IS_WINDOWS = File.separatorChar == '\\';
+    public static final Boolean IS_WINDOWS = File.separatorChar == '\\';
 
-    public static boolean match(List<String> patterns, File file) {
+    public static Boolean match(List<String> patterns, File file) {
         return !match(patterns, file.getPath()).isEmpty();
     }
 
-    public static boolean match(String pattern, File file) {
+    public static Boolean match(String pattern, File file) {
         return match(pattern, file.getPath());
     }
 
@@ -66,7 +66,7 @@ public static List<String> match(List<String> patterns, String name) {
         return matches;
     }
 
-    public static boolean match(String pattern, String name) {
+    public static Boolean match(String pattern, String name) {
         Pattern: while (!pattern.isEmpty()) {
             ScanResult scanResult = scanChunk(pattern);
             pattern = scanResult.pattern;
@@ -103,12 +103,12 @@ public static boolean match(String pattern, String name) {
     }
 
     static ScanResult scanChunk(String pattern) {
-        boolean star = false;
+        Boolean star = false;
         if (!pattern.isEmpty() && pattern.charAt(0) == '*') {
             pattern = pattern.substring(1);
             star = true;
         }
-        boolean inRange = false;
+        Boolean inRange = false;
         int i;
         Scan: for (i = 0; i < pattern.length(); i++) {
             switch (pattern.charAt(i)) {
@@ -157,12 +157,12 @@ static String matchChunk(String chunk, String s) {
                     throw new GoLangFileMatchException();
                 }
                 // possibly negated
-                boolean negated = chunk.charAt(chunkOffset) == '^';
+                Boolean negated = chunk.charAt(chunkOffset) == '^';
                 if (negated) {
                     chunkOffset++;
                 }
                 // parse all ranges
-                boolean match = false;
+                Boolean match = false;
                 int nrange = 0;
                 while (true) {
                     if (chunkOffset < chunkLength && chunk.charAt(chunkOffset) == ']' && nrange > 0) {
@@ -238,13 +238,13 @@ static GetEscResult getEsc(String chunk, int chunkOffset, int chunkLength) {
     }
 
     private static final class ScanResult {
-        public boolean star;
+        public Boolean star;
 
         public String chunk;
 
         public String pattern;
 
-        public ScanResult(boolean star, String chunk, String pattern) {
+        public ScanResult(Boolean star, String chunk, String pattern) {
             this.star = star;
             this.chunk = chunk;
             this.pattern = pattern;
diff --git a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
index 44310e9ce..1c85ee3f4 100644
--- a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
@@ -17,6 +17,8 @@
  */
 public class LocalDirectorySSLConfig implements SSLConfig, Serializable {
 
+    private static final long serialVersionUID = -4736328026418377358L;
+
     private final String dockerCertPath;
 
     public LocalDirectorySSLConfig(String dockerCertPath) {
@@ -31,7 +33,7 @@ public String getDockerCertPath() {
     @Override
     public SSLContext getSSLContext() {
 
-        boolean certificatesExist = CertificateUtils.verifyCertificatesExist(dockerCertPath);
+        Boolean certificatesExist = CertificateUtils.verifyCertificatesExist(dockerCertPath);
 
         if (certificatesExist) {
 
diff --git a/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
index 4e1ce6765..522d5b189 100644
--- a/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
+++ b/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
@@ -37,7 +37,7 @@ public void processResponseStream(InputStream response, ResultCallback<T> result
 
         try {
             JsonParser jp = JSON_FACTORY.createParser(response);
-            boolean closed = jp.isClosed();
+            Boolean closed = jp.isClosed();
             JsonToken nextToken = jp.nextToken();
             while (!closed && nextToken != null && nextToken != JsonToken.END_OBJECT) {
                 try {
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index b5387ede0..b57108ea5 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -28,7 +28,7 @@ public abstract class ResultCallbackTemplate<RC_T extends ResultCallback<A_RES_T
 
     private Closeable stream;
 
-    private boolean closed = false;
+    private Boolean closed = false;
 
     @Override
     public void onStart(Closeable stream) {
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
index 3594f960f..868bf3e97 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
@@ -5,6 +5,8 @@
 import java.io.IOException;
 
 import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,6 +39,11 @@ public RES_T exec() throws DockerException {
     public void close() {
     }
 
+    @Override
+    public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SIMPLE_STYLE);
+    }
+
     protected String registryAuth(AuthConfig authConfig) {
         try {
             return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfig).getBytes());
diff --git a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
index d25517df1..d393586e4 100644
--- a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
@@ -25,7 +25,7 @@ public class AttachContainerCmdImpl extends AbstrAsyncDockerCmd<AttachContainerC
 
     private String containerId;
 
-    private boolean logs, followStream, timestamps, stdout, stderr;
+    private Boolean logs, followStream, timestamps, stdout, stderr;
 
     public AttachContainerCmdImpl(AttachContainerCmd.Exec exec, String containerId) {
         super(exec);
@@ -38,27 +38,27 @@ public String getContainerId() {
     }
 
     @Override
-    public boolean hasLogsEnabled() {
+    public Boolean hasLogsEnabled() {
         return logs;
     }
 
     @Override
-    public boolean hasFollowStreamEnabled() {
+    public Boolean hasFollowStreamEnabled() {
         return followStream;
     }
 
     @Override
-    public boolean hasTimestampsEnabled() {
+    public Boolean hasTimestampsEnabled() {
         return timestamps;
     }
 
     @Override
-    public boolean hasStdoutEnabled() {
+    public Boolean hasStdoutEnabled() {
         return stdout;
     }
 
     @Override
-    public boolean hasStderrEnabled() {
+    public Boolean hasStderrEnabled() {
         return stderr;
     }
 
@@ -75,13 +75,13 @@ public AttachContainerCmd withFollowStream() {
     }
 
     @Override
-    public AttachContainerCmd withFollowStream(boolean followStream) {
+    public AttachContainerCmd withFollowStream(Boolean followStream) {
         this.followStream = followStream;
         return this;
     }
 
     @Override
-    public AttachContainerCmd withTimestamps(boolean timestamps) {
+    public AttachContainerCmd withTimestamps(Boolean timestamps) {
         this.timestamps = timestamps;
         return this;
     }
@@ -92,7 +92,7 @@ public AttachContainerCmd withStdOut() {
     }
 
     @Override
-    public AttachContainerCmd withStdOut(boolean stdout) {
+    public AttachContainerCmd withStdOut(Boolean stdout) {
         this.stdout = stdout;
         return this;
     }
@@ -103,13 +103,13 @@ public AttachContainerCmd withStdErr() {
     }
 
     @Override
-    public AttachContainerCmd withStdErr(boolean stderr) {
+    public AttachContainerCmd withStdErr(Boolean stderr) {
         this.stderr = stderr;
         return this;
     }
 
     @Override
-    public AttachContainerCmd withLogs(boolean logs) {
+    public AttachContainerCmd withLogs(Boolean logs) {
         this.logs = logs;
         return this;
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
index 73c716c14..bb112b884 100644
--- a/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
@@ -6,9 +6,9 @@
 import com.github.dockerjava.api.model.AuthResponse;
 
 /**
- * 
+ *
  * Authenticate with the server, useful for checking authentication.
- * 
+ *
  */
 public class AuthCmdImpl extends AbstrAuthCfgDockerCmd<AuthCmd, AuthResponse> implements AuthCmd {
 
@@ -21,9 +21,4 @@ public AuthCmdImpl(AuthCmd.Exec exec, AuthConfig authConfig) {
     public AuthResponse exec() throws UnauthorizedException {
         return super.exec();
     }
-
-    @Override
-    public String toString() {
-        return "authenticate using " + this.getAuthConfig();
-    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index 4be5a4ede..6971982b3 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -7,15 +7,13 @@
 import java.io.InputStream;
 import java.net.URI;
 
+import javax.annotation.CheckForNull;
+
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.api.model.BuildResponseItem;
 import com.github.dockerjava.core.FilePathUtil;
 import com.github.dockerjava.core.dockerfile.Dockerfile;
-import org.apache.commons.lang.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
-import javax.annotation.CheckForNull;
 
 /**
  *
@@ -30,13 +28,13 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR
     @CheckForNull
     private String tag;
 
-    private boolean noCache;
+    private Boolean noCache;
 
-    private boolean remove = true;
+    private Boolean remove = true;
 
-    private boolean quiet;
+    private Boolean quiet;
 
-    private boolean pull;
+    private Boolean pull;
 
     @CheckForNull
     private AuthConfigurations buildAuthConfigs;
@@ -100,17 +98,17 @@ public URI getRemote() {
     }
 
     @Override
-    public boolean hasNoCacheEnabled() {
+    public Boolean hasNoCacheEnabled() {
         return noCache;
     }
 
     @Override
-    public boolean hasRemoveEnabled() {
+    public Boolean hasRemoveEnabled() {
         return remove;
     }
 
     @Override
-    public boolean isForcerm() {
+    public Boolean isForcerm() {
         return forcerm != null && forcerm;
     }
 
@@ -120,12 +118,12 @@ public Boolean getForcerm() {
     }
 
     @Override
-    public boolean isQuiet() {
+    public Boolean isQuiet() {
         return quiet;
     }
 
     @Override
-    public boolean hasPullEnabled() {
+    public Boolean hasPullEnabled() {
         return pull;
     }
 
@@ -191,7 +189,7 @@ public BuildImageCmdImpl withNoCache() {
     }
 
     @Override
-    public BuildImageCmdImpl withNoCache(boolean noCache) {
+    public BuildImageCmdImpl withNoCache(Boolean noCache) {
         this.noCache = noCache;
         return this;
     }
@@ -202,7 +200,7 @@ public BuildImageCmdImpl withRemove() {
     }
 
     @Override
-    public BuildImageCmdImpl withRemove(boolean rm) {
+    public BuildImageCmdImpl withRemove(Boolean rm) {
         this.remove = rm;
         return this;
     }
@@ -224,7 +222,7 @@ public BuildImageCmdImpl withQuiet() {
     }
 
     @Override
-    public BuildImageCmdImpl withQuiet(boolean quiet) {
+    public BuildImageCmdImpl withQuiet(Boolean quiet) {
         this.quiet = quiet;
         return this;
     }
@@ -235,19 +233,19 @@ public BuildImageCmdImpl withPull() {
     }
 
     @Override
-    public BuildImageCmdImpl withPull(boolean pull) {
+    public BuildImageCmdImpl withPull(Boolean pull) {
         this.pull = pull;
         return this;
     }
 
     @Override
-    public BuildImageCmd withMemory(long memory) {
+    public BuildImageCmd withMemory(Long memory) {
         this.memory = memory;
         return this;
     }
 
     @Override
-    public BuildImageCmd withMemswap(long memswap) {
+    public BuildImageCmd withMemswap(Long memswap) {
         this.memswap = memswap;
         return this;
     }
@@ -318,9 +316,4 @@ public void close() {
             throw new RuntimeException(e);
         }
     }
-
-    @Override
-    public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SIMPLE_STYLE);
-    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
index 497d08c3f..db429dc8d 100644
--- a/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
@@ -2,8 +2,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.CommitCmd;
@@ -19,22 +17,22 @@ public class CommitCmdImpl extends AbstrDockerCmd<CommitCmd, String> implements
 
     private String containerId, repository, tag, message, author;
 
-    private boolean pause = true;
+    private Boolean pause = true;
 
     @JsonProperty("AttachStdin")
-    private boolean attachStdin;
+    private Boolean attachStdin;
 
     @JsonProperty("AttachStdout")
-    private boolean attachStdout;
+    private Boolean attachStdout;
 
     @JsonProperty("AttachStderr")
-    private boolean attachStderr;
+    private Boolean attachStderr;
 
     @JsonProperty("Cmd")
     private String[] cmd;
 
     @JsonProperty("DisableNetwork")
-    private boolean disableNetwork;
+    private Boolean disableNetwork;
 
     @JsonProperty("Env")
     private String[] env;
@@ -52,16 +50,16 @@ public class CommitCmdImpl extends AbstrDockerCmd<CommitCmd, String> implements
     private Integer memorySwap;
 
     @JsonProperty("OpenStdin")
-    private boolean openStdin;
+    private Boolean openStdin;
 
     @JsonProperty("PortSpecs")
     private String[] portSpecs;
 
     @JsonProperty("StdinOnce")
-    private boolean stdinOnce;
+    private Boolean stdinOnce;
 
     @JsonProperty("Tty")
-    private boolean tty;
+    private Boolean tty;
 
     @JsonProperty("User")
     private String user;
@@ -110,12 +108,12 @@ public String getAuthor() {
     }
 
     @Override
-    public boolean hasPauseEnabled() {
+    public Boolean hasPauseEnabled() {
         return pause;
     }
 
     @Override
-    public CommitCmdImpl withAttachStderr(boolean attachStderr) {
+    public CommitCmdImpl withAttachStderr(Boolean attachStderr) {
         this.attachStderr = attachStderr;
         return this;
     }
@@ -126,7 +124,7 @@ public CommitCmdImpl withAttachStderr() {
     }
 
     @Override
-    public CommitCmdImpl withAttachStdin(boolean attachStdin) {
+    public CommitCmdImpl withAttachStdin(Boolean attachStdin) {
         this.attachStdin = attachStdin;
         return this;
     }
@@ -137,7 +135,7 @@ public CommitCmdImpl withAttachStdin() {
     }
 
     @Override
-    public CommitCmdImpl withAttachStdout(boolean attachStdout) {
+    public CommitCmdImpl withAttachStdout(Boolean attachStdout) {
         this.attachStdout = attachStdout;
         return this;
     }
@@ -155,7 +153,7 @@ public CommitCmdImpl withCmd(String... cmd) {
     }
 
     @Override
-    public CommitCmdImpl withDisableNetwork(boolean disableNetwork) {
+    public CommitCmdImpl withDisableNetwork(Boolean disableNetwork) {
         this.disableNetwork = disableNetwork;
         return this;
     }
@@ -189,7 +187,7 @@ public CommitCmdImpl withRepository(String repository) {
     }
 
     @Override
-    public CommitCmdImpl withPause(boolean pause) {
+    public CommitCmdImpl withPause(Boolean pause) {
         this.pause = pause;
         return this;
     }
@@ -255,12 +253,12 @@ public CommitCmdImpl withMemorySwap(Integer memorySwap) {
     }
 
     @Override
-    public boolean isOpenStdin() {
+    public Boolean isOpenStdin() {
         return openStdin;
     }
 
     @Override
-    public CommitCmdImpl withOpenStdin(boolean openStdin) {
+    public CommitCmdImpl withOpenStdin(Boolean openStdin) {
         checkNotNull(openStdin, "openStdin was not specified");
         this.openStdin = openStdin;
         return this;
@@ -279,12 +277,12 @@ public CommitCmdImpl withPortSpecs(String... portSpecs) {
     }
 
     @Override
-    public boolean isStdinOnce() {
+    public Boolean isStdinOnce() {
         return stdinOnce;
     }
 
     @Override
-    public CommitCmdImpl withStdinOnce(boolean stdinOnce) {
+    public CommitCmdImpl withStdinOnce(Boolean stdinOnce) {
         this.stdinOnce = stdinOnce;
         return this;
     }
@@ -295,12 +293,12 @@ public CommitCmdImpl withStdinOnce() {
     }
 
     @Override
-    public boolean isTty() {
+    public Boolean isTty() {
         return tty;
     }
 
     @Override
-    public CommitCmdImpl withTty(boolean tty) {
+    public CommitCmdImpl withTty(Boolean tty) {
         this.tty = tty;
         return this;
     }
@@ -346,13 +344,6 @@ public CommitCmdImpl withWorkingDir(String workingDir) {
         return this;
     }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("commit ").append(author != null ? "--author " + author + " " : "")
-                .append(message != null ? "--message " + message + " " : "").append(containerId)
-                .append(repository != null ? " " + repository + ":" : " ").append(tag != null ? tag : "").toString();
-    }
-
     /**
      * @throws NotFoundException
      *             No such container
diff --git a/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
index a394c535c..2651ddb77 100644
--- a/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
@@ -38,11 +38,6 @@ public ContainerDiffCmdImpl withContainerId(String containerId) {
         return this;
     }
 
-    @Override
-    public String toString() {
-        return new StringBuilder("diff ").append(containerId).toString();
-    }
-
     /**
      * @throws NotFoundException
      *             No such container
diff --git a/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
index ef5f86a7a..6258fc4ed 100644
--- a/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
@@ -4,8 +4,6 @@
 
 import java.io.InputStream;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
@@ -68,11 +66,6 @@ public CopyFileFromContainerCmdImpl withHostPath(String hostPath) {
         return this;
     }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("cp ").append(containerId).append(":").append(resource).toString();
-    }
-
     /**
      * @throws NotFoundException
      *             No such container
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index f29c5c05f..1ca9d483a 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -7,6 +7,8 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.ConflictException;
 import com.github.dockerjava.api.NotFoundException;
@@ -34,55 +36,41 @@
  * Creates a new container.
  *
  */
+@JsonInclude(Include.NON_NULL)
 public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, CreateContainerResponse> implements
         CreateContainerCmd {
 
     private String name;
 
     @JsonProperty("Hostname")
-    private String hostName = "";
+    private String hostName;
 
     @JsonProperty("Domainname")
-    private String domainName = "";
+    private String domainName;
 
     @JsonProperty("User")
-    private String user = "";
-
-    @JsonProperty("Memory")
-    private long memoryLimit = 0;
-
-    @JsonProperty("MemorySwap")
-    private long memorySwap = 0;
-
-    @JsonProperty("CpuShares")
-    private int cpuShares = 0;
-
-    @JsonProperty("CpuPeriod")
-    private Integer cpuPeriod;
-
-    @JsonProperty("Cpuset")
-    private String cpuset;
+    private String user;
 
     @JsonProperty("AttachStdin")
-    private boolean attachStdin = false;
+    private Boolean attachStdin;
 
     @JsonProperty("AttachStdout")
-    private boolean attachStdout = false;
+    private Boolean attachStdout;
 
     @JsonProperty("AttachStderr")
-    private boolean attachStderr = false;
+    private Boolean attachStderr;
 
     @JsonProperty("PortSpecs")
     private String[] portSpecs;
 
     @JsonProperty("Tty")
-    private boolean tty = false;
+    private Boolean tty;
 
     @JsonProperty("OpenStdin")
-    private boolean stdinOpen = false;
+    private Boolean stdinOpen;
 
     @JsonProperty("StdinOnce")
-    private boolean stdInOnce = false;
+    private Boolean stdInOnce;
 
     @JsonProperty("Env")
     private String[] env;
@@ -100,13 +88,13 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     private Volumes volumes = new Volumes();
 
     @JsonProperty("WorkingDir")
-    private String workingDir = "";
+    private String workingDir;
 
     @JsonProperty("MacAddress")
     private String macAddress;
 
     @JsonProperty("NetworkDisabled")
-    private boolean networkDisabled = false;
+    private Boolean networkDisabled;
 
     @JsonProperty("ExposedPorts")
     private ExposedPorts exposedPorts = new ExposedPorts();
@@ -117,14 +105,6 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     @JsonProperty("Labels")
     private Map<String, String> labels;
 
-    @JsonProperty("CpusetMems")
-    private String cpusetMems;
-
-    @JsonProperty("BlkioWeight")
-    private Integer blkioWeight;
-
-    @JsonProperty("OomKillDisable")
-    private Boolean oomKillDisable;
 
     public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, String image) {
         super(exec);
@@ -150,16 +130,19 @@ public Bind[] getBinds() {
     }
 
     @Override
+    @JsonIgnore
     public Integer getBlkioWeight() {
-        return blkioWeight;
+        return hostConfig.getBlkioWeight();
     }
 
     @Override
+    @JsonIgnore
     public Capability[] getCapAdd() {
         return hostConfig.getCapAdd();
     }
 
     @Override
+    @JsonIgnore
     public Capability[] getCapDrop() {
         return hostConfig.getCapDrop();
     }
@@ -169,28 +152,28 @@ public String[] getCmd() {
         return cmd;
     }
 
-    public String getContainerIDFile() {
-        return hostConfig.getContainerIDFile();
-    }
-
     @Override
+    @JsonIgnore
     public Integer getCpuPeriod() {
-        return cpuPeriod;
+        return hostConfig.getCpuPeriod();
     }
 
     @Override
-    public String getCpuset() {
-        return cpuset;
+    @JsonIgnore
+    public String getCpusetCpus() {
+        return hostConfig.getCpusetCpus();
     }
 
     @Override
+    @JsonIgnore
     public String getCpusetMems() {
-        return cpusetMems;
+        return hostConfig.getCpusetMems();
     }
 
     @Override
-    public int getCpuShares() {
-        return cpuShares;
+    @JsonIgnore
+    public Integer getCpuShares() {
+        return hostConfig.getCpuShares();
     }
 
     @Override
@@ -272,18 +255,21 @@ public LogConfig getLogConfig() {
         return hostConfig.getLogConfig();
     }
 
+    @Override
     public String getMacAddress() {
         return macAddress;
     }
 
     @Override
-    public long getMemoryLimit() {
-        return memoryLimit;
+    @JsonIgnore
+    public Long getMemory() {
+        return hostConfig.getMemory();
     }
 
     @Override
-    public long getMemorySwap() {
-        return memorySwap;
+    @JsonIgnore
+    public Long getMemorySwap() {
+        return hostConfig.getMemorySwap();
     }
 
     @Override
@@ -315,6 +301,7 @@ public RestartPolicy getRestartPolicy() {
     }
 
     @Override
+    @JsonIgnore
     public Ulimit[] getUlimits() {
         return hostConfig.getUlimits();
     }
@@ -342,28 +329,29 @@ public String getWorkingDir() {
     }
 
     @Override
-    public boolean isAttachStderr() {
+    public Boolean isAttachStderr() {
         return attachStderr;
     }
 
     @Override
-    public boolean isAttachStdin() {
+    public Boolean isAttachStdin() {
         return attachStdin;
     }
 
     @Override
-    public boolean isAttachStdout() {
+    public Boolean isAttachStdout() {
         return attachStdout;
     }
 
     @Override
-    public boolean isNetworkDisabled() {
+    public Boolean isNetworkDisabled() {
         return networkDisabled;
     }
 
     @Override
+    @JsonIgnore
     public Boolean isOomKillDisable() {
-        return oomKillDisable;
+        return hostConfig.isOomKillDisable();
     }
 
     @Override
@@ -378,22 +366,24 @@ public Boolean isPublishAllPorts() {
         return hostConfig.isPublishAllPorts();
     }
 
-    public boolean isReadonlyRootfs() {
+    @Override
+    @JsonIgnore
+    public Boolean isReadonlyRootfs() {
         return hostConfig.isReadonlyRootfs();
     }
 
     @Override
-    public boolean isStdInOnce() {
+    public Boolean isStdInOnce() {
         return stdInOnce;
     }
 
     @Override
-    public boolean isStdinOpen() {
+    public Boolean isStdinOpen() {
         return stdinOpen;
     }
 
     @Override
-    public boolean isTty() {
+    public Boolean isTty() {
         return tty;
     }
 
@@ -404,19 +394,22 @@ public String toString() {
     }
 
     @Override
-    public CreateContainerCmdImpl withAttachStderr(boolean attachStderr) {
+    public CreateContainerCmdImpl withAttachStderr(Boolean attachStderr) {
+        checkNotNull(attachStderr, "attachStderr was not specified");
         this.attachStderr = attachStderr;
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withAttachStdin(boolean attachStdin) {
+    public CreateContainerCmdImpl withAttachStdin(Boolean attachStdin) {
+        checkNotNull(attachStdin, "attachStdin was not specified");
         this.attachStdin = attachStdin;
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withAttachStdout(boolean attachStdout) {
+    public CreateContainerCmdImpl withAttachStdout(Boolean attachStdout) {
+        checkNotNull(attachStdout, "attachStdout was not specified");
         this.attachStdout = attachStdout;
         return this;
     }
@@ -431,8 +424,8 @@ public CreateContainerCmd withBinds(Bind... binds) {
     @Override
     public CreateContainerCmd withBlkioWeight(Integer blkioWeight) {
         checkNotNull(blkioWeight, "blkioWeight was not specified");
-        this.blkioWeight = blkioWeight;
-        return null;
+        hostConfig.setBlkioWeight(blkioWeight);
+        return this;
     }
 
     @Override
@@ -466,27 +459,28 @@ public CreateContainerCmd withContainerIDFile(String containerIDFile) {
     @Override
     public CreateContainerCmd withCpuPeriod(Integer cpuPeriod) {
         checkNotNull(cpuPeriod, "cpuPeriod was not specified");
-        this.cpuPeriod = cpuPeriod;
+        hostConfig.setCpuPeriod(cpuPeriod);
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withCpuset(String cpuset) {
-        checkNotNull(cpuset, "cpuset was not specified");
-        this.cpuset = cpuset;
+    public CreateContainerCmdImpl withCpusetCpus(String cpusetCpus) {
+        checkNotNull(cpusetCpus, "cpusetCpus was not specified");
+        hostConfig.setCpusetCpus(cpusetCpus);
         return this;
     }
 
     @Override
     public CreateContainerCmd withCpusetMems(String cpusetMems) {
         checkNotNull(cpusetMems, "cpusetMems was not specified");
-        this.cpusetMems = cpusetMems;
+        hostConfig.setCpusetMems(cpusetMems);
         return null;
     }
 
     @Override
-    public CreateContainerCmdImpl withCpuShares(int cpuShares) {
-        this.cpuShares = cpuShares;
+    public CreateContainerCmdImpl withCpuShares(Integer cpuShares) {
+        checkNotNull(cpuShares, "cpuShares was not specified");
+        hostConfig.setCpuShares(cpuShares);
         return this;
     }
 
@@ -596,14 +590,16 @@ public CreateContainerCmdImpl withMacAddress(String macAddress) {
     }
 
     @Override
-    public CreateContainerCmdImpl withMemoryLimit(long memoryLimit) {
-        this.memoryLimit = memoryLimit;
+    public CreateContainerCmdImpl withMemory(Long memory) {
+        checkNotNull(memory, "memory was not specified");
+        hostConfig.setMemory(memory);
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withMemorySwap(long memorySwap) {
-        this.memorySwap = memorySwap;
+    public CreateContainerCmdImpl withMemorySwap(Long memorySwap) {
+        checkNotNull(memorySwap, "memorySwap was not specified");
+        hostConfig.setMemorySwap(memorySwap);
         return this;
     }
 
@@ -615,7 +611,8 @@ public CreateContainerCmdImpl withName(String name) {
     }
 
     @Override
-    public CreateContainerCmdImpl withNetworkDisabled(boolean disableNetwork) {
+    public CreateContainerCmdImpl withNetworkDisabled(Boolean disableNetwork) {
+        checkNotNull(disableNetwork, "disableNetwork was not specified");
         this.networkDisabled = disableNetwork;
         return this;
     }
@@ -630,7 +627,7 @@ public CreateContainerCmd withNetworkMode(String networkMode) {
     @Override
     public CreateContainerCmd withOomKillDisable(Boolean oomKillDisable) {
         checkNotNull(oomKillDisable, "oomKillDisable was not specified");
-        this.oomKillDisable = oomKillDisable;
+        hostConfig.setOomKillDisable(oomKillDisable);
         return this;
     }
 
@@ -656,19 +653,22 @@ public CreateContainerCmdImpl withPortSpecs(String... portSpecs) {
     }
 
     @Override
-    public CreateContainerCmd withPrivileged(boolean privileged) {
+    public CreateContainerCmd withPrivileged(Boolean privileged) {
+        checkNotNull(privileged, "no privileged was specified");
         this.hostConfig.setPrivileged(privileged);
         return this;
     }
 
     @Override
-    public CreateContainerCmd withPublishAllPorts(boolean publishAllPorts) {
+    public CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts) {
+        checkNotNull(publishAllPorts, "no publishAllPorts was specified");
         this.hostConfig.setPublishAllPorts(publishAllPorts);
         return this;
     }
 
     @Override
-    public CreateContainerCmd withReadonlyRootfs(boolean readonlyRootfs) {
+    public CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs) {
+        checkNotNull(readonlyRootfs, "no readonlyRootfs was specified");
         hostConfig.setReadonlyRootfs(readonlyRootfs);
         return this;
     }
@@ -681,19 +681,22 @@ public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) {
     }
 
     @Override
-    public CreateContainerCmdImpl withStdInOnce(boolean stdInOnce) {
+    public CreateContainerCmdImpl withStdInOnce(Boolean stdInOnce) {
+        checkNotNull(stdInOnce, "no stdInOnce was specified");
         this.stdInOnce = stdInOnce;
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withStdinOpen(boolean stdinOpen) {
+    public CreateContainerCmdImpl withStdinOpen(Boolean stdinOpen) {
+        checkNotNull(stdinOpen, "no stdinOpen was specified");
         this.stdinOpen = stdinOpen;
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withTty(boolean tty) {
+    public CreateContainerCmdImpl withTty(Boolean tty) {
+        checkNotNull(tty, "no tty was specified");
         this.tty = tty;
         return this;
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
index 3ed2f912e..57ddc2908 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
@@ -4,8 +4,6 @@
 
 import java.io.InputStream;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.CreateImageResponse;
 
@@ -77,10 +75,4 @@ public CreateImageCmdImpl withTag(String tag) {
         this.tag = tag;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("import - ").append(repository != null ? repository + ":" : "")
-                .append(tag != null ? tag : "").toString();
-    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
index 5cb801db7..9bd34e57d 100644
--- a/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
@@ -55,10 +55,4 @@ public Filters getFilters() {
         return filters;
     }
 
-    @Override
-    public String toString() {
-        return new StringBuilder("events").append(since != null ? " --since=" + since : "")
-                .append(until != null ? " --until=" + until : "")
-                .append(filters != null ? " --filters=" + filters : "").toString();
-    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
index 3b00d22c5..55a080ebf 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
@@ -2,26 +2,29 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.ExecCreateCmd;
 import com.github.dockerjava.api.command.ExecCreateCmdResponse;
 
+@JsonInclude(Include.NON_NULL)
 public class ExecCreateCmdImpl extends AbstrDockerCmd<ExecCreateCmd, ExecCreateCmdResponse> implements ExecCreateCmd {
 
     private String containerId;
 
     @JsonProperty("AttachStdin")
-    private boolean attachStdin;
+    private Boolean attachStdin;
 
     @JsonProperty("AttachStdout")
-    private boolean attachStdout;
+    private Boolean attachStdout;
 
     @JsonProperty("AttachStderr")
-    private boolean attachStderr;
+    private Boolean attachStderr;
 
     @JsonProperty("Tty")
-    private boolean tty;
+    private Boolean tty;
 
     @JsonProperty("Cmd")
     private String[] cmd;
@@ -39,7 +42,7 @@ public ExecCreateCmd withContainerId(String containerId) {
     }
 
     @Override
-    public ExecCreateCmd withAttachStdin(boolean attachStdin) {
+    public ExecCreateCmd withAttachStdin(Boolean attachStdin) {
         this.attachStdin = attachStdin;
         return this;
     }
@@ -50,7 +53,7 @@ public ExecCreateCmd withAttachStdin() {
     }
 
     @Override
-    public ExecCreateCmd withAttachStdout(boolean attachStdout) {
+    public ExecCreateCmd withAttachStdout(Boolean attachStdout) {
         this.attachStdout = attachStdout;
         return this;
     }
@@ -61,7 +64,7 @@ public ExecCreateCmd withAttachStdout() {
     }
 
     @Override
-    public ExecCreateCmd withAttachStderr(boolean attachStderr) {
+    public ExecCreateCmd withAttachStderr(Boolean attachStderr) {
         this.attachStderr = attachStderr;
         return this;
     }
@@ -72,7 +75,7 @@ public ExecCreateCmd withAttachStderr() {
     }
 
     @Override
-    public ExecCreateCmd withTty(boolean tty) {
+    public ExecCreateCmd withTty(Boolean tty) {
         this.tty = tty;
         return this;
     }
@@ -94,22 +97,22 @@ public String getContainerId() {
     }
 
     @Override
-    public boolean hasAttachStdinEnabled() {
+    public Boolean hasAttachStdinEnabled() {
         return attachStdin;
     }
 
     @Override
-    public boolean hasAttachStdoutEnabled() {
+    public Boolean hasAttachStdoutEnabled() {
         return attachStdout;
     }
 
     @Override
-    public boolean hasAttachStderrEnabled() {
+    public Boolean hasAttachStderrEnabled() {
         return attachStderr;
     }
 
     @Override
-    public boolean hasTtyEnabled() {
+    public Boolean hasTtyEnabled() {
         return tty;
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
index a479a91f2..3c2e00198 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
@@ -11,7 +11,7 @@ public class ExecStartCmdImpl extends AbstrDockerCmd<ExecStartCmd, InputStream>
 
     private String execId;
 
-    private boolean detach, tty;
+    private Boolean detach, tty;
 
     public ExecStartCmdImpl(ExecStartCmd.Exec exec, String execId) {
         super(exec);
@@ -31,23 +31,23 @@ public ExecStartCmd withExecId(String execId) {
     }
 
     @Override
-    public boolean hasDetachEnabled() {
+    public Boolean hasDetachEnabled() {
         return detach;
     }
 
     @Override
-    public boolean hasTtyEnabled() {
+    public Boolean hasTtyEnabled() {
         return tty;
     }
 
     @Override
-    public ExecStartCmd withDetach(boolean detach) {
+    public ExecStartCmd withDetach(Boolean detach) {
         this.detach = detach;
         return this;
     }
 
     @Override
-    public ExecStartCmd withTty(boolean tty) {
+    public ExecStartCmd withTty(Boolean tty) {
         this.tty = tty;
         return this;
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
index bb5a5d17a..78db8359f 100644
--- a/src/main/java/com/github/dockerjava/core/command/FrameReader.java
+++ b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
@@ -18,7 +18,7 @@ public class FrameReader implements AutoCloseable {
 
     private final InputStream inputStream;
 
-    private boolean rawStreamDetected = false;
+    private Boolean rawStreamDetected = false;
 
     private final byte[] rawBuffer = new byte[1000];
 
diff --git a/src/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java
index f2dd3ca82..ea27537c7 100644
--- a/src/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java
@@ -12,8 +12,4 @@ public InfoCmdImpl(InfoCmd.Exec exec) {
         super(exec);
     }
 
-    @Override
-    public String toString() {
-        return "info";
-    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
index c3fe5f6d5..5b4090a4e 100644
--- a/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
@@ -31,11 +31,6 @@ public InspectContainerCmd withContainerId(String containerId) {
         return this;
     }
 
-    @Override
-    public String toString() {
-        return "inspect " + containerId;
-    }
-
     /**
      * @throws NotFoundException
      *             No such container
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
index 8ee8f79c3..0d93afc4e 100644
--- a/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
@@ -25,11 +25,6 @@ public InspectExecCmd withExecId(String execId) {
         return this;
     }
 
-    @Override
-    public String toString() {
-        return "inspect " + execId;
-    }
-
     /**
      * @throws NotFoundException
      *             No such exec
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
index 3e28bd488..93043f8e6 100644
--- a/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
@@ -31,11 +31,6 @@ public InspectImageCmd withImageId(String imageId) {
         return this;
     }
 
-    @Override
-    public String toString() {
-        return "inspect " + imageId;
-    }
-
     /**
      * @throws NotFoundException
      *             No such image
diff --git a/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
index 05e709f37..45c5e38ba 100644
--- a/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
@@ -41,11 +41,6 @@ public KillContainerCmd withSignal(String signal) {
         return this;
     }
 
-    @Override
-    public String toString() {
-        return "kill " + containerId;
-    }
-
     /**
      * @throws NotFoundException
      *             No such container
diff --git a/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
index 5759cfc53..b7a70603d 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
@@ -27,9 +27,9 @@
 public class ListContainersCmdImpl extends AbstrDockerCmd<ListContainersCmd, List<Container>> implements
         ListContainersCmd {
 
-    private int limit = -1;
+    private Integer limit = -1;
 
-    private boolean showSize, showAll = false;
+    private Boolean showSize, showAll = false;
 
     private String sinceId, beforeId;
 
@@ -40,17 +40,17 @@ public ListContainersCmdImpl(ListContainersCmd.Exec exec) {
     }
 
     @Override
-    public int getLimit() {
+    public Integer getLimit() {
         return limit;
     }
 
     @Override
-    public boolean hasShowSizeEnabled() {
+    public Boolean hasShowSizeEnabled() {
         return showSize;
     }
 
     @Override
-    public boolean hasShowAllEnabled() {
+    public Boolean hasShowAllEnabled() {
         return showAll;
     }
 
@@ -70,19 +70,20 @@ public Filters getFilters() {
     }
 
     @Override
-    public ListContainersCmd withShowAll(boolean showAll) {
+    public ListContainersCmd withShowAll(Boolean showAll) {
         this.showAll = showAll;
         return this;
     }
 
     @Override
-    public ListContainersCmd withShowSize(boolean showSize) {
+    public ListContainersCmd withShowSize(Boolean showSize) {
         this.showSize = showSize;
         return this;
     }
 
     @Override
-    public ListContainersCmd withLimit(int limit) {
+    public ListContainersCmd withLimit(Integer limit) {
+        checkNotNull(limit, "limit was not specified");
         checkArgument(limit > 0, "limit must be greater 0");
         this.limit = limit;
         return this;
@@ -109,11 +110,4 @@ public ListContainersCmd withFilters(Filters filters) {
         return this;
     }
 
-    @Override
-    public String toString() {
-        return new StringBuilder("ps ").append(showAll ? "--all=true" : "").append(showSize ? "--size=true" : "")
-                .append(sinceId != null ? " --since " + sinceId : "")
-                .append(beforeId != null ? " --before " + beforeId : "").append(limit != -1 ? "-n " + limit : "")
-                .append(filters != null ? " --filters " + filters : "").toString();
-    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
index ddd4dc79f..69879b673 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
@@ -19,7 +19,7 @@ public class ListImagesCmdImpl extends AbstrDockerCmd<ListImagesCmd, List<Image>
 
     private String filters;
 
-    private boolean showAll = false;
+    private Boolean showAll = false;
 
     public ListImagesCmdImpl(ListImagesCmd.Exec exec) {
         super(exec);
@@ -31,12 +31,12 @@ public String getFilters() {
     }
 
     @Override
-    public boolean hasShowAllEnabled() {
+    public Boolean hasShowAllEnabled() {
         return showAll;
     }
 
     @Override
-    public ListImagesCmd withShowAll(boolean showAll) {
+    public ListImagesCmd withShowAll(Boolean showAll) {
         this.showAll = showAll;
         return this;
     }
@@ -48,9 +48,4 @@ public ListImagesCmd withFilters(String filter) {
         return this;
     }
 
-    @Override
-    public String toString() {
-        return new StringBuilder("images ").append(showAll ? "--all=true" : "")
-                .append(filters != null ? "--filter " + filters : "").toString();
-    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
index a9d923635..3acb33450 100644
--- a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -23,9 +23,9 @@ public class LogContainerCmdImpl extends AbstrAsyncDockerCmd<LogContainerCmd, Fr
 
     private String containerId;
 
-    private int tail = -1;
+    private Integer tail;
 
-    private boolean followStream, timestamps, stdout, stderr;
+    private Boolean followStream, timestamps, stdout, stderr;
 
     public LogContainerCmdImpl(LogContainerCmd.Exec exec, String containerId) {
         super(exec);
@@ -38,27 +38,27 @@ public String getContainerId() {
     }
 
     @Override
-    public int getTail() {
+    public Integer getTail() {
         return tail;
     }
 
     @Override
-    public boolean hasFollowStreamEnabled() {
+    public Boolean hasFollowStreamEnabled() {
         return followStream;
     }
 
     @Override
-    public boolean hasTimestampsEnabled() {
+    public Boolean hasTimestampsEnabled() {
         return timestamps;
     }
 
     @Override
-    public boolean hasStdoutEnabled() {
+    public Boolean hasStdoutEnabled() {
         return stdout;
     }
 
     @Override
-    public boolean hasStderrEnabled() {
+    public Boolean hasStderrEnabled() {
         return stderr;
     }
 
@@ -75,7 +75,7 @@ public LogContainerCmd withFollowStream() {
     }
 
     @Override
-    public LogContainerCmd withFollowStream(boolean followStream) {
+    public LogContainerCmd withFollowStream(Boolean followStream) {
         this.followStream = followStream;
         return this;
     }
@@ -86,7 +86,7 @@ public LogContainerCmd withTimestamps() {
     }
 
     @Override
-    public LogContainerCmd withTimestamps(boolean timestamps) {
+    public LogContainerCmd withTimestamps(Boolean timestamps) {
         this.timestamps = timestamps;
         return this;
     }
@@ -97,7 +97,7 @@ public LogContainerCmd withStdOut() {
     }
 
     @Override
-    public LogContainerCmd withStdOut(boolean stdout) {
+    public LogContainerCmd withStdOut(Boolean stdout) {
         this.stdout = stdout;
         return this;
     }
@@ -108,7 +108,7 @@ public LogContainerCmd withStdErr() {
     }
 
     @Override
-    public LogContainerCmd withStdErr(boolean stderr) {
+    public LogContainerCmd withStdErr(Boolean stderr) {
         this.stderr = stderr;
         return this;
     }
@@ -120,15 +120,9 @@ public LogContainerCmd withTailAll() {
     }
 
     @Override
-    public LogContainerCmd withTail(int tail) {
+    public LogContainerCmd withTail(Integer tail) {
         this.tail = tail;
         return this;
     }
 
-    @Override
-    public String toString() {
-        return new StringBuilder("logs ").append(followStream ? "--follow=true" : "")
-                .append(timestamps ? "--timestamps=true" : "").append(containerId).toString();
-    }
-
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
index 81a30dcde..1102b0893 100644
--- a/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
@@ -33,11 +33,6 @@ public PauseContainerCmd withContainerId(String containerId) {
         return this;
     }
 
-    @Override
-    public String toString() {
-        return new StringBuilder("pause ").append(containerId).toString();
-    }
-
     /**
      * @throws NotFoundException
      *             No such container
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
index 2416401b0..547fc6519 100644
--- a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
@@ -73,8 +73,4 @@ public PullImageCmd withRegistry(String registry) {
         return this;
     }
 
-    @Override
-    public String toString() {
-        return new StringBuilder("pull ").append(repository).append(tag != null ? ":" + tag : "").toString();
-    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
index 1924759bd..765006bab 100644
--- a/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
@@ -43,7 +43,8 @@ public void awaitSuccess() {
         if (latestItem == null) {
             throw new DockerClientException("Could not pull image");
         } else if (!latestItem.isPullSuccessIndicated()) {
-            throw new DockerClientException("Could not pull image: " + latestItem.getError());
+            String message = (latestItem.getError() != null) ? latestItem.getError() : latestItem.getStatus();
+            throw new DockerClientException("Could not pull image: " + message);
         }
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
index 709113a09..621c4a7a4 100644
--- a/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
@@ -71,9 +71,4 @@ private PushImageCmd withOptionalAuthConfig(AuthConfig authConfig) {
         return this;
     }
 
-    @Override
-    public String toString() {
-        return new StringBuilder("push ").append(name).toString();
-    }
-
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
index ff23023d2..9bf6c3aba 100644
--- a/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
@@ -2,12 +2,15 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 
 /**
  * Remove a container.
- * 
+ *
  * @param removeVolumes
  *            - true or false, Remove the volumes associated to the container. Defaults to false
  * @param force
@@ -17,7 +20,7 @@ public class RemoveContainerCmdImpl extends AbstrDockerCmd<RemoveContainerCmd, V
 
     private String containerId;
 
-    private boolean removeVolumes, force;
+    private Boolean removeVolumes, force;
 
     public RemoveContainerCmdImpl(RemoveContainerCmd.Exec exec, String containerId) {
         super(exec);
@@ -30,12 +33,12 @@ public String getContainerId() {
     }
 
     @Override
-    public boolean hasRemoveVolumesEnabled() {
+    public Boolean hasRemoveVolumesEnabled() {
         return removeVolumes;
     }
 
     @Override
-    public boolean hasForceEnabled() {
+    public Boolean hasForceEnabled() {
         return force;
     }
 
@@ -47,7 +50,7 @@ public RemoveContainerCmd withContainerId(String containerId) {
     }
 
     @Override
-    public RemoveContainerCmd withRemoveVolumes(boolean removeVolumes) {
+    public RemoveContainerCmd withRemoveVolumes(Boolean removeVolumes) {
         this.removeVolumes = removeVolumes;
         return this;
     }
@@ -58,17 +61,11 @@ public RemoveContainerCmd withForce() {
     }
 
     @Override
-    public RemoveContainerCmd withForce(boolean force) {
+    public RemoveContainerCmd withForce(Boolean force) {
         this.force = force;
         return this;
     }
 
-    @Override
-    public String toString() {
-        return new StringBuilder("rm ").append(removeVolumes ? "--volumes=true" : "")
-                .append(force ? "--force=true" : "").append(containerId).toString();
-    }
-
     /**
      * @throws NotFoundException
      *             No such container
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
index ee9e7f33b..43fee1ea2 100644
--- a/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
@@ -2,6 +2,9 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.RemoveImageCmd;
 
@@ -14,7 +17,7 @@ public class RemoveImageCmdImpl extends AbstrDockerCmd<RemoveImageCmd, Void> imp
 
     private String imageId;
 
-    private boolean force, noPrune;
+    private Boolean force, noPrune;
 
     public RemoveImageCmdImpl(RemoveImageCmd.Exec exec, String imageId) {
         super(exec);
@@ -27,12 +30,12 @@ public String getImageId() {
     }
 
     @Override
-    public boolean hasForceEnabled() {
+    public Boolean hasForceEnabled() {
         return force;
     }
 
     @Override
-    public boolean hasNoPruneEnabled() {
+    public Boolean hasNoPruneEnabled() {
         return noPrune;
     }
 
@@ -49,7 +52,7 @@ public RemoveImageCmd withForce() {
     }
 
     @Override
-    public RemoveImageCmd withForce(boolean force) {
+    public RemoveImageCmd withForce(Boolean force) {
         this.force = force;
         return this;
     }
@@ -60,17 +63,11 @@ public RemoveImageCmd withNoPrune() {
     }
 
     @Override
-    public RemoveImageCmd withNoPrune(boolean noPrune) {
+    public RemoveImageCmd withNoPrune(Boolean noPrune) {
         this.noPrune = noPrune;
         return this;
     }
 
-    @Override
-    public String toString() {
-        return new StringBuilder("rmi ").append(noPrune ? "--no-prune=true" : "").append(force ? "--force=true" : "")
-                .append(imageId).toString();
-    }
-
     /**
      * @throws NotFoundException
      *             No such image
diff --git a/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
index 4766dfdb4..fe99477fa 100644
--- a/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
@@ -17,7 +17,7 @@ public class RestartContainerCmdImpl extends AbstrDockerCmd<RestartContainerCmd,
 
     private String containerId;
 
-    private int timeout = 10;
+    private Integer timeout = 10;
 
     public RestartContainerCmdImpl(RestartContainerCmd.Exec exec, String containerId) {
         super(exec);
@@ -30,7 +30,7 @@ public String getContainerId() {
     }
 
     @Override
-    public int getTimeout() {
+    public Integer getTimeout() {
         return timeout;
     }
 
@@ -42,17 +42,13 @@ public RestartContainerCmd withContainerId(String containerId) {
     }
 
     @Override
-    public RestartContainerCmd withtTimeout(int timeout) {
+    public RestartContainerCmd withtTimeout(Integer timeout) {
+        checkNotNull(timeout, "timeout was not specified");
         checkArgument(timeout >= 0, "timeout must be greater or equal 0");
         this.timeout = timeout;
         return this;
     }
 
-    @Override
-    public String toString() {
-        return new StringBuilder("restart ").append("--time=" + timeout + " ").append(containerId).toString();
-    }
-
     /**
      * @throws NotFoundException
      *             No such container
diff --git a/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
index 676b151af..12dafb7d9 100644
--- a/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
@@ -49,11 +49,6 @@ public SaveImageCmd withTag(String tag) {
         return this;
     }
 
-    @Override
-    public String toString() {
-        return new StringBuilder("get ").append(name).toString();
-    }
-
     /**
      * @throws com.github.dockerjava.api.NotFoundException
      *             No such image
diff --git a/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
index 6630377c8..342a7fbd2 100644
--- a/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
@@ -35,8 +35,4 @@ public SearchImagesCmd withTerm(String term) {
         return this;
     }
 
-    @Override
-    public String toString() {
-        return new StringBuilder("search ").append(term).toString();
-    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
index 6fe60734d..9d432b7f3 100644
--- a/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
@@ -37,11 +37,6 @@ public String getContainerId() {
         return containerId;
     }
 
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this).toString();
-    }
-
     /**
      * @throws NotFoundException
      *             No such container
diff --git a/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
index 9f0e3a00a..bcd187d6a 100644
--- a/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
@@ -28,8 +28,4 @@ public String getContainerId() {
         return containerId;
     }
 
-    @Override
-    public String toString() {
-        return new StringBuilder("stats").append(containerId != null ? " --id=" + containerId : "").toString();
-    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
index 28373e2ce..bb3ff28e6 100644
--- a/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
@@ -3,6 +3,9 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.NotModifiedException;
 import com.github.dockerjava.api.command.StopContainerCmd;
@@ -20,7 +23,7 @@ public class StopContainerCmdImpl extends AbstrDockerCmd<StopContainerCmd, Void>
 
     private String containerId;
 
-    private int timeout = 10;
+    private Integer timeout = 10;
 
     public StopContainerCmdImpl(StopContainerCmd.Exec exec, String containerId) {
         super(exec);
@@ -33,7 +36,7 @@ public String getContainerId() {
     }
 
     @Override
-    public int getTimeout() {
+    public Integer getTimeout() {
         return timeout;
     }
 
@@ -45,17 +48,13 @@ public StopContainerCmd withContainerId(String containerId) {
     }
 
     @Override
-    public StopContainerCmd withTimeout(int timeout) {
+    public StopContainerCmd withTimeout(Integer timeout) {
+        checkNotNull(timeout, "timeout was not specified");
         checkArgument(timeout >= 0, "timeout must be greater or equal 0");
         this.timeout = timeout;
         return this;
     }
 
-    @Override
-    public String toString() {
-        return new StringBuilder("stop ").append("--time=" + timeout + " ").append(containerId).toString();
-    }
-
     /**
      * @throws NotFoundException
      *             No such container
diff --git a/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
index e31151147..afa3c3e52 100644
--- a/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
@@ -2,6 +2,9 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
 import com.github.dockerjava.api.command.TagImageCmd;
 
 /**
@@ -13,13 +16,13 @@
  *            The repository to tag in
  * @param force
  *            (not documented)
- * 
+ *
  */
 public class TagImageCmdImpl extends AbstrDockerCmd<TagImageCmd, Void> implements TagImageCmd {
 
     private String imageId, repository, tag;
 
-    private boolean force;
+    private Boolean force;
 
     public TagImageCmdImpl(TagImageCmd.Exec exec, String imageId, String repository, String tag) {
         super(exec);
@@ -44,7 +47,7 @@ public String getTag() {
     }
 
     @Override
-    public boolean hasForceEnabled() {
+    public Boolean hasForceEnabled() {
         return force;
     }
 
@@ -75,15 +78,9 @@ public TagImageCmd withForce() {
     }
 
     @Override
-    public TagImageCmd withForce(boolean force) {
+    public TagImageCmd withForce(Boolean force) {
         this.force = force;
         return this;
     }
 
-    @Override
-    public String toString() {
-        return new StringBuilder("tag ").append(force ? "--force=true " : "")
-                .append(repository != null ? repository + "/" : "").append(imageId)
-                .append(tag != null ? ":" + tag : "").toString();
-    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
index b4414f29e..44fc97be2 100644
--- a/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
@@ -2,6 +2,9 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.TopContainerResponse;
@@ -45,11 +48,6 @@ public TopContainerCmd withPsArgs(String psArgs) {
         return this;
     }
 
-    @Override
-    public String toString() {
-        return new StringBuilder("top ").append(containerId).append(psArgs != null ? " " + psArgs : "").toString();
-    }
-
     /**
      * @throws NotFoundException
      *             No such container
diff --git a/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
index 583d519c8..949a7bb6f 100644
--- a/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
@@ -33,11 +33,6 @@ public UnpauseContainerCmd withContainerId(String containerId) {
         return this;
     }
 
-    @Override
-    public String toString() {
-        return new StringBuilder("pause ").append(containerId).toString();
-    }
-
     /**
      * @throws NotFoundException
      *             No such container
diff --git a/src/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java
index 67f46ce3a..3f27eacf1 100644
--- a/src/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java
@@ -8,11 +8,6 @@
  */
 public class VersionCmdImpl extends AbstrDockerCmd<VersionCmd, Version> implements VersionCmd {
 
-    @Override
-    public String toString() {
-        return "version";
-    }
-
     public VersionCmdImpl(VersionCmd.Exec exec) {
         super(exec);
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
index 702eebd33..bdafdc688 100644
--- a/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
@@ -6,7 +6,7 @@
 
 /**
  * Wait a container
- * 
+ *
  * Block until container stops, then returns its exit code
  */
 public class WaitContainerCmdImpl extends AbstrDockerCmd<WaitContainerCmd, Integer> implements WaitContainerCmd {
@@ -30,8 +30,4 @@ public WaitContainerCmd withContainerId(String containerId) {
         return this;
     }
 
-    @Override
-    public String toString() {
-        return "wait " + containerId;
-    }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
index 4c0d36eaa..c203941d6 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
@@ -42,4 +42,16 @@ protected String registryConfigs(AuthConfigurations authConfigs) {
         }
     }
 
+    protected boolean bool(Boolean bool) {
+        return bool != null && bool;
+    }
+
+    protected WebTarget booleanQueryParam(WebTarget webTarget, String name, Boolean value) {
+        if(bool(value)) {
+            webTarget = webTarget.queryParam(name, bool(value) + "");
+        }
+
+        return webTarget;
+    }
+
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
index 67da89284..e006e0434 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
@@ -26,12 +26,13 @@ protected AbstractCallbackNotifier<Frame> callbackNotifier(AttachContainerCmd co
             ResultCallback<Frame> resultCallback) {
 
         WebTarget webTarget = getBaseResource().path("/containers/{id}/attach")
-                .resolveTemplate("id", command.getContainerId())
-                .queryParam("logs", command.hasLogsEnabled() ? "1" : "0")
-                // .queryParam("stdin", command.hasStdinEnabled() ? "1" : "0")
-                .queryParam("stdout", command.hasStdoutEnabled() ? "1" : "0")
-                .queryParam("stderr", command.hasStderrEnabled() ? "1" : "0")
-                .queryParam("stream", command.hasFollowStreamEnabled() ? "1" : "0");
+                .resolveTemplate("id", command.getContainerId());
+
+        webTarget = booleanQueryParam(webTarget, "logs", command.hasLogsEnabled());
+        webTarget = booleanQueryParam(webTarget, "stdout", command.hasStdoutEnabled());
+        //webTarget = booleanQueryParam(webTarget, "stdin", command.hasStdinEnabled());
+        webTarget = booleanQueryParam(webTarget, "stderr", command.hasStderrEnabled());
+        webTarget = booleanQueryParam(webTarget, "stream", command.hasFollowStreamEnabled());
 
         LOGGER.trace("POST: {}", webTarget);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index 8da1884b8..a7e842aa5 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -51,21 +51,18 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
         if (command.getRemote() != null) {
             webTarget = webTarget.queryParam("remote", command.getRemote().toString());
         }
-        if (command.isQuiet()) {
-            webTarget = webTarget.queryParam("q", "true");
-        }
-        if (command.hasNoCacheEnabled()) {
-            webTarget = webTarget.queryParam("nocache", "true");
-        }
-        if (command.hasPullEnabled()) {
-            webTarget = webTarget.queryParam("pull", "true");
-        }
-        if (!command.hasRemoveEnabled()) {
+
+        webTarget = booleanQueryParam(webTarget, "q", command.isQuiet());
+        webTarget = booleanQueryParam(webTarget, "nocache", command.hasNoCacheEnabled());
+        webTarget = booleanQueryParam(webTarget, "pull", command.hasPullEnabled());
+        webTarget = booleanQueryParam(webTarget, "rm", command.hasRemoveEnabled());
+        webTarget = booleanQueryParam(webTarget, "forcerm", command.isForcerm());
+
+        // this has to be handled differently as it should switch to 'false'
+        if (command.hasRemoveEnabled() == null || !command.hasRemoveEnabled()) {
             webTarget = webTarget.queryParam("rm", "false");
         }
-        if (command.isForcerm()) {
-            webTarget = webTarget.queryParam("forcerm", "true");
-        }
+
         if (command.getMemory() != null) {
             webTarget = webTarget.queryParam("memory", command.getMemory());
         }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
index fec4da6ac..5116e7a83 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
@@ -21,13 +21,14 @@ public CommitCmdExec(WebTarget baseResource) {
 
     @Override
     protected String execute(CommitCmd command) {
-        WebTarget webResource = getBaseResource().path("/commit").queryParam("container", command.getContainerId())
+        WebTarget webTarget = getBaseResource().path("/commit").queryParam("container", command.getContainerId())
                 .queryParam("repo", command.getRepository()).queryParam("tag", command.getTag())
-                .queryParam("m", command.getMessage()).queryParam("author", command.getAuthor())
-                .queryParam("pause", command.hasPauseEnabled() ? "1" : "0");
+                .queryParam("m", command.getMessage()).queryParam("author", command.getAuthor());
 
-        LOGGER.trace("POST: {}", webResource);
-        ObjectNode objectNode = webResource.request().accept("application/vnd.docker.raw-stream")
+        webTarget = booleanQueryParam(webTarget, "pause", command.hasPauseEnabled());
+
+        LOGGER.trace("POST: {}", webTarget);
+        ObjectNode objectNode = webTarget.request().accept("application/vnd.docker.raw-stream")
                 .post(entity(command, MediaType.APPLICATION_JSON), ObjectNode.class);
         return objectNode.get("Id").asText();
     }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
index e1e74eec9..22dc4a7d0 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
@@ -25,22 +25,23 @@ public ListContainersCmdExec(WebTarget baseResource) {
 
     @Override
     protected List<Container> execute(ListContainersCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/json")
-                .queryParam("all", command.hasShowAllEnabled() ? "1" : "0").queryParam("since", command.getSinceId())
-                .queryParam("before", command.getBeforeId())
-                .queryParam("size", command.hasShowSizeEnabled() ? "1" : "0");
+        WebTarget webTarget = getBaseResource().path("/containers/json").queryParam("since", command.getSinceId())
+                .queryParam("before", command.getBeforeId());
 
-        if (command.getLimit() >= 0) {
-            webResource = webResource.queryParam("limit", String.valueOf(command.getLimit()));
+        webTarget = booleanQueryParam(webTarget, "all", command.hasShowAllEnabled());
+        webTarget = booleanQueryParam(webTarget, "size", command.hasShowSizeEnabled());
+
+        if (command.getLimit() != null && command.getLimit() >= 0) {
+            webTarget = webTarget.queryParam("limit", String.valueOf(command.getLimit()));
         }
 
         if (command.getFilters() != null) {
-            webResource = webResource.queryParam("filters",
-                    urlPathSegmentEscaper().escape(command.getFilters().toString()));
+            webTarget = webTarget
+                    .queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters().toString()));
         }
 
-        LOGGER.trace("GET: {}", webResource);
-        List<Container> containers = webResource.request().accept(MediaType.APPLICATION_JSON)
+        LOGGER.trace("GET: {}", webTarget);
+        List<Container> containers = webTarget.request().accept(MediaType.APPLICATION_JSON)
                 .get(new GenericType<List<Container>>() {
                 });
         LOGGER.trace("Response: {}", containers);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
index fa8409cb8..c7f3f85c2 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
@@ -24,15 +24,16 @@ public ListImagesCmdExec(WebTarget baseResource) {
 
     @Override
     protected List<Image> execute(ListImagesCmd command) {
-        WebTarget webResource = getBaseResource().path("/images/json").queryParam("all",
-                command.hasShowAllEnabled() ? "1" : "0");
+        WebTarget webTarget = getBaseResource().path("/images/json");
+
+        webTarget = booleanQueryParam(webTarget, "all", command.hasShowAllEnabled());
 
         if (command.getFilters() != null)
-            webResource = webResource.queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters()));
+            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters()));
 
-        LOGGER.trace("GET: {}", webResource);
+        LOGGER.trace("GET: {}", webTarget);
 
-        List<Image> images = webResource.request().accept(MediaType.APPLICATION_JSON)
+        List<Image> images = webTarget.request().accept(MediaType.APPLICATION_JSON)
                 .get(new GenericType<List<Image>>() {
                 });
         LOGGER.trace("Response: {}", images);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
index 0ab3da7a5..9cbeb08cc 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
@@ -26,12 +26,16 @@ protected AbstractCallbackNotifier<Frame> callbackNotifier(LogContainerCmd comma
             ResultCallback<Frame> resultCallback) {
 
         WebTarget webTarget = getBaseResource().path("/containers/{id}/logs")
-                .resolveTemplate("id", command.getContainerId())
-                .queryParam("timestamps", command.hasTimestampsEnabled() ? "1" : "0")
-                .queryParam("stdout", command.hasStdoutEnabled() ? "1" : "0")
-                .queryParam("stderr", command.hasStderrEnabled() ? "1" : "0")
-                .queryParam("follow", command.hasFollowStreamEnabled() ? "1" : "0")
-                .queryParam("tail", command.getTail() < 0 ? "all" : "" + command.getTail());
+                .resolveTemplate("id", command.getContainerId());
+
+        if(command.getTail() != null) {
+            webTarget = webTarget.queryParam("tail", command.getTail() < 0 ? "all" : "" + command.getTail());
+        }
+
+        webTarget = booleanQueryParam(webTarget, "timestamps", command.hasTimestampsEnabled());
+        webTarget = booleanQueryParam(webTarget, "stdout", command.hasStdoutEnabled());
+        webTarget = booleanQueryParam(webTarget, "stderr", command.hasStderrEnabled());
+        webTarget = booleanQueryParam(webTarget, "follow", command.hasFollowStreamEnabled());
 
         LOGGER.trace("GET: {}", webTarget);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
index 2e72c37bc..b66cf5ea9 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
@@ -19,12 +19,13 @@ public RemoveContainerCmdExec(WebTarget baseResource) {
 
     @Override
     protected Void execute(RemoveContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/" + command.getContainerId())
-                .queryParam("v", command.hasRemoveVolumesEnabled() ? "1" : "0")
-                .queryParam("force", command.hasForceEnabled() ? "1" : "0");
+        WebTarget webTarget = getBaseResource().path("/containers/" + command.getContainerId());
 
-        LOGGER.trace("DELETE: {}", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON).delete().close();
+        webTarget = booleanQueryParam(webTarget, "v", command.hasRemoveVolumesEnabled());
+        webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled());
+
+        LOGGER.trace("DELETE: {}", webTarget);
+        webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close();
 
         return null;
     }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
index 18d477c51..21d2eb263 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
@@ -17,12 +17,13 @@ public RemoveImageCmdExec(WebTarget baseResource) {
 
     @Override
     protected Void execute(RemoveImageCmd command) {
-        WebTarget webResource = getBaseResource().path("/images/" + command.getImageId())
-                .queryParam("force", command.hasForceEnabled() ? "1" : "0")
-                .queryParam("noprune", command.hasNoPruneEnabled() ? "1" : "0");
+        WebTarget webTarget = getBaseResource().path("/images/" + command.getImageId());
 
-        LOGGER.trace("DELETE: {}", webResource);
-        webResource.request().delete().close();
+        webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled());
+        webTarget = booleanQueryParam(webTarget, "noprune", command.hasNoPruneEnabled());
+
+        LOGGER.trace("DELETE: {}", webTarget);
+        webTarget.request().delete().close();
 
         return null;
     }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
index 0a4fced89..4f5498180 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
@@ -20,7 +20,11 @@ public RestartContainerCmdExec(WebTarget baseResource) {
     @Override
     protected Void execute(RestartContainerCmd command) {
         WebTarget webResource = getBaseResource().path("/containers/{id}/restart")
-                .resolveTemplate("id", command.getContainerId()).queryParam("t", String.valueOf(command.getTimeout()));
+                .resolveTemplate("id", command.getContainerId());
+
+        if(command.getTimeout() != null) {
+            webResource = webResource.queryParam("t", String.valueOf(command.getTimeout()));
+        }
 
         LOGGER.trace("POST: {}", webResource);
         webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
index ca6ad3537..3ba2403aa 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
@@ -20,7 +20,11 @@ public StopContainerCmdExec(WebTarget baseResource) {
     @Override
     protected Void execute(StopContainerCmd command) {
         WebTarget webResource = getBaseResource().path("/containers/{id}/stop")
-                .resolveTemplate("id", command.getContainerId()).queryParam("t", String.valueOf(command.getTimeout()));
+                .resolveTemplate("id", command.getContainerId());
+
+        if(command.getTimeout() != null) {
+            webResource = webResource.queryParam("t", String.valueOf(command.getTimeout()));
+        }
 
         LOGGER.trace("POST: {}", webResource);
         webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
diff --git a/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
index f697b22b2..a114d2239 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
@@ -17,12 +17,13 @@ public TagImageCmdExec(WebTarget baseResource) {
 
     @Override
     protected Void execute(TagImageCmd command) {
-        WebTarget webResource = getBaseResource().path("/images/" + command.getImageId() + "/tag")
-                .queryParam("repo", command.getRepository()).queryParam("tag", command.getTag())
-                .queryParam("force", command.hasForceEnabled() ? "1" : "0");
+        WebTarget webTarget = getBaseResource().path("/images/" + command.getImageId() + "/tag")
+                .queryParam("repo", command.getRepository()).queryParam("tag", command.getTag());
 
-        LOGGER.trace("POST: {}", webResource);
-        webResource.request().post(null).close();
+        webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled());
+
+        LOGGER.trace("POST: {}", webTarget);
+        webTarget.request().post(null).close();
         return null;
     }
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
index 0ba33ec82..69fdf8c92 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
@@ -111,7 +111,7 @@ public int compare(final Map.Entry<String, List<String>> o1, final Map.Entry<Str
 
     private final AtomicLong _id = new AtomicLong(0);
 
-    private final boolean printEntity;
+    private final Boolean printEntity;
 
     private final int maxEntitySize;
 
@@ -132,7 +132,7 @@ public LoggingFilter() {
      *            if true, entity will be logged as well up to the default maxEntitySize, which is 8KB
      */
     @SuppressWarnings("BooleanParameter")
-    public LoggingFilter(final Logger logger, final boolean printEntity) {
+    public LoggingFilter(final Logger logger, final Boolean printEntity) {
         this.logger = logger;
         this.printEntity = printEntity;
         this.maxEntitySize = DEFAULT_MAX_ENTITY_SIZE;
@@ -189,7 +189,7 @@ private void printPrefixedHeaders(final StringBuilder b, final long id, final St
                 prefixId(b, id).append(prefix).append(header).append(": ").append(val.get(0)).append("\n");
             } else {
                 final StringBuilder sb = new StringBuilder();
-                boolean add = false;
+                Boolean add = false;
                 for (final Object s : val) {
                     if (add) {
                         sb.append(',');
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
index a93085987..847033fd5 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
@@ -28,7 +28,7 @@ public class SelectiveLoggingFilter extends LoggingFilter {
         SKIPPED_CONTENT = Collections.unmodifiableSet(s);
     }
 
-    public SelectiveLoggingFilter(Logger logger, boolean b) {
+    public SelectiveLoggingFilter(Logger logger, Boolean b) {
         super(logger, b);
     }
 
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index e8dfa9bd7..225f16ac9 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -138,7 +138,7 @@ public static String consumeAsString(InputStream response) {
      * @param port
      *            the port to check for availability
      */
-    public static boolean available(int port) {
+    public static Boolean available(int port) {
         if (port < 1100 || port > 60000) {
             throw new IllegalArgumentException("Invalid start port: " + port);
         }
diff --git a/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java b/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
index cf5b03188..990548442 100644
--- a/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
+++ b/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
@@ -26,7 +26,7 @@ public void testMatch(MatchTestCase testCase) throws IOException {
             s = FilenameUtils.normalize(s);
         }
         try {
-            boolean matched = GoLangFileMatch.match(pattern, s);
+            Boolean matched = GoLangFileMatch.match(pattern, s);
             if (testCase.expectException) {
                 Assert.fail("Expected GoFileMatchException");
             }
@@ -101,11 +101,11 @@ private final class MatchTestCase {
 
         private final String s;
 
-        private final boolean matches;
+        private final Boolean matches;
 
-        private final boolean expectException;
+        private final Boolean expectException;
 
-        public MatchTestCase(String pattern, String s, boolean matches, boolean expectException) {
+        public MatchTestCase(String pattern, String s, Boolean matches, Boolean expectException) {
             super();
             this.pattern = pattern;
             this.s = s;
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
index b00034ad0..96bae1d8a 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
@@ -53,7 +53,7 @@ public void copyFromContainer() throws Exception {
         dockerClient.startContainerCmd(container.getId()).exec();
 
         InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "/copyFromContainer").exec();
-        boolean bytesAvailable = response.available() > 0;
+        Boolean bytesAvailable = response.available() > 0;
         assertTrue(bytesAvailable, "The file was not copied from the container.");
 
         // read the stream fully. Otherwise, the underlying stream will not be closed.
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 1aeeb5479..27318f39a 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -512,7 +512,7 @@ public void createContainerWithLabels() throws DockerException {
 
         Map<String, String> labels = new HashMap<String, String>();
         labels.put("com.github.dockerjava.null", null);
-        labels.put("com.github.dockerjava.boolean", "true");
+        labels.put("com.github.dockerjava.Boolean", "true");
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withLabels(labels).exec();
diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
index 2d1be184a..ead529107 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -64,7 +64,7 @@ public void testEventStreamTimeBound() throws Exception {
 
         dockerClient.eventsCmd().withSince(startTime).withUntil(endTime).exec(eventCallback);
 
-        boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
+        Boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
 
         eventCallback.close();
 
@@ -83,7 +83,7 @@ public void testEventStreaming1() throws Exception {
 
         generateEvents();
 
-        boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
+        Boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
 
         eventCallback.close();
         assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
@@ -101,7 +101,7 @@ public void testEventStreaming2() throws Exception {
 
         generateEvents();
 
-        boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
+        Boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
 
         eventCallback.close();
         assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
@@ -117,7 +117,7 @@ public void testEventStreamingWithFilter() throws Exception {
 
         generateEvents();
 
-        boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
+        Boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
 
         eventCallback.close();
         assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
diff --git a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
index 94934296b..43aa49f0e 100644
--- a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
@@ -57,7 +57,7 @@ public void execStart() throws Exception {
         dockerClient.execStartCmd(execCreateCmdResponse.getId()).exec();
 
         InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "/execStartTest.log").exec();
-        boolean bytesAvailable = response.available() > 0;
+        Boolean bytesAvailable = response.available() > 0;
         assertTrue(bytesAvailable, "The file was not copied from the container.");
 
         // read the stream fully. Otherwise, the underlying stream will not be closed.
@@ -82,7 +82,7 @@ public void execStartAttached() throws Exception {
         dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true).exec();
 
         InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "/execStartTest.log").exec();
-        boolean bytesAvailable = response.available() > 0;
+        Boolean bytesAvailable = response.available() > 0;
         assertTrue(bytesAvailable, "The file was not copied from the container.");
 
         // read the stream fully. Otherwise, the underlying stream will not be closed.
diff --git a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
index 221d36f36..d508df235 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
@@ -72,11 +72,11 @@ public void listDanglingImages() throws DockerException {
         assertThat(images, notNullValue());
         LOG.info("Images List: {}", images);
         assertThat(images.size(), is(greaterThan(0)));
-        boolean imageInFilteredList = isImageInFilteredList(images, imageId);
+        Boolean imageInFilteredList = isImageInFilteredList(images, imageId);
         assertTrue(imageInFilteredList);
     }
 
-    private boolean isImageInFilteredList(List<Image> images, String expectedImageId) {
+    private Boolean isImageInFilteredList(List<Image> images, String expectedImageId) {
         for (Image image : images) {
             if (expectedImageId.equals(image.getId())) {
                 return true;
diff --git a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
index 299c694d4..611225d4c 100644
--- a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
@@ -66,7 +66,7 @@ public void testStatsStreaming() throws InterruptedException, IOException {
                 .exec(new StatsCallbackTest(countDownLatch));
 
         countDownLatch.await(3, TimeUnit.SECONDS);
-        boolean gotStats = statsCallback.gotStats();
+        Boolean gotStats = statsCallback.gotStats();
 
         LOG.info("Stop stats collection");
 
@@ -84,7 +84,7 @@ public void testStatsStreaming() throws InterruptedException, IOException {
     private class StatsCallbackTest extends ResultCallbackTemplate<StatsCallbackTest, Statistics> {
         private final CountDownLatch countDownLatch;
 
-        private boolean gotStats = false;
+        private Boolean gotStats = false;
 
         public StatsCallbackTest(CountDownLatch countDownLatch) {
             this.countDownLatch = countDownLatch;
@@ -99,7 +99,7 @@ public void onNext(Statistics stats) {
             countDownLatch.countDown();
         }
 
-        public boolean gotStats() {
+        public Boolean gotStats() {
             return gotStats;
         }
     }

From c9618782d0c89e5f80c105f068c56d8028b56123 Mon Sep 17 00:00:00 2001
From: Marco Lotz <marco-aurelio.bar.lotz@hp.com>
Date: Tue, 1 Sep 2015 16:24:29 +0100
Subject: [PATCH 0220/1272] Link sent to a German Version of dev group.
 Modified to English address.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4a89ab63d..60eeca79b 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Supports a subset of the Docker Remote API [v1.19](https://github.com/docker/doc
 
 <b>The current implementation is based on Jersey 2.x and therefore classpath incompatible with older Jersey 1.x dependent libraries!</b>
 
-Developer forum for [docker-java](https://groups.google.com/forum/?hl=de#!forum/docker-java-dev "docker-java")
+Developer forum for [docker-java](https://groups.google.com/forum/?#!forum/docker-java-dev "docker-java")
 
 ## Build with Maven
 

From ee0b7db93537bfaf26983d02ea4fed4a1608e217 Mon Sep 17 00:00:00 2001
From: Yongxing Wang <yongxing@sumologic.com>
Date: Thu, 10 Sep 2015 17:42:51 -0700
Subject: [PATCH 0221/1272] This add the support for "since" field for logs
 command.

---
 .../dockerjava/api/command/LogContainerCmd.java |  6 ++++++
 .../core/command/LogContainerCmdImpl.java       | 17 ++++++++++++++++-
 .../dockerjava/jaxrs/LogContainerCmdExec.java   |  1 +
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
index a97393aa5..b1c22283c 100644
--- a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -18,6 +18,8 @@
  *            - true or false, if true, print timestamps for every log line. Defaults to false.
  * @param tail
  *            - `all` or `<number>`, Output specified number of lines at the end of logs
+ * @param since
+ *            - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default: 0 (unfiltered)
  */
 public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame> {
 
@@ -33,6 +35,8 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame>
 
     public boolean hasStderrEnabled();
 
+    public int getSince();
+
     public LogContainerCmd withContainerId(String containerId);
 
     /**
@@ -63,6 +67,8 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame>
 
     public LogContainerCmd withTail(int tail);
 
+    public LogContainerCmd withSince(int since);
+
     public static interface Exec extends DockerCmdAsyncExec<LogContainerCmd, Frame> {
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
index a9d923635..afc6a0754 100644
--- a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -18,6 +18,8 @@
  *            - true or false, if true, print timestamps for every log line. Defaults to false.
  * @param tail
  *            - `all` or `<number>`, Output specified number of lines at the end of logs
+ * @param since
+ *            - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default: 0 (unfiltered)
  */
 public class LogContainerCmdImpl extends AbstrAsyncDockerCmd<LogContainerCmd, Frame> implements LogContainerCmd {
 
@@ -27,6 +29,8 @@ public class LogContainerCmdImpl extends AbstrAsyncDockerCmd<LogContainerCmd, Fr
 
     private boolean followStream, timestamps, stdout, stderr;
 
+    private int since = 0;
+
     public LogContainerCmdImpl(LogContainerCmd.Exec exec, String containerId) {
         super(exec);
         withContainerId(containerId);
@@ -62,6 +66,9 @@ public boolean hasStderrEnabled() {
         return stderr;
     }
 
+    @Override
+    public int getSince() {return since; }
+
     @Override
     public LogContainerCmd withContainerId(String containerId) {
         checkNotNull(containerId, "containerId was not specified");
@@ -125,10 +132,18 @@ public LogContainerCmd withTail(int tail) {
         return this;
     }
 
+    @Override
+    public LogContainerCmd withSince(int since) {
+        this.since = since;
+        return this;
+    }
+
     @Override
     public String toString() {
         return new StringBuilder("logs ").append(followStream ? "--follow=true" : "")
-                .append(timestamps ? "--timestamps=true" : "").append(containerId).toString();
+                .append(timestamps ? "--timestamps=true" : "")
+                .append(since > 0 ? "--since=" + since : "")
+                .append(containerId).toString();
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
index 0ab3da7a5..b2c1691b6 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
@@ -31,6 +31,7 @@ protected AbstractCallbackNotifier<Frame> callbackNotifier(LogContainerCmd comma
                 .queryParam("stdout", command.hasStdoutEnabled() ? "1" : "0")
                 .queryParam("stderr", command.hasStderrEnabled() ? "1" : "0")
                 .queryParam("follow", command.hasFollowStreamEnabled() ? "1" : "0")
+                .queryParam("since", command.getSince())
                 .queryParam("tail", command.getTail() < 0 ? "all" : "" + command.getTail());
 
         LOGGER.trace("GET: {}", webTarget);

From 2625bca90566801cb64557755728cf525892c5b8 Mon Sep 17 00:00:00 2001
From: Yongxing Wang <yongxing@sumologic.com>
Date: Thu, 10 Sep 2015 23:33:29 -0700
Subject: [PATCH 0222/1272] add a test for the since field

---
 .../core/command/LogContainerCmdImplTest.java | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
index 2e2dedb45..16b0266ac 100644
--- a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
@@ -62,6 +62,7 @@ public void asyncLogContainer() throws Exception {
 
         LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
 
+        //this essentially test the since=0 case
         dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec(loggingCallback);
 
         loggingCallback.awaitCompletion();
@@ -69,6 +70,8 @@ public void asyncLogContainer() throws Exception {
         assertTrue(loggingCallback.toString().contains(snippet));
     }
 
+
+
     @Test
     public void asyncLogNonExistingContainer() throws Exception {
 
@@ -135,4 +138,30 @@ public void asyncMultipleLogContainer() throws Exception {
         assertTrue(loggingCallback.toString().contains(snippet));
     }
 
+    @Test
+    public void asyncLogContainerWithSince() throws Exception {
+        String snippet = "hello world";
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("/bin/echo", snippet)
+                .exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
+
+        assertThat(exitCode, equalTo(0));
+
+        LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
+
+        int oneMinuteIntoFuture = (int)(System.currentTimeMillis()/1000) + 60;
+        dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().withSince(oneMinuteIntoFuture).exec(loggingCallback);
+
+        loggingCallback.awaitCompletion();
+
+        assertFalse(loggingCallback.toString().contains(snippet));
+    }
+
 }

From 1d38e935efe47c2b316b083358af78f141c68d27 Mon Sep 17 00:00:00 2001
From: Richard Lee <git@richardlee.name>
Date: Tue, 15 Sep 2015 13:29:54 -0700
Subject: [PATCH 0223/1272] Add all missing fields to ResponseItem and related
 classes. Fix types to match Go code.

---
 .../api/model/BuildResponseItem.java          |  7 ---
 .../api/model/PushResponseItem.java           |  2 +-
 .../dockerjava/api/model/ResponseItem.java    | 56 ++++++++++++++-----
 3 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
index 37fae34e7..f2ede94cc 100644
--- a/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
@@ -14,13 +14,6 @@ public class BuildResponseItem extends ResponseItem {
 
     private static final String BUILD_SUCCESS = "Successfully built";
 
-    @JsonProperty("stream")
-    private String stream;
-
-    public String getStream() {
-        return stream;
-    }
-
     /**
      * Returns whether the stream field indicates a successful build operation
      */
diff --git a/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
index 2555271fd..e45fac17c 100644
--- a/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
@@ -18,7 +18,7 @@ public class PushResponseItem extends ResponseItem {
      */
     @JsonIgnore
     public boolean isErrorIndicated() {
-        if (getError() == null)
+        if (getError() == null && getErrorDetail() == null)
             return false;
 
         return true;
diff --git a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
index 3ea625164..c9e6c6bec 100644
--- a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
@@ -16,57 +16,83 @@ public class ResponseItem implements Serializable {
 
     private static final long serialVersionUID = -5187169652557467828L;
 
+    @JsonProperty("stream")
+    private String stream;
+
     @JsonProperty("status")
     private String status;
 
+    @JsonProperty("progressDetail")
+    private ProgressDetail progressDetail;
+
     @JsonProperty("progress")
     private String progress;
 
-    @JsonProperty("progressDetail")
-    private ProgressDetail progressDetail;
+    @JsonProperty("id")
+    private String id;
 
-    @JsonProperty("error")
-    private String error;
+    @JsonProperty("from")
+    private String from;
+
+    @JsonProperty("time")
+    private long time;
 
     @JsonProperty("errorDetail")
     private ErrorDetail errorDetail;
 
-    @JsonProperty("id")
-    private String id;
+    @JsonProperty("error")
+    private String error;
 
-    public String getStatus() {
-        return status;
+    public String getStream() {
+        return stream;
     }
 
-    public String getProgress() {
-        return progress;
+    public String getStatus() {
+        return status;
     }
 
     public ProgressDetail getProgressDetail() {
         return progressDetail;
     }
 
+    @Deprecated
+    public String getProgress() {
+        return progress;
+    }
+
     public String getId() {
         return id;
     }
 
-    public String getError() {
-        return error;
+    public String getFrom() {
+        return from;
+    }
+
+    public long getTime() {
+        return time;
     }
 
     public ErrorDetail getErrorDetail() {
         return errorDetail;
     }
 
+    @Deprecated
+    public String getError() {
+        return error;
+    }
+
     @JsonIgnoreProperties(ignoreUnknown = false)
     public static class ProgressDetail implements Serializable {
         private static final long serialVersionUID = -1954994695645715264L;
 
         @JsonProperty("current")
-        int current;
+        long current;
 
         @JsonProperty("total")
-        int total;
+        long total;
+
+        @JsonProperty("start")
+        long start;
 
         @Override
         public String toString() {
@@ -79,7 +105,7 @@ public static class ErrorDetail implements Serializable {
         private static final long serialVersionUID = -9136704865403084083L;
 
         @JsonProperty("code")
-        String code;
+        int code;
 
         @JsonProperty("message")
         String message;

From 7ff167043548c98a26a507462c51f1529f0b8344 Mon Sep 17 00:00:00 2001
From: Richard Lee <git@richardlee.name>
Date: Thu, 17 Sep 2015 08:44:44 -0700
Subject: [PATCH 0224/1272] Minor refactoring of error method

---
 .../dockerjava/api/model/BuildResponseItem.java    |  6 ++++--
 .../dockerjava/api/model/PullResponseItem.java     |  3 ++-
 .../dockerjava/api/model/PushResponseItem.java     | 12 ------------
 .../github/dockerjava/api/model/ResponseItem.java  | 14 ++++++++++++++
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
index f2ede94cc..348a4c8f5 100644
--- a/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
@@ -19,16 +19,18 @@ public class BuildResponseItem extends ResponseItem {
      */
     @JsonIgnore
     public boolean isBuildSuccessIndicated() {
-        if (getStream() == null)
+        if (isErrorIndicated() || getStream() == null) {
             return false;
+        }
 
         return getStream().contains(BUILD_SUCCESS);
     }
 
     @JsonIgnore
     public String getImageId() {
-        if (!isBuildSuccessIndicated())
+        if (!isBuildSuccessIndicated()) {
             return null;
+        }
 
         return getStream().replaceFirst(BUILD_SUCCESS, "").trim();
     }
diff --git a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
index b2bedca60..834060b99 100644
--- a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
@@ -18,8 +18,9 @@ public class PullResponseItem extends ResponseItem {
      */
     @JsonIgnore
     public boolean isPullSuccessIndicated() {
-        if (getStatus() == null)
+        if (isErrorIndicated() || getStatus() == null) {
             return false;
+        }
 
         return (getStatus().contains("Download complete") || getStatus().contains("Image is up to date") || getStatus()
                 .contains("Downloaded newer image"));
diff --git a/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
index e45fac17c..31a2329d8 100644
--- a/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
@@ -11,16 +11,4 @@ public class PushResponseItem extends ResponseItem {
 
     private static final long serialVersionUID = 8256977108011295857L;
 
-    /**
-     * Returns whether the error field indicates an error
-     *
-     * @returns true: the error field indicates an error, false: the error field doesn't indicate an error
-     */
-    @JsonIgnore
-    public boolean isErrorIndicated() {
-        if (getError() == null && getErrorDetail() == null)
-            return false;
-
-        return true;
-    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
index c9e6c6bec..ea16c0801 100644
--- a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
@@ -2,6 +2,7 @@
 
 import java.io.Serializable;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 
@@ -25,6 +26,7 @@ public class ResponseItem implements Serializable {
     @JsonProperty("progressDetail")
     private ProgressDetail progressDetail;
 
+    @Deprecated
     @JsonProperty("progress")
     private String progress;
 
@@ -40,6 +42,7 @@ public class ResponseItem implements Serializable {
     @JsonProperty("errorDetail")
     private ErrorDetail errorDetail;
 
+    @Deprecated
     @JsonProperty("error")
     private String error;
 
@@ -81,6 +84,17 @@ public String getError() {
         return error;
     }
 
+    /**
+     * Returns whether the error field indicates an error
+     *
+     * @returns true: the error field indicates an error, false: the error field doesn't indicate an error
+     */
+    @JsonIgnore
+    public boolean isErrorIndicated() {
+        // check both the deprecated and current error fields, just in case
+        return getError() != null || getErrorDetail() != null;
+    }
+
     @JsonIgnoreProperties(ignoreUnknown = false)
     public static class ProgressDetail implements Serializable {
         private static final long serialVersionUID = -1954994695645715264L;

From e12e3b6f32ba04c113dd0b74e1bf011871491e9f Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 17 Sep 2015 21:03:29 +0200
Subject: [PATCH 0225/1272] Fix test

---
 .../core/command/LogContainerCmdImplTest.java          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
index 16b0266ac..c3f6ab01c 100644
--- a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
@@ -62,7 +62,7 @@ public void asyncLogContainer() throws Exception {
 
         LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
 
-        //this essentially test the since=0 case
+        // this essentially test the since=0 case
         dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec(loggingCallback);
 
         loggingCallback.awaitCompletion();
@@ -70,8 +70,6 @@ public void asyncLogContainer() throws Exception {
         assertTrue(loggingCallback.toString().contains(snippet));
     }
 
-
-
     @Test
     public void asyncLogNonExistingContainer() throws Exception {
 
@@ -148,6 +146,8 @@ public void asyncLogContainerWithSince() throws Exception {
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
+        int timestamp = (int) (System.currentTimeMillis() / 1000);
+
         dockerClient.startContainerCmd(container.getId()).exec();
 
         int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
@@ -156,8 +156,8 @@ public void asyncLogContainerWithSince() throws Exception {
 
         LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
 
-        int oneMinuteIntoFuture = (int)(System.currentTimeMillis()/1000) + 60;
-        dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().withSince(oneMinuteIntoFuture).exec(loggingCallback);
+        dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().withSince(timestamp)
+                .exec(loggingCallback);
 
         loggingCallback.awaitCompletion();
 

From 3973912162054ac2e070088e6bcb2627a5c5bbe4 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 17 Sep 2015 21:03:42 +0200
Subject: [PATCH 0226/1272] Format sources

---
 .../github/dockerjava/api/command/LogContainerCmd.java |  3 ++-
 .../dockerjava/core/command/LogContainerCmdImpl.java   | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
index b1c22283c..4c09d1f44 100644
--- a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -19,7 +19,8 @@
  * @param tail
  *            - `all` or `<number>`, Output specified number of lines at the end of logs
  * @param since
- *            - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default: 0 (unfiltered)
+ *            - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that
+ *            timestamp. Default: 0 (unfiltered)
  */
 public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame> {
 
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
index afc6a0754..d9b34e7fb 100644
--- a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -19,7 +19,8 @@
  * @param tail
  *            - `all` or `<number>`, Output specified number of lines at the end of logs
  * @param since
- *            - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default: 0 (unfiltered)
+ *            - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that
+ *            timestamp. Default: 0 (unfiltered)
  */
 public class LogContainerCmdImpl extends AbstrAsyncDockerCmd<LogContainerCmd, Frame> implements LogContainerCmd {
 
@@ -67,7 +68,9 @@ public boolean hasStderrEnabled() {
     }
 
     @Override
-    public int getSince() {return since; }
+    public int getSince() {
+        return since;
+    }
 
     @Override
     public LogContainerCmd withContainerId(String containerId) {
@@ -141,8 +144,7 @@ public LogContainerCmd withSince(int since) {
     @Override
     public String toString() {
         return new StringBuilder("logs ").append(followStream ? "--follow=true" : "")
-                .append(timestamps ? "--timestamps=true" : "")
-                .append(since > 0 ? "--since=" + since : "")
+                .append(timestamps ? "--timestamps=true" : "").append(since > 0 ? "--since=" + since : "")
                 .append(containerId).toString();
     }
 

From 62306da1cb857654a4fea38fc15b906a580cbe8c Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 17 Sep 2015 21:06:00 +0200
Subject: [PATCH 0227/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 149cad945..7f1e11bc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Change Log
 ===
 
+Latest SNAPSHOT version
+---
+* [#320] (https://github.com/docker-java/docker-java/pull/320) Support "since" field for logs command
+
 v2.1.0
 ---
 * [#306] (https://github.com/docker-java/docker-java/pull/306) fix(core): fix NPE if latestItem is null in result callback

From 8893e8f346d9db72d02787e95e76be2ba2116d8e Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 17 Sep 2015 21:22:02 +0200
Subject: [PATCH 0228/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f1e11bc4..1e9c77866 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ Change Log
 
 Latest SNAPSHOT version
 ---
+* [#326] (https://github.com/docker-java/docker-java/pull/326) Add all missing fields to ResponseItem and related classes 
 * [#320] (https://github.com/docker-java/docker-java/pull/320) Support "since" field for logs command
 
 v2.1.0

From ae29bf7fe7db0907b95da7c7f9db7bead3b25836 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 18 Sep 2015 07:15:58 +0200
Subject: [PATCH 0229/1272] WIP

---
 .../dockerjava/api/command/BuildImageCmd.java |  2 +-
 .../dockerjava/api/model/AccessMode.java      |  4 +--
 .../dockerjava/api/model/AuthConfig.java      |  2 +-
 .../dockerjava/api/model/ContainerConfig.java | 24 ++++++++--------
 .../dockerjava/api/model/HostConfig.java      | 28 -------------------
 .../github/dockerjava/api/model/Volumes.java  |  1 -
 .../dockerjava/core/CertificateUtils.java     |  7 ++---
 .../dockerjava/core/GoLangFileMatch.java      | 26 ++++++++---------
 .../core/LocalDirectorySSLConfig.java         |  2 +-
 .../core/command/BuildImageCmdImpl.java       |  2 +-
 .../core/command/LogContainerCmdImpl.java     | 11 ++++----
 .../dockerjava/jaxrs/LogContainerCmdExec.java |  2 +-
 .../dockerjava/api/model/AuthConfigTest.java  |  6 ----
 13 files changed, 39 insertions(+), 78 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 903273872..e9778fa3c 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -51,7 +51,7 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     /**
      * "forcerm" in API
      */
-    public Boolean isForcerm();
+    public boolean isForcerm();
 
     @CheckForNull
     public Boolean getForcerm();
diff --git a/src/main/java/com/github/dockerjava/api/model/AccessMode.java b/src/main/java/com/github/dockerjava/api/model/AccessMode.java
index 07098cbf2..e87494215 100644
--- a/src/main/java/com/github/dockerjava/api/model/AccessMode.java
+++ b/src/main/java/com/github/dockerjava/api/model/AccessMode.java
@@ -15,11 +15,11 @@ public enum AccessMode {
      */
     public static final AccessMode DEFAULT = rw;
 
-    public static final AccessMode fromBoolean(Boolean accessMode) {
+    public static final AccessMode fromBoolean(boolean accessMode) {
         return accessMode ? rw : ro;
     }
 
-    public final Boolean toBoolean() {
+    public final boolean toBoolean() {
         return this.equals(AccessMode.rw) ? true : false;
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
index 45dabf894..93bf4a7bf 100644
--- a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -76,7 +76,7 @@ public void setAuth(String auth) {
 
     @Override
     public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SIMPLE_STYLE);
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
index f119888f8..7c527dfe2 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
@@ -20,22 +20,22 @@
 public class ContainerConfig {
 
     @JsonProperty("AttachStderr")
-    private Boolean attachStderr = false;
+    private Boolean attachStderr;
 
     @JsonProperty("AttachStdin")
-    private Boolean attachStdin = false;
+    private Boolean attachStdin;
 
     @JsonProperty("AttachStdout")
-    private Boolean attachStdout = false;
+    private Boolean attachStdout;
 
     @JsonProperty("Cmd")
     private String[] cmd;
 
     @JsonProperty("Domainname")
-    private String domainName = "";
+    private String domainName;
 
     @JsonProperty("Entrypoint")
-    private String[] entrypoint = new String[] {};
+    private String[] entrypoint;
 
     @JsonProperty("Env")
     private String[] env;
@@ -44,7 +44,7 @@ public class ContainerConfig {
     private ExposedPorts exposedPorts;
 
     @JsonProperty("Hostname")
-    private String hostName = "";
+    private String hostName;
 
     @JsonProperty("Image")
     private String image;
@@ -56,31 +56,31 @@ public class ContainerConfig {
     private String macAddress;
 
     @JsonProperty("NetworkDisabled")
-    private Boolean networkDisabled = false;
+    private Boolean networkDisabled;
 
     @JsonProperty("OnBuild")
     private String[] onBuild;
 
     @JsonProperty("OpenStdin")
-    private Boolean stdinOpen = false;
+    private Boolean stdinOpen;
 
     @JsonProperty("PortSpecs")
     private String[] portSpecs;
 
     @JsonProperty("StdinOnce")
-    private Boolean stdInOnce = false;
+    private Boolean stdInOnce;
 
     @JsonProperty("Tty")
-    private Boolean tty = false;
+    private Boolean tty;
 
     @JsonProperty("User")
-    private String user = "";
+    private String user;
 
     @JsonProperty("Volumes")
     private Map<String, ?> volumes;
 
     @JsonProperty("WorkingDir")
-    private String workingDir = "";
+    private String workingDir;
 
     @JsonIgnore
     public ExposedPort[] getExposedPorts() {
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 36e9ee93d..1c64c2b27 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -93,34 +93,6 @@ public class HostConfig {
     @JsonProperty("VolumesFrom")
     private VolumesFrom[] volumesFrom;
 
-    public HostConfig() {
-    }
-
-    // public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, LogConfig logConfig, Ports portBindings,
-    // Boolean publishAllPorts, Boolean privileged, Boolean readonlyRootfs, String[] dns, String[] dnsSearch,
-    // VolumesFrom[] volumesFrom, String containerIDFile, Capability[] capAdd, Capability[] capDrop,
-    // RestartPolicy restartPolicy, String networkMode, Device[] devices, String[] extraHosts, Ulimit[] ulimits) {
-    // this.binds = new Binds(binds);
-    // this.links = new Links(links);
-    // this.lxcConf = lxcConf;
-    // this.logConfig = logConfig;
-    // this.portBindings = portBindings;
-    // this.publishAllPorts = publishAllPorts;
-    // this.privileged = privileged;
-    // this.readonlyRootfs = readonlyRootfs;
-    // this.dns = dns;
-    // this.dnsSearch = dnsSearch;
-    // this.volumesFrom = volumesFrom;
-    // this.containerIDFile = containerIDFile;
-    // this.capAdd = capAdd;
-    // this.capDrop = capDrop;
-    // this.restartPolicy = restartPolicy;
-    // this.networkMode = networkMode;
-    // this.devices = devices;
-    // this.extraHosts = extraHosts;
-    // this.ulimits = ulimits;
-    // }
-
     @JsonIgnore
     public Bind[] getBinds() {
         return (binds == null) ? new Bind[0] : binds.getBinds();
diff --git a/src/main/java/com/github/dockerjava/api/model/Volumes.java b/src/main/java/com/github/dockerjava/api/model/Volumes.java
index 434a0edad..46175548d 100644
--- a/src/main/java/com/github/dockerjava/api/model/Volumes.java
+++ b/src/main/java/com/github/dockerjava/api/model/Volumes.java
@@ -48,7 +48,6 @@ public void serialize(Volumes volumes, JsonGenerator jsonGen, SerializerProvider
                 jsonGen.writeFieldName(volume.getPath());
                 jsonGen.writeStartObject();
                 jsonGen.writeEndObject();
-                // jsonGen.writeString(Boolean.toString(volume.getAccessMode().equals(AccessMode.rw) ? true: false));
             }
             jsonGen.writeEndObject();
         }
diff --git a/src/main/java/com/github/dockerjava/core/CertificateUtils.java b/src/main/java/com/github/dockerjava/core/CertificateUtils.java
index 56a818f72..cae59836f 100644
--- a/src/main/java/com/github/dockerjava/core/CertificateUtils.java
+++ b/src/main/java/com/github/dockerjava/core/CertificateUtils.java
@@ -27,14 +27,11 @@
 
 public class CertificateUtils {
 
-    public static Boolean verifyCertificatesExist(String dockerCertPath) {
+    public static boolean verifyCertificatesExist(String dockerCertPath) {
         String[] files = { "ca.pem", "cert.pem", "key.pem" };
         for (String file : files) {
             File path = new File(dockerCertPath, file);
-            Boolean exists = path.exists();
-            if (!exists) {
-                return false;
-            }
+            return path.exists();
         }
 
         return true;
diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index c9067b431..3e2d57485 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -24,16 +24,16 @@
  *                  character class (must be non-empty)
  *       c           matches character c (c != '*', '?', '\\', '[')
  *       '\\' c      matches character c
- * 
+ *
  *   character-range:
  *       c           matches character c (c != '\\', '-', ']')
  *       '\\' c      matches character c
  *       lo '-' hi   matches character c for lo <= c <= hi
- * 
+ *
  *  Match requires pattern to match all of name, not just a substring.
  *  The only possible returned error is ErrBadPattern, when pattern
  *  is malformed.
- * 
+ *
  * On Windows, escaping is disabled. Instead, '\\' is treated as
  *  path separator.
  * </pre>
@@ -43,13 +43,13 @@
  */
 public class GoLangFileMatch {
 
-    public static final Boolean IS_WINDOWS = File.separatorChar == '\\';
+    public static final boolean IS_WINDOWS = File.separatorChar == '\\';
 
-    public static Boolean match(List<String> patterns, File file) {
+    public static boolean match(List<String> patterns, File file) {
         return !match(patterns, file.getPath()).isEmpty();
     }
 
-    public static Boolean match(String pattern, File file) {
+    public static boolean match(String pattern, File file) {
         return match(pattern, file.getPath());
     }
 
@@ -66,7 +66,7 @@ public static List<String> match(List<String> patterns, String name) {
         return matches;
     }
 
-    public static Boolean match(String pattern, String name) {
+    public static boolean match(String pattern, String name) {
         Pattern: while (!pattern.isEmpty()) {
             ScanResult scanResult = scanChunk(pattern);
             pattern = scanResult.pattern;
@@ -103,12 +103,12 @@ public static Boolean match(String pattern, String name) {
     }
 
     static ScanResult scanChunk(String pattern) {
-        Boolean star = false;
+        boolean star = false;
         if (!pattern.isEmpty() && pattern.charAt(0) == '*') {
             pattern = pattern.substring(1);
             star = true;
         }
-        Boolean inRange = false;
+        boolean inRange = false;
         int i;
         Scan: for (i = 0; i < pattern.length(); i++) {
             switch (pattern.charAt(i)) {
@@ -157,12 +157,12 @@ static String matchChunk(String chunk, String s) {
                     throw new GoLangFileMatchException();
                 }
                 // possibly negated
-                Boolean negated = chunk.charAt(chunkOffset) == '^';
+                boolean negated = chunk.charAt(chunkOffset) == '^';
                 if (negated) {
                     chunkOffset++;
                 }
                 // parse all ranges
-                Boolean match = false;
+                boolean match = false;
                 int nrange = 0;
                 while (true) {
                     if (chunkOffset < chunkLength && chunk.charAt(chunkOffset) == ']' && nrange > 0) {
@@ -238,13 +238,13 @@ static GetEscResult getEsc(String chunk, int chunkOffset, int chunkLength) {
     }
 
     private static final class ScanResult {
-        public Boolean star;
+        public boolean star;
 
         public String chunk;
 
         public String pattern;
 
-        public ScanResult(Boolean star, String chunk, String pattern) {
+        public ScanResult(boolean star, String chunk, String pattern) {
             this.star = star;
             this.chunk = chunk;
             this.pattern = pattern;
diff --git a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
index 1c85ee3f4..c667d49e6 100644
--- a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
@@ -33,7 +33,7 @@ public String getDockerCertPath() {
     @Override
     public SSLContext getSSLContext() {
 
-        Boolean certificatesExist = CertificateUtils.verifyCertificatesExist(dockerCertPath);
+        boolean certificatesExist = CertificateUtils.verifyCertificatesExist(dockerCertPath);
 
         if (certificatesExist) {
 
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index 6971982b3..60d11b9d1 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -108,7 +108,7 @@ public Boolean hasRemoveEnabled() {
     }
 
     @Override
-    public Boolean isForcerm() {
+    public boolean isForcerm() {
         return forcerm != null && forcerm;
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
index 965b69b35..2876b9536 100644
--- a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -2,6 +2,9 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.model.Frame;
 
@@ -26,11 +29,9 @@ public class LogContainerCmdImpl extends AbstrAsyncDockerCmd<LogContainerCmd, Fr
 
     private String containerId;
 
-    private int tail;
-
     private Boolean followStream, timestamps, stdout, stderr;
 
-    private Integer since;
+    private Integer tail, since;
 
     public LogContainerCmdImpl(LogContainerCmd.Exec exec, String containerId) {
         super(exec);
@@ -143,9 +144,7 @@ public LogContainerCmd withSince(Integer since) {
 
     @Override
     public String toString() {
-        return new StringBuilder("logs ").append(followStream ? "--follow=true" : "")
-                .append(timestamps ? "--timestamps=true" : "").append(since > 0 ? "--since=" + since : "")
-                .append(containerId).toString();
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
index bc31cd491..af330c4d6 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
@@ -29,7 +29,7 @@ protected AbstractCallbackNotifier<Frame> callbackNotifier(LogContainerCmd comma
                 .resolveTemplate("id", command.getContainerId());
 
         if(command.getTail() != null) {
-            webTarget = webTarget.queryParam("tail", command.getTail() < 0 ? "all" : "" + command.getTail());
+            webTarget = webTarget.queryParam("tail", command.getTail());
         }
 
         if(command.getSince() != null) {
diff --git a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
index 8aa132935..f718b1bdb 100644
--- a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
@@ -18,12 +18,6 @@ public void setUp() throws Exception {
         authConfig.setUsername("qux");
     }
 
-    @Test
-    public void string() throws Exception {
-        assertEquals(authConfig.toString(),
-                "AuthConfig{username='qux', password='bar', email='foo', serverAddress='baz'}");
-    }
-
     @Test
     public void defaultServerAddress() throws Exception {
         assertEquals(new AuthConfig().getServerAddress(), "https://index.docker.io/v1/");

From 537c26eeb3331ea84d6543bffa0b3885f5cdb5e1 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 18 Sep 2015 07:17:39 +0200
Subject: [PATCH 0230/1272] [maven-release-plugin] prepare release
 docker-java-2.1.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 75748be1a..1a18a7d86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>2.1.1-SNAPSHOT</version>
+	<version>2.1.1</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>docker-java-2.1.1</tag>
 	</scm>
 
 	<developers>

From c11bf430f46dfaef7f414264c966268a6e229a5a Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 18 Sep 2015 07:17:43 +0200
Subject: [PATCH 0231/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1a18a7d86..d30c04212 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>2.1.1</version>
+	<version>2.1.2-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>docker-java-2.1.1</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 1134e2d39fad4543e9c770718ff1812ae571986f Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 18 Sep 2015 07:20:35 +0200
Subject: [PATCH 0232/1272] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ecb84295e..fc86bd39c 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ Run build without integration tests:
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>2.1.0</version>
+          <version>2.1.1</version>
     </dependency>
 
 ### Latest SNAPSHOT version
@@ -74,7 +74,7 @@ You can find the latest SNAPSHOT version including javadoc and source files on [
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>2.1.1-SNAPSHOT</version>
+          <version>2.1.2-SNAPSHOT</version>
     </dependency>
 
 ## Documentation

From a4670eefc93c76dbed3f6ecf962f4f9362f5e732 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 18 Sep 2015 07:21:22 +0200
Subject: [PATCH 0233/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e9c77866..dd6e676c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Change Log
 ===
 
-Latest SNAPSHOT version
+v2.1.1
 ---
 * [#326] (https://github.com/docker-java/docker-java/pull/326) Add all missing fields to ResponseItem and related classes 
 * [#320] (https://github.com/docker-java/docker-java/pull/320) Support "since" field for logs command

From 561f9d06f1f840861857f735cb567da8aad29bd7 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 24 Sep 2015 22:03:05 +0200
Subject: [PATCH 0234/1272] Added null check annotations and removed withX()
 methods

---
 .../api/command/AttachContainerCmd.java       |  22 ++-
 .../dockerjava/api/command/AuthCmd.java       |   6 +-
 .../dockerjava/api/command/BuildImageCmd.java |  24 ++-
 .../dockerjava/api/command/CommitCmd.java     |  94 ++++++-----
 .../api/command/ContainerDiffCmd.java         |   6 +-
 .../api/command/CopyFileFromContainerCmd.java |  17 +-
 .../api/command/CreateContainerCmd.java       | 157 +++++++++++-------
 .../api/command/CreateImageCmd.java           |   9 +-
 .../dockerjava/api/command/EventsCmd.java     |  15 +-
 .../dockerjava/api/command/ExecCreateCmd.java |  33 ++--
 .../dockerjava/api/command/ExecStartCmd.java  |  17 +-
 .../api/command/InspectContainerCmd.java      |   7 +-
 .../api/command/InspectExecCmd.java           |   7 +-
 .../api/command/InspectImageCmd.java          |   6 +-
 .../api/command/KillContainerCmd.java         |   7 +-
 .../api/command/ListContainersCmd.java        |  28 ++--
 .../dockerjava/api/command/ListImagesCmd.java |   4 +
 .../api/command/LogContainerCmd.java          |  23 ++-
 .../api/command/PauseContainerCmd.java        |   6 +-
 .../dockerjava/api/command/PullImageCmd.java  |   8 +-
 .../dockerjava/api/command/PushImageCmd.java  |  12 +-
 .../api/command/RemoveContainerCmd.java       |  10 +-
 .../api/command/RemoveImageCmd.java           |  18 +-
 .../api/command/RestartContainerCmd.java      |   7 +-
 .../dockerjava/api/command/SaveImageCmd.java  |   7 +-
 .../api/command/SearchImagesCmd.java          |   6 +-
 .../api/command/StartContainerCmd.java        |  12 +-
 .../dockerjava/api/command/StatsCmd.java      |   7 +-
 .../api/command/StopContainerCmd.java         |   7 +-
 .../dockerjava/api/command/TagImageCmd.java   |   9 +-
 .../api/command/TopContainerCmd.java          |   7 +-
 .../api/command/UnpauseContainerCmd.java      |   6 +-
 .../api/command/WaitContainerCmd.java         |   6 +-
 .../core/command/AttachContainerCmdImpl.java  |  20 ---
 .../core/command/BuildImageCmdImpl.java       |  45 +----
 .../core/command/CommitCmdImpl.java           |  25 ---
 .../core/command/ExecCreateCmdImpl.java       |  20 ---
 .../core/command/ExecStartCmdImpl.java        |  10 --
 .../core/command/LogContainerCmdImpl.java     |  20 ---
 .../core/command/RemoveContainerCmdImpl.java  |   5 -
 .../core/command/RemoveImageCmdImpl.java      |  10 --
 .../client/AbstractDockerClientTest.java      |   8 +-
 .../command/AttachContainerCmdImplTest.java   |   4 +-
 .../core/command/BuildImageCmdImplTest.java   |  16 +-
 .../core/command/DockerfileFixture.java       |   6 +-
 .../core/command/FrameReaderITest.java        |   2 +-
 .../core/command/InspectExecCmdImplTest.java  |   4 +-
 .../core/command/ListImagesCmdImplTest.java   |   2 +-
 .../core/command/LogContainerCmdImplTest.java |  12 +-
 .../core/command/PullImageCmdImplTest.java    |   2 +-
 50 files changed, 418 insertions(+), 403 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
index 0924fb008..13979fb8b 100644
--- a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
@@ -2,6 +2,9 @@
 
 import java.io.InputStream;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.model.Frame;
 
@@ -22,24 +25,25 @@
  */
 public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, Frame> {
 
+    @CheckForNull
     public String getContainerId();
 
+    @CheckForNull
     public Boolean hasLogsEnabled();
 
+    @CheckForNull
     public Boolean hasFollowStreamEnabled();
 
+    @CheckForNull
     public Boolean hasTimestampsEnabled();
 
+    @CheckForNull
     public Boolean hasStdoutEnabled();
 
+    @CheckForNull
     public Boolean hasStderrEnabled();
 
-    public AttachContainerCmd withContainerId(String containerId);
-
-    /**
-     * See {@link #withFollowStream(Boolean)}
-     */
-    public AttachContainerCmd withFollowStream();
+    public AttachContainerCmd withContainerId(@Nonnull String containerId);
 
     /**
      * Following the stream means the resulting {@link InputStream} returned by {@link #exec()} reads infinitely. So a
@@ -50,18 +54,12 @@ public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, F
 
     public AttachContainerCmd withTimestamps(Boolean timestamps);
 
-    public AttachContainerCmd withStdOut();
-
     public AttachContainerCmd withStdOut(Boolean stdout);
 
-    public AttachContainerCmd withStdErr();
-
     public AttachContainerCmd withStdErr(Boolean stderr);
 
     public AttachContainerCmd withLogs(Boolean logs);
 
-    public AttachContainerCmd withLogs();
-
     public static interface Exec extends DockerCmdAsyncExec<AttachContainerCmd, Frame> {
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
index 26e05c1e6..da7d47a7a 100644
--- a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.UnauthorizedException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthResponse;
@@ -11,9 +14,10 @@
  */
 public interface AuthCmd extends SyncDockerCmd<AuthResponse> {
 
+    @CheckForNull
     public AuthConfig getAuthConfig();
 
-    public AuthCmd withAuthConfig(AuthConfig authConfig);
+    public AuthCmd withAuthConfig(@Nonnull AuthConfig authConfig);
 
     /**
      * @return The status. Based on it's value you may mean you need to authorise your account, e.g.:
diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index e9778fa3c..99a065629 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -4,6 +4,8 @@
 import com.github.dockerjava.api.model.BuildResponseItem;
 
 import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import java.io.File;
 import java.io.InputStream;
 import java.net.URI;
@@ -20,8 +22,10 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     // lib specific
 
+    @CheckForNull
     public InputStream getTarInputStream();
 
+    @CheckForNull
     public AuthConfigurations getBuildAuthConfigs();
 
     // getters
@@ -41,29 +45,31 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     /**
      * "nocache" in API
      */
+    @CheckForNull
     public Boolean hasNoCacheEnabled();
 
     /**
      * "rm" in API
      */
+    @CheckForNull
     public Boolean hasRemoveEnabled();
 
     /**
      * "forcerm" in API
      */
-    public boolean isForcerm();
-
     @CheckForNull
-    public Boolean getForcerm();
+    public Boolean isForcerm();
 
     /**
      * "q" in API
      */
+    @CheckForNull
     public Boolean isQuiet();
 
     /**
      * "pull" in API
      */
+    @CheckForNull
     public Boolean hasPullEnabled();
 
     @CheckForNull
@@ -91,24 +97,14 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     public BuildImageCmd withDockerfile(File dockerfile);
 
-    public BuildImageCmd withNoCache();
-
     public BuildImageCmd withNoCache(Boolean noCache);
 
-    public BuildImageCmd withRemove();
-
     public BuildImageCmd withRemove(Boolean rm);
 
-    public BuildImageCmd withForcerm();
-
     public BuildImageCmd withForcerm(Boolean forcerm);
 
-    public BuildImageCmd withQuiet();
-
     public BuildImageCmd withQuiet(Boolean quiet);
 
-    public BuildImageCmd withPull();
-
     public BuildImageCmd withPull(Boolean pull);
 
     public BuildImageCmd withMemory(Long memory);
@@ -123,7 +119,7 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfig);
 
-    public BuildImageCmd withTarInputStream(InputStream tarInputStream);
+    public BuildImageCmd withTarInputStream(@Nonnull InputStream tarInputStream);
 
     public static interface Exec extends DockerCmdAsyncExec<BuildImageCmd, BuildResponseItem> {
     }
diff --git a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
index a932a3f70..77e19363c 100644
--- a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.model.ExposedPorts;
 import com.github.dockerjava.api.model.Volumes;
@@ -11,96 +14,104 @@
  */
 public interface CommitCmd extends SyncDockerCmd<String> {
 
+    @CheckForNull
+    public String getAuthor();
+
+    @CheckForNull
     public String getContainerId();
 
-    public CommitCmd withContainerId(String containerId);
+    @CheckForNull
+    public String[] getEnv();
 
-    public String getRepository();
+    @CheckForNull
+    public ExposedPorts getExposedPorts();
 
-    public String getTag();
+    @CheckForNull
+    public String getHostname();
 
+    @CheckForNull
+    public Integer getMemory();
+
+    @CheckForNull
+    public Integer getMemorySwap();
+
+    @CheckForNull
     public String getMessage();
 
-    public String getAuthor();
+    @CheckForNull
+    public String[] getPortSpecs();
 
-    public Boolean hasPauseEnabled();
+    @CheckForNull
+    public String getRepository();
 
-    public CommitCmd withAttachStderr(Boolean attachStderr);
+    @CheckForNull
+    public String getTag();
 
-    public CommitCmd withAttachStderr();
+    @CheckForNull
+    public String getUser();
 
-    public CommitCmd withAttachStdin(Boolean attachStdin);
+    @CheckForNull
+    public Volumes getVolumes();
 
-    public CommitCmd withAttachStdin();
+    @CheckForNull
+    public String getWorkingDir();
 
-    public CommitCmd withAttachStdout(Boolean attachStdout);
+    @CheckForNull
+    public Boolean hasPauseEnabled();
 
-    public CommitCmd withAttachStdout();
+    @CheckForNull
+    public Boolean isOpenStdin();
 
-    public CommitCmd withCmd(String... cmd);
+    @CheckForNull
+    public Boolean isStdinOnce();
 
-    public CommitCmd withDisableNetwork(Boolean disableNetwork);
+    @CheckForNull
+    public Boolean isTty();
 
-    public CommitCmd withAuthor(String author);
+    public CommitCmd withAttachStderr(Boolean attachStderr);
 
-    public CommitCmd withMessage(String message);
+    public CommitCmd withAttachStdin(Boolean attachStdin);
 
-    public CommitCmd withTag(String tag);
+    public CommitCmd withAttachStdout(Boolean attachStdout);
 
-    public CommitCmd withRepository(String repository);
+    public CommitCmd withAuthor(String author);
 
-    public CommitCmd withPause(Boolean pause);
+    public CommitCmd withCmd(String... cmd);
 
-    public String[] getEnv();
+    public CommitCmd withContainerId(@Nonnull String containerId);
 
-    public CommitCmd withEnv(String... env);
+    public CommitCmd withDisableNetwork(Boolean disableNetwork);
 
-    public ExposedPorts getExposedPorts();
+    public CommitCmd withEnv(String... env);
 
     public CommitCmd withExposedPorts(ExposedPorts exposedPorts);
 
-    public String getHostname();
-
     public CommitCmd withHostname(String hostname);
 
-    public Integer getMemory();
-
     public CommitCmd withMemory(Integer memory);
 
-    public Integer getMemorySwap();
-
     public CommitCmd withMemorySwap(Integer memorySwap);
 
-    public Boolean isOpenStdin();
+    public CommitCmd withMessage(String message);
 
     public CommitCmd withOpenStdin(Boolean openStdin);
 
-    public String[] getPortSpecs();
+    public CommitCmd withPause(Boolean pause);
 
     public CommitCmd withPortSpecs(String... portSpecs);
 
-    public Boolean isStdinOnce();
+    public CommitCmd withRepository(String repository);
 
     public CommitCmd withStdinOnce(Boolean stdinOnce);
 
-    public CommitCmd withStdinOnce();
-
-    public Boolean isTty();
+    public CommitCmd withTag(String tag);
 
     public CommitCmd withTty(Boolean tty);
 
-    public CommitCmd withTty();
-
-    public String getUser();
-
     public CommitCmd withUser(String user);
 
-    public Volumes getVolumes();
-
     public CommitCmd withVolumes(Volumes volumes);
 
-    public String getWorkingDir();
-
     public CommitCmd withWorkingDir(String workingDir);
 
     /**
@@ -112,5 +123,4 @@ public interface CommitCmd extends SyncDockerCmd<String> {
 
     public static interface Exec extends DockerCmdSyncExec<CommitCmd, String> {
     }
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java b/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
index 968fb5c7c..42ae5e9dd 100644
--- a/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
@@ -2,6 +2,9 @@
 
 import java.util.List;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.InternalServerErrorException;
 import com.github.dockerjava.api.NotFoundException;
@@ -9,9 +12,10 @@
 
 public interface ContainerDiffCmd extends SyncDockerCmd<List<ChangeLog>> {
 
+    @CheckForNull
     public String getContainerId();
 
-    public ContainerDiffCmd withContainerId(String containerId);
+    public ContainerDiffCmd withContainerId(@Nonnull String containerId);
 
     @Override
     public String toString();
diff --git a/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
index 1bc3ca909..e51b8ac46 100644
--- a/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
@@ -2,22 +2,28 @@
 
 import java.io.InputStream;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.NotFoundException;
 
 public interface CopyFileFromContainerCmd extends SyncDockerCmd<InputStream> {
 
+    @CheckForNull
     public String getContainerId();
 
-    public String getResource();
-
-    public CopyFileFromContainerCmd withContainerId(String containerId);
+    @CheckForNull
+    public String getHostPath();
 
-    public CopyFileFromContainerCmd withResource(String resource);
+    @CheckForNull
+    public String getResource();
 
-    public String getHostPath();
+    public CopyFileFromContainerCmd withContainerId(@Nonnull String containerId);
 
     public CopyFileFromContainerCmd withHostPath(String hostPath);
 
+    public CopyFileFromContainerCmd withResource(@Nonnull String resource);
+
     /**
      * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
      *
@@ -29,5 +35,4 @@ public interface CopyFileFromContainerCmd extends SyncDockerCmd<InputStream> {
 
     public static interface Exec extends DockerCmdSyncExec<CopyFileFromContainerCmd, InputStream> {
     }
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index c0a695426..2301cd841 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -2,6 +2,8 @@
 
 import java.util.Map;
 
+import javax.annotation.CheckForNull;
+
 import com.github.dockerjava.api.ConflictException;
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.model.Bind;
@@ -20,120 +22,157 @@
 
 public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerResponse> {
 
-    public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, CreateContainerResponse> {
-    }
+    @CheckForNull
+    public Bind[] getBinds();
 
     /**
-     * @throws NotFoundException
-     *             No such container
-     * @throws ConflictException
-     *             Named container already exists
+     * @since 1.19
      */
-    @Override
-    public CreateContainerResponse exec() throws NotFoundException, ConflictException;
-
-    public Bind[] getBinds();
+    @CheckForNull
+    public Integer getBlkioWeight();
 
+    @CheckForNull
     public Capability[] getCapAdd();
 
+    @CheckForNull
     public Capability[] getCapDrop();
 
+    @CheckForNull
     public String[] getCmd();
 
-    public String getCpusetCpus();
-
-    public Integer getCpuShares();
-
     /**
      * @since 1.19
      */
+    @CheckForNull
     public Integer getCpuPeriod();
 
-    /**
-     * @since 1.19
-     */
-    public String getCpusetMems();
+    @CheckForNull
+    public String getCpusetCpus();
 
     /**
      * @since 1.19
      */
-    public Integer getBlkioWeight();
+    @CheckForNull
+    public String getCpusetMems();
 
-    /**
-     * @since 1.19
-     */
-    public Boolean isOomKillDisable();
+    @CheckForNull
+    public Integer getCpuShares();
 
+    @CheckForNull
     public Device[] getDevices();
 
+    @CheckForNull
     public String[] getDns();
 
+    @CheckForNull
     public String[] getDnsSearch();
 
+    @CheckForNull
+    public String getDomainName();
+
+    @CheckForNull
     public String[] getEntrypoint();
 
+    @CheckForNull
     public String[] getEnv();
 
+    @CheckForNull
     public ExposedPort[] getExposedPorts();
 
+    @CheckForNull
     public String[] getExtraHosts();
 
+    @CheckForNull
     public String getHostName();
 
-    public String getDomainName();
-
+    @CheckForNull
     public String getImage();
 
-    public Link[] getLinks();
+    @CheckForNull
+    Map<String, String> getLabels();
 
-    public LxcConf[] getLxcConf();
+    @CheckForNull
+    public Link[] getLinks();
 
+    @CheckForNull
     public LogConfig getLogConfig();
 
+    @CheckForNull
+    public LxcConf[] getLxcConf();
+
+    @CheckForNull
     public String getMacAddress();
 
+    @CheckForNull
     public Long getMemory();
 
+    @CheckForNull
     public Long getMemorySwap();
 
+    @CheckForNull
     public String getName();
 
+    @CheckForNull
     public String getNetworkMode();
 
+    @CheckForNull
     public Ports getPortBindings();
 
+    @CheckForNull
     public String[] getPortSpecs();
 
+    @CheckForNull
     public RestartPolicy getRestartPolicy();
 
+    @CheckForNull
+    public Ulimit[] getUlimits();
+
+    @CheckForNull
     public String getUser();
 
+    @CheckForNull
     public Volume[] getVolumes();
 
+    @CheckForNull
     public VolumesFrom[] getVolumesFrom();
 
+    @CheckForNull
     public String getWorkingDir();
 
-    public Ulimit[] getUlimits();
-
+    @CheckForNull
     public Boolean isAttachStderr();
 
+    @CheckForNull
     public Boolean isAttachStdin();
 
+    @CheckForNull
     public Boolean isAttachStdout();
 
+    @CheckForNull
     public Boolean isNetworkDisabled();
 
+    /**
+     * @since 1.19
+     */
+    @CheckForNull
+    public Boolean isOomKillDisable();
+
+    @CheckForNull
     public Boolean isPrivileged();
 
+    @CheckForNull
     public Boolean isPublishAllPorts();
 
+    @CheckForNull
     public Boolean isReadonlyRootfs();
 
+    @CheckForNull
     public Boolean isStdInOnce();
 
+    @CheckForNull
     public Boolean isStdinOpen();
 
+    @CheckForNull
     public Boolean isTty();
 
     public CreateContainerCmd withAttachStderr(Boolean attachStderr);
@@ -144,6 +183,11 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public CreateContainerCmd withBinds(Bind... binds);
 
+    /**
+     * @since 1.19
+     */
+    public CreateContainerCmd withBlkioWeight(Integer blkioWeight);
+
     /**
      * Add linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> to the
      * container. For example: adding {@link Capability#MKNOD} allows the container to create special files using the
@@ -160,37 +204,27 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public CreateContainerCmd withCmd(String... cmd);
 
-    public CreateContainerCmd withCpusetCpus(String cpusetCpus);
-
-    public CreateContainerCmd withCpuShares(Integer cpuShares);
+    public CreateContainerCmd withContainerIDFile(String containerIDFile);
 
     /**
      * @since 1.19
      */
     public CreateContainerCmd withCpuPeriod(Integer cpuPeriod);
 
-    /**
-     * @since 1.19
-     */
-    public CreateContainerCmd withCpusetMems(String cpusetMems);
+    public CreateContainerCmd withCpusetCpus(String cpusetCpus);
 
     /**
      * @since 1.19
      */
-    public CreateContainerCmd withBlkioWeight(Integer blkioWeight);
+    public CreateContainerCmd withCpusetMems(String cpusetMems);
 
-    /**
-     * @since 1.19
-     */
-    public CreateContainerCmd withOomKillDisable(Boolean oomKillDisable);
+    public CreateContainerCmd withCpuShares(Integer cpuShares);
 
     /**
      * Add host devices to the container
      */
     public CreateContainerCmd withDevices(Device... devices);
 
-    public CreateContainerCmd withNetworkDisabled(Boolean disableNetwork);
-
     /**
      * Set custom DNS servers
      */
@@ -201,6 +235,8 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
      */
     public CreateContainerCmd withDnsSearch(String... dnsSearch);
 
+    public CreateContainerCmd withDomainName(String domainName);
+
     public CreateContainerCmd withEntrypoint(String... entrypoint);
 
     public CreateContainerCmd withEnv(String... env);
@@ -214,8 +250,6 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public CreateContainerCmd withHostName(String hostName);
 
-    public CreateContainerCmd withDomainName(String domainName);
-
     public CreateContainerCmd withImage(String image);
 
     public CreateContainerCmd withLabels(Map<String, String> labels);
@@ -225,9 +259,11 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
      */
     public CreateContainerCmd withLinks(Link... links);
 
+    public CreateContainerCmd withLogConfig(LogConfig logConfig);
+
     public CreateContainerCmd withLxcConf(LxcConf... lxcConf);
 
-    public CreateContainerCmd withLogConfig(LogConfig logConfig);
+    public CreateContainerCmd withMacAddress(String macAddress);
 
     public CreateContainerCmd withMemory(Long memory);
 
@@ -235,6 +271,8 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public CreateContainerCmd withName(String name);
 
+    public CreateContainerCmd withNetworkDisabled(Boolean disableNetwork);
+
     /**
      * Set the Network mode for the container
      * <ul>
@@ -247,6 +285,11 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
      */
     public CreateContainerCmd withNetworkMode(String networkMode);
 
+    /**
+     * @since 1.19
+     */
+    public CreateContainerCmd withOomKillDisable(Boolean oomKillDisable);
+
     /**
      * Add one or more {@link PortBinding}s. This corresponds to the <code>--publish</code> (<code>-p</code>) option of
      * the <code>docker run</code> CLI command.
@@ -266,6 +309,8 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts);
 
+    public CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs);
+
     /**
      * Set custom {@link RestartPolicy} for the container. Defaults to {@link RestartPolicy#noRestart()}
      */
@@ -277,6 +322,8 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public CreateContainerCmd withTty(Boolean tty);
 
+    public CreateContainerCmd withUlimits(Ulimit[] ulimits);
+
     public CreateContainerCmd withUser(String user);
 
     public CreateContainerCmd withVolumes(Volume... volumes);
@@ -285,17 +332,15 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public CreateContainerCmd withWorkingDir(String workingDir);
 
-    public CreateContainerCmd withMacAddress(String macAddress);
-
-    public CreateContainerCmd withUlimits(Ulimit[] ulimits);
-
-    public CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs);
-
-    public CreateContainerCmd withContainerIDFile(String containerIDFile);
-
     /**
-     * @return
+     * @throws NotFoundException
+     *             No such container
+     * @throws ConflictException
+     *             Named container already exists
      */
-    Map<String, String> getLabels();
+    @Override
+    public CreateContainerResponse exec() throws NotFoundException, ConflictException;
 
+    public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, CreateContainerResponse> {
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
index 93b00efac..66df49c98 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
@@ -2,20 +2,25 @@
 
 import java.io.InputStream;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 public interface CreateImageCmd extends SyncDockerCmd<CreateImageResponse> {
 
+    @CheckForNull
     public String getRepository();
 
-    // TODO remove method
+    @CheckForNull
     public String getTag();
 
+    @CheckForNull
     public InputStream getImageStream();
 
     /**
      * @param repository
      *            the repository to import to
      */
-    public CreateImageCmd withRepository(String repository);
+    public CreateImageCmd withRepository(@Nonnull String repository);
 
     /**
      * @param imageStream
diff --git a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java b/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
index e1e57c534..4020a8e72 100644
--- a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+
 import com.github.dockerjava.api.model.Event;
 import com.github.dockerjava.api.model.Filters;
 
@@ -12,19 +14,22 @@
  *            - Stream events until this timestamp
  */
 public interface EventsCmd extends AsyncDockerCmd<EventsCmd, Event> {
-    public EventsCmd withSince(String since);
 
-    public EventsCmd withUntil(String until);
+    @CheckForNull
+    public Filters getFilters();
 
+    @CheckForNull
     public String getSince();
 
+    @CheckForNull
     public String getUntil();
 
-    public Filters getFilters();
-
     public EventsCmd withFilters(Filters filters);
 
-    public static interface Exec extends DockerCmdAsyncExec<EventsCmd, Event> {
+    public EventsCmd withSince(String since);
 
+    public EventsCmd withUntil(String until);
+
+    public static interface Exec extends DockerCmdAsyncExec<EventsCmd, Event> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
index 6ff1b738e..67ffe5818 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
@@ -1,37 +1,38 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 public interface ExecCreateCmd extends SyncDockerCmd<ExecCreateCmdResponse> {
 
+    @CheckForNull
     public String getContainerId();
 
-    public ExecCreateCmd withContainerId(String containerId);
-
-    public ExecCreateCmd withCmd(String... cmd);
-
-    public ExecCreateCmd withAttachStdin(Boolean attachStdin);
-
-    public ExecCreateCmd withAttachStdin();
+    @CheckForNull
+    public Boolean hasAttachStderrEnabled();
 
+    @CheckForNull
     public Boolean hasAttachStdinEnabled();
 
-    public ExecCreateCmd withAttachStdout(Boolean attachStdout);
-
-    public ExecCreateCmd withAttachStdout();
-
+    @CheckForNull
     public Boolean hasAttachStdoutEnabled();
 
+    @CheckForNull
+    public Boolean hasTtyEnabled();
+
     public ExecCreateCmd withAttachStderr(Boolean attachStderr);
 
-    public ExecCreateCmd withAttachStderr();
+    public ExecCreateCmd withAttachStdin(Boolean attachStdin);
 
-    public Boolean hasAttachStderrEnabled();
+    public ExecCreateCmd withAttachStdout(Boolean attachStdout);
 
-    public ExecCreateCmd withTty(Boolean tty);
+    public ExecCreateCmd withCmd(String... cmd);
 
-    public ExecCreateCmd withTty();
+    public ExecCreateCmd withContainerId(@Nonnull String containerId);
 
-    public Boolean hasTtyEnabled();
+    public ExecCreateCmd withTty(Boolean tty);
 
     public static interface Exec extends DockerCmdSyncExec<ExecCreateCmd, ExecCreateCmdResponse> {
     }
+
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
index 0d4ffa44a..c9e0d3f00 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
@@ -2,26 +2,28 @@
 
 import java.io.InputStream;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.NotFoundException;
 
 public interface ExecStartCmd extends SyncDockerCmd<InputStream> {
 
+    @CheckForNull
     public String getExecId();
 
-    public ExecStartCmd withExecId(String execId);
-
+    @CheckForNull
     public Boolean hasDetachEnabled();
 
-    public ExecStartCmd withDetach(Boolean detach);
+    @CheckForNull
+    public Boolean hasTtyEnabled();
 
-    public ExecStartCmd withDetach();
+    public ExecStartCmd withDetach(Boolean detach);
 
-    public Boolean hasTtyEnabled();
+    public ExecStartCmd withExecId(@Nonnull String execId);
 
     public ExecStartCmd withTty(Boolean tty);
 
-    public ExecStartCmd withTty();
-
     /**
      * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
      *
@@ -33,4 +35,5 @@ public interface ExecStartCmd extends SyncDockerCmd<InputStream> {
 
     public static interface Exec extends DockerCmdSyncExec<ExecStartCmd, InputStream> {
     }
+
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
index d9988085f..875ed7c32 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
@@ -1,12 +1,16 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.NotFoundException;
 
 public interface InspectContainerCmd extends SyncDockerCmd<InspectContainerResponse> {
 
+    @CheckForNull
     public String getContainerId();
 
-    public InspectContainerCmd withContainerId(String containerId);
+    public InspectContainerCmd withContainerId(@Nonnull String containerId);
 
     /**
      * @throws NotFoundException
@@ -17,5 +21,4 @@ public interface InspectContainerCmd extends SyncDockerCmd<InspectContainerRespo
 
     public static interface Exec extends DockerCmdSyncExec<InspectContainerCmd, InspectContainerResponse> {
     }
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
index 36ce45fc5..4abc73e79 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
@@ -1,11 +1,16 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.NotFoundException;
 
 public interface InspectExecCmd extends SyncDockerCmd<InspectExecResponse> {
+
+    @CheckForNull
     public String getExecId();
 
-    public InspectExecCmd withExecId(String execId);
+    public InspectExecCmd withExecId(@Nonnull String execId);
 
     /**
      * @throws NotFoundException
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
index 6eaea9075..54ae3c228 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.NotFoundException;
 
 /**
@@ -7,9 +10,10 @@
  */
 public interface InspectImageCmd extends SyncDockerCmd<InspectImageResponse> {
 
+    @CheckForNull
     public String getImageId();
 
-    public InspectImageCmd withImageId(String imageId);
+    public InspectImageCmd withImageId(@Nonnull String imageId);
 
     /**
      * @throws NotFoundException
diff --git a/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
index 513bf09c5..c751506a5 100644
--- a/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.NotFoundException;
 
 /**
@@ -7,11 +10,13 @@
  */
 public interface KillContainerCmd extends SyncDockerCmd<Void> {
 
+    @CheckForNull
     public String getContainerId();
 
+    @CheckForNull
     public String getSignal();
 
-    public KillContainerCmd withContainerId(String containerId);
+    public KillContainerCmd withContainerId(@Nonnull String containerId);
 
     public KillContainerCmd withSignal(String signal);
 
diff --git a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
index 2994fd9d6..cec5f66c2 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import javax.annotation.CheckForNull;
+
 import com.github.dockerjava.api.model.Container;
 import com.github.dockerjava.api.model.Filters;
 
@@ -22,29 +24,35 @@
  */
 public interface ListContainersCmd extends SyncDockerCmd<List<Container>> {
 
-    public Integer getLimit();
+    @CheckForNull
+    public String getBeforeId();
 
-    public Boolean hasShowSizeEnabled();
+    @CheckForNull
+    public Filters getFilters();
 
-    public Boolean hasShowAllEnabled();
+    @CheckForNull
+    public Integer getLimit();
 
+    @CheckForNull
     public String getSinceId();
 
-    public String getBeforeId();
+    @CheckForNull
+    public Boolean hasShowAllEnabled();
 
-    public Filters getFilters();
+    @CheckForNull
+    public Boolean hasShowSizeEnabled();
 
-    public ListContainersCmd withShowAll(Boolean showAll);
+    public ListContainersCmd withBefore(String before);
 
-    public ListContainersCmd withShowSize(Boolean showSize);
+    public ListContainersCmd withFilters(Filters filters);
 
     public ListContainersCmd withLimit(Integer limit);
 
-    public ListContainersCmd withSince(String since);
+    public ListContainersCmd withShowAll(Boolean showAll);
 
-    public ListContainersCmd withBefore(String before);
+    public ListContainersCmd withShowSize(Boolean showSize);
 
-    public ListContainersCmd withFilters(Filters filters);
+    public ListContainersCmd withSince(String since);
 
     public static interface Exec extends DockerCmdSyncExec<ListContainersCmd, List<Container>> {
     }
diff --git a/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java b/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
index a9aa5b9d2..481bf7e49 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import javax.annotation.CheckForNull;
+
 import com.github.dockerjava.api.model.Image;
 
 /**
@@ -14,8 +16,10 @@
  */
 public interface ListImagesCmd extends SyncDockerCmd<List<Image>> {
 
+    @CheckForNull
     public String getFilters();
 
+    @CheckForNull
     public Boolean hasShowAllEnabled();
 
     public ListImagesCmd withShowAll(Boolean showAll);
diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
index 11c1db31b..f06a715cb 100644
--- a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -2,6 +2,9 @@
 
 import java.io.InputStream;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.model.Frame;
 
@@ -24,26 +27,28 @@
  */
 public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame> {
 
+    @CheckForNull
     public String getContainerId();
 
+    @CheckForNull
     public Integer getTail();
 
+    @CheckForNull
     public Boolean hasFollowStreamEnabled();
 
+    @CheckForNull
     public Boolean hasTimestampsEnabled();
 
+    @CheckForNull
     public Boolean hasStdoutEnabled();
 
+    @CheckForNull
     public Boolean hasStderrEnabled();
 
+    @CheckForNull
     public Integer getSince();
 
-    public LogContainerCmd withContainerId(String containerId);
-
-    /**
-     * See {@link #withFollowStream(Boolean)}
-     */
-    public LogContainerCmd withFollowStream();
+    public LogContainerCmd withContainerId(@Nonnull String containerId);
 
     /**
      * Following the stream means the resulting {@link InputStream} returned by {@link #exec()} reads infinitely. So a
@@ -52,16 +57,10 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame>
      */
     public LogContainerCmd withFollowStream(Boolean followStream);
 
-    public LogContainerCmd withTimestamps();
-
     public LogContainerCmd withTimestamps(Boolean timestamps);
 
-    public LogContainerCmd withStdOut();
-
     public LogContainerCmd withStdOut(Boolean stdout);
 
-    public LogContainerCmd withStdErr();
-
     public LogContainerCmd withStdErr(Boolean stderr);
 
     public LogContainerCmd withTailAll();
diff --git a/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
index 21039bb42..be179a5c4 100644
--- a/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.NotFoundException;
 
 /**
@@ -11,9 +14,10 @@
  */
 public interface PauseContainerCmd extends SyncDockerCmd<Void> {
 
+    @CheckForNull
     public String getContainerId();
 
-    public PauseContainerCmd withContainerId(String containerId);
+    public PauseContainerCmd withContainerId(@Nonnull String containerId);
 
     /**
      * @throws NotFoundException
diff --git a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java b/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
index 53edbe9a4..641258fd1 100644
--- a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PullResponseItem;
 
@@ -10,15 +13,18 @@
  */
 public interface PullImageCmd extends AsyncDockerCmd<PullImageCmd, PullResponseItem> {
 
+    @CheckForNull
     public String getRepository();
 
+    @CheckForNull
     public String getTag();
 
+    @CheckForNull
     public String getRegistry();
 
     public AuthConfig getAuthConfig();
 
-    public PullImageCmd withRepository(String repository);
+    public PullImageCmd withRepository(@Nonnull String repository);
 
     public PullImageCmd withTag(String tag);
 
diff --git a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java b/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
index 9b8c55918..3fddd0dba 100644
--- a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.model.AuthConfig;
@@ -13,15 +16,20 @@
  */
 public interface PushImageCmd extends AsyncDockerCmd<PushImageCmd, PushResponseItem> {
 
+    @CheckForNull
+    public AuthConfig getAuthConfig();
+
+    @CheckForNull
     public String getName();
 
+    @CheckForNull
     public String getTag();
 
     /**
      * @param name
      *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
      */
-    public PushImageCmd withName(String name);
+    public PushImageCmd withName(@Nonnull String name);
 
     /**
      * @param tag
@@ -29,8 +37,6 @@ public interface PushImageCmd extends AsyncDockerCmd<PushImageCmd, PushResponseI
      */
     public PushImageCmd withTag(String tag);
 
-    public AuthConfig getAuthConfig();
-
     public PushImageCmd withAuthConfig(AuthConfig authConfig);
 
     /**
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
index 08aced4ea..2214d4ae2 100644
--- a/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.NotFoundException;
 
 /**
@@ -12,18 +15,19 @@
  */
 public interface RemoveContainerCmd extends SyncDockerCmd<Void> {
 
+    @CheckForNull
     public String getContainerId();
 
+    @CheckForNull
     public Boolean hasRemoveVolumesEnabled();
 
+    @CheckForNull
     public Boolean hasForceEnabled();
 
-    public RemoveContainerCmd withContainerId(String containerId);
+    public RemoveContainerCmd withContainerId(@Nonnull String containerId);
 
     public RemoveContainerCmd withRemoveVolumes(Boolean removeVolumes);
 
-    public RemoveContainerCmd withForce();
-
     public RemoveContainerCmd withForce(Boolean force);
 
     /**
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
index 8b56d5ae6..e2cb9ca22 100644
--- a/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.NotFoundException;
 
 /**
@@ -9,29 +12,22 @@
  */
 public interface RemoveImageCmd extends SyncDockerCmd<Void> {
 
+    @CheckForNull
     public String getImageId();
 
+    @CheckForNull
     public Boolean hasForceEnabled();
 
+    @CheckForNull
     public Boolean hasNoPruneEnabled();
 
-    public RemoveImageCmd withImageId(String imageId);
-
-    /**
-     * force delete of an image, even if it's tagged in multiple repositories
-     */
-    public RemoveImageCmd withForce();
+    public RemoveImageCmd withImageId(@Nonnull String imageId);
 
     /**
      * force parameter to force delete of an image, even if it's tagged in multiple repositories
      */
     public RemoveImageCmd withForce(Boolean force);
 
-    /**
-     * prevent the deletion of parent images
-     */
-    public RemoveImageCmd withNoPrune();
-
     /**
      * noprune parameter to prevent the deletion of parent images
      *
diff --git a/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
index f146269f3..07e8776e3 100644
--- a/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.NotFoundException;
 
 /**
@@ -11,11 +14,13 @@
  */
 public interface RestartContainerCmd extends SyncDockerCmd<Void> {
 
+    @CheckForNull
     public String getContainerId();
 
+    @CheckForNull
     public Integer getTimeout();
 
-    public RestartContainerCmd withContainerId(String containerId);
+    public RestartContainerCmd withContainerId(@Nonnull String containerId);
 
     public RestartContainerCmd withtTimeout(Integer timeout);
 
diff --git a/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java b/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
index 459beb047..1469eabba 100644
--- a/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
@@ -2,19 +2,24 @@
 
 import java.io.InputStream;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.NotFoundException;
 
 public interface SaveImageCmd extends SyncDockerCmd<InputStream> {
 
+    @CheckForNull
     public String getName();
 
+    @CheckForNull
     public String getTag();
 
     /**
      * @param name
      *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
      */
-    public SaveImageCmd withName(String name);
+    public SaveImageCmd withName(@Nonnull String name);
 
     /**
      * @param tag
diff --git a/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java b/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
index a1229da9c..897623517 100644
--- a/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
@@ -2,6 +2,9 @@
 
 import java.util.List;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.model.SearchItem;
 
 /**
@@ -13,9 +16,10 @@
  */
 public interface SearchImagesCmd extends SyncDockerCmd<List<SearchItem>> {
 
+    @CheckForNull
     public String getTerm();
 
-    public SearchImagesCmd withTerm(String term);
+    public SearchImagesCmd withTerm(@Nonnull String term);
 
     public static interface Exec extends DockerCmdSyncExec<SearchImagesCmd, List<SearchItem>> {
     }
diff --git a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
index 0cfb3ea8e..6c64a4d29 100644
--- a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.NotModifiedException;
 
@@ -9,12 +12,10 @@
  */
 public interface StartContainerCmd extends SyncDockerCmd<Void> {
 
-    public static interface Exec extends DockerCmdSyncExec<StartContainerCmd, Void> {
-    }
-
+    @CheckForNull
     String getContainerId();
 
-    StartContainerCmd withContainerId(String containerId);
+    StartContainerCmd withContainerId(@Nonnull String containerId);
 
     /**
      * @throws NotFoundException
@@ -24,4 +25,7 @@ public static interface Exec extends DockerCmdSyncExec<StartContainerCmd, Void>
      */
     @Override
     public Void exec() throws NotFoundException, NotModifiedException;
+
+    public static interface Exec extends DockerCmdSyncExec<StartContainerCmd, Void> {
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/StatsCmd.java b/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
index 64b38d472..653cd3bb2 100644
--- a/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.model.Statistics;
 
 /**
@@ -7,10 +10,12 @@
  * block when a container is stopped until the container is up again.
  */
 public interface StatsCmd extends AsyncDockerCmd<StatsCmd, Statistics> {
-    public StatsCmd withContainerId(String containerId);
 
+    @CheckForNull
     public String getContainerId();
 
+    public StatsCmd withContainerId(@Nonnull String containerId);
+
     public static interface Exec extends DockerCmdAsyncExec<StatsCmd, Statistics> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
index a9f52d62d..af63c5c92 100644
--- a/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.NotModifiedException;
 
@@ -14,11 +17,13 @@
  */
 public interface StopContainerCmd extends SyncDockerCmd<Void> {
 
+    @CheckForNull
     public String getContainerId();
 
+    @CheckForNull
     public Integer getTimeout();
 
-    public StopContainerCmd withContainerId(String containerId);
+    public StopContainerCmd withContainerId(@Nonnull String containerId);
 
     public StopContainerCmd withTimeout(Integer timeout);
 
diff --git a/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java b/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
index 569fddd5e..8ceab3656 100644
--- a/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 /**
  * Tag an image into a repository
  *
@@ -13,15 +16,19 @@
  */
 public interface TagImageCmd extends SyncDockerCmd<Void> {
 
+    @CheckForNull
     public String getImageId();
 
+    @CheckForNull
     public String getRepository();
 
+    @CheckForNull
     public String getTag();
 
+    @CheckForNull
     public Boolean hasForceEnabled();
 
-    public TagImageCmd withImageId(String imageId);
+    public TagImageCmd withImageId(@Nonnull String imageId);
 
     public TagImageCmd withRepository(String repository);
 
diff --git a/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
index 3e1762f1d..d3eb69c17 100644
--- a/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.NotFoundException;
 
 /**
@@ -7,11 +10,13 @@
  */
 public interface TopContainerCmd extends SyncDockerCmd<TopContainerResponse> {
 
+    @CheckForNull
     public String getContainerId();
 
+    @CheckForNull
     public String getPsArgs();
 
-    public TopContainerCmd withContainerId(String containerId);
+    public TopContainerCmd withContainerId(@Nonnull String containerId);
 
     public TopContainerCmd withPsArgs(String psArgs);
 
diff --git a/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
index 44f5658e2..0d7892468 100644
--- a/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.NotFoundException;
 
 /**
@@ -11,9 +14,10 @@
  */
 public interface UnpauseContainerCmd extends SyncDockerCmd<Void> {
 
+    @CheckForNull
     public String getContainerId();
 
-    public UnpauseContainerCmd withContainerId(String containerId);
+    public UnpauseContainerCmd withContainerId(@Nonnull String containerId);
 
     /**
      * @throws NotFoundException
diff --git a/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
index 2accc3af9..347c515a2 100644
--- a/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.NotFoundException;
 
 /**
@@ -9,9 +12,10 @@
  */
 public interface WaitContainerCmd extends SyncDockerCmd<Integer> {
 
+    @CheckForNull
     public String getContainerId();
 
-    public WaitContainerCmd withContainerId(String containerId);
+    public WaitContainerCmd withContainerId(@Nonnull String containerId);
 
     /**
      * @throws NotFoundException
diff --git a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
index d393586e4..629990ff1 100644
--- a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
@@ -69,11 +69,6 @@ public AttachContainerCmd withContainerId(String containerId) {
         return this;
     }
 
-    @Override
-    public AttachContainerCmd withFollowStream() {
-        return withFollowStream(true);
-    }
-
     @Override
     public AttachContainerCmd withFollowStream(Boolean followStream) {
         this.followStream = followStream;
@@ -86,22 +81,12 @@ public AttachContainerCmd withTimestamps(Boolean timestamps) {
         return this;
     }
 
-    @Override
-    public AttachContainerCmd withStdOut() {
-        return withStdOut(true);
-    }
-
     @Override
     public AttachContainerCmd withStdOut(Boolean stdout) {
         this.stdout = stdout;
         return this;
     }
 
-    @Override
-    public AttachContainerCmd withStdErr() {
-        return withStdErr(true);
-    }
-
     @Override
     public AttachContainerCmd withStdErr(Boolean stderr) {
         this.stderr = stderr;
@@ -113,9 +98,4 @@ public AttachContainerCmd withLogs(Boolean logs) {
         this.logs = logs;
         return this;
     }
-
-    @Override
-    public AttachContainerCmd withLogs() {
-        return withLogs(true);
-    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index 60d11b9d1..16bdbbaf2 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -7,8 +7,6 @@
 import java.io.InputStream;
 import java.net.URI;
 
-import javax.annotation.CheckForNull;
-
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.api.model.BuildResponseItem;
@@ -22,10 +20,8 @@
  */
 public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildResponseItem> implements BuildImageCmd {
 
-    @CheckForNull
     private InputStream tarInputStream;
 
-    @CheckForNull
     private String tag;
 
     private Boolean noCache;
@@ -36,31 +32,22 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR
 
     private Boolean pull;
 
-    @CheckForNull
     private AuthConfigurations buildAuthConfigs;
 
-    @CheckForNull
     private File dockerFile;
 
-    @CheckForNull
     private File baseDirectory;
 
-    @CheckForNull
     private String cpusetcpus;
 
-    @CheckForNull
     private Long memory;
 
-    @CheckForNull
     private String cpushares;
 
-    @CheckForNull
     private Boolean forcerm;
 
-    @CheckForNull
     private Long memswap;
 
-    @CheckForNull
     private URI remote;
 
     public BuildImageCmdImpl(BuildImageCmd.Exec exec) {
@@ -108,12 +95,7 @@ public Boolean hasRemoveEnabled() {
     }
 
     @Override
-    public boolean isForcerm() {
-        return forcerm != null && forcerm;
-    }
-
-    @Override
-    public Boolean getForcerm() {
+    public Boolean isForcerm() {
         return forcerm;
     }
 
@@ -183,55 +165,30 @@ public BuildImageCmd withRemote(URI remote) {
         return this;
     }
 
-    @Override
-    public BuildImageCmdImpl withNoCache() {
-        return withNoCache(true);
-    }
-
     @Override
     public BuildImageCmdImpl withNoCache(Boolean noCache) {
         this.noCache = noCache;
         return this;
     }
 
-    @Override
-    public BuildImageCmdImpl withRemove() {
-        return withRemove(true);
-    }
-
     @Override
     public BuildImageCmdImpl withRemove(Boolean rm) {
         this.remove = rm;
         return this;
     }
 
-    @Override
-    public BuildImageCmd withForcerm() {
-        return withForcerm(true);
-    }
-
     @Override
     public BuildImageCmd withForcerm(Boolean forcerm) {
         this.forcerm = forcerm;
         return this;
     }
 
-    @Override
-    public BuildImageCmdImpl withQuiet() {
-        return withQuiet(true);
-    }
-
     @Override
     public BuildImageCmdImpl withQuiet(Boolean quiet) {
         this.quiet = quiet;
         return this;
     }
 
-    @Override
-    public BuildImageCmdImpl withPull() {
-        return withPull(true);
-    }
-
     @Override
     public BuildImageCmdImpl withPull(Boolean pull) {
         this.pull = pull;
diff --git a/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
index db429dc8d..dbd437470 100644
--- a/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
@@ -118,33 +118,18 @@ public CommitCmdImpl withAttachStderr(Boolean attachStderr) {
         return this;
     }
 
-    @Override
-    public CommitCmdImpl withAttachStderr() {
-        return withAttachStderr(true);
-    }
-
     @Override
     public CommitCmdImpl withAttachStdin(Boolean attachStdin) {
         this.attachStdin = attachStdin;
         return this;
     }
 
-    @Override
-    public CommitCmdImpl withAttachStdin() {
-        return withAttachStdin(true);
-    }
-
     @Override
     public CommitCmdImpl withAttachStdout(Boolean attachStdout) {
         this.attachStdout = attachStdout;
         return this;
     }
 
-    @Override
-    public CommitCmdImpl withAttachStdout() {
-        return withAttachStdout(true);
-    }
-
     @Override
     public CommitCmdImpl withCmd(String... cmd) {
         checkNotNull(cmd, "cmd was not specified");
@@ -287,11 +272,6 @@ public CommitCmdImpl withStdinOnce(Boolean stdinOnce) {
         return this;
     }
 
-    @Override
-    public CommitCmdImpl withStdinOnce() {
-        return withStdinOnce(true);
-    }
-
     @Override
     public Boolean isTty() {
         return tty;
@@ -303,11 +283,6 @@ public CommitCmdImpl withTty(Boolean tty) {
         return this;
     }
 
-    @Override
-    public CommitCmdImpl withTty() {
-        return withTty(true);
-    }
-
     @Override
     public String getUser() {
         return user;
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
index 55a080ebf..5df38860c 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
@@ -47,44 +47,24 @@ public ExecCreateCmd withAttachStdin(Boolean attachStdin) {
         return this;
     }
 
-    @Override
-    public ExecCreateCmd withAttachStdin() {
-        return withAttachStdin(true);
-    }
-
     @Override
     public ExecCreateCmd withAttachStdout(Boolean attachStdout) {
         this.attachStdout = attachStdout;
         return this;
     }
 
-    @Override
-    public ExecCreateCmd withAttachStdout() {
-        return withAttachStdout(true);
-    }
-
     @Override
     public ExecCreateCmd withAttachStderr(Boolean attachStderr) {
         this.attachStderr = attachStderr;
         return this;
     }
 
-    @Override
-    public ExecCreateCmd withAttachStderr() {
-        return withAttachStderr(true);
-    }
-
     @Override
     public ExecCreateCmd withTty(Boolean tty) {
         this.tty = tty;
         return this;
     }
 
-    @Override
-    public ExecCreateCmd withTty() {
-        return withTty(true);
-    }
-
     @Override
     public ExecCreateCmd withCmd(String... cmd) {
         this.cmd = cmd;
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
index 3c2e00198..72efd3052 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
@@ -52,16 +52,6 @@ public ExecStartCmd withTty(Boolean tty) {
         return this;
     }
 
-    @Override
-    public ExecStartCmd withDetach() {
-        return withDetach(true);
-    }
-
-    @Override
-    public ExecStartCmd withTty() {
-        return withTty(true);
-    }
-
     /**
      * @throws com.github.dockerjava.api.NotFoundException
      *             No such exec instance
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
index 2876b9536..f561a6deb 100644
--- a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -80,44 +80,24 @@ public LogContainerCmd withContainerId(String containerId) {
         return this;
     }
 
-    @Override
-    public LogContainerCmd withFollowStream() {
-        return withFollowStream(true);
-    }
-
     @Override
     public LogContainerCmd withFollowStream(Boolean followStream) {
         this.followStream = followStream;
         return this;
     }
 
-    @Override
-    public LogContainerCmd withTimestamps() {
-        return withTimestamps(true);
-    }
-
     @Override
     public LogContainerCmd withTimestamps(Boolean timestamps) {
         this.timestamps = timestamps;
         return this;
     }
 
-    @Override
-    public LogContainerCmd withStdOut() {
-        return withStdOut(true);
-    }
-
     @Override
     public LogContainerCmd withStdOut(Boolean stdout) {
         this.stdout = stdout;
         return this;
     }
 
-    @Override
-    public LogContainerCmd withStdErr() {
-        return withStdErr(true);
-    }
-
     @Override
     public LogContainerCmd withStdErr(Boolean stderr) {
         this.stderr = stderr;
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
index 9bf6c3aba..d23323d2f 100644
--- a/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
@@ -55,11 +55,6 @@ public RemoveContainerCmd withRemoveVolumes(Boolean removeVolumes) {
         return this;
     }
 
-    @Override
-    public RemoveContainerCmd withForce() {
-        return withForce(true);
-    }
-
     @Override
     public RemoveContainerCmd withForce(Boolean force) {
         this.force = force;
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
index 43fee1ea2..bca8d37b1 100644
--- a/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
@@ -46,22 +46,12 @@ public RemoveImageCmd withImageId(String imageId) {
         return this;
     }
 
-    @Override
-    public RemoveImageCmd withForce() {
-        return withForce(true);
-    }
-
     @Override
     public RemoveImageCmd withForce(Boolean force) {
         this.force = force;
         return this;
     }
 
-    @Override
-    public RemoveImageCmd withNoPrune() {
-        return withNoPrune(true);
-    }
-
     @Override
     public RemoveImageCmd withNoPrune(Boolean noPrune) {
         this.noPrune = noPrune;
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 225f16ac9..1938cf43b 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -86,7 +86,7 @@ public void afterMethod(ITestResult result) {
             LOG.info("Cleaning up temporary container {}", container);
 
             try {
-                dockerClient.removeContainerCmd(container).withForce().exec();
+                dockerClient.removeContainerCmd(container).withForce(true).exec();
             } catch (DockerException ignore) {
                 // ignore.printStackTrace();
             }
@@ -95,7 +95,7 @@ public void afterMethod(ITestResult result) {
         for (String image : dockerCmdExecFactory.getImageNames()) {
             LOG.info("Cleaning up temporary image with {}", image);
             try {
-                dockerClient.removeImageCmd(image).withForce().exec();
+                dockerClient.removeImageCmd(image).withForce(true).exec();
             } catch (DockerException ignore) {
                 // ignore.printStackTrace();
             }
@@ -186,7 +186,7 @@ public static void assertContainerHasVolumes(InspectContainerResponse inspectCon
     }
 
     protected String containerLog(String containerId) throws Exception {
-        return dockerClient.logContainerCmd(containerId).withStdOut().exec(new LogContainerTestCallback())
+        return dockerClient.logContainerCmd(containerId).withStdOut(true).exec(new LogContainerTestCallback())
                 .awaitCompletion().toString();
     }
 
@@ -207,7 +207,7 @@ public String toString() {
 
     protected String buildImage(File baseDir) throws Exception {
 
-        return dockerClient.buildImageCmd(baseDir).withNoCache().exec(new BuildImageResultCallback()).awaitImageId();
+        return dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
index 11a65aa14..8ba419824 100644
--- a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
@@ -65,7 +65,7 @@ public void onNext(Frame frame) {
             };
         };
 
-        dockerClient.attachContainerCmd(container.getId()).withStdErr().withStdOut().withFollowStream().withLogs()
+        dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true).withLogs(true)
                 .exec(callback).awaitCompletion(30, TimeUnit.SECONDS).close();
 
         assertThat(callback.toString(), containsString(snippet));
@@ -94,7 +94,7 @@ public void onNext(Frame frame) {
             };
         };
 
-        dockerClient.attachContainerCmd(container.getId()).withStdErr().withStdOut().withFollowStream().exec(callback)
+        dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true).exec(callback)
                 .awaitCompletion(15, TimeUnit.SECONDS).close();
 
         System.out.println("log: " + callback.toString());
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 22030cc9f..8ad663a5a 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -87,7 +87,7 @@ public void testNonstandard2() throws Exception {
         File dockerFile = new File(Thread.currentThread().getContextClassLoader()
                 .getResource("nonstandard/subdirectory/Dockerfile-nonstandard").getFile());
 
-        dockerClient.buildImageCmd().withBaseDirectory(baseDir).withDockerfile(dockerFile).withNoCache()
+        dockerClient.buildImageCmd().withBaseDirectory(baseDir).withDockerfile(dockerFile).withNoCache(true)
                 .exec(new BuildImageResultCallback()).awaitImageId();
     }
 
@@ -149,7 +149,7 @@ private String dockerfileBuild(File baseDir) throws Exception {
     }
 
     private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
-        String imageId = buildImageCmd.withNoCache().exec(new BuildImageResultCallback()).awaitImageId();
+        String imageId = buildImageCmd.withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
 
         // Create container based on image
         CreateContainerResponse container = dockerClient.createContainerCmd(imageId).exec();
@@ -168,7 +168,7 @@ public void testDockerfileIgnored() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerfileIgnored")
                 .getFile());
 
-        dockerClient.buildImageCmd(baseDir).withNoCache().exec(new BuildImageResultCallback()).awaitImageId();
+        dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
     }
 
     @Test
@@ -176,7 +176,7 @@ public void testDockerfileNotIgnored() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerfileNotIgnored")
                 .getFile());
 
-        dockerClient.buildImageCmd(baseDir).withNoCache().exec(new BuildImageResultCallback()).awaitImageId();
+        dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
     }
 
     @Test(expectedExceptions = { DockerClientException.class })
@@ -184,7 +184,7 @@ public void testInvalidDockerIgnorePattern() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader()
                 .getResource("testInvalidDockerignorePattern").getFile());
 
-        dockerClient.buildImageCmd(baseDir).withNoCache().exec(new BuildImageResultCallback()).awaitImageId();
+        dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
     }
 
     @Test(groups = "ignoreInCircleCi")
@@ -199,7 +199,7 @@ public void testDockerIgnore() throws Exception {
     public void testNetCatDockerfileBuilder() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("netcat").getFile());
 
-        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache().exec(new BuildImageResultCallback())
+        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback())
                 .awaitImageId();
 
         assertNotNull(imageId, "Not successful in build");
@@ -274,7 +274,7 @@ public void testBuildFromPrivateRegistry() throws Exception {
         dockerClient.pushImageCmd("localhost:5000/testuser/busybox").withTag("latest").withAuthConfig(authConfig)
                 .exec(new PushImageResultCallback()).awaitSuccess();
 
-        dockerClient.removeImageCmd("localhost:5000/testuser/busybox").withForce().exec();
+        dockerClient.removeImageCmd("localhost:5000/testuser/busybox").withForce(true).exec();
 
         baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testBuildFromPrivateRegistry")
                 .getFile());
@@ -282,7 +282,7 @@ public void testBuildFromPrivateRegistry() throws Exception {
         AuthConfigurations authConfigurations = new AuthConfigurations();
         authConfigurations.addConfig(authConfig);
 
-        imageId = dockerClient.buildImageCmd(baseDir).withNoCache().withBuildAuthConfigs(authConfigurations)
+        imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).withBuildAuthConfigs(authConfigurations)
                 .exec(new BuildImageResultCallback()).awaitImageId();
 
         inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
index 9d9b15fd1..569f44d57 100644
--- a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
+++ b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -34,7 +34,7 @@ public void open() throws Exception {
 
         LOGGER.info("building {}", directory);
 
-        dockerClient.buildImageCmd(new File("src/test/resources", directory)).withNoCache()
+        dockerClient.buildImageCmd(new File("src/test/resources", directory)).withNoCache(true)
                 .exec(new BuildImageResultCallback()).awaitImageId();
 
         Image lastCreatedImage = dockerClient.listImagesCmd().exec().get(0);
@@ -56,7 +56,7 @@ public void close() throws Exception {
         if (containerId != null) {
             LOGGER.info("removing container {}", containerId);
             try {
-                dockerClient.removeContainerCmd(containerId).withForce() // stop too
+                dockerClient.removeContainerCmd(containerId).withForce(true) // stop too
                         .exec();
             } catch (NotFoundException | InternalServerErrorException ignored) {
                 LOGGER.info("ignoring {}", ignored.getMessage());
@@ -67,7 +67,7 @@ public void close() throws Exception {
         if (repository != null) {
             LOGGER.info("removing repository {}", repository);
             try {
-                dockerClient.removeImageCmd(repository).withForce().exec();
+                dockerClient.removeImageCmd(repository).withForce(true).exec();
             } catch (NotFoundException | InternalServerErrorException e) {
                 LOGGER.info("ignoring {}", e.getMessage());
             }
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index 5b1df2241..27c7cb07e 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -56,7 +56,7 @@ private List<Frame> getLoggingFrames() throws Exception {
 
         FrameReaderITestCallback collectFramesCallback = new FrameReaderITestCallback();
 
-        dockerClient.logContainerCmd(dockerfileFixture.getContainerId()).withStdOut().withStdErr().withTailAll()
+        dockerClient.logContainerCmd(dockerfileFixture.getContainerId()).withStdOut(true).withStdErr(true).withTailAll()
         // we can't follow stream here as it blocks reading from resulting InputStream infinitely
         // .withFollowStream()
                 .exec(collectFramesCallback).awaitCompletion();
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
index 62f530bf2..744bbe82c 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
@@ -58,11 +58,11 @@ public void inspectExecTest() throws IOException {
         dockerClient.startContainerCmd(container.getId()).exec();
 
         ExecCreateCmdResponse touchFileCmdCreateResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout().withAttachStderr().withCmd("touch", "/marker").exec();
+                .withAttachStdout(true).withAttachStderr(true).withCmd("touch", "/marker").exec();
         LOG.info("Created exec {}", touchFileCmdCreateResponse.toString());
         assertThat(touchFileCmdCreateResponse.getId(), not(isEmptyString()));
         ExecCreateCmdResponse checkFileCmdCreateResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout().withAttachStderr().withCmd("test", "-e", "/marker").exec();
+                .withAttachStdout(true).withAttachStderr(true).withCmd("test", "-e", "/marker").exec();
         LOG.info("Created exec {}", checkFileCmdCreateResponse.toString());
         assertThat(checkFileCmdCreateResponse.getId(), not(isEmptyString()));
 
diff --git a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
index d508df235..3c1fe738d 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
@@ -76,7 +76,7 @@ public void listDanglingImages() throws DockerException {
         assertTrue(imageInFilteredList);
     }
 
-    private Boolean isImageInFilteredList(List<Image> images, String expectedImageId) {
+    private boolean isImageInFilteredList(List<Image> images, String expectedImageId) {
         for (Image image : images) {
             if (expectedImageId.equals(image.getId())) {
                 return true;
diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
index c3f6ab01c..1ad4795de 100644
--- a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
@@ -63,7 +63,7 @@ public void asyncLogContainer() throws Exception {
         LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
 
         // this essentially test the since=0 case
-        dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec(loggingCallback);
+        dockerClient.logContainerCmd(container.getId()).withStdErr(true).withStdOut(true).exec(loggingCallback);
 
         loggingCallback.awaitCompletion();
 
@@ -95,7 +95,7 @@ public void onComplete() {
             };
         };
 
-        dockerClient.logContainerCmd("non-existing").withStdErr().withStdOut().exec(loggingCallback).awaitCompletion();
+        dockerClient.logContainerCmd("non-existing").withStdErr(true).withStdOut(true).exec(loggingCallback).awaitCompletion();
     }
 
     @Test
@@ -117,19 +117,19 @@ public void asyncMultipleLogContainer() throws Exception {
 
         LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
 
-        dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec(loggingCallback);
+        dockerClient.logContainerCmd(container.getId()).withStdErr(true).withStdOut(true).exec(loggingCallback);
 
         loggingCallback.close();
 
         loggingCallback = new LogContainerTestCallback();
 
-        dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec(loggingCallback);
+        dockerClient.logContainerCmd(container.getId()).withStdErr(true).withStdOut(true).exec(loggingCallback);
 
         loggingCallback.close();
 
         loggingCallback = new LogContainerTestCallback();
 
-        dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().exec(loggingCallback);
+        dockerClient.logContainerCmd(container.getId()).withStdErr(true).withStdOut(true).exec(loggingCallback);
 
         loggingCallback.awaitCompletion();
 
@@ -156,7 +156,7 @@ public void asyncLogContainerWithSince() throws Exception {
 
         LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
 
-        dockerClient.logContainerCmd(container.getId()).withStdErr().withStdOut().withSince(timestamp)
+        dockerClient.logContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withSince(timestamp)
                 .exec(loggingCallback);
 
         loggingCallback.awaitCompletion();
diff --git a/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
index 10e31e171..0d7b112f6 100644
--- a/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
@@ -81,7 +81,7 @@ public void testPullImage() throws Exception {
         LOG.info("Removing image: {}", testImage);
 
         try {
-            dockerClient.removeImageCmd(testImage).withForce().exec();
+            dockerClient.removeImageCmd(testImage).withForce(true).exec();
         } catch (NotFoundException e) {
             // just ignore if not exist
         }

From 9f32269298921a9fc5fe149971a3abae87ebcec4 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 24 Sep 2015 22:46:13 +0200
Subject: [PATCH 0235/1272] Added additional withX(List<Y> x) methods

---
 .../api/command/CreateContainerCmd.java       |  50 +++++-
 .../core/command/CreateContainerCmdImpl.java  | 143 ++++++++++++++----
 2 files changed, 163 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 2301cd841..b7c7e8e87 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.command;
 
+import java.util.List;
 import java.util.Map;
 
 import javax.annotation.CheckForNull;
@@ -225,29 +226,55 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
      */
     public CreateContainerCmd withDevices(Device... devices);
 
+    /**
+     * Add host devices to the container
+     */
+    public CreateContainerCmd withDevices(List<Device> devices);
+
     /**
      * Set custom DNS servers
      */
     public CreateContainerCmd withDns(String... dns);
 
+    /**
+     * Set custom DNS servers
+     */
+    public CreateContainerCmd withDns(List<String> dns);
+
     /**
      * Set custom DNS search domains
      */
     public CreateContainerCmd withDnsSearch(String... dnsSearch);
 
+    /**
+     * Set custom DNS search domains
+     */
+    public CreateContainerCmd withDnsSearch(List<String> dnsSearch);
+
     public CreateContainerCmd withDomainName(String domainName);
 
     public CreateContainerCmd withEntrypoint(String... entrypoint);
 
+    public CreateContainerCmd withEntrypoint(List<String> entrypoint);
+
     public CreateContainerCmd withEnv(String... env);
 
+    public CreateContainerCmd withEnv(List<String> env);
+
     public CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts);
 
+    public CreateContainerCmd withExposedPorts(List<ExposedPort> exposedPorts);
+
     /**
      * Add hostnames to /etc/hosts in the container
      */
     public CreateContainerCmd withExtraHosts(String... extraHosts);
 
+    /**
+     * Add hostnames to /etc/hosts in the container
+     */
+    public CreateContainerCmd withExtraHosts(List<String> extraHosts);
+
     public CreateContainerCmd withHostName(String hostName);
 
     public CreateContainerCmd withImage(String image);
@@ -259,10 +286,17 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
      */
     public CreateContainerCmd withLinks(Link... links);
 
+    /**
+     * Add link to another container.
+     */
+    public CreateContainerCmd withLinks(List<Link> links);
+
     public CreateContainerCmd withLogConfig(LogConfig logConfig);
 
     public CreateContainerCmd withLxcConf(LxcConf... lxcConf);
 
+    public CreateContainerCmd withLxcConf(List<LxcConf> lxcConf);
+
     public CreateContainerCmd withMacAddress(String macAddress);
 
     public CreateContainerCmd withMemory(Long memory);
@@ -296,6 +330,12 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
      */
     public CreateContainerCmd withPortBindings(PortBinding... portBindings);
 
+    /**
+     * Add one or more {@link PortBinding}s. This corresponds to the <code>--publish</code> (<code>-p</code>) option of
+     * the <code>docker run</code> CLI command.
+     */
+    public CreateContainerCmd withPortBindings(List<PortBinding> portBindings);
+
     /**
      * Add the port bindings that are contained in the given {@link Ports} object.
      *
@@ -305,6 +345,8 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     public CreateContainerCmd withPortSpecs(String... portSpecs);
 
+    public CreateContainerCmd withPortSpecs(List<String> portSpecs);
+
     public CreateContainerCmd withPrivileged(Boolean privileged);
 
     public CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts);
@@ -322,14 +364,20 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     public CreateContainerCmd withTty(Boolean tty);
 
-    public CreateContainerCmd withUlimits(Ulimit[] ulimits);
+    public CreateContainerCmd withUlimits(Ulimit... ulimits);
+
+    public CreateContainerCmd withUlimits(List<Ulimit> ulimits);
 
     public CreateContainerCmd withUser(String user);
 
     public CreateContainerCmd withVolumes(Volume... volumes);
 
+    public CreateContainerCmd withVolumes(List<Volume> volumes);
+
     public CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom);
 
+    public CreateContainerCmd withVolumesFrom(List<VolumesFrom> volumesFrom);
+
     public CreateContainerCmd withWorkingDir(String workingDir);
 
     /**
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 1ca9d483a..e02f30f94 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -2,6 +2,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -394,21 +395,21 @@ public String toString() {
     }
 
     @Override
-    public CreateContainerCmdImpl withAttachStderr(Boolean attachStderr) {
+    public CreateContainerCmd withAttachStderr(Boolean attachStderr) {
         checkNotNull(attachStderr, "attachStderr was not specified");
         this.attachStderr = attachStderr;
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withAttachStdin(Boolean attachStdin) {
+    public CreateContainerCmd withAttachStdin(Boolean attachStdin) {
         checkNotNull(attachStdin, "attachStdin was not specified");
         this.attachStdin = attachStdin;
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withAttachStdout(Boolean attachStdout) {
+    public CreateContainerCmd withAttachStdout(Boolean attachStdout) {
         checkNotNull(attachStdout, "attachStdout was not specified");
         this.attachStdout = attachStdout;
         return this;
@@ -443,7 +444,7 @@ public CreateContainerCmd withCapDrop(Capability... capDrop) {
     }
 
     @Override
-    public CreateContainerCmdImpl withCmd(String... cmd) {
+    public CreateContainerCmd withCmd(String... cmd) {
         checkNotNull(cmd, "cmd was not specified");
         this.cmd = cmd;
         return this;
@@ -464,7 +465,7 @@ public CreateContainerCmd withCpuPeriod(Integer cpuPeriod) {
     }
 
     @Override
-    public CreateContainerCmdImpl withCpusetCpus(String cpusetCpus) {
+    public CreateContainerCmd withCpusetCpus(String cpusetCpus) {
         checkNotNull(cpusetCpus, "cpusetCpus was not specified");
         hostConfig.setCpusetCpus(cpusetCpus);
         return this;
@@ -478,7 +479,7 @@ public CreateContainerCmd withCpusetMems(String cpusetMems) {
     }
 
     @Override
-    public CreateContainerCmdImpl withCpuShares(Integer cpuShares) {
+    public CreateContainerCmd withCpuShares(Integer cpuShares) {
         checkNotNull(cpuShares, "cpuShares was not specified");
         hostConfig.setCpuShares(cpuShares);
         return this;
@@ -492,12 +493,24 @@ public CreateContainerCmd withDevices(Device... devices) {
     }
 
     @Override
-    public CreateContainerCmdImpl withDns(String... dns) {
+    public CreateContainerCmd withDevices(List<Device> devices) {
+        checkNotNull(devices, "devices was not specified");
+        return withDevices(devices.toArray(new Device[0]));
+    }
+
+    @Override
+    public CreateContainerCmd withDns(String... dns) {
         checkNotNull(dns, "dns was not specified");
         this.hostConfig.setDns(dns);
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withDns(List<String> dns) {
+        checkNotNull(dns, "dns was not specified");
+        return withDns(dns.toArray(new String[0]));
+    }
+
     @Override
     public CreateContainerCmd withDnsSearch(String... dnsSearch) {
         checkNotNull(dnsSearch, "dnsSearch was not specified");
@@ -506,33 +519,57 @@ public CreateContainerCmd withDnsSearch(String... dnsSearch) {
     }
 
     @Override
-    public CreateContainerCmdImpl withDomainName(String domainName) {
+    public CreateContainerCmd withDnsSearch(List<String> dnsSearch) {
+        checkNotNull(dnsSearch, "dnsSearch was not specified");
+        return withDnsSearch(dnsSearch.toArray(new String[0]));
+    }
+
+    @Override
+    public CreateContainerCmd withDomainName(String domainName) {
         checkNotNull(domainName, "no domainName was specified");
         this.domainName = domainName;
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withEntrypoint(String... entrypoint) {
+    public CreateContainerCmd withEntrypoint(String... entrypoint) {
         checkNotNull(entrypoint, "entrypoint was not specified");
         this.entrypoint = entrypoint;
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withEnv(String... env) {
+    public CreateContainerCmd withEntrypoint(List<String> entrypoint) {
+        checkNotNull(entrypoint, "entrypoint was not specified");
+        return withEntrypoint(entrypoint.toArray(new String[0]));
+    }
+
+    @Override
+    public CreateContainerCmd withEnv(String... env) {
         checkNotNull(env, "env was not specified");
         this.env = env;
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withExposedPorts(ExposedPort... exposedPorts) {
+    public CreateContainerCmd withEnv(List<String> env) {
+        checkNotNull(env, "env was not specified");
+        return withEnv(env.toArray(new String[0]));
+    }
+
+    @Override
+    public CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts) {
         checkNotNull(exposedPorts, "exposedPorts was not specified");
         this.exposedPorts = new ExposedPorts(exposedPorts);
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withExposedPorts(List<ExposedPort> exposedPorts) {
+        checkNotNull(exposedPorts, "exposedPorts was not specified");
+        return withExposedPorts(exposedPorts.toArray(new ExposedPort[0]));
+    }
+
     @Override
     public CreateContainerCmd withExtraHosts(String... extraHosts) {
         checkNotNull(extraHosts, "extraHosts was not specified");
@@ -541,33 +578,45 @@ public CreateContainerCmd withExtraHosts(String... extraHosts) {
     }
 
     @Override
-    public CreateContainerCmdImpl withHostName(String hostName) {
+    public CreateContainerCmd withExtraHosts(List<String> extraHosts) {
+        checkNotNull(extraHosts, "extraHosts was not specified");
+        return withExtraHosts(extraHosts.toArray(new String[0]));
+    }
+
+    @Override
+    public CreateContainerCmd withHostName(String hostName) {
         checkNotNull(hostConfig, "no hostName was specified");
         this.hostName = hostName;
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withImage(String image) {
+    public CreateContainerCmd withImage(String image) {
         checkNotNull(image, "no image was specified");
         this.image = image;
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withLabels(Map<String, String> labels) {
+    public CreateContainerCmd withLabels(Map<String, String> labels) {
         checkNotNull(labels, "labels was not specified");
         this.labels = labels;
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withLinks(Link... links) {
+    public CreateContainerCmd withLinks(Link... links) {
         checkNotNull(links, "links was not specified");
         this.hostConfig.setLinks(links);
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withLinks(List<Link> links) {
+        checkNotNull(links, "links was not specified");
+        return withLinks(links.toArray(new Link[0]));
+    }
+
     @Override
     public CreateContainerCmd withLxcConf(LxcConf... lxcConf) {
         checkNotNull(lxcConf, "lxcConf was not specified");
@@ -575,6 +624,12 @@ public CreateContainerCmd withLxcConf(LxcConf... lxcConf) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withLxcConf(List<LxcConf> lxcConf) {
+        checkNotNull(lxcConf, "lxcConf was not specified");
+        return withLxcConf(lxcConf.toArray(new LxcConf[0]));
+    }
+
     @Override
     public CreateContainerCmd withLogConfig(LogConfig logConfig) {
         checkNotNull(logConfig, "logConfig was not specified");
@@ -583,35 +638,35 @@ public CreateContainerCmd withLogConfig(LogConfig logConfig) {
     }
 
     @Override
-    public CreateContainerCmdImpl withMacAddress(String macAddress) {
+    public CreateContainerCmd withMacAddress(String macAddress) {
         checkNotNull(macAddress, "macAddress was not specified");
         this.macAddress = macAddress;
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withMemory(Long memory) {
+    public CreateContainerCmd withMemory(Long memory) {
         checkNotNull(memory, "memory was not specified");
         hostConfig.setMemory(memory);
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withMemorySwap(Long memorySwap) {
+    public CreateContainerCmd withMemorySwap(Long memorySwap) {
         checkNotNull(memorySwap, "memorySwap was not specified");
         hostConfig.setMemorySwap(memorySwap);
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withName(String name) {
+    public CreateContainerCmd withName(String name) {
         checkNotNull(name, "name was not specified");
         this.name = name;
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withNetworkDisabled(Boolean disableNetwork) {
+    public CreateContainerCmd withNetworkDisabled(Boolean disableNetwork) {
         checkNotNull(disableNetwork, "disableNetwork was not specified");
         this.networkDisabled = disableNetwork;
         return this;
@@ -638,6 +693,12 @@ public CreateContainerCmd withPortBindings(PortBinding... portBindings) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withPortBindings(List<PortBinding> portBindings) {
+        checkNotNull(portBindings, "portBindings was not specified");
+        return withPortBindings(portBindings.toArray(new PortBinding[0]));
+    }
+
     @Override
     public CreateContainerCmd withPortBindings(Ports portBindings) {
         checkNotNull(portBindings, "portBindings was not specified");
@@ -646,12 +707,18 @@ public CreateContainerCmd withPortBindings(Ports portBindings) {
     }
 
     @Override
-    public CreateContainerCmdImpl withPortSpecs(String... portSpecs) {
+    public CreateContainerCmd withPortSpecs(String... portSpecs) {
         checkNotNull(portSpecs, "portSpecs was not specified");
         this.portSpecs = portSpecs;
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withPortSpecs(List<String> portSpecs) {
+        checkNotNull(portSpecs, "portSpecs was not specified");
+        return withPortSpecs(portSpecs.toArray(new String[0]));
+    }
+
     @Override
     public CreateContainerCmd withPrivileged(Boolean privileged) {
         checkNotNull(privileged, "no privileged was specified");
@@ -681,56 +748,74 @@ public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) {
     }
 
     @Override
-    public CreateContainerCmdImpl withStdInOnce(Boolean stdInOnce) {
+    public CreateContainerCmd withStdInOnce(Boolean stdInOnce) {
         checkNotNull(stdInOnce, "no stdInOnce was specified");
         this.stdInOnce = stdInOnce;
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withStdinOpen(Boolean stdinOpen) {
+    public CreateContainerCmd withStdinOpen(Boolean stdinOpen) {
         checkNotNull(stdinOpen, "no stdinOpen was specified");
         this.stdinOpen = stdinOpen;
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withTty(Boolean tty) {
+    public CreateContainerCmd withTty(Boolean tty) {
         checkNotNull(tty, "no tty was specified");
         this.tty = tty;
         return this;
     }
 
     @Override
-    public CreateContainerCmd withUlimits(Ulimit[] ulimits) {
+    public CreateContainerCmd withUlimits(Ulimit... ulimits) {
         checkNotNull(ulimits, "no ulimits was specified");
         hostConfig.setUlimits(ulimits);
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withUser(String user) {
+    public CreateContainerCmd withUlimits(List<Ulimit> ulimits) {
+        checkNotNull(ulimits, "no ulimits was specified");
+        return withUlimits(ulimits.toArray(new Ulimit[0]));
+    }
+
+    @Override
+    public CreateContainerCmd withUser(String user) {
         checkNotNull(user, "user was not specified");
         this.user = user;
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withVolumes(Volume... volumes) {
+    public CreateContainerCmd withVolumes(Volume... volumes) {
         checkNotNull(volumes, "volumes was not specified");
         this.volumes = new Volumes(volumes);
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withVolumesFrom(VolumesFrom... volumesFrom) {
+    public CreateContainerCmd withVolumes(List<Volume> volumes) {
+        checkNotNull(volumes, "volumes was not specified");
+        return withVolumes(volumes.toArray(new Volume[0]));
+    }
+
+    @Override
+    public CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom) {
         checkNotNull(volumesFrom, "volumesFrom was not specified");
         this.hostConfig.setVolumesFrom(volumesFrom);
         return this;
     }
 
     @Override
-    public CreateContainerCmdImpl withWorkingDir(String workingDir) {
+    public CreateContainerCmd withVolumesFrom(List<VolumesFrom> volumesFrom) {
+        checkNotNull(volumesFrom, "volumesFrom was not specified");
+        return withVolumesFrom(volumesFrom.toArray(new VolumesFrom[0]));
+    }
+
+    @Override
+    public CreateContainerCmd withWorkingDir(String workingDir) {
         checkNotNull(workingDir, "workingDir was not specified");
         this.workingDir = workingDir;
         return this;

From 38d268f362dfec0000a0fa08ae45261a8e8c6ec4 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 24 Sep 2015 22:51:20 +0200
Subject: [PATCH 0236/1272] Removed import

---
 .../java/com/github/dockerjava/api/async/ResultCallback.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/async/ResultCallback.java b/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
index 8525f2478..2016e1980 100644
--- a/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
+++ b/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.async;
 
 import java.io.Closeable;
-import java.io.IOException;
 
 /**
  * Result callback

From db8cc70815331347dbac4dad06671dc4f43739fe Mon Sep 17 00:00:00 2001
From: Aleksandr Guljajev <alexandr.gulyayev@gmail.com>
Date: Mon, 28 Sep 2015 17:04:40 +0200
Subject: [PATCH 0237/1272] Adding support for withPidMode #332

---
 .../api/command/CreateContainerCmd.java       |  3 +
 .../dockerjava/api/model/HostConfig.java      | 10 +++-
 .../core/command/CreateContainerCmdImpl.java  | 24 ++++++--
 .../command/CreateContainerCmdImplTest.java   | 55 ++++++++++---------
 4 files changed, 60 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 638331240..0fd89a44e 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -134,6 +134,8 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public boolean isTty();
 
+    public String getPidMode();
+
     public CreateContainerCmd withAttachStderr(boolean attachStderr);
 
     public CreateContainerCmd withAttachStdin(boolean attachStdin);
@@ -291,6 +293,7 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public CreateContainerCmd withContainerIDFile(String containerIDFile);
 
+    public CreateContainerCmd withPidMode(String pidMode);
     /**
      * @return
      */
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 9b31e05a9..d91118afe 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -75,13 +75,16 @@ public class HostConfig {
     @JsonProperty("CpuShares")
     private int cpuShares = 0;
 
+    @JsonProperty("PidMode")
+    private String pidMode;
+
     public HostConfig() {
     }
 
     public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, LogConfig logConfig, Ports portBindings,
             boolean publishAllPorts, boolean privileged, boolean readonlyRootfs, String[] dns, String[] dnsSearch,
             VolumesFrom[] volumesFrom, String containerIDFile, Capability[] capAdd, Capability[] capDrop,
-            RestartPolicy restartPolicy, String networkMode, Device[] devices, String[] extraHosts, Ulimit[] ulimits) {
+            RestartPolicy restartPolicy, String networkMode, Device[] devices, String[] extraHosts, Ulimit[] ulimits, String pidMode) {
         this.binds = new Binds(binds);
         this.links = new Links(links);
         this.lxcConf = lxcConf;
@@ -101,6 +104,7 @@ public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, LogConfig logCo
         this.devices = devices;
         this.extraHosts = extraHosts;
         this.ulimits = ulimits;
+        this.pidMode = pidMode;
     }
 
     @JsonIgnore
@@ -194,6 +198,8 @@ public int getCpuShares() {
         return cpuShares;
     }
 
+    public String getPidMode() { return pidMode; }
+
     @JsonIgnore
     public void setBinds(Bind... binds) {
         this.binds = new Binds(binds);
@@ -273,6 +279,8 @@ public void setUlimits(Ulimit[] ulimits) {
         this.ulimits = ulimits;
     }
 
+    public void setPidMode(String pidMode) { this.pidMode = pidMode; }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index f29c5c05f..570153c69 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -1,11 +1,5 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Map;
-
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.ConflictException;
@@ -28,6 +22,11 @@
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.Volumes;
 import com.github.dockerjava.api.model.VolumesFrom;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import java.util.Map;
+
+import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  *
@@ -397,6 +396,12 @@ public boolean isTty() {
         return tty;
     }
 
+    @Override
+    @JsonIgnore
+    public String getPidMode() {
+        return hostConfig.getPidMode();
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this).append("create container ").append(name != null ? "name=" + name + " " : "")
@@ -733,4 +738,11 @@ public CreateContainerCmdImpl withWorkingDir(String workingDir) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withPidMode(String pidMode) {
+        checkNotNull(pidMode, "pidMode was not specified");
+        this.hostConfig.setPidMode(pidMode);
+        return this;
+    }
+
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 1aeeb5479..b290a618c 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -1,5 +1,14 @@
 package com.github.dockerjava.core.command;
 
+import com.github.dockerjava.api.ConflictException;
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.*;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+import org.testng.ITestResult;
+import org.testng.annotations.*;
+
 import static com.github.dockerjava.api.model.Capability.MKNOD;
 import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -21,31 +30,10 @@
 import java.util.Map;
 import java.util.UUID;
 
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.ConflictException;
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.AccessMode;
-import com.github.dockerjava.api.model.Bind;
-import com.github.dockerjava.api.model.Device;
-import com.github.dockerjava.api.model.ExposedPort;
-import com.github.dockerjava.api.model.HostConfig;
-import com.github.dockerjava.api.model.Link;
-import com.github.dockerjava.api.model.LogConfig;
-import com.github.dockerjava.api.model.Ports;
-import com.github.dockerjava.api.model.RestartPolicy;
-import com.github.dockerjava.api.model.Ulimit;
-import com.github.dockerjava.api.model.Volume;
-import com.github.dockerjava.api.model.VolumeRW;
-import com.github.dockerjava.api.model.VolumesFrom;
-import com.github.dockerjava.client.AbstractDockerClientTest;
+import static com.github.dockerjava.api.model.Capability.MKNOD;
+import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
 
 @Test(groups = "integration")
 public class CreateContainerCmdImplTest extends AbstractDockerClientTest {
@@ -451,6 +439,21 @@ public void createContainerWithRestartPolicy() throws DockerException {
         assertThat(inspectContainerResponse.getHostConfig().getRestartPolicy(), is(equalTo(restartPolicy)));
     }
 
+    @Test
+    public void createContainerWithPidMode() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withPidMode("host").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getHostConfig().getPidMode(), is(equalTo("host")));
+    }
+
     /**
      * This tests support for --net option for the docker run command: --net="bridge" Set the Network mode for the
      * container 'bridge': creates a new network stack for the container on the docker bridge 'none': no networking for
@@ -543,4 +546,6 @@ public void createContainerWithLogConfig() throws DockerException {
         // null becomes empty string
         assertEquals(inspectContainerResponse.getHostConfig().getLogConfig().type, logConfig.type);
     }
+
+
 }

From 0a730b81a8fc91fcef861d9b26f773d29524c6e3 Mon Sep 17 00:00:00 2001
From: Aleksandr Guljajev <alexandr.gulyayev@gmail.com>
Date: Mon, 28 Sep 2015 17:12:49 +0200
Subject: [PATCH 0238/1272] Style fixes

---
 .../java/com/github/dockerjava/api/model/HostConfig.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index d91118afe..0e3a835ee 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -84,7 +84,8 @@ public HostConfig() {
     public HostConfig(Bind[] binds, Link[] links, LxcConf[] lxcConf, LogConfig logConfig, Ports portBindings,
             boolean publishAllPorts, boolean privileged, boolean readonlyRootfs, String[] dns, String[] dnsSearch,
             VolumesFrom[] volumesFrom, String containerIDFile, Capability[] capAdd, Capability[] capDrop,
-            RestartPolicy restartPolicy, String networkMode, Device[] devices, String[] extraHosts, Ulimit[] ulimits, String pidMode) {
+            RestartPolicy restartPolicy, String networkMode, Device[] devices, String[] extraHosts, Ulimit[] ulimits,
+            String pidMode) {
         this.binds = new Binds(binds);
         this.links = new Links(links);
         this.lxcConf = lxcConf;
@@ -198,7 +199,9 @@ public int getCpuShares() {
         return cpuShares;
     }
 
-    public String getPidMode() { return pidMode; }
+    public String getPidMode() {
+        return pidMode;
+    }
 
     @JsonIgnore
     public void setBinds(Bind... binds) {

From 4b543c33db68959a43ce43b5d08039b8d324dfb9 Mon Sep 17 00:00:00 2001
From: Aleksandr Guljajev <alexandr.gulyayev@gmail.com>
Date: Mon, 28 Sep 2015 17:25:21 +0200
Subject: [PATCH 0239/1272] Style fixes; * imports fixed

---
 .../api/command/CreateContainerCmd.java       |  3 +++
 .../dockerjava/api/model/HostConfig.java      |  4 +++-
 .../dockerjava/jaxrs/EventsCmdExec.java       |  4 ++--
 .../command/CreateContainerCmdImplTest.java   | 22 ++++++++++++++-----
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 0fd89a44e..ea7691446 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -18,6 +18,8 @@
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
 
+import javax.annotation.CheckForNull;
+
 public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerResponse> {
 
     public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, CreateContainerResponse> {
@@ -134,6 +136,7 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public boolean isTty();
 
+    @CheckForNull
     public String getPidMode();
 
     public CreateContainerCmd withAttachStderr(boolean attachStderr);
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 0e3a835ee..4ab1cf76f 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -282,7 +282,9 @@ public void setUlimits(Ulimit[] ulimits) {
         this.ulimits = ulimits;
     }
 
-    public void setPidMode(String pidMode) { this.pidMode = pidMode; }
+    public void setPidMode(String pidMode) {
+        this.pidMode = pidMode;
+    }
 
     @Override
     public String toString() {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
index 6720604df..7936ef15f 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.jaxrs;
 
-import static com.google.common.net.UrlEscapers.*;
-
 import javax.ws.rs.client.WebTarget;
 
 import org.slf4j.Logger;
@@ -14,6 +12,8 @@
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
 
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
 public class EventsCmdExec extends AbstrAsyncDockerCmdExec<EventsCmd, Event> implements EventsCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(EventsCmdExec.class);
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index b290a618c..a939bcbd9 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -4,10 +4,25 @@
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.*;
+import com.github.dockerjava.api.model.AccessMode;
+import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.Device;
+import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.Link;
+import com.github.dockerjava.api.model.LogConfig;
+import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.RestartPolicy;
+import com.github.dockerjava.api.model.Ulimit;
+import com.github.dockerjava.api.model.Volume;
+import com.github.dockerjava.api.model.VolumeRW;
+import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import org.testng.ITestResult;
-import org.testng.annotations.*;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
 
 import static com.github.dockerjava.api.model.Capability.MKNOD;
 import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
@@ -33,7 +48,6 @@
 import static com.github.dockerjava.api.model.Capability.MKNOD;
 import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
 
 @Test(groups = "integration")
 public class CreateContainerCmdImplTest extends AbstractDockerClientTest {
@@ -546,6 +560,4 @@ public void createContainerWithLogConfig() throws DockerException {
         // null becomes empty string
         assertEquals(inspectContainerResponse.getHostConfig().getLogConfig().type, logConfig.type);
     }
-
-
 }

From 6df5a7fa314396fa56ef2b112f6d663e6fcc0d52 Mon Sep 17 00:00:00 2001
From: Aleksandr Guljajev <alexandr.gulyayev@gmail.com>
Date: Tue, 29 Sep 2015 09:51:31 +0200
Subject: [PATCH 0240/1272] Adding checkfornull annotation

---
 src/main/java/com/github/dockerjava/api/model/HostConfig.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 4ab1cf76f..cbb6e84de 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -6,6 +6,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import javax.annotation.CheckForNull;
+
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class HostConfig {
 
@@ -199,6 +201,7 @@ public int getCpuShares() {
         return cpuShares;
     }
 
+    @CheckForNull
     public String getPidMode() {
         return pidMode;
     }

From 4f094c1128a5c4b4974a51d7de446eb24f5350dc Mon Sep 17 00:00:00 2001
From: Aleksandr Guljajev <alexandr.gulyayev@gmail.com>
Date: Tue, 29 Sep 2015 10:53:03 +0200
Subject: [PATCH 0241/1272] Renaming withPidMode to withPid (consistency)

---
 .../com/github/dockerjava/api/command/CreateContainerCmd.java   | 2 +-
 .../github/dockerjava/core/command/CreateContainerCmdImpl.java  | 2 +-
 .../dockerjava/core/command/CreateContainerCmdImplTest.java     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index ea7691446..46e099908 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -296,7 +296,7 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public CreateContainerCmd withContainerIDFile(String containerIDFile);
 
-    public CreateContainerCmd withPidMode(String pidMode);
+    public CreateContainerCmd withPid(String pidMode);
     /**
      * @return
      */
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 570153c69..d07b43887 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -739,7 +739,7 @@ public CreateContainerCmdImpl withWorkingDir(String workingDir) {
     }
 
     @Override
-    public CreateContainerCmd withPidMode(String pidMode) {
+    public CreateContainerCmd withPid(String pidMode) {
         checkNotNull(pidMode, "pidMode was not specified");
         this.hostConfig.setPidMode(pidMode);
         return this;
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index a939bcbd9..222a4a1e1 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -457,7 +457,7 @@ public void createContainerWithRestartPolicy() throws DockerException {
     public void createContainerWithPidMode() throws DockerException {
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
-                .withPidMode("host").exec();
+                .withPid("host").exec();
 
         LOG.info("Created container {}", container.toString());
 

From 2eb297eb64ebdd5e7a41e496a5477d2f7fc77a4b Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 29 Sep 2015 21:21:54 +0200
Subject: [PATCH 0242/1272] Renamed method

---
 .../github/dockerjava/api/command/CreateContainerCmd.java  | 7 ++++++-
 .../dockerjava/core/command/CreateContainerCmdImpl.java    | 2 +-
 .../core/command/CreateContainerCmdImplTest.java           | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 46e099908..e3ffa4996 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -296,7 +296,12 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public CreateContainerCmd withContainerIDFile(String containerIDFile);
 
-    public CreateContainerCmd withPid(String pidMode);
+    /**
+     * Set the PID (Process) Namespace mode for the container, 'host': use the host's PID namespace
+     * inside the container
+     */
+    public CreateContainerCmd withPidMode(String pidMode);
+
     /**
      * @return
      */
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index d07b43887..570153c69 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -739,7 +739,7 @@ public CreateContainerCmdImpl withWorkingDir(String workingDir) {
     }
 
     @Override
-    public CreateContainerCmd withPid(String pidMode) {
+    public CreateContainerCmd withPidMode(String pidMode) {
         checkNotNull(pidMode, "pidMode was not specified");
         this.hostConfig.setPidMode(pidMode);
         return this;
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 222a4a1e1..a939bcbd9 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -457,7 +457,7 @@ public void createContainerWithRestartPolicy() throws DockerException {
     public void createContainerWithPidMode() throws DockerException {
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
-                .withPid("host").exec();
+                .withPidMode("host").exec();
 
         LOG.info("Created container {}", container.toString());
 

From 3ebe8ca8eabdef9b512570fe8b60f1b1234df9c6 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 29 Sep 2015 21:24:03 +0200
Subject: [PATCH 0243/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd6e676c5..7738add8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 Change Log
 ===
+Latest SNAPSHOT version
+---
+* [#333] (https://github.com/docker-java/docker-java/pull/333) Adding support for withPidMode 
 
 v2.1.1
 ---

From 1e13c8985cd6c1fdaa25ee595b11048a53b3b79a Mon Sep 17 00:00:00 2001
From: Marcus Thiesen <mt@hubrick.com>
Date: Sun, 4 Oct 2015 21:06:34 +0200
Subject: [PATCH 0244/1272] Add API versioning support

An issue with docker-java currently is that API < 1.19 has a different
authentication scheme than newer API versions. This leads to major problems
in environments with different docker installations
(see alexec/docker-java-orchestration#49)

docker-java Issue #288 fixed the issue for API >= 1.19, but let older servers
out of the consideration.

This patch distributes the client config through the executors and thus allows
the execution to vary depending on those options.
---
 .../dockerjava/core/DockerClientConfig.java   |  20 +--
 .../dockerjava/core/DockerClientImpl.java     |  34 ++---
 .../dockerjava/core/RemoteApiVersion.java     | 111 ++++++++++++++
 .../jaxrs/AbstrAsyncDockerCmdExec.java        |  14 +-
 .../dockerjava/jaxrs/AbstrDockerCmdExec.java  |  35 +++--
 .../jaxrs/AbstrSyncDockerCmdExec.java         |  13 +-
 .../jaxrs/AttachContainerCmdExec.java         |  14 +-
 .../github/dockerjava/jaxrs/AuthCmdExec.java  |  18 +--
 .../dockerjava/jaxrs/BuildImageCmdExec.java   |  38 +++--
 .../dockerjava/jaxrs/CommitCmdExec.java       |  16 +-
 .../jaxrs/ContainerDiffCmdExec.java           |  17 +--
 .../jaxrs/CopyFileFromContainerCmdExec.java   |  19 ++-
 .../jaxrs/CreateContainerCmdExec.java         |  16 +-
 .../dockerjava/jaxrs/CreateImageCmdExec.java  |  16 +-
 .../jaxrs/DockerCmdExecFactoryImpl.java       | 142 +++++++++---------
 .../dockerjava/jaxrs/EventsCmdExec.java       |  14 +-
 .../dockerjava/jaxrs/ExecCreateCmdExec.java   |  16 +-
 .../dockerjava/jaxrs/ExecStartCmdExec.java    |  19 ++-
 .../github/dockerjava/jaxrs/InfoCmdExec.java  |  14 +-
 .../jaxrs/InspectContainerCmdExec.java        |  14 +-
 .../dockerjava/jaxrs/InspectExecCmdExec.java  |  14 +-
 .../dockerjava/jaxrs/InspectImageCmdExec.java |  14 +-
 .../jaxrs/KillContainerCmdExec.java           |  12 +-
 .../jaxrs/ListContainersCmdExec.java          |  19 ++-
 .../dockerjava/jaxrs/ListImagesCmdExec.java   |  19 ++-
 .../dockerjava/jaxrs/LogContainerCmdExec.java |  14 +-
 .../jaxrs/PauseContainerCmdExec.java          |  12 +-
 .../github/dockerjava/jaxrs/PingCmdExec.java  |  10 +-
 .../dockerjava/jaxrs/PullImageCmdExec.java    |  24 +--
 .../dockerjava/jaxrs/PushImageCmdExec.java    |  22 +--
 .../jaxrs/RemoveContainerCmdExec.java         |  12 +-
 .../dockerjava/jaxrs/RemoveImageCmdExec.java  |  10 +-
 .../jaxrs/RestartContainerCmdExec.java        |  12 +-
 .../dockerjava/jaxrs/SaveImageCmdExec.java    |  17 +--
 .../dockerjava/jaxrs/SearchImagesCmdExec.java |  17 +--
 .../jaxrs/StartContainerCmdExec.java          |  14 +-
 .../github/dockerjava/jaxrs/StatsCmdExec.java |  14 +-
 .../jaxrs/StopContainerCmdExec.java           |  12 +-
 .../dockerjava/jaxrs/TagImageCmdExec.java     |  10 +-
 .../dockerjava/jaxrs/TopContainerCmdExec.java |  14 +-
 .../jaxrs/UnpauseContainerCmdExec.java        |  12 +-
 .../dockerjava/jaxrs/VersionCmdExec.java      |  14 +-
 .../jaxrs/WaitContainerCmdExec.java           |  14 +-
 .../core/DockerClientConfigTest.java          |  13 +-
 44 files changed, 533 insertions(+), 412 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/core/RemoteApiVersion.java

diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index ae8156748..6e16c6557 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -1,6 +1,10 @@
 package com.github.dockerjava.core;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.AuthConfigurations;
+import com.github.dockerjava.core.NameParser.HostnameReposName;
+import com.github.dockerjava.core.NameParser.ReposTag;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -12,11 +16,7 @@
 import java.util.Map;
 import java.util.Properties;
 
-import com.github.dockerjava.api.DockerClientException;
-import com.github.dockerjava.api.model.AuthConfig;
-import com.github.dockerjava.api.model.AuthConfigurations;
-import com.github.dockerjava.core.NameParser.HostnameReposName;
-import com.github.dockerjava.core.NameParser.ReposTag;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 public class DockerClientConfig implements Serializable {
 
@@ -66,14 +66,16 @@ public class DockerClientConfig implements Serializable {
 
     private URI uri;
 
-    private final String version, username, password, email, serverAddress, dockerCfgPath;
+    private final String username, password, email, serverAddress, dockerCfgPath;
+
+    private final RemoteApiVersion version;
 
     private final SSLConfig sslConfig;
 
     DockerClientConfig(URI uri, String version, String username, String password, String email, String serverAddress,
             String dockerCfgPath, SSLConfig sslConfig) {
         this.uri = uri;
-        this.version = version;
+        this.version = RemoteApiVersion.parseConfigWithDefault(version);
         this.username = username;
         this.password = password;
         this.email = email;
@@ -209,7 +211,7 @@ public void setUri(URI uri) {
         this.uri = uri;
     }
 
-    public String getVersion() {
+    public RemoteApiVersion getVersion() {
         return version;
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 206ce26fd..2e22791cd 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -1,12 +1,5 @@
 package com.github.dockerjava.core;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd;
@@ -46,7 +39,6 @@
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.AuthConfig;
-import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.api.model.Identifier;
 import com.github.dockerjava.core.command.AttachContainerCmdImpl;
 import com.github.dockerjava.core.command.AuthCmdImpl;
@@ -85,6 +77,13 @@
 import com.github.dockerjava.core.command.VersionCmdImpl;
 import com.github.dockerjava.core.command.WaitContainerCmdImpl;
 
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * @author Konstantin Pelykh (kpelykh@gmail.com)
  *
@@ -332,28 +331,19 @@ public CommitCmd commitCmd(String containerId) {
 
     @Override
     public BuildImageCmd buildImageCmd() {
-        return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec()));
+        return new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec());
     }
 
     @Override
     public BuildImageCmd buildImageCmd(File dockerFileOrFolder) {
-        return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(),
-                dockerFileOrFolder));
+        return new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(),
+                dockerFileOrFolder);
     }
 
     @Override
     public BuildImageCmd buildImageCmd(InputStream tarInputStream) {
-        return augmentBuildImageCmd(new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(),
-                tarInputStream));
-    }
-
-    private BuildImageCmd augmentBuildImageCmd(BuildImageCmd buildImageCmd) {
-        final AuthConfigurations authConfigurations = dockerClientConfig.getAuthConfigurations();
-        if (!authConfigurations.getConfigs().isEmpty()) {
-            buildImageCmd.withBuildAuthConfigs(authConfigurations);
-        }
-
-        return buildImageCmd;
+        return new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(),
+                tarInputStream);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
new file mode 100644
index 000000000..7c0092971
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -0,0 +1,111 @@
+package com.github.dockerjava.core;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Bean to encapsulate the version of the Docker Remote API (REST API)
+ * <p>
+ * Contains the minor and major version of the API as well as operations to compare API versions.
+ *
+ * @author Marcus Thiesen
+ */
+public class RemoteApiVersion {
+
+    public static final RemoteApiVersion VERSION_1_19 = RemoteApiVersion.create(1, 19);
+    private static final Pattern VERSION_REGEX = Pattern.compile("v?(\\d+)\\.(\\d+)");
+    private static final RemoteApiVersion UNKNOWN_VERSION = new RemoteApiVersion(0, 0) {
+
+        @Override
+        public boolean isGreaterOrEqual(final RemoteApiVersion other) {
+            return false;
+        }
+
+        @Override
+        public String toString() {
+            return MoreObjects.toStringHelper(this).addValue("UNKNOWN_VERSION").toString();
+        }
+
+        @Override
+        public String asWebPathPart() {
+            return "";
+        }
+    };
+    private final int major;
+    private final int minor;
+    private RemoteApiVersion(final int major, final int minor) {
+        this.major = major;
+        this.minor = minor;
+    }
+
+    public static RemoteApiVersion create(final int major, final int minor) {
+        Preconditions.checkArgument(major > 0, "Major version must be bigger than 0 but is " + major);
+        Preconditions.checkArgument(minor > 0, "Minor version must be bigger than 0 but is " + minor);
+        return new RemoteApiVersion(major, minor);
+    }
+
+    public static RemoteApiVersion unknown() {
+        return UNKNOWN_VERSION;
+    }
+
+    public static RemoteApiVersion parseConfig(final String version) {
+        Preconditions.checkArgument(version != null, "Version must not be null");
+        final Matcher matcher = VERSION_REGEX.matcher(version);
+        if (matcher.matches()) {
+            return create(Integer.parseInt(matcher.group(1)), Integer.parseInt(matcher.group(2)));
+        }
+        throw new IllegalArgumentException(version + " can not be parsed");
+    }
+
+    public static RemoteApiVersion parseConfigWithDefault(final String version) {
+        if (Strings.isNullOrEmpty(version)) {
+            return UNKNOWN_VERSION;
+        }
+
+        try {
+            return parseConfig(version);
+        } catch (IllegalArgumentException e) {
+            return UNKNOWN_VERSION;
+        }
+    }
+
+    public boolean isGreaterOrEqual(final RemoteApiVersion other) {
+        if (major >= other.major) {
+            if (minor >= other.minor) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        final RemoteApiVersion that = (RemoteApiVersion) o;
+        return Objects.equal(major, that.major) &&
+                Objects.equal(minor, that.minor);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(major, minor);
+    }
+
+    @Override
+    public String toString() {
+        return MoreObjects.toStringHelper(this)
+                .add("major", major)
+                .add("minor", minor)
+                .toString();
+    }
+
+    public String asWebPathPart() {
+        return "v" + major + "." + minor;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
index c8cc954f3..c2f1a3def 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
@@ -1,20 +1,20 @@
 package com.github.dockerjava.jaxrs;
 
-import java.io.Closeable;
-import java.io.IOException;
-
-import javax.ws.rs.client.WebTarget;
-
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.AsyncDockerCmd;
 import com.github.dockerjava.api.command.DockerCmdAsyncExec;
+import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 
+import javax.ws.rs.client.WebTarget;
+import java.io.Closeable;
+import java.io.IOException;
+
 public abstract class AbstrAsyncDockerCmdExec<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T>, A_RES_T> extends
         AbstrDockerCmdExec implements DockerCmdAsyncExec<CMD_T, A_RES_T> {
 
-    public AbstrAsyncDockerCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public AbstrAsyncDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
index 4c0d36eaa..e20f480b6 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
@@ -1,30 +1,37 @@
 package com.github.dockerjava.jaxrs;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.io.IOException;
-
-import javax.ws.rs.client.WebTarget;
-
-import org.apache.commons.codec.binary.Base64;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.codec.binary.Base64;
+
+import javax.ws.rs.client.WebTarget;
+import java.io.IOException;
+
+import static com.google.common.base.Preconditions.checkNotNull;
 
 public abstract class AbstrDockerCmdExec {
 
-    private WebTarget baseResource;
+    private final DockerClientConfig dockerClientConfig;
+    private final WebTarget baseResource;
 
-    public AbstrDockerCmdExec(WebTarget baseResource) {
+    public AbstrDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
         checkNotNull(baseResource, "baseResource was not specified");
+        checkNotNull(dockerClientConfig, "dockerClientConfig was not specified");
         this.baseResource = baseResource;
+        this.dockerClientConfig = dockerClientConfig;
     }
 
     protected WebTarget getBaseResource() {
         return baseResource;
     }
 
+    protected AuthConfigurations getBuildAuthConfigs() {
+        return dockerClientConfig.getAuthConfigurations();
+    }
+
     protected String registryAuth(AuthConfig authConfig) {
         try {
             return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfig).getBytes());
@@ -35,7 +42,13 @@ protected String registryAuth(AuthConfig authConfig) {
 
     protected String registryConfigs(AuthConfigurations authConfigs) {
         try {
-            String json = new ObjectMapper().writeValueAsString(authConfigs.getConfigs());
+            final String json;
+            if (dockerClientConfig.getVersion().isGreaterOrEqual(RemoteApiVersion.VERSION_1_19)) {
+                json = new ObjectMapper().writeValueAsString(authConfigs.getConfigs());
+            } else {
+                json = new ObjectMapper().writeValueAsString(authConfigs);
+            }
+
             return Base64.encodeBase64String(json.getBytes());
         } catch (IOException e) {
             throw new RuntimeException(e);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
index 016184053..ed1ec6233 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
@@ -1,19 +1,18 @@
 package com.github.dockerjava.jaxrs;
 
-import java.io.IOException;
-
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.client.WebTarget;
-
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.command.DockerCmd;
 import com.github.dockerjava.api.command.DockerCmdSyncExec;
+import com.github.dockerjava.core.DockerClientConfig;
+
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.client.WebTarget;
 
 public abstract class AbstrSyncDockerCmdExec<CMD_T extends DockerCmd<RES_T>, RES_T> extends AbstrDockerCmdExec
         implements DockerCmdSyncExec<CMD_T, RES_T> {
 
-    public AbstrSyncDockerCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public AbstrSyncDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
index 67da89284..37f13edc6 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
@@ -1,24 +1,24 @@
 package com.github.dockerjava.jaxrs;
 
-import javax.ws.rs.client.WebTarget;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.async.FrameStreamProcessor;
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
 
 public class AttachContainerCmdExec extends AbstrAsyncDockerCmdExec<AttachContainerCmd, Frame> implements
         AttachContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AttachContainerCmdExec.class);
 
-    public AttachContainerCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public AttachContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
index cd346fc78..9c59a8c02 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
@@ -1,24 +1,24 @@
 package com.github.dockerjava.jaxrs;
 
-import static javax.ws.rs.client.Entity.entity;
+import com.github.dockerjava.api.UnauthorizedException;
+import com.github.dockerjava.api.command.AuthCmd;
+import com.github.dockerjava.api.model.AuthResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.UnauthorizedException;
-import com.github.dockerjava.api.command.AuthCmd;
-import com.github.dockerjava.api.model.AuthResponse;
+import static javax.ws.rs.client.Entity.entity;
 
 public class AuthCmdExec extends AbstrSyncDockerCmdExec<AuthCmd, AuthResponse> implements AuthCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AuthCmdExec.class);
 
-    public AuthCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public AuthCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index 8da1884b8..fa04875f1 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -1,40 +1,50 @@
 package com.github.dockerjava.jaxrs;
 
-import static javax.ws.rs.client.Entity.entity;
-
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.glassfish.jersey.client.ClientProperties;
-import org.glassfish.jersey.client.RequestEntityProcessing;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.api.model.BuildResponseItem;
+import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.async.JsonStreamProcessor;
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
+import org.glassfish.jersey.client.ClientProperties;
+import org.glassfish.jersey.client.RequestEntityProcessing;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import static javax.ws.rs.client.Entity.entity;
 
 public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem> implements
         BuildImageCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageCmdExec.class);
 
-    public BuildImageCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public BuildImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     private Invocation.Builder resourceWithOptionalAuthConfig(BuildImageCmd command, Invocation.Builder request) {
-        AuthConfigurations authConfigs = command.getBuildAuthConfigs();
+        final AuthConfigurations authConfigs = firstNonNull(command.getBuildAuthConfigs(), getBuildAuthConfigs());
         if (authConfigs != null) {
             request = request.header("X-Registry-Config", registryConfigs(authConfigs));
         }
         return request;
     }
 
+    private static AuthConfigurations firstNonNull(final AuthConfigurations fromCommand, final AuthConfigurations fromConfig) {
+        if (fromCommand != null) {
+            return fromCommand;
+        }
+        if (fromConfig != null) {
+            return fromConfig;
+        }
+        return null;
+    }
+
     @Override
     protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImageCmd command,
             ResultCallback<BuildResponseItem> resultCallback) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
index fec4da6ac..ba4d78945 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
@@ -1,22 +1,22 @@
 package com.github.dockerjava.jaxrs;
 
-import static javax.ws.rs.client.Entity.entity;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.github.dockerjava.api.command.CommitCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.github.dockerjava.api.command.CommitCmd;
+import static javax.ws.rs.client.Entity.entity;
 
 public class CommitCmdExec extends AbstrSyncDockerCmdExec<CommitCmd, String> implements CommitCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CommitCmdExec.class);
 
-    public CommitCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public CommitCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java
index aa7878a65..12ceb2cd0 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java
@@ -1,24 +1,23 @@
 package com.github.dockerjava.jaxrs;
 
-import java.util.List;
+import com.github.dockerjava.api.command.ContainerDiffCmd;
+import com.github.dockerjava.api.model.ChangeLog;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.ContainerDiffCmd;
-import com.github.dockerjava.api.model.ChangeLog;
+import java.util.List;
 
 public class ContainerDiffCmdExec extends AbstrSyncDockerCmdExec<ContainerDiffCmd, List<ChangeLog>> implements
         ContainerDiffCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ContainerDiffCmdExec.class);
 
-    public ContainerDiffCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public ContainerDiffCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
index cb31cb2f5..15185a8d8 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
@@ -1,26 +1,25 @@
 package com.github.dockerjava.jaxrs;
 
-import static javax.ws.rs.client.Entity.entity;
-
-import java.io.InputStream;
+import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import java.io.InputStream;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
-import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
+import static javax.ws.rs.client.Entity.entity;
 
 public class CopyFileFromContainerCmdExec extends AbstrSyncDockerCmdExec<CopyFileFromContainerCmd, InputStream>
         implements CopyFileFromContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CopyFileFromContainerCmdExec.class);
 
-    public CopyFileFromContainerCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public CopyFileFromContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
index ef42c43ff..bb923289d 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
@@ -1,23 +1,23 @@
 package com.github.dockerjava.jaxrs;
 
-import static javax.ws.rs.client.Entity.entity;
+import com.github.dockerjava.api.command.CreateContainerCmd;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.CreateContainerCmd;
-import com.github.dockerjava.api.command.CreateContainerResponse;
+import static javax.ws.rs.client.Entity.entity;
 
 public class CreateContainerCmdExec extends AbstrSyncDockerCmdExec<CreateContainerCmd, CreateContainerResponse>
         implements CreateContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CreateContainerCmdExec.class);
 
-    public CreateContainerCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public CreateContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
index baba39829..3656d9463 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
@@ -1,23 +1,23 @@
 package com.github.dockerjava.jaxrs;
 
-import static javax.ws.rs.client.Entity.entity;
+import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.CreateImageResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.CreateImageCmd;
-import com.github.dockerjava.api.command.CreateImageResponse;
+import static javax.ws.rs.client.Entity.entity;
 
 public class CreateImageCmdExec extends AbstrSyncDockerCmdExec<CreateImageCmd, CreateImageResponse> implements
         CreateImageCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CreateImageCmdExec.class);
 
-    public CreateImageCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public CreateImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index ef8d4e4fb..11381a494 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -1,29 +1,5 @@
 package com.github.dockerjava.jaxrs;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.io.IOException;
-import java.net.URI;
-
-import javax.net.ssl.SSLContext;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.client.ClientResponseFilter;
-import javax.ws.rs.client.WebTarget;
-
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.glassfish.jersey.CommonProperties;
-import org.glassfish.jersey.apache.connector.ApacheClientProperties;
-import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.client.ClientProperties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import com.github.dockerjava.api.DockerClientException;
 import com.github.dockerjava.api.command.AttachContainerCmd;
@@ -64,13 +40,36 @@
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-//import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
-// see https://github.com/docker-java/docker-java/issues/196
+import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.jaxrs.connector.ApacheConnectorProvider;
-import com.github.dockerjava.jaxrs.filter.FollowRedirectsFilter;
 import com.github.dockerjava.jaxrs.filter.JsonClientFilter;
 import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter;
 import com.github.dockerjava.jaxrs.filter.SelectiveLoggingFilter;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.glassfish.jersey.CommonProperties;
+import org.glassfish.jersey.apache.connector.ApacheClientProperties;
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.ClientProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.SSLContext;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.client.ClientResponseFilter;
+import javax.ws.rs.client.WebTarget;
+import java.io.IOException;
+import java.net.URI;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+//import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
+// see https://github.com/docker-java/docker-java/issues/196
 
 public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
 
@@ -92,6 +91,8 @@ public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
 
     private ClientResponseFilter[] clientResponseFilters = null;
 
+    private DockerClientConfig dockerClientConfig;
+
     @Override
     public void init(DockerClientConfig dockerClientConfig) {
         checkNotNull(dockerClientConfig, "config was not specified");
@@ -168,11 +169,9 @@ public void init(DockerClientConfig dockerClientConfig) {
         }
         WebTarget webResource = client.target(dockerClientConfig.getUri());
 
-        if (dockerClientConfig.getVersion() == null || dockerClientConfig.getVersion().isEmpty()) {
-            baseResource = webResource;
-        } else {
-            baseResource = webResource.path("v" + dockerClientConfig.getVersion());
-        }
+        baseResource = webResource.path(dockerClientConfig.getVersion().asWebPathPart());
+
+        this.dockerClientConfig = dockerClientConfig;
     }
 
     private org.apache.http.config.Registry<ConnectionSocketFactory> getSchemeRegistry(final URI originalUri,
@@ -187,188 +186,193 @@ private org.apache.http.config.Registry<ConnectionSocketFactory> getSchemeRegist
     }
 
     protected WebTarget getBaseResource() {
-        checkNotNull(baseResource, "Factory not initialized. You probably forgot to call init()!");
+        checkNotNull(baseResource, "Factory not initialized, baseResource not set. You probably forgot to call init()!");
         return baseResource;
     }
+    
+    protected DockerClientConfig getDockerClientConfig() {
+        checkNotNull(dockerClientConfig, "Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!");
+        return dockerClientConfig;
+    }
 
     @Override
     public AuthCmd.Exec createAuthCmdExec() {
-        return new AuthCmdExec(getBaseResource());
+        return new AuthCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public InfoCmd.Exec createInfoCmdExec() {
-        return new InfoCmdExec(getBaseResource());
+        return new InfoCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public PingCmd.Exec createPingCmdExec() {
-        return new PingCmdExec(getBaseResource());
+        return new PingCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public VersionCmd.Exec createVersionCmdExec() {
-        return new VersionCmdExec(getBaseResource());
+        return new VersionCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public PullImageCmd.Exec createPullImageCmdExec() {
-        return new PullImageCmdExec(getBaseResource());
+        return new PullImageCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public PushImageCmd.Exec createPushImageCmdExec() {
-        return new PushImageCmdExec(getBaseResource());
+        return new PushImageCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public SaveImageCmd.Exec createSaveImageCmdExec() {
-        return new SaveImageCmdExec(getBaseResource());
+        return new SaveImageCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public CreateImageCmd.Exec createCreateImageCmdExec() {
-        return new CreateImageCmdExec(getBaseResource());
+        return new CreateImageCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public SearchImagesCmd.Exec createSearchImagesCmdExec() {
-        return new SearchImagesCmdExec(getBaseResource());
+        return new SearchImagesCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public RemoveImageCmd.Exec createRemoveImageCmdExec() {
-        return new RemoveImageCmdExec(getBaseResource());
+        return new RemoveImageCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public ListImagesCmd.Exec createListImagesCmdExec() {
-        return new ListImagesCmdExec(getBaseResource());
+        return new ListImagesCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public InspectImageCmd.Exec createInspectImageCmdExec() {
-        return new InspectImageCmdExec(getBaseResource());
+        return new InspectImageCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public ListContainersCmd.Exec createListContainersCmdExec() {
-        return new ListContainersCmdExec(getBaseResource());
+        return new ListContainersCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public CreateContainerCmd.Exec createCreateContainerCmdExec() {
-        return new CreateContainerCmdExec(getBaseResource());
+        return new CreateContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public StartContainerCmd.Exec createStartContainerCmdExec() {
-        return new StartContainerCmdExec(getBaseResource());
+        return new StartContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public InspectContainerCmd.Exec createInspectContainerCmdExec() {
-        return new InspectContainerCmdExec(getBaseResource());
+        return new InspectContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public ExecCreateCmd.Exec createExecCmdExec() {
-        return new ExecCreateCmdExec(getBaseResource());
+        return new ExecCreateCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
-        return new RemoveContainerCmdExec(getBaseResource());
+        return new RemoveContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public WaitContainerCmd.Exec createWaitContainerCmdExec() {
-        return new WaitContainerCmdExec(getBaseResource());
+        return new WaitContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public AttachContainerCmd.Exec createAttachContainerCmdExec() {
-        return new AttachContainerCmdExec(getBaseResource());
+        return new AttachContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public ExecStartCmd.Exec createExecStartCmdExec() {
-        return new ExecStartCmdExec(getBaseResource());
+        return new ExecStartCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public InspectExecCmd.Exec createInspectExecCmdExec() {
-        return new InspectExecCmdExec(getBaseResource());
+        return new InspectExecCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public LogContainerCmd.Exec createLogContainerCmdExec() {
-        return new LogContainerCmdExec(getBaseResource());
+        return new LogContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
-        return new CopyFileFromContainerCmdExec(getBaseResource());
+        return new CopyFileFromContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public StopContainerCmd.Exec createStopContainerCmdExec() {
-        return new StopContainerCmdExec(getBaseResource());
+        return new StopContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
-        return new ContainerDiffCmdExec(getBaseResource());
+        return new ContainerDiffCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public KillContainerCmd.Exec createKillContainerCmdExec() {
-        return new KillContainerCmdExec(getBaseResource());
+        return new KillContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public RestartContainerCmd.Exec createRestartContainerCmdExec() {
-        return new RestartContainerCmdExec(getBaseResource());
+        return new RestartContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public CommitCmd.Exec createCommitCmdExec() {
-        return new CommitCmdExec(getBaseResource());
+        return new CommitCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public BuildImageCmd.Exec createBuildImageCmdExec() {
-        return new BuildImageCmdExec(getBaseResource());
+        return new BuildImageCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public TopContainerCmd.Exec createTopContainerCmdExec() {
-        return new TopContainerCmdExec(getBaseResource());
+        return new TopContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public TagImageCmd.Exec createTagImageCmdExec() {
-        return new TagImageCmdExec(getBaseResource());
+        return new TagImageCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public PauseContainerCmd.Exec createPauseContainerCmdExec() {
-        return new PauseContainerCmdExec(getBaseResource());
+        return new PauseContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
-        return new UnpauseContainerCmdExec(baseResource);
+        return new UnpauseContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public EventsCmd.Exec createEventsCmdExec() {
-        return new EventsCmdExec(getBaseResource());
+        return new EventsCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public StatsCmd.Exec createStatsCmdExec() {
-        return new StatsCmdExec(getBaseResource());
+        return new StatsCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
index 7936ef15f..2b73f2658 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -1,16 +1,16 @@
 package com.github.dockerjava.jaxrs;
 
-import javax.ws.rs.client.WebTarget;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.async.JsonStreamProcessor;
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
 
 import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
 
@@ -18,8 +18,8 @@ public class EventsCmdExec extends AbstrAsyncDockerCmdExec<EventsCmd, Event> imp
 
     private static final Logger LOGGER = LoggerFactory.getLogger(EventsCmdExec.class);
 
-    public EventsCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public EventsCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
index 17b1d2c64..79fa04bed 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
@@ -1,23 +1,23 @@
 package com.github.dockerjava.jaxrs;
 
-import static javax.ws.rs.client.Entity.entity;
+import com.github.dockerjava.api.command.ExecCreateCmd;
+import com.github.dockerjava.api.command.ExecCreateCmdResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.ExecCreateCmd;
-import com.github.dockerjava.api.command.ExecCreateCmdResponse;
+import static javax.ws.rs.client.Entity.entity;
 
 public class ExecCreateCmdExec extends AbstrSyncDockerCmdExec<ExecCreateCmd, ExecCreateCmdResponse> implements
         ExecCreateCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(VersionCmdExec.class);
 
-    public ExecCreateCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public ExecCreateCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
index fcae733e6..cf850d10c 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
@@ -1,25 +1,24 @@
 package com.github.dockerjava.jaxrs;
 
-import static javax.ws.rs.client.Entity.entity;
-
-import java.io.InputStream;
+import com.github.dockerjava.api.command.ExecStartCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import java.io.InputStream;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.ExecStartCmd;
-import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
+import static javax.ws.rs.client.Entity.entity;
 
 public class ExecStartCmdExec extends AbstrSyncDockerCmdExec<ExecStartCmd, InputStream> implements ExecStartCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ExecStartCmdExec.class);
 
-    public ExecStartCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public ExecStartCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
index 141d7d1dd..d1dda0148 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
@@ -1,20 +1,20 @@
 package com.github.dockerjava.jaxrs;
 
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
+import com.github.dockerjava.api.command.InfoCmd;
+import com.github.dockerjava.api.model.Info;
+import com.github.dockerjava.core.DockerClientConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.command.InfoCmd;
-import com.github.dockerjava.api.model.Info;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
 
 public class InfoCmdExec extends AbstrSyncDockerCmdExec<InfoCmd, Info> implements InfoCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(InfoCmdExec.class);
 
-    public InfoCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public InfoCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
index 9c6e34a92..68790cb69 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
@@ -1,21 +1,21 @@
 package com.github.dockerjava.jaxrs;
 
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
+import com.github.dockerjava.api.command.InspectContainerCmd;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.core.DockerClientConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.command.InspectContainerCmd;
-import com.github.dockerjava.api.command.InspectContainerResponse;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
 
 public class InspectContainerCmdExec extends AbstrSyncDockerCmdExec<InspectContainerCmd, InspectContainerResponse>
         implements InspectContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(InspectContainerCmdExec.class);
 
-    public InspectContainerCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public InspectContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
index d8310bd3a..c5127a962 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
@@ -1,20 +1,20 @@
 package com.github.dockerjava.jaxrs;
 
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
+import com.github.dockerjava.api.command.InspectExecCmd;
+import com.github.dockerjava.api.command.InspectExecResponse;
+import com.github.dockerjava.core.DockerClientConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.command.InspectExecCmd;
-import com.github.dockerjava.api.command.InspectExecResponse;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
 
 public class InspectExecCmdExec extends AbstrSyncDockerCmdExec<InspectExecCmd, InspectExecResponse> implements
         InspectExecCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(InspectExecCmdExec.class);
 
-    public InspectExecCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public InspectExecCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java
index 9148887ef..71944e12f 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java
@@ -1,21 +1,21 @@
 package com.github.dockerjava.jaxrs;
 
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
+import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.InspectImageResponse;
+import com.github.dockerjava.core.DockerClientConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.command.InspectImageCmd;
-import com.github.dockerjava.api.command.InspectImageResponse;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
 
 public class InspectImageCmdExec extends AbstrSyncDockerCmdExec<InspectImageCmd, InspectImageResponse> implements
         InspectImageCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(InspectImageCmdExec.class);
 
-    public InspectImageCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public InspectImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
index f4d2680b9..0c62aee1c 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
@@ -1,20 +1,20 @@
 package com.github.dockerjava.jaxrs;
 
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
+import com.github.dockerjava.api.command.KillContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.command.KillContainerCmd;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
 
 public class KillContainerCmdExec extends AbstrSyncDockerCmdExec<KillContainerCmd, Void> implements
         KillContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(KillContainerCmdExec.class);
 
-    public KillContainerCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public KillContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
index e1e74eec9..01afaa6c5 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
@@ -1,26 +1,25 @@
 package com.github.dockerjava.jaxrs;
 
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
-import java.util.List;
+import com.github.dockerjava.api.command.ListContainersCmd;
+import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
+import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.ListContainersCmd;
-import com.github.dockerjava.api.model.Container;
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
 
 public class ListContainersCmdExec extends AbstrSyncDockerCmdExec<ListContainersCmd, List<Container>> implements
         ListContainersCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ListContainersCmdExec.class);
 
-    public ListContainersCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public ListContainersCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
index fa8409cb8..06e7b782b 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
@@ -1,25 +1,24 @@
 package com.github.dockerjava.jaxrs;
 
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
-import java.util.List;
+import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.model.Image;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
+import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.ListImagesCmd;
-import com.github.dockerjava.api.model.Image;
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
 
 public class ListImagesCmdExec extends AbstrSyncDockerCmdExec<ListImagesCmd, List<Image>> implements ListImagesCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ListImagesCmdExec.class);
 
-    public ListImagesCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public ListImagesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
index b2c1691b6..7bce2964d 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
@@ -1,24 +1,24 @@
 package com.github.dockerjava.jaxrs;
 
-import javax.ws.rs.client.WebTarget;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.async.FrameStreamProcessor;
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
 
 public class LogContainerCmdExec extends AbstrAsyncDockerCmdExec<LogContainerCmd, Frame> implements
         LogContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LogContainerCmdExec.class);
 
-    public LogContainerCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public LogContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
index 04bb68a6f..8ba4e6b5d 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
@@ -1,20 +1,20 @@
 package com.github.dockerjava.jaxrs;
 
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
+import com.github.dockerjava.api.command.PauseContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.command.PauseContainerCmd;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
 
 public class PauseContainerCmdExec extends AbstrSyncDockerCmdExec<PauseContainerCmd, Void> implements
         PauseContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PauseContainerCmdExec.class);
 
-    public PauseContainerCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public PauseContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
index 875155c96..974ec427c 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
@@ -1,18 +1,18 @@
 package com.github.dockerjava.jaxrs;
 
-import javax.ws.rs.client.WebTarget;
-
+import com.github.dockerjava.api.command.PingCmd;
+import com.github.dockerjava.core.DockerClientConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.command.PingCmd;
+import javax.ws.rs.client.WebTarget;
 
 public class PingCmdExec extends AbstrSyncDockerCmdExec<PingCmd, Void> implements PingCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PingCmdExec.class);
 
-    public PingCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public PingCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
index dfba3c1c6..b68edeb0c 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
@@ -1,30 +1,30 @@
 package com.github.dockerjava.jaxrs;
 
-import static javax.ws.rs.client.Entity.entity;
-
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PullResponseItem;
+import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.async.JsonStreamProcessor;
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.Invocation.Builder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import static javax.ws.rs.client.Entity.entity;
 
 public class PullImageCmdExec extends AbstrAsyncDockerCmdExec<PullImageCmd, PullResponseItem> implements
         PullImageCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PullImageCmdExec.class);
 
-    public PullImageCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public PullImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     private Invocation.Builder resourceWithOptionalAuthConfig(PullImageCmd command, Invocation.Builder request) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
index 2095fd3e2..3278289a5 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
@@ -1,29 +1,29 @@
 package com.github.dockerjava.jaxrs;
 
-import static javax.ws.rs.client.Entity.entity;
-
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.PushImageCmd;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PushResponseItem;
+import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.async.JsonStreamProcessor;
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.Invocation.Builder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import static javax.ws.rs.client.Entity.entity;
 
 public class PushImageCmdExec extends AbstrAsyncDockerCmdExec<PushImageCmd, PushResponseItem> implements
         PushImageCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PushImageCmdExec.class);
 
-    public PushImageCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public PushImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     private String name(PushImageCmd command) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
index 2e72c37bc..b11d7d457 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
@@ -1,20 +1,20 @@
 package com.github.dockerjava.jaxrs;
 
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
+import com.github.dockerjava.api.command.RemoveContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.command.RemoveContainerCmd;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
 
 public class RemoveContainerCmdExec extends AbstrSyncDockerCmdExec<RemoveContainerCmd, Void> implements
         RemoveContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(RemoveContainerCmdExec.class);
 
-    public RemoveContainerCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public RemoveContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
index 18d477c51..7ef7058e5 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
@@ -1,18 +1,18 @@
 package com.github.dockerjava.jaxrs;
 
-import javax.ws.rs.client.WebTarget;
-
+import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.core.DockerClientConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.command.RemoveImageCmd;
+import javax.ws.rs.client.WebTarget;
 
 public class RemoveImageCmdExec extends AbstrSyncDockerCmdExec<RemoveImageCmd, Void> implements RemoveImageCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(RemoveImageCmdExec.class);
 
-    public RemoveImageCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public RemoveImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
index 0a4fced89..918dfa361 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
@@ -1,20 +1,20 @@
 package com.github.dockerjava.jaxrs;
 
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
+import com.github.dockerjava.api.command.RestartContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.command.RestartContainerCmd;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
 
 public class RestartContainerCmdExec extends AbstrSyncDockerCmdExec<RestartContainerCmd, Void> implements
         RestartContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(RestartContainerCmdExec.class);
 
-    public RestartContainerCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public RestartContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
index 39a06f15a..77604cf74 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
@@ -1,22 +1,21 @@
 package com.github.dockerjava.jaxrs;
 
-import java.io.InputStream;
+import com.github.dockerjava.api.command.SaveImageCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.SaveImageCmd;
-import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
+import java.io.InputStream;
 
 public class SaveImageCmdExec extends AbstrSyncDockerCmdExec<SaveImageCmd, InputStream> implements SaveImageCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(SaveImageCmdExec.class);
 
-    public SaveImageCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public SaveImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java
index 1de9943d9..ded7fc8c3 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java
@@ -1,24 +1,23 @@
 package com.github.dockerjava.jaxrs;
 
-import java.util.List;
+import com.github.dockerjava.api.command.SearchImagesCmd;
+import com.github.dockerjava.api.model.SearchItem;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.SearchImagesCmd;
-import com.github.dockerjava.api.model.SearchItem;
+import java.util.List;
 
 public class SearchImagesCmdExec extends AbstrSyncDockerCmdExec<SearchImagesCmd, List<SearchItem>> implements
         SearchImagesCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SearchImagesCmdExec.class);
 
-    public SearchImagesCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public SearchImagesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
index 8b41f2cd9..4d0c60111 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
@@ -1,22 +1,22 @@
 package com.github.dockerjava.jaxrs;
 
-import static javax.ws.rs.client.Entity.entity;
+import com.github.dockerjava.api.command.StartContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.StartContainerCmd;
+import static javax.ws.rs.client.Entity.entity;
 
 public class StartContainerCmdExec extends AbstrSyncDockerCmdExec<StartContainerCmd, Void> implements
         StartContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(StartContainerCmdExec.class);
 
-    public StartContainerCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public StartContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
index 10fbd1ca6..f934b895d 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
@@ -1,22 +1,22 @@
 package com.github.dockerjava.jaxrs;
 
-import javax.ws.rs.client.WebTarget;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.StatsCmd;
 import com.github.dockerjava.api.model.Statistics;
+import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.async.JsonStreamProcessor;
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
 
 public class StatsCmdExec extends AbstrAsyncDockerCmdExec<StatsCmd, Statistics> implements StatsCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(StatsCmdExec.class);
 
-    public StatsCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public StatsCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
index ca6ad3537..8805be6d0 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
@@ -1,20 +1,20 @@
 package com.github.dockerjava.jaxrs;
 
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
+import com.github.dockerjava.api.command.StopContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.command.StopContainerCmd;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
 
 public class StopContainerCmdExec extends AbstrSyncDockerCmdExec<StopContainerCmd, Void> implements
         StopContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(StopContainerCmdExec.class);
 
-    public StopContainerCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public StopContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
index f697b22b2..ca9249eb3 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
@@ -1,18 +1,18 @@
 package com.github.dockerjava.jaxrs;
 
-import javax.ws.rs.client.WebTarget;
-
+import com.github.dockerjava.api.command.TagImageCmd;
+import com.github.dockerjava.core.DockerClientConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.command.TagImageCmd;
+import javax.ws.rs.client.WebTarget;
 
 public class TagImageCmdExec extends AbstrSyncDockerCmdExec<TagImageCmd, Void> implements TagImageCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TagImageCmdExec.class);
 
-    public TagImageCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public TagImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
index 32c9cbc63..46a139e39 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
@@ -1,22 +1,22 @@
 package com.github.dockerjava.jaxrs;
 
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
+import com.github.dockerjava.api.command.TopContainerCmd;
+import com.github.dockerjava.api.command.TopContainerResponse;
+import com.github.dockerjava.core.DockerClientConfig;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.command.TopContainerCmd;
-import com.github.dockerjava.api.command.TopContainerResponse;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
 
 public class TopContainerCmdExec extends AbstrSyncDockerCmdExec<TopContainerCmd, TopContainerResponse> implements
         TopContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TopContainerCmdExec.class);
 
-    public TopContainerCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public TopContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
index 3005f6630..375ff875f 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
@@ -1,20 +1,20 @@
 package com.github.dockerjava.jaxrs;
 
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
+import com.github.dockerjava.api.command.UnpauseContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.command.UnpauseContainerCmd;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
 
 public class UnpauseContainerCmdExec extends AbstrSyncDockerCmdExec<UnpauseContainerCmd, Void> implements
         UnpauseContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(UnpauseContainerCmdExec.class);
 
-    public UnpauseContainerCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public UnpauseContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java
index 0c1611bc4..3965e04d6 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java
@@ -1,20 +1,20 @@
 package com.github.dockerjava.jaxrs;
 
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
+import com.github.dockerjava.api.command.VersionCmd;
+import com.github.dockerjava.api.model.Version;
+import com.github.dockerjava.core.DockerClientConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.command.VersionCmd;
-import com.github.dockerjava.api.model.Version;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
 
 public class VersionCmdExec extends AbstrSyncDockerCmdExec<VersionCmd, Version> implements VersionCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(VersionCmdExec.class);
 
-    public VersionCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public VersionCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
index a916e1b5b..16dab933d 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
@@ -1,21 +1,21 @@
 package com.github.dockerjava.jaxrs;
 
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.github.dockerjava.api.command.WaitContainerCmd;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
 
 public class WaitContainerCmdExec extends AbstrSyncDockerCmdExec<WaitContainerCmd, Integer> implements
         WaitContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(WaitContainerCmdExec.class);
 
-    public WaitContainerCmdExec(WebTarget baseResource) {
-        super(baseResource);
+    public WaitContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
     }
 
     @Override
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
index 9597b97d7..e66cfa57d 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.core;
 
-import static org.testng.Assert.assertEquals;
+import com.github.dockerjava.api.model.AuthConfig;
+import org.testng.annotations.Test;
 
 import java.net.URI;
 import java.util.Collections;
@@ -8,9 +9,7 @@
 import java.util.Map;
 import java.util.Properties;
 
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.model.AuthConfig;
+import static org.testng.Assert.assertEquals;
 
 public class DockerClientConfigTest {
 
@@ -25,7 +24,7 @@ private static DockerClientConfig newExampleConfig() {
     public void string() throws Exception {
         assertEquals(
                 EXAMPLE_CONFIG.toString(),
-                "DockerClientConfig{uri=http://foo, version='bar', username='baz', password='qux', email='blam', serverAddress='wham', dockerCfgPath='flam', sslConfig='LocalDirectorySSLConfig{dockerCertPath=flim}'}");
+                "DockerClientConfig{uri=http://foo, version='{UNKNOWN_VERSION}', username='baz', password='qux', email='blam', serverAddress='wham', dockerCfgPath='flam', sslConfig='LocalDirectorySSLConfig{dockerCertPath=flim}'}");
     }
 
     @Test
@@ -159,7 +158,7 @@ public void defaults() throws Exception {
         assertEquals(config.getUri(), URI.create("https://localhost:2376"));
         assertEquals(config.getUsername(), "someUserName");
         assertEquals(config.getServerAddress(), AuthConfig.DEFAULT_SERVER_ADDRESS);
-        assertEquals(config.getVersion(), null);
+        assertEquals(config.getVersion(), RemoteApiVersion.unknown());
         assertEquals(config.getDockerCfgPath(), "someHomeDir/.dockercfg");
         assertEquals(((LocalDirectorySSLConfig) config.getSslConfig()).getDockerCertPath(), "someHomeDir/.docker");
     }
@@ -185,4 +184,4 @@ public void systemProperties() throws Exception {
         assertEquals(config, EXAMPLE_CONFIG);
 
     }
-}
\ No newline at end of file
+}

From e1a16509ed942afdf143ef3e6ffec49bd10acf67 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 7 Oct 2015 22:50:06 +0200
Subject: [PATCH 0245/1272] Remove deprecated config option

---
 src/main/resources/docker.io.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/resources/docker.io.properties b/src/main/resources/docker.io.properties
index 6f0bfc86c..30ba2b62a 100644
--- a/src/main/resources/docker.io.properties
+++ b/src/main/resources/docker.io.properties
@@ -1,5 +1,4 @@
 docker.io.url=https://localhost:2376
-docker.io.enableLoggingFilter=true
 docker.io.dockerCertPath=${user.home}/.docker
 docker.io.dockerCfgPath=${user.home}/.dockercfg
 docker.io.username=${user.name}

From ffe7cc4fc0e4e2eb555715e15a910dc3442162f7 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 7 Oct 2015 22:51:11 +0200
Subject: [PATCH 0246/1272] pin API version for integration tests

---
 .../github/dockerjava/client/AbstractDockerClientTest.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index e8dfa9bd7..e8c98d902 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -38,6 +38,8 @@ public abstract class AbstractDockerClientTest extends Assert {
 
     public static final Logger LOG = LoggerFactory.getLogger(AbstractDockerClientTest.class);
 
+    private String apiVersion = "1.19";
+
     protected DockerClient dockerClient;
 
     protected TestDockerCmdExecFactory dockerCmdExecFactory = new TestDockerCmdExecFactory(
@@ -68,7 +70,8 @@ protected DockerClientConfig config(String password) {
         if (password != null) {
             builder = builder.withPassword(password);
         }
-        return builder.build();
+
+        return builder.withVersion(apiVersion).build();
     }
 
     public void afterTest() {

From 9d20d12533336de944b9311b80c754f47b2e7985 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 7 Oct 2015 22:52:15 +0200
Subject: [PATCH 0247/1272] Format sources

---
 .../api/command/CreateContainerCmd.java       |  3 +--
 .../dockerjava/core/DockerClientImpl.java     |  6 ++----
 .../dockerjava/core/RemoteApiVersion.java     | 19 +++++++++++--------
 .../dockerjava/jaxrs/AbstrDockerCmdExec.java  |  1 +
 .../dockerjava/jaxrs/BuildImageCmdExec.java   |  3 ++-
 .../jaxrs/DockerCmdExecFactoryImpl.java       |  8 ++++----
 6 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index e3ffa4996..4dba937fe 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -297,8 +297,7 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
     public CreateContainerCmd withContainerIDFile(String containerIDFile);
 
     /**
-     * Set the PID (Process) Namespace mode for the container, 'host': use the host's PID namespace
-     * inside the container
+     * Set the PID (Process) Namespace mode for the container, 'host': use the host's PID namespace inside the container
      */
     public CreateContainerCmd withPidMode(String pidMode);
 
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 2e22791cd..b00a7a7f9 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -336,14 +336,12 @@ public BuildImageCmd buildImageCmd() {
 
     @Override
     public BuildImageCmd buildImageCmd(File dockerFileOrFolder) {
-        return new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(),
-                dockerFileOrFolder);
+        return new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(), dockerFileOrFolder);
     }
 
     @Override
     public BuildImageCmd buildImageCmd(InputStream tarInputStream) {
-        return new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(),
-                tarInputStream);
+        return new BuildImageCmdImpl(getDockerCmdExecFactory().createBuildImageCmdExec(), tarInputStream);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index 7c0092971..e6b2cf6e8 100644
--- a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -18,7 +18,9 @@
 public class RemoteApiVersion {
 
     public static final RemoteApiVersion VERSION_1_19 = RemoteApiVersion.create(1, 19);
+
     private static final Pattern VERSION_REGEX = Pattern.compile("v?(\\d+)\\.(\\d+)");
+
     private static final RemoteApiVersion UNKNOWN_VERSION = new RemoteApiVersion(0, 0) {
 
         @Override
@@ -36,8 +38,11 @@ public String asWebPathPart() {
             return "";
         }
     };
+
     private final int major;
+
     private final int minor;
+
     private RemoteApiVersion(final int major, final int minor) {
         this.major = major;
         this.minor = minor;
@@ -85,11 +90,12 @@ public boolean isGreaterOrEqual(final RemoteApiVersion other) {
 
     @Override
     public boolean equals(final Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         final RemoteApiVersion that = (RemoteApiVersion) o;
-        return Objects.equal(major, that.major) &&
-                Objects.equal(minor, that.minor);
+        return Objects.equal(major, that.major) && Objects.equal(minor, that.minor);
     }
 
     @Override
@@ -99,10 +105,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("major", major)
-                .add("minor", minor)
-                .toString();
+        return MoreObjects.toStringHelper(this).add("major", major).add("minor", minor).toString();
     }
 
     public String asWebPathPart() {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
index e20f480b6..2ac9835bc 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
@@ -15,6 +15,7 @@
 public abstract class AbstrDockerCmdExec {
 
     private final DockerClientConfig dockerClientConfig;
+
     private final WebTarget baseResource;
 
     public AbstrDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index fa04875f1..4f1a198d2 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -35,7 +35,8 @@ private Invocation.Builder resourceWithOptionalAuthConfig(BuildImageCmd command,
         return request;
     }
 
-    private static AuthConfigurations firstNonNull(final AuthConfigurations fromCommand, final AuthConfigurations fromConfig) {
+    private static AuthConfigurations firstNonNull(final AuthConfigurations fromCommand,
+            final AuthConfigurations fromConfig) {
         if (fromCommand != null) {
             return fromCommand;
         }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index 11381a494..c331f461c 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -167,9 +167,8 @@ public void init(DockerClientConfig dockerClientConfig) {
         if (originalUri.getScheme().equals("unix")) {
             dockerClientConfig.setUri(UnixConnectionSocketFactory.sanitizeUri(originalUri));
         }
-        WebTarget webResource = client.target(dockerClientConfig.getUri());
 
-        baseResource = webResource.path(dockerClientConfig.getVersion().asWebPathPart());
+        baseResource = client.target(dockerClientConfig.getUri()).path(dockerClientConfig.getVersion().asWebPathPart());
 
         this.dockerClientConfig = dockerClientConfig;
     }
@@ -189,9 +188,10 @@ protected WebTarget getBaseResource() {
         checkNotNull(baseResource, "Factory not initialized, baseResource not set. You probably forgot to call init()!");
         return baseResource;
     }
-    
+
     protected DockerClientConfig getDockerClientConfig() {
-        checkNotNull(dockerClientConfig, "Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!");
+        checkNotNull(dockerClientConfig,
+                "Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!");
         return dockerClientConfig;
     }
 

From 135cfe5a218b6c40d144c47c6ac313699d497dfd Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Wed, 7 Oct 2015 23:01:34 +0200
Subject: [PATCH 0248/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7738add8c..01bb822bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@ Change Log
 ===
 Latest SNAPSHOT version
 ---
+* [#335] (https://github.com/docker-java/docker-java/pull/335) Improve backward-compatibility support for older API versions
 * [#333] (https://github.com/docker-java/docker-java/pull/333) Adding support for withPidMode 
 
 v2.1.1

From 0084979e367e64848a25b3015d7202eac5beef9d Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 10 Oct 2015 17:10:58 +0300
Subject: [PATCH 0249/1272] Add findbugs maven plugin

---
 pom.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pom.xml b/pom.xml
index d30c04212..4d9aa45b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -373,6 +373,25 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>findbugs-maven-plugin</artifactId>
+				<version>3.0.2</version>
+				<configuration>
+					<effort>Max</effort>
+					<threshold>Low</threshold>
+					<xmlOutput>true</xmlOutput>
+					<!-- until all will be fixed -->
+					<failOnError>false</failOnError>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 

From 7452d6d1afa2d2ba8bb8f8f4e198f1e46f111f53 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 10 Oct 2015 17:12:39 +0300
Subject: [PATCH 0250/1272] =?UTF-8?q?PMD:=C2=A0Consider=20simply=20returni?=
 =?UTF-8?q?ng=20the=20value=20vs=20storing=20it=20in=20local=20variable=20?=
 =?UTF-8?q?'message'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
index fc01327c2..3d581a0b0 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
@@ -83,8 +83,7 @@ private String getBodyAsMessage(ClientResponseContext responseContext) throws IO
                 if (charset == null) {
                     charset = Charset.defaultCharset();
                 }
-                String message = new String(buffer, charset);
-                return message;
+                return new String(buffer, charset);
             }
         }
         return null;

From 39339b9ca64ffad7a76f05f500fef0c03ed664a8 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 10 Oct 2015 17:13:24 +0300
Subject: [PATCH 0251/1272] Add checkfornull annotation

---
 .../dockerjava/core/command/BuildImageResultCallback.java      | 3 +++
 .../dockerjava/core/command/PullImageResultCallback.java       | 3 +++
 .../dockerjava/core/command/PushImageResultCallback.java       | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
index ae36a63d7..9f501c8c6 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
@@ -12,6 +12,8 @@
 import com.github.dockerjava.api.model.BuildResponseItem;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
 
+import javax.annotation.CheckForNull;
+
 /**
  *
  * @author marcus
@@ -21,6 +23,7 @@ public class BuildImageResultCallback extends ResultCallbackTemplate<BuildImageR
 
     private final static Logger LOGGER = LoggerFactory.getLogger(BuildImageResultCallback.class);
 
+    @CheckForNull
     private BuildResponseItem latestItem = null;
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
index 1924759bd..956a088a3 100644
--- a/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
@@ -10,6 +10,8 @@
 import com.github.dockerjava.api.model.PullResponseItem;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
 
+import javax.annotation.CheckForNull;
+
 /**
  *
  * @author marcus
@@ -19,6 +21,7 @@ public class PullImageResultCallback extends ResultCallbackTemplate<PullImageRes
 
     private final static Logger LOGGER = LoggerFactory.getLogger(PullImageResultCallback.class);
 
+    @CheckForNull
     private PullResponseItem latestItem = null;
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
index 2b80a244e..b13b444ca 100644
--- a/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
@@ -10,6 +10,8 @@
 import com.github.dockerjava.api.model.PushResponseItem;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
 
+import javax.annotation.CheckForNull;
+
 /**
  *
  * @author marcus
@@ -19,6 +21,7 @@ public class PushImageResultCallback extends ResultCallbackTemplate<PushImageRes
 
     private final static Logger LOGGER = LoggerFactory.getLogger(PushImageResultCallback.class);
 
+    @CheckForNull
     private PushResponseItem latestItem = null;
 
     @Override

From 6a58761cafc0a95a213df5a372971416a6930b3a Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 10 Oct 2015 17:19:02 +0300
Subject: [PATCH 0252/1272] Close streams

---
 .../java/com/github/dockerjava/core/DockerClientConfig.java  | 5 +++--
 .../java/com/github/dockerjava/core/KeystoreSSLConfig.java   | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index 6e16c6557..6187be49c 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -9,6 +9,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.Serializable;
 import java.net.URI;
 import java.util.Collections;
@@ -85,9 +86,9 @@ public class DockerClientConfig implements Serializable {
     }
 
     private static Properties loadIncludedDockerProperties(Properties systemProperties) {
-        try {
+        try (InputStream is = DockerClientConfig.class.getResourceAsStream("/" + DOCKER_IO_PROPERTIES_PROPERTY)) {
             Properties p = new Properties();
-            p.load(DockerClientConfig.class.getResourceAsStream("/" + DOCKER_IO_PROPERTIES_PROPERTY));
+            p.load(is);
             replaceProperties(p, systemProperties);
             return p;
         } catch (IOException e) {
diff --git a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
index d7a17cfab..dc9defbfb 100644
--- a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
@@ -57,7 +57,9 @@ public KeystoreSSLConfig(File pfxFile, String password) throws KeyStoreException
         checkNotNull(pfxFile);
         checkNotNull(password);
         keystore = KeyStore.getInstance("pkcs12");
-        keystore.load(new FileInputStream(pfxFile), password.toCharArray());
+        try (FileInputStream fs = new FileInputStream(pfxFile)) {
+            keystore.load(fs, password.toCharArray());
+        }
         keystorePassword = password;
     }
 

From 92ac07d74ed121d8fcac7d3a8dd83e81cf928e4d Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 10 Oct 2015 17:20:31 +0300
Subject: [PATCH 0253/1272] PMD: merge nested ifs

---
 .../github/dockerjava/core/CompressArchiveUtil.java    |  6 ++----
 .../com/github/dockerjava/core/GoLangFileMatch.java    |  7 ++-----
 .../com/github/dockerjava/core/RemoteApiVersion.java   |  6 ++----
 .../dockerjava/jaxrs/connector/ApacheConnector.java    | 10 ++++------
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
index 59dec59ef..c64d07b7d 100644
--- a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
+++ b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
@@ -25,10 +25,8 @@ public static File archiveTARFiles(File base, Iterable<File> files, String archi
                 TarArchiveEntry tarEntry = new TarArchiveEntry(file);
                 tarEntry.setName(relativize(base, file));
 
-                if (!file.isDirectory()) {
-                    if (file.canExecute()) {
-                        tarEntry.setMode(tarEntry.getMode() | 0755);
-                    }
+                if (!file.isDirectory() && file.canExecute()) {
+                    tarEntry.setMode(tarEntry.getMode() | 0755);
                 }
 
                 tos.putArchiveEntry(tarEntry);
diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index afe4b9843..6ebdd604b 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -113,11 +113,8 @@ static ScanResult scanChunk(String pattern) {
         Scan: for (i = 0; i < pattern.length(); i++) {
             switch (pattern.charAt(i)) {
             case '\\': {
-                if (!IS_WINDOWS) {
-                    // error check handled in matchChunk: bad pattern.
-                    if (i + 1 < pattern.length()) {
-                        i++;
-                    }
+                if (!IS_WINDOWS && i + 1 < pattern.length()) {
+                    i++;
                 }
                 break;
             }
diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index e6b2cf6e8..81db242cd 100644
--- a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -80,10 +80,8 @@ public static RemoteApiVersion parseConfigWithDefault(final String version) {
     }
 
     public boolean isGreaterOrEqual(final RemoteApiVersion other) {
-        if (major >= other.major) {
-            if (minor >= other.minor) {
-                return true;
-            }
+        if (major >= other.major && minor >= other.minor) {
+            return true;
         }
         return false;
     }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
index f989133f7..f7c830902 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
@@ -213,12 +213,10 @@ class ApacheConnector implements Connector {
         if (config != null) {
             final Object connectionManager = config.getProperties().get(ApacheClientProperties.CONNECTION_MANAGER);
 
-            if (connectionManager != null) {
-                if (!(connectionManager instanceof HttpClientConnectionManager)) {
-                    LOGGER.log(Level.WARNING, LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
-                            ApacheClientProperties.CONNECTION_MANAGER, connectionManager.getClass().getName(),
-                            HttpClientConnectionManager.class.getName()));
-                }
+            if (connectionManager != null && !(connectionManager instanceof HttpClientConnectionManager)) {
+                LOGGER.log(Level.WARNING, LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
+                        ApacheClientProperties.CONNECTION_MANAGER, connectionManager.getClass().getName(),
+                        HttpClientConnectionManager.class.getName()));
             }
 
             reqConfig = config.getProperties().get(ApacheClientProperties.REQUEST_CONFIG);

From 51c580ed0ec8b3007bf2c60d8649b1594dfa40c5 Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Tue, 13 Oct 2015 11:20:11 +0200
Subject: [PATCH 0254/1272] Implement equals/hashCode for Filters

---
 .../github/dockerjava/api/model/Filters.java  | 17 ++++++++
 .../dockerjava/api/model/FiltersTest.java     | 43 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 src/test/java/com/github/dockerjava/api/model/FiltersTest.java

diff --git a/src/main/java/com/github/dockerjava/api/model/Filters.java b/src/main/java/com/github/dockerjava/api/model/Filters.java
index b912b541a..227545e22 100644
--- a/src/main/java/com/github/dockerjava/api/model/Filters.java
+++ b/src/main/java/com/github/dockerjava/api/model/Filters.java
@@ -92,6 +92,22 @@ private static List<String> labelsMapToList(Map<String, String> labels) {
         return result;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Filters filters1 = (Filters) o;
+
+        return filters.equals(filters1.filters);
+
+    }
+
+    @Override
+    public int hashCode() {
+        return filters.hashCode();
+    }
+
     @Override
     public String toString() {
         try {
@@ -100,4 +116,5 @@ public String toString() {
             throw new RuntimeException(e);
         }
     }
+
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/FiltersTest.java b/src/test/java/com/github/dockerjava/api/model/FiltersTest.java
new file mode 100644
index 000000000..1572553e6
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/api/model/FiltersTest.java
@@ -0,0 +1,43 @@
+package com.github.dockerjava.api.model;
+
+import com.google.common.collect.Maps;
+import org.testng.annotations.Test;
+
+import java.util.Map;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotSame;
+
+/**
+ * @author Vincent Latombe <vincent@latombe.net>
+ */
+public class FiltersTest {
+
+    @Test
+    public void newFiltersShouldBeEquals() {
+        assertEquals(new Filters(), new Filters());
+    }
+
+    @Test
+    public void filtersWithEqualContentShouldBeEquals() {
+        assertEquals(new Filters().withContainers("foo"), new Filters().withContainers("foo"));
+        assertEquals(new Filters().withLabels("alpha=val"), new Filters().withLabels("alpha=val"));
+    }
+
+    @Test
+    public void withLabelsMapShouldBeEquivalentToVarargs() {
+        Map<String, String> map = Maps.newHashMap();
+        map.put("alpha", "val");
+        assertEquals(new Filters().withLabels("alpha=val"), new Filters().withLabels(map));
+
+        map = Maps.newHashMap();
+        map.put("alpha", "val");
+        map.put("beta", "val1");
+        assertEquals(new Filters().withLabels("alpha=val", "beta=val1"), new Filters().withLabels(map));
+    }
+
+    @Test
+    public void filtersWithDifferentContentShouldntBeEquals() {
+        assertNotSame(new Filters().withContainers("foo"), new Filters().withContainers("bar"));
+    }
+}

From 4bd788f90814e1000a30a0619253647c8f8a4be3 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 16 Oct 2015 22:01:56 +0200
Subject: [PATCH 0255/1272] use latest testng version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d30c04212..280138916 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
 
 		<!-- test dependencies -->
 		<logback.version>1.1.0</logback.version>
-		<testng.version>5.12.1</testng.version>
+		<testng.version>6.1.1</testng.version>
 		<hamcrest.library.version>1.3</hamcrest.library.version>
 		<hamcrest.jpa-matchers>1.6</hamcrest.jpa-matchers>
 		<lambdaj.version>2.3.3</lambdaj.version>

From 546e6424c5c9b9fa6b64db25ffbc9afb7783b8cf Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 16 Oct 2015 22:02:22 +0200
Subject: [PATCH 0256/1272] format sources

---
 src/main/java/com/github/dockerjava/api/model/Filters.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/Filters.java b/src/main/java/com/github/dockerjava/api/model/Filters.java
index 227545e22..b24dd69db 100644
--- a/src/main/java/com/github/dockerjava/api/model/Filters.java
+++ b/src/main/java/com/github/dockerjava/api/model/Filters.java
@@ -94,8 +94,10 @@ private static List<String> labelsMapToList(Map<String, String> labels) {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
 
         Filters filters1 = (Filters) o;
 

From 95796f692f7967de9a1c81101949790fdb1b1cce Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 16 Oct 2015 22:02:45 +0200
Subject: [PATCH 0257/1272] Add missing hashcode tests

---
 .../dockerjava/api/model/FiltersTest.java     | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/api/model/FiltersTest.java b/src/test/java/com/github/dockerjava/api/model/FiltersTest.java
index 1572553e6..8016ec49f 100644
--- a/src/test/java/com/github/dockerjava/api/model/FiltersTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/FiltersTest.java
@@ -5,8 +5,7 @@
 
 import java.util.Map;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotSame;
+import static org.testng.Assert.*;
 
 /**
  * @author Vincent Latombe <vincent@latombe.net>
@@ -18,6 +17,11 @@ public void newFiltersShouldBeEquals() {
         assertEquals(new Filters(), new Filters());
     }
 
+    @Test
+    public void newFiltersShouldHaveEqualHashcode() {
+        assertEquals(new Filters().hashCode(), new Filters().hashCode());
+    }
+
     @Test
     public void filtersWithEqualContentShouldBeEquals() {
         assertEquals(new Filters().withContainers("foo"), new Filters().withContainers("foo"));
@@ -25,7 +29,13 @@ public void filtersWithEqualContentShouldBeEquals() {
     }
 
     @Test
-    public void withLabelsMapShouldBeEquivalentToVarargs() {
+    public void filtersWithEqualContentShouldHaveEqualHashcode() {
+        assertEquals(new Filters().withContainers("foo").hashCode(), new Filters().withContainers("foo").hashCode());
+        assertEquals(new Filters().withLabels("alpha=val").hashCode(), new Filters().withLabels("alpha=val").hashCode());
+    }
+
+    @Test
+    public void withLabelsMapShouldBeEqualsToVarargs() {
         Map<String, String> map = Maps.newHashMap();
         map.put("alpha", "val");
         assertEquals(new Filters().withLabels("alpha=val"), new Filters().withLabels(map));
@@ -38,6 +48,11 @@ public void withLabelsMapShouldBeEquivalentToVarargs() {
 
     @Test
     public void filtersWithDifferentContentShouldntBeEquals() {
-        assertNotSame(new Filters().withContainers("foo"), new Filters().withContainers("bar"));
+        assertNotEquals(new Filters().withContainers("foo"), new Filters().withContainers("bar"));
+    }
+
+    @Test
+    public void filtersWithDifferentContentShouldntHaveEqualHashcode() {
+        assertNotEquals(new Filters().withContainers("foo").hashCode(), new Filters().withContainers("bar").hashCode());
     }
 }

From 520ed0f966400db1df881b85f497e99fc6bda74e Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 16 Oct 2015 22:26:50 +0200
Subject: [PATCH 0258/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01bb822bb..969f6583c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@ Change Log
 ===
 Latest SNAPSHOT version
 ---
+* [#344] (https://github.com/docker-java/docker-java/pull/344) Implement equals/hashCode for Filters
 * [#335] (https://github.com/docker-java/docker-java/pull/335) Improve backward-compatibility support for older API versions
 * [#333] (https://github.com/docker-java/docker-java/pull/333) Adding support for withPidMode 
 

From cae292401b3fc227c66e23a51de4d048e6e6dee6 Mon Sep 17 00:00:00 2001
From: VU Minh Khang <minh.khang.vu.mkv@gmail.com>
Date: Sat, 17 Oct 2015 18:47:32 +0200
Subject: [PATCH 0259/1272] Implementations of Copy file to container command
 Modification of Copy file from container command to follow 1.20 API

---
 .../github/dockerjava/api/DockerClient.java   |  3 +
 .../api/command/DockerCmdExecFactory.java     |  4 +-
 .../dockerjava/core/CompressArchiveUtil.java  | 59 +++++++++++
 .../dockerjava/core/DockerClientImpl.java     | 23 +++--
 .../github/dockerjava/core/FilePathUtil.java  | 26 ++++-
 .../github/dockerjava/core/TarDirWalker.java  | 46 +++++++++
 .../command/CopyFileFromContainerCmdImpl.java | 10 +-
 .../core/command/CopyFileToContainerCmd.java  | 62 ++++++++++++
 .../command/CopyFileToContainerCmdImpl.java   | 97 +++++++++++++++++++
 .../jaxrs/CopyFileFromContainerCmdExec.java   | 22 ++---
 .../jaxrs/CopyFileToContainerCmdExec.java     | 57 +++++++++++
 .../jaxrs/DockerCmdExecFactoryImpl.java       |  6 ++
 .../client/AbstractDockerClientTest.java      |  2 +-
 .../core/TestDockerCmdExecFactory.java        |  7 +-
 .../CopyFileToContainerCmdImplTest.java       | 70 +++++++++++++
 15 files changed, 458 insertions(+), 36 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/core/TarDirWalker.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/CopyFileToContainerCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/CopyFileToContainerCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/CopyFileToContainerCmdExec.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/CopyFileToContainerCmdImplTest.java

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 8b578f08e..79bd8dac0 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -43,6 +43,7 @@
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Identifier;
+import com.github.dockerjava.core.command.CopyFileToContainerCmd;
 
 // https://godoc.org/github.com/fsouza/go-dockerclient
 public interface DockerClient extends Closeable {
@@ -120,6 +121,8 @@ public interface DockerClient extends Closeable {
 
     public CopyFileFromContainerCmd copyFileFromContainerCmd(String containerId, String resource);
 
+    public CopyFileToContainerCmd copyFileToContainerCmd(String containerId, String hostResource);
+
     public ContainerDiffCmd containerDiffCmd(String containerId);
 
     public StopContainerCmd stopContainerCmd(String containerId);
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index fc750a743..33581c0e7 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -4,6 +4,7 @@
 import java.io.IOException;
 
 import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.command.CopyFileToContainerCmd;
 
 public interface DockerCmdExecFactory extends Closeable {
 
@@ -57,6 +58,8 @@ public interface DockerCmdExecFactory extends Closeable {
 
     public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec();
 
+    public CopyFileToContainerCmd.Exec createCopyFileToContainerCmdExec();
+
     public StopContainerCmd.Exec createStopContainerCmdExec();
 
     public ContainerDiffCmd.Exec createContainerDiffCmdExec();
@@ -83,5 +86,4 @@ public interface DockerCmdExecFactory extends Closeable {
 
     @Override
     public void close() throws IOException;
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
index c64d07b7d..de86ecc5c 100644
--- a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
+++ b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
@@ -2,18 +2,77 @@
 
 import static com.github.dockerjava.core.FilePathUtil.relativize;
 
+import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.zip.GZIPOutputStream;
 
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
+import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
 import org.apache.commons.io.FileUtils;
 
+import com.google.common.io.ByteStreams;
+import com.google.common.io.Closeables;
+
 public class CompressArchiveUtil {
 
+    static void putTarEntry(TarArchiveOutputStream tarOutputStream, TarArchiveEntry tarEntry, Path file) throws IOException {
+        tarEntry.setSize(Files.size(file));
+        tarOutputStream.putArchiveEntry(tarEntry);
+        InputStream input = new BufferedInputStream(Files.newInputStream(file));
+        try {
+            ByteStreams.copy(input, tarOutputStream);
+            tarOutputStream.closeArchiveEntry();
+        } finally {
+            input.close();
+        }
+    }
+
+    /**
+     * Recursively tar file
+     *
+     * @param inputPath    file path can be directory
+     * @param outputPath   where to put the archived file
+     * @param childrenOnly if inputPath is directory and if childrenOnly is true, the archive will contain all of its children, else the archive contains unique
+     *                     entry which is the inputPath itself
+     * @param gZipped      compress with gzip algorithm
+     */
+    public static void tar(Path inputPath, Path outputPath, boolean gZipped, boolean childrenOnly) throws IOException {
+        if (!Files.exists(inputPath)) {
+            throw new FileNotFoundException("File not found " + inputPath);
+        }
+        FileUtils.touch(outputPath.toFile());
+        OutputStream outputStream = new BufferedOutputStream(Files.newOutputStream(outputPath));
+        if (gZipped) {
+            outputStream = new GzipCompressorOutputStream(outputStream);
+        }
+        TarArchiveOutputStream tarArchiveOutputStream = new TarArchiveOutputStream(outputStream);
+        tarArchiveOutputStream.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
+        try {
+            if (!Files.isDirectory(inputPath)) {
+                putTarEntry(tarArchiveOutputStream, new TarArchiveEntry(inputPath.getFileName().toString()), inputPath);
+            } else {
+                Path sourcePath = inputPath;
+                if (!childrenOnly) {
+                    // In order to have the dossier as the root entry
+                    sourcePath = inputPath.getParent();
+                }
+                Files.walkFileTree(inputPath, new TarDirWalker(sourcePath, tarArchiveOutputStream));
+            }
+            tarArchiveOutputStream.flush();
+        } finally {
+            Closeables.close(tarArchiveOutputStream, true);
+        }
+    }
+
     public static File archiveTARFiles(File base, Iterable<File> files, String archiveNameWithOutExtension)
             throws IOException {
         File tarFile = new File(FileUtils.getTempDirectoryPath(), archiveNameWithOutExtension + ".tar");
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index b00a7a7f9..9725116f6 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -1,5 +1,12 @@
 package com.github.dockerjava.core;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd;
@@ -46,6 +53,8 @@
 import com.github.dockerjava.core.command.CommitCmdImpl;
 import com.github.dockerjava.core.command.ContainerDiffCmdImpl;
 import com.github.dockerjava.core.command.CopyFileFromContainerCmdImpl;
+import com.github.dockerjava.core.command.CopyFileToContainerCmd;
+import com.github.dockerjava.core.command.CopyFileToContainerCmdImpl;
 import com.github.dockerjava.core.command.CreateContainerCmdImpl;
 import com.github.dockerjava.core.command.CreateImageCmdImpl;
 import com.github.dockerjava.core.command.EventsCmdImpl;
@@ -77,16 +86,8 @@
 import com.github.dockerjava.core.command.VersionCmdImpl;
 import com.github.dockerjava.core.command.WaitContainerCmdImpl;
 
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * @author Konstantin Pelykh (kpelykh@gmail.com)
- *
  * @see "https://github.com/docker/docker/blob/master/api/client/commands.go"
  */
 public class DockerClientImpl implements Closeable, DockerClient {
@@ -304,6 +305,12 @@ public CopyFileFromContainerCmd copyFileFromContainerCmd(String containerId, Str
                 containerId, resource);
     }
 
+    @Override
+    public CopyFileToContainerCmd copyFileToContainerCmd(String containerId, String hostResource) {
+        return new CopyFileToContainerCmdImpl(getDockerCmdExecFactory().createCopyFileToContainerCmdExec(),
+                containerId, hostResource);
+    }
+
     @Override
     public ContainerDiffCmd containerDiffCmd(String containerId) {
         return new ContainerDiffCmdImpl(getDockerCmdExecFactory().createContainerDiffCmdExec(), containerId);
diff --git a/src/main/java/com/github/dockerjava/core/FilePathUtil.java b/src/main/java/com/github/dockerjava/core/FilePathUtil.java
index b02821bde..94e7fd9be 100644
--- a/src/main/java/com/github/dockerjava/core/FilePathUtil.java
+++ b/src/main/java/com/github/dockerjava/core/FilePathUtil.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
 
 import com.github.dockerjava.api.DockerClientException;
 
@@ -9,11 +10,9 @@ public class FilePathUtil {
 
     /**
      * Return the relative path. Path elements are separated with / char.
-     * 
-     * @param baseDir
-     *            a parent directory of {@code file}
-     * @param file
-     *            the file to get the relative path
+     *
+     * @param baseDir a parent directory of {@code file}
+     * @param file    the file to get the relative path
      * @return the relative path
      */
     public static String relativize(File baseDir, File file) {
@@ -26,4 +25,21 @@ public static String relativize(File baseDir, File file) {
             throw new DockerClientException(e.getMessage(), e);
         }
     }
+
+    /**
+     * Return the relative path. Path elements are separated with / char.
+     *
+     * @param baseDir a parent directory of {@code file}
+     * @param file    the file to get the relative path
+     * @return the relative path
+     */
+    public static String relativize(Path baseDir, Path file) {
+        String path = baseDir.toUri().relativize(file.toUri()).getPath();
+        if (!"/".equals(baseDir.getFileSystem().getSeparator())) {
+            // For windows
+            return path.replace(baseDir.getFileSystem().getSeparator(), "/");
+        } else {
+            return path;
+        }
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/TarDirWalker.java b/src/main/java/com/github/dockerjava/core/TarDirWalker.java
new file mode 100644
index 000000000..091d9d3a6
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/TarDirWalker.java
@@ -0,0 +1,46 @@
+package com.github.dockerjava.core;
+
+import static com.github.dockerjava.core.FilePathUtil.relativize;
+
+import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
+
+import com.google.common.io.Closeables;
+
+public class TarDirWalker extends SimpleFileVisitor<Path> {
+
+    private Path basePath;
+
+    private TarArchiveOutputStream tarArchiveOutputStream;
+
+    public TarDirWalker(Path basePath, TarArchiveOutputStream tarArchiveOutputStream) {
+        this.basePath = basePath;
+        this.tarArchiveOutputStream = tarArchiveOutputStream;
+    }
+
+    @Override
+    public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+        if (!dir.equals(basePath)) {
+            tarArchiveOutputStream.putArchiveEntry(new TarArchiveEntry(relativize(basePath, dir)));
+        }
+        return FileVisitResult.CONTINUE;
+    }
+
+    @Override
+    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+        CompressArchiveUtil.putTarEntry(tarArchiveOutputStream, new TarArchiveEntry(relativize(basePath, file)), file);
+        return FileVisitResult.CONTINUE;
+    }
+
+    @Override
+    public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
+        Closeables.close(tarArchiveOutputStream, true);
+        throw exc;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
index ef5f86a7a..e8e2503e1 100644
--- a/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
@@ -6,24 +6,19 @@
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
 
 /**
- *
  * Copy files or folders from a container.
- *
  */
 public class CopyFileFromContainerCmdImpl extends AbstrDockerCmd<CopyFileFromContainerCmd, InputStream> implements
         CopyFileFromContainerCmd {
 
     private String containerId;
 
-    @JsonProperty("HostPath")
     private String hostPath = ".";
 
-    @JsonProperty("Resource")
     private String resource;
 
     public CopyFileFromContainerCmdImpl(CopyFileFromContainerCmd.Exec exec, String containerId, String resource) {
@@ -70,12 +65,11 @@ public CopyFileFromContainerCmdImpl withHostPath(String hostPath) {
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this).append("cp ").append(containerId).append(":").append(resource).toString();
+        return new ToStringBuilder(this).append("cp ").append(hostPath).append(" ").append(containerId).append(":").append(resource).toString();
     }
 
     /**
-     * @throws NotFoundException
-     *             No such container
+     * @throws NotFoundException No such container
      */
     @Override
     public InputStream exec() throws NotFoundException {
diff --git a/src/main/java/com/github/dockerjava/core/command/CopyFileToContainerCmd.java b/src/main/java/com/github/dockerjava/core/command/CopyFileToContainerCmd.java
new file mode 100644
index 000000000..1c66be241
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/CopyFileToContainerCmd.java
@@ -0,0 +1,62 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.command.DockerCmdSyncExec;
+import com.github.dockerjava.api.command.SyncDockerCmd;
+
+public interface CopyFileToContainerCmd extends SyncDockerCmd<Void> {
+
+    public String getContainerId();
+
+    public String getHostResource();
+
+    public boolean isNoOverwriteDirNonDir();
+
+    public boolean isDirChildrenOnly();
+
+    /**
+     * Set container's id
+     *
+     * @param containerId id of the container to copy file to
+     * @return this
+     */
+    public CopyFileToContainerCmd withContainerId(String containerId);
+
+    /**
+     * Set path to the resource on the host machine
+     *
+     * @param resource path to the resource on the host machine
+     * @return this
+     */
+    public CopyFileToContainerCmd withHostResource(String resource);
+
+    /**
+     * If set to true then it will be an error if unpacking the given content would cause an existing directory to be replaced with a non-directory and vice versa
+     *
+     * @param noOverwriteDirNonDir flag to know if non directory can be overwritten
+     * @return this
+     */
+    public CopyFileToContainerCmd withNoOverwriteDirNonDir(boolean noOverwriteDirNonDir);
+
+    /**
+     * If this flag is set to true, all children of the local directory will be copied to the remote without the root directory.
+     * For ex: if I have root/titi and root/tata and the remote path is /var/data.
+     * dirChildrenOnly = true will create /var/data/titi and /var/data/tata
+     * dirChildrenOnly = false will create /var/data/root/titi and /var/data/root/tata
+     *
+     * @param dirChildrenOnly if root directory is ignored
+     * @return this
+     */
+    public CopyFileToContainerCmd withDirChildrenOnly(boolean dirChildrenOnly);
+
+    public String getRemotePath();
+
+    public CopyFileToContainerCmd withRemotePath(String remotePath);
+
+    @Override
+    public Void exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdSyncExec<CopyFileToContainerCmd, Void> {
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/CopyFileToContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CopyFileToContainerCmdImpl.java
new file mode 100644
index 000000000..81d464b9b
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/CopyFileToContainerCmdImpl.java
@@ -0,0 +1,97 @@
+package com.github.dockerjava.core.command;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import com.github.dockerjava.api.NotFoundException;
+
+public class CopyFileToContainerCmdImpl extends AbstrDockerCmd<CopyFileToContainerCmd, Void> implements CopyFileToContainerCmd {
+
+    private String containerId;
+
+    private String remotePath = ".";
+
+    private String hostResource;
+
+    private boolean noOverwriteDirNonDir = false;
+
+    private boolean dirChildrenOnly = false;
+
+    public CopyFileToContainerCmdImpl(CopyFileToContainerCmd.Exec exec, String containerId, String hostResource) {
+        super(exec);
+        withContainerId(containerId);
+        withHostResource(hostResource);
+    }
+
+    @Override
+    public CopyFileToContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
+
+    @Override
+    public CopyFileToContainerCmd withHostResource(String hostResource) {
+        checkNotNull(hostResource, "hostResource was not specified");
+        this.hostResource = hostResource;
+        return this;
+    }
+
+    @Override
+    public String getContainerId() {
+        return this.containerId;
+    }
+
+    @Override
+    public String getHostResource() {
+        return this.hostResource;
+    }
+
+    @Override
+    public boolean isNoOverwriteDirNonDir() {
+        return this.noOverwriteDirNonDir;
+    }
+
+    @Override
+    public CopyFileToContainerCmd withNoOverwriteDirNonDir(boolean noOverwriteDirNonDir) {
+        this.noOverwriteDirNonDir = noOverwriteDirNonDir;
+        return this;
+    }
+
+    @Override
+    public CopyFileToContainerCmd withRemotePath(String remotePath) {
+        checkNotNull(remotePath, "remotePath was not specified");
+        this.remotePath = remotePath;
+        return this;
+    }
+
+    @Override
+    public String getRemotePath() {
+        return this.remotePath;
+    }
+
+    @Override
+    public boolean isDirChildrenOnly() {
+        return this.dirChildrenOnly;
+    }
+
+    @Override
+    public CopyFileToContainerCmd withDirChildrenOnly(boolean dirChildrenOnly) {
+        this.dirChildrenOnly = dirChildrenOnly;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this).append("cp ").append(hostResource).append(" ").append(containerId).append(":").append(remotePath).toString();
+    }
+
+    /**
+     * @throws NotFoundException No such container
+     */
+    @Override
+    public Void exec() throws NotFoundException {
+        return super.exec();
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
index 15185a8d8..4dec7556e 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
@@ -1,17 +1,16 @@
 package com.github.dockerjava.jaxrs;
 
-import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.io.InputStream;
 
 import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import java.io.InputStream;
 
-import static javax.ws.rs.client.Entity.entity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
 
 public class CopyFileFromContainerCmdExec extends AbstrSyncDockerCmdExec<CopyFileFromContainerCmd, InputStream>
         implements CopyFileFromContainerCmd.Exec {
@@ -24,13 +23,12 @@ public CopyFileFromContainerCmdExec(WebTarget baseResource, DockerClientConfig d
 
     @Override
     protected InputStream execute(CopyFileFromContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/copy").resolveTemplate("id",
+        WebTarget webResource = getBaseResource().path("/containers/{id}/archive").resolveTemplate("id",
                 command.getContainerId());
 
-        LOGGER.trace("POST: " + webResource.toString());
+        LOGGER.trace("Get: " + webResource.toString());
 
-        Response response = webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE)
-                .post(entity(command, MediaType.APPLICATION_JSON));
+        Response response = webResource.queryParam("path", command.getResource()).request().accept("application/x-tar").get();
 
         return new WrappedResponseInputStream(response);
     }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CopyFileToContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CopyFileToContainerCmdExec.java
new file mode 100644
index 000000000..db44a7551
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/CopyFileToContainerCmdExec.java
@@ -0,0 +1,57 @@
+package com.github.dockerjava.jaxrs;
+
+import static javax.ws.rs.client.Entity.entity;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import javax.ws.rs.client.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.core.CompressArchiveUtil;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.command.CopyFileToContainerCmd;
+import com.google.common.io.Closeables;
+
+public class CopyFileToContainerCmdExec extends AbstrSyncDockerCmdExec<CopyFileToContainerCmd, Void> implements CopyFileToContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CopyFileFromContainerCmdExec.class);
+
+    public CopyFileToContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(CopyFileToContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/archive").resolveTemplate("id",
+                command.getContainerId());
+
+        LOGGER.trace("PUT: " + webResource.toString());
+        InputStream streamToUpload = null;
+        try {
+            Path toUpload = Files.createTempFile("docker-java", "tar.gz");
+            CompressArchiveUtil.tar(Paths.get(command.getHostResource()), toUpload, true, command.isDirChildrenOnly());
+            streamToUpload = Files.newInputStream(toUpload);
+            webResource
+                    .queryParam("path", command.getRemotePath())
+                    .queryParam("noOverwriteDirNonDir", command.isNoOverwriteDirNonDir())
+                    .request()
+                    .put(entity(streamToUpload, "application/x-tar"))
+                    .close();
+            return null;
+        } catch (IOException e) {
+            throw new DockerClientException("Error occurred while preparing uploading host resource <" + command.getHostResource() + ">", e);
+        } finally {
+            if (streamToUpload != null) {
+                Closeables.closeQuietly(streamToUpload);
+            }
+        }
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index c331f461c..24a70be4a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -41,6 +41,7 @@
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.RemoteApiVersion;
+import com.github.dockerjava.core.command.CopyFileToContainerCmd;
 import com.github.dockerjava.jaxrs.connector.ApacheConnectorProvider;
 import com.github.dockerjava.jaxrs.filter.JsonClientFilter;
 import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter;
@@ -315,6 +316,11 @@ public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
         return new CopyFileFromContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public CopyFileToContainerCmd.Exec createCopyFileToContainerCmdExec() {
+        return new CopyFileToContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public StopContainerCmd.Exec createStopContainerCmdExec() {
         return new StopContainerCmdExec(getBaseResource(), getDockerClientConfig());
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index e8c98d902..bba339991 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -38,7 +38,7 @@ public abstract class AbstractDockerClientTest extends Assert {
 
     public static final Logger LOG = LoggerFactory.getLogger(AbstractDockerClientTest.class);
 
-    private String apiVersion = "1.19";
+    private String apiVersion = "1.20";
 
     protected DockerClient dockerClient;
 
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index fdc582083..5e9f18f06 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -46,13 +46,13 @@
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.BuildResponseItem;
+import com.github.dockerjava.core.command.CopyFileToContainerCmd;
 
 /**
  * Special {@link DockerCmdExecFactory} implementation that collects container and image creations while test execution
  * for the purpose of automatically cleanup.
  *
  * @author marcus
- *
  */
 public class TestDockerCmdExecFactory implements DockerCmdExecFactory {
 
@@ -242,6 +242,11 @@ public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
         return delegate.createCopyFileFromContainerCmdExec();
     }
 
+    @Override
+    public CopyFileToContainerCmd.Exec createCopyFileToContainerCmdExec() {
+        return delegate.createCopyFileToContainerCmdExec();
+    }
+
     @Override
     public StopContainerCmd.Exec createStopContainerCmdExec() {
         return delegate.createStopContainerCmdExec();
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyFileToContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyFileToContainerCmdImplTest.java
new file mode 100644
index 000000000..445fc5696
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/CopyFileToContainerCmdImplTest.java
@@ -0,0 +1,70 @@
+package com.github.dockerjava.core.command;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.not;
+
+import java.io.InputStream;
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+import com.google.common.io.Closeables;
+
+public class CopyFileToContainerCmdImplTest extends AbstractDockerClientTest {
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void copyToContainer() throws Exception {
+        // TODO extract this into a shared method
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withName("docker-java-itest-copyFromContainer").withCmd("touch", "/copyFromContainer").exec();
+
+        LOG.info("Created container: {}", container);
+        assertThat(container.getId(), not(isEmptyOrNullString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        dockerClient.copyFileToContainerCmd(container.getId(), "src/test/resources/testReadFile").exec();
+        InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "testReadFile").exec();
+        boolean bytesAvailable = response.available() > 0;
+        assertTrue(bytesAvailable, "The file was not copied to the container.");
+        Closeables.closeQuietly(response);
+    }
+
+    @Test
+    public void copyToNonExistingContainer() throws Exception {
+        try {
+            dockerClient.copyFileFromContainerCmd("non-existing", "/test").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException ignored) {
+        }
+    }
+
+}

From 89bb406bfa52d45c6ebcb73f687d25016e7ff22c Mon Sep 17 00:00:00 2001
From: VU Minh Khang <minh.khang.vu.mkv@gmail.com>
Date: Mon, 19 Oct 2015 22:11:15 +0200
Subject: [PATCH 0260/1272] Use new try syntax for Java to free resources

---
 .../dockerjava/core/CompressArchiveUtil.java  | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
index de86ecc5c..97b05213e 100644
--- a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
+++ b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
@@ -20,22 +20,28 @@
 import org.apache.commons.io.FileUtils;
 
 import com.google.common.io.ByteStreams;
-import com.google.common.io.Closeables;
 
 public class CompressArchiveUtil {
 
     static void putTarEntry(TarArchiveOutputStream tarOutputStream, TarArchiveEntry tarEntry, Path file) throws IOException {
         tarEntry.setSize(Files.size(file));
         tarOutputStream.putArchiveEntry(tarEntry);
-        InputStream input = new BufferedInputStream(Files.newInputStream(file));
-        try {
+        try (InputStream input = new BufferedInputStream(Files.newInputStream(file))) {
             ByteStreams.copy(input, tarOutputStream);
             tarOutputStream.closeArchiveEntry();
-        } finally {
-            input.close();
         }
     }
 
+    private static TarArchiveOutputStream buildTarStream(Path outputPath, boolean gZipped) throws IOException {
+        OutputStream outputStream = new BufferedOutputStream(Files.newOutputStream(outputPath));
+        if (gZipped) {
+            outputStream = new GzipCompressorOutputStream(outputStream);
+        }
+        TarArchiveOutputStream tarArchiveOutputStream = new TarArchiveOutputStream(outputStream);
+        tarArchiveOutputStream.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
+        return tarArchiveOutputStream;
+    }
+
     /**
      * Recursively tar file
      *
@@ -50,13 +56,8 @@ public static void tar(Path inputPath, Path outputPath, boolean gZipped, boolean
             throw new FileNotFoundException("File not found " + inputPath);
         }
         FileUtils.touch(outputPath.toFile());
-        OutputStream outputStream = new BufferedOutputStream(Files.newOutputStream(outputPath));
-        if (gZipped) {
-            outputStream = new GzipCompressorOutputStream(outputStream);
-        }
-        TarArchiveOutputStream tarArchiveOutputStream = new TarArchiveOutputStream(outputStream);
-        tarArchiveOutputStream.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
-        try {
+
+        try (TarArchiveOutputStream tarArchiveOutputStream = buildTarStream(outputPath, gZipped)) {
             if (!Files.isDirectory(inputPath)) {
                 putTarEntry(tarArchiveOutputStream, new TarArchiveEntry(inputPath.getFileName().toString()), inputPath);
             } else {
@@ -68,8 +69,6 @@ public static void tar(Path inputPath, Path outputPath, boolean gZipped, boolean
                 Files.walkFileTree(inputPath, new TarDirWalker(sourcePath, tarArchiveOutputStream));
             }
             tarArchiveOutputStream.flush();
-        } finally {
-            Closeables.close(tarArchiveOutputStream, true);
         }
     }
 

From 187d88967e0d72ee314d89fe72002e8867e5f427 Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Wed, 21 Oct 2015 13:21:30 +0200
Subject: [PATCH 0261/1272] issue #349

Remove the ServiceLoader logic, as there will be only one implementation of DockerCmdExecFactory
---
 .../dockerjava/core/DockerClientBuilder.java  | 32 ++-----------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
index 28c84cab5..6aed6c358 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
@@ -1,26 +1,12 @@
 package com.github.dockerjava.core;
 
-import java.util.Iterator;
-import java.util.ServiceLoader;
-
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
 import com.github.dockerjava.core.DockerClientConfig.DockerClientConfigBuilder;
+import com.github.dockerjava.jaxrs.DockerCmdExecFactoryImpl;
 
 public class DockerClientBuilder {
 
-    private static Class<? extends DockerCmdExecFactory> factoryClass;
-
-    private static ServiceLoader<DockerCmdExecFactory> serviceLoader = ServiceLoader.load(DockerCmdExecFactory.class);
-
-    static {
-        serviceLoader.reload();
-        Iterator<DockerCmdExecFactory> iterator = serviceLoader.iterator();
-        if (iterator.hasNext()) {
-            factoryClass = iterator.next().getClass();
-        }
-    }
-
     private DockerClientImpl dockerClient = null;
 
     private DockerCmdExecFactory dockerCmdExecFactory = null;
@@ -46,16 +32,7 @@ public static DockerClientBuilder getInstance(String serverUrl) {
     }
 
     public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() {
-        if (factoryClass == null) {
-            throw new RuntimeException("Fatal: Can't find any implementation of '"
-                    + DockerCmdExecFactory.class.getName() + "' in the current classpath.");
-        }
-
-        try {
-            return factoryClass.newInstance();
-        } catch (InstantiationException | IllegalAccessException e) {
-            throw new RuntimeException("Fatal: Can't create new instance of '" + factoryClass.getName() + "'");
-        }
+        return new DockerCmdExecFactoryImpl();
     }
 
     public DockerClientBuilder withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) {
@@ -63,11 +40,6 @@ public DockerClientBuilder withDockerCmdExecFactory(DockerCmdExecFactory dockerC
         return this;
     }
 
-    public DockerClientBuilder withServiceLoaderClassLoader(ClassLoader classLoader) {
-        serviceLoader = ServiceLoader.load(DockerCmdExecFactory.class, classLoader);
-        return this;
-    }
-
     public DockerClient build() {
         if (dockerCmdExecFactory != null) {
             dockerClient.withDockerCmdExecFactory(dockerCmdExecFactory);

From c58d24a39e546832acd58b1a40ed1d6ab3f240a3 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Wed, 21 Oct 2015 21:23:40 +0200
Subject: [PATCH 0262/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 969f6583c..d881294ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@ Change Log
 ===
 Latest SNAPSHOT version
 ---
+* [#350] (https://github.com/docker-java/docker-java/pull/350) Remove ServiceLoader logic
 * [#344] (https://github.com/docker-java/docker-java/pull/344) Implement equals/hashCode for Filters
 * [#335] (https://github.com/docker-java/docker-java/pull/335) Improve backward-compatibility support for older API versions
 * [#333] (https://github.com/docker-java/docker-java/pull/333) Adding support for withPidMode 

From 90f4aba1d107ee9d721f643a0ce1cc7ef6c0570d Mon Sep 17 00:00:00 2001
From: VU Minh Khang <minh.khang.vu.mkv@gmail.com>
Date: Fri, 30 Oct 2015 18:12:32 +0100
Subject: [PATCH 0263/1272] Use java 7 to close stream

---
 .../jaxrs/CopyFileToContainerCmdExec.java      | 18 +++++++-----------
 .../CopyFileToContainerCmdImplTest.java        |  9 ++++-----
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/CopyFileToContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CopyFileToContainerCmdExec.java
index db44a7551..ca7c3d9b8 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CopyFileToContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CopyFileToContainerCmdExec.java
@@ -17,7 +17,6 @@
 import com.github.dockerjava.core.CompressArchiveUtil;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.command.CopyFileToContainerCmd;
-import com.google.common.io.Closeables;
 
 public class CopyFileToContainerCmdExec extends AbstrSyncDockerCmdExec<CopyFileToContainerCmd, Void> implements CopyFileToContainerCmd.Exec {
 
@@ -27,17 +26,19 @@ public CopyFileToContainerCmdExec(WebTarget baseResource, DockerClientConfig doc
         super(baseResource, dockerClientConfig);
     }
 
+    private InputStream buildUploadStream(CopyFileToContainerCmd command) throws IOException {
+        Path toUpload = Files.createTempFile("docker-java", ".tar.gz");
+        CompressArchiveUtil.tar(Paths.get(command.getHostResource()), toUpload, true, command.isDirChildrenOnly());
+        return Files.newInputStream(toUpload);
+    }
+
     @Override
     protected Void execute(CopyFileToContainerCmd command) {
         WebTarget webResource = getBaseResource().path("/containers/{id}/archive").resolveTemplate("id",
                 command.getContainerId());
 
         LOGGER.trace("PUT: " + webResource.toString());
-        InputStream streamToUpload = null;
-        try {
-            Path toUpload = Files.createTempFile("docker-java", "tar.gz");
-            CompressArchiveUtil.tar(Paths.get(command.getHostResource()), toUpload, true, command.isDirChildrenOnly());
-            streamToUpload = Files.newInputStream(toUpload);
+        try (InputStream streamToUpload = buildUploadStream(command)) {
             webResource
                     .queryParam("path", command.getRemotePath())
                     .queryParam("noOverwriteDirNonDir", command.isNoOverwriteDirNonDir())
@@ -47,11 +48,6 @@ protected Void execute(CopyFileToContainerCmd command) {
             return null;
         } catch (IOException e) {
             throw new DockerClientException("Error occurred while preparing uploading host resource <" + command.getHostResource() + ">", e);
-        } finally {
-            if (streamToUpload != null) {
-                Closeables.closeQuietly(streamToUpload);
-            }
         }
     }
-
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyFileToContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyFileToContainerCmdImplTest.java
index 445fc5696..7bee960b4 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyFileToContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyFileToContainerCmdImplTest.java
@@ -17,7 +17,6 @@
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
-import com.google.common.io.Closeables;
 
 public class CopyFileToContainerCmdImplTest extends AbstractDockerClientTest {
     @BeforeTest
@@ -52,10 +51,10 @@ public void copyToContainer() throws Exception {
         dockerClient.startContainerCmd(container.getId()).exec();
 
         dockerClient.copyFileToContainerCmd(container.getId(), "src/test/resources/testReadFile").exec();
-        InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "testReadFile").exec();
-        boolean bytesAvailable = response.available() > 0;
-        assertTrue(bytesAvailable, "The file was not copied to the container.");
-        Closeables.closeQuietly(response);
+        try (InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "testReadFile").exec()) {
+            boolean bytesAvailable = response.available() > 0;
+            assertTrue(bytesAvailable, "The file was not copied to the container.");
+        }
     }
 
     @Test

From 05524c0dd097979060bc5d937ecd0732ae02fc19 Mon Sep 17 00:00:00 2001
From: gandrianakis <g.andrianakis@internetq.com>
Date: Mon, 2 Nov 2015 18:44:24 +0200
Subject: [PATCH 0264/1272] Small doc fixes

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fc86bd39c..591161862 100644
--- a/README.md
+++ b/README.md
@@ -36,11 +36,11 @@ listening on TCP port. To allow Docker server to use TCP add the following line
 
     DOCKER_OPTS="-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock"
 
-However you can force docker-java to use UNIX socket communication by configure the following url:
+However you can force docker-java to use UNIX socket communication by configuring the following url:
 
     unix:///var/run/docker.sock
 
-More details setting up Docker server can be found in official documentation: http://docs.docker.io/en/latest/use/basics/
+More details about setting up Docker server can be found in official documentation: http://docs.docker.io/en/latest/use/basics/
 
 Now make sure that docker is up:
 

From 7a15817834662213b59f9c45c2b1618ea0fdb184 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 4 Nov 2015 12:22:59 +0100
Subject: [PATCH 0265/1272] Fix issue #348

---
 .../api/command/WaitContainerCmd.java         |  9 ++-
 .../dockerjava/api/model/WaitResponse.java    | 19 +++++
 .../core/async/ResultCallbackTemplate.java    | 19 ++++-
 .../core/command/WaitContainerCmdImpl.java    |  5 +-
 .../command/WaitContainerResultCallback.java  | 75 +++++++++++++++++++
 .../jaxrs/WaitContainerCmdExec.java           | 27 ++++---
 .../dockerjava/client/DockerClientTest.java   |  3 +-
 .../core/command/BuildImageCmdImplTest.java   |  2 +-
 .../command/ContainerDiffCmdImplTest.java     |  2 +-
 .../core/command/FrameReaderITest.java        |  3 +-
 .../core/command/LogContainerCmdImplTest.java | 12 +--
 .../command/RemoveContainerCmdImplTest.java   |  2 +-
 .../command/StartContainerCmdImplTest.java    |  2 +-
 .../command/WaitContainerCmdImplTest.java     | 43 +++++++++--
 14 files changed, 190 insertions(+), 33 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/WaitResponse.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java

diff --git a/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
index 2accc3af9..f92ca655a 100644
--- a/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
@@ -1,13 +1,16 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.model.BuildResponseItem;
+import com.github.dockerjava.api.model.WaitResponse;
 
 /**
  * Wait a container
  *
  * Block until container stops, then returns its exit code
  */
-public interface WaitContainerCmd extends SyncDockerCmd<Integer> {
+public interface WaitContainerCmd extends AsyncDockerCmd<WaitContainerCmd, WaitResponse> {
 
     public String getContainerId();
 
@@ -18,9 +21,9 @@ public interface WaitContainerCmd extends SyncDockerCmd<Integer> {
      *             container not found
      */
     @Override
-    public Integer exec() throws NotFoundException;
+    public <T extends ResultCallback<WaitResponse>> T exec(T resultCallback);
 
-    public static interface Exec extends DockerCmdSyncExec<WaitContainerCmd, Integer> {
+    public static interface Exec extends DockerCmdAsyncExec<WaitContainerCmd, WaitResponse> {
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/model/WaitResponse.java b/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
new file mode 100644
index 000000000..578e44f1e
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
@@ -0,0 +1,19 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+/**
+ * Represents a wait container command response
+ */
+@JsonIgnoreProperties(ignoreUnknown = false)
+public class WaitResponse  {
+
+    @JsonProperty("StatusCode")
+    private Integer statusCode;
+
+    public Integer getStatusCode() {
+        return statusCode;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index b5387ede0..5ca32c3b7 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -12,6 +12,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.async.ResultCallback;
+import com.google.common.base.Throwables;
 
 /**
  * Abstract template implementation of {@link ResultCallback}
@@ -30,6 +31,8 @@ public abstract class ResultCallbackTemplate<RC_T extends ResultCallback<A_RES_T
 
     private boolean closed = false;
 
+    private Throwable firstError = null;
+
     @Override
     public void onStart(Closeable stream) {
         this.stream = stream;
@@ -38,12 +41,15 @@ public void onStart(Closeable stream) {
 
     @Override
     public void onError(Throwable throwable) {
+
         if (closed)
             return;
 
+        if (this.firstError == null)
+            this.firstError = throwable;
+
         try {
             LOGGER.error("Error during callback", throwable);
-            throw new RuntimeException(throwable);
         } finally {
             try {
                 close();
@@ -76,6 +82,8 @@ public void close() throws IOException {
     @SuppressWarnings("unchecked")
     public RC_T awaitCompletion() throws InterruptedException {
         completed.await();
+        // eventually (re)throws RuntimeException
+        getFirstError();
         return (RC_T) this;
     }
 
@@ -87,4 +95,13 @@ public RC_T awaitCompletion(long timeout, TimeUnit timeUnit) throws InterruptedE
         completed.await(timeout, timeUnit);
         return (RC_T) this;
     }
+
+    protected RuntimeException getFirstError() {
+        if (firstError != null) {
+            // this call throws a RuntimeException
+            return Throwables.propagate(firstError);
+        } else {
+            return null;
+        }
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
index 702eebd33..17f67fe49 100644
--- a/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
@@ -3,13 +3,14 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.api.model.WaitResponse;
 
 /**
  * Wait a container
- * 
+ *
  * Block until container stops, then returns its exit code
  */
-public class WaitContainerCmdImpl extends AbstrDockerCmd<WaitContainerCmd, Integer> implements WaitContainerCmd {
+public class WaitContainerCmdImpl extends AbstrAsyncDockerCmd<WaitContainerCmd, WaitResponse> implements WaitContainerCmd {
 
     private String containerId;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java b/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
new file mode 100644
index 000000000..48f2749dc
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
@@ -0,0 +1,75 @@
+/*
+ * Created on 21.07.2015
+ */
+package com.github.dockerjava.core.command;
+
+import java.util.concurrent.TimeUnit;
+
+import javax.annotation.CheckForNull;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.model.WaitResponse;
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
+import com.google.common.base.Throwables;
+
+/**
+ *
+ * @author marcus
+ *
+ */
+public class WaitContainerResultCallback extends ResultCallbackTemplate<WaitContainerResultCallback, WaitResponse> {
+
+    private final static Logger LOGGER = LoggerFactory.getLogger(WaitContainerResultCallback.class);
+
+    @CheckForNull
+    private WaitResponse waitResponse = null;
+
+    @Override
+    public void onNext(WaitResponse waitResponse) {
+        this.waitResponse = waitResponse;
+        LOGGER.debug(waitResponse.toString());
+    }
+
+    /**
+     * Awaits the status code from the container.
+     *
+     * @throws DockerClientException
+     *             if the wait operation fails.
+     */
+    public Integer awaitStatusCode() {
+        try {
+            awaitCompletion();
+        } catch (InterruptedException e) {
+            throw new DockerClientException("", e);
+        }
+
+        return getStatusCode();
+    }
+
+    /**
+     * Awaits the status code from the container.
+     *
+     * @throws DockerClientException
+     *             if the wait operation fails.
+     */
+    public Integer awaitStatusCode(long timeout, TimeUnit timeUnit) {
+        try {
+            awaitCompletion(timeout, timeUnit);
+        } catch (InterruptedException e) {
+            throw new DockerClientException("Awaiting status code interrupted: ", e);
+        }
+
+        return getStatusCode();
+    }
+
+    private Integer getStatusCode() {
+        if (waitResponse == null) {
+            throw new DockerClientException("Error while wait container");
+        } else {
+            return waitResponse.getStatusCode();
+        }
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
index 16dab933d..7a91a8b4f 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
@@ -1,15 +1,22 @@
 package com.github.dockerjava.jaxrs;
 
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.github.dockerjava.api.command.WaitContainerCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static javax.ws.rs.client.Entity.entity;
 
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
-public class WaitContainerCmdExec extends AbstrSyncDockerCmdExec<WaitContainerCmd, Integer> implements
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.api.model.WaitResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.async.JsonStreamProcessor;
+import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
+import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
+
+public class WaitContainerCmdExec extends AbstrAsyncDockerCmdExec<WaitContainerCmd, WaitResponse> implements
         WaitContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(WaitContainerCmdExec.class);
@@ -19,14 +26,16 @@ public WaitContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerCli
     }
 
     @Override
-    protected Integer execute(WaitContainerCmd command) {
+    protected AbstractCallbackNotifier<WaitResponse> callbackNotifier(WaitContainerCmd command,
+            ResultCallback<WaitResponse> resultCallback) {
+
         WebTarget webResource = getBaseResource().path("/containers/{id}/wait").resolveTemplate("id",
                 command.getContainerId());
 
         LOGGER.trace("POST: {}", webResource);
-        ObjectNode ObjectNode = webResource.request().accept(MediaType.APPLICATION_JSON).post(null, ObjectNode.class);
 
-        return ObjectNode.get("StatusCode").asInt();
+        return new POSTCallbackNotifier<WaitResponse>(new JsonStreamProcessor<WaitResponse>(
+                WaitResponse.class), resultCallback, webResource.request().accept(MediaType.APPLICATION_JSON), entity(null, MediaType.APPLICATION_JSON));
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/client/DockerClientTest.java b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
index 0141e01ac..73cf49571 100644
--- a/src/test/java/com/github/dockerjava/client/DockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
@@ -16,6 +16,7 @@
 
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.core.command.WaitContainerResultCallback;
 
 /**
  * Unit test for DockerClient.
@@ -61,7 +62,7 @@ public void testRunShlex() throws DockerException {
             CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd(commands).exec();
             dockerClient.startContainerCmd(container.getId());
 
-            int exitcode = dockerClient.waitContainerCmd(container.getId()).exec();
+            int exitcode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
             assertThat(exitcode, equalTo(0));
         }
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 22030cc9f..6f4f0e3f4 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -158,7 +158,7 @@ private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
         assertThat(container.getId(), not(isEmptyString()));
 
         dockerClient.startContainerCmd(container.getId()).exec();
-        dockerClient.waitContainerCmd(container.getId()).exec();
+        dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
 
         return containerLog(container.getId());
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
index 3db2b7282..f7602ff5a 100644
--- a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
@@ -53,7 +53,7 @@ public void testContainerDiff() throws DockerException {
         assertThat(container.getId(), not(isEmptyString()));
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
         assertThat(exitCode, equalTo(0));
 
         List<ChangeLog> filesystemDiff = dockerClient.containerDiffCmd(container.getId()).exec();
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index 5b1df2241..4ca4f7b5b 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -41,7 +41,8 @@ public void deleteDockerContainerImage() throws Exception {
     public void canCloseFrameReaderAndReadExpectedLines() throws Exception {
 
         // wait for the container to be successfully executed
-        int exitCode = dockerClient.waitContainerCmd(dockerfileFixture.getContainerId()).exec();
+        int exitCode = dockerClient.waitContainerCmd(dockerfileFixture.getContainerId())
+                .exec(new WaitContainerResultCallback()).awaitStatusCode();
         assertEquals(0, exitCode);
 
         Iterator<Frame> response = getLoggingFrames().iterator();
diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
index c3f6ab01c..638cbdc4c 100644
--- a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
@@ -17,7 +17,6 @@
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
 @Test(groups = "integration")
@@ -56,7 +55,8 @@ public void asyncLogContainer() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+                .awaitStatusCode();
 
         assertThat(exitCode, equalTo(0));
 
@@ -80,7 +80,7 @@ public void onError(Throwable throwable) {
                 assertEquals(throwable.getClass().getName(), NotFoundException.class.getName());
 
                 try {
-                    // close the callback to prevent the call to onFinish
+                    // close the callback to prevent the call to onComplete
                     close();
                 } catch (IOException e) {
                     throw new RuntimeException();
@@ -111,7 +111,8 @@ public void asyncMultipleLogContainer() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+                .awaitStatusCode();
 
         assertThat(exitCode, equalTo(0));
 
@@ -150,7 +151,8 @@ public void asyncLogContainerWithSince() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+                .awaitStatusCode();
 
         assertThat(exitCode, equalTo(0));
 
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
index 3241f0739..1b39e5ac0 100644
--- a/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
@@ -56,7 +56,7 @@ public void removeContainer() throws DockerException {
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true").exec();
 
         dockerClient.startContainerCmd(container.getId()).exec();
-        dockerClient.waitContainerCmd(container.getId()).exec();
+        dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
 
         LOG.info("Removing container: {}", container.getId());
         dockerClient.removeContainerCmd(container.getId()).exec();
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index ae323c4c0..560d8cbca 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -87,7 +87,7 @@ public void startContainerWithVolumes() throws DockerException {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        dockerClient.waitContainerCmd(container.getId()).exec();
+        dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
 
         inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
diff --git a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
index 3b5172b9e..d3b38c4e1 100644
--- a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
@@ -19,6 +19,7 @@
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.WaitResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
 @Test(groups = "integration")
@@ -54,7 +55,8 @@ public void testWaitContainer() throws DockerException {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec();
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+                .awaitStatusCode();
         LOG.info("Container exit code: {}", exitCode);
 
         assertThat(exitCode, equalTo(0));
@@ -66,12 +68,39 @@ public void testWaitContainer() throws DockerException {
         assertThat(inspectContainerResponse.getState().getExitCode(), is(equalTo(exitCode)));
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void testWaitNonExistingContainer() throws DockerException {
-        try {
-            dockerClient.waitContainerCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+
+        WaitContainerResultCallback callback = new WaitContainerResultCallback() {
+            public void onNext(WaitResponse waitResponse) {
+                fail("expected NotFoundException");
+            };
+        };
+
+        dockerClient.waitContainerCmd("non-existing").exec(callback).awaitStatusCode();
+    }
+
+    @Test
+    public void testWaitContainerAbort() throws Exception {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        WaitContainerResultCallback callback = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback());
+
+        Thread.sleep(5000);
+
+        callback.close();
+
+        dockerClient.killContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        assertThat(inspectContainerResponse.getState().isRunning(), is(equalTo(false)));
     }
 }

From 7ec816d4c560d3dffb5c58e218e61c26c9e1cd54 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 4 Nov 2015 12:30:49 +0100
Subject: [PATCH 0266/1272] [maven-release-plugin] prepare release
 docker-java-2.1.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index af8e20bf0..a9742ce9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>2.1.2-SNAPSHOT</version>
+	<version>2.1.2</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>docker-java-2.1.2</tag>
 	</scm>
 
 	<developers>

From b06e71f218b31b2b513708695bfbeca6922d61e0 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 4 Nov 2015 12:30:53 +0100
Subject: [PATCH 0267/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a9742ce9d..debfb672e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>2.1.2</version>
+	<version>2.1.3-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>docker-java-2.1.2</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 3ceef6ce2dcdb301e05b6293d042874a026eebb5 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Wed, 4 Nov 2015 12:33:40 +0100
Subject: [PATCH 0268/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d881294ff..50f95f871 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 Change Log
 ===
-Latest SNAPSHOT version
+v2.1.2
 ---
 * [#350] (https://github.com/docker-java/docker-java/pull/350) Remove ServiceLoader logic
 * [#344] (https://github.com/docker-java/docker-java/pull/344) Implement equals/hashCode for Filters

From 2a4bf8abb631b4ad26a5c9d837516e9af963ebb7 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Wed, 4 Nov 2015 12:34:07 +0100
Subject: [PATCH 0269/1272] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 591161862..54ebe56ac 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ Run build without integration tests:
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>2.1.1</version>
+          <version>2.1.2</version>
     </dependency>
 
 ### Latest SNAPSHOT version
@@ -74,7 +74,7 @@ You can find the latest SNAPSHOT version including javadoc and source files on [
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>2.1.2-SNAPSHOT</version>
+          <version>2.1.3-SNAPSHOT</version>
     </dependency>
 
 ## Documentation

From d25eea146681314d7178567a5777167335c9dd31 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 4 Nov 2015 14:27:51 +0100
Subject: [PATCH 0270/1272] Added @CheckForNull annotation

---
 .../github/dockerjava/core/async/ResultCallbackTemplate.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index 5ca32c3b7..44af625af 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -8,6 +8,8 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import javax.annotation.CheckForNull;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -96,6 +98,7 @@ public RC_T awaitCompletion(long timeout, TimeUnit timeUnit) throws InterruptedE
         return (RC_T) this;
     }
 
+    @CheckForNull
     protected RuntimeException getFirstError() {
         if (firstError != null) {
             // this call throws a RuntimeException

From 1584e0db7509f4f079526d7c5e5f3c0bba8bbd0e Mon Sep 17 00:00:00 2001
From: Simon Webb <simon.webb@dunnhumby.com>
Date: Thu, 5 Nov 2015 11:24:41 +0000
Subject: [PATCH 0271/1272] Added override for bulk-read variant of
 InputStream.read() in anonymous inner class created by
 Dockerfile.ScannedResult.buildDockerFolderTar(). This fixes an IO performance
 issue that occurs when only the single-byte variant of the read() method on
 InputStream is overriden.

---
 .../com/github/dockerjava/core/dockerfile/Dockerfile.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 9c8ef428d..38f40fc7a 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -142,6 +142,11 @@ public int read() throws IOException {
                         return tarInputStream.read();
                     }
 
+                    @Override
+                    public int read(byte [] buff, int offset, int len) throws IOException {
+                        return tarInputStream.read(buff, offset, len);
+                    }
+
                     @Override
                     public void close() throws IOException {
                         IOUtils.closeQuietly(tarInputStream);

From 9a172ad5fbb90bb763b646397dbd3f469f4616eb Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 5 Nov 2015 15:34:25 +0100
Subject: [PATCH 0272/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50f95f871..d5674c7fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 Change Log
 ===
+Latest SNAPSHOT
+---
+* [#357] (https://github.com/docker-java/docker-java/pull/357)  Wait container command needs possibility to abort operation
+
 v2.1.2
 ---
 * [#350] (https://github.com/docker-java/docker-java/pull/350) Remove ServiceLoader logic

From cc5b11a7407d5ab89d5e1564b6ea86f7bad63adf Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 5 Nov 2015 15:47:18 +0100
Subject: [PATCH 0273/1272] Bump to version 3.0.0-SNAPSHOT according to semver

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index debfb672e..dfee63050 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>2.1.3-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>

From 901654b77e7fc64d2d8630ef214c6c52927878c8 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 5 Nov 2015 15:47:31 +0100
Subject: [PATCH 0274/1272] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 54ebe56ac..26ec653ac 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ You can find the latest SNAPSHOT version including javadoc and source files on [
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>2.1.3-SNAPSHOT</version>
+          <version>3.0.0-SNAPSHOT</version>
     </dependency>
 
 ## Documentation

From df8c13f5271ef3cc97c65bd42854c5a0e8920931 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 5 Nov 2015 16:40:02 +0100
Subject: [PATCH 0275/1272] Added missing withXXX(List list) methods

---
 .../api/command/CreateContainerCmd.java       | 20 +++++++-
 .../core/command/CreateContainerCmdImpl.java  | 49 ++++++++++++++-----
 2 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index accaf801b..0a070acfa 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -21,8 +21,6 @@
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
 
-import javax.annotation.CheckForNull;
-
 public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerResponse> {
 
     @CheckForNull
@@ -189,6 +187,8 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     public CreateContainerCmd withBinds(Bind... binds);
 
+    public CreateContainerCmd withBinds(List<Bind> binds);
+
     /**
      * @since 1.19
      */
@@ -201,6 +201,13 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
      */
     public CreateContainerCmd withCapAdd(Capability... capAdd);
 
+    /**
+     * Add linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> to the
+     * container. For example: adding {@link Capability#MKNOD} allows the container to create special files using the
+     * 'mknod' command.
+     */
+    public CreateContainerCmd withCapAdd(List<Capability> capAdd);
+
     /**
      * Drop linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> from the
      * container. For example: dropping {@link Capability#CHOWN} prevents the container from changing the owner of any
@@ -208,8 +215,17 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
      */
     public CreateContainerCmd withCapDrop(Capability... capDrop);
 
+    /**
+     * Drop linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> from the
+     * container. For example: dropping {@link Capability#CHOWN} prevents the container from changing the owner of any
+     * files.
+     */
+    public CreateContainerCmd withCapDrop(List<Capability> capDrop);
+
     public CreateContainerCmd withCmd(String... cmd);
 
+    public CreateContainerCmd withCmd(List<String> cmd);
+
     public CreateContainerCmd withContainerIDFile(String containerIDFile);
 
     /**
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 84d544a3c..41f31dee4 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -106,7 +106,6 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     @JsonProperty("Labels")
     private Map<String, String> labels;
 
-
     public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, String image) {
         super(exec);
         checkNotNull(image, "image was not specified");
@@ -428,6 +427,12 @@ public CreateContainerCmd withBinds(Bind... binds) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withBinds(List<Bind> binds) {
+        checkNotNull(binds, "binds was not specified");
+        return withBinds(binds.toArray(new Bind[binds.size()]));
+    }
+
     @Override
     public CreateContainerCmd withBlkioWeight(Integer blkioWeight) {
         checkNotNull(blkioWeight, "blkioWeight was not specified");
@@ -442,6 +447,12 @@ public CreateContainerCmd withCapAdd(Capability... capAdd) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withCapAdd(List<Capability> capAdd) {
+        checkNotNull(capAdd, "capAdd was not specified");
+        return withCapAdd(capAdd.toArray(new Capability[capAdd.size()]));
+    }
+
     @Override
     public CreateContainerCmd withCapDrop(Capability... capDrop) {
         checkNotNull(capDrop, "capDrop was not specified");
@@ -449,6 +460,12 @@ public CreateContainerCmd withCapDrop(Capability... capDrop) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withCapDrop(List<Capability> capDrop) {
+        checkNotNull(capDrop, "capDrop was not specified");
+        return withCapDrop(capDrop.toArray(new Capability[capDrop.size()]));
+    }
+
     @Override
     public CreateContainerCmd withCmd(String... cmd) {
         checkNotNull(cmd, "cmd was not specified");
@@ -456,6 +473,12 @@ public CreateContainerCmd withCmd(String... cmd) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withCmd(List<String> cmd) {
+        checkNotNull(cmd, "cmd was not specified");
+        return withCmd(cmd.toArray(new String[cmd.size()]));
+    }
+
     @Override
     public CreateContainerCmd withContainerIDFile(String containerIDFile) {
         checkNotNull(containerIDFile, "no containerIDFile was specified");
@@ -481,7 +504,7 @@ public CreateContainerCmd withCpusetCpus(String cpusetCpus) {
     public CreateContainerCmd withCpusetMems(String cpusetMems) {
         checkNotNull(cpusetMems, "cpusetMems was not specified");
         hostConfig.setCpusetMems(cpusetMems);
-        return null;
+        return this;
     }
 
     @Override
@@ -501,7 +524,7 @@ public CreateContainerCmd withDevices(Device... devices) {
     @Override
     public CreateContainerCmd withDevices(List<Device> devices) {
         checkNotNull(devices, "devices was not specified");
-        return withDevices(devices.toArray(new Device[0]));
+        return withDevices(devices.toArray(new Device[devices.size()]));
     }
 
     @Override
@@ -514,7 +537,7 @@ public CreateContainerCmd withDns(String... dns) {
     @Override
     public CreateContainerCmd withDns(List<String> dns) {
         checkNotNull(dns, "dns was not specified");
-        return withDns(dns.toArray(new String[0]));
+        return withDns(dns.toArray(new String[dns.size()]));
     }
 
     @Override
@@ -547,7 +570,7 @@ public CreateContainerCmd withEntrypoint(String... entrypoint) {
     @Override
     public CreateContainerCmd withEntrypoint(List<String> entrypoint) {
         checkNotNull(entrypoint, "entrypoint was not specified");
-        return withEntrypoint(entrypoint.toArray(new String[0]));
+        return withEntrypoint(entrypoint.toArray(new String[entrypoint.size()]));
     }
 
     @Override
@@ -560,7 +583,7 @@ public CreateContainerCmd withEnv(String... env) {
     @Override
     public CreateContainerCmd withEnv(List<String> env) {
         checkNotNull(env, "env was not specified");
-        return withEnv(env.toArray(new String[0]));
+        return withEnv(env.toArray(new String[env.size()]));
     }
 
     @Override
@@ -573,7 +596,7 @@ public CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts) {
     @Override
     public CreateContainerCmd withExposedPorts(List<ExposedPort> exposedPorts) {
         checkNotNull(exposedPorts, "exposedPorts was not specified");
-        return withExposedPorts(exposedPorts.toArray(new ExposedPort[0]));
+        return withExposedPorts(exposedPorts.toArray(new ExposedPort[exposedPorts.size()]));
     }
 
     @Override
@@ -586,7 +609,7 @@ public CreateContainerCmd withExtraHosts(String... extraHosts) {
     @Override
     public CreateContainerCmd withExtraHosts(List<String> extraHosts) {
         checkNotNull(extraHosts, "extraHosts was not specified");
-        return withExtraHosts(extraHosts.toArray(new String[0]));
+        return withExtraHosts(extraHosts.toArray(new String[extraHosts.size()]));
     }
 
     @Override
@@ -620,7 +643,7 @@ public CreateContainerCmd withLinks(Link... links) {
     @Override
     public CreateContainerCmd withLinks(List<Link> links) {
         checkNotNull(links, "links was not specified");
-        return withLinks(links.toArray(new Link[0]));
+        return withLinks(links.toArray(new Link[links.size()]));
     }
 
     @Override
@@ -722,7 +745,7 @@ public CreateContainerCmd withPortSpecs(String... portSpecs) {
     @Override
     public CreateContainerCmd withPortSpecs(List<String> portSpecs) {
         checkNotNull(portSpecs, "portSpecs was not specified");
-        return withPortSpecs(portSpecs.toArray(new String[0]));
+        return withPortSpecs(portSpecs.toArray(new String[portSpecs.size()]));
     }
 
     @Override
@@ -784,7 +807,7 @@ public CreateContainerCmd withUlimits(Ulimit... ulimits) {
     @Override
     public CreateContainerCmd withUlimits(List<Ulimit> ulimits) {
         checkNotNull(ulimits, "no ulimits was specified");
-        return withUlimits(ulimits.toArray(new Ulimit[0]));
+        return withUlimits(ulimits.toArray(new Ulimit[ulimits.size()]));
     }
 
     @Override
@@ -804,7 +827,7 @@ public CreateContainerCmd withVolumes(Volume... volumes) {
     @Override
     public CreateContainerCmd withVolumes(List<Volume> volumes) {
         checkNotNull(volumes, "volumes was not specified");
-        return withVolumes(volumes.toArray(new Volume[0]));
+        return withVolumes(volumes.toArray(new Volume[volumes.size()]));
     }
 
     @Override
@@ -817,7 +840,7 @@ public CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom) {
     @Override
     public CreateContainerCmd withVolumesFrom(List<VolumesFrom> volumesFrom) {
         checkNotNull(volumesFrom, "volumesFrom was not specified");
-        return withVolumesFrom(volumesFrom.toArray(new VolumesFrom[0]));
+        return withVolumesFrom(volumesFrom.toArray(new VolumesFrom[volumesFrom.size()]));
     }
 
     @Override

From 37bcad634f9ebc689e119466b5c0c659a3e6330e Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 5 Nov 2015 16:46:00 +0100
Subject: [PATCH 0276/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5674c7fe..33bb5b902 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,8 @@ Change Log
 ===
 Latest SNAPSHOT
 ---
-* [#357] (https://github.com/docker-java/docker-java/pull/357)  Wait container command needs possibility to abort operation
+* [#357] (https://github.com/docker-java/docker-java/pull/357) Wait container command needs possibility to abort operation
+* [#313] (https://github.com/docker-java/docker-java/pull/313) Refactor primitive type fields to be of object type in JSON objects
 
 v2.1.2
 ---

From e728c42cfca8b3747f2c2dbdccf74afcc0cd4840 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 6 Nov 2015 08:50:04 +0100
Subject: [PATCH 0277/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33bb5b902..6be59e110 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,13 @@
 Change Log
 ===
-Latest SNAPSHOT
+Latest SNAPSHOT (3.0.0-SNAPSHOT)
 ---
+Notes
+
+* The upcoming release will contain multiple API breaking changes therefore the major version switch
+
+All changes
+
 * [#357] (https://github.com/docker-java/docker-java/pull/357) Wait container command needs possibility to abort operation
 * [#313] (https://github.com/docker-java/docker-java/pull/313) Refactor primitive type fields to be of object type in JSON objects
 

From cc23307c2fbc89130c28bf7891bfdf52ebb42ca3 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 6 Nov 2015 09:06:46 +0100
Subject: [PATCH 0278/1272] Format sources

---
 .../com/github/dockerjava/api/model/WaitResponse.java     | 3 +--
 .../java/com/github/dockerjava/core/GoLangFileMatch.java  | 6 +++---
 .../dockerjava/core/command/WaitContainerCmdImpl.java     | 3 ++-
 .../com/github/dockerjava/core/dockerfile/Dockerfile.java | 2 +-
 .../com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java   | 2 +-
 .../github/dockerjava/jaxrs/AttachContainerCmdExec.java   | 6 +++---
 .../com/github/dockerjava/jaxrs/ListImagesCmdExec.java    | 5 ++---
 .../com/github/dockerjava/jaxrs/LogContainerCmdExec.java  | 8 ++++----
 .../github/dockerjava/jaxrs/RestartContainerCmdExec.java  | 6 +++---
 .../com/github/dockerjava/jaxrs/StopContainerCmdExec.java | 6 +++---
 .../com/github/dockerjava/jaxrs/WaitContainerCmdExec.java | 5 +++--
 .../dockerjava/client/AbstractDockerClientTest.java       | 3 ++-
 .../com/github/dockerjava/client/DockerClientTest.java    | 3 ++-
 .../core/command/AttachContainerCmdImplTest.java          | 8 ++++----
 .../dockerjava/core/command/ContainerDiffCmdImplTest.java | 3 ++-
 .../github/dockerjava/core/command/FrameReaderITest.java  | 7 ++++---
 .../dockerjava/core/command/LogContainerCmdImplTest.java  | 3 ++-
 .../dockerjava/core/command/WaitContainerCmdImplTest.java | 3 ++-
 18 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/WaitResponse.java b/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
index 578e44f1e..ca6d61eb9 100644
--- a/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
+++ b/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
@@ -3,12 +3,11 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 /**
  * Represents a wait container command response
  */
 @JsonIgnoreProperties(ignoreUnknown = false)
-public class WaitResponse  {
+public class WaitResponse {
 
     @JsonProperty("StatusCode")
     private Integer statusCode;
diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index 85267e698..6ebdd604b 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -24,16 +24,16 @@
  *                  character class (must be non-empty)
  *       c           matches character c (c != '*', '?', '\\', '[')
  *       '\\' c      matches character c
- *
+ * 
  *   character-range:
  *       c           matches character c (c != '\\', '-', ']')
  *       '\\' c      matches character c
  *       lo '-' hi   matches character c for lo <= c <= hi
- *
+ * 
  *  Match requires pattern to match all of name, not just a substring.
  *  The only possible returned error is ErrBadPattern, when pattern
  *  is malformed.
- *
+ * 
  * On Windows, escaping is disabled. Instead, '\\' is treated as
  *  path separator.
  * </pre>
diff --git a/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
index af18a5895..eeb05ff60 100644
--- a/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
@@ -10,7 +10,8 @@
  *
  * Block until container stops, then returns its exit code
  */
-public class WaitContainerCmdImpl extends AbstrAsyncDockerCmd<WaitContainerCmd, WaitResponse> implements WaitContainerCmd {
+public class WaitContainerCmdImpl extends AbstrAsyncDockerCmd<WaitContainerCmd, WaitResponse> implements
+        WaitContainerCmd {
 
     private String containerId;
 
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 38f40fc7a..c9bd37d1e 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -143,7 +143,7 @@ public int read() throws IOException {
                     }
 
                     @Override
-                    public int read(byte [] buff, int offset, int len) throws IOException {
+                    public int read(byte[] buff, int offset, int len) throws IOException {
                         return tarInputStream.read(buff, offset, len);
                     }
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
index 10ee7896d..b2c61c13e 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
@@ -61,7 +61,7 @@ protected boolean bool(Boolean bool) {
     }
 
     protected WebTarget booleanQueryParam(WebTarget webTarget, String name, Boolean value) {
-        if(bool(value)) {
+        if (bool(value)) {
             webTarget = webTarget.queryParam(name, bool(value) + "");
         }
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
index d0a5ae8f3..b272adc78 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
@@ -25,12 +25,12 @@ public AttachContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerC
     protected AbstractCallbackNotifier<Frame> callbackNotifier(AttachContainerCmd command,
             ResultCallback<Frame> resultCallback) {
 
-        WebTarget webTarget = getBaseResource().path("/containers/{id}/attach")
-                .resolveTemplate("id", command.getContainerId());
+        WebTarget webTarget = getBaseResource().path("/containers/{id}/attach").resolveTemplate("id",
+                command.getContainerId());
 
         webTarget = booleanQueryParam(webTarget, "logs", command.hasLogsEnabled());
         webTarget = booleanQueryParam(webTarget, "stdout", command.hasStdoutEnabled());
-        //webTarget = booleanQueryParam(webTarget, "stdin", command.hasStdinEnabled());
+        // webTarget = booleanQueryParam(webTarget, "stdin", command.hasStdinEnabled());
         webTarget = booleanQueryParam(webTarget, "stderr", command.hasStderrEnabled());
         webTarget = booleanQueryParam(webTarget, "stream", command.hasFollowStreamEnabled());
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
index 7bfecd1f2..c6422aa52 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
@@ -32,9 +32,8 @@ protected List<Image> execute(ListImagesCmd command) {
 
         LOGGER.trace("GET: {}", webTarget);
 
-        List<Image> images = webTarget.request().accept(MediaType.APPLICATION_JSON)
-                .get(new GenericType<List<Image>>() {
-                });
+        List<Image> images = webTarget.request().accept(MediaType.APPLICATION_JSON).get(new GenericType<List<Image>>() {
+        });
         LOGGER.trace("Response: {}", images);
 
         return images;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
index 086e98a87..349d2e240 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
@@ -25,14 +25,14 @@ public LogContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClie
     protected AbstractCallbackNotifier<Frame> callbackNotifier(LogContainerCmd command,
             ResultCallback<Frame> resultCallback) {
 
-        WebTarget webTarget = getBaseResource().path("/containers/{id}/logs")
-                .resolveTemplate("id", command.getContainerId());
+        WebTarget webTarget = getBaseResource().path("/containers/{id}/logs").resolveTemplate("id",
+                command.getContainerId());
 
-        if(command.getTail() != null) {
+        if (command.getTail() != null) {
             webTarget = webTarget.queryParam("tail", command.getTail());
         }
 
-        if(command.getSince() != null) {
+        if (command.getSince() != null) {
             webTarget = webTarget.queryParam("since", command.getSince());
         }
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
index bfc65ae27..496fa450c 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
@@ -19,10 +19,10 @@ public RestartContainerCmdExec(WebTarget baseResource, DockerClientConfig docker
 
     @Override
     protected Void execute(RestartContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/restart")
-                .resolveTemplate("id", command.getContainerId());
+        WebTarget webResource = getBaseResource().path("/containers/{id}/restart").resolveTemplate("id",
+                command.getContainerId());
 
-        if(command.getTimeout() != null) {
+        if (command.getTimeout() != null) {
             webResource = webResource.queryParam("t", String.valueOf(command.getTimeout()));
         }
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
index ae9834750..eda4e3e30 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
@@ -19,10 +19,10 @@ public StopContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerCli
 
     @Override
     protected Void execute(StopContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/stop")
-                .resolveTemplate("id", command.getContainerId());
+        WebTarget webResource = getBaseResource().path("/containers/{id}/stop").resolveTemplate("id",
+                command.getContainerId());
 
-        if(command.getTimeout() != null) {
+        if (command.getTimeout() != null) {
             webResource = webResource.queryParam("t", String.valueOf(command.getTimeout()));
         }
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
index 7a91a8b4f..06bd40edc 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
@@ -34,8 +34,9 @@ protected AbstractCallbackNotifier<WaitResponse> callbackNotifier(WaitContainerC
 
         LOGGER.trace("POST: {}", webResource);
 
-        return new POSTCallbackNotifier<WaitResponse>(new JsonStreamProcessor<WaitResponse>(
-                WaitResponse.class), resultCallback, webResource.request().accept(MediaType.APPLICATION_JSON), entity(null, MediaType.APPLICATION_JSON));
+        return new POSTCallbackNotifier<WaitResponse>(new JsonStreamProcessor<WaitResponse>(WaitResponse.class),
+                resultCallback, webResource.request().accept(MediaType.APPLICATION_JSON), entity(null,
+                        MediaType.APPLICATION_JSON));
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 3c901f29c..ec4aa82be 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -210,7 +210,8 @@ public String toString() {
 
     protected String buildImage(File baseDir) throws Exception {
 
-        return dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
+        return dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback())
+                .awaitImageId();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/client/DockerClientTest.java b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
index 73cf49571..d3bd75cf5 100644
--- a/src/test/java/com/github/dockerjava/client/DockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
@@ -62,7 +62,8 @@ public void testRunShlex() throws DockerException {
             CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd(commands).exec();
             dockerClient.startContainerCmd(container.getId());
 
-            int exitcode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
+            int exitcode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+                    .awaitStatusCode();
             assertThat(exitcode, equalTo(0));
         }
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
index 8ba419824..ead8ad39e 100644
--- a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
@@ -65,8 +65,8 @@ public void onNext(Frame frame) {
             };
         };
 
-        dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true).withLogs(true)
-                .exec(callback).awaitCompletion(30, TimeUnit.SECONDS).close();
+        dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
+                .withLogs(true).exec(callback).awaitCompletion(30, TimeUnit.SECONDS).close();
 
         assertThat(callback.toString(), containsString(snippet));
     }
@@ -94,8 +94,8 @@ public void onNext(Frame frame) {
             };
         };
 
-        dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true).exec(callback)
-                .awaitCompletion(15, TimeUnit.SECONDS).close();
+        dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
+                .exec(callback).awaitCompletion(15, TimeUnit.SECONDS).close();
 
         System.out.println("log: " + callback.toString());
 
diff --git a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
index f7602ff5a..aa692d2c5 100644
--- a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
@@ -53,7 +53,8 @@ public void testContainerDiff() throws DockerException {
         assertThat(container.getId(), not(isEmptyString()));
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+                .awaitStatusCode();
         assertThat(exitCode, equalTo(0));
 
         List<ChangeLog> filesystemDiff = dockerClient.containerDiffCmd(container.getId()).exec();
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index cdd2771e9..df616ddba 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -57,9 +57,10 @@ private List<Frame> getLoggingFrames() throws Exception {
 
         FrameReaderITestCallback collectFramesCallback = new FrameReaderITestCallback();
 
-        dockerClient.logContainerCmd(dockerfileFixture.getContainerId()).withStdOut(true).withStdErr(true).withTailAll()
-        // we can't follow stream here as it blocks reading from resulting InputStream infinitely
-        // .withFollowStream()
+        dockerClient.logContainerCmd(dockerfileFixture.getContainerId()).withStdOut(true).withStdErr(true)
+                .withTailAll()
+                // we can't follow stream here as it blocks reading from resulting InputStream infinitely
+                // .withFollowStream()
                 .exec(collectFramesCallback).awaitCompletion();
 
         return collectFramesCallback.frames;
diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
index 0b0f9d031..beb38d885 100644
--- a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
@@ -95,7 +95,8 @@ public void onComplete() {
             };
         };
 
-        dockerClient.logContainerCmd("non-existing").withStdErr(true).withStdOut(true).exec(loggingCallback).awaitCompletion();
+        dockerClient.logContainerCmd("non-existing").withStdErr(true).withStdOut(true).exec(loggingCallback)
+                .awaitCompletion();
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
index d3b38c4e1..68d638807 100644
--- a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
@@ -90,7 +90,8 @@ public void testWaitContainerAbort() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        WaitContainerResultCallback callback = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback());
+        WaitContainerResultCallback callback = dockerClient.waitContainerCmd(container.getId()).exec(
+                new WaitContainerResultCallback());
 
         Thread.sleep(5000);
 

From be5c1c3a45afb0f76bb981ccafc236fd08e05a72 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 6 Nov 2015 09:10:05 +0100
Subject: [PATCH 0279/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6be59e110..35849bbbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ Notes
 
 All changes
 
+* [#359] (https://github.com/docker-java/docker-java/pull/359) Fix performance issue of build command by adding bulk-read variant of InputStream.read()
 * [#357] (https://github.com/docker-java/docker-java/pull/357) Wait container command needs possibility to abort operation
 * [#313] (https://github.com/docker-java/docker-java/pull/313) Refactor primitive type fields to be of object type in JSON objects
 

From 2d828ad527e41cbfd04b1e9777b0e3a92ea1baee Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 6 Nov 2015 19:06:59 +0100
Subject: [PATCH 0280/1272] Added AHC dependency

---
 pom.xml                                       |   9 +-
 .../ahc/AttachContainerCmdExec.java           | 101 ++++++++++++++++++
 2 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/github/dockerjava/ahc/AttachContainerCmdExec.java

diff --git a/pom.xml b/pom.xml
index dfee63050..60fac661f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -201,6 +202,12 @@
 			<version>3.0.0</version>
 			<scope>provided</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>org.asynchttpclient</groupId>
+			<artifactId>async-http-client</artifactId>
+			<version>2.0.0-alpha22</version>
+		</dependency>
 	</dependencies>
 
 	<distributionManagement>
diff --git a/src/main/java/com/github/dockerjava/ahc/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/ahc/AttachContainerCmdExec.java
new file mode 100644
index 000000000..99be7d507
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/ahc/AttachContainerCmdExec.java
@@ -0,0 +1,101 @@
+package com.github.dockerjava.ahc;
+
+import java.io.ByteArrayOutputStream;
+import java.net.URL;
+import java.util.concurrent.Future;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.AttachContainerCmd;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.async.FrameStreamProcessor;
+import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
+import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
+
+import org.asynchttpclient.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+
+public class AttachContainerCmdExec implements AttachContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AttachContainerCmdExec.class);
+
+    private URL baseResource;
+
+    private DockerClientConfig dockerClientConfig;
+
+    public AttachContainerCmdExec(URL baseResource, DockerClientConfig dockerClientConfig) {
+        this.baseResource = baseResource;
+        this.dockerClientConfig = dockerClientConfig;
+    }
+
+    // @Override
+    // protected AbstractCallbackNotifier<Frame> callbackNotifier(AttachContainerCmd command,
+    // ResultCallback<Frame> resultCallback) {
+    //
+    // WebTarget webTarget = getBaseResource().path("/containers/{id}/attach").resolveTemplate("id",
+    // command.getContainerId());
+    //
+    // webTarget = booleanQueryParam(webTarget, "logs", command.hasLogsEnabled());
+    // webTarget = booleanQueryParam(webTarget, "stdout", command.hasStdoutEnabled());
+    // // webTarget = booleanQueryParam(webTarget, "stdin", command.hasStdinEnabled());
+    // webTarget = booleanQueryParam(webTarget, "stderr", command.hasStderrEnabled());
+    // webTarget = booleanQueryParam(webTarget, "stream", command.hasFollowStreamEnabled());
+    //
+    // LOGGER.trace("POST: {}", webTarget);
+    //
+    // return new POSTCallbackNotifier<Frame>(new FrameStreamProcessor(), resultCallback, webTarget.request(), null);
+    // }
+
+    @Override
+    public Void exec(AttachContainerCmd command, ResultCallback<Frame> resultCallback) {
+        AsyncHttpClientConfig config = new DefaultAsyncHttpClientConfig.Builder().build();
+
+        AsyncHttpClient c = new DefaultAsyncHttpClient(config);
+        c.prepareGet("http://www.ning.com/").execute(new AsyncHandler<String>() {
+            private ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+
+            @Override
+            public State onStatusReceived(HttpResponseStatus status) throws Exception {
+                int statusCode = status.getStatusCode();
+                // The Status have been read
+                // If you don't want to read the headers,body or stop processing the response
+                if (statusCode >= 500) {
+                    return State.ABORT;
+                }
+
+                return State.CONTINUE;
+            }
+
+            @Override
+            public State onHeadersReceived(HttpResponseHeaders h) throws Exception {
+
+                // The headers have been read
+                // If you don't want to read the body, or stop processing the response
+                return State.CONTINUE;
+            }
+
+            @Override
+            public State onBodyPartReceived(HttpResponseBodyPart bodyPart) throws Exception {
+                bytes.write(bodyPart.getBodyPartBytes());
+                return State.CONTINUE;
+            }
+
+            @Override
+            public String onCompleted() throws Exception {
+                // Will be invoked once the response has been fully read or a ResponseComplete exception
+                // has been thrown.
+                // NOTE: should probably use Content-Encoding from headers
+                return bytes.toString("UTF-8");
+            }
+
+            @Override
+            public void onThrowable(Throwable t) {
+            }
+        });
+
+        return null;
+    }
+}

From f8a5fb47fc6e7c724dca8b5d29b9a7cce557bb8e Mon Sep 17 00:00:00 2001
From: Boni Garcia <bgarcia@gsyc.es>
Date: Tue, 10 Nov 2015 17:42:08 +0100
Subject: [PATCH 0281/1272] Deprecate "network" and enable "networks" stats
 (remote Docker API 1.21)

---
 .../com/github/dockerjava/api/model/Statistics.java   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/Statistics.java b/src/main/java/com/github/dockerjava/api/model/Statistics.java
index f6acf16ee..4e2692014 100644
--- a/src/main/java/com/github/dockerjava/api/model/Statistics.java
+++ b/src/main/java/com/github/dockerjava/api/model/Statistics.java
@@ -16,6 +16,13 @@ public class Statistics {
     @JsonProperty("read")
     private String read;
 
+    @JsonProperty("networks")
+    private Map<String, Object> networksStats;
+
+    /**
+     * Deprecated as of Docker Remote API 1.21
+     */
+    @Deprecated
     @JsonProperty("network")
     private Map<String, Object> networkStats;
 
@@ -28,6 +35,10 @@ public class Statistics {
     @JsonProperty("cpu_stats")
     private Map<String, Object> cpuStats;
 
+    public Map<String, Object> getNetworksStats() {
+        return networksStats;
+    }
+
     public Map<String, Object> getNetworkStats() {
         return networkStats;
     }

From ef030277b81e42336747be435c2ee9050550a3ac Mon Sep 17 00:00:00 2001
From: Boni Garcia <bgarcia@gsyc.es>
Date: Tue, 10 Nov 2015 18:01:35 +0100
Subject: [PATCH 0282/1272] Improve JavaDoc and include @CheckForNull

Conflicts:
	src/main/java/com/github/dockerjava/api/model/Statistics.java
---
 .../github/dockerjava/api/model/Statistics.java  | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/Statistics.java b/src/main/java/com/github/dockerjava/api/model/Statistics.java
index 4e2692014..ec837a0ac 100644
--- a/src/main/java/com/github/dockerjava/api/model/Statistics.java
+++ b/src/main/java/com/github/dockerjava/api/model/Statistics.java
@@ -2,6 +2,8 @@
 
 import java.util.Map;
 
+import javax.annotation.CheckForNull;
+
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -16,11 +18,15 @@ public class Statistics {
     @JsonProperty("read")
     private String read;
 
+    /**
+     * @since Docker Remote API 1.21
+     */
+    @CheckForNull
     @JsonProperty("networks")
     private Map<String, Object> networksStats;
 
     /**
-     * Deprecated as of Docker Remote API 1.21
+     * @deprecated as of Docker Remote API 1.21, replaced by {@link #networksStats}
      */
     @Deprecated
     @JsonProperty("network")
@@ -35,10 +41,18 @@ public class Statistics {
     @JsonProperty("cpu_stats")
     private Map<String, Object> cpuStats;
 
+    /**
+     * @since Docker Remote API 1.21
+     */
+    @CheckForNull
     public Map<String, Object> getNetworksStats() {
         return networksStats;
     }
 
+    /**
+     * @deprecated as of Docker Remote API 1.21, replaced by {@link #getNetworksStats()}
+     */
+    @Deprecated
     public Map<String, Object> getNetworkStats() {
         return networkStats;
     }

From ee1b8cf6beb7f49b7e246109b1bf6de8ea272fcf Mon Sep 17 00:00:00 2001
From: Boni Garcia <bgarcia@gsyc.es>
Date: Wed, 11 Nov 2015 13:36:55 +0100
Subject: [PATCH 0283/1272] Remove "Stats" from "networks" field in statistics

---
 .../com/github/dockerjava/api/model/Statistics.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/Statistics.java b/src/main/java/com/github/dockerjava/api/model/Statistics.java
index ec837a0ac..c4daf0573 100644
--- a/src/main/java/com/github/dockerjava/api/model/Statistics.java
+++ b/src/main/java/com/github/dockerjava/api/model/Statistics.java
@@ -23,10 +23,10 @@ public class Statistics {
      */
     @CheckForNull
     @JsonProperty("networks")
-    private Map<String, Object> networksStats;
+    private Map<String, Object> networks;
 
     /**
-     * @deprecated as of Docker Remote API 1.21, replaced by {@link #networksStats}
+     * @deprecated as of Docker Remote API 1.21, replaced by {@link #networks}
      */
     @Deprecated
     @JsonProperty("network")
@@ -45,12 +45,12 @@ public class Statistics {
      * @since Docker Remote API 1.21
      */
     @CheckForNull
-    public Map<String, Object> getNetworksStats() {
-        return networksStats;
+    public Map<String, Object> getNetworks() {
+        return networks;
     }
 
     /**
-     * @deprecated as of Docker Remote API 1.21, replaced by {@link #getNetworksStats()}
+     * @deprecated as of Docker Remote API 1.21, replaced by {@link #getNetworks()}
      */
     @Deprecated
     public Map<String, Object> getNetworkStats() {

From bc05ff913b6826a39fbe32eec4ca5a6a58e5f6f8 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 13 Nov 2015 21:53:14 +0100
Subject: [PATCH 0284/1272] start netty implementation (proof of concept)

---
 pom.xml                                       |  29 +-
 .../ahc/AttachContainerCmdExec.java           | 101 ----
 .../api/command/ExecCreateCmdResponse.java    |   8 +
 .../dockerjava/core/command/FrameReader.java  |   9 +-
 .../dockerjava/netty/AbstrDockerCmdExec.java  |  70 +++
 .../netty/AbstrSyncDockerCmdExec.java         |  33 ++
 .../dockerjava/netty/ChannelProvider.java     |   7 +
 .../netty/DockerCmdExecFactoryImpl.java       | 484 ++++++++++++++++++
 .../dockerjava/netty/ExecCreateCmdExec.java   |  30 ++
 .../dockerjava/netty/ExecStartCmdExec.java    |  29 ++
 .../github/dockerjava/netty/InfoCmdExec.java  |  42 ++
 .../dockerjava/netty/InvocationBuilder.java   | 313 +++++++++++
 .../github/dockerjava/netty/MediaType.java    |  16 +
 .../github/dockerjava/netty/WebTarget.java    |  69 +++
 .../handler/AwaitObjectInboundHandler.java    |  39 ++
 .../DeserializeJsonInboundHandler.java        |  31 ++
 .../netty/handler/DockerRawStreamHandler.java | 124 +++++
 .../handler/HijackHttpConnectionHandler.java  |  57 +++
 .../netty/handler/HttpRequestProvider.java    |   9 +
 .../handler/HttpResponseInboundHandler.java   | 128 +++++
 .../HttpResponseStreamInboundHandler.java     |  93 ++++
 .../handler/SerializeJsonOutboundHandler.java |  19 +
 22 files changed, 1635 insertions(+), 105 deletions(-)
 delete mode 100644 src/main/java/com/github/dockerjava/ahc/AttachContainerCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/AbstrDockerCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/AbstrSyncDockerCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/ChannelProvider.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/ExecCreateCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/ExecStartCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/InfoCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/MediaType.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/WebTarget.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/handler/AwaitObjectInboundHandler.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/handler/DeserializeJsonInboundHandler.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/handler/DockerRawStreamHandler.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/handler/HijackHttpConnectionHandler.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/handler/HttpResponseInboundHandler.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamInboundHandler.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/handler/SerializeJsonOutboundHandler.java

diff --git a/pom.xml b/pom.xml
index 60fac661f..27326fd6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,9 +204,25 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.asynchttpclient</groupId>
-			<artifactId>async-http-client</artifactId>
-			<version>2.0.0-alpha22</version>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-codec-http</artifactId>
+			<version>4.1.0.Beta7</version>
+		</dependency>
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-handler</artifactId>
+			<version>4.1.0.Beta7</version>
+		</dependency>
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-handler-proxy</artifactId>
+			<version>4.1.0.Beta7</version>
+		</dependency>
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-transport-native-epoll</artifactId>
+			<version>4.1.0.Beta7</version>
+			<classifier>linux-x86_64</classifier>
 		</dependency>
 	</dependencies>
 
@@ -222,6 +238,13 @@
 	</distributionManagement>
 
 	<build>
+		<extensions>
+			<extension>
+				<groupId>kr.motd.maven</groupId>
+				<artifactId>os-maven-plugin</artifactId>
+				<version>1.2.3.Final</version>
+			</extension>
+		</extensions>
 		<pluginManagement>
 			<plugins>
 
diff --git a/src/main/java/com/github/dockerjava/ahc/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/ahc/AttachContainerCmdExec.java
deleted file mode 100644
index 99be7d507..000000000
--- a/src/main/java/com/github/dockerjava/ahc/AttachContainerCmdExec.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.github.dockerjava.ahc;
-
-import java.io.ByteArrayOutputStream;
-import java.net.URL;
-import java.util.concurrent.Future;
-
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.command.AttachContainerCmd;
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.async.FrameStreamProcessor;
-import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
-import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
-
-import org.asynchttpclient.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-
-public class AttachContainerCmdExec implements AttachContainerCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(AttachContainerCmdExec.class);
-
-    private URL baseResource;
-
-    private DockerClientConfig dockerClientConfig;
-
-    public AttachContainerCmdExec(URL baseResource, DockerClientConfig dockerClientConfig) {
-        this.baseResource = baseResource;
-        this.dockerClientConfig = dockerClientConfig;
-    }
-
-    // @Override
-    // protected AbstractCallbackNotifier<Frame> callbackNotifier(AttachContainerCmd command,
-    // ResultCallback<Frame> resultCallback) {
-    //
-    // WebTarget webTarget = getBaseResource().path("/containers/{id}/attach").resolveTemplate("id",
-    // command.getContainerId());
-    //
-    // webTarget = booleanQueryParam(webTarget, "logs", command.hasLogsEnabled());
-    // webTarget = booleanQueryParam(webTarget, "stdout", command.hasStdoutEnabled());
-    // // webTarget = booleanQueryParam(webTarget, "stdin", command.hasStdinEnabled());
-    // webTarget = booleanQueryParam(webTarget, "stderr", command.hasStderrEnabled());
-    // webTarget = booleanQueryParam(webTarget, "stream", command.hasFollowStreamEnabled());
-    //
-    // LOGGER.trace("POST: {}", webTarget);
-    //
-    // return new POSTCallbackNotifier<Frame>(new FrameStreamProcessor(), resultCallback, webTarget.request(), null);
-    // }
-
-    @Override
-    public Void exec(AttachContainerCmd command, ResultCallback<Frame> resultCallback) {
-        AsyncHttpClientConfig config = new DefaultAsyncHttpClientConfig.Builder().build();
-
-        AsyncHttpClient c = new DefaultAsyncHttpClient(config);
-        c.prepareGet("http://www.ning.com/").execute(new AsyncHandler<String>() {
-            private ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-
-            @Override
-            public State onStatusReceived(HttpResponseStatus status) throws Exception {
-                int statusCode = status.getStatusCode();
-                // The Status have been read
-                // If you don't want to read the headers,body or stop processing the response
-                if (statusCode >= 500) {
-                    return State.ABORT;
-                }
-
-                return State.CONTINUE;
-            }
-
-            @Override
-            public State onHeadersReceived(HttpResponseHeaders h) throws Exception {
-
-                // The headers have been read
-                // If you don't want to read the body, or stop processing the response
-                return State.CONTINUE;
-            }
-
-            @Override
-            public State onBodyPartReceived(HttpResponseBodyPart bodyPart) throws Exception {
-                bytes.write(bodyPart.getBodyPartBytes());
-                return State.CONTINUE;
-            }
-
-            @Override
-            public String onCompleted() throws Exception {
-                // Will be invoked once the response has been fully read or a ResponseComplete exception
-                // has been thrown.
-                // NOTE: should probably use Content-Encoding from headers
-                return bytes.toString("UTF-8");
-            }
-
-            @Override
-            public void onThrowable(Throwable t) {
-            }
-        });
-
-        return null;
-    }
-}
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
index 391625cfa..08751f3e2 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -12,4 +15,9 @@ public class ExecCreateCmdResponse {
     public String getId() {
         return id;
     }
+    
+    @Override
+    public String toString() {
+    	return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
index 78db8359f..e7e4a4031 100644
--- a/src/main/java/com/github/dockerjava/core/command/FrameReader.java
+++ b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
@@ -4,6 +4,8 @@
 import java.io.InputStream;
 import java.util.Arrays;
 
+import org.apache.commons.io.HexDump;
+
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.StreamType;
 
@@ -16,11 +18,12 @@ public class FrameReader implements AutoCloseable {
 
     private static final int HEADER_SIZE = 8;
 
+    private final byte[] rawBuffer = new byte[1000];
+
     private final InputStream inputStream;
 
     private Boolean rawStreamDetected = false;
 
-    private final byte[] rawBuffer = new byte[1000];
 
     public FrameReader(InputStream inputStream) {
         this.inputStream = inputStream;
@@ -65,6 +68,8 @@ public Frame readFrame() throws IOException {
                 actualHeaderSize += headerCount;
             } while (actualHeaderSize < HEADER_SIZE);
 
+            // HexDump.dump(header, 0, System.err, 0);
+            
             StreamType streamType = streamType(header[0]);
 
             if (streamType.equals(StreamType.RAW)) {
@@ -74,6 +79,8 @@ public Frame readFrame() throws IOException {
 
             int payloadSize = ((header[4] & 0xff) << 24) + ((header[5] & 0xff) << 16) + ((header[6] & 0xff) << 8)
                     + (header[7] & 0xff);
+            
+            //System.out.println("payload size: " + payloadSize);
 
             byte[] payload = new byte[payloadSize];
             int actualPayloadSize = 0;
diff --git a/src/main/java/com/github/dockerjava/netty/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/netty/AbstrDockerCmdExec.java
new file mode 100644
index 000000000..3d0308d57
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/AbstrDockerCmdExec.java
@@ -0,0 +1,70 @@
+package com.github.dockerjava.netty;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.AuthConfigurations;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.codec.binary.Base64;
+
+import java.io.IOException;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+public abstract class AbstrDockerCmdExec {
+
+    private final DockerClientConfig dockerClientConfig;
+
+    private final WebTarget baseResource;
+
+    public AbstrDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        checkNotNull(baseResource, "baseResource was not specified");
+        checkNotNull(dockerClientConfig, "dockerClientConfig was not specified");
+        this.baseResource = baseResource;
+        this.dockerClientConfig = dockerClientConfig;
+    }
+
+    protected WebTarget getBaseResource() {
+        return baseResource;
+    }
+
+    protected AuthConfigurations getBuildAuthConfigs() {
+        return dockerClientConfig.getAuthConfigurations();
+    }
+
+    protected String registryAuth(AuthConfig authConfig) {
+        try {
+            return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfig).getBytes());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    protected String registryConfigs(AuthConfigurations authConfigs) {
+        try {
+            final String json;
+            if (dockerClientConfig.getVersion().isGreaterOrEqual(RemoteApiVersion.VERSION_1_19)) {
+                json = new ObjectMapper().writeValueAsString(authConfigs.getConfigs());
+            } else {
+                json = new ObjectMapper().writeValueAsString(authConfigs);
+            }
+
+            return Base64.encodeBase64String(json.getBytes());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    protected boolean bool(Boolean bool) {
+        return bool != null && bool;
+    }
+
+    protected WebTarget booleanQueryParam(WebTarget webTarget, String name, Boolean value) {
+        if (bool(value)) {
+            webTarget = webTarget.queryParam(name, bool(value) + "");
+        }
+
+        return webTarget;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/AbstrSyncDockerCmdExec.java b/src/main/java/com/github/dockerjava/netty/AbstrSyncDockerCmdExec.java
new file mode 100644
index 000000000..43854dbd1
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/AbstrSyncDockerCmdExec.java
@@ -0,0 +1,33 @@
+package com.github.dockerjava.netty;
+
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.command.DockerCmd;
+import com.github.dockerjava.api.command.DockerCmdSyncExec;
+import com.github.dockerjava.core.DockerClientConfig;
+
+
+public abstract class AbstrSyncDockerCmdExec<CMD_T extends DockerCmd<RES_T>, RES_T> extends AbstrDockerCmdExec
+        implements DockerCmdSyncExec<CMD_T, RES_T> {
+
+    public AbstrSyncDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    public RES_T exec(CMD_T command) {
+        // this hack works because of ResponseStatusExceptionFilter
+        try (CMD_T cmd = command) {
+            try {
+                return execute(cmd);
+            } catch (RuntimeException e) {
+                if (e.getCause() instanceof DockerException) {
+                    throw (DockerException) e.getCause();
+                } else {
+                    throw e;
+                }
+            }
+        }
+    }
+
+    protected abstract RES_T execute(CMD_T command);
+}
diff --git a/src/main/java/com/github/dockerjava/netty/ChannelProvider.java b/src/main/java/com/github/dockerjava/netty/ChannelProvider.java
new file mode 100644
index 000000000..a868f1cd1
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/ChannelProvider.java
@@ -0,0 +1,7 @@
+package com.github.dockerjava.netty;
+
+import io.netty.channel.Channel;
+
+public interface ChannelProvider {
+	Channel getChannel();
+}
diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
new file mode 100644
index 000000000..3627038cd
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
@@ -0,0 +1,484 @@
+package com.github.dockerjava.netty;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.net.UnknownHostException;
+
+import javax.net.ssl.SSLException;
+
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.command.AttachContainerCmd;
+import com.github.dockerjava.api.command.AuthCmd;
+import com.github.dockerjava.api.command.BuildImageCmd;
+import com.github.dockerjava.api.command.CommitCmd;
+import com.github.dockerjava.api.command.ContainerDiffCmd;
+import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.api.command.CreateContainerCmd;
+import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.DockerCmdExecFactory;
+import com.github.dockerjava.api.command.EventsCmd;
+import com.github.dockerjava.api.command.ExecCreateCmd;
+import com.github.dockerjava.api.command.ExecCreateCmdResponse;
+import com.github.dockerjava.api.command.ExecStartCmd;
+import com.github.dockerjava.api.command.InfoCmd;
+import com.github.dockerjava.api.command.InspectContainerCmd;
+import com.github.dockerjava.api.command.InspectExecCmd;
+import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.KillContainerCmd;
+import com.github.dockerjava.api.command.ListContainersCmd;
+import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.LogContainerCmd;
+import com.github.dockerjava.api.command.PauseContainerCmd;
+import com.github.dockerjava.api.command.PingCmd;
+import com.github.dockerjava.api.command.PullImageCmd;
+import com.github.dockerjava.api.command.PushImageCmd;
+import com.github.dockerjava.api.command.RemoveContainerCmd;
+import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.api.command.RestartContainerCmd;
+import com.github.dockerjava.api.command.SaveImageCmd;
+import com.github.dockerjava.api.command.SearchImagesCmd;
+import com.github.dockerjava.api.command.StartContainerCmd;
+import com.github.dockerjava.api.command.StatsCmd;
+import com.github.dockerjava.api.command.StopContainerCmd;
+import com.github.dockerjava.api.command.TagImageCmd;
+import com.github.dockerjava.api.command.TopContainerCmd;
+import com.github.dockerjava.api.command.UnpauseContainerCmd;
+import com.github.dockerjava.api.command.VersionCmd;
+import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.Info;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.DockerClientConfig.DockerClientConfigBuilder;
+import com.github.dockerjava.core.command.ExecCreateCmdImpl;
+import com.github.dockerjava.core.command.ExecStartCmdImpl;
+import com.github.dockerjava.core.command.FrameReader;
+import com.github.dockerjava.core.command.InfoCmdImpl;
+import com.github.dockerjava.netty.handler.HijackHttpConnectionHandler;
+import com.github.dockerjava.netty.handler.HttpResponseInboundHandler;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.channel.epoll.EpollDomainSocketChannel;
+import io.netty.channel.epoll.EpollEventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.channel.unix.DomainSocketAddress;
+import io.netty.channel.unix.UnixChannel;
+import io.netty.handler.codec.http.HttpClientCodec;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpObject;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.handler.codec.json.JsonObjectDecoder;
+import io.netty.handler.logging.LogLevel;
+import io.netty.handler.logging.LoggingHandler;
+import io.netty.handler.proxy.HttpProxyHandler;
+import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslContextBuilder;
+import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
+
+/**
+ * http://stackoverflow.com/questions/33296749/netty-connect-to-unix-domain-
+ * socket-failed http://netty.io/wiki/native-transports.html
+ * https://github.com/netty/netty/blob/master/example/src/main/java/io/netty/
+ * example/http/snoop/HttpSnoopClient.java
+ * 
+ * @author marcus
+ *
+ */
+public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(DockerCmdExecFactoryImpl.class.getName());
+
+	private DockerClientConfig dockerClientConfig;
+
+	private Bootstrap bootstrap;
+
+	private EventLoopGroup eventLoopGroup;
+
+	private ChannelProvider channelProvider = new ChannelProvider() {
+		@Override
+		public Channel getChannel() {
+			return connect();
+		}
+	};
+
+	@Override
+	public void init(DockerClientConfig dockerClientConfig) {
+		checkNotNull(dockerClientConfig, "config was not specified");
+		this.dockerClientConfig = dockerClientConfig;
+
+		bootstrap = new Bootstrap();
+
+		String scheme = dockerClientConfig.getUri().getScheme();
+
+		if ("unix".equals(scheme)) {
+			eventLoopGroup = new EpollEventLoopGroup();
+			bootstrap.group(eventLoopGroup).channel(EpollDomainSocketChannel.class)
+					.handler(new ChannelInitializer<UnixChannel>() {
+						@Override
+						protected void initChannel(final UnixChannel channel) throws Exception {
+							channel.pipeline().addLast(new HttpClientCodec());
+						}
+					});
+
+		} else if ("http".equals(scheme)) {
+			eventLoopGroup = new NioEventLoopGroup();
+
+			try {
+				final SslContext sslCtx = SslContextBuilder.forClient()
+						.trustManager(InsecureTrustManagerFactory.INSTANCE).build();
+
+				InetAddress addr = InetAddress.getLoopbackAddress();
+
+				final SocketAddress proxyAddress = new InetSocketAddress(addr, 8008);
+
+				bootstrap.group(eventLoopGroup).channel(NioSocketChannel.class)
+						.handler(new ChannelInitializer<SocketChannel>() {
+							@Override
+							protected void initChannel(final SocketChannel channel) throws Exception {
+								// channel.pipeline().addLast(new
+								// HttpProxyHandler(proxyAddress));
+
+								// channel.pipeline().addLast(sslCtx.newHandler(channel.alloc()));
+								HttpClientCodec httpClientCodec = new HttpClientCodec();
+
+								channel.pipeline().addLast(new LoggingHandler(LogLevel.DEBUG));
+								channel.pipeline().addLast(httpClientCodec);
+
+							}
+						});
+
+			} catch (SSLException e1) {
+				// TODO Auto-generated catch block
+				e1.printStackTrace();
+			}
+
+		}
+
+	}
+
+	private Channel connect() {
+		try {
+			return connect(bootstrap);
+		} catch (InterruptedException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	private Channel connect(final Bootstrap bootstrap) throws InterruptedException {
+
+		String scheme = dockerClientConfig.getUri().getScheme();
+
+		if ("unix".equals(scheme)) {
+			return bootstrap.connect(new DomainSocketAddress("/var/run/docker.sock")).sync().channel();
+		} else if ("http".equals(scheme)) {
+			String host = dockerClientConfig.getUri().getHost();
+			int port = dockerClientConfig.getUri().getPort();
+
+			if (port == -1) {
+				throw new RuntimeException("no port configured for " + host);
+			}
+
+			return bootstrap.connect(host, port).sync().channel();
+		} else {
+			throw new RuntimeException("unsupported protocol scheme: " + scheme);
+		}
+
+	}
+
+	protected DockerClientConfig getDockerClientConfig() {
+		checkNotNull(dockerClientConfig,
+				"Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!");
+		return dockerClientConfig;
+	}
+
+	@Override
+	public AuthCmd.Exec createAuthCmdExec() {
+		return null; // new AuthCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public InfoCmd.Exec createInfoCmdExec() {
+		return new InfoCmdExec(new WebTarget(channelProvider), getDockerClientConfig());
+	}
+
+	@Override
+	public PingCmd.Exec createPingCmdExec() {
+		return null; // new PingCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public VersionCmd.Exec createVersionCmdExec() {
+		return null; // new VersionCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public PullImageCmd.Exec createPullImageCmdExec() {
+		return null; // new PullImageCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public PushImageCmd.Exec createPushImageCmdExec() {
+		return null; // new PushImageCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public SaveImageCmd.Exec createSaveImageCmdExec() {
+		return null; // new SaveImageCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public CreateImageCmd.Exec createCreateImageCmdExec() {
+		return null; // new CreateImageCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public SearchImagesCmd.Exec createSearchImagesCmdExec() {
+		return null; // new SearchImagesCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public RemoveImageCmd.Exec createRemoveImageCmdExec() {
+		return null; // new RemoveImageCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public ListImagesCmd.Exec createListImagesCmdExec() {
+		return null; // new ListImagesCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public InspectImageCmd.Exec createInspectImageCmdExec() {
+		return null; // new InspectImageCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public ListContainersCmd.Exec createListContainersCmdExec() {
+		return null; // new ListContainersCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public CreateContainerCmd.Exec createCreateContainerCmdExec() {
+		return null; // new CreateContainerCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public StartContainerCmd.Exec createStartContainerCmdExec() {
+		return null; // new StartContainerCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public InspectContainerCmd.Exec createInspectContainerCmdExec() {
+		return null; // new InspectContainerCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public ExecCreateCmd.Exec createExecCmdExec() {
+		return new ExecCreateCmdExec(new WebTarget(channelProvider), getDockerClientConfig());
+	}
+
+	@Override
+	public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
+		return null; // new RemoveContainerCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public WaitContainerCmd.Exec createWaitContainerCmdExec() {
+		return null; // new WaitContainerCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public AttachContainerCmd.Exec createAttachContainerCmdExec() {
+		return null; // new AttachContainerCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public ExecStartCmd.Exec createExecStartCmdExec() {
+
+		return new ExecStartCmdExec(new WebTarget(channelProvider), getDockerClientConfig());
+	}
+
+	@Override
+	public InspectExecCmd.Exec createInspectExecCmdExec() {
+		return null; // new InspectExecCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public LogContainerCmd.Exec createLogContainerCmdExec() {
+		return null; // new LogContainerCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
+		return null; // new CopyFileFromContainerCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public StopContainerCmd.Exec createStopContainerCmdExec() {
+		return null; // new StopContainerCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
+		return null; // new ContainerDiffCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public KillContainerCmd.Exec createKillContainerCmdExec() {
+		return null; // new KillContainerCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public RestartContainerCmd.Exec createRestartContainerCmdExec() {
+		return null; // new RestartContainerCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public CommitCmd.Exec createCommitCmdExec() {
+		return null; // new CommitCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public BuildImageCmd.Exec createBuildImageCmdExec() {
+		return null; // new BuildImageCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public TopContainerCmd.Exec createTopContainerCmdExec() {
+		return null; // new TopContainerCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public TagImageCmd.Exec createTagImageCmdExec() {
+		return null; // new TagImageCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public PauseContainerCmd.Exec createPauseContainerCmdExec() {
+		return null; // new PauseContainerCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
+		return null; // new UnpauseContainerCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public EventsCmd.Exec createEventsCmdExec() {
+		return null; // new EventsCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public StatsCmd.Exec createStatsCmdExec() {
+		return null; // new StatsCmdExec(getBaseResource(),
+						// getDockerClientConfig());
+	}
+
+	@Override
+	public void close() throws IOException {
+		// checkNotNull(client, "Factory not initialized. You probably forgot to
+		// call init()!");
+		// client.close();
+
+		eventLoopGroup.shutdownGracefully();
+	}
+
+	public static void main(String[] args) throws IOException {
+		DockerCmdExecFactory execFactory = new DockerCmdExecFactoryImpl();
+		// execFactory.init(new
+		// DockerClientConfigBuilder().withUri("unix:///var/run/docker.sock").build());
+		execFactory.init(new DockerClientConfigBuilder().withUri("http://localhost:2375").build());
+
+		// InfoCmd.Exec exec = execFactory.createInfoCmdExec();
+		//
+		// InfoCmd infoCmd = new InfoCmdImpl(exec);
+		//
+		// Info info = infoCmd.exec();
+		//
+		// System.out.println("result: " + info);
+		//
+		// infoCmd.close();
+
+		ExecCreateCmd.Exec execCreate = execFactory.createExecCmdExec();
+
+		ExecCreateCmd execCreateCmd = new ExecCreateCmdImpl(execCreate, "test").withCmd("/bin/bash")
+				.withAttachStdout(true).withAttachStderr(true).withAttachStdin(true);
+
+		ExecCreateCmdResponse execCreateCmdResponse = execCreate.exec(execCreateCmd);
+
+		System.out.println("result: " + execCreateCmdResponse);
+
+		ExecStartCmd.Exec execStart = execFactory.createExecStartCmdExec();
+
+		ExecStartCmd execStartCmd = new ExecStartCmdImpl(execStart, execCreateCmdResponse.getId()).withDetach(false)
+				.withTty(true);
+
+		InputStream response = execStart.exec(execStartCmd);
+
+//		FrameReader frameReader = new FrameReader(response);
+//
+//		System.out.println("read frame");
+//		Frame frame  = frameReader.readFrame();
+//		
+//		while(frame != null) {
+//			System.out.println("frame: " + frame);
+//			frame = frameReader.readFrame();
+//		}
+//		System.out.println("all frames read");
+//		
+//		System.out.flush();
+
+		// System.out.println("response: " + IOUtils.toString(response,
+		// "UTF-8"));
+
+		//execFactory.close();
+	}
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/ExecCreateCmdExec.java b/src/main/java/com/github/dockerjava/netty/ExecCreateCmdExec.java
new file mode 100644
index 000000000..10e5ad9d8
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/ExecCreateCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.netty;
+
+import com.github.dockerjava.api.command.ExecCreateCmd;
+import com.github.dockerjava.api.command.ExecCreateCmdResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.AbstrSyncDockerCmdExec;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ExecCreateCmdExec extends AbstrSyncDockerCmdExec<ExecCreateCmd, ExecCreateCmdResponse>
+		implements ExecCreateCmd.Exec {
+	
+	private static final Logger LOGGER = LoggerFactory.getLogger(ExecCreateCmdExec.class);
+
+	public ExecCreateCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+		super(baseResource, dockerClientConfig);
+	}
+
+	@Override
+	protected ExecCreateCmdResponse execute(ExecCreateCmd command) {
+		WebTarget webResource = getBaseResource().path("/containers/{id}/exec").resolveTemplate("id",
+				command.getContainerId());
+
+		LOGGER.trace("POST: {}", webResource);
+
+		return webResource.request().accept(MediaType.APPLICATION_JSON)
+				.post(command, ExecCreateCmdResponse.class);
+	}
+}
diff --git a/src/main/java/com/github/dockerjava/netty/ExecStartCmdExec.java b/src/main/java/com/github/dockerjava/netty/ExecStartCmdExec.java
new file mode 100644
index 000000000..b158bf4e2
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/ExecStartCmdExec.java
@@ -0,0 +1,29 @@
+package com.github.dockerjava.netty;
+
+import java.io.InputStream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.command.ExecStartCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+
+public class ExecStartCmdExec extends AbstrSyncDockerCmdExec<ExecStartCmd, InputStream> implements ExecStartCmd.Exec {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(ExecStartCmdExec.class);
+
+	public ExecStartCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+		super(baseResource, dockerClientConfig);
+	}
+
+	@Override
+	protected InputStream execute(ExecStartCmd command) {
+		WebTarget webResource = getBaseResource().path("/exec/{id}/start").resolveTemplate("id", command.getExecId());
+
+		LOGGER.trace("POST: {}", webResource);
+
+		webResource.request().accept(MediaType.APPLICATION_JSON).post(command, System.out, null, System.in);
+
+		return null;
+	}
+}
diff --git a/src/main/java/com/github/dockerjava/netty/InfoCmdExec.java b/src/main/java/com/github/dockerjava/netty/InfoCmdExec.java
new file mode 100644
index 000000000..04abf103f
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/InfoCmdExec.java
@@ -0,0 +1,42 @@
+package com.github.dockerjava.netty;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.command.InfoCmd;
+import com.github.dockerjava.api.model.Info;
+import com.github.dockerjava.core.DockerClientConfig;
+
+/**
+ * http://stackoverflow.com/questions/33296749/netty-connect-to-unix-domain-
+ * socket-failed http://netty.io/wiki/native-transports.html
+ * https://github.com/netty/netty/blob/master/example/src/main/java/io/netty/
+ * example/http/snoop/HttpSnoopClient.java
+ * 
+ * @author marcus
+ *
+ */
+public class InfoCmdExec implements InfoCmd.Exec {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(InfoCmdExec.class);
+
+	private WebTarget webResource;
+
+	private DockerClientConfig dockerClientConfig;
+	
+	public InfoCmdExec(WebTarget webResource, DockerClientConfig dockerClientConfig) {
+		this.webResource = webResource;
+		this.dockerClientConfig = dockerClientConfig;
+	}
+
+
+	@Override
+	public Info exec(InfoCmd command) {
+		return webResource.path("info").request().get(Info.class);
+	}
+
+
+	
+
+	
+}
diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
new file mode 100644
index 000000000..a257f8837
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
@@ -0,0 +1,313 @@
+package com.github.dockerjava.netty;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.commons.io.HexDump;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.netty.handler.AwaitObjectInboundHandler;
+import com.github.dockerjava.netty.handler.DeserializeJsonInboundHandler;
+import com.github.dockerjava.netty.handler.DockerRawStreamHandler;
+import com.github.dockerjava.netty.handler.HijackHttpConnectionHandler;
+import com.github.dockerjava.netty.handler.HttpRequestProvider;
+import com.github.dockerjava.netty.handler.HttpResponseInboundHandler;
+import com.github.dockerjava.netty.handler.HttpResponseStreamInboundHandler;
+import com.github.dockerjava.netty.handler.SerializeJsonOutboundHandler;
+
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpClientCodec;
+import io.netty.handler.codec.http.HttpClientUpgradeHandler;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaderValues;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.codec.http.multipart.HttpPostRequestEncoder;
+import io.netty.handler.codec.http.multipart.InterfaceHttpData;
+import io.netty.handler.codec.json.JsonObjectDecoder;
+
+public class InvocationBuilder {
+
+	private ChannelProvider channelProvider;
+	private String resource;
+	private Map<String, String> headers = new HashMap<String, String>();
+
+	public InvocationBuilder(ChannelProvider channelProvider, String resource) {
+		this.channelProvider = channelProvider;
+		this.resource = resource;
+	}
+
+	public InvocationBuilder accept(MediaType mediaType) {
+		headers.put(HttpHeaderNames.ACCEPT.toString(), mediaType.getMediaType());
+		return this;
+	}
+
+	public <T> T get(Class<T> resultType) {
+		FullHttpRequest request = prepareGetRequest(resource);
+
+		Channel channel = channelProvider.getChannel();
+
+		AwaitObjectInboundHandler<T> awaitObject = new AwaitObjectInboundHandler<T>(resultType);
+
+		channel.pipeline().addLast(new HttpResponseInboundHandler(new HttpRequestProvider() {
+			@Override
+			public HttpRequest getHttpRequest(String uri) {
+				return prepareGetRequest(uri);
+			}
+		}));
+		channel.pipeline().addLast(new JsonObjectDecoder());
+		channel.pipeline().addLast(new DeserializeJsonInboundHandler<T>(resultType));
+		channel.pipeline().addLast(awaitObject);
+
+		System.out.println("resource: " + resource);
+
+		channel.writeAndFlush(request);
+
+		// Wait for the server to close the connection.
+		try {
+			// channel.closeFuture().sync();
+			T response = awaitObject.await();
+
+			// channel.disconnect();
+
+			return response;
+		} catch (InterruptedException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	private FullHttpRequest prepareGetRequest(String uri) {
+		// Prepare the HTTP request.
+		FullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, uri);
+
+		setDefaultHeaders(request);
+		return request;
+	}
+
+	private void setDefaultHeaders(HttpRequest request) {
+		request.headers().set(HttpHeaderNames.HOST, "");
+		request.headers().set(HttpHeaderNames.CONNECTION, HttpHeaderValues.KEEP_ALIVE);
+		request.headers().set(HttpHeaderNames.ACCEPT_ENCODING, HttpHeaderValues.GZIP);
+
+		for (Map.Entry<String, String> entry : headers.entrySet()) {
+			request.headers().set((CharSequence) entry.getKey(), entry.getValue());
+		}
+	}
+
+	public <T> T post(final Object entity, Class<T> resultType) {
+
+		HttpRequest request = preparePostRequest(resource, entity);
+
+		AwaitObjectInboundHandler<T> awaitObject = new AwaitObjectInboundHandler<T>(resultType);
+
+		Channel channel = channelProvider.getChannel();
+
+		channel.pipeline().addLast(new HttpResponseInboundHandler(new HttpRequestProvider() {
+			@Override
+			public HttpRequest getHttpRequest(String uri) {
+				return preparePostRequest(uri, entity);
+			}
+		}));
+		channel.pipeline().addLast(new JsonObjectDecoder());
+		channel.pipeline().addLast(new DeserializeJsonInboundHandler<T>(resultType));
+		channel.pipeline().addLast(awaitObject);
+
+		System.out.println("resource: " + resource);
+		System.out.println(channel.isActive());
+
+		channel.writeAndFlush(request);
+
+		// Wait for the server to close the connection.
+		try {
+			// channel.closeFuture().sync();
+			T response = awaitObject.await();
+
+			return response;
+		} catch (InterruptedException e) {
+			throw new RuntimeException(e);
+		}
+
+	}
+
+	public InputStream post(final Object entity, final InputStream stdin) {
+
+		HttpRequest request = preparePostRequest(resource, entity);
+
+		HttpResponseStreamInboundHandler streamHandler = new HttpResponseStreamInboundHandler();
+
+		final Channel channel = channelProvider.getChannel();
+		
+		HijackHttpConnectionHandler hijackHandler = new HijackHttpConnectionHandler();
+		channel.pipeline()
+				.addLast(new HttpClientUpgradeHandler(new HttpClientCodec(), hijackHandler, Integer.MAX_VALUE));
+		channel.pipeline().addLast(new HttpResponseInboundHandler(new HttpRequestProvider() {
+			@Override
+			public HttpRequest getHttpRequest(String uri) {
+				return preparePostRequest(uri, entity);
+			}
+		}));
+
+		channel.pipeline().addLast(streamHandler);
+
+		System.out.println("resource: " + resource);
+		System.out.println(channel.isActive());
+
+		channel.writeAndFlush(request);
+
+		// wait for successful http upgrade procedure
+		hijackHandler.await();
+
+//		Iterator<Entry<String, ChannelHandler>> iterator = channel.pipeline().iterator();
+//
+//		while (iterator.hasNext()) {
+//			Entry<String, ChannelHandler> next = iterator.next();
+//			System.out.println(next.getValue());
+//		}
+
+		// start a new thread that reads from stdin and writes to the channel
+		new Thread(new Runnable() {
+			
+			@Override
+			public void run() {
+				
+				BufferedReader reader = new BufferedReader(new InputStreamReader(stdin));
+				
+				int read = -1;
+				while((read = read(reader)) != -1) {
+					byte[] bytes = ByteBuffer.allocate(4).putInt(read).array();
+					channel.writeAndFlush(Unpooled.copiedBuffer(bytes));
+				}
+			}
+
+			private int read(BufferedReader reader) {
+				try {
+					return reader.read();
+				} catch (IOException e) {
+					throw new RuntimeException(e);
+				}
+			}
+		}).start();
+		
+		return streamHandler.getInputStream();
+	}
+	
+	public void post(final Object entity, final OutputStream stdout, final OutputStream stderr, final InputStream stdin) {
+
+		HttpRequest request = preparePostRequest(resource, entity);
+
+		DockerRawStreamHandler streamHandler = new DockerRawStreamHandler(stdout, stderr);
+
+		final Channel channel = channelProvider.getChannel();
+		
+		HijackHttpConnectionHandler hijackHandler = new HijackHttpConnectionHandler();
+		channel.pipeline()
+				.addLast(new HttpClientUpgradeHandler(new HttpClientCodec(), hijackHandler, Integer.MAX_VALUE));
+		channel.pipeline().addLast(new HttpResponseInboundHandler(new HttpRequestProvider() {
+			@Override
+			public HttpRequest getHttpRequest(String uri) {
+				return preparePostRequest(uri, entity);
+			}
+		}));
+
+		channel.pipeline().addLast(streamHandler);
+
+		System.out.println("resource: " + resource);
+		System.out.println(channel.isActive());
+
+		channel.writeAndFlush(request);
+
+		// wait for successful http upgrade procedure
+		hijackHandler.await();
+
+//		Iterator<Entry<String, ChannelHandler>> iterator = channel.pipeline().iterator();
+//
+//		while (iterator.hasNext()) {
+//			Entry<String, ChannelHandler> next = iterator.next();
+//			System.out.println(next.getValue());
+//		}
+
+		// start a new thread that reads from stdin and writes to the channel
+		new Thread(new Runnable() {
+			
+			@Override
+			public void run() {
+				
+				BufferedReader reader = new BufferedReader(new InputStreamReader(stdin, Charset.forName("UTF-8")));
+				
+				int read = -1;
+				while((read = read(reader)) != -1) {
+					byte[] bytes = ByteBuffer.allocate(4).putInt(read).array();
+					try {
+						bytes = new String(bytes).getBytes("US-ASCII");
+						
+						HexDump.dump(bytes, 0, System.err, 0);
+					} catch (UnsupportedEncodingException e) {
+						throw new RuntimeException(e);
+					} catch (ArrayIndexOutOfBoundsException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					} catch (IllegalArgumentException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					} catch (IOException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+					
+					channel.writeAndFlush(Unpooled.copiedBuffer(bytes));
+				}
+			}
+
+			private int read(BufferedReader reader) {
+				try {
+					return reader.read();
+				} catch (IOException e) {
+					throw new RuntimeException(e);
+				}
+			}
+		}).start();
+		
+		
+	}
+
+
+	private HttpRequest preparePostRequest(String uri, Object entity) {
+		// Prepare the HTTP request.
+		FullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, uri);
+
+		setDefaultHeaders(request);
+
+		byte[] bytes;
+		try {
+			bytes = new ObjectMapper().writeValueAsBytes(entity);
+		} catch (JsonProcessingException e) {
+			throw new RuntimeException(e);
+		}
+
+		request.headers().set(HttpHeaderNames.CONTENT_TYPE, "application/json");
+		request.content().clear().writeBytes(Unpooled.copiedBuffer(bytes));
+		request.headers().set(HttpHeaderNames.CONTENT_LENGTH, bytes.length);
+
+		return request;
+	}
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/MediaType.java b/src/main/java/com/github/dockerjava/netty/MediaType.java
new file mode 100644
index 000000000..347b9de72
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/MediaType.java
@@ -0,0 +1,16 @@
+package com.github.dockerjava.netty;
+
+public enum MediaType {
+
+	APPLICATION_JSON("application/json");
+	
+	private String mediaType;
+	
+	private MediaType(String mediaType) {
+		this.mediaType = mediaType;
+	}
+	
+	public String getMediaType() {
+		return mediaType;
+	}
+}
diff --git a/src/main/java/com/github/dockerjava/netty/WebTarget.java b/src/main/java/com/github/dockerjava/netty/WebTarget.java
new file mode 100644
index 000000000..7c8970d33
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/WebTarget.java
@@ -0,0 +1,69 @@
+package com.github.dockerjava.netty;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
+
+import io.netty.channel.Channel;
+
+public class WebTarget {
+	
+	private ChannelProvider channelProvider;
+	
+	private List<String> path = new ArrayList<String>();
+	
+	private Map<String, String> queryParams = new HashMap<String, String>();
+	
+	private static String PATH_SEPARATOR = "/";
+	
+	public WebTarget(ChannelProvider channelProvider) {
+		this.channelProvider = channelProvider;
+	}
+	
+	public WebTarget path(String... components) {
+		
+		for(String component : components) {
+			
+			path.addAll(Arrays.asList(StringUtils.split(component, PATH_SEPARATOR)));
+		}
+		
+		return this;
+	}
+	
+	public InvocationBuilder request() {
+		String resource = PATH_SEPARATOR + StringUtils.join(path, PATH_SEPARATOR);
+		
+		List<String> params = new ArrayList<String>();
+		for(Map.Entry<String, String> entry : queryParams.entrySet()) {
+			params.add(entry.getKey() + "=" + entry.getValue());
+		}
+		
+		if(!params.isEmpty()) {
+			resource = resource + "?" + StringUtils.join(params, "&");
+		}
+		
+		return new InvocationBuilder(channelProvider, resource);
+	}
+	
+	public WebTarget resolveTemplate(String name, Object value) {
+		List<String> newPath = new ArrayList<String>();
+		for(String component : path) {
+			component = component.replaceAll("\\{" + name + "\\}", value.toString());
+			newPath.add(component);
+		}
+		path = newPath;
+		return this;
+	}
+	
+	public WebTarget queryParam(String name, Object value) {
+		queryParams.put(name, value.toString());
+		return this;
+	}
+	
+
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/handler/AwaitObjectInboundHandler.java b/src/main/java/com/github/dockerjava/netty/handler/AwaitObjectInboundHandler.java
new file mode 100644
index 000000000..806e76d31
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/handler/AwaitObjectInboundHandler.java
@@ -0,0 +1,39 @@
+package com.github.dockerjava.netty.handler;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+
+public class AwaitObjectInboundHandler<T> extends SimpleChannelInboundHandler<T> {
+	
+	public AwaitObjectInboundHandler(Class<T> clazz) {
+		super(clazz);
+	}
+	
+	private CountDownLatch countDownLatch = new CountDownLatch(1);
+	
+	private T object;
+	
+	@Override
+	protected void channelRead0(ChannelHandlerContext ctx, T msg) throws Exception {
+		object = msg;
+		countDownLatch.countDown();
+	}
+
+	public T await() throws InterruptedException {
+		countDownLatch.await();
+		return object;
+	}
+	
+	@Override
+	public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+		cause.printStackTrace();
+		ctx.close();
+	}
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/handler/DeserializeJsonInboundHandler.java b/src/main/java/com/github/dockerjava/netty/handler/DeserializeJsonInboundHandler.java
new file mode 100644
index 000000000..d2a23988d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/handler/DeserializeJsonInboundHandler.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.netty.handler;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+
+public class DeserializeJsonInboundHandler<T> extends SimpleChannelInboundHandler<ByteBuf>{
+	
+	private Class<T> clazz;
+		
+	public DeserializeJsonInboundHandler(Class<T> clazz) {
+		this.clazz = clazz;
+	}
+	
+	@Override
+	protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
+		byte[] buffer = new byte[msg.readableBytes()];
+		msg.readBytes(buffer);
+
+		T object = null;
+		try {
+			object = new ObjectMapper().readValue(buffer, clazz);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+
+		ctx.fireChannelRead(object);
+	}
+}
diff --git a/src/main/java/com/github/dockerjava/netty/handler/DockerRawStreamHandler.java b/src/main/java/com/github/dockerjava/netty/handler/DockerRawStreamHandler.java
new file mode 100644
index 000000000..7d2e501f5
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/handler/DockerRawStreamHandler.java
@@ -0,0 +1,124 @@
+package com.github.dockerjava.netty.handler;
+
+import java.io.OutputStream;
+
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.StreamType;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+
+public class DockerRawStreamHandler extends SimpleChannelInboundHandler<ByteBuf> {
+
+	private static final int HEADER_SIZE = 8;
+
+	private final ByteBuf rawBuffer = Unpooled.buffer(1000);
+
+	private OutputStream stdout, stderr;
+
+	private byte[] header = new byte[HEADER_SIZE];
+
+	private int headerCnt = 0;
+
+	private int payloadCnt = 0;
+
+	public DockerRawStreamHandler(OutputStream stdout, OutputStream stderr) {
+		this.stdout = stdout;
+		this.stderr = stderr;
+	}
+
+	@Override
+	protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
+
+		// System.out.println("msg: " + msg.readableBytes());
+		rawBuffer.writeBytes(msg.copy());
+		// System.out.println("readableBytes: " + rawBuffer.readableBytes());
+
+		Frame frame = null;
+
+		do {
+			if (frame != null) {
+				switch (frame.getStreamType()) {
+				case STDOUT:
+					if (stdout != null) {
+						stdout.write(frame.getPayload());
+						stdout.flush();
+					}
+					break;
+				case STDERR:
+					if (stderr != null) {
+						stderr.write(frame.getPayload());
+						stderr.flush();
+					}
+					break;
+				}
+				headerCnt = 0;
+				payloadCnt = 0;
+			}
+		} while ((frame = decode()) != null);
+
+	}
+
+	private int read(byte[] buf, int offset, int length) {
+		length = Math.min(rawBuffer.readableBytes(), length);
+		rawBuffer.readBytes(buf, offset, length);
+		return length;
+	}
+
+	private Frame decode() {
+		if (headerCnt < HEADER_SIZE) {
+
+			int headerCount = read(header, headerCnt, HEADER_SIZE - headerCnt);
+
+			if (headerCount == 0) {
+				return null;
+			}
+			headerCnt += headerCount;
+
+			if (headerCnt < HEADER_SIZE)
+				return null;
+		}
+
+		StreamType streamType = streamType(header[0]);
+
+		int payloadSize = ((header[4] & 0xff) << 24) + ((header[5] & 0xff) << 16) + ((header[6] & 0xff) << 8)
+				+ (header[7] & 0xff);
+
+		byte[] payload = new byte[payloadSize];
+
+		int count = read(payload, payloadCnt, payloadSize - payloadCnt);
+
+		if (count == 0)
+			return null;
+
+		payloadCnt += count;
+
+		if (payloadCnt < payloadSize)
+			return null;
+
+		return new Frame(streamType, payload);
+
+	}
+
+	@Override
+	public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+		cause.printStackTrace();
+		ctx.close();
+	}
+
+	private static StreamType streamType(byte streamType) {
+		switch (streamType) {
+		case 0:
+			return StreamType.STDIN;
+		case 1:
+			return StreamType.STDOUT;
+		case 2:
+			return StreamType.STDERR;
+		default:
+			return StreamType.RAW;
+		}
+	}
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HijackHttpConnectionHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HijackHttpConnectionHandler.java
new file mode 100644
index 000000000..1a4a6673b
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/handler/HijackHttpConnectionHandler.java
@@ -0,0 +1,57 @@
+package com.github.dockerjava.netty.handler;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import java.util.concurrent.CountDownLatch;
+
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpClientCodec;
+import io.netty.handler.codec.http.HttpClientUpgradeHandler;
+import io.netty.handler.codec.http.HttpRequest;
+
+public class HijackHttpConnectionHandler implements HttpClientUpgradeHandler.UpgradeCodec {
+	
+	private CountDownLatch latch = new CountDownLatch(1);
+	
+	@Override
+	public void upgradeTo(ChannelHandlerContext ctx, FullHttpResponse upgradeResponse)
+			throws Exception {
+		System.out.println("UPGRADED");
+		latch.countDown();
+//		ChannelHandler removed = ctx.pipeline().remove(HttpClientCodec.class);
+//		
+//		System.out.println("removed: " + removed);
+		
+		
+		
+		
+
+	}
+
+	@Override
+	public Collection<CharSequence> setUpgradeHeaders(ChannelHandlerContext ctx,
+			HttpRequest upgradeRequest) {
+		return Collections.emptyList();
+	}
+
+	@Override
+	public CharSequence protocol() {
+		return "tcp";
+	}
+	
+	public void await() {
+		try {
+			latch.await();
+			System.out.println("upgrade awaited");
+		} catch (InterruptedException e) {
+			throw new RuntimeException(e);
+		}
+	}
+	
+	
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java b/src/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java
new file mode 100644
index 000000000..9777a1098
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java
@@ -0,0 +1,9 @@
+package com.github.dockerjava.netty.handler;
+
+import io.netty.handler.codec.http.HttpRequest;
+
+public interface HttpRequestProvider {
+	
+	HttpRequest getHttpRequest(String uri);
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseInboundHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseInboundHandler.java
new file mode 100644
index 000000000..143e5dcf5
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseInboundHandler.java
@@ -0,0 +1,128 @@
+package com.github.dockerjava.netty.handler;
+
+import java.nio.charset.Charset;
+
+import com.github.dockerjava.api.BadRequestException;
+import com.github.dockerjava.api.ConflictException;
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.InternalServerErrorException;
+import com.github.dockerjava.api.NotAcceptableException;
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.NotModifiedException;
+import com.github.dockerjava.api.UnauthorizedException;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpObject;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.LastHttpContent;
+
+public class HttpResponseInboundHandler extends SimpleChannelInboundHandler<HttpObject> {
+
+	private HttpRequestProvider requestProvider;
+
+	private HttpResponse response;
+
+	private ByteBuf body = Unpooled.buffer();
+
+	public HttpResponseInboundHandler(HttpRequestProvider requestProvider) {
+		super(false);
+		this.requestProvider = requestProvider;
+	}
+
+	@Override
+	protected void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Exception {
+		if (msg instanceof HttpResponse) {
+			HttpResponse response = (HttpResponse) msg;
+
+			System.err.println("STATUS: " + response.status());
+			System.err.println("VERSION: " + response.protocolVersion());
+			System.err.println();
+
+			this.response = response;
+
+			if (!response.headers().isEmpty()) {
+				for (CharSequence name : response.headers().names()) {
+					for (CharSequence value : response.headers().getAll(name)) {
+						System.err.println("HEADER: " + name + " = " + value);
+					}
+				}
+				System.err.println();
+			}
+
+		} else if (msg instanceof HttpContent) {
+			//System.err.println("Got http content");
+
+			HttpContent content = (HttpContent) msg;
+
+			ByteBuf byteBuf = content.content();
+
+			switch (response.status().code()) {
+			case 200:
+			case 201:
+			case 204:
+				ctx.fireChannelRead(byteBuf);
+				break;
+			default:
+				body.writeBytes(byteBuf);
+			}
+
+			if (content instanceof LastHttpContent) {
+
+				try {
+					switch (response.status().code()) {
+					case 200:
+					case 201:
+					case 204:
+
+						break;
+					case 301:
+					case 302:
+						if (response.headers().contains(HttpHeaderNames.LOCATION)) {
+							String location = response.headers().get(HttpHeaderNames.LOCATION);
+							System.out.println("redirected to :" + location);
+							HttpRequest redirected = requestProvider.getHttpRequest(location);
+
+							ctx.channel().writeAndFlush(redirected);
+						} else {
+							ctx.fireExceptionCaught(new RuntimeException("missing 'location' header for redirect"));
+						}
+						break;
+					case 304:
+						throw new NotModifiedException(getBodyAsMessage(body));
+					case 400:
+						throw new BadRequestException(getBodyAsMessage(body));
+					case 401:
+						throw new UnauthorizedException(getBodyAsMessage(body));
+					case 404:
+						throw new NotFoundException(getBodyAsMessage(body));
+					case 406:
+						throw new NotAcceptableException(getBodyAsMessage(body));
+					case 409:
+						throw new ConflictException(getBodyAsMessage(body));
+					case 500:
+						throw new InternalServerErrorException(getBodyAsMessage(body));
+					default:
+						throw new DockerException(getBodyAsMessage(body), response.status().code());
+					}
+				} finally {
+					 //ctx.close();
+				}
+
+			}
+		} else {
+			System.err.println("UNKNOWN");
+		}
+
+	}
+
+	private String getBodyAsMessage(ByteBuf body) {
+		return body.readBytes(body.readableBytes()).toString(Charset.forName("UTF-8"));
+	}
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamInboundHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamInboundHandler.java
new file mode 100644
index 000000000..854cb7b2a
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamInboundHandler.java
@@ -0,0 +1,93 @@
+package com.github.dockerjava.netty.handler;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.LinkedTransferQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.apache.commons.io.HexDump;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+
+public class HttpResponseStreamInboundHandler extends SimpleChannelInboundHandler<ByteBuf> {
+
+	private CountDownLatch latch = new CountDownLatch(1);
+	private HttpResponseInputStream stream = new HttpResponseInputStream();
+
+	@Override
+	protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
+
+		latch.countDown();
+		stream.write(msg.copy());
+
+		//System.out.println("got data: " + msg.readableBytes());
+
+		if (msg.readableBytes() == 0) {			
+			stream.close();
+		}
+	}
+
+	@Override
+	public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+		cause.printStackTrace();
+		ctx.close();
+	}
+
+	public InputStream getInputStream() {
+		try {
+			latch.await();
+		} catch (InterruptedException e) {
+			throw new RuntimeException(e);
+		}
+		return stream;
+	}
+
+	public static class HttpResponseInputStream extends InputStream {
+
+		private AtomicBoolean closed = new AtomicBoolean(false);
+
+		private LinkedTransferQueue<ByteBuf> queue = new LinkedTransferQueue<ByteBuf>();
+
+		private ByteBuf current = null;
+
+		public void write(ByteBuf byteBuf) {
+			queue.put(byteBuf);
+		}
+
+		@Override
+		public void close() throws IOException {
+			closed.set(true);
+			super.close();
+		}
+
+		@Override
+		public int read() throws IOException {
+			if (closed.get())
+				return -1;
+
+			if (current == null || current.readableBytes() == 0) {
+				try {
+					current = queue.poll(10, TimeUnit.SECONDS);
+				} catch (InterruptedException e) {
+					throw new RuntimeException(e);
+				}
+			}
+			
+			if(current != null && current.readableBytes() > 0) {
+				return current.readByte();
+			} else {
+				return read();
+			}
+			
+			
+
+			
+		}
+
+	}
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/handler/SerializeJsonOutboundHandler.java b/src/main/java/com/github/dockerjava/netty/handler/SerializeJsonOutboundHandler.java
new file mode 100644
index 000000000..4505c02a9
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/handler/SerializeJsonOutboundHandler.java
@@ -0,0 +1,19 @@
+package com.github.dockerjava.netty.handler;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
+
+public class SerializeJsonOutboundHandler extends MessageToByteEncoder<Object>{
+	
+	private ObjectMapper mapper = new ObjectMapper();
+
+	@Override
+	protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception {
+		byte[] serialized = mapper.writeValueAsBytes(msg);
+		System.out.println("serialized: " + new String(serialized));
+		out.writeBytes(serialized);
+	}
+}

From 4a81097e4875c995b1922484f0eb39c77acd7b31 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Sat, 14 Nov 2015 16:35:08 +0100
Subject: [PATCH 0285/1272] Removed some debug output

---
 .../dockerjava/netty/InvocationBuilder.java   | 75 ++++---------------
 1 file changed, 16 insertions(+), 59 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
index a257f8837..b4f0fb1ee 100644
--- a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
+++ b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
@@ -7,15 +7,9 @@
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.commons.io.HexDump;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -26,12 +20,9 @@
 import com.github.dockerjava.netty.handler.HttpRequestProvider;
 import com.github.dockerjava.netty.handler.HttpResponseInboundHandler;
 import com.github.dockerjava.netty.handler.HttpResponseStreamInboundHandler;
-import com.github.dockerjava.netty.handler.SerializeJsonOutboundHandler;
 
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelHandler;
 import io.netty.handler.codec.http.DefaultFullHttpRequest;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpClientCodec;
@@ -41,8 +32,6 @@
 import io.netty.handler.codec.http.HttpMethod;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpVersion;
-import io.netty.handler.codec.http.multipart.HttpPostRequestEncoder;
-import io.netty.handler.codec.http.multipart.InterfaceHttpData;
 import io.netty.handler.codec.json.JsonObjectDecoder;
 
 public class InvocationBuilder {
@@ -155,7 +144,7 @@ public InputStream post(final Object entity, final InputStream stdin) {
 		HttpResponseStreamInboundHandler streamHandler = new HttpResponseStreamInboundHandler();
 
 		final Channel channel = channelProvider.getChannel();
-		
+
 		HijackHttpConnectionHandler hijackHandler = new HijackHttpConnectionHandler();
 		channel.pipeline()
 				.addLast(new HttpClientUpgradeHandler(new HttpClientCodec(), hijackHandler, Integer.MAX_VALUE));
@@ -168,31 +157,21 @@ public HttpRequest getHttpRequest(String uri) {
 
 		channel.pipeline().addLast(streamHandler);
 
-		System.out.println("resource: " + resource);
-		System.out.println(channel.isActive());
-
 		channel.writeAndFlush(request);
 
 		// wait for successful http upgrade procedure
 		hijackHandler.await();
 
-//		Iterator<Entry<String, ChannelHandler>> iterator = channel.pipeline().iterator();
-//
-//		while (iterator.hasNext()) {
-//			Entry<String, ChannelHandler> next = iterator.next();
-//			System.out.println(next.getValue());
-//		}
-
 		// start a new thread that reads from stdin and writes to the channel
 		new Thread(new Runnable() {
-			
+
 			@Override
 			public void run() {
-				
+
 				BufferedReader reader = new BufferedReader(new InputStreamReader(stdin));
-				
+
 				int read = -1;
-				while((read = read(reader)) != -1) {
+				while ((read = read(reader)) != -1) {
 					byte[] bytes = ByteBuffer.allocate(4).putInt(read).array();
 					channel.writeAndFlush(Unpooled.copiedBuffer(bytes));
 				}
@@ -206,18 +185,19 @@ private int read(BufferedReader reader) {
 				}
 			}
 		}).start();
-		
+
 		return streamHandler.getInputStream();
 	}
-	
-	public void post(final Object entity, final OutputStream stdout, final OutputStream stderr, final InputStream stdin) {
+
+	public void post(final Object entity, final OutputStream stdout, final OutputStream stderr,
+			final InputStream stdin) {
 
 		HttpRequest request = preparePostRequest(resource, entity);
 
 		DockerRawStreamHandler streamHandler = new DockerRawStreamHandler(stdout, stderr);
 
 		final Channel channel = channelProvider.getChannel();
-		
+
 		HijackHttpConnectionHandler hijackHandler = new HijackHttpConnectionHandler();
 		channel.pipeline()
 				.addLast(new HttpClientUpgradeHandler(new HttpClientCodec(), hijackHandler, Integer.MAX_VALUE));
@@ -230,49 +210,28 @@ public HttpRequest getHttpRequest(String uri) {
 
 		channel.pipeline().addLast(streamHandler);
 
-		System.out.println("resource: " + resource);
-		System.out.println(channel.isActive());
-
 		channel.writeAndFlush(request);
 
 		// wait for successful http upgrade procedure
 		hijackHandler.await();
 
-//		Iterator<Entry<String, ChannelHandler>> iterator = channel.pipeline().iterator();
-//
-//		while (iterator.hasNext()) {
-//			Entry<String, ChannelHandler> next = iterator.next();
-//			System.out.println(next.getValue());
-//		}
-
 		// start a new thread that reads from stdin and writes to the channel
 		new Thread(new Runnable() {
-			
+
 			@Override
 			public void run() {
-				
+
 				BufferedReader reader = new BufferedReader(new InputStreamReader(stdin, Charset.forName("UTF-8")));
-				
+
 				int read = -1;
-				while((read = read(reader)) != -1) {
+				while ((read = read(reader)) != -1) {
 					byte[] bytes = ByteBuffer.allocate(4).putInt(read).array();
 					try {
 						bytes = new String(bytes).getBytes("US-ASCII");
-						
-						HexDump.dump(bytes, 0, System.err, 0);
 					} catch (UnsupportedEncodingException e) {
 						throw new RuntimeException(e);
-					} catch (ArrayIndexOutOfBoundsException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					} catch (IllegalArgumentException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					} catch (IOException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
 					}
-					
+
 					channel.writeAndFlush(Unpooled.copiedBuffer(bytes));
 				}
 			}
@@ -285,10 +244,8 @@ private int read(BufferedReader reader) {
 				}
 			}
 		}).start();
-		
-		
-	}
 
+	}
 
 	private HttpRequest preparePostRequest(String uri, Object entity) {
 		// Prepare the HTTP request.

From e7f1724e8b0d069a1ce17531cf1bb92c751e986c Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Sat, 14 Nov 2015 16:36:55 +0100
Subject: [PATCH 0286/1272] Fix regression in decode algorithm for docker
 stream

---
 .../netty/handler/DockerRawStreamHandler.java | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/netty/handler/DockerRawStreamHandler.java b/src/main/java/com/github/dockerjava/netty/handler/DockerRawStreamHandler.java
index 7d2e501f5..e7f7e3377 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/DockerRawStreamHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/DockerRawStreamHandler.java
@@ -21,6 +21,8 @@ public class DockerRawStreamHandler extends SimpleChannelInboundHandler<ByteBuf>
 	private byte[] header = new byte[HEADER_SIZE];
 
 	private int headerCnt = 0;
+	
+	private byte[] payload = new byte[0];
 
 	private int payloadCnt = 0;
 
@@ -32,13 +34,13 @@ public DockerRawStreamHandler(OutputStream stdout, OutputStream stderr) {
 	@Override
 	protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
 
-		// System.out.println("msg: " + msg.readableBytes());
-		rawBuffer.writeBytes(msg.copy());
-		// System.out.println("readableBytes: " + rawBuffer.readableBytes());
+		rawBuffer.writeBytes(msg.copy(), 0, msg.readableBytes());
 
 		Frame frame = null;
 
 		do {
+			frame = decode();
+			
 			if (frame != null) {
 				switch (frame.getStreamType()) {
 				case STDOUT:
@@ -53,11 +55,15 @@ protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Excep
 						stderr.flush();
 					}
 					break;
+				default:
+					System.err.println("unknown stream type");		
 				}
+				
 				headerCnt = 0;
 				payloadCnt = 0;
-			}
-		} while ((frame = decode()) != null);
+			} 
+			
+		} while (frame != null);
 
 	}
 
@@ -86,7 +92,8 @@ private Frame decode() {
 		int payloadSize = ((header[4] & 0xff) << 24) + ((header[5] & 0xff) << 16) + ((header[6] & 0xff) << 8)
 				+ (header[7] & 0xff);
 
-		byte[] payload = new byte[payloadSize];
+		if(payloadCnt == 0)
+			payload = new byte[payloadSize];
 
 		int count = read(payload, payloadCnt, payloadSize - payloadCnt);
 

From 1f59e5a8eaeffefd34a44c7000d8877a8d9c6986 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 14 Nov 2015 20:12:28 +0300
Subject: [PATCH 0287/1272] Move exceptions into separate package

---
 .../com/github/dockerjava/api/DockerClient.java  |  1 +
 .../github/dockerjava/api/command/AuthCmd.java   |  2 +-
 .../github/dockerjava/api/command/CommitCmd.java |  2 +-
 .../dockerjava/api/command/ContainerDiffCmd.java |  6 +++---
 .../api/command/CopyFileFromContainerCmd.java    |  2 +-
 .../api/command/CreateContainerCmd.java          |  4 ++--
 .../dockerjava/api/command/ExecStartCmd.java     |  4 ++--
 .../api/command/InspectContainerCmd.java         |  2 +-
 .../dockerjava/api/command/InspectExecCmd.java   |  2 +-
 .../dockerjava/api/command/InspectImageCmd.java  |  2 +-
 .../dockerjava/api/command/KillContainerCmd.java |  2 +-
 .../api/command/PauseContainerCmd.java           |  2 +-
 .../dockerjava/api/command/PushImageCmd.java     |  2 +-
 .../api/command/RemoveContainerCmd.java          |  2 +-
 .../dockerjava/api/command/RemoveImageCmd.java   |  2 +-
 .../api/command/RestartContainerCmd.java         |  2 +-
 .../dockerjava/api/command/SaveImageCmd.java     |  4 ++--
 .../api/command/StartContainerCmd.java           |  4 ++--
 .../dockerjava/api/command/StopContainerCmd.java |  4 ++--
 .../dockerjava/api/command/TopContainerCmd.java  |  2 +-
 .../api/command/UnpauseContainerCmd.java         |  2 +-
 .../dockerjava/api/command/WaitContainerCmd.java |  2 +-
 .../api/{ => exception}/BadRequestException.java |  2 +-
 .../api/{ => exception}/ConflictException.java   |  2 +-
 .../{ => exception}/DockerClientException.java   |  2 +-
 .../api/{ => exception}/DockerException.java     |  2 +-
 .../InternalServerErrorException.java            |  2 +-
 .../{ => exception}/NotAcceptableException.java  |  2 +-
 .../api/{ => exception}/NotFoundException.java   |  2 +-
 .../{ => exception}/NotModifiedException.java    |  2 +-
 .../{ => exception}/UnauthorizedException.java   |  2 +-
 .../dockerjava/core/DockerClientConfig.java      |  2 +-
 .../com/github/dockerjava/core/FilePathUtil.java |  2 +-
 .../github/dockerjava/core/GoLangFileMatch.java  |  1 +
 .../dockerjava/core/LocalDirectorySSLConfig.java |  2 +-
 .../com/github/dockerjava/core/NameParser.java   |  1 +
 .../dockerjava/core/command/AbstrDockerCmd.java  |  2 +-
 .../dockerjava/core/command/AuthCmdImpl.java     |  2 +-
 .../core/command/BuildImageResultCallback.java   |  2 +-
 .../dockerjava/core/command/CommitCmdImpl.java   |  2 +-
 .../core/command/ContainerDiffCmdImpl.java       |  6 +++---
 .../command/CopyFileFromContainerCmdImpl.java    |  2 +-
 .../core/command/CreateContainerCmdImpl.java     |  4 ++--
 .../core/command/ExecCreateCmdImpl.java          |  2 +-
 .../core/command/ExecStartCmdImpl.java           |  4 ++--
 .../core/command/InspectContainerCmdImpl.java    |  2 +-
 .../core/command/InspectExecCmdImpl.java         |  2 +-
 .../core/command/InspectImageCmdImpl.java        |  2 +-
 .../core/command/KillContainerCmdImpl.java       |  2 +-
 .../core/command/PauseContainerCmdImpl.java      |  2 +-
 .../core/command/PullImageResultCallback.java    |  2 +-
 .../core/command/PushImageResultCallback.java    |  2 +-
 .../core/command/RemoveContainerCmdImpl.java     |  2 +-
 .../core/command/RemoveImageCmdImpl.java         |  2 +-
 .../core/command/RestartContainerCmdImpl.java    |  2 +-
 .../core/command/SaveImageCmdImpl.java           |  4 ++--
 .../core/command/StartContainerCmdImpl.java      |  4 ++--
 .../core/command/StopContainerCmdImpl.java       |  4 ++--
 .../core/command/TopContainerCmdImpl.java        |  2 +-
 .../core/command/UnpauseContainerCmdImpl.java    |  2 +-
 .../command/WaitContainerResultCallback.java     |  2 +-
 .../dockerjava/core/dockerfile/Dockerfile.java   |  4 ++--
 .../core/dockerfile/DockerfileStatement.java     |  2 +-
 .../GoLangFileMatchException.java                |  2 +-
 .../InvalidRepositoryNameException.java          |  2 +-
 .../dockerjava/jaxrs/AbstrSyncDockerCmdExec.java |  2 +-
 .../com/github/dockerjava/jaxrs/AuthCmdExec.java |  2 +-
 .../jaxrs/DockerCmdExecFactoryImpl.java          |  2 +-
 .../filter/ResponseStatusExceptionFilter.java    | 16 ++++++++--------
 .../client/AbstractDockerClientTest.java         |  2 +-
 .../dockerjava/client/DockerClientTest.java      |  2 +-
 .../dockerjava/core/GoLangFileMatchTest.java     |  1 +
 .../github/dockerjava/core/NameParserTest.java   |  1 +
 .../dockerjava/core/command/AuthCmdImplTest.java |  2 +-
 .../core/command/BuildImageCmdImplTest.java      |  2 +-
 .../core/command/CommitCmdImplTest.java          |  4 ++--
 .../core/command/ContainerDiffCmdImplTest.java   |  4 ++--
 .../CopyFileFromContainerCmdImplTest.java        |  2 +-
 .../core/command/CreateContainerCmdImplTest.java |  4 ++--
 .../core/command/DockerfileFixture.java          |  4 ++--
 .../dockerjava/core/command/InfoCmdImplTest.java |  2 +-
 .../core/command/KillContainerCmdImplTest.java   |  4 ++--
 .../core/command/ListImagesCmdImplTest.java      |  2 +-
 .../core/command/LogContainerCmdImplTest.java    |  2 +-
 .../core/command/PullImageCmdImplTest.java       |  2 +-
 .../core/command/PushImageCmdImplTest.java       |  2 +-
 .../core/command/RemoveContainerCmdImplTest.java |  4 ++--
 .../core/command/RemoveImageCmdImplTest.java     |  4 ++--
 .../command/RestartContainerCmdImplTest.java     |  4 ++--
 .../core/command/SearchImagesCmdImplTest.java    |  2 +-
 .../core/command/StartContainerCmdImplTest.java  |  6 +++---
 .../core/command/StopContainerCmdImplTest.java   |  4 ++--
 .../core/command/TagImageCmdImplTest.java        |  2 +-
 .../core/command/VersionCmdImplTest.java         |  2 +-
 .../core/command/WaitContainerCmdImplTest.java   |  4 ++--
 .../dockerfile/DockerfileStatementAddTest.java   |  2 +-
 96 files changed, 130 insertions(+), 125 deletions(-)
 rename src/main/java/com/github/dockerjava/api/{ => exception}/BadRequestException.java (90%)
 rename src/main/java/com/github/dockerjava/api/{ => exception}/ConflictException.java (90%)
 rename src/main/java/com/github/dockerjava/api/{ => exception}/DockerClientException.java (88%)
 rename src/main/java/com/github/dockerjava/api/{ => exception}/DockerException.java (92%)
 rename src/main/java/com/github/dockerjava/api/{ => exception}/InternalServerErrorException.java (91%)
 rename src/main/java/com/github/dockerjava/api/{ => exception}/NotAcceptableException.java (90%)
 rename src/main/java/com/github/dockerjava/api/{ => exception}/NotFoundException.java (92%)
 rename src/main/java/com/github/dockerjava/api/{ => exception}/NotModifiedException.java (90%)
 rename src/main/java/com/github/dockerjava/api/{ => exception}/UnauthorizedException.java (90%)
 rename src/main/java/com/github/dockerjava/core/{ => exception}/GoLangFileMatchException.java (81%)
 rename src/main/java/com/github/dockerjava/core/{ => exception}/InvalidRepositoryNameException.java (86%)

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 8b578f08e..bb0c67549 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -41,6 +41,7 @@
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Identifier;
 
diff --git a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
index da7d47a7a..168927959 100644
--- a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
@@ -3,7 +3,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import com.github.dockerjava.api.UnauthorizedException;
+import com.github.dockerjava.api.exception.UnauthorizedException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthResponse;
 
diff --git a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
index 77e19363c..c948ed7d3 100644
--- a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
@@ -3,7 +3,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.ExposedPorts;
 import com.github.dockerjava.api.model.Volumes;
 
diff --git a/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java b/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
index 42ae5e9dd..204e35fce 100644
--- a/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
@@ -5,9 +5,9 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.InternalServerErrorException;
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.InternalServerErrorException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.ChangeLog;
 
 public interface ContainerDiffCmd extends SyncDockerCmd<List<ChangeLog>> {
diff --git a/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
index e51b8ac46..5ae9f6276 100644
--- a/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
@@ -5,7 +5,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 
 public interface CopyFileFromContainerCmd extends SyncDockerCmd<InputStream> {
 
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 0a070acfa..f1c7fdd9c 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -5,8 +5,8 @@
 
 import javax.annotation.CheckForNull;
 
-import com.github.dockerjava.api.ConflictException;
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.ConflictException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Capability;
 import com.github.dockerjava.api.model.Device;
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
index c9e0d3f00..83aedc27a 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
@@ -5,7 +5,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 
 public interface ExecStartCmd extends SyncDockerCmd<InputStream> {
 
@@ -27,7 +27,7 @@ public interface ExecStartCmd extends SyncDockerCmd<InputStream> {
     /**
      * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
      *
-     * @throws com.github.dockerjava.api.NotFoundException
+     * @throws NotFoundException
      *             No such exec instance
      */
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
index 875ed7c32..b6fde3fdc 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
@@ -3,7 +3,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 
 public interface InspectContainerCmd extends SyncDockerCmd<InspectContainerResponse> {
 
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
index 4abc73e79..d1c6b48f1 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
@@ -3,7 +3,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 
 public interface InspectExecCmd extends SyncDockerCmd<InspectExecResponse> {
 
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
index 54ae3c228..2d3163533 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
@@ -3,7 +3,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 
 /**
  * Inspect the details of an image.
diff --git a/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
index c751506a5..1e8da1a18 100644
--- a/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
@@ -3,7 +3,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 
 /**
  * Kill a running container.
diff --git a/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
index be179a5c4..4ca00a90d 100644
--- a/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
@@ -3,7 +3,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 
 /**
  * Pause a container.
diff --git a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java b/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
index 3fddd0dba..9b0799553 100644
--- a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
@@ -3,7 +3,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PushResponseItem;
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
index 2214d4ae2..5cbb21171 100644
--- a/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
@@ -3,7 +3,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 
 /**
  * Remove a container.
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
index e2cb9ca22..987d29410 100644
--- a/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
@@ -3,7 +3,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 
 /**
  *
diff --git a/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
index 07e8776e3..688141a20 100644
--- a/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
@@ -3,7 +3,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 
 /**
  * Restart a running container.
diff --git a/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java b/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
index 1469eabba..272a2d564 100644
--- a/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
@@ -5,7 +5,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 
 public interface SaveImageCmd extends SyncDockerCmd<InputStream> {
 
@@ -30,7 +30,7 @@ public interface SaveImageCmd extends SyncDockerCmd<InputStream> {
     /**
      * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
      *
-     * @throws com.github.dockerjava.api.NotFoundException
+     * @throws NotFoundException
      *             No such image
      */
     public InputStream exec() throws NotFoundException;
diff --git a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
index 6c64a4d29..4be500b4f 100644
--- a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
@@ -3,8 +3,8 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import com.github.dockerjava.api.NotFoundException;
-import com.github.dockerjava.api.NotModifiedException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.exception.NotModifiedException;
 
 /**
  * Start a container.
diff --git a/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
index af63c5c92..cf7cb53c8 100644
--- a/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
@@ -3,8 +3,8 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import com.github.dockerjava.api.NotFoundException;
-import com.github.dockerjava.api.NotModifiedException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.exception.NotModifiedException;
 
 /**
  * Stop a running container.
diff --git a/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
index d3eb69c17..5c6381a71 100644
--- a/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
@@ -3,7 +3,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 
 /**
  * List processes running inside a container
diff --git a/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
index 0d7892468..5e620a079 100644
--- a/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
@@ -3,7 +3,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 
 /**
  * Unpause a container.
diff --git a/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
index 3192a8bf1..529f86bc3 100644
--- a/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
@@ -3,7 +3,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.model.BuildResponseItem;
 import com.github.dockerjava.api.model.WaitResponse;
diff --git a/src/main/java/com/github/dockerjava/api/BadRequestException.java b/src/main/java/com/github/dockerjava/api/exception/BadRequestException.java
similarity index 90%
rename from src/main/java/com/github/dockerjava/api/BadRequestException.java
rename to src/main/java/com/github/dockerjava/api/exception/BadRequestException.java
index 2696c5bc1..0934281a3 100644
--- a/src/main/java/com/github/dockerjava/api/BadRequestException.java
+++ b/src/main/java/com/github/dockerjava/api/exception/BadRequestException.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.api;
+package com.github.dockerjava.api.exception;
 
 /**
  *
diff --git a/src/main/java/com/github/dockerjava/api/ConflictException.java b/src/main/java/com/github/dockerjava/api/exception/ConflictException.java
similarity index 90%
rename from src/main/java/com/github/dockerjava/api/ConflictException.java
rename to src/main/java/com/github/dockerjava/api/exception/ConflictException.java
index 6a84fdee3..da223a79e 100644
--- a/src/main/java/com/github/dockerjava/api/ConflictException.java
+++ b/src/main/java/com/github/dockerjava/api/exception/ConflictException.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.api;
+package com.github.dockerjava.api.exception;
 
 /**
  *
diff --git a/src/main/java/com/github/dockerjava/api/DockerClientException.java b/src/main/java/com/github/dockerjava/api/exception/DockerClientException.java
similarity index 88%
rename from src/main/java/com/github/dockerjava/api/DockerClientException.java
rename to src/main/java/com/github/dockerjava/api/exception/DockerClientException.java
index 538698bb6..24139c0e1 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClientException.java
+++ b/src/main/java/com/github/dockerjava/api/exception/DockerClientException.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.api;
+package com.github.dockerjava.api.exception;
 
 /**
  *
diff --git a/src/main/java/com/github/dockerjava/api/DockerException.java b/src/main/java/com/github/dockerjava/api/exception/DockerException.java
similarity index 92%
rename from src/main/java/com/github/dockerjava/api/DockerException.java
rename to src/main/java/com/github/dockerjava/api/exception/DockerException.java
index 48bb2dd90..5b511ff96 100644
--- a/src/main/java/com/github/dockerjava/api/DockerException.java
+++ b/src/main/java/com/github/dockerjava/api/exception/DockerException.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.api;
+package com.github.dockerjava.api.exception;
 
 /**
  *
diff --git a/src/main/java/com/github/dockerjava/api/InternalServerErrorException.java b/src/main/java/com/github/dockerjava/api/exception/InternalServerErrorException.java
similarity index 91%
rename from src/main/java/com/github/dockerjava/api/InternalServerErrorException.java
rename to src/main/java/com/github/dockerjava/api/exception/InternalServerErrorException.java
index cda5602ed..451a31bac 100644
--- a/src/main/java/com/github/dockerjava/api/InternalServerErrorException.java
+++ b/src/main/java/com/github/dockerjava/api/exception/InternalServerErrorException.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.api;
+package com.github.dockerjava.api.exception;
 
 /**
  *
diff --git a/src/main/java/com/github/dockerjava/api/NotAcceptableException.java b/src/main/java/com/github/dockerjava/api/exception/NotAcceptableException.java
similarity index 90%
rename from src/main/java/com/github/dockerjava/api/NotAcceptableException.java
rename to src/main/java/com/github/dockerjava/api/exception/NotAcceptableException.java
index 78345a68b..45a2e97fc 100644
--- a/src/main/java/com/github/dockerjava/api/NotAcceptableException.java
+++ b/src/main/java/com/github/dockerjava/api/exception/NotAcceptableException.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.api;
+package com.github.dockerjava.api.exception;
 
 /**
  *
diff --git a/src/main/java/com/github/dockerjava/api/NotFoundException.java b/src/main/java/com/github/dockerjava/api/exception/NotFoundException.java
similarity index 92%
rename from src/main/java/com/github/dockerjava/api/NotFoundException.java
rename to src/main/java/com/github/dockerjava/api/exception/NotFoundException.java
index 67e6f18bf..fb1d2369f 100644
--- a/src/main/java/com/github/dockerjava/api/NotFoundException.java
+++ b/src/main/java/com/github/dockerjava/api/exception/NotFoundException.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.api;
+package com.github.dockerjava.api.exception;
 
 /**
  * Indicates that the given entity does not exist.
diff --git a/src/main/java/com/github/dockerjava/api/NotModifiedException.java b/src/main/java/com/github/dockerjava/api/exception/NotModifiedException.java
similarity index 90%
rename from src/main/java/com/github/dockerjava/api/NotModifiedException.java
rename to src/main/java/com/github/dockerjava/api/exception/NotModifiedException.java
index fa0aa459f..3e2820365 100644
--- a/src/main/java/com/github/dockerjava/api/NotModifiedException.java
+++ b/src/main/java/com/github/dockerjava/api/exception/NotModifiedException.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.api;
+package com.github.dockerjava.api.exception;
 
 /**
  *
diff --git a/src/main/java/com/github/dockerjava/api/UnauthorizedException.java b/src/main/java/com/github/dockerjava/api/exception/UnauthorizedException.java
similarity index 90%
rename from src/main/java/com/github/dockerjava/api/UnauthorizedException.java
rename to src/main/java/com/github/dockerjava/api/exception/UnauthorizedException.java
index b097d6523..2dcf8764e 100644
--- a/src/main/java/com/github/dockerjava/api/UnauthorizedException.java
+++ b/src/main/java/com/github/dockerjava/api/exception/UnauthorizedException.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.api;
+package com.github.dockerjava.api.exception;
 
 /**
  *
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index 6187be49c..6439680b9 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core;
 
-import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.core.NameParser.HostnameReposName;
diff --git a/src/main/java/com/github/dockerjava/core/FilePathUtil.java b/src/main/java/com/github/dockerjava/core/FilePathUtil.java
index b02821bde..a5d926a53 100644
--- a/src/main/java/com/github/dockerjava/core/FilePathUtil.java
+++ b/src/main/java/com/github/dockerjava/core/FilePathUtil.java
@@ -3,7 +3,7 @@
 import java.io.File;
 import java.io.IOException;
 
-import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.exception.DockerClientException;
 
 public class FilePathUtil {
 
diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index 6ebdd604b..8ce237c72 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -7,6 +7,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.github.dockerjava.core.exception.GoLangFileMatchException;
 import org.apache.commons.lang.StringUtils;
 
 /**
diff --git a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
index c667d49e6..21719c591 100644
--- a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
@@ -10,7 +10,7 @@
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.glassfish.jersey.SslConfigurator;
 
-import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.exception.DockerClientException;
 
 /**
  * SSL Config from local files.
diff --git a/src/main/java/com/github/dockerjava/core/NameParser.java b/src/main/java/com/github/dockerjava/core/NameParser.java
index 49a550b1d..10ad10bd8 100644
--- a/src/main/java/com/github/dockerjava/core/NameParser.java
+++ b/src/main/java/com/github/dockerjava/core/NameParser.java
@@ -5,6 +5,7 @@
 
 import java.util.regex.Pattern;
 
+import com.github.dockerjava.core.exception.InvalidRepositoryNameException;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
index 868bf3e97..15e92d474 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
@@ -11,7 +11,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.command.DockerCmd;
 import com.github.dockerjava.api.command.DockerCmdSyncExec;
 import com.github.dockerjava.api.command.SyncDockerCmd;
diff --git a/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
index bb112b884..16ebe03f8 100644
--- a/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import com.github.dockerjava.api.UnauthorizedException;
+import com.github.dockerjava.api.exception.UnauthorizedException;
 import com.github.dockerjava.api.command.AuthCmd;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthResponse;
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
index 9f501c8c6..2536b891b 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
@@ -8,7 +8,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.BuildResponseItem;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
index dbd437470..b619dee78 100644
--- a/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
@@ -3,7 +3,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.CommitCmd;
 import com.github.dockerjava.api.model.ExposedPorts;
 import com.github.dockerjava.api.model.Volumes;
diff --git a/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
index 2651ddb77..3d788ac7b 100644
--- a/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
@@ -4,9 +4,9 @@
 
 import java.util.List;
 
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.InternalServerErrorException;
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.InternalServerErrorException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.ContainerDiffCmd;
 import com.github.dockerjava.api.model.ChangeLog;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
index 6258fc4ed..93c7e807c 100644
--- a/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
@@ -5,7 +5,7 @@
 import java.io.InputStream;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
 
 /**
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 41f31dee4..555569f16 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -9,8 +9,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.api.ConflictException;
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.ConflictException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.model.Bind;
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
index 5df38860c..2c946f1cb 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
@@ -5,7 +5,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.ExecCreateCmd;
 import com.github.dockerjava.api.command.ExecCreateCmdResponse;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
index 72efd3052..a8e1742a0 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
@@ -4,7 +4,7 @@
 
 import java.io.InputStream;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.ExecStartCmd;
 
 public class ExecStartCmdImpl extends AbstrDockerCmd<ExecStartCmd, InputStream> implements ExecStartCmd {
@@ -53,7 +53,7 @@ public ExecStartCmd withTty(Boolean tty) {
     }
 
     /**
-     * @throws com.github.dockerjava.api.NotFoundException
+     * @throws NotFoundException
      *             No such exec instance
      */
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
index 5b4090a4e..f090d3a76 100644
--- a/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
@@ -2,7 +2,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
index 0d93afc4e..d1c0d7140 100644
--- a/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectExecResponse;
 import com.google.common.base.Preconditions;
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
index 93043f8e6..1f9735db8 100644
--- a/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
@@ -2,7 +2,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectImageResponse;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
index 45c5e38ba..3b51bd346 100644
--- a/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
@@ -2,7 +2,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.KillContainerCmd;
 
 /**
diff --git a/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
index 1102b0893..0e35f0472 100644
--- a/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
@@ -2,7 +2,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 
 /**
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
index c0eaa5d3d..1beb9e3b3 100644
--- a/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
@@ -6,7 +6,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.PullResponseItem;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
index b13b444ca..9bc3b15d7 100644
--- a/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
@@ -6,7 +6,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.PushResponseItem;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
index d23323d2f..ac4181ff6 100644
--- a/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
@@ -5,7 +5,7 @@
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 
 /**
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
index bca8d37b1..4badee130 100644
--- a/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
@@ -5,7 +5,7 @@
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.RemoveImageCmd;
 
 /**
diff --git a/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
index fe99477fa..a521fe468 100644
--- a/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
@@ -3,7 +3,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 
 /**
diff --git a/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
index 12dafb7d9..64480758c 100644
--- a/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
@@ -4,7 +4,7 @@
 
 import java.io.InputStream;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.SaveImageCmd;
 
 public class SaveImageCmdImpl extends AbstrDockerCmd<SaveImageCmd, InputStream> implements SaveImageCmd {
@@ -50,7 +50,7 @@ public SaveImageCmd withTag(String tag) {
     }
 
     /**
-     * @throws com.github.dockerjava.api.NotFoundException
+     * @throws NotFoundException
      *             No such image
      */
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
index 9d432b7f3..679c93750 100644
--- a/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
@@ -7,8 +7,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.github.dockerjava.api.NotFoundException;
-import com.github.dockerjava.api.NotModifiedException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.exception.NotModifiedException;
 import com.github.dockerjava.api.command.StartContainerCmd;
 
 /**
diff --git a/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
index bb3ff28e6..0d745bcdd 100644
--- a/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
@@ -6,8 +6,8 @@
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 
-import com.github.dockerjava.api.NotFoundException;
-import com.github.dockerjava.api.NotModifiedException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.exception.NotModifiedException;
 import com.github.dockerjava.api.command.StopContainerCmd;
 
 /**
diff --git a/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
index 44fc97be2..fabdbe3ae 100644
--- a/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
@@ -5,7 +5,7 @@
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.TopContainerResponse;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
index 949a7bb6f..2b9b19de3 100644
--- a/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
@@ -2,7 +2,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 
 /**
diff --git a/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java b/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
index 48f2749dc..cc255fcea 100644
--- a/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
@@ -10,7 +10,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.WaitResponse;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
 import com.google.common.base.Throwables;
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index c9bd37d1e..2084b2cce 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -1,10 +1,10 @@
 package com.github.dockerjava.core.dockerfile;
 
-import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.core.CompressArchiveUtil;
 import com.github.dockerjava.core.FilePathUtil;
 import com.github.dockerjava.core.GoLangFileMatch;
-import com.github.dockerjava.core.GoLangFileMatchException;
+import com.github.dockerjava.core.exception.GoLangFileMatchException;
 import com.github.dockerjava.core.GoLangMatchFileFilter;
 import com.google.common.base.Function;
 import com.google.common.base.Objects;
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java b/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
index 2c06312a1..91ff755db 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
@@ -8,7 +8,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.exception.DockerClientException;
 import com.google.common.base.Function;
 import com.google.common.base.Objects;
 import com.google.common.base.Optional;
diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatchException.java b/src/main/java/com/github/dockerjava/core/exception/GoLangFileMatchException.java
similarity index 81%
rename from src/main/java/com/github/dockerjava/core/GoLangFileMatchException.java
rename to src/main/java/com/github/dockerjava/core/exception/GoLangFileMatchException.java
index d1f353938..3bbdc2a72 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangFileMatchException.java
+++ b/src/main/java/com/github/dockerjava/core/exception/GoLangFileMatchException.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2014 SignalFuse, Inc.
  */
-package com.github.dockerjava.core;
+package com.github.dockerjava.core.exception;
 
 public class GoLangFileMatchException extends IllegalArgumentException {
 
diff --git a/src/main/java/com/github/dockerjava/core/InvalidRepositoryNameException.java b/src/main/java/com/github/dockerjava/core/exception/InvalidRepositoryNameException.java
similarity index 86%
rename from src/main/java/com/github/dockerjava/core/InvalidRepositoryNameException.java
rename to src/main/java/com/github/dockerjava/core/exception/InvalidRepositoryNameException.java
index 8885fc756..6b2341e31 100644
--- a/src/main/java/com/github/dockerjava/core/InvalidRepositoryNameException.java
+++ b/src/main/java/com/github/dockerjava/core/exception/InvalidRepositoryNameException.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.core;
+package com.github.dockerjava.core.exception;
 
 public class InvalidRepositoryNameException extends IllegalArgumentException {
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
index ed1ec6233..4e44d42cd 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.jaxrs;
 
-import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.command.DockerCmd;
 import com.github.dockerjava.api.command.DockerCmdSyncExec;
 import com.github.dockerjava.core.DockerClientConfig;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
index 9c59a8c02..247a6a387 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.jaxrs;
 
-import com.github.dockerjava.api.UnauthorizedException;
+import com.github.dockerjava.api.exception.UnauthorizedException;
 import com.github.dockerjava.api.command.AuthCmd;
 import com.github.dockerjava.api.model.AuthResponse;
 import com.github.dockerjava.core.DockerClientConfig;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index c331f461c..745cd67c0 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -1,7 +1,7 @@
 package com.github.dockerjava.jaxrs;
 
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
-import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd;
 import com.github.dockerjava.api.command.BuildImageCmd;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
index 3d581a0b0..e597b594b 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
@@ -12,14 +12,14 @@
 
 import org.apache.commons.io.IOUtils;
 
-import com.github.dockerjava.api.BadRequestException;
-import com.github.dockerjava.api.ConflictException;
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.InternalServerErrorException;
-import com.github.dockerjava.api.NotAcceptableException;
-import com.github.dockerjava.api.NotFoundException;
-import com.github.dockerjava.api.NotModifiedException;
-import com.github.dockerjava.api.UnauthorizedException;
+import com.github.dockerjava.api.exception.BadRequestException;
+import com.github.dockerjava.api.exception.ConflictException;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.InternalServerErrorException;
+import com.github.dockerjava.api.exception.NotAcceptableException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.exception.NotModifiedException;
+import com.github.dockerjava.api.exception.UnauthorizedException;
 
 /**
  * This {@link ClientResponseFilter} implementation detects http status codes and throws {@link DockerException}s
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index ec4aa82be..76409ebbc 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -21,7 +21,7 @@
 import org.testng.ITestResult;
 
 import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.Volume;
diff --git a/src/test/java/com/github/dockerjava/client/DockerClientTest.java b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
index d3bd75cf5..8a7d6f6a4 100644
--- a/src/test/java/com/github/dockerjava/client/DockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
@@ -14,7 +14,7 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.core.command.WaitContainerResultCallback;
 
diff --git a/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java b/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
index 990548442..342c740ed 100644
--- a/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
+++ b/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
@@ -5,6 +5,7 @@
 
 import java.io.IOException;
 
+import com.github.dockerjava.core.exception.GoLangFileMatchException;
 import junit.framework.Assert;
 
 import org.apache.commons.io.FilenameUtils;
diff --git a/src/test/java/com/github/dockerjava/core/NameParserTest.java b/src/test/java/com/github/dockerjava/core/NameParserTest.java
index 6b694753a..afae80ebb 100644
--- a/src/test/java/com/github/dockerjava/core/NameParserTest.java
+++ b/src/test/java/com/github/dockerjava/core/NameParserTest.java
@@ -3,6 +3,7 @@
  */
 package com.github.dockerjava.core;
 
+import com.github.dockerjava.core.exception.InvalidRepositoryNameException;
 import org.apache.commons.lang.StringUtils;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
index 36211b205..c01c8b8cd 100644
--- a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
@@ -9,7 +9,7 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.UnauthorizedException;
+import com.github.dockerjava.api.exception.UnauthorizedException;
 import com.github.dockerjava.api.model.AuthResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import com.github.dockerjava.core.DockerClientBuilder;
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 206fcacf1..89d15ecac 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -24,7 +24,7 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
diff --git a/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
index 657edf8d7..b8758d332 100644
--- a/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
@@ -16,8 +16,8 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectImageResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
diff --git a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
index aa692d2c5..62c7b2ec0 100644
--- a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
@@ -17,8 +17,8 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.model.ChangeLog;
 import com.github.dockerjava.client.AbstractDockerClientTest;
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
index 96bae1d8a..3e4e88612 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
@@ -14,7 +14,7 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index a383782e6..d2b2985ac 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -1,7 +1,7 @@
 package com.github.dockerjava.core.command;
 
-import com.github.dockerjava.api.ConflictException;
-import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.exception.ConflictException;
+import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.AccessMode;
diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
index 569f44d57..acb8b8a5d 100644
--- a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
+++ b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -6,8 +6,8 @@
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.InternalServerErrorException;
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.InternalServerErrorException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Image;
 
 /**
diff --git a/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
index f6551d573..d234efe4c 100644
--- a/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
@@ -13,7 +13,7 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.client.AbstractDockerClientTest;
diff --git a/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
index 6346ce165..1a4e65ccd 100644
--- a/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
@@ -17,8 +17,8 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
diff --git a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
index 3c1fe738d..6f1ae7a68 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
@@ -19,7 +19,7 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.model.Image;
 import com.github.dockerjava.api.model.Info;
diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
index beb38d885..0a9a39718 100644
--- a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
@@ -15,7 +15,7 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
diff --git a/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
index 0d7b112f6..d5e6d2c48 100644
--- a/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
@@ -13,7 +13,7 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.InspectImageResponse;
 import com.github.dockerjava.api.command.PullImageCmd;
diff --git a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
index 2f7e1c391..e89a071b8 100644
--- a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
@@ -15,7 +15,7 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
index 1b39e5ac0..87ace71df 100644
--- a/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
@@ -19,8 +19,8 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.model.Container;
 import com.github.dockerjava.client.AbstractDockerClientTest;
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
index 75f58828b..a4d670e31 100644
--- a/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
@@ -20,8 +20,8 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.model.Container;
 import com.github.dockerjava.client.AbstractDockerClientTest;
diff --git a/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
index 1258cd7df..31b81726f 100644
--- a/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
@@ -15,8 +15,8 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
diff --git a/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java
index 6b3d2adb9..78e018427 100644
--- a/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java
@@ -18,7 +18,7 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.SearchItem;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index 560d8cbca..042497672 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -24,9 +24,9 @@
 import org.testng.annotations.Test;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.InternalServerErrorException;
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.InternalServerErrorException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.command.StartContainerCmd;
diff --git a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
index 1342471ca..12213b802 100644
--- a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
@@ -17,8 +17,8 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
diff --git a/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java
index 116d2b68d..94d4291d0 100644
--- a/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java
@@ -12,7 +12,7 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
 @Test(groups = "integration")
diff --git a/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java
index 7bac10c6e..d8bfb3f23 100644
--- a/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java
@@ -10,7 +10,7 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.Version;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
diff --git a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
index 68d638807..02ddaf32a 100644
--- a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
@@ -15,8 +15,8 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.WaitResponse;
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
index 133ed2eae..b121900b4 100644
--- a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
+++ b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.dockerfile;
 
-import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.exception.DockerClientException;
 import com.google.common.base.Optional;
 import junit.framework.TestCase;
 import org.hamcrest.Matcher;

From 3302c540ae411d497fb1677e1d5e1a83582989c7 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 14 Nov 2015 20:18:08 +0300
Subject: [PATCH 0288/1272] Make util contstructors private

---
 .../java/com/github/dockerjava/core/CertificateUtils.java    | 3 +++
 .../java/com/github/dockerjava/core/CompressArchiveUtil.java | 5 ++++-
 src/main/java/com/github/dockerjava/core/FilePathUtil.java   | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/core/CertificateUtils.java b/src/main/java/com/github/dockerjava/core/CertificateUtils.java
index cae59836f..88ff42f26 100644
--- a/src/main/java/com/github/dockerjava/core/CertificateUtils.java
+++ b/src/main/java/com/github/dockerjava/core/CertificateUtils.java
@@ -26,6 +26,9 @@
 import java.util.List;
 
 public class CertificateUtils {
+    private CertificateUtils() {
+        // utility class
+    }
 
     public static boolean verifyCertificatesExist(String dockerCertPath) {
         String[] files = { "ca.pem", "cert.pem", "key.pem" };
diff --git a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
index c64d07b7d..356c0c88d 100644
--- a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
+++ b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core;
 
-import static com.github.dockerjava.core.FilePathUtil.relativize;
+import static com.github.dockerjava.core.util.FilePathUtil.relativize;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -13,6 +13,9 @@
 import org.apache.commons.io.FileUtils;
 
 public class CompressArchiveUtil {
+    private CompressArchiveUtil() {
+        // utility class
+    }
 
     public static File archiveTARFiles(File base, Iterable<File> files, String archiveNameWithOutExtension)
             throws IOException {
diff --git a/src/main/java/com/github/dockerjava/core/FilePathUtil.java b/src/main/java/com/github/dockerjava/core/FilePathUtil.java
index a5d926a53..94393f1b8 100644
--- a/src/main/java/com/github/dockerjava/core/FilePathUtil.java
+++ b/src/main/java/com/github/dockerjava/core/FilePathUtil.java
@@ -6,6 +6,9 @@
 import com.github.dockerjava.api.exception.DockerClientException;
 
 public class FilePathUtil {
+    private FilePathUtil() {
+        // utility class
+    }
 
     /**
      * Return the relative path. Path elements are separated with / char.

From 291326475cc498d2c1ca43fdc3b3c4e01db94ab4 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 14 Nov 2015 20:18:23 +0300
Subject: [PATCH 0289/1272] Remove unused imports

---
 .../com/github/dockerjava/api/command/WaitContainerCmd.java    | 1 -
 .../com/github/dockerjava/api/model/BuildResponseItem.java     | 1 -
 .../java/com/github/dockerjava/api/model/PushResponseItem.java | 1 -
 .../github/dockerjava/core/command/AbstrAsyncDockerCmd.java    | 2 --
 .../github/dockerjava/core/command/RemoveContainerCmdImpl.java | 3 ---
 .../com/github/dockerjava/core/command/RemoveImageCmdImpl.java | 3 ---
 .../github/dockerjava/core/command/StartContainerCmdImpl.java  | 2 --
 .../github/dockerjava/core/command/StopContainerCmdImpl.java   | 3 ---
 .../com/github/dockerjava/core/command/TagImageCmdImpl.java    | 3 ---
 .../github/dockerjava/core/command/TopContainerCmdImpl.java    | 3 ---
 .../dockerjava/core/command/WaitContainerResultCallback.java   | 1 -
 .../com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java  | 1 -
 .../dockerjava/core/command/CreateContainerCmdImplTest.java    | 2 --
 13 files changed, 26 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
index 529f86bc3..09f480021 100644
--- a/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
@@ -5,7 +5,6 @@
 
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.model.BuildResponseItem;
 import com.github.dockerjava.api.model.WaitResponse;
 
 /**
diff --git a/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
index 348a4c8f5..264988910 100644
--- a/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Represents a build response stream item
diff --git a/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
index 31a2329d8..059398d4e 100644
--- a/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 /**
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
index c49c0404c..5849fc3fb 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
@@ -2,8 +2,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.IOException;
-
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.AsyncDockerCmd;
 import com.github.dockerjava.api.command.DockerCmdAsyncExec;
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
index ac4181ff6..980088c74 100644
--- a/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
@@ -2,9 +2,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.apache.commons.lang.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
index 4badee130..d8b8f1181 100644
--- a/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
@@ -2,9 +2,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.apache.commons.lang.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.RemoveImageCmd;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
index 679c93750..740032815 100644
--- a/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
@@ -3,8 +3,6 @@
 import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_EMPTY;
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.github.dockerjava.api.exception.NotFoundException;
diff --git a/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
index 0d745bcdd..5c0634c71 100644
--- a/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
@@ -3,9 +3,6 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.apache.commons.lang.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.exception.NotModifiedException;
 import com.github.dockerjava.api.command.StopContainerCmd;
diff --git a/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
index afa3c3e52..c1337112d 100644
--- a/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
@@ -2,9 +2,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.apache.commons.lang.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
 import com.github.dockerjava.api.command.TagImageCmd;
 
 /**
diff --git a/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
index fabdbe3ae..77adf1916 100644
--- a/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
@@ -2,9 +2,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.apache.commons.lang.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.TopContainerResponse;
diff --git a/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java b/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
index cc255fcea..5af956cf2 100644
--- a/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
@@ -13,7 +13,6 @@
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.WaitResponse;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
-import com.google.common.base.Throwables;
 
 /**
  *
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index 745cd67c0..e3d57442a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -40,7 +40,6 @@
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.jaxrs.connector.ApacheConnectorProvider;
 import com.github.dockerjava.jaxrs.filter.JsonClientFilter;
 import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter;
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index d2b2985ac..a445c6ceb 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -45,8 +45,6 @@
 import java.util.Map;
 import java.util.UUID;
 
-import static com.github.dockerjava.api.model.Capability.MKNOD;
-import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 @Test(groups = "integration")

From f9c597218263a987f247da7d1f92e3ffe10bb2a9 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 15 Nov 2015 22:39:17 +0100
Subject: [PATCH 0290/1272] Added basic SSL support

---
 .../dockerjava/core/DockerClientConfig.java   |  15 +-
 .../netty/DockerCmdExecFactoryImpl.java       | 848 +++++++++---------
 .../core/DockerClientConfigTest.java          |   2 +-
 .../dockerjava/core/DockerClientImplTest.java |   2 +-
 4 files changed, 453 insertions(+), 414 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index 6187be49c..3e7e20f79 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -73,16 +73,20 @@ public class DockerClientConfig implements Serializable {
 
     private final SSLConfig sslConfig;
 
+    private final String dockerCertPath;
+
     DockerClientConfig(URI uri, String version, String username, String password, String email, String serverAddress,
-            String dockerCfgPath, SSLConfig sslConfig) {
+            String dockerCfgPath, String dockerCertPath, SSLConfig sslConfig) {
         this.uri = uri;
         this.version = RemoteApiVersion.parseConfigWithDefault(version);
         this.username = username;
         this.password = password;
         this.email = email;
         this.serverAddress = serverAddress;
+
         this.dockerCfgPath = dockerCfgPath;
         this.sslConfig = sslConfig;
+        this.dockerCertPath = dockerCertPath;
     }
 
     private static Properties loadIncludedDockerProperties(Properties systemProperties) {
@@ -240,6 +244,10 @@ public String getDockerCfgPath() {
         return dockerCfgPath;
     }
 
+    public String getDockerCertPath() {
+        return dockerCertPath;
+    }
+
     private AuthConfig getAuthConfig() {
         AuthConfig authConfig = null;
         if (getUsername() != null && getPassword() != null && getEmail() != null && getServerAddress() != null) {
@@ -346,7 +354,7 @@ public String toString() {
     public static class DockerClientConfigBuilder {
         private URI uri;
 
-        private String version, username, password, email, serverAddress, dockerCfgPath;
+        private String version, username, password, email, serverAddress, dockerCfgPath, dockerCertPath;
 
         private SSLConfig sslConfig;
 
@@ -401,6 +409,7 @@ public DockerClientConfigBuilder withServerAddress(String serverAddress) {
         public final DockerClientConfigBuilder withDockerCertPath(String dockerCertPath) {
             if (dockerCertPath != null) {
                 this.sslConfig = new LocalDirectorySSLConfig(dockerCertPath);
+                this.dockerCertPath = dockerCertPath;
             }
             return this;
         }
@@ -416,7 +425,7 @@ public final DockerClientConfigBuilder withSSLConfig(SSLConfig config) {
         }
 
         public DockerClientConfig build() {
-            return new DockerClientConfig(uri, version, username, password, email, serverAddress, dockerCfgPath,
+            return new DockerClientConfig(uri, version, username, password, email, serverAddress, dockerCfgPath, dockerCertPath,
                     sslConfig);
         }
     }
diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
index 3627038cd..fcbbe17b6 100644
--- a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
@@ -1,17 +1,33 @@
 package com.github.dockerjava.netty;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.epoll.EpollDomainSocketChannel;
+import io.netty.channel.epoll.EpollEventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.channel.unix.DomainSocketAddress;
+import io.netty.channel.unix.UnixChannel;
+import io.netty.handler.codec.http.HttpClientCodec;
+import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslContextBuilder;
+import io.netty.handler.ssl.SslProvider;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
-import java.net.UnknownHostException;
+import java.security.Security;
 
-import javax.net.ssl.SSLException;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.TrustManagerFactory;
 
-import org.apache.commons.io.IOUtils;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,432 +69,446 @@
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.api.model.Info;
+import com.github.dockerjava.core.CertificateUtils;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.DockerClientConfig.DockerClientConfigBuilder;
 import com.github.dockerjava.core.command.ExecCreateCmdImpl;
 import com.github.dockerjava.core.command.ExecStartCmdImpl;
-import com.github.dockerjava.core.command.FrameReader;
-import com.github.dockerjava.core.command.InfoCmdImpl;
-import com.github.dockerjava.netty.handler.HijackHttpConnectionHandler;
-import com.github.dockerjava.netty.handler.HttpResponseInboundHandler;
-
-import io.netty.bootstrap.Bootstrap;
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.SimpleChannelInboundHandler;
-import io.netty.channel.epoll.EpollDomainSocketChannel;
-import io.netty.channel.epoll.EpollEventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.nio.NioSocketChannel;
-import io.netty.channel.unix.DomainSocketAddress;
-import io.netty.channel.unix.UnixChannel;
-import io.netty.handler.codec.http.HttpClientCodec;
-import io.netty.handler.codec.http.HttpContent;
-import io.netty.handler.codec.http.HttpObject;
-import io.netty.handler.codec.http.HttpResponse;
-import io.netty.handler.codec.http.LastHttpContent;
-import io.netty.handler.codec.json.JsonObjectDecoder;
-import io.netty.handler.logging.LogLevel;
-import io.netty.handler.logging.LoggingHandler;
-import io.netty.handler.proxy.HttpProxyHandler;
-import io.netty.handler.ssl.SslContext;
-import io.netty.handler.ssl.SslContextBuilder;
-import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
 
 /**
- * http://stackoverflow.com/questions/33296749/netty-connect-to-unix-domain-
- * socket-failed http://netty.io/wiki/native-transports.html
- * https://github.com/netty/netty/blob/master/example/src/main/java/io/netty/
- * example/http/snoop/HttpSnoopClient.java
- * 
+ * http://stackoverflow.com/questions/33296749/netty-connect-to-unix-domain- socket-failed
+ * http://netty.io/wiki/native-transports.html
+ * https://github.com/netty/netty/blob/master/example/src/main/java/io/netty/ example/http/snoop/HttpSnoopClient.java
+ *
  * @author marcus
  *
  */
 public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DockerCmdExecFactoryImpl.class.getName());
+    private static final Logger LOGGER = LoggerFactory.getLogger(DockerCmdExecFactoryImpl.class.getName());
+
+    private DockerClientConfig dockerClientConfig;
+
+    private Bootstrap bootstrap;
+
+    private EventLoopGroup eventLoopGroup;
+
+    private NettyInitializer nettyInitializer;
+
+    private ChannelProvider channelProvider = new ChannelProvider() {
+        @Override
+        public Channel getChannel() {
+            return connect();
+        }
+    };
+
+    @Override
+    public void init(DockerClientConfig dockerClientConfig) {
+        checkNotNull(dockerClientConfig, "config was not specified");
+        this.dockerClientConfig = dockerClientConfig;
+
+        bootstrap = new Bootstrap();
 
-	private DockerClientConfig dockerClientConfig;
+        String scheme = dockerClientConfig.getUri().getScheme();
 
-	private Bootstrap bootstrap;
+        if ("unix".equals(scheme)) {
+            nettyInitializer = new UnixDomainSocketInitializer();
+        } else if (scheme.startsWith("http")) {
+            nettyInitializer = new InetSocketInitializer();
+        }
 
-	private EventLoopGroup eventLoopGroup;
+        nettyInitializer.init(bootstrap, dockerClientConfig);
+    }
 
-	private ChannelProvider channelProvider = new ChannelProvider() {
-		@Override
-		public Channel getChannel() {
-			return connect();
-		}
-	};
+    private Channel connect() {
+        try {
+            return connect(bootstrap);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
-	@Override
-	public void init(DockerClientConfig dockerClientConfig) {
-		checkNotNull(dockerClientConfig, "config was not specified");
-		this.dockerClientConfig = dockerClientConfig;
+    private Channel connect(final Bootstrap bootstrap) throws InterruptedException {
+       return nettyInitializer.connect(bootstrap);
+    }
 
-		bootstrap = new Bootstrap();
+    private static interface NettyInitializer {
+        EventLoopGroup init(final Bootstrap bootstrap, DockerClientConfig dockerClientConfig);
+        Channel connect(final Bootstrap bootstrap) throws InterruptedException;
+    }
 
-		String scheme = dockerClientConfig.getUri().getScheme();
 
-		if ("unix".equals(scheme)) {
-			eventLoopGroup = new EpollEventLoopGroup();
-			bootstrap.group(eventLoopGroup).channel(EpollDomainSocketChannel.class)
-					.handler(new ChannelInitializer<UnixChannel>() {
-						@Override
-						protected void initChannel(final UnixChannel channel) throws Exception {
-							channel.pipeline().addLast(new HttpClientCodec());
-						}
-					});
+    private class UnixDomainSocketInitializer implements NettyInitializer {
+        @Override
+        public EventLoopGroup init(Bootstrap bootstrap, DockerClientConfig dockerClientConfig) {
+            EventLoopGroup eventLoopGroup = new EpollEventLoopGroup();
+            bootstrap.group(eventLoopGroup).channel(EpollDomainSocketChannel.class)
+                    .handler(new ChannelInitializer<UnixChannel>() {
+                        @Override
+                        protected void initChannel(final UnixChannel channel) throws Exception {
+                            channel.pipeline().addLast(new HttpClientCodec());
+                        }
+                    });
+            return eventLoopGroup;
+        }
 
-		} else if ("http".equals(scheme)) {
-			eventLoopGroup = new NioEventLoopGroup();
+        @Override
+        public Channel connect(Bootstrap bootstrap) throws InterruptedException {
+            return bootstrap.connect(new DomainSocketAddress("/var/run/docker.sock")).sync().channel();
+        }
+    }
 
-			try {
-				final SslContext sslCtx = SslContextBuilder.forClient()
-						.trustManager(InsecureTrustManagerFactory.INSTANCE).build();
+    private class InetSocketInitializer implements NettyInitializer {
+        @Override
+        public EventLoopGroup init(Bootstrap bootstrap, DockerClientConfig dockerClientConfig) {
+            EventLoopGroup eventLoopGroup = new NioEventLoopGroup();
 
-				InetAddress addr = InetAddress.getLoopbackAddress();
-
-				final SocketAddress proxyAddress = new InetSocketAddress(addr, 8008);
-
-				bootstrap.group(eventLoopGroup).channel(NioSocketChannel.class)
-						.handler(new ChannelInitializer<SocketChannel>() {
-							@Override
-							protected void initChannel(final SocketChannel channel) throws Exception {
-								// channel.pipeline().addLast(new
-								// HttpProxyHandler(proxyAddress));
-
-								// channel.pipeline().addLast(sslCtx.newHandler(channel.alloc()));
-								HttpClientCodec httpClientCodec = new HttpClientCodec();
-
-								channel.pipeline().addLast(new LoggingHandler(LogLevel.DEBUG));
-								channel.pipeline().addLast(httpClientCodec);
-
-							}
-						});
-
-			} catch (SSLException e1) {
-				// TODO Auto-generated catch block
-				e1.printStackTrace();
-			}
-
-		}
-
-	}
-
-	private Channel connect() {
-		try {
-			return connect(bootstrap);
-		} catch (InterruptedException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	private Channel connect(final Bootstrap bootstrap) throws InterruptedException {
-
-		String scheme = dockerClientConfig.getUri().getScheme();
-
-		if ("unix".equals(scheme)) {
-			return bootstrap.connect(new DomainSocketAddress("/var/run/docker.sock")).sync().channel();
-		} else if ("http".equals(scheme)) {
-			String host = dockerClientConfig.getUri().getHost();
-			int port = dockerClientConfig.getUri().getPort();
-
-			if (port == -1) {
-				throw new RuntimeException("no port configured for " + host);
-			}
-
-			return bootstrap.connect(host, port).sync().channel();
-		} else {
-			throw new RuntimeException("unsupported protocol scheme: " + scheme);
-		}
-
-	}
-
-	protected DockerClientConfig getDockerClientConfig() {
-		checkNotNull(dockerClientConfig,
-				"Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!");
-		return dockerClientConfig;
-	}
-
-	@Override
-	public AuthCmd.Exec createAuthCmdExec() {
-		return null; // new AuthCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public InfoCmd.Exec createInfoCmdExec() {
-		return new InfoCmdExec(new WebTarget(channelProvider), getDockerClientConfig());
-	}
-
-	@Override
-	public PingCmd.Exec createPingCmdExec() {
-		return null; // new PingCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public VersionCmd.Exec createVersionCmdExec() {
-		return null; // new VersionCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public PullImageCmd.Exec createPullImageCmdExec() {
-		return null; // new PullImageCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public PushImageCmd.Exec createPushImageCmdExec() {
-		return null; // new PushImageCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public SaveImageCmd.Exec createSaveImageCmdExec() {
-		return null; // new SaveImageCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public CreateImageCmd.Exec createCreateImageCmdExec() {
-		return null; // new CreateImageCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public SearchImagesCmd.Exec createSearchImagesCmdExec() {
-		return null; // new SearchImagesCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public RemoveImageCmd.Exec createRemoveImageCmdExec() {
-		return null; // new RemoveImageCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public ListImagesCmd.Exec createListImagesCmdExec() {
-		return null; // new ListImagesCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public InspectImageCmd.Exec createInspectImageCmdExec() {
-		return null; // new InspectImageCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public ListContainersCmd.Exec createListContainersCmdExec() {
-		return null; // new ListContainersCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public CreateContainerCmd.Exec createCreateContainerCmdExec() {
-		return null; // new CreateContainerCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public StartContainerCmd.Exec createStartContainerCmdExec() {
-		return null; // new StartContainerCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public InspectContainerCmd.Exec createInspectContainerCmdExec() {
-		return null; // new InspectContainerCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public ExecCreateCmd.Exec createExecCmdExec() {
-		return new ExecCreateCmdExec(new WebTarget(channelProvider), getDockerClientConfig());
-	}
-
-	@Override
-	public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
-		return null; // new RemoveContainerCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public WaitContainerCmd.Exec createWaitContainerCmdExec() {
-		return null; // new WaitContainerCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public AttachContainerCmd.Exec createAttachContainerCmdExec() {
-		return null; // new AttachContainerCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public ExecStartCmd.Exec createExecStartCmdExec() {
-
-		return new ExecStartCmdExec(new WebTarget(channelProvider), getDockerClientConfig());
-	}
-
-	@Override
-	public InspectExecCmd.Exec createInspectExecCmdExec() {
-		return null; // new InspectExecCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public LogContainerCmd.Exec createLogContainerCmdExec() {
-		return null; // new LogContainerCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
-		return null; // new CopyFileFromContainerCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public StopContainerCmd.Exec createStopContainerCmdExec() {
-		return null; // new StopContainerCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
-		return null; // new ContainerDiffCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public KillContainerCmd.Exec createKillContainerCmdExec() {
-		return null; // new KillContainerCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public RestartContainerCmd.Exec createRestartContainerCmdExec() {
-		return null; // new RestartContainerCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public CommitCmd.Exec createCommitCmdExec() {
-		return null; // new CommitCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public BuildImageCmd.Exec createBuildImageCmdExec() {
-		return null; // new BuildImageCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public TopContainerCmd.Exec createTopContainerCmdExec() {
-		return null; // new TopContainerCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public TagImageCmd.Exec createTagImageCmdExec() {
-		return null; // new TagImageCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public PauseContainerCmd.Exec createPauseContainerCmdExec() {
-		return null; // new PauseContainerCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
-		return null; // new UnpauseContainerCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public EventsCmd.Exec createEventsCmdExec() {
-		return null; // new EventsCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public StatsCmd.Exec createStatsCmdExec() {
-		return null; // new StatsCmdExec(getBaseResource(),
-						// getDockerClientConfig());
-	}
-
-	@Override
-	public void close() throws IOException {
-		// checkNotNull(client, "Factory not initialized. You probably forgot to
-		// call init()!");
-		// client.close();
-
-		eventLoopGroup.shutdownGracefully();
-	}
-
-	public static void main(String[] args) throws IOException {
-		DockerCmdExecFactory execFactory = new DockerCmdExecFactoryImpl();
-		// execFactory.init(new
-		// DockerClientConfigBuilder().withUri("unix:///var/run/docker.sock").build());
-		execFactory.init(new DockerClientConfigBuilder().withUri("http://localhost:2375").build());
-
-		// InfoCmd.Exec exec = execFactory.createInfoCmdExec();
-		//
-		// InfoCmd infoCmd = new InfoCmdImpl(exec);
-		//
-		// Info info = infoCmd.exec();
-		//
-		// System.out.println("result: " + info);
-		//
-		// infoCmd.close();
-
-		ExecCreateCmd.Exec execCreate = execFactory.createExecCmdExec();
-
-		ExecCreateCmd execCreateCmd = new ExecCreateCmdImpl(execCreate, "test").withCmd("/bin/bash")
-				.withAttachStdout(true).withAttachStderr(true).withAttachStdin(true);
-
-		ExecCreateCmdResponse execCreateCmdResponse = execCreate.exec(execCreateCmd);
-
-		System.out.println("result: " + execCreateCmdResponse);
-
-		ExecStartCmd.Exec execStart = execFactory.createExecStartCmdExec();
-
-		ExecStartCmd execStartCmd = new ExecStartCmdImpl(execStart, execCreateCmdResponse.getId()).withDetach(false)
-				.withTty(true);
-
-		InputStream response = execStart.exec(execStartCmd);
-
-//		FrameReader frameReader = new FrameReader(response);
-//
-//		System.out.println("read frame");
-//		Frame frame  = frameReader.readFrame();
-//		
-//		while(frame != null) {
-//			System.out.println("frame: " + frame);
-//			frame = frameReader.readFrame();
-//		}
-//		System.out.println("all frames read");
-//		
-//		System.out.flush();
-
-		// System.out.println("response: " + IOUtils.toString(response,
-		// "UTF-8"));
-
-		//execFactory.close();
-	}
+            InetAddress addr = InetAddress.getLoopbackAddress();
+
+            final SocketAddress proxyAddress = new InetSocketAddress(addr, 8008);
+
+            final SslContext sslCtx = initSslContext(dockerClientConfig);
+
+            bootstrap.group(eventLoopGroup).channel(NioSocketChannel.class)
+                    .handler(new ChannelInitializer<SocketChannel>() {
+                        @Override
+                        protected void initChannel(final SocketChannel channel) throws Exception {
+                            // channel.pipeline().addLast(new
+                            // HttpProxyHandler(proxyAddress));
+
+                            if (sslCtx != null) {
+                                channel.pipeline().addLast(sslCtx.newHandler(channel.alloc()));
+                            }
+
+                            channel.pipeline().addLast(new HttpClientCodec());
+                        }
+                    });
+
+            return eventLoopGroup;
+        }
+
+        @Override
+        public Channel connect(Bootstrap bootstrap) throws InterruptedException {
+            String host = dockerClientConfig.getUri().getHost();
+            int port = dockerClientConfig.getUri().getPort();
+
+            if (port == -1) {
+                throw new RuntimeException("no port configured for " + host);
+            }
+
+            return bootstrap.connect(host, port).sync().channel();
+        }
+
+        private SslContext initSslContext(DockerClientConfig dockerClientConfig) {
+            SslContext sslContext = null;
+
+            String scheme = dockerClientConfig.getUri().getScheme();
+
+            if ("https".equals(scheme) && dockerClientConfig.getDockerCertPath() != null) {
+
+                String dockerCertPath = dockerClientConfig.getDockerCertPath();
+
+                Security.addProvider(new BouncyCastleProvider());
+
+                try {
+                    TrustManagerFactory tmFactory = TrustManagerFactory.getInstance("PKIX");
+                    tmFactory.init(CertificateUtils.createTrustStore(dockerCertPath));
+
+                    KeyManagerFactory kmFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+                    kmFactory.init(CertificateUtils.createKeyStore(dockerCertPath), "docker".toCharArray());
+
+                    sslContext = SslContextBuilder.forClient().sslProvider(SslProvider.JDK).keyManager(kmFactory)
+                            .trustManager(tmFactory).build();
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+
+            }
+            return sslContext;
+        }
+    }
+
+    protected DockerClientConfig getDockerClientConfig() {
+        checkNotNull(dockerClientConfig,
+                "Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!");
+        return dockerClientConfig;
+    }
+
+    @Override
+    public AuthCmd.Exec createAuthCmdExec() {
+        return null; // new AuthCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public InfoCmd.Exec createInfoCmdExec() {
+        return new InfoCmdExec(new WebTarget(channelProvider), getDockerClientConfig());
+    }
+
+    @Override
+    public PingCmd.Exec createPingCmdExec() {
+        return null; // new PingCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public VersionCmd.Exec createVersionCmdExec() {
+        return null; // new VersionCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public PullImageCmd.Exec createPullImageCmdExec() {
+        return null; // new PullImageCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public PushImageCmd.Exec createPushImageCmdExec() {
+        return null; // new PushImageCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public SaveImageCmd.Exec createSaveImageCmdExec() {
+        return null; // new SaveImageCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public CreateImageCmd.Exec createCreateImageCmdExec() {
+        return null; // new CreateImageCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public SearchImagesCmd.Exec createSearchImagesCmdExec() {
+        return null; // new SearchImagesCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveImageCmd.Exec createRemoveImageCmdExec() {
+        return null; // new RemoveImageCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public ListImagesCmd.Exec createListImagesCmdExec() {
+        return null; // new ListImagesCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public InspectImageCmd.Exec createInspectImageCmdExec() {
+        return null; // new InspectImageCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public ListContainersCmd.Exec createListContainersCmdExec() {
+        return null; // new ListContainersCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public CreateContainerCmd.Exec createCreateContainerCmdExec() {
+        return null; // new CreateContainerCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public StartContainerCmd.Exec createStartContainerCmdExec() {
+        return null; // new StartContainerCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public InspectContainerCmd.Exec createInspectContainerCmdExec() {
+        return null; // new InspectContainerCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public ExecCreateCmd.Exec createExecCmdExec() {
+        return new ExecCreateCmdExec(new WebTarget(channelProvider), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
+        return null; // new RemoveContainerCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public WaitContainerCmd.Exec createWaitContainerCmdExec() {
+        return null; // new WaitContainerCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public AttachContainerCmd.Exec createAttachContainerCmdExec() {
+        return null; // new AttachContainerCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public ExecStartCmd.Exec createExecStartCmdExec() {
+
+        return new ExecStartCmdExec(new WebTarget(channelProvider), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectExecCmd.Exec createInspectExecCmdExec() {
+        return null; // new InspectExecCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public LogContainerCmd.Exec createLogContainerCmdExec() {
+        return null; // new LogContainerCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
+        return null; // new CopyFileFromContainerCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public StopContainerCmd.Exec createStopContainerCmdExec() {
+        return null; // new StopContainerCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
+        return null; // new ContainerDiffCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public KillContainerCmd.Exec createKillContainerCmdExec() {
+        return null; // new KillContainerCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public RestartContainerCmd.Exec createRestartContainerCmdExec() {
+        return null; // new RestartContainerCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public CommitCmd.Exec createCommitCmdExec() {
+        return null; // new CommitCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public BuildImageCmd.Exec createBuildImageCmdExec() {
+        return null; // new BuildImageCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public TopContainerCmd.Exec createTopContainerCmdExec() {
+        return null; // new TopContainerCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public TagImageCmd.Exec createTagImageCmdExec() {
+        return null; // new TagImageCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public PauseContainerCmd.Exec createPauseContainerCmdExec() {
+        return null; // new PauseContainerCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
+        return null; // new UnpauseContainerCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public EventsCmd.Exec createEventsCmdExec() {
+        return null; // new EventsCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public StatsCmd.Exec createStatsCmdExec() {
+        return null; // new StatsCmdExec(getBaseResource(),
+                     // getDockerClientConfig());
+    }
+
+    @Override
+    public void close() throws IOException {
+        // checkNotNull(client, "Factory not initialized. You probably forgot to
+        // call init()!");
+        // client.close();
+
+        eventLoopGroup.shutdownGracefully();
+    }
+
+    public static void main(String[] args) throws IOException {
+        DockerCmdExecFactory execFactory = new DockerCmdExecFactoryImpl();
+        // execFactory.init(new
+        // DockerClientConfigBuilder().withUri("unix:///var/run/docker.sock").build());
+        // execFactory.init(new DockerClientConfigBuilder().withUri("http://localhost:2375").build());
+
+        DockerClientConfig config = DockerClientConfig.createDefaultConfigBuilder().withUri("https://192.168.59.103:2376").build();
+
+        execFactory.init(config);
+
+        // InfoCmd.Exec exec = execFactory.createInfoCmdExec();
+        //
+        // InfoCmd infoCmd = new InfoCmdImpl(exec);
+        //
+        // Info info = infoCmd.exec();
+        //
+        // System.out.println("result: " + info);
+        //
+        // infoCmd.close();
+
+        ExecCreateCmd.Exec execCreate = execFactory.createExecCmdExec();
+
+        ExecCreateCmd execCreateCmd = new ExecCreateCmdImpl(execCreate, "test").withCmd("/bin/bash")
+                .withAttachStdout(true).withAttachStderr(true).withAttachStdin(true);
+
+        ExecCreateCmdResponse execCreateCmdResponse = execCreate.exec(execCreateCmd);
+
+        System.out.println("result: " + execCreateCmdResponse);
+
+        ExecStartCmd.Exec execStart = execFactory.createExecStartCmdExec();
+
+        ExecStartCmd execStartCmd = new ExecStartCmdImpl(execStart, execCreateCmdResponse.getId()).withDetach(false)
+                .withTty(true);
+
+        InputStream response = execStart.exec(execStartCmd);
+
+        // FrameReader frameReader = new FrameReader(response);
+        //
+        // System.out.println("read frame");
+        // Frame frame = frameReader.readFrame();
+        //
+        // while(frame != null) {
+        // System.out.println("frame: " + frame);
+        // frame = frameReader.readFrame();
+        // }
+        // System.out.println("all frames read");
+        //
+        // System.out.flush();
+
+        // System.out.println("response: " + IOUtils.toString(response,
+        // "UTF-8"));
+
+        // execFactory.close();
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
index e66cfa57d..cfcf7f381 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
@@ -16,7 +16,7 @@ public class DockerClientConfigTest {
     public static final DockerClientConfig EXAMPLE_CONFIG = newExampleConfig();
 
     private static DockerClientConfig newExampleConfig() {
-        return new DockerClientConfig(URI.create("http://foo"), "bar", "baz", "qux", "blam", "wham", "flam",
+        return new DockerClientConfig(URI.create("http://foo"), "bar", "baz", "qux", "blam", "wham", "flam", "flum",
                 new LocalDirectorySSLConfig("flim"));
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
index c5a1e841c..5f4ee3e67 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
@@ -10,7 +10,7 @@ public class DockerClientImplTest {
     @Test
     public void configuredInstanceAuthConfig() throws Exception {
         // given a config with null serverAddress
-        DockerClientConfig dockerClientConfig = new DockerClientConfig(null, null, "", "", "", null, null, null);
+        DockerClientConfig dockerClientConfig = new DockerClientConfig(null, null, "", "", "", null, null, null, null);
         DockerClientImpl dockerClient = DockerClientImpl.getInstance(dockerClientConfig);
 
         // when we get the auth config

From 87e398aa15885b04c75e0532b00ae46ac6e04991 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 20 Nov 2015 08:55:08 +0100
Subject: [PATCH 0291/1272] Migrated more command exec implementations and
 tests

---
 .../dockerjava/api/command/ExecStartCmd.java  |   9 +-
 .../api/command/LogContainerCmd.java          |   8 +
 .../dockerjava/core/DockerClientConfig.java   |  12 +-
 .../core/command/ExecStartCmdImpl.java        |  12 +-
 .../core/command/ExecStartResultCallback.java |  63 ++
 .../dockerjava/jaxrs/ExecStartCmdExec.java    |  22 +-
 .../netty/DockerCmdExecFactoryImpl.java       | 158 ++---
 .../dockerjava/netty/ExecStartCmdExec.java    |  29 -
 .../dockerjava/netty/InvocationBuilder.java   | 446 ++++++++------
 .../github/dockerjava/netty/MediaType.java    |   9 +-
 .../netty/exec/AbstrAsyncDockerCmdExec.java   |  67 +++
 .../netty/{ => exec}/AbstrDockerCmdExec.java  |   4 +-
 .../{ => exec}/AbstrSyncDockerCmdExec.java    |   3 +-
 .../dockerjava/netty/exec/AuthCmdExec.java    |  34 ++
 .../exec/CopyFileFromContainerCmdExec.java    |  33 ++
 .../netty/exec/CreateContainerCmdExec.java    |  35 ++
 .../netty/{ => exec}/ExecCreateCmdExec.java   |   7 +-
 .../netty/exec/ExecStartCmdExec.java          |  29 +
 .../netty/{ => exec}/InfoCmdExec.java         |  11 +-
 .../netty/exec/InspectContainerCmdExec.java   |  31 +
 .../netty/exec/InspectExecCmdExec.java        |  26 +
 .../netty/exec/InspectImageCmdExec.java       |  31 +
 .../netty/exec/KillContainerCmdExec.java      |  35 ++
 .../netty/exec/ListContainersCmdExec.java     |  53 ++
 .../netty/exec/LogContainerCmdExec.java       |  48 ++
 .../netty/exec/RemoveContainerCmdExec.java    |  33 ++
 .../netty/exec/StartContainerCmdExec.java     |  33 ++
 .../netty/exec/StopContainerCmdExec.java      |  36 ++
 .../netty/exec/WaitContainerCmdExec.java      |  36 ++
 .../handler/AwaitObjectInboundHandler.java    |  62 +-
 .../DeserializeJsonInboundHandler.java        |   7 +-
 ....java => FramedResponseStreamHandler.java} |  48 +-
 ....java => HttpConnectionHijackHandler.java} |  28 +-
 .../netty/handler/HttpResponseHandler.java    |  83 +++
 .../handler/HttpResponseInboundHandler.java   | 128 ----
 .../HttpResponseStreamInboundHandler.java     | 176 +++---
 .../core/DockerClientConfigTest.java          |   2 +-
 .../dockerjava/core/DockerClientImplTest.java |   2 +-
 .../core/command/ExecStartCmdImplTest.java    |   6 +-
 .../core/command/InspectExecCmdImplTest.java  |  16 +-
 .../netty/AbstractDockerClientTest.java       | 217 +++++++
 .../netty/exec/AuthCmdExecTest.java           |  57 ++
 .../exec/CreateContainerCmdExecTest.java      | 560 ++++++++++++++++++
 .../netty/exec/ExecCreateCmdExecTest.java     |  61 ++
 .../netty/exec/ExecStartCmdExecTest.java      |  97 +++
 .../netty/exec/InfoCmdExecTest.java           |  71 +++
 .../netty/exec/InspectExecCmdExecTest.java    |  96 +++
 .../netty/exec/KillContainerCmdExecTest.java  |  80 +++
 .../netty/exec/LogContainerCmdExecTest.java   | 171 ++++++
 .../netty/exec/StopContainerCmdExecTest.java  |  79 +++
 .../netty/exec/WaitContainerCmdExecTest.java  | 108 ++++
 src/test/resources/logback.xml                |   1 +
 52 files changed, 2882 insertions(+), 627 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
 delete mode 100644 src/main/java/com/github/dockerjava/netty/ExecStartCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/AbstrAsyncDockerCmdExec.java
 rename src/main/java/com/github/dockerjava/netty/{ => exec}/AbstrDockerCmdExec.java (96%)
 rename src/main/java/com/github/dockerjava/netty/{ => exec}/AbstrSyncDockerCmdExec.java (92%)
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/AuthCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/CreateContainerCmdExec.java
 rename src/main/java/com/github/dockerjava/netty/{ => exec}/ExecCreateCmdExec.java (78%)
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/ExecStartCmdExec.java
 rename src/main/java/com/github/dockerjava/netty/{ => exec}/InfoCmdExec.java (91%)
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/InspectContainerCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/InspectExecCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/InspectImageCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/KillContainerCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/LogContainerCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/StartContainerCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/StopContainerCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/WaitContainerCmdExec.java
 rename src/main/java/com/github/dockerjava/netty/handler/{DockerRawStreamHandler.java => FramedResponseStreamHandler.java} (76%)
 rename src/main/java/com/github/dockerjava/netty/handler/{HijackHttpConnectionHandler.java => HttpConnectionHijackHandler.java} (76%)
 create mode 100644 src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
 delete mode 100644 src/main/java/com/github/dockerjava/netty/handler/HttpResponseInboundHandler.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/AbstractDockerClientTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/AuthCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/ExecCreateCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/InfoCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/KillContainerCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/LogContainerCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/WaitContainerCmdExecTest.java

diff --git a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
index c9e0d3f00..2129bf40c 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
@@ -6,8 +6,10 @@
 import javax.annotation.Nonnull;
 
 import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.model.Frame;
 
-public interface ExecStartCmd extends SyncDockerCmd<InputStream> {
+public interface ExecStartCmd extends AsyncDockerCmd<ExecStartCmd, Frame> {
 
     @CheckForNull
     public String getExecId();
@@ -25,15 +27,14 @@ public interface ExecStartCmd extends SyncDockerCmd<InputStream> {
     public ExecStartCmd withTty(Boolean tty);
 
     /**
-     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
      *
      * @throws com.github.dockerjava.api.NotFoundException
      *             No such exec instance
      */
     @Override
-    public InputStream exec() throws NotFoundException;
+    public <T extends ResultCallback<Frame>> T exec(T resultCallback);
 
-    public static interface Exec extends DockerCmdSyncExec<ExecStartCmd, InputStream> {
+    public static interface Exec extends DockerCmdAsyncExec<ExecStartCmd, Frame> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
index f06a715cb..f4b5076c5 100644
--- a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -6,6 +6,7 @@
 import javax.annotation.Nonnull;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.model.Frame;
 
 /**
@@ -69,6 +70,13 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame>
 
     public LogContainerCmd withSince(Integer since);
 
+    /**
+     * @throws com.github.dockerjava.api.NotFoundException
+     *             No such container
+     */
+    @Override
+    public <T extends ResultCallback<Frame>> T exec(T resultCallback);
+
     public static interface Exec extends DockerCmdAsyncExec<LogContainerCmd, Frame> {
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index 3e7e20f79..c3e12d91b 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -73,20 +73,16 @@ public class DockerClientConfig implements Serializable {
 
     private final SSLConfig sslConfig;
 
-    private final String dockerCertPath;
-
     DockerClientConfig(URI uri, String version, String username, String password, String email, String serverAddress,
-            String dockerCfgPath, String dockerCertPath, SSLConfig sslConfig) {
+            String dockerCfgPath, SSLConfig sslConfig) {
         this.uri = uri;
         this.version = RemoteApiVersion.parseConfigWithDefault(version);
         this.username = username;
         this.password = password;
         this.email = email;
         this.serverAddress = serverAddress;
-
         this.dockerCfgPath = dockerCfgPath;
         this.sslConfig = sslConfig;
-        this.dockerCertPath = dockerCertPath;
     }
 
     private static Properties loadIncludedDockerProperties(Properties systemProperties) {
@@ -244,10 +240,6 @@ public String getDockerCfgPath() {
         return dockerCfgPath;
     }
 
-    public String getDockerCertPath() {
-        return dockerCertPath;
-    }
-
     private AuthConfig getAuthConfig() {
         AuthConfig authConfig = null;
         if (getUsername() != null && getPassword() != null && getEmail() != null && getServerAddress() != null) {
@@ -425,7 +417,7 @@ public final DockerClientConfigBuilder withSSLConfig(SSLConfig config) {
         }
 
         public DockerClientConfig build() {
-            return new DockerClientConfig(uri, version, username, password, email, serverAddress, dockerCfgPath, dockerCertPath,
+            return new DockerClientConfig(uri, version, username, password, email, serverAddress, dockerCfgPath,
                     sslConfig);
         }
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
index 72efd3052..0871fddfb 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
@@ -2,12 +2,11 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.InputStream;
-
-import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.ExecStartCmd;
+import com.github.dockerjava.api.model.Frame;
 
-public class ExecStartCmdImpl extends AbstrDockerCmd<ExecStartCmd, InputStream> implements ExecStartCmd {
+public class ExecStartCmdImpl extends AbstrAsyncDockerCmd<ExecStartCmd, Frame> implements ExecStartCmd {
 
     private String execId;
 
@@ -57,8 +56,7 @@ public ExecStartCmd withTty(Boolean tty) {
      *             No such exec instance
      */
     @Override
-    public InputStream exec() throws NotFoundException {
-        return super.exec();
+    public <T extends ResultCallback<Frame>> T exec(T resultCallback) {
+        return super.exec(resultCallback);
     }
-
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java b/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
new file mode 100644
index 000000000..dda336807
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
@@ -0,0 +1,63 @@
+/*
+ * Created on 21.07.2015
+ */
+package com.github.dockerjava.core.command;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
+
+/**
+ *
+ * @author marcus
+ *
+ */
+public class ExecStartResultCallback extends ResultCallbackTemplate<ExecStartResultCallback, Frame> {
+
+    private final static Logger LOGGER = LoggerFactory.getLogger(ExecStartResultCallback.class);
+
+    private OutputStream stdout, stderr;
+
+    public ExecStartResultCallback(OutputStream stdout, OutputStream stderr) {
+        this.stdout = stdout;
+        this.stderr = stderr;
+    }
+
+    public ExecStartResultCallback() {
+        this(null, null);
+    }
+
+
+    @Override
+    public void onNext(Frame frame) {
+        if (frame != null) {
+            try {
+                switch (frame.getStreamType()) {
+                case STDOUT:
+                    if (stdout != null) {
+                        stdout.write(frame.getPayload());
+                        stdout.flush();
+                    }
+                    break;
+                case STDERR:
+                    if (stderr != null) {
+                        stderr.write(frame.getPayload());
+                        stderr.flush();
+                    }
+                    break;
+                default:
+                    LOGGER.error("unknown stream type:" + frame.getStreamType());
+                }
+            } catch (IOException e) {
+                onError(e);
+            }
+
+        }
+        LOGGER.debug(frame.toString());
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
index cf850d10c..0b1db4eb0 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
@@ -1,19 +1,26 @@
 package com.github.dockerjava.jaxrs;
 
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.ExecStartCmd;
+import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.async.FrameStreamProcessor;
+import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
+import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
 import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+
 import java.io.InputStream;
 
 import static javax.ws.rs.client.Entity.entity;
 
-public class ExecStartCmdExec extends AbstrSyncDockerCmdExec<ExecStartCmd, InputStream> implements ExecStartCmd.Exec {
+public class ExecStartCmdExec extends AbstrAsyncDockerCmdExec<ExecStartCmd, Frame> implements ExecStartCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ExecStartCmdExec.class);
 
@@ -22,14 +29,13 @@ public ExecStartCmdExec(WebTarget baseResource, DockerClientConfig dockerClientC
     }
 
     @Override
-    protected InputStream execute(ExecStartCmd command) {
-        WebTarget webResource = getBaseResource().path("/exec/{id}/start").resolveTemplate("id", command.getExecId());
-
-        LOGGER.trace("POST: {}", webResource);
+    protected AbstractCallbackNotifier<Frame> callbackNotifier(ExecStartCmd command,
+            ResultCallback<Frame> resultCallback) {
+        WebTarget webTarget = getBaseResource().path("/exec/{id}/start").resolveTemplate("id", command.getExecId());
 
-        Response response = webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(entity(command, MediaType.APPLICATION_JSON), Response.class);
+        LOGGER.trace("POST: {}", webTarget);
 
-        return new WrappedResponseInputStream(response);
+        return new POSTCallbackNotifier<Frame>(new FrameStreamProcessor(), resultCallback, webTarget.request().accept(
+                MediaType.APPLICATION_JSON), null);
     }
 }
diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
index fcbbe17b6..6c97055fb 100644
--- a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
@@ -13,19 +13,18 @@
 import io.netty.channel.unix.DomainSocketAddress;
 import io.netty.channel.unix.UnixChannel;
 import io.netty.handler.codec.http.HttpClientCodec;
-import io.netty.handler.ssl.SslContext;
-import io.netty.handler.ssl.SslContextBuilder;
-import io.netty.handler.ssl.SslProvider;
+import io.netty.handler.logging.LoggingHandler;
+import io.netty.handler.ssl.SslHandler;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.security.Security;
 
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLParameters;
 
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.slf4j.Logger;
@@ -69,10 +68,25 @@
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
-import com.github.dockerjava.core.CertificateUtils;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.command.ExecCreateCmdImpl;
 import com.github.dockerjava.core.command.ExecStartCmdImpl;
+import com.github.dockerjava.core.command.ExecStartResultCallback;
+import com.github.dockerjava.netty.exec.AuthCmdExec;
+import com.github.dockerjava.netty.exec.CopyFileFromContainerCmdExec;
+import com.github.dockerjava.netty.exec.CreateContainerCmdExec;
+import com.github.dockerjava.netty.exec.ExecCreateCmdExec;
+import com.github.dockerjava.netty.exec.ExecStartCmdExec;
+import com.github.dockerjava.netty.exec.InfoCmdExec;
+import com.github.dockerjava.netty.exec.InspectContainerCmdExec;
+import com.github.dockerjava.netty.exec.InspectExecCmdExec;
+import com.github.dockerjava.netty.exec.InspectImageCmdExec;
+import com.github.dockerjava.netty.exec.KillContainerCmdExec;
+import com.github.dockerjava.netty.exec.LogContainerCmdExec;
+import com.github.dockerjava.netty.exec.RemoveContainerCmdExec;
+import com.github.dockerjava.netty.exec.StartContainerCmdExec;
+import com.github.dockerjava.netty.exec.StopContainerCmdExec;
+import com.github.dockerjava.netty.exec.WaitContainerCmdExec;
 
 /**
  * http://stackoverflow.com/questions/33296749/netty-connect-to-unix-domain- socket-failed
@@ -97,7 +111,9 @@ public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
     private ChannelProvider channelProvider = new ChannelProvider() {
         @Override
         public Channel getChannel() {
-            return connect();
+            Channel channel = connect();
+            channel.pipeline().addLast(new LoggingHandler(getClass()));
+            return channel;
         }
     };
 
@@ -128,15 +144,15 @@ private Channel connect() {
     }
 
     private Channel connect(final Bootstrap bootstrap) throws InterruptedException {
-       return nettyInitializer.connect(bootstrap);
+        return nettyInitializer.connect(bootstrap);
     }
 
     private static interface NettyInitializer {
         EventLoopGroup init(final Bootstrap bootstrap, DockerClientConfig dockerClientConfig);
+
         Channel connect(final Bootstrap bootstrap) throws InterruptedException;
     }
 
-
     private class UnixDomainSocketInitializer implements NettyInitializer {
         @Override
         public EventLoopGroup init(Bootstrap bootstrap, DockerClientConfig dockerClientConfig) {
@@ -159,14 +175,14 @@ public Channel connect(Bootstrap bootstrap) throws InterruptedException {
 
     private class InetSocketInitializer implements NettyInitializer {
         @Override
-        public EventLoopGroup init(Bootstrap bootstrap, DockerClientConfig dockerClientConfig) {
+        public EventLoopGroup init(Bootstrap bootstrap, final DockerClientConfig dockerClientConfig) {
             EventLoopGroup eventLoopGroup = new NioEventLoopGroup();
 
             InetAddress addr = InetAddress.getLoopbackAddress();
 
             final SocketAddress proxyAddress = new InetSocketAddress(addr, 8008);
 
-            final SslContext sslCtx = initSslContext(dockerClientConfig);
+            Security.addProvider(new BouncyCastleProvider());
 
             bootstrap.group(eventLoopGroup).channel(NioSocketChannel.class)
                     .handler(new ChannelInitializer<SocketChannel>() {
@@ -174,11 +190,6 @@ public EventLoopGroup init(Bootstrap bootstrap, DockerClientConfig dockerClientC
                         protected void initChannel(final SocketChannel channel) throws Exception {
                             // channel.pipeline().addLast(new
                             // HttpProxyHandler(proxyAddress));
-
-                            if (sslCtx != null) {
-                                channel.pipeline().addLast(sslCtx.newHandler(channel.alloc()));
-                            }
-
                             channel.pipeline().addLast(new HttpClientCodec());
                         }
                     });
@@ -195,35 +206,42 @@ public Channel connect(Bootstrap bootstrap) throws InterruptedException {
                 throw new RuntimeException("no port configured for " + host);
             }
 
-            return bootstrap.connect(host, port).sync().channel();
-        }
+            Channel channel = bootstrap.connect(host, port).sync().channel();
+
+            if ("https".equals(dockerClientConfig.getUri().getScheme())) {
+                final SslHandler ssl = initSsl(dockerClientConfig);
 
-        private SslContext initSslContext(DockerClientConfig dockerClientConfig) {
-            SslContext sslContext = null;
+                if (ssl != null) {
+                    channel.pipeline().addFirst(ssl);
+                }
+            }
 
-            String scheme = dockerClientConfig.getUri().getScheme();
+            return channel;
+        }
 
-            if ("https".equals(scheme) && dockerClientConfig.getDockerCertPath() != null) {
+        private SslHandler initSsl(DockerClientConfig dockerClientConfig) {
+            SslHandler ssl = null;
 
-                String dockerCertPath = dockerClientConfig.getDockerCertPath();
+            try {
+                String host = dockerClientConfig.getUri().getHost();
+                int port = dockerClientConfig.getUri().getPort();
 
-                Security.addProvider(new BouncyCastleProvider());
+                SSLContext sslContext = dockerClientConfig.getSslConfig().getSSLContext();
 
-                try {
-                    TrustManagerFactory tmFactory = TrustManagerFactory.getInstance("PKIX");
-                    tmFactory.init(CertificateUtils.createTrustStore(dockerCertPath));
+                SSLEngine engine = sslContext.createSSLEngine(host, port);
+                engine.setUseClientMode(true);
+                engine.setSSLParameters(enableHostNameVerification(engine.getSSLParameters()));
 
-                    KeyManagerFactory kmFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-                    kmFactory.init(CertificateUtils.createKeyStore(dockerCertPath), "docker".toCharArray());
+                // in the future we may use HostnameVerifier like here:
+                // https://github.com/AsyncHttpClient/async-http-client/blob/1.8.x/src/main/java/com/ning/http/client/providers/netty/NettyConnectListener.java#L76
 
-                    sslContext = SslContextBuilder.forClient().sslProvider(SslProvider.JDK).keyManager(kmFactory)
-                            .trustManager(tmFactory).build();
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
+                ssl = new SslHandler(engine);
 
+            } catch (Exception e) {
+                throw new RuntimeException(e);
             }
-            return sslContext;
+
+            return ssl;
         }
     }
 
@@ -233,15 +251,19 @@ protected DockerClientConfig getDockerClientConfig() {
         return dockerClientConfig;
     }
 
+    public SSLParameters enableHostNameVerification(SSLParameters sslParameters) {
+        sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
+        return sslParameters;
+    }
+
     @Override
     public AuthCmd.Exec createAuthCmdExec() {
-        return null; // new AuthCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new AuthCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public InfoCmd.Exec createInfoCmdExec() {
-        return new InfoCmdExec(new WebTarget(channelProvider), getDockerClientConfig());
+        return new InfoCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
@@ -300,8 +322,7 @@ public ListImagesCmd.Exec createListImagesCmdExec() {
 
     @Override
     public InspectImageCmd.Exec createInspectImageCmdExec() {
-        return null; // new InspectImageCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new InspectImageCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
@@ -312,37 +333,32 @@ public ListContainersCmd.Exec createListContainersCmdExec() {
 
     @Override
     public CreateContainerCmd.Exec createCreateContainerCmdExec() {
-        return null; // new CreateContainerCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new CreateContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public StartContainerCmd.Exec createStartContainerCmdExec() {
-        return null; // new StartContainerCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new StartContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public InspectContainerCmd.Exec createInspectContainerCmdExec() {
-        return null; // new InspectContainerCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new InspectContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public ExecCreateCmd.Exec createExecCmdExec() {
-        return new ExecCreateCmdExec(new WebTarget(channelProvider), getDockerClientConfig());
+        return new ExecCreateCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
-        return null; // new RemoveContainerCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new RemoveContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public WaitContainerCmd.Exec createWaitContainerCmdExec() {
-        return null; // new WaitContainerCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new WaitContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
@@ -353,32 +369,27 @@ public AttachContainerCmd.Exec createAttachContainerCmdExec() {
 
     @Override
     public ExecStartCmd.Exec createExecStartCmdExec() {
-
-        return new ExecStartCmdExec(new WebTarget(channelProvider), getDockerClientConfig());
+        return new ExecStartCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public InspectExecCmd.Exec createInspectExecCmdExec() {
-        return null; // new InspectExecCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new InspectExecCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public LogContainerCmd.Exec createLogContainerCmdExec() {
-        return null; // new LogContainerCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new LogContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
-        return null; // new CopyFileFromContainerCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new CopyFileFromContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public StopContainerCmd.Exec createStopContainerCmdExec() {
-        return null; // new StopContainerCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new StopContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
@@ -389,8 +400,7 @@ public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
 
     @Override
     public KillContainerCmd.Exec createKillContainerCmdExec() {
-        return null; // new KillContainerCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new KillContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
@@ -456,13 +466,18 @@ public void close() throws IOException {
         eventLoopGroup.shutdownGracefully();
     }
 
+    private WebTarget getBaseResource() {
+        return new WebTarget(channelProvider);
+    }
+
     public static void main(String[] args) throws IOException {
         DockerCmdExecFactory execFactory = new DockerCmdExecFactoryImpl();
         // execFactory.init(new
         // DockerClientConfigBuilder().withUri("unix:///var/run/docker.sock").build());
         // execFactory.init(new DockerClientConfigBuilder().withUri("http://localhost:2375").build());
 
-        DockerClientConfig config = DockerClientConfig.createDefaultConfigBuilder().withUri("https://192.168.59.103:2376").build();
+        DockerClientConfig config = DockerClientConfig.createDefaultConfigBuilder()
+                .withUri("https://192.168.59.103:2376").build();
 
         execFactory.init(config);
 
@@ -490,7 +505,18 @@ public static void main(String[] args) throws IOException {
         ExecStartCmd execStartCmd = new ExecStartCmdImpl(execStart, execCreateCmdResponse.getId()).withDetach(false)
                 .withTty(true);
 
-        InputStream response = execStart.exec(execStartCmd);
+        ExecStartResultCallback callback = new ExecStartResultCallback(System.out, System.err);
+
+        execStart.exec(execStartCmd, callback);
+
+        try {
+            callback.awaitCompletion();
+        } catch (InterruptedException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+
+        System.err.println("main finished");
 
         // FrameReader frameReader = new FrameReader(response);
         //
diff --git a/src/main/java/com/github/dockerjava/netty/ExecStartCmdExec.java b/src/main/java/com/github/dockerjava/netty/ExecStartCmdExec.java
deleted file mode 100644
index b158bf4e2..000000000
--- a/src/main/java/com/github/dockerjava/netty/ExecStartCmdExec.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.github.dockerjava.netty;
-
-import java.io.InputStream;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.ExecStartCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class ExecStartCmdExec extends AbstrSyncDockerCmdExec<ExecStartCmd, InputStream> implements ExecStartCmd.Exec {
-
-	private static final Logger LOGGER = LoggerFactory.getLogger(ExecStartCmdExec.class);
-
-	public ExecStartCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-		super(baseResource, dockerClientConfig);
-	}
-
-	@Override
-	protected InputStream execute(ExecStartCmd command) {
-		WebTarget webResource = getBaseResource().path("/exec/{id}/start").resolveTemplate("id", command.getExecId());
-
-		LOGGER.trace("POST: {}", webResource);
-
-		webResource.request().accept(MediaType.APPLICATION_JSON).post(command, System.out, null, System.in);
-
-		return null;
-	}
-}
diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
index b4f0fb1ee..a2cfeb827 100644
--- a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
+++ b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
@@ -1,270 +1,340 @@
 package com.github.dockerjava.netty;
 
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpClientCodec;
+import io.netty.handler.codec.http.HttpClientUpgradeHandler;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaderValues;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.codec.json.JsonObjectDecoder;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.BadRequestException;
+import com.github.dockerjava.api.ConflictException;
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.InternalServerErrorException;
+import com.github.dockerjava.api.NotAcceptableException;
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.NotModifiedException;
+import com.github.dockerjava.api.UnauthorizedException;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.netty.handler.AwaitObjectInboundHandler;
 import com.github.dockerjava.netty.handler.DeserializeJsonInboundHandler;
-import com.github.dockerjava.netty.handler.DockerRawStreamHandler;
-import com.github.dockerjava.netty.handler.HijackHttpConnectionHandler;
+import com.github.dockerjava.netty.handler.FramedResponseStreamHandler;
+import com.github.dockerjava.netty.handler.HttpConnectionHijackHandler;
 import com.github.dockerjava.netty.handler.HttpRequestProvider;
-import com.github.dockerjava.netty.handler.HttpResponseInboundHandler;
+import com.github.dockerjava.netty.handler.HttpResponseHandler;
 import com.github.dockerjava.netty.handler.HttpResponseStreamInboundHandler;
 
-import io.netty.buffer.Unpooled;
-import io.netty.channel.Channel;
-import io.netty.handler.codec.http.DefaultFullHttpRequest;
-import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.HttpClientCodec;
-import io.netty.handler.codec.http.HttpClientUpgradeHandler;
-import io.netty.handler.codec.http.HttpHeaderNames;
-import io.netty.handler.codec.http.HttpHeaderValues;
-import io.netty.handler.codec.http.HttpMethod;
-import io.netty.handler.codec.http.HttpRequest;
-import io.netty.handler.codec.http.HttpVersion;
-import io.netty.handler.codec.json.JsonObjectDecoder;
-
 public class InvocationBuilder {
 
-	private ChannelProvider channelProvider;
-	private String resource;
-	private Map<String, String> headers = new HashMap<String, String>();
+    private ChannelProvider channelProvider;
+
+    private String resource;
+
+    private Map<String, String> headers = new HashMap<String, String>();
+
+    public InvocationBuilder(ChannelProvider channelProvider, String resource) {
+        this.channelProvider = channelProvider;
+        this.resource = resource;
+    }
+
+    public InvocationBuilder accept(MediaType mediaType) {
+        headers.put(HttpHeaderNames.ACCEPT.toString(), mediaType.getMediaType());
+        return this;
+    }
+
+    public <T> T get(Class<T> resultType) {
 
-	public InvocationBuilder(ChannelProvider channelProvider, String resource) {
-		this.channelProvider = channelProvider;
-		this.resource = resource;
-	}
+        HttpRequestProvider requestProvider = httpGetRequestProvider();
 
-	public InvocationBuilder accept(MediaType mediaType) {
-		headers.put(HttpHeaderNames.ACCEPT.toString(), mediaType.getMediaType());
-		return this;
-	}
+        Channel channel = channelProvider.getChannel();
 
-	public <T> T get(Class<T> resultType) {
-		FullHttpRequest request = prepareGetRequest(resource);
+        AwaitObjectInboundHandler<T> awaitObject = new AwaitObjectInboundHandler<T>(resultType);
 
-		Channel channel = channelProvider.getChannel();
+        HttpResponseHandler responseHandler = new HttpResponseHandler();
 
-		AwaitObjectInboundHandler<T> awaitObject = new AwaitObjectInboundHandler<T>(resultType);
+        channel.pipeline().addLast(responseHandler);
+        channel.pipeline().addLast(new JsonObjectDecoder());
+        channel.pipeline().addLast(new DeserializeJsonInboundHandler<T>(resultType));
+        channel.pipeline().addLast(awaitObject);
 
-		channel.pipeline().addLast(new HttpResponseInboundHandler(new HttpRequestProvider() {
-			@Override
-			public HttpRequest getHttpRequest(String uri) {
-				return prepareGetRequest(uri);
-			}
-		}));
-		channel.pipeline().addLast(new JsonObjectDecoder());
-		channel.pipeline().addLast(new DeserializeJsonInboundHandler<T>(resultType));
-		channel.pipeline().addLast(awaitObject);
+        sendRequestAndHandleResponse(requestProvider, channel, responseHandler);
 
-		System.out.println("resource: " + resource);
+        return awaitObject.await();
 
-		channel.writeAndFlush(request);
+    }
 
-		// Wait for the server to close the connection.
-		try {
-			// channel.closeFuture().sync();
-			T response = awaitObject.await();
+    private void sendRequestAndHandleResponse(HttpRequestProvider requestProvider, Channel channel,
+            HttpResponseHandler responseHandler) {
 
-			// channel.disconnect();
+        channel.writeAndFlush(requestProvider.getHttpRequest(resource));
 
-			return response;
-		} catch (InterruptedException e) {
-			throw new RuntimeException(e);
-		}
-	}
+        handleResponse(channel, responseHandler, requestProvider);
+    }
 
-	private FullHttpRequest prepareGetRequest(String uri) {
-		// Prepare the HTTP request.
-		FullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, uri);
+    private HttpRequestProvider httpGetRequestProvider() {
+        return new HttpRequestProvider() {
+            @Override
+            public HttpRequest getHttpRequest(String uri) {
+                return prepareGetRequest(uri);
+            }
+        };
+    }
 
-		setDefaultHeaders(request);
-		return request;
-	}
+    public void get(ResultCallback<Frame> resultCallback) {
 
-	private void setDefaultHeaders(HttpRequest request) {
-		request.headers().set(HttpHeaderNames.HOST, "");
-		request.headers().set(HttpHeaderNames.CONNECTION, HttpHeaderValues.KEEP_ALIVE);
-		request.headers().set(HttpHeaderNames.ACCEPT_ENCODING, HttpHeaderValues.GZIP);
+        HttpRequestProvider requestProvider = httpGetRequestProvider();
 
-		for (Map.Entry<String, String> entry : headers.entrySet()) {
-			request.headers().set((CharSequence) entry.getKey(), entry.getValue());
-		}
-	}
+        HttpResponseHandler responseHandler = new HttpResponseHandler();
 
-	public <T> T post(final Object entity, Class<T> resultType) {
+        FramedResponseStreamHandler streamHandler = new FramedResponseStreamHandler(resultCallback);
 
-		HttpRequest request = preparePostRequest(resource, entity);
+        Channel channel = channelProvider.getChannel();
 
-		AwaitObjectInboundHandler<T> awaitObject = new AwaitObjectInboundHandler<T>(resultType);
+        channel.pipeline().addLast(responseHandler);
+        channel.pipeline().addLast(streamHandler);
 
-		Channel channel = channelProvider.getChannel();
+        sendRequestAndHandleResponse(requestProvider, channel, responseHandler);
+    }
 
-		channel.pipeline().addLast(new HttpResponseInboundHandler(new HttpRequestProvider() {
-			@Override
-			public HttpRequest getHttpRequest(String uri) {
-				return preparePostRequest(uri, entity);
-			}
-		}));
-		channel.pipeline().addLast(new JsonObjectDecoder());
-		channel.pipeline().addLast(new DeserializeJsonInboundHandler<T>(resultType));
-		channel.pipeline().addLast(awaitObject);
+    private FullHttpRequest prepareGetRequest(String uri) {
 
-		System.out.println("resource: " + resource);
-		System.out.println(channel.isActive());
+        FullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, uri);
 
-		channel.writeAndFlush(request);
+        setDefaultHeaders(request);
 
-		// Wait for the server to close the connection.
-		try {
-			// channel.closeFuture().sync();
-			T response = awaitObject.await();
+        return request;
+    }
 
-			return response;
-		} catch (InterruptedException e) {
-			throw new RuntimeException(e);
-		}
+    private void setDefaultHeaders(HttpRequest request) {
+        request.headers().set(HttpHeaderNames.HOST, "");
+        request.headers().set(HttpHeaderNames.CONNECTION, HttpHeaderValues.KEEP_ALIVE);
+        request.headers().set(HttpHeaderNames.ACCEPT_ENCODING, HttpHeaderValues.GZIP);
 
-	}
+        for (Map.Entry<String, String> entry : headers.entrySet()) {
+            request.headers().set((CharSequence) entry.getKey(), entry.getValue());
+        }
+    }
 
-	public InputStream post(final Object entity, final InputStream stdin) {
+    public <T> T post(final Object entity, Class<T> resultType) {
 
-		HttpRequest request = preparePostRequest(resource, entity);
+        HttpRequestProvider requestProvider = httpPostRequestProvider(entity);
 
-		HttpResponseStreamInboundHandler streamHandler = new HttpResponseStreamInboundHandler();
+        AwaitObjectInboundHandler<T> awaitObject = new AwaitObjectInboundHandler<T>(resultType);
 
-		final Channel channel = channelProvider.getChannel();
+        Channel channel = channelProvider.getChannel();
 
-		HijackHttpConnectionHandler hijackHandler = new HijackHttpConnectionHandler();
-		channel.pipeline()
-				.addLast(new HttpClientUpgradeHandler(new HttpClientCodec(), hijackHandler, Integer.MAX_VALUE));
-		channel.pipeline().addLast(new HttpResponseInboundHandler(new HttpRequestProvider() {
-			@Override
-			public HttpRequest getHttpRequest(String uri) {
-				return preparePostRequest(uri, entity);
-			}
-		}));
+        HttpResponseHandler responseHandler = new HttpResponseHandler();
 
-		channel.pipeline().addLast(streamHandler);
+        channel.pipeline().addLast(responseHandler);
+        channel.pipeline().addLast(new JsonObjectDecoder());
+        channel.pipeline().addLast(new DeserializeJsonInboundHandler<T>(resultType));
+        channel.pipeline().addLast(awaitObject);
 
-		channel.writeAndFlush(request);
+        sendRequestAndHandleResponse(requestProvider, channel, responseHandler);
 
-		// wait for successful http upgrade procedure
-		hijackHandler.await();
+        return awaitObject.await();
 
-		// start a new thread that reads from stdin and writes to the channel
-		new Thread(new Runnable() {
+    }
 
-			@Override
-			public void run() {
+    public void post(final Object entity, final InputStream stdin, ResultCallback<Frame> resultCallback) {
 
-				BufferedReader reader = new BufferedReader(new InputStreamReader(stdin));
+        HttpRequestProvider requestProvider = httpPostRequestProvider(entity);
 
-				int read = -1;
-				while ((read = read(reader)) != -1) {
-					byte[] bytes = ByteBuffer.allocate(4).putInt(read).array();
-					channel.writeAndFlush(Unpooled.copiedBuffer(bytes));
-				}
-			}
+        FramedResponseStreamHandler streamHandler = new FramedResponseStreamHandler(resultCallback);
 
-			private int read(BufferedReader reader) {
-				try {
-					return reader.read();
-				} catch (IOException e) {
-					throw new RuntimeException(e);
-				}
-			}
-		}).start();
+        final Channel channel = channelProvider.getChannel();
 
-		return streamHandler.getInputStream();
-	}
+        HttpResponseHandler responseHandler = new HttpResponseHandler();
 
-	public void post(final Object entity, final OutputStream stdout, final OutputStream stderr,
-			final InputStream stdin) {
+        HttpConnectionHijackHandler hijackHandler = new HttpConnectionHijackHandler(responseHandler);
 
-		HttpRequest request = preparePostRequest(resource, entity);
+        channel.pipeline().addLast(
+                new HttpClientUpgradeHandler(new HttpClientCodec(), hijackHandler, Integer.MAX_VALUE));
+        channel.pipeline().addLast(streamHandler);
 
-		DockerRawStreamHandler streamHandler = new DockerRawStreamHandler(stdout, stderr);
+        sendRequestAndHandleResponse(requestProvider, channel, responseHandler);
 
-		final Channel channel = channelProvider.getChannel();
+        // wait for successful http upgrade procedure
+        hijackHandler.await();
 
-		HijackHttpConnectionHandler hijackHandler = new HijackHttpConnectionHandler();
-		channel.pipeline()
-				.addLast(new HttpClientUpgradeHandler(new HttpClientCodec(), hijackHandler, Integer.MAX_VALUE));
-		channel.pipeline().addLast(new HttpResponseInboundHandler(new HttpRequestProvider() {
-			@Override
-			public HttpRequest getHttpRequest(String uri) {
-				return preparePostRequest(uri, entity);
-			}
-		}));
+        // now we can start a new thread that reads from stdin and writes to the channel
+        new Thread(new Runnable() {
 
-		channel.pipeline().addLast(streamHandler);
+            @Override
+            public void run() {
 
-		channel.writeAndFlush(request);
+                BufferedReader reader = new BufferedReader(new InputStreamReader(stdin, Charset.forName("UTF-8")));
 
-		// wait for successful http upgrade procedure
-		hijackHandler.await();
+                int read = -1;
+                while ((read = read(reader)) != -1) {
+                    byte[] bytes = ByteBuffer.allocate(4).putInt(read).array();
+                    try {
+                        bytes = new String(bytes).getBytes("US-ASCII");
+                    } catch (UnsupportedEncodingException e) {
+                        throw new RuntimeException(e);
+                    }
 
-		// start a new thread that reads from stdin and writes to the channel
-		new Thread(new Runnable() {
+                    channel.writeAndFlush(Unpooled.copiedBuffer(bytes));
+                }
+            }
 
-			@Override
-			public void run() {
+            private int read(BufferedReader reader) {
+                try {
+                    return reader.read();
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }).start();
 
-				BufferedReader reader = new BufferedReader(new InputStreamReader(stdin, Charset.forName("UTF-8")));
+    }
 
-				int read = -1;
-				while ((read = read(reader)) != -1) {
-					byte[] bytes = ByteBuffer.allocate(4).putInt(read).array();
-					try {
-						bytes = new String(bytes).getBytes("US-ASCII");
-					} catch (UnsupportedEncodingException e) {
-						throw new RuntimeException(e);
-					}
+    private void handleResponse(final Channel channel, HttpResponseHandler responseHandler,
+            HttpRequestProvider requestProvider) {
+        HttpResponse response = responseHandler.awaitResponse();
 
-					channel.writeAndFlush(Unpooled.copiedBuffer(bytes));
-				}
-			}
+        switch (response.status().code()) {
+        case 101:
+        case 200:
+        case 201:
+        case 204:
+            break;
+        case 301:
+        case 302:
+            if (response.headers().contains(HttpHeaderNames.LOCATION)) {
+                String location = response.headers().get(HttpHeaderNames.LOCATION);
+                System.out.println("redirected to :" + location);
+                HttpRequest redirected = requestProvider.getHttpRequest(location);
 
-			private int read(BufferedReader reader) {
-				try {
-					return reader.read();
-				} catch (IOException e) {
-					throw new RuntimeException(e);
-				}
-			}
-		}).start();
+                channel.writeAndFlush(redirected);
+            }
+            break;
+        case 304:
+            throw new NotModifiedException(responseHandler.awaitErrorBody());
+        case 400:
+            throw new BadRequestException(responseHandler.awaitErrorBody());
+        case 401:
+            throw new UnauthorizedException(responseHandler.awaitErrorBody());
+        case 404:
+            throw new NotFoundException(responseHandler.awaitErrorBody());
+        case 406:
+            throw new NotAcceptableException(responseHandler.awaitErrorBody());
+        case 409:
+            throw new ConflictException(responseHandler.awaitErrorBody());
+        case 500:
+            throw new InternalServerErrorException(responseHandler.awaitErrorBody());
+        default:
+            throw new DockerException(responseHandler.awaitErrorBody(), response.status().code());
+        }
 
-	}
+    }
 
-	private HttpRequest preparePostRequest(String uri, Object entity) {
-		// Prepare the HTTP request.
-		FullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, uri);
+    private HttpRequest preparePostRequest(String uri, Object entity) {
 
-		setDefaultHeaders(request);
+        FullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, uri);
 
-		byte[] bytes;
-		try {
-			bytes = new ObjectMapper().writeValueAsBytes(entity);
-		} catch (JsonProcessingException e) {
-			throw new RuntimeException(e);
-		}
+        setDefaultHeaders(request);
 
-		request.headers().set(HttpHeaderNames.CONTENT_TYPE, "application/json");
-		request.content().clear().writeBytes(Unpooled.copiedBuffer(bytes));
-		request.headers().set(HttpHeaderNames.CONTENT_LENGTH, bytes.length);
+        if (entity != null) {
+            byte[] bytes;
+            try {
+                bytes = new ObjectMapper().writeValueAsBytes(entity);
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+            }
+
+            request.headers().set(HttpHeaderNames.CONTENT_TYPE, "application/json");
+            request.content().clear().writeBytes(Unpooled.copiedBuffer(bytes));
+            request.headers().set(HttpHeaderNames.CONTENT_LENGTH, bytes.length);
+        } else {
+            request.headers().set(HttpHeaderNames.CONTENT_LENGTH, 0);
+        }
+
+        return request;
+    }
+
+    private HttpRequest prepareDeleteRequest(String uri) {
+
+        FullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.DELETE, uri);
+
+        setDefaultHeaders(request);
+
+        return request;
+    }
+
+    public InputStream post(final Object entity) {
+
+        HttpRequestProvider requestProvider = httpPostRequestProvider(entity);
+
+        Channel channel = channelProvider.getChannel();
+
+        HttpResponseHandler responseHandler = new HttpResponseHandler();
+        HttpResponseStreamInboundHandler streamHandler = new HttpResponseStreamInboundHandler();
+
+        channel.pipeline().addLast(responseHandler);
+        channel.pipeline().addLast(streamHandler);
+
+        sendRequestAndHandleResponse(requestProvider, channel, responseHandler);
+
+        return streamHandler.getInputStream();
+    }
+
+    private HttpRequestProvider httpPostRequestProvider(final Object entity) {
+        return new HttpRequestProvider() {
+            @Override
+            public HttpRequest getHttpRequest(String uri) {
+                return preparePostRequest(uri, entity);
+            }
+        };
+    }
+
+    public void delete() {
+
+        HttpRequestProvider requestProvider = httpDeleteRequestProvider();
+
+        HttpResponseHandler responseHandler = new HttpResponseHandler();
+
+        Channel channel = channelProvider.getChannel();
+
+        channel.pipeline().addLast(responseHandler);
+
+        sendRequestAndHandleResponse(requestProvider, channel, responseHandler);
+    }
 
-		return request;
-	}
+    private HttpRequestProvider httpDeleteRequestProvider() {
+        return new HttpRequestProvider() {
+            @Override
+            public HttpRequest getHttpRequest(String uri) {
+                return prepareDeleteRequest(uri);
+            }
+        };
+    }
 
+    public <T> T get(TypeReference<T> typeReference) {
+        Class<T> clazz = (Class<T>) typeReference.getType().getClass();
+        return null;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/netty/MediaType.java b/src/main/java/com/github/dockerjava/netty/MediaType.java
index 347b9de72..e3fe18c3f 100644
--- a/src/main/java/com/github/dockerjava/netty/MediaType.java
+++ b/src/main/java/com/github/dockerjava/netty/MediaType.java
@@ -2,14 +2,15 @@
 
 public enum MediaType {
 
-	APPLICATION_JSON("application/json");
-	
+	APPLICATION_JSON("application/json"),
+	APPLICATION_OCTET_STREAM("application/octet-stream");
+
 	private String mediaType;
-	
+
 	private MediaType(String mediaType) {
 		this.mediaType = mediaType;
 	}
-	
+
 	public String getMediaType() {
 		return mediaType;
 	}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/AbstrAsyncDockerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/AbstrAsyncDockerCmdExec.java
new file mode 100644
index 000000000..cb2b523c4
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/AbstrAsyncDockerCmdExec.java
@@ -0,0 +1,67 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.AsyncDockerCmd;
+import com.github.dockerjava.api.command.DockerCmdAsyncExec;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
+import com.github.dockerjava.netty.WebTarget;
+
+import java.io.Closeable;
+import java.io.IOException;
+
+public abstract class AbstrAsyncDockerCmdExec<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T>, A_RES_T> extends
+        AbstrDockerCmdExec implements DockerCmdAsyncExec<CMD_T, A_RES_T> {
+
+    public AbstrAsyncDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    public Void exec(CMD_T command, ResultCallback<A_RES_T> resultCallback) {
+        return execute(command, resultCallback);
+    }
+
+    protected final Void execute(final CMD_T command, final ResultCallback<A_RES_T> resultCallback) {
+
+        ResultCallback<A_RES_T> delegatingResultCallback = new ResultCallback<A_RES_T>() {
+
+            @Override
+            public void close() throws IOException {
+                resultCallback.close();
+                command.close();
+            }
+
+            @Override
+            public void onStart(Closeable closeable) {
+                resultCallback.onStart(closeable);
+            }
+
+            @Override
+            public void onNext(A_RES_T object) {
+                resultCallback.onNext(object);
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                resultCallback.onError(throwable);
+            }
+
+            @Override
+            public void onComplete() {
+                resultCallback.onComplete();
+                command.close();
+            }
+        };
+
+        execute0(command, delegatingResultCallback);
+
+        return null;
+    }
+
+    protected abstract Void execute0(final CMD_T command, final ResultCallback<A_RES_T> resultCallback);
+
+
+
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/AbstrDockerCmdExec.java
similarity index 96%
rename from src/main/java/com/github/dockerjava/netty/AbstrDockerCmdExec.java
rename to src/main/java/com/github/dockerjava/netty/exec/AbstrDockerCmdExec.java
index 3d0308d57..a1d54bd27 100644
--- a/src/main/java/com/github/dockerjava/netty/AbstrDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/AbstrDockerCmdExec.java
@@ -1,10 +1,12 @@
-package com.github.dockerjava.netty;
+package com.github.dockerjava.netty.exec;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.RemoteApiVersion;
+import com.github.dockerjava.netty.WebTarget;
+
 import org.apache.commons.codec.binary.Base64;
 
 import java.io.IOException;
diff --git a/src/main/java/com/github/dockerjava/netty/AbstrSyncDockerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/AbstrSyncDockerCmdExec.java
similarity index 92%
rename from src/main/java/com/github/dockerjava/netty/AbstrSyncDockerCmdExec.java
rename to src/main/java/com/github/dockerjava/netty/exec/AbstrSyncDockerCmdExec.java
index 43854dbd1..b67eac37a 100644
--- a/src/main/java/com/github/dockerjava/netty/AbstrSyncDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/AbstrSyncDockerCmdExec.java
@@ -1,9 +1,10 @@
-package com.github.dockerjava.netty;
+package com.github.dockerjava.netty.exec;
 
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.command.DockerCmd;
 import com.github.dockerjava.api.command.DockerCmdSyncExec;
 import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.WebTarget;
 
 
 public abstract class AbstrSyncDockerCmdExec<CMD_T extends DockerCmd<RES_T>, RES_T> extends AbstrDockerCmdExec
diff --git a/src/main/java/com/github/dockerjava/netty/exec/AuthCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/AuthCmdExec.java
new file mode 100644
index 000000000..ed6c9cb7a
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/AuthCmdExec.java
@@ -0,0 +1,34 @@
+package com.github.dockerjava.netty.exec;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.command.AuthCmd;
+import com.github.dockerjava.api.model.AuthResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+public class AuthCmdExec extends AbstrSyncDockerCmdExec<AuthCmd, AuthResponse> implements AuthCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AuthCmdExec.class);
+
+    public AuthCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected AuthResponse execute(AuthCmd command) {
+        WebTarget webResource = getBaseResource().path("/auth");
+        LOGGER.trace("POST: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(command.getAuthConfig(), AuthResponse.class);
+
+//        if (response.getStatus() == 401) {
+//            throw new UnauthorizedException("Unauthorized");
+//        }
+//
+//        return response.readEntity(AuthResponse.class);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExec.java
new file mode 100644
index 000000000..338b9b973
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExec.java
@@ -0,0 +1,33 @@
+package com.github.dockerjava.netty.exec;
+
+import java.io.InputStream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+public class CopyFileFromContainerCmdExec extends AbstrSyncDockerCmdExec<CopyFileFromContainerCmd, InputStream>
+        implements CopyFileFromContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CopyFileFromContainerCmdExec.class);
+
+    public CopyFileFromContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected InputStream execute(CopyFileFromContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/copy").resolveTemplate("id",
+                command.getContainerId());
+
+        LOGGER.trace("POST: " + webResource.toString());
+
+        return webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM)
+                .post(command);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CreateContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/CreateContainerCmdExec.java
new file mode 100644
index 000000000..bf858349b
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/CreateContainerCmdExec.java
@@ -0,0 +1,35 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.CreateContainerCmd;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.CreateContainerCmd.Exec;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CreateContainerCmdExec extends AbstrSyncDockerCmdExec<CreateContainerCmd, CreateContainerResponse>
+        implements CreateContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateContainerCmdExec.class);
+
+    public CreateContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected CreateContainerResponse execute(CreateContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/create");
+
+        if (command.getName() != null) {
+            webResource = webResource.queryParam("name", command.getName());
+        }
+
+        LOGGER.trace("POST: {} ", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(command, CreateContainerResponse.class);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/ExecCreateCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ExecCreateCmdExec.java
similarity index 78%
rename from src/main/java/com/github/dockerjava/netty/ExecCreateCmdExec.java
rename to src/main/java/com/github/dockerjava/netty/exec/ExecCreateCmdExec.java
index 10e5ad9d8..78f788f3f 100644
--- a/src/main/java/com/github/dockerjava/netty/ExecCreateCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ExecCreateCmdExec.java
@@ -1,9 +1,12 @@
-package com.github.dockerjava.netty;
+package com.github.dockerjava.netty.exec;
 
 import com.github.dockerjava.api.command.ExecCreateCmd;
 import com.github.dockerjava.api.command.ExecCreateCmdResponse;
+import com.github.dockerjava.api.command.ExecCreateCmd.Exec;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.AbstrSyncDockerCmdExec;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.netty.exec.AbstrSyncDockerCmdExec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ExecStartCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ExecStartCmdExec.java
new file mode 100644
index 000000000..9d684ca7b
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/ExecStartCmdExec.java
@@ -0,0 +1,29 @@
+package com.github.dockerjava.netty.exec;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.ExecStartCmd;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+public class ExecStartCmdExec extends AbstrAsyncDockerCmdExec<ExecStartCmd, Frame> implements ExecStartCmd.Exec {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(ExecStartCmdExec.class);
+
+	public ExecStartCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+		super(baseResource, dockerClientConfig);
+	}
+
+    @Override
+    protected Void execute0(ExecStartCmd command, ResultCallback<Frame> resultCallback) {
+        WebTarget webTarget = getBaseResource().path("/exec/{id}/start").resolveTemplate("id", command.getExecId());
+
+        webTarget.request().accept(MediaType.APPLICATION_JSON).post(command, System.in, resultCallback);
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/InfoCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/InfoCmdExec.java
similarity index 91%
rename from src/main/java/com/github/dockerjava/netty/InfoCmdExec.java
rename to src/main/java/com/github/dockerjava/netty/exec/InfoCmdExec.java
index 04abf103f..5a41073a4 100644
--- a/src/main/java/com/github/dockerjava/netty/InfoCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/InfoCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty;
+package com.github.dockerjava.netty.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -6,13 +6,14 @@
 import com.github.dockerjava.api.command.InfoCmd;
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.WebTarget;
 
 /**
  * http://stackoverflow.com/questions/33296749/netty-connect-to-unix-domain-
  * socket-failed http://netty.io/wiki/native-transports.html
  * https://github.com/netty/netty/blob/master/example/src/main/java/io/netty/
  * example/http/snoop/HttpSnoopClient.java
- * 
+ *
  * @author marcus
  *
  */
@@ -23,7 +24,7 @@ public class InfoCmdExec implements InfoCmd.Exec {
 	private WebTarget webResource;
 
 	private DockerClientConfig dockerClientConfig;
-	
+
 	public InfoCmdExec(WebTarget webResource, DockerClientConfig dockerClientConfig) {
 		this.webResource = webResource;
 		this.dockerClientConfig = dockerClientConfig;
@@ -36,7 +37,7 @@ public Info exec(InfoCmd command) {
 	}
 
 
-	
 
-	
+
+
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/InspectContainerCmdExec.java
new file mode 100644
index 000000000..6490ddd7f
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/InspectContainerCmdExec.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.netty.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.InspectContainerCmd;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class InspectContainerCmdExec extends AbstrSyncDockerCmdExec<InspectContainerCmd, InspectContainerResponse>
+        implements InspectContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InspectContainerCmdExec.class);
+
+    public InspectContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected InspectContainerResponse execute(InspectContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/json").resolveTemplate("id",
+                command.getContainerId());
+
+        LOGGER.debug("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectContainerResponse.class);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectExecCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/InspectExecCmdExec.java
new file mode 100644
index 000000000..470df9c2c
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/InspectExecCmdExec.java
@@ -0,0 +1,26 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.InspectExecCmd;
+import com.github.dockerjava.api.command.InspectExecResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class InspectExecCmdExec extends AbstrSyncDockerCmdExec<InspectExecCmd, InspectExecResponse> implements
+        InspectExecCmd.Exec {
+    private static final Logger LOGGER = LoggerFactory.getLogger(InspectExecCmdExec.class);
+
+    public InspectExecCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected InspectExecResponse execute(InspectExecCmd command) {
+        WebTarget webResource = getBaseResource().path("/exec/{id}/json").resolveTemplate("id", command.getExecId());
+        LOGGER.debug("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectExecResponse.class);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/InspectImageCmdExec.java
new file mode 100644
index 000000000..0092b5ff9
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/InspectImageCmdExec.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.netty.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.InspectImageResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class InspectImageCmdExec extends AbstrSyncDockerCmdExec<InspectImageCmd, InspectImageResponse> implements
+        InspectImageCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InspectImageCmdExec.class);
+
+    public InspectImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected InspectImageResponse execute(InspectImageCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/{id}/json").resolveTemplate("id", command.getImageId());
+
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<InspectImageResponse>() {
+        });
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/KillContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/KillContainerCmdExec.java
new file mode 100644
index 000000000..bc56c51fc
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/KillContainerCmdExec.java
@@ -0,0 +1,35 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.KillContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class KillContainerCmdExec extends AbstrSyncDockerCmdExec<KillContainerCmd, Void> implements
+        KillContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(KillContainerCmdExec.class);
+
+    public KillContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(KillContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/kill").resolveTemplate("id",
+                command.getContainerId());
+
+        if (command.getSignal() != null) {
+            webResource = webResource.queryParam("signal", command.getSignal());
+        }
+
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(null);
+
+        return null;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
new file mode 100644
index 000000000..0f35c84e3
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
@@ -0,0 +1,53 @@
+package com.github.dockerjava.netty.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.ListContainersCmd;
+import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import javax.ws.rs.core.GenericType;
+
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
+public class ListContainersCmdExec extends AbstrSyncDockerCmdExec<ListContainersCmd, List<Container>> implements
+        ListContainersCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ListContainersCmdExec.class);
+
+    public ListContainersCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected List<Container> execute(ListContainersCmd command) {
+        WebTarget webTarget = getBaseResource().path("/containers/json").queryParam("since", command.getSinceId())
+                .queryParam("before", command.getBeforeId());
+
+        webTarget = booleanQueryParam(webTarget, "all", command.hasShowAllEnabled());
+        webTarget = booleanQueryParam(webTarget, "size", command.hasShowSizeEnabled());
+
+        if (command.getLimit() != null && command.getLimit() >= 0) {
+            webTarget = webTarget.queryParam("limit", String.valueOf(command.getLimit()));
+        }
+
+        if (command.getFilters() != null) {
+            webTarget = webTarget
+                    .queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters().toString()));
+        }
+
+        LOGGER.trace("GET: {}", webTarget);
+        List<Container> containers = webTarget.request().accept(MediaType.APPLICATION_JSON)
+                .get(new TypeReference<List<Container>>() {});
+        LOGGER.trace("Response: {}", containers);
+
+        return containers;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/LogContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/LogContainerCmdExec.java
new file mode 100644
index 000000000..4135f7308
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/LogContainerCmdExec.java
@@ -0,0 +1,48 @@
+package com.github.dockerjava.netty.exec;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.LogContainerCmd;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.WebTarget;
+
+
+public class LogContainerCmdExec extends AbstrAsyncDockerCmdExec<LogContainerCmd, Frame> implements
+        LogContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(LogContainerCmdExec.class);
+
+    public LogContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute0(LogContainerCmd command, ResultCallback<Frame> resultCallback) {
+
+        WebTarget webTarget = getBaseResource().path("/containers/{id}/logs").resolveTemplate("id",
+                command.getContainerId());
+
+        if (command.getTail() != null) {
+            webTarget = webTarget.queryParam("tail", command.getTail());
+        }
+
+        if (command.getSince() != null) {
+            webTarget = webTarget.queryParam("since", command.getSince());
+        }
+
+        webTarget = booleanQueryParam(webTarget, "timestamps", command.hasTimestampsEnabled());
+        webTarget = booleanQueryParam(webTarget, "stdout", command.hasStdoutEnabled());
+        webTarget = booleanQueryParam(webTarget, "stderr", command.hasStderrEnabled());
+        webTarget = booleanQueryParam(webTarget, "follow", command.hasFollowStreamEnabled());
+
+        LOGGER.trace("GET: {}", webTarget);
+
+        webTarget.request().get(resultCallback);
+
+        return null;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExec.java
new file mode 100644
index 000000000..ff4a2240e
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExec.java
@@ -0,0 +1,33 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.RemoveContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RemoveContainerCmdExec extends AbstrSyncDockerCmdExec<RemoveContainerCmd, Void> implements
+        RemoveContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveContainerCmdExec.class);
+
+    public RemoveContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(RemoveContainerCmd command) {
+        WebTarget webTarget = getBaseResource().path("/containers/" + command.getContainerId());
+
+        webTarget = booleanQueryParam(webTarget, "v", command.hasRemoveVolumesEnabled());
+        webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled());
+
+        LOGGER.trace("DELETE: {}", webTarget);
+        webTarget.request().accept(MediaType.APPLICATION_JSON).delete();
+
+        return null;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/StartContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/StartContainerCmdExec.java
new file mode 100644
index 000000000..cfa7d28ce
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/StartContainerCmdExec.java
@@ -0,0 +1,33 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.StartContainerCmd;
+import com.github.dockerjava.api.command.StartContainerCmd.Exec;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class StartContainerCmdExec extends AbstrSyncDockerCmdExec<StartContainerCmd, Void> implements
+        StartContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(StartContainerCmdExec.class);
+
+    public StartContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(StartContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/start").resolveTemplate("id",
+                command.getContainerId());
+
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(command);
+
+        return null;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/StopContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/StopContainerCmdExec.java
new file mode 100644
index 000000000..9e25d1c8d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/StopContainerCmdExec.java
@@ -0,0 +1,36 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.StopContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+
+public class StopContainerCmdExec extends AbstrSyncDockerCmdExec<StopContainerCmd, Void> implements
+        StopContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(StopContainerCmdExec.class);
+
+    public StopContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(StopContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/stop").resolveTemplate("id",
+                command.getContainerId());
+
+        if (command.getTimeout() != null) {
+            webResource = webResource.queryParam("t", String.valueOf(command.getTimeout()));
+        }
+
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(null);
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/WaitContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/WaitContainerCmdExec.java
new file mode 100644
index 000000000..f4f0076f3
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/WaitContainerCmdExec.java
@@ -0,0 +1,36 @@
+package com.github.dockerjava.netty.exec;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.api.model.WaitResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.async.JsonStreamProcessor;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+
+public class WaitContainerCmdExec extends AbstrAsyncDockerCmdExec<WaitContainerCmd, WaitResponse> implements
+        WaitContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(WaitContainerCmdExec.class);
+
+    public WaitContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute0(WaitContainerCmd command, ResultCallback<WaitResponse> resultCallback) {
+        WebTarget webTarget = getBaseResource().path("/containers/{id}/wait").resolveTemplate("id",
+                command.getContainerId());
+
+        LOGGER.trace("POST: {}", webTarget);
+
+        webTarget.request().accept(MediaType.APPLICATION_JSON).post(null, WaitResponse.class);
+
+        return null;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/handler/AwaitObjectInboundHandler.java b/src/main/java/com/github/dockerjava/netty/handler/AwaitObjectInboundHandler.java
index 806e76d31..543fc095b 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/AwaitObjectInboundHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/AwaitObjectInboundHandler.java
@@ -1,39 +1,39 @@
 package com.github.dockerjava.netty.handler;
 
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 
+import java.util.concurrent.CountDownLatch;
+
 public class AwaitObjectInboundHandler<T> extends SimpleChannelInboundHandler<T> {
-	
-	public AwaitObjectInboundHandler(Class<T> clazz) {
-		super(clazz);
-	}
-	
-	private CountDownLatch countDownLatch = new CountDownLatch(1);
-	
-	private T object;
-	
-	@Override
-	protected void channelRead0(ChannelHandlerContext ctx, T msg) throws Exception {
-		object = msg;
-		countDownLatch.countDown();
-	}
-
-	public T await() throws InterruptedException {
-		countDownLatch.await();
-		return object;
-	}
-	
-	@Override
-	public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-		cause.printStackTrace();
-		ctx.close();
-	}
+
+    public AwaitObjectInboundHandler(Class<T> clazz) {
+        super(clazz);
+    }
+
+    private CountDownLatch countDownLatch = new CountDownLatch(1);
+
+    private T object;
+
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, T msg) throws Exception {
+        object = msg;
+        countDownLatch.countDown();
+    }
+
+    public T await() {
+        try {
+            countDownLatch.await();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        return object;
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        cause.printStackTrace();
+        ctx.close();
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/netty/handler/DeserializeJsonInboundHandler.java b/src/main/java/com/github/dockerjava/netty/handler/DeserializeJsonInboundHandler.java
index d2a23988d..994169a36 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/DeserializeJsonInboundHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/DeserializeJsonInboundHandler.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.netty.handler;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.netty.buffer.ByteBuf;
@@ -7,13 +8,13 @@
 import io.netty.channel.SimpleChannelInboundHandler;
 
 public class DeserializeJsonInboundHandler<T> extends SimpleChannelInboundHandler<ByteBuf>{
-	
+
 	private Class<T> clazz;
-		
+
 	public DeserializeJsonInboundHandler(Class<T> clazz) {
 		this.clazz = clazz;
 	}
-	
+
 	@Override
 	protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
 		byte[] buffer = new byte[msg.readableBytes()];
diff --git a/src/main/java/com/github/dockerjava/netty/handler/DockerRawStreamHandler.java b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
similarity index 76%
rename from src/main/java/com/github/dockerjava/netty/handler/DockerRawStreamHandler.java
rename to src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
index e7f7e3377..7907a62b5 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/DockerRawStreamHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
@@ -1,34 +1,32 @@
 package com.github.dockerjava.netty.handler;
 
-import java.io.OutputStream;
-
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.api.model.StreamType;
-
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 
-public class DockerRawStreamHandler extends SimpleChannelInboundHandler<ByteBuf> {
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.StreamType;
+
+public class FramedResponseStreamHandler extends SimpleChannelInboundHandler<ByteBuf> {
 
 	private static final int HEADER_SIZE = 8;
 
 	private final ByteBuf rawBuffer = Unpooled.buffer(1000);
 
-	private OutputStream stdout, stderr;
-
 	private byte[] header = new byte[HEADER_SIZE];
 
 	private int headerCnt = 0;
-	
+
 	private byte[] payload = new byte[0];
 
 	private int payloadCnt = 0;
 
-	public DockerRawStreamHandler(OutputStream stdout, OutputStream stderr) {
-		this.stdout = stdout;
-		this.stderr = stderr;
+	private ResultCallback<Frame> resultCallback;
+
+	public FramedResponseStreamHandler(ResultCallback<Frame> resultCallback) {
+		this.resultCallback = resultCallback;
 	}
 
 	@Override
@@ -40,29 +38,13 @@ protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Excep
 
 		do {
 			frame = decode();
-			
+
 			if (frame != null) {
-				switch (frame.getStreamType()) {
-				case STDOUT:
-					if (stdout != null) {
-						stdout.write(frame.getPayload());
-						stdout.flush();
-					}
-					break;
-				case STDERR:
-					if (stderr != null) {
-						stderr.write(frame.getPayload());
-						stderr.flush();
-					}
-					break;
-				default:
-					System.err.println("unknown stream type");		
-				}
-				
+			    resultCallback.onNext(frame);
 				headerCnt = 0;
 				payloadCnt = 0;
-			} 
-			
+			}
+
 		} while (frame != null);
 
 	}
@@ -111,7 +93,7 @@ private Frame decode() {
 
 	@Override
 	public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-		cause.printStackTrace();
+		resultCallback.onError(cause);
 		ctx.close();
 	}
 
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HijackHttpConnectionHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpConnectionHijackHandler.java
similarity index 76%
rename from src/main/java/com/github/dockerjava/netty/handler/HijackHttpConnectionHandler.java
rename to src/main/java/com/github/dockerjava/netty/handler/HttpConnectionHijackHandler.java
index 1a4a6673b..1a59118fb 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/HijackHttpConnectionHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpConnectionHijackHandler.java
@@ -13,23 +13,23 @@
 import io.netty.handler.codec.http.HttpClientUpgradeHandler;
 import io.netty.handler.codec.http.HttpRequest;
 
-public class HijackHttpConnectionHandler implements HttpClientUpgradeHandler.UpgradeCodec {
-	
+public class HttpConnectionHijackHandler implements HttpClientUpgradeHandler.UpgradeCodec {
+
 	private CountDownLatch latch = new CountDownLatch(1);
-	
+
+	private HttpResponseHandler httpResponseHandler;
+
+	public HttpConnectionHijackHandler(HttpResponseHandler httpResponseHandler) {
+        this.httpResponseHandler = httpResponseHandler;
+    }
+
 	@Override
 	public void upgradeTo(ChannelHandlerContext ctx, FullHttpResponse upgradeResponse)
 			throws Exception {
 		System.out.println("UPGRADED");
+		httpResponseHandler.channelRead(ctx, upgradeResponse);
+		ctx.pipeline().addLast(httpResponseHandler);
 		latch.countDown();
-//		ChannelHandler removed = ctx.pipeline().remove(HttpClientCodec.class);
-//		
-//		System.out.println("removed: " + removed);
-		
-		
-		
-		
-
 	}
 
 	@Override
@@ -42,7 +42,7 @@ public Collection<CharSequence> setUpgradeHeaders(ChannelHandlerContext ctx,
 	public CharSequence protocol() {
 		return "tcp";
 	}
-	
+
 	public void await() {
 		try {
 			latch.await();
@@ -51,7 +51,7 @@ public void await() {
 			throw new RuntimeException(e);
 		}
 	}
-	
-	
+
+
 
 }
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
new file mode 100644
index 000000000..0b1007869
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
@@ -0,0 +1,83 @@
+package com.github.dockerjava.netty.handler;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpObject;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.LastHttpContent;
+
+import java.nio.charset.Charset;
+import java.util.concurrent.CountDownLatch;
+
+public class HttpResponseHandler extends SimpleChannelInboundHandler<HttpObject> {
+
+    private HttpResponse response;
+
+    private ByteBuf errorBody = Unpooled.buffer();
+
+    private CountDownLatch responseLatch = new CountDownLatch(1);
+
+    private CountDownLatch errorBodyLatch = new CountDownLatch(1);
+
+    public HttpResponseHandler() {
+        super(false);
+    }
+
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Exception {
+        if (msg instanceof HttpResponse) {
+
+            response = (HttpResponse) msg;
+            responseLatch.countDown();
+
+        } else if (msg instanceof HttpContent) {
+
+            HttpContent content = (HttpContent) msg;
+
+            ByteBuf byteBuf = content.content();
+
+            switch (response.status().code()) {
+            case 200:
+            case 201:
+            case 204:
+                ctx.fireChannelRead(byteBuf);
+                break;
+            default:
+                errorBody.writeBytes(byteBuf);
+            }
+
+            if (content instanceof LastHttpContent) {
+                errorBodyLatch.countDown();
+            }
+        } else {
+            System.err.println("UNKNOWN");
+        }
+
+    }
+
+    private String getBodyAsMessage(ByteBuf body) {
+        return body.readBytes(body.readableBytes()).toString(Charset.forName("UTF-8"));
+    }
+
+    public HttpResponse awaitResponse() {
+        try {
+            responseLatch.await();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        return response;
+    }
+
+    public String awaitErrorBody() {
+        try {
+            errorBodyLatch.await();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        return getBodyAsMessage(errorBody);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseInboundHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseInboundHandler.java
deleted file mode 100644
index 143e5dcf5..000000000
--- a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseInboundHandler.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.github.dockerjava.netty.handler;
-
-import java.nio.charset.Charset;
-
-import com.github.dockerjava.api.BadRequestException;
-import com.github.dockerjava.api.ConflictException;
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.InternalServerErrorException;
-import com.github.dockerjava.api.NotAcceptableException;
-import com.github.dockerjava.api.NotFoundException;
-import com.github.dockerjava.api.NotModifiedException;
-import com.github.dockerjava.api.UnauthorizedException;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-import io.netty.handler.codec.http.HttpContent;
-import io.netty.handler.codec.http.HttpHeaderNames;
-import io.netty.handler.codec.http.HttpObject;
-import io.netty.handler.codec.http.HttpRequest;
-import io.netty.handler.codec.http.HttpResponse;
-import io.netty.handler.codec.http.LastHttpContent;
-
-public class HttpResponseInboundHandler extends SimpleChannelInboundHandler<HttpObject> {
-
-	private HttpRequestProvider requestProvider;
-
-	private HttpResponse response;
-
-	private ByteBuf body = Unpooled.buffer();
-
-	public HttpResponseInboundHandler(HttpRequestProvider requestProvider) {
-		super(false);
-		this.requestProvider = requestProvider;
-	}
-
-	@Override
-	protected void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Exception {
-		if (msg instanceof HttpResponse) {
-			HttpResponse response = (HttpResponse) msg;
-
-			System.err.println("STATUS: " + response.status());
-			System.err.println("VERSION: " + response.protocolVersion());
-			System.err.println();
-
-			this.response = response;
-
-			if (!response.headers().isEmpty()) {
-				for (CharSequence name : response.headers().names()) {
-					for (CharSequence value : response.headers().getAll(name)) {
-						System.err.println("HEADER: " + name + " = " + value);
-					}
-				}
-				System.err.println();
-			}
-
-		} else if (msg instanceof HttpContent) {
-			//System.err.println("Got http content");
-
-			HttpContent content = (HttpContent) msg;
-
-			ByteBuf byteBuf = content.content();
-
-			switch (response.status().code()) {
-			case 200:
-			case 201:
-			case 204:
-				ctx.fireChannelRead(byteBuf);
-				break;
-			default:
-				body.writeBytes(byteBuf);
-			}
-
-			if (content instanceof LastHttpContent) {
-
-				try {
-					switch (response.status().code()) {
-					case 200:
-					case 201:
-					case 204:
-
-						break;
-					case 301:
-					case 302:
-						if (response.headers().contains(HttpHeaderNames.LOCATION)) {
-							String location = response.headers().get(HttpHeaderNames.LOCATION);
-							System.out.println("redirected to :" + location);
-							HttpRequest redirected = requestProvider.getHttpRequest(location);
-
-							ctx.channel().writeAndFlush(redirected);
-						} else {
-							ctx.fireExceptionCaught(new RuntimeException("missing 'location' header for redirect"));
-						}
-						break;
-					case 304:
-						throw new NotModifiedException(getBodyAsMessage(body));
-					case 400:
-						throw new BadRequestException(getBodyAsMessage(body));
-					case 401:
-						throw new UnauthorizedException(getBodyAsMessage(body));
-					case 404:
-						throw new NotFoundException(getBodyAsMessage(body));
-					case 406:
-						throw new NotAcceptableException(getBodyAsMessage(body));
-					case 409:
-						throw new ConflictException(getBodyAsMessage(body));
-					case 500:
-						throw new InternalServerErrorException(getBodyAsMessage(body));
-					default:
-						throw new DockerException(getBodyAsMessage(body), response.status().code());
-					}
-				} finally {
-					 //ctx.close();
-				}
-
-			}
-		} else {
-			System.err.println("UNKNOWN");
-		}
-
-	}
-
-	private String getBodyAsMessage(ByteBuf body) {
-		return body.readBytes(body.readableBytes()).toString(Charset.forName("UTF-8"));
-	}
-
-}
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamInboundHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamInboundHandler.java
index 854cb7b2a..2f9974c16 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamInboundHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamInboundHandler.java
@@ -1,5 +1,9 @@
 package com.github.dockerjava.netty.handler;
 
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.concurrent.CountDownLatch;
@@ -7,87 +11,99 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.commons.io.HexDump;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-
 public class HttpResponseStreamInboundHandler extends SimpleChannelInboundHandler<ByteBuf> {
 
-	private CountDownLatch latch = new CountDownLatch(1);
-	private HttpResponseInputStream stream = new HttpResponseInputStream();
-
-	@Override
-	protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
-
-		latch.countDown();
-		stream.write(msg.copy());
-
-		//System.out.println("got data: " + msg.readableBytes());
-
-		if (msg.readableBytes() == 0) {			
-			stream.close();
-		}
-	}
-
-	@Override
-	public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-		cause.printStackTrace();
-		ctx.close();
-	}
-
-	public InputStream getInputStream() {
-		try {
-			latch.await();
-		} catch (InterruptedException e) {
-			throw new RuntimeException(e);
-		}
-		return stream;
-	}
-
-	public static class HttpResponseInputStream extends InputStream {
-
-		private AtomicBoolean closed = new AtomicBoolean(false);
-
-		private LinkedTransferQueue<ByteBuf> queue = new LinkedTransferQueue<ByteBuf>();
-
-		private ByteBuf current = null;
-
-		public void write(ByteBuf byteBuf) {
-			queue.put(byteBuf);
-		}
-
-		@Override
-		public void close() throws IOException {
-			closed.set(true);
-			super.close();
-		}
-
-		@Override
-		public int read() throws IOException {
-			if (closed.get())
-				return -1;
-
-			if (current == null || current.readableBytes() == 0) {
-				try {
-					current = queue.poll(10, TimeUnit.SECONDS);
-				} catch (InterruptedException e) {
-					throw new RuntimeException(e);
-				}
-			}
-			
-			if(current != null && current.readableBytes() > 0) {
-				return current.readByte();
-			} else {
-				return read();
-			}
-			
-			
-
-			
-		}
-
-	}
+    private CountDownLatch latch = new CountDownLatch(1);
+
+    private HttpResponseInputStream stream = new HttpResponseInputStream();
+
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
+
+        latch.countDown();
+        stream.write(msg.copy());
+    }
+
+    @Override
+    public void channelReadComplete(ChannelHandlerContext ctx) throws Exception {
+        stream.close();
+        super.channelReadComplete(ctx);
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        cause.printStackTrace();
+        ctx.close();
+    }
+
+    public InputStream getInputStream() {
+        try {
+            latch.await();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        return stream;
+    }
+
+    public static class HttpResponseInputStream extends InputStream {
+
+        private AtomicBoolean closed = new AtomicBoolean(false);
+
+        private LinkedTransferQueue<ByteBuf> queue = new LinkedTransferQueue<ByteBuf>();
+
+        private ByteBuf current = null;
+
+        public void write(ByteBuf byteBuf) {
+            queue.put(byteBuf);
+        }
+
+        @Override
+        public void close() throws IOException {
+            closed.set(true);
+            super.close();
+        }
+
+        @Override
+        public int available() throws IOException {
+            poll();
+            return readableBytes();
+        }
+
+        private int readableBytes() {
+            if (current != null)
+                return current.readableBytes();
+            else
+                return 0;
+        }
+
+        @Override
+        public int read() throws IOException {
+
+            poll();
+
+            if (readableBytes() == 0) {
+                if (closed.get())
+                    return -1;
+            }
+
+            if (current != null && current.readableBytes() > 0) {
+                return current.readByte();
+            } else {
+                return read();
+            }
+
+        }
+
+        private void poll() {
+            if (readableBytes() == 0) {
+                try {
+                    current = queue.poll(50, TimeUnit.MILLISECONDS);
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+
+    }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
index cfcf7f381..e66cfa57d 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
@@ -16,7 +16,7 @@ public class DockerClientConfigTest {
     public static final DockerClientConfig EXAMPLE_CONFIG = newExampleConfig();
 
     private static DockerClientConfig newExampleConfig() {
-        return new DockerClientConfig(URI.create("http://foo"), "bar", "baz", "qux", "blam", "wham", "flam", "flum",
+        return new DockerClientConfig(URI.create("http://foo"), "bar", "baz", "qux", "blam", "wham", "flam",
                 new LocalDirectorySSLConfig("flim"));
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
index 5f4ee3e67..c5a1e841c 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
@@ -10,7 +10,7 @@ public class DockerClientImplTest {
     @Test
     public void configuredInstanceAuthConfig() throws Exception {
         // given a config with null serverAddress
-        DockerClientConfig dockerClientConfig = new DockerClientConfig(null, null, "", "", "", null, null, null, null);
+        DockerClientConfig dockerClientConfig = new DockerClientConfig(null, null, "", "", "", null, null, null);
         DockerClientImpl dockerClient = DockerClientImpl.getInstance(dockerClientConfig);
 
         // when we get the auth config
diff --git a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
index 43aa49f0e..4ece3e8ed 100644
--- a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
@@ -54,7 +54,8 @@ public void execStart() throws Exception {
 
         ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
                 .withAttachStdout(true).withCmd("touch", "/execStartTest.log").exec();
-        dockerClient.execStartCmd(execCreateCmdResponse.getId()).exec();
+        dockerClient.execStartCmd(execCreateCmdResponse.getId()).exec(
+                new ExecStartResultCallback(System.out, System.err));
 
         InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "/execStartTest.log").exec();
         Boolean bytesAvailable = response.available() > 0;
@@ -79,7 +80,8 @@ public void execStartAttached() throws Exception {
 
         ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
                 .withAttachStdout(true).withCmd("touch", "/execStartTest.log").exec();
-        dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true).exec();
+        dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true)
+                .exec(new ExecStartResultCallback(System.out, System.err));
 
         InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "/execStartTest.log").exec();
         Boolean bytesAvailable = response.available() > 0;
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
index 744bbe82c..4f88b6317 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
@@ -67,25 +67,23 @@ public void inspectExecTest() throws IOException {
         assertThat(checkFileCmdCreateResponse.getId(), not(isEmptyString()));
 
         // Check that file does not exist
-        InputStream response1 = dockerClient.execStartCmd(container.getId())
-                .withExecId(checkFileCmdCreateResponse.getId()).exec();
-        asString(response1); // consume
+        dockerClient.execStartCmd(container.getId())
+                .withExecId(checkFileCmdCreateResponse.getId()).exec(new ExecStartResultCallback(System.out, System.err));
+
 
         InspectExecResponse first = dockerClient.inspectExecCmd(checkFileCmdCreateResponse.getId()).exec();
         assertThat(first.getExitCode(), is(1));
 
         // Create the file
-        InputStream response2 = dockerClient.execStartCmd(container.getId())
-                .withExecId(touchFileCmdCreateResponse.getId()).exec();
-        asString(response2);
+        dockerClient.execStartCmd(container.getId())
+                .withExecId(touchFileCmdCreateResponse.getId()).exec(new ExecStartResultCallback(System.out, System.err));
 
         InspectExecResponse second = dockerClient.inspectExecCmd(touchFileCmdCreateResponse.getId()).exec();
         assertThat(second.getExitCode(), is(0));
 
         // Check that file does exist now
-        InputStream response3 = dockerClient.execStartCmd(container.getId())
-                .withExecId(checkFileCmdCreateResponse.getId()).exec();
-        asString(response3);
+        dockerClient.execStartCmd(container.getId())
+                .withExecId(checkFileCmdCreateResponse.getId()).exec(new ExecStartResultCallback(System.out, System.err));
 
         InspectExecResponse third = dockerClient.inspectExecCmd(checkFileCmdCreateResponse.getId()).exec();
         assertThat(third.getExitCode(), is(0));
diff --git a/src/test/java/com/github/dockerjava/netty/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/netty/AbstractDockerClientTest.java
new file mode 100644
index 000000000..b9a914593
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/AbstractDockerClientTest.java
@@ -0,0 +1,217 @@
+package com.github.dockerjava.netty;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.lang.reflect.Method;
+import java.net.DatagramSocket;
+import java.net.ServerSocket;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.LineIterator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.ITestResult;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.Volume;
+import com.github.dockerjava.api.model.VolumeBind;
+import com.github.dockerjava.core.DockerClientBuilder;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.TestDockerCmdExecFactory;
+import com.github.dockerjava.core.command.BuildImageResultCallback;
+import com.github.dockerjava.core.command.LogContainerResultCallback;
+import com.github.dockerjava.core.command.PullImageResultCallback;
+import com.google.common.base.Joiner;
+
+public abstract class AbstractDockerClientTest extends Assert {
+
+    public static final Logger LOG = LoggerFactory.getLogger(AbstractDockerClientTest.class);
+
+    private String apiVersion = "1.19";
+
+    protected DockerClient dockerClient;
+
+    protected TestDockerCmdExecFactory dockerCmdExecFactory = new TestDockerCmdExecFactory(
+            new DockerCmdExecFactoryImpl());
+
+    public void beforeTest() throws Exception {
+
+        LOG.info("======================= BEFORETEST =======================");
+        LOG.info("Connecting to Docker server");
+        dockerClient = DockerClientBuilder.getInstance(config()).withDockerCmdExecFactory(dockerCmdExecFactory).build();
+
+//        LOG.info("Pulling image 'busybox'");
+//
+//        // need to block until image is pulled completely
+//        dockerClient.pullImageCmd("busybox").withTag("latest").exec(new PullImageResultCallback()).awaitSuccess();
+
+        assertNotNull(dockerClient);
+        LOG.info("======================= END OF BEFORETEST =======================\n\n");
+    }
+
+    private DockerClientConfig config() {
+        return config(null);
+    }
+
+    protected DockerClientConfig config(String password) {
+        DockerClientConfig.DockerClientConfigBuilder builder = DockerClientConfig.createDefaultConfigBuilder()
+                .withServerAddress("https://index.docker.io/v1/");
+        if (password != null) {
+            builder = builder.withPassword(password);
+        }
+
+        return builder.withVersion(apiVersion).build();
+    }
+
+    public void afterTest() {
+        LOG.info("======================= END OF AFTERTEST =======================");
+    }
+
+    public void beforeMethod(Method method) {
+        LOG.info(String.format("################################## STARTING %s ##################################",
+                method.getName()));
+    }
+
+    public void afterMethod(ITestResult result) {
+
+        for (String container : dockerCmdExecFactory.getContainerNames()) {
+            LOG.info("Cleaning up temporary container {}", container);
+
+            try {
+                dockerClient.removeContainerCmd(container).withForce(true).exec();
+            } catch (DockerException ignore) {
+                // ignore.printStackTrace();
+            }
+        }
+
+        for (String image : dockerCmdExecFactory.getImageNames()) {
+            LOG.info("Cleaning up temporary image with {}", image);
+            try {
+                dockerClient.removeImageCmd(image).withForce(true).exec();
+            } catch (DockerException ignore) {
+                // ignore.printStackTrace();
+            }
+        }
+
+        LOG.info("################################## END OF {} ##################################\n", result.getName());
+    }
+
+    protected String asString(InputStream response) {
+        return consumeAsString(response);
+    }
+
+    public static String consumeAsString(InputStream response) {
+
+        StringWriter logwriter = new StringWriter();
+
+        try {
+            LineIterator itr = IOUtils.lineIterator(response, "UTF-8");
+
+            while (itr.hasNext()) {
+                String line = itr.next();
+                logwriter.write(line + (itr.hasNext() ? "\n" : ""));
+                LOG.info("line: " + line);
+            }
+            response.close();
+
+            return logwriter.toString();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } finally {
+            IOUtils.closeQuietly(response);
+        }
+    }
+
+    // UTIL
+
+    /**
+     * Checks to see if a specific port is available.
+     *
+     * @param port
+     *            the port to check for availability
+     */
+    public static Boolean available(int port) {
+        if (port < 1100 || port > 60000) {
+            throw new IllegalArgumentException("Invalid start port: " + port);
+        }
+
+        ServerSocket ss = null;
+        DatagramSocket ds = null;
+        try {
+            ss = new ServerSocket(port);
+            ss.setReuseAddress(true);
+            ds = new DatagramSocket(port);
+            ds.setReuseAddress(true);
+            return true;
+        } catch (IOException ignored) {
+        } finally {
+            if (ds != null) {
+                ds.close();
+            }
+
+            if (ss != null) {
+                try {
+                    ss.close();
+                } catch (IOException e) {
+                    /* should not be thrown */
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Asserts that {@link InspectContainerResponse#getVolumes()} (<code>.Volumes</code>) has {@link VolumeBind}s for
+     * the given {@link Volume}s
+     */
+    public static void assertContainerHasVolumes(InspectContainerResponse inspectContainerResponse,
+            Volume... expectedVolumes) {
+        VolumeBind[] volumeBinds = inspectContainerResponse.getVolumes();
+        LOG.info("Inspect .Volumes = [{}]", Joiner.on(", ").join(volumeBinds));
+
+        List<Volume> volumes = new ArrayList<Volume>();
+        for (VolumeBind bind : volumeBinds) {
+            volumes.add(new Volume(bind.getContainerPath()));
+        }
+        assertThat(volumes, contains(expectedVolumes));
+    }
+
+    protected String containerLog(String containerId) throws Exception {
+        return dockerClient.logContainerCmd(containerId).withStdOut(true).exec(new LogContainerTestCallback())
+                .awaitCompletion().toString();
+    }
+
+    public static class LogContainerTestCallback extends LogContainerResultCallback {
+        protected final StringBuffer log = new StringBuffer();
+
+        @Override
+        public void onNext(Frame frame) {
+            log.append(new String(frame.getPayload()));
+            super.onNext(frame);
+        }
+
+        @Override
+        public String toString() {
+            return log.toString();
+        }
+    }
+
+    protected String buildImage(File baseDir) throws Exception {
+
+        return dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback())
+                .awaitImageId();
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/AuthCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/AuthCmdExecTest.java
new file mode 100644
index 000000000..3cadd6485
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/AuthCmdExecTest.java
@@ -0,0 +1,57 @@
+package com.github.dockerjava.netty.exec;
+
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.UnauthorizedException;
+import com.github.dockerjava.api.model.AuthResponse;
+import com.github.dockerjava.core.DockerClientBuilder;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class AuthCmdExecTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void testAuth() throws Exception {
+        AuthResponse response = dockerClient.authCmd().exec();
+
+        assertEquals(response.getStatus(), "Login Succeeded");
+    }
+
+    @Test()
+    public void testAuthInvalid() throws Exception {
+
+        try {
+            DockerClientBuilder.getInstance(config("garbage")).build().authCmd().exec();
+            fail("Expected a UnauthorizedException caused by a bad password.");
+        } catch (UnauthorizedException e) {
+            assertEquals(e.getMessage(), "Wrong login/password, please try again\n");
+        }
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
new file mode 100644
index 000000000..43400edfc
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
@@ -0,0 +1,560 @@
+package com.github.dockerjava.netty.exec;
+
+import static com.github.dockerjava.api.model.Capability.MKNOD;
+import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItemInArray;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.startsWith;
+
+import java.lang.reflect.Method;
+import java.security.SecureRandom;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.ConflictException;
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.AccessMode;
+import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.Device;
+import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.Link;
+import com.github.dockerjava.api.model.LogConfig;
+import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.RestartPolicy;
+import com.github.dockerjava.api.model.Ulimit;
+import com.github.dockerjava.api.model.Volume;
+import com.github.dockerjava.api.model.VolumeRW;
+import com.github.dockerjava.api.model.VolumesFrom;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class CreateContainerCmdExecTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void createContainerWithExistingName() throws DockerException {
+
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("env")
+                .withName(containerName).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        try {
+            dockerClient.createContainerCmd("busybox").withCmd("env").withName(containerName).exec();
+            fail("expected ConflictException");
+        } catch (ConflictException e) {
+        }
+    }
+
+    @Test
+    public void createContainerWithVolume() throws DockerException {
+
+        Volume volume = new Volume("/var/log");
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withVolumes(volume)
+                .withCmd("true").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        LOG.info("Inspect container {}", inspectContainerResponse.getConfig().getVolumes());
+
+        assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(), contains("/var/log"));
+
+        assertThat(inspectContainerResponse.getVolumesRW(), hasItemInArray(new VolumeRW(volume, AccessMode.rw)));
+    }
+
+    @Test
+    public void createContainerWithReadOnlyVolume() throws DockerException {
+
+        Volume volume = new Volume("/srv/test");
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withVolumes(volume)
+                .withCmd("true").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        LOG.info("Inspect container {}", inspectContainerResponse.getConfig().getVolumes());
+
+        assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(), contains("/srv/test"));
+
+        assertThat(Arrays.asList(inspectContainerResponse.getVolumesRW()), contains(new VolumeRW(volume)));
+    }
+
+    @Test
+    public void createContainerWithVolumesFrom() throws DockerException {
+
+        Volume volume1 = new Volume("/opt/webapp1");
+        Volume volume2 = new Volume("/opt/webapp2");
+
+        String container1Name = UUID.randomUUID().toString();
+
+        // create a running container with bind mounts
+        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName(container1Name)
+                .withBinds(new Bind("/src/webapp1", volume1), new Bind("/src/webapp2", volume2)).exec();
+        LOG.info("Created container1 {}", container1.toString());
+
+        dockerClient.startContainerCmd(container1.getId()).exec();
+        LOG.info("Started container1 {}", container1.toString());
+
+        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+                .exec();
+
+        assertContainerHasVolumes(inspectContainerResponse1, volume1, volume2);
+
+        // create a second container with volumes from first container
+        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withVolumesFrom(new VolumesFrom(container1Name)).exec();
+        LOG.info("Created container2 {}", container2.toString());
+
+        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+                .exec();
+
+        // No volumes are created, the information is just stored in .HostConfig.VolumesFrom
+        assertThat(inspectContainerResponse2.getHostConfig().getVolumesFrom(), hasItemInArray(new VolumesFrom(
+                container1Name)));
+
+        // To ensure that the information stored in VolumesFrom really is considered
+        // when starting the container, we start it and verify that it has the same
+        // bind mounts as the first container.
+        // This is somehow out of scope here, but it helped me to understand how the
+        // VolumesFrom feature really works.
+        dockerClient.startContainerCmd(container2.getId()).exec();
+        LOG.info("Started container2 {}", container2.toString());
+
+        inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId()).exec();
+
+        assertThat(inspectContainerResponse2.getHostConfig().getVolumesFrom(), hasItemInArray(new VolumesFrom(
+                container1Name)));
+        assertContainerHasVolumes(inspectContainerResponse2, volume1, volume2);
+    }
+
+    @Test
+    public void createContainerWithEnv() throws Exception {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withEnv("VARIABLE=success")
+                .withCmd("env").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), containsInAnyOrder("VARIABLE=success"));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        assertThat(containerLog(container.getId()), containsString("VARIABLE=success"));
+    }
+
+    @Test
+    public void createContainerWithHostname() throws Exception {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withHostName("docker-java")
+                .withCmd("env").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getConfig().getHostName(), equalTo("docker-java"));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        assertThat(containerLog(container.getId()), containsString("HOSTNAME=docker-java"));
+    }
+
+    @Test
+    public void createContainerWithName() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
+                .withCmd("env").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getName(), equalTo("/container"));
+
+        try {
+            dockerClient.createContainerCmd("busybox").withName("container").withCmd("env").exec();
+            fail("Expected ConflictException");
+        } catch (ConflictException e) {
+        }
+
+    }
+
+    @Test
+    public void createContainerWithLink() throws DockerException {
+
+        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName("container1").exec();
+        LOG.info("Created container1 {}", container1.toString());
+        assertThat(container1.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container1.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+                .exec();
+        LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
+        assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
+
+        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withName("container2")
+                .withCmd("env").withLinks(new Link("container1", "container1Link")).exec();
+        LOG.info("Created container {}", container2.toString());
+        assertThat(container2.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+                .exec();
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
+                "container1Link") }));
+    }
+
+    @Test
+    public void createContainerWithCapAddAndCapDrop() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCapAdd(NET_ADMIN)
+                .withCapDrop(MKNOD).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getCapAdd()), contains(NET_ADMIN));
+
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getCapDrop()), contains(MKNOD));
+    }
+
+    @Test
+    public void createContainerWithDns() throws DockerException {
+
+        String aDnsServer = "8.8.8.8";
+        String anotherDnsServer = "8.8.4.4";
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withDns(aDnsServer, anotherDnsServer).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()),
+                contains(aDnsServer, anotherDnsServer));
+    }
+
+    @Test
+    public void createContainerWithEntrypoint() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
+                .withEntrypoint("sleep", "9999").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEntrypoint()), contains("sleep", "9999"));
+
+    }
+
+    @Test
+    public void createContainerWithExtraHosts() throws DockerException {
+
+        String[] extraHosts = { "dockerhost:127.0.0.1", "otherhost:10.0.0.1" };
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
+                .withExtraHosts(extraHosts).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getExtraHosts()),
+                containsInAnyOrder("dockerhost:127.0.0.1", "otherhost:10.0.0.1"));
+    }
+
+    @Test
+    public void createContainerWithDevices() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withDevices(new Device("rwm", "/dev/nulo", "/dev/zero")).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDevices()), contains(new Device("rwm",
+                "/dev/nulo", "/dev/zero")));
+    }
+
+    @Test
+    public void createContainerWithPortBindings() throws DockerException {
+
+        ExposedPort tcp22 = ExposedPort.tcp(22);
+        ExposedPort tcp23 = ExposedPort.tcp(23);
+
+        Ports portBindings = new Ports();
+        portBindings.bind(tcp22, Ports.Binding(11022));
+        portBindings.bind(tcp23, Ports.Binding(11023));
+        portBindings.bind(tcp23, Ports.Binding(11024));
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
+
+        assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
+                is(equalTo(Ports.Binding(11022))));
+
+        assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
+                is(equalTo(Ports.Binding(11023))));
+
+        assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
+                is(equalTo(Ports.Binding(11024))));
+
+    }
+
+    @Test
+    public void createContainerWithLinking() throws DockerException {
+
+        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName("container1").exec();
+
+        LOG.info("Created container1 {}", container1.toString());
+        assertThat(container1.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container1.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+                .exec();
+        LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
+
+        assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId()));
+        assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
+        assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
+        assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
+
+        if (!inspectContainerResponse1.getState().isRunning()) {
+            assertThat(inspectContainerResponse1.getState().getExitCode(), is(equalTo(0)));
+        }
+
+        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName("container2").withLinks(new Link("container1", "container1Link")).exec();
+
+        LOG.info("Created container2 {}", container2.toString());
+        assertThat(container2.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+                .exec();
+        LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
+
+        assertThat(inspectContainerResponse2.getConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
+                "container1Link") }));
+        assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
+        assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
+        assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
+
+    }
+
+    @Test
+    public void createContainerWithRestartPolicy() throws DockerException {
+
+        RestartPolicy restartPolicy = RestartPolicy.onFailureRestart(5);
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withRestartPolicy(restartPolicy).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getHostConfig().getRestartPolicy(), is(equalTo(restartPolicy)));
+    }
+
+    @Test
+    public void createContainerWithPidMode() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withPidMode("host").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getHostConfig().getPidMode(), is(equalTo("host")));
+    }
+
+    /**
+     * This tests support for --net option for the docker run command: --net="bridge" Set the Network mode for the
+     * container 'bridge': creates a new network stack for the container on the docker bridge 'none': no networking for
+     * this container 'container:': reuses another container network stack 'host': use the host network stack inside the
+     * container. Note: the host mode gives the container full access to local system services such as D-bus and is
+     * therefore considered insecure.
+     */
+    @Test
+    public void createContainerWithNetworkMode() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withNetworkMode("host").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getHostConfig().getNetworkMode(), is(equalTo("host")));
+    }
+
+    @Test
+    public void createContainerWithMacAddress() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withMacAddress("00:80:41:ae:fd:7e").withCmd("true").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertEquals(inspectContainerResponse.getConfig().getMacAddress(), "00:80:41:ae:fd:7e");
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void createContainerWithULimits() throws DockerException {
+
+        Ulimit[] ulimits = { new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096) };
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
+                .withUlimits(ulimits).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getUlimits()),
+                containsInAnyOrder(new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096)));
+
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void createContainerWithLabels() throws DockerException {
+
+        Map<String, String> labels = new HashMap<String, String>();
+        labels.put("com.github.dockerjava.null", null);
+        labels.put("com.github.dockerjava.Boolean", "true");
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withLabels(labels).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        // null becomes empty string
+        labels.put("com.github.dockerjava.null", "");
+        assertThat(inspectContainerResponse.getConfig().getLabels(), is(equalTo(labels)));
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void createContainerWithLogConfig() throws DockerException {
+
+        LogConfig logConfig = new LogConfig(LogConfig.LoggingType.NONE, null);
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withLogConfig(logConfig).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        // null becomes empty string
+        assertEquals(inspectContainerResponse.getHostConfig().getLogConfig().type, logConfig.type);
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ExecCreateCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ExecCreateCmdExecTest.java
new file mode 100644
index 000000000..9f95751c2
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/ExecCreateCmdExecTest.java
@@ -0,0 +1,61 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+import java.lang.reflect.Method;
+import java.security.SecureRandom;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.ExecCreateCmdResponse;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class ExecCreateCmdExecTest extends AbstractDockerClientTest {
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void execCreateTest() {
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
+                .withName(containerName).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
+                .withCmd("touch", "file.log").exec();
+
+        assertThat(execCreateCmdResponse.getId(), not(isEmptyString()));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
new file mode 100644
index 000000000..3702a7102
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
@@ -0,0 +1,97 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.security.SecureRandom;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.ExecCreateCmdResponse;
+import com.github.dockerjava.core.command.ExecStartResultCallback;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class ExecStartCmdExecTest extends AbstractDockerClientTest {
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void execStart() throws Exception {
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
+                .withName(containerName).exec();
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
+                .withAttachStdout(true).withCmd("touch", "/execStartTest.log").exec();
+        dockerClient.execStartCmd(execCreateCmdResponse.getId()).exec(
+                new ExecStartResultCallback(System.out, System.err));
+
+        InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "/execStartTest.log").exec();
+
+        Boolean bytesAvailable = response.available() > 0;
+        assertTrue(bytesAvailable, "The file was not copied from the container.");
+
+        // read the stream fully. Otherwise, the underlying stream will not be closed.
+        String responseAsString = asString(response);
+        assertNotNull(responseAsString);
+        assertTrue(responseAsString.length() > 0);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void execStartAttached() throws Exception {
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName(containerName).exec();
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
+                .withAttachStdout(true).withCmd("touch", "/execStartTest.log").exec();
+        dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true)
+                .exec(new ExecStartResultCallback(System.out, System.err));
+
+        InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "/execStartTest.log").exec();
+        Boolean bytesAvailable = response.available() > 0;
+        assertTrue(bytesAvailable, "The file was not copied from the container.");
+
+        // read the stream fully. Otherwise, the underlying stream will not be closed.
+        String responseAsString = asString(response);
+        assertNotNull(responseAsString);
+        assertTrue(responseAsString.length() > 0);
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InfoCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InfoCmdExecTest.java
new file mode 100644
index 000000000..db2e0ba96
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/InfoCmdExecTest.java
@@ -0,0 +1,71 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.not;
+
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.model.Info;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class InfoCmdExecTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void info() throws DockerException {
+        // Make sure that there is at least one container for the assertion
+        // TODO extract this into a shared method
+        if (dockerClient.listContainersCmd().withShowAll(true).exec().size() == 0) {
+            CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                    .withName("docker-java-itest-info").withCmd("touch", "/test").exec();
+
+            LOG.info("Created container: {}", container);
+            assertThat(container.getId(), not(isEmptyOrNullString()));
+
+            dockerClient.startContainerCmd(container.getId()).exec();
+        }
+
+        Info dockerInfo = dockerClient.infoCmd().exec();
+        LOG.info(dockerInfo.toString());
+
+        assertTrue(dockerInfo.toString().contains("containers"));
+        assertTrue(dockerInfo.toString().contains("images"));
+        assertTrue(dockerInfo.toString().contains("debug"));
+
+        assertTrue(dockerInfo.getContainers() > 0);
+        assertTrue(dockerInfo.getImages() > 0);
+        assertTrue(dockerInfo.getNFd() > 0);
+        assertTrue(dockerInfo.getNGoroutines() > 0);
+        assertTrue(dockerInfo.getNCPU() > 0);
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
new file mode 100644
index 000000000..c2fbc84a0
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
@@ -0,0 +1,96 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.security.SecureRandom;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.ExecCreateCmdResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.command.InspectExecResponse;
+import com.github.dockerjava.core.command.ExecStartResultCallback;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
+
+@Test(groups = "integration")
+public class InspectExecCmdExecTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void inspectExecTest() throws IOException {
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
+                .withName(containerName).exec();
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        ExecCreateCmdResponse touchFileCmdCreateResponse = dockerClient.execCreateCmd(container.getId())
+                .withAttachStdout(true).withAttachStderr(true).withCmd("touch", "/marker").exec();
+        LOG.info("Created exec {}", touchFileCmdCreateResponse.toString());
+        assertThat(touchFileCmdCreateResponse.getId(), not(isEmptyString()));
+        ExecCreateCmdResponse checkFileCmdCreateResponse = dockerClient.execCreateCmd(container.getId())
+                .withAttachStdout(true).withAttachStderr(true).withCmd("test", "-e", "/marker").exec();
+        LOG.info("Created exec {}", checkFileCmdCreateResponse.toString());
+        assertThat(checkFileCmdCreateResponse.getId(), not(isEmptyString()));
+
+        // Check that file does not exist
+        dockerClient.execStartCmd(container.getId())
+                .withExecId(checkFileCmdCreateResponse.getId()).exec(new ExecStartResultCallback(System.out, System.err));
+
+        InspectExecResponse first = dockerClient.inspectExecCmd(checkFileCmdCreateResponse.getId()).exec();
+        assertThat(first.getExitCode(), is(1));
+
+        // Create the file
+        dockerClient.execStartCmd(container.getId())
+                .withExecId(touchFileCmdCreateResponse.getId()).exec(new ExecStartResultCallback(System.out, System.err));
+
+        InspectExecResponse second = dockerClient.inspectExecCmd(touchFileCmdCreateResponse.getId()).exec();
+        assertThat(second.getExitCode(), is(0));
+
+        // Check that file does exist now
+        dockerClient.execStartCmd(container.getId())
+                .withExecId(checkFileCmdCreateResponse.getId()).exec(new ExecStartResultCallback(System.out, System.err));
+
+        InspectExecResponse third = dockerClient.inspectExecCmd(checkFileCmdCreateResponse.getId()).exec();
+        assertThat(third.getExitCode(), is(0));
+
+        // Get container info and check its roundtrip to ensure the consistency
+        InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(container.getId()).exec();
+        assertEquals(containerInfo.getId(), container.getId());
+        JSONTestHelper.testRoundTrip(containerInfo);
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/KillContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/KillContainerCmdExecTest.java
new file mode 100644
index 000000000..9ba2c278b
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/KillContainerCmdExecTest.java
@@ -0,0 +1,80 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+import java.lang.reflect.Method;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class KillContainerCmdExecTest extends AbstractDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(KillContainerCmdExecTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void killContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        LOG.info("Killing container: {}", container.getId());
+        dockerClient.killContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        assertThat(inspectContainerResponse.getState().isRunning(), is(equalTo(false)));
+        assertThat(inspectContainerResponse.getState().getExitCode(), not(equalTo(0)));
+
+    }
+
+    @Test
+    public void killNonExistingContainer() throws DockerException {
+
+        try {
+            dockerClient.killContainerCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/LogContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/LogContainerCmdExecTest.java
new file mode 100644
index 000000000..a9a48dc58
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/LogContainerCmdExecTest.java
@@ -0,0 +1,171 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+import com.github.dockerjava.core.command.WaitContainerResultCallback;
+
+@Test(groups = "integration")
+public class LogContainerCmdExecTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void asyncLogContainer() throws Exception {
+
+        String snippet = "hello world";
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("/bin/echo", snippet)
+                .exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+                .awaitStatusCode();
+
+        assertThat(exitCode, equalTo(0));
+
+        LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
+
+        // this essentially test the since=0 case
+        dockerClient.logContainerCmd(container.getId()).withStdErr(true).withStdOut(true).exec(loggingCallback);
+
+        loggingCallback.awaitCompletion();
+
+        assertTrue(loggingCallback.toString().contains(snippet));
+    }
+
+    @Test
+    public void asyncLogNonExistingContainer() throws Exception {
+
+        LogContainerTestCallback loggingCallback = new LogContainerTestCallback() {
+            @Override
+            public void onError(Throwable throwable) {
+
+                assertEquals(throwable.getClass().getName(), NotFoundException.class.getName());
+
+                try {
+                    // close the callback to prevent the call to onComplete
+                    close();
+                } catch (IOException e) {
+                    throw new RuntimeException();
+                }
+
+                super.onError(throwable);
+            }
+
+            public void onComplete() {
+                super.onComplete();
+                fail("expected NotFoundException");
+            };
+        };
+
+        dockerClient.logContainerCmd("non-existing").withStdErr(true).withStdOut(true).exec(loggingCallback)
+                .awaitCompletion();
+    }
+
+    @Test
+    public void asyncMultipleLogContainer() throws Exception {
+
+        String snippet = "hello world";
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("/bin/echo", snippet)
+                .exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+                .awaitStatusCode();
+
+        assertThat(exitCode, equalTo(0));
+
+        LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
+
+        dockerClient.logContainerCmd(container.getId()).withStdErr(true).withStdOut(true).exec(loggingCallback);
+
+        loggingCallback.close();
+
+        loggingCallback = new LogContainerTestCallback();
+
+        dockerClient.logContainerCmd(container.getId()).withStdErr(true).withStdOut(true).exec(loggingCallback);
+
+        loggingCallback.close();
+
+        loggingCallback = new LogContainerTestCallback();
+
+        dockerClient.logContainerCmd(container.getId()).withStdErr(true).withStdOut(true).exec(loggingCallback);
+
+        loggingCallback.awaitCompletion();
+
+        assertTrue(loggingCallback.toString().contains(snippet));
+    }
+
+    @Test
+    public void asyncLogContainerWithSince() throws Exception {
+        String snippet = "hello world";
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("/bin/echo", snippet)
+                .exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        int timestamp = (int) (System.currentTimeMillis() / 1000);
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+                .awaitStatusCode();
+
+        assertThat(exitCode, equalTo(0));
+
+        LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
+
+        dockerClient.logContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withSince(timestamp)
+                .exec(loggingCallback);
+
+        loggingCallback.awaitCompletion();
+
+        assertFalse(loggingCallback.toString().contains(snippet));
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java
new file mode 100644
index 000000000..8f01b1957
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java
@@ -0,0 +1,79 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+import java.lang.reflect.Method;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class StopContainerCmdExecTest extends AbstractDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(StopContainerCmdExecTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void testStopContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        LOG.info("Stopping container: {}", container.getId());
+        dockerClient.stopContainerCmd(container.getId()).withTimeout(2).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        assertThat(inspectContainerResponse.getState().isRunning(), is(equalTo(false)));
+        assertThat(inspectContainerResponse.getState().getExitCode(), not(equalTo(0)));
+    }
+
+    @Test
+    public void testStopNonExistingContainer() throws DockerException {
+        try {
+            dockerClient.stopContainerCmd("non-existing").withTimeout(2).exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+
+        }
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/WaitContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/WaitContainerCmdExecTest.java
new file mode 100644
index 000000000..ba1dd518e
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/WaitContainerCmdExecTest.java
@@ -0,0 +1,108 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.WaitResponse;
+import com.github.dockerjava.core.command.WaitContainerResultCallback;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class WaitContainerCmdExecTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void testWaitContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true").exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+                .awaitStatusCode();
+        LOG.info("Container exit code: {}", exitCode);
+
+        assertThat(exitCode, equalTo(0));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        assertThat(inspectContainerResponse.getState().isRunning(), is(equalTo(false)));
+        assertThat(inspectContainerResponse.getState().getExitCode(), is(equalTo(exitCode)));
+    }
+
+    @Test(expectedExceptions = NotFoundException.class)
+    public void testWaitNonExistingContainer() throws DockerException {
+
+        WaitContainerResultCallback callback = new WaitContainerResultCallback() {
+            public void onNext(WaitResponse waitResponse) {
+                fail("expected NotFoundException");
+            };
+        };
+
+        dockerClient.waitContainerCmd("non-existing").exec(callback).awaitStatusCode();
+    }
+
+    @Test
+    public void testWaitContainerAbort() throws Exception {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        WaitContainerResultCallback callback = dockerClient.waitContainerCmd(container.getId()).exec(
+                new WaitContainerResultCallback());
+
+        Thread.sleep(5000);
+
+        callback.close();
+
+        dockerClient.killContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        assertThat(inspectContainerResponse.getState().isRunning(), is(equalTo(false)));
+    }
+}
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
index c2d4557a4..b4309b868 100644
--- a/src/test/resources/logback.xml
+++ b/src/test/resources/logback.xml
@@ -8,6 +8,7 @@
 
     <logger name="com.github.dockerjava" level="DEBUG"/>
     <logger name="com.github.dockerjava.jaxrs" level="DEBUG"/>
+    <logger name="com.github.dockerjava.netty" level="DEBUG"/>
     <logger name="org.apache.http.impl.conn" level="DEBUG"/>
 
 

From c3e84869c5a2f2194983a257d1880031162bc910 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 14 Nov 2015 20:28:09 +0300
Subject: [PATCH 0292/1272] Move utils into util package

---
 .../com/github/dockerjava/core/GoLangMatchFileFilter.java     | 1 +
 .../com/github/dockerjava/core/LocalDirectorySSLConfig.java   | 1 +
 .../com/github/dockerjava/core/command/BuildImageCmdImpl.java | 2 +-
 .../com/github/dockerjava/core/dockerfile/Dockerfile.java     | 4 ++--
 .../github/dockerjava/core/{ => util}/CertificateUtils.java   | 2 +-
 .../dockerjava/core/{ => util}/CompressArchiveUtil.java       | 2 +-
 .../com/github/dockerjava/core/{ => util}/FilePathUtil.java   | 2 +-
 .../com/github/dockerjava/core/CompressArchiveUtilTest.java   | 1 +
 .../github/dockerjava/core/command/BuildImageCmdImplTest.java | 2 +-
 9 files changed, 10 insertions(+), 7 deletions(-)
 rename src/main/java/com/github/dockerjava/core/{ => util}/CertificateUtils.java (99%)
 rename src/main/java/com/github/dockerjava/core/{ => util}/CompressArchiveUtil.java (97%)
 rename src/main/java/com/github/dockerjava/core/{ => util}/FilePathUtil.java (95%)

diff --git a/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java b/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
index 371c30fed..1bdfc1669 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
@@ -6,6 +6,7 @@
 import java.io.File;
 import java.util.List;
 
+import com.github.dockerjava.core.util.FilePathUtil;
 import org.apache.commons.io.filefilter.AbstractFileFilter;
 
 public class GoLangMatchFileFilter extends AbstractFileFilter {
diff --git a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
index 21719c591..7bc7f5c8b 100644
--- a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
@@ -7,6 +7,7 @@
 
 import javax.net.ssl.SSLContext;
 
+import com.github.dockerjava.core.util.CertificateUtils;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.glassfish.jersey.SslConfigurator;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index 16bdbbaf2..8511a60fe 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -10,7 +10,7 @@
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.api.model.BuildResponseItem;
-import com.github.dockerjava.core.FilePathUtil;
+import com.github.dockerjava.core.util.FilePathUtil;
 import com.github.dockerjava.core.dockerfile.Dockerfile;
 
 /**
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 2084b2cce..2112a794c 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -1,8 +1,8 @@
 package com.github.dockerjava.core.dockerfile;
 
 import com.github.dockerjava.api.exception.DockerClientException;
-import com.github.dockerjava.core.CompressArchiveUtil;
-import com.github.dockerjava.core.FilePathUtil;
+import com.github.dockerjava.core.util.CompressArchiveUtil;
+import com.github.dockerjava.core.util.FilePathUtil;
 import com.github.dockerjava.core.GoLangFileMatch;
 import com.github.dockerjava.core.exception.GoLangFileMatchException;
 import com.github.dockerjava.core.GoLangMatchFileFilter;
diff --git a/src/main/java/com/github/dockerjava/core/CertificateUtils.java b/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
similarity index 99%
rename from src/main/java/com/github/dockerjava/core/CertificateUtils.java
rename to src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
index 88ff42f26..384b4b429 100644
--- a/src/main/java/com/github/dockerjava/core/CertificateUtils.java
+++ b/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.core;
+package com.github.dockerjava.core.util;
 
 import org.apache.commons.io.IOUtils;
 import org.bouncycastle.cert.X509CertificateHolder;
diff --git a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
similarity index 97%
rename from src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
rename to src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
index 356c0c88d..df141df7b 100644
--- a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
+++ b/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.core;
+package com.github.dockerjava.core.util;
 
 import static com.github.dockerjava.core.util.FilePathUtil.relativize;
 
diff --git a/src/main/java/com/github/dockerjava/core/FilePathUtil.java b/src/main/java/com/github/dockerjava/core/util/FilePathUtil.java
similarity index 95%
rename from src/main/java/com/github/dockerjava/core/FilePathUtil.java
rename to src/main/java/com/github/dockerjava/core/util/FilePathUtil.java
index 94393f1b8..9655bc502 100644
--- a/src/main/java/com/github/dockerjava/core/FilePathUtil.java
+++ b/src/main/java/com/github/dockerjava/core/util/FilePathUtil.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.core;
+package com.github.dockerjava.core.util;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java b/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
index 90ca91fca..fa4164b94 100644
--- a/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
+++ b/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
@@ -12,6 +12,7 @@
 import java.io.IOException;
 import java.util.zip.GZIPInputStream;
 
+import com.github.dockerjava.core.util.CompressArchiveUtil;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.io.FileUtils;
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 89d15ecac..f8dc6a940 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -35,7 +35,7 @@
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.client.AbstractDockerClientTest;
-import com.github.dockerjava.core.CompressArchiveUtil;
+import com.github.dockerjava.core.util.CompressArchiveUtil;
 
 @Test(groups = "integration")
 public class BuildImageCmdImplTest extends AbstractDockerClientTest {

From ee2c9b47789550a09c46c7acec934badf7f4247f Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 14 Nov 2015 20:26:45 +0300
Subject: [PATCH 0293/1272] Add checkstyle with unused imports check

---
 pom.xml                                       | 30 +++++++++++++++++++
 .../checkstyle/checkstyle-config.xml          | 21 +++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 src/test/resources/checkstyle/checkstyle-config.xml

diff --git a/pom.xml b/pom.xml
index dfee63050..d3abf129a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -420,6 +420,36 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>docker-java-analyses</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-checkstyle-plugin</artifactId>
+						<version>2.17</version>
+						<executions>
+							<execution>
+								<id>checkstyle</id>
+								<phase>validate</phase>
+								<goals>
+									<goal>check</goal>
+								</goals>
+							</execution>
+						</executions>
+						<configuration>
+							<encoding>UTF-8</encoding>
+							<failOnViolation>true</failOnViolation>
+							<logViolationsToConsole>true</logViolationsToConsole>
+							<linkXRef>false</linkXRef>
+							<!-- if some IDE has integration and requires other place, propose it -->
+							<configLocation>
+								src/test/resources/checkstyle/checkstyle-config.xml
+							</configLocation>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 
 </project>
diff --git a/src/test/resources/checkstyle/checkstyle-config.xml b/src/test/resources/checkstyle/checkstyle-config.xml
new file mode 100644
index 000000000..b804c7f97
--- /dev/null
+++ b/src/test/resources/checkstyle/checkstyle-config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+    <!--
+        If you set the basedir property below, then all reported file
+        names will be relative to the specified directory. See
+        http://checkstyle.sourceforge.net/5.x/config.html#Checker
+
+        <property name="basedir" value="${basedir}"/>
+    -->
+
+    <module name="TreeWalker">
+        <module name="UnusedImports">
+            <property name="processJavadoc" value="true"/>
+        </module>
+    </module>
+
+</module>

From e93399c0633e49d214c381c7ce382f01a74bd65e Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 20 Nov 2015 17:13:10 +0300
Subject: [PATCH 0294/1272] Move findbugs into profile.

---
 pom.xml | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index d3abf129a..31ef5c969 100644
--- a/pom.xml
+++ b/pom.xml
@@ -373,25 +373,6 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>findbugs-maven-plugin</artifactId>
-				<version>3.0.2</version>
-				<configuration>
-					<effort>Max</effort>
-					<threshold>Low</threshold>
-					<xmlOutput>true</xmlOutput>
-					<!-- until all will be fixed -->
-					<failOnError>false</failOnError>
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>check</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 
@@ -422,6 +403,9 @@
 		</profile>
 		<profile>
 			<id>docker-java-analyses</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
 			<build>
 				<plugins>
 					<plugin>
@@ -447,6 +431,25 @@
 							</configLocation>
 						</configuration>
 					</plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>findbugs-maven-plugin</artifactId>
+						<version>3.0.2</version>
+						<configuration>
+							<effort>Max</effort>
+							<threshold>Low</threshold>
+							<xmlOutput>true</xmlOutput>
+							<!-- until all will be fixed -->
+							<failOnError>false</failOnError>
+						</configuration>
+						<executions>
+							<execution>
+								<goals>
+									<goal>check</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>

From fe8778e5b7f8c0c968ed3905a68ce1eaad547d02 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 20 Nov 2015 18:56:35 +0300
Subject: [PATCH 0295/1272] Fix DockerClientConfig serialization.

serialVersionUID extracted with:

java version "1.7.0_76"
Java(TM) SE Runtime Environment (build 1.7.0_76-b13)
Java HotSpot(TM) 64-Bit Server VM (build 24.76-b04, mixed mode)

Resolves #376
---
 .../dockerjava/core/RemoteApiVersion.java     |  4 +++-
 .../core/DockerClientConfigTest.java          | 11 +++++++++
 .../dockerjava/core/RemoteApiVersionTest.java | 23 +++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java

diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index 81db242cd..aa8411f80 100644
--- a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -5,6 +5,7 @@
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 
+import java.io.Serializable;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -15,7 +16,8 @@
  *
  * @author Marcus Thiesen
  */
-public class RemoteApiVersion {
+public class RemoteApiVersion implements Serializable {
+    private static final long serialVersionUID = -5382212999262115459L;
 
     public static final RemoteApiVersion VERSION_1_19 = RemoteApiVersion.create(1, 19);
 
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
index e66cfa57d..8bb1c3e39 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.core;
 
 import com.github.dockerjava.api.model.AuthConfig;
+import org.apache.commons.lang.SerializationUtils;
 import org.testng.annotations.Test;
 
 import java.net.URI;
@@ -9,6 +10,8 @@
 import java.util.Map;
 import java.util.Properties;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
 import static org.testng.Assert.assertEquals;
 
 public class DockerClientConfigTest {
@@ -184,4 +187,12 @@ public void systemProperties() throws Exception {
         assertEquals(config, EXAMPLE_CONFIG);
 
     }
+
+    @Test
+    public void serializableTest() {
+        final byte[] serialized = SerializationUtils.serialize(EXAMPLE_CONFIG);
+        final DockerClientConfig deserialized = (DockerClientConfig) SerializationUtils.deserialize(serialized);
+
+        assertThat("Deserialized object mush match source object", deserialized, equalTo(EXAMPLE_CONFIG));
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java b/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java
new file mode 100644
index 000000000..011f909ad
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java
@@ -0,0 +1,23 @@
+package com.github.dockerjava.core;
+
+import org.apache.commons.lang.SerializationUtils;
+import org.testng.annotations.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+public class RemoteApiVersionTest {
+    @Test
+    public void testSerial() {
+        SerializationUtils.serialize(RemoteApiVersion.unknown());
+        final RemoteApiVersion remoteApiVersion = RemoteApiVersion.create(1, 20);
+
+        final byte[] serialized = SerializationUtils.serialize(remoteApiVersion);
+        RemoteApiVersion deserialized = (RemoteApiVersion) SerializationUtils.deserialize(serialized);
+
+        assertThat("Deserialized object mush match source object", deserialized, equalTo(remoteApiVersion));
+    }
+}

From e03273068342171377638c7bd143edb757d729ae Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 20 Nov 2015 22:24:50 +0300
Subject: [PATCH 0296/1272] Add docker versions for easier javadoc reference

---
 .../dockerjava/core/RemoteApiVersion.java     | 44 ++++++++++++++++++-
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index aa8411f80..bdc2b5247 100644
--- a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -10,7 +10,8 @@
 import java.util.regex.Pattern;
 
 /**
- * Bean to encapsulate the version of the Docker Remote API (REST API)
+ * Bean to encapsulate the version of the
+ * <a href="http://docs.docker.com/engine/reference/api/docker_remote_api/">Docker Remote (REST) API</a>
  * <p>
  * Contains the minor and major version of the API as well as operations to compare API versions.
  *
@@ -19,10 +20,49 @@
 public class RemoteApiVersion implements Serializable {
     private static final long serialVersionUID = -5382212999262115459L;
 
+    private static final Pattern VERSION_REGEX = Pattern.compile("v?(\\d+)\\.(\\d+)");
+
+    /**
+     * @see <a href="http://docs.docker.com/engine/reference/api/docker_remote_api_v1.16/">Docker API 1.16</a>
+     */
+    public static final RemoteApiVersion VERSION_1_16 = RemoteApiVersion.create(1, 16);
+
+    /**
+     * @see <a href="http://docs.docker.com/engine/reference/api/docker_remote_api_v1.17/">Docker API 1.17</a>
+     */
+    public static final RemoteApiVersion VERSION_1_17 = RemoteApiVersion.create(1, 17);
+
+    /**
+     * @see <a href="http://docs.docker.com/engine/reference/api/docker_remote_api_v1.18/">Docker API 1.18</a>
+     */
+    public static final RemoteApiVersion VERSION_1_18 = RemoteApiVersion.create(1, 18);
+
+    /**
+     * @see <a href="http://docs.docker.com/engine/reference/api/docker_remote_api_v1.19/">Docker API 1.19</a>
+     */
     public static final RemoteApiVersion VERSION_1_19 = RemoteApiVersion.create(1, 19);
 
-    private static final Pattern VERSION_REGEX = Pattern.compile("v?(\\d+)\\.(\\d+)");
+    /**
+     * @see <a href="http://docs.docker.com/engine/reference/api/docker_remote_api_v1.20/">Docker API 1.20</a>
+     */
+    public static final RemoteApiVersion VERSION_1_20 = RemoteApiVersion.create(1, 20);
+
+
+    /**
+     * @see <a href="http://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/">Docker API 1.21</a>
+     */
+    public static final RemoteApiVersion VERSION_1_21 = RemoteApiVersion.create(1, 21);
+
+    /**
+     * @see <a href="https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.22.md">Docker API 1.22</a>
+     */
+    public static final RemoteApiVersion VERSION_1_22 = RemoteApiVersion.create(1, 22);
+
 
+    /**
+     * Unknown, docker doesn't reflect reality.
+     * I.e. we implemented method, but for javadoc it not clear when it was added.
+     */
     private static final RemoteApiVersion UNKNOWN_VERSION = new RemoteApiVersion(0, 0) {
 
         @Override

From 7e6173de4dc91136e6799e2c55351953717851ec Mon Sep 17 00:00:00 2001
From: Ritesh Patel <ritesh@nirmata.com>
Date: Tue, 17 Nov 2015 22:25:18 -0800
Subject: [PATCH 0297/1272] Add missing properties for
 InspectContainerResponse.Status

- add missing fields 1.22
- replace isXX to getXX for objects
- annotated everything
---
 .../api/command/InspectContainerResponse.java | 132 +++++++++++++++++-
 .../command/CreateContainerCmdImplTest.java   |   6 +-
 .../command/KillContainerCmdImplTest.java     |   2 +-
 .../command/RestartContainerCmdImplTest.java  |   2 +-
 .../command/StartContainerCmdImplTest.java    |  24 ++--
 .../command/StopContainerCmdImplTest.java     |   2 +-
 .../command/WaitContainerCmdImplTest.java     |   4 +-
 7 files changed, 150 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index e37e28471..742319483 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -16,6 +17,8 @@
 import com.github.dockerjava.api.model.VolumeRW;
 import com.github.dockerjava.api.model.VolumesRW;
 
+import javax.annotation.CheckForNull;
+
 /**
  *
  * @author Konstantin Pelykh (kpelykh@gmail.com)
@@ -225,44 +228,169 @@ public String toString() {
     @JsonIgnoreProperties(ignoreUnknown = true)
     public class ContainerState {
 
+        /**
+         * @since {@link RemoteApiVersion#VERSION_1_20}
+         */
+        @CheckForNull
+        @JsonProperty("Status")
+        private String status;
+
+        /**
+         * @since < {@link RemoteApiVersion#VERSION_1_16}
+         */
+        @CheckForNull
         @JsonProperty("Running")
         private Boolean running;
 
+        /**
+         * @since {@link RemoteApiVersion#VERSION_1_17}
+         */
+        @CheckForNull
         @JsonProperty("Paused")
         private Boolean paused;
 
+        /**
+         * @since {@link RemoteApiVersion#VERSION_1_17}
+         */
+        @CheckForNull
+        @JsonProperty("Restarting")
+        private Boolean restarting;
+
+        /**
+         * @since {@link RemoteApiVersion#VERSION_1_17}
+         */
+        @CheckForNull
+        @JsonProperty("OOMKilled")
+        private Boolean oomKilled;
+
+        /**
+         * <a href="https://github.com/docker/docker/pull/18127">Unclear</a>
+         * @since {@link RemoteApiVersion#UNKNOWN_VERSION}
+         */
+        @CheckForNull
+        @JsonProperty("Dead")
+        private Boolean dead;
+
+        /**
+         * @since < {@link RemoteApiVersion#VERSION_1_16}
+         */
+        @CheckForNull
         @JsonProperty("Pid")
         private Integer pid;
 
+        /**
+         * @since < {@link RemoteApiVersion#VERSION_1_16}
+         */
+        @CheckForNull
         @JsonProperty("ExitCode")
         private Integer exitCode;
 
+        /**
+         * @since {@link RemoteApiVersion#VERSION_1_17}
+         */
+        @CheckForNull
+        @JsonProperty("Error")
+        private String error;
+
+        /**
+         * @since < {@link RemoteApiVersion#VERSION_1_16}
+         */
+        @CheckForNull
         @JsonProperty("StartedAt")
         private String startedAt;
 
+        /**
+         * @since {@link RemoteApiVersion#VERSION_1_17}
+         */
+        @CheckForNull
         @JsonProperty("FinishedAt")
         private String finishedAt;
 
-        public Boolean isRunning() {
+
+        /**
+         * See {@link #status}
+         */
+        @CheckForNull
+        public String getStatus() {
+            return status;
+        }
+
+        /**
+         * See {@link #running}
+         */
+        @CheckForNull
+        public Boolean getRunning() {
             return running;
         }
 
-        public Boolean isPaused() {
+        /**
+         * See {@link #paused}
+         */
+        @CheckForNull
+        public Boolean getPaused() {
             return paused;
         }
 
+        /**
+         * See {@link #restarting}
+         */
+        @CheckForNull
+        public Boolean getRestarting() {
+            return restarting;
+        }
+
+        /**
+         * See {@link #oomKilled}
+         */
+        @CheckForNull
+        public Boolean getOOMKilled() {
+            return oomKilled;
+        }
+
+        /**
+         * See {@link #dead}
+         */
+        @CheckForNull
+        public Boolean getDead() {
+            return dead;
+        }
+
+        /**
+         * See {@link #pid}
+         */
+        @CheckForNull
         public Integer getPid() {
             return pid;
         }
 
+        /**
+         * See {@link #exitCode}
+         */
+        @CheckForNull
         public Integer getExitCode() {
             return exitCode;
         }
 
+        /**
+         * See {@link #error}
+         */
+        @CheckForNull
+        public String getError() {
+            return error;
+        }
+
+        /**
+         * See {@link #startedAt}
+         */
+        @CheckForNull
         public String getStartedAt() {
             return startedAt;
         }
 
+        /**
+         * See {@link #finishedAt}
+         */
+        @CheckForNull
         public String getFinishedAt() {
             return finishedAt;
         }
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index a445c6ceb..f741f5245 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -253,7 +253,7 @@ public void createContainerWithLink() throws DockerException {
         InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
                 .exec();
         LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
-        assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
+        assertThat(inspectContainerResponse1.getState().getRunning(), is(true));
 
         CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withName("container2")
                 .withCmd("env").withLinks(new Link("container1", "container1Link")).exec();
@@ -406,9 +406,9 @@ public void createContainerWithLinking() throws DockerException {
         assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
         assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
         assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
-        assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
+        assertThat(inspectContainerResponse1.getState().getRunning(), is(true));
 
-        if (!inspectContainerResponse1.getState().isRunning()) {
+        if (!inspectContainerResponse1.getState().getRunning()) {
             assertThat(inspectContainerResponse1.getState().getExitCode(), is(equalTo(0)));
         }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
index 1a4e65ccd..3ba85928e 100644
--- a/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
@@ -62,7 +62,7 @@ public void killContainer() throws DockerException {
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
         LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
 
-        assertThat(inspectContainerResponse.getState().isRunning(), is(equalTo(false)));
+        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
         assertThat(inspectContainerResponse.getState().getExitCode(), not(equalTo(0)));
 
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
index 31b81726f..4920ac087 100644
--- a/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
@@ -66,7 +66,7 @@ public void restartContainer() throws DockerException {
 
         assertThat(startTime, not(equalTo(startTime2)));
 
-        assertThat(inspectContainerResponse.getState().isRunning(), is(equalTo(true)));
+        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(true)));
 
         dockerClient.killContainerCmd(container.getId()).exec();
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index 042497672..db6e28fe0 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -289,9 +289,9 @@ public void startContainerWithLinkingDeprecated() throws DockerException {
         assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
         assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
         assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
-        assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
+        assertThat(inspectContainerResponse1.getState().getRunning(), is(true));
 
-        if (!inspectContainerResponse1.getState().isRunning()) {
+        if (!inspectContainerResponse1.getState().getRunning()) {
             assertThat(inspectContainerResponse1.getState().getExitCode(), is(equalTo(0)));
         }
 
@@ -317,7 +317,7 @@ public void startContainerWithLinkingDeprecated() throws DockerException {
         assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
         assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
         assertThat(inspectContainerResponse2.getState(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getState().isRunning(), is(true));
+        assertThat(inspectContainerResponse2.getState().getRunning(), is(true));
 
     }
 
@@ -342,9 +342,9 @@ public void startContainerWithLinking() throws DockerException {
         assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
         assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
         assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
-        assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
+        assertThat(inspectContainerResponse1.getState().getRunning(), is(true));
 
-        if (!inspectContainerResponse1.getState().isRunning()) {
+        if (!inspectContainerResponse1.getState().getRunning()) {
             assertThat(inspectContainerResponse1.getState().getExitCode(), is(equalTo(0)));
         }
 
@@ -370,7 +370,7 @@ public void startContainerWithLinking() throws DockerException {
         assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
         assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
         assertThat(inspectContainerResponse2.getState(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getState().isRunning(), is(true));
+        assertThat(inspectContainerResponse2.getState().getRunning(), is(true));
 
     }
 
@@ -396,9 +396,9 @@ public void startContainer() throws DockerException {
         assertThat(inspectContainerResponse.getImageId(), not(isEmptyString()));
         assertThat(inspectContainerResponse.getState(), is(notNullValue()));
 
-        assertThat(inspectContainerResponse.getState().isRunning(), is(true));
+        assertThat(inspectContainerResponse.getState().getRunning(), is(true));
 
-        if (!inspectContainerResponse.getState().isRunning()) {
+        if (!inspectContainerResponse.getState().getRunning()) {
             assertThat(inspectContainerResponse.getState().getExitCode(), is(equalTo(0)));
         }
     }
@@ -452,7 +452,7 @@ public void startContainerWithCapAddAndCapDrop() throws DockerException {
 
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-        assertThat(inspectContainerResponse.getState().isRunning(), is(true));
+        assertThat(inspectContainerResponse.getState().getRunning(), is(true));
 
         assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getCapAdd()), contains(NET_ADMIN));
 
@@ -473,7 +473,7 @@ public void startContainerWithDevices() throws DockerException {
 
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-        assertThat(inspectContainerResponse.getState().isRunning(), is(true));
+        assertThat(inspectContainerResponse.getState().getRunning(), is(true));
 
         assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDevices()), contains(new Device("rwm",
                 "/dev/nulo", "/dev/zero")));
@@ -493,7 +493,7 @@ public void startContainerWithExtraHosts() throws DockerException {
 
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-        assertThat(inspectContainerResponse.getState().isRunning(), is(true));
+        assertThat(inspectContainerResponse.getState().getRunning(), is(true));
 
         assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getExtraHosts()),
                 contains("dockerhost:127.0.0.1"));
@@ -515,7 +515,7 @@ public void startContainerWithRestartPolicy() throws DockerException {
 
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-        assertThat(inspectContainerResponse.getState().isRunning(), is(true));
+        assertThat(inspectContainerResponse.getState().getRunning(), is(true));
 
         assertThat(inspectContainerResponse.getHostConfig().getRestartPolicy(), is(equalTo(restartPolicy)));
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
index 12213b802..0718c7700 100644
--- a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
@@ -62,7 +62,7 @@ public void testStopContainer() throws DockerException {
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
         LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
 
-        assertThat(inspectContainerResponse.getState().isRunning(), is(equalTo(false)));
+        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
         assertThat(inspectContainerResponse.getState().getExitCode(), not(equalTo(0)));
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
index 02ddaf32a..8de80573c 100644
--- a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
@@ -64,7 +64,7 @@ public void testWaitContainer() throws DockerException {
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
         LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
 
-        assertThat(inspectContainerResponse.getState().isRunning(), is(equalTo(false)));
+        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
         assertThat(inspectContainerResponse.getState().getExitCode(), is(equalTo(exitCode)));
     }
 
@@ -102,6 +102,6 @@ public void testWaitContainerAbort() throws Exception {
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
         LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
 
-        assertThat(inspectContainerResponse.getState().isRunning(), is(equalTo(false)));
+        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
     }
 }

From 0bc6671184c8ac210d7df97510ccf05074565310 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 21 Nov 2015 00:27:59 +0300
Subject: [PATCH 0298/1272] Add test case

---
 .../api/command/CommandJSONSamples.java       |   4 +-
 .../command/InspectContainerResponseTest.java |  31 +++-
 .../inspectContainerResponse_full_1_21.json   | 143 ++++++++++++++++++
 3 files changed, 171 insertions(+), 7 deletions(-)
 create mode 100644 src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_21.json

diff --git a/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java b/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
index 104727896..ee7848391 100644
--- a/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
+++ b/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
@@ -24,7 +24,9 @@
  */
 public enum CommandJSONSamples implements JSONResourceRef {
 
-    inspectContainerResponse_full, inspectContainerResponse_empty;
+    inspectContainerResponse_full,
+    inspectContainerResponse_full_1_21,
+    inspectContainerResponse_empty;
 
     @Override
     public String getFileName() {
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
index 2345b8825..c9d40b65f 100644
--- a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
+++ b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
@@ -15,18 +15,21 @@
  */
 package com.github.dockerjava.api.command;
 
-import static com.github.dockerjava.test.serdes.JSONTestHelper.testRoundTrip;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import org.testng.annotations.Test;
 
 import java.io.IOException;
 
-import org.testng.annotations.Test;
+import static com.github.dockerjava.test.serdes.JSONTestHelper.testRoundTrip;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.core.IsNot.not;
+import static org.testng.Assert.*;
 
 /**
  * Tests for {@link InspectContainerResponse}.
- * 
+ *
  * @author Oleg Nenashev
  */
 public class InspectContainerResponseTest {
@@ -48,6 +51,22 @@ public void roundTrip_full() throws IOException {
         assertTrue(response.getVolumesRW()[0].getAccessMode().toBoolean());
     }
 
+    @Test
+    public void roundTrip_1_21_full() throws IOException {
+        InspectContainerResponse[] responses = testRoundTrip(CommandJSONSamples.inspectContainerResponse_full_1_21,
+                InspectContainerResponse[].class);
+        assertEquals(1, responses.length);
+        final InspectContainerResponse response = responses[0];
+        final InspectContainerResponse.ContainerState state = response.getState();
+        assertThat(state, not(nullValue()));
+
+        assertFalse(state.getDead());
+        assertThat(state.getStatus(), containsString("running"));
+        assertFalse(state.getRestarting());
+        assertFalse(state.getOOMKilled());
+        assertThat(state.getError(), isEmptyString());
+    }
+
     @Test
     public void roundTrip_empty() throws IOException {
         testRoundTrip(CommandJSONSamples.inspectContainerResponse_empty, InspectContainerResponse[].class);
diff --git a/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_21.json b/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_21.json
new file mode 100644
index 000000000..92ee66d54
--- /dev/null
+++ b/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_21.json
@@ -0,0 +1,143 @@
+[
+  {
+    "Id": "fc1243c01bbb791d9eca64204d76f72fc47fbebbca892d7dd0a5cd0e4e346045",
+    "Created": "2015-11-20T21:10:34.775649753Z",
+    "Path": "cat",
+    "Args": [],
+    "State": {
+      "Status": "running",
+      "Running": true,
+      "Paused": false,
+      "Restarting": false,
+      "OOMKilled": false,
+      "Dead": false,
+      "Pid": 10912,
+      "ExitCode": 0,
+      "Error": "",
+      "StartedAt": "2015-11-20T21:10:34.845546358Z",
+      "FinishedAt": "0001-01-01T00:00:00Z"
+    },
+    "Image": "c51f86c283408d1749d066333f7acd5d33b053b003a61ff6a7b36819ddcbc7b7",
+    "ResolvConfPath": "/mnt/sda1/var/lib/docker/containers/fc1243c01bbb791d9eca64204d76f72fc47fbebbca892d7dd0a5cd0e4e346045/resolv.conf",
+    "HostnamePath": "/mnt/sda1/var/lib/docker/containers/fc1243c01bbb791d9eca64204d76f72fc47fbebbca892d7dd0a5cd0e4e346045/hostname",
+    "HostsPath": "/mnt/sda1/var/lib/docker/containers/fc1243c01bbb791d9eca64204d76f72fc47fbebbca892d7dd0a5cd0e4e346045/hosts",
+    "LogPath": "/mnt/sda1/var/lib/docker/containers/fc1243c01bbb791d9eca64204d76f72fc47fbebbca892d7dd0a5cd0e4e346045/fc1243c01bbb791d9eca64204d76f72fc47fbebbca892d7dd0a5cd0e4e346045-json.log",
+    "Name": "/small_hodgkin",
+    "RestartCount": 0,
+    "Driver": "aufs",
+    "ExecDriver": "native-0.2",
+    "MountLabel": "",
+    "ProcessLabel": "",
+    "AppArmorProfile": "",
+    "ExecIDs": null,
+    "HostConfig": {
+      "Binds": null,
+      "ContainerIDFile": "",
+      "LxcConf": [],
+      "Memory": 0,
+      "MemoryReservation": 0,
+      "MemorySwap": 0,
+      "KernelMemory": 0,
+      "CpuShares": 0,
+      "CpuPeriod": 0,
+      "CpusetCpus": "",
+      "CpusetMems": "",
+      "CpuQuota": 0,
+      "BlkioWeight": 0,
+      "OomKillDisable": false,
+      "MemorySwappiness": -1,
+      "Privileged": false,
+      "PortBindings": {},
+      "Links": null,
+      "PublishAllPorts": false,
+      "Dns": null,
+      "DnsOptions": null,
+      "DnsSearch": null,
+      "ExtraHosts": null,
+      "VolumesFrom": null,
+      "Devices": [],
+      "NetworkMode": "default",
+      "IpcMode": "",
+      "PidMode": "",
+      "UTSMode": "",
+      "CapAdd": null,
+      "CapDrop": null,
+      "GroupAdd": null,
+      "RestartPolicy": {
+        "Name": "no",
+        "MaximumRetryCount": 0
+      },
+      "SecurityOpt": null,
+      "ReadonlyRootfs": false,
+      "Ulimits": null,
+      "LogConfig": {
+        "Type": "json-file",
+        "Config": {}
+      },
+      "CgroupParent": "",
+      "ConsoleSize": [
+        0,
+        0
+      ],
+      "VolumeDriver": ""
+    },
+    "GraphDriver": {
+      "Name": "aufs",
+      "Data": null
+    },
+    "Mounts": [],
+    "Config": {
+      "Hostname": "fc1243c01bbb",
+      "Domainname": "",
+      "User": "",
+      "AttachStdin": false,
+      "AttachStdout": false,
+      "AttachStderr": false,
+      "Tty": false,
+      "OpenStdin": true,
+      "StdinOnce": false,
+      "Env": null,
+      "Cmd": [
+        "cat"
+      ],
+      "Image": "busybox",
+      "Volumes": null,
+      "WorkingDir": "",
+      "Entrypoint": null,
+      "OnBuild": null,
+      "Labels": {},
+      "StopSignal": "SIGTERM"
+    },
+    "NetworkSettings": {
+      "Bridge": "",
+      "SandboxID": "5a6ded01bf23cc180e8ba6a059449ac832f28fa1d8367127e316607f92d3228c",
+      "HairpinMode": false,
+      "LinkLocalIPv6Address": "",
+      "LinkLocalIPv6PrefixLen": 0,
+      "Ports": {},
+      "SandboxKey": "/var/run/docker/netns/5a6ded01bf23",
+      "SecondaryIPAddresses": null,
+      "SecondaryIPv6Addresses": null,
+      "EndpointID": "6b4bb2aff9981d6e132cf37ebbfd370069061fab848ae56247b154717a99aba7",
+      "Gateway": "172.17.0.1",
+      "GlobalIPv6Address": "",
+      "GlobalIPv6PrefixLen": 0,
+      "IPAddress": "172.17.0.2",
+      "IPPrefixLen": 16,
+      "IPv6Gateway": "",
+      "MacAddress": "02:42:ac:11:00:02",
+      "Networks": {
+        "bridge": {
+          "EndpointID": "6b4bb2aff9981d6e132cf37ebbfd370069061fab848ae56247b154717a99aba7",
+          "Gateway": "172.17.0.1",
+          "IPAddress": "172.17.0.2",
+          "IPPrefixLen": 16,
+          "IPv6Gateway": "",
+          "GlobalIPv6Address": "",
+          "GlobalIPv6PrefixLen": 0,
+          "MacAddress": "02:42:ac:11:00:02"
+        }
+      }
+    }
+  }
+]

From ef093ab225dece6a80e4387e4112eb4774f432d8 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 21 Nov 2015 00:40:39 +0300
Subject: [PATCH 0299/1272] Add equals and hashCode for State

---
 .../api/command/InspectContainerResponse.java        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index 742319483..57ebe5cc0 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -4,6 +4,8 @@
 import java.util.Map;
 
 import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -395,6 +397,16 @@ public String getFinishedAt() {
             return finishedAt;
         }
 
+        @Override
+        public boolean equals(Object o) {
+            return EqualsBuilder.reflectionEquals(this, o);
+        }
+
+        @Override
+        public int hashCode() {
+            return HashCodeBuilder.reflectionHashCode(this);
+        }
+
         @Override
         public String toString() {
             return ToStringBuilder.reflectionToString(this);

From f44ee8f76237a84bc3a4e57c41e097452c808447 Mon Sep 17 00:00:00 2001
From: VU Minh Khang <minh.khang.vu.mkv@gmail.com>
Date: Mon, 23 Nov 2015 23:31:25 +0100
Subject: [PATCH 0300/1272] Rename CopyFileFromContainerCmd and
 CopyFileToContainerCmd to CopyArchiveFromContainerCmd and
 CopyArchiveToContainerCmd

---
 .../github/dockerjava/api/DockerClient.java    |  8 ++++----
 ...d.java => CopyArchiveFromContainerCmd.java} | 10 +++++-----
 .../command/CopyArchiveToContainerCmd.java}    | 18 ++++++++----------
 .../api/command/DockerCmdExecFactory.java      |  5 ++---
 .../dockerjava/core/DockerClientImpl.java      | 16 ++++++++--------
 ...va => CopyArchiveFromContainerCmdImpl.java} | 14 +++++++-------
 ...java => CopyArchiveToContainerCmdImpl.java} | 15 ++++++++-------
 ...va => CopyArchiveFromContainerCmdExec.java} | 12 ++++++------
 ...java => CopyArchiveToContainerCmdExec.java} | 16 ++++++++--------
 .../jaxrs/DockerCmdExecFactoryImpl.java        | 13 ++++++-------
 .../core/TestDockerCmdExecFactory.java         | 12 ++++++------
 ...> CopyArchiveFromContainerCmdImplTest.java} |  6 +++---
 ... => CopyArchiveToContainerCmdImplTest.java} |  8 ++++----
 .../core/command/ExecStartCmdImplTest.java     |  4 ++--
 14 files changed, 77 insertions(+), 80 deletions(-)
 rename src/main/java/com/github/dockerjava/api/command/{CopyFileFromContainerCmd.java => CopyArchiveFromContainerCmd.java} (61%)
 rename src/main/java/com/github/dockerjava/{core/command/CopyFileToContainerCmd.java => api/command/CopyArchiveToContainerCmd.java} (66%)
 rename src/main/java/com/github/dockerjava/core/command/{CopyFileFromContainerCmdImpl.java => CopyArchiveFromContainerCmdImpl.java} (69%)
 rename src/main/java/com/github/dockerjava/core/command/{CopyFileToContainerCmdImpl.java => CopyArchiveToContainerCmdImpl.java} (73%)
 rename src/main/java/com/github/dockerjava/jaxrs/{CopyFileFromContainerCmdExec.java => CopyArchiveFromContainerCmdExec.java} (64%)
 rename src/main/java/com/github/dockerjava/jaxrs/{CopyFileToContainerCmdExec.java => CopyArchiveToContainerCmdExec.java} (70%)
 rename src/test/java/com/github/dockerjava/core/command/{CopyFileFromContainerCmdImplTest.java => CopyArchiveFromContainerCmdImplTest.java} (88%)
 rename src/test/java/com/github/dockerjava/core/command/{CopyFileToContainerCmdImplTest.java => CopyArchiveToContainerCmdImplTest.java} (82%)

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index feebfae45..88c830ea7 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -10,7 +10,7 @@
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.command.CommitCmd;
 import com.github.dockerjava.api.command.ContainerDiffCmd;
-import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.EventsCmd;
@@ -44,7 +44,7 @@
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Identifier;
-import com.github.dockerjava.core.command.CopyFileToContainerCmd;
+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 
 // https://godoc.org/github.com/fsouza/go-dockerclient
 public interface DockerClient extends Closeable {
@@ -120,9 +120,9 @@ public interface DockerClient extends Closeable {
 
     public LogContainerCmd logContainerCmd(String containerId);
 
-    public CopyFileFromContainerCmd copyFileFromContainerCmd(String containerId, String resource);
+    public CopyArchiveFromContainerCmd copyArchiveFromContainerCmd(String containerId, String resource);
 
-    public CopyFileToContainerCmd copyFileToContainerCmd(String containerId, String hostResource);
+    public CopyArchiveToContainerCmd copyArchiveToContainerCmd(String containerId, String hostResource);
 
     public ContainerDiffCmd containerDiffCmd(String containerId);
 
diff --git a/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java
similarity index 61%
rename from src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
rename to src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java
index 5ae9f6276..1bb8cf617 100644
--- a/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java
@@ -7,7 +7,7 @@
 
 import com.github.dockerjava.api.exception.NotFoundException;
 
-public interface CopyFileFromContainerCmd extends SyncDockerCmd<InputStream> {
+public interface CopyArchiveFromContainerCmd extends SyncDockerCmd<InputStream> {
 
     @CheckForNull
     public String getContainerId();
@@ -18,11 +18,11 @@ public interface CopyFileFromContainerCmd extends SyncDockerCmd<InputStream> {
     @CheckForNull
     public String getResource();
 
-    public CopyFileFromContainerCmd withContainerId(@Nonnull String containerId);
+    public CopyArchiveFromContainerCmd withContainerId(@Nonnull String containerId);
 
-    public CopyFileFromContainerCmd withHostPath(String hostPath);
+    public CopyArchiveFromContainerCmd withHostPath(String hostPath);
 
-    public CopyFileFromContainerCmd withResource(@Nonnull String resource);
+    public CopyArchiveFromContainerCmd withResource(@Nonnull String resource);
 
     /**
      * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
@@ -33,6 +33,6 @@ public interface CopyFileFromContainerCmd extends SyncDockerCmd<InputStream> {
     @Override
     public InputStream exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdSyncExec<CopyFileFromContainerCmd, InputStream> {
+    public static interface Exec extends DockerCmdSyncExec<CopyArchiveFromContainerCmd, InputStream> {
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/core/command/CopyFileToContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
similarity index 66%
rename from src/main/java/com/github/dockerjava/core/command/CopyFileToContainerCmd.java
rename to src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
index ab168c9c3..6fbad5eff 100644
--- a/src/main/java/com/github/dockerjava/core/command/CopyFileToContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
@@ -1,10 +1,8 @@
-package com.github.dockerjava.core.command;
+package com.github.dockerjava.api.command;
 
-import com.github.dockerjava.api.command.DockerCmdSyncExec;
-import com.github.dockerjava.api.command.SyncDockerCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
 
-public interface CopyFileToContainerCmd extends SyncDockerCmd<Void> {
+public interface CopyArchiveToContainerCmd extends SyncDockerCmd<Void> {
 
     public String getContainerId();
 
@@ -20,7 +18,7 @@ public interface CopyFileToContainerCmd extends SyncDockerCmd<Void> {
      * @param containerId id of the container to copy file to
      * @return this
      */
-    public CopyFileToContainerCmd withContainerId(String containerId);
+    public CopyArchiveToContainerCmd withContainerId(String containerId);
 
     /**
      * Set path to the resource on the host machine
@@ -28,7 +26,7 @@ public interface CopyFileToContainerCmd extends SyncDockerCmd<Void> {
      * @param resource path to the resource on the host machine
      * @return this
      */
-    public CopyFileToContainerCmd withHostResource(String resource);
+    public CopyArchiveToContainerCmd withHostResource(String resource);
 
     /**
      * If set to true then it will be an error if unpacking the given content would cause an existing directory to be replaced with a non-directory and vice versa
@@ -36,7 +34,7 @@ public interface CopyFileToContainerCmd extends SyncDockerCmd<Void> {
      * @param noOverwriteDirNonDir flag to know if non directory can be overwritten
      * @return this
      */
-    public CopyFileToContainerCmd withNoOverwriteDirNonDir(boolean noOverwriteDirNonDir);
+    public CopyArchiveToContainerCmd withNoOverwriteDirNonDir(boolean noOverwriteDirNonDir);
 
     /**
      * If this flag is set to true, all children of the local directory will be copied to the remote without the root directory.
@@ -47,16 +45,16 @@ public interface CopyFileToContainerCmd extends SyncDockerCmd<Void> {
      * @param dirChildrenOnly if root directory is ignored
      * @return this
      */
-    public CopyFileToContainerCmd withDirChildrenOnly(boolean dirChildrenOnly);
+    public CopyArchiveToContainerCmd withDirChildrenOnly(boolean dirChildrenOnly);
 
     public String getRemotePath();
 
-    public CopyFileToContainerCmd withRemotePath(String remotePath);
+    public CopyArchiveToContainerCmd withRemotePath(String remotePath);
 
     @Override
     public Void exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdSyncExec<CopyFileToContainerCmd, Void> {
+    public static interface Exec extends DockerCmdSyncExec<CopyArchiveToContainerCmd, Void> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index 33581c0e7..a8f63ab52 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -4,7 +4,6 @@
 import java.io.IOException;
 
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.command.CopyFileToContainerCmd;
 
 public interface DockerCmdExecFactory extends Closeable {
 
@@ -56,9 +55,9 @@ public interface DockerCmdExecFactory extends Closeable {
 
     public LogContainerCmd.Exec createLogContainerCmdExec();
 
-    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec();
+    public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec();
 
-    public CopyFileToContainerCmd.Exec createCopyFileToContainerCmdExec();
+    public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec();
 
     public StopContainerCmd.Exec createStopContainerCmdExec();
 
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 9725116f6..572b8e906 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -13,7 +13,7 @@
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.command.CommitCmd;
 import com.github.dockerjava.api.command.ContainerDiffCmd;
-import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
@@ -52,9 +52,9 @@
 import com.github.dockerjava.core.command.BuildImageCmdImpl;
 import com.github.dockerjava.core.command.CommitCmdImpl;
 import com.github.dockerjava.core.command.ContainerDiffCmdImpl;
-import com.github.dockerjava.core.command.CopyFileFromContainerCmdImpl;
-import com.github.dockerjava.core.command.CopyFileToContainerCmd;
-import com.github.dockerjava.core.command.CopyFileToContainerCmdImpl;
+import com.github.dockerjava.core.command.CopyArchiveFromContainerCmdImpl;
+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
+import com.github.dockerjava.core.command.CopyArchiveToContainerCmdImpl;
 import com.github.dockerjava.core.command.CreateContainerCmdImpl;
 import com.github.dockerjava.core.command.CreateImageCmdImpl;
 import com.github.dockerjava.core.command.EventsCmdImpl;
@@ -300,14 +300,14 @@ public LogContainerCmd logContainerCmd(String containerId) {
     }
 
     @Override
-    public CopyFileFromContainerCmd copyFileFromContainerCmd(String containerId, String resource) {
-        return new CopyFileFromContainerCmdImpl(getDockerCmdExecFactory().createCopyFileFromContainerCmdExec(),
+    public CopyArchiveFromContainerCmd copyArchiveFromContainerCmd(String containerId, String resource) {
+        return new CopyArchiveFromContainerCmdImpl(getDockerCmdExecFactory().createCopyArchiveFromContainerCmdExec(),
                 containerId, resource);
     }
 
     @Override
-    public CopyFileToContainerCmd copyFileToContainerCmd(String containerId, String hostResource) {
-        return new CopyFileToContainerCmdImpl(getDockerCmdExecFactory().createCopyFileToContainerCmdExec(),
+    public CopyArchiveToContainerCmd copyArchiveToContainerCmd(String containerId, String hostResource) {
+        return new CopyArchiveToContainerCmdImpl(getDockerCmdExecFactory().createCopyArchiveToContainerCmdExec(),
                 containerId, hostResource);
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java
similarity index 69%
rename from src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
rename to src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java
index 5ff671d14..dd03fc435 100644
--- a/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java
@@ -4,14 +4,14 @@
 
 import java.io.InputStream;
 
-import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
 
 /**
  * Copy files or folders from a container.
  */
-public class CopyFileFromContainerCmdImpl extends AbstrDockerCmd<CopyFileFromContainerCmd, InputStream> implements
-        CopyFileFromContainerCmd {
+public class CopyArchiveFromContainerCmdImpl extends AbstrDockerCmd<CopyArchiveFromContainerCmd, InputStream> implements
+        CopyArchiveFromContainerCmd {
 
     private String containerId;
 
@@ -19,7 +19,7 @@ public class CopyFileFromContainerCmdImpl extends AbstrDockerCmd<CopyFileFromCon
 
     private String resource;
 
-    public CopyFileFromContainerCmdImpl(CopyFileFromContainerCmd.Exec exec, String containerId, String resource) {
+    public CopyArchiveFromContainerCmdImpl(CopyArchiveFromContainerCmd.Exec exec, String containerId, String resource) {
         super(exec);
         withContainerId(containerId);
         withResource(resource);
@@ -36,14 +36,14 @@ public String getResource() {
     }
 
     @Override
-    public CopyFileFromContainerCmdImpl withContainerId(String containerId) {
+    public CopyArchiveFromContainerCmdImpl withContainerId(String containerId) {
         checkNotNull(containerId, "containerId was not specified");
         this.containerId = containerId;
         return this;
     }
 
     @Override
-    public CopyFileFromContainerCmdImpl withResource(String resource) {
+    public CopyArchiveFromContainerCmdImpl withResource(String resource) {
         checkNotNull(resource, "resource was not specified");
         this.resource = resource;
         return this;
@@ -55,7 +55,7 @@ public String getHostPath() {
     }
 
     @Override
-    public CopyFileFromContainerCmdImpl withHostPath(String hostPath) {
+    public CopyArchiveFromContainerCmdImpl withHostPath(String hostPath) {
         checkNotNull(hostPath, "hostPath was not specified");
         this.hostPath = hostPath;
         return this;
diff --git a/src/main/java/com/github/dockerjava/core/command/CopyFileToContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
similarity index 73%
rename from src/main/java/com/github/dockerjava/core/command/CopyFileToContainerCmdImpl.java
rename to src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
index dec50d627..47c0d0446 100644
--- a/src/main/java/com/github/dockerjava/core/command/CopyFileToContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
@@ -4,9 +4,10 @@
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 
+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
 
-public class CopyFileToContainerCmdImpl extends AbstrDockerCmd<CopyFileToContainerCmd, Void> implements CopyFileToContainerCmd {
+public class CopyArchiveToContainerCmdImpl extends AbstrDockerCmd<CopyArchiveToContainerCmd, Void> implements CopyArchiveToContainerCmd {
 
     private String containerId;
 
@@ -18,21 +19,21 @@ public class CopyFileToContainerCmdImpl extends AbstrDockerCmd<CopyFileToContain
 
     private boolean dirChildrenOnly = false;
 
-    public CopyFileToContainerCmdImpl(CopyFileToContainerCmd.Exec exec, String containerId, String hostResource) {
+    public CopyArchiveToContainerCmdImpl(CopyArchiveToContainerCmd.Exec exec, String containerId, String hostResource) {
         super(exec);
         withContainerId(containerId);
         withHostResource(hostResource);
     }
 
     @Override
-    public CopyFileToContainerCmd withContainerId(String containerId) {
+    public CopyArchiveToContainerCmd withContainerId(String containerId) {
         checkNotNull(containerId, "containerId was not specified");
         this.containerId = containerId;
         return this;
     }
 
     @Override
-    public CopyFileToContainerCmd withHostResource(String hostResource) {
+    public CopyArchiveToContainerCmd withHostResource(String hostResource) {
         checkNotNull(hostResource, "hostResource was not specified");
         this.hostResource = hostResource;
         return this;
@@ -54,13 +55,13 @@ public boolean isNoOverwriteDirNonDir() {
     }
 
     @Override
-    public CopyFileToContainerCmd withNoOverwriteDirNonDir(boolean noOverwriteDirNonDir) {
+    public CopyArchiveToContainerCmd withNoOverwriteDirNonDir(boolean noOverwriteDirNonDir) {
         this.noOverwriteDirNonDir = noOverwriteDirNonDir;
         return this;
     }
 
     @Override
-    public CopyFileToContainerCmd withRemotePath(String remotePath) {
+    public CopyArchiveToContainerCmd withRemotePath(String remotePath) {
         checkNotNull(remotePath, "remotePath was not specified");
         this.remotePath = remotePath;
         return this;
@@ -77,7 +78,7 @@ public boolean isDirChildrenOnly() {
     }
 
     @Override
-    public CopyFileToContainerCmd withDirChildrenOnly(boolean dirChildrenOnly) {
+    public CopyArchiveToContainerCmd withDirChildrenOnly(boolean dirChildrenOnly) {
         this.dirChildrenOnly = dirChildrenOnly;
         return this;
     }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java
similarity index 64%
rename from src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
rename to src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java
index 4dec7556e..c3fe175ee 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java
@@ -8,21 +8,21 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
 
-public class CopyFileFromContainerCmdExec extends AbstrSyncDockerCmdExec<CopyFileFromContainerCmd, InputStream>
-        implements CopyFileFromContainerCmd.Exec {
+public class CopyArchiveFromContainerCmdExec extends AbstrSyncDockerCmdExec<CopyArchiveFromContainerCmd, InputStream>
+        implements CopyArchiveFromContainerCmd.Exec {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CopyFileFromContainerCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CopyArchiveFromContainerCmdExec.class);
 
-    public CopyFileFromContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+    public CopyArchiveFromContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
         super(baseResource, dockerClientConfig);
     }
 
     @Override
-    protected InputStream execute(CopyFileFromContainerCmd command) {
+    protected InputStream execute(CopyArchiveFromContainerCmd command) {
         WebTarget webResource = getBaseResource().path("/containers/{id}/archive").resolveTemplate("id",
                 command.getContainerId());
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CopyFileToContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java
similarity index 70%
rename from src/main/java/com/github/dockerjava/jaxrs/CopyFileToContainerCmdExec.java
rename to src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java
index ca7c3d9b8..1866d196c 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CopyFileToContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java
@@ -13,27 +13,27 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.DockerClientException;
-import com.github.dockerjava.core.CompressArchiveUtil;
+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
+import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.command.CopyFileToContainerCmd;
+import com.github.dockerjava.core.util.CompressArchiveUtil;
 
-public class CopyFileToContainerCmdExec extends AbstrSyncDockerCmdExec<CopyFileToContainerCmd, Void> implements CopyFileToContainerCmd.Exec {
+public class CopyArchiveToContainerCmdExec extends AbstrSyncDockerCmdExec<CopyArchiveToContainerCmd, Void> implements CopyArchiveToContainerCmd.Exec {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CopyFileFromContainerCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CopyArchiveFromContainerCmdExec.class);
 
-    public CopyFileToContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+    public CopyArchiveToContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
         super(baseResource, dockerClientConfig);
     }
 
-    private InputStream buildUploadStream(CopyFileToContainerCmd command) throws IOException {
+    private InputStream buildUploadStream(CopyArchiveToContainerCmd command) throws IOException {
         Path toUpload = Files.createTempFile("docker-java", ".tar.gz");
         CompressArchiveUtil.tar(Paths.get(command.getHostResource()), toUpload, true, command.isDirChildrenOnly());
         return Files.newInputStream(toUpload);
     }
 
     @Override
-    protected Void execute(CopyFileToContainerCmd command) {
+    protected Void execute(CopyArchiveToContainerCmd command) {
         WebTarget webResource = getBaseResource().path("/containers/{id}/archive").resolveTemplate("id",
                 command.getContainerId());
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index b373d737a..bcb669f47 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -7,7 +7,7 @@
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.command.CommitCmd;
 import com.github.dockerjava.api.command.ContainerDiffCmd;
-import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
@@ -40,8 +40,7 @@
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.RemoteApiVersion;
-import com.github.dockerjava.core.command.CopyFileToContainerCmd;
+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 import com.github.dockerjava.jaxrs.connector.ApacheConnectorProvider;
 import com.github.dockerjava.jaxrs.filter.JsonClientFilter;
 import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter;
@@ -312,13 +311,13 @@ public LogContainerCmd.Exec createLogContainerCmdExec() {
     }
 
     @Override
-    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
-        return new CopyFileFromContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() {
+        return new CopyArchiveFromContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
-    public CopyFileToContainerCmd.Exec createCopyFileToContainerCmdExec() {
-        return new CopyFileToContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() {
+        return new CopyArchiveToContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index 5e9f18f06..528d99cec 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -11,7 +11,7 @@
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.command.CommitCmd;
 import com.github.dockerjava.api.command.ContainerDiffCmd;
-import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.CreateImageCmd;
@@ -46,7 +46,7 @@
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.BuildResponseItem;
-import com.github.dockerjava.core.command.CopyFileToContainerCmd;
+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 
 /**
  * Special {@link DockerCmdExecFactory} implementation that collects container and image creations while test execution
@@ -238,13 +238,13 @@ public LogContainerCmd.Exec createLogContainerCmdExec() {
     }
 
     @Override
-    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
-        return delegate.createCopyFileFromContainerCmdExec();
+    public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() {
+        return delegate.createCopyArchiveFromContainerCmdExec();
     }
 
     @Override
-    public CopyFileToContainerCmd.Exec createCopyFileToContainerCmdExec() {
-        return delegate.createCopyFileToContainerCmdExec();
+    public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() {
+        return delegate.createCopyArchiveToContainerCmdExec();
     }
 
     @Override
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImplTest.java
similarity index 88%
rename from src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
rename to src/test/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImplTest.java
index 3e4e88612..0f9da6058 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImplTest.java
@@ -19,7 +19,7 @@
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
 @Test(groups = "integration")
-public class CopyFileFromContainerCmdImplTest extends AbstractDockerClientTest {
+public class CopyArchiveFromContainerCmdImplTest extends AbstractDockerClientTest {
 
     @BeforeTest
     public void beforeTest() throws Exception {
@@ -52,7 +52,7 @@ public void copyFromContainer() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "/copyFromContainer").exec();
+        InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/copyFromContainer").exec();
         Boolean bytesAvailable = response.available() > 0;
         assertTrue(bytesAvailable, "The file was not copied from the container.");
 
@@ -65,7 +65,7 @@ public void copyFromContainer() throws Exception {
     @Test
     public void copyFromNonExistingContainer() throws Exception {
         try {
-            dockerClient.copyFileFromContainerCmd("non-existing", "/test").exec();
+            dockerClient.copyArchiveFromContainerCmd("non-existing", "/test").exec();
             fail("expected NotFoundException");
         } catch (NotFoundException ignored) {
         }
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyFileToContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
similarity index 82%
rename from src/test/java/com/github/dockerjava/core/command/CopyFileToContainerCmdImplTest.java
rename to src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
index 7bee960b4..77d35970b 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyFileToContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
@@ -18,7 +18,7 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
-public class CopyFileToContainerCmdImplTest extends AbstractDockerClientTest {
+public class CopyArchiveToContainerCmdImplTest extends AbstractDockerClientTest {
     @BeforeTest
     public void beforeTest() throws Exception {
         super.beforeTest();
@@ -50,8 +50,8 @@ public void copyToContainer() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        dockerClient.copyFileToContainerCmd(container.getId(), "src/test/resources/testReadFile").exec();
-        try (InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "testReadFile").exec()) {
+        dockerClient.copyArchiveToContainerCmd(container.getId(), "src/test/resources/testReadFile").exec();
+        try (InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "testReadFile").exec()) {
             boolean bytesAvailable = response.available() > 0;
             assertTrue(bytesAvailable, "The file was not copied to the container.");
         }
@@ -60,7 +60,7 @@ public void copyToContainer() throws Exception {
     @Test
     public void copyToNonExistingContainer() throws Exception {
         try {
-            dockerClient.copyFileFromContainerCmd("non-existing", "/test").exec();
+            dockerClient.copyArchiveFromContainerCmd("non-existing", "/test").exec();
             fail("expected NotFoundException");
         } catch (NotFoundException ignored) {
         }
diff --git a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
index 43aa49f0e..5144f2d4f 100644
--- a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
@@ -56,7 +56,7 @@ public void execStart() throws Exception {
                 .withAttachStdout(true).withCmd("touch", "/execStartTest.log").exec();
         dockerClient.execStartCmd(execCreateCmdResponse.getId()).exec();
 
-        InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "/execStartTest.log").exec();
+        InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec();
         Boolean bytesAvailable = response.available() > 0;
         assertTrue(bytesAvailable, "The file was not copied from the container.");
 
@@ -81,7 +81,7 @@ public void execStartAttached() throws Exception {
                 .withAttachStdout(true).withCmd("touch", "/execStartTest.log").exec();
         dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true).exec();
 
-        InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "/execStartTest.log").exec();
+        InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec();
         Boolean bytesAvailable = response.available() > 0;
         assertTrue(bytesAvailable, "The file was not copied from the container.");
 

From 6124775f91b2b8c2631ce7a71eead72dc63d6d8c Mon Sep 17 00:00:00 2001
From: VU Minh Khang <minh.khang.vu.mkv@gmail.com>
Date: Tue, 24 Nov 2015 00:30:25 +0100
Subject: [PATCH 0301/1272] Reset CopyFileFromContainerCmd for compatibility
 purpose

---
 .../github/dockerjava/api/DockerClient.java   |  5 +-
 .../api/command/CopyFileFromContainerCmd.java | 38 +++++++++
 .../api/command/DockerCmdExecFactory.java     |  2 +
 .../dockerjava/core/DockerClientImpl.java     |  8 ++
 .../command/CopyFileFromContainerCmdImpl.java | 77 +++++++++++++++++++
 .../core/util/CompressArchiveUtil.java        |  1 -
 .../core/{ => util}/TarDirWalker.java         |  8 +-
 .../jaxrs/CopyFileFromContainerCmdExec.java   | 38 +++++++++
 .../jaxrs/DockerCmdExecFactoryImpl.java       | 58 ++++++++------
 .../core/TestDockerCmdExecFactory.java        |  8 +-
 .../CopyArchiveToContainerCmdImplTest.java    |  2 +-
 .../CopyFileFromContainerCmdImplTest.java     | 73 ++++++++++++++++++
 12 files changed, 284 insertions(+), 34 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
 rename src/main/java/com/github/dockerjava/core/{ => util}/TarDirWalker.java (87%)
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 88c830ea7..81bd1957e 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -11,6 +11,8 @@
 import com.github.dockerjava.api.command.CommitCmd;
 import com.github.dockerjava.api.command.ContainerDiffCmd;
 import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
+import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.EventsCmd;
@@ -44,7 +46,6 @@
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Identifier;
-import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 
 // https://godoc.org/github.com/fsouza/go-dockerclient
 public interface DockerClient extends Closeable {
@@ -122,6 +123,8 @@ public interface DockerClient extends Closeable {
 
     public CopyArchiveFromContainerCmd copyArchiveFromContainerCmd(String containerId, String resource);
 
+    public CopyFileFromContainerCmd copyFileFromContainerCmd(String containerId, String resource);
+
     public CopyArchiveToContainerCmd copyArchiveToContainerCmd(String containerId, String hostResource);
 
     public ContainerDiffCmd containerDiffCmd(String containerId);
diff --git a/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
new file mode 100644
index 000000000..5ae9f6276
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
@@ -0,0 +1,38 @@
+package com.github.dockerjava.api.command;
+
+import java.io.InputStream;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+
+public interface CopyFileFromContainerCmd extends SyncDockerCmd<InputStream> {
+
+    @CheckForNull
+    public String getContainerId();
+
+    @CheckForNull
+    public String getHostPath();
+
+    @CheckForNull
+    public String getResource();
+
+    public CopyFileFromContainerCmd withContainerId(@Nonnull String containerId);
+
+    public CopyFileFromContainerCmd withHostPath(String hostPath);
+
+    public CopyFileFromContainerCmd withResource(@Nonnull String resource);
+
+    /**
+     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
+     *
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public InputStream exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdSyncExec<CopyFileFromContainerCmd, InputStream> {
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index a8f63ab52..f0b35f58f 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -55,6 +55,8 @@ public interface DockerCmdExecFactory extends Closeable {
 
     public LogContainerCmd.Exec createLogContainerCmdExec();
 
+    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec();
+
     public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec();
 
     public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec();
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 572b8e906..913cf0a4c 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -14,6 +14,7 @@
 import com.github.dockerjava.api.command.CommitCmd;
 import com.github.dockerjava.api.command.ContainerDiffCmd;
 import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
+import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
@@ -55,6 +56,7 @@
 import com.github.dockerjava.core.command.CopyArchiveFromContainerCmdImpl;
 import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 import com.github.dockerjava.core.command.CopyArchiveToContainerCmdImpl;
+import com.github.dockerjava.core.command.CopyFileFromContainerCmdImpl;
 import com.github.dockerjava.core.command.CreateContainerCmdImpl;
 import com.github.dockerjava.core.command.CreateImageCmdImpl;
 import com.github.dockerjava.core.command.EventsCmdImpl;
@@ -299,6 +301,12 @@ public LogContainerCmd logContainerCmd(String containerId) {
         return new LogContainerCmdImpl(getDockerCmdExecFactory().createLogContainerCmdExec(), containerId);
     }
 
+    @Override
+    public CopyFileFromContainerCmd copyFileFromContainerCmd(String containerId, String resource) {
+        return new CopyFileFromContainerCmdImpl(getDockerCmdExecFactory().createCopyFileFromContainerCmdExec(),
+                containerId, resource);
+    }
+
     @Override
     public CopyArchiveFromContainerCmd copyArchiveFromContainerCmd(String containerId, String resource) {
         return new CopyArchiveFromContainerCmdImpl(getDockerCmdExecFactory().createCopyArchiveFromContainerCmdExec(),
diff --git a/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
new file mode 100644
index 000000000..77a219170
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
@@ -0,0 +1,77 @@
+package com.github.dockerjava.core.command;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.io.InputStream;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+
+/**
+ *
+ * Copy files or folders from a container.
+ *
+ */
+public class CopyFileFromContainerCmdImpl extends AbstrDockerCmd<CopyFileFromContainerCmd, InputStream> implements
+        CopyFileFromContainerCmd {
+
+    private String containerId;
+
+    @JsonProperty("HostPath")
+    private String hostPath = ".";
+
+    @JsonProperty("Resource")
+    private String resource;
+
+    public CopyFileFromContainerCmdImpl(CopyFileFromContainerCmd.Exec exec, String containerId, String resource) {
+        super(exec);
+        withContainerId(containerId);
+        withResource(resource);
+    }
+
+    @Override
+    public String getContainerId() {
+        return containerId;
+    }
+
+    @Override
+    public String getResource() {
+        return resource;
+    }
+
+    @Override
+    public CopyFileFromContainerCmdImpl withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
+
+    @Override
+    public CopyFileFromContainerCmdImpl withResource(String resource) {
+        checkNotNull(resource, "resource was not specified");
+        this.resource = resource;
+        return this;
+    }
+
+    @Override
+    public String getHostPath() {
+        return hostPath;
+    }
+
+    @Override
+    public CopyFileFromContainerCmdImpl withHostPath(String hostPath) {
+        checkNotNull(hostPath, "hostPath was not specified");
+        this.hostPath = hostPath;
+        return this;
+    }
+
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public InputStream exec() throws NotFoundException {
+        return super.exec();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
index c5bf9f0be..8506a66e3 100644
--- a/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
+++ b/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
@@ -19,7 +19,6 @@
 import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
 import org.apache.commons.io.FileUtils;
 
-import com.github.dockerjava.core.TarDirWalker;
 import com.google.common.io.ByteStreams;
 
 public class CompressArchiveUtil {
diff --git a/src/main/java/com/github/dockerjava/core/TarDirWalker.java b/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
similarity index 87%
rename from src/main/java/com/github/dockerjava/core/TarDirWalker.java
rename to src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
index 091d9d3a6..927736af5 100644
--- a/src/main/java/com/github/dockerjava/core/TarDirWalker.java
+++ b/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
@@ -1,6 +1,4 @@
-package com.github.dockerjava.core;
-
-import static com.github.dockerjava.core.FilePathUtil.relativize;
+package com.github.dockerjava.core.util;
 
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
@@ -27,14 +25,14 @@ public TarDirWalker(Path basePath, TarArchiveOutputStream tarArchiveOutputStream
     @Override
     public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
         if (!dir.equals(basePath)) {
-            tarArchiveOutputStream.putArchiveEntry(new TarArchiveEntry(relativize(basePath, dir)));
+            tarArchiveOutputStream.putArchiveEntry(new TarArchiveEntry(FilePathUtil.relativize(basePath, dir)));
         }
         return FileVisitResult.CONTINUE;
     }
 
     @Override
     public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-        CompressArchiveUtil.putTarEntry(tarArchiveOutputStream, new TarArchiveEntry(relativize(basePath, file)), file);
+        CompressArchiveUtil.putTarEntry(tarArchiveOutputStream, new TarArchiveEntry(FilePathUtil.relativize(basePath, file)), file);
         return FileVisitResult.CONTINUE;
     }
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
new file mode 100644
index 000000000..10a719cbc
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
@@ -0,0 +1,38 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.InputStream;
+
+import static javax.ws.rs.client.Entity.entity;
+
+public class CopyFileFromContainerCmdExec extends AbstrSyncDockerCmdExec<CopyFileFromContainerCmd, InputStream>
+        implements CopyFileFromContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CopyFileFromContainerCmdExec.class);
+
+    public CopyFileFromContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected InputStream execute(CopyFileFromContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/copy").resolveTemplate("id",
+                command.getContainerId());
+
+        LOGGER.trace("POST: " + webResource.toString());
+
+        Response response = webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE)
+                .post(entity(command, MediaType.APPLICATION_JSON));
+
+        return new WrappedResponseInputStream(response);
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index bcb669f47..ba076848d 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -1,13 +1,38 @@
 package com.github.dockerjava.jaxrs;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.io.IOException;
+import java.net.URI;
+
+import javax.net.ssl.SSLContext;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.client.ClientResponseFilter;
+import javax.ws.rs.client.WebTarget;
+
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.glassfish.jersey.CommonProperties;
+import org.glassfish.jersey.apache.connector.ApacheClientProperties;
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.ClientProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
-import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd;
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.command.CommitCmd;
 import com.github.dockerjava.api.command.ContainerDiffCmd;
 import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
+import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
@@ -39,34 +64,12 @@
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 import com.github.dockerjava.jaxrs.connector.ApacheConnectorProvider;
 import com.github.dockerjava.jaxrs.filter.JsonClientFilter;
 import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter;
 import com.github.dockerjava.jaxrs.filter.SelectiveLoggingFilter;
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.glassfish.jersey.CommonProperties;
-import org.glassfish.jersey.apache.connector.ApacheClientProperties;
-import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.client.ClientProperties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.net.ssl.SSLContext;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.client.ClientResponseFilter;
-import javax.ws.rs.client.WebTarget;
-import java.io.IOException;
-import java.net.URI;
-
-import static com.google.common.base.Preconditions.checkNotNull;
 
 //import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 // see https://github.com/docker-java/docker-java/issues/196
@@ -174,7 +177,7 @@ public void init(DockerClientConfig dockerClientConfig) {
     }
 
     private org.apache.http.config.Registry<ConnectionSocketFactory> getSchemeRegistry(final URI originalUri,
-            SSLContext sslContext) {
+                                                                                       SSLContext sslContext) {
         RegistryBuilder<ConnectionSocketFactory> registryBuilder = RegistryBuilder.create();
         registryBuilder.register("http", PlainConnectionSocketFactory.getSocketFactory());
         if (sslContext != null) {
@@ -315,6 +318,11 @@ public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec()
         return new CopyArchiveFromContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
+        return new CopyFileFromContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() {
         return new CopyArchiveToContainerCmdExec(getBaseResource(), getDockerClientConfig());
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index 528d99cec..d1ff920b0 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -12,6 +12,8 @@
 import com.github.dockerjava.api.command.CommitCmd;
 import com.github.dockerjava.api.command.ContainerDiffCmd;
 import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
+import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.CreateImageCmd;
@@ -46,7 +48,6 @@
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.BuildResponseItem;
-import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 
 /**
  * Special {@link DockerCmdExecFactory} implementation that collects container and image creations while test execution
@@ -237,6 +238,11 @@ public LogContainerCmd.Exec createLogContainerCmdExec() {
         return delegate.createLogContainerCmdExec();
     }
 
+    @Override
+    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
+        return delegate.createCopyFileFromContainerCmdExec();
+    }
+
     @Override
     public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() {
         return delegate.createCopyArchiveFromContainerCmdExec();
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
index 77d35970b..dfc991526 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
@@ -14,8 +14,8 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
 public class CopyArchiveToContainerCmdImplTest extends AbstractDockerClientTest {
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
new file mode 100644
index 000000000..d073daf45
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
@@ -0,0 +1,73 @@
+package com.github.dockerjava.core.command;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.not;
+
+import java.io.InputStream;
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class CopyFileFromContainerCmdImplTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void copyFromContainer() throws Exception {
+        // TODO extract this into a shared method
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withName("docker-java-itest-copyFromContainer").withCmd("touch", "/copyFromContainer").exec();
+
+        LOG.info("Created container: {}", container);
+        assertThat(container.getId(), not(isEmptyOrNullString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "/copyFromContainer").exec();
+        Boolean bytesAvailable = response.available() > 0;
+        assertTrue(bytesAvailable, "The file was not copied from the container.");
+
+        // read the stream fully. Otherwise, the underlying stream will not be closed.
+        String responseAsString = asString(response);
+        assertNotNull(responseAsString);
+        assertTrue(responseAsString.length() > 0);
+    }
+
+    @Test
+    public void copyFromNonExistingContainer() throws Exception {
+        try {
+            dockerClient.copyFileFromContainerCmd("non-existing", "/test").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException ignored) {
+        }
+    }
+}
\ No newline at end of file

From e837b810592b2b39726148a7f0920b06f1b88ba2 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 24 Nov 2015 19:44:30 +0100
Subject: [PATCH 0302/1272] WIP

---
 .../api/command/InspectContainerResponse.java |   2 +-
 .../netty/DockerCmdExecFactoryImpl.java       |  24 +-
 .../dockerjava/netty/InvocationBuilder.java   | 344 +++++++++---------
 .../github/dockerjava/netty/WebTarget.java    | 106 +++---
 .../dockerjava/netty/exec/AuthCmdExec.java    |  10 +-
 .../netty/exec/CreateContainerCmdExec.java    |   4 +-
 .../netty/exec/ExecCreateCmdExec.java         |  32 +-
 .../dockerjava/netty/exec/InfoCmdExec.java    |  36 +-
 .../netty/exec/InspectContainerCmdExec.java   |  10 +-
 .../netty/exec/InspectExecCmdExec.java        |  12 +-
 .../netty/exec/InspectImageCmdExec.java       |   9 +-
 .../netty/exec/ListContainersCmdExec.java     |  21 +-
 .../netty/exec/RemoveContainerCmdExec.java    |   4 +-
 .../netty/exec/WaitContainerCmdExec.java      |   6 +-
 .../handler/AwaitObjectInboundHandler.java    |  39 --
 .../DeserializeJsonInboundHandler.java        |  32 --
 .../handler/FramedResponseStreamHandler.java  |  14 +
 .../netty/handler/HttpResponseHandler.java    |  82 +++--
 .../HttpResponseStreamInboundHandler.java     |  10 -
 ...ndHandler.java => JsonRequestHandler.java} |   2 +-
 .../handler/JsonResponseCallbackHandler.java  |  47 +++
 .../netty/handler/JsonResponseHandler.java    |  62 ++++
 .../client/AbstractDockerClientTest.java      |   3 +-
 .../netty/AbstractDockerClientTest.java       |   8 +
 .../exec/CreateContainerCmdExecTest.java      |   7 -
 .../exec/InspectContainerCmdExecTest.java     |  81 +++++
 .../netty/exec/ListContainersCmdExecTest.java | 171 +++++++++
 .../netty/exec/LogContainerCmdExecTest.java   |   2 +-
 .../netty/exec/WaitContainerCmdExecTest.java  |   2 +
 29 files changed, 769 insertions(+), 413 deletions(-)
 delete mode 100644 src/main/java/com/github/dockerjava/netty/handler/AwaitObjectInboundHandler.java
 delete mode 100644 src/main/java/com/github/dockerjava/netty/handler/DeserializeJsonInboundHandler.java
 rename src/main/java/com/github/dockerjava/netty/handler/{SerializeJsonOutboundHandler.java => JsonRequestHandler.java} (87%)
 create mode 100644 src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/handler/JsonResponseHandler.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java

diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index e37e28471..cedbc826e 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -126,7 +126,7 @@ public String getResolvConfPath() {
 
     @JsonIgnore
     public VolumeBind[] getVolumes() {
-        return volumes.getBinds();
+        return volumes == null ? new VolumeBind[0]: volumes.getBinds();
     }
 
     @JsonIgnore
diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
index 6c97055fb..37d2534c5 100644
--- a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
@@ -68,10 +68,12 @@
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.command.ExecCreateCmdImpl;
 import com.github.dockerjava.core.command.ExecStartCmdImpl;
 import com.github.dockerjava.core.command.ExecStartResultCallback;
+import com.github.dockerjava.core.command.InfoCmdImpl;
 import com.github.dockerjava.netty.exec.AuthCmdExec;
 import com.github.dockerjava.netty.exec.CopyFileFromContainerCmdExec;
 import com.github.dockerjava.netty.exec.CreateContainerCmdExec;
@@ -82,6 +84,7 @@
 import com.github.dockerjava.netty.exec.InspectExecCmdExec;
 import com.github.dockerjava.netty.exec.InspectImageCmdExec;
 import com.github.dockerjava.netty.exec.KillContainerCmdExec;
+import com.github.dockerjava.netty.exec.ListContainersCmdExec;
 import com.github.dockerjava.netty.exec.LogContainerCmdExec;
 import com.github.dockerjava.netty.exec.RemoveContainerCmdExec;
 import com.github.dockerjava.netty.exec.StartContainerCmdExec;
@@ -327,8 +330,7 @@ public InspectImageCmd.Exec createInspectImageCmdExec() {
 
     @Override
     public ListContainersCmd.Exec createListContainersCmdExec() {
-        return null; // new ListContainersCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new ListContainersCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
@@ -481,15 +483,15 @@ public static void main(String[] args) throws IOException {
 
         execFactory.init(config);
 
-        // InfoCmd.Exec exec = execFactory.createInfoCmdExec();
-        //
-        // InfoCmd infoCmd = new InfoCmdImpl(exec);
-        //
-        // Info info = infoCmd.exec();
-        //
-        // System.out.println("result: " + info);
-        //
-        // infoCmd.close();
+        InfoCmd.Exec exec = execFactory.createInfoCmdExec();
+
+        InfoCmd infoCmd = new InfoCmdImpl(exec);
+
+        Info info = infoCmd.exec();
+
+        System.out.println("result: " + info);
+
+        infoCmd.close();
 
         ExecCreateCmd.Exec execCreate = execFactory.createExecCmdExec();
 
diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
index a2cfeb827..943875270 100644
--- a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
+++ b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
@@ -2,6 +2,8 @@
 
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
 import io.netty.handler.codec.http.DefaultFullHttpRequest;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpClientCodec;
@@ -10,11 +12,11 @@
 import io.netty.handler.codec.http.HttpHeaderValues;
 import io.netty.handler.codec.http.HttpMethod;
 import io.netty.handler.codec.http.HttpRequest;
-import io.netty.handler.codec.http.HttpResponse;
 import io.netty.handler.codec.http.HttpVersion;
 import io.netty.handler.codec.json.JsonObjectDecoder;
 
 import java.io.BufferedReader;
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -22,33 +24,42 @@
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.BadRequestException;
-import com.github.dockerjava.api.ConflictException;
-import com.github.dockerjava.api.DockerException;
-import com.github.dockerjava.api.InternalServerErrorException;
-import com.github.dockerjava.api.NotAcceptableException;
-import com.github.dockerjava.api.NotFoundException;
-import com.github.dockerjava.api.NotModifiedException;
-import com.github.dockerjava.api.UnauthorizedException;
 import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.model.Container;
 import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.netty.handler.AwaitObjectInboundHandler;
-import com.github.dockerjava.netty.handler.DeserializeJsonInboundHandler;
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
 import com.github.dockerjava.netty.handler.FramedResponseStreamHandler;
 import com.github.dockerjava.netty.handler.HttpConnectionHijackHandler;
 import com.github.dockerjava.netty.handler.HttpRequestProvider;
 import com.github.dockerjava.netty.handler.HttpResponseHandler;
 import com.github.dockerjava.netty.handler.HttpResponseStreamInboundHandler;
+import com.github.dockerjava.netty.handler.JsonResponseCallbackHandler;
 
 public class InvocationBuilder {
 
+    public class ResponseCallback<T> extends ResultCallbackTemplate<ResponseCallback<T>, T> {
+
+        private T result = null;
+
+        public T awaitResult() {
+            try {
+                awaitCompletion();
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+            return result;
+        }
+
+        @Override
+        public void onNext(T object) {
+            result = object;
+        }
+    }
+
     private ChannelProvider channelProvider;
 
     private String resource;
@@ -65,98 +76,120 @@ public InvocationBuilder accept(MediaType mediaType) {
         return this;
     }
 
-    public <T> T get(Class<T> resultType) {
+    public ResponseCallback<Void> delete() {
 
-        HttpRequestProvider requestProvider = httpGetRequestProvider();
+        HttpRequestProvider requestProvider = httpDeleteRequestProvider();
 
-        Channel channel = channelProvider.getChannel();
+        ResponseCallback<Void> callback = new ResponseCallback<Void>();
 
-        AwaitObjectInboundHandler<T> awaitObject = new AwaitObjectInboundHandler<T>(resultType);
+        HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, callback);
 
-        HttpResponseHandler responseHandler = new HttpResponseHandler();
+        Channel channel = getChannel();
 
         channel.pipeline().addLast(responseHandler);
-        channel.pipeline().addLast(new JsonObjectDecoder());
-        channel.pipeline().addLast(new DeserializeJsonInboundHandler<T>(resultType));
-        channel.pipeline().addLast(awaitObject);
-
-        sendRequestAndHandleResponse(requestProvider, channel, responseHandler);
 
-        return awaitObject.await();
+        sendRequestAndHandleResponse(requestProvider, channel);
 
+        return callback;
     }
 
-    private void sendRequestAndHandleResponse(HttpRequestProvider requestProvider, Channel channel,
-            HttpResponseHandler responseHandler) {
+    public void get(ResultCallback<Frame> resultCallback) {
+
+        HttpRequestProvider requestProvider = httpGetRequestProvider();
+
+        HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
+
+        FramedResponseStreamHandler streamHandler = new FramedResponseStreamHandler(resultCallback);
+
+        Channel channel = getChannel();
 
-        channel.writeAndFlush(requestProvider.getHttpRequest(resource));
+        channel.pipeline().addLast(responseHandler);
+        channel.pipeline().addLast(streamHandler);
 
-        handleResponse(channel, responseHandler, requestProvider);
+        sendRequestAndHandleResponse(requestProvider, channel);
     }
 
-    private HttpRequestProvider httpGetRequestProvider() {
-        return new HttpRequestProvider() {
-            @Override
-            public HttpRequest getHttpRequest(String uri) {
-                return prepareGetRequest(uri);
-            }
-        };
+    public <T> ResponseCallback<T> get(TypeReference<T> typeReference) {
+
+        ResponseCallback<T> callback = new ResponseCallback<T>();
+
+        get(typeReference, callback);
+
+        return callback;
     }
 
-    public void get(ResultCallback<Frame> resultCallback) {
+    public <T> void get(TypeReference<T> typeReference, ResultCallback<T> resultCallback) {
 
         HttpRequestProvider requestProvider = httpGetRequestProvider();
 
-        HttpResponseHandler responseHandler = new HttpResponseHandler();
+        Channel channel = getChannel();
 
-        FramedResponseStreamHandler streamHandler = new FramedResponseStreamHandler(resultCallback);
+        resultCallbackOnStart(channel, resultCallback);
 
-        Channel channel = channelProvider.getChannel();
+        JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<T>(typeReference,
+                resultCallback);
+
+        HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
 
         channel.pipeline().addLast(responseHandler);
-        channel.pipeline().addLast(streamHandler);
+        channel.pipeline().addLast(new JsonObjectDecoder());
+        channel.pipeline().addLast(jsonResponseHandler);
 
-        sendRequestAndHandleResponse(requestProvider, channel, responseHandler);
-    }
+        sendRequestAndHandleResponse(requestProvider, channel);
 
-    private FullHttpRequest prepareGetRequest(String uri) {
+        return;
+    }
 
-        FullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, uri);
+    private Channel getChannel() {
+        Channel channel = channelProvider.getChannel();
 
-        setDefaultHeaders(request);
+        return channel;
+    }
 
-        return request;
+    private HttpRequestProvider httpDeleteRequestProvider() {
+        return new HttpRequestProvider() {
+            @Override
+            public HttpRequest getHttpRequest(String uri) {
+                return prepareDeleteRequest(uri);
+            }
+        };
     }
 
-    private void setDefaultHeaders(HttpRequest request) {
-        request.headers().set(HttpHeaderNames.HOST, "");
-        request.headers().set(HttpHeaderNames.CONNECTION, HttpHeaderValues.KEEP_ALIVE);
-        request.headers().set(HttpHeaderNames.ACCEPT_ENCODING, HttpHeaderValues.GZIP);
+    private HttpRequestProvider httpGetRequestProvider() {
+        return new HttpRequestProvider() {
+            @Override
+            public HttpRequest getHttpRequest(String uri) {
+                return prepareGetRequest(uri);
+            }
+        };
+    }
 
-        for (Map.Entry<String, String> entry : headers.entrySet()) {
-            request.headers().set((CharSequence) entry.getKey(), entry.getValue());
-        }
+    private HttpRequestProvider httpPostRequestProvider(final Object entity) {
+        return new HttpRequestProvider() {
+            @Override
+            public HttpRequest getHttpRequest(String uri) {
+                return preparePostRequest(uri, entity);
+            }
+        };
     }
 
-    public <T> T post(final Object entity, Class<T> resultType) {
+    public InputStream post(final Object entity) {
 
         HttpRequestProvider requestProvider = httpPostRequestProvider(entity);
 
-        AwaitObjectInboundHandler<T> awaitObject = new AwaitObjectInboundHandler<T>(resultType);
+        Channel channel = getChannel();
 
-        Channel channel = channelProvider.getChannel();
+        ResponseCallback<Void> callback = new ResponseCallback<Void>();
 
-        HttpResponseHandler responseHandler = new HttpResponseHandler();
+        HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, callback);
+        HttpResponseStreamInboundHandler streamHandler = new HttpResponseStreamInboundHandler();
 
         channel.pipeline().addLast(responseHandler);
-        channel.pipeline().addLast(new JsonObjectDecoder());
-        channel.pipeline().addLast(new DeserializeJsonInboundHandler<T>(resultType));
-        channel.pipeline().addLast(awaitObject);
-
-        sendRequestAndHandleResponse(requestProvider, channel, responseHandler);
+        channel.pipeline().addLast(streamHandler);
 
-        return awaitObject.await();
+        sendRequestAndHandleResponse(requestProvider, channel);
 
+        return streamHandler.getInputStream();
     }
 
     public void post(final Object entity, final InputStream stdin, ResultCallback<Frame> resultCallback) {
@@ -165,9 +198,9 @@ public void post(final Object entity, final InputStream stdin, ResultCallback<Fr
 
         FramedResponseStreamHandler streamHandler = new FramedResponseStreamHandler(resultCallback);
 
-        final Channel channel = channelProvider.getChannel();
+        final Channel channel = getChannel();
 
-        HttpResponseHandler responseHandler = new HttpResponseHandler();
+        HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
 
         HttpConnectionHijackHandler hijackHandler = new HttpConnectionHijackHandler(responseHandler);
 
@@ -175,7 +208,7 @@ public void post(final Object entity, final InputStream stdin, ResultCallback<Fr
                 new HttpClientUpgradeHandler(new HttpClientCodec(), hijackHandler, Integer.MAX_VALUE));
         channel.pipeline().addLast(streamHandler);
 
-        sendRequestAndHandleResponse(requestProvider, channel, responseHandler);
+        sendRequestAndHandleResponse(requestProvider, channel);
 
         // wait for successful http upgrade procedure
         hijackHandler.await();
@@ -183,6 +216,14 @@ public void post(final Object entity, final InputStream stdin, ResultCallback<Fr
         // now we can start a new thread that reads from stdin and writes to the channel
         new Thread(new Runnable() {
 
+            private int read(BufferedReader reader) {
+                try {
+                    return reader.read();
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+
             @Override
             public void run() {
 
@@ -200,56 +241,72 @@ public void run() {
                     channel.writeAndFlush(Unpooled.copiedBuffer(bytes));
                 }
             }
+        }).start();
+    }
 
-            private int read(BufferedReader reader) {
+    public <T> T post(final Object entity, TypeReference<T> typeReference) {
+
+        ResponseCallback<T> callback = new ResponseCallback<T>();
+
+        post(entity, typeReference, callback);
+
+        return callback.awaitResult();
+    }
+
+    public <T> void post(final Object entity, TypeReference<T> typeReference, final ResultCallback<T> resultCallback) {
+
+        HttpRequestProvider requestProvider = httpPostRequestProvider(entity);
+
+        Channel channel = getChannel();
+
+        resultCallbackOnStart(channel, resultCallback);
+
+        JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<T>(typeReference,
+                resultCallback);
+
+        HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
+
+        channel.pipeline().addLast(responseHandler);
+        channel.pipeline().addLast(new JsonObjectDecoder());
+        channel.pipeline().addLast(jsonResponseHandler);
+
+        sendRequestAndHandleResponse(requestProvider, channel);
+
+        return;
+    }
+
+    private <T> void resultCallbackOnStart(final Channel channel, final ResultCallback<T> resultCallback) {
+        Closeable closeable = new Closeable() {
+            @Override
+            public void close() throws IOException {
                 try {
-                    return reader.read();
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
+                    System.err.println("closing channel");
+                    channel.close().sync();
+                } catch (InterruptedException e) {
+                    resultCallback.onError(e);
                 }
             }
-        }).start();
+        };
 
+        resultCallback.onStart(closeable);
     }
 
-    private void handleResponse(final Channel channel, HttpResponseHandler responseHandler,
-            HttpRequestProvider requestProvider) {
-        HttpResponse response = responseHandler.awaitResponse();
-
-        switch (response.status().code()) {
-        case 101:
-        case 200:
-        case 201:
-        case 204:
-            break;
-        case 301:
-        case 302:
-            if (response.headers().contains(HttpHeaderNames.LOCATION)) {
-                String location = response.headers().get(HttpHeaderNames.LOCATION);
-                System.out.println("redirected to :" + location);
-                HttpRequest redirected = requestProvider.getHttpRequest(location);
-
-                channel.writeAndFlush(redirected);
-            }
-            break;
-        case 304:
-            throw new NotModifiedException(responseHandler.awaitErrorBody());
-        case 400:
-            throw new BadRequestException(responseHandler.awaitErrorBody());
-        case 401:
-            throw new UnauthorizedException(responseHandler.awaitErrorBody());
-        case 404:
-            throw new NotFoundException(responseHandler.awaitErrorBody());
-        case 406:
-            throw new NotAcceptableException(responseHandler.awaitErrorBody());
-        case 409:
-            throw new ConflictException(responseHandler.awaitErrorBody());
-        case 500:
-            throw new InternalServerErrorException(responseHandler.awaitErrorBody());
-        default:
-            throw new DockerException(responseHandler.awaitErrorBody(), response.status().code());
-        }
+    private HttpRequest prepareDeleteRequest(String uri) {
+
+        FullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.DELETE, uri);
+
+        setDefaultHeaders(request);
+
+        return request;
+    }
+
+    private FullHttpRequest prepareGetRequest(String uri) {
+
+        FullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, uri);
+
+        setDefaultHeaders(request);
 
+        return request;
     }
 
     private HttpRequest preparePostRequest(String uri, Object entity) {
@@ -276,65 +333,28 @@ private HttpRequest preparePostRequest(String uri, Object entity) {
         return request;
     }
 
-    private HttpRequest prepareDeleteRequest(String uri) {
-
-        FullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.DELETE, uri);
-
-        setDefaultHeaders(request);
+    private void sendRequestAndHandleResponse(HttpRequestProvider requestProvider, Channel channel) {
 
-        return request;
-    }
+        ChannelFuture channelFuture = channel.writeAndFlush(requestProvider.getHttpRequest(resource));
 
-    public InputStream post(final Object entity) {
-
-        HttpRequestProvider requestProvider = httpPostRequestProvider(entity);
-
-        Channel channel = channelProvider.getChannel();
-
-        HttpResponseHandler responseHandler = new HttpResponseHandler();
-        HttpResponseStreamInboundHandler streamHandler = new HttpResponseStreamInboundHandler();
-
-        channel.pipeline().addLast(responseHandler);
-        channel.pipeline().addLast(streamHandler);
-
-        sendRequestAndHandleResponse(requestProvider, channel, responseHandler);
-
-        return streamHandler.getInputStream();
-    }
-
-    private HttpRequestProvider httpPostRequestProvider(final Object entity) {
-        return new HttpRequestProvider() {
+        channelFuture.addListener(new ChannelFutureListener() {
             @Override
-            public HttpRequest getHttpRequest(String uri) {
-                return preparePostRequest(uri, entity);
-            }
-        };
-    }
-
-    public void delete() {
-
-        HttpRequestProvider requestProvider = httpDeleteRequestProvider();
-
-        HttpResponseHandler responseHandler = new HttpResponseHandler();
-
-        Channel channel = channelProvider.getChannel();
-
-        channel.pipeline().addLast(responseHandler);
-
-        sendRequestAndHandleResponse(requestProvider, channel, responseHandler);
-    }
+            public void operationComplete(ChannelFuture future) throws Exception {
+                if (future.isSuccess()) {
+                    System.err.println("Request success");
+                }
 
-    private HttpRequestProvider httpDeleteRequestProvider() {
-        return new HttpRequestProvider() {
-            @Override
-            public HttpRequest getHttpRequest(String uri) {
-                return prepareDeleteRequest(uri);
             }
-        };
+        });
     }
 
-    public <T> T get(TypeReference<T> typeReference) {
-        Class<T> clazz = (Class<T>) typeReference.getType().getClass();
-        return null;
-    }
+    private void setDefaultHeaders(HttpRequest request) {
+        request.headers().set(HttpHeaderNames.HOST, "");
+        request.headers().set(HttpHeaderNames.CONNECTION, HttpHeaderValues.KEEP_ALIVE);
+        request.headers().set(HttpHeaderNames.ACCEPT_ENCODING, HttpHeaderValues.GZIP);
+
+        for (Map.Entry<String, String> entry : headers.entrySet()) {
+            request.headers().set((CharSequence) entry.getKey(), entry.getValue());
+        }
+    };
 }
diff --git a/src/main/java/com/github/dockerjava/netty/WebTarget.java b/src/main/java/com/github/dockerjava/netty/WebTarget.java
index 7c8970d33..d4af90786 100644
--- a/src/main/java/com/github/dockerjava/netty/WebTarget.java
+++ b/src/main/java/com/github/dockerjava/netty/WebTarget.java
@@ -11,59 +11,59 @@
 import io.netty.channel.Channel;
 
 public class WebTarget {
-	
-	private ChannelProvider channelProvider;
-	
-	private List<String> path = new ArrayList<String>();
-	
-	private Map<String, String> queryParams = new HashMap<String, String>();
-	
-	private static String PATH_SEPARATOR = "/";
-	
-	public WebTarget(ChannelProvider channelProvider) {
-		this.channelProvider = channelProvider;
-	}
-	
-	public WebTarget path(String... components) {
-		
-		for(String component : components) {
-			
-			path.addAll(Arrays.asList(StringUtils.split(component, PATH_SEPARATOR)));
-		}
-		
-		return this;
-	}
-	
-	public InvocationBuilder request() {
-		String resource = PATH_SEPARATOR + StringUtils.join(path, PATH_SEPARATOR);
-		
-		List<String> params = new ArrayList<String>();
-		for(Map.Entry<String, String> entry : queryParams.entrySet()) {
-			params.add(entry.getKey() + "=" + entry.getValue());
-		}
-		
-		if(!params.isEmpty()) {
-			resource = resource + "?" + StringUtils.join(params, "&");
-		}
-		
-		return new InvocationBuilder(channelProvider, resource);
-	}
-	
-	public WebTarget resolveTemplate(String name, Object value) {
-		List<String> newPath = new ArrayList<String>();
-		for(String component : path) {
-			component = component.replaceAll("\\{" + name + "\\}", value.toString());
-			newPath.add(component);
-		}
-		path = newPath;
-		return this;
-	}
-	
-	public WebTarget queryParam(String name, Object value) {
-		queryParams.put(name, value.toString());
-		return this;
-	}
-	
 
+    private ChannelProvider channelProvider;
+
+    private List<String> path = new ArrayList<String>();
+
+    private Map<String, String> queryParams = new HashMap<String, String>();
+
+    private static String PATH_SEPARATOR = "/";
+
+    public WebTarget(ChannelProvider channelProvider) {
+        this.channelProvider = channelProvider;
+    }
+
+    public WebTarget path(String... components) {
+
+        for (String component : components) {
+
+            path.addAll(Arrays.asList(StringUtils.split(component, PATH_SEPARATOR)));
+        }
+
+        return this;
+    }
+
+    public InvocationBuilder request() {
+        String resource = PATH_SEPARATOR + StringUtils.join(path, PATH_SEPARATOR);
+
+        List<String> params = new ArrayList<String>();
+        for (Map.Entry<String, String> entry : queryParams.entrySet()) {
+            params.add(entry.getKey() + "=" + entry.getValue());
+        }
+
+        if (!params.isEmpty()) {
+            resource = resource + "?" + StringUtils.join(params, "&");
+        }
+
+        return new InvocationBuilder(channelProvider, resource);
+    }
+
+    public WebTarget resolveTemplate(String name, Object value) {
+        List<String> newPath = new ArrayList<String>();
+        for (String component : path) {
+            component = component.replaceAll("\\{" + name + "\\}", value.toString());
+            newPath.add(component);
+        }
+        path = newPath;
+        return this;
+    }
+
+    public WebTarget queryParam(String name, Object value) {
+        if (value != null) {
+            queryParams.put(name, value.toString());
+        }
+        return this;
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/AuthCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/AuthCmdExec.java
index ed6c9cb7a..b6f004940 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/AuthCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/AuthCmdExec.java
@@ -3,6 +3,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.AuthCmd;
 import com.github.dockerjava.api.model.AuthResponse;
 import com.github.dockerjava.core.DockerClientConfig;
@@ -22,13 +23,8 @@ protected AuthResponse execute(AuthCmd command) {
         WebTarget webResource = getBaseResource().path("/auth");
         LOGGER.trace("POST: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(command.getAuthConfig(), AuthResponse.class);
-
-//        if (response.getStatus() == 401) {
-//            throw new UnauthorizedException("Unauthorized");
-//        }
-//
-//        return response.readEntity(AuthResponse.class);
+                .post(command.getAuthConfig(), new TypeReference<AuthResponse>() {
+                });
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CreateContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/CreateContainerCmdExec.java
index bf858349b..3a5e75d60 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/CreateContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/CreateContainerCmdExec.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.netty.exec;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.CreateContainerCmd.Exec;
@@ -29,7 +30,8 @@ protected CreateContainerResponse execute(CreateContainerCmd command) {
 
         LOGGER.trace("POST: {} ", webResource);
         return webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(command, CreateContainerResponse.class);
+                .post(command, new TypeReference<CreateContainerResponse>() {
+                });
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ExecCreateCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ExecCreateCmdExec.java
index 78f788f3f..17af370a9 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ExecCreateCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ExecCreateCmdExec.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.netty.exec;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.ExecCreateCmd;
 import com.github.dockerjava.api.command.ExecCreateCmdResponse;
 import com.github.dockerjava.api.command.ExecCreateCmd.Exec;
@@ -11,23 +12,24 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ExecCreateCmdExec extends AbstrSyncDockerCmdExec<ExecCreateCmd, ExecCreateCmdResponse>
-		implements ExecCreateCmd.Exec {
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(ExecCreateCmdExec.class);
+public class ExecCreateCmdExec extends AbstrSyncDockerCmdExec<ExecCreateCmd, ExecCreateCmdResponse> implements
+        ExecCreateCmd.Exec {
 
-	public ExecCreateCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-		super(baseResource, dockerClientConfig);
-	}
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExecCreateCmdExec.class);
 
-	@Override
-	protected ExecCreateCmdResponse execute(ExecCreateCmd command) {
-		WebTarget webResource = getBaseResource().path("/containers/{id}/exec").resolveTemplate("id",
-				command.getContainerId());
+    public ExecCreateCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
 
-		LOGGER.trace("POST: {}", webResource);
+    @Override
+    protected ExecCreateCmdResponse execute(ExecCreateCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/exec").resolveTemplate("id",
+                command.getContainerId());
 
-		return webResource.request().accept(MediaType.APPLICATION_JSON)
-				.post(command, ExecCreateCmdResponse.class);
-	}
+        LOGGER.trace("POST: {}", webResource);
+
+        return webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(command, new TypeReference<ExecCreateCmdResponse>() {
+                });
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InfoCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/InfoCmdExec.java
index 5a41073a4..1db090ae6 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/InfoCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/InfoCmdExec.java
@@ -3,41 +3,37 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.InfoCmd;
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.netty.WebTarget;
 
 /**
- * http://stackoverflow.com/questions/33296749/netty-connect-to-unix-domain-
- * socket-failed http://netty.io/wiki/native-transports.html
- * https://github.com/netty/netty/blob/master/example/src/main/java/io/netty/
- * example/http/snoop/HttpSnoopClient.java
+ * http://stackoverflow.com/questions/33296749/netty-connect-to-unix-domain- socket-failed
+ * http://netty.io/wiki/native-transports.html
+ * https://github.com/netty/netty/blob/master/example/src/main/java/io/netty/ example/http/snoop/HttpSnoopClient.java
  *
  * @author marcus
  *
  */
 public class InfoCmdExec implements InfoCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(InfoCmdExec.class);
-
-	private WebTarget webResource;
-
-	private DockerClientConfig dockerClientConfig;
-
-	public InfoCmdExec(WebTarget webResource, DockerClientConfig dockerClientConfig) {
-		this.webResource = webResource;
-		this.dockerClientConfig = dockerClientConfig;
-	}
-
-
-	@Override
-	public Info exec(InfoCmd command) {
-		return webResource.path("info").request().get(Info.class);
-	}
+    private static final Logger LOGGER = LoggerFactory.getLogger(InfoCmdExec.class);
 
+    private WebTarget webResource;
 
+    private DockerClientConfig dockerClientConfig;
 
+    public InfoCmdExec(WebTarget webResource, DockerClientConfig dockerClientConfig) {
+        this.webResource = webResource;
+        this.dockerClientConfig = dockerClientConfig;
+    }
 
+    @Override
+    public Info exec(InfoCmd command) {
+        return webResource.path("info").request().get(new TypeReference<Info>() {
+        }).awaitResult();
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/InspectContainerCmdExec.java
index 6490ddd7f..85b391a20 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/InspectContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/InspectContainerCmdExec.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.netty.exec;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectContainerResponse;
@@ -7,9 +10,6 @@
 import com.github.dockerjava.netty.MediaType;
 import com.github.dockerjava.netty.WebTarget;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class InspectContainerCmdExec extends AbstrSyncDockerCmdExec<InspectContainerCmd, InspectContainerResponse>
         implements InspectContainerCmd.Exec {
 
@@ -25,7 +25,9 @@ protected InspectContainerResponse execute(InspectContainerCmd command) {
                 command.getContainerId());
 
         LOGGER.debug("GET: {}", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectContainerResponse.class);
+        return webResource.request().accept(MediaType.APPLICATION_JSON)
+                .get(new TypeReference<InspectContainerResponse>() {
+                }).awaitResult();
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectExecCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/InspectExecCmdExec.java
index 470df9c2c..aac395d32 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/InspectExecCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/InspectExecCmdExec.java
@@ -1,14 +1,15 @@
 package com.github.dockerjava.netty.exec;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectExecResponse;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.netty.MediaType;
 import com.github.dockerjava.netty.WebTarget;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class InspectExecCmdExec extends AbstrSyncDockerCmdExec<InspectExecCmd, InspectExecResponse> implements
         InspectExecCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(InspectExecCmdExec.class);
@@ -20,7 +21,10 @@ public InspectExecCmdExec(WebTarget baseResource, DockerClientConfig dockerClien
     @Override
     protected InspectExecResponse execute(InspectExecCmd command) {
         WebTarget webResource = getBaseResource().path("/exec/{id}/json").resolveTemplate("id", command.getExecId());
+
         LOGGER.debug("GET: {}", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectExecResponse.class);
+
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<InspectExecResponse>() {
+        }).awaitResult();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/InspectImageCmdExec.java
index 0092b5ff9..b6f42414d 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/InspectImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/InspectImageCmdExec.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.netty.exec;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectImageResponse;
@@ -7,9 +10,6 @@
 import com.github.dockerjava.netty.MediaType;
 import com.github.dockerjava.netty.WebTarget;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class InspectImageCmdExec extends AbstrSyncDockerCmdExec<InspectImageCmd, InspectImageResponse> implements
         InspectImageCmd.Exec {
 
@@ -24,8 +24,9 @@ protected InspectImageResponse execute(InspectImageCmd command) {
         WebTarget webResource = getBaseResource().path("/images/{id}/json").resolveTemplate("id", command.getImageId());
 
         LOGGER.trace("GET: {}", webResource);
+
         return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<InspectImageResponse>() {
-        });
+        }).awaitResult();
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
index 0f35c84e3..fe08c507d 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
@@ -1,5 +1,12 @@
 package com.github.dockerjava.netty.exec;
 
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.model.Container;
@@ -7,15 +14,6 @@
 import com.github.dockerjava.netty.MediaType;
 import com.github.dockerjava.netty.WebTarget;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-
-import javax.ws.rs.core.GenericType;
-
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
 public class ListContainersCmdExec extends AbstrSyncDockerCmdExec<ListContainersCmd, List<Container>> implements
         ListContainersCmd.Exec {
 
@@ -43,8 +41,11 @@ protected List<Container> execute(ListContainersCmd command) {
         }
 
         LOGGER.trace("GET: {}", webTarget);
+
         List<Container> containers = webTarget.request().accept(MediaType.APPLICATION_JSON)
-                .get(new TypeReference<List<Container>>() {});
+                .get(new TypeReference<List<Container>>() {
+                }).awaitResult();
+
         LOGGER.trace("Response: {}", containers);
 
         return containers;
diff --git a/src/main/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExec.java
index ff4a2240e..46f8e5d21 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExec.java
@@ -25,9 +25,7 @@ protected Void execute(RemoveContainerCmd command) {
         webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled());
 
         LOGGER.trace("DELETE: {}", webTarget);
-        webTarget.request().accept(MediaType.APPLICATION_JSON).delete();
-
-        return null;
+        return webTarget.request().accept(MediaType.APPLICATION_JSON).delete().awaitResult();
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/WaitContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/WaitContainerCmdExec.java
index f4f0076f3..d6e5eb0f6 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/WaitContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/WaitContainerCmdExec.java
@@ -3,15 +3,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.WaitResponse;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.async.JsonStreamProcessor;
 import com.github.dockerjava.netty.MediaType;
 import com.github.dockerjava.netty.WebTarget;
 
-
 public class WaitContainerCmdExec extends AbstrAsyncDockerCmdExec<WaitContainerCmd, WaitResponse> implements
         WaitContainerCmd.Exec {
 
@@ -28,7 +27,8 @@ protected Void execute0(WaitContainerCmd command, ResultCallback<WaitResponse> r
 
         LOGGER.trace("POST: {}", webTarget);
 
-        webTarget.request().accept(MediaType.APPLICATION_JSON).post(null, WaitResponse.class);
+        webTarget.request().accept(MediaType.APPLICATION_JSON).post(null, new TypeReference<WaitResponse>() {
+        }, resultCallback);
 
         return null;
     }
diff --git a/src/main/java/com/github/dockerjava/netty/handler/AwaitObjectInboundHandler.java b/src/main/java/com/github/dockerjava/netty/handler/AwaitObjectInboundHandler.java
deleted file mode 100644
index 543fc095b..000000000
--- a/src/main/java/com/github/dockerjava/netty/handler/AwaitObjectInboundHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.github.dockerjava.netty.handler;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-
-import java.util.concurrent.CountDownLatch;
-
-public class AwaitObjectInboundHandler<T> extends SimpleChannelInboundHandler<T> {
-
-    public AwaitObjectInboundHandler(Class<T> clazz) {
-        super(clazz);
-    }
-
-    private CountDownLatch countDownLatch = new CountDownLatch(1);
-
-    private T object;
-
-    @Override
-    protected void channelRead0(ChannelHandlerContext ctx, T msg) throws Exception {
-        object = msg;
-        countDownLatch.countDown();
-    }
-
-    public T await() {
-        try {
-            countDownLatch.await();
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-        return object;
-    }
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        cause.printStackTrace();
-        ctx.close();
-    }
-
-}
diff --git a/src/main/java/com/github/dockerjava/netty/handler/DeserializeJsonInboundHandler.java b/src/main/java/com/github/dockerjava/netty/handler/DeserializeJsonInboundHandler.java
deleted file mode 100644
index 994169a36..000000000
--- a/src/main/java/com/github/dockerjava/netty/handler/DeserializeJsonInboundHandler.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.github.dockerjava.netty.handler;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-
-public class DeserializeJsonInboundHandler<T> extends SimpleChannelInboundHandler<ByteBuf>{
-
-	private Class<T> clazz;
-
-	public DeserializeJsonInboundHandler(Class<T> clazz) {
-		this.clazz = clazz;
-	}
-
-	@Override
-	protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
-		byte[] buffer = new byte[msg.readableBytes()];
-		msg.readBytes(buffer);
-
-		T object = null;
-		try {
-			object = new ObjectMapper().readValue(buffer, clazz);
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-
-		ctx.fireChannelRead(object);
-	}
-}
diff --git a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
index 7907a62b5..8a3a7f1d3 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
@@ -2,8 +2,10 @@
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.util.concurrent.GenericFutureListener;
 
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.model.Frame;
@@ -47,8 +49,20 @@ protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Excep
 
 		} while (frame != null);
 
+
+//		ctx.channel().closeFuture().addListener(new GenericFutureListener<ChannelFuture>() {
+//
+//            @Override
+//            public void operationComplete(ChannelFuture future) throws Exception {
+//                System.err.println("channel closed");
+//                resultCallback.onComplete();
+//            }
+//        });
+
 	}
 
+
+
 	private int read(byte[] buf, int offset, int length) {
 		length = Math.min(rawBuffer.readableBytes(), length);
 		rawBuffer.readBytes(buf, offset, length);
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
index 0b1007869..548c13697 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
@@ -5,25 +5,39 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpObject;
+import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponse;
 import io.netty.handler.codec.http.LastHttpContent;
 
 import java.nio.charset.Charset;
 import java.util.concurrent.CountDownLatch;
 
+import com.github.dockerjava.api.BadRequestException;
+import com.github.dockerjava.api.ConflictException;
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.InternalServerErrorException;
+import com.github.dockerjava.api.NotAcceptableException;
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.NotModifiedException;
+import com.github.dockerjava.api.UnauthorizedException;
+import com.github.dockerjava.api.async.ResultCallback;
+
 public class HttpResponseHandler extends SimpleChannelInboundHandler<HttpObject> {
 
     private HttpResponse response;
 
     private ByteBuf errorBody = Unpooled.buffer();
 
-    private CountDownLatch responseLatch = new CountDownLatch(1);
+    private HttpRequestProvider requestProvider;
 
-    private CountDownLatch errorBodyLatch = new CountDownLatch(1);
+    private ResultCallback<?> resultCallback;
 
-    public HttpResponseHandler() {
+    public HttpResponseHandler(HttpRequestProvider requestProvider, ResultCallback<?> resultCallback) {
         super(false);
+        this.requestProvider = requestProvider;
+        this.resultCallback = resultCallback;
     }
 
     @Override
@@ -31,8 +45,6 @@ protected void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Ex
         if (msg instanceof HttpResponse) {
 
             response = (HttpResponse) msg;
-            responseLatch.countDown();
-
         } else if (msg instanceof HttpContent) {
 
             HttpContent content = (HttpContent) msg;
@@ -50,7 +62,47 @@ protected void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Ex
             }
 
             if (content instanceof LastHttpContent) {
-                errorBodyLatch.countDown();
+                try {
+
+                    switch (response.status().code()) {
+                    case 101:
+                    case 200:
+                    case 201:
+                    case 204:
+                        break;
+                    case 301:
+                    case 302:
+                        if (response.headers().contains(HttpHeaderNames.LOCATION)) {
+                            String location = response.headers().get(HttpHeaderNames.LOCATION);
+                            System.out.println("redirected to :" + location);
+                            HttpRequest redirected = requestProvider.getHttpRequest(location);
+
+                            ctx.channel().writeAndFlush(redirected);
+                        }
+                        break;
+                    case 304:
+                        throw new NotModifiedException(getBodyAsMessage(errorBody));
+                    case 400:
+                        throw new BadRequestException(getBodyAsMessage(errorBody));
+                    case 401:
+                        throw new UnauthorizedException(getBodyAsMessage(errorBody));
+                    case 404:
+                        throw new NotFoundException(getBodyAsMessage(errorBody));
+                    case 406:
+                        throw new NotAcceptableException(getBodyAsMessage(errorBody));
+                    case 409:
+                        throw new ConflictException(getBodyAsMessage(errorBody));
+                    case 500:
+                        throw new InternalServerErrorException(getBodyAsMessage(errorBody));
+                    default:
+                        throw new DockerException(getBodyAsMessage(errorBody), response.status().code());
+                    }
+                } catch (Throwable e) {
+                    resultCallback.onError(e);
+                } finally {
+                    System.err.println("LastHttpContent");
+                    resultCallback.onComplete();
+                }
             }
         } else {
             System.err.println("UNKNOWN");
@@ -62,22 +114,4 @@ private String getBodyAsMessage(ByteBuf body) {
         return body.readBytes(body.readableBytes()).toString(Charset.forName("UTF-8"));
     }
 
-    public HttpResponse awaitResponse() {
-        try {
-            responseLatch.await();
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-        return response;
-    }
-
-    public String awaitErrorBody() {
-        try {
-            errorBodyLatch.await();
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-        return getBodyAsMessage(errorBody);
-    }
-
 }
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamInboundHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamInboundHandler.java
index 2f9974c16..f2a66c202 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamInboundHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamInboundHandler.java
@@ -6,21 +6,16 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedTransferQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class HttpResponseStreamInboundHandler extends SimpleChannelInboundHandler<ByteBuf> {
 
-    private CountDownLatch latch = new CountDownLatch(1);
-
     private HttpResponseInputStream stream = new HttpResponseInputStream();
 
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
-
-        latch.countDown();
         stream.write(msg.copy());
     }
 
@@ -37,11 +32,6 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
     }
 
     public InputStream getInputStream() {
-        try {
-            latch.await();
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
         return stream;
     }
 
diff --git a/src/main/java/com/github/dockerjava/netty/handler/SerializeJsonOutboundHandler.java b/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
similarity index 87%
rename from src/main/java/com/github/dockerjava/netty/handler/SerializeJsonOutboundHandler.java
rename to src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
index 4505c02a9..d797ba188 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/SerializeJsonOutboundHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
@@ -6,7 +6,7 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
 
-public class SerializeJsonOutboundHandler extends MessageToByteEncoder<Object>{
+public class JsonRequestHandler extends MessageToByteEncoder<Object>{
 	
 	private ObjectMapper mapper = new ObjectMapper();
 
diff --git a/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java b/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
new file mode 100644
index 000000000..e6b1ef3a8
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
@@ -0,0 +1,47 @@
+package com.github.dockerjava.netty.handler;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.async.ResultCallback;
+
+public class JsonResponseCallbackHandler<T> extends SimpleChannelInboundHandler<ByteBuf> {
+
+    private static ObjectMapper objectMapper = new ObjectMapper();
+
+    private TypeReference<T> typeReference;
+
+    private ResultCallback<T> callback;
+
+    public JsonResponseCallbackHandler(TypeReference<T> typeReference, ResultCallback<T> callback) {
+        this.typeReference = typeReference;
+        this.callback = callback;
+    }
+
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
+        byte[] buffer = new byte[msg.readableBytes()];
+        msg.readBytes(buffer);
+
+        T object = null;
+
+        try {
+            object = objectMapper.readValue(buffer, typeReference);
+        } catch (Exception e) {
+            callback.onError(e);
+            throw new RuntimeException(e);
+        }
+
+        callback.onNext(object);
+        callback.close();
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        callback.onError(cause);
+        ctx.close();
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/handler/JsonResponseHandler.java b/src/main/java/com/github/dockerjava/netty/handler/JsonResponseHandler.java
new file mode 100644
index 000000000..efbd74f1f
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/handler/JsonResponseHandler.java
@@ -0,0 +1,62 @@
+package com.github.dockerjava.netty.handler;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+
+import java.util.concurrent.CountDownLatch;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class JsonResponseHandler<T> extends SimpleChannelInboundHandler<ByteBuf> {
+
+    private static ObjectMapper objectMapper = new ObjectMapper();
+
+    private TypeReference<T> typeReference;
+
+    private CountDownLatch countDownLatch = new CountDownLatch(1);
+
+    private T object;
+
+    public JsonResponseHandler(TypeReference<T> typeReference) {
+        this.typeReference = typeReference;
+    }
+
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
+        System.err.println("AwaitObjectInboundHandler: channelRead0: " + msg);
+        byte[] buffer = new byte[msg.readableBytes()];
+        msg.readBytes(buffer);
+
+        try {
+            object = objectMapper.readValue(buffer, typeReference);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        countDownLatch.countDown();
+    }
+
+    @Override
+    public void channelReadComplete(ChannelHandlerContext ctx) throws Exception {
+        System.err.println("AwaitObjectInboundHandler: channelReadComplete");
+        super.channelReadComplete(ctx);
+    }
+
+    public T await() {
+        try {
+            countDownLatch.await();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        return object;
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        cause.printStackTrace();
+        ctx.close();
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index ec4aa82be..81149c741 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -199,7 +199,8 @@ public static class LogContainerTestCallback extends LogContainerResultCallback
         @Override
         public void onNext(Frame frame) {
             log.append(new String(frame.getPayload()));
-            super.onNext(frame);
+            System.err.println("LogContainerTestCallback: " + log.toString());
+            //super.onNext(frame);
         }
 
         @Override
diff --git a/src/test/java/com/github/dockerjava/netty/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/netty/AbstractDockerClientTest.java
index b9a914593..e178362a2 100644
--- a/src/test/java/com/github/dockerjava/netty/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/netty/AbstractDockerClientTest.java
@@ -206,6 +206,14 @@ public void onNext(Frame frame) {
         public String toString() {
             return log.toString();
         }
+
+        @Override
+        public LogContainerResultCallback awaitCompletion() throws InterruptedException {
+            LogContainerResultCallback result =  super.awaitCompletion();
+            System.err.println("awaitCompletion returned");
+
+            return result;
+        }
     }
 
     protected String buildImage(File baseDir) throws Exception {
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
index 43400edfc..2660aff5a 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
@@ -230,13 +230,6 @@ public void createContainerWithName() throws DockerException {
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
         assertThat(inspectContainerResponse.getName(), equalTo("/container"));
-
-        try {
-            dockerClient.createContainerCmd("busybox").withName("container").withCmd("env").exec();
-            fail("Expected ConflictException");
-        } catch (ConflictException e) {
-        }
-
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
new file mode 100644
index 000000000..dde8b3ab9
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
@@ -0,0 +1,81 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+import java.lang.reflect.Method;
+import java.security.SecureRandom;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.ExecCreateCmdResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.command.InspectExecResponse;
+import com.github.dockerjava.core.command.ExecStartResultCallback;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
+
+@Test(groups = "integration")
+public class InspectContainerCmdExecTest extends AbstractDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(InspectContainerCmdExecTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test()
+    public void inspectContainer() throws DockerException {
+
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
+                .withName(containerName).exec();
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(container.getId()).exec();
+        assertEquals(containerInfo.getId(), container.getId());
+
+    }
+
+    @Test
+    public void inspectNonExistingContainer() throws DockerException {
+
+        try {
+            dockerClient.inspectContainerCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java
new file mode 100644
index 000000000..3f97aa69d
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java
@@ -0,0 +1,171 @@
+package com.github.dockerjava.netty.exec;
+
+import static ch.lambdaj.Lambda.filter;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.startsWith;
+import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Map;
+
+import org.hamcrest.Matcher;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.api.model.Filters;
+import com.github.dockerjava.core.command.PullImageResultCallback;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+import com.google.common.collect.ImmutableMap;
+
+@Test(groups = "integration")
+public class ListContainersCmdExecTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    public void testListContainers() throws Exception {
+
+        String testImage = "busybox";
+
+//        // need to block until image is pulled completely
+//        dockerClient.pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess();
+
+        List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
+        assertThat(containers, notNullValue());
+        LOG.info("Container List: {}", containers);
+
+        int size = containers.size();
+
+        CreateContainerResponse container1 = dockerClient.createContainerCmd(testImage).withCmd("echo").exec();
+
+        assertThat(container1.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container1.getId()).exec();
+
+        assertThat(inspectContainerResponse.getConfig().getImage(), is(equalTo(testImage)));
+
+        dockerClient.startContainerCmd(container1.getId()).exec();
+
+        LOG.info("container id: " + container1.getId());
+
+        List<Container> containers2 = dockerClient.listContainersCmd().withShowAll(true).exec();
+
+        for (Container container : containers2) {
+            LOG.info("listContainer: id=" + container.getId() + " image=" + container.getImage());
+        }
+
+        assertThat(size + 1, is(equalTo(containers2.size())));
+        Matcher matcher = hasItem(hasField("id", startsWith(container1.getId())));
+        assertThat(containers2, matcher);
+
+        List<Container> filteredContainers = filter(hasField("id", startsWith(container1.getId())), containers2);
+        assertThat(filteredContainers.size(), is(equalTo(1)));
+
+        for (Container container : filteredContainers) {
+            LOG.info("filteredContainer: " + container);
+        }
+
+        Container container2 = filteredContainers.get(0);
+        assertThat(container2.getCommand(), not(isEmptyString()));
+        assertThat(container2.getImage(), startsWith(testImage));
+    }
+
+    @Test
+    public void testListContainersWithLabelsFilter() throws Exception {
+
+        String testImage = "busybox";
+
+        // need to block until image is pulled completely
+        dockerClient.pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitCompletion();
+
+        List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
+        assertThat(containers, notNullValue());
+        LOG.info("Container List: {}", containers);
+
+        int size = containers.size();
+
+        CreateContainerResponse container1 = dockerClient.createContainerCmd(testImage).withCmd("echo").exec();
+
+        assertThat(container1.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container1.getId()).exec();
+
+        assertThat(inspectContainerResponse.getConfig().getImage(), is(equalTo(testImage)));
+
+        dockerClient.startContainerCmd(container1.getId()).exec();
+
+        LOG.info("container id: " + container1.getId());
+
+        List<Container> containers2 = dockerClient.listContainersCmd().withShowAll(true).exec();
+
+        for (Container container : containers2) {
+            LOG.info("listContainer: id=" + container.getId() + " image=" + container.getImage());
+        }
+
+        assertThat(size + 1, is(equalTo(containers2.size())));
+        Matcher matcher = hasItem(hasField("id", startsWith(container1.getId())));
+        assertThat(containers2, matcher);
+
+        List<Container> filteredContainers = filter(hasField("id", startsWith(container1.getId())), containers2);
+        assertThat(filteredContainers.size(), is(equalTo(1)));
+
+        for (Container container : filteredContainers) {
+            LOG.info("filteredContainer: " + container);
+        }
+
+        Container container2 = filteredContainers.get(0);
+        assertThat(container2.getCommand(), not(isEmptyString()));
+        assertThat(container2.getImage(), startsWith(testImage));
+
+        Map<String, String> labels = ImmutableMap.of("test", "docker-java");
+
+        // list with filter by label
+        dockerClient.createContainerCmd(testImage).withCmd("echo").withLabels(labels).exec();
+        filteredContainers = dockerClient.listContainersCmd().withShowAll(true)
+                .withFilters(new Filters().withLabels(labels)).exec();
+        assertThat(filteredContainers.size(), is(equalTo(1)));
+        Container container3 = filteredContainers.get(0);
+        assertThat(container3.getCommand(), not(isEmptyString()));
+        assertThat(container3.getImage(), startsWith(testImage));
+
+        filteredContainers = dockerClient.listContainersCmd().withShowAll(true)
+                .withFilters(new Filters().withLabels("test")).exec();
+        assertThat(filteredContainers.size(), is(equalTo(1)));
+        container3 = filteredContainers.get(0);
+        assertThat(container3.getCommand(), not(isEmptyString()));
+        assertThat(container3.getImage(), startsWith(testImage));
+        assertEquals(container3.getLabels(), labels);
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/LogContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/LogContainerCmdExecTest.java
index a9a48dc58..98c1043e1 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/LogContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/LogContainerCmdExecTest.java
@@ -17,8 +17,8 @@
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
 import com.github.dockerjava.core.command.WaitContainerResultCallback;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
 
 @Test(groups = "integration")
 public class LogContainerCmdExecTest extends AbstractDockerClientTest {
diff --git a/src/test/java/com/github/dockerjava/netty/exec/WaitContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/WaitContainerCmdExecTest.java
index ba1dd518e..d28f45224 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/WaitContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/WaitContainerCmdExecTest.java
@@ -96,6 +96,8 @@ public void testWaitContainerAbort() throws Exception {
 
         Thread.sleep(5000);
 
+        System.err.println("closing callback");
+
         callback.close();
 
         dockerClient.killContainerCmd(container.getId()).exec();

From f85b59d3aefc4ae6f162fde075f118e03f245c52 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 24 Nov 2015 19:49:41 +0100
Subject: [PATCH 0303/1272] Renamed networStats to network

---
 .../java/com/github/dockerjava/api/model/Statistics.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/Statistics.java b/src/main/java/com/github/dockerjava/api/model/Statistics.java
index c4daf0573..ff08056c4 100644
--- a/src/main/java/com/github/dockerjava/api/model/Statistics.java
+++ b/src/main/java/com/github/dockerjava/api/model/Statistics.java
@@ -30,7 +30,7 @@ public class Statistics {
      */
     @Deprecated
     @JsonProperty("network")
-    private Map<String, Object> networkStats;
+    private Map<String, Object> network;
 
     @JsonProperty("memory_stats")
     private Map<String, Object> memoryStats;
@@ -53,8 +53,8 @@ public Map<String, Object> getNetworks() {
      * @deprecated as of Docker Remote API 1.21, replaced by {@link #getNetworks()}
      */
     @Deprecated
-    public Map<String, Object> getNetworkStats() {
-        return networkStats;
+    public Map<String, Object> getNetwork() {
+        return network;
     }
 
     public Map<String, Object> getCpuStats() {

From b0538819b13e70cbb1e60b1e2d2a352b10381bbb Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 24 Nov 2015 20:25:56 +0100
Subject: [PATCH 0304/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50f95f871..9201a7683 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
 Change Log
+
+2.1.3-SNAPSHOT
+---
+* [#362] (https://github.com/docker-java/docker-java/pull/362) Deprecate "network" and enable "networks" stats (remote Docker API 1.21) 
+
 ===
 v2.1.2
 ---

From fabfb01ea4a24d80fd7a5436abd74e96f2572893 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 24 Nov 2015 20:26:19 +0100
Subject: [PATCH 0305/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9201a7683..62b2e65bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
 Change Log
-
+===
 2.1.3-SNAPSHOT
 ---
 * [#362] (https://github.com/docker-java/docker-java/pull/362) Deprecate "network" and enable "networks" stats (remote Docker API 1.21) 

From 609cf6e239032c98ceecbc71eaa8de9d6cc1bbfd Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 24 Nov 2015 20:31:18 +0100
Subject: [PATCH 0306/1272] Fix changelog

---
 CHANGELOG.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35849bbbd..110dcb9fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 Change Log
 ===
-Latest SNAPSHOT (3.0.0-SNAPSHOT)
+
+3.0.0-SNAPSHOT
 ---
 Notes
 
@@ -8,10 +9,15 @@ Notes
 
 All changes
 
+* [#362] (https://github.com/docker-java/docker-java/pull/362) Deprecate "network" and enable "networks" stats (remote Docker API 1.21) 
 * [#359] (https://github.com/docker-java/docker-java/pull/359) Fix performance issue of build command by adding bulk-read variant of InputStream.read()
 * [#357] (https://github.com/docker-java/docker-java/pull/357) Wait container command needs possibility to abort operation
 * [#313] (https://github.com/docker-java/docker-java/pull/313) Refactor primitive type fields to be of object type in JSON objects
 
+2.1.3-SNAPSHOT
+---
+* [#362] (https://github.com/docker-java/docker-java/pull/362) Deprecate "network" and enable "networks" stats (remote Docker API 1.21) 
+
 v2.1.2
 ---
 * [#350] (https://github.com/docker-java/docker-java/pull/350) Remove ServiceLoader logic

From 570fa096b681993dc99a987ed526d7c9b08dd2b7 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 24 Nov 2015 20:40:36 +0100
Subject: [PATCH 0307/1272] Fix potential NullpointerExceptions

---
 .../dockerjava/api/command/InspectContainerResponse.java | 4 ++--
 .../dockerjava/client/AbstractDockerClientTest.java      | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index e37e28471..38e0b58f3 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -126,12 +126,12 @@ public String getResolvConfPath() {
 
     @JsonIgnore
     public VolumeBind[] getVolumes() {
-        return volumes.getBinds();
+        return volumes == null ? null : volumes.getBinds();
     }
 
     @JsonIgnore
     public VolumeRW[] getVolumesRW() {
-        return volumesRW.getVolumesRW();
+        return volumesRW == null ? null : volumesRW.getVolumesRW();
     }
 
     public String getHostnamePath() {
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 76409ebbc..2fd228b9f 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -178,12 +178,13 @@ public static Boolean available(int port) {
      */
     public static void assertContainerHasVolumes(InspectContainerResponse inspectContainerResponse,
             Volume... expectedVolumes) {
-        VolumeBind[] volumeBinds = inspectContainerResponse.getVolumes();
-        LOG.info("Inspect .Volumes = [{}]", Joiner.on(", ").join(volumeBinds));
 
         List<Volume> volumes = new ArrayList<Volume>();
-        for (VolumeBind bind : volumeBinds) {
-            volumes.add(new Volume(bind.getContainerPath()));
+        VolumeBind[] volumeBinds = inspectContainerResponse.getVolumes();
+        if (volumeBinds != null) {
+            for (VolumeBind bind : volumeBinds) {
+                volumes.add(new Volume(bind.getContainerPath()));
+            }
         }
         assertThat(volumes, contains(expectedVolumes));
     }

From 0f654699e04985c2c129be1442798f6edbb600cc Mon Sep 17 00:00:00 2001
From: VU Minh Khang <minh.khang.vu.mkv@gmail.com>
Date: Fri, 27 Nov 2015 22:52:12 +0100
Subject: [PATCH 0308/1272] Fix formatting rules

---
 .../github/dockerjava/api/DockerClient.java   | 25 +++++++++++++++++++
 .../command/CopyArchiveFromContainerCmd.java  |  2 +-
 .../command/CopyArchiveToContainerCmd.java    |  4 ---
 .../command/CopyFileFromContainerCmdImpl.java |  2 +-
 .../dockerjava/core/util/FilePathUtil.java    | 12 ++++++---
 5 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 81bd1957e..9ee8e0aea 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -121,10 +121,35 @@ public interface DockerClient extends Closeable {
 
     public LogContainerCmd logContainerCmd(String containerId);
 
+    /**
+     * Copy resource from container to local machine.
+     * Since docker API version 1.20 and above.
+     *
+     * @param containerId id of the container
+     * @param resource    path to container's resource
+     * @return created command
+     */
     public CopyArchiveFromContainerCmd copyArchiveFromContainerCmd(String containerId, String resource);
 
+    /**
+     * Copy resource from container to local machine.
+     * Deprecated, since docker API version 1.20 and above use copyArchiveFromContainerCmd instead.
+     *
+     * @param containerId id of the container
+     * @param resource    path to container's resource
+     * @return created command
+     */
+    @Deprecated
     public CopyFileFromContainerCmd copyFileFromContainerCmd(String containerId, String resource);
 
+    /**
+     * Copy archive from local machine to remote container
+     * Since docker API version 1.20 and above.
+     *
+     * @param containerId  id of the container
+     * @param hostResource path to container's resource
+     * @return created command
+     */
     public CopyArchiveToContainerCmd copyArchiveToContainerCmd(String containerId, String hostResource);
 
     public ContainerDiffCmd containerDiffCmd(String containerId);
diff --git a/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java
index 1bb8cf617..56b24d24d 100644
--- a/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java
@@ -35,4 +35,4 @@ public interface CopyArchiveFromContainerCmd extends SyncDockerCmd<InputStream>
 
     public static interface Exec extends DockerCmdSyncExec<CopyArchiveFromContainerCmd, InputStream> {
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
index 6fbad5eff..c21f76fa6 100644
--- a/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
@@ -16,7 +16,6 @@ public interface CopyArchiveToContainerCmd extends SyncDockerCmd<Void> {
      * Set container's id
      *
      * @param containerId id of the container to copy file to
-     * @return this
      */
     public CopyArchiveToContainerCmd withContainerId(String containerId);
 
@@ -24,7 +23,6 @@ public interface CopyArchiveToContainerCmd extends SyncDockerCmd<Void> {
      * Set path to the resource on the host machine
      *
      * @param resource path to the resource on the host machine
-     * @return this
      */
     public CopyArchiveToContainerCmd withHostResource(String resource);
 
@@ -32,7 +30,6 @@ public interface CopyArchiveToContainerCmd extends SyncDockerCmd<Void> {
      * If set to true then it will be an error if unpacking the given content would cause an existing directory to be replaced with a non-directory and vice versa
      *
      * @param noOverwriteDirNonDir flag to know if non directory can be overwritten
-     * @return this
      */
     public CopyArchiveToContainerCmd withNoOverwriteDirNonDir(boolean noOverwriteDirNonDir);
 
@@ -43,7 +40,6 @@ public interface CopyArchiveToContainerCmd extends SyncDockerCmd<Void> {
      * dirChildrenOnly = false will create /var/data/root/titi and /var/data/root/tata
      *
      * @param dirChildrenOnly if root directory is ignored
-     * @return this
      */
     public CopyArchiveToContainerCmd withDirChildrenOnly(boolean dirChildrenOnly);
 
diff --git a/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
index 77a219170..93c7e807c 100644
--- a/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
@@ -74,4 +74,4 @@ public CopyFileFromContainerCmdImpl withHostPath(String hostPath) {
     public InputStream exec() throws NotFoundException {
         return super.exec();
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/core/util/FilePathUtil.java b/src/main/java/com/github/dockerjava/core/util/FilePathUtil.java
index 402991559..d5e14ed0d 100644
--- a/src/main/java/com/github/dockerjava/core/util/FilePathUtil.java
+++ b/src/main/java/com/github/dockerjava/core/util/FilePathUtil.java
@@ -14,8 +14,10 @@ private FilePathUtil() {
     /**
      * Return the relative path. Path elements are separated with / char.
      *
-     * @param baseDir a parent directory of {@code file}
-     * @param file    the file to get the relative path
+     * @param baseDir
+     *            a parent directory of {@code file}
+     * @param file
+     *            the file to get the relative path
      * @return the relative path
      */
     public static String relativize(File baseDir, File file) {
@@ -32,8 +34,10 @@ public static String relativize(File baseDir, File file) {
     /**
      * Return the relative path. Path elements are separated with / char.
      *
-     * @param baseDir a parent directory of {@code file}
-     * @param file    the file to get the relative path
+     * @param baseDir
+     *            a parent directory of {@code file}
+     * @param file
+     *            the file to get the relative path
      * @return the relative path
      */
     public static String relativize(Path baseDir, Path file) {

From f0dc0c7b3241b726e2cf736f0c28f60abe4931c4 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 29 Nov 2015 13:53:04 +0100
Subject: [PATCH 0309/1272] Added missing exec implementations as well as
 appropriate tests

---
 .../dockerjava/api/command/ExecCreateCmd.java |   2 +
 .../dockerjava/api/command/ExecStartCmd.java  |   6 +-
 .../core/async/ResultCallbackTemplate.java    |   1 +
 .../core/command/ExecCreateCmdImpl.java       |   3 +
 .../core/command/ExecStartCmdImpl.java        |  19 +
 .../core/dockerfile/Dockerfile.java           |  11 +-
 .../netty/DockerCmdExecFactoryImpl.java       |  88 ++-
 .../dockerjava/netty/InvocationBuilder.java   | 124 +++-
 .../github/dockerjava/netty/WebTarget.java    |   2 -
 .../netty/exec/AbstrAsyncDockerCmdExec.java   |  10 +-
 .../netty/exec/AttachContainerCmdExec.java    |  39 ++
 .../netty/exec/BuildImageCmdExec.java         |  93 +++
 .../dockerjava/netty/exec/CommitCmdExec.java  |  36 ++
 .../netty/exec/ContainerDiffCmdExec.java      |  34 ++
 .../netty/exec/CreateContainerCmdExec.java    |   8 +-
 .../netty/exec/CreateImageCmdExec.java        |  31 +
 .../dockerjava/netty/exec/EventsCmdExec.java  |  41 ++
 .../netty/exec/ExecStartCmdExec.java          |  10 +-
 .../netty/exec/ListImagesCmdExec.java         |  45 ++
 .../netty/exec/PauseContainerCmdExec.java     |  31 +
 .../dockerjava/netty/exec/PingCmdExec.java    |  28 +
 .../netty/exec/PullImageCmdExec.java          |  46 ++
 .../netty/exec/PushImageCmdExec.java          |  48 ++
 .../netty/exec/RemoveImageCmdExec.java        |  31 +
 .../netty/exec/RestartContainerCmdExec.java   |  36 ++
 .../netty/exec/SaveImageCmdExec.java          |  28 +
 .../netty/exec/SearchImagesCmdExec.java       |  33 ++
 .../netty/exec/StartContainerCmdExec.java     |   8 +-
 .../dockerjava/netty/exec/StatsCmdExec.java   |  33 ++
 .../netty/exec/TagImageCmdExec.java           |  30 +
 .../netty/exec/TopContainerCmdExec.java       |  36 ++
 .../netty/exec/UnpauseContainerCmdExec.java   |  31 +
 .../dockerjava/netty/exec/VersionCmdExec.java |  30 +
 .../netty/exec/WaitContainerCmdExec.java      |   2 +-
 .../handler/FramedResponseStreamHandler.java  | 163 +++---
 .../handler/HttpConnectionHijackHandler.java  |  67 +--
 .../netty/handler/HttpResponseHandler.java    |   7 -
 ...er.java => HttpResponseStreamHandler.java} |  18 +-
 .../netty/handler/JsonRequestHandler.java     |   7 +-
 .../handler/JsonResponseCallbackHandler.java  |   1 -
 .../exec/AttachContainerCmdExecTest.java      | 122 ++++
 .../netty/exec/BuildImageCmdExecTest.java     | 296 ++++++++++
 .../netty/exec/CommitCmdExecTest.java         |  80 +++
 .../netty/exec/ContainerDiffCmdExecTest.java  |  80 +++
 .../CopyFileFromContainerCmdExecTest.java     |  73 +++
 .../netty/exec/EventsCmdExecTest.java         | 162 +++++
 .../netty/exec/ExecStartCmdExecTest.java      |  49 ++
 .../exec/InspectContainerCmdExecTest.java     |   6 -
 .../netty/exec/InspectExecCmdExecTest.java    |  18 +-
 .../netty/exec/ListContainersCmdExecTest.java |   4 +-
 .../netty/exec/ListImagesCmdExecTest.java     | 102 ++++
 .../netty/exec/PingCmdExecTest.java           |  43 ++
 .../netty/exec/PullImageCmdExecTest.java      | 119 ++++
 .../netty/exec/PushImageCmdExecTest.java      |  79 +++
 .../exec/RemoveContainerCmdExecTest.java      |  81 +++
 .../netty/exec/RemoveImageCmdExecTest.java    |  88 +++
 .../exec/RestartContainerCmdExecTest.java     |  84 +++
 .../netty/exec/SaveImageCmdExecTest.java      |  55 ++
 .../netty/exec/SearchImagesCmdExecTest.java   |  59 ++
 .../netty/exec/StartContainerCmdExecTest.java | 553 ++++++++++++++++++
 .../netty/exec/StatsCmdExecTest.java          | 106 ++++
 .../netty/exec/TagImageCmdExecTest.java       |  63 ++
 .../netty/exec/VersionCmdExecTest.java        |  52 ++
 63 files changed, 3443 insertions(+), 248 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/AttachContainerCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/CommitCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/CreateImageCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/EventsCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/PauseContainerCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/PingCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/PullImageCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/PushImageCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/RemoveImageCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/RestartContainerCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/SaveImageCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/SearchImagesCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/StatsCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/TagImageCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/TopContainerCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/UnpauseContainerCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/VersionCmdExec.java
 rename src/main/java/com/github/dockerjava/netty/handler/{HttpResponseStreamInboundHandler.java => HttpResponseStreamHandler.java} (87%)
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/PingCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/PullImageCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/PushImageCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/RemoveImageCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/RestartContainerCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/SaveImageCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/SearchImagesCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/StatsCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/TagImageCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/VersionCmdExecTest.java

diff --git a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
index 67ffe5818..3fb227ff8 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.api.command;
 
+import java.io.InputStream;
+
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
index 2129bf40c..b883dee0e 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
@@ -5,7 +5,6 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.model.Frame;
 
@@ -20,12 +19,17 @@ public interface ExecStartCmd extends AsyncDockerCmd<ExecStartCmd, Frame> {
     @CheckForNull
     public Boolean hasTtyEnabled();
 
+    @CheckForNull
+    public InputStream getStdin();
+
     public ExecStartCmd withDetach(Boolean detach);
 
     public ExecStartCmd withExecId(@Nonnull String execId);
 
     public ExecStartCmd withTty(Boolean tty);
 
+    public ExecStartCmd withStdIn(InputStream stdin);
+
     /**
      *
      * @throws com.github.dockerjava.api.NotFoundException
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index 44af625af..4db4edcea 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -63,6 +63,7 @@ public void onError(Throwable throwable) {
 
     @Override
     public void onComplete() {
+        System.err.println("callback onComplete");
         try {
             close();
         } catch (IOException e) {
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
index 5df38860c..3e68db1e4 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
@@ -2,6 +2,9 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.io.InputStream;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
index 0871fddfb..a70bac7d7 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
@@ -2,7 +2,11 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.io.InputStream;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.ExecCreateCmd;
 import com.github.dockerjava.api.command.ExecStartCmd;
 import com.github.dockerjava.api.model.Frame;
 
@@ -12,6 +16,8 @@ public class ExecStartCmdImpl extends AbstrAsyncDockerCmd<ExecStartCmd, Frame> i
 
     private Boolean detach, tty;
 
+    private InputStream stdin;
+
     public ExecStartCmdImpl(ExecStartCmd.Exec exec, String execId) {
         super(exec);
         withExecId(execId);
@@ -39,6 +45,13 @@ public Boolean hasTtyEnabled() {
         return tty;
     }
 
+    @Override
+    @JsonIgnore
+    public InputStream getStdin() {
+        return stdin;
+    }
+
+
     @Override
     public ExecStartCmd withDetach(Boolean detach) {
         this.detach = detach;
@@ -51,6 +64,12 @@ public ExecStartCmd withTty(Boolean tty) {
         return this;
     }
 
+    @Override
+    public ExecStartCmd withStdIn(InputStream stdin) {
+        this.stdin = stdin;
+        return this;
+    }
+
     /**
      * @throws com.github.dockerjava.api.NotFoundException
      *             No such exec instance
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index c9bd37d1e..032b81cb7 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -17,6 +17,7 @@
 import org.apache.commons.io.filefilter.TrueFileFilter;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -133,10 +134,18 @@ public InputStream buildDockerFolderTar(File directory) {
                 dockerFolderTar = CompressArchiveUtil.archiveTARFiles(directory, filesToAdd,
                         archiveNameWithOutExtension);
 
-                final InputStream tarInputStream = FileUtils.openInputStream(dockerFolderTar);
+                long length = dockerFolderTar.length();
+
+                final FileInputStream tarInputStream = FileUtils.openInputStream(dockerFolderTar);
                 final File tarFile = dockerFolderTar;
 
                 return new InputStream() {
+
+                    @Override
+                    public int available() throws IOException {
+                        return tarInputStream.available();
+                    }
+
                     @Override
                     public int read() throws IOException {
                         return tarInputStream.read();
diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
index 37d2534c5..303f8ddfc 100644
--- a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
@@ -74,9 +74,15 @@
 import com.github.dockerjava.core.command.ExecStartCmdImpl;
 import com.github.dockerjava.core.command.ExecStartResultCallback;
 import com.github.dockerjava.core.command.InfoCmdImpl;
+import com.github.dockerjava.netty.exec.AttachContainerCmdExec;
 import com.github.dockerjava.netty.exec.AuthCmdExec;
+import com.github.dockerjava.netty.exec.BuildImageCmdExec;
+import com.github.dockerjava.netty.exec.CommitCmdExec;
+import com.github.dockerjava.netty.exec.ContainerDiffCmdExec;
 import com.github.dockerjava.netty.exec.CopyFileFromContainerCmdExec;
 import com.github.dockerjava.netty.exec.CreateContainerCmdExec;
+import com.github.dockerjava.netty.exec.CreateImageCmdExec;
+import com.github.dockerjava.netty.exec.EventsCmdExec;
 import com.github.dockerjava.netty.exec.ExecCreateCmdExec;
 import com.github.dockerjava.netty.exec.ExecStartCmdExec;
 import com.github.dockerjava.netty.exec.InfoCmdExec;
@@ -85,16 +91,30 @@
 import com.github.dockerjava.netty.exec.InspectImageCmdExec;
 import com.github.dockerjava.netty.exec.KillContainerCmdExec;
 import com.github.dockerjava.netty.exec.ListContainersCmdExec;
+import com.github.dockerjava.netty.exec.ListImagesCmdExec;
 import com.github.dockerjava.netty.exec.LogContainerCmdExec;
+import com.github.dockerjava.netty.exec.PauseContainerCmdExec;
+import com.github.dockerjava.netty.exec.PingCmdExec;
+import com.github.dockerjava.netty.exec.PullImageCmdExec;
+import com.github.dockerjava.netty.exec.PushImageCmdExec;
 import com.github.dockerjava.netty.exec.RemoveContainerCmdExec;
+import com.github.dockerjava.netty.exec.RemoveImageCmdExec;
+import com.github.dockerjava.netty.exec.RestartContainerCmdExec;
+import com.github.dockerjava.netty.exec.SaveImageCmdExec;
+import com.github.dockerjava.netty.exec.SearchImagesCmdExec;
 import com.github.dockerjava.netty.exec.StartContainerCmdExec;
+import com.github.dockerjava.netty.exec.StatsCmdExec;
 import com.github.dockerjava.netty.exec.StopContainerCmdExec;
+import com.github.dockerjava.netty.exec.TagImageCmdExec;
+import com.github.dockerjava.netty.exec.TopContainerCmdExec;
+import com.github.dockerjava.netty.exec.UnpauseContainerCmdExec;
+import com.github.dockerjava.netty.exec.VersionCmdExec;
 import com.github.dockerjava.netty.exec.WaitContainerCmdExec;
 
 /**
- * http://stackoverflow.com/questions/33296749/netty-connect-to-unix-domain- socket-failed
+ * http://stackoverflow.com/questions/33296749/netty-connect-to-unix-domain-socket-failed
  * http://netty.io/wiki/native-transports.html
- * https://github.com/netty/netty/blob/master/example/src/main/java/io/netty/ example/http/snoop/HttpSnoopClient.java
+ * https://github.com/netty/netty/blob/master/example/src/main/java/io/netty/example/http/snoop/HttpSnoopClient.java
  *
  * @author marcus
  *
@@ -271,56 +291,47 @@ public InfoCmd.Exec createInfoCmdExec() {
 
     @Override
     public PingCmd.Exec createPingCmdExec() {
-        return null; // new PingCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new PingCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public VersionCmd.Exec createVersionCmdExec() {
-        return null; // new VersionCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new VersionCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public PullImageCmd.Exec createPullImageCmdExec() {
-        return null; // new PullImageCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new PullImageCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public PushImageCmd.Exec createPushImageCmdExec() {
-        return null; // new PushImageCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new PushImageCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public SaveImageCmd.Exec createSaveImageCmdExec() {
-        return null; // new SaveImageCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new SaveImageCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public CreateImageCmd.Exec createCreateImageCmdExec() {
-        return null; // new CreateImageCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new CreateImageCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public SearchImagesCmd.Exec createSearchImagesCmdExec() {
-        return null; // new SearchImagesCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new SearchImagesCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public RemoveImageCmd.Exec createRemoveImageCmdExec() {
-        return null; // new RemoveImageCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new RemoveImageCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public ListImagesCmd.Exec createListImagesCmdExec() {
-        return null; // new ListImagesCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new ListImagesCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
@@ -365,8 +376,7 @@ public WaitContainerCmd.Exec createWaitContainerCmdExec() {
 
     @Override
     public AttachContainerCmd.Exec createAttachContainerCmdExec() {
-        return null; // new AttachContainerCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new AttachContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
@@ -396,8 +406,7 @@ public StopContainerCmd.Exec createStopContainerCmdExec() {
 
     @Override
     public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
-        return null; // new ContainerDiffCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new ContainerDiffCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
@@ -407,63 +416,52 @@ public KillContainerCmd.Exec createKillContainerCmdExec() {
 
     @Override
     public RestartContainerCmd.Exec createRestartContainerCmdExec() {
-        return null; // new RestartContainerCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new RestartContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public CommitCmd.Exec createCommitCmdExec() {
-        return null; // new CommitCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new CommitCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public BuildImageCmd.Exec createBuildImageCmdExec() {
-        return null; // new BuildImageCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new BuildImageCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public TopContainerCmd.Exec createTopContainerCmdExec() {
-        return null; // new TopContainerCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new TopContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public TagImageCmd.Exec createTagImageCmdExec() {
-        return null; // new TagImageCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new TagImageCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public PauseContainerCmd.Exec createPauseContainerCmdExec() {
-        return null; // new PauseContainerCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new PauseContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
-        return null; // new UnpauseContainerCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new UnpauseContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public EventsCmd.Exec createEventsCmdExec() {
-        return null; // new EventsCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new EventsCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public StatsCmd.Exec createStatsCmdExec() {
-        return null; // new StatsCmdExec(getBaseResource(),
-                     // getDockerClientConfig());
+        return new StatsCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
     @Override
     public void close() throws IOException {
-        // checkNotNull(client, "Factory not initialized. You probably forgot to
-        // call init()!");
-        // client.close();
+        checkNotNull(eventLoopGroup, "Factory not initialized. You probably forgot to call init()!");
 
         eventLoopGroup.shutdownGracefully();
     }
diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
index 943875270..e8c358267 100644
--- a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
+++ b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
@@ -5,6 +5,7 @@
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import io.netty.handler.codec.http.DefaultHttpRequest;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpClientCodec;
 import io.netty.handler.codec.http.HttpClientUpgradeHandler;
@@ -13,8 +14,12 @@
 import io.netty.handler.codec.http.HttpMethod;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.codec.http.LastHttpContent;
 import io.netty.handler.codec.json.JsonObjectDecoder;
+import io.netty.handler.stream.ChunkedStream;
+import io.netty.handler.stream.ChunkedWriteHandler;
 
+import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.Closeable;
 import java.io.IOException;
@@ -29,6 +34,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.DockerClientException;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
@@ -36,7 +42,7 @@
 import com.github.dockerjava.netty.handler.HttpConnectionHijackHandler;
 import com.github.dockerjava.netty.handler.HttpRequestProvider;
 import com.github.dockerjava.netty.handler.HttpResponseHandler;
-import com.github.dockerjava.netty.handler.HttpResponseStreamInboundHandler;
+import com.github.dockerjava.netty.handler.HttpResponseStreamHandler;
 import com.github.dockerjava.netty.handler.JsonResponseCallbackHandler;
 
 public class InvocationBuilder {
@@ -72,7 +78,11 @@ public InvocationBuilder(ChannelProvider channelProvider, String resource) {
     }
 
     public InvocationBuilder accept(MediaType mediaType) {
-        headers.put(HttpHeaderNames.ACCEPT.toString(), mediaType.getMediaType());
+        return header(HttpHeaderNames.ACCEPT.toString(), mediaType.getMediaType());
+    }
+
+    public InvocationBuilder header(String name, String value) {
+        headers.put(name, value);
         return this;
     }
 
@@ -88,7 +98,7 @@ public ResponseCallback<Void> delete() {
 
         channel.pipeline().addLast(responseHandler);
 
-        sendRequestAndHandleResponse(requestProvider, channel);
+        sendRequest(requestProvider, channel);
 
         return callback;
     }
@@ -106,7 +116,7 @@ public void get(ResultCallback<Frame> resultCallback) {
         channel.pipeline().addLast(responseHandler);
         channel.pipeline().addLast(streamHandler);
 
-        sendRequestAndHandleResponse(requestProvider, channel);
+        sendRequest(requestProvider, channel);
     }
 
     public <T> ResponseCallback<T> get(TypeReference<T> typeReference) {
@@ -135,15 +145,13 @@ public <T> void get(TypeReference<T> typeReference, ResultCallback<T> resultCall
         channel.pipeline().addLast(new JsonObjectDecoder());
         channel.pipeline().addLast(jsonResponseHandler);
 
-        sendRequestAndHandleResponse(requestProvider, channel);
+        sendRequest(requestProvider, channel);
 
         return;
     }
 
     private Channel getChannel() {
-        Channel channel = channelProvider.getChannel();
-
-        return channel;
+        return channelProvider.getChannel();
     }
 
     private HttpRequestProvider httpDeleteRequestProvider() {
@@ -179,17 +187,17 @@ public InputStream post(final Object entity) {
 
         Channel channel = getChannel();
 
-        ResponseCallback<Void> callback = new ResponseCallback<Void>();
+        ResponseCallback<InputStream> callback = new ResponseCallback<InputStream>();
 
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, callback);
-        HttpResponseStreamInboundHandler streamHandler = new HttpResponseStreamInboundHandler();
+        HttpResponseStreamHandler streamHandler = new HttpResponseStreamHandler(callback);
 
         channel.pipeline().addLast(responseHandler);
         channel.pipeline().addLast(streamHandler);
 
-        sendRequestAndHandleResponse(requestProvider, channel);
+        sendRequest(requestProvider, channel);
 
-        return streamHandler.getInputStream();
+        return callback.awaitResult();
     }
 
     public void post(final Object entity, final InputStream stdin, ResultCallback<Frame> resultCallback) {
@@ -208,7 +216,7 @@ public void post(final Object entity, final InputStream stdin, ResultCallback<Fr
                 new HttpClientUpgradeHandler(new HttpClientCodec(), hijackHandler, Integer.MAX_VALUE));
         channel.pipeline().addLast(streamHandler);
 
-        sendRequestAndHandleResponse(requestProvider, channel);
+        sendRequest(requestProvider, channel);
 
         // wait for successful http upgrade procedure
         hijackHandler.await();
@@ -270,7 +278,7 @@ public <T> void post(final Object entity, TypeReference<T> typeReference, final
         channel.pipeline().addLast(new JsonObjectDecoder());
         channel.pipeline().addLast(jsonResponseHandler);
 
-        sendRequestAndHandleResponse(requestProvider, channel);
+        sendRequest(requestProvider, channel);
 
         return;
     }
@@ -311,11 +319,12 @@ private FullHttpRequest prepareGetRequest(String uri) {
 
     private HttpRequest preparePostRequest(String uri, Object entity) {
 
-        FullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, uri);
-
-        setDefaultHeaders(request);
+        HttpRequest request = null;
 
         if (entity != null) {
+
+            FullHttpRequest fullRequest = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, uri);
+
             byte[] bytes;
             try {
                 bytes = new ObjectMapper().writeValueAsBytes(entity);
@@ -323,17 +332,22 @@ private HttpRequest preparePostRequest(String uri, Object entity) {
                 throw new RuntimeException(e);
             }
 
-            request.headers().set(HttpHeaderNames.CONTENT_TYPE, "application/json");
-            request.content().clear().writeBytes(Unpooled.copiedBuffer(bytes));
-            request.headers().set(HttpHeaderNames.CONTENT_LENGTH, bytes.length);
+            fullRequest.headers().set(HttpHeaderNames.CONTENT_TYPE, "application/json");
+            fullRequest.content().clear().writeBytes(Unpooled.copiedBuffer(bytes));
+            fullRequest.headers().set(HttpHeaderNames.CONTENT_LENGTH, bytes.length);
+
+            request = fullRequest;
         } else {
+            request = new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, uri);
             request.headers().set(HttpHeaderNames.CONTENT_LENGTH, 0);
         }
 
+        setDefaultHeaders(request);
+
         return request;
     }
 
-    private void sendRequestAndHandleResponse(HttpRequestProvider requestProvider, Channel channel) {
+    private void sendRequest(HttpRequestProvider requestProvider, Channel channel) {
 
         ChannelFuture channelFuture = channel.writeAndFlush(requestProvider.getHttpRequest(resource));
 
@@ -356,5 +370,73 @@ private void setDefaultHeaders(HttpRequest request) {
         for (Map.Entry<String, String> entry : headers.entrySet()) {
             request.headers().set((CharSequence) entry.getKey(), entry.getValue());
         }
+    }
+
+    public <T> T post(TypeReference<T> typeReference, InputStream body) {
+
+        ResponseCallback<T> callback = new ResponseCallback<T>();
+
+        post(typeReference, callback, body);
+
+        return callback.awaitResult();
+    }
+
+
+    public <T> void post(TypeReference<T> typeReference, ResultCallback<T> resultCallback, InputStream body) {
+        HttpRequestProvider requestProvider = httpPostRequestProvider(null);
+
+        Channel channel = getChannel();
+
+        resultCallbackOnStart(channel, resultCallback);
+
+        JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<T>(typeReference,
+                resultCallback);
+
+        HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
+
+        channel.pipeline().addLast(new ChunkedWriteHandler());
+        channel.pipeline().addLast(responseHandler);
+        channel.pipeline().addLast(new JsonObjectDecoder());
+        channel.pipeline().addLast(jsonResponseHandler);
+
+        HttpRequest request = requestProvider.getHttpRequest(resource);
+
+        // don't accept FullHttpRequest here
+        if (request instanceof FullHttpRequest) {
+            throw new DockerClientException("fatal: request is instance of FullHttpRequest");
+        }
+
+        request.headers().set(HttpHeaderNames.TRANSFER_ENCODING, HttpHeaderValues.CHUNKED);
+        request.headers().remove(HttpHeaderNames.CONTENT_LENGTH);
+
+        channel.write(request);
+
+        channel.write(new ChunkedStream(new BufferedInputStream(body, 1024 * 1024), 1024 * 1024));
+        channel.write(LastHttpContent.EMPTY_LAST_CONTENT);
+        channel.flush();
+
+        return;
+
+    }
+
+    public InputStream get() {
+        HttpRequestProvider requestProvider = httpGetRequestProvider();
+
+        Channel channel = getChannel();
+
+        ResponseCallback<InputStream> resultCallback = new ResponseCallback<InputStream>();
+
+        resultCallbackOnStart(channel, resultCallback);
+
+        HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
+
+        HttpResponseStreamHandler streamHandler = new HttpResponseStreamHandler(resultCallback);
+
+        channel.pipeline().addLast(responseHandler);
+        channel.pipeline().addLast(streamHandler);
+
+        sendRequest(requestProvider, channel);
+
+        return resultCallback.awaitResult();
     };
 }
diff --git a/src/main/java/com/github/dockerjava/netty/WebTarget.java b/src/main/java/com/github/dockerjava/netty/WebTarget.java
index d4af90786..4362ccab9 100644
--- a/src/main/java/com/github/dockerjava/netty/WebTarget.java
+++ b/src/main/java/com/github/dockerjava/netty/WebTarget.java
@@ -8,8 +8,6 @@
 
 import org.apache.commons.lang.StringUtils;
 
-import io.netty.channel.Channel;
-
 public class WebTarget {
 
     private ChannelProvider channelProvider;
diff --git a/src/main/java/com/github/dockerjava/netty/exec/AbstrAsyncDockerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/AbstrAsyncDockerCmdExec.java
index cb2b523c4..3d1d4fac3 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/AbstrAsyncDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/AbstrAsyncDockerCmdExec.java
@@ -1,15 +1,14 @@
 package com.github.dockerjava.netty.exec;
 
+import java.io.Closeable;
+import java.io.IOException;
+
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.AsyncDockerCmd;
 import com.github.dockerjava.api.command.DockerCmdAsyncExec;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.netty.WebTarget;
 
-import java.io.Closeable;
-import java.io.IOException;
-
 public abstract class AbstrAsyncDockerCmdExec<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T>, A_RES_T> extends
         AbstrDockerCmdExec implements DockerCmdAsyncExec<CMD_T, A_RES_T> {
 
@@ -61,7 +60,4 @@ public void onComplete() {
 
     protected abstract Void execute0(final CMD_T command, final ResultCallback<A_RES_T> resultCallback);
 
-
-
-
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/AttachContainerCmdExec.java
new file mode 100644
index 000000000..76cec4272
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/AttachContainerCmdExec.java
@@ -0,0 +1,39 @@
+package com.github.dockerjava.netty.exec;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.AttachContainerCmd;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.WebTarget;
+
+public class AttachContainerCmdExec extends AbstrAsyncDockerCmdExec<AttachContainerCmd, Frame> implements
+        AttachContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AttachContainerCmdExec.class);
+
+    public AttachContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute0(AttachContainerCmd command, ResultCallback<Frame> resultCallback) {
+
+        WebTarget webTarget = getBaseResource().path("/containers/{id}/attach").resolveTemplate("id",
+                command.getContainerId());
+
+        webTarget = booleanQueryParam(webTarget, "logs", command.hasLogsEnabled());
+        webTarget = booleanQueryParam(webTarget, "stdout", command.hasStdoutEnabled());
+        // webTarget = booleanQueryParam(webTarget, "stdin", command.hasStdinEnabled());
+        webTarget = booleanQueryParam(webTarget, "stderr", command.hasStderrEnabled());
+        webTarget = booleanQueryParam(webTarget, "stream", command.hasFollowStreamEnabled());
+
+        LOGGER.trace("POST: {}", webTarget);
+
+        webTarget.request().post(null, System.in, resultCallback);
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
new file mode 100644
index 000000000..9c0e6c09f
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
@@ -0,0 +1,93 @@
+package com.github.dockerjava.netty.exec;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.BuildImageCmd;
+import com.github.dockerjava.api.model.AuthConfigurations;
+import com.github.dockerjava.api.model.BuildResponseItem;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.InvocationBuilder;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem> implements
+        BuildImageCmd.Exec {
+    private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageCmdExec.class);
+
+    public BuildImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    private InvocationBuilder resourceWithOptionalAuthConfig(BuildImageCmd command, InvocationBuilder request) {
+        final AuthConfigurations authConfigs = firstNonNull(command.getBuildAuthConfigs(), getBuildAuthConfigs());
+        if (authConfigs != null) {
+            request = request.header("X-Registry-Config", registryConfigs(authConfigs));
+        }
+        return request;
+    }
+
+    private static AuthConfigurations firstNonNull(final AuthConfigurations fromCommand,
+            final AuthConfigurations fromConfig) {
+        if (fromCommand != null) {
+            return fromCommand;
+        }
+        if (fromConfig != null) {
+            return fromConfig;
+        }
+        return null;
+    }
+
+    @Override
+    protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem> resultCallback) {
+
+        WebTarget webTarget = getBaseResource().path("/build");
+        String dockerFilePath = command.getPathToDockerfile();
+
+        if (dockerFilePath != null && command.getRemote() == null && !"Dockerfile".equals(dockerFilePath)) {
+            webTarget = webTarget.queryParam("dockerfile", dockerFilePath);
+        }
+        if (command.getTag() != null) {
+            webTarget = webTarget.queryParam("t", command.getTag());
+        }
+        if (command.getRemote() != null) {
+            webTarget = webTarget.queryParam("remote", command.getRemote().toString());
+        }
+
+        webTarget = booleanQueryParam(webTarget, "q", command.isQuiet());
+        webTarget = booleanQueryParam(webTarget, "nocache", command.hasNoCacheEnabled());
+        webTarget = booleanQueryParam(webTarget, "pull", command.hasPullEnabled());
+        webTarget = booleanQueryParam(webTarget, "rm", command.hasRemoveEnabled());
+        webTarget = booleanQueryParam(webTarget, "forcerm", command.isForcerm());
+
+        // this has to be handled differently as it should switch to 'false'
+        if (command.hasRemoveEnabled() == null || !command.hasRemoveEnabled()) {
+            webTarget = webTarget.queryParam("rm", "false");
+        }
+
+        if (command.getMemory() != null) {
+            webTarget = webTarget.queryParam("memory", command.getMemory());
+        }
+        if (command.getMemswap() != null) {
+            webTarget = webTarget.queryParam("memswap", command.getMemswap());
+        }
+        if (command.getCpushares() != null) {
+            webTarget = webTarget.queryParam("cpushares", command.getCpushares());
+        }
+        if (command.getCpusetcpus() != null) {
+            webTarget = webTarget.queryParam("cpusetcpus", command.getCpusetcpus());
+        }
+
+        LOGGER.trace("POST: {}", webTarget);
+
+        InvocationBuilder builder = resourceWithOptionalAuthConfig(command, webTarget.request()).accept(
+                MediaType.APPLICATION_JSON).header("Content-Type", "application/tar").header("encoding", "gzip");
+
+        builder.post(new TypeReference<BuildResponseItem>() {
+        }, resultCallback, command.getTarInputStream());
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CommitCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/CommitCmdExec.java
new file mode 100644
index 000000000..98c2dbd97
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/CommitCmdExec.java
@@ -0,0 +1,36 @@
+package com.github.dockerjava.netty.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.github.dockerjava.api.command.CommitCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CommitCmdExec extends AbstrSyncDockerCmdExec<CommitCmd, String> implements CommitCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CommitCmdExec.class);
+
+    public CommitCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected String execute(CommitCmd command) {
+        WebTarget webTarget = getBaseResource().path("/commit").queryParam("container", command.getContainerId())
+                .queryParam("repo", command.getRepository()).queryParam("tag", command.getTag())
+                .queryParam("m", command.getMessage()).queryParam("author", command.getAuthor());
+
+        webTarget = booleanQueryParam(webTarget, "pause", command.hasPauseEnabled());
+
+        LOGGER.trace("POST: {}", webTarget);
+        ObjectNode objectNode = webTarget.request().accept(MediaType.APPLICATION_JSON).
+                post(command, new TypeReference<ObjectNode>() {});
+
+        return objectNode.get("Id").asText();
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExec.java
new file mode 100644
index 000000000..a1d2d9601
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExec.java
@@ -0,0 +1,34 @@
+package com.github.dockerjava.netty.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.ContainerDiffCmd;
+import com.github.dockerjava.api.model.ChangeLog;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class ContainerDiffCmdExec extends AbstrSyncDockerCmdExec<ContainerDiffCmd, List<ChangeLog>> implements
+        ContainerDiffCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ContainerDiffCmdExec.class);
+
+    public ContainerDiffCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected List<ChangeLog> execute(ContainerDiffCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/changes").resolveTemplate("id",
+                command.getContainerId());
+
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<List<ChangeLog>>() {
+        }).awaitResult();
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CreateContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/CreateContainerCmdExec.java
index 3a5e75d60..f7e4e39d9 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/CreateContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/CreateContainerCmdExec.java
@@ -1,16 +1,15 @@
 package com.github.dockerjava.netty.exec;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.CreateContainerCmd.Exec;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.netty.MediaType;
 import com.github.dockerjava.netty.WebTarget;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class CreateContainerCmdExec extends AbstrSyncDockerCmdExec<CreateContainerCmd, CreateContainerResponse>
         implements CreateContainerCmd.Exec {
 
@@ -33,5 +32,4 @@ protected CreateContainerResponse execute(CreateContainerCmd command) {
                 .post(command, new TypeReference<CreateContainerResponse>() {
                 });
     }
-
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CreateImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/CreateImageCmdExec.java
new file mode 100644
index 000000000..2526bc2e1
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/CreateImageCmdExec.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.netty.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.CreateImageResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CreateImageCmdExec extends AbstrSyncDockerCmdExec<CreateImageCmd, CreateImageResponse> implements
+        CreateImageCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateImageCmdExec.class);
+
+    public CreateImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected CreateImageResponse execute(CreateImageCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/create").queryParam("repo", command.getRepository())
+                .queryParam("tag", command.getTag()).queryParam("fromSrc", "-");
+
+        LOGGER.trace("POST: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM)
+                .post(new TypeReference<CreateImageResponse>() {}, command.getImageStream());
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/EventsCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/EventsCmdExec.java
new file mode 100644
index 000000000..ef95d2e0d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/EventsCmdExec.java
@@ -0,0 +1,41 @@
+package com.github.dockerjava.netty.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.EventsCmd;
+import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
+public class EventsCmdExec extends AbstrAsyncDockerCmdExec<EventsCmd, Event> implements EventsCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(EventsCmdExec.class);
+
+    public EventsCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute0(EventsCmd command, ResultCallback<Event> resultCallback) {
+
+        WebTarget webTarget = getBaseResource().path("/events").queryParam("since", command.getSince())
+                .queryParam("until", command.getUntil());
+
+        if (command.getFilters() != null) {
+            webTarget = webTarget
+                    .queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters().toString()));
+        }
+
+        LOGGER.trace("GET: {}", webTarget);
+
+        webTarget.request().get(new TypeReference<Event>() {
+        }, resultCallback);
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ExecStartCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ExecStartCmdExec.java
index 9d684ca7b..374b2062d 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ExecStartCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ExecStartCmdExec.java
@@ -12,17 +12,17 @@
 
 public class ExecStartCmdExec extends AbstrAsyncDockerCmdExec<ExecStartCmd, Frame> implements ExecStartCmd.Exec {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(ExecStartCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExecStartCmdExec.class);
 
-	public ExecStartCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-		super(baseResource, dockerClientConfig);
-	}
+    public ExecStartCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
 
     @Override
     protected Void execute0(ExecStartCmd command, ResultCallback<Frame> resultCallback) {
         WebTarget webTarget = getBaseResource().path("/exec/{id}/start").resolveTemplate("id", command.getExecId());
 
-        webTarget.request().accept(MediaType.APPLICATION_JSON).post(command, System.in, resultCallback);
+        webTarget.request().accept(MediaType.APPLICATION_JSON).post(command, command.getStdin(), resultCallback);
 
         return null;
     }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java
new file mode 100644
index 000000000..1521f3e5c
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java
@@ -0,0 +1,45 @@
+package com.github.dockerjava.netty.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.model.Image;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
+public class ListImagesCmdExec extends AbstrSyncDockerCmdExec<ListImagesCmd, List<Image>> implements ListImagesCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ListImagesCmdExec.class);
+
+    public ListImagesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected List<Image> execute(ListImagesCmd command) {
+        WebTarget webTarget = getBaseResource().path("/images/json");
+
+        webTarget = booleanQueryParam(webTarget, "all", command.hasShowAllEnabled());
+
+        if (command.getFilters() != null)
+            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters()));
+
+        LOGGER.trace("GET: {}", webTarget);
+
+        List<Image> images = webTarget.request().accept(MediaType.APPLICATION_JSON)
+                .get(new TypeReference<List<Image>>() {
+                }).awaitResult();
+
+        LOGGER.trace("Response: {}", images);
+
+        return images;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/PauseContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/PauseContainerCmdExec.java
new file mode 100644
index 000000000..178eee99c
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/PauseContainerCmdExec.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.PauseContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PauseContainerCmdExec extends AbstrSyncDockerCmdExec<PauseContainerCmd, Void> implements
+        PauseContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PauseContainerCmdExec.class);
+
+    public PauseContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(PauseContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/pause").resolveTemplate("id",
+                command.getContainerId());
+
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(null);
+
+        return null;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/PingCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/PingCmdExec.java
new file mode 100644
index 000000000..6e305caed
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/PingCmdExec.java
@@ -0,0 +1,28 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.PingCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PingCmdExec extends AbstrSyncDockerCmdExec<PingCmd, Void> implements PingCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PingCmdExec.class);
+
+    public PingCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(PingCmd command) {
+        WebTarget webResource = getBaseResource().path("/_ping");
+
+        LOGGER.trace("GET: {}", webResource);
+        webResource.request().get();
+
+        return null;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/PullImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/PullImageCmdExec.java
new file mode 100644
index 000000000..7f15b4e62
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/PullImageCmdExec.java
@@ -0,0 +1,46 @@
+package com.github.dockerjava.netty.exec;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.PullImageCmd;
+import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.PullResponseItem;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.InvocationBuilder;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+public class PullImageCmdExec extends AbstrAsyncDockerCmdExec<PullImageCmd, PullResponseItem> implements
+        PullImageCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PullImageCmdExec.class);
+
+    public PullImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    private InvocationBuilder resourceWithOptionalAuthConfig(PullImageCmd command, InvocationBuilder request) {
+        AuthConfig authConfig = command.getAuthConfig();
+        if (authConfig != null) {
+            request = request.header("X-Registry-Auth", registryAuth(authConfig));
+        }
+        return request;
+    }
+
+    @Override
+    protected Void execute0(PullImageCmd command, ResultCallback<PullResponseItem> resultCallback) {
+
+        WebTarget webResource = getBaseResource().path("/images/create").queryParam("tag", command.getTag())
+                .queryParam("fromImage", command.getRepository()).queryParam("registry", command.getRegistry());
+
+        LOGGER.trace("POST: {}", webResource);
+        resourceWithOptionalAuthConfig(command, webResource.request()).accept(MediaType.APPLICATION_OCTET_STREAM).post(
+                null, new TypeReference<PullResponseItem>() {
+                }, resultCallback);
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/PushImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/PushImageCmdExec.java
new file mode 100644
index 000000000..d6dcdbd00
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/PushImageCmdExec.java
@@ -0,0 +1,48 @@
+package com.github.dockerjava.netty.exec;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.PushImageCmd;
+import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.PushResponseItem;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.InvocationBuilder;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+public class PushImageCmdExec extends AbstrAsyncDockerCmdExec<PushImageCmd, PushResponseItem> implements
+        PushImageCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PushImageCmdExec.class);
+
+    public PushImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    private String name(PushImageCmd command) {
+        String name = command.getName();
+        AuthConfig authConfig = command.getAuthConfig();
+        return (name.contains("/") || authConfig == null) ? name : authConfig.getUsername();
+    }
+
+    @Override
+    protected Void execute0(PushImageCmd command, ResultCallback<PushResponseItem> resultCallback) {
+
+        WebTarget webResource = getBaseResource().path("/images/" + name(command) + "/push").queryParam("tag",
+                command.getTag());
+
+        final String registryAuth = registryAuth(command.getAuthConfig());
+        LOGGER.trace("POST: {}", webResource);
+
+        InvocationBuilder builder = webResource.request().header("X-Registry-Auth", registryAuth)
+                .accept(MediaType.APPLICATION_JSON);
+
+        builder.post(null, new TypeReference<PushResponseItem>() {
+        }, resultCallback);
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/RemoveImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/RemoveImageCmdExec.java
new file mode 100644
index 000000000..fa3a7ed57
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/RemoveImageCmdExec.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RemoveImageCmdExec extends AbstrSyncDockerCmdExec<RemoveImageCmd, Void> implements RemoveImageCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveImageCmdExec.class);
+
+    public RemoveImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(RemoveImageCmd command) {
+        WebTarget webTarget = getBaseResource().path("/images/" + command.getImageId());
+
+        webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled());
+        webTarget = booleanQueryParam(webTarget, "noprune", command.hasNoPruneEnabled());
+
+        LOGGER.trace("DELETE: {}", webTarget);
+        webTarget.request().delete().awaitResult();
+
+        return null;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/RestartContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/RestartContainerCmdExec.java
new file mode 100644
index 000000000..dc52f0eef
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/RestartContainerCmdExec.java
@@ -0,0 +1,36 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.RestartContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class RestartContainerCmdExec extends AbstrSyncDockerCmdExec<RestartContainerCmd, Void> implements
+        RestartContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(RestartContainerCmdExec.class);
+
+    public RestartContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(RestartContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/restart").resolveTemplate("id",
+                command.getContainerId());
+
+        if (command.getTimeout() != null) {
+            webResource = webResource.queryParam("t", String.valueOf(command.getTimeout()));
+        }
+
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(null);
+
+        return null;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/SaveImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/SaveImageCmdExec.java
new file mode 100644
index 000000000..629f49871
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/SaveImageCmdExec.java
@@ -0,0 +1,28 @@
+package com.github.dockerjava.netty.exec;
+
+import java.io.InputStream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.command.SaveImageCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+public class SaveImageCmdExec extends AbstrSyncDockerCmdExec<SaveImageCmd, InputStream> implements SaveImageCmd.Exec {
+    private static final Logger LOGGER = LoggerFactory.getLogger(SaveImageCmdExec.class);
+
+    public SaveImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected InputStream execute(SaveImageCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/" + command.getName() + "/get").queryParam("tag",
+                command.getTag());
+
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get();
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/SearchImagesCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/SearchImagesCmdExec.java
new file mode 100644
index 000000000..31db18fc3
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/SearchImagesCmdExec.java
@@ -0,0 +1,33 @@
+package com.github.dockerjava.netty.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.SearchImagesCmd;
+import com.github.dockerjava.api.model.SearchItem;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class SearchImagesCmdExec extends AbstrSyncDockerCmdExec<SearchImagesCmd, List<SearchItem>> implements
+        SearchImagesCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(SearchImagesCmdExec.class);
+
+    public SearchImagesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected List<SearchItem> execute(SearchImagesCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/search").queryParam("term", command.getTerm());
+
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<List<SearchItem>>() {
+        }).awaitResult();
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/StartContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/StartContainerCmdExec.java
index cfa7d28ce..12f2d8cbc 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/StartContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/StartContainerCmdExec.java
@@ -1,15 +1,13 @@
 package com.github.dockerjava.netty.exec;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.github.dockerjava.api.command.StartContainerCmd;
-import com.github.dockerjava.api.command.StartContainerCmd.Exec;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.netty.MediaType;
 import com.github.dockerjava.netty.WebTarget;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
 public class StartContainerCmdExec extends AbstrSyncDockerCmdExec<StartContainerCmd, Void> implements
         StartContainerCmd.Exec {
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/StatsCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/StatsCmdExec.java
new file mode 100644
index 000000000..d167d5686
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/StatsCmdExec.java
@@ -0,0 +1,33 @@
+package com.github.dockerjava.netty.exec;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.StatsCmd;
+import com.github.dockerjava.api.model.Statistics;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.WebTarget;
+
+public class StatsCmdExec extends AbstrAsyncDockerCmdExec<StatsCmd, Statistics> implements StatsCmd.Exec {
+    private static final Logger LOGGER = LoggerFactory.getLogger(StatsCmdExec.class);
+
+    public StatsCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute0(StatsCmd command, ResultCallback<Statistics> resultCallback) {
+
+        WebTarget webTarget = getBaseResource().path("/containers/{id}/stats").resolveTemplate("id",
+                command.getContainerId());
+
+        LOGGER.trace("GET: {}", webTarget);
+
+        webTarget.request().get(new TypeReference<Statistics>() {
+        }, resultCallback);
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/TagImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/TagImageCmdExec.java
new file mode 100644
index 000000000..ad7ed264e
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/TagImageCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.TagImageCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TagImageCmdExec extends AbstrSyncDockerCmdExec<TagImageCmd, Void> implements TagImageCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(TagImageCmdExec.class);
+
+    public TagImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(TagImageCmd command) {
+        WebTarget webTarget = getBaseResource().path("/images/" + command.getImageId() + "/tag")
+                .queryParam("repo", command.getRepository()).queryParam("tag", command.getTag());
+
+        webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled());
+
+        LOGGER.trace("POST: {}", webTarget);
+        webTarget.request().post(null);
+        return null;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/TopContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/TopContainerCmdExec.java
new file mode 100644
index 000000000..630179b48
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/TopContainerCmdExec.java
@@ -0,0 +1,36 @@
+package com.github.dockerjava.netty.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.TopContainerCmd;
+import com.github.dockerjava.api.command.TopContainerResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TopContainerCmdExec extends AbstrSyncDockerCmdExec<TopContainerCmd, TopContainerResponse> implements
+        TopContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(TopContainerCmdExec.class);
+
+    public TopContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected TopContainerResponse execute(TopContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/top").resolveTemplate("id",
+                command.getContainerId());
+
+        if (!StringUtils.isEmpty(command.getPsArgs()))
+            webResource = webResource.queryParam("ps_args", command.getPsArgs());
+
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<TopContainerResponse>() {
+        }).awaitResult();
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/UnpauseContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/UnpauseContainerCmdExec.java
new file mode 100644
index 000000000..61fb9a880
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/UnpauseContainerCmdExec.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.UnpauseContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class UnpauseContainerCmdExec extends AbstrSyncDockerCmdExec<UnpauseContainerCmd, Void> implements
+        UnpauseContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(UnpauseContainerCmdExec.class);
+
+    public UnpauseContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(UnpauseContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/unpause").resolveTemplate("id",
+                command.getContainerId());
+
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(null);
+
+        return null;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/VersionCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/VersionCmdExec.java
new file mode 100644
index 000000000..9f62ea921
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/VersionCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.netty.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.VersionCmd;
+import com.github.dockerjava.api.model.Version;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class VersionCmdExec extends AbstrSyncDockerCmdExec<VersionCmd, Version> implements VersionCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(VersionCmdExec.class);
+
+    public VersionCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Version execute(VersionCmd command) {
+        WebTarget webResource = getBaseResource().path("/version");
+
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<Version>() {
+        }).awaitResult();
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/WaitContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/WaitContainerCmdExec.java
index d6e5eb0f6..5883b7188 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/WaitContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/WaitContainerCmdExec.java
@@ -27,7 +27,7 @@ protected Void execute0(WaitContainerCmd command, ResultCallback<WaitResponse> r
 
         LOGGER.trace("POST: {}", webTarget);
 
-        webTarget.request().accept(MediaType.APPLICATION_JSON).post(null, new TypeReference<WaitResponse>() {
+        webTarget.request().accept(MediaType.APPLICATION_JSON).post((Object) null, new TypeReference<WaitResponse>() {
         }, resultCallback);
 
         return null;
diff --git a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
index 8a3a7f1d3..5974f407f 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
@@ -2,10 +2,8 @@
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
-import io.netty.util.concurrent.GenericFutureListener;
 
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.model.Frame;
@@ -13,115 +11,124 @@
 
 public class FramedResponseStreamHandler extends SimpleChannelInboundHandler<ByteBuf> {
 
-	private static final int HEADER_SIZE = 8;
+    private static final int HEADER_SIZE = 8;
 
-	private final ByteBuf rawBuffer = Unpooled.buffer(1000);
+    private final ByteBuf rawBuffer = Unpooled.buffer(1000);
 
-	private byte[] header = new byte[HEADER_SIZE];
+    private byte[] header = new byte[HEADER_SIZE];
 
-	private int headerCnt = 0;
+    private int headerCnt = 0;
 
-	private byte[] payload = new byte[0];
+    private byte[] payload = new byte[0];
 
-	private int payloadCnt = 0;
+    private int payloadCnt = 0;
 
-	private ResultCallback<Frame> resultCallback;
+    private ResultCallback<Frame> resultCallback;
 
-	public FramedResponseStreamHandler(ResultCallback<Frame> resultCallback) {
-		this.resultCallback = resultCallback;
-	}
+    private StreamType streamType = null;
 
-	@Override
-	protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
+    public FramedResponseStreamHandler(ResultCallback<Frame> resultCallback) {
+        this.resultCallback = resultCallback;
+    }
 
-		rawBuffer.writeBytes(msg.copy(), 0, msg.readableBytes());
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
 
-		Frame frame = null;
+        rawBuffer.writeBytes(msg.copy(), 0, msg.readableBytes());
 
-		do {
-			frame = decode();
+        Frame frame = null;
 
-			if (frame != null) {
-			    resultCallback.onNext(frame);
-				headerCnt = 0;
-				payloadCnt = 0;
-			}
+        do {
+            frame = decode();
 
-		} while (frame != null);
+            if (frame != null) {
+                resultCallback.onNext(frame);
+            }
 
+        } while (frame != null);
+    }
 
-//		ctx.channel().closeFuture().addListener(new GenericFutureListener<ChannelFuture>() {
-//
-//            @Override
-//            public void operationComplete(ChannelFuture future) throws Exception {
-//                System.err.println("channel closed");
-//                resultCallback.onComplete();
-//            }
-//        });
+    private int read(byte[] buf, int offset, int length) {
+        length = Math.min(rawBuffer.readableBytes(), length);
+        rawBuffer.readBytes(buf, offset, length);
+        return length;
+    }
 
-	}
+    private Frame decode() {
+        if (headerCnt < HEADER_SIZE) {
 
+            int headerCount = read(header, headerCnt, HEADER_SIZE - headerCnt);
 
+            if (headerCount == 0) {
+                return null;
+            }
+            headerCnt += headerCount;
 
-	private int read(byte[] buf, int offset, int length) {
-		length = Math.min(rawBuffer.readableBytes(), length);
-		rawBuffer.readBytes(buf, offset, length);
-		return length;
-	}
+            if (headerCnt < HEADER_SIZE)
+                return null;
 
-	private Frame decode() {
-		if (headerCnt < HEADER_SIZE) {
+            streamType = streamType(header[0]);
 
-			int headerCount = read(header, headerCnt, HEADER_SIZE - headerCnt);
+            if (streamType.equals(StreamType.RAW)) {
+                return new Frame(streamType, header);
+            }
+        }
 
-			if (headerCount == 0) {
-				return null;
-			}
-			headerCnt += headerCount;
+        if (streamType.equals(StreamType.RAW)) {
 
-			if (headerCnt < HEADER_SIZE)
-				return null;
-		}
+            if (payloadCnt == 0)
+                payload = new byte[rawBuffer.readableBytes()];
 
-		StreamType streamType = streamType(header[0]);
+            int count = read(payload, payloadCnt, rawBuffer.readableBytes());
 
-		int payloadSize = ((header[4] & 0xff) << 24) + ((header[5] & 0xff) << 16) + ((header[6] & 0xff) << 8)
-				+ (header[7] & 0xff);
+            if (count == 0)
+                return null;
 
-		if(payloadCnt == 0)
-			payload = new byte[payloadSize];
+            payloadCnt = 0;
 
-		int count = read(payload, payloadCnt, payloadSize - payloadCnt);
+            return new Frame(StreamType.RAW, payload);
+        } else {
 
-		if (count == 0)
-			return null;
+            int payloadSize = ((header[4] & 0xff) << 24) + ((header[5] & 0xff) << 16) + ((header[6] & 0xff) << 8)
+                    + (header[7] & 0xff);
 
-		payloadCnt += count;
+            if (payloadCnt == 0)
+                payload = new byte[payloadSize];
 
-		if (payloadCnt < payloadSize)
-			return null;
+            int count = read(payload, payloadCnt, payloadSize - payloadCnt);
 
-		return new Frame(streamType, payload);
+            if (count == 0)
+                return null;
 
-	}
+            payloadCnt += count;
 
-	@Override
-	public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-		resultCallback.onError(cause);
-		ctx.close();
-	}
+            if (payloadCnt < payloadSize)
+                return null;
 
-	private static StreamType streamType(byte streamType) {
-		switch (streamType) {
-		case 0:
-			return StreamType.STDIN;
-		case 1:
-			return StreamType.STDOUT;
-		case 2:
-			return StreamType.STDERR;
-		default:
-			return StreamType.RAW;
-		}
-	}
+            headerCnt = 0;
+            payloadCnt = 0;
+
+            return new Frame(streamType, payload);
+        }
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        resultCallback.onError(cause);
+        ctx.close();
+    }
+
+    private static StreamType streamType(byte streamType) {
+        switch (streamType) {
+        case 0:
+            return StreamType.STDIN;
+        case 1:
+            return StreamType.STDOUT;
+        case 2:
+            return StreamType.STDERR;
+        default:
+            return StreamType.RAW;
+        }
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpConnectionHijackHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpConnectionHijackHandler.java
index 1a59118fb..0b0135d7e 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/HttpConnectionHijackHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpConnectionHijackHandler.java
@@ -1,57 +1,46 @@
 package com.github.dockerjava.netty.handler;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Map.Entry;
-import java.util.concurrent.CountDownLatch;
-
-import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.http.FullHttpResponse;
-import io.netty.handler.codec.http.HttpClientCodec;
 import io.netty.handler.codec.http.HttpClientUpgradeHandler;
 import io.netty.handler.codec.http.HttpRequest;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.concurrent.CountDownLatch;
+
 public class HttpConnectionHijackHandler implements HttpClientUpgradeHandler.UpgradeCodec {
 
-	private CountDownLatch latch = new CountDownLatch(1);
+    private CountDownLatch latch = new CountDownLatch(1);
 
-	private HttpResponseHandler httpResponseHandler;
+    private HttpResponseHandler httpResponseHandler;
 
-	public HttpConnectionHijackHandler(HttpResponseHandler httpResponseHandler) {
+    public HttpConnectionHijackHandler(HttpResponseHandler httpResponseHandler) {
         this.httpResponseHandler = httpResponseHandler;
     }
 
-	@Override
-	public void upgradeTo(ChannelHandlerContext ctx, FullHttpResponse upgradeResponse)
-			throws Exception {
-		System.out.println("UPGRADED");
-		httpResponseHandler.channelRead(ctx, upgradeResponse);
-		ctx.pipeline().addLast(httpResponseHandler);
-		latch.countDown();
-	}
-
-	@Override
-	public Collection<CharSequence> setUpgradeHeaders(ChannelHandlerContext ctx,
-			HttpRequest upgradeRequest) {
-		return Collections.emptyList();
-	}
-
-	@Override
-	public CharSequence protocol() {
-		return "tcp";
-	}
-
-	public void await() {
-		try {
-			latch.await();
-			System.out.println("upgrade awaited");
-		} catch (InterruptedException e) {
-			throw new RuntimeException(e);
-		}
-	}
+    @Override
+    public void upgradeTo(ChannelHandlerContext ctx, FullHttpResponse upgradeResponse) throws Exception {
+        httpResponseHandler.channelRead(ctx, upgradeResponse);
+        ctx.pipeline().addLast(httpResponseHandler);
+        latch.countDown();
+    }
 
+    @Override
+    public Collection<CharSequence> setUpgradeHeaders(ChannelHandlerContext ctx, HttpRequest upgradeRequest) {
+        return Collections.emptyList();
+    }
 
+    @Override
+    public CharSequence protocol() {
+        return "tcp";
+    }
 
+    public void await() {
+        try {
+            latch.await();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
index 548c13697..851295269 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
@@ -12,7 +12,6 @@
 import io.netty.handler.codec.http.LastHttpContent;
 
 import java.nio.charset.Charset;
-import java.util.concurrent.CountDownLatch;
 
 import com.github.dockerjava.api.BadRequestException;
 import com.github.dockerjava.api.ConflictException;
@@ -74,7 +73,6 @@ protected void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Ex
                     case 302:
                         if (response.headers().contains(HttpHeaderNames.LOCATION)) {
                             String location = response.headers().get(HttpHeaderNames.LOCATION);
-                            System.out.println("redirected to :" + location);
                             HttpRequest redirected = requestProvider.getHttpRequest(location);
 
                             ctx.channel().writeAndFlush(redirected);
@@ -100,18 +98,13 @@ protected void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Ex
                 } catch (Throwable e) {
                     resultCallback.onError(e);
                 } finally {
-                    System.err.println("LastHttpContent");
                     resultCallback.onComplete();
                 }
             }
-        } else {
-            System.err.println("UNKNOWN");
         }
-
     }
 
     private String getBodyAsMessage(ByteBuf body) {
         return body.readBytes(body.readableBytes()).toString(Charset.forName("UTF-8"));
     }
-
 }
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamInboundHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
similarity index 87%
rename from src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamInboundHandler.java
rename to src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
index f2a66c202..0cda2de81 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamInboundHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
@@ -10,10 +10,16 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class HttpResponseStreamInboundHandler extends SimpleChannelInboundHandler<ByteBuf> {
+import com.github.dockerjava.api.async.ResultCallback;
+
+public class HttpResponseStreamHandler extends SimpleChannelInboundHandler<ByteBuf> {
 
     private HttpResponseInputStream stream = new HttpResponseInputStream();
 
+    public HttpResponseStreamHandler(ResultCallback<InputStream> resultCallback) {
+        resultCallback.onNext(stream);
+    }
+
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
         stream.write(msg.copy());
@@ -25,16 +31,6 @@ public void channelReadComplete(ChannelHandlerContext ctx) throws Exception {
         super.channelReadComplete(ctx);
     }
 
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        cause.printStackTrace();
-        ctx.close();
-    }
-
-    public InputStream getInputStream() {
-        return stream;
-    }
-
     public static class HttpResponseInputStream extends InputStream {
 
         private AtomicBoolean closed = new AtomicBoolean(false);
diff --git a/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java b/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
index d797ba188..4340e1a38 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
@@ -1,19 +1,18 @@
 package com.github.dockerjava.netty.handler;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 public class JsonRequestHandler extends MessageToByteEncoder<Object>{
-	
+
 	private ObjectMapper mapper = new ObjectMapper();
 
 	@Override
 	protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception {
 		byte[] serialized = mapper.writeValueAsBytes(msg);
-		System.out.println("serialized: " + new String(serialized));
 		out.writeBytes(serialized);
 	}
 }
diff --git a/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java b/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
index e6b1ef3a8..614508a81 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
@@ -36,7 +36,6 @@ protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Excep
         }
 
         callback.onNext(object);
-        callback.close();
     }
 
     @Override
diff --git a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
new file mode 100644
index 000000000..2dedf0255
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
@@ -0,0 +1,122 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.util.concurrent.TimeUnit;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.StreamType;
+import com.github.dockerjava.core.command.AttachContainerResultCallback;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class AttachContainerCmdExecTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void attachContainerWithoutTTY() throws Exception {
+
+        String snippet = "hello world";
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("echo", snippet)
+                .withTty(false).exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        AttachContainerTestCallback callback = new AttachContainerTestCallback() {
+            @Override
+            public void onNext(Frame frame) {
+                assertEquals(frame.getStreamType(), StreamType.STDOUT);
+                super.onNext(frame);
+            };
+        };
+
+        dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
+                .withLogs(true).exec(callback).awaitCompletion(10, TimeUnit.SECONDS).close();
+
+        assertThat(callback.toString(), containsString(snippet));
+    }
+
+    @Test
+    public void attachContainerWithTTY() throws Exception {
+
+        File baseDir = new File(Thread.currentThread().getContextClassLoader()
+                .getResource("attachContainerTestDockerfile").getFile());
+
+        String imageId = buildImage(baseDir);
+
+        CreateContainerResponse container = dockerClient.createContainerCmd(imageId).withTty(true).exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        AttachContainerTestCallback callback = new AttachContainerTestCallback() {
+            @Override
+            public void onNext(Frame frame) {
+                assertEquals(frame.getStreamType(), StreamType.RAW);
+                super.onNext(frame);
+            };
+        };
+
+        dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
+                .exec(callback).awaitCompletion(10, TimeUnit.SECONDS).close();
+
+        System.out.println("log: " + callback.toString());
+
+        // HexDump.dump(collectFramesCallback.toString().getBytes(), 0, System.out, 0);
+
+        assertThat(callback.toString(), containsString("stdout\r\nstderr"));
+    }
+
+    public static class AttachContainerTestCallback extends AttachContainerResultCallback {
+        private StringBuffer log = new StringBuffer();
+
+        @Override
+        public void onNext(Frame item) {
+            log.append(new String(item.getPayload()));
+            super.onNext(item);
+        }
+
+        @Override
+        public String toString() {
+            return log.toString();
+        }
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
new file mode 100644
index 000000000..b60968d06
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
@@ -0,0 +1,296 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.UUID;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.filefilter.TrueFileFilter;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.command.BuildImageCmd;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.command.InspectImageResponse;
+import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.AuthConfigurations;
+import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.PortBinding;
+import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.core.CompressArchiveUtil;
+import com.github.dockerjava.core.command.BuildImageResultCallback;
+import com.github.dockerjava.core.command.PushImageResultCallback;
+import com.github.dockerjava.core.command.WaitContainerResultCallback;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class BuildImageCmdExecTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void testNginxDockerfileBuilder() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("nginx").getFile());
+
+        String imageId = buildImage(baseDir);
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        assertThat(inspectImageResponse, not(nullValue()));
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+        assertThat(inspectImageResponse.getAuthor(), equalTo("Guillaume J. Charmes \"guillaume@dotcloud.com\""));
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void testNonstandard1() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader()
+                .getResource("nonstandard/subdirectory/Dockerfile-nonstandard").getFile());
+
+        buildImage(baseDir);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void testNonstandard2() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("nonstandard").getFile());
+        File dockerFile = new File(Thread.currentThread().getContextClassLoader()
+                .getResource("nonstandard/subdirectory/Dockerfile-nonstandard").getFile());
+
+        dockerClient.buildImageCmd().withBaseDirectory(baseDir).withDockerfile(dockerFile).withNoCache(true)
+                .exec(new BuildImageResultCallback()).awaitImageId();
+    }
+
+    @Test
+    public void testDockerBuilderFromTar() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddFile").getFile());
+        Collection<File> files = FileUtils.listFiles(baseDir, TrueFileFilter.INSTANCE, TrueFileFilter.INSTANCE);
+        File tarFile = CompressArchiveUtil.archiveTARFiles(baseDir, files, UUID.randomUUID().toString());
+        String response = dockerfileBuild(new FileInputStream(tarFile));
+        assertThat(response, containsString("Successfully executed testrun.sh"));
+    }
+
+    @Test
+    public void testDockerBuilderAddUrl() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddUrl").getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("Docker"));
+    }
+
+    @Test
+    public void testDockerBuilderAddFileInSubfolder() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddFileInSubfolder")
+                .getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("Successfully executed testrun.sh"));
+    }
+
+    @Test
+    public void testDockerBuilderAddFilesViaWildcard() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddFilesViaWildcard")
+                .getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("Successfully executed testinclude1.sh"));
+        assertThat(response, not(containsString("Successfully executed testinclude2.sh")));
+    }
+
+    @Test
+    public void testDockerBuilderAddFolder() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddFolder").getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("Successfully executed testAddFolder.sh"));
+    }
+
+    @Test
+    public void testDockerBuilderEnv() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testEnv").getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("Successfully executed testrun.sh"));
+    }
+
+    private String dockerfileBuild(InputStream tarInputStream) throws Exception {
+
+        return execBuild(dockerClient.buildImageCmd().withTarInputStream(tarInputStream));
+    }
+
+    private String dockerfileBuild(File baseDir) throws Exception {
+
+        return execBuild(dockerClient.buildImageCmd(baseDir));
+    }
+
+    private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
+        String imageId = buildImageCmd.withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
+
+        // Create container based on image
+        CreateContainerResponse container = dockerClient.createContainerCmd(imageId).exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
+
+        return containerLog(container.getId());
+    }
+
+    @Test(expectedExceptions = { DockerClientException.class })
+    public void testDockerfileIgnored() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerfileIgnored")
+                .getFile());
+
+        dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
+    }
+
+    @Test
+    public void testDockerfileNotIgnored() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerfileNotIgnored")
+                .getFile());
+
+        dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
+    }
+
+    @Test(expectedExceptions = { DockerClientException.class })
+    public void testInvalidDockerIgnorePattern() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader()
+                .getResource("testInvalidDockerignorePattern").getFile());
+
+        dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void testDockerIgnore() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerignore")
+                .getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("/tmp/a/a /tmp/a/c /tmp/a/d"));
+    }
+
+    @Test
+    public void testNetCatDockerfileBuilder() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("netcat").getFile());
+
+        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback())
+                .awaitImageId();
+
+        assertNotNull(imageId, "Not successful in build");
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        assertThat(inspectImageResponse, not(nullValue()));
+        assertThat(inspectImageResponse.getId(), not(nullValue()));
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+        CreateContainerResponse container = dockerClient.createContainerCmd(inspectImageResponse.getId()).exec();
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getId(), notNullValue());
+        assertThat(inspectContainerResponse.getNetworkSettings().getPorts(), notNullValue());
+
+        // No use as such if not running on the server
+        // for (Ports.Port p : inspectContainerResponse.getNetworkSettings().getPorts().getAllPorts()) {
+        // int port = Integer.valueOf(p.getHostPort());
+        // LOG.info("Checking port {} is open", port);
+        // assertThat(available(port), is(false));
+        // }
+        dockerClient.stopContainerCmd(container.getId()).withTimeout(0).exec();
+
+    }
+
+    @Test
+    public void testAddAndCopySubstitution() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testENVSubstitution")
+                .getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("testENVSubstitution successfully completed"));
+    }
+
+    @Test
+    public void testBuildFromPrivateRegistry() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("privateRegistry").getFile());
+
+        String imageId = buildImage(baseDir);
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        assertThat(inspectImageResponse, not(nullValue()));
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+        dockerClient.tagImageCmd(imageId, "testregistry", "2").withForce().exec();
+
+        // see https://github.com/docker/distribution/blob/master/docs/deploying.md#native-basic-auth
+        CreateContainerResponse testregistry = dockerClient
+                .createContainerCmd("testregistry:2")
+                .withName("registry")
+                .withPortBindings(new PortBinding(new Ports.Binding(5000), ExposedPort.tcp(5000)))
+                .withEnv("REGISTRY_AUTH=htpasswd", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm",
+                        "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "REGISTRY_LOG_LEVEL=debug",
+                        "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key")
+                .exec();
+
+        dockerClient.startContainerCmd(testregistry.getId()).exec();
+
+        AuthConfig authConfig = new AuthConfig();
+
+        // credentials as configured in /auth/htpasswd
+        authConfig.setUsername("testuser");
+        authConfig.setPassword("testpassword");
+        authConfig.setEmail("foo@bar.de");
+        authConfig.setServerAddress("localhost:5000");
+
+        dockerClient.authCmd().withAuthConfig(authConfig).exec();
+        dockerClient.tagImageCmd("busybox:latest", "localhost:5000/testuser/busybox", "latest").withForce().exec();
+
+        dockerClient.pushImageCmd("localhost:5000/testuser/busybox").withTag("latest").withAuthConfig(authConfig)
+                .exec(new PushImageResultCallback()).awaitSuccess();
+
+        dockerClient.removeImageCmd("localhost:5000/testuser/busybox").withForce(true).exec();
+
+        baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testBuildFromPrivateRegistry")
+                .getFile());
+
+        AuthConfigurations authConfigurations = new AuthConfigurations();
+        authConfigurations.addConfig(authConfig);
+
+        imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).withBuildAuthConfigs(authConfigurations)
+                .exec(new BuildImageResultCallback()).awaitImageId();
+
+        inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        assertThat(inspectImageResponse, not(nullValue()));
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
new file mode 100644
index 000000000..fbb5cd547
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
@@ -0,0 +1,80 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.startsWith;
+import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
+
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectImageResponse;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class CommitCmdExecTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void commit() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("touch", "/test").exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        LOG.info("Commiting container: {}", container.toString());
+        String imageId = dockerClient.commitCmd(container.getId()).exec();
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+        assertThat(inspectImageResponse, hasField("container", startsWith(container.getId())));
+        assertThat(inspectImageResponse.getContainerConfig().getImage(), equalTo("busybox"));
+
+        InspectImageResponse busyboxImg = dockerClient.inspectImageCmd("busybox").exec();
+
+        assertThat(inspectImageResponse.getParent(), equalTo(busyboxImg.getId()));
+    }
+
+    @Test
+    public void commitNonExistingContainer() throws DockerException {
+        try {
+            dockerClient.commitCmd("non-existent").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExecTest.java
new file mode 100644
index 000000000..6d03064da
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExecTest.java
@@ -0,0 +1,80 @@
+package com.github.dockerjava.netty.exec;
+
+import static ch.lambdaj.Lambda.selectUnique;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.model.ChangeLog;
+import com.github.dockerjava.core.command.WaitContainerResultCallback;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class ContainerDiffCmdExecTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void testContainerDiff() throws DockerException {
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("touch", "/test").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+                .awaitStatusCode();
+        assertThat(exitCode, equalTo(0));
+
+        List<ChangeLog> filesystemDiff = dockerClient.containerDiffCmd(container.getId()).exec();
+        LOG.info("Container DIFF: {}", filesystemDiff.toString());
+
+        assertThat(filesystemDiff.size(), equalTo(1));
+        ChangeLog testChangeLog = selectUnique(filesystemDiff, hasField("path", equalTo("/test")));
+
+        assertThat(testChangeLog, hasField("path", equalTo("/test")));
+        assertThat(testChangeLog, hasField("kind", equalTo(1)));
+    }
+
+    @Test
+    public void testContainerDiffWithNonExistingContainer() throws DockerException {
+        try {
+            dockerClient.containerDiffCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java
new file mode 100644
index 000000000..d0a705a3a
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java
@@ -0,0 +1,73 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.not;
+
+import java.io.InputStream;
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class CopyFileFromContainerCmdExecTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void copyFromContainer() throws Exception {
+        // TODO extract this into a shared method
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withName("docker-java-itest-copyFromContainer").withCmd("touch", "/copyFromContainer").exec();
+
+        LOG.info("Created container: {}", container);
+        assertThat(container.getId(), not(isEmptyOrNullString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "/copyFromContainer").exec();
+        Boolean bytesAvailable = response.available() > 0;
+        assertTrue(bytesAvailable, "The file was not copied from the container.");
+
+        // read the stream fully. Otherwise, the underlying stream will not be closed.
+        String responseAsString = asString(response);
+        assertNotNull(responseAsString);
+        assertTrue(responseAsString.length() > 0);
+    }
+
+    @Test
+    public void copyFromNonExistingContainer() throws Exception {
+        try {
+            dockerClient.copyFileFromContainerCmd("non-existing", "/test").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException ignored) {
+        }
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java
new file mode 100644
index 000000000..0122858a7
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java
@@ -0,0 +1,162 @@
+package com.github.dockerjava.netty.exec;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.api.model.EventFilters;
+import com.github.dockerjava.core.command.EventsResultCallback;
+import com.github.dockerjava.core.command.PullImageResultCallback;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class EventsCmdExecTest extends AbstractDockerClientTest {
+
+    private static int KNOWN_NUM_EVENTS = 4;
+
+    private static String getEpochTime() {
+        return String.valueOf(System.currentTimeMillis() / 1000);
+    }
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    /*
+     * This specific test may fail with boot2docker as time may not in sync with host system
+     */
+    @Test
+    public void testEventStreamTimeBound() throws Exception {
+        // Don't include other tests events
+        TimeUnit.SECONDS.sleep(1);
+
+        String startTime = getEpochTime();
+        int expectedEvents = generateEvents();
+        String endTime = getEpochTime();
+
+        CountDownLatch countDownLatch = new CountDownLatch(expectedEvents);
+        EventsTestCallback eventCallback = new EventsTestCallback(countDownLatch);
+
+        dockerClient.eventsCmd().withSince(startTime).withUntil(endTime).exec(eventCallback);
+
+        Boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
+
+        eventCallback.close();
+
+        assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
+    }
+
+    @Test
+    public void testEventStreaming1() throws Exception {
+        // Don't include other tests events
+        TimeUnit.SECONDS.sleep(1);
+
+        CountDownLatch countDownLatch = new CountDownLatch(KNOWN_NUM_EVENTS);
+        EventsTestCallback eventCallback = new EventsTestCallback(countDownLatch);
+
+        dockerClient.eventsCmd().withSince(getEpochTime()).exec(eventCallback);
+
+        generateEvents();
+
+        Boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
+
+        eventCallback.close();
+        assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
+    }
+
+    @Test
+    public void testEventStreaming2() throws Exception {
+        // Don't include other tests events
+        TimeUnit.SECONDS.sleep(1);
+
+        CountDownLatch countDownLatch = new CountDownLatch(KNOWN_NUM_EVENTS);
+        EventsTestCallback eventCallback = new EventsTestCallback(countDownLatch);
+
+        dockerClient.eventsCmd().withSince(getEpochTime()).exec(eventCallback);
+
+        generateEvents();
+
+        Boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
+
+        eventCallback.close();
+        assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
+    }
+
+    public void testEventStreamingWithFilter() throws Exception {
+        // Don't include other tests events
+        TimeUnit.SECONDS.sleep(1);
+
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        EventsTestCallback eventCallback = dockerClient.eventsCmd().withFilters(new EventFilters().withEvent("start"))
+                .exec(new EventsTestCallback(countDownLatch));
+
+        generateEvents();
+
+        Boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
+
+        eventCallback.close();
+        assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
+    }
+
+    /**
+     * This method generates {#link KNOWN_NUM_EVENTS} events
+     */
+    private int generateEvents() throws Exception {
+        String testImage = "busybox";
+
+        dockerClient.pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd(testImage).withCmd("sleep", "9999").exec();
+        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerClient.stopContainerCmd(container.getId()).exec();
+        return KNOWN_NUM_EVENTS;
+    }
+
+    private class EventsTestCallback extends EventsResultCallback {
+
+        private final CountDownLatch countDownLatch;
+
+        private final List<Event> events = new ArrayList<Event>();
+
+        public EventsTestCallback(CountDownLatch countDownLatch) {
+            this.countDownLatch = countDownLatch;
+        }
+
+        public void onNext(Event event) {
+            LOG.info("Received event #{}: {}", countDownLatch.getCount(), event);
+            countDownLatch.countDown();
+            events.add(event);
+        }
+
+        public List<Event> getEvents() {
+            return new ArrayList<Event>(events);
+        }
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
index 3702a7102..a05e91b99 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
@@ -4,9 +4,12 @@
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.security.SecureRandom;
+import java.util.concurrent.TimeUnit;
 
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
@@ -94,4 +97,50 @@ public void execStartAttached() throws Exception {
         assertNotNull(responseAsString);
         assertTrue(responseAsString.length() > 0);
     }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void execStartAttachStdin() throws Exception {
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName(containerName).exec();
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InputStream stdin = new ByteArrayInputStream("echo STDIN\n".getBytes());
+
+        ByteArrayOutputStream stdout = new ByteArrayOutputStream();
+
+        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
+                .withAttachStdout(true).withAttachStdin(true).withCmd("/bin/sh").exec();
+        dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true).withStdIn(stdin)
+                .exec(new ExecStartResultCallback(stdout, System.err)).awaitCompletion(5, TimeUnit.SECONDS);
+
+        assertEquals(stdout.toString(), "STDIN\n");
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void execStartNotAttachedStdin() throws Exception {
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName(containerName).exec();
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InputStream stdin = new ByteArrayInputStream("echo STDIN\n".getBytes());
+
+        ByteArrayOutputStream stdout = new ByteArrayOutputStream();
+
+        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
+                .withAttachStdout(true).withAttachStdin(false).withCmd("/bin/sh").exec();
+        dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true).withStdIn(stdin)
+                .exec(new ExecStartResultCallback(stdout, System.err)).awaitCompletion(5, TimeUnit.SECONDS);
+
+        assertEquals(stdout.toString(), "");
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
index dde8b3ab9..e9403caa1 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
@@ -1,8 +1,6 @@
 package com.github.dockerjava.netty.exec;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
 
@@ -21,12 +19,8 @@
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.ExecCreateCmdResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.command.InspectExecResponse;
-import com.github.dockerjava.core.command.ExecStartResultCallback;
 import com.github.dockerjava.netty.AbstractDockerClientTest;
-import com.github.dockerjava.test.serdes.JSONTestHelper;
 
 @Test(groups = "integration")
 public class InspectContainerCmdExecTest extends AbstractDockerClientTest {
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
index c2fbc84a0..5efadaa2a 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
@@ -59,7 +59,7 @@ public void inspectExecTest() throws IOException {
         dockerClient.startContainerCmd(container.getId()).exec();
 
         ExecCreateCmdResponse touchFileCmdCreateResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true).withAttachStderr(true).withCmd("touch", "/marker").exec();
+                .withAttachStdout(true).withAttachStderr(true).withCmd("touch", "/marker").withTty(true).exec();
         LOG.info("Created exec {}", touchFileCmdCreateResponse.toString());
         assertThat(touchFileCmdCreateResponse.getId(), not(isEmptyString()));
         ExecCreateCmdResponse checkFileCmdCreateResponse = dockerClient.execCreateCmd(container.getId())
@@ -68,22 +68,26 @@ public void inspectExecTest() throws IOException {
         assertThat(checkFileCmdCreateResponse.getId(), not(isEmptyString()));
 
         // Check that file does not exist
-        dockerClient.execStartCmd(container.getId())
-                .withExecId(checkFileCmdCreateResponse.getId()).exec(new ExecStartResultCallback(System.out, System.err));
+        dockerClient.execStartCmd(container.getId()).withDetach(false).withTty(true)
+                .withExecId(checkFileCmdCreateResponse.getId())
+                .exec(new ExecStartResultCallback(System.out, System.err));
 
         InspectExecResponse first = dockerClient.inspectExecCmd(checkFileCmdCreateResponse.getId()).exec();
+        assertEquals(first.isRunning(), new Boolean(false));
         assertThat(first.getExitCode(), is(1));
 
         // Create the file
-        dockerClient.execStartCmd(container.getId())
-                .withExecId(touchFileCmdCreateResponse.getId()).exec(new ExecStartResultCallback(System.out, System.err));
+        dockerClient.execStartCmd(container.getId()).withDetach(false).withTty(true)
+                .withExecId(touchFileCmdCreateResponse.getId())
+                .exec(new ExecStartResultCallback(System.out, System.err));
 
         InspectExecResponse second = dockerClient.inspectExecCmd(touchFileCmdCreateResponse.getId()).exec();
+        assertEquals(first.isRunning(), new Boolean(false));
         assertThat(second.getExitCode(), is(0));
 
         // Check that file does exist now
-        dockerClient.execStartCmd(container.getId())
-                .withExecId(checkFileCmdCreateResponse.getId()).exec(new ExecStartResultCallback(System.out, System.err));
+        dockerClient.execStartCmd(container.getId()).withExecId(checkFileCmdCreateResponse.getId())
+                .exec(new ExecStartResultCallback(System.out, System.err));
 
         InspectExecResponse third = dockerClient.inspectExecCmd(checkFileCmdCreateResponse.getId()).exec();
         assertThat(third.getExitCode(), is(0));
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java
index 3f97aa69d..bf4cb7504 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java
@@ -58,8 +58,8 @@ public void testListContainers() throws Exception {
 
         String testImage = "busybox";
 
-//        // need to block until image is pulled completely
-//        dockerClient.pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess();
+        // // need to block until image is pulled completely
+        // dockerClient.pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess();
 
         List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
         assertThat(containers, notNullValue());
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java
new file mode 100644
index 000000000..24def3d4a
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java
@@ -0,0 +1,102 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.emptyArray;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.model.Image;
+import com.github.dockerjava.api.model.Info;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class ListImagesCmdExecTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void listImages() throws DockerException {
+        List<Image> images = dockerClient.listImagesCmd().withShowAll(true).exec();
+        assertThat(images, notNullValue());
+        LOG.info("Images List: {}", images);
+        Info info = dockerClient.infoCmd().exec();
+
+        assertThat(images.size(), equalTo(info.getImages()));
+
+        Image img = images.get(0);
+        assertThat(img.getCreated(), is(greaterThan(0L)));
+        assertThat(img.getVirtualSize(), is(greaterThan(0L)));
+        assertThat(img.getId(), not(isEmptyString()));
+        assertThat(img.getRepoTags(), not(emptyArray()));
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void listDanglingImages() throws DockerException {
+        String imageId = createDanglingImage();
+        List<Image> images = dockerClient.listImagesCmd().withFilters("{\"dangling\":[\"true\"]}").withShowAll(true)
+                .exec();
+        assertThat(images, notNullValue());
+        LOG.info("Images List: {}", images);
+        assertThat(images.size(), is(greaterThan(0)));
+        Boolean imageInFilteredList = isImageInFilteredList(images, imageId);
+        assertTrue(imageInFilteredList);
+    }
+
+    private boolean isImageInFilteredList(List<Image> images, String expectedImageId) {
+        for (Image image : images) {
+            if (expectedImageId.equals(image.getId())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private String createDanglingImage() {
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "5").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        LOG.info("Committing container {}", container.toString());
+        String imageId = dockerClient.commitCmd(container.getId()).exec();
+
+        dockerClient.stopContainerCmd(container.getId()).exec();
+        dockerClient.killContainerCmd(container.getId()).exec();
+        dockerClient.removeContainerCmd(container.getId()).exec();
+        return imageId;
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/PingCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/PingCmdExecTest.java
new file mode 100644
index 000000000..b98ff9bfd
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/PingCmdExecTest.java
@@ -0,0 +1,43 @@
+package com.github.dockerjava.netty.exec;
+
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class PingCmdExecTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void ping() throws DockerException {
+        dockerClient.pingCmd().exec();
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/PullImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/PullImageCmdExecTest.java
new file mode 100644
index 000000000..620519326
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/PullImageCmdExecTest.java
@@ -0,0 +1,119 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
+import static org.hamcrest.Matchers.notNullValue;
+
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.InspectImageResponse;
+import com.github.dockerjava.api.command.PullImageCmd;
+import com.github.dockerjava.api.model.Info;
+import com.github.dockerjava.api.model.PullResponseItem;
+import com.github.dockerjava.core.command.PullImageCmdImpl;
+import com.github.dockerjava.core.command.PullImageResultCallback;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class PullImageCmdExecTest extends AbstractDockerClientTest {
+
+    private static final PullImageCmd.Exec NOP_EXEC = new PullImageCmd.Exec() {
+        public Void exec(PullImageCmd command, ResultCallback<PullResponseItem> resultCallback) {
+            return null;
+        };
+    };
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void nullAuthConfig() throws Exception {
+        PullImageCmdImpl pullImageCmd = new PullImageCmdImpl(NOP_EXEC, null, "");
+        try {
+            pullImageCmd.withAuthConfig(null);
+            fail();
+        } catch (Exception e) {
+            assertEquals(e.getMessage(), "authConfig was not specified");
+        } finally {
+            pullImageCmd.close();
+        }
+    }
+
+    @Test
+    public void testPullImage() throws Exception {
+        Info info = dockerClient.infoCmd().exec();
+        LOG.info("Client info: {}", info.toString());
+
+        int imgCount = info.getImages();
+        LOG.info("imgCount1: {}", imgCount);
+
+        // This should be an image that is not used by other repositories
+        // already
+        // pulled down, preferably small in size. If tag is not used pull will
+        // download all images in that repository but tmpImgs will only
+        // deleted 'latest' image but not images with other tags
+        String testImage = "hackmann/empty";
+
+        LOG.info("Removing image: {}", testImage);
+
+        try {
+            dockerClient.removeImageCmd(testImage).withForce(true).exec();
+        } catch (NotFoundException e) {
+            // just ignore if not exist
+        }
+
+        info = dockerClient.infoCmd().exec();
+        LOG.info("Client info: {}", info.toString());
+
+        imgCount = info.getImages();
+        LOG.info("imgCount2: {}", imgCount);
+
+        LOG.info("Pulling image: {}", testImage);
+
+        dockerClient.pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess();
+
+        info = dockerClient.infoCmd().exec();
+        LOG.info("Client info after pull, {}", info.toString());
+
+        assertThat(imgCount, lessThanOrEqualTo(info.getImages()));
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(testImage).exec();
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+        assertThat(inspectImageResponse, notNullValue());
+    }
+
+    @Test
+    public void testPullNonExistingImage() throws Exception {
+
+        // does not throw an exception
+        // stream needs to be fully read in order to close the underlying connection
+        dockerClient.pullImageCmd("xvxcv/foo").exec(new PullImageResultCallback()).awaitCompletion();
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/PushImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/PushImageCmdExecTest.java
new file mode 100644
index 000000000..3c8bd4eb8
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/PushImageCmdExecTest.java
@@ -0,0 +1,79 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+import java.lang.reflect.Method;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.DockerClientException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.core.command.PullImageResultCallback;
+import com.github.dockerjava.core.command.PushImageResultCallback;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class PushImageCmdExecTest extends AbstractDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(PushImageCmdExecTest.class);
+
+    String username;
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+        username = dockerClient.authConfig().getUsername();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void pushLatest() throws Exception {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        LOG.info("Committing container: {}", container.toString());
+        String imageId = dockerClient.commitCmd(container.getId()).withRepository(username + "/busybox").exec();
+
+        // we have to block until image is pushed
+        dockerClient.pushImageCmd(username + "/busybox").exec(new PushImageResultCallback()).awaitSuccess();
+
+        LOG.info("Removing image: {}", imageId);
+        dockerClient.removeImageCmd(imageId).exec();
+
+        dockerClient.pullImageCmd(username + "/busybox").exec(new PullImageResultCallback()).awaitSuccess();
+    }
+
+    @Test(expectedExceptions = DockerClientException.class)
+    public void pushNonExistentImage() throws Exception {
+
+        dockerClient.pushImageCmd(username + "/xxx").exec(new PushImageResultCallback()).awaitSuccess();
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExecTest.java
new file mode 100644
index 000000000..58be803d6
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExecTest.java
@@ -0,0 +1,81 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.startsWith;
+import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.hamcrest.Matcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.core.command.WaitContainerResultCallback;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class RemoveContainerCmdExecTest extends AbstractDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(RemoveContainerCmdExecTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void removeContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true").exec();
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
+
+        LOG.info("Removing container: {}", container.getId());
+        dockerClient.removeContainerCmd(container.getId()).exec();
+
+        List<Container> containers2 = dockerClient.listContainersCmd().withShowAll(true).exec();
+
+        Matcher matcher = not(hasItem(hasField("id", startsWith(container.getId()))));
+        assertThat(containers2, matcher);
+
+    }
+
+    @Test
+    public void removeNonExistingContainer() throws DockerException {
+        try {
+            dockerClient.removeContainerCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RemoveImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RemoveImageCmdExecTest.java
new file mode 100644
index 000000000..e1e11c308
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/RemoveImageCmdExecTest.java
@@ -0,0 +1,88 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.startsWith;
+import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.hamcrest.Matcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class RemoveImageCmdExecTest extends AbstractDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(RemoveImageCmdExecTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void removeImage() throws DockerException, InterruptedException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        LOG.info("Committing container {}", container.toString());
+        String imageId = dockerClient.commitCmd(container.getId()).exec();
+
+        dockerClient.stopContainerCmd(container.getId()).exec();
+        dockerClient.killContainerCmd(container.getId()).exec();
+        dockerClient.removeContainerCmd(container.getId()).exec();
+
+        LOG.info("Removing image: {}", imageId);
+        dockerClient.removeImageCmd(imageId).exec();
+
+        List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
+
+        Matcher matcher = not(hasItem(hasField("id", startsWith(imageId))));
+        assertThat(containers, matcher);
+    }
+
+    @Test
+    public void removeNonExistingImage() throws DockerException, InterruptedException {
+        try {
+            dockerClient.removeImageCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RestartContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RestartContainerCmdExecTest.java
new file mode 100644
index 000000000..6fd50e122
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/RestartContainerCmdExecTest.java
@@ -0,0 +1,84 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class RestartContainerCmdExecTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void restartContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        String startTime = inspectContainerResponse.getState().getStartedAt();
+
+        dockerClient.restartContainerCmd(container.getId()).withtTimeout(2).exec();
+
+        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect After Restart: {}", inspectContainerResponse2.toString());
+
+        String startTime2 = inspectContainerResponse2.getState().getStartedAt();
+
+        assertThat(startTime, not(equalTo(startTime2)));
+
+        assertThat(inspectContainerResponse.getState().isRunning(), is(equalTo(true)));
+
+        dockerClient.killContainerCmd(container.getId()).exec();
+    }
+
+    @Test
+    public void restartNonExistingContainer() throws DockerException, InterruptedException {
+        try {
+            dockerClient.restartContainerCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/SaveImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/SaveImageCmdExecTest.java
new file mode 100644
index 000000000..399eb5341
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/SaveImageCmdExecTest.java
@@ -0,0 +1,55 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
+
+import java.io.InputStream;
+import java.lang.reflect.Method;
+
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class SaveImageCmdExecTest extends AbstractDockerClientTest {
+    public static final Logger LOG = LoggerFactory.getLogger(SaveImageCmdExecTest.class);
+
+    String username;
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void saveImage() throws Exception {
+
+        InputStream image = IOUtils.toBufferedInputStream(dockerClient.saveImageCmd("busybox").exec());
+        assertThat(image.available(), greaterThan(0));
+
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/SearchImagesCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/SearchImagesCmdExecTest.java
new file mode 100644
index 000000000..1055d6782
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/SearchImagesCmdExecTest.java
@@ -0,0 +1,59 @@
+package com.github.dockerjava.netty.exec;
+
+import static ch.lambdaj.Lambda.filter;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.is;
+import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.hamcrest.Matcher;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.model.SearchItem;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class SearchImagesCmdExecTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void searchImages() throws DockerException {
+        List<SearchItem> dockerSearch = dockerClient.searchImagesCmd("busybox").exec();
+        LOG.info("Search returned {}", dockerSearch.toString());
+
+        Matcher matcher = hasItem(hasField("name", equalTo("busybox")));
+        assertThat(dockerSearch, matcher);
+
+        assertThat(filter(hasField("name", is("busybox")), dockerSearch).size(), equalTo(1));
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
new file mode 100644
index 000000000..5beded265
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
@@ -0,0 +1,553 @@
+package com.github.dockerjava.netty.exec;
+
+import static com.github.dockerjava.api.model.AccessMode.ro;
+import static com.github.dockerjava.api.model.Capability.MKNOD;
+import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.startsWith;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.UUID;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.InternalServerErrorException;
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.command.StartContainerCmd;
+import com.github.dockerjava.api.model.AccessMode;
+import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.Device;
+import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.Link;
+import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.RestartPolicy;
+import com.github.dockerjava.api.model.Volume;
+import com.github.dockerjava.api.model.VolumeRW;
+import com.github.dockerjava.api.model.VolumesFrom;
+import com.github.dockerjava.core.command.WaitContainerResultCallback;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class StartContainerCmdExecTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void startContainerWithVolumes() throws DockerException {
+
+        // see http://docs.docker.io/use/working_with_volumes/
+        Volume volume1 = new Volume("/opt/webapp1");
+
+        Volume volume2 = new Volume("/opt/webapp2");
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withVolumes(volume1, volume2)
+                .withCmd("true").withBinds(new Bind("/src/webapp1", volume1, ro), new Bind("/src/webapp2", volume2))
+                .exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(), contains("/opt/webapp1", "/opt/webapp2"));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
+
+        inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertContainerHasVolumes(inspectContainerResponse, volume1, volume2);
+
+        assertThat(Arrays.asList(inspectContainerResponse.getVolumesRW()),
+                contains(new VolumeRW(volume1, AccessMode.ro), new VolumeRW(volume2)));
+
+    }
+
+    @Test
+    public void startContainerWithVolumesFrom() throws DockerException {
+
+        Volume volume1 = new Volume("/opt/webapp1");
+        Volume volume2 = new Volume("/opt/webapp2");
+
+        String container1Name = UUID.randomUUID().toString();
+
+        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName(container1Name)
+                .withBinds(new Bind("/src/webapp1", volume1), new Bind("/src/webapp2", volume2)).exec();
+        LOG.info("Created container1 {}", container1.toString());
+
+        dockerClient.startContainerCmd(container1.getId()).exec();
+        LOG.info("Started container1 {}", container1.toString());
+
+        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+                .exec();
+
+        assertContainerHasVolumes(inspectContainerResponse1, volume1, volume2);
+
+        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withVolumesFrom(new VolumesFrom(container1Name)).exec();
+        LOG.info("Created container2 {}", container2.toString());
+
+        dockerClient.startContainerCmd(container2.getId()).exec();
+        LOG.info("Started container2 {}", container2.toString());
+
+        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+                .exec();
+
+        assertContainerHasVolumes(inspectContainerResponse2, volume1, volume2);
+    }
+
+    @Test
+    public void startContainerWithDns() throws DockerException {
+
+        String aDnsServer = "8.8.8.8";
+        String anotherDnsServer = "8.8.4.4";
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withDns(aDnsServer, anotherDnsServer).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()),
+                contains(aDnsServer, anotherDnsServer));
+    }
+
+    @Test
+    public void startContainerWithDnsSearch() throws DockerException {
+
+        String dnsSearch = "example.com";
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withDnsSearch(dnsSearch).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDnsSearch()), contains(dnsSearch));
+    }
+
+    @Test
+    public void startContainerWithPortBindings() throws DockerException {
+
+        ExposedPort tcp22 = ExposedPort.tcp(22);
+        ExposedPort tcp23 = ExposedPort.tcp(23);
+
+        Ports portBindings = new Ports();
+        portBindings.bind(tcp22, Ports.Binding(11022));
+        portBindings.bind(tcp23, Ports.Binding(11023));
+        portBindings.bind(tcp23, Ports.Binding(11024));
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
+
+        assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
+                is(equalTo(Ports.Binding(11022))));
+
+        assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
+                is(equalTo(Ports.Binding(11023))));
+
+        assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
+                is(equalTo(Ports.Binding(11024))));
+
+    }
+
+    @Test
+    public void startContainerWithRandomPortBindings() throws DockerException {
+
+        ExposedPort tcp22 = ExposedPort.tcp(22);
+        ExposedPort tcp23 = ExposedPort.tcp(23);
+
+        Ports portBindings = new Ports();
+        portBindings.bind(tcp22, Ports.Binding(null));
+        portBindings.bind(tcp23, Ports.Binding(null));
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).withPublishAllPorts(true).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
+
+        assertThat(inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(tcp22)[0].getHostPort(),
+                is(not(equalTo(tcp22.getPort()))));
+
+        assertThat(inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(tcp23)[0].getHostPort(),
+                is(not(equalTo(tcp23.getPort()))));
+
+    }
+
+    @Test
+    public void startContainerWithConflictingPortBindings() throws DockerException {
+
+        ExposedPort tcp22 = ExposedPort.tcp(22);
+        ExposedPort tcp23 = ExposedPort.tcp(23);
+
+        Ports portBindings = new Ports();
+        portBindings.bind(tcp22, Ports.Binding(11022));
+        portBindings.bind(tcp23, Ports.Binding(11022));
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        try {
+            dockerClient.startContainerCmd(container.getId()).exec();
+            fail("expected InternalServerErrorException");
+        } catch (InternalServerErrorException e) {
+
+        }
+
+    }
+
+    @Test
+    public void startContainerWithLinkingDeprecated() throws DockerException {
+
+        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName("container1").exec();
+
+        LOG.info("Created container1 {}", container1.toString());
+        assertThat(container1.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container1.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+                .exec();
+        LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
+
+        assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId()));
+        assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
+        assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
+        assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
+
+        if (!inspectContainerResponse1.getState().isRunning()) {
+            assertThat(inspectContainerResponse1.getState().getExitCode(), is(equalTo(0)));
+        }
+
+        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName("container2").withLinks(new Link("container1", "container1Link")).exec();
+
+        LOG.info("Created container2 {}", container2.toString());
+        assertThat(container2.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container2.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+                .exec();
+        LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
+
+        assertThat(inspectContainerResponse2.getConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
+                "container1Link") }));
+        assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
+        assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
+        assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse2.getState(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getState().isRunning(), is(true));
+
+    }
+
+    @Test
+    public void startContainerWithLinking() throws DockerException {
+
+        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName("container1").exec();
+
+        LOG.info("Created container1 {}", container1.toString());
+        assertThat(container1.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container1.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+                .exec();
+        LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
+
+        assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId()));
+        assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
+        assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
+        assertThat(inspectContainerResponse1.getState().isRunning(), is(true));
+
+        if (!inspectContainerResponse1.getState().isRunning()) {
+            assertThat(inspectContainerResponse1.getState().getExitCode(), is(equalTo(0)));
+        }
+
+        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName("container2").withLinks(new Link("container1", "container1Link")).exec();
+
+        LOG.info("Created container2 {}", container2.toString());
+        assertThat(container2.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container2.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+                .exec();
+        LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
+
+        assertThat(inspectContainerResponse2.getConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
+                "container1Link") }));
+        assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
+        assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
+        assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse2.getState(), is(notNullValue()));
+        assertThat(inspectContainerResponse2.getState().isRunning(), is(true));
+
+    }
+
+    @Test
+    public void startContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd(new String[] { "top" })
+                .exec();
+
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        assertThat(inspectContainerResponse.getConfig(), is(notNullValue()));
+        assertThat(inspectContainerResponse.getId(), not(isEmptyString()));
+
+        assertThat(inspectContainerResponse.getId(), startsWith(container.getId()));
+
+        assertThat(inspectContainerResponse.getImageId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse.getState(), is(notNullValue()));
+
+        assertThat(inspectContainerResponse.getState().isRunning(), is(true));
+
+        if (!inspectContainerResponse.getState().isRunning()) {
+            assertThat(inspectContainerResponse.getState().getExitCode(), is(equalTo(0)));
+        }
+    }
+
+    @Test
+    public void testStartNonExistingContainer() throws DockerException {
+        try {
+            dockerClient.startContainerCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
+
+    /**
+     * This tests support for --net option for the docker run command: --net="bridge" Set the Network mode for the
+     * container 'bridge': creates a new network stack for the container on the docker bridge 'none': no networking for
+     * this container 'container:': reuses another container network stack 'host': use the host network stack inside the
+     * container. Note: the host mode gives the container full access to local system services such as D-bus and is
+     * therefore considered insecure.
+     */
+    @Test
+    public void startContainerWithNetworkMode() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+                .withNetworkMode("host").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getHostConfig().getNetworkMode(), is(equalTo("host")));
+    }
+
+    @Test
+    public void startContainerWithCapAddAndCapDrop() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withCapAdd(NET_ADMIN).withCapDrop(MKNOD).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getState().isRunning(), is(true));
+
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getCapAdd()), contains(NET_ADMIN));
+
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getCapDrop()), contains(MKNOD));
+    }
+
+    @Test
+    public void startContainerWithDevices() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withDevices(new Device("rwm", "/dev/nulo", "/dev/zero")).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getState().isRunning(), is(true));
+
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDevices()), contains(new Device("rwm",
+                "/dev/nulo", "/dev/zero")));
+    }
+
+    @Test
+    public void startContainerWithExtraHosts() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withExtraHosts("dockerhost:127.0.0.1").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getState().isRunning(), is(true));
+
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getExtraHosts()),
+                contains("dockerhost:127.0.0.1"));
+    }
+
+    @Test
+    public void startContainerWithRestartPolicy() throws DockerException {
+
+        RestartPolicy restartPolicy = RestartPolicy.onFailureRestart(5);
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withRestartPolicy(restartPolicy).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getState().isRunning(), is(true));
+
+        assertThat(inspectContainerResponse.getHostConfig().getRestartPolicy(), is(equalTo(restartPolicy)));
+    }
+
+    @Test
+    public void existingHostConfigIsPreservedByBlankStartCmd() throws DockerException {
+
+        String dnsServer = "8.8.8.8";
+
+        // prepare a container with custom DNS
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withDns(dnsServer)
+                .withCmd("true").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        // start container _without_any_customization_ (important!)
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        // The DNS setting survived.
+        assertThat(inspectContainerResponse.getHostConfig().getDns(), is(notNullValue()));
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()), contains(dnsServer));
+    }
+
+    @Test
+    public void anUnconfiguredCommandSerializesToEmptyJson() throws Exception {
+        ObjectMapper objectMapper = new ObjectMapper();
+        StartContainerCmd command = dockerClient.startContainerCmd("");
+        assertThat(objectMapper.writeValueAsString(command), is("{}"));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/StatsCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/StatsCmdExecTest.java
new file mode 100644
index 000000000..9b3e0a377
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/StatsCmdExecTest.java
@@ -0,0 +1,106 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.security.SecureRandom;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.model.Statistics;
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class StatsCmdExecTest extends AbstractDockerClientTest {
+
+    private static int NUM_STATS = 5;
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void testStatsStreaming() throws InterruptedException, IOException {
+        TimeUnit.SECONDS.sleep(1);
+
+        CountDownLatch countDownLatch = new CountDownLatch(NUM_STATS);
+
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
+                .withName(containerName).exec();
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        StatsCallbackTest statsCallback = dockerClient.statsCmd().withContainerId(container.getId())
+                .exec(new StatsCallbackTest(countDownLatch));
+
+        countDownLatch.await(3, TimeUnit.SECONDS);
+        Boolean gotStats = statsCallback.gotStats();
+
+        LOG.info("Stop stats collection");
+
+        statsCallback.close();
+
+        LOG.info("Stopping container");
+        dockerClient.stopContainerCmd(container.getId()).exec();
+        dockerClient.removeContainerCmd(container.getId()).exec();
+
+        LOG.info("Completed test");
+        assertTrue(gotStats, "Expected true");
+
+    }
+
+    private class StatsCallbackTest extends ResultCallbackTemplate<StatsCallbackTest, Statistics> {
+        private final CountDownLatch countDownLatch;
+
+        private Boolean gotStats = false;
+
+        public StatsCallbackTest(CountDownLatch countDownLatch) {
+            this.countDownLatch = countDownLatch;
+        }
+
+        @Override
+        public void onNext(Statistics stats) {
+            LOG.info("Received stats #{}: {}", countDownLatch.getCount(), stats);
+            if (stats != null) {
+                gotStats = true;
+            }
+            countDownLatch.countDown();
+        }
+
+        public Boolean gotStats() {
+            return gotStats;
+        }
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/TagImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/TagImageCmdExecTest.java
new file mode 100644
index 000000000..edfc1b657
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/TagImageCmdExecTest.java
@@ -0,0 +1,63 @@
+package com.github.dockerjava.netty.exec;
+
+import java.lang.reflect.Method;
+
+import org.apache.commons.lang.math.RandomUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.NotFoundException;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class TagImageCmdExecTest extends AbstractDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(TagImageCmdExecTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void tagImage() throws Exception {
+        String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
+
+        dockerClient.tagImageCmd("busybox:latest", "docker-java/busybox", tag).exec();
+
+        dockerClient.removeImageCmd("docker-java/busybox:" + tag).exec();
+    }
+
+    @Test
+    public void tagNonExistingImage() throws Exception {
+        String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
+
+        try {
+            dockerClient.tagImageCmd("non-existing", "docker-java/busybox", tag).exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/VersionCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/VersionCmdExecTest.java
new file mode 100644
index 000000000..78ac5ee27
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/VersionCmdExecTest.java
@@ -0,0 +1,52 @@
+package com.github.dockerjava.netty.exec;
+
+import java.lang.reflect.Method;
+
+import org.apache.commons.lang.StringUtils;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.model.Version;
+import com.github.dockerjava.netty.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class VersionCmdExecTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void version() throws DockerException {
+        Version version = dockerClient.versionCmd().exec();
+        LOG.info(version.toString());
+
+        assertTrue(version.getGoVersion().length() > 0);
+        assertTrue(version.getVersion().length() > 0);
+
+        assertEquals(StringUtils.split(version.getVersion(), ".").length, 3);
+
+    }
+
+}

From 83c0407b22b50618e09101cc0282b0fc0362c878 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 1 Dec 2015 21:09:40 +0100
Subject: [PATCH 0310/1272] Basic http proxy configuration support

---
 .../jaxrs/DockerCmdExecFactoryImpl.java       | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index c331f461c..26c78a6d4 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -45,6 +45,7 @@
 import com.github.dockerjava.jaxrs.filter.JsonClientFilter;
 import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter;
 import com.github.dockerjava.jaxrs.filter.SelectiveLoggingFilter;
+
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.conn.socket.PlainConnectionSocketFactory;
@@ -63,8 +64,13 @@
 import javax.ws.rs.client.ClientRequestFilter;
 import javax.ws.rs.client.ClientResponseFilter;
 import javax.ws.rs.client.WebTarget;
+
 import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
 import java.net.URI;
+import java.util.List;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -96,6 +102,7 @@ public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
     @Override
     public void init(DockerClientConfig dockerClientConfig) {
         checkNotNull(dockerClientConfig, "config was not specified");
+        this.dockerClientConfig = dockerClientConfig;
 
         ClientConfig clientConfig = new ClientConfig();
         clientConfig.connectorProvider(new ApacheConnectorProvider());
@@ -135,11 +142,14 @@ public void init(DockerClientConfig dockerClientConfig) {
         SSLContext sslContext = null;
 
         if (dockerClientConfig.getSslConfig() != null) {
+            configureProxy(clientConfig, "https");
             try {
                 sslContext = dockerClientConfig.getSslConfig().getSSLContext();
             } catch (Exception ex) {
                 throw new DockerClientException("Error in SSL Configuration", ex);
             }
+        } else {
+            configureProxy(clientConfig, "http");
         }
 
         PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(
@@ -170,7 +180,30 @@ public void init(DockerClientConfig dockerClientConfig) {
 
         baseResource = client.target(dockerClientConfig.getUri()).path(dockerClientConfig.getVersion().asWebPathPart());
 
-        this.dockerClientConfig = dockerClientConfig;
+    }
+
+    private void configureProxy(ClientConfig clientConfig, String protocol) {
+
+        List<Proxy> proxies = ProxySelector.getDefault().select(dockerClientConfig.getUri());
+
+        for (Proxy proxy : proxies) {
+            InetSocketAddress address = (InetSocketAddress) proxy.address();
+            if (address != null) {
+                String hostname = address.getHostName();
+                int port = address.getPort();
+
+                clientConfig.property(ClientProperties.PROXY_URI, protocol + "://" + hostname + ":" + port);
+
+                String httpProxyUser = System.getProperty(protocol + ".proxyUser");
+                if (httpProxyUser != null) {
+                    clientConfig.property(ClientProperties.PROXY_USERNAME, httpProxyUser);
+                    String httpProxyPassword = System.getProperty(protocol + ".proxyPassword");
+                    if (httpProxyPassword != null) {
+                        clientConfig.property(ClientProperties.PROXY_PASSWORD, httpProxyPassword);
+                    }
+                }
+            }
+        }
     }
 
     private org.apache.http.config.Registry<ConnectionSocketFactory> getSchemeRegistry(final URI originalUri,

From 04de9fbe56192a647e35d17134d4cfc4b0e0c34f Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 1 Dec 2015 21:41:52 +0100
Subject: [PATCH 0311/1272] Make ProgressDetails attributes public

---
 .../dockerjava/api/model/ResponseItem.java    | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
index ea16c0801..c9a77554a 100644
--- a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
@@ -100,13 +100,25 @@ public static class ProgressDetail implements Serializable {
         private static final long serialVersionUID = -1954994695645715264L;
 
         @JsonProperty("current")
-        long current;
+        public long current;
 
         @JsonProperty("total")
-        long total;
+        public long total;
 
         @JsonProperty("start")
-        long start;
+        public long start;
+
+        public long getCurrent() {
+            return current;
+        }
+
+        public long getTotal() {
+            return total;
+        }
+
+        public long getStart() {
+            return start;
+        }
 
         @Override
         public String toString() {
@@ -124,6 +136,14 @@ public static class ErrorDetail implements Serializable {
         @JsonProperty("message")
         String message;
 
+        public int getCode() {
+            return code;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
         @Override
         public String toString() {
             return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();

From fb565f12fa27d9b1ab144a25103ae269aa251761 Mon Sep 17 00:00:00 2001
From: Zach Marshall <Zach.Marshall@sas.com>
Date: Sat, 21 Nov 2015 13:10:30 -0500
Subject: [PATCH 0312/1272] Allow legacy registry message to indicate pull
 success

If build node is pulling from older registry and build node reports
legacy registry message, docker java will treat this as a failure.
This update allows this message to be treated as a success condition.

Add tests for PullItemResponse

Add new tests for testing the error/success logic of
PullItemResponse. Update test framework with minor refactoring.
---
 .../api/model/PullResponseItem.java           |  9 ++-
 .../api/model/PullResponseItemTest.java       | 63 +++++++++++++++++++
 .../api/model/PullResponseJSONSamples.java    | 37 +++++++++++
 .../test/serdes/JSONTestHelper.java           | 18 +++---
 .../api/model/pullImageResponse_error.json    |  1 +
 .../api/model/pullImageResponse_legacy.json   |  1 +
 .../model/pullImageResponse_newerImage.json   |  1 +
 .../api/model/pullImageResponse_upToDate.json |  1 +
 8 files changed, 121 insertions(+), 10 deletions(-)
 create mode 100644 src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java
 create mode 100644 src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java
 create mode 100644 src/test/resources/com/github/dockerjava/api/model/pullImageResponse_error.json
 create mode 100644 src/test/resources/com/github/dockerjava/api/model/pullImageResponse_legacy.json
 create mode 100644 src/test/resources/com/github/dockerjava/api/model/pullImageResponse_newerImage.json
 create mode 100644 src/test/resources/com/github/dockerjava/api/model/pullImageResponse_upToDate.json

diff --git a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
index 834060b99..28aa3b14c 100644
--- a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
@@ -10,6 +10,10 @@
 public class PullResponseItem extends ResponseItem {
 
     private static final long serialVersionUID = -2575482839766823293L;
+    private static final String LEGACY_REGISTRY = "this image was pulled from a legacy registry";
+    private static final String DOWNLOADED_NEWER_IMAGE = "Downloaded newer image";
+    private static final String IMAGE_UP_TO_DATE = "Image is up to date";
+    private static final String DOWNLOAD_COMPLETE = "Download complete";
 
     /**
      * Returns whether the status indicates a successful pull operation
@@ -22,8 +26,9 @@ public boolean isPullSuccessIndicated() {
             return false;
         }
 
-        return (getStatus().contains("Download complete") || getStatus().contains("Image is up to date") || getStatus()
-                .contains("Downloaded newer image"));
+        return (getStatus().contains(DOWNLOAD_COMPLETE) || getStatus().contains(IMAGE_UP_TO_DATE)
+                || getStatus().contains(DOWNLOADED_NEWER_IMAGE)
+                || getStatus().contains(LEGACY_REGISTRY));
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java b/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java
new file mode 100644
index 000000000..c69130d1f
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015, Zach Marshall.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.dockerjava.api.model;
+
+import static com.github.dockerjava.test.serdes.JSONTestHelper.testRoundTrip;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+import java.io.IOException;
+
+import org.testng.annotations.Test;
+
+/**
+ * Tests logic of PullResponseItem's error/success handling by simulating a JSON response.
+ *
+ * @author Zach Marshall
+ */
+public class PullResponseItemTest {
+    @Test
+    public void pullNewerImage() throws IOException {
+        PullResponseItem response =
+                testRoundTrip(PullResponseJSONSamples.pullImageResponse_newerImage, PullResponseItem.class);
+        assertTrue(response.isPullSuccessIndicated());
+        assertFalse(response.isErrorIndicated());
+    }
+
+    @Test
+    public void pullUpToDate() throws IOException {
+        PullResponseItem response =
+                testRoundTrip(PullResponseJSONSamples.pullImageResponse_upToDate, PullResponseItem.class);
+        assertTrue(response.isPullSuccessIndicated());
+        assertFalse(response.isErrorIndicated());
+    }
+
+    @Test
+    public void pullLegacyRegistry() throws IOException {
+        PullResponseItem response =
+                testRoundTrip(PullResponseJSONSamples.pullImageResponse_legacy, PullResponseItem.class);
+        assertTrue(response.isPullSuccessIndicated());
+        assertFalse(response.isErrorIndicated());
+    }
+
+    @Test
+    public void pullAndEncounterError() throws IOException {
+        PullResponseItem response =
+                testRoundTrip(PullResponseJSONSamples.pullImageResponse_error, PullResponseItem.class);
+        assertFalse(response.isPullSuccessIndicated());
+        assertTrue(response.isErrorIndicated());
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java b/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java
new file mode 100644
index 000000000..31cdf0f3b
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015 Zach Marshall.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.dockerjava.api.model;
+
+import com.github.dockerjava.test.serdes.JSONResourceRef;
+
+/**
+ * Enumeration for the available pull response statuses.
+ *
+ * @author Zach Marshall
+ */
+public enum PullResponseJSONSamples implements JSONResourceRef {
+    pullImageResponse_legacy, pullImageResponse_error, pullImageResponse_newerImage, pullImageResponse_upToDate;
+
+    @Override
+    public String getFileName() {
+        return this + ".json";
+    }
+
+    @Override
+    public Class<?> getResourceClass() {
+        return PullResponseJSONSamples.class;
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java b/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
index 602a6e76f..32c373d09 100644
--- a/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
+++ b/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
@@ -25,13 +25,14 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.command.CommandJSONSamples;
 
 /**
- * Provides helper methods for serialization-deserialization tests
- * 
+ * Provides helper methods for serialization-deserialization tests.
+ *
+ * <p><b>TODO</b>: Create helper that loads json files from simple folder
+ * structure using a type, version number, and name.</p>
+ *
  * @author Oleg Nenashev
- * @since TODO
  */
 public class JSONTestHelper {
 
@@ -45,11 +46,12 @@ public class JSONTestHelper {
      *             JSON Conversion error
      */
     public static String readString(JSONResourceRef resource) throws IOException {
-        InputStream istream = CommandJSONSamples.class.getResourceAsStream(resource.getFileName());
-        if (istream == null) {
-            throw new IOException("Cannot retrieve resource " + resource.getFileName());
+        try (InputStream istream = resource.getResourceClass().getResourceAsStream(resource.getFileName())) {
+            if (istream == null) {
+                throw new IOException("Cannot retrieve resource " + resource.getFileName());
+            }
+            return IOUtils.toString(istream, "UTF-8");
         }
-        return IOUtils.toString(istream, "UTF-8");
     }
 
     /**
diff --git a/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_error.json b/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_error.json
new file mode 100644
index 000000000..f2ed0ddf2
--- /dev/null
+++ b/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_error.json
@@ -0,0 +1 @@
+{"errorDetail":{"message":"Error: image cccxxx/xxxccc:latest not found"},"error":"Error: image cccxxx/xxxccc:latest not found"}
diff --git a/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_legacy.json b/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_legacy.json
new file mode 100644
index 000000000..9c755cf5b
--- /dev/null
+++ b/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_legacy.json
@@ -0,0 +1 @@
+{"status":"docker.com/xxxxcv/ccccxx: this image was pulled from a legacy registry.  Important: This registry version will not be supported in future versions of docker."}
diff --git a/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_newerImage.json b/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_newerImage.json
new file mode 100644
index 000000000..e5046c8b1
--- /dev/null
+++ b/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_newerImage.json
@@ -0,0 +1 @@
+{"status":"Downloaded newer image for docker.com/xxxxcv/ccccxx"}
diff --git a/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_upToDate.json b/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_upToDate.json
new file mode 100644
index 000000000..e821ce688
--- /dev/null
+++ b/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_upToDate.json
@@ -0,0 +1 @@
+{"status":"Image is up to date for docker.com/xxxxcv/ccccxx"}

From c03f0c5ed2dc54248113f36a9a70843dd671ce30 Mon Sep 17 00:00:00 2001
From: Zach Marshall <Zach.Marshall@sas.com>
Date: Sat, 21 Nov 2015 13:10:30 -0500
Subject: [PATCH 0313/1272] Allow legacy registry message to indicate pull
 success

If build node is pulling from older registry and build node reports
legacy registry message, docker java will treat this as a failure.
This update allows this message to be treated as a success condition.

Add tests for PullItemResponse

Add new tests for testing the error/success logic of
PullItemResponse. Update test framework with minor refactoring.
---
 .../api/model/PullResponseItem.java           |  9 ++-
 .../api/model/PullResponseItemTest.java       | 63 +++++++++++++++++++
 .../api/model/PullResponseJSONSamples.java    | 37 +++++++++++
 .../test/serdes/JSONTestHelper.java           | 18 +++---
 .../api/model/pullImageResponse_error.json    |  1 +
 .../api/model/pullImageResponse_legacy.json   |  1 +
 .../model/pullImageResponse_newerImage.json   |  1 +
 .../api/model/pullImageResponse_upToDate.json |  1 +
 8 files changed, 121 insertions(+), 10 deletions(-)
 create mode 100644 src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java
 create mode 100644 src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java
 create mode 100644 src/test/resources/com/github/dockerjava/api/model/pullImageResponse_error.json
 create mode 100644 src/test/resources/com/github/dockerjava/api/model/pullImageResponse_legacy.json
 create mode 100644 src/test/resources/com/github/dockerjava/api/model/pullImageResponse_newerImage.json
 create mode 100644 src/test/resources/com/github/dockerjava/api/model/pullImageResponse_upToDate.json

diff --git a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
index 834060b99..28aa3b14c 100644
--- a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
@@ -10,6 +10,10 @@
 public class PullResponseItem extends ResponseItem {
 
     private static final long serialVersionUID = -2575482839766823293L;
+    private static final String LEGACY_REGISTRY = "this image was pulled from a legacy registry";
+    private static final String DOWNLOADED_NEWER_IMAGE = "Downloaded newer image";
+    private static final String IMAGE_UP_TO_DATE = "Image is up to date";
+    private static final String DOWNLOAD_COMPLETE = "Download complete";
 
     /**
      * Returns whether the status indicates a successful pull operation
@@ -22,8 +26,9 @@ public boolean isPullSuccessIndicated() {
             return false;
         }
 
-        return (getStatus().contains("Download complete") || getStatus().contains("Image is up to date") || getStatus()
-                .contains("Downloaded newer image"));
+        return (getStatus().contains(DOWNLOAD_COMPLETE) || getStatus().contains(IMAGE_UP_TO_DATE)
+                || getStatus().contains(DOWNLOADED_NEWER_IMAGE)
+                || getStatus().contains(LEGACY_REGISTRY));
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java b/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java
new file mode 100644
index 000000000..c69130d1f
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015, Zach Marshall.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.dockerjava.api.model;
+
+import static com.github.dockerjava.test.serdes.JSONTestHelper.testRoundTrip;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+import java.io.IOException;
+
+import org.testng.annotations.Test;
+
+/**
+ * Tests logic of PullResponseItem's error/success handling by simulating a JSON response.
+ *
+ * @author Zach Marshall
+ */
+public class PullResponseItemTest {
+    @Test
+    public void pullNewerImage() throws IOException {
+        PullResponseItem response =
+                testRoundTrip(PullResponseJSONSamples.pullImageResponse_newerImage, PullResponseItem.class);
+        assertTrue(response.isPullSuccessIndicated());
+        assertFalse(response.isErrorIndicated());
+    }
+
+    @Test
+    public void pullUpToDate() throws IOException {
+        PullResponseItem response =
+                testRoundTrip(PullResponseJSONSamples.pullImageResponse_upToDate, PullResponseItem.class);
+        assertTrue(response.isPullSuccessIndicated());
+        assertFalse(response.isErrorIndicated());
+    }
+
+    @Test
+    public void pullLegacyRegistry() throws IOException {
+        PullResponseItem response =
+                testRoundTrip(PullResponseJSONSamples.pullImageResponse_legacy, PullResponseItem.class);
+        assertTrue(response.isPullSuccessIndicated());
+        assertFalse(response.isErrorIndicated());
+    }
+
+    @Test
+    public void pullAndEncounterError() throws IOException {
+        PullResponseItem response =
+                testRoundTrip(PullResponseJSONSamples.pullImageResponse_error, PullResponseItem.class);
+        assertFalse(response.isPullSuccessIndicated());
+        assertTrue(response.isErrorIndicated());
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java b/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java
new file mode 100644
index 000000000..31cdf0f3b
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2015 Zach Marshall.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.dockerjava.api.model;
+
+import com.github.dockerjava.test.serdes.JSONResourceRef;
+
+/**
+ * Enumeration for the available pull response statuses.
+ *
+ * @author Zach Marshall
+ */
+public enum PullResponseJSONSamples implements JSONResourceRef {
+    pullImageResponse_legacy, pullImageResponse_error, pullImageResponse_newerImage, pullImageResponse_upToDate;
+
+    @Override
+    public String getFileName() {
+        return this + ".json";
+    }
+
+    @Override
+    public Class<?> getResourceClass() {
+        return PullResponseJSONSamples.class;
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java b/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
index 602a6e76f..32c373d09 100644
--- a/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
+++ b/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
@@ -25,13 +25,14 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.command.CommandJSONSamples;
 
 /**
- * Provides helper methods for serialization-deserialization tests
- * 
+ * Provides helper methods for serialization-deserialization tests.
+ *
+ * <p><b>TODO</b>: Create helper that loads json files from simple folder
+ * structure using a type, version number, and name.</p>
+ *
  * @author Oleg Nenashev
- * @since TODO
  */
 public class JSONTestHelper {
 
@@ -45,11 +46,12 @@ public class JSONTestHelper {
      *             JSON Conversion error
      */
     public static String readString(JSONResourceRef resource) throws IOException {
-        InputStream istream = CommandJSONSamples.class.getResourceAsStream(resource.getFileName());
-        if (istream == null) {
-            throw new IOException("Cannot retrieve resource " + resource.getFileName());
+        try (InputStream istream = resource.getResourceClass().getResourceAsStream(resource.getFileName())) {
+            if (istream == null) {
+                throw new IOException("Cannot retrieve resource " + resource.getFileName());
+            }
+            return IOUtils.toString(istream, "UTF-8");
         }
-        return IOUtils.toString(istream, "UTF-8");
     }
 
     /**
diff --git a/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_error.json b/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_error.json
new file mode 100644
index 000000000..f2ed0ddf2
--- /dev/null
+++ b/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_error.json
@@ -0,0 +1 @@
+{"errorDetail":{"message":"Error: image cccxxx/xxxccc:latest not found"},"error":"Error: image cccxxx/xxxccc:latest not found"}
diff --git a/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_legacy.json b/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_legacy.json
new file mode 100644
index 000000000..9c755cf5b
--- /dev/null
+++ b/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_legacy.json
@@ -0,0 +1 @@
+{"status":"docker.com/xxxxcv/ccccxx: this image was pulled from a legacy registry.  Important: This registry version will not be supported in future versions of docker."}
diff --git a/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_newerImage.json b/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_newerImage.json
new file mode 100644
index 000000000..e5046c8b1
--- /dev/null
+++ b/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_newerImage.json
@@ -0,0 +1 @@
+{"status":"Downloaded newer image for docker.com/xxxxcv/ccccxx"}
diff --git a/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_upToDate.json b/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_upToDate.json
new file mode 100644
index 000000000..e821ce688
--- /dev/null
+++ b/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_upToDate.json
@@ -0,0 +1 @@
+{"status":"Image is up to date for docker.com/xxxxcv/ccccxx"}

From 51e3983b32f9b43086586fa668c351b0f5e6bb63 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 2 Dec 2015 23:07:35 +0100
Subject: [PATCH 0314/1272] Remove public from members as getters are public
 already

---
 .../java/com/github/dockerjava/api/model/ResponseItem.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
index c9a77554a..3ad013786 100644
--- a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
@@ -100,13 +100,13 @@ public static class ProgressDetail implements Serializable {
         private static final long serialVersionUID = -1954994695645715264L;
 
         @JsonProperty("current")
-        public long current;
+        long current;
 
         @JsonProperty("total")
-        public long total;
+        long total;
 
         @JsonProperty("start")
-        public long start;
+        long start;
 
         public long getCurrent() {
             return current;

From 0576e8ef249622d72d4447a0f392a4c5c8783388 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Wed, 2 Dec 2015 23:20:18 +0100
Subject: [PATCH 0315/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62b2e65bb..5e4ecdb37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,8 @@ Change Log
 ===
 2.1.3-SNAPSHOT
 ---
-* [#362] (https://github.com/docker-java/docker-java/pull/362) Deprecate "network" and enable "networks" stats (remote Docker API 1.21) 
+* [#387] (https://github.com/docker-java/docker-java/pull/387) Make ProgressDetails attributes public
+* [#362] (https://github.com/docker-java/docker-java/pull/362) Deprecate "network" and enable "networks" stats (remote Docker API 1.21)
 
 ===
 v2.1.2

From 09909136805a6adce27270b2557ebe9eceaabfeb Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 3 Dec 2015 00:12:29 +0100
Subject: [PATCH 0316/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e03a67219..b1e90b8fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ Notes
 
 All changes
 
+* [#387] (https://github.com/docker-java/docker-java/pull/387) Make ProgressDetails attributes public
 * [#362] (https://github.com/docker-java/docker-java/pull/362) Deprecate "network" and enable "networks" stats (remote Docker API 1.21) 
 * [#359] (https://github.com/docker-java/docker-java/pull/359) Fix performance issue of build command by adding bulk-read variant of InputStream.read()
 * [#357] (https://github.com/docker-java/docker-java/pull/357) Wait container command needs possibility to abort operation

From 77b8559685906e68e1871084ee7bfbfba3e24b71 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 3 Dec 2015 20:52:42 +0100
Subject: [PATCH 0317/1272] Pass mandatory container id into stats command
 constructor

---
 src/main/java/com/github/dockerjava/api/DockerClient.java     | 2 +-
 .../java/com/github/dockerjava/core/DockerClientImpl.java     | 4 ++--
 .../java/com/github/dockerjava/core/command/StatsCmdImpl.java | 3 ++-
 .../com/github/dockerjava/core/command/StatsCmdImplTest.java  | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index bb0c67549..57c7f3dc0 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -147,7 +147,7 @@ public interface DockerClient extends Closeable {
 
     public EventsCmd eventsCmd();
 
-    public StatsCmd statsCmd();
+    public StatsCmd statsCmd(String containerId);
 
     @Override
     public void close() throws IOException;
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index b00a7a7f9..9546335b1 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -370,8 +370,8 @@ public EventsCmd eventsCmd() {
     }
 
     @Override
-    public StatsCmd statsCmd() {
-        return new StatsCmdImpl(getDockerCmdExecFactory().createStatsCmdExec());
+    public StatsCmd statsCmd(String containerId) {
+        return new StatsCmdImpl(getDockerCmdExecFactory().createStatsCmdExec(), containerId);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
index bcd187d6a..69d9a02d7 100644
--- a/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
@@ -12,8 +12,9 @@ public class StatsCmdImpl extends AbstrAsyncDockerCmd<StatsCmd, Statistics> impl
 
     private String containerId;
 
-    public StatsCmdImpl(StatsCmd.Exec exec) {
+    public StatsCmdImpl(StatsCmd.Exec exec, String containerId) {
         super(exec);
+        withContainerId(containerId);
     }
 
     @Override
diff --git a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
index 611225d4c..169225e97 100644
--- a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
@@ -62,7 +62,7 @@ public void testStatsStreaming() throws InterruptedException, IOException {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        StatsCallbackTest statsCallback = dockerClient.statsCmd().withContainerId(container.getId())
+        StatsCallbackTest statsCallback = dockerClient.statsCmd(container.getId())
                 .exec(new StatsCallbackTest(countDownLatch));
 
         countDownLatch.await(3, TimeUnit.SECONDS);

From 6bea0f5bedd7c78a8e5e084f7e9ce77afeab3bbc Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 3 Dec 2015 21:06:46 +0100
Subject: [PATCH 0318/1272] Added @Nonnull annotations

---
 .../github/dockerjava/api/DockerClient.java   | 50 ++++++++++---------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 57c7f3dc0..2f16f6608 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -5,6 +5,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import javax.annotation.Nonnull;
+
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd;
 import com.github.dockerjava.api.command.BuildImageCmd;
@@ -65,23 +67,23 @@ public interface DockerClient extends Closeable {
      * * IMAGE API *
      */
 
-    public PullImageCmd pullImageCmd(String repository);
+    public PullImageCmd pullImageCmd(@Nonnull String repository);
 
-    public PushImageCmd pushImageCmd(String name);
+    public PushImageCmd pushImageCmd(@Nonnull String name);
 
-    public PushImageCmd pushImageCmd(Identifier identifier);
+    public PushImageCmd pushImageCmd(@Nonnull Identifier identifier);
 
-    public CreateImageCmd createImageCmd(String repository, InputStream imageStream);
+    public CreateImageCmd createImageCmd(@Nonnull String repository, @Nonnull InputStream imageStream);
 
-    public SearchImagesCmd searchImagesCmd(String term);
+    public SearchImagesCmd searchImagesCmd(@Nonnull String term);
 
-    public RemoveImageCmd removeImageCmd(String imageId);
+    public RemoveImageCmd removeImageCmd(@Nonnull String imageId);
 
     public ListImagesCmd listImagesCmd();
 
-    public InspectImageCmd inspectImageCmd(String imageId);
+    public InspectImageCmd inspectImageCmd(@Nonnull String imageId);
 
-    public SaveImageCmd saveImageCmd(String name);
+    public SaveImageCmd saveImageCmd(@Nonnull String name);
 
     /**
      * * CONTAINER API *
@@ -89,7 +91,7 @@ public interface DockerClient extends Closeable {
 
     public ListContainersCmd listContainersCmd();
 
-    public CreateContainerCmd createContainerCmd(String image);
+    public CreateContainerCmd createContainerCmd(@Nonnull String image);
 
     /**
      * Creates a new {@link StartContainerCmd} for the container with the given ID. The command can then be further
@@ -101,35 +103,35 @@ public interface DockerClient extends Closeable {
      * <p>
      * This command corresponds to the <code>/containers/{id}/start</code> endpoint of the Docker Remote API.
      */
-    public StartContainerCmd startContainerCmd(String containerId);
+    public StartContainerCmd startContainerCmd(@Nonnull String containerId);
 
-    public ExecCreateCmd execCreateCmd(String containerId);
+    public ExecCreateCmd execCreateCmd(@Nonnull String containerId);
 
-    public InspectContainerCmd inspectContainerCmd(String containerId);
+    public InspectContainerCmd inspectContainerCmd(@Nonnull String containerId);
 
-    public RemoveContainerCmd removeContainerCmd(String containerId);
+    public RemoveContainerCmd removeContainerCmd(@Nonnull String containerId);
 
-    public WaitContainerCmd waitContainerCmd(String containerId);
+    public WaitContainerCmd waitContainerCmd(@Nonnull String containerId);
 
-    public AttachContainerCmd attachContainerCmd(String containerId);
+    public AttachContainerCmd attachContainerCmd(@Nonnull String containerId);
 
-    public ExecStartCmd execStartCmd(String containerId);
+    public ExecStartCmd execStartCmd(@Nonnull String containerId);
 
-    public InspectExecCmd inspectExecCmd(String execId);
+    public InspectExecCmd inspectExecCmd(@Nonnull String execId);
 
-    public LogContainerCmd logContainerCmd(String containerId);
+    public LogContainerCmd logContainerCmd(@Nonnull String containerId);
 
-    public CopyFileFromContainerCmd copyFileFromContainerCmd(String containerId, String resource);
+    public CopyFileFromContainerCmd copyFileFromContainerCmd(@Nonnull String containerId, @Nonnull String resource);
 
-    public ContainerDiffCmd containerDiffCmd(String containerId);
+    public ContainerDiffCmd containerDiffCmd(@Nonnull String containerId);
 
-    public StopContainerCmd stopContainerCmd(String containerId);
+    public StopContainerCmd stopContainerCmd(@Nonnull String containerId);
 
-    public KillContainerCmd killContainerCmd(String containerId);
+    public KillContainerCmd killContainerCmd(@Nonnull String containerId);
 
-    public RestartContainerCmd restartContainerCmd(String containerId);
+    public RestartContainerCmd restartContainerCmd(@Nonnull String containerId);
 
-    public CommitCmd commitCmd(String containerId);
+    public CommitCmd commitCmd(@Nonnull String containerId);
 
     public BuildImageCmd buildImageCmd();
 

From fca2ea584f0ad588e0090280a53d904406e854fa Mon Sep 17 00:00:00 2001
From: VU Minh Khang <minh.khang.vu.mkv@gmail.com>
Date: Thu, 3 Dec 2015 21:50:14 +0100
Subject: [PATCH 0319/1272] Re-design API to accept both a path and a tar input
 stream

---
 .../github/dockerjava/api/DockerClient.java   | 10 +--
 .../command/CopyArchiveToContainerCmd.java    | 35 +++++---
 .../dockerjava/core/DockerClientImpl.java     |  4 +-
 .../CopyArchiveToContainerCmdImpl.java        | 84 ++++++++++++++-----
 .../jaxrs/CopyArchiveToContainerCmdExec.java  | 32 ++-----
 .../CopyArchiveToContainerCmdImplTest.java    | 35 ++++++--
 6 files changed, 131 insertions(+), 69 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 9ee8e0aea..5e77e579b 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -133,24 +133,24 @@ public interface DockerClient extends Closeable {
 
     /**
      * Copy resource from container to local machine.
-     * Deprecated, since docker API version 1.20 and above use copyArchiveFromContainerCmd instead.
      *
      * @param containerId id of the container
      * @param resource    path to container's resource
      * @return created command
+     * @see #copyArchiveFromContainerCmd(String, String)
+     * @deprecated since docker API version 1.20 and replaced by {@link #copyArchiveFromContainerCmd(String, String)} instead
      */
     @Deprecated
     public CopyFileFromContainerCmd copyFileFromContainerCmd(String containerId, String resource);
 
     /**
      * Copy archive from local machine to remote container
-     * Since docker API version 1.20 and above.
      *
-     * @param containerId  id of the container
-     * @param hostResource path to container's resource
+     * @param containerId id of the container
      * @return created command
+     * @since docker API version 1.20 and above.
      */
-    public CopyArchiveToContainerCmd copyArchiveToContainerCmd(String containerId, String hostResource);
+    public CopyArchiveToContainerCmd copyArchiveToContainerCmd(String containerId);
 
     public ContainerDiffCmd containerDiffCmd(String containerId);
 
diff --git a/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
index c21f76fa6..129526cfe 100644
--- a/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
@@ -1,37 +1,48 @@
 package com.github.dockerjava.api.command;
 
+import java.io.InputStream;
+
 import com.github.dockerjava.api.exception.NotFoundException;
 
 public interface CopyArchiveToContainerCmd extends SyncDockerCmd<Void> {
 
-    public String getContainerId();
+    String getContainerId();
+
+    String getHostResource();
 
-    public String getHostResource();
+    InputStream getTarInputStream();
 
-    public boolean isNoOverwriteDirNonDir();
+    boolean isNoOverwriteDirNonDir();
 
-    public boolean isDirChildrenOnly();
+    boolean isDirChildrenOnly();
 
     /**
      * Set container's id
      *
      * @param containerId id of the container to copy file to
      */
-    public CopyArchiveToContainerCmd withContainerId(String containerId);
+    CopyArchiveToContainerCmd withContainerId(String containerId);
 
     /**
      * Set path to the resource on the host machine
      *
      * @param resource path to the resource on the host machine
      */
-    public CopyArchiveToContainerCmd withHostResource(String resource);
+    CopyArchiveToContainerCmd withHostResource(String resource);
+
+    /**
+     * Set the tar input stream that will be uploaded to the container. withHostResource or withTarInputStream can be defined but not both.
+     *
+     * @param tarInputStream the stream to upload to the container
+     */
+    CopyArchiveToContainerCmd withTarInputStream(InputStream tarInputStream);
 
     /**
      * If set to true then it will be an error if unpacking the given content would cause an existing directory to be replaced with a non-directory and vice versa
      *
      * @param noOverwriteDirNonDir flag to know if non directory can be overwritten
      */
-    public CopyArchiveToContainerCmd withNoOverwriteDirNonDir(boolean noOverwriteDirNonDir);
+    CopyArchiveToContainerCmd withNoOverwriteDirNonDir(boolean noOverwriteDirNonDir);
 
     /**
      * If this flag is set to true, all children of the local directory will be copied to the remote without the root directory.
@@ -41,16 +52,16 @@ public interface CopyArchiveToContainerCmd extends SyncDockerCmd<Void> {
      *
      * @param dirChildrenOnly if root directory is ignored
      */
-    public CopyArchiveToContainerCmd withDirChildrenOnly(boolean dirChildrenOnly);
+    CopyArchiveToContainerCmd withDirChildrenOnly(boolean dirChildrenOnly);
 
-    public String getRemotePath();
+    String getRemotePath();
 
-    public CopyArchiveToContainerCmd withRemotePath(String remotePath);
+    CopyArchiveToContainerCmd withRemotePath(String remotePath);
 
     @Override
-    public Void exec() throws NotFoundException;
+    Void exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdSyncExec<CopyArchiveToContainerCmd, Void> {
+    interface Exec extends DockerCmdSyncExec<CopyArchiveToContainerCmd, Void> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 913cf0a4c..10014efcb 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -314,9 +314,9 @@ public CopyArchiveFromContainerCmd copyArchiveFromContainerCmd(String containerI
     }
 
     @Override
-    public CopyArchiveToContainerCmd copyArchiveToContainerCmd(String containerId, String hostResource) {
+    public CopyArchiveToContainerCmd copyArchiveToContainerCmd(String containerId) {
         return new CopyArchiveToContainerCmdImpl(getDockerCmdExecFactory().createCopyArchiveToContainerCmdExec(),
-                containerId, hostResource);
+                containerId);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
index 47c0d0446..a40fc72d9 100644
--- a/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
@@ -2,10 +2,19 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
+import com.github.dockerjava.api.exception.BadRequestException;
 import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.core.util.CompressArchiveUtil;
 
 public class CopyArchiveToContainerCmdImpl extends AbstrDockerCmd<CopyArchiveToContainerCmd, Void> implements CopyArchiveToContainerCmd {
 
@@ -13,16 +22,17 @@ public class CopyArchiveToContainerCmdImpl extends AbstrDockerCmd<CopyArchiveToC
 
     private String remotePath = ".";
 
+    private InputStream tarInputStream;
+
     private String hostResource;
 
     private boolean noOverwriteDirNonDir = false;
 
     private boolean dirChildrenOnly = false;
 
-    public CopyArchiveToContainerCmdImpl(CopyArchiveToContainerCmd.Exec exec, String containerId, String hostResource) {
+    public CopyArchiveToContainerCmdImpl(CopyArchiveToContainerCmd.Exec exec, String containerId) {
         super(exec);
         withContainerId(containerId);
-        withHostResource(hostResource);
     }
 
     @Override
@@ -40,31 +50,49 @@ public CopyArchiveToContainerCmd withHostResource(String hostResource) {
     }
 
     @Override
-    public String getContainerId() {
-        return this.containerId;
+    public CopyArchiveToContainerCmd withNoOverwriteDirNonDir(boolean noOverwriteDirNonDir) {
+        this.noOverwriteDirNonDir = noOverwriteDirNonDir;
+        return this;
     }
 
     @Override
-    public String getHostResource() {
-        return this.hostResource;
+    public CopyArchiveToContainerCmd withRemotePath(String remotePath) {
+        checkNotNull(remotePath, "remotePath was not specified");
+        this.remotePath = remotePath;
+        return this;
     }
 
     @Override
-    public boolean isNoOverwriteDirNonDir() {
-        return this.noOverwriteDirNonDir;
+    public CopyArchiveToContainerCmd withTarInputStream(InputStream tarInputStream) {
+        checkNotNull(tarInputStream, "tarInputStream was not specified");
+        this.tarInputStream = tarInputStream;
+        return this;
     }
 
     @Override
-    public CopyArchiveToContainerCmd withNoOverwriteDirNonDir(boolean noOverwriteDirNonDir) {
-        this.noOverwriteDirNonDir = noOverwriteDirNonDir;
+    public CopyArchiveToContainerCmd withDirChildrenOnly(boolean dirChildrenOnly) {
+        this.dirChildrenOnly = dirChildrenOnly;
         return this;
     }
 
     @Override
-    public CopyArchiveToContainerCmd withRemotePath(String remotePath) {
-        checkNotNull(remotePath, "remotePath was not specified");
-        this.remotePath = remotePath;
-        return this;
+    public InputStream getTarInputStream() {
+        return tarInputStream;
+    }
+
+    @Override
+    public String getContainerId() {
+        return this.containerId;
+    }
+
+    @Override
+    public String getHostResource() {
+        return this.hostResource;
+    }
+
+    @Override
+    public boolean isNoOverwriteDirNonDir() {
+        return this.noOverwriteDirNonDir;
     }
 
     @Override
@@ -77,22 +105,38 @@ public boolean isDirChildrenOnly() {
         return this.dirChildrenOnly;
     }
 
-    @Override
-    public CopyArchiveToContainerCmd withDirChildrenOnly(boolean dirChildrenOnly) {
-        this.dirChildrenOnly = dirChildrenOnly;
-        return this;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this).append("cp ").append(hostResource).append(" ").append(containerId).append(":").append(remotePath).toString();
     }
 
+    private InputStream buildUploadStream(String hostResource, boolean dirChildrenOnly) throws IOException {
+        Path toUpload = Files.createTempFile("docker-java", ".tar.gz");
+        CompressArchiveUtil.tar(Paths.get(hostResource), toUpload, true, dirChildrenOnly);
+        return Files.newInputStream(toUpload);
+    }
+
     /**
      * @throws com.github.dockerjava.api.exception.NotFoundException No such container
      */
     @Override
     public Void exec() throws NotFoundException {
+        if (StringUtils.isNotEmpty(this.hostResource)) {
+            // User set host resource and not directly a stream
+            if (this.tarInputStream != null) {
+                throw new BadRequestException("Only one of host resource or tar input stream should be defined to perform the copy, not both");
+            }
+            // We compress the given path, call exec so that the stream is consumed and then close it our self
+            try (InputStream uploadStream = buildUploadStream(this.hostResource, this.dirChildrenOnly)) {
+                this.tarInputStream = uploadStream;
+                return super.exec();
+            } catch (IOException e) {
+                throw new BadRequestException("Unable to perform tar on host resource " + this.hostResource);
+            }
+        } else if (this.tarInputStream == null) {
+            throw new BadRequestException("One of host resource or tar input stream must be defined to perform the copy");
+        }
+        // User set a stream, so we will just consume it and let the user close it by him self
         return super.exec();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java
index 1866d196c..c77d50709 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java
@@ -2,11 +2,7 @@
 
 import static javax.ws.rs.client.Entity.entity;
 
-import java.io.IOException;
 import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 
 import javax.ws.rs.client.WebTarget;
 
@@ -14,9 +10,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
-import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.util.CompressArchiveUtil;
 
 public class CopyArchiveToContainerCmdExec extends AbstrSyncDockerCmdExec<CopyArchiveToContainerCmd, Void> implements CopyArchiveToContainerCmd.Exec {
 
@@ -26,28 +20,20 @@ public CopyArchiveToContainerCmdExec(WebTarget baseResource, DockerClientConfig
         super(baseResource, dockerClientConfig);
     }
 
-    private InputStream buildUploadStream(CopyArchiveToContainerCmd command) throws IOException {
-        Path toUpload = Files.createTempFile("docker-java", ".tar.gz");
-        CompressArchiveUtil.tar(Paths.get(command.getHostResource()), toUpload, true, command.isDirChildrenOnly());
-        return Files.newInputStream(toUpload);
-    }
-
     @Override
     protected Void execute(CopyArchiveToContainerCmd command) {
         WebTarget webResource = getBaseResource().path("/containers/{id}/archive").resolveTemplate("id",
                 command.getContainerId());
 
         LOGGER.trace("PUT: " + webResource.toString());
-        try (InputStream streamToUpload = buildUploadStream(command)) {
-            webResource
-                    .queryParam("path", command.getRemotePath())
-                    .queryParam("noOverwriteDirNonDir", command.isNoOverwriteDirNonDir())
-                    .request()
-                    .put(entity(streamToUpload, "application/x-tar"))
-                    .close();
-            return null;
-        } catch (IOException e) {
-            throw new DockerClientException("Error occurred while preparing uploading host resource <" + command.getHostResource() + ">", e);
-        }
+        InputStream streamToUpload = command.getTarInputStream();
+        webResource
+                .queryParam("path", command.getRemotePath())
+                .queryParam("noOverwriteDirNonDir", command.isNoOverwriteDirNonDir())
+                .request()
+                .put(entity(streamToUpload, "application/x-tar"))
+                .close();
+        return null;
+
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
index dfc991526..3e5cb6702 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
@@ -4,8 +4,12 @@
 import static org.hamcrest.Matchers.isEmptyOrNullString;
 import static org.hamcrest.Matchers.not;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Method;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
@@ -17,6 +21,7 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.client.AbstractDockerClientTest;
+import com.github.dockerjava.core.util.CompressArchiveUtil;
 
 public class CopyArchiveToContainerCmdImplTest extends AbstractDockerClientTest {
     @BeforeTest
@@ -40,17 +45,33 @@ public void afterMethod(ITestResult result) {
     }
 
     @Test
-    public void copyToContainer() throws Exception {
-        // TODO extract this into a shared method
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withName("docker-java-itest-copyFromContainer").withCmd("touch", "/copyFromContainer").exec();
+    public void copyFileToContainer() throws Exception {
+        CreateContainerResponse container = prepareContainerForCopy();
+        Path temp = Files.createTempFile("", ".tar.gz");
+        CompressArchiveUtil.tar(Paths.get("src/test/resources/testReadFile"), temp, true, false);
+        try (InputStream uploadStream = Files.newInputStream(temp)) {
+            dockerClient.copyArchiveToContainerCmd(container.getId()).withTarInputStream(uploadStream).exec();
+            assertFileCopied(container);
+        }
+    }
 
+    @Test
+    public void copyStreamToContainer() throws Exception {
+        CreateContainerResponse container = prepareContainerForCopy();
+        dockerClient.copyArchiveToContainerCmd(container.getId()).withHostResource("src/test/resources/testReadFile").exec();
+        assertFileCopied(container);
+    }
+
+    private CreateContainerResponse prepareContainerForCopy() {
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("docker-java-itest-copyToContainer").exec();
         LOG.info("Created container: {}", container);
         assertThat(container.getId(), not(isEmptyOrNullString()));
-
         dockerClient.startContainerCmd(container.getId()).exec();
+        // Copy a folder to the container
+        return container;
+    }
 
-        dockerClient.copyArchiveToContainerCmd(container.getId(), "src/test/resources/testReadFile").exec();
+    private void assertFileCopied(CreateContainerResponse container) throws IOException {
         try (InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "testReadFile").exec()) {
             boolean bytesAvailable = response.available() > 0;
             assertTrue(bytesAvailable, "The file was not copied to the container.");
@@ -60,7 +81,7 @@ public void copyToContainer() throws Exception {
     @Test
     public void copyToNonExistingContainer() throws Exception {
         try {
-            dockerClient.copyArchiveFromContainerCmd("non-existing", "/test").exec();
+            dockerClient.copyArchiveToContainerCmd("non-existing").withHostResource("src/test/resources/testReadFile").exec();
             fail("expected NotFoundException");
         } catch (NotFoundException ignored) {
         }

From 0871b9dbed2efacbea3f32e0fa3b1906d2384b2c Mon Sep 17 00:00:00 2001
From: VU Minh Khang <minh.khang.vu.mkv@gmail.com>
Date: Thu, 3 Dec 2015 23:35:11 +0100
Subject: [PATCH 0320/1272] Minor fix API doc

---
 src/main/java/com/github/dockerjava/api/DockerClient.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 9a0c02962..586c40ff0 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -125,11 +125,11 @@ public interface DockerClient extends Closeable {
 
     /**
      * Copy resource from container to local machine.
-     * Since docker API version 1.20 and above.
      *
      * @param containerId id of the container
      * @param resource    path to container's resource
      * @return created command
+     * @since docker API version 1.20 and above.
      */
     public CopyArchiveFromContainerCmd copyArchiveFromContainerCmd(@Nonnull String containerId, @Nonnull String resource);
 
@@ -140,7 +140,7 @@ public interface DockerClient extends Closeable {
      * @param resource    path to container's resource
      * @return created command
      * @see #copyArchiveFromContainerCmd(String, String)
-     * @deprecated since docker API version 1.20 and replaced by {@link #copyArchiveFromContainerCmd(String, String)} instead
+     * @deprecated since docker API version 1.20, replaced by {@link #copyArchiveFromContainerCmd(String, String)}
      */
     @Deprecated
     public CopyFileFromContainerCmd copyFileFromContainerCmd(@Nonnull String containerId, @Nonnull String resource);

From a72355f47478f674eded2b0afe143dac6576a6a3 Mon Sep 17 00:00:00 2001
From: VU Minh Khang <minh.khang.vu.mkv@gmail.com>
Date: Sat, 5 Dec 2015 19:15:10 +0100
Subject: [PATCH 0321/1272] Rollback unrelated changes due to code formatter

---
 .../com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java   | 2 +-
 .../core/command/CopyFileFromContainerCmdImplTest.java          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index ba076848d..6e2591f86 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -177,7 +177,7 @@ public void init(DockerClientConfig dockerClientConfig) {
     }
 
     private org.apache.http.config.Registry<ConnectionSocketFactory> getSchemeRegistry(final URI originalUri,
-                                                                                       SSLContext sslContext) {
+            SSLContext sslContext) {
         RegistryBuilder<ConnectionSocketFactory> registryBuilder = RegistryBuilder.create();
         registryBuilder.register("http", PlainConnectionSocketFactory.getSocketFactory());
         if (sslContext != null) {
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
index d073daf45..3e4e88612 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
@@ -70,4 +70,4 @@ public void copyFromNonExistingContainer() throws Exception {
         } catch (NotFoundException ignored) {
         }
     }
-}
\ No newline at end of file
+}

From 477f4a1eb32c459d1d3ec364039ed31e7f5d8820 Mon Sep 17 00:00:00 2001
From: VU Minh Khang <minh.khang.vu.mkv@gmail.com>
Date: Sat, 5 Dec 2015 19:19:24 +0100
Subject: [PATCH 0322/1272] Use remote api version constant

---
 src/main/java/com/github/dockerjava/api/DockerClient.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 586c40ff0..49eafcfca 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -48,6 +48,7 @@
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Identifier;
+import com.github.dockerjava.core.RemoteApiVersion;
 
 // https://godoc.org/github.com/fsouza/go-dockerclient
 public interface DockerClient extends Closeable {
@@ -129,7 +130,7 @@ public interface DockerClient extends Closeable {
      * @param containerId id of the container
      * @param resource    path to container's resource
      * @return created command
-     * @since docker API version 1.20 and above.
+     * @since {@link RemoteApiVersion#VERSION_1_20}
      */
     public CopyArchiveFromContainerCmd copyArchiveFromContainerCmd(@Nonnull String containerId, @Nonnull String resource);
 
@@ -150,7 +151,7 @@ public interface DockerClient extends Closeable {
      *
      * @param containerId id of the container
      * @return created command
-     * @since docker API version 1.20 and above.
+     * @since {@link RemoteApiVersion#VERSION_1_20}
      */
     public CopyArchiveToContainerCmd copyArchiveToContainerCmd(@Nonnull String containerId);
 

From be493f0a53e42cdf6b750ad0afa5b05800fce867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Warcha=C5=82?= <lukasz.warchal@asseco.pl>
Date: Mon, 7 Dec 2015 22:21:56 +0100
Subject: [PATCH 0323/1272] Added test to demonstrate #219

---
 .../core/command/BuildImageCmdImplTest.java         | 13 +++++++++++++
 .../resources/testAddOnBuild/onbuild/Dockerfile     |  8 ++++++++
 src/test/resources/testAddOnBuild/test/Dockerfile   |  1 +
 src/test/resources/testAddOnBuild/test/testrun.sh   |  3 +++
 4 files changed, 25 insertions(+)
 create mode 100644 src/test/resources/testAddOnBuild/onbuild/Dockerfile
 create mode 100644 src/test/resources/testAddOnBuild/test/Dockerfile
 create mode 100755 src/test/resources/testAddOnBuild/test/testrun.sh

diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index f8dc6a940..20e6b1935 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -100,6 +100,19 @@ public void testDockerBuilderFromTar() throws Exception {
         assertThat(response, containsString("Successfully executed testrun.sh"));
     }
 
+    @Test
+    public void testDockerBuildWithOnBuild() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddOnBuild/onbuild").getFile());
+        dockerClient.buildImageCmd(baseDir)
+                .withNoCache(true)
+                .withTag("docker-java-onbuild")
+                .exec(new BuildImageResultCallback())
+                .awaitImageId();
+        baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddOnBuild/test").getFile());
+        String response = dockerfileBuild(baseDir);
+        assertThat(response, containsString("Successfully executed testrun.sh"));
+    }
+
     @Test
     public void testDockerBuilderAddUrl() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddUrl").getFile());
diff --git a/src/test/resources/testAddOnBuild/onbuild/Dockerfile b/src/test/resources/testAddOnBuild/onbuild/Dockerfile
new file mode 100644
index 000000000..e482cd833
--- /dev/null
+++ b/src/test/resources/testAddOnBuild/onbuild/Dockerfile
@@ -0,0 +1,8 @@
+FROM      ubuntu:latest
+
+# Copy testrun.sh files into the container
+
+ONBUILD ADD ./testrun.sh    /tmp/
+ONBUILD RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh
+
+CMD ["testrun.sh"]
diff --git a/src/test/resources/testAddOnBuild/test/Dockerfile b/src/test/resources/testAddOnBuild/test/Dockerfile
new file mode 100644
index 000000000..533264d46
--- /dev/null
+++ b/src/test/resources/testAddOnBuild/test/Dockerfile
@@ -0,0 +1 @@
+FROM docker-java-onbuild
diff --git a/src/test/resources/testAddOnBuild/test/testrun.sh b/src/test/resources/testAddOnBuild/test/testrun.sh
new file mode 100755
index 000000000..80b468e71
--- /dev/null
+++ b/src/test/resources/testAddOnBuild/test/testrun.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "Successfully executed testrun.sh"

From 61bcaa70a32a5b5e3b6556dfb2b84e5cba575e8e Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Mon, 7 Dec 2015 22:38:14 +0100
Subject: [PATCH 0324/1272] Introduce InspectContainerResponse.Mounts Fix issue
 #388

---
 .../api/command/InspectContainerResponse.java | 91 +++++++++++++++++++
 .../github/dockerjava/api/model/Binds.java    | 11 +--
 .../github/dockerjava/api/model/VolumeRW.java |  3 +
 .../client/AbstractDockerClientTest.java      | 15 +--
 .../command/CreateContainerCmdImplTest.java   | 57 ++++++------
 .../command/StartContainerCmdImplTest.java    | 10 +-
 src/test/resources/testAddUrl/Dockerfile      |  2 +-
 7 files changed, 146 insertions(+), 43 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index d289d35be..1ce801540 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -4,6 +4,7 @@
 import java.util.Map;
 
 import com.github.dockerjava.core.RemoteApiVersion;
+
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -14,6 +15,7 @@
 import com.github.dockerjava.api.model.ContainerConfig;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumeBind;
 import com.github.dockerjava.api.model.VolumeBinds;
 import com.github.dockerjava.api.model.VolumeRW;
@@ -89,6 +91,9 @@ public class InspectContainerResponse {
     @JsonProperty("VolumesRW")
     private VolumesRW volumesRW;
 
+    @JsonProperty("Mounts")
+    private List<Mount> mounts;
+
     public String getId() {
         return id;
     }
@@ -134,7 +139,12 @@ public VolumeBind[] getVolumes() {
         return volumes == null ? null : volumes.getBinds();
     }
 
+    /**
+     * @deprecated As of {@link RemoteApiVersion#VERSION_1_20}
+     * use {@link #getMounts()} instead
+     */
     @JsonIgnore
+    @Deprecated
     public VolumeRW[] getVolumesRW() {
         return volumesRW == null ? null : volumesRW.getVolumesRW();
     }
@@ -167,6 +177,10 @@ public String getMountLabel() {
         return mountLabel;
     }
 
+    public List<Mount> getMounts() {
+        return mounts;
+    }
+
     public List<String> getExecIds() {
         return execIds;
     }
@@ -413,4 +427,81 @@ public String toString() {
         }
     }
 
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class Mount {
+
+        /**
+         * @since {@link RemoteApiVersion#VERSION_1_20}
+         */
+        @CheckForNull
+        @JsonProperty("Name")
+        private String name;
+
+        /**
+         * @since {@link RemoteApiVersion#VERSION_1_20}
+         */
+        @CheckForNull
+        @JsonProperty("Source")
+        private String source;
+
+        /**
+         * @since {@link RemoteApiVersion#VERSION_1_20}
+         */
+        @CheckForNull
+        @JsonProperty("Destination")
+        private Volume destination;
+
+        /**
+         * @since {@link RemoteApiVersion#VERSION_1_20}
+         */
+        @CheckForNull
+        @JsonProperty("Driver")
+        private String driver;
+
+        /**
+         * @since {@link RemoteApiVersion#VERSION_1_20}
+         */
+        @CheckForNull
+        @JsonProperty("Mode")
+        private String mode;
+
+        /**
+         * @since {@link RemoteApiVersion#VERSION_1_20}
+         */
+        @CheckForNull
+        @JsonProperty("RW")
+        private Boolean rw;
+
+        @CheckForNull
+        public String getName() {
+            return name;
+        }
+
+        @CheckForNull
+        public String getSource() {
+            return source;
+        }
+
+        @CheckForNull
+        public Volume getDestination() {
+            return destination;
+        }
+
+        @CheckForNull
+        public String getDriver() {
+            return driver;
+        }
+
+        @CheckForNull
+        public String getMode() {
+            return mode;
+        }
+
+        @CheckForNull
+        public Boolean getRW() {
+            return rw;
+        }
+
+    }
+
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Binds.java b/src/main/java/com/github/dockerjava/api/model/Binds.java
index 1824ca77b..917cfdcbd 100644
--- a/src/main/java/com/github/dockerjava/api/model/Binds.java
+++ b/src/main/java/com/github/dockerjava/api/model/Binds.java
@@ -4,7 +4,6 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
@@ -17,7 +16,6 @@
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.node.NullNode;
 
 @JsonSerialize(using = Binds.Serializer.class)
 @JsonDeserialize(using = Binds.Deserializer.class)
@@ -58,12 +56,11 @@ public Binds deserialize(JsonParser jsonParser, DeserializationContext deseriali
             List<Bind> binds = new ArrayList<Bind>();
             ObjectCodec oc = jsonParser.getCodec();
             JsonNode node = oc.readTree(jsonParser);
-            for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
+            for (Iterator<JsonNode> it = node.elements(); it.hasNext();) {
+
+                JsonNode field = it.next();
+                binds.add(Bind.parse(field.asText()));
 
-                Map.Entry<String, JsonNode> field = it.next();
-                if (!field.getValue().equals(NullNode.getInstance())) {
-                    binds.add(Bind.parse(field.getKey()));
-                }
             }
             return new Binds(binds.toArray(new Bind[0]));
         }
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeRW.java b/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
index 46d4539b4..bdb347bee 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
@@ -18,14 +18,17 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.node.NullNode;
+import com.github.dockerjava.core.RemoteApiVersion;
 
 /**
  * Represents a bind mounted volume in a Docker container.
  *
  * @see Bind
+ * @deprecated since {@link RemoteApiVersion#VERSION_1_20}
  */
 @JsonDeserialize(using = VolumeRW.Deserializer.class)
 @JsonSerialize(using = VolumeRW.Serializer.class)
+@Deprecated
 public class VolumeRW {
 
     private Volume volume;
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 2fd228b9f..c01ced920 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -2,6 +2,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
 
 import java.io.File;
 import java.io.IOException;
@@ -23,6 +24,8 @@
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse.Mount;
+import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumeBind;
@@ -38,7 +41,7 @@ public abstract class AbstractDockerClientTest extends Assert {
 
     public static final Logger LOG = LoggerFactory.getLogger(AbstractDockerClientTest.class);
 
-    private String apiVersion = "1.19";
+    private String apiVersion = "1.21";
 
     protected DockerClient dockerClient;
 
@@ -180,13 +183,13 @@ public static void assertContainerHasVolumes(InspectContainerResponse inspectCon
             Volume... expectedVolumes) {
 
         List<Volume> volumes = new ArrayList<Volume>();
-        VolumeBind[] volumeBinds = inspectContainerResponse.getVolumes();
-        if (volumeBinds != null) {
-            for (VolumeBind bind : volumeBinds) {
-                volumes.add(new Volume(bind.getContainerPath()));
+        List<Mount> mounts = inspectContainerResponse.getMounts();
+        if (mounts != null) {
+            for (Mount mount : mounts) {
+                volumes.add(mount.getDestination());
             }
         }
-        assertThat(volumes, contains(expectedVolumes));
+        assertThat(volumes, containsInAnyOrder(expectedVolumes));
     }
 
     protected String containerLog(String containerId) throws Exception {
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index f741f5245..2f6ea0859 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -1,29 +1,5 @@
 package com.github.dockerjava.core.command;
 
-import com.github.dockerjava.api.exception.ConflictException;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.AccessMode;
-import com.github.dockerjava.api.model.Bind;
-import com.github.dockerjava.api.model.Device;
-import com.github.dockerjava.api.model.ExposedPort;
-import com.github.dockerjava.api.model.Link;
-import com.github.dockerjava.api.model.LogConfig;
-import com.github.dockerjava.api.model.Ports;
-import com.github.dockerjava.api.model.RestartPolicy;
-import com.github.dockerjava.api.model.Ulimit;
-import com.github.dockerjava.api.model.Volume;
-import com.github.dockerjava.api.model.VolumeRW;
-import com.github.dockerjava.api.model.VolumesFrom;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
 import static com.github.dockerjava.api.model.Capability.MKNOD;
 import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -45,7 +21,29 @@
 import java.util.Map;
 import java.util.UUID;
 
-import static org.hamcrest.MatcherAssert.assertThat;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.exception.ConflictException;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.AccessMode;
+import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.Device;
+import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.Link;
+import com.github.dockerjava.api.model.LogConfig;
+import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.RestartPolicy;
+import com.github.dockerjava.api.model.Ulimit;
+import com.github.dockerjava.api.model.Volume;
+import com.github.dockerjava.api.model.VolumesFrom;
+import com.github.dockerjava.client.AbstractDockerClientTest;
 
 @Test(groups = "integration")
 public class CreateContainerCmdImplTest extends AbstractDockerClientTest {
@@ -107,9 +105,12 @@ public void createContainerWithVolume() throws DockerException {
 
         assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(), contains("/var/log"));
 
-        assertThat(inspectContainerResponse.getVolumesRW(), hasItemInArray(new VolumeRW(volume, AccessMode.rw)));
+        assertEquals(inspectContainerResponse.getMounts().get(0).getDestination(), volume);
+        assertEquals(inspectContainerResponse.getMounts().get(0).getMode(), AccessMode.rw);
+        assertTrue(inspectContainerResponse.getMounts().get(0).getRW());
     }
 
+
     @Test
     public void createContainerWithReadOnlyVolume() throws DockerException {
 
@@ -128,7 +129,9 @@ public void createContainerWithReadOnlyVolume() throws DockerException {
 
         assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(), contains("/srv/test"));
 
-        assertThat(Arrays.asList(inspectContainerResponse.getVolumesRW()), contains(new VolumeRW(volume)));
+        assertEquals(inspectContainerResponse.getMounts().get(0).getDestination(), volume);
+        // TODO: Create a read-only volume and test like this
+        // assertFalse(inspectContainerResponse.getMounts().get(0).getRW());
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index db6e28fe0..6b672c93c 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -93,9 +93,15 @@ public void startContainerWithVolumes() throws DockerException {
 
         assertContainerHasVolumes(inspectContainerResponse, volume1, volume2);
 
-        assertThat(Arrays.asList(inspectContainerResponse.getVolumesRW()),
-                contains(new VolumeRW(volume1, AccessMode.ro), new VolumeRW(volume2)));
+        assertEquals(inspectContainerResponse.getMounts().size(), 2);
 
+        assertEquals(inspectContainerResponse.getMounts().get(0).getDestination(), volume1);
+        assertEquals(inspectContainerResponse.getMounts().get(0).getMode(), "ro");
+        assertEquals(inspectContainerResponse.getMounts().get(0).getRW(), Boolean.FALSE);
+
+        assertEquals(inspectContainerResponse.getMounts().get(1).getDestination(), volume2);
+        assertEquals(inspectContainerResponse.getMounts().get(1).getMode(), "rw");
+        assertEquals(inspectContainerResponse.getMounts().get(1).getRW(), Boolean.TRUE);
     }
 
     @Test
diff --git a/src/test/resources/testAddUrl/Dockerfile b/src/test/resources/testAddUrl/Dockerfile
index ba0b91a0b..d9a0676d4 100644
--- a/src/test/resources/testAddUrl/Dockerfile
+++ b/src/test/resources/testAddUrl/Dockerfile
@@ -2,7 +2,7 @@ FROM      ubuntu:latest
 
 # Copy testrun.sh files into the container
 
-ADD	http://www.docker.io       /tmp/docker_home.html
+ADD	https://hub.docker.com/r/marcuslinke/busybox/       /tmp/docker_home.html
 ADD	./testrun.sh       /tmp/
 
 RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh

From c2d62fa350a889c5f334d1d3321c255d6f02435f Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Mon, 7 Dec 2015 23:18:21 +0100
Subject: [PATCH 0325/1272] Code cleanup

---
 .../api/command/InspectContainerResponse.java      |  4 ++++
 .../client/AbstractDockerClientTest.java           |  5 +----
 .../core/command/CreateContainerCmdImplTest.java   |  8 ++++----
 .../core/command/StartContainerCmdImplTest.java    | 14 +++++++-------
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index 1ce801540..6a899a908 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -177,6 +177,10 @@ public String getMountLabel() {
         return mountLabel;
     }
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_20}
+     */
+    @CheckForNull
     public List<Mount> getMounts() {
         return mounts;
     }
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index c01ced920..dd07afdb4 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.client;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 
 import java.io.File;
@@ -22,10 +21,9 @@
 import org.testng.ITestResult;
 
 import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse.Mount;
-import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumeBind;
@@ -35,7 +33,6 @@
 import com.github.dockerjava.core.command.BuildImageResultCallback;
 import com.github.dockerjava.core.command.LogContainerResultCallback;
 import com.github.dockerjava.core.command.PullImageResultCallback;
-import com.google.common.base.Joiner;
 
 public abstract class AbstractDockerClientTest extends Assert {
 
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 2f6ea0859..6150140c9 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -105,9 +105,9 @@ public void createContainerWithVolume() throws DockerException {
 
         assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(), contains("/var/log"));
 
-        assertEquals(inspectContainerResponse.getMounts().get(0).getDestination(), volume);
-        assertEquals(inspectContainerResponse.getMounts().get(0).getMode(), AccessMode.rw);
-        assertTrue(inspectContainerResponse.getMounts().get(0).getRW());
+        assertThat(inspectContainerResponse.getMounts().get(0).getDestination(), equalTo(volume));
+        assertThat(inspectContainerResponse.getMounts().get(0).getMode(), equalTo(""));
+        assertThat(inspectContainerResponse.getMounts().get(0).getRW(), equalTo(true));
     }
 
 
@@ -129,7 +129,7 @@ public void createContainerWithReadOnlyVolume() throws DockerException {
 
         assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(), contains("/srv/test"));
 
-        assertEquals(inspectContainerResponse.getMounts().get(0).getDestination(), volume);
+        assertThat(inspectContainerResponse.getMounts().get(0).getDestination(), equalTo(volume));
         // TODO: Create a read-only volume and test like this
         // assertFalse(inspectContainerResponse.getMounts().get(0).getRW());
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index 6b672c93c..a927daaaf 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -93,15 +93,15 @@ public void startContainerWithVolumes() throws DockerException {
 
         assertContainerHasVolumes(inspectContainerResponse, volume1, volume2);
 
-        assertEquals(inspectContainerResponse.getMounts().size(), 2);
+        assertThat(inspectContainerResponse.getMounts().size(), equalTo(2));
 
-        assertEquals(inspectContainerResponse.getMounts().get(0).getDestination(), volume1);
-        assertEquals(inspectContainerResponse.getMounts().get(0).getMode(), "ro");
-        assertEquals(inspectContainerResponse.getMounts().get(0).getRW(), Boolean.FALSE);
+        assertThat(inspectContainerResponse.getMounts().get(0).getDestination(), equalTo(volume1));
+        assertThat(inspectContainerResponse.getMounts().get(0).getMode(), equalTo("ro"));
+        assertThat(inspectContainerResponse.getMounts().get(0).getRW(), equalTo(Boolean.FALSE));
 
-        assertEquals(inspectContainerResponse.getMounts().get(1).getDestination(), volume2);
-        assertEquals(inspectContainerResponse.getMounts().get(1).getMode(), "rw");
-        assertEquals(inspectContainerResponse.getMounts().get(1).getRW(), Boolean.TRUE);
+        assertThat(inspectContainerResponse.getMounts().get(1).getDestination(), equalTo(volume2));
+        assertThat(inspectContainerResponse.getMounts().get(1).getMode(), equalTo("rw"));
+        assertThat(inspectContainerResponse.getMounts().get(1).getRW(), equalTo(Boolean.TRUE));
     }
 
     @Test

From 089bdd1a6fbdc55fad2c11922c0ad6ec446f066e Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Mon, 7 Dec 2015 23:31:02 +0100
Subject: [PATCH 0326/1272] Adding @CheckForNull

---
 .../github/dockerjava/api/command/InspectContainerResponse.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index 6a899a908..cb14b7e5b 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -145,6 +145,7 @@ public VolumeBind[] getVolumes() {
      */
     @JsonIgnore
     @Deprecated
+    @CheckForNull
     public VolumeRW[] getVolumesRW() {
         return volumesRW == null ? null : volumesRW.getVolumesRW();
     }

From e043190ad16727c049a3f7250c613aaa7e1169b2 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 8 Dec 2015 00:08:36 +0100
Subject: [PATCH 0327/1272] Use custom matcher for testing containers mounted
 volumes

---
 .../client/AbstractDockerClientTest.java      | 30 +++++++++++--------
 .../command/CreateContainerCmdImplTest.java   |  6 ++--
 .../command/StartContainerCmdImplTest.java    | 15 +++++-----
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index dd07afdb4..f2e2489c0 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -15,6 +15,8 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.LineIterator;
+import org.hamcrest.FeatureMatcher;
+import org.hamcrest.Matcher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
@@ -172,21 +174,23 @@ public static Boolean available(int port) {
         return false;
     }
 
-    /**
-     * Asserts that {@link InspectContainerResponse#getVolumes()} (<code>.Volumes</code>) has {@link VolumeBind}s for
-     * the given {@link Volume}s
-     */
-    public static void assertContainerHasVolumes(InspectContainerResponse inspectContainerResponse,
-            Volume... expectedVolumes) {
-
-        List<Volume> volumes = new ArrayList<Volume>();
-        List<Mount> mounts = inspectContainerResponse.getMounts();
-        if (mounts != null) {
-            for (Mount mount : mounts) {
-                volumes.add(mount.getDestination());
+    protected MountedVolumes mountedVolumes(Matcher<? super List<Volume>> subMatcher) {
+       return new MountedVolumes(subMatcher, "Mounted volumes", "mountedVolumes");
+    }
+
+    private static class MountedVolumes extends FeatureMatcher<InspectContainerResponse, List<Volume>> {
+        public MountedVolumes(Matcher<? super List<Volume>> subMatcher, String featureDescription, String featureName) {
+            super(subMatcher, featureDescription, featureName);
+        }
+
+        @Override
+        public List<Volume> featureValueOf(InspectContainerResponse item) {
+           List<Volume> volumes = new ArrayList<Volume>();
+             for (Mount mount : item.getMounts()) {
+                   volumes.add(mount.getDestination());
             }
+            return volumes;
         }
-        assertThat(volumes, containsInAnyOrder(expectedVolumes));
     }
 
     protected String containerLog(String containerId) throws Exception {
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 6150140c9..4e4cac9f1 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -32,7 +32,6 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.AccessMode;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
@@ -154,7 +153,7 @@ public void createContainerWithVolumesFrom() throws DockerException {
         InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
                 .exec();
 
-        assertContainerHasVolumes(inspectContainerResponse1, volume1, volume2);
+        assertThat(inspectContainerResponse1, mountedVolumes(containsInAnyOrder(volume1, volume2)));
 
         // create a second container with volumes from first container
         CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
@@ -180,7 +179,8 @@ public void createContainerWithVolumesFrom() throws DockerException {
 
         assertThat(inspectContainerResponse2.getHostConfig().getVolumesFrom(), hasItemInArray(new VolumesFrom(
                 container1Name)));
-        assertContainerHasVolumes(inspectContainerResponse2, volume1, volume2);
+
+        assertThat(inspectContainerResponse2, mountedVolumes(containsInAnyOrder(volume1, volume2)));
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index a927daaaf..b43eb0ff2 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -5,6 +5,7 @@
 import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
@@ -24,13 +25,12 @@
 import org.testng.annotations.Test;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.InternalServerErrorException;
-import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.command.StartContainerCmd;
-import com.github.dockerjava.api.model.AccessMode;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.InternalServerErrorException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
@@ -38,7 +38,6 @@
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Volume;
-import com.github.dockerjava.api.model.VolumeRW;
 import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
@@ -91,7 +90,7 @@ public void startContainerWithVolumes() throws DockerException {
 
         inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-        assertContainerHasVolumes(inspectContainerResponse, volume1, volume2);
+        assertThat(inspectContainerResponse, mountedVolumes(containsInAnyOrder(volume1, volume2)));
 
         assertThat(inspectContainerResponse.getMounts().size(), equalTo(2));
 
@@ -123,7 +122,7 @@ public void startContainerWithVolumesFrom() throws DockerException {
         InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
                 .exec();
 
-        assertContainerHasVolumes(inspectContainerResponse1, volume1, volume2);
+        assertThat(inspectContainerResponse1, mountedVolumes(containsInAnyOrder(volume1, volume2)));
 
         CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withVolumesFrom(new VolumesFrom(container1Name)).exec();
@@ -135,7 +134,7 @@ public void startContainerWithVolumesFrom() throws DockerException {
         InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
                 .exec();
 
-        assertContainerHasVolumes(inspectContainerResponse2, volume1, volume2);
+        assertThat(inspectContainerResponse2, mountedVolumes(containsInAnyOrder(volume1, volume2)));
     }
 
     @Test

From 9653b7022642f6db6d84f368f772fbb248affacb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Warcha=C5=82?= <lukasz.warchal@asseco.pl>
Date: Tue, 8 Dec 2015 00:18:59 +0100
Subject: [PATCH 0328/1272] Fixes #219

---
 .../core/dockerfile/Dockerfile.java           | 80 +++----------------
 .../resources/testDockerignore/.dockerignore  |  2 +-
 2 files changed, 10 insertions(+), 72 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 2112a794c..f889e2282 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -5,7 +5,6 @@
 import com.github.dockerjava.core.util.FilePathUtil;
 import com.github.dockerjava.core.GoLangFileMatch;
 import com.github.dockerjava.core.exception.GoLangFileMatchException;
-import com.github.dockerjava.core.GoLangMatchFileFilter;
 import com.google.common.base.Function;
 import com.google.common.base.Objects;
 import com.google.common.base.Optional;
@@ -21,9 +20,7 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.UUID;
 
 /**
@@ -115,8 +112,6 @@ public class ScannedResult {
 
         final List<String> ignores;
 
-        final Map<String, String> environmentMap = new HashMap<String, String>();
-
         final List<File> filesToAdd = new ArrayList<File>();
 
         public InputStream buildDockerFolderTar() {
@@ -162,7 +157,8 @@ public void close() throws IOException {
 
         @Override
         public String toString() {
-            return Objects.toStringHelper(this).add("ignores", ignores).add("environmentMap", environmentMap)
+            return Objects.toStringHelper(this)
+                    .add("ignores", ignores)
                     .add("filesToAdd", filesToAdd).toString();
         }
 
@@ -172,18 +168,17 @@ public ScannedResult() throws IOException {
 
             String matchingIgnorePattern = effectiveMatchingIgnorePattern(dockerFile);
 
-            if (matchingIgnorePattern == null) {
-                filesToAdd.add(dockerFile);
-            } else {
+            if (matchingIgnorePattern != null) {
                 throw new DockerClientException(String.format(
                         "Dockerfile is excluded by pattern '%s' in .dockerignore file", matchingIgnorePattern));
             }
 
-            for (DockerfileStatement statement : getStatements()) {
-                if (statement instanceof DockerfileStatement.Env) {
-                    processEnvStatement((DockerfileStatement.Env) statement);
-                } else if (statement instanceof DockerfileStatement.Add) {
-                    processAddStatement((DockerfileStatement.Add) statement);
+            Collection<File> filesInBuildContext = FileUtils.listFiles(getDockerFolder(), TrueFileFilter.INSTANCE,
+                    TrueFileFilter.INSTANCE);
+
+            for (File f : filesInBuildContext) {
+                if (effectiveMatchingIgnorePattern(f) == null) {
+                    filesToAdd.add(f);
                 }
             }
         }
@@ -238,62 +233,5 @@ private String effectiveMatchingIgnorePattern(File file) {
 
             return lastMatchingPattern;
         }
-
-        private void processAddStatement(DockerfileStatement.Add add) throws IOException {
-
-            add = add.transform(environmentMap);
-
-            for (String resource : add.getFileResources()) {
-
-                File dockerFolder = getDockerFolder();
-
-                File src = new File(resource);
-                if (!src.isAbsolute()) {
-                    src = new File(dockerFolder, resource);
-                } else {
-                    throw new DockerClientException(String.format("Source file %s must be relative to %s", src,
-                            dockerFolder));
-                }
-
-                if (src.exists()) {
-                    src = src.getCanonicalFile();
-                    if (src.isDirectory()) {
-                        Collection<File> files = FileUtils.listFiles(src, new GoLangMatchFileFilter(src, ignores),
-                                TrueFileFilter.INSTANCE);
-                        filesToAdd.addAll(files);
-                    } else if (effectiveMatchingIgnorePattern(src) == null) {
-                        filesToAdd.add(src);
-                    } else {
-                        throw new DockerClientException(String.format(
-                                "Source file %s is excluded by .dockerignore file", src));
-                    }
-                } else {
-                    filesToAdd.addAll(resolveWildcards(src, ignores));
-                }
-            }
-        }
-
-        private Collection<File> resolveWildcards(File file, List<String> ignores) {
-            List<File> filesToAdd = new ArrayList<File>();
-
-            File parent = file.getParentFile();
-            if (parent != null) {
-                if (parent.isDirectory()) {
-                    Collection<File> files = FileUtils.listFiles(parent, new GoLangMatchFileFilter(parent, ignores),
-                            TrueFileFilter.INSTANCE);
-                    filesToAdd.addAll(files);
-                } else {
-                    filesToAdd.addAll(resolveWildcards(parent, ignores));
-                }
-            } else {
-                throw new DockerClientException(String.format("Source file %s doesn't exist", file));
-            }
-
-            return filesToAdd;
-        }
-
-        private void processEnvStatement(DockerfileStatement.Env env) {
-            environmentMap.put(env.variable, env.value);
-        }
     }
 }
diff --git a/src/test/resources/testDockerignore/.dockerignore b/src/test/resources/testDockerignore/.dockerignore
index 63d8dbd40..bd3b31a85 100644
--- a/src/test/resources/testDockerignore/.dockerignore
+++ b/src/test/resources/testDockerignore/.dockerignore
@@ -1 +1 @@
-b
\ No newline at end of file
+*/b

From d63e70b123f615be526544f89ca522c694ae5a9a Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 8 Dec 2015 19:36:21 +0100
Subject: [PATCH 0329/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1e90b8fb..db41510df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,8 @@ Notes
 * The upcoming release will contain multiple API breaking changes therefore the major version switch
 
 All changes
-
+ 
+* [#392] (https://github.com/docker-java/docker-java/pull/392) Introduce InspectContainerResponse.Mounts
 * [#387] (https://github.com/docker-java/docker-java/pull/387) Make ProgressDetails attributes public
 * [#362] (https://github.com/docker-java/docker-java/pull/362) Deprecate "network" and enable "networks" stats (remote Docker API 1.21) 
 * [#359] (https://github.com/docker-java/docker-java/pull/359) Fix performance issue of build command by adding bulk-read variant of InputStream.read()

From 7b1e19024be0cc7cde10b6aad61d8b86a0077ee5 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 8 Dec 2015 19:43:15 +0100
Subject: [PATCH 0330/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e4ecdb37..7c17b4d19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,9 @@ Change Log
 ===
 2.1.3-SNAPSHOT
 ---
+ 
 * [#387] (https://github.com/docker-java/docker-java/pull/387) Make ProgressDetails attributes public
+* [#386] (https://github.com/docker-java/docker-java/pull/386) Basic http proxy configuration support
 * [#362] (https://github.com/docker-java/docker-java/pull/362) Deprecate "network" and enable "networks" stats (remote Docker API 1.21)
 
 ===

From 0e46d3fc27ce3494b141a7e708f55e7dca355819 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 8 Dec 2015 20:22:14 +0100
Subject: [PATCH 0331/1272] [maven-release-plugin] prepare release
 docker-java-2.1.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index debfb672e..eb77e55ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>2.1.3-SNAPSHOT</version>
+	<version>2.1.3</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>docker-java-2.1.3</tag>
 	</scm>
 
 	<developers>

From bcacdb1efc5e9569a9fefd4af2e5cb9b728d38c5 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 8 Dec 2015 20:22:18 +0100
Subject: [PATCH 0332/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index eb77e55ee..6bcd3989d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>2.1.3</version>
+	<version>2.1.4-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>docker-java-2.1.3</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 45aa177105efa701f7cdf44ce2f5a450ee2d1831 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 8 Dec 2015 20:25:24 +0100
Subject: [PATCH 0333/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c17b4d19..fbcfaf035 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 Change Log
 ===
-2.1.3-SNAPSHOT
+2.1.3
 ---
  
 * [#387] (https://github.com/docker-java/docker-java/pull/387) Make ProgressDetails attributes public

From 418d192791d30367ccfdd7ee16428e05f2bbb04a Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 8 Dec 2015 22:15:37 +0100
Subject: [PATCH 0334/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eee4da341..aa2af5646 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,13 +8,14 @@ Notes
 * The upcoming release will contain multiple API breaking changes therefore the major version switch
 
 All changes
- 
+
 * [#392] (https://github.com/docker-java/docker-java/pull/392) Introduce InspectContainerResponse.Mounts
 * [#387] (https://github.com/docker-java/docker-java/pull/387) Make ProgressDetails attributes public
 * [#386] (https://github.com/docker-java/docker-java/pull/386) Basic http proxy configuration support
 * [#362] (https://github.com/docker-java/docker-java/pull/362) Deprecate "network" and enable "networks" stats (remote Docker API 1.21) 
 * [#359] (https://github.com/docker-java/docker-java/pull/359) Fix performance issue of build command by adding bulk-read variant of InputStream.read()
 * [#357] (https://github.com/docker-java/docker-java/pull/357) Wait container command needs possibility to abort operation
+* [#347] (https://github.com/docker-java/docker-java/pull/347) Implementation of copy archive to/from container commands 
 * [#313] (https://github.com/docker-java/docker-java/pull/313) Refactor primitive type fields to be of object type in JSON objects
 
 v2.1.3

From b18125c860d3439c70089aeac51d0af47a5e42c3 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 8 Dec 2015 22:17:19 +0100
Subject: [PATCH 0335/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa2af5646..b72b2438b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ Change Log
 ---
 Notes
 
-* The upcoming release will contain multiple API breaking changes therefore the major version switch
+* The upcoming release will contain multiple API breaking changes therefore the major version switch. It will supports a subset of v.1.21 of the docker remote API.
 
 All changes
 

From 033caf8b3798c8d68dff4ad2236cdcc3e487f1ea Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 8 Dec 2015 22:59:44 +0100
Subject: [PATCH 0336/1272] Format sources

---
 .../github/dockerjava/core/dockerfile/Dockerfile.java  |  4 +---
 .../dockerjava/core/command/BuildImageCmdImplTest.java | 10 ++++------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index f889e2282..46b5642f4 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -157,9 +157,7 @@ public void close() throws IOException {
 
         @Override
         public String toString() {
-            return Objects.toStringHelper(this)
-                    .add("ignores", ignores)
-                    .add("filesToAdd", filesToAdd).toString();
+            return Objects.toStringHelper(this).add("ignores", ignores).add("filesToAdd", filesToAdd).toString();
         }
 
         public ScannedResult() throws IOException {
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 20e6b1935..017186ccd 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -102,12 +102,10 @@ public void testDockerBuilderFromTar() throws Exception {
 
     @Test
     public void testDockerBuildWithOnBuild() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddOnBuild/onbuild").getFile());
-        dockerClient.buildImageCmd(baseDir)
-                .withNoCache(true)
-                .withTag("docker-java-onbuild")
-                .exec(new BuildImageResultCallback())
-                .awaitImageId();
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddOnBuild/onbuild")
+                .getFile());
+        dockerClient.buildImageCmd(baseDir).withNoCache(true).withTag("docker-java-onbuild")
+                .exec(new BuildImageResultCallback()).awaitImageId();
         baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddOnBuild/test").getFile());
         String response = dockerfileBuild(baseDir);
         assertThat(response, containsString("Successfully executed testrun.sh"));

From 58bcd6fe2ddb50c16d9ceb0c58c696f78854a64a Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 8 Dec 2015 23:02:29 +0100
Subject: [PATCH 0337/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b72b2438b..760bf3b52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ Notes
 * The upcoming release will contain multiple API breaking changes therefore the major version switch. It will supports a subset of v.1.21 of the docker remote API.
 
 All changes
-
+* [#393] (https://github.com/docker-java/docker-java/pull/392) Support ONBUILD instruction in Dockerfiles 
 * [#392] (https://github.com/docker-java/docker-java/pull/392) Introduce InspectContainerResponse.Mounts
 * [#387] (https://github.com/docker-java/docker-java/pull/387) Make ProgressDetails attributes public
 * [#386] (https://github.com/docker-java/docker-java/pull/386) Basic http proxy configuration support

From 47a9391f03932f3a437a9d192863de271e1cdddb Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 8 Dec 2015 23:07:54 +0100
Subject: [PATCH 0338/1272] Tag as integration test

---
 .../core/command/CopyArchiveToContainerCmdImplTest.java          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
index eaa4f9b54..0f8f2164b 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
@@ -23,6 +23,7 @@
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import com.github.dockerjava.core.util.CompressArchiveUtil;
 
+@Test(groups = "integration")
 public class CopyArchiveToContainerCmdImplTest extends AbstractDockerClientTest {
     @BeforeTest
     public void beforeTest() throws Exception {

From a1c7bf594e781219aa3da19055f11c655b701d4a Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 10 Dec 2015 22:13:16 +0100
Subject: [PATCH 0339/1272] Added copy archive from/to container command for
 (netty)

---
 .../exec/CopyArchiveFromContainerCmdExec.java | 32 +++++++
 .../exec/CopyArchiveToContainerCmdExec.java   | 36 +++++++
 .../CopyArchiveFromContainerCmdExecTest.java  | 73 ++++++++++++++
 .../CopyArchiveToContainerCmdExecTest.java    | 94 +++++++++++++++++++
 4 files changed, 235 insertions(+)
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExec.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExecTest.java

diff --git a/src/main/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExec.java
new file mode 100644
index 000000000..6f4a93ba3
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExec.java
@@ -0,0 +1,32 @@
+package com.github.dockerjava.netty.exec;
+
+import java.io.InputStream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+public class CopyArchiveFromContainerCmdExec extends AbstrSyncDockerCmdExec<CopyArchiveFromContainerCmd, InputStream>
+        implements CopyArchiveFromContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CopyArchiveFromContainerCmdExec.class);
+
+    public CopyArchiveFromContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected InputStream execute(CopyArchiveFromContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/archive").resolveTemplate("id",
+                command.getContainerId());
+
+        LOGGER.trace("Get: " + webResource.toString());
+
+        return webResource.queryParam("path", command.getResource()).request().accept(MediaType.APPLICATION_X_TAR)
+                .get();
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExec.java
new file mode 100644
index 000000000..c956a815d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExec.java
@@ -0,0 +1,36 @@
+package com.github.dockerjava.netty.exec;
+
+import java.io.InputStream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+public class CopyArchiveToContainerCmdExec extends AbstrSyncDockerCmdExec<CopyArchiveToContainerCmd, Void> implements
+        CopyArchiveToContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CopyArchiveFromContainerCmdExec.class);
+
+    public CopyArchiveToContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(CopyArchiveToContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/archive").resolveTemplate("id",
+                command.getContainerId());
+
+        LOGGER.trace("PUT: " + webResource.toString());
+        InputStream streamToUpload = command.getTarInputStream();
+
+        webResource.queryParam("path", command.getRemotePath())
+                .queryParam("noOverwriteDirNonDir", command.isNoOverwriteDirNonDir()).request()
+                .put(streamToUpload, MediaType.APPLICATION_X_TAR);
+
+        return null;
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExecTest.java
new file mode 100644
index 000000000..aa4dcc575
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExecTest.java
@@ -0,0 +1,73 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.not;
+
+import java.io.InputStream;
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+
+@Test(groups = "integration")
+public class CopyArchiveFromContainerCmdExecTest extends AbstractNettyDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void copyFromContainer() throws Exception {
+        // TODO extract this into a shared method
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withName("docker-java-itest-copyFromContainer").withCmd("touch", "/copyFromContainer").exec();
+
+        LOG.info("Created container: {}", container);
+        assertThat(container.getId(), not(isEmptyOrNullString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/copyFromContainer").exec();
+        Boolean bytesAvailable = response.available() > 0;
+        assertTrue(bytesAvailable, "The file was not copied from the container.");
+
+        // read the stream fully. Otherwise, the underlying stream will not be closed.
+        String responseAsString = asString(response);
+        assertNotNull(responseAsString);
+        assertTrue(responseAsString.length() > 0);
+    }
+
+    @Test
+    public void copyFromNonExistingContainer() throws Exception {
+        try {
+            dockerClient.copyArchiveFromContainerCmd("non-existing", "/test").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException ignored) {
+        }
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExecTest.java
new file mode 100644
index 000000000..d755dfcba
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExecTest.java
@@ -0,0 +1,94 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.not;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.core.util.CompressArchiveUtil;
+import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+
+@Test(groups = "integration")
+public class CopyArchiveToContainerCmdExecTest extends AbstractNettyDockerClientTest {
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void copyFileToContainer() throws Exception {
+        CreateContainerResponse container = prepareContainerForCopy();
+        Path temp = Files.createTempFile("", ".tar.gz");
+        CompressArchiveUtil.tar(Paths.get("src/test/resources/testReadFile"), temp, true, false);
+        try (InputStream uploadStream = Files.newInputStream(temp)) {
+            dockerClient.copyArchiveToContainerCmd(container.getId()).withTarInputStream(uploadStream).exec();
+            assertFileCopied(container);
+        }
+    }
+
+    @Test
+    public void copyStreamToContainer() throws Exception {
+        CreateContainerResponse container = prepareContainerForCopy();
+        dockerClient.copyArchiveToContainerCmd(container.getId()).withHostResource("src/test/resources/testReadFile")
+                .exec();
+        assertFileCopied(container);
+    }
+
+    private CreateContainerResponse prepareContainerForCopy() {
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withName("docker-java-itest-copyToContainer").exec();
+        LOG.info("Created container: {}", container);
+        assertThat(container.getId(), not(isEmptyOrNullString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+        // Copy a folder to the container
+        return container;
+    }
+
+    private void assertFileCopied(CreateContainerResponse container) throws IOException {
+        try (InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "testReadFile").exec()) {
+            boolean bytesAvailable = response.available() > 0;
+            assertTrue(bytesAvailable, "The file was not copied to the container.");
+        }
+    }
+
+    @Test
+    public void copyToNonExistingContainer() throws Exception {
+        try {
+            dockerClient.copyArchiveToContainerCmd("non-existing").withHostResource("src/test/resources/testReadFile")
+                    .exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException ignored) {
+        }
+    }
+
+}

From ca376d6862d160df16e17b48e37f8a6246e8779b Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 11 Dec 2015 22:18:21 +0100
Subject: [PATCH 0340/1272] Added stdin parameter to attach command api,
 implemented for netty

---
 .../api/command/AttachContainerCmd.java       |  5 +++
 .../core/async/ResultCallbackTemplate.java    |  1 -
 .../core/command/AttachContainerCmdImpl.java  | 18 +++++++++
 .../jaxrs/AttachContainerCmdExec.java         |  5 ++-
 .../dockerjava/netty/InvocationBuilder.java   | 22 +++++------
 .../netty/exec/AttachContainerCmdExec.java    |  4 +-
 .../netty/exec/RemoveContainerCmdExec.java    |  4 +-
 .../netty/exec/RemoveImageCmdExec.java        |  2 +-
 .../command/AttachContainerCmdImplTest.java   | 29 +++++++++++++++
 .../exec/AttachContainerCmdExecTest.java      | 37 +++++++++++++++++++
 10 files changed, 109 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
index 13979fb8b..6326fa13b 100644
--- a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
@@ -43,6 +43,9 @@ public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, F
     @CheckForNull
     public Boolean hasStderrEnabled();
 
+    @CheckForNull
+    public InputStream getStdin();
+
     public AttachContainerCmd withContainerId(@Nonnull String containerId);
 
     /**
@@ -58,6 +61,8 @@ public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, F
 
     public AttachContainerCmd withStdErr(Boolean stderr);
 
+    public AttachContainerCmd withStdIn(InputStream stdin);
+
     public AttachContainerCmd withLogs(Boolean logs);
 
     public static interface Exec extends DockerCmdAsyncExec<AttachContainerCmd, Frame> {
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index 4db4edcea..44af625af 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -63,7 +63,6 @@ public void onError(Throwable throwable) {
 
     @Override
     public void onComplete() {
-        System.err.println("callback onComplete");
         try {
             close();
         } catch (IOException e) {
diff --git a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
index 629990ff1..89e27c8ea 100644
--- a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
@@ -2,6 +2,8 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.io.InputStream;
+
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.model.Frame;
 
@@ -17,6 +19,8 @@
  *            - true or false, includes stdout log. Defaults to false.
  * @param stderr
  *            - true or false, includes stderr log. Defaults to false.
+ * @param stdin
+ *            - null or {@link InputStream}, pass stream to stdin of the container.
  * @param timestamps
  *            - true or false, if true, print timestamps for every log line. Defaults to false.
  */
@@ -27,6 +31,8 @@ public class AttachContainerCmdImpl extends AbstrAsyncDockerCmd<AttachContainerC
 
     private Boolean logs, followStream, timestamps, stdout, stderr;
 
+    private InputStream stdin;
+
     public AttachContainerCmdImpl(AttachContainerCmd.Exec exec, String containerId) {
         super(exec);
         withContainerId(containerId);
@@ -62,6 +68,11 @@ public Boolean hasStderrEnabled() {
         return stderr;
     }
 
+    @Override
+    public InputStream getStdin() {
+        return stdin;
+    }
+
     @Override
     public AttachContainerCmd withContainerId(String containerId) {
         checkNotNull(containerId, "containerId was not specified");
@@ -93,6 +104,13 @@ public AttachContainerCmd withStdErr(Boolean stderr) {
         return this;
     }
 
+    @Override
+    public AttachContainerCmd withStdIn(InputStream stdin) {
+        checkNotNull(stdin, "stdin was not specified");
+        this.stdin = stdin;
+        return this;
+    }
+
     @Override
     public AttachContainerCmd withLogs(Boolean logs) {
         this.logs = logs;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
index 0d399ad0c..b3670a8b9 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
@@ -26,12 +26,15 @@ public AttachContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerC
     protected AbstractCallbackNotifier<Frame> callbackNotifier(AttachContainerCmd command,
             ResultCallback<Frame> resultCallback) {
 
+        if (command.getStdin() != null)
+            throw new UnsupportedOperationException(
+                    "Passing stdin to the container is currently not supported. Try experimental netty engine!");
+
         WebTarget webTarget = getBaseResource().path("/containers/{id}/attach").resolveTemplate("id",
                 command.getContainerId());
 
         webTarget = booleanQueryParam(webTarget, "logs", command.hasLogsEnabled());
         webTarget = booleanQueryParam(webTarget, "stdout", command.hasStdoutEnabled());
-        // webTarget = booleanQueryParam(webTarget, "stdin", command.hasStdinEnabled());
         webTarget = booleanQueryParam(webTarget, "stderr", command.hasStderrEnabled());
         webTarget = booleanQueryParam(webTarget, "stream", command.hasFollowStreamEnabled());
 
diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
index c49328c2a..8b6688ca6 100644
--- a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
+++ b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
@@ -86,7 +86,7 @@ public InvocationBuilder header(String name, String value) {
         return this;
     }
 
-    public ResponseCallback<Void> delete() {
+    public void delete() {
 
         HttpRequestProvider requestProvider = httpDeleteRequestProvider();
 
@@ -100,7 +100,7 @@ public ResponseCallback<Void> delete() {
 
         sendRequest(requestProvider, channel);
 
-        return callback;
+        callback.awaitResult();
     }
 
     public void get(ResultCallback<Frame> resultCallback) {
@@ -134,7 +134,7 @@ public <T> void get(TypeReference<T> typeReference, ResultCallback<T> resultCall
 
         Channel channel = getChannel();
 
-        resultCallbackOnStart(channel, resultCallback);
+        initCallback(channel, resultCallback);
 
         JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<T>(typeReference,
                 resultCallback);
@@ -276,7 +276,7 @@ public <T> void post(final Object entity, TypeReference<T> typeReference, final
 
         Channel channel = getChannel();
 
-        resultCallbackOnStart(channel, resultCallback);
+        initCallback(channel, resultCallback);
 
         JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<T>(typeReference,
                 resultCallback);
@@ -292,12 +292,11 @@ public <T> void post(final Object entity, TypeReference<T> typeReference, final
         return;
     }
 
-    private <T> void resultCallbackOnStart(final Channel channel, final ResultCallback<T> resultCallback) {
+    private <T> void initCallback(final Channel channel, final ResultCallback<T> resultCallback) {
         Closeable closeable = new Closeable() {
             @Override
             public void close() throws IOException {
                 try {
-                    System.err.println("closing channel");
                     channel.close().sync();
                 } catch (InterruptedException e) {
                     resultCallback.onError(e);
@@ -327,14 +326,14 @@ private FullHttpRequest prepareGetRequest(String uri) {
     }
 
     private HttpRequest preparePostRequest(String uri, Object entity) {
-        return prepareRequest(uri, entity, HttpMethod.POST);
+        return prepareEntityRequest(uri, entity, HttpMethod.POST);
     }
 
     private HttpRequest preparePutRequest(String uri, Object entity) {
-        return prepareRequest(uri, entity, HttpMethod.PUT);
+        return prepareEntityRequest(uri, entity, HttpMethod.PUT);
     }
 
-    private HttpRequest prepareRequest(String uri, Object entity, HttpMethod httpMethod) {
+    private HttpRequest prepareEntityRequest(String uri, Object entity, HttpMethod httpMethod) {
 
         HttpRequest request = null;
 
@@ -404,7 +403,7 @@ public <T> void post(TypeReference<T> typeReference, ResultCallback<T> resultCal
 
         Channel channel = getChannel();
 
-        resultCallbackOnStart(channel, resultCallback);
+        initCallback(channel, resultCallback);
 
         JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<T>(typeReference,
                 resultCallback);
@@ -440,7 +439,7 @@ public InputStream get() {
 
         ResponseCallback<InputStream> resultCallback = new ResponseCallback<InputStream>();
 
-        resultCallbackOnStart(channel, resultCallback);
+        initCallback(channel, resultCallback);
 
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
 
@@ -482,6 +481,5 @@ public void put(InputStream body, MediaType mediaType) {
         channel.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT);
 
         resultCallback.awaitResult();
-
     };
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/AttachContainerCmdExec.java
index 76cec4272..2fdace48a 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/AttachContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/AttachContainerCmdExec.java
@@ -26,13 +26,13 @@ protected Void execute0(AttachContainerCmd command, ResultCallback<Frame> result
 
         webTarget = booleanQueryParam(webTarget, "logs", command.hasLogsEnabled());
         webTarget = booleanQueryParam(webTarget, "stdout", command.hasStdoutEnabled());
-        // webTarget = booleanQueryParam(webTarget, "stdin", command.hasStdinEnabled());
         webTarget = booleanQueryParam(webTarget, "stderr", command.hasStderrEnabled());
+        webTarget = booleanQueryParam(webTarget, "stdin", command.getStdin() != null);
         webTarget = booleanQueryParam(webTarget, "stream", command.hasFollowStreamEnabled());
 
         LOGGER.trace("POST: {}", webTarget);
 
-        webTarget.request().post(null, System.in, resultCallback);
+        webTarget.request().post(null, command.getStdin(), resultCallback);
 
         return null;
     }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExec.java
index bf3a3a56b..63d16bda6 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExec.java
@@ -25,7 +25,9 @@ protected Void execute(RemoveContainerCmd command) {
         webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled());
 
         LOGGER.trace("DELETE: {}", webTarget);
-        return webTarget.request().accept(MediaType.APPLICATION_JSON).delete().awaitResult();
+        webTarget.request().accept(MediaType.APPLICATION_JSON).delete();
+
+        return null;
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/RemoveImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/RemoveImageCmdExec.java
index d4e0e212a..35ae053d3 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/RemoveImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/RemoveImageCmdExec.java
@@ -23,7 +23,7 @@ protected Void execute(RemoveImageCmd command) {
         webTarget = booleanQueryParam(webTarget, "noprune", command.hasNoPruneEnabled());
 
         LOGGER.trace("DELETE: {}", webTarget);
-        webTarget.request().delete().awaitResult();
+        webTarget.request().delete();
 
         return null;
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
index ead8ad39e..be2d5fdd0 100644
--- a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
@@ -5,7 +5,9 @@
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.util.concurrent.TimeUnit;
 
@@ -104,6 +106,33 @@ public void onNext(Frame frame) {
         assertThat(callback.toString(), containsString("stdout\r\nstderr"));
     }
 
+    @Test(expectedExceptions = UnsupportedOperationException.class)
+    public void attachContainerStdinUnsupported() throws Exception {
+
+        String snippet = "hello world";
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("echo", snippet)
+                .withTty(false).exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        AttachContainerTestCallback callback = new AttachContainerTestCallback() {
+            @Override
+            public void onNext(Frame frame) {
+                assertEquals(frame.getStreamType(), StreamType.STDOUT);
+                super.onNext(frame);
+            };
+        };
+
+        InputStream stdin = new ByteArrayInputStream("".getBytes());
+
+        dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
+                .withLogs(true).withStdIn(stdin).exec(callback).awaitCompletion(30, TimeUnit.SECONDS).close();
+    }
+
     public static class AttachContainerTestCallback extends AttachContainerResultCallback {
         private StringBuffer log = new StringBuffer();
 
diff --git a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
index 06f33d00e..08daa7e6f 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
@@ -5,7 +5,9 @@
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.util.concurrent.TimeUnit;
 
@@ -17,6 +19,7 @@
 import org.testng.annotations.Test;
 
 import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.StreamType;
 import com.github.dockerjava.core.command.AttachContainerResultCallback;
@@ -72,6 +75,40 @@ public void onNext(Frame frame) {
         assertThat(callback.toString(), containsString(snippet));
     }
 
+    @Test
+    public void attachContainerWithStdin() throws Exception {
+
+        String snippet = "hello world";
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("/bin/sh", "-c", "read line && echo $line")
+                .withTty(false).withStdinOpen(true).exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertTrue(inspectContainerResponse.getState().getRunning());
+
+        AttachContainerTestCallback callback = new AttachContainerTestCallback() {
+
+            @Override
+            public void onNext(Frame frame) {
+                assertEquals(frame.getStreamType(), StreamType.STDOUT);
+                super.onNext(frame);
+            };
+        };
+
+        InputStream stdin = new ByteArrayInputStream((snippet + "\n").getBytes());
+
+        dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
+                .withStdIn(stdin).exec(callback).awaitCompletion(2, TimeUnit.SECONDS).close();
+
+        assertThat(callback.toString(), containsString(snippet));
+    }
+
     @Test
     public void attachContainerWithTTY() throws Exception {
 

From feb93a41658067105a60a9b5f05a923e80be14ca Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 11 Dec 2015 22:20:58 +0100
Subject: [PATCH 0341/1272] Removed println() debugging

---
 .../java/com/github/dockerjava/core/command/FrameReader.java  | 4 +---
 .../dockerjava/netty/exec/AttachContainerCmdExecTest.java     | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
index ff1a9d7ea..0e885082a 100644
--- a/src/main/java/com/github/dockerjava/core/command/FrameReader.java
+++ b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
@@ -67,7 +67,7 @@ public Frame readFrame() throws IOException {
             } while (actualHeaderSize < HEADER_SIZE);
 
             // HexDump.dump(header, 0, System.err, 0);
-            
+
             StreamType streamType = streamType(header[0]);
 
             if (streamType.equals(StreamType.RAW)) {
@@ -77,8 +77,6 @@ public Frame readFrame() throws IOException {
 
             int payloadSize = ((header[4] & 0xff) << 24) + ((header[5] & 0xff) << 16) + ((header[6] & 0xff) << 8)
                     + (header[7] & 0xff);
-            
-            //System.out.println("payload size: " + payloadSize);
 
             byte[] payload = new byte[payloadSize];
             int actualPayloadSize = 0;
diff --git a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
index 08daa7e6f..fe34aa537 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
@@ -135,8 +135,6 @@ public void onNext(Frame frame) {
         dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
                 .exec(callback).awaitCompletion(10, TimeUnit.SECONDS).close();
 
-        System.out.println("log: " + callback.toString());
-
         // HexDump.dump(collectFramesCallback.toString().getBytes(), 0, System.out, 0);
 
         assertThat(callback.toString(), containsString("stdout\r\nstderr"));

From 8039e18dfb12d9c1412d7e90c1c47d96ac4c28dd Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sat, 12 Dec 2015 20:13:53 +0100
Subject: [PATCH 0342/1272] Code cleanup

---
 .../api/command/AsyncDockerCmd.java           |   2 +-
 .../api/command/TopContainerResponse.java     |   2 +-
 .../dockerjava/api/model/RestartPolicy.java   |   2 +-
 .../dockerjava/core/DockerClientConfig.java   |   3 +-
 .../core/async/FrameStreamProcessor.java      |   2 +-
 .../core/async/JsonStreamProcessor.java       |   2 +-
 .../core/async/ResponseStreamProcessor.java   |   2 +-
 .../core/async/ResultCallbackTemplate.java    |   2 +-
 .../AttachContainerResultCallback.java        |   2 +-
 .../command/BuildImageResultCallback.java     |   2 +-
 .../core/command/EventsResultCallback.java    |   2 +-
 .../core/command/ExecStartResultCallback.java |   6 +-
 .../command/LogContainerResultCallback.java   |   2 +-
 .../core/command/PullImageResultCallback.java |   2 +-
 .../core/command/PushImageResultCallback.java |   2 +-
 .../command/WaitContainerResultCallback.java  |   2 +-
 .../jaxrs/async/GETCallbackNotifier.java      |   2 +-
 .../jaxrs/async/POSTCallbackNotifier.java     |   2 +-
 .../ApacheConnectorClientResponse.java        |   2 +-
 .../filter/ResponseStatusExceptionFilter.java |   2 +-
 .../util/WrappedResponseInputStream.java      |   2 +-
 .../dockerjava/netty/ChannelProvider.java     |   4 +-
 .../netty/DockerCmdExecFactoryImpl.java       |   6 +-
 .../dockerjava/netty/InvocationBuilder.java   |   6 +-
 .../netty/exec/ContainerDiffCmdExec.java      |   2 +-
 .../dockerjava/netty/exec/InfoCmdExec.java    |   7 +-
 .../netty/exec/InspectContainerCmdExec.java   |   2 +-
 .../netty/exec/InspectExecCmdExec.java        |   2 +-
 .../netty/exec/InspectImageCmdExec.java       |   2 +-
 .../netty/exec/ListContainersCmdExec.java     |   2 +-
 .../netty/exec/ListImagesCmdExec.java         |   6 +-
 .../netty/exec/LogContainerCmdExec.java       |   1 -
 .../netty/exec/SearchImagesCmdExec.java       |   2 +-
 .../netty/exec/TopContainerCmdExec.java       |   2 +-
 .../dockerjava/netty/exec/VersionCmdExec.java |   2 +-
 .../handler/FramedResponseStreamHandler.java  |  16 +-
 .../handler/HttpConnectionHijackHandler.java  |   2 +-
 .../netty/handler/HttpRequestProvider.java    |   3 +-
 .../handler/HttpResponseStreamHandler.java    |  14 +-
 .../dockerjava/core/NameParserTest.java       |   2 +-
 .../core/TestDockerCmdExecFactory.java        |   2 +-
 .../netty/AbstractNettyDockerClientTest.java  | 209 ------------------
 42 files changed, 64 insertions(+), 277 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java b/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
index 78ee978fa..221d3d165 100644
--- a/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
@@ -8,7 +8,7 @@
 /**
  *
  *
- * @author marcus
+ * @author Marcus Linke
  *
  */
 public interface AsyncDockerCmd<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T>, A_RES_T> extends DockerCmd<Void> {
diff --git a/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
index 8864167f3..cd6da6814 100644
--- a/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
@@ -6,7 +6,7 @@
 
 /**
  *
- * @author marcus
+ * @author Marcus Linke
  *
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
index cd437667f..34f8e7e57 100644
--- a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
+++ b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
@@ -24,7 +24,7 @@
  * <dd>
  * </dl>
  *
- * @author marcus
+ * @author Marcus Linke
  *
  */
 public class RestartPolicy {
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index 618309fd6..fa5c77e6a 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -346,7 +346,7 @@ public String toString() {
     public static class DockerClientConfigBuilder {
         private URI uri;
 
-        private String version, username, password, email, serverAddress, dockerCfgPath, dockerCertPath;
+        private String version, username, password, email, serverAddress, dockerCfgPath;
 
         private SSLConfig sslConfig;
 
@@ -401,7 +401,6 @@ public DockerClientConfigBuilder withServerAddress(String serverAddress) {
         public final DockerClientConfigBuilder withDockerCertPath(String dockerCertPath) {
             if (dockerCertPath != null) {
                 this.sslConfig = new LocalDirectorySSLConfig(dockerCertPath);
-                this.dockerCertPath = dockerCertPath;
             }
             return this;
         }
diff --git a/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java b/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java
index 220cd80ef..3070930d6 100644
--- a/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java
+++ b/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java
@@ -13,7 +13,7 @@
 /**
  *
  *
- * @author marcus
+ * @author Marcus Linke
  *
  */
 public class FrameStreamProcessor implements ResponseStreamProcessor<Frame> {
diff --git a/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
index 522d5b189..7e6c497e6 100644
--- a/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
+++ b/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
@@ -14,7 +14,7 @@
 
 /**
  *
- * @author marcus
+ * @author Marcus Linke
  *
  */
 public class JsonStreamProcessor<T> implements ResponseStreamProcessor<T> {
diff --git a/src/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java b/src/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java
index 879a8c305..5c93801d3 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java
@@ -9,7 +9,7 @@
 
 /**
  *
- * @author marcus
+ * @author Marcus Linke
  *
  */
 public interface ResponseStreamProcessor<T> {
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index 44af625af..3a62ae46a 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -19,7 +19,7 @@
 /**
  * Abstract template implementation of {@link ResultCallback}
  *
- * @author marcus
+ * @author Marcus Linke
  *
  */
 public abstract class ResultCallbackTemplate<RC_T extends ResultCallback<A_RES_T>, A_RES_T> implements
diff --git a/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java b/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
index 2822b8e48..f16b20301 100644
--- a/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
@@ -11,7 +11,7 @@
 
 /**
  *
- * @author marcus
+ * @author Marcus Linke
  *
  */
 public class AttachContainerResultCallback extends ResultCallbackTemplate<AttachContainerResultCallback, Frame> {
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
index 2463f8b1d..06c6b1e51 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
@@ -16,7 +16,7 @@
 
 /**
  *
- * @author marcus
+ * @author Marcus Linke
  *
  */
 public class BuildImageResultCallback extends ResultCallbackTemplate<BuildImageResultCallback, BuildResponseItem> {
diff --git a/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java b/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
index 29efac6ca..c731b863e 100644
--- a/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
@@ -11,7 +11,7 @@
 
 /**
  *
- * @author marcus
+ * @author Marcus Linke
  *
  */
 public class EventsResultCallback extends ResultCallbackTemplate<EventsResultCallback, Event> {
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java b/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
index dda336807..ebf1d08a1 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
@@ -1,6 +1,3 @@
-/*
- * Created on 21.07.2015
- */
 package com.github.dockerjava.core.command;
 
 import java.io.IOException;
@@ -14,7 +11,7 @@
 
 /**
  *
- * @author marcus
+ * @author Marcus Linke
  *
  */
 public class ExecStartResultCallback extends ResultCallbackTemplate<ExecStartResultCallback, Frame> {
@@ -32,7 +29,6 @@ public ExecStartResultCallback() {
         this(null, null);
     }
 
-
     @Override
     public void onNext(Frame frame) {
         if (frame != null) {
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java b/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
index ffe46baf8..b7fc81cb2 100644
--- a/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
@@ -11,7 +11,7 @@
 
 /**
  *
- * @author marcus
+ * @author Marcus Linke
  *
  */
 public class LogContainerResultCallback extends ResultCallbackTemplate<LogContainerResultCallback, Frame> {
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
index 5416d0537..27be12215 100644
--- a/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
@@ -14,7 +14,7 @@
 
 /**
  *
- * @author marcus
+ * @author Marcus Linke
  *
  */
 public class PullImageResultCallback extends ResultCallbackTemplate<PullImageResultCallback, PullResponseItem> {
diff --git a/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
index 8f08f3e15..65ec93c88 100644
--- a/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
@@ -14,7 +14,7 @@
 
 /**
  *
- * @author marcus
+ * @author Marcus Linke
  *
  */
 public class PushImageResultCallback extends ResultCallbackTemplate<PushImageResultCallback, PushResponseItem> {
diff --git a/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java b/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
index 5af956cf2..5416d124c 100644
--- a/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
@@ -16,7 +16,7 @@
 
 /**
  *
- * @author marcus
+ * @author Marcus Linke
  *
  */
 public class WaitContainerResultCallback extends ResultCallbackTemplate<WaitContainerResultCallback, WaitResponse> {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java b/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java
index 996696479..e6f4fd1d2 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java
@@ -11,7 +11,7 @@
 
 /**
  *
- * @author marcus
+ * @author Marcus Linke
  *
  */
 public class GETCallbackNotifier<T> extends AbstractCallbackNotifier<T> {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java b/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java
index 9fe848950..bd96e8250 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java
@@ -12,7 +12,7 @@
 
 /**
  *
- * @author marcus
+ * @author Marcus Linke
  *
  */
 public class POSTCallbackNotifier<T> extends AbstractCallbackNotifier<T> {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java
index a4d68e202..d358f574a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java
@@ -14,7 +14,7 @@
  * 
  * https://java.net/jira/browse/JERSEY-2852
  * 
- * @author marcus
+ * @author Marcus Linke
  *
  */
 public class ApacheConnectorClientResponse extends ClientResponse {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
index e597b594b..e119c7303 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
@@ -24,7 +24,7 @@
 /**
  * This {@link ClientResponseFilter} implementation detects http status codes and throws {@link DockerException}s
  *
- * @author marcus
+ * @author Marcus Linke
  *
  */
 public class ResponseStatusExceptionFilter implements ClientResponseFilter {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java b/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
index 05d4f9066..14072ba55 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
@@ -10,7 +10,7 @@
  * {@link WrappedResponseInputStream} is closed it closes the underlying {@link Response} object also to prevent
  * blocking/hanging connections.
  *
- * @author marcus
+ * @author Marcus Linke
  */
 public class WrappedResponseInputStream extends InputStream {
 
diff --git a/src/main/java/com/github/dockerjava/netty/ChannelProvider.java b/src/main/java/com/github/dockerjava/netty/ChannelProvider.java
index a868f1cd1..49cefe9d5 100644
--- a/src/main/java/com/github/dockerjava/netty/ChannelProvider.java
+++ b/src/main/java/com/github/dockerjava/netty/ChannelProvider.java
@@ -3,5 +3,5 @@
 import io.netty.channel.Channel;
 
 public interface ChannelProvider {
-	Channel getChannel();
-}
+    Channel getChannel();
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
index 4ac044ac6..570f8a663 100644
--- a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
@@ -115,7 +115,7 @@
  * https://github.com/netty/netty/blob/master/example/src/main/java/io/netty/example/http/snoop/HttpSnoopClient.java
  * https://github.com/slandelle/netty-request-chunking/blob/master/src/test/java/slandelle/ChunkingTest.java
  *
- * @author marcus
+ * @author Marcus Linke
  *
  */
 public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
@@ -154,7 +154,7 @@ public void init(DockerClientConfig dockerClientConfig) {
             nettyInitializer = new InetSocketInitializer();
         }
 
-        nettyInitializer.init(bootstrap, dockerClientConfig);
+        eventLoopGroup = nettyInitializer.init(bootstrap, dockerClientConfig);
     }
 
     private Channel connect() {
@@ -169,7 +169,7 @@ private Channel connect(final Bootstrap bootstrap) throws InterruptedException {
         return nettyInitializer.connect(bootstrap);
     }
 
-    private static interface NettyInitializer {
+    private interface NettyInitializer {
         EventLoopGroup init(final Bootstrap bootstrap, DockerClientConfig dockerClientConfig);
 
         Channel connect(final Bootstrap bootstrap) throws InterruptedException;
diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
index 8b6688ca6..68516100a 100644
--- a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
+++ b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
@@ -119,13 +119,13 @@ public void get(ResultCallback<Frame> resultCallback) {
         sendRequest(requestProvider, channel);
     }
 
-    public <T> ResponseCallback<T> get(TypeReference<T> typeReference) {
+    public <T> T get(TypeReference<T> typeReference) {
 
         ResponseCallback<T> callback = new ResponseCallback<T>();
 
         get(typeReference, callback);
 
-        return callback;
+        return callback.awaitResult();
     }
 
     public <T> void get(TypeReference<T> typeReference, ResultCallback<T> resultCallback) {
@@ -228,7 +228,7 @@ public void post(final Object entity, final InputStream stdin, ResultCallback<Fr
         sendRequest(requestProvider, channel);
 
         // wait for successful http upgrade procedure
-        hijackHandler.await();
+        hijackHandler.awaitUpgrade();
 
         // now we can start a new thread that reads from stdin and writes to the channel
         new Thread(new Runnable() {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExec.java
index 28aae4e05..662b9c1d4 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExec.java
@@ -28,7 +28,7 @@ protected List<ChangeLog> execute(ContainerDiffCmd command) {
 
         LOGGER.trace("GET: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<List<ChangeLog>>() {
-        }).awaitResult();
+        });
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InfoCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/InfoCmdExec.java
index 1db090ae6..288765650 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/InfoCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/InfoCmdExec.java
@@ -14,7 +14,7 @@
  * http://netty.io/wiki/native-transports.html
  * https://github.com/netty/netty/blob/master/example/src/main/java/io/netty/ example/http/snoop/HttpSnoopClient.java
  *
- * @author marcus
+ * @author Marcus Linke
  *
  */
 public class InfoCmdExec implements InfoCmd.Exec {
@@ -23,17 +23,14 @@ public class InfoCmdExec implements InfoCmd.Exec {
 
     private WebTarget webResource;
 
-    private DockerClientConfig dockerClientConfig;
-
     public InfoCmdExec(WebTarget webResource, DockerClientConfig dockerClientConfig) {
         this.webResource = webResource;
-        this.dockerClientConfig = dockerClientConfig;
     }
 
     @Override
     public Info exec(InfoCmd command) {
         return webResource.path("info").request().get(new TypeReference<Info>() {
-        }).awaitResult();
+        });
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/InspectContainerCmdExec.java
index 85b391a20..e8f691ba1 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/InspectContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/InspectContainerCmdExec.java
@@ -27,7 +27,7 @@ protected InspectContainerResponse execute(InspectContainerCmd command) {
         LOGGER.debug("GET: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_JSON)
                 .get(new TypeReference<InspectContainerResponse>() {
-                }).awaitResult();
+                });
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectExecCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/InspectExecCmdExec.java
index aac395d32..ee913f369 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/InspectExecCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/InspectExecCmdExec.java
@@ -25,6 +25,6 @@ protected InspectExecResponse execute(InspectExecCmd command) {
         LOGGER.debug("GET: {}", webResource);
 
         return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<InspectExecResponse>() {
-        }).awaitResult();
+        });
     }
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/InspectImageCmdExec.java
index b6f42414d..b86072ecb 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/InspectImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/InspectImageCmdExec.java
@@ -26,7 +26,7 @@ protected InspectImageResponse execute(InspectImageCmd command) {
         LOGGER.trace("GET: {}", webResource);
 
         return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<InspectImageResponse>() {
-        }).awaitResult();
+        });
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
index fe08c507d..b45e76cbd 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
@@ -44,7 +44,7 @@ protected List<Container> execute(ListContainersCmd command) {
 
         List<Container> containers = webTarget.request().accept(MediaType.APPLICATION_JSON)
                 .get(new TypeReference<List<Container>>() {
-                }).awaitResult();
+                });
 
         LOGGER.trace("Response: {}", containers);
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java
index b27bfcf8b..4ca65a061 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java
@@ -28,18 +28,18 @@ protected List<Image> execute(ListImagesCmd command) {
 
         webTarget = booleanQueryParam(webTarget, "all", command.hasShowAllEnabled());
 
-        if (command.getFilters() != null)
+        if (command.getFilters() != null) {
             webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters()));
+        }
 
         LOGGER.trace("GET: {}", webTarget);
 
         List<Image> images = webTarget.request().accept(MediaType.APPLICATION_JSON)
                 .get(new TypeReference<List<Image>>() {
-                }).awaitResult();
+                });
 
         LOGGER.trace("Response: {}", images);
 
         return images;
     }
-
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/LogContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/LogContainerCmdExec.java
index 4135f7308..911780362 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/LogContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/LogContainerCmdExec.java
@@ -44,5 +44,4 @@ protected Void execute0(LogContainerCmd command, ResultCallback<Frame> resultCal
 
         return null;
     }
-
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/SearchImagesCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/SearchImagesCmdExec.java
index b1ff7b10c..d31d00a9f 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/SearchImagesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/SearchImagesCmdExec.java
@@ -27,7 +27,7 @@ protected List<SearchItem> execute(SearchImagesCmd command) {
 
         LOGGER.trace("GET: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<List<SearchItem>>() {
-        }).awaitResult();
+        });
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/TopContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/TopContainerCmdExec.java
index 9b04e6c7d..07ec12b03 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/TopContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/TopContainerCmdExec.java
@@ -30,7 +30,7 @@ protected TopContainerResponse execute(TopContainerCmd command) {
 
         LOGGER.trace("GET: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<TopContainerResponse>() {
-        }).awaitResult();
+        });
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/VersionCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/VersionCmdExec.java
index 4d2bf936e..84857c208 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/VersionCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/VersionCmdExec.java
@@ -24,7 +24,7 @@ protected Version execute(VersionCmd command) {
 
         LOGGER.trace("GET: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<Version>() {
-        }).awaitResult();
+        });
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
index 5974f407f..c1b6a4812 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
@@ -62,10 +62,12 @@ private Frame decode() {
             if (headerCount == 0) {
                 return null;
             }
+
             headerCnt += headerCount;
 
-            if (headerCnt < HEADER_SIZE)
+            if (headerCnt < HEADER_SIZE) {
                 return null;
+            }
 
             streamType = streamType(header[0]);
 
@@ -81,8 +83,9 @@ private Frame decode() {
 
             int count = read(payload, payloadCnt, rawBuffer.readableBytes());
 
-            if (count == 0)
+            if (count == 0) {
                 return null;
+            }
 
             payloadCnt = 0;
 
@@ -92,18 +95,21 @@ private Frame decode() {
             int payloadSize = ((header[4] & 0xff) << 24) + ((header[5] & 0xff) << 16) + ((header[6] & 0xff) << 8)
                     + (header[7] & 0xff);
 
-            if (payloadCnt == 0)
+            if (payloadCnt == 0) {
                 payload = new byte[payloadSize];
+            }
 
             int count = read(payload, payloadCnt, payloadSize - payloadCnt);
 
-            if (count == 0)
+            if (count == 0) {
                 return null;
+            }
 
             payloadCnt += count;
 
-            if (payloadCnt < payloadSize)
+            if (payloadCnt < payloadSize) {
                 return null;
+            }
 
             headerCnt = 0;
             payloadCnt = 0;
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpConnectionHijackHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpConnectionHijackHandler.java
index 0b0135d7e..3010682f6 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/HttpConnectionHijackHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpConnectionHijackHandler.java
@@ -36,7 +36,7 @@ public CharSequence protocol() {
         return "tcp";
     }
 
-    public void await() {
+    public void awaitUpgrade() {
         try {
             latch.await();
         } catch (InterruptedException e) {
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java b/src/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java
index 9777a1098..0d861cc01 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java
@@ -3,7 +3,6 @@
 import io.netty.handler.codec.http.HttpRequest;
 
 public interface HttpRequestProvider {
-	
-	HttpRequest getHttpRequest(String uri);
 
+    public HttpRequest getHttpRequest(String uri);
 }
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
index 0cda2de81..59dc8929e 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
@@ -56,10 +56,12 @@ public int available() throws IOException {
         }
 
         private int readableBytes() {
-            if (current != null)
+            if (current != null) {
                 return current.readableBytes();
-            else
+            } else {
                 return 0;
+            }
+
         }
 
         @Override
@@ -68,8 +70,9 @@ public int read() throws IOException {
             poll();
 
             if (readableBytes() == 0) {
-                if (closed.get())
+                if (closed.get()) {
                     return -1;
+                }
             }
 
             if (current != null && current.readableBytes() > 0) {
@@ -77,7 +80,6 @@ public int read() throws IOException {
             } else {
                 return read();
             }
-
         }
 
         private void poll() {
@@ -89,7 +91,5 @@ private void poll() {
                 }
             }
         }
-
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/test/java/com/github/dockerjava/core/NameParserTest.java b/src/test/java/com/github/dockerjava/core/NameParserTest.java
index afae80ebb..865f9a401 100644
--- a/src/test/java/com/github/dockerjava/core/NameParserTest.java
+++ b/src/test/java/com/github/dockerjava/core/NameParserTest.java
@@ -16,7 +16,7 @@
 /**
  *
  *
- * @author marcus
+ * @author Marcus Linke
  *
  */
 public class NameParserTest {
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index d1ff920b0..4a96e664f 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -53,7 +53,7 @@
  * Special {@link DockerCmdExecFactory} implementation that collects container and image creations while test execution
  * for the purpose of automatically cleanup.
  *
- * @author marcus
+ * @author Marcus Linke
  */
 public class TestDockerCmdExecFactory implements DockerCmdExecFactory {
 
diff --git a/src/test/java/com/github/dockerjava/netty/AbstractNettyDockerClientTest.java b/src/test/java/com/github/dockerjava/netty/AbstractNettyDockerClientTest.java
index 7f2b83f4d..6dcb435f1 100644
--- a/src/test/java/com/github/dockerjava/netty/AbstractNettyDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/netty/AbstractNettyDockerClientTest.java
@@ -1,39 +1,10 @@
 package com.github.dockerjava.netty;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.lang.reflect.Method;
-import java.net.DatagramSocket;
-import java.net.ServerSocket;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.LineIterator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.ITestResult;
 
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.api.model.Volume;
-import com.github.dockerjava.api.model.VolumeBind;
 import com.github.dockerjava.client.AbstractDockerClientTest;
-import com.github.dockerjava.core.DockerClientBuilder;
-import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.TestDockerCmdExecFactory;
-import com.github.dockerjava.core.command.BuildImageResultCallback;
-import com.github.dockerjava.core.command.LogContainerResultCallback;
-import com.github.dockerjava.core.command.PullImageResultCallback;
-import com.google.common.base.Joiner;
 
 public abstract class AbstractNettyDockerClientTest extends AbstractDockerClientTest {
 
@@ -44,184 +15,4 @@ protected TestDockerCmdExecFactory initTestDockerCmdExecFactory() {
         return new TestDockerCmdExecFactory(
                 new DockerCmdExecFactoryImpl());
     }
-//
-//    protected TestDockerCmdExecFactory dockerCmdExecFactory =
-//
-//    public void beforeTest() throws Exception {
-//
-//        LOG.info("======================= BEFORETEST =======================");
-//        LOG.info("Connecting to Docker server");
-//        dockerClient = DockerClientBuilder.getInstance(config()).withDockerCmdExecFactory(dockerCmdExecFactory).build();
-//
-////        LOG.info("Pulling image 'busybox'");
-////
-////        // need to block until image is pulled completely
-////        dockerClient.pullImageCmd("busybox").withTag("latest").exec(new PullImageResultCallback()).awaitSuccess();
-//
-//        assertNotNull(dockerClient);
-//        LOG.info("======================= END OF BEFORETEST =======================\n\n");
-//    }
-//
-//    private DockerClientConfig config() {
-//        return config(null);
-//    }
-//
-//    protected DockerClientConfig config(String password) {
-//        DockerClientConfig.DockerClientConfigBuilder builder = DockerClientConfig.createDefaultConfigBuilder()
-//                .withServerAddress("https://index.docker.io/v1/");
-//        if (password != null) {
-//            builder = builder.withPassword(password);
-//        }
-//
-//        return builder.withVersion(apiVersion).build();
-//    }
-//
-//    public void afterTest() {
-//        LOG.info("======================= END OF AFTERTEST =======================");
-//    }
-//
-//    public void beforeMethod(Method method) {
-//        LOG.info(String.format("################################## STARTING %s ##################################",
-//                method.getName()));
-//    }
-//
-//    public void afterMethod(ITestResult result) {
-//
-//        for (String container : dockerCmdExecFactory.getContainerNames()) {
-//            LOG.info("Cleaning up temporary container {}", container);
-//
-//            try {
-//                dockerClient.removeContainerCmd(container).withForce(true).exec();
-//            } catch (DockerException ignore) {
-//                // ignore.printStackTrace();
-//            }
-//        }
-//
-//        for (String image : dockerCmdExecFactory.getImageNames()) {
-//            LOG.info("Cleaning up temporary image with {}", image);
-//            try {
-//                dockerClient.removeImageCmd(image).withForce(true).exec();
-//            } catch (DockerException ignore) {
-//                // ignore.printStackTrace();
-//            }
-//        }
-//
-//        LOG.info("################################## END OF {} ##################################\n", result.getName());
-//    }
-//
-//    protected String asString(InputStream response) {
-//        return consumeAsString(response);
-//    }
-//
-//    public static String consumeAsString(InputStream response) {
-//
-//        StringWriter logwriter = new StringWriter();
-//
-//        try {
-//            LineIterator itr = IOUtils.lineIterator(response, "UTF-8");
-//
-//            while (itr.hasNext()) {
-//                String line = itr.next();
-//                logwriter.write(line + (itr.hasNext() ? "\n" : ""));
-//                LOG.info("line: " + line);
-//            }
-//            response.close();
-//
-//            return logwriter.toString();
-//        } catch (IOException e) {
-//            throw new RuntimeException(e);
-//        } finally {
-//            IOUtils.closeQuietly(response);
-//        }
-//    }
-//
-//    // UTIL
-//
-//    /**
-//     * Checks to see if a specific port is available.
-//     *
-//     * @param port
-//     *            the port to check for availability
-//     */
-//    public static Boolean available(int port) {
-//        if (port < 1100 || port > 60000) {
-//            throw new IllegalArgumentException("Invalid start port: " + port);
-//        }
-//
-//        ServerSocket ss = null;
-//        DatagramSocket ds = null;
-//        try {
-//            ss = new ServerSocket(port);
-//            ss.setReuseAddress(true);
-//            ds = new DatagramSocket(port);
-//            ds.setReuseAddress(true);
-//            return true;
-//        } catch (IOException ignored) {
-//        } finally {
-//            if (ds != null) {
-//                ds.close();
-//            }
-//
-//            if (ss != null) {
-//                try {
-//                    ss.close();
-//                } catch (IOException e) {
-//                    /* should not be thrown */
-//                }
-//            }
-//        }
-//
-//        return false;
-//    }
-//
-//    /**
-//     * Asserts that {@link InspectContainerResponse#getVolumes()} (<code>.Volumes</code>) has {@link VolumeBind}s for
-//     * the given {@link Volume}s
-//     */
-//    public static void assertContainerHasVolumes(InspectContainerResponse inspectContainerResponse,
-//            Volume... expectedVolumes) {
-//        VolumeBind[] volumeBinds = inspectContainerResponse.getVolumes();
-//        LOG.info("Inspect .Volumes = [{}]", Joiner.on(", ").join(volumeBinds));
-//
-//        List<Volume> volumes = new ArrayList<Volume>();
-//        for (VolumeBind bind : volumeBinds) {
-//            volumes.add(new Volume(bind.getContainerPath()));
-//        }
-//        assertThat(volumes, contains(expectedVolumes));
-//    }
-//
-//    protected String containerLog(String containerId) throws Exception {
-//        return dockerClient.logContainerCmd(containerId).withStdOut(true).exec(new LogContainerTestCallback())
-//                .awaitCompletion().toString();
-//    }
-//
-//    public static class LogContainerTestCallback extends LogContainerResultCallback {
-//        protected final StringBuffer log = new StringBuffer();
-//
-//        @Override
-//        public void onNext(Frame frame) {
-//            log.append(new String(frame.getPayload()));
-//            super.onNext(frame);
-//        }
-//
-//        @Override
-//        public String toString() {
-//            return log.toString();
-//        }
-//
-//        @Override
-//        public LogContainerResultCallback awaitCompletion() throws InterruptedException {
-//            LogContainerResultCallback result =  super.awaitCompletion();
-//            System.err.println("awaitCompletion returned");
-//
-//            return result;
-//        }
-//    }
-//
-//    protected String buildImage(File baseDir) throws Exception {
-//
-//        return dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback())
-//                .awaitImageId();
-//    }
-
 }

From d5dbb5de459809fdf90467a67ffd07b5595725ed Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Mon, 14 Dec 2015 21:04:01 +0100
Subject: [PATCH 0343/1272] Added some javadoc

---
 .../netty/DockerCmdExecFactoryImpl.java       | 25 +++++---
 .../dockerjava/netty/InvocationBuilder.java   |  6 ++
 .../github/dockerjava/netty/MediaType.java    |  6 ++
 .../github/dockerjava/netty/WebTarget.java    |  6 ++
 .../handler/FramedResponseStreamHandler.java  |  9 +++
 .../netty/handler/HttpResponseHandler.java    |  6 ++
 .../handler/HttpResponseStreamHandler.java    |  5 ++
 .../netty/handler/JsonRequestHandler.java     |  5 ++
 .../handler/JsonResponseCallbackHandler.java  |  5 ++
 .../netty/handler/JsonResponseHandler.java    | 62 -------------------
 10 files changed, 65 insertions(+), 70 deletions(-)
 delete mode 100644 src/main/java/com/github/dockerjava/netty/handler/JsonResponseHandler.java

diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
index 570f8a663..865389fef 100644
--- a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
@@ -27,8 +27,6 @@
 import javax.net.ssl.SSLParameters;
 
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd;
@@ -70,6 +68,7 @@
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.DockerClientImpl;
 import com.github.dockerjava.netty.exec.AttachContainerCmdExec;
 import com.github.dockerjava.netty.exec.AuthCmdExec;
 import com.github.dockerjava.netty.exec.BuildImageCmdExec;
@@ -110,17 +109,27 @@
 import com.github.dockerjava.netty.exec.WaitContainerCmdExec;
 
 /**
- * http://stackoverflow.com/questions/33296749/netty-connect-to-unix-domain-socket-failed
- * http://netty.io/wiki/native-transports.html
- * https://github.com/netty/netty/blob/master/example/src/main/java/io/netty/example/http/snoop/HttpSnoopClient.java
- * https://github.com/slandelle/netty-request-chunking/blob/master/src/test/java/slandelle/ChunkingTest.java
+ * Experimental implementation of {@link DockerCmdExecFactory} that supports http connection hijacking that is needed to
+ * pass STDIN to the container.
  *
- * @author Marcus Linke
+ * To use it just pass an instance via {@link DockerClientImpl#withDockerCmdExecFactory(DockerCmdExecFactory)}
+ *
+ * @see https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#attach-to-a-container
+ * @see https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#exec-start
  *
+ *
+ * @author Marcus Linke
  */
 public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DockerCmdExecFactoryImpl.class.getName());
+    /*
+     * useful links:
+     *
+     * http://stackoverflow.com/questions/33296749/netty-connect-to-unix-domain-socket-failed
+     * http://netty.io/wiki/native-transports.html
+     * https://github.com/netty/netty/blob/master/example/src/main/java/io/netty/example/http/snoop/HttpSnoopClient.java
+     * https://github.com/slandelle/netty-request-chunking/blob/master/src/test/java/slandelle/ChunkingTest.java
+     */
 
     private DockerClientConfig dockerClientConfig;
 
diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
index 68516100a..a478cf6c1 100644
--- a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
+++ b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
@@ -45,6 +45,12 @@
 import com.github.dockerjava.netty.handler.HttpResponseStreamHandler;
 import com.github.dockerjava.netty.handler.JsonResponseCallbackHandler;
 
+/**
+ * This class is basically a replacement of javax.ws.rs.client.Invocation.Builder to allow simpler
+ * migration of JAX-RS code to a netty based implementation.
+ *
+ * @author Marcus Linke
+ */
 public class InvocationBuilder {
 
     public class ResponseCallback<T> extends ResultCallbackTemplate<ResponseCallback<T>, T> {
diff --git a/src/main/java/com/github/dockerjava/netty/MediaType.java b/src/main/java/com/github/dockerjava/netty/MediaType.java
index 3341f4a46..a7738604a 100644
--- a/src/main/java/com/github/dockerjava/netty/MediaType.java
+++ b/src/main/java/com/github/dockerjava/netty/MediaType.java
@@ -1,5 +1,11 @@
 package com.github.dockerjava.netty;
 
+/**
+ * This class is basically a replacement of javax.ws.rs.core.MediaType to allow simpler
+ * migration of JAX-RS code to a netty based implementation.
+ *
+ * @author Marcus Linke
+ */
 public enum MediaType {
 
 	APPLICATION_JSON("application/json"),
diff --git a/src/main/java/com/github/dockerjava/netty/WebTarget.java b/src/main/java/com/github/dockerjava/netty/WebTarget.java
index 4362ccab9..7698858a3 100644
--- a/src/main/java/com/github/dockerjava/netty/WebTarget.java
+++ b/src/main/java/com/github/dockerjava/netty/WebTarget.java
@@ -8,6 +8,12 @@
 
 import org.apache.commons.lang.StringUtils;
 
+/**
+ * This class is basically a replacement of javax.ws.rs.client.WebTarget to allow simpler
+ * migration of JAX-RS code to a netty based implementation.
+ *
+ * @author Marcus Linke
+ */
 public class WebTarget {
 
     private ChannelProvider channelProvider;
diff --git a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
index c1b6a4812..87878f0da 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
@@ -9,6 +9,15 @@
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.StreamType;
 
+/**
+ * Handler that decodes a docker-raw-stream as described here:
+ *
+ * https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#attach-to-a-container
+ *
+ * It drives the {@link ResultCallback#onNext(Object)} method of the passed {@link ResultCallback}.
+ *
+ * @author Marcus Linke
+ */
 public class FramedResponseStreamHandler extends SimpleChannelInboundHandler<ByteBuf> {
 
     private static final int HEADER_SIZE = 8;
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
index d5306ba26..2f11ccf38 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
@@ -23,6 +23,12 @@
 import com.github.dockerjava.api.exception.NotModifiedException;
 import com.github.dockerjava.api.exception.UnauthorizedException;
 
+/**
+ * Handler that is responsible to handle an incoming {@link HttpResponse}. It evaluates the status code and
+ * triggers the appropriate lifecycle methods at the passed {@link ResultCallback}.
+ *
+ * @author Marcus Linke
+ */
 public class HttpResponseHandler extends SimpleChannelInboundHandler<HttpObject> {
 
     private HttpResponse response;
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
index 59dc8929e..b3800be56 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
@@ -12,6 +12,11 @@
 
 import com.github.dockerjava.api.async.ResultCallback;
 
+/**
+ * Handler that converts an incoming byte stream to an {@link InputStream}.
+ *
+ * @author marcus
+ */
 public class HttpResponseStreamHandler extends SimpleChannelInboundHandler<ByteBuf> {
 
     private HttpResponseInputStream stream = new HttpResponseInputStream();
diff --git a/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java b/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
index 4340e1a38..54ffb2f96 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
@@ -6,6 +6,11 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+/**
+ * Handler that encodes an outgoing object to JSON.
+ *
+ * @author Marcus Linke
+ */
 public class JsonRequestHandler extends MessageToByteEncoder<Object>{
 
 	private ObjectMapper mapper = new ObjectMapper();
diff --git a/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java b/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
index 614508a81..b5f76ab73 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
@@ -8,6 +8,11 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.async.ResultCallback;
 
+/**
+ * Handler that decodes an incoming byte stream into objects of T and calls {@link ResultCallback#onNext(Object)}
+ *
+ * @author Marcus Linke
+ */
 public class JsonResponseCallbackHandler<T> extends SimpleChannelInboundHandler<ByteBuf> {
 
     private static ObjectMapper objectMapper = new ObjectMapper();
diff --git a/src/main/java/com/github/dockerjava/netty/handler/JsonResponseHandler.java b/src/main/java/com/github/dockerjava/netty/handler/JsonResponseHandler.java
deleted file mode 100644
index efbd74f1f..000000000
--- a/src/main/java/com/github/dockerjava/netty/handler/JsonResponseHandler.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.github.dockerjava.netty.handler;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-
-import java.util.concurrent.CountDownLatch;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-public class JsonResponseHandler<T> extends SimpleChannelInboundHandler<ByteBuf> {
-
-    private static ObjectMapper objectMapper = new ObjectMapper();
-
-    private TypeReference<T> typeReference;
-
-    private CountDownLatch countDownLatch = new CountDownLatch(1);
-
-    private T object;
-
-    public JsonResponseHandler(TypeReference<T> typeReference) {
-        this.typeReference = typeReference;
-    }
-
-    @Override
-    protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
-        System.err.println("AwaitObjectInboundHandler: channelRead0: " + msg);
-        byte[] buffer = new byte[msg.readableBytes()];
-        msg.readBytes(buffer);
-
-        try {
-            object = objectMapper.readValue(buffer, typeReference);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-
-        countDownLatch.countDown();
-    }
-
-    @Override
-    public void channelReadComplete(ChannelHandlerContext ctx) throws Exception {
-        System.err.println("AwaitObjectInboundHandler: channelReadComplete");
-        super.channelReadComplete(ctx);
-    }
-
-    public T await() {
-        try {
-            countDownLatch.await();
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-        return object;
-    }
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        cause.printStackTrace();
-        ctx.close();
-    }
-
-}

From 60e021bb5078e0678769094c6e150f03c25242df Mon Sep 17 00:00:00 2001
From: Simon Webb <simon.webb@dunnhumby.com>
Date: Thu, 5 Nov 2015 11:24:41 +0000
Subject: [PATCH 0344/1272] Added override for bulk-read variant of
 InputStream.read() in anonymous inner class created by
 Dockerfile.ScannedResult.buildDockerFolderTar(). This fixes an IO performance
 issue that occurs when only the single-byte variant of the read() method on
 InputStream is overriden.

---
 .../com/github/dockerjava/core/dockerfile/Dockerfile.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 9c8ef428d..38f40fc7a 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -142,6 +142,11 @@ public int read() throws IOException {
                         return tarInputStream.read();
                     }
 
+                    @Override
+                    public int read(byte [] buff, int offset, int len) throws IOException {
+                        return tarInputStream.read(buff, offset, len);
+                    }
+
                     @Override
                     public void close() throws IOException {
                         IOUtils.closeQuietly(tarInputStream);

From 61fc0a332bf974f686509519b554ff2253f1fb58 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 15 Dec 2015 20:09:49 +0100
Subject: [PATCH 0345/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbcfaf035..a9e70ddc3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Change Log
 ===
-2.1.3
+
+2.1.4-SNAPSHOT
+---
+* [#359] (https://github.com/docker-java/docker-java/pull/359) Fix performance issue of build command by adding bulk-read variant of InputStream.read()
+
+v2.1.3
 ---
  
 * [#387] (https://github.com/docker-java/docker-java/pull/387) Make ProgressDetails attributes public

From b9f32db8d341871d2d0250d2ce7ecab17756fbbe Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 15 Dec 2015 20:49:10 +0100
Subject: [PATCH 0346/1272] Fix issue #396

---
 .../jaxrs/DockerCmdExecFactoryImpl.java          | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index 26c78a6d4..ceddb8af4 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -140,16 +140,23 @@ public void init(DockerClientConfig dockerClientConfig) {
         URI originalUri = dockerClientConfig.getUri();
 
         SSLContext sslContext = null;
+        String protocol = null;
 
         if (dockerClientConfig.getSslConfig() != null) {
-            configureProxy(clientConfig, "https");
+            protocol = "https";
             try {
                 sslContext = dockerClientConfig.getSslConfig().getSSLContext();
             } catch (Exception ex) {
                 throw new DockerClientException("Error in SSL Configuration", ex);
             }
         } else {
-            configureProxy(clientConfig, "http");
+            protocol = "http";
+        }
+
+        if(originalUri.getScheme().equals("unix")) {
+            dockerClientConfig.setUri(UnixConnectionSocketFactory.sanitizeUri(originalUri));
+        } else {
+            configureProxy(clientConfig, protocol);
         }
 
         PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(
@@ -174,12 +181,7 @@ public void init(DockerClientConfig dockerClientConfig) {
 
         client = clientBuilder.build();
 
-        if (originalUri.getScheme().equals("unix")) {
-            dockerClientConfig.setUri(UnixConnectionSocketFactory.sanitizeUri(originalUri));
-        }
-
         baseResource = client.target(dockerClientConfig.getUri()).path(dockerClientConfig.getVersion().asWebPathPart());
-
     }
 
     private void configureProxy(ClientConfig clientConfig, String protocol) {

From dd022034fc49336f0f229ff7fac17ea82639a2c1 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 15 Dec 2015 21:14:22 +0100
Subject: [PATCH 0347/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9e70ddc3..fc64027de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@ Change Log
 
 2.1.4-SNAPSHOT
 ---
+
+* [#396] (https://github.com/docker-java/docker-java/pull/396) Disable evaluation of http.proxy... variables when using unix socket connection  
 * [#359] (https://github.com/docker-java/docker-java/pull/359) Fix performance issue of build command by adding bulk-read variant of InputStream.read()
 
 v2.1.3

From 3aef2d0fce14e4ffefcd7ace620b9f05252f982d Mon Sep 17 00:00:00 2001
From: gtejasvarma <gtejasvarma@gmail.com>
Date: Thu, 17 Dec 2015 11:37:53 -0800
Subject: [PATCH 0348/1272] adding RestartCount to InspectContainerResponse

---
 .../dockerjava/api/command/InspectContainerResponse.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index b98e6d70d..a6e396985 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -66,6 +66,9 @@ public class InspectContainerResponse {
     @JsonProperty("Name")
     private String name;
 
+    @JsonProperty("RestartCount")
+    private int restartCount;;
+
     @JsonProperty("NetworkSettings")
     private NetworkSettings networkSettings;
 
@@ -160,6 +163,10 @@ public String getName() {
         return name;
     }
 
+    public int getRestartCount() {
+        return restartCount;
+    }
+
     public String getDriver() {
         return driver;
     }

From c32d631220fd76a408302399ea9192577fcba51f Mon Sep 17 00:00:00 2001
From: Ivan Gracia <izanmail@gmail.com>
Date: Fri, 18 Dec 2015 13:25:20 +0100
Subject: [PATCH 0349/1272] Upgraded jackson-jaxrs-json-provider dependency

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index af33917b8..308432bd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
 		<jdk.target>1.7</jdk.target>
 
 		<jersey.version>2.11</jersey.version>
-		<jackson-jaxrs.version>2.1.2</jackson-jaxrs.version>
+		<jackson-jaxrs.version>2.6.4</jackson-jaxrs.version>
 		<httpclient.version>4.3.1</httpclient.version>
 		<commons-compress.version>1.5</commons-compress.version>
 		<commons-codec.version>1.8</commons-codec.version>

From 4e9b85fa048b5f619553dcc4deae167a5d90f724 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 19 Dec 2015 02:16:54 +0300
Subject: [PATCH 0350/1272] Checkstyle NL in EOF.

---
 .../java/com/github/dockerjava/api/command/AuthCmd.java     | 2 +-
 .../com/github/dockerjava/api/command/BuildImageCmd.java    | 2 +-
 .../java/com/github/dockerjava/api/command/CommitCmd.java   | 2 +-
 .../com/github/dockerjava/api/command/ContainerDiffCmd.java | 2 +-
 .../dockerjava/api/command/CopyFileFromContainerCmd.java    | 2 +-
 .../com/github/dockerjava/api/command/CreateImageCmd.java   | 2 +-
 .../java/com/github/dockerjava/api/command/DockerCmd.java   | 2 +-
 .../github/dockerjava/api/command/DockerCmdExecFactory.java | 2 +-
 .../java/com/github/dockerjava/api/command/InfoCmd.java     | 2 +-
 .../github/dockerjava/api/command/InspectContainerCmd.java  | 2 +-
 .../com/github/dockerjava/api/command/InspectImageCmd.java  | 2 +-
 .../com/github/dockerjava/api/command/KillContainerCmd.java | 2 +-
 .../github/dockerjava/api/command/ListContainersCmd.java    | 2 +-
 .../com/github/dockerjava/api/command/ListImagesCmd.java    | 2 +-
 .../github/dockerjava/api/command/PauseContainerCmd.java    | 2 +-
 .../java/com/github/dockerjava/api/command/PingCmd.java     | 2 +-
 .../com/github/dockerjava/api/command/PullImageCmd.java     | 2 +-
 .../com/github/dockerjava/api/command/PushImageCmd.java     | 2 +-
 .../github/dockerjava/api/command/RemoveContainerCmd.java   | 2 +-
 .../com/github/dockerjava/api/command/RemoveImageCmd.java   | 2 +-
 .../github/dockerjava/api/command/RestartContainerCmd.java  | 2 +-
 .../com/github/dockerjava/api/command/SearchImagesCmd.java  | 2 +-
 .../com/github/dockerjava/api/command/StopContainerCmd.java | 2 +-
 .../com/github/dockerjava/api/command/SyncDockerCmd.java    | 2 +-
 .../java/com/github/dockerjava/api/command/TagImageCmd.java | 2 +-
 .../com/github/dockerjava/api/command/TopContainerCmd.java  | 2 +-
 .../github/dockerjava/api/command/UnpauseContainerCmd.java  | 2 +-
 .../java/com/github/dockerjava/api/command/VersionCmd.java  | 2 +-
 .../dockerjava/core/command/AbstrAuthCfgDockerCmd.java      | 2 +-
 .../dockerjava/jaxrs/CopyFileFromContainerCmdExec.java      | 2 +-
 .../com/github/dockerjava/jaxrs/filter/LoggingFilter.java   | 2 +-
 .../java/com/github/dockerjava/netty/ChannelProvider.java   | 2 +-
 .../dockerjava/netty/handler/HttpResponseStreamHandler.java | 2 +-
 src/main/resources/docker.io.properties                     | 2 +-
 src/test/resources/checkstyle/checkstyle-config.xml         | 6 ++++++
 35 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
index 168927959..8402ee533 100644
--- a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
@@ -31,4 +31,4 @@ public interface AuthCmd extends SyncDockerCmd<AuthResponse> {
     public static interface Exec extends DockerCmdSyncExec<AuthCmd, AuthResponse> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 643d95bae..96d94fd06 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -124,4 +124,4 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     public static interface Exec extends DockerCmdAsyncExec<BuildImageCmd, BuildResponseItem> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
index c948ed7d3..81bc70e0c 100644
--- a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
@@ -123,4 +123,4 @@ public interface CommitCmd extends SyncDockerCmd<String> {
 
     public static interface Exec extends DockerCmdSyncExec<CommitCmd, String> {
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java b/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
index 204e35fce..cc3bfa757 100644
--- a/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
@@ -34,4 +34,4 @@ public interface ContainerDiffCmd extends SyncDockerCmd<List<ChangeLog>> {
     public static interface Exec extends DockerCmdSyncExec<ContainerDiffCmd, List<ChangeLog>> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
index 5ae9f6276..8786ca57f 100644
--- a/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
@@ -35,4 +35,4 @@ public interface CopyFileFromContainerCmd extends SyncDockerCmd<InputStream> {
 
     public static interface Exec extends DockerCmdSyncExec<CopyFileFromContainerCmd, InputStream> {
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
index 66df49c98..db10a374c 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
@@ -38,4 +38,4 @@ public interface CreateImageCmd extends SyncDockerCmd<CreateImageResponse> {
     public static interface Exec extends DockerCmdSyncExec<CreateImageCmd, CreateImageResponse> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmd.java b/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
index eafe34ae5..27aad850b 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
@@ -7,4 +7,4 @@ public interface DockerCmd<RES_T> extends Closeable {
     @Override
     public void close();
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index f0b35f58f..c3c753e9c 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -87,4 +87,4 @@ public interface DockerCmdExecFactory extends Closeable {
 
     @Override
     public void close() throws IOException;
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/InfoCmd.java b/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
index 2fe7f2bf6..257c3bec1 100644
--- a/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
@@ -7,4 +7,4 @@ public interface InfoCmd extends SyncDockerCmd<Info> {
     public static interface Exec extends DockerCmdSyncExec<InfoCmd, Info> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
index b6fde3fdc..b5fbe212f 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
@@ -21,4 +21,4 @@ public interface InspectContainerCmd extends SyncDockerCmd<InspectContainerRespo
 
     public static interface Exec extends DockerCmdSyncExec<InspectContainerCmd, InspectContainerResponse> {
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
index 2d3163533..253c31e78 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
@@ -25,4 +25,4 @@ public interface InspectImageCmd extends SyncDockerCmd<InspectImageResponse> {
     public static interface Exec extends DockerCmdSyncExec<InspectImageCmd, InspectImageResponse> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
index 1e8da1a18..aca3902c0 100644
--- a/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
@@ -30,4 +30,4 @@ public interface KillContainerCmd extends SyncDockerCmd<Void> {
     public static interface Exec extends DockerCmdSyncExec<KillContainerCmd, Void> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
index cec5f66c2..87faec0b3 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
@@ -57,4 +57,4 @@ public interface ListContainersCmd extends SyncDockerCmd<List<Container>> {
     public static interface Exec extends DockerCmdSyncExec<ListContainersCmd, List<Container>> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java b/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
index 481bf7e49..3ef40f48f 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
@@ -29,4 +29,4 @@ public interface ListImagesCmd extends SyncDockerCmd<List<Image>> {
     public static interface Exec extends DockerCmdSyncExec<ListImagesCmd, List<Image>> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
index 4ca00a90d..74a4c86bc 100644
--- a/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
@@ -29,4 +29,4 @@ public interface PauseContainerCmd extends SyncDockerCmd<Void> {
     public static interface Exec extends DockerCmdSyncExec<PauseContainerCmd, Void> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/PingCmd.java b/src/main/java/com/github/dockerjava/api/command/PingCmd.java
index 0be834e9a..07de7e959 100644
--- a/src/main/java/com/github/dockerjava/api/command/PingCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PingCmd.java
@@ -9,4 +9,4 @@ public interface PingCmd extends SyncDockerCmd<Void> {
     public static interface Exec extends DockerCmdSyncExec<PingCmd, Void> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java b/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
index 641258fd1..319fecd14 100644
--- a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
@@ -34,4 +34,4 @@ public interface PullImageCmd extends AsyncDockerCmd<PullImageCmd, PullResponseI
 
     public static interface Exec extends DockerCmdAsyncExec<PullImageCmd, PullResponseItem> {
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java b/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
index 24cb7fd71..8b9f3961e 100644
--- a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
@@ -48,4 +48,4 @@ public interface PushImageCmd extends AsyncDockerCmd<PushImageCmd, PushResponseI
 
     public static interface Exec extends DockerCmdAsyncExec<PushImageCmd, PushResponseItem> {
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
index 5cbb21171..bcc700d03 100644
--- a/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
@@ -40,4 +40,4 @@ public interface RemoveContainerCmd extends SyncDockerCmd<Void> {
     public static interface Exec extends DockerCmdSyncExec<RemoveContainerCmd, Void> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
index 987d29410..cfd9c36cd 100644
--- a/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
@@ -44,4 +44,4 @@ public interface RemoveImageCmd extends SyncDockerCmd<Void> {
     public static interface Exec extends DockerCmdSyncExec<RemoveImageCmd, Void> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
index 688141a20..d15666437 100644
--- a/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
@@ -34,4 +34,4 @@ public interface RestartContainerCmd extends SyncDockerCmd<Void> {
     public static interface Exec extends DockerCmdSyncExec<RestartContainerCmd, Void> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java b/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
index 897623517..42cd6917e 100644
--- a/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
@@ -24,4 +24,4 @@ public interface SearchImagesCmd extends SyncDockerCmd<List<SearchItem>> {
     public static interface Exec extends DockerCmdSyncExec<SearchImagesCmd, List<SearchItem>> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
index cf7cb53c8..2c99a5fd5 100644
--- a/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
@@ -39,4 +39,4 @@ public interface StopContainerCmd extends SyncDockerCmd<Void> {
     public static interface Exec extends DockerCmdSyncExec<StopContainerCmd, Void> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java b/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java
index 0ac3cf819..4bc55fec6 100644
--- a/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java
@@ -4,4 +4,4 @@ public interface SyncDockerCmd<RES_T> extends DockerCmd<RES_T> {
 
     public RES_T exec();
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java b/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
index 8ceab3656..08b1411ff 100644
--- a/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
@@ -41,4 +41,4 @@ public interface TagImageCmd extends SyncDockerCmd<Void> {
     public static interface Exec extends DockerCmdSyncExec<TagImageCmd, Void> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
index 5c6381a71..edde72628 100644
--- a/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
@@ -30,4 +30,4 @@ public interface TopContainerCmd extends SyncDockerCmd<TopContainerResponse> {
     public static interface Exec extends DockerCmdSyncExec<TopContainerCmd, TopContainerResponse> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
index 5e620a079..8b751e55c 100644
--- a/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
@@ -29,4 +29,4 @@ public interface UnpauseContainerCmd extends SyncDockerCmd<Void> {
     public static interface Exec extends DockerCmdSyncExec<UnpauseContainerCmd, Void> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/VersionCmd.java b/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
index 5f823c6cb..789c521fb 100644
--- a/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
@@ -10,4 +10,4 @@ public interface VersionCmd extends SyncDockerCmd<Version> {
     public static interface Exec extends DockerCmdSyncExec<VersionCmd, Version> {
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
index 626affae2..64e0e27f8 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
@@ -34,4 +34,4 @@ private T withOptionalAuthConfig(AuthConfig authConfig) {
         return (T) this;
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
index f63b0cb58..6afffe0c4 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
@@ -37,4 +37,4 @@ protected InputStream execute(CopyFileFromContainerCmd command) {
         return new WrappedResponseInputStream(response);
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
index 69fdf8c92..6dbea0045 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
@@ -337,4 +337,4 @@ public void write(final int i) throws IOException {
             inner.write(i);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/netty/ChannelProvider.java b/src/main/java/com/github/dockerjava/netty/ChannelProvider.java
index 49cefe9d5..c742015fc 100644
--- a/src/main/java/com/github/dockerjava/netty/ChannelProvider.java
+++ b/src/main/java/com/github/dockerjava/netty/ChannelProvider.java
@@ -4,4 +4,4 @@
 
 public interface ChannelProvider {
     Channel getChannel();
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
index b3800be56..d4f19f2e3 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
@@ -97,4 +97,4 @@ private void poll() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/docker.io.properties b/src/main/resources/docker.io.properties
index 30ba2b62a..719500e24 100644
--- a/src/main/resources/docker.io.properties
+++ b/src/main/resources/docker.io.properties
@@ -2,4 +2,4 @@ docker.io.url=https://localhost:2376
 docker.io.dockerCertPath=${user.home}/.docker
 docker.io.dockerCfgPath=${user.home}/.dockercfg
 docker.io.username=${user.name}
-docker.io.serverAddress=https://index.docker.io/v1/
\ No newline at end of file
+docker.io.serverAddress=https://index.docker.io/v1/
diff --git a/src/test/resources/checkstyle/checkstyle-config.xml b/src/test/resources/checkstyle/checkstyle-config.xml
index b804c7f97..9f9f7b02b 100644
--- a/src/test/resources/checkstyle/checkstyle-config.xml
+++ b/src/test/resources/checkstyle/checkstyle-config.xml
@@ -12,6 +12,12 @@
         <property name="basedir" value="${basedir}"/>
     -->
 
+    <!-- Checks whether files end with a new line.                        -->
+    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+    <module name="NewlineAtEndOfFile">
+        <property name="lineSeparator" value="lf"/>
+    </module>
+
     <module name="TreeWalker">
         <module name="UnusedImports">
             <property name="processJavadoc" value="true"/>

From 2f82aab16f9743bdd324e184590344c6411b6c49 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 18 Dec 2015 22:29:51 +0100
Subject: [PATCH 0351/1272] Support for volume API

---
 .../github/dockerjava/api/DockerClient.java   | 12 ++++
 .../api/command/CreateVolumeCmd.java          | 40 +++++++++++
 .../api/command/CreateVolumeResponse.java     | 40 +++++++++++
 .../api/command/DockerCmdExecFactory.java     |  9 +++
 .../api/command/InspectVolumeCmd.java         | 23 +++++++
 .../api/command/InspectVolumeResponse.java    | 40 +++++++++++
 .../api/command/ListVolumesCmd.java           | 25 +++++++
 .../api/command/ListVolumesResponse.java      | 28 ++++++++
 .../api/command/RemoveVolumeCmd.java          | 30 +++++++++
 .../dockerjava/core/DockerClientImpl.java     | 28 ++++++++
 .../core/command/CreateVolumeCmdImpl.java     | 66 +++++++++++++++++++
 .../core/command/InspectVolumeCmdImpl.java    | 42 ++++++++++++
 .../core/command/ListVolumesCmdImpl.java      | 32 +++++++++
 .../core/command/RemoveVolumeCmdImpl.java     | 38 +++++++++++
 .../dockerjava/jaxrs/CreateVolumeCmdExec.java | 32 +++++++++
 .../jaxrs/DockerCmdExecFactoryImpl.java       | 26 +++++++-
 .../jaxrs/InspectVolumeCmdExec.java           | 29 ++++++++
 .../dockerjava/jaxrs/ListVolumesCmdExec.java  | 34 ++++++++++
 .../dockerjava/jaxrs/RemoveVolumeCmdExec.java | 30 +++++++++
 .../netty/DockerCmdExecFactoryImpl.java       | 28 ++++++++
 .../dockerjava/netty/InvocationBuilder.java   | 51 +++++++-------
 .../netty/exec/CreateVolumeCmdExec.java       | 31 +++++++++
 .../netty/exec/InspectVolumeCmdExec.java      | 30 +++++++++
 .../netty/exec/ListVolumesCmdExec.java        | 36 ++++++++++
 .../netty/exec/RemoveVolumeCmdExec.java       | 29 ++++++++
 .../core/TestDockerCmdExecFactory.java        | 25 ++++++-
 .../core/command/BuildImageCmdImplTest.java   |  3 +
 .../core/command/CreateVolumeCmdImplTest.java | 53 +++++++++++++++
 .../command/InspectVolumeCmdImplTest.java     | 56 ++++++++++++++++
 .../core/command/ListVolumesCmdImplTest.java  | 59 +++++++++++++++++
 .../core/command/RemoveVolumeCmdImplTest.java | 65 ++++++++++++++++++
 .../netty/AbstractNettyDockerClientTest.java  |  3 +-
 .../netty/exec/BuildImageCmdExecTest.java     |  3 +
 .../netty/exec/CreateVolumeCmdExecTest.java   | 53 +++++++++++++++
 .../netty/exec/InspectVolumeCmdExecTest.java  | 56 ++++++++++++++++
 .../netty/exec/ListVolumesCmdExecTest.java    | 59 +++++++++++++++++
 .../netty/exec/RemoveVolumeCmdExecTest.java   | 65 ++++++++++++++++++
 37 files changed, 1280 insertions(+), 29 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/CreateVolumeCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/InspectVolumeCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/RemoveVolumeCmdExec.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/CreateVolumeCmdImplTest.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/InspectVolumeCmdImplTest.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/ListVolumesCmdImplTest.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/RemoveVolumeCmdImplTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/CreateVolumeCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/InspectVolumeCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/ListVolumesCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/RemoveVolumeCmdExecTest.java

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 6694be0de..a3a3a9aa0 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -17,6 +17,7 @@
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.CreateVolumeCmd;
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.command.ExecCreateCmd;
 import com.github.dockerjava.api.command.ExecStartCmd;
@@ -24,9 +25,11 @@
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.InspectVolumeCmd;
 import com.github.dockerjava.api.command.KillContainerCmd;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.command.PingCmd;
@@ -34,6 +37,7 @@
 import com.github.dockerjava.api.command.PushImageCmd;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.api.command.SearchImagesCmd;
@@ -188,6 +192,14 @@ public interface DockerClient extends Closeable {
 
     public StatsCmd statsCmd(String containerId);
 
+    public CreateVolumeCmd createVolumeCmd();
+
+    public InspectVolumeCmd inspectVolumeCmd(String name);
+
+    public RemoveVolumeCmd removeVolumeCmd(String name);
+
+    public ListVolumesCmd listVolumesCmd();
+
     @Override
     public void close() throws IOException;
 
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java
new file mode 100644
index 000000000..0642cf902
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java
@@ -0,0 +1,40 @@
+package com.github.dockerjava.api.command;
+
+import java.util.Map;
+
+import javax.annotation.CheckForNull;
+
+public interface CreateVolumeCmd extends SyncDockerCmd<CreateVolumeResponse> {
+
+    @CheckForNull
+    public String getName();
+
+    @CheckForNull
+    public String getDriver();
+
+    @CheckForNull
+    public Map<String, String> getDriverOpts();
+
+    /**
+     * @param name
+     *            - The new volume’s name. If not specified, Docker generates a name.
+     */
+    public CreateVolumeCmd withName(String name);
+
+    /**
+     * @param driver
+     *            - Name of the volume driver to use. Defaults to local for the name.
+     */
+    public CreateVolumeCmd withDriver(String driver);
+
+    /**
+     * @param driverOpts
+     *            - A mapping of driver options and values. These options are passed directly to the driver and are
+     *            driver specific.
+     */
+    public CreateVolumeCmd withDriverOpts(Map<String, String> driverOpts);
+
+    public static interface Exec extends DockerCmdSyncExec<CreateVolumeCmd, CreateVolumeResponse> {
+    }
+}
+
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java b/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
new file mode 100644
index 000000000..3a541a0cd
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
@@ -0,0 +1,40 @@
+package com.github.dockerjava.api.command;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ *
+ * @author Marcus Linke
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CreateVolumeResponse {
+
+    @JsonProperty("Name")
+    private String name;
+
+    @JsonProperty("Driver")
+    private String driver;
+
+    @JsonProperty("Mountpoint")
+    private String mountpoint;
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDriver() {
+        return driver;
+    }
+
+    public String getMountpoint() {
+        return mountpoint;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index c3c753e9c..98de728e8 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -85,6 +85,15 @@ public interface DockerCmdExecFactory extends Closeable {
 
     public StatsCmd.Exec createStatsCmdExec();
 
+    public CreateVolumeCmd.Exec createCreateVolumeCmdExec();
+
+    public InspectVolumeCmd.Exec createInspectVolumeCmdExec();
+
+    public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec();
+
+    public ListVolumesCmd.Exec createListVolumesCmdExec();
+
     @Override
     public void close() throws IOException;
+
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java
new file mode 100644
index 000000000..bf08e18b4
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java
@@ -0,0 +1,23 @@
+package com.github.dockerjava.api.command;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Inspect the details of a volume.
+ *
+ * @author Marcus Linke
+ *
+ */
+public interface InspectVolumeCmd extends SyncDockerCmd<InspectVolumeResponse> {
+
+    public String getName();
+
+    /**
+     * @param name
+     *            - The volume’s name.
+     */
+    public InspectVolumeCmd withName(@Nonnull String name);
+
+    public static interface Exec extends DockerCmdSyncExec<InspectVolumeCmd, InspectVolumeResponse> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
new file mode 100644
index 000000000..b5b35c563
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
@@ -0,0 +1,40 @@
+package com.github.dockerjava.api.command;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ *
+ * @author Marcus Linke
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class InspectVolumeResponse {
+
+    @JsonProperty("Name")
+    private String name;
+
+    @JsonProperty("Driver")
+    private String driver;
+
+    @JsonProperty("Mountpoint")
+    private String mountpoint;
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDriver() {
+        return driver;
+    }
+
+    public String getMountpoint() {
+        return mountpoint;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java b/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java
new file mode 100644
index 000000000..f900f1967
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java
@@ -0,0 +1,25 @@
+package com.github.dockerjava.api.command;
+
+import javax.annotation.CheckForNull;
+
+/**
+ * List volumes.
+ *
+ *
+ * @author Marcus Linke
+ */
+public interface ListVolumesCmd extends SyncDockerCmd<ListVolumesResponse> {
+
+    @CheckForNull
+    public String getFilters();
+
+    /**
+     * @param filters
+     *            - JSON encoded value of the filters (a map[string][]string) to process on the volumes list. There is
+     *            one available filter: dangling=true
+     */
+    public ListVolumesCmd withFilters(String filters);
+
+    public static interface Exec extends DockerCmdSyncExec<ListVolumesCmd, ListVolumesResponse> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java b/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
new file mode 100644
index 000000000..c45712d09
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
@@ -0,0 +1,28 @@
+package com.github.dockerjava.api.command;
+
+import java.util.List;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ *
+ * @author Marcus Linke
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ListVolumesResponse {
+
+    @JsonProperty("Volumes")
+    private List<InspectVolumeResponse> volumes;
+
+    public List<InspectVolumeResponse> getVolumes() {
+        return volumes;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java
new file mode 100644
index 000000000..ba136af25
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.api.command;
+
+import javax.annotation.Nonnull;
+
+import com.github.dockerjava.api.exception.ConflictException;
+import com.github.dockerjava.api.exception.NotFoundException;
+
+/**
+ * Remove a volume.
+ *
+ * @author Marcus Linke
+ */
+public interface RemoveVolumeCmd extends SyncDockerCmd<Void> {
+
+    public String getName();
+
+    public RemoveVolumeCmd withName(@Nonnull String name);
+
+    /**
+     * @throws NotFoundException
+     *             No such volume
+     * @throws ConflictException
+     *             Volume is in use and cannot be removed
+     */
+    @Override
+    public Void exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdSyncExec<RemoveVolumeCmd, Void> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 62df4aacb..05726f735 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -18,6 +18,7 @@
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.CreateVolumeCmd;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.command.ExecCreateCmd;
@@ -26,9 +27,11 @@
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.InspectVolumeCmd;
 import com.github.dockerjava.api.command.KillContainerCmd;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.command.PingCmd;
@@ -36,6 +39,7 @@
 import com.github.dockerjava.api.command.PushImageCmd;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.api.command.SearchImagesCmd;
@@ -59,6 +63,7 @@
 import com.github.dockerjava.core.command.CopyFileFromContainerCmdImpl;
 import com.github.dockerjava.core.command.CreateContainerCmdImpl;
 import com.github.dockerjava.core.command.CreateImageCmdImpl;
+import com.github.dockerjava.core.command.CreateVolumeCmdImpl;
 import com.github.dockerjava.core.command.EventsCmdImpl;
 import com.github.dockerjava.core.command.ExecCreateCmdImpl;
 import com.github.dockerjava.core.command.ExecStartCmdImpl;
@@ -66,9 +71,11 @@
 import com.github.dockerjava.core.command.InspectContainerCmdImpl;
 import com.github.dockerjava.core.command.InspectExecCmdImpl;
 import com.github.dockerjava.core.command.InspectImageCmdImpl;
+import com.github.dockerjava.core.command.InspectVolumeCmdImpl;
 import com.github.dockerjava.core.command.KillContainerCmdImpl;
 import com.github.dockerjava.core.command.ListContainersCmdImpl;
 import com.github.dockerjava.core.command.ListImagesCmdImpl;
+import com.github.dockerjava.core.command.ListVolumesCmdImpl;
 import com.github.dockerjava.core.command.LogContainerCmdImpl;
 import com.github.dockerjava.core.command.PauseContainerCmdImpl;
 import com.github.dockerjava.core.command.PingCmdImpl;
@@ -76,6 +83,7 @@
 import com.github.dockerjava.core.command.PushImageCmdImpl;
 import com.github.dockerjava.core.command.RemoveContainerCmdImpl;
 import com.github.dockerjava.core.command.RemoveImageCmdImpl;
+import com.github.dockerjava.core.command.RemoveVolumeCmdImpl;
 import com.github.dockerjava.core.command.RestartContainerCmdImpl;
 import com.github.dockerjava.core.command.SaveImageCmdImpl;
 import com.github.dockerjava.core.command.SearchImagesCmdImpl;
@@ -389,6 +397,26 @@ public StatsCmd statsCmd(String containerId) {
         return new StatsCmdImpl(getDockerCmdExecFactory().createStatsCmdExec(), containerId);
     }
 
+    @Override
+    public CreateVolumeCmd createVolumeCmd() {
+        return new CreateVolumeCmdImpl(getDockerCmdExecFactory().createCreateVolumeCmdExec());
+    }
+
+    @Override
+    public InspectVolumeCmd inspectVolumeCmd(String name) {
+        return new InspectVolumeCmdImpl(getDockerCmdExecFactory().createInspectVolumeCmdExec(), name);
+    }
+
+    @Override
+    public RemoveVolumeCmd removeVolumeCmd(String name) {
+        return new RemoveVolumeCmdImpl(getDockerCmdExecFactory().createRemoveVolumeCmdExec(), name);
+    }
+
+    @Override
+    public ListVolumesCmd listVolumesCmd() {
+        return new ListVolumesCmdImpl(getDockerCmdExecFactory().createListVolumesCmdExec());
+    }
+
     @Override
     public void close() throws IOException {
         getDockerCmdExecFactory().close();
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java
new file mode 100644
index 000000000..13cb0ac83
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java
@@ -0,0 +1,66 @@
+package com.github.dockerjava.core.command;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.command.CreateVolumeCmd;
+import com.github.dockerjava.api.command.CreateVolumeResponse;
+
+/**
+ * Create a volume.
+ *
+ * @author Marcus Linke
+ */
+public class CreateVolumeCmdImpl extends AbstrDockerCmd<CreateVolumeCmd, CreateVolumeResponse> implements
+        CreateVolumeCmd {
+
+    @JsonProperty("Name")
+    private String name;
+
+    @JsonProperty("Driver")
+    private String driver;
+
+    @JsonProperty("DriverOpts")
+    private Map<String, String> driverOpts;
+
+    public CreateVolumeCmdImpl(CreateVolumeCmd.Exec exec) {
+        super(exec);
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getDriver() {
+        return driver;
+    }
+
+    @Override
+    public Map<String, String> getDriverOpts() {
+        return driverOpts;
+    }
+
+    @Override
+    public CreateVolumeCmdImpl withName(String name) {
+        checkNotNull(name, "name was not specified");
+        this.name = name;
+        return this;
+    }
+
+    @Override
+    public CreateVolumeCmdImpl withDriver(String driver) {
+        checkNotNull(driver, "driver was not specified");
+        this.driver = driver;
+        return this;
+    }
+
+    @Override
+    public CreateVolumeCmd withDriverOpts(Map<String, String> driverOpts) {
+        checkNotNull(driverOpts, "driverOpts was not specified");
+        return this;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java
new file mode 100644
index 000000000..c789d91c9
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java
@@ -0,0 +1,42 @@
+package com.github.dockerjava.core.command;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.github.dockerjava.api.command.InspectVolumeCmd;
+import com.github.dockerjava.api.command.InspectVolumeResponse;
+import com.github.dockerjava.api.exception.NotFoundException;
+
+/**
+ * Inspect the details of a volume.
+ */
+public class InspectVolumeCmdImpl extends AbstrDockerCmd<InspectVolumeCmd, InspectVolumeResponse> implements
+        InspectVolumeCmd {
+
+    private String name;
+
+    public InspectVolumeCmdImpl(InspectVolumeCmd.Exec exec, String name) {
+        super(exec);
+        withName(name);
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public InspectVolumeCmd withName(String name) {
+        checkNotNull(name, "name was not specified");
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * @throws NotFoundException
+     *             No such volume
+     */
+    @Override
+    public InspectVolumeResponse exec() throws NotFoundException {
+        return super.exec();
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java
new file mode 100644
index 000000000..af1ca3fae
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java
@@ -0,0 +1,32 @@
+package com.github.dockerjava.core.command;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.github.dockerjava.api.command.ListVolumesCmd;
+import com.github.dockerjava.api.command.ListVolumesResponse;
+
+/**
+ *
+ * @author Marcus Linke
+ *
+ */
+public class ListVolumesCmdImpl extends AbstrDockerCmd<ListVolumesCmd, ListVolumesResponse> implements ListVolumesCmd {
+
+    private String filters;
+
+    public ListVolumesCmdImpl(ListVolumesCmd.Exec exec) {
+        super(exec);
+    }
+
+    @Override
+    public String getFilters() {
+        return filters;
+    }
+
+    @Override
+    public ListVolumesCmd withFilters(String filter) {
+        checkNotNull(filter, "filters have not been specified");
+        this.filters = filter;
+        return this;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java
new file mode 100644
index 000000000..ee294a130
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java
@@ -0,0 +1,38 @@
+package com.github.dockerjava.core.command;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.github.dockerjava.api.command.RemoveVolumeCmd;
+import com.github.dockerjava.api.exception.NotFoundException;
+
+/**
+ * Remove a volume.
+ *
+ * @author Marcus Linke
+ */
+public class RemoveVolumeCmdImpl extends AbstrDockerCmd<RemoveVolumeCmd, Void> implements RemoveVolumeCmd {
+
+    private String name;
+
+    public RemoveVolumeCmdImpl(RemoveVolumeCmd.Exec exec, String name) {
+        super(exec);
+        withName(name);
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public RemoveVolumeCmd withName(String name) {
+        checkNotNull(name, "name was not specified");
+        this.name = name;
+        return this;
+    }
+
+    @Override
+    public Void exec() throws NotFoundException {
+        return super.exec();
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java
new file mode 100644
index 000000000..c71d2297e
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java
@@ -0,0 +1,32 @@
+package com.github.dockerjava.jaxrs;
+
+import static javax.ws.rs.client.Entity.entity;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.command.CreateVolumeCmd;
+import com.github.dockerjava.api.command.CreateVolumeResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+
+public class CreateVolumeCmdExec extends AbstrSyncDockerCmdExec<CreateVolumeCmd, CreateVolumeResponse> implements
+        CreateVolumeCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateVolumeCmdExec.class);
+
+    public CreateVolumeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected CreateVolumeResponse execute(CreateVolumeCmd command) {
+        WebTarget webResource = getBaseResource().path("/volumes/create");
+
+        LOGGER.trace("POST: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(entity(command, MediaType.APPLICATION_JSON), CreateVolumeResponse.class);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index 62b49d7d7..30bc5e34f 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -39,6 +39,7 @@
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.CreateVolumeCmd;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.command.ExecCreateCmd;
@@ -47,9 +48,11 @@
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.InspectVolumeCmd;
 import com.github.dockerjava.api.command.KillContainerCmd;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.command.PingCmd;
@@ -57,6 +60,7 @@
 import com.github.dockerjava.api.command.PushImageCmd;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.api.command.SearchImagesCmd;
@@ -154,7 +158,7 @@ public void init(DockerClientConfig dockerClientConfig) {
             protocol = "http";
         }
 
-        if(originalUri.getScheme().equals("unix")) {
+        if (originalUri.getScheme().equals("unix")) {
             dockerClientConfig.setUri(UnixConnectionSocketFactory.sanitizeUri(originalUri));
         } else {
             configureProxy(clientConfig, protocol);
@@ -421,6 +425,26 @@ public StatsCmd.Exec createStatsCmdExec() {
         return new StatsCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
+        return new CreateVolumeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectVolumeCmd.Exec createInspectVolumeCmdExec() {
+        return new InspectVolumeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() {
+        return new RemoveVolumeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ListVolumesCmd.Exec createListVolumesCmdExec() {
+        return new ListVolumesCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public void close() throws IOException {
         checkNotNull(client, "Factory not initialized. You probably forgot to call init()!");
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java
new file mode 100644
index 000000000..9ca2ac02a
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java
@@ -0,0 +1,29 @@
+package com.github.dockerjava.jaxrs;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.command.InspectVolumeCmd;
+import com.github.dockerjava.api.command.InspectVolumeResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+
+public class InspectVolumeCmdExec extends AbstrSyncDockerCmdExec<InspectVolumeCmd, InspectVolumeResponse> implements
+        InspectVolumeCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InspectVolumeCmdExec.class);
+
+    public InspectVolumeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected InspectVolumeResponse execute(InspectVolumeCmd command) {
+        WebTarget webResource = getBaseResource().path("/volumes/{name}").resolveTemplate("name", command.getName());
+
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectVolumeResponse.class);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
new file mode 100644
index 000000000..2550db31b
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
@@ -0,0 +1,34 @@
+package com.github.dockerjava.jaxrs;
+
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.command.ListVolumesCmd;
+import com.github.dockerjava.api.command.ListVolumesResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+
+public class ListVolumesCmdExec extends AbstrSyncDockerCmdExec<ListVolumesCmd, ListVolumesResponse> implements ListVolumesCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ListVolumesCmdExec.class);
+
+    public ListVolumesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected ListVolumesResponse execute(ListVolumesCmd command) {
+        WebTarget webTarget = getBaseResource().path("/volumes");
+
+        if (command.getFilters() != null)
+            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters()));
+
+        LOGGER.trace("GET: {}", webTarget);
+
+        return webTarget.request().accept(MediaType.APPLICATION_JSON).get(ListVolumesResponse.class);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java
new file mode 100644
index 000000000..618a85ed8
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.jaxrs;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.command.RemoveVolumeCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+
+public class RemoveVolumeCmdExec extends AbstrSyncDockerCmdExec<RemoveVolumeCmd, Void> implements
+        RemoveVolumeCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveVolumeCmdExec.class);
+
+    public RemoveVolumeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(RemoveVolumeCmd command) {
+        WebTarget webTarget = getBaseResource().path("/volumes/" + command.getName());
+
+        LOGGER.trace("DELETE: {}", webTarget);
+        webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close();
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
index 865389fef..9ddd51288 100644
--- a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
@@ -38,6 +38,7 @@
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.CreateVolumeCmd;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.command.ExecCreateCmd;
@@ -46,9 +47,11 @@
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.InspectVolumeCmd;
 import com.github.dockerjava.api.command.KillContainerCmd;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.command.PingCmd;
@@ -56,6 +59,7 @@
 import com.github.dockerjava.api.command.PushImageCmd;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.api.command.SearchImagesCmd;
@@ -79,6 +83,7 @@
 import com.github.dockerjava.netty.exec.CopyFileFromContainerCmdExec;
 import com.github.dockerjava.netty.exec.CreateContainerCmdExec;
 import com.github.dockerjava.netty.exec.CreateImageCmdExec;
+import com.github.dockerjava.netty.exec.CreateVolumeCmdExec;
 import com.github.dockerjava.netty.exec.EventsCmdExec;
 import com.github.dockerjava.netty.exec.ExecCreateCmdExec;
 import com.github.dockerjava.netty.exec.ExecStartCmdExec;
@@ -86,9 +91,11 @@
 import com.github.dockerjava.netty.exec.InspectContainerCmdExec;
 import com.github.dockerjava.netty.exec.InspectExecCmdExec;
 import com.github.dockerjava.netty.exec.InspectImageCmdExec;
+import com.github.dockerjava.netty.exec.InspectVolumeCmdExec;
 import com.github.dockerjava.netty.exec.KillContainerCmdExec;
 import com.github.dockerjava.netty.exec.ListContainersCmdExec;
 import com.github.dockerjava.netty.exec.ListImagesCmdExec;
+import com.github.dockerjava.netty.exec.ListVolumesCmdExec;
 import com.github.dockerjava.netty.exec.LogContainerCmdExec;
 import com.github.dockerjava.netty.exec.PauseContainerCmdExec;
 import com.github.dockerjava.netty.exec.PingCmdExec;
@@ -96,6 +103,7 @@
 import com.github.dockerjava.netty.exec.PushImageCmdExec;
 import com.github.dockerjava.netty.exec.RemoveContainerCmdExec;
 import com.github.dockerjava.netty.exec.RemoveImageCmdExec;
+import com.github.dockerjava.netty.exec.RemoveVolumeCmdExec;
 import com.github.dockerjava.netty.exec.RestartContainerCmdExec;
 import com.github.dockerjava.netty.exec.SaveImageCmdExec;
 import com.github.dockerjava.netty.exec.SearchImagesCmdExec;
@@ -477,6 +485,26 @@ public StatsCmd.Exec createStatsCmdExec() {
         return new StatsCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
+        return new CreateVolumeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectVolumeCmd.Exec createInspectVolumeCmdExec() {
+        return new InspectVolumeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() {
+        return new RemoveVolumeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ListVolumesCmd.Exec createListVolumesCmdExec() {
+        return new ListVolumesCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public void close() throws IOException {
         checkNotNull(eventLoopGroup, "Factory not initialized. You probably forgot to call init()!");
diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
index a478cf6c1..36fea48eb 100644
--- a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
+++ b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
@@ -46,8 +46,8 @@
 import com.github.dockerjava.netty.handler.JsonResponseCallbackHandler;
 
 /**
- * This class is basically a replacement of javax.ws.rs.client.Invocation.Builder to allow simpler
- * migration of JAX-RS code to a netty based implementation.
+ * This class is basically a replacement of javax.ws.rs.client.Invocation.Builder to allow simpler migration of JAX-RS
+ * code to a netty based implementation.
  *
  * @author Marcus Linke
  */
@@ -236,35 +236,37 @@ public void post(final Object entity, final InputStream stdin, ResultCallback<Fr
         // wait for successful http upgrade procedure
         hijackHandler.awaitUpgrade();
 
-        // now we can start a new thread that reads from stdin and writes to the channel
-        new Thread(new Runnable() {
+        if (stdin != null) {
+            // now we can start a new thread that reads from stdin and writes to the channel
+            new Thread(new Runnable() {
 
-            private int read(BufferedReader reader) {
-                try {
-                    return reader.read();
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
+                private int read(BufferedReader reader) {
+                    try {
+                        return reader.read();
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
                 }
-            }
 
-            @Override
-            public void run() {
+                @Override
+                public void run() {
 
-                BufferedReader reader = new BufferedReader(new InputStreamReader(stdin, Charset.forName("UTF-8")));
+                    BufferedReader reader = new BufferedReader(new InputStreamReader(stdin, Charset.forName("UTF-8")));
 
-                int read = -1;
-                while ((read = read(reader)) != -1) {
-                    byte[] bytes = ByteBuffer.allocate(4).putInt(read).array();
-                    try {
-                        bytes = new String(bytes).getBytes("US-ASCII");
-                    } catch (UnsupportedEncodingException e) {
-                        throw new RuntimeException(e);
-                    }
+                    int read = -1;
+                    while ((read = read(reader)) != -1) {
+                        byte[] bytes = ByteBuffer.allocate(4).putInt(read).array();
+                        try {
+                            bytes = new String(bytes).getBytes("US-ASCII");
+                        } catch (UnsupportedEncodingException e) {
+                            throw new RuntimeException(e);
+                        }
 
-                    channel.writeAndFlush(Unpooled.copiedBuffer(bytes));
+                        channel.writeAndFlush(Unpooled.copiedBuffer(bytes));
+                    }
                 }
-            }
-        }).start();
+            }).start();
+        }
     }
 
     public <T> T post(final Object entity, TypeReference<T> typeReference) {
@@ -403,7 +405,6 @@ public <T> T post(TypeReference<T> typeReference, InputStream body) {
         return callback.awaitResult();
     }
 
-
     public <T> void post(TypeReference<T> typeReference, ResultCallback<T> resultCallback, InputStream body) {
         HttpRequestProvider requestProvider = httpPostRequestProvider(null);
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CreateVolumeCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/CreateVolumeCmdExec.java
new file mode 100644
index 000000000..746e46067
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/CreateVolumeCmdExec.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.netty.exec;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.CreateVolumeCmd;
+import com.github.dockerjava.api.command.CreateVolumeResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+public class CreateVolumeCmdExec extends AbstrSyncDockerCmdExec<CreateVolumeCmd, CreateVolumeResponse> implements
+        CreateVolumeCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateVolumeCmdExec.class);
+
+    public CreateVolumeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected CreateVolumeResponse execute(CreateVolumeCmd command) {
+        WebTarget webResource = getBaseResource().path("/volumes/create");
+
+        LOGGER.trace("POST: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(command, new TypeReference<CreateVolumeResponse>() {
+                });
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectVolumeCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/InspectVolumeCmdExec.java
new file mode 100644
index 000000000..1c3adf47e
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/InspectVolumeCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.netty.exec;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.InspectVolumeCmd;
+import com.github.dockerjava.api.command.InspectVolumeResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+public class InspectVolumeCmdExec extends AbstrSyncDockerCmdExec<InspectVolumeCmd, InspectVolumeResponse> implements
+        InspectVolumeCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InspectVolumeCmdExec.class);
+
+    public InspectVolumeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected InspectVolumeResponse execute(InspectVolumeCmd command) {
+        WebTarget webResource = getBaseResource().path("/volumes/{name}").resolveTemplate("name", command.getName());
+
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<InspectVolumeResponse>() {
+        });
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java
new file mode 100644
index 000000000..2086e4d2d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java
@@ -0,0 +1,36 @@
+package com.github.dockerjava.netty.exec;
+
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.ListVolumesCmd;
+import com.github.dockerjava.api.command.ListVolumesResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+public class ListVolumesCmdExec extends AbstrSyncDockerCmdExec<ListVolumesCmd, ListVolumesResponse> implements
+        ListVolumesCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ListVolumesCmdExec.class);
+
+    public ListVolumesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected ListVolumesResponse execute(ListVolumesCmd command) {
+        WebTarget webTarget = getBaseResource().path("/volumes");
+
+        if (command.getFilters() != null)
+            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters()));
+
+        LOGGER.trace("GET: {}", webTarget);
+
+        return webTarget.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<ListVolumesResponse>() {
+        });
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/RemoveVolumeCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/RemoveVolumeCmdExec.java
new file mode 100644
index 000000000..baf6eabe1
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/RemoveVolumeCmdExec.java
@@ -0,0 +1,29 @@
+package com.github.dockerjava.netty.exec;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.command.RemoveVolumeCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+
+public class RemoveVolumeCmdExec extends AbstrSyncDockerCmdExec<RemoveVolumeCmd, Void> implements
+        RemoveVolumeCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveVolumeCmdExec.class);
+
+    public RemoveVolumeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(RemoveVolumeCmd command) {
+        WebTarget webTarget = getBaseResource().path("/volumes/" + command.getName());
+
+        LOGGER.trace("DELETE: {}", webTarget);
+        webTarget.request().accept(MediaType.APPLICATION_JSON).delete();
+
+        return null;
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index 4a96e664f..6045ce56b 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -18,6 +18,7 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.CreateImageResponse;
+import com.github.dockerjava.api.command.CreateVolumeCmd;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.command.ExecCreateCmd;
@@ -26,9 +27,11 @@
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.InspectVolumeCmd;
 import com.github.dockerjava.api.command.KillContainerCmd;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.command.PingCmd;
@@ -36,6 +39,7 @@
 import com.github.dockerjava.api.command.PushImageCmd;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.api.command.SearchImagesCmd;
@@ -308,6 +312,26 @@ public StatsCmd.Exec createStatsCmdExec() {
         return delegate.createStatsCmdExec();
     }
 
+    @Override
+    public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
+        return delegate.createCreateVolumeCmdExec();
+    }
+
+    @Override
+    public InspectVolumeCmd.Exec createInspectVolumeCmdExec() {
+        return delegate.createInspectVolumeCmdExec();
+    }
+
+    @Override
+    public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() {
+        return delegate.createRemoveVolumeCmdExec();
+    }
+
+    @Override
+    public ListVolumesCmd.Exec createListVolumesCmdExec() {
+        return delegate.createListVolumesCmdExec();
+    }
+
     public List<String> getContainerNames() {
         return new ArrayList<String>(containerNames);
     }
@@ -315,5 +339,4 @@ public List<String> getContainerNames() {
     public List<String> getImageNames() {
         return new ArrayList<String>(imageNames);
     }
-
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 017186ccd..9623e077f 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -271,6 +271,9 @@ public void testBuildFromPrivateRegistry() throws Exception {
 
         dockerClient.startContainerCmd(testregistry.getId()).exec();
 
+        // wait for registry to boot
+        Thread.sleep(3000);
+
         AuthConfig authConfig = new AuthConfig();
 
         // credentials as configured in /auth/htpasswd
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateVolumeCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateVolumeCmdImplTest.java
new file mode 100644
index 000000000..c08c55c2c
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/CreateVolumeCmdImplTest.java
@@ -0,0 +1,53 @@
+package com.github.dockerjava.core.command;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.CreateVolumeResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class CreateVolumeCmdImplTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void createVolume() throws DockerException {
+
+        CreateVolumeResponse createVolumeResponse = dockerClient.createVolumeCmd().withName("volume1")
+                .withDriver("local").exec();
+
+        assertThat(createVolumeResponse.getName(), equalTo("volume1"));
+        assertThat(createVolumeResponse.getDriver(), equalTo("local"));
+        assertThat(createVolumeResponse.getMountpoint(), containsString("/volume1/"));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectVolumeCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectVolumeCmdImplTest.java
new file mode 100644
index 000000000..730246d3d
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/InspectVolumeCmdImplTest.java
@@ -0,0 +1,56 @@
+package com.github.dockerjava.core.command;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.InspectVolumeResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class InspectVolumeCmdImplTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void inspectVolume() throws DockerException {
+
+        String volumeName = "volume1";
+
+        dockerClient.createVolumeCmd().withName(volumeName).withDriver("local").exec();
+
+        InspectVolumeResponse inspectVolumeResponse = dockerClient.inspectVolumeCmd(volumeName).exec();
+
+        assertThat(inspectVolumeResponse.getName(), equalTo("volume1"));
+        assertThat(inspectVolumeResponse.getDriver(), equalTo("local"));
+        assertThat(inspectVolumeResponse.getMountpoint(), containsString("/volume1/"));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/ListVolumesCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListVolumesCmdImplTest.java
new file mode 100644
index 000000000..646f502c8
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/ListVolumesCmdImplTest.java
@@ -0,0 +1,59 @@
+package com.github.dockerjava.core.command;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.CreateVolumeResponse;
+import com.github.dockerjava.api.command.ListVolumesResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class ListVolumesCmdImplTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void listVolumes() throws DockerException {
+
+        CreateVolumeResponse createVolumeResponse = dockerClient.createVolumeCmd().withName("volume1")
+                .withDriver("local").exec();
+
+        assertThat(createVolumeResponse.getName(), equalTo("volume1"));
+        assertThat(createVolumeResponse.getDriver(), equalTo("local"));
+        assertThat(createVolumeResponse.getMountpoint(), containsString("/volume1/"));
+
+        ListVolumesResponse listVolumesResponse = dockerClient.listVolumesCmd().exec();
+
+        assertThat(listVolumesResponse.getVolumes().size(), greaterThanOrEqualTo(1));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveVolumeCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveVolumeCmdImplTest.java
new file mode 100644
index 000000000..249bf8493
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/RemoveVolumeCmdImplTest.java
@@ -0,0 +1,65 @@
+package com.github.dockerjava.core.command;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.CreateVolumeResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class RemoveVolumeCmdImplTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void removeVolume() throws DockerException {
+
+        String volumeName = "volume1";
+
+        CreateVolumeResponse createVolumeResponse = dockerClient.createVolumeCmd().withName(volumeName)
+                .withDriver("local").exec();
+
+        assertThat(createVolumeResponse.getName(), equalTo(volumeName));
+        assertThat(createVolumeResponse.getDriver(), equalTo("local"));
+        assertThat(createVolumeResponse.getMountpoint(), containsString("/volume1/"));
+
+        dockerClient.removeVolumeCmd(volumeName).exec();
+
+        try {
+            dockerClient.inspectVolumeCmd(volumeName).exec();
+            fail("Expected NotFoundException");
+        } catch (NotFoundException e) {
+            // just ignore
+        }
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/AbstractNettyDockerClientTest.java b/src/test/java/com/github/dockerjava/netty/AbstractNettyDockerClientTest.java
index 6dcb435f1..44a541808 100644
--- a/src/test/java/com/github/dockerjava/netty/AbstractNettyDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/netty/AbstractNettyDockerClientTest.java
@@ -12,7 +12,6 @@ public abstract class AbstractNettyDockerClientTest extends AbstractDockerClient
 
     @Override
     protected TestDockerCmdExecFactory initTestDockerCmdExecFactory() {
-        return new TestDockerCmdExecFactory(
-                new DockerCmdExecFactoryImpl());
+        return new TestDockerCmdExecFactory(new DockerCmdExecFactoryImpl());
     }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
index 19b42420e..7fb94fcd4 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
@@ -263,6 +263,9 @@ public void testBuildFromPrivateRegistry() throws Exception {
 
         dockerClient.startContainerCmd(testregistry.getId()).exec();
 
+        // wait for registry to boot
+        Thread.sleep(3000);
+
         AuthConfig authConfig = new AuthConfig();
 
         // credentials as configured in /auth/htpasswd
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateVolumeCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateVolumeCmdExecTest.java
new file mode 100644
index 000000000..3e971dc3b
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateVolumeCmdExecTest.java
@@ -0,0 +1,53 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.CreateVolumeResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+
+@Test(groups = "integration")
+public class CreateVolumeCmdExecTest extends AbstractNettyDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void createVolume() throws DockerException {
+
+        CreateVolumeResponse createVolumeResponse = dockerClient.createVolumeCmd().withName("volume1")
+                .withDriver("local").exec();
+
+        assertThat(createVolumeResponse.getName(), equalTo("volume1"));
+        assertThat(createVolumeResponse.getDriver(), equalTo("local"));
+        assertThat(createVolumeResponse.getMountpoint(), containsString("/volume1/"));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectVolumeCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectVolumeCmdExecTest.java
new file mode 100644
index 000000000..65f7ff983
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectVolumeCmdExecTest.java
@@ -0,0 +1,56 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.InspectVolumeResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+
+@Test(groups = "integration")
+public class InspectVolumeCmdExecTest extends AbstractNettyDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void inspectVolume() throws DockerException {
+
+        String volumeName = "volume1";
+
+        dockerClient.createVolumeCmd().withName(volumeName).withDriver("local").exec();
+
+        InspectVolumeResponse inspectVolumeResponse = dockerClient.inspectVolumeCmd(volumeName).exec();
+
+        assertThat(inspectVolumeResponse.getName(), equalTo("volume1"));
+        assertThat(inspectVolumeResponse.getDriver(), equalTo("local"));
+        assertThat(inspectVolumeResponse.getMountpoint(), containsString("/volume1/"));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ListVolumesCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ListVolumesCmdExecTest.java
new file mode 100644
index 000000000..bca5ebece
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/ListVolumesCmdExecTest.java
@@ -0,0 +1,59 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.CreateVolumeResponse;
+import com.github.dockerjava.api.command.ListVolumesResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+
+@Test(groups = "integration")
+public class ListVolumesCmdExecTest extends AbstractNettyDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void listVolumes() throws DockerException {
+
+        CreateVolumeResponse createVolumeResponse = dockerClient.createVolumeCmd().withName("volume1")
+                .withDriver("local").exec();
+
+        assertThat(createVolumeResponse.getName(), equalTo("volume1"));
+        assertThat(createVolumeResponse.getDriver(), equalTo("local"));
+        assertThat(createVolumeResponse.getMountpoint(), containsString("/volume1/"));
+
+        ListVolumesResponse listVolumesResponse = dockerClient.listVolumesCmd().exec();
+
+        assertThat(listVolumesResponse.getVolumes().size(), greaterThanOrEqualTo(1));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RemoveVolumeCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RemoveVolumeCmdExecTest.java
new file mode 100644
index 000000000..59aafde67
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/RemoveVolumeCmdExecTest.java
@@ -0,0 +1,65 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.CreateVolumeResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+
+@Test(groups = "integration")
+public class RemoveVolumeCmdExecTest extends AbstractNettyDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void removeVolume() throws DockerException {
+
+        String volumeName = "volume1";
+
+        CreateVolumeResponse createVolumeResponse = dockerClient.createVolumeCmd().withName(volumeName)
+                .withDriver("local").exec();
+
+        assertThat(createVolumeResponse.getName(), equalTo(volumeName));
+        assertThat(createVolumeResponse.getDriver(), equalTo("local"));
+        assertThat(createVolumeResponse.getMountpoint(), containsString("/volume1/"));
+
+        dockerClient.removeVolumeCmd(volumeName).exec();
+
+        try {
+            dockerClient.inspectVolumeCmd(volumeName).exec();
+            fail("Expected NotFoundException");
+        } catch (NotFoundException e) {
+            // just ignore
+        }
+    }
+}

From 96d01bf3a961c42ccbb11a9920bd670eaf957763 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 18 Dec 2015 23:13:41 +0100
Subject: [PATCH 0352/1272] Improved volume API tests

---
 .../dockerjava/netty/InvocationBuilder.java   |  4 ---
 .../client/AbstractDockerClientTest.java      |  9 +++++++
 .../core/TestDockerCmdExecFactory.java        | 25 ++++++++++++++++--
 .../core/command/CreateVolumeCmdImplTest.java | 26 +++++++++++++++++--
 .../command/InspectVolumeCmdImplTest.java     |  9 +++++++
 .../netty/exec/CreateVolumeCmdExecTest.java   | 20 ++++++++++++++
 .../netty/exec/InspectVolumeCmdExecTest.java  |  9 +++++++
 7 files changed, 94 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
index 36fea48eb..8f1641279 100644
--- a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
+++ b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
@@ -378,10 +378,6 @@ private void sendRequest(HttpRequestProvider requestProvider, Channel channel) {
         channelFuture.addListener(new ChannelFutureListener() {
             @Override
             public void operationComplete(ChannelFuture future) throws Exception {
-                if (future.isSuccess()) {
-                    System.err.println("Request success");
-                }
-
             }
         });
     }
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index cdf7f457e..8751e07e5 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -109,6 +109,15 @@ public void afterMethod(ITestResult result) {
             }
         }
 
+        for (String volume : dockerCmdExecFactory.getVolumeNames()) {
+            LOG.info("Cleaning up temporary volume with {}", volume);
+            try {
+                dockerClient.removeVolumeCmd(volume).exec();
+            } catch (DockerException ignore) {
+                // ignore.printStackTrace();
+            }
+        }
+
         LOG.info("################################## END OF {} ##################################\n", result.getName());
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index 6045ce56b..8128bb915 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -19,6 +19,7 @@
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.CreateImageResponse;
 import com.github.dockerjava.api.command.CreateVolumeCmd;
+import com.github.dockerjava.api.command.CreateVolumeResponse;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.command.ExecCreateCmd;
@@ -65,6 +66,8 @@ public class TestDockerCmdExecFactory implements DockerCmdExecFactory {
 
     private List<String> imageNames = new ArrayList<String>();
 
+    private List<String> volumeNames = new ArrayList<String>();
+
     private DockerCmdExecFactory delegate;
 
     public TestDockerCmdExecFactory(DockerCmdExecFactory delegate) {
@@ -314,7 +317,14 @@ public StatsCmd.Exec createStatsCmdExec() {
 
     @Override
     public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
-        return delegate.createCreateVolumeCmdExec();
+        return new CreateVolumeCmd.Exec() {
+            @Override
+            public CreateVolumeResponse exec(CreateVolumeCmd command) {
+                CreateVolumeResponse result = delegate.createCreateVolumeCmdExec().exec(command);
+                volumeNames.add(command.getName());
+                return result;
+            }
+        };
     }
 
     @Override
@@ -324,7 +334,14 @@ public InspectVolumeCmd.Exec createInspectVolumeCmdExec() {
 
     @Override
     public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() {
-        return delegate.createRemoveVolumeCmdExec();
+        return new RemoveVolumeCmd.Exec() {
+            @Override
+            public Void exec(RemoveVolumeCmd command) {
+                delegate.createRemoveVolumeCmdExec().exec(command);
+                volumeNames.remove(command.getName());
+                return null;
+            }
+        };
     }
 
     @Override
@@ -339,4 +356,8 @@ public List<String> getContainerNames() {
     public List<String> getImageNames() {
         return new ArrayList<String>(imageNames);
     }
+
+    public List<String> getVolumeNames() {
+        return new ArrayList<String>(volumeNames);
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateVolumeCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateVolumeCmdImplTest.java
index c08c55c2c..39688b424 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateVolumeCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateVolumeCmdImplTest.java
@@ -43,11 +43,33 @@ public void afterMethod(ITestResult result) {
     @Test
     public void createVolume() throws DockerException {
 
-        CreateVolumeResponse createVolumeResponse = dockerClient.createVolumeCmd().withName("volume1")
+        String volumeName = "volume1";
+
+        CreateVolumeResponse createVolumeResponse = dockerClient.createVolumeCmd().withName(volumeName)
                 .withDriver("local").exec();
 
-        assertThat(createVolumeResponse.getName(), equalTo("volume1"));
+        assertThat(createVolumeResponse.getName(), equalTo(volumeName));
         assertThat(createVolumeResponse.getDriver(), equalTo("local"));
         assertThat(createVolumeResponse.getMountpoint(), containsString("/volume1/"));
     }
+
+    @Test
+    public void createVolumeWithExistingName() throws DockerException {
+
+        String volumeName = "volume1";
+
+        CreateVolumeResponse createVolumeResponse1 = dockerClient.createVolumeCmd().withName(volumeName)
+                .withDriver("local").exec();
+
+        assertThat(createVolumeResponse1.getName(), equalTo(volumeName));
+        assertThat(createVolumeResponse1.getDriver(), equalTo("local"));
+        assertThat(createVolumeResponse1.getMountpoint(), containsString("/volume1/"));
+
+        CreateVolumeResponse createVolumeResponse2 = dockerClient.createVolumeCmd().withName(volumeName)
+                .withDriver("local").exec();
+
+        assertThat(createVolumeResponse2.getName(), equalTo(volumeName));
+        assertThat(createVolumeResponse2.getDriver(), equalTo("local"));
+        assertThat(createVolumeResponse2.getMountpoint(), equalTo(createVolumeResponse1.getMountpoint()));
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectVolumeCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectVolumeCmdImplTest.java
index 730246d3d..c24f173df 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectVolumeCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InspectVolumeCmdImplTest.java
@@ -15,6 +15,7 @@
 
 import com.github.dockerjava.api.command.InspectVolumeResponse;
 import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
 @Test(groups = "integration")
@@ -53,4 +54,12 @@ public void inspectVolume() throws DockerException {
         assertThat(inspectVolumeResponse.getDriver(), equalTo("local"));
         assertThat(inspectVolumeResponse.getMountpoint(), containsString("/volume1/"));
     }
+
+    @Test(expectedExceptions = NotFoundException.class)
+    public void inspectNonExistentVolume() throws DockerException {
+
+        String volumeName = "non-existing";
+
+        dockerClient.inspectVolumeCmd(volumeName).exec();
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateVolumeCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateVolumeCmdExecTest.java
index 3e971dc3b..1e1a30b73 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateVolumeCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateVolumeCmdExecTest.java
@@ -50,4 +50,24 @@ public void createVolume() throws DockerException {
         assertThat(createVolumeResponse.getDriver(), equalTo("local"));
         assertThat(createVolumeResponse.getMountpoint(), containsString("/volume1/"));
     }
+
+    @Test
+    public void createVolumeWithExistingName() throws DockerException {
+
+        String volumeName = "volume1";
+
+        CreateVolumeResponse createVolumeResponse1 = dockerClient.createVolumeCmd().withName(volumeName)
+                .withDriver("local").exec();
+
+        assertThat(createVolumeResponse1.getName(), equalTo(volumeName));
+        assertThat(createVolumeResponse1.getDriver(), equalTo("local"));
+        assertThat(createVolumeResponse1.getMountpoint(), containsString("/volume1/"));
+
+        CreateVolumeResponse createVolumeResponse2 = dockerClient.createVolumeCmd().withName(volumeName)
+                .withDriver("local").exec();
+
+        assertThat(createVolumeResponse2.getName(), equalTo(volumeName));
+        assertThat(createVolumeResponse2.getDriver(), equalTo("local"));
+        assertThat(createVolumeResponse2.getMountpoint(), equalTo(createVolumeResponse1.getMountpoint()));
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectVolumeCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectVolumeCmdExecTest.java
index 65f7ff983..191767f87 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectVolumeCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectVolumeCmdExecTest.java
@@ -15,6 +15,7 @@
 
 import com.github.dockerjava.api.command.InspectVolumeResponse;
 import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 
 @Test(groups = "integration")
@@ -53,4 +54,12 @@ public void inspectVolume() throws DockerException {
         assertThat(inspectVolumeResponse.getDriver(), equalTo("local"));
         assertThat(inspectVolumeResponse.getMountpoint(), containsString("/volume1/"));
     }
+
+    @Test(expectedExceptions = NotFoundException.class)
+    public void inspectNonExistentVolume() throws DockerException {
+
+        String volumeName = "non-existing";
+
+        dockerClient.inspectVolumeCmd(volumeName).exec();
+    }
 }

From ce17ccae43f27d81f9fede3663d6efe9598f684a Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Sat, 19 Dec 2015 08:58:49 +0100
Subject: [PATCH 0353/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e545233bb..dc09dcc4b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ Notes
 
 All changes
 
+* [#408] (https://github.com/docker-java/docker-java/pull/408) Support for volume API 
 * [#396] (https://github.com/docker-java/docker-java/pull/396) Disable evaluation of http.proxy... variables when using unix socket connection 
 * [#393] (https://github.com/docker-java/docker-java/pull/392) Support ONBUILD instruction in Dockerfiles 
 * [#392] (https://github.com/docker-java/docker-java/pull/392) Introduce InspectContainerResponse.Mounts

From ff8c01c3e3f7c53b2998c427278e71150d509669 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Sat, 19 Dec 2015 09:08:55 +0100
Subject: [PATCH 0354/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc09dcc4b..a9c6adde9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ Change Log
 ---
 Notes
 
-* The upcoming release will contain multiple API breaking changes therefore the major version switch. It will supports a subset of v.1.21 of the docker remote API.
+* The upcoming release will contain multiple API breaking changes therefore the major version switch. It will support a subset of v.1.21 of the docker remote API. It also includes an experimental netty based implementation of `DockerCmdExecFactory` that probably will replace the current jersey/httpclient based one in a later release.
 
 All changes
 

From 95caffad742b61470b4a4ce98286b6b2fa5a07fc Mon Sep 17 00:00:00 2001
From: alenkacz <varkockova.a@gmail.com>
Date: Sat, 19 Dec 2015 15:58:36 +0100
Subject: [PATCH 0355/1272] Support for build-args of docker build

In 1.9 there is new property - build-args that can be specified for
docker build command
---
 .../dockerjava/api/command/BuildImageCmd.java    |  6 ++++++
 .../core/command/BuildImageCmdImpl.java          | 15 +++++++++++++++
 .../dockerjava/jaxrs/BuildImageCmdExec.java      | 16 ++++++++++++++++
 .../core/command/BuildImageCmdImplTest.java      | 14 ++++++++++++++
 src/test/resources/testBuildArgs/Dockerfile      |  5 +++++
 5 files changed, 56 insertions(+)
 create mode 100644 src/test/resources/testBuildArgs/Dockerfile

diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 96d94fd06..07d29fb54 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.InputStream;
 import java.net.URI;
+import java.util.Map;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
@@ -87,6 +88,9 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     @CheckForNull
     public String getCpusetcpus();
 
+    @CheckForNull
+    public Map<String, String> getBuildArgs();
+
     // setters
 
     public BuildImageCmd withTag(String tag);
@@ -115,6 +119,8 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     public BuildImageCmd withCpusetcpus(String cpusetcpus);
 
+    public BuildImageCmd withBuildArg(String key, String value);
+
     // setters lib specific
 
     public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfig);
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index 67bcdf45f..6d2fefd92 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -6,6 +6,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
 
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.model.AuthConfigurations;
@@ -50,6 +52,8 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR
 
     private URI remote;
 
+    private Map<String, String> buildArgs = new HashMap<String, String>();
+
     public BuildImageCmdImpl(BuildImageCmd.Exec exec) {
         super(exec);
     }
@@ -138,6 +142,11 @@ public String getCpusetcpus() {
         return cpusetcpus;
     }
 
+    @Override
+    public Map<String, String> getBuildArgs() {
+        return buildArgs;
+    }
+
     // getter lib specific
 
     @Override
@@ -219,6 +228,12 @@ public BuildImageCmd withCpusetcpus(String cpusetcpus) {
         return this;
     }
 
+    @Override
+    public BuildImageCmd withBuildArg(String key, String value) {
+        this.buildArgs.put(key, value);
+        return this;
+    }
+
     // lib specific
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index fd868a7b3..68e56bbec 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -6,6 +6,7 @@
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.RequestEntityProcessing;
 import org.slf4j.Logger;
@@ -20,9 +21,12 @@
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
 
+import java.io.IOException;
+
 public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem> implements
         BuildImageCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageCmdExec.class);
+    private static final ObjectMapper MAPPER = new ObjectMapper();
 
     public BuildImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
         super(baseResource, dockerClientConfig);
@@ -88,6 +92,18 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
             webTarget = webTarget.queryParam("cpusetcpus", command.getCpusetcpus());
         }
 
+        if (command.hasRemoveEnabled() == null || !command.hasRemoveEnabled()) {
+            webTarget = webTarget.queryParam("rm", "false");
+        }
+
+        if (command.getBuildArgs() != null) {
+            try {
+                webTarget = webTarget.queryParam("buildargs", MAPPER.writeValueAsString(command.getBuildArgs()));
+            } catch (IOException e) {
+                // pass
+            }
+        }
+
         webTarget.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED);
         webTarget.property(ClientProperties.CHUNKED_ENCODING_SIZE, 1024 * 1024);
 
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 9623e077f..9266c5ccd 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -304,4 +304,18 @@ public void testBuildFromPrivateRegistry() throws Exception {
         LOG.info("Image Inspect: {}", inspectImageResponse.toString());
 
     }
+
+    @Test
+    public void testBuildArgs() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testBuildArgs").getFile());
+
+        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc").exec(new BuildImageResultCallback())
+                .awaitImageId();
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        assertThat(inspectImageResponse, not(nullValue()));
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+        assertThat(inspectImageResponse.getConfig().getLabels().get("test"), equalTo("abc"));
+    }
 }
diff --git a/src/test/resources/testBuildArgs/Dockerfile b/src/test/resources/testBuildArgs/Dockerfile
new file mode 100644
index 000000000..c8dd0ae36
--- /dev/null
+++ b/src/test/resources/testBuildArgs/Dockerfile
@@ -0,0 +1,5 @@
+FROM      ubuntu:latest
+
+ARG testArg
+
+LABEL "test"=$testArg

From 6845dc30222fa1982aad55fa53a062ae189e1e2a Mon Sep 17 00:00:00 2001
From: gtejasvarma <gtejasvarma@gmail.com>
Date: Mon, 21 Dec 2015 13:48:00 -0800
Subject: [PATCH 0356/1272] changing to Object type from native type

---
 .../dockerjava/api/command/InspectContainerResponse.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index a6e396985..d8d3a5066 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -67,7 +67,7 @@ public class InspectContainerResponse {
     private String name;
 
     @JsonProperty("RestartCount")
-    private int restartCount;;
+    private Integer restartCount;
 
     @JsonProperty("NetworkSettings")
     private NetworkSettings networkSettings;
@@ -163,7 +163,7 @@ public String getName() {
         return name;
     }
 
-    public int getRestartCount() {
+    public Integer getRestartCount() {
         return restartCount;
     }
 

From a11811b8b6a725ba0f3349dd4e543f8ba80d0123 Mon Sep 17 00:00:00 2001
From: alenkacz <varkockova.a@gmail.com>
Date: Sat, 9 Jan 2016 13:38:04 +0100
Subject: [PATCH 0357/1272] Add information about API version

---
 .../com/github/dockerjava/api/command/BuildImageCmd.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 07d29fb54..3f3ca5a5e 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -10,6 +10,7 @@
 
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.api.model.BuildResponseItem;
+import com.github.dockerjava.core.RemoteApiVersion;
 
 /**
  * Build an image from Dockerfile.
@@ -88,6 +89,9 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     @CheckForNull
     public String getCpusetcpus();
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_21}
+     */
     @CheckForNull
     public Map<String, String> getBuildArgs();
 
@@ -119,6 +123,9 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     public BuildImageCmd withCpusetcpus(String cpusetcpus);
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_21}
+     */
     public BuildImageCmd withBuildArg(String key, String value);
 
     // setters lib specific

From 10ad1d5b789c799826aa8f32d2c61ba6e54fbb53 Mon Sep 17 00:00:00 2001
From: alenkacz <varkockova.a@gmail.com>
Date: Sun, 10 Jan 2016 09:24:28 +0100
Subject: [PATCH 0358/1272] Add also netty based implementation

---
 .../dockerjava/netty/exec/BuildImageCmdExec.java   | 12 ++++++++++++
 .../netty/exec/BuildImageCmdExecTest.java          | 14 ++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
index 9c0e6c09f..0d1573158 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.netty.exec;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -13,9 +14,12 @@
 import com.github.dockerjava.netty.MediaType;
 import com.github.dockerjava.netty.WebTarget;
 
+import java.io.IOException;
+
 public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem> implements
         BuildImageCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageCmdExec.class);
+    private static final ObjectMapper MAPPER = new ObjectMapper();
 
     public BuildImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
         super(baseResource, dockerClientConfig);
@@ -80,6 +84,14 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
             webTarget = webTarget.queryParam("cpusetcpus", command.getCpusetcpus());
         }
 
+        if (command.getBuildArgs() != null) {
+            try {
+                webTarget = webTarget.queryParam("buildargs", MAPPER.writeValueAsString(command.getBuildArgs()));
+           } catch (IOException e) {
+                // pass
+           }
+        }
+
         LOGGER.trace("POST: {}", webTarget);
 
         InvocationBuilder builder = resourceWithOptionalAuthConfig(command, webTarget.request()).accept(
diff --git a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
index 7fb94fcd4..e4aa05250 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
@@ -296,4 +296,18 @@ public void testBuildFromPrivateRegistry() throws Exception {
         LOG.info("Image Inspect: {}", inspectImageResponse.toString());
 
     }
+
+    @Test
+    public void testBuildArgs() throws Exception {
+        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testBuildArgs").getFile());
+
+        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc").exec(new BuildImageResultCallback())
+                .awaitImageId();
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        assertThat(inspectImageResponse, not(nullValue()));
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+        assertThat(inspectImageResponse.getConfig().getLabels().get("test"), equalTo("abc"));
+    }
 }

From 5b6cc0f5ad41f1e9e1ed49625d0c82229ae50428 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 10 Jan 2016 17:26:51 +0100
Subject: [PATCH 0359/1272] Dont preset empty buildArgs

---
 .../github/dockerjava/core/command/BuildImageCmdImpl.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index 6d2fefd92..acf4fa10a 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -52,7 +52,7 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR
 
     private URI remote;
 
-    private Map<String, String> buildArgs = new HashMap<String, String>();
+    private Map<String, String> buildArgs;
 
     public BuildImageCmdImpl(BuildImageCmd.Exec exec) {
         super(exec);
@@ -230,6 +230,9 @@ public BuildImageCmd withCpusetcpus(String cpusetcpus) {
 
     @Override
     public BuildImageCmd withBuildArg(String key, String value) {
+        if (this.buildArgs == null) {
+            this.buildArgs = new HashMap<String, String>();
+        }
         this.buildArgs.put(key, value);
         return this;
     }

From 49a84c1aec17e293801db8743828e0b73198afdf Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 10 Jan 2016 17:28:11 +0100
Subject: [PATCH 0360/1272] send buildArgs only if non-empty

---
 .../github/dockerjava/jaxrs/BuildImageCmdExec.java | 10 +++++++---
 .../dockerjava/netty/exec/BuildImageCmdExec.java   | 14 ++++++++------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index 68e56bbec..ec6be7fe1 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -7,6 +7,7 @@
 import javax.ws.rs.core.MediaType;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.RequestEntityProcessing;
 import org.slf4j.Logger;
@@ -22,10 +23,12 @@
 import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
 
 import java.io.IOException;
+import java.net.URLEncoder;
 
 public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem> implements
         BuildImageCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageCmdExec.class);
+
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
     public BuildImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
@@ -96,11 +99,12 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
             webTarget = webTarget.queryParam("rm", "false");
         }
 
-        if (command.getBuildArgs() != null) {
+        if (command.getBuildArgs() != null && !command.getBuildArgs().isEmpty()) {
             try {
-                webTarget = webTarget.queryParam("buildargs", MAPPER.writeValueAsString(command.getBuildArgs()));
+                webTarget = webTarget.queryParam("buildargs",
+                        URLEncoder.encode(MAPPER.writeValueAsString(command.getBuildArgs()), "UTF-8"));
             } catch (IOException e) {
-                // pass
+                throw new RuntimeException(e);
             }
         }
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
index 0d1573158..ba09fa743 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
@@ -19,6 +19,7 @@
 public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem> implements
         BuildImageCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageCmdExec.class);
+
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
     public BuildImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
@@ -84,18 +85,19 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
             webTarget = webTarget.queryParam("cpusetcpus", command.getCpusetcpus());
         }
 
-        if (command.getBuildArgs() != null) {
+        if (command.getBuildArgs() != null && !command.getBuildArgs().isEmpty()) {
             try {
                 webTarget = webTarget.queryParam("buildargs", MAPPER.writeValueAsString(command.getBuildArgs()));
-           } catch (IOException e) {
-                // pass
-           }
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
         }
 
         LOGGER.trace("POST: {}", webTarget);
 
-        InvocationBuilder builder = resourceWithOptionalAuthConfig(command, webTarget.request()).accept(
-                MediaType.APPLICATION_JSON).header("Content-Type", "application/tar").header("encoding", "gzip");
+        InvocationBuilder builder = resourceWithOptionalAuthConfig(command, webTarget.request())
+                .accept(MediaType.APPLICATION_JSON).header("Content-Type", "application/tar")
+                .header("encoding", "gzip");
 
         builder.post(new TypeReference<BuildResponseItem>() {
         }, resultCallback, command.getTarInputStream());

From 672984d11f8468531700e180631e462723d35674 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 10 Jan 2016 17:30:52 +0100
Subject: [PATCH 0361/1272] update CHANGELOG

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9c6adde9..55e1593d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,9 +9,10 @@ Notes
 
 All changes
 
+* [#410] (https://github.com/docker-java/docker-java/pull/410) Support for build-args of docker build 
 * [#408] (https://github.com/docker-java/docker-java/pull/408) Support for volume API 
 * [#396] (https://github.com/docker-java/docker-java/pull/396) Disable evaluation of http.proxy... variables when using unix socket connection 
-* [#393] (https://github.com/docker-java/docker-java/pull/392) Support ONBUILD instruction in Dockerfiles 
+* [#393] (https://github.com/docker-java/docker-java/pull/393) Support ONBUILD instruction in Dockerfiles 
 * [#392] (https://github.com/docker-java/docker-java/pull/392) Introduce InspectContainerResponse.Mounts
 * [#387] (https://github.com/docker-java/docker-java/pull/387) Make ProgressDetails attributes public
 * [#386] (https://github.com/docker-java/docker-java/pull/386) Basic http proxy configuration support

From 231d0c5509e63ae69e4d9e37549ef28460abc9f4 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Mon, 11 Jan 2016 22:52:34 +0100
Subject: [PATCH 0362/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55e1593d8..380ba2c38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,7 +22,7 @@ All changes
 * [#347] (https://github.com/docker-java/docker-java/pull/347) Implementation of copy archive to/from container commands 
 * [#313] (https://github.com/docker-java/docker-java/pull/313) Refactor primitive type fields to be of object type in JSON objects
 
-2.1.4-SNAPSHOT
+v2.1.4
 ---
 
 * [#396] (https://github.com/docker-java/docker-java/pull/396) Disable evaluation of http.proxy... variables when using unix socket connection  

From d4e01e30002df2dad89a700f04a2e0d53117eb64 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 15 Jan 2016 21:39:38 +0100
Subject: [PATCH 0363/1272] Add inspect container RestartCount test

---
 .../api/command/InspectContainerResponse.java |  3 +
 .../command/InspectContainerCmdImplTest.java  | 90 +++++++++++++++++++
 .../exec/InspectContainerCmdExecTest.java     | 15 ++++
 3 files changed, 108 insertions(+)
 create mode 100644 src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java

diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index d8d3a5066..59438dba2 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -66,6 +66,9 @@ public class InspectContainerResponse {
     @JsonProperty("Name")
     private String name;
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_17}
+     */
     @JsonProperty("RestartCount")
     private Integer restartCount;
 
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
new file mode 100644
index 000000000..cf555a28a
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
@@ -0,0 +1,90 @@
+package com.github.dockerjava.core.command;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+import java.lang.reflect.Method;
+import java.security.SecureRandom;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class InspectContainerCmdImplTest extends AbstractDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(InspectContainerCmdImplTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test()
+    public void inspectContainer() throws DockerException {
+
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
+                .withName(containerName).exec();
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(container.getId()).exec();
+        assertEquals(containerInfo.getId(), container.getId());
+
+    }
+
+    @Test
+    public void inspectNonExistingContainer() throws DockerException {
+
+        try {
+            dockerClient.inspectContainerCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
+
+    @Test
+    public void inspectContainerRestartCount() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCmd("env").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getRestartCount(), equalTo(0));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
index 63bafe7d2..31116ef22 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.netty.exec;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
 
@@ -72,4 +73,18 @@ public void inspectNonExistingContainer() throws DockerException {
         }
     }
 
+    @Test
+    public void inspectContainerRestartCount() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCmd("env").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getRestartCount(), equalTo(0));
+    }
 }

From b86392aea1358f3b0341f297c38cd59865c17d79 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 15 Jan 2016 21:41:05 +0100
Subject: [PATCH 0364/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 380ba2c38..6b0b38327 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,9 +8,9 @@ Notes
 * The upcoming release will contain multiple API breaking changes therefore the major version switch. It will support a subset of v.1.21 of the docker remote API. It also includes an experimental netty based implementation of `DockerCmdExecFactory` that probably will replace the current jersey/httpclient based one in a later release.
 
 All changes
-
 * [#410] (https://github.com/docker-java/docker-java/pull/410) Support for build-args of docker build 
-* [#408] (https://github.com/docker-java/docker-java/pull/408) Support for volume API 
+* [#408] (https://github.com/docker-java/docker-java/pull/408) Support for volume API
+* [#406] (https://github.com/docker-java/docker-java/pull/406) Added RestartCount to InspectContainerResponse
 * [#396] (https://github.com/docker-java/docker-java/pull/396) Disable evaluation of http.proxy... variables when using unix socket connection 
 * [#393] (https://github.com/docker-java/docker-java/pull/393) Support ONBUILD instruction in Dockerfiles 
 * [#392] (https://github.com/docker-java/docker-java/pull/392) Introduce InspectContainerResponse.Mounts

From f6d225d2c2e65aa058da5b94c2350cbe5d5f96c9 Mon Sep 17 00:00:00 2001
From: Andrew Keely <andrew.keely@gmail.com>
Date: Fri, 8 Jan 2016 22:58:51 -0500
Subject: [PATCH 0365/1272] Implement Network API

---
 .../github/dockerjava/api/DockerClient.java   |  18 ++
 .../api/command/ConnectToNetworkCmd.java      |  27 ++
 .../api/command/CreateNetworkCmd.java         |  42 +++
 .../api/command/CreateNetworkResponse.java    |  36 +++
 .../api/command/DisconnectFromNetworkCmd.java |  27 ++
 .../api/command/DockerCmdExecFactory.java     |  12 +
 .../api/command/InspectContainerResponse.java |  54 +---
 .../api/command/InspectExecResponse.java      |  31 ++
 .../api/command/InspectNetworkCmd.java        |  31 ++
 .../api/command/ListNetworksCmd.java          |  25 ++
 .../api/command/RemoveNetworkCmd.java         |  30 ++
 .../github/dockerjava/api/model/Network.java  | 154 ++++++++++
 .../dockerjava/api/model/NetworkFilters.java  |  15 +
 .../dockerjava/api/model/NetworkSettings.java | 272 ++++++++++++++++++
 .../dockerjava/api/model/PortBinding.java     |   1 -
 .../github/dockerjava/api/model/Ports.java    |   1 -
 .../dockerjava/core/DockerClientImpl.java     |  42 +++
 .../core/command/ConnectToNetworkCmdImpl.java |  39 +++
 .../core/command/CreateNetworkCmdImpl.java    |  71 +++++
 .../command/DisconnectFromNetworkCmdImpl.java |  40 +++
 .../core/command/InpectNetworkCmdImpl.java    |  24 ++
 .../core/command/ListNetworksCmdImpl.java     |  27 ++
 .../core/command/RemoveNetworkCmdImpl.java    |  26 ++
 .../jaxrs/ConnectToNetworkCmdExec.java        |  32 +++
 .../jaxrs/CreateNetworkCmdExec.java           |  31 ++
 .../jaxrs/DisconnectFromNetworkCmdExec.java   |  32 +++
 .../jaxrs/DockerCmdExecFactoryImpl.java       |  91 ++++--
 .../jaxrs/InspectNetworkCmdExec.java          |  28 ++
 .../dockerjava/jaxrs/ListNetworksCmdExec.java |  43 +++
 .../jaxrs/RemoveNetworkCmdExec.java           |  30 ++
 .../netty/DockerCmdExecFactoryImpl.java       |  96 +++++--
 .../netty/exec/ConnectToNetworkCmdExec.java   |  29 ++
 .../netty/exec/CreateNetworkCmdExec.java      |  30 ++
 .../exec/DisconnectFromNetworkCmdExec.java    |  29 ++
 .../netty/exec/InspectNetworkCmdExec.java     |  29 ++
 .../netty/exec/ListNetworksCmdExec.java       |  37 +++
 .../netty/exec/RemoveNetworkCmdExec.java      |  29 ++
 .../client/AbstractDockerClientTest.java      |  23 ++
 .../core/TestDockerCmdExecFactory.java        |  97 ++++---
 .../command/ConnectToNetworkCmdImplTest.java  |  59 ++++
 .../command/CreateNetworkCmdImplTest.java     |  52 ++++
 .../DisconnectFromNetworkCmdImplTest.java     |  59 ++++
 .../command/InspectContainerCmdImplTest.java  |  15 +
 .../core/command/InspectExecCmdImplTest.java  |  30 +-
 .../command/InspectNetworkCmdImplTest.java    |  57 ++++
 .../core/command/ListNetworksCmdImplTest.java |  55 ++++
 .../command/RemoveNetworkCmdImplTest.java     |  76 +++++
 .../netty/exec/CreateNetworkCmdExecTest.java  |  52 ++++
 .../exec/InspectContainerCmdExecTest.java     |  15 +
 .../netty/exec/InspectExecCmdExecTest.java    |  22 ++
 .../netty/exec/InspectNetworkCmdExecTest.java |  57 ++++
 .../netty/exec/ListNetworksCmdExecTest.java   |  55 ++++
 .../netty/exec/RemoveNetworkCmdExecTest.java  |  76 +++++
 53 files changed, 2252 insertions(+), 159 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/Network.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/NetworkFilters.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/InpectNetworkCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/RemoveNetworkCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/InspectNetworkCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExec.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImplTest.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/InspectNetworkCmdImplTest.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/ListNetworksCmdImplTest.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/RemoveNetworkCmdImplTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/InspectNetworkCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/ListNetworksCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExecTest.java

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index a3a3a9aa0..5db2967ff 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -11,13 +11,16 @@
 import com.github.dockerjava.api.command.AuthCmd;
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.command.CommitCmd;
+import com.github.dockerjava.api.command.ConnectToNetworkCmd;
 import com.github.dockerjava.api.command.ContainerDiffCmd;
 import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
 import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.CreateNetworkCmd;
 import com.github.dockerjava.api.command.CreateVolumeCmd;
+import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.command.ExecCreateCmd;
 import com.github.dockerjava.api.command.ExecStartCmd;
@@ -25,10 +28,12 @@
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.InspectNetworkCmd;
 import com.github.dockerjava.api.command.InspectVolumeCmd;
 import com.github.dockerjava.api.command.KillContainerCmd;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.ListNetworksCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
@@ -37,6 +42,7 @@
 import com.github.dockerjava.api.command.PushImageCmd;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.api.command.RemoveNetworkCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
@@ -200,6 +206,18 @@ public interface DockerClient extends Closeable {
 
     public ListVolumesCmd listVolumesCmd();
 
+    public ListNetworksCmd listNetworksCmd();
+
+    public InspectNetworkCmd inspectNetworkCmd();
+
+    public CreateNetworkCmd createNetworkCmd();
+
+    public RemoveNetworkCmd removeNetworkCmd(@Nonnull String networkId);
+
+    public ConnectToNetworkCmd connectToNetworkCmd();
+
+    public DisconnectFromNetworkCmd disconnectFromNetworkCmd();
+
     @Override
     public void close() throws IOException;
 
diff --git a/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java b/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java
new file mode 100644
index 000000000..cf76e2ec3
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java
@@ -0,0 +1,27 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * Connects a container to a network.
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_21}
+ */
+public interface ConnectToNetworkCmd extends SyncDockerCmd<Void> {
+
+    @CheckForNull
+    public String getNetworkId();
+
+    @CheckForNull
+    public String getContainerId();
+
+    public ConnectToNetworkCmd withNetworkId(@Nonnull String networkId);
+
+    public ConnectToNetworkCmd withContainerId(@Nonnull String containerId);
+
+    public static interface Exec extends DockerCmdSyncExec<ConnectToNetworkCmd, Void> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
new file mode 100644
index 000000000..2e3cd92a0
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
@@ -0,0 +1,42 @@
+package com.github.dockerjava.api.command;
+
+import java.util.Map;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.api.model.Network.Ipam;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+/**
+ * Create a network.
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_21}
+ */
+public interface CreateNetworkCmd extends SyncDockerCmd<CreateNetworkResponse> {
+
+    @CheckForNull
+    public String getName();
+
+    @CheckForNull
+    public String getDriver();
+
+    @CheckForNull
+    public Network.Ipam getIpam();
+
+    /** The new network's name. Required. */
+    public CreateNetworkCmd withName(@Nonnull String name);
+
+    /** Optional custom IP scheme for the network. */
+    public CreateNetworkCmd withIpamConfig(Ipam.Config config);
+
+    /** Name of the network driver to use. Defaults to <code>bridge</code>. */
+    public CreateNetworkCmd withDriver(String driver);
+
+    /** Driver specific options  */
+    public CreateNetworkCmd withOptions(Map<String, String> options);
+
+    public static interface Exec extends DockerCmdSyncExec<CreateNetworkCmd, CreateNetworkResponse> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java b/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
new file mode 100644
index 000000000..ec4827476
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
@@ -0,0 +1,36 @@
+package com.github.dockerjava.api.command;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CreateNetworkResponse {
+
+    @JsonProperty("Id")
+    private String id;
+
+    @JsonProperty("Warnings")
+    private String[] warnings;
+
+    public String getId() {
+        return id;
+    }
+
+    public String[] getWarnings() {
+        return warnings;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public void setWarnings(String[] warnings) {
+        this.warnings = warnings;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java b/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java
new file mode 100644
index 000000000..a2452416b
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java
@@ -0,0 +1,27 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * Disconnects a container from a network.
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_21}
+ */
+public interface DisconnectFromNetworkCmd extends SyncDockerCmd<Void> {
+
+    @CheckForNull
+    public String getNetworkId();
+
+    @CheckForNull
+    public String getContainerId();
+
+    public DisconnectFromNetworkCmd withNetworkId(@Nonnull String networkId);
+
+    public DisconnectFromNetworkCmd withContainerId(@Nonnull String containerId);
+
+    public static interface Exec extends DockerCmdSyncExec<DisconnectFromNetworkCmd, Void> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index 98de728e8..fb1715e38 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -93,6 +93,18 @@ public interface DockerCmdExecFactory extends Closeable {
 
     public ListVolumesCmd.Exec createListVolumesCmdExec();
 
+    public ListNetworksCmd.Exec createListNetworksCmdExec();
+
+    public InspectNetworkCmd.Exec createInspectNetworkCmdExec();
+
+    public CreateNetworkCmd.Exec createCreateNetworkCmdExec();
+
+    public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec();
+
+    public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec();
+
+    public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec();
+
     @Override
     public void close() throws IOException;
 
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index 59438dba2..85f2812f0 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.command;
 
 import java.util.List;
-import java.util.Map;
 
 import javax.annotation.CheckForNull;
 
@@ -14,7 +13,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.model.ContainerConfig;
 import com.github.dockerjava.api.model.HostConfig;
-import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.NetworkSettings;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumeBind;
 import com.github.dockerjava.api.model.VolumeBinds;
@@ -203,56 +202,7 @@ public String toString() {
         return ToStringBuilder.reflectionToString(this);
     }
 
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public class NetworkSettings {
-
-        @JsonProperty("IPAddress")
-        private String ipAddress;
-
-        @JsonProperty("IPPrefixLen")
-        private Integer ipPrefixLen;
-
-        @JsonProperty("Gateway")
-        private String gateway;
-
-        @JsonProperty("Bridge")
-        private String bridge;
-
-        @JsonProperty("PortMapping")
-        private Map<String, Map<String, String>> portMapping;
-
-        @JsonProperty("Ports")
-        private Ports ports;
-
-        public String getIpAddress() {
-            return ipAddress;
-        }
-
-        public Integer getIpPrefixLen() {
-            return ipPrefixLen;
-        }
-
-        public String getGateway() {
-            return gateway;
-        }
 
-        public String getBridge() {
-            return bridge;
-        }
-
-        public Map<String, Map<String, String>> getPortMapping() {
-            return portMapping;
-        }
-
-        public Ports getPorts() {
-            return ports;
-        }
-
-        @Override
-        public String toString() {
-            return ToStringBuilder.reflectionToString(this);
-        }
-    }
 
     @JsonIgnoreProperties(ignoreUnknown = true)
     public class ContainerState {
@@ -514,7 +464,5 @@ public String getMode() {
         public Boolean getRW() {
             return rw;
         }
-
     }
-
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
index b1cb09b20..63f111dce 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
@@ -6,6 +6,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.NetworkSettings;
+import com.github.dockerjava.core.RemoteApiVersion;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class InspectExecResponse {
@@ -27,6 +29,12 @@ public class InspectExecResponse {
     @JsonProperty("ExitCode")
     private Integer exitCode;
 
+    @JsonProperty("ProcessConfig")
+    private ProcessConfig processConfig;
+
+    @JsonProperty("Container")
+    private Container container;
+
     public String getId() {
         return id;
     }
@@ -51,6 +59,14 @@ public Integer getExitCode() {
         return exitCode;
     }
 
+    public ProcessConfig getProcessConfig() {
+        return processConfig;
+    }
+
+    public Container getContainer() {
+        return container;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
@@ -58,6 +74,7 @@ public String toString() {
 
     @JsonIgnoreProperties(ignoreUnknown = true)
     public class ProcessConfig {
+
         @JsonProperty("arguments")
         private List<String> arguments;
 
@@ -98,4 +115,18 @@ public String toString() {
             return ToStringBuilder.reflectionToString(this);
         }
     }
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public class Container {
+
+        @JsonProperty("NetworkSettings")
+        private NetworkSettings networkSettings;
+
+        /**
+         * @since {@link RemoteApiVersion#VERSION_1_21}
+         */
+        public NetworkSettings getNetworkSettings() {
+            return networkSettings;
+        }
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java
new file mode 100644
index 000000000..18394879a
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * Inspect a network.
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_21}
+ */
+public interface InspectNetworkCmd extends SyncDockerCmd<Network> {
+
+    @CheckForNull
+    public String getNetworkId();
+
+    public InspectNetworkCmd withNetworkId(@Nonnull String networkId);
+
+    /**
+     * @throws NotFoundException
+     *             No such network
+     */
+    @Override
+    public Network exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdSyncExec<InspectNetworkCmd, Network> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java b/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
new file mode 100644
index 000000000..2b5b29996
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
@@ -0,0 +1,25 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.model.Filters;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import javax.annotation.CheckForNull;
+
+import java.util.List;
+
+/**
+ * List networks.
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_21}
+ */
+public interface ListNetworksCmd extends SyncDockerCmd<List<Network>> {
+
+    @CheckForNull
+    public Filters getFilters();
+
+    ListNetworksCmd withFilters(Filters filters);
+
+    public static interface Exec extends DockerCmdSyncExec<ListNetworksCmd, List<Network>> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java
new file mode 100644
index 000000000..3dcb428e2
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * Remove a network.
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_21}
+ */
+public interface RemoveNetworkCmd extends SyncDockerCmd<Void> {
+
+    @CheckForNull
+    public String getNetworkId();
+
+    public RemoveNetworkCmd withNetworkId(@Nonnull String networkId);
+
+    /**
+     * @throws NotFoundException
+     *             No such network
+     */
+    @Override
+    public Void exec() throws NotFoundException;
+
+    public static interface Exec extends DockerCmdSyncExec<RemoveNetworkCmd, Void> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/Network.java b/src/main/java/com/github/dockerjava/api/model/Network.java
new file mode 100644
index 000000000..d62d83019
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/Network.java
@@ -0,0 +1,154 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class Network {
+
+    @JsonProperty("Id")
+    private String id;
+
+    @JsonProperty("Name")
+    private String name;
+
+    @JsonProperty("Scope")
+    private String scope;
+
+    @JsonProperty("Driver")
+    private String driver;
+
+    @JsonProperty("IPAM")
+    private Ipam ipam;
+
+    @JsonProperty("Containers")
+    private Map<String, ContainerNetworkConfig> containers;
+
+    @JsonProperty("Options")
+    private Map<String, String> options;
+
+    public String getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getScope() {
+        return scope;
+    }
+
+    public String getDriver() {
+        return driver;
+    }
+
+    public Ipam getIpam() {
+        return ipam;
+    }
+
+    public Map<String, ContainerNetworkConfig> getContainers() {
+        return containers;
+    }
+
+    public Map<String, String> getOptions() {
+        return options;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class ContainerNetworkConfig {
+
+        @JsonProperty("EndpointID")
+        private String endpointId;
+
+        @JsonProperty("MacAddress")
+        private String macAddress;
+
+        @JsonProperty("IPv4Address")
+        private String ipv4Address;
+
+        @JsonProperty("IPv6Address")
+        private String ipv6Address;
+
+        public String getEndpointId() {
+            return endpointId;
+        }
+
+        public String getMacAddress() {
+            return macAddress;
+        }
+
+        public String getIpv4Address() {
+            return ipv4Address;
+        }
+
+        public String getIpv6Address() {
+            return ipv6Address;
+        }
+
+        @Override
+        public String toString() {
+            return ToStringBuilder.reflectionToString(this);
+        }
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class Ipam {
+
+        @JsonProperty("Driver")
+        private String driver;
+
+        @JsonProperty("Config")
+        List<Config> config = new ArrayList<>();
+
+        public String getDriver() {
+            return driver;
+        }
+
+        public List<Config> getConfig() {
+            return config;
+        }
+
+        @Override
+        public String toString() {
+            return ToStringBuilder.reflectionToString(this);
+        }
+
+        @JsonIgnoreProperties(ignoreUnknown = true)
+        public static class Config {
+
+            @JsonProperty("Subnet")
+            private String subnet;
+
+            @JsonProperty("IPRange")
+            private String ipRange;
+
+            @JsonProperty("Gateway")
+            private String gateway;
+
+            public String getSubnet() {
+                return subnet;
+            }
+
+            public String getIpRange() {
+                return ipRange;
+            }
+
+            public String getGateway() {
+                return gateway;
+            }
+         }
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/NetworkFilters.java b/src/main/java/com/github/dockerjava/api/model/NetworkFilters.java
new file mode 100644
index 000000000..f3c837643
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/NetworkFilters.java
@@ -0,0 +1,15 @@
+package com.github.dockerjava.api.model;
+
+/**
+ * Created by andrewk on 1/5/16.
+ */
+public class NetworkFilters extends Filters {
+
+    public Filters withNames(String... names) {
+        return withFilter("name", names);
+    }
+
+    public Filters withIds(String... ids) {
+        return withFilter("id", ids);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java b/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
new file mode 100644
index 000000000..64c954ec9
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
@@ -0,0 +1,272 @@
+/*
+ * Created on 16.01.2016
+ */
+package com.github.dockerjava.api.model;
+
+import java.util.Map;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+/**
+ *
+ * @author Marcus Linke
+ *
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class NetworkSettings {
+
+    @JsonProperty("Bridge")
+    private String bridge;
+
+    @JsonProperty("SandboxID")
+    private String sandboxId;
+
+    @JsonProperty("HairpinMode")
+    private Boolean hairpinMode;
+
+    @JsonProperty("LinkLocalIPv6Address")
+    private String linkLocalIPv6Address;
+
+    @JsonProperty("LinkLocalIPv6PrefixLen")
+    private Integer linkLocalIPv6PrefixLen;
+
+    @JsonProperty("Ports")
+    private Ports ports;
+
+    @JsonProperty("SandboxKey")
+    private String sandboxKey;
+
+    @JsonProperty("SecondaryIPAddresses")
+    private Object secondaryIPAddresses;
+
+    @JsonProperty("SecondaryIPv6Addresses")
+    private Object secondaryIPv6Addresses;
+
+    @JsonProperty("EndpointID")
+    private String endpointID;
+
+    @JsonProperty("Gateway")
+    private String gateway;
+
+    @JsonProperty("PortMapping")
+    private Map<String, Map<String, String>> portMapping;
+
+    @JsonProperty("GlobalIPv6Address")
+    private String globalIPv6Address;
+
+    @JsonProperty("GlobalIPv6PrefixLen")
+    private Integer globalIPv6PrefixLen;
+
+    @JsonProperty("IPAddress")
+    private String ipAddress;
+
+    @JsonProperty("IPPrefixLen")
+    private Integer ipPrefixLen;
+
+    @JsonProperty("IPv6Gateway")
+    private String ipV6Gateway;
+
+    @JsonProperty("MacAddress")
+    private String macAddress;
+
+    @JsonProperty("Networks")
+    private Map<String, Network> networks;
+
+    /**
+     * @deprecated since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    public String getIpAddress() {
+        return ipAddress;
+    }
+
+    /**
+     * @deprecated since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    public Integer getIpPrefixLen() {
+        return ipPrefixLen;
+    }
+
+    /**
+     * @deprecated since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    public String getGateway() {
+        return gateway;
+    }
+
+    public String getBridge() {
+        return bridge;
+    }
+
+    /**
+     * @deprecated since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    public Map<String, Map<String, String>> getPortMapping() {
+        return portMapping;
+    }
+
+    /**
+     * @deprecated since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    public String getMacAddress() {
+        return macAddress;
+    }
+
+    public Ports getPorts() {
+        return ports;
+    }
+
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    public String getEndpointID() {
+        return endpointID;
+    }
+
+    public String getIpV6Gateway() {
+        return ipV6Gateway;
+    }
+
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    public Map<String, Network> getNetworks() {
+        return networks;
+    }
+
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    public String getSandboxId() {
+        return sandboxId;
+    }
+
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    public String getSandboxKey() {
+        return sandboxKey;
+    }
+
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    public Object getSecondaryIPAddresses() {
+        return secondaryIPAddresses;
+    }
+
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    public Object getSecondaryIPv6Addresses() {
+        return secondaryIPv6Addresses;
+    }
+
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    public Boolean getHairpinMode() {
+        return hairpinMode;
+    }
+
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    public String getLinkLocalIPv6Address() {
+        return linkLocalIPv6Address;
+    }
+
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    public Integer getLinkLocalIPv6PrefixLen() {
+        return linkLocalIPv6PrefixLen;
+    }
+
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    public String getGlobalIPv6Address() {
+        return globalIPv6Address;
+    }
+
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    public Integer getGlobalIPv6PrefixLen() {
+        return globalIPv6PrefixLen;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class Network {
+
+        @JsonProperty("EndpointID")
+        private String endpointId;
+
+        @JsonProperty("Gateway")
+        private String gateway;
+
+        @JsonProperty("IPAddress")
+        private String ipAddress;
+
+        @JsonProperty("IPPrefixLen")
+        private Integer ipPrefixLen;
+
+        @JsonProperty("IPv6Gateway")
+        private String ipV6Gateway;
+
+        @JsonProperty("GlobalIPv6Address")
+        private String globalIPv6Address;
+
+        @JsonProperty("GlobalIPv6PrefixLen")
+        private Integer globalIPv6PrefixLen;
+
+        @JsonProperty("MacAddress")
+        private String macAddress;
+
+        public String getEndpointId() {
+            return endpointId;
+        }
+
+        public String getGateway() {
+            return gateway;
+        }
+
+        public String getIpAddress() {
+            return ipAddress;
+        }
+
+        public Integer getIpPrefixLen() {
+            return ipPrefixLen;
+        }
+
+        public String getIpV6Gateway() {
+            return ipV6Gateway;
+        }
+
+        public String getGlobalIPv6Address() {
+            return globalIPv6Address;
+        }
+
+        public Integer getGlobalIPv6PrefixLen() {
+            return globalIPv6PrefixLen;
+        }
+
+        public String getMacAddress() {
+            return macAddress;
+        }
+
+        @Override
+        public String toString() {
+            return ToStringBuilder.reflectionToString(this);
+        }
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/PortBinding.java b/src/main/java/com/github/dockerjava/api/model/PortBinding.java
index 355e83aa3..99e04f1bc 100644
--- a/src/main/java/com/github/dockerjava/api/model/PortBinding.java
+++ b/src/main/java/com/github/dockerjava/api/model/PortBinding.java
@@ -4,7 +4,6 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
-import com.github.dockerjava.api.command.InspectContainerResponse.NetworkSettings;
 import com.github.dockerjava.api.model.Ports.Binding;
 
 /**
diff --git a/src/main/java/com/github/dockerjava/api/model/Ports.java b/src/main/java/com/github/dockerjava/api/model/Ports.java
index a5f13977b..0ff5762e6 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -23,7 +23,6 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.node.NullNode;
-import com.github.dockerjava.api.command.InspectContainerResponse.NetworkSettings;
 
 /**
  * A container for port bindings, made available as a {@link Map} via its {@link #getBindings()} method.
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 05726f735..ede135613 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -12,13 +12,16 @@
 import com.github.dockerjava.api.command.AuthCmd;
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.command.CommitCmd;
+import com.github.dockerjava.api.command.ConnectToNetworkCmd;
 import com.github.dockerjava.api.command.ContainerDiffCmd;
 import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
 import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.CreateNetworkCmd;
 import com.github.dockerjava.api.command.CreateVolumeCmd;
+import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.command.ExecCreateCmd;
@@ -27,10 +30,12 @@
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.InspectNetworkCmd;
 import com.github.dockerjava.api.command.InspectVolumeCmd;
 import com.github.dockerjava.api.command.KillContainerCmd;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.ListNetworksCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
@@ -39,6 +44,7 @@
 import com.github.dockerjava.api.command.PushImageCmd;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.api.command.RemoveNetworkCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
@@ -57,17 +63,21 @@
 import com.github.dockerjava.core.command.AuthCmdImpl;
 import com.github.dockerjava.core.command.BuildImageCmdImpl;
 import com.github.dockerjava.core.command.CommitCmdImpl;
+import com.github.dockerjava.core.command.ConnectToNetworkCmdImpl;
 import com.github.dockerjava.core.command.ContainerDiffCmdImpl;
 import com.github.dockerjava.core.command.CopyArchiveFromContainerCmdImpl;
 import com.github.dockerjava.core.command.CopyArchiveToContainerCmdImpl;
 import com.github.dockerjava.core.command.CopyFileFromContainerCmdImpl;
 import com.github.dockerjava.core.command.CreateContainerCmdImpl;
 import com.github.dockerjava.core.command.CreateImageCmdImpl;
+import com.github.dockerjava.core.command.CreateNetworkCmdImpl;
 import com.github.dockerjava.core.command.CreateVolumeCmdImpl;
+import com.github.dockerjava.core.command.DisconnectFromNetworkCmdImpl;
 import com.github.dockerjava.core.command.EventsCmdImpl;
 import com.github.dockerjava.core.command.ExecCreateCmdImpl;
 import com.github.dockerjava.core.command.ExecStartCmdImpl;
 import com.github.dockerjava.core.command.InfoCmdImpl;
+import com.github.dockerjava.core.command.InpectNetworkCmdImpl;
 import com.github.dockerjava.core.command.InspectContainerCmdImpl;
 import com.github.dockerjava.core.command.InspectExecCmdImpl;
 import com.github.dockerjava.core.command.InspectImageCmdImpl;
@@ -75,6 +85,7 @@
 import com.github.dockerjava.core.command.KillContainerCmdImpl;
 import com.github.dockerjava.core.command.ListContainersCmdImpl;
 import com.github.dockerjava.core.command.ListImagesCmdImpl;
+import com.github.dockerjava.core.command.ListNetworksCmdImpl;
 import com.github.dockerjava.core.command.ListVolumesCmdImpl;
 import com.github.dockerjava.core.command.LogContainerCmdImpl;
 import com.github.dockerjava.core.command.PauseContainerCmdImpl;
@@ -83,6 +94,7 @@
 import com.github.dockerjava.core.command.PushImageCmdImpl;
 import com.github.dockerjava.core.command.RemoveContainerCmdImpl;
 import com.github.dockerjava.core.command.RemoveImageCmdImpl;
+import com.github.dockerjava.core.command.RemoveNetworkCmdImpl;
 import com.github.dockerjava.core.command.RemoveVolumeCmdImpl;
 import com.github.dockerjava.core.command.RestartContainerCmdImpl;
 import com.github.dockerjava.core.command.SaveImageCmdImpl;
@@ -417,6 +429,36 @@ public ListVolumesCmd listVolumesCmd() {
         return new ListVolumesCmdImpl(getDockerCmdExecFactory().createListVolumesCmdExec());
     }
 
+    @Override
+    public ListNetworksCmd listNetworksCmd() {
+        return new ListNetworksCmdImpl(getDockerCmdExecFactory().createListNetworksCmdExec());
+    }
+
+    @Override
+    public InspectNetworkCmd inspectNetworkCmd() {
+        return new InpectNetworkCmdImpl(getDockerCmdExecFactory().createInspectNetworkCmdExec());
+    }
+
+    @Override
+    public CreateNetworkCmd createNetworkCmd() {
+        return new CreateNetworkCmdImpl(getDockerCmdExecFactory().createCreateNetworkCmdExec());
+    }
+
+    @Override
+    public RemoveNetworkCmd removeNetworkCmd(String networkId) {
+        return new RemoveNetworkCmdImpl(getDockerCmdExecFactory().createRemoveNetworkCmdExec(), networkId);
+    }
+
+    @Override
+    public ConnectToNetworkCmd connectToNetworkCmd() {
+        return new ConnectToNetworkCmdImpl(getDockerCmdExecFactory().createConnectToNetworkCmdExec());
+    }
+
+    @Override
+    public DisconnectFromNetworkCmd disconnectFromNetworkCmd() {
+        return new DisconnectFromNetworkCmdImpl(getDockerCmdExecFactory().createDisconnectFromNetworkCmdExec());
+    }
+
     @Override
     public void close() throws IOException {
         getDockerCmdExecFactory().close();
diff --git a/src/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java
new file mode 100644
index 000000000..cfb6cce14
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java
@@ -0,0 +1,39 @@
+package com.github.dockerjava.core.command;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.command.ConnectToNetworkCmd;
+import com.github.dockerjava.api.command.DockerCmdSyncExec;
+
+public class ConnectToNetworkCmdImpl extends AbstrDockerCmd<ConnectToNetworkCmd, Void> implements ConnectToNetworkCmd {
+
+    @JsonIgnore
+    private String networkId;
+
+    @JsonProperty("Container")
+    private String containerId;
+
+    public ConnectToNetworkCmdImpl(DockerCmdSyncExec<ConnectToNetworkCmd, Void> execution) {
+        super(execution);
+    }
+
+    @Override
+    public String getNetworkId() {
+        return networkId;
+    }
+
+    @Override
+    public String getContainerId() {
+        return containerId;
+    }
+
+    @Override public ConnectToNetworkCmd withNetworkId(String networkId) {
+        this.networkId = networkId;
+        return this;
+    }
+
+    @Override public ConnectToNetworkCmd withContainerId(String containerId) {
+        this.containerId = containerId;
+        return this;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
new file mode 100644
index 000000000..fba16dfb9
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
@@ -0,0 +1,71 @@
+package com.github.dockerjava.core.command;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.api.command.DockerCmdSyncExec;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.api.model.Network.Ipam;
+
+public class CreateNetworkCmdImpl extends AbstrDockerCmd<CreateNetworkCmd, CreateNetworkResponse>
+    implements CreateNetworkCmd {
+
+    @JsonProperty("Name")
+    private String name;
+
+    @JsonProperty("Driver")
+    private String driver;
+
+    @JsonProperty("IPAM")
+    private Network.Ipam ipam;
+
+    @JsonProperty("Options")
+    private Map<String, String> options = new HashMap<>();
+
+    public CreateNetworkCmdImpl(DockerCmdSyncExec<CreateNetworkCmd, CreateNetworkResponse> execution) {
+        super(execution);
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getDriver() {
+        return driver;
+    }
+
+    @Override
+    public Network.Ipam getIpam() {
+        return ipam;
+    }
+
+    @Override
+    public CreateNetworkCmd withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    @Override
+    public CreateNetworkCmd withDriver(String driver) {
+        this.driver = driver;
+        return this;
+    }
+
+    @Override
+    public CreateNetworkCmd withIpamConfig(Ipam.Config config) {
+        this.ipam.getConfig().add(config);
+        return this;
+    }
+
+    @Override
+    public CreateNetworkCmd withOptions(Map<String, String> options) {
+        this.options = options;
+        return this;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java
new file mode 100644
index 000000000..a89201ad2
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java
@@ -0,0 +1,40 @@
+package com.github.dockerjava.core.command;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
+import com.github.dockerjava.api.command.DockerCmdSyncExec;
+
+public class DisconnectFromNetworkCmdImpl extends AbstrDockerCmd<DisconnectFromNetworkCmd, Void>
+    implements DisconnectFromNetworkCmd {
+
+    @JsonIgnore
+    private String networkId;
+
+    @JsonProperty("Container")
+    private String containerId;
+
+    public DisconnectFromNetworkCmdImpl(DockerCmdSyncExec<DisconnectFromNetworkCmd, Void> execution) {
+        super(execution);
+    }
+
+    @Override
+    public String getNetworkId() {
+        return networkId;
+    }
+
+    @Override
+    public String getContainerId() {
+        return containerId;
+    }
+
+    @Override public DisconnectFromNetworkCmd withNetworkId(String networkId) {
+        this.networkId = networkId;
+        return this;
+    }
+
+    @Override public DisconnectFromNetworkCmd withContainerId(String containerId) {
+        this.containerId = containerId;
+        return this;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/InpectNetworkCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InpectNetworkCmdImpl.java
new file mode 100644
index 000000000..0a0c564c5
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/InpectNetworkCmdImpl.java
@@ -0,0 +1,24 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.DockerCmdSyncExec;
+import com.github.dockerjava.api.command.InspectNetworkCmd;
+import com.github.dockerjava.api.model.Network;
+
+public class InpectNetworkCmdImpl extends AbstrDockerCmd<InspectNetworkCmd, Network> implements InspectNetworkCmd {
+
+    private String networkId;
+
+    public InpectNetworkCmdImpl(DockerCmdSyncExec<InspectNetworkCmd, Network> exec) {
+        super(exec);
+    }
+
+    @Override public String getNetworkId() {
+        return networkId;
+    }
+
+    @Override public InspectNetworkCmd withNetworkId(String networkId) {
+
+        this.networkId = networkId;
+        return this;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java
new file mode 100644
index 000000000..2303e7c9c
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java
@@ -0,0 +1,27 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.model.Filters;
+import com.github.dockerjava.api.model.Network;
+
+import java.util.List;
+
+public class ListNetworksCmdImpl extends AbstrDockerCmd<ListNetworksCmd, List<Network>> implements
+    ListNetworksCmd {
+
+    private Filters filters;
+
+    public ListNetworksCmdImpl(ListNetworksCmd.Exec exec) {
+        super(exec);
+    }
+
+    @Override public Filters getFilters() {
+        return filters;
+    }
+
+    @Override public ListNetworksCmd withFilters(Filters filters) {
+
+        this.filters = filters;
+        return this;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveNetworkCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveNetworkCmdImpl.java
new file mode 100644
index 000000000..ced7279f9
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/RemoveNetworkCmdImpl.java
@@ -0,0 +1,26 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.DockerCmdSyncExec;
+import com.github.dockerjava.api.command.RemoveNetworkCmd;
+
+public class RemoveNetworkCmdImpl extends AbstrDockerCmd<RemoveNetworkCmd, Void> implements RemoveNetworkCmd {
+
+    private String networkId;
+
+    public RemoveNetworkCmdImpl(DockerCmdSyncExec<RemoveNetworkCmd, Void> execution, String networkId) {
+        super(execution);
+        withNetworkId(networkId);
+    }
+
+    @Override
+    public String getNetworkId() {
+
+        return networkId;
+    }
+
+    @Override
+    public RemoveNetworkCmd withNetworkId(String networkId) {
+        this.networkId = networkId;
+        return this;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java
new file mode 100644
index 000000000..dfc730e03
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java
@@ -0,0 +1,32 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.command.ConnectToNetworkCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import static javax.ws.rs.client.Entity.entity;
+
+public class ConnectToNetworkCmdExec extends AbstrSyncDockerCmdExec<ConnectToNetworkCmd, Void>
+    implements ConnectToNetworkCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConnectToNetworkCmdExec.class);
+
+    public ConnectToNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(ConnectToNetworkCmd command) {
+
+        WebTarget webTarget = getBaseResource().path("/networks/" + command.getNetworkId() + "/connect");
+
+        LOGGER.trace("POST: {}", webTarget);
+        webTarget.request().post(entity(command, MediaType.APPLICATION_JSON));
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java
new file mode 100644
index 000000000..14f22b502
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import static javax.ws.rs.client.Entity.entity;
+
+public class CreateNetworkCmdExec extends AbstrSyncDockerCmdExec<CreateNetworkCmd, CreateNetworkResponse> implements
+        CreateNetworkCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateNetworkCmdExec.class);
+
+    public CreateNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected CreateNetworkResponse execute(CreateNetworkCmd command) {
+        WebTarget webResource = getBaseResource().path("/networks/create");
+
+        LOGGER.trace("POST: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(entity(command, MediaType.APPLICATION_JSON), CreateNetworkResponse.class);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java
new file mode 100644
index 000000000..4f6f54576
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java
@@ -0,0 +1,32 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import static javax.ws.rs.client.Entity.entity;
+
+public class DisconnectFromNetworkCmdExec extends AbstrSyncDockerCmdExec<DisconnectFromNetworkCmd, Void>
+    implements DisconnectFromNetworkCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(DisconnectFromNetworkCmdExec.class);
+
+    public DisconnectFromNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(DisconnectFromNetworkCmd command) {
+
+        WebTarget webTarget = getBaseResource().path("/networks/" + command.getNetworkId() + "/disconnect");
+
+        LOGGER.trace("POST: {}", webTarget);
+        webTarget.request().post(entity(command, MediaType.APPLICATION_JSON));
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index 30bc5e34f..bbd71ba38 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -2,44 +2,21 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.ProxySelector;
-import java.net.URI;
-import java.util.List;
-
-import javax.net.ssl.SSLContext;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.client.ClientResponseFilter;
-import javax.ws.rs.client.WebTarget;
-
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.glassfish.jersey.CommonProperties;
-import org.glassfish.jersey.apache.connector.ApacheClientProperties;
-import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.client.ClientProperties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd;
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.command.CommitCmd;
+import com.github.dockerjava.api.command.ConnectToNetworkCmd;
 import com.github.dockerjava.api.command.ContainerDiffCmd;
 import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
 import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.CreateNetworkCmd;
 import com.github.dockerjava.api.command.CreateVolumeCmd;
+import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.command.ExecCreateCmd;
@@ -48,10 +25,12 @@
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.InspectNetworkCmd;
 import com.github.dockerjava.api.command.InspectVolumeCmd;
 import com.github.dockerjava.api.command.KillContainerCmd;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.ListNetworksCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
@@ -60,6 +39,7 @@
 import com.github.dockerjava.api.command.PushImageCmd;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.api.command.RemoveNetworkCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
@@ -78,6 +58,30 @@
 import com.github.dockerjava.jaxrs.filter.JsonClientFilter;
 import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter;
 import com.github.dockerjava.jaxrs.filter.SelectiveLoggingFilter;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.glassfish.jersey.CommonProperties;
+import org.glassfish.jersey.apache.connector.ApacheClientProperties;
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.ClientProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.SSLContext;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.client.ClientResponseFilter;
+import javax.ws.rs.client.WebTarget;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.URI;
+import java.util.List;
 
 //import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 // see https://github.com/docker-java/docker-java/issues/196
@@ -445,6 +449,41 @@ public ListVolumesCmd.Exec createListVolumesCmdExec() {
         return new ListVolumesCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public ListNetworksCmd.Exec createListNetworksCmdExec() {
+        return new ListNetworksCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectNetworkCmd.Exec createInspectNetworkCmdExec() {
+
+        return new InspectNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CreateNetworkCmd.Exec createCreateNetworkCmdExec() {
+
+        return new CreateNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() {
+
+        return new RemoveNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() {
+
+        return new ConnectToNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() {
+
+        return new DisconnectFromNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public void close() throws IOException {
         checkNotNull(client, "Factory not initialized. You probably forgot to call init()!");
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java
new file mode 100644
index 000000000..c5e6b4d0a
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java
@@ -0,0 +1,28 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.command.InspectNetworkCmd;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+public class InspectNetworkCmdExec extends AbstrSyncDockerCmdExec<InspectNetworkCmd, Network> implements InspectNetworkCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ListNetworksCmdExec.class);
+
+    public InspectNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override protected Network execute(InspectNetworkCmd command) {
+
+        WebTarget webResource = getBaseResource().path("/networks/{id}").resolveTemplate("id",
+            command.getNetworkId());
+
+        LOGGER.debug("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(Network.class);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java
new file mode 100644
index 000000000..80438d433
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java
@@ -0,0 +1,43 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
+public class ListNetworksCmdExec extends AbstrSyncDockerCmdExec<ListNetworksCmd, List<Network>> implements
+        ListNetworksCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ListNetworksCmdExec.class);
+
+    public ListNetworksCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected List<Network> execute(ListNetworksCmd command) {
+        WebTarget webTarget = getBaseResource().path("/networks");
+
+        if (command.getFilters() != null) {
+            webTarget = webTarget
+                    .queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters().toString()));
+        }
+
+        LOGGER.trace("GET: {}", webTarget);
+        List<Network> networks = webTarget.request().accept(MediaType.APPLICATION_JSON)
+                .get(new GenericType<List<Network>>() {
+                });
+        LOGGER.trace("Response: {}", networks);
+
+        return networks;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java
new file mode 100644
index 000000000..84f115d4c
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+public class RemoveNetworkCmdExec extends AbstrSyncDockerCmdExec<RemoveNetworkCmd, Void>
+    implements RemoveNetworkCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveNetworkCmdExec.class);
+
+    public RemoveNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(RemoveNetworkCmd command) {
+
+        WebTarget webTarget = getBaseResource().path("/networks/" + command.getNetworkId());
+
+        LOGGER.trace("DELETE: {}", webTarget);
+        webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close();
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
index 9ddd51288..ee3b50101 100644
--- a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
@@ -1,44 +1,19 @@
 package com.github.dockerjava.netty;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.epoll.EpollDomainSocketChannel;
-import io.netty.channel.epoll.EpollEventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.nio.NioSocketChannel;
-import io.netty.channel.unix.DomainSocketAddress;
-import io.netty.channel.unix.UnixChannel;
-import io.netty.handler.codec.http.HttpClientCodec;
-import io.netty.handler.logging.LoggingHandler;
-import io.netty.handler.ssl.SslHandler;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.security.Security;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLParameters;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd;
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.command.CommitCmd;
+import com.github.dockerjava.api.command.ConnectToNetworkCmd;
 import com.github.dockerjava.api.command.ContainerDiffCmd;
 import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
 import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.CreateNetworkCmd;
 import com.github.dockerjava.api.command.CreateVolumeCmd;
+import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.command.ExecCreateCmd;
@@ -47,10 +22,12 @@
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.InspectNetworkCmd;
 import com.github.dockerjava.api.command.InspectVolumeCmd;
 import com.github.dockerjava.api.command.KillContainerCmd;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.ListNetworksCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
@@ -59,6 +36,7 @@
 import com.github.dockerjava.api.command.PushImageCmd;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.api.command.RemoveNetworkCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
@@ -77,13 +55,16 @@
 import com.github.dockerjava.netty.exec.AuthCmdExec;
 import com.github.dockerjava.netty.exec.BuildImageCmdExec;
 import com.github.dockerjava.netty.exec.CommitCmdExec;
+import com.github.dockerjava.netty.exec.ConnectToNetworkCmdExec;
 import com.github.dockerjava.netty.exec.ContainerDiffCmdExec;
 import com.github.dockerjava.netty.exec.CopyArchiveFromContainerCmdExec;
 import com.github.dockerjava.netty.exec.CopyArchiveToContainerCmdExec;
 import com.github.dockerjava.netty.exec.CopyFileFromContainerCmdExec;
 import com.github.dockerjava.netty.exec.CreateContainerCmdExec;
 import com.github.dockerjava.netty.exec.CreateImageCmdExec;
+import com.github.dockerjava.netty.exec.CreateNetworkCmdExec;
 import com.github.dockerjava.netty.exec.CreateVolumeCmdExec;
+import com.github.dockerjava.netty.exec.DisconnectFromNetworkCmdExec;
 import com.github.dockerjava.netty.exec.EventsCmdExec;
 import com.github.dockerjava.netty.exec.ExecCreateCmdExec;
 import com.github.dockerjava.netty.exec.ExecStartCmdExec;
@@ -91,10 +72,12 @@
 import com.github.dockerjava.netty.exec.InspectContainerCmdExec;
 import com.github.dockerjava.netty.exec.InspectExecCmdExec;
 import com.github.dockerjava.netty.exec.InspectImageCmdExec;
+import com.github.dockerjava.netty.exec.InspectNetworkCmdExec;
 import com.github.dockerjava.netty.exec.InspectVolumeCmdExec;
 import com.github.dockerjava.netty.exec.KillContainerCmdExec;
 import com.github.dockerjava.netty.exec.ListContainersCmdExec;
 import com.github.dockerjava.netty.exec.ListImagesCmdExec;
+import com.github.dockerjava.netty.exec.ListNetworksCmdExec;
 import com.github.dockerjava.netty.exec.ListVolumesCmdExec;
 import com.github.dockerjava.netty.exec.LogContainerCmdExec;
 import com.github.dockerjava.netty.exec.PauseContainerCmdExec;
@@ -103,6 +86,7 @@
 import com.github.dockerjava.netty.exec.PushImageCmdExec;
 import com.github.dockerjava.netty.exec.RemoveContainerCmdExec;
 import com.github.dockerjava.netty.exec.RemoveImageCmdExec;
+import com.github.dockerjava.netty.exec.RemoveNetworkCmdExec;
 import com.github.dockerjava.netty.exec.RemoveVolumeCmdExec;
 import com.github.dockerjava.netty.exec.RestartContainerCmdExec;
 import com.github.dockerjava.netty.exec.SaveImageCmdExec;
@@ -115,6 +99,32 @@
 import com.github.dockerjava.netty.exec.UnpauseContainerCmdExec;
 import com.github.dockerjava.netty.exec.VersionCmdExec;
 import com.github.dockerjava.netty.exec.WaitContainerCmdExec;
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.epoll.EpollDomainSocketChannel;
+import io.netty.channel.epoll.EpollEventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.channel.unix.DomainSocketAddress;
+import io.netty.channel.unix.UnixChannel;
+import io.netty.handler.codec.http.HttpClientCodec;
+import io.netty.handler.logging.LoggingHandler;
+import io.netty.handler.ssl.SslHandler;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLParameters;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.security.Security;
+
+import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * Experimental implementation of {@link DockerCmdExecFactory} that supports http connection hijacking that is needed to
@@ -505,6 +515,36 @@ public ListVolumesCmd.Exec createListVolumesCmdExec() {
         return new ListVolumesCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public ListNetworksCmd.Exec createListNetworksCmdExec() {
+        return new ListNetworksCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectNetworkCmd.Exec createInspectNetworkCmdExec() {
+        return new InspectNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CreateNetworkCmd.Exec createCreateNetworkCmdExec() {
+        return new CreateNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() {
+        return new RemoveNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() {
+        return new ConnectToNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() {
+        return new DisconnectFromNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public void close() throws IOException {
         checkNotNull(eventLoopGroup, "Factory not initialized. You probably forgot to call init()!");
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExec.java
new file mode 100644
index 000000000..b1090f4c3
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExec.java
@@ -0,0 +1,29 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.ConnectToNetworkCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class ConnectToNetworkCmdExec extends AbstrSyncDockerCmdExec<ConnectToNetworkCmd, Void>
+    implements ConnectToNetworkCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConnectToNetworkCmdExec.class);
+
+    public ConnectToNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(ConnectToNetworkCmd command) {
+
+        WebTarget webTarget = getBaseResource().path("/networks/" + command.getNetworkId() + "/connect");
+
+        LOGGER.trace("POST: {}", webTarget);
+        webTarget.request().post(command);
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExec.java
new file mode 100644
index 000000000..cfc825e80
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.netty.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CreateNetworkCmdExec extends AbstrSyncDockerCmdExec<CreateNetworkCmd, CreateNetworkResponse> implements
+        CreateNetworkCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateNetworkCmdExec.class);
+
+    public CreateNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected CreateNetworkResponse execute(CreateNetworkCmd command) {
+        WebTarget webResource = getBaseResource().path("/networks/create");
+
+        LOGGER.trace("POST: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(command, new TypeReference<CreateNetworkResponse>() {
+                });
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExec.java
new file mode 100644
index 000000000..8b814bddc
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExec.java
@@ -0,0 +1,29 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class DisconnectFromNetworkCmdExec extends AbstrSyncDockerCmdExec<DisconnectFromNetworkCmd, Void>
+    implements DisconnectFromNetworkCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(DisconnectFromNetworkCmdExec.class);
+
+    public DisconnectFromNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(DisconnectFromNetworkCmd command) {
+
+        WebTarget webTarget = getBaseResource().path("/networks/" + command.getNetworkId() + "/disconnect");
+
+        LOGGER.trace("POST: {}", webTarget);
+        webTarget.request().post(command);
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectNetworkCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/InspectNetworkCmdExec.java
new file mode 100644
index 000000000..51777972f
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/InspectNetworkCmdExec.java
@@ -0,0 +1,29 @@
+package com.github.dockerjava.netty.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.InspectNetworkCmd;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class InspectNetworkCmdExec extends AbstrSyncDockerCmdExec<InspectNetworkCmd, Network> implements
+        InspectNetworkCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InspectNetworkCmdExec.class);
+
+    public InspectNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Network execute(InspectNetworkCmd command) {
+        WebTarget webResource = getBaseResource().path("/networks/{id}").resolveTemplate("id", command.getNetworkId());
+
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<Network>() {
+        });
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java
new file mode 100644
index 000000000..8f370642f
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java
@@ -0,0 +1,37 @@
+package com.github.dockerjava.netty.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
+public class ListNetworksCmdExec extends AbstrSyncDockerCmdExec<ListNetworksCmd, List<Network>> implements
+        ListNetworksCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ListNetworksCmdExec.class);
+
+    public ListNetworksCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected List<Network> execute(ListNetworksCmd command) {
+        WebTarget webTarget = getBaseResource().path("/networks");
+
+        if (command.getFilters() != null)
+            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters().toString()));
+
+        LOGGER.trace("GET: {}", webTarget);
+
+        return webTarget.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<List<Network>>() {
+        });
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExec.java
new file mode 100644
index 000000000..deb52100d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExec.java
@@ -0,0 +1,29 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RemoveNetworkCmdExec extends AbstrSyncDockerCmdExec<RemoveNetworkCmd, Void> implements
+        RemoveNetworkCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveNetworkCmdExec.class);
+
+    public RemoveNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(RemoveNetworkCmd command) {
+        WebTarget webTarget = getBaseResource().path("/networks/" + command.getNetworkId());
+
+        LOGGER.trace("DELETE: {}", webTarget);
+        webTarget.request().accept(MediaType.APPLICATION_JSON).delete();
+
+        return null;
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 8751e07e5..37e2916e6 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -12,6 +12,7 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.LineIterator;
+import org.apache.commons.lang.StringUtils;
 import org.hamcrest.FeatureMatcher;
 import org.hamcrest.Matcher;
 import org.slf4j.Logger;
@@ -24,6 +25,7 @@
 import com.github.dockerjava.api.command.InspectContainerResponse.Mount;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.core.DockerClientBuilder;
 import com.github.dockerjava.core.DockerClientConfig;
@@ -118,6 +120,15 @@ public void afterMethod(ITestResult result) {
             }
         }
 
+        for (String networkId : dockerCmdExecFactory.getNetworkIds()) {
+            LOG.info("Cleaning up temporary network with {}", networkId);
+            try {
+                dockerClient.removeNetworkCmd(networkId).exec();
+            } catch (DockerException ignore) {
+                // ignore.printStackTrace();
+            }
+        }
+
         LOG.info("################################## END OF {} ##################################\n", result.getName());
     }
 
@@ -232,4 +243,16 @@ protected String buildImage(File baseDir) throws Exception {
                 .awaitImageId();
     }
 
+    protected Network findNetwork(List<Network> networks, String name) {
+
+        for (Network network : networks) {
+            if (StringUtils.equals(network.getName(), name)) {
+                return network;
+            }
+        }
+
+        fail("No network found.");
+        return null;
+    }
+
 }
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index 8128bb915..50860789b 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -6,52 +6,8 @@
 import java.util.List;
 
 import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.command.AttachContainerCmd;
+import com.github.dockerjava.api.command.*;
 import com.github.dockerjava.api.command.AuthCmd.Exec;
-import com.github.dockerjava.api.command.BuildImageCmd;
-import com.github.dockerjava.api.command.CommitCmd;
-import com.github.dockerjava.api.command.ContainerDiffCmd;
-import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
-import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
-import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
-import com.github.dockerjava.api.command.CreateContainerCmd;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.CreateImageCmd;
-import com.github.dockerjava.api.command.CreateImageResponse;
-import com.github.dockerjava.api.command.CreateVolumeCmd;
-import com.github.dockerjava.api.command.CreateVolumeResponse;
-import com.github.dockerjava.api.command.DockerCmdExecFactory;
-import com.github.dockerjava.api.command.EventsCmd;
-import com.github.dockerjava.api.command.ExecCreateCmd;
-import com.github.dockerjava.api.command.ExecStartCmd;
-import com.github.dockerjava.api.command.InfoCmd;
-import com.github.dockerjava.api.command.InspectContainerCmd;
-import com.github.dockerjava.api.command.InspectExecCmd;
-import com.github.dockerjava.api.command.InspectImageCmd;
-import com.github.dockerjava.api.command.InspectVolumeCmd;
-import com.github.dockerjava.api.command.KillContainerCmd;
-import com.github.dockerjava.api.command.ListContainersCmd;
-import com.github.dockerjava.api.command.ListImagesCmd;
-import com.github.dockerjava.api.command.ListVolumesCmd;
-import com.github.dockerjava.api.command.LogContainerCmd;
-import com.github.dockerjava.api.command.PauseContainerCmd;
-import com.github.dockerjava.api.command.PingCmd;
-import com.github.dockerjava.api.command.PullImageCmd;
-import com.github.dockerjava.api.command.PushImageCmd;
-import com.github.dockerjava.api.command.RemoveContainerCmd;
-import com.github.dockerjava.api.command.RemoveImageCmd;
-import com.github.dockerjava.api.command.RemoveVolumeCmd;
-import com.github.dockerjava.api.command.RestartContainerCmd;
-import com.github.dockerjava.api.command.SaveImageCmd;
-import com.github.dockerjava.api.command.SearchImagesCmd;
-import com.github.dockerjava.api.command.StartContainerCmd;
-import com.github.dockerjava.api.command.StatsCmd;
-import com.github.dockerjava.api.command.StopContainerCmd;
-import com.github.dockerjava.api.command.TagImageCmd;
-import com.github.dockerjava.api.command.TopContainerCmd;
-import com.github.dockerjava.api.command.UnpauseContainerCmd;
-import com.github.dockerjava.api.command.VersionCmd;
-import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.BuildResponseItem;
 
 /**
@@ -68,6 +24,8 @@ public class TestDockerCmdExecFactory implements DockerCmdExecFactory {
 
     private List<String> volumeNames = new ArrayList<String>();
 
+    private List<String> networkIds = new ArrayList<>();
+
     private DockerCmdExecFactory delegate;
 
     public TestDockerCmdExecFactory(DockerCmdExecFactory delegate) {
@@ -349,6 +307,51 @@ public ListVolumesCmd.Exec createListVolumesCmdExec() {
         return delegate.createListVolumesCmdExec();
     }
 
+    @Override
+    public ListNetworksCmd.Exec createListNetworksCmdExec() {
+        return delegate.createListNetworksCmdExec();
+    }
+
+    @Override
+    public InspectNetworkCmd.Exec createInspectNetworkCmdExec() {
+        return delegate.createInspectNetworkCmdExec();
+    }
+
+    @Override
+    public CreateNetworkCmd.Exec createCreateNetworkCmdExec() {
+
+        return new CreateNetworkCmd.Exec() {
+            @Override
+            public CreateNetworkResponse exec(CreateNetworkCmd command) {
+                CreateNetworkResponse result = delegate.createCreateNetworkCmdExec().exec(command);
+                networkIds.add(result.getId());
+                return result;
+            }
+        };
+    }
+
+    @Override
+    public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() {
+        return new RemoveNetworkCmd.Exec() {
+            @Override
+            public Void exec(RemoveNetworkCmd command) {
+                delegate.createRemoveNetworkCmdExec().exec(command);
+                networkIds.remove(command.getNetworkId());
+                return null;
+            }
+        };
+    }
+
+    @Override
+    public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() {
+        return delegate.createConnectToNetworkCmdExec();
+    }
+
+    @Override
+    public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() {
+        return delegate.createDisconnectFromNetworkCmdExec();
+    }
+
     public List<String> getContainerNames() {
         return new ArrayList<String>(containerNames);
     }
@@ -360,4 +363,8 @@ public List<String> getImageNames() {
     public List<String> getVolumeNames() {
         return new ArrayList<String>(volumeNames);
     }
+
+    public List<String> getNetworkIds() {
+        return new ArrayList<>(networkIds);
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java
new file mode 100644
index 000000000..ad051e0bd
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java
@@ -0,0 +1,59 @@
+package com.github.dockerjava.core.command;
+
+import java.lang.reflect.Method;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class ConnectToNetworkCmdImplTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void connectToNetwork() throws InterruptedException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        CreateNetworkResponse network = dockerClient.createNetworkCmd().withName("testNetwork").exec();
+
+        dockerClient.connectToNetworkCmd().withNetworkId(network.getId()).withContainerId(container.getId()).exec();
+
+        Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
+
+        assertTrue(updatedNetwork.getContainers().containsKey(container.getId()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertNotNull(inspectContainerResponse.getNetworkSettings().getNetworks().get("testNetwork"));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
new file mode 100644
index 000000000..eefeb535f
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
@@ -0,0 +1,52 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+
+@Test(groups = "integration")
+public class CreateNetworkCmdImplTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void createNetwork() throws DockerException {
+
+        String networkName = "testNetwork";
+
+        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).exec();
+
+        assertNotNull(createNetworkResponse.getId());
+
+        Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
+        assertEquals(network.getName(), networkName);
+        assertEquals(network.getDriver(), "bridge");
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImplTest.java
new file mode 100644
index 000000000..7f94c5a0f
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImplTest.java
@@ -0,0 +1,59 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+
+@Test(groups = "integration")
+public class DisconnectFromNetworkCmdImplTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void disconnectFromNetwork() throws InterruptedException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        CreateNetworkResponse network = dockerClient.createNetworkCmd().withName("testNetwork").exec();
+
+        dockerClient.connectToNetworkCmd().withNetworkId(network.getId()).withContainerId(container.getId()).exec();
+
+        Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
+
+        assertTrue(updatedNetwork.getContainers().containsKey(container.getId()));
+
+        dockerClient.disconnectFromNetworkCmd().withNetworkId(network.getId()).withContainerId(container.getId()).exec();
+
+        updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
+
+        assertFalse(updatedNetwork.getContainers().containsKey(container.getId()));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
index cf555a28a..e11ff6839 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
@@ -87,4 +87,19 @@ public void inspectContainerRestartCount() throws DockerException {
 
         assertThat(inspectContainerResponse.getRestartCount(), equalTo(0));
     }
+
+    @Test
+    public void inspectContainerNetworkSettings() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCmd("env").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertFalse(inspectContainerResponse.getNetworkSettings().getHairpinMode());
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
index 4f88b6317..4e87d5abf 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
@@ -6,7 +6,6 @@
 import static org.hamcrest.Matchers.not;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.security.SecureRandom;
 
@@ -47,10 +46,10 @@ public void afterMethod(ITestResult result) {
     }
 
     @Test(groups = "ignoreInCircleCi")
-    public void inspectExecTest() throws IOException {
+    public void inspectExec() throws IOException {
         String containerName = "generated_" + new SecureRandom().nextInt();
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withName(containerName).exec();
         LOG.info("Created container {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
@@ -70,9 +69,8 @@ public void inspectExecTest() throws IOException {
         dockerClient.execStartCmd(container.getId())
                 .withExecId(checkFileCmdCreateResponse.getId()).exec(new ExecStartResultCallback(System.out, System.err));
 
-
         InspectExecResponse first = dockerClient.inspectExecCmd(checkFileCmdCreateResponse.getId()).exec();
-        assertThat(first.getExitCode(), is(1));
+        assertThat(first.getExitCode(), is(0));
 
         // Create the file
         dockerClient.execStartCmd(container.getId())
@@ -93,4 +91,26 @@ public void inspectExecTest() throws IOException {
         assertEquals(containerInfo.getId(), container.getId());
         JSONTestHelper.testRoundTrip(containerInfo);
     }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void inspectExecNetworkSettings() throws IOException {
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName(containerName).exec();
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        ExecCreateCmdResponse exec = dockerClient.execCreateCmd(container.getId())
+                .withAttachStdout(true).withAttachStderr(true).withCmd("/bin/bash").exec();
+        LOG.info("Created exec {}", exec.toString());
+        assertThat(exec.getId(), not(isEmptyString()));
+
+        InspectExecResponse inspectExecResponse = dockerClient.inspectExecCmd(exec.getId()).exec();
+        assertThat(inspectExecResponse.getExitCode(), is(0));
+
+        assertNotNull(inspectExecResponse.getContainer().getNetworkSettings().getNetworks().get("bridge"));
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectNetworkCmdImplTest.java
new file mode 100644
index 000000000..9d992eb15
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/InspectNetworkCmdImplTest.java
@@ -0,0 +1,57 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+@Test(groups = "integration")
+public class InspectNetworkCmdImplTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void inspectNetwork() throws DockerException {
+
+        List<Network> networks = dockerClient.listNetworksCmd().exec();
+
+        Network expected = findNetwork(networks, "bridge");
+
+        Network network = dockerClient.inspectNetworkCmd().withNetworkId(expected.getId()).exec();
+
+        assertThat(network.getName(), equalTo(expected.getName()));
+        assertThat(network.getScope(), equalTo(expected.getScope()));
+        assertThat(network.getDriver(), equalTo(expected.getDriver()));
+        assertThat(network.getIpam().getConfig().get(0).getSubnet(), equalTo(expected.getIpam().getConfig().get(0).getSubnet()));
+        assertThat(network.getIpam().getDriver(), equalTo(expected.getIpam().getDriver()));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/ListNetworksCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListNetworksCmdImplTest.java
new file mode 100644
index 000000000..192adb4bc
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/ListNetworksCmdImplTest.java
@@ -0,0 +1,55 @@
+package com.github.dockerjava.core.command;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+
+@Test(groups = "integration")
+public class ListNetworksCmdImplTest extends AbstractDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void listNetworks() throws DockerException {
+
+        List<Network> networks = dockerClient.listNetworksCmd().exec();
+
+        Network network = findNetwork(networks, "bridge");
+
+        assertThat(network.getName(), equalTo("bridge"));
+        assertThat(network.getScope(), equalTo("local"));
+        assertThat(network.getDriver(), equalTo("bridge"));
+        assertThat(network.getIpam().getDriver(), equalTo("default"));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveNetworkCmdImplTest.java
new file mode 100644
index 000000000..e1e4e45fe
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/RemoveNetworkCmdImplTest.java
@@ -0,0 +1,76 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+import org.hamcrest.Matcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.startsWith;
+import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
+
+@Test(groups = "integration")
+public class RemoveNetworkCmdImplTest extends AbstractDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(RemoveNetworkCmdImplTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void removeNetwork() throws DockerException {
+
+        CreateNetworkResponse network = dockerClient.createNetworkCmd().withName("test-network").exec();
+
+        LOG.info("Removing network: {}", network.getId());
+        dockerClient.removeNetworkCmd(network.getId()).exec();
+
+        List<Network> networks = dockerClient.listNetworksCmd().exec();
+
+        Matcher matcher = not(hasItem(hasField("id", startsWith(network.getId()))));
+        assertThat(networks, matcher);
+
+    }
+
+    @Test
+    public void removeNonExistingContainer() throws DockerException {
+        try {
+            dockerClient.removeNetworkCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
new file mode 100644
index 000000000..fa9962826
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
@@ -0,0 +1,52 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+
+@Test(groups = "integration")
+public class CreateNetworkCmdExecTest extends AbstractNettyDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void createNetwork() throws DockerException {
+
+        String networkName = "testNetwork";
+
+        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).exec();
+
+        assertNotNull(createNetworkResponse.getId());
+
+        Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
+        assertEquals(network.getName(), networkName);
+        assertEquals(network.getDriver(), "bridge");
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
index 31116ef22..f63dda273 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
@@ -87,4 +87,19 @@ public void inspectContainerRestartCount() throws DockerException {
 
         assertThat(inspectContainerResponse.getRestartCount(), equalTo(0));
     }
+
+    @Test
+    public void inspectContainerNetworkSettings() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCmd("env").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertNotNull(inspectContainerResponse.getNetworkSettings().getNetworks().get("bridge"));
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
index fc3bb089b..efeba6e99 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
@@ -97,4 +97,26 @@ public void inspectExecTest() throws IOException {
         assertEquals(containerInfo.getId(), container.getId());
         JSONTestHelper.testRoundTrip(containerInfo);
     }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void inspectExecNetworkSettings() throws IOException {
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName(containerName).exec();
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        ExecCreateCmdResponse exec = dockerClient.execCreateCmd(container.getId())
+                .withAttachStdout(true).withAttachStderr(true).withCmd("/bin/bash").exec();
+        LOG.info("Created exec {}", exec.toString());
+        assertThat(exec.getId(), not(isEmptyString()));
+
+        InspectExecResponse inspectExecResponse = dockerClient.inspectExecCmd(exec.getId()).exec();
+        assertThat(inspectExecResponse.getExitCode(), is(0));
+
+        assertNotNull(inspectExecResponse.getContainer().getNetworkSettings().getNetworks().get("bridge"));
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectNetworkCmdExecTest.java
new file mode 100644
index 000000000..7cbab660b
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectNetworkCmdExecTest.java
@@ -0,0 +1,57 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+@Test(groups = "integration")
+public class InspectNetworkCmdExecTest extends AbstractNettyDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void inspectNetwork() throws DockerException {
+
+        List<Network> networks = dockerClient.listNetworksCmd().exec();
+
+        Network expected = findNetwork(networks, "bridge");
+
+        Network network = dockerClient.inspectNetworkCmd().withNetworkId(expected.getId()).exec();
+
+        assertThat(network.getName(), equalTo(expected.getName()));
+        assertThat(network.getScope(), equalTo(expected.getScope()));
+        assertThat(network.getDriver(), equalTo(expected.getDriver()));
+        assertThat(network.getIpam().getConfig().get(0).getSubnet(), equalTo(expected.getIpam().getConfig().get(0).getSubnet()));
+        assertThat(network.getIpam().getDriver(), equalTo(expected.getIpam().getDriver()));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ListNetworksCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ListNetworksCmdExecTest.java
new file mode 100644
index 000000000..8a5d975f0
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/ListNetworksCmdExecTest.java
@@ -0,0 +1,55 @@
+package com.github.dockerjava.netty.exec;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+
+@Test(groups = "integration")
+public class ListNetworksCmdExecTest extends AbstractNettyDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void listNetworks() throws DockerException {
+
+        List<Network> networks = dockerClient.listNetworksCmd().exec();
+
+        Network network = findNetwork(networks, "bridge");
+
+        assertThat(network.getName(), equalTo("bridge"));
+        assertThat(network.getScope(), equalTo("local"));
+        assertThat(network.getDriver(), equalTo("bridge"));
+        assertThat(network.getIpam().getDriver(), equalTo("default"));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExecTest.java
new file mode 100644
index 000000000..9fda49f21
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExecTest.java
@@ -0,0 +1,76 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+import org.hamcrest.Matcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.startsWith;
+import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
+
+@Test(groups = "integration")
+public class RemoveNetworkCmdExecTest extends AbstractNettyDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(RemoveNetworkCmdExecTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void removeNetwork() throws DockerException {
+
+        CreateNetworkResponse network = dockerClient.createNetworkCmd().withName("test-network").exec();
+
+        LOG.info("Removing network: {}", network.getId());
+        dockerClient.removeNetworkCmd(network.getId()).exec();
+
+        List<Network> networks = dockerClient.listNetworksCmd().exec();
+
+        Matcher matcher = not(hasItem(hasField("id", startsWith(network.getId()))));
+        assertThat(networks, matcher);
+
+    }
+
+    @Test
+    public void removeNonExistingContainer() throws DockerException {
+        try {
+            dockerClient.removeNetworkCmd("non-existing").exec();
+            fail("expected NotFoundException");
+        } catch (NotFoundException e) {
+        }
+    }
+
+}

From aabf07b17e03742f9cbb1cd186df87ed1b9fb30b Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Mon, 18 Jan 2016 21:01:58 +0100
Subject: [PATCH 0366/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b0b38327..c6d7b5550 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ Notes
 * The upcoming release will contain multiple API breaking changes therefore the major version switch. It will support a subset of v.1.21 of the docker remote API. It also includes an experimental netty based implementation of `DockerCmdExecFactory` that probably will replace the current jersey/httpclient based one in a later release.
 
 All changes
+* [#425] (https://github.com/docker-java/docker-java/pull/425) Implement Network API
 * [#410] (https://github.com/docker-java/docker-java/pull/410) Support for build-args of docker build 
 * [#408] (https://github.com/docker-java/docker-java/pull/408) Support for volume API
 * [#406] (https://github.com/docker-java/docker-java/pull/406) Added RestartCount to InspectContainerResponse

From acfe65de6f4ef1392a9bc561a01d88268ef9869b Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Mon, 18 Jan 2016 21:53:13 +0100
Subject: [PATCH 0367/1272] Refactored filters API

---
 .../dockerjava/api/command/EventsCmd.java     | 49 ++++++++++++---
 .../api/command/ListContainersCmd.java        | 62 ++++++++++++++-----
 .../dockerjava/api/command/ListImagesCmd.java | 32 +++++++---
 .../api/command/ListNetworksCmd.java          |  8 ++-
 .../api/command/ListVolumesCmd.java           | 13 ++--
 .../dockerjava/api/model/EventFilters.java    | 37 -----------
 .../dockerjava/api/model/NetworkFilters.java  | 15 -----
 .../api/model/PullResponseItem.java           |  1 -
 .../core/command/EventsCmdImpl.java           | 45 +++++++++++---
 .../core/command/ListContainersCmdImpl.java   | 49 +++++++++------
 .../core/command/ListImagesCmdImpl.java       | 56 +++++++++++++----
 .../core/command/ListNetworksCmdImpl.java     | 23 ++++---
 .../core/command/ListVolumesCmdImpl.java      | 16 +++--
 .../util/FiltersBuilder.java}                 | 39 ++++--------
 .../dockerjava/core/util/FiltersEncoder.java  | 30 +++++++++
 .../dockerjava/jaxrs/EventsCmdExec.java       |  5 +-
 .../jaxrs/ListContainersCmdExec.java          |  3 +-
 .../dockerjava/jaxrs/ListImagesCmdExec.java   | 10 ++-
 .../dockerjava/jaxrs/ListNetworksCmdExec.java |  7 ++-
 .../dockerjava/jaxrs/ListVolumesCmdExec.java  |  5 +-
 .../dockerjava/netty/exec/EventsCmdExec.java  |  5 +-
 .../netty/exec/ListContainersCmdExec.java     |  3 +-
 .../netty/exec/ListImagesCmdExec.java         |  5 +-
 .../netty/exec/ListNetworksCmdExec.java       |  6 +-
 .../netty/exec/ListVolumesCmdExec.java        |  5 +-
 .../dockerjava/api/model/FiltersTest.java     | 58 -----------------
 .../core/command/EventsCmdImplTest.java       |  3 +-
 .../command/ListContainersCmdImplTest.java    |  5 +-
 .../core/command/ListImagesCmdImplTest.java   |  7 +--
 .../core/util/FiltersBuilderTest.java         | 61 ++++++++++++++++++
 .../netty/exec/EventsCmdExecTest.java         |  3 +-
 .../netty/exec/ListContainersCmdExecTest.java |  6 +-
 .../netty/exec/ListImagesCmdExecTest.java     |  8 +--
 33 files changed, 412 insertions(+), 268 deletions(-)
 delete mode 100644 src/main/java/com/github/dockerjava/api/model/EventFilters.java
 delete mode 100644 src/main/java/com/github/dockerjava/api/model/NetworkFilters.java
 rename src/main/java/com/github/dockerjava/{api/model/Filters.java => core/util/FiltersBuilder.java} (66%)
 create mode 100644 src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
 delete mode 100644 src/test/java/com/github/dockerjava/api/model/FiltersTest.java
 create mode 100644 src/test/java/com/github/dockerjava/core/util/FiltersBuilderTest.java

diff --git a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java b/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
index 4020a8e72..8c03270df 100644
--- a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
@@ -1,22 +1,19 @@
 package com.github.dockerjava.api.command;
 
+import java.util.List;
+import java.util.Map;
+
 import javax.annotation.CheckForNull;
 
 import com.github.dockerjava.api.model.Event;
-import com.github.dockerjava.api.model.Filters;
 
 /**
  * Get events
- *
- * @param since
- *            - Show all events created since timestamp
- * @param until
- *            - Stream events until this timestamp
  */
 public interface EventsCmd extends AsyncDockerCmd<EventsCmd, Event> {
 
     @CheckForNull
-    public Filters getFilters();
+    public Map<String, List<String>> getFilters();
 
     @CheckForNull
     public String getSince();
@@ -24,10 +21,46 @@ public interface EventsCmd extends AsyncDockerCmd<EventsCmd, Event> {
     @CheckForNull
     public String getUntil();
 
-    public EventsCmd withFilters(Filters filters);
+    /**
+     * @param container
+     *            - container to filter
+     */
+    public EventsCmd withContainerFilter(String... container);
+
+    /**
+     * @param event
+     *            - event to filter (pull | create | attach | start | stop | kill)
+     */
+    public EventsCmd withEventFilter(String... event);
+
+    /**
+     * @param image
+     *            - image to filter
+     */
+    public EventsCmd withImageFilter(String... image);
+
+    /**
+     * @param label
+     *            - label to filter
+     */
+    public EventsCmd withLabelFilter(String... label);
+
+    /**
+     * @param labels
+     *            - labels to filter (map of names and values)
+     */
+    public EventsCmd withLabelFilter(Map<String, String> labels);
 
+    /**
+     * @param since
+     *            - Show all events created since timestamp
+     */
     public EventsCmd withSince(String since);
 
+    /**
+     * @param until
+     *            - Show all events created until timestamp
+     */
     public EventsCmd withUntil(String until);
 
     public static interface Exec extends DockerCmdAsyncExec<EventsCmd, Event> {
diff --git a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
index 87faec0b3..842f242cc 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
@@ -1,26 +1,15 @@
 package com.github.dockerjava.api.command;
 
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.CheckForNull;
 
 import com.github.dockerjava.api.model.Container;
-import com.github.dockerjava.api.model.Filters;
 
 /**
  * List containers
  *
- * @param showAll
- *            - true or false, Show all containers. Only running containers are shown by default.
- * @param showSize
- *            - true or false, Show the containers sizes. This is false by default.
- * @param limit
- *            - Show `limit` last created containers, include non-running ones. There is no limit by default.
- * @param sinceId
- *            - Show only containers created since Id, include non-running ones.
- * @param beforeId
- *            - Show only containers created before Id, include non-running ones.
- *
  */
 public interface ListContainersCmd extends SyncDockerCmd<List<Container>> {
 
@@ -28,7 +17,7 @@ public interface ListContainersCmd extends SyncDockerCmd<List<Container>> {
     public String getBeforeId();
 
     @CheckForNull
-    public Filters getFilters();
+    public Map<String, List<String>> getFilters();
 
     @CheckForNull
     public Integer getLimit();
@@ -42,16 +31,59 @@ public interface ListContainersCmd extends SyncDockerCmd<List<Container>> {
     @CheckForNull
     public Boolean hasShowSizeEnabled();
 
+    /**
+     * @param beforeId
+     *            - Show only containers created before Id, include non-running ones.
+     */
     public ListContainersCmd withBefore(String before);
 
-    public ListContainersCmd withFilters(Filters filters);
-
+    /**
+     * @param exitcode
+     *            - Show only containers that exited with the passed exitcode.
+     */
+    public ListContainersCmd withExitcodeFilter(Integer exitcode);
+
+    /**
+     * @param exitcode
+     *            - Show only containers with the passed status (created|restarting|running|paused|exited).
+     */
+    public ListContainersCmd withStatusFilter(String status);
+
+    /**
+     * @param labels
+     *            - Show only containers with the passed labels.
+     */
+    public ListContainersCmd withLabelFilter(String... labels);
+
+    /**
+     * @param labels
+     *            - Show only containers with the passed labels. Labels is a {@link Map} that contains label keys and
+     *            values
+     */
+    public ListContainersCmd withLabelFilter(Map<String, String> labels);
+
+    /**
+     * @param limit
+     *            - Show `limit` last created containers, include non-running ones. There is no limit by default.
+     */
     public ListContainersCmd withLimit(Integer limit);
 
+    /**
+     * @param showAll
+     *            - Show all containers. Only running containers are shown by default.
+     */
     public ListContainersCmd withShowAll(Boolean showAll);
 
+    /**
+     * @param showSize
+     *            - Show the containers sizes. This is false by default.
+     */
     public ListContainersCmd withShowSize(Boolean showSize);
 
+    /**
+     * @param sinceId
+     *            - Show only containers created since Id, include non-running ones.
+     */
     public ListContainersCmd withSince(String since);
 
     public static interface Exec extends DockerCmdSyncExec<ListContainersCmd, List<Container>> {
diff --git a/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java b/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
index 3ef40f48f..7dee8c918 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.CheckForNull;
 
@@ -8,23 +9,40 @@
 
 /**
  * List images
- *
- * @param showAll
- *            - Show all images (by default filter out the intermediate images used to build)
- * @param filters
- *            - a json encoded value of the filters (a map[string][]string) to process on the images list.
  */
 public interface ListImagesCmd extends SyncDockerCmd<List<Image>> {
 
     @CheckForNull
-    public String getFilters();
+    public Map<String, List<String>> getFilters();
+
+    public String getImageNameFilter();
 
     @CheckForNull
     public Boolean hasShowAllEnabled();
 
+    /**
+     * Show all images (by default filter out the intermediate images used to build)
+     */
     public ListImagesCmd withShowAll(Boolean showAll);
 
-    public ListImagesCmd withFilters(String filters);
+    public ListImagesCmd withImageNameFilter(String imageName);
+
+    /**
+     * Filter dangling images
+     */
+    public ListImagesCmd withDanglingFilter(Boolean dangling);
+
+    /**
+     * @param labels
+     *            - string array in the form ["key"] or ["key=value"] or a mix of both
+     */
+    public ListImagesCmd withLabelFilter(String... label);
+
+    /**
+     * @param labels
+     *            - {@link Map} of labels that contains label keys and values
+     */
+    public ListImagesCmd withLabelFilter(Map<String, String> labels);
 
     public static interface Exec extends DockerCmdSyncExec<ListImagesCmd, List<Image>> {
     }
diff --git a/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java b/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
index 2b5b29996..dd3c89c7b 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
@@ -1,12 +1,12 @@
 package com.github.dockerjava.api.command;
 
-import com.github.dockerjava.api.model.Filters;
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.CheckForNull;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * List networks.
@@ -16,9 +16,11 @@
 public interface ListNetworksCmd extends SyncDockerCmd<List<Network>> {
 
     @CheckForNull
-    public Filters getFilters();
+    public Map<String, List<String>> getFilters();
 
-    ListNetworksCmd withFilters(Filters filters);
+    ListNetworksCmd withNameFilter(String... networkName);
+
+    ListNetworksCmd withIdFilter(String... networkId);
 
     public static interface Exec extends DockerCmdSyncExec<ListNetworksCmd, List<Network>> {
     }
diff --git a/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java b/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java
index f900f1967..a049aa20f 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java
@@ -1,24 +1,25 @@
 package com.github.dockerjava.api.command;
 
+import java.util.List;
+import java.util.Map;
+
 import javax.annotation.CheckForNull;
 
 /**
  * List volumes.
  *
- *
  * @author Marcus Linke
  */
 public interface ListVolumesCmd extends SyncDockerCmd<ListVolumesResponse> {
 
     @CheckForNull
-    public String getFilters();
+    public Map<String, List<String>> getFilters();
 
     /**
-     * @param filters
-     *            - JSON encoded value of the filters (a map[string][]string) to process on the volumes list. There is
-     *            one available filter: dangling=true
+     * @param dangling
+     *            - Show dangling volumes filter
      */
-    public ListVolumesCmd withFilters(String filters);
+    public ListVolumesCmd withDanglingFilter(Boolean dangling);
 
     public static interface Exec extends DockerCmdSyncExec<ListVolumesCmd, ListVolumesResponse> {
     }
diff --git a/src/main/java/com/github/dockerjava/api/model/EventFilters.java b/src/main/java/com/github/dockerjava/api/model/EventFilters.java
deleted file mode 100644
index 08cb7ad11..000000000
--- a/src/main/java/com/github/dockerjava/api/model/EventFilters.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.github.dockerjava.api.model;
-
-import java.util.List;
-
-/**
- * Representation of a Docker event filter.
- *
- * @author Carlos Sanchez <carlos@apache.org>
- * 
- */
-public class EventFilters extends Filters {
-
-    /**
-     * Default constructor for the deserialization.
-     */
-    public EventFilters() {
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param event
-     *            event to filter
-     */
-    public EventFilters(String... event) {
-        super();
-        withEvent(event);
-    }
-
-    public Filters withEvent(String... event) {
-        return withFilter("event", event);
-    }
-
-    public List<String> getEvent() {
-        return getFilter("event");
-    }
-}
diff --git a/src/main/java/com/github/dockerjava/api/model/NetworkFilters.java b/src/main/java/com/github/dockerjava/api/model/NetworkFilters.java
deleted file mode 100644
index f3c837643..000000000
--- a/src/main/java/com/github/dockerjava/api/model/NetworkFilters.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.github.dockerjava.api.model;
-
-/**
- * Created by andrewk on 1/5/16.
- */
-public class NetworkFilters extends Filters {
-
-    public Filters withNames(String... names) {
-        return withFilter("name", names);
-    }
-
-    public Filters withIds(String... ids) {
-        return withFilter("id", ids);
-    }
-}
diff --git a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
index c18d12bd0..3ab77bee0 100644
--- a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
@@ -33,5 +33,4 @@ public boolean isPullSuccessIndicated() {
         return (getStatus().contains(DOWNLOAD_COMPLETE) || getStatus().contains(IMAGE_UP_TO_DATE)
                 || getStatus().contains(DOWNLOADED_NEWER_IMAGE) || getStatus().contains(LEGACY_REGISTRY));
     }
-
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
index 9bd34e57d..230f6dd5a 100644
--- a/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
@@ -2,9 +2,12 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.util.List;
+import java.util.Map;
+
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.model.Event;
-import com.github.dockerjava.api.model.Filters;
+import com.github.dockerjava.core.util.FiltersBuilder;
 
 /**
  * Stream docker events
@@ -15,7 +18,7 @@ public class EventsCmdImpl extends AbstrAsyncDockerCmd<EventsCmd, Event> impleme
 
     private String until;
 
-    private Filters filters;
+    private FiltersBuilder filters = new FiltersBuilder();
 
     public EventsCmdImpl(EventsCmd.Exec exec) {
         super(exec);
@@ -34,9 +37,37 @@ public EventsCmd withUntil(String until) {
     }
 
     @Override
-    public EventsCmd withFilters(Filters filters) {
-        checkNotNull(filters, "filters have not been specified");
-        this.filters = filters;
+    public EventsCmd withContainerFilter(String... container) {
+        checkNotNull(container, "container have not been specified");
+        this.filters.withContainers(container);
+        return this;
+    }
+
+    @Override
+    public EventsCmd withImageFilter(String... image) {
+        checkNotNull(image, "image have not been specified");
+        this.filters.withImages(image);
+        return this;
+    }
+
+    @Override
+    public EventsCmd withEventFilter(String... event) {
+        checkNotNull(event, "event have not been specified");
+        this.filters.withFilter("event", event);
+        return this;
+    }
+
+    @Override
+    public EventsCmd withLabelFilter(String... label) {
+        checkNotNull(label, "label have not been specified");
+        this.filters.withLabels(label);
+        return this;
+    }
+
+    @Override
+    public EventsCmd withLabelFilter(Map<String, String> labels) {
+        checkNotNull(labels, "labels have not been specified");
+        this.filters.withLabels(labels);
         return this;
     }
 
@@ -51,8 +82,8 @@ public String getUntil() {
     }
 
     @Override
-    public Filters getFilters() {
-        return filters;
+    public Map<String, List<String>> getFilters() {
+        return filters.build();
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
index b7a70603d..8e8e194da 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
@@ -4,25 +4,14 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.List;
+import java.util.Map;
 
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.model.Container;
-import com.github.dockerjava.api.model.Filters;
+import com.github.dockerjava.core.util.FiltersBuilder;
 
 /**
- * List containers
- *
- * @param showAll
- *            - true or false, Show all containers. Only running containers are shown by default.
- * @param showSize
- *            - true or false, Show the containers sizes. This is false by default.
- * @param limit
- *            - Show `limit` last created containers, include non-running ones. There is no limit by default.
- * @param sinceId
- *            - Show only containers created since Id, include non-running ones.
- * @param beforeId
- *            - Show only containers created before Id, include non-running ones.
- *
+ * List containers.
  */
 public class ListContainersCmdImpl extends AbstrDockerCmd<ListContainersCmd, List<Container>> implements
         ListContainersCmd {
@@ -33,7 +22,7 @@ public class ListContainersCmdImpl extends AbstrDockerCmd<ListContainersCmd, Lis
 
     private String sinceId, beforeId;
 
-    private Filters filters;
+    private FiltersBuilder filters = new FiltersBuilder();
 
     public ListContainersCmdImpl(ListContainersCmd.Exec exec) {
         super(exec);
@@ -65,8 +54,8 @@ public String getBeforeId() {
     }
 
     @Override
-    public Filters getFilters() {
-        return filters;
+    public Map<String, List<String>> getFilters() {
+        return filters.build();
     }
 
     @Override
@@ -104,10 +93,30 @@ public ListContainersCmd withBefore(String before) {
     }
 
     @Override
-    public ListContainersCmd withFilters(Filters filters) {
-        checkNotNull(filters, "filters was not specified");
-        this.filters = filters;
+    public ListContainersCmd withLabelFilter(String... labels) {
+        checkNotNull(labels, "labels was not specified");
+        this.filters.withLabels(labels);
         return this;
     }
 
+    @Override
+    public ListContainersCmd withLabelFilter(Map<String, String> labels) {
+        checkNotNull(labels, "labels was not specified");
+        this.filters.withLabels(labels);
+        return this;
+    }
+
+    @Override
+    public ListContainersCmd withExitcodeFilter(Integer exitcode) {
+        checkNotNull(exitcode, "exitcode was not specified");
+        this.filters.withFilter("exitcode", exitcode.toString());
+        return this;
+    }
+
+    @Override
+    public ListContainersCmd withStatusFilter(String status) {
+        checkNotNull(status, "status was not specified");
+        this.filters.withFilter("status", status);
+        return this;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
index 69879b673..d726ca7ce 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
@@ -3,31 +3,33 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
 
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.model.Image;
+import com.github.dockerjava.core.util.FiltersBuilder;
 
 /**
  * List images
- *
- * @param showAll
- *            - Show all images (by default filter out the intermediate images used to build)
- * @param filters
- *            - a json encoded value of the filters (a map[string][]string) to process on the images list.
  */
 public class ListImagesCmdImpl extends AbstrDockerCmd<ListImagesCmd, List<Image>> implements ListImagesCmd {
 
-    private String filters;
+	private String imageNameFilter;
+
+	private Boolean showAll = false;
 
-    private Boolean showAll = false;
+    private FiltersBuilder filters = new FiltersBuilder();
 
     public ListImagesCmdImpl(ListImagesCmd.Exec exec) {
         super(exec);
     }
 
     @Override
-    public String getFilters() {
-        return filters;
+    public Map<String, List<String>> getFilters() {
+        return filters.build();
     }
 
     @Override
@@ -42,10 +44,40 @@ public ListImagesCmd withShowAll(Boolean showAll) {
     }
 
     @Override
-    public ListImagesCmd withFilters(String filter) {
-        checkNotNull(filter, "filters have not been specified");
-        this.filters = filter;
+    public ListImagesCmd withDanglingFilter(Boolean dangling) {
+        checkNotNull(dangling, "dangling have not been specified");
+        filters.withFilter("dangling", dangling.toString());
+        return this;
+    }
+
+    @Override
+    public ListImagesCmd withLabelFilter(String... labels) {
+        checkNotNull(labels, "labels have not been specified");
+        filters.withLabels(labels);
+        return this;
+    }
+
+    @Override
+    public ListImagesCmd withLabelFilter(Map<String, String> labels) {
+        checkNotNull(labels, "labels have not been specified");
+        filters.withLabels(labels);
         return this;
     }
 
+    @Override
+    public ListImagesCmd withImageNameFilter(String imageNameFilter) {
+        checkNotNull(imageNameFilter, "image name filter not specified");
+        this.imageNameFilter = imageNameFilter;
+        return this;
+    }
+
+    @Override
+    public String getImageNameFilter() {
+        return this.imageNameFilter;
+    }
+
+    @Override
+    public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java
index 2303e7c9c..44a9d2cfb 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java
@@ -1,27 +1,34 @@
 package com.github.dockerjava.core.command;
 
 import com.github.dockerjava.api.command.ListNetworksCmd;
-import com.github.dockerjava.api.model.Filters;
 import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.core.util.FiltersBuilder;
 
 import java.util.List;
+import java.util.Map;
 
-public class ListNetworksCmdImpl extends AbstrDockerCmd<ListNetworksCmd, List<Network>> implements
-    ListNetworksCmd {
+public class ListNetworksCmdImpl extends AbstrDockerCmd<ListNetworksCmd, List<Network>> implements ListNetworksCmd {
 
-    private Filters filters;
+    private FiltersBuilder filtersBuilder = new FiltersBuilder();
 
     public ListNetworksCmdImpl(ListNetworksCmd.Exec exec) {
         super(exec);
     }
 
-    @Override public Filters getFilters() {
-        return filters;
+    @Override
+    public Map<String, List<String>> getFilters() {
+        return filtersBuilder.build();
     }
 
-    @Override public ListNetworksCmd withFilters(Filters filters) {
+    @Override
+    public ListNetworksCmd withIdFilter(String... networkId) {
+        this.filtersBuilder.withFilter("id", networkId);
+        return this;
+    }
 
-        this.filters = filters;
+    @Override
+    public ListNetworksCmd withNameFilter(String... networkName) {
+        this.filtersBuilder.withFilter("name", networkName);
         return this;
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java
index af1ca3fae..d9efe7b17 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java
@@ -2,8 +2,12 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.util.List;
+import java.util.Map;
+
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.ListVolumesResponse;
+import com.github.dockerjava.core.util.FiltersBuilder;
 
 /**
  *
@@ -12,21 +16,21 @@
  */
 public class ListVolumesCmdImpl extends AbstrDockerCmd<ListVolumesCmd, ListVolumesResponse> implements ListVolumesCmd {
 
-    private String filters;
+    private FiltersBuilder filters = new FiltersBuilder();
 
     public ListVolumesCmdImpl(ListVolumesCmd.Exec exec) {
         super(exec);
     }
 
     @Override
-    public String getFilters() {
-        return filters;
+    public Map<String, List<String>> getFilters() {
+        return filters.build();
     }
 
     @Override
-    public ListVolumesCmd withFilters(String filter) {
-        checkNotNull(filter, "filters have not been specified");
-        this.filters = filter;
+    public ListVolumesCmd withDanglingFilter(Boolean dangling) {
+        checkNotNull(dangling, "dangling have not been specified");
+        this.filters.withFilter("dangling", dangling.toString());
         return this;
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Filters.java b/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
similarity index 66%
rename from src/main/java/com/github/dockerjava/api/model/Filters.java
rename to src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
index b24dd69db..d6cd0d9f7 100644
--- a/src/main/java/com/github/dockerjava/api/model/Filters.java
+++ b/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.api.model;
+package com.github.dockerjava.core.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -7,29 +7,20 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.ws.rs.core.MediaType;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
-
 /**
  * Representation of Docker filters.
  *
  * @author Carlos Sanchez <carlos@apache.org>
  *
  */
-public class Filters {
-
-    private static ObjectMapper OBJECT_MAPPER = new JacksonJaxbJsonProvider().locateMapper(Map.class,
-            MediaType.APPLICATION_JSON_TYPE);
+public class FiltersBuilder {
 
     private Map<String, List<String>> filters = new HashMap<String, List<String>>();
 
-    public Filters() {
+    public FiltersBuilder() {
     }
 
-    public Filters withFilter(String key, String... value) {
+    public FiltersBuilder withFilter(String key, String... value) {
         filters.put(key, Arrays.asList(value));
         return this;
     }
@@ -38,7 +29,7 @@ public List<String> getFilter(String key) {
         return filters.get(key);
     }
 
-    public Filters withImages(String... image) {
+    public FiltersBuilder withImages(String... image) {
         withFilter("image", image);
         return this;
     }
@@ -47,7 +38,7 @@ public List<String> getImage() {
         return getFilter("image");
     }
 
-    public Filters withContainers(String... container) {
+    public FiltersBuilder withContainers(String... container) {
         withFilter("container", container);
         return this;
     }
@@ -61,9 +52,8 @@ public List<String> getContainer() {
      *
      * @param labels
      *            string array in the form ["key"] or ["key=value"] or a mix of both
-     * @return
      */
-    public Filters withLabels(String... labels) {
+    public FiltersBuilder withLabels(String... labels) {
         withFilter("label", labels);
         return this;
     }
@@ -73,9 +63,8 @@ public Filters withLabels(String... labels) {
      *
      * @param labels
      *            {@link Map} of labels that contains label keys and values
-     * @return
      */
-    public Filters withLabels(Map<String, String> labels) {
+    public FiltersBuilder withLabels(Map<String, String> labels) {
         withFilter("label", labelsMapToList(labels).toArray(new String[labels.size()]));
         return this;
     }
@@ -99,7 +88,7 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass())
             return false;
 
-        Filters filters1 = (Filters) o;
+        FiltersBuilder filters1 = (FiltersBuilder) o;
 
         return filters.equals(filters1.filters);
 
@@ -110,13 +99,7 @@ public int hashCode() {
         return filters.hashCode();
     }
 
-    @Override
-    public String toString() {
-        try {
-            return OBJECT_MAPPER.writeValueAsString(filters);
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
+    public Map<String, List<String>> build() {
+        return filters;
     }
-
 }
diff --git a/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java b/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
new file mode 100644
index 000000000..75f9d48c2
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.core.util;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.ws.rs.core.MediaType;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
+
+/**
+ * JSON Encoder for docker filters.
+ *
+ * @author Carlos Sanchez <carlos@apache.org>
+ *
+ */
+public class FiltersEncoder {
+
+    private static ObjectMapper OBJECT_MAPPER = new JacksonJaxbJsonProvider().locateMapper(Map.class,
+            MediaType.APPLICATION_JSON_TYPE);
+
+    public static String jsonEncode(Map<String, List<String>> filters) {
+        try {
+            return OBJECT_MAPPER.writeValueAsString(filters);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
index 395fde4e0..3d4c8dc17 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -12,6 +12,7 @@
 import com.github.dockerjava.api.model.Event;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.async.JsonStreamProcessor;
+import com.github.dockerjava.core.util.FiltersEncoder;
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
 
@@ -28,9 +29,9 @@ protected AbstractCallbackNotifier<Event> callbackNotifier(EventsCmd command, Re
         WebTarget webTarget = getBaseResource().path("/events").queryParam("since", command.getSince())
                 .queryParam("until", command.getUntil());
 
-        if (command.getFilters() != null) {
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget
-                    .queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters().toString()));
+                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
         }
 
         LOGGER.trace("GET: {}", webTarget);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
index 4031bfa0d..fd882b673 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
@@ -14,6 +14,7 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.model.Container;
 import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.util.FiltersEncoder;
 
 public class ListContainersCmdExec extends AbstrSyncDockerCmdExec<ListContainersCmd, List<Container>> implements
         ListContainersCmd.Exec {
@@ -38,7 +39,7 @@ protected List<Container> execute(ListContainersCmd command) {
 
         if (command.getFilters() != null) {
             webTarget = webTarget
-                    .queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters().toString()));
+                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
         }
 
         LOGGER.trace("GET: {}", webTarget);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
index 9734dfb42..1e7acfc33 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
@@ -14,6 +14,7 @@
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.model.Image;
 import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.util.FiltersEncoder;
 
 public class ListImagesCmdExec extends AbstrSyncDockerCmdExec<ListImagesCmd, List<Image>> implements ListImagesCmd.Exec {
 
@@ -29,8 +30,13 @@ protected List<Image> execute(ListImagesCmd command) {
 
         webTarget = booleanQueryParam(webTarget, "all", command.hasShowAllEnabled());
 
-        if (command.getFilters() != null)
-            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters()));
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
+        	webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+        }
+
+        if (command.getImageNameFilter() != null) {
+        	webTarget = webTarget.queryParam("filter", urlPathSegmentEscaper().escape(command.getImageNameFilter()));
+        }
 
         LOGGER.trace("GET: {}", webTarget);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java
index 80438d433..9137e28d2 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java
@@ -3,12 +3,15 @@
 import com.github.dockerjava.api.command.ListNetworksCmd;
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.util.FiltersEncoder;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MediaType;
+
 import java.util.List;
 
 import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
@@ -26,9 +29,9 @@ public ListNetworksCmdExec(WebTarget baseResource, DockerClientConfig dockerClie
     protected List<Network> execute(ListNetworksCmd command) {
         WebTarget webTarget = getBaseResource().path("/networks");
 
-        if (command.getFilters() != null) {
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget
-                    .queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters().toString()));
+                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
         }
 
         LOGGER.trace("GET: {}", webTarget);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
index 2550db31b..dd877a89a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
@@ -11,6 +11,7 @@
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.ListVolumesResponse;
 import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.util.FiltersEncoder;
 
 public class ListVolumesCmdExec extends AbstrSyncDockerCmdExec<ListVolumesCmd, ListVolumesResponse> implements ListVolumesCmd.Exec {
 
@@ -24,8 +25,8 @@ public ListVolumesCmdExec(WebTarget baseResource, DockerClientConfig dockerClien
     protected ListVolumesResponse execute(ListVolumesCmd command) {
         WebTarget webTarget = getBaseResource().path("/volumes");
 
-        if (command.getFilters() != null)
-            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters()));
+        if (command.getFilters() != null && !command.getFilters().isEmpty())
+            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
 
         LOGGER.trace("GET: {}", webTarget);
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/EventsCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/EventsCmdExec.java
index be1ac0956..f07230c07 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/EventsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/EventsCmdExec.java
@@ -10,6 +10,7 @@
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.model.Event;
 import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.util.FiltersEncoder;
 import com.github.dockerjava.netty.WebTarget;
 
 public class EventsCmdExec extends AbstrAsyncDockerCmdExec<EventsCmd, Event> implements EventsCmd.Exec {
@@ -26,9 +27,9 @@ protected Void execute0(EventsCmd command, ResultCallback<Event> resultCallback)
         WebTarget webTarget = getBaseResource().path("/events").queryParam("since", command.getSince())
                 .queryParam("until", command.getUntil());
 
-        if (command.getFilters() != null) {
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget
-                    .queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters().toString()));
+                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
         }
 
         LOGGER.trace("GET: {}", webTarget);
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
index b45e76cbd..219aebc4b 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
@@ -11,6 +11,7 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.model.Container;
 import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.util.FiltersEncoder;
 import com.github.dockerjava.netty.MediaType;
 import com.github.dockerjava.netty.WebTarget;
 
@@ -37,7 +38,7 @@ protected List<Container> execute(ListContainersCmd command) {
 
         if (command.getFilters() != null) {
             webTarget = webTarget
-                    .queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters().toString()));
+                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
         }
 
         LOGGER.trace("GET: {}", webTarget);
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java
index 4ca65a061..0d1b81962 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java
@@ -11,6 +11,7 @@
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.model.Image;
 import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.util.FiltersEncoder;
 import com.github.dockerjava.netty.MediaType;
 import com.github.dockerjava.netty.WebTarget;
 
@@ -28,8 +29,8 @@ protected List<Image> execute(ListImagesCmd command) {
 
         webTarget = booleanQueryParam(webTarget, "all", command.hasShowAllEnabled());
 
-        if (command.getFilters() != null) {
-            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters()));
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
+            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
         }
 
         LOGGER.trace("GET: {}", webTarget);
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java
index 8f370642f..e0c945d6d 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java
@@ -4,8 +4,10 @@
 import com.github.dockerjava.api.command.ListNetworksCmd;
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.util.FiltersEncoder;
 import com.github.dockerjava.netty.MediaType;
 import com.github.dockerjava.netty.WebTarget;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -26,8 +28,8 @@ public ListNetworksCmdExec(WebTarget baseResource, DockerClientConfig dockerClie
     protected List<Network> execute(ListNetworksCmd command) {
         WebTarget webTarget = getBaseResource().path("/networks");
 
-        if (command.getFilters() != null)
-            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters().toString()));
+        if (command.getFilters() != null && !command.getFilters().isEmpty())
+            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
 
         LOGGER.trace("GET: {}", webTarget);
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java
index 2086e4d2d..98d073ff5 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java
@@ -9,6 +9,7 @@
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.ListVolumesResponse;
 import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.util.FiltersEncoder;
 import com.github.dockerjava.netty.MediaType;
 import com.github.dockerjava.netty.WebTarget;
 
@@ -25,8 +26,8 @@ public ListVolumesCmdExec(WebTarget baseResource, DockerClientConfig dockerClien
     protected ListVolumesResponse execute(ListVolumesCmd command) {
         WebTarget webTarget = getBaseResource().path("/volumes");
 
-        if (command.getFilters() != null)
-            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters()));
+        if (command.getFilters() != null && !command.getFilters().isEmpty())
+            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
 
         LOGGER.trace("GET: {}", webTarget);
 
diff --git a/src/test/java/com/github/dockerjava/api/model/FiltersTest.java b/src/test/java/com/github/dockerjava/api/model/FiltersTest.java
deleted file mode 100644
index 8016ec49f..000000000
--- a/src/test/java/com/github/dockerjava/api/model/FiltersTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.github.dockerjava.api.model;
-
-import com.google.common.collect.Maps;
-import org.testng.annotations.Test;
-
-import java.util.Map;
-
-import static org.testng.Assert.*;
-
-/**
- * @author Vincent Latombe <vincent@latombe.net>
- */
-public class FiltersTest {
-
-    @Test
-    public void newFiltersShouldBeEquals() {
-        assertEquals(new Filters(), new Filters());
-    }
-
-    @Test
-    public void newFiltersShouldHaveEqualHashcode() {
-        assertEquals(new Filters().hashCode(), new Filters().hashCode());
-    }
-
-    @Test
-    public void filtersWithEqualContentShouldBeEquals() {
-        assertEquals(new Filters().withContainers("foo"), new Filters().withContainers("foo"));
-        assertEquals(new Filters().withLabels("alpha=val"), new Filters().withLabels("alpha=val"));
-    }
-
-    @Test
-    public void filtersWithEqualContentShouldHaveEqualHashcode() {
-        assertEquals(new Filters().withContainers("foo").hashCode(), new Filters().withContainers("foo").hashCode());
-        assertEquals(new Filters().withLabels("alpha=val").hashCode(), new Filters().withLabels("alpha=val").hashCode());
-    }
-
-    @Test
-    public void withLabelsMapShouldBeEqualsToVarargs() {
-        Map<String, String> map = Maps.newHashMap();
-        map.put("alpha", "val");
-        assertEquals(new Filters().withLabels("alpha=val"), new Filters().withLabels(map));
-
-        map = Maps.newHashMap();
-        map.put("alpha", "val");
-        map.put("beta", "val1");
-        assertEquals(new Filters().withLabels("alpha=val", "beta=val1"), new Filters().withLabels(map));
-    }
-
-    @Test
-    public void filtersWithDifferentContentShouldntBeEquals() {
-        assertNotEquals(new Filters().withContainers("foo"), new Filters().withContainers("bar"));
-    }
-
-    @Test
-    public void filtersWithDifferentContentShouldntHaveEqualHashcode() {
-        assertNotEquals(new Filters().withContainers("foo").hashCode(), new Filters().withContainers("bar").hashCode());
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
index ead529107..939f95087 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -15,7 +15,6 @@
 
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.model.Event;
-import com.github.dockerjava.api.model.EventFilters;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
 @Test(groups = "integration")
@@ -112,7 +111,7 @@ public void testEventStreamingWithFilter() throws Exception {
         TimeUnit.SECONDS.sleep(1);
 
         CountDownLatch countDownLatch = new CountDownLatch(1);
-        EventsTestCallback eventCallback = dockerClient.eventsCmd().withFilters(new EventFilters().withEvent("start"))
+        EventsTestCallback eventCallback = dockerClient.eventsCmd().withEventFilter("start")
                 .exec(new EventsTestCallback(countDownLatch));
 
         generateEvents();
diff --git a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
index e41b7736f..529c2f89b 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
@@ -26,7 +26,6 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Container;
-import com.github.dockerjava.api.model.Filters;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import com.google.common.collect.ImmutableMap;
 
@@ -152,14 +151,14 @@ public void testListContainersWithLabelsFilter() throws Exception {
         // list with filter by label
         dockerClient.createContainerCmd(testImage).withCmd("echo").withLabels(labels).exec();
         filteredContainers = dockerClient.listContainersCmd().withShowAll(true)
-                .withFilters(new Filters().withLabels(labels)).exec();
+                .withLabelFilter(labels).exec();
         assertThat(filteredContainers.size(), is(equalTo(1)));
         Container container3 = filteredContainers.get(0);
         assertThat(container3.getCommand(), not(isEmptyString()));
         assertThat(container3.getImage(), startsWith(testImage));
 
         filteredContainers = dockerClient.listContainersCmd().withShowAll(true)
-                .withFilters(new Filters().withLabels("test")).exec();
+                .withLabelFilter("test").exec();
         assertThat(filteredContainers.size(), is(equalTo(1)));
         container3 = filteredContainers.get(0);
         assertThat(container3.getCommand(), not(isEmptyString()));
diff --git a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
index 6f1ae7a68..1b811867a 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
@@ -65,9 +65,9 @@ public void listImages() throws DockerException {
     }
 
     @Test(groups = "ignoreInCircleCi")
-    public void listDanglingImages() throws DockerException {
+    public void listImagesWithDanglingFilter() throws DockerException {
         String imageId = createDanglingImage();
-        List<Image> images = dockerClient.listImagesCmd().withFilters("{\"dangling\":[\"true\"]}").withShowAll(true)
+        List<Image> images = dockerClient.listImagesCmd().withDanglingFilter(true).withShowAll(true)
                 .exec();
         assertThat(images, notNullValue());
         LOG.info("Images List: {}", images);
@@ -86,7 +86,7 @@ private boolean isImageInFilteredList(List<Image> images, String expectedImageId
     }
 
     private String createDanglingImage() {
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "5").exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
         dockerClient.startContainerCmd(container.getId()).exec();
@@ -95,7 +95,6 @@ private String createDanglingImage() {
         String imageId = dockerClient.commitCmd(container.getId()).exec();
 
         dockerClient.stopContainerCmd(container.getId()).exec();
-        dockerClient.killContainerCmd(container.getId()).exec();
         dockerClient.removeContainerCmd(container.getId()).exec();
         return imageId;
     }
diff --git a/src/test/java/com/github/dockerjava/core/util/FiltersBuilderTest.java b/src/test/java/com/github/dockerjava/core/util/FiltersBuilderTest.java
new file mode 100644
index 000000000..125fd0785
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/util/FiltersBuilderTest.java
@@ -0,0 +1,61 @@
+package com.github.dockerjava.core.util;
+
+import com.github.dockerjava.core.util.
+FiltersBuilder;
+import com.google.common.collect.Maps;
+
+import org.testng.annotations.Test;
+
+import java.util.Map;
+
+import static org.testng.Assert.*;
+
+/**
+ * @author Vincent Latombe <vincent@latombe.net>
+ */
+public class FiltersBuilderTest {
+
+    @Test
+    public void newFiltersShouldBeEquals() {
+        assertEquals(new FiltersBuilder(), new FiltersBuilder());
+    }
+
+    @Test
+    public void newFiltersShouldHaveEqualHashcode() {
+        assertEquals(new FiltersBuilder().hashCode(), new FiltersBuilder().hashCode());
+    }
+
+    @Test
+    public void filtersWithEqualContentShouldBeEquals() {
+        assertEquals(new FiltersBuilder().withContainers("foo"), new FiltersBuilder().withContainers("foo"));
+        assertEquals(new FiltersBuilder().withLabels("alpha=val"), new FiltersBuilder().withLabels("alpha=val"));
+    }
+
+    @Test
+    public void filtersWithEqualContentShouldHaveEqualHashcode() {
+        assertEquals(new FiltersBuilder().withContainers("foo").hashCode(), new FiltersBuilder().withContainers("foo").hashCode());
+        assertEquals(new FiltersBuilder().withLabels("alpha=val").hashCode(), new FiltersBuilder().withLabels("alpha=val").hashCode());
+    }
+
+    @Test
+    public void withLabelsMapShouldBeEqualsToVarargs() {
+        Map<String, String> map = Maps.newHashMap();
+        map.put("alpha", "val");
+        assertEquals(new FiltersBuilder().withLabels("alpha=val"), new FiltersBuilder().withLabels(map));
+
+        map = Maps.newHashMap();
+        map.put("alpha", "val");
+        map.put("beta", "val1");
+        assertEquals(new FiltersBuilder().withLabels("alpha=val", "beta=val1"), new FiltersBuilder().withLabels(map));
+    }
+
+    @Test
+    public void filtersWithDifferentContentShouldntBeEquals() {
+        assertNotEquals(new FiltersBuilder().withContainers("foo"), new FiltersBuilder().withContainers("bar"));
+    }
+
+    @Test
+    public void filtersWithDifferentContentShouldntHaveEqualHashcode() {
+        assertNotEquals(new FiltersBuilder().withContainers("foo").hashCode(), new FiltersBuilder().withContainers("bar").hashCode());
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java
index 06119b203..a634e2562 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java
@@ -15,7 +15,6 @@
 
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.model.Event;
-import com.github.dockerjava.api.model.EventFilters;
 import com.github.dockerjava.core.command.EventsResultCallback;
 import com.github.dockerjava.core.command.PullImageResultCallback;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
@@ -114,7 +113,7 @@ public void testEventStreamingWithFilter() throws Exception {
         TimeUnit.SECONDS.sleep(1);
 
         CountDownLatch countDownLatch = new CountDownLatch(1);
-        EventsTestCallback eventCallback = dockerClient.eventsCmd().withFilters(new EventFilters().withEvent("start"))
+        EventsTestCallback eventCallback = dockerClient.eventsCmd().withEventFilter("start")
                 .exec(new EventsTestCallback(countDownLatch));
 
         generateEvents();
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java
index c36bead2e..673784281 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java
@@ -26,8 +26,8 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Container;
-import com.github.dockerjava.api.model.Filters;
 import com.github.dockerjava.core.command.PullImageResultCallback;
+import com.github.dockerjava.core.util.FiltersBuilder;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 import com.google.common.collect.ImmutableMap;
 
@@ -153,14 +153,14 @@ public void testListContainersWithLabelsFilter() throws Exception {
         // list with filter by label
         dockerClient.createContainerCmd(testImage).withCmd("echo").withLabels(labels).exec();
         filteredContainers = dockerClient.listContainersCmd().withShowAll(true)
-                .withFilters(new Filters().withLabels(labels)).exec();
+                .withLabelFilter(labels).exec();
         assertThat(filteredContainers.size(), is(equalTo(1)));
         Container container3 = filteredContainers.get(0);
         assertThat(container3.getCommand(), not(isEmptyString()));
         assertThat(container3.getImage(), startsWith(testImage));
 
         filteredContainers = dockerClient.listContainersCmd().withShowAll(true)
-                .withFilters(new Filters().withLabels("test")).exec();
+                .withLabelFilter("test").exec();
         assertThat(filteredContainers.size(), is(equalTo(1)));
         container3 = filteredContainers.get(0);
         assertThat(container3.getCommand(), not(isEmptyString()));
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java
index f6348c7d9..c83fa7ef9 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java
@@ -65,10 +65,9 @@ public void listImages() throws DockerException {
     }
 
     @Test(groups = "ignoreInCircleCi")
-    public void listDanglingImages() throws DockerException {
+    public void listImagesWithDanglingFilter() throws DockerException {
         String imageId = createDanglingImage();
-        List<Image> images = dockerClient.listImagesCmd().withFilters("{\"dangling\":[\"true\"]}").withShowAll(true)
-                .exec();
+        List<Image> images = dockerClient.listImagesCmd().withDanglingFilter(true).withShowAll(true).exec();
         assertThat(images, notNullValue());
         LOG.info("Images List: {}", images);
         assertThat(images.size(), is(greaterThan(0)));
@@ -86,7 +85,7 @@ private boolean isImageInFilteredList(List<Image> images, String expectedImageId
     }
 
     private String createDanglingImage() {
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "5").exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
         dockerClient.startContainerCmd(container.getId()).exec();
@@ -95,7 +94,6 @@ private String createDanglingImage() {
         String imageId = dockerClient.commitCmd(container.getId()).exec();
 
         dockerClient.stopContainerCmd(container.getId()).exec();
-        dockerClient.killContainerCmd(container.getId()).exec();
         dockerClient.removeContainerCmd(container.getId()).exec();
         return imageId;
     }

From 6e2a702911b11b1224c1ac907da2260a65617736 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Mon, 18 Jan 2016 22:00:07 +0100
Subject: [PATCH 0368/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6d7b5550..56914c46b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ Notes
 * The upcoming release will contain multiple API breaking changes therefore the major version switch. It will support a subset of v.1.21 of the docker remote API. It also includes an experimental netty based implementation of `DockerCmdExecFactory` that probably will replace the current jersey/httpclient based one in a later release.
 
 All changes
+* [#426] (https://github.com/docker-java/docker-java/pull/426) Refactored filters API 
 * [#425] (https://github.com/docker-java/docker-java/pull/425) Implement Network API
 * [#410] (https://github.com/docker-java/docker-java/pull/410) Support for build-args of docker build 
 * [#408] (https://github.com/docker-java/docker-java/pull/408) Support for volume API

From 1f943a3df92eb87e24f0dd0ffdc2c5898ffb6f8d Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 20 Jan 2016 23:34:54 +0100
Subject: [PATCH 0369/1272] Enable all tests again

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 308432bd0..c6a93bc7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
 		<jdk.target>1.7</jdk.target>
 
 		<jersey.version>2.11</jersey.version>
-		<jackson-jaxrs.version>2.6.4</jackson-jaxrs.version>
+		<jackson-jaxrs.version>2.1.2</jackson-jaxrs.version>
 		<httpclient.version>4.3.1</httpclient.version>
 		<commons-compress.version>1.5</commons-compress.version>
 		<commons-codec.version>1.8</commons-codec.version>
@@ -391,7 +391,7 @@
 						</goals>
 						<configuration>
 							<groups>integration</groups>
-							<excludedGroups>ignoreInCircleCi</excludedGroups>
+<!-- 							<excludedGroups>ignoreInCircleCi</excludedGroups> -->
 							<includes>
 								<include>**/*Test.java</include>
 							</includes>

From 6b2253571fae133e7c923dd3b4ec0d9c4ed66abf Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 20 Jan 2016 23:37:18 +0100
Subject: [PATCH 0370/1272] Catch NotFoundException

---
 .../com/github/dockerjava/client/AbstractDockerClientTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 37e2916e6..074c19ad9 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -24,6 +24,7 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse.Mount;
 import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.api.model.Volume;
@@ -57,7 +58,7 @@ public void beforeTest() throws Exception {
 
         try {
             dockerClient.inspectImageCmd("busybox").exec();
-        } catch (Exception e) {
+        } catch (NotFoundException e) {
             LOG.info("Pulling image 'busybox'");
             // need to block until image is pulled completely
             dockerClient.pullImageCmd("busybox").withTag("latest").exec(new PullImageResultCallback()).awaitSuccess();

From 9d2b823b5925aff5885dd2c3242a86564f154c04 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 20 Jan 2016 23:39:41 +0100
Subject: [PATCH 0371/1272] Fix removeImage test: Don't kill already stopped
 container

---
 .../github/dockerjava/core/command/RemoveImageCmdImplTest.java   | 1 -
 .../com/github/dockerjava/netty/exec/RemoveImageCmdExecTest.java | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
index a4d670e31..90be81c7f 100644
--- a/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
@@ -63,7 +63,6 @@ public void removeImage() throws DockerException, InterruptedException {
         String imageId = dockerClient.commitCmd(container.getId()).exec();
 
         dockerClient.stopContainerCmd(container.getId()).exec();
-        dockerClient.killContainerCmd(container.getId()).exec();
         dockerClient.removeContainerCmd(container.getId()).exec();
 
         LOG.info("Removing image: {}", imageId);
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RemoveImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RemoveImageCmdExecTest.java
index 62ff486ea..e2f69ac1e 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/RemoveImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/RemoveImageCmdExecTest.java
@@ -63,7 +63,6 @@ public void removeImage() throws DockerException, InterruptedException {
         String imageId = dockerClient.commitCmd(container.getId()).exec();
 
         dockerClient.stopContainerCmd(container.getId()).exec();
-        dockerClient.killContainerCmd(container.getId()).exec();
         dockerClient.removeContainerCmd(container.getId()).exec();
 
         LOG.info("Removing image: {}", imageId);

From 70e9680f3b1df10c1f14e0119bf03621cb279d3f Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 20 Jan 2016 23:41:20 +0100
Subject: [PATCH 0372/1272] Fix inspectContainer test

---
 .../dockerjava/netty/exec/InspectContainerCmdExecTest.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
index f63dda273..a07e23143 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
@@ -100,6 +100,6 @@ public void inspectContainerNetworkSettings() throws DockerException {
 
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-        assertNotNull(inspectContainerResponse.getNetworkSettings().getNetworks().get("bridge"));
+        assertFalse(inspectContainerResponse.getNetworkSettings().getHairpinMode());
     }
 }

From c931fb7558ab9e0a512fa9bdd54a603c3649bb1e Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 20 Jan 2016 23:42:46 +0100
Subject: [PATCH 0373/1272] Fix issue #424

---
 .../core/command/ExecStartCmdImpl.java        | 12 ++++-
 .../core/command/ExecStartResultCallback.java |  2 +
 .../dockerjava/jaxrs/ExecStartCmdExec.java    |  3 +-
 .../handler/FramedResponseStreamHandler.java  | 12 +++--
 .../core/command/ExecStartCmdImplTest.java    |  2 +-
 .../core/command/InspectExecCmdImplTest.java  | 42 ++++++++--------
 .../netty/exec/ExecStartCmdExecTest.java      |  7 ++-
 .../netty/exec/InspectExecCmdExecTest.java    | 50 +++++++++----------
 8 files changed, 72 insertions(+), 58 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
index f77460730..836c9158e 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
@@ -5,17 +5,27 @@
 import java.io.InputStream;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.ExecStartCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Frame;
 
+@JsonInclude(Include.NON_NULL)
 public class ExecStartCmdImpl extends AbstrAsyncDockerCmd<ExecStartCmd, Frame> implements ExecStartCmd {
 
+    @JsonIgnore
     private String execId;
 
-    private Boolean detach, tty;
+    @JsonProperty("Detach")
+    private Boolean detach;
+
+    @JsonProperty("Tty")
+    private Boolean tty;
 
+    @JsonIgnore
     private InputStream stdin;
 
     public ExecStartCmdImpl(ExecStartCmd.Exec exec, String execId) {
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java b/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
index ebf1d08a1..5f4c33729 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
@@ -35,7 +35,9 @@ public void onNext(Frame frame) {
             try {
                 switch (frame.getStreamType()) {
                 case STDOUT:
+                case RAW:
                     if (stdout != null) {
+                        System.err.println(new String(frame.getPayload()));
                         stdout.write(frame.getPayload());
                         stdout.flush();
                     }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
index f737f6e28..dc7cf6598 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.jaxrs;
 
+import static javax.ws.rs.client.Entity.entity;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
@@ -30,6 +31,6 @@ protected AbstractCallbackNotifier<Frame> callbackNotifier(ExecStartCmd command,
         LOGGER.trace("POST: {}", webTarget);
 
         return new POSTCallbackNotifier<Frame>(new FrameStreamProcessor(), resultCallback, webTarget.request().accept(
-                MediaType.APPLICATION_JSON), null);
+                MediaType.APPLICATION_JSON), entity(command, MediaType.APPLICATION_JSON));
     }
 }
diff --git a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
index 87878f0da..945833cdd 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.netty.handler;
 
+import java.util.Arrays;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
@@ -74,14 +76,14 @@ private Frame decode() {
 
             headerCnt += headerCount;
 
-            if (headerCnt < HEADER_SIZE) {
-                return null;
-            }
-
             streamType = streamType(header[0]);
 
             if (streamType.equals(StreamType.RAW)) {
-                return new Frame(streamType, header);
+                return new Frame(streamType, Arrays.copyOf(header, headerCount));
+            }
+
+            if (headerCnt < HEADER_SIZE) {
+                return null;
             }
         }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
index 6d15cf03b..d7b689a9e 100644
--- a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
@@ -55,7 +55,7 @@ public void execStart() throws Exception {
         ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
                 .withAttachStdout(true).withCmd("touch", "/execStartTest.log").exec();
         dockerClient.execStartCmd(execCreateCmdResponse.getId()).exec(
-                new ExecStartResultCallback(System.out, System.err));
+                new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
 
         InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec();
         Boolean bytesAvailable = response.available() > 0;
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
index 4e87d5abf..51c2e3c29 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
@@ -46,7 +46,7 @@ public void afterMethod(ITestResult result) {
     }
 
     @Test(groups = "ignoreInCircleCi")
-    public void inspectExec() throws IOException {
+    public void inspectExec() throws Exception {
         String containerName = "generated_" + new SecureRandom().nextInt();
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
@@ -56,34 +56,34 @@ public void inspectExec() throws IOException {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        ExecCreateCmdResponse touchFileCmdCreateResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true).withAttachStderr(true).withCmd("touch", "/marker").exec();
-        LOG.info("Created exec {}", touchFileCmdCreateResponse.toString());
-        assertThat(touchFileCmdCreateResponse.getId(), not(isEmptyString()));
-        ExecCreateCmdResponse checkFileCmdCreateResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true).withAttachStderr(true).withCmd("test", "-e", "/marker").exec();
-        LOG.info("Created exec {}", checkFileCmdCreateResponse.toString());
-        assertThat(checkFileCmdCreateResponse.getId(), not(isEmptyString()));
-
         // Check that file does not exist
-        dockerClient.execStartCmd(container.getId())
-                .withExecId(checkFileCmdCreateResponse.getId()).exec(new ExecStartResultCallback(System.out, System.err));
-
-        InspectExecResponse first = dockerClient.inspectExecCmd(checkFileCmdCreateResponse.getId()).exec();
-        assertThat(first.getExitCode(), is(0));
+        ExecCreateCmdResponse checkFileExec1 = dockerClient.execCreateCmd(container.getId())
+                .withAttachStdout(true).withAttachStderr(true).withCmd("test", "-e", "/marker").exec();
+        LOG.info("Created exec {}", checkFileExec1.toString());
+        assertThat(checkFileExec1.getId(), not(isEmptyString()));
+        dockerClient.execStartCmd(checkFileExec1.getId()).exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
+        InspectExecResponse first = dockerClient.inspectExecCmd(checkFileExec1.getId()).exec();
+        assertThat(first.getExitCode(), is(1));
 
         // Create the file
+        ExecCreateCmdResponse touchFileExec = dockerClient.execCreateCmd(container.getId())
+                .withAttachStdout(true).withAttachStderr(true).withCmd("touch", "/marker").exec();
+        LOG.info("Created exec {}", touchFileExec.toString());
+        assertThat(touchFileExec.getId(), not(isEmptyString()));
         dockerClient.execStartCmd(container.getId())
-                .withExecId(touchFileCmdCreateResponse.getId()).exec(new ExecStartResultCallback(System.out, System.err));
-
-        InspectExecResponse second = dockerClient.inspectExecCmd(touchFileCmdCreateResponse.getId()).exec();
+                .withExecId(touchFileExec.getId()).exec(new ExecStartResultCallback(System.out, System.err));
+        InspectExecResponse second = dockerClient.inspectExecCmd(touchFileExec.getId()).exec();
         assertThat(second.getExitCode(), is(0));
 
+
         // Check that file does exist now
+        ExecCreateCmdResponse checkFileExec2 = dockerClient.execCreateCmd(container.getId())
+                .withAttachStdout(true).withAttachStderr(true).withCmd("test", "-e", "/marker").exec();
+        LOG.info("Created exec {}", checkFileExec2.toString());
+        assertThat(checkFileExec2.getId(), not(isEmptyString()));
         dockerClient.execStartCmd(container.getId())
-                .withExecId(checkFileCmdCreateResponse.getId()).exec(new ExecStartResultCallback(System.out, System.err));
-
-        InspectExecResponse third = dockerClient.inspectExecCmd(checkFileCmdCreateResponse.getId()).exec();
+                .withExecId(checkFileExec2.getId()).exec(new ExecStartResultCallback(System.out, System.err));
+        InspectExecResponse third = dockerClient.inspectExecCmd(checkFileExec2.getId()).exec();
         assertThat(third.getExitCode(), is(0));
 
         // Get container info and check its roundtrip to ensure the consistency
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
index b9d81db9d..1e5af11da 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
@@ -61,7 +61,10 @@ public void execStart() throws Exception {
         dockerClient.execStartCmd(execCreateCmdResponse.getId()).exec(
                 new ExecStartResultCallback(System.out, System.err));
 
-        InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "/execStartTest.log").exec();
+        LOG.info("Wait for 5 seconds");
+        Thread.sleep(5000);
+
+        InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec();
 
         Boolean bytesAvailable = response.available() > 0;
         assertTrue(bytesAvailable, "The file was not copied from the container.");
@@ -88,7 +91,7 @@ public void execStartAttached() throws Exception {
         dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true)
                 .exec(new ExecStartResultCallback(System.out, System.err));
 
-        InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "/execStartTest.log").exec();
+        InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec();
         Boolean bytesAvailable = response.available() > 0;
         assertTrue(bytesAvailable, "The file was not copied from the container.");
 
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
index efeba6e99..1849b2fe3 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
@@ -48,48 +48,44 @@ public void afterMethod(ITestResult result) {
     }
 
     @Test(groups = "ignoreInCircleCi")
-    public void inspectExecTest() throws IOException {
+    public void inspectExec() throws Exception {
         String containerName = "generated_" + new SecureRandom().nextInt();
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withName(containerName).exec();
         LOG.info("Created container {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        ExecCreateCmdResponse touchFileCmdCreateResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true).withAttachStderr(true).withCmd("touch", "/marker").withTty(true).exec();
-        LOG.info("Created exec {}", touchFileCmdCreateResponse.toString());
-        assertThat(touchFileCmdCreateResponse.getId(), not(isEmptyString()));
-        ExecCreateCmdResponse checkFileCmdCreateResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true).withAttachStderr(true).withCmd("test", "-e", "/marker").exec();
-        LOG.info("Created exec {}", checkFileCmdCreateResponse.toString());
-        assertThat(checkFileCmdCreateResponse.getId(), not(isEmptyString()));
-
         // Check that file does not exist
-        dockerClient.execStartCmd(container.getId()).withDetach(false).withTty(true)
-                .withExecId(checkFileCmdCreateResponse.getId())
-                .exec(new ExecStartResultCallback(System.out, System.err));
-
-        InspectExecResponse first = dockerClient.inspectExecCmd(checkFileCmdCreateResponse.getId()).exec();
-        assertEquals(first.isRunning(), new Boolean(false));
+        ExecCreateCmdResponse checkFileExec1 = dockerClient.execCreateCmd(container.getId())
+                .withAttachStdout(false).withAttachStderr(false).withCmd("test", "-e", "/marker").exec();
+        LOG.info("Created exec {}", checkFileExec1.toString());
+        assertThat(checkFileExec1.getId(), not(isEmptyString()));
+        dockerClient.execStartCmd(checkFileExec1.getId()).exec(new ExecStartResultCallback(System.out, System.err));
+        InspectExecResponse first = dockerClient.inspectExecCmd(checkFileExec1.getId()).exec();
         assertThat(first.getExitCode(), is(1));
 
         // Create the file
-        dockerClient.execStartCmd(container.getId()).withDetach(false).withTty(true)
-                .withExecId(touchFileCmdCreateResponse.getId())
-                .exec(new ExecStartResultCallback(System.out, System.err));
-
-        InspectExecResponse second = dockerClient.inspectExecCmd(touchFileCmdCreateResponse.getId()).exec();
-        assertEquals(first.isRunning(), new Boolean(false));
+        ExecCreateCmdResponse touchFileExec = dockerClient.execCreateCmd(container.getId())
+                .withAttachStdout(true).withAttachStderr(true).withCmd("touch", "/marker").exec();
+        LOG.info("Created exec {}", touchFileExec.toString());
+        assertThat(touchFileExec.getId(), not(isEmptyString()));
+        dockerClient.execStartCmd(container.getId())
+                .withExecId(touchFileExec.getId()).exec(new ExecStartResultCallback(System.out, System.err));
+        InspectExecResponse second = dockerClient.inspectExecCmd(touchFileExec.getId()).exec();
         assertThat(second.getExitCode(), is(0));
 
-        // Check that file does exist now
-        dockerClient.execStartCmd(container.getId()).withExecId(checkFileCmdCreateResponse.getId())
-                .exec(new ExecStartResultCallback(System.out, System.err));
 
-        InspectExecResponse third = dockerClient.inspectExecCmd(checkFileCmdCreateResponse.getId()).exec();
+        // Check that file does exist now
+        ExecCreateCmdResponse checkFileExec2 = dockerClient.execCreateCmd(container.getId())
+                .withAttachStdout(true).withAttachStderr(true).withCmd("test", "-e", "/marker").exec();
+        LOG.info("Created exec {}", checkFileExec2.toString());
+        assertThat(checkFileExec2.getId(), not(isEmptyString()));
+        dockerClient.execStartCmd(container.getId())
+                .withExecId(checkFileExec2.getId()).exec(new ExecStartResultCallback(System.out, System.err));
+        InspectExecResponse third = dockerClient.inspectExecCmd(checkFileExec2.getId()).exec();
         assertThat(third.getExitCode(), is(0));
 
         // Get container info and check its roundtrip to ensure the consistency

From af2a37a095d618f622b4275ef7eec35f7b8df789 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 20 Jan 2016 23:41:20 +0100
Subject: [PATCH 0374/1272] Remove debug println

---
 .../github/dockerjava/core/command/ExecStartResultCallback.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java b/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
index 5f4c33729..23f549c49 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
@@ -37,7 +37,6 @@ public void onNext(Frame frame) {
                 case STDOUT:
                 case RAW:
                     if (stdout != null) {
-                        System.err.println(new String(frame.getPayload()));
                         stdout.write(frame.getPayload());
                         stdout.flush();
                     }

From bb6bbd63d42007dce69295d668a9bf2e25522ff4 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 21 Jan 2016 22:34:01 +0100
Subject: [PATCH 0375/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56914c46b..2f0141068 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ Notes
 * The upcoming release will contain multiple API breaking changes therefore the major version switch. It will support a subset of v.1.21 of the docker remote API. It also includes an experimental netty based implementation of `DockerCmdExecFactory` that probably will replace the current jersey/httpclient based one in a later release.
 
 All changes
+* [#430] (https://github.com/docker-java/docker-java/pull/430) Fix ExecStartCmd failure 
 * [#426] (https://github.com/docker-java/docker-java/pull/426) Refactored filters API 
 * [#425] (https://github.com/docker-java/docker-java/pull/425) Implement Network API
 * [#410] (https://github.com/docker-java/docker-java/pull/410) Support for build-args of docker build 

From 9b3ed93add255b7da3e123f5a8710fa54c9ca651 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 22 Jan 2016 19:30:35 +0100
Subject: [PATCH 0376/1272] Revert downgrade of jackson

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c6a93bc7a..43a73c889 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
 		<jdk.target>1.7</jdk.target>
 
 		<jersey.version>2.11</jersey.version>
-		<jackson-jaxrs.version>2.1.2</jackson-jaxrs.version>
+		<jackson-jaxrs.version>2.6.4</jackson-jaxrs.version>
 		<httpclient.version>4.3.1</httpclient.version>
 		<commons-compress.version>1.5</commons-compress.version>
 		<commons-codec.version>1.8</commons-codec.version>

From 822cb327d21370a059ef7cc1aa50341d273aa0df Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sat, 23 Jan 2016 19:24:36 +0100
Subject: [PATCH 0377/1272] Fix issue #434

---
 .../dockerjava/api/async/ResultCallback.java  |  4 +--
 .../core/async/ResultCallbackTemplate.java    | 24 +++++++++++++
 .../core/command/ExecStartResultCallback.java |  2 +-
 .../dockerjava/netty/InvocationBuilder.java   | 36 ++++++-------------
 .../netty/handler/HttpResponseHandler.java    | 15 ++++++--
 .../core/command/ExecStartCmdImplTest.java    |  2 +-
 .../core/command/InspectExecCmdImplTest.java  | 31 ++++++++--------
 .../netty/exec/ExecStartCmdExecTest.java      | 13 +++----
 .../netty/exec/InspectExecCmdExecTest.java    | 31 ++++++++--------
 9 files changed, 90 insertions(+), 68 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/async/ResultCallback.java b/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
index 2016e1980..0bb052a0b 100644
--- a/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
+++ b/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
@@ -7,8 +7,8 @@
  */
 public interface ResultCallback<A_RES_T> extends Closeable {
     /**
-     * Called when the async processing starts. The passed {@link Closeable} can be used to close/interrupt the
-     * processing
+     * Called when the async processing starts respectively when the response arrives from the server. The passed
+     * {@link Closeable} can be used to close/interrupt the processing.
      */
     void onStart(Closeable closeable);
 
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index 3a62ae46a..5e63f2b5f 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -27,6 +27,8 @@ public abstract class ResultCallbackTemplate<RC_T extends ResultCallback<A_RES_T
 
     private final static Logger LOGGER = LoggerFactory.getLogger(ResultCallbackTemplate.class);
 
+    private final CountDownLatch started = new CountDownLatch(1);
+
     private final CountDownLatch completed = new CountDownLatch(1);
 
     private Closeable stream;
@@ -39,6 +41,7 @@ public abstract class ResultCallbackTemplate<RC_T extends ResultCallback<A_RES_T
     public void onStart(Closeable stream) {
         this.stream = stream;
         this.closed = false;
+        started.countDown();
     }
 
     @Override
@@ -98,6 +101,27 @@ public RC_T awaitCompletion(long timeout, TimeUnit timeUnit) throws InterruptedE
         return (RC_T) this;
     }
 
+    /**
+     * Blocks until {@link ResultCallback#onStart()} was called. {@link ResultCallback#onStart()} is called when the
+     * request was processed on the server side and the response is incoming.
+     */
+    @SuppressWarnings("unchecked")
+    public RC_T awaitStarted() throws InterruptedException {
+        started.await();
+        return (RC_T) this;
+    }
+
+    /**
+     * Blocks until {@link ResultCallback#onStart()} was called or the given timeout occurs.
+     * {@link ResultCallback#onStart()} is called when the request was processed on the server side and the response is
+     * incoming.
+     */
+    @SuppressWarnings("unchecked")
+    public RC_T awaitStarted(long timeout, TimeUnit timeUnit) throws InterruptedException {
+        started.await(timeout, timeUnit);
+        return (RC_T) this;
+    }
+
     @CheckForNull
     protected RuntimeException getFirstError() {
         if (firstError != null) {
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java b/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
index 23f549c49..5f73b65eb 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
@@ -54,7 +54,7 @@ public void onNext(Frame frame) {
                 onError(e);
             }
 
+            LOGGER.debug(frame.toString());
         }
-        LOGGER.debug(frame.toString());
     }
 }
diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
index 8f1641279..e3b799165 100644
--- a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
+++ b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
@@ -18,10 +18,11 @@
 import io.netty.handler.codec.json.JsonObjectDecoder;
 import io.netty.handler.stream.ChunkedStream;
 import io.netty.handler.stream.ChunkedWriteHandler;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
-import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -140,8 +141,6 @@ public <T> void get(TypeReference<T> typeReference, ResultCallback<T> resultCall
 
         Channel channel = getChannel();
 
-        initCallback(channel, resultCallback);
-
         JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<T>(typeReference,
                 resultCallback);
 
@@ -215,7 +214,7 @@ public InputStream post(final Object entity) {
         return callback.awaitResult();
     }
 
-    public void post(final Object entity, final InputStream stdin, ResultCallback<Frame> resultCallback) {
+    public void post(final Object entity, final InputStream stdin, final ResultCallback<Frame> resultCallback) {
 
         HttpRequestProvider requestProvider = httpPostRequestProvider(entity);
 
@@ -223,6 +222,14 @@ public void post(final Object entity, final InputStream stdin, ResultCallback<Fr
 
         final Channel channel = getChannel();
 
+        // result callback's close() method must be called when the servers closes the connection
+        channel.closeFuture().addListener(new GenericFutureListener<Future<? super Void>>() {
+            @Override
+            public void operationComplete(Future<? super Void> future) throws Exception {
+                resultCallback.onComplete();
+            }
+        });
+
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
 
         HttpConnectionHijackHandler hijackHandler = new HttpConnectionHijackHandler(responseHandler);
@@ -284,8 +291,6 @@ public <T> void post(final Object entity, TypeReference<T> typeReference, final
 
         Channel channel = getChannel();
 
-        initCallback(channel, resultCallback);
-
         JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<T>(typeReference,
                 resultCallback);
 
@@ -300,21 +305,6 @@ public <T> void post(final Object entity, TypeReference<T> typeReference, final
         return;
     }
 
-    private <T> void initCallback(final Channel channel, final ResultCallback<T> resultCallback) {
-        Closeable closeable = new Closeable() {
-            @Override
-            public void close() throws IOException {
-                try {
-                    channel.close().sync();
-                } catch (InterruptedException e) {
-                    resultCallback.onError(e);
-                }
-            }
-        };
-
-        resultCallback.onStart(closeable);
-    }
-
     private HttpRequest prepareDeleteRequest(String uri) {
 
         FullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.DELETE, uri);
@@ -406,8 +396,6 @@ public <T> void post(TypeReference<T> typeReference, ResultCallback<T> resultCal
 
         Channel channel = getChannel();
 
-        initCallback(channel, resultCallback);
-
         JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<T>(typeReference,
                 resultCallback);
 
@@ -442,8 +430,6 @@ public InputStream get() {
 
         ResponseCallback<InputStream> resultCallback = new ResponseCallback<InputStream>();
 
-        initCallback(channel, resultCallback);
-
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
 
         HttpResponseStreamHandler streamHandler = new HttpResponseStreamHandler(resultCallback);
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
index 2f11ccf38..cbe8686d9 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
@@ -11,6 +11,7 @@
 import io.netty.handler.codec.http.HttpResponse;
 import io.netty.handler.codec.http.LastHttpContent;
 
+import java.io.Closeable;
 import java.nio.charset.Charset;
 
 import com.github.dockerjava.api.async.ResultCallback;
@@ -24,8 +25,8 @@
 import com.github.dockerjava.api.exception.UnauthorizedException;
 
 /**
- * Handler that is responsible to handle an incoming {@link HttpResponse}. It evaluates the status code and
- * triggers the appropriate lifecycle methods at the passed {@link ResultCallback}.
+ * Handler that is responsible to handle an incoming {@link HttpResponse}. It evaluates the status code and triggers the
+ * appropriate lifecycle methods at the passed {@link ResultCallback}.
  *
  * @author Marcus Linke
  */
@@ -46,10 +47,18 @@ public HttpResponseHandler(HttpRequestProvider requestProvider, ResultCallback<?
     }
 
     @Override
-    protected void channelRead0(ChannelHandlerContext ctx, HttpObject msg) throws Exception {
+    protected void channelRead0(final ChannelHandlerContext ctx, HttpObject msg) throws Exception {
         if (msg instanceof HttpResponse) {
 
             response = (HttpResponse) msg;
+
+            resultCallback.onStart(new Closeable() {
+                @Override
+                public void close() {
+                    ctx.channel().close();
+                }
+            });
+
         } else if (msg instanceof HttpContent) {
 
             HttpContent content = (HttpContent) msg;
diff --git a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
index d7b689a9e..c4f0b9189 100644
--- a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
@@ -81,7 +81,7 @@ public void execStartAttached() throws Exception {
         ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
                 .withAttachStdout(true).withCmd("touch", "/execStartTest.log").exec();
         dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true)
-                .exec(new ExecStartResultCallback(System.out, System.err));
+                .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
 
         InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec();
         Boolean bytesAvailable = response.available() > 0;
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
index 51c2e3c29..f40ee7e69 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
@@ -57,33 +57,36 @@ public void inspectExec() throws Exception {
         dockerClient.startContainerCmd(container.getId()).exec();
 
         // Check that file does not exist
-        ExecCreateCmdResponse checkFileExec1 = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true).withAttachStderr(true).withCmd("test", "-e", "/marker").exec();
+        ExecCreateCmdResponse checkFileExec1 = dockerClient.execCreateCmd(container.getId()).withAttachStdout(true)
+                .withAttachStderr(true).withCmd("test", "-e", "/marker").exec();
         LOG.info("Created exec {}", checkFileExec1.toString());
         assertThat(checkFileExec1.getId(), not(isEmptyString()));
-        dockerClient.execStartCmd(checkFileExec1.getId()).exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
+        dockerClient.execStartCmd(checkFileExec1.getId()).withDetach(false)
+                .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
         InspectExecResponse first = dockerClient.inspectExecCmd(checkFileExec1.getId()).exec();
+        assertThat(first.isRunning(), is(false));
         assertThat(first.getExitCode(), is(1));
 
         // Create the file
-        ExecCreateCmdResponse touchFileExec = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true).withAttachStderr(true).withCmd("touch", "/marker").exec();
+        ExecCreateCmdResponse touchFileExec = dockerClient.execCreateCmd(container.getId()).withAttachStdout(true)
+                .withAttachStderr(true).withCmd("touch", "/marker").exec();
         LOG.info("Created exec {}", touchFileExec.toString());
         assertThat(touchFileExec.getId(), not(isEmptyString()));
-        dockerClient.execStartCmd(container.getId())
-                .withExecId(touchFileExec.getId()).exec(new ExecStartResultCallback(System.out, System.err));
+        dockerClient.execStartCmd(touchFileExec.getId()).withDetach(false)
+                .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
         InspectExecResponse second = dockerClient.inspectExecCmd(touchFileExec.getId()).exec();
+        assertThat(second.isRunning(), is(false));
         assertThat(second.getExitCode(), is(0));
 
-
         // Check that file does exist now
-        ExecCreateCmdResponse checkFileExec2 = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true).withAttachStderr(true).withCmd("test", "-e", "/marker").exec();
+        ExecCreateCmdResponse checkFileExec2 = dockerClient.execCreateCmd(container.getId()).withAttachStdout(true)
+                .withAttachStderr(true).withCmd("test", "-e", "/marker").exec();
         LOG.info("Created exec {}", checkFileExec2.toString());
         assertThat(checkFileExec2.getId(), not(isEmptyString()));
-        dockerClient.execStartCmd(container.getId())
-                .withExecId(checkFileExec2.getId()).exec(new ExecStartResultCallback(System.out, System.err));
+        dockerClient.execStartCmd(checkFileExec2.getId()).withDetach(false)
+                .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
         InspectExecResponse third = dockerClient.inspectExecCmd(checkFileExec2.getId()).exec();
+        assertThat(third.isRunning(), is(false));
         assertThat(third.getExitCode(), is(0));
 
         // Get container info and check its roundtrip to ensure the consistency
@@ -103,8 +106,8 @@ public void inspectExecNetworkSettings() throws IOException {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        ExecCreateCmdResponse exec = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true).withAttachStderr(true).withCmd("/bin/bash").exec();
+        ExecCreateCmdResponse exec = dockerClient.execCreateCmd(container.getId()).withAttachStdout(true)
+                .withAttachStderr(true).withCmd("/bin/bash").exec();
         LOG.info("Created exec {}", exec.toString());
         assertThat(exec.getId(), not(isEmptyString()));
 
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
index 1e5af11da..e4ceedac7 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
@@ -58,11 +58,8 @@ public void execStart() throws Exception {
 
         ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
                 .withAttachStdout(true).withCmd("touch", "/execStartTest.log").exec();
-        dockerClient.execStartCmd(execCreateCmdResponse.getId()).exec(
-                new ExecStartResultCallback(System.out, System.err));
-
-        LOG.info("Wait for 5 seconds");
-        Thread.sleep(5000);
+        dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false)
+                .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
 
         InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec();
 
@@ -88,8 +85,8 @@ public void execStartAttached() throws Exception {
 
         ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
                 .withAttachStdout(true).withCmd("touch", "/execStartTest.log").exec();
-        dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true)
-                .exec(new ExecStartResultCallback(System.out, System.err));
+        dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false)
+                .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
 
         InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec();
         Boolean bytesAvailable = response.available() > 0;
@@ -141,7 +138,7 @@ public void execStartNotAttachedStdin() throws Exception {
 
         ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
                 .withAttachStdout(true).withAttachStdin(false).withCmd("/bin/sh").exec();
-        dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true).withStdIn(stdin)
+        dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withStdIn(stdin)
                 .exec(new ExecStartResultCallback(stdout, System.err)).awaitCompletion(5, TimeUnit.SECONDS);
 
         assertEquals(stdout.toString(), "");
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
index 1849b2fe3..ecf5ed568 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
@@ -59,33 +59,36 @@ public void inspectExec() throws Exception {
         dockerClient.startContainerCmd(container.getId()).exec();
 
         // Check that file does not exist
-        ExecCreateCmdResponse checkFileExec1 = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(false).withAttachStderr(false).withCmd("test", "-e", "/marker").exec();
+        ExecCreateCmdResponse checkFileExec1 = dockerClient.execCreateCmd(container.getId()).withAttachStdout(true)
+                .withAttachStderr(true).withCmd("test", "-e", "/marker").exec();
         LOG.info("Created exec {}", checkFileExec1.toString());
         assertThat(checkFileExec1.getId(), not(isEmptyString()));
-        dockerClient.execStartCmd(checkFileExec1.getId()).exec(new ExecStartResultCallback(System.out, System.err));
+        dockerClient.execStartCmd(checkFileExec1.getId()).withDetach(false)
+                .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
         InspectExecResponse first = dockerClient.inspectExecCmd(checkFileExec1.getId()).exec();
+        assertThat(first.isRunning(), is(false));
         assertThat(first.getExitCode(), is(1));
 
         // Create the file
-        ExecCreateCmdResponse touchFileExec = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true).withAttachStderr(true).withCmd("touch", "/marker").exec();
+        ExecCreateCmdResponse touchFileExec = dockerClient.execCreateCmd(container.getId()).withAttachStdout(true)
+                .withAttachStderr(true).withCmd("touch", "/marker").exec();
         LOG.info("Created exec {}", touchFileExec.toString());
         assertThat(touchFileExec.getId(), not(isEmptyString()));
-        dockerClient.execStartCmd(container.getId())
-                .withExecId(touchFileExec.getId()).exec(new ExecStartResultCallback(System.out, System.err));
+        dockerClient.execStartCmd(touchFileExec.getId()).withDetach(false)
+                .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
         InspectExecResponse second = dockerClient.inspectExecCmd(touchFileExec.getId()).exec();
+        assertThat(second.isRunning(), is(false));
         assertThat(second.getExitCode(), is(0));
 
-
         // Check that file does exist now
-        ExecCreateCmdResponse checkFileExec2 = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true).withAttachStderr(true).withCmd("test", "-e", "/marker").exec();
+        ExecCreateCmdResponse checkFileExec2 = dockerClient.execCreateCmd(container.getId()).withAttachStdout(true)
+                .withAttachStderr(true).withCmd("test", "-e", "/marker").exec();
         LOG.info("Created exec {}", checkFileExec2.toString());
         assertThat(checkFileExec2.getId(), not(isEmptyString()));
-        dockerClient.execStartCmd(container.getId())
-                .withExecId(checkFileExec2.getId()).exec(new ExecStartResultCallback(System.out, System.err));
+        dockerClient.execStartCmd(checkFileExec2.getId()).withDetach(false)
+                .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
         InspectExecResponse third = dockerClient.inspectExecCmd(checkFileExec2.getId()).exec();
+        assertThat(third.isRunning(), is(false));
         assertThat(third.getExitCode(), is(0));
 
         // Get container info and check its roundtrip to ensure the consistency
@@ -105,8 +108,8 @@ public void inspectExecNetworkSettings() throws IOException {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        ExecCreateCmdResponse exec = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true).withAttachStderr(true).withCmd("/bin/bash").exec();
+        ExecCreateCmdResponse exec = dockerClient.execCreateCmd(container.getId()).withAttachStdout(true)
+                .withAttachStderr(true).withCmd("/bin/bash").exec();
         LOG.info("Created exec {}", exec.toString());
         assertThat(exec.getId(), not(isEmptyString()));
 

From 0115561927dd420ba6e6109132a3b56e8e48edbe Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 24 Jan 2016 19:03:41 +0100
Subject: [PATCH 0378/1272] Fix tests

---
 .../dockerjava/core/command/LogContainerCmdImplTest.java       | 3 ++-
 .../github/dockerjava/netty/exec/LogContainerCmdExecTest.java  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
index 0a9a39718..817179eb2 100644
--- a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
@@ -4,6 +4,7 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.containsString;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -164,7 +165,7 @@ public void asyncLogContainerWithSince() throws Exception {
 
         loggingCallback.awaitCompletion();
 
-        assertFalse(loggingCallback.toString().contains(snippet));
+        assertThat(loggingCallback.toString(), containsString(snippet));
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/LogContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/LogContainerCmdExecTest.java
index b3bb6ed58..310994755 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/LogContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/LogContainerCmdExecTest.java
@@ -4,6 +4,7 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.containsString;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -165,7 +166,7 @@ public void asyncLogContainerWithSince() throws Exception {
 
         loggingCallback.awaitCompletion();
 
-        assertFalse(loggingCallback.toString().contains(snippet));
+        assertThat(loggingCallback.toString(), containsString(snippet));
     }
 
 }

From d3c7df8df5b4d9565299445257526a4ade0ae610 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Mon, 25 Jan 2016 22:24:59 +0100
Subject: [PATCH 0379/1272] Test binds in inspect container response

---
 .../core/command/CreateContainerCmdImplTest.java       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index e89d09861..ce2771652 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -140,18 +140,20 @@ public void createContainerWithVolumesFrom() throws DockerException {
 
         String container1Name = UUID.randomUUID().toString();
 
+        Bind bind1 = new Bind("/src/webapp1", volume1);
+        Bind bind2 = new Bind("/src/webapp2", volume2);
+
         // create a running container with bind mounts
         CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withName(container1Name)
-                .withBinds(new Bind("/src/webapp1", volume1), new Bind("/src/webapp2", volume2)).exec();
+                .withBinds(bind1, bind2).exec();
         LOG.info("Created container1 {}", container1.toString());
 
-        dockerClient.startContainerCmd(container1.getId()).exec();
-        LOG.info("Started container1 {}", container1.toString());
-
         InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
                 .exec();
 
+        assertThat(Arrays.asList(inspectContainerResponse1.getHostConfig().getBinds()), containsInAnyOrder(bind1, bind2));
+
         assertThat(inspectContainerResponse1, mountedVolumes(containsInAnyOrder(volume1, volume2)));
 
         // create a second container with volumes from first container

From edd90c389b632e4ed01ba12456654a5a81bdfee1 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Mon, 25 Jan 2016 22:46:26 +0100
Subject: [PATCH 0380/1272] netty: Test binds in inspect container response

---
 .../netty/exec/CreateContainerCmdExecTest.java         | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
index 0a11c8ce4..9a37ef01a 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
@@ -142,18 +142,20 @@ public void createContainerWithVolumesFrom() throws DockerException {
 
         String container1Name = UUID.randomUUID().toString();
 
+        Bind bind1 = new Bind("/src/webapp1", volume1);
+        Bind bind2 = new Bind("/src/webapp2", volume2);
+
         // create a running container with bind mounts
         CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withName(container1Name)
-                .withBinds(new Bind("/src/webapp1", volume1), new Bind("/src/webapp2", volume2)).exec();
+                .withBinds(bind1, bind2).exec();
         LOG.info("Created container1 {}", container1.toString());
 
-        dockerClient.startContainerCmd(container1.getId()).exec();
-        LOG.info("Started container1 {}", container1.toString());
-
         InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
                 .exec();
 
+        assertThat(Arrays.asList(inspectContainerResponse1.getHostConfig().getBinds()), containsInAnyOrder(bind1, bind2));
+
         assertThat(inspectContainerResponse1, mountedVolumes(containsInAnyOrder(volume1, volume2)));
 
         // create a second container with volumes from first container

From f2954e037ef6be098b1ef838480d61421ed34ceb Mon Sep 17 00:00:00 2001
From: Marcus Thiesen <mt@hubrick.com>
Date: Wed, 27 Jan 2016 10:58:00 +0100
Subject: [PATCH 0381/1272] Make API Version transitions easier

IMHO there is no reason to be that strict about the JSON models, because it
leads to things like e.g. Issue #437 .

Be more lenient with changes in the data.
---
 .../com/github/dockerjava/api/model/BuildResponseItem.java  | 2 +-
 .../com/github/dockerjava/api/model/PullResponseItem.java   | 2 +-
 .../com/github/dockerjava/api/model/PushResponseItem.java   | 2 +-
 .../java/com/github/dockerjava/api/model/ResponseItem.java  | 6 +++---
 .../java/com/github/dockerjava/api/model/WaitResponse.java  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
index 264988910..a53a1df9a 100644
--- a/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
@@ -6,7 +6,7 @@
 /**
  * Represents a build response stream item
  */
-@JsonIgnoreProperties(ignoreUnknown = false)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class BuildResponseItem extends ResponseItem {
 
     private static final long serialVersionUID = -1252904184236343612L;
diff --git a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
index 3ab77bee0..90b3ee336 100644
--- a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
@@ -6,7 +6,7 @@
 /**
  * Represents a pull response stream item
  */
-@JsonIgnoreProperties(ignoreUnknown = false)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class PullResponseItem extends ResponseItem {
 
     private static final long serialVersionUID = -2575482839766823293L;
diff --git a/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
index 059398d4e..829fbbbad 100644
--- a/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
@@ -5,7 +5,7 @@
 /**
  * Represents a push response stream item
  */
-@JsonIgnoreProperties(ignoreUnknown = false)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class PushResponseItem extends ResponseItem {
 
     private static final long serialVersionUID = 8256977108011295857L;
diff --git a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
index 1bf71fa34..586a49d63 100644
--- a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
@@ -14,7 +14,7 @@
 /**
  * Represents a pull response stream item
  */
-@JsonIgnoreProperties(ignoreUnknown = false)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ResponseItem implements Serializable {
 
     private static final long serialVersionUID = -5187169652557467828L;
@@ -105,7 +105,7 @@ public boolean isErrorIndicated() {
         return getError() != null || getErrorDetail() != null;
     }
 
-    @JsonIgnoreProperties(ignoreUnknown = false)
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class ProgressDetail implements Serializable {
         private static final long serialVersionUID = -1954994695645715264L;
 
@@ -139,7 +139,7 @@ public String toString() {
         }
     }
 
-    @JsonIgnoreProperties(ignoreUnknown = false)
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class ErrorDetail implements Serializable {
         private static final long serialVersionUID = -9136704865403084083L;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/WaitResponse.java b/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
index ca6d61eb9..a2ab16f6f 100644
--- a/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
+++ b/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
@@ -6,7 +6,7 @@
 /**
  * Represents a wait container command response
  */
-@JsonIgnoreProperties(ignoreUnknown = false)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class WaitResponse {
 
     @JsonProperty("StatusCode")

From d0cde8e79f20d6c21b526222e62f709c3f86e55f Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 31 Jan 2016 16:11:36 +0300
Subject: [PATCH 0382/1272] Checkstyle: not tabs.

---
 .../api/command/ExecCreateCmdResponse.java    |  4 ++--
 .../core/command/ListImagesCmdImpl.java       |  4 ++--
 .../dockerjava/jaxrs/ListImagesCmdExec.java   |  4 ++--
 .../github/dockerjava/netty/MediaType.java    | 20 +++++++++----------
 .../netty/handler/JsonRequestHandler.java     | 14 ++++++-------
 .../checkstyle/checkstyle-config.xml          |  8 ++++++++
 6 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
index 08751f3e2..9c13912fc 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
@@ -15,9 +15,9 @@ public class ExecCreateCmdResponse {
     public String getId() {
         return id;
     }
-    
+
     @Override
     public String toString() {
-    	return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
index d726ca7ce..1033b43ec 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
@@ -17,9 +17,9 @@
  */
 public class ListImagesCmdImpl extends AbstrDockerCmd<ListImagesCmd, List<Image>> implements ListImagesCmd {
 
-	private String imageNameFilter;
+    private String imageNameFilter;
 
-	private Boolean showAll = false;
+    private Boolean showAll = false;
 
     private FiltersBuilder filters = new FiltersBuilder();
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
index 1e7acfc33..3d6320151 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
@@ -31,11 +31,11 @@ protected List<Image> execute(ListImagesCmd command) {
         webTarget = booleanQueryParam(webTarget, "all", command.hasShowAllEnabled());
 
         if (command.getFilters() != null && !command.getFilters().isEmpty()) {
-        	webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
         }
 
         if (command.getImageNameFilter() != null) {
-        	webTarget = webTarget.queryParam("filter", urlPathSegmentEscaper().escape(command.getImageNameFilter()));
+            webTarget = webTarget.queryParam("filter", urlPathSegmentEscaper().escape(command.getImageNameFilter()));
         }
 
         LOGGER.trace("GET: {}", webTarget);
diff --git a/src/main/java/com/github/dockerjava/netty/MediaType.java b/src/main/java/com/github/dockerjava/netty/MediaType.java
index a7738604a..50732aeb8 100644
--- a/src/main/java/com/github/dockerjava/netty/MediaType.java
+++ b/src/main/java/com/github/dockerjava/netty/MediaType.java
@@ -8,17 +8,17 @@
  */
 public enum MediaType {
 
-	APPLICATION_JSON("application/json"),
-	APPLICATION_OCTET_STREAM("application/octet-stream"),
-	APPLICATION_X_TAR("application/x-tar");
+    APPLICATION_JSON("application/json"),
+    APPLICATION_OCTET_STREAM("application/octet-stream"),
+    APPLICATION_X_TAR("application/x-tar");
 
-	private String mediaType;
+    private String mediaType;
 
-	private MediaType(String mediaType) {
-		this.mediaType = mediaType;
-	}
+    private MediaType(String mediaType) {
+        this.mediaType = mediaType;
+    }
 
-	public String getMediaType() {
-		return mediaType;
-	}
+    public String getMediaType() {
+        return mediaType;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java b/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
index 54ffb2f96..cb6f60678 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
@@ -11,13 +11,13 @@
  *
  * @author Marcus Linke
  */
-public class JsonRequestHandler extends MessageToByteEncoder<Object>{
+public class JsonRequestHandler extends MessageToByteEncoder<Object> {
 
-	private ObjectMapper mapper = new ObjectMapper();
+    private ObjectMapper mapper = new ObjectMapper();
 
-	@Override
-	protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception {
-		byte[] serialized = mapper.writeValueAsBytes(msg);
-		out.writeBytes(serialized);
-	}
+    @Override
+    protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception {
+        byte[] serialized = mapper.writeValueAsBytes(msg);
+        out.writeBytes(serialized);
+    }
 }
diff --git a/src/test/resources/checkstyle/checkstyle-config.xml b/src/test/resources/checkstyle/checkstyle-config.xml
index 9f9f7b02b..f65ea846f 100644
--- a/src/test/resources/checkstyle/checkstyle-config.xml
+++ b/src/test/resources/checkstyle/checkstyle-config.xml
@@ -18,6 +18,14 @@
         <property name="lineSeparator" value="lf"/>
     </module>
 
+    <module name="Translation"/>
+
+    <module name="FileLength"/>
+
+    <module name="FileTabCharacter">
+        <property name="eachLine" value="true"/>
+    </module>
+
     <module name="TreeWalker">
         <module name="UnusedImports">
             <property name="processJavadoc" value="true"/>

From 2d110ad9ee602e08190c9859fb39334f6907250e Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 31 Jan 2016 16:15:27 +0300
Subject: [PATCH 0383/1272] Checkstyle: no trailing spaces.

---
 .../github/dockerjava/api/model/Capability.java    |  2 +-
 .../dockerjava/api/model/InternetProtocol.java     | 14 +++++++++-----
 .../github/dockerjava/api/model/Repository.java    |  4 ++--
 .../github/dockerjava/core/GoLangFileMatch.java    |  6 +++---
 .../github/dockerjava/core/KeystoreSSLConfig.java  |  2 +-
 .../java/com/github/dockerjava/core/SSLConfig.java |  2 +-
 .../dockerjava/core/command/PingCmdImpl.java       |  1 -
 .../connector/ApacheConnectorClientResponse.java   |  4 ++--
 .../jaxrs/filter/FollowRedirectsFilter.java        |  2 +-
 .../jaxrs/filter/SelectiveLoggingFilter.java       |  3 +--
 .../resources/checkstyle/checkstyle-config.xml     |  7 +++++++
 11 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/Capability.java b/src/main/java/com/github/dockerjava/api/model/Capability.java
index b17827553..4757937e3 100644
--- a/src/main/java/com/github/dockerjava/api/model/Capability.java
+++ b/src/main/java/com/github/dockerjava/api/model/Capability.java
@@ -3,7 +3,7 @@
 /**
  * The Linux capabilities supported by Docker. The list of capabilities is defined in Docker's types.go, {@link #ALL}
  * was added manually.
- * 
+ *
  * @see <a
  *      href="http://man7.org/linux/man-pages/man7/capabilities.7.html">http://man7.org/linux/man-pages/man7/capabilities.7.html</a>
  */
diff --git a/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java b/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
index 65df8cf6f..e3ef2b98c 100644
--- a/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
+++ b/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
@@ -2,15 +2,19 @@
 
 /**
  * The IP protocols supported by Docker.
- * 
+ *
  * @see #TCP
  * @see #UDP
  */
 public enum InternetProtocol {
-    /** The <i>Transmission Control Protocol</i> */
+    /**
+     * The <i>Transmission Control Protocol</i>
+     */
     TCP,
 
-    /** The <i>User Datagram Protocol</i> */
+    /**
+     * The <i>User Datagram Protocol</i>
+     */
     UDP;
 
     /**
@@ -21,7 +25,7 @@ public enum InternetProtocol {
     /**
      * Returns a string representation of this {@link InternetProtocol} suitable for inclusion in a JSON message. The
      * output is the lowercased name of the Protocol, e.g. <code>tcp</code>.
-     * 
+     *
      * @return a string representation of this {@link InternetProtocol}
      */
     @Override
@@ -31,7 +35,7 @@ public String toString() {
 
     /**
      * Parses a string to an {@link InternetProtocol}.
-     * 
+     *
      * @param serialized
      *            the protocol, e.g. <code>tcp</code> or <code>TCP</code>
      * @return an {@link InternetProtocol} described by the string
diff --git a/src/main/java/com/github/dockerjava/api/model/Repository.java b/src/main/java/com/github/dockerjava/api/model/Repository.java
index 1c5b641ba..3055c8980 100644
--- a/src/main/java/com/github/dockerjava/api/model/Repository.java
+++ b/src/main/java/com/github/dockerjava/api/model/Repository.java
@@ -13,7 +13,7 @@ public class Repository {
 
     /**
      * Name may be eg. 'busybox' or '10.0.0.1:5000/fred'
-     * 
+     *
      * @param name
      *            Repository name
      */
@@ -23,7 +23,7 @@ public Repository(String name) {
 
     /**
      * Return the URL portion (repository). Note that this might not actually BE a repository location.
-     * 
+     *
      * @return
      * @throws java.net.MalformedURLException
      */
diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index ef798d68d..2f29789ea 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -26,16 +26,16 @@
  *                  character class (must be non-empty)
  *       c           matches character c (c != '*', '?', '\\', '[')
  *       '\\' c      matches character c
- * 
+ *
  *   character-range:
  *       c           matches character c (c != '\\', '-', ']')
  *       '\\' c      matches character c
  *       lo '-' hi   matches character c for lo <= c <= hi
- * 
+ *
  *  Match requires pattern to match all of name, not just a substring.
  *  The only possible returned error is ErrBadPattern, when pattern
  *  is malformed.
- * 
+ *
  * On Windows, escaping is disabled. Instead, '\\' is treated as
  *  path separator.
  * </pre>
diff --git a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
index dc9defbfb..5e62f4d78 100644
--- a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
@@ -65,7 +65,7 @@ public KeystoreSSLConfig(File pfxFile, String password) throws KeyStoreException
 
     /**
      * Get the SSL Context out of the keystore.
-     * 
+     *
      * @return java SSLContext
      * @throws KeyManagementException
      * @throws UnrecoverableKeyException
diff --git a/src/main/java/com/github/dockerjava/core/SSLConfig.java b/src/main/java/com/github/dockerjava/core/SSLConfig.java
index 6c7e5c353..0346aa610 100644
--- a/src/main/java/com/github/dockerjava/core/SSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/SSLConfig.java
@@ -14,7 +14,7 @@ public interface SSLConfig {
 
     /**
      * Get the SSL Context, from wherever it comes (file, keystore).
-     * 
+     *
      * @return an SSL context.
      */
     SSLContext getSSLContext() throws KeyManagementException, UnrecoverableKeyException, NoSuchAlgorithmException,
diff --git a/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java
index c9118a095..39c9666d7 100644
--- a/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java
@@ -4,7 +4,6 @@
 
 /**
  * Ping the Docker server
- * 
  */
 public class PingCmdImpl extends AbstrDockerCmd<PingCmd, Void> implements PingCmd {
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java
index d358f574a..fead3575c 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java
@@ -11,9 +11,9 @@
 
 /**
  * Fix for https://github.com/docker-java/docker-java/issues/196
- * 
+ *
  * https://java.net/jira/browse/JERSEY-2852
- * 
+ *
  * @author Marcus Linke
  *
  */
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java
index be079d430..cb5cd0687 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java
@@ -12,7 +12,7 @@
  * Default implementation of RedirectStrategy honors the restrictions on automatic redirection of entity enclosing
  * methods such as POST and PUT imposed by the HTTP specification. 302 Moved Temporarily, 301 Moved Permanently and 307
  * Temporary Redirect status codes will result in an automatic redirect of HEAD and GET methods only.
- * 
+ *
  * {@link org.apache.http.impl.client.DefaultRedirectStrategy}
  *
  * This filter allows arbitrary redirection for other methods.
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
index 847033fd5..2251d8fad 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
@@ -13,9 +13,8 @@
 
 /**
  * A version of the logging filter that will avoid trying to log entities which can cause issues with the console.
- * 
- * @author sfitts
  *
+ * @author sfitts
  */
 public class SelectiveLoggingFilter extends LoggingFilter {
 
diff --git a/src/test/resources/checkstyle/checkstyle-config.xml b/src/test/resources/checkstyle/checkstyle-config.xml
index f65ea846f..0b42e4d05 100644
--- a/src/test/resources/checkstyle/checkstyle-config.xml
+++ b/src/test/resources/checkstyle/checkstyle-config.xml
@@ -26,6 +26,13 @@
         <property name="eachLine" value="true"/>
     </module>
 
+    <module name="RegexpSingleline">
+        <!-- \s matches whitespace character, $ matches end of line. -->
+        <property name="format" value="\s+$"/>
+        <property name="message" value="Line has trailing spaces."/>
+    </module>
+
+
     <module name="TreeWalker">
         <module name="UnusedImports">
             <property name="processJavadoc" value="true"/>

From 3dcb1439957e51e669f8a2ed476aad612ba47e6f Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 31 Jan 2016 16:35:38 +0300
Subject: [PATCH 0384/1272] Checkstyle: fix naming convention.

---
 .../com/github/dockerjava/api/model/Info.java | 36 +++++++++----------
 .../github/dockerjava/api/model/Ports.java    |  4 +--
 .../dockerjava/core/DockerClientConfig.java   |  6 ++--
 .../github/dockerjava/core/NameParser.java    |  3 +-
 .../dockerjava/core/util/FiltersEncoder.java  |  2 +-
 .../jaxrs/connector/ApacheConnector.java      | 10 +++---
 .../jaxrs/filter/LoggingFilter.java           | 10 +++---
 .../github/dockerjava/netty/WebTarget.java    |  2 +-
 .../dockerjava/api/model/BindingTest.java     |  8 ++---
 .../api/model/Ports_addBindingsTest.java      |  4 +--
 .../command/CreateContainerCmdImplTest.java   | 12 +++----
 .../command/StartContainerCmdImplTest.java    | 20 +++++------
 .../exec/CreateContainerCmdExecTest.java      | 14 ++++----
 .../netty/exec/StartContainerCmdExecTest.java | 22 ++++++------
 .../checkstyle/checkstyle-config.xml          | 31 ++++++++++++++++
 15 files changed, 106 insertions(+), 78 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/Info.java b/src/main/java/com/github/dockerjava/api/model/Info.java
index d038df878..0e4816cce 100644
--- a/src/main/java/com/github/dockerjava/api/model/Info.java
+++ b/src/main/java/com/github/dockerjava/api/model/Info.java
@@ -25,7 +25,7 @@ public class Info {
     private Boolean debug;
 
     @JsonProperty("DockerRootDir")
-    private String DockerRootDir;
+    private String dockerRootDir;
 
     @JsonProperty("Driver")
     private String driver;
@@ -37,16 +37,16 @@ public class Info {
     private String executionDriver;
 
     @JsonProperty("ID")
-    private String ID;
+    private String id;
 
     @JsonProperty("IPv4Forwarding")
-    private Boolean IPv4Forwarding;
+    private Boolean ipv4Forwarding;
 
     @JsonProperty("Images")
     private Integer images;
 
     @JsonProperty("IndexServerAddress")
-    private String IndexServerAddress;
+    private String indexServerAddress;
 
     @JsonProperty("InitPath")
     private String initPath;
@@ -58,7 +58,7 @@ public class Info {
     private String kernelVersion;
 
     @JsonProperty("Labels")
-    private String[] Labels;
+    private String[] labels;
 
     @JsonProperty("MemoryLimit")
     private Boolean memoryLimit;
@@ -70,19 +70,19 @@ public class Info {
     private String name;
 
     @JsonProperty("NCPU")
-    private Integer NCPU;
+    private Integer ncpu;
 
     @JsonProperty("NEventsListener")
     private Long nEventListener;
 
     @JsonProperty("NFd")
-    private Integer NFd;
+    private Integer nfd;
 
     @JsonProperty("NGoroutines")
-    private Integer NGoroutines;
+    private Integer nGoroutines;
 
     @JsonProperty("OperatingSystem")
-    private String OperatingSystem;
+    private String operatingSystem;
 
     @JsonProperty("Sockets")
     private String[] sockets;
@@ -99,7 +99,7 @@ public Integer getContainers() {
     }
 
     public String getDockerRootDir() {
-        return DockerRootDir;
+        return dockerRootDir;
     }
 
     public String getDriver() {
@@ -115,15 +115,15 @@ public Integer getImages() {
     }
 
     public String getID() {
-        return ID;
+        return id;
     }
 
     public Boolean getIPv4Forwarding() {
-        return IPv4Forwarding;
+        return ipv4Forwarding;
     }
 
     public String getIndexServerAddress() {
-        return IndexServerAddress;
+        return indexServerAddress;
     }
 
     public String getInitPath() {
@@ -139,7 +139,7 @@ public String getKernelVersion() {
     }
 
     public String[] getLabels() {
-        return Labels;
+        return labels;
     }
 
     public String[] getSockets() {
@@ -163,19 +163,19 @@ public String getName() {
     }
 
     public Integer getNCPU() {
-        return NCPU;
+        return ncpu;
     }
 
     public Integer getNFd() {
-        return NFd;
+        return nfd;
     }
 
     public Integer getNGoroutines() {
-        return NGoroutines;
+        return nGoroutines;
     }
 
     public String getOperatingSystem() {
-        return OperatingSystem;
+        return operatingSystem;
     }
 
     public Boolean getSwapLimit() {
diff --git a/src/main/java/com/github/dockerjava/api/model/Ports.java b/src/main/java/com/github/dockerjava/api/model/Ports.java
index 0ff5762e6..780e5911c 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -112,14 +112,14 @@ public Map<ExposedPort, Binding[]> getBindings() {
     /**
      * Creates a {@link Binding} for the given IP address and port number.
      */
-    public static Binding Binding(String hostIp, Integer hostPort) {
+    public static Binding binding(String hostIp, Integer hostPort) {
         return new Binding(hostIp, hostPort);
     }
 
     /**
      * Creates a {@link Binding} for the given port number, leaving the IP address undefined.
      */
-    public static Binding Binding(Integer hostPort) {
+    public static Binding binding(Integer hostPort) {
         return new Binding(hostPort);
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index fa5c77e6a..0a1868922 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -270,10 +270,10 @@ public AuthConfig effectiveAuthConfig(String imageName) {
             authConfig = authConfigFile.resolveAuthConfig(hostnameReposName.hostname);
         }
 
-        AuthConfig _authConfig = getAuthConfig();
+        AuthConfig otherAuthConfig = getAuthConfig();
 
-        if (_authConfig != null)
-            authConfig = _authConfig;
+        if (otherAuthConfig != null)
+            authConfig = otherAuthConfig;
 
         return authConfig;
     }
diff --git a/src/main/java/com/github/dockerjava/core/NameParser.java b/src/main/java/com/github/dockerjava/core/NameParser.java
index ba2948fb8..3c58eb331 100644
--- a/src/main/java/com/github/dockerjava/core/NameParser.java
+++ b/src/main/java/com/github/dockerjava/core/NameParser.java
@@ -13,13 +13,14 @@
 import com.github.dockerjava.core.exception.InvalidRepositoryNameException;
 
 public class NameParser {
-
+    //CHECKSTYLE:OFF
     private static final int RepositoryNameTotalLengthMax = 255;
 
     private static final Pattern RepositoryNameComponentRegexp = Pattern.compile("[a-z0-9]+(?:[._-][a-z0-9]+)*");
 
     private static final Pattern RepositoryNameComponentAnchoredRegexp = Pattern.compile("^"
             + RepositoryNameComponentRegexp.pattern() + "$");
+    //CHECKSTYLE:ON
 
     // private static final Pattern RepositoryNameRegexp = Pattern.compile("(?:" +
     // RepositoryNameComponentRegexp.pattern()
diff --git a/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java b/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
index 75f9d48c2..164528a8c 100644
--- a/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
+++ b/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
@@ -17,7 +17,7 @@
  */
 public class FiltersEncoder {
 
-    private static ObjectMapper OBJECT_MAPPER = new JacksonJaxbJsonProvider().locateMapper(Map.class,
+    private static final ObjectMapper OBJECT_MAPPER = new JacksonJaxbJsonProvider().locateMapper(Map.class,
             MediaType.APPLICATION_JSON_TYPE);
 
     public static String jsonEncode(Map<String, List<String>> filters) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
index f7c830902..cfbabb513 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
@@ -184,13 +184,13 @@ class ApacheConnector implements Connector {
 
     private final static Logger LOGGER = Logger.getLogger(ApacheConnector.class.getName());
 
-    private static final VersionInfo vi;
+    private static final VersionInfo VERSION_INFO;
 
-    private static final String release;
+    private static final String RELEASE;
 
     static {
-        vi = VersionInfo.loadVersionInfo("org.apache.http.client", HttpClientBuilder.class.getClassLoader());
-        release = (vi != null) ? vi.getRelease() : VersionInfo.UNAVAILABLE;
+        VERSION_INFO = VersionInfo.loadVersionInfo("org.apache.http.client", HttpClientBuilder.class.getClassLoader());
+        RELEASE = (VERSION_INFO != null) ? VERSION_INFO.getRelease() : VersionInfo.UNAVAILABLE;
     }
 
     private final CloseableHttpClient client;
@@ -507,7 +507,7 @@ public void run() {
 
     @Override
     public String getName() {
-        return "Apache HttpClient " + release;
+        return "Apache HttpClient " + RELEASE;
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
index 6dbea0045..ccd6500d1 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
@@ -109,7 +109,7 @@ public int compare(final Map.Entry<String, List<String>> o1, final Map.Entry<Str
     @SuppressWarnings("NonConstantLogger")
     private final Logger logger;
 
-    private final AtomicLong _id = new AtomicLong(0);
+    private final AtomicLong id = new AtomicLong(0);
 
     private final Boolean printEntity;
 
@@ -227,7 +227,7 @@ private InputStream logInboundEntity(final StringBuilder b, InputStream stream)
 
     @Override
     public void filter(final ClientRequestContext context) throws IOException {
-        final long id = this._id.incrementAndGet();
+        final long id = this.id.incrementAndGet();
         final StringBuilder b = new StringBuilder();
 
         printRequestLine(b, "Sending client request", id, context.getMethod(), context.getUri());
@@ -246,7 +246,7 @@ public void filter(final ClientRequestContext context) throws IOException {
     @Override
     public void filter(final ClientRequestContext requestContext, final ClientResponseContext responseContext)
             throws IOException {
-        final long id = this._id.incrementAndGet();
+        final long id = this.id.incrementAndGet();
         final StringBuilder b = new StringBuilder();
 
         printResponseLine(b, "Client response received", id, responseContext.getStatus());
@@ -261,7 +261,7 @@ public void filter(final ClientRequestContext requestContext, final ClientRespon
 
     @Override
     public void filter(final ContainerRequestContext context) throws IOException {
-        final long id = this._id.incrementAndGet();
+        final long id = this.id.incrementAndGet();
         final StringBuilder b = new StringBuilder();
 
         printRequestLine(b, "Server has received a request", id, context.getMethod(), context.getUriInfo()
@@ -278,7 +278,7 @@ public void filter(final ContainerRequestContext context) throws IOException {
     @Override
     public void filter(final ContainerRequestContext requestContext, final ContainerResponseContext responseContext)
             throws IOException {
-        final long id = this._id.incrementAndGet();
+        final long id = this.id.incrementAndGet();
         final StringBuilder b = new StringBuilder();
 
         printResponseLine(b, "Server responded with a response", id, responseContext.getStatus());
diff --git a/src/main/java/com/github/dockerjava/netty/WebTarget.java b/src/main/java/com/github/dockerjava/netty/WebTarget.java
index 7698858a3..f86520434 100644
--- a/src/main/java/com/github/dockerjava/netty/WebTarget.java
+++ b/src/main/java/com/github/dockerjava/netty/WebTarget.java
@@ -22,7 +22,7 @@ public class WebTarget {
 
     private Map<String, String> queryParams = new HashMap<String, String>();
 
-    private static String PATH_SEPARATOR = "/";
+    private static final String PATH_SEPARATOR = "/";
 
     public WebTarget(ChannelProvider channelProvider) {
         this.channelProvider = channelProvider;
diff --git a/src/test/java/com/github/dockerjava/api/model/BindingTest.java b/src/test/java/com/github/dockerjava/api/model/BindingTest.java
index 3309a8904..23e793cf8 100644
--- a/src/test/java/com/github/dockerjava/api/model/BindingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/BindingTest.java
@@ -10,22 +10,22 @@ public class BindingTest {
 
     @Test
     public void parseIpAndPort() {
-        assertEquals(Binding.parse("127.0.0.1:80"), Ports.Binding("127.0.0.1", 80));
+        assertEquals(Binding.parse("127.0.0.1:80"), Ports.binding("127.0.0.1", 80));
     }
 
     @Test
     public void parsePortOnly() {
-        assertEquals(Binding.parse("80"), Ports.Binding(null, 80));
+        assertEquals(Binding.parse("80"), Ports.binding(null, 80));
     }
 
     @Test
     public void parseIPOnly() {
-        assertEquals(Binding.parse("127.0.0.1"), Ports.Binding("127.0.0.1", null));
+        assertEquals(Binding.parse("127.0.0.1"), Ports.binding("127.0.0.1", null));
     }
 
     @Test
     public void parseEmptyString() {
-        assertEquals(Binding.parse(""), Ports.Binding(null, null));
+        assertEquals(Binding.parse(""), Ports.binding(null, null));
     }
 
     @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Binding 'nonsense'")
diff --git a/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java b/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
index da127b122..05a2b3f01 100644
--- a/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
@@ -19,9 +19,9 @@ public class Ports_addBindingsTest {
 
     private static final ExposedPort TCP_90 = ExposedPort.tcp(90);
 
-    private static final Binding BINDING_8080 = Ports.Binding(8080);
+    private static final Binding BINDING_8080 = Ports.binding(8080);
 
-    private static final Binding BINDING_9090 = Ports.Binding(9090);
+    private static final Binding BINDING_9090 = Ports.binding(9090);
 
     private Ports ports;
 
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index ce2771652..3f989c114 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -363,9 +363,9 @@ public void createContainerWithPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.Binding(11022));
-        portBindings.bind(tcp23, Ports.Binding(11023));
-        portBindings.bind(tcp23, Ports.Binding(11024));
+        portBindings.bind(tcp22, Ports.binding(11022));
+        portBindings.bind(tcp23, Ports.binding(11023));
+        portBindings.bind(tcp23, Ports.binding(11024));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
@@ -379,13 +379,13 @@ public void createContainerWithPortBindings() throws DockerException {
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
-                is(equalTo(Ports.Binding(11022))));
+                is(equalTo(Ports.binding(11022))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
-                is(equalTo(Ports.Binding(11023))));
+                is(equalTo(Ports.binding(11023))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
-                is(equalTo(Ports.Binding(11024))));
+                is(equalTo(Ports.binding(11024))));
 
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index b43eb0ff2..ce060f4bb 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -186,9 +186,9 @@ public void startContainerWithPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.Binding(11022));
-        portBindings.bind(tcp23, Ports.Binding(11023));
-        portBindings.bind(tcp23, Ports.Binding(11024));
+        portBindings.bind(tcp22, Ports.binding(11022));
+        portBindings.bind(tcp23, Ports.binding(11023));
+        portBindings.bind(tcp23, Ports.binding(11024));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
@@ -206,13 +206,13 @@ public void startContainerWithPortBindings() throws DockerException {
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
-                is(equalTo(Ports.Binding(11022))));
+                is(equalTo(Ports.binding(11022))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
-                is(equalTo(Ports.Binding(11023))));
+                is(equalTo(Ports.binding(11023))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
-                is(equalTo(Ports.Binding(11024))));
+                is(equalTo(Ports.binding(11024))));
 
     }
 
@@ -223,8 +223,8 @@ public void startContainerWithRandomPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.Binding(null));
-        portBindings.bind(tcp23, Ports.Binding(null));
+        portBindings.bind(tcp22, Ports.binding(null));
+        portBindings.bind(tcp23, Ports.binding(null));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).withPublishAllPorts(true).exec();
@@ -254,8 +254,8 @@ public void startContainerWithConflictingPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.Binding(11022));
-        portBindings.bind(tcp23, Ports.Binding(11022));
+        portBindings.bind(tcp22, Ports.binding(11022));
+        portBindings.bind(tcp23, Ports.binding(11022));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
index 9a37ef01a..a29b26d7b 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
@@ -32,7 +32,6 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.AccessMode;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
@@ -42,7 +41,6 @@
 import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Ulimit;
 import com.github.dockerjava.api.model.Volume;
-import com.github.dockerjava.api.model.VolumeRW;
 import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 
@@ -358,9 +356,9 @@ public void createContainerWithPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.Binding(11022));
-        portBindings.bind(tcp23, Ports.Binding(11023));
-        portBindings.bind(tcp23, Ports.Binding(11024));
+        portBindings.bind(tcp22, Ports.binding(11022));
+        portBindings.bind(tcp23, Ports.binding(11023));
+        portBindings.bind(tcp23, Ports.binding(11024));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
@@ -374,13 +372,13 @@ public void createContainerWithPortBindings() throws DockerException {
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
-                is(equalTo(Ports.Binding(11022))));
+                is(equalTo(Ports.binding(11022))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
-                is(equalTo(Ports.Binding(11023))));
+                is(equalTo(Ports.binding(11023))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
-                is(equalTo(Ports.Binding(11024))));
+                is(equalTo(Ports.binding(11024))));
 
     }
 
diff --git a/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
index d743935eb..8af196a60 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
@@ -31,7 +31,6 @@
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.InternalServerErrorException;
 import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.model.AccessMode;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
@@ -39,7 +38,6 @@
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Volume;
-import com.github.dockerjava.api.model.VolumeRW;
 import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.core.command.WaitContainerResultCallback;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
@@ -189,9 +187,9 @@ public void startContainerWithPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.Binding(11022));
-        portBindings.bind(tcp23, Ports.Binding(11023));
-        portBindings.bind(tcp23, Ports.Binding(11024));
+        portBindings.bind(tcp22, Ports.binding(11022));
+        portBindings.bind(tcp23, Ports.binding(11023));
+        portBindings.bind(tcp23, Ports.binding(11024));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
@@ -209,13 +207,13 @@ public void startContainerWithPortBindings() throws DockerException {
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
-                is(equalTo(Ports.Binding(11022))));
+                is(equalTo(Ports.binding(11022))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
-                is(equalTo(Ports.Binding(11023))));
+                is(equalTo(Ports.binding(11023))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
-                is(equalTo(Ports.Binding(11024))));
+                is(equalTo(Ports.binding(11024))));
 
     }
 
@@ -226,8 +224,8 @@ public void startContainerWithRandomPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.Binding(null));
-        portBindings.bind(tcp23, Ports.Binding(null));
+        portBindings.bind(tcp22, Ports.binding(null));
+        portBindings.bind(tcp23, Ports.binding(null));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).withPublishAllPorts(true).exec();
@@ -257,8 +255,8 @@ public void startContainerWithConflictingPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.Binding(11022));
-        portBindings.bind(tcp23, Ports.Binding(11022));
+        portBindings.bind(tcp22, Ports.binding(11022));
+        portBindings.bind(tcp23, Ports.binding(11022));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
diff --git a/src/test/resources/checkstyle/checkstyle-config.xml b/src/test/resources/checkstyle/checkstyle-config.xml
index 0b42e4d05..c31d642ef 100644
--- a/src/test/resources/checkstyle/checkstyle-config.xml
+++ b/src/test/resources/checkstyle/checkstyle-config.xml
@@ -32,8 +32,39 @@
         <property name="message" value="Line has trailing spaces."/>
     </module>
 
+    <module name="SuppressionCommentFilter">
+        <property name="offCommentFormat" value="CHECKSTYLE\:OFF"/>
+        <property name="onCommentFormat" value="CHECKSTYLE\:ON"/>
+    </module>
+
+    <module name="SuppressWithNearbyCommentFilter"/>
+
+    <!-- Support @SuppressWarnings (added in Checkstyle 5.7) -->
+    <!-- see http://checkstyle.sourceforge.net/config.html#SuppressWarningsFilter -->
+    <module name="SuppressWarningsFilter"/>
 
     <module name="TreeWalker">
+        <property name="cacheFile" value="${checkstyle.cache.file}"/>
+
+        <!-- required for SuppressWarningsFilter (and other Suppress* rules not used here) -->
+        <!-- see http://checkstyle.sourceforge.net/config_annotation.html#SuppressWarningsHolder -->
+        <module name="SuppressWarningsHolder"/>
+
+        <module name="FileContentsHolder"/>
+
+        <!-- Checks for Naming Conventions.                  -->
+        <!-- See http://checkstyle.sf.net/config_naming.html -->
+        <module name="ConstantName"/>
+        <module name="LocalFinalVariableName"/>
+        <module name="LocalVariableName"/>
+        <module name="MemberName"/>
+        <module name="MethodName"/>
+        <module name="PackageName"/>
+        <module name="ParameterName"/>
+        <module name="StaticVariableName"/>
+        <module name="TypeName"/>
+
+
         <module name="UnusedImports">
             <property name="processJavadoc" value="true"/>
         </module>

From 5bcb8f846edc81fc97b5d7d19c1c6d513c9c80e3 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 31 Jan 2016 16:49:45 +0300
Subject: [PATCH 0385/1272] Checkstyle: line length fix + other.

---
 .../dockerjava/api/command/AuthCmd.java       |  3 +-
 .../checkstyle/checkstyle-config.xml          | 44 ++++++++++++++++++-
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
index 8402ee533..75e5801ff 100644
--- a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
@@ -21,7 +21,8 @@ public interface AuthCmd extends SyncDockerCmd<AuthResponse> {
 
     /**
      * @return The status. Based on it's value you may mean you need to authorise your account, e.g.:
-     *         "Account created. Please see the documentation of the registry http://localhost:5000/v1/ for instructions how to activate it."
+     *         "Account created. Please see the documentation of the registry http://localhost:5000/v1/
+     *         for instructions how to activate it."
      * @throws UnauthorizedException
      *             If you're not authorised (e.g. bad password).
      */
diff --git a/src/test/resources/checkstyle/checkstyle-config.xml b/src/test/resources/checkstyle/checkstyle-config.xml
index c31d642ef..74a724eba 100644
--- a/src/test/resources/checkstyle/checkstyle-config.xml
+++ b/src/test/resources/checkstyle/checkstyle-config.xml
@@ -64,10 +64,52 @@
         <module name="StaticVariableName"/>
         <module name="TypeName"/>
 
-
+        <!-- Checks for imports                              -->
+        <!-- See http://checkstyle.sf.net/config_import.html -->
+        <module name="AvoidStarImport"/>
+        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+        <module name="RedundantImport"/>
         <module name="UnusedImports">
             <property name="processJavadoc" value="true"/>
         </module>
+
+        <!-- IDEA mathcher? uncomment as last commit -->
+        <!--<module name="ImportOrder">-->
+            <!--<property name="groups" value="*,javax,java"/>-->
+            <!--<property name="ordered" value="true"/>-->
+            <!--<property name="separated" value="false"/>-->
+            <!--<property name="option" value="bottom"/>-->
+            <!--<property name="sortStaticImportsAlphabetically" value="true"/>-->
+        <!--</module>-->
+
+        <!--http://checkstyle.sourceforge.net/config_misc.html#Indentation-->
+        <!-- 220 errors -->
+        <!--<module name="Indentation"/>-->
+
+        <!-- Checks for Size Violations.                    -->
+        <!-- See http://checkstyle.sf.net/config_sizes.html -->
+        <module name="LineLength">
+            <property name="max" value="140"/>
+            <property name="ignorePattern" value="^//.*|^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+        </module>
+        <module name="MethodLength"/>
+        <!-- upto @marcuslinke -->
+        <!--<module name="ParameterNumber"/>-->
+
+        <!-- Checks for whitespace                               -->
+        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+        <module name="EmptyForIteratorPad"/>
+        <module name="MethodParamPad"/>
+        <module name="NoWhitespaceAfter"/>
+        <module name="NoWhitespaceBefore"/>
+        <module name="OperatorWrap">
+            <property name="option" value="eol"/>
+        </module>
+        <module name="ParenPad"/>
+        <module name="TypecastParenPad"/>
+        <module name="WhitespaceAfter"/>
+        <module name="WhitespaceAround"/>
+
     </module>
 
 </module>

From c76a187bee6bc9d3d3b322914356b8aa13007f0c Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 31 Jan 2016 17:07:14 +0300
Subject: [PATCH 0386/1272] Checkstyle: whitespace checks.

---
 .../java/com/github/dockerjava/api/model/Ports.java |  2 +-
 .../github/dockerjava/core/DockerClientConfig.java  |  2 +-
 .../github/dockerjava/core/KeystoreSSLConfig.java   |  2 +-
 .../dockerjava/core/dockerfile/Dockerfile.java      |  2 +-
 .../dockerjava/core/util/CertificateUtils.java      |  2 +-
 src/test/resources/checkstyle/checkstyle-config.xml | 13 ++++++++-----
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/Ports.java b/src/main/java/com/github/dockerjava/api/model/Ports.java
index 780e5911c..6132e4647 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -70,7 +70,7 @@ public void bind(ExposedPort exposedPort, Binding binding) {
             if (binding == null) {
                 ports.put(exposedPort, null);
             } else {
-                ports.put(exposedPort, new Binding[] { binding });
+                ports.put(exposedPort, new Binding[]{binding});
             }
         }
     }
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index 0a1868922..8c363321c 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -178,7 +178,7 @@ private static Properties overrideDockerPropertiesWithSystemProperties(Propertie
         Properties overriddenProperties = new Properties();
         overriddenProperties.putAll(p);
 
-        for (String key : new String[] { DOCKER_IO_URL_PROPERTY, DOCKER_IO_VERSION_PROPERTY,
+        for (String key : new String[]{DOCKER_IO_URL_PROPERTY, DOCKER_IO_VERSION_PROPERTY,
                 DOCKER_IO_USERNAME_PROPERTY, DOCKER_IO_PASSWORD_PROPERTY, DOCKER_IO_EMAIL_PROPERTY,
                 DOCKER_IO_SERVER_ADDRESS_PROPERTY, DOCKER_IO_DOCKER_CERT_PATH_PROPERTY,
                 DOCKER_IO_DOCKER_CFG_PATH_PROPERTY, }) {
diff --git a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
index 5e62f4d78..a552b3775 100644
--- a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
@@ -87,7 +87,7 @@ public SSLContext getSSLContext() throws KeyManagementException, UnrecoverableKe
         final KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory
                 .getDefaultAlgorithm());
         keyManagerFactory.init(keystore, keystorePassword.toCharArray());
-        context.init(keyManagerFactory.getKeyManagers(), new TrustManager[] { new X509TrustManager() {
+        context.init(keyManagerFactory.getKeyManagers(), new TrustManager[]{new X509TrustManager() {
             @Override
             public X509Certificate[] getAcceptedIssuers() {
                 return new X509Certificate[] {};
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 077aff4bf..d7173d4d8 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -147,7 +147,7 @@ public int read() throws IOException {
                     }
 
                     @Override
-                    public int read(byte [] buff, int offset, int len) throws IOException {
+                    public int read(byte[] buff, int offset, int len) throws IOException {
                         return tarInputStream.read(buff, offset, len);
                     }
 
diff --git a/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java b/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
index 19f142593..65e6544f1 100644
--- a/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
+++ b/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
@@ -31,7 +31,7 @@ private CertificateUtils() {
     }
 
     public static boolean verifyCertificatesExist(String dockerCertPath) {
-        String[] files = { "ca.pem", "cert.pem", "key.pem" };
+        String[] files = {"ca.pem", "cert.pem", "key.pem"};
         for (String file : files) {
             File path = new File(dockerCertPath, file);
             return path.exists();
diff --git a/src/test/resources/checkstyle/checkstyle-config.xml b/src/test/resources/checkstyle/checkstyle-config.xml
index 74a724eba..1f9e606eb 100644
--- a/src/test/resources/checkstyle/checkstyle-config.xml
+++ b/src/test/resources/checkstyle/checkstyle-config.xml
@@ -98,17 +98,20 @@
 
         <!-- Checks for whitespace                               -->
         <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="EmptyForIteratorPad"/>
+        <!-- @KostyaSha unsure -->
+        <!--<module name="EmptyForIteratorPad"/>-->
         <module name="MethodParamPad"/>
         <module name="NoWhitespaceAfter"/>
         <module name="NoWhitespaceBefore"/>
-        <module name="OperatorWrap">
-            <property name="option" value="eol"/>
-        </module>
+        <!-- upto @marcuslinke -->
+        <!--<module name="OperatorWrap">-->
+            <!--<property name="option" value="eol"/>-->
+        <!--</module>-->
         <module name="ParenPad"/>
         <module name="TypecastParenPad"/>
         <module name="WhitespaceAfter"/>
-        <module name="WhitespaceAround"/>
+        <!-- some weirdness with logger in CommitCmdExec and CreateImageCmdExec -->
+        <!--<module name="WhitespaceAround"/>-->
 
     </module>
 

From 01f82d2c2c4ff93a7c5d0fcf22750f615f7e46eb Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 31 Jan 2016 18:36:39 +0300
Subject: [PATCH 0387/1272] Checkstyle: redundant lines.

Disabled for now.
---
 .../api/command/AsyncDockerCmd.java           |  2 +-
 .../api/command/AttachContainerCmd.java       | 30 +++++++++----------
 .../checkstyle/checkstyle-config.xml          |  4 +++
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java b/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
index 221d3d165..3218a8419 100644
--- a/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
@@ -13,6 +13,6 @@
  */
 public interface AsyncDockerCmd<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T>, A_RES_T> extends DockerCmd<Void> {
 
-    public <T extends ResultCallback<A_RES_T>> T exec(T resultCallback);
+    <T extends ResultCallback<A_RES_T>> T exec(T resultCallback);
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
index 6326fa13b..84f063d7e 100644
--- a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
@@ -26,46 +26,46 @@
 public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, Frame> {
 
     @CheckForNull
-    public String getContainerId();
+    String getContainerId();
 
     @CheckForNull
-    public Boolean hasLogsEnabled();
+    Boolean hasLogsEnabled();
 
     @CheckForNull
-    public Boolean hasFollowStreamEnabled();
+    Boolean hasFollowStreamEnabled();
 
     @CheckForNull
-    public Boolean hasTimestampsEnabled();
+    Boolean hasTimestampsEnabled();
 
     @CheckForNull
-    public Boolean hasStdoutEnabled();
+    Boolean hasStdoutEnabled();
 
     @CheckForNull
-    public Boolean hasStderrEnabled();
+    Boolean hasStderrEnabled();
 
     @CheckForNull
-    public InputStream getStdin();
+    InputStream getStdin();
 
-    public AttachContainerCmd withContainerId(@Nonnull String containerId);
+    AttachContainerCmd withContainerId(@Nonnull String containerId);
 
     /**
      * Following the stream means the resulting {@link InputStream} returned by {@link #exec()} reads infinitely. So a
      * {@link InputStream#read()} MAY BLOCK FOREVER as long as no data is streamed from the docker host to
      * {@link DockerClient}!
      */
-    public AttachContainerCmd withFollowStream(Boolean followStream);
+    AttachContainerCmd withFollowStream(Boolean followStream);
 
-    public AttachContainerCmd withTimestamps(Boolean timestamps);
+    AttachContainerCmd withTimestamps(Boolean timestamps);
 
-    public AttachContainerCmd withStdOut(Boolean stdout);
+    AttachContainerCmd withStdOut(Boolean stdout);
 
-    public AttachContainerCmd withStdErr(Boolean stderr);
+    AttachContainerCmd withStdErr(Boolean stderr);
 
-    public AttachContainerCmd withStdIn(InputStream stdin);
+    AttachContainerCmd withStdIn(InputStream stdin);
 
-    public AttachContainerCmd withLogs(Boolean logs);
+    AttachContainerCmd withLogs(Boolean logs);
 
-    public static interface Exec extends DockerCmdAsyncExec<AttachContainerCmd, Frame> {
+    interface Exec extends DockerCmdAsyncExec<AttachContainerCmd, Frame> {
     }
 
 }
diff --git a/src/test/resources/checkstyle/checkstyle-config.xml b/src/test/resources/checkstyle/checkstyle-config.xml
index 1f9e606eb..0a0969513 100644
--- a/src/test/resources/checkstyle/checkstyle-config.xml
+++ b/src/test/resources/checkstyle/checkstyle-config.xml
@@ -113,6 +113,10 @@
         <!-- some weirdness with logger in CommitCmdExec and CreateImageCmdExec -->
         <!--<module name="WhitespaceAround"/>-->
 
+        <!-- Modifier Checks                                    -->
+        <!-- Verify with @marcuslinke before. 576 violations -->
+        <!--<module name="RedundantModifier"/>-->
+
     </module>
 
 </module>

From a2c6773a037fd86ae8bb5ad0f5cd5bce381d597b Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 31 Jan 2016 18:37:12 +0300
Subject: [PATCH 0388/1272] Checkstyle: fixed ModifierOrder.

ModifierOrder: 'static' modifier out of order with the JLS suggestions.
---
 .../github/dockerjava/core/async/ResultCallbackTemplate.java    | 2 +-
 .../java/com/github/dockerjava/core/command/AbstrDockerCmd.java | 2 +-
 .../dockerjava/core/command/AttachContainerResultCallback.java  | 2 +-
 .../dockerjava/core/command/BuildImageResultCallback.java       | 2 +-
 .../github/dockerjava/core/command/EventsResultCallback.java    | 2 +-
 .../github/dockerjava/core/command/ExecStartResultCallback.java | 2 +-
 .../dockerjava/core/command/LogContainerResultCallback.java     | 2 +-
 .../github/dockerjava/core/command/PullImageResultCallback.java | 2 +-
 .../github/dockerjava/core/command/PushImageResultCallback.java | 2 +-
 .../dockerjava/core/command/WaitContainerResultCallback.java    | 2 +-
 .../com/github/dockerjava/jaxrs/connector/ApacheConnector.java  | 2 +-
 src/test/resources/checkstyle/checkstyle-config.xml             | 2 ++
 12 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index 5e63f2b5f..f87c0e525 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -25,7 +25,7 @@
 public abstract class ResultCallbackTemplate<RC_T extends ResultCallback<A_RES_T>, A_RES_T> implements
         ResultCallback<A_RES_T> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(ResultCallbackTemplate.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ResultCallbackTemplate.class);
 
     private final CountDownLatch started = new CountDownLatch(1);
 
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
index 0c7877503..9e1e775c5 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
@@ -19,7 +19,7 @@
 
 public abstract class AbstrDockerCmd<CMD_T extends DockerCmd<RES_T>, RES_T> implements SyncDockerCmd<RES_T> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(AbstrDockerCmd.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AbstrDockerCmd.class);
 
     protected DockerCmdSyncExec<CMD_T, RES_T> execution;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java b/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
index f16b20301..bddddfd4f 100644
--- a/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
@@ -16,7 +16,7 @@
  */
 public class AttachContainerResultCallback extends ResultCallbackTemplate<AttachContainerResultCallback, Frame> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(AttachContainerResultCallback.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AttachContainerResultCallback.class);
 
     @Override
     public void onNext(Frame item) {
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
index 06c6b1e51..1ca276434 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
@@ -21,7 +21,7 @@
  */
 public class BuildImageResultCallback extends ResultCallbackTemplate<BuildImageResultCallback, BuildResponseItem> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(BuildImageResultCallback.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageResultCallback.class);
 
     @CheckForNull
     private BuildResponseItem latestItem = null;
diff --git a/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java b/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
index c731b863e..cd6205f6d 100644
--- a/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
@@ -16,7 +16,7 @@
  */
 public class EventsResultCallback extends ResultCallbackTemplate<EventsResultCallback, Event> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(EventsResultCallback.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(EventsResultCallback.class);
 
     @Override
     public void onNext(Event item) {
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java b/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
index 5f73b65eb..62e492db9 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
@@ -16,7 +16,7 @@
  */
 public class ExecStartResultCallback extends ResultCallbackTemplate<ExecStartResultCallback, Frame> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(ExecStartResultCallback.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExecStartResultCallback.class);
 
     private OutputStream stdout, stderr;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java b/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
index b7fc81cb2..677e5fb64 100644
--- a/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
@@ -16,7 +16,7 @@
  */
 public class LogContainerResultCallback extends ResultCallbackTemplate<LogContainerResultCallback, Frame> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(LogContainerResultCallback.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(LogContainerResultCallback.class);
 
     @Override
     public void onNext(Frame item) {
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
index 27be12215..ce274dbe8 100644
--- a/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
@@ -19,7 +19,7 @@
  */
 public class PullImageResultCallback extends ResultCallbackTemplate<PullImageResultCallback, PullResponseItem> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(PullImageResultCallback.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PullImageResultCallback.class);
 
     @CheckForNull
     private PullResponseItem latestItem = null;
diff --git a/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
index 65ec93c88..55dfb5650 100644
--- a/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
@@ -19,7 +19,7 @@
  */
 public class PushImageResultCallback extends ResultCallbackTemplate<PushImageResultCallback, PushResponseItem> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(PushImageResultCallback.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PushImageResultCallback.class);
 
     @CheckForNull
     private PushResponseItem latestItem = null;
diff --git a/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java b/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
index 5416d124c..feb7916e7 100644
--- a/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
@@ -21,7 +21,7 @@
  */
 public class WaitContainerResultCallback extends ResultCallbackTemplate<WaitContainerResultCallback, WaitResponse> {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(WaitContainerResultCallback.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(WaitContainerResultCallback.class);
 
     @CheckForNull
     private WaitResponse waitResponse = null;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
index cfbabb513..7994f3261 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
@@ -182,7 +182,7 @@
 @SuppressWarnings("deprecation")
 class ApacheConnector implements Connector {
 
-    private final static Logger LOGGER = Logger.getLogger(ApacheConnector.class.getName());
+    private static final Logger LOGGER = Logger.getLogger(ApacheConnector.class.getName());
 
     private static final VersionInfo VERSION_INFO;
 
diff --git a/src/test/resources/checkstyle/checkstyle-config.xml b/src/test/resources/checkstyle/checkstyle-config.xml
index 0a0969513..ee08b57c2 100644
--- a/src/test/resources/checkstyle/checkstyle-config.xml
+++ b/src/test/resources/checkstyle/checkstyle-config.xml
@@ -114,6 +114,8 @@
         <!--<module name="WhitespaceAround"/>-->
 
         <!-- Modifier Checks                                    -->
+        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+        <module name="ModifierOrder"/>
         <!-- Verify with @marcuslinke before. 576 violations -->
         <!--<module name="RedundantModifier"/>-->
 

From 1fc561bf1245c3464deb4ad44de619b781527d0d Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 31 Jan 2016 19:05:58 +0300
Subject: [PATCH 0389/1272] Checkstyle: fixed braces.

---
 .../github/dockerjava/api/model/AuthConfig.java    |  2 ++
 .../java/com/github/dockerjava/api/model/Bind.java |  3 ++-
 .../com/github/dockerjava/api/model/Device.java    |  3 ++-
 .../github/dockerjava/api/model/ExposedPort.java   |  3 ++-
 .../com/github/dockerjava/api/model/Frame.java     |  2 ++
 .../github/dockerjava/api/model/Identifier.java    | 13 ++++++++-----
 .../java/com/github/dockerjava/api/model/Link.java |  3 ++-
 .../com/github/dockerjava/api/model/LogConfig.java |  3 ++-
 .../github/dockerjava/api/model/PortBinding.java   |  3 ++-
 .../com/github/dockerjava/api/model/Ports.java     |  3 ++-
 .../github/dockerjava/api/model/Repository.java    |  3 ++-
 .../github/dockerjava/api/model/RestartPolicy.java | 11 ++++++++---
 .../com/github/dockerjava/api/model/Ulimit.java    |  2 ++
 .../com/github/dockerjava/api/model/Volume.java    |  3 ++-
 .../com/github/dockerjava/api/model/VolumeRW.java  |  3 ++-
 .../github/dockerjava/api/model/VolumesFrom.java   |  3 ++-
 .../com/github/dockerjava/core/AuthConfigFile.java |  2 ++
 .../github/dockerjava/core/DockerClientConfig.java |  5 ++++-
 .../github/dockerjava/core/DockerClientImpl.java   |  9 ++++++---
 .../github/dockerjava/core/KeystoreSSLConfig.java  |  3 ++-
 .../github/dockerjava/core/RemoteApiVersion.java   |  2 ++
 .../core/async/ResultCallbackTemplate.java         |  9 +++++----
 .../dockerjava/core/command/BuildImageCmdImpl.java |  9 ++++++---
 .../dockerjava/core/dockerfile/Dockerfile.java     |  9 ++++++---
 .../dockerjava/core/util/FiltersBuilder.java       |  2 ++
 .../dockerjava/jaxrs/AttachContainerCmdExec.java   |  3 ++-
 .../dockerjava/jaxrs/DockerCmdExecFactoryImpl.java | 12 ++++++++----
 .../dockerjava/jaxrs/ListVolumesCmdExec.java       |  3 ++-
 .../dockerjava/jaxrs/TopContainerCmdExec.java      |  3 ++-
 .../jaxrs/async/AbstractCallbackNotifier.java      |  3 ++-
 .../dockerjava/netty/exec/ListNetworksCmdExec.java |  3 ++-
 .../dockerjava/netty/exec/ListVolumesCmdExec.java  |  3 ++-
 .../dockerjava/netty/exec/TopContainerCmdExec.java |  3 ++-
 .../netty/handler/FramedResponseStreamHandler.java |  3 ++-
 .../resources/checkstyle/checkstyle-config.xml     | 14 ++++++++++++++
 35 files changed, 117 insertions(+), 46 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
index 0e994daf3..0bd6cac8c 100644
--- a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -79,6 +79,7 @@ public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
+    //CHECKSTYLE:OFF
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -127,4 +128,5 @@ public boolean equals(Object obj) {
             return false;
         return true;
     }
+    //CHECKSTYLE:ON
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Bind.java b/src/main/java/com/github/dockerjava/api/model/Bind.java
index f7f6954f5..aa4863923 100644
--- a/src/main/java/com/github/dockerjava/api/model/Bind.java
+++ b/src/main/java/com/github/dockerjava/api/model/Bind.java
@@ -72,8 +72,9 @@ public boolean equals(Object obj) {
             Bind other = (Bind) obj;
             return new EqualsBuilder().append(path, other.getPath()).append(volume, other.getVolume())
                     .append(accessMode, other.getAccessMode()).isEquals();
-        } else
+        } else {
             return super.equals(obj);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/Device.java b/src/main/java/com/github/dockerjava/api/model/Device.java
index 21aef589a..9240239b1 100644
--- a/src/main/java/com/github/dockerjava/api/model/Device.java
+++ b/src/main/java/com/github/dockerjava/api/model/Device.java
@@ -52,8 +52,9 @@ public boolean equals(Object obj) {
             return new EqualsBuilder().append(cGroupPermissions, other.getcGroupPermissions())
                     .append(pathInContainer, other.getPathInContainer()).append(pathOnHost, other.getPathOnHost())
                     .isEquals();
-        } else
+        } else {
             return super.equals(obj);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/ExposedPort.java b/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
index 4dbdbe19b..43ee92291 100644
--- a/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
+++ b/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
@@ -151,8 +151,9 @@ public boolean equals(Object obj) {
         if (obj instanceof ExposedPort) {
             ExposedPort other = (ExposedPort) obj;
             return new EqualsBuilder().append(protocol, other.getProtocol()).append(port, other.getPort()).isEquals();
-        } else
+        } else {
             return super.equals(obj);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/Frame.java b/src/main/java/com/github/dockerjava/api/model/Frame.java
index 1be92f9b6..e398ec255 100644
--- a/src/main/java/com/github/dockerjava/api/model/Frame.java
+++ b/src/main/java/com/github/dockerjava/api/model/Frame.java
@@ -28,6 +28,7 @@ public String toString() {
         return String.format("%s: %s", streamType, new String(payload).trim());
     }
 
+    //CHECKSTYLE:OFF
     @Override
     public boolean equals(Object o) {
         if (this == o)
@@ -47,4 +48,5 @@ public int hashCode() {
         result = 31 * result + Arrays.hashCode(payload);
         return result;
     }
+    //CHECKSTYLE:ON
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Identifier.java b/src/main/java/com/github/dockerjava/api/model/Identifier.java
index 96daab11a..ed5100e25 100644
--- a/src/main/java/com/github/dockerjava/api/model/Identifier.java
+++ b/src/main/java/com/github/dockerjava/api/model/Identifier.java
@@ -14,10 +14,11 @@ public class Identifier {
     public Identifier(Repository repository, String tag) {
         this.repository = repository;
 
-        if (tag == null)
+        if (tag == null) {
             this.tag = Optional.absent();
-        else
+        } else {
             this.tag = Optional.of(tag);
+        }
     }
 
     /**
@@ -33,15 +34,17 @@ public static Identifier fromCompoundString(String identifier) {
         String[] parts = identifier.split("/");
         if (parts.length != 2) {
             String[] rhs = identifier.split(":");
-            if (rhs.length != 2)
+            if (rhs.length != 2) {
                 return new Identifier(new Repository(identifier), null);
-            else
+            } else {
                 return new Identifier(new Repository(rhs[0]), rhs[1]);
+            }
         }
 
         String[] rhs = parts[1].split(":");
-        if (rhs.length != 2)
+        if (rhs.length != 2) {
             return new Identifier(new Repository(identifier), null);
+        }
 
         return new Identifier(new Repository(parts[0] + "/" + rhs[0]), rhs[1]);
     }
diff --git a/src/main/java/com/github/dockerjava/api/model/Link.java b/src/main/java/com/github/dockerjava/api/model/Link.java
index 43f9de65b..f647438a9 100644
--- a/src/main/java/com/github/dockerjava/api/model/Link.java
+++ b/src/main/java/com/github/dockerjava/api/model/Link.java
@@ -74,8 +74,9 @@ public boolean equals(final Object obj) {
         if (obj instanceof Link) {
             final Link other = (Link) obj;
             return new EqualsBuilder().append(name, other.getName()).append(alias, other.getAlias()).isEquals();
-        } else
+        } else {
             return super.equals(obj);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
index 37bb17a8e..669bbc554 100644
--- a/src/main/java/com/github/dockerjava/api/model/LogConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
@@ -98,8 +98,9 @@ public LoggingType deserialize(JsonParser jsonParser, DeserializationContext des
                 JsonNode node = oc.readTree(jsonParser);
 
                 for (LoggingType loggingType : values()) {
-                    if (loggingType.getType().equals(node.asText()))
+                    if (loggingType.getType().equals(node.asText())) {
                         return loggingType;
+                    }
                 }
 
                 throw new IllegalArgumentException("No enum constant " + LoggingType.class + "." + node.asText());
diff --git a/src/main/java/com/github/dockerjava/api/model/PortBinding.java b/src/main/java/com/github/dockerjava/api/model/PortBinding.java
index 99e04f1bc..81f94ca06 100644
--- a/src/main/java/com/github/dockerjava/api/model/PortBinding.java
+++ b/src/main/java/com/github/dockerjava/api/model/PortBinding.java
@@ -64,8 +64,9 @@ public boolean equals(Object obj) {
             PortBinding other = (PortBinding) obj;
             return new EqualsBuilder().append(binding, other.getBinding()).append(exposedPort, other.getExposedPort())
                     .isEquals();
-        } else
+        } else {
             return super.equals(obj);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/Ports.java b/src/main/java/com/github/dockerjava/api/model/Ports.java
index 6132e4647..43ad92585 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -249,8 +249,9 @@ public boolean equals(Object obj) {
                 Binding other = (Binding) obj;
                 return new EqualsBuilder().append(hostIp, other.getHostIp()).append(hostPort, other.getHostPort())
                         .isEquals();
-            } else
+            } else {
                 return super.equals(obj);
+            }
         }
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Repository.java b/src/main/java/com/github/dockerjava/api/model/Repository.java
index 3055c8980..1e814a1b5 100644
--- a/src/main/java/com/github/dockerjava/api/model/Repository.java
+++ b/src/main/java/com/github/dockerjava/api/model/Repository.java
@@ -37,8 +37,9 @@ public String toString() {
     }
 
     public String getPath() {
-        if (!name.contains("/"))
+        if (!name.contains("/")) {
             return name;
+        }
 
         return name.substring(name.indexOf("/") + 1);
     }
diff --git a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
index 34f8e7e57..d5c8f6e8e 100644
--- a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
+++ b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
@@ -89,10 +89,14 @@ public static RestartPolicy parse(String serialized) throws IllegalArgumentExcep
         try {
             String[] parts = serialized.split(":");
             String name = parts[0];
-            if ("no".equals(name))
+            if ("no".equals(name)) {
                 return noRestart();
-            if ("always".equals(name))
+            }
+
+            if ("always".equals(name)) {
                 return alwaysRestart();
+            }
+
             if ("on-failure".equals(name)) {
                 int count = 0;
                 if (parts.length == 2) {
@@ -124,8 +128,9 @@ public boolean equals(Object obj) {
             RestartPolicy other = (RestartPolicy) obj;
             return new EqualsBuilder().append(maximumRetryCount, other.getMaximumRetryCount())
                     .append(name, other.getName()).isEquals();
-        } else
+        } else {
             return super.equals(obj);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/Ulimit.java b/src/main/java/com/github/dockerjava/api/model/Ulimit.java
index 209eb22fe..51602e043 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ulimit.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ulimit.java
@@ -45,6 +45,7 @@ public Integer getHard() {
         return hard;
     }
 
+    //CHECKSTYLE:OFF
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof Ulimit) {
@@ -60,4 +61,5 @@ public boolean equals(Object obj) {
     public int hashCode() {
         return new HashCodeBuilder().append(name).append(soft).append(hard).toHashCode();
     }
+    //CHECKSTYLE:ON
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Volume.java b/src/main/java/com/github/dockerjava/api/model/Volume.java
index 93f7e4e4f..655a8dbfc 100644
--- a/src/main/java/com/github/dockerjava/api/model/Volume.java
+++ b/src/main/java/com/github/dockerjava/api/model/Volume.java
@@ -30,8 +30,9 @@ public boolean equals(Object obj) {
         if (obj instanceof Volume) {
             Volume other = (Volume) obj;
             return new EqualsBuilder().append(path, other.getPath()).isEquals();
-        } else
+        } else {
             return super.equals(obj);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeRW.java b/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
index bdb347bee..3709d1b0c 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
@@ -69,8 +69,9 @@ public boolean equals(Object obj) {
             VolumeRW other = (VolumeRW) obj;
             return new EqualsBuilder().append(getVolume(), other.getVolume()).append(accessMode, other.getAccessMode())
                     .isEquals();
-        } else
+        } else {
             return super.equals(obj);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java b/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
index 01f80aba9..78585ef48 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
@@ -77,8 +77,9 @@ public boolean equals(Object obj) {
             VolumesFrom other = (VolumesFrom) obj;
             return new EqualsBuilder().append(container, other.getContainer())
                     .append(accessMode, other.getAccessMode()).isEquals();
-        } else
+        } else {
             return super.equals(obj);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
index 78fd453ab..7315a05af 100644
--- a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
+++ b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
@@ -63,6 +63,7 @@ public AuthConfigurations getAuthConfigurations() {
         return authConfigurations;
     }
 
+    //CHECKSTYLE:OFF
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -87,6 +88,7 @@ public boolean equals(Object obj) {
             return false;
         return true;
     }
+    //CHECKSTYLE:ON
 
     @Override
     public String toString() {
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index 8c363321c..35f54c736 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -272,8 +272,9 @@ public AuthConfig effectiveAuthConfig(String imageName) {
 
         AuthConfig otherAuthConfig = getAuthConfig();
 
-        if (otherAuthConfig != null)
+        if (otherAuthConfig != null) {
             authConfig = otherAuthConfig;
+        }
 
         return authConfig;
     }
@@ -294,6 +295,7 @@ public AuthConfigurations getAuthConfigurations() {
         return new AuthConfigurations();
     }
 
+    //CHECKSTYLE:OFF
     @Override
     public boolean equals(Object o) {
         if (this == o)
@@ -335,6 +337,7 @@ public int hashCode() {
         result = 31 * result + (sslConfig != null ? sslConfig.hashCode() : 0);
         return result;
     }
+    //CHECKSTYLE:ON
 
     @Override
     public String toString() {
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index ede135613..ca842b383 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -214,20 +214,23 @@ public PushImageCmd pushImageCmd(String name) {
         PushImageCmd cmd = new PushImageCmdImpl(getDockerCmdExecFactory().createPushImageCmdExec(), name);
 
         AuthConfig cfg = dockerClientConfig.effectiveAuthConfig(name);
-        if (cfg != null)
+        if (cfg != null) {
             cmd.withAuthConfig(cfg);
+        }
         return cmd;
     }
 
     @Override
     public PushImageCmd pushImageCmd(Identifier identifier) {
         PushImageCmd cmd = pushImageCmd(identifier.repository.name);
-        if (identifier.tag.isPresent())
+        if (identifier.tag.isPresent()) {
             cmd.withTag(identifier.tag.get());
+        }
 
         AuthConfig cfg = dockerClientConfig.effectiveAuthConfig(identifier.repository.name);
-        if (cfg != null)
+        if (cfg != null) {
             cmd.withAuthConfig(cfg);
+        }
 
         return cmd;
     }
diff --git a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
index a552b3775..bdc2e6e89 100644
--- a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
@@ -81,8 +81,9 @@ public SSLContext getSSLContext() throws KeyManagementException, UnrecoverableKe
         String httpProtocols = System.getProperty("https.protocols");
         System.setProperty("https.protocols", "TLSv1");
 
-        if (httpProtocols != null)
+        if (httpProtocols != null) {
             System.setProperty("https.protocols", httpProtocols);
+        }
 
         final KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory
                 .getDefaultAlgorithm());
diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index 63269ce55..80f9406b7 100644
--- a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -127,6 +127,7 @@ public boolean isGreaterOrEqual(final RemoteApiVersion other) {
         return false;
     }
 
+    //CHECKSTYLE:OFF
     @Override
     public boolean equals(final Object o) {
         if (this == o)
@@ -136,6 +137,7 @@ public boolean equals(final Object o) {
         final RemoteApiVersion that = (RemoteApiVersion) o;
         return Objects.equal(major, that.major) && Objects.equal(minor, that.minor);
     }
+    //CHECKSTYLE:ON
 
     @Override
     public int hashCode() {
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index f87c0e525..0e146c1e9 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -47,11 +47,11 @@ public void onStart(Closeable stream) {
     @Override
     public void onError(Throwable throwable) {
 
-        if (closed)
-            return;
+        if (closed) return;
 
-        if (this.firstError == null)
+        if (this.firstError == null) {
             this.firstError = throwable;
+        }
 
         try {
             LOGGER.error("Error during callback", throwable);
@@ -76,8 +76,9 @@ public void onComplete() {
     @Override
     public void close() throws IOException {
         closed = true;
-        if (stream != null)
+        if (stream != null) {
             stream.close();
+        }
         completed.countDown();
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index acf4fa10a..ef57e84a4 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -248,13 +248,16 @@ public BuildImageCmd withBaseDirectory(File baseDirectory) {
     @Override
     public BuildImageCmdImpl withDockerfile(File dockerfile) {
         checkNotNull(dockerfile);
-        if (!dockerfile.exists())
+        if (!dockerfile.exists()) {
             throw new IllegalArgumentException("Dockerfile does not exist");
-        if (!dockerfile.isFile())
+        }
+        if (!dockerfile.isFile()) {
             throw new IllegalArgumentException("Not a directory");
+        }
 
-        if (baseDirectory == null)
+        if (baseDirectory == null) {
             withBaseDirectory(dockerfile.getParentFile());
+        }
 
         this.dockerFile = dockerfile;
 
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index d7173d4d8..9a94d6b1d 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -221,21 +221,24 @@ private String effectiveMatchingIgnorePattern(File file) {
 
             List<String> matchingPattern = matchingIgnorePatterns(relativeFilename);
 
-            if (matchingPattern.isEmpty())
+            if (matchingPattern.isEmpty()) {
                 return null;
+            }
 
             String lastMatchingPattern = matchingPattern.get(matchingPattern.size() - 1);
 
             int lastMatchingPatternIndex = ignores.lastIndexOf(lastMatchingPattern);
 
-            if (lastMatchingPatternIndex == ignores.size() - 1)
+            if (lastMatchingPatternIndex == ignores.size() - 1) {
                 return lastMatchingPattern;
+            }
 
             List<String> remainingIgnorePattern = ignores.subList(lastMatchingPatternIndex + 1, ignores.size());
 
             for (String ignorePattern : remainingIgnorePattern) {
-                if (ignorePattern.equals("!" + relativeFilename))
+                if (ignorePattern.equals("!" + relativeFilename)) {
                     return null;
+                }
             }
 
             return lastMatchingPattern;
diff --git a/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java b/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
index d6cd0d9f7..7ad380481 100644
--- a/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
+++ b/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
@@ -81,6 +81,7 @@ private static List<String> labelsMapToList(Map<String, String> labels) {
         return result;
     }
 
+    //CHECKSTYLE:OFF
     @Override
     public boolean equals(Object o) {
         if (this == o)
@@ -93,6 +94,7 @@ public boolean equals(Object o) {
         return filters.equals(filters1.filters);
 
     }
+    //CHECKSTYLE:ON
 
     @Override
     public int hashCode() {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
index b3670a8b9..c21c305df 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
@@ -26,9 +26,10 @@ public AttachContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerC
     protected AbstractCallbackNotifier<Frame> callbackNotifier(AttachContainerCmd command,
             ResultCallback<Frame> resultCallback) {
 
-        if (command.getStdin() != null)
+        if (command.getStdin() != null) {
             throw new UnsupportedOperationException(
                     "Passing stdin to the container is currently not supported. Try experimental netty engine!");
+        }
 
         WebTarget webTarget = getBaseResource().path("/containers/{id}/attach").resolveTemplate("id",
                 command.getContainerId());
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index bbd71ba38..79f60ec39 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -134,15 +134,17 @@ public void init(DockerClientConfig dockerClientConfig) {
 
         if (clientResponseFilters != null) {
             for (ClientResponseFilter clientResponseFilter : clientResponseFilters) {
-                if (clientResponseFilter != null)
+                if (clientResponseFilter != null) {
                     clientConfig.register(clientResponseFilter);
+                }
             }
         }
 
         if (clientRequestFilters != null) {
             for (ClientRequestFilter clientRequestFilter : clientRequestFilters) {
-                if (clientRequestFilter != null)
+                if (clientRequestFilter != null) {
                     clientConfig.register(clientRequestFilter);
+                }
             }
         }
 
@@ -171,10 +173,12 @@ public void init(DockerClientConfig dockerClientConfig) {
         PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(
                 originalUri, sslContext));
 
-        if (maxTotalConnections != null)
+        if (maxTotalConnections != null) {
             connManager.setMaxTotal(maxTotalConnections);
-        if (maxPerRouteConnections != null)
+        }
+        if (maxPerRouteConnections != null) {
             connManager.setDefaultMaxPerRoute(maxPerRouteConnections);
+        }
 
         clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER, connManager);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
index dd877a89a..4f2165b93 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
@@ -25,8 +25,9 @@ public ListVolumesCmdExec(WebTarget baseResource, DockerClientConfig dockerClien
     protected ListVolumesResponse execute(ListVolumesCmd command) {
         WebTarget webTarget = getBaseResource().path("/volumes");
 
-        if (command.getFilters() != null && !command.getFilters().isEmpty())
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+        }
 
         LOGGER.trace("GET: {}", webTarget);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
index 48b6641a1..22841d8bf 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
@@ -25,8 +25,9 @@ protected TopContainerResponse execute(TopContainerCmd command) {
         WebTarget webResource = getBaseResource().path("/containers/{id}/top").resolveTemplate("id",
                 command.getContainerId());
 
-        if (!StringUtils.isEmpty(command.getPsArgs()))
+        if (!StringUtils.isEmpty(command.getPsArgs())) {
             webResource = webResource.queryParam("ps_args", command.getPsArgs());
+        }
 
         LOGGER.trace("GET: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_JSON).get(TopContainerResponse.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java b/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
index e94ad1f2c..aac5a94d6 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
@@ -58,8 +58,9 @@ public Void call() throws Exception {
         try {
             InputStream inputStream = new WrappedResponseInputStream(response);
 
-            if (resultCallback != null)
+            if (resultCallback != null) {
                 responseStreamProcessor.processResponseStream(inputStream, resultCallback);
+            }
 
             return null;
         } catch (Exception e) {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java
index e0c945d6d..11e5fe238 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java
@@ -28,8 +28,9 @@ public ListNetworksCmdExec(WebTarget baseResource, DockerClientConfig dockerClie
     protected List<Network> execute(ListNetworksCmd command) {
         WebTarget webTarget = getBaseResource().path("/networks");
 
-        if (command.getFilters() != null && !command.getFilters().isEmpty())
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+        }
 
         LOGGER.trace("GET: {}", webTarget);
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java
index 98d073ff5..1db5684cb 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java
@@ -26,8 +26,9 @@ public ListVolumesCmdExec(WebTarget baseResource, DockerClientConfig dockerClien
     protected ListVolumesResponse execute(ListVolumesCmd command) {
         WebTarget webTarget = getBaseResource().path("/volumes");
 
-        if (command.getFilters() != null && !command.getFilters().isEmpty())
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+        }
 
         LOGGER.trace("GET: {}", webTarget);
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/TopContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/TopContainerCmdExec.java
index 07ec12b03..c4ae9249d 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/TopContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/TopContainerCmdExec.java
@@ -25,8 +25,9 @@ protected TopContainerResponse execute(TopContainerCmd command) {
         WebTarget webResource = getBaseResource().path("/containers/{id}/top").resolveTemplate("id",
                 command.getContainerId());
 
-        if (!StringUtils.isEmpty(command.getPsArgs()))
+        if (!StringUtils.isEmpty(command.getPsArgs())) {
             webResource = webResource.queryParam("ps_args", command.getPsArgs());
+        }
 
         LOGGER.trace("GET: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<TopContainerResponse>() {
diff --git a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
index 945833cdd..b58292b51 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
@@ -89,8 +89,9 @@ private Frame decode() {
 
         if (streamType.equals(StreamType.RAW)) {
 
-            if (payloadCnt == 0)
+            if (payloadCnt == 0) {
                 payload = new byte[rawBuffer.readableBytes()];
+            }
 
             int count = read(payload, payloadCnt, rawBuffer.readableBytes());
 
diff --git a/src/test/resources/checkstyle/checkstyle-config.xml b/src/test/resources/checkstyle/checkstyle-config.xml
index ee08b57c2..a97064845 100644
--- a/src/test/resources/checkstyle/checkstyle-config.xml
+++ b/src/test/resources/checkstyle/checkstyle-config.xml
@@ -119,6 +119,20 @@
         <!-- Verify with @marcuslinke before. 576 violations -->
         <!--<module name="RedundantModifier"/>-->
 
+
+        <!-- Checks for blocks. You know, those {}'s         -->
+        <!-- See http://checkstyle.sf.net/config_blocks.html -->
+        <module name="AvoidNestedBlocks">
+            <property name="allowInSwitchCase" value="true"/>
+        </module>
+        <module name="EmptyBlock"/>
+        <module name="LeftCurly"/>
+        <module name="NeedBraces">
+            <property name="allowSingleLineStatement" value="true"/>
+        </module>
+        <module name="RightCurly"/>
+
+
     </module>
 
 </module>

From 552b05dbafbabab2eeac7c21f596779f8d2e7367 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sat, 30 Jan 2016 22:35:49 +0100
Subject: [PATCH 0390/1272] Refactoring of DockerClientConfig to better match
 with docker CLI configuration options

---
 README.md                                     |  62 ++--
 .../api/command/DockerCmdExecFactory.java     |   4 +
 .../dockerjava/core/DockerClientConfig.java   | 317 +++++++++---------
 .../dockerjava/core/DockerClientImpl.java     |  14 +-
 .../dockerjava/jaxrs/AbstrDockerCmdExec.java  |   2 +-
 .../jaxrs/DockerCmdExecFactoryImpl.java       |  83 +++--
 .../netty/DockerCmdExecFactoryImpl.java       |  31 +-
 .../netty/exec/AbstrDockerCmdExec.java        |   2 +-
 src/main/resources/docker-java.properties     |  17 +
 src/main/resources/docker.io.properties       |   5 -
 .../client/AbstractDockerClientTest.java      |   6 +-
 .../core/DockerClientConfigTest.java          | 195 +++++------
 .../dockerjava/core/DockerClientImplTest.java |   7 +-
 .../core/TestDockerCmdExecFactory.java        |   7 +
 .../someHomeDir/.docker/certs/dummy.txt       |   0
 .../resources/someHomeDir/.docker/config.json |   9 +
 16 files changed, 414 insertions(+), 347 deletions(-)
 create mode 100644 src/main/resources/docker-java.properties
 delete mode 100644 src/main/resources/docker.io.properties
 create mode 100644 src/test/resources/someHomeDir/.docker/certs/dummy.txt
 create mode 100644 src/test/resources/someHomeDir/.docker/config.json

diff --git a/README.md b/README.md
index 26ec653ac..9175135ae 100644
--- a/README.md
+++ b/README.md
@@ -85,13 +85,15 @@ For code examples, please look at the [Wiki](https://github.com/docker-java/dock
 
 There are a couple of configuration items, all of which have sensible defaults:
 
-* `url` The Docker URL, e.g. `https://localhost:2376` or `unix:///var/run/docker.sock`
-* `version` The API version, e.g. `1.16`.
-* `username` Your registry username (required to push containers).
-* `password` Your registry password.
-* `email` Your registry email.
-* `serverAddress` Your registry's address.
-* `dockerCertPath` Path to the docker certs.
+* `DOCKER_HOST` The Docker Host URL, e.g. `tcp://localhost:2376` or `unix:///var/run/docker.sock`
+* `DOCKER_TLS_VERIFY` enable/disable TLS verification (switch between `http` and `https` protocol)
+* `DOCKER_CERT_PATH` Path to the certificates needed for TLS verification
+* `DOCKER_CONFIG` Path for additional docker configuration files (like `.dockercfg`)
+* `api.version` The API version, e.g. `1.21`.
+* `registry.url` Your registry's address.
+* `registry.username` Your registry username (required to push containers).
+* `registry.password` Your registry password.
+* `registry.email` Your registry email.
 
 There are three ways to configure, in descending order of precedence:
 
@@ -99,42 +101,46 @@ There are three ways to configure, in descending order of precedence:
 In your application, e.g.
 
     DockerClientConfig config = DockerClientConfig.createDefaultConfigBuilder()
-        .withVersion("1.16")
-        .withUri("https://my-docker-host.tld:2376")
-        .withUsername("dockeruser")
-        .withPassword("ilovedocker")
-        .withEmail("dockeruser@github.com")
-        .withServerAddress("https://index.docker.io/v1/")
-        .withDockerCertPath("/home/user/.docker")
+        .withDockerHost("tcp://my-docker-host.tld:2376")
+        .withDockerTlsVerify("1")
+        .withDockerCertPath("/home/user/.docker/certs")
+        .withDockerConfig("/home/user/.docker")
+        .withApiVersion("1.21")
+        .withRegistryUrl("https://index.docker.io/v1/")
+        .withRegistryUsername("dockeruser")
+        .withRegistryPassword("ilovedocker")
+        .withRegistryEmail("dockeruser@github.com")
         .build();
     DockerClient docker = DockerClientBuilder.getInstance(config).build();
 
 #### Properties
 
-    docker.io.url=https://localhost:2376
-    docker.io.version=1.16
-    docker.io.username=dockeruser
-    docker.io.password=ilovedocker
-    docker.io.email=dockeruser@github.com
-    docker.io.serverAddress=https://index.docker.io/v1/
-    docker.io.dockerCertPath=/home/user/.docker
-
+    DOCKER_HOST=tcp://localhost:2376
+    DOCKER_TLS_VERIFY=1
+    DOCKER_CERT_PATH=/home/user/.docker/certs
+    DOCKER_CONFIG=/home/user/.docker
+    api.version=1.21
+    registry.url=https://index.docker.io/v1/
+    registry.username=dockeruser
+    registry.password=ilovedocker
+    registry.email=dockeruser@github.com
 
 ##### System Properties:
 
-    java -Ddocker.io.username=dockeruser pkg.Main
+    java -Dregistry.username=dockeruser pkg.Main
 
 ##### System Environment
 
-    export DOCKER_URL=http://localhost:2376
-
-Note: we also auto-detect defaults. If you use `DOCKER_HOST` we use that value, and if `DOCKER_CERT_PATH` or `DOCKER_TLS_VERIFY=1` is set, we switch to SSL.
+    export DOCKER_URL=tcp://localhost:2376
+    export DOCKER_TLS_VERIFY=1
+    export DOCKER_CERT_PATH=/home/user/.docker/certs
+    export DOCKER_CONFIG=/home/user/.docker
 
 ##### File System
 
-In `$HOME/.docker.io.properties`
+In `$HOME/.docker-java.properties`
 
 ##### Class Path
 
-In the class path at `/docker.io.properties`
+In the class path at `/docker-java.properties`
     
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index fb1715e38..fc793558f 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -3,6 +3,8 @@
 import java.io.Closeable;
 import java.io.IOException;
 
+import javax.net.ssl.SSLContext;
+
 import com.github.dockerjava.core.DockerClientConfig;
 
 public interface DockerCmdExecFactory extends Closeable {
@@ -105,6 +107,8 @@ public interface DockerCmdExecFactory extends Closeable {
 
     public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec();
 
+    public DockerCmdExecFactory withSSLContext(SSLContext sslContext);
+
     @Override
     public void close() throws IOException;
 
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index fa5c77e6a..400f417ea 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -8,10 +8,17 @@
 import java.io.InputStream;
 import java.io.Serializable;
 import java.net.URI;
-import java.util.Collections;
-import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
+
+import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
 
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.AuthConfig;
@@ -19,74 +26,108 @@
 import com.github.dockerjava.core.NameParser.HostnameReposName;
 import com.github.dockerjava.core.NameParser.ReposTag;
 
+/**
+ * Respects some of the docker CLI options. See
+ * https://docs.docker.com/engine/reference/commandline/cli/#environment-variables
+ */
 public class DockerClientConfig implements Serializable {
 
     private static final long serialVersionUID = -4307357472441531489L;
 
-    private static final String DOCKER_HOST_PROPERTY = "DOCKER_HOST";
+    public static final String DOCKER_HOST = "DOCKER_HOST";
 
-    private static final String DOCKER_CERT_PATH_PROPERTY = "DOCKER_CERT_PATH";
+    public static final String DOCKER_TLS_VERIFY = "DOCKER_TLS_VERIFY";
 
-    private static final String DOCKER_VERIFY_TLS_PROPERTY = "DOCKER_TLS_VERIFY";
+    public static final String DOCKER_CONFIG = "DOCKER_CONFIG";
 
-    private static final String DOCKER_IO_URL_PROPERTY = "docker.io.url";
+    public static final String DOCKER_CERT_PATH = "DOCKER_CERT_PATH";
 
-    private static final String DOCKER_IO_VERSION_PROPERTY = "docker.io.version";
+    public static final String API_VERSION = "api.version";
 
-    private static final String DOCKER_IO_USERNAME_PROPERTY = "docker.io.username";
+    public static final String REGISTRY_USERNAME = "registry.username";
 
-    private static final String DOCKER_IO_PASSWORD_PROPERTY = "docker.io.password";
+    public static final String REGISTRY_PASSWORD = "registry.password";
 
-    private static final String DOCKER_IO_EMAIL_PROPERTY = "docker.io.email";
+    public static final String REGISTRY_EMAIL = "registry.email";
 
-    private static final String DOCKER_IO_SERVER_ADDRESS_PROPERTY = "docker.io.serverAddress";
+    public static final String REGISTRY_URL = "registry.url";
 
-    private static final String DOCKER_IO_DOCKER_CERT_PATH_PROPERTY = "docker.io.dockerCertPath";
+    private static final String DOCKER_JAVA_PROPERTIES = "docker-java.properties";
 
-    private static final String DOCKER_IO_DOCKER_CFG_PATH_PROPERTY = "docker.io.dockerCfgPath";
+    private static final String DOCKER_CFG = ".dockercfg";
+
+    private static final Set<String> configKeys = new HashSet<String>();
 
-    /**
-     * A map from the environment name to the interval name.
-     */
-    // Immutable ish
-    private static final Map<String, String> ENV_NAME_TO_IO_NAME;
     static {
-        Map<String, String> m = new HashMap<String, String>();
-        m.put("DOCKER_URL", DOCKER_IO_URL_PROPERTY);
-        m.put("DOCKER_VERSION", DOCKER_IO_VERSION_PROPERTY);
-        m.put("DOCKER_USERNAME", DOCKER_IO_USERNAME_PROPERTY);
-        m.put("DOCKER_PASSWORD", DOCKER_IO_PASSWORD_PROPERTY);
-        m.put("DOCKER_EMAIL", DOCKER_IO_EMAIL_PROPERTY);
-        m.put("DOCKER_SERVER_ADDRESS", DOCKER_IO_SERVER_ADDRESS_PROPERTY);
-        m.put(DOCKER_CERT_PATH_PROPERTY, DOCKER_IO_DOCKER_CERT_PATH_PROPERTY);
-        m.put("DOCKER_CFG_PATH", DOCKER_IO_DOCKER_CFG_PATH_PROPERTY);
-        ENV_NAME_TO_IO_NAME = Collections.unmodifiableMap(m);
+        configKeys.add(DOCKER_HOST);
+        configKeys.add(DOCKER_TLS_VERIFY);
+        configKeys.add(DOCKER_CONFIG);
+        configKeys.add(DOCKER_CERT_PATH);
+        configKeys.add(API_VERSION);
+        configKeys.add(REGISTRY_USERNAME);
+        configKeys.add(REGISTRY_PASSWORD);
+        configKeys.add(REGISTRY_EMAIL);
+        configKeys.add(REGISTRY_URL);
     }
 
-    private static final String DOCKER_IO_PROPERTIES_PROPERTY = "docker.io.properties";
+    private URI dockerHost;
 
-    private URI uri;
+    private final String registryUsername, registryPassword, registryEmail, registryUrl, dockerConfig, dockerCertPath;
 
-    private final String username, password, email, serverAddress, dockerCfgPath;
+    private boolean dockerTlsVerify;
 
-    private final RemoteApiVersion version;
+    private final RemoteApiVersion apiVersion;
 
-    private final SSLConfig sslConfig;
+    DockerClientConfig(URI dockerHost, String dockerConfig, String apiVersion, String registryUrl,
+            String registryUsername, String registryPassword, String registryEmail, String dockerCertPath,
+            boolean dockerTslVerify) {
+        this.dockerHost = checkDockerHostScheme(dockerHost);
+        this.dockerTlsVerify = dockerTslVerify;
+        this.dockerCertPath = checkDockerCertPath(dockerTslVerify, dockerCertPath);
+        this.dockerConfig = dockerConfig;
+        this.apiVersion = RemoteApiVersion.parseConfigWithDefault(apiVersion);
+        this.registryUsername = registryUsername;
+        this.registryPassword = registryPassword;
+        this.registryEmail = registryEmail;
+        this.registryUrl = registryUrl;
+    }
 
-    DockerClientConfig(URI uri, String version, String username, String password, String email, String serverAddress,
-            String dockerCfgPath, SSLConfig sslConfig) {
-        this.uri = uri;
-        this.version = RemoteApiVersion.parseConfigWithDefault(version);
-        this.username = username;
-        this.password = password;
-        this.email = email;
-        this.serverAddress = serverAddress;
-        this.dockerCfgPath = dockerCfgPath;
-        this.sslConfig = sslConfig;
+    private URI checkDockerHostScheme(URI dockerHost) {
+        if ("tcp".equals(dockerHost.getScheme()) || "unix".equals(dockerHost.getScheme())) {
+            return dockerHost;
+        } else {
+            throw new DockerClientException("Unsupported protocol scheme found: '" + dockerHost
+                    + "'. Only 'tcp://' or 'unix://' supported.");
+        }
+    }
+
+    private String checkDockerCertPath(boolean dockerTlsVerify, String dockerCertPath) {
+        if (dockerTlsVerify) {
+            if (StringUtils.isEmpty(dockerCertPath)) {
+                throw new DockerClientException(
+                        "Enabled TLS verification (DOCKER_TLS_VERIFY=1) but certifate path (DOCKER_CERT_PATH) is not defined.");
+            } else {
+                File certPath = new File(dockerCertPath);
+
+                if (!certPath.exists()) {
+                    throw new DockerClientException(
+                            "Certificate path (DOCKER_CERT_PATH) '" + dockerCertPath + "' doesn't exist.");
+                }
+
+                if(certPath.isDirectory()) {
+                    return dockerCertPath;
+                } else {
+                    throw new DockerClientException(
+                            "Certificate path (DOCKER_CERT_PATH) '" + dockerCertPath + "' doesn't point to a directory.");
+                }
+            }
+        } else {
+            return dockerCertPath;
+        }
     }
 
     private static Properties loadIncludedDockerProperties(Properties systemProperties) {
-        try (InputStream is = DockerClientConfig.class.getResourceAsStream("/" + DOCKER_IO_PROPERTIES_PROPERTY)) {
+        try (InputStream is = DockerClientConfig.class.getResourceAsStream("/" + DOCKER_JAVA_PROPERTIES)) {
             Properties p = new Properties();
             p.load(is);
             replaceProperties(p, systemProperties);
@@ -125,7 +166,7 @@ private static Properties overrideDockerPropertiesWithSettingsFromUserHome(Prope
         overriddenProperties.putAll(p);
 
         final File usersDockerPropertiesFile = new File(systemProperties.getProperty("user.home"), "."
-                + DOCKER_IO_PROPERTIES_PROPERTY);
+                + DOCKER_JAVA_PROPERTIES);
         if (usersDockerPropertiesFile.isFile()) {
             try {
                 final FileInputStream in = new FileInputStream(usersDockerPropertiesFile);
@@ -146,27 +187,20 @@ private static Properties overrideDockerPropertiesWithEnv(Properties properties,
         overriddenProperties.putAll(properties);
 
         // special case which is a sensible default
-        if (env.containsKey(DOCKER_HOST_PROPERTY)) {
-            overriddenProperties.setProperty(DOCKER_IO_URL_PROPERTY,
-                    env.get(DOCKER_HOST_PROPERTY).replace("tcp", protocol(env)));
+        if (env.containsKey(DOCKER_HOST)) {
+            overriddenProperties.setProperty(DOCKER_HOST, env.get(DOCKER_HOST));
         }
 
         for (Map.Entry<String, String> envEntry : env.entrySet()) {
             String envKey = envEntry.getKey();
-            if (ENV_NAME_TO_IO_NAME.containsKey(envKey)) {
-                overriddenProperties.setProperty(ENV_NAME_TO_IO_NAME.get(envKey), envEntry.getValue());
+            if (configKeys.contains(envKey)) {
+                overriddenProperties.setProperty(envKey, envEntry.getValue());
             }
         }
 
         return overriddenProperties;
     }
 
-    private static String protocol(Map<String, String> env) {
-        // if this is set, we assume we need SSL
-        return env.containsKey(DOCKER_CERT_PATH_PROPERTY) || "1".equals(env.get(DOCKER_VERIFY_TLS_PROPERTY)) ? "https"
-                : "http";
-    }
-
     /**
      * Creates a new Properties object containing values overridden from the System properties
      *
@@ -178,10 +212,7 @@ private static Properties overrideDockerPropertiesWithSystemProperties(Propertie
         Properties overriddenProperties = new Properties();
         overriddenProperties.putAll(p);
 
-        for (String key : new String[] { DOCKER_IO_URL_PROPERTY, DOCKER_IO_VERSION_PROPERTY,
-                DOCKER_IO_USERNAME_PROPERTY, DOCKER_IO_PASSWORD_PROPERTY, DOCKER_IO_EMAIL_PROPERTY,
-                DOCKER_IO_SERVER_ADDRESS_PROPERTY, DOCKER_IO_DOCKER_CERT_PATH_PROPERTY,
-                DOCKER_IO_DOCKER_CFG_PATH_PROPERTY, }) {
+        for (String key : configKeys) {
             if (systemProperties.containsKey(key)) {
                 overriddenProperties.setProperty(key, systemProperties.getProperty(key));
             }
@@ -204,50 +235,55 @@ static DockerClientConfigBuilder createDefaultConfigBuilder(Map<String, String>
         return new DockerClientConfigBuilder().withProperties(properties);
     }
 
-    public URI getUri() {
-        return uri;
+    public URI getDockerHost() {
+        return dockerHost;
     }
 
-    public void setUri(URI uri) {
-        this.uri = uri;
+    public void setDockerHost(URI dockerHost) {
+        this.dockerHost = dockerHost;
     }
 
-    public RemoteApiVersion getVersion() {
-        return version;
+    public RemoteApiVersion getApiVersion() {
+        return apiVersion;
     }
 
-    public String getUsername() {
-        return username;
+    public String getRegistryUsername() {
+        return registryUsername;
     }
 
-    public String getPassword() {
-        return password;
+    public String getRegistryPassword() {
+        return registryPassword;
     }
 
-    public String getEmail() {
-        return email;
+    public String getRegistryEmail() {
+        return registryEmail;
     }
 
-    public String getServerAddress() {
-        return serverAddress;
+    public String getRegistryUrl() {
+        return registryUrl;
     }
 
-    public SSLConfig getSslConfig() {
-        return sslConfig;
+    public String getDockerConfig() {
+        return dockerConfig;
     }
 
-    public String getDockerCfgPath() {
-        return dockerCfgPath;
+    public String getDockerCertPath() {
+        return dockerCertPath;
+    }
+
+    public boolean getDockerTlsVerify() {
+        return dockerTlsVerify;
     }
 
     private AuthConfig getAuthConfig() {
         AuthConfig authConfig = null;
-        if (getUsername() != null && getPassword() != null && getEmail() != null && getServerAddress() != null) {
+        if (getRegistryUsername() != null && getRegistryPassword() != null && getRegistryEmail() != null
+                && getRegistryUrl() != null) {
             authConfig = new AuthConfig();
-            authConfig.setUsername(getUsername());
-            authConfig.setPassword(getPassword());
-            authConfig.setEmail(getEmail());
-            authConfig.setServerAddress(getServerAddress());
+            authConfig.setUsername(getRegistryUsername());
+            authConfig.setPassword(getRegistryPassword());
+            authConfig.setEmail(getRegistryEmail());
+            authConfig.setServerAddress(getRegistryUrl());
         }
         return authConfig;
     }
@@ -255,12 +291,12 @@ private AuthConfig getAuthConfig() {
     public AuthConfig effectiveAuthConfig(String imageName) {
         AuthConfig authConfig = null;
 
-        String dockerCfgFile = getDockerCfgPath();
+        File dockerCfgFile = new File(getDockerConfig() + File.separator + DOCKER_CFG);
 
-        if (dockerCfgFile != null && imageName != null) {
+        if (dockerCfgFile.exists() && dockerCfgFile.isFile() && imageName != null) {
             AuthConfigFile authConfigFile;
             try {
-                authConfigFile = AuthConfigFile.loadConfig(new File(dockerCfgFile));
+                authConfigFile = AuthConfigFile.loadConfig(dockerCfgFile);
             } catch (IOException e) {
                 throw new DockerClientException("Failed to parse dockerCfgFile", e);
             }
@@ -279,11 +315,11 @@ public AuthConfig effectiveAuthConfig(String imageName) {
     }
 
     public AuthConfigurations getAuthConfigurations() {
-        String dockerCfgFile = getDockerCfgPath();
-        if (dockerCfgFile != null) {
+        File dockerCfgFile = new File(getDockerConfig() + File.separator + DOCKER_CFG);
+        if (dockerCfgFile.exists() && dockerCfgFile.isFile()) {
             AuthConfigFile authConfigFile;
             try {
-                authConfigFile = AuthConfigFile.loadConfig(new File(dockerCfgFile));
+                authConfigFile = AuthConfigFile.loadConfig(dockerCfgFile);
             } catch (IOException e) {
                 throw new DockerClientException("Failed to parse dockerCfgFile", e);
             }
@@ -303,121 +339,92 @@ public boolean equals(Object o) {
 
         DockerClientConfig that = (DockerClientConfig) o;
 
-        if (sslConfig != null ? !sslConfig.equals(that.sslConfig) : that.sslConfig != null)
-            return false;
-        if (dockerCfgPath != null ? !dockerCfgPath.equals(that.dockerCfgPath) : that.dockerCfgPath != null)
-            return false;
-        if (email != null ? !email.equals(that.email) : that.email != null)
-            return false;
-        if (password != null ? !password.equals(that.password) : that.password != null)
-            return false;
-        if (serverAddress != null ? !serverAddress.equals(that.serverAddress) : that.serverAddress != null)
-            return false;
-        if (uri != null ? !uri.equals(that.uri) : that.uri != null)
-            return false;
-        if (username != null ? !username.equals(that.username) : that.username != null)
-            return false;
-        if (version != null ? !version.equals(that.version) : that.version != null)
-            return false;
-
-        return true;
+        return EqualsBuilder.reflectionEquals(this, that);
     }
 
     @Override
     public int hashCode() {
-        int result = uri != null ? uri.hashCode() : 0;
-        result = 31 * result + (version != null ? version.hashCode() : 0);
-        result = 31 * result + (username != null ? username.hashCode() : 0);
-        result = 31 * result + (password != null ? password.hashCode() : 0);
-        result = 31 * result + (email != null ? email.hashCode() : 0);
-        result = 31 * result + (serverAddress != null ? serverAddress.hashCode() : 0);
-        result = 31 * result + (dockerCfgPath != null ? dockerCfgPath.hashCode() : 0);
-        result = 31 * result + (sslConfig != null ? sslConfig.hashCode() : 0);
-        return result;
+        return HashCodeBuilder.reflectionHashCode(this);
     }
 
     @Override
     public String toString() {
-        return "DockerClientConfig{" + "uri=" + uri + ", version='" + version + '\'' + ", username='" + username + '\''
-                + ", password='" + password + '\'' + ", email='" + email + '\'' + ", serverAddress='" + serverAddress
-                + '\'' + ", dockerCfgPath='" + dockerCfgPath + '\'' + ", sslConfig='" + sslConfig + '\'' + '}';
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
     public static class DockerClientConfigBuilder {
-        private URI uri;
+        private URI dockerHost;
 
-        private String version, username, password, email, serverAddress, dockerCfgPath;
+        private String apiVersion, registryUsername, registryPassword, registryEmail, registryUrl, dockerConfig,
+                dockerCertPath;
 
-        private SSLConfig sslConfig;
+        private boolean dockerTlsVerify;
 
         /**
          * This will set all fields in the builder to those contained in the Properties object. The Properties object
-         * should contain the following docker.io.* keys: url, version, username, password, email, dockerCertPath, and
-         * dockerCfgPath. If docker.io.readTimeout or docker.io.enableLoggingFilter are not contained, they will be set
-         * to 1000 and true, respectively.
+         * should contain the following docker-java configuration keys: DOCKER_HOST, DOCKER_TLS_VERIFY, api.version,
+         * registry.username, registry.password, registry.email, DOCKER_CERT_PATH, and DOCKER_CONFIG.
          */
         public DockerClientConfigBuilder withProperties(Properties p) {
-            return withUri(p.getProperty(DOCKER_IO_URL_PROPERTY))
-                    .withVersion(p.getProperty(DOCKER_IO_VERSION_PROPERTY))
-                    .withUsername(p.getProperty(DOCKER_IO_USERNAME_PROPERTY))
-                    .withPassword(p.getProperty(DOCKER_IO_PASSWORD_PROPERTY))
-                    .withEmail(p.getProperty(DOCKER_IO_EMAIL_PROPERTY))
-                    .withServerAddress(p.getProperty(DOCKER_IO_SERVER_ADDRESS_PROPERTY))
-                    .withDockerCertPath(p.getProperty(DOCKER_IO_DOCKER_CERT_PATH_PROPERTY))
-                    .withDockerCfgPath(p.getProperty(DOCKER_IO_DOCKER_CFG_PATH_PROPERTY));
+            return withDockerHost(p.getProperty(DOCKER_HOST)).withDockerTlsVerify(p.getProperty(DOCKER_TLS_VERIFY))
+                    .withDockerConfig(p.getProperty(DOCKER_CONFIG)).withDockerCertPath(p.getProperty(DOCKER_CERT_PATH))
+                    .withApiVersion(p.getProperty(API_VERSION)).withRegistryUsername(p.getProperty(REGISTRY_USERNAME))
+                    .withRegistryPassword(p.getProperty(REGISTRY_PASSWORD))
+                    .withRegistryEmail(p.getProperty(REGISTRY_EMAIL)).withRegistryUrl(p.getProperty(REGISTRY_URL));
         }
 
-        public final DockerClientConfigBuilder withUri(String uri) {
-            checkNotNull(uri, "uri was not specified");
-            this.uri = URI.create(uri);
+        /**
+         * configure DOCKER_HOST
+         */
+        public final DockerClientConfigBuilder withDockerHost(String dockerHost) {
+            checkNotNull(dockerHost, "uri was not specified");
+            this.dockerHost = URI.create(dockerHost);
             return this;
         }
 
-        public final DockerClientConfigBuilder withVersion(String version) {
-            this.version = version;
+        public final DockerClientConfigBuilder withApiVersion(String apiVersion) {
+            this.apiVersion = apiVersion;
             return this;
         }
 
-        public final DockerClientConfigBuilder withUsername(String username) {
-            this.username = username;
+        public final DockerClientConfigBuilder withRegistryUsername(String registryUsername) {
+            this.registryUsername = registryUsername;
             return this;
         }
 
-        public final DockerClientConfigBuilder withPassword(String password) {
-            this.password = password;
+        public final DockerClientConfigBuilder withRegistryPassword(String registryPassword) {
+            this.registryPassword = registryPassword;
             return this;
         }
 
-        public final DockerClientConfigBuilder withEmail(String email) {
-            this.email = email;
+        public final DockerClientConfigBuilder withRegistryEmail(String registryEmail) {
+            this.registryEmail = registryEmail;
             return this;
         }
 
-        public DockerClientConfigBuilder withServerAddress(String serverAddress) {
-            this.serverAddress = serverAddress;
+        public DockerClientConfigBuilder withRegistryUrl(String registryUrl) {
+            this.registryUrl = registryUrl;
             return this;
         }
 
         public final DockerClientConfigBuilder withDockerCertPath(String dockerCertPath) {
-            if (dockerCertPath != null) {
-                this.sslConfig = new LocalDirectorySSLConfig(dockerCertPath);
-            }
+            this.dockerCertPath = dockerCertPath;
             return this;
         }
 
-        public final DockerClientConfigBuilder withDockerCfgPath(String dockerCfgPath) {
-            this.dockerCfgPath = dockerCfgPath;
+        public final DockerClientConfigBuilder withDockerConfig(String dockerConfig) {
+            this.dockerConfig = dockerConfig;
             return this;
         }
 
-        public final DockerClientConfigBuilder withSSLConfig(SSLConfig config) {
-            this.sslConfig = config;
+        public final DockerClientConfigBuilder withDockerTlsVerify(String dockerTlsVerify) {
+            this.dockerTlsVerify = BooleanUtils.toBoolean(dockerTlsVerify.trim(), "1", "0");
             return this;
         }
 
         public DockerClientConfig build() {
-            return new DockerClientConfig(uri, version, username, password, email, serverAddress, dockerCfgPath,
-                    sslConfig);
+            return new DockerClientConfig(dockerHost, dockerConfig, apiVersion, registryUrl, registryUsername,
+                    registryPassword, registryEmail, dockerCertPath, dockerTlsVerify);
         }
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index ede135613..0ee71909c 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -132,7 +132,7 @@ private DockerClientImpl(DockerClientConfig dockerClientConfig) {
     }
 
     private static DockerClientConfig configWithServerUrl(String serverUrl) {
-        return DockerClientConfig.createDefaultConfigBuilder().withUri(serverUrl).build();
+        return DockerClientConfig.createDefaultConfigBuilder().withDockerHost(serverUrl).build();
     }
 
     public static DockerClientImpl getInstance() {
@@ -161,14 +161,14 @@ private DockerCmdExecFactory getDockerCmdExecFactory() {
 
     @Override
     public AuthConfig authConfig() {
-        checkNotNull(dockerClientConfig.getUsername(), "Configured username is null.");
-        checkNotNull(dockerClientConfig.getServerAddress(), "Configured serverAddress is null.");
+        checkNotNull(dockerClientConfig.getRegistryUsername(), "Configured username is null.");
+        checkNotNull(dockerClientConfig.getRegistryUrl(), "Configured serverAddress is null.");
 
         AuthConfig authConfig = new AuthConfig();
-        authConfig.setUsername(dockerClientConfig.getUsername());
-        authConfig.setPassword(dockerClientConfig.getPassword());
-        authConfig.setEmail(dockerClientConfig.getEmail());
-        authConfig.setServerAddress(dockerClientConfig.getServerAddress());
+        authConfig.setUsername(dockerClientConfig.getRegistryUsername());
+        authConfig.setPassword(dockerClientConfig.getRegistryPassword());
+        authConfig.setEmail(dockerClientConfig.getRegistryEmail());
+        authConfig.setServerAddress(dockerClientConfig.getRegistryUrl());
 
         return authConfig;
     }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
index d8c84663c..750114b11 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
@@ -46,7 +46,7 @@ protected String registryAuth(AuthConfig authConfig) {
     protected String registryConfigs(AuthConfigurations authConfigs) {
         try {
             final String json;
-            if (dockerClientConfig.getVersion().isGreaterOrEqual(RemoteApiVersion.VERSION_1_19)) {
+            if (dockerClientConfig.getApiVersion().isGreaterOrEqual(RemoteApiVersion.VERSION_1_19)) {
                 json = new ObjectMapper().writeValueAsString(authConfigs.getConfigs());
             } else {
                 json = new ObjectMapper().writeValueAsString(authConfigs);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index bbd71ba38..337b3e790 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -2,6 +2,33 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+
+import javax.net.ssl.SSLContext;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.client.ClientResponseFilter;
+import javax.ws.rs.client.WebTarget;
+
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.glassfish.jersey.CommonProperties;
+import org.glassfish.jersey.apache.connector.ApacheClientProperties;
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.ClientProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd;
@@ -54,34 +81,11 @@
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.LocalDirectorySSLConfig;
 import com.github.dockerjava.jaxrs.connector.ApacheConnectorProvider;
 import com.github.dockerjava.jaxrs.filter.JsonClientFilter;
 import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter;
 import com.github.dockerjava.jaxrs.filter.SelectiveLoggingFilter;
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.glassfish.jersey.CommonProperties;
-import org.glassfish.jersey.apache.connector.ApacheClientProperties;
-import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.client.ClientProperties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.net.ssl.SSLContext;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.client.ClientResponseFilter;
-import javax.ws.rs.client.WebTarget;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.ProxySelector;
-import java.net.URI;
-import java.util.List;
 
 //import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 // see https://github.com/docker-java/docker-java/issues/196
@@ -108,6 +112,8 @@ public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
 
     private DockerClientConfig dockerClientConfig;
 
+    SSLContext sslContext = null;
+
     @Override
     public void init(DockerClientConfig dockerClientConfig) {
         checkNotNull(dockerClientConfig, "config was not specified");
@@ -146,15 +152,19 @@ public void init(DockerClientConfig dockerClientConfig) {
             }
         }
 
-        URI originalUri = dockerClientConfig.getUri();
+        URI originalUri = dockerClientConfig.getDockerHost();
 
-        SSLContext sslContext = null;
         String protocol = null;
 
-        if (dockerClientConfig.getSslConfig() != null) {
+        if (dockerClientConfig.getDockerTlsVerify()) {
             protocol = "https";
+
             try {
-                sslContext = dockerClientConfig.getSslConfig().getSSLContext();
+
+                if (sslContext == null) {
+                    sslContext = new LocalDirectorySSLConfig(dockerClientConfig.getDockerCertPath()).getSSLContext();
+                }
+
             } catch (Exception ex) {
                 throw new DockerClientException("Error in SSL Configuration", ex);
             }
@@ -163,8 +173,13 @@ public void init(DockerClientConfig dockerClientConfig) {
         }
 
         if (originalUri.getScheme().equals("unix")) {
-            dockerClientConfig.setUri(UnixConnectionSocketFactory.sanitizeUri(originalUri));
+            dockerClientConfig.setDockerHost(UnixConnectionSocketFactory.sanitizeUri(originalUri));
         } else {
+            try {
+                originalUri = new URI(originalUri.toString().replaceFirst("tcp", protocol));
+            } catch (URISyntaxException e) {
+                throw new RuntimeException(e);
+            }
             configureProxy(clientConfig, protocol);
         }
 
@@ -190,12 +205,12 @@ public void init(DockerClientConfig dockerClientConfig) {
 
         client = clientBuilder.build();
 
-        baseResource = client.target(dockerClientConfig.getUri()).path(dockerClientConfig.getVersion().asWebPathPart());
+        baseResource = client.target(originalUri.toString()).path(dockerClientConfig.getApiVersion().asWebPathPart());
     }
 
     private void configureProxy(ClientConfig clientConfig, String protocol) {
 
-        List<Proxy> proxies = ProxySelector.getDefault().select(dockerClientConfig.getUri());
+        List<Proxy> proxies = ProxySelector.getDefault().select(dockerClientConfig.getDockerHost());
 
         for (Proxy proxy : proxies) {
             InetSocketAddress address = (InetSocketAddress) proxy.address();
@@ -490,6 +505,12 @@ public void close() throws IOException {
         client.close();
     }
 
+    @Override
+    public DockerCmdExecFactoryImpl withSSLContext(SSLContext sslContext) {
+        this.sslContext = sslContext;
+        return this;
+    }
+
     public DockerCmdExecFactoryImpl withReadTimeout(Integer readTimeout) {
         this.readTimeout = readTimeout;
         return this;
diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
index ee3b50101..d26cf70c0 100644
--- a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
@@ -51,6 +51,7 @@
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.DockerClientImpl;
+import com.github.dockerjava.core.LocalDirectorySSLConfig;
 import com.github.dockerjava.netty.exec.AttachContainerCmdExec;
 import com.github.dockerjava.netty.exec.AuthCmdExec;
 import com.github.dockerjava.netty.exec.BuildImageCmdExec;
@@ -99,6 +100,7 @@
 import com.github.dockerjava.netty.exec.UnpauseContainerCmdExec;
 import com.github.dockerjava.netty.exec.VersionCmdExec;
 import com.github.dockerjava.netty.exec.WaitContainerCmdExec;
+
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelInitializer;
@@ -113,11 +115,13 @@
 import io.netty.handler.codec.http.HttpClientCodec;
 import io.netty.handler.logging.LoggingHandler;
 import io.netty.handler.ssl.SslHandler;
+
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;
+
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -157,6 +161,8 @@ public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
 
     private NettyInitializer nettyInitializer;
 
+    private SSLContext sslContext = null;
+
     private ChannelProvider channelProvider = new ChannelProvider() {
         @Override
         public Channel getChannel() {
@@ -173,11 +179,11 @@ public void init(DockerClientConfig dockerClientConfig) {
 
         bootstrap = new Bootstrap();
 
-        String scheme = dockerClientConfig.getUri().getScheme();
+        String scheme = dockerClientConfig.getDockerHost().getScheme();
 
         if ("unix".equals(scheme)) {
             nettyInitializer = new UnixDomainSocketInitializer();
-        } else if (scheme.startsWith("http")) {
+        } else if ("tcp".equals(scheme)) {
             nettyInitializer = new InetSocketInitializer();
         }
 
@@ -248,8 +254,8 @@ protected void initChannel(final SocketChannel channel) throws Exception {
 
         @Override
         public Channel connect(Bootstrap bootstrap) throws InterruptedException {
-            String host = dockerClientConfig.getUri().getHost();
-            int port = dockerClientConfig.getUri().getPort();
+            String host = dockerClientConfig.getDockerHost().getHost();
+            int port = dockerClientConfig.getDockerHost().getPort();
 
             if (port == -1) {
                 throw new RuntimeException("no port configured for " + host);
@@ -257,7 +263,7 @@ public Channel connect(Bootstrap bootstrap) throws InterruptedException {
 
             Channel channel = bootstrap.connect(host, port).sync().channel();
 
-            if ("https".equals(dockerClientConfig.getUri().getScheme())) {
+            if (dockerClientConfig.getDockerTlsVerify()) {
                 final SslHandler ssl = initSsl(dockerClientConfig);
 
                 if (ssl != null) {
@@ -272,10 +278,12 @@ private SslHandler initSsl(DockerClientConfig dockerClientConfig) {
             SslHandler ssl = null;
 
             try {
-                String host = dockerClientConfig.getUri().getHost();
-                int port = dockerClientConfig.getUri().getPort();
+                String host = dockerClientConfig.getDockerHost().getHost();
+                int port = dockerClientConfig.getDockerHost().getPort();
 
-                SSLContext sslContext = dockerClientConfig.getSslConfig().getSSLContext();
+                if(sslContext == null) {
+                    sslContext = new LocalDirectorySSLConfig(dockerClientConfig.getDockerCertPath()).getSSLContext();
+                }
 
                 SSLEngine engine = sslContext.createSSLEngine(host, port);
                 engine.setUseClientMode(true);
@@ -552,6 +560,13 @@ public void close() throws IOException {
         eventLoopGroup.shutdownGracefully();
     }
 
+    @Override
+    public DockerCmdExecFactory withSSLContext(SSLContext sslContext) {
+        this.sslContext = sslContext;
+        return this;
+    }
+
+
     private WebTarget getBaseResource() {
         return new WebTarget(channelProvider);
     }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/AbstrDockerCmdExec.java
index e8b3597c9..5cf36a0a4 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/AbstrDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/AbstrDockerCmdExec.java
@@ -45,7 +45,7 @@ protected String registryAuth(AuthConfig authConfig) {
     protected String registryConfigs(AuthConfigurations authConfigs) {
         try {
             final String json;
-            if (dockerClientConfig.getVersion().isGreaterOrEqual(RemoteApiVersion.VERSION_1_19)) {
+            if (dockerClientConfig.getApiVersion().isGreaterOrEqual(RemoteApiVersion.VERSION_1_19)) {
                 json = new ObjectMapper().writeValueAsString(authConfigs.getConfigs());
             } else {
                 json = new ObjectMapper().writeValueAsString(authConfigs);
diff --git a/src/main/resources/docker-java.properties b/src/main/resources/docker-java.properties
new file mode 100644
index 000000000..ea85f6c01
--- /dev/null
+++ b/src/main/resources/docker-java.properties
@@ -0,0 +1,17 @@
+#docker.io.url=https://localhost:2376
+#docker.io.dockerCertPath=${user.home}/.docker
+#docker.io.dockerCfgPath=${user.home}/.dockercfg
+#docker.io.username=${user.name}
+#docker.io.serverAddress=https://index.docker.io/v1/
+#
+DOCKER_HOST=tcp://localhost:2376
+DOCKER_TLS_VERIFY=1
+DOCKER_CONFIG=${user.home}/.docker
+DOCKER_CERT_PATH=${user.home}/.docker/certs
+
+api.version=
+registry.url=https://index.docker.io/v1/
+registry.username=${user.name}
+#registry.password=
+#registry.email=
+
diff --git a/src/main/resources/docker.io.properties b/src/main/resources/docker.io.properties
deleted file mode 100644
index 719500e24..000000000
--- a/src/main/resources/docker.io.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-docker.io.url=https://localhost:2376
-docker.io.dockerCertPath=${user.home}/.docker
-docker.io.dockerCfgPath=${user.home}/.dockercfg
-docker.io.username=${user.name}
-docker.io.serverAddress=https://index.docker.io/v1/
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 074c19ad9..5f63207d1 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -74,12 +74,12 @@ private DockerClientConfig config() {
 
     protected DockerClientConfig config(String password) {
         DockerClientConfig.DockerClientConfigBuilder builder = DockerClientConfig.createDefaultConfigBuilder()
-                .withServerAddress("https://index.docker.io/v1/");
+                .withRegistryUrl("https://index.docker.io/v1/");
         if (password != null) {
-            builder = builder.withPassword(password);
+            builder = builder.withRegistryPassword(password);
         }
 
-        return builder.withVersion(apiVersion).build();
+        return builder.withApiVersion(apiVersion).build();
     }
 
     public void afterTest() {
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
index 8bb1c3e39..e87254b88 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
@@ -1,8 +1,8 @@
 package com.github.dockerjava.core;
 
-import com.github.dockerjava.api.model.AuthConfig;
-import org.apache.commons.lang.SerializationUtils;
-import org.testng.annotations.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.testng.Assert.assertEquals;
 
 import java.net.URI;
 import java.util.Collections;
@@ -10,113 +10,57 @@
 import java.util.Map;
 import java.util.Properties;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.testng.Assert.assertEquals;
+import org.apache.commons.lang.SerializationUtils;
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.exception.DockerClientException;
+import com.github.dockerjava.api.model.AuthConfig;
 
 public class DockerClientConfigTest {
 
     public static final DockerClientConfig EXAMPLE_CONFIG = newExampleConfig();
 
     private static DockerClientConfig newExampleConfig() {
-        return new DockerClientConfig(URI.create("http://foo"), "bar", "baz", "qux", "blam", "wham", "flam",
-                new LocalDirectorySSLConfig("flim"));
-    }
 
-    @Test
-    public void string() throws Exception {
-        assertEquals(
-                EXAMPLE_CONFIG.toString(),
-                "DockerClientConfig{uri=http://foo, version='{UNKNOWN_VERSION}', username='baz', password='qux', email='blam', serverAddress='wham', dockerCfgPath='flam', sslConfig='LocalDirectorySSLConfig{dockerCertPath=flim}'}");
-    }
+        String dockerCertPath = dockerCertPath();
 
-    @Test
-    public void equals() throws Exception {
-        assertEquals(EXAMPLE_CONFIG, newExampleConfig());
+        return new DockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
+                dockerCertPath, true);
     }
 
-    @Test
-    public void environmentDockerHost() throws Exception {
-
-        // given docker host in env
-        Map<String, String> env = new HashMap<String, String>();
-        env.put("DOCKER_HOST", "tcp://baz:8768");
-        // and it looks to be SSL disabled
-        env.remove("DOCKER_CERT_PATH");
-
-        // when you build a config
-        DockerClientConfig config = buildConfig(env, new Properties());
-
-        // then the URL is that value with "http" instead of "tcp"
-        assertEquals(config.getUri(), URI.create("http://baz:8768"));
+    private static String homeDir() {
+        return "target/test-classes/someHomeDir";
     }
 
-    @Test
-    public void environmentDockerHostHttpsAutoDetectByCertPath() throws Exception {
-
-        // given docker host in env
-        Map<String, String> env = new HashMap<String, String>(System.getenv());
-        env.put("DOCKER_HOST", "tcp://bar:8768");
-        // and it looks to be SSL enabled
-        env.put("DOCKER_CERT_PATH", "any value");
-
-        // when you build a config
-        DockerClientConfig config = buildConfig(env, new Properties());
-
-        // then the URL is that value with "tcp" changed to "https"
-        assertEquals(config.getUri(), URI.create("https://bar:8768"));
+    private static String dockerCertPath() {
+        return homeDir() + "/.docker";
     }
 
     @Test
-    public void environmentDockerHostHttpsAutoDetectByTlsVerify() throws Exception {
-
-        // given docker host in env
-        Map<String, String> env = new HashMap<String, String>(System.getenv());
-        env.put("DOCKER_HOST", "tcp://bar:8768");
-        // and it looks to be SSL enabled
-        env.put("DOCKER_TLS_VERIFY", "1");
-
-        // when you build a config
-        DockerClientConfig config = buildConfig(env, new Properties());
-
-        // then the URL is that value with "tcp" changed to "https"
-        assertEquals(config.getUri(), URI.create("https://bar:8768"));
+    public void equals() throws Exception {
+        assertEquals(EXAMPLE_CONFIG, newExampleConfig());
     }
 
     @Test
-    public void environmentDockerHostWithInvalidTlsVerify() throws Exception {
+    public void environmentDockerHost() throws Exception {
 
         // given docker host in env
-        Map<String, String> env = new HashMap<String, String>(System.getenv());
-        env.put("DOCKER_HOST", "tcp://bar:8768");
+        Map<String, String> env = new HashMap<String, String>();
+        env.put(DockerClientConfig.DOCKER_HOST, "tcp://baz:8768");
         // and it looks to be SSL disabled
         env.remove("DOCKER_CERT_PATH");
-        // and it has an invalid TLS_VERIFY value
-        env.put("DOCKER_TLS_VERIFY", "any value different from '1'");
 
-        // when you build a config
-        DockerClientConfig config = buildConfig(env, new Properties());
 
-        // then the URL is that value with "tcp" changed to "https"
-        assertEquals(config.getUri(), URI.create("http://bar:8768"));
-    }
-
-    @Test
-    public void environmentDockerHostWithInvalidTlsVerifyButWithCertPath() throws Exception {
 
-        // given docker host in env
-        Map<String, String> env = new HashMap<String, String>(System.getenv());
-        env.put("DOCKER_HOST", "tcp://bar:8768");
-        // and it looks to be SSL enabled
-        env.put("DOCKER_CERT_PATH", "any value");
-        // and it has an invalid TLS_VERIFY value
-        env.put("DOCKER_TLS_VERIFY", "any value different from '1'");
+        // given default cert path
+        Properties systemProperties = new Properties();
+        systemProperties.setProperty("user.name", "someUserName");
+        systemProperties.setProperty("user.home", homeDir());
 
         // when you build a config
-        DockerClientConfig config = buildConfig(env, new Properties());
+        DockerClientConfig config = buildConfig(env, systemProperties);
 
-        // then the URL is that value with "tcp" changed to "https"
-        assertEquals(config.getUri(), URI.create("https://bar:8768"));
+        assertEquals(config.getDockerHost(), URI.create("tcp://baz:8768"));
     }
 
     @Test
@@ -124,16 +68,16 @@ public void environment() throws Exception {
 
         // given a default config in env properties
         Map<String, String> env = new HashMap<String, String>();
-        env.put("DOCKER_URL", "http://foo");
-        env.put("DOCKER_VERSION", "bar");
-        env.put("DOCKER_USERNAME", "baz");
-        env.put("DOCKER_PASSWORD", "qux");
-        env.put("DOCKER_EMAIL", "blam");
-        env.put("DOCKER_SERVER_ADDRESS", "wham");
-        env.put("DOCKER_CERT_PATH", "flim");
-        env.put("DOCKER_CFG_PATH", "flam");
-        env.put("DOCKER_READ_TIMEOUT", "877");
-        env.put("DOCKER_LOGGING_FILTER_ENABLED", "false");
+        env.put(DockerClientConfig.DOCKER_HOST, "tcp://foo");
+        env.put(DockerClientConfig.API_VERSION, "apiVersion");
+        env.put(DockerClientConfig.REGISTRY_USERNAME, "registryUsername");
+        env.put(DockerClientConfig.REGISTRY_PASSWORD, "registryPassword");
+        env.put(DockerClientConfig.REGISTRY_EMAIL, "registryEmail");
+        env.put(DockerClientConfig.REGISTRY_URL, "registryUrl");
+        env.put(DockerClientConfig.DOCKER_CONFIG, "dockerConfig");
+        env.put(DockerClientConfig.DOCKER_CERT_PATH, dockerCertPath());
+        env.put(DockerClientConfig.DOCKER_TLS_VERIFY, "1");
+
 
         // when you build a config
         DockerClientConfig config = buildConfig(env, new Properties());
@@ -152,18 +96,18 @@ public void defaults() throws Exception {
         // given default cert path
         Properties systemProperties = new Properties();
         systemProperties.setProperty("user.name", "someUserName");
-        systemProperties.setProperty("user.home", "someHomeDir");
+        systemProperties.setProperty("user.home", homeDir());
 
         // when you build config
         DockerClientConfig config = buildConfig(Collections.<String, String> emptyMap(), systemProperties);
 
         // then the cert path is as expected
-        assertEquals(config.getUri(), URI.create("https://localhost:2376"));
-        assertEquals(config.getUsername(), "someUserName");
-        assertEquals(config.getServerAddress(), AuthConfig.DEFAULT_SERVER_ADDRESS);
-        assertEquals(config.getVersion(), RemoteApiVersion.unknown());
-        assertEquals(config.getDockerCfgPath(), "someHomeDir/.dockercfg");
-        assertEquals(((LocalDirectorySSLConfig) config.getSslConfig()).getDockerCertPath(), "someHomeDir/.docker");
+        assertEquals(config.getDockerHost(), URI.create("tcp://localhost:2376"));
+        assertEquals(config.getRegistryUsername(), "someUserName");
+        assertEquals(config.getRegistryUrl(), AuthConfig.DEFAULT_SERVER_ADDRESS);
+        assertEquals(config.getApiVersion(), RemoteApiVersion.unknown());
+        assertEquals(config.getDockerConfig(), homeDir() + "/.docker");
+        assertEquals(config.getDockerCertPath(), homeDir() + "/.docker/certs");
     }
 
     @Test
@@ -171,14 +115,15 @@ public void systemProperties() throws Exception {
 
         // given system properties based on the example
         Properties systemProperties = new Properties();
-        systemProperties.setProperty("docker.io.url", "http://foo");
-        systemProperties.setProperty("docker.io.version", "bar");
-        systemProperties.setProperty("docker.io.username", "baz");
-        systemProperties.setProperty("docker.io.password", "qux");
-        systemProperties.setProperty("docker.io.email", "blam");
-        systemProperties.setProperty("docker.io.serverAddress", "wham");
-        systemProperties.setProperty("docker.io.dockerCertPath", "flim");
-        systemProperties.setProperty("docker.io.dockerCfgPath", "flam");
+        systemProperties.put(DockerClientConfig.DOCKER_HOST, "tcp://foo");
+        systemProperties.put(DockerClientConfig.API_VERSION, "apiVersion");
+        systemProperties.put(DockerClientConfig.REGISTRY_USERNAME, "registryUsername");
+        systemProperties.put(DockerClientConfig.REGISTRY_PASSWORD, "registryPassword");
+        systemProperties.put(DockerClientConfig.REGISTRY_EMAIL, "registryEmail");
+        systemProperties.put(DockerClientConfig.REGISTRY_URL, "registryUrl");
+        systemProperties.put(DockerClientConfig.DOCKER_CONFIG, "dockerConfig");
+        systemProperties.put(DockerClientConfig.DOCKER_CERT_PATH, dockerCertPath());
+        systemProperties.put(DockerClientConfig.DOCKER_TLS_VERIFY, "1");
 
         // when you build new config
         DockerClientConfig config = buildConfig(Collections.<String, String> emptyMap(), systemProperties);
@@ -195,4 +140,40 @@ public void serializableTest() {
 
         assertThat("Deserialized object mush match source object", deserialized, equalTo(EXAMPLE_CONFIG));
     }
+
+    @Test(expectedExceptions = DockerClientException.class)
+    public void testTlsVerifyAndCertPathNull() throws Exception {
+        new DockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
+                null, true);
+    }
+
+    @Test(expectedExceptions = DockerClientException.class)
+    public void testTlsVerifyAndCertPathEmpty() throws Exception {
+        new DockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
+                "", true);
+    }
+
+    @Test()
+    public void testTlsVerifyAndCertPath() throws Exception {
+        new DockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
+                dockerCertPath(), true);
+    }
+
+    @Test(expectedExceptions = DockerClientException.class)
+    public void testWrongHostScheme() throws Exception {
+        new DockerClientConfig(URI.create("http://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
+                null, false);
+    }
+
+    @Test()
+    public void testTcpHostScheme() throws Exception {
+        new DockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
+                null, false);
+    }
+
+    @Test()
+    public void testUnixHostScheme() throws Exception {
+        new DockerClientConfig(URI.create("unix://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
+                null, false);
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
index c5a1e841c..62cfaa146 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
@@ -3,6 +3,8 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.AssertJUnit.fail;
 
+import java.net.URI;
+
 import org.testng.annotations.Test;
 
 public class DockerClientImplTest {
@@ -10,7 +12,7 @@ public class DockerClientImplTest {
     @Test
     public void configuredInstanceAuthConfig() throws Exception {
         // given a config with null serverAddress
-        DockerClientConfig dockerClientConfig = new DockerClientConfig(null, null, "", "", "", null, null, null);
+        DockerClientConfig dockerClientConfig = new DockerClientConfig(URI.create("tcp://foo"), null, null, null, "", "", "", null, false);
         DockerClientImpl dockerClient = DockerClientImpl.getInstance(dockerClientConfig);
 
         // when we get the auth config
@@ -25,6 +27,9 @@ public void configuredInstanceAuthConfig() throws Exception {
 
     @Test
     public void defaultInstanceAuthConfig() throws Exception {
+
+        System.setProperty("user.home", "target/test-classes/someHomeDir");
+
         // given a default client
         DockerClientImpl dockerClient = DockerClientImpl.getInstance();
 
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index 50860789b..a5dfcfbc5 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -5,6 +5,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.net.ssl.SSLContext;
+
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.*;
 import com.github.dockerjava.api.command.AuthCmd.Exec;
@@ -367,4 +369,9 @@ public List<String> getVolumeNames() {
     public List<String> getNetworkIds() {
         return new ArrayList<>(networkIds);
     }
+
+    @Override
+    public DockerCmdExecFactory withSSLContext(SSLContext sslContext) {
+        return delegate.withSSLContext(sslContext);
+    }
 }
diff --git a/src/test/resources/someHomeDir/.docker/certs/dummy.txt b/src/test/resources/someHomeDir/.docker/certs/dummy.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/someHomeDir/.docker/config.json b/src/test/resources/someHomeDir/.docker/config.json
new file mode 100644
index 000000000..630394039
--- /dev/null
+++ b/src/test/resources/someHomeDir/.docker/config.json
@@ -0,0 +1,9 @@
+{
+    "auths":{
+        "https://index.docker.io/v1/":{
+            "auth":"XXXX=",
+            "email":"foo.bar@test.com"
+        }
+        
+    }
+}
\ No newline at end of file

From 7d9ed5d154d38c2ea7f6e3da2f649c6cde9fdb9b Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 31 Jan 2016 19:13:56 +0300
Subject: [PATCH 0391/1272] Checkstyle: common coding problems.

Some hashes probably need to be reviewed.
---
 .../com/github/dockerjava/api/model/Ports.java    |  1 +
 .../com/github/dockerjava/core/NameParser.java    |  1 +
 .../dockerjava/jaxrs/filter/LoggingFilter.java    | 10 +++++-----
 .../netty/DockerCmdExecFactoryImpl.java           | 12 ++++++------
 .../resources/checkstyle/checkstyle-config.xml    | 15 +++++++++++++++
 5 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/Ports.java b/src/main/java/com/github/dockerjava/api/model/Ports.java
index 43ad92585..6bbb05fa2 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -33,6 +33,7 @@
  * @see HostConfig#getPortBindings()
  * @see NetworkSettings#getPorts()
  */
+@SuppressWarnings(value = "checkstyle:equalshashcode") //FIXME?
 @JsonDeserialize(using = Ports.Deserializer.class)
 @JsonSerialize(using = Ports.Serializer.class)
 public class Ports {
diff --git a/src/main/java/com/github/dockerjava/core/NameParser.java b/src/main/java/com/github/dockerjava/core/NameParser.java
index 3c58eb331..77cc6bb06 100644
--- a/src/main/java/com/github/dockerjava/core/NameParser.java
+++ b/src/main/java/com/github/dockerjava/core/NameParser.java
@@ -12,6 +12,7 @@
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.core.exception.InvalidRepositoryNameException;
 
+@SuppressWarnings(value = "checkstyle:equalshashcode")
 public class NameParser {
     //CHECKSTYLE:OFF
     private static final int RepositoryNameTotalLengthMax = 255;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
index ccd6500d1..76666fe4e 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
@@ -109,7 +109,7 @@ public int compare(final Map.Entry<String, List<String>> o1, final Map.Entry<Str
     @SuppressWarnings("NonConstantLogger")
     private final Logger logger;
 
-    private final AtomicLong id = new AtomicLong(0);
+    private final AtomicLong aid = new AtomicLong(0);
 
     private final Boolean printEntity;
 
@@ -227,7 +227,7 @@ private InputStream logInboundEntity(final StringBuilder b, InputStream stream)
 
     @Override
     public void filter(final ClientRequestContext context) throws IOException {
-        final long id = this.id.incrementAndGet();
+        final long id = aid.incrementAndGet();
         final StringBuilder b = new StringBuilder();
 
         printRequestLine(b, "Sending client request", id, context.getMethod(), context.getUri());
@@ -246,7 +246,7 @@ public void filter(final ClientRequestContext context) throws IOException {
     @Override
     public void filter(final ClientRequestContext requestContext, final ClientResponseContext responseContext)
             throws IOException {
-        final long id = this.id.incrementAndGet();
+        final long id = aid.incrementAndGet();
         final StringBuilder b = new StringBuilder();
 
         printResponseLine(b, "Client response received", id, responseContext.getStatus());
@@ -261,7 +261,7 @@ public void filter(final ClientRequestContext requestContext, final ClientRespon
 
     @Override
     public void filter(final ContainerRequestContext context) throws IOException {
-        final long id = this.id.incrementAndGet();
+        final long id = aid.incrementAndGet();
         final StringBuilder b = new StringBuilder();
 
         printRequestLine(b, "Server has received a request", id, context.getMethod(), context.getUriInfo()
@@ -278,7 +278,7 @@ public void filter(final ContainerRequestContext context) throws IOException {
     @Override
     public void filter(final ContainerRequestContext requestContext, final ContainerResponseContext responseContext)
             throws IOException {
-        final long id = this.id.incrementAndGet();
+        final long id = aid.incrementAndGet();
         final StringBuilder b = new StringBuilder();
 
         printResponseLine(b, "Server responded with a response", id, responseContext.getStatus());
diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
index ee3b50101..2f7422ac2 100644
--- a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
@@ -205,15 +205,15 @@ private interface NettyInitializer {
     private class UnixDomainSocketInitializer implements NettyInitializer {
         @Override
         public EventLoopGroup init(Bootstrap bootstrap, DockerClientConfig dockerClientConfig) {
-            EventLoopGroup eventLoopGroup = new EpollEventLoopGroup();
-            bootstrap.group(eventLoopGroup).channel(EpollDomainSocketChannel.class)
+            EventLoopGroup epollEventLoopGroup = new EpollEventLoopGroup();
+            bootstrap.group(epollEventLoopGroup).channel(EpollDomainSocketChannel.class)
                     .handler(new ChannelInitializer<UnixChannel>() {
                         @Override
                         protected void initChannel(final UnixChannel channel) throws Exception {
                             channel.pipeline().addLast(new HttpClientCodec());
                         }
                     });
-            return eventLoopGroup;
+            return epollEventLoopGroup;
         }
 
         @Override
@@ -225,7 +225,7 @@ public Channel connect(Bootstrap bootstrap) throws InterruptedException {
     private class InetSocketInitializer implements NettyInitializer {
         @Override
         public EventLoopGroup init(Bootstrap bootstrap, final DockerClientConfig dockerClientConfig) {
-            EventLoopGroup eventLoopGroup = new NioEventLoopGroup();
+            EventLoopGroup nioEventLoopGroup = new NioEventLoopGroup();
 
             InetAddress addr = InetAddress.getLoopbackAddress();
 
@@ -233,7 +233,7 @@ public EventLoopGroup init(Bootstrap bootstrap, final DockerClientConfig dockerC
 
             Security.addProvider(new BouncyCastleProvider());
 
-            bootstrap.group(eventLoopGroup).channel(NioSocketChannel.class)
+            bootstrap.group(nioEventLoopGroup).channel(NioSocketChannel.class)
                     .handler(new ChannelInitializer<SocketChannel>() {
                         @Override
                         protected void initChannel(final SocketChannel channel) throws Exception {
@@ -243,7 +243,7 @@ protected void initChannel(final SocketChannel channel) throws Exception {
                         }
                     });
 
-            return eventLoopGroup;
+            return nioEventLoopGroup;
         }
 
         @Override
diff --git a/src/test/resources/checkstyle/checkstyle-config.xml b/src/test/resources/checkstyle/checkstyle-config.xml
index a97064845..3c353fc1a 100644
--- a/src/test/resources/checkstyle/checkstyle-config.xml
+++ b/src/test/resources/checkstyle/checkstyle-config.xml
@@ -132,6 +132,21 @@
         </module>
         <module name="RightCurly"/>
 
+        <!-- Checks for common coding problems               -->
+        <!-- See http://checkstyle.sf.net/config_coding.html -->
+        <!--<module name="AvoidInlineConditionals"/>-->
+        <module name="EmptyStatement"/>
+        <module name="EqualsHashCode"/>
+        <module name="HiddenField">
+            <property name="tokens" value="VARIABLE_DEF"/>
+        </module>
+        <module name="IllegalInstantiation"/>
+        <module name="InnerAssignment"/>
+        <!--<module name="MagicNumber"/>-->
+        <!-- upto @marcusline -->
+        <!--<module name="MissingSwitchDefault"/>-->
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
 
     </module>
 

From e835537d195c9cdf55058fa95542621fc7671265 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 31 Jan 2016 19:18:41 +0300
Subject: [PATCH 0392/1272] Checkstyle: class design.

Utility classes should not have a public or default constructor.
---
 .../java/com/github/dockerjava/core/GoLangFileMatch.java   | 2 ++
 src/main/java/com/github/dockerjava/core/NameParser.java   | 3 +++
 .../com/github/dockerjava/core/util/FiltersEncoder.java    | 2 ++
 src/test/resources/checkstyle/checkstyle-config.xml        | 7 +++++++
 4 files changed, 14 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index 2f29789ea..7bed65c5b 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -44,6 +44,8 @@
  *
  */
 public class GoLangFileMatch {
+    private GoLangFileMatch() {
+    }
 
     public static final boolean IS_WINDOWS = File.separatorChar == '\\';
 
diff --git a/src/main/java/com/github/dockerjava/core/NameParser.java b/src/main/java/com/github/dockerjava/core/NameParser.java
index 77cc6bb06..5027422fd 100644
--- a/src/main/java/com/github/dockerjava/core/NameParser.java
+++ b/src/main/java/com/github/dockerjava/core/NameParser.java
@@ -14,6 +14,9 @@
 
 @SuppressWarnings(value = "checkstyle:equalshashcode")
 public class NameParser {
+    private NameParser() {
+    }
+
     //CHECKSTYLE:OFF
     private static final int RepositoryNameTotalLengthMax = 255;
 
diff --git a/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java b/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
index 164528a8c..280daad45 100644
--- a/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
+++ b/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
@@ -16,6 +16,8 @@
  *
  */
 public class FiltersEncoder {
+    private FiltersEncoder() {
+    }
 
     private static final ObjectMapper OBJECT_MAPPER = new JacksonJaxbJsonProvider().locateMapper(Map.class,
             MediaType.APPLICATION_JSON_TYPE);
diff --git a/src/test/resources/checkstyle/checkstyle-config.xml b/src/test/resources/checkstyle/checkstyle-config.xml
index 3c353fc1a..2906a76ad 100644
--- a/src/test/resources/checkstyle/checkstyle-config.xml
+++ b/src/test/resources/checkstyle/checkstyle-config.xml
@@ -148,6 +148,13 @@
         <module name="SimplifyBooleanExpression"/>
         <module name="SimplifyBooleanReturn"/>
 
+        <!-- Checks for class design                         -->
+        <!-- See http://checkstyle.sf.net/config_design.html -->
+        <module name="HideUtilityClassConstructor"/>
+        <module name="InterfaceIsType"/>
+        <!-- FIXME check with @marcuslinke -->
+        <!--<module name="VisibilityModifier"/>-->
+
     </module>
 
 </module>

From b0e2853feca000af1ec95deb2f0976eb3ddf71aa Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 31 Jan 2016 19:20:55 +0300
Subject: [PATCH 0393/1272] Checkstyle: other checks.

---
 src/test/resources/checkstyle/checkstyle-config.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/test/resources/checkstyle/checkstyle-config.xml b/src/test/resources/checkstyle/checkstyle-config.xml
index 2906a76ad..02f55585f 100644
--- a/src/test/resources/checkstyle/checkstyle-config.xml
+++ b/src/test/resources/checkstyle/checkstyle-config.xml
@@ -155,6 +155,16 @@
         <!-- FIXME check with @marcuslinke -->
         <!--<module name="VisibilityModifier"/>-->
 
+        <!-- Miscellaneous other checks.                   -->
+        <!-- See http://checkstyle.sf.net/config_misc.html -->
+        <module name="ArrayTypeStyle"/>
+        <module name="TodoComment">
+            <property name="format" value="(TODO)|(FIXME)"/>
+            <property name="severity" value="info"/>
+        </module>
+        <!--<module name="FinalParameters"/>-->
+        <module name="UpperEll"/>
+
     </module>
 
 </module>

From d5d77ad81c355cba305d76e138d500706dcf339b Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 31 Jan 2016 19:33:16 +0300
Subject: [PATCH 0394/1272] checkstyle: violations were in overlapped netty
 classes.

---
 .../java/com/github/dockerjava/netty/exec/CommitCmdExec.java | 4 ++--
 .../com/github/dockerjava/netty/exec/CreateImageCmdExec.java | 2 +-
 src/test/resources/checkstyle/checkstyle-config.xml          | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/netty/exec/CommitCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/CommitCmdExec.java
index b42bbdb3b..eaba91fdb 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/CommitCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/CommitCmdExec.java
@@ -27,8 +27,8 @@ protected String execute(CommitCmd command) {
         webTarget = booleanQueryParam(webTarget, "pause", command.hasPauseEnabled());
 
         LOGGER.trace("POST: {}", webTarget);
-        ObjectNode objectNode = webTarget.request().accept(MediaType.APPLICATION_JSON).
-                post(command, new TypeReference<ObjectNode>() {});
+        ObjectNode objectNode = webTarget.request().accept(MediaType.APPLICATION_JSON)
+                .post(command, new TypeReference<ObjectNode>() { });
 
         return objectNode.get("Id").asText();
     }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CreateImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/CreateImageCmdExec.java
index 3d3ddec27..0e182e8bc 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/CreateImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/CreateImageCmdExec.java
@@ -26,6 +26,6 @@ protected CreateImageResponse execute(CreateImageCmd command) {
 
         LOGGER.trace("POST: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM)
-                .post(new TypeReference<CreateImageResponse>() {}, command.getImageStream());
+                .post(new TypeReference<CreateImageResponse>() { }, command.getImageStream());
     }
 }
diff --git a/src/test/resources/checkstyle/checkstyle-config.xml b/src/test/resources/checkstyle/checkstyle-config.xml
index 02f55585f..ea30a270d 100644
--- a/src/test/resources/checkstyle/checkstyle-config.xml
+++ b/src/test/resources/checkstyle/checkstyle-config.xml
@@ -98,8 +98,7 @@
 
         <!-- Checks for whitespace                               -->
         <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <!-- @KostyaSha unsure -->
-        <!--<module name="EmptyForIteratorPad"/>-->
+        <module name="EmptyForIteratorPad"/>
         <module name="MethodParamPad"/>
         <module name="NoWhitespaceAfter"/>
         <module name="NoWhitespaceBefore"/>
@@ -111,7 +110,7 @@
         <module name="TypecastParenPad"/>
         <module name="WhitespaceAfter"/>
         <!-- some weirdness with logger in CommitCmdExec and CreateImageCmdExec -->
-        <!--<module name="WhitespaceAround"/>-->
+        <module name="WhitespaceAround"/>
 
         <!-- Modifier Checks                                    -->
         <!-- See http://checkstyle.sf.net/config_modifiers.html -->

From 60a3518631cdc0a5606c0a96fcbc579fc27af526 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sat, 6 Feb 2016 18:30:53 +0100
Subject: [PATCH 0395/1272] Sync sources with eclipse code formatter and
 checkstyle

---
 etc/docker-java-formatter.xml                 | 587 ++++++++++++++++++
 .../github/dockerjava/api/DockerClient.java   |   9 +-
 .../dockerjava/api/async/ResultCallback.java  |   4 +-
 .../api/command/AttachContainerCmd.java       |   3 +-
 .../dockerjava/api/command/AuthCmd.java       |   5 +-
 .../command/CopyArchiveToContainerCmd.java    |  14 +-
 .../api/command/CreateContainerCmd.java       |  32 +-
 .../api/command/CreateNetworkCmd.java         |   2 +-
 .../api/command/CreateVolumeCmd.java          |   4 +-
 .../api/command/InspectContainerResponse.java |   2 -
 .../api/command/ListContainersCmd.java        |   3 +-
 .../api/command/LogContainerCmd.java          |   7 +-
 .../dockerjava/api/command/StatsCmd.java      |   4 +-
 .../dockerjava/api/model/AuthConfig.java      |   4 +-
 .../com/github/dockerjava/api/model/Bind.java |  27 +-
 .../dockerjava/api/model/Capability.java      |  62 +-
 .../github/dockerjava/api/model/Event.java    |   6 +-
 .../dockerjava/api/model/ExposedPort.java     |  22 +-
 .../github/dockerjava/api/model/Frame.java    |   4 +-
 .../dockerjava/api/model/Identifier.java      |   4 +-
 .../api/model/InternetProtocol.java           |   4 +-
 .../com/github/dockerjava/api/model/Link.java |  27 +-
 .../dockerjava/api/model/LogConfig.java       |   6 +-
 .../github/dockerjava/api/model/Network.java  |   2 +-
 .../dockerjava/api/model/PortBinding.java     |  34 +-
 .../github/dockerjava/api/model/Ports.java    |  69 +-
 .../dockerjava/api/model/RestartPolicy.java   |   7 +-
 .../github/dockerjava/api/model/Ulimit.java   |   4 +-
 .../github/dockerjava/api/model/VolumeRW.java |   4 +-
 .../dockerjava/api/model/VolumesFrom.java     |  24 +-
 .../dockerjava/core/AuthConfigFile.java       |   5 +-
 .../dockerjava/core/DockerClientConfig.java   |  17 +-
 .../dockerjava/core/GoLangFileMatch.java      | 136 ++--
 .../dockerjava/core/KeystoreSSLConfig.java    |  26 +-
 .../github/dockerjava/core/NameParser.java    |   5 +-
 .../dockerjava/core/RemoteApiVersion.java     |  15 +-
 .../core/async/ResultCallbackTemplate.java    |   9 +-
 .../core/command/ConnectToNetworkCmdImpl.java |   6 +-
 .../core/command/CreateNetworkCmdImpl.java    |   3 +-
 .../command/DisconnectFromNetworkCmdImpl.java |   8 +-
 .../core/command/ExecStartCmdImpl.java        |   1 -
 .../core/command/ExecStartResultCallback.java |  30 +-
 .../dockerjava/core/command/FrameReader.java  |  17 +-
 .../core/command/InpectNetworkCmdImpl.java    |   6 +-
 .../core/command/LogContainerCmdImpl.java     |   4 +-
 .../core/dockerfile/Dockerfile.java           |   4 +-
 .../core/util/CompressArchiveUtil.java        |   4 +-
 .../dockerjava/core/util/FiltersBuilder.java  |   5 +-
 .../dockerjava/jaxrs/ApacheUnixSocket.java    |  10 +-
 .../jaxrs/ConnectToNetworkCmdExec.java        |   2 +-
 .../jaxrs/DisconnectFromNetworkCmdExec.java   |   2 +-
 .../jaxrs/InspectNetworkCmdExec.java          |   5 +-
 .../jaxrs/RemoveNetworkCmdExec.java           |   2 +-
 .../jaxrs/connector/ApacheConnector.java      |  32 +-
 .../connector/ApacheConnectorProvider.java    |  47 +-
 .../jaxrs/filter/FollowRedirectsFilter.java   |   6 +-
 .../jaxrs/filter/LoggingFilter.java           |  13 +-
 .../filter/ResponseStatusExceptionFilter.java |  40 +-
 .../util/WrappedResponseInputStream.java      |   5 +-
 .../netty/DockerCmdExecFactoryImpl.java       |   4 +-
 .../dockerjava/netty/InvocationBuilder.java   |   4 +-
 .../github/dockerjava/netty/MediaType.java    |   4 +-
 .../github/dockerjava/netty/WebTarget.java    |   4 +-
 .../netty/exec/AbstrSyncDockerCmdExec.java    |   1 -
 .../dockerjava/netty/exec/CommitCmdExec.java  |   3 +-
 .../netty/exec/ConnectToNetworkCmdExec.java   |   3 +-
 .../netty/exec/CreateImageCmdExec.java        |   3 +-
 .../exec/DisconnectFromNetworkCmdExec.java    |   3 +-
 .../dockerjava/netty/exec/InfoCmdExec.java    |   3 +-
 .../netty/exec/LogContainerCmdExec.java       |   1 -
 .../netty/exec/RestartContainerCmdExec.java   |   1 -
 .../netty/exec/StopContainerCmdExec.java      |   2 -
 .../handler/FramedResponseStreamHandler.java  |  16 +-
 .../netty/handler/HttpResponseHandler.java    |  78 +--
 .../dockerjava/api/model/AuthConfigTest.java  |   2 +-
 .../dockerjava/api/model/IdentifierTest.java  |   2 +-
 .../api/model/Ports_addBindingsTest.java      |  11 +-
 .../dockerjava/api/model/RepositoryTest.java  |   2 +-
 .../model/RestartPolicy_SerializingTest.java  |   4 +-
 .../api/model/RestartPolicy_toStringTest.java |   2 +-
 .../dockerjava/api/model/VolumeBindsTest.java |   2 +-
 .../client/AbstractDockerClientTest.java      |   2 +-
 .../dockerjava/client/DockerClientTest.java   |   4 +-
 .../dockerjava/core/DockerClientImplTest.java |   2 +-
 .../dockerjava/core/GoLangFileMatchTest.java  | 108 ++--
 .../core/TestDockerCmdExecFactory.java        |   4 +-
 .../core/command/BuildImageCmdImplTest.java   |   7 +-
 .../command/CreateContainerCmdImplTest.java   |  21 +-
 .../core/command/FrameReaderTest.java         |   2 +-
 .../command/StartContainerCmdImplTest.java    |  19 +-
 .../DockerfileStatementAddTest.java           |  18 +-
 .../core/dockerfile/DockerfileTest.java       |   2 +-
 .../core/util/FiltersBuilderTest.java         |   3 +-
 .../netty/exec/BuildImageCmdExecTest.java     |   7 +-
 .../exec/CreateContainerCmdExecTest.java      |  21 +-
 .../netty/exec/StartContainerCmdExecTest.java |  19 +-
 96 files changed, 1192 insertions(+), 653 deletions(-)
 create mode 100644 etc/docker-java-formatter.xml

diff --git a/etc/docker-java-formatter.xml b/etc/docker-java-formatter.xml
new file mode 100644
index 000000000..211b0a223
--- /dev/null
+++ b/etc/docker-java-formatter.xml
@@ -0,0 +1,587 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="12">
+<profile kind="CodeFormatterProfile" name="eclipse-cs docker-java" version="12">
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="140"/>
+<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="140"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+</profile>
+<profile kind="CodeFormatterProfile" name="na" version="12">
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
+<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+</profile>
+</profiles>
diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 5db2967ff..aaa3c5fcf 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -107,12 +107,11 @@ public interface DockerClient extends Closeable {
     public CreateContainerCmd createContainerCmd(@Nonnull String image);
 
     /**
-     * Creates a new {@link StartContainerCmd} for the container with the given ID. The command can then be further
-     * customized by using builder methods on it like {@link StartContainerCmd#withDns(String...)}.
+     * Creates a new {@link StartContainerCmd} for the container with the given ID. The command can then be further customized by using
+     * builder methods on it like {@link StartContainerCmd#withDns(String...)}.
      * <p>
-     * <b>If you customize the command, any existing configuration of the target container will get reset to its default
-     * before applying the new configuration. To preserve the existing configuration, use an unconfigured
-     * {@link StartContainerCmd}.</b>
+     * <b>If you customize the command, any existing configuration of the target container will get reset to its default before applying the
+     * new configuration. To preserve the existing configuration, use an unconfigured {@link StartContainerCmd}.</b>
      * <p>
      * This command corresponds to the <code>/containers/{id}/start</code> endpoint of the Docker Remote API.
      */
diff --git a/src/main/java/com/github/dockerjava/api/async/ResultCallback.java b/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
index 0bb052a0b..5b9fdb81c 100644
--- a/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
+++ b/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
@@ -7,8 +7,8 @@
  */
 public interface ResultCallback<A_RES_T> extends Closeable {
     /**
-     * Called when the async processing starts respectively when the response arrives from the server. The passed
-     * {@link Closeable} can be used to close/interrupt the processing.
+     * Called when the async processing starts respectively when the response arrives from the server. The passed {@link Closeable} can be
+     * used to close/interrupt the processing.
      */
     void onStart(Closeable closeable);
 
diff --git a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
index 84f063d7e..ddeb21c2d 100644
--- a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
@@ -50,8 +50,7 @@ public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, F
 
     /**
      * Following the stream means the resulting {@link InputStream} returned by {@link #exec()} reads infinitely. So a
-     * {@link InputStream#read()} MAY BLOCK FOREVER as long as no data is streamed from the docker host to
-     * {@link DockerClient}!
+     * {@link InputStream#read()} MAY BLOCK FOREVER as long as no data is streamed from the docker host to {@link DockerClient}!
      */
     AttachContainerCmd withFollowStream(Boolean followStream);
 
diff --git a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
index 75e5801ff..236b0f326 100644
--- a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
@@ -20,9 +20,8 @@ public interface AuthCmd extends SyncDockerCmd<AuthResponse> {
     public AuthCmd withAuthConfig(@Nonnull AuthConfig authConfig);
 
     /**
-     * @return The status. Based on it's value you may mean you need to authorise your account, e.g.:
-     *         "Account created. Please see the documentation of the registry http://localhost:5000/v1/
-     *         for instructions how to activate it."
+     * @return The status. Based on it's value you may mean you need to authorise your account, e.g.: "Account created. Please see the
+     *         documentation of the registry http://localhost:5000/v1/ for instructions how to activate it."
      * @throws UnauthorizedException
      *             If you're not authorised (e.g. bad password).
      */
diff --git a/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
index bbfae4597..a4dfb5c03 100644
--- a/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
@@ -33,8 +33,7 @@ public interface CopyArchiveToContainerCmd extends SyncDockerCmd<Void> {
     CopyArchiveToContainerCmd withHostResource(String resource);
 
     /**
-     * Set the tar input stream that will be uploaded to the container. withHostResource or withTarInputStream can be
-     * defined but not both.
+     * Set the tar input stream that will be uploaded to the container. withHostResource or withTarInputStream can be defined but not both.
      *
      * @param tarInputStream
      *            the stream to upload to the container
@@ -42,8 +41,8 @@ public interface CopyArchiveToContainerCmd extends SyncDockerCmd<Void> {
     CopyArchiveToContainerCmd withTarInputStream(InputStream tarInputStream);
 
     /**
-     * If set to true then it will be an error if unpacking the given content would cause an existing directory to be
-     * replaced with a non-directory and vice versa
+     * If set to true then it will be an error if unpacking the given content would cause an existing directory to be replaced with a
+     * non-directory and vice versa
      *
      * @param noOverwriteDirNonDir
      *            flag to know if non directory can be overwritten
@@ -51,10 +50,9 @@ public interface CopyArchiveToContainerCmd extends SyncDockerCmd<Void> {
     CopyArchiveToContainerCmd withNoOverwriteDirNonDir(boolean noOverwriteDirNonDir);
 
     /**
-     * If this flag is set to true, all children of the local directory will be copied to the remote without the root
-     * directory. For ex: if I have root/titi and root/tata and the remote path is /var/data. dirChildrenOnly = true
-     * will create /var/data/titi and /var/data/tata dirChildrenOnly = false will create /var/data/root/titi and
-     * /var/data/root/tata
+     * If this flag is set to true, all children of the local directory will be copied to the remote without the root directory. For ex: if
+     * I have root/titi and root/tata and the remote path is /var/data. dirChildrenOnly = true will create /var/data/titi and /var/data/tata
+     * dirChildrenOnly = false will create /var/data/root/titi and /var/data/root/tata
      *
      * @param dirChildrenOnly
      *            if root directory is ignored
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index f1c7fdd9c..6b004c826 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -195,30 +195,26 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     public CreateContainerCmd withBlkioWeight(Integer blkioWeight);
 
     /**
-     * Add linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> to the
-     * container. For example: adding {@link Capability#MKNOD} allows the container to create special files using the
-     * 'mknod' command.
+     * Add linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> to the container. For example:
+     * adding {@link Capability#MKNOD} allows the container to create special files using the 'mknod' command.
      */
     public CreateContainerCmd withCapAdd(Capability... capAdd);
 
     /**
-     * Add linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> to the
-     * container. For example: adding {@link Capability#MKNOD} allows the container to create special files using the
-     * 'mknod' command.
+     * Add linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> to the container. For example:
+     * adding {@link Capability#MKNOD} allows the container to create special files using the 'mknod' command.
      */
     public CreateContainerCmd withCapAdd(List<Capability> capAdd);
 
     /**
-     * Drop linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> from the
-     * container. For example: dropping {@link Capability#CHOWN} prevents the container from changing the owner of any
-     * files.
+     * Drop linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> from the container. For example:
+     * dropping {@link Capability#CHOWN} prevents the container from changing the owner of any files.
      */
     public CreateContainerCmd withCapDrop(Capability... capDrop);
 
     /**
-     * Drop linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> from the
-     * container. For example: dropping {@link Capability#CHOWN} prevents the container from changing the owner of any
-     * files.
+     * Drop linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> from the container. For example:
+     * dropping {@link Capability#CHOWN} prevents the container from changing the owner of any files.
      */
     public CreateContainerCmd withCapDrop(List<Capability> capDrop);
 
@@ -334,8 +330,8 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
      * <li>'bridge': creates a new network stack for the container on the docker bridge</li>
      * <li>'none': no networking for this container</li>
      * <li>'container:<name|id>': reuses another container network stack</li>
-     * <li>'host': use the host network stack inside the container. Note: the host mode gives the container full access
-     * to local system services such as D-bus and is therefore considered insecure.</li>
+     * <li>'host': use the host network stack inside the container. Note: the host mode gives the container full access to local system
+     * services such as D-bus and is therefore considered insecure.</li>
      * </ul>
      */
     public CreateContainerCmd withNetworkMode(String networkMode);
@@ -346,14 +342,14 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     public CreateContainerCmd withOomKillDisable(Boolean oomKillDisable);
 
     /**
-     * Add one or more {@link PortBinding}s. This corresponds to the <code>--publish</code> (<code>-p</code>) option of
-     * the <code>docker run</code> CLI command.
+     * Add one or more {@link PortBinding}s. This corresponds to the <code>--publish</code> (<code>-p</code>) option of the
+     * <code>docker run</code> CLI command.
      */
     public CreateContainerCmd withPortBindings(PortBinding... portBindings);
 
     /**
-     * Add one or more {@link PortBinding}s. This corresponds to the <code>--publish</code> (<code>-p</code>) option of
-     * the <code>docker run</code> CLI command.
+     * Add one or more {@link PortBinding}s. This corresponds to the <code>--publish</code> (<code>-p</code>) option of the
+     * <code>docker run</code> CLI command.
      */
     public CreateContainerCmd withPortBindings(List<PortBinding> portBindings);
 
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
index 2e3cd92a0..82b4ac18c 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
@@ -34,7 +34,7 @@ public interface CreateNetworkCmd extends SyncDockerCmd<CreateNetworkResponse> {
     /** Name of the network driver to use. Defaults to <code>bridge</code>. */
     public CreateNetworkCmd withDriver(String driver);
 
-    /** Driver specific options  */
+    /** Driver specific options */
     public CreateNetworkCmd withOptions(Map<String, String> options);
 
     public static interface Exec extends DockerCmdSyncExec<CreateNetworkCmd, CreateNetworkResponse> {
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java
index 0642cf902..801fb6122 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java
@@ -29,12 +29,10 @@ public interface CreateVolumeCmd extends SyncDockerCmd<CreateVolumeResponse> {
 
     /**
      * @param driverOpts
-     *            - A mapping of driver options and values. These options are passed directly to the driver and are
-     *            driver specific.
+     *            - A mapping of driver options and values. These options are passed directly to the driver and are driver specific.
      */
     public CreateVolumeCmd withDriverOpts(Map<String, String> driverOpts);
 
     public static interface Exec extends DockerCmdSyncExec<CreateVolumeCmd, CreateVolumeResponse> {
     }
 }
-
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index 85f2812f0..3a49a4dd4 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -202,8 +202,6 @@ public String toString() {
         return ToStringBuilder.reflectionToString(this);
     }
 
-
-
     @JsonIgnoreProperties(ignoreUnknown = true)
     public class ContainerState {
 
diff --git a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
index 842f242cc..4ae506a42 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
@@ -57,8 +57,7 @@ public interface ListContainersCmd extends SyncDockerCmd<List<Container>> {
 
     /**
      * @param labels
-     *            - Show only containers with the passed labels. Labels is a {@link Map} that contains label keys and
-     *            values
+     *            - Show only containers with the passed labels. Labels is a {@link Map} that contains label keys and values
      */
     public ListContainersCmd withLabelFilter(Map<String, String> labels);
 
diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
index f4b5076c5..bb3081ce4 100644
--- a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -23,8 +23,8 @@
  * @param tail
  *            - `all` or `<number>`, Output specified number of lines at the end of logs
  * @param since
- *            - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that
- *            timestamp. Default: 0 (unfiltered)
+ *            - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default:
+ *            0 (unfiltered)
  */
 public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame> {
 
@@ -53,8 +53,7 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame>
 
     /**
      * Following the stream means the resulting {@link InputStream} returned by {@link #exec()} reads infinitely. So a
-     * {@link InputStream#read()} MAY BLOCK FOREVER as long as no data is streamed from the docker host to
-     * {@link DockerClient}!
+     * {@link InputStream#read()} MAY BLOCK FOREVER as long as no data is streamed from the docker host to {@link DockerClient}!
      */
     public LogContainerCmd withFollowStream(Boolean followStream);
 
diff --git a/src/main/java/com/github/dockerjava/api/command/StatsCmd.java b/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
index 653cd3bb2..d2d7fe385 100644
--- a/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
@@ -6,8 +6,8 @@
 import com.github.dockerjava.api.model.Statistics;
 
 /**
- * Get container stats. The result of {@link Statistics} is handled asynchronously because the docker remote API will
- * block when a container is stopped until the container is up again.
+ * Get container stats. The result of {@link Statistics} is handled asynchronously because the docker remote API will block when a container
+ * is stopped until the container is up again.
  */
 public interface StatsCmd extends AsyncDockerCmd<StatsCmd, Statistics> {
 
diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
index 0bd6cac8c..3dc3ef348 100644
--- a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -79,7 +79,7 @@ public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
-    //CHECKSTYLE:OFF
+    // CHECKSTYLE:OFF
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -128,5 +128,5 @@ public boolean equals(Object obj) {
             return false;
         return true;
     }
-    //CHECKSTYLE:ON
+    // CHECKSTYLE:ON
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Bind.java b/src/main/java/com/github/dockerjava/api/model/Bind.java
index aa4863923..bc7c8e4bb 100644
--- a/src/main/java/com/github/dockerjava/api/model/Bind.java
+++ b/src/main/java/com/github/dockerjava/api/model/Bind.java
@@ -4,8 +4,8 @@
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
 /**
- * Represents a host path being bind mounted as a {@link Volume} in a Docker container. The Bind can be in read only or
- * read write access mode.
+ * Represents a host path being bind mounted as a {@link Volume} in a Docker container. The Bind can be in read only or read write access
+ * mode.
  */
 public class Bind {
 
@@ -50,16 +50,16 @@ public static Bind parse(String serialized) {
         try {
             String[] parts = serialized.split(":");
             switch (parts.length) {
-            case 2: {
-                return new Bind(parts[0], new Volume(parts[1]));
-            }
-            case 3: {
-                AccessMode accessMode = AccessMode.valueOf(parts[2].toLowerCase());
-                return new Bind(parts[0], new Volume(parts[1]), accessMode);
-            }
-            default: {
-                throw new IllegalArgumentException();
-            }
+                case 2: {
+                    return new Bind(parts[0], new Volume(parts[1]));
+                }
+                case 3: {
+                    AccessMode accessMode = AccessMode.valueOf(parts[2].toLowerCase());
+                    return new Bind(parts[0], new Volume(parts[1]), accessMode);
+                }
+                default: {
+                    throw new IllegalArgumentException();
+                }
             }
         } catch (Exception e) {
             throw new IllegalArgumentException("Error parsing Bind '" + serialized + "'");
@@ -84,8 +84,7 @@ public int hashCode() {
 
     /**
      * Returns a string representation of this {@link Bind} suitable for inclusion in a JSON message. The format is
-     * <code>&lt;host path&gt;:&lt;container path&gt;:&lt;access mode&gt;</code>, like the argument in
-     * {@link #parse(String)}.
+     * <code>&lt;host path&gt;:&lt;container path&gt;:&lt;access mode&gt;</code>, like the argument in {@link #parse(String)}.
      *
      * @return a string representation of this {@link Bind}
      */
diff --git a/src/main/java/com/github/dockerjava/api/model/Capability.java b/src/main/java/com/github/dockerjava/api/model/Capability.java
index 4757937e3..6237a65ae 100644
--- a/src/main/java/com/github/dockerjava/api/model/Capability.java
+++ b/src/main/java/com/github/dockerjava/api/model/Capability.java
@@ -1,11 +1,9 @@
 package com.github.dockerjava.api.model;
 
 /**
- * The Linux capabilities supported by Docker. The list of capabilities is defined in Docker's types.go, {@link #ALL}
- * was added manually.
+ * The Linux capabilities supported by Docker. The list of capabilities is defined in Docker's types.go, {@link #ALL} was added manually.
  *
- * @see <a
- *      href="http://man7.org/linux/man-pages/man7/capabilities.7.html">http://man7.org/linux/man-pages/man7/capabilities.7.html</a>
+ * @see <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">http://man7.org/linux/man-pages/man7/capabilities.7.html</a>
  */
 public enum Capability {
     /**
@@ -33,8 +31,7 @@ public enum Capability {
      */
     CHOWN,
     /**
-     * Bypass file read, write, and execute permission checks. (DAC is an abbreviation of
-     * "discretionary access control".)
+     * Bypass file read, write, and execute permission checks. (DAC is an abbreviation of "discretionary access control".)
      */
     DAC_OVERRIDE,
     /**
@@ -43,9 +40,8 @@ public enum Capability {
     DAC_READ_SEARCH,
     /**
      * <ul>
-     * <li>Bypass permission checks on operations that normally require the file system UID of the process to match the
-     * UID of the file (e.g., chmod(2), utime(2)), excluding those operations covered by the {@link #DAC_OVERRIDE} and
-     * {@link #DAC_READ_SEARCH}.
+     * <li>Bypass permission checks on operations that normally require the file system UID of the process to match the UID of the file
+     * (e.g., chmod(2), utime(2)), excluding those operations covered by the {@link #DAC_OVERRIDE} and {@link #DAC_READ_SEARCH}.
      * <li>Set extended file attributes (see chattr(1)) on arbitrary files.
      * <li>Set Access Control Lists (ACLs) on arbitrary files.
      * <li>Ignore directory sticky bit on file deletion.
@@ -56,8 +52,8 @@ public enum Capability {
     /**
      * <ul>
      * <li>Don't clear set-user-ID and set-group-ID permission bits when a file is modified.
-     * <li>Set the set-group-ID bit for a file whose GID does not match the file system or any of the supplementary GIDs
-     * of the calling process.
+     * <li>Set the set-group-ID bit for a file whose GID does not match the file system or any of the supplementary GIDs of the calling
+     * process.
      * </ul>
      */
     FSETID,
@@ -70,8 +66,7 @@ public enum Capability {
      */
     IPC_OWNER,
     /**
-     * Bypass permission checks for sending signals (see kill(2)). This includes use of the ioctl(2) KDSIGACCEPT
-     * operation.
+     * Bypass permission checks for sending signals (see kill(2)). This includes use of the ioctl(2) KDSIGACCEPT operation.
      */
     KILL,
     /**
@@ -105,8 +100,8 @@ public enum Capability {
      * <li>Clear driver statistics.
      * <li>Set promiscuous mode.
      * <li>Enabling multicasting.
-     * <li>Use setsockopt(2) to set the following socket options: SO_DEBUG, SO_MARK, SO_PRIORITY (for a priority outside
-     * the range 0 to 6), SO_RCVBUFFORCE, and SO_SNDBUFFORCE.
+     * <li>Use setsockopt(2) to set the following socket options: SO_DEBUG, SO_MARK, SO_PRIORITY (for a priority outside the range 0 to 6),
+     * SO_RCVBUFFORCE, and SO_SNDBUFFORCE.
      * </ul>
      */
     NET_ADMIN,
@@ -139,9 +134,9 @@ public enum Capability {
     /**
      * If file capabilities are not supported:
      * <ul>
-     * <li>grant or remove any capability in the caller's permitted capability set to or from any other process. (This
-     * property of CAP_SETPCAP is not available when the kernel is configured to support file capabilities, since
-     * CAP_SETPCAP has entirely different semantics for such kernels.)
+     * <li>grant or remove any capability in the caller's permitted capability set to or from any other process. (This property of
+     * CAP_SETPCAP is not available when the kernel is configured to support file capabilities, since CAP_SETPCAP has entirely different
+     * semantics for such kernels.)
      * </ul>
      * <p>
      * If file capabilities are supported:
@@ -161,19 +156,17 @@ public enum Capability {
     SETUID,
     /**
      * <ul>
-     * <li>Perform a range of system administration operations including: quotactl(2), mount(2), umount(2), swapon(2),
-     * swapoff(2), sethostname(2), and setdomainname(2).
-     * <li>Perform privileged syslog(2) operations (since Linux 2.6.37, CAP_SYSLOG should be used to permit such
-     * operations).
+     * <li>Perform a range of system administration operations including: quotactl(2), mount(2), umount(2), swapon(2), swapoff(2),
+     * sethostname(2), and setdomainname(2).
+     * <li>Perform privileged syslog(2) operations (since Linux 2.6.37, CAP_SYSLOG should be used to permit such operations).
      * <li>Perform VM86_REQUEST_IRQ vm86(2) command.
      * <li>Perform IPC_SET and IPC_RMID operations on arbitrary System V IPC objects.
      * <li>Perform operations on trusted and security Extended Attributes (see attr(5)).
      * <li>Use lookup_dcookie(2)
-     * <li>Use ioprio_set(2) to assign IOPRIO_CLASS_RT and (before Linux 2.6.25) IOPRIO_CLASS_IDLE I/O scheduling
-     * classes.
+     * <li>Use ioprio_set(2) to assign IOPRIO_CLASS_RT and (before Linux 2.6.25) IOPRIO_CLASS_IDLE I/O scheduling classes.
      * <li>Forge UID when passing socket credentials.
-     * <li>Exceed /proc/sys/fs/file-max, the system-wide limit on the number of open files, in system calls that open
-     * files (e.g., accept(2), execve(2), open(2), pipe(2)).
+     * <li>Exceed /proc/sys/fs/file-max, the system-wide limit on the number of open files, in system calls that open files (e.g.,
+     * accept(2), execve(2), open(2), pipe(2)).
      * <li>Employ CLONE_* flags that create new namespaces with clone(2) and unshare(2).
      * <li>Call perf_event_open(2).
      * <li>Access privileged perf event information.
@@ -181,8 +174,7 @@ public enum Capability {
      * <li>Call fanotify_init(2).
      * <li>Perform KEYCTL_CHOWN and KEYCTL_SETPERM keyctl(2) operations.
      * <li>Perform madvise(2) MADV_HWPOISON operation.
-     * <li>Employ the TIOCSTI ioctl(2) to insert characters into the input queue of a terminal other than the caller's
-     * controlling terminal.
+     * <li>Employ the TIOCSTI ioctl(2) to insert characters into the input queue of a terminal other than the caller's controlling terminal.
      * <li>Employ the obsolete nfsservctl(2) system call.
      * <li>Employ the obsolete bdflush(2) system call.
      * <li>Perform various privileged block-device ioctl(2) operations.
@@ -202,8 +194,8 @@ public enum Capability {
     /**
      * <ul>
      * <li>Perform privileged syslog(2) operations. See syslog(2) for information on which operations require privilege.
-     * <li>View kernel addresses exposed via /proc and other interfaces when /proc/sys/kernel/kptr_restrict has the
-     * value 1. (See the discussion of the kptr_restrict in proc(5).)
+     * <li>View kernel addresses exposed via /proc and other interfaces when /proc/sys/kernel/kptr_restrict has the value 1. (See the
+     * discussion of the kptr_restrict in proc(5).)
      * </ul>
      */
     SYSLOG,
@@ -217,8 +209,8 @@ public enum Capability {
     /**
      * <ul>
      * <li>Raise process nice value (nice(2), setpriority(2)) and change the nice value for arbitrary processes.
-     * <li>Set real-time scheduling policies for calling process, and set scheduling policies and priorities for
-     * arbitrary processes (sched_setscheduler(2), sched_setparam(2)).
+     * <li>Set real-time scheduling policies for calling process, and set scheduling policies and priorities for arbitrary processes
+     * (sched_setscheduler(2), sched_setparam(2)).
      * <li>Set CPU affinity for arbitrary processes (sched_setaffinity(2)).
      * <li>Set I/O scheduling class and priority for arbitrary processes (ioprio_set(2)).
      * <li>Apply migrate_pages(2) to arbitrary processes and allow processes to be migrated to arbitrary nodes.
@@ -265,10 +257,8 @@ public enum Capability {
      * <li>Override maximum number of consoles on console allocation.
      * <li>Override maximum number of keymaps.
      * <li>Allow more than 64hz interrupts from the real-time clock.
-     * <li>Raise msg_qbytes limit for a System V message queue above the limit in /proc/sys/kernel/msgmnb (see msgop(2)
-     * and msgctl(2)).
-     * <li>Override the /proc/sys/fs/pipe-size-max limit when setting the capacity of a pipe using the F_SETPIPE_SZ
-     * fcntl(2) command.
+     * <li>Raise msg_qbytes limit for a System V message queue above the limit in /proc/sys/kernel/msgmnb (see msgop(2) and msgctl(2)).
+     * <li>Override the /proc/sys/fs/pipe-size-max limit when setting the capacity of a pipe using the F_SETPIPE_SZ fcntl(2) command.
      * <li>Use F_SETPIPE_SZ to increase the capacity of a pipe above the limit specified by /proc/sys/fs/pipe-max-size.
      * <li>Override /proc/sys/fs/mqueue/queues_max limit when creating POSIX message queues (see mq_overview(7)).
      * <li>Employ prctl(2) PR_SET_MM operation.
diff --git a/src/main/java/com/github/dockerjava/api/model/Event.java b/src/main/java/com/github/dockerjava/api/model/Event.java
index 1ec0f433d..202f5a350 100644
--- a/src/main/java/com/github/dockerjava/api/model/Event.java
+++ b/src/main/java/com/github/dockerjava/api/model/Event.java
@@ -36,8 +36,7 @@ public Event() {
      *            Container ID
      * @param status
      *            Status string. List of statuses is available in <a
-     *            href="https://docs.docker.com/reference/api/docker_remote_api_v1.16/#monitor-dockers-events">Docker
-     *            API v.1.16</a>
+     *            href="https://docs.docker.com/reference/api/docker_remote_api_v1.16/#monitor-dockers-events">Docker API v.1.16</a>
      * @param from
      *            Image, from which the container has been created
      * @param time
@@ -53,8 +52,7 @@ public Event(String status, String id, String from, Long time) {
 
     /**
      * Status of docker image or container. List of statuses is available in <a
-     * href="https://docs.docker.com/reference/api/docker_remote_api_v1.16/#monitor-dockers-events">Docker API
-     * v.1.16</a>
+     * href="https://docs.docker.com/reference/api/docker_remote_api_v1.16/#monitor-dockers-events">Docker API v.1.16</a>
      *
      * @return Status string
      */
diff --git a/src/main/java/com/github/dockerjava/api/model/ExposedPort.java b/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
index 43ee92291..25829b8aa 100644
--- a/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
+++ b/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
@@ -24,9 +24,9 @@
 import com.github.dockerjava.api.model.Ports.Binding;
 
 /**
- * Represents a container port that Docker exposes to external clients. The port is defined by its {@link #getPort()
- * port number} and an {@link InternetProtocol}. It can be published by Docker by
- * {@link Ports#bind(ExposedPort, Binding) binding} it to a host port, represented by a {@link Binding}.
+ * Represents a container port that Docker exposes to external clients. The port is defined by its {@link #getPort() port number} and an
+ * {@link InternetProtocol}. It can be published by Docker by {@link Ports#bind(ExposedPort, Binding) binding} it to a host port,
+ * represented by a {@link Binding}.
  */
 @JsonDeserialize(using = ExposedPort.Deserializer.class)
 @JsonSerialize(using = ExposedPort.Serializer.class)
@@ -123,12 +123,12 @@ public static ExposedPort parse(String serialized) throws IllegalArgumentExcepti
         try {
             String[] parts = serialized.split("/");
             switch (parts.length) {
-            case 1:
-                return new ExposedPort(Integer.valueOf(parts[0]));
-            case 2:
-                return new ExposedPort(Integer.valueOf(parts[0]), InternetProtocol.parse(parts[1]));
-            default:
-                throw new IllegalArgumentException();
+                case 1:
+                    return new ExposedPort(Integer.valueOf(parts[0]));
+                case 2:
+                    return new ExposedPort(Integer.valueOf(parts[0]), InternetProtocol.parse(parts[1]));
+                default:
+                    throw new IllegalArgumentException();
             }
         } catch (Exception e) {
             throw new IllegalArgumentException("Error parsing ExposedPort '" + serialized + "'");
@@ -136,8 +136,8 @@ public static ExposedPort parse(String serialized) throws IllegalArgumentExcepti
     }
 
     /**
-     * Returns a string representation of this {@link ExposedPort} suitable for inclusion in a JSON message. The format
-     * is <code>port/protocol</code>, like the argument in {@link #parse(String)}.
+     * Returns a string representation of this {@link ExposedPort} suitable for inclusion in a JSON message. The format is
+     * <code>port/protocol</code>, like the argument in {@link #parse(String)}.
      *
      * @return a string representation of this {@link ExposedPort}
      */
diff --git a/src/main/java/com/github/dockerjava/api/model/Frame.java b/src/main/java/com/github/dockerjava/api/model/Frame.java
index e398ec255..0ad16e8c6 100644
--- a/src/main/java/com/github/dockerjava/api/model/Frame.java
+++ b/src/main/java/com/github/dockerjava/api/model/Frame.java
@@ -28,7 +28,7 @@ public String toString() {
         return String.format("%s: %s", streamType, new String(payload).trim());
     }
 
-    //CHECKSTYLE:OFF
+    // CHECKSTYLE:OFF
     @Override
     public boolean equals(Object o) {
         if (this == o)
@@ -48,5 +48,5 @@ public int hashCode() {
         result = 31 * result + Arrays.hashCode(payload);
         return result;
     }
-    //CHECKSTYLE:ON
+    // CHECKSTYLE:ON
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Identifier.java b/src/main/java/com/github/dockerjava/api/model/Identifier.java
index ed5100e25..1051d857f 100644
--- a/src/main/java/com/github/dockerjava/api/model/Identifier.java
+++ b/src/main/java/com/github/dockerjava/api/model/Identifier.java
@@ -22,8 +22,8 @@ public Identifier(Repository repository, String tag) {
     }
 
     /**
-     * Return an identifier that correctly splits up the repository and tag. There can be &gt; 1 ":" fred/jim --&gt;
-     * fred/jim, [] fred/jim:123 --&gt; fred/jim, 123 fred:123/jim:123 --&gt; fred:123/jim, 123
+     * Return an identifier that correctly splits up the repository and tag. There can be &gt; 1 ":" fred/jim --&gt; fred/jim, []
+     * fred/jim:123 --&gt; fred/jim, 123 fred:123/jim:123 --&gt; fred:123/jim, 123
      *
      *
      * @param identifier
diff --git a/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java b/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
index e3ef2b98c..2bb4db285 100644
--- a/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
+++ b/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
@@ -23,8 +23,8 @@ public enum InternetProtocol {
     public static final InternetProtocol DEFAULT = TCP;
 
     /**
-     * Returns a string representation of this {@link InternetProtocol} suitable for inclusion in a JSON message. The
-     * output is the lowercased name of the Protocol, e.g. <code>tcp</code>.
+     * Returns a string representation of this {@link InternetProtocol} suitable for inclusion in a JSON message. The output is the
+     * lowercased name of the Protocol, e.g. <code>tcp</code>.
      *
      * @return a string representation of this {@link InternetProtocol}
      */
diff --git a/src/main/java/com/github/dockerjava/api/model/Link.java b/src/main/java/com/github/dockerjava/api/model/Link.java
index f647438a9..89647306c 100644
--- a/src/main/java/com/github/dockerjava/api/model/Link.java
+++ b/src/main/java/com/github/dockerjava/api/model/Link.java
@@ -4,10 +4,9 @@
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
 /**
- * Represents a network link between two Docker containers. The container with the name {@link #getName()} is made
- * available in the target container with the aliased name {@link #getAlias()}. This involves creating an entry in
- * <code>/etc/hosts</code> and some environment variables in the target container as well as creating a network bridge
- * between both containers.
+ * Represents a network link between two Docker containers. The container with the name {@link #getName()} is made available in the target
+ * container with the aliased name {@link #getAlias()}. This involves creating an entry in <code>/etc/hosts</code> and some environment
+ * variables in the target container as well as creating a network bridge between both containers.
  */
 public class Link {
 
@@ -55,14 +54,14 @@ public static Link parse(final String serialized) throws IllegalArgumentExceptio
         try {
             final String[] parts = serialized.split(":");
             switch (parts.length) {
-            case 2: {
-                String[] nameSplit = parts[0].split("/");
-                String[] aliasSplit = parts[1].split("/");
-                return new Link(nameSplit[nameSplit.length - 1], aliasSplit[aliasSplit.length - 1]);
-            }
-            default: {
-                throw new IllegalArgumentException();
-            }
+                case 2: {
+                    String[] nameSplit = parts[0].split("/");
+                    String[] aliasSplit = parts[1].split("/");
+                    return new Link(nameSplit[nameSplit.length - 1], aliasSplit[aliasSplit.length - 1]);
+                }
+                default: {
+                    throw new IllegalArgumentException();
+                }
             }
         } catch (final Exception e) {
             throw new IllegalArgumentException("Error parsing Link '" + serialized + "'");
@@ -85,8 +84,8 @@ public int hashCode() {
     }
 
     /**
-     * Returns a string representation of this {@link Link} suitable for inclusion in a JSON message. The format is
-     * <code>name:alias</code>, like the argument in {@link #parse(String)}.
+     * Returns a string representation of this {@link Link} suitable for inclusion in a JSON message. The format is <code>name:alias</code>,
+     * like the argument in {@link #parse(String)}.
      *
      * @return a string representation of this {@link Link}
      */
diff --git a/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
index 669bbc554..cf9cdc1ee 100644
--- a/src/main/java/com/github/dockerjava/api/model/LogConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
@@ -22,9 +22,9 @@
  *
  * json-file (default) syslog journald none
  *
- * If a driver is specified that is NOT supported,docker will default to null. If configs are supplied that are not
- * supported by the type docker will ignore them. In most cases setting the config option to null will suffice. Consult
- * the docker remote API for a more detailed and up-to-date explanation of the available types and their options.
+ * If a driver is specified that is NOT supported,docker will default to null. If configs are supplied that are not supported by the type
+ * docker will ignore them. In most cases setting the config option to null will suffice. Consult the docker remote API for a more detailed
+ * and up-to-date explanation of the available types and their options.
  */
 public class LogConfig {
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Network.java b/src/main/java/com/github/dockerjava/api/model/Network.java
index d62d83019..546904254 100644
--- a/src/main/java/com/github/dockerjava/api/model/Network.java
+++ b/src/main/java/com/github/dockerjava/api/model/Network.java
@@ -149,6 +149,6 @@ public String getIpRange() {
             public String getGateway() {
                 return gateway;
             }
-         }
+        }
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/PortBinding.java b/src/main/java/com/github/dockerjava/api/model/PortBinding.java
index 81f94ca06..e163272d7 100644
--- a/src/main/java/com/github/dockerjava/api/model/PortBinding.java
+++ b/src/main/java/com/github/dockerjava/api/model/PortBinding.java
@@ -7,13 +7,13 @@
 import com.github.dockerjava.api.model.Ports.Binding;
 
 /**
- * In a {@link PortBinding}, a network socket on the Docker host, expressed as a {@link Binding}, is bound to an
- * {@link ExposedPort} of a container. A {@link PortBinding} corresponds to the <code>--publish</code> (<code>-p</code>)
- * option of the <code>docker run</code> (and similar) CLI command for adding port bindings to a container.
+ * In a {@link PortBinding}, a network socket on the Docker host, expressed as a {@link Binding}, is bound to an {@link ExposedPort} of a
+ * container. A {@link PortBinding} corresponds to the <code>--publish</code> (<code>-p</code>) option of the <code>docker run</code> (and
+ * similar) CLI command for adding port bindings to a container.
  * <p>
- * <i>Note: This is an abstraction used for creating new port bindings. It is not to be confused with the abstraction
- * used for querying existing port bindings from a container configuration in {@link NetworkSettings#getPorts()} and
- * {@link HostConfig#getPortBindings()}. In that context, a <code>Map&lt;ExposedPort, Binding[]&gt;</code> is used.</i>
+ * <i>Note: This is an abstraction used for creating new port bindings. It is not to be confused with the abstraction used for querying
+ * existing port bindings from a container configuration in {@link NetworkSettings#getPorts()} and {@link HostConfig#getPortBindings()}. In
+ * that context, a <code>Map&lt;ExposedPort, Binding[]&gt;</code> is used.</i>
  */
 public class PortBinding {
     private final Binding binding;
@@ -37,17 +37,17 @@ public static PortBinding parse(String serialized) throws IllegalArgumentExcepti
         try {
             String[] parts = StringUtils.splitByWholeSeparator(serialized, ":");
             switch (parts.length) {
-            case 3:
-                // 127.0.0.1:80:8080/tcp
-                return createFromSubstrings(parts[0] + ":" + parts[1], parts[2]);
-            case 2:
-                // 80:8080 // 127.0.0.1::8080
-                return createFromSubstrings(parts[0], parts[1]);
-            case 1:
-                // 8080
-                return createFromSubstrings("", parts[0]);
-            default:
-                throw new IllegalArgumentException();
+                case 3:
+                    // 127.0.0.1:80:8080/tcp
+                    return createFromSubstrings(parts[0] + ":" + parts[1], parts[2]);
+                case 2:
+                    // 80:8080 // 127.0.0.1::8080
+                    return createFromSubstrings(parts[0], parts[1]);
+                case 1:
+                    // 8080
+                    return createFromSubstrings("", parts[0]);
+                default:
+                    throw new IllegalArgumentException();
             }
         } catch (Exception e) {
             throw new IllegalArgumentException("Error parsing PortBinding '" + serialized + "'", e);
diff --git a/src/main/java/com/github/dockerjava/api/model/Ports.java b/src/main/java/com/github/dockerjava/api/model/Ports.java
index 6bbb05fa2..e0250bba1 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -27,13 +27,13 @@
 /**
  * A container for port bindings, made available as a {@link Map} via its {@link #getBindings()} method.
  * <p>
- * <i>Note: This is an abstraction used for querying existing port bindings from a container configuration. It is not to
- * be confused with the {@link PortBinding} abstraction used for adding new port bindings to a container.</i>
+ * <i>Note: This is an abstraction used for querying existing port bindings from a container configuration. It is not to be confused with
+ * the {@link PortBinding} abstraction used for adding new port bindings to a container.</i>
  *
  * @see HostConfig#getPortBindings()
  * @see NetworkSettings#getPorts()
  */
-@SuppressWarnings(value = "checkstyle:equalshashcode") //FIXME?
+@SuppressWarnings(value = "checkstyle:equalshashcode")
 @JsonDeserialize(using = Ports.Deserializer.class)
 @JsonSerialize(using = Ports.Serializer.class)
 public class Ports {
@@ -41,16 +41,15 @@ public class Ports {
     private final Map<ExposedPort, Binding[]> ports = new HashMap<ExposedPort, Binding[]>();
 
     /**
-     * Creates a {@link Ports} object with no {@link PortBinding}s. Use {@link #bind(ExposedPort, Binding)} or
-     * {@link #add(PortBinding...)} to add {@link PortBinding}s.
+     * Creates a {@link Ports} object with no {@link PortBinding}s. Use {@link #bind(ExposedPort, Binding)} or {@link #add(PortBinding...)}
+     * to add {@link PortBinding}s.
      */
     public Ports() {
     }
 
     /**
-     * Creates a {@link Ports} object with an initial {@link PortBinding} for the specified {@link ExposedPort} and
-     * {@link Binding}. Use {@link #bind(ExposedPort, Binding)} or {@link #add(PortBinding...)} to add more
-     * {@link PortBinding}s.
+     * Creates a {@link Ports} object with an initial {@link PortBinding} for the specified {@link ExposedPort} and {@link Binding}. Use
+     * {@link #bind(ExposedPort, Binding)} or {@link #add(PortBinding...)} to add more {@link PortBinding}s.
      */
     public Ports(ExposedPort exposedPort, Binding host) {
         bind(exposedPort, host);
@@ -71,7 +70,7 @@ public void bind(ExposedPort exposedPort, Binding binding) {
             if (binding == null) {
                 ports.put(exposedPort, null);
             } else {
-                ports.put(exposedPort, new Binding[]{binding});
+                ports.put(exposedPort, new Binding[] {binding});
             }
         }
     }
@@ -91,8 +90,7 @@ public String toString() {
     }
 
     /**
-     * Returns the port bindings in the format used by the Docker remote API, i.e. the {@link Binding}s grouped by
-     * {@link ExposedPort}.
+     * Returns the port bindings in the format used by the Docker remote API, i.e. the {@link Binding}s grouped by {@link ExposedPort}.
      *
      * @return the port bindings as a {@link Map} that contains one or more {@link Binding}s per {@link ExposedPort}.
      */
@@ -125,9 +123,9 @@ public static Binding binding(Integer hostPort) {
     }
 
     /**
-     * A {@link Binding} represents a socket on the Docker host that is used in a {@link PortBinding}. It is
-     * characterized by an {@link #getHostIp() IP address} and a {@link #getHostPort() port number}. Both properties may
-     * be <code>null</code> in order to let Docker assign them dynamically/using defaults.
+     * A {@link Binding} represents a socket on the Docker host that is used in a {@link PortBinding}. It is characterized by an
+     * {@link #getHostIp() IP address} and a {@link #getHostPort() port number}. Both properties may be <code>null</code> in order to let
+     * Docker assign them dynamically/using defaults.
      *
      * @see Ports#bind(ExposedPort, Binding)
      * @see ExposedPort
@@ -139,8 +137,7 @@ public static class Binding {
         private final Integer hostPort;
 
         /**
-         * Creates a {@link Binding} for the given {@link #getHostIp() IP address} and {@link #getHostPort() port
-         * number}.
+         * Creates a {@link Binding} for the given {@link #getHostIp() IP address} and {@link #getHostPort() port number}.
          *
          * @see Ports#bind(ExposedPort, Binding)
          * @see ExposedPort
@@ -151,8 +148,8 @@ public Binding(String hostIp, Integer hostPort) {
         }
 
         /**
-         * Creates a {@link Binding} for the given {@link #getHostPort() port number}, leaving the {@link #getHostIp()
-         * IP address} undefined.
+         * Creates a {@link Binding} for the given {@link #getHostPort() port number}, leaving the {@link #getHostIp() IP address}
+         * undefined.
          *
          * @see Ports#bind(ExposedPort, Binding)
          * @see ExposedPort
@@ -162,32 +159,30 @@ public Binding(Integer hostPort) {
         }
 
         /**
-         * Creates a {@link Binding} for the given {@link #getHostIp() IP address}, leaving the {@link #getHostPort()
-         * port number} undefined.
+         * Creates a {@link Binding} for the given {@link #getHostIp() IP address}, leaving the {@link #getHostPort() port number}
+         * undefined.
          */
         public Binding(String hostIp) {
             this(hostIp, null);
         }
 
         /**
-         * Creates a {@link Binding} with both {@link #getHostIp() IP address} and {@link #getHostPort() port number}
-         * undefined.
+         * Creates a {@link Binding} with both {@link #getHostIp() IP address} and {@link #getHostPort() port number} undefined.
          */
         public Binding() {
             this(null, null);
         }
 
         /**
-         * @return the IP address on the Docker host. May be <code>null</code>, in which case Docker will bind the port
-         *         to all interfaces (<code>0.0.0.0</code>).
+         * @return the IP address on the Docker host. May be <code>null</code>, in which case Docker will bind the port to all interfaces (
+         *         <code>0.0.0.0</code>).
          */
         public String getHostIp() {
             return hostIp;
         }
 
         /**
-         * @return the port number on the Docker host. May be <code>null</code>, in which case Docker will dynamically
-         *         assign a port.
+         * @return the port number on the Docker host. May be <code>null</code>, in which case Docker will dynamically assign a port.
          */
         public Integer getHostPort() {
             return hostPort;
@@ -212,15 +207,15 @@ public static Binding parse(String serialized) throws IllegalArgumentException {
 
                 String[] parts = serialized.split(":");
                 switch (parts.length) {
-                case 2: {
-                    return new Binding(parts[0], Integer.valueOf(parts[1]));
-                }
-                case 1: {
-                    return parts[0].contains(".") ? new Binding(parts[0]) : new Binding(Integer.valueOf(parts[0]));
-                }
-                default: {
-                    throw new IllegalArgumentException();
-                }
+                    case 2: {
+                        return new Binding(parts[0], Integer.valueOf(parts[1]));
+                    }
+                    case 1: {
+                        return parts[0].contains(".") ? new Binding(parts[0]) : new Binding(Integer.valueOf(parts[0]));
+                    }
+                    default: {
+                        throw new IllegalArgumentException();
+                    }
                 }
             } catch (Exception e) {
                 throw new IllegalArgumentException("Error parsing Binding '" + serialized + "'");
@@ -228,8 +223,8 @@ public static Binding parse(String serialized) throws IllegalArgumentException {
         }
 
         /**
-         * Returns a string representation of this {@link Binding} suitable for inclusion in a JSON message. The format
-         * is <code>[IP:]Port</code>, like the argument in {@link #parse(String)}.
+         * Returns a string representation of this {@link Binding} suitable for inclusion in a JSON message. The format is
+         * <code>[IP:]Port</code>, like the argument in {@link #parse(String)}.
          *
          * @return a string representation of this {@link Binding}
          */
diff --git a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
index d5c8f6e8e..ac6c4a318 100644
--- a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
+++ b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
@@ -15,8 +15,7 @@
  * <dd>Do not restart the container if it dies. (default)</dd>
  *
  * <dt>on-failure</dt>
- * <dd>Restart the container if it exits with a non-zero exit code. Can also accept an optional maximum restart count
- * (e.g. on-failure:5).
+ * <dd>Restart the container if it exits with a non-zero exit code. Can also accept an optional maximum restart count (e.g. on-failure:5).
  * <dd>
  *
  * <dt>always</dt>
@@ -111,8 +110,8 @@ public static RestartPolicy parse(String serialized) throws IllegalArgumentExcep
     }
 
     /**
-     * Returns a string representation of this {@link RestartPolicy}. The format is <code>name[:count]</code>, like the
-     * argument in {@link #parse(String)}.
+     * Returns a string representation of this {@link RestartPolicy}. The format is <code>name[:count]</code>, like the argument in
+     * {@link #parse(String)}.
      *
      * @return a string representation of this {@link RestartPolicy}
      */
diff --git a/src/main/java/com/github/dockerjava/api/model/Ulimit.java b/src/main/java/com/github/dockerjava/api/model/Ulimit.java
index 51602e043..7427fb0cc 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ulimit.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ulimit.java
@@ -45,7 +45,7 @@ public Integer getHard() {
         return hard;
     }
 
-    //CHECKSTYLE:OFF
+    // CHECKSTYLE:OFF
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof Ulimit) {
@@ -61,5 +61,5 @@ public boolean equals(Object obj) {
     public int hashCode() {
         return new HashCodeBuilder().append(name).append(soft).append(hard).toHashCode();
     }
-    //CHECKSTYLE:ON
+    // CHECKSTYLE:ON
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeRW.java b/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
index 3709d1b0c..7c4bdfb26 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
@@ -53,8 +53,8 @@ public AccessMode getAccessMode() {
     }
 
     /**
-     * Returns a string representation of this {@link VolumeRW} suitable for inclusion in a JSON message. The returned
-     * String is simply the container path, {@link #getPath()}.
+     * Returns a string representation of this {@link VolumeRW} suitable for inclusion in a JSON message. The returned String is simply the
+     * container path, {@link #getPath()}.
      *
      * @return a string representation of this {@link VolumeRW}
      */
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java b/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
index 78585ef48..f027b6d71 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
@@ -55,16 +55,16 @@ public static VolumesFrom parse(String serialized) {
         try {
             String[] parts = serialized.split(":");
             switch (parts.length) {
-            case 1: {
-                return new VolumesFrom(parts[0]);
-            }
-            case 2: {
-                return new VolumesFrom(parts[0], AccessMode.valueOf(parts[1]));
-            }
-
-            default: {
-                throw new IllegalArgumentException();
-            }
+                case 1: {
+                    return new VolumesFrom(parts[0]);
+                }
+                case 2: {
+                    return new VolumesFrom(parts[0], AccessMode.valueOf(parts[1]));
+                }
+
+                default: {
+                    throw new IllegalArgumentException();
+                }
             }
         } catch (Exception e) {
             throw new IllegalArgumentException("Error parsing Bind '" + serialized + "'");
@@ -88,8 +88,8 @@ public int hashCode() {
     }
 
     /**
-     * Returns a string representation of this {@link VolumesFrom} suitable for inclusion in a JSON message. The format
-     * is <code>&lt;container&gt;:&lt;access mode&gt;</code>, like the argument in {@link #parse(String)}.
+     * Returns a string representation of this {@link VolumesFrom} suitable for inclusion in a JSON message. The format is
+     * <code>&lt;container&gt;:&lt;access mode&gt;</code>, like the argument in {@link #parse(String)}.
      *
      * @return a string representation of this {@link VolumesFrom}
      */
diff --git a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
index 7315a05af..1a4ef5a47 100644
--- a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
+++ b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
@@ -63,7 +63,7 @@ public AuthConfigurations getAuthConfigurations() {
         return authConfigurations;
     }
 
-    //CHECKSTYLE:OFF
+    // CHECKSTYLE:OFF
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -88,7 +88,8 @@ public boolean equals(Object obj) {
             return false;
         return true;
     }
-    //CHECKSTYLE:ON
+
+    // CHECKSTYLE:ON
 
     @Override
     public String toString() {
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index 35f54c736..89c4d3787 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -178,10 +178,11 @@ private static Properties overrideDockerPropertiesWithSystemProperties(Propertie
         Properties overriddenProperties = new Properties();
         overriddenProperties.putAll(p);
 
-        for (String key : new String[]{DOCKER_IO_URL_PROPERTY, DOCKER_IO_VERSION_PROPERTY,
+        for (String key : new String[] {
+                DOCKER_IO_URL_PROPERTY, DOCKER_IO_VERSION_PROPERTY,
                 DOCKER_IO_USERNAME_PROPERTY, DOCKER_IO_PASSWORD_PROPERTY, DOCKER_IO_EMAIL_PROPERTY,
                 DOCKER_IO_SERVER_ADDRESS_PROPERTY, DOCKER_IO_DOCKER_CERT_PATH_PROPERTY,
-                DOCKER_IO_DOCKER_CFG_PATH_PROPERTY, }) {
+                DOCKER_IO_DOCKER_CFG_PATH_PROPERTY}) {
             if (systemProperties.containsKey(key)) {
                 overriddenProperties.setProperty(key, systemProperties.getProperty(key));
             }
@@ -295,7 +296,7 @@ public AuthConfigurations getAuthConfigurations() {
         return new AuthConfigurations();
     }
 
-    //CHECKSTYLE:OFF
+    // CHECKSTYLE:OFF
     @Override
     public boolean equals(Object o) {
         if (this == o)
@@ -337,7 +338,8 @@ public int hashCode() {
         result = 31 * result + (sslConfig != null ? sslConfig.hashCode() : 0);
         return result;
     }
-    //CHECKSTYLE:ON
+
+    // CHECKSTYLE:ON
 
     @Override
     public String toString() {
@@ -354,10 +356,9 @@ public static class DockerClientConfigBuilder {
         private SSLConfig sslConfig;
 
         /**
-         * This will set all fields in the builder to those contained in the Properties object. The Properties object
-         * should contain the following docker.io.* keys: url, version, username, password, email, dockerCertPath, and
-         * dockerCfgPath. If docker.io.readTimeout or docker.io.enableLoggingFilter are not contained, they will be set
-         * to 1000 and true, respectively.
+         * This will set all fields in the builder to those contained in the Properties object. The Properties object should contain the
+         * following docker.io.* keys: url, version, username, password, email, dockerCertPath, and dockerCfgPath. If docker.io.readTimeout
+         * or docker.io.enableLoggingFilter are not contained, they will be set to 1000 and true, respectively.
          */
         public DockerClientConfigBuilder withProperties(Properties p) {
             return withUri(p.getProperty(DOCKER_IO_URL_PROPERTY))
diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index 7bed65c5b..5dabdf404 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -116,22 +116,22 @@ static ScanResult scanChunk(String pattern) {
         int i;
         Scan: for (i = 0; i < pattern.length(); i++) {
             switch (pattern.charAt(i)) {
-            case '\\': {
-                if (!IS_WINDOWS && i + 1 < pattern.length()) {
-                    i++;
-                }
-                break;
-            }
-            case '[':
-                inRange = true;
-                break;
-            case ']':
-                inRange = false;
-                break;
-            case '*':
-                if (!inRange) {
-                    break Scan;
+                case '\\': {
+                    if (!IS_WINDOWS && i + 1 < pattern.length()) {
+                        i++;
+                    }
+                    break;
                 }
+                case '[':
+                    inRange = true;
+                    break;
+                case ']':
+                    inRange = false;
+                    break;
+                case '*':
+                    if (!inRange) {
+                        break Scan;
+                    }
             }
         }
         return new ScanResult(star, pattern.substring(0, i), pattern.substring(i));
@@ -148,68 +148,68 @@ static String matchChunk(String chunk, String s) {
                 return null;
             }
             switch (chunk.charAt(chunkOffset)) {
-            case '[':
-                r = s.charAt(sOffset);
-                sOffset++;
-                chunkOffset++;
-                // We can't end right after '[', we're expecting at least
-                // a closing bracket and possibly a caret.
-                if (chunkOffset == chunkLength) {
-                    throw new GoLangFileMatchException();
-                }
-                // possibly negated
-                boolean negated = chunk.charAt(chunkOffset) == '^';
-                if (negated) {
+                case '[':
+                    r = s.charAt(sOffset);
+                    sOffset++;
                     chunkOffset++;
-                }
-                // parse all ranges
-                boolean match = false;
-                int nrange = 0;
-                while (true) {
-                    if (chunkOffset < chunkLength && chunk.charAt(chunkOffset) == ']' && nrange > 0) {
+                    // We can't end right after '[', we're expecting at least
+                    // a closing bracket and possibly a caret.
+                    if (chunkOffset == chunkLength) {
+                        throw new GoLangFileMatchException();
+                    }
+                    // possibly negated
+                    boolean negated = chunk.charAt(chunkOffset) == '^';
+                    if (negated) {
                         chunkOffset++;
-                        break;
                     }
-                    GetEscResult result = getEsc(chunk, chunkOffset, chunkLength);
-                    char lo = result.lo;
-                    char hi = lo;
-                    chunkOffset = result.chunkOffset;
-                    if (chunk.charAt(chunkOffset) == '-') {
-                        result = getEsc(chunk, ++chunkOffset, chunkLength);
+                    // parse all ranges
+                    boolean match = false;
+                    int nrange = 0;
+                    while (true) {
+                        if (chunkOffset < chunkLength && chunk.charAt(chunkOffset) == ']' && nrange > 0) {
+                            chunkOffset++;
+                            break;
+                        }
+                        GetEscResult result = getEsc(chunk, chunkOffset, chunkLength);
+                        char lo = result.lo;
+                        char hi = lo;
                         chunkOffset = result.chunkOffset;
-                        hi = result.lo;
+                        if (chunk.charAt(chunkOffset) == '-') {
+                            result = getEsc(chunk, ++chunkOffset, chunkLength);
+                            chunkOffset = result.chunkOffset;
+                            hi = result.lo;
+                        }
+                        if (lo <= r && r <= hi) {
+                            match = true;
+                        }
+                        nrange++;
                     }
-                    if (lo <= r && r <= hi) {
-                        match = true;
+                    if (match == negated) {
+                        return null;
                     }
-                    nrange++;
-                }
-                if (match == negated) {
-                    return null;
-                }
-                break;
+                    break;
 
-            case '?':
-                if (s.charAt(sOffset) == File.separatorChar) {
-                    return null;
-                }
-                sOffset++;
-                chunkOffset++;
-                break;
-            case '\\':
-                if (!IS_WINDOWS) {
+                case '?':
+                    if (s.charAt(sOffset) == File.separatorChar) {
+                        return null;
+                    }
+                    sOffset++;
                     chunkOffset++;
-                    if (chunkOffset == chunkLength) {
-                        throw new GoLangFileMatchException();
+                    break;
+                case '\\':
+                    if (!IS_WINDOWS) {
+                        chunkOffset++;
+                        if (chunkOffset == chunkLength) {
+                            throw new GoLangFileMatchException();
+                        }
                     }
-                }
-                // fallthrough
-            default:
-                if (chunk.charAt(chunkOffset) != s.charAt(sOffset)) {
-                    return null;
-                }
-                sOffset++;
-                chunkOffset++;
+                    // fallthrough
+                default:
+                    if (chunk.charAt(chunkOffset) != s.charAt(sOffset)) {
+                        return null;
+                    }
+                    sOffset++;
+                    chunkOffset++;
             }
         }
         return s.substring(sOffset);
diff --git a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
index bdc2e6e89..43946a53b 100644
--- a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
@@ -88,22 +88,24 @@ public SSLContext getSSLContext() throws KeyManagementException, UnrecoverableKe
         final KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory
                 .getDefaultAlgorithm());
         keyManagerFactory.init(keystore, keystorePassword.toCharArray());
-        context.init(keyManagerFactory.getKeyManagers(), new TrustManager[]{new X509TrustManager() {
-            @Override
-            public X509Certificate[] getAcceptedIssuers() {
-                return new X509Certificate[] {};
-            }
+        context.init(keyManagerFactory.getKeyManagers(), new TrustManager[] {
+                new X509TrustManager() {
+                    @Override
+                    public X509Certificate[] getAcceptedIssuers() {
+                        return new X509Certificate[] {};
+                    }
 
-            @Override
-            public void checkClientTrusted(final X509Certificate[] arg0, final String arg1) {
+                    @Override
+                    public void checkClientTrusted(final X509Certificate[] arg0, final String arg1) {
 
-            }
+                    }
 
-            @Override
-            public void checkServerTrusted(final X509Certificate[] arg0, final String arg1) {
+                    @Override
+                    public void checkServerTrusted(final X509Certificate[] arg0, final String arg1) {
 
-            }
-        } }, new SecureRandom());
+                    }
+                }
+        }, new SecureRandom());
 
         return context;
     }
diff --git a/src/main/java/com/github/dockerjava/core/NameParser.java b/src/main/java/com/github/dockerjava/core/NameParser.java
index 5027422fd..1db59e3a0 100644
--- a/src/main/java/com/github/dockerjava/core/NameParser.java
+++ b/src/main/java/com/github/dockerjava/core/NameParser.java
@@ -17,14 +17,15 @@ public class NameParser {
     private NameParser() {
     }
 
-    //CHECKSTYLE:OFF
+    // CHECKSTYLE:OFF
     private static final int RepositoryNameTotalLengthMax = 255;
 
     private static final Pattern RepositoryNameComponentRegexp = Pattern.compile("[a-z0-9]+(?:[._-][a-z0-9]+)*");
 
     private static final Pattern RepositoryNameComponentAnchoredRegexp = Pattern.compile("^"
             + RepositoryNameComponentRegexp.pattern() + "$");
-    //CHECKSTYLE:ON
+
+    // CHECKSTYLE:ON
 
     // private static final Pattern RepositoryNameRegexp = Pattern.compile("(?:" +
     // RepositoryNameComponentRegexp.pattern()
diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index 80f9406b7..4a264ab17 100644
--- a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -10,8 +10,8 @@
 import com.google.common.base.Strings;
 
 /**
- * Bean to encapsulate the version of the <a
- * href="http://docs.docker.com/engine/reference/api/docker_remote_api/">Docker Remote (REST) API</a>
+ * Bean to encapsulate the version of the <a href="http://docs.docker.com/engine/reference/api/docker_remote_api/">Docker Remote (REST)
+ * API</a>
  * <p>
  * Contains the minor and major version of the API as well as operations to compare API versions.
  *
@@ -53,14 +53,12 @@ public class RemoteApiVersion implements Serializable {
     public static final RemoteApiVersion VERSION_1_21 = RemoteApiVersion.create(1, 21);
 
     /**
-     * @see <a href="https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.22.md">Docker
-     *      API 1.22</a>
+     * @see <a href="https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.22.md">Docker API 1.22</a>
      */
     public static final RemoteApiVersion VERSION_1_22 = RemoteApiVersion.create(1, 22);
 
     /**
-     * Unknown, docker doesn't reflect reality. I.e. we implemented method, but for javadoc it not clear when it was
-     * added.
+     * Unknown, docker doesn't reflect reality. I.e. we implemented method, but for javadoc it not clear when it was added.
      */
     private static final RemoteApiVersion UNKNOWN_VERSION = new RemoteApiVersion(0, 0) {
 
@@ -127,7 +125,7 @@ public boolean isGreaterOrEqual(final RemoteApiVersion other) {
         return false;
     }
 
-    //CHECKSTYLE:OFF
+    // CHECKSTYLE:OFF
     @Override
     public boolean equals(final Object o) {
         if (this == o)
@@ -137,7 +135,8 @@ public boolean equals(final Object o) {
         final RemoteApiVersion that = (RemoteApiVersion) o;
         return Objects.equal(major, that.major) && Objects.equal(minor, that.minor);
     }
-    //CHECKSTYLE:ON
+
+    // CHECKSTYLE:ON
 
     @Override
     public int hashCode() {
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index 0e146c1e9..edbf49827 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -103,8 +103,8 @@ public RC_T awaitCompletion(long timeout, TimeUnit timeUnit) throws InterruptedE
     }
 
     /**
-     * Blocks until {@link ResultCallback#onStart()} was called. {@link ResultCallback#onStart()} is called when the
-     * request was processed on the server side and the response is incoming.
+     * Blocks until {@link ResultCallback#onStart()} was called. {@link ResultCallback#onStart()} is called when the request was processed
+     * on the server side and the response is incoming.
      */
     @SuppressWarnings("unchecked")
     public RC_T awaitStarted() throws InterruptedException {
@@ -113,9 +113,8 @@ public RC_T awaitStarted() throws InterruptedException {
     }
 
     /**
-     * Blocks until {@link ResultCallback#onStart()} was called or the given timeout occurs.
-     * {@link ResultCallback#onStart()} is called when the request was processed on the server side and the response is
-     * incoming.
+     * Blocks until {@link ResultCallback#onStart()} was called or the given timeout occurs. {@link ResultCallback#onStart()} is called when
+     * the request was processed on the server side and the response is incoming.
      */
     @SuppressWarnings("unchecked")
     public RC_T awaitStarted(long timeout, TimeUnit timeUnit) throws InterruptedException {
diff --git a/src/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java
index cfb6cce14..7014704b1 100644
--- a/src/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java
@@ -27,12 +27,14 @@ public String getContainerId() {
         return containerId;
     }
 
-    @Override public ConnectToNetworkCmd withNetworkId(String networkId) {
+    @Override
+    public ConnectToNetworkCmd withNetworkId(String networkId) {
         this.networkId = networkId;
         return this;
     }
 
-    @Override public ConnectToNetworkCmd withContainerId(String containerId) {
+    @Override
+    public ConnectToNetworkCmd withContainerId(String containerId) {
         this.containerId = containerId;
         return this;
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
index fba16dfb9..c7d3b0abb 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.core.command;
 
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -12,7 +11,7 @@
 import com.github.dockerjava.api.model.Network.Ipam;
 
 public class CreateNetworkCmdImpl extends AbstrDockerCmd<CreateNetworkCmd, CreateNetworkResponse>
-    implements CreateNetworkCmd {
+        implements CreateNetworkCmd {
 
     @JsonProperty("Name")
     private String name;
diff --git a/src/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java
index a89201ad2..ae24946b6 100644
--- a/src/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java
@@ -6,7 +6,7 @@
 import com.github.dockerjava.api.command.DockerCmdSyncExec;
 
 public class DisconnectFromNetworkCmdImpl extends AbstrDockerCmd<DisconnectFromNetworkCmd, Void>
-    implements DisconnectFromNetworkCmd {
+        implements DisconnectFromNetworkCmd {
 
     @JsonIgnore
     private String networkId;
@@ -28,12 +28,14 @@ public String getContainerId() {
         return containerId;
     }
 
-    @Override public DisconnectFromNetworkCmd withNetworkId(String networkId) {
+    @Override
+    public DisconnectFromNetworkCmd withNetworkId(String networkId) {
         this.networkId = networkId;
         return this;
     }
 
-    @Override public DisconnectFromNetworkCmd withContainerId(String containerId) {
+    @Override
+    public DisconnectFromNetworkCmd withContainerId(String containerId) {
         this.containerId = containerId;
         return this;
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
index 836c9158e..01532090a 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
@@ -61,7 +61,6 @@ public InputStream getStdin() {
         return stdin;
     }
 
-
     @Override
     public ExecStartCmd withDetach(Boolean detach) {
         this.detach = detach;
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java b/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
index 62e492db9..847d62057 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
@@ -34,21 +34,21 @@ public void onNext(Frame frame) {
         if (frame != null) {
             try {
                 switch (frame.getStreamType()) {
-                case STDOUT:
-                case RAW:
-                    if (stdout != null) {
-                        stdout.write(frame.getPayload());
-                        stdout.flush();
-                    }
-                    break;
-                case STDERR:
-                    if (stderr != null) {
-                        stderr.write(frame.getPayload());
-                        stderr.flush();
-                    }
-                    break;
-                default:
-                    LOGGER.error("unknown stream type:" + frame.getStreamType());
+                    case STDOUT:
+                    case RAW:
+                        if (stdout != null) {
+                            stdout.write(frame.getPayload());
+                            stdout.flush();
+                        }
+                        break;
+                    case STDERR:
+                        if (stderr != null) {
+                            stderr.write(frame.getPayload());
+                            stderr.flush();
+                        }
+                        break;
+                    default:
+                        LOGGER.error("unknown stream type:" + frame.getStreamType());
                 }
             } catch (IOException e) {
                 onError(e);
diff --git a/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
index 0e885082a..1e8ac0930 100644
--- a/src/main/java/com/github/dockerjava/core/command/FrameReader.java
+++ b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
@@ -22,21 +22,20 @@ public class FrameReader implements AutoCloseable {
 
     private Boolean rawStreamDetected = false;
 
-
     public FrameReader(InputStream inputStream) {
         this.inputStream = inputStream;
     }
 
     private static StreamType streamType(byte streamType) {
         switch (streamType) {
-        case 0:
-            return StreamType.STDIN;
-        case 1:
-            return StreamType.STDOUT;
-        case 2:
-            return StreamType.STDERR;
-        default:
-            return StreamType.RAW;
+            case 0:
+                return StreamType.STDIN;
+            case 1:
+                return StreamType.STDOUT;
+            case 2:
+                return StreamType.STDERR;
+            default:
+                return StreamType.RAW;
         }
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/InpectNetworkCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InpectNetworkCmdImpl.java
index 0a0c564c5..7d9ef75b1 100644
--- a/src/main/java/com/github/dockerjava/core/command/InpectNetworkCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InpectNetworkCmdImpl.java
@@ -12,11 +12,13 @@ public InpectNetworkCmdImpl(DockerCmdSyncExec<InspectNetworkCmd, Network> exec)
         super(exec);
     }
 
-    @Override public String getNetworkId() {
+    @Override
+    public String getNetworkId() {
         return networkId;
     }
 
-    @Override public InspectNetworkCmd withNetworkId(String networkId) {
+    @Override
+    public InspectNetworkCmd withNetworkId(String networkId) {
 
         this.networkId = networkId;
         return this;
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
index f561a6deb..aa267fc8f 100644
--- a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -22,8 +22,8 @@
  * @param tail
  *            - `all` or `<number>`, Output specified number of lines at the end of logs
  * @param since
- *            - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that
- *            timestamp. Default: 0 (unfiltered)
+ *            - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default:
+ *            0 (unfiltered)
  */
 public class LogContainerCmdImpl extends AbstrAsyncDockerCmd<LogContainerCmd, Frame> implements LogContainerCmd {
 
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 9a94d6b1d..8c1c34e2a 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -213,8 +213,8 @@ private List<String> matchingIgnorePatterns(String fileName) {
         }
 
         /**
-         * Returns the matching ignore pattern for the given file or null if it should NOT be ignored. Exception rules
-         * like "!Dockerfile" will be respected.
+         * Returns the matching ignore pattern for the given file or null if it should NOT be ignored. Exception rules like "!Dockerfile"
+         * will be respected.
          */
         private String effectiveMatchingIgnorePattern(File file) {
             String relativeFilename = FilePathUtil.relativize(getDockerFolder(), file);
diff --git a/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
index c63489d85..5052dda40 100644
--- a/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
+++ b/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
@@ -54,8 +54,8 @@ private static TarArchiveOutputStream buildTarStream(Path outputPath, boolean gZ
      * @param outputPath
      *            where to put the archived file
      * @param childrenOnly
-     *            if inputPath is directory and if childrenOnly is true, the archive will contain all of its children,
-     *            else the archive contains unique entry which is the inputPath itself
+     *            if inputPath is directory and if childrenOnly is true, the archive will contain all of its children, else the archive
+     *            contains unique entry which is the inputPath itself
      * @param gZipped
      *            compress with gzip algorithm
      */
diff --git a/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java b/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
index 7ad380481..4d71014dd 100644
--- a/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
+++ b/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
@@ -81,7 +81,7 @@ private static List<String> labelsMapToList(Map<String, String> labels) {
         return result;
     }
 
-    //CHECKSTYLE:OFF
+    // CHECKSTYLE:OFF
     @Override
     public boolean equals(Object o) {
         if (this == o)
@@ -94,7 +94,8 @@ public boolean equals(Object o) {
         return filters.equals(filters1.filters);
 
     }
-    //CHECKSTYLE:ON
+
+    // CHECKSTYLE:ON
 
     @Override
     public int hashCode() {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java b/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
index e30028f34..a1b860b28 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
@@ -35,13 +35,11 @@
 import org.newsclub.net.unix.AFUNIXSocket;
 
 /**
- * Provides a socket that wraps an org.newsclub.net.unix.AFUNIXSocket and delays setting options until the socket is
- * connected. This is necessary because the Apache HTTP client attempts to set options prior to connecting the socket,
- * which doesn't work for Unix sockets since options are being set on the underlying file descriptor. Until the socket
- * is connected, the file descriptor doesn't exist.
+ * Provides a socket that wraps an org.newsclub.net.unix.AFUNIXSocket and delays setting options until the socket is connected. This is
+ * necessary because the Apache HTTP client attempts to set options prior to connecting the socket, which doesn't work for Unix sockets
+ * since options are being set on the underlying file descriptor. Until the socket is connected, the file descriptor doesn't exist.
  *
- * This class also noop's any calls to setReuseAddress, which is called by the Apache client but isn't supported by
- * AFUnixSocket.
+ * This class also noop's any calls to setReuseAddress, which is called by the Apache client but isn't supported by AFUnixSocket.
  */
 public class ApacheUnixSocket extends Socket {
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java
index dfc730e03..8a69b31fd 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java
@@ -11,7 +11,7 @@
 import static javax.ws.rs.client.Entity.entity;
 
 public class ConnectToNetworkCmdExec extends AbstrSyncDockerCmdExec<ConnectToNetworkCmd, Void>
-    implements ConnectToNetworkCmd.Exec {
+        implements ConnectToNetworkCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ConnectToNetworkCmdExec.class);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java
index 4f6f54576..95c3f5c22 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java
@@ -11,7 +11,7 @@
 import static javax.ws.rs.client.Entity.entity;
 
 public class DisconnectFromNetworkCmdExec extends AbstrSyncDockerCmdExec<DisconnectFromNetworkCmd, Void>
-    implements DisconnectFromNetworkCmd.Exec {
+        implements DisconnectFromNetworkCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DisconnectFromNetworkCmdExec.class);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java
index c5e6b4d0a..c9b19f881 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java
@@ -17,10 +17,11 @@ public InspectNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerCl
         super(baseResource, dockerClientConfig);
     }
 
-    @Override protected Network execute(InspectNetworkCmd command) {
+    @Override
+    protected Network execute(InspectNetworkCmd command) {
 
         WebTarget webResource = getBaseResource().path("/networks/{id}").resolveTemplate("id",
-            command.getNetworkId());
+                command.getNetworkId());
 
         LOGGER.debug("GET: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_JSON).get(Network.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java
index 84f115d4c..acc2bdd27 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java
@@ -9,7 +9,7 @@
 import javax.ws.rs.core.MediaType;
 
 public class RemoveNetworkCmdExec extends AbstrSyncDockerCmdExec<RemoveNetworkCmd, Void>
-    implements RemoveNetworkCmd.Exec {
+        implements RemoveNetworkCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(RemoveNetworkCmdExec.class);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
index 7994f3261..68b47bfa8 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
@@ -142,32 +142,29 @@
  * <li>{@link ApacheClientProperties#SSL_CONFIG}</li>
  * </ul>
  * <p>
- * This connector uses {@link RequestEntityProcessing#CHUNKED chunked encoding} as a default setting. This can be
- * overridden by the {@link ClientProperties#REQUEST_ENTITY_PROCESSING}. By default the
- * {@link ClientProperties#CHUNKED_ENCODING_SIZE} property is only supported by using default connection manager. If
- * custom connection manager needs to be used then chunked encoding size can be set by providing a custom
- * {@link org.apache.http.HttpClientConnection} (via custom
- * {@link org.apache.http.impl.conn.ManagedHttpClientConnectionFactory}) and overriding {@code createOutputStream}
- * method.
+ * This connector uses {@link RequestEntityProcessing#CHUNKED chunked encoding} as a default setting. This can be overridden by the
+ * {@link ClientProperties#REQUEST_ENTITY_PROCESSING}. By default the {@link ClientProperties#CHUNKED_ENCODING_SIZE} property is only
+ * supported by using default connection manager. If custom connection manager needs to be used then chunked encoding size can be set by
+ * providing a custom {@link org.apache.http.HttpClientConnection} (via custom
+ * {@link org.apache.http.impl.conn.ManagedHttpClientConnectionFactory}) and overriding {@code createOutputStream} method.
  * </p>
  * <p>
- * Using of authorization is dependent on the chunk encoding setting. If the entity buffering is enabled, the entity is
- * buffered and authorization can be performed automatically in response to a 401 by sending the request again. When
- * entity buffering is disabled (chunked encoding is used) then the property
- * {@link org.glassfish.jersey.apache.connector.ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION} must be set to
- * {@code true}.
+ * Using of authorization is dependent on the chunk encoding setting. If the entity buffering is enabled, the entity is buffered and
+ * authorization can be performed automatically in response to a 401 by sending the request again. When entity buffering is disabled
+ * (chunked encoding is used) then the property
+ * {@link org.glassfish.jersey.apache.connector.ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION} must be set to {@code true}.
  * </p>
  * <p>
  * If a {@link org.glassfish.jersey.client.ClientResponse} is obtained and an entity is not read from the response then
- * {@link org.glassfish.jersey.client.ClientResponse#close()} MUST be called after processing the response to release
- * connection-based resources.
+ * {@link org.glassfish.jersey.client.ClientResponse#close()} MUST be called after processing the response to release connection-based
+ * resources.
  * </p>
  * <p>
  * Client operations are thread safe, the HTTP connection may be shared between different threads.
  * </p>
  * <p>
- * If a response entity is obtained that is an instance of {@link Closeable} then the instance MUST be closed after
- * processing the entity to release connection-based resources.
+ * If a response entity is obtained that is an instance of {@link Closeable} then the instance MUST be closed after processing the entity to
+ * release connection-based resources.
  * </p>
  * <p>
  * The following methods are currently supported: HEAD, GET, POST, PUT, DELETE, OPTIONS, PATCH and TRACE.
@@ -404,8 +401,7 @@ public HttpClient getHttpClient() {
     /**
      * Get the {@link CookieStore}.
      *
-     * @return the {@link CookieStore} instance or {@code null} when {@value ApacheClientProperties#DISABLE_COOKIES} set
-     *         to {@code true}.
+     * @return the {@link CookieStore} instance or {@code null} when {@value ApacheClientProperties#DISABLE_COOKIES} set to {@code true}.
      */
     public CookieStore getCookieStore() {
         return cookieStore;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java
index 00deefe85..eafb55c29 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java
@@ -51,8 +51,8 @@
 import org.glassfish.jersey.client.spi.ConnectorProvider;
 
 /**
- * Connector provider for Jersey {@link Connector connectors} that utilize Apache HTTP Client to send and receive HTTP
- * request and responses.
+ * Connector provider for Jersey {@link Connector connectors} that utilize Apache HTTP Client to send and receive HTTP request and
+ * responses.
  * <p>
  * The following connector configuration properties are supported:
  * <ul>
@@ -70,30 +70,28 @@
  * </ul>
  * </p>
  * <p>
- * Connector instances created via this connector provider use
- * {@link org.glassfish.jersey.client.RequestEntityProcessing#CHUNKED chunked encoding} as a default setting. This can
- * be overridden by the {@link org.glassfish.jersey.client.ClientProperties#REQUEST_ENTITY_PROCESSING}. By default the
- * {@link org.glassfish.jersey.client.ClientProperties#CHUNKED_ENCODING_SIZE} property is only supported when using the
- * default {@code org.apache.http.conn.HttpClientConnectionManager} instance. If custom connection manager is used, then
- * chunked encoding size can be set by providing a custom {@code org.apache.http.HttpClientConnection} (via custom
- * {@code org.apache.http.impl.conn.ManagedHttpClientConnectionFactory}) and overriding it's {@code createOutputStream}
- * method.
+ * Connector instances created via this connector provider use {@link org.glassfish.jersey.client.RequestEntityProcessing#CHUNKED chunked
+ * encoding} as a default setting. This can be overridden by the
+ * {@link org.glassfish.jersey.client.ClientProperties#REQUEST_ENTITY_PROCESSING}. By default the
+ * {@link org.glassfish.jersey.client.ClientProperties#CHUNKED_ENCODING_SIZE} property is only supported when using the default
+ * {@code org.apache.http.conn.HttpClientConnectionManager} instance. If custom connection manager is used, then chunked encoding size can
+ * be set by providing a custom {@code org.apache.http.HttpClientConnection} (via custom
+ * {@code org.apache.http.impl.conn.ManagedHttpClientConnectionFactory}) and overriding it's {@code createOutputStream} method.
  * </p>
  * <p>
- * Use of authorization by the AHC-based connectors is dependent on the chunk encoding setting. If the entity buffering
- * is enabled, the entity is buffered and authorization can be performed automatically in response to a 401 by sending
- * the request again. When entity buffering is disabled (chunked encoding is used) then the property
- * {@link org.glassfish.jersey.apache.connector.ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION} must be set to
- * {@code true}.
+ * Use of authorization by the AHC-based connectors is dependent on the chunk encoding setting. If the entity buffering is enabled, the
+ * entity is buffered and authorization can be performed automatically in response to a 401 by sending the request again. When entity
+ * buffering is disabled (chunked encoding is used) then the property
+ * {@link org.glassfish.jersey.apache.connector.ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION} must be set to {@code true}.
  * </p>
  * <p>
  * If a {@link org.glassfish.jersey.client.ClientResponse} is obtained and an entity is not read from the response then
- * {@link org.glassfish.jersey.client.ClientResponse#close()} MUST be called after processing the response to release
- * connection-based resources.
+ * {@link org.glassfish.jersey.client.ClientResponse#close()} MUST be called after processing the response to release connection-based
+ * resources.
  * </p>
  * <p>
- * If a response entity is obtained that is an instance of {@link java.io.Closeable} then the instance MUST be closed
- * after processing the entity to release connection-based resources.
+ * If a response entity is obtained that is an instance of {@link java.io.Closeable} then the instance MUST be closed after processing the
+ * entity to release connection-based resources.
  * <p/>
  * <p>
  * The following methods are currently supported: HEAD, GET, POST, PUT, DELETE, OPTIONS, PATCH and TRACE.
@@ -114,17 +112,16 @@ public Connector getConnector(Client client, Configuration runtimeConfig) {
     }
 
     /**
-     * Retrieve the underlying Apache {@link HttpClient} instance from {@link org.glassfish.jersey.client.JerseyClient}
-     * or {@link org.glassfish.jersey.client.JerseyWebTarget} configured to use {@code ApacheConnectorProvider}.
+     * Retrieve the underlying Apache {@link HttpClient} instance from {@link org.glassfish.jersey.client.JerseyClient} or
+     * {@link org.glassfish.jersey.client.JerseyWebTarget} configured to use {@code ApacheConnectorProvider}.
      *
      * @param component
-     *            {@code JerseyClient} or {@code JerseyWebTarget} instance that is configured to use
-     *            {@code ApacheConnectorProvider}.
+     *            {@code JerseyClient} or {@code JerseyWebTarget} instance that is configured to use {@code ApacheConnectorProvider}.
      * @return underlying Apache {@code HttpClient} instance.
      *
      * @throws java.lang.IllegalArgumentException
-     *             in case the {@code component} is neither {@code JerseyClient} nor {@code JerseyWebTarget} instance or
-     *             in case the component is not configured to use a {@code ApacheConnectorProvider}.
+     *             in case the {@code component} is neither {@code JerseyClient} nor {@code JerseyWebTarget} instance or in case the
+     *             component is not configured to use a {@code ApacheConnectorProvider}.
      * @since 2.8
      */
     public static HttpClient getHttpClient(Configurable<?> component) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java
index cb5cd0687..4a7765d97 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java
@@ -9,9 +9,9 @@
 import javax.ws.rs.core.Response;
 
 /**
- * Default implementation of RedirectStrategy honors the restrictions on automatic redirection of entity enclosing
- * methods such as POST and PUT imposed by the HTTP specification. 302 Moved Temporarily, 301 Moved Permanently and 307
- * Temporary Redirect status codes will result in an automatic redirect of HEAD and GET methods only.
+ * Default implementation of RedirectStrategy honors the restrictions on automatic redirection of entity enclosing methods such as POST and
+ * PUT imposed by the HTTP specification. 302 Moved Temporarily, 301 Moved Permanently and 307 Temporary Redirect status codes will result
+ * in an automatic redirect of HEAD and GET methods only.
  *
  * {@link org.apache.http.impl.client.DefaultRedirectStrategy}
  *
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
index 76666fe4e..8c9848318 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
@@ -116,8 +116,8 @@ public int compare(final Map.Entry<String, List<String>> o1, final Map.Entry<Str
     private final int maxEntitySize;
 
     /**
-     * Create a logging filter logging the request and response to a default JDK logger, named as the fully qualified
-     * class name of this class. Entity logging is turned off by default.
+     * Create a logging filter logging the request and response to a default JDK logger, named as the fully qualified class name of this
+     * class. Entity logging is turned off by default.
      */
     public LoggingFilter() {
         this(LOGGER, false);
@@ -139,15 +139,14 @@ public LoggingFilter(final Logger logger, final Boolean printEntity) {
     }
 
     /**
-     * Creates a logging filter with custom logger and entity logging turned on, but potentially limiting the size of
-     * entity to be buffered and logged.
+     * Creates a logging filter with custom logger and entity logging turned on, but potentially limiting the size of entity to be buffered
+     * and logged.
      *
      * @param logger
      *            the logger to log requests and responses.
      * @param maxEntitySize
-     *            maximum number of entity bytes to be logged (and buffered) - if the entity is larger, logging filter
-     *            will print (and buffer in memory) only the specified number of bytes and print "...more..." string at
-     *            the end.
+     *            maximum number of entity bytes to be logged (and buffered) - if the entity is larger, logging filter will print (and
+     *            buffer in memory) only the specified number of bytes and print "...more..." string at the end.
      */
     public LoggingFilter(final Logger logger, final int maxEntitySize) {
         this.logger = logger;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
index e119c7303..a88dccb0d 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
@@ -33,26 +33,26 @@ public class ResponseStatusExceptionFilter implements ClientResponseFilter {
     public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException {
         int status = responseContext.getStatus();
         switch (status) {
-        case 200:
-        case 201:
-        case 204:
-            return;
-        case 304:
-            throw new NotModifiedException(getBodyAsMessage(responseContext));
-        case 400:
-            throw new BadRequestException(getBodyAsMessage(responseContext));
-        case 401:
-            throw new UnauthorizedException(getBodyAsMessage(responseContext));
-        case 404:
-            throw new NotFoundException(getBodyAsMessage(responseContext));
-        case 406:
-            throw new NotAcceptableException(getBodyAsMessage(responseContext));
-        case 409:
-            throw new ConflictException(getBodyAsMessage(responseContext));
-        case 500:
-            throw new InternalServerErrorException(getBodyAsMessage(responseContext));
-        default:
-            throw new DockerException(getBodyAsMessage(responseContext), status);
+            case 200:
+            case 201:
+            case 204:
+                return;
+            case 304:
+                throw new NotModifiedException(getBodyAsMessage(responseContext));
+            case 400:
+                throw new BadRequestException(getBodyAsMessage(responseContext));
+            case 401:
+                throw new UnauthorizedException(getBodyAsMessage(responseContext));
+            case 404:
+                throw new NotFoundException(getBodyAsMessage(responseContext));
+            case 406:
+                throw new NotAcceptableException(getBodyAsMessage(responseContext));
+            case 409:
+                throw new ConflictException(getBodyAsMessage(responseContext));
+            case 500:
+                throw new InternalServerErrorException(getBodyAsMessage(responseContext));
+            default:
+                throw new DockerException(getBodyAsMessage(responseContext), status);
         }
     }
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java b/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
index 14072ba55..afe0dce92 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
@@ -6,9 +6,8 @@
 import javax.ws.rs.core.Response;
 
 /**
- * This is a wrapper around {@link Response} that acts as a {@link InputStream}. When this
- * {@link WrappedResponseInputStream} is closed it closes the underlying {@link Response} object also to prevent
- * blocking/hanging connections.
+ * This is a wrapper around {@link Response} that acts as a {@link InputStream}. When this {@link WrappedResponseInputStream} is closed it
+ * closes the underlying {@link Response} object also to prevent blocking/hanging connections.
  *
  * @author Marcus Linke
  */
diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
index 2f7422ac2..9a6e976cc 100644
--- a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
@@ -127,8 +127,8 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
- * Experimental implementation of {@link DockerCmdExecFactory} that supports http connection hijacking that is needed to
- * pass STDIN to the container.
+ * Experimental implementation of {@link DockerCmdExecFactory} that supports http connection hijacking that is needed to pass STDIN to the
+ * container.
  *
  * To use it just pass an instance via {@link DockerClientImpl#withDockerCmdExecFactory(DockerCmdExecFactory)}
  *
diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
index e3b799165..467693748 100644
--- a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
+++ b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
@@ -47,8 +47,8 @@
 import com.github.dockerjava.netty.handler.JsonResponseCallbackHandler;
 
 /**
- * This class is basically a replacement of javax.ws.rs.client.Invocation.Builder to allow simpler migration of JAX-RS
- * code to a netty based implementation.
+ * This class is basically a replacement of javax.ws.rs.client.Invocation.Builder to allow simpler migration of JAX-RS code to a netty based
+ * implementation.
  *
  * @author Marcus Linke
  */
diff --git a/src/main/java/com/github/dockerjava/netty/MediaType.java b/src/main/java/com/github/dockerjava/netty/MediaType.java
index 50732aeb8..fac3a95e0 100644
--- a/src/main/java/com/github/dockerjava/netty/MediaType.java
+++ b/src/main/java/com/github/dockerjava/netty/MediaType.java
@@ -1,8 +1,8 @@
 package com.github.dockerjava.netty;
 
 /**
- * This class is basically a replacement of javax.ws.rs.core.MediaType to allow simpler
- * migration of JAX-RS code to a netty based implementation.
+ * This class is basically a replacement of javax.ws.rs.core.MediaType to allow simpler migration of JAX-RS code to a netty based
+ * implementation.
  *
  * @author Marcus Linke
  */
diff --git a/src/main/java/com/github/dockerjava/netty/WebTarget.java b/src/main/java/com/github/dockerjava/netty/WebTarget.java
index f86520434..090fea67c 100644
--- a/src/main/java/com/github/dockerjava/netty/WebTarget.java
+++ b/src/main/java/com/github/dockerjava/netty/WebTarget.java
@@ -9,8 +9,8 @@
 import org.apache.commons.lang.StringUtils;
 
 /**
- * This class is basically a replacement of javax.ws.rs.client.WebTarget to allow simpler
- * migration of JAX-RS code to a netty based implementation.
+ * This class is basically a replacement of javax.ws.rs.client.WebTarget to allow simpler migration of JAX-RS code to a netty based
+ * implementation.
  *
  * @author Marcus Linke
  */
diff --git a/src/main/java/com/github/dockerjava/netty/exec/AbstrSyncDockerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/AbstrSyncDockerCmdExec.java
index 0422110a5..993799dab 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/AbstrSyncDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/AbstrSyncDockerCmdExec.java
@@ -6,7 +6,6 @@
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.netty.WebTarget;
 
-
 public abstract class AbstrSyncDockerCmdExec<CMD_T extends DockerCmd<RES_T>, RES_T> extends AbstrDockerCmdExec
         implements DockerCmdSyncExec<CMD_T, RES_T> {
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CommitCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/CommitCmdExec.java
index eaba91fdb..e568345cd 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/CommitCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/CommitCmdExec.java
@@ -28,7 +28,8 @@ protected String execute(CommitCmd command) {
 
         LOGGER.trace("POST: {}", webTarget);
         ObjectNode objectNode = webTarget.request().accept(MediaType.APPLICATION_JSON)
-                .post(command, new TypeReference<ObjectNode>() { });
+                .post(command, new TypeReference<ObjectNode>() {
+                });
 
         return objectNode.get("Id").asText();
     }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExec.java
index b1090f4c3..b7bff9d52 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExec.java
@@ -6,9 +6,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 public class ConnectToNetworkCmdExec extends AbstrSyncDockerCmdExec<ConnectToNetworkCmd, Void>
-    implements ConnectToNetworkCmd.Exec {
+        implements ConnectToNetworkCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ConnectToNetworkCmdExec.class);
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CreateImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/CreateImageCmdExec.java
index 0e182e8bc..8fd791f53 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/CreateImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/CreateImageCmdExec.java
@@ -26,6 +26,7 @@ protected CreateImageResponse execute(CreateImageCmd command) {
 
         LOGGER.trace("POST: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM)
-                .post(new TypeReference<CreateImageResponse>() { }, command.getImageStream());
+                .post(new TypeReference<CreateImageResponse>() {
+                }, command.getImageStream());
     }
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExec.java
index 8b814bddc..ef139517f 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExec.java
@@ -6,9 +6,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 public class DisconnectFromNetworkCmdExec extends AbstrSyncDockerCmdExec<DisconnectFromNetworkCmd, Void>
-    implements DisconnectFromNetworkCmd.Exec {
+        implements DisconnectFromNetworkCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DisconnectFromNetworkCmdExec.class);
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InfoCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/InfoCmdExec.java
index 288765650..8fc211322 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/InfoCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/InfoCmdExec.java
@@ -10,8 +10,7 @@
 import com.github.dockerjava.netty.WebTarget;
 
 /**
- * http://stackoverflow.com/questions/33296749/netty-connect-to-unix-domain- socket-failed
- * http://netty.io/wiki/native-transports.html
+ * http://stackoverflow.com/questions/33296749/netty-connect-to-unix-domain- socket-failed http://netty.io/wiki/native-transports.html
  * https://github.com/netty/netty/blob/master/example/src/main/java/io/netty/ example/http/snoop/HttpSnoopClient.java
  *
  * @author Marcus Linke
diff --git a/src/main/java/com/github/dockerjava/netty/exec/LogContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/LogContainerCmdExec.java
index 911780362..a23bcb20d 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/LogContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/LogContainerCmdExec.java
@@ -9,7 +9,6 @@
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.netty.WebTarget;
 
-
 public class LogContainerCmdExec extends AbstrAsyncDockerCmdExec<LogContainerCmd, Frame> implements
         LogContainerCmd.Exec {
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/RestartContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/RestartContainerCmdExec.java
index 6c1f47a0b..df9721054 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/RestartContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/RestartContainerCmdExec.java
@@ -8,7 +8,6 @@
 import com.github.dockerjava.netty.MediaType;
 import com.github.dockerjava.netty.WebTarget;
 
-
 public class RestartContainerCmdExec extends AbstrSyncDockerCmdExec<RestartContainerCmd, Void> implements
         RestartContainerCmd.Exec {
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/StopContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/StopContainerCmdExec.java
index 3bade97e7..cd85d92c2 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/StopContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/StopContainerCmdExec.java
@@ -8,8 +8,6 @@
 import com.github.dockerjava.netty.MediaType;
 import com.github.dockerjava.netty.WebTarget;
 
-
-
 public class StopContainerCmdExec extends AbstrSyncDockerCmdExec<StopContainerCmd, Void> implements
         StopContainerCmd.Exec {
 
diff --git a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
index b58292b51..0567050d2 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
@@ -138,14 +138,14 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E
 
     private static StreamType streamType(byte streamType) {
         switch (streamType) {
-        case 0:
-            return StreamType.STDIN;
-        case 1:
-            return StreamType.STDOUT;
-        case 2:
-            return StreamType.STDERR;
-        default:
-            return StreamType.RAW;
+            case 0:
+                return StreamType.STDIN;
+            case 1:
+                return StreamType.STDOUT;
+            case 2:
+                return StreamType.STDERR;
+            default:
+                return StreamType.RAW;
         }
     }
 
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
index cbe8686d9..571fa9be5 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
@@ -25,8 +25,8 @@
 import com.github.dockerjava.api.exception.UnauthorizedException;
 
 /**
- * Handler that is responsible to handle an incoming {@link HttpResponse}. It evaluates the status code and triggers the
- * appropriate lifecycle methods at the passed {@link ResultCallback}.
+ * Handler that is responsible to handle an incoming {@link HttpResponse}. It evaluates the status code and triggers the appropriate
+ * lifecycle methods at the passed {@link ResultCallback}.
  *
  * @author Marcus Linke
  */
@@ -66,49 +66,49 @@ public void close() {
             ByteBuf byteBuf = content.content();
 
             switch (response.status().code()) {
-            case 200:
-            case 201:
-            case 204:
-                ctx.fireChannelRead(byteBuf);
-                break;
-            default:
-                errorBody.writeBytes(byteBuf);
+                case 200:
+                case 201:
+                case 204:
+                    ctx.fireChannelRead(byteBuf);
+                    break;
+                default:
+                    errorBody.writeBytes(byteBuf);
             }
 
             if (content instanceof LastHttpContent) {
                 try {
 
                     switch (response.status().code()) {
-                    case 101:
-                    case 200:
-                    case 201:
-                    case 204:
-                        break;
-                    case 301:
-                    case 302:
-                        if (response.headers().contains(HttpHeaderNames.LOCATION)) {
-                            String location = response.headers().get(HttpHeaderNames.LOCATION);
-                            HttpRequest redirected = requestProvider.getHttpRequest(location);
-
-                            ctx.channel().writeAndFlush(redirected);
-                        }
-                        break;
-                    case 304:
-                        throw new NotModifiedException(getBodyAsMessage(errorBody));
-                    case 400:
-                        throw new BadRequestException(getBodyAsMessage(errorBody));
-                    case 401:
-                        throw new UnauthorizedException(getBodyAsMessage(errorBody));
-                    case 404:
-                        throw new NotFoundException(getBodyAsMessage(errorBody));
-                    case 406:
-                        throw new NotAcceptableException(getBodyAsMessage(errorBody));
-                    case 409:
-                        throw new ConflictException(getBodyAsMessage(errorBody));
-                    case 500:
-                        throw new InternalServerErrorException(getBodyAsMessage(errorBody));
-                    default:
-                        throw new DockerException(getBodyAsMessage(errorBody), response.status().code());
+                        case 101:
+                        case 200:
+                        case 201:
+                        case 204:
+                            break;
+                        case 301:
+                        case 302:
+                            if (response.headers().contains(HttpHeaderNames.LOCATION)) {
+                                String location = response.headers().get(HttpHeaderNames.LOCATION);
+                                HttpRequest redirected = requestProvider.getHttpRequest(location);
+
+                                ctx.channel().writeAndFlush(redirected);
+                            }
+                            break;
+                        case 304:
+                            throw new NotModifiedException(getBodyAsMessage(errorBody));
+                        case 400:
+                            throw new BadRequestException(getBodyAsMessage(errorBody));
+                        case 401:
+                            throw new UnauthorizedException(getBodyAsMessage(errorBody));
+                        case 404:
+                            throw new NotFoundException(getBodyAsMessage(errorBody));
+                        case 406:
+                            throw new NotAcceptableException(getBodyAsMessage(errorBody));
+                        case 409:
+                            throw new ConflictException(getBodyAsMessage(errorBody));
+                        case 500:
+                            throw new InternalServerErrorException(getBodyAsMessage(errorBody));
+                        default:
+                            throw new DockerException(getBodyAsMessage(errorBody), response.status().code());
                     }
                 } catch (Throwable e) {
                     resultCallback.onError(e);
diff --git a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
index f718b1bdb..33066a84f 100644
--- a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
@@ -22,4 +22,4 @@ public void setUp() throws Exception {
     public void defaultServerAddress() throws Exception {
         assertEquals(new AuthConfig().getServerAddress(), "https://index.docker.io/v1/");
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java b/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
index 14325bd12..e8d4703db 100644
--- a/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
@@ -34,4 +34,4 @@ public void testFromCompoundString() throws Exception {
         Identifier i6 = Identifier.fromCompoundString("10.0.0.1:5000/my-test-image:1234");
         assertEquals(i6.repository.getPath(), "my-test-image");
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java b/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
index 05a2b3f01..a5a8697f5 100644
--- a/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
@@ -10,9 +10,8 @@
 import com.github.dockerjava.api.model.Ports.Binding;
 
 /**
- * As there may be several {@link Binding}s per {@link ExposedPort}, it makes a difference if you add
- * {@link PortBinding}s for the same or different {@link ExposedPort}s to {@link Ports}. This test verifies that the Map
- * in {@link Ports} is populated correctly in both cases.
+ * As there may be several {@link Binding}s per {@link ExposedPort}, it makes a difference if you add {@link PortBinding}s for the same or
+ * different {@link ExposedPort}s to {@link Ports}. This test verifies that the Map in {@link Ports} is populated correctly in both cases.
  */
 public class Ports_addBindingsTest {
     private static final ExposedPort TCP_80 = ExposedPort.tcp(80);
@@ -37,8 +36,8 @@ public void addTwoBindingsForDifferentExposedPorts() {
         Map<ExposedPort, Binding[]> bindings = ports.getBindings();
         // two keys with one value each
         assertEquals(bindings.size(), 2);
-        assertEquals(bindings.get(TCP_80), new Binding[] { BINDING_8080 });
-        assertEquals(bindings.get(TCP_90), new Binding[] { BINDING_9090 });
+        assertEquals(bindings.get(TCP_80), new Binding[] {BINDING_8080});
+        assertEquals(bindings.get(TCP_90), new Binding[] {BINDING_9090});
     }
 
     @Test
@@ -48,7 +47,7 @@ public void addTwoBindingsForSameExposedPort() {
         Map<ExposedPort, Binding[]> bindings = ports.getBindings();
         // one key with two values
         assertEquals(bindings.size(), 1);
-        assertEquals(bindings.get(TCP_80), new Binding[] { BINDING_8080, BINDING_9090 });
+        assertEquals(bindings.get(TCP_80), new Binding[] {BINDING_8080, BINDING_9090});
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/api/model/RepositoryTest.java b/src/test/java/com/github/dockerjava/api/model/RepositoryTest.java
index 8db0273df..c78b61a85 100644
--- a/src/test/java/com/github/dockerjava/api/model/RepositoryTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/RepositoryTest.java
@@ -15,4 +15,4 @@ public void testRepository() throws Exception {
 
         assertEquals(1234, repo1.getURL().getPort());
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_SerializingTest.java b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_SerializingTest.java
index b4a9a746a..74c97fcf6 100644
--- a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_SerializingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_SerializingTest.java
@@ -7,8 +7,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
- * Compares serialization results of various {@link RestartPolicy}s with what Docker (as of 1.3.3) actually sends when
- * executing <code>docker run --restart xxx</code>.
+ * Compares serialization results of various {@link RestartPolicy}s with what Docker (as of 1.3.3) actually sends when executing
+ * <code>docker run --restart xxx</code>.
  */
 public class RestartPolicy_SerializingTest {
     private final ObjectMapper objectMapper = new ObjectMapper();
diff --git a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java
index a2d99ce9c..69e1e88a2 100644
--- a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java
@@ -9,7 +9,7 @@ public class RestartPolicy_toStringTest {
 
     @DataProvider(name = "input")
     public Object[][] restartPolicies() {
-        return new Object[][] { { "no" }, { "always" }, { "on-failure" }, { "on-failure:2" } };
+        return new Object[][] { {"no"}, {"always"}, {"on-failure"}, {"on-failure:2"}};
     }
 
     @Test(dataProvider = "input")
diff --git a/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java b/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
index 7a22d6587..7d35c25a3 100644
--- a/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
@@ -28,4 +28,4 @@ public void t1() throws IOException {
         objectMapper.readValue(s, VolumeBinds.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 074c19ad9..bc36acb33 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -229,7 +229,7 @@ public static class LogContainerTestCallback extends LogContainerResultCallback
         public void onNext(Frame frame) {
             log.append(new String(frame.getPayload()));
             System.err.println("LogContainerTestCallback: " + log.toString());
-            //super.onNext(frame);
+            // super.onNext(frame);
         }
 
         @Override
diff --git a/src/test/java/com/github/dockerjava/client/DockerClientTest.java b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
index 8a7d6f6a4..72a09f0e5 100644
--- a/src/test/java/com/github/dockerjava/client/DockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
@@ -50,11 +50,11 @@ public void afterMethod(ITestResult result) {
     @Test
     public void testRunShlex() throws DockerException {
 
-        String[] commands = new String[] { "true",
+        String[] commands = new String[] {"true",
                 "echo \"The Young Descendant of Tepes & Septette for the Dead Princess\"",
                 "echo -n 'The Young Descendant of Tepes & Septette for the Dead Princess'",
                 "/bin/sh -c echo Hello World", "/bin/sh -c echo 'Hello World'", "echo 'Night of Nights'",
-                "true && echo 'Night of Nights'" };
+                "true && echo 'Night of Nights'"};
 
         for (String command : commands) {
             LOG.info("Running command: [{}]", command);
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
index c5a1e841c..34995ab1a 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
@@ -33,4 +33,4 @@ public void defaultInstanceAuthConfig() throws Exception {
 
         // then we do not get an exception
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java b/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
index 342c740ed..0fd870194 100644
--- a/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
+++ b/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
@@ -41,60 +41,60 @@ public void testMatch(MatchTestCase testCase) throws IOException {
 
     @DataProvider
     public Object[][] getTestData() {
-        return new Object[][] { new Object[] { new MatchTestCase("abc", "abc", true, false) },
-                new Object[] { new MatchTestCase("*", "abc", true, false) },
-                new Object[] { new MatchTestCase("*c", "abc", true, false) },
-                new Object[] { new MatchTestCase("a*", "a", true, false) },
-                new Object[] { new MatchTestCase("a*", "abc", true, false) },
-                new Object[] { new MatchTestCase("a*", "ab/c", false, false) },
-                new Object[] { new MatchTestCase("a*/b", "abc/b", true, false) },
-                new Object[] { new MatchTestCase("a*/b", "a/c/b", false, false) },
-                new Object[] { new MatchTestCase("a*b*c*d*e*/f", "axbxcxdxe/f", true, false) },
-                new Object[] { new MatchTestCase("a*b*c*d*e*/f", "axbxcxdxexxx/f", true, false) },
-                new Object[] { new MatchTestCase("a*b*c*d*e*/f", "axbxcxdxe/xxx/f", false, false) },
-                new Object[] { new MatchTestCase("a*b*c*d*e*/f", "axbxcxdxexxx/fff", false, false) },
-                new Object[] { new MatchTestCase("a*b?c*x", "abxbbxdbxebxczzx", true, false) },
-                new Object[] { new MatchTestCase("a*b?c*x", "abxbbxdbxebxczzy", false, false) },
-                new Object[] { new MatchTestCase("ab[c]", "abc", true, false) },
-                new Object[] { new MatchTestCase("ab[b-d]", "abc", true, false) },
-                new Object[] { new MatchTestCase("ab[e-g]", "abc", false, false) },
-                new Object[] { new MatchTestCase("ab[^c]", "abc", false, false) },
-                new Object[] { new MatchTestCase("ab[^b-d]", "abc", false, false) },
-                new Object[] { new MatchTestCase("ab[^e-g]", "abc", true, false) },
-                new Object[] { new MatchTestCase("a\\*b", "a*b", true, false) },
-                new Object[] { new MatchTestCase("a\\*b", "ab", false, false) },
-                new Object[] { new MatchTestCase("a?b", "a☺b", true, false) },
-                new Object[] { new MatchTestCase("a[^a]b", "a☺b", true, false) },
-                new Object[] { new MatchTestCase("a???b", "a☺b", false, false) },
-                new Object[] { new MatchTestCase("a[^a][^a][^a]b", "a☺b", false, false) },
-                new Object[] { new MatchTestCase("[a-ζ]*", "α", true, false) },
-                new Object[] { new MatchTestCase("*[a-ζ]", "A", false, false) },
-                new Object[] { new MatchTestCase("a?b", "a/b", false, false) },
-                new Object[] { new MatchTestCase("a*b", "a/b", false, false) },
-                new Object[] { new MatchTestCase("[\\]a]", "]", true, false) },
-                new Object[] { new MatchTestCase("[\\-]", "-", true, false) },
-                new Object[] { new MatchTestCase("[x\\-]", "x", true, false) },
-                new Object[] { new MatchTestCase("[x\\-]", "-", true, false) },
-                new Object[] { new MatchTestCase("[x\\-]", "z", false, false) },
-                new Object[] { new MatchTestCase("[\\-x]", "x", true, false) },
-                new Object[] { new MatchTestCase("[\\-x]", "-", true, false) },
-                new Object[] { new MatchTestCase("[\\-x]", "a", false, false) },
-                new Object[] { new MatchTestCase("[]a]", "]", false, true) },
-                new Object[] { new MatchTestCase("[-]", "-", false, true) },
-                new Object[] { new MatchTestCase("[x-]", "x", false, true) },
-                new Object[] { new MatchTestCase("[x-]", "-", false, true) },
-                new Object[] { new MatchTestCase("[x-]", "z", false, true) },
-                new Object[] { new MatchTestCase("[-x]", "x", false, true) },
-                new Object[] { new MatchTestCase("[-x]", "-", false, true) },
-                new Object[] { new MatchTestCase("[-x]", "a", false, true) },
-                new Object[] { new MatchTestCase("\\", "a", false, true) },
-                new Object[] { new MatchTestCase("[a-b-c]", "a", false, true) },
-                new Object[] { new MatchTestCase("[", "a", false, true) },
-                new Object[] { new MatchTestCase("[^", "a", false, true) },
-                new Object[] { new MatchTestCase("[^bc", "a", false, true) },
-                new Object[] { new MatchTestCase("a[", "a", false, false) },
-                new Object[] { new MatchTestCase("a[", "ab", false, true) },
-                new Object[] { new MatchTestCase("*x", "xxx", true, false) } };
+        return new Object[][] {new Object[] {new MatchTestCase("abc", "abc", true, false)},
+                new Object[] {new MatchTestCase("*", "abc", true, false)},
+                new Object[] {new MatchTestCase("*c", "abc", true, false)},
+                new Object[] {new MatchTestCase("a*", "a", true, false)},
+                new Object[] {new MatchTestCase("a*", "abc", true, false)},
+                new Object[] {new MatchTestCase("a*", "ab/c", false, false)},
+                new Object[] {new MatchTestCase("a*/b", "abc/b", true, false)},
+                new Object[] {new MatchTestCase("a*/b", "a/c/b", false, false)},
+                new Object[] {new MatchTestCase("a*b*c*d*e*/f", "axbxcxdxe/f", true, false)},
+                new Object[] {new MatchTestCase("a*b*c*d*e*/f", "axbxcxdxexxx/f", true, false)},
+                new Object[] {new MatchTestCase("a*b*c*d*e*/f", "axbxcxdxe/xxx/f", false, false)},
+                new Object[] {new MatchTestCase("a*b*c*d*e*/f", "axbxcxdxexxx/fff", false, false)},
+                new Object[] {new MatchTestCase("a*b?c*x", "abxbbxdbxebxczzx", true, false)},
+                new Object[] {new MatchTestCase("a*b?c*x", "abxbbxdbxebxczzy", false, false)},
+                new Object[] {new MatchTestCase("ab[c]", "abc", true, false)},
+                new Object[] {new MatchTestCase("ab[b-d]", "abc", true, false)},
+                new Object[] {new MatchTestCase("ab[e-g]", "abc", false, false)},
+                new Object[] {new MatchTestCase("ab[^c]", "abc", false, false)},
+                new Object[] {new MatchTestCase("ab[^b-d]", "abc", false, false)},
+                new Object[] {new MatchTestCase("ab[^e-g]", "abc", true, false)},
+                new Object[] {new MatchTestCase("a\\*b", "a*b", true, false)},
+                new Object[] {new MatchTestCase("a\\*b", "ab", false, false)},
+                new Object[] {new MatchTestCase("a?b", "a☺b", true, false)},
+                new Object[] {new MatchTestCase("a[^a]b", "a☺b", true, false)},
+                new Object[] {new MatchTestCase("a???b", "a☺b", false, false)},
+                new Object[] {new MatchTestCase("a[^a][^a][^a]b", "a☺b", false, false)},
+                new Object[] {new MatchTestCase("[a-ζ]*", "α", true, false)},
+                new Object[] {new MatchTestCase("*[a-ζ]", "A", false, false)},
+                new Object[] {new MatchTestCase("a?b", "a/b", false, false)},
+                new Object[] {new MatchTestCase("a*b", "a/b", false, false)},
+                new Object[] {new MatchTestCase("[\\]a]", "]", true, false)},
+                new Object[] {new MatchTestCase("[\\-]", "-", true, false)},
+                new Object[] {new MatchTestCase("[x\\-]", "x", true, false)},
+                new Object[] {new MatchTestCase("[x\\-]", "-", true, false)},
+                new Object[] {new MatchTestCase("[x\\-]", "z", false, false)},
+                new Object[] {new MatchTestCase("[\\-x]", "x", true, false)},
+                new Object[] {new MatchTestCase("[\\-x]", "-", true, false)},
+                new Object[] {new MatchTestCase("[\\-x]", "a", false, false)},
+                new Object[] {new MatchTestCase("[]a]", "]", false, true)},
+                new Object[] {new MatchTestCase("[-]", "-", false, true)},
+                new Object[] {new MatchTestCase("[x-]", "x", false, true)},
+                new Object[] {new MatchTestCase("[x-]", "-", false, true)},
+                new Object[] {new MatchTestCase("[x-]", "z", false, true)},
+                new Object[] {new MatchTestCase("[-x]", "x", false, true)},
+                new Object[] {new MatchTestCase("[-x]", "-", false, true)},
+                new Object[] {new MatchTestCase("[-x]", "a", false, true)},
+                new Object[] {new MatchTestCase("\\", "a", false, true)},
+                new Object[] {new MatchTestCase("[a-b-c]", "a", false, true)},
+                new Object[] {new MatchTestCase("[", "a", false, true)},
+                new Object[] {new MatchTestCase("[^", "a", false, true)},
+                new Object[] {new MatchTestCase("[^bc", "a", false, true)},
+                new Object[] {new MatchTestCase("a[", "a", false, false)},
+                new Object[] {new MatchTestCase("a[", "ab", false, true)},
+                new Object[] {new MatchTestCase("*x", "xxx", true, false)}};
     }
 
     private final class MatchTestCase {
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index 50860789b..3ac8828e8 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -11,8 +11,8 @@
 import com.github.dockerjava.api.model.BuildResponseItem;
 
 /**
- * Special {@link DockerCmdExecFactory} implementation that collects container and image creations while test execution
- * for the purpose of automatically cleanup.
+ * Special {@link DockerCmdExecFactory} implementation that collects container and image creations while test execution for the purpose of
+ * automatically cleanup.
  *
  * @author Marcus Linke
  */
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 9266c5ccd..775b12b16 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -174,7 +174,7 @@ private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
         return containerLog(container.getId());
     }
 
-    @Test(expectedExceptions = { DockerClientException.class })
+    @Test(expectedExceptions = {DockerClientException.class})
     public void testDockerfileIgnored() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerfileIgnored")
                 .getFile());
@@ -190,7 +190,7 @@ public void testDockerfileNotIgnored() throws Exception {
         dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
     }
 
-    @Test(expectedExceptions = { DockerClientException.class })
+    @Test(expectedExceptions = {DockerClientException.class})
     public void testInvalidDockerIgnorePattern() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader()
                 .getResource("testInvalidDockerignorePattern").getFile());
@@ -309,7 +309,8 @@ public void testBuildFromPrivateRegistry() throws Exception {
     public void testBuildArgs() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testBuildArgs").getFile());
 
-        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc").exec(new BuildImageResultCallback())
+        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc")
+                .exec(new BuildImageResultCallback())
                 .awaitImageId();
 
         InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 3f989c114..dba1a1a34 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -266,8 +266,8 @@ public void createContainerWithLink() throws DockerException {
 
         InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
                 .exec();
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
-                "container1Link") }));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link("container1",
+                "container1Link")}));
     }
 
     @Test
@@ -325,7 +325,7 @@ public void createContainerWithEntrypoint() throws DockerException {
     @Test
     public void createContainerWithExtraHosts() throws DockerException {
 
-        String[] extraHosts = { "dockerhost:127.0.0.1", "otherhost:10.0.0.1" };
+        String[] extraHosts = {"dockerhost:127.0.0.1", "otherhost:10.0.0.1"};
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
                 .withExtraHosts(extraHosts).exec();
@@ -430,8 +430,8 @@ public void createContainerWithLinking() throws DockerException {
         assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
         assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
-                "container1Link") }));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link("container1",
+                "container1Link")}));
         assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
         assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
         assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
@@ -471,11 +471,10 @@ public void createContainerWithPidMode() throws DockerException {
     }
 
     /**
-     * This tests support for --net option for the docker run command: --net="bridge" Set the Network mode for the
-     * container 'bridge': creates a new network stack for the container on the docker bridge 'none': no networking for
-     * this container 'container:': reuses another container network stack 'host': use the host network stack inside the
-     * container. Note: the host mode gives the container full access to local system services such as D-bus and is
-     * therefore considered insecure.
+     * This tests support for --net option for the docker run command: --net="bridge" Set the Network mode for the container 'bridge':
+     * creates a new network stack for the container on the docker bridge 'none': no networking for this container 'container:': reuses
+     * another container network stack 'host': use the host network stack inside the container. Note: the host mode gives the container full
+     * access to local system services such as D-bus and is therefore considered insecure.
      */
     @Test
     public void createContainerWithNetworkMode() throws DockerException {
@@ -510,7 +509,7 @@ public void createContainerWithMacAddress() throws DockerException {
     @Test(groups = "ignoreInCircleCi")
     public void createContainerWithULimits() throws DockerException {
 
-        Ulimit[] ulimits = { new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096) };
+        Ulimit[] ulimits = {new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096)};
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
                 .withUlimits(ulimits).exec();
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
index 1d21b8e95..38ddf1402 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
@@ -58,4 +58,4 @@ private void setBytes(int... bytes) {
             this.bytes.add(aByte);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index ce060f4bb..0bc2c9b1a 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -316,8 +316,8 @@ public void startContainerWithLinkingDeprecated() throws DockerException {
         assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
         assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
-                "container1Link") }));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link("container1",
+                "container1Link")}));
         assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
         assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
         assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
@@ -369,8 +369,8 @@ public void startContainerWithLinking() throws DockerException {
         assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
         assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
-                "container1Link") }));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link("container1",
+                "container1Link")}));
         assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
         assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
         assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
@@ -382,7 +382,7 @@ public void startContainerWithLinking() throws DockerException {
     @Test
     public void startContainer() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd(new String[] { "top" })
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd(new String[] {"top"})
                 .exec();
 
         LOG.info("Created container {}", container.toString());
@@ -418,11 +418,10 @@ public void testStartNonExistingContainer() throws DockerException {
     }
 
     /**
-     * This tests support for --net option for the docker run command: --net="bridge" Set the Network mode for the
-     * container 'bridge': creates a new network stack for the container on the docker bridge 'none': no networking for
-     * this container 'container:': reuses another container network stack 'host': use the host network stack inside the
-     * container. Note: the host mode gives the container full access to local system services such as D-bus and is
-     * therefore considered insecure.
+     * This tests support for --net option for the docker run command: --net="bridge" Set the Network mode for the container 'bridge':
+     * creates a new network stack for the container on the docker bridge 'none': no networking for this container 'container:': reuses
+     * another container network stack 'host': use the host network stack inside the container. Note: the host mode gives the container full
+     * access to local system services such as D-bus and is therefore considered insecure.
      */
     @Test
     public void startContainerWithNetworkMode() throws DockerException {
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
index b121900b4..47d570d8c 100644
--- a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
+++ b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
@@ -20,14 +20,14 @@ public class DockerfileStatementAddTest extends TestCase {
 
     @DataProvider(name = "valid scenarios")
     public Object[][] validScenarios() {
-        return new Object[][] { { "ADD src dest", contains("src"), "dest" },
-                { "ADD \"src file\" \"dest\"", contains("src file"), "dest" },
-                { "ADD src\"file dest", contains("src\"file"), "dest" },
-                { "ADD src1 src2 dest", containsInAnyOrder("src1", "src2"), "dest" },
-                { "COPY src dest", contains("src"), "dest" },
-                { "COPY \"src file\" \"dest\"", contains("src file"), "dest" },
-                { "COPY src\"file dest", contains("src\"file"), "dest" },
-                { "COPY src1 src2 dest", containsInAnyOrder("src1", "src2"), "dest" } };
+        return new Object[][] { {"ADD src dest", contains("src"), "dest"},
+                {"ADD \"src file\" \"dest\"", contains("src file"), "dest"},
+                {"ADD src\"file dest", contains("src\"file"), "dest"},
+                {"ADD src1 src2 dest", containsInAnyOrder("src1", "src2"), "dest"},
+                {"COPY src dest", contains("src"), "dest"},
+                {"COPY \"src file\" \"dest\"", contains("src file"), "dest"},
+                {"COPY src\"file dest", contains("src\"file"), "dest"},
+                {"COPY src1 src2 dest", containsInAnyOrder("src1", "src2"), "dest"}};
     }
 
     @Test(dataProvider = "valid scenarios")
@@ -38,7 +38,7 @@ public void testAddOrCopyPattern(String command, Matcher matchesExpectation, Str
         assertThat(optionalAdd.get().destination, is(expectedDest));
     }
 
-    @Test(expectedExceptions = { DockerClientException.class })
+    @Test(expectedExceptions = {DockerClientException.class})
     public void shouldThrowExceptionIfDestNotSpecified() {
         DockerfileStatement.Add.create("ADD src");
     }
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java
index c69529d02..ba96ad2eb 100644
--- a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java
+++ b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java
@@ -46,4 +46,4 @@ public void testAllItems() throws IOException {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/github/dockerjava/core/util/FiltersBuilderTest.java b/src/test/java/com/github/dockerjava/core/util/FiltersBuilderTest.java
index 125fd0785..25027ae76 100644
--- a/src/test/java/com/github/dockerjava/core/util/FiltersBuilderTest.java
+++ b/src/test/java/com/github/dockerjava/core/util/FiltersBuilderTest.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.core.util;
 
-import com.github.dockerjava.core.util.
-FiltersBuilder;
+import com.github.dockerjava.core.util.FiltersBuilder;
 import com.google.common.collect.Maps;
 
 import org.testng.annotations.Test;
diff --git a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
index e4aa05250..fad4ef7b1 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
@@ -166,7 +166,7 @@ private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
         return containerLog(container.getId());
     }
 
-    @Test(expectedExceptions = { DockerClientException.class })
+    @Test(expectedExceptions = {DockerClientException.class})
     public void testDockerfileIgnored() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerfileIgnored")
                 .getFile());
@@ -182,7 +182,7 @@ public void testDockerfileNotIgnored() throws Exception {
         dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
     }
 
-    @Test(expectedExceptions = { DockerClientException.class })
+    @Test(expectedExceptions = {DockerClientException.class})
     public void testInvalidDockerIgnorePattern() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader()
                 .getResource("testInvalidDockerignorePattern").getFile());
@@ -301,7 +301,8 @@ public void testBuildFromPrivateRegistry() throws Exception {
     public void testBuildArgs() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testBuildArgs").getFile());
 
-        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc").exec(new BuildImageResultCallback())
+        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc")
+                .exec(new BuildImageResultCallback())
                 .awaitImageId();
 
         InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
index a29b26d7b..9a6d4b354 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
@@ -259,8 +259,8 @@ public void createContainerWithLink() throws DockerException {
 
         InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
                 .exec();
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
-                "container1Link") }));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link("container1",
+                "container1Link")}));
     }
 
     @Test
@@ -318,7 +318,7 @@ public void createContainerWithEntrypoint() throws DockerException {
     @Test
     public void createContainerWithExtraHosts() throws DockerException {
 
-        String[] extraHosts = { "dockerhost:127.0.0.1", "otherhost:10.0.0.1" };
+        String[] extraHosts = {"dockerhost:127.0.0.1", "otherhost:10.0.0.1"};
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
                 .withExtraHosts(extraHosts).exec();
@@ -423,8 +423,8 @@ public void createContainerWithLinking() throws DockerException {
         assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
         assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
-                "container1Link") }));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link("container1",
+                "container1Link")}));
         assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
         assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
         assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
@@ -464,11 +464,10 @@ public void createContainerWithPidMode() throws DockerException {
     }
 
     /**
-     * This tests support for --net option for the docker run command: --net="bridge" Set the Network mode for the
-     * container 'bridge': creates a new network stack for the container on the docker bridge 'none': no networking for
-     * this container 'container:': reuses another container network stack 'host': use the host network stack inside the
-     * container. Note: the host mode gives the container full access to local system services such as D-bus and is
-     * therefore considered insecure.
+     * This tests support for --net option for the docker run command: --net="bridge" Set the Network mode for the container 'bridge':
+     * creates a new network stack for the container on the docker bridge 'none': no networking for this container 'container:': reuses
+     * another container network stack 'host': use the host network stack inside the container. Note: the host mode gives the container full
+     * access to local system services such as D-bus and is therefore considered insecure.
      */
     @Test
     public void createContainerWithNetworkMode() throws DockerException {
@@ -503,7 +502,7 @@ public void createContainerWithMacAddress() throws DockerException {
     @Test(groups = "ignoreInCircleCi")
     public void createContainerWithULimits() throws DockerException {
 
-        Ulimit[] ulimits = { new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096) };
+        Ulimit[] ulimits = {new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096)};
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
                 .withUlimits(ulimits).exec();
diff --git a/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
index 8af196a60..02b7cd51b 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
@@ -317,8 +317,8 @@ public void startContainerWithLinkingDeprecated() throws DockerException {
         assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
         assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
-                "container1Link") }));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link("container1",
+                "container1Link")}));
         assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
         assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
         assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
@@ -370,8 +370,8 @@ public void startContainerWithLinking() throws DockerException {
         assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
         assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] { new Link("container1",
-                "container1Link") }));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link("container1",
+                "container1Link")}));
         assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
         assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
         assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
@@ -383,7 +383,7 @@ public void startContainerWithLinking() throws DockerException {
     @Test
     public void startContainer() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd(new String[] { "top" })
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd(new String[] {"top"})
                 .exec();
 
         LOG.info("Created container {}", container.toString());
@@ -419,11 +419,10 @@ public void testStartNonExistingContainer() throws DockerException {
     }
 
     /**
-     * This tests support for --net option for the docker run command: --net="bridge" Set the Network mode for the
-     * container 'bridge': creates a new network stack for the container on the docker bridge 'none': no networking for
-     * this container 'container:': reuses another container network stack 'host': use the host network stack inside the
-     * container. Note: the host mode gives the container full access to local system services such as D-bus and is
-     * therefore considered insecure.
+     * This tests support for --net option for the docker run command: --net="bridge" Set the Network mode for the container 'bridge':
+     * creates a new network stack for the container on the docker bridge 'none': no networking for this container 'container:': reuses
+     * another container network stack 'host': use the host network stack inside the container. Note: the host mode gives the container full
+     * access to local system services such as D-bus and is therefore considered insecure.
      */
     @Test
     public void startContainerWithNetworkMode() throws DockerException {

From fbef1cd41ed5e3b3202d82f88117d907e54fea85 Mon Sep 17 00:00:00 2001
From: Christopher Dancy <dancc@pega.com>
Date: Sat, 6 Feb 2016 16:20:57 -0500
Subject: [PATCH 0396/1272] Return null, instead of NullPointerException,
 should no exposedPorts be found

---
 .../java/com/github/dockerjava/api/model/ContainerConfig.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
index efc5e0248..d7f4b81ee 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
@@ -84,7 +84,7 @@ public class ContainerConfig {
 
     @JsonIgnore
     public ExposedPort[] getExposedPorts() {
-        return exposedPorts.getExposedPorts();
+        return exposedPorts != null ? exposedPorts.getExposedPorts() : null;
     }
 
     public Boolean isNetworkDisabled() {

From 835c78c250c6f59a838e5e947ea1971961c644c9 Mon Sep 17 00:00:00 2001
From: Christopher Dancy <dancc@pega.com>
Date: Sat, 6 Feb 2016 16:49:28 -0500
Subject: [PATCH 0397/1272] Expose netty deps as a version and bump to latest
 4.1.0.CR2

---
 pom.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 43a73c889..60e8fcad5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,7 @@
 		<!-- test dependencies -->
 		<logback.version>1.1.0</logback.version>
 		<testng.version>6.1.1</testng.version>
+		<netty.version>4.1.0.CR2</netty.version>
 		<hamcrest.library.version>1.3</hamcrest.library.version>
 		<hamcrest.jpa-matchers>1.6</hamcrest.jpa-matchers>
 		<lambdaj.version>2.3.3</lambdaj.version>
@@ -206,22 +207,22 @@
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-codec-http</artifactId>
-			<version>4.1.0.Beta7</version>
+			<version>${netty.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-handler</artifactId>
-			<version>4.1.0.Beta7</version>
+			<version>${netty.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-handler-proxy</artifactId>
-			<version>4.1.0.Beta7</version>
+			<version>${netty.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-transport-native-epoll</artifactId>
-			<version>4.1.0.Beta7</version>
+			<version>${netty.version}</version>
 			<classifier>linux-x86_64</classifier>
 		</dependency>
 	</dependencies>

From 3a1527714910ff8e65edb745aac4f6d44aa83f9c Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 7 Feb 2016 19:43:44 +0100
Subject: [PATCH 0398/1272] Add withDockerTlsVerify(Boolean dockerTlsVerify)

---
 .../dockerjava/core/DockerClientConfig.java   | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index 400f417ea..12d09664c 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -27,8 +27,7 @@
 import com.github.dockerjava.core.NameParser.ReposTag;
 
 /**
- * Respects some of the docker CLI options. See
- * https://docs.docker.com/engine/reference/commandline/cli/#environment-variables
+ * Respects some of the docker CLI options. See https://docs.docker.com/engine/reference/commandline/cli/#environment-variables
  */
 public class DockerClientConfig implements Serializable {
 
@@ -114,7 +113,7 @@ private String checkDockerCertPath(boolean dockerTlsVerify, String dockerCertPat
                             "Certificate path (DOCKER_CERT_PATH) '" + dockerCertPath + "' doesn't exist.");
                 }
 
-                if(certPath.isDirectory()) {
+                if (certPath.isDirectory()) {
                     return dockerCertPath;
                 } else {
                     throw new DockerClientException(
@@ -361,9 +360,9 @@ public static class DockerClientConfigBuilder {
         private boolean dockerTlsVerify;
 
         /**
-         * This will set all fields in the builder to those contained in the Properties object. The Properties object
-         * should contain the following docker-java configuration keys: DOCKER_HOST, DOCKER_TLS_VERIFY, api.version,
-         * registry.username, registry.password, registry.email, DOCKER_CERT_PATH, and DOCKER_CONFIG.
+         * This will set all fields in the builder to those contained in the Properties object. The Properties object should contain the
+         * following docker-java configuration keys: DOCKER_HOST, DOCKER_TLS_VERIFY, api.version, registry.username, registry.password,
+         * registry.email, DOCKER_CERT_PATH, and DOCKER_CONFIG.
          */
         public DockerClientConfigBuilder withProperties(Properties p) {
             return withDockerHost(p.getProperty(DOCKER_HOST)).withDockerTlsVerify(p.getProperty(DOCKER_TLS_VERIFY))
@@ -418,7 +417,13 @@ public final DockerClientConfigBuilder withDockerConfig(String dockerConfig) {
         }
 
         public final DockerClientConfigBuilder withDockerTlsVerify(String dockerTlsVerify) {
-            this.dockerTlsVerify = BooleanUtils.toBoolean(dockerTlsVerify.trim(), "1", "0");
+            this.dockerTlsVerify = BooleanUtils.toBoolean(dockerTlsVerify.trim())
+                    || BooleanUtils.toBoolean(dockerTlsVerify.trim(), "1", "0");
+            return this;
+        }
+
+        public final DockerClientConfigBuilder withDockerTlsVerify(Boolean dockerTlsVerify) {
+            this.dockerTlsVerify = dockerTlsVerify;
             return this;
         }
 

From 4bafd142f0633f3aa34c217f4fcdcbbbac7416a7 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 7 Feb 2016 19:51:01 +0100
Subject: [PATCH 0399/1272] Fix README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9175135ae..0b519d0f3 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ In your application, e.g.
 
     DockerClientConfig config = DockerClientConfig.createDefaultConfigBuilder()
         .withDockerHost("tcp://my-docker-host.tld:2376")
-        .withDockerTlsVerify("1")
+        .withDockerTlsVerify(true)
         .withDockerCertPath("/home/user/.docker/certs")
         .withDockerConfig("/home/user/.docker")
         .withApiVersion("1.21")
@@ -113,7 +113,7 @@ In your application, e.g.
         .build();
     DockerClient docker = DockerClientBuilder.getInstance(config).build();
 
-#### Properties
+#### Properties (docker-java.properties)
 
     DOCKER_HOST=tcp://localhost:2376
     DOCKER_TLS_VERIFY=1

From 6e91d2606d3befd0962683830ccbe14c9c1a3002 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Sun, 7 Feb 2016 22:51:38 +0100
Subject: [PATCH 0400/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f0141068..f33c3a30f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,8 +6,10 @@ Change Log
 Notes
 
 * The upcoming release will contain multiple API breaking changes therefore the major version switch. It will support a subset of v.1.21 of the docker remote API. It also includes an experimental netty based implementation of `DockerCmdExecFactory` that probably will replace the current jersey/httpclient based one in a later release.
+* The configuration has been changed to better match the docker CLI configuration options. The properties file was renamed from `docker.io.properties` to `docker-java.properties`. See README.md for details.
 
 All changes
+* [#447] (https://github.com/docker-java/docker-java/pull/447) Refactoring of DockerClientConfig 
 * [#430] (https://github.com/docker-java/docker-java/pull/430) Fix ExecStartCmd failure 
 * [#426] (https://github.com/docker-java/docker-java/pull/426) Refactored filters API 
 * [#425] (https://github.com/docker-java/docker-java/pull/425) Implement Network API

From 55ad6295f523cb93ca47296a67195d498943acfb Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 7 Feb 2016 23:12:53 +0100
Subject: [PATCH 0401/1272] Remove code-style.epf in favor of
 docker-java-formatter.xml

---
 etc/code-style.epf | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 etc/code-style.epf

diff --git a/etc/code-style.epf b/etc/code-style.epf
deleted file mode 100644
index abd8a9364..000000000
--- a/etc/code-style.epf
+++ /dev/null
@@ -1,23 +0,0 @@
-#Mon Jun 29 09:34:24 CEST 2015
-/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.overrideannotation=true
-/instance/org.eclipse.jdt.ui/formatter_settings_version=12
-/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.formatterprofiles.version=12
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">\t\t\t\n\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*\n * Created on ${date}\n */\n${package_declaration}\n\n/**\n * &lt;TODO\: class description&gt;\n *\n * @author ${user}\n *\n */\n${type_declaration}</template></templates>
-\!/=
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.localSuffixes=
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.localPrefixes=
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.gettersetter.use.is=true
-/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.exception.name=e
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.formatterprofiles=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\n<profiles version\="12">\n<profile kind\="CodeFormatterProfile" name\="na" version\="12">\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value\="1"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.indentation.size" value\="4"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.disabling_tag" value\="@formatter\:off"/>\n<setting id\="org.eclipse.jdt.core.formatter.continuation_indentation" value\="2"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value\="0"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value\="1"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_after_package" value\="1"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.enabling_tag" value\="@formatter\:on"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value\="1"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value\="false"/>\n<setting id\="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value\="error"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.line_length" value\="120"/>\n<setting id\="org.eclipse.jdt.core.formatter.use_on_off_tags" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value\="0"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_block" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.compact_else_if" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value\="16"/>\n<setting id\="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value\="error"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value\="1"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.format_line_comments" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_assignment" value\="0"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value\="0"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value\="80"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.format_header" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value\="enabled"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value\="0"/>\n<setting id\="org.eclipse.jdt.core.formatter.join_wrapped_lines" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value\="80"/>\n<setting id\="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value\="false"/>\n<setting id\="org.eclipse.jdt.core.compiler.source" value\="1.8"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.tabulation.size" value\="4"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.format_source_code" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_before_field" value\="1"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value\="2"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_before_method" value\="1"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value\="1.8"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_switch" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.format_html" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.indent_empty_lines" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value\="0"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value\="1"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value\="1"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.format_block_comments" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value\="false"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value\="16"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.compiler.compliance" value\="1.8"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value\="end_of_line"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_before_package" value\="0"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.join_lines_in_comments" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value\="insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value\="true"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.tabulation.char" value\="space"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value\="1"/>\n<setting id\="org.eclipse.jdt.core.formatter.lineSplit" value\="120"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value\="do not insert"/>\n<setting id\="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value\="insert"/>\n</profile>\n</profiles>\n
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-@org.eclipse.jdt.ui=3.9.50.v20140317-1811
-/instance/org.eclipse.jdt.ui/formatter_profile=_na
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-file_export_version=3.0
-@org.eclipse.jdt.core=3.9.50.xx-201502282108-e43j8

From 43feaf1fb17165b81cc39e39759024c93ab37f63 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 8 Feb 2016 01:58:36 +0300
Subject: [PATCH 0402/1272] Make AuthConfig fluent setters.

Resolves #453
---
 .../dockerjava/api/model/AuthConfig.java      | 19 ++++++-----
 .../dockerjava/core/AuthConfigFile.java       | 10 +++---
 .../dockerjava/core/DockerClientConfig.java   | 10 +++---
 .../dockerjava/core/DockerClientImpl.java     | 12 +++----
 .../dockerjava/core/GoLangFileMatch.java      |  2 +-
 .../dockerjava/api/model/AuthConfigTest.java  | 10 +++---
 .../dockerjava/core/AuthConfigFileTest.java   | 32 +++++++++----------
 .../core/command/BuildImageCmdImplTest.java   | 11 +++----
 .../netty/exec/BuildImageCmdExecTest.java     | 11 +++----
 9 files changed, 58 insertions(+), 59 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
index 3dc3ef348..5c99942fc 100644
--- a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -3,7 +3,6 @@
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -30,48 +29,52 @@ public class AuthConfig {
     @JsonProperty("serveraddress")
     private String serverAddress = DEFAULT_SERVER_ADDRESS;
 
+    @JsonProperty("auth")
     private String auth;
 
     public String getUsername() {
         return username;
     }
 
-    public void setUsername(String username) {
+    public AuthConfig withUsername(String username) {
         this.username = username;
+        return this;
     }
 
     public String getPassword() {
         return password;
     }
 
-    public void setPassword(String password) {
+    public AuthConfig withPassword(String password) {
         this.password = password;
+        return this;
     }
 
     public String getEmail() {
         return email;
     }
 
-    public void setEmail(String email) {
+    public AuthConfig withEmail(String email) {
         this.email = email;
+        return this;
     }
 
     public String getServerAddress() {
         return serverAddress;
     }
 
-    public void setServerAddress(String serverAddress) {
+    public AuthConfig withServerAddress(String serverAddress) {
         this.serverAddress = serverAddress;
+        return this;
     }
 
-    @JsonIgnore
     public String getAuth() {
         return auth;
     }
 
-    @JsonProperty("auth")
-    public void setAuth(String auth) {
+    public AuthConfig withAuth(String auth) {
         this.auth = auth;
+        return this;
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
index 1a4ef5a47..ed96a7c44 100644
--- a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
+++ b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
@@ -111,8 +111,8 @@ public static AuthConfigFile loadConfig(File confFile) throws IOException {
             for (Map.Entry<String, AuthConfig> entry : configMap.entrySet()) {
                 AuthConfig authConfig = entry.getValue();
                 decodeAuth(authConfig.getAuth(), authConfig);
-                authConfig.setAuth(null);
-                authConfig.setServerAddress(entry.getKey());
+                authConfig.withAuth(null);
+                authConfig.withServerAddress(entry.getKey());
                 configFile.addConfig(authConfig);
             }
         } else {
@@ -131,7 +131,7 @@ public static AuthConfigFile loadConfig(File confFile) throws IOException {
             if (origEmail.length != 2) {
                 throw new IOException("Invalid Auth config file");
             }
-            config.setEmail(origEmail[1]);
+            config.withEmail(origEmail[1]);
             configFile.addConfig(config);
         }
         return configFile;
@@ -144,8 +144,8 @@ static void decodeAuth(String auth, AuthConfig config) throws IOException {
         if (parts.length != 2) {
             throw new IOException("Invalid auth configuration file");
         }
-        config.setUsername(parts[0]);
-        config.setPassword(parts[1]);
+        config.withUsername(parts[0]);
+        config.withPassword(parts[1]);
     }
 
     static String convertToHostname(String server) {
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index 5ebd9aa72..1472be028 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -278,11 +278,11 @@ private AuthConfig getAuthConfig() {
         AuthConfig authConfig = null;
         if (getRegistryUsername() != null && getRegistryPassword() != null && getRegistryEmail() != null
                 && getRegistryUrl() != null) {
-            authConfig = new AuthConfig();
-            authConfig.setUsername(getRegistryUsername());
-            authConfig.setPassword(getRegistryPassword());
-            authConfig.setEmail(getRegistryEmail());
-            authConfig.setServerAddress(getRegistryUrl());
+            authConfig = new AuthConfig()
+                    .withUsername(getRegistryUsername())
+                    .withPassword(getRegistryPassword())
+                    .withEmail(getRegistryEmail())
+                    .withServerAddress(getRegistryUrl());
         }
         return authConfig;
     }
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index bbf667a89..317bb051e 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -164,13 +164,11 @@ public AuthConfig authConfig() {
         checkNotNull(dockerClientConfig.getRegistryUsername(), "Configured username is null.");
         checkNotNull(dockerClientConfig.getRegistryUrl(), "Configured serverAddress is null.");
 
-        AuthConfig authConfig = new AuthConfig();
-        authConfig.setUsername(dockerClientConfig.getRegistryUsername());
-        authConfig.setPassword(dockerClientConfig.getRegistryPassword());
-        authConfig.setEmail(dockerClientConfig.getRegistryEmail());
-        authConfig.setServerAddress(dockerClientConfig.getRegistryUrl());
-
-        return authConfig;
+        return new AuthConfig()
+                .withUsername(dockerClientConfig.getRegistryUsername())
+                .withPassword(dockerClientConfig.getRegistryPassword())
+                .withEmail(dockerClientConfig.getRegistryEmail())
+                .withServerAddress(dockerClientConfig.getRegistryUrl());
     }
 
     /**
diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index 5dabdf404..62dce2adc 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -37,7 +37,7 @@
  *  is malformed.
  *
  * On Windows, escaping is disabled. Instead, '\\' is treated as
- *  path separator.
+ AuthConfigTest *  path separator.
  * </pre>
  *
  * @author tedo
diff --git a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
index 33066a84f..252e7a11e 100644
--- a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
@@ -11,11 +11,11 @@ public class AuthConfigTest {
 
     @BeforeMethod
     public void setUp() throws Exception {
-        authConfig = new AuthConfig();
-        authConfig.setEmail("foo");
-        authConfig.setPassword("bar");
-        authConfig.setServerAddress("baz");
-        authConfig.setUsername("qux");
+        authConfig = new AuthConfig()
+                .withEmail("foo")
+                .withPassword("bar")
+                .withServerAddress("baz")
+                .withUsername("qux");
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java b/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java
index e1c1b6f8d..c9d0ea36a 100644
--- a/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java
+++ b/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java
@@ -48,17 +48,17 @@ public void invalidLegacyEmailLine() throws IOException {
 
     @Test
     public void validJson() throws IOException {
-        AuthConfig authConfig1 = new AuthConfig();
-        authConfig1.setEmail("foo@example.com");
-        authConfig1.setUsername("foo");
-        authConfig1.setPassword("bar");
-        authConfig1.setServerAddress("quay.io");
-
-        AuthConfig authConfig2 = new AuthConfig();
-        authConfig2.setEmail("moo@example.com");
-        authConfig2.setUsername("foo1");
-        authConfig2.setPassword("bar1");
-        authConfig2.setServerAddress(AuthConfig.DEFAULT_SERVER_ADDRESS);
+        AuthConfig authConfig1 = new AuthConfig()
+                .withEmail("foo@example.com")
+                .withUsername("foo")
+                .withPassword("bar")
+                .withServerAddress("quay.io");
+
+        AuthConfig authConfig2 = new AuthConfig()
+                .withEmail("moo@example.com")
+                .withUsername("foo1")
+                .withPassword("bar1")
+                .withServerAddress(AuthConfig.DEFAULT_SERVER_ADDRESS);
 
         AuthConfigFile expected = new AuthConfigFile();
         expected.addConfig(authConfig1);
@@ -70,11 +70,11 @@ public void validJson() throws IOException {
 
     @Test
     public void validLegacy() throws IOException {
-        AuthConfig authConfig = new AuthConfig();
-        authConfig.setEmail("foo@example.com");
-        authConfig.setUsername("foo");
-        authConfig.setPassword("bar");
-        authConfig.setServerAddress(AuthConfig.DEFAULT_SERVER_ADDRESS);
+        AuthConfig authConfig = new AuthConfig()
+                .withEmail("foo@example.com")
+                .withUsername("foo")
+                .withPassword("bar")
+                .withServerAddress(AuthConfig.DEFAULT_SERVER_ADDRESS);
 
         AuthConfigFile expected = new AuthConfigFile();
         expected.addConfig(authConfig);
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 775b12b16..aac25d218 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -274,13 +274,12 @@ public void testBuildFromPrivateRegistry() throws Exception {
         // wait for registry to boot
         Thread.sleep(3000);
 
-        AuthConfig authConfig = new AuthConfig();
-
         // credentials as configured in /auth/htpasswd
-        authConfig.setUsername("testuser");
-        authConfig.setPassword("testpassword");
-        authConfig.setEmail("foo@bar.de");
-        authConfig.setServerAddress("localhost:5000");
+        AuthConfig authConfig = new AuthConfig()
+                .withUsername("testuser")
+                .withPassword("testpassword")
+                .withEmail("foo@bar.de")
+                .withServerAddress("localhost:5000");
 
         dockerClient.authCmd().withAuthConfig(authConfig).exec();
         dockerClient.tagImageCmd("busybox:latest", "localhost:5000/testuser/busybox", "latest").withForce().exec();
diff --git a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
index fad4ef7b1..c5b2c3aa9 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
@@ -266,13 +266,12 @@ public void testBuildFromPrivateRegistry() throws Exception {
         // wait for registry to boot
         Thread.sleep(3000);
 
-        AuthConfig authConfig = new AuthConfig();
-
         // credentials as configured in /auth/htpasswd
-        authConfig.setUsername("testuser");
-        authConfig.setPassword("testpassword");
-        authConfig.setEmail("foo@bar.de");
-        authConfig.setServerAddress("localhost:5000");
+        AuthConfig authConfig = new AuthConfig()
+                .withUsername("testuser")
+                .withPassword("testpassword")
+                .withEmail("foo@bar.de")
+                .withServerAddress("localhost:5000");
 
         dockerClient.authCmd().withAuthConfig(authConfig).exec();
         dockerClient.tagImageCmd("busybox:latest", "localhost:5000/testuser/busybox", "latest").withForce().exec();

From bd11042d0fa41d0e2dc44fc139502c45def8f873 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 8 Feb 2016 21:25:49 +0300
Subject: [PATCH 0403/1272] Rename withServerAddress to withRegistryAddress.

This is more correct as auth used only for pull/push operations.
---
 .../dockerjava/api/model/AuthConfig.java       | 18 +++++++++---------
 .../api/model/AuthConfigurations.java          |  2 +-
 .../github/dockerjava/core/AuthConfigFile.java |  4 ++--
 .../dockerjava/core/DockerClientConfig.java    |  2 +-
 .../dockerjava/core/DockerClientImpl.java      |  2 +-
 .../dockerjava/api/model/AuthConfigTest.java   |  4 ++--
 .../dockerjava/core/AuthConfigFileTest.java    |  6 +++---
 .../core/command/BuildImageCmdImplTest.java    |  2 +-
 .../netty/exec/BuildImageCmdExecTest.java      |  2 +-
 9 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
index 5c99942fc..ae7ebdda2 100644
--- a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -27,7 +27,7 @@ public class AuthConfig {
     private String email;
 
     @JsonProperty("serveraddress")
-    private String serverAddress = DEFAULT_SERVER_ADDRESS;
+    private String registryAddress = DEFAULT_SERVER_ADDRESS;
 
     @JsonProperty("auth")
     private String auth;
@@ -59,12 +59,12 @@ public AuthConfig withEmail(String email) {
         return this;
     }
 
-    public String getServerAddress() {
-        return serverAddress;
+    public String getRegistryAddress() {
+        return registryAddress;
     }
 
-    public AuthConfig withServerAddress(String serverAddress) {
-        this.serverAddress = serverAddress;
+    public AuthConfig withRegistryAddress(String registryAddress) {
+        this.registryAddress = registryAddress;
         return this;
     }
 
@@ -90,7 +90,7 @@ public int hashCode() {
         result = prime * result + ((auth == null) ? 0 : auth.hashCode());
         result = prime * result + ((email == null) ? 0 : email.hashCode());
         result = prime * result + ((password == null) ? 0 : password.hashCode());
-        result = prime * result + ((serverAddress == null) ? 0 : serverAddress.hashCode());
+        result = prime * result + ((registryAddress == null) ? 0 : registryAddress.hashCode());
         result = prime * result + ((username == null) ? 0 : username.hashCode());
         return result;
     }
@@ -119,10 +119,10 @@ public boolean equals(Object obj) {
                 return false;
         } else if (!password.equals(other.password))
             return false;
-        if (serverAddress == null) {
-            if (other.serverAddress != null)
+        if (registryAddress == null) {
+            if (other.registryAddress != null)
                 return false;
-        } else if (!serverAddress.equals(other.serverAddress))
+        } else if (!registryAddress.equals(other.registryAddress))
             return false;
         if (username == null) {
             if (other.username != null)
diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java b/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
index 21451e64b..e8edbc950 100644
--- a/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
+++ b/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
@@ -11,7 +11,7 @@ public class AuthConfigurations {
     private Map<String, AuthConfig> configs = new TreeMap<>();
 
     public void addConfig(AuthConfig authConfig) {
-        configs.put(authConfig.getServerAddress(), authConfig);
+        configs.put(authConfig.getRegistryAddress(), authConfig);
     }
 
     public Map<String, AuthConfig> getConfigs() {
diff --git a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
index ed96a7c44..f796fd7c9 100644
--- a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
+++ b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
@@ -29,7 +29,7 @@ public AuthConfigFile() {
     }
 
     void addConfig(AuthConfig config) {
-        authConfigMap.put(config.getServerAddress(), config);
+        authConfigMap.put(config.getRegistryAddress(), config);
     }
 
     public AuthConfig resolveAuthConfig(String hostname) {
@@ -112,7 +112,7 @@ public static AuthConfigFile loadConfig(File confFile) throws IOException {
                 AuthConfig authConfig = entry.getValue();
                 decodeAuth(authConfig.getAuth(), authConfig);
                 authConfig.withAuth(null);
-                authConfig.withServerAddress(entry.getKey());
+                authConfig.withRegistryAddress(entry.getKey());
                 configFile.addConfig(authConfig);
             }
         } else {
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index 1472be028..d3897199c 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -282,7 +282,7 @@ && getRegistryUrl() != null) {
                     .withUsername(getRegistryUsername())
                     .withPassword(getRegistryPassword())
                     .withEmail(getRegistryEmail())
-                    .withServerAddress(getRegistryUrl());
+                    .withRegistryAddress(getRegistryUrl());
         }
         return authConfig;
     }
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 317bb051e..59e18bc85 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -168,7 +168,7 @@ public AuthConfig authConfig() {
                 .withUsername(dockerClientConfig.getRegistryUsername())
                 .withPassword(dockerClientConfig.getRegistryPassword())
                 .withEmail(dockerClientConfig.getRegistryEmail())
-                .withServerAddress(dockerClientConfig.getRegistryUrl());
+                .withRegistryAddress(dockerClientConfig.getRegistryUrl());
     }
 
     /**
diff --git a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
index 252e7a11e..8f5bd64f3 100644
--- a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
@@ -14,12 +14,12 @@ public void setUp() throws Exception {
         authConfig = new AuthConfig()
                 .withEmail("foo")
                 .withPassword("bar")
-                .withServerAddress("baz")
+                .withRegistryAddress("baz")
                 .withUsername("qux");
     }
 
     @Test
     public void defaultServerAddress() throws Exception {
-        assertEquals(new AuthConfig().getServerAddress(), "https://index.docker.io/v1/");
+        assertEquals(new AuthConfig().getRegistryAddress(), "https://index.docker.io/v1/");
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java b/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java
index c9d0ea36a..221a926b5 100644
--- a/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java
+++ b/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java
@@ -52,13 +52,13 @@ public void validJson() throws IOException {
                 .withEmail("foo@example.com")
                 .withUsername("foo")
                 .withPassword("bar")
-                .withServerAddress("quay.io");
+                .withRegistryAddress("quay.io");
 
         AuthConfig authConfig2 = new AuthConfig()
                 .withEmail("moo@example.com")
                 .withUsername("foo1")
                 .withPassword("bar1")
-                .withServerAddress(AuthConfig.DEFAULT_SERVER_ADDRESS);
+                .withRegistryAddress(AuthConfig.DEFAULT_SERVER_ADDRESS);
 
         AuthConfigFile expected = new AuthConfigFile();
         expected.addConfig(authConfig1);
@@ -74,7 +74,7 @@ public void validLegacy() throws IOException {
                 .withEmail("foo@example.com")
                 .withUsername("foo")
                 .withPassword("bar")
-                .withServerAddress(AuthConfig.DEFAULT_SERVER_ADDRESS);
+                .withRegistryAddress(AuthConfig.DEFAULT_SERVER_ADDRESS);
 
         AuthConfigFile expected = new AuthConfigFile();
         expected.addConfig(authConfig);
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index aac25d218..99eefb4de 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -279,7 +279,7 @@ public void testBuildFromPrivateRegistry() throws Exception {
                 .withUsername("testuser")
                 .withPassword("testpassword")
                 .withEmail("foo@bar.de")
-                .withServerAddress("localhost:5000");
+                .withRegistryAddress("localhost:5000");
 
         dockerClient.authCmd().withAuthConfig(authConfig).exec();
         dockerClient.tagImageCmd("busybox:latest", "localhost:5000/testuser/busybox", "latest").withForce().exec();
diff --git a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
index c5b2c3aa9..8a19c7eb9 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
@@ -271,7 +271,7 @@ public void testBuildFromPrivateRegistry() throws Exception {
                 .withUsername("testuser")
                 .withPassword("testpassword")
                 .withEmail("foo@bar.de")
-                .withServerAddress("localhost:5000");
+                .withRegistryAddress("localhost:5000");
 
         dockerClient.authCmd().withAuthConfig(authConfig).exec();
         dockerClient.tagImageCmd("busybox:latest", "localhost:5000/testuser/busybox", "latest").withForce().exec();

From 2281246d41628d747a28020fedc78d4575e69256 Mon Sep 17 00:00:00 2001
From: Christopher Dancy <dancc@pega.com>
Date: Sat, 13 Feb 2016 11:26:52 -0500
Subject: [PATCH 0404/1272] ADDED: gelf, fluentd, awslogs, and splunk drivers

---
 .../com/github/dockerjava/api/model/LogConfig.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
index cf9cdc1ee..8c1bbdb86 100644
--- a/src/main/java/com/github/dockerjava/api/model/LogConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
@@ -69,7 +69,15 @@ public LogConfig setConfig(Map<String, String> config) {
     @JsonDeserialize(using = LoggingType.Deserializer.class)
     @JsonSerialize(using = LoggingType.Serializer.class)
     public static enum LoggingType {
-        DEFAULT("json-file"), JSON_FILE("json-file"), NONE("none"), SYSLOG("syslog"), JOURNALD("journald");
+        DEFAULT("json-file"),
+        JSON_FILE("json-file"),
+        NONE("none"),
+        SYSLOG("syslog"),
+        JOURNALD("journald"),
+        GELF("gelf"),
+        FLUENTD("fluentd"),
+        AWSLOGS("awslogs"),
+        SPLUNK("splunk");
 
         private String type;
 

From 810174a438d506c4dc601acf302bfcd08e367bfc Mon Sep 17 00:00:00 2001
From: Matthieu Baechler <matthieu.baechler@gmail.com>
Date: Thu, 11 Feb 2016 16:58:41 +0100
Subject: [PATCH 0405/1272] Issue-456 input configuration should not be altered
 as it breaks unix socket support

---
 .../dockerjava/core/DockerClientConfig.java       |  8 ++------
 .../jaxrs/DockerCmdExecFactoryImpl.java           | 15 +++++++++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index d3897199c..fbd285867 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -69,11 +69,11 @@ public class DockerClientConfig implements Serializable {
         CONFIG_KEYS.add(REGISTRY_URL);
     }
 
-    private URI dockerHost;
+    private final URI dockerHost;
 
     private final String registryUsername, registryPassword, registryEmail, registryUrl, dockerConfig, dockerCertPath;
 
-    private boolean dockerTlsVerify;
+    private final boolean dockerTlsVerify;
 
     private final RemoteApiVersion apiVersion;
 
@@ -238,10 +238,6 @@ public URI getDockerHost() {
         return dockerHost;
     }
 
-    public void setDockerHost(URI dockerHost) {
-        this.dockerHost = dockerHost;
-    }
-
     public RemoteApiVersion getApiVersion() {
         return apiVersion;
     }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index ec0a3b0a3..2c5b2b077 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -174,14 +174,14 @@ public void init(DockerClientConfig dockerClientConfig) {
             protocol = "http";
         }
 
-        if (originalUri.getScheme().equals("unix")) {
-            dockerClientConfig.setDockerHost(UnixConnectionSocketFactory.sanitizeUri(originalUri));
-        } else {
+        if (!originalUri.getScheme().equals("unix")) {
+
             try {
                 originalUri = new URI(originalUri.toString().replaceFirst("tcp", protocol));
             } catch (URISyntaxException e) {
                 throw new RuntimeException(e);
             }
+
             configureProxy(clientConfig, protocol);
         }
 
@@ -209,7 +209,14 @@ public void init(DockerClientConfig dockerClientConfig) {
 
         client = clientBuilder.build();
 
-        baseResource = client.target(originalUri.toString()).path(dockerClientConfig.getApiVersion().asWebPathPart());
+        baseResource = client.target(sanitizeUrl(originalUri).toString()).path(dockerClientConfig.getApiVersion().asWebPathPart());
+    }
+
+    private URI sanitizeUrl(URI originalUri) {
+        if (originalUri.getScheme().equals("unix")) {
+            return UnixConnectionSocketFactory.sanitizeUri(originalUri);
+        }
+        return originalUri;
     }
 
     private void configureProxy(ClientConfig clientConfig, String protocol) {

From a1aaabc080b7279add661845ebca8bbe3f671a14 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 14 Feb 2016 02:05:23 +0300
Subject: [PATCH 0406/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f33c3a30f..52e8c1856 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ Notes
 * The configuration has been changed to better match the docker CLI configuration options. The properties file was renamed from `docker.io.properties` to `docker-java.properties`. See README.md for details.
 
 All changes
+* [#463] (https://github.com/docker-java/docker-java/pull/463) More logging drivers
 * [#447] (https://github.com/docker-java/docker-java/pull/447) Refactoring of DockerClientConfig 
 * [#430] (https://github.com/docker-java/docker-java/pull/430) Fix ExecStartCmd failure 
 * [#426] (https://github.com/docker-java/docker-java/pull/426) Refactored filters API 

From dbc5fa6a76720e38bceac38bd3c05b9b57ab0059 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Mon, 15 Feb 2016 20:20:46 +0100
Subject: [PATCH 0407/1272] Update README.md

---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0b519d0f3..1a99670c8 100644
--- a/README.md
+++ b/README.md
@@ -64,13 +64,12 @@ Run build without integration tests:
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>2.1.2</version>
+          <version>2.2.0</version>
     </dependency>
-
+    
 ### Latest SNAPSHOT version
 You can find the latest SNAPSHOT version including javadoc and source files on [Sonatypes OSS repository](https://oss.sonatype.org/content/groups/public/com/github/docker-java/docker-java/).
 
-
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>

From cafb8646fc5988264c40dd31234ef7c51c992282 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Mon, 15 Feb 2016 20:26:05 +0100
Subject: [PATCH 0408/1272] [maven-release-plugin] prepare release
 docker-java-3.0.0-RC1

---
 pom.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 60e8fcad5..ed0a1b54f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -11,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>3.0.0-RC1</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -29,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>docker-java-3.0.0-RC1</tag>
 	</scm>
 
 	<developers>

From 24802bc006a013e20c30e63b69b86affd78b9cf5 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Mon, 15 Feb 2016 20:26:09 +0100
Subject: [PATCH 0409/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ed0a1b54f..a945e41e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.0-RC1</version>
+	<version>3.0.0-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>docker-java-3.0.0-RC1</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From ff4055c237204ef1c43e32b6ebcf13edbbe3282f Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Mon, 15 Feb 2016 20:35:25 +0100
Subject: [PATCH 0410/1272] Update README.md

---
 README.md | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1a99670c8..144143b4b 100644
--- a/README.md
+++ b/README.md
@@ -67,14 +67,23 @@ Run build without integration tests:
           <version>2.2.0</version>
     </dependency>
     
-### Latest SNAPSHOT version
-You can find the latest SNAPSHOT version including javadoc and source files on [Sonatypes OSS repository](https://oss.sonatype.org/content/groups/public/com/github/docker-java/docker-java/).
+### Latest release candidate
+
+    <dependency>
+          <groupId>com.github.docker-java</groupId>
+          <artifactId>docker-java</artifactId>
+          <version>3.0.0-RC1</version>
+    </dependency>
+    
+### Latest development version
+You can find the latest development version including javadoc and source files on [Sonatypes OSS repository](https://oss.sonatype.org/content/groups/public/com/github/docker-java/docker-java/).
 
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
           <version>3.0.0-SNAPSHOT</version>
     </dependency>
+    
 
 ## Documentation
 

From 39fd1f73db2bc79f1e583bd8aa02c520096bbbf1 Mon Sep 17 00:00:00 2001
From: Roman Timushev <rtimush@gmail.com>
Date: Tue, 16 Feb 2016 18:19:52 +0300
Subject: [PATCH 0411/1272] Better unit test for ExecStart with stdin

---
 .../github/dockerjava/netty/exec/ExecStartCmdExecTest.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
index e4ceedac7..6436cd5da 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
@@ -109,16 +109,16 @@ public void execStartAttachStdin() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        InputStream stdin = new ByteArrayInputStream("echo STDIN\n".getBytes());
+        InputStream stdin = new ByteArrayInputStream("STDIN\n".getBytes("UTF-8"));
 
         ByteArrayOutputStream stdout = new ByteArrayOutputStream();
 
         ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true).withAttachStdin(true).withCmd("/bin/sh").exec();
+                .withAttachStdout(true).withAttachStdin(true).withCmd("cat").exec();
         dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true).withStdIn(stdin)
                 .exec(new ExecStartResultCallback(stdout, System.err)).awaitCompletion(5, TimeUnit.SECONDS);
 
-        assertEquals(stdout.toString(), "STDIN\n");
+        assertEquals(stdout.toString("UTF-8"), "STDIN\n");
     }
 
     @Test(groups = "ignoreInCircleCi")

From 875444329e0fa09e4eeef9fe825be952d1aaaac0 Mon Sep 17 00:00:00 2001
From: Roman Timushev <rtimush@gmail.com>
Date: Tue, 16 Feb 2016 18:21:02 +0300
Subject: [PATCH 0412/1272] Fix stdin encoding

---
 .../dockerjava/netty/InvocationBuilder.java   | 25 ++++++-------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
index 83ce63979..70737eeac 100644
--- a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
+++ b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
@@ -22,13 +22,8 @@
 import io.netty.util.concurrent.GenericFutureListener;
 
 import java.io.BufferedInputStream;
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -249,9 +244,9 @@ public void operationComplete(Future<? super Void> future) throws Exception {
             // now we can start a new thread that reads from stdin and writes to the channel
             new Thread(new Runnable() {
 
-                private int read(BufferedReader reader) {
+                private int read(InputStream is, byte[] buf) {
                     try {
-                        return reader.read();
+                        return is.read(buf);
                     } catch (IOException e) {
                         throw new RuntimeException(e);
                     }
@@ -260,19 +255,13 @@ private int read(BufferedReader reader) {
                 @Override
                 public void run() {
 
-                    BufferedReader reader = new BufferedReader(new InputStreamReader(stdin, Charset.forName("UTF-8")));
+                    byte[] buffer = new byte[1024];
 
-                    int read = -1;
-                    while ((read = read(reader)) != -1) {
-                        byte[] bytes = ByteBuffer.allocate(4).putInt(read).array();
-                        try {
-                            bytes = new String(bytes).getBytes("US-ASCII");
-                        } catch (UnsupportedEncodingException e) {
-                            throw new RuntimeException(e);
-                        }
-
-                        channel.writeAndFlush(Unpooled.copiedBuffer(bytes));
+                    int read;
+                    while ((read = read(stdin, buffer)) != -1) {
+                        channel.writeAndFlush(Unpooled.copiedBuffer(buffer, 0, read));
                     }
+
                 }
             }).start();
         }

From 91729b271d442cc9aab9016e078a8822843bff60 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 16 Feb 2016 22:43:00 +0100
Subject: [PATCH 0413/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52e8c1856..30f109b37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ Notes
 * The configuration has been changed to better match the docker CLI configuration options. The properties file was renamed from `docker.io.properties` to `docker-java.properties`. See README.md for details.
 
 All changes
+* [#466] (https://github.com/docker-java/docker-java/pull/466) Fix exec start stdin encoding 
+
+Included in 3.0.0-RC1
 * [#463] (https://github.com/docker-java/docker-java/pull/463) More logging drivers
 * [#447] (https://github.com/docker-java/docker-java/pull/447) Refactoring of DockerClientConfig 
 * [#430] (https://github.com/docker-java/docker-java/pull/430) Fix ExecStartCmd failure 

From 15400193ae77b45e9c8b88d5c5f8b0a38cf5a396 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 16 Feb 2016 23:28:02 +0100
Subject: [PATCH 0414/1272] Fix issue #461

---
 .../core/async/JsonStreamProcessor.java       |  9 ++-
 .../core/async/JsonStreamProcessorTest.java   | 65 +++++++++++++++++++
 2 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java

diff --git a/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
index 7e6c497e6..b17f4b220 100644
--- a/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
+++ b/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.dockerjava.api.async.ResultCallback;
 
 /**
@@ -41,8 +42,12 @@ public void processResponseStream(InputStream response, ResultCallback<T> result
             JsonToken nextToken = jp.nextToken();
             while (!closed && nextToken != null && nextToken != JsonToken.END_OBJECT) {
                 try {
-                    T next = OBJECT_MAPPER.readValue(jp, clazz);
-                    resultCallback.onNext(next);
+                    ObjectNode objectNode = OBJECT_MAPPER.readTree(jp);
+
+                    if (!objectNode.isEmpty(null)) {
+                        T next = OBJECT_MAPPER.treeToValue(objectNode, clazz);
+                        resultCallback.onNext(next);
+                    }
                 } catch (Exception e) {
                     resultCallback.onError(e);
                 }
diff --git a/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java b/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
new file mode 100644
index 000000000..6c9ee8a15
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
@@ -0,0 +1,65 @@
+/*
+ * Created on 16.02.2016
+ */
+package com.github.dockerjava.core.async;
+
+import static org.testng.Assert.assertFalse;
+
+import java.io.ByteArrayInputStream;
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.model.PullResponseItem;
+
+
+/**
+ *
+ * @author Marcus Linke
+ *
+ */
+public class JsonStreamProcessorTest {
+
+    @Test
+    public void processEmptyJson() throws Exception {
+
+        InputStream response = new ByteArrayInputStream("{}".getBytes());
+
+        JsonStreamProcessor<PullResponseItem> jsonStreamProcessor = new JsonStreamProcessor<PullResponseItem>(PullResponseItem.class);
+
+        final List<Boolean> completed = new ArrayList<Boolean>();
+
+        jsonStreamProcessor.processResponseStream(response, new ResultCallback<PullResponseItem>() {
+
+            @Override
+            public void close() throws IOException {
+            }
+
+            @Override
+            public void onStart(Closeable closeable) {
+            }
+
+            @Override
+            public void onNext(PullResponseItem object) {
+                assertFalse(true, "onNext called for empty json");
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+            }
+
+            @Override
+            public void onComplete() {
+                completed.add(true);
+            }
+        });
+
+        assertFalse(completed.isEmpty(), "Stream processing not completed");
+    }
+
+}

From 7666d875a686861c6896f0d6a357b81d0b7b6c6a Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 17 Feb 2016 04:56:57 +0300
Subject: [PATCH 0415/1272] Fix javadocs

---
 .../github/dockerjava/api/command/ListContainersCmd.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
index 4ae506a42..f55089393 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
@@ -32,7 +32,7 @@ public interface ListContainersCmd extends SyncDockerCmd<List<Container>> {
     public Boolean hasShowSizeEnabled();
 
     /**
-     * @param beforeId
+     * @param before
      *            - Show only containers created before Id, include non-running ones.
      */
     public ListContainersCmd withBefore(String before);
@@ -44,7 +44,7 @@ public interface ListContainersCmd extends SyncDockerCmd<List<Container>> {
     public ListContainersCmd withExitcodeFilter(Integer exitcode);
 
     /**
-     * @param exitcode
+     * @param status
      *            - Show only containers with the passed status (created|restarting|running|paused|exited).
      */
     public ListContainersCmd withStatusFilter(String status);
@@ -80,7 +80,7 @@ public interface ListContainersCmd extends SyncDockerCmd<List<Container>> {
     public ListContainersCmd withShowSize(Boolean showSize);
 
     /**
-     * @param sinceId
+     * @param since
      *            - Show only containers created since Id, include non-running ones.
      */
     public ListContainersCmd withSince(String since);

From 06170d83552333c04f2e1de70c4ff18b6c6955a5 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 17 Feb 2016 04:57:51 +0300
Subject: [PATCH 0416/1272] Try with resources. API object setter.

---
 .../dockerjava/core/DockerClientConfig.java   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index fbd285867..038c43cae 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -164,16 +164,11 @@ private static Properties overrideDockerPropertiesWithSettingsFromUserHome(Prope
         Properties overriddenProperties = new Properties();
         overriddenProperties.putAll(p);
 
-        final File usersDockerPropertiesFile = new File(systemProperties.getProperty("user.home"), "."
-                + DOCKER_JAVA_PROPERTIES);
+        final File usersDockerPropertiesFile = new File(systemProperties.getProperty("user.home"),
+                "." + DOCKER_JAVA_PROPERTIES);
         if (usersDockerPropertiesFile.isFile()) {
-            try {
-                final FileInputStream in = new FileInputStream(usersDockerPropertiesFile);
-                try {
-                    overriddenProperties.load(in);
-                } finally {
-                    in.close();
-                }
+            try (FileInputStream in = new FileInputStream(usersDockerPropertiesFile)) {
+                overriddenProperties.load(in);
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
@@ -381,6 +376,12 @@ public final DockerClientConfigBuilder withDockerHost(String dockerHost) {
             return this;
         }
 
+
+        public final DockerClientConfigBuilder withApiVersion(RemoteApiVersion apiVersion) {
+            this.apiVersion = apiVersion.getVersion();
+            return this;
+        }
+
         public final DockerClientConfigBuilder withApiVersion(String apiVersion) {
             this.apiVersion = apiVersion;
             return this;

From 373be76501c151fea5997a361d08ba4d879f4d0a Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 17 Feb 2016 04:58:18 +0300
Subject: [PATCH 0417/1272] Enable lost tests.

---
 .../github/dockerjava/core/RemoteApiVersion.java  | 15 +++++++++++----
 .../core/command/ListContainersCmdImplTest.java   |  1 +
 .../netty/exec/ListContainersCmdExecTest.java     |  1 +
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index 4a264ab17..1dd93f466 100644
--- a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -1,14 +1,14 @@
 package com.github.dockerjava.core;
 
-import java.io.Serializable;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 
+import java.io.Serializable;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * Bean to encapsulate the version of the <a href="http://docs.docker.com/engine/reference/api/docker_remote_api/">Docker Remote (REST)
  * API</a>
@@ -125,6 +125,13 @@ public boolean isGreaterOrEqual(final RemoteApiVersion other) {
         return false;
     }
 
+    /**
+     * @return String representation of version. i.e. "1.22"
+     */
+    public String getVersion() {
+        return major + "." + minor;
+    }
+
     // CHECKSTYLE:OFF
     @Override
     public boolean equals(final Object o) {
diff --git a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
index 529c2f89b..7bbfb3945 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
@@ -52,6 +52,7 @@ public void afterMethod(ITestResult result) {
         super.afterMethod(result);
     }
 
+    @Test
     public void testListContainers() throws Exception {
 
         String testImage = "busybox";
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java
index 673784281..40464c6f7 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java
@@ -54,6 +54,7 @@ public void afterMethod(ITestResult result) {
         super.afterMethod(result);
     }
 
+    @Test
     public void testListContainers() throws Exception {
 
         String testImage = "busybox";

From 14bf660387421f823f44d9d4e2cfeb12ad2d0e31 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 17 Feb 2016 20:39:17 +0100
Subject: [PATCH 0418/1272] Add comment

---
 .../com/github/dockerjava/core/async/JsonStreamProcessor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
index b17f4b220..8d9a64303 100644
--- a/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
+++ b/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
@@ -43,7 +43,7 @@ public void processResponseStream(InputStream response, ResultCallback<T> result
             while (!closed && nextToken != null && nextToken != JsonToken.END_OBJECT) {
                 try {
                     ObjectNode objectNode = OBJECT_MAPPER.readTree(jp);
-
+                    // exclude empty item serialization into class #461
                     if (!objectNode.isEmpty(null)) {
                         T next = OBJECT_MAPPER.treeToValue(objectNode, clazz);
                         resultCallback.onNext(next);

From 1398d6dfccdafbc0c17e497b1fc5f50f41a83144 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 21 Feb 2016 03:26:11 +0300
Subject: [PATCH 0419/1272] Add jacoco and codecov.io

---
 .travis.yml |  3 +++
 pom.xml     | 26 +++++++++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 985c35690..8f8ad52d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,9 @@
 language: java
 jdk:
  - oraclejdk7
+before_install:
+ - pip install --user codecov
 after_success:
+ - codecov
  - echo "<settings><servers><server><id>ossrh</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml
  - mvn deploy -DskipITs --settings ~/settings.xml
diff --git a/pom.xml b/pom.xml
index a945e41e7..d4a5b6947 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,6 @@
 		<maven-release-plugin.version>2.3.1</maven-release-plugin.version>
 		<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
 		<maven-failsafe-plugin.version>2.17</maven-failsafe-plugin.version>
-		<cobertura-maven-plugin.version>2.5.1</cobertura-maven-plugin.version>
 		<maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
 	</properties>
 
@@ -279,12 +278,6 @@
 					</executions>
 				</plugin>
 
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>cobertura-maven-plugin</artifactId>
-					<version>${cobertura-maven-plugin.version}</version>
-				</plugin>
-
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-antrun-plugin</artifactId>
@@ -480,6 +473,25 @@
 							</execution>
 						</executions>
 					</plugin>
+					<plugin>
+						<groupId>org.jacoco</groupId>
+						<artifactId>jacoco-maven-plugin</artifactId>
+						<version>0.7.6.201602180812</version>
+						<executions>
+							<execution>
+								<goals>
+									<goal>prepare-agent</goal>
+								</goals>
+							</execution>
+							<execution>
+								<id>report</id>
+								<phase>test</phase>
+								<goals>
+									<goal>report</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>

From f26105d14cbfb017c1fa554b710e407e0d06e5ae Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 22 Feb 2016 23:38:05 +0300
Subject: [PATCH 0420/1272] Fix travis. Don't push non master branches.

---
 .travis.yml             |  4 +---
 travis-after-success.sh | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100755 travis-after-success.sh

diff --git a/.travis.yml b/.travis.yml
index 8f8ad52d3..1d78b3bb9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,4 @@ jdk:
 before_install:
  - pip install --user codecov
 after_success:
- - codecov
- - echo "<settings><servers><server><id>ossrh</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml
- - mvn deploy -DskipITs --settings ~/settings.xml
+ - ./travis-after-success.sh
diff --git a/travis-after-success.sh b/travis-after-success.sh
new file mode 100755
index 000000000..aeb3c12c7
--- /dev/null
+++ b/travis-after-success.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+codecov
+if [[ $TRAVIS_BRANCH == "master" ]] && [[ $TRAVIS_PULL_REQUEST == "false" ]];
+then
+    cat << EOF >> ~/settings.xml
+<settings>
+ <servers>
+   <server>
+    <id>ossrh</id>
+    <username>\${env.OSSRH_USER}</username>
+    <password>\${env.OSSRH_PASS}</password>
+    </server>
+   </servers>
+</settings>
+EOF
+    mvn deploy -DskipITs --settings ~/settings.xml
+ fi

From f54a0178f7c7469347e79866d7b4a1f4911f85e6 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 23 Feb 2016 20:13:19 +0100
Subject: [PATCH 0421/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30f109b37..222b73812 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,15 @@ Included in 3.0.0-RC1
 * [#347] (https://github.com/docker-java/docker-java/pull/347) Implementation of copy archive to/from container commands 
 * [#313] (https://github.com/docker-java/docker-java/pull/313) Refactor primitive type fields to be of object type in JSON objects
 
+v2.2.1
+---
+* [#474] (https://github.com/docker-java/docker-java/pull/474) Fix periodic pull failure (2.x)
+
+v2.2.0
+---
+* [#457] (https://github.com/docker-java/docker-java/pull/457) Input configuration should not be altered as it breaks unix socket support 
+* [#430] (https://github.com/docker-java/docker-java/pull/430) Fix ExecStartCmd failure (backported from 3.0.0)
+
 v2.1.4
 ---
 

From dc95e25219c26a93847c751862e996a32e02d0bb Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 23 Feb 2016 20:14:10 +0100
Subject: [PATCH 0422/1272] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 144143b4b..ad1f2c157 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ Run build without integration tests:
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>2.2.0</version>
+          <version>2.2.1</version>
     </dependency>
     
 ### Latest release candidate

From 2bff259fbc1fd656da5769cd41df0ab95ec17432 Mon Sep 17 00:00:00 2001
From: Roman Timushev <rtimush@gmail.com>
Date: Wed, 24 Feb 2016 14:58:47 +0300
Subject: [PATCH 0423/1272] Updated to netty 4.1.0.CR3

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d4a5b6947..c33a1de3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
 		<!-- test dependencies -->
 		<logback.version>1.1.0</logback.version>
 		<testng.version>6.1.1</testng.version>
-		<netty.version>4.1.0.CR2</netty.version>
+		<netty.version>4.1.0.CR3</netty.version>
 		<hamcrest.library.version>1.3</hamcrest.library.version>
 		<hamcrest.jpa-matchers>1.6</hamcrest.jpa-matchers>
 		<lambdaj.version>2.3.3</lambdaj.version>

From 4fd5657bad7aabb6a3f6fedb236143ab988c0575 Mon Sep 17 00:00:00 2001
From: Roman Timushev <rtimush@gmail.com>
Date: Thu, 18 Feb 2016 01:44:09 +0300
Subject: [PATCH 0424/1272] Send end of stream properly

---
 .../java/com/github/dockerjava/netty/InvocationBuilder.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
index 70737eeac..fc0c72846 100644
--- a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
+++ b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
@@ -4,6 +4,7 @@
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.socket.DuplexChannel;
 import io.netty.handler.codec.http.DefaultFullHttpRequest;
 import io.netty.handler.codec.http.DefaultHttpRequest;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -262,6 +263,11 @@ public void run() {
                         channel.writeAndFlush(Unpooled.copiedBuffer(buffer, 0, read));
                     }
 
+                    // we close the writing side of the socket, but keep the read side open to transfer stdout/stderr
+                    if (channel instanceof DuplexChannel) {
+                        ((DuplexChannel) channel).shutdownOutput();
+                    }
+
                 }
             }).start();
         }

From fb2467a297413da3bc44ca921f703f79eb14b91f Mon Sep 17 00:00:00 2001
From: Roman Timushev <rtimush@gmail.com>
Date: Thu, 18 Feb 2016 11:07:50 +0300
Subject: [PATCH 0425/1272] Test that exec finishes

---
 .../core/async/ResultCallbackTemplate.java       | 16 ++++++++--------
 .../core/command/AttachContainerCmdImplTest.java |  9 ++++++---
 .../netty/exec/AttachContainerCmdExecTest.java   |  9 ++++++---
 .../netty/exec/ExecStartCmdExecTest.java         |  6 ++++--
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index edbf49827..f120012af 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -95,11 +95,11 @@ public RC_T awaitCompletion() throws InterruptedException {
 
     /**
      * Blocks until {@link ResultCallback#onComplete()} was called or the given timeout occurs
+     * @return {@code true} if completed and {@code false} if the waiting time elapsed
+     *         before {@link ResultCallback#onComplete()} was called.
      */
-    @SuppressWarnings("unchecked")
-    public RC_T awaitCompletion(long timeout, TimeUnit timeUnit) throws InterruptedException {
-        completed.await(timeout, timeUnit);
-        return (RC_T) this;
+    public boolean awaitCompletion(long timeout, TimeUnit timeUnit) throws InterruptedException {
+        return completed.await(timeout, timeUnit);
     }
 
     /**
@@ -115,11 +115,11 @@ public RC_T awaitStarted() throws InterruptedException {
     /**
      * Blocks until {@link ResultCallback#onStart()} was called or the given timeout occurs. {@link ResultCallback#onStart()} is called when
      * the request was processed on the server side and the response is incoming.
+     * @return {@code true} if started and {@code false} if the waiting time elapsed
+     *         before {@link ResultCallback#onStart()} was called.
      */
-    @SuppressWarnings("unchecked")
-    public RC_T awaitStarted(long timeout, TimeUnit timeUnit) throws InterruptedException {
-        started.await(timeout, timeUnit);
-        return (RC_T) this;
+    public boolean awaitStarted(long timeout, TimeUnit timeUnit) throws InterruptedException {
+        return started.await(timeout, timeUnit);
     }
 
     @CheckForNull
diff --git a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
index be2d5fdd0..21507e44e 100644
--- a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
@@ -68,7 +68,8 @@ public void onNext(Frame frame) {
         };
 
         dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
-                .withLogs(true).exec(callback).awaitCompletion(30, TimeUnit.SECONDS).close();
+                .withLogs(true).exec(callback).awaitCompletion(30, TimeUnit.SECONDS);
+        callback.close();
 
         assertThat(callback.toString(), containsString(snippet));
     }
@@ -97,7 +98,8 @@ public void onNext(Frame frame) {
         };
 
         dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
-                .exec(callback).awaitCompletion(15, TimeUnit.SECONDS).close();
+                .exec(callback).awaitCompletion(15, TimeUnit.SECONDS);
+        callback.close();
 
         System.out.println("log: " + callback.toString());
 
@@ -130,7 +132,8 @@ public void onNext(Frame frame) {
         InputStream stdin = new ByteArrayInputStream("".getBytes());
 
         dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
-                .withLogs(true).withStdIn(stdin).exec(callback).awaitCompletion(30, TimeUnit.SECONDS).close();
+                .withLogs(true).withStdIn(stdin).exec(callback).awaitCompletion(30, TimeUnit.SECONDS);
+        callback.close();
     }
 
     public static class AttachContainerTestCallback extends AttachContainerResultCallback {
diff --git a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
index fe34aa537..7f8e66609 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
@@ -70,7 +70,8 @@ public void onNext(Frame frame) {
         };
 
         dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
-                .withLogs(true).exec(callback).awaitCompletion(10, TimeUnit.SECONDS).close();
+                .withLogs(true).exec(callback).awaitCompletion(10, TimeUnit.SECONDS);
+        callback.close();
 
         assertThat(callback.toString(), containsString(snippet));
     }
@@ -104,7 +105,8 @@ public void onNext(Frame frame) {
         InputStream stdin = new ByteArrayInputStream((snippet + "\n").getBytes());
 
         dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
-                .withStdIn(stdin).exec(callback).awaitCompletion(2, TimeUnit.SECONDS).close();
+                .withStdIn(stdin).exec(callback).awaitCompletion(2, TimeUnit.SECONDS);
+        callback.close();
 
         assertThat(callback.toString(), containsString(snippet));
     }
@@ -133,7 +135,8 @@ public void onNext(Frame frame) {
         };
 
         dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
-                .exec(callback).awaitCompletion(10, TimeUnit.SECONDS).close();
+                .exec(callback).awaitCompletion(10, TimeUnit.SECONDS);
+        callback.close();
 
         // HexDump.dump(collectFramesCallback.toString().getBytes(), 0, System.out, 0);
 
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
index 6436cd5da..137c7c579 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
@@ -115,9 +115,10 @@ public void execStartAttachStdin() throws Exception {
 
         ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
                 .withAttachStdout(true).withAttachStdin(true).withCmd("cat").exec();
-        dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true).withStdIn(stdin)
+        boolean completed = dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true).withStdIn(stdin)
                 .exec(new ExecStartResultCallback(stdout, System.err)).awaitCompletion(5, TimeUnit.SECONDS);
 
+        assertTrue(completed, "The process was not finished.");
         assertEquals(stdout.toString("UTF-8"), "STDIN\n");
     }
 
@@ -138,9 +139,10 @@ public void execStartNotAttachedStdin() throws Exception {
 
         ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
                 .withAttachStdout(true).withAttachStdin(false).withCmd("/bin/sh").exec();
-        dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withStdIn(stdin)
+        boolean completed = dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withStdIn(stdin)
                 .exec(new ExecStartResultCallback(stdout, System.err)).awaitCompletion(5, TimeUnit.SECONDS);
 
+        assertTrue(completed, "The process was not finished.");
         assertEquals(stdout.toString(), "");
     }
 }

From 26af2d946a1f8e1a5a289374b899037b6b07e47e Mon Sep 17 00:00:00 2001
From: Roman Timushev <rtimush@gmail.com>
Date: Wed, 24 Feb 2016 15:54:49 +0300
Subject: [PATCH 0426/1272] Use DuplexChannel everywhere

---
 .../dockerjava/netty/ChannelProvider.java     |  4 ++--
 .../netty/DockerCmdExecFactoryImpl.java       | 20 +++++++++----------
 .../dockerjava/netty/InvocationBuilder.java   |  8 +++-----
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/netty/ChannelProvider.java b/src/main/java/com/github/dockerjava/netty/ChannelProvider.java
index c742015fc..26ceea4b4 100644
--- a/src/main/java/com/github/dockerjava/netty/ChannelProvider.java
+++ b/src/main/java/com/github/dockerjava/netty/ChannelProvider.java
@@ -1,7 +1,7 @@
 package com.github.dockerjava.netty;
 
-import io.netty.channel.Channel;
+import io.netty.channel.socket.DuplexChannel;
 
 public interface ChannelProvider {
-    Channel getChannel();
+    DuplexChannel getChannel();
 }
diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
index c714f5cc6..1eca3a9df 100644
--- a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
@@ -102,12 +102,12 @@
 import com.github.dockerjava.netty.exec.WaitContainerCmdExec;
 
 import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.Channel;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.epoll.EpollDomainSocketChannel;
 import io.netty.channel.epoll.EpollEventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.DuplexChannel;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.channel.unix.DomainSocketAddress;
@@ -165,8 +165,8 @@ public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
 
     private ChannelProvider channelProvider = new ChannelProvider() {
         @Override
-        public Channel getChannel() {
-            Channel channel = connect();
+        public DuplexChannel getChannel() {
+            DuplexChannel channel = connect();
             channel.pipeline().addLast(new LoggingHandler(getClass()));
             return channel;
         }
@@ -190,7 +190,7 @@ public void init(DockerClientConfig dockerClientConfig) {
         eventLoopGroup = nettyInitializer.init(bootstrap, dockerClientConfig);
     }
 
-    private Channel connect() {
+    private DuplexChannel connect() {
         try {
             return connect(bootstrap);
         } catch (InterruptedException e) {
@@ -198,14 +198,14 @@ private Channel connect() {
         }
     }
 
-    private Channel connect(final Bootstrap bootstrap) throws InterruptedException {
+    private DuplexChannel connect(final Bootstrap bootstrap) throws InterruptedException {
         return nettyInitializer.connect(bootstrap);
     }
 
     private interface NettyInitializer {
         EventLoopGroup init(final Bootstrap bootstrap, DockerClientConfig dockerClientConfig);
 
-        Channel connect(final Bootstrap bootstrap) throws InterruptedException;
+        DuplexChannel connect(final Bootstrap bootstrap) throws InterruptedException;
     }
 
     private class UnixDomainSocketInitializer implements NettyInitializer {
@@ -223,8 +223,8 @@ protected void initChannel(final UnixChannel channel) throws Exception {
         }
 
         @Override
-        public Channel connect(Bootstrap bootstrap) throws InterruptedException {
-            return bootstrap.connect(new DomainSocketAddress("/var/run/docker.sock")).sync().channel();
+        public DuplexChannel connect(Bootstrap bootstrap) throws InterruptedException {
+            return (DuplexChannel) bootstrap.connect(new DomainSocketAddress("/var/run/docker.sock")).sync().channel();
         }
     }
 
@@ -253,7 +253,7 @@ protected void initChannel(final SocketChannel channel) throws Exception {
         }
 
         @Override
-        public Channel connect(Bootstrap bootstrap) throws InterruptedException {
+        public DuplexChannel connect(Bootstrap bootstrap) throws InterruptedException {
             String host = dockerClientConfig.getDockerHost().getHost();
             int port = dockerClientConfig.getDockerHost().getPort();
 
@@ -261,7 +261,7 @@ public Channel connect(Bootstrap bootstrap) throws InterruptedException {
                 throw new RuntimeException("no port configured for " + host);
             }
 
-            Channel channel = bootstrap.connect(host, port).sync().channel();
+            DuplexChannel channel = (DuplexChannel) bootstrap.connect(host, port).sync().channel();
 
             if (dockerClientConfig.getDockerTlsVerify()) {
                 final SslHandler ssl = initSsl(dockerClientConfig);
diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
index fc0c72846..9669d6818 100644
--- a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
+++ b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
@@ -151,7 +151,7 @@ public <T> void get(TypeReference<T> typeReference, ResultCallback<T> resultCall
         return;
     }
 
-    private Channel getChannel() {
+    private DuplexChannel getChannel() {
         return channelProvider.getChannel();
     }
 
@@ -216,7 +216,7 @@ public void post(final Object entity, final InputStream stdin, final ResultCallb
 
         FramedResponseStreamHandler streamHandler = new FramedResponseStreamHandler(resultCallback);
 
-        final Channel channel = getChannel();
+        final DuplexChannel channel = getChannel();
 
         // result callback's close() method must be called when the servers closes the connection
         channel.closeFuture().addListener(new GenericFutureListener<Future<? super Void>>() {
@@ -264,9 +264,7 @@ public void run() {
                     }
 
                     // we close the writing side of the socket, but keep the read side open to transfer stdout/stderr
-                    if (channel instanceof DuplexChannel) {
-                        ((DuplexChannel) channel).shutdownOutput();
-                    }
+                    channel.shutdownOutput();
 
                 }
             }).start();

From 4ac0894f846925bbe9c15ca8e6b0dd4dbfaaa1ff Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Wed, 24 Feb 2016 21:09:57 +0100
Subject: [PATCH 0427/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 222b73812..8c79ccddb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ Notes
 * The configuration has been changed to better match the docker CLI configuration options. The properties file was renamed from `docker.io.properties` to `docker-java.properties`. See README.md for details.
 
 All changes
+* [#472] (https://github.com/docker-java/docker-java/pull/472) Exec start command: detect end of STDIN stream 
 * [#466] (https://github.com/docker-java/docker-java/pull/466) Fix exec start stdin encoding 
 
 Included in 3.0.0-RC1

From c28e8d564f24150a5c3ea4d1400b70fd9b882822 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 26 Feb 2016 20:17:55 +0100
Subject: [PATCH 0428/1272] Test exec start with tty disabled

---
 .../netty/exec/ExecStartCmdExecTest.java      | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
index 137c7c579..2938ac8c0 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
@@ -3,6 +3,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.containsString;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -122,6 +123,39 @@ public void execStartAttachStdin() throws Exception {
         assertEquals(stdout.toString("UTF-8"), "STDIN\n");
     }
 
+    public void execStartAttachStdinToShell() throws Exception {
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerClient
+                .createContainerCmd("busybox")
+                .withCmd("sleep", "9999")
+                .withName(containerName)
+                .exec();
+
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InputStream stdin = new ByteArrayInputStream("ls\n".getBytes());
+
+        ByteArrayOutputStream stdout = new ByteArrayOutputStream();
+
+        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
+                .withAttachStdout(true)
+                .withAttachStdin(true)
+                .withTty(false)
+                .withCmd("/bin/sh").exec();
+
+        dockerClient.execStartCmd(execCreateCmdResponse.getId())
+                .withDetach(false)
+                .withStdIn(stdin)
+                .exec(new ExecStartResultCallback(stdout, System.err))
+                .awaitCompletion();
+
+        assertThat(stdout.toString(), containsString("etc\n"));
+    }
+
     @Test(groups = "ignoreInCircleCi")
     public void execStartNotAttachedStdin() throws Exception {
         String containerName = "generated_" + new SecureRandom().nextInt();

From 423998b8c937f5f0fd8165ea3b95eb0ed2baf82c Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Sat, 27 Feb 2016 17:07:21 +0100
Subject: [PATCH 0429/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c79ccddb..5852e3338 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,10 @@ Included in 3.0.0-RC1
 * [#347] (https://github.com/docker-java/docker-java/pull/347) Implementation of copy archive to/from container commands 
 * [#313] (https://github.com/docker-java/docker-java/pull/313) Refactor primitive type fields to be of object type in JSON objects
 
+v2.2.2
+---
+* [#478] (https://github.com/docker-java/docker-java/pull/478) Remove debug println
+
 v2.2.1
 ---
 * [#474] (https://github.com/docker-java/docker-java/pull/474) Fix periodic pull failure (2.x)

From b2e852c42311847040e38da1df8e12b016a02f8c Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 1 Mar 2016 01:24:08 +0300
Subject: [PATCH 0430/1272] Fix NegativeArraySizeException in awaitCompletion()

Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
---
 .../com/github/dockerjava/core/command/FrameReader.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
index 1e8ac0930..9c9c31e74 100644
--- a/src/main/java/com/github/dockerjava/core/command/FrameReader.java
+++ b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
@@ -7,6 +7,8 @@
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.StreamType;
 
+import javax.annotation.CheckForNull;
+
 /**
  * Breaks the input into frame. Similar to how a buffered reader would readLies.
  * <p/>
@@ -42,14 +44,16 @@ private static StreamType streamType(byte streamType) {
     /**
      * @return A frame, or null if no more frames.
      */
+    @CheckForNull
     public Frame readFrame() throws IOException {
 
         if (rawStreamDetected) {
-
             int read = inputStream.read(rawBuffer);
+            if (read == -1) {
+                return null;
+            }
 
             return new Frame(StreamType.RAW, Arrays.copyOf(rawBuffer, read));
-
         } else {
 
             byte[] header = new byte[HEADER_SIZE];

From 4e4896ec9c344ca5a9ee80d072d4efa1d9e5b7ce Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Wed, 2 Mar 2016 19:39:41 +0100
Subject: [PATCH 0431/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5852e3338..4ad984e21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ Notes
 * The configuration has been changed to better match the docker CLI configuration options. The properties file was renamed from `docker.io.properties` to `docker-java.properties`. See README.md for details.
 
 All changes
+* [#486] (https://github.com/docker-java/docker-java/pull/486) Fix NegativeArraySizeException in awaitCompletion()
 * [#472] (https://github.com/docker-java/docker-java/pull/472) Exec start command: detect end of STDIN stream 
 * [#466] (https://github.com/docker-java/docker-java/pull/466) Fix exec start stdin encoding 
 
@@ -32,6 +33,10 @@ Included in 3.0.0-RC1
 * [#347] (https://github.com/docker-java/docker-java/pull/347) Implementation of copy archive to/from container commands 
 * [#313] (https://github.com/docker-java/docker-java/pull/313) Refactor primitive type fields to be of object type in JSON objects
 
+v2.2.3
+---
+* [#487] (https://github.com/docker-java/docker-java/pull/487) Fix NegativeArraySizeException in awaitCompletion() 
+
 v2.2.2
 ---
 * [#478] (https://github.com/docker-java/docker-java/pull/478) Remove debug println

From 29f1a2e069f6f4afa3126d5c9203c5118043f996 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 2 Mar 2016 19:42:39 +0100
Subject: [PATCH 0432/1272] [maven-release-plugin] prepare release
 docker-java-3.0.0-RC2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c33a1de3a..d4a3d3a4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>3.0.0-RC2</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>docker-java-3.0.0-RC2</tag>
 	</scm>
 
 	<developers>

From 56885b5618eb05cc900c3f8a8fc9226c2a577769 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 2 Mar 2016 19:42:45 +0100
Subject: [PATCH 0433/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d4a3d3a4f..c33a1de3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.0-RC2</version>
+	<version>3.0.0-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>docker-java-3.0.0-RC2</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 7ed0508d6912018da3e59d83d06600bc6df3a7e3 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Wed, 2 Mar 2016 19:47:07 +0100
Subject: [PATCH 0434/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ad984e21..c1fd6b848 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ Notes
 * The configuration has been changed to better match the docker CLI configuration options. The properties file was renamed from `docker.io.properties` to `docker-java.properties`. See README.md for details.
 
 All changes
+
+Included in 3.0.0-RC2
 * [#486] (https://github.com/docker-java/docker-java/pull/486) Fix NegativeArraySizeException in awaitCompletion()
 * [#472] (https://github.com/docker-java/docker-java/pull/472) Exec start command: detect end of STDIN stream 
 * [#466] (https://github.com/docker-java/docker-java/pull/466) Fix exec start stdin encoding 

From b5c7f44f365f80073c1db80cef0378d99b1cfbfa Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Wed, 2 Mar 2016 19:47:28 +0100
Subject: [PATCH 0435/1272] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ad1f2c157..4205fa95e 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ Run build without integration tests:
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>3.0.0-RC1</version>
+          <version>3.0.0-RC2</version>
     </dependency>
     
 ### Latest development version

From 6761841debc2805a8362b0cb31d8c24b232e5083 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 27 Feb 2016 01:28:58 +0300
Subject: [PATCH 0436/1272] Add helper for api version extraction

---
 .../com/github/dockerjava/utils/TestUtils.java  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 src/test/java/com/github/dockerjava/utils/TestUtils.java

diff --git a/src/test/java/com/github/dockerjava/utils/TestUtils.java b/src/test/java/com/github/dockerjava/utils/TestUtils.java
new file mode 100644
index 000000000..b40273ecb
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/utils/TestUtils.java
@@ -0,0 +1,17 @@
+package com.github.dockerjava.utils;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+public class TestUtils {
+    private TestUtils() {
+    }
+
+    public static RemoteApiVersion getVersion(DockerClient client) {
+        final String serverVersion = client.versionCmd().exec().getApiVersion();
+        return RemoteApiVersion.parseConfig(serverVersion);
+    }
+}

From 32c65f0a46ae7337e1744bd5ec940c6445eade8c Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 21 Feb 2016 02:15:48 +0300
Subject: [PATCH 0437/1272] Remove package prefix for already imported class.

---
 .../com/github/dockerjava/core/async/JsonStreamProcessor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
index 8d9a64303..9da43b62b 100644
--- a/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
+++ b/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
@@ -34,7 +34,7 @@ public JsonStreamProcessor(Class<T> clazz) {
     public void processResponseStream(InputStream response, ResultCallback<T> resultCallback) {
 
         resultCallback.onStart(response);
-        OBJECT_MAPPER.configure(com.fasterxml.jackson.core.JsonParser.Feature.AUTO_CLOSE_SOURCE, true);
+        OBJECT_MAPPER.configure(JsonParser.Feature.AUTO_CLOSE_SOURCE, true);
 
         try {
             JsonParser jp = JSON_FACTORY.createParser(response);

From ddba77f84e22a77b1ab7c553da7b41d07d89fa86 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 19 Feb 2016 23:17:49 +0300
Subject: [PATCH 0438/1272] Document code rules.

---
 docs/devel.adoc | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 docs/devel.adoc

diff --git a/docs/devel.adoc b/docs/devel.adoc
new file mode 100644
index 000000000..50c6a7279
--- /dev/null
+++ b/docs/devel.adoc
@@ -0,0 +1,25 @@
+### Code Design
+  * Model is based on Objects and not primitives that allows nullify requests and have null values for data
+  that wasn't provided by docker daemon.
+  * For null safeness findbugs annotations are used.
+  ** Every method that may return `null` (and we are unsure in any fields as docker daemon may change something)
+     should be annotated with `@CheckForNull` return qualifier from `javax.annotation` package.
+  ** Methods that can't return `null` must be annotated with `@Nonnull`.
+  ** The same for Arguments.
+  ** `@Nullable` must be used only for changing inherited (other typed) qualifier.
+  * Setters in builder style must be prefixed with `withXX`.
+  * All classes should provide `toString()` `equals()` and `hashCode()` defined methods.
+  * Javadocs
+  ** Provide full information on field:
+  *** For models define API version with `@since {@link RemoteApiVersion#VERSION_1_X}`.
+  ** getters/setters should refernce to field `@see #$field`.
+
+### Coding style
+  * TBD, some initial styling already enforced with checkstyle.
+  IDEA/checkstyle file analogues will be provided soon.
+
+### Testing
+  * Unit tests for serder (serialization-deserialization).
+  * Integration tests for commands.
+  * If model object has builders, then fill it with data and compare by `equals()` with expected response
+  from docker daemon. If failed, then some fields mappings are wrong.

From 60c9efb942ac040839b5bc4194a14676b7470971 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 26 Feb 2016 20:36:16 +0300
Subject: [PATCH 0439/1272] Update maven surefire

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c33a1de3a..2b5fe2119 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,8 +72,8 @@
 		<maven-jar-plugin.version>2.2</maven-jar-plugin.version>
 		<maven-compiler-plugin.version>2.3.1</maven-compiler-plugin.version>
 		<maven-release-plugin.version>2.3.1</maven-release-plugin.version>
-		<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
-		<maven-failsafe-plugin.version>2.17</maven-failsafe-plugin.version>
+		<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+		<maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
 		<maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
 	</properties>
 

From e944b49ee09b08f92689ae1315fe18ee29a6c734 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 27 Feb 2016 02:11:40 +0300
Subject: [PATCH 0440/1272] Fix sync test to be async.

---
 .../core/command/FrameReaderITest.java        | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index df616ddba..06d07667c 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -1,10 +1,18 @@
 package com.github.dockerjava.core.command;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.hasProperty;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
 
 import org.testng.annotations.AfterTest;
@@ -39,18 +47,17 @@ public void deleteDockerContainerImage() throws Exception {
 
     @Test
     public void canCloseFrameReaderAndReadExpectedLines() throws Exception {
-
         // wait for the container to be successfully executed
         int exitCode = dockerClient.waitContainerCmd(dockerfileFixture.getContainerId())
                 .exec(new WaitContainerResultCallback()).awaitStatusCode();
         assertEquals(0, exitCode);
 
-        Iterator<Frame> response = getLoggingFrames().iterator();
-
-        assertEquals(response.next(), new Frame(StreamType.STDOUT, "to stdout\n".getBytes()));
-        assertEquals(response.next(), new Frame(StreamType.STDERR, "to stderr\n".getBytes()));
-        assertFalse(response.hasNext());
-
+        final List<Frame> loggingFrames = getLoggingFrames();
+        final Frame outFrame = new Frame(StreamType.STDOUT, "to stdout\n".getBytes());
+        final Frame errFrame = new Frame(StreamType.STDERR, "to stderr\n".getBytes());
+        
+        assertThat(loggingFrames, containsInAnyOrder(outFrame, errFrame));
+        assertThat(loggingFrames, hasSize(2));
     }
 
     private List<Frame> getLoggingFrames() throws Exception {

From bbab47eeaffac40342739adb600966816cbdc2af Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 17 Feb 2016 04:58:37 +0300
Subject: [PATCH 0441/1272] Sync up to 1.22 API part 1

Squashed:
- HostConfig.class: setXX() -> withXX()
- Info.class
- remove isXX that doesn't match primitives
- added builder setters
- Extract nested class from Info.class
- Restore getter name.
- IDEA generated it as javabean getter but docker-java uses other style?
- Test case Info and fix.
- Switch to reflection methods.
- Easier fields detection.
- Version.class to use reflection.
- Clean-up imports.
- Version.class serder test
- AuthConfig.class add serder tests.
- ContainerPort.class to reflection.
- HostConfig.class to refleciton.
- Test for CreateContainer with stopSignal
- Implement UpdateContainerCmd with tests
- Fix junit errors?
- Fix and update test.
- Deprecate container field
- Do test conditional.
- Value set according to response.
- Cleanup test code after fix.
- Clarify usage
---
 .../github/dockerjava/api/DockerClient.java   |  10 +
 .../api/command/CreateContainerCmd.java       |   5 +
 .../api/command/DockerCmdExecFactory.java     |   2 +
 .../api/command/InspectExecResponse.java      |  52 +
 .../api/command/UpdateContainerCmd.java       |  68 ++
 .../dockerjava/api/model/AuthConfig.java      |  24 +
 .../dockerjava/api/model/Container.java       | 129 ++-
 .../api/model/ContainerHostConfig.java        |  46 +
 .../api/model/ContainerNetwork.java           | 273 ++++++
 .../api/model/ContainerNetworkSettings.java   |  55 ++
 .../dockerjava/api/model/ContainerPort.java   | 108 +++
 .../dockerjava/api/model/HostConfig.java      | 536 ++++++++++-
 .../com/github/dockerjava/api/model/Info.java | 890 +++++++++++++++++-
 .../api/model/InfoRegistryConfig.java         | 189 ++++
 .../dockerjava/api/model/NetworkSettings.java |  16 +
 .../api/model/UpdateContainerResponse.java    |  28 +
 .../github/dockerjava/api/model/Version.java  |  49 +-
 .../dockerjava/core/DockerClientImpl.java     |   9 +
 .../dockerjava/core/RemoteApiVersion.java     |   2 +-
 .../core/command/CreateContainerCmdImpl.java  |  79 +-
 .../core/command/UpdateContainerCmdImpl.java  | 264 ++++++
 .../jaxrs/DockerCmdExecFactoryImpl.java       |   7 +
 .../jaxrs/UpdateContainerCmdExec.java         |  36 +
 .../netty/DockerCmdExecFactoryImpl.java       |   7 +
 .../netty/exec/UpdateContainerCmdExec.java    |  34 +
 .../api/command/InspectExecResponseTest.java  |  56 ++
 .../dockerjava/api/model/AuthConfigTest.java  |  65 +-
 .../dockerjava/api/model/ContainerTest.java   |  44 +
 .../dockerjava/api/model/IdentifierTest.java  |   9 +-
 .../github/dockerjava/api/model/InfoTest.java | 172 ++++
 .../dockerjava/api/model/VersionTest.java     |  40 +
 .../client/AbstractDockerClientTest.java      |   7 +-
 .../core/TestDockerCmdExecFactory.java        |   5 +
 .../command/CreateContainerCmdImplTest.java   | 170 ++--
 .../core/command/InspectExecCmdImplTest.java  |  24 +-
 .../command/StopContainerCmdImplTest.java     |  12 +-
 .../command/UpdateContainerCmdImplTest.java   | 114 +++
 .../DockerfileStatementAddTest.java           |   5 +-
 .../netty/exec/InspectExecCmdExecTest.java    |  23 +-
 .../netty/exec/StopContainerCmdExecTest.java  |  12 +-
 .../exec/UpdateContainerCmdExecTest.java      |  98 ++
 .../dockerjava/test/serdes/JSONSamples.java   |  66 ++
 .../test/serdes/JSONTestHelper.java           |   4 -
 .../1.22/containers/container/json/1.json     | 151 +++
 .../containers/container/update/docs.json     |  12 +
 .../samples/1.22/containers/create/docs.json  | 131 +++
 .../samples/1.22/containers/json/filter1.json |  37 +
 .../resources/samples/1.22/exec/ID/1.json     |  18 +
 src/test/resources/samples/1.22/info/1.json   |  91 ++
 .../resources/samples/1.22/info/docs.json     |  76 ++
 .../samples/1.22/other/AuthConfig/docs1.json  |   5 +
 .../samples/1.22/other/AuthConfig/docs2.json  |   3 +
 .../resources/samples/1.22/version/1.json     |  10 +
 53 files changed, 4153 insertions(+), 225 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ContainerPort.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExec.java
 create mode 100644 src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java
 create mode 100644 src/test/java/com/github/dockerjava/api/model/ContainerTest.java
 create mode 100644 src/test/java/com/github/dockerjava/api/model/InfoTest.java
 create mode 100644 src/test/java/com/github/dockerjava/api/model/VersionTest.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/test/serdes/JSONSamples.java
 create mode 100644 src/test/resources/samples/1.22/containers/container/json/1.json
 create mode 100644 src/test/resources/samples/1.22/containers/container/update/docs.json
 create mode 100644 src/test/resources/samples/1.22/containers/create/docs.json
 create mode 100644 src/test/resources/samples/1.22/containers/json/filter1.json
 create mode 100644 src/test/resources/samples/1.22/exec/ID/1.json
 create mode 100644 src/test/resources/samples/1.22/info/1.json
 create mode 100644 src/test/resources/samples/1.22/info/docs.json
 create mode 100644 src/test/resources/samples/1.22/other/AuthConfig/docs1.json
 create mode 100644 src/test/resources/samples/1.22/other/AuthConfig/docs2.json
 create mode 100644 src/test/resources/samples/1.22/version/1.json

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index aaa3c5fcf..4ae45ec89 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -53,6 +53,7 @@
 import com.github.dockerjava.api.command.TagImageCmd;
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
+import com.github.dockerjava.api.command.UpdateContainerCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.exception.DockerException;
@@ -175,6 +176,15 @@ public interface DockerClient extends Closeable {
 
     public KillContainerCmd killContainerCmd(@Nonnull String containerId);
 
+    /**
+     * Update container settings
+     *
+     * @param containerId id of the container
+     * @return command
+     * @since {@link RemoteApiVersion#VERSION_1_22}
+     */
+    public UpdateContainerCmd updateContainerCmd(@Nonnull String containerId);
+
     public RestartContainerCmd restartContainerCmd(@Nonnull String containerId);
 
     public CommitCmd commitCmd(@Nonnull String containerId);
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 6b004c826..972739898 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -80,6 +80,9 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     public ExposedPort[] getExposedPorts();
 
+    @CheckForNull
+    public String getStopSignal();
+
     @CheckForNull
     public String[] getExtraHosts();
 
@@ -280,6 +283,8 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     public CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts);
 
+    public CreateContainerCmd withStopSignal(String stopSignal);
+
     public CreateContainerCmd withExposedPorts(List<ExposedPort> exposedPorts);
 
     /**
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index fc793558f..fcaad81fc 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -69,6 +69,8 @@ public interface DockerCmdExecFactory extends Closeable {
 
     public KillContainerCmd.Exec createKillContainerCmdExec();
 
+    UpdateContainerCmd.Exec createUpdateContainerCmdExec();
+
     public RestartContainerCmd.Exec createRestartContainerCmdExec();
 
     public CommitCmd.Exec createCommitCmdExec();
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
index 63f111dce..2833a5ade 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
@@ -9,6 +9,8 @@
 import com.github.dockerjava.api.model.NetworkSettings;
 import com.github.dockerjava.core.RemoteApiVersion;
 
+import javax.annotation.CheckForNull;
+
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class InspectExecResponse {
     @JsonProperty("ID")
@@ -26,15 +28,37 @@ public class InspectExecResponse {
     @JsonProperty("Running")
     private Boolean running;
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("CanRemove")
+    private Boolean canRemove;
+
     @JsonProperty("ExitCode")
     private Integer exitCode;
 
     @JsonProperty("ProcessConfig")
     private ProcessConfig processConfig;
 
+    /**
+     * @deprecated @since {@link RemoteApiVersion#VERSION_1_22}
+     */
+    @Deprecated
     @JsonProperty("Container")
     private Container container;
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("ContainerID")
+    private String containerID;
+
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("DetachKeys")
+    private String detachKeys;
+
     public String getId() {
         return id;
     }
@@ -63,10 +87,38 @@ public ProcessConfig getProcessConfig() {
         return processConfig;
     }
 
+    /**
+     * @see #container
+     */
+    @Deprecated
     public Container getContainer() {
         return container;
     }
 
+    /**
+     * @see #canRemove
+     */
+    @CheckForNull
+    public Boolean getCanRemove() {
+        return canRemove;
+    }
+
+    /**
+     * @see #containerID
+     */
+    @CheckForNull
+    public String getContainerID() {
+        return containerID;
+    }
+
+    /**
+     * @see #detachKeys
+     */
+    @CheckForNull
+    public String getDetachKeys() {
+        return detachKeys;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
diff --git a/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
new file mode 100644
index 000000000..3dc7a0773
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
@@ -0,0 +1,68 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.model.UpdateContainerResponse;
+
+import javax.annotation.CheckForNull;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+public interface UpdateContainerCmd extends SyncDockerCmd<UpdateContainerResponse> {
+    @CheckForNull
+    String getContainerId();
+
+    @CheckForNull
+    public Integer getBlkioWeight();
+
+    public UpdateContainerCmd withBlkioWeight(Integer blkioWeight);
+
+    public UpdateContainerCmd withContainerId(String containerId);
+
+    @CheckForNull
+    public Integer getCpuPeriod();
+
+    public UpdateContainerCmd withCpuPeriod(Integer cpuPeriod);
+
+    @CheckForNull
+    public Integer getCpuQuota();
+
+    public UpdateContainerCmd withCpuQuota(Integer cpuQuota);
+
+    @CheckForNull
+    public String getCpusetCpus();
+
+    public UpdateContainerCmd withCpusetCpus(String cpusetCpus);
+
+    @CheckForNull
+    public String getCpusetMems();
+
+    public UpdateContainerCmd withCpusetMems(String cpusetMems);
+
+    @CheckForNull
+    public Integer getCpuShares();
+
+    public UpdateContainerCmd withCpuShares(Integer cpuShares);
+
+    @CheckForNull
+    public Long getKernelMemory();
+
+    public UpdateContainerCmd withKernelMemory(Long kernelMemory);
+
+    @CheckForNull
+    public Long getMemory();
+
+    public UpdateContainerCmd withMemory(Long memory);
+
+    @CheckForNull
+    public Long getMemoryReservation();
+
+    public UpdateContainerCmd withMemoryReservation(Long memoryReservation);
+
+    @CheckForNull
+    Long getMemorySwap();
+
+    UpdateContainerCmd withMemorySwap(Long memorySwap);
+
+    interface Exec extends DockerCmdSyncExec<UpdateContainerCmd, UpdateContainerResponse> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
index ae7ebdda2..849f26a21 100644
--- a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -7,6 +7,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import javax.annotation.CheckForNull;
+
 @JsonInclude(Include.NON_NULL)
 public class AuthConfig {
 
@@ -32,6 +34,12 @@ public class AuthConfig {
     @JsonProperty("auth")
     private String auth;
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("registrytoken")
+    private String registrytoken;
+
     public String getUsername() {
         return username;
     }
@@ -77,6 +85,22 @@ public AuthConfig withAuth(String auth) {
         return this;
     }
 
+    /**
+     * @see #registrytoken
+     */
+    @CheckForNull
+    public String getRegistrytoken() {
+        return registrytoken;
+    }
+
+    /**
+     * @see #registrytoken
+     */
+    public AuthConfig withRegistrytoken(String registrytoken) {
+        this.registrytoken = registrytoken;
+        return this;
+    }
+
     @Override
     public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
diff --git a/src/main/java/com/github/dockerjava/api/model/Container.java b/src/main/java/com/github/dockerjava/api/model/Container.java
index dcdf1699d..47492920d 100644
--- a/src/main/java/com/github/dockerjava/api/model/Container.java
+++ b/src/main/java/com/github/dockerjava/api/model/Container.java
@@ -1,18 +1,22 @@
 package com.github.dockerjava.api.model;
 
-import java.util.Map;
-
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.command.ListContainersCmd;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import javax.annotation.CheckForNull;
+import java.util.Map;
 
 /**
+ * Used for Listing containers.
  *
  * @author Konstantin Pelykh (kpelykh@gmail.com)
- *
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_NULL)
@@ -30,11 +34,17 @@ public class Container {
     @JsonProperty("Image")
     private String image;
 
+    /**
+     * @since since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    @JsonProperty("ImageID")
+    private String imageId;
+
     @JsonProperty("Names")
     private String[] names;
 
     @JsonProperty("Ports")
-    public Port[] ports;
+    public ContainerPort[] ports;
 
     @JsonProperty("Labels")
     public Map<String, String> labels;
@@ -42,6 +52,35 @@ public class Container {
     @JsonProperty("Status")
     private String status;
 
+    /**
+     * @since ~{@link RemoteApiVersion#VERSION_1_19}
+     */
+    @JsonProperty("SizeRw")
+    private Long sizeRw;
+
+    /**
+     * Returns only when {@link ListContainersCmd#withShowSize(java.lang.Boolean)} set
+     *
+     * @since ~{@link RemoteApiVersion#VERSION_1_19}
+     */
+    @JsonProperty("SizeRootFs")
+    private Long sizeRootFs;
+
+    /**
+     * @since ~{@link RemoteApiVersion#VERSION_1_20}
+     */
+    @JsonProperty("HostConfig")
+    private ContainerHostConfig hostConfig;
+
+    /**
+     * Docker API docs says "list of networks", but json names `networkSettings`.
+     * So, reusing existed NetworkSettings model object.
+     *
+     * @since ~{@link RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("NetworkSettings")
+    private ContainerNetworkSettings networkSettings;
+
     public String getId() {
         return id;
     }
@@ -54,6 +93,11 @@ public String getImage() {
         return image;
     }
 
+    @CheckForNull
+    public String getImageId() {
+        return imageId;
+    }
+
     public Long getCreated() {
         return created;
     }
@@ -62,7 +106,7 @@ public String getStatus() {
         return status;
     }
 
-    public Port[] getPorts() {
+    public ContainerPort[] getPorts() {
         return ports;
     }
 
@@ -74,45 +118,50 @@ public String[] getNames() {
         return names;
     }
 
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
+    /**
+     * @see #sizeRw
+     */
+    @CheckForNull
+    public Long getSizeRw() {
+        return sizeRw;
     }
 
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class Port {
-
-        @JsonProperty("IP")
-        private String ip;
-
-        @JsonProperty("PrivatePort")
-        private Integer privatePort;
-
-        @JsonProperty("PublicPort")
-        private Integer publicPort;
-
-        @JsonProperty("Type")
-        private String type;
+    /**
+     * @see #sizeRootFs
+     */
+    @CheckForNull
+    public Long getSizeRootFs() {
+        return sizeRootFs;
+    }
 
-        public String getIp() {
-            return ip;
-        }
+    /**
+     * @see #networkSettings
+     */
+    @CheckForNull
+    public ContainerNetworkSettings getNetworkSettings() {
+        return networkSettings;
+    }
 
-        public Integer getPrivatePort() {
-            return privatePort;
-        }
+    /**
+     * @see #hostConfig
+     */
+    @CheckForNull
+    public ContainerHostConfig getHostConfig() {
+        return hostConfig;
+    }
 
-        public Integer getPublicPort() {
-            return publicPort;
-        }
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
 
-        public String getType() {
-            return type;
-        }
+    @Override
+    public boolean equals(Object o) {
+      return EqualsBuilder.reflectionEquals(this, o);
+    }
 
-        @Override
-        public String toString() {
-            return ToStringBuilder.reflectionToString(this);
-        }
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java b/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
new file mode 100644
index 000000000..43a5a94b1
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
@@ -0,0 +1,46 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+/**
+ * Used in {@link Container}
+ *
+ * @see Container
+ * @author Kanstantsin Shautsou
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ContainerHostConfig {
+    @JsonProperty("NetworkMode")
+    private String networkMode;
+
+    public String getNetworkMode() {
+        return networkMode;
+    }
+
+    /**
+     * @see #networkMode
+     */
+    public ContainerHostConfig withNetworkMode(String networkMode) {
+        this.networkMode = networkMode;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java b/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
new file mode 100644
index 000000000..4bfde8bfd
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
@@ -0,0 +1,273 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import javax.annotation.CheckForNull;
+import java.util.List;
+
+/**
+ * @see ContainerNetworkSettings
+ * @author Kanstantsin Shautsou
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ContainerNetwork {
+    /**
+     * FIXME verify
+     */
+    @JsonProperty("IPAMConfig")
+    private Network.Ipam.Config ipamConfig;
+
+    /**
+     * FIXME verify
+     */
+    @JsonProperty("Links")
+    private List<String> links;
+
+    /**
+     * FIXME no docs, unknown field.
+     * Type picked from `docker/vendor/src/github.com/docker/engine-api/types/network/network.go`
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("Aliases")
+    private List<String> aliases;
+
+    @JsonProperty("NetworkID")
+    private String networkID;
+
+    @JsonProperty("EndpointID")
+    private String endpointId;
+
+    @JsonProperty("Gateway")
+    private String gateway;
+
+    @JsonProperty("IPAddress")
+    private String ipAddress;
+
+    @JsonProperty("IPPrefixLen")
+    private Integer ipPrefixLen;
+
+    @JsonProperty("IPv6Gateway")
+    private String ipV6Gateway;
+
+    @JsonProperty("GlobalIPv6Address")
+    private String globalIPv6Address;
+
+    @JsonProperty("GlobalIPv6PrefixLen")
+    private Integer globalIPv6PrefixLen;
+
+    @JsonProperty("MacAddress")
+    private String macAddress;
+
+    /**
+     * @see #aliases
+     */
+    @CheckForNull
+    public List<String> getAliases() {
+        return aliases;
+    }
+
+    /**
+     * @see #aliases
+     */
+    public ContainerNetwork withAliases(List<String> aliases) {
+        this.aliases = aliases;
+        return this;
+    }
+
+    /**
+     * @see #endpointId
+     */
+    @CheckForNull
+    public String getEndpointId() {
+        return endpointId;
+    }
+
+    /**
+     * @see #endpointId
+     */
+    public ContainerNetwork withEndpointId(String endpointId) {
+        this.endpointId = endpointId;
+        return this;
+    }
+
+    /**
+     * @see #gateway
+     */
+    @CheckForNull
+    public String getGateway() {
+        return gateway;
+    }
+
+    /**
+     * @see #gateway
+     */
+    public ContainerNetwork withGateway(String gateway) {
+        this.gateway = gateway;
+        return this;
+    }
+
+    /**
+     * @see #globalIPv6Address
+     */
+    @CheckForNull
+    public String getGlobalIPv6Address() {
+        return globalIPv6Address;
+    }
+
+    /**
+     * @see #globalIPv6Address
+     */
+    public ContainerNetwork withGlobalIPv6Address(String globalIPv6Address) {
+        this.globalIPv6Address = globalIPv6Address;
+        return this;
+    }
+
+    /**
+     * @see #globalIPv6PrefixLen
+     */
+    @CheckForNull
+    public Integer getGlobalIPv6PrefixLen() {
+        return globalIPv6PrefixLen;
+    }
+
+    /**
+     * @see #globalIPv6PrefixLen
+     */
+    public ContainerNetwork withGlobalIPv6PrefixLen(Integer globalIPv6PrefixLen) {
+        this.globalIPv6PrefixLen = globalIPv6PrefixLen;
+        return this;
+    }
+
+    /**
+     * @see #ipAddress
+     */
+    @CheckForNull
+    public String getIpAddress() {
+        return ipAddress;
+    }
+
+    /**
+     * @see #ipAddress
+     */
+    public ContainerNetwork withIpAddress(String ipAddress) {
+        this.ipAddress = ipAddress;
+        return this;
+    }
+
+    /**
+     * @see #ipamConfig
+     */
+    @CheckForNull
+    public Network.Ipam.Config getIpamConfig() {
+        return ipamConfig;
+    }
+
+    /**
+     * @see #ipamConfig
+     */
+    public ContainerNetwork withIpamConfig(Network.Ipam.Config ipamConfig) {
+        this.ipamConfig = ipamConfig;
+        return this;
+    }
+
+    /**
+     * @see #ipPrefixLen
+     */
+    @CheckForNull
+    public Integer getIpPrefixLen() {
+        return ipPrefixLen;
+    }
+
+    /**
+     * @see #ipPrefixLen
+     */
+    public ContainerNetwork withIpPrefixLen(Integer ipPrefixLen) {
+        this.ipPrefixLen = ipPrefixLen;
+        return this;
+    }
+
+    /**
+     * @see #ipV6Gateway
+     */
+    @CheckForNull
+    public String getIpV6Gateway() {
+        return ipV6Gateway;
+    }
+
+    /**
+     * @see #ipV6Gateway
+     */
+    public ContainerNetwork withIpV6Gateway(String ipV6Gateway) {
+        this.ipV6Gateway = ipV6Gateway;
+        return this;
+    }
+
+    /**
+     * @see #links
+     */
+    @CheckForNull
+    public List<String> getLinks() {
+        return links;
+    }
+
+    /**
+     * @see #links
+     */
+    public ContainerNetwork withLinks(List<String> links) {
+        this.links = links;
+        return this;
+    }
+
+    /**
+     * @see #macAddress
+     */
+    @CheckForNull
+    public String getMacAddress() {
+        return macAddress;
+    }
+
+    /**
+     * @see #macAddress
+     */
+    public ContainerNetwork withMacAddress(String macAddress) {
+        this.macAddress = macAddress;
+        return this;
+    }
+
+    /**
+     * @see #networkID
+     */
+    @CheckForNull
+    public String getNetworkID() {
+        return networkID;
+    }
+
+    /**
+     * @see #networkID
+     */
+    public ContainerNetwork withNetworkID(String networkID) {
+        this.networkID = networkID;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return  EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java b/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
new file mode 100644
index 000000000..7f4b17be5
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
@@ -0,0 +1,55 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import java.util.Map;
+
+/**
+ * Sub-object in {@link Container}
+ *
+ * @see Container
+ * @since {@link RemoteApiVersion#VERSION_1_22}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ContainerNetworkSettings {
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("Networks")
+    private Map<String, ContainerNetwork> networks;
+
+    /**
+     * @see #networks
+     */
+    public Map<String, ContainerNetwork> getNetworks() {
+        return networks;
+    }
+
+    /**
+     * @see #networks
+     */
+    public ContainerNetworkSettings withNetworks(Map<String, ContainerNetwork> networks) {
+        this.networks = networks;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerPort.java b/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
new file mode 100644
index 000000000..09f718ef6
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
@@ -0,0 +1,108 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import javax.annotation.CheckForNull;
+
+/**
+ * @author Kanstantsin Shautsou
+ * @see Container
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ContainerPort {
+
+    @JsonProperty("IP")
+    private String ip;
+
+    @JsonProperty("PrivatePort")
+    private Integer privatePort;
+
+    @JsonProperty("PublicPort")
+    private Integer publicPort;
+
+    @JsonProperty("Type")
+    private String type;
+
+    /**
+     * @see #ip
+     */
+    @CheckForNull
+    public String getIp() {
+        return ip;
+    }
+
+    /**
+     * @see #ip
+     */
+    public ContainerPort withIp(String ip) {
+        this.ip = ip;
+        return this;
+    }
+
+    /**
+     * @see #privatePort
+     */
+    @CheckForNull
+    public Integer getPrivatePort() {
+        return privatePort;
+    }
+
+    /**
+     * @see #privatePort
+     */
+    public ContainerPort withPrivatePort(Integer privatePort) {
+        this.privatePort = privatePort;
+        return this;
+    }
+
+    /**
+     * @see #publicPort
+     */
+    @CheckForNull
+    public Integer getPublicPort() {
+        return publicPort;
+    }
+
+    /**
+     * @see #publicPort
+     */
+    public ContainerPort withPublicPort(Integer publicPort) {
+        this.publicPort = publicPort;
+        return this;
+    }
+
+    /**
+     * @see #type
+     */
+    @CheckForNull
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * @see #type
+     */
+    public ContainerPort withType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index edad5cfcb..912439357 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -1,15 +1,22 @@
 package com.github.dockerjava.api.model;
 
-import javax.annotation.CheckForNull;
-
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import javax.annotation.CheckForNull;
+import java.util.List;
 
+/**
+ * Used in `/containers/create`, and in inspect container.
+ * TODO exclude usage for 2 different models.
+ */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_NULL)
 public class HostConfig {
@@ -20,6 +27,42 @@ public class HostConfig {
     @JsonProperty("BlkioWeight")
     private Integer blkioWeight;
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("BlkioWeightDevice")
+    private List<Object> blkioWeightDevice;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("BlkioDeviceReadBps")
+    private List<Object> blkioDeviceReadBps;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("BlkioDeviceReadIOps")
+    private List<Object> blkioDeviceReadIOps;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("BlkioDeviceWriteBps")
+    private List<Object> blkioDeviceWriteBps;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("BlkioDeviceWriteIOps")
+    private List<Object> blkioDeviceWriteIOps;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20}
+     */
+    @JsonProperty("MemorySwappiness")
+    private Integer memorySwappiness;
+
     @JsonProperty("CapAdd")
     private Capability[] capAdd;
 
@@ -35,6 +78,12 @@ public class HostConfig {
     @JsonProperty("CpuShares")
     private Integer cpuShares;
 
+    /**
+     * @since ~{@link RemoteApiVersion#VERSION_1_20}
+     */
+    @JsonProperty("CpuQuota")
+    private Integer cpuQuota;
+
     @JsonProperty("CpusetCpus")
     private String cpusetCpus;
 
@@ -68,12 +117,30 @@ public class HostConfig {
     @JsonProperty("MemorySwap")
     private Long memorySwap;
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    @JsonProperty("MemoryReservation")
+    private Long memoryReservation;
+
+     /**
+     * @since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    @JsonProperty("KernelMemory")
+    private Long kernelMemory;
+
     @JsonProperty("NetworkMode")
     private String networkMode;
 
     @JsonProperty("OomKillDisable")
     private Boolean oomKillDisable;
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("OomScoreAdj")
+    private Boolean oomScoreAdj;
+
     @JsonProperty("PortBindings")
     private Ports portBindings;
 
@@ -98,6 +165,31 @@ public class HostConfig {
     @JsonProperty("PidMode")
     private String pidMode;
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_20}
+     */
+    @JsonProperty("SecurityOpt")
+    private List<String> securityOpts;
+
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_20}
+     */
+    @JsonProperty("CgroupParent")
+    private String cgroupParent;
+
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    @JsonProperty("VolumeDriver")
+    private String volumeDriver;
+
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("ShmSize")
+    private String shmSize;
+
+
     @JsonIgnore
     public Bind[] getBinds() {
         return (binds == null) ? new Bind[0] : binds.getBinds();
@@ -214,124 +306,486 @@ public String getPidMode() {
         return pidMode;
     }
 
+    /**
+     * @see #blkioDeviceReadBps
+     */
+    @CheckForNull
+    public List<Object> getBlkioDeviceReadBps() {
+        return blkioDeviceReadBps;
+    }
+
+    /**
+     * @see #blkioDeviceReadIOps
+     */
+    @CheckForNull
+    public List<Object> getBlkioDeviceReadIOps() {
+        return blkioDeviceReadIOps;
+    }
+
+    /**
+     * @see #blkioDeviceWriteBps
+     */
+    @CheckForNull
+    public List<Object> getBlkioDeviceWriteBps() {
+        return blkioDeviceWriteBps;
+    }
+
+    /**
+     * @see #blkioDeviceWriteIOps
+     */
+    @CheckForNull
+    public List<Object> getBlkioDeviceWriteIOps() {
+        return blkioDeviceWriteIOps;
+    }
+
+    /**
+     * @see #blkioWeightDevice
+     */
+    @CheckForNull
+    public List<Object> getBlkioWeightDevice() {
+        return blkioWeightDevice;
+    }
+
+    /**
+     * @see #oomScoreAdj
+     */
+    @CheckForNull
+    public Boolean getOomScoreAdj() {
+        return oomScoreAdj;
+    }
+
+    /**
+     * @see #cpuQuota
+     */
+    @CheckForNull
+    public Integer getCpuQuota() {
+        return cpuQuota;
+    }
+
+    /**
+     * @see #kernelMemory
+     */
+    @CheckForNull
+    public Long getKernelMemory() {
+        return kernelMemory;
+    }
+
+    /**
+     * @see #memoryReservation
+     */
+    @CheckForNull
+    public Long getMemoryReservation() {
+        return memoryReservation;
+    }
+
+    /**
+     * @see #memorySwappiness
+     */
+    @CheckForNull
+    public Integer getMemorySwappiness() {
+        return memorySwappiness;
+    }
+
+    /**
+     * @see #oomKillDisable
+     */
+    @CheckForNull
+    public Boolean getOomKillDisable() {
+        return oomKillDisable;
+    }
+
+    /**
+     * @see #securityOpts
+     */
+    @CheckForNull
+    public List<String> getSecurityOpts() {
+        return securityOpts;
+    }
+
+    /**
+     * @see #cgroupParent
+     */
+    @CheckForNull
+    public String getCgroupParent() {
+        return cgroupParent;
+    }
+
+    /**
+     * @see #shmSize
+     */
+    @CheckForNull
+    public String getShmSize() {
+        return shmSize;
+    }
+
+    /**
+     * @see #volumeDriver
+     */
+    @CheckForNull
+    public String getVolumeDriver() {
+        return volumeDriver;
+    }
+
     @JsonIgnore
     public void setBinds(Bind... binds) {
         this.binds = new Binds(binds);
     }
 
-    public void setBlkioWeight(Integer blkioWeight) {
-        this.blkioWeight = blkioWeight;
+    @JsonIgnore
+    public void setLinks(Link... links) {
+        this.links = new Links(links);
     }
 
-    public void setCpuPeriod(Integer cpuPeriod) {
-        this.cpuPeriod = cpuPeriod;
+    // auto-generated builder setters
+    /**
+     * @see #binds
+     */
+    public HostConfig withBinds(Binds binds) {
+        this.binds = binds;
+        return this;
     }
 
-    public void setCpuShares(Integer cpuShares) {
-        this.cpuShares = cpuShares;
+    /**
+     * @see #blkioDeviceReadBps
+     */
+    public HostConfig withBlkioDeviceReadBps(List<Object> blkioDeviceReadBps) {
+        this.blkioDeviceReadBps = blkioDeviceReadBps;
+        return this;
     }
 
-    public void setCpusetCpus(String cpusetCpus) {
-        this.cpusetCpus = cpusetCpus;
+    /**
+     * @see #blkioDeviceReadIOps
+     */
+    public HostConfig withBlkioDeviceReadIOps(List<Object> blkioDeviceReadIOps) {
+        this.blkioDeviceReadIOps = blkioDeviceReadIOps;
+        return this;
     }
 
-    public void setCpusetMems(String cpusetMems) {
-        this.cpusetMems = cpusetMems;
+    /**
+     * @see #blkioDeviceWriteBps
+     */
+    public HostConfig withBlkioDeviceWriteBps(List<Object> blkioDeviceWriteBps) {
+        this.blkioDeviceWriteBps = blkioDeviceWriteBps;
+        return this;
+    }
+
+    /**
+     * @see #blkioDeviceWriteIOps
+     */
+    public HostConfig withBlkioDeviceWriteIOps(List<Object> blkioDeviceWriteIOps) {
+        this.blkioDeviceWriteIOps = blkioDeviceWriteIOps;
+        return this;
+    }
+
+    /**
+     * @see #blkioWeight
+     */
+    public HostConfig withBlkioWeight(Integer blkioWeight) {
+        this.blkioWeight = blkioWeight;
+        return this;
     }
 
-    public void setCapAdd(Capability[] capAdd) {
+    /**
+     * @see #blkioWeightDevice
+     */
+    public HostConfig withBlkioWeightDevice(List<Object> blkioWeightDevice) {
+        this.blkioWeightDevice = blkioWeightDevice;
+        return this;
+    }
+
+    /**
+     * @see #capAdd
+     */
+    public HostConfig withCapAdd(Capability[] capAdd) {
         this.capAdd = capAdd;
+        return this;
     }
 
-    public void setCapDrop(Capability[] capDrop) {
+    /**
+     * @see #capDrop
+     */
+    public HostConfig withCapDrop(Capability[] capDrop) {
         this.capDrop = capDrop;
+        return this;
+    }
+
+    /**
+     * @see #cgroupParent
+     */
+    public HostConfig withCgroupParent(String cgroupParent) {
+        this.cgroupParent = cgroupParent;
+        return this;
     }
 
-    public void setContainerIDFile(String containerIDFile) {
+    /**
+     * @see #containerIDFile
+     */
+    public HostConfig withContainerIDFile(String containerIDFile) {
         this.containerIDFile = containerIDFile;
+        return this;
+    }
+
+    /**
+     * @see #cpuPeriod
+     */
+    public HostConfig withCpuPeriod(Integer cpuPeriod) {
+        this.cpuPeriod = cpuPeriod;
+        return this;
+    }
+
+    /**
+     * @see #cpuQuota
+     */
+    public HostConfig withCpuQuota(Integer cpuQuota) {
+        this.cpuQuota = cpuQuota;
+        return this;
+    }
+
+    /**
+     * @see #cpusetCpus
+     */
+    public HostConfig withCpusetCpus(String cpusetCpus) {
+        this.cpusetCpus = cpusetCpus;
+        return this;
+    }
+
+    /**
+     * @see #cpusetMems
+     */
+    public HostConfig withCpusetMems(String cpusetMems) {
+        this.cpusetMems = cpusetMems;
+        return this;
     }
 
-    public void setDevices(Device[] devices) {
+    /**
+     * @see #cpuShares
+     */
+    public HostConfig withCpuShares(Integer cpuShares) {
+        this.cpuShares = cpuShares;
+        return this;
+    }
+
+    /**
+     * @see #devices
+     */
+    public HostConfig withDevices(Device[] devices) {
         this.devices = devices;
+        return this;
     }
 
-    public void setDns(String[] dns) {
+    /**
+     * @see #dns
+     */
+    public HostConfig withDns(String[] dns) {
         this.dns = dns;
+        return this;
     }
 
-    public void setDnsSearch(String[] dnsSearch) {
+    /**
+     * @see #dnsSearch
+     */
+    public HostConfig withDnsSearch(String[] dnsSearch) {
         this.dnsSearch = dnsSearch;
+        return this;
     }
 
-    public void setExtraHosts(String[] extraHosts) {
+    /**
+     * @see #extraHosts
+     */
+    public HostConfig withExtraHosts(String[] extraHosts) {
         this.extraHosts = extraHosts;
+        return this;
     }
 
-    @JsonIgnore
-    public void setLinks(Link... links) {
-        this.links = new Links(links);
+    /**
+     * @see #kernelMemory
+     */
+    public HostConfig withKernelMemory(Long kernelMemory) {
+        this.kernelMemory = kernelMemory;
+        return this;
     }
 
-    @JsonIgnore
-    public void setLogConfig(LogConfig logConfig) {
+    /**
+     * @see #links
+     */
+    public HostConfig withLinks(Links links) {
+        this.links = links;
+        return this;
+    }
+
+    /**
+     * @see #logConfig
+     */
+    public HostConfig withLogConfig(LogConfig logConfig) {
         this.logConfig = logConfig;
+        return this;
     }
 
-    public void setLxcConf(LxcConf[] lxcConf) {
+    /**
+     * @see #lxcConf
+     */
+    public HostConfig withLxcConf(LxcConf[] lxcConf) {
         this.lxcConf = lxcConf;
+        return this;
     }
 
-    public void setMemory(Long memory) {
+    /**
+     * @see #memory
+     */
+    public HostConfig withMemory(Long memory) {
         this.memory = memory;
+        return this;
+    }
+
+    /**
+     * @see #memoryReservation
+     */
+    public HostConfig withMemoryReservation(Long memoryReservation) {
+        this.memoryReservation = memoryReservation;
+        return this;
     }
 
-    public void setMemorySwap(Long memorySwap) {
+    /**
+     * @see #memorySwap
+     */
+    public HostConfig withMemorySwap(Long memorySwap) {
         this.memorySwap = memorySwap;
+        return this;
     }
 
-    public void setNetworkMode(String networkMode) {
+    /**
+     * @see #memorySwappiness
+     */
+    public HostConfig withMemorySwappiness(Integer memorySwappiness) {
+        this.memorySwappiness = memorySwappiness;
+        return this;
+    }
+
+    /**
+     * @see #networkMode
+     */
+    public HostConfig withNetworkMode(String networkMode) {
         this.networkMode = networkMode;
+        return this;
     }
 
-    public void setOomKillDisable(Boolean oomKillDisable) {
+    /**
+     * @see #oomKillDisable
+     */
+    public HostConfig withOomKillDisable(Boolean oomKillDisable) {
         this.oomKillDisable = oomKillDisable;
+        return this;
+    }
+
+    /**
+     * @see #oomScoreAdj
+     */
+    public HostConfig withOomScoreAdj(Boolean oomScoreAdj) {
+        this.oomScoreAdj = oomScoreAdj;
+        return this;
     }
 
-    public void setPortBindings(Ports portBindings) {
+    /**
+     * @see #pidMode
+     */
+    public HostConfig withPidMode(String pidMode) {
+        this.pidMode = pidMode;
+        return this;
+    }
+
+    /**
+     * @see #portBindings
+     */
+    public HostConfig withPortBindings(Ports portBindings) {
         this.portBindings = portBindings;
+        return this;
     }
 
-    public void setPrivileged(Boolean privileged) {
+    /**
+     * @see #privileged
+     */
+    public HostConfig withPrivileged(Boolean privileged) {
         this.privileged = privileged;
+        return this;
     }
 
-    public void setPublishAllPorts(Boolean publishAllPorts) {
+    /**
+     * @see #publishAllPorts
+     */
+    public HostConfig withPublishAllPorts(Boolean publishAllPorts) {
         this.publishAllPorts = publishAllPorts;
+        return this;
     }
 
-    public void setReadonlyRootfs(Boolean readonlyRootfs) {
+    /**
+     * @see #readonlyRootfs
+     */
+    public HostConfig withReadonlyRootfs(Boolean readonlyRootfs) {
         this.readonlyRootfs = readonlyRootfs;
+        return this;
     }
 
-    public void setRestartPolicy(RestartPolicy restartPolicy) {
+    /**
+     * @see #restartPolicy
+     */
+    public HostConfig withRestartPolicy(RestartPolicy restartPolicy) {
         this.restartPolicy = restartPolicy;
+        return this;
+    }
+
+    /**
+     * @see #securityOpts
+     */
+    public HostConfig withSecurityOpts(List<String> securityOpts) {
+        this.securityOpts = securityOpts;
+        return this;
+    }
+
+    /**
+     * @see #shmSize
+     */
+    public HostConfig withShmSize(String shmSize) {
+        this.shmSize = shmSize;
+        return this;
     }
 
-    public void setUlimits(Ulimit[] ulimits) {
+    /**
+     * @see #ulimits
+     */
+    public HostConfig withUlimits(Ulimit[] ulimits) {
         this.ulimits = ulimits;
+        return this;
     }
 
-    public void setVolumesFrom(VolumesFrom[] volumesFrom) {
-        this.volumesFrom = volumesFrom;
+    /**
+     * @see #volumeDriver
+     */
+    public HostConfig withVolumeDriver(String volumeDriver) {
+        this.volumeDriver = volumeDriver;
+        return this;
     }
 
-    public void setPidMode(String pidMode) {
-        this.pidMode = pidMode;
+    /**
+     * @see #volumesFrom
+     */
+    public HostConfig withVolumesFrom(VolumesFrom[] volumesFrom) {
+        this.volumesFrom = volumesFrom;
+        return this;
     }
+    // end of auto-generated
 
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
     }
 
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Info.java b/src/main/java/com/github/dockerjava/api/model/Info.java
index 0e4816cce..7270eceb8 100644
--- a/src/main/java/com/github/dockerjava/api/model/Info.java
+++ b/src/main/java/com/github/dockerjava/api/model/Info.java
@@ -1,29 +1,80 @@
 package com.github.dockerjava.api.model;
 
-import java.util.List;
-
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import javax.annotation.CheckForNull;
+import java.util.List;
+import java.util.Map;
 
 /**
+ * Used for `/info`
  *
  * @author Konstantin Pelykh (kpelykh@gmail.com)
- *
  */
 @JsonInclude(Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Info {
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("Architecture")
+    private String architecture;
+
     @JsonProperty("Containers")
     private Integer containers;
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("ContainersStopped")
+    private Integer containersStopped;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("ContainersPaused")
+    private Integer containersPaused;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("ContainersRunning")
+    private Integer containersRunning;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20}
+     */
+    @JsonProperty("CpuCfsPeriod")
+    private Boolean cpuCfsPeriod;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20}
+     */
+    @JsonProperty("CpuCfsQuota")
+    private Boolean cpuCfsQuota;
+
+    @JsonProperty("CPUShares")
+    private Boolean cpuShares;
+
+    @JsonProperty("CPUSet")
+    private Boolean cpuSet;
+
     @JsonProperty("Debug")
     private Boolean debug;
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21}
+     */
+    @JsonProperty("DiscoveryBackend")
+    private String discoveryBackend;
+
     @JsonProperty("DockerRootDir")
     private String dockerRootDir;
 
@@ -31,17 +82,53 @@ public class Info {
     private String driver;
 
     @JsonProperty("DriverStatus")
-    private List<Object> driverStatuses;
+    private List<List<String>> driverStatuses;
+
+    @JsonProperty("SystemStatus")
+    private List<Object> systemStatus;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("Plugins")
+    private Map<String, List<String>> plugins;
 
     @JsonProperty("ExecutionDriver")
     private String executionDriver;
 
+    @JsonProperty("LoggingDriver")
+    private String loggingDriver;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20}
+     */
+    @JsonProperty("ExperimentalBuild")
+    private Boolean experimentalBuild;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20}
+     */
+    @JsonProperty("HttpProxy")
+    private String httpProxy;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20}
+     */
+    @JsonProperty("HttpsProxy")
+    private String httpsProxy;
+
     @JsonProperty("ID")
     private String id;
 
     @JsonProperty("IPv4Forwarding")
     private Boolean ipv4Forwarding;
 
+    @JsonProperty("BridgeNfIptables")
+    private Boolean bridgeNfIptables;
+
+    @JsonProperty("BridgeNfIp6tables")
+    private Boolean bridgeNfIp6tables;
+
     @JsonProperty("Images")
     private Integer images;
 
@@ -73,7 +160,7 @@ public class Info {
     private Integer ncpu;
 
     @JsonProperty("NEventsListener")
-    private Long nEventListener;
+    private Integer nEventsListener;
 
     @JsonProperty("NFd")
     private Integer nfd;
@@ -81,113 +168,872 @@ public class Info {
     @JsonProperty("NGoroutines")
     private Integer nGoroutines;
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20}
+     */
+    @JsonProperty("NoProxy")
+    private String noProxy;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20}
+     */
+    @JsonProperty("OomKillDisable")
+    private Boolean oomKillDisable;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("OSType")
+    private String osType;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("OomScoreAdj")
+    private Integer oomScoreAdj;
+
     @JsonProperty("OperatingSystem")
     private String operatingSystem;
 
+    @JsonProperty("RegistryConfig")
+    private InfoRegistryConfig registryConfig;
+
     @JsonProperty("Sockets")
     private String[] sockets;
 
     @JsonProperty("SwapLimit")
     private Boolean swapLimit;
 
-    public Boolean isDebug() {
-        return debug;
+    /**
+     * @since ~{@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20}
+     */
+    @JsonProperty("SystemTime")
+    private String systemTime;
+
+    /**
+     * @since ~{@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21}
+     */
+    @JsonProperty("ServerVersion")
+    private String serverVersion;
+
+    @JsonProperty("ClusterStore")
+    private String clusterStore;
+
+    @JsonProperty("ClusterAdvertise")
+    private String clusterAdvertise;
+
+    /**
+     * @see #architecture
+     */
+    @CheckForNull
+    public String getArchitecture() {
+        return architecture;
+    }
+
+    /**
+     * @see #architecture
+     */
+    public Info withArchitecture(String architecture) {
+        this.architecture = architecture;
+        return this;
     }
 
+    /**
+     * @see #containers
+     */
+    @CheckForNull
     public Integer getContainers() {
         return containers;
     }
 
+    /**
+     * @see #containers
+     */
+    public Info withContainers(Integer containers) {
+        this.containers = containers;
+        return this;
+    }
+
+    /**
+     * @see #containersPaused
+     */
+    @CheckForNull
+    public Integer getContainersPaused() {
+        return containersPaused;
+    }
+
+    /**
+     * @see #containersPaused
+     */
+    public Info withContainersPaused(Integer containersPaused) {
+        this.containersPaused = containersPaused;
+        return this;
+    }
+
+    /**
+     * @see #containersRunning
+     */
+    @CheckForNull
+    public Integer getContainersRunning() {
+        return containersRunning;
+    }
+
+    /**
+     * @see #containersRunning
+     */
+    public Info withContainersRunning(Integer containersRunning) {
+        this.containersRunning = containersRunning;
+        return this;
+    }
+
+    /**
+     * @see #containersStopped
+     */
+    @CheckForNull
+    public Integer getContainersStopped() {
+        return containersStopped;
+    }
+
+    /**
+     * @see #containersStopped
+     */
+    public Info withContainersStopped(Integer containersStopped) {
+        this.containersStopped = containersStopped;
+        return this;
+    }
+
+    /**
+     * @see #cpuCfsPeriod
+     */
+    @CheckForNull
+    public Boolean getCpuCfsPeriod() {
+        return cpuCfsPeriod;
+    }
+
+    /**
+     * @see #cpuCfsPeriod
+     */
+    public Info withCpuCfsPeriod(Boolean cpuCfsPeriod) {
+        this.cpuCfsPeriod = cpuCfsPeriod;
+        return this;
+    }
+
+    /**
+     * @see #cpuCfsQuota
+     */
+    @CheckForNull
+    public Boolean getCpuCfsQuota() {
+        return cpuCfsQuota;
+    }
+
+    /**
+     * @see #cpuCfsQuota
+     */
+    public Info withCpuCfsQuota(Boolean cpuCfsQuota) {
+        this.cpuCfsQuota = cpuCfsQuota;
+        return this;
+    }
+
+    /**
+     * @see #cpuShares
+     */
+    @CheckForNull
+    public Boolean getCpuShares() {
+        return cpuShares;
+    }
+
+    /**
+     * @see #cpuShares
+     */
+    public Info withCpuShares(Boolean cpuShares) {
+        this.cpuShares = cpuShares;
+        return this;
+    }
+
+    /**
+     * @see #cpuSet
+     */
+    @CheckForNull
+    public Boolean getCpuSet() {
+        return cpuSet;
+    }
+
+    /**
+     * @see #cpuSet
+     */
+    public Info withCpuSet(Boolean cpuSet) {
+        this.cpuSet = cpuSet;
+        return this;
+    }
+
+    /**
+     * @see #debug
+     */
+    @CheckForNull
+    public Boolean getDebug() {
+        return debug;
+    }
+
+    /**
+     * @see #debug
+     */
+    public Info withDebug(Boolean debug) {
+        this.debug = debug;
+        return this;
+    }
+
+    /**
+     * @see #discoveryBackend
+     */
+    @CheckForNull
+    public String getDiscoveryBackend() {
+        return discoveryBackend;
+    }
+
+    /**
+     * @see #discoveryBackend
+     */
+    public Info withDiscoveryBackend(String discoveryBackend) {
+        this.discoveryBackend = discoveryBackend;
+        return this;
+    }
+
+    /**
+     * @see #dockerRootDir
+     */
+    @CheckForNull
     public String getDockerRootDir() {
         return dockerRootDir;
     }
 
+    /**
+     * @see #dockerRootDir
+     */
+    public Info withDockerRootDir(String dockerRootDir) {
+        this.dockerRootDir = dockerRootDir;
+        return this;
+    }
+
+    /**
+     * @see #driver
+     */
+    @CheckForNull
     public String getDriver() {
         return driver;
     }
 
-    public List<Object> getDriverStatuses() {
+    /**
+     * @see #driver
+     */
+    public Info withDriver(String driver) {
+        this.driver = driver;
+        return this;
+    }
+
+    /**
+     * @see #driverStatuses
+     */
+    @CheckForNull
+    public List<List<String>> getDriverStatuses() {
         return driverStatuses;
     }
 
-    public Integer getImages() {
-        return images;
+    /**
+     * @see #driverStatuses
+     */
+    public Info withDriverStatuses(List<List<String>> driverStatuses) {
+        this.driverStatuses = driverStatuses;
+        return this;
+    }
+
+    /**
+     * @see #executionDriver
+     */
+    @CheckForNull
+    public String getExecutionDriver() {
+        return executionDriver;
+    }
+
+    /**
+     * @see #executionDriver
+     */
+    public Info withExecutionDriver(String executionDriver) {
+        this.executionDriver = executionDriver;
+        return this;
+    }
+
+    /**
+     * @see #loggingDriver
+     */
+    @CheckForNull
+    public String getLoggingDriver() {
+        return loggingDriver;
+    }
+
+    /**
+     * @see #loggingDriver
+     */
+    public Info withLoggingDriver(String loggingDriver) {
+        this.loggingDriver = loggingDriver;
+        return this;
     }
 
-    public String getID() {
+    /**
+     * @see #experimentalBuild
+     */
+    @CheckForNull
+    public Boolean getExperimentalBuild() {
+        return experimentalBuild;
+    }
+
+    /**
+     * @see #experimentalBuild
+     */
+    public Info withExperimentalBuild(Boolean experimentalBuild) {
+        this.experimentalBuild = experimentalBuild;
+        return this;
+    }
+
+    /**
+     * @see #httpProxy
+     */
+    @CheckForNull
+    public String getHttpProxy() {
+        return httpProxy;
+    }
+
+    /**
+     * @see #httpProxy
+     */
+    public Info withHttpProxy(String httpProxy) {
+        this.httpProxy = httpProxy;
+        return this;
+    }
+
+    /**
+     * @see #httpsProxy
+     */
+    @CheckForNull
+    public String getHttpsProxy() {
+        return httpsProxy;
+    }
+
+    /**
+     * @see #httpsProxy
+     */
+    public Info withHttpsProxy(String httpsProxy) {
+        this.httpsProxy = httpsProxy;
+        return this;
+    }
+
+    /**
+     * @see #id
+     */
+    @CheckForNull
+    public String getId() {
         return id;
     }
 
-    public Boolean getIPv4Forwarding() {
-        return ipv4Forwarding;
+    /**
+     * @see #id
+     */
+    public Info withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    /**
+     * @see #images
+     */
+    @CheckForNull
+    public Integer getImages() {
+        return images;
+    }
+
+    /**
+     * @see #images
+     */
+    public Info withImages(Integer images) {
+        this.images = images;
+        return this;
     }
 
+    /**
+     * @see #indexServerAddress
+     */
+    @CheckForNull
     public String getIndexServerAddress() {
         return indexServerAddress;
     }
 
+    /**
+     * @see #indexServerAddress
+     */
+    public Info withIndexServerAddress(String indexServerAddress) {
+        this.indexServerAddress = indexServerAddress;
+        return this;
+    }
+
+    /**
+     * @see #initPath
+     */
+    @CheckForNull
     public String getInitPath() {
         return initPath;
     }
 
+    /**
+     * @see #initPath
+     */
+    public Info withInitPath(String initPath) {
+        this.initPath = initPath;
+        return this;
+    }
+
+    /**
+     * @see #initSha1
+     */
+    @CheckForNull
     public String getInitSha1() {
         return initSha1;
     }
 
+    /**
+     * @see #initSha1
+     */
+    public Info withInitSha1(String initSha1) {
+        this.initSha1 = initSha1;
+        return this;
+    }
+
+    /**
+     * @see #ipv4Forwarding
+     */
+    @CheckForNull
+    public Boolean getIPv4Forwarding() {
+        return ipv4Forwarding;
+    }
+
+    /**
+     * @see #ipv4Forwarding
+     */
+    public Info withIPv4Forwarding(Boolean ipv4Forwarding) {
+        this.ipv4Forwarding = ipv4Forwarding;
+        return this;
+    }
+
+    /**
+     * @see #bridgeNfIptables
+     */
+    @CheckForNull
+    public Boolean getBridgeNfIptables() {
+        return bridgeNfIptables;
+    }
+
+    /**
+     * @see #bridgeNfIptables
+     */
+    public Info withBridgeNfIptables(Boolean bridgeNfIptables) {
+        this.bridgeNfIptables = bridgeNfIptables;
+        return this;
+    }
+
+    /**
+     * @see #bridgeNfIp6tables
+     */
+    @CheckForNull
+    public Boolean getBridgeNfIp6tables() {
+        return bridgeNfIp6tables;
+    }
+
+    /**
+     * @see #bridgeNfIp6tables
+     */
+    public Info withBridgeNfIp6tables(Boolean bridgeNfIp6tables) {
+        this.bridgeNfIp6tables = bridgeNfIp6tables;
+        return this;
+    }
+
+    /**
+     * @see #kernelVersion
+     */
+    @CheckForNull
     public String getKernelVersion() {
         return kernelVersion;
     }
 
+    /**
+     * @see #kernelVersion
+     */
+    public Info withKernelVersion(String kernelVersion) {
+        this.kernelVersion = kernelVersion;
+        return this;
+    }
+
+    /**
+     * @see #labels
+     */
+    @CheckForNull
     public String[] getLabels() {
         return labels;
     }
 
-    public String[] getSockets() {
-        return sockets;
+    /**
+     * @see #labels
+     */
+    public Info withLabels(String[] labels) {
+        this.labels = labels;
+        return this;
     }
 
-    public Boolean isMemoryLimit() {
+    /**
+     * @see #memoryLimit
+     */
+    @CheckForNull
+    public Boolean getMemoryLimit() {
         return memoryLimit;
     }
 
-    public Long getnEventListener() {
-        return nEventListener;
+    /**
+     * @see #memoryLimit
+     */
+    public Info withMemoryLimit(Boolean memoryLimit) {
+        this.memoryLimit = memoryLimit;
+        return this;
     }
 
+    /**
+     * @see #memTotal
+     */
+    @CheckForNull
     public Long getMemTotal() {
         return memTotal;
     }
 
+    /**
+     * @see #memTotal
+     */
+    public Info withMemTotal(Long memTotal) {
+        this.memTotal = memTotal;
+        return this;
+    }
+
+    /**
+     * @see #name
+     */
+    @CheckForNull
     public String getName() {
         return name;
     }
 
+    /**
+     * @see #name
+     */
+    public Info withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * @see #ncpu
+     */
+    @CheckForNull
     public Integer getNCPU() {
         return ncpu;
     }
 
+    /**
+     * @see #ncpu
+     */
+    public Info withNCPU(Integer ncpu) {
+        this.ncpu = ncpu;
+        return this;
+    }
+
+    /**
+     * @see #nEventsListener
+     */
+    @CheckForNull
+    public Integer getNEventsListener() {
+        return nEventsListener;
+    }
+
+    /**
+     * @see #nEventsListener
+     */
+    public Info withNEventsListener(Integer nEventListener) {
+        this.nEventsListener = nEventListener;
+        return this;
+    }
+
+    /**
+     * @see #nfd
+     */
+    @CheckForNull
     public Integer getNFd() {
         return nfd;
     }
 
+    /**
+     * @see #nfd
+     */
+    public Info withNFd(Integer nfd) {
+        this.nfd = nfd;
+        return this;
+    }
+
+    /**
+     * @see #nGoroutines
+     */
+    @CheckForNull
     public Integer getNGoroutines() {
         return nGoroutines;
     }
 
+    /**
+     * @see #nGoroutines
+     */
+    public Info withNGoroutines(Integer nGoroutines) {
+        this.nGoroutines = nGoroutines;
+        return this;
+    }
+
+    /**
+     * @see #noProxy
+     */
+    @CheckForNull
+    public String getNoProxy() {
+        return noProxy;
+    }
+
+    /**
+     * @see #noProxy
+     */
+    public Info withNoProxy(String noProxy) {
+        this.noProxy = noProxy;
+        return this;
+    }
+
+    /**
+     * @see #oomKillDisable
+     */
+    @CheckForNull
+    public Boolean getOomKillDisable() {
+        return oomKillDisable;
+    }
+
+    /**
+     * @see #oomKillDisable
+     */
+    public Info withOomKillDisable(Boolean oomKillDisable) {
+        this.oomKillDisable = oomKillDisable;
+        return this;
+    }
+
+    /**
+     * @see #oomScoreAdj
+     */
+    @CheckForNull
+    public Integer getOomScoreAdj() {
+        return oomScoreAdj;
+    }
+
+    /**
+     * @see #oomScoreAdj
+     */
+    public Info withOomScoreAdj(Integer oomScoreAdj) {
+        this.oomScoreAdj = oomScoreAdj;
+        return this;
+    }
+
+    /**
+     * @see #operatingSystem
+     */
+    @CheckForNull
     public String getOperatingSystem() {
         return operatingSystem;
     }
 
+    /**
+     * @see #operatingSystem
+     */
+    public Info withOperatingSystem(String operatingSystem) {
+        this.operatingSystem = operatingSystem;
+        return this;
+    }
+
+    /**
+     * @see #osType
+     */
+    @CheckForNull
+    public String getOsType() {
+        return osType;
+    }
+
+    /**
+     * @see #osType
+     */
+    public Info withOsType(String osType) {
+        this.osType = osType;
+        return this;
+    }
+
+    /**
+     * @see #plugins
+     */
+    @CheckForNull
+    public Map<String, List<String>> getPlugins() {
+        return plugins;
+    }
+
+    /**
+     * @see #plugins
+     */
+    public Info withPlugins(Map<String, List<String>> plugins) {
+        this.plugins = plugins;
+        return this;
+    }
+
+    /**
+     * @see #registryConfig
+     */
+    @CheckForNull
+    public InfoRegistryConfig getRegistryConfig() {
+        return registryConfig;
+    }
+
+    /**
+     * @see #registryConfig
+     */
+    public Info withRegistryConfig(InfoRegistryConfig registryConfig) {
+        this.registryConfig = registryConfig;
+        return this;
+    }
+
+    /**
+     * @see #serverVersion
+     */
+    @CheckForNull
+    public String getServerVersion() {
+        return serverVersion;
+    }
+
+    /**
+     * @see #serverVersion
+     */
+    public Info withServerVersion(String serverVersion) {
+        this.serverVersion = serverVersion;
+        return this;
+    }
+
+    /**
+     * @see #clusterStore
+     */
+    @CheckForNull
+    public String getClusterStore() {
+        return clusterStore;
+    }
+
+    /**
+     * @see #clusterStore
+     */
+    public Info withClusterStore(String clusterStore) {
+        this.clusterStore = clusterStore;
+        return this;
+    }
+
+    /**
+     * @see #clusterAdvertise
+     */
+    @CheckForNull
+    public String getClusterAdvertise() {
+        return clusterAdvertise;
+    }
+
+    /**
+     * @see #clusterAdvertise
+     */
+    public Info withClusterAdvertise(String clusterAdvertise) {
+        this.clusterAdvertise = clusterAdvertise;
+        return this;
+    }
+
+    /**
+     * @see #sockets
+     */
+    @CheckForNull
+    public String[] getSockets() {
+        return sockets;
+    }
+
+    /**
+     * @see #sockets
+     */
+    public Info withSockets(String[] sockets) {
+        this.sockets = sockets;
+        return this;
+    }
+
+    /**
+     * @see #swapLimit
+     */
+    @CheckForNull
     public Boolean getSwapLimit() {
         return swapLimit;
     }
 
-    public String getExecutionDriver() {
-        return executionDriver;
+    /**
+     * @see #swapLimit
+     */
+    public Info withSwapLimit(Boolean swapLimit) {
+        this.swapLimit = swapLimit;
+        return this;
+    }
+
+    /**
+     * @see #systemStatus
+     */
+    @CheckForNull
+    public List<Object> getSystemStatus() {
+        return systemStatus;
+    }
+
+    /**
+     * @see #systemStatus
+     */
+    public Info withSystemStatus(List<Object> systemStatus) {
+        this.systemStatus = systemStatus;
+        return this;
+    }
+
+    /**
+     * @see #systemTime
+     */
+    @CheckForNull
+    public String getSystemTime() {
+        return systemTime;
+    }
+
+    /**
+     * @see #systemTime
+     */
+    public Info withSystemTime(String systemTime) {
+        this.systemTime = systemTime;
+        return this;
     }
 
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
     }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java b/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
new file mode 100644
index 000000000..cc67994a5
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
@@ -0,0 +1,189 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import javax.annotation.CheckForNull;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @since ~{@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public final class InfoRegistryConfig {
+    @JsonProperty("IndexConfigs")
+    private Map<String, IndexConfig> indexConfigs;
+
+    @JsonProperty("InsecureRegistryCIDRs")
+    private List<String> insecureRegistryCIDRs;
+
+    /**
+     * //FIXME unknown field
+     */
+    @JsonProperty("Mirrors")
+    private Object mirrors;
+
+    /**
+     * @see #indexConfigs
+     */
+    @CheckForNull
+    public Map<String, IndexConfig> getIndexConfigs() {
+        return indexConfigs;
+    }
+
+    /**
+     * @see #indexConfigs
+     */
+    public InfoRegistryConfig withIndexConfigs(Map<String, IndexConfig> indexConfigs) {
+        this.indexConfigs = indexConfigs;
+        return this;
+    }
+
+    /**
+     * @see #insecureRegistryCIDRs
+     */
+    @CheckForNull
+    public List<String> getInsecureRegistryCIDRs() {
+        return insecureRegistryCIDRs;
+    }
+
+    /**
+     * @see #insecureRegistryCIDRs
+     */
+    public InfoRegistryConfig withInsecureRegistryCIDRs(List<String> insecureRegistryCIDRs) {
+        this.insecureRegistryCIDRs = insecureRegistryCIDRs;
+        return this;
+    }
+
+    /**
+     * @see #mirrors
+     */
+    @CheckForNull
+    public Object getMirrors() {
+        return mirrors;
+    }
+
+    /**
+     * @see #mirrors
+     */
+    public InfoRegistryConfig withMirrors(Object mirrors) {
+        this.mirrors = mirrors;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+       return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+    /**
+     * @since ~{@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20}
+     */
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static final class IndexConfig {
+        @JsonProperty("Mirrors")
+        private String mirrors;
+
+        @JsonProperty("Name")
+        private String name;
+
+        @JsonProperty("Official")
+        private Boolean official;
+
+        @JsonProperty("Secure")
+        private Boolean secure;
+
+        /**
+         * @see #mirrors
+         */
+        @CheckForNull
+        public String getMirrors() {
+            return mirrors;
+        }
+
+        /**
+         * @see #mirrors
+         */
+        public IndexConfig withMirrors(String mirrors) {
+            this.mirrors = mirrors;
+            return this;
+        }
+
+        /**
+         * @see #name
+         */
+        @CheckForNull
+        public String getName() {
+            return name;
+        }
+
+        /**
+         * @see #name
+         */
+        public IndexConfig withName(String name) {
+            this.name = name;
+            return this;
+        }
+
+        /**
+         * @see #official
+         */
+        @CheckForNull
+        public Boolean getOfficial() {
+            return official;
+        }
+
+        /**
+         * @see #official
+         */
+        public IndexConfig withOfficial(Boolean official) {
+            this.official = official;
+            return this;
+        }
+
+        /**
+         * @see #secure
+         */
+        @CheckForNull
+        public Boolean getSecure() {
+            return secure;
+        }
+
+        /**
+         * @see #secure
+         */
+        public IndexConfig withSecure(Boolean secure) {
+            this.secure = secure;
+            return this;
+        }
+
+        @Override
+        public String toString() {
+            return ToStringBuilder.reflectionToString(this);
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            return EqualsBuilder.reflectionEquals(this, o);
+        }
+
+        @Override
+        public int hashCode() {
+            return HashCodeBuilder.reflectionHashCode(this);
+        }
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java b/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
index 64c954ec9..680048c18 100644
--- a/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
+++ b/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
@@ -11,6 +11,8 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.core.RemoteApiVersion;
 
+import javax.annotation.CheckForNull;
+
 /**
  *
  * @author Marcus Linke
@@ -208,6 +210,15 @@ public String toString() {
     @JsonIgnoreProperties(ignoreUnknown = true)
     public static class Network {
 
+        @JsonProperty("IPAMConfig")
+        private String ipamConfig;
+
+        /**
+         * @since {@link RemoteApiVersion#VERSION_1_22}
+         */
+        @JsonProperty("NetworkID")
+        private String networkID;
+
         @JsonProperty("EndpointID")
         private String endpointId;
 
@@ -232,6 +243,11 @@ public static class Network {
         @JsonProperty("MacAddress")
         private String macAddress;
 
+        @CheckForNull
+        public String getNetworkID() {
+            return networkID;
+        }
+
         public String getEndpointId() {
             return endpointId;
         }
diff --git a/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java b/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java
new file mode 100644
index 000000000..b1b1188d0
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java
@@ -0,0 +1,28 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import javax.annotation.CheckForNull;
+import java.util.List;
+
+/**
+ * @author Kanstantsin Shautsou
+ * @see com.github.dockerjava.api.command.UpdateContainerCmd
+ * @see <a href="https://docs.docker.com/engine/reference/api/docker_remote_api_v1.22/">
+ * https://docs.docker.com/engine/reference/api/docker_remote_api_v1.22/</a>
+ * @since {@link RemoteApiVersion#VERSION_1_22}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class UpdateContainerResponse extends ResponseItem {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("Warnings")
+    private List<String> warnings;
+
+    @CheckForNull
+    public List<String> getWarnings() {
+        return warnings;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/Version.java b/src/main/java/com/github/dockerjava/api/model/Version.java
index aca548987..004c85f22 100644
--- a/src/main/java/com/github/dockerjava/api/model/Version.java
+++ b/src/main/java/com/github/dockerjava/api/model/Version.java
@@ -1,14 +1,19 @@
 package com.github.dockerjava.api.model;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.command.VersionCmd;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import javax.annotation.CheckForNull;
 
 /**
+ * Used for `/version`
  *
  * @author Konstantin Pelykh (kpelykh@gmail.com)
- *
+ * @see VersionCmd
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Version {
@@ -34,6 +39,18 @@ public class Version {
     @JsonProperty("Version")
     private String version;
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("BuildTime")
+    private String buildTime;
+
+    /**
+     * @since ~{@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20}
+     */
+    @JsonProperty("Experimental")
+    private Boolean experimental;
+
     public String getVersion() {
         return version;
     }
@@ -62,8 +79,34 @@ public String getApiVersion() {
         return apiVersion;
     }
 
+    /**
+     * @see #buildTime
+     */
+    @CheckForNull
+    public String getBuildTime() {
+        return buildTime;
+    }
+
+    /**
+     * @see #experimental
+     */
+    @CheckForNull
+    public Boolean getExperimental() {
+        return experimental;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
     }
+
+    @Override
+    public boolean equals(Object o) {
+        return  EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 59e18bc85..9d342e249 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -55,6 +55,7 @@
 import com.github.dockerjava.api.command.TagImageCmd;
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
+import com.github.dockerjava.api.command.UpdateContainerCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.AuthConfig;
@@ -105,9 +106,12 @@
 import com.github.dockerjava.core.command.TagImageCmdImpl;
 import com.github.dockerjava.core.command.TopContainerCmdImpl;
 import com.github.dockerjava.core.command.UnpauseContainerCmdImpl;
+import com.github.dockerjava.core.command.UpdateContainerCmdImpl;
 import com.github.dockerjava.core.command.VersionCmdImpl;
 import com.github.dockerjava.core.command.WaitContainerCmdImpl;
 
+import javax.annotation.Nonnull;
+
 /**
  * @author Konstantin Pelykh (kpelykh@gmail.com)
  * @see "https://github.com/docker/docker/blob/master/api/client/commands.go"
@@ -355,6 +359,11 @@ public KillContainerCmd killContainerCmd(String containerId) {
         return new KillContainerCmdImpl(getDockerCmdExecFactory().createKillContainerCmdExec(), containerId);
     }
 
+    @Override
+    public UpdateContainerCmd updateContainerCmd(@Nonnull String containerId) {
+        return new UpdateContainerCmdImpl(getDockerCmdExecFactory().createUpdateContainerCmdExec(), containerId);
+    }
+
     @Override
     public RestartContainerCmd restartContainerCmd(String containerId) {
         return new RestartContainerCmdImpl(getDockerCmdExecFactory().createRestartContainerCmdExec(), containerId);
diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index 1dd93f466..e15cccc88 100644
--- a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -12,7 +12,7 @@
 /**
  * Bean to encapsulate the version of the <a href="http://docs.docker.com/engine/reference/api/docker_remote_api/">Docker Remote (REST)
  * API</a>
- * <p>
+ * <p/>
  * Contains the minor and major version of the API as well as operations to compare API versions.
  *
  * @author Marcus Thiesen
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 6b5cea08a..e03acbf7f 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -33,9 +33,8 @@
 import com.github.dockerjava.api.model.VolumesFrom;
 
 /**
- *
  * Creates a new container.
- *
+ * `/containers/create`
  */
 @JsonInclude(Include.NON_NULL)
 public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, CreateContainerResponse> implements
@@ -100,6 +99,12 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     @JsonProperty("ExposedPorts")
     private ExposedPorts exposedPorts = new ExposedPorts();
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21}
+     */
+    @JsonProperty("StopSignal")
+    private String stopSignal;
+
     @JsonProperty("HostConfig")
     private HostConfig hostConfig = new HostConfig();
 
@@ -215,6 +220,15 @@ public ExposedPort[] getExposedPorts() {
         return exposedPorts.getExposedPorts();
     }
 
+    /**
+     * @see #stopSignal
+     */
+    @JsonIgnore
+    @Override
+    public String getStopSignal() {
+        return stopSignal;
+    }
+
     @Override
     @JsonIgnore
     public String[] getExtraHosts() {
@@ -436,14 +450,14 @@ public CreateContainerCmd withBinds(List<Bind> binds) {
     @Override
     public CreateContainerCmd withBlkioWeight(Integer blkioWeight) {
         checkNotNull(blkioWeight, "blkioWeight was not specified");
-        hostConfig.setBlkioWeight(blkioWeight);
+        hostConfig.withBlkioWeight(blkioWeight);
         return this;
     }
 
     @Override
     public CreateContainerCmd withCapAdd(Capability... capAdd) {
         checkNotNull(capAdd, "capAdd was not specified");
-        hostConfig.setCapAdd(capAdd);
+        hostConfig.withCapAdd(capAdd);
         return this;
     }
 
@@ -456,7 +470,7 @@ public CreateContainerCmd withCapAdd(List<Capability> capAdd) {
     @Override
     public CreateContainerCmd withCapDrop(Capability... capDrop) {
         checkNotNull(capDrop, "capDrop was not specified");
-        hostConfig.setCapDrop(capDrop);
+        hostConfig.withCapDrop(capDrop);
         return this;
     }
 
@@ -482,42 +496,42 @@ public CreateContainerCmd withCmd(List<String> cmd) {
     @Override
     public CreateContainerCmd withContainerIDFile(String containerIDFile) {
         checkNotNull(containerIDFile, "no containerIDFile was specified");
-        hostConfig.setContainerIDFile(containerIDFile);
+        hostConfig.withContainerIDFile(containerIDFile);
         return this;
     }
 
     @Override
     public CreateContainerCmd withCpuPeriod(Integer cpuPeriod) {
         checkNotNull(cpuPeriod, "cpuPeriod was not specified");
-        hostConfig.setCpuPeriod(cpuPeriod);
+        hostConfig.withCpuPeriod(cpuPeriod);
         return this;
     }
 
     @Override
     public CreateContainerCmd withCpusetCpus(String cpusetCpus) {
         checkNotNull(cpusetCpus, "cpusetCpus was not specified");
-        hostConfig.setCpusetCpus(cpusetCpus);
+        hostConfig.withCpusetCpus(cpusetCpus);
         return this;
     }
 
     @Override
     public CreateContainerCmd withCpusetMems(String cpusetMems) {
         checkNotNull(cpusetMems, "cpusetMems was not specified");
-        hostConfig.setCpusetMems(cpusetMems);
+        hostConfig.withCpusetMems(cpusetMems);
         return this;
     }
 
     @Override
     public CreateContainerCmd withCpuShares(Integer cpuShares) {
         checkNotNull(cpuShares, "cpuShares was not specified");
-        hostConfig.setCpuShares(cpuShares);
+        hostConfig.withCpuShares(cpuShares);
         return this;
     }
 
     @Override
     public CreateContainerCmd withDevices(Device... devices) {
         checkNotNull(devices, "devices was not specified");
-        this.hostConfig.setDevices(devices);
+        this.hostConfig.withDevices(devices);
         return this;
     }
 
@@ -530,7 +544,7 @@ public CreateContainerCmd withDevices(List<Device> devices) {
     @Override
     public CreateContainerCmd withDns(String... dns) {
         checkNotNull(dns, "dns was not specified");
-        this.hostConfig.setDns(dns);
+        this.hostConfig.withDns(dns);
         return this;
     }
 
@@ -543,7 +557,7 @@ public CreateContainerCmd withDns(List<String> dns) {
     @Override
     public CreateContainerCmd withDnsSearch(String... dnsSearch) {
         checkNotNull(dnsSearch, "dnsSearch was not specified");
-        this.hostConfig.setDnsSearch(dnsSearch);
+        this.hostConfig.withDnsSearch(dnsSearch);
         return this;
     }
 
@@ -593,6 +607,13 @@ public CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withStopSignal(String stopSignal) {
+        checkNotNull(stopSignal, "stopSignal wasn't specified.");
+        this.stopSignal = stopSignal;
+        return this;
+    }
+
     @Override
     public CreateContainerCmd withExposedPorts(List<ExposedPort> exposedPorts) {
         checkNotNull(exposedPorts, "exposedPorts was not specified");
@@ -602,7 +623,7 @@ public CreateContainerCmd withExposedPorts(List<ExposedPort> exposedPorts) {
     @Override
     public CreateContainerCmd withExtraHosts(String... extraHosts) {
         checkNotNull(extraHosts, "extraHosts was not specified");
-        this.hostConfig.setExtraHosts(extraHosts);
+        this.hostConfig.withExtraHosts(extraHosts);
         return this;
     }
 
@@ -649,7 +670,7 @@ public CreateContainerCmd withLinks(List<Link> links) {
     @Override
     public CreateContainerCmd withLxcConf(LxcConf... lxcConf) {
         checkNotNull(lxcConf, "lxcConf was not specified");
-        this.hostConfig.setLxcConf(lxcConf);
+        this.hostConfig.withLxcConf(lxcConf);
         return this;
     }
 
@@ -662,7 +683,7 @@ public CreateContainerCmd withLxcConf(List<LxcConf> lxcConf) {
     @Override
     public CreateContainerCmd withLogConfig(LogConfig logConfig) {
         checkNotNull(logConfig, "logConfig was not specified");
-        this.hostConfig.setLogConfig(logConfig);
+        this.hostConfig.withLogConfig(logConfig);
         return this;
     }
 
@@ -676,14 +697,14 @@ public CreateContainerCmd withMacAddress(String macAddress) {
     @Override
     public CreateContainerCmd withMemory(Long memory) {
         checkNotNull(memory, "memory was not specified");
-        hostConfig.setMemory(memory);
+        hostConfig.withMemory(memory);
         return this;
     }
 
     @Override
     public CreateContainerCmd withMemorySwap(Long memorySwap) {
         checkNotNull(memorySwap, "memorySwap was not specified");
-        hostConfig.setMemorySwap(memorySwap);
+        hostConfig.withMemorySwap(memorySwap);
         return this;
     }
 
@@ -704,21 +725,21 @@ public CreateContainerCmd withNetworkDisabled(Boolean disableNetwork) {
     @Override
     public CreateContainerCmd withNetworkMode(String networkMode) {
         checkNotNull(networkMode, "networkMode was not specified");
-        this.hostConfig.setNetworkMode(networkMode);
+        this.hostConfig.withNetworkMode(networkMode);
         return this;
     }
 
     @Override
     public CreateContainerCmd withOomKillDisable(Boolean oomKillDisable) {
         checkNotNull(oomKillDisable, "oomKillDisable was not specified");
-        hostConfig.setOomKillDisable(oomKillDisable);
+        hostConfig.withOomKillDisable(oomKillDisable);
         return this;
     }
 
     @Override
     public CreateContainerCmd withPortBindings(PortBinding... portBindings) {
         checkNotNull(portBindings, "portBindings was not specified");
-        this.hostConfig.setPortBindings(new Ports(portBindings));
+        this.hostConfig.withPortBindings(new Ports(portBindings));
         return this;
     }
 
@@ -731,7 +752,7 @@ public CreateContainerCmd withPortBindings(List<PortBinding> portBindings) {
     @Override
     public CreateContainerCmd withPortBindings(Ports portBindings) {
         checkNotNull(portBindings, "portBindings was not specified");
-        this.hostConfig.setPortBindings(portBindings);
+        this.hostConfig.withPortBindings(portBindings);
         return this;
     }
 
@@ -751,28 +772,28 @@ public CreateContainerCmd withPortSpecs(List<String> portSpecs) {
     @Override
     public CreateContainerCmd withPrivileged(Boolean privileged) {
         checkNotNull(privileged, "no privileged was specified");
-        this.hostConfig.setPrivileged(privileged);
+        this.hostConfig.withPrivileged(privileged);
         return this;
     }
 
     @Override
     public CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts) {
         checkNotNull(publishAllPorts, "no publishAllPorts was specified");
-        this.hostConfig.setPublishAllPorts(publishAllPorts);
+        this.hostConfig.withPublishAllPorts(publishAllPorts);
         return this;
     }
 
     @Override
     public CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs) {
         checkNotNull(readonlyRootfs, "no readonlyRootfs was specified");
-        hostConfig.setReadonlyRootfs(readonlyRootfs);
+        hostConfig.withReadonlyRootfs(readonlyRootfs);
         return this;
     }
 
     @Override
     public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) {
         checkNotNull(restartPolicy, "restartPolicy was not specified");
-        this.hostConfig.setRestartPolicy(restartPolicy);
+        this.hostConfig.withRestartPolicy(restartPolicy);
         return this;
     }
 
@@ -800,7 +821,7 @@ public CreateContainerCmd withTty(Boolean tty) {
     @Override
     public CreateContainerCmd withUlimits(Ulimit... ulimits) {
         checkNotNull(ulimits, "no ulimits was specified");
-        hostConfig.setUlimits(ulimits);
+        hostConfig.withUlimits(ulimits);
         return this;
     }
 
@@ -833,7 +854,7 @@ public CreateContainerCmd withVolumes(List<Volume> volumes) {
     @Override
     public CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom) {
         checkNotNull(volumesFrom, "volumesFrom was not specified");
-        this.hostConfig.setVolumesFrom(volumesFrom);
+        this.hostConfig.withVolumesFrom(volumesFrom);
         return this;
     }
 
@@ -853,7 +874,7 @@ public CreateContainerCmd withWorkingDir(String workingDir) {
     @Override
     public CreateContainerCmd withPidMode(String pidMode) {
         checkNotNull(pidMode, "pidMode was not specified");
-        this.hostConfig.setPidMode(pidMode);
+        this.hostConfig.withPidMode(pidMode);
         return this;
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
new file mode 100644
index 000000000..ee95842b2
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
@@ -0,0 +1,264 @@
+package com.github.dockerjava.core.command;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.command.UpdateContainerCmd;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.UpdateContainerResponse;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import javax.annotation.CheckForNull;
+
+/**
+ * @author Kanstantsin Shautsou
+ * @see <a href="https://docs.docker.com/engine/reference/api/docker_remote_api_v1.22/">
+ * https://docs.docker.com/engine/reference/api/docker_remote_api_v1.22/</a>
+ * @since {@link RemoteApiVersion#VERSION_1_22}
+ */
+public class UpdateContainerCmdImpl extends AbstrDockerCmd<UpdateContainerCmd, UpdateContainerResponse>
+        implements UpdateContainerCmd {
+
+    @JsonIgnoreProperties
+    private String containerId;
+
+    @JsonProperty("BlkioWeight")
+    private Integer blkioWeight;
+
+    @JsonProperty("CpuShares")
+    private Integer cpuShares;
+
+    @JsonProperty("CpuPeriod")
+    private Integer cpuPeriod;
+
+    @JsonProperty("CpuQuota")
+    private Integer cpuQuota;
+
+    @JsonProperty("CpusetCpus")
+    private String cpusetCpus;
+
+    @JsonProperty("CpusetMems")
+    private String cpusetMems;
+
+    @JsonProperty("Memory")
+    private Long memory;
+
+    @JsonProperty("MemorySwap")
+    private Long memorySwap;
+
+    @JsonProperty("MemoryReservation")
+    private Long memoryReservation;
+
+    @JsonProperty("KernelMemory")
+    private Long kernelMemory;
+
+    public UpdateContainerCmdImpl() {
+        super(null);
+    }
+
+    public UpdateContainerCmdImpl(UpdateContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
+
+    /**
+     * @see #blkioWeight
+     */
+    @CheckForNull
+    public Integer getBlkioWeight() {
+        return blkioWeight;
+    }
+
+    /**
+     * @see #blkioWeight
+     */
+    public UpdateContainerCmd withBlkioWeight(Integer blkioWeight) {
+        this.blkioWeight = blkioWeight;
+        return this;
+    }
+
+    /**
+     * @see #containerId
+     */
+    @CheckForNull
+    public String getContainerId() {
+        return containerId;
+    }
+
+    /**
+     * @see #containerId
+     */
+    public UpdateContainerCmd withContainerId(String containerId) {
+        this.containerId = containerId;
+        return this;
+    }
+
+    /**
+     * @see #cpuPeriod
+     */
+    @CheckForNull
+    public Integer getCpuPeriod() {
+        return cpuPeriod;
+    }
+
+    /**
+     * @see #cpuPeriod
+     */
+    public UpdateContainerCmd withCpuPeriod(Integer cpuPeriod) {
+        this.cpuPeriod = cpuPeriod;
+        return this;
+    }
+
+    /**
+     * @see #cpuQuota
+     */
+    @CheckForNull
+    public Integer getCpuQuota() {
+        return cpuQuota;
+    }
+
+    /**
+     * @see #cpuQuota
+     */
+    public UpdateContainerCmd withCpuQuota(Integer cpuQuota) {
+        this.cpuQuota = cpuQuota;
+        return this;
+    }
+
+    /**
+     * @see #cpusetCpus
+     */
+    @CheckForNull
+    public String getCpusetCpus() {
+        return cpusetCpus;
+    }
+
+    /**
+     * @see #cpusetCpus
+     */
+    public UpdateContainerCmd withCpusetCpus(String cpusetCpus) {
+        this.cpusetCpus = cpusetCpus;
+        return this;
+    }
+
+    /**
+     * @see #cpusetMems
+     */
+    @CheckForNull
+    public String getCpusetMems() {
+        return cpusetMems;
+    }
+
+    /**
+     * @see #cpusetMems
+     */
+    public UpdateContainerCmd withCpusetMems(String cpusetMems) {
+        this.cpusetMems = cpusetMems;
+        return this;
+    }
+
+    /**
+     * @see #cpuShares
+     */
+    @CheckForNull
+    public Integer getCpuShares() {
+        return cpuShares;
+    }
+
+    /**
+     * @see #cpuShares
+     */
+    public UpdateContainerCmd withCpuShares(Integer cpuShares) {
+        this.cpuShares = cpuShares;
+        return this;
+    }
+
+    /**
+     * @see #kernelMemory
+     */
+    @CheckForNull
+    public Long getKernelMemory() {
+        return kernelMemory;
+    }
+
+    /**
+     * @see #kernelMemory
+     */
+    public UpdateContainerCmd withKernelMemory(Long kernelMemory) {
+        this.kernelMemory = kernelMemory;
+        return this;
+    }
+
+    /**
+     * @see #memory
+     */
+    @CheckForNull
+    public Long getMemory() {
+        return memory;
+    }
+
+    /**
+     * @see #memory
+     */
+    public UpdateContainerCmd withMemory(Long memory) {
+        this.memory = memory;
+        return this;
+    }
+
+    /**
+     * @see #memoryReservation
+     */
+    @CheckForNull
+    public Long getMemoryReservation() {
+        return memoryReservation;
+    }
+
+    /**
+     * @see #memoryReservation
+     */
+    public UpdateContainerCmd withMemoryReservation(Long memoryReservation) {
+        this.memoryReservation = memoryReservation;
+        return this;
+    }
+
+    /**
+     * @see #memorySwap
+     */
+    @CheckForNull
+    public Long getMemorySwap() {
+        return memorySwap;
+    }
+
+    /**
+     * @see #memorySwap
+     */
+    public UpdateContainerCmd withMemorySwap(Long memorySwap) {
+        this.memorySwap = memorySwap;
+        return this;
+    }
+
+    /**
+     * @throws NotFoundException No such container
+     */
+    @Override
+    public UpdateContainerResponse exec() throws NotFoundException {
+        return super.exec();
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index 2c5b2b077..4716877af 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -17,6 +17,7 @@
 import javax.ws.rs.client.ClientResponseFilter;
 import javax.ws.rs.client.WebTarget;
 
+import com.github.dockerjava.api.command.UpdateContainerCmd;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.conn.socket.PlainConnectionSocketFactory;
@@ -410,6 +411,12 @@ public KillContainerCmd.Exec createKillContainerCmdExec() {
         return new KillContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+
+    @Override
+    public UpdateContainerCmd.Exec createUpdateContainerCmdExec() {
+        return new UpdateContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public RestartContainerCmd.Exec createRestartContainerCmdExec() {
         return new RestartContainerCmdExec(getBaseResource(), getDockerClientConfig());
diff --git a/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java
new file mode 100644
index 000000000..474d7338e
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java
@@ -0,0 +1,36 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.command.UpdateContainerCmd;
+import com.github.dockerjava.api.model.UpdateContainerResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import static javax.ws.rs.client.Entity.entity;
+
+/**
+ * Update container settings.
+ *
+ * @author Kanstantsin Shautsou
+ */
+public class UpdateContainerCmdExec extends AbstrSyncDockerCmdExec<UpdateContainerCmd, UpdateContainerResponse>
+        implements UpdateContainerCmd.Exec {
+    private static final Logger LOGGER = LoggerFactory.getLogger(UpdateContainerCmdExec.class);
+
+    public UpdateContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected UpdateContainerResponse execute(UpdateContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/update")
+                .resolveTemplate("id", command.getContainerId());
+
+        LOGGER.trace("POST: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(entity(command, MediaType.APPLICATION_JSON), UpdateContainerResponse.class);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
index 1eca3a9df..1210c56bc 100644
--- a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
@@ -47,6 +47,7 @@
 import com.github.dockerjava.api.command.TagImageCmd;
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
+import com.github.dockerjava.api.command.UpdateContainerCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
@@ -98,6 +99,7 @@
 import com.github.dockerjava.netty.exec.TagImageCmdExec;
 import com.github.dockerjava.netty.exec.TopContainerCmdExec;
 import com.github.dockerjava.netty.exec.UnpauseContainerCmdExec;
+import com.github.dockerjava.netty.exec.UpdateContainerCmdExec;
 import com.github.dockerjava.netty.exec.VersionCmdExec;
 import com.github.dockerjava.netty.exec.WaitContainerCmdExec;
 
@@ -458,6 +460,11 @@ public KillContainerCmd.Exec createKillContainerCmdExec() {
         return new KillContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public UpdateContainerCmd.Exec createUpdateContainerCmdExec() {
+        return new UpdateContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public RestartContainerCmd.Exec createRestartContainerCmdExec() {
         return new RestartContainerCmdExec(getBaseResource(), getDockerClientConfig());
diff --git a/src/main/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExec.java
new file mode 100644
index 000000000..3c88dead8
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExec.java
@@ -0,0 +1,34 @@
+package com.github.dockerjava.netty.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.UpdateContainerCmd;
+import com.github.dockerjava.api.model.UpdateContainerResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+public class UpdateContainerCmdExec extends AbstrSyncDockerCmdExec<UpdateContainerCmd, UpdateContainerResponse>
+        implements UpdateContainerCmd.Exec {
+    private static final Logger LOGGER = LoggerFactory.getLogger(UpdateContainerCmdExec.class);
+
+    public UpdateContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected UpdateContainerResponse execute(UpdateContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/update")
+                .resolveTemplate("id", command.getContainerId());
+
+        LOGGER.trace("POST: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(command, new TypeReference<UpdateContainerResponse>() {
+                });
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java
new file mode 100644
index 000000000..cb9264d9f
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java
@@ -0,0 +1,56 @@
+package com.github.dockerjava.api.command;
+
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.testng.annotations.Test;
+
+import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.hamcrest.core.IsNull.nullValue;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+public class InspectExecResponseTest {
+
+    @Test
+    public void test_1_22_SerDer1() throws Exception {
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(InspectExecResponse.class);
+
+        final InspectExecResponse execResponse = testRoundTrip(RemoteApiVersion.VERSION_1_22,
+                "/exec/ID/1.json",
+                type
+        );
+
+        assertThat(execResponse, notNullValue());
+
+        assertThat(execResponse.getId(),
+                is("1ca2ca598fab202f86dd9281196c405456069013958a475396b707e85c56473b"));
+        assertThat(execResponse.isRunning(), is(false));
+        assertThat(execResponse.getExitCode(), is(nullValue()));
+
+        final InspectExecResponse.ProcessConfig processConfig = execResponse.getProcessConfig();
+        assertThat(processConfig, notNullValue());
+        assertThat(processConfig.isTty(), is(false));
+        assertThat(processConfig.getEntryPoint(), is("/bin/bash"));
+        assertThat(processConfig.getArguments(), hasSize(0));
+        assertThat(processConfig.isPrivileged(), is(false));
+        assertThat(processConfig.getUser(), isEmptyString());
+
+
+        assertThat(execResponse.isOpenStdin(), is(false));
+        assertThat(execResponse.isOpenStderr(), is(true));
+        assertThat(execResponse.isOpenStdout(), is(true));
+        assertThat(execResponse.getCanRemove(), is(false));
+        assertThat(execResponse.getContainerID(),
+                is("ffa39805f089af3099e36452a985481f96170a9dff40be69d34d1722c7660d38"));
+
+        assertThat(execResponse.getDetachKeys(), isEmptyString());
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
index 8f5bd64f3..db1553e33 100644
--- a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
@@ -1,25 +1,64 @@
 package com.github.dockerjava.api.model;
 
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.BeforeMethod;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.core.RemoteApiVersion;
 import org.testng.annotations.Test;
 
-public class AuthConfigTest {
+import java.io.IOException;
 
-    private AuthConfig authConfig;
+import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.testng.Assert.assertEquals;
 
-    @BeforeMethod
-    public void setUp() throws Exception {
-        authConfig = new AuthConfig()
-                .withEmail("foo")
-                .withPassword("bar")
-                .withRegistryAddress("baz")
-                .withUsername("qux");
-    }
+public class AuthConfigTest {
 
     @Test
     public void defaultServerAddress() throws Exception {
         assertEquals(new AuthConfig().getRegistryAddress(), "https://index.docker.io/v1/");
     }
+
+    @Test
+    public void serderDocs1() throws IOException {
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(AuthConfig.class);
+
+        final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_22,
+                "/other/AuthConfig/docs1.json",
+                type
+        );
+
+        assertThat(authConfig, notNullValue());
+        assertThat(authConfig.getUsername(), is("jdoe"));
+        assertThat(authConfig.getPassword(), is("secret"));
+        assertThat(authConfig.getEmail(), is("jdoe@acme.com"));
+
+        final AuthConfig authConfig1 = new AuthConfig().withUsername("jdoe")
+                .withPassword("secret")
+                .withEmail("jdoe@acme.com");
+
+        assertThat(authConfig1, equalTo(authConfig));
+    }
+
+    @Test
+    public void serderDocs2() throws IOException {
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(AuthConfig.class);
+
+        final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_22,
+                "/other/AuthConfig/docs2.json",
+                type
+        );
+
+        assertThat(authConfig, notNullValue());
+        assertThat(authConfig.getRegistrytoken(), is("9cbaf023786cd7..."));
+
+
+        final AuthConfig authConfig1 = new AuthConfig().withRegistrytoken("9cbaf023786cd7...");
+
+        assertThat(authConfig1, equalTo(authConfig));
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/ContainerTest.java b/src/test/java/com/github/dockerjava/api/model/ContainerTest.java
new file mode 100644
index 000000000..a143e6c57
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/api/model/ContainerTest.java
@@ -0,0 +1,44 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.type.CollectionType;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.util.List;
+
+import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.core.IsEqual.equalTo;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+public class ContainerTest {
+
+    @Test
+    public void serderJson1() throws IOException {
+        final ObjectMapper mapper = new ObjectMapper();
+        final CollectionType type = mapper.getTypeFactory().constructCollectionType(List.class, Container.class);
+
+        final List<Container> containers = testRoundTrip(RemoteApiVersion.VERSION_1_22,
+                "containers/json/filter1.json",
+                type
+        );
+
+        assertThat(containers.size(), equalTo(1));
+
+        final Container container = containers.get(0);
+
+        assertThat(container.getImageId(),
+                equalTo("sha256:0cb40641836c461bc97c793971d84d758371ed682042457523e4ae701efe7ec9"));
+        assertThat(container.getSizeRootFs(), equalTo(1113554L));
+
+        final ContainerHostConfig hostConfig = container.getHostConfig();
+        assertThat(hostConfig, notNullValue());
+        assertThat(hostConfig.getNetworkMode(), equalTo("default"));
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java b/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
index e8d4703db..eb458ab4c 100644
--- a/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
@@ -1,9 +1,14 @@
 package com.github.dockerjava.api.model;
 
-import junit.framework.TestCase;
 
-public class IdentifierTest extends TestCase {
+import org.testng.annotations.Test;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
+public class IdentifierTest {
+
+    @Test
     public void testFromCompoundString() throws Exception {
 
         Identifier i1 = Identifier.fromCompoundString("10.0.0.1/jim");
diff --git a/src/test/java/com/github/dockerjava/api/model/InfoTest.java b/src/test/java/com/github/dockerjava/api/model/InfoTest.java
new file mode 100644
index 000000000..6d4c76471
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/api/model/InfoTest.java
@@ -0,0 +1,172 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.model.InfoRegistryConfig.IndexConfig;
+import org.hamcrest.CoreMatchers;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
+import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+public class InfoTest {
+
+    @Test
+    public void serder1Json() throws IOException {
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().constructType(Info.class);
+
+        final Info info = testRoundTrip(VERSION_1_22,
+                "info/1.json",
+                type
+        );
+
+        final List<List<String>> driverStatus = asList(
+                asList("Root Dir", "/mnt/sda1/var/lib/docker/aufs"),
+                asList("Backing Filesystem", "extfs"),
+                asList("Dirs", "31"),
+                asList("Dirperm1 Supported", "true")
+        );
+
+        final Map<String, List<String>> plugins = new LinkedHashMap<>();
+        plugins.put("Volume", singletonList("local"));
+        plugins.put("Network", asList("bridge", "null", "host"));
+        plugins.put("Authorization", null);
+
+        assertThat(info, notNullValue());
+        assertThat(info.getArchitecture(), equalTo("x86_64"));
+        assertThat(info.getContainersStopped(), is(3));
+        assertThat(info.getContainersPaused(), is(10));
+        assertThat(info.getContainersRunning(), is(2));
+        assertThat(info.getCpuCfsPeriod(), is(true));
+
+        // not available in this dump
+        assertThat(info.getCpuCfsQuota(), is(true));
+        assertThat(info.getDiscoveryBackend(), nullValue());
+        assertThat(info.getOomScoreAdj(), nullValue());
+
+        assertThat(info.getDriverStatuses(), notNullValue());
+        assertThat(info.getDriverStatuses(), hasSize(4));
+        assertThat(info.getDriverStatuses(), equalTo(driverStatus));
+
+        assertThat(info.getNGoroutines(), is(40));
+
+        assertThat(info.getSystemStatus(), CoreMatchers.nullValue());
+
+        assertThat(info.getPlugins(), equalTo(plugins));
+        assertThat(info.getPlugins(), hasEntry("Volume", singletonList("local")));
+        assertThat(info.getPlugins(), hasEntry("Authorization", null));
+
+        assertThat(info.getExperimentalBuild(), is(false));
+
+        assertThat(info.getHttpProxy(), isEmptyString());
+        assertThat(info.getHttpsProxy(), isEmptyString());
+        assertThat(info.getNoProxy(), isEmptyString());
+        assertThat(info.getOomKillDisable(), is(true));
+        assertThat(info.getOsType(), equalTo("linux"));
+
+        final InfoRegistryConfig registryConfig = info.getRegistryConfig();
+        assertThat(registryConfig, notNullValue());
+        final List<String> cidRs = registryConfig.getInsecureRegistryCIDRs();
+        assertThat(cidRs, notNullValue());
+        assertThat(cidRs, contains("127.0.0.0/8"));
+
+        final Map<String, IndexConfig> indexConfigs = registryConfig.getIndexConfigs();
+        assertThat(indexConfigs, notNullValue());
+        final IndexConfig indexConfig = new IndexConfig().withMirrors(null).withName("docker.io")
+                .withSecure(true).withOfficial(true);
+        assertThat(indexConfigs, hasEntry("docker.io", indexConfig));
+        assertThat(registryConfig.getMirrors(), nullValue());
+
+        assertThat(info.getSystemTime(), is("2016-02-17T14:56:35.212841831Z"));
+        assertThat(info.getServerVersion(), is("1.10.1"));
+
+        assertThat(info.getCpuSet(), is(true));
+        assertThat(info.getCpuShares(), is(true));
+        assertThat(info.getIPv4Forwarding(), is(true));
+        assertThat(info.getBridgeNfIptables(), is(true));
+        assertThat(info.getBridgeNfIp6tables(), is(true));
+        assertThat(info.getDebug(), is(true));
+        assertThat(info.getNFd(), is(24));
+        assertThat(info.getOomKillDisable(), is(true));
+        assertThat(info.getLoggingDriver(), is("json-file"));
+        assertThat(info.getOperatingSystem(),
+                is("Boot2Docker 1.10.1 (TCL 6.4.1); master : b03e158 - Thu Feb 11 22:34:01 UTC 2016"));
+        assertThat(info.getClusterStore(), is(""));
+
+
+        final Info withInfo = new Info().withArchitecture("x86_64")
+                .withContainers(2)
+                .withContainersRunning(2)
+                .withContainersPaused(10)
+                .withContainersStopped(3)
+                .withImages(13)
+                .withId("HLN2:5SBU:SRQR:CQI6:AB52:LZZ2:DED5:REDM:BU73:JFHE:R37A:5HMX")
+                .withDriver("aufs")
+                .withDriverStatuses(driverStatus)
+                .withSystemStatus(null)
+                .withPlugins(plugins)
+                .withMemoryLimit(true)
+                .withSwapLimit(true)
+                .withCpuCfsPeriod(true)
+                .withCpuCfsQuota(true)
+                .withCpuShares(true)
+                .withCpuSet(true)
+                .withIPv4Forwarding(true)
+                .withBridgeNfIptables(true)
+                .withBridgeNfIp6tables(true)
+                .withDebug(true)
+                .withNFd(24)
+                .withOomKillDisable(true)
+                .withNGoroutines(40)
+                .withSystemTime("2016-02-17T14:56:35.212841831Z")
+                .withExecutionDriver("native-0.2")
+                .withLoggingDriver("json-file")
+                .withNEventsListener(0)
+                .withKernelVersion("4.1.17-boot2docker")
+                .withOperatingSystem("Boot2Docker 1.10.1 (TCL 6.4.1); master : b03e158 - Thu Feb 11 22:34:01 UTC 2016")
+                .withOsType("linux")
+                .withIndexServerAddress("https://index.docker.io/v1/")
+                .withRegistryConfig(registryConfig)
+                .withInitSha1("")
+                .withInitPath("/usr/local/bin/docker")
+                .withNCPU(1)
+                .withMemTotal(1044574208L)
+                .withDockerRootDir("/mnt/sda1/var/lib/docker")
+                .withHttpProxy("")
+                .withHttpsProxy("")
+                .withNoProxy("")
+                .withName("docker-java")
+                .withLabels(new String[]{"provider=virtualbox"})
+                .withExperimentalBuild(false)
+                .withServerVersion("1.10.1")
+                .withClusterStore("")
+                .withClusterAdvertise("")
+                //shredinger-fields
+                .withDiscoveryBackend(null)
+                .withOomScoreAdj(null)
+                .withSockets(null)
+                ;
+
+        assertThat(info, is(withInfo));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/api/model/VersionTest.java b/src/test/java/com/github/dockerjava/api/model/VersionTest.java
new file mode 100644
index 000000000..c32d93069
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/api/model/VersionTest.java
@@ -0,0 +1,40 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.testng.annotations.Test;
+
+import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.notNullValue;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+public class VersionTest {
+
+    @Test
+    public void testSerDer1() throws Exception {
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(Version.class);
+
+        final Version version = testRoundTrip(RemoteApiVersion.VERSION_1_22,
+                "/version/1.json",
+                type
+        );
+
+        assertThat(version, notNullValue());
+
+        assertThat(version.getVersion(), is("1.10.1"));
+        assertThat(version.getApiVersion(), is("1.22"));
+        assertThat(version.getGitCommit(), is("9e83765"));
+        assertThat(version.getGoVersion(), is("go1.5.3"));
+        assertThat(version.getOperatingSystem(), is("linux"));
+        assertThat(version.getArch(), is("amd64"));
+        assertThat(version.getKernelVersion(), is("4.1.17-boot2docker"));
+        assertThat(version.getBuildTime(), is("2016-02-11T20:39:58.688092588+00:00"));
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 8ddc481b3..1375cc9b6 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -10,6 +10,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.LineIterator;
 import org.apache.commons.lang.StringUtils;
@@ -39,7 +40,7 @@ public abstract class AbstractDockerClientTest extends Assert {
 
     public static final Logger LOG = LoggerFactory.getLogger(AbstractDockerClientTest.class);
 
-    private String apiVersion = "1.21";
+    private RemoteApiVersion apiVersion = RemoteApiVersion.VERSION_1_22;
 
     protected DockerClient dockerClient;
 
@@ -54,7 +55,9 @@ public void beforeTest() throws Exception {
 
         LOG.info("======================= BEFORETEST =======================");
         LOG.info("Connecting to Docker server");
-        dockerClient = DockerClientBuilder.getInstance(config()).withDockerCmdExecFactory(dockerCmdExecFactory).build();
+        dockerClient = DockerClientBuilder.getInstance(config())
+                .withDockerCmdExecFactory(dockerCmdExecFactory)
+                .build();
 
         try {
             dockerClient.inspectImageCmd("busybox").exec();
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index cf49a669e..b2b86601c 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -235,6 +235,11 @@ public KillContainerCmd.Exec createKillContainerCmdExec() {
         return delegate.createKillContainerCmdExec();
     }
 
+    @Override
+    public UpdateContainerCmd.Exec createUpdateContainerCmdExec() {
+        return delegate.createUpdateContainerCmdExec();
+    }
+
     @Override
     public RestartContainerCmd.Exec createRestartContainerCmdExec() {
         return delegate.createRestartContainerCmdExec();
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index dba1a1a34..7800a8c12 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -1,33 +1,5 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.api.model.Capability.MKNOD;
-import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasItemInArray;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.startsWith;
-
-import java.lang.reflect.Method;
-import java.security.SecureRandom;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.ConflictException;
@@ -35,6 +7,7 @@
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.Link;
 import com.github.dockerjava.api.model.LogConfig;
 import com.github.dockerjava.api.model.Ports;
@@ -43,9 +16,38 @@
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.client.AbstractDockerClientTest;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+import java.security.SecureRandom;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+import static com.github.dockerjava.api.model.Capability.MKNOD;
+import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItemInArray;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.startsWith;
 
 @Test(groups = "integration")
 public class CreateContainerCmdImplTest extends AbstractDockerClientTest {
+    public static final String BUSYBOX_IMAGE = "busybox";
 
     @BeforeTest
     public void beforeTest() throws Exception {
@@ -72,7 +74,7 @@ public void createContainerWithExistingName() throws DockerException {
 
         String containerName = "generated_" + new SecureRandom().nextInt();
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("env")
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("env")
                 .withName(containerName).exec();
 
         LOG.info("Created container {}", container.toString());
@@ -80,7 +82,7 @@ public void createContainerWithExistingName() throws DockerException {
         assertThat(container.getId(), not(isEmptyString()));
 
         try {
-            dockerClient.createContainerCmd("busybox").withCmd("env").withName(containerName).exec();
+            dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("env").withName(containerName).exec();
             fail("expected ConflictException");
         } catch (ConflictException e) {
         }
@@ -91,7 +93,7 @@ public void createContainerWithVolume() throws DockerException {
 
         Volume volume = new Volume("/var/log");
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withVolumes(volume)
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withVolumes(volume)
                 .withCmd("true").exec();
 
         LOG.info("Created container {}", container.toString());
@@ -114,7 +116,7 @@ public void createContainerWithReadOnlyVolume() throws DockerException {
 
         Volume volume = new Volume("/srv/test");
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withVolumes(volume)
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withVolumes(volume)
                 .withCmd("true").exec();
 
         LOG.info("Created container {}", container.toString());
@@ -144,7 +146,7 @@ public void createContainerWithVolumesFrom() throws DockerException {
         Bind bind2 = new Bind("/src/webapp2", volume2);
 
         // create a running container with bind mounts
-        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+        CreateContainerResponse container1 = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("sleep", "9999")
                 .withName(container1Name)
                 .withBinds(bind1, bind2).exec();
         LOG.info("Created container1 {}", container1.toString());
@@ -157,7 +159,7 @@ public void createContainerWithVolumesFrom() throws DockerException {
         assertThat(inspectContainerResponse1, mountedVolumes(containsInAnyOrder(volume1, volume2)));
 
         // create a second container with volumes from first container
-        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+        CreateContainerResponse container2 = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("sleep", "9999")
                 .withVolumesFrom(new VolumesFrom(container1Name)).exec();
         LOG.info("Created container2 {}", container2.toString());
 
@@ -187,7 +189,7 @@ public void createContainerWithVolumesFrom() throws DockerException {
     @Test
     public void createContainerWithEnv() throws Exception {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withEnv("VARIABLE=success")
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withEnv("VARIABLE=success")
                 .withCmd("env").exec();
 
         LOG.info("Created container {}", container.toString());
@@ -206,7 +208,7 @@ public void createContainerWithEnv() throws Exception {
     @Test
     public void createContainerWithHostname() throws Exception {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withHostName("docker-java")
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withHostName("docker-java")
                 .withCmd("env").exec();
 
         LOG.info("Created container {}", container.toString());
@@ -225,7 +227,7 @@ public void createContainerWithHostname() throws Exception {
     @Test
     public void createContainerWithName() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withName("container")
                 .withCmd("env").exec();
 
         LOG.info("Created container {}", container.toString());
@@ -237,7 +239,7 @@ public void createContainerWithName() throws DockerException {
         assertThat(inspectContainerResponse.getName(), equalTo("/container"));
 
         try {
-            dockerClient.createContainerCmd("busybox").withName("container").withCmd("env").exec();
+            dockerClient.createContainerCmd(BUSYBOX_IMAGE).withName("container").withCmd("env").exec();
             fail("Expected ConflictException");
         } catch (ConflictException e) {
         }
@@ -247,7 +249,7 @@ public void createContainerWithName() throws DockerException {
     @Test
     public void createContainerWithLink() throws DockerException {
 
-        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+        CreateContainerResponse container1 = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("sleep", "9999")
                 .withName("container1").exec();
         LOG.info("Created container1 {}", container1.toString());
         assertThat(container1.getId(), not(isEmptyString()));
@@ -259,21 +261,21 @@ public void createContainerWithLink() throws DockerException {
         LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
         assertThat(inspectContainerResponse1.getState().getRunning(), is(true));
 
-        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withName("container2")
+        CreateContainerResponse container2 = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withName("container2")
                 .withCmd("env").withLinks(new Link("container1", "container1Link")).exec();
         LOG.info("Created container {}", container2.toString());
         assertThat(container2.getId(), not(isEmptyString()));
 
         InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
                 .exec();
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link("container1",
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[]{new Link("container1",
                 "container1Link")}));
     }
 
     @Test
     public void createContainerWithCapAddAndCapDrop() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCapAdd(NET_ADMIN)
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCapAdd(NET_ADMIN)
                 .withCapDrop(MKNOD).exec();
 
         LOG.info("Created container {}", container.toString());
@@ -293,7 +295,7 @@ public void createContainerWithDns() throws DockerException {
         String aDnsServer = "8.8.8.8";
         String anotherDnsServer = "8.8.4.4";
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("true")
                 .withDns(aDnsServer, anotherDnsServer).exec();
 
         LOG.info("Created container {}", container.toString());
@@ -309,7 +311,7 @@ public void createContainerWithDns() throws DockerException {
     @Test
     public void createContainerWithEntrypoint() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withName("container")
                 .withEntrypoint("sleep", "9999").exec();
 
         LOG.info("Created container {}", container.toString());
@@ -327,7 +329,7 @@ public void createContainerWithExtraHosts() throws DockerException {
 
         String[] extraHosts = {"dockerhost:127.0.0.1", "otherhost:10.0.0.1"};
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withName("container")
                 .withExtraHosts(extraHosts).exec();
 
         LOG.info("Created container {}", container.toString());
@@ -343,7 +345,7 @@ public void createContainerWithExtraHosts() throws DockerException {
     @Test
     public void createContainerWithDevices() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("sleep", "9999")
                 .withDevices(new Device("rwm", "/dev/nulo", "/dev/zero")).exec();
 
         LOG.info("Created container {}", container.toString());
@@ -367,7 +369,7 @@ public void createContainerWithPortBindings() throws DockerException {
         portBindings.bind(tcp23, Ports.binding(11023));
         portBindings.bind(tcp23, Ports.binding(11024));
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
 
         LOG.info("Created container {}", container.toString());
@@ -392,7 +394,7 @@ public void createContainerWithPortBindings() throws DockerException {
     @Test
     public void createContainerWithLinking() throws DockerException {
 
-        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+        CreateContainerResponse container1 = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("sleep", "9999")
                 .withName("container1").exec();
 
         LOG.info("Created container1 {}", container1.toString());
@@ -416,7 +418,7 @@ public void createContainerWithLinking() throws DockerException {
             assertThat(inspectContainerResponse1.getState().getExitCode(), is(equalTo(0)));
         }
 
-        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+        CreateContainerResponse container2 = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("sleep", "9999")
                 .withName("container2").withLinks(new Link("container1", "container1Link")).exec();
 
         LOG.info("Created container2 {}", container2.toString());
@@ -430,7 +432,7 @@ public void createContainerWithLinking() throws DockerException {
         assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
         assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link("container1",
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[]{new Link("container1",
                 "container1Link")}));
         assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
         assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
@@ -443,7 +445,7 @@ public void createContainerWithRestartPolicy() throws DockerException {
 
         RestartPolicy restartPolicy = RestartPolicy.onFailureRestart(5);
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("sleep", "9999")
                 .withRestartPolicy(restartPolicy).exec();
 
         LOG.info("Created container {}", container.toString());
@@ -458,7 +460,7 @@ public void createContainerWithRestartPolicy() throws DockerException {
     @Test
     public void createContainerWithPidMode() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("true")
                 .withPidMode("host").exec();
 
         LOG.info("Created container {}", container.toString());
@@ -479,7 +481,7 @@ public void createContainerWithPidMode() throws DockerException {
     @Test
     public void createContainerWithNetworkMode() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("true")
                 .withNetworkMode("host").exec();
 
         LOG.info("Created container {}", container.toString());
@@ -494,7 +496,7 @@ public void createContainerWithNetworkMode() throws DockerException {
     @Test
     public void createContainerWithMacAddress() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
                 .withMacAddress("00:80:41:ae:fd:7e").withCmd("true").exec();
 
         LOG.info("Created container {}", container.toString());
@@ -511,7 +513,7 @@ public void createContainerWithULimits() throws DockerException {
 
         Ulimit[] ulimits = {new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096)};
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withName("container")
                 .withUlimits(ulimits).exec();
 
         LOG.info("Created container {}", container.toString());
@@ -532,7 +534,7 @@ public void createContainerWithLabels() throws DockerException {
         labels.put("com.github.dockerjava.null", null);
         labels.put("com.github.dockerjava.Boolean", "true");
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("sleep", "9999")
                 .withLabels(labels).exec();
 
         LOG.info("Created container {}", container.toString());
@@ -550,7 +552,7 @@ public void createContainerWithLabels() throws DockerException {
     public void createContainerWithLogConfig() throws DockerException {
 
         LogConfig logConfig = new LogConfig(LogConfig.LoggingType.NONE, null);
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withLogConfig(logConfig).exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withLogConfig(logConfig).exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -561,4 +563,58 @@ public void createContainerWithLogConfig() throws DockerException {
         // null becomes empty string
         assertEquals(inspectContainerResponse.getHostConfig().getLogConfig().type, logConfig.type);
     }
+
+    /**
+     * https://github.com/calavera/docker/blob/3781cde61ff10b1d9114ae5b4c5c1d1b2c20a1ee/integration-cli/docker_cli_run_unix_test.go#L319-L333
+     */
+    @Test
+    public void testWithStopSignal() throws Exception {
+        Integer signal = 10; // SIGUSR1 in busybox
+
+        CreateContainerResponse resp = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
+                .withCmd("/bin/sh", "-c", "trap 'echo \"exit trapped 10\"; exit 10' USR1; while true; do sleep 1; done")
+                .withAttachStdin(true)
+                .withTty(true)
+                .withStopSignal(signal.toString())
+                .exec();
+        final String containerId = resp.getId();
+        assertThat(containerId, not(isEmptyString()));
+        dockerClient.startContainerCmd(containerId).exec();
+
+        InspectContainerResponse inspect = dockerClient.inspectContainerCmd(containerId).exec();
+        assertThat(inspect.getState().getRunning(), is(true));
+
+        dockerClient.stopContainerCmd(containerId).exec();
+        Thread.sleep(TimeUnit.SECONDS.toMillis(3));
+
+        inspect = dockerClient.inspectContainerCmd(containerId).exec();
+        assertThat(inspect.getState().getRunning(), is(false));
+        assertThat(inspect.getState().getExitCode(), is(signal));
+
+        StringBuilder stringBuilder = new StringBuilder();
+        final StringBuilderLogReader callback = new StringBuilderLogReader(stringBuilder);
+        dockerClient.logContainerCmd(containerId)
+                .withStdErr(true)
+                .withStdOut(true)
+                .withTailAll()
+                .exec(callback)
+                .awaitCompletion();
+
+        String log = callback.builder.toString();
+        assertThat(log, is("exit trapped 10"));
+    }
+
+    private static class StringBuilderLogReader extends LogContainerResultCallback {
+        public StringBuilder builder;
+
+        public StringBuilderLogReader(StringBuilder builder) {
+            this.builder = builder;
+        }
+
+        @Override
+        public void onNext(Frame item) {
+            builder.append(new String(item.getPayload()).trim());
+            super.onNext(item);
+        }
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
index f40ee7e69..a21a312aa 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
@@ -1,14 +1,19 @@
 package com.github.dockerjava.core.command;
 
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
+import static com.github.dockerjava.utils.TestUtils.getVersion;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.security.SecureRandom;
 
+import com.github.dockerjava.core.RemoteApiVersion;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -97,6 +102,8 @@ public void inspectExec() throws Exception {
 
     @Test(groups = "ignoreInCircleCi")
     public void inspectExecNetworkSettings() throws IOException {
+        final RemoteApiVersion apiVersion = getVersion(dockerClient);
+
         String containerName = "generated_" + new SecureRandom().nextInt();
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
@@ -112,8 +119,19 @@ public void inspectExecNetworkSettings() throws IOException {
         assertThat(exec.getId(), not(isEmptyString()));
 
         InspectExecResponse inspectExecResponse = dockerClient.inspectExecCmd(exec.getId()).exec();
-        assertThat(inspectExecResponse.getExitCode(), is(0));
-
-        assertNotNull(inspectExecResponse.getContainer().getNetworkSettings().getNetworks().get("bridge"));
+        assertThat(inspectExecResponse.getExitCode(), is(nullValue()));
+        assertThat(inspectExecResponse.isOpenStdin(), is(false));
+        assertThat(inspectExecResponse.isOpenStdout(), is(true));
+        assertThat(inspectExecResponse.isRunning(), is(false));
+        assertThat(inspectExecResponse.getCanRemove(), is(false));
+        assertThat(inspectExecResponse.getContainerID(), is(container.getId()));
+
+        final InspectExecResponse.Container inspectContainer = inspectExecResponse.getContainer();
+        if (apiVersion.isGreaterOrEqual(VERSION_1_22)) {
+            assertThat(inspectContainer, nullValue());
+        } else {
+            assertThat(inspectContainer, notNullValue());
+            assertNotNull(inspectContainer.getNetworkSettings().getNetworks().get("bridge"));
+        }
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
index 0718c7700..913ed9474 100644
--- a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.core.command;
 
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
+import static com.github.dockerjava.utils.TestUtils.getVersion;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
@@ -8,6 +10,7 @@
 
 import java.lang.reflect.Method;
 
+import com.github.dockerjava.core.RemoteApiVersion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.ITestResult;
@@ -50,6 +53,7 @@ public void afterMethod(ITestResult result) {
 
     @Test(groups = "ignoreInCircleCi")
     public void testStopContainer() throws DockerException {
+        final RemoteApiVersion apiVersion = getVersion(dockerClient);
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         LOG.info("Created container: {}", container.toString());
@@ -63,7 +67,13 @@ public void testStopContainer() throws DockerException {
         LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
 
         assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
-        assertThat(inspectContainerResponse.getState().getExitCode(), not(equalTo(0)));
+
+        final Integer exitCode = inspectContainerResponse.getState().getExitCode();
+        if (apiVersion.equals(VERSION_1_22)) {
+            assertThat(exitCode, is(0));
+        } else {
+            assertThat(exitCode, not(0));
+        }
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java
new file mode 100644
index 000000000..76708f889
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java
@@ -0,0 +1,114 @@
+package com.github.dockerjava.core.command;
+
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.HostConfig;
+import com.github.dockerjava.api.model.UpdateContainerResponse;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+
+import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
+import static org.hamcrest.core.IsNull.notNullValue;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+@Test(groups = "integration")
+public class UpdateContainerCmdImplTest extends AbstractDockerClientTest {
+
+    public static final String BUSYBOX_IMAGE = "busybox";
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void updateContainer() throws DockerException, IOException {
+        CreateContainerResponse response = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
+                .withCmd("sleep", "9999")
+                .exec();
+        String containerId = response.getId();
+        dockerClient.startContainerCmd(containerId).exec();
+
+        InspectContainerResponse inspectBefore = dockerClient.inspectContainerCmd(containerId).exec();
+        final HostConfig beforeHostConfig = inspectBefore.getHostConfig();
+
+        final UpdateContainerResponse updateResponse = dockerClient.updateContainerCmd(containerId)
+                .withBlkioWeight(300)
+                .withCpuShares(512)
+                .withCpuPeriod(100000)
+                .withCpuQuota(50000)
+//                .withCpusetCpus("0") // depends on env
+                .withCpusetMems("0")
+                .withMemory(314572800L)
+                .withMemorySwap(514288000L)
+                .withMemoryReservation(209715200L)
+//                .withKernelMemory(52428800) Can not update kernel memory to a running container, please stop it first.
+                .exec();
+
+        // docker toolbox 1.10.1
+        assertThat(updateResponse.getWarnings(), hasSize(1));
+        assertThat(updateResponse.getWarnings().get(0),
+                is("Your kernel does not support Block I/O weight. Weight discarded."));
+
+        InspectContainerResponse inspectAfter = dockerClient.inspectContainerCmd(containerId).exec();
+        final HostConfig afterHostConfig = inspectAfter.getHostConfig();
+
+        assertThat(afterHostConfig.getMemory(),
+                is(314572800L));
+
+//        assertThat(afterHostConfig.getBlkioWeight(), is(300));
+        assertThat(afterHostConfig.getCpuShares(), is(512));
+        assertThat(afterHostConfig.getCpuPeriod(), is(100000));
+        assertThat(afterHostConfig.getCpuQuota(), is(50000));
+        assertThat(afterHostConfig.getCpusetMems(), is("0"));
+
+        assertThat(afterHostConfig.getMemoryReservation(), is(209715200L));
+        assertThat(afterHostConfig.getMemorySwap(), is(514288000L));
+
+    }
+
+    @Test(enabled = false, description = "impossible to serder because model bundled in cmd")
+    public void serDerDocs1() throws IOException {
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(UpdateContainerCmdImpl.class);
+
+        final UpdateContainerCmdImpl upd = testRoundTrip(RemoteApiVersion.VERSION_1_22,
+                "/containers/container/update/docs.json",
+                type
+        );
+
+        assertThat(upd, notNullValue());
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
index 47d570d8c..102b113e3 100644
--- a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
+++ b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
@@ -2,7 +2,6 @@
 
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.google.common.base.Optional;
-import junit.framework.TestCase;
 import org.hamcrest.Matcher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,9 +13,9 @@
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.is;
 
-public class DockerfileStatementAddTest extends TestCase {
+public class DockerfileStatementAddTest {
 
-    private static final Logger log = LoggerFactory.getLogger(DockerfileStatementAddTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DockerfileStatementAddTest.class);
 
     @DataProvider(name = "valid scenarios")
     public Object[][] validScenarios() {
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
index ecf5ed568..3d2b55e24 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
@@ -1,14 +1,19 @@
 package com.github.dockerjava.netty.exec;
 
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
+import static com.github.dockerjava.utils.TestUtils.getVersion;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.security.SecureRandom;
 
+import com.github.dockerjava.core.RemoteApiVersion;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -99,6 +104,7 @@ public void inspectExec() throws Exception {
 
     @Test(groups = "ignoreInCircleCi")
     public void inspectExecNetworkSettings() throws IOException {
+        final RemoteApiVersion apiVersion = getVersion(dockerClient);
         String containerName = "generated_" + new SecureRandom().nextInt();
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
@@ -114,8 +120,19 @@ public void inspectExecNetworkSettings() throws IOException {
         assertThat(exec.getId(), not(isEmptyString()));
 
         InspectExecResponse inspectExecResponse = dockerClient.inspectExecCmd(exec.getId()).exec();
-        assertThat(inspectExecResponse.getExitCode(), is(0));
-
-        assertNotNull(inspectExecResponse.getContainer().getNetworkSettings().getNetworks().get("bridge"));
+        assertThat(inspectExecResponse.getExitCode(), is(nullValue()));
+        assertThat(inspectExecResponse.isOpenStdin(), is(false));
+        assertThat(inspectExecResponse.isOpenStdout(), is(true));
+        assertThat(inspectExecResponse.isRunning(), is(false));
+        assertThat(inspectExecResponse.getCanRemove(), is(false));
+        assertThat(inspectExecResponse.getContainerID(), is(container.getId()));
+
+        final InspectExecResponse.Container inspectContainer = inspectExecResponse.getContainer();
+        if (apiVersion.isGreaterOrEqual(VERSION_1_22)) {
+            assertThat(inspectContainer, nullValue());
+        } else {
+            assertThat(inspectContainer, notNullValue());
+            assertNotNull(inspectContainer.getNetworkSettings().getNetworks().get("bridge"));
+        }
     }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java
index 01bf74458..b3f545a42 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.netty.exec;
 
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
+import static com.github.dockerjava.utils.TestUtils.getVersion;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
@@ -8,6 +10,7 @@
 
 import java.lang.reflect.Method;
 
+import com.github.dockerjava.core.RemoteApiVersion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.ITestResult;
@@ -50,6 +53,7 @@ public void afterMethod(ITestResult result) {
 
     @Test(groups = "ignoreInCircleCi")
     public void testStopContainer() throws DockerException {
+        final RemoteApiVersion apiVersion = getVersion(dockerClient);
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         LOG.info("Created container: {}", container.toString());
@@ -63,7 +67,13 @@ public void testStopContainer() throws DockerException {
         LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
 
         assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
-        assertThat(inspectContainerResponse.getState().getExitCode(), not(equalTo(0)));
+
+        final Integer exitCode = inspectContainerResponse.getState().getExitCode();
+        if (apiVersion.equals(VERSION_1_22)) {
+            assertThat(exitCode, is(0));
+        } else {
+            assertThat(exitCode, not(0));
+        }
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java
new file mode 100644
index 000000000..94c8242e5
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java
@@ -0,0 +1,98 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.HostConfig;
+import com.github.dockerjava.api.model.UpdateContainerResponse;
+import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+@Test(groups = "integration")
+public class UpdateContainerCmdExecTest extends AbstractNettyDockerClientTest {
+    public static final Logger LOG = LoggerFactory.getLogger(UpdateContainerCmdExecTest.class);
+    private static final String BUSYBOX_IMAGE = "busybox";
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void updateContainer() throws DockerException, IOException {
+        CreateContainerResponse response = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
+                .withCmd("sleep", "9999")
+                .exec();
+        String containerId = response.getId();
+        dockerClient.startContainerCmd(containerId).exec();
+
+        InspectContainerResponse inspectBefore = dockerClient.inspectContainerCmd(containerId).exec();
+        final HostConfig beforeHostConfig = inspectBefore.getHostConfig();
+
+        final UpdateContainerResponse updateResponse = dockerClient.updateContainerCmd(containerId)
+                .withBlkioWeight(300)
+                .withCpuShares(512)
+                .withCpuPeriod(100000)
+                .withCpuQuota(50000)
+//                .withCpusetCpus("0") // depends on env
+                .withCpusetMems("0")
+                .withMemory(314572800L)
+                .withMemorySwap(514288000L)
+                .withMemoryReservation(209715200L)
+//                .withKernelMemory(52428800) Can not update kernel memory to a running container, please stop it first.
+                .exec();
+
+        // docker toolbox 1.10.1
+        assertThat(updateResponse.getWarnings(), hasSize(1));
+        assertThat(updateResponse.getWarnings().get(0),
+                is("Your kernel does not support Block I/O weight. Weight discarded."));
+
+        InspectContainerResponse inspectAfter = dockerClient.inspectContainerCmd(containerId).exec();
+        final HostConfig afterHostConfig = inspectAfter.getHostConfig();
+
+        assertThat(afterHostConfig.getMemory(),
+                is(314572800L));
+
+//        assertThat(afterHostConfig.getBlkioWeight(), is(300));
+        assertThat(afterHostConfig.getCpuShares(), is(512));
+        assertThat(afterHostConfig.getCpuPeriod(), is(100000));
+        assertThat(afterHostConfig.getCpuQuota(), is(50000));
+        assertThat(afterHostConfig.getCpusetMems(), is("0"));
+
+        assertThat(afterHostConfig.getMemoryReservation(), is(209715200L));
+        assertThat(afterHostConfig.getMemorySwap(), is(514288000L));
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/test/serdes/JSONSamples.java b/src/test/java/com/github/dockerjava/test/serdes/JSONSamples.java
new file mode 100644
index 000000000..1b5337aa6
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/test/serdes/JSONSamples.java
@@ -0,0 +1,66 @@
+package com.github.dockerjava.test.serdes;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotSame;
+
+/**
+ * Samples helper
+ *
+ * @author Kanstantsin Shautsou
+ */
+public class JSONSamples {
+
+    /**
+     * Access to samples storage.
+     *
+     * @param version docker version of json sample
+     * @param context path to file for interested dump
+     * @return Content of JSON sample
+     * @throws IOException
+     */
+    public static String getSampleContent(RemoteApiVersion version, String context) throws IOException {
+        File resource = new File("src/test/resources/samples/" + version.getVersion() + "/" + context);
+        return FileUtils.readFileToString(resource, "UTF-8");
+    }
+
+    public static <TClass> TClass testRoundTrip(RemoteApiVersion version, String context,
+                                                JavaType type) throws IOException {
+        ObjectMapper mapper = new ObjectMapper();
+        final TClass tObject = mapper.readValue(getSampleContent(version, context), type);
+        return testRoundTrip(tObject, type);
+    }
+
+    /**
+     * Same as {@link JSONTestHelper#testRoundTrip(java.lang.Object, java.lang.Class)}
+     * but via {@link TypeReference}
+     */
+    public static <TClass> TClass testRoundTrip(TClass item, JavaType type)
+            throws IOException, AssertionError {
+        ObjectMapper mapper = new ObjectMapper();
+
+        String serialized1 = mapper.writeValueAsString(item);
+        JsonNode json1 = mapper.readTree(serialized1);
+
+        TClass deserialized1 = mapper.readValue(serialized1, type);
+        String serialized2 = mapper.writeValueAsString(deserialized1);
+
+        JsonNode json2 = mapper.readTree(serialized2);
+        TClass deserialized2 = mapper.readValue(serialized2, type);
+
+        assertEquals(json2, json1, "JSONs must be equal after the second roundtrip");
+        assertEquals(deserialized2, deserialized2, "Objects must be equal after the second roundtrip");
+        assertNotSame(deserialized2, deserialized1, "Objects must be not the same");
+
+        return deserialized2;
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java b/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
index 8cacb6c5e..99a90f0af 100644
--- a/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
+++ b/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
@@ -29,10 +29,6 @@
 /**
  * Provides helper methods for serialization-deserialization tests.
  *
- * <p>
- * <b>TODO</b>: Create helper that loads json files from simple folder structure using a type, version number, and name.
- * </p>
- *
  * @author Oleg Nenashev
  */
 public class JSONTestHelper {
diff --git a/src/test/resources/samples/1.22/containers/container/json/1.json b/src/test/resources/samples/1.22/containers/container/json/1.json
new file mode 100644
index 000000000..6cb71cc82
--- /dev/null
+++ b/src/test/resources/samples/1.22/containers/container/json/1.json
@@ -0,0 +1,151 @@
+{
+  "Id": "095351afe7b4995dfb3e965f9cfd3a07b1fe69198c50085a2cb7c2b5a5c9b62f",
+  "Created": "2016-02-16T22:40:51.465045919Z",
+  "Path": "echo",
+  "Args": [],
+  "State": {
+    "Status": "created",
+    "Running": false,
+    "Paused": false,
+    "Restarting": false,
+    "OOMKilled": false,
+    "Dead": false,
+    "Pid": 0,
+    "ExitCode": 0,
+    "Error": "",
+    "StartedAt": "0001-01-01T00:00:00Z",
+    "FinishedAt": "0001-01-01T00:00:00Z"
+  },
+  "Image": "sha256:0cb40641836c461bc97c793971d84d758371ed682042457523e4ae701efe7ec9",
+  "ResolvConfPath": "",
+  "HostnamePath": "",
+  "HostsPath": "",
+  "LogPath": "",
+  "Name": "/drunk_golick",
+  "RestartCount": 0,
+  "Driver": "aufs",
+  "MountLabel": "",
+  "ProcessLabel": "",
+  "AppArmorProfile": "",
+  "ExecIDs": null,
+  "HostConfig": {
+    "Binds": null,
+    "ContainerIDFile": "",
+    "LogConfig": {
+      "Type": "json-file",
+      "Config": {}
+    },
+    "NetworkMode": "default",
+    "PortBindings": null,
+    "RestartPolicy": {
+      "Name": "",
+      "MaximumRetryCount": 0
+    },
+    "VolumeDriver": "",
+    "VolumesFrom": null,
+    "CapAdd": null,
+    "CapDrop": null,
+    "Dns": null,
+    "DnsOptions": null,
+    "DnsSearch": null,
+    "ExtraHosts": null,
+    "GroupAdd": null,
+    "IpcMode": "",
+    "Links": null,
+    "OomScoreAdj": 0,
+    "PidMode": "",
+    "Privileged": false,
+    "PublishAllPorts": false,
+    "ReadonlyRootfs": false,
+    "SecurityOpt": null,
+    "UTSMode": "",
+    "ShmSize": 67108864,
+    "ConsoleSize": [
+      0,
+      0
+    ],
+    "Isolation": "",
+    "CpuShares": 0,
+    "CgroupParent": "",
+    "BlkioWeight": 0,
+    "BlkioWeightDevice": null,
+    "BlkioDeviceReadBps": null,
+    "BlkioDeviceWriteBps": null,
+    "BlkioDeviceReadIOps": null,
+    "BlkioDeviceWriteIOps": null,
+    "CpuPeriod": 0,
+    "CpuQuota": 0,
+    "CpusetCpus": "",
+    "CpusetMems": "",
+    "Devices": null,
+    "KernelMemory": 0,
+    "Memory": 0,
+    "MemoryReservation": 0,
+    "MemorySwap": 0,
+    "MemorySwappiness": -1,
+    "OomKillDisable": false,
+    "PidsLimit": 0,
+    "Ulimits": null
+  },
+  "GraphDriver": {
+    "Name": "aufs",
+    "Data": null
+  },
+  "Mounts": [],
+  "Config": {
+    "Hostname": "095351afe7b4",
+    "Domainname": "",
+    "User": "",
+    "AttachStdin": false,
+    "AttachStdout": false,
+    "AttachStderr": false,
+    "Tty": false,
+    "OpenStdin": false,
+    "StdinOnce": false,
+    "Env": null,
+    "Cmd": [
+      "echo"
+    ],
+    "Image": "busybox",
+    "Volumes": null,
+    "WorkingDir": "",
+    "Entrypoint": null,
+    "OnBuild": null,
+    "Labels": {}
+  },
+  "NetworkSettings": {
+    "Bridge": "",
+    "SandboxID": "",
+    "HairpinMode": false,
+    "LinkLocalIPv6Address": "",
+    "LinkLocalIPv6PrefixLen": 0,
+    "Ports": null,
+    "SandboxKey": "",
+    "SecondaryIPAddresses": null,
+    "SecondaryIPv6Addresses": null,
+    "EndpointID": "",
+    "Gateway": "",
+    "GlobalIPv6Address": "",
+    "GlobalIPv6PrefixLen": 0,
+    "IPAddress": "",
+    "IPPrefixLen": 0,
+    "IPv6Gateway": "",
+    "MacAddress": "",
+    "Networks": {
+      "bridge": {
+        "IPAMConfig": null,
+        "Links": null,
+        "Aliases": null,
+        "NetworkID": "",
+        "EndpointID": "",
+        "Gateway": "",
+        "IPAddress": "",
+        "IPPrefixLen": 0,
+        "IPv6Gateway": "",
+        "GlobalIPv6Address": "",
+        "GlobalIPv6PrefixLen": 0,
+        "MacAddress": ""
+      }
+    }
+  }
+}
diff --git a/src/test/resources/samples/1.22/containers/container/update/docs.json b/src/test/resources/samples/1.22/containers/container/update/docs.json
new file mode 100644
index 000000000..9d26fcb2f
--- /dev/null
+++ b/src/test/resources/samples/1.22/containers/container/update/docs.json
@@ -0,0 +1,12 @@
+{
+  "BlkioWeight": 300,
+  "CpuShares": 512,
+  "CpuPeriod": 100000,
+  "CpuQuota": 50000,
+  "CpusetCpus": "0,1",
+  "CpusetMems": "0",
+  "Memory": 314572800,
+  "MemorySwap": 514288000,
+  "MemoryReservation": 209715200,
+  "KernelMemory": 52428800
+}
diff --git a/src/test/resources/samples/1.22/containers/create/docs.json b/src/test/resources/samples/1.22/containers/create/docs.json
new file mode 100644
index 000000000..4bafc3cb5
--- /dev/null
+++ b/src/test/resources/samples/1.22/containers/create/docs.json
@@ -0,0 +1,131 @@
+{
+  "Hostname": "",
+  "Domainname": "",
+  "User": "",
+  "AttachStdin": false,
+  "AttachStdout": true,
+  "AttachStderr": true,
+  "Tty": false,
+  "OpenStdin": false,
+  "StdinOnce": false,
+  "Env": [
+    "FOO=bar",
+    "BAZ=quux"
+  ],
+  "Cmd": [
+    "date"
+  ],
+  "Entrypoint": "",
+  "Image": "ubuntu",
+  "Labels": {
+    "com.example.vendor": "Acme",
+    "com.example.license": "GPL",
+    "com.example.version": "1.0"
+  },
+  "Mounts": [
+    {
+      "Name": "fac362...80535",
+      "Source": "/data",
+      "Destination": "/data",
+      "Driver": "local",
+      "Mode": "ro,Z",
+      "RW": false,
+      "Propagation": ""
+    }
+  ],
+  "WorkingDir": "",
+  "NetworkDisabled": false,
+  "MacAddress": "12:34:56:78:9a:bc",
+  "ExposedPorts": {
+    "22/tcp": {}
+  },
+  "StopSignal": "SIGTERM",
+  "HostConfig": {
+    "Binds": [
+      "/tmp:/tmp"
+    ],
+    "Links": [
+      "redis3:redis"
+    ],
+    "Memory": 0,
+    "MemorySwap": 0,
+    "MemoryReservation": 0,
+    "KernelMemory": 0,
+    "CpuShares": 512,
+    "CpuPeriod": 100000,
+    "CpuQuota": 50000,
+    "CpusetCpus": "0,1",
+    "CpusetMems": "0,1",
+    "BlkioWeight": 300,
+    "BlkioWeightDevice": [
+      {}
+    ],
+    "BlkioDeviceReadBps": [
+      {}
+    ],
+    "BlkioDeviceReadIOps": [
+      {}
+    ],
+    "BlkioDeviceWriteBps": [
+      {}
+    ],
+    "BlkioDeviceWriteIOps": [
+      {}
+    ],
+    "MemorySwappiness": 60,
+    "OomKillDisable": false,
+    "OomScoreAdj": 500,
+    "PortBindings": {
+      "22/tcp": [
+        {
+          "HostPort": "11022"
+        }
+      ]
+    },
+    "PublishAllPorts": false,
+    "Privileged": false,
+    "ReadonlyRootfs": false,
+    "Dns": [
+      "8.8.8.8"
+    ],
+    "DnsOptions": [
+      ""
+    ],
+    "DnsSearch": [
+      ""
+    ],
+    "ExtraHosts": null,
+    "VolumesFrom": [
+      "parent",
+      "other:ro"
+    ],
+    "CapAdd": [
+      "NET_ADMIN"
+    ],
+    "CapDrop": [
+      "MKNOD"
+    ],
+    "GroupAdd": [
+      "newgroup"
+    ],
+    "RestartPolicy": {
+      "Name": "",
+      "MaximumRetryCount": 0
+    },
+    "NetworkMode": "bridge",
+    "Devices": [],
+    "Ulimits": [
+      {}
+    ],
+    "LogConfig": {
+      "Type": "json-file",
+      "Config": {}
+    },
+    "SecurityOpt": [
+      ""
+    ],
+    "CgroupParent": "",
+    "VolumeDriver": "",
+    "ShmSize": 67108864
+  }
+}
diff --git a/src/test/resources/samples/1.22/containers/json/filter1.json b/src/test/resources/samples/1.22/containers/json/filter1.json
new file mode 100644
index 000000000..159e62da6
--- /dev/null
+++ b/src/test/resources/samples/1.22/containers/json/filter1.json
@@ -0,0 +1,37 @@
+[
+  {
+    "Id": "095351afe7b4995dfb3e965f9cfd3a07b1fe69198c50085a2cb7c2b5a5c9b62f",
+    "Names": [
+      "/drunk_golick"
+    ],
+    "Image": "busybox",
+    "ImageID": "sha256:0cb40641836c461bc97c793971d84d758371ed682042457523e4ae701efe7ec9",
+    "Command": "echo",
+    "Created": 1455662451,
+    "Ports": [],
+    "SizeRootFs": 1113554,
+    "Labels": {},
+    "Status": "Up Less than a second",
+    "HostConfig": {
+      "NetworkMode": "default"
+    },
+    "NetworkSettings": {
+      "Networks": {
+        "bridge": {
+          "IPAMConfig": null,
+          "Links": null,
+          "Aliases": null,
+          "NetworkID": "",
+          "EndpointID": "f69f5cff77b527c829bc45d71ba8c5eabca005ef3a8da8c7ee88c13ffc1ab602",
+          "Gateway": "172.17.0.1",
+          "IPAddress": "172.17.0.2",
+          "IPPrefixLen": 16,
+          "IPv6Gateway": "",
+          "GlobalIPv6Address": "",
+          "GlobalIPv6PrefixLen": 0,
+          "MacAddress": "02:42:ac:11:00:02"
+        }
+      }
+    }
+  }
+]
diff --git a/src/test/resources/samples/1.22/exec/ID/1.json b/src/test/resources/samples/1.22/exec/ID/1.json
new file mode 100644
index 000000000..f06c807af
--- /dev/null
+++ b/src/test/resources/samples/1.22/exec/ID/1.json
@@ -0,0 +1,18 @@
+{
+  "ID": "1ca2ca598fab202f86dd9281196c405456069013958a475396b707e85c56473b",
+  "Running": false,
+  "ExitCode": null,
+  "ProcessConfig": {
+    "tty": false,
+    "entrypoint": "/bin/bash",
+    "arguments": [],
+    "privileged": false,
+    "user": ""
+  },
+  "OpenStdin": false,
+  "OpenStderr": true,
+  "OpenStdout": true,
+  "CanRemove": false,
+  "ContainerID": "ffa39805f089af3099e36452a985481f96170a9dff40be69d34d1722c7660d38",
+  "DetachKeys": ""
+}
diff --git a/src/test/resources/samples/1.22/info/1.json b/src/test/resources/samples/1.22/info/1.json
new file mode 100644
index 000000000..42ceb1b6e
--- /dev/null
+++ b/src/test/resources/samples/1.22/info/1.json
@@ -0,0 +1,91 @@
+{
+  "ID": "HLN2:5SBU:SRQR:CQI6:AB52:LZZ2:DED5:REDM:BU73:JFHE:R37A:5HMX",
+  "Containers": 2,
+  "ContainersRunning": 2,
+  "ContainersPaused": 10,
+  "ContainersStopped": 3,
+  "Images": 13,
+  "Driver": "aufs",
+  "DriverStatus": [
+    [
+      "Root Dir",
+      "/mnt/sda1/var/lib/docker/aufs"
+    ],
+    [
+      "Backing Filesystem",
+      "extfs"
+    ],
+    [
+      "Dirs",
+      "31"
+    ],
+    [
+      "Dirperm1 Supported",
+      "true"
+    ]
+  ],
+  "SystemStatus": null,
+  "Plugins": {
+    "Volume": [
+      "local"
+    ],
+    "Network": [
+      "bridge",
+      "null",
+      "host"
+    ],
+    "Authorization": null
+  },
+  "MemoryLimit": true,
+  "SwapLimit": true,
+  "CpuCfsPeriod": true,
+  "CpuCfsQuota": true,
+  "CPUShares": true,
+  "CPUSet": true,
+  "IPv4Forwarding": true,
+  "BridgeNfIptables": true,
+  "BridgeNfIp6tables": true,
+  "Debug": true,
+  "NFd": 24,
+  "OomKillDisable": true,
+  "NGoroutines": 40,
+  "SystemTime": "2016-02-17T14:56:35.212841831Z",
+  "ExecutionDriver": "native-0.2",
+  "LoggingDriver": "json-file",
+  "NEventsListener": 0,
+  "KernelVersion": "4.1.17-boot2docker",
+  "OperatingSystem": "Boot2Docker 1.10.1 (TCL 6.4.1); master : b03e158 - Thu Feb 11 22:34:01 UTC 2016",
+  "OSType": "linux",
+  "Architecture": "x86_64",
+  "IndexServerAddress": "https://index.docker.io/v1/",
+  "RegistryConfig": {
+    "InsecureRegistryCIDRs": [
+      "127.0.0.0/8"
+    ],
+    "IndexConfigs": {
+      "docker.io": {
+        "Name": "docker.io",
+        "Mirrors": null,
+        "Secure": true,
+        "Official": true
+      }
+    },
+    "Mirrors": null
+  },
+  "InitSha1": "",
+  "InitPath": "/usr/local/bin/docker",
+  "NCPU": 1,
+  "MemTotal": 1044574208,
+  "DockerRootDir": "/mnt/sda1/var/lib/docker",
+  "HttpProxy": "",
+  "HttpsProxy": "",
+  "NoProxy": "",
+  "Name": "docker-java",
+  "Labels": [
+    "provider=virtualbox"
+  ],
+  "ExperimentalBuild": false,
+  "ServerVersion": "1.10.1",
+  "ClusterStore": "",
+  "ClusterAdvertise": ""
+}
diff --git a/src/test/resources/samples/1.22/info/docs.json b/src/test/resources/samples/1.22/info/docs.json
new file mode 100644
index 000000000..537a0a1d2
--- /dev/null
+++ b/src/test/resources/samples/1.22/info/docs.json
@@ -0,0 +1,76 @@
+{
+  "Architecture": "x86_64",
+  "Containers": 11,
+  "ContainersRunning": 7,
+  "ContainersStopped": 3,
+  "ContainersPaused": 1,
+  "CpuCfsPeriod": true,
+  "CpuCfsQuota": true,
+  "Debug": false,
+  "DiscoveryBackend": "etcd://localhost:2379",
+  "DockerRootDir": "/var/lib/docker",
+  "Driver": "btrfs",
+  "DriverStatus": [
+    [
+      ""
+    ]
+  ],
+  "SystemStatus": [
+    [
+      "State",
+      "Healthy"
+    ]
+  ],
+  "Plugins": {
+    "Volume": [
+      "local"
+    ],
+    "Network": [
+      "null",
+      "host",
+      "bridge"
+    ]
+  },
+  "ExecutionDriver": "native-0.1",
+  "ExperimentalBuild": false,
+  "HttpProxy": "http://test:test@localhost:8080",
+  "HttpsProxy": "https://test:test@localhost:8080",
+  "ID": "7TRN:IPZB:QYBB:VPBQ:UMPP:KARE:6ZNR:XE6T:7EWV:PKF4:ZOJD:TPYS",
+  "IPv4Forwarding": true,
+  "Images": 16,
+  "IndexServerAddress": "https://index.docker.io/v1/",
+  "InitPath": "/usr/bin/docker",
+  "InitSha1": "",
+  "KernelVersion": "3.12.0-1-amd64",
+  "Labels": [
+    "storage=ssd"
+  ],
+  "MemTotal": 2099236864,
+  "MemoryLimit": true,
+  "NCPU": 1,
+  "NEventsListener": 0,
+  "NFd": 11,
+  "NGoroutines": 21,
+  "Name": "prod-server-42",
+  "NoProxy": "9.81.1.160",
+  "OomKillDisable": true,
+  "OSType": "linux",
+  "OomScoreAdj": 500,
+  "OperatingSystem": "Boot2Docker",
+  "RegistryConfig": {
+    "IndexConfigs": {
+      "docker.io": {
+        "Mirrors": null,
+        "Name": "docker.io",
+        "Official": true,
+        "Secure": true
+      }
+    },
+    "InsecureRegistryCIDRs": [
+      "127.0.0.0/8"
+    ]
+  },
+  "SwapLimit": false,
+  "SystemTime": "2015-03-10T11:11:23.730591467-07:00",
+  "ServerVersion": "1.9.0"
+}
diff --git a/src/test/resources/samples/1.22/other/AuthConfig/docs1.json b/src/test/resources/samples/1.22/other/AuthConfig/docs1.json
new file mode 100644
index 000000000..5f712fb62
--- /dev/null
+++ b/src/test/resources/samples/1.22/other/AuthConfig/docs1.json
@@ -0,0 +1,5 @@
+{
+  "username": "jdoe",
+  "password": "secret",
+  "email": "jdoe@acme.com"
+}
diff --git a/src/test/resources/samples/1.22/other/AuthConfig/docs2.json b/src/test/resources/samples/1.22/other/AuthConfig/docs2.json
new file mode 100644
index 000000000..8ac70c20a
--- /dev/null
+++ b/src/test/resources/samples/1.22/other/AuthConfig/docs2.json
@@ -0,0 +1,3 @@
+{
+  "registrytoken": "9cbaf023786cd7..."
+}
diff --git a/src/test/resources/samples/1.22/version/1.json b/src/test/resources/samples/1.22/version/1.json
new file mode 100644
index 000000000..454c767ba
--- /dev/null
+++ b/src/test/resources/samples/1.22/version/1.json
@@ -0,0 +1,10 @@
+{
+  "Version": "1.10.1",
+  "ApiVersion": "1.22",
+  "GitCommit": "9e83765",
+  "GoVersion": "go1.5.3",
+  "Os": "linux",
+  "Arch": "amd64",
+  "KernelVersion": "4.1.17-boot2docker",
+  "BuildTime": "2016-02-11T20:39:58.688092588+00:00"
+}

From 0d2562e8da848bd3480d7aff981f6e7dae968f87 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 3 Mar 2016 00:57:25 +0300
Subject: [PATCH 0442/1272] @Nonnull annotation

---
 .../github/dockerjava/api/command/UpdateContainerCmd.java    | 5 ++++-
 .../dockerjava/core/command/UpdateContainerCmdImpl.java      | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
index 3dc7a0773..d7e32e445 100644
--- a/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
@@ -1,11 +1,14 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.model.UpdateContainerResponse;
+import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 
 /**
  * @author Kanstantsin Shautsou
+ * @since {@link RemoteApiVersion#VERSION_1_22}
  */
 public interface UpdateContainerCmd extends SyncDockerCmd<UpdateContainerResponse> {
     @CheckForNull
@@ -16,7 +19,7 @@ public interface UpdateContainerCmd extends SyncDockerCmd<UpdateContainerRespons
 
     public UpdateContainerCmd withBlkioWeight(Integer blkioWeight);
 
-    public UpdateContainerCmd withContainerId(String containerId);
+    public UpdateContainerCmd withContainerId(@Nonnull String containerId);
 
     @CheckForNull
     public Integer getCpuPeriod();
diff --git a/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
index ee95842b2..b8915a802 100644
--- a/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
@@ -11,6 +11,7 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 
 /**
  * @author Kanstantsin Shautsou
@@ -90,7 +91,7 @@ public String getContainerId() {
     /**
      * @see #containerId
      */
-    public UpdateContainerCmd withContainerId(String containerId) {
+    public UpdateContainerCmd withContainerId(@Nonnull String containerId) {
         this.containerId = containerId;
         return this;
     }

From c4e2084a291a360b6fcc841487fdc9ebd198a9e1 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 3 Mar 2016 01:07:34 +0300
Subject: [PATCH 0443/1272] Don't enforce api version for tests.

---
 .../github/dockerjava/client/AbstractDockerClientTest.java   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 1375cc9b6..4c8750ecc 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -10,7 +10,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.LineIterator;
 import org.apache.commons.lang.StringUtils;
@@ -40,8 +39,6 @@ public abstract class AbstractDockerClientTest extends Assert {
 
     public static final Logger LOG = LoggerFactory.getLogger(AbstractDockerClientTest.class);
 
-    private RemoteApiVersion apiVersion = RemoteApiVersion.VERSION_1_22;
-
     protected DockerClient dockerClient;
 
     protected TestDockerCmdExecFactory dockerCmdExecFactory = initTestDockerCmdExecFactory();
@@ -82,7 +79,7 @@ protected DockerClientConfig config(String password) {
             builder = builder.withRegistryPassword(password);
         }
 
-        return builder.withApiVersion(apiVersion).build();
+        return builder.build();
     }
 
     public void afterTest() {

From 2f35beda98f8b5edb1a1c9efa993ef1a0d758cc0 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 3 Mar 2016 01:08:32 +0300
Subject: [PATCH 0444/1272] Condition test

---
 .../core/command/InspectExecCmdImplTest.java        | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
index a21a312aa..d86bcc39e 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
@@ -119,12 +119,19 @@ public void inspectExecNetworkSettings() throws IOException {
         assertThat(exec.getId(), not(isEmptyString()));
 
         InspectExecResponse inspectExecResponse = dockerClient.inspectExecCmd(exec.getId()).exec();
-        assertThat(inspectExecResponse.getExitCode(), is(nullValue()));
+
+        if (apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_22)) {
+            assertThat(inspectExecResponse.getExitCode(), is(nullValue()));
+            assertThat(inspectExecResponse.getCanRemove(), is(false));
+            assertThat(inspectExecResponse.getContainerID(), is(container.getId()));
+        } else {
+            assertThat(inspectExecResponse.getExitCode(), is(0));
+            assertNotNull(inspectExecResponse.getContainer().getNetworkSettings().getNetworks().get("bridge"));
+        }
+
         assertThat(inspectExecResponse.isOpenStdin(), is(false));
         assertThat(inspectExecResponse.isOpenStdout(), is(true));
         assertThat(inspectExecResponse.isRunning(), is(false));
-        assertThat(inspectExecResponse.getCanRemove(), is(false));
-        assertThat(inspectExecResponse.getContainerID(), is(container.getId()));
 
         final InspectExecResponse.Container inspectContainer = inspectExecResponse.getContainer();
         if (apiVersion.isGreaterOrEqual(VERSION_1_22)) {

From 5400925fbdd9b1482cff23a1b304ae2804150792 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 3 Mar 2016 01:14:41 +0300
Subject: [PATCH 0445/1272] Test update only for >= 1.22

---
 .../core/command/UpdateContainerCmdImplTest.java         | 9 ++++++++-
 .../netty/exec/UpdateContainerCmdExecTest.java           | 9 +++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java
index 76708f889..c230fbb02 100644
--- a/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java
@@ -10,6 +10,7 @@
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -20,6 +21,7 @@
 import java.lang.reflect.Method;
 
 import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
+import static com.github.dockerjava.utils.TestUtils.getVersion;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
@@ -55,6 +57,12 @@ public void afterMethod(ITestResult result) {
 
     @Test(groups = "ignoreInCircleCi")
     public void updateContainer() throws DockerException, IOException {
+        final RemoteApiVersion apiVersion = getVersion(dockerClient);
+
+        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_22)) {
+            throw new SkipException("API version should be >= 1.22");
+        }
+
         CreateContainerResponse response = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
                 .withCmd("sleep", "9999")
                 .exec();
@@ -62,7 +70,6 @@ public void updateContainer() throws DockerException, IOException {
         dockerClient.startContainerCmd(containerId).exec();
 
         InspectContainerResponse inspectBefore = dockerClient.inspectContainerCmd(containerId).exec();
-        final HostConfig beforeHostConfig = inspectBefore.getHostConfig();
 
         final UpdateContainerResponse updateResponse = dockerClient.updateContainerCmd(containerId)
                 .withBlkioWeight(300)
diff --git a/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java
index 94c8242e5..e2907dc8a 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java
@@ -5,10 +5,12 @@
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.UpdateContainerResponse;
+import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -18,6 +20,7 @@
 import java.io.IOException;
 import java.lang.reflect.Method;
 
+import static com.github.dockerjava.utils.TestUtils.getVersion;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
@@ -52,6 +55,12 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void updateContainer() throws DockerException, IOException {
+        final RemoteApiVersion apiVersion = getVersion(dockerClient);
+
+        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_22)) {
+            throw new SkipException("API version should be >= 1.22");
+        }
+
         CreateContainerResponse response = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
                 .withCmd("sleep", "9999")
                 .exec();

From e149beea150086099a4218fa704b983b8afb7c91 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 3 Mar 2016 01:52:15 +0300
Subject: [PATCH 0446/1272] Condition test

---
 .../netty/exec/InspectExecCmdExecTest.java          | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
index 3d2b55e24..d0bb5ca1f 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
@@ -120,12 +120,19 @@ public void inspectExecNetworkSettings() throws IOException {
         assertThat(exec.getId(), not(isEmptyString()));
 
         InspectExecResponse inspectExecResponse = dockerClient.inspectExecCmd(exec.getId()).exec();
-        assertThat(inspectExecResponse.getExitCode(), is(nullValue()));
+
+        if (apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_22)) {
+            assertThat(inspectExecResponse.getExitCode(), is(nullValue()));
+            assertThat(inspectExecResponse.getCanRemove(), is(false));
+            assertThat(inspectExecResponse.getContainerID(), is(container.getId()));
+        } else {
+            assertThat(inspectExecResponse.getExitCode(), is(0));
+            assertNotNull(inspectExecResponse.getContainer().getNetworkSettings().getNetworks().get("bridge"));
+        }
+
         assertThat(inspectExecResponse.isOpenStdin(), is(false));
         assertThat(inspectExecResponse.isOpenStdout(), is(true));
         assertThat(inspectExecResponse.isRunning(), is(false));
-        assertThat(inspectExecResponse.getCanRemove(), is(false));
-        assertThat(inspectExecResponse.getContainerID(), is(container.getId()));
 
         final InspectExecResponse.Container inspectContainer = inspectExecResponse.getContainer();
         if (apiVersion.isGreaterOrEqual(VERSION_1_22)) {

From b1d77c51d9fbc4e6d5c60e4a51bd7c196e90675e Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 3 Mar 2016 02:10:02 +0300
Subject: [PATCH 0447/1272] Fix unrelable test.

---
 .../api/command/InspectContainerResponse.java | 63 +++++++++++++++++++
 .../command/StartContainerCmdImplTest.java    | 17 ++---
 .../netty/exec/StartContainerCmdExecTest.java | 23 ++++---
 3 files changed, 87 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index 3a49a4dd4..d19bc0329 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -462,5 +462,68 @@ public String getMode() {
         public Boolean getRW() {
             return rw;
         }
+
+        /**
+         * @see #destination
+         */
+        public Mount withDestination(Volume destination) {
+            this.destination = destination;
+            return this;
+        }
+
+        /**
+         * @see #driver
+         */
+        public Mount withDriver(String driver) {
+            this.driver = driver;
+            return this;
+        }
+
+        /**
+         * @see #mode
+         */
+        public Mount withMode(String mode) {
+            this.mode = mode;
+            return this;
+        }
+
+        /**
+         * @see #name
+         */
+        public Mount withName(String name) {
+            this.name = name;
+            return this;
+        }
+
+        /**
+         * @see #rw
+         */
+        public Mount withRw(Boolean rw) {
+            this.rw = rw;
+            return this;
+        }
+
+        /**
+         * @see #source
+         */
+        public Mount withSource(String source) {
+            this.source = source;
+            return this;
+        }
+
+        @Override
+        public String toString() {
+            return ToStringBuilder.reflectionToString(this);
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            return EqualsBuilder.reflectionEquals(this, o);
+        }
+
+        @Override
+        public int hashCode() {
+            return HashCodeBuilder.reflectionHashCode(this);
+        }
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index 0bc2c9b1a..a2f1e51d8 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -7,6 +7,7 @@
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
@@ -15,6 +16,7 @@
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.List;
 import java.util.UUID;
 
 import org.testng.ITestResult;
@@ -92,15 +94,16 @@ public void startContainerWithVolumes() throws DockerException {
 
         assertThat(inspectContainerResponse, mountedVolumes(containsInAnyOrder(volume1, volume2)));
 
-        assertThat(inspectContainerResponse.getMounts().size(), equalTo(2));
+        final List<InspectContainerResponse.Mount> mounts = inspectContainerResponse.getMounts();
 
-        assertThat(inspectContainerResponse.getMounts().get(0).getDestination(), equalTo(volume1));
-        assertThat(inspectContainerResponse.getMounts().get(0).getMode(), equalTo("ro"));
-        assertThat(inspectContainerResponse.getMounts().get(0).getRW(), equalTo(Boolean.FALSE));
+        assertThat(mounts, hasSize(2));
 
-        assertThat(inspectContainerResponse.getMounts().get(1).getDestination(), equalTo(volume2));
-        assertThat(inspectContainerResponse.getMounts().get(1).getMode(), equalTo("rw"));
-        assertThat(inspectContainerResponse.getMounts().get(1).getRW(), equalTo(Boolean.TRUE));
+        final InspectContainerResponse.Mount mount1 = new InspectContainerResponse.Mount()
+                .withRw(false).withMode("ro").withDestination(volume1).withSource("/src/webapp1");
+        final InspectContainerResponse.Mount mount2 = new InspectContainerResponse.Mount()
+                .withRw(true).withMode("rw").withDestination(volume2).withSource("/src/webapp2");
+
+        assertThat(mounts, containsInAnyOrder(mount1, mount2));
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
index 02b7cd51b..6c70c1f07 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
@@ -7,6 +7,7 @@
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
@@ -15,6 +16,7 @@
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.List;
 import java.util.UUID;
 
 import org.testng.ITestResult;
@@ -73,8 +75,10 @@ public void startContainerWithVolumes() throws DockerException {
 
         Volume volume2 = new Volume("/opt/webapp2");
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withVolumes(volume1, volume2)
-                .withCmd("true").withBinds(new Bind("/src/webapp1", volume1, ro), new Bind("/src/webapp2", volume2))
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withVolumes(volume1, volume2)
+                .withCmd("true")
+                .withBinds(new Bind("/src/webapp1", volume1, ro), new Bind("/src/webapp2", volume2))
                 .exec();
 
         LOG.info("Created container {}", container.toString());
@@ -93,15 +97,16 @@ public void startContainerWithVolumes() throws DockerException {
 
         assertThat(inspectContainerResponse, mountedVolumes(containsInAnyOrder(volume1, volume2)));
 
-        assertThat(inspectContainerResponse.getMounts().size(), equalTo(2));
+        final List<InspectContainerResponse.Mount> mounts = inspectContainerResponse.getMounts();
 
-        assertThat(inspectContainerResponse.getMounts().get(0).getDestination(), equalTo(volume1));
-        assertThat(inspectContainerResponse.getMounts().get(0).getMode(), equalTo("ro"));
-        assertThat(inspectContainerResponse.getMounts().get(0).getRW(), equalTo(Boolean.FALSE));
+        assertThat(mounts, hasSize(2));
 
-        assertThat(inspectContainerResponse.getMounts().get(1).getDestination(), equalTo(volume2));
-        assertThat(inspectContainerResponse.getMounts().get(1).getMode(), equalTo("rw"));
-        assertThat(inspectContainerResponse.getMounts().get(1).getRW(), equalTo(Boolean.TRUE));
+        final InspectContainerResponse.Mount mount1 = new InspectContainerResponse.Mount()
+                .withRw(false).withMode("ro").withDestination(volume1).withSource("/src/webapp1");
+        final InspectContainerResponse.Mount mount2 = new InspectContainerResponse.Mount()
+                .withRw(true).withMode("rw").withDestination(volume2).withSource("/src/webapp2");
+
+        assertThat(mounts, containsInAnyOrder(mount1, mount2));
     }
 
     @Test

From a0ec66f12c396e56e6148fc3e69fe2713620202a Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 4 Mar 2016 13:09:27 +0300
Subject: [PATCH 0448/1272] Fix versioning Auth issues for unknown API
 connections.

Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
---
 .../dockerjava/core/RemoteApiVersion.java       |  2 +-
 .../dockerjava/jaxrs/AbstrDockerCmdExec.java    | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index e15cccc88..992125414 100644
--- a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -60,7 +60,7 @@ public class RemoteApiVersion implements Serializable {
     /**
      * Unknown, docker doesn't reflect reality. I.e. we implemented method, but for javadoc it not clear when it was added.
      */
-    private static final RemoteApiVersion UNKNOWN_VERSION = new RemoteApiVersion(0, 0) {
+    public static final RemoteApiVersion UNKNOWN_VERSION = new RemoteApiVersion(0, 0) {
 
         @Override
         public boolean isGreaterOrEqual(final RemoteApiVersion other) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
index 750114b11..ad819468a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
@@ -1,11 +1,14 @@
 package com.github.dockerjava.jaxrs;
 
+import static com.github.dockerjava.core.RemoteApiVersion.UNKNOWN_VERSION;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_19;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.IOException;
 
 import javax.ws.rs.client.WebTarget;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.commons.codec.binary.Base64;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -46,10 +49,18 @@ protected String registryAuth(AuthConfig authConfig) {
     protected String registryConfigs(AuthConfigurations authConfigs) {
         try {
             final String json;
-            if (dockerClientConfig.getApiVersion().isGreaterOrEqual(RemoteApiVersion.VERSION_1_19)) {
-                json = new ObjectMapper().writeValueAsString(authConfigs.getConfigs());
+            final ObjectMapper objectMapper = new ObjectMapper();
+            final RemoteApiVersion apiVersion = dockerClientConfig.getApiVersion();
+
+            if (apiVersion.equals(UNKNOWN_VERSION)) {
+                ObjectNode rootNode = objectMapper.valueToTree(authConfigs.getConfigs()); // all registries
+                final ObjectNode authNodes = objectMapper.valueToTree(authConfigs); // wrapped in "configs":{}
+                rootNode.setAll(authNodes); // merge 2 variants
+                json = rootNode.toString();
+            } else if (apiVersion.isGreaterOrEqual(VERSION_1_19)) {
+                json = objectMapper.writeValueAsString(authConfigs.getConfigs());
             } else {
-                json = new ObjectMapper().writeValueAsString(authConfigs);
+                json = objectMapper.writeValueAsString(authConfigs);
             }
 
             return Base64.encodeBase64String(json.getBytes());

From 241257cc8d53bb1de394358d18d7d57984a21501 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 4 Mar 2016 16:37:06 +0300
Subject: [PATCH 0449/1272] Fix netty auth.

---
 .../dockerjava/jaxrs/BuildImageCmdExec.java     | 10 ++++++----
 .../netty/exec/AbstrDockerCmdExec.java          | 17 ++++++++++++++---
 .../netty/exec/BuildImageCmdExec.java           |  5 +++--
 .../netty/exec/BuildImageCmdExecTest.java       |  7 +++++--
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index ec6be7fe1..dc642f1a6 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -37,7 +37,7 @@ public BuildImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClient
 
     private Invocation.Builder resourceWithOptionalAuthConfig(BuildImageCmd command, Invocation.Builder request) {
         final AuthConfigurations authConfigs = firstNonNull(command.getBuildAuthConfigs(), getBuildAuthConfigs());
-        if (authConfigs != null) {
+        if (authConfigs != null && !authConfigs.getConfigs().isEmpty()) {
             request = request.header("X-Registry-Config", registryConfigs(authConfigs));
         }
         return request;
@@ -113,8 +113,10 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
 
         LOGGER.trace("POST: {}", webTarget);
 
-        return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(BuildResponseItem.class), resultCallback,
-                resourceWithOptionalAuthConfig(command, webTarget.request()).accept(MediaType.TEXT_PLAIN), entity(
-                        command.getTarInputStream(), "application/tar"));
+        return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(BuildResponseItem.class),
+                resultCallback,
+                resourceWithOptionalAuthConfig(command, webTarget.request()).accept(MediaType.TEXT_PLAIN),
+                entity(command.getTarInputStream(), "application/tar")
+        );
     }
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/AbstrDockerCmdExec.java
index 5cf36a0a4..85763b403 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/AbstrDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/AbstrDockerCmdExec.java
@@ -1,9 +1,12 @@
 package com.github.dockerjava.netty.exec;
 
+import static com.github.dockerjava.core.RemoteApiVersion.UNKNOWN_VERSION;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_19;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.IOException;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.commons.codec.binary.Base64;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -45,10 +48,18 @@ protected String registryAuth(AuthConfig authConfig) {
     protected String registryConfigs(AuthConfigurations authConfigs) {
         try {
             final String json;
-            if (dockerClientConfig.getApiVersion().isGreaterOrEqual(RemoteApiVersion.VERSION_1_19)) {
-                json = new ObjectMapper().writeValueAsString(authConfigs.getConfigs());
+            final ObjectMapper objectMapper = new ObjectMapper();
+            final RemoteApiVersion apiVersion = dockerClientConfig.getApiVersion();
+
+            if (apiVersion.equals(UNKNOWN_VERSION)) {
+                ObjectNode rootNode = objectMapper.valueToTree(authConfigs.getConfigs()); // all registries
+                final ObjectNode authNodes = objectMapper.valueToTree(authConfigs); // wrapped in "configs":{}
+                rootNode.setAll(authNodes); // merge 2 variants
+                json = rootNode.toString();
+            } else if (apiVersion.isGreaterOrEqual(VERSION_1_19)) {
+                json = objectMapper.writeValueAsString(authConfigs.getConfigs());
             } else {
-                json = new ObjectMapper().writeValueAsString(authConfigs);
+                json = objectMapper.writeValueAsString(authConfigs);
             }
 
             return Base64.encodeBase64String(json.getBytes());
diff --git a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
index ba09fa743..155ceef6a 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
@@ -28,7 +28,7 @@ public BuildImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClient
 
     private InvocationBuilder resourceWithOptionalAuthConfig(BuildImageCmd command, InvocationBuilder request) {
         final AuthConfigurations authConfigs = firstNonNull(command.getBuildAuthConfigs(), getBuildAuthConfigs());
-        if (authConfigs != null) {
+        if (authConfigs != null && !authConfigs.getConfigs().isEmpty()) {
             request = request.header("X-Registry-Config", registryConfigs(authConfigs));
         }
         return request;
@@ -96,7 +96,8 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
         LOGGER.trace("POST: {}", webTarget);
 
         InvocationBuilder builder = resourceWithOptionalAuthConfig(command, webTarget.request())
-                .accept(MediaType.APPLICATION_JSON).header("Content-Type", "application/tar")
+                .accept(MediaType.APPLICATION_JSON)
+                .header("Content-Type", "application/tar")
                 .header("encoding", "gzip");
 
         builder.post(new TypeReference<BuildResponseItem>() {
diff --git a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
index 8a19c7eb9..1299cf6ae 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
@@ -287,8 +287,11 @@ public void testBuildFromPrivateRegistry() throws Exception {
         AuthConfigurations authConfigurations = new AuthConfigurations();
         authConfigurations.addConfig(authConfig);
 
-        imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).withBuildAuthConfigs(authConfigurations)
-                .exec(new BuildImageResultCallback()).awaitImageId();
+        imageId = dockerClient.buildImageCmd(baseDir)
+                .withNoCache(true)
+                .withBuildAuthConfigs(authConfigurations)
+                .exec(new BuildImageResultCallback())
+                .awaitImageId();
 
         inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
         assertThat(inspectImageResponse, not(nullValue()));

From ac439d50b7b227fadde209da10a09b6fc3be7bc2 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 4 Mar 2016 21:29:34 +0100
Subject: [PATCH 0450/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1fd6b848..76b00b30d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,11 +5,13 @@ Change Log
 ---
 Notes
 
-* The upcoming release will contain multiple API breaking changes therefore the major version switch. It will support a subset of v.1.21 of the docker remote API. It also includes an experimental netty based implementation of `DockerCmdExecFactory` that probably will replace the current jersey/httpclient based one in a later release.
+* The upcoming release will contain multiple API breaking changes therefore the major version switch. It will support a subset of v.1.22 of the docker remote API. It also includes an experimental netty based implementation of `DockerCmdExecFactory` that probably will replace the current jersey/httpclient based one in a later release.
 * The configuration has been changed to better match the docker CLI configuration options. The properties file was renamed from `docker.io.properties` to `docker-java.properties`. See README.md for details.
 
 All changes
 
+* [#488] (https://github.com/docker-java/docker-java/pull/488) Support remote API 1.22 subset
+
 Included in 3.0.0-RC2
 * [#486] (https://github.com/docker-java/docker-java/pull/486) Fix NegativeArraySizeException in awaitCompletion()
 * [#472] (https://github.com/docker-java/docker-java/pull/472) Exec start command: detect end of STDIN stream 

From 7c27d149876c19bb233f7dc865bee163a0aa601e Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 4 Mar 2016 21:45:52 +0100
Subject: [PATCH 0451/1272] [maven-release-plugin] prepare release
 docker-java-3.0.0-RC3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2b5fe2119..1c5d9d1c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>3.0.0-RC3</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>docker-java-3.0.0-RC3</tag>
 	</scm>
 
 	<developers>

From d084518e82cbddc2ea9dcc32a6255edf63931331 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 4 Mar 2016 21:45:57 +0100
Subject: [PATCH 0452/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1c5d9d1c4..2b5fe2119 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.0-RC3</version>
+	<version>3.0.0-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>docker-java-3.0.0-RC3</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From d4d07280bef7649e7025c3d84492b1ff11b9d565 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 4 Mar 2016 21:50:00 +0100
Subject: [PATCH 0453/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76b00b30d..9a91e105f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ Notes
 
 All changes
 
+Included in 3.0.0-RC3
 * [#488] (https://github.com/docker-java/docker-java/pull/488) Support remote API 1.22 subset
 
 Included in 3.0.0-RC2

From b3b6315656c846852554166e91b1a35323e914d2 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 4 Mar 2016 21:51:15 +0100
Subject: [PATCH 0454/1272] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4205fa95e..0822de006 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ Run build without integration tests:
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>2.2.1</version>
+          <version>2.2.3</version>
     </dependency>
     
 ### Latest release candidate
@@ -72,7 +72,7 @@ Run build without integration tests:
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>3.0.0-RC2</version>
+          <version>3.0.0-RC3</version>
     </dependency>
     
 ### Latest development version

From 6d90bc30c4c1c8132be89570039ac2dc90fe6226 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 4 Mar 2016 21:54:30 +0100
Subject: [PATCH 0455/1272] Update README.md

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0822de006..3601be462 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,6 @@
 
 Java API client for [Docker](http://docs.docker.io/ "Docker")
 
-Supports a subset of the Docker Remote API [v1.19](https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.19.md), Docker Server version 1.7.x
-
 <b>The current implementation is based on Jersey 2.x and therefore classpath incompatible with older Jersey 1.x dependent libraries!</b>
 
 Developer forum for [docker-java](https://groups.google.com/forum/?#!forum/docker-java-dev "docker-java")
@@ -16,7 +14,6 @@ Developer forum for [docker-java](https://groups.google.com/forum/?#!forum/docke
 
 * Java 1.7
 * Maven 3.0.5
-* Docker 1.7.x
 
 If you need SSL, then you'll need to put your `*.pem` file into `~/.docker/`, if you're using boot2docker, do this: 
  
@@ -60,6 +57,7 @@ Run build without integration tests:
 ## Docker-Java maven dependencies
 
 ### Latest release version
+Supports a subset of the Docker Remote API [v1.19](https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.19.md), Docker Server version 1.7.x
 
     <dependency>
           <groupId>com.github.docker-java</groupId>
@@ -68,6 +66,7 @@ Run build without integration tests:
     </dependency>
     
 ### Latest release candidate
+Supports a subset of the Docker Remote API [v1.22](https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.22.md), Docker Server version 1.10.x
 
     <dependency>
           <groupId>com.github.docker-java</groupId>
@@ -76,6 +75,8 @@ Run build without integration tests:
     </dependency>
     
 ### Latest development version
+Supports a subset of the Docker Remote API [v1.22](https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.22.md), Docker Server version 1.10.x
+
 You can find the latest development version including javadoc and source files on [Sonatypes OSS repository](https://oss.sonatype.org/content/groups/public/com/github/docker-java/docker-java/).
 
     <dependency>

From ad8643f54e808d2eeca6657c14f0b02afe198ddd Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 10 Mar 2016 00:51:32 +0300
Subject: [PATCH 0456/1272] Cleanup modifiers.

---
 .../github/dockerjava/api/DockerClient.java   | 108 ++++----
 .../dockerjava/api/command/AuthCmd.java       |   8 +-
 .../dockerjava/api/command/BuildImageCmd.java |  64 ++---
 .../dockerjava/api/command/CommitCmd.java     |  86 +++----
 .../api/command/ConnectToNetworkCmd.java      |  10 +-
 .../api/command/ContainerDiffCmd.java         |  10 +-
 .../command/CopyArchiveFromContainerCmd.java  |  16 +-
 .../api/command/CopyFileFromContainerCmd.java |  16 +-
 .../api/command/CreateContainerCmd.java       | 238 +++++++++---------
 .../api/command/CreateImageCmd.java           |  14 +-
 .../api/command/CreateNetworkCmd.java         |  16 +-
 .../api/command/CreateVolumeCmd.java          |  14 +-
 .../api/command/DisconnectFromNetworkCmd.java |  10 +-
 .../dockerjava/api/command/DockerCmd.java     |   2 +-
 .../api/command/DockerCmdAsyncExec.java       |   2 +-
 .../api/command/DockerCmdExecFactory.java     | 102 ++++----
 .../api/command/DockerCmdSyncExec.java        |   2 +-
 .../dockerjava/api/command/EventsCmd.java     |  22 +-
 .../dockerjava/api/command/ExecCreateCmd.java |  24 +-
 .../dockerjava/api/command/ExecStartCmd.java  |  20 +-
 .../dockerjava/api/command/InfoCmd.java       |   2 +-
 .../api/command/InspectContainerCmd.java      |   8 +-
 .../api/command/InspectExecCmd.java           |   8 +-
 .../api/command/InspectImageCmd.java          |   8 +-
 .../api/command/InspectNetworkCmd.java        |   8 +-
 .../api/command/InspectVolumeCmd.java         |   6 +-
 .../api/command/KillContainerCmd.java         |  12 +-
 .../api/command/ListContainersCmd.java        |  32 +--
 .../dockerjava/api/command/ListImagesCmd.java |  18 +-
 .../api/command/ListNetworksCmd.java          |   4 +-
 .../api/command/ListVolumesCmd.java           |   6 +-
 .../api/command/LogContainerCmd.java          |  34 +--
 .../api/command/PauseContainerCmd.java        |   8 +-
 .../dockerjava/api/command/PingCmd.java       |   2 +-
 .../dockerjava/api/command/PullImageCmd.java  |  18 +-
 .../dockerjava/api/command/PushImageCmd.java  |  16 +-
 .../api/command/RemoveContainerCmd.java       |  16 +-
 .../api/command/RemoveImageCmd.java           |  16 +-
 .../api/command/RemoveNetworkCmd.java         |   8 +-
 .../api/command/RemoveVolumeCmd.java          |   8 +-
 .../api/command/RestartContainerCmd.java      |  12 +-
 .../dockerjava/api/command/SaveImageCmd.java  |  12 +-
 .../api/command/SearchImagesCmd.java          |   6 +-
 .../api/command/StartContainerCmd.java        |   4 +-
 .../dockerjava/api/command/StatsCmd.java      |   6 +-
 .../api/command/StopContainerCmd.java         |  12 +-
 .../dockerjava/api/command/SyncDockerCmd.java |   2 +-
 .../dockerjava/api/command/TagImageCmd.java   |  20 +-
 .../api/command/TopContainerCmd.java          |  12 +-
 .../api/command/UnpauseContainerCmd.java      |   8 +-
 .../api/command/UpdateContainerCmd.java       |  38 +--
 .../dockerjava/api/command/VersionCmd.java    |   2 +-
 .../api/command/WaitContainerCmd.java         |   8 +-
 .../dockerjava/api/model/LogConfig.java       |   4 +-
 .../dockerjava/core/GoLangFileMatch.java      |   4 +-
 .../github/dockerjava/netty/MediaType.java    |   2 +-
 .../netty/handler/HttpRequestProvider.java    |   2 +-
 .../checkstyle/checkstyle-config.xml          |   3 +-
 58 files changed, 589 insertions(+), 590 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 4ae45ec89..3ceabf3e7 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -64,48 +64,48 @@
 // https://godoc.org/github.com/fsouza/go-dockerclient
 public interface DockerClient extends Closeable {
 
-    public AuthConfig authConfig() throws DockerException;
+    AuthConfig authConfig() throws DockerException;
 
     /**
      * Authenticate with the server, useful for checking authentication.
      */
-    public AuthCmd authCmd();
+    AuthCmd authCmd();
 
-    public InfoCmd infoCmd();
+    InfoCmd infoCmd();
 
-    public PingCmd pingCmd();
+    PingCmd pingCmd();
 
-    public VersionCmd versionCmd();
+    VersionCmd versionCmd();
 
     /**
      * * IMAGE API *
      */
 
-    public PullImageCmd pullImageCmd(@Nonnull String repository);
+    PullImageCmd pullImageCmd(@Nonnull String repository);
 
-    public PushImageCmd pushImageCmd(@Nonnull String name);
+    PushImageCmd pushImageCmd(@Nonnull String name);
 
-    public PushImageCmd pushImageCmd(@Nonnull Identifier identifier);
+    PushImageCmd pushImageCmd(@Nonnull Identifier identifier);
 
-    public CreateImageCmd createImageCmd(@Nonnull String repository, @Nonnull InputStream imageStream);
+    CreateImageCmd createImageCmd(@Nonnull String repository, @Nonnull InputStream imageStream);
 
-    public SearchImagesCmd searchImagesCmd(@Nonnull String term);
+    SearchImagesCmd searchImagesCmd(@Nonnull String term);
 
-    public RemoveImageCmd removeImageCmd(@Nonnull String imageId);
+    RemoveImageCmd removeImageCmd(@Nonnull String imageId);
 
-    public ListImagesCmd listImagesCmd();
+    ListImagesCmd listImagesCmd();
 
-    public InspectImageCmd inspectImageCmd(@Nonnull String imageId);
+    InspectImageCmd inspectImageCmd(@Nonnull String imageId);
 
-    public SaveImageCmd saveImageCmd(@Nonnull String name);
+    SaveImageCmd saveImageCmd(@Nonnull String name);
 
     /**
      * * CONTAINER API *
      */
 
-    public ListContainersCmd listContainersCmd();
+    ListContainersCmd listContainersCmd();
 
-    public CreateContainerCmd createContainerCmd(@Nonnull String image);
+    CreateContainerCmd createContainerCmd(@Nonnull String image);
 
     /**
      * Creates a new {@link StartContainerCmd} for the container with the given ID. The command can then be further customized by using
@@ -116,23 +116,23 @@ public interface DockerClient extends Closeable {
      * <p>
      * This command corresponds to the <code>/containers/{id}/start</code> endpoint of the Docker Remote API.
      */
-    public StartContainerCmd startContainerCmd(@Nonnull String containerId);
+    StartContainerCmd startContainerCmd(@Nonnull String containerId);
 
-    public ExecCreateCmd execCreateCmd(@Nonnull String containerId);
+    ExecCreateCmd execCreateCmd(@Nonnull String containerId);
 
-    public InspectContainerCmd inspectContainerCmd(@Nonnull String containerId);
+    InspectContainerCmd inspectContainerCmd(@Nonnull String containerId);
 
-    public RemoveContainerCmd removeContainerCmd(@Nonnull String containerId);
+    RemoveContainerCmd removeContainerCmd(@Nonnull String containerId);
 
-    public WaitContainerCmd waitContainerCmd(@Nonnull String containerId);
+    WaitContainerCmd waitContainerCmd(@Nonnull String containerId);
 
-    public AttachContainerCmd attachContainerCmd(@Nonnull String containerId);
+    AttachContainerCmd attachContainerCmd(@Nonnull String containerId);
 
-    public ExecStartCmd execStartCmd(@Nonnull String containerId);
+    ExecStartCmd execStartCmd(@Nonnull String containerId);
 
-    public InspectExecCmd inspectExecCmd(@Nonnull String execId);
+    InspectExecCmd inspectExecCmd(@Nonnull String execId);
 
-    public LogContainerCmd logContainerCmd(@Nonnull String containerId);
+    LogContainerCmd logContainerCmd(@Nonnull String containerId);
 
     /**
      * Copy resource from container to local machine.
@@ -144,7 +144,7 @@ public interface DockerClient extends Closeable {
      * @return created command
      * @since {@link RemoteApiVersion#VERSION_1_20}
      */
-    public CopyArchiveFromContainerCmd copyArchiveFromContainerCmd(@Nonnull String containerId, @Nonnull String resource);
+    CopyArchiveFromContainerCmd copyArchiveFromContainerCmd(@Nonnull String containerId, @Nonnull String resource);
 
     /**
      * Copy resource from container to local machine.
@@ -158,7 +158,7 @@ public interface DockerClient extends Closeable {
      * @deprecated since docker API version 1.20, replaced by {@link #copyArchiveFromContainerCmd(String, String)}
      */
     @Deprecated
-    public CopyFileFromContainerCmd copyFileFromContainerCmd(@Nonnull String containerId, @Nonnull String resource);
+    CopyFileFromContainerCmd copyFileFromContainerCmd(@Nonnull String containerId, @Nonnull String resource);
 
     /**
      * Copy archive from local machine to remote container
@@ -168,13 +168,13 @@ public interface DockerClient extends Closeable {
      * @return created command
      * @since {@link RemoteApiVersion#VERSION_1_20}
      */
-    public CopyArchiveToContainerCmd copyArchiveToContainerCmd(@Nonnull String containerId);
+    CopyArchiveToContainerCmd copyArchiveToContainerCmd(@Nonnull String containerId);
 
-    public ContainerDiffCmd containerDiffCmd(@Nonnull String containerId);
+    ContainerDiffCmd containerDiffCmd(@Nonnull String containerId);
 
-    public StopContainerCmd stopContainerCmd(@Nonnull String containerId);
+    StopContainerCmd stopContainerCmd(@Nonnull String containerId);
 
-    public KillContainerCmd killContainerCmd(@Nonnull String containerId);
+    KillContainerCmd killContainerCmd(@Nonnull String containerId);
 
     /**
      * Update container settings
@@ -183,51 +183,51 @@ public interface DockerClient extends Closeable {
      * @return command
      * @since {@link RemoteApiVersion#VERSION_1_22}
      */
-    public UpdateContainerCmd updateContainerCmd(@Nonnull String containerId);
+    UpdateContainerCmd updateContainerCmd(@Nonnull String containerId);
 
-    public RestartContainerCmd restartContainerCmd(@Nonnull String containerId);
+    RestartContainerCmd restartContainerCmd(@Nonnull String containerId);
 
-    public CommitCmd commitCmd(@Nonnull String containerId);
+    CommitCmd commitCmd(@Nonnull String containerId);
 
-    public BuildImageCmd buildImageCmd();
+    BuildImageCmd buildImageCmd();
 
-    public BuildImageCmd buildImageCmd(File dockerFileOrFolder);
+    BuildImageCmd buildImageCmd(File dockerFileOrFolder);
 
-    public BuildImageCmd buildImageCmd(InputStream tarInputStream);
+    BuildImageCmd buildImageCmd(InputStream tarInputStream);
 
-    public TopContainerCmd topContainerCmd(String containerId);
+    TopContainerCmd topContainerCmd(String containerId);
 
-    public TagImageCmd tagImageCmd(String imageId, String repository, String tag);
+    TagImageCmd tagImageCmd(String imageId, String repository, String tag);
 
-    public PauseContainerCmd pauseContainerCmd(String containerId);
+    PauseContainerCmd pauseContainerCmd(String containerId);
 
-    public UnpauseContainerCmd unpauseContainerCmd(String containerId);
+    UnpauseContainerCmd unpauseContainerCmd(String containerId);
 
-    public EventsCmd eventsCmd();
+    EventsCmd eventsCmd();
 
-    public StatsCmd statsCmd(String containerId);
+    StatsCmd statsCmd(String containerId);
 
-    public CreateVolumeCmd createVolumeCmd();
+    CreateVolumeCmd createVolumeCmd();
 
-    public InspectVolumeCmd inspectVolumeCmd(String name);
+    InspectVolumeCmd inspectVolumeCmd(String name);
 
-    public RemoveVolumeCmd removeVolumeCmd(String name);
+    RemoveVolumeCmd removeVolumeCmd(String name);
 
-    public ListVolumesCmd listVolumesCmd();
+    ListVolumesCmd listVolumesCmd();
 
-    public ListNetworksCmd listNetworksCmd();
+    ListNetworksCmd listNetworksCmd();
 
-    public InspectNetworkCmd inspectNetworkCmd();
+    InspectNetworkCmd inspectNetworkCmd();
 
-    public CreateNetworkCmd createNetworkCmd();
+    CreateNetworkCmd createNetworkCmd();
 
-    public RemoveNetworkCmd removeNetworkCmd(@Nonnull String networkId);
+    RemoveNetworkCmd removeNetworkCmd(@Nonnull String networkId);
 
-    public ConnectToNetworkCmd connectToNetworkCmd();
+    ConnectToNetworkCmd connectToNetworkCmd();
 
-    public DisconnectFromNetworkCmd disconnectFromNetworkCmd();
+    DisconnectFromNetworkCmd disconnectFromNetworkCmd();
 
     @Override
-    public void close() throws IOException;
+    void close() throws IOException;
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
index 236b0f326..a92b1593b 100644
--- a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
@@ -15,9 +15,9 @@
 public interface AuthCmd extends SyncDockerCmd<AuthResponse> {
 
     @CheckForNull
-    public AuthConfig getAuthConfig();
+    AuthConfig getAuthConfig();
 
-    public AuthCmd withAuthConfig(@Nonnull AuthConfig authConfig);
+    AuthCmd withAuthConfig(@Nonnull AuthConfig authConfig);
 
     /**
      * @return The status. Based on it's value you may mean you need to authorise your account, e.g.: "Account created. Please see the
@@ -26,9 +26,9 @@ public interface AuthCmd extends SyncDockerCmd<AuthResponse> {
      *             If you're not authorised (e.g. bad password).
      */
     @Override
-    public AuthResponse exec() throws UnauthorizedException;
+    AuthResponse exec() throws UnauthorizedException;
 
-    public static interface Exec extends DockerCmdSyncExec<AuthCmd, AuthResponse> {
+    interface Exec extends DockerCmdSyncExec<AuthCmd, AuthResponse> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 3f3ca5a5e..d11c86c7f 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -25,10 +25,10 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     // lib specific
 
     @CheckForNull
-    public InputStream getTarInputStream();
+    InputStream getTarInputStream();
 
     @CheckForNull
-    public AuthConfigurations getBuildAuthConfigs();
+    AuthConfigurations getBuildAuthConfigs();
 
     // getters
 
@@ -36,105 +36,105 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
      * "t" in API
      */
     @CheckForNull
-    public String getTag();
+    String getTag();
 
     /**
      * "remote" in API
      */
     @CheckForNull
-    public URI getRemote();
+    URI getRemote();
 
     /**
      * "nocache" in API
      */
     @CheckForNull
-    public Boolean hasNoCacheEnabled();
+    Boolean hasNoCacheEnabled();
 
     /**
      * "rm" in API
      */
     @CheckForNull
-    public Boolean hasRemoveEnabled();
+    Boolean hasRemoveEnabled();
 
     /**
      * "forcerm" in API
      */
     @CheckForNull
-    public Boolean isForcerm();
+    Boolean isForcerm();
 
     /**
      * "q" in API
      */
     @CheckForNull
-    public Boolean isQuiet();
+    Boolean isQuiet();
 
     /**
      * "pull" in API
      */
     @CheckForNull
-    public Boolean hasPullEnabled();
+    Boolean hasPullEnabled();
 
     @CheckForNull
-    public String getPathToDockerfile();
+    String getPathToDockerfile();
 
     @CheckForNull
-    public Long getMemory();
+    Long getMemory();
 
     @CheckForNull
-    public Long getMemswap();
+    Long getMemswap();
 
     @CheckForNull
-    public String getCpushares();
+    String getCpushares();
 
     @CheckForNull
-    public String getCpusetcpus();
+    String getCpusetcpus();
 
     /**
      * @since {@link RemoteApiVersion#VERSION_1_21}
      */
     @CheckForNull
-    public Map<String, String> getBuildArgs();
+    Map<String, String> getBuildArgs();
 
     // setters
 
-    public BuildImageCmd withTag(String tag);
+    BuildImageCmd withTag(String tag);
 
-    public BuildImageCmd withRemote(URI remote);
+    BuildImageCmd withRemote(URI remote);
 
-    public BuildImageCmd withBaseDirectory(File baseDirectory);
+    BuildImageCmd withBaseDirectory(File baseDirectory);
 
-    public BuildImageCmd withDockerfile(File dockerfile);
+    BuildImageCmd withDockerfile(File dockerfile);
 
-    public BuildImageCmd withNoCache(Boolean noCache);
+    BuildImageCmd withNoCache(Boolean noCache);
 
-    public BuildImageCmd withRemove(Boolean rm);
+    BuildImageCmd withRemove(Boolean rm);
 
-    public BuildImageCmd withForcerm(Boolean forcerm);
+    BuildImageCmd withForcerm(Boolean forcerm);
 
-    public BuildImageCmd withQuiet(Boolean quiet);
+    BuildImageCmd withQuiet(Boolean quiet);
 
-    public BuildImageCmd withPull(Boolean pull);
+    BuildImageCmd withPull(Boolean pull);
 
-    public BuildImageCmd withMemory(Long memory);
+    BuildImageCmd withMemory(Long memory);
 
-    public BuildImageCmd withMemswap(Long memswap);
+    BuildImageCmd withMemswap(Long memswap);
 
-    public BuildImageCmd withCpushares(String cpushares);
+    BuildImageCmd withCpushares(String cpushares);
 
-    public BuildImageCmd withCpusetcpus(String cpusetcpus);
+    BuildImageCmd withCpusetcpus(String cpusetcpus);
 
     /**
      * @since {@link RemoteApiVersion#VERSION_1_21}
      */
-    public BuildImageCmd withBuildArg(String key, String value);
+    BuildImageCmd withBuildArg(String key, String value);
 
     // setters lib specific
 
-    public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfig);
+    BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfig);
 
-    public BuildImageCmd withTarInputStream(@Nonnull InputStream tarInputStream);
+    BuildImageCmd withTarInputStream(@Nonnull InputStream tarInputStream);
 
-    public static interface Exec extends DockerCmdAsyncExec<BuildImageCmd, BuildResponseItem> {
+    interface Exec extends DockerCmdAsyncExec<BuildImageCmd, BuildResponseItem> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
index 81bc70e0c..c5da5bab6 100644
--- a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
@@ -15,112 +15,112 @@
 public interface CommitCmd extends SyncDockerCmd<String> {
 
     @CheckForNull
-    public String getAuthor();
+    String getAuthor();
 
     @CheckForNull
-    public String getContainerId();
+    String getContainerId();
 
     @CheckForNull
-    public String[] getEnv();
+    String[] getEnv();
 
     @CheckForNull
-    public ExposedPorts getExposedPorts();
+    ExposedPorts getExposedPorts();
 
     @CheckForNull
-    public String getHostname();
+    String getHostname();
 
     @CheckForNull
-    public Integer getMemory();
+    Integer getMemory();
 
     @CheckForNull
-    public Integer getMemorySwap();
+    Integer getMemorySwap();
 
     @CheckForNull
-    public String getMessage();
+    String getMessage();
 
     @CheckForNull
-    public String[] getPortSpecs();
+    String[] getPortSpecs();
 
     @CheckForNull
-    public String getRepository();
+    String getRepository();
 
     @CheckForNull
-    public String getTag();
+    String getTag();
 
     @CheckForNull
-    public String getUser();
+    String getUser();
 
     @CheckForNull
-    public Volumes getVolumes();
+    Volumes getVolumes();
 
     @CheckForNull
-    public String getWorkingDir();
+    String getWorkingDir();
 
     @CheckForNull
-    public Boolean hasPauseEnabled();
+    Boolean hasPauseEnabled();
 
     @CheckForNull
-    public Boolean isOpenStdin();
+    Boolean isOpenStdin();
 
     @CheckForNull
-    public Boolean isStdinOnce();
+    Boolean isStdinOnce();
 
     @CheckForNull
-    public Boolean isTty();
+    Boolean isTty();
 
-    public CommitCmd withAttachStderr(Boolean attachStderr);
+    CommitCmd withAttachStderr(Boolean attachStderr);
 
-    public CommitCmd withAttachStdin(Boolean attachStdin);
+    CommitCmd withAttachStdin(Boolean attachStdin);
 
-    public CommitCmd withAttachStdout(Boolean attachStdout);
+    CommitCmd withAttachStdout(Boolean attachStdout);
 
-    public CommitCmd withAuthor(String author);
+    CommitCmd withAuthor(String author);
 
-    public CommitCmd withCmd(String... cmd);
+    CommitCmd withCmd(String... cmd);
 
-    public CommitCmd withContainerId(@Nonnull String containerId);
+    CommitCmd withContainerId(@Nonnull String containerId);
 
-    public CommitCmd withDisableNetwork(Boolean disableNetwork);
+    CommitCmd withDisableNetwork(Boolean disableNetwork);
 
-    public CommitCmd withEnv(String... env);
+    CommitCmd withEnv(String... env);
 
-    public CommitCmd withExposedPorts(ExposedPorts exposedPorts);
+    CommitCmd withExposedPorts(ExposedPorts exposedPorts);
 
-    public CommitCmd withHostname(String hostname);
+    CommitCmd withHostname(String hostname);
 
-    public CommitCmd withMemory(Integer memory);
+    CommitCmd withMemory(Integer memory);
 
-    public CommitCmd withMemorySwap(Integer memorySwap);
+    CommitCmd withMemorySwap(Integer memorySwap);
 
-    public CommitCmd withMessage(String message);
+    CommitCmd withMessage(String message);
 
-    public CommitCmd withOpenStdin(Boolean openStdin);
+    CommitCmd withOpenStdin(Boolean openStdin);
 
-    public CommitCmd withPause(Boolean pause);
+    CommitCmd withPause(Boolean pause);
 
-    public CommitCmd withPortSpecs(String... portSpecs);
+    CommitCmd withPortSpecs(String... portSpecs);
 
-    public CommitCmd withRepository(String repository);
+    CommitCmd withRepository(String repository);
 
-    public CommitCmd withStdinOnce(Boolean stdinOnce);
+    CommitCmd withStdinOnce(Boolean stdinOnce);
 
-    public CommitCmd withTag(String tag);
+    CommitCmd withTag(String tag);
 
-    public CommitCmd withTty(Boolean tty);
+    CommitCmd withTty(Boolean tty);
 
-    public CommitCmd withUser(String user);
+    CommitCmd withUser(String user);
 
-    public CommitCmd withVolumes(Volumes volumes);
+    CommitCmd withVolumes(Volumes volumes);
 
-    public CommitCmd withWorkingDir(String workingDir);
+    CommitCmd withWorkingDir(String workingDir);
 
     /**
      * @throws NotFoundException
      *             No such container
      */
     @Override
-    public String exec() throws NotFoundException;
+    String exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdSyncExec<CommitCmd, String> {
+    interface Exec extends DockerCmdSyncExec<CommitCmd, String> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java b/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java
index cf76e2ec3..cd5c57774 100644
--- a/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java
@@ -13,15 +13,15 @@
 public interface ConnectToNetworkCmd extends SyncDockerCmd<Void> {
 
     @CheckForNull
-    public String getNetworkId();
+    String getNetworkId();
 
     @CheckForNull
-    public String getContainerId();
+    String getContainerId();
 
-    public ConnectToNetworkCmd withNetworkId(@Nonnull String networkId);
+    ConnectToNetworkCmd withNetworkId(@Nonnull String networkId);
 
-    public ConnectToNetworkCmd withContainerId(@Nonnull String containerId);
+    ConnectToNetworkCmd withContainerId(@Nonnull String containerId);
 
-    public static interface Exec extends DockerCmdSyncExec<ConnectToNetworkCmd, Void> {
+    interface Exec extends DockerCmdSyncExec<ConnectToNetworkCmd, Void> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java b/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
index cc3bfa757..b64a13233 100644
--- a/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
@@ -13,12 +13,12 @@
 public interface ContainerDiffCmd extends SyncDockerCmd<List<ChangeLog>> {
 
     @CheckForNull
-    public String getContainerId();
+    String getContainerId();
 
-    public ContainerDiffCmd withContainerId(@Nonnull String containerId);
+    ContainerDiffCmd withContainerId(@Nonnull String containerId);
 
     @Override
-    public String toString();
+    String toString();
 
     /**
      * @throws NotFoundException
@@ -29,9 +29,9 @@ public interface ContainerDiffCmd extends SyncDockerCmd<List<ChangeLog>> {
      *             unexpected http status code
      */
     @Override
-    public List<ChangeLog> exec() throws NotFoundException;
+    List<ChangeLog> exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdSyncExec<ContainerDiffCmd, List<ChangeLog>> {
+    interface Exec extends DockerCmdSyncExec<ContainerDiffCmd, List<ChangeLog>> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java
index 56b24d24d..4ed28c01f 100644
--- a/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java
@@ -10,19 +10,19 @@
 public interface CopyArchiveFromContainerCmd extends SyncDockerCmd<InputStream> {
 
     @CheckForNull
-    public String getContainerId();
+    String getContainerId();
 
     @CheckForNull
-    public String getHostPath();
+    String getHostPath();
 
     @CheckForNull
-    public String getResource();
+    String getResource();
 
-    public CopyArchiveFromContainerCmd withContainerId(@Nonnull String containerId);
+    CopyArchiveFromContainerCmd withContainerId(@Nonnull String containerId);
 
-    public CopyArchiveFromContainerCmd withHostPath(String hostPath);
+    CopyArchiveFromContainerCmd withHostPath(String hostPath);
 
-    public CopyArchiveFromContainerCmd withResource(@Nonnull String resource);
+    CopyArchiveFromContainerCmd withResource(@Nonnull String resource);
 
     /**
      * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
@@ -31,8 +31,8 @@ public interface CopyArchiveFromContainerCmd extends SyncDockerCmd<InputStream>
      *             No such container
      */
     @Override
-    public InputStream exec() throws NotFoundException;
+    InputStream exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdSyncExec<CopyArchiveFromContainerCmd, InputStream> {
+    interface Exec extends DockerCmdSyncExec<CopyArchiveFromContainerCmd, InputStream> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
index 8786ca57f..5dc920ed0 100644
--- a/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
@@ -10,19 +10,19 @@
 public interface CopyFileFromContainerCmd extends SyncDockerCmd<InputStream> {
 
     @CheckForNull
-    public String getContainerId();
+    String getContainerId();
 
     @CheckForNull
-    public String getHostPath();
+    String getHostPath();
 
     @CheckForNull
-    public String getResource();
+    String getResource();
 
-    public CopyFileFromContainerCmd withContainerId(@Nonnull String containerId);
+    CopyFileFromContainerCmd withContainerId(@Nonnull String containerId);
 
-    public CopyFileFromContainerCmd withHostPath(String hostPath);
+    CopyFileFromContainerCmd withHostPath(String hostPath);
 
-    public CopyFileFromContainerCmd withResource(@Nonnull String resource);
+    CopyFileFromContainerCmd withResource(@Nonnull String resource);
 
     /**
      * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
@@ -31,8 +31,8 @@ public interface CopyFileFromContainerCmd extends SyncDockerCmd<InputStream> {
      *             No such container
      */
     @Override
-    public InputStream exec() throws NotFoundException;
+    InputStream exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdSyncExec<CopyFileFromContainerCmd, InputStream> {
+    interface Exec extends DockerCmdSyncExec<CopyFileFromContainerCmd, InputStream> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 972739898..1454a5f80 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -24,310 +24,310 @@
 public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerResponse> {
 
     @CheckForNull
-    public Bind[] getBinds();
+    Bind[] getBinds();
 
     /**
      * @since 1.19
      */
     @CheckForNull
-    public Integer getBlkioWeight();
+    Integer getBlkioWeight();
 
     @CheckForNull
-    public Capability[] getCapAdd();
+    Capability[] getCapAdd();
 
     @CheckForNull
-    public Capability[] getCapDrop();
+    Capability[] getCapDrop();
 
     @CheckForNull
-    public String[] getCmd();
+    String[] getCmd();
 
     /**
      * @since 1.19
      */
     @CheckForNull
-    public Integer getCpuPeriod();
+    Integer getCpuPeriod();
 
     @CheckForNull
-    public String getCpusetCpus();
+    String getCpusetCpus();
 
     /**
      * @since 1.19
      */
     @CheckForNull
-    public String getCpusetMems();
+    String getCpusetMems();
 
     @CheckForNull
-    public Integer getCpuShares();
+    Integer getCpuShares();
 
     @CheckForNull
-    public Device[] getDevices();
+    Device[] getDevices();
 
     @CheckForNull
-    public String[] getDns();
+    String[] getDns();
 
     @CheckForNull
-    public String[] getDnsSearch();
+    String[] getDnsSearch();
 
     @CheckForNull
-    public String getDomainName();
+    String getDomainName();
 
     @CheckForNull
-    public String[] getEntrypoint();
+    String[] getEntrypoint();
 
     @CheckForNull
-    public String[] getEnv();
+    String[] getEnv();
 
     @CheckForNull
-    public ExposedPort[] getExposedPorts();
+    ExposedPort[] getExposedPorts();
 
     @CheckForNull
-    public String getStopSignal();
+    String getStopSignal();
 
     @CheckForNull
-    public String[] getExtraHosts();
+    String[] getExtraHosts();
 
     @CheckForNull
-    public String getHostName();
+    String getHostName();
 
     @CheckForNull
-    public String getImage();
+    String getImage();
 
     @CheckForNull
     Map<String, String> getLabels();
 
     @CheckForNull
-    public Link[] getLinks();
+    Link[] getLinks();
 
     @CheckForNull
-    public LogConfig getLogConfig();
+    LogConfig getLogConfig();
 
     @CheckForNull
-    public LxcConf[] getLxcConf();
+    LxcConf[] getLxcConf();
 
     @CheckForNull
-    public String getMacAddress();
+    String getMacAddress();
 
     @CheckForNull
-    public Long getMemory();
+    Long getMemory();
 
     @CheckForNull
-    public Long getMemorySwap();
+    Long getMemorySwap();
 
     @CheckForNull
-    public String getName();
+    String getName();
 
     @CheckForNull
-    public String getNetworkMode();
+    String getNetworkMode();
 
     @CheckForNull
-    public Ports getPortBindings();
+    Ports getPortBindings();
 
     @CheckForNull
-    public String[] getPortSpecs();
+    String[] getPortSpecs();
 
     @CheckForNull
-    public RestartPolicy getRestartPolicy();
+    RestartPolicy getRestartPolicy();
 
     @CheckForNull
-    public Ulimit[] getUlimits();
+    Ulimit[] getUlimits();
 
     @CheckForNull
-    public String getUser();
+    String getUser();
 
     @CheckForNull
-    public Volume[] getVolumes();
+    Volume[] getVolumes();
 
     @CheckForNull
-    public VolumesFrom[] getVolumesFrom();
+    VolumesFrom[] getVolumesFrom();
 
     @CheckForNull
-    public String getWorkingDir();
+    String getWorkingDir();
 
     @CheckForNull
-    public Boolean isAttachStderr();
+    Boolean isAttachStderr();
 
     @CheckForNull
-    public Boolean isAttachStdin();
+    Boolean isAttachStdin();
 
     @CheckForNull
-    public Boolean isAttachStdout();
+    Boolean isAttachStdout();
 
     @CheckForNull
-    public Boolean isNetworkDisabled();
+    Boolean isNetworkDisabled();
 
     /**
      * @since 1.19
      */
     @CheckForNull
-    public Boolean isOomKillDisable();
+    Boolean isOomKillDisable();
 
     @CheckForNull
-    public Boolean isPrivileged();
+    Boolean isPrivileged();
 
     @CheckForNull
-    public Boolean isPublishAllPorts();
+    Boolean isPublishAllPorts();
 
     @CheckForNull
-    public Boolean isReadonlyRootfs();
+    Boolean isReadonlyRootfs();
 
     @CheckForNull
-    public Boolean isStdInOnce();
+    Boolean isStdInOnce();
 
     @CheckForNull
-    public Boolean isStdinOpen();
+    Boolean isStdinOpen();
 
     @CheckForNull
-    public String getPidMode();
+    String getPidMode();
 
     @CheckForNull
-    public Boolean isTty();
+    Boolean isTty();
 
-    public CreateContainerCmd withAttachStderr(Boolean attachStderr);
+    CreateContainerCmd withAttachStderr(Boolean attachStderr);
 
-    public CreateContainerCmd withAttachStdin(Boolean attachStdin);
+    CreateContainerCmd withAttachStdin(Boolean attachStdin);
 
-    public CreateContainerCmd withAttachStdout(Boolean attachStdout);
+    CreateContainerCmd withAttachStdout(Boolean attachStdout);
 
-    public CreateContainerCmd withBinds(Bind... binds);
+    CreateContainerCmd withBinds(Bind... binds);
 
-    public CreateContainerCmd withBinds(List<Bind> binds);
+    CreateContainerCmd withBinds(List<Bind> binds);
 
     /**
      * @since 1.19
      */
-    public CreateContainerCmd withBlkioWeight(Integer blkioWeight);
+    CreateContainerCmd withBlkioWeight(Integer blkioWeight);
 
     /**
      * Add linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> to the container. For example:
      * adding {@link Capability#MKNOD} allows the container to create special files using the 'mknod' command.
      */
-    public CreateContainerCmd withCapAdd(Capability... capAdd);
+    CreateContainerCmd withCapAdd(Capability... capAdd);
 
     /**
      * Add linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> to the container. For example:
      * adding {@link Capability#MKNOD} allows the container to create special files using the 'mknod' command.
      */
-    public CreateContainerCmd withCapAdd(List<Capability> capAdd);
+    CreateContainerCmd withCapAdd(List<Capability> capAdd);
 
     /**
      * Drop linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> from the container. For example:
      * dropping {@link Capability#CHOWN} prevents the container from changing the owner of any files.
      */
-    public CreateContainerCmd withCapDrop(Capability... capDrop);
+    CreateContainerCmd withCapDrop(Capability... capDrop);
 
     /**
      * Drop linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> from the container. For example:
      * dropping {@link Capability#CHOWN} prevents the container from changing the owner of any files.
      */
-    public CreateContainerCmd withCapDrop(List<Capability> capDrop);
+    CreateContainerCmd withCapDrop(List<Capability> capDrop);
 
-    public CreateContainerCmd withCmd(String... cmd);
+    CreateContainerCmd withCmd(String... cmd);
 
-    public CreateContainerCmd withCmd(List<String> cmd);
+    CreateContainerCmd withCmd(List<String> cmd);
 
-    public CreateContainerCmd withContainerIDFile(String containerIDFile);
+    CreateContainerCmd withContainerIDFile(String containerIDFile);
 
     /**
      * @since 1.19
      */
-    public CreateContainerCmd withCpuPeriod(Integer cpuPeriod);
+    CreateContainerCmd withCpuPeriod(Integer cpuPeriod);
 
-    public CreateContainerCmd withCpusetCpus(String cpusetCpus);
+    CreateContainerCmd withCpusetCpus(String cpusetCpus);
 
     /**
      * @since 1.19
      */
-    public CreateContainerCmd withCpusetMems(String cpusetMems);
+    CreateContainerCmd withCpusetMems(String cpusetMems);
 
-    public CreateContainerCmd withCpuShares(Integer cpuShares);
+    CreateContainerCmd withCpuShares(Integer cpuShares);
 
     /**
      * Add host devices to the container
      */
-    public CreateContainerCmd withDevices(Device... devices);
+    CreateContainerCmd withDevices(Device... devices);
 
     /**
      * Add host devices to the container
      */
-    public CreateContainerCmd withDevices(List<Device> devices);
+    CreateContainerCmd withDevices(List<Device> devices);
 
     /**
      * Set custom DNS servers
      */
-    public CreateContainerCmd withDns(String... dns);
+    CreateContainerCmd withDns(String... dns);
 
     /**
      * Set custom DNS servers
      */
-    public CreateContainerCmd withDns(List<String> dns);
+    CreateContainerCmd withDns(List<String> dns);
 
     /**
      * Set custom DNS search domains
      */
-    public CreateContainerCmd withDnsSearch(String... dnsSearch);
+    CreateContainerCmd withDnsSearch(String... dnsSearch);
 
     /**
      * Set custom DNS search domains
      */
-    public CreateContainerCmd withDnsSearch(List<String> dnsSearch);
+    CreateContainerCmd withDnsSearch(List<String> dnsSearch);
 
-    public CreateContainerCmd withDomainName(String domainName);
+    CreateContainerCmd withDomainName(String domainName);
 
-    public CreateContainerCmd withEntrypoint(String... entrypoint);
+    CreateContainerCmd withEntrypoint(String... entrypoint);
 
-    public CreateContainerCmd withEntrypoint(List<String> entrypoint);
+    CreateContainerCmd withEntrypoint(List<String> entrypoint);
 
-    public CreateContainerCmd withEnv(String... env);
+    CreateContainerCmd withEnv(String... env);
 
-    public CreateContainerCmd withEnv(List<String> env);
+    CreateContainerCmd withEnv(List<String> env);
 
-    public CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts);
+    CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts);
 
-    public CreateContainerCmd withStopSignal(String stopSignal);
+    CreateContainerCmd withStopSignal(String stopSignal);
 
-    public CreateContainerCmd withExposedPorts(List<ExposedPort> exposedPorts);
+    CreateContainerCmd withExposedPorts(List<ExposedPort> exposedPorts);
 
     /**
      * Add hostnames to /etc/hosts in the container
      */
-    public CreateContainerCmd withExtraHosts(String... extraHosts);
+    CreateContainerCmd withExtraHosts(String... extraHosts);
 
     /**
      * Add hostnames to /etc/hosts in the container
      */
-    public CreateContainerCmd withExtraHosts(List<String> extraHosts);
+    CreateContainerCmd withExtraHosts(List<String> extraHosts);
 
-    public CreateContainerCmd withHostName(String hostName);
+    CreateContainerCmd withHostName(String hostName);
 
-    public CreateContainerCmd withImage(String image);
+    CreateContainerCmd withImage(String image);
 
-    public CreateContainerCmd withLabels(Map<String, String> labels);
+    CreateContainerCmd withLabels(Map<String, String> labels);
 
     /**
      * Add link to another container.
      */
-    public CreateContainerCmd withLinks(Link... links);
+    CreateContainerCmd withLinks(Link... links);
 
     /**
      * Add link to another container.
      */
-    public CreateContainerCmd withLinks(List<Link> links);
+    CreateContainerCmd withLinks(List<Link> links);
 
-    public CreateContainerCmd withLogConfig(LogConfig logConfig);
+    CreateContainerCmd withLogConfig(LogConfig logConfig);
 
-    public CreateContainerCmd withLxcConf(LxcConf... lxcConf);
+    CreateContainerCmd withLxcConf(LxcConf... lxcConf);
 
-    public CreateContainerCmd withLxcConf(List<LxcConf> lxcConf);
+    CreateContainerCmd withLxcConf(List<LxcConf> lxcConf);
 
-    public CreateContainerCmd withMacAddress(String macAddress);
+    CreateContainerCmd withMacAddress(String macAddress);
 
-    public CreateContainerCmd withMemory(Long memory);
+    CreateContainerCmd withMemory(Long memory);
 
-    public CreateContainerCmd withMemorySwap(Long memorySwap);
+    CreateContainerCmd withMemorySwap(Long memorySwap);
 
-    public CreateContainerCmd withName(String name);
+    CreateContainerCmd withName(String name);
 
-    public CreateContainerCmd withNetworkDisabled(Boolean disableNetwork);
+    CreateContainerCmd withNetworkDisabled(Boolean disableNetwork);
 
     /**
      * Set the Network mode for the container
@@ -339,73 +339,73 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
      * services such as D-bus and is therefore considered insecure.</li>
      * </ul>
      */
-    public CreateContainerCmd withNetworkMode(String networkMode);
+    CreateContainerCmd withNetworkMode(String networkMode);
 
     /**
      * @since 1.19
      */
-    public CreateContainerCmd withOomKillDisable(Boolean oomKillDisable);
+    CreateContainerCmd withOomKillDisable(Boolean oomKillDisable);
 
     /**
      * Add one or more {@link PortBinding}s. This corresponds to the <code>--publish</code> (<code>-p</code>) option of the
      * <code>docker run</code> CLI command.
      */
-    public CreateContainerCmd withPortBindings(PortBinding... portBindings);
+    CreateContainerCmd withPortBindings(PortBinding... portBindings);
 
     /**
      * Add one or more {@link PortBinding}s. This corresponds to the <code>--publish</code> (<code>-p</code>) option of the
      * <code>docker run</code> CLI command.
      */
-    public CreateContainerCmd withPortBindings(List<PortBinding> portBindings);
+    CreateContainerCmd withPortBindings(List<PortBinding> portBindings);
 
     /**
      * Add the port bindings that are contained in the given {@link Ports} object.
      *
      * @see #withPortBindings(PortBinding...)
      */
-    public CreateContainerCmd withPortBindings(Ports portBindings);
+    CreateContainerCmd withPortBindings(Ports portBindings);
 
-    public CreateContainerCmd withPortSpecs(String... portSpecs);
+    CreateContainerCmd withPortSpecs(String... portSpecs);
 
-    public CreateContainerCmd withPortSpecs(List<String> portSpecs);
+    CreateContainerCmd withPortSpecs(List<String> portSpecs);
 
-    public CreateContainerCmd withPrivileged(Boolean privileged);
+    CreateContainerCmd withPrivileged(Boolean privileged);
 
-    public CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts);
+    CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts);
 
-    public CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs);
+    CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs);
 
     /**
      * Set custom {@link RestartPolicy} for the container. Defaults to {@link RestartPolicy#noRestart()}
      */
-    public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy);
+    CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy);
 
-    public CreateContainerCmd withStdInOnce(Boolean stdInOnce);
+    CreateContainerCmd withStdInOnce(Boolean stdInOnce);
 
-    public CreateContainerCmd withStdinOpen(Boolean stdinOpen);
+    CreateContainerCmd withStdinOpen(Boolean stdinOpen);
 
-    public CreateContainerCmd withTty(Boolean tty);
+    CreateContainerCmd withTty(Boolean tty);
 
-    public CreateContainerCmd withUlimits(Ulimit... ulimits);
+    CreateContainerCmd withUlimits(Ulimit... ulimits);
 
-    public CreateContainerCmd withUlimits(List<Ulimit> ulimits);
+    CreateContainerCmd withUlimits(List<Ulimit> ulimits);
 
-    public CreateContainerCmd withUser(String user);
+    CreateContainerCmd withUser(String user);
 
-    public CreateContainerCmd withVolumes(Volume... volumes);
+    CreateContainerCmd withVolumes(Volume... volumes);
 
-    public CreateContainerCmd withVolumes(List<Volume> volumes);
+    CreateContainerCmd withVolumes(List<Volume> volumes);
 
-    public CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom);
+    CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom);
 
-    public CreateContainerCmd withVolumesFrom(List<VolumesFrom> volumesFrom);
+    CreateContainerCmd withVolumesFrom(List<VolumesFrom> volumesFrom);
 
-    public CreateContainerCmd withWorkingDir(String workingDir);
+    CreateContainerCmd withWorkingDir(String workingDir);
 
     /**
      * Set the PID (Process) Namespace mode for the container, 'host': use the host's PID namespace inside the container
      */
-    public CreateContainerCmd withPidMode(String pidMode);
+    CreateContainerCmd withPidMode(String pidMode);
 
     /**
      * @throws NotFoundException
@@ -414,8 +414,8 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
      *             Named container already exists
      */
     @Override
-    public CreateContainerResponse exec() throws NotFoundException, ConflictException;
+    CreateContainerResponse exec() throws NotFoundException, ConflictException;
 
-    public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, CreateContainerResponse> {
+    interface Exec extends DockerCmdSyncExec<CreateContainerCmd, CreateContainerResponse> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
index db10a374c..86935cd10 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
@@ -8,34 +8,34 @@
 public interface CreateImageCmd extends SyncDockerCmd<CreateImageResponse> {
 
     @CheckForNull
-    public String getRepository();
+    String getRepository();
 
     @CheckForNull
-    public String getTag();
+    String getTag();
 
     @CheckForNull
-    public InputStream getImageStream();
+    InputStream getImageStream();
 
     /**
      * @param repository
      *            the repository to import to
      */
-    public CreateImageCmd withRepository(@Nonnull String repository);
+    CreateImageCmd withRepository(@Nonnull String repository);
 
     /**
      * @param imageStream
      *            the InputStream of the tar file
      */
-    public CreateImageCmd withImageStream(InputStream imageStream);
+    CreateImageCmd withImageStream(InputStream imageStream);
 
     /**
      * @param tag
      *            any tag for this image
      * @deprecated use repo:tag format for repository
      */
-    public CreateImageCmd withTag(String tag);
+    CreateImageCmd withTag(String tag);
 
-    public static interface Exec extends DockerCmdSyncExec<CreateImageCmd, CreateImageResponse> {
+    interface Exec extends DockerCmdSyncExec<CreateImageCmd, CreateImageResponse> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
index 82b4ac18c..6ad26b605 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
@@ -17,26 +17,26 @@
 public interface CreateNetworkCmd extends SyncDockerCmd<CreateNetworkResponse> {
 
     @CheckForNull
-    public String getName();
+    String getName();
 
     @CheckForNull
-    public String getDriver();
+    String getDriver();
 
     @CheckForNull
-    public Network.Ipam getIpam();
+    Network.Ipam getIpam();
 
     /** The new network's name. Required. */
-    public CreateNetworkCmd withName(@Nonnull String name);
+    CreateNetworkCmd withName(@Nonnull String name);
 
     /** Optional custom IP scheme for the network. */
-    public CreateNetworkCmd withIpamConfig(Ipam.Config config);
+    CreateNetworkCmd withIpamConfig(Ipam.Config config);
 
     /** Name of the network driver to use. Defaults to <code>bridge</code>. */
-    public CreateNetworkCmd withDriver(String driver);
+    CreateNetworkCmd withDriver(String driver);
 
     /** Driver specific options */
-    public CreateNetworkCmd withOptions(Map<String, String> options);
+    CreateNetworkCmd withOptions(Map<String, String> options);
 
-    public static interface Exec extends DockerCmdSyncExec<CreateNetworkCmd, CreateNetworkResponse> {
+    interface Exec extends DockerCmdSyncExec<CreateNetworkCmd, CreateNetworkResponse> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java
index 801fb6122..3d052033f 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java
@@ -7,32 +7,32 @@
 public interface CreateVolumeCmd extends SyncDockerCmd<CreateVolumeResponse> {
 
     @CheckForNull
-    public String getName();
+    String getName();
 
     @CheckForNull
-    public String getDriver();
+    String getDriver();
 
     @CheckForNull
-    public Map<String, String> getDriverOpts();
+    Map<String, String> getDriverOpts();
 
     /**
      * @param name
      *            - The new volume’s name. If not specified, Docker generates a name.
      */
-    public CreateVolumeCmd withName(String name);
+    CreateVolumeCmd withName(String name);
 
     /**
      * @param driver
      *            - Name of the volume driver to use. Defaults to local for the name.
      */
-    public CreateVolumeCmd withDriver(String driver);
+    CreateVolumeCmd withDriver(String driver);
 
     /**
      * @param driverOpts
      *            - A mapping of driver options and values. These options are passed directly to the driver and are driver specific.
      */
-    public CreateVolumeCmd withDriverOpts(Map<String, String> driverOpts);
+    CreateVolumeCmd withDriverOpts(Map<String, String> driverOpts);
 
-    public static interface Exec extends DockerCmdSyncExec<CreateVolumeCmd, CreateVolumeResponse> {
+    interface Exec extends DockerCmdSyncExec<CreateVolumeCmd, CreateVolumeResponse> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java b/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java
index a2452416b..ca870ef37 100644
--- a/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java
@@ -13,15 +13,15 @@
 public interface DisconnectFromNetworkCmd extends SyncDockerCmd<Void> {
 
     @CheckForNull
-    public String getNetworkId();
+    String getNetworkId();
 
     @CheckForNull
-    public String getContainerId();
+    String getContainerId();
 
-    public DisconnectFromNetworkCmd withNetworkId(@Nonnull String networkId);
+    DisconnectFromNetworkCmd withNetworkId(@Nonnull String networkId);
 
-    public DisconnectFromNetworkCmd withContainerId(@Nonnull String containerId);
+    DisconnectFromNetworkCmd withContainerId(@Nonnull String containerId);
 
-    public static interface Exec extends DockerCmdSyncExec<DisconnectFromNetworkCmd, Void> {
+    interface Exec extends DockerCmdSyncExec<DisconnectFromNetworkCmd, Void> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmd.java b/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
index 27aad850b..ea3ecf0d9 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
@@ -5,6 +5,6 @@
 public interface DockerCmd<RES_T> extends Closeable {
 
     @Override
-    public void close();
+    void close();
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java
index dfd2a371e..52b16d3c3 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java
@@ -4,6 +4,6 @@
 
 public interface DockerCmdAsyncExec<CMD_T extends DockerCmd<Void>, A_RES_T> {
 
-    public Void exec(CMD_T command, ResultCallback<A_RES_T> resultCallback);
+    Void exec(CMD_T command, ResultCallback<A_RES_T> resultCallback);
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index fcaad81fc..8cc42cf15 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -9,109 +9,109 @@
 
 public interface DockerCmdExecFactory extends Closeable {
 
-    public void init(DockerClientConfig dockerClientConfig);
+    void init(DockerClientConfig dockerClientConfig);
 
-    public AuthCmd.Exec createAuthCmdExec();
+    AuthCmd.Exec createAuthCmdExec();
 
-    public InfoCmd.Exec createInfoCmdExec();
+    InfoCmd.Exec createInfoCmdExec();
 
-    public PingCmd.Exec createPingCmdExec();
+    PingCmd.Exec createPingCmdExec();
 
-    public ExecCreateCmd.Exec createExecCmdExec();
+    ExecCreateCmd.Exec createExecCmdExec();
 
-    public VersionCmd.Exec createVersionCmdExec();
+    VersionCmd.Exec createVersionCmdExec();
 
-    public PullImageCmd.Exec createPullImageCmdExec();
+    PullImageCmd.Exec createPullImageCmdExec();
 
-    public PushImageCmd.Exec createPushImageCmdExec();
+    PushImageCmd.Exec createPushImageCmdExec();
 
-    public SaveImageCmd.Exec createSaveImageCmdExec();
+    SaveImageCmd.Exec createSaveImageCmdExec();
 
-    public CreateImageCmd.Exec createCreateImageCmdExec();
+    CreateImageCmd.Exec createCreateImageCmdExec();
 
-    public SearchImagesCmd.Exec createSearchImagesCmdExec();
+    SearchImagesCmd.Exec createSearchImagesCmdExec();
 
-    public RemoveImageCmd.Exec createRemoveImageCmdExec();
+    RemoveImageCmd.Exec createRemoveImageCmdExec();
 
-    public ListImagesCmd.Exec createListImagesCmdExec();
+    ListImagesCmd.Exec createListImagesCmdExec();
 
-    public InspectImageCmd.Exec createInspectImageCmdExec();
+    InspectImageCmd.Exec createInspectImageCmdExec();
 
-    public ListContainersCmd.Exec createListContainersCmdExec();
+    ListContainersCmd.Exec createListContainersCmdExec();
 
-    public CreateContainerCmd.Exec createCreateContainerCmdExec();
+    CreateContainerCmd.Exec createCreateContainerCmdExec();
 
-    public StartContainerCmd.Exec createStartContainerCmdExec();
+    StartContainerCmd.Exec createStartContainerCmdExec();
 
-    public InspectContainerCmd.Exec createInspectContainerCmdExec();
+    InspectContainerCmd.Exec createInspectContainerCmdExec();
 
-    public RemoveContainerCmd.Exec createRemoveContainerCmdExec();
+    RemoveContainerCmd.Exec createRemoveContainerCmdExec();
 
-    public WaitContainerCmd.Exec createWaitContainerCmdExec();
+    WaitContainerCmd.Exec createWaitContainerCmdExec();
 
-    public AttachContainerCmd.Exec createAttachContainerCmdExec();
+    AttachContainerCmd.Exec createAttachContainerCmdExec();
 
-    public ExecStartCmd.Exec createExecStartCmdExec();
+    ExecStartCmd.Exec createExecStartCmdExec();
 
-    public InspectExecCmd.Exec createInspectExecCmdExec();
+    InspectExecCmd.Exec createInspectExecCmdExec();
 
-    public LogContainerCmd.Exec createLogContainerCmdExec();
+    LogContainerCmd.Exec createLogContainerCmdExec();
 
-    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec();
+    CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec();
 
-    public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec();
+    CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec();
 
-    public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec();
+    CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec();
 
-    public StopContainerCmd.Exec createStopContainerCmdExec();
+    StopContainerCmd.Exec createStopContainerCmdExec();
 
-    public ContainerDiffCmd.Exec createContainerDiffCmdExec();
+    ContainerDiffCmd.Exec createContainerDiffCmdExec();
 
-    public KillContainerCmd.Exec createKillContainerCmdExec();
+    KillContainerCmd.Exec createKillContainerCmdExec();
 
     UpdateContainerCmd.Exec createUpdateContainerCmdExec();
 
-    public RestartContainerCmd.Exec createRestartContainerCmdExec();
+    RestartContainerCmd.Exec createRestartContainerCmdExec();
 
-    public CommitCmd.Exec createCommitCmdExec();
+    CommitCmd.Exec createCommitCmdExec();
 
-    public BuildImageCmd.Exec createBuildImageCmdExec();
+    BuildImageCmd.Exec createBuildImageCmdExec();
 
-    public TopContainerCmd.Exec createTopContainerCmdExec();
+    TopContainerCmd.Exec createTopContainerCmdExec();
 
-    public TagImageCmd.Exec createTagImageCmdExec();
+    TagImageCmd.Exec createTagImageCmdExec();
 
-    public PauseContainerCmd.Exec createPauseContainerCmdExec();
+    PauseContainerCmd.Exec createPauseContainerCmdExec();
 
-    public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec();
+    UnpauseContainerCmd.Exec createUnpauseContainerCmdExec();
 
-    public EventsCmd.Exec createEventsCmdExec();
+    EventsCmd.Exec createEventsCmdExec();
 
-    public StatsCmd.Exec createStatsCmdExec();
+    StatsCmd.Exec createStatsCmdExec();
 
-    public CreateVolumeCmd.Exec createCreateVolumeCmdExec();
+    CreateVolumeCmd.Exec createCreateVolumeCmdExec();
 
-    public InspectVolumeCmd.Exec createInspectVolumeCmdExec();
+    InspectVolumeCmd.Exec createInspectVolumeCmdExec();
 
-    public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec();
+    RemoveVolumeCmd.Exec createRemoveVolumeCmdExec();
 
-    public ListVolumesCmd.Exec createListVolumesCmdExec();
+    ListVolumesCmd.Exec createListVolumesCmdExec();
 
-    public ListNetworksCmd.Exec createListNetworksCmdExec();
+    ListNetworksCmd.Exec createListNetworksCmdExec();
 
-    public InspectNetworkCmd.Exec createInspectNetworkCmdExec();
+    InspectNetworkCmd.Exec createInspectNetworkCmdExec();
 
-    public CreateNetworkCmd.Exec createCreateNetworkCmdExec();
+    CreateNetworkCmd.Exec createCreateNetworkCmdExec();
 
-    public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec();
+    RemoveNetworkCmd.Exec createRemoveNetworkCmdExec();
 
-    public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec();
+    ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec();
 
-    public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec();
+    DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec();
 
-    public DockerCmdExecFactory withSSLContext(SSLContext sslContext);
+    DockerCmdExecFactory withSSLContext(SSLContext sslContext);
 
     @Override
-    public void close() throws IOException;
+    void close() throws IOException;
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdSyncExec.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdSyncExec.java
index 678b4afe1..a4cd40707 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdSyncExec.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdSyncExec.java
@@ -2,6 +2,6 @@
 
 public interface DockerCmdSyncExec<CMD_T extends DockerCmd<RES_T>, RES_T> {
 
-    public RES_T exec(CMD_T command);
+    RES_T exec(CMD_T command);
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java b/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
index 8c03270df..c52706226 100644
--- a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
@@ -13,56 +13,56 @@
 public interface EventsCmd extends AsyncDockerCmd<EventsCmd, Event> {
 
     @CheckForNull
-    public Map<String, List<String>> getFilters();
+    Map<String, List<String>> getFilters();
 
     @CheckForNull
-    public String getSince();
+    String getSince();
 
     @CheckForNull
-    public String getUntil();
+    String getUntil();
 
     /**
      * @param container
      *            - container to filter
      */
-    public EventsCmd withContainerFilter(String... container);
+    EventsCmd withContainerFilter(String... container);
 
     /**
      * @param event
      *            - event to filter (pull | create | attach | start | stop | kill)
      */
-    public EventsCmd withEventFilter(String... event);
+    EventsCmd withEventFilter(String... event);
 
     /**
      * @param image
      *            - image to filter
      */
-    public EventsCmd withImageFilter(String... image);
+    EventsCmd withImageFilter(String... image);
 
     /**
      * @param label
      *            - label to filter
      */
-    public EventsCmd withLabelFilter(String... label);
+    EventsCmd withLabelFilter(String... label);
 
     /**
      * @param labels
      *            - labels to filter (map of names and values)
      */
-    public EventsCmd withLabelFilter(Map<String, String> labels);
+    EventsCmd withLabelFilter(Map<String, String> labels);
 
     /**
      * @param since
      *            - Show all events created since timestamp
      */
-    public EventsCmd withSince(String since);
+    EventsCmd withSince(String since);
 
     /**
      * @param until
      *            - Show all events created until timestamp
      */
-    public EventsCmd withUntil(String until);
+    EventsCmd withUntil(String until);
 
-    public static interface Exec extends DockerCmdAsyncExec<EventsCmd, Event> {
+    interface Exec extends DockerCmdAsyncExec<EventsCmd, Event> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
index 67ffe5818..fe2329290 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
@@ -6,33 +6,33 @@
 public interface ExecCreateCmd extends SyncDockerCmd<ExecCreateCmdResponse> {
 
     @CheckForNull
-    public String getContainerId();
+    String getContainerId();
 
     @CheckForNull
-    public Boolean hasAttachStderrEnabled();
+    Boolean hasAttachStderrEnabled();
 
     @CheckForNull
-    public Boolean hasAttachStdinEnabled();
+    Boolean hasAttachStdinEnabled();
 
     @CheckForNull
-    public Boolean hasAttachStdoutEnabled();
+    Boolean hasAttachStdoutEnabled();
 
     @CheckForNull
-    public Boolean hasTtyEnabled();
+    Boolean hasTtyEnabled();
 
-    public ExecCreateCmd withAttachStderr(Boolean attachStderr);
+    ExecCreateCmd withAttachStderr(Boolean attachStderr);
 
-    public ExecCreateCmd withAttachStdin(Boolean attachStdin);
+    ExecCreateCmd withAttachStdin(Boolean attachStdin);
 
-    public ExecCreateCmd withAttachStdout(Boolean attachStdout);
+    ExecCreateCmd withAttachStdout(Boolean attachStdout);
 
-    public ExecCreateCmd withCmd(String... cmd);
+    ExecCreateCmd withCmd(String... cmd);
 
-    public ExecCreateCmd withContainerId(@Nonnull String containerId);
+    ExecCreateCmd withContainerId(@Nonnull String containerId);
 
-    public ExecCreateCmd withTty(Boolean tty);
+    ExecCreateCmd withTty(Boolean tty);
 
-    public static interface Exec extends DockerCmdSyncExec<ExecCreateCmd, ExecCreateCmdResponse> {
+    interface Exec extends DockerCmdSyncExec<ExecCreateCmd, ExecCreateCmdResponse> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
index e102ef71b..6d151be61 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
@@ -12,24 +12,24 @@
 public interface ExecStartCmd extends AsyncDockerCmd<ExecStartCmd, Frame> {
 
     @CheckForNull
-    public String getExecId();
+    String getExecId();
 
     @CheckForNull
-    public Boolean hasDetachEnabled();
+    Boolean hasDetachEnabled();
 
     @CheckForNull
-    public Boolean hasTtyEnabled();
+    Boolean hasTtyEnabled();
 
     @CheckForNull
-    public InputStream getStdin();
+    InputStream getStdin();
 
-    public ExecStartCmd withDetach(Boolean detach);
+    ExecStartCmd withDetach(Boolean detach);
 
-    public ExecStartCmd withExecId(@Nonnull String execId);
+    ExecStartCmd withExecId(@Nonnull String execId);
 
-    public ExecStartCmd withTty(Boolean tty);
+    ExecStartCmd withTty(Boolean tty);
 
-    public ExecStartCmd withStdIn(InputStream stdin);
+    ExecStartCmd withStdIn(InputStream stdin);
 
     /**
      *
@@ -37,9 +37,9 @@ public interface ExecStartCmd extends AsyncDockerCmd<ExecStartCmd, Frame> {
      *             No such exec instance
      */
     @Override
-    public <T extends ResultCallback<Frame>> T exec(T resultCallback);
+    <T extends ResultCallback<Frame>> T exec(T resultCallback);
 
-    public static interface Exec extends DockerCmdAsyncExec<ExecStartCmd, Frame> {
+    interface Exec extends DockerCmdAsyncExec<ExecStartCmd, Frame> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/InfoCmd.java b/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
index 257c3bec1..5dead0f45 100644
--- a/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
@@ -4,7 +4,7 @@
 
 public interface InfoCmd extends SyncDockerCmd<Info> {
 
-    public static interface Exec extends DockerCmdSyncExec<InfoCmd, Info> {
+    interface Exec extends DockerCmdSyncExec<InfoCmd, Info> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
index b5fbe212f..cb782c64d 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
@@ -8,17 +8,17 @@
 public interface InspectContainerCmd extends SyncDockerCmd<InspectContainerResponse> {
 
     @CheckForNull
-    public String getContainerId();
+    String getContainerId();
 
-    public InspectContainerCmd withContainerId(@Nonnull String containerId);
+    InspectContainerCmd withContainerId(@Nonnull String containerId);
 
     /**
      * @throws NotFoundException
      *             No such container
      */
     @Override
-    public InspectContainerResponse exec() throws NotFoundException;
+    InspectContainerResponse exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdSyncExec<InspectContainerCmd, InspectContainerResponse> {
+    interface Exec extends DockerCmdSyncExec<InspectContainerCmd, InspectContainerResponse> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
index d1c6b48f1..fdb2577c4 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
@@ -8,17 +8,17 @@
 public interface InspectExecCmd extends SyncDockerCmd<InspectExecResponse> {
 
     @CheckForNull
-    public String getExecId();
+    String getExecId();
 
-    public InspectExecCmd withExecId(@Nonnull String execId);
+    InspectExecCmd withExecId(@Nonnull String execId);
 
     /**
      * @throws NotFoundException
      *             if no such exec has been found
      */
     @Override
-    public InspectExecResponse exec() throws NotFoundException;
+    InspectExecResponse exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdSyncExec<InspectExecCmd, InspectExecResponse> {
+    interface Exec extends DockerCmdSyncExec<InspectExecCmd, InspectExecResponse> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
index 253c31e78..411a71bcb 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
@@ -11,18 +11,18 @@
 public interface InspectImageCmd extends SyncDockerCmd<InspectImageResponse> {
 
     @CheckForNull
-    public String getImageId();
+    String getImageId();
 
-    public InspectImageCmd withImageId(@Nonnull String imageId);
+    InspectImageCmd withImageId(@Nonnull String imageId);
 
     /**
      * @throws NotFoundException
      *             No such image
      */
     @Override
-    public InspectImageResponse exec() throws NotFoundException;
+    InspectImageResponse exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdSyncExec<InspectImageCmd, InspectImageResponse> {
+    interface Exec extends DockerCmdSyncExec<InspectImageCmd, InspectImageResponse> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java
index 18394879a..2e5536731 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java
@@ -15,17 +15,17 @@
 public interface InspectNetworkCmd extends SyncDockerCmd<Network> {
 
     @CheckForNull
-    public String getNetworkId();
+    String getNetworkId();
 
-    public InspectNetworkCmd withNetworkId(@Nonnull String networkId);
+    InspectNetworkCmd withNetworkId(@Nonnull String networkId);
 
     /**
      * @throws NotFoundException
      *             No such network
      */
     @Override
-    public Network exec() throws NotFoundException;
+    Network exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdSyncExec<InspectNetworkCmd, Network> {
+    interface Exec extends DockerCmdSyncExec<InspectNetworkCmd, Network> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java
index bf08e18b4..73d552d22 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java
@@ -10,14 +10,14 @@
  */
 public interface InspectVolumeCmd extends SyncDockerCmd<InspectVolumeResponse> {
 
-    public String getName();
+    String getName();
 
     /**
      * @param name
      *            - The volume’s name.
      */
-    public InspectVolumeCmd withName(@Nonnull String name);
+    InspectVolumeCmd withName(@Nonnull String name);
 
-    public static interface Exec extends DockerCmdSyncExec<InspectVolumeCmd, InspectVolumeResponse> {
+    interface Exec extends DockerCmdSyncExec<InspectVolumeCmd, InspectVolumeResponse> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
index aca3902c0..e64d7b393 100644
--- a/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
@@ -11,23 +11,23 @@
 public interface KillContainerCmd extends SyncDockerCmd<Void> {
 
     @CheckForNull
-    public String getContainerId();
+    String getContainerId();
 
     @CheckForNull
-    public String getSignal();
+    String getSignal();
 
-    public KillContainerCmd withContainerId(@Nonnull String containerId);
+    KillContainerCmd withContainerId(@Nonnull String containerId);
 
-    public KillContainerCmd withSignal(String signal);
+    KillContainerCmd withSignal(String signal);
 
     /**
      * @throws NotFoundException
      *             No such container
      */
     @Override
-    public Void exec() throws NotFoundException;
+    Void exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdSyncExec<KillContainerCmd, Void> {
+    interface Exec extends DockerCmdSyncExec<KillContainerCmd, Void> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
index f55089393..7c6c9acec 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
@@ -14,78 +14,78 @@
 public interface ListContainersCmd extends SyncDockerCmd<List<Container>> {
 
     @CheckForNull
-    public String getBeforeId();
+    String getBeforeId();
 
     @CheckForNull
-    public Map<String, List<String>> getFilters();
+    Map<String, List<String>> getFilters();
 
     @CheckForNull
-    public Integer getLimit();
+    Integer getLimit();
 
     @CheckForNull
-    public String getSinceId();
+    String getSinceId();
 
     @CheckForNull
-    public Boolean hasShowAllEnabled();
+    Boolean hasShowAllEnabled();
 
     @CheckForNull
-    public Boolean hasShowSizeEnabled();
+    Boolean hasShowSizeEnabled();
 
     /**
      * @param before
      *            - Show only containers created before Id, include non-running ones.
      */
-    public ListContainersCmd withBefore(String before);
+    ListContainersCmd withBefore(String before);
 
     /**
      * @param exitcode
      *            - Show only containers that exited with the passed exitcode.
      */
-    public ListContainersCmd withExitcodeFilter(Integer exitcode);
+    ListContainersCmd withExitcodeFilter(Integer exitcode);
 
     /**
      * @param status
      *            - Show only containers with the passed status (created|restarting|running|paused|exited).
      */
-    public ListContainersCmd withStatusFilter(String status);
+    ListContainersCmd withStatusFilter(String status);
 
     /**
      * @param labels
      *            - Show only containers with the passed labels.
      */
-    public ListContainersCmd withLabelFilter(String... labels);
+    ListContainersCmd withLabelFilter(String... labels);
 
     /**
      * @param labels
      *            - Show only containers with the passed labels. Labels is a {@link Map} that contains label keys and values
      */
-    public ListContainersCmd withLabelFilter(Map<String, String> labels);
+    ListContainersCmd withLabelFilter(Map<String, String> labels);
 
     /**
      * @param limit
      *            - Show `limit` last created containers, include non-running ones. There is no limit by default.
      */
-    public ListContainersCmd withLimit(Integer limit);
+    ListContainersCmd withLimit(Integer limit);
 
     /**
      * @param showAll
      *            - Show all containers. Only running containers are shown by default.
      */
-    public ListContainersCmd withShowAll(Boolean showAll);
+    ListContainersCmd withShowAll(Boolean showAll);
 
     /**
      * @param showSize
      *            - Show the containers sizes. This is false by default.
      */
-    public ListContainersCmd withShowSize(Boolean showSize);
+    ListContainersCmd withShowSize(Boolean showSize);
 
     /**
      * @param since
      *            - Show only containers created since Id, include non-running ones.
      */
-    public ListContainersCmd withSince(String since);
+    ListContainersCmd withSince(String since);
 
-    public static interface Exec extends DockerCmdSyncExec<ListContainersCmd, List<Container>> {
+    interface Exec extends DockerCmdSyncExec<ListContainersCmd, List<Container>> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java b/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
index 7dee8c918..7741df743 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
@@ -13,38 +13,38 @@
 public interface ListImagesCmd extends SyncDockerCmd<List<Image>> {
 
     @CheckForNull
-    public Map<String, List<String>> getFilters();
+    Map<String, List<String>> getFilters();
 
-    public String getImageNameFilter();
+    String getImageNameFilter();
 
     @CheckForNull
-    public Boolean hasShowAllEnabled();
+    Boolean hasShowAllEnabled();
 
     /**
      * Show all images (by default filter out the intermediate images used to build)
      */
-    public ListImagesCmd withShowAll(Boolean showAll);
+    ListImagesCmd withShowAll(Boolean showAll);
 
-    public ListImagesCmd withImageNameFilter(String imageName);
+    ListImagesCmd withImageNameFilter(String imageName);
 
     /**
      * Filter dangling images
      */
-    public ListImagesCmd withDanglingFilter(Boolean dangling);
+    ListImagesCmd withDanglingFilter(Boolean dangling);
 
     /**
      * @param labels
      *            - string array in the form ["key"] or ["key=value"] or a mix of both
      */
-    public ListImagesCmd withLabelFilter(String... label);
+    ListImagesCmd withLabelFilter(String... label);
 
     /**
      * @param labels
      *            - {@link Map} of labels that contains label keys and values
      */
-    public ListImagesCmd withLabelFilter(Map<String, String> labels);
+    ListImagesCmd withLabelFilter(Map<String, String> labels);
 
-    public static interface Exec extends DockerCmdSyncExec<ListImagesCmd, List<Image>> {
+    interface Exec extends DockerCmdSyncExec<ListImagesCmd, List<Image>> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java b/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
index dd3c89c7b..23d92151c 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
@@ -16,12 +16,12 @@
 public interface ListNetworksCmd extends SyncDockerCmd<List<Network>> {
 
     @CheckForNull
-    public Map<String, List<String>> getFilters();
+    Map<String, List<String>> getFilters();
 
     ListNetworksCmd withNameFilter(String... networkName);
 
     ListNetworksCmd withIdFilter(String... networkId);
 
-    public static interface Exec extends DockerCmdSyncExec<ListNetworksCmd, List<Network>> {
+    interface Exec extends DockerCmdSyncExec<ListNetworksCmd, List<Network>> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java b/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java
index a049aa20f..88c6ee291 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java
@@ -13,14 +13,14 @@
 public interface ListVolumesCmd extends SyncDockerCmd<ListVolumesResponse> {
 
     @CheckForNull
-    public Map<String, List<String>> getFilters();
+    Map<String, List<String>> getFilters();
 
     /**
      * @param dangling
      *            - Show dangling volumes filter
      */
-    public ListVolumesCmd withDanglingFilter(Boolean dangling);
+    ListVolumesCmd withDanglingFilter(Boolean dangling);
 
-    public static interface Exec extends DockerCmdSyncExec<ListVolumesCmd, ListVolumesResponse> {
+    interface Exec extends DockerCmdSyncExec<ListVolumesCmd, ListVolumesResponse> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
index bb3081ce4..53674cbaa 100644
--- a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -29,54 +29,54 @@
 public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame> {
 
     @CheckForNull
-    public String getContainerId();
+    String getContainerId();
 
     @CheckForNull
-    public Integer getTail();
+    Integer getTail();
 
     @CheckForNull
-    public Boolean hasFollowStreamEnabled();
+    Boolean hasFollowStreamEnabled();
 
     @CheckForNull
-    public Boolean hasTimestampsEnabled();
+    Boolean hasTimestampsEnabled();
 
     @CheckForNull
-    public Boolean hasStdoutEnabled();
+    Boolean hasStdoutEnabled();
 
     @CheckForNull
-    public Boolean hasStderrEnabled();
+    Boolean hasStderrEnabled();
 
     @CheckForNull
-    public Integer getSince();
+    Integer getSince();
 
-    public LogContainerCmd withContainerId(@Nonnull String containerId);
+    LogContainerCmd withContainerId(@Nonnull String containerId);
 
     /**
      * Following the stream means the resulting {@link InputStream} returned by {@link #exec()} reads infinitely. So a
      * {@link InputStream#read()} MAY BLOCK FOREVER as long as no data is streamed from the docker host to {@link DockerClient}!
      */
-    public LogContainerCmd withFollowStream(Boolean followStream);
+    LogContainerCmd withFollowStream(Boolean followStream);
 
-    public LogContainerCmd withTimestamps(Boolean timestamps);
+    LogContainerCmd withTimestamps(Boolean timestamps);
 
-    public LogContainerCmd withStdOut(Boolean stdout);
+    LogContainerCmd withStdOut(Boolean stdout);
 
-    public LogContainerCmd withStdErr(Boolean stderr);
+    LogContainerCmd withStdErr(Boolean stderr);
 
-    public LogContainerCmd withTailAll();
+    LogContainerCmd withTailAll();
 
-    public LogContainerCmd withTail(Integer tail);
+    LogContainerCmd withTail(Integer tail);
 
-    public LogContainerCmd withSince(Integer since);
+    LogContainerCmd withSince(Integer since);
 
     /**
      * @throws com.github.dockerjava.api.NotFoundException
      *             No such container
      */
     @Override
-    public <T extends ResultCallback<Frame>> T exec(T resultCallback);
+    <T extends ResultCallback<Frame>> T exec(T resultCallback);
 
-    public static interface Exec extends DockerCmdAsyncExec<LogContainerCmd, Frame> {
+    interface Exec extends DockerCmdAsyncExec<LogContainerCmd, Frame> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
index 74a4c86bc..813c40d50 100644
--- a/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
@@ -15,18 +15,18 @@
 public interface PauseContainerCmd extends SyncDockerCmd<Void> {
 
     @CheckForNull
-    public String getContainerId();
+    String getContainerId();
 
-    public PauseContainerCmd withContainerId(@Nonnull String containerId);
+    PauseContainerCmd withContainerId(@Nonnull String containerId);
 
     /**
      * @throws NotFoundException
      *             No such container
      */
     @Override
-    public Void exec() throws NotFoundException;
+    Void exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdSyncExec<PauseContainerCmd, Void> {
+    interface Exec extends DockerCmdSyncExec<PauseContainerCmd, Void> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/PingCmd.java b/src/main/java/com/github/dockerjava/api/command/PingCmd.java
index 07de7e959..54b81b981 100644
--- a/src/main/java/com/github/dockerjava/api/command/PingCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PingCmd.java
@@ -6,7 +6,7 @@
  */
 public interface PingCmd extends SyncDockerCmd<Void> {
 
-    public static interface Exec extends DockerCmdSyncExec<PingCmd, Void> {
+    interface Exec extends DockerCmdSyncExec<PingCmd, Void> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java b/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
index 319fecd14..8127f7b1f 100644
--- a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
@@ -14,24 +14,24 @@
 public interface PullImageCmd extends AsyncDockerCmd<PullImageCmd, PullResponseItem> {
 
     @CheckForNull
-    public String getRepository();
+    String getRepository();
 
     @CheckForNull
-    public String getTag();
+    String getTag();
 
     @CheckForNull
-    public String getRegistry();
+    String getRegistry();
 
-    public AuthConfig getAuthConfig();
+    AuthConfig getAuthConfig();
 
-    public PullImageCmd withRepository(@Nonnull String repository);
+    PullImageCmd withRepository(@Nonnull String repository);
 
-    public PullImageCmd withTag(String tag);
+    PullImageCmd withTag(String tag);
 
-    public PullImageCmd withRegistry(String registry);
+    PullImageCmd withRegistry(String registry);
 
-    public PullImageCmd withAuthConfig(AuthConfig authConfig);
+    PullImageCmd withAuthConfig(AuthConfig authConfig);
 
-    public static interface Exec extends DockerCmdAsyncExec<PullImageCmd, PullResponseItem> {
+    interface Exec extends DockerCmdAsyncExec<PullImageCmd, PullResponseItem> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java b/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
index 8b9f3961e..abd86c53c 100644
--- a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
@@ -17,35 +17,35 @@
 public interface PushImageCmd extends AsyncDockerCmd<PushImageCmd, PushResponseItem> {
 
     @CheckForNull
-    public AuthConfig getAuthConfig();
+    AuthConfig getAuthConfig();
 
     @CheckForNull
-    public String getName();
+    String getName();
 
     @CheckForNull
-    public String getTag();
+    String getTag();
 
     /**
      * @param name
      *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
      */
-    public PushImageCmd withName(@Nonnull String name);
+    PushImageCmd withName(@Nonnull String name);
 
     /**
      * @param tag
      *            The image's tag. Not null.
      */
-    public PushImageCmd withTag(String tag);
+    PushImageCmd withTag(String tag);
 
-    public PushImageCmd withAuthConfig(AuthConfig authConfig);
+    PushImageCmd withAuthConfig(AuthConfig authConfig);
 
     /**
      * @throws NotFoundException
      *             No such image
      */
     @Override
-    public <T extends ResultCallback<PushResponseItem>> T exec(T resultCallback);
+    <T extends ResultCallback<PushResponseItem>> T exec(T resultCallback);
 
-    public static interface Exec extends DockerCmdAsyncExec<PushImageCmd, PushResponseItem> {
+    interface Exec extends DockerCmdAsyncExec<PushImageCmd, PushResponseItem> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
index bcc700d03..0a057af81 100644
--- a/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
@@ -16,28 +16,28 @@
 public interface RemoveContainerCmd extends SyncDockerCmd<Void> {
 
     @CheckForNull
-    public String getContainerId();
+    String getContainerId();
 
     @CheckForNull
-    public Boolean hasRemoveVolumesEnabled();
+    Boolean hasRemoveVolumesEnabled();
 
     @CheckForNull
-    public Boolean hasForceEnabled();
+    Boolean hasForceEnabled();
 
-    public RemoveContainerCmd withContainerId(@Nonnull String containerId);
+    RemoveContainerCmd withContainerId(@Nonnull String containerId);
 
-    public RemoveContainerCmd withRemoveVolumes(Boolean removeVolumes);
+    RemoveContainerCmd withRemoveVolumes(Boolean removeVolumes);
 
-    public RemoveContainerCmd withForce(Boolean force);
+    RemoveContainerCmd withForce(Boolean force);
 
     /**
      * @throws NotFoundException
      *             No such container
      */
     @Override
-    public Void exec() throws NotFoundException;
+    Void exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdSyncExec<RemoveContainerCmd, Void> {
+    interface Exec extends DockerCmdSyncExec<RemoveContainerCmd, Void> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
index cfd9c36cd..a1942b69b 100644
--- a/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
@@ -13,35 +13,35 @@
 public interface RemoveImageCmd extends SyncDockerCmd<Void> {
 
     @CheckForNull
-    public String getImageId();
+    String getImageId();
 
     @CheckForNull
-    public Boolean hasForceEnabled();
+    Boolean hasForceEnabled();
 
     @CheckForNull
-    public Boolean hasNoPruneEnabled();
+    Boolean hasNoPruneEnabled();
 
-    public RemoveImageCmd withImageId(@Nonnull String imageId);
+    RemoveImageCmd withImageId(@Nonnull String imageId);
 
     /**
      * force parameter to force delete of an image, even if it's tagged in multiple repositories
      */
-    public RemoveImageCmd withForce(Boolean force);
+    RemoveImageCmd withForce(Boolean force);
 
     /**
      * noprune parameter to prevent the deletion of parent images
      *
      */
-    public RemoveImageCmd withNoPrune(Boolean noPrune);
+    RemoveImageCmd withNoPrune(Boolean noPrune);
 
     /**
      * @throws NotFoundException
      *             No such image
      */
     @Override
-    public Void exec() throws NotFoundException;
+    Void exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdSyncExec<RemoveImageCmd, Void> {
+    interface Exec extends DockerCmdSyncExec<RemoveImageCmd, Void> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java
index 3dcb428e2..b6ad0e652 100644
--- a/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java
@@ -14,17 +14,17 @@
 public interface RemoveNetworkCmd extends SyncDockerCmd<Void> {
 
     @CheckForNull
-    public String getNetworkId();
+    String getNetworkId();
 
-    public RemoveNetworkCmd withNetworkId(@Nonnull String networkId);
+    RemoveNetworkCmd withNetworkId(@Nonnull String networkId);
 
     /**
      * @throws NotFoundException
      *             No such network
      */
     @Override
-    public Void exec() throws NotFoundException;
+    Void exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdSyncExec<RemoveNetworkCmd, Void> {
+    interface Exec extends DockerCmdSyncExec<RemoveNetworkCmd, Void> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java
index ba136af25..c21ad240d 100644
--- a/src/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java
@@ -12,9 +12,9 @@
  */
 public interface RemoveVolumeCmd extends SyncDockerCmd<Void> {
 
-    public String getName();
+    String getName();
 
-    public RemoveVolumeCmd withName(@Nonnull String name);
+    RemoveVolumeCmd withName(@Nonnull String name);
 
     /**
      * @throws NotFoundException
@@ -23,8 +23,8 @@ public interface RemoveVolumeCmd extends SyncDockerCmd<Void> {
      *             Volume is in use and cannot be removed
      */
     @Override
-    public Void exec() throws NotFoundException;
+    Void exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdSyncExec<RemoveVolumeCmd, Void> {
+    interface Exec extends DockerCmdSyncExec<RemoveVolumeCmd, Void> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
index d15666437..5dcc59c24 100644
--- a/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
@@ -15,23 +15,23 @@
 public interface RestartContainerCmd extends SyncDockerCmd<Void> {
 
     @CheckForNull
-    public String getContainerId();
+    String getContainerId();
 
     @CheckForNull
-    public Integer getTimeout();
+    Integer getTimeout();
 
-    public RestartContainerCmd withContainerId(@Nonnull String containerId);
+    RestartContainerCmd withContainerId(@Nonnull String containerId);
 
-    public RestartContainerCmd withtTimeout(Integer timeout);
+    RestartContainerCmd withtTimeout(Integer timeout);
 
     /**
      * @throws NotFoundException
      *             No such container
      */
     @Override
-    public Void exec() throws NotFoundException;
+    Void exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdSyncExec<RestartContainerCmd, Void> {
+    interface Exec extends DockerCmdSyncExec<RestartContainerCmd, Void> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java b/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
index 272a2d564..aee9011cb 100644
--- a/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
@@ -10,22 +10,22 @@
 public interface SaveImageCmd extends SyncDockerCmd<InputStream> {
 
     @CheckForNull
-    public String getName();
+    String getName();
 
     @CheckForNull
-    public String getTag();
+    String getTag();
 
     /**
      * @param name
      *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
      */
-    public SaveImageCmd withName(@Nonnull String name);
+    SaveImageCmd withName(@Nonnull String name);
 
     /**
      * @param tag
      *            The image's tag. Not null.
      */
-    public SaveImageCmd withTag(String tag);
+    SaveImageCmd withTag(String tag);
 
     /**
      * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
@@ -33,9 +33,9 @@ public interface SaveImageCmd extends SyncDockerCmd<InputStream> {
      * @throws NotFoundException
      *             No such image
      */
-    public InputStream exec() throws NotFoundException;
+    InputStream exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdSyncExec<SaveImageCmd, InputStream> {
+    interface Exec extends DockerCmdSyncExec<SaveImageCmd, InputStream> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java b/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
index 42cd6917e..2bc87cc73 100644
--- a/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
@@ -17,11 +17,11 @@
 public interface SearchImagesCmd extends SyncDockerCmd<List<SearchItem>> {
 
     @CheckForNull
-    public String getTerm();
+    String getTerm();
 
-    public SearchImagesCmd withTerm(@Nonnull String term);
+    SearchImagesCmd withTerm(@Nonnull String term);
 
-    public static interface Exec extends DockerCmdSyncExec<SearchImagesCmd, List<SearchItem>> {
+    interface Exec extends DockerCmdSyncExec<SearchImagesCmd, List<SearchItem>> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
index 4be500b4f..e82f7f433 100644
--- a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
@@ -24,8 +24,8 @@ public interface StartContainerCmd extends SyncDockerCmd<Void> {
      *             Container already started
      */
     @Override
-    public Void exec() throws NotFoundException, NotModifiedException;
+    Void exec() throws NotFoundException, NotModifiedException;
 
-    public static interface Exec extends DockerCmdSyncExec<StartContainerCmd, Void> {
+    interface Exec extends DockerCmdSyncExec<StartContainerCmd, Void> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/StatsCmd.java b/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
index d2d7fe385..6085a810b 100644
--- a/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
@@ -12,10 +12,10 @@
 public interface StatsCmd extends AsyncDockerCmd<StatsCmd, Statistics> {
 
     @CheckForNull
-    public String getContainerId();
+    String getContainerId();
 
-    public StatsCmd withContainerId(@Nonnull String containerId);
+    StatsCmd withContainerId(@Nonnull String containerId);
 
-    public static interface Exec extends DockerCmdAsyncExec<StatsCmd, Statistics> {
+    interface Exec extends DockerCmdAsyncExec<StatsCmd, Statistics> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
index 2c99a5fd5..3b39fec9c 100644
--- a/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
@@ -18,14 +18,14 @@
 public interface StopContainerCmd extends SyncDockerCmd<Void> {
 
     @CheckForNull
-    public String getContainerId();
+    String getContainerId();
 
     @CheckForNull
-    public Integer getTimeout();
+    Integer getTimeout();
 
-    public StopContainerCmd withContainerId(@Nonnull String containerId);
+    StopContainerCmd withContainerId(@Nonnull String containerId);
 
-    public StopContainerCmd withTimeout(Integer timeout);
+    StopContainerCmd withTimeout(Integer timeout);
 
     /**
      * @throws NotFoundException
@@ -34,9 +34,9 @@ public interface StopContainerCmd extends SyncDockerCmd<Void> {
      *             Container already stopped
      */
     @Override
-    public Void exec() throws NotFoundException, NotModifiedException;
+    Void exec() throws NotFoundException, NotModifiedException;
 
-    public static interface Exec extends DockerCmdSyncExec<StopContainerCmd, Void> {
+    interface Exec extends DockerCmdSyncExec<StopContainerCmd, Void> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java b/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java
index 4bc55fec6..2105f7b80 100644
--- a/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java
@@ -2,6 +2,6 @@
 
 public interface SyncDockerCmd<RES_T> extends DockerCmd<RES_T> {
 
-    public RES_T exec();
+    RES_T exec();
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java b/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
index 08b1411ff..07c8cd335 100644
--- a/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
@@ -17,28 +17,28 @@
 public interface TagImageCmd extends SyncDockerCmd<Void> {
 
     @CheckForNull
-    public String getImageId();
+    String getImageId();
 
     @CheckForNull
-    public String getRepository();
+    String getRepository();
 
     @CheckForNull
-    public String getTag();
+    String getTag();
 
     @CheckForNull
-    public Boolean hasForceEnabled();
+    Boolean hasForceEnabled();
 
-    public TagImageCmd withImageId(@Nonnull String imageId);
+    TagImageCmd withImageId(@Nonnull String imageId);
 
-    public TagImageCmd withRepository(String repository);
+    TagImageCmd withRepository(String repository);
 
-    public TagImageCmd withTag(String tag);
+    TagImageCmd withTag(String tag);
 
-    public TagImageCmd withForce();
+    TagImageCmd withForce();
 
-    public TagImageCmd withForce(Boolean force);
+    TagImageCmd withForce(Boolean force);
 
-    public static interface Exec extends DockerCmdSyncExec<TagImageCmd, Void> {
+    interface Exec extends DockerCmdSyncExec<TagImageCmd, Void> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
index edde72628..7cf2cee46 100644
--- a/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
@@ -11,23 +11,23 @@
 public interface TopContainerCmd extends SyncDockerCmd<TopContainerResponse> {
 
     @CheckForNull
-    public String getContainerId();
+    String getContainerId();
 
     @CheckForNull
-    public String getPsArgs();
+    String getPsArgs();
 
-    public TopContainerCmd withContainerId(@Nonnull String containerId);
+    TopContainerCmd withContainerId(@Nonnull String containerId);
 
-    public TopContainerCmd withPsArgs(String psArgs);
+    TopContainerCmd withPsArgs(String psArgs);
 
     /**
      * @throws NotFoundException
      *             No such container
      */
     @Override
-    public TopContainerResponse exec() throws NotFoundException;
+    TopContainerResponse exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdSyncExec<TopContainerCmd, TopContainerResponse> {
+    interface Exec extends DockerCmdSyncExec<TopContainerCmd, TopContainerResponse> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
index 8b751e55c..28c2e7d36 100644
--- a/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
@@ -15,18 +15,18 @@
 public interface UnpauseContainerCmd extends SyncDockerCmd<Void> {
 
     @CheckForNull
-    public String getContainerId();
+    String getContainerId();
 
-    public UnpauseContainerCmd withContainerId(@Nonnull String containerId);
+    UnpauseContainerCmd withContainerId(@Nonnull String containerId);
 
     /**
      * @throws NotFoundException
      *             No such container
      */
     @Override
-    public Void exec() throws NotFoundException;
+    Void exec() throws NotFoundException;
 
-    public static interface Exec extends DockerCmdSyncExec<UnpauseContainerCmd, Void> {
+    interface Exec extends DockerCmdSyncExec<UnpauseContainerCmd, Void> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
index d7e32e445..a834b7ba0 100644
--- a/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
@@ -15,51 +15,51 @@ public interface UpdateContainerCmd extends SyncDockerCmd<UpdateContainerRespons
     String getContainerId();
 
     @CheckForNull
-    public Integer getBlkioWeight();
+    Integer getBlkioWeight();
 
-    public UpdateContainerCmd withBlkioWeight(Integer blkioWeight);
+    UpdateContainerCmd withBlkioWeight(Integer blkioWeight);
 
-    public UpdateContainerCmd withContainerId(@Nonnull String containerId);
+    UpdateContainerCmd withContainerId(@Nonnull String containerId);
 
     @CheckForNull
-    public Integer getCpuPeriod();
+    Integer getCpuPeriod();
 
-    public UpdateContainerCmd withCpuPeriod(Integer cpuPeriod);
+    UpdateContainerCmd withCpuPeriod(Integer cpuPeriod);
 
     @CheckForNull
-    public Integer getCpuQuota();
+    Integer getCpuQuota();
 
-    public UpdateContainerCmd withCpuQuota(Integer cpuQuota);
+    UpdateContainerCmd withCpuQuota(Integer cpuQuota);
 
     @CheckForNull
-    public String getCpusetCpus();
+    String getCpusetCpus();
 
-    public UpdateContainerCmd withCpusetCpus(String cpusetCpus);
+    UpdateContainerCmd withCpusetCpus(String cpusetCpus);
 
     @CheckForNull
-    public String getCpusetMems();
+    String getCpusetMems();
 
-    public UpdateContainerCmd withCpusetMems(String cpusetMems);
+    UpdateContainerCmd withCpusetMems(String cpusetMems);
 
     @CheckForNull
-    public Integer getCpuShares();
+    Integer getCpuShares();
 
-    public UpdateContainerCmd withCpuShares(Integer cpuShares);
+    UpdateContainerCmd withCpuShares(Integer cpuShares);
 
     @CheckForNull
-    public Long getKernelMemory();
+    Long getKernelMemory();
 
-    public UpdateContainerCmd withKernelMemory(Long kernelMemory);
+    UpdateContainerCmd withKernelMemory(Long kernelMemory);
 
     @CheckForNull
-    public Long getMemory();
+    Long getMemory();
 
-    public UpdateContainerCmd withMemory(Long memory);
+    UpdateContainerCmd withMemory(Long memory);
 
     @CheckForNull
-    public Long getMemoryReservation();
+    Long getMemoryReservation();
 
-    public UpdateContainerCmd withMemoryReservation(Long memoryReservation);
+    UpdateContainerCmd withMemoryReservation(Long memoryReservation);
 
     @CheckForNull
     Long getMemorySwap();
diff --git a/src/main/java/com/github/dockerjava/api/command/VersionCmd.java b/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
index 789c521fb..1e45efb62 100644
--- a/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
@@ -7,7 +7,7 @@
  */
 public interface VersionCmd extends SyncDockerCmd<Version> {
 
-    public static interface Exec extends DockerCmdSyncExec<VersionCmd, Version> {
+    interface Exec extends DockerCmdSyncExec<VersionCmd, Version> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
index 6512e48d4..daa4e5d3c 100644
--- a/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
@@ -15,18 +15,18 @@
 public interface WaitContainerCmd extends AsyncDockerCmd<WaitContainerCmd, WaitResponse> {
 
     @CheckForNull
-    public String getContainerId();
+    String getContainerId();
 
-    public WaitContainerCmd withContainerId(@Nonnull String containerId);
+    WaitContainerCmd withContainerId(@Nonnull String containerId);
 
     /**
      * @throws NotFoundException
      *             container not found
      */
     @Override
-    public <T extends ResultCallback<WaitResponse>> T exec(T resultCallback);
+    <T extends ResultCallback<WaitResponse>> T exec(T resultCallback);
 
-    public static interface Exec extends DockerCmdAsyncExec<WaitContainerCmd, WaitResponse> {
+    interface Exec extends DockerCmdAsyncExec<WaitContainerCmd, WaitResponse> {
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
index 8c1bbdb86..f4fd0e958 100644
--- a/src/main/java/com/github/dockerjava/api/model/LogConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
@@ -68,7 +68,7 @@ public LogConfig setConfig(Map<String, String> config) {
 
     @JsonDeserialize(using = LoggingType.Deserializer.class)
     @JsonSerialize(using = LoggingType.Serializer.class)
-    public static enum LoggingType {
+    public enum LoggingType {
         DEFAULT("json-file"),
         JSON_FILE("json-file"),
         NONE("none"),
@@ -81,7 +81,7 @@ public static enum LoggingType {
 
         private String type;
 
-        private LoggingType(String type) {
+        LoggingType(String type) {
             this.type = type;
         }
 
diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index 62dce2adc..fa5dba722 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -245,7 +245,7 @@ private static final class ScanResult {
 
         public String pattern;
 
-        public ScanResult(boolean star, String chunk, String pattern) {
+        ScanResult(boolean star, String chunk, String pattern) {
             this.star = star;
             this.chunk = chunk;
             this.pattern = pattern;
@@ -257,7 +257,7 @@ private static final class GetEscResult {
 
         public int chunkOffset;
 
-        public GetEscResult(char lo, int chunkOffset) {
+        GetEscResult(char lo, int chunkOffset) {
             this.lo = lo;
             this.chunkOffset = chunkOffset;
         }
diff --git a/src/main/java/com/github/dockerjava/netty/MediaType.java b/src/main/java/com/github/dockerjava/netty/MediaType.java
index fac3a95e0..f65ca913f 100644
--- a/src/main/java/com/github/dockerjava/netty/MediaType.java
+++ b/src/main/java/com/github/dockerjava/netty/MediaType.java
@@ -14,7 +14,7 @@ public enum MediaType {
 
     private String mediaType;
 
-    private MediaType(String mediaType) {
+    MediaType(String mediaType) {
         this.mediaType = mediaType;
     }
 
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java b/src/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java
index 0d861cc01..ff4e02b63 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java
@@ -4,5 +4,5 @@
 
 public interface HttpRequestProvider {
 
-    public HttpRequest getHttpRequest(String uri);
+    HttpRequest getHttpRequest(String uri);
 }
diff --git a/src/test/resources/checkstyle/checkstyle-config.xml b/src/test/resources/checkstyle/checkstyle-config.xml
index ea30a270d..33508c723 100644
--- a/src/test/resources/checkstyle/checkstyle-config.xml
+++ b/src/test/resources/checkstyle/checkstyle-config.xml
@@ -115,8 +115,7 @@
         <!-- Modifier Checks                                    -->
         <!-- See http://checkstyle.sf.net/config_modifiers.html -->
         <module name="ModifierOrder"/>
-        <!-- Verify with @marcuslinke before. 576 violations -->
-        <!--<module name="RedundantModifier"/>-->
+        <module name="RedundantModifier"/>
 
 
         <!-- Checks for blocks. You know, those {}'s         -->

From 970fbb60b8c07fd55371f5bcd2a5b22eefe6cc16 Mon Sep 17 00:00:00 2001
From: Matthew Avant <mavant@palantir.com>
Date: Wed, 9 Mar 2016 21:13:26 -0800
Subject: [PATCH 0457/1272] Expose cgroup-parent to the client

---
 .../dockerjava/api/command/CreateContainerCmd.java   |  5 +++++
 .../core/command/CreateContainerCmdImpl.java         | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 1454a5f80..0181d86be 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -179,6 +179,9 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     String getPidMode();
 
+    @CheckForNull
+    String getCgroupParent();
+
     @CheckForNull
     Boolean isTty();
 
@@ -402,6 +405,8 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     CreateContainerCmd withWorkingDir(String workingDir);
 
+    CreateContainerCmd withCgroupParent(String cgroupParent);
+
     /**
      * Set the PID (Process) Namespace mode for the container, 'host': use the host's PID namespace inside the container
      */
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index e03acbf7f..4f69e9ed0 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -407,6 +407,11 @@ public String getPidMode() {
         return hostConfig.getPidMode();
     }
 
+    @Override
+    public String getCgroupParent() {
+        return hostConfig.getCgroupParent();
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this).append("create container ").append(name != null ? "name=" + name + " " : "")
@@ -871,6 +876,13 @@ public CreateContainerCmd withWorkingDir(String workingDir) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withCgroupParent(final String cgroupParent) {
+        checkNotNull(cgroupParent, "cgroupParent was not specified");
+        this.hostConfig.withCgroupParent(cgroupParent);
+        return this;
+    }
+
     @Override
     public CreateContainerCmd withPidMode(String pidMode) {
         checkNotNull(pidMode, "pidMode was not specified");

From 8703cf6cebd678493c13f16b6263f44be52496f7 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 11 Mar 2016 00:48:27 +0300
Subject: [PATCH 0458/1272] Update image inspect response.

Closes #493
---
 .../dockerjava/api/command/GraphDriver.java   |  76 ++++
 .../api/command/InspectImageResponse.java     | 277 ++++++++++++++-
 .../dockerjava/api/model/ContainerConfig.java | 334 ++++++++++++++++--
 .../api/command/InspectImageResponseTest.java | 163 +++++++++
 .../samples/1.22/images/docImage/doc.json     |  89 +++++
 .../samples/1.22/images/image1/inspect1.json  |  69 ++++
 6 files changed, 953 insertions(+), 55 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/command/GraphDriver.java
 create mode 100644 src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
 create mode 100644 src/test/resources/samples/1.22/images/docImage/doc.json
 create mode 100644 src/test/resources/samples/1.22/images/image1/inspect1.json

diff --git a/src/main/java/com/github/dockerjava/api/command/GraphDriver.java b/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
new file mode 100644
index 000000000..6285195c4
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
@@ -0,0 +1,76 @@
+package com.github.dockerjava.api.command;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import javax.annotation.CheckForNull;
+
+/**
+ * Part of {@link InspectImageResponse}
+ *
+ * @author Kanstantsin Shautsou
+ * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21}
+ */
+public class GraphDriver {
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21}
+     */
+    @JsonProperty("Name")
+    private String name;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21}
+     */
+    @JsonProperty("Data")
+    private String data;
+
+
+    /**
+     * @see #data
+     */
+    @CheckForNull
+    public String getData() {
+        return data;
+    }
+
+    /**
+     * @see #data
+     */
+    public GraphDriver withData(String data) {
+        this.data = data;
+        return this;
+    }
+
+    /**
+     * @see #name
+     */
+    @CheckForNull
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @see #name
+     */
+    public GraphDriver withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
index db9184c6d..740a1b832 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
@@ -1,11 +1,16 @@
 package com.github.dockerjava.api.command;
 
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.model.ContainerConfig;
 
+import javax.annotation.CheckForNull;
+import java.util.List;
+
 /**
  *
  * @author Konstantin Pelykh (kpelykh@gmail.com)
@@ -50,56 +55,292 @@ public class InspectImageResponse {
     @JsonProperty("Size")
     private Long size;
 
-    public String getId() {
-        return id;
+    @JsonProperty("RepoTags")
+    private List<String> repoTags;
+
+    @JsonProperty("RepoDigests")
+    private List<String> repoDigests;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21}
+     */
+    @JsonProperty("VirtualSize")
+    private Long virtualSize;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21}
+     */
+    @JsonProperty("GraphDriver")
+    private GraphDriver graphDriver;
+
+    /**
+     * @see #arch
+     */
+    @CheckForNull
+    public String getArch() {
+        return arch;
     }
 
-    public String getParent() {
-        return parent;
+    /**
+     * @see #arch
+     */
+    public InspectImageResponse withArch(String arch) {
+        this.arch = arch;
+        return this;
     }
 
-    public String getCreated() {
-        return created;
+    /**
+     * @see #author
+     */
+    @CheckForNull
+    public String getAuthor() {
+        return author;
+    }
+
+    /**
+     * @see #author
+     */
+    public InspectImageResponse withAuthor(String author) {
+        this.author = author;
+        return this;
+    }
+
+    /**
+     * @see #comment
+     */
+    @CheckForNull
+    public String getComment() {
+        return comment;
+    }
+
+    /**
+     * @see #comment
+     */
+    public InspectImageResponse withComment(String comment) {
+        this.comment = comment;
+        return this;
+    }
+
+    /**
+     * @see #config
+     */
+    @CheckForNull
+    public ContainerConfig getConfig() {
+        return config;
     }
 
+    /**
+     * @see #config
+     */
+    public InspectImageResponse withConfig(ContainerConfig config) {
+        this.config = config;
+        return this;
+    }
+
+    /**
+     * @see #container
+     */
+    @CheckForNull
     public String getContainer() {
         return container;
     }
 
+    /**
+     * @see #container
+     */
+    public InspectImageResponse withContainer(String container) {
+        this.container = container;
+        return this;
+    }
+
+    /**
+     * @see #containerConfig
+     */
+    @CheckForNull
     public ContainerConfig getContainerConfig() {
         return containerConfig;
     }
 
-    public Long getSize() {
-        return size;
+    /**
+     * @see #containerConfig
+     */
+    public InspectImageResponse withContainerConfig(ContainerConfig containerConfig) {
+        this.containerConfig = containerConfig;
+        return this;
     }
 
-    public String getDockerVersion() {
-        return dockerVersion;
+    /**
+     * @see #created
+     */
+    @CheckForNull
+    public String getCreated() {
+        return created;
     }
 
-    public ContainerConfig getConfig() {
-        return config;
+    /**
+     * @see #created
+     */
+    public InspectImageResponse withCreated(String created) {
+        this.created = created;
+        return this;
     }
 
-    public String getArch() {
-        return arch;
+    /**
+     * @see #dockerVersion
+     */
+    @CheckForNull
+    public String getDockerVersion() {
+        return dockerVersion;
     }
 
-    public String getComment() {
-        return comment;
+    /**
+     * @see #dockerVersion
+     */
+    public InspectImageResponse withDockerVersion(String dockerVersion) {
+        this.dockerVersion = dockerVersion;
+        return this;
     }
 
-    public String getAuthor() {
-        return author;
+    /**
+     * @see #id
+     */
+    @CheckForNull
+    public String getId() {
+        return id;
     }
 
+    /**
+     * @see #id
+     */
+    public InspectImageResponse withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    /**
+     * @see #os
+     */
+    @CheckForNull
     public String getOs() {
         return os;
     }
 
+    /**
+     * @see #os
+     */
+    public InspectImageResponse withOs(String os) {
+        this.os = os;
+        return this;
+    }
+
+    /**
+     * @see #parent
+     */
+    @CheckForNull
+    public String getParent() {
+        return parent;
+    }
+
+    /**
+     * @see #parent
+     */
+    public InspectImageResponse withParent(String parent) {
+        this.parent = parent;
+        return this;
+    }
+
+    /**
+     * @see #repoTags
+     */
+    @CheckForNull
+    public List<String> getRepoTags() {
+        return repoTags;
+    }
+
+    /**
+     * @see #repoTags
+     */
+    public InspectImageResponse withRepoTags(List<String> repoTags) {
+        this.repoTags = repoTags;
+        return this;
+    }
+
+    /**
+     * @see #size
+     */
+    @CheckForNull
+    public Long getSize() {
+        return size;
+    }
+
+    /**
+     * @see #size
+     */
+    public InspectImageResponse withSize(Long size) {
+        this.size = size;
+        return this;
+    }
+
+    /**
+     * @see #repoDigests
+     */
+    @CheckForNull
+    public List<String> getRepoDigests() {
+        return repoDigests;
+    }
+
+    /**
+     * @see #repoDigests
+     */
+    public InspectImageResponse withRepoDigests(List<String> repoDigests) {
+        this.repoDigests = repoDigests;
+        return this;
+    }
+
+    /**
+     * @see #graphDriver
+     */
+    @CheckForNull
+    public GraphDriver getGraphDriver() {
+        return graphDriver;
+    }
+
+    /**
+     * @see #graphDriver
+     */
+    public InspectImageResponse withGraphDriver(GraphDriver graphDriver) {
+        this.graphDriver = graphDriver;
+        return this;
+    }
+
+    /**
+     * @see #virtualSize
+     */
+    @CheckForNull
+    public Long getVirtualSize() {
+        return virtualSize;
+    }
+
+    /**
+     * @see #virtualSize
+     */
+    public InspectImageResponse withVirtualSize(Long virtualSize) {
+        this.virtualSize = virtualSize;
+        return this;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
     }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
index d7f4b81ee..224da3272 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
@@ -1,19 +1,21 @@
 package com.github.dockerjava.api.model;
 
-import java.util.Map;
-
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import javax.annotation.CheckForNull;
+import java.util.Map;
 
 /**
+ * Used as part of 'images/IMAGE/someimage' response.
  *
  * @author Konstantin Pelykh (kpelykh@gmail.com)
- *
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_NULL)
@@ -87,88 +89,346 @@ public ExposedPort[] getExposedPorts() {
         return exposedPorts != null ? exposedPorts.getExposedPorts() : null;
     }
 
-    public Boolean isNetworkDisabled() {
-        return networkDisabled;
+    /**
+     * @see #attachStderr
+     */
+    @CheckForNull
+    public Boolean getAttachStderr() {
+        return attachStderr;
     }
 
+    /**
+     * @see #attachStderr
+     */
+    public ContainerConfig withAttachStderr(Boolean attachStderr) {
+        this.attachStderr = attachStderr;
+        return this;
+    }
+
+    /**
+     * @see #attachStdin
+     */
+    @CheckForNull
+    public Boolean getAttachStdin() {
+        return attachStdin;
+    }
+
+    /**
+     * @see #attachStdin
+     */
+    public ContainerConfig withAttachStdin(Boolean attachStdin) {
+        this.attachStdin = attachStdin;
+        return this;
+    }
+
+    /**
+     * @see #attachStdout
+     */
+    @CheckForNull
+    public Boolean getAttachStdout() {
+        return attachStdout;
+    }
+
+    /**
+     * @see #attachStdout
+     */
+    public ContainerConfig withAttachStdout(Boolean attachStdout) {
+        this.attachStdout = attachStdout;
+        return this;
+    }
+
+    /**
+     * @see #cmd
+     */
+    @CheckForNull
+    public String[] getCmd() {
+        return cmd;
+    }
+
+    /**
+     * @see #cmd
+     */
+    public ContainerConfig withCmd(String[] cmd) {
+        this.cmd = cmd;
+        return this;
+    }
+
+    /**
+     * @see #domainName
+     */
+    @CheckForNull
     public String getDomainName() {
         return domainName;
     }
 
-    public String getWorkingDir() {
-        return workingDir;
+    /**
+     * @see #domainName
+     */
+    public ContainerConfig withDomainName(String domainName) {
+        this.domainName = domainName;
+        return this;
+    }
+
+    /**
+     * @see #entrypoint
+     */
+    @CheckForNull
+    public String[] getEntrypoint() {
+        return entrypoint;
+    }
+
+    /**
+     * @see #entrypoint
+     */
+    public ContainerConfig withEntrypoint(String[] entrypoint) {
+        this.entrypoint = entrypoint;
+        return this;
+    }
+
+    /**
+     * @see #env
+     */
+    @CheckForNull
+    public String[] getEnv() {
+        return env;
     }
 
+    /**
+     * @see #env
+     */
+    public ContainerConfig withEnv(String[] env) {
+        this.env = env;
+        return this;
+    }
+
+    /**
+     * @see #exposedPorts
+     */
+    public ContainerConfig withExposedPorts(ExposedPorts exposedPorts) {
+        this.exposedPorts = exposedPorts;
+        return this;
+    }
+
+    /**
+     * @see #hostName
+     */
+    @CheckForNull
     public String getHostName() {
         return hostName;
     }
 
-    public String[] getPortSpecs() {
-        return portSpecs;
+    /**
+     * @see #hostName
+     */
+    public ContainerConfig withHostName(String hostName) {
+        this.hostName = hostName;
+        return this;
     }
 
-    public String getUser() {
-        return user;
+    /**
+     * @see #image
+     */
+    @CheckForNull
+    public String getImage() {
+        return image;
     }
 
-    public Boolean isTty() {
-        return tty;
+    /**
+     * @see #image
+     */
+    public ContainerConfig withImage(String image) {
+        this.image = image;
+        return this;
     }
 
-    public Boolean isStdinOpen() {
-        return stdinOpen;
+    /**
+     * @see #labels
+     */
+    @CheckForNull
+    public Map<String, String> getLabels() {
+        return labels;
     }
 
-    public Boolean isStdInOnce() {
-        return stdInOnce;
+    /**
+     * @see #labels
+     */
+    public ContainerConfig withLabels(Map<String, String> labels) {
+        this.labels = labels;
+        return this;
     }
 
+    /**
+     * @see #macAddress
+     */
+    @CheckForNull
     public String getMacAddress() {
         return macAddress;
     }
 
-    public Boolean isAttachStdin() {
-        return attachStdin;
+    /**
+     * @see #macAddress
+     */
+    public ContainerConfig withMacAddress(String macAddress) {
+        this.macAddress = macAddress;
+        return this;
     }
 
-    public Boolean isAttachStdout() {
-        return attachStdout;
+    /**
+     * @see #networkDisabled
+     */
+    @CheckForNull
+    public Boolean getNetworkDisabled() {
+        return networkDisabled;
     }
 
-    public Boolean isAttachStderr() {
-        return attachStderr;
+    /**
+     * @see #networkDisabled
+     */
+    public ContainerConfig withNetworkDisabled(Boolean networkDisabled) {
+        this.networkDisabled = networkDisabled;
+        return this;
     }
 
-    public String[] getEnv() {
-        return env;
+    /**
+     * @see #onBuild
+     */
+    @CheckForNull
+    public String[] getOnBuild() {
+        return onBuild;
     }
 
-    public String[] getCmd() {
-        return cmd;
+    /**
+     * @see #onBuild
+     */
+    public ContainerConfig withOnBuild(String[] onBuild) {
+        this.onBuild = onBuild;
+        return this;
     }
 
-    public String getImage() {
-        return image;
+    /**
+     * @see #portSpecs
+     */
+    @CheckForNull
+    public String[] getPortSpecs() {
+        return portSpecs;
+    }
+
+    /**
+     * @see #portSpecs
+     */
+    public ContainerConfig withPortSpecs(String[] portSpecs) {
+        this.portSpecs = portSpecs;
+        return this;
+    }
+
+    /**
+     * @see #stdInOnce
+     */
+    @CheckForNull
+    public Boolean getStdInOnce() {
+        return stdInOnce;
     }
 
+    /**
+     * @see #stdInOnce
+     */
+    public ContainerConfig withStdInOnce(Boolean stdInOnce) {
+        this.stdInOnce = stdInOnce;
+        return this;
+    }
+
+    /**
+     * @see #stdinOpen
+     */
+    @CheckForNull
+    public Boolean getStdinOpen() {
+        return stdinOpen;
+    }
+
+    /**
+     * @see #stdinOpen
+     */
+    public ContainerConfig withStdinOpen(Boolean stdinOpen) {
+        this.stdinOpen = stdinOpen;
+        return this;
+    }
+
+    /**
+     * @see #tty
+     */
+    @CheckForNull
+    public Boolean getTty() {
+        return tty;
+    }
+
+    /**
+     * @see #tty
+     */
+    public ContainerConfig withTty(Boolean tty) {
+        this.tty = tty;
+        return this;
+    }
+
+    /**
+     * @see #user
+     */
+    @CheckForNull
+    public String getUser() {
+        return user;
+    }
+
+    /**
+     * @see #user
+     */
+    public ContainerConfig withUser(String user) {
+        this.user = user;
+        return this;
+    }
+
+    /**
+     * @see #volumes
+     */
+    @CheckForNull
     public Map<String, ?> getVolumes() {
         return volumes;
     }
 
-    public String[] getEntrypoint() {
-        return entrypoint;
+    /**
+     * @see #volumes
+     */
+    public ContainerConfig withVolumes(Map<String, ?> volumes) {
+        this.volumes = volumes;
+        return this;
     }
 
-    public String[] getOnBuild() {
-        return onBuild;
+    /**
+     * @see #workingDir
+     */
+    @CheckForNull
+    public String getWorkingDir() {
+        return workingDir;
     }
 
-    public Map<String, String> getLabels() {
-        return labels;
+    /**
+     * @see #workingDir
+     */
+    public ContainerConfig withWorkingDir(String workingDir) {
+        this.workingDir = workingDir;
+        return this;
     }
 
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
     }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
new file mode 100644
index 000000000..0df990d00
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
@@ -0,0 +1,163 @@
+package com.github.dockerjava.api.command;
+
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.model.ContainerConfig;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.util.Collections;
+
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
+import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+public class InspectImageResponseTest {
+    @Test
+    public void serder1_22Json() throws IOException {
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class);
+
+        final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22,
+                "images/image1/inspect1.json",
+                type
+        );
+
+        final ContainerConfig config = new ContainerConfig()
+                .withAttachStderr(false)
+                .withAttachStdin(false)
+                .withAttachStdout(false)
+                .withCmd(null)
+                .withDomainName("")
+                .withEntrypoint(null)
+                .withEnv(new String[]{"HOME=/", "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"})
+                .withExposedPorts(null)
+                .withHostName("aee9ba801acc")
+                .withImage("511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158")
+                .withLabels(null)
+                .withMacAddress(null)
+                .withNetworkDisabled(null)
+                .withOnBuild(new String[]{})
+                .withStdinOpen(false)
+                .withPortSpecs(null)
+                .withStdInOnce(false)
+                .withTty(false)
+                .withUser("")
+                .withVolumes(null)
+                .withWorkingDir("");
+
+        final ContainerConfig containerConfig = new ContainerConfig()
+                .withAttachStderr(false)
+                .withAttachStdin(false)
+                .withAttachStdout(false)
+                .withCmd(new String[]{"/bin/sh", "-c", "#(nop) MAINTAINER hack@worldticket.net"})
+                .withDomainName("")
+                .withEntrypoint(null)
+                .withEnv(new String[]{"HOME=/", "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"})
+                .withExposedPorts(null)
+                .withHostName("aee9ba801acc")
+                .withImage("511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158")
+                .withLabels(null)
+                .withMacAddress(null)
+                .withNetworkDisabled(null)
+                .withOnBuild(new String[]{})
+                .withStdinOpen(false)
+                .withPortSpecs(null)
+                .withStdInOnce(false)
+                .withTty(false)
+                .withUser("")
+                .withVolumes(null)
+                .withWorkingDir("");
+
+        assertThat(inspectImage, notNullValue());
+        assertThat(inspectImage.getArch(), is("amd64"));
+        assertThat(inspectImage.getAuthor(), is("hack@worldticket.net"));
+        assertThat(inspectImage.getComment(), isEmptyString());
+
+        assertThat(inspectImage.getConfig(), notNullValue());
+        assertThat(inspectImage.getConfig(), equalTo(config));
+
+        assertThat(inspectImage.getCreated(), is("2014-04-29T19:59:10.84997669Z"));
+        assertThat(inspectImage.getContainer(), is("aee9ba801acca0e648ffd91df204ba82ae85d97608a4864a019e2004d7e1b133"));
+
+        assertThat(inspectImage.getContainerConfig(), notNullValue());
+        assertThat(inspectImage.getContainerConfig(), equalTo(containerConfig));
+
+        assertThat(inspectImage.getDockerVersion(), is("0.8.1"));
+        assertThat(inspectImage.getId(), is("sha256:ee45fe0d1fcdf1a0f9c2d1e36c6f4b3202bbb2032f14d7c9312b27bfcf6aee24"));
+        assertThat(inspectImage.getOs(), is("linux"));
+        assertThat(inspectImage.getParent(), isEmptyString());
+        assertThat(inspectImage.getSize(), is(0L));
+
+        assertThat(inspectImage.getRepoTags(), hasSize(1));
+        assertThat(inspectImage.getRepoTags(), hasItem("hackmann/empty:latest"));
+
+        final GraphDriver aufsGraphDriver = new GraphDriver().withName("aufs");
+        final GraphDriver graphDriver = inspectImage.getGraphDriver();
+        assertThat(graphDriver, notNullValue());
+        assertThat(graphDriver, equalTo(aufsGraphDriver));
+        assertThat(graphDriver.getName(), is("aufs"));
+        assertThat(graphDriver.getData(), nullValue());
+
+        assertThat(inspectImage.getVirtualSize(), is(0L));
+
+
+        final InspectImageResponse inspectImageResponse = new InspectImageResponse().withArch("amd64")
+                .withAuthor("hack@worldticket.net")
+                .withComment("")
+                .withConfig(config)
+                .withContainer("aee9ba801acca0e648ffd91df204ba82ae85d97608a4864a019e2004d7e1b133")
+                .withContainerConfig(containerConfig)
+                .withCreated("2014-04-29T19:59:10.84997669Z")
+                .withDockerVersion("0.8.1")
+                .withId("sha256:ee45fe0d1fcdf1a0f9c2d1e36c6f4b3202bbb2032f14d7c9312b27bfcf6aee24")
+                .withOs("linux")
+                .withParent("")
+                .withSize(0L)
+                .withRepoTags(Collections.singletonList("hackmann/empty:latest"))
+                .withRepoDigests(Collections.<String>emptyList())
+                .withVirtualSize(0L)
+                .withGraphDriver(aufsGraphDriver);
+
+        assertThat(inspectImage, equalTo(inspectImageResponse));
+    }
+
+
+    @Test
+    public void serder1_22_doc() throws IOException {
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class);
+
+        final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22,
+                "images/docImage/doc.json",
+                type
+        );
+
+        assertThat(inspectImage, notNullValue());
+
+        assertThat(inspectImage.getRepoDigests(), hasSize(1));
+        assertThat(inspectImage.getRepoDigests(),
+                contains("localhost:5000/test/busybox/example@" +
+                        "sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf")
+        );
+
+        assertThat(inspectImage.getRepoTags(), hasSize(3));
+        assertThat(inspectImage.getRepoTags(), containsInAnyOrder(
+                "example:1.0",
+                "example:latest",
+                "example:stable"
+        ));
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/samples/1.22/images/docImage/doc.json b/src/test/resources/samples/1.22/images/docImage/doc.json
new file mode 100644
index 000000000..4cbb269c4
--- /dev/null
+++ b/src/test/resources/samples/1.22/images/docImage/doc.json
@@ -0,0 +1,89 @@
+{
+  "Id": "85f05633ddc1c50679be2b16a0479ab6f7637f8884e0cfe0f4d20e1ebb3d6e7c",
+  "Container": "cb91e48a60d01f1e27028b4fc6819f4f290b3cf12496c8176ec714d0d390984a",
+  "Comment": "",
+  "Os": "linux",
+  "Architecture": "amd64",
+  "Parent": "91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c",
+  "ContainerConfig": {
+    "Tty": false,
+    "Hostname": "e611e15f9c9d",
+    "Volumes": null,
+    "Domainname": "",
+    "AttachStdout": false,
+    "PublishService": "",
+    "AttachStdin": false,
+    "OpenStdin": false,
+    "StdinOnce": false,
+    "NetworkDisabled": false,
+    "OnBuild": [],
+    "Image": "91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c",
+    "User": "",
+    "WorkingDir": "",
+    "Entrypoint": null,
+    "MacAddress": "",
+    "AttachStderr": false,
+    "Labels": {
+      "com.example.license": "GPL",
+      "com.example.version": "1.0",
+      "com.example.vendor": "Acme"
+    },
+    "Env": [
+      "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    ],
+    "ExposedPorts": null,
+    "Cmd": [
+      "/bin/sh",
+      "-c",
+      "#(nop) LABEL com.example.vendor=Acme com.example.license=GPL com.example.version=1.0"
+    ]
+  },
+  "DockerVersion": "1.9.0-dev",
+  "VirtualSize": 188359297,
+  "Size": 0,
+  "Author": "",
+  "Created": "2015-09-10T08:30:53.26995814Z",
+  "GraphDriver": {
+    "Name": "aufs",
+    "Data": null
+  },
+  "RepoDigests": [
+    "localhost:5000/test/busybox/example@sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"
+  ],
+  "RepoTags": [
+    "example:1.0",
+    "example:latest",
+    "example:stable"
+  ],
+  "Config": {
+    "Image": "91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c",
+    "NetworkDisabled": false,
+    "OnBuild": [],
+    "StdinOnce": false,
+    "PublishService": "",
+    "AttachStdin": false,
+    "OpenStdin": false,
+    "Domainname": "",
+    "AttachStdout": false,
+    "Tty": false,
+    "Hostname": "e611e15f9c9d",
+    "Volumes": null,
+    "Cmd": [
+      "/bin/bash"
+    ],
+    "ExposedPorts": null,
+    "Env": [
+      "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    ],
+    "Labels": {
+      "com.example.vendor": "Acme",
+      "com.example.version": "1.0",
+      "com.example.license": "GPL"
+    },
+    "Entrypoint": null,
+    "MacAddress": "",
+    "AttachStderr": false,
+    "WorkingDir": "",
+    "User": ""
+  }
+}
diff --git a/src/test/resources/samples/1.22/images/image1/inspect1.json b/src/test/resources/samples/1.22/images/image1/inspect1.json
new file mode 100644
index 000000000..ef674df2b
--- /dev/null
+++ b/src/test/resources/samples/1.22/images/image1/inspect1.json
@@ -0,0 +1,69 @@
+{
+  "Id": "sha256:ee45fe0d1fcdf1a0f9c2d1e36c6f4b3202bbb2032f14d7c9312b27bfcf6aee24",
+  "RepoTags": [
+    "hackmann/empty:latest"
+  ],
+  "RepoDigests": [],
+  "Parent": "",
+  "Comment": "",
+  "Created": "2014-04-29T19:59:10.84997669Z",
+  "Container": "aee9ba801acca0e648ffd91df204ba82ae85d97608a4864a019e2004d7e1b133",
+  "ContainerConfig": {
+    "Hostname": "aee9ba801acc",
+    "Domainname": "",
+    "User": "",
+    "AttachStdin": false,
+    "AttachStdout": false,
+    "AttachStderr": false,
+    "Tty": false,
+    "OpenStdin": false,
+    "StdinOnce": false,
+    "Env": [
+      "HOME=/",
+      "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    ],
+    "Cmd": [
+      "/bin/sh",
+      "-c",
+      "#(nop) MAINTAINER hack@worldticket.net"
+    ],
+    "Image": "511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158",
+    "Volumes": null,
+    "WorkingDir": "",
+    "Entrypoint": null,
+    "OnBuild": [],
+    "Labels": null
+  },
+  "DockerVersion": "0.8.1",
+  "Author": "hack@worldticket.net",
+  "Config": {
+    "Hostname": "aee9ba801acc",
+    "Domainname": "",
+    "User": "",
+    "AttachStdin": false,
+    "AttachStdout": false,
+    "AttachStderr": false,
+    "Tty": false,
+    "OpenStdin": false,
+    "StdinOnce": false,
+    "Env": [
+      "HOME=/",
+      "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    ],
+    "Cmd": null,
+    "Image": "511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158",
+    "Volumes": null,
+    "WorkingDir": "",
+    "Entrypoint": null,
+    "OnBuild": [],
+    "Labels": null
+  },
+  "Architecture": "amd64",
+  "Os": "linux",
+  "Size": 0,
+  "VirtualSize": 0,
+  "GraphDriver": {
+    "Name": "aufs",
+    "Data": null
+  }
+}

From 5b6fb633c847473dfe4f265aa7fe58a1d89fa32d Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 11 Mar 2016 01:10:29 +0300
Subject: [PATCH 0459/1272] Fix typo in test

---
 .../github/dockerjava/client/DockerClientTest.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/client/DockerClientTest.java b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
index 72a09f0e5..b124fdc9a 100644
--- a/src/test/java/com/github/dockerjava/client/DockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
@@ -50,20 +50,26 @@ public void afterMethod(ITestResult result) {
     @Test
     public void testRunShlex() throws DockerException {
 
-        String[] commands = new String[] {"true",
+        String[] commands = new String[] {
+                "true",
                 "echo \"The Young Descendant of Tepes & Septette for the Dead Princess\"",
                 "echo -n 'The Young Descendant of Tepes & Septette for the Dead Princess'",
                 "/bin/sh -c echo Hello World", "/bin/sh -c echo 'Hello World'", "echo 'Night of Nights'",
-                "true && echo 'Night of Nights'"};
+                "true && echo 'Night of Nights'"
+        };
 
         for (String command : commands) {
             LOG.info("Running command: [{}]", command);
 
-            CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd(commands).exec();
+            CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                    .withCmd(command)
+                    .exec();
             dockerClient.startContainerCmd(container.getId());
 
-            int exitcode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+            int exitcode = dockerClient.waitContainerCmd(container.getId())
+                    .exec(new WaitContainerResultCallback())
                     .awaitStatusCode();
+
             assertThat(exitcode, equalTo(0));
         }
     }

From 8a27a63926bc9e595d3e0a24cdae2a7e1d0733ce Mon Sep 17 00:00:00 2001
From: Marcus Thiesen <mt@hubrick.com>
Date: Thu, 28 Jan 2016 20:09:06 +0100
Subject: [PATCH 0460/1272] Add aux to ResponseItem for API 1.22

As mentioned in Issue #437

Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
---
 .../dockerjava/api/model/ResponseItem.java    | 67 ++++++++++++++++---
 1 file changed, 57 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
index 586a49d63..12a090db8 100644
--- a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
@@ -1,15 +1,14 @@
 package com.github.dockerjava.api.model;
 
-import java.io.Serializable;
-
-import javax.annotation.CheckForNull;
-
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
 
 /**
  * Represents a pull response stream item
@@ -48,6 +47,12 @@ public class ResponseItem implements Serializable {
     @JsonProperty("error")
     private String error;
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("aux")
+    private AuxDetail aux;
+
     @CheckForNull
     public String getStream() {
         return stream;
@@ -94,6 +99,14 @@ public String getError() {
         return error;
     }
 
+    /**
+     * @see #aux
+     */
+    @CheckForNull
+    public AuxDetail getAux() {
+        return aux;
+    }
+
     /**
      * Returns whether the error field indicates an error
      *
@@ -135,7 +148,7 @@ public Long getStart() {
 
         @Override
         public String toString() {
-            return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();
+            return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
         }
     }
 
@@ -161,12 +174,46 @@ public String getMessage() {
 
         @Override
         public String toString() {
-            return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();
+            return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+        }
+    }
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class AuxDetail implements Serializable {
+        private static final long serialVersionUID = 1L;
+
+        @JsonProperty("Size")
+        private Integer size;
+
+        @JsonProperty("Tag")
+        private String tag;
+
+        @JsonProperty("Digest")
+        private String digest;
+
+        @CheckForNull
+        public Integer getSize() {
+            return size;
+        }
+
+        @CheckForNull
+        public String getTag() {
+            return tag;
+        }
+
+        @CheckForNull
+        public String getDigest() {
+            return digest;
+        }
+
+        @Override
+        public String toString() {
+            return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
         }
     }
 
     @Override
     public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }

From 3b3399d5674d68590de4da2107ec56a6688a57d0 Mon Sep 17 00:00:00 2001
From: Alexander Koshevoy <tejksat@users.noreply.github.com>
Date: Fri, 11 Mar 2016 15:01:51 +0300
Subject: [PATCH 0461/1272] Fixes skipping 0xff bytes from result stream
 returned by Netty implementation of copy file/archive commands

---
 pom.xml                                       |  8 +++
 .../handler/HttpResponseStreamHandler.java    |  2 +-
 .../HttpResponseStreamHandlerTest.java        | 51 +++++++++++++++++++
 3 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java

diff --git a/pom.xml b/pom.xml
index 2b5fe2119..9ee5cad51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,7 @@
 		<hamcrest.library.version>1.3</hamcrest.library.version>
 		<hamcrest.jpa-matchers>1.6</hamcrest.jpa-matchers>
 		<lambdaj.version>2.3.3</lambdaj.version>
+		<mockito.version>1.10.19</mockito.version>
 
 
 		<maven-jar-plugin.version>2.2</maven-jar-plugin.version>
@@ -195,6 +196,13 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>${mockito.version}</version>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>com.google.code.findbugs</groupId>
 			<artifactId>annotations</artifactId>
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
index d4f19f2e3..706228d04 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
@@ -81,7 +81,7 @@ public int read() throws IOException {
             }
 
             if (current != null && current.readableBytes() > 0) {
-                return current.readByte();
+                return current.readByte() & 0xff;
             } else {
                 return read();
             }
diff --git a/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java b/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
new file mode 100644
index 000000000..5d4c091d9
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
@@ -0,0 +1,51 @@
+package com.github.dockerjava.netty.handler;
+
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufInputStream;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import org.apache.commons.io.IOUtils;
+import org.mockito.Mockito;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.io.InputStream;
+
+/**
+ * @author Alexander Koshevoy
+ */
+public class HttpResponseStreamHandlerTest {
+    @Test
+    public void testNoBytesSkipped() throws Exception {
+        ResultCallbackTest callback = new ResultCallbackTest();
+        HttpResponseStreamHandler streamHandler = new HttpResponseStreamHandler(callback);
+        ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
+        ByteBuf buffer = generateByteBuf();
+        streamHandler.channelRead0(ctx, buffer);
+        streamHandler.channelReadComplete(ctx);
+
+        Assert.assertTrue(IOUtils.contentEquals(callback.getInputStream(), new ByteBufInputStream(buffer)));
+    }
+
+    private ByteBuf generateByteBuf() {
+        byte[] array = new byte[256];
+        for (int i = 0; i < array.length; i++) {
+            array[i] = (byte) i;
+        }
+        return Unpooled.copiedBuffer(array);
+    }
+
+    private static class ResultCallbackTest extends ResultCallbackTemplate<ResultCallbackTest, InputStream> {
+        private InputStream stream;
+
+        @Override
+        public void onNext(InputStream stream) {
+            this.stream = stream;
+        }
+
+        public InputStream getInputStream() {
+            return stream;
+        }
+    }
+}

From c3ab3d215e2acf0a2569c060fbaede3ae973a4e2 Mon Sep 17 00:00:00 2001
From: tejksat <tejksat@users.noreply.github.com>
Date: Sun, 20 Mar 2016 01:02:31 +0300
Subject: [PATCH 0462/1272] Integration test for copy archive cmd checking
 integrity of received binary file

---
 .../CopyArchiveFromContainerCmdExecTest.java  |  40 ++++++++++++++++++
 .../resources/testCopyFromArchive/binary.dat  | Bin 0 -> 288 bytes
 2 files changed, 40 insertions(+)
 create mode 100644 src/test/resources/testCopyFromArchive/binary.dat

diff --git a/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExecTest.java
index aa4dcc575..caec336a2 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExecTest.java
@@ -6,7 +6,14 @@
 
 import java.io.InputStream;
 import java.lang.reflect.Method;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
 
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.apache.commons.io.IOUtils;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -16,6 +23,7 @@
 
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.core.util.CompressArchiveUtil;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 
 @Test(groups = "integration")
@@ -70,4 +78,36 @@ public void copyFromNonExistingContainer() throws Exception {
         } catch (NotFoundException ignored) {
         }
     }
+
+    @Test
+    public void copyFromContainerBinaryFile() throws Exception {
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withName("docker-java-itest-copyFromContainerBinaryFile").exec();
+
+        LOG.info("Created container: {}", container);
+        assertThat(container.getId(), not(isEmptyOrNullString()));
+
+        Path temp = Files.createTempFile("", ".tar.gz");
+        Path binaryFile = Paths.get("src/test/resources/testCopyFromArchive/binary.dat");
+        CompressArchiveUtil.tar(binaryFile, temp, true, false);
+
+        try (InputStream uploadStream = Files.newInputStream(temp)) {
+            dockerClient.copyArchiveToContainerCmd(container.getId()).withTarInputStream(uploadStream).exec();
+        }
+
+        InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/binary.dat").exec();
+        Boolean bytesAvailable = response.available() > 0;
+        assertTrue(bytesAvailable, "The file was not copied from the container.");
+
+        try (TarArchiveInputStream tarInputStream = new TarArchiveInputStream(response)) {
+            TarArchiveEntry nextTarEntry = tarInputStream.getNextTarEntry();
+
+            assertEquals(nextTarEntry.getName(), "binary.dat");
+            try (InputStream binaryFileInputStream = Files.newInputStream(binaryFile, StandardOpenOption.READ)) {
+                assertTrue(IOUtils.contentEquals(binaryFileInputStream, tarInputStream));
+            }
+
+            assertNull(tarInputStream.getNextTarEntry(), "Nothing except binary.dat is expected to be copied.");
+        }
+    }
 }
diff --git a/src/test/resources/testCopyFromArchive/binary.dat b/src/test/resources/testCopyFromArchive/binary.dat
new file mode 100644
index 0000000000000000000000000000000000000000..61bcc872c139dd1bc827058031947f132b91fa53
GIT binary patch
literal 288
zcmV+*0pI>paAjj@VQe6Cd2M2EY;!CicVTp6XdrKObRi0Wfr5jCg@%WSiHeJijgF6y
zk&=^?m6n&7nVOrNot~edp`xRtrKYE-sj922t*)=Iv9hzYwYImoxw^Z&y}rM|!NSAD
z#m2|T$;!*j&Cbuz(bCh@)z;V8+1lIO-QM5e;o{@u<>u$;>FVq3?e6dJ@$&QZ_4fDp
z`TG0({r>*|0RjUA1qKHQ2?`4g4Gs?w5fT#=6&4p585$cL9UdPbAtECrB_<~*DJm;0
zEiNxGF)}kWH8wXmIXXK$Jw87`K|(`BMMg(RNlHshO-@fxQBqS>RaRG6Sz23MU0z>c
mVPa!sWoBn+X=-b1ZEkOHadLBXb#`}nd3t+%eSUg-e0_dnKZ{-f

literal 0
HcmV?d00001


From 2f62af8bfb64eadde35c0329fb834a403dc60ec6 Mon Sep 17 00:00:00 2001
From: tejksat <tejksat@users.noreply.github.com>
Date: Sun, 20 Mar 2016 01:11:28 +0300
Subject: [PATCH 0463/1272] Static import for assertion used, imports
 reformatted

---
 .../netty/handler/HttpResponseStreamHandlerTest.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java b/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
index 5d4c091d9..6652f3eba 100644
--- a/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
+++ b/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
@@ -1,16 +1,18 @@
 package com.github.dockerjava.netty.handler;
 
-import com.github.dockerjava.core.async.ResultCallbackTemplate;
+import static org.testng.Assert.assertTrue;
+
+import java.io.InputStream;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufInputStream;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import org.apache.commons.io.IOUtils;
 import org.mockito.Mockito;
-import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import java.io.InputStream;
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
 
 /**
  * @author Alexander Koshevoy
@@ -25,7 +27,7 @@ public void testNoBytesSkipped() throws Exception {
         streamHandler.channelRead0(ctx, buffer);
         streamHandler.channelReadComplete(ctx);
 
-        Assert.assertTrue(IOUtils.contentEquals(callback.getInputStream(), new ByteBufInputStream(buffer)));
+        assertTrue(IOUtils.contentEquals(callback.getInputStream(), new ByteBufInputStream(buffer)));
     }
 
     private ByteBuf generateByteBuf() {

From ec6ca9fb45f7686a4db81be07c7db96a9c94e8f0 Mon Sep 17 00:00:00 2001
From: lujian <254461627@qq.com>
Date: Thu, 17 Mar 2016 10:13:41 +0800
Subject: [PATCH 0464/1272] RenameContainer

Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
---
 .../github/dockerjava/api/DockerClient.java   | 10 +++
 .../api/command/DockerCmdExecFactory.java     |  8 +++
 .../api/command/RenameContainerCmd.java       | 34 +++++++++
 .../dockerjava/core/DockerClientImpl.java     |  7 ++
 .../core/command/RenameContainerCmdImpl.java  | 52 ++++++++++++++
 .../jaxrs/DockerCmdExecFactoryImpl.java       |  6 ++
 .../jaxrs/RenameContainerCmdExec.java         | 30 ++++++++
 .../netty/DockerCmdExecFactoryImpl.java       |  7 ++
 .../netty/exec/RenameContainerCmdExec.java    | 29 ++++++++
 .../core/TestDockerCmdExecFactory.java        |  5 ++
 .../command/RenameContainerCmdImplTest.java   | 71 +++++++++++++++++++
 .../exec/RenameContainerCmdExecTest.java      | 71 +++++++++++++++++++
 12 files changed, 330 insertions(+)
 create mode 100644 src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/RenameContainerCmdExec.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 3ceabf3e7..978bd35ca 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -56,6 +56,7 @@
 import com.github.dockerjava.api.command.UpdateContainerCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Identifier;
@@ -185,6 +186,15 @@ public interface DockerClient extends Closeable {
      */
     UpdateContainerCmd updateContainerCmd(@Nonnull String containerId);
 
+    /**
+     * Rename container.
+     *
+     * @param containerId id of the container
+     * @return command
+     * @since {@link RemoteApiVersion#VERSION_1_17}
+     */
+    RenameContainerCmd renameContainerCmd(@Nonnull String containerId);
+
     RestartContainerCmd restartContainerCmd(@Nonnull String containerId);
 
     CommitCmd commitCmd(@Nonnull String containerId);
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index 8cc42cf15..ae090e434 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -6,6 +6,7 @@
 import javax.net.ssl.SSLContext;
 
 import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.RemoteApiVersion;
 
 public interface DockerCmdExecFactory extends Closeable {
 
@@ -71,6 +72,13 @@ public interface DockerCmdExecFactory extends Closeable {
 
     UpdateContainerCmd.Exec createUpdateContainerCmdExec();
 
+    /**
+     * Rename container.
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_17}
+     */
+    RenameContainerCmd.Exec createRenameContainerCmdExec();
+
     RestartContainerCmd.Exec createRestartContainerCmdExec();
 
     CommitCmd.Exec createCommitCmdExec();
diff --git a/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java
new file mode 100644
index 000000000..bce20251f
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java
@@ -0,0 +1,34 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * Rename a container.
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_17}
+ */
+public interface RenameContainerCmd extends SyncDockerCmd<Void> {
+
+    @CheckForNull
+    String getContainerId();
+
+    RenameContainerCmd withContainerId(@Nonnull String containerId);
+
+    @CheckForNull
+    String getName();
+
+    RenameContainerCmd withName(@Nonnull String name);
+
+    /**
+     * @throws NotFoundException No such container
+     */
+    @Override
+    Void exec() throws NotFoundException;
+
+    interface Exec extends DockerCmdSyncExec<RenameContainerCmd, Void> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 9d342e249..9f4f0f88b 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -58,6 +58,7 @@
 import com.github.dockerjava.api.command.UpdateContainerCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Identifier;
 import com.github.dockerjava.core.command.AttachContainerCmdImpl;
@@ -109,6 +110,7 @@
 import com.github.dockerjava.core.command.UpdateContainerCmdImpl;
 import com.github.dockerjava.core.command.VersionCmdImpl;
 import com.github.dockerjava.core.command.WaitContainerCmdImpl;
+import com.github.dockerjava.core.command.RenameContainerCmdImpl;
 
 import javax.annotation.Nonnull;
 
@@ -364,6 +366,11 @@ public UpdateContainerCmd updateContainerCmd(@Nonnull String containerId) {
         return new UpdateContainerCmdImpl(getDockerCmdExecFactory().createUpdateContainerCmdExec(), containerId);
     }
 
+    @Override
+    public RenameContainerCmd renameContainerCmd(@Nonnull String containerId) {
+        return new RenameContainerCmdImpl(getDockerCmdExecFactory().createRenameContainerCmdExec(), containerId);
+    }
+
     @Override
     public RestartContainerCmd restartContainerCmd(String containerId) {
         return new RestartContainerCmdImpl(getDockerCmdExecFactory().createRestartContainerCmdExec(), containerId);
diff --git a/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java
new file mode 100644
index 000000000..ebf3ebabf
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java
@@ -0,0 +1,52 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.RenameContainerCmd;
+import com.github.dockerjava.api.exception.NotFoundException;
+
+import javax.annotation.Nonnull;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+public class RenameContainerCmdImpl extends AbstrDockerCmd<RenameContainerCmd, Void> implements RenameContainerCmd {
+
+    private String containerId;
+
+    private String name;
+
+    public RenameContainerCmdImpl(RenameContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
+
+    @Override
+    public String getContainerId() {
+        return containerId;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public RenameContainerCmd withContainerId(@Nonnull String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
+
+    @Override
+    public RenameContainerCmd withName(@Nonnull String name) {
+        checkNotNull(name, "name was not specified");
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * @throws NotFoundException No such container
+     */
+    @Override
+    public Void exec() throws NotFoundException {
+        return super.exec();
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index 4716877af..f64cf4e2b 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -80,6 +80,7 @@
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.LocalDirectorySSLConfig;
@@ -417,6 +418,11 @@ public UpdateContainerCmd.Exec createUpdateContainerCmdExec() {
         return new UpdateContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public RenameContainerCmd.Exec createRenameContainerCmdExec() {
+        return new RenameContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public RestartContainerCmd.Exec createRestartContainerCmdExec() {
         return new RestartContainerCmdExec(getBaseResource(), getDockerClientConfig());
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java
new file mode 100644
index 000000000..c747ea9b0
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.jaxrs;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import com.github.dockerjava.api.command.RenameContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RenameContainerCmdExec extends AbstrSyncDockerCmdExec<RenameContainerCmd, Void>
+        implements RenameContainerCmd.Exec {
+    private static final Logger LOG = LoggerFactory.getLogger(RenameContainerCmdExec.class);
+
+    public RenameContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(RenameContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/rename")
+                .resolveTemplate("id", command.getContainerId())
+                .queryParam("name", command.getName());
+
+        LOG.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(null);
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
index 1210c56bc..08a0179a1 100644
--- a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
@@ -50,6 +50,7 @@
 import com.github.dockerjava.api.command.UpdateContainerCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.DockerClientImpl;
 import com.github.dockerjava.core.LocalDirectorySSLConfig;
@@ -102,6 +103,7 @@
 import com.github.dockerjava.netty.exec.UpdateContainerCmdExec;
 import com.github.dockerjava.netty.exec.VersionCmdExec;
 import com.github.dockerjava.netty.exec.WaitContainerCmdExec;
+import com.github.dockerjava.netty.exec.RenameContainerCmdExec;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.ChannelInitializer;
@@ -465,6 +467,11 @@ public UpdateContainerCmd.Exec createUpdateContainerCmdExec() {
         return new UpdateContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public RenameContainerCmd.Exec createRenameContainerCmdExec() {
+        return new RenameContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public RestartContainerCmd.Exec createRestartContainerCmdExec() {
         return new RestartContainerCmdExec(getBaseResource(), getDockerClientConfig());
diff --git a/src/main/java/com/github/dockerjava/netty/exec/RenameContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/RenameContainerCmdExec.java
new file mode 100644
index 000000000..43f97e961
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/RenameContainerCmdExec.java
@@ -0,0 +1,29 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.RenameContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RenameContainerCmdExec extends AbstrSyncDockerCmdExec<RenameContainerCmd, Void>
+        implements RenameContainerCmd.Exec {
+    private static final Logger LOG = LoggerFactory.getLogger(RenameContainerCmdExec.class);
+
+    public RenameContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(RenameContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/rename")
+                .resolveTemplate("id", command.getContainerId())
+                .queryParam("name", command.getName());
+
+        LOG.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(null);
+
+        return null;
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index b2b86601c..ba05ab4e3 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -240,6 +240,11 @@ public UpdateContainerCmd.Exec createUpdateContainerCmdExec() {
         return delegate.createUpdateContainerCmdExec();
     }
 
+    @Override
+    public RenameContainerCmd.Exec createRenameContainerCmdExec(){
+        return delegate.createRenameContainerCmdExec();
+    }
+
     @Override
     public RestartContainerCmd.Exec createRestartContainerCmdExec() {
         return delegate.createRestartContainerCmdExec();
diff --git a/src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java
new file mode 100644
index 000000000..9f503a87b
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java
@@ -0,0 +1,71 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+import org.testng.ITestResult;
+import org.testng.annotations.*;
+
+import java.lang.reflect.Method;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
+
+@Test(groups = "integration")
+public class RenameContainerCmdImplTest extends AbstractDockerClientTest {
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void renameContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        String name1 = inspectContainerResponse.getName();
+
+        dockerClient.renameContainerCmd(container.getId())
+                .withName(getClass().getCanonicalName() + "renameContainer")
+                .exec();
+
+        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect After Rename: {}", inspectContainerResponse2.toString());
+
+        String name2 = inspectContainerResponse2.getName();
+
+        assertNotEquals(name1, name2);
+
+        dockerClient.killContainerCmd(container.getId()).exec();
+    }
+
+    @Test(expectedExceptions = NotFoundException.class)
+    public void renameExistingContainer() throws DockerException, InterruptedException {
+        dockerClient.renameContainerCmd("non-existing")
+                .withName(getClass().getCanonicalName() + "renameExistingContainer")
+                .exec();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java
new file mode 100644
index 000000000..c176bc1d6
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java
@@ -0,0 +1,71 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+import org.testng.ITestResult;
+import org.testng.annotations.*;
+
+import java.lang.reflect.Method;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
+
+@Test(groups = "integration")
+public class RenameContainerCmdExecTest extends AbstractNettyDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void renameContainer() throws DockerException {
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        String name1 = inspectContainerResponse.getName();
+
+        dockerClient.renameContainerCmd(container.getId())
+                .withName(getClass().getCanonicalName() + "renameContainer")
+                .exec();
+
+        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect After Rename: {}", inspectContainerResponse2.toString());
+
+        String name2 = inspectContainerResponse2.getName();
+
+        assertNotEquals(name1, name2);
+
+        dockerClient.killContainerCmd(container.getId()).exec();
+    }
+
+    @Test(expectedExceptions = NotFoundException.class)
+    public void renameNonExistingContainer() throws DockerException, InterruptedException {
+        dockerClient.renameContainerCmd("non-existing")
+                .withName(getClass().getCanonicalName() + "renameExistingContainer")
+                .exec();
+    }
+}

From 64061dfe828210c4c995245e68a8891ed0136a62 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 21 Mar 2016 00:13:47 +0300
Subject: [PATCH 0465/1272] Use annotation features instead custom check.

---
 .../core/command/CreateContainerCmdImplTest.java         | 8 ++------
 .../core/command/InspectContainerCmdImplTest.java        | 9 ++-------
 .../netty/exec/CreateContainerCmdExecTest.java           | 8 ++------
 .../netty/exec/InspectContainerCmdExecTest.java          | 9 ++-------
 4 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 7800a8c12..2567a3c28 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -69,7 +69,7 @@ public void afterMethod(ITestResult result) {
         super.afterMethod(result);
     }
 
-    @Test
+    @Test(expectedExceptions = ConflictException.class)
     public void createContainerWithExistingName() throws DockerException {
 
         String containerName = "generated_" + new SecureRandom().nextInt();
@@ -81,11 +81,7 @@ public void createContainerWithExistingName() throws DockerException {
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        try {
-            dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("env").withName(containerName).exec();
-            fail("expected ConflictException");
-        } catch (ConflictException e) {
-        }
+        dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("env").withName(containerName).exec();
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
index e11ff6839..47ed11201 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
@@ -63,14 +63,9 @@ public void inspectContainer() throws DockerException {
 
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void inspectNonExistingContainer() throws DockerException {
-
-        try {
-            dockerClient.inspectContainerCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+        dockerClient.inspectContainerCmd("non-existing").exec();
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
index 9a6d4b354..fde1179ee 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
@@ -67,7 +67,7 @@ public void afterMethod(ITestResult result) {
         super.afterMethod(result);
     }
 
-    @Test
+    @Test(expectedExceptions = ConflictException.class)
     public void createContainerWithExistingName() throws DockerException {
 
         String containerName = "generated_" + new SecureRandom().nextInt();
@@ -79,11 +79,7 @@ public void createContainerWithExistingName() throws DockerException {
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        try {
-            dockerClient.createContainerCmd("busybox").withCmd("env").withName(containerName).exec();
-            fail("expected ConflictException");
-        } catch (ConflictException e) {
-        }
+        dockerClient.createContainerCmd("busybox").withCmd("env").withName(containerName).exec();
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
index a07e23143..87fe3b48b 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
@@ -63,14 +63,9 @@ public void inspectContainer() throws DockerException {
 
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void inspectNonExistingContainer() throws DockerException {
-
-        try {
-            dockerClient.inspectContainerCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+        dockerClient.inspectContainerCmd("non-existing").exec();
     }
 
     @Test

From dfe3c43e887b6c1944bda664af3b7ed1760f3408 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 21 Mar 2016 00:31:43 +0300
Subject: [PATCH 0466/1272] Use hashcode, tostring, equals builders.

---
 .../core/command/CreateContainerCmdImpl.java  | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 4f69e9ed0..bb9fcc318 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -5,6 +5,8 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -412,12 +414,6 @@ public String getCgroupParent() {
         return hostConfig.getCgroupParent();
     }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).append("create container ").append(name != null ? "name=" + name + " " : "")
-                .append(this).toString();
-    }
-
     @Override
     public CreateContainerCmd withAttachStderr(Boolean attachStderr) {
         checkNotNull(attachStderr, "attachStderr was not specified");
@@ -890,4 +886,18 @@ public CreateContainerCmd withPidMode(String pidMode) {
         return this;
     }
 
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 }

From ab6443bbeafa1676732d5fa18ac43522afb77ed2 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 21 Mar 2016 00:32:44 +0300
Subject: [PATCH 0467/1272] Add test case for CgroupParent

---
 .../core/command/CreateContainerCmdImplTest.java   | 14 ++++++++++++++
 .../netty/exec/CreateContainerCmdExecTest.java     | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 2567a3c28..f2fd32b6a 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -613,4 +613,18 @@ public void onNext(Frame item) {
             super.onNext(item);
         }
     }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void createContainerWithCgroupParent() throws DockerException {
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCgroupParent("/parent").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainer = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainer.getHostConfig().getCgroupParent(), is("/parent"));
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
index fde1179ee..02c5cc54e 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
@@ -550,4 +550,18 @@ public void createContainerWithLogConfig() throws DockerException {
         // null becomes empty string
         assertEquals(inspectContainerResponse.getHostConfig().getLogConfig().type, logConfig.type);
     }
+
+    @Test(groups = "ignoreInCircleCi")
+    public void createContainerWithCgroupParent() throws DockerException {
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCgroupParent("/parent").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainer = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainer.getHostConfig().getCgroupParent(), is("/parent"));
+    }
 }

From cdc17cb2c1fdce31fa7ffe16d085f7143127f7d8 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 21 Mar 2016 01:26:11 +0300
Subject: [PATCH 0468/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a91e105f..f34102285 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,12 @@ Notes
 
 All changes
 
+Included in 3.0.0-RC4
+* [#495] (https://github.com/docker-java/docker-java/pull/495) Add CgroupParent option for create cmd
+* [#504] (https://github.com/docker-java/docker-java/pull/504) Rename container cmd
+* [#500] (https://github.com/docker-java/docker-java/pull/500) Add aux to ResponseItem
+* [#498] (https://github.com/docker-java/docker-java/issues/493) Expose RepoTags from inspect image command
+
 Included in 3.0.0-RC3
 * [#488] (https://github.com/docker-java/docker-java/pull/488) Support remote API 1.22 subset
 

From 13c51b0fd863a2599d10cf3a70af141f3a861761 Mon Sep 17 00:00:00 2001
From: hongweiyi <hongweiyi@hotmail.com>
Date: Thu, 24 Mar 2016 11:16:24 +0800
Subject: [PATCH 0469/1272] Change execStartCmd arguments name.

com.github.dockerjava.api.DockerClient#execStartCmd: argument name should be execId but not containerId.
Signed-off-by: hongwei yi <hongweiyi@hotmail.com>
---
 src/main/java/com/github/dockerjava/api/DockerClient.java     | 2 +-
 .../java/com/github/dockerjava/core/DockerClientImpl.java     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 978bd35ca..4c0e2ed56 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -129,7 +129,7 @@ public interface DockerClient extends Closeable {
 
     AttachContainerCmd attachContainerCmd(@Nonnull String containerId);
 
-    ExecStartCmd execStartCmd(@Nonnull String containerId);
+    ExecStartCmd execStartCmd(@Nonnull String execId);
 
     InspectExecCmd inspectExecCmd(@Nonnull String execId);
 
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 9f4f0f88b..765f562bd 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -314,8 +314,8 @@ public AttachContainerCmd attachContainerCmd(String containerId) {
     }
 
     @Override
-    public ExecStartCmd execStartCmd(String containerId) {
-        return new ExecStartCmdImpl(getDockerCmdExecFactory().createExecStartCmdExec(), containerId);
+    public ExecStartCmd execStartCmd(String execId) {
+        return new ExecStartCmdImpl(getDockerCmdExecFactory().createExecStartCmdExec(), execId);
     }
 
     @Override

From 1576aad228750341f3c15f22dd1ab7c12e748451 Mon Sep 17 00:00:00 2001
From: Hendrik Haddorp <hendrik.haddorp@de.ibm.com>
Date: Tue, 22 Mar 2016 22:54:23 +0100
Subject: [PATCH 0470/1272] Fixed verifyCertificatesExist for missing or wrong
 files.

---
 .../core/util/CertificateUtils.java           |  5 +-
 .../core/util/CertificateUtilsTest.java       | 51 +++++++++++++++++++
 .../CertificateUtilsTest/allFilesExist/ca.pem |  0
 .../allFilesExist/cert.pem                    |  0
 .../allFilesExist/key.pem                     |  0
 .../caAndCertMissing/key.pem                  |  0
 .../caAndKeyMissing/cert.pem                  |  0
 .../CertificateUtilsTest/caMissing/cert.pem   |  0
 .../CertificateUtilsTest/caMissing/key.pem    |  0
 .../certAndKeyMissing/ca.pem                  |  0
 .../CertificateUtilsTest/certMissing/ca.pem   |  0
 .../CertificateUtilsTest/certMissing/key.pem  |  0
 .../CertificateUtilsTest/keyMissing/ca.pem    |  0
 .../CertificateUtilsTest/keyMissing/cert.pem  |  0
 14 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java
 create mode 100644 src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/ca.pem
 create mode 100644 src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/cert.pem
 create mode 100644 src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/key.pem
 create mode 100644 src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caAndCertMissing/key.pem
 create mode 100644 src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caAndKeyMissing/cert.pem
 create mode 100644 src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caMissing/cert.pem
 create mode 100644 src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caMissing/key.pem
 create mode 100644 src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certAndKeyMissing/ca.pem
 create mode 100644 src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certMissing/ca.pem
 create mode 100644 src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certMissing/key.pem
 create mode 100644 src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/keyMissing/ca.pem
 create mode 100644 src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/keyMissing/cert.pem

diff --git a/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java b/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
index 65e6544f1..562a954a7 100644
--- a/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
+++ b/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
@@ -32,12 +32,13 @@ private CertificateUtils() {
 
     public static boolean verifyCertificatesExist(String dockerCertPath) {
         String[] files = {"ca.pem", "cert.pem", "key.pem"};
+        boolean result = true;
         for (String file : files) {
             File path = new File(dockerCertPath, file);
-            return path.exists();
+            result &= path.exists();
         }
 
-        return true;
+        return result;
     }
 
     public static KeyStore createKeyStore(final String dockerCertPath) throws NoSuchAlgorithmException,
diff --git a/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java b/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java
new file mode 100644
index 000000000..36c00c076
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java
@@ -0,0 +1,51 @@
+package com.github.dockerjava.core.util;
+
+import org.testng.annotations.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+
+public class CertificateUtilsTest {
+    private static final String baseDir = CertificateUtilsTest.class.getResource(
+            CertificateUtilsTest.class.getSimpleName() + "/").getFile();
+
+    @Test
+    public void allFilesExist() {
+        assertThat(CertificateUtils.verifyCertificatesExist(baseDir + "allFilesExist"), is(true));
+    }
+
+    @Test
+    public void caAndCertAndKeyMissing() {
+        assertThat(CertificateUtils.verifyCertificatesExist(baseDir + "caAndCertAndKeyMissing"), is(false));
+    }
+
+    @Test
+    public void caAndCertMissing() {
+        assertThat(CertificateUtils.verifyCertificatesExist(baseDir + "caAndCertMissing"), is(false));
+    }
+
+    @Test
+    public void caAndKeyMissing() {
+        assertThat(CertificateUtils.verifyCertificatesExist(baseDir + "caAndKeyMissing"), is(false));
+    }
+
+    @Test
+    public void caMissing() {
+        assertThat(CertificateUtils.verifyCertificatesExist(baseDir + "caMissing"), is(false));
+    }
+
+    @Test
+    public void certAndKeyMissing() {
+        assertThat(CertificateUtils.verifyCertificatesExist(baseDir + "certAndKeyMissing"), is(false));
+    }
+
+    @Test
+    public void certMissing() {
+        assertThat(CertificateUtils.verifyCertificatesExist(baseDir + "certMissing"), is(false));
+    }
+
+    @Test
+    public void keyMissing() {
+        assertThat(CertificateUtils.verifyCertificatesExist(baseDir + "keyMissing"), is(false));
+    }
+}
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/ca.pem b/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/ca.pem
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/cert.pem b/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/cert.pem
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/key.pem b/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/key.pem
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caAndCertMissing/key.pem b/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caAndCertMissing/key.pem
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caAndKeyMissing/cert.pem b/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caAndKeyMissing/cert.pem
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caMissing/cert.pem b/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caMissing/cert.pem
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caMissing/key.pem b/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caMissing/key.pem
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certAndKeyMissing/ca.pem b/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certAndKeyMissing/ca.pem
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certMissing/ca.pem b/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certMissing/ca.pem
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certMissing/key.pem b/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certMissing/key.pem
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/keyMissing/ca.pem b/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/keyMissing/ca.pem
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/keyMissing/cert.pem b/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/keyMissing/cert.pem
new file mode 100644
index 000000000..e69de29bb

From 7920d4822eb06524935ae04fd6af87668b68b388 Mon Sep 17 00:00:00 2001
From: Oleg Anastasyev <oa@odnoklassniki.ru>
Date: Tue, 15 Mar 2016 17:22:54 +0200
Subject: [PATCH 0471/1272] SELinux context support to volumes

---
 .../com/github/dockerjava/api/model/Bind.java | 77 ++++++++++++++-----
 .../dockerjava/api/model/SELContext.java      | 45 +++++++++++
 .../github/dockerjava/api/model/BindTest.java | 51 ++++++++++++
 3 files changed, 153 insertions(+), 20 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SELContext.java

diff --git a/src/main/java/com/github/dockerjava/api/model/Bind.java b/src/main/java/com/github/dockerjava/api/model/Bind.java
index bc7c8e4bb..bf02bbad2 100644
--- a/src/main/java/com/github/dockerjava/api/model/Bind.java
+++ b/src/main/java/com/github/dockerjava/api/model/Bind.java
@@ -4,8 +4,8 @@
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
 /**
- * Represents a host path being bind mounted as a {@link Volume} in a Docker container. The Bind can be in read only or read write access
- * mode.
+ * Represents a host path being bind mounted as a {@link Volume} in a Docker container.
+ * The Bind can be in read only or read write access mode.
  */
 public class Bind {
 
@@ -15,14 +15,24 @@ public class Bind {
 
     private AccessMode accessMode;
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_17}
+     */
+    private SELContext secMode;
+
     public Bind(String path, Volume volume) {
-        this(path, volume, AccessMode.DEFAULT);
+        this(path, volume, AccessMode.DEFAULT, SELContext.DEFAULT);
     }
 
     public Bind(String path, Volume volume, AccessMode accessMode) {
+        this(path, volume, accessMode, SELContext.DEFAULT);
+    }
+
+    public Bind(String path, Volume volume, AccessMode accessMode, SELContext secMode) {
         this.path = path;
         this.volume = volume;
         this.accessMode = accessMode;
+        this.secMode = secMode;
     }
 
     public String getPath() {
@@ -37,6 +47,10 @@ public AccessMode getAccessMode() {
         return accessMode;
     }
 
+    public SELContext getSecMode() {
+        return secMode;
+    }
+
     /**
      * Parses a bind mount specification to a {@link Bind}.
      *
@@ -50,19 +64,29 @@ public static Bind parse(String serialized) {
         try {
             String[] parts = serialized.split(":");
             switch (parts.length) {
-                case 2: {
-                    return new Bind(parts[0], new Volume(parts[1]));
-                }
-                case 3: {
-                    AccessMode accessMode = AccessMode.valueOf(parts[2].toLowerCase());
-                    return new Bind(parts[0], new Volume(parts[1]), accessMode);
-                }
-                default: {
-                    throw new IllegalArgumentException();
+            case 2: {
+                return new Bind(parts[0], new Volume(parts[1]));
+            }
+            case 3: {
+                String[] flags = parts[2].split(",");
+                AccessMode accessMode = AccessMode.DEFAULT;
+                SELContext seMode = SELContext.DEFAULT;
+                for (String p : flags) {
+                    if (p.length() == 2) {
+                        accessMode = AccessMode.valueOf(p.toLowerCase());
+                    } else {
+                        seMode = SELContext.fromString(p);
+                    }
                 }
+
+                return new Bind(parts[0], new Volume(parts[1]), accessMode, seMode);
+            }
+            default: {
+                throw new IllegalArgumentException();
+            }
             }
         } catch (Exception e) {
-            throw new IllegalArgumentException("Error parsing Bind '" + serialized + "'");
+            throw new IllegalArgumentException("Error parsing Bind '" + serialized + "'", e);
         }
     }
 
@@ -70,8 +94,12 @@ public static Bind parse(String serialized) {
     public boolean equals(Object obj) {
         if (obj instanceof Bind) {
             Bind other = (Bind) obj;
-            return new EqualsBuilder().append(path, other.getPath()).append(volume, other.getVolume())
-                    .append(accessMode, other.getAccessMode()).isEquals();
+            return new EqualsBuilder()
+                    .append(path, other.getPath())
+                    .append(volume, other.getVolume())
+                    .append(accessMode, other.getAccessMode())
+                    .append(secMode, other.getSecMode())
+                    .isEquals();
         } else {
             return super.equals(obj);
         }
@@ -79,18 +107,27 @@ public boolean equals(Object obj) {
 
     @Override
     public int hashCode() {
-        return new HashCodeBuilder().append(path).append(volume).append(accessMode).toHashCode();
+        return new HashCodeBuilder()
+                .append(path)
+                .append(volume)
+                .append(accessMode)
+                .append(secMode)
+                .toHashCode();
     }
 
     /**
-     * Returns a string representation of this {@link Bind} suitable for inclusion in a JSON message. The format is
-     * <code>&lt;host path&gt;:&lt;container path&gt;:&lt;access mode&gt;</code>, like the argument in {@link #parse(String)}.
+     * Returns a string representation of this {@link Bind} suitable for inclusion in a JSON message.
+     * The format is <code>&lt;host path&gt;:&lt;container path&gt;:&lt;access mode&gt;</code>,
+     * like the argument in {@link #parse(String)}.
      *
      * @return a string representation of this {@link Bind}
      */
     @Override
     public String toString() {
-        return path + ":" + volume.getPath() + ":" + accessMode.toString();
+        return String.format("%s:%s:%s%s",
+                path,
+                volume.getPath(),
+                accessMode.toString(),
+                secMode != SELContext.none ? "," + secMode.toString() : "");
     }
-
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/SELContext.java b/src/main/java/com/github/dockerjava/api/model/SELContext.java
new file mode 100644
index 000000000..b3d199f6f
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SELContext.java
@@ -0,0 +1,45 @@
+package com.github.dockerjava.api.model;
+
+/**
+ * The context mode of bound volume in SELinux.
+ * Host path <code>shared</code> - can be used by all containers, <code>private</code> - by only this container
+ *
+ * @see http://www.projectatomic.io/blog/2015/06/using-volumes-with-docker-can-cause-problems-with-selinux/
+ * @since 1.17
+ */
+public enum SELContext {
+    /** no selinux */
+    none(""),
+
+    /** z option */
+    shared("z"),
+
+    /** Z option */
+    single("Z");
+
+    /**
+     * The default {@link SELContext}: {@link #none}
+     */
+    public static final SELContext DEFAULT = none;
+
+    private String value;
+
+    SELContext(String v) {
+        this.value = v;
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+
+    public static SELContext fromString(String p) {
+        switch (p) {
+        case "z":
+            return shared;
+        case "Z":
+            return single;
+        }
+        return none;
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/api/model/BindTest.java b/src/test/java/com/github/dockerjava/api/model/BindTest.java
index db5aec212..27c9dcb6b 100644
--- a/src/test/java/com/github/dockerjava/api/model/BindTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/BindTest.java
@@ -14,6 +14,7 @@ public void parseUsingDefaultAccessMode() {
         assertEquals(bind.getPath(), "/host");
         assertEquals(bind.getVolume().getPath(), "/container");
         assertEquals(bind.getAccessMode(), AccessMode.DEFAULT);
+        assertEquals(bind.getSecMode(), SELContext.none);
     }
 
     @Test
@@ -22,6 +23,7 @@ public void parseReadWrite() {
         assertEquals(bind.getPath(), "/host");
         assertEquals(bind.getVolume().getPath(), "/container");
         assertEquals(bind.getAccessMode(), rw);
+        assertEquals(bind.getSecMode(), SELContext.none);
     }
 
     @Test
@@ -30,6 +32,40 @@ public void parseReadOnly() {
         assertEquals(bind.getPath(), "/host");
         assertEquals(bind.getVolume().getPath(), "/container");
         assertEquals(bind.getAccessMode(), ro);
+        assertEquals(bind.getSecMode(), SELContext.none);
+    }
+
+    @Test
+    public void parseSELOnly() {
+        Bind bind = Bind.parse("/host:/container:Z");
+        assertEquals(bind.getPath(), "/host");
+        assertEquals(bind.getVolume().getPath(), "/container");
+        assertEquals(bind.getAccessMode(), AccessMode.DEFAULT);
+        assertEquals(bind.getSecMode(), SELContext.single);
+        
+        bind = Bind.parse("/host:/container:z");
+        assertEquals(bind.getPath(), "/host");
+        assertEquals(bind.getVolume().getPath(), "/container");
+        assertEquals(bind.getAccessMode(), AccessMode.DEFAULT);
+        assertEquals(bind.getSecMode(), SELContext.shared);
+    }
+
+    @Test
+    public void parseReadWriteSEL() {
+        Bind bind = Bind.parse("/host:/container:rw,Z");
+        assertEquals(bind.getPath(), "/host");
+        assertEquals(bind.getVolume().getPath(), "/container");
+        assertEquals(bind.getAccessMode(), rw);
+        assertEquals(bind.getSecMode(), SELContext.single);
+    }
+
+    @Test
+    public void parseReadOnlySEL() {
+        Bind bind = Bind.parse("/host:/container:ro,z");
+        assertEquals(bind.getPath(), "/host");
+        assertEquals(bind.getVolume().getPath(), "/container");
+        assertEquals(bind.getAccessMode(), ro);
+        assertEquals(bind.getSecMode(), SELContext.shared);
     }
 
     @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Bind.*")
@@ -62,4 +98,19 @@ public void toStringDefaultAccessMode() {
         assertEquals(Bind.parse("/host:/container").toString(), "/host:/container:rw");
     }
 
+    @Test
+    public void toStringReadOnlySEL() {
+        assertEquals(Bind.parse("/host:/container:ro,Z").toString(), "/host:/container:ro,Z");
+    }
+
+    @Test
+    public void toStringReadWriteSEL() {
+        assertEquals(Bind.parse("/host:/container:rw,z").toString(), "/host:/container:rw,z");
+    }
+
+    @Test
+    public void toStringDefaultSEL() {
+        assertEquals(Bind.parse("/host:/container:Z").toString(), "/host:/container:rw,Z");
+    }
+
 }

From 253f6d2375f2838badd6336d13810804173eba39 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 27 Mar 2016 21:21:25 +0300
Subject: [PATCH 0472/1272] Use Hamcrest matchers.

---
 .../github/dockerjava/api/model/BindTest.java | 73 ++++++++++---------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/api/model/BindTest.java b/src/test/java/com/github/dockerjava/api/model/BindTest.java
index 27c9dcb6b..3204ee716 100644
--- a/src/test/java/com/github/dockerjava/api/model/BindTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/BindTest.java
@@ -2,7 +2,8 @@
 
 import static com.github.dockerjava.api.model.AccessMode.ro;
 import static com.github.dockerjava.api.model.AccessMode.rw;
-import static org.testng.Assert.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
 
 import org.testng.annotations.Test;
 
@@ -11,61 +12,61 @@ public class BindTest {
     @Test
     public void parseUsingDefaultAccessMode() {
         Bind bind = Bind.parse("/host:/container");
-        assertEquals(bind.getPath(), "/host");
-        assertEquals(bind.getVolume().getPath(), "/container");
-        assertEquals(bind.getAccessMode(), AccessMode.DEFAULT);
-        assertEquals(bind.getSecMode(), SELContext.none);
+        assertThat(bind.getPath(), is("/host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(AccessMode.DEFAULT));
+        assertThat(bind.getSecMode(), is(SELContext.none));
     }
 
     @Test
     public void parseReadWrite() {
         Bind bind = Bind.parse("/host:/container:rw");
-        assertEquals(bind.getPath(), "/host");
-        assertEquals(bind.getVolume().getPath(), "/container");
-        assertEquals(bind.getAccessMode(), rw);
-        assertEquals(bind.getSecMode(), SELContext.none);
+        assertThat(bind.getPath(), is("/host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(rw));
+        assertThat(bind.getSecMode(), is(SELContext.none));
     }
 
     @Test
     public void parseReadOnly() {
         Bind bind = Bind.parse("/host:/container:ro");
-        assertEquals(bind.getPath(), "/host");
-        assertEquals(bind.getVolume().getPath(), "/container");
-        assertEquals(bind.getAccessMode(), ro);
-        assertEquals(bind.getSecMode(), SELContext.none);
+        assertThat(bind.getPath(), is("/host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(ro));
+        assertThat(bind.getSecMode(), is(SELContext.none));
     }
 
     @Test
     public void parseSELOnly() {
         Bind bind = Bind.parse("/host:/container:Z");
-        assertEquals(bind.getPath(), "/host");
-        assertEquals(bind.getVolume().getPath(), "/container");
-        assertEquals(bind.getAccessMode(), AccessMode.DEFAULT);
-        assertEquals(bind.getSecMode(), SELContext.single);
-        
+        assertThat(bind.getPath(), is("/host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(AccessMode.DEFAULT));
+        assertThat(bind.getSecMode(), is(SELContext.single));
+
         bind = Bind.parse("/host:/container:z");
-        assertEquals(bind.getPath(), "/host");
-        assertEquals(bind.getVolume().getPath(), "/container");
-        assertEquals(bind.getAccessMode(), AccessMode.DEFAULT);
-        assertEquals(bind.getSecMode(), SELContext.shared);
+        assertThat(bind.getPath(), is("/host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(AccessMode.DEFAULT));
+        assertThat(bind.getSecMode(), is(SELContext.shared));
     }
 
     @Test
     public void parseReadWriteSEL() {
         Bind bind = Bind.parse("/host:/container:rw,Z");
-        assertEquals(bind.getPath(), "/host");
-        assertEquals(bind.getVolume().getPath(), "/container");
-        assertEquals(bind.getAccessMode(), rw);
-        assertEquals(bind.getSecMode(), SELContext.single);
+        assertThat(bind.getPath(), is("/host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(rw));
+        assertThat(bind.getSecMode(), is(SELContext.single));
     }
 
     @Test
     public void parseReadOnlySEL() {
         Bind bind = Bind.parse("/host:/container:ro,z");
-        assertEquals(bind.getPath(), "/host");
-        assertEquals(bind.getVolume().getPath(), "/container");
-        assertEquals(bind.getAccessMode(), ro);
-        assertEquals(bind.getSecMode(), SELContext.shared);
+        assertThat(bind.getPath(), is("/host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(ro));
+        assertThat(bind.getSecMode(), is(SELContext.shared));
     }
 
     @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Bind.*")
@@ -85,32 +86,32 @@ public void parseNull() {
 
     @Test
     public void toStringReadOnly() {
-        assertEquals(Bind.parse("/host:/container:ro").toString(), "/host:/container:ro");
+        assertThat(Bind.parse("/host:/container:ro").toString(), is("/host:/container:ro"));
     }
 
     @Test
     public void toStringReadWrite() {
-        assertEquals(Bind.parse("/host:/container:rw").toString(), "/host:/container:rw");
+        assertThat(Bind.parse("/host:/container:rw").toString(), is("/host:/container:rw"));
     }
 
     @Test
     public void toStringDefaultAccessMode() {
-        assertEquals(Bind.parse("/host:/container").toString(), "/host:/container:rw");
+        assertThat(Bind.parse("/host:/container").toString(), is("/host:/container:rw"));
     }
 
     @Test
     public void toStringReadOnlySEL() {
-        assertEquals(Bind.parse("/host:/container:ro,Z").toString(), "/host:/container:ro,Z");
+        assertThat(Bind.parse("/host:/container:ro,Z").toString(), is("/host:/container:ro,Z"));
     }
 
     @Test
     public void toStringReadWriteSEL() {
-        assertEquals(Bind.parse("/host:/container:rw,z").toString(), "/host:/container:rw,z");
+        assertThat(Bind.parse("/host:/container:rw,z").toString(), is("/host:/container:rw,z"));
     }
 
     @Test
     public void toStringDefaultSEL() {
-        assertEquals(Bind.parse("/host:/container:Z").toString(), "/host:/container:rw,Z");
+        assertThat(Bind.parse("/host:/container:Z").toString(), is("/host:/container:rw,Z"));
     }
 
 }

From de9f326ec68c63dd18176b028361046bb2c4cf82 Mon Sep 17 00:00:00 2001
From: Hendrik Haddorp <hendrik.haddorp@de.ibm.com>
Date: Tue, 22 Mar 2016 21:34:01 +0100
Subject: [PATCH 0473/1272] Mirrors is list and not a single String.

---
 .../api/model/InfoRegistryConfig.java         |   6 +-
 .../github/dockerjava/api/model/InfoTest.java | 158 +++++++++++++++++
 src/test/resources/samples/1.22/info/2.json   | 165 ++++++++++++++++++
 3 files changed, 326 insertions(+), 3 deletions(-)
 create mode 100644 src/test/resources/samples/1.22/info/2.json

diff --git a/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java b/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
index cc67994a5..956aaebe3 100644
--- a/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
@@ -96,7 +96,7 @@ public int hashCode() {
     @JsonIgnoreProperties(ignoreUnknown = true)
     public static final class IndexConfig {
         @JsonProperty("Mirrors")
-        private String mirrors;
+        private List<String> mirrors;
 
         @JsonProperty("Name")
         private String name;
@@ -111,14 +111,14 @@ public static final class IndexConfig {
          * @see #mirrors
          */
         @CheckForNull
-        public String getMirrors() {
+        public List<String> getMirrors() {
             return mirrors;
         }
 
         /**
          * @see #mirrors
          */
-        public IndexConfig withMirrors(String mirrors) {
+        public IndexConfig withMirrors(List<String> mirrors) {
             this.mirrors = mirrors;
             return this;
         }
diff --git a/src/test/java/com/github/dockerjava/api/model/InfoTest.java b/src/test/java/com/github/dockerjava/api/model/InfoTest.java
index 6d4c76471..806870ae6 100644
--- a/src/test/java/com/github/dockerjava/api/model/InfoTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/InfoTest.java
@@ -7,6 +7,7 @@
 import org.testng.annotations.Test;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -169,4 +170,161 @@ public void serder1Json() throws IOException {
 
         assertThat(info, is(withInfo));
     }
+
+    @Test
+    public void serder2Json() throws IOException {
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().constructType(Info.class);
+
+        final Info info = testRoundTrip(VERSION_1_22,
+                "info/2.json",
+                type
+        );
+
+        final List<List<String>> driverStatus = asList(
+                asList("Pool Name", "docker-253:2-17567992-pool"),
+                asList("Pool Blocksize", "65.54 kB"),
+                asList("Base Device Size", "107.4 GB"),
+                asList("Backing Filesystem", "ext4"),
+                asList("Data file", "/dev/loop0"),
+                asList("Metadata file", "/dev/loop1"),
+                asList("Data Space Used", "3.89 GB"),
+                asList("Data Space Total", "107.4 GB"),
+                asList("Data Space Available", "103.5 GB"),
+                asList("Metadata Space Used", "5.46 MB"),
+                asList("Metadata Space Total", "2.147 GB"),
+                asList("Metadata Space Available", "2.142 GB"),
+                asList("Udev Sync Supported", "true"),
+                asList("Deferred Removal Enabled", "false"),
+                asList("Deferred Deletion Enabled", "false"),
+                asList("Deferred Deleted Device Count", "0"),
+                asList("Data loop file", "/var/lib/docker/devicemapper/devicemapper/data"),
+                asList("Metadata loop file", "/var/lib/docker/devicemapper/devicemapper/metadata"),
+                asList("Library Version", "1.02.107-RHEL7 (2015-12-01)")
+        );
+
+        final Map<String, List<String>> plugins = new LinkedHashMap<>();
+        plugins.put("Volume", singletonList("local"));
+        plugins.put("Network", asList("null", "host", "bridge"));
+        plugins.put("Authorization", null);
+
+        assertThat(info, notNullValue());
+        assertThat(info.getArchitecture(), equalTo("x86_64"));
+        assertThat(info.getContainersStopped(), is(2));
+        assertThat(info.getContainersPaused(), is(0));
+        assertThat(info.getContainersRunning(), is(0));
+        assertThat(info.getCpuCfsPeriod(), is(true));
+
+        // not available in this dump
+        assertThat(info.getCpuCfsQuota(), is(true));
+        assertThat(info.getDiscoveryBackend(), nullValue());
+        assertThat(info.getOomScoreAdj(), nullValue());
+
+        assertThat(info.getDriverStatuses(), notNullValue());
+        assertThat(info.getDriverStatuses(), hasSize(19));
+        assertThat(info.getDriverStatuses(), equalTo(driverStatus));
+
+        assertThat(info.getNGoroutines(), is(30));
+
+        assertThat(info.getSystemStatus(), CoreMatchers.nullValue());
+
+        assertThat(info.getPlugins(), equalTo(plugins));
+        assertThat(info.getPlugins(), hasEntry("Volume", singletonList("local")));
+        assertThat(info.getPlugins(), hasEntry("Authorization", null));
+
+        assertThat(info.getExperimentalBuild(), is(false));
+
+        assertThat(info.getHttpProxy(), isEmptyString());
+        assertThat(info.getHttpsProxy(), isEmptyString());
+        assertThat(info.getNoProxy(), isEmptyString());
+        assertThat(info.getOomKillDisable(), is(true));
+        assertThat(info.getOsType(), equalTo("linux"));
+
+        final InfoRegistryConfig registryConfig = info.getRegistryConfig();
+        assertThat(registryConfig, notNullValue());
+        final List<String> cidRs = registryConfig.getInsecureRegistryCIDRs();
+        assertThat(cidRs, notNullValue());
+        assertThat(cidRs, contains("127.0.0.0/8"));
+
+        final Map<String, IndexConfig> indexConfigs = registryConfig.getIndexConfigs();
+        assertThat(indexConfigs, notNullValue());
+        final IndexConfig indexConfig = new IndexConfig().withMirrors(null).withName("docker.io")
+                .withSecure(true).withOfficial(true);
+        assertThat(indexConfigs, hasEntry("docker.io", indexConfig));
+        final IndexConfig indexConfig2 = new IndexConfig().withMirrors(Collections.<String>emptyList()).withName("somehost:80")
+                .withSecure(false).withOfficial(false);
+        assertThat(indexConfigs, hasEntry("somehost:80", indexConfig2));
+        assertThat(registryConfig.getMirrors(), nullValue());
+
+        assertThat(info.getSystemTime(), is("2016-03-20T17:32:06.598846244+01:00"));
+        assertThat(info.getServerVersion(), is("1.10.2"));
+
+        assertThat(info.getCpuSet(), is(true));
+        assertThat(info.getCpuShares(), is(true));
+        assertThat(info.getIPv4Forwarding(), is(true));
+        assertThat(info.getBridgeNfIptables(), is(false));
+        assertThat(info.getBridgeNfIp6tables(), is(false));
+        assertThat(info.getDebug(), is(false));
+        assertThat(info.getNFd(), is(13));
+        assertThat(info.getOomKillDisable(), is(true));
+        assertThat(info.getLoggingDriver(), is("json-file"));
+        assertThat(info.getOperatingSystem(), is("Red Hat Enterprise Linux Workstation 7.2 (Maipo)"));
+        assertThat(info.getClusterStore(), is(""));
+
+
+        final Info withInfo = new Info().withArchitecture("x86_64")
+                .withContainers(2)
+                .withContainersRunning(0)
+                .withContainersPaused(0)
+                .withContainersStopped(2)
+                .withImages(55)
+                .withId("H52J:52LG:YP4W:EHKY:SRK5:RYG6:ETWR:7AR3:MTFJ:PC6C:4YF2:NTN2")
+                .withDriver("devicemapper")
+                .withDriverStatuses(driverStatus)
+                .withSystemStatus(null)
+                .withPlugins(plugins)
+                .withMemoryLimit(true)
+                .withSwapLimit(true)
+                .withCpuCfsPeriod(true)
+                .withCpuCfsQuota(true)
+                .withCpuShares(true)
+                .withCpuSet(true)
+                .withIPv4Forwarding(true)
+                .withBridgeNfIptables(false)
+                .withBridgeNfIp6tables(false)
+                .withDebug(false)
+                .withNFd(13)
+                .withOomKillDisable(true)
+                .withNGoroutines(30)
+                .withSystemTime("2016-03-20T17:32:06.598846244+01:00")
+                .withExecutionDriver("native-0.2")
+                .withLoggingDriver("json-file")
+                .withNEventsListener(0)
+                .withKernelVersion("3.10.0-327.10.1.el7.x86_64")
+                .withOperatingSystem("Red Hat Enterprise Linux Workstation 7.2 (Maipo)")
+                .withOsType("linux")
+                .withIndexServerAddress("https://index.docker.io/v1/")
+                .withRegistryConfig(registryConfig)
+                .withInitSha1("672d65f3cf8816fbda421afeed7e52c0ca17d5e7")
+                .withInitPath("/usr/libexec/docker/dockerinit")
+                .withNCPU(8)
+                .withMemTotal(33350918144L)
+                .withDockerRootDir("/var/lib/docker")
+                .withHttpProxy("")
+                .withHttpsProxy("")
+                .withNoProxy("")
+                .withName("somename")
+                .withLabels(null)
+                .withExperimentalBuild(false)
+                .withServerVersion("1.10.2")
+                .withClusterStore("")
+                .withClusterAdvertise("")
+                //shredinger-fields
+                .withDiscoveryBackend(null)
+                .withOomScoreAdj(null)
+                .withSockets(null)
+                ;
+
+        assertThat(info, is(withInfo));
+    }
 }
diff --git a/src/test/resources/samples/1.22/info/2.json b/src/test/resources/samples/1.22/info/2.json
new file mode 100644
index 000000000..c30dca325
--- /dev/null
+++ b/src/test/resources/samples/1.22/info/2.json
@@ -0,0 +1,165 @@
+{
+   "ID":"H52J:52LG:YP4W:EHKY:SRK5:RYG6:ETWR:7AR3:MTFJ:PC6C:4YF2:NTN2",
+   "Containers":2,
+   "ContainersRunning":0,
+   "ContainersPaused":0,
+   "ContainersStopped":2,
+   "Images":55,
+   "Driver":"devicemapper",
+   "DriverStatus":[
+      [
+         "Pool Name",
+         "docker-253:2-17567992-pool"
+      ],
+      [
+         "Pool Blocksize",
+         "65.54 kB"
+      ],
+      [
+         "Base Device Size",
+         "107.4 GB"
+      ],
+      [
+         "Backing Filesystem",
+         "ext4"
+      ],
+      [
+         "Data file",
+         "/dev/loop0"
+      ],
+      [
+         "Metadata file",
+         "/dev/loop1"
+      ],
+      [
+         "Data Space Used",
+         "3.89 GB"
+      ],
+      [
+         "Data Space Total",
+         "107.4 GB"
+      ],
+      [
+         "Data Space Available",
+         "103.5 GB"
+      ],
+      [
+         "Metadata Space Used",
+         "5.46 MB"
+      ],
+      [
+         "Metadata Space Total",
+         "2.147 GB"
+      ],
+      [
+         "Metadata Space Available",
+         "2.142 GB"
+      ],
+      [
+         "Udev Sync Supported",
+         "true"
+      ],
+      [
+         "Deferred Removal Enabled",
+         "false"
+      ],
+      [
+         "Deferred Deletion Enabled",
+         "false"
+      ],
+      [
+         "Deferred Deleted Device Count",
+         "0"
+      ],
+      [
+         "Data loop file",
+         "/var/lib/docker/devicemapper/devicemapper/data"
+      ],
+      [
+         "Metadata loop file",
+         "/var/lib/docker/devicemapper/devicemapper/metadata"
+      ],
+      [
+         "Library Version",
+         "1.02.107-RHEL7 (2015-12-01)"
+      ]
+   ],
+   "SystemStatus":null,
+   "Plugins":{
+      "Volume":[
+         "local"
+      ],
+      "Network":[
+         "null",
+         "host",
+         "bridge"
+      ],
+      "Authorization":null
+   },
+   "MemoryLimit":true,
+   "SwapLimit":true,
+   "CpuCfsPeriod":true,
+   "CpuCfsQuota":true,
+   "CPUShares":true,
+   "CPUSet":true,
+   "IPv4Forwarding":true,
+   "BridgeNfIptables":false,
+   "BridgeNfIp6tables":false,
+   "Debug":false,
+   "NFd":13,
+   "OomKillDisable":true,
+   "NGoroutines":30,
+   "SystemTime":"2016-03-20T17:32:06.598846244+01:00",
+   "ExecutionDriver":"native-0.2",
+   "LoggingDriver":"json-file",
+   "NEventsListener":0,
+   "KernelVersion":"3.10.0-327.10.1.el7.x86_64",
+   "PkgVersion":"docker-1.10.2-6.git0f5ac89.el7.x86_64",
+   "OperatingSystem":"Red Hat Enterprise Linux Workstation 7.2 (Maipo)",
+   "OSType":"linux",
+   "Architecture":"x86_64",
+   "IndexServerAddress":"https://index.docker.io/v1/",
+   "IndexServerName":"docker.io",
+   "RegistryConfig":{
+      "InsecureRegistryCIDRs":[
+         "127.0.0.0/8"
+      ],
+      "IndexConfigs":{
+         "docker.io":{
+            "Name":"docker.io",
+            "Mirrors":null,
+            "Secure":true,
+            "Official":true
+         },
+         "somehost:80":{
+            "Name":"somehost:80",
+            "Mirrors":[
+
+            ],
+            "Secure":false,
+            "Official":false
+         }
+      },
+      "Mirrors":null
+   },
+   "InitSha1":"672d65f3cf8816fbda421afeed7e52c0ca17d5e7",
+   "InitPath":"/usr/libexec/docker/dockerinit",
+   "NCPU":8,
+   "MemTotal":33350918144,
+   "DockerRootDir":"/var/lib/docker",
+   "HttpProxy":"",
+   "HttpsProxy":"",
+   "NoProxy":"",
+   "Name":"somename",
+   "Labels":null,
+   "ExperimentalBuild":false,
+   "ServerVersion":"1.10.2",
+   "ClusterStore":"",
+   "ClusterAdvertise":"",
+   "Registries":[
+      {
+         "Name":"docker.io",
+         "Secure":true
+      }
+   ]
+}

From 33a25ed9096cef84133cc734db89bf9b8ce9c9c8 Mon Sep 17 00:00:00 2001
From: hongweiyi <hongweiyi@hotmail.com>
Date: Wed, 23 Mar 2016 22:31:14 +0800
Subject: [PATCH 0474/1272] DOCKER_TLS_VERIFY cannot be 'false' or empty

Signed-off-by: hongwei yi <hongweiyi@hotmail.com>
---
 .../dockerjava/core/DockerClientConfig.java   |  5 ++-
 .../core/DockerClientConfigTest.java          | 33 +++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index 038c43cae..a03d6e086 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -13,7 +13,6 @@
 import java.util.Properties;
 import java.util.Set;
 
-import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
@@ -418,8 +417,8 @@ public final DockerClientConfigBuilder withDockerConfig(String dockerConfig) {
         }
 
         public final DockerClientConfigBuilder withDockerTlsVerify(String dockerTlsVerify) {
-            this.dockerTlsVerify = BooleanUtils.toBoolean(dockerTlsVerify.trim())
-                    || BooleanUtils.toBoolean(dockerTlsVerify.trim(), "1", "0");
+            String trimmed = dockerTlsVerify.trim();
+            this.dockerTlsVerify = "true".equalsIgnoreCase(trimmed) || "1".equals(trimmed);
             return this;
         }
 
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
index e87254b88..a363e12ec 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
@@ -2,8 +2,12 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.core.Is.is;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
 
+import java.lang.reflect.Field;
 import java.net.URI;
 import java.util.Collections;
 import java.util.HashMap;
@@ -176,4 +180,33 @@ public void testUnixHostScheme() throws Exception {
         new DockerClientConfig(URI.create("unix://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
                 null, false);
     }
+
+    @Test
+    public void withDockerTlsVerify() throws Exception {
+        DockerClientConfig.DockerClientConfigBuilder builder = new DockerClientConfig.DockerClientConfigBuilder();
+        Field field = builder.getClass().getDeclaredField("dockerTlsVerify");
+        field.setAccessible(true);
+
+        builder.withDockerTlsVerify("");
+        assertThat(field.getBoolean(builder), is(false));
+
+        builder.withDockerTlsVerify("false");
+        assertThat(field.getBoolean(builder), is(false));
+
+        builder.withDockerTlsVerify("FALSE");
+        assertThat(field.getBoolean(builder), is(false));
+
+        builder.withDockerTlsVerify("true");
+        assertThat(field.getBoolean(builder), is(true));
+
+        builder.withDockerTlsVerify("TRUE");
+        assertThat(field.getBoolean(builder), is(true));
+
+        builder.withDockerTlsVerify("0");
+        assertThat(field.getBoolean(builder), is(false));
+
+        builder.withDockerTlsVerify("1");
+        assertThat(field.getBoolean(builder), is(true));
+    }
+
 }

From 9639cb7bdf602887899feccdd639406e4c9323ca Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 28 Mar 2016 00:33:12 +0300
Subject: [PATCH 0475/1272] Refactor CertUtils. Support ECDSA and PrivateKey.

---
 .../core/util/CertificateUtils.java           | 206 +++++++++++-------
 1 file changed, 128 insertions(+), 78 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java b/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
index 562a954a7..6e1925630 100644
--- a/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
+++ b/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
@@ -2,30 +2,38 @@
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
 import java.security.KeyFactory;
-import java.security.KeyPair;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
-import java.security.PublicKey;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.io.IOUtils;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
+import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
 import org.bouncycastle.cert.X509CertificateHolder;
 import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
 import org.bouncycastle.openssl.PEMKeyPair;
 import org.bouncycastle.openssl.PEMParser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.CheckForNull;
+
+import static java.util.Objects.requireNonNull;
 
 public class CertificateUtils {
+    private static final Logger LOG = LoggerFactory.getLogger(CertificateUtils.class);
+
     private CertificateUtils() {
         // utility class
     }
@@ -41,115 +49,157 @@ public static boolean verifyCertificatesExist(String dockerCertPath) {
         return result;
     }
 
+    /**
+     * @param dockerCertPath with standard named files.
+     */
     public static KeyStore createKeyStore(final String dockerCertPath) throws NoSuchAlgorithmException,
             InvalidKeySpecException, IOException, CertificateException, KeyStoreException {
-        KeyPair keyPair = loadPrivateKey(dockerCertPath);
-        List<Certificate> privateCertificates = loadCertificates(dockerCertPath);
+        return createKeyStore("key.pem", "cert.pem");
+    }
+
+
+    @SuppressFBWarnings(value = "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
+    public static KeyStore createKeyStore(final String keypem, final String certpem) throws NoSuchAlgorithmException,
+            InvalidKeySpecException, IOException, CertificateException, KeyStoreException {
+        PrivateKey privateKey = loadPrivateKey(keypem);
+        requireNonNull(privateKey);
+        List<Certificate> privateCertificates = loadCertificates(certpem);
 
         KeyStore keyStore = KeyStore.getInstance("JKS");
         keyStore.load(null);
 
-        keyStore.setKeyEntry("docker", keyPair.getPrivate(), "docker".toCharArray(),
-                privateCertificates.toArray(new Certificate[privateCertificates.size()]));
+        keyStore.setKeyEntry("docker",
+                privateKey,
+                "docker".toCharArray(),
+                privateCertificates.toArray(new Certificate[privateCertificates.size()])
+        );
+
         return keyStore;
     }
 
-    public static KeyStore createTrustStore(final String dockerCertPath) throws IOException, CertificateException,
-            KeyStoreException, NoSuchAlgorithmException {
-        File caPath = new File(dockerCertPath, "ca.pem");
-        BufferedReader reader = new BufferedReader(new FileReader(caPath));
-        PEMParser pemParser = null;
-
-        try {
-            pemParser = new PEMParser(reader);
-            X509CertificateHolder certificateHolder = (X509CertificateHolder) pemParser.readObject();
-            Certificate caCertificate = new JcaX509CertificateConverter().setProvider("BC").getCertificate(
-                    certificateHolder);
-
-            KeyStore trustStore = KeyStore.getInstance("JKS");
-            trustStore.load(null);
-            trustStore.setCertificateEntry("ca", caCertificate);
-            return trustStore;
-
-        } finally {
-            if (pemParser != null) {
-                IOUtils.closeQuietly(pemParser);
-            }
-
-            if (reader != null) {
-                IOUtils.closeQuietly(reader);
-            }
+    /**
+     * from "cert.pem" String
+     */
+    private static List<Certificate> loadCertificates(final String certpem) throws IOException,
+            CertificateException {
+        final StringReader certReader = new StringReader(certpem);
+        try (BufferedReader reader = new BufferedReader(certReader)) {
+            return loadCertificates(reader);
         }
-
     }
 
-    private static List<Certificate> loadCertificates(final String dockerCertPath) throws IOException,
+    /**
+     * "cert.pem" from reader
+     */
+    private static List<Certificate> loadCertificates(final Reader reader) throws IOException,
             CertificateException {
-        File certificate = new File(dockerCertPath, "cert.pem");
-        BufferedReader reader = new BufferedReader(new FileReader(certificate));
-        PEMParser pemParser = null;
-
-        try {
+        try (PEMParser pemParser = new PEMParser(reader)) {
             List<Certificate> certificates = new ArrayList<>();
-            pemParser = new PEMParser(reader);
+
             JcaX509CertificateConverter certificateConverter = new JcaX509CertificateConverter().setProvider("BC");
             Object certObj = pemParser.readObject();
 
-            while (certObj != null) {
+            if (certObj instanceof X509CertificateHolder) {
                 X509CertificateHolder certificateHolder = (X509CertificateHolder) certObj;
                 certificates.add(certificateConverter.getCertificate(certificateHolder));
-
-                certObj = pemParser.readObject();
             }
 
             return certificates;
-        } finally {
-            if (pemParser != null) {
-                IOUtils.closeQuietly(pemParser);
-            }
-
-            if (reader != null) {
-                IOUtils.closeQuietly(reader);
-            }
         }
-
     }
 
-    private static KeyPair loadPrivateKey(final String dockerCertPath) throws IOException, NoSuchAlgorithmException,
-            InvalidKeySpecException {
-        File certificate = new File(dockerCertPath, "key.pem");
-        BufferedReader reader = new BufferedReader(new FileReader(certificate));
 
-        PEMParser pemParser = null;
+    /**
+     * Return private key ("key.pem") from Reader
+     */
+    @CheckForNull
+    private static PrivateKey loadPrivateKey(final Reader reader) throws IOException, NoSuchAlgorithmException,
+            InvalidKeySpecException {
+        try (PEMParser pemParser = new PEMParser(reader)) {
+            Object readObject = pemParser.readObject();
+            while (readObject != null) {
+                if (readObject instanceof PEMKeyPair) {
+                    PEMKeyPair pemKeyPair = (PEMKeyPair) readObject;
+                    PrivateKey privateKey = guessKey(pemKeyPair.getPrivateKeyInfo().getEncoded());
+                    if (privateKey != null) {
+                        return privateKey;
+                    }
+                } else if (readObject instanceof PrivateKeyInfo) {
+                    PrivateKeyInfo privateKeyInfo = (PrivateKeyInfo) readObject;
+                    PrivateKey privateKey = guessKey(privateKeyInfo.getEncoded());
+                    if (privateKey != null) {
+                        return privateKey;
+                    }
+                } else if (readObject instanceof ASN1ObjectIdentifier) {
+                    // no idea how it can be used
+                    final ASN1ObjectIdentifier asn1ObjectIdentifier = (ASN1ObjectIdentifier) readObject;
+                    LOG.trace("Ignoring asn1ObjectIdentifier {}", asn1ObjectIdentifier);
+                } else {
+                    LOG.warn("Unknown object '{}' from PEMParser", readObject);
+                }
+
+                readObject = pemParser.readObject();
+            }
+        }
 
-        try {
-            pemParser = new PEMParser(reader);
+        return null;
+    }
 
-            PEMKeyPair pemKeyPair = (PEMKeyPair) pemParser.readObject();
+    @CheckForNull
+    private static PrivateKey guessKey(byte[] encodedKey) throws NoSuchAlgorithmException {
+        //no way to know, so iterate
+        for (String guessFactory : new String[]{"RSA", "ECDSA"}) {
+            try {
+                KeyFactory factory = KeyFactory.getInstance(guessFactory);
 
-            byte[] pemPrivateKeyEncoded = pemKeyPair.getPrivateKeyInfo().getEncoded();
-            byte[] pemPublicKeyEncoded = pemKeyPair.getPublicKeyInfo().getEncoded();
+                PKCS8EncodedKeySpec privateKeySpec = new PKCS8EncodedKeySpec(encodedKey);
+                return factory.generatePrivate(privateKeySpec);
+            } catch (InvalidKeySpecException ignore) {
+            }
+        }
 
-            KeyFactory factory = KeyFactory.getInstance("RSA");
+        return null;
+    }
 
-            X509EncodedKeySpec publicKeySpec = new X509EncodedKeySpec(pemPublicKeyEncoded);
-            PublicKey publicKey = factory.generatePublic(publicKeySpec);
+    /**
+     * Return KeyPair from "key.pem"
+     */
+    @CheckForNull
+    private static PrivateKey loadPrivateKey(final String keypem) throws IOException, NoSuchAlgorithmException,
+            InvalidKeySpecException {
+        try (StringReader certReader = new StringReader(keypem);
+             BufferedReader reader = new BufferedReader(certReader)) {
+            return loadPrivateKey(reader);
+        }
+    }
 
-            PKCS8EncodedKeySpec privateKeySpec = new PKCS8EncodedKeySpec(pemPrivateKeyEncoded);
-            PrivateKey privateKey = factory.generatePrivate(privateKeySpec);
+    /**
+     * "ca.pem" from String
+     */
+    public static KeyStore createTrustStore(String capem) throws IOException, CertificateException,
+            KeyStoreException, NoSuchAlgorithmException {
+        try (Reader certReader = new StringReader(capem)) {
+            return createTrustStore(certReader);
+        }
+    }
 
-            return new KeyPair(publicKey, privateKey);
+    /**
+     * "ca.pem" from Reader
+     */
+    public static KeyStore createTrustStore(final Reader certReader) throws IOException, CertificateException,
+            KeyStoreException, NoSuchAlgorithmException {
+        try (PEMParser pemParser = new PEMParser(certReader)) {
+            X509CertificateHolder certificateHolder = (X509CertificateHolder) pemParser.readObject();
+            Certificate caCertificate = new JcaX509CertificateConverter()
+                    .setProvider("BC")
+                    .getCertificate(certificateHolder);
 
-        } finally {
-            if (pemParser != null) {
-                IOUtils.closeQuietly(pemParser);
-            }
+            KeyStore trustStore = KeyStore.getInstance("JKS");
+            trustStore.load(null);
+            trustStore.setCertificateEntry("ca", caCertificate);
 
-            if (reader != null) {
-                IOUtils.closeQuietly(reader);
-            }
+            return trustStore;
         }
-
     }
 
 }

From 3bde2a93e9a47d06485db7133c7dd8b4059b0aab Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 29 Mar 2016 20:27:49 +0200
Subject: [PATCH 0476/1272] Add test originated from netty impl

---
 .../CopyArchiveFromContainerCmdImplTest.java  | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/src/test/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImplTest.java
index 0f9da6058..9b30dd891 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImplTest.java
@@ -6,7 +6,14 @@
 
 import java.io.InputStream;
 import java.lang.reflect.Method;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
 
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.apache.commons.io.IOUtils;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -17,6 +24,7 @@
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
+import com.github.dockerjava.core.util.CompressArchiveUtil;
 
 @Test(groups = "integration")
 public class CopyArchiveFromContainerCmdImplTest extends AbstractDockerClientTest {
@@ -70,4 +78,36 @@ public void copyFromNonExistingContainer() throws Exception {
         } catch (NotFoundException ignored) {
         }
     }
+
+    @Test
+    public void copyFromContainerBinaryFile() throws Exception {
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withName("docker-java-itest-copyFromContainerBinaryFile").exec();
+
+        LOG.info("Created container: {}", container);
+        assertThat(container.getId(), not(isEmptyOrNullString()));
+
+        Path temp = Files.createTempFile("", ".tar.gz");
+        Path binaryFile = Paths.get("src/test/resources/testCopyFromArchive/binary.dat");
+        CompressArchiveUtil.tar(binaryFile, temp, true, false);
+
+        try (InputStream uploadStream = Files.newInputStream(temp)) {
+            dockerClient.copyArchiveToContainerCmd(container.getId()).withTarInputStream(uploadStream).exec();
+        }
+
+        InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/binary.dat").exec();
+        Boolean bytesAvailable = response.available() > 0;
+        assertTrue(bytesAvailable, "The file was not copied from the container.");
+
+        try (TarArchiveInputStream tarInputStream = new TarArchiveInputStream(response)) {
+            TarArchiveEntry nextTarEntry = tarInputStream.getNextTarEntry();
+
+            assertEquals(nextTarEntry.getName(), "binary.dat");
+            try (InputStream binaryFileInputStream = Files.newInputStream(binaryFile, StandardOpenOption.READ)) {
+                assertTrue(IOUtils.contentEquals(binaryFileInputStream, tarInputStream));
+            }
+
+            assertNull(tarInputStream.getNextTarEntry(), "Nothing except binary.dat is expected to be copied.");
+        }
+    }
 }

From ac89c92e9e2108467b60ac24d4d882cb122bce27 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 29 Mar 2016 20:48:19 +0200
Subject: [PATCH 0477/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f34102285..73d2220cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,10 +11,11 @@ Notes
 All changes
 
 Included in 3.0.0-RC4
-* [#495] (https://github.com/docker-java/docker-java/pull/495) Add CgroupParent option for create cmd
-* [#504] (https://github.com/docker-java/docker-java/pull/504) Rename container cmd
+* [#510] (https://github.com/docker-java/docker-java/pull/510) Add CgroupParent option for create cmd
+* [#509] (https://github.com/docker-java/docker-java/pull/509) Implement container rename api 
 * [#500] (https://github.com/docker-java/docker-java/pull/500) Add aux to ResponseItem
-* [#498] (https://github.com/docker-java/docker-java/issues/493) Expose RepoTags from inspect image command
+* [#498] (https://github.com/docker-java/docker-java/issues/498) Update image inspect response
+
 
 Included in 3.0.0-RC3
 * [#488] (https://github.com/docker-java/docker-java/pull/488) Support remote API 1.22 subset

From 70489a23853e6b16eebc4782490ac32d0c4ead49 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 29 Mar 2016 20:52:05 +0200
Subject: [PATCH 0478/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73d2220cf..8c5706377 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ All changes
 Included in 3.0.0-RC4
 * [#510] (https://github.com/docker-java/docker-java/pull/510) Add CgroupParent option for create cmd
 * [#509] (https://github.com/docker-java/docker-java/pull/509) Implement container rename api 
+* [#501] (https://github.com/docker-java/docker-java/pull/501) Fix execution of copy file/archive command skips 0xFF bytes 
 * [#500] (https://github.com/docker-java/docker-java/pull/500) Add aux to ResponseItem
 * [#498] (https://github.com/docker-java/docker-java/issues/498) Update image inspect response
 

From 6870c6ab484d51c5f3a484317a37a99e871e570a Mon Sep 17 00:00:00 2001
From: Alejandro Mousist <alejandro.mousist@intraway.com>
Date: Wed, 30 Mar 2016 17:15:13 -0300
Subject: [PATCH 0479/1272] Added shmsize build option

---
 .../dockerjava/api/command/BuildImageCmd.java      |  5 +++++
 .../dockerjava/core/command/BuildImageCmdImpl.java | 14 ++++++++++++++
 .../github/dockerjava/jaxrs/BuildImageCmdExec.java |  4 ++++
 .../dockerjava/netty/exec/BuildImageCmdExec.java   |  4 ++++
 4 files changed, 27 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index d11c86c7f..84f4e42c5 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -95,6 +95,9 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     @CheckForNull
     Map<String, String> getBuildArgs();
 
+    @CheckForNull
+    long getShmsize();
+
     // setters
 
     BuildImageCmd withTag(String tag);
@@ -134,6 +137,8 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     BuildImageCmd withTarInputStream(@Nonnull InputStream tarInputStream);
 
+    BuildImageCmd withShmsize(long shmsize);
+
     interface Exec extends DockerCmdAsyncExec<BuildImageCmd, BuildResponseItem> {
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index ef57e84a4..d5a42f7a3 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -50,6 +50,8 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR
 
     private Long memswap;
 
+    private long shmsize;
+
     private URI remote;
 
     private Map<String, String> buildArgs;
@@ -159,6 +161,11 @@ public InputStream getTarInputStream() {
         return tarInputStream;
     }
 
+    @Override
+    public long getShmsize() {
+        return shmsize;
+    }
+
     // setters
 
     @Override
@@ -284,6 +291,12 @@ public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfigs) {
         return this;
     }
 
+    @Override
+    public BuildImageCmd withShmsize(long shmsize) {
+        this.shmsize = shmsize;
+        return this;
+    }
+
     @Override
     public void close() {
         super.close();
@@ -294,4 +307,5 @@ public void close() {
             throw new RuntimeException(e);
         }
     }
+
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index dc642f1a6..c94946e7e 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -108,6 +108,10 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
             }
         }
 
+        if (command.getShmsize() != 0) {
+            webTarget = webTarget.queryParam("shmsize", command.getShmsize());
+        }
+
         webTarget.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED);
         webTarget.property(ClientProperties.CHUNKED_ENCODING_SIZE, 1024 * 1024);
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
index 155ceef6a..bf1be4713 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
@@ -93,6 +93,10 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
             }
         }
 
+        if (command.getShmsize() != 0) {
+            webTarget = webTarget.queryParam("shmsize", command.getShmsize());
+        }
+
         LOGGER.trace("POST: {}", webTarget);
 
         InvocationBuilder builder = resourceWithOptionalAuthConfig(command, webTarget.request())

From 8c7e12caf1d29c821d51dec29c7305afe9984fa2 Mon Sep 17 00:00:00 2001
From: Alejandro Mousist <alejandro.mousist@intraway.com>
Date: Wed, 30 Mar 2016 23:10:04 -0300
Subject: [PATCH 0480/1272] Code style/design for shmsize build option (API
 v1_22)

---
 .../github/dockerjava/api/command/BuildImageCmd.java | 10 ++++++++--
 .../dockerjava/core/command/BuildImageCmdImpl.java   | 12 +++++++++---
 .../github/dockerjava/jaxrs/BuildImageCmdExec.java   |  2 +-
 .../dockerjava/netty/exec/BuildImageCmdExec.java     |  2 +-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 84f4e42c5..20b23e903 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -95,8 +95,11 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     @CheckForNull
     Map<String, String> getBuildArgs();
 
+    /**
+     *@since {@link RemoteApiVersion#VERSION_1_22}
+     */
     @CheckForNull
-    long getShmsize();
+    Long getShmsize();
 
     // setters
 
@@ -137,7 +140,10 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     BuildImageCmd withTarInputStream(@Nonnull InputStream tarInputStream);
 
-    BuildImageCmd withShmsize(long shmsize);
+    /**
+    *@since {@link RemoteApiVersion#VERSION_1_22}
+    */
+    BuildImageCmd withShmsize(Long shmsize);
 
     interface Exec extends DockerCmdAsyncExec<BuildImageCmd, BuildResponseItem> {
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index d5a42f7a3..58f148cb6 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -50,7 +50,7 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR
 
     private Long memswap;
 
-    private long shmsize;
+    private Long shmsize;
 
     private URI remote;
 
@@ -161,8 +161,11 @@ public InputStream getTarInputStream() {
         return tarInputStream;
     }
 
+    /**
+     * @see #shmsize
+     */
     @Override
-    public long getShmsize() {
+    public Long getShmsize() {
         return shmsize;
     }
 
@@ -291,8 +294,11 @@ public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfigs) {
         return this;
     }
 
+    /**
+     * @see #shmsize
+     */
     @Override
-    public BuildImageCmd withShmsize(long shmsize) {
+    public BuildImageCmd withShmsize(Long shmsize) {
         this.shmsize = shmsize;
         return this;
     }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index c94946e7e..43e7687eb 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -108,7 +108,7 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
             }
         }
 
-        if (command.getShmsize() != 0) {
+        if (command.getShmsize() != null) {
             webTarget = webTarget.queryParam("shmsize", command.getShmsize());
         }
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
index bf1be4713..f4ff04576 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
@@ -93,7 +93,7 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
             }
         }
 
-        if (command.getShmsize() != 0) {
+        if (command.getShmsize() != null) {
             webTarget = webTarget.queryParam("shmsize", command.getShmsize());
         }
 

From cb89d2b43a35e149a90fba5597e444525664125d Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 31 Mar 2016 20:37:39 +0200
Subject: [PATCH 0481/1272] Fix issue #531

---
 .../dockerjava/netty/handler/FramedResponseStreamHandler.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
index 0567050d2..f360ca756 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
@@ -62,6 +62,7 @@ protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Excep
     private int read(byte[] buf, int offset, int length) {
         length = Math.min(rawBuffer.readableBytes(), length);
         rawBuffer.readBytes(buf, offset, length);
+        rawBuffer.discardReadBytes();
         return length;
     }
 

From 866a3a0804b469abe267896052f63e463c82ddea Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 31 Mar 2016 20:54:35 +0200
Subject: [PATCH 0482/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c5706377..6d7303448 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ Notes
 All changes
 
 Included in 3.0.0-RC4
+* [#528] (https://github.com/docker-java/docker-java/pull/528) Fix DOCKER_TLS_VERIFY cannot be 'false' or empty
+* [#527] (https://github.com/docker-java/docker-java/pull/527) Fix `mirrors` field is list and not a single string #527 
 * [#510] (https://github.com/docker-java/docker-java/pull/510) Add CgroupParent option for create cmd
 * [#509] (https://github.com/docker-java/docker-java/pull/509) Implement container rename api 
 * [#501] (https://github.com/docker-java/docker-java/pull/501) Fix execution of copy file/archive command skips 0xFF bytes 

From 6c0ad12668a7402d34f8fa7e86512ae04c58324a Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 31 Mar 2016 20:57:07 +0200
Subject: [PATCH 0483/1272] [maven-release-plugin] prepare release
 docker-java-3.0.0-RC4

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9ee5cad51..fcaa92a1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>3.0.0-RC4</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>docker-java-3.0.0-RC4</tag>
 	</scm>
 
 	<developers>

From 90f719c65112dfb49ce2be3496aacbf05d35a58a Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 31 Mar 2016 20:57:12 +0200
Subject: [PATCH 0484/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index fcaa92a1c..9ee5cad51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.0-RC4</version>
+	<version>3.0.0-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>docker-java-3.0.0-RC4</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 24866d0735cae435336e717ff97d15aca8d21cae Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 31 Mar 2016 21:45:34 +0200
Subject: [PATCH 0485/1272] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3601be462..ae6d5d620 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ Supports a subset of the Docker Remote API [v1.22](https://github.com/docker/doc
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>3.0.0-RC3</version>
+          <version>3.0.0-RC4</version>
     </dependency>
     
 ### Latest development version

From 7ea7514627968ffb5361a59af1956c57f6f08210 Mon Sep 17 00:00:00 2001
From: Surya Gaddipati <surya.gaddipati@gmail.com>
Date: Fri, 1 Apr 2016 11:14:00 -0500
Subject: [PATCH 0486/1272] Assign passed in volume opts to field

---
 .../com/github/dockerjava/core/command/CreateVolumeCmdImpl.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java
index 13cb0ac83..46b12ebea 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java
@@ -61,6 +61,7 @@ public CreateVolumeCmdImpl withDriver(String driver) {
     @Override
     public CreateVolumeCmd withDriverOpts(Map<String, String> driverOpts) {
         checkNotNull(driverOpts, "driverOpts was not specified");
+        this.driverOpts = driverOpts;
         return this;
     }
 }

From 284b26b58649ae9b00c36cb9ac383b46d7d1a5bd Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 7 Apr 2016 13:04:55 +0200
Subject: [PATCH 0487/1272] Clarify configuration for unix sockets

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ae6d5d620..9a155d0c4 100644
--- a/README.md
+++ b/README.md
@@ -33,9 +33,10 @@ listening on TCP port. To allow Docker server to use TCP add the following line
 
     DOCKER_OPTS="-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock"
 
-However you can force docker-java to use UNIX socket communication by configuring the following url:
+However you can force docker-java to use UNIX socket communication by configure the following (see [Configuration](.#Configuration) for details):
 
-    unix:///var/run/docker.sock
+    DOCKER_HOST=unix:///var/run/docker.sock
+    DOCKER_TLS_VERIFY=0
 
 More details about setting up Docker server can be found in official documentation: http://docs.docker.io/en/latest/use/basics/
 

From 042bf59db43f70eb9089d5f793dfcf62afb8aa47 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 8 Apr 2016 20:55:50 +0300
Subject: [PATCH 0488/1272] Use getters for objects

---
 .../api/command/CreateContainerCmd.java       |  8 ++--
 .../dockerjava/api/model/HostConfig.java      | 40 +++++++++++--------
 .../core/command/CreateContainerCmdImpl.java  | 16 ++++----
 3 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 0181d86be..ffcb01c98 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -159,16 +159,16 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
      * @since 1.19
      */
     @CheckForNull
-    Boolean isOomKillDisable();
+    Boolean getOomKillDisable();
 
     @CheckForNull
-    Boolean isPrivileged();
+    Boolean getPrivileged();
 
     @CheckForNull
-    Boolean isPublishAllPorts();
+    Boolean getPublishAllPorts();
 
     @CheckForNull
-    Boolean isReadonlyRootfs();
+    Boolean getReadonlyRootfs();
 
     @CheckForNull
     Boolean isStdInOnce();
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 912439357..400ae29dd 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -285,22 +285,6 @@ public VolumesFrom[] getVolumesFrom() {
         return volumesFrom;
     }
 
-    public Boolean isOomKillDisable() {
-        return oomKillDisable;
-    }
-
-    public Boolean isPrivileged() {
-        return privileged;
-    }
-
-    public Boolean isPublishAllPorts() {
-        return publishAllPorts;
-    }
-
-    public Boolean isReadonlyRootfs() {
-        return readonlyRootfs;
-    }
-
     @CheckForNull
     public String getPidMode() {
         return pidMode;
@@ -701,6 +685,14 @@ public HostConfig withPortBindings(Ports portBindings) {
         return this;
     }
 
+    /**
+     * @see #privileged
+     */
+    @CheckForNull
+    public Boolean getPrivileged() {
+        return privileged;
+    }
+
     /**
      * @see #privileged
      */
@@ -709,6 +701,14 @@ public HostConfig withPrivileged(Boolean privileged) {
         return this;
     }
 
+    /**
+     * @see #publishAllPorts
+     */
+    @CheckForNull
+    public Boolean getPublishAllPorts() {
+        return publishAllPorts;
+    }
+
     /**
      * @see #publishAllPorts
      */
@@ -717,6 +717,14 @@ public HostConfig withPublishAllPorts(Boolean publishAllPorts) {
         return this;
     }
 
+    /**
+     * @see #readonlyRootfs
+     */
+    @CheckForNull
+    public Boolean getReadonlyRootfs() {
+        return readonlyRootfs;
+    }
+
     /**
      * @see #readonlyRootfs
      */
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index bb9fcc318..48b93a004 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -366,26 +366,26 @@ public Boolean isNetworkDisabled() {
 
     @Override
     @JsonIgnore
-    public Boolean isOomKillDisable() {
-        return hostConfig.isOomKillDisable();
+    public Boolean getOomKillDisable() {
+        return hostConfig.getOomKillDisable();
     }
 
     @Override
     @JsonIgnore
-    public Boolean isPrivileged() {
-        return hostConfig.isPrivileged();
+    public Boolean getPrivileged() {
+        return hostConfig.getPrivileged();
     }
 
     @Override
     @JsonIgnore
-    public Boolean isPublishAllPorts() {
-        return hostConfig.isPublishAllPorts();
+    public Boolean getPublishAllPorts() {
+        return hostConfig.getPublishAllPorts();
     }
 
     @Override
     @JsonIgnore
-    public Boolean isReadonlyRootfs() {
-        return hostConfig.isReadonlyRootfs();
+    public Boolean getReadonlyRootfs() {
+        return hostConfig.getReadonlyRootfs();
     }
 
     @Override

From 13ef31e3fc432b416366d14e05442a0c3572ffda Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 8 Apr 2016 21:26:16 +0300
Subject: [PATCH 0489/1272] GraphData is more complex structure.

Fixes #538
---
 .../dockerjava/api/command/GraphData.java     |  86 ++++++++++
 .../dockerjava/api/command/GraphDriver.java   |   6 +-
 .../api/command/InspectImageResponseTest.java |  29 ++++
 .../1.22/images/docImage/inspect_doc.json     | 150 ++++++++++++++++++
 4 files changed, 268 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/command/GraphData.java
 create mode 100644 src/test/resources/samples/1.22/images/docImage/inspect_doc.json

diff --git a/src/main/java/com/github/dockerjava/api/command/GraphData.java b/src/main/java/com/github/dockerjava/api/command/GraphData.java
new file mode 100644
index 000000000..dc55810ba
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/GraphData.java
@@ -0,0 +1,86 @@
+package com.github.dockerjava.api.command;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import javax.annotation.CheckForNull;
+
+/**
+ * part of {@link GraphDriver}
+ * @author Kanstantsin Shautsou
+ */
+public class GraphData {
+    @JsonProperty("DeviceId")
+    private String deviceId;
+
+    @JsonProperty("DeviceName")
+    private String deviceName;
+
+    @JsonProperty("DeviceSize")
+    private String deviceSize;
+
+    /**
+     * @see #deviceId
+     */
+    @CheckForNull
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    /**
+     * @see #deviceId
+     */
+    public GraphData withDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+        return this;
+    }
+
+    /**
+     * @see #deviceName
+     */
+    @CheckForNull
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    /**
+     * @see #deviceName
+     */
+    public GraphData withDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+        return this;
+    }
+
+    /**
+     * @see #deviceSize
+     */
+    @CheckForNull
+    public String getDeviceSize() {
+        return deviceSize;
+    }
+
+    /**
+     * @see #deviceSize
+     */
+    public GraphData withDeviceSize(String deviceSize) {
+        this.deviceSize = deviceSize;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/GraphDriver.java b/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
index 6285195c4..0d41364aa 100644
--- a/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
+++ b/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
@@ -24,21 +24,21 @@ public class GraphDriver {
      * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21}
      */
     @JsonProperty("Data")
-    private String data;
+    private GraphData data;
 
 
     /**
      * @see #data
      */
     @CheckForNull
-    public String getData() {
+    public GraphData getData() {
         return data;
     }
 
     /**
      * @see #data
      */
-    public GraphDriver withData(String data) {
+    public GraphDriver withData(GraphData data) {
         this.data = data;
         return this;
     }
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
index 0df990d00..410d5b32a 100644
--- a/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
+++ b/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
@@ -160,4 +160,33 @@ public void serder1_22_doc() throws IOException {
                 "example:stable"
         ));
     }
+
+    @Test
+    public void serder1_22_inspect_doc() throws IOException {
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class);
+
+        final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22,
+                "images/docImage/inspect_doc.json",
+                type
+        );
+
+        GraphData newGraphData = new GraphData()
+                .withDeviceId("5")
+                .withDeviceName("docker-253:1-2763198-d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47")
+                .withDeviceSize("171798691840");
+
+        assertThat(inspectImage, notNullValue());
+        GraphDriver graphDriver = inspectImage.getGraphDriver();
+        assertThat(graphDriver, notNullValue());
+        GraphData data = graphDriver.getData();
+
+        assertThat(data, is(newGraphData));
+
+        assertThat(data.getDeviceId(), is("5"));
+        assertThat(data.getDeviceName(),
+                is("docker-253:1-2763198-d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47"));
+        assertThat(data.getDeviceSize(),
+                is("171798691840"));
+    }
 }
\ No newline at end of file
diff --git a/src/test/resources/samples/1.22/images/docImage/inspect_doc.json b/src/test/resources/samples/1.22/images/docImage/inspect_doc.json
new file mode 100644
index 000000000..5ffc187cb
--- /dev/null
+++ b/src/test/resources/samples/1.22/images/docImage/inspect_doc.json
@@ -0,0 +1,150 @@
+{
+  "Id": "d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47",
+  "Created": "2015-06-08T16:18:02.505155285Z",
+  "Path": "bash",
+  "Args": [],
+  "State": {
+    "Running": false,
+    "Paused": false,
+    "Restarting": false,
+    "OOMKilled": false,
+    "Dead": false,
+    "Pid": 0,
+    "ExitCode": 0,
+    "Error": "",
+    "StartedAt": "2015-06-08T16:18:03.643865954Z",
+    "FinishedAt": "2015-06-08T16:57:06.448552862Z"
+  },
+  "Image": "ded7cd95e059788f2586a51c275a4f151653779d6a7f4dad77c2bd34601d94e4",
+  "NetworkSettings": {
+    "Bridge": "",
+    "SandboxID": "6b4851d1903e16dd6a567bd526553a86664361f31036eaaa2f8454d6f4611f6f",
+    "HairpinMode": false,
+    "LinkLocalIPv6Address": "",
+    "LinkLocalIPv6PrefixLen": 0,
+    "Ports": {},
+    "SandboxKey": "/var/run/docker/netns/6b4851d1903e",
+    "SecondaryIPAddresses": null,
+    "SecondaryIPv6Addresses": null,
+    "EndpointID": "7587b82f0dada3656fda26588aee72630c6fab1536d36e394b2bfbcf898c971d",
+    "Gateway": "172.17.0.1",
+    "GlobalIPv6Address": "",
+    "GlobalIPv6PrefixLen": 0,
+    "IPAddress": "172.17.0.2",
+    "IPPrefixLen": 16,
+    "IPv6Gateway": "",
+    "MacAddress": "02:42:ac:12:00:02",
+    "Networks": {
+      "bridge": {
+        "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
+        "EndpointID": "7587b82f0dada3656fda26588aee72630c6fab1536d36e394b2bfbcf898c971d",
+        "Gateway": "172.17.0.1",
+        "IPAddress": "172.17.0.2",
+        "IPPrefixLen": 16,
+        "IPv6Gateway": "",
+        "GlobalIPv6Address": "",
+        "GlobalIPv6PrefixLen": 0,
+        "MacAddress": "02:42:ac:12:00:02"
+      }
+    }
+  },
+  "ResolvConfPath": "/var/lib/docker/containers/d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47/resolv.conf",
+  "HostnamePath": "/var/lib/docker/containers/d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47/hostname",
+  "HostsPath": "/var/lib/docker/containers/d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47/hosts",
+  "LogPath": "/var/lib/docker/containers/d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47/d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47-json.log",
+  "Name": "/adoring_wozniak",
+  "RestartCount": 0,
+  "Driver": "devicemapper",
+  "MountLabel": "",
+  "ProcessLabel": "",
+  "Mounts": [
+    {
+      "Source": "/data",
+      "Destination": "/data",
+      "Mode": "ro,Z",
+      "RW": false,
+      "Propagation": ""
+    }
+  ],
+  "AppArmorProfile": "",
+  "ExecIDs": null,
+  "HostConfig": {
+    "Binds": null,
+    "ContainerIDFile": "",
+    "Memory": 0,
+    "MemorySwap": 0,
+    "CpuShares": 0,
+    "CpuPeriod": 0,
+    "CpusetCpus": "",
+    "CpusetMems": "",
+    "CpuQuota": 0,
+    "BlkioWeight": 0,
+    "OomKillDisable": false,
+    "Privileged": false,
+    "PortBindings": {},
+    "Links": null,
+    "PublishAllPorts": false,
+    "Dns": null,
+    "DnsSearch": null,
+    "DnsOptions": null,
+    "ExtraHosts": null,
+    "VolumesFrom": null,
+    "Devices": [],
+    "NetworkMode": "bridge",
+    "IpcMode": "",
+    "PidMode": "",
+    "UTSMode": "",
+    "CapAdd": null,
+    "CapDrop": null,
+    "RestartPolicy": {
+      "Name": "no",
+      "MaximumRetryCount": 0
+    },
+    "SecurityOpt": null,
+    "ReadonlyRootfs": false,
+    "Ulimits": null,
+    "LogConfig": {
+      "Type": "json-file",
+      "Config": {}
+    },
+    "CgroupParent": ""
+  },
+  "GraphDriver": {
+    "Name": "devicemapper",
+    "Data": {
+      "DeviceId": "5",
+      "DeviceName": "docker-253:1-2763198-d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47",
+      "DeviceSize": "171798691840"
+    }
+  },
+  "Config": {
+    "Hostname": "d2cc496561d6",
+    "Domainname": "",
+    "User": "",
+    "AttachStdin": true,
+    "AttachStdout": true,
+    "AttachStderr": true,
+    "ExposedPorts": null,
+    "Tty": true,
+    "OpenStdin": true,
+    "StdinOnce": true,
+    "Env": null,
+    "Cmd": [
+      "bash"
+    ],
+    "Image": "fedora",
+    "Volumes": null,
+    "VolumeDriver": "",
+    "WorkingDir": "",
+    "Entrypoint": null,
+    "NetworkDisabled": false,
+    "MacAddress": "",
+    "OnBuild": null,
+    "Labels": {},
+    "Memory": 0,
+    "MemorySwap": 0,
+    "CpuShares": 0,
+    "Cpuset": "",
+    "StopSignal": "SIGTERM"
+  }
+}

From 1ca5d26b2ab8edcd57c64b59f9fd0a1fc335ab78 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 8 Apr 2016 21:00:08 +0200
Subject: [PATCH 0490/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d7303448..196408717 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,11 @@ Notes
 
 All changes
 
+* [#542] (https://github.com/docker-java/docker-java/pull/542) Fix large volumes of output from "docker exec" trigger out of memory error
+* [#541] (https://github.com/docker-java/docker-java/pull/541) ImageInspectResponse.GraphDriver.Data is more complex structure 
+* [#534] (https://github.com/docker-java/docker-java/pull/534) Fix create volume command doesn't assign passed in volume driverOpts to field
+* [#533] (https://github.com/docker-java/docker-java/pull/533) Added shmsize build option 
+
 Included in 3.0.0-RC4
 * [#528] (https://github.com/docker-java/docker-java/pull/528) Fix DOCKER_TLS_VERIFY cannot be 'false' or empty
 * [#527] (https://github.com/docker-java/docker-java/pull/527) Fix `mirrors` field is list and not a single string #527 

From 741492cd1181443e81af3b3475d97c5ff93141fa Mon Sep 17 00:00:00 2001
From: Mikhail Stepura <mikhail.stepura@outlook.com>
Date: Thu, 14 Apr 2016 13:57:39 -0700
Subject: [PATCH 0491/1272] Use named daemon threads for callback processing

---
 .../dockerjava/jaxrs/async/AbstractCallbackNotifier.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java b/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
index aac5a94d6..86f528af6 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
@@ -10,6 +10,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.concurrent.ThreadFactory;
 
 import javax.ws.rs.ProcessingException;
 import javax.ws.rs.client.Invocation.Builder;
@@ -18,6 +19,7 @@
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.core.async.ResponseStreamProcessor;
 import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 public abstract class AbstractCallbackNotifier<T> implements Callable<Void> {
 
@@ -25,6 +27,9 @@ public abstract class AbstractCallbackNotifier<T> implements Callable<Void> {
 
     private final ResultCallback<T> resultCallback;
 
+    private static final ThreadFactory FACTORY =
+            new ThreadFactoryBuilder().setDaemon(true).setNameFormat("dockerjava-jaxrs-async-%d").build();
+
     protected final Builder requestBuilder;
 
     protected AbstractCallbackNotifier(ResponseStreamProcessor<T> responseStreamProcessor,
@@ -76,7 +81,7 @@ public Void call() throws Exception {
 
     public static <T> Future<Void> startAsyncProcessing(AbstractCallbackNotifier<T> callbackNotifier) {
 
-        ExecutorService executorService = Executors.newSingleThreadExecutor();
+        ExecutorService executorService = Executors.newSingleThreadExecutor(FACTORY);
         Future<Void> response = executorService.submit(callbackNotifier);
         executorService.shutdown();
         return response;

From 2f88b39a4954a2ebc88a4ebdfe74a245c6183685 Mon Sep 17 00:00:00 2001
From: VU Minh Khang <minh.khang.vu.mkv@gmail.com>
Date: Mon, 18 Apr 2016 00:20:48 +0200
Subject: [PATCH 0492/1272] Add setters in order to be able to construct
 network creation request

---
 .../com/github/dockerjava/api/model/Network.java     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/Network.java b/src/main/java/com/github/dockerjava/api/model/Network.java
index 546904254..583441049 100644
--- a/src/main/java/com/github/dockerjava/api/model/Network.java
+++ b/src/main/java/com/github/dockerjava/api/model/Network.java
@@ -149,6 +149,18 @@ public String getIpRange() {
             public String getGateway() {
                 return gateway;
             }
+
+            public void setSubnet(String subnet) {
+                this.subnet = subnet;
+            }
+
+            public void setIpRange(String ipRange) {
+                this.ipRange = ipRange;
+            }
+
+            public void setGateway(String gateway) {
+                this.gateway = gateway;
+            }
         }
     }
 }

From 14f64794c722522da59ec8b83d6dd17f95f8a54d Mon Sep 17 00:00:00 2001
From: VU Minh Khang <minh.khang.vu.mkv@gmail.com>
Date: Mon, 18 Apr 2016 00:41:55 +0200
Subject: [PATCH 0493/1272] Fix NPE for withIpamConfig

---
 .../github/dockerjava/core/command/CreateNetworkCmdImpl.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
index c7d3b0abb..b07076dc5 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
@@ -58,6 +58,9 @@ public CreateNetworkCmd withDriver(String driver) {
 
     @Override
     public CreateNetworkCmd withIpamConfig(Ipam.Config config) {
+        if (this.ipam == null) {
+            this.ipam = new Ipam();
+        }
         this.ipam.getConfig().add(config);
         return this;
     }

From 3ed7e7cf32943fbcf604eba3511faeb9c85f17e9 Mon Sep 17 00:00:00 2001
From: VU Minh Khang <minh.khang.vu.mkv@gmail.com>
Date: Mon, 18 Apr 2016 00:54:25 +0200
Subject: [PATCH 0494/1272] Add test for network creation with ipam config

---
 .../dockerjava/core/command/CreateNetworkCmdImplTest.java    | 5 +++--
 .../dockerjava/netty/exec/CreateNetworkCmdExecTest.java      | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
index eefeb535f..25225160b 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
@@ -40,8 +40,9 @@ public void afterMethod(ITestResult result) {
     public void createNetwork() throws DockerException {
 
         String networkName = "testNetwork";
-
-        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).exec();
+        Network.Ipam.Config config = new Network.Ipam.Config();
+        config.setSubnet("10.67.79.0/24");
+        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).withIpamConfig(config).exec();
 
         assertNotNull(createNetworkResponse.getId());
 
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
index fa9962826..cd5b788ed 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
@@ -40,8 +40,9 @@ public void afterMethod(ITestResult result) {
     public void createNetwork() throws DockerException {
 
         String networkName = "testNetwork";
-
-        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).exec();
+        Network.Ipam.Config config = new Network.Ipam.Config();
+        config.setSubnet("10.67.79.0/24");
+        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).withIpamConfig(config).exec();
 
         assertNotNull(createNetworkResponse.getId());
 

From 41355559bbbfd0b8ea258f81951a23bb03417d11 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 22 Apr 2016 20:25:37 +0200
Subject: [PATCH 0495/1272] rename netty worker threads

---
 .../github/dockerjava/netty/DockerCmdExecFactoryImpl.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
index 08a0179a1..8f704c7af 100644
--- a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
@@ -119,6 +119,7 @@
 import io.netty.handler.codec.http.HttpClientCodec;
 import io.netty.handler.logging.LoggingHandler;
 import io.netty.handler.ssl.SslHandler;
+import io.netty.util.concurrent.DefaultThreadFactory;
 
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
@@ -148,6 +149,8 @@
  */
 public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
 
+    private static String threadPrefix = "dockerjava-netty";
+
     /*
      * useful links:
      *
@@ -215,7 +218,7 @@ private interface NettyInitializer {
     private class UnixDomainSocketInitializer implements NettyInitializer {
         @Override
         public EventLoopGroup init(Bootstrap bootstrap, DockerClientConfig dockerClientConfig) {
-            EventLoopGroup epollEventLoopGroup = new EpollEventLoopGroup();
+            EventLoopGroup epollEventLoopGroup = new EpollEventLoopGroup(0, new DefaultThreadFactory(threadPrefix));
             bootstrap.group(epollEventLoopGroup).channel(EpollDomainSocketChannel.class)
                     .handler(new ChannelInitializer<UnixChannel>() {
                         @Override
@@ -235,7 +238,7 @@ public DuplexChannel connect(Bootstrap bootstrap) throws InterruptedException {
     private class InetSocketInitializer implements NettyInitializer {
         @Override
         public EventLoopGroup init(Bootstrap bootstrap, final DockerClientConfig dockerClientConfig) {
-            EventLoopGroup nioEventLoopGroup = new NioEventLoopGroup();
+            EventLoopGroup nioEventLoopGroup = new NioEventLoopGroup(0, new DefaultThreadFactory(threadPrefix));
 
             InetAddress addr = InetAddress.getLoopbackAddress();
 

From fa0a69a3dbee6a940a21e77e6868ac95f7fbd660 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 22 Apr 2016 20:40:48 +0200
Subject: [PATCH 0496/1272] [maven-release-plugin] prepare release
 docker-java-3.0.0-RC5

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9ee5cad51..17964e6b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>3.0.0-RC5</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>docker-java-3.0.0-RC5</tag>
 	</scm>
 
 	<developers>

From f384eb4b293d498c3d0ac6adc3a51383ad1aede8 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 22 Apr 2016 20:40:53 +0200
Subject: [PATCH 0497/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 17964e6b9..9ee5cad51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.0-RC5</version>
+	<version>3.0.0-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>docker-java-3.0.0-RC5</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 12e266bba47ad0a3e7f6b56a11a675b77a7b53b7 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 22 Apr 2016 20:48:10 +0200
Subject: [PATCH 0498/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 196408717..2154f36a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ Notes
 
 All changes
 
+Included in 3.0.0-RC5
+
 * [#542] (https://github.com/docker-java/docker-java/pull/542) Fix large volumes of output from "docker exec" trigger out of memory error
 * [#541] (https://github.com/docker-java/docker-java/pull/541) ImageInspectResponse.GraphDriver.Data is more complex structure 
 * [#534] (https://github.com/docker-java/docker-java/pull/534) Fix create volume command doesn't assign passed in volume driverOpts to field

From a760dd5954cc465b840c79640cc436608e64b49c Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 22 Apr 2016 20:48:40 +0200
Subject: [PATCH 0499/1272] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9a155d0c4..f2135f61b 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ Supports a subset of the Docker Remote API [v1.22](https://github.com/docker/doc
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>3.0.0-RC4</version>
+          <version>3.0.0-RC5</version>
     </dependency>
     
 ### Latest development version

From 89330387bf90fbe2bde1dcc3bea87b11be47fa06 Mon Sep 17 00:00:00 2001
From: VU Minh Khang <minh.khang.vu.mkv@gmail.com>
Date: Sat, 30 Apr 2016 14:24:44 +0200
Subject: [PATCH 0500/1272] Separate tests

---
 .../command/CreateNetworkCmdImplTest.java     | 21 ++++++++++++++-----
 .../netty/exec/CreateNetworkCmdExecTest.java  | 21 ++++++++++++++-----
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
index 25225160b..c278f191b 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
@@ -5,11 +5,7 @@
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
 
 import java.lang.reflect.Method;
 
@@ -39,6 +35,20 @@ public void afterMethod(ITestResult result) {
     @Test
     public void createNetwork() throws DockerException {
 
+        String networkName = "testNetwork";
+
+        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).exec();
+
+        assertNotNull(createNetworkResponse.getId());
+
+        Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
+        assertEquals(network.getName(), networkName);
+        assertEquals(network.getDriver(), "bridge");
+    }
+
+    @Test
+    public void createNetworkWithCustomConfig() throws DockerException {
+
         String networkName = "testNetwork";
         Network.Ipam.Config config = new Network.Ipam.Config();
         config.setSubnet("10.67.79.0/24");
@@ -49,5 +59,6 @@ public void createNetwork() throws DockerException {
         Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
         assertEquals(network.getName(), networkName);
         assertEquals(network.getDriver(), "bridge");
+        assertEquals("10.67.79.0/24", network.getIpam().getConfig().iterator().next().getSubnet());
     }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
index cd5b788ed..974d684b8 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
@@ -5,11 +5,7 @@
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
 
 import java.lang.reflect.Method;
 
@@ -39,6 +35,20 @@ public void afterMethod(ITestResult result) {
     @Test
     public void createNetwork() throws DockerException {
 
+        String networkName = "testNetwork";
+
+        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).exec();
+
+        assertNotNull(createNetworkResponse.getId());
+
+        Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
+        assertEquals(network.getName(), networkName);
+        assertEquals(network.getDriver(), "bridge");
+    }
+
+    @Test
+    public void createNetworkWithCustomConfig() throws DockerException {
+
         String networkName = "testNetwork";
         Network.Ipam.Config config = new Network.Ipam.Config();
         config.setSubnet("10.67.79.0/24");
@@ -49,5 +59,6 @@ public void createNetwork() throws DockerException {
         Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
         assertEquals(network.getName(), networkName);
         assertEquals(network.getDriver(), "bridge");
+        assertEquals("10.67.79.0/24", network.getIpam().getConfig().iterator().next().getSubnet());
     }
 }

From b8f87dcf3897390414dd55f6cbe1016cd0859929 Mon Sep 17 00:00:00 2001
From: Yannick Lorenzati <yannick.lorenzat@gmail.com>
Date: Sat, 30 Apr 2016 14:40:41 +0200
Subject: [PATCH 0501/1272] docker java generate empty filter instead of no
 filter #557

---
 .../java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java | 2 +-
 .../com/github/dockerjava/netty/exec/ListContainersCmdExec.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
index fd882b673..50311ef54 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
@@ -37,7 +37,7 @@ protected List<Container> execute(ListContainersCmd command) {
             webTarget = webTarget.queryParam("limit", String.valueOf(command.getLimit()));
         }
 
-        if (command.getFilters() != null) {
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget
                     .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
         }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
index 219aebc4b..e5ab4b66b 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
@@ -36,7 +36,7 @@ protected List<Container> execute(ListContainersCmd command) {
             webTarget = webTarget.queryParam("limit", String.valueOf(command.getLimit()));
         }
 
-        if (command.getFilters() != null) {
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget
                     .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
         }

From 4d605506b2a1512977103f9313259b503917d35d Mon Sep 17 00:00:00 2001
From: fb <fb@baqend.com>
Date: Sat, 27 Feb 2016 11:11:47 +0100
Subject: [PATCH 0502/1272] implement links and aliases for user defined
 networks add missing network options add tests

---
 .../api/command/ConnectToNetworkCmd.java      |   6 +
 .../api/command/CreateContainerCmd.java       |  34 ++++-
 .../api/command/CreateNetworkCmd.java         |  33 +++--
 .../api/command/DisconnectFromNetworkCmd.java |   5 +
 .../api/model/ContainerNetwork.java           |  73 +++++++++--
 .../dockerjava/api/model/HostConfig.java      |  12 ++
 .../github/dockerjava/api/model/Network.java  |  35 ++++-
 .../dockerjava/api/model/NetworkSettings.java |  90 +------------
 .../core/command/ConnectToNetworkCmdImpl.java |  15 +++
 .../core/command/CreateContainerCmdImpl.java  | 122 ++++++++++++++++--
 .../core/command/CreateNetworkCmdImpl.java    |  51 +++++++-
 .../command/DisconnectFromNetworkCmdImpl.java |  14 ++
 .../core/command/RemoveNetworkCmdImpl.java    |   1 -
 .../command/ConnectToNetworkCmdImplTest.java  |  52 +++++++-
 .../command/CreateContainerCmdImplTest.java   | 106 +++++++++++++++
 .../DisconnectFromNetworkCmdImplTest.java     |  22 ++++
 16 files changed, 542 insertions(+), 129 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java b/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java
index cd5c57774..0f384e043 100644
--- a/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.command;
 
+import com.github.dockerjava.api.model.ContainerNetwork;
 import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.CheckForNull;
@@ -18,10 +19,15 @@ public interface ConnectToNetworkCmd extends SyncDockerCmd<Void> {
     @CheckForNull
     String getContainerId();
 
+    @CheckForNull
+    ContainerNetwork getContainerConfig();
+
     ConnectToNetworkCmd withNetworkId(@Nonnull String networkId);
 
     ConnectToNetworkCmd withContainerId(@Nonnull String containerId);
 
+    ConnectToNetworkCmd withContainerNetwork(@Nonnull ContainerNetwork endpointConfig);
+
     interface Exec extends DockerCmdSyncExec<ConnectToNetworkCmd, Void> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index ffcb01c98..196763560 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -1,10 +1,5 @@
 package com.github.dockerjava.api.command;
 
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.CheckForNull;
-
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Bind;
@@ -21,8 +16,15 @@
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
 
+import javax.annotation.CheckForNull;
+import java.util.List;
+import java.util.Map;
+
 public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerResponse> {
 
+    @CheckForNull
+    List<String> getAliases();
+
     @CheckForNull
     Bind[] getBinds();
 
@@ -92,6 +94,12 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     String getImage();
 
+    @CheckForNull
+    String getIpv4Address();
+
+    @CheckForNull
+    String getIpv6Address();
+
     @CheckForNull
     Map<String, String> getLabels();
 
@@ -185,6 +193,18 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     Boolean isTty();
 
+    /**
+     * Add network-scoped alias for the container
+     * @param aliases on ore more aliases
+     */
+    CreateContainerCmd withAliases(String... aliases);
+
+    /**
+     * Add network-scoped alias for the container
+     * @param aliases on ore more aliases
+     */
+    CreateContainerCmd withAliases(List<String> aliases);
+
     CreateContainerCmd withAttachStderr(Boolean attachStderr);
 
     CreateContainerCmd withAttachStdin(Boolean attachStdin);
@@ -304,6 +324,10 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     CreateContainerCmd withImage(String image);
 
+    CreateContainerCmd withIpv4Address(String ipv4Address);
+
+    CreateContainerCmd withIpv6Address(String ipv6Address);
+
     CreateContainerCmd withLabels(Map<String, String> labels);
 
     /**
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
index 6ad26b605..39989bd13 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
@@ -1,14 +1,13 @@
 package com.github.dockerjava.api.command;
 
-import java.util.Map;
-
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.api.model.Network.Ipam;
 import com.github.dockerjava.core.RemoteApiVersion;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+import java.util.Map;
+
 /**
  * Create a network.
  *
@@ -25,18 +24,36 @@ public interface CreateNetworkCmd extends SyncDockerCmd<CreateNetworkResponse> {
     @CheckForNull
     Network.Ipam getIpam();
 
+    @CheckForNull
+    Map<String, String> getOptions();
+
+    @CheckForNull
+    Boolean getCheckDuplicate();
+
+    @CheckForNull
+    Boolean getInternal();
+
+    @CheckForNull
+    Boolean getEnableIPv6();
+
     /** The new network's name. Required. */
     CreateNetworkCmd withName(@Nonnull String name);
 
-    /** Optional custom IP scheme for the network. */
-    CreateNetworkCmd withIpamConfig(Ipam.Config config);
-
     /** Name of the network driver to use. Defaults to <code>bridge</code>. */
     CreateNetworkCmd withDriver(String driver);
 
+    /** Ipam config, such es subnet, gateway and ip range of the network */
+    CreateNetworkCmd withIpam(Ipam ipam);
+
     /** Driver specific options */
     CreateNetworkCmd withOptions(Map<String, String> options);
 
+    CreateNetworkCmd withCheckDuplicate(boolean checkForDuplicate);
+
+    CreateNetworkCmd withInternal(boolean internal);
+
+    CreateNetworkCmd withEnableIpv6(boolean enableIpv6);
+
     interface Exec extends DockerCmdSyncExec<CreateNetworkCmd, CreateNetworkResponse> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java b/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java
index ca870ef37..ce75172b4 100644
--- a/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java
@@ -18,10 +18,15 @@ public interface DisconnectFromNetworkCmd extends SyncDockerCmd<Void> {
     @CheckForNull
     String getContainerId();
 
+    @CheckForNull
+    Boolean getForce();
+
     DisconnectFromNetworkCmd withNetworkId(@Nonnull String networkId);
 
     DisconnectFromNetworkCmd withContainerId(@Nonnull String containerId);
 
+    DisconnectFromNetworkCmd withForce(@Nonnull Boolean force);
+
     interface Exec extends DockerCmdSyncExec<DisconnectFromNetworkCmd, Void> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java b/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
index 4bfde8bfd..9b2160e98 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.core.RemoteApiVersion;
@@ -8,9 +9,14 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import javax.annotation.CheckForNull;
+import java.util.Arrays;
 import java.util.List;
 
 /**
+ * Types taken form
+ * {@see https://github.com/docker/engine-api/blob/release/1.10/types/network/network.go}
+ * Docker named it EndpointSettings
+ *
  * @see ContainerNetworkSettings
  * @author Kanstantsin Shautsou
  */
@@ -20,16 +26,16 @@ public class ContainerNetwork {
      * FIXME verify
      */
     @JsonProperty("IPAMConfig")
-    private Network.Ipam.Config ipamConfig;
+    private Ipam ipamConfig;
 
     /**
      * FIXME verify
      */
     @JsonProperty("Links")
-    private List<String> links;
+    private Links links;
 
     /**
-     * FIXME no docs, unknown field.
+     * Add network-scoped alias for the container
      * Type picked from `docker/vendor/src/github.com/docker/engine-api/types/network/network.go`
      *
      * @since {@link RemoteApiVersion#VERSION_1_22}
@@ -80,6 +86,14 @@ public ContainerNetwork withAliases(List<String> aliases) {
         return this;
     }
 
+    /**
+     * @see #aliases
+     */
+    public ContainerNetwork withAliases(String... aliases) {
+        this.aliases = Arrays.asList(aliases);
+        return this;
+    }
+
     /**
      * @see #endpointId
      */
@@ -155,7 +169,7 @@ public String getIpAddress() {
     /**
      * @see #ipAddress
      */
-    public ContainerNetwork withIpAddress(String ipAddress) {
+    public ContainerNetwork withIpv4Address(String ipAddress) {
         this.ipAddress = ipAddress;
         return this;
     }
@@ -164,14 +178,14 @@ public ContainerNetwork withIpAddress(String ipAddress) {
      * @see #ipamConfig
      */
     @CheckForNull
-    public Network.Ipam.Config getIpamConfig() {
+    public Ipam getIpamConfig() {
         return ipamConfig;
     }
 
     /**
      * @see #ipamConfig
      */
-    public ContainerNetwork withIpamConfig(Network.Ipam.Config ipamConfig) {
+    public ContainerNetwork withIpamConfig(Ipam ipamConfig) {
         this.ipamConfig = ipamConfig;
         return this;
     }
@@ -212,15 +226,24 @@ public ContainerNetwork withIpV6Gateway(String ipV6Gateway) {
      * @see #links
      */
     @CheckForNull
-    public List<String> getLinks() {
-        return links;
+    @JsonIgnore
+    public Link[] getLinks() {
+        return links == null ? new Link[0] : links.getLinks();
+    }
+
+    /**
+     * @see #links
+     */
+    public ContainerNetwork withLinks(List<Link> links) {
+        this.links = new Links(links);
+        return this;
     }
 
     /**
      * @see #links
      */
-    public ContainerNetwork withLinks(List<String> links) {
-        this.links = links;
+    public ContainerNetwork withLinks(Link... links) {
+        this.links = new Links(links);
         return this;
     }
 
@@ -270,4 +293,34 @@ public boolean equals(Object o) {
     public int hashCode() {
         return HashCodeBuilder.reflectionHashCode(this);
     }
+
+    /**
+     * Docker named it EndpointIPAMConfig
+     */
+    public static class Ipam {
+
+        @JsonProperty("IPv4Address")
+        private String ipv4Address;
+
+        @JsonProperty("IPv6Address")
+        private String ipv6Address;
+
+        public String getIpv4Address() {
+            return ipv4Address;
+        }
+
+        public String getIpv6Address() {
+            return ipv6Address;
+        }
+
+        public Ipam withIpv4Address(String ipv4Address) {
+            this.ipv4Address = ipv4Address;
+            return this;
+        }
+
+        public Ipam withIpv6Address(String ipv6Address) {
+            this.ipv6Address = ipv6Address;
+            return this;
+        }
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 400ae29dd..19a6a9128 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -11,6 +11,7 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import javax.annotation.CheckForNull;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -21,6 +22,8 @@
 @JsonInclude(Include.NON_NULL)
 public class HostConfig {
 
+    private static final List<String> PREDEFINED_NETWORKS = Arrays.asList("bridge", "host", "none");
+
     @JsonProperty("Binds")
     private Binds binds;
 
@@ -410,6 +413,15 @@ public String getVolumeDriver() {
         return volumeDriver;
     }
 
+    /**
+     * Parse the network mode as specified at
+     * {@see https://github.com/docker/engine-api/blob/master/types/container/hostconfig_unix.go}
+     */
+    @JsonIgnore
+    public boolean isUserDefinedNetwork() {
+        return networkMode != null && !PREDEFINED_NETWORKS.contains(networkMode) && !networkMode.startsWith("container:");
+    }
+
     @JsonIgnore
     public void setBinds(Bind... binds) {
         this.binds = new Binds(binds);
diff --git a/src/main/java/com/github/dockerjava/api/model/Network.java b/src/main/java/com/github/dockerjava/api/model/Network.java
index 546904254..6f4114914 100644
--- a/src/main/java/com/github/dockerjava/api/model/Network.java
+++ b/src/main/java/com/github/dockerjava/api/model/Network.java
@@ -6,6 +6,7 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -111,16 +112,33 @@ public static class Ipam {
         private String driver;
 
         @JsonProperty("Config")
-        List<Config> config = new ArrayList<>();
+        private List<Config> config = new ArrayList<>();
+
+        @JsonProperty("Options")
+        private Map<String, String> options = null;
 
         public String getDriver() {
             return driver;
         }
 
+        public Map<String, String> getOptions() {
+            return options;
+        }
+
         public List<Config> getConfig() {
             return config;
         }
 
+        public Ipam withConfig(List<Config> ipamConfigs) {
+            config = ipamConfigs;
+            return this;
+        }
+
+        public Ipam withConfig(Config... ipamConfigs) {
+            config = Arrays.asList(ipamConfigs);
+            return this;
+        }
+
         @Override
         public String toString() {
             return ToStringBuilder.reflectionToString(this);
@@ -149,6 +167,21 @@ public String getIpRange() {
             public String getGateway() {
                 return gateway;
             }
+
+            public Config withSubnet(String subnet) {
+                this.subnet = subnet;
+                return this;
+            }
+
+            public Config withIpRange(String ipRange) {
+                this.ipRange = ipRange;
+                return this;
+            }
+
+            public Config withGateway(String gateway) {
+                this.gateway = gateway;
+                return this;
+            }
         }
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java b/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
index 680048c18..1d523bf4b 100644
--- a/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
+++ b/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
@@ -3,15 +3,12 @@
  */
 package com.github.dockerjava.api.model;
 
-import java.util.Map;
-
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.ToStringBuilder;
 
-import javax.annotation.CheckForNull;
+import java.util.Map;
 
 /**
  *
@@ -76,7 +73,7 @@ public class NetworkSettings {
     private String macAddress;
 
     @JsonProperty("Networks")
-    private Map<String, Network> networks;
+    private Map<String, ContainerNetwork> networks;
 
     /**
      * @deprecated since {@link RemoteApiVersion#VERSION_1_21}
@@ -135,7 +132,7 @@ public String getIpV6Gateway() {
     /**
      * @since {@link RemoteApiVersion#VERSION_1_21}
      */
-    public Map<String, Network> getNetworks() {
+    public Map<String, ContainerNetwork> getNetworks() {
         return networks;
     }
 
@@ -206,83 +203,4 @@ public Integer getGlobalIPv6PrefixLen() {
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
     }
-
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class Network {
-
-        @JsonProperty("IPAMConfig")
-        private String ipamConfig;
-
-        /**
-         * @since {@link RemoteApiVersion#VERSION_1_22}
-         */
-        @JsonProperty("NetworkID")
-        private String networkID;
-
-        @JsonProperty("EndpointID")
-        private String endpointId;
-
-        @JsonProperty("Gateway")
-        private String gateway;
-
-        @JsonProperty("IPAddress")
-        private String ipAddress;
-
-        @JsonProperty("IPPrefixLen")
-        private Integer ipPrefixLen;
-
-        @JsonProperty("IPv6Gateway")
-        private String ipV6Gateway;
-
-        @JsonProperty("GlobalIPv6Address")
-        private String globalIPv6Address;
-
-        @JsonProperty("GlobalIPv6PrefixLen")
-        private Integer globalIPv6PrefixLen;
-
-        @JsonProperty("MacAddress")
-        private String macAddress;
-
-        @CheckForNull
-        public String getNetworkID() {
-            return networkID;
-        }
-
-        public String getEndpointId() {
-            return endpointId;
-        }
-
-        public String getGateway() {
-            return gateway;
-        }
-
-        public String getIpAddress() {
-            return ipAddress;
-        }
-
-        public Integer getIpPrefixLen() {
-            return ipPrefixLen;
-        }
-
-        public String getIpV6Gateway() {
-            return ipV6Gateway;
-        }
-
-        public String getGlobalIPv6Address() {
-            return globalIPv6Address;
-        }
-
-        public Integer getGlobalIPv6PrefixLen() {
-            return globalIPv6PrefixLen;
-        }
-
-        public String getMacAddress() {
-            return macAddress;
-        }
-
-        @Override
-        public String toString() {
-            return ToStringBuilder.reflectionToString(this);
-        }
-    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java
index 7014704b1..93fd8abb8 100644
--- a/src/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java
@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.command.ConnectToNetworkCmd;
 import com.github.dockerjava.api.command.DockerCmdSyncExec;
+import com.github.dockerjava.api.model.ContainerNetwork;
 
 public class ConnectToNetworkCmdImpl extends AbstrDockerCmd<ConnectToNetworkCmd, Void> implements ConnectToNetworkCmd {
 
@@ -13,6 +14,9 @@ public class ConnectToNetworkCmdImpl extends AbstrDockerCmd<ConnectToNetworkCmd,
     @JsonProperty("Container")
     private String containerId;
 
+    @JsonProperty("EndpointConfig")
+    private ContainerNetwork endpointConfig;
+
     public ConnectToNetworkCmdImpl(DockerCmdSyncExec<ConnectToNetworkCmd, Void> execution) {
         super(execution);
     }
@@ -27,6 +31,11 @@ public String getContainerId() {
         return containerId;
     }
 
+    @Override
+    public ContainerNetwork getContainerConfig() {
+        return endpointConfig;
+    }
+
     @Override
     public ConnectToNetworkCmd withNetworkId(String networkId) {
         this.networkId = networkId;
@@ -38,4 +47,10 @@ public ConnectToNetworkCmd withContainerId(String containerId) {
         this.containerId = containerId;
         return this;
     }
+
+    @Override
+    public ConnectToNetworkCmd withContainerNetwork(ContainerNetwork endpointConfig) {
+        this.endpointConfig = endpointConfig;
+        return this;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 48b93a004..0b6944b04 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -1,14 +1,5 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
@@ -19,6 +10,7 @@
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Capability;
+import com.github.dockerjava.api.model.ContainerNetwork;
 import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.ExposedPorts;
@@ -33,6 +25,16 @@
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.Volumes;
 import com.github.dockerjava.api.model.VolumesFrom;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Collections.singletonMap;
 
 /**
  * Creates a new container.
@@ -113,6 +115,18 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     @JsonProperty("Labels")
     private Map<String, String> labels;
 
+    @JsonProperty("NetworkingConfig")
+    private NetworkingConfig networkingConfig;
+
+    @JsonIgnore
+    private String ipv4Address = null;
+
+    @JsonIgnore
+    private String ipv6Address = null;
+
+    @JsonIgnore
+    private List<String> aliases = null;
+
     public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, String image) {
         super(exec);
         checkNotNull(image, "image was not specified");
@@ -127,9 +141,48 @@ public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, String image) {
      */
     @Override
     public CreateContainerResponse exec() throws NotFoundException, ConflictException {
+        //code flow taken from https://github.com/docker/docker/blob/master/runconfig/opts/parse.go
+        ContainerNetwork containerNetwork = null;
+
+        if (ipv4Address != null || ipv6Address != null) {
+            containerNetwork = new ContainerNetwork()
+                    .withIpamConfig(new ContainerNetwork.Ipam()
+                            .withIpv4Address(ipv4Address)
+                            .withIpv6Address(ipv6Address)
+                    );
+
+        }
+
+        if (hostConfig.isUserDefinedNetwork() && hostConfig.getLinks().length > 0) {
+            if (containerNetwork == null) {
+                containerNetwork = new ContainerNetwork();
+            }
+
+            containerNetwork.withLinks(hostConfig.getLinks());
+        }
+
+        if (aliases != null) {
+            if (containerNetwork == null) {
+                containerNetwork = new ContainerNetwork();
+            }
+
+            containerNetwork.withAliases(aliases);
+        }
+
+        if (containerNetwork != null) {
+            networkingConfig = new NetworkingConfig()
+                    .withEndpointsConfig(singletonMap(hostConfig.getNetworkMode(), containerNetwork));
+        }
+
         return super.exec();
     }
 
+    @Override
+    @JsonIgnore
+    public List<String> getAliases() {
+        return aliases;
+    }
+
     @Override
     @JsonIgnore
     public Bind[] getBinds() {
@@ -247,6 +300,16 @@ public String getImage() {
         return image;
     }
 
+    @Override
+    public String getIpv4Address() {
+        return ipv4Address;
+    }
+
+    @Override
+    public String getIpv6Address() {
+        return ipv6Address;
+    }
+
     @Override
     @JsonIgnore
     public Map<String, String> getLabels() {
@@ -414,6 +477,19 @@ public String getCgroupParent() {
         return hostConfig.getCgroupParent();
     }
 
+    @Override
+    public CreateContainerCmd withAliases(String... aliases) {
+        this.aliases = Arrays.asList(aliases);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withAliases(List<String> aliases) {
+        checkNotNull(aliases, "aliases was not specified");
+        this.aliases = aliases;
+        return this;
+    }
+
     @Override
     public CreateContainerCmd withAttachStderr(Boolean attachStderr) {
         checkNotNull(attachStderr, "attachStderr was not specified");
@@ -648,6 +724,20 @@ public CreateContainerCmd withImage(String image) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withIpv4Address(String ipv4Address) {
+        checkNotNull(ipv4Address, "no ipv4Address was specified");
+        this.ipv4Address = ipv4Address;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withIpv6Address(String ipv6Address) {
+        checkNotNull(ipv6Address, "no ipv6Address was specified");
+        this.ipv6Address = ipv6Address;
+        return this;
+    }
+
     @Override
     public CreateContainerCmd withLabels(Map<String, String> labels) {
         checkNotNull(labels, "labels was not specified");
@@ -900,4 +990,18 @@ public boolean equals(Object o) {
     public int hashCode() {
         return HashCodeBuilder.reflectionHashCode(this);
     }
+
+    public static class NetworkingConfig {
+        @JsonProperty("EndpointsConfig")
+        public Map<String, ContainerNetwork> endpointsConfig;
+
+        public Map<String, ContainerNetwork> getEndpointsConfig() {
+            return endpointsConfig;
+        }
+
+        public NetworkingConfig withEndpointsConfig(Map<String, ContainerNetwork> endpointsConfig) {
+            this.endpointsConfig = endpointsConfig;
+            return this;
+        }
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
index c7d3b0abb..834aa6905 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
@@ -25,6 +25,15 @@ public class CreateNetworkCmdImpl extends AbstrDockerCmd<CreateNetworkCmd, Creat
     @JsonProperty("Options")
     private Map<String, String> options = new HashMap<>();
 
+    @JsonProperty("CheckDuplicate")
+    private Boolean checkDuplicate;
+
+    @JsonProperty("Internal")
+    private Boolean internal;
+
+    @JsonProperty("EnableIPv6")
+    private Boolean enableIpv6;
+
     public CreateNetworkCmdImpl(DockerCmdSyncExec<CreateNetworkCmd, CreateNetworkResponse> execution) {
         super(execution);
     }
@@ -44,6 +53,26 @@ public Network.Ipam getIpam() {
         return ipam;
     }
 
+    @Override
+    public Map<String, String> getOptions() {
+        return options;
+    }
+
+    @Override
+    public Boolean getCheckDuplicate() {
+        return checkDuplicate;
+    }
+
+    @Override
+    public Boolean getInternal() {
+        return internal;
+    }
+
+    @Override
+    public Boolean getEnableIPv6() {
+        return enableIpv6;
+    }
+
     @Override
     public CreateNetworkCmd withName(String name) {
         this.name = name;
@@ -57,8 +86,8 @@ public CreateNetworkCmd withDriver(String driver) {
     }
 
     @Override
-    public CreateNetworkCmd withIpamConfig(Ipam.Config config) {
-        this.ipam.getConfig().add(config);
+    public CreateNetworkCmd withIpam(Ipam ipam) {
+        this.ipam = ipam;
         return this;
     }
 
@@ -67,4 +96,22 @@ public CreateNetworkCmd withOptions(Map<String, String> options) {
         this.options = options;
         return this;
     }
+
+    @Override
+    public CreateNetworkCmd withCheckDuplicate(boolean checkDuplicate) {
+        this.checkDuplicate = checkDuplicate;
+        return this;
+    }
+
+    @Override
+    public CreateNetworkCmd withInternal(boolean internal) {
+        this.internal = internal;
+        return this;
+    }
+
+    @Override
+    public CreateNetworkCmd withEnableIpv6(boolean enableIpv6) {
+        this.enableIpv6 = enableIpv6;
+        return this;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java
index ae24946b6..b871b36c6 100644
--- a/src/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java
@@ -14,6 +14,9 @@ public class DisconnectFromNetworkCmdImpl extends AbstrDockerCmd<DisconnectFromN
     @JsonProperty("Container")
     private String containerId;
 
+    @JsonProperty("Force")
+    private Boolean force;
+
     public DisconnectFromNetworkCmdImpl(DockerCmdSyncExec<DisconnectFromNetworkCmd, Void> execution) {
         super(execution);
     }
@@ -28,6 +31,11 @@ public String getContainerId() {
         return containerId;
     }
 
+    @Override
+    public Boolean getForce() {
+        return force;
+    }
+
     @Override
     public DisconnectFromNetworkCmd withNetworkId(String networkId) {
         this.networkId = networkId;
@@ -39,4 +47,10 @@ public DisconnectFromNetworkCmd withContainerId(String containerId) {
         this.containerId = containerId;
         return this;
     }
+
+    @Override
+    public DisconnectFromNetworkCmd withForce(Boolean force) {
+        this.force = force;
+        return this;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveNetworkCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveNetworkCmdImpl.java
index ced7279f9..cc9465244 100644
--- a/src/main/java/com/github/dockerjava/core/command/RemoveNetworkCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/RemoveNetworkCmdImpl.java
@@ -14,7 +14,6 @@ public RemoveNetworkCmdImpl(DockerCmdSyncExec<RemoveNetworkCmd, Void> execution,
 
     @Override
     public String getNetworkId() {
-
         return networkId;
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java
index ad051e0bd..f67994de6 100644
--- a/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java
@@ -1,7 +1,11 @@
 package com.github.dockerjava.core.command;
 
-import java.lang.reflect.Method;
-
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.ContainerNetwork;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.client.AbstractDockerClientTest;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -9,11 +13,8 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.CreateNetworkResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.client.AbstractDockerClientTest;
+import java.lang.reflect.Method;
+import java.util.Collections;
 
 @Test(groups = "integration")
 public class ConnectToNetworkCmdImplTest extends AbstractDockerClientTest {
@@ -56,4 +57,41 @@ public void connectToNetwork() throws InterruptedException {
 
         assertNotNull(inspectContainerResponse.getNetworkSettings().getNetworks().get("testNetwork"));
     }
+
+    @Test
+    public void connectToNetworkWithContainerNetwork() throws InterruptedException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        CreateNetworkResponse network = dockerClient.createNetworkCmd()
+                .withName("testNetwork")
+                .withIpam(new Network.Ipam()
+                    .withConfig(new Network.Ipam.Config()
+                        .withSubnet("10.100.100.0/24")))
+                .exec();
+
+        dockerClient.connectToNetworkCmd()
+                .withNetworkId(network.getId())
+                .withContainerId(container.getId())
+                .withContainerNetwork(new ContainerNetwork()
+                    .withAliases("testing")
+                    .withIpamConfig(new ContainerNetwork.Ipam()
+                        .withIpv4Address("10.100.100.100")))
+                .exec();
+
+        Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
+
+        Network.ContainerNetworkConfig containerNetworkConfig = updatedNetwork.getContainers().get(container.getId());
+        assertNotNull(containerNetworkConfig);
+        assertEquals("10.100.100.100", containerNetworkConfig.getIpv4Address());
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        ContainerNetwork testNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get("testNetwork");
+        assertNotNull(testNetwork);
+        assertEquals(Collections.singletonList("testing"), testNetwork.getAliases());
+        assertEquals("10.100.100.0", testNetwork.getGateway());
+        assertEquals("10.100.100.100", testNetwork.getIpAddress());
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index f2fd32b6a..682edc4ce 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -1,15 +1,18 @@
 package com.github.dockerjava.core.command;
 
 import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.CreateNetworkResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.ContainerNetwork;
 import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.Link;
 import com.github.dockerjava.api.model.LogConfig;
+import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Ulimit;
@@ -22,10 +25,12 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
+import org.testng.internal.junit.ArrayAsserts;
 
 import java.lang.reflect.Method;
 import java.security.SecureRandom;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -268,6 +273,107 @@ public void createContainerWithLink() throws DockerException {
                 "container1Link")}));
     }
 
+    @Test
+    public void createContainerWithLinkInCustomNetwork() throws DockerException {
+
+        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd()
+                .withName("linkNet")
+                .exec();
+
+        assertNotNull(createNetworkResponse.getId());
+
+        CreateContainerResponse container1 = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
+                .withNetworkMode("linkNet")
+                .withCmd("sleep", "9999")
+                .withName("container1")
+                .exec();
+
+        assertThat(container1.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container1.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+                .exec();
+        LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
+        assertThat(inspectContainerResponse1.getState().getRunning(), is(true));
+
+        CreateContainerResponse container2 = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
+                .withNetworkMode("linkNet")
+                .withName("container2")
+                .withCmd("env")
+                .withLinks(new Link("container1", "container1Link"))
+                .exec();
+
+        LOG.info("Created container {}", container2.toString());
+        assertThat(container2.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+                .exec();
+
+        ContainerNetwork linkNet = inspectContainerResponse2.getNetworkSettings().getNetworks().get("linkNet");
+        assertNotNull(linkNet);
+        ArrayAsserts.assertArrayEquals(new Link[]{ new Link("container1", "container1Link")}, linkNet.getLinks());
+    }
+
+    @Test
+    public void createContainerWithCustomIp() throws DockerException {
+
+        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd()
+                .withIpam(new Network.Ipam()
+                        .withConfig(new Network.Ipam.Config()
+                                .withSubnet("10.100.101.0/24")))
+                .withName("customIpNet")
+                .exec();
+
+        assertNotNull(createNetworkResponse.getId());
+
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
+                .withNetworkMode("customIpNet")
+                .withCmd("sleep", "9999")
+                .withName("container")
+                .withIpv4Address("10.100.101.100")
+                .exec();
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId())
+                .exec();
+
+        ContainerNetwork customIpNet = inspectContainerResponse.getNetworkSettings().getNetworks().get("customIpNet");
+        assertNotNull(customIpNet);
+        assertEquals("10.100.101.0", customIpNet.getGateway());
+        assertEquals("10.100.101.100", customIpNet.getIpAddress());
+    }
+
+    @Test
+    public void createContainerWithAlias() throws DockerException {
+
+        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd()
+                .withName("aliasNet")
+                .exec();
+
+        assertNotNull(createNetworkResponse.getId());
+
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
+                .withNetworkMode("aliasNet")
+                .withCmd("sleep", "9999")
+                .withName("container")
+                .withAliases("server")
+                .exec();
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId())
+                .exec();
+
+        ContainerNetwork aliasNet = inspectContainerResponse.getNetworkSettings().getNetworks().get("aliasNet");
+        assertEquals(Collections.singletonList("server"), aliasNet.getAliases());
+    }
+
     @Test
     public void createContainerWithCapAddAndCapDrop() throws DockerException {
 
diff --git a/src/test/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImplTest.java
index 7f94c5a0f..c4219b54e 100644
--- a/src/test/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImplTest.java
@@ -56,4 +56,26 @@ public void disconnectFromNetwork() throws InterruptedException {
 
         assertFalse(updatedNetwork.getContainers().containsKey(container.getId()));
     }
+
+    @Test
+    public void forceDisconnectFromNetwork() throws InterruptedException {
+
+        CreateNetworkResponse network = dockerClient.createNetworkCmd().withName("testNetwork").exec();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withNetworkMode("testNetwork")
+                .withCmd("sleep", "9999")
+                .exec();
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        dockerClient.disconnectFromNetworkCmd()
+                .withNetworkId(network.getId())
+                .withContainerId(container.getId())
+                .withForce(true)
+                .exec();
+
+        Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
+        assertFalse(updatedNetwork.getContainers().containsKey(container.getId()));
+    }
 }

From 54d34f0c00e0ba6b81b05e82d782f050b165cff6 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Mon, 2 May 2016 21:34:59 +0200
Subject: [PATCH 0503/1272] Fix issue #560

---
 .../netty/handler/FramedResponseStreamHandler.java           | 2 +-
 .../github/dockerjava/netty/handler/HttpResponseHandler.java | 5 ++++-
 .../netty/handler/JsonResponseCallbackHandler.java           | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
index f360ca756..534894a99 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
@@ -45,7 +45,7 @@ public FramedResponseStreamHandler(ResultCallback<Frame> resultCallback) {
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
 
-        rawBuffer.writeBytes(msg.copy(), 0, msg.readableBytes());
+        rawBuffer.writeBytes(msg, 0, msg.readableBytes());
 
         Frame frame = null;
 
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
index 571fa9be5..9986e10e9 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
@@ -120,6 +120,9 @@ public void close() {
     }
 
     private String getBodyAsMessage(ByteBuf body) {
-        return body.readBytes(body.readableBytes()).toString(Charset.forName("UTF-8"));
+        String result = body.readBytes(body.readableBytes()).toString(Charset.forName("UTF-8"));
+        body.discardReadBytes();
+        body.release();
+        return result;
     }
 }
diff --git a/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java b/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
index b5f76ab73..db20d6216 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
@@ -30,6 +30,7 @@ public JsonResponseCallbackHandler(TypeReference<T> typeReference, ResultCallbac
     protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
         byte[] buffer = new byte[msg.readableBytes()];
         msg.readBytes(buffer);
+        msg.discardReadBytes();
 
         T object = null;
 

From 1ab6e63c4c6eb30baa66771d97f244735565dc0b Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Mon, 2 May 2016 21:49:39 +0200
Subject: [PATCH 0504/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2154f36a7..f88303a1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ Notes
 
 All changes
 
+* [#563] (https://github.com/docker-java/docker-java/pull/563) Fix memory leak in netty implementation of DockerCmdExecFactory
+
 Included in 3.0.0-RC5
 
 * [#542] (https://github.com/docker-java/docker-java/pull/542) Fix large volumes of output from "docker exec" trigger out of memory error

From 90ff0bd99b490a3eb4553f36c222a7c5d3881af6 Mon Sep 17 00:00:00 2001
From: VU Minh Khang <minh.khang.vu.mkv@gmail.com>
Date: Thu, 5 May 2016 20:43:46 +0200
Subject: [PATCH 0505/1272] Fix imports

---
 .../dockerjava/core/command/CreateNetworkCmdImplTest.java   | 6 +++++-
 .../dockerjava/netty/exec/CreateNetworkCmdExecTest.java     | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
index c278f191b..f56a89f64 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
@@ -5,7 +5,11 @@
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import org.testng.ITestResult;
-import org.testng.annotations.*;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
 
 import java.lang.reflect.Method;
 
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
index 974d684b8..35602ddd9 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
@@ -5,7 +5,11 @@
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 import org.testng.ITestResult;
-import org.testng.annotations.*;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
 
 import java.lang.reflect.Method;
 

From 4431df9c0dee7d6d75554c27a59c5157caf6b395 Mon Sep 17 00:00:00 2001
From: VU Minh Khang <minh.khang.vu.mkv@gmail.com>
Date: Fri, 6 May 2016 10:20:46 +0200
Subject: [PATCH 0506/1272] Fix test names

---
 .../dockerjava/core/command/CreateNetworkCmdImplTest.java       | 2 +-
 .../github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
index f56a89f64..4875ba7c5 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
@@ -51,7 +51,7 @@ public void createNetwork() throws DockerException {
     }
 
     @Test
-    public void createNetworkWithCustomConfig() throws DockerException {
+    public void createNetworkWithIpamConfig() throws DockerException {
 
         String networkName = "testNetwork";
         Network.Ipam.Config config = new Network.Ipam.Config();
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
index 35602ddd9..63f2eb620 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
@@ -51,7 +51,7 @@ public void createNetwork() throws DockerException {
     }
 
     @Test
-    public void createNetworkWithCustomConfig() throws DockerException {
+    public void createNetworkWithIpamConfig() throws DockerException {
 
         String networkName = "testNetwork";
         Network.Ipam.Config config = new Network.Ipam.Config();

From 0f0353a95a22748a52e99856596bcc32c670b419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Warcha=C5=82?= <lukasz.warchal@asseco.pl>
Date: Fri, 6 May 2016 11:57:27 +0200
Subject: [PATCH 0507/1272] Throws exception when WaitContainerResultCallback
 timeouts

Fixes #570
---
 .../command/WaitContainerResultCallback.java  |  4 +-
 .../command/WaitContainerCmdImplTest.java     | 55 ++++++++++++++-----
 2 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java b/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
index feb7916e7..df415d555 100644
--- a/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
@@ -56,7 +56,9 @@ public Integer awaitStatusCode() {
      */
     public Integer awaitStatusCode(long timeout, TimeUnit timeUnit) {
         try {
-            awaitCompletion(timeout, timeUnit);
+            if (!awaitCompletion(timeout, timeUnit)) {
+                throw new DockerClientException("Awaiting status code timeout.");
+            }
         } catch (InterruptedException e) {
             throw new DockerClientException("Awaiting status code interrupted: ", e);
         }
diff --git a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
index 8de80573c..0e69d00f0 100644
--- a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
@@ -1,13 +1,12 @@
 package com.github.dockerjava.core.command;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-import java.lang.reflect.Method;
-
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.exception.DockerClientException;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.WaitResponse;
+import com.github.dockerjava.client.AbstractDockerClientTest;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -15,12 +14,11 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.WaitResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
+import java.lang.reflect.Method;
+import java.util.concurrent.TimeUnit;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
 
 @Test(groups = "integration")
 public class WaitContainerCmdImplTest extends AbstractDockerClientTest {
@@ -74,7 +72,7 @@ public void testWaitNonExistingContainer() throws DockerException {
         WaitContainerResultCallback callback = new WaitContainerResultCallback() {
             public void onNext(WaitResponse waitResponse) {
                 fail("expected NotFoundException");
-            };
+            }
         };
 
         dockerClient.waitContainerCmd("non-existing").exec(callback).awaitStatusCode();
@@ -104,4 +102,31 @@ public void testWaitContainerAbort() throws Exception {
 
         assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
     }
+
+    @Test
+    public void testWaitContainerTimeout() throws Exception {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        WaitContainerResultCallback callback = dockerClient.waitContainerCmd(container.getId()).exec(
+                new WaitContainerResultCallback());
+        try {
+            callback.awaitStatusCode(100, TimeUnit.MILLISECONDS);
+            fail("Should throw exception on timeout.");
+        } catch(DockerClientException e){
+            LOG.info(e.getMessage());
+        }
+
+        dockerClient.killContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
+    }
 }

From a8466ff9fa46d653cafbbc4d4b3ed00fbd683f70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Warcha=C5=82?= <lukasz.warchal@asseco.pl>
Date: Fri, 6 May 2016 12:56:21 +0200
Subject: [PATCH 0508/1272] Add test for WaitContainerResultCallback timeout in
 Netty implementation

---
 .../netty/exec/WaitContainerCmdExecTest.java  | 57 +++++++++++++------
 1 file changed, 41 insertions(+), 16 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/netty/exec/WaitContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/WaitContainerCmdExecTest.java
index 527d5f995..20919a934 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/WaitContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/WaitContainerCmdExecTest.java
@@ -1,27 +1,25 @@
 package com.github.dockerjava.netty.exec;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-import java.lang.reflect.Method;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.WaitResponse;
 import com.github.dockerjava.core.command.WaitContainerResultCallback;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+import java.util.concurrent.TimeUnit;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
 
 @Test(groups = "integration")
 public class WaitContainerCmdExecTest extends AbstractNettyDockerClientTest {
@@ -75,7 +73,7 @@ public void testWaitNonExistingContainer() throws DockerException {
         WaitContainerResultCallback callback = new WaitContainerResultCallback() {
             public void onNext(WaitResponse waitResponse) {
                 fail("expected NotFoundException");
-            };
+            }
         };
 
         dockerClient.waitContainerCmd("non-existing").exec(callback).awaitStatusCode();
@@ -107,4 +105,31 @@ public void testWaitContainerAbort() throws Exception {
 
         assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
     }
+
+    @Test
+    public void testWaitContainerTimeout() throws Exception {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        WaitContainerResultCallback callback = dockerClient.waitContainerCmd(container.getId()).exec(
+                new WaitContainerResultCallback());
+        try {
+            callback.awaitStatusCode(100, TimeUnit.MILLISECONDS);
+            fail("Should throw exception on timeout.");
+        } catch(DockerClientException e){
+            LOG.info(e.getMessage());
+        }
+
+        dockerClient.killContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
+    }
 }

From f24fc2613d4b9be8ef3619d9cf3827f6e5f780e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Warcha=C5=82?= <lukasz.warchal@asseco.pl>
Date: Fri, 6 May 2016 13:12:57 +0200
Subject: [PATCH 0509/1272] Polish tests for WaitContainerCmd

Reduce containers sleep duration to 10 seconds.
Remove unnecessary calls to KillContainerCmd.
---
 .../core/command/WaitContainerCmdImplTest.java           | 9 +--------
 .../dockerjava/netty/exec/WaitContainerCmdExecTest.java  | 9 +--------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
index 0e69d00f0..b92dcc657 100644
--- a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
@@ -106,7 +106,7 @@ public void testWaitContainerAbort() throws Exception {
     @Test
     public void testWaitContainerTimeout() throws Exception {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "10").exec();
 
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
@@ -121,12 +121,5 @@ public void testWaitContainerTimeout() throws Exception {
         } catch(DockerClientException e){
             LOG.info(e.getMessage());
         }
-
-        dockerClient.killContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
     }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/WaitContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/WaitContainerCmdExecTest.java
index 20919a934..42898974c 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/WaitContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/WaitContainerCmdExecTest.java
@@ -109,7 +109,7 @@ public void testWaitContainerAbort() throws Exception {
     @Test
     public void testWaitContainerTimeout() throws Exception {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "10").exec();
 
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
@@ -124,12 +124,5 @@ public void testWaitContainerTimeout() throws Exception {
         } catch(DockerClientException e){
             LOG.info(e.getMessage());
         }
-
-        dockerClient.killContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
     }
 }

From 4fc98a0d406e000915db5e55ca3d1a6f82e8e1ff Mon Sep 17 00:00:00 2001
From: AE <ae@ae.nl>
Date: Fri, 6 May 2016 16:39:53 +0200
Subject: [PATCH 0510/1272] Docker inspect command now shows sizes if request.

---
 .../dockerjava/api/command/InspectContainerCmd.java  |  4 ++++
 .../api/command/InspectContainerResponse.java        |  7 +++++++
 .../core/command/InspectContainerCmdImpl.java        | 12 ++++++++++++
 .../dockerjava/jaxrs/InspectContainerCmdExec.java    |  5 +++--
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
index cb782c64d..c0f666fa3 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
@@ -12,6 +12,10 @@ public interface InspectContainerCmd extends SyncDockerCmd<InspectContainerRespo
 
     InspectContainerCmd withContainerId(@Nonnull String containerId);
 
+    InspectContainerCmd withSize(Boolean showSize);
+
+    boolean getSize();
+
     /**
      * @throws NotFoundException
      *             No such container
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index d19bc0329..59a267e9d 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -56,6 +56,9 @@ public class InspectContainerResponse {
     @JsonProperty("Id")
     private String id;
 
+    @JsonProperty("SizeRootFs")
+    private Integer sizeRootFs;
+
     @JsonProperty("Image")
     private String imageId;
 
@@ -102,6 +105,10 @@ public String getId() {
         return id;
     }
 
+    public Integer getSizeRootFs() {
+        return  sizeRootFs;
+    }
+
     public String getCreated() {
         return created;
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
index 51b1bdf5a..b6ba08540 100644
--- a/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
@@ -13,6 +13,7 @@ public class InspectContainerCmdImpl extends AbstrDockerCmd<InspectContainerCmd,
         InspectContainerCmd {
 
     private String containerId;
+    private boolean size;
 
     public InspectContainerCmdImpl(InspectContainerCmd.Exec exec, String containerId) {
         super(exec);
@@ -31,6 +32,17 @@ public InspectContainerCmd withContainerId(String containerId) {
         return this;
     }
 
+    @Override
+    public InspectContainerCmd withSize(Boolean showSize) {
+        this.size = showSize;
+        return this;
+    }
+
+    @Override
+    public boolean getSize() {
+        return size;
+    }
+
     /**
      * @throws NotFoundException
      *             No such container
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
index 74bcc801c..2edbe2d29 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
@@ -21,8 +21,9 @@ public InspectContainerCmdExec(WebTarget baseResource, DockerClientConfig docker
 
     @Override
     protected InspectContainerResponse execute(InspectContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/json").resolveTemplate("id",
-                command.getContainerId());
+        WebTarget webResource = getBaseResource().path("/containers/{id}/json")
+                                                 .queryParam("size", command.getSize())
+                                                 .resolveTemplate("id", command.getContainerId());
 
         LOGGER.debug("GET: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectContainerResponse.class);

From 4bf2648d92cab2117a3e07d6db7b8626c7312af5 Mon Sep 17 00:00:00 2001
From: francois <flaroche@gmail.com>
Date: Sun, 1 May 2016 23:44:39 +0200
Subject: [PATCH 0511/1272] Work on port ranges - change all to strings

---
 .../dockerjava/api/model/ExposedPort.java     |  6 +-
 .../github/dockerjava/api/model/Ports.java    | 76 +++++++++----------
 .../command/InspectContainerResponseTest.java |  4 +-
 .../dockerjava/api/model/BindingTest.java     |  7 +-
 .../dockerjava/api/model/PortBindingTest.java | 12 +--
 .../api/model/Ports_SerializingTest.java      | 17 ++---
 .../api/model/Ports_addBindingsTest.java      | 13 ++--
 .../core/TestDockerCmdExecFactory.java        | 66 ++++++++++++++--
 .../core/command/BuildImageCmdImplTest.java   |  2 +-
 .../command/CreateContainerCmdImplTest.java   | 12 +--
 .../command/RenameContainerCmdImplTest.java   |  9 ++-
 .../command/StartContainerCmdImplTest.java    | 71 +++++++++--------
 .../core/util/FiltersBuilderTest.java         |  5 +-
 .../netty/exec/BuildImageCmdExecTest.java     |  2 +-
 .../exec/CreateContainerCmdExecTest.java      | 67 ++++++++--------
 .../exec/RenameContainerCmdExecTest.java      |  9 ++-
 .../netty/exec/StartContainerCmdExecTest.java | 71 +++++++++--------
 17 files changed, 253 insertions(+), 196 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/ExposedPort.java b/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
index 25829b8aa..4e30c8df0 100644
--- a/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
+++ b/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
@@ -65,7 +65,7 @@ public ExposedPort(int port) {
      * @param scheme
      *            the {@link #getScheme() scheme}, <code>tcp</code> or <code>udp</code>
      * @param port
-     *            the {@link #getPort() port number}
+     *            the {@link #getPort() port number or port range}
      * @deprecated use {@link #ExposedPort(int, InternetProtocol)}
      */
     @Deprecated
@@ -124,9 +124,9 @@ public static ExposedPort parse(String serialized) throws IllegalArgumentExcepti
             String[] parts = serialized.split("/");
             switch (parts.length) {
                 case 1:
-                    return new ExposedPort(Integer.valueOf(parts[0]));
+                    return new ExposedPort(Integer.parseInt(parts[0]));
                 case 2:
-                    return new ExposedPort(Integer.valueOf(parts[0]), InternetProtocol.parse(parts[1]));
+                    return new ExposedPort(Integer.parseInt(parts[0]), InternetProtocol.parse(parts[1]));
                 default:
                     throw new IllegalArgumentException();
             }
diff --git a/src/main/java/com/github/dockerjava/api/model/Ports.java b/src/main/java/com/github/dockerjava/api/model/Ports.java
index e0250bba1..17b2ad432 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -1,16 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import static org.apache.commons.lang.StringUtils.isEmpty;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.builder.EqualsBuilder;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -23,6 +12,16 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.node.NullNode;
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.builder.EqualsBuilder;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import static org.apache.commons.lang.StringUtils.isEmpty;
 
 /**
  * A container for port bindings, made available as a {@link Map} via its {@link #getBindings()} method.
@@ -111,15 +110,15 @@ public Map<ExposedPort, Binding[]> getBindings() {
     /**
      * Creates a {@link Binding} for the given IP address and port number.
      */
-    public static Binding binding(String hostIp, Integer hostPort) {
+    public static Binding binding(String hostIp, String hostPort) {
         return new Binding(hostIp, hostPort);
     }
 
     /**
      * Creates a {@link Binding} for the given port number, leaving the IP address undefined.
      */
-    public static Binding binding(Integer hostPort) {
-        return new Binding(hostPort);
+    public static Binding binding(String hostPort) {
+        return new Binding(null, hostPort);
     }
 
     /**
@@ -132,38 +131,38 @@ public static Binding binding(Integer hostPort) {
      */
     public static class Binding {
 
-        private final String hostIp;
-
-        private final Integer hostPort;
-
         /**
-         * Creates a {@link Binding} for the given {@link #getHostIp() IP address} and {@link #getHostPort() port number}.
+         * Creates a {@link Binding} for the given {@link #getHostPort() port number or range}, leaving the {@link #getHostIp() IP address}
+         * undefined.
          *
          * @see Ports#bind(ExposedPort, Binding)
          * @see ExposedPort
          */
-        public Binding(String hostIp, Integer hostPort) {
-            this.hostIp = isEmpty(hostIp) ? null : hostIp;
-            this.hostPort = hostPort;
+        public static Binding forPort(String port) {
+            return new Binding(null, port);
         }
 
         /**
-         * Creates a {@link Binding} for the given {@link #getHostPort() port number}, leaving the {@link #getHostIp() IP address}
+         * Creates a {@link Binding} for the given {@link #getHostIp() IP address}, leaving the {@link #getHostPort() port number}
          * undefined.
-         *
-         * @see Ports#bind(ExposedPort, Binding)
-         * @see ExposedPort
          */
-        public Binding(Integer hostPort) {
-            this(null, hostPort);
+        public static Binding forIp(String hostIp) {
+            return new Binding(hostIp, null);
         }
 
+        private final String hostIp;
+
+        private final String hostPort;
+
         /**
-         * Creates a {@link Binding} for the given {@link #getHostIp() IP address}, leaving the {@link #getHostPort() port number}
-         * undefined.
+         * Creates a {@link Binding} for the given {@link #getHostIp() IP address} and {@link #getHostPort() port number}.
+         *
+         * @see Ports#bind(ExposedPort, Binding)
+         * @see ExposedPort
          */
-        public Binding(String hostIp) {
-            this(hostIp, null);
+        public Binding(String hostIp, String hostPort) {
+            this.hostIp = isEmpty(hostIp) ? null : hostIp;
+            this.hostPort = hostPort;
         }
 
         /**
@@ -184,7 +183,7 @@ public String getHostIp() {
         /**
          * @return the port number on the Docker host. May be <code>null</code>, in which case Docker will dynamically assign a port.
          */
-        public Integer getHostPort() {
+        public String getHostPort() {
             return hostPort;
         }
 
@@ -208,10 +207,10 @@ public static Binding parse(String serialized) throws IllegalArgumentException {
                 String[] parts = serialized.split(":");
                 switch (parts.length) {
                     case 2: {
-                        return new Binding(parts[0], Integer.valueOf(parts[1]));
+                        return new Binding(parts[0], parts[1]);
                     }
                     case 1: {
-                        return parts[0].contains(".") ? new Binding(parts[0]) : new Binding(Integer.valueOf(parts[0]));
+                        return parts[0].contains(".") ? Binding.forIp(parts[0]) : Binding.forPort(parts[0]);
                     }
                     default: {
                         throw new IllegalArgumentException();
@@ -231,7 +230,7 @@ public static Binding parse(String serialized) throws IllegalArgumentException {
         @Override
         public String toString() {
             if (isEmpty(hostIp)) {
-                return Integer.toString(hostPort);
+                return hostPort;
             } else if (hostPort == null) {
                 return hostIp;
             } else {
@@ -270,7 +269,7 @@ public Ports deserialize(JsonParser jsonParser, DeserializationContext deseriali
                         JsonNode bindingNode = bindingsArray.get(i);
                         if (!bindingNode.equals(NullNode.getInstance())) {
                             String hostIp = bindingNode.get("HostIp").textValue();
-                            int hostPort = bindingNode.get("HostPort").asInt();
+                            String hostPort = bindingNode.get("HostPort").textValue();
                             out.bind(ExposedPort.parse(portNode.getKey()), new Binding(hostIp, hostPort));
                         }
                     }
@@ -294,8 +293,7 @@ public void serialize(Ports portBindings, JsonGenerator jsonGen, SerializerProvi
                     for (Binding binding : entry.getValue()) {
                         jsonGen.writeStartObject();
                         jsonGen.writeStringField("HostIp", binding.getHostIp() == null ? "" : binding.getHostIp());
-                        jsonGen.writeStringField("HostPort", binding.getHostPort() == null ? "" : binding.getHostPort()
-                                .toString());
+                        jsonGen.writeStringField("HostPort", binding.getHostPort() == null ? "" : binding.getHostPort());
                         jsonGen.writeEndObject();
                     }
                     jsonGen.writeEndArray();
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
index c9d40b65f..f64cf4ead 100644
--- a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
+++ b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
@@ -25,7 +25,9 @@
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.core.IsNot.not;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
 
 /**
  * Tests for {@link InspectContainerResponse}.
diff --git a/src/test/java/com/github/dockerjava/api/model/BindingTest.java b/src/test/java/com/github/dockerjava/api/model/BindingTest.java
index 23e793cf8..290e66b82 100644
--- a/src/test/java/com/github/dockerjava/api/model/BindingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/BindingTest.java
@@ -10,12 +10,12 @@ public class BindingTest {
 
     @Test
     public void parseIpAndPort() {
-        assertEquals(Binding.parse("127.0.0.1:80"), Ports.binding("127.0.0.1", 80));
+        assertEquals(Binding.parse("127.0.0.1:80"), Ports.binding("127.0.0.1", "80"));
     }
 
     @Test
     public void parsePortOnly() {
-        assertEquals(Binding.parse("80"), Ports.binding(null, 80));
+        assertEquals(Binding.parse("80"), Ports.binding(null, "80"));
     }
 
     @Test
@@ -28,7 +28,8 @@ public void parseEmptyString() {
         assertEquals(Binding.parse(""), Ports.binding(null, null));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Binding 'nonsense'")
+    // Strings can be used since it can be a range. Let the docker daemon do the validation.
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Binding 'nonsense'", enabled = false)
     public void parseInvalidInput() {
         Binding.parse("nonsense");
     }
diff --git a/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java b/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
index e5f5f4c1b..296148177 100644
--- a/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
@@ -13,22 +13,22 @@ public class PortBindingTest {
     @Test
     public void fullDefinition() {
         assertEquals(PortBinding.parse("127.0.0.1:80:8080/tcp"),
-                new PortBinding(new Binding("127.0.0.1", 80), TCP_8080));
+                new PortBinding(new Binding("127.0.0.1", "80"), TCP_8080));
     }
 
     @Test
     public void noProtocol() {
-        assertEquals(PortBinding.parse("127.0.0.1:80:8080"), new PortBinding(new Binding("127.0.0.1", 80), TCP_8080));
+        assertEquals(PortBinding.parse("127.0.0.1:80:8080"), new PortBinding(new Binding("127.0.0.1", "80"), TCP_8080));
     }
 
     @Test
     public void noHostIp() {
-        assertEquals(PortBinding.parse("80:8080/tcp"), new PortBinding(new Binding(80), TCP_8080));
+        assertEquals(PortBinding.parse("80:8080/tcp"), new PortBinding(Binding.forPort("80"), TCP_8080));
     }
 
     @Test
     public void portsOnly() {
-        assertEquals(PortBinding.parse("80:8080"), new PortBinding(new Binding(80), TCP_8080));
+        assertEquals(PortBinding.parse("80:8080"), new PortBinding(Binding.forPort("80"), TCP_8080));
     }
 
     @Test
@@ -38,10 +38,10 @@ public void exposedPortOnly() {
 
     @Test
     public void dynamicHostPort() {
-        assertEquals(PortBinding.parse("127.0.0.1::8080"), new PortBinding(new Binding("127.0.0.1"), TCP_8080));
+        assertEquals(PortBinding.parse("127.0.0.1::8080"), new PortBinding(Binding.forIp("127.0.0.1"), TCP_8080));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing PortBinding 'nonsense'")
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing PortBinding 'nonsense'", enabled = false)
     public void parseInvalidInput() {
         PortBinding.parse("nonsense");
     }
diff --git a/src/test/java/com/github/dockerjava/api/model/Ports_SerializingTest.java b/src/test/java/com/github/dockerjava/api/model/Ports_SerializingTest.java
index 8c8d2014f..fb89561e5 100644
--- a/src/test/java/com/github/dockerjava/api/model/Ports_SerializingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/Ports_SerializingTest.java
@@ -1,13 +1,12 @@
 package com.github.dockerjava.api.model;
 
-import static org.testng.Assert.assertEquals;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.model.Ports.Binding;
+import org.testng.annotations.Test;
 
 import java.util.Map;
 
-import org.testng.annotations.Test;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.model.Ports.Binding;
+import static org.testng.Assert.assertEquals;
 
 public class Ports_SerializingTest {
     private final ObjectMapper objectMapper = new ObjectMapper();
@@ -24,15 +23,15 @@ public void deserializingPortWithMultipleBindings() throws Exception {
 
         Binding[] bindings = map.get(ExposedPort.tcp(80));
         assertEquals(bindings.length, 2);
-        assertEquals(bindings[0], new Binding("10.0.0.1", 80));
-        assertEquals(bindings[1], new Binding("10.0.0.2", 80));
+        assertEquals(bindings[0], new Binding("10.0.0.1", "80"));
+        assertEquals(bindings[1], new Binding("10.0.0.2", "80"));
     }
 
     @Test
     public void serializingPortWithMultipleBindings() throws Exception {
         Ports ports = new Ports();
-        ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.1", 80));
-        ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.2", 80));
+        ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.1", "80"));
+        ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.2", "80"));
         assertEquals(objectMapper.writeValueAsString(ports), jsonWithDoubleBindingForOnePort);
     }
 
diff --git a/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java b/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
index a5a8697f5..401ee4b44 100644
--- a/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
@@ -1,13 +1,12 @@
 package com.github.dockerjava.api.model;
 
-import static org.testng.Assert.assertEquals;
-
-import java.util.Map;
-
+import com.github.dockerjava.api.model.Ports.Binding;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.model.Ports.Binding;
+import java.util.Map;
+
+import static org.testng.Assert.assertEquals;
 
 /**
  * As there may be several {@link Binding}s per {@link ExposedPort}, it makes a difference if you add {@link PortBinding}s for the same or
@@ -18,9 +17,9 @@ public class Ports_addBindingsTest {
 
     private static final ExposedPort TCP_90 = ExposedPort.tcp(90);
 
-    private static final Binding BINDING_8080 = Ports.binding(8080);
+    private static final Binding BINDING_8080 = Ports.binding("8080");
 
-    private static final Binding BINDING_9090 = Ports.binding(9090);
+    private static final Binding BINDING_9090 = Ports.binding("9090");
 
     private Ports ports;
 
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index ba05ab4e3..aee8a60a8 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -1,17 +1,69 @@
 package com.github.dockerjava.core;
 
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.AttachContainerCmd;
+import com.github.dockerjava.api.command.AuthCmd.Exec;
+import com.github.dockerjava.api.command.BuildImageCmd;
+import com.github.dockerjava.api.command.CommitCmd;
+import com.github.dockerjava.api.command.ConnectToNetworkCmd;
+import com.github.dockerjava.api.command.ContainerDiffCmd;
+import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
+import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.api.command.CreateContainerCmd;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.CreateImageResponse;
+import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.api.command.CreateVolumeCmd;
+import com.github.dockerjava.api.command.CreateVolumeResponse;
+import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
+import com.github.dockerjava.api.command.DockerCmdExecFactory;
+import com.github.dockerjava.api.command.EventsCmd;
+import com.github.dockerjava.api.command.ExecCreateCmd;
+import com.github.dockerjava.api.command.ExecStartCmd;
+import com.github.dockerjava.api.command.InfoCmd;
+import com.github.dockerjava.api.command.InspectContainerCmd;
+import com.github.dockerjava.api.command.InspectExecCmd;
+import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.InspectNetworkCmd;
+import com.github.dockerjava.api.command.InspectVolumeCmd;
+import com.github.dockerjava.api.command.KillContainerCmd;
+import com.github.dockerjava.api.command.ListContainersCmd;
+import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.command.ListVolumesCmd;
+import com.github.dockerjava.api.command.LogContainerCmd;
+import com.github.dockerjava.api.command.PauseContainerCmd;
+import com.github.dockerjava.api.command.PingCmd;
+import com.github.dockerjava.api.command.PullImageCmd;
+import com.github.dockerjava.api.command.PushImageCmd;
+import com.github.dockerjava.api.command.RemoveContainerCmd;
+import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.RemoveVolumeCmd;
+import com.github.dockerjava.api.command.RenameContainerCmd;
+import com.github.dockerjava.api.command.RestartContainerCmd;
+import com.github.dockerjava.api.command.SaveImageCmd;
+import com.github.dockerjava.api.command.SearchImagesCmd;
+import com.github.dockerjava.api.command.StartContainerCmd;
+import com.github.dockerjava.api.command.StatsCmd;
+import com.github.dockerjava.api.command.StopContainerCmd;
+import com.github.dockerjava.api.command.TagImageCmd;
+import com.github.dockerjava.api.command.TopContainerCmd;
+import com.github.dockerjava.api.command.UnpauseContainerCmd;
+import com.github.dockerjava.api.command.UpdateContainerCmd;
+import com.github.dockerjava.api.command.VersionCmd;
+import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.api.model.BuildResponseItem;
+
+import javax.net.ssl.SSLContext;
 import java.io.IOException;
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.net.ssl.SSLContext;
-
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.command.*;
-import com.github.dockerjava.api.command.AuthCmd.Exec;
-import com.github.dockerjava.api.model.BuildResponseItem;
-
 /**
  * Special {@link DockerCmdExecFactory} implementation that collects container and image creations while test execution for the purpose of
  * automatically cleanup.
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 99eefb4de..9ae4e3e98 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -263,7 +263,7 @@ public void testBuildFromPrivateRegistry() throws Exception {
         CreateContainerResponse testregistry = dockerClient
                 .createContainerCmd("testregistry:2")
                 .withName("registry")
-                .withPortBindings(new PortBinding(new Ports.Binding(5000), ExposedPort.tcp(5000)))
+                .withPortBindings(new PortBinding(Ports.Binding.forPort("5000"), ExposedPort.tcp(5000)))
                 .withEnv("REGISTRY_AUTH=htpasswd", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm",
                         "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "REGISTRY_LOG_LEVEL=debug",
                         "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key")
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index f2fd32b6a..05d2b6d0d 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -361,9 +361,9 @@ public void createContainerWithPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.binding(11022));
-        portBindings.bind(tcp23, Ports.binding(11023));
-        portBindings.bind(tcp23, Ports.binding(11024));
+        portBindings.bind(tcp22, Ports.binding("11022"));
+        portBindings.bind(tcp23, Ports.binding("11023"));
+        portBindings.bind(tcp23, Ports.binding("11024"));
 
         CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
@@ -377,13 +377,13 @@ public void createContainerWithPortBindings() throws DockerException {
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
-                is(equalTo(Ports.binding(11022))));
+                is(equalTo(Ports.binding("11022"))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
-                is(equalTo(Ports.binding(11023))));
+                is(equalTo(Ports.binding("11023"))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
-                is(equalTo(Ports.binding(11024))));
+                is(equalTo(Ports.binding("11024"))));
 
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java
index 9f503a87b..582ab2556 100644
--- a/src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java
@@ -6,12 +6,17 @@
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import org.testng.ITestResult;
-import org.testng.annotations.*;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
 
 import java.lang.reflect.Method;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
 
 @Test(groups = "integration")
 public class RenameContainerCmdImplTest extends AbstractDockerClientTest {
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index a2f1e51d8..4437eaaa7 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -1,31 +1,5 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.api.model.AccessMode.ro;
-import static com.github.dockerjava.api.model.Capability.MKNOD;
-import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.startsWith;
-
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
@@ -42,6 +16,31 @@
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.client.AbstractDockerClientTest;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+
+import static com.github.dockerjava.api.model.AccessMode.ro;
+import static com.github.dockerjava.api.model.Capability.MKNOD;
+import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.startsWith;
 
 @Test(groups = "integration")
 public class StartContainerCmdImplTest extends AbstractDockerClientTest {
@@ -189,9 +188,9 @@ public void startContainerWithPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.binding(11022));
-        portBindings.bind(tcp23, Ports.binding(11023));
-        portBindings.bind(tcp23, Ports.binding(11024));
+        portBindings.bind(tcp22, Ports.binding("11022"));
+        portBindings.bind(tcp23, Ports.binding("11023"));
+        portBindings.bind(tcp23, Ports.binding("11024"));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
@@ -209,13 +208,13 @@ public void startContainerWithPortBindings() throws DockerException {
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
-                is(equalTo(Ports.binding(11022))));
+                is(equalTo(Ports.binding("11022"))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
-                is(equalTo(Ports.binding(11023))));
+                is(equalTo(Ports.binding("11023"))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
-                is(equalTo(Ports.binding(11024))));
+                is(equalTo(Ports.binding("11024"))));
 
     }
 
@@ -243,10 +242,10 @@ public void startContainerWithRandomPortBindings() throws DockerException {
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
         assertThat(inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(tcp22)[0].getHostPort(),
-                is(not(equalTo(tcp22.getPort()))));
+                is(not(equalTo(String.valueOf(tcp22.getPort())))));
 
         assertThat(inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(tcp23)[0].getHostPort(),
-                is(not(equalTo(tcp23.getPort()))));
+                is(not(equalTo(String.valueOf(tcp23.getPort())))));
 
     }
 
@@ -257,8 +256,8 @@ public void startContainerWithConflictingPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.binding(11022));
-        portBindings.bind(tcp23, Ports.binding(11022));
+        portBindings.bind(tcp22, Ports.binding("11022"));
+        portBindings.bind(tcp23, Ports.binding("11022"));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
diff --git a/src/test/java/com/github/dockerjava/core/util/FiltersBuilderTest.java b/src/test/java/com/github/dockerjava/core/util/FiltersBuilderTest.java
index 25027ae76..e70a3b057 100644
--- a/src/test/java/com/github/dockerjava/core/util/FiltersBuilderTest.java
+++ b/src/test/java/com/github/dockerjava/core/util/FiltersBuilderTest.java
@@ -1,13 +1,12 @@
 package com.github.dockerjava.core.util;
 
-import com.github.dockerjava.core.util.FiltersBuilder;
 import com.google.common.collect.Maps;
-
 import org.testng.annotations.Test;
 
 import java.util.Map;
 
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotEquals;
 
 /**
  * @author Vincent Latombe <vincent@latombe.net>
diff --git a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
index 1299cf6ae..2f9ac934c 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
@@ -255,7 +255,7 @@ public void testBuildFromPrivateRegistry() throws Exception {
         CreateContainerResponse testregistry = dockerClient
                 .createContainerCmd("testregistry:2")
                 .withName("registry")
-                .withPortBindings(new PortBinding(new Ports.Binding(5000), ExposedPort.tcp(5000)))
+                .withPortBindings(new PortBinding(Ports.Binding.forPort("5000"), ExposedPort.tcp(5000)))
                 .withEnv("REGISTRY_AUTH=htpasswd", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm",
                         "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "REGISTRY_LOG_LEVEL=debug",
                         "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key")
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
index 02c5cc54e..0daf4fb46 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
@@ -1,33 +1,5 @@
 package com.github.dockerjava.netty.exec;
 
-import static com.github.dockerjava.api.model.Capability.MKNOD;
-import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasItemInArray;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.startsWith;
-
-import java.lang.reflect.Method;
-import java.security.SecureRandom;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.ConflictException;
@@ -43,6 +15,33 @@
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+import java.security.SecureRandom;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import static com.github.dockerjava.api.model.Capability.MKNOD;
+import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItemInArray;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.startsWith;
 
 @Test(groups = "integration")
 public class CreateContainerCmdExecTest extends AbstractNettyDockerClientTest {
@@ -352,9 +351,9 @@ public void createContainerWithPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.binding(11022));
-        portBindings.bind(tcp23, Ports.binding(11023));
-        portBindings.bind(tcp23, Ports.binding(11024));
+        portBindings.bind(tcp22, Ports.binding("11022"));
+        portBindings.bind(tcp23, Ports.binding("11023"));
+        portBindings.bind(tcp23, Ports.binding("11024"));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
@@ -368,13 +367,13 @@ public void createContainerWithPortBindings() throws DockerException {
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
-                is(equalTo(Ports.binding(11022))));
+                is(equalTo(Ports.binding("11022"))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
-                is(equalTo(Ports.binding(11023))));
+                is(equalTo(Ports.binding("11023"))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
-                is(equalTo(Ports.binding(11024))));
+                is(equalTo(Ports.binding("11024"))));
 
     }
 
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java
index c176bc1d6..100a7d772 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java
@@ -6,12 +6,17 @@
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 import org.testng.ITestResult;
-import org.testng.annotations.*;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
 
 import java.lang.reflect.Method;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
 
 @Test(groups = "integration")
 public class RenameContainerCmdExecTest extends AbstractNettyDockerClientTest {
diff --git a/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
index 6c70c1f07..844274887 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
@@ -1,31 +1,5 @@
 package com.github.dockerjava.netty.exec;
 
-import static com.github.dockerjava.api.model.AccessMode.ro;
-import static com.github.dockerjava.api.model.Capability.MKNOD;
-import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.startsWith;
-
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
@@ -43,6 +17,31 @@
 import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.core.command.WaitContainerResultCallback;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+
+import static com.github.dockerjava.api.model.AccessMode.ro;
+import static com.github.dockerjava.api.model.Capability.MKNOD;
+import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.startsWith;
 
 @Test(groups = "integration")
 public class StartContainerCmdExecTest extends AbstractNettyDockerClientTest {
@@ -192,9 +191,9 @@ public void startContainerWithPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.binding(11022));
-        portBindings.bind(tcp23, Ports.binding(11023));
-        portBindings.bind(tcp23, Ports.binding(11024));
+        portBindings.bind(tcp22, Ports.binding("11022"));
+        portBindings.bind(tcp23, Ports.binding("11023"));
+        portBindings.bind(tcp23, Ports.binding("11024"));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
@@ -212,13 +211,13 @@ public void startContainerWithPortBindings() throws DockerException {
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
-                is(equalTo(Ports.binding(11022))));
+                is(equalTo(Ports.binding("11022"))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
-                is(equalTo(Ports.binding(11023))));
+                is(equalTo(Ports.binding("11023"))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
-                is(equalTo(Ports.binding(11024))));
+                is(equalTo(Ports.binding("11024"))));
 
     }
 
@@ -246,10 +245,10 @@ public void startContainerWithRandomPortBindings() throws DockerException {
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
         assertThat(inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(tcp22)[0].getHostPort(),
-                is(not(equalTo(tcp22.getPort()))));
+                is(not(equalTo(String.valueOf(tcp22.getPort())))));
 
         assertThat(inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(tcp23)[0].getHostPort(),
-                is(not(equalTo(tcp23.getPort()))));
+                is(not(equalTo(String.valueOf(tcp23.getPort())))));
 
     }
 
@@ -260,8 +259,8 @@ public void startContainerWithConflictingPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.binding(11022));
-        portBindings.bind(tcp23, Ports.binding(11022));
+        portBindings.bind(tcp22, Ports.binding("11022"));
+        portBindings.bind(tcp23, Ports.binding("11022"));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();

From 9641b01d0559aa23299bdf229c07a29e065d4398 Mon Sep 17 00:00:00 2001
From: Lappas Dionysis <dio@freelabs.net>
Date: Sun, 8 May 2016 19:07:39 +0300
Subject: [PATCH 0512/1272] Fixes copyArchiveToContainerCmdImpl fail when
 hostResource has an empty dir which gets added  as last entry to tar

CopyArchiveToContainerCmdImpl FAILS with com.github.dockerjava.api.exception.BadRequestException: Unable to perform tar on host resource /path/to/resource, if the resourceHost is a dir that containes an empty dir which will be added as the last entry to the generated .tar file.
---
 src/main/java/com/github/dockerjava/core/util/TarDirWalker.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java b/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
index 7c3a9ca29..af263ee9c 100644
--- a/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
+++ b/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
@@ -26,6 +26,7 @@ public TarDirWalker(Path basePath, TarArchiveOutputStream tarArchiveOutputStream
     public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
         if (!dir.equals(basePath)) {
             tarArchiveOutputStream.putArchiveEntry(new TarArchiveEntry(FilePathUtil.relativize(basePath, dir)));
+            tarArchiveOutputStream.closeArchiveEntry();
         }
         return FileVisitResult.CONTINUE;
     }

From 2edfcb0e0aa08feade900dcd3250a991d9458a85 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 8 May 2016 22:24:06 +0200
Subject: [PATCH 0513/1272] Polish binding for port ranges

---
 .../github/dockerjava/api/model/Ports.java    | 103 ++++++++++--------
 .../dockerjava/api/model/BindingTest.java     |   8 +-
 .../dockerjava/api/model/PortBindingTest.java |  12 +-
 .../api/model/Ports_addBindingsTest.java      |   4 +-
 .../core/command/BuildImageCmdImplTest.java   |   2 +-
 .../command/CreateContainerCmdImplTest.java   |  14 ++-
 .../command/StartContainerCmdImplTest.java    |  26 +++--
 .../netty/exec/BuildImageCmdExecTest.java     |   3 +-
 .../exec/CreateContainerCmdExecTest.java      |  14 ++-
 .../netty/exec/StartContainerCmdExecTest.java |  26 +++--
 10 files changed, 119 insertions(+), 93 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/Ports.java b/src/main/java/com/github/dockerjava/api/model/Ports.java
index 17b2ad432..904a31c4e 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -107,24 +107,10 @@ public Map<ExposedPort, Binding[]> getBindings() {
     // return bindings.toArray(new PortBinding[bindings.size()]);
     // }
 
-    /**
-     * Creates a {@link Binding} for the given IP address and port number.
-     */
-    public static Binding binding(String hostIp, String hostPort) {
-        return new Binding(hostIp, hostPort);
-    }
-
-    /**
-     * Creates a {@link Binding} for the given port number, leaving the IP address undefined.
-     */
-    public static Binding binding(String hostPort) {
-        return new Binding(null, hostPort);
-    }
-
     /**
      * A {@link Binding} represents a socket on the Docker host that is used in a {@link PortBinding}. It is characterized by an
-     * {@link #getHostIp() IP address} and a {@link #getHostPort() port number}. Both properties may be <code>null</code> in order to let
-     * Docker assign them dynamically/using defaults.
+     * {@link #getHostIp() IP address} and a {@link #getHostPortSpec() port spec}. Both properties may be <code>null</code> in order to
+     * let Docker assign them dynamically/using defaults.
      *
      * @see Ports#bind(ExposedPort, Binding)
      * @see ExposedPort
@@ -132,44 +118,74 @@ public static Binding binding(String hostPort) {
     public static class Binding {
 
         /**
-         * Creates a {@link Binding} for the given {@link #getHostPort() port number or range}, leaving the {@link #getHostIp() IP address}
+         * Creates a {@link Binding} for the given {@link #getHostPortSpec() port spec}, leaving the {@link #getHostIp() IP address}
          * undefined.
          *
          * @see Ports#bind(ExposedPort, Binding)
          * @see ExposedPort
          */
-        public static Binding forPort(String port) {
-            return new Binding(null, port);
+        public static Binding bindPortSpec(String portSpec) {
+            return new Binding(null, portSpec);
         }
 
         /**
-         * Creates a {@link Binding} for the given {@link #getHostIp() IP address}, leaving the {@link #getHostPort() port number}
+         * Creates a {@link Binding} for the given {@link #getHostIp() IP address}, leaving the {@link #getHostPortSpec() port spec}
          * undefined.
          */
-        public static Binding forIp(String hostIp) {
+        public static Binding bindIp(String hostIp) {
             return new Binding(hostIp, null);
         }
 
+        /**
+         * Creates a {@link Binding} for the given {@link #getHostIp() IP address} and port number.
+         */
+        public static Binding bindIpAndPort(String hostIp, int port) {
+            return new Binding(hostIp, "" + port);
+        }
+
+        /**
+         * Creates a {@link Binding} for the given {@link #getHostIp() IP address} and port range.
+         */
+        public static Binding bindIpAndPortRange(String hostIp, int lowPort, int highPort) {
+            return new Binding(hostIp, lowPort + "-" + highPort);
+        }
+
+        /**
+         * Creates a {@link Binding} for the given port range, leaving the {@link #getHostIp() IP address}
+         * undefined.
+         */
+        public static Binding bindPortRange(int lowPort, int highPort) {
+            return bindIpAndPortRange(null, lowPort, highPort);
+        }
+
+        /**
+         * Creates a {@link Binding} for the given port leaving the {@link #getHostIp() IP address}
+         * undefined.
+         */
+        public static Binding bindPort(int port) {
+            return bindIpAndPort(null, port);
+        }
+
+        /**
+         * Creates an empty {@link Binding}.
+         */
+        public static Binding empty() {
+            return new Binding(null, null);
+        }
+
         private final String hostIp;
 
-        private final String hostPort;
+        private final String hostPortSpec;
 
         /**
-         * Creates a {@link Binding} for the given {@link #getHostIp() IP address} and {@link #getHostPort() port number}.
+         * Creates a {@link Binding} for the given {@link #getHostIp() host IP address} and {@link #getHostPortSpec() host port spec}.
          *
          * @see Ports#bind(ExposedPort, Binding)
          * @see ExposedPort
          */
-        public Binding(String hostIp, String hostPort) {
+        public Binding(String hostIp, String hostPortSpec) {
             this.hostIp = isEmpty(hostIp) ? null : hostIp;
-            this.hostPort = hostPort;
-        }
-
-        /**
-         * Creates a {@link Binding} with both {@link #getHostIp() IP address} and {@link #getHostPort() port number} undefined.
-         */
-        public Binding() {
-            this(null, null);
+            this.hostPortSpec = hostPortSpec;
         }
 
         /**
@@ -181,16 +197,17 @@ public String getHostIp() {
         }
 
         /**
-         * @return the port number on the Docker host. May be <code>null</code>, in which case Docker will dynamically assign a port.
+         * @return the port spec for the binding on the Docker host. May reference a single port ("1234"), a port range ("1234-2345") or
+         *         <code>null</code>, in which case Docker will dynamically assign a port.
          */
-        public String getHostPort() {
-            return hostPort;
+        public String getHostPortSpec() {
+            return hostPortSpec;
         }
 
         /**
          * Parses a textual host and port specification (as used by the Docker CLI) to a {@link Binding}.
          * <p>
-         * Legal syntax: <code>IP|IP:port|port</code>
+         * Legal syntax: <code>IP|IP:portSpec|portSpec</code> where <code>portSpec</code> is either a single port or a port range
          *
          * @param serialized
          *            serialized the specification, e.g. <code>127.0.0.1:80</code>
@@ -201,7 +218,7 @@ public String getHostPort() {
         public static Binding parse(String serialized) throws IllegalArgumentException {
             try {
                 if (serialized.isEmpty()) {
-                    return new Binding();
+                    return Binding.empty();
                 }
 
                 String[] parts = serialized.split(":");
@@ -210,7 +227,7 @@ public static Binding parse(String serialized) throws IllegalArgumentException {
                         return new Binding(parts[0], parts[1]);
                     }
                     case 1: {
-                        return parts[0].contains(".") ? Binding.forIp(parts[0]) : Binding.forPort(parts[0]);
+                        return parts[0].contains(".") ? Binding.bindIp(parts[0]) : Binding.bindPortSpec(parts[0]);
                     }
                     default: {
                         throw new IllegalArgumentException();
@@ -230,11 +247,11 @@ public static Binding parse(String serialized) throws IllegalArgumentException {
         @Override
         public String toString() {
             if (isEmpty(hostIp)) {
-                return hostPort;
-            } else if (hostPort == null) {
+                return hostPortSpec;
+            } else if (hostPortSpec == null) {
                 return hostIp;
             } else {
-                return hostIp + ":" + hostPort;
+                return hostIp + ":" + hostPortSpec;
             }
         }
 
@@ -242,7 +259,7 @@ public String toString() {
         public boolean equals(Object obj) {
             if (obj instanceof Binding) {
                 Binding other = (Binding) obj;
-                return new EqualsBuilder().append(hostIp, other.getHostIp()).append(hostPort, other.getHostPort())
+                return new EqualsBuilder().append(hostIp, other.getHostIp()).append(hostPortSpec, other.getHostPortSpec())
                         .isEquals();
             } else {
                 return super.equals(obj);
@@ -293,7 +310,7 @@ public void serialize(Ports portBindings, JsonGenerator jsonGen, SerializerProvi
                     for (Binding binding : entry.getValue()) {
                         jsonGen.writeStartObject();
                         jsonGen.writeStringField("HostIp", binding.getHostIp() == null ? "" : binding.getHostIp());
-                        jsonGen.writeStringField("HostPort", binding.getHostPort() == null ? "" : binding.getHostPort());
+                        jsonGen.writeStringField("HostPort", binding.getHostPortSpec() == null ? "" : binding.getHostPortSpec());
                         jsonGen.writeEndObject();
                     }
                     jsonGen.writeEndArray();
diff --git a/src/test/java/com/github/dockerjava/api/model/BindingTest.java b/src/test/java/com/github/dockerjava/api/model/BindingTest.java
index 290e66b82..3b5ea2f6a 100644
--- a/src/test/java/com/github/dockerjava/api/model/BindingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/BindingTest.java
@@ -10,22 +10,22 @@ public class BindingTest {
 
     @Test
     public void parseIpAndPort() {
-        assertEquals(Binding.parse("127.0.0.1:80"), Ports.binding("127.0.0.1", "80"));
+        assertEquals(Binding.parse("127.0.0.1:80"), Binding.bindIpAndPort("127.0.0.1", 80));
     }
 
     @Test
     public void parsePortOnly() {
-        assertEquals(Binding.parse("80"), Ports.binding(null, "80"));
+        assertEquals(Binding.parse("80"), Binding.bindPort(80));
     }
 
     @Test
     public void parseIPOnly() {
-        assertEquals(Binding.parse("127.0.0.1"), Ports.binding("127.0.0.1", null));
+        assertEquals(Binding.parse("127.0.0.1"), Binding.bindIp("127.0.0.1"));
     }
 
     @Test
     public void parseEmptyString() {
-        assertEquals(Binding.parse(""), Ports.binding(null, null));
+        assertEquals(Binding.parse(""), Binding.empty());
     }
 
     // Strings can be used since it can be a range. Let the docker daemon do the validation.
diff --git a/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java b/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
index 296148177..7603c3f1b 100644
--- a/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
@@ -13,32 +13,32 @@ public class PortBindingTest {
     @Test
     public void fullDefinition() {
         assertEquals(PortBinding.parse("127.0.0.1:80:8080/tcp"),
-                new PortBinding(new Binding("127.0.0.1", "80"), TCP_8080));
+                new PortBinding(Binding.bindIpAndPort("127.0.0.1", 80), TCP_8080));
     }
 
     @Test
     public void noProtocol() {
-        assertEquals(PortBinding.parse("127.0.0.1:80:8080"), new PortBinding(new Binding("127.0.0.1", "80"), TCP_8080));
+        assertEquals(PortBinding.parse("127.0.0.1:80:8080"), new PortBinding(Binding.bindIpAndPort("127.0.0.1", 80), TCP_8080));
     }
 
     @Test
     public void noHostIp() {
-        assertEquals(PortBinding.parse("80:8080/tcp"), new PortBinding(Binding.forPort("80"), TCP_8080));
+        assertEquals(PortBinding.parse("80:8080/tcp"), new PortBinding(Binding.bindPort(80), TCP_8080));
     }
 
     @Test
     public void portsOnly() {
-        assertEquals(PortBinding.parse("80:8080"), new PortBinding(Binding.forPort("80"), TCP_8080));
+        assertEquals(PortBinding.parse("80:8080"), new PortBinding(Binding.bindPort(80), TCP_8080));
     }
 
     @Test
     public void exposedPortOnly() {
-        assertEquals(PortBinding.parse("8080"), new PortBinding(new Binding(), TCP_8080));
+        assertEquals(PortBinding.parse("8080"), new PortBinding(Binding.empty(), TCP_8080));
     }
 
     @Test
     public void dynamicHostPort() {
-        assertEquals(PortBinding.parse("127.0.0.1::8080"), new PortBinding(Binding.forIp("127.0.0.1"), TCP_8080));
+        assertEquals(PortBinding.parse("127.0.0.1::8080"), new PortBinding(Binding.bindIp("127.0.0.1"), TCP_8080));
     }
 
     @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing PortBinding 'nonsense'", enabled = false)
diff --git a/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java b/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
index 401ee4b44..26e815f3b 100644
--- a/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
@@ -17,9 +17,9 @@ public class Ports_addBindingsTest {
 
     private static final ExposedPort TCP_90 = ExposedPort.tcp(90);
 
-    private static final Binding BINDING_8080 = Ports.binding("8080");
+    private static final Binding BINDING_8080 = Binding.bindPort(8080);
 
-    private static final Binding BINDING_9090 = Ports.binding("9090");
+    private static final Binding BINDING_9090 = Binding.bindPort(9090);
 
     private Ports ports;
 
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 9ae4e3e98..8eea40eec 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -263,7 +263,7 @@ public void testBuildFromPrivateRegistry() throws Exception {
         CreateContainerResponse testregistry = dockerClient
                 .createContainerCmd("testregistry:2")
                 .withName("registry")
-                .withPortBindings(new PortBinding(Ports.Binding.forPort("5000"), ExposedPort.tcp(5000)))
+                .withPortBindings(new PortBinding(Ports.Binding.bindPortSpec("5000"), ExposedPort.tcp(5000)))
                 .withEnv("REGISTRY_AUTH=htpasswd", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm",
                         "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "REGISTRY_LOG_LEVEL=debug",
                         "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key")
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 05d2b6d0d..bc5a7d940 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -15,7 +15,9 @@
 import com.github.dockerjava.api.model.Ulimit;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
+import com.github.dockerjava.api.model.Ports.Binding;
 import com.github.dockerjava.client.AbstractDockerClientTest;
+
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -361,9 +363,9 @@ public void createContainerWithPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.binding("11022"));
-        portBindings.bind(tcp23, Ports.binding("11023"));
-        portBindings.bind(tcp23, Ports.binding("11024"));
+        portBindings.bind(tcp22, Binding.bindPort(11022));
+        portBindings.bind(tcp23, Binding.bindPort(11023));
+        portBindings.bind(tcp23, Binding.bindPort(11024));
 
         CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
@@ -377,13 +379,13 @@ public void createContainerWithPortBindings() throws DockerException {
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
-                is(equalTo(Ports.binding("11022"))));
+                is(equalTo(Binding.bindPort(11022))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
-                is(equalTo(Ports.binding("11023"))));
+                is(equalTo(Binding.bindPort(11023))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
-                is(equalTo(Ports.binding("11024"))));
+                is(equalTo(Binding.bindPort(11024))));
 
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index 4437eaaa7..2b32e00c5 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -15,7 +15,9 @@
 import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
+import com.github.dockerjava.api.model.Ports.Binding;
 import com.github.dockerjava.client.AbstractDockerClientTest;
+
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -188,9 +190,9 @@ public void startContainerWithPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.binding("11022"));
-        portBindings.bind(tcp23, Ports.binding("11023"));
-        portBindings.bind(tcp23, Ports.binding("11024"));
+        portBindings.bind(tcp22, Binding.bindPort(11022));
+        portBindings.bind(tcp23, Binding.bindPort(11023));
+        portBindings.bind(tcp23, Binding.bindPort(11024));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
@@ -208,13 +210,13 @@ public void startContainerWithPortBindings() throws DockerException {
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
-                is(equalTo(Ports.binding("11022"))));
+                is(equalTo(Binding.bindPort(11022))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
-                is(equalTo(Ports.binding("11023"))));
+                is(equalTo(Binding.bindPort(11023))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
-                is(equalTo(Ports.binding("11024"))));
+                is(equalTo(Binding.bindPort(11024))));
 
     }
 
@@ -225,8 +227,8 @@ public void startContainerWithRandomPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.binding(null));
-        portBindings.bind(tcp23, Ports.binding(null));
+        portBindings.bind(tcp22, Binding.empty());
+        portBindings.bind(tcp23, Binding.empty());
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).withPublishAllPorts(true).exec();
@@ -241,10 +243,10 @@ public void startContainerWithRandomPortBindings() throws DockerException {
 
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
-        assertThat(inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(tcp22)[0].getHostPort(),
+        assertThat(inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(tcp22)[0].getHostPortSpec(),
                 is(not(equalTo(String.valueOf(tcp22.getPort())))));
 
-        assertThat(inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(tcp23)[0].getHostPort(),
+        assertThat(inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(tcp23)[0].getHostPortSpec(),
                 is(not(equalTo(String.valueOf(tcp23.getPort())))));
 
     }
@@ -256,8 +258,8 @@ public void startContainerWithConflictingPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.binding("11022"));
-        portBindings.bind(tcp23, Ports.binding("11022"));
+        portBindings.bind(tcp22, Binding.bindPort(11022));
+        portBindings.bind(tcp23, Binding.bindPort(11022));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
diff --git a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
index 2f9ac934c..92975f38f 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
@@ -34,6 +34,7 @@
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.Ports.Binding;
 import com.github.dockerjava.core.command.BuildImageResultCallback;
 import com.github.dockerjava.core.command.PushImageResultCallback;
 import com.github.dockerjava.core.command.WaitContainerResultCallback;
@@ -255,7 +256,7 @@ public void testBuildFromPrivateRegistry() throws Exception {
         CreateContainerResponse testregistry = dockerClient
                 .createContainerCmd("testregistry:2")
                 .withName("registry")
-                .withPortBindings(new PortBinding(Ports.Binding.forPort("5000"), ExposedPort.tcp(5000)))
+                .withPortBindings(new PortBinding(Binding.bindPort(5000), ExposedPort.tcp(5000)))
                 .withEnv("REGISTRY_AUTH=htpasswd", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm",
                         "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "REGISTRY_LOG_LEVEL=debug",
                         "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key")
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
index 0daf4fb46..4231a5f72 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
@@ -10,11 +10,13 @@
 import com.github.dockerjava.api.model.Link;
 import com.github.dockerjava.api.model.LogConfig;
 import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.Ports.Binding;
 import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Ulimit;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -351,9 +353,9 @@ public void createContainerWithPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.binding("11022"));
-        portBindings.bind(tcp23, Ports.binding("11023"));
-        portBindings.bind(tcp23, Ports.binding("11024"));
+        portBindings.bind(tcp22, Binding.bindPort(11022));
+        portBindings.bind(tcp23, Binding.bindPort(11023));
+        portBindings.bind(tcp23, Binding.bindPort(11024));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
@@ -367,13 +369,13 @@ public void createContainerWithPortBindings() throws DockerException {
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
-                is(equalTo(Ports.binding("11022"))));
+                is(equalTo(Binding.bindPort(11022))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
-                is(equalTo(Ports.binding("11023"))));
+                is(equalTo(Binding.bindPort(11023))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
-                is(equalTo(Ports.binding("11024"))));
+                is(equalTo(Binding.bindPort(11024))));
 
     }
 
diff --git a/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
index 844274887..f4a36c2b1 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
@@ -15,8 +15,10 @@
 import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
+import com.github.dockerjava.api.model.Ports.Binding;
 import com.github.dockerjava.core.command.WaitContainerResultCallback;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -191,9 +193,9 @@ public void startContainerWithPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.binding("11022"));
-        portBindings.bind(tcp23, Ports.binding("11023"));
-        portBindings.bind(tcp23, Ports.binding("11024"));
+        portBindings.bind(tcp22, Binding.bindPort(11022));
+        portBindings.bind(tcp23, Binding.bindPort(11023));
+        portBindings.bind(tcp23, Binding.bindPort(11024));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
@@ -211,13 +213,13 @@ public void startContainerWithPortBindings() throws DockerException {
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
-                is(equalTo(Ports.binding("11022"))));
+                is(equalTo(Binding.bindPort(11022))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
-                is(equalTo(Ports.binding("11023"))));
+                is(equalTo(Binding.bindPort(11023))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
-                is(equalTo(Ports.binding("11024"))));
+                is(equalTo(Binding.bindPort(11024))));
 
     }
 
@@ -228,8 +230,8 @@ public void startContainerWithRandomPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.binding(null));
-        portBindings.bind(tcp23, Ports.binding(null));
+        portBindings.bind(tcp22, Binding.empty());
+        portBindings.bind(tcp23, Binding.empty());
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).withPublishAllPorts(true).exec();
@@ -244,10 +246,10 @@ public void startContainerWithRandomPortBindings() throws DockerException {
 
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
-        assertThat(inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(tcp22)[0].getHostPort(),
+        assertThat(inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(tcp22)[0].getHostPortSpec(),
                 is(not(equalTo(String.valueOf(tcp22.getPort())))));
 
-        assertThat(inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(tcp23)[0].getHostPort(),
+        assertThat(inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(tcp23)[0].getHostPortSpec(),
                 is(not(equalTo(String.valueOf(tcp23.getPort())))));
 
     }
@@ -259,8 +261,8 @@ public void startContainerWithConflictingPortBindings() throws DockerException {
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Ports.binding("11022"));
-        portBindings.bind(tcp23, Ports.binding("11022"));
+        portBindings.bind(tcp22, Binding.bindPort(11022));
+        portBindings.bind(tcp23, Binding.bindPort(11022));
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();

From 61869c8a75cd9e3e295aadacc74b92471b591d1f Mon Sep 17 00:00:00 2001
From: AE <ae@ae.nl>
Date: Mon, 9 May 2016 19:33:43 +0200
Subject: [PATCH 0514/1272] Adds tests for inspect command when size is used.

---
 .../command/InspectContainerCmdImplTest.java    | 17 +++++++++++++++++
 .../netty/exec/InspectContainerCmdExecTest.java | 15 +++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
index 47ed11201..2a20edc6e 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
@@ -63,6 +63,23 @@ public void inspectContainer() throws DockerException {
 
     }
 
+    @Test()
+    public void inspectContainerWithSize() throws DockerException {
+
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
+                .withName(containerName).exec();
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(container.getId())
+                                                             .withSize(true)
+                                                             .exec();
+        assertNotNull(containerInfo.getSizeRootFs());
+        assertEquals(containerInfo.getId(), container.getId());
+    }
+
     @Test(expectedExceptions = NotFoundException.class)
     public void inspectNonExistingContainer() throws DockerException {
         dockerClient.inspectContainerCmd("non-existing").exec();
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
index 87fe3b48b..8f38dde79 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
@@ -63,6 +63,21 @@ public void inspectContainer() throws DockerException {
 
     }
 
+    @Test()
+    public void inspectContainerWithSize() throws DockerException {
+
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
+                .withName(containerName).exec();
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(container.getId()).exec();
+        assertEquals(containerInfo.getId(), container.getId());
+        assertNotNull(containerInfo.getSizeRootFs());
+    }
+
     @Test(expectedExceptions = NotFoundException.class)
     public void inspectNonExistingContainer() throws DockerException {
         dockerClient.inspectContainerCmd("non-existing").exec();

From d2b2a2dde55f367831a749f6246438d08e4522b5 Mon Sep 17 00:00:00 2001
From: Lappas Dionysis <dio@freelabs.net>
Date: Mon, 9 May 2016 20:41:27 +0300
Subject: [PATCH 0515/1272] Added Test Case that simulates failure on
 copyArchiveToContainerCmdImpl when last tar entry is an empty dir

---
 .../CopyArchiveToContainerCmdImplTest.java    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
index 0f8f2164b..06967706f 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
@@ -90,5 +90,32 @@ public void copyToNonExistingContainer() throws Exception {
         } catch (NotFoundException ignored) {
         }
     }
+    
+    @Test 
+    public void copyDirWithLastAddedTarEnryEmptyDir() throws Exception{
+        // create a temp dir
+        Path localDir = Files.createTempDirectory("");
+        localDir.toFile().deleteOnExit();
+        // create sub-dir with name b
+        Path emptyDir = Files.createTempDirectory(localDir.resolve("b"), "");
+        emptyDir.toFile().deleteOnExit();
+        // creaet sub-dir with name a
+        Path dirWithFile = Files.createTempDirectory(localDir.resolve("a"), "");
+        dirWithFile.toFile().deleteOnExit();
+        // create file in sub-dir b, name or conter are irrelevant
+        Path file = Files.createTempFile(dirWithFile.resolve("file"), "", "");
+        file.toFile().deleteOnExit();
+        
+        // create a test container
+        CreateContainerResponse container = dockerClient.createContainerCmd("progrium/busybox:latest")
+                .withCmd("/bin/sh", "-c", "while true; do sleep 9999; done")
+                .exec();
+        // start the container
+        dockerClient.startContainerCmd(container.getId()).exec();
+        // copy data from local dir to container 
+        dockerClient.copyArchiveToContainerCmd(container.getId())
+                .withHostResource(localDir.toString())
+                .exec();
+    }
 
 }

From 72b2e73a686c39851c177cc440725ef2f888de9d Mon Sep 17 00:00:00 2001
From: AE <ae@ae.nl>
Date: Mon, 9 May 2016 19:58:00 +0200
Subject: [PATCH 0516/1272] Strenghten tests for withSize in InspectContainer.

---
 .../core/command/InspectContainerCmdImplTest.java      | 10 ++++++----
 .../netty/exec/InspectContainerCmdExecTest.java        |  7 ++++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
index 2a20edc6e..c0eaab3a6 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
@@ -8,6 +8,7 @@
 import java.lang.reflect.Method;
 import java.security.SecureRandom;
 
+import com.github.dockerjava.api.command.InspectContainerCmd;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.ITestResult;
@@ -73,11 +74,12 @@ public void inspectContainerWithSize() throws DockerException {
         LOG.info("Created container {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(container.getId())
-                                                             .withSize(true)
-                                                             .exec();
-        assertNotNull(containerInfo.getSizeRootFs());
+        InspectContainerCmd command = dockerClient.inspectContainerCmd(container.getId()).withSize(true);
+        assertTrue(command.getSize());
+        InspectContainerResponse containerInfo  = command.exec();
         assertEquals(containerInfo.getId(), container.getId());
+        assertNotNull(containerInfo.getSizeRootFs());
+        assertTrue(containerInfo.getSizeRootFs().intValue() > 0 );
     }
 
     @Test(expectedExceptions = NotFoundException.class)
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
index 8f38dde79..af32cebce 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
@@ -8,6 +8,7 @@
 import java.lang.reflect.Method;
 import java.security.SecureRandom;
 
+import com.github.dockerjava.api.command.InspectContainerCmd;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.ITestResult;
@@ -73,9 +74,13 @@ public void inspectContainerWithSize() throws DockerException {
         LOG.info("Created container {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerCmd command = dockerClient.inspectContainerCmd(container.getId())
+                                                      .withSize(true);
+        assertTrue(command.getSize());
+        InspectContainerResponse containerInfo  = command.exec();
         assertEquals(containerInfo.getId(), container.getId());
         assertNotNull(containerInfo.getSizeRootFs());
+        assertTrue(containerInfo.getSizeRootFs().intValue() > 0 );
     }
 
     @Test(expectedExceptions = NotFoundException.class)

From 8af6f2f6437aec20c4ce3501d8843eb4c60d69d7 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Mon, 9 May 2016 21:54:53 +0200
Subject: [PATCH 0517/1272] Polish test and comment

---
 src/main/java/com/github/dockerjava/api/model/ExposedPort.java | 2 +-
 .../github/dockerjava/core/command/BuildImageCmdImplTest.java  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/ExposedPort.java b/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
index 4e30c8df0..ec95f6273 100644
--- a/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
+++ b/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
@@ -65,7 +65,7 @@ public ExposedPort(int port) {
      * @param scheme
      *            the {@link #getScheme() scheme}, <code>tcp</code> or <code>udp</code>
      * @param port
-     *            the {@link #getPort() port number or port range}
+     *            the {@link #getPort() port number}
      * @deprecated use {@link #ExposedPort(int, InternetProtocol)}
      */
     @Deprecated
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 8eea40eec..c0dc967d4 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -34,6 +34,7 @@
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.Ports.Binding;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import com.github.dockerjava.core.util.CompressArchiveUtil;
 
@@ -263,7 +264,7 @@ public void testBuildFromPrivateRegistry() throws Exception {
         CreateContainerResponse testregistry = dockerClient
                 .createContainerCmd("testregistry:2")
                 .withName("registry")
-                .withPortBindings(new PortBinding(Ports.Binding.bindPortSpec("5000"), ExposedPort.tcp(5000)))
+                .withPortBindings(new PortBinding(Binding.bindPort(5000), ExposedPort.tcp(5000)))
                 .withEnv("REGISTRY_AUTH=htpasswd", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm",
                         "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "REGISTRY_LOG_LEVEL=debug",
                         "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key")

From 8b5badadca35dfb8f96f398aad5aaa942a064fe1 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Mon, 9 May 2016 22:35:55 +0200
Subject: [PATCH 0518/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f88303a1c..235b87622 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ Notes
 
 All changes
 
+* [#575] (https://github.com/docker-java/docker-java/pull/575) Support binding of port ranges
 * [#563] (https://github.com/docker-java/docker-java/pull/563) Fix memory leak in netty implementation of DockerCmdExecFactory
 
 Included in 3.0.0-RC5

From 572a1eafe84397abaf4c93f882e71b6b49c2d27e Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Mon, 9 May 2016 23:27:56 +0200
Subject: [PATCH 0519/1272] Polish tests

---
 .../CopyArchiveToContainerCmdImpl.java        |  8 ++---
 .../CopyArchiveToContainerCmdImplTest.java    | 33 ++++++++++---------
 .../CopyArchiveToContainerCmdExecTest.java    | 28 ++++++++++++++++
 3 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
index 3a35b3508..0f734fde9 100644
--- a/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
@@ -12,7 +12,7 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
-import com.github.dockerjava.api.exception.BadRequestException;
+import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.core.util.CompressArchiveUtil;
 
@@ -127,7 +127,7 @@ public Void exec() throws NotFoundException {
         if (StringUtils.isNotEmpty(this.hostResource)) {
             // User set host resource and not directly a stream
             if (this.tarInputStream != null) {
-                throw new BadRequestException(
+                throw new DockerClientException(
                         "Only one of host resource or tar input stream should be defined to perform the copy, not both");
             }
             // We compress the given path, call exec so that the stream is consumed and then close it our self
@@ -135,10 +135,10 @@ public Void exec() throws NotFoundException {
                 this.tarInputStream = uploadStream;
                 return super.exec();
             } catch (IOException e) {
-                throw new BadRequestException("Unable to perform tar on host resource " + this.hostResource);
+                throw new DockerClientException("Unable to perform tar on host resource " + this.hostResource, e);
             }
         } else if (this.tarInputStream == null) {
-            throw new BadRequestException(
+            throw new DockerClientException(
                     "One of host resource or tar input stream must be defined to perform the copy");
         }
         // User set a stream, so we will just consume it and let the user close it by him self
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
index 06967706f..b8ede3416 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
@@ -11,6 +11,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import org.apache.commons.io.FileUtils;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -90,32 +91,32 @@ public void copyToNonExistingContainer() throws Exception {
         } catch (NotFoundException ignored) {
         }
     }
-    
-    @Test 
-    public void copyDirWithLastAddedTarEnryEmptyDir() throws Exception{
+
+    @Test
+    public void copyDirWithLastAddedTarEntryEmptyDir() throws Exception{
         // create a temp dir
-        Path localDir = Files.createTempDirectory("");
+        Path localDir = Files.createTempDirectory(null);
         localDir.toFile().deleteOnExit();
-        // create sub-dir with name b
-        Path emptyDir = Files.createTempDirectory(localDir.resolve("b"), "");
-        emptyDir.toFile().deleteOnExit();
-        // creaet sub-dir with name a
-        Path dirWithFile = Files.createTempDirectory(localDir.resolve("a"), "");
-        dirWithFile.toFile().deleteOnExit();
+        // create empty sub-dir with name b
+        Files.createDirectory(localDir.resolve("b"));
+        // create sub-dir with name a
+        Path dirWithFile = Files.createDirectory(localDir.resolve("a"));
         // create file in sub-dir b, name or conter are irrelevant
-        Path file = Files.createTempFile(dirWithFile.resolve("file"), "", "");
-        file.toFile().deleteOnExit();
-        
+        Files.createFile(dirWithFile.resolve("file"));
+
         // create a test container
-        CreateContainerResponse container = dockerClient.createContainerCmd("progrium/busybox:latest")
-                .withCmd("/bin/sh", "-c", "while true; do sleep 9999; done")
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCmd("sleep", "9999")
                 .exec();
         // start the container
         dockerClient.startContainerCmd(container.getId()).exec();
-        // copy data from local dir to container 
+        // copy data from local dir to container
         dockerClient.copyArchiveToContainerCmd(container.getId())
                 .withHostResource(localDir.toString())
                 .exec();
+
+        // cleanup dir
+        FileUtils.deleteDirectory(localDir.toFile());
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExecTest.java
index d755dfcba..9e9b0c731 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExecTest.java
@@ -11,6 +11,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import org.apache.commons.io.FileUtils;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -91,4 +92,31 @@ public void copyToNonExistingContainer() throws Exception {
         }
     }
 
+    @Test
+    public void copyDirWithLastAddedTarEntryEmptyDir() throws Exception{
+        // create a temp dir
+        Path localDir = Files.createTempDirectory(null);
+        localDir.toFile().deleteOnExit();
+        // create empty sub-dir with name b
+        Files.createDirectory(localDir.resolve("b"));
+        // create sub-dir with name a
+        Path dirWithFile = Files.createDirectory(localDir.resolve("a"));
+        // create file in sub-dir b, name or conter are irrelevant
+        Files.createFile(dirWithFile.resolve("file"));
+
+        // create a test container
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCmd("sleep", "9999")
+                .exec();
+        // start the container
+        dockerClient.startContainerCmd(container.getId()).exec();
+        // copy data from local dir to container
+        dockerClient.copyArchiveToContainerCmd(container.getId())
+                .withHostResource(localDir.toString())
+                .exec();
+
+        // cleanup dir
+        FileUtils.deleteDirectory(localDir.toFile());
+    }
+
 }

From 1f85b7dfacc447cfdf5e66df4e142620a6753ce0 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Mon, 9 May 2016 23:30:44 +0200
Subject: [PATCH 0520/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 235b87622..4e93dd737 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ Notes
 All changes
 
 * [#575] (https://github.com/docker-java/docker-java/pull/575) Support binding of port ranges
+* [#574] (https://github.com/docker-java/docker-java/pull/574) Fix for copyArchiveToContainerCmd bug
 * [#563] (https://github.com/docker-java/docker-java/pull/563) Fix memory leak in netty implementation of DockerCmdExecFactory
 
 Included in 3.0.0-RC5

From 28e11ed2af5ea3ef3dc73a067467d9fb9f8bda19 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Wed, 11 May 2016 21:23:51 +0200
Subject: [PATCH 0521/1272] Fix issue #551

---
 .../core/command/BuildImageCmdImpl.java       |  2 +-
 .../core/dockerfile/Dockerfile.java           | 26 ++++++++++++-------
 .../core/command/BuildImageCmdImplTest.java   | 19 ++++++++++++--
 .../DockerfileAddMultipleFilesTest.java       |  2 +-
 .../core/dockerfile/DockerfileTest.java       |  2 +-
 .../dockerfileFolder/Dockerfile               |  7 +++++
 .../testrunFolder/testrun.sh                  |  3 +++
 7 files changed, 46 insertions(+), 15 deletions(-)
 create mode 100644 src/test/resources/testDockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile
 create mode 100755 src/test/resources/testDockerfileNotInBaseDirectory/testrunFolder/testrun.sh

diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index 58f148cb6..487f0b264 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -272,7 +272,7 @@ public BuildImageCmdImpl withDockerfile(File dockerfile) {
         this.dockerFile = dockerfile;
 
         try {
-            withTarInputStream(new Dockerfile(dockerfile).parse().buildDockerFolderTar(baseDirectory));
+            withTarInputStream(new Dockerfile(dockerfile, baseDirectory).parse().buildDockerFolderTar());
         } catch (IOException e) {
             // we just created the file this should never happen.
             throw new RuntimeException(e);
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 8c1c34e2a..c970d6c2d 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -31,8 +31,9 @@ public class Dockerfile {
 
     public final File dockerFile;
 
-    public Dockerfile(File dockerFile) {
+    private final File baseDirectory;
 
+    public Dockerfile(File dockerFile, File baseDirectory) {
         if (!dockerFile.exists()) {
             throw new IllegalStateException(String.format("Dockerfile %s does not exist", dockerFile.getAbsolutePath()));
         }
@@ -43,6 +44,15 @@ public Dockerfile(File dockerFile) {
 
         this.dockerFile = dockerFile;
 
+        if (!baseDirectory.exists()) {
+            throw new IllegalStateException(String.format("Base directory %s does not exist", baseDirectory.getAbsolutePath()));
+        }
+
+        if (!baseDirectory.isDirectory()) {
+            throw new IllegalStateException(String.format("Base directory %s is not a directory", baseDirectory.getAbsolutePath()));
+        }
+
+        this.baseDirectory = baseDirectory;
     }
 
     private static class LineTransformer implements Function<String, Optional<? extends DockerfileStatement>> {
@@ -76,7 +86,7 @@ public Iterable<DockerfileStatement> getStatements() throws IOException {
 
     public List<String> getIgnores() throws IOException {
         List<String> ignores = new ArrayList<String>();
-        File dockerIgnoreFile = new File(getDockerFolder(), ".dockerignore");
+        File dockerIgnoreFile = new File(baseDirectory, ".dockerignore");
         if (dockerIgnoreFile.exists()) {
             int lineNumber = 0;
             List<String> dockerIgnoreFileContent = FileUtils.readLines(dockerIgnoreFile);
@@ -102,10 +112,6 @@ public ScannedResult parse() throws IOException {
         return new ScannedResult();
     }
 
-    public File getDockerFolder() {
-        return dockerFile.getParentFile();
-    }
-
     /**
      * Result of scanning / parsing a docker file.
      */
@@ -116,7 +122,7 @@ public class ScannedResult {
         final List<File> filesToAdd = new ArrayList<File>();
 
         public InputStream buildDockerFolderTar() {
-            return buildDockerFolderTar(getDockerFolder());
+            return buildDockerFolderTar(baseDirectory);
         }
 
         public InputStream buildDockerFolderTar(File directory) {
@@ -180,7 +186,7 @@ public ScannedResult() throws IOException {
                         "Dockerfile is excluded by pattern '%s' in .dockerignore file", matchingIgnorePattern));
             }
 
-            Collection<File> filesInBuildContext = FileUtils.listFiles(getDockerFolder(), TrueFileFilter.INSTANCE,
+            Collection<File> filesInBuildContext = FileUtils.listFiles(baseDirectory, TrueFileFilter.INSTANCE,
                     TrueFileFilter.INSTANCE);
 
             for (File f : filesInBuildContext) {
@@ -217,7 +223,7 @@ private List<String> matchingIgnorePatterns(String fileName) {
          * will be respected.
          */
         private String effectiveMatchingIgnorePattern(File file) {
-            String relativeFilename = FilePathUtil.relativize(getDockerFolder(), file);
+            String relativeFilename = FilePathUtil.relativize(baseDirectory, file);
 
             List<String> matchingPattern = matchingIgnorePatterns(relativeFilename);
 
@@ -242,6 +248,6 @@ private String effectiveMatchingIgnorePattern(File file) {
             }
 
             return lastMatchingPattern;
-        }
+         }
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index c0dc967d4..950b80a24 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -24,16 +24,15 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.command.InspectImageResponse;
+import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.PortBinding;
-import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.Ports.Binding;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import com.github.dockerjava.core.util.CompressArchiveUtil;
@@ -319,4 +318,20 @@ public void testBuildArgs() throws Exception {
 
         assertThat(inspectImageResponse.getConfig().getLabels().get("test"), equalTo("abc"));
     }
+
+    public void testDockerfileNotInBaseDirectory() throws Exception {
+        File baseDirectory = getResource("testDockerfileNotInBaseDirectory");
+        File dockerfile = getResource("testDockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile");
+        BuildImageCmd command = dockerClient.buildImageCmd()
+                .withBaseDirectory(baseDirectory)
+                .withDockerfile(dockerfile);
+
+        String response = execBuild(command);
+
+        assertThat(response, containsString("Successfully executed testrun.sh"));
+    }
+
+    private File getResource(String path) {
+        return new File(Thread.currentThread().getContextClassLoader().getResource(path).getFile());
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
index 0752aded5..8997a6d80 100644
--- a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
+++ b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
@@ -29,7 +29,7 @@ public String apply(File file) {
     public void testAddMultipleFiles() throws IOException {
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddMultipleFiles")
                 .getFile());
-        Dockerfile dockerfile = new Dockerfile(new File(baseDir, "Dockerfile"));
+        Dockerfile dockerfile = new Dockerfile(new File(baseDir, "Dockerfile"), baseDir);
         Dockerfile.ScannedResult result = dockerfile.parse();
         Collection<String> filesToAdd = transform(result.filesToAdd, TO_FILE_NAMES);
 
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java
index ba96ad2eb..390bcf647 100644
--- a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java
+++ b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java
@@ -26,7 +26,7 @@ public void testAllItems() throws IOException {
 
         for (File child : root.listFiles()) {
             if (new File(child, "Dockerfile").exists()) {
-                Dockerfile dockerfile = new Dockerfile(new File(child, "Dockerfile"));
+                Dockerfile dockerfile = new Dockerfile(new File(child, "Dockerfile"), baseDir);
                 dockerfiles.put(child.getName(), dockerfile);
             }
         }
diff --git a/src/test/resources/testDockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile b/src/test/resources/testDockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile
new file mode 100644
index 000000000..9bf10088b
--- /dev/null
+++ b/src/test/resources/testDockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile
@@ -0,0 +1,7 @@
+FROM ubuntu:latest
+
+ADD	testrunFolder/testrun.sh       /tmp/
+
+RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh
+
+CMD ["testrun.sh"]
\ No newline at end of file
diff --git a/src/test/resources/testDockerfileNotInBaseDirectory/testrunFolder/testrun.sh b/src/test/resources/testDockerfileNotInBaseDirectory/testrunFolder/testrun.sh
new file mode 100755
index 000000000..14259aa77
--- /dev/null
+++ b/src/test/resources/testDockerfileNotInBaseDirectory/testrunFolder/testrun.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "Successfully executed testrun.sh"
\ No newline at end of file

From f6edaaad38a3c0451f3c6d923a27e3592fca830f Mon Sep 17 00:00:00 2001
From: "Ciro S. Costa" <ciro9758@gmail.com>
Date: Thu, 12 May 2016 13:47:10 -0300
Subject: [PATCH 0522/1272] Adds namefilteer to netty's ListimagesCmdExec

Previously just jaxrs had implemented the feature of filtering by image
name. Even though the `withFilter` was exposed, netty's implemntation
didn't checked for its presence.

The commits adds a test for such feature and the correctionn to the
mentioned problem.
---
 .../dockerjava/netty/exec/ListImagesCmdExec.java     |  4 ++++
 .../dockerjava/netty/exec/ListImagesCmdExecTest.java | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java
index 0d1b81962..a1a38add5 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java
@@ -33,6 +33,10 @@ protected List<Image> execute(ListImagesCmd command) {
             webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
         }
 
+       if (command.getImageNameFilter() != null) {
+            webTarget = webTarget.queryParam("filter", urlPathSegmentEscaper().escape(command.getImageNameFilter()));
+       }
+
         LOGGER.trace("GET: {}", webTarget);
 
         List<Image> images = webTarget.request().accept(MediaType.APPLICATION_JSON)
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java
index c83fa7ef9..170a8479f 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java
@@ -75,6 +75,18 @@ public void listImagesWithDanglingFilter() throws DockerException {
         assertTrue(imageInFilteredList);
     }
 
+    @Test
+    public void listImagesWithNameFilter() throws DockerException {
+        String imageId = createDanglingImage();
+        dockerClient.tagImageCmd(imageId, "test_repository", "latest").exec();
+        List<Image> images = dockerClient.listImagesCmd().withImageNameFilter("test_repository:latest").exec();
+        assertThat(images, notNullValue());
+        LOG.info("Images List: {}", images);
+        assertThat(images.size(), is(equalTo(1)));
+        Boolean imageInFilteredList = isImageInFilteredList(images, imageId);
+        assertTrue(imageInFilteredList);
+    }
+
     private boolean isImageInFilteredList(List<Image> images, String expectedImageId) {
         for (Image image : images) {
             if (expectedImageId.equals(image.getId())) {

From 7ab0418022e9a1591c8c76c2213e946c58914b91 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 12 May 2016 19:35:25 +0200
Subject: [PATCH 0523/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e93dd737..242d575f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ Notes
 
 All changes
 
+* [#578] (https://github.com/docker-java/docker-java/pull/578)  Fix error during image build when Dockerfile in subdirectory of build context
 * [#575] (https://github.com/docker-java/docker-java/pull/575) Support binding of port ranges
 * [#574] (https://github.com/docker-java/docker-java/pull/574) Fix for copyArchiveToContainerCmd bug
 * [#563] (https://github.com/docker-java/docker-java/pull/563) Fix memory leak in netty implementation of DockerCmdExecFactory

From 0533459c533bf58ff3fcd66603849f7589d62cf7 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 12 May 2016 20:13:39 +0200
Subject: [PATCH 0524/1272] Polish inspect container with rootFS size

---
 .../com/github/dockerjava/api/command/InspectContainerCmd.java | 2 +-
 .../dockerjava/core/command/InspectContainerCmdImpl.java       | 2 +-
 .../com/github/dockerjava/jaxrs/InspectContainerCmdExec.java   | 3 ++-
 .../github/dockerjava/netty/exec/InspectContainerCmdExec.java  | 2 ++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
index c0f666fa3..bbb0159f8 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
@@ -14,7 +14,7 @@ public interface InspectContainerCmd extends SyncDockerCmd<InspectContainerRespo
 
     InspectContainerCmd withSize(Boolean showSize);
 
-    boolean getSize();
+    Boolean getSize();
 
     /**
      * @throws NotFoundException
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
index b6ba08540..ed3c01b00 100644
--- a/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
@@ -39,7 +39,7 @@ public InspectContainerCmd withSize(Boolean showSize) {
     }
 
     @Override
-    public boolean getSize() {
+    public Boolean getSize() {
         return size;
     }
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
index 2edbe2d29..0599f04a1 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
@@ -22,9 +22,10 @@ public InspectContainerCmdExec(WebTarget baseResource, DockerClientConfig docker
     @Override
     protected InspectContainerResponse execute(InspectContainerCmd command) {
         WebTarget webResource = getBaseResource().path("/containers/{id}/json")
-                                                 .queryParam("size", command.getSize())
                                                  .resolveTemplate("id", command.getContainerId());
 
+        webResource = booleanQueryParam(webResource, "size", command.getSize());
+
         LOGGER.debug("GET: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectContainerResponse.class);
     }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/InspectContainerCmdExec.java
index e8f691ba1..b6a4a06f2 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/InspectContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/InspectContainerCmdExec.java
@@ -24,6 +24,8 @@ protected InspectContainerResponse execute(InspectContainerCmd command) {
         WebTarget webResource = getBaseResource().path("/containers/{id}/json").resolveTemplate("id",
                 command.getContainerId());
 
+        webResource = booleanQueryParam(webResource, "size", command.getSize());
+
         LOGGER.debug("GET: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_JSON)
                 .get(new TypeReference<InspectContainerResponse>() {

From d4b3be163fc8fc01a2c16d578eda1a7eeebd9fa4 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 12 May 2016 20:15:32 +0200
Subject: [PATCH 0525/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 242d575f3..44358e876 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,9 +10,10 @@ Notes
 
 All changes
 
-* [#578] (https://github.com/docker-java/docker-java/pull/578)  Fix error during image build when Dockerfile in subdirectory of build context
+* [#578] (https://github.com/docker-java/docker-java/pull/578) Fix error during image build when Dockerfile in subdirectory of build context
 * [#575] (https://github.com/docker-java/docker-java/pull/575) Support binding of port ranges
 * [#574] (https://github.com/docker-java/docker-java/pull/574) Fix for copyArchiveToContainerCmd bug
+* [#572] (https://github.com/docker-java/docker-java/pull/572) Inspect container command now shows sizes if requested 
 * [#563] (https://github.com/docker-java/docker-java/pull/563) Fix memory leak in netty implementation of DockerCmdExecFactory
 
 Included in 3.0.0-RC5

From 763559fbfa371d40bc96d3955d4fd8562718c090 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 12 May 2016 21:04:58 +0200
Subject: [PATCH 0526/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44358e876..ad9ddbba7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ All changes
 * [#574] (https://github.com/docker-java/docker-java/pull/574) Fix for copyArchiveToContainerCmd bug
 * [#572] (https://github.com/docker-java/docker-java/pull/572) Inspect container command now shows sizes if requested 
 * [#563] (https://github.com/docker-java/docker-java/pull/563) Fix memory leak in netty implementation of DockerCmdExecFactory
+* [#550] (https://github.com/docker-java/docker-java/pull/550) Add ability to configure IPAM config for CreateNetworkCmd 
 
 Included in 3.0.0-RC5
 

From e0d418b401308fe24814b249944036be01b4affd Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 12 May 2016 23:53:57 +0200
Subject: [PATCH 0527/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad9ddbba7..75f0f9dc7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ Notes
 
 All changes
 
+* [#579] (https://github.com/docker-java/docker-java/pull/579) Adds missing name filter evaluation to netty version of ListImagesCmdExec 
 * [#578] (https://github.com/docker-java/docker-java/pull/578) Fix error during image build when Dockerfile in subdirectory of build context
 * [#575] (https://github.com/docker-java/docker-java/pull/575) Support binding of port ranges
 * [#574] (https://github.com/docker-java/docker-java/pull/574) Fix for copyArchiveToContainerCmd bug

From f4dc5637965064c8627137c08511dfc2a84b2aec Mon Sep 17 00:00:00 2001
From: Lappas Dionysis <dio@freelabs.net>
Date: Sat, 14 May 2016 23:58:45 +0300
Subject: [PATCH 0528/1272] Fixes execute permissions for files inside a dir
 added to tar using copyArchiveToContainerCmdIml.

Files added to tar are stored with 644 permission mode. As a result, execute permissions are discarded. This fix retains permissions for files inside directories copied with copyArchiveToContainerCmdIml.
---
 .../java/com/github/dockerjava/core/util/TarDirWalker.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java b/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
index af263ee9c..3c5336a28 100644
--- a/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
+++ b/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
@@ -33,8 +33,11 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) th
 
     @Override
     public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-        CompressArchiveUtil.putTarEntry(tarArchiveOutputStream,
-                new TarArchiveEntry(FilePathUtil.relativize(basePath, file)), file);
+        TarArchiveEntry tarEntry = new TarArchiveEntry(FilePathUtil.relativize(basePath, file));
+        if (filePath.toFile().canExecute()) {
+                tarEntry.setMode(tarEntry.getMode() | 0755);
+        }
+        CompressArchiveUtil.putTarEntry(tarArchiveOutputStream, tarEntry, file);
         return FileVisitResult.CONTINUE;
     }
 

From e229005fd43e9e8d89d52f115ad096947cfd6b14 Mon Sep 17 00:00:00 2001
From: Lappas Dionysis <dio@freelabs.net>
Date: Sun, 15 May 2016 00:02:44 +0300
Subject: [PATCH 0529/1272]  Fixes execute permissions for files not contained
 in any dir that are added to tar using copyArchiveToContainerCmdIml.

---
 .../github/dockerjava/core/util/CompressArchiveUtil.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
index 5052dda40..a4616514e 100644
--- a/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
+++ b/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
@@ -67,7 +67,11 @@ public static void tar(Path inputPath, Path outputPath, boolean gZipped, boolean
 
         try (TarArchiveOutputStream tarArchiveOutputStream = buildTarStream(outputPath, gZipped)) {
             if (!Files.isDirectory(inputPath)) {
-                putTarEntry(tarArchiveOutputStream, new TarArchiveEntry(inputPath.getFileName().toString()), inputPath);
+                TarArchiveEntry tarEntry = new TarArchiveEntry(inputPath.getFileName().toString());
+                if (filePath.toFile().canExecute()) {
+                    tarEntry.setMode(tarEntry.getMode() | 0755);
+                }
+                putTarEntry(tarArchiveOutputStream, tarEntry, inputPath);
             } else {
                 Path sourcePath = inputPath;
                 if (!childrenOnly) {

From cc93a1fb54bea392cf0c2da5c82ab190a2f921bd Mon Sep 17 00:00:00 2001
From: Lappas Dionysis <dio@freelabs.net>
Date: Sun, 15 May 2016 01:15:58 +0300
Subject: [PATCH 0530/1272] Added Test Case for CopyArchiveToContainerCmdImpl
 when copying files with execute permission.

Test Case that simulates a scenario where a script file with permission to execute is copied to the containers with CopyArchiveToContainerCmdImpl and then it is executed.
---
 .../CopyArchiveToContainerCmdImplTest.java    | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
index 06967706f..04117aba7 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
@@ -3,6 +3,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isEmptyOrNullString;
 import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.equalTo;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -117,5 +118,39 @@ public void copyDirWithLastAddedTarEnryEmptyDir() throws Exception{
                 .withHostResource(localDir.toString())
                 .exec();
     }
+    
+    @Test
+    public void copyFileWithExecutePermission() throws Exception {
+        // create script file, add permission to execute
+        scriptPath = Files.createTempFile("run", ".sh");
+        boolean executable = scriptPath.toFile().setExecutable(true, false);
+        if (!executable){
+            throw new Exception("Execute permission on file not set!");
+        }
+        String snippet = "Running script with execute permission.";
+        String scriptTextStr = "#!/bin/sh\necho \"" + snippet + "\"";
+        // write content for created script
+        Files.write(scriptPath, scriptTextStr.getBytes());
+        // create a test container which starts and waits 3 seconds for the
+        // script to be copied to the container's home dir and then executes it
+        String containerCmd = "sleep 3; /home/" + scriptPath.getFileName().toString();
+        CreateContainerResponse container = docker.createContainerCmd("busybox")
+                .withName("test")
+                .withCmd("/bin/sh", "-c", containerCmd)
+                .exec();
+        // start the container
+        docker.startContainerCmd(container.getId()).exec();
+        // copy script to container home dir
+        docker.copyArchiveToContainerCmd(container.getId())
+                .withRemotePath("/home")
+                .withHostResource(scriptPath.toString())
+                .exec();
+        // await exid code
+        int exitCode = docker.waitContainerCmd(container.getId())
+                .exec(new WaitContainerResultCallback())
+                .awaitStatusCode();
+        // check result
+        assertThat(exitCode, equalTo(0));
+    }
 
 }

From d3918c3ff3e17dbb4cf3442bae0aa1b22c8ef857 Mon Sep 17 00:00:00 2001
From: Lappas Dionysis <dio@freelabs.net>
Date: Sun, 15 May 2016 01:52:35 +0300
Subject: [PATCH 0531/1272] Fixed input file name

---
 .../com/github/dockerjava/core/util/CompressArchiveUtil.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
index a4616514e..2e75bcc41 100644
--- a/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
+++ b/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
@@ -68,7 +68,7 @@ public static void tar(Path inputPath, Path outputPath, boolean gZipped, boolean
         try (TarArchiveOutputStream tarArchiveOutputStream = buildTarStream(outputPath, gZipped)) {
             if (!Files.isDirectory(inputPath)) {
                 TarArchiveEntry tarEntry = new TarArchiveEntry(inputPath.getFileName().toString());
-                if (filePath.toFile().canExecute()) {
+                if (inputPath.toFile().canExecute()) {
                     tarEntry.setMode(tarEntry.getMode() | 0755);
                 }
                 putTarEntry(tarArchiveOutputStream, tarEntry, inputPath);

From c93a1fca4a062a7d90d361c061aa3a6a2edf6057 Mon Sep 17 00:00:00 2001
From: Lappas Dionysis <dio@freelabs.net>
Date: Sun, 15 May 2016 01:55:10 +0300
Subject: [PATCH 0532/1272] Fixed name for variable

---
 src/main/java/com/github/dockerjava/core/util/TarDirWalker.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java b/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
index 3c5336a28..bbe834ee6 100644
--- a/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
+++ b/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
@@ -34,7 +34,7 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) th
     @Override
     public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
         TarArchiveEntry tarEntry = new TarArchiveEntry(FilePathUtil.relativize(basePath, file));
-        if (filePath.toFile().canExecute()) {
+        if (file.toFile().canExecute()) {
                 tarEntry.setMode(tarEntry.getMode() | 0755);
         }
         CompressArchiveUtil.putTarEntry(tarArchiveOutputStream, tarEntry, file);

From 7ee187b7ee025ac2a798842f1db06ea198ad6666 Mon Sep 17 00:00:00 2001
From: Lappas Dionysis <dio@freelabs.net>
Date: Sun, 15 May 2016 02:01:14 +0300
Subject: [PATCH 0533/1272] Added missing variable type declaration

---
 .../core/command/CopyArchiveToContainerCmdImplTest.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
index 04117aba7..a1652456e 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
@@ -122,7 +122,7 @@ public void copyDirWithLastAddedTarEnryEmptyDir() throws Exception{
     @Test
     public void copyFileWithExecutePermission() throws Exception {
         // create script file, add permission to execute
-        scriptPath = Files.createTempFile("run", ".sh");
+        Path scriptPath = Files.createTempFile("run", ".sh");
         boolean executable = scriptPath.toFile().setExecutable(true, false);
         if (!executable){
             throw new Exception("Execute permission on file not set!");

From 381b7db28fd1007dea34b491c57fcd2ba8108591 Mon Sep 17 00:00:00 2001
From: Lappas Dionysis <dio@freelabs.net>
Date: Sun, 15 May 2016 02:07:25 +0300
Subject: [PATCH 0534/1272] Fixed docker client name

---
 .../core/command/CopyArchiveToContainerCmdImplTest.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
index a1652456e..d96a6ad25 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
@@ -134,19 +134,19 @@ public void copyFileWithExecutePermission() throws Exception {
         // create a test container which starts and waits 3 seconds for the
         // script to be copied to the container's home dir and then executes it
         String containerCmd = "sleep 3; /home/" + scriptPath.getFileName().toString();
-        CreateContainerResponse container = docker.createContainerCmd("busybox")
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
                 .withName("test")
                 .withCmd("/bin/sh", "-c", containerCmd)
                 .exec();
         // start the container
-        docker.startContainerCmd(container.getId()).exec();
+        dockerClient.startContainerCmd(container.getId()).exec();
         // copy script to container home dir
-        docker.copyArchiveToContainerCmd(container.getId())
+        dockerClient.copyArchiveToContainerCmd(container.getId())
                 .withRemotePath("/home")
                 .withHostResource(scriptPath.toString())
                 .exec();
         // await exid code
-        int exitCode = docker.waitContainerCmd(container.getId())
+        int exitCode = dockerClient.waitContainerCmd(container.getId())
                 .exec(new WaitContainerResultCallback())
                 .awaitStatusCode();
         // check result

From 328cd6745af14f57c43b948eaa742d1424ace50a Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 24 May 2016 20:58:51 +0200
Subject: [PATCH 0535/1272] Add test for netty impl

---
 .../CopyArchiveToContainerCmdExecTest.java    | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExecTest.java
index 9e9b0c731..eb43b54de 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExecTest.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.netty.exec;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.isEmptyOrNullString;
 import static org.hamcrest.Matchers.not;
 
@@ -21,6 +22,7 @@
 
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.core.command.WaitContainerResultCallback;
 import com.github.dockerjava.core.util.CompressArchiveUtil;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 
@@ -119,4 +121,38 @@ public void copyDirWithLastAddedTarEntryEmptyDir() throws Exception{
         FileUtils.deleteDirectory(localDir.toFile());
     }
 
+    @Test
+    public void copyFileWithExecutePermission() throws Exception {
+        // create script file, add permission to execute
+        Path scriptPath = Files.createTempFile("run", ".sh");
+        boolean executable = scriptPath.toFile().setExecutable(true, false);
+        if (!executable){
+            throw new Exception("Execute permission on file not set!");
+        }
+        String snippet = "Running script with execute permission.";
+        String scriptTextStr = "#!/bin/sh\necho \"" + snippet + "\"";
+        // write content for created script
+        Files.write(scriptPath, scriptTextStr.getBytes());
+        // create a test container which starts and waits 3 seconds for the
+        // script to be copied to the container's home dir and then executes it
+        String containerCmd = "sleep 3; /home/" + scriptPath.getFileName().toString();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withName("test")
+                .withCmd("/bin/sh", "-c", containerCmd)
+                .exec();
+        // start the container
+        dockerClient.startContainerCmd(container.getId()).exec();
+        // copy script to container home dir
+        dockerClient.copyArchiveToContainerCmd(container.getId())
+                .withRemotePath("/home")
+                .withHostResource(scriptPath.toString())
+                .exec();
+        // await exid code
+        int exitCode = dockerClient.waitContainerCmd(container.getId())
+                .exec(new WaitContainerResultCallback())
+                .awaitStatusCode();
+        // check result
+        assertThat(exitCode, equalTo(0));
+    }
+
 }

From 0758623f4763fe4e45618beba5c0233874e2266e Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 24 May 2016 20:59:41 +0200
Subject: [PATCH 0536/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75f0f9dc7..429f4b275 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ Notes
 
 All changes
 
+* [#580] (https://github.com/docker-java/docker-java/pull/580) Fixes execute permissions for files when copied to container 
 * [#579] (https://github.com/docker-java/docker-java/pull/579) Adds missing name filter evaluation to netty version of ListImagesCmdExec 
 * [#578] (https://github.com/docker-java/docker-java/pull/578) Fix error during image build when Dockerfile in subdirectory of build context
 * [#575] (https://github.com/docker-java/docker-java/pull/575) Support binding of port ranges

From a1d1e3dfda7a2ade9304c990f73d42aa573ef342 Mon Sep 17 00:00:00 2001
From: Jeremy <jrickard@vmware.com>
Date: Tue, 24 May 2016 14:19:28 -0600
Subject: [PATCH 0537/1272] Fixes Issue #584

Adds RootDir property to GraphData. This was seen on a
CentOS system without aufs support.
---
 .../dockerjava/api/command/GraphData.java     |  26 ++-
 .../api/command/InspectImageResponseTest.java | 197 +++++++++---------
 2 files changed, 122 insertions(+), 101 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/GraphData.java b/src/main/java/com/github/dockerjava/api/command/GraphData.java
index dc55810ba..a00f44e5d 100644
--- a/src/main/java/com/github/dockerjava/api/command/GraphData.java
+++ b/src/main/java/com/github/dockerjava/api/command/GraphData.java
@@ -1,17 +1,23 @@
 package com.github.dockerjava.api.command;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.CheckForNull;
+
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
-import javax.annotation.CheckForNull;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * part of {@link GraphDriver}
+ *
  * @author Kanstantsin Shautsou
  */
 public class GraphData {
+
+    @JsonProperty("RootDir")
+    private String rootDir;
+
     @JsonProperty("DeviceId")
     private String deviceId;
 
@@ -21,6 +27,22 @@ public class GraphData {
     @JsonProperty("DeviceSize")
     private String deviceSize;
 
+    /**
+     * @see #rootDir
+     */
+    @CheckForNull
+    public String getRootDir() {
+        return rootDir;
+    }
+
+    /**
+     * @see #deviceId
+     */
+    public GraphData withRootDir(String rootDir) {
+        this.rootDir = rootDir;
+        return this;
+    }
+
     /**
      * @see #deviceId
      */
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
index 410d5b32a..e7cd2aaa8 100644
--- a/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
+++ b/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
@@ -1,13 +1,5 @@
 package com.github.dockerjava.api.command;
 
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.model.ContainerConfig;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.util.Collections;
-
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
 import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -21,65 +13,72 @@
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 
+import java.io.IOException;
+import java.util.Collections;
+
+import org.testng.annotations.Test;
+
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.model.ContainerConfig;
+
 /**
  * @author Kanstantsin Shautsou
  */
 public class InspectImageResponseTest {
+
     @Test
     public void serder1_22Json() throws IOException {
         final ObjectMapper mapper = new ObjectMapper();
         final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class);
 
-        final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22,
-                "images/image1/inspect1.json",
-                type
-        );
-
-        final ContainerConfig config = new ContainerConfig()
-                .withAttachStderr(false)
-                .withAttachStdin(false)
-                .withAttachStdout(false)
-                .withCmd(null)
-                .withDomainName("")
-                .withEntrypoint(null)
-                .withEnv(new String[]{"HOME=/", "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"})
-                .withExposedPorts(null)
-                .withHostName("aee9ba801acc")
-                .withImage("511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158")
-                .withLabels(null)
-                .withMacAddress(null)
-                .withNetworkDisabled(null)
-                .withOnBuild(new String[]{})
-                .withStdinOpen(false)
-                .withPortSpecs(null)
-                .withStdInOnce(false)
-                .withTty(false)
-                .withUser("")
-                .withVolumes(null)
-                .withWorkingDir("");
-
-        final ContainerConfig containerConfig = new ContainerConfig()
-                .withAttachStderr(false)
-                .withAttachStdin(false)
-                .withAttachStdout(false)
-                .withCmd(new String[]{"/bin/sh", "-c", "#(nop) MAINTAINER hack@worldticket.net"})
-                .withDomainName("")
-                .withEntrypoint(null)
-                .withEnv(new String[]{"HOME=/", "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"})
-                .withExposedPorts(null)
-                .withHostName("aee9ba801acc")
-                .withImage("511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158")
-                .withLabels(null)
-                .withMacAddress(null)
-                .withNetworkDisabled(null)
-                .withOnBuild(new String[]{})
-                .withStdinOpen(false)
-                .withPortSpecs(null)
-                .withStdInOnce(false)
-                .withTty(false)
-                .withUser("")
-                .withVolumes(null)
-                .withWorkingDir("");
+        final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22, "images/image1/inspect1.json", type);
+
+        final ContainerConfig config = new ContainerConfig().withAttachStderr(false)
+                                                            .withAttachStdin(false)
+                                                            .withAttachStdout(false)
+                                                            .withCmd(null)
+                                                            .withDomainName("")
+                                                            .withEntrypoint(null)
+                                                            .withEnv(new String[] { "HOME=/",
+                                                                                    "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" })
+                                                            .withExposedPorts(null)
+                                                            .withHostName("aee9ba801acc")
+                                                            .withImage("511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158")
+                                                            .withLabels(null)
+                                                            .withMacAddress(null)
+                                                            .withNetworkDisabled(null)
+                                                            .withOnBuild(new String[] {})
+                                                            .withStdinOpen(false)
+                                                            .withPortSpecs(null)
+                                                            .withStdInOnce(false)
+                                                            .withTty(false)
+                                                            .withUser("")
+                                                            .withVolumes(null)
+                                                            .withWorkingDir("");
+
+        final ContainerConfig containerConfig = new ContainerConfig().withAttachStderr(false)
+                                                                     .withAttachStdin(false)
+                                                                     .withAttachStdout(false)
+                                                                     .withCmd(new String[] { "/bin/sh", "-c", "#(nop) MAINTAINER hack@worldticket.net" })
+                                                                     .withDomainName("")
+                                                                     .withEntrypoint(null)
+                                                                     .withEnv(new String[] { "HOME=/",
+                                                                                             "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" })
+                                                                     .withExposedPorts(null)
+                                                                     .withHostName("aee9ba801acc")
+                                                                     .withImage("511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158")
+                                                                     .withLabels(null)
+                                                                     .withMacAddress(null)
+                                                                     .withNetworkDisabled(null)
+                                                                     .withOnBuild(new String[] {})
+                                                                     .withStdinOpen(false)
+                                                                     .withPortSpecs(null)
+                                                                     .withStdInOnce(false)
+                                                                     .withTty(false)
+                                                                     .withUser("")
+                                                                     .withVolumes(null)
+                                                                     .withWorkingDir("");
 
         assertThat(inspectImage, notNullValue());
         assertThat(inspectImage.getArch(), is("amd64"));
@@ -113,52 +112,41 @@ public void serder1_22Json() throws IOException {
 
         assertThat(inspectImage.getVirtualSize(), is(0L));
 
-
         final InspectImageResponse inspectImageResponse = new InspectImageResponse().withArch("amd64")
-                .withAuthor("hack@worldticket.net")
-                .withComment("")
-                .withConfig(config)
-                .withContainer("aee9ba801acca0e648ffd91df204ba82ae85d97608a4864a019e2004d7e1b133")
-                .withContainerConfig(containerConfig)
-                .withCreated("2014-04-29T19:59:10.84997669Z")
-                .withDockerVersion("0.8.1")
-                .withId("sha256:ee45fe0d1fcdf1a0f9c2d1e36c6f4b3202bbb2032f14d7c9312b27bfcf6aee24")
-                .withOs("linux")
-                .withParent("")
-                .withSize(0L)
-                .withRepoTags(Collections.singletonList("hackmann/empty:latest"))
-                .withRepoDigests(Collections.<String>emptyList())
-                .withVirtualSize(0L)
-                .withGraphDriver(aufsGraphDriver);
+                                                                                    .withAuthor("hack@worldticket.net")
+                                                                                    .withComment("")
+                                                                                    .withConfig(config)
+                                                                                    .withContainer("aee9ba801acca0e648ffd91df204ba82ae85d97608a4864a019e2004d7e1b133")
+                                                                                    .withContainerConfig(containerConfig)
+                                                                                    .withCreated("2014-04-29T19:59:10.84997669Z")
+                                                                                    .withDockerVersion("0.8.1")
+                                                                                    .withId("sha256:ee45fe0d1fcdf1a0f9c2d1e36c6f4b3202bbb2032f14d7c9312b27bfcf6aee24")
+                                                                                    .withOs("linux")
+                                                                                    .withParent("")
+                                                                                    .withSize(0L)
+                                                                                    .withRepoTags(Collections.singletonList("hackmann/empty:latest"))
+                                                                                    .withRepoDigests(Collections.<String> emptyList())
+                                                                                    .withVirtualSize(0L)
+                                                                                    .withGraphDriver(aufsGraphDriver);
 
         assertThat(inspectImage, equalTo(inspectImageResponse));
     }
 
-
     @Test
     public void serder1_22_doc() throws IOException {
         final ObjectMapper mapper = new ObjectMapper();
         final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class);
 
-        final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22,
-                "images/docImage/doc.json",
-                type
-        );
+        final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22, "images/docImage/doc.json", type);
 
         assertThat(inspectImage, notNullValue());
 
         assertThat(inspectImage.getRepoDigests(), hasSize(1));
         assertThat(inspectImage.getRepoDigests(),
-                contains("localhost:5000/test/busybox/example@" +
-                        "sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf")
-        );
+                   contains("localhost:5000/test/busybox/example@" + "sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"));
 
         assertThat(inspectImage.getRepoTags(), hasSize(3));
-        assertThat(inspectImage.getRepoTags(), containsInAnyOrder(
-                "example:1.0",
-                "example:latest",
-                "example:stable"
-        ));
+        assertThat(inspectImage.getRepoTags(), containsInAnyOrder("example:1.0", "example:latest", "example:stable"));
     }
 
     @Test
@@ -166,15 +154,11 @@ public void serder1_22_inspect_doc() throws IOException {
         final ObjectMapper mapper = new ObjectMapper();
         final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class);
 
-        final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22,
-                "images/docImage/inspect_doc.json",
-                type
-        );
+        final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22, "images/docImage/inspect_doc.json", type);
 
-        GraphData newGraphData = new GraphData()
-                .withDeviceId("5")
-                .withDeviceName("docker-253:1-2763198-d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47")
-                .withDeviceSize("171798691840");
+        GraphData newGraphData = new GraphData().withDeviceId("5")
+                                                .withDeviceName("docker-253:1-2763198-d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47")
+                                                .withDeviceSize("171798691840");
 
         assertThat(inspectImage, notNullValue());
         GraphDriver graphDriver = inspectImage.getGraphDriver();
@@ -184,9 +168,24 @@ public void serder1_22_inspect_doc() throws IOException {
         assertThat(data, is(newGraphData));
 
         assertThat(data.getDeviceId(), is("5"));
-        assertThat(data.getDeviceName(),
-                is("docker-253:1-2763198-d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47"));
-        assertThat(data.getDeviceSize(),
-                is("171798691840"));
+        assertThat(data.getDeviceName(), is("docker-253:1-2763198-d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47"));
+        assertThat(data.getDeviceSize(), is("171798691840"));
+    }
+
+    @Test
+    private void testOverlayNetworkRootDir() throws IOException {
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class);
+
+        final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22, "images/overlay/inspectOverlay.json", type);
+
+        final GraphData overlayGraphData = new GraphData().withRootDir("/var/lib/docker/overlay/7e8d362d6b78d47eafe4863fd129cbcada35dbd419d7188cc1dbf1233d505576/root");
+        final GraphDriver overlayGraphDriver = new GraphDriver().withName("overlay").withData(overlayGraphData);
+        final GraphDriver graphDriver = inspectImage.getGraphDriver();
+        assertThat(graphDriver, notNullValue());
+        assertThat(graphDriver, equalTo(overlayGraphDriver));
+        assertThat(graphDriver.getName(), is("overlay"));
+        assertThat(graphDriver.getData(), equalTo(overlayGraphData));
+
     }
 }
\ No newline at end of file

From 3f71f1f165d652ceb044151c9abea2b1707d56c9 Mon Sep 17 00:00:00 2001
From: Jeremy <jrickard@vmware.com>
Date: Tue, 24 May 2016 14:19:28 -0600
Subject: [PATCH 0538/1272] Fixes Issue #584

Adds RootDir property to GraphData. This was seen on a
CentOS system without aufs support.
---
 .../api/command/InspectImageResponseTest.java | 128 +++++++++---------
 .../1.22/images/overlay/inspectOverlay.json   |  93 +++++++++++++
 2 files changed, 157 insertions(+), 64 deletions(-)
 create mode 100644 src/test/resources/samples/1.22/images/overlay/inspectOverlay.json

diff --git a/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
index e7cd2aaa8..5bce25a48 100644
--- a/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
+++ b/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
@@ -34,51 +34,49 @@ public void serder1_22Json() throws IOException {
 
         final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22, "images/image1/inspect1.json", type);
 
-        final ContainerConfig config = new ContainerConfig().withAttachStderr(false)
-                                                            .withAttachStdin(false)
-                                                            .withAttachStdout(false)
-                                                            .withCmd(null)
-                                                            .withDomainName("")
-                                                            .withEntrypoint(null)
-                                                            .withEnv(new String[] { "HOME=/",
-                                                                                    "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" })
-                                                            .withExposedPorts(null)
-                                                            .withHostName("aee9ba801acc")
-                                                            .withImage("511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158")
-                                                            .withLabels(null)
-                                                            .withMacAddress(null)
-                                                            .withNetworkDisabled(null)
-                                                            .withOnBuild(new String[] {})
-                                                            .withStdinOpen(false)
-                                                            .withPortSpecs(null)
-                                                            .withStdInOnce(false)
-                                                            .withTty(false)
-                                                            .withUser("")
-                                                            .withVolumes(null)
-                                                            .withWorkingDir("");
+        final ContainerConfig config = new ContainerConfig().withAttachStdout(false)
+                .withCmd(null)
+                .withDomainName("")
+                .withEntrypoint(null)
+                .withEnv(new String[] {"HOME=/",
+                        "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"})
+                .withExposedPorts(null)
+                .withHostName("aee9ba801acc")
+                .withImage("511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158")
+                .withLabels(null)
+                .withMacAddress(null)
+                .withNetworkDisabled(null)
+                .withOnBuild(new String[] {})
+                .withStdinOpen(false)
+                .withPortSpecs(null)
+                .withStdInOnce(false)
+                .withTty(false)
+                .withUser("")
+                .withVolumes(null)
+                .withWorkingDir("");
 
         final ContainerConfig containerConfig = new ContainerConfig().withAttachStderr(false)
-                                                                     .withAttachStdin(false)
-                                                                     .withAttachStdout(false)
-                                                                     .withCmd(new String[] { "/bin/sh", "-c", "#(nop) MAINTAINER hack@worldticket.net" })
-                                                                     .withDomainName("")
-                                                                     .withEntrypoint(null)
-                                                                     .withEnv(new String[] { "HOME=/",
-                                                                                             "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" })
-                                                                     .withExposedPorts(null)
-                                                                     .withHostName("aee9ba801acc")
-                                                                     .withImage("511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158")
-                                                                     .withLabels(null)
-                                                                     .withMacAddress(null)
-                                                                     .withNetworkDisabled(null)
-                                                                     .withOnBuild(new String[] {})
-                                                                     .withStdinOpen(false)
-                                                                     .withPortSpecs(null)
-                                                                     .withStdInOnce(false)
-                                                                     .withTty(false)
-                                                                     .withUser("")
-                                                                     .withVolumes(null)
-                                                                     .withWorkingDir("");
+                .withAttachStdin(false)
+                .withAttachStdout(false)
+                .withCmd(new String[] {"/bin/sh", "-c", "#(nop) MAINTAINER hack@worldticket.net"})
+                .withDomainName("")
+                .withEntrypoint(null)
+                .withEnv(new String[] {"HOME=/",
+                        "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"})
+                .withExposedPorts(null)
+                .withHostName("aee9ba801acc")
+                .withImage("511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158")
+                .withLabels(null)
+                .withMacAddress(null)
+                .withNetworkDisabled(null)
+                .withOnBuild(new String[] {})
+                .withStdinOpen(false)
+                .withPortSpecs(null)
+                .withStdInOnce(false)
+                .withTty(false)
+                .withUser("")
+                .withVolumes(null)
+                .withWorkingDir("");
 
         assertThat(inspectImage, notNullValue());
         assertThat(inspectImage.getArch(), is("amd64"));
@@ -113,21 +111,21 @@ public void serder1_22Json() throws IOException {
         assertThat(inspectImage.getVirtualSize(), is(0L));
 
         final InspectImageResponse inspectImageResponse = new InspectImageResponse().withArch("amd64")
-                                                                                    .withAuthor("hack@worldticket.net")
-                                                                                    .withComment("")
-                                                                                    .withConfig(config)
-                                                                                    .withContainer("aee9ba801acca0e648ffd91df204ba82ae85d97608a4864a019e2004d7e1b133")
-                                                                                    .withContainerConfig(containerConfig)
-                                                                                    .withCreated("2014-04-29T19:59:10.84997669Z")
-                                                                                    .withDockerVersion("0.8.1")
-                                                                                    .withId("sha256:ee45fe0d1fcdf1a0f9c2d1e36c6f4b3202bbb2032f14d7c9312b27bfcf6aee24")
-                                                                                    .withOs("linux")
-                                                                                    .withParent("")
-                                                                                    .withSize(0L)
-                                                                                    .withRepoTags(Collections.singletonList("hackmann/empty:latest"))
-                                                                                    .withRepoDigests(Collections.<String> emptyList())
-                                                                                    .withVirtualSize(0L)
-                                                                                    .withGraphDriver(aufsGraphDriver);
+                .withAuthor("hack@worldticket.net")
+                .withComment("")
+                .withConfig(config)
+                .withContainer("aee9ba801acca0e648ffd91df204ba82ae85d97608a4864a019e2004d7e1b133")
+                .withContainerConfig(containerConfig)
+                .withCreated("2014-04-29T19:59:10.84997669Z")
+                .withDockerVersion("0.8.1")
+                .withId("sha256:ee45fe0d1fcdf1a0f9c2d1e36c6f4b3202bbb2032f14d7c9312b27bfcf6aee24")
+                .withOs("linux")
+                .withParent("")
+                .withSize(0L)
+                .withRepoTags(Collections.singletonList("hackmann/empty:latest"))
+                .withRepoDigests(Collections.<String> emptyList())
+                .withVirtualSize(0L)
+                .withGraphDriver(aufsGraphDriver);
 
         assertThat(inspectImage, equalTo(inspectImageResponse));
     }
@@ -143,7 +141,9 @@ public void serder1_22_doc() throws IOException {
 
         assertThat(inspectImage.getRepoDigests(), hasSize(1));
         assertThat(inspectImage.getRepoDigests(),
-                   contains("localhost:5000/test/busybox/example@" + "sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"));
+
+                contains("localhost:5000/test/busybox/example@"
+                        + "sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"));
 
         assertThat(inspectImage.getRepoTags(), hasSize(3));
         assertThat(inspectImage.getRepoTags(), containsInAnyOrder("example:1.0", "example:latest", "example:stable"));
@@ -157,9 +157,8 @@ public void serder1_22_inspect_doc() throws IOException {
         final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22, "images/docImage/inspect_doc.json", type);
 
         GraphData newGraphData = new GraphData().withDeviceId("5")
-                                                .withDeviceName("docker-253:1-2763198-d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47")
-                                                .withDeviceSize("171798691840");
-
+                .withDeviceName("docker-253:1-2763198-d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47")
+                .withDeviceSize("171798691840");
         assertThat(inspectImage, notNullValue());
         GraphDriver graphDriver = inspectImage.getGraphDriver();
         assertThat(graphDriver, notNullValue());
@@ -179,7 +178,8 @@ private void testOverlayNetworkRootDir() throws IOException {
 
         final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22, "images/overlay/inspectOverlay.json", type);
 
-        final GraphData overlayGraphData = new GraphData().withRootDir("/var/lib/docker/overlay/7e8d362d6b78d47eafe4863fd129cbcada35dbd419d7188cc1dbf1233d505576/root");
+        final GraphData overlayGraphData = new GraphData()
+                .withRootDir("/var/lib/docker/overlay/7e8d362d6b78d47eafe4863fd129cbcada35dbd419d7188cc1dbf1233d505576/root");
         final GraphDriver overlayGraphDriver = new GraphDriver().withName("overlay").withData(overlayGraphData);
         final GraphDriver graphDriver = inspectImage.getGraphDriver();
         assertThat(graphDriver, notNullValue());
@@ -188,4 +188,4 @@ private void testOverlayNetworkRootDir() throws IOException {
         assertThat(graphDriver.getData(), equalTo(overlayGraphData));
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/samples/1.22/images/overlay/inspectOverlay.json b/src/test/resources/samples/1.22/images/overlay/inspectOverlay.json
new file mode 100644
index 000000000..7e3fe0bea
--- /dev/null
+++ b/src/test/resources/samples/1.22/images/overlay/inspectOverlay.json
@@ -0,0 +1,93 @@
+{
+  "Id": "sha256:0ac989a7cba2ce7f5fbe5d520b338e780055ec251371ee35f7462ae9944696c5",
+  "RepoTags": [
+    "test-image:latest"
+  ],
+  "RepoDigests": [],
+  "Parent": "",
+  "Comment": "",
+  "Created": "2016-05-24T19:25:01.31608131Z",
+  "Container": "221f000eccdec85b74cd4f4f37c7c0392d0f620bee45e9618cac3e57409a6d2c",
+  "ContainerConfig": {
+    "Hostname": "6ea525e7ec5c",
+    "Domainname": "",
+    "User": "",
+    "AttachStdin": false,
+    "AttachStdout": false,
+    "AttachStderr": false,
+    "Tty": false,
+    "OpenStdin": false,
+    "StdinOnce": false,
+    "Env": [
+      "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    ],
+    "Cmd": [
+      "/bin/sh",
+      "-c",
+      "#(nop) ENTRYPOINT [\"bin/run.sh\"]"
+    ],
+    "Image": "sha256:f8321fac5b5484874c1c5c02719905ec815c8ad20c2bc66222cfde19cd0491b7",
+    "Volumes": {
+      "/var/lib/docker": {}
+    },
+    "WorkingDir": "/opt",
+    "Entrypoint": [
+      "bin/run.sh"
+    ],
+    "OnBuild": [],
+    "Labels": {}
+  },
+  "DockerVersion": "1.11.1",
+  "Author": "",
+  "Config": {
+    "Hostname": "6ea525e7ec5c",
+    "Domainname": "",
+    "User": "",
+    "AttachStdin": false,
+    "AttachStdout": false,
+    "AttachStderr": false,
+    "Tty": false,
+    "OpenStdin": false,
+    "StdinOnce": false,
+    "Env": [
+      "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    ],
+    "Cmd": null,
+    "Image": "sha256:f8321fac5b5484874c1c5c02719905ec815c8ad20c2bc66222cfde19cd0491b7",
+    "Volumes": {
+      "/var/lib/docker": {}
+    },
+    "WorkingDir": "/opt",
+    "Entrypoint": [
+      "bin/run.sh"
+    ],
+    "OnBuild": [],
+    "Labels": {}
+  },
+  "Architecture": "amd64",
+  "Os": "linux",
+  "Size": 345943268,
+  "VirtualSize": 345943268,
+  "GraphDriver": {
+    "Name": "overlay",
+    "Data": {
+      "RootDir": "/var/lib/docker/overlay/7e8d362d6b78d47eafe4863fd129cbcada35dbd419d7188cc1dbf1233d505576/root"
+    }
+  },
+  "RootFS": {
+    "Type": "layers",
+    "Layers": [
+      "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef",
+      "sha256:bd8153423e4131205018c431283e0a08298b291838db9bc6c19620523f5a818c",
+      "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef",
+      "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef",
+      "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef",
+      "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef",
+      "sha256:bb0716c3f5f5be1e5ee6912f7e9f44193898e0b3ed9031a0416f8ca262e89975",
+      "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef",
+      "sha256:58845ae9bfa7659900a9b30abb2c96330eff09bfbc6521ea77937ba60f8cc131",
+      "sha256:8c22161a61c24eb6f7aa130d45189354fd8dbe9467e5b2debf828908113eacb0",
+      "sha256:0c0c9045d2542e7845a2bdd8ead0e0fb2722be2c07c5553838dd61ffe051d672"
+    ]
+  }
+}
\ No newline at end of file

From 9b8ca72947b771c6fbeda00d17b9382fed2c09a6 Mon Sep 17 00:00:00 2001
From: Jeremy <jrickard@vmware.com>
Date: Tue, 24 May 2016 14:19:28 -0600
Subject: [PATCH 0539/1272] Fixes Issue #584

Adds RootDir property to GraphData. This was seen on a
CentOS system without aufs support.
---
 .../dockerjava/api/command/GraphData.java     |  6 +-
 .../api/command/InspectImageResponseTest.java | 80 ++++++++++++-------
 2 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/GraphData.java b/src/main/java/com/github/dockerjava/api/command/GraphData.java
index a00f44e5d..1aac8db84 100644
--- a/src/main/java/com/github/dockerjava/api/command/GraphData.java
+++ b/src/main/java/com/github/dockerjava/api/command/GraphData.java
@@ -1,16 +1,14 @@
 package com.github.dockerjava.api.command;
 
-import javax.annotation.CheckForNull;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.annotation.CheckForNull;
 
 /**
  * part of {@link GraphDriver}
- *
  * @author Kanstantsin Shautsou
  */
 public class GraphData {
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
index 5bce25a48..4c604e6a0 100644
--- a/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
+++ b/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
@@ -1,5 +1,13 @@
 package com.github.dockerjava.api.command;
 
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.model.ContainerConfig;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.util.Collections;
+
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
 import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -13,40 +21,35 @@
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 
-import java.io.IOException;
-import java.util.Collections;
-
-import org.testng.annotations.Test;
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.model.ContainerConfig;
-
 /**
  * @author Kanstantsin Shautsou
  */
 public class InspectImageResponseTest {
-
     @Test
     public void serder1_22Json() throws IOException {
         final ObjectMapper mapper = new ObjectMapper();
         final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class);
 
-        final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22, "images/image1/inspect1.json", type);
+        final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22,
+                "images/image1/inspect1.json",
+                type
+        );
 
-        final ContainerConfig config = new ContainerConfig().withAttachStdout(false)
+        final ContainerConfig config = new ContainerConfig()
+                .withAttachStderr(false)
+                .withAttachStdin(false)
+                .withAttachStdout(false)
                 .withCmd(null)
                 .withDomainName("")
                 .withEntrypoint(null)
-                .withEnv(new String[] {"HOME=/",
-                        "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"})
+                .withEnv(new String[]{"HOME=/", "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"})
                 .withExposedPorts(null)
                 .withHostName("aee9ba801acc")
                 .withImage("511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158")
                 .withLabels(null)
                 .withMacAddress(null)
                 .withNetworkDisabled(null)
-                .withOnBuild(new String[] {})
+                .withOnBuild(new String[]{})
                 .withStdinOpen(false)
                 .withPortSpecs(null)
                 .withStdInOnce(false)
@@ -55,21 +58,21 @@ public void serder1_22Json() throws IOException {
                 .withVolumes(null)
                 .withWorkingDir("");
 
-        final ContainerConfig containerConfig = new ContainerConfig().withAttachStderr(false)
+        final ContainerConfig containerConfig = new ContainerConfig()
+                .withAttachStderr(false)
                 .withAttachStdin(false)
                 .withAttachStdout(false)
-                .withCmd(new String[] {"/bin/sh", "-c", "#(nop) MAINTAINER hack@worldticket.net"})
+                .withCmd(new String[]{"/bin/sh", "-c", "#(nop) MAINTAINER hack@worldticket.net"})
                 .withDomainName("")
                 .withEntrypoint(null)
-                .withEnv(new String[] {"HOME=/",
-                        "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"})
+                .withEnv(new String[]{"HOME=/", "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"})
                 .withExposedPorts(null)
                 .withHostName("aee9ba801acc")
                 .withImage("511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158")
                 .withLabels(null)
                 .withMacAddress(null)
                 .withNetworkDisabled(null)
-                .withOnBuild(new String[] {})
+                .withOnBuild(new String[]{})
                 .withStdinOpen(false)
                 .withPortSpecs(null)
                 .withStdInOnce(false)
@@ -110,6 +113,7 @@ public void serder1_22Json() throws IOException {
 
         assertThat(inspectImage.getVirtualSize(), is(0L));
 
+
         final InspectImageResponse inspectImageResponse = new InspectImageResponse().withArch("amd64")
                 .withAuthor("hack@worldticket.net")
                 .withComment("")
@@ -123,30 +127,38 @@ public void serder1_22Json() throws IOException {
                 .withParent("")
                 .withSize(0L)
                 .withRepoTags(Collections.singletonList("hackmann/empty:latest"))
-                .withRepoDigests(Collections.<String> emptyList())
+                .withRepoDigests(Collections.<String>emptyList())
                 .withVirtualSize(0L)
                 .withGraphDriver(aufsGraphDriver);
 
         assertThat(inspectImage, equalTo(inspectImageResponse));
     }
 
+
     @Test
     public void serder1_22_doc() throws IOException {
         final ObjectMapper mapper = new ObjectMapper();
         final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class);
 
-        final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22, "images/docImage/doc.json", type);
+        final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22,
+                "images/docImage/doc.json",
+                type
+        );
 
         assertThat(inspectImage, notNullValue());
 
         assertThat(inspectImage.getRepoDigests(), hasSize(1));
         assertThat(inspectImage.getRepoDigests(),
-
-                contains("localhost:5000/test/busybox/example@"
-                        + "sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"));
+                contains("localhost:5000/test/busybox/example@" +
+                        "sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf")
+        );
 
         assertThat(inspectImage.getRepoTags(), hasSize(3));
-        assertThat(inspectImage.getRepoTags(), containsInAnyOrder("example:1.0", "example:latest", "example:stable"));
+        assertThat(inspectImage.getRepoTags(), containsInAnyOrder(
+                "example:1.0",
+                "example:latest",
+                "example:stable"
+        ));
     }
 
     @Test
@@ -154,11 +166,16 @@ public void serder1_22_inspect_doc() throws IOException {
         final ObjectMapper mapper = new ObjectMapper();
         final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class);
 
-        final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22, "images/docImage/inspect_doc.json", type);
+        final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22,
+                "images/docImage/inspect_doc.json",
+                type
+        );
 
-        GraphData newGraphData = new GraphData().withDeviceId("5")
+        GraphData newGraphData = new GraphData()
+                .withDeviceId("5")
                 .withDeviceName("docker-253:1-2763198-d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47")
                 .withDeviceSize("171798691840");
+
         assertThat(inspectImage, notNullValue());
         GraphDriver graphDriver = inspectImage.getGraphDriver();
         assertThat(graphDriver, notNullValue());
@@ -167,8 +184,10 @@ public void serder1_22_inspect_doc() throws IOException {
         assertThat(data, is(newGraphData));
 
         assertThat(data.getDeviceId(), is("5"));
-        assertThat(data.getDeviceName(), is("docker-253:1-2763198-d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47"));
-        assertThat(data.getDeviceSize(), is("171798691840"));
+        assertThat(data.getDeviceName(),
+                is("docker-253:1-2763198-d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47"));
+        assertThat(data.getDeviceSize(),
+                is("171798691840"));
     }
 
     @Test
@@ -186,6 +205,5 @@ private void testOverlayNetworkRootDir() throws IOException {
         assertThat(graphDriver, equalTo(overlayGraphDriver));
         assertThat(graphDriver.getName(), is("overlay"));
         assertThat(graphDriver.getData(), equalTo(overlayGraphData));
-
     }
 }

From d05e38078117c8e1f20ab4ecc20575b64cb801bc Mon Sep 17 00:00:00 2001
From: Jeremy <jrickard@vmware.com>
Date: Tue, 24 May 2016 14:19:28 -0600
Subject: [PATCH 0540/1272] Fixes Issue #584

Adds RootDir property to GraphData. This was seen on a
CentOS system without aufs support.
---
 src/main/java/com/github/dockerjava/api/command/GraphData.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/GraphData.java b/src/main/java/com/github/dockerjava/api/command/GraphData.java
index 1aac8db84..5130fafc7 100644
--- a/src/main/java/com/github/dockerjava/api/command/GraphData.java
+++ b/src/main/java/com/github/dockerjava/api/command/GraphData.java
@@ -34,7 +34,7 @@ public String getRootDir() {
     }
 
     /**
-     * @see #deviceId
+     * @see #rootDir
      */
     public GraphData withRootDir(String rootDir) {
         this.rootDir = rootDir;

From 4ac56af0ee3fe02e4e50c30c05e435fbfe7bf9e8 Mon Sep 17 00:00:00 2001
From: Logan O'Sullivan Bruns <lbruns@linkedin.com>
Date: Tue, 24 May 2016 10:27:27 -0700
Subject: [PATCH 0541/1272] Always use HTTP to connect to proxy even when
 proxying HTTPS

The intention of the current implementation seems to be to have the
normal proxy settings accomplish the same results with docker-java as
they would in java in general. I think the one accidental divergence
from that is that for the HTTPS case setting https.{proxy,port} would
normally still use HTTP but in this case the code is- I think
unintentionally- switching to the proxy connection to HTTPS.

This change makes it so it corresponds better with how the java proxy
properties work as well. Even when proxying HTTPS the connection to
the actually proxy is done over HTTP and it makes a CONNECT call to
stream the HTTPS over.

Most proxies are still used via HTTP and for better or worse this is
the assumption built into the java proxy configuration which
docker-java is using. The apache client is more flexible and perhaps
the docker-java configuration should be too but I'd like to argue that
until then that the docker-java match the behavior of java.

Also this allows me to use docker-java through the corporate proxy
when proxying HTTPS. Otherwise HTTP works but HTTPS fails since the
proxy is not configured with HTTPS.
---
 .../com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index f64cf4e2b..5d489bbc5 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -231,7 +231,7 @@ private void configureProxy(ClientConfig clientConfig, String protocol) {
                 String hostname = address.getHostName();
                 int port = address.getPort();
 
-                clientConfig.property(ClientProperties.PROXY_URI, protocol + "://" + hostname + ":" + port);
+                clientConfig.property(ClientProperties.PROXY_URI, "http://" + hostname + ":" + port);
 
                 String httpProxyUser = System.getProperty(protocol + ".proxyUser");
                 if (httpProxyUser != null) {

From fac1ba22dc904f86774d16c56754a280a7ac4e97 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 2 Jun 2016 20:22:40 +0200
Subject: [PATCH 0542/1272] Add ignore unknown properties annotation

---
 src/main/java/com/github/dockerjava/api/command/GraphData.java | 3 +++
 .../java/com/github/dockerjava/api/command/GraphDriver.java    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/GraphData.java b/src/main/java/com/github/dockerjava/api/command/GraphData.java
index 5130fafc7..5a2944e0b 100644
--- a/src/main/java/com/github/dockerjava/api/command/GraphData.java
+++ b/src/main/java/com/github/dockerjava/api/command/GraphData.java
@@ -1,6 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -11,6 +13,7 @@
  * part of {@link GraphDriver}
  * @author Kanstantsin Shautsou
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GraphData {
 
     @JsonProperty("RootDir")
diff --git a/src/main/java/com/github/dockerjava/api/command/GraphDriver.java b/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
index 0d41364aa..1394e866e 100644
--- a/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
+++ b/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
@@ -1,6 +1,8 @@
 package com.github.dockerjava.api.command;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -13,6 +15,7 @@
  * @author Kanstantsin Shautsou
  * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21}
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GraphDriver {
     /**
      * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21}

From ad83c3adc410a901f25e22f20185dea5b0beb0cf Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 2 Jun 2016 20:24:31 +0200
Subject: [PATCH 0543/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 429f4b275..c4a771d25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ Notes
 
 All changes
 
+* [#585] (https://github.com/docker-java/docker-java/pull/585) Add RootDir property to GraphData
 * [#580] (https://github.com/docker-java/docker-java/pull/580) Fixes execute permissions for files when copied to container 
 * [#579] (https://github.com/docker-java/docker-java/pull/579) Adds missing name filter evaluation to netty version of ListImagesCmdExec 
 * [#578] (https://github.com/docker-java/docker-java/pull/578) Fix error during image build when Dockerfile in subdirectory of build context

From 0c48b5fe0984388a27a65a3e4fbc2383a3821a30 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 2 Jun 2016 21:52:06 +0200
Subject: [PATCH 0544/1272] Add missing tests for netty impl

---
 .../exec/ConnectToNetworkCmdExecTest.java     | 98 +++++++++++++++++++
 .../DisconnectFromNetworkCmdExecTest.java     | 82 ++++++++++++++++
 2 files changed, 180 insertions(+)
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExecTest.java

diff --git a/src/test/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExecTest.java
new file mode 100644
index 000000000..ee1a681b6
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExecTest.java
@@ -0,0 +1,98 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.ContainerNetwork;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+import java.util.Collections;
+
+@Test(groups = "integration")
+public class ConnectToNetworkCmdExecTest extends AbstractNettyDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void connectToNetwork() throws InterruptedException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        CreateNetworkResponse network = dockerClient.createNetworkCmd().withName("testNetwork").exec();
+
+        dockerClient.connectToNetworkCmd().withNetworkId(network.getId()).withContainerId(container.getId()).exec();
+
+        Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
+
+        assertTrue(updatedNetwork.getContainers().containsKey(container.getId()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertNotNull(inspectContainerResponse.getNetworkSettings().getNetworks().get("testNetwork"));
+    }
+
+    @Test
+    public void connectToNetworkWithContainerNetwork() throws InterruptedException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        CreateNetworkResponse network = dockerClient.createNetworkCmd()
+                .withName("testNetwork")
+                .withIpam(new Network.Ipam()
+                    .withConfig(new Network.Ipam.Config()
+                        .withSubnet("10.100.100.0/24")))
+                .exec();
+
+        dockerClient.connectToNetworkCmd()
+                .withNetworkId(network.getId())
+                .withContainerId(container.getId())
+                .withContainerNetwork(new ContainerNetwork()
+                    .withAliases("testing")
+                    .withIpamConfig(new ContainerNetwork.Ipam()
+                        .withIpv4Address("10.100.100.100")))
+                .exec();
+
+        Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
+
+        Network.ContainerNetworkConfig containerNetworkConfig = updatedNetwork.getContainers().get(container.getId());
+        assertNotNull(containerNetworkConfig);
+        assertEquals(containerNetworkConfig.getIpv4Address(), "10.100.100.100/24");
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        ContainerNetwork testNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get("testNetwork");
+        assertNotNull(testNetwork);
+        assertEquals(testNetwork.getAliases(), Collections.singletonList("testing"));
+        assertEquals(testNetwork.getGateway(), "10.100.100.1");
+        assertEquals(testNetwork.getIpAddress(), "10.100.100.100");
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExecTest.java
new file mode 100644
index 000000000..1f2563dec
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExecTest.java
@@ -0,0 +1,82 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+
+@Test(groups = "integration")
+public class DisconnectFromNetworkCmdExecTest extends AbstractNettyDockerClientTest {
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void disconnectFromNetwork() throws InterruptedException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        CreateNetworkResponse network = dockerClient.createNetworkCmd().withName("testNetwork").exec();
+
+        dockerClient.connectToNetworkCmd().withNetworkId(network.getId()).withContainerId(container.getId()).exec();
+
+        Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
+
+        assertTrue(updatedNetwork.getContainers().containsKey(container.getId()));
+
+        dockerClient.disconnectFromNetworkCmd().withNetworkId(network.getId()).withContainerId(container.getId()).exec();
+
+        updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
+
+        assertFalse(updatedNetwork.getContainers().containsKey(container.getId()));
+    }
+
+    @Test
+    public void forceDisconnectFromNetwork() throws InterruptedException {
+
+        CreateNetworkResponse network = dockerClient.createNetworkCmd().withName("testNetwork").exec();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withNetworkMode("testNetwork")
+                .withCmd("sleep", "9999")
+                .exec();
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        dockerClient.disconnectFromNetworkCmd()
+                .withNetworkId(network.getId())
+                .withContainerId(container.getId())
+                .withForce(true)
+                .exec();
+
+        Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
+        assertFalse(updatedNetwork.getContainers().containsKey(container.getId()));
+    }
+}

From 19acfcc8496ace6fe52c25d1359c7f891c01a04b Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 2 Jun 2016 21:54:43 +0200
Subject: [PATCH 0545/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4a771d25..7a6bae5af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,8 @@ All changes
 * [#574] (https://github.com/docker-java/docker-java/pull/574) Fix for copyArchiveToContainerCmd bug
 * [#572] (https://github.com/docker-java/docker-java/pull/572) Inspect container command now shows sizes if requested 
 * [#563] (https://github.com/docker-java/docker-java/pull/563) Fix memory leak in netty implementation of DockerCmdExecFactory
-* [#550] (https://github.com/docker-java/docker-java/pull/550) Add ability to configure IPAM config for CreateNetworkCmd 
+* [#550] (https://github.com/docker-java/docker-java/pull/550) Add ability to configure IPAM config for CreateNetworkCmd
+* [#484] (https://github.com/docker-java/docker-java/pull/484) Implement missing network api options for v1.22
 
 Included in 3.0.0-RC5
 

From 7d1f64f7678b9857b3605558434c76d140aac172 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 2 Jun 2016 23:19:50 +0200
Subject: [PATCH 0546/1272] Fix issue #480

---
 .../dockerjava/core/DockerClientConfig.java      | 16 ++++++++++------
 ...b.dockerjava.api.command.DockerCmdExecFactory |  1 -
 src/main/resources/docker-java.properties        | 12 +++---------
 .../dockerjava/core/DockerClientConfigTest.java  | 10 +++-------
 4 files changed, 16 insertions(+), 23 deletions(-)
 delete mode 100644 src/main/resources/META-INF/services/com.github.dockerjava.api.command.DockerCmdExecFactory

diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index a03d6e086..31cfc0c58 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -109,14 +109,16 @@ private String checkDockerCertPath(boolean dockerTlsVerify, String dockerCertPat
 
                 if (!certPath.exists()) {
                     throw new DockerClientException(
-                            "Certificate path (DOCKER_CERT_PATH) '" + dockerCertPath + "' doesn't exist.");
+                            "Enabled TLS verification (DOCKER_TLS_VERIFY=1) but certificate path (DOCKER_CERT_PATH) '" + dockerCertPath
+                                    + "' doesn't exist.");
                 }
 
                 if (certPath.isDirectory()) {
                     return dockerCertPath;
                 } else {
                     throw new DockerClientException(
-                            "Certificate path (DOCKER_CERT_PATH) '" + dockerCertPath + "' doesn't point to a directory.");
+                            "Enabled TLS verification (DOCKER_TLS_VERIFY=1) but certificate path (DOCKER_CERT_PATH) '" + dockerCertPath
+                                    + "' doesn't point to a directory.");
                 }
             }
         } else {
@@ -375,7 +377,6 @@ public final DockerClientConfigBuilder withDockerHost(String dockerHost) {
             return this;
         }
 
-
         public final DockerClientConfigBuilder withApiVersion(RemoteApiVersion apiVersion) {
             this.apiVersion = apiVersion.getVersion();
             return this;
@@ -417,8 +418,12 @@ public final DockerClientConfigBuilder withDockerConfig(String dockerConfig) {
         }
 
         public final DockerClientConfigBuilder withDockerTlsVerify(String dockerTlsVerify) {
-            String trimmed = dockerTlsVerify.trim();
-            this.dockerTlsVerify = "true".equalsIgnoreCase(trimmed) || "1".equals(trimmed);
+            if (dockerTlsVerify != null) {
+                String trimmed = dockerTlsVerify.trim();
+                this.dockerTlsVerify = "true".equalsIgnoreCase(trimmed) || "1".equals(trimmed);
+            } else {
+                this.dockerTlsVerify = false;
+            }
             return this;
         }
 
@@ -433,4 +438,3 @@ public DockerClientConfig build() {
         }
     }
 }
-
diff --git a/src/main/resources/META-INF/services/com.github.dockerjava.api.command.DockerCmdExecFactory b/src/main/resources/META-INF/services/com.github.dockerjava.api.command.DockerCmdExecFactory
deleted file mode 100644
index f0686bc9f..000000000
--- a/src/main/resources/META-INF/services/com.github.dockerjava.api.command.DockerCmdExecFactory
+++ /dev/null
@@ -1 +0,0 @@
-com.github.dockerjava.jaxrs.DockerCmdExecFactoryImpl
\ No newline at end of file
diff --git a/src/main/resources/docker-java.properties b/src/main/resources/docker-java.properties
index ea85f6c01..fc9209c97 100644
--- a/src/main/resources/docker-java.properties
+++ b/src/main/resources/docker-java.properties
@@ -1,13 +1,7 @@
-#docker.io.url=https://localhost:2376
-#docker.io.dockerCertPath=${user.home}/.docker
-#docker.io.dockerCfgPath=${user.home}/.dockercfg
-#docker.io.username=${user.name}
-#docker.io.serverAddress=https://index.docker.io/v1/
-#
-DOCKER_HOST=tcp://localhost:2376
-DOCKER_TLS_VERIFY=1
+DOCKER_HOST=unix:///var/run/docker.sock
 DOCKER_CONFIG=${user.home}/.docker
-DOCKER_CERT_PATH=${user.home}/.docker/certs
+#DOCKER_TLS_VERIFY=1
+#DOCKER_CERT_PATH=${user.home}/.docker/certs
 
 api.version=
 registry.url=https://index.docker.io/v1/
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
index a363e12ec..ee679a0af 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
@@ -4,8 +4,7 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.core.Is.is;
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.assertNull;
 
 import java.lang.reflect.Field;
 import java.net.URI;
@@ -54,8 +53,6 @@ public void environmentDockerHost() throws Exception {
         // and it looks to be SSL disabled
         env.remove("DOCKER_CERT_PATH");
 
-
-
         // given default cert path
         Properties systemProperties = new Properties();
         systemProperties.setProperty("user.name", "someUserName");
@@ -82,7 +79,6 @@ public void environment() throws Exception {
         env.put(DockerClientConfig.DOCKER_CERT_PATH, dockerCertPath());
         env.put(DockerClientConfig.DOCKER_TLS_VERIFY, "1");
 
-
         // when you build a config
         DockerClientConfig config = buildConfig(env, new Properties());
 
@@ -106,12 +102,12 @@ public void defaults() throws Exception {
         DockerClientConfig config = buildConfig(Collections.<String, String> emptyMap(), systemProperties);
 
         // then the cert path is as expected
-        assertEquals(config.getDockerHost(), URI.create("tcp://localhost:2376"));
+        assertEquals(config.getDockerHost(), URI.create("unix:///var/run/docker.sock"));
         assertEquals(config.getRegistryUsername(), "someUserName");
         assertEquals(config.getRegistryUrl(), AuthConfig.DEFAULT_SERVER_ADDRESS);
         assertEquals(config.getApiVersion(), RemoteApiVersion.unknown());
         assertEquals(config.getDockerConfig(), homeDir() + "/.docker");
-        assertEquals(config.getDockerCertPath(), homeDir() + "/.docker/certs");
+        assertNull(config.getDockerCertPath());
     }
 
     @Test

From 94e860e574d7eebc64ee8e7fa4090d1d4c82d8a7 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 3 Jun 2016 21:12:42 +0200
Subject: [PATCH 0547/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a6bae5af..ee0dae776 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ Notes
 * The configuration has been changed to better match the docker CLI configuration options. The properties file was renamed from `docker.io.properties` to `docker-java.properties`. See README.md for details.
 
 All changes
-
+* [#590] (https://github.com/docker-java/docker-java/pull/590) Fix default docker.properties to match with docker CLI defaults 
 * [#585] (https://github.com/docker-java/docker-java/pull/585) Add RootDir property to GraphData
 * [#580] (https://github.com/docker-java/docker-java/pull/580) Fixes execute permissions for files when copied to container 
 * [#579] (https://github.com/docker-java/docker-java/pull/579) Adds missing name filter evaluation to netty version of ListImagesCmdExec 

From fc38f319311821f790c1dcb8f1990676cc0e44f3 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 3 Jun 2016 21:53:02 +0200
Subject: [PATCH 0548/1272] [maven-release-plugin] prepare release
 docker-java-3.0.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9ee5cad51..3b77e6e98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>3.0.0</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>docker-java-3.0.0</tag>
 	</scm>
 
 	<developers>

From 37afc15c5baeb5f479a56ca5e858bf230adb1102 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Fri, 3 Jun 2016 21:53:10 +0200
Subject: [PATCH 0549/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3b77e6e98..bee178a6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.0</version>
+	<version>3.0.1-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>docker-java-3.0.0</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 2f3d90c0a6bd564f8f8c53696198f9d74cdcd045 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 3 Jun 2016 22:02:41 +0200
Subject: [PATCH 0550/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee0dae776..f55b2cd75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,11 @@
 Change Log
 ===
 
-3.0.0-SNAPSHOT
+v3.0.0
 ---
 Notes
 
-* The upcoming release will contain multiple API breaking changes therefore the major version switch. It will support a subset of v.1.22 of the docker remote API. It also includes an experimental netty based implementation of `DockerCmdExecFactory` that probably will replace the current jersey/httpclient based one in a later release.
+* The 3.0.0 release contains multiple API breaking changes compared to 2.x therefore the major version switch. It supports a subset of v.1.22 of the docker remote API. It also includes an experimental netty based implementation of `DockerCmdExecFactory` that probably will replace the current jersey/httpclient based one in a later release. Take a look at the [Wiki](https://github.com/docker-java/docker-java/wiki#intialize-docker-client-advanced) how to use it.
 * The configuration has been changed to better match the docker CLI configuration options. The properties file was renamed from `docker.io.properties` to `docker-java.properties`. See README.md for details.
 
 All changes

From 9a59b10c5a28e6ae4d29af770f2412b1f88fc7dd Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Fri, 3 Jun 2016 22:54:02 +0200
Subject: [PATCH 0551/1272] Update README.md

---
 README.md | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index f2135f61b..1b39ebab3 100644
--- a/README.md
+++ b/README.md
@@ -58,21 +58,12 @@ Run build without integration tests:
 ## Docker-Java maven dependencies
 
 ### Latest release version
-Supports a subset of the Docker Remote API [v1.19](https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.19.md), Docker Server version 1.7.x
-
-    <dependency>
-          <groupId>com.github.docker-java</groupId>
-          <artifactId>docker-java</artifactId>
-          <version>2.2.3</version>
-    </dependency>
-    
-### Latest release candidate
 Supports a subset of the Docker Remote API [v1.22](https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.22.md), Docker Server version 1.10.x
 
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>3.0.0-RC5</version>
+          <version>3.0.0</version>
     </dependency>
     
 ### Latest development version
@@ -83,7 +74,7 @@ You can find the latest development version including javadoc and source files o
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>3.0.0-SNAPSHOT</version>
+          <version>3.0.1-SNAPSHOT</version>
     </dependency>
     
 

From 0a1b34c3b2a201f82a16821e1f3f6ca0337854ca Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Sat, 4 Jun 2016 00:16:29 +0200
Subject: [PATCH 0552/1272] Update README.md

---
 README.md | 44 +++++++++++++++-----------------------------
 1 file changed, 15 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 1b39ebab3..e47b6e5a4 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,9 @@ Java API client for [Docker](http://docs.docker.io/ "Docker")
 
 Developer forum for [docker-java](https://groups.google.com/forum/?#!forum/docker-java-dev "docker-java")
 
+[Changelog](https://github.com/docker-java/docker-java/blob/master/CHANGELOG.md)<br/>
+[Wiki](https://github.com/docker-java/docker-java/wiki)
+
 ## Build with Maven
 
 ###### Prerequisites:
@@ -15,10 +18,6 @@ Developer forum for [docker-java](https://groups.google.com/forum/?#!forum/docke
 * Java 1.7
 * Maven 3.0.5
 
-If you need SSL, then you'll need to put your `*.pem` file into `~/.docker/`, if you're using boot2docker, do this: 
- 
-    $ ln -s /Users/alex.collins/.boot2docker/certs/boot2docker-vm .docker
-
 Build and run integration tests as follows:
 
     $ mvn clean install
@@ -27,35 +26,22 @@ If you do not have access to a Docker server or just want to execute the build q
 
     $ mvn clean install -DskipITs
 
-By default Docker server is using UNIX sockets for communication with the Docker client, however docker-java
-client uses TCP/IP to connect to the Docker server by default, so you will need to make sure that your Docker server is
-listening on TCP port. To allow Docker server to use TCP add the following line to /etc/default/docker
+By default the docker engine is using local UNIX sockets for communication with the docker CLI so docker-java
+client also uses UNIX domain sockets to connect to the docker daemon by default. To make the docker daemon listening on a TCP (http/https) port you have to configure it by setting the DOCKER_OPTS environment variable to something like the following: 
 
     DOCKER_OPTS="-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock"
-
-However you can force docker-java to use UNIX socket communication by configure the following (see [Configuration](.#Configuration) for details):
-
-    DOCKER_HOST=unix:///var/run/docker.sock
-    DOCKER_TLS_VERIFY=0
-
+    
 More details about setting up Docker server can be found in official documentation: http://docs.docker.io/en/latest/use/basics/
 
-Now make sure that docker is up:
+To force docker-java to use TCP (http) configure the following (see [Configuration](https://github.com/docker-java/docker-java#configuration) for details):
 
-    $ docker -H tcp://127.0.0.1:2375 version
-
-    Client version: 0.8.0
-	Go version (client): go1.2
-	Git commit (client): cc3a8c8
-	Server version: 1.2.0
-	Git commit (server): fa7b24f
-	Go version (server): go1.3.1
-
-Run build without integration tests:
-
-    $ mvn clean install -DskipITs
+    DOCKER_HOST=tcp://127.0.0.1:2375
+    
+For secure tls (https) communication:   
 
-## Docker-Java maven dependencies
+    DOCKER_HOST=tcp://127.0.0.1:2376
+    DOCKER_TLS_VERIFY=1
+    DOCKER_CERT_PATH=/Users/marcus/.docker/machine/machines/docker-1.10.2
 
 ### Latest release version
 Supports a subset of the Docker Remote API [v1.22](https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.22.md), Docker Server version 1.10.x
@@ -128,11 +114,11 @@ In your application, e.g.
 
 ##### System Properties:
 
-    java -Dregistry.username=dockeruser pkg.Main
+    java -DDOCKER_HOST=tcp://localhost:2375 -Dregistry.username=dockeruser pkg.Main
 
 ##### System Environment
 
-    export DOCKER_URL=tcp://localhost:2376
+    export DOCKER_HOST=tcp://localhost:2376
     export DOCKER_TLS_VERIFY=1
     export DOCKER_CERT_PATH=/home/user/.docker/certs
     export DOCKER_CONFIG=/home/user/.docker

From 3a3318282a4cf5d37b20b7d85ac00ef7549df84d Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Sun, 5 Jun 2016 15:30:00 +0200
Subject: [PATCH 0553/1272] Reorganize image build tests

---
 .../client/AbstractDockerClientTest.java      |   2 -
 .../core/command/BuildImageCmdImplTest.java   | 144 +++++-----------
 .../DockerfileAddMultipleFilesTest.java       |  14 +-
 .../core/dockerfile/DockerfileTest.java       |  49 ------
 .../netty/exec/BuildImageCmdExecTest.java     | 159 +++++++-----------
 .../ADD/file}/Dockerfile                      |   0
 .../ADD/file}/testrun.sh                      |   0
 .../ADD/fileInSubfolder}/Dockerfile           |   0
 .../ADD/fileInSubfolder}/files/testrun.sh     |   0
 .../ADD/files}/Dockerfile                     |   0
 .../ADD/files}/src1                           |   0
 .../ADD/files}/src2                           |   0
 .../ADD/filesViaWildcard}/Dockerfile          |   0
 .../ADD/filesViaWildcard}/folder1/testrun.sh  |   0
 .../filesViaWildcard}/folder2/testinclude1.sh |   0
 .../filesViaWildcard}/ignore/testinclude2.sh  |   0
 .../ADD/folder}/Dockerfile                    |   0
 .../ADD/folder}/folderA/testAddFolder.sh      |   0
 .../ADD/url}/Dockerfile                       |   2 +-
 .../resources/buildTests/ADD/url/testrun.sh   |   4 +
 .../{nginx => buildTests/AUTHOR}/Dockerfile   |   2 +-
 .../ENV}/Dockerfile                           |   0
 .../ENV}/subst-file-2-abc123.txt              |   0
 .../ENV}/subst-file-abc123.txt                |   0
 .../ENV}/testrun.sh                           |   0
 .../FROM/privateRegistry}/Dockerfile          |   0
 .../ONBUILD/child}/Dockerfile                 |   0
 .../ONBUILD/child}/testrun.sh                 |   0
 .../ONBUILD/parent}/Dockerfile                |   0
 .../buildArgs}/Dockerfile                     |   0
 .../dockerfileFolder/Dockerfile               |   0
 .../testrunFolder/testrun.sh                  |   0
 .../DockerfileIgnored}/.dockerignore          |   0
 .../DockerfileIgnored}/Dockerfile             |   0
 .../DockerfileIgnored}/testrun.sh             |   0
 .../DockerfileNotIgnored}/.dockerignore       |   0
 .../DockerfileNotIgnored}/Dockerfile          |   0
 .../InvalidDockerignorePattern}/.dockerignore |   0
 .../InvalidDockerignorePattern}/Dockerfile    |   0
 .../InvalidDockerignorePattern}/testrun.sh    |   0
 .../ValidDockerignorePattern}/.dockerignore   |   0
 .../ValidDockerignorePattern}/Dockerfile      |   0
 .../ValidDockerignorePattern}/a/a             |   0
 .../ValidDockerignorePattern}/a/b             |   0
 .../ValidDockerignorePattern}/a/c             |   0
 .../ValidDockerignorePattern}/a/d             |   0
 .../ValidDockerignorePattern}/testrun.sh      |   0
 src/test/resources/netcat/Dockerfile          |  11 --
 .../subdirectory/Dockerfile-nonstandard       |  12 --
 src/test/resources/testAddUrl/testrun.sh      |   4 -
 src/test/resources/testEnv/Dockerfile         |  10 --
 .../resources/testEnv/subFolder/testrun.sh    |   3 -
 52 files changed, 111 insertions(+), 305 deletions(-)
 delete mode 100644 src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java
 rename src/test/resources/{testAddFile => buildTests/ADD/file}/Dockerfile (100%)
 rename src/test/resources/{testAddFile => buildTests/ADD/file}/testrun.sh (100%)
 rename src/test/resources/{testAddFileInSubfolder => buildTests/ADD/fileInSubfolder}/Dockerfile (100%)
 rename src/test/resources/{testAddFileInSubfolder => buildTests/ADD/fileInSubfolder}/files/testrun.sh (100%)
 rename src/test/resources/{testAddMultipleFiles => buildTests/ADD/files}/Dockerfile (100%)
 rename src/test/resources/{testAddMultipleFiles => buildTests/ADD/files}/src1 (100%)
 rename src/test/resources/{testAddMultipleFiles => buildTests/ADD/files}/src2 (100%)
 rename src/test/resources/{testAddFilesViaWildcard => buildTests/ADD/filesViaWildcard}/Dockerfile (100%)
 rename src/test/resources/{testAddFilesViaWildcard => buildTests/ADD/filesViaWildcard}/folder1/testrun.sh (100%)
 rename src/test/resources/{testAddFilesViaWildcard => buildTests/ADD/filesViaWildcard}/folder2/testinclude1.sh (100%)
 rename src/test/resources/{testAddFilesViaWildcard => buildTests/ADD/filesViaWildcard}/ignore/testinclude2.sh (100%)
 rename src/test/resources/{testAddFolder => buildTests/ADD/folder}/Dockerfile (100%)
 rename src/test/resources/{testAddFolder => buildTests/ADD/folder}/folderA/testAddFolder.sh (100%)
 rename src/test/resources/{testAddUrl => buildTests/ADD/url}/Dockerfile (71%)
 create mode 100755 src/test/resources/buildTests/ADD/url/testrun.sh
 rename src/test/resources/{nginx => buildTests/AUTHOR}/Dockerfile (81%)
 rename src/test/resources/{testENVSubstitution => buildTests/ENV}/Dockerfile (100%)
 rename src/test/resources/{testENVSubstitution => buildTests/ENV}/subst-file-2-abc123.txt (100%)
 rename src/test/resources/{testENVSubstitution => buildTests/ENV}/subst-file-abc123.txt (100%)
 rename src/test/resources/{testENVSubstitution => buildTests/ENV}/testrun.sh (100%)
 rename src/test/resources/{testBuildFromPrivateRegistry => buildTests/FROM/privateRegistry}/Dockerfile (100%)
 rename src/test/resources/{testAddOnBuild/test => buildTests/ONBUILD/child}/Dockerfile (100%)
 rename src/test/resources/{testAddOnBuild/test => buildTests/ONBUILD/child}/testrun.sh (100%)
 rename src/test/resources/{testAddOnBuild/onbuild => buildTests/ONBUILD/parent}/Dockerfile (100%)
 rename src/test/resources/{testBuildArgs => buildTests/buildArgs}/Dockerfile (100%)
 rename src/test/resources/{testDockerfileNotInBaseDirectory => buildTests/dockerfileNotInBaseDirectory}/dockerfileFolder/Dockerfile (100%)
 rename src/test/resources/{testDockerfileNotInBaseDirectory => buildTests/dockerfileNotInBaseDirectory}/testrunFolder/testrun.sh (100%)
 rename src/test/resources/{testDockerfileIgnored => buildTests/dockerignore/DockerfileIgnored}/.dockerignore (100%)
 rename src/test/resources/{testDockerfileIgnored => buildTests/dockerignore/DockerfileIgnored}/Dockerfile (100%)
 rename src/test/resources/{testDockerfileIgnored => buildTests/dockerignore/DockerfileIgnored}/testrun.sh (100%)
 rename src/test/resources/{testDockerfileNotIgnored => buildTests/dockerignore/DockerfileNotIgnored}/.dockerignore (100%)
 rename src/test/resources/{testDockerfileNotIgnored => buildTests/dockerignore/DockerfileNotIgnored}/Dockerfile (100%)
 rename src/test/resources/{testInvalidDockerignorePattern => buildTests/dockerignore/InvalidDockerignorePattern}/.dockerignore (100%)
 rename src/test/resources/{testInvalidDockerignorePattern => buildTests/dockerignore/InvalidDockerignorePattern}/Dockerfile (100%)
 rename src/test/resources/{testInvalidDockerignorePattern => buildTests/dockerignore/InvalidDockerignorePattern}/testrun.sh (100%)
 rename src/test/resources/{testDockerignore => buildTests/dockerignore/ValidDockerignorePattern}/.dockerignore (100%)
 rename src/test/resources/{testDockerignore => buildTests/dockerignore/ValidDockerignorePattern}/Dockerfile (100%)
 rename src/test/resources/{testDockerignore => buildTests/dockerignore/ValidDockerignorePattern}/a/a (100%)
 rename src/test/resources/{testDockerignore => buildTests/dockerignore/ValidDockerignorePattern}/a/b (100%)
 rename src/test/resources/{testDockerignore => buildTests/dockerignore/ValidDockerignorePattern}/a/c (100%)
 rename src/test/resources/{testDockerignore => buildTests/dockerignore/ValidDockerignorePattern}/a/d (100%)
 rename src/test/resources/{testDockerignore => buildTests/dockerignore/ValidDockerignorePattern}/testrun.sh (100%)
 delete mode 100644 src/test/resources/netcat/Dockerfile
 delete mode 100644 src/test/resources/nonstandard/subdirectory/Dockerfile-nonstandard
 delete mode 100755 src/test/resources/testAddUrl/testrun.sh
 delete mode 100644 src/test/resources/testEnv/Dockerfile
 delete mode 100755 src/test/resources/testEnv/subFolder/testrun.sh

diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 4c8750ecc..231e709c1 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -228,8 +228,6 @@ public static class LogContainerTestCallback extends LogContainerResultCallback
         @Override
         public void onNext(Frame frame) {
             log.append(new String(frame.getPayload()));
-            System.err.println("LogContainerTestCallback: " + log.toString());
-            // super.onNext(frame);
         }
 
         @Override
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 950b80a24..31f3c3045 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -5,7 +5,6 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 
 import java.io.File;
@@ -26,7 +25,6 @@
 
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.command.InspectImageResponse;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.AuthConfig;
@@ -61,10 +59,9 @@ public void afterMethod(ITestResult result) {
     }
 
     @Test
-    public void testNginxDockerfileBuilder() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("nginx").getFile());
+    public void author() throws Exception {
 
-        String imageId = buildImage(baseDir);
+        String imageId = buildImage(fileFromBuildTestResource("AUTHOR"));
 
         InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
         assertThat(inspectImageResponse, not(nullValue()));
@@ -73,27 +70,9 @@ public void testNginxDockerfileBuilder() throws Exception {
         assertThat(inspectImageResponse.getAuthor(), equalTo("Guillaume J. Charmes \"guillaume@dotcloud.com\""));
     }
 
-    @Test(groups = "ignoreInCircleCi")
-    public void testNonstandard1() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader()
-                .getResource("nonstandard/subdirectory/Dockerfile-nonstandard").getFile());
-
-        buildImage(baseDir);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void testNonstandard2() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("nonstandard").getFile());
-        File dockerFile = new File(Thread.currentThread().getContextClassLoader()
-                .getResource("nonstandard/subdirectory/Dockerfile-nonstandard").getFile());
-
-        dockerClient.buildImageCmd().withBaseDirectory(baseDir).withDockerfile(dockerFile).withNoCache(true)
-                .exec(new BuildImageResultCallback()).awaitImageId();
-    }
-
     @Test
-    public void testDockerBuilderFromTar() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddFile").getFile());
+    public void buildImageFromTar() throws Exception {
+        File baseDir = fileFromBuildTestResource("ADD/file");
         Collection<File> files = FileUtils.listFiles(baseDir, TrueFileFilter.INSTANCE, TrueFileFilter.INSTANCE);
         File tarFile = CompressArchiveUtil.archiveTARFiles(baseDir, files, UUID.randomUUID().toString());
         String response = dockerfileBuild(new FileInputStream(tarFile));
@@ -101,54 +80,45 @@ public void testDockerBuilderFromTar() throws Exception {
     }
 
     @Test
-    public void testDockerBuildWithOnBuild() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddOnBuild/onbuild")
-                .getFile());
+    public void onBuild() throws Exception {
+        File baseDir = fileFromBuildTestResource("ONBUILD/parent");
+
         dockerClient.buildImageCmd(baseDir).withNoCache(true).withTag("docker-java-onbuild")
                 .exec(new BuildImageResultCallback()).awaitImageId();
-        baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddOnBuild/test").getFile());
+        baseDir = fileFromBuildTestResource("ONBUILD/child");
         String response = dockerfileBuild(baseDir);
         assertThat(response, containsString("Successfully executed testrun.sh"));
     }
 
     @Test
-    public void testDockerBuilderAddUrl() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddUrl").getFile());
+    public void addUrl() throws Exception {
+        File baseDir = fileFromBuildTestResource("ADD/url");
         String response = dockerfileBuild(baseDir);
-        assertThat(response, containsString("Docker"));
+        assertThat(response, containsString("Example Domain"));
     }
 
     @Test
-    public void testDockerBuilderAddFileInSubfolder() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddFileInSubfolder")
-                .getFile());
+    public void addFileInSubfolder() throws Exception {
+        File baseDir = fileFromBuildTestResource("ADD/fileInSubfolder");
         String response = dockerfileBuild(baseDir);
         assertThat(response, containsString("Successfully executed testrun.sh"));
     }
 
     @Test
-    public void testDockerBuilderAddFilesViaWildcard() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddFilesViaWildcard")
-                .getFile());
+    public void addFilesViaWildcard() throws Exception {
+        File baseDir = fileFromBuildTestResource("ADD/filesViaWildcard");
         String response = dockerfileBuild(baseDir);
         assertThat(response, containsString("Successfully executed testinclude1.sh"));
         assertThat(response, not(containsString("Successfully executed testinclude2.sh")));
     }
 
     @Test
-    public void testDockerBuilderAddFolder() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddFolder").getFile());
+    public void addFolder() throws Exception {
+        File baseDir = fileFromBuildTestResource("ADD/folder");
         String response = dockerfileBuild(baseDir);
         assertThat(response, containsString("Successfully executed testAddFolder.sh"));
     }
 
-    @Test
-    public void testDockerBuilderEnv() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testEnv").getFile());
-        String response = dockerfileBuild(baseDir);
-        assertThat(response, containsString("Successfully executed testrun.sh"));
-    }
-
     private String dockerfileBuild(InputStream tarInputStream) throws Exception {
 
         return execBuild(dockerClient.buildImageCmd().withTarInputStream(tarInputStream));
@@ -175,80 +145,42 @@ private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
     }
 
     @Test(expectedExceptions = {DockerClientException.class})
-    public void testDockerfileIgnored() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerfileIgnored")
-                .getFile());
+    public void dockerignoreDockerfileIgnored() throws Exception {
+        File baseDir = fileFromBuildTestResource("dockerignore/DockerfileIgnored");
 
         dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
     }
 
     @Test
-    public void testDockerfileNotIgnored() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerfileNotIgnored")
-                .getFile());
+    public void dockerignoreDockerfileNotIgnored() throws Exception {
+        File baseDir = fileFromBuildTestResource("dockerignore/DockerfileNotIgnored");
 
         dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
     }
 
     @Test(expectedExceptions = {DockerClientException.class})
-    public void testInvalidDockerIgnorePattern() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader()
-                .getResource("testInvalidDockerignorePattern").getFile());
+    public void dockerignoreInvalidDockerIgnorePattern() throws Exception {
+        File baseDir = fileFromBuildTestResource("dockerignore/InvalidDockerignorePattern");
 
         dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
     }
 
-    @Test(groups = "ignoreInCircleCi")
-    public void testDockerIgnore() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerignore")
-                .getFile());
+    @Test()
+    public void dockerignoreValidDockerIgnorePattern() throws Exception {
+        File baseDir = fileFromBuildTestResource("dockerignore/ValidDockerignorePattern");
         String response = dockerfileBuild(baseDir);
         assertThat(response, containsString("/tmp/a/a /tmp/a/c /tmp/a/d"));
     }
 
     @Test
-    public void testNetCatDockerfileBuilder() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("netcat").getFile());
-
-        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback())
-                .awaitImageId();
-
-        assertNotNull(imageId, "Not successful in build");
-
-        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
-        assertThat(inspectImageResponse, not(nullValue()));
-        assertThat(inspectImageResponse.getId(), not(nullValue()));
-        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-
-        CreateContainerResponse container = dockerClient.createContainerCmd(inspectImageResponse.getId()).exec();
-        assertThat(container.getId(), not(isEmptyString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(inspectContainerResponse.getId(), notNullValue());
-        assertThat(inspectContainerResponse.getNetworkSettings().getPorts(), notNullValue());
-
-        // No use as such if not running on the server
-        // for (Ports.Port p : inspectContainerResponse.getNetworkSettings().getPorts().getAllPorts()) {
-        // int port = Integer.valueOf(p.getHostPort());
-        // LOG.info("Checking port {} is open", port);
-        // assertThat(available(port), is(false));
-        // }
-        dockerClient.stopContainerCmd(container.getId()).withTimeout(0).exec();
-
-    }
-
-    @Test
-    public void testAddAndCopySubstitution() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testENVSubstitution")
-                .getFile());
+    public void env() throws Exception {
+        File baseDir = fileFromBuildTestResource("ENV");
         String response = dockerfileBuild(baseDir);
         assertThat(response, containsString("testENVSubstitution successfully completed"));
     }
 
     @Test
-    public void testBuildFromPrivateRegistry() throws Exception {
+    public void fromPrivateRegistry() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("privateRegistry").getFile());
 
         String imageId = buildImage(baseDir);
@@ -289,8 +221,7 @@ public void testBuildFromPrivateRegistry() throws Exception {
 
         dockerClient.removeImageCmd("localhost:5000/testuser/busybox").withForce(true).exec();
 
-        baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testBuildFromPrivateRegistry")
-                .getFile());
+        baseDir = fileFromBuildTestResource("FROM/privateRegistry");
 
         AuthConfigurations authConfigurations = new AuthConfigurations();
         authConfigurations.addConfig(authConfig);
@@ -305,8 +236,8 @@ public void testBuildFromPrivateRegistry() throws Exception {
     }
 
     @Test
-    public void testBuildArgs() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testBuildArgs").getFile());
+    public void buildArgs() throws Exception {
+        File baseDir = fileFromBuildTestResource("buildArgs");
 
         String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc")
                 .exec(new BuildImageResultCallback())
@@ -319,9 +250,9 @@ public void testBuildArgs() throws Exception {
         assertThat(inspectImageResponse.getConfig().getLabels().get("test"), equalTo("abc"));
     }
 
-    public void testDockerfileNotInBaseDirectory() throws Exception {
-        File baseDirectory = getResource("testDockerfileNotInBaseDirectory");
-        File dockerfile = getResource("testDockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile");
+    public void dockerfileNotInBaseDirectory() throws Exception {
+        File baseDirectory = fileFromBuildTestResource("dockerfileNotInBaseDirectory");
+        File dockerfile = fileFromBuildTestResource("dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile");
         BuildImageCmd command = dockerClient.buildImageCmd()
                 .withBaseDirectory(baseDirectory)
                 .withDockerfile(dockerfile);
@@ -331,7 +262,8 @@ public void testDockerfileNotInBaseDirectory() throws Exception {
         assertThat(response, containsString("Successfully executed testrun.sh"));
     }
 
-    private File getResource(String path) {
-        return new File(Thread.currentThread().getContextClassLoader().getResource(path).getFile());
+    private File fileFromBuildTestResource(String resource) {
+        return new File(Thread.currentThread().getContextClassLoader()
+                .getResource("buildTests/" + resource).getFile());
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
index 8997a6d80..164246957 100644
--- a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
+++ b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
@@ -1,7 +1,7 @@
 package com.github.dockerjava.core.dockerfile;
 
 import com.google.common.base.Function;
-import junit.framework.TestCase;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.Test;
@@ -14,7 +14,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 
-public class DockerfileAddMultipleFilesTest extends TestCase {
+public class DockerfileAddMultipleFilesTest  {
 
     private static final Logger log = LoggerFactory.getLogger(DockerfileAddMultipleFilesTest.class);
 
@@ -26,13 +26,17 @@ public String apply(File file) {
     };
 
     @Test
-    public void testAddMultipleFiles() throws IOException {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddMultipleFiles")
-                .getFile());
+    public void addFiles() throws IOException {
+        File baseDir = fileFromBuildTestResource("ADD/files");
         Dockerfile dockerfile = new Dockerfile(new File(baseDir, "Dockerfile"), baseDir);
         Dockerfile.ScannedResult result = dockerfile.parse();
         Collection<String> filesToAdd = transform(result.filesToAdd, TO_FILE_NAMES);
 
         assertThat(filesToAdd, containsInAnyOrder("Dockerfile", "src1", "src2"));
     }
+
+    private File fileFromBuildTestResource(String resource) {
+        return new File(Thread.currentThread().getContextClassLoader()
+                .getResource("buildTests/" + resource).getFile());
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java
deleted file mode 100644
index 390bcf647..000000000
--- a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.github.dockerjava.core.dockerfile;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.annotations.Test;
-
-public class DockerfileTest extends TestCase {
-
-    private static final Logger log = LoggerFactory.getLogger(DockerfileTest.class);
-
-    @Test
-    public void testAllItems() throws IOException {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("netcat").getFile());
-
-        File root = baseDir.getParentFile();
-
-        Map<String, Dockerfile> dockerfiles = new HashMap<String, Dockerfile>();
-        Map<String, Dockerfile.ScannedResult> results = new HashMap<String, Dockerfile.ScannedResult>();
-
-        for (File child : root.listFiles()) {
-            if (new File(child, "Dockerfile").exists()) {
-                Dockerfile dockerfile = new Dockerfile(new File(child, "Dockerfile"), baseDir);
-                dockerfiles.put(child.getName(), dockerfile);
-            }
-        }
-
-        for (String name : dockerfiles.keySet()) {
-            log.info("Scanning {}", name);
-            try {
-                results.put(name, dockerfiles.get(name).parse());
-            } catch (Exception ex) {
-                log.error("Error in {}", name, ex);
-            }
-
-        }
-
-        for (String name : results.keySet()) {
-            log.info("Name: {} = {}", name, results.get(name));
-        }
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
index 92975f38f..1474ef25f 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
@@ -5,7 +5,6 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 
 import java.io.File;
@@ -65,10 +64,9 @@ public void afterMethod(ITestResult result) {
     }
 
     @Test
-    public void testNginxDockerfileBuilder() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("nginx").getFile());
+    public void author() throws Exception {
 
-        String imageId = buildImage(baseDir);
+        String imageId = buildImage(fileFromBuildTestResource("AUTHOR"));
 
         InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
         assertThat(inspectImageResponse, not(nullValue()));
@@ -77,27 +75,9 @@ public void testNginxDockerfileBuilder() throws Exception {
         assertThat(inspectImageResponse.getAuthor(), equalTo("Guillaume J. Charmes \"guillaume@dotcloud.com\""));
     }
 
-    @Test(groups = "ignoreInCircleCi")
-    public void testNonstandard1() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader()
-                .getResource("nonstandard/subdirectory/Dockerfile-nonstandard").getFile());
-
-        buildImage(baseDir);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void testNonstandard2() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("nonstandard").getFile());
-        File dockerFile = new File(Thread.currentThread().getContextClassLoader()
-                .getResource("nonstandard/subdirectory/Dockerfile-nonstandard").getFile());
-
-        dockerClient.buildImageCmd().withBaseDirectory(baseDir).withDockerfile(dockerFile).withNoCache(true)
-                .exec(new BuildImageResultCallback()).awaitImageId();
-    }
-
     @Test
-    public void testDockerBuilderFromTar() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddFile").getFile());
+    public void buildImageFromTar() throws Exception {
+        File baseDir = fileFromBuildTestResource("ADD/file");
         Collection<File> files = FileUtils.listFiles(baseDir, TrueFileFilter.INSTANCE, TrueFileFilter.INSTANCE);
         File tarFile = CompressArchiveUtil.archiveTARFiles(baseDir, files, UUID.randomUUID().toString());
         String response = dockerfileBuild(new FileInputStream(tarFile));
@@ -105,41 +85,43 @@ public void testDockerBuilderFromTar() throws Exception {
     }
 
     @Test
-    public void testDockerBuilderAddUrl() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddUrl").getFile());
+    public void onBuild() throws Exception {
+        File baseDir = fileFromBuildTestResource("ONBUILD/parent");
+
+        dockerClient.buildImageCmd(baseDir).withNoCache(true).withTag("docker-java-onbuild")
+                .exec(new BuildImageResultCallback()).awaitImageId();
+        baseDir = fileFromBuildTestResource("ONBUILD/child");
         String response = dockerfileBuild(baseDir);
-        assertThat(response, containsString("Docker"));
+        assertThat(response, containsString("Successfully executed testrun.sh"));
     }
 
     @Test
-    public void testDockerBuilderAddFileInSubfolder() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddFileInSubfolder")
-                .getFile());
+    public void addUrl() throws Exception {
+        File baseDir = fileFromBuildTestResource("ADD/url");
         String response = dockerfileBuild(baseDir);
-        assertThat(response, containsString("Successfully executed testrun.sh"));
+        assertThat(response, containsString("Example Domain"));
     }
 
     @Test
-    public void testDockerBuilderAddFilesViaWildcard() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddFilesViaWildcard")
-                .getFile());
+    public void addFileInSubfolder() throws Exception {
+        File baseDir = fileFromBuildTestResource("ADD/fileInSubfolder");
         String response = dockerfileBuild(baseDir);
-        assertThat(response, containsString("Successfully executed testinclude1.sh"));
-        assertThat(response, not(containsString("Successfully executed testinclude2.sh")));
+        assertThat(response, containsString("Successfully executed testrun.sh"));
     }
 
     @Test
-    public void testDockerBuilderAddFolder() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testAddFolder").getFile());
+    public void addFilesViaWildcard() throws Exception {
+        File baseDir = fileFromBuildTestResource("ADD/filesViaWildcard");
         String response = dockerfileBuild(baseDir);
-        assertThat(response, containsString("Successfully executed testAddFolder.sh"));
+        assertThat(response, containsString("Successfully executed testinclude1.sh"));
+        assertThat(response, not(containsString("Successfully executed testinclude2.sh")));
     }
 
     @Test
-    public void testDockerBuilderEnv() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testEnv").getFile());
+    public void addFolder() throws Exception {
+        File baseDir = fileFromBuildTestResource("ADD/folder");
         String response = dockerfileBuild(baseDir);
-        assertThat(response, containsString("Successfully executed testrun.sh"));
+        assertThat(response, containsString("Successfully executed testAddFolder.sh"));
     }
 
     private String dockerfileBuild(InputStream tarInputStream) throws Exception {
@@ -168,80 +150,42 @@ private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
     }
 
     @Test(expectedExceptions = {DockerClientException.class})
-    public void testDockerfileIgnored() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerfileIgnored")
-                .getFile());
+    public void dockerignoreDockerfileIgnored() throws Exception {
+        File baseDir = fileFromBuildTestResource("dockerignore/DockerfileIgnored");
 
         dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
     }
 
     @Test
-    public void testDockerfileNotIgnored() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerfileNotIgnored")
-                .getFile());
+    public void dockerignoreDockerfileNotIgnored() throws Exception {
+        File baseDir = fileFromBuildTestResource("dockerignore/DockerfileNotIgnored");
 
         dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
     }
 
     @Test(expectedExceptions = {DockerClientException.class})
-    public void testInvalidDockerIgnorePattern() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader()
-                .getResource("testInvalidDockerignorePattern").getFile());
+    public void dockerignoreInvalidDockerIgnorePattern() throws Exception {
+        File baseDir = fileFromBuildTestResource("dockerignore/InvalidDockerignorePattern");
 
         dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
     }
 
-    @Test(groups = "ignoreInCircleCi")
-    public void testDockerIgnore() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testDockerignore")
-                .getFile());
+    @Test()
+    public void dockerignoreValidDockerIgnorePattern() throws Exception {
+        File baseDir = fileFromBuildTestResource("dockerignore/ValidDockerignorePattern");
         String response = dockerfileBuild(baseDir);
         assertThat(response, containsString("/tmp/a/a /tmp/a/c /tmp/a/d"));
     }
 
     @Test
-    public void testNetCatDockerfileBuilder() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("netcat").getFile());
-
-        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback())
-                .awaitImageId();
-
-        assertNotNull(imageId, "Not successful in build");
-
-        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
-        assertThat(inspectImageResponse, not(nullValue()));
-        assertThat(inspectImageResponse.getId(), not(nullValue()));
-        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-
-        CreateContainerResponse container = dockerClient.createContainerCmd(inspectImageResponse.getId()).exec();
-        assertThat(container.getId(), not(isEmptyString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(inspectContainerResponse.getId(), notNullValue());
-        assertThat(inspectContainerResponse.getNetworkSettings().getPorts(), notNullValue());
-
-        // No use as such if not running on the server
-        // for (Ports.Port p : inspectContainerResponse.getNetworkSettings().getPorts().getAllPorts()) {
-        // int port = Integer.valueOf(p.getHostPort());
-        // LOG.info("Checking port {} is open", port);
-        // assertThat(available(port), is(false));
-        // }
-        dockerClient.stopContainerCmd(container.getId()).withTimeout(0).exec();
-
-    }
-
-    @Test
-    public void testAddAndCopySubstitution() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testENVSubstitution")
-                .getFile());
+    public void env() throws Exception {
+        File baseDir = fileFromBuildTestResource("ENV");
         String response = dockerfileBuild(baseDir);
         assertThat(response, containsString("testENVSubstitution successfully completed"));
     }
 
     @Test
-    public void testBuildFromPrivateRegistry() throws Exception {
+    public void fromPrivateRegistry() throws Exception {
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("privateRegistry").getFile());
 
         String imageId = buildImage(baseDir);
@@ -282,17 +226,13 @@ public void testBuildFromPrivateRegistry() throws Exception {
 
         dockerClient.removeImageCmd("localhost:5000/testuser/busybox").withForce(true).exec();
 
-        baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testBuildFromPrivateRegistry")
-                .getFile());
+        baseDir = fileFromBuildTestResource("FROM/privateRegistry");
 
         AuthConfigurations authConfigurations = new AuthConfigurations();
         authConfigurations.addConfig(authConfig);
 
-        imageId = dockerClient.buildImageCmd(baseDir)
-                .withNoCache(true)
-                .withBuildAuthConfigs(authConfigurations)
-                .exec(new BuildImageResultCallback())
-                .awaitImageId();
+        imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).withBuildAuthConfigs(authConfigurations)
+                .exec(new BuildImageResultCallback()).awaitImageId();
 
         inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
         assertThat(inspectImageResponse, not(nullValue()));
@@ -301,8 +241,8 @@ public void testBuildFromPrivateRegistry() throws Exception {
     }
 
     @Test
-    public void testBuildArgs() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("testBuildArgs").getFile());
+    public void buildArgs() throws Exception {
+        File baseDir = fileFromBuildTestResource("buildArgs");
 
         String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc")
                 .exec(new BuildImageResultCallback())
@@ -314,4 +254,21 @@ public void testBuildArgs() throws Exception {
 
         assertThat(inspectImageResponse.getConfig().getLabels().get("test"), equalTo("abc"));
     }
+
+    public void dockerfileNotInBaseDirectory() throws Exception {
+        File baseDirectory = fileFromBuildTestResource("dockerfileNotInBaseDirectory");
+        File dockerfile = fileFromBuildTestResource("dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile");
+        BuildImageCmd command = dockerClient.buildImageCmd()
+                .withBaseDirectory(baseDirectory)
+                .withDockerfile(dockerfile);
+
+        String response = execBuild(command);
+
+        assertThat(response, containsString("Successfully executed testrun.sh"));
+    }
+
+    private File fileFromBuildTestResource(String resource) {
+        return new File(Thread.currentThread().getContextClassLoader()
+                .getResource("buildTests/" + resource).getFile());
+    }
 }
diff --git a/src/test/resources/testAddFile/Dockerfile b/src/test/resources/buildTests/ADD/file/Dockerfile
similarity index 100%
rename from src/test/resources/testAddFile/Dockerfile
rename to src/test/resources/buildTests/ADD/file/Dockerfile
diff --git a/src/test/resources/testAddFile/testrun.sh b/src/test/resources/buildTests/ADD/file/testrun.sh
similarity index 100%
rename from src/test/resources/testAddFile/testrun.sh
rename to src/test/resources/buildTests/ADD/file/testrun.sh
diff --git a/src/test/resources/testAddFileInSubfolder/Dockerfile b/src/test/resources/buildTests/ADD/fileInSubfolder/Dockerfile
similarity index 100%
rename from src/test/resources/testAddFileInSubfolder/Dockerfile
rename to src/test/resources/buildTests/ADD/fileInSubfolder/Dockerfile
diff --git a/src/test/resources/testAddFileInSubfolder/files/testrun.sh b/src/test/resources/buildTests/ADD/fileInSubfolder/files/testrun.sh
similarity index 100%
rename from src/test/resources/testAddFileInSubfolder/files/testrun.sh
rename to src/test/resources/buildTests/ADD/fileInSubfolder/files/testrun.sh
diff --git a/src/test/resources/testAddMultipleFiles/Dockerfile b/src/test/resources/buildTests/ADD/files/Dockerfile
similarity index 100%
rename from src/test/resources/testAddMultipleFiles/Dockerfile
rename to src/test/resources/buildTests/ADD/files/Dockerfile
diff --git a/src/test/resources/testAddMultipleFiles/src1 b/src/test/resources/buildTests/ADD/files/src1
similarity index 100%
rename from src/test/resources/testAddMultipleFiles/src1
rename to src/test/resources/buildTests/ADD/files/src1
diff --git a/src/test/resources/testAddMultipleFiles/src2 b/src/test/resources/buildTests/ADD/files/src2
similarity index 100%
rename from src/test/resources/testAddMultipleFiles/src2
rename to src/test/resources/buildTests/ADD/files/src2
diff --git a/src/test/resources/testAddFilesViaWildcard/Dockerfile b/src/test/resources/buildTests/ADD/filesViaWildcard/Dockerfile
similarity index 100%
rename from src/test/resources/testAddFilesViaWildcard/Dockerfile
rename to src/test/resources/buildTests/ADD/filesViaWildcard/Dockerfile
diff --git a/src/test/resources/testAddFilesViaWildcard/folder1/testrun.sh b/src/test/resources/buildTests/ADD/filesViaWildcard/folder1/testrun.sh
similarity index 100%
rename from src/test/resources/testAddFilesViaWildcard/folder1/testrun.sh
rename to src/test/resources/buildTests/ADD/filesViaWildcard/folder1/testrun.sh
diff --git a/src/test/resources/testAddFilesViaWildcard/folder2/testinclude1.sh b/src/test/resources/buildTests/ADD/filesViaWildcard/folder2/testinclude1.sh
similarity index 100%
rename from src/test/resources/testAddFilesViaWildcard/folder2/testinclude1.sh
rename to src/test/resources/buildTests/ADD/filesViaWildcard/folder2/testinclude1.sh
diff --git a/src/test/resources/testAddFilesViaWildcard/ignore/testinclude2.sh b/src/test/resources/buildTests/ADD/filesViaWildcard/ignore/testinclude2.sh
similarity index 100%
rename from src/test/resources/testAddFilesViaWildcard/ignore/testinclude2.sh
rename to src/test/resources/buildTests/ADD/filesViaWildcard/ignore/testinclude2.sh
diff --git a/src/test/resources/testAddFolder/Dockerfile b/src/test/resources/buildTests/ADD/folder/Dockerfile
similarity index 100%
rename from src/test/resources/testAddFolder/Dockerfile
rename to src/test/resources/buildTests/ADD/folder/Dockerfile
diff --git a/src/test/resources/testAddFolder/folderA/testAddFolder.sh b/src/test/resources/buildTests/ADD/folder/folderA/testAddFolder.sh
similarity index 100%
rename from src/test/resources/testAddFolder/folderA/testAddFolder.sh
rename to src/test/resources/buildTests/ADD/folder/folderA/testAddFolder.sh
diff --git a/src/test/resources/testAddUrl/Dockerfile b/src/test/resources/buildTests/ADD/url/Dockerfile
similarity index 71%
rename from src/test/resources/testAddUrl/Dockerfile
rename to src/test/resources/buildTests/ADD/url/Dockerfile
index d9a0676d4..2b10c34e5 100644
--- a/src/test/resources/testAddUrl/Dockerfile
+++ b/src/test/resources/buildTests/ADD/url/Dockerfile
@@ -2,7 +2,7 @@ FROM      ubuntu:latest
 
 # Copy testrun.sh files into the container
 
-ADD	https://hub.docker.com/r/marcuslinke/busybox/       /tmp/docker_home.html
+ADD	http://www.example.com/index.html       /tmp/some.html
 ADD	./testrun.sh       /tmp/
 
 RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh
diff --git a/src/test/resources/buildTests/ADD/url/testrun.sh b/src/test/resources/buildTests/ADD/url/testrun.sh
new file mode 100755
index 000000000..4d240d5ae
--- /dev/null
+++ b/src/test/resources/buildTests/ADD/url/testrun.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cat /tmp/some.html
+
diff --git a/src/test/resources/nginx/Dockerfile b/src/test/resources/buildTests/AUTHOR/Dockerfile
similarity index 81%
rename from src/test/resources/nginx/Dockerfile
rename to src/test/resources/buildTests/AUTHOR/Dockerfile
index 2d0fa24cb..32ffcedc7 100644
--- a/src/test/resources/nginx/Dockerfile
+++ b/src/test/resources/buildTests/AUTHOR/Dockerfile
@@ -9,4 +9,4 @@ MAINTAINER Guillaume J. Charmes "guillaume@dotcloud.com"
 RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
 RUN apt-get update
 
-RUN apt-get install -y inotify-tools nginx apache2 openssh-server
\ No newline at end of file
+RUN apt-get install -y nginx
\ No newline at end of file
diff --git a/src/test/resources/testENVSubstitution/Dockerfile b/src/test/resources/buildTests/ENV/Dockerfile
similarity index 100%
rename from src/test/resources/testENVSubstitution/Dockerfile
rename to src/test/resources/buildTests/ENV/Dockerfile
diff --git a/src/test/resources/testENVSubstitution/subst-file-2-abc123.txt b/src/test/resources/buildTests/ENV/subst-file-2-abc123.txt
similarity index 100%
rename from src/test/resources/testENVSubstitution/subst-file-2-abc123.txt
rename to src/test/resources/buildTests/ENV/subst-file-2-abc123.txt
diff --git a/src/test/resources/testENVSubstitution/subst-file-abc123.txt b/src/test/resources/buildTests/ENV/subst-file-abc123.txt
similarity index 100%
rename from src/test/resources/testENVSubstitution/subst-file-abc123.txt
rename to src/test/resources/buildTests/ENV/subst-file-abc123.txt
diff --git a/src/test/resources/testENVSubstitution/testrun.sh b/src/test/resources/buildTests/ENV/testrun.sh
similarity index 100%
rename from src/test/resources/testENVSubstitution/testrun.sh
rename to src/test/resources/buildTests/ENV/testrun.sh
diff --git a/src/test/resources/testBuildFromPrivateRegistry/Dockerfile b/src/test/resources/buildTests/FROM/privateRegistry/Dockerfile
similarity index 100%
rename from src/test/resources/testBuildFromPrivateRegistry/Dockerfile
rename to src/test/resources/buildTests/FROM/privateRegistry/Dockerfile
diff --git a/src/test/resources/testAddOnBuild/test/Dockerfile b/src/test/resources/buildTests/ONBUILD/child/Dockerfile
similarity index 100%
rename from src/test/resources/testAddOnBuild/test/Dockerfile
rename to src/test/resources/buildTests/ONBUILD/child/Dockerfile
diff --git a/src/test/resources/testAddOnBuild/test/testrun.sh b/src/test/resources/buildTests/ONBUILD/child/testrun.sh
similarity index 100%
rename from src/test/resources/testAddOnBuild/test/testrun.sh
rename to src/test/resources/buildTests/ONBUILD/child/testrun.sh
diff --git a/src/test/resources/testAddOnBuild/onbuild/Dockerfile b/src/test/resources/buildTests/ONBUILD/parent/Dockerfile
similarity index 100%
rename from src/test/resources/testAddOnBuild/onbuild/Dockerfile
rename to src/test/resources/buildTests/ONBUILD/parent/Dockerfile
diff --git a/src/test/resources/testBuildArgs/Dockerfile b/src/test/resources/buildTests/buildArgs/Dockerfile
similarity index 100%
rename from src/test/resources/testBuildArgs/Dockerfile
rename to src/test/resources/buildTests/buildArgs/Dockerfile
diff --git a/src/test/resources/testDockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile b/src/test/resources/buildTests/dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile
similarity index 100%
rename from src/test/resources/testDockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile
rename to src/test/resources/buildTests/dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile
diff --git a/src/test/resources/testDockerfileNotInBaseDirectory/testrunFolder/testrun.sh b/src/test/resources/buildTests/dockerfileNotInBaseDirectory/testrunFolder/testrun.sh
similarity index 100%
rename from src/test/resources/testDockerfileNotInBaseDirectory/testrunFolder/testrun.sh
rename to src/test/resources/buildTests/dockerfileNotInBaseDirectory/testrunFolder/testrun.sh
diff --git a/src/test/resources/testDockerfileIgnored/.dockerignore b/src/test/resources/buildTests/dockerignore/DockerfileIgnored/.dockerignore
similarity index 100%
rename from src/test/resources/testDockerfileIgnored/.dockerignore
rename to src/test/resources/buildTests/dockerignore/DockerfileIgnored/.dockerignore
diff --git a/src/test/resources/testDockerfileIgnored/Dockerfile b/src/test/resources/buildTests/dockerignore/DockerfileIgnored/Dockerfile
similarity index 100%
rename from src/test/resources/testDockerfileIgnored/Dockerfile
rename to src/test/resources/buildTests/dockerignore/DockerfileIgnored/Dockerfile
diff --git a/src/test/resources/testDockerfileIgnored/testrun.sh b/src/test/resources/buildTests/dockerignore/DockerfileIgnored/testrun.sh
similarity index 100%
rename from src/test/resources/testDockerfileIgnored/testrun.sh
rename to src/test/resources/buildTests/dockerignore/DockerfileIgnored/testrun.sh
diff --git a/src/test/resources/testDockerfileNotIgnored/.dockerignore b/src/test/resources/buildTests/dockerignore/DockerfileNotIgnored/.dockerignore
similarity index 100%
rename from src/test/resources/testDockerfileNotIgnored/.dockerignore
rename to src/test/resources/buildTests/dockerignore/DockerfileNotIgnored/.dockerignore
diff --git a/src/test/resources/testDockerfileNotIgnored/Dockerfile b/src/test/resources/buildTests/dockerignore/DockerfileNotIgnored/Dockerfile
similarity index 100%
rename from src/test/resources/testDockerfileNotIgnored/Dockerfile
rename to src/test/resources/buildTests/dockerignore/DockerfileNotIgnored/Dockerfile
diff --git a/src/test/resources/testInvalidDockerignorePattern/.dockerignore b/src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/.dockerignore
similarity index 100%
rename from src/test/resources/testInvalidDockerignorePattern/.dockerignore
rename to src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/.dockerignore
diff --git a/src/test/resources/testInvalidDockerignorePattern/Dockerfile b/src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/Dockerfile
similarity index 100%
rename from src/test/resources/testInvalidDockerignorePattern/Dockerfile
rename to src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/Dockerfile
diff --git a/src/test/resources/testInvalidDockerignorePattern/testrun.sh b/src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/testrun.sh
similarity index 100%
rename from src/test/resources/testInvalidDockerignorePattern/testrun.sh
rename to src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/testrun.sh
diff --git a/src/test/resources/testDockerignore/.dockerignore b/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/.dockerignore
similarity index 100%
rename from src/test/resources/testDockerignore/.dockerignore
rename to src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/.dockerignore
diff --git a/src/test/resources/testDockerignore/Dockerfile b/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/Dockerfile
similarity index 100%
rename from src/test/resources/testDockerignore/Dockerfile
rename to src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/Dockerfile
diff --git a/src/test/resources/testDockerignore/a/a b/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/a
similarity index 100%
rename from src/test/resources/testDockerignore/a/a
rename to src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/a
diff --git a/src/test/resources/testDockerignore/a/b b/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/b
similarity index 100%
rename from src/test/resources/testDockerignore/a/b
rename to src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/b
diff --git a/src/test/resources/testDockerignore/a/c b/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/c
similarity index 100%
rename from src/test/resources/testDockerignore/a/c
rename to src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/c
diff --git a/src/test/resources/testDockerignore/a/d b/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/d
similarity index 100%
rename from src/test/resources/testDockerignore/a/d
rename to src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/d
diff --git a/src/test/resources/testDockerignore/testrun.sh b/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/testrun.sh
similarity index 100%
rename from src/test/resources/testDockerignore/testrun.sh
rename to src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/testrun.sh
diff --git a/src/test/resources/netcat/Dockerfile b/src/test/resources/netcat/Dockerfile
deleted file mode 100644
index 1974f1063..000000000
--- a/src/test/resources/netcat/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-# Firefox over VNC
-#
-# VERSION               0.3
-
-FROM ubuntu:latest
-
-#install netcat
-RUN apt-get install -y netcat
-
-EXPOSE 6900
-CMD    ["nc", "-l", "6900"]
\ No newline at end of file
diff --git a/src/test/resources/nonstandard/subdirectory/Dockerfile-nonstandard b/src/test/resources/nonstandard/subdirectory/Dockerfile-nonstandard
deleted file mode 100644
index 2d0fa24cb..000000000
--- a/src/test/resources/nonstandard/subdirectory/Dockerfile-nonstandard
+++ /dev/null
@@ -1,12 +0,0 @@
-# Nginx
-#
-# VERSION               0.0.1
-
-FROM      ubuntu:latest
-MAINTAINER Guillaume J. Charmes "guillaume@dotcloud.com"
-
-# make sure the package repository is up to date
-RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
-RUN apt-get update
-
-RUN apt-get install -y inotify-tools nginx apache2 openssh-server
\ No newline at end of file
diff --git a/src/test/resources/testAddUrl/testrun.sh b/src/test/resources/testAddUrl/testrun.sh
deleted file mode 100755
index 8eb4630b3..000000000
--- a/src/test/resources/testAddUrl/testrun.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cat /tmp/docker_home.html
-
diff --git a/src/test/resources/testEnv/Dockerfile b/src/test/resources/testEnv/Dockerfile
deleted file mode 100644
index a0a084633..000000000
--- a/src/test/resources/testEnv/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM      ubuntu:latest
-
-ENV varA ./subFolder
-ENV varB $varA/testrun.sh 
-
-ADD	$varB       /tmp/
-
-RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh
-
-CMD ["testrun.sh"]
diff --git a/src/test/resources/testEnv/subFolder/testrun.sh b/src/test/resources/testEnv/subFolder/testrun.sh
deleted file mode 100755
index 14259aa77..000000000
--- a/src/test/resources/testEnv/subFolder/testrun.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-echo "Successfully executed testrun.sh"
\ No newline at end of file

From 4280ee7c639605291f8acda039051395055414ae Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 7 Jun 2016 22:08:41 +0200
Subject: [PATCH 0554/1272] Use expectExceptions in test annotation

---
 .../github/dockerjava/netty/exec/AuthCmdExecTest.java  | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/netty/exec/AuthCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/AuthCmdExecTest.java
index 66ac1bce3..690d478f4 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/AuthCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/AuthCmdExecTest.java
@@ -44,14 +44,8 @@ public void testAuth() throws Exception {
         assertEquals(response.getStatus(), "Login Succeeded");
     }
 
-    @Test()
+    @Test(expectedExceptions = UnauthorizedException.class)
     public void testAuthInvalid() throws Exception {
-
-        try {
-            DockerClientBuilder.getInstance(config("garbage")).build().authCmd().exec();
-            fail("Expected a UnauthorizedException caused by a bad password.");
-        } catch (UnauthorizedException e) {
-            assertEquals(e.getMessage(), "Wrong login/password, please try again\n");
-        }
+        DockerClientBuilder.getInstance(config("garbage")).build().authCmd().exec();
     }
 }

From 84cf070278343867bf2a984a6fa18839a5a635e5 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 7 Jun 2016 22:09:59 +0200
Subject: [PATCH 0555/1272] Fix test for v.1.23

---
 .../netty/exec/ExecStartCmdExecTest.java      | 60 +++++++++++++------
 1 file changed, 43 insertions(+), 17 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
index 2938ac8c0..e87c56d74 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
@@ -46,7 +46,7 @@ public void afterMethod(ITestResult result) {
         super.afterMethod(result);
     }
 
-    @Test(groups = "ignoreInCircleCi")
+    @Test()
     public void execStart() throws Exception {
         String containerName = "generated_" + new SecureRandom().nextInt();
 
@@ -58,9 +58,14 @@ public void execStart() throws Exception {
         dockerClient.startContainerCmd(container.getId()).exec();
 
         ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true).withCmd("touch", "/execStartTest.log").exec();
-        dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false)
-                .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
+                .withAttachStdout(true)
+                .withCmd("touch", "/execStartTest.log")
+                .exec();
+
+        dockerClient.execStartCmd(execCreateCmdResponse.getId())
+                .withDetach(false)
+                .exec(new ExecStartResultCallback(System.out, System.err))
+                .awaitCompletion();
 
         InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec();
 
@@ -73,7 +78,7 @@ public void execStart() throws Exception {
         assertTrue(responseAsString.length() > 0);
     }
 
-    @Test(groups = "ignoreInCircleCi")
+    @Test()
     public void execStartAttached() throws Exception {
         String containerName = "generated_" + new SecureRandom().nextInt();
 
@@ -85,9 +90,14 @@ public void execStartAttached() throws Exception {
         dockerClient.startContainerCmd(container.getId()).exec();
 
         ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true).withCmd("touch", "/execStartTest.log").exec();
-        dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false)
-                .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
+                .withAttachStdout(true)
+                .withCmd("touch", "/execStartTest.log")
+                .exec();
+
+        dockerClient.execStartCmd(execCreateCmdResponse.getId())
+                .withDetach(false)
+                .exec(new ExecStartResultCallback(System.out, System.err))
+                .awaitCompletion();
 
         InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec();
         Boolean bytesAvailable = response.available() > 0;
@@ -99,7 +109,7 @@ public void execStartAttached() throws Exception {
         assertTrue(responseAsString.length() > 0);
     }
 
-    @Test(groups = "ignoreInCircleCi")
+    @Test()
     public void execStartAttachStdin() throws Exception {
         String containerName = "generated_" + new SecureRandom().nextInt();
 
@@ -115,14 +125,23 @@ public void execStartAttachStdin() throws Exception {
         ByteArrayOutputStream stdout = new ByteArrayOutputStream();
 
         ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true).withAttachStdin(true).withCmd("cat").exec();
-        boolean completed = dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true).withStdIn(stdin)
-                .exec(new ExecStartResultCallback(stdout, System.err)).awaitCompletion(5, TimeUnit.SECONDS);
+                .withAttachStdout(true)
+                .withAttachStdin(true)
+                .withCmd("cat")
+                .exec();
+
+        boolean completed = dockerClient.execStartCmd(execCreateCmdResponse.getId())
+                .withDetach(false)
+                .withTty(true)
+                .withStdIn(stdin)
+                .exec(new ExecStartResultCallback(stdout, System.err))
+                .awaitCompletion(5, TimeUnit.SECONDS);
 
         assertTrue(completed, "The process was not finished.");
         assertEquals(stdout.toString("UTF-8"), "STDIN\n");
     }
 
+    @Test()
     public void execStartAttachStdinToShell() throws Exception {
         String containerName = "generated_" + new SecureRandom().nextInt();
 
@@ -156,7 +175,7 @@ public void execStartAttachStdinToShell() throws Exception {
         assertThat(stdout.toString(), containsString("etc\n"));
     }
 
-    @Test(groups = "ignoreInCircleCi")
+    @Test()
     public void execStartNotAttachedStdin() throws Exception {
         String containerName = "generated_" + new SecureRandom().nextInt();
 
@@ -172,11 +191,18 @@ public void execStartNotAttachedStdin() throws Exception {
         ByteArrayOutputStream stdout = new ByteArrayOutputStream();
 
         ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true).withAttachStdin(false).withCmd("/bin/sh").exec();
-        boolean completed = dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withStdIn(stdin)
-                .exec(new ExecStartResultCallback(stdout, System.err)).awaitCompletion(5, TimeUnit.SECONDS);
+                .withAttachStdout(true)
+                .withAttachStdin(false)
+                .withCmd("/bin/sh").exec();
 
-        assertTrue(completed, "The process was not finished.");
+        boolean completed = dockerClient.execStartCmd(execCreateCmdResponse.getId())
+                .withDetach(false)
+                .withStdIn(stdin)
+                .exec(new ExecStartResultCallback(stdout, System.err))
+                .awaitCompletion(5, TimeUnit.SECONDS);
+
+        // with v1.22 of the remote api the server closed the connection when no stdin was attached while exec create, so completed was true
+        assertFalse(completed, "The process was not finished.");
         assertEquals(stdout.toString(), "");
     }
 }

From 63f276a99c0f5245e47e869431d6c2b11a2dd101 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Tue, 7 Jun 2016 23:36:25 +0200
Subject: [PATCH 0556/1272] Fix load certs from file system

---
 .../dockerjava/core/LocalDirectorySSLConfig.java  | 15 +++++++++++++--
 .../dockerjava/core/util/CertificateUtils.java    | 10 +---------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
index e39a2bc40..961c282de 100644
--- a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
@@ -2,7 +2,10 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.io.File;
 import java.io.Serializable;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.security.Security;
 
 import javax.net.ssl.SSLContext;
@@ -50,9 +53,17 @@ public SSLContext getSSLContext() {
                     System.setProperty("https.protocols", httpProtocols);
                 }
 
-                sslConfig.keyStore(CertificateUtils.createKeyStore(dockerCertPath));
+                String caPemPath = dockerCertPath + File.separator + "ca.pem";
+                String keyPemPath = dockerCertPath + File.separator + "key.pem";
+                String certPemPath = dockerCertPath + File.separator + "cert.pem";
+
+                String keypem = new String(Files.readAllBytes(Paths.get(keyPemPath)));
+                String certpem = new String(Files.readAllBytes(Paths.get(certPemPath)));
+                String capem = new String(Files.readAllBytes(Paths.get(caPemPath)));
+
+                sslConfig.keyStore(CertificateUtils.createKeyStore(keypem, certpem));
                 sslConfig.keyStorePassword("docker");
-                sslConfig.trustStore(CertificateUtils.createTrustStore(dockerCertPath));
+                sslConfig.trustStore(CertificateUtils.createTrustStore(capem));
 
                 return sslConfig.createSSLContext();
 
diff --git a/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java b/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
index 6e1925630..c760331d6 100644
--- a/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
+++ b/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
@@ -18,6 +18,7 @@
 import java.util.List;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
 import org.bouncycastle.cert.X509CertificateHolder;
@@ -49,15 +50,6 @@ public static boolean verifyCertificatesExist(String dockerCertPath) {
         return result;
     }
 
-    /**
-     * @param dockerCertPath with standard named files.
-     */
-    public static KeyStore createKeyStore(final String dockerCertPath) throws NoSuchAlgorithmException,
-            InvalidKeySpecException, IOException, CertificateException, KeyStoreException {
-        return createKeyStore("key.pem", "cert.pem");
-    }
-
-
     @SuppressFBWarnings(value = "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
     public static KeyStore createKeyStore(final String keypem, final String certpem) throws NoSuchAlgorithmException,
             InvalidKeySpecException, IOException, CertificateException, KeyStoreException {

From fefd16017d70b29e1d1f337bf9338ce0cb9543a3 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 7 Jun 2016 23:38:37 +0200
Subject: [PATCH 0557/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f55b2cd75..6125ab5b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Change Log
 ===
 
+3.0.0-SNAPSHOT
+---
+
+All changes
+* [#529] (https://github.com/docker-java/docker-java/pull/529) Refactor CertUtils. Support ECDSA and PrivateKey 
+
 v3.0.0
 ---
 Notes

From 605815651521f3270e01b67b0e89b183e10cedbe Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Tue, 7 Jun 2016 23:39:22 +0200
Subject: [PATCH 0558/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6125ab5b7..1f3b7e9b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Change Log
 ===
 
-3.0.0-SNAPSHOT
+3.0.1-SNAPSHOT
 ---
 
 All changes

From 3a2dcc490879d345c6c96b215f1e47c995d293f5 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 8 Jun 2016 21:59:57 +0300
Subject: [PATCH 0559/1272] Implemented Device parser (#593)

* Implement Device parser

Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>

* Add more tests, fix.
---
 .../github/dockerjava/api/model/Device.java   | 76 +++++++++++++++
 .../dockerjava/api/model/DeviceTest.java      | 95 +++++++++++++++++++
 2 files changed, 171 insertions(+)
 create mode 100644 src/test/java/com/github/dockerjava/api/model/DeviceTest.java

diff --git a/src/main/java/com/github/dockerjava/api/model/Device.java b/src/main/java/com/github/dockerjava/api/model/Device.java
index 9240239b1..f2b75e3f5 100644
--- a/src/main/java/com/github/dockerjava/api/model/Device.java
+++ b/src/main/java/com/github/dockerjava/api/model/Device.java
@@ -1,6 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.commons.lang.BooleanUtils.isNotTrue;
+import static org.apache.commons.lang.StringUtils.isEmpty;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
@@ -9,6 +11,11 @@
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import javax.annotation.Nonnull;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
+
 @JsonInclude(Include.NON_NULL)
 public class Device {
 
@@ -45,6 +52,75 @@ public String getPathOnHost() {
         return pathOnHost;
     }
 
+    /**
+     * @link https://github.com/docker/docker/blob/6b4a46f28266031ce1a1315f17fb69113a06efe1/runconfig/opts/parse_test.go#L468
+     */
+    @Nonnull
+    public static Device parse(@Nonnull String deviceStr) {
+        String src = "";
+        String dst = "";
+        String permissions = "rwm";
+        final String[] arr = deviceStr.trim().split(":");
+        // java String.split() returns wrong length, use tokenizer instead
+        switch (new StringTokenizer(deviceStr, ":").countTokens()) {
+            case 3: {
+                // Mismatches docker code logic. While there is no validations after parsing, checking heregit
+                if (validDeviceMode(arr[2])) {
+                    permissions = arr[2];
+                } else {
+                    throw new IllegalArgumentException("Invalid device specification: " + deviceStr);
+                }
+            }
+            case 2: {
+                if (validDeviceMode(arr[1])) {
+                    permissions = arr[1];
+                } else {
+                    dst = arr[1];
+                }
+            }
+            case 1: {
+                src = arr[0];
+                break;
+            }
+            default: {
+                throw new IllegalArgumentException("Invalid device specification: " + deviceStr);
+            }
+        }
+
+        if (isEmpty(dst)) {
+            dst = src;
+        }
+
+        return new Device(permissions, dst, src);
+    }
+
+    /**
+     * ValidDeviceMode checks if the mode for device is valid or not.
+     * Valid mode is a composition of r (read), w (write), and m (mknod).
+     *
+     * @link https://github.com/docker/docker/blob/6b4a46f28266031ce1a1315f17fb69113a06efe1/runconfig/opts/parse.go#L796
+     */
+    private static boolean validDeviceMode(String deviceMode) {
+        Map<String, Boolean> validModes = new HashMap<>(3);
+        validModes.put("r", true);
+        validModes.put("w", true);
+        validModes.put("m", true);
+
+        if (isEmpty(deviceMode)) {
+            return false;
+        }
+
+        for (char ch : deviceMode.toCharArray()) {
+            final String mode = String.valueOf(ch);
+            if (isNotTrue(validModes.get(mode))) {
+                return false; // wrong mode
+            }
+            validModes.put(mode, false);
+        }
+
+        return true;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof Device) {
diff --git a/src/test/java/com/github/dockerjava/api/model/DeviceTest.java b/src/test/java/com/github/dockerjava/api/model/DeviceTest.java
new file mode 100644
index 000000000..5c48c4886
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/api/model/DeviceTest.java
@@ -0,0 +1,95 @@
+package com.github.dockerjava.api.model;
+
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import static junit.framework.Assert.fail;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+public class DeviceTest {
+
+    public static List<String> validPaths = Arrays.asList(
+            "/home",
+            "/home:/home",
+            "/home:/something/else",
+            "/with space",
+            "/home:/with space",
+            "relative:/absolute-path",
+            "hostPath:/containerPath:r",
+            "/hostPath:/containerPath:rw",
+            "/hostPath:/containerPath:mrw"
+    );
+
+    public static HashMap<String, String> badPaths = new LinkedHashMap<String, String>() {{
+        put("", "bad format for path: ");
+        // TODO implement ValidatePath
+//        put("./", "./ is not an absolute path");
+//        put("../", "../ is not an absolute path");
+//        put("/:../", "../ is not an absolute path");
+//        put("/:path", "path is not an absolute path");
+//        put(":", "bad format for path: :");
+//        put("/tmp:", " is not an absolute path");
+//        put(":test", "bad format for path: :test");
+//        put(":/test", "bad format for path: :/test");
+//        put("tmp:", " is not an absolute path");
+//        put(":test:", "bad format for path: :test:");
+//        put("::", "bad format for path: ::");
+//        put(":::", "bad format for path: :::");
+//        put("/tmp:::", "bad format for path: /tmp:::");
+//        put(":/tmp::", "bad format for path: :/tmp::");
+//        put("path:ro", "ro is not an absolute path");
+//        put("path:rr", "rr is not an absolute path");
+        put("a:/b:ro", "bad mode specified: ro");
+        put("a:/b:rr", "bad mode specified: rr");
+    }};
+
+    @Test
+    public void testParse() throws Exception {
+        assertThat(Device.parse("/dev/sda:/dev/xvdc:r"),
+                equalTo(new Device("r", "/dev/xvdc", "/dev/sda")));
+
+        assertThat(Device.parse("/dev/snd:rw"),
+                equalTo(new Device("rw", "/dev/snd", "/dev/snd")));
+
+        assertThat(Device.parse("/dev/snd:/something"),
+                equalTo(new Device("rwm", "/something", "/dev/snd")));
+
+        assertThat(Device.parse("/dev/snd:/something:rw"),
+                equalTo(new Device("rw", "/something", "/dev/snd")));
+
+    }
+
+    @Test
+    public void testParseBadPaths() {
+        for (Map.Entry<String, String> entry : badPaths.entrySet()) {
+            final String deviceStr = entry.getKey();
+            try {
+                Device.parse(deviceStr);
+                fail("Should fail because: " + entry.getValue() + " '" + deviceStr + "'");
+            } catch (IllegalArgumentException ex) {
+                assertThat(ex.getMessage(), containsString("Invalid device specification:"));
+            }
+        }
+    }
+
+    @Test
+    public void testParseValidPaths() {
+        for (String path : validPaths) {
+            Device.parse(path);
+        }
+    }
+}

From 72597d723e56d84890d3821d734a46cc2e0a9441 Mon Sep 17 00:00:00 2001
From: Marcus Linke <linke@newsaktuell.de>
Date: Thu, 9 Jun 2016 23:44:04 +0200
Subject: [PATCH 0560/1272] Complement logging tests

---
 .../client/AbstractDockerClientTest.java      | 18 ++++
 .../core/command/LogContainerCmdImplTest.java | 93 ++++++++++++++-----
 .../netty/exec/LogContainerCmdExecTest.java   | 93 ++++++++++++++-----
 3 files changed, 162 insertions(+), 42 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 231e709c1..1a52bbd3f 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -225,8 +225,21 @@ protected String containerLog(String containerId) throws Exception {
     public static class LogContainerTestCallback extends LogContainerResultCallback {
         protected final StringBuffer log = new StringBuffer();
 
+        List<Frame> collectedFrames = new ArrayList<Frame>();
+
+        boolean collectFrames = false;
+
+        public LogContainerTestCallback() {
+            this(false);
+        }
+
+        public LogContainerTestCallback(boolean collectFrames) {
+            this.collectFrames = collectFrames;
+        }
+
         @Override
         public void onNext(Frame frame) {
+            if(collectFrames) collectedFrames.add(frame);
             log.append(new String(frame.getPayload()));
         }
 
@@ -234,6 +247,11 @@ public void onNext(Frame frame) {
         public String toString() {
             return log.toString();
         }
+
+
+        public List<Frame> getCollectedFrames() {
+            return collectedFrames;
+        }
     }
 
     protected String buildImage(File baseDir) throws Exception {
diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
index 817179eb2..869bcbb1a 100644
--- a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
@@ -8,6 +8,7 @@
 
 import java.io.IOException;
 import java.lang.reflect.Method;
+import java.util.concurrent.TimeUnit;
 
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
@@ -17,6 +18,7 @@
 import org.testng.annotations.Test;
 
 import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.StreamType;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
@@ -44,31 +46,65 @@ public void afterMethod(ITestResult result) {
     }
 
     @Test
-    public void asyncLogContainer() throws Exception {
+    public void asyncLogContainerWithTtyEnabled() throws Exception {
 
-        String snippet = "hello world";
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("/bin/echo", snippet)
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCmd("/bin/sh", "-c", "while true; do echo hello; sleep 1; done")
+                .withTty(true)
                 .exec();
 
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerClient.startContainerCmd(container.getId())
+            .exec();
 
-        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
-                .awaitStatusCode();
+        LogContainerTestCallback loggingCallback = new LogContainerTestCallback(true);
 
-        assertThat(exitCode, equalTo(0));
+        // this essentially test the since=0 case
+        dockerClient.logContainerCmd(container.getId())
+            .withStdErr(true)
+            .withStdOut(true)
+            .withFollowStream(true)
+            .withTailAll()
+            .exec(loggingCallback);
 
-        LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
+        loggingCallback.awaitCompletion(3, TimeUnit.SECONDS);
+
+        assertTrue(loggingCallback.toString().contains("hello"));
+
+        assertEquals(loggingCallback.getCollectedFrames().get(0).getStreamType(), StreamType.RAW);
+    }
+
+    @Test
+    public void asyncLogContainerWithTtyDisabled() throws Exception {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCmd("/bin/sh", "-c", "while true; do echo hello; sleep 1; done")
+                .withTty(false)
+                .exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId())
+            .exec();
+
+        LogContainerTestCallback loggingCallback = new LogContainerTestCallback(true);
 
         // this essentially test the since=0 case
-        dockerClient.logContainerCmd(container.getId()).withStdErr(true).withStdOut(true).exec(loggingCallback);
+        dockerClient.logContainerCmd(container.getId())
+            .withStdErr(true)
+            .withStdOut(true)
+            .withFollowStream(true)
+            .withTailAll()
+            .exec(loggingCallback);
 
-        loggingCallback.awaitCompletion();
+        loggingCallback.awaitCompletion(3, TimeUnit.SECONDS);
 
-        assertTrue(loggingCallback.toString().contains(snippet));
+        assertTrue(loggingCallback.toString().contains("hello"));
+
+        assertEquals(loggingCallback.getCollectedFrames().get(0).getStreamType(), StreamType.STDOUT);
     }
 
     @Test
@@ -105,7 +141,8 @@ public void asyncMultipleLogContainer() throws Exception {
 
         String snippet = "hello world";
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("/bin/echo", snippet)
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCmd("/bin/echo", snippet)
                 .exec();
 
         LOG.info("Created container: {}", container.toString());
@@ -113,26 +150,36 @@ public void asyncMultipleLogContainer() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+        int exitCode = dockerClient.waitContainerCmd(container.getId())
+                .exec(new WaitContainerResultCallback())
                 .awaitStatusCode();
 
         assertThat(exitCode, equalTo(0));
 
         LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
 
-        dockerClient.logContainerCmd(container.getId()).withStdErr(true).withStdOut(true).exec(loggingCallback);
+        dockerClient.logContainerCmd(container.getId())
+                .withStdErr(true)
+                .withStdOut(true)
+                .exec(loggingCallback);
 
         loggingCallback.close();
 
         loggingCallback = new LogContainerTestCallback();
 
-        dockerClient.logContainerCmd(container.getId()).withStdErr(true).withStdOut(true).exec(loggingCallback);
+        dockerClient.logContainerCmd(container.getId())
+                .withStdErr(true)
+                .withStdOut(true)
+                .exec(loggingCallback);
 
         loggingCallback.close();
 
         loggingCallback = new LogContainerTestCallback();
 
-        dockerClient.logContainerCmd(container.getId()).withStdErr(true).withStdOut(true).exec(loggingCallback);
+        dockerClient.logContainerCmd(container.getId())
+                .withStdErr(true)
+                .withStdOut(true)
+                .exec(loggingCallback);
 
         loggingCallback.awaitCompletion();
 
@@ -143,7 +190,8 @@ public void asyncMultipleLogContainer() throws Exception {
     public void asyncLogContainerWithSince() throws Exception {
         String snippet = "hello world";
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("/bin/echo", snippet)
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCmd("/bin/echo", snippet)
                 .exec();
 
         LOG.info("Created container: {}", container.toString());
@@ -153,19 +201,22 @@ public void asyncLogContainerWithSince() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+        int exitCode = dockerClient.waitContainerCmd(container.getId())
+                .exec(new WaitContainerResultCallback())
                 .awaitStatusCode();
 
         assertThat(exitCode, equalTo(0));
 
         LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
 
-        dockerClient.logContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withSince(timestamp)
+        dockerClient.logContainerCmd(container.getId())
+                .withStdErr(true)
+                .withStdOut(true)
+                .withSince(timestamp)
                 .exec(loggingCallback);
 
         loggingCallback.awaitCompletion();
 
         assertThat(loggingCallback.toString(), containsString(snippet));
     }
-
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/LogContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/LogContainerCmdExecTest.java
index 310994755..fe408ac18 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/LogContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/LogContainerCmdExecTest.java
@@ -8,6 +8,7 @@
 
 import java.io.IOException;
 import java.lang.reflect.Method;
+import java.util.concurrent.TimeUnit;
 
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
@@ -18,6 +19,7 @@
 
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.StreamType;
 import com.github.dockerjava.core.command.WaitContainerResultCallback;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 
@@ -45,31 +47,65 @@ public void afterMethod(ITestResult result) {
     }
 
     @Test
-    public void asyncLogContainer() throws Exception {
+    public void asyncLogContainerWithTtyEnabled() throws Exception {
 
-        String snippet = "hello world";
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("/bin/echo", snippet)
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCmd("/bin/sh", "-c", "while true; do echo hello; sleep 1; done")
+                .withTty(true)
                 .exec();
 
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerClient.startContainerCmd(container.getId())
+            .exec();
 
-        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
-                .awaitStatusCode();
+        LogContainerTestCallback loggingCallback = new LogContainerTestCallback(true);
 
-        assertThat(exitCode, equalTo(0));
+        // this essentially test the since=0 case
+        dockerClient.logContainerCmd(container.getId())
+            .withStdErr(true)
+            .withStdOut(true)
+            .withFollowStream(true)
+            .withTailAll()
+            .exec(loggingCallback);
 
-        LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
+        loggingCallback.awaitCompletion(3, TimeUnit.SECONDS);
+
+        assertTrue(loggingCallback.toString().contains("hello"));
+
+        assertEquals(loggingCallback.getCollectedFrames().get(0).getStreamType(), StreamType.RAW);
+    }
+
+    @Test
+    public void asyncLogContainerWithTtyDisabled() throws Exception {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCmd("/bin/sh", "-c", "while true; do echo hello; sleep 1; done")
+                .withTty(false)
+                .exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId())
+            .exec();
+
+        LogContainerTestCallback loggingCallback = new LogContainerTestCallback(true);
 
         // this essentially test the since=0 case
-        dockerClient.logContainerCmd(container.getId()).withStdErr(true).withStdOut(true).exec(loggingCallback);
+        dockerClient.logContainerCmd(container.getId())
+            .withStdErr(true)
+            .withStdOut(true)
+            .withFollowStream(true)
+            .withTailAll()
+            .exec(loggingCallback);
 
-        loggingCallback.awaitCompletion();
+        loggingCallback.awaitCompletion(3, TimeUnit.SECONDS);
 
-        assertTrue(loggingCallback.toString().contains(snippet));
+        assertTrue(loggingCallback.toString().contains("hello"));
+
+        assertEquals(loggingCallback.getCollectedFrames().get(0).getStreamType(), StreamType.STDOUT);
     }
 
     @Test
@@ -106,7 +142,8 @@ public void asyncMultipleLogContainer() throws Exception {
 
         String snippet = "hello world";
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("/bin/echo", snippet)
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCmd("/bin/echo", snippet)
                 .exec();
 
         LOG.info("Created container: {}", container.toString());
@@ -114,26 +151,36 @@ public void asyncMultipleLogContainer() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+        int exitCode = dockerClient.waitContainerCmd(container.getId())
+                .exec(new WaitContainerResultCallback())
                 .awaitStatusCode();
 
         assertThat(exitCode, equalTo(0));
 
         LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
 
-        dockerClient.logContainerCmd(container.getId()).withStdErr(true).withStdOut(true).exec(loggingCallback);
+        dockerClient.logContainerCmd(container.getId())
+                .withStdErr(true)
+                .withStdOut(true)
+                .exec(loggingCallback);
 
         loggingCallback.close();
 
         loggingCallback = new LogContainerTestCallback();
 
-        dockerClient.logContainerCmd(container.getId()).withStdErr(true).withStdOut(true).exec(loggingCallback);
+        dockerClient.logContainerCmd(container.getId())
+                .withStdErr(true)
+                .withStdOut(true)
+                .exec(loggingCallback);
 
         loggingCallback.close();
 
         loggingCallback = new LogContainerTestCallback();
 
-        dockerClient.logContainerCmd(container.getId()).withStdErr(true).withStdOut(true).exec(loggingCallback);
+        dockerClient.logContainerCmd(container.getId())
+                .withStdErr(true)
+                .withStdOut(true)
+                .exec(loggingCallback);
 
         loggingCallback.awaitCompletion();
 
@@ -144,7 +191,8 @@ public void asyncMultipleLogContainer() throws Exception {
     public void asyncLogContainerWithSince() throws Exception {
         String snippet = "hello world";
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("/bin/echo", snippet)
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCmd("/bin/echo", snippet)
                 .exec();
 
         LOG.info("Created container: {}", container.toString());
@@ -154,19 +202,22 @@ public void asyncLogContainerWithSince() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+        int exitCode = dockerClient.waitContainerCmd(container.getId())
+                .exec(new WaitContainerResultCallback())
                 .awaitStatusCode();
 
         assertThat(exitCode, equalTo(0));
 
         LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
 
-        dockerClient.logContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withSince(timestamp)
+        dockerClient.logContainerCmd(container.getId())
+                .withStdErr(true)
+                .withStdOut(true)
+                .withSince(timestamp)
                 .exec(loggingCallback);
 
         loggingCallback.awaitCompletion();
 
         assertThat(loggingCallback.toString(), containsString(snippet));
     }
-
 }

From 9ae14cb9567b8257be26f41423f94cf61391969c Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Mon, 13 Jun 2016 22:56:48 +0200
Subject: [PATCH 0561/1272] Refactor configuration of SSL to allow override
 with custom config (#596)

* Refactor configuration of SSL to allow override with custom config

* Store SSLConfig instead SSLContext

* avoid NPE

* prepare release

* Coding style changes
---
 pom.xml                                       |   2 +-
 .../api/command/DockerCmdExecFactory.java     |   4 -
 .../core/DefaultDockerClientConfig.java       | 455 ++++++++++++++++++
 .../dockerjava/core/DockerClientBuilder.java  |   4 +-
 .../dockerjava/core/DockerClientConfig.java   | 436 +----------------
 .../dockerjava/core/DockerClientImpl.java     |   4 +-
 .../jaxrs/DockerCmdExecFactoryImpl.java       |  28 +-
 .../netty/DockerCmdExecFactoryImpl.java       |  38 +-
 .../client/AbstractDockerClientTest.java      |   8 +-
 ...ava => DefaultDockerClientConfigTest.java} |  96 ++--
 .../dockerjava/core/DockerClientImplTest.java |   2 +-
 .../core/TestDockerCmdExecFactory.java        |   6 -
 12 files changed, 552 insertions(+), 531 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
 rename src/test/java/com/github/dockerjava/core/{DockerClientConfigTest.java => DefaultDockerClientConfigTest.java} (54%)

diff --git a/pom.xml b/pom.xml
index bee178a6d..3f9caa55a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.1-SNAPSHOT</version>
+	<version>3.0.0-kostyasha-3</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index ae090e434..0de3afe38 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -3,8 +3,6 @@
 import java.io.Closeable;
 import java.io.IOException;
 
-import javax.net.ssl.SSLContext;
-
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.RemoteApiVersion;
 
@@ -117,8 +115,6 @@ public interface DockerCmdExecFactory extends Closeable {
 
     DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec();
 
-    DockerCmdExecFactory withSSLContext(SSLContext sslContext);
-
     @Override
     void close() throws IOException;
 
diff --git a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
new file mode 100644
index 000000000..4641f9d3c
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -0,0 +1,455 @@
+package com.github.dockerjava.core;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.net.URI;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import com.github.dockerjava.api.exception.DockerClientException;
+import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.AuthConfigurations;
+import com.github.dockerjava.core.NameParser.HostnameReposName;
+import com.github.dockerjava.core.NameParser.ReposTag;
+
+/**
+ * Respects some of the docker CLI options. See https://docs.docker.com/engine/reference/commandline/cli/#environment-variables
+ */
+public class DefaultDockerClientConfig implements Serializable, DockerClientConfig {
+
+    private static final long serialVersionUID = -4307357472441531489L;
+
+    public static final String DOCKER_HOST = "DOCKER_HOST";
+
+    public static final String DOCKER_TLS_VERIFY = "DOCKER_TLS_VERIFY";
+
+    public static final String DOCKER_CONFIG = "DOCKER_CONFIG";
+
+    public static final String DOCKER_CERT_PATH = "DOCKER_CERT_PATH";
+
+    public static final String API_VERSION = "api.version";
+
+    public static final String REGISTRY_USERNAME = "registry.username";
+
+    public static final String REGISTRY_PASSWORD = "registry.password";
+
+    public static final String REGISTRY_EMAIL = "registry.email";
+
+    public static final String REGISTRY_URL = "registry.url";
+
+    private static final String DOCKER_JAVA_PROPERTIES = "docker-java.properties";
+
+    private static final String DOCKER_CFG = ".dockercfg";
+
+    private static final Set<String> CONFIG_KEYS = new HashSet<String>();
+
+    static {
+        CONFIG_KEYS.add(DOCKER_HOST);
+        CONFIG_KEYS.add(DOCKER_TLS_VERIFY);
+        CONFIG_KEYS.add(DOCKER_CONFIG);
+        CONFIG_KEYS.add(DOCKER_CERT_PATH);
+        CONFIG_KEYS.add(API_VERSION);
+        CONFIG_KEYS.add(REGISTRY_USERNAME);
+        CONFIG_KEYS.add(REGISTRY_PASSWORD);
+        CONFIG_KEYS.add(REGISTRY_EMAIL);
+        CONFIG_KEYS.add(REGISTRY_URL);
+    }
+
+    private final URI dockerHost;
+
+    private final String registryUsername, registryPassword, registryEmail, registryUrl, dockerConfig;
+
+    private final SSLConfig sslConfig;
+
+    private final RemoteApiVersion apiVersion;
+
+    DefaultDockerClientConfig(URI dockerHost, String dockerConfig, String apiVersion, String registryUrl,
+            String registryUsername, String registryPassword, String registryEmail, SSLConfig sslConfig) {
+        this.dockerHost = checkDockerHostScheme(dockerHost);
+        this.dockerConfig = dockerConfig;
+        this.apiVersion = RemoteApiVersion.parseConfigWithDefault(apiVersion);
+        this.sslConfig = sslConfig;
+        this.registryUsername = registryUsername;
+        this.registryPassword = registryPassword;
+        this.registryEmail = registryEmail;
+        this.registryUrl = registryUrl;
+    }
+
+    private URI checkDockerHostScheme(URI dockerHost) {
+        if ("tcp".equals(dockerHost.getScheme()) || "unix".equals(dockerHost.getScheme())) {
+            return dockerHost;
+        } else {
+            throw new DockerClientException("Unsupported protocol scheme found: '" + dockerHost
+                    + "'. Only 'tcp://' or 'unix://' supported.");
+        }
+    }
+
+    private static Properties loadIncludedDockerProperties(Properties systemProperties) {
+        try (InputStream is = DefaultDockerClientConfig.class.getResourceAsStream("/" + DOCKER_JAVA_PROPERTIES)) {
+            Properties p = new Properties();
+            p.load(is);
+            replaceProperties(p, systemProperties);
+            return p;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static void replaceProperties(Properties properties, Properties replacements) {
+        for (Object objectKey : properties.keySet()) {
+            String key = objectKey.toString();
+            properties.setProperty(key, replaceProperties(properties.getProperty(key), replacements));
+        }
+    }
+
+    private static String replaceProperties(String s, Properties replacements) {
+        for (Map.Entry<Object, Object> entry : replacements.entrySet()) {
+            String key = "${" + entry.getKey() + "}";
+            while (s.contains(key)) {
+                s = s.replace(key, String.valueOf(entry.getValue()));
+            }
+        }
+        return s;
+    }
+
+    /**
+     * Creates a new Properties object containing values overridden from ${user.home}/.docker.io.properties
+     *
+     * @param p
+     *            The original set of properties to override
+     * @return A copy of the original Properties with overridden values
+     */
+    private static Properties overrideDockerPropertiesWithSettingsFromUserHome(Properties p, Properties systemProperties) {
+        Properties overriddenProperties = new Properties();
+        overriddenProperties.putAll(p);
+
+        final File usersDockerPropertiesFile = new File(systemProperties.getProperty("user.home"),
+                "." + DOCKER_JAVA_PROPERTIES);
+        if (usersDockerPropertiesFile.isFile()) {
+            try (FileInputStream in = new FileInputStream(usersDockerPropertiesFile)) {
+                overriddenProperties.load(in);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return overriddenProperties;
+    }
+
+    private static Properties overrideDockerPropertiesWithEnv(Properties properties, Map<String, String> env) {
+        Properties overriddenProperties = new Properties();
+        overriddenProperties.putAll(properties);
+
+        // special case which is a sensible default
+        if (env.containsKey(DOCKER_HOST)) {
+            overriddenProperties.setProperty(DOCKER_HOST, env.get(DOCKER_HOST));
+        }
+
+        for (Map.Entry<String, String> envEntry : env.entrySet()) {
+            String envKey = envEntry.getKey();
+            if (CONFIG_KEYS.contains(envKey)) {
+                overriddenProperties.setProperty(envKey, envEntry.getValue());
+            }
+        }
+
+        return overriddenProperties;
+    }
+
+    /**
+     * Creates a new Properties object containing values overridden from the System properties
+     *
+     * @param p
+     *            The original set of properties to override
+     * @return A copy of the original Properties with overridden values
+     */
+    private static Properties overrideDockerPropertiesWithSystemProperties(Properties p, Properties systemProperties) {
+        Properties overriddenProperties = new Properties();
+        overriddenProperties.putAll(p);
+
+        for (String key : CONFIG_KEYS) {
+            if (systemProperties.containsKey(key)) {
+                overriddenProperties.setProperty(key, systemProperties.getProperty(key));
+            }
+        }
+        return overriddenProperties;
+    }
+
+    public static Builder createDefaultConfigBuilder() {
+        return createDefaultConfigBuilder(System.getenv(), System.getProperties());
+    }
+
+    /**
+     * Allows you to build the config without system environment interfering for more robust testing
+     */
+    static Builder createDefaultConfigBuilder(Map<String, String> env, Properties systemProperties) {
+        Properties properties = loadIncludedDockerProperties(systemProperties);
+        properties = overrideDockerPropertiesWithSettingsFromUserHome(properties, systemProperties);
+        properties = overrideDockerPropertiesWithEnv(properties, env);
+        properties = overrideDockerPropertiesWithSystemProperties(properties, systemProperties);
+        return new Builder().withProperties(properties);
+    }
+
+    @Override
+    public URI getDockerHost() {
+        return dockerHost;
+    }
+
+    @Override
+    public RemoteApiVersion getApiVersion() {
+        return apiVersion;
+    }
+
+    @Override
+    public String getRegistryUsername() {
+        return registryUsername;
+    }
+
+    @Override
+    public String getRegistryPassword() {
+        return registryPassword;
+    }
+
+    @Override
+    public String getRegistryEmail() {
+        return registryEmail;
+    }
+
+    @Override
+    public String getRegistryUrl() {
+        return registryUrl;
+    }
+
+    public String getDockerConfig() {
+        return dockerConfig;
+    }
+
+    private AuthConfig getAuthConfig() {
+        AuthConfig authConfig = null;
+        if (getRegistryUsername() != null && getRegistryPassword() != null && getRegistryEmail() != null
+                && getRegistryUrl() != null) {
+            authConfig = new AuthConfig()
+                    .withUsername(getRegistryUsername())
+                    .withPassword(getRegistryPassword())
+                    .withEmail(getRegistryEmail())
+                    .withRegistryAddress(getRegistryUrl());
+        }
+        return authConfig;
+    }
+
+    @Override
+    public AuthConfig effectiveAuthConfig(String imageName) {
+        AuthConfig authConfig = null;
+
+        File dockerCfgFile = new File(getDockerConfig() + File.separator + DOCKER_CFG);
+
+        if (dockerCfgFile.exists() && dockerCfgFile.isFile() && imageName != null) {
+            AuthConfigFile authConfigFile;
+            try {
+                authConfigFile = AuthConfigFile.loadConfig(dockerCfgFile);
+            } catch (IOException e) {
+                throw new DockerClientException("Failed to parse dockerCfgFile", e);
+            }
+            ReposTag reposTag = NameParser.parseRepositoryTag(imageName);
+            HostnameReposName hostnameReposName = NameParser.resolveRepositoryName(reposTag.repos);
+
+            authConfig = authConfigFile.resolveAuthConfig(hostnameReposName.hostname);
+        }
+
+        AuthConfig otherAuthConfig = getAuthConfig();
+
+        if (otherAuthConfig != null) {
+            authConfig = otherAuthConfig;
+        }
+
+        return authConfig;
+    }
+
+    @Override
+    public AuthConfigurations getAuthConfigurations() {
+        File dockerCfgFile = new File(getDockerConfig() + File.separator + DOCKER_CFG);
+        if (dockerCfgFile.exists() && dockerCfgFile.isFile()) {
+            AuthConfigFile authConfigFile;
+            try {
+                authConfigFile = AuthConfigFile.loadConfig(dockerCfgFile);
+            } catch (IOException e) {
+                throw new DockerClientException("Failed to parse dockerCfgFile", e);
+            }
+
+            return authConfigFile.getAuthConfigurations();
+        }
+
+        return new AuthConfigurations();
+    }
+
+    @Override
+    public SSLConfig getSSLConfig() {
+        return sslConfig;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    public static class Builder {
+        private URI dockerHost;
+
+        private String apiVersion, registryUsername, registryPassword, registryEmail, registryUrl, dockerConfig,
+                dockerCertPath;
+
+        private boolean dockerTlsVerify;
+
+        private SSLConfig customSslConfig = null;
+
+        /**
+         * This will set all fields in the builder to those contained in the Properties object. The Properties object should contain the
+         * following docker-java configuration keys: DOCKER_HOST, DOCKER_TLS_VERIFY, api.version, registry.username, registry.password,
+         * registry.email, DOCKER_CERT_PATH, and DOCKER_CONFIG.
+         */
+        public Builder withProperties(Properties p) {
+            return withDockerHost(p.getProperty(DOCKER_HOST))
+                    .withDockerTlsVerify(p.getProperty(DOCKER_TLS_VERIFY))
+                    .withDockerConfig(p.getProperty(DOCKER_CONFIG))
+                    .withDockerCertPath(p.getProperty(DOCKER_CERT_PATH))
+                    .withApiVersion(p.getProperty(API_VERSION))
+                    .withRegistryUsername(p.getProperty(REGISTRY_USERNAME))
+                    .withRegistryPassword(p.getProperty(REGISTRY_PASSWORD))
+                    .withRegistryEmail(p.getProperty(REGISTRY_EMAIL))
+                    .withRegistryUrl(p.getProperty(REGISTRY_URL));
+        }
+
+        /**
+         * configure DOCKER_HOST
+         */
+        public final Builder withDockerHost(String dockerHost) {
+            checkNotNull(dockerHost, "uri was not specified");
+            this.dockerHost = URI.create(dockerHost);
+            return this;
+        }
+
+        public final Builder withApiVersion(RemoteApiVersion apiVersion) {
+            this.apiVersion = apiVersion.getVersion();
+            return this;
+        }
+
+        public final Builder withApiVersion(String apiVersion) {
+            this.apiVersion = apiVersion;
+            return this;
+        }
+
+        public final Builder withRegistryUsername(String registryUsername) {
+            this.registryUsername = registryUsername;
+            return this;
+        }
+
+        public final Builder withRegistryPassword(String registryPassword) {
+            this.registryPassword = registryPassword;
+            return this;
+        }
+
+        public final Builder withRegistryEmail(String registryEmail) {
+            this.registryEmail = registryEmail;
+            return this;
+        }
+
+        public Builder withRegistryUrl(String registryUrl) {
+            this.registryUrl = registryUrl;
+            return this;
+        }
+
+        public final Builder withDockerCertPath(String dockerCertPath) {
+            this.dockerCertPath = dockerCertPath;
+            return this;
+        }
+
+        public final Builder withDockerConfig(String dockerConfig) {
+            this.dockerConfig = dockerConfig;
+            return this;
+        }
+
+        public final Builder withDockerTlsVerify(String dockerTlsVerify) {
+            if (dockerTlsVerify != null) {
+                String trimmed = dockerTlsVerify.trim();
+                this.dockerTlsVerify = "true".equalsIgnoreCase(trimmed) || "1".equals(trimmed);
+            } else {
+                this.dockerTlsVerify = false;
+            }
+            return this;
+        }
+
+        public final Builder withDockerTlsVerify(Boolean dockerTlsVerify) {
+            this.dockerTlsVerify = dockerTlsVerify;
+            return this;
+        }
+
+        /**
+         * Overrides the default {@link SSLConfig} that is used when calling {@link Builder#withDockerTlsVerify(java.lang.Boolean)} and
+         * {@link Builder#withDockerCertPath(String)}. This way it is possible to pass a custom {@link SSLConfig} to the resulting
+         * {@link DockerClientConfig} that may be created by other means than the local file system.
+         */
+        public final Builder withCustomSslConfig(SSLConfig customSslConfig) {
+            this.customSslConfig = customSslConfig;
+            return this;
+        }
+
+        public DefaultDockerClientConfig build() {
+
+            SSLConfig sslConfig = null;
+
+            if (customSslConfig == null) {
+                if (dockerTlsVerify) {
+                    dockerCertPath = checkDockerCertPath(dockerCertPath);
+                    sslConfig = new LocalDirectorySSLConfig(dockerCertPath);
+                }
+            } else {
+                sslConfig = customSslConfig;
+            }
+
+            return new DefaultDockerClientConfig(dockerHost, dockerConfig, apiVersion, registryUrl, registryUsername,
+                    registryPassword, registryEmail, sslConfig);
+        }
+
+        private String checkDockerCertPath(String dockerCertPath) {
+            if (StringUtils.isEmpty(dockerCertPath)) {
+                throw new DockerClientException(
+                        "Enabled TLS verification (DOCKER_TLS_VERIFY=1) but certifate path (DOCKER_CERT_PATH) is not defined.");
+            }
+
+            File certPath = new File(dockerCertPath);
+
+            if (!certPath.exists()) {
+                throw new DockerClientException(
+                        "Enabled TLS verification (DOCKER_TLS_VERIFY=1) but certificate path (DOCKER_CERT_PATH) '"
+                                + dockerCertPath + "' doesn't exist.");
+            } else if (!certPath.isDirectory()) {
+                throw new DockerClientException(
+                        "Enabled TLS verification (DOCKER_TLS_VERIFY=1) but certificate path (DOCKER_CERT_PATH) '"
+                                + dockerCertPath + "' doesn't point to a directory.");
+            }
+
+            return dockerCertPath;
+        }
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
index 6aed6c358..743b8c2ef 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
@@ -2,7 +2,7 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
-import com.github.dockerjava.core.DockerClientConfig.DockerClientConfigBuilder;
+import com.github.dockerjava.core.DefaultDockerClientConfig.Builder;
 import com.github.dockerjava.jaxrs.DockerCmdExecFactoryImpl;
 
 public class DockerClientBuilder {
@@ -19,7 +19,7 @@ public static DockerClientBuilder getInstance() {
         return new DockerClientBuilder(DockerClientImpl.getInstance());
     }
 
-    public static DockerClientBuilder getInstance(DockerClientConfigBuilder dockerClientConfigBuilder) {
+    public static DockerClientBuilder getInstance(Builder dockerClientConfigBuilder) {
         return getInstance(dockerClientConfigBuilder.build());
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index 31cfc0c58..532fe6b43 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -1,440 +1,40 @@
+/*
+ * Created on 08.06.2016
+ */
 package com.github.dockerjava.core;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Serializable;
 import java.net.URI;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
 
-import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
-import com.github.dockerjava.core.NameParser.HostnameReposName;
-import com.github.dockerjava.core.NameParser.ReposTag;
 
 /**
- * Respects some of the docker CLI options. See https://docs.docker.com/engine/reference/commandline/cli/#environment-variables
+ * Interface that describes the docker client configuration.
+ *
+ * @author Marcus Linke
+ *
  */
-public class DockerClientConfig implements Serializable {
-
-    private static final long serialVersionUID = -4307357472441531489L;
-
-    public static final String DOCKER_HOST = "DOCKER_HOST";
-
-    public static final String DOCKER_TLS_VERIFY = "DOCKER_TLS_VERIFY";
-
-    public static final String DOCKER_CONFIG = "DOCKER_CONFIG";
-
-    public static final String DOCKER_CERT_PATH = "DOCKER_CERT_PATH";
-
-    public static final String API_VERSION = "api.version";
-
-    public static final String REGISTRY_USERNAME = "registry.username";
-
-    public static final String REGISTRY_PASSWORD = "registry.password";
-
-    public static final String REGISTRY_EMAIL = "registry.email";
-
-    public static final String REGISTRY_URL = "registry.url";
-
-    private static final String DOCKER_JAVA_PROPERTIES = "docker-java.properties";
-
-    private static final String DOCKER_CFG = ".dockercfg";
-
-    private static final Set<String> CONFIG_KEYS = new HashSet<String>();
-
-    static {
-        CONFIG_KEYS.add(DOCKER_HOST);
-        CONFIG_KEYS.add(DOCKER_TLS_VERIFY);
-        CONFIG_KEYS.add(DOCKER_CONFIG);
-        CONFIG_KEYS.add(DOCKER_CERT_PATH);
-        CONFIG_KEYS.add(API_VERSION);
-        CONFIG_KEYS.add(REGISTRY_USERNAME);
-        CONFIG_KEYS.add(REGISTRY_PASSWORD);
-        CONFIG_KEYS.add(REGISTRY_EMAIL);
-        CONFIG_KEYS.add(REGISTRY_URL);
-    }
-
-    private final URI dockerHost;
-
-    private final String registryUsername, registryPassword, registryEmail, registryUrl, dockerConfig, dockerCertPath;
+public interface DockerClientConfig {
 
-    private final boolean dockerTlsVerify;
+    URI getDockerHost();
 
-    private final RemoteApiVersion apiVersion;
+    RemoteApiVersion getApiVersion();
 
-    DockerClientConfig(URI dockerHost, String dockerConfig, String apiVersion, String registryUrl,
-            String registryUsername, String registryPassword, String registryEmail, String dockerCertPath,
-            boolean dockerTslVerify) {
-        this.dockerHost = checkDockerHostScheme(dockerHost);
-        this.dockerTlsVerify = dockerTslVerify;
-        this.dockerCertPath = checkDockerCertPath(dockerTslVerify, dockerCertPath);
-        this.dockerConfig = dockerConfig;
-        this.apiVersion = RemoteApiVersion.parseConfigWithDefault(apiVersion);
-        this.registryUsername = registryUsername;
-        this.registryPassword = registryPassword;
-        this.registryEmail = registryEmail;
-        this.registryUrl = registryUrl;
-    }
+    String getRegistryUsername();
 
-    private URI checkDockerHostScheme(URI dockerHost) {
-        if ("tcp".equals(dockerHost.getScheme()) || "unix".equals(dockerHost.getScheme())) {
-            return dockerHost;
-        } else {
-            throw new DockerClientException("Unsupported protocol scheme found: '" + dockerHost
-                    + "'. Only 'tcp://' or 'unix://' supported.");
-        }
-    }
+    String getRegistryPassword();
 
-    private String checkDockerCertPath(boolean dockerTlsVerify, String dockerCertPath) {
-        if (dockerTlsVerify) {
-            if (StringUtils.isEmpty(dockerCertPath)) {
-                throw new DockerClientException(
-                        "Enabled TLS verification (DOCKER_TLS_VERIFY=1) but certifate path (DOCKER_CERT_PATH) is not defined.");
-            } else {
-                File certPath = new File(dockerCertPath);
+    String getRegistryEmail();
 
-                if (!certPath.exists()) {
-                    throw new DockerClientException(
-                            "Enabled TLS verification (DOCKER_TLS_VERIFY=1) but certificate path (DOCKER_CERT_PATH) '" + dockerCertPath
-                                    + "' doesn't exist.");
-                }
+    String getRegistryUrl();
 
-                if (certPath.isDirectory()) {
-                    return dockerCertPath;
-                } else {
-                    throw new DockerClientException(
-                            "Enabled TLS verification (DOCKER_TLS_VERIFY=1) but certificate path (DOCKER_CERT_PATH) '" + dockerCertPath
-                                    + "' doesn't point to a directory.");
-                }
-            }
-        } else {
-            return dockerCertPath;
-        }
-    }
+    AuthConfig effectiveAuthConfig(String imageName);
 
-    private static Properties loadIncludedDockerProperties(Properties systemProperties) {
-        try (InputStream is = DockerClientConfig.class.getResourceAsStream("/" + DOCKER_JAVA_PROPERTIES)) {
-            Properties p = new Properties();
-            p.load(is);
-            replaceProperties(p, systemProperties);
-            return p;
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static void replaceProperties(Properties properties, Properties replacements) {
-        for (Object objectKey : properties.keySet()) {
-            String key = objectKey.toString();
-            properties.setProperty(key, replaceProperties(properties.getProperty(key), replacements));
-        }
-    }
-
-    private static String replaceProperties(String s, Properties replacements) {
-        for (Map.Entry<Object, Object> entry : replacements.entrySet()) {
-            String key = "${" + entry.getKey() + "}";
-            while (s.contains(key)) {
-                s = s.replace(key, String.valueOf(entry.getValue()));
-            }
-        }
-        return s;
-    }
-
-    /**
-     * Creates a new Properties object containing values overridden from ${user.home}/.docker.io.properties
-     *
-     * @param p
-     *            The original set of properties to override
-     * @return A copy of the original Properties with overridden values
-     */
-    private static Properties overrideDockerPropertiesWithSettingsFromUserHome(Properties p, Properties systemProperties) {
-        Properties overriddenProperties = new Properties();
-        overriddenProperties.putAll(p);
-
-        final File usersDockerPropertiesFile = new File(systemProperties.getProperty("user.home"),
-                "." + DOCKER_JAVA_PROPERTIES);
-        if (usersDockerPropertiesFile.isFile()) {
-            try (FileInputStream in = new FileInputStream(usersDockerPropertiesFile)) {
-                overriddenProperties.load(in);
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-        return overriddenProperties;
-    }
-
-    private static Properties overrideDockerPropertiesWithEnv(Properties properties, Map<String, String> env) {
-        Properties overriddenProperties = new Properties();
-        overriddenProperties.putAll(properties);
-
-        // special case which is a sensible default
-        if (env.containsKey(DOCKER_HOST)) {
-            overriddenProperties.setProperty(DOCKER_HOST, env.get(DOCKER_HOST));
-        }
-
-        for (Map.Entry<String, String> envEntry : env.entrySet()) {
-            String envKey = envEntry.getKey();
-            if (CONFIG_KEYS.contains(envKey)) {
-                overriddenProperties.setProperty(envKey, envEntry.getValue());
-            }
-        }
-
-        return overriddenProperties;
-    }
+    AuthConfigurations getAuthConfigurations();
 
     /**
-     * Creates a new Properties object containing values overridden from the System properties
-     *
-     * @param p
-     *            The original set of properties to override
-     * @return A copy of the original Properties with overridden values
+     * Returns an {@link SSLConfig} when secure connection is configured or null if not.
      */
-    private static Properties overrideDockerPropertiesWithSystemProperties(Properties p, Properties systemProperties) {
-        Properties overriddenProperties = new Properties();
-        overriddenProperties.putAll(p);
-
-        for (String key : CONFIG_KEYS) {
-            if (systemProperties.containsKey(key)) {
-                overriddenProperties.setProperty(key, systemProperties.getProperty(key));
-            }
-        }
-        return overriddenProperties;
-    }
-
-    public static DockerClientConfigBuilder createDefaultConfigBuilder() {
-        return createDefaultConfigBuilder(System.getenv(), System.getProperties());
-    }
-
-    /**
-     * Allows you to build the config without system environment interfering for more robust testing
-     */
-    static DockerClientConfigBuilder createDefaultConfigBuilder(Map<String, String> env, Properties systemProperties) {
-        Properties properties = loadIncludedDockerProperties(systemProperties);
-        properties = overrideDockerPropertiesWithSettingsFromUserHome(properties, systemProperties);
-        properties = overrideDockerPropertiesWithEnv(properties, env);
-        properties = overrideDockerPropertiesWithSystemProperties(properties, systemProperties);
-        return new DockerClientConfigBuilder().withProperties(properties);
-    }
-
-    public URI getDockerHost() {
-        return dockerHost;
-    }
-
-    public RemoteApiVersion getApiVersion() {
-        return apiVersion;
-    }
-
-    public String getRegistryUsername() {
-        return registryUsername;
-    }
-
-    public String getRegistryPassword() {
-        return registryPassword;
-    }
-
-    public String getRegistryEmail() {
-        return registryEmail;
-    }
-
-    public String getRegistryUrl() {
-        return registryUrl;
-    }
-
-    public String getDockerConfig() {
-        return dockerConfig;
-    }
-
-    public String getDockerCertPath() {
-        return dockerCertPath;
-    }
-
-    public boolean getDockerTlsVerify() {
-        return dockerTlsVerify;
-    }
-
-    private AuthConfig getAuthConfig() {
-        AuthConfig authConfig = null;
-        if (getRegistryUsername() != null && getRegistryPassword() != null && getRegistryEmail() != null
-                && getRegistryUrl() != null) {
-            authConfig = new AuthConfig()
-                    .withUsername(getRegistryUsername())
-                    .withPassword(getRegistryPassword())
-                    .withEmail(getRegistryEmail())
-                    .withRegistryAddress(getRegistryUrl());
-        }
-        return authConfig;
-    }
-
-    public AuthConfig effectiveAuthConfig(String imageName) {
-        AuthConfig authConfig = null;
-
-        File dockerCfgFile = new File(getDockerConfig() + File.separator + DOCKER_CFG);
-
-        if (dockerCfgFile.exists() && dockerCfgFile.isFile() && imageName != null) {
-            AuthConfigFile authConfigFile;
-            try {
-                authConfigFile = AuthConfigFile.loadConfig(dockerCfgFile);
-            } catch (IOException e) {
-                throw new DockerClientException("Failed to parse dockerCfgFile", e);
-            }
-            ReposTag reposTag = NameParser.parseRepositoryTag(imageName);
-            HostnameReposName hostnameReposName = NameParser.resolveRepositoryName(reposTag.repos);
-
-            authConfig = authConfigFile.resolveAuthConfig(hostnameReposName.hostname);
-        }
-
-        AuthConfig otherAuthConfig = getAuthConfig();
-
-        if (otherAuthConfig != null) {
-            authConfig = otherAuthConfig;
-        }
-
-        return authConfig;
-    }
-
-    public AuthConfigurations getAuthConfigurations() {
-        File dockerCfgFile = new File(getDockerConfig() + File.separator + DOCKER_CFG);
-        if (dockerCfgFile.exists() && dockerCfgFile.isFile()) {
-            AuthConfigFile authConfigFile;
-            try {
-                authConfigFile = AuthConfigFile.loadConfig(dockerCfgFile);
-            } catch (IOException e) {
-                throw new DockerClientException("Failed to parse dockerCfgFile", e);
-            }
-
-            return authConfigFile.getAuthConfigurations();
-        }
-
-        return new AuthConfigurations();
-    }
-
-    // CHECKSTYLE:OFF
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        DockerClientConfig that = (DockerClientConfig) o;
-
-        return EqualsBuilder.reflectionEquals(this, that);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
-    // CHECKSTYLE:ON
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    public static class DockerClientConfigBuilder {
-        private URI dockerHost;
-
-        private String apiVersion, registryUsername, registryPassword, registryEmail, registryUrl, dockerConfig,
-                dockerCertPath;
-
-        private boolean dockerTlsVerify;
-
-        /**
-         * This will set all fields in the builder to those contained in the Properties object. The Properties object should contain the
-         * following docker-java configuration keys: DOCKER_HOST, DOCKER_TLS_VERIFY, api.version, registry.username, registry.password,
-         * registry.email, DOCKER_CERT_PATH, and DOCKER_CONFIG.
-         */
-        public DockerClientConfigBuilder withProperties(Properties p) {
-            return withDockerHost(p.getProperty(DOCKER_HOST)).withDockerTlsVerify(p.getProperty(DOCKER_TLS_VERIFY))
-                    .withDockerConfig(p.getProperty(DOCKER_CONFIG)).withDockerCertPath(p.getProperty(DOCKER_CERT_PATH))
-                    .withApiVersion(p.getProperty(API_VERSION)).withRegistryUsername(p.getProperty(REGISTRY_USERNAME))
-                    .withRegistryPassword(p.getProperty(REGISTRY_PASSWORD))
-                    .withRegistryEmail(p.getProperty(REGISTRY_EMAIL)).withRegistryUrl(p.getProperty(REGISTRY_URL));
-        }
-
-        /**
-         * configure DOCKER_HOST
-         */
-        public final DockerClientConfigBuilder withDockerHost(String dockerHost) {
-            checkNotNull(dockerHost, "uri was not specified");
-            this.dockerHost = URI.create(dockerHost);
-            return this;
-        }
-
-        public final DockerClientConfigBuilder withApiVersion(RemoteApiVersion apiVersion) {
-            this.apiVersion = apiVersion.getVersion();
-            return this;
-        }
-
-        public final DockerClientConfigBuilder withApiVersion(String apiVersion) {
-            this.apiVersion = apiVersion;
-            return this;
-        }
-
-        public final DockerClientConfigBuilder withRegistryUsername(String registryUsername) {
-            this.registryUsername = registryUsername;
-            return this;
-        }
-
-        public final DockerClientConfigBuilder withRegistryPassword(String registryPassword) {
-            this.registryPassword = registryPassword;
-            return this;
-        }
-
-        public final DockerClientConfigBuilder withRegistryEmail(String registryEmail) {
-            this.registryEmail = registryEmail;
-            return this;
-        }
-
-        public DockerClientConfigBuilder withRegistryUrl(String registryUrl) {
-            this.registryUrl = registryUrl;
-            return this;
-        }
-
-        public final DockerClientConfigBuilder withDockerCertPath(String dockerCertPath) {
-            this.dockerCertPath = dockerCertPath;
-            return this;
-        }
-
-        public final DockerClientConfigBuilder withDockerConfig(String dockerConfig) {
-            this.dockerConfig = dockerConfig;
-            return this;
-        }
-
-        public final DockerClientConfigBuilder withDockerTlsVerify(String dockerTlsVerify) {
-            if (dockerTlsVerify != null) {
-                String trimmed = dockerTlsVerify.trim();
-                this.dockerTlsVerify = "true".equalsIgnoreCase(trimmed) || "1".equals(trimmed);
-            } else {
-                this.dockerTlsVerify = false;
-            }
-            return this;
-        }
-
-        public final DockerClientConfigBuilder withDockerTlsVerify(Boolean dockerTlsVerify) {
-            this.dockerTlsVerify = dockerTlsVerify;
-            return this;
-        }
+    SSLConfig getSSLConfig();
 
-        public DockerClientConfig build() {
-            return new DockerClientConfig(dockerHost, dockerConfig, apiVersion, registryUrl, registryUsername,
-                    registryPassword, registryEmail, dockerCertPath, dockerTlsVerify);
-        }
-    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 765f562bd..e11ca4f30 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -125,7 +125,7 @@ public class DockerClientImpl implements Closeable, DockerClient {
     private DockerCmdExecFactory dockerCmdExecFactory;
 
     private DockerClientImpl() {
-        this(DockerClientConfig.createDefaultConfigBuilder().build());
+        this(DefaultDockerClientConfig.createDefaultConfigBuilder().build());
     }
 
     private DockerClientImpl(String serverUrl) {
@@ -138,7 +138,7 @@ private DockerClientImpl(DockerClientConfig dockerClientConfig) {
     }
 
     private static DockerClientConfig configWithServerUrl(String serverUrl) {
-        return DockerClientConfig.createDefaultConfigBuilder().withDockerHost(serverUrl).build();
+        return DefaultDockerClientConfig.createDefaultConfigBuilder().withDockerHost(serverUrl).build();
     }
 
     public static DockerClientImpl getInstance() {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index 5d489bbc5..d71cc33ae 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -18,6 +18,7 @@
 import javax.ws.rs.client.WebTarget;
 
 import com.github.dockerjava.api.command.UpdateContainerCmd;
+
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.conn.socket.PlainConnectionSocketFactory;
@@ -83,7 +84,6 @@
 import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.LocalDirectorySSLConfig;
 import com.github.dockerjava.jaxrs.connector.ApacheConnectorProvider;
 import com.github.dockerjava.jaxrs.filter.JsonClientFilter;
 import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter;
@@ -114,8 +114,6 @@ public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
 
     private DockerClientConfig dockerClientConfig;
 
-    SSLContext sslContext = null;
-
     @Override
     public void init(DockerClientConfig dockerClientConfig) {
         checkNotNull(dockerClientConfig, "config was not specified");
@@ -160,18 +158,16 @@ public void init(DockerClientConfig dockerClientConfig) {
 
         String protocol = null;
 
-        if (dockerClientConfig.getDockerTlsVerify()) {
-            protocol = "https";
+        SSLContext sslContext = null;
 
-            try {
-
-                if (sslContext == null) {
-                    sslContext = new LocalDirectorySSLConfig(dockerClientConfig.getDockerCertPath()).getSSLContext();
-                }
+        try {
+            sslContext = dockerClientConfig.getSSLConfig().getSSLContext();
+        } catch (Exception ex) {
+            throw new DockerClientException("Error in SSL Configuration", ex);
+        }
 
-            } catch (Exception ex) {
-                throw new DockerClientException("Error in SSL Configuration", ex);
-            }
+        if (sslContext != null) {
+            protocol = "https";
         } else {
             protocol = "http";
         }
@@ -529,12 +525,6 @@ public void close() throws IOException {
         client.close();
     }
 
-    @Override
-    public DockerCmdExecFactoryImpl withSSLContext(SSLContext sslContext) {
-        this.sslContext = sslContext;
-        return this;
-    }
-
     public DockerCmdExecFactoryImpl withReadTimeout(Integer readTimeout) {
         this.readTimeout = readTimeout;
         return this;
diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
index 8f704c7af..1f55c61a8 100644
--- a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
@@ -53,7 +53,7 @@
 import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.DockerClientImpl;
-import com.github.dockerjava.core.LocalDirectorySSLConfig;
+import com.github.dockerjava.core.SSLConfig;
 import com.github.dockerjava.netty.exec.AttachContainerCmdExec;
 import com.github.dockerjava.netty.exec.AuthCmdExec;
 import com.github.dockerjava.netty.exec.BuildImageCmdExec;
@@ -123,7 +123,6 @@
 
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
-import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;
 
@@ -168,8 +167,6 @@ public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
 
     private NettyInitializer nettyInitializer;
 
-    private SSLContext sslContext = null;
-
     private ChannelProvider channelProvider = new ChannelProvider() {
         @Override
         public DuplexChannel getChannel() {
@@ -270,12 +267,10 @@ public DuplexChannel connect(Bootstrap bootstrap) throws InterruptedException {
 
             DuplexChannel channel = (DuplexChannel) bootstrap.connect(host, port).sync().channel();
 
-            if (dockerClientConfig.getDockerTlsVerify()) {
-                final SslHandler ssl = initSsl(dockerClientConfig);
+            final SslHandler ssl = initSsl(dockerClientConfig);
 
-                if (ssl != null) {
-                    channel.pipeline().addFirst(ssl);
-                }
+            if (ssl != null) {
+                channel.pipeline().addFirst(ssl);
             }
 
             return channel;
@@ -288,18 +283,19 @@ private SslHandler initSsl(DockerClientConfig dockerClientConfig) {
                 String host = dockerClientConfig.getDockerHost().getHost();
                 int port = dockerClientConfig.getDockerHost().getPort();
 
-                if (sslContext == null) {
-                    sslContext = new LocalDirectorySSLConfig(dockerClientConfig.getDockerCertPath()).getSSLContext();
-                }
+                final SSLConfig sslConfig = dockerClientConfig.getSSLConfig();
+
+                if (sslConfig != null && sslConfig.getSSLContext() != null) {
 
-                SSLEngine engine = sslContext.createSSLEngine(host, port);
-                engine.setUseClientMode(true);
-                engine.setSSLParameters(enableHostNameVerification(engine.getSSLParameters()));
+                    SSLEngine engine = sslConfig.getSSLContext().createSSLEngine(host, port);
+                    engine.setUseClientMode(true);
+                    engine.setSSLParameters(enableHostNameVerification(engine.getSSLParameters()));
 
-                // in the future we may use HostnameVerifier like here:
-                // https://github.com/AsyncHttpClient/async-http-client/blob/1.8.x/src/main/java/com/ning/http/client/providers/netty/NettyConnectListener.java#L76
+                    // in the future we may use HostnameVerifier like here:
+                    // https://github.com/AsyncHttpClient/async-http-client/blob/1.8.x/src/main/java/com/ning/http/client/providers/netty/NettyConnectListener.java#L76
 
-                ssl = new SslHandler(engine);
+                    ssl = new SslHandler(engine);
+                }
 
             } catch (Exception e) {
                 throw new RuntimeException(e);
@@ -577,12 +573,6 @@ public void close() throws IOException {
         eventLoopGroup.shutdownGracefully();
     }
 
-    @Override
-    public DockerCmdExecFactory withSSLContext(SSLContext sslContext) {
-        this.sslContext = sslContext;
-        return this;
-    }
-
     private WebTarget getBaseResource() {
         return new WebTarget(channelProvider);
     }
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index 1a52bbd3f..e6cc00ac0 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -29,7 +29,7 @@
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.core.DockerClientBuilder;
-import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.core.TestDockerCmdExecFactory;
 import com.github.dockerjava.core.command.BuildImageResultCallback;
 import com.github.dockerjava.core.command.LogContainerResultCallback;
@@ -68,12 +68,12 @@ public void beforeTest() throws Exception {
         LOG.info("======================= END OF BEFORETEST =======================\n\n");
     }
 
-    private DockerClientConfig config() {
+    private DefaultDockerClientConfig config() {
         return config(null);
     }
 
-    protected DockerClientConfig config(String password) {
-        DockerClientConfig.DockerClientConfigBuilder builder = DockerClientConfig.createDefaultConfigBuilder()
+    protected DefaultDockerClientConfig config(String password) {
+        DefaultDockerClientConfig.Builder builder = DefaultDockerClientConfig.createDefaultConfigBuilder()
                 .withRegistryUrl("https://index.docker.io/v1/");
         if (password != null) {
             builder = builder.withRegistryPassword(password);
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
similarity index 54%
rename from src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
rename to src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
index ee679a0af..55ec38015 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
+++ b/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
@@ -19,16 +19,16 @@
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.AuthConfig;
 
-public class DockerClientConfigTest {
+public class DefaultDockerClientConfigTest {
 
-    public static final DockerClientConfig EXAMPLE_CONFIG = newExampleConfig();
+    public static final DefaultDockerClientConfig EXAMPLE_CONFIG = newExampleConfig();
 
-    private static DockerClientConfig newExampleConfig() {
+    private static DefaultDockerClientConfig newExampleConfig() {
 
         String dockerCertPath = dockerCertPath();
 
-        return new DockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
-                dockerCertPath, true);
+        return new DefaultDockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
+                new LocalDirectorySSLConfig(dockerCertPath));
     }
 
     private static String homeDir() {
@@ -49,7 +49,7 @@ public void environmentDockerHost() throws Exception {
 
         // given docker host in env
         Map<String, String> env = new HashMap<String, String>();
-        env.put(DockerClientConfig.DOCKER_HOST, "tcp://baz:8768");
+        env.put(DefaultDockerClientConfig.DOCKER_HOST, "tcp://baz:8768");
         // and it looks to be SSL disabled
         env.remove("DOCKER_CERT_PATH");
 
@@ -59,7 +59,7 @@ public void environmentDockerHost() throws Exception {
         systemProperties.setProperty("user.home", homeDir());
 
         // when you build a config
-        DockerClientConfig config = buildConfig(env, systemProperties);
+        DefaultDockerClientConfig config = buildConfig(env, systemProperties);
 
         assertEquals(config.getDockerHost(), URI.create("tcp://baz:8768"));
     }
@@ -69,25 +69,25 @@ public void environment() throws Exception {
 
         // given a default config in env properties
         Map<String, String> env = new HashMap<String, String>();
-        env.put(DockerClientConfig.DOCKER_HOST, "tcp://foo");
-        env.put(DockerClientConfig.API_VERSION, "apiVersion");
-        env.put(DockerClientConfig.REGISTRY_USERNAME, "registryUsername");
-        env.put(DockerClientConfig.REGISTRY_PASSWORD, "registryPassword");
-        env.put(DockerClientConfig.REGISTRY_EMAIL, "registryEmail");
-        env.put(DockerClientConfig.REGISTRY_URL, "registryUrl");
-        env.put(DockerClientConfig.DOCKER_CONFIG, "dockerConfig");
-        env.put(DockerClientConfig.DOCKER_CERT_PATH, dockerCertPath());
-        env.put(DockerClientConfig.DOCKER_TLS_VERIFY, "1");
+        env.put(DefaultDockerClientConfig.DOCKER_HOST, "tcp://foo");
+        env.put(DefaultDockerClientConfig.API_VERSION, "apiVersion");
+        env.put(DefaultDockerClientConfig.REGISTRY_USERNAME, "registryUsername");
+        env.put(DefaultDockerClientConfig.REGISTRY_PASSWORD, "registryPassword");
+        env.put(DefaultDockerClientConfig.REGISTRY_EMAIL, "registryEmail");
+        env.put(DefaultDockerClientConfig.REGISTRY_URL, "registryUrl");
+        env.put(DefaultDockerClientConfig.DOCKER_CONFIG, "dockerConfig");
+        env.put(DefaultDockerClientConfig.DOCKER_CERT_PATH, dockerCertPath());
+        env.put(DefaultDockerClientConfig.DOCKER_TLS_VERIFY, "1");
 
         // when you build a config
-        DockerClientConfig config = buildConfig(env, new Properties());
+        DefaultDockerClientConfig config = buildConfig(env, new Properties());
 
         // then we get the example object
         assertEquals(config, EXAMPLE_CONFIG);
     }
 
-    private DockerClientConfig buildConfig(Map<String, String> env, Properties systemProperties) {
-        return DockerClientConfig.createDefaultConfigBuilder(env, systemProperties).build();
+    private DefaultDockerClientConfig buildConfig(Map<String, String> env, Properties systemProperties) {
+        return DefaultDockerClientConfig.createDefaultConfigBuilder(env, systemProperties).build();
     }
 
     @Test
@@ -99,7 +99,7 @@ public void defaults() throws Exception {
         systemProperties.setProperty("user.home", homeDir());
 
         // when you build config
-        DockerClientConfig config = buildConfig(Collections.<String, String> emptyMap(), systemProperties);
+        DefaultDockerClientConfig config = buildConfig(Collections.<String, String> emptyMap(), systemProperties);
 
         // then the cert path is as expected
         assertEquals(config.getDockerHost(), URI.create("unix:///var/run/docker.sock"));
@@ -107,7 +107,7 @@ public void defaults() throws Exception {
         assertEquals(config.getRegistryUrl(), AuthConfig.DEFAULT_SERVER_ADDRESS);
         assertEquals(config.getApiVersion(), RemoteApiVersion.unknown());
         assertEquals(config.getDockerConfig(), homeDir() + "/.docker");
-        assertNull(config.getDockerCertPath());
+        assertNull(config.getSSLConfig());
     }
 
     @Test
@@ -115,18 +115,18 @@ public void systemProperties() throws Exception {
 
         // given system properties based on the example
         Properties systemProperties = new Properties();
-        systemProperties.put(DockerClientConfig.DOCKER_HOST, "tcp://foo");
-        systemProperties.put(DockerClientConfig.API_VERSION, "apiVersion");
-        systemProperties.put(DockerClientConfig.REGISTRY_USERNAME, "registryUsername");
-        systemProperties.put(DockerClientConfig.REGISTRY_PASSWORD, "registryPassword");
-        systemProperties.put(DockerClientConfig.REGISTRY_EMAIL, "registryEmail");
-        systemProperties.put(DockerClientConfig.REGISTRY_URL, "registryUrl");
-        systemProperties.put(DockerClientConfig.DOCKER_CONFIG, "dockerConfig");
-        systemProperties.put(DockerClientConfig.DOCKER_CERT_PATH, dockerCertPath());
-        systemProperties.put(DockerClientConfig.DOCKER_TLS_VERIFY, "1");
+        systemProperties.put(DefaultDockerClientConfig.DOCKER_HOST, "tcp://foo");
+        systemProperties.put(DefaultDockerClientConfig.API_VERSION, "apiVersion");
+        systemProperties.put(DefaultDockerClientConfig.REGISTRY_USERNAME, "registryUsername");
+        systemProperties.put(DefaultDockerClientConfig.REGISTRY_PASSWORD, "registryPassword");
+        systemProperties.put(DefaultDockerClientConfig.REGISTRY_EMAIL, "registryEmail");
+        systemProperties.put(DefaultDockerClientConfig.REGISTRY_URL, "registryUrl");
+        systemProperties.put(DefaultDockerClientConfig.DOCKER_CONFIG, "dockerConfig");
+        systemProperties.put(DefaultDockerClientConfig.DOCKER_CERT_PATH, dockerCertPath());
+        systemProperties.put(DefaultDockerClientConfig.DOCKER_TLS_VERIFY, "1");
 
         // when you build new config
-        DockerClientConfig config = buildConfig(Collections.<String, String> emptyMap(), systemProperties);
+        DefaultDockerClientConfig config = buildConfig(Collections.<String, String> emptyMap(), systemProperties);
 
         // then it is the same as the example
         assertEquals(config, EXAMPLE_CONFIG);
@@ -136,50 +136,46 @@ public void systemProperties() throws Exception {
     @Test
     public void serializableTest() {
         final byte[] serialized = SerializationUtils.serialize(EXAMPLE_CONFIG);
-        final DockerClientConfig deserialized = (DockerClientConfig) SerializationUtils.deserialize(serialized);
+        final DefaultDockerClientConfig deserialized = (DefaultDockerClientConfig) SerializationUtils.deserialize(serialized);
 
         assertThat("Deserialized object mush match source object", deserialized, equalTo(EXAMPLE_CONFIG));
     }
 
-    @Test(expectedExceptions = DockerClientException.class)
-    public void testTlsVerifyAndCertPathNull() throws Exception {
-        new DockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
-                null, true);
+    @Test()
+    public void testSslContextEmpty() throws Exception {
+        new DefaultDockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
+                null);
     }
 
-    @Test(expectedExceptions = DockerClientException.class)
-    public void testTlsVerifyAndCertPathEmpty() throws Exception {
-        new DockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
-                "", true);
-    }
+
 
     @Test()
     public void testTlsVerifyAndCertPath() throws Exception {
-        new DockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
-                dockerCertPath(), true);
+        new DefaultDockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
+                new LocalDirectorySSLConfig(dockerCertPath()));
     }
 
     @Test(expectedExceptions = DockerClientException.class)
     public void testWrongHostScheme() throws Exception {
-        new DockerClientConfig(URI.create("http://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
-                null, false);
+        new DefaultDockerClientConfig(URI.create("http://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
+                null);
     }
 
     @Test()
     public void testTcpHostScheme() throws Exception {
-        new DockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
-                null, false);
+        new DefaultDockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
+                null);
     }
 
     @Test()
     public void testUnixHostScheme() throws Exception {
-        new DockerClientConfig(URI.create("unix://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
-                null, false);
+        new DefaultDockerClientConfig(URI.create("unix://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
+                null);
     }
 
     @Test
     public void withDockerTlsVerify() throws Exception {
-        DockerClientConfig.DockerClientConfigBuilder builder = new DockerClientConfig.DockerClientConfigBuilder();
+        DefaultDockerClientConfig.Builder builder = new DefaultDockerClientConfig.Builder();
         Field field = builder.getClass().getDeclaredField("dockerTlsVerify");
         field.setAccessible(true);
 
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
index 7ea8bace5..1df4636ba 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
@@ -12,7 +12,7 @@ public class DockerClientImplTest {
     @Test
     public void configuredInstanceAuthConfig() throws Exception {
         // given a config with null serverAddress
-        DockerClientConfig dockerClientConfig = new DockerClientConfig(URI.create("tcp://foo"), null, null, null, "", "", "", null, false);
+        DefaultDockerClientConfig dockerClientConfig = new DefaultDockerClientConfig(URI.create("tcp://foo"), null, null, null, "", "", "", null);
         DockerClientImpl dockerClient = DockerClientImpl.getInstance(dockerClientConfig);
 
         // when we get the auth config
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index aee8a60a8..48ea1e164 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -58,7 +58,6 @@
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.BuildResponseItem;
 
-import javax.net.ssl.SSLContext;
 import java.io.IOException;
 import java.security.SecureRandom;
 import java.util.ArrayList;
@@ -431,9 +430,4 @@ public List<String> getVolumeNames() {
     public List<String> getNetworkIds() {
         return new ArrayList<>(networkIds);
     }
-
-    @Override
-    public DockerCmdExecFactory withSSLContext(SSLContext sslContext) {
-        return delegate.withSSLContext(sslContext);
-    }
 }

From 006fd9b061066ba76c7412009292ec2e644417a4 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Mon, 13 Jun 2016 23:00:05 +0200
Subject: [PATCH 0562/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f3b7e9b9..ad5885775 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ Change Log
 ---
 
 All changes
+* [#596] (https://github.com/docker-java/docker-java/pull/596) Refactor configuration of SSL to allow override with custom config 
 * [#529] (https://github.com/docker-java/docker-java/pull/529) Refactor CertUtils. Support ECDSA and PrivateKey 
 
 v3.0.0

From 2f8d317585c0d4b4e9fc45d122a3a02ad31a1d72 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 14 Jun 2016 00:02:15 +0300
Subject: [PATCH 0563/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad5885775..10065afad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ Change Log
 All changes
 * [#596] (https://github.com/docker-java/docker-java/pull/596) Refactor configuration of SSL to allow override with custom config 
 * [#529] (https://github.com/docker-java/docker-java/pull/529) Refactor CertUtils. Support ECDSA and PrivateKey 
+* [#593] (https://github.com/docker-java/docker-java/pull/593) Added Device.parse() method with simple verification.
 
 v3.0.0
 ---

From efb424523971ddb50488bc3b03a52f32d8bcc5b9 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 15 Jun 2016 23:43:44 +0300
Subject: [PATCH 0564/1272] Allow null value. boolean <-> Boolean error

---
 .../github/dockerjava/core/DefaultDockerClientConfig.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index 4641f9d3c..b21e227ec 100644
--- a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.core;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.commons.lang.BooleanUtils.isTrue;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -319,7 +320,7 @@ public static class Builder {
         private String apiVersion, registryUsername, registryPassword, registryEmail, registryUrl, dockerConfig,
                 dockerCertPath;
 
-        private boolean dockerTlsVerify;
+        private Boolean dockerTlsVerify;
 
         private SSLConfig customSslConfig = null;
 
@@ -419,7 +420,7 @@ public DefaultDockerClientConfig build() {
             SSLConfig sslConfig = null;
 
             if (customSslConfig == null) {
-                if (dockerTlsVerify) {
+                if (isTrue(dockerTlsVerify)) {
                     dockerCertPath = checkDockerCertPath(dockerCertPath);
                     sslConfig = new LocalDirectorySSLConfig(dockerCertPath);
                 }

From 019770cc8dda7fcdcbede13fa7cefcdb072589ed Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 16 Jun 2016 09:53:49 +0300
Subject: [PATCH 0565/1272] Fix tests

---
 .../core/DefaultDockerClientConfigTest.java        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
index 55ec38015..54e70c511 100644
--- a/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
+++ b/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
@@ -180,25 +180,25 @@ public void withDockerTlsVerify() throws Exception {
         field.setAccessible(true);
 
         builder.withDockerTlsVerify("");
-        assertThat(field.getBoolean(builder), is(false));
+        assertThat((Boolean) field.get(builder), is(false));
 
         builder.withDockerTlsVerify("false");
-        assertThat(field.getBoolean(builder), is(false));
+        assertThat((Boolean) field.get(builder), is(false));
 
         builder.withDockerTlsVerify("FALSE");
-        assertThat(field.getBoolean(builder), is(false));
+        assertThat((Boolean) field.get(builder), is(false));
 
         builder.withDockerTlsVerify("true");
-        assertThat(field.getBoolean(builder), is(true));
+        assertThat((Boolean) field.get(builder), is(true));
 
         builder.withDockerTlsVerify("TRUE");
-        assertThat(field.getBoolean(builder), is(true));
+        assertThat((Boolean) field.get(builder), is(true));
 
         builder.withDockerTlsVerify("0");
-        assertThat(field.getBoolean(builder), is(false));
+        assertThat((Boolean) field.get(builder), is(false));
 
         builder.withDockerTlsVerify("1");
-        assertThat(field.getBoolean(builder), is(true));
+        assertThat((Boolean) field.get(builder), is(true));
     }
 
 }

From 2116ae00f5ca5e5630491bc68a4208adc969b1dc Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 18 Jun 2016 00:12:52 +0300
Subject: [PATCH 0566/1272] Docker travis for ITs (#606)

Fast build - without integration tests.
ITs - against different docker versions.
---
 .travis.yml                                   |  37 ++-
 get-docker-com.sh                             | 313 ++++++++++++++++++
 .../jaxrs/DockerCmdExecFactoryImpl.java       |   6 +-
 src/test/resources/travis-logback.xml         |  19 ++
 travis-after-success.sh                       |   5 +-
 travis-before-install.sh                      |  43 +++
 6 files changed, 418 insertions(+), 5 deletions(-)
 create mode 100755 get-docker-com.sh
 create mode 100644 src/test/resources/travis-logback.xml
 create mode 100755 travis-before-install.sh

diff --git a/.travis.yml b/.travis.yml
index 1d78b3bb9..4e980294e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,40 @@
+sudo: required
+dist: trusty
 language: java
+
+services:
+  - docker
+
 jdk:
  - oraclejdk7
+
+env:
+  global:
+    - DOCKER_TLS_VERIFY=""
+
+  matrix:
+    - repo="main"  DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" FAST_BUILD=true
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty"
+    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty" DEPLOY=true
+    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.10.3-0~trusty"
+    - repo="testing" DOCKER_HOST="tcp://127.0.0.1:2375"
+    - repo="testing" DOCKER_HOST="unix:///var/run/docker.sock"
+    - repo="experimental" DOCKER_HOST="tcp://127.0.0.1:2375"
+    - repo="experimental" DOCKER_HOST="unix:///var/run/docker.sock"
+
+cache:
+  directories:
+  - $HOME/.travis_cache
+#  - $HOME/.m2 install would pollute it
+
 before_install:
- - pip install --user codecov
+  - pip install --user codecov
+  - ./travis-before-install.sh
+
+script: if [ "${FAST_BUILD}" == true ]; then mvn package ; else mvn verify; fi
+
 after_success:
- - ./travis-after-success.sh
+  - ./travis-after-success.sh
+
+after_script:
+  - sudo cat /var/log/upstart/docker.log
diff --git a/get-docker-com.sh b/get-docker-com.sh
new file mode 100755
index 000000000..66ca4aefc
--- /dev/null
+++ b/get-docker-com.sh
@@ -0,0 +1,313 @@
+#!/bin/sh
+set -e
+#
+# This script is meant for quick & easy install via:
+#   'curl -sSL https://get.docker.com/ | sh'
+# or:
+#   'wget -qO- https://get.docker.com/ | sh'
+#
+# For test builds (ie. release candidates):
+#   'curl -fsSL https://test.docker.com/ | sh'
+# or:
+#   'wget -qO- https://test.docker.com/ | sh'
+#
+# For experimental builds:
+#   'curl -fsSL https://experimental.docker.com/ | sh'
+# or:
+#   'wget -qO- https://experimental.docker.com/ | sh'
+#
+# Docker Maintainers:
+#   To update this script on https://get.docker.com,
+#   use hack/release.sh during a normal release,
+#   or the following one-liner for script hotfixes:
+#     aws s3 cp --acl public-read hack/install.sh s3://get.docker.com/index
+#
+
+url="https://get.docker.com/"
+apt_url="https://apt.dockerproject.org"
+yum_url="https://yum.dockerproject.org"
+gpg_fingerprint="58118E89F3A912897C070ADBF76221572C52609D"
+
+key_servers="
+ha.pool.sks-keyservers.net
+pgp.mit.edu
+keyserver.ubuntu.com
+"
+
+command_exists() {
+	command -v "$@" > /dev/null 2>&1
+}
+
+semverParse() {
+	major="${1%%.*}"
+	minor="${1#$major.}"
+	minor="${minor%%.*}"
+	patch="${1#$major.$minor.}"
+	patch="${patch%%[-.]*}"
+}
+
+do_install() {
+	case "$(uname -m)" in
+		*64)
+			;;
+		*)
+			cat >&2 <<-'EOF'
+			Error: you are not using a 64bit platform.
+			Docker currently only supports 64bit platforms.
+			EOF
+			exit 1
+			;;
+	esac
+
+	user="$(id -un 2>/dev/null || true)"
+
+	sh_c='sh -c'
+	if [ "$user" != 'root' ]; then
+		if command_exists sudo; then
+			sh_c='sudo -E sh -c'
+		elif command_exists su; then
+			sh_c='su -c'
+		else
+			cat >&2 <<-'EOF'
+			Error: this installer needs the ability to run commands as root.
+			We are unable to find either "sudo" or "su" available to make this happen.
+			EOF
+			exit 1
+		fi
+	fi
+
+	curl=''
+	if command_exists curl; then
+		curl='curl -sSL'
+	elif command_exists wget; then
+		curl='wget -qO-'
+	elif command_exists busybox && busybox --list-modules | grep -q wget; then
+		curl='busybox wget -qO-'
+	fi
+
+	# check to see which repo they are trying to install from
+	if [ -z "$repo" ]; then
+		repo='main'
+		if [ "https://test.docker.com/" = "$url" ]; then
+			repo='testing'
+		elif [ "https://experimental.docker.com/" = "$url" ]; then
+			repo='experimental'
+		fi
+	fi
+
+	# perform some very rudimentary platform detection
+	lsb_dist=''
+	dist_version=''
+	if command_exists lsb_release; then
+		lsb_dist="$(lsb_release -si)"
+	fi
+	if [ -z "$lsb_dist" ] && [ -r /etc/lsb-release ]; then
+		lsb_dist="$(. /etc/lsb-release && echo "$DISTRIB_ID")"
+	fi
+	if [ -z "$lsb_dist" ] && [ -r /etc/debian_version ]; then
+		lsb_dist='debian'
+	fi
+	if [ -z "$lsb_dist" ] && [ -r /etc/fedora-release ]; then
+		lsb_dist='fedora'
+	fi
+	if [ -z "$lsb_dist" ] && [ -r /etc/oracle-release ]; then
+		lsb_dist='oracleserver'
+	fi
+	if [ -z "$lsb_dist" ]; then
+		if [ -r /etc/centos-release ] || [ -r /etc/redhat-release ]; then
+			lsb_dist='centos'
+		fi
+	fi
+	if [ -z "$lsb_dist" ] && [ -r /etc/os-release ]; then
+		lsb_dist="$(. /etc/os-release && echo "$ID")"
+	fi
+
+	lsb_dist="$(echo "$lsb_dist" | tr '[:upper:]' '[:lower:]')"
+
+	case "$lsb_dist" in
+
+		ubuntu)
+			if command_exists lsb_release; then
+				dist_version="$(lsb_release --codename | cut -f2)"
+			fi
+			if [ -z "$dist_version" ] && [ -r /etc/lsb-release ]; then
+				dist_version="$(. /etc/lsb-release && echo "$DISTRIB_CODENAME")"
+			fi
+		;;
+
+		debian)
+			dist_version="$(cat /etc/debian_version | sed 's/\/.*//' | sed 's/\..*//')"
+			case "$dist_version" in
+				8)
+					dist_version="jessie"
+				;;
+				7)
+					dist_version="wheezy"
+				;;
+			esac
+		;;
+
+		oracleserver)
+			# need to switch lsb_dist to match yum repo URL
+			lsb_dist="oraclelinux"
+			dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//')"
+		;;
+
+		fedora|centos)
+			dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//')"
+		;;
+
+		*)
+			if command_exists lsb_release; then
+				dist_version="$(lsb_release --codename | cut -f2)"
+			fi
+			if [ -z "$dist_version" ] && [ -r /etc/os-release ]; then
+				dist_version="$(. /etc/os-release && echo "$VERSION_ID")"
+			fi
+		;;
+
+
+	esac
+
+
+	# Run setup for each distro accordingly
+	case "$lsb_dist" in
+		ubuntu|debian)
+			export DEBIAN_FRONTEND=noninteractive
+
+			did_apt_get_update=
+			apt_get_update() {
+				if [ -z "$did_apt_get_update" ]; then
+					( set -x; $sh_c 'sleep 3; apt-get update' )
+					did_apt_get_update=1
+				fi
+			}
+
+			# aufs is preferred over devicemapper; try to ensure the driver is available.
+			if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then
+				if uname -r | grep -q -- '-generic' && dpkg -l 'linux-image-*-generic' | grep -qE '^ii|^hi' 2>/dev/null; then
+					kern_extras="linux-image-extra-$(uname -r) linux-image-extra-virtual"
+
+					apt_get_update
+					( set -x; $sh_c 'sleep 3; apt-get install -y -q '"$kern_extras" ) || true
+
+					if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then
+						echo >&2 'Warning: tried to install '"$kern_extras"' (for AUFS)'
+						echo >&2 ' but we still have no AUFS.  Docker may not work. Proceeding anyways!'
+						( set -x; sleep 10 )
+					fi
+				else
+					echo >&2 'Warning: current kernel is not supported by the linux-image-extra-virtual'
+					echo >&2 ' package.  We have no AUFS support.  Consider installing the packages'
+					echo >&2 ' linux-image-virtual kernel and linux-image-extra-virtual for AUFS support.'
+					( set -x; sleep 10 )
+				fi
+			fi
+
+			# install apparmor utils if they're missing and apparmor is enabled in the kernel
+			# otherwise Docker will fail to start
+			if [ "$(cat /sys/module/apparmor/parameters/enabled 2>/dev/null)" = 'Y' ]; then
+				if command -v apparmor_parser >/dev/null 2>&1; then
+					echo 'apparmor is enabled in the kernel and apparmor utils were already installed'
+				else
+					echo 'apparmor is enabled in the kernel, but apparmor_parser missing'
+					apt_get_update
+					( set -x; $sh_c 'sleep 3; apt-get install -y -q apparmor' )
+				fi
+			fi
+
+			if [ ! -e /usr/lib/apt/methods/https ]; then
+				apt_get_update
+				( set -x; $sh_c 'sleep 3; apt-get install -y -q apt-transport-https ca-certificates' )
+			fi
+			if [ -z "$curl" ]; then
+				apt_get_update
+				( set -x; $sh_c 'sleep 3; apt-get install -y -q curl ca-certificates' )
+				curl='curl -sSL'
+			fi
+			(
+			set -x
+			for key_server in $key_servers ; do
+				$sh_c "apt-key adv --keyserver hkp://${key_server}:80 --recv-keys ${gpg_fingerprint}" && break
+			done
+			$sh_c "apt-key adv -k ${gpg_fingerprint} >/dev/null"
+			$sh_c "mkdir -p /etc/apt/sources.list.d"
+			$sh_c "echo deb [arch=$(dpkg --print-architecture)] ${apt_url}/repo ${lsb_dist}-${dist_version} ${repo} > /etc/apt/sources.list.d/docker.list"
+			$sh_c 'sleep 3; apt-get update'
+			if [ -z "$DOCKER_VERSION" ]; then
+			    $sh_c 'apt-get -o Dpkg::Options::="--force-confnew" install -y -q docker-engine'
+			else
+			    $sh_c "apt-get -o Dpkg::Options::=\"--force-confnew\" install -y -q docker-engine=$DOCKER_VERSION"
+			fi
+			)
+			exit 0
+			;;
+
+		fedora|centos|oraclelinux)
+			$sh_c "cat >/etc/yum.repos.d/docker-${repo}.repo" <<-EOF
+			[docker-${repo}-repo]
+			name=Docker ${repo} Repository
+			baseurl=${yum_url}/repo/${repo}/${lsb_dist}/${dist_version}
+			enabled=1
+			gpgcheck=1
+			gpgkey=${yum_url}/gpg
+			EOF
+			if [ "$lsb_dist" = "fedora" ] && [ "$dist_version" -ge "22" ]; then
+				(
+					set -x
+					$sh_c 'sleep 3; dnf -y -q install docker-engine'
+				)
+			else
+				(
+					set -x
+					$sh_c 'sleep 3; yum -y -q install docker-engine'
+				)
+			fi
+			exit 0
+			;;
+		gentoo)
+			if [ "$url" = "https://test.docker.com/" ]; then
+				# intentionally mixed spaces and tabs here -- tabs are stripped by "<<-'EOF'", spaces are kept in the output
+				cat >&2 <<-'EOF'
+
+				  You appear to be trying to install the latest nightly build in Gentoo.'
+				  The portage tree should contain the latest stable release of Docker, but'
+				  if you want something more recent, you can always use the live ebuild'
+				  provided in the "docker" overlay available via layman.  For more'
+				  instructions, please see the following URL:'
+
+				    https://github.com/tianon/docker-overlay#using-this-overlay'
+
+				  After adding the "docker" overlay, you should be able to:'
+
+				    emerge -av =app-emulation/docker-9999'
+
+				EOF
+				exit 1
+			fi
+
+			(
+				set -x
+				$sh_c 'sleep 3; emerge app-emulation/docker'
+			)
+			exit 0
+			;;
+	esac
+
+	# intentionally mixed spaces and tabs here -- tabs are stripped by "<<-'EOF'", spaces are kept in the output
+	cat >&2 <<-'EOF'
+
+	  Either your platform is not easily detectable, is not supported by this
+	  installer script (yet - PRs welcome! [hack/install.sh]), or does not yet have
+	  a package for Docker.  Please visit the following URL for more detailed
+	  installation instructions:
+
+	    https://docs.docker.com/engine/installation/
+
+	EOF
+	exit 1
+}
+
+# wrapped up in a function so that we have some protection against only getting
+# half the file during "curl | sh"
+do_install
\ No newline at end of file
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index d71cc33ae..fc74e1fde 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -19,6 +19,7 @@
 
 import com.github.dockerjava.api.command.UpdateContainerCmd;
 
+import com.github.dockerjava.core.SSLConfig;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.conn.socket.PlainConnectionSocketFactory;
@@ -161,7 +162,10 @@ public void init(DockerClientConfig dockerClientConfig) {
         SSLContext sslContext = null;
 
         try {
-            sslContext = dockerClientConfig.getSSLConfig().getSSLContext();
+            final SSLConfig sslConfig = dockerClientConfig.getSSLConfig();
+            if (sslConfig != null) {
+                sslContext = sslConfig.getSSLContext();
+            }
         } catch (Exception ex) {
             throw new DockerClientException("Error in SSL Configuration", ex);
         }
diff --git a/src/test/resources/travis-logback.xml b/src/test/resources/travis-logback.xml
new file mode 100644
index 000000000..250cbd335
--- /dev/null
+++ b/src/test/resources/travis-logback.xml
@@ -0,0 +1,19 @@
+<configuration debug="true"> <!-- This will give you some valuable info about logback config upon runtime. Remove this for production. -->
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!--<logger name="com.github.dockerjava" level="DEBUG"/>-->
+    <!--<logger name="com.github.dockerjava.jaxrs" level="DEBUG"/>-->
+    <!--<logger name="com.github.dockerjava.netty" level="DEBUG"/>-->
+    <!--<logger name="org.apache.http.impl.conn" level="DEBUG"/>-->
+
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+
+</configuration>
diff --git a/travis-after-success.sh b/travis-after-success.sh
index aeb3c12c7..6d198daf5 100755
--- a/travis-after-success.sh
+++ b/travis-after-success.sh
@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 
+
 codecov
-if [[ $TRAVIS_BRANCH == "master" ]] && [[ $TRAVIS_PULL_REQUEST == "false" ]];
+if [[ $TRAVIS_BRANCH == "master" ]] && [[ $TRAVIS_PULL_REQUEST == "false" ]] && [[ $DEPLOY == "true" ]];
 then
-    cat << EOF >> ~/settings.xml
+    cat <<EOF >> ~/settings.xml
 <settings>
  <servers>
    <server>
diff --git a/travis-before-install.sh b/travis-before-install.sh
new file mode 100755
index 000000000..0253ce6bf
--- /dev/null
+++ b/travis-before-install.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+
+if [ "$FAST_BUILD" == true ]; then
+    echo "Fast build, skipping docker installations."
+    exit 0
+fi
+
+set -exu
+
+docker info
+docker version
+
+sudo -E apt-get update
+sudo -E apt-get install -q -y wget
+sudo -E apt-get -q -y --purge remove docker-engine
+sudo -E apt-cache policy docker-engine
+
+./get-docker-com.sh
+#mkdir "${HOME}/.cache" || :
+#pushd "${HOME}/.cache"
+# wget -N "https://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_${DOCKER_VERSION}_amd64.deb"
+# sudo apt-get -f install
+# sudo dpkg -i "$(ls *${DOCKER_VERSION}*)"
+#popd
+#rm -f "src/test/resources/logback.xml"
+mv "src/test/resources/travis-logback.xml" "src/test/resources/logback.xml"
+
+echo 'DOCKER_OPTS="-H=unix:///var/run/docker.sock -H=tcp://127.0.0.1:2375"' | sudo tee -a /etc/default/docker
+sudo -E restart docker
+sleep 10
+docker version
+docker info
+
+set +u
+
+cat <<EOF > "${HOME}/.docker-java.properties"
+registry.username=${registry_username}
+registry.password=${registry_password}
+registry.email=${registry_email}
+registry.url=https://index.docker.io/v1/
+
+EOF

From 2bd837f0187edbb85888f4d2a43c05b487d1858b Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 20 Jun 2016 10:54:50 +0300
Subject: [PATCH 0567/1272] Coverity (#613)

- more badges
- coverity verification on master on main (fast/successful) build.
---
 .travis.yml              | 15 ++++++++++++---
 README.md                |  2 ++
 travis-before-install.sh |  5 +++++
 travis-script.sh         | 22 ++++++++++++++++++++++
 4 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100755 travis-script.sh

diff --git a/.travis.yml b/.travis.yml
index 4e980294e..b99125afc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,14 +8,22 @@ services:
 jdk:
  - oraclejdk7
 
+install: true
+
 env:
   global:
     - DOCKER_TLS_VERIFY=""
+    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
+    #   via the "travis encrypt" command using the project repo's public key
+    - secure: "GonzmzvnXsTNQV+6sKtBSSPiwbpMZjxumNt5LFp1g77/afLxw9kl2EQOXbUe308vFOwRVqeY7drBvNJa8aJkTUClfMaGRjfZ9DUwm6doMKMUYrdEkYoQTcH7yDX5K5w9MT6m+Izj+BK2gB7nK3yFlYG6COeXCdFbQ4/cf3/xfRc="
+    - COVERITY_SCAN_PROJECT_NAME="docker-java/docker-java"
+    - COVERITY_SCAN_BRANCH_PATTERN="master"
+    - COVERITY_SCAN_NOTIFICATION_EMAIL="kanstantsin.sha@gmail.com"
 
   matrix:
-    - repo="main"  DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" FAST_BUILD=true
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" DEPLOY=true FAST_BUILD=true COVERITY=true
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty"
-    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty" DEPLOY=true
+    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty"
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.10.3-0~trusty"
     - repo="testing" DOCKER_HOST="tcp://127.0.0.1:2375"
     - repo="testing" DOCKER_HOST="unix:///var/run/docker.sock"
@@ -31,7 +39,8 @@ before_install:
   - pip install --user codecov
   - ./travis-before-install.sh
 
-script: if [ "${FAST_BUILD}" == true ]; then mvn package ; else mvn verify; fi
+script:
+  - ./travis-script.sh
 
 after_success:
   - ./travis-after-success.sh
diff --git a/README.md b/README.md
index e47b6e5a4..71fbaa11e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
 [![Build Status](https://travis-ci.org/docker-java/docker-java.svg?branch=master)](https://travis-ci.org/docker-java/docker-java)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/9177/badge.svg?flat=1)](https://scan.coverity.com/projects/9177)
+[![codecov.io](http://codecov.io/github/docker-java/docker-java/coverage.svg?branch=master)](http://codecov.io/github/docker-java/docker-java?branch=master)
 <!--[![Circle CI](https://circleci.com/gh/docker-java/docker-java.svg?style=svg)](https://circleci.com/gh/docker-java/docker-java)-->
 # docker-java 
 
diff --git a/travis-before-install.sh b/travis-before-install.sh
index 0253ce6bf..13034fc74 100755
--- a/travis-before-install.sh
+++ b/travis-before-install.sh
@@ -1,6 +1,11 @@
 #!/usr/bin/env bash
 
 
+sudo apt-get install -y -q ca-certificates
+
+echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-certificates.crt
+
+
 if [ "$FAST_BUILD" == true ]; then
     echo "Fast build, skipping docker installations."
     exit 0
diff --git a/travis-script.sh b/travis-script.sh
new file mode 100755
index 000000000..0a5fdd38c
--- /dev/null
+++ b/travis-script.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+set -ex
+
+IS_COVERITY_SCAN_BRANCH=`ruby -e "puts '${TRAVIS_BRANCH}' =~ /\\A$COVERITY_SCAN_BRANCH_PATTERN\\z/ ? 1 : 0"`
+
+
+if [ "${FAST_BUILD}" == "true" ]; then
+    if [ "$COVERITY" == "true" ] && [ "$IS_COVERITY_SCAN_BRANCH" = "1" ]; then
+        export COVERITY_SCAN_BUILD_COMMAND="mvn package"
+        curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash
+    else
+        mvn package
+    fi
+else
+    if [ "$COVERITY" == "true" ] && [ "$IS_COVERITY_SCAN_BRANCH" = "1" ]; then
+        COVERITY_SCAN_BUILD_COMMAND="mvn verify"
+        curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash
+    else
+        mvn verify
+    fi
+fi

From 197e72c268d3c0a555b78095987864565f23f5c9 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 29 Jun 2016 23:58:33 +0300
Subject: [PATCH 0568/1272] Versioneye references.

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 71fbaa11e..47873ccfe 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 [![Build Status](https://travis-ci.org/docker-java/docker-java.svg?branch=master)](https://travis-ci.org/docker-java/docker-java)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/9177/badge.svg?flat=1)](https://scan.coverity.com/projects/9177)
 [![codecov.io](http://codecov.io/github/docker-java/docker-java/coverage.svg?branch=master)](http://codecov.io/github/docker-java/docker-java?branch=master)
+[![Reference Status](https://www.versioneye.com/java/com.github.docker-java:docker-java/reference_badge.svg?style=flat-square)](https://www.versioneye.com/java/com.github.docker-java:docker-java/references)
 <!--[![Circle CI](https://circleci.com/gh/docker-java/docker-java.svg?style=svg)](https://circleci.com/gh/docker-java/docker-java)-->
 # docker-java 
 

From 2e79af92672df2d5b722dad5857ed43eebb16b77 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 4 Jul 2016 10:30:51 +0300
Subject: [PATCH 0569/1272] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 47873ccfe..5fb385387 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/9177/badge.svg?flat=1)](https://scan.coverity.com/projects/9177)
 [![codecov.io](http://codecov.io/github/docker-java/docker-java/coverage.svg?branch=master)](http://codecov.io/github/docker-java/docker-java?branch=master)
 [![Reference Status](https://www.versioneye.com/java/com.github.docker-java:docker-java/reference_badge.svg?style=flat-square)](https://www.versioneye.com/java/com.github.docker-java:docker-java/references)
+![License](http://img.shields.io/:license-apache-blue.svg?style=flat-square)](https://github.com/docker-java/docker-java/blob/master/LICENSE)
+
 <!--[![Circle CI](https://circleci.com/gh/docker-java/docker-java.svg?style=svg)](https://circleci.com/gh/docker-java/docker-java)-->
 # docker-java 
 

From 4b2ffe244493639b8fef0622ef2405cd95942cba Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 4 Jul 2016 10:31:26 +0300
Subject: [PATCH 0570/1272] Typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5fb385387..d50624c0d 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/9177/badge.svg?flat=1)](https://scan.coverity.com/projects/9177)
 [![codecov.io](http://codecov.io/github/docker-java/docker-java/coverage.svg?branch=master)](http://codecov.io/github/docker-java/docker-java?branch=master)
 [![Reference Status](https://www.versioneye.com/java/com.github.docker-java:docker-java/reference_badge.svg?style=flat-square)](https://www.versioneye.com/java/com.github.docker-java:docker-java/references)
-![License](http://img.shields.io/:license-apache-blue.svg?style=flat-square)](https://github.com/docker-java/docker-java/blob/master/LICENSE)
+[![License](http://img.shields.io/:license-apache-blue.svg?style=flat-square)](https://github.com/docker-java/docker-java/blob/master/LICENSE)
 
 <!--[![Circle CI](https://circleci.com/gh/docker-java/docker-java.svg?style=svg)](https://circleci.com/gh/docker-java/docker-java)-->
 # docker-java 

From 04fa7e86584ad0d6a8d8bb4d7b8712bd193aa7cd Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 4 Jul 2016 22:04:35 +0300
Subject: [PATCH 0571/1272] Fix it2 (#621)

* Fix hasItem in test

* Disable toolbox only tests
---
 .../core/command/CreateContainerCmdImplTest.java     | 12 ++++++++----
 .../core/command/UpdateContainerCmdImplTest.java     |  8 ++++----
 .../netty/exec/CreateContainerCmdExecTest.java       | 12 ++++++++----
 .../netty/exec/UpdateContainerCmdExecTest.java       |  8 ++++----
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index a93e100c6..a9c0acb8c 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -45,6 +45,7 @@
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasItemInArray;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
@@ -191,9 +192,12 @@ public void createContainerWithVolumesFrom() throws DockerException {
 
     @Test
     public void createContainerWithEnv() throws Exception {
+        final String testVariable = "VARIABLE=success";
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withEnv("VARIABLE=success")
-                .withCmd("env").exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
+                .withEnv(testVariable)
+                .withCmd("env")
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -201,11 +205,11 @@ public void createContainerWithEnv() throws Exception {
 
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), containsInAnyOrder("VARIABLE=success"));
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), hasItem(testVariable));
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        assertThat(containerLog(container.getId()), containsString("VARIABLE=success"));
+        assertThat(containerLog(container.getId()), containsString(testVariable));
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java
index c230fbb02..3c7a9fd47 100644
--- a/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java
@@ -84,10 +84,10 @@ public void updateContainer() throws DockerException, IOException {
 //                .withKernelMemory(52428800) Can not update kernel memory to a running container, please stop it first.
                 .exec();
 
-        // docker toolbox 1.10.1
-        assertThat(updateResponse.getWarnings(), hasSize(1));
-        assertThat(updateResponse.getWarnings().get(0),
-                is("Your kernel does not support Block I/O weight. Weight discarded."));
+        // true only on docker toolbox (1.10.1)
+//        assertThat(updateResponse.getWarnings(), hasSize(1));
+//        assertThat(updateResponse.getWarnings().get(0),
+//                is("Your kernel does not support Block I/O weight. Weight discarded."));
 
         InspectContainerResponse inspectAfter = dockerClient.inspectContainerCmd(containerId).exec();
         final HostConfig afterHostConfig = inspectAfter.getHostConfig();
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
index 3dbe21f16..ec35f930a 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
@@ -43,6 +43,7 @@
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasItemInArray;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
@@ -189,9 +190,12 @@ public void createContainerWithVolumesFrom() throws DockerException {
 
     @Test
     public void createContainerWithEnv() throws Exception {
+        final String testVariable = "VARIABLE=success";
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withEnv("VARIABLE=success")
-                .withCmd("env").exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withEnv(testVariable)
+                .withCmd("env")
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -199,11 +203,11 @@ public void createContainerWithEnv() throws Exception {
 
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), containsInAnyOrder("VARIABLE=success"));
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), hasItem(testVariable));
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        assertThat(containerLog(container.getId()), containsString("VARIABLE=success"));
+        assertThat(containerLog(container.getId()), containsString(testVariable));
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java
index e2907dc8a..1134afd6d 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java
@@ -83,10 +83,10 @@ public void updateContainer() throws DockerException, IOException {
 //                .withKernelMemory(52428800) Can not update kernel memory to a running container, please stop it first.
                 .exec();
 
-        // docker toolbox 1.10.1
-        assertThat(updateResponse.getWarnings(), hasSize(1));
-        assertThat(updateResponse.getWarnings().get(0),
-                is("Your kernel does not support Block I/O weight. Weight discarded."));
+        // found only on docker toolbox (1.10.1)
+//        assertThat(updateResponse.getWarnings(), hasSize(1));
+//        assertThat(updateResponse.getWarnings().get(0),
+//                is("Your kernel does not support Block I/O weight. Weight discarded."));
 
         InspectContainerResponse inspectAfter = dockerClient.inspectContainerCmd(containerId).exec();
         final HostConfig afterHostConfig = inspectAfter.getHostConfig();

From 0890ec30cdf8d33c639eabc23bd158323fb83966 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 4 Jul 2016 22:09:11 +0300
Subject: [PATCH 0572/1272] [CID-125822] Fix resource leak

---
 .../dockerjava/jaxrs/async/AbstractCallbackNotifier.java      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java b/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
index 86f528af6..bd80a2d66 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
@@ -60,9 +60,7 @@ public Void call() throws Exception {
             return null;
         }
 
-        try {
-            InputStream inputStream = new WrappedResponseInputStream(response);
-
+        try (InputStream inputStream = new WrappedResponseInputStream(response)) {
             if (resultCallback != null) {
                 responseStreamProcessor.processResponseStream(inputStream, resultCallback);
             }

From f74fc3dd51d454e561c66c6a0667525ce9d250de Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 4 Jul 2016 22:49:41 +0300
Subject: [PATCH 0573/1272] Don't upload coverity for PRs

---
 travis-script.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/travis-script.sh b/travis-script.sh
index 0a5fdd38c..e40de7f73 100755
--- a/travis-script.sh
+++ b/travis-script.sh
@@ -6,14 +6,14 @@ IS_COVERITY_SCAN_BRANCH=`ruby -e "puts '${TRAVIS_BRANCH}' =~ /\\A$COVERITY_SCAN_
 
 
 if [ "${FAST_BUILD}" == "true" ]; then
-    if [ "$COVERITY" == "true" ] && [ "$IS_COVERITY_SCAN_BRANCH" = "1" ]; then
+    if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$COVERITY" == "true" ] && [ "$IS_COVERITY_SCAN_BRANCH" = "1" ]; then
         export COVERITY_SCAN_BUILD_COMMAND="mvn package"
         curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash
     else
         mvn package
     fi
 else
-    if [ "$COVERITY" == "true" ] && [ "$IS_COVERITY_SCAN_BRANCH" = "1" ]; then
+    if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$COVERITY" == "true" ] && [ "$IS_COVERITY_SCAN_BRANCH" = "1" ]; then
         COVERITY_SCAN_BUILD_COMMAND="mvn verify"
         curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash
     else

From ada726bbdb79bf850d571e8f184be1ad454892db Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 4 Jul 2016 22:54:30 +0300
Subject: [PATCH 0574/1272] Update badges

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d50624c0d..159108dd8 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,9 @@
+[![Maven Central](https://img.shields.io/maven-central/v/com.github.docker-java/docker-java.svg?maxAge=2592000)]()
+[![Reference Status](https://www.versioneye.com/java/com.github.docker-java:docker-java/reference_badge.svg?style=flat)](https://www.versioneye.com/java/com.github.docker-java:docker-java/references)
 [![Build Status](https://travis-ci.org/docker-java/docker-java.svg?branch=master)](https://travis-ci.org/docker-java/docker-java)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/9177/badge.svg?flat=1)](https://scan.coverity.com/projects/9177)
 [![codecov.io](http://codecov.io/github/docker-java/docker-java/coverage.svg?branch=master)](http://codecov.io/github/docker-java/docker-java?branch=master)
-[![Reference Status](https://www.versioneye.com/java/com.github.docker-java:docker-java/reference_badge.svg?style=flat-square)](https://www.versioneye.com/java/com.github.docker-java:docker-java/references)
-[![License](http://img.shields.io/:license-apache-blue.svg?style=flat-square)](https://github.com/docker-java/docker-java/blob/master/LICENSE)
+[![License](http://img.shields.io/:license-apache-blue.svg?style=flat)](https://github.com/docker-java/docker-java/blob/master/LICENSE)
 
 <!--[![Circle CI](https://circleci.com/gh/docker-java/docker-java.svg?style=svg)](https://circleci.com/gh/docker-java/docker-java)-->
 # docker-java 

From 199e27db662da73fe51c2af8f66ad595bd91b1cc Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 4 Jul 2016 23:32:13 +0300
Subject: [PATCH 0575/1272] Move scripts to dir. Fix coverity skip.

---
 .travis.yml                                   |   6 +-
 .../travis-after-success.sh                   |   0
 .../travis-before-install.sh                  |   0
 travis-script.sh => .travis/travis-script.sh  |   6 +-
 .travis/travisci_build_coverity_scan.sh       | 100 ++++++++++++++++++
 5 files changed, 107 insertions(+), 5 deletions(-)
 rename travis-after-success.sh => .travis/travis-after-success.sh (100%)
 rename travis-before-install.sh => .travis/travis-before-install.sh (100%)
 rename travis-script.sh => .travis/travis-script.sh (68%)
 create mode 100644 .travis/travisci_build_coverity_scan.sh

diff --git a/.travis.yml b/.travis.yml
index b99125afc..b6e6f953b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,13 +37,13 @@ cache:
 
 before_install:
   - pip install --user codecov
-  - ./travis-before-install.sh
+  - ./.travis/travis-before-install.sh
 
 script:
-  - ./travis-script.sh
+  - ./.travis/travis-script.sh
 
 after_success:
-  - ./travis-after-success.sh
+  - ./.travis/travis-after-success.sh
 
 after_script:
   - sudo cat /var/log/upstart/docker.log
diff --git a/travis-after-success.sh b/.travis/travis-after-success.sh
similarity index 100%
rename from travis-after-success.sh
rename to .travis/travis-after-success.sh
diff --git a/travis-before-install.sh b/.travis/travis-before-install.sh
similarity index 100%
rename from travis-before-install.sh
rename to .travis/travis-before-install.sh
diff --git a/travis-script.sh b/.travis/travis-script.sh
similarity index 68%
rename from travis-script.sh
rename to .travis/travis-script.sh
index e40de7f73..7046940ff 100755
--- a/travis-script.sh
+++ b/.travis/travis-script.sh
@@ -8,14 +8,16 @@ IS_COVERITY_SCAN_BRANCH=`ruby -e "puts '${TRAVIS_BRANCH}' =~ /\\A$COVERITY_SCAN_
 if [ "${FAST_BUILD}" == "true" ]; then
     if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$COVERITY" == "true" ] && [ "$IS_COVERITY_SCAN_BRANCH" = "1" ]; then
         export COVERITY_SCAN_BUILD_COMMAND="mvn package"
-        curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash
+        #curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash
+        ./.travis/travisci_build_coverity_scan.sh
     else
         mvn package
     fi
 else
     if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$COVERITY" == "true" ] && [ "$IS_COVERITY_SCAN_BRANCH" = "1" ]; then
         COVERITY_SCAN_BUILD_COMMAND="mvn verify"
-        curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash
+        #curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash
+        ./.travis/travisci_build_coverity_scan.sh
     else
         mvn verify
     fi
diff --git a/.travis/travisci_build_coverity_scan.sh b/.travis/travisci_build_coverity_scan.sh
new file mode 100644
index 000000000..2679384b9
--- /dev/null
+++ b/.travis/travisci_build_coverity_scan.sh
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+set -e
+
+# Environment check
+echo -e "\033[33;1mNote: COVERITY_SCAN_PROJECT_NAME and COVERITY_SCAN_TOKEN are available on Project Settings page on scan.coverity.com\033[0m"
+[ -z "$COVERITY_SCAN_PROJECT_NAME" ] && echo "ERROR: COVERITY_SCAN_PROJECT_NAME must be set" && exit 1
+[ -z "$COVERITY_SCAN_NOTIFICATION_EMAIL" ] && echo "ERROR: COVERITY_SCAN_NOTIFICATION_EMAIL must be set" && exit 1
+[ -z "$COVERITY_SCAN_BRANCH_PATTERN" ] && echo "ERROR: COVERITY_SCAN_BRANCH_PATTERN must be set" && exit 1
+[ -z "$COVERITY_SCAN_BUILD_COMMAND" ] && echo "ERROR: COVERITY_SCAN_BUILD_COMMAND must be set" && exit 1
+[ -z "$COVERITY_SCAN_TOKEN" ] && echo "ERROR: COVERITY_SCAN_TOKEN must be set" && exit 1
+
+PLATFORM=`uname`
+TOOL_ARCHIVE=/tmp/cov-analysis-${PLATFORM}.tgz
+TOOL_URL=https://scan.coverity.com/download/${PLATFORM}
+TOOL_BASE=/tmp/coverity-scan-analysis
+UPLOAD_URL="https://scan.coverity.com/builds"
+SCAN_URL="https://scan.coverity.com"
+
+# Do not run on pull requests
+if [ "${TRAVIS_PULL_REQUEST}" = "true" ]; then
+  echo -e "\033[33;1mINFO: Skipping Coverity Analysis: branch is a pull request.\033[0m"
+  exit 0
+fi
+
+# Verify this branch should run
+IS_COVERITY_SCAN_BRANCH=`ruby -e "puts '${TRAVIS_BRANCH}' =~ /\\A$COVERITY_SCAN_BRANCH_PATTERN\\z/ ? 1 : 0"`
+if [ "$IS_COVERITY_SCAN_BRANCH" = "1" ]; then
+  echo -e "\033[33;1mCoverity Scan configured to run on branch ${TRAVIS_BRANCH}\033[0m"
+else
+  echo -e "\033[33;1mCoverity Scan NOT configured to run on branch ${TRAVIS_BRANCH}\033[0m"
+  exit 1
+fi
+
+# Verify upload is permitted
+AUTH_RES=`curl -s --form project="$COVERITY_SCAN_PROJECT_NAME" --form token="$COVERITY_SCAN_TOKEN" $SCAN_URL/api/upload_permitted`
+if [ "$AUTH_RES" = "Access denied" ]; then
+  echo -e "\033[33;1mCoverity Scan API access denied. Check COVERITY_SCAN_PROJECT_NAME and COVERITY_SCAN_TOKEN.\033[0m"
+  exit 1
+else
+  AUTH=`echo $AUTH_RES | ruby -e "require 'rubygems'; require 'json'; puts JSON[STDIN.read]['upload_permitted']"`
+  if [ "$AUTH" = "true" ]; then
+    echo -e "\033[33;1mCoverity Scan analysis authorized per quota.\033[0m"
+  else
+    WHEN=`echo $AUTH_RES | ruby -e "require 'rubygems'; require 'json'; puts JSON[STDIN.read]['next_upload_permitted_at']"`
+    echo -e "\033[33;1mCoverity Scan analysis NOT authorized until $WHEN.\033[0m"
+
+    exit 1
+  fi
+fi
+
+if [ ! -d $TOOL_BASE ]; then
+  # Download Coverity Scan Analysis Tool
+  if [ ! -e $TOOL_ARCHIVE ]; then
+    echo -e "\033[33;1mDownloading Coverity Scan Analysis Tool...\033[0m"
+    wget -nv -O $TOOL_ARCHIVE $TOOL_URL --post-data "project=$COVERITY_SCAN_PROJECT_NAME&token=$COVERITY_SCAN_TOKEN"
+  fi
+
+  # Extract Coverity Scan Analysis Tool
+  echo -e "\033[33;1mExtracting Coverity Scan Analysis Tool...\033[0m"
+  mkdir -p $TOOL_BASE
+  pushd $TOOL_BASE
+  tar xzf $TOOL_ARCHIVE
+  popd
+fi
+
+TOOL_DIR=`find $TOOL_BASE -type d -name 'cov-analysis*'`
+export PATH=$TOOL_DIR/bin:$PATH
+
+# Build
+echo -e "\033[33;1mRunning Coverity Scan Analysis Tool...\033[0m"
+COV_BUILD_OPTIONS=""
+#COV_BUILD_OPTIONS="--return-emit-failures 8 --parse-error-threshold 85"
+RESULTS_DIR="cov-int"
+eval "${COVERITY_SCAN_BUILD_COMMAND_PREPEND}"
+COVERITY_UNSUPPORTED=1 cov-build --dir $RESULTS_DIR $COV_BUILD_OPTIONS $COVERITY_SCAN_BUILD_COMMAND
+cov-import-scm --dir $RESULTS_DIR --scm git --log $RESULTS_DIR/scm_log.txt 2>&1
+
+# Upload results
+echo -e "\033[33;1mTarring Coverity Scan Analysis results...\033[0m"
+RESULTS_ARCHIVE=analysis-results.tgz
+tar czf $RESULTS_ARCHIVE $RESULTS_DIR
+SHA=`git rev-parse --short HEAD`
+
+echo -e "\033[33;1mUploading Coverity Scan Analysis results...\033[0m"
+response=$(curl \
+  --silent --write-out "\n%{http_code}\n" \
+  --form project=$COVERITY_SCAN_PROJECT_NAME \
+  --form token=$COVERITY_SCAN_TOKEN \
+  --form email=$COVERITY_SCAN_NOTIFICATION_EMAIL \
+  --form file=@$RESULTS_ARCHIVE \
+  --form version=$SHA \
+  --form description="Travis CI build" \
+  $UPLOAD_URL)
+status_code=$(echo "$response" | sed -n '$p')
+if [ "$status_code" != "201" ]; then
+  TEXT=$(echo "$response" | sed '$d')
+  echo -e "\033[33;1mCoverity Scan upload failed: $TEXT.\033[0m"
+  exit 1
+fi

From a4d5d85d28e6ccb70c33215515b8ef75352c4bb9 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 5 Jul 2016 21:24:07 +0300
Subject: [PATCH 0576/1272] Fix file perm.

---
 .travis/travisci_build_coverity_scan.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 .travis/travisci_build_coverity_scan.sh

diff --git a/.travis/travisci_build_coverity_scan.sh b/.travis/travisci_build_coverity_scan.sh
old mode 100644
new mode 100755

From 898d6fa3c7dd7367327f21ed3f3088e0f1f9e691 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 5 Jul 2016 21:49:10 +0300
Subject: [PATCH 0577/1272] require bash?

---
 .travis/travisci_build_coverity_scan.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/travisci_build_coverity_scan.sh b/.travis/travisci_build_coverity_scan.sh
index 2679384b9..13af2c275 100755
--- a/.travis/travisci_build_coverity_scan.sh
+++ b/.travis/travisci_build_coverity_scan.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 

From fba96397576f2e9f9c56eb0aad7eb5713eefddc0 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 20 Jun 2016 14:55:12 +0300
Subject: [PATCH 0578/1272] Update deps. Fix IT.

- remove custom jersey connector
- update all deps
- httpclient latest fails, stay on working version
---
 pom.xml                                       |  77 +-
 .../jaxrs/DockerCmdExecFactoryImpl.java       |  25 +-
 .../jaxrs/UnixConnectionSocketFactory.java    |   5 +-
 .../jaxrs/async/AbstractCallbackNotifier.java |   1 +
 .../jaxrs/connector/ApacheConnector.java      | 663 ------------------
 .../ApacheConnectorClientResponse.java        |  48 --
 .../connector/ApacheConnectorProvider.java    | 146 ----
 .../dockerjava/jaxrs/connector/README.txt     |   3 -
 .../command/AttachContainerCmdImplTest.java   |  26 +-
 .../exec/AttachContainerCmdExecTest.java      |   8 +-
 10 files changed, 101 insertions(+), 901 deletions(-)
 delete mode 100644 src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
 delete mode 100644 src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java
 delete mode 100644 src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java
 delete mode 100644 src/main/java/com/github/dockerjava/jaxrs/connector/README.txt

diff --git a/pom.xml b/pom.xml
index 3f9caa55a..cb43f2897 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,35 +47,35 @@
 		<jdk.source>1.7</jdk.source>
 		<jdk.target>1.7</jdk.target>
 
-		<jersey.version>2.11</jersey.version>
+		<jersey.version>2.23.1</jersey.version>
 		<jackson-jaxrs.version>2.6.4</jackson-jaxrs.version>
-		<httpclient.version>4.3.1</httpclient.version>
-		<commons-compress.version>1.5</commons-compress.version>
-		<commons-codec.version>1.8</commons-codec.version>
-		<commons-io.version>2.3</commons-io.version>
+		<httpclient.version>4.5</httpclient.version><!-- 4.5.1-4.5.2 broken -->
+		<commons-compress.version>1.12</commons-compress.version>
+		<commons-codec.version>1.10</commons-codec.version>
+		<commons-io.version>2.5</commons-io.version>
 		<commons-lang.version>2.6</commons-lang.version>
-		<slf4j-api.version>1.7.5</slf4j-api.version>
+		<slf4j-api.version>1.7.21</slf4j-api.version>
 
-		<bouncycastle.version>1.51</bouncycastle.version>
-		<unix-socket-factory.version>2015-01-27T15-02-14</unix-socket-factory.version>
-		<guava.version>18.0</guava.version>
+		<bouncycastle.version>1.54</bouncycastle.version>
+		<unix-socket-factory.version>2016-04-06T22-21-19</unix-socket-factory.version>
+		<guava.version>19.0</guava.version>
 
 		<!-- test dependencies -->
-		<logback.version>1.1.0</logback.version>
-		<testng.version>6.1.1</testng.version>
-		<netty.version>4.1.0.CR3</netty.version>
+		<logback.version>1.1.7</logback.version>
+		<testng.version>6.9.10</testng.version>
+		<netty.version>4.1.1.Final</netty.version>
 		<hamcrest.library.version>1.3</hamcrest.library.version>
-		<hamcrest.jpa-matchers>1.6</hamcrest.jpa-matchers>
+		<hamcrest.jpa-matchers>1.8</hamcrest.jpa-matchers>
 		<lambdaj.version>2.3.3</lambdaj.version>
 		<mockito.version>1.10.19</mockito.version>
 
 
-		<maven-jar-plugin.version>2.2</maven-jar-plugin.version>
-		<maven-compiler-plugin.version>2.3.1</maven-compiler-plugin.version>
-		<maven-release-plugin.version>2.3.1</maven-release-plugin.version>
+		<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
+		<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
+		<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
 		<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
 		<maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
-		<maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
+		<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
 	</properties>
 
 	<dependencies>
@@ -89,6 +89,11 @@
 			<artifactId>jersey-apache-connector</artifactId>
 			<version>${jersey.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+			<version>4.4.5</version>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
@@ -99,10 +104,20 @@
 			<artifactId>jersey-client</artifactId>
 			<version>${jersey.version}</version>
 		</dependency>
+		<!--<dependency>-->
+			<!--<groupId>de.gesellix</groupId>-->
+			<!--<artifactId>unix-socket-factory</artifactId>-->
+			<!--<version>${unix-socket-factory.version}</version>-->
+		<!--</dependency>-->
+		<dependency>
+			<groupId>com.kohlschutter.junixsocket</groupId>
+			<artifactId>junixsocket-common</artifactId>
+			<version>2.0.4</version>
+		</dependency>
 		<dependency>
-			<groupId>de.gesellix</groupId>
-			<artifactId>unix-socket-factory</artifactId>
-			<version>${unix-socket-factory.version}</version>
+			<groupId>com.kohlschutter.junixsocket</groupId>
+			<artifactId>junixsocket-native-common</artifactId>
+			<version>2.0.4</version>
 		</dependency>
 
 		<dependency>
@@ -133,7 +148,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
-			<version>1.7.12</version>
+			<version>1.7.21</version>
 		</dependency>
 
 		<dependency>
@@ -206,7 +221,7 @@
 		<dependency>
 			<groupId>com.google.code.findbugs</groupId>
 			<artifactId>annotations</artifactId>
-			<version>3.0.0</version>
+			<version>3.0.1</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -231,6 +246,12 @@
 			<version>${netty.version}</version>
 			<classifier>linux-x86_64</classifier>
 		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<distributionManagement>
@@ -321,7 +342,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
-					<version>2.2.1</version>
+					<version>3.0.1</version>
 					<executions>
 						<execution>
 							<id>attach-sources</id>
@@ -334,7 +355,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.9.1</version>
+					<version>2.10.4</version>
 					<executions>
 						<execution>
 							<id>attach-javadocs</id>
@@ -350,7 +371,7 @@
 			<plugin>
 				<groupId>org.sonatype.plugins</groupId>
 				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.2</version>
+				<version>1.6.7</version>
 				<extensions>true</extensions>
 				<configuration>
 					<serverId>ossrh</serverId>
@@ -362,7 +383,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>
-				<version>2.5</version>
+				<version>${maven-release-plugin.version}</version>
 				<configuration>
 					<autoVersionSubmodules>true</autoVersionSubmodules>
 					<useReleaseProfile>false</useReleaseProfile>
@@ -465,7 +486,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>findbugs-maven-plugin</artifactId>
-						<version>3.0.2</version>
+						<version>3.0.3</version>
 						<configuration>
 							<effort>Max</effort>
 							<threshold>Low</threshold>
@@ -484,7 +505,7 @@
 					<plugin>
 						<groupId>org.jacoco</groupId>
 						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>0.7.6.201602180812</version>
+						<version>0.7.7.201606060606</version>
 						<executions>
 							<execution>
 								<goals>
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index fc74e1fde..4800f22ae 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -18,8 +18,8 @@
 import javax.ws.rs.client.WebTarget;
 
 import com.github.dockerjava.api.command.UpdateContainerCmd;
-
 import com.github.dockerjava.core.SSLConfig;
+
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.conn.socket.PlainConnectionSocketFactory;
@@ -27,6 +27,7 @@
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.glassfish.jersey.CommonProperties;
 import org.glassfish.jersey.apache.connector.ApacheClientProperties;
+import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
 import org.slf4j.Logger;
@@ -85,7 +86,6 @@
 import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.jaxrs.connector.ApacheConnectorProvider;
 import com.github.dockerjava.jaxrs.filter.JsonClientFilter;
 import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter;
 import com.github.dockerjava.jaxrs.filter.SelectiveLoggingFilter;
@@ -115,6 +115,8 @@ public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
 
     private DockerClientConfig dockerClientConfig;
 
+    private PoolingHttpClientConnectionManager connManager = null;
+
     @Override
     public void init(DockerClientConfig dockerClientConfig) {
         checkNotNull(dockerClientConfig, "config was not specified");
@@ -187,8 +189,21 @@ public void init(DockerClientConfig dockerClientConfig) {
             configureProxy(clientConfig, protocol);
         }
 
-        PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(
-                originalUri, sslContext));
+        connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(
+                originalUri, sslContext)) {
+
+            @Override
+            public void close() {
+                super.shutdown();
+            }
+
+            @Override
+            public void shutdown() {
+                // Disable shutdown of the pool. This will be done later, when this factory is closed
+                // This is a workaround for finalize method on jerseys ClientRuntime which
+                // closes the client and shuts down the connection pool when it is garbage collected
+            }
+        };
 
         if (maxTotalConnections != null) {
             connManager.setMaxTotal(maxTotalConnections);
@@ -412,7 +427,6 @@ public KillContainerCmd.Exec createKillContainerCmdExec() {
         return new KillContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
-
     @Override
     public UpdateContainerCmd.Exec createUpdateContainerCmdExec() {
         return new UpdateContainerCmdExec(getBaseResource(), getDockerClientConfig());
@@ -527,6 +541,7 @@ public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() {
     public void close() throws IOException {
         checkNotNull(client, "Factory not initialized. You probably forgot to call init()!");
         client.close();
+        connManager.close();
     }
 
     public DockerCmdExecFactoryImpl withReadTimeout(Integer readTimeout) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java b/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
index 870e2fd04..0c5400ecd 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
@@ -29,7 +29,8 @@
 import java.net.URI;
 
 import org.apache.http.HttpHost;
-import org.apache.http.annotation.Immutable;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.protocol.HttpContext;
@@ -38,7 +39,7 @@
 /**
  * Provides a ConnectionSocketFactory for connecting Apache HTTP clients to Unix sockets.
  */
-@Immutable
+@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
 public class UnixConnectionSocketFactory implements ConnectionSocketFactory {
 
     private File socketFile;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java b/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
index bd80a2d66..cd7a7f809 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
@@ -61,6 +61,7 @@ public Void call() throws Exception {
         }
 
         try (InputStream inputStream = new WrappedResponseInputStream(response)) {
+
             if (resultCallback != null) {
                 responseStreamProcessor.processResponseStream(inputStream, resultCallback);
             }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
deleted file mode 100644
index 68b47bfa8..000000000
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnector.java
+++ /dev/null
@@ -1,663 +0,0 @@
-package com.github.dockerjava.jaxrs.connector;
-
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2010-2014 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * http://glassfish.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.core.Configuration;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-
-import jersey.repackaged.com.google.common.util.concurrent.MoreExecutors;
-
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.AuthCache;
-import org.apache.http.client.CookieStore;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.config.CookieSpecs;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.methods.RequestBuilder;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.config.ConnectionConfig;
-import org.apache.http.config.Registry;
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.HttpClientConnectionManager;
-import org.apache.http.conn.ManagedHttpClientConnection;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLContexts;
-import org.apache.http.conn.ssl.X509HostnameVerifier;
-import org.apache.http.entity.AbstractHttpEntity;
-import org.apache.http.entity.BufferedHttpEntity;
-import org.apache.http.entity.ContentLengthStrategy;
-import org.apache.http.impl.auth.BasicScheme;
-import org.apache.http.impl.client.BasicAuthCache;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.conn.DefaultManagedHttpClientConnection;
-import org.apache.http.impl.conn.ManagedHttpClientConnectionFactory;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.apache.http.impl.io.ChunkedOutputStream;
-import org.apache.http.io.SessionOutputBuffer;
-import org.apache.http.util.TextUtils;
-import org.apache.http.util.VersionInfo;
-import org.glassfish.jersey.SslConfigurator;
-import org.glassfish.jersey.apache.connector.ApacheClientProperties;
-import org.glassfish.jersey.apache.connector.LocalizationMessages;
-import org.glassfish.jersey.client.ClientProperties;
-import org.glassfish.jersey.client.ClientRequest;
-import org.glassfish.jersey.client.ClientResponse;
-import org.glassfish.jersey.client.RequestEntityProcessing;
-import org.glassfish.jersey.client.spi.AsyncConnectorCallback;
-import org.glassfish.jersey.client.spi.Connector;
-import org.glassfish.jersey.internal.util.PropertiesHelper;
-import org.glassfish.jersey.message.internal.HeaderUtils;
-import org.glassfish.jersey.message.internal.OutboundMessageContext;
-import org.glassfish.jersey.message.internal.ReaderWriter;
-import org.glassfish.jersey.message.internal.Statuses;
-
-/**
- * A {@link Connector} that utilizes the Apache HTTP Client to send and receive HTTP request and responses.
- * <p/>
- * The following properties are only supported at construction of this class:
- * <ul>
- * <li>{@link ApacheClientProperties#CONNECTION_MANAGER}</li>
- * <li>{@link ApacheClientProperties#REQUEST_CONFIG}</li>
- * <li>{@link ApacheClientProperties#CREDENTIALS_PROVIDER}</li>
- * <li>{@link ApacheClientProperties#DISABLE_COOKIES}</li>
- * <li>{@link ClientProperties#PROXY_URI}</li>
- * <li>{@link ClientProperties#PROXY_USERNAME}</li>
- * <li>{@link ClientProperties#PROXY_PASSWORD}</li>
- * <li>{@link ClientProperties#REQUEST_ENTITY_PROCESSING} - default value is {@link RequestEntityProcessing#CHUNKED}</li>
- * <li>{@link ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION}</li>
- * <li>{@link ApacheClientProperties#SSL_CONFIG}</li>
- * </ul>
- * <p>
- * This connector uses {@link RequestEntityProcessing#CHUNKED chunked encoding} as a default setting. This can be overridden by the
- * {@link ClientProperties#REQUEST_ENTITY_PROCESSING}. By default the {@link ClientProperties#CHUNKED_ENCODING_SIZE} property is only
- * supported by using default connection manager. If custom connection manager needs to be used then chunked encoding size can be set by
- * providing a custom {@link org.apache.http.HttpClientConnection} (via custom
- * {@link org.apache.http.impl.conn.ManagedHttpClientConnectionFactory}) and overriding {@code createOutputStream} method.
- * </p>
- * <p>
- * Using of authorization is dependent on the chunk encoding setting. If the entity buffering is enabled, the entity is buffered and
- * authorization can be performed automatically in response to a 401 by sending the request again. When entity buffering is disabled
- * (chunked encoding is used) then the property
- * {@link org.glassfish.jersey.apache.connector.ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION} must be set to {@code true}.
- * </p>
- * <p>
- * If a {@link org.glassfish.jersey.client.ClientResponse} is obtained and an entity is not read from the response then
- * {@link org.glassfish.jersey.client.ClientResponse#close()} MUST be called after processing the response to release connection-based
- * resources.
- * </p>
- * <p>
- * Client operations are thread safe, the HTTP connection may be shared between different threads.
- * </p>
- * <p>
- * If a response entity is obtained that is an instance of {@link Closeable} then the instance MUST be closed after processing the entity to
- * release connection-based resources.
- * </p>
- * <p>
- * The following methods are currently supported: HEAD, GET, POST, PUT, DELETE, OPTIONS, PATCH and TRACE.
- * </p>
- *
- * @author jorgeluisw@mac.com
- * @author Paul Sandoz (paul.sandoz at oracle.com)
- * @author Pavel Bucek (pavel.bucek at oracle.com)
- * @author Arul Dhesiaseelan (aruld at acm.org)
- * @see ApacheClientProperties#CONNECTION_MANAGER
- */
-@SuppressWarnings("deprecation")
-class ApacheConnector implements Connector {
-
-    private static final Logger LOGGER = Logger.getLogger(ApacheConnector.class.getName());
-
-    private static final VersionInfo VERSION_INFO;
-
-    private static final String RELEASE;
-
-    static {
-        VERSION_INFO = VersionInfo.loadVersionInfo("org.apache.http.client", HttpClientBuilder.class.getClassLoader());
-        RELEASE = (VERSION_INFO != null) ? VERSION_INFO.getRelease() : VersionInfo.UNAVAILABLE;
-    }
-
-    private final CloseableHttpClient client;
-
-    private final CookieStore cookieStore;
-
-    private final boolean preemptiveBasicAuth;
-
-    private final RequestConfig requestConfig;
-
-    /**
-     * Create the new Apache HTTP Client connector.
-     *
-     * @param config
-     *            client configuration.
-     */
-    ApacheConnector(Configuration config) {
-        Object reqConfig = null;
-
-        if (config != null) {
-            final Object connectionManager = config.getProperties().get(ApacheClientProperties.CONNECTION_MANAGER);
-
-            if (connectionManager != null && !(connectionManager instanceof HttpClientConnectionManager)) {
-                LOGGER.log(Level.WARNING, LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
-                        ApacheClientProperties.CONNECTION_MANAGER, connectionManager.getClass().getName(),
-                        HttpClientConnectionManager.class.getName()));
-            }
-
-            reqConfig = config.getProperties().get(ApacheClientProperties.REQUEST_CONFIG);
-            if (reqConfig != null) {
-                if (!(reqConfig instanceof RequestConfig)) {
-                    LOGGER.log(Level.WARNING, LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
-                            ApacheClientProperties.REQUEST_CONFIG, reqConfig.getClass().getName(),
-                            RequestConfig.class.getName()));
-                    reqConfig = null;
-                }
-            }
-        }
-
-        final SSLContext sslContext = getSslContext(config);
-        final HttpClientBuilder clientBuilder = HttpClientBuilder.create();
-
-        clientBuilder.setConnectionManager(getConnectionManager(config, sslContext));
-        clientBuilder.setSslcontext(sslContext);
-
-        final RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
-
-        int connectTimeout = 0;
-        int socketTimeout = 0;
-        boolean ignoreCookies = false;
-        if (config != null) {
-            connectTimeout = ClientProperties.getValue(config.getProperties(), ClientProperties.CONNECT_TIMEOUT, 0);
-            socketTimeout = ClientProperties.getValue(config.getProperties(), ClientProperties.READ_TIMEOUT, 0);
-            ignoreCookies = PropertiesHelper.isProperty(config.getProperties(), ApacheClientProperties.DISABLE_COOKIES);
-
-            final Object credentialsProvider = config.getProperty(ApacheClientProperties.CREDENTIALS_PROVIDER);
-            if (credentialsProvider != null && (credentialsProvider instanceof CredentialsProvider)) {
-                clientBuilder.setDefaultCredentialsProvider((CredentialsProvider) credentialsProvider);
-            }
-
-            Object proxyUri;
-            proxyUri = config.getProperty(ClientProperties.PROXY_URI);
-            if (proxyUri != null) {
-                final URI u = getProxyUri(proxyUri);
-                final HttpHost proxy = new HttpHost(u.getHost(), u.getPort(), u.getScheme());
-                String userName;
-                userName = ClientProperties.getValue(config.getProperties(), ClientProperties.PROXY_USERNAME,
-                        String.class);
-                if (userName != null) {
-                    String password;
-                    password = ClientProperties.getValue(config.getProperties(), ClientProperties.PROXY_PASSWORD,
-                            String.class);
-
-                    if (password != null) {
-                        final CredentialsProvider credsProvider = new BasicCredentialsProvider();
-                        credsProvider.setCredentials(new AuthScope(u.getHost(), u.getPort()),
-                                new UsernamePasswordCredentials(userName, password));
-                        clientBuilder.setDefaultCredentialsProvider(credsProvider);
-                    }
-                }
-                clientBuilder.setProxy(proxy);
-            }
-
-            final Boolean preemptiveBasicAuthProperty = (Boolean) config.getProperties().get(
-                    ApacheClientProperties.PREEMPTIVE_BASIC_AUTHENTICATION);
-            this.preemptiveBasicAuth = (preemptiveBasicAuthProperty != null) ? preemptiveBasicAuthProperty : false;
-        } else {
-            this.preemptiveBasicAuth = false;
-        }
-
-        if (reqConfig != null) {
-            RequestConfig.Builder reqConfigBuilder = RequestConfig.copy((RequestConfig) reqConfig);
-            if (connectTimeout > 0) {
-                reqConfigBuilder.setConnectTimeout(connectTimeout);
-            }
-            if (socketTimeout > 0) {
-                reqConfigBuilder.setSocketTimeout(socketTimeout);
-            }
-            if (ignoreCookies) {
-                reqConfigBuilder.setCookieSpec(CookieSpecs.IGNORE_COOKIES);
-            }
-            requestConfig = reqConfigBuilder.build();
-        } else {
-            requestConfigBuilder.setConnectTimeout(connectTimeout);
-            requestConfigBuilder.setSocketTimeout(socketTimeout);
-            if (ignoreCookies) {
-                requestConfigBuilder.setCookieSpec(CookieSpecs.IGNORE_COOKIES);
-            }
-            requestConfig = requestConfigBuilder.build();
-        }
-
-        if (requestConfig.getCookieSpec() == null || !requestConfig.getCookieSpec().equals(CookieSpecs.IGNORE_COOKIES)) {
-            this.cookieStore = new BasicCookieStore();
-            clientBuilder.setDefaultCookieStore(cookieStore);
-        } else {
-            this.cookieStore = null;
-        }
-        clientBuilder.setDefaultRequestConfig(requestConfig);
-        this.client = clientBuilder.build();
-    }
-
-    private SSLContext getSslContext(final Configuration config) {
-        final SslConfigurator sslConfigurator = ApacheClientProperties.getValue(config.getProperties(),
-                ApacheClientProperties.SSL_CONFIG, SslConfigurator.class);
-
-        return sslConfigurator != null ? sslConfigurator.createSSLContext() : null;
-    }
-
-    HttpClientConnectionManager getConnectionManager(final Configuration config, final SSLContext sslContext) {
-        final Object cmObject = config.getProperties().get(ApacheClientProperties.CONNECTION_MANAGER);
-
-        // Connection manager from configuration.
-        if (cmObject != null) {
-            if (cmObject instanceof HttpClientConnectionManager) {
-                return (HttpClientConnectionManager) cmObject;
-            } else {
-                LOGGER.log(Level.WARNING, LocalizationMessages.IGNORING_VALUE_OF_PROPERTY(
-                        ApacheClientProperties.CONNECTION_MANAGER, cmObject.getClass().getName(),
-                        HttpClientConnectionManager.class.getName()));
-            }
-        }
-
-        // Create custom connection manager.
-        return createConnectionManager(config, sslContext, null, false);
-    }
-
-    private HttpClientConnectionManager createConnectionManager(final Configuration config,
-            final SSLContext sslContext, X509HostnameVerifier hostnameVerifier, final boolean useSystemProperties) {
-
-        final String[] supportedProtocols = useSystemProperties ? split(System.getProperty("https.protocols")) : null;
-        final String[] supportedCipherSuites = useSystemProperties ? split(System.getProperty("https.cipherSuites"))
-                : null;
-
-        if (hostnameVerifier == null) {
-            hostnameVerifier = SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER;
-        }
-
-        final LayeredConnectionSocketFactory sslSocketFactory;
-        if (sslContext != null) {
-            sslSocketFactory = new SSLConnectionSocketFactory(sslContext, supportedProtocols, supportedCipherSuites,
-                    hostnameVerifier);
-        } else {
-            if (useSystemProperties) {
-                sslSocketFactory = new SSLConnectionSocketFactory((SSLSocketFactory) SSLSocketFactory.getDefault(),
-                        supportedProtocols, supportedCipherSuites, hostnameVerifier);
-            } else {
-                sslSocketFactory = new SSLConnectionSocketFactory(SSLContexts.createDefault(), hostnameVerifier);
-            }
-        }
-
-        final Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory> create()
-                .register("http", PlainConnectionSocketFactory.getSocketFactory()).register("https", sslSocketFactory)
-                .build();
-
-        final Integer chunkSize = ClientProperties.getValue(config.getProperties(),
-                ClientProperties.CHUNKED_ENCODING_SIZE, 4096, Integer.class);
-
-        final PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(registry,
-                new ConnectionFactory(chunkSize));
-
-        if (useSystemProperties) {
-            String s = System.getProperty("http.keepAlive", "true");
-            if ("true".equalsIgnoreCase(s)) {
-                s = System.getProperty("http.maxConnections", "5");
-                final int max = Integer.parseInt(s);
-                connectionManager.setDefaultMaxPerRoute(max);
-                connectionManager.setMaxTotal(2 * max);
-            }
-        }
-
-        return connectionManager;
-    }
-
-    private static String[] split(final String s) {
-        if (TextUtils.isBlank(s)) {
-            return null;
-        }
-        return s.split(" *, *");
-    }
-
-    /**
-     * Get the {@link HttpClient}.
-     *
-     * @return the {@link HttpClient}.
-     */
-    @SuppressWarnings("UnusedDeclaration")
-    public HttpClient getHttpClient() {
-        return client;
-    }
-
-    /**
-     * Get the {@link CookieStore}.
-     *
-     * @return the {@link CookieStore} instance or {@code null} when {@value ApacheClientProperties#DISABLE_COOKIES} set to {@code true}.
-     */
-    public CookieStore getCookieStore() {
-        return cookieStore;
-    }
-
-    private static URI getProxyUri(final Object proxy) {
-        if (proxy instanceof URI) {
-            return (URI) proxy;
-        } else if (proxy instanceof String) {
-            return URI.create((String) proxy);
-        } else {
-            throw new ProcessingException(LocalizationMessages.WRONG_PROXY_URI_TYPE(ClientProperties.PROXY_URI));
-        }
-    }
-
-    @Override
-    public ClientResponse apply(final ClientRequest clientRequest) throws ProcessingException {
-        final HttpUriRequest request = getUriHttpRequest(clientRequest);
-        final Map<String, String> clientHeadersSnapshot = writeOutBoundHeaders(clientRequest.getHeaders(), request);
-
-        try {
-            final CloseableHttpResponse response;
-            final HttpClientContext context = HttpClientContext.create();
-            if (preemptiveBasicAuth) {
-                final AuthCache authCache = new BasicAuthCache();
-                final BasicScheme basicScheme = new BasicScheme();
-                authCache.put(getHost(request), basicScheme);
-                context.setAuthCache(authCache);
-            }
-
-            // context.setRequestConfig(RequestConfig.custom().setConnectionRequestTimeout(10).build());
-
-            response = client.execute(getHost(request), request, context);
-            HeaderUtils
-                    .checkHeaderChanges(clientHeadersSnapshot, clientRequest.getHeaders(), this.getClass().getName());
-
-            final Response.StatusType status = response.getStatusLine().getReasonPhrase() == null ? Statuses
-                    .from(response.getStatusLine().getStatusCode()) : Statuses.from(response.getStatusLine()
-                    .getStatusCode(), response.getStatusLine().getReasonPhrase());
-
-            final ClientResponse responseContext = new ApacheConnectorClientResponse(status, clientRequest, response);
-            final List<URI> redirectLocations = context.getRedirectLocations();
-            if (redirectLocations != null && !redirectLocations.isEmpty()) {
-                responseContext.setResolvedRequestUri(redirectLocations.get(redirectLocations.size() - 1));
-            }
-
-            final Header[] respHeaders = response.getAllHeaders();
-            final MultivaluedMap<String, String> headers = responseContext.getHeaders();
-            for (final Header header : respHeaders) {
-                final String headerName = header.getName();
-                List<String> list = headers.get(headerName);
-                if (list == null) {
-                    list = new ArrayList<String>();
-                }
-                list.add(header.getValue());
-                headers.put(headerName, list);
-            }
-
-            final HttpEntity entity = response.getEntity();
-
-            if (entity != null) {
-                if (headers.get(HttpHeaders.CONTENT_LENGTH) == null) {
-                    headers.add(HttpHeaders.CONTENT_LENGTH, String.valueOf(entity.getContentLength()));
-                }
-
-                final Header contentEncoding = entity.getContentEncoding();
-                if (headers.get(HttpHeaders.CONTENT_ENCODING) == null && contentEncoding != null) {
-                    headers.add(HttpHeaders.CONTENT_ENCODING, contentEncoding.getValue());
-                }
-            }
-
-            try {
-                responseContext.setEntityStream(new HttpClientResponseInputStream(response));
-            } catch (final IOException e) {
-                LOGGER.log(Level.SEVERE, null, e);
-            }
-
-            return responseContext;
-        } catch (final Exception e) {
-            throw new ProcessingException(e);
-        }
-    }
-
-    @Override
-    public Future<?> apply(final ClientRequest request, final AsyncConnectorCallback callback) {
-        return MoreExecutors.sameThreadExecutor().submit(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    callback.response(apply(request));
-                } catch (final ProcessingException ex) {
-                    callback.failure(ex);
-                } catch (final Throwable t) {
-                    callback.failure(t);
-                }
-            }
-        });
-    }
-
-    @Override
-    public String getName() {
-        return "Apache HttpClient " + RELEASE;
-    }
-
-    @Override
-    public void close() {
-        try {
-            client.close();
-        } catch (final IOException e) {
-            throw new ProcessingException(LocalizationMessages.FAILED_TO_STOP_CLIENT(), e);
-        }
-    }
-
-    private HttpHost getHost(final HttpUriRequest request) {
-        return new HttpHost(request.getURI().getHost(), request.getURI().getPort(), request.getURI().getScheme());
-    }
-
-    private HttpUriRequest getUriHttpRequest(final ClientRequest clientRequest) {
-        final Boolean redirectsEnabled = clientRequest.resolveProperty(ClientProperties.FOLLOW_REDIRECTS,
-                requestConfig.isRedirectsEnabled());
-        final RequestConfig config = RequestConfig.copy(requestConfig).setRedirectsEnabled(redirectsEnabled).build();
-
-        final Boolean bufferingEnabled = clientRequest.resolveProperty(ClientProperties.REQUEST_ENTITY_PROCESSING,
-                RequestEntityProcessing.class) == RequestEntityProcessing.BUFFERED;
-        final HttpEntity entity = getHttpEntity(clientRequest, bufferingEnabled);
-
-        return RequestBuilder.create(clientRequest.getMethod()).setUri(clientRequest.getUri()).setConfig(config)
-                .setEntity(entity).build();
-    }
-
-    private HttpEntity getHttpEntity(final ClientRequest clientRequest, final boolean bufferingEnabled) {
-        final Object entity = clientRequest.getEntity();
-
-        if (entity == null) {
-            return null;
-        }
-
-        final AbstractHttpEntity httpEntity = new AbstractHttpEntity() {
-            @Override
-            public boolean isRepeatable() {
-                return false;
-            }
-
-            @Override
-            public long getContentLength() {
-                return -1;
-            }
-
-            @Override
-            public InputStream getContent() throws IOException, IllegalStateException {
-                if (bufferingEnabled) {
-                    final ByteArrayOutputStream buffer = new ByteArrayOutputStream(512);
-                    writeTo(buffer);
-                    return new ByteArrayInputStream(buffer.toByteArray());
-                } else {
-                    return null;
-                }
-            }
-
-            @Override
-            public void writeTo(final OutputStream outputStream) throws IOException {
-                clientRequest.setStreamProvider(new OutboundMessageContext.StreamProvider() {
-                    @Override
-                    public OutputStream getOutputStream(final int contentLength) throws IOException {
-                        return outputStream;
-                    }
-                });
-                clientRequest.writeEntity();
-            }
-
-            @Override
-            public boolean isStreaming() {
-                return false;
-            }
-        };
-
-        if (bufferingEnabled) {
-            try {
-                return new BufferedHttpEntity(httpEntity);
-            } catch (final IOException e) {
-                throw new ProcessingException(LocalizationMessages.ERROR_BUFFERING_ENTITY(), e);
-            }
-        } else {
-            return httpEntity;
-        }
-    }
-
-    private static Map<String, String> writeOutBoundHeaders(final MultivaluedMap<String, Object> headers,
-            final HttpUriRequest request) {
-        Map<String, String> stringHeaders = HeaderUtils.asStringHeadersSingleValue(headers);
-
-        for (Map.Entry<String, String> e : stringHeaders.entrySet()) {
-            request.addHeader(e.getKey(), e.getValue());
-        }
-        return stringHeaders;
-    }
-
-    private static final class HttpClientResponseInputStream extends FilterInputStream {
-
-        HttpClientResponseInputStream(final CloseableHttpResponse response) throws IOException {
-            super(getInputStream(response));
-        }
-
-        @Override
-        public void close() throws IOException {
-            super.close();
-        }
-    }
-
-    private static InputStream getInputStream(final CloseableHttpResponse response) throws IOException {
-
-        if (response.getEntity() == null) {
-            return new ByteArrayInputStream(new byte[0]);
-        } else {
-            final InputStream i = response.getEntity().getContent();
-            if (i.markSupported()) {
-                return i;
-            }
-            return new BufferedInputStream(i, ReaderWriter.BUFFER_SIZE);
-        }
-    }
-
-    private static class ConnectionFactory extends ManagedHttpClientConnectionFactory {
-
-        private static final AtomicLong COUNTER = new AtomicLong();
-
-        private final int chunkSize;
-
-        private ConnectionFactory(final int chunkSize) {
-            this.chunkSize = chunkSize;
-        }
-
-        @Override
-        public ManagedHttpClientConnection create(final HttpRoute route, final ConnectionConfig config) {
-            final String id = "http-outgoing-" + Long.toString(COUNTER.getAndIncrement());
-
-            return new HttpClientConnection(id, config.getBufferSize(), chunkSize);
-        }
-    }
-
-    private static class HttpClientConnection extends DefaultManagedHttpClientConnection {
-
-        private final int chunkSize;
-
-        private HttpClientConnection(final String id, final int buffersize, final int chunkSize) {
-            super(id, buffersize);
-
-            this.chunkSize = chunkSize;
-        }
-
-        @Override
-        protected OutputStream createOutputStream(final long len, final SessionOutputBuffer outbuffer) {
-            if (len == ContentLengthStrategy.CHUNKED) {
-                return new ChunkedOutputStream(chunkSize, outbuffer);
-            }
-            return super.createOutputStream(len, outbuffer);
-        }
-    }
-}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java
deleted file mode 100644
index fead3575c..000000000
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorClientResponse.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.github.dockerjava.jaxrs.connector;
-
-import java.io.IOException;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.StatusType;
-
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.glassfish.jersey.client.ClientRequest;
-import org.glassfish.jersey.client.ClientResponse;
-
-/**
- * Fix for https://github.com/docker-java/docker-java/issues/196
- *
- * https://java.net/jira/browse/JERSEY-2852
- *
- * @author Marcus Linke
- *
- */
-public class ApacheConnectorClientResponse extends ClientResponse {
-
-    private CloseableHttpResponse closeableHttpResponse;
-
-    public ApacheConnectorClientResponse(ClientRequest requestContext, Response response) {
-        super(requestContext, response);
-    }
-
-    public ApacheConnectorClientResponse(StatusType status, ClientRequest requestContext,
-            CloseableHttpResponse closeableHttpResponse) {
-        super(status, requestContext);
-        this.closeableHttpResponse = closeableHttpResponse;
-    }
-
-    public ApacheConnectorClientResponse(StatusType status, ClientRequest requestContext) {
-        super(status, requestContext);
-    }
-
-    @Override
-    public void close() {
-        try {
-            closeableHttpResponse.close();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        super.close();
-    }
-
-}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java b/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java
deleted file mode 100644
index eafb55c29..000000000
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/ApacheConnectorProvider.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.github.dockerjava.jaxrs.connector;
-
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2013-2014 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * http://glassfish.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-import javax.ws.rs.client.Client;
-import javax.ws.rs.core.Configurable;
-import javax.ws.rs.core.Configuration;
-
-import org.apache.http.client.HttpClient;
-import org.glassfish.jersey.apache.connector.ApacheClientProperties;
-import org.glassfish.jersey.apache.connector.LocalizationMessages;
-import org.glassfish.jersey.client.Initializable;
-import org.glassfish.jersey.client.spi.Connector;
-import org.glassfish.jersey.client.spi.ConnectorProvider;
-
-/**
- * Connector provider for Jersey {@link Connector connectors} that utilize Apache HTTP Client to send and receive HTTP request and
- * responses.
- * <p>
- * The following connector configuration properties are supported:
- * <ul>
- * <li>{@link ApacheClientProperties#CONNECTION_MANAGER}</li>
- * <li>{@link ApacheClientProperties#REQUEST_CONFIG}</li>
- * <li>{@link ApacheClientProperties#CREDENTIALS_PROVIDER}</li>
- * <li>{@link ApacheClientProperties#DISABLE_COOKIES}</li>
- * <li>{@link org.glassfish.jersey.client.ClientProperties#PROXY_URI}</li>
- * <li>{@link org.glassfish.jersey.client.ClientProperties#PROXY_USERNAME}</li>
- * <li>{@link org.glassfish.jersey.client.ClientProperties#PROXY_PASSWORD}</li>
- * <li>{@link org.glassfish.jersey.client.ClientProperties#REQUEST_ENTITY_PROCESSING} - default value is
- * {@link org.glassfish.jersey.client.RequestEntityProcessing#CHUNKED}</li>
- * <li>{@link ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION}</li>
- * <li>{@link ApacheClientProperties#SSL_CONFIG}</li>
- * </ul>
- * </p>
- * <p>
- * Connector instances created via this connector provider use {@link org.glassfish.jersey.client.RequestEntityProcessing#CHUNKED chunked
- * encoding} as a default setting. This can be overridden by the
- * {@link org.glassfish.jersey.client.ClientProperties#REQUEST_ENTITY_PROCESSING}. By default the
- * {@link org.glassfish.jersey.client.ClientProperties#CHUNKED_ENCODING_SIZE} property is only supported when using the default
- * {@code org.apache.http.conn.HttpClientConnectionManager} instance. If custom connection manager is used, then chunked encoding size can
- * be set by providing a custom {@code org.apache.http.HttpClientConnection} (via custom
- * {@code org.apache.http.impl.conn.ManagedHttpClientConnectionFactory}) and overriding it's {@code createOutputStream} method.
- * </p>
- * <p>
- * Use of authorization by the AHC-based connectors is dependent on the chunk encoding setting. If the entity buffering is enabled, the
- * entity is buffered and authorization can be performed automatically in response to a 401 by sending the request again. When entity
- * buffering is disabled (chunked encoding is used) then the property
- * {@link org.glassfish.jersey.apache.connector.ApacheClientProperties#PREEMPTIVE_BASIC_AUTHENTICATION} must be set to {@code true}.
- * </p>
- * <p>
- * If a {@link org.glassfish.jersey.client.ClientResponse} is obtained and an entity is not read from the response then
- * {@link org.glassfish.jersey.client.ClientResponse#close()} MUST be called after processing the response to release connection-based
- * resources.
- * </p>
- * <p>
- * If a response entity is obtained that is an instance of {@link java.io.Closeable} then the instance MUST be closed after processing the
- * entity to release connection-based resources.
- * <p/>
- * <p>
- * The following methods are currently supported: HEAD, GET, POST, PUT, DELETE, OPTIONS, PATCH and TRACE.
- * <p/>
- *
- * @author Pavel Bucek (pavel.bucek at oracle.com)
- * @author Arul Dhesiaseelan (aruld at acm.org)
- * @author jorgeluisw at mac.com
- * @author Marek Potociar (marek.potociar at oracle.com)
- * @author Paul Sandoz (paul.sandoz at oracle.com)
- * @since 2.5
- */
-public class ApacheConnectorProvider implements ConnectorProvider {
-
-    @Override
-    public Connector getConnector(Client client, Configuration runtimeConfig) {
-        return new ApacheConnector(runtimeConfig);
-    }
-
-    /**
-     * Retrieve the underlying Apache {@link HttpClient} instance from {@link org.glassfish.jersey.client.JerseyClient} or
-     * {@link org.glassfish.jersey.client.JerseyWebTarget} configured to use {@code ApacheConnectorProvider}.
-     *
-     * @param component
-     *            {@code JerseyClient} or {@code JerseyWebTarget} instance that is configured to use {@code ApacheConnectorProvider}.
-     * @return underlying Apache {@code HttpClient} instance.
-     *
-     * @throws java.lang.IllegalArgumentException
-     *             in case the {@code component} is neither {@code JerseyClient} nor {@code JerseyWebTarget} instance or in case the
-     *             component is not configured to use a {@code ApacheConnectorProvider}.
-     * @since 2.8
-     */
-    public static HttpClient getHttpClient(Configurable<?> component) {
-        if (!(component instanceof Initializable)) {
-            throw new IllegalArgumentException(LocalizationMessages.INVALID_CONFIGURABLE_COMPONENT_TYPE(component
-                    .getClass().getName()));
-        }
-
-        final Initializable<?> initializable = (Initializable<?>) component;
-        Connector connector = initializable.getConfiguration().getConnector();
-        if (connector == null) {
-            initializable.preInitialize();
-            connector = initializable.getConfiguration().getConnector();
-        }
-
-        if (connector instanceof ApacheConnector) {
-            return ((ApacheConnector) connector).getHttpClient();
-        }
-
-        throw new IllegalArgumentException(LocalizationMessages.EXPECTED_CONNECTOR_PROVIDER_NOT_USED());
-    }
-}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/connector/README.txt b/src/main/java/com/github/dockerjava/jaxrs/connector/README.txt
deleted file mode 100644
index c3c1415f1..000000000
--- a/src/main/java/com/github/dockerjava/jaxrs/connector/README.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-This package exists as a workaround to https://java.net/jira/browse/JERSEY-2852.
-It introduces ApacheConnectorClientResponse which extends ClientResponse and closes
-the underlying CloseableHttpResponse when close() is called.
\ No newline at end of file
diff --git a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
index 21507e44e..f8bf33fef 100644
--- a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.core.command;
 
+import static org.apache.commons.lang.StringUtils.isEmpty;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.isEmptyString;
@@ -11,7 +12,9 @@
 import java.lang.reflect.Method;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.commons.codec.binary.StringUtils;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -74,7 +77,7 @@ public void onNext(Frame frame) {
         assertThat(callback.toString(), containsString(snippet));
     }
 
-    @Test
+    @Test(groups = "badTests", enabled = false)
     public void attachContainerWithTTY() throws Exception {
 
         File baseDir = new File(Thread.currentThread().getContextClassLoader()
@@ -97,14 +100,24 @@ public void onNext(Frame frame) {
             };
         };
 
-        dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
-                .exec(callback).awaitCompletion(15, TimeUnit.SECONDS);
+        dockerClient.attachContainerCmd(container.getId())
+                .withStdErr(true)
+                .withStdOut(true)
+                .withFollowStream(true)
+                .exec(callback)
+                .awaitCompletion();
+//                .awaitCompletion(15, TimeUnit.SECONDS);
         callback.close();
 
+        dockerClient.close();
+
         System.out.println("log: " + callback.toString());
 
         // HexDump.dump(collectFramesCallback.toString().getBytes(), 0, System.out, 0);
-
+        RuntimeException firstError = callback.getFirstError();
+        if (isEmpty(callback.toString())) {
+            throw new SkipException("com.github.dockerjava.api.exception.InternalServerErrorException: http: Hijack is incompatible with use of CloseNotifier");
+        }
         assertThat(callback.toString(), containsString("stdout\r\nstderr"));
     }
 
@@ -145,6 +158,11 @@ public void onNext(Frame item) {
             super.onNext(item);
         }
 
+        @Override
+        public RuntimeException getFirstError() {
+            return super.getFirstError();
+        }
+
         @Override
         public String toString() {
             return log.toString();
diff --git a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
index 7f8e66609..ba3d5a9ca 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
@@ -134,8 +134,12 @@ public void onNext(Frame frame) {
             };
         };
 
-        dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
-                .exec(callback).awaitCompletion(10, TimeUnit.SECONDS);
+        dockerClient.attachContainerCmd(container.getId())
+                .withStdErr(true)
+                .withStdOut(true)
+                .withFollowStream(true)
+                .exec(callback)
+                .awaitCompletion(10, TimeUnit.SECONDS);
         callback.close();
 
         // HexDump.dump(collectFramesCallback.toString().getBytes(), 0, System.out, 0);

From 52ff6d82952a4b1ff2426a24e239547e32f38314 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 8 Jul 2016 00:31:26 +0300
Subject: [PATCH 0579/1272] revert dep and test

---
 pom.xml                                        | 18 ++++--------------
 .../command/AttachContainerCmdImplTest.java    | 11 ++---------
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index cb43f2897..a13ac1fc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
 		<slf4j-api.version>1.7.21</slf4j-api.version>
 
 		<bouncycastle.version>1.54</bouncycastle.version>
-		<unix-socket-factory.version>2016-04-06T22-21-19</unix-socket-factory.version>
+		<unix-socket-factory.version>2015-01-27T15-02-14</unix-socket-factory.version>
 		<guava.version>19.0</guava.version>
 
 		<!-- test dependencies -->
@@ -104,20 +104,10 @@
 			<artifactId>jersey-client</artifactId>
 			<version>${jersey.version}</version>
 		</dependency>
-		<!--<dependency>-->
-			<!--<groupId>de.gesellix</groupId>-->
-			<!--<artifactId>unix-socket-factory</artifactId>-->
-			<!--<version>${unix-socket-factory.version}</version>-->
-		<!--</dependency>-->
 		<dependency>
-			<groupId>com.kohlschutter.junixsocket</groupId>
-			<artifactId>junixsocket-common</artifactId>
-			<version>2.0.4</version>
-		</dependency>
-		<dependency>
-			<groupId>com.kohlschutter.junixsocket</groupId>
-			<artifactId>junixsocket-native-common</artifactId>
-			<version>2.0.4</version>
+			<groupId>de.gesellix</groupId>
+			<artifactId>unix-socket-factory</artifactId>
+			<version>${unix-socket-factory.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
index f8bf33fef..ef69984f3 100644
--- a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
@@ -77,7 +77,7 @@ public void onNext(Frame frame) {
         assertThat(callback.toString(), containsString(snippet));
     }
 
-    @Test(groups = "badTests", enabled = false)
+    @Test
     public void attachContainerWithTTY() throws Exception {
 
         File baseDir = new File(Thread.currentThread().getContextClassLoader()
@@ -105,19 +105,12 @@ public void onNext(Frame frame) {
                 .withStdOut(true)
                 .withFollowStream(true)
                 .exec(callback)
-                .awaitCompletion();
-//                .awaitCompletion(15, TimeUnit.SECONDS);
+                .awaitCompletion(15, TimeUnit.SECONDS);
         callback.close();
 
-        dockerClient.close();
-
         System.out.println("log: " + callback.toString());
 
         // HexDump.dump(collectFramesCallback.toString().getBytes(), 0, System.out, 0);
-        RuntimeException firstError = callback.getFirstError();
-        if (isEmpty(callback.toString())) {
-            throw new SkipException("com.github.dockerjava.api.exception.InternalServerErrorException: http: Hijack is incompatible with use of CloseNotifier");
-        }
         assertThat(callback.toString(), containsString("stdout\r\nstderr"));
     }
 

From 19d5f84c0bfe9494d558f991e073680195989371 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 8 Jul 2016 00:44:37 +0300
Subject: [PATCH 0580/1272] Fix version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3f9caa55a..bee178a6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.0-kostyasha-3</version>
+	<version>3.0.1-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>

From 1a148f2e51ac908cfa9a23e0f847a07b2c155797 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 8 Jul 2016 01:14:28 +0300
Subject: [PATCH 0581/1272] Skip auth tests

---
 pom.xml                                                        | 3 ++-
 .../github/dockerjava/core/command/PushImageCmdImplTest.java   | 2 +-
 .../com/github/dockerjava/netty/exec/PushImageCmdExecTest.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index a13ac1fc0..2437baa22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -388,6 +388,7 @@
 				<version>${maven-surefire-plugin.version}</version>
 				<configuration>
 					<excludedGroups>integration</excludedGroups>
+					<excludedGroups>integration-auth</excludedGroups>
 				</configuration>
 			</plugin>
 
@@ -403,7 +404,7 @@
 						</goals>
 						<configuration>
 							<groups>integration</groups>
-<!-- 							<excludedGroups>ignoreInCircleCi</excludedGroups> -->
+ 							<excludedGroups>integration-auth</excludedGroups>
 							<includes>
 								<include>**/*Test.java</include>
 							</includes>
diff --git a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
index e89a071b8..a48750bd1 100644
--- a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
@@ -19,7 +19,7 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
-@Test(groups = "integration")
+@Test(groups = "integration-auth")
 public class PushImageCmdImplTest extends AbstractDockerClientTest {
 
     public static final Logger LOG = LoggerFactory.getLogger(PushImageCmdImplTest.class);
diff --git a/src/test/java/com/github/dockerjava/netty/exec/PushImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/PushImageCmdExecTest.java
index 777cc8eed..5e77a6765 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/PushImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/PushImageCmdExecTest.java
@@ -21,7 +21,7 @@
 import com.github.dockerjava.core.command.PushImageResultCallback;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 
-@Test(groups = "integration")
+@Test(groups = "integration-auth")
 public class PushImageCmdExecTest extends AbstractNettyDockerClientTest {
 
     public static final Logger LOG = LoggerFactory.getLogger(PushImageCmdExecTest.class);

From 3a782a9834449f78368c54356d5dd3412ae89917 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 8 Jul 2016 01:26:19 +0300
Subject: [PATCH 0582/1272] Enable cache

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b6e6f953b..4491de529 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ env:
 cache:
   directories:
   - $HOME/.travis_cache
-#  - $HOME/.m2 install would pollute it
+  - $HOME/.m2 # install will pollute it
 
 before_install:
   - pip install --user codecov

From 31d5627be8dad851941f126a5af0aa5385e002b4 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 8 Jul 2016 01:45:09 +0300
Subject: [PATCH 0583/1272] Disable experimental/testing

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4491de529..9c96c5abd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,10 +25,10 @@ env:
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty"
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty"
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.10.3-0~trusty"
-    - repo="testing" DOCKER_HOST="tcp://127.0.0.1:2375"
-    - repo="testing" DOCKER_HOST="unix:///var/run/docker.sock"
-    - repo="experimental" DOCKER_HOST="tcp://127.0.0.1:2375"
-    - repo="experimental" DOCKER_HOST="unix:///var/run/docker.sock"
+#    - repo="testing" DOCKER_HOST="tcp://127.0.0.1:2375"
+#    - repo="testing" DOCKER_HOST="unix:///var/run/docker.sock"
+#    - repo="experimental" DOCKER_HOST="tcp://127.0.0.1:2375"
+#    - repo="experimental" DOCKER_HOST="unix:///var/run/docker.sock"
 
 cache:
   directories:

From 007f66899f9a84bde102f4740631816973e2fb9a Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 8 Jul 2016 02:12:48 +0300
Subject: [PATCH 0584/1272] run codecov only on one run

---
 .travis.yml                                                   | 3 +--
 .travis/travis-after-success.sh                               | 4 +++-
 .travis/travis-before-install.sh                              | 3 +--
 .../github/dockerjava/core/command/PushImageCmdImplTest.java  | 2 +-
 .../github/dockerjava/netty/exec/PushImageCmdExecTest.java    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9c96c5abd..bb559fd93 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,8 +21,7 @@ env:
     - COVERITY_SCAN_NOTIFICATION_EMAIL="kanstantsin.sha@gmail.com"
 
   matrix:
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" DEPLOY=true FAST_BUILD=true COVERITY=true
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty"
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" DEPLOY=true COVERITY=true CODECOV=true
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty"
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.10.3-0~trusty"
 #    - repo="testing" DOCKER_HOST="tcp://127.0.0.1:2375"
diff --git a/.travis/travis-after-success.sh b/.travis/travis-after-success.sh
index 6d198daf5..695358122 100755
--- a/.travis/travis-after-success.sh
+++ b/.travis/travis-after-success.sh
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 
+if [[ $CODECOV == "true" ]]; then
+    codecov
+fi
 
-codecov
 if [[ $TRAVIS_BRANCH == "master" ]] && [[ $TRAVIS_PULL_REQUEST == "false" ]] && [[ $DEPLOY == "true" ]];
 then
     cat <<EOF >> ~/settings.xml
diff --git a/.travis/travis-before-install.sh b/.travis/travis-before-install.sh
index 13034fc74..970425f63 100755
--- a/.travis/travis-before-install.sh
+++ b/.travis/travis-before-install.sh
@@ -28,8 +28,7 @@ sudo -E apt-cache policy docker-engine
 # sudo apt-get -f install
 # sudo dpkg -i "$(ls *${DOCKER_VERSION}*)"
 #popd
-#rm -f "src/test/resources/logback.xml"
-mv "src/test/resources/travis-logback.xml" "src/test/resources/logback.xml"
+
 
 echo 'DOCKER_OPTS="-H=unix:///var/run/docker.sock -H=tcp://127.0.0.1:2375"' | sudo tee -a /etc/default/docker
 sudo -E restart docker
diff --git a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
index a48750bd1..0fb32c311 100644
--- a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
@@ -19,7 +19,7 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
-@Test(groups = "integration-auth")
+@Test(groups = {"integration-auth", "integration"})
 public class PushImageCmdImplTest extends AbstractDockerClientTest {
 
     public static final Logger LOG = LoggerFactory.getLogger(PushImageCmdImplTest.class);
diff --git a/src/test/java/com/github/dockerjava/netty/exec/PushImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/PushImageCmdExecTest.java
index 5e77a6765..73e99af6d 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/PushImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/PushImageCmdExecTest.java
@@ -21,7 +21,7 @@
 import com.github.dockerjava.core.command.PushImageResultCallback;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 
-@Test(groups = "integration-auth")
+@Test(groups = {"integration", "integration-auth"})
 public class PushImageCmdExecTest extends AbstractNettyDockerClientTest {
 
     public static final Logger LOG = LoggerFactory.getLogger(PushImageCmdExecTest.class);

From 3854e2efd477ae4cba4e0d1c85302ccc2d085c41 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 8 Jul 2016 02:15:44 +0300
Subject: [PATCH 0585/1272] revert typo

---
 .travis/travis-before-install.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis/travis-before-install.sh b/.travis/travis-before-install.sh
index 970425f63..13034fc74 100755
--- a/.travis/travis-before-install.sh
+++ b/.travis/travis-before-install.sh
@@ -28,7 +28,8 @@ sudo -E apt-cache policy docker-engine
 # sudo apt-get -f install
 # sudo dpkg -i "$(ls *${DOCKER_VERSION}*)"
 #popd
-
+#rm -f "src/test/resources/logback.xml"
+mv "src/test/resources/travis-logback.xml" "src/test/resources/logback.xml"
 
 echo 'DOCKER_OPTS="-H=unix:///var/run/docker.sock -H=tcp://127.0.0.1:2375"' | sudo tee -a /etc/default/docker
 sudo -E restart docker

From 24d3a15001da56083a5c83f47a1f5076e1468195 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 8 Jul 2016 02:31:08 +0300
Subject: [PATCH 0586/1272] tune timeout

---
 .../dockerjava/netty/exec/AttachContainerCmdExecTest.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
index ba3d5a9ca..675c11177 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
@@ -105,7 +105,9 @@ public void onNext(Frame frame) {
         InputStream stdin = new ByteArrayInputStream((snippet + "\n").getBytes());
 
         dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
-                .withStdIn(stdin).exec(callback).awaitCompletion(2, TimeUnit.SECONDS);
+                .withStdIn(stdin)
+                .exec(callback)
+                .awaitCompletion(5, TimeUnit.SECONDS);
         callback.close();
 
         assertThat(callback.toString(), containsString(snippet));

From 8837ac38a9a6b820ea292a8afc82a658cb24d883 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 8 Jul 2016 10:50:27 +0300
Subject: [PATCH 0587/1272] Fix shell scripting

---
 .travis/travis-script.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/travis-script.sh b/.travis/travis-script.sh
index 7046940ff..aeae555ef 100755
--- a/.travis/travis-script.sh
+++ b/.travis/travis-script.sh
@@ -15,7 +15,7 @@ if [ "${FAST_BUILD}" == "true" ]; then
     fi
 else
     if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$COVERITY" == "true" ] && [ "$IS_COVERITY_SCAN_BRANCH" = "1" ]; then
-        COVERITY_SCAN_BUILD_COMMAND="mvn verify"
+        export COVERITY_SCAN_BUILD_COMMAND="mvn verify"
         #curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash
         ./.travis/travisci_build_coverity_scan.sh
     else

From 1c14bc3cf04f22a0768e47431a0124425f53e787 Mon Sep 17 00:00:00 2001
From: tejksat <tejksat@users.noreply.github.com>
Date: Sat, 9 Jul 2016 11:19:43 +0300
Subject: [PATCH 0588/1272] Fix for #625 (#630)

* Fix for #625

* Checkstyle errors fixed
---
 .../github/dockerjava/netty/WebTarget.java    | 63 +++++++++++++++----
 .../dockerjava/netty/WebTargetTest.java       | 39 ++++++++++++
 2 files changed, 89 insertions(+), 13 deletions(-)
 create mode 100644 src/test/java/com/github/dockerjava/netty/WebTargetTest.java

diff --git a/src/main/java/com/github/dockerjava/netty/WebTarget.java b/src/main/java/com/github/dockerjava/netty/WebTarget.java
index 090fea67c..ef1510f5c 100644
--- a/src/main/java/com/github/dockerjava/netty/WebTarget.java
+++ b/src/main/java/com/github/dockerjava/netty/WebTarget.java
@@ -2,12 +2,14 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
 /**
  * This class is basically a replacement of javax.ws.rs.client.WebTarget to allow simpler migration of JAX-RS code to a netty based
  * implementation.
@@ -16,32 +18,40 @@
  */
 public class WebTarget {
 
-    private ChannelProvider channelProvider;
+    private final ChannelProvider channelProvider;
 
-    private List<String> path = new ArrayList<String>();
+    private final ImmutableList<String> path;
 
-    private Map<String, String> queryParams = new HashMap<String, String>();
+    private final ImmutableMap<String, String> queryParams;
 
     private static final String PATH_SEPARATOR = "/";
 
     public WebTarget(ChannelProvider channelProvider) {
+        this(channelProvider, ImmutableList.<String>of(), ImmutableMap.<String, String>of());
+    }
+
+    private WebTarget(ChannelProvider channelProvider,
+                      ImmutableList<String> path,
+                      ImmutableMap<String, String> queryParams) {
         this.channelProvider = channelProvider;
+        this.path = path;
+        this.queryParams = queryParams;
     }
 
     public WebTarget path(String... components) {
+        ImmutableList.Builder<String> newPath = ImmutableList.<String>builder().addAll(this.path);
 
         for (String component : components) {
-
-            path.addAll(Arrays.asList(StringUtils.split(component, PATH_SEPARATOR)));
+            newPath.addAll(Arrays.asList(StringUtils.split(component, PATH_SEPARATOR)));
         }
 
-        return this;
+        return new WebTarget(channelProvider, newPath.build(), queryParams);
     }
 
     public InvocationBuilder request() {
         String resource = PATH_SEPARATOR + StringUtils.join(path, PATH_SEPARATOR);
 
-        List<String> params = new ArrayList<String>();
+        List<String> params = new ArrayList<>();
         for (Map.Entry<String, String> entry : queryParams.entrySet()) {
             params.add(entry.getKey() + "=" + entry.getValue());
         }
@@ -54,20 +64,47 @@ public InvocationBuilder request() {
     }
 
     public WebTarget resolveTemplate(String name, Object value) {
-        List<String> newPath = new ArrayList<String>();
+        ImmutableList.Builder<String> newPath = ImmutableList.builder();
         for (String component : path) {
             component = component.replaceAll("\\{" + name + "\\}", value.toString());
             newPath.add(component);
         }
-        path = newPath;
-        return this;
+        return new WebTarget(channelProvider, newPath.build(), queryParams);
     }
 
     public WebTarget queryParam(String name, Object value) {
+        ImmutableMap.Builder<String, String> builder = ImmutableMap.<String, String>builder().putAll(queryParams);
         if (value != null) {
-            queryParams.put(name, value.toString());
+            builder.put(name, value.toString());
         }
-        return this;
+        return new WebTarget(channelProvider, path, builder.build());
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        WebTarget webTarget = (WebTarget) o;
+
+        if (channelProvider != null ? !channelProvider.equals(webTarget.channelProvider) : webTarget.channelProvider != null) {
+            return false;
+        }
+        if (path != null ? !path.equals(webTarget.path) : webTarget.path != null) {
+            return false;
+        }
+        return queryParams != null ? queryParams.equals(webTarget.queryParams) : webTarget.queryParams == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = channelProvider != null ? channelProvider.hashCode() : 0;
+        result = 31 * result + (path != null ? path.hashCode() : 0);
+        result = 31 * result + (queryParams != null ? queryParams.hashCode() : 0);
+        return result;
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/WebTargetTest.java b/src/test/java/com/github/dockerjava/netty/WebTargetTest.java
new file mode 100644
index 000000000..a462eb8b5
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/WebTargetTest.java
@@ -0,0 +1,39 @@
+package com.github.dockerjava.netty;
+
+import static org.testng.Assert.assertEquals;
+
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * @author Alexander Koshevoy
+ */
+public class WebTargetTest {
+    @Mock private ChannelProvider channelProvider;
+
+    @BeforeMethod
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    public void verifyImmutability() throws Exception {
+        WebTarget emptyWebTarget = new WebTarget(channelProvider);
+
+        WebTarget initWebTarget = emptyWebTarget.path("/containers/{id}/attach").resolveTemplate("id", "d03da378b592")
+                .queryParam("logs", "true");
+
+        WebTarget anotherWebTarget = emptyWebTarget.path("/containers/{id}/attach")
+                .resolveTemplate("id", "2cfada4e3c07").queryParam("stdin", "true");
+
+        assertEquals(new WebTarget(channelProvider), emptyWebTarget);
+
+        assertEquals(new WebTarget(channelProvider).path("/containers/d03da378b592/attach")
+                .queryParam("logs", "true"), initWebTarget);
+
+        assertEquals(new WebTarget(channelProvider).path("/containers/2cfada4e3c07/attach")
+                .queryParam("stdin", "true"), anotherWebTarget);
+    }
+}

From 1923e7e5866374dc4cb771ef9d7d3317aba2704b Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Sat, 9 Jul 2016 10:22:03 +0200
Subject: [PATCH 0589/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10065afad..e1f16ec14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ Change Log
 ---
 
 All changes
+* [#630 ] (https://github.com/docker-java/docker-java/pull/630) Fix: Second execution of a docker command in Netty implementation always fails 
 * [#596] (https://github.com/docker-java/docker-java/pull/596) Refactor configuration of SSL to allow override with custom config 
 * [#529] (https://github.com/docker-java/docker-java/pull/529) Refactor CertUtils. Support ECDSA and PrivateKey 
 * [#593] (https://github.com/docker-java/docker-java/pull/593) Added Device.parse() method with simple verification.

From 5f9e2bfe2f840467394152cb18695002302e0767 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 12 Jul 2016 11:28:35 +0300
Subject: [PATCH 0590/1272] Change serial until we didn't ship release

---
 .../com/github/dockerjava/core/DefaultDockerClientConfig.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index b21e227ec..a9a15bb36 100644
--- a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -31,7 +31,7 @@
  */
 public class DefaultDockerClientConfig implements Serializable, DockerClientConfig {
 
-    private static final long serialVersionUID = -4307357472441531489L;
+    private static final long serialVersionUID = 1L;
 
     public static final String DOCKER_HOST = "DOCKER_HOST";
 

From 2f50240329e336d097239b7813949d1ba29d607e Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 12 Jul 2016 11:29:28 +0300
Subject: [PATCH 0591/1272] Test also on 1.10

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index bb559fd93..31a062e79 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,7 @@ env:
   matrix:
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" DEPLOY=true COVERITY=true CODECOV=true
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty"
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.10.3-0~trusty"
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.10.3-0~trusty"
 #    - repo="testing" DOCKER_HOST="tcp://127.0.0.1:2375"
 #    - repo="testing" DOCKER_HOST="unix:///var/run/docker.sock"

From d803c4692efc51bf0e8c138ca3a396947274391d Mon Sep 17 00:00:00 2001
From: Leonid Rudenko <leonsabr@yandex-team.ru>
Date: Thu, 14 Jul 2016 23:42:54 +0400
Subject: [PATCH 0592/1272] Implement POST /images/load endpoint (#627)

---
 .../github/dockerjava/api/DockerClient.java   |  13 +++
 .../api/command/DockerCmdExecFactory.java     |   2 +
 .../dockerjava/api/command/LoadImageCmd.java  |  21 +++++
 .../dockerjava/core/DockerClientImpl.java     |   7 ++
 .../dockerjava/core/RemoteApiVersion.java     |   5 ++
 .../core/command/LoadImageCmdImpl.java        |  39 +++++++++
 .../jaxrs/DockerCmdExecFactoryImpl.java       |   6 ++
 .../dockerjava/jaxrs/LoadImageCmdExec.java    |  31 +++++++
 .../netty/DockerCmdExecFactoryImpl.java       |   7 ++
 .../netty/exec/LoadImageCmdExec.java          |  29 +++++++
 .../core/TestDockerCmdExecFactory.java        |  12 +++
 .../core/command/LoadImageCmdImplTest.java    |  76 ++++++++++++++++++
 .../netty/exec/LoadImageCmdExecTest.java      |  76 ++++++++++++++++++
 .../dockerjava/utils/TestResources.java       |  14 ++++
 src/test/resources/api/images/load/image.tar  | Bin 0 -> 11264 bytes
 15 files changed, 338 insertions(+)
 create mode 100644 src/main/java/com/github/dockerjava/api/command/LoadImageCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/LoadImageCmdExec.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/LoadImageCmdImplTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/LoadImageCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/utils/TestResources.java
 create mode 100644 src/test/resources/api/images/load/image.tar

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 4c0e2ed56..491c11ac8 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -35,6 +35,7 @@
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
+import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.command.PingCmd;
@@ -90,6 +91,18 @@ public interface DockerClient extends Closeable {
 
     CreateImageCmd createImageCmd(@Nonnull String repository, @Nonnull InputStream imageStream);
 
+    /**
+     * Loads a tarball with a set of images and tags into a Docker repository.
+     *
+     * Corresponds to POST /images/load API endpoint.
+     *
+     * @param imageStream
+     *            stream of the tarball file
+     * @return created command
+     * @since {@link RemoteApiVersion#VERSION_1_7}
+     */
+    LoadImageCmd loadImageCmd(@Nonnull InputStream imageStream);
+
     SearchImagesCmd searchImagesCmd(@Nonnull String term);
 
     RemoveImageCmd removeImageCmd(@Nonnull String imageId);
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index 0de3afe38..671c0d535 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -28,6 +28,8 @@ public interface DockerCmdExecFactory extends Closeable {
 
     CreateImageCmd.Exec createCreateImageCmdExec();
 
+    LoadImageCmd.Exec createLoadImageCmdExec();
+
     SearchImagesCmd.Exec createSearchImagesCmdExec();
 
     RemoveImageCmd.Exec createRemoveImageCmdExec();
diff --git a/src/main/java/com/github/dockerjava/api/command/LoadImageCmd.java b/src/main/java/com/github/dockerjava/api/command/LoadImageCmd.java
new file mode 100644
index 000000000..184b7ef33
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/LoadImageCmd.java
@@ -0,0 +1,21 @@
+package com.github.dockerjava.api.command;
+
+import java.io.InputStream;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+public interface LoadImageCmd extends SyncDockerCmd<Void> {
+
+    @CheckForNull
+    InputStream getImageStream();
+
+    /**
+     * @param imageStream
+     *            the InputStream of the tar file
+     */
+    LoadImageCmd withImageStream(@Nonnull InputStream imageStream);
+
+    interface Exec extends DockerCmdSyncExec<LoadImageCmd, Void> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index e11ca4f30..2d0b5caab 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -37,6 +37,7 @@
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
+import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.command.PingCmd;
@@ -89,6 +90,7 @@
 import com.github.dockerjava.core.command.ListImagesCmdImpl;
 import com.github.dockerjava.core.command.ListNetworksCmdImpl;
 import com.github.dockerjava.core.command.ListVolumesCmdImpl;
+import com.github.dockerjava.core.command.LoadImageCmdImpl;
 import com.github.dockerjava.core.command.LogContainerCmdImpl;
 import com.github.dockerjava.core.command.PauseContainerCmdImpl;
 import com.github.dockerjava.core.command.PingCmdImpl;
@@ -249,6 +251,11 @@ public CreateImageCmd createImageCmd(String repository, InputStream imageStream)
         return new CreateImageCmdImpl(getDockerCmdExecFactory().createCreateImageCmdExec(), repository, imageStream);
     }
 
+    @Override
+    public LoadImageCmd loadImageCmd(@Nonnull InputStream imageStream) {
+        return new LoadImageCmdImpl(getDockerCmdExecFactory().createLoadImageCmdExec(), imageStream);
+    }
+
     @Override
     public SearchImagesCmd searchImagesCmd(String term) {
         return new SearchImagesCmdImpl(getDockerCmdExecFactory().createSearchImagesCmdExec(), term);
diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index 992125414..954ed9971 100644
--- a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -22,6 +22,11 @@ public class RemoteApiVersion implements Serializable {
 
     private static final Pattern VERSION_REGEX = Pattern.compile("v?(\\d+)\\.(\\d+)");
 
+    /**
+     * Online documentation is not available anymore.
+     */
+    public static final RemoteApiVersion VERSION_1_7 = RemoteApiVersion.create(1, 7);
+
     /**
      * @see <a href="http://docs.docker.com/engine/reference/api/docker_remote_api_v1.16/">Docker API 1.16</a>
      */
diff --git a/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java
new file mode 100644
index 000000000..496ea3176
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java
@@ -0,0 +1,39 @@
+package com.github.dockerjava.core.command;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.io.InputStream;
+
+import com.github.dockerjava.api.command.LoadImageCmd;
+
+import javax.annotation.Nonnull;
+
+public class LoadImageCmdImpl extends AbstrDockerCmd<LoadImageCmd, Void> implements LoadImageCmd {
+
+    private InputStream imageStream;
+
+    /**
+     * @param imageStream
+     *            the InputStream of the tar file
+     */
+    public LoadImageCmdImpl(LoadImageCmd.Exec exec, InputStream imageStream) {
+        super(exec);
+        withImageStream(imageStream);
+    }
+
+    @Override
+    public InputStream getImageStream() {
+        return imageStream;
+    }
+
+    /**
+     * @param imageStream
+     *            the InputStream of the tar file
+     */
+    @Override
+    public LoadImageCmdImpl withImageStream(@Nonnull InputStream imageStream) {
+        checkNotNull(imageStream, "imageStream was not specified");
+        this.imageStream = imageStream;
+        return this;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index 4800f22ae..7e573a123 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -63,6 +63,7 @@
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
+import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.command.PingCmd;
@@ -322,6 +323,11 @@ public CreateImageCmd.Exec createCreateImageCmdExec() {
         return new CreateImageCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public LoadImageCmd.Exec createLoadImageCmdExec() {
+        return new LoadImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public SearchImagesCmd.Exec createSearchImagesCmdExec() {
         return new SearchImagesCmdExec(getBaseResource(), getDockerClientConfig());
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java
new file mode 100644
index 000000000..23d6c493a
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.jaxrs;
+
+import static javax.ws.rs.client.Entity.entity;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.command.LoadImageCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+
+public class LoadImageCmdExec extends AbstrSyncDockerCmdExec<LoadImageCmd, Void> implements LoadImageCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(LoadImageCmdExec.class);
+
+    public LoadImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(LoadImageCmd command) {
+        WebTarget webTarget = getBaseResource().path("/images/load");
+
+        LOGGER.trace("POST: {}", webTarget);
+        webTarget.request().post(entity(command.getImageStream(), MediaType.APPLICATION_OCTET_STREAM));
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
index 1f55c61a8..dff69a228 100644
--- a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
@@ -29,6 +29,7 @@
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
+import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.command.PingCmd;
@@ -82,6 +83,7 @@
 import com.github.dockerjava.netty.exec.ListImagesCmdExec;
 import com.github.dockerjava.netty.exec.ListNetworksCmdExec;
 import com.github.dockerjava.netty.exec.ListVolumesCmdExec;
+import com.github.dockerjava.netty.exec.LoadImageCmdExec;
 import com.github.dockerjava.netty.exec.LogContainerCmdExec;
 import com.github.dockerjava.netty.exec.PauseContainerCmdExec;
 import com.github.dockerjava.netty.exec.PingCmdExec;
@@ -366,6 +368,11 @@ public CreateImageCmd.Exec createCreateImageCmdExec() {
         return new CreateImageCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public LoadImageCmd.Exec createLoadImageCmdExec() {
+        return new LoadImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public SearchImagesCmd.Exec createSearchImagesCmdExec() {
         return new SearchImagesCmdExec(getBaseResource(), getDockerClientConfig());
diff --git a/src/main/java/com/github/dockerjava/netty/exec/LoadImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/LoadImageCmdExec.java
new file mode 100644
index 000000000..23581119f
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/LoadImageCmdExec.java
@@ -0,0 +1,29 @@
+package com.github.dockerjava.netty.exec;
+
+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;
+
+public class LoadImageCmdExec extends AbstrSyncDockerCmdExec<LoadImageCmd, Void> implements
+        LoadImageCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(LoadImageCmdExec.class);
+
+    public LoadImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(LoadImageCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/load");
+
+        LOGGER.trace("POST: {}", webResource);
+        return webResource.request()
+                .post(new TypeReference<Void>() {
+                }, command.getImageStream());
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index 48ea1e164..46d6d4dcc 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -34,6 +34,7 @@
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
+import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.command.PingCmd;
@@ -131,6 +132,17 @@ public CreateImageResponse exec(CreateImageCmd command) {
         };
     }
 
+    @Override
+    public LoadImageCmd.Exec createLoadImageCmdExec() {
+        return new LoadImageCmd.Exec() {
+            @Override
+            public Void exec(LoadImageCmd command) {
+                delegate.createLoadImageCmdExec().exec(command);
+                return null;
+            }
+        };
+    }
+
     @Override
     public RemoveImageCmd.Exec createRemoveImageCmdExec() {
         return new RemoveImageCmd.Exec() {
diff --git a/src/test/java/com/github/dockerjava/core/command/LoadImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LoadImageCmdImplTest.java
new file mode 100644
index 000000000..7cecf7334
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/LoadImageCmdImplTest.java
@@ -0,0 +1,76 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.model.Image;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+
+import com.github.dockerjava.utils.TestResources;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.nio.file.Files;
+import java.util.List;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.hamcrest.core.IsEqual.equalTo;
+
+@Test(groups = "integration")
+public class LoadImageCmdImplTest extends AbstractDockerClientTest {
+
+    private String expectedImageId;
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+        expectedImageId = "sha256:56031f66eb0cef2e2e5cb2d1dabafaa0ebcd0a18a507d313b5bdb8c0472c5eba";
+        if (findImageWithId(expectedImageId, dockerClient.listImagesCmd().exec()) != null) {
+            dockerClient.removeImageCmd(expectedImageId).exec();
+        }
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        dockerClient.removeImageCmd(expectedImageId).exec();
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void loadImageFromTar() throws Exception {
+        try (InputStream uploadStream = Files.newInputStream(TestResources.getApiImagesLoadTestTarball())) {
+            dockerClient.loadImageCmd(uploadStream).exec();
+        }
+
+        final Image image = findImageWithId(expectedImageId, dockerClient.listImagesCmd().exec());
+
+        assertThat("Can't find expected image after loading from a tar archive!", image, notNullValue());
+        assertThat("Image after loading from a tar archive has wrong tags!",
+                asList(image.getRepoTags()), equalTo(singletonList("docker-java/load:1.0")));
+    }
+
+    private Image findImageWithId(final String id, final List<Image> images) {
+        for (Image image : images) {
+            if (id.equals(image.getId())) {
+                return image;
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/LoadImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/LoadImageCmdExecTest.java
new file mode 100644
index 000000000..d978f5662
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/LoadImageCmdExecTest.java
@@ -0,0 +1,76 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.model.Image;
+
+import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+import com.github.dockerjava.utils.TestResources;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.nio.file.Files;
+import java.util.List;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.hamcrest.core.IsEqual.equalTo;
+
+@Test(groups = "integration")
+public class LoadImageCmdExecTest extends AbstractNettyDockerClientTest {
+
+    private String expectedImageId;
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+        expectedImageId = "sha256:56031f66eb0cef2e2e5cb2d1dabafaa0ebcd0a18a507d313b5bdb8c0472c5eba";
+        if (findImageWithId(expectedImageId, dockerClient.listImagesCmd().exec()) != null) {
+            dockerClient.removeImageCmd(expectedImageId).exec();
+        }
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        dockerClient.removeImageCmd(expectedImageId).exec();
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void loadImageFromTar() throws Exception {
+        try (InputStream uploadStream = Files.newInputStream(TestResources.getApiImagesLoadTestTarball())) {
+            dockerClient.loadImageCmd(uploadStream).exec();
+        }
+
+        final Image image = findImageWithId(expectedImageId, dockerClient.listImagesCmd().exec());
+
+        assertThat("Can't find expected image after loading from a tar archive!", image, notNullValue());
+        assertThat("Image after loading from a tar archive has wrong tags!",
+                asList(image.getRepoTags()), equalTo(singletonList("docker-java/load:1.0")));
+    }
+
+    private Image findImageWithId(final String id, final List<Image> images) {
+        for (Image image : images) {
+            if (id.equals(image.getId())) {
+                return image;
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/utils/TestResources.java b/src/test/java/com/github/dockerjava/utils/TestResources.java
new file mode 100644
index 000000000..35ece680f
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/utils/TestResources.java
@@ -0,0 +1,14 @@
+package com.github.dockerjava.utils;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class TestResources {
+
+    private TestResources() {
+    }
+
+    public static Path getApiImagesLoadTestTarball() {
+        return Paths.get("src/test/resources/api/images/load/image.tar");
+    }
+}
diff --git a/src/test/resources/api/images/load/image.tar b/src/test/resources/api/images/load/image.tar
new file mode 100644
index 0000000000000000000000000000000000000000..6f2f08f9e945811249c0027eec3a0de531ead521
GIT binary patch
literal 11264
zcmeHNU2oeq6!r6dg~7dSfMfHUl7KyQX@C|e=Az9ybU_eM{7BTwQXt7e1H=D)SGJQl
zZc`_<5_AalV2kACC3%i6DISUw%9s-|cByxSTE>L%Owu^wR>{~?N(lB&lGIZk5$z(u
zm`oMJ80$#kQE&T&F~>@X9#m<s&HqInp^7PJi%QkQL~(+9eX-s3?iSO!(G_%QS5J$f
ztqpEhe@|4O@5=v&gLm&=kN^5!cQL_Oa=yv?RT_|Ey<7ZK%(?9Kcjn}Kow_P}=KPc4
zlc0QscKH9v5ZF2XKh<TiWlUS*pJE|5<DX$3;(rUQofOYdW>JE6eGJe5nab(LwazFe
zau2ILEDs4!h)gIO#)?WQW5)h%P0OOuS>Y-$_Hi0x?&FvlDJ&;mOD!~IX+#+Dm@DpL
ztWzs36A|a|mLRZnOgax4g3xt$C*as;rzn}BS7qH4dg3-(0PC0K1lnGeLHh4{(GR$L
z(KOney>Dz*pv3FEc58X%wD~&IRWO8=<zaJqeLp^T#ce-})VMIvp_TnXae<N}^!CN!
zt3O85x*FxB(fO!Ovm#kbUng%07Fo+A+@j+F+MfXKM`#4eQGEtO*)#C->u*JQ{(FCa
z{PtttXSqv+RVt<M!WUaXX(YJhk&RW%JT*iTWw6EEF`|v;k#P~DD&kV5QRKa0)b+EX
zPlnBxrfu`}M4z_sLPH<Qd^&M8N{VTo570kl^*Jj}UuG@8P<&7{)#Z7a6@cK<VqE+=
z&2s4TGWkZQE?-rj50EX*XIGtExT?-dpaPL0A;T5Z&zIjNR*wg}uFP51IMYn4mRCKo
zk^_4s5QFlpn0`U?PNtmT<R?O4*NK0W>q}P++db5s*Ov94w|m0d@BaiQsj&Xv3227}
zi|M>Wf8TPog@2%*-tbQ;?Ef)gBJlq$EW6IrzjW;}_zMUG1Ofs9f&T*nLSoovOX*T<
zoTrXDVNz;|)v5Mc!?A#|Sd&N#tSloe6{$@l1N(AngiH0X1O12NP5p-`9M=CQd3<K*
zj&0wwmQo&js~rR|kk*0#c9#J504eout?VqTo3a8;@@V!TZFVW+o}^IoN>J?Ynf@b+
ziE~gB*Hoqfs>-tQAUn-ab9vrsQ45iw1~JNJ-k)R^%8pQdrm2vLW1M;d$Jf#*2WQj~
z7cm7T*~Lz!B-TVyr5#Cyj%}<(Y?x&<qDF(*%$d{Zc>auat%)u&@9O40>-di@NZa=R
zjFPppVE8_O!1^EbpC5($LG@sA*k2u*pibTeAxPi3^YT!iE`oG9Kka?e7a9&Yv`yf^
zxjj92)5?Ymi|!Oih~(oSXFQ1hUIkp$87vf;s~=YL{?^;#pYZE%g4(ZW+W40u#Q*&P
m-obLVI&Hg&(018vgS3M~;rTp-;||<}ssVw3KtSLz5%>?llNJ&H

literal 0
HcmV?d00001


From 8be5180513b65be8da2444a71de62f7dba5106c3 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 14 Jul 2016 22:44:12 +0300
Subject: [PATCH 0593/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1f16ec14..4d28a9319 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,8 @@ Change Log
 ---
 
 All changes
-* [#630 ] (https://github.com/docker-java/docker-java/pull/630) Fix: Second execution of a docker command in Netty implementation always fails 
+* [#627] (https://github.com/docker-java/docker-java/pull/627) Implementation of POST /images/load endpoint 
+* [#630] (https://github.com/docker-java/docker-java/pull/630) Fix: Second execution of a docker command in Netty implementation always fails 
 * [#596] (https://github.com/docker-java/docker-java/pull/596) Refactor configuration of SSL to allow override with custom config 
 * [#529] (https://github.com/docker-java/docker-java/pull/529) Refactor CertUtils. Support ECDSA and PrivateKey 
 * [#593] (https://github.com/docker-java/docker-java/pull/593) Added Device.parse() method with simple verification.

From 369a12e410cd4c1fe7d58dde8b5a49920330c4e4 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 15 Jul 2016 14:27:25 +0300
Subject: [PATCH 0594/1272] Try cache coverity (#636)

---
 .travis.yml                             | 1 +
 .travis/travisci_build_coverity_scan.sh | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 31a062e79..bb93f49b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,7 @@ env:
 cache:
   directories:
   - $HOME/.travis_cache
+  - /tmp/coverity-cache
   - $HOME/.m2 # install will pollute it
 
 before_install:
diff --git a/.travis/travisci_build_coverity_scan.sh b/.travis/travisci_build_coverity_scan.sh
index 13af2c275..160945f40 100755
--- a/.travis/travisci_build_coverity_scan.sh
+++ b/.travis/travisci_build_coverity_scan.sh
@@ -11,7 +11,7 @@ echo -e "\033[33;1mNote: COVERITY_SCAN_PROJECT_NAME and COVERITY_SCAN_TOKEN are
 [ -z "$COVERITY_SCAN_TOKEN" ] && echo "ERROR: COVERITY_SCAN_TOKEN must be set" && exit 1
 
 PLATFORM=`uname`
-TOOL_ARCHIVE=/tmp/cov-analysis-${PLATFORM}.tgz
+TOOL_ARCHIVE=/tmp/coverity-cache/cov-analysis-${PLATFORM}.tgz
 TOOL_URL=https://scan.coverity.com/download/${PLATFORM}
 TOOL_BASE=/tmp/coverity-scan-analysis
 UPLOAD_URL="https://scan.coverity.com/builds"
@@ -49,18 +49,20 @@ else
   fi
 fi
 
+mkdir -p /tmp/coverity-cache || :
+
 if [ ! -d $TOOL_BASE ]; then
   # Download Coverity Scan Analysis Tool
   if [ ! -e $TOOL_ARCHIVE ]; then
     echo -e "\033[33;1mDownloading Coverity Scan Analysis Tool...\033[0m"
-    wget -nv -O $TOOL_ARCHIVE $TOOL_URL --post-data "project=$COVERITY_SCAN_PROJECT_NAME&token=$COVERITY_SCAN_TOKEN"
+    wget -nvN -O $TOOL_ARCHIVE $TOOL_URL --post-data "project=$COVERITY_SCAN_PROJECT_NAME&token=$COVERITY_SCAN_TOKEN"
   fi
 
   # Extract Coverity Scan Analysis Tool
   echo -e "\033[33;1mExtracting Coverity Scan Analysis Tool...\033[0m"
   mkdir -p $TOOL_BASE
   pushd $TOOL_BASE
-  tar xzf $TOOL_ARCHIVE
+    tar -xf $TOOL_ARCHIVE
   popd
 fi
 

From a87b7894272ff3cb9ffecadd6848fdb45ad777a7 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 15 Jul 2016 14:34:19 +0300
Subject: [PATCH 0595/1272] Update travisci_build_coverity_scan.sh

---
 .travis/travisci_build_coverity_scan.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/travisci_build_coverity_scan.sh b/.travis/travisci_build_coverity_scan.sh
index 160945f40..a4d978e22 100755
--- a/.travis/travisci_build_coverity_scan.sh
+++ b/.travis/travisci_build_coverity_scan.sh
@@ -55,7 +55,7 @@ if [ ! -d $TOOL_BASE ]; then
   # Download Coverity Scan Analysis Tool
   if [ ! -e $TOOL_ARCHIVE ]; then
     echo -e "\033[33;1mDownloading Coverity Scan Analysis Tool...\033[0m"
-    wget -nvN -O $TOOL_ARCHIVE $TOOL_URL --post-data "project=$COVERITY_SCAN_PROJECT_NAME&token=$COVERITY_SCAN_TOKEN"
+    wget -nv -N -O $TOOL_ARCHIVE $TOOL_URL --post-data "project=$COVERITY_SCAN_PROJECT_NAME&token=$COVERITY_SCAN_TOKEN"
   fi
 
   # Extract Coverity Scan Analysis Tool

From 7bcf6fbe2f561e51d45727b4dac9773f4d162f2f Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 15 Jul 2016 14:52:36 +0300
Subject: [PATCH 0596/1272] Update travisci_build_coverity_scan.sh

---
 .travis/travisci_build_coverity_scan.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis/travisci_build_coverity_scan.sh b/.travis/travisci_build_coverity_scan.sh
index a4d978e22..8d0fff04b 100755
--- a/.travis/travisci_build_coverity_scan.sh
+++ b/.travis/travisci_build_coverity_scan.sh
@@ -62,6 +62,9 @@ if [ ! -d $TOOL_BASE ]; then
   echo -e "\033[33;1mExtracting Coverity Scan Analysis Tool...\033[0m"
   mkdir -p $TOOL_BASE
   pushd $TOOL_BASE
+    du -sh $TOOL_ARCHIVE
+    file $TOOL_ARCHIVE
+    ls -la $TOOL_ARCHIVE
     tar -xf $TOOL_ARCHIVE
   popd
 fi

From a57fec6f7fa10645589b3b5b9d5e5ea7d2590254 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 15 Jul 2016 17:25:34 +0300
Subject: [PATCH 0597/1272] Add second run that should be successfull

@coverity fails without any clear reason.
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index bb93f49b5..a8cbe29e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,7 @@ env:
     - COVERITY_SCAN_NOTIFICATION_EMAIL="kanstantsin.sha@gmail.com"
 
   matrix:
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" DEPLOY=true CODECOV=true
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" DEPLOY=true COVERITY=true CODECOV=true
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty"
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.10.3-0~trusty"

From 236e1be53547f86bf279fbbc4ec8daef6e8cf83e Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 22 Jul 2016 00:56:00 +0300
Subject: [PATCH 0598/1272] Try debug bad travis download

---
 .travis/travisci_build_coverity_scan.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis/travisci_build_coverity_scan.sh b/.travis/travisci_build_coverity_scan.sh
index 8d0fff04b..6bf9a9b1f 100755
--- a/.travis/travisci_build_coverity_scan.sh
+++ b/.travis/travisci_build_coverity_scan.sh
@@ -64,6 +64,7 @@ if [ ! -d $TOOL_BASE ]; then
   pushd $TOOL_BASE
     du -sh $TOOL_ARCHIVE
     file $TOOL_ARCHIVE
+    file $TOOL_ARCHIVE | grep HTML && cat $TOOL_ARCHIVE || :
     ls -la $TOOL_ARCHIVE
     tar -xf $TOOL_ARCHIVE
   popd

From 5dbde940d32b02c57b6c55e87be455846d511eac Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 22 Jul 2016 00:59:46 +0300
Subject: [PATCH 0599/1272] Fix IT run when it shouldn't

CSV and not list.
---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5842ac320..130977ba3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -387,8 +387,7 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>${maven-surefire-plugin.version}</version>
 				<configuration>
-					<excludedGroups>integration</excludedGroups>
-					<excludedGroups>integration-auth</excludedGroups>
+					<excludedGroups>integration,integration-auth</excludedGroups>
 				</configuration>
 			</plugin>
 

From 4db9bee87c58e564479ed55a4929f3e1fa4662a1 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 22 Jul 2016 02:08:13 +0300
Subject: [PATCH 0600/1272] fix concurrency issue

---
 .../exec/AttachContainerCmdExecTest.java      | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
index 675c11177..7daa59b25 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.netty.exec;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.isEmptyString;
@@ -70,7 +71,7 @@ public void onNext(Frame frame) {
         };
 
         dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
-                .withLogs(true).exec(callback).awaitCompletion(10, TimeUnit.SECONDS);
+                .withLogs(true).exec(callback).awaitCompletion(10, SECONDS);
         callback.close();
 
         assertThat(callback.toString(), containsString(snippet));
@@ -81,33 +82,40 @@ public void attachContainerWithStdin() throws Exception {
 
         String snippet = "hello world";
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("/bin/sh", "-c", "read line && echo $line")
-                .withTty(false).withStdinOpen(true).exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCmd("/bin/sh", "-c", "sleep 1 && read line && echo $line")
+                .withTty(false)
+                .withStdinOpen(true)
+                .exec();
 
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
+        Thread.sleep(SECONDS.toMillis(3)); //wait bash initialisation
+
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
         assertTrue(inspectContainerResponse.getState().getRunning());
 
         AttachContainerTestCallback callback = new AttachContainerTestCallback() {
-
             @Override
             public void onNext(Frame frame) {
                 assertEquals(frame.getStreamType(), StreamType.STDOUT);
                 super.onNext(frame);
-            };
+            }
         };
 
         InputStream stdin = new ByteArrayInputStream((snippet + "\n").getBytes());
 
-        dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
+        dockerClient.attachContainerCmd(container.getId())
+                .withStdErr(true)
+                .withStdOut(true)
+                .withFollowStream(true)
                 .withStdIn(stdin)
                 .exec(callback)
-                .awaitCompletion(5, TimeUnit.SECONDS);
+                .awaitCompletion(15, SECONDS);
         callback.close();
 
         assertThat(callback.toString(), containsString(snippet));
@@ -141,7 +149,7 @@ public void onNext(Frame frame) {
                 .withStdOut(true)
                 .withFollowStream(true)
                 .exec(callback)
-                .awaitCompletion(10, TimeUnit.SECONDS);
+                .awaitCompletion(10, SECONDS);
         callback.close();
 
         // HexDump.dump(collectFramesCallback.toString().getBytes(), 0, System.out, 0);

From 582331a85ad9bc529b4d8a37d1d80d286bd57b25 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 22 Jul 2016 02:48:09 +0300
Subject: [PATCH 0601/1272] Verify coverity before not downloading it

---
 .travis/travisci_build_coverity_scan.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.travis/travisci_build_coverity_scan.sh b/.travis/travisci_build_coverity_scan.sh
index 6bf9a9b1f..a73c66536 100755
--- a/.travis/travisci_build_coverity_scan.sh
+++ b/.travis/travisci_build_coverity_scan.sh
@@ -52,6 +52,13 @@ fi
 mkdir -p /tmp/coverity-cache || :
 
 if [ ! -d $TOOL_BASE ]; then
+
+  # verify that binary is right
+  if file $TOOL_ARCHIVE | grep HTML ; then
+    echo "Removing $TOOL_ARCHIVE"
+    rm -f $TOOL_ARCHIVE
+  fi
+  
   # Download Coverity Scan Analysis Tool
   if [ ! -e $TOOL_ARCHIVE ]; then
     echo -e "\033[33;1mDownloading Coverity Scan Analysis Tool...\033[0m"

From eacea85d70e689e03407572ff982983ecea0c640 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 22 Jul 2016 03:23:56 +0300
Subject: [PATCH 0602/1272] Don't spam with warnings

@coverity using bsd tar??
---
 .travis/travisci_build_coverity_scan.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/travisci_build_coverity_scan.sh b/.travis/travisci_build_coverity_scan.sh
index a73c66536..7f30638e1 100755
--- a/.travis/travisci_build_coverity_scan.sh
+++ b/.travis/travisci_build_coverity_scan.sh
@@ -73,7 +73,7 @@ if [ ! -d $TOOL_BASE ]; then
     file $TOOL_ARCHIVE
     file $TOOL_ARCHIVE | grep HTML && cat $TOOL_ARCHIVE || :
     ls -la $TOOL_ARCHIVE
-    tar -xf $TOOL_ARCHIVE
+    tar -xf $TOOL_ARCHIVE | grep -v "Ignoring unknown extended header keyword"
   popd
 fi
 

From 59db6da8f40f7559c9e33968f5ba5a8283df3673 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 22 Jul 2016 03:26:10 +0300
Subject: [PATCH 0603/1272] Try limit threadCount

Default is parallel test, when there are many tests they become slow and fails.
---
 pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pom.xml b/pom.xml
index 130977ba3..7f51e9d99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -402,6 +402,9 @@
 							<goal>verify</goal>
 						</goals>
 						<configuration>
+							<useUnlimitedThreads>true</useUnlimitedThreads>
+							<perCoreThreadCount>true</perCoreThreadCount>
+							<threadCount>1</threadCount>
 							<groups>integration</groups>
  							<excludedGroups>integration-auth</excludedGroups>
 							<includes>

From 51fe92d8400541afb7fdeb170b55bfa91538920e Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 22 Jul 2016 03:54:24 +0300
Subject: [PATCH 0604/1272] Update travisci_build_coverity_scan.sh

---
 .travis/travisci_build_coverity_scan.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/travisci_build_coverity_scan.sh b/.travis/travisci_build_coverity_scan.sh
index 7f30638e1..933ddae37 100755
--- a/.travis/travisci_build_coverity_scan.sh
+++ b/.travis/travisci_build_coverity_scan.sh
@@ -73,7 +73,7 @@ if [ ! -d $TOOL_BASE ]; then
     file $TOOL_ARCHIVE
     file $TOOL_ARCHIVE | grep HTML && cat $TOOL_ARCHIVE || :
     ls -la $TOOL_ARCHIVE
-    tar -xf $TOOL_ARCHIVE | grep -v "Ignoring unknown extended header keyword"
+    tar -xf $TOOL_ARCHIVE |& grep -v "Ignoring unknown extended header keyword"
   popd
 fi
 

From 9578981d860478f0c8bda9d1da5b481bdd960c5d Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 22 Jul 2016 03:57:44 +0300
Subject: [PATCH 0605/1272] Update netty

Try fix #632
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7f51e9d99..1d4328f9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
 		<!-- test dependencies -->
 		<logback.version>1.1.7</logback.version>
 		<testng.version>6.9.10</testng.version>
-		<netty.version>4.1.1.Final</netty.version>
+		<netty.version>4.1.3.Final</netty.version>
 		<hamcrest.library.version>1.3</hamcrest.library.version>
 		<hamcrest.jpa-matchers>1.8</hamcrest.jpa-matchers>
 		<lambdaj.version>2.3.3</lambdaj.version>

From 22fe7a6794c91f6a73988099eaf7e2f3e91bf25b Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 22 Jul 2016 04:18:14 +0300
Subject: [PATCH 0606/1272] Update travisci_build_coverity_scan.sh

---
 .travis/travisci_build_coverity_scan.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/travisci_build_coverity_scan.sh b/.travis/travisci_build_coverity_scan.sh
index 933ddae37..074d0a46f 100755
--- a/.travis/travisci_build_coverity_scan.sh
+++ b/.travis/travisci_build_coverity_scan.sh
@@ -73,7 +73,7 @@ if [ ! -d $TOOL_BASE ]; then
     file $TOOL_ARCHIVE
     file $TOOL_ARCHIVE | grep HTML && cat $TOOL_ARCHIVE || :
     ls -la $TOOL_ARCHIVE
-    tar -xf $TOOL_ARCHIVE |& grep -v "Ignoring unknown extended header keyword"
+    tar -xf $TOOL_ARCHIVE #|& grep -v "Ignoring unknown extended header keyword"
   popd
 fi
 

From 83ac192b85614c0263aebfcb5ef298d9a9cf0b52 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 22 Jul 2016 11:10:09 +0300
Subject: [PATCH 0607/1272] Name classes normally (#639)

* Name classes normally
---
 .../dockerjava/core/DockerClientBuilder.java  |   4 +-
 .../jaxrs/DockerCmdExecFactoryImpl.java       | 586 +-----------------
 .../jaxrs/JerseyDockerCmdExecFactory.java     | 583 +++++++++++++++++
 .../netty/DockerCmdExecFactoryImpl.java       | 585 +----------------
 .../netty/NettyDockerCmdExecFactory.java      | 586 ++++++++++++++++++
 .../netty/AbstractNettyDockerClientTest.java  |   2 +-
 6 files changed, 1182 insertions(+), 1164 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java

diff --git a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
index 743b8c2ef..991bdbb86 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
@@ -3,7 +3,7 @@
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
 import com.github.dockerjava.core.DefaultDockerClientConfig.Builder;
-import com.github.dockerjava.jaxrs.DockerCmdExecFactoryImpl;
+import com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory;
 
 public class DockerClientBuilder {
 
@@ -32,7 +32,7 @@ public static DockerClientBuilder getInstance(String serverUrl) {
     }
 
     public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() {
-        return new DockerCmdExecFactoryImpl();
+        return new JerseyDockerCmdExecFactory();
     }
 
     public DockerClientBuilder withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index 7e573a123..1d407e233 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -1,583 +1,9 @@
 package com.github.dockerjava.jaxrs;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.ProxySelector;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
-
-import javax.net.ssl.SSLContext;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.client.ClientResponseFilter;
-import javax.ws.rs.client.WebTarget;
-
-import com.github.dockerjava.api.command.UpdateContainerCmd;
-import com.github.dockerjava.core.SSLConfig;
-
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.glassfish.jersey.CommonProperties;
-import org.glassfish.jersey.apache.connector.ApacheClientProperties;
-import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
-import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.client.ClientProperties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
-import com.github.dockerjava.api.command.AttachContainerCmd;
-import com.github.dockerjava.api.command.AuthCmd;
-import com.github.dockerjava.api.command.BuildImageCmd;
-import com.github.dockerjava.api.command.CommitCmd;
-import com.github.dockerjava.api.command.ConnectToNetworkCmd;
-import com.github.dockerjava.api.command.ContainerDiffCmd;
-import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
-import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
-import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
-import com.github.dockerjava.api.command.CreateContainerCmd;
-import com.github.dockerjava.api.command.CreateImageCmd;
-import com.github.dockerjava.api.command.CreateNetworkCmd;
-import com.github.dockerjava.api.command.CreateVolumeCmd;
-import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
-import com.github.dockerjava.api.command.DockerCmdExecFactory;
-import com.github.dockerjava.api.command.EventsCmd;
-import com.github.dockerjava.api.command.ExecCreateCmd;
-import com.github.dockerjava.api.command.ExecStartCmd;
-import com.github.dockerjava.api.command.InfoCmd;
-import com.github.dockerjava.api.command.InspectContainerCmd;
-import com.github.dockerjava.api.command.InspectExecCmd;
-import com.github.dockerjava.api.command.InspectImageCmd;
-import com.github.dockerjava.api.command.InspectNetworkCmd;
-import com.github.dockerjava.api.command.InspectVolumeCmd;
-import com.github.dockerjava.api.command.KillContainerCmd;
-import com.github.dockerjava.api.command.ListContainersCmd;
-import com.github.dockerjava.api.command.ListImagesCmd;
-import com.github.dockerjava.api.command.ListNetworksCmd;
-import com.github.dockerjava.api.command.ListVolumesCmd;
-import com.github.dockerjava.api.command.LoadImageCmd;
-import com.github.dockerjava.api.command.LogContainerCmd;
-import com.github.dockerjava.api.command.PauseContainerCmd;
-import com.github.dockerjava.api.command.PingCmd;
-import com.github.dockerjava.api.command.PullImageCmd;
-import com.github.dockerjava.api.command.PushImageCmd;
-import com.github.dockerjava.api.command.RemoveContainerCmd;
-import com.github.dockerjava.api.command.RemoveImageCmd;
-import com.github.dockerjava.api.command.RemoveNetworkCmd;
-import com.github.dockerjava.api.command.RemoveVolumeCmd;
-import com.github.dockerjava.api.command.RestartContainerCmd;
-import com.github.dockerjava.api.command.SaveImageCmd;
-import com.github.dockerjava.api.command.SearchImagesCmd;
-import com.github.dockerjava.api.command.StartContainerCmd;
-import com.github.dockerjava.api.command.StatsCmd;
-import com.github.dockerjava.api.command.StopContainerCmd;
-import com.github.dockerjava.api.command.TagImageCmd;
-import com.github.dockerjava.api.command.TopContainerCmd;
-import com.github.dockerjava.api.command.UnpauseContainerCmd;
-import com.github.dockerjava.api.command.VersionCmd;
-import com.github.dockerjava.api.command.WaitContainerCmd;
-import com.github.dockerjava.api.command.RenameContainerCmd;
-import com.github.dockerjava.api.exception.DockerClientException;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.jaxrs.filter.JsonClientFilter;
-import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter;
-import com.github.dockerjava.jaxrs.filter.SelectiveLoggingFilter;
-
-//import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
-// see https://github.com/docker-java/docker-java/issues/196
-
-public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(DockerCmdExecFactoryImpl.class.getName());
-
-    private Client client;
-
-    private WebTarget baseResource;
-
-    private Integer readTimeout = null;
-
-    private Integer connectTimeout = null;
-
-    private Integer maxTotalConnections = null;
-
-    private Integer maxPerRouteConnections = null;
-
-    private ClientRequestFilter[] clientRequestFilters = null;
-
-    private ClientResponseFilter[] clientResponseFilters = null;
-
-    private DockerClientConfig dockerClientConfig;
-
-    private PoolingHttpClientConnectionManager connManager = null;
-
-    @Override
-    public void init(DockerClientConfig dockerClientConfig) {
-        checkNotNull(dockerClientConfig, "config was not specified");
-        this.dockerClientConfig = dockerClientConfig;
-
-        ClientConfig clientConfig = new ClientConfig();
-        clientConfig.connectorProvider(new ApacheConnectorProvider());
-        clientConfig.property(CommonProperties.FEATURE_AUTO_DISCOVERY_DISABLE, true);
-
-        clientConfig.register(ResponseStatusExceptionFilter.class);
-        clientConfig.register(JsonClientFilter.class);
-        clientConfig.register(JacksonJsonProvider.class);
-
-        // logging may disabled via log level
-        clientConfig.register(new SelectiveLoggingFilter(LOGGER, true));
-
-        if (readTimeout != null) {
-            clientConfig.property(ClientProperties.READ_TIMEOUT, readTimeout);
-        }
-
-        if (connectTimeout != null) {
-            clientConfig.property(ClientProperties.CONNECT_TIMEOUT, connectTimeout);
-        }
-
-        if (clientResponseFilters != null) {
-            for (ClientResponseFilter clientResponseFilter : clientResponseFilters) {
-                if (clientResponseFilter != null) {
-                    clientConfig.register(clientResponseFilter);
-                }
-            }
-        }
-
-        if (clientRequestFilters != null) {
-            for (ClientRequestFilter clientRequestFilter : clientRequestFilters) {
-                if (clientRequestFilter != null) {
-                    clientConfig.register(clientRequestFilter);
-                }
-            }
-        }
-
-        URI originalUri = dockerClientConfig.getDockerHost();
-
-        String protocol = null;
-
-        SSLContext sslContext = null;
-
-        try {
-            final SSLConfig sslConfig = dockerClientConfig.getSSLConfig();
-            if (sslConfig != null) {
-                sslContext = sslConfig.getSSLContext();
-            }
-        } catch (Exception ex) {
-            throw new DockerClientException("Error in SSL Configuration", ex);
-        }
-
-        if (sslContext != null) {
-            protocol = "https";
-        } else {
-            protocol = "http";
-        }
-
-        if (!originalUri.getScheme().equals("unix")) {
-
-            try {
-                originalUri = new URI(originalUri.toString().replaceFirst("tcp", protocol));
-            } catch (URISyntaxException e) {
-                throw new RuntimeException(e);
-            }
-
-            configureProxy(clientConfig, protocol);
-        }
-
-        connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(
-                originalUri, sslContext)) {
-
-            @Override
-            public void close() {
-                super.shutdown();
-            }
-
-            @Override
-            public void shutdown() {
-                // Disable shutdown of the pool. This will be done later, when this factory is closed
-                // This is a workaround for finalize method on jerseys ClientRuntime which
-                // closes the client and shuts down the connection pool when it is garbage collected
-            }
-        };
-
-        if (maxTotalConnections != null) {
-            connManager.setMaxTotal(maxTotalConnections);
-        }
-        if (maxPerRouteConnections != null) {
-            connManager.setDefaultMaxPerRoute(maxPerRouteConnections);
-        }
-
-        clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER, connManager);
-
-        // Configure connection pool timeout
-        // clientConfig.property(ApacheClientProperties.REQUEST_CONFIG, RequestConfig.custom()
-        // .setConnectionRequestTimeout(1000).build());
-
-        ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(clientConfig);
-
-        if (sslContext != null) {
-            clientBuilder.sslContext(sslContext);
-        }
-
-        client = clientBuilder.build();
-
-        baseResource = client.target(sanitizeUrl(originalUri).toString()).path(dockerClientConfig.getApiVersion().asWebPathPart());
-    }
-
-    private URI sanitizeUrl(URI originalUri) {
-        if (originalUri.getScheme().equals("unix")) {
-            return UnixConnectionSocketFactory.sanitizeUri(originalUri);
-        }
-        return originalUri;
-    }
-
-    private void configureProxy(ClientConfig clientConfig, String protocol) {
-
-        List<Proxy> proxies = ProxySelector.getDefault().select(dockerClientConfig.getDockerHost());
-
-        for (Proxy proxy : proxies) {
-            InetSocketAddress address = (InetSocketAddress) proxy.address();
-            if (address != null) {
-                String hostname = address.getHostName();
-                int port = address.getPort();
-
-                clientConfig.property(ClientProperties.PROXY_URI, "http://" + hostname + ":" + port);
-
-                String httpProxyUser = System.getProperty(protocol + ".proxyUser");
-                if (httpProxyUser != null) {
-                    clientConfig.property(ClientProperties.PROXY_USERNAME, httpProxyUser);
-                    String httpProxyPassword = System.getProperty(protocol + ".proxyPassword");
-                    if (httpProxyPassword != null) {
-                        clientConfig.property(ClientProperties.PROXY_PASSWORD, httpProxyPassword);
-                    }
-                }
-            }
-        }
-    }
-
-    private org.apache.http.config.Registry<ConnectionSocketFactory> getSchemeRegistry(final URI originalUri,
-            SSLContext sslContext) {
-        RegistryBuilder<ConnectionSocketFactory> registryBuilder = RegistryBuilder.create();
-        registryBuilder.register("http", PlainConnectionSocketFactory.getSocketFactory());
-        if (sslContext != null) {
-            registryBuilder.register("https", new SSLConnectionSocketFactory(sslContext));
-        }
-        registryBuilder.register("unix", new UnixConnectionSocketFactory(originalUri));
-        return registryBuilder.build();
-    }
-
-    protected WebTarget getBaseResource() {
-        checkNotNull(baseResource, "Factory not initialized, baseResource not set. You probably forgot to call init()!");
-        return baseResource;
-    }
-
-    protected DockerClientConfig getDockerClientConfig() {
-        checkNotNull(dockerClientConfig,
-                "Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!");
-        return dockerClientConfig;
-    }
-
-    @Override
-    public AuthCmd.Exec createAuthCmdExec() {
-        return new AuthCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InfoCmd.Exec createInfoCmdExec() {
-        return new InfoCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public PingCmd.Exec createPingCmdExec() {
-        return new PingCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public VersionCmd.Exec createVersionCmdExec() {
-        return new VersionCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public PullImageCmd.Exec createPullImageCmdExec() {
-        return new PullImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public PushImageCmd.Exec createPushImageCmdExec() {
-        return new PushImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public SaveImageCmd.Exec createSaveImageCmdExec() {
-        return new SaveImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CreateImageCmd.Exec createCreateImageCmdExec() {
-        return new CreateImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public LoadImageCmd.Exec createLoadImageCmdExec() {
-        return new LoadImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public SearchImagesCmd.Exec createSearchImagesCmdExec() {
-        return new SearchImagesCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RemoveImageCmd.Exec createRemoveImageCmdExec() {
-        return new RemoveImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ListImagesCmd.Exec createListImagesCmdExec() {
-        return new ListImagesCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectImageCmd.Exec createInspectImageCmdExec() {
-        return new InspectImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ListContainersCmd.Exec createListContainersCmdExec() {
-        return new ListContainersCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CreateContainerCmd.Exec createCreateContainerCmdExec() {
-        return new CreateContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public StartContainerCmd.Exec createStartContainerCmdExec() {
-        return new StartContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectContainerCmd.Exec createInspectContainerCmdExec() {
-        return new InspectContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ExecCreateCmd.Exec createExecCmdExec() {
-        return new ExecCreateCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
-        return new RemoveContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public WaitContainerCmd.Exec createWaitContainerCmdExec() {
-        return new WaitContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public AttachContainerCmd.Exec createAttachContainerCmdExec() {
-        return new AttachContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ExecStartCmd.Exec createExecStartCmdExec() {
-        return new ExecStartCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectExecCmd.Exec createInspectExecCmdExec() {
-        return new InspectExecCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public LogContainerCmd.Exec createLogContainerCmdExec() {
-        return new LogContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() {
-        return new CopyArchiveFromContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
-        return new CopyFileFromContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() {
-        return new CopyArchiveToContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public StopContainerCmd.Exec createStopContainerCmdExec() {
-        return new StopContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
-        return new ContainerDiffCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public KillContainerCmd.Exec createKillContainerCmdExec() {
-        return new KillContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public UpdateContainerCmd.Exec createUpdateContainerCmdExec() {
-        return new UpdateContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RenameContainerCmd.Exec createRenameContainerCmdExec() {
-        return new RenameContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RestartContainerCmd.Exec createRestartContainerCmdExec() {
-        return new RestartContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CommitCmd.Exec createCommitCmdExec() {
-        return new CommitCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public BuildImageCmd.Exec createBuildImageCmdExec() {
-        return new BuildImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public TopContainerCmd.Exec createTopContainerCmdExec() {
-        return new TopContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public TagImageCmd.Exec createTagImageCmdExec() {
-        return new TagImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public PauseContainerCmd.Exec createPauseContainerCmdExec() {
-        return new PauseContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
-        return new UnpauseContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public EventsCmd.Exec createEventsCmdExec() {
-        return new EventsCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public StatsCmd.Exec createStatsCmdExec() {
-        return new StatsCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
-        return new CreateVolumeCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectVolumeCmd.Exec createInspectVolumeCmdExec() {
-        return new InspectVolumeCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() {
-        return new RemoveVolumeCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ListVolumesCmd.Exec createListVolumesCmdExec() {
-        return new ListVolumesCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ListNetworksCmd.Exec createListNetworksCmdExec() {
-        return new ListNetworksCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectNetworkCmd.Exec createInspectNetworkCmdExec() {
-
-        return new InspectNetworkCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CreateNetworkCmd.Exec createCreateNetworkCmdExec() {
-
-        return new CreateNetworkCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() {
-
-        return new RemoveNetworkCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() {
-
-        return new ConnectToNetworkCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() {
-
-        return new DisconnectFromNetworkCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public void close() throws IOException {
-        checkNotNull(client, "Factory not initialized. You probably forgot to call init()!");
-        client.close();
-        connManager.close();
-    }
-
-    public DockerCmdExecFactoryImpl withReadTimeout(Integer readTimeout) {
-        this.readTimeout = readTimeout;
-        return this;
-    }
-
-    public DockerCmdExecFactoryImpl withConnectTimeout(Integer connectTimeout) {
-        this.connectTimeout = connectTimeout;
-        return this;
-    }
-
-    public DockerCmdExecFactoryImpl withMaxTotalConnections(Integer maxTotalConnections) {
-        this.maxTotalConnections = maxTotalConnections;
-        return this;
-    }
-
-    public DockerCmdExecFactoryImpl withMaxPerRouteConnections(Integer maxPerRouteConnections) {
-        this.maxPerRouteConnections = maxPerRouteConnections;
-        return this;
-    }
-
-    public DockerCmdExecFactoryImpl withClientResponseFilters(ClientResponseFilter... clientResponseFilter) {
-        this.clientResponseFilters = clientResponseFilter;
-        return this;
-    }
-
-    public DockerCmdExecFactoryImpl withClientRequestFilters(ClientRequestFilter... clientRequestFilters) {
-        this.clientRequestFilters = clientRequestFilters;
-        return this;
-    }
-
+/**
+ * @author Kanstantsin Shautsou
+ * @deprecated clashes with netty impl.
+ */
+@Deprecated
+public class DockerCmdExecFactoryImpl extends JerseyDockerCmdExecFactory {
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
new file mode 100644
index 000000000..3339a2696
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -0,0 +1,583 @@
+package com.github.dockerjava.jaxrs;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+
+import javax.net.ssl.SSLContext;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.client.ClientResponseFilter;
+import javax.ws.rs.client.WebTarget;
+
+import com.github.dockerjava.api.command.UpdateContainerCmd;
+import com.github.dockerjava.core.SSLConfig;
+
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.glassfish.jersey.CommonProperties;
+import org.glassfish.jersey.apache.connector.ApacheClientProperties;
+import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.ClientProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+import com.github.dockerjava.api.command.AttachContainerCmd;
+import com.github.dockerjava.api.command.AuthCmd;
+import com.github.dockerjava.api.command.BuildImageCmd;
+import com.github.dockerjava.api.command.CommitCmd;
+import com.github.dockerjava.api.command.ConnectToNetworkCmd;
+import com.github.dockerjava.api.command.ContainerDiffCmd;
+import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
+import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.api.command.CreateContainerCmd;
+import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.command.CreateVolumeCmd;
+import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
+import com.github.dockerjava.api.command.DockerCmdExecFactory;
+import com.github.dockerjava.api.command.EventsCmd;
+import com.github.dockerjava.api.command.ExecCreateCmd;
+import com.github.dockerjava.api.command.ExecStartCmd;
+import com.github.dockerjava.api.command.InfoCmd;
+import com.github.dockerjava.api.command.InspectContainerCmd;
+import com.github.dockerjava.api.command.InspectExecCmd;
+import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.InspectNetworkCmd;
+import com.github.dockerjava.api.command.InspectVolumeCmd;
+import com.github.dockerjava.api.command.KillContainerCmd;
+import com.github.dockerjava.api.command.ListContainersCmd;
+import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.command.ListVolumesCmd;
+import com.github.dockerjava.api.command.LoadImageCmd;
+import com.github.dockerjava.api.command.LogContainerCmd;
+import com.github.dockerjava.api.command.PauseContainerCmd;
+import com.github.dockerjava.api.command.PingCmd;
+import com.github.dockerjava.api.command.PullImageCmd;
+import com.github.dockerjava.api.command.PushImageCmd;
+import com.github.dockerjava.api.command.RemoveContainerCmd;
+import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.RemoveVolumeCmd;
+import com.github.dockerjava.api.command.RestartContainerCmd;
+import com.github.dockerjava.api.command.SaveImageCmd;
+import com.github.dockerjava.api.command.SearchImagesCmd;
+import com.github.dockerjava.api.command.StartContainerCmd;
+import com.github.dockerjava.api.command.StatsCmd;
+import com.github.dockerjava.api.command.StopContainerCmd;
+import com.github.dockerjava.api.command.TagImageCmd;
+import com.github.dockerjava.api.command.TopContainerCmd;
+import com.github.dockerjava.api.command.UnpauseContainerCmd;
+import com.github.dockerjava.api.command.VersionCmd;
+import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.api.command.RenameContainerCmd;
+import com.github.dockerjava.api.exception.DockerClientException;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.jaxrs.filter.JsonClientFilter;
+import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter;
+import com.github.dockerjava.jaxrs.filter.SelectiveLoggingFilter;
+
+//import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
+// see https://github.com/docker-java/docker-java/issues/196
+
+public class JerseyDockerCmdExecFactory implements DockerCmdExecFactory {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(JerseyDockerCmdExecFactory.class.getName());
+
+    private Client client;
+
+    private WebTarget baseResource;
+
+    private Integer readTimeout = null;
+
+    private Integer connectTimeout = null;
+
+    private Integer maxTotalConnections = null;
+
+    private Integer maxPerRouteConnections = null;
+
+    private ClientRequestFilter[] clientRequestFilters = null;
+
+    private ClientResponseFilter[] clientResponseFilters = null;
+
+    private DockerClientConfig dockerClientConfig;
+
+    private PoolingHttpClientConnectionManager connManager = null;
+
+    @Override
+    public void init(DockerClientConfig dockerClientConfig) {
+        checkNotNull(dockerClientConfig, "config was not specified");
+        this.dockerClientConfig = dockerClientConfig;
+
+        ClientConfig clientConfig = new ClientConfig();
+        clientConfig.connectorProvider(new ApacheConnectorProvider());
+        clientConfig.property(CommonProperties.FEATURE_AUTO_DISCOVERY_DISABLE, true);
+
+        clientConfig.register(ResponseStatusExceptionFilter.class);
+        clientConfig.register(JsonClientFilter.class);
+        clientConfig.register(JacksonJsonProvider.class);
+
+        // logging may disabled via log level
+        clientConfig.register(new SelectiveLoggingFilter(LOGGER, true));
+
+        if (readTimeout != null) {
+            clientConfig.property(ClientProperties.READ_TIMEOUT, readTimeout);
+        }
+
+        if (connectTimeout != null) {
+            clientConfig.property(ClientProperties.CONNECT_TIMEOUT, connectTimeout);
+        }
+
+        if (clientResponseFilters != null) {
+            for (ClientResponseFilter clientResponseFilter : clientResponseFilters) {
+                if (clientResponseFilter != null) {
+                    clientConfig.register(clientResponseFilter);
+                }
+            }
+        }
+
+        if (clientRequestFilters != null) {
+            for (ClientRequestFilter clientRequestFilter : clientRequestFilters) {
+                if (clientRequestFilter != null) {
+                    clientConfig.register(clientRequestFilter);
+                }
+            }
+        }
+
+        URI originalUri = dockerClientConfig.getDockerHost();
+
+        String protocol = null;
+
+        SSLContext sslContext = null;
+
+        try {
+            final SSLConfig sslConfig = dockerClientConfig.getSSLConfig();
+            if (sslConfig != null) {
+                sslContext = sslConfig.getSSLContext();
+            }
+        } catch (Exception ex) {
+            throw new DockerClientException("Error in SSL Configuration", ex);
+        }
+
+        if (sslContext != null) {
+            protocol = "https";
+        } else {
+            protocol = "http";
+        }
+
+        if (!originalUri.getScheme().equals("unix")) {
+
+            try {
+                originalUri = new URI(originalUri.toString().replaceFirst("tcp", protocol));
+            } catch (URISyntaxException e) {
+                throw new RuntimeException(e);
+            }
+
+            configureProxy(clientConfig, protocol);
+        }
+
+        connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(
+                originalUri, sslContext)) {
+
+            @Override
+            public void close() {
+                super.shutdown();
+            }
+
+            @Override
+            public void shutdown() {
+                // Disable shutdown of the pool. This will be done later, when this factory is closed
+                // This is a workaround for finalize method on jerseys ClientRuntime which
+                // closes the client and shuts down the connection pool when it is garbage collected
+            }
+        };
+
+        if (maxTotalConnections != null) {
+            connManager.setMaxTotal(maxTotalConnections);
+        }
+        if (maxPerRouteConnections != null) {
+            connManager.setDefaultMaxPerRoute(maxPerRouteConnections);
+        }
+
+        clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER, connManager);
+
+        // Configure connection pool timeout
+        // clientConfig.property(ApacheClientProperties.REQUEST_CONFIG, RequestConfig.custom()
+        // .setConnectionRequestTimeout(1000).build());
+
+        ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(clientConfig);
+
+        if (sslContext != null) {
+            clientBuilder.sslContext(sslContext);
+        }
+
+        client = clientBuilder.build();
+
+        baseResource = client.target(sanitizeUrl(originalUri).toString()).path(dockerClientConfig.getApiVersion().asWebPathPart());
+    }
+
+    private URI sanitizeUrl(URI originalUri) {
+        if (originalUri.getScheme().equals("unix")) {
+            return UnixConnectionSocketFactory.sanitizeUri(originalUri);
+        }
+        return originalUri;
+    }
+
+    private void configureProxy(ClientConfig clientConfig, String protocol) {
+
+        List<Proxy> proxies = ProxySelector.getDefault().select(dockerClientConfig.getDockerHost());
+
+        for (Proxy proxy : proxies) {
+            InetSocketAddress address = (InetSocketAddress) proxy.address();
+            if (address != null) {
+                String hostname = address.getHostName();
+                int port = address.getPort();
+
+                clientConfig.property(ClientProperties.PROXY_URI, "http://" + hostname + ":" + port);
+
+                String httpProxyUser = System.getProperty(protocol + ".proxyUser");
+                if (httpProxyUser != null) {
+                    clientConfig.property(ClientProperties.PROXY_USERNAME, httpProxyUser);
+                    String httpProxyPassword = System.getProperty(protocol + ".proxyPassword");
+                    if (httpProxyPassword != null) {
+                        clientConfig.property(ClientProperties.PROXY_PASSWORD, httpProxyPassword);
+                    }
+                }
+            }
+        }
+    }
+
+    private org.apache.http.config.Registry<ConnectionSocketFactory> getSchemeRegistry(final URI originalUri,
+            SSLContext sslContext) {
+        RegistryBuilder<ConnectionSocketFactory> registryBuilder = RegistryBuilder.create();
+        registryBuilder.register("http", PlainConnectionSocketFactory.getSocketFactory());
+        if (sslContext != null) {
+            registryBuilder.register("https", new SSLConnectionSocketFactory(sslContext));
+        }
+        registryBuilder.register("unix", new UnixConnectionSocketFactory(originalUri));
+        return registryBuilder.build();
+    }
+
+    protected WebTarget getBaseResource() {
+        checkNotNull(baseResource, "Factory not initialized, baseResource not set. You probably forgot to call init()!");
+        return baseResource;
+    }
+
+    protected DockerClientConfig getDockerClientConfig() {
+        checkNotNull(dockerClientConfig,
+                "Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!");
+        return dockerClientConfig;
+    }
+
+    @Override
+    public AuthCmd.Exec createAuthCmdExec() {
+        return new AuthCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InfoCmd.Exec createInfoCmdExec() {
+        return new InfoCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public PingCmd.Exec createPingCmdExec() {
+        return new PingCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public VersionCmd.Exec createVersionCmdExec() {
+        return new VersionCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public PullImageCmd.Exec createPullImageCmdExec() {
+        return new PullImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public PushImageCmd.Exec createPushImageCmdExec() {
+        return new PushImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public SaveImageCmd.Exec createSaveImageCmdExec() {
+        return new SaveImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CreateImageCmd.Exec createCreateImageCmdExec() {
+        return new CreateImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public LoadImageCmd.Exec createLoadImageCmdExec() {
+        return new LoadImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public SearchImagesCmd.Exec createSearchImagesCmdExec() {
+        return new SearchImagesCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveImageCmd.Exec createRemoveImageCmdExec() {
+        return new RemoveImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ListImagesCmd.Exec createListImagesCmdExec() {
+        return new ListImagesCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectImageCmd.Exec createInspectImageCmdExec() {
+        return new InspectImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ListContainersCmd.Exec createListContainersCmdExec() {
+        return new ListContainersCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CreateContainerCmd.Exec createCreateContainerCmdExec() {
+        return new CreateContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public StartContainerCmd.Exec createStartContainerCmdExec() {
+        return new StartContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectContainerCmd.Exec createInspectContainerCmdExec() {
+        return new InspectContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ExecCreateCmd.Exec createExecCmdExec() {
+        return new ExecCreateCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
+        return new RemoveContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public WaitContainerCmd.Exec createWaitContainerCmdExec() {
+        return new WaitContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public AttachContainerCmd.Exec createAttachContainerCmdExec() {
+        return new AttachContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ExecStartCmd.Exec createExecStartCmdExec() {
+        return new ExecStartCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectExecCmd.Exec createInspectExecCmdExec() {
+        return new InspectExecCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public LogContainerCmd.Exec createLogContainerCmdExec() {
+        return new LogContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() {
+        return new CopyArchiveFromContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
+        return new CopyFileFromContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() {
+        return new CopyArchiveToContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public StopContainerCmd.Exec createStopContainerCmdExec() {
+        return new StopContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
+        return new ContainerDiffCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public KillContainerCmd.Exec createKillContainerCmdExec() {
+        return new KillContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public UpdateContainerCmd.Exec createUpdateContainerCmdExec() {
+        return new UpdateContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RenameContainerCmd.Exec createRenameContainerCmdExec() {
+        return new RenameContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RestartContainerCmd.Exec createRestartContainerCmdExec() {
+        return new RestartContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CommitCmd.Exec createCommitCmdExec() {
+        return new CommitCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public BuildImageCmd.Exec createBuildImageCmdExec() {
+        return new BuildImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public TopContainerCmd.Exec createTopContainerCmdExec() {
+        return new TopContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public TagImageCmd.Exec createTagImageCmdExec() {
+        return new TagImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public PauseContainerCmd.Exec createPauseContainerCmdExec() {
+        return new PauseContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
+        return new UnpauseContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public EventsCmd.Exec createEventsCmdExec() {
+        return new EventsCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public StatsCmd.Exec createStatsCmdExec() {
+        return new StatsCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
+        return new CreateVolumeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectVolumeCmd.Exec createInspectVolumeCmdExec() {
+        return new InspectVolumeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() {
+        return new RemoveVolumeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ListVolumesCmd.Exec createListVolumesCmdExec() {
+        return new ListVolumesCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ListNetworksCmd.Exec createListNetworksCmdExec() {
+        return new ListNetworksCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectNetworkCmd.Exec createInspectNetworkCmdExec() {
+
+        return new InspectNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CreateNetworkCmd.Exec createCreateNetworkCmdExec() {
+
+        return new CreateNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() {
+
+        return new RemoveNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() {
+
+        return new ConnectToNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() {
+
+        return new DisconnectFromNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public void close() throws IOException {
+        checkNotNull(client, "Factory not initialized. You probably forgot to call init()!");
+        client.close();
+        connManager.close();
+    }
+
+    public JerseyDockerCmdExecFactory withReadTimeout(Integer readTimeout) {
+        this.readTimeout = readTimeout;
+        return this;
+    }
+
+    public JerseyDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) {
+        this.connectTimeout = connectTimeout;
+        return this;
+    }
+
+    public JerseyDockerCmdExecFactory withMaxTotalConnections(Integer maxTotalConnections) {
+        this.maxTotalConnections = maxTotalConnections;
+        return this;
+    }
+
+    public JerseyDockerCmdExecFactory withMaxPerRouteConnections(Integer maxPerRouteConnections) {
+        this.maxPerRouteConnections = maxPerRouteConnections;
+        return this;
+    }
+
+    public JerseyDockerCmdExecFactory withClientResponseFilters(ClientResponseFilter... clientResponseFilter) {
+        this.clientResponseFilters = clientResponseFilter;
+        return this;
+    }
+
+    public JerseyDockerCmdExecFactory withClientRequestFilters(ClientRequestFilter... clientRequestFilters) {
+        this.clientRequestFilters = clientRequestFilters;
+        return this;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
index dff69a228..25825d169 100644
--- a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
@@ -1,586 +1,9 @@
 package com.github.dockerjava.netty;
 
-import com.github.dockerjava.api.command.AttachContainerCmd;
-import com.github.dockerjava.api.command.AuthCmd;
-import com.github.dockerjava.api.command.BuildImageCmd;
-import com.github.dockerjava.api.command.CommitCmd;
-import com.github.dockerjava.api.command.ConnectToNetworkCmd;
-import com.github.dockerjava.api.command.ContainerDiffCmd;
-import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
-import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
-import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
-import com.github.dockerjava.api.command.CreateContainerCmd;
-import com.github.dockerjava.api.command.CreateImageCmd;
-import com.github.dockerjava.api.command.CreateNetworkCmd;
-import com.github.dockerjava.api.command.CreateVolumeCmd;
-import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
-import com.github.dockerjava.api.command.DockerCmdExecFactory;
-import com.github.dockerjava.api.command.EventsCmd;
-import com.github.dockerjava.api.command.ExecCreateCmd;
-import com.github.dockerjava.api.command.ExecStartCmd;
-import com.github.dockerjava.api.command.InfoCmd;
-import com.github.dockerjava.api.command.InspectContainerCmd;
-import com.github.dockerjava.api.command.InspectExecCmd;
-import com.github.dockerjava.api.command.InspectImageCmd;
-import com.github.dockerjava.api.command.InspectNetworkCmd;
-import com.github.dockerjava.api.command.InspectVolumeCmd;
-import com.github.dockerjava.api.command.KillContainerCmd;
-import com.github.dockerjava.api.command.ListContainersCmd;
-import com.github.dockerjava.api.command.ListImagesCmd;
-import com.github.dockerjava.api.command.ListNetworksCmd;
-import com.github.dockerjava.api.command.ListVolumesCmd;
-import com.github.dockerjava.api.command.LoadImageCmd;
-import com.github.dockerjava.api.command.LogContainerCmd;
-import com.github.dockerjava.api.command.PauseContainerCmd;
-import com.github.dockerjava.api.command.PingCmd;
-import com.github.dockerjava.api.command.PullImageCmd;
-import com.github.dockerjava.api.command.PushImageCmd;
-import com.github.dockerjava.api.command.RemoveContainerCmd;
-import com.github.dockerjava.api.command.RemoveImageCmd;
-import com.github.dockerjava.api.command.RemoveNetworkCmd;
-import com.github.dockerjava.api.command.RemoveVolumeCmd;
-import com.github.dockerjava.api.command.RestartContainerCmd;
-import com.github.dockerjava.api.command.SaveImageCmd;
-import com.github.dockerjava.api.command.SearchImagesCmd;
-import com.github.dockerjava.api.command.StartContainerCmd;
-import com.github.dockerjava.api.command.StatsCmd;
-import com.github.dockerjava.api.command.StopContainerCmd;
-import com.github.dockerjava.api.command.TagImageCmd;
-import com.github.dockerjava.api.command.TopContainerCmd;
-import com.github.dockerjava.api.command.UnpauseContainerCmd;
-import com.github.dockerjava.api.command.UpdateContainerCmd;
-import com.github.dockerjava.api.command.VersionCmd;
-import com.github.dockerjava.api.command.WaitContainerCmd;
-import com.github.dockerjava.api.command.RenameContainerCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.DockerClientImpl;
-import com.github.dockerjava.core.SSLConfig;
-import com.github.dockerjava.netty.exec.AttachContainerCmdExec;
-import com.github.dockerjava.netty.exec.AuthCmdExec;
-import com.github.dockerjava.netty.exec.BuildImageCmdExec;
-import com.github.dockerjava.netty.exec.CommitCmdExec;
-import com.github.dockerjava.netty.exec.ConnectToNetworkCmdExec;
-import com.github.dockerjava.netty.exec.ContainerDiffCmdExec;
-import com.github.dockerjava.netty.exec.CopyArchiveFromContainerCmdExec;
-import com.github.dockerjava.netty.exec.CopyArchiveToContainerCmdExec;
-import com.github.dockerjava.netty.exec.CopyFileFromContainerCmdExec;
-import com.github.dockerjava.netty.exec.CreateContainerCmdExec;
-import com.github.dockerjava.netty.exec.CreateImageCmdExec;
-import com.github.dockerjava.netty.exec.CreateNetworkCmdExec;
-import com.github.dockerjava.netty.exec.CreateVolumeCmdExec;
-import com.github.dockerjava.netty.exec.DisconnectFromNetworkCmdExec;
-import com.github.dockerjava.netty.exec.EventsCmdExec;
-import com.github.dockerjava.netty.exec.ExecCreateCmdExec;
-import com.github.dockerjava.netty.exec.ExecStartCmdExec;
-import com.github.dockerjava.netty.exec.InfoCmdExec;
-import com.github.dockerjava.netty.exec.InspectContainerCmdExec;
-import com.github.dockerjava.netty.exec.InspectExecCmdExec;
-import com.github.dockerjava.netty.exec.InspectImageCmdExec;
-import com.github.dockerjava.netty.exec.InspectNetworkCmdExec;
-import com.github.dockerjava.netty.exec.InspectVolumeCmdExec;
-import com.github.dockerjava.netty.exec.KillContainerCmdExec;
-import com.github.dockerjava.netty.exec.ListContainersCmdExec;
-import com.github.dockerjava.netty.exec.ListImagesCmdExec;
-import com.github.dockerjava.netty.exec.ListNetworksCmdExec;
-import com.github.dockerjava.netty.exec.ListVolumesCmdExec;
-import com.github.dockerjava.netty.exec.LoadImageCmdExec;
-import com.github.dockerjava.netty.exec.LogContainerCmdExec;
-import com.github.dockerjava.netty.exec.PauseContainerCmdExec;
-import com.github.dockerjava.netty.exec.PingCmdExec;
-import com.github.dockerjava.netty.exec.PullImageCmdExec;
-import com.github.dockerjava.netty.exec.PushImageCmdExec;
-import com.github.dockerjava.netty.exec.RemoveContainerCmdExec;
-import com.github.dockerjava.netty.exec.RemoveImageCmdExec;
-import com.github.dockerjava.netty.exec.RemoveNetworkCmdExec;
-import com.github.dockerjava.netty.exec.RemoveVolumeCmdExec;
-import com.github.dockerjava.netty.exec.RestartContainerCmdExec;
-import com.github.dockerjava.netty.exec.SaveImageCmdExec;
-import com.github.dockerjava.netty.exec.SearchImagesCmdExec;
-import com.github.dockerjava.netty.exec.StartContainerCmdExec;
-import com.github.dockerjava.netty.exec.StatsCmdExec;
-import com.github.dockerjava.netty.exec.StopContainerCmdExec;
-import com.github.dockerjava.netty.exec.TagImageCmdExec;
-import com.github.dockerjava.netty.exec.TopContainerCmdExec;
-import com.github.dockerjava.netty.exec.UnpauseContainerCmdExec;
-import com.github.dockerjava.netty.exec.UpdateContainerCmdExec;
-import com.github.dockerjava.netty.exec.VersionCmdExec;
-import com.github.dockerjava.netty.exec.WaitContainerCmdExec;
-import com.github.dockerjava.netty.exec.RenameContainerCmdExec;
-
-import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.epoll.EpollDomainSocketChannel;
-import io.netty.channel.epoll.EpollEventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.DuplexChannel;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.nio.NioSocketChannel;
-import io.netty.channel.unix.DomainSocketAddress;
-import io.netty.channel.unix.UnixChannel;
-import io.netty.handler.codec.http.HttpClientCodec;
-import io.netty.handler.logging.LoggingHandler;
-import io.netty.handler.ssl.SslHandler;
-import io.netty.util.concurrent.DefaultThreadFactory;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLParameters;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.security.Security;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
- * Experimental implementation of {@link DockerCmdExecFactory} that supports http connection hijacking that is needed to pass STDIN to the
- * container.
- *
- * To use it just pass an instance via {@link DockerClientImpl#withDockerCmdExecFactory(DockerCmdExecFactory)}
- *
- * @see https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#attach-to-a-container
- * @see https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#exec-start
- *
- *
- * @author Marcus Linke
+ * @author Kanstantsin Shautsou
+ * @deprecated old clashing name
  */
-public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
-
-    private static String threadPrefix = "dockerjava-netty";
-
-    /*
-     * useful links:
-     *
-     * http://stackoverflow.com/questions/33296749/netty-connect-to-unix-domain-socket-failed
-     * http://netty.io/wiki/native-transports.html
-     * https://github.com/netty/netty/blob/master/example/src/main/java/io/netty/example/http/snoop/HttpSnoopClient.java
-     * https://github.com/slandelle/netty-request-chunking/blob/master/src/test/java/slandelle/ChunkingTest.java
-     */
-
-    private DockerClientConfig dockerClientConfig;
-
-    private Bootstrap bootstrap;
-
-    private EventLoopGroup eventLoopGroup;
-
-    private NettyInitializer nettyInitializer;
-
-    private ChannelProvider channelProvider = new ChannelProvider() {
-        @Override
-        public DuplexChannel getChannel() {
-            DuplexChannel channel = connect();
-            channel.pipeline().addLast(new LoggingHandler(getClass()));
-            return channel;
-        }
-    };
-
-    @Override
-    public void init(DockerClientConfig dockerClientConfig) {
-        checkNotNull(dockerClientConfig, "config was not specified");
-        this.dockerClientConfig = dockerClientConfig;
-
-        bootstrap = new Bootstrap();
-
-        String scheme = dockerClientConfig.getDockerHost().getScheme();
-
-        if ("unix".equals(scheme)) {
-            nettyInitializer = new UnixDomainSocketInitializer();
-        } else if ("tcp".equals(scheme)) {
-            nettyInitializer = new InetSocketInitializer();
-        }
-
-        eventLoopGroup = nettyInitializer.init(bootstrap, dockerClientConfig);
-    }
-
-    private DuplexChannel connect() {
-        try {
-            return connect(bootstrap);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private DuplexChannel connect(final Bootstrap bootstrap) throws InterruptedException {
-        return nettyInitializer.connect(bootstrap);
-    }
-
-    private interface NettyInitializer {
-        EventLoopGroup init(final Bootstrap bootstrap, DockerClientConfig dockerClientConfig);
-
-        DuplexChannel connect(final Bootstrap bootstrap) throws InterruptedException;
-    }
-
-    private class UnixDomainSocketInitializer implements NettyInitializer {
-        @Override
-        public EventLoopGroup init(Bootstrap bootstrap, DockerClientConfig dockerClientConfig) {
-            EventLoopGroup epollEventLoopGroup = new EpollEventLoopGroup(0, new DefaultThreadFactory(threadPrefix));
-            bootstrap.group(epollEventLoopGroup).channel(EpollDomainSocketChannel.class)
-                    .handler(new ChannelInitializer<UnixChannel>() {
-                        @Override
-                        protected void initChannel(final UnixChannel channel) throws Exception {
-                            channel.pipeline().addLast(new HttpClientCodec());
-                        }
-                    });
-            return epollEventLoopGroup;
-        }
-
-        @Override
-        public DuplexChannel connect(Bootstrap bootstrap) throws InterruptedException {
-            return (DuplexChannel) bootstrap.connect(new DomainSocketAddress("/var/run/docker.sock")).sync().channel();
-        }
-    }
-
-    private class InetSocketInitializer implements NettyInitializer {
-        @Override
-        public EventLoopGroup init(Bootstrap bootstrap, final DockerClientConfig dockerClientConfig) {
-            EventLoopGroup nioEventLoopGroup = new NioEventLoopGroup(0, new DefaultThreadFactory(threadPrefix));
-
-            InetAddress addr = InetAddress.getLoopbackAddress();
-
-            final SocketAddress proxyAddress = new InetSocketAddress(addr, 8008);
-
-            Security.addProvider(new BouncyCastleProvider());
-
-            bootstrap.group(nioEventLoopGroup).channel(NioSocketChannel.class)
-                    .handler(new ChannelInitializer<SocketChannel>() {
-                        @Override
-                        protected void initChannel(final SocketChannel channel) throws Exception {
-                            // channel.pipeline().addLast(new
-                            // HttpProxyHandler(proxyAddress));
-                            channel.pipeline().addLast(new HttpClientCodec());
-                        }
-                    });
-
-            return nioEventLoopGroup;
-        }
-
-        @Override
-        public DuplexChannel connect(Bootstrap bootstrap) throws InterruptedException {
-            String host = dockerClientConfig.getDockerHost().getHost();
-            int port = dockerClientConfig.getDockerHost().getPort();
-
-            if (port == -1) {
-                throw new RuntimeException("no port configured for " + host);
-            }
-
-            DuplexChannel channel = (DuplexChannel) bootstrap.connect(host, port).sync().channel();
-
-            final SslHandler ssl = initSsl(dockerClientConfig);
-
-            if (ssl != null) {
-                channel.pipeline().addFirst(ssl);
-            }
-
-            return channel;
-        }
-
-        private SslHandler initSsl(DockerClientConfig dockerClientConfig) {
-            SslHandler ssl = null;
-
-            try {
-                String host = dockerClientConfig.getDockerHost().getHost();
-                int port = dockerClientConfig.getDockerHost().getPort();
-
-                final SSLConfig sslConfig = dockerClientConfig.getSSLConfig();
-
-                if (sslConfig != null && sslConfig.getSSLContext() != null) {
-
-                    SSLEngine engine = sslConfig.getSSLContext().createSSLEngine(host, port);
-                    engine.setUseClientMode(true);
-                    engine.setSSLParameters(enableHostNameVerification(engine.getSSLParameters()));
-
-                    // in the future we may use HostnameVerifier like here:
-                    // https://github.com/AsyncHttpClient/async-http-client/blob/1.8.x/src/main/java/com/ning/http/client/providers/netty/NettyConnectListener.java#L76
-
-                    ssl = new SslHandler(engine);
-                }
-
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-
-            return ssl;
-        }
-    }
-
-    protected DockerClientConfig getDockerClientConfig() {
-        checkNotNull(dockerClientConfig,
-                "Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!");
-        return dockerClientConfig;
-    }
-
-    public SSLParameters enableHostNameVerification(SSLParameters sslParameters) {
-        sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
-        return sslParameters;
-    }
-
-    @Override
-    public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() {
-        return new CopyArchiveFromContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() {
-        return new CopyArchiveToContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public AuthCmd.Exec createAuthCmdExec() {
-        return new AuthCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InfoCmd.Exec createInfoCmdExec() {
-        return new InfoCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public PingCmd.Exec createPingCmdExec() {
-        return new PingCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public VersionCmd.Exec createVersionCmdExec() {
-        return new VersionCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public PullImageCmd.Exec createPullImageCmdExec() {
-        return new PullImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public PushImageCmd.Exec createPushImageCmdExec() {
-        return new PushImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public SaveImageCmd.Exec createSaveImageCmdExec() {
-        return new SaveImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CreateImageCmd.Exec createCreateImageCmdExec() {
-        return new CreateImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public LoadImageCmd.Exec createLoadImageCmdExec() {
-        return new LoadImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public SearchImagesCmd.Exec createSearchImagesCmdExec() {
-        return new SearchImagesCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RemoveImageCmd.Exec createRemoveImageCmdExec() {
-        return new RemoveImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ListImagesCmd.Exec createListImagesCmdExec() {
-        return new ListImagesCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectImageCmd.Exec createInspectImageCmdExec() {
-        return new InspectImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ListContainersCmd.Exec createListContainersCmdExec() {
-        return new ListContainersCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CreateContainerCmd.Exec createCreateContainerCmdExec() {
-        return new CreateContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public StartContainerCmd.Exec createStartContainerCmdExec() {
-        return new StartContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectContainerCmd.Exec createInspectContainerCmdExec() {
-        return new InspectContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ExecCreateCmd.Exec createExecCmdExec() {
-        return new ExecCreateCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
-        return new RemoveContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public WaitContainerCmd.Exec createWaitContainerCmdExec() {
-        return new WaitContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public AttachContainerCmd.Exec createAttachContainerCmdExec() {
-        return new AttachContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ExecStartCmd.Exec createExecStartCmdExec() {
-        return new ExecStartCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectExecCmd.Exec createInspectExecCmdExec() {
-        return new InspectExecCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public LogContainerCmd.Exec createLogContainerCmdExec() {
-        return new LogContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
-        return new CopyFileFromContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public StopContainerCmd.Exec createStopContainerCmdExec() {
-        return new StopContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
-        return new ContainerDiffCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public KillContainerCmd.Exec createKillContainerCmdExec() {
-        return new KillContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public UpdateContainerCmd.Exec createUpdateContainerCmdExec() {
-        return new UpdateContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RenameContainerCmd.Exec createRenameContainerCmdExec() {
-        return new RenameContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RestartContainerCmd.Exec createRestartContainerCmdExec() {
-        return new RestartContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CommitCmd.Exec createCommitCmdExec() {
-        return new CommitCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public BuildImageCmd.Exec createBuildImageCmdExec() {
-        return new BuildImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public TopContainerCmd.Exec createTopContainerCmdExec() {
-        return new TopContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public TagImageCmd.Exec createTagImageCmdExec() {
-        return new TagImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public PauseContainerCmd.Exec createPauseContainerCmdExec() {
-        return new PauseContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
-        return new UnpauseContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public EventsCmd.Exec createEventsCmdExec() {
-        return new EventsCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public StatsCmd.Exec createStatsCmdExec() {
-        return new StatsCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
-        return new CreateVolumeCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectVolumeCmd.Exec createInspectVolumeCmdExec() {
-        return new InspectVolumeCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() {
-        return new RemoveVolumeCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ListVolumesCmd.Exec createListVolumesCmdExec() {
-        return new ListVolumesCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ListNetworksCmd.Exec createListNetworksCmdExec() {
-        return new ListNetworksCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectNetworkCmd.Exec createInspectNetworkCmdExec() {
-        return new InspectNetworkCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CreateNetworkCmd.Exec createCreateNetworkCmdExec() {
-        return new CreateNetworkCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() {
-        return new RemoveNetworkCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() {
-        return new ConnectToNetworkCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() {
-        return new DisconnectFromNetworkCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public void close() throws IOException {
-        checkNotNull(eventLoopGroup, "Factory not initialized. You probably forgot to call init()!");
-
-        eventLoopGroup.shutdownGracefully();
-    }
-
-    private WebTarget getBaseResource() {
-        return new WebTarget(channelProvider);
-    }
+@Deprecated
+public class DockerCmdExecFactoryImpl extends NettyDockerCmdExecFactory {
 }
diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
new file mode 100644
index 000000000..cead92e92
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -0,0 +1,586 @@
+package com.github.dockerjava.netty;
+
+import com.github.dockerjava.api.command.AttachContainerCmd;
+import com.github.dockerjava.api.command.AuthCmd;
+import com.github.dockerjava.api.command.BuildImageCmd;
+import com.github.dockerjava.api.command.CommitCmd;
+import com.github.dockerjava.api.command.ConnectToNetworkCmd;
+import com.github.dockerjava.api.command.ContainerDiffCmd;
+import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
+import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.api.command.CreateContainerCmd;
+import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.command.CreateVolumeCmd;
+import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
+import com.github.dockerjava.api.command.DockerCmdExecFactory;
+import com.github.dockerjava.api.command.EventsCmd;
+import com.github.dockerjava.api.command.ExecCreateCmd;
+import com.github.dockerjava.api.command.ExecStartCmd;
+import com.github.dockerjava.api.command.InfoCmd;
+import com.github.dockerjava.api.command.InspectContainerCmd;
+import com.github.dockerjava.api.command.InspectExecCmd;
+import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.InspectNetworkCmd;
+import com.github.dockerjava.api.command.InspectVolumeCmd;
+import com.github.dockerjava.api.command.KillContainerCmd;
+import com.github.dockerjava.api.command.ListContainersCmd;
+import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.command.ListVolumesCmd;
+import com.github.dockerjava.api.command.LoadImageCmd;
+import com.github.dockerjava.api.command.LogContainerCmd;
+import com.github.dockerjava.api.command.PauseContainerCmd;
+import com.github.dockerjava.api.command.PingCmd;
+import com.github.dockerjava.api.command.PullImageCmd;
+import com.github.dockerjava.api.command.PushImageCmd;
+import com.github.dockerjava.api.command.RemoveContainerCmd;
+import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.RemoveVolumeCmd;
+import com.github.dockerjava.api.command.RestartContainerCmd;
+import com.github.dockerjava.api.command.SaveImageCmd;
+import com.github.dockerjava.api.command.SearchImagesCmd;
+import com.github.dockerjava.api.command.StartContainerCmd;
+import com.github.dockerjava.api.command.StatsCmd;
+import com.github.dockerjava.api.command.StopContainerCmd;
+import com.github.dockerjava.api.command.TagImageCmd;
+import com.github.dockerjava.api.command.TopContainerCmd;
+import com.github.dockerjava.api.command.UnpauseContainerCmd;
+import com.github.dockerjava.api.command.UpdateContainerCmd;
+import com.github.dockerjava.api.command.VersionCmd;
+import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.api.command.RenameContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.DockerClientImpl;
+import com.github.dockerjava.core.SSLConfig;
+import com.github.dockerjava.netty.exec.AttachContainerCmdExec;
+import com.github.dockerjava.netty.exec.AuthCmdExec;
+import com.github.dockerjava.netty.exec.BuildImageCmdExec;
+import com.github.dockerjava.netty.exec.CommitCmdExec;
+import com.github.dockerjava.netty.exec.ConnectToNetworkCmdExec;
+import com.github.dockerjava.netty.exec.ContainerDiffCmdExec;
+import com.github.dockerjava.netty.exec.CopyArchiveFromContainerCmdExec;
+import com.github.dockerjava.netty.exec.CopyArchiveToContainerCmdExec;
+import com.github.dockerjava.netty.exec.CopyFileFromContainerCmdExec;
+import com.github.dockerjava.netty.exec.CreateContainerCmdExec;
+import com.github.dockerjava.netty.exec.CreateImageCmdExec;
+import com.github.dockerjava.netty.exec.CreateNetworkCmdExec;
+import com.github.dockerjava.netty.exec.CreateVolumeCmdExec;
+import com.github.dockerjava.netty.exec.DisconnectFromNetworkCmdExec;
+import com.github.dockerjava.netty.exec.EventsCmdExec;
+import com.github.dockerjava.netty.exec.ExecCreateCmdExec;
+import com.github.dockerjava.netty.exec.ExecStartCmdExec;
+import com.github.dockerjava.netty.exec.InfoCmdExec;
+import com.github.dockerjava.netty.exec.InspectContainerCmdExec;
+import com.github.dockerjava.netty.exec.InspectExecCmdExec;
+import com.github.dockerjava.netty.exec.InspectImageCmdExec;
+import com.github.dockerjava.netty.exec.InspectNetworkCmdExec;
+import com.github.dockerjava.netty.exec.InspectVolumeCmdExec;
+import com.github.dockerjava.netty.exec.KillContainerCmdExec;
+import com.github.dockerjava.netty.exec.ListContainersCmdExec;
+import com.github.dockerjava.netty.exec.ListImagesCmdExec;
+import com.github.dockerjava.netty.exec.ListNetworksCmdExec;
+import com.github.dockerjava.netty.exec.ListVolumesCmdExec;
+import com.github.dockerjava.netty.exec.LoadImageCmdExec;
+import com.github.dockerjava.netty.exec.LogContainerCmdExec;
+import com.github.dockerjava.netty.exec.PauseContainerCmdExec;
+import com.github.dockerjava.netty.exec.PingCmdExec;
+import com.github.dockerjava.netty.exec.PullImageCmdExec;
+import com.github.dockerjava.netty.exec.PushImageCmdExec;
+import com.github.dockerjava.netty.exec.RemoveContainerCmdExec;
+import com.github.dockerjava.netty.exec.RemoveImageCmdExec;
+import com.github.dockerjava.netty.exec.RemoveNetworkCmdExec;
+import com.github.dockerjava.netty.exec.RemoveVolumeCmdExec;
+import com.github.dockerjava.netty.exec.RestartContainerCmdExec;
+import com.github.dockerjava.netty.exec.SaveImageCmdExec;
+import com.github.dockerjava.netty.exec.SearchImagesCmdExec;
+import com.github.dockerjava.netty.exec.StartContainerCmdExec;
+import com.github.dockerjava.netty.exec.StatsCmdExec;
+import com.github.dockerjava.netty.exec.StopContainerCmdExec;
+import com.github.dockerjava.netty.exec.TagImageCmdExec;
+import com.github.dockerjava.netty.exec.TopContainerCmdExec;
+import com.github.dockerjava.netty.exec.UnpauseContainerCmdExec;
+import com.github.dockerjava.netty.exec.UpdateContainerCmdExec;
+import com.github.dockerjava.netty.exec.VersionCmdExec;
+import com.github.dockerjava.netty.exec.WaitContainerCmdExec;
+import com.github.dockerjava.netty.exec.RenameContainerCmdExec;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.epoll.EpollDomainSocketChannel;
+import io.netty.channel.epoll.EpollEventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.DuplexChannel;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.channel.unix.DomainSocketAddress;
+import io.netty.channel.unix.UnixChannel;
+import io.netty.handler.codec.http.HttpClientCodec;
+import io.netty.handler.logging.LoggingHandler;
+import io.netty.handler.ssl.SslHandler;
+import io.netty.util.concurrent.DefaultThreadFactory;
+
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLParameters;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.security.Security;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Experimental implementation of {@link DockerCmdExecFactory} that supports http connection hijacking that is needed to pass STDIN to the
+ * container.
+ *
+ * To use it just pass an instance via {@link DockerClientImpl#withDockerCmdExecFactory(DockerCmdExecFactory)}
+ *
+ * @see https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#attach-to-a-container
+ * @see https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#exec-start
+ *
+ *
+ * @author Marcus Linke
+ */
+public class NettyDockerCmdExecFactory implements DockerCmdExecFactory {
+
+    private static String threadPrefix = "dockerjava-netty";
+
+    /*
+     * useful links:
+     *
+     * http://stackoverflow.com/questions/33296749/netty-connect-to-unix-domain-socket-failed
+     * http://netty.io/wiki/native-transports.html
+     * https://github.com/netty/netty/blob/master/example/src/main/java/io/netty/example/http/snoop/HttpSnoopClient.java
+     * https://github.com/slandelle/netty-request-chunking/blob/master/src/test/java/slandelle/ChunkingTest.java
+     */
+
+    private DockerClientConfig dockerClientConfig;
+
+    private Bootstrap bootstrap;
+
+    private EventLoopGroup eventLoopGroup;
+
+    private NettyInitializer nettyInitializer;
+
+    private ChannelProvider channelProvider = new ChannelProvider() {
+        @Override
+        public DuplexChannel getChannel() {
+            DuplexChannel channel = connect();
+            channel.pipeline().addLast(new LoggingHandler(getClass()));
+            return channel;
+        }
+    };
+
+    @Override
+    public void init(DockerClientConfig dockerClientConfig) {
+        checkNotNull(dockerClientConfig, "config was not specified");
+        this.dockerClientConfig = dockerClientConfig;
+
+        bootstrap = new Bootstrap();
+
+        String scheme = dockerClientConfig.getDockerHost().getScheme();
+
+        if ("unix".equals(scheme)) {
+            nettyInitializer = new UnixDomainSocketInitializer();
+        } else if ("tcp".equals(scheme)) {
+            nettyInitializer = new InetSocketInitializer();
+        }
+
+        eventLoopGroup = nettyInitializer.init(bootstrap, dockerClientConfig);
+    }
+
+    private DuplexChannel connect() {
+        try {
+            return connect(bootstrap);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private DuplexChannel connect(final Bootstrap bootstrap) throws InterruptedException {
+        return nettyInitializer.connect(bootstrap);
+    }
+
+    private interface NettyInitializer {
+        EventLoopGroup init(final Bootstrap bootstrap, DockerClientConfig dockerClientConfig);
+
+        DuplexChannel connect(final Bootstrap bootstrap) throws InterruptedException;
+    }
+
+    private class UnixDomainSocketInitializer implements NettyInitializer {
+        @Override
+        public EventLoopGroup init(Bootstrap bootstrap, DockerClientConfig dockerClientConfig) {
+            EventLoopGroup epollEventLoopGroup = new EpollEventLoopGroup(0, new DefaultThreadFactory(threadPrefix));
+            bootstrap.group(epollEventLoopGroup).channel(EpollDomainSocketChannel.class)
+                    .handler(new ChannelInitializer<UnixChannel>() {
+                        @Override
+                        protected void initChannel(final UnixChannel channel) throws Exception {
+                            channel.pipeline().addLast(new HttpClientCodec());
+                        }
+                    });
+            return epollEventLoopGroup;
+        }
+
+        @Override
+        public DuplexChannel connect(Bootstrap bootstrap) throws InterruptedException {
+            return (DuplexChannel) bootstrap.connect(new DomainSocketAddress("/var/run/docker.sock")).sync().channel();
+        }
+    }
+
+    private class InetSocketInitializer implements NettyInitializer {
+        @Override
+        public EventLoopGroup init(Bootstrap bootstrap, final DockerClientConfig dockerClientConfig) {
+            EventLoopGroup nioEventLoopGroup = new NioEventLoopGroup(0, new DefaultThreadFactory(threadPrefix));
+
+            InetAddress addr = InetAddress.getLoopbackAddress();
+
+            final SocketAddress proxyAddress = new InetSocketAddress(addr, 8008);
+
+            Security.addProvider(new BouncyCastleProvider());
+
+            bootstrap.group(nioEventLoopGroup).channel(NioSocketChannel.class)
+                    .handler(new ChannelInitializer<SocketChannel>() {
+                        @Override
+                        protected void initChannel(final SocketChannel channel) throws Exception {
+                            // channel.pipeline().addLast(new
+                            // HttpProxyHandler(proxyAddress));
+                            channel.pipeline().addLast(new HttpClientCodec());
+                        }
+                    });
+
+            return nioEventLoopGroup;
+        }
+
+        @Override
+        public DuplexChannel connect(Bootstrap bootstrap) throws InterruptedException {
+            String host = dockerClientConfig.getDockerHost().getHost();
+            int port = dockerClientConfig.getDockerHost().getPort();
+
+            if (port == -1) {
+                throw new RuntimeException("no port configured for " + host);
+            }
+
+            DuplexChannel channel = (DuplexChannel) bootstrap.connect(host, port).sync().channel();
+
+            final SslHandler ssl = initSsl(dockerClientConfig);
+
+            if (ssl != null) {
+                channel.pipeline().addFirst(ssl);
+            }
+
+            return channel;
+        }
+
+        private SslHandler initSsl(DockerClientConfig dockerClientConfig) {
+            SslHandler ssl = null;
+
+            try {
+                String host = dockerClientConfig.getDockerHost().getHost();
+                int port = dockerClientConfig.getDockerHost().getPort();
+
+                final SSLConfig sslConfig = dockerClientConfig.getSSLConfig();
+
+                if (sslConfig != null && sslConfig.getSSLContext() != null) {
+
+                    SSLEngine engine = sslConfig.getSSLContext().createSSLEngine(host, port);
+                    engine.setUseClientMode(true);
+                    engine.setSSLParameters(enableHostNameVerification(engine.getSSLParameters()));
+
+                    // in the future we may use HostnameVerifier like here:
+                    // https://github.com/AsyncHttpClient/async-http-client/blob/1.8.x/src/main/java/com/ning/http/client/providers/netty/NettyConnectListener.java#L76
+
+                    ssl = new SslHandler(engine);
+                }
+
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+
+            return ssl;
+        }
+    }
+
+    protected DockerClientConfig getDockerClientConfig() {
+        checkNotNull(dockerClientConfig,
+                "Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!");
+        return dockerClientConfig;
+    }
+
+    public SSLParameters enableHostNameVerification(SSLParameters sslParameters) {
+        sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
+        return sslParameters;
+    }
+
+    @Override
+    public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() {
+        return new CopyArchiveFromContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() {
+        return new CopyArchiveToContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public AuthCmd.Exec createAuthCmdExec() {
+        return new AuthCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InfoCmd.Exec createInfoCmdExec() {
+        return new InfoCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public PingCmd.Exec createPingCmdExec() {
+        return new PingCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public VersionCmd.Exec createVersionCmdExec() {
+        return new VersionCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public PullImageCmd.Exec createPullImageCmdExec() {
+        return new PullImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public PushImageCmd.Exec createPushImageCmdExec() {
+        return new PushImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public SaveImageCmd.Exec createSaveImageCmdExec() {
+        return new SaveImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CreateImageCmd.Exec createCreateImageCmdExec() {
+        return new CreateImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public LoadImageCmd.Exec createLoadImageCmdExec() {
+        return new LoadImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public SearchImagesCmd.Exec createSearchImagesCmdExec() {
+        return new SearchImagesCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveImageCmd.Exec createRemoveImageCmdExec() {
+        return new RemoveImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ListImagesCmd.Exec createListImagesCmdExec() {
+        return new ListImagesCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectImageCmd.Exec createInspectImageCmdExec() {
+        return new InspectImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ListContainersCmd.Exec createListContainersCmdExec() {
+        return new ListContainersCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CreateContainerCmd.Exec createCreateContainerCmdExec() {
+        return new CreateContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public StartContainerCmd.Exec createStartContainerCmdExec() {
+        return new StartContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectContainerCmd.Exec createInspectContainerCmdExec() {
+        return new InspectContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ExecCreateCmd.Exec createExecCmdExec() {
+        return new ExecCreateCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
+        return new RemoveContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public WaitContainerCmd.Exec createWaitContainerCmdExec() {
+        return new WaitContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public AttachContainerCmd.Exec createAttachContainerCmdExec() {
+        return new AttachContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ExecStartCmd.Exec createExecStartCmdExec() {
+        return new ExecStartCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectExecCmd.Exec createInspectExecCmdExec() {
+        return new InspectExecCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public LogContainerCmd.Exec createLogContainerCmdExec() {
+        return new LogContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
+        return new CopyFileFromContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public StopContainerCmd.Exec createStopContainerCmdExec() {
+        return new StopContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
+        return new ContainerDiffCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public KillContainerCmd.Exec createKillContainerCmdExec() {
+        return new KillContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public UpdateContainerCmd.Exec createUpdateContainerCmdExec() {
+        return new UpdateContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RenameContainerCmd.Exec createRenameContainerCmdExec() {
+        return new RenameContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RestartContainerCmd.Exec createRestartContainerCmdExec() {
+        return new RestartContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CommitCmd.Exec createCommitCmdExec() {
+        return new CommitCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public BuildImageCmd.Exec createBuildImageCmdExec() {
+        return new BuildImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public TopContainerCmd.Exec createTopContainerCmdExec() {
+        return new TopContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public TagImageCmd.Exec createTagImageCmdExec() {
+        return new TagImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public PauseContainerCmd.Exec createPauseContainerCmdExec() {
+        return new PauseContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
+        return new UnpauseContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public EventsCmd.Exec createEventsCmdExec() {
+        return new EventsCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public StatsCmd.Exec createStatsCmdExec() {
+        return new StatsCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
+        return new CreateVolumeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectVolumeCmd.Exec createInspectVolumeCmdExec() {
+        return new InspectVolumeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() {
+        return new RemoveVolumeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ListVolumesCmd.Exec createListVolumesCmdExec() {
+        return new ListVolumesCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ListNetworksCmd.Exec createListNetworksCmdExec() {
+        return new ListNetworksCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectNetworkCmd.Exec createInspectNetworkCmdExec() {
+        return new InspectNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CreateNetworkCmd.Exec createCreateNetworkCmdExec() {
+        return new CreateNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() {
+        return new RemoveNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() {
+        return new ConnectToNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() {
+        return new DisconnectFromNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public void close() throws IOException {
+        checkNotNull(eventLoopGroup, "Factory not initialized. You probably forgot to call init()!");
+
+        eventLoopGroup.shutdownGracefully();
+    }
+
+    private WebTarget getBaseResource() {
+        return new WebTarget(channelProvider);
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/AbstractNettyDockerClientTest.java b/src/test/java/com/github/dockerjava/netty/AbstractNettyDockerClientTest.java
index 44a541808..57f7aa421 100644
--- a/src/test/java/com/github/dockerjava/netty/AbstractNettyDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/netty/AbstractNettyDockerClientTest.java
@@ -12,6 +12,6 @@ public abstract class AbstractNettyDockerClientTest extends AbstractDockerClient
 
     @Override
     protected TestDockerCmdExecFactory initTestDockerCmdExecFactory() {
-        return new TestDockerCmdExecFactory(new DockerCmdExecFactoryImpl());
+        return new TestDockerCmdExecFactory(new NettyDockerCmdExecFactory());
     }
 }

From e8b8519bbfb32cc1c5f3b6533b8b32fe7950103a Mon Sep 17 00:00:00 2001
From: tjlee <v.chernov@crystals.ru>
Date: Fri, 29 Jul 2016 17:11:02 +0300
Subject: [PATCH 0608/1272] [tests] Added integration tests for pause / unpause
 commands (#647)

* [tests] Added integration tests for pause / unpause commands
* [tests] added missing netty tests; fixed javadoc text; fixed annotations;
---
 .../core/command/PauseCmdImplTest.java        | 103 +++++++++++++++
 .../core/command/UnpauseCmdImplTest.java      | 118 ++++++++++++++++++
 .../netty/exec/PauseCmdImplTest.java          | 103 +++++++++++++++
 .../netty/exec/UnpauseCmdImplTest.java        | 118 ++++++++++++++++++
 .../dockerjava/utils/ContainerUtils.java      |  70 +++++++++++
 5 files changed, 512 insertions(+)
 create mode 100644 src/test/java/com/github/dockerjava/core/command/PauseCmdImplTest.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/UnpauseCmdImplTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/PauseCmdImplTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/UnpauseCmdImplTest.java
 create mode 100644 src/test/java/com/github/dockerjava/utils/ContainerUtils.java

diff --git a/src/test/java/com/github/dockerjava/core/command/PauseCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PauseCmdImplTest.java
new file mode 100644
index 000000000..f100c4f89
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/PauseCmdImplTest.java
@@ -0,0 +1,103 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.InternalServerErrorException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+import com.github.dockerjava.utils.ContainerUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+@Test(groups = {"integration", "ignoreInCircleCi"})
+public class PauseCmdImplTest extends AbstractDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(PauseCmdImplTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void pauseRunningContainer() {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        ContainerUtils.startContainer(dockerClient, container);
+
+        ContainerUtils.pauseContainer(dockerClient, container);
+    }
+
+    @Test(expectedExceptions = NotFoundException.class)
+    public void pauseNonExistingContainer() {
+
+        dockerClient.pauseContainerCmd("non-existing").exec();
+    }
+
+    @Test(expectedExceptions = InternalServerErrorException.class)
+    public void pauseStoppedContainer() {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        ContainerUtils.startContainer(dockerClient, container);
+
+        ContainerUtils.stopContainer(dockerClient, container);
+
+        dockerClient.pauseContainerCmd(container.getId()).exec();
+    }
+
+    @Test(expectedExceptions = InternalServerErrorException.class)
+    public void pausePausedContainer() {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        ContainerUtils.startContainer(dockerClient, container);
+
+        ContainerUtils.pauseContainer(dockerClient, container);
+
+        dockerClient.pauseContainerCmd(container.getId()).exec();
+    }
+
+    @Test(expectedExceptions = InternalServerErrorException.class)
+    public void pauseCreatedContainer() {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.pauseContainerCmd(container.getId()).exec();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/UnpauseCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/UnpauseCmdImplTest.java
new file mode 100644
index 000000000..f640c4182
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/UnpauseCmdImplTest.java
@@ -0,0 +1,118 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.InternalServerErrorException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+import com.github.dockerjava.utils.ContainerUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+@Test(groups = {"integration", "ignoreInCircleCi"})
+public class UnpauseCmdImplTest extends AbstractDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(UnpauseCmdImplTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void unpausePausedContainer() {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        ContainerUtils.startContainer(dockerClient, container);
+
+        ContainerUtils.pauseContainer(dockerClient, container);
+
+        ContainerUtils.unpaseContainer(dockerClient, container);
+    }
+
+    @Test(expectedExceptions = InternalServerErrorException.class)
+    public void unpauseRunningContainer() {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        ContainerUtils.startContainer(dockerClient, container);
+
+        dockerClient.unpauseContainerCmd(container.getId()).exec();
+    }
+
+    @Test(expectedExceptions = InternalServerErrorException.class)
+    public void unpauseStoppedContainer() {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        ContainerUtils.startContainer(dockerClient, container);
+
+        ContainerUtils.stopContainer(dockerClient, container);
+
+        dockerClient.unpauseContainerCmd(container.getId()).exec();
+    }
+
+    @Test(expectedExceptions = NotFoundException.class)
+    public void unpauseNonExistingContainer() {
+
+        dockerClient.unpauseContainerCmd("non-existing").exec();
+    }
+
+    @Test(expectedExceptions = InternalServerErrorException.class)
+    public void unpauseCreatedContainer() {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.unpauseContainerCmd(container.getId()).exec();
+    }
+
+    @Test(expectedExceptions = InternalServerErrorException.class)
+    public void unpauseUnpausedContainer() {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        ContainerUtils.startContainer(dockerClient, container);
+
+        ContainerUtils.pauseContainer(dockerClient, container);
+
+        dockerClient.unpauseContainerCmd(container.getId()).exec();
+        dockerClient.unpauseContainerCmd(container.getId()).exec();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/PauseCmdImplTest.java b/src/test/java/com/github/dockerjava/netty/exec/PauseCmdImplTest.java
new file mode 100644
index 000000000..612c3efd2
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/PauseCmdImplTest.java
@@ -0,0 +1,103 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.InternalServerErrorException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+import com.github.dockerjava.utils.ContainerUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+@Test(groups = {"integration", "ignoreInCircleCi"})
+public class PauseCmdImplTest extends AbstractNettyDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(PauseCmdImplTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void pauseRunningContainer() {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        ContainerUtils.startContainer(dockerClient, container);
+
+        ContainerUtils.pauseContainer(dockerClient, container);
+    }
+
+    @Test(expectedExceptions = NotFoundException.class)
+    public void pauseNonExistingContainer() {
+
+        dockerClient.pauseContainerCmd("non-existing").exec();
+    }
+
+    @Test(expectedExceptions = InternalServerErrorException.class)
+    public void pauseStoppedContainer() {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        ContainerUtils.startContainer(dockerClient, container);
+
+        ContainerUtils.stopContainer(dockerClient, container);
+
+        dockerClient.pauseContainerCmd(container.getId()).exec();
+    }
+
+    @Test(expectedExceptions = InternalServerErrorException.class)
+    public void pausePausedContainer() {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        ContainerUtils.startContainer(dockerClient, container);
+
+        ContainerUtils.pauseContainer(dockerClient, container);
+
+        dockerClient.pauseContainerCmd(container.getId()).exec();
+    }
+
+    @Test(expectedExceptions = InternalServerErrorException.class)
+    public void pauseCreatedContainer() {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.pauseContainerCmd(container.getId()).exec();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/UnpauseCmdImplTest.java b/src/test/java/com/github/dockerjava/netty/exec/UnpauseCmdImplTest.java
new file mode 100644
index 000000000..db91bc9f9
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/UnpauseCmdImplTest.java
@@ -0,0 +1,118 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.InternalServerErrorException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+import com.github.dockerjava.utils.ContainerUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+@Test(groups = {"integration", "ignoreInCircleCi"})
+public class UnpauseCmdImplTest extends AbstractNettyDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(UnpauseCmdImplTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void unpausePausedContainer() {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        ContainerUtils.startContainer(dockerClient, container);
+
+        ContainerUtils.pauseContainer(dockerClient, container);
+
+        ContainerUtils.unpaseContainer(dockerClient, container);
+    }
+
+    @Test(expectedExceptions = InternalServerErrorException.class)
+    public void unpauseRunningContainer() {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        ContainerUtils.startContainer(dockerClient, container);
+
+        dockerClient.unpauseContainerCmd(container.getId()).exec();
+    }
+
+    @Test(expectedExceptions = InternalServerErrorException.class)
+    public void unpauseStoppedContainer() {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        ContainerUtils.startContainer(dockerClient, container);
+
+        ContainerUtils.stopContainer(dockerClient, container);
+
+        dockerClient.unpauseContainerCmd(container.getId()).exec();
+    }
+
+    @Test(expectedExceptions = NotFoundException.class)
+    public void unpauseNonExistingContainer() {
+
+        dockerClient.unpauseContainerCmd("non-existing").exec();
+    }
+
+    @Test(expectedExceptions = InternalServerErrorException.class)
+    public void unpauseCreatedContainer() {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.unpauseContainerCmd(container.getId()).exec();
+    }
+
+    @Test(expectedExceptions = InternalServerErrorException.class)
+    public void unpauseUnpausedContainer() {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        ContainerUtils.startContainer(dockerClient, container);
+
+        ContainerUtils.pauseContainer(dockerClient, container);
+
+        dockerClient.unpauseContainerCmd(container.getId()).exec();
+        dockerClient.unpauseContainerCmd(container.getId()).exec();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/utils/ContainerUtils.java b/src/test/java/com/github/dockerjava/utils/ContainerUtils.java
new file mode 100644
index 000000000..75be6c4d9
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/utils/ContainerUtils.java
@@ -0,0 +1,70 @@
+package com.github.dockerjava.utils;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+/**
+ * Container cmd utils
+ */
+public class ContainerUtils {
+
+    private ContainerUtils() {
+    }
+
+    /**
+     * Starts container and ensures that it running
+     *
+     * @param dockerClient docker client
+     * @param container    container
+     */
+    public static void startContainer(DockerClient dockerClient, CreateContainerResponse container) {
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        assertThat(inspectContainerResponse.getState().getRunning(), is(true));
+    }
+
+    /**
+     * Pauses container and ensures that it paused
+     *
+     * @param dockerClient docker client
+     * @param container    container
+     */
+    public static void pauseContainer(DockerClient dockerClient, CreateContainerResponse container) {
+        dockerClient.pauseContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        assertThat(inspectContainerResponse.getState().getPaused(), is(true));
+    }
+
+    /**
+     * Stops container and ensures that it stopped
+     *
+     * @param dockerClient docker client
+     * @param container    container
+     */
+    public static void stopContainer(DockerClient dockerClient, CreateContainerResponse container) {
+        dockerClient.stopContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        assertThat(inspectContainerResponse.getState().getRunning(), is(false));
+    }
+
+    /**
+     * Unpauses container and ensures that it unpaused (running)
+     *
+     * @param dockerClient docker client
+     * @param container    container
+     */
+    public static void unpaseContainer(DockerClient dockerClient, CreateContainerResponse container) {
+        dockerClient.unpauseContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        assertThat(inspectContainerResponse.getState().getPaused(), is(false));
+        assertThat(inspectContainerResponse.getState().getRunning(), is(true));
+    }
+}

From d78a1cfb3a1c3a198389c0f86c9d92caa37db8de Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 29 Jul 2016 19:58:13 +0300
Subject: [PATCH 0609/1272] Add 1.12.0 for tests

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a8cbe29e2..a9e93162a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,8 @@ env:
     - COVERITY_SCAN_NOTIFICATION_EMAIL="kanstantsin.sha@gmail.com"
 
   matrix:
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" DEPLOY=true CODECOV=true
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.12.0-0~trusty"
+    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.12.0-0~trusty"
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" DEPLOY=true COVERITY=true CODECOV=true
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty"
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.10.3-0~trusty"

From 4c663e18bf1685600d4aa032a7517ab3f0f6042f Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 1 Aug 2016 16:57:52 +0300
Subject: [PATCH 0610/1272] Fix test for different API behaviour. (#642)

---
 .../github/dockerjava/core/RemoteApiVersion.java | 10 ++++++++++
 .../netty/exec/ExecStartCmdExecTest.java         | 16 +++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index 954ed9971..f40b5b4d5 100644
--- a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -62,6 +62,16 @@ public class RemoteApiVersion implements Serializable {
      */
     public static final RemoteApiVersion VERSION_1_22 = RemoteApiVersion.create(1, 22);
 
+    /**
+     * @see <a href="https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.23.md">Docker API 1.22</a>
+     */
+    public static final RemoteApiVersion VERSION_1_23 = RemoteApiVersion.create(1, 23);
+
+    /**
+     * @see <a href="https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.24.md">Docker API 1.22</a>
+     */
+    public static final RemoteApiVersion VERSION_1_24 = RemoteApiVersion.create(1, 24);
+
     /**
      * Unknown, docker doesn't reflect reality. I.e. we implemented method, but for javadoc it not clear when it was added.
      */
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
index e87c56d74..52db7fe44 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.netty.exec;
 
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_23;
+import static com.github.dockerjava.utils.TestUtils.getVersion;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
@@ -12,6 +15,7 @@
 import java.security.SecureRandom;
 import java.util.concurrent.TimeUnit;
 
+import com.github.dockerjava.core.RemoteApiVersion;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -193,7 +197,8 @@ public void execStartNotAttachedStdin() throws Exception {
         ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
                 .withAttachStdout(true)
                 .withAttachStdin(false)
-                .withCmd("/bin/sh").exec();
+                .withCmd("/bin/sh")
+                .exec();
 
         boolean completed = dockerClient.execStartCmd(execCreateCmdResponse.getId())
                 .withDetach(false)
@@ -201,8 +206,13 @@ public void execStartNotAttachedStdin() throws Exception {
                 .exec(new ExecStartResultCallback(stdout, System.err))
                 .awaitCompletion(5, TimeUnit.SECONDS);
 
-        // with v1.22 of the remote api the server closed the connection when no stdin was attached while exec create, so completed was true
-        assertFalse(completed, "The process was not finished.");
         assertEquals(stdout.toString(), "");
+
+        if (getVersion(dockerClient).isGreaterOrEqual(VERSION_1_23)) {
+            assertFalse(completed, "The process was not finished.");
+        } else {
+            assertTrue(completed, "with v1.22 of the remote api the server closed the connection when no stdin " +
+                    "was attached while exec create, so completed was true");
+        }
     }
 }

From 6195eb888f34293217d463bb205041d51b2602dc Mon Sep 17 00:00:00 2001
From: tjlee <v.chernov@crystals.ru>
Date: Mon, 1 Aug 2016 20:43:25 +0300
Subject: [PATCH 0611/1272] [tests] use expectedExceptions (#649)

---
 .../core/command/AuthCmdImplTest.java         |  9 ++-------
 .../core/command/CommitCmdImplTest.java       | 10 +++-------
 .../command/ContainerDiffCmdImplTest.java     | 10 +++-------
 .../CopyArchiveFromContainerCmdImplTest.java  |  9 +++------
 .../CopyArchiveToContainerCmdImplTest.java    | 10 +++-------
 .../CopyFileFromContainerCmdImplTest.java     |  9 +++------
 .../command/CreateContainerCmdImplTest.java   |  8 ++------
 .../command/KillContainerCmdImplTest.java     |  8 ++------
 .../command/RemoveContainerCmdImplTest.java   |  9 +++------
 .../core/command/RemoveImageCmdImplTest.java  |  8 ++------
 .../command/RemoveNetworkCmdImplTest.java     |  9 +++------
 .../core/command/RemoveVolumeCmdImplTest.java |  9 ++-------
 .../command/RestartContainerCmdImplTest.java  |  9 ++-------
 .../command/StartContainerCmdImplTest.java    | 17 ++++-------------
 .../command/StopContainerCmdImplTest.java     |  8 ++------
 .../core/command/TagImageCmdImplTest.java     | 10 +++-------
 .../netty/exec/CommitCmdExecTest.java         |  9 +++------
 .../netty/exec/ContainerDiffCmdExecTest.java  |  9 +++------
 .../CopyArchiveFromContainerCmdExecTest.java  |  9 +++------
 .../CopyArchiveToContainerCmdExecTest.java    | 10 +++-------
 .../CopyFileFromContainerCmdExecTest.java     |  9 +++------
 .../netty/exec/KillContainerCmdExecTest.java  |  8 ++------
 .../exec/RemoveContainerCmdExecTest.java      |  9 +++------
 .../netty/exec/RemoveImageCmdExecTest.java    |  8 ++------
 .../netty/exec/RemoveNetworkCmdExecTest.java  |  9 +++------
 .../netty/exec/RemoveVolumeCmdExecTest.java   |  9 ++-------
 .../exec/RestartContainerCmdExecTest.java     |  8 ++------
 .../netty/exec/StartContainerCmdExecTest.java | 19 +++++--------------
 .../netty/exec/StopContainerCmdExecTest.java  |  8 ++------
 .../netty/exec/TagImageCmdExecTest.java       | 10 +++-------
 30 files changed, 81 insertions(+), 205 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
index c01c8b8cd..887c99130 100644
--- a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
@@ -45,14 +45,9 @@ public void testAuth() throws Exception {
     }
 
     // Disabled because of 500/InternalServerException
-    @Test(enabled = false)
+    @Test(enabled = false, expectedExceptions = UnauthorizedException.class, expectedExceptionsMessageRegExp = "Wrong login/password, please try again")
     public void testAuthInvalid() throws Exception {
 
-        try {
-            DockerClientBuilder.getInstance(config("garbage")).build().authCmd().exec();
-            fail("Expected a UnauthorizedException caused by a bad password.");
-        } catch (UnauthorizedException e) {
-            assertEquals(e.getMessage(), "Wrong login/password, please try again\n");
-        }
+        DockerClientBuilder.getInstance(config("garbage")).build().authCmd().exec();
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
index b8758d332..64e1d7ddf 100644
--- a/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
@@ -68,13 +68,9 @@ public void commit() throws DockerException {
         assertThat(inspectImageResponse.getParent(), equalTo(busyboxImg.getId()));
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void commitNonExistingContainer() throws DockerException {
-        try {
-            dockerClient.commitCmd("non-existent").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
-    }
 
+        dockerClient.commitCmd("non-existent").exec();
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
index 62c7b2ec0..e51db21f4 100644
--- a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
@@ -67,13 +67,9 @@ public void testContainerDiff() throws DockerException {
         assertThat(testChangeLog, hasField("kind", equalTo(1)));
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void testContainerDiffWithNonExistingContainer() throws DockerException {
-        try {
-            dockerClient.containerDiffCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
-    }
 
+        dockerClient.containerDiffCmd("non-existing").exec();
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImplTest.java
index 9b30dd891..59c459382 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImplTest.java
@@ -70,13 +70,10 @@ public void copyFromContainer() throws Exception {
         assertTrue(responseAsString.length() > 0);
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void copyFromNonExistingContainer() throws Exception {
-        try {
-            dockerClient.copyArchiveFromContainerCmd("non-existing", "/test").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException ignored) {
-        }
+
+        dockerClient.copyArchiveFromContainerCmd("non-existing", "/test").exec();
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
index a1006277c..658c1f090 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
@@ -83,14 +83,10 @@ private void assertFileCopied(CreateContainerResponse container) throws IOExcept
         }
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void copyToNonExistingContainer() throws Exception {
-        try {
-            dockerClient.copyArchiveToContainerCmd("non-existing").withHostResource("src/test/resources/testReadFile")
-                    .exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException ignored) {
-        }
+
+        dockerClient.copyArchiveToContainerCmd("non-existing").withHostResource("src/test/resources/testReadFile").exec();
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
index 3e4e88612..8bd2c44fe 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
@@ -62,12 +62,9 @@ public void copyFromContainer() throws Exception {
         assertTrue(responseAsString.length() > 0);
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void copyFromNonExistingContainer() throws Exception {
-        try {
-            dockerClient.copyFileFromContainerCmd("non-existing", "/test").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException ignored) {
-        }
+
+        dockerClient.copyFileFromContainerCmd("non-existing", "/test").exec();
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index a9c0acb8c..214bb2f4a 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -231,7 +231,7 @@ public void createContainerWithHostname() throws Exception {
         assertThat(containerLog(container.getId()), containsString("HOSTNAME=docker-java"));
     }
 
-    @Test
+    @Test(expectedExceptions = ConflictException.class)
     public void createContainerWithName() throws DockerException {
 
         CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withName("container")
@@ -245,12 +245,8 @@ public void createContainerWithName() throws DockerException {
 
         assertThat(inspectContainerResponse.getName(), equalTo("/container"));
 
-        try {
-            dockerClient.createContainerCmd(BUSYBOX_IMAGE).withName("container").withCmd("env").exec();
-            fail("Expected ConflictException");
-        } catch (ConflictException e) {
-        }
 
+        dockerClient.createContainerCmd(BUSYBOX_IMAGE).withName("container").withCmd("env").exec();
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
index 3ba85928e..c8589271e 100644
--- a/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
@@ -67,14 +67,10 @@ public void killContainer() throws DockerException {
 
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void killNonExistingContainer() throws DockerException {
 
-        try {
-            dockerClient.killContainerCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+        dockerClient.killContainerCmd("non-existing").exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
index 87ace71df..26c8e0e19 100644
--- a/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
@@ -68,13 +68,10 @@ public void removeContainer() throws DockerException {
 
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void removeNonExistingContainer() throws DockerException {
-        try {
-            dockerClient.removeContainerCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+
+        dockerClient.removeContainerCmd("non-existing").exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
index 90be81c7f..4427da997 100644
--- a/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
@@ -74,14 +74,10 @@ public void removeImage() throws DockerException, InterruptedException {
         assertThat(containers, matcher);
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void removeNonExistingImage() throws DockerException, InterruptedException {
-        try {
-            dockerClient.removeImageCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
 
+        dockerClient.removeImageCmd("non-existing").exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveNetworkCmdImplTest.java
index e1e4e45fe..228e48c4d 100644
--- a/src/test/java/com/github/dockerjava/core/command/RemoveNetworkCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RemoveNetworkCmdImplTest.java
@@ -64,13 +64,10 @@ public void removeNetwork() throws DockerException {
 
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void removeNonExistingContainer() throws DockerException {
-        try {
-            dockerClient.removeNetworkCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+
+        dockerClient.removeNetworkCmd("non-existing").exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveVolumeCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveVolumeCmdImplTest.java
index 249bf8493..9ed690b65 100644
--- a/src/test/java/com/github/dockerjava/core/command/RemoveVolumeCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RemoveVolumeCmdImplTest.java
@@ -41,7 +41,7 @@ public void afterMethod(ITestResult result) {
         super.afterMethod(result);
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void removeVolume() throws DockerException {
 
         String volumeName = "volume1";
@@ -55,11 +55,6 @@ public void removeVolume() throws DockerException {
 
         dockerClient.removeVolumeCmd(volumeName).exec();
 
-        try {
-            dockerClient.inspectVolumeCmd(volumeName).exec();
-            fail("Expected NotFoundException");
-        } catch (NotFoundException e) {
-            // just ignore
-        }
+        dockerClient.inspectVolumeCmd(volumeName).exec();
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
index 4920ac087..84916f082 100644
--- a/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
@@ -71,14 +71,9 @@ public void restartContainer() throws DockerException {
         dockerClient.killContainerCmd(container.getId()).exec();
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void restartNonExistingContainer() throws DockerException, InterruptedException {
-        try {
-            dockerClient.restartContainerCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
 
+        dockerClient.restartContainerCmd("non-existing").exec();
     }
-
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
index 2b32e00c5..4bb8f2b99 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -251,7 +251,7 @@ public void startContainerWithRandomPortBindings() throws DockerException {
 
     }
 
-    @Test
+    @Test(expectedExceptions = InternalServerErrorException.class)
     public void startContainerWithConflictingPortBindings() throws DockerException {
 
         ExposedPort tcp22 = ExposedPort.tcp(22);
@@ -268,13 +268,7 @@ public void startContainerWithConflictingPortBindings() throws DockerException {
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        try {
-            dockerClient.startContainerCmd(container.getId()).exec();
-            fail("expected InternalServerErrorException");
-        } catch (InternalServerErrorException e) {
-
-        }
-
+        dockerClient.startContainerCmd(container.getId()).exec();
     }
 
     @Test
@@ -412,13 +406,10 @@ public void startContainer() throws DockerException {
         }
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void testStartNonExistingContainer() throws DockerException {
-        try {
+
             dockerClient.startContainerCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
     }
 
     /**
diff --git a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
index 913ed9474..382e5b29c 100644
--- a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
@@ -76,14 +76,10 @@ public void testStopContainer() throws DockerException {
         }
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void testStopNonExistingContainer() throws DockerException {
-        try {
-            dockerClient.stopContainerCmd("non-existing").withTimeout(2).exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
 
-        }
+        dockerClient.stopContainerCmd("non-existing").withTimeout(2).exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java
index 94d4291d0..3bf033212 100644
--- a/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java
@@ -49,15 +49,11 @@ public void tagImage() throws Exception {
         dockerClient.removeImageCmd("docker-java/busybox:" + tag).exec();
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void tagNonExistingImage() throws Exception {
-        String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
 
-        try {
-            dockerClient.tagImageCmd("non-existing", "docker-java/busybox", tag).exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+        String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
+        dockerClient.tagImageCmd("non-existing", "docker-java/busybox", tag).exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
index 0186f4233..3d1a66333 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
@@ -68,13 +68,10 @@ public void commit() throws DockerException {
         assertThat(inspectImageResponse.getParent(), equalTo(busyboxImg.getId()));
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void commitNonExistingContainer() throws DockerException {
-        try {
-            dockerClient.commitCmd("non-existent").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+
+        dockerClient.commitCmd("non-existent").exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExecTest.java
index 57c4b46a0..c21c426b5 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExecTest.java
@@ -68,13 +68,10 @@ public void testContainerDiff() throws DockerException {
         assertThat(testChangeLog, hasField("kind", equalTo(1)));
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void testContainerDiffWithNonExistingContainer() throws DockerException {
-        try {
-            dockerClient.containerDiffCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+
+        dockerClient.containerDiffCmd("non-existing").exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExecTest.java
index caec336a2..02b56156d 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExecTest.java
@@ -70,13 +70,10 @@ public void copyFromContainer() throws Exception {
         assertTrue(responseAsString.length() > 0);
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void copyFromNonExistingContainer() throws Exception {
-        try {
-            dockerClient.copyArchiveFromContainerCmd("non-existing", "/test").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException ignored) {
-        }
+
+        dockerClient.copyArchiveFromContainerCmd("non-existing", "/test").exec();
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExecTest.java
index eb43b54de..d75d36ea8 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExecTest.java
@@ -84,14 +84,10 @@ private void assertFileCopied(CreateContainerResponse container) throws IOExcept
         }
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void copyToNonExistingContainer() throws Exception {
-        try {
-            dockerClient.copyArchiveToContainerCmd("non-existing").withHostResource("src/test/resources/testReadFile")
-                    .exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException ignored) {
-        }
+
+        dockerClient.copyArchiveToContainerCmd("non-existing").withHostResource("src/test/resources/testReadFile").exec();
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java
index b9682c592..b512cfa69 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java
@@ -62,12 +62,9 @@ public void copyFromContainer() throws Exception {
         assertTrue(responseAsString.length() > 0);
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void copyFromNonExistingContainer() throws Exception {
-        try {
-            dockerClient.copyFileFromContainerCmd("non-existing", "/test").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException ignored) {
-        }
+
+        dockerClient.copyFileFromContainerCmd("non-existing", "/test").exec();
     }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/KillContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/KillContainerCmdExecTest.java
index 867373e63..d354c8df3 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/KillContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/KillContainerCmdExecTest.java
@@ -67,14 +67,10 @@ public void killContainer() throws DockerException {
 
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void killNonExistingContainer() throws DockerException {
 
-        try {
-            dockerClient.killContainerCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+        dockerClient.killContainerCmd("non-existing").exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExecTest.java
index ffe456c09..1e7abebdb 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExecTest.java
@@ -69,13 +69,10 @@ public void removeContainer() throws DockerException {
 
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void removeNonExistingContainer() throws DockerException {
-        try {
-            dockerClient.removeContainerCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+
+        dockerClient.removeContainerCmd("non-existing").exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RemoveImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RemoveImageCmdExecTest.java
index e2f69ac1e..857bec714 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/RemoveImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/RemoveImageCmdExecTest.java
@@ -74,14 +74,10 @@ public void removeImage() throws DockerException, InterruptedException {
         assertThat(containers, matcher);
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void removeNonExistingImage() throws DockerException, InterruptedException {
-        try {
-            dockerClient.removeImageCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
 
+        dockerClient.removeImageCmd("non-existing").exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExecTest.java
index 9fda49f21..f8e7d26ca 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExecTest.java
@@ -64,13 +64,10 @@ public void removeNetwork() throws DockerException {
 
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void removeNonExistingContainer() throws DockerException {
-        try {
-            dockerClient.removeNetworkCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+
+        dockerClient.removeNetworkCmd("non-existing").exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RemoveVolumeCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RemoveVolumeCmdExecTest.java
index 59aafde67..d7995861c 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/RemoveVolumeCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/RemoveVolumeCmdExecTest.java
@@ -41,7 +41,7 @@ public void afterMethod(ITestResult result) {
         super.afterMethod(result);
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void removeVolume() throws DockerException {
 
         String volumeName = "volume1";
@@ -55,11 +55,6 @@ public void removeVolume() throws DockerException {
 
         dockerClient.removeVolumeCmd(volumeName).exec();
 
-        try {
-            dockerClient.inspectVolumeCmd(volumeName).exec();
-            fail("Expected NotFoundException");
-        } catch (NotFoundException e) {
-            // just ignore
-        }
+        dockerClient.inspectVolumeCmd(volumeName).exec();
     }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RestartContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RestartContainerCmdExecTest.java
index 3360057a8..3b1ada5c2 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/RestartContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/RestartContainerCmdExecTest.java
@@ -71,14 +71,10 @@ public void restartContainer() throws DockerException {
         dockerClient.killContainerCmd(container.getId()).exec();
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void restartNonExistingContainer() throws DockerException, InterruptedException {
-        try {
-            dockerClient.restartContainerCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
 
+        dockerClient.restartContainerCmd("non-existing").exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
index f4a36c2b1..eed82fcd9 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
@@ -254,7 +254,7 @@ public void startContainerWithRandomPortBindings() throws DockerException {
 
     }
 
-    @Test
+    @Test(expectedExceptions = InternalServerErrorException.class)
     public void startContainerWithConflictingPortBindings() throws DockerException {
 
         ExposedPort tcp22 = ExposedPort.tcp(22);
@@ -271,13 +271,7 @@ public void startContainerWithConflictingPortBindings() throws DockerException {
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        try {
-            dockerClient.startContainerCmd(container.getId()).exec();
-            fail("expected InternalServerErrorException");
-        } catch (InternalServerErrorException e) {
-
-        }
-
+        dockerClient.startContainerCmd(container.getId()).exec();
     }
 
     @Test
@@ -415,13 +409,10 @@ public void startContainer() throws DockerException {
         }
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void testStartNonExistingContainer() throws DockerException {
-        try {
-            dockerClient.startContainerCmd("non-existing").exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+
+        dockerClient.startContainerCmd("non-existing").exec();
     }
 
     /**
diff --git a/src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java
index b3f545a42..1dca12890 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java
@@ -76,14 +76,10 @@ public void testStopContainer() throws DockerException {
         }
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void testStopNonExistingContainer() throws DockerException {
-        try {
-            dockerClient.stopContainerCmd("non-existing").withTimeout(2).exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
 
-        }
+        dockerClient.stopContainerCmd("non-existing").withTimeout(2).exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/TagImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/TagImageCmdExecTest.java
index bbab169ef..6c84775ee 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/TagImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/TagImageCmdExecTest.java
@@ -49,15 +49,11 @@ public void tagImage() throws Exception {
         dockerClient.removeImageCmd("docker-java/busybox:" + tag).exec();
     }
 
-    @Test
+    @Test(expectedExceptions = NotFoundException.class)
     public void tagNonExistingImage() throws Exception {
-        String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
 
-        try {
-            dockerClient.tagImageCmd("non-existing", "docker-java/busybox", tag).exec();
-            fail("expected NotFoundException");
-        } catch (NotFoundException e) {
-        }
+        String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
+        dockerClient.tagImageCmd("non-existing", "docker-java/busybox", tag).exec();
     }
 
 }

From b1ed66b10c3def348091809d3ecc5234396d8190 Mon Sep 17 00:00:00 2001
From: tejksat <tejksat@users.noreply.github.com>
Date: Mon, 1 Aug 2016 20:46:47 +0300
Subject: [PATCH 0612/1272] Fix for #643 (#648)

* Fix for #643

.dockerignore rules handling refactored. A rule is translated to a regexp pattern and then a path is checked against it.

* Fix for #643

Failing tests on Windows fixed: Windows file separator escaped.
---
 .../dockerjava/core/GoLangFileMatch.java      | 305 +++++++++---------
 .../core/dockerfile/Dockerfile.java           |  19 +-
 .../dockerjava/core/GoLangFileMatchTest.java  |  22 +-
 .../DockerfileAddMultipleFilesTest.java       |  49 ++-
 .../.dockerignore                             |   3 +
 .../EffectiveDockerignorePatterns/Dockerfile  |   3 +
 .../README-secret.md                          |   1 +
 .../EffectiveDockerignorePatterns/README.md   |   0
 .../.dockerignore                             |   3 +
 .../IneffectiveDockerignorePattern/Dockerfile |   3 +
 .../README-secret.md                          |   0
 .../IneffectiveDockerignorePattern/README.md  |   0
 .../NestedDirsDockerignore/.dockerignore      |   5 +
 .../NestedDirsDockerignore/Dockerfile         |   3 +
 .../NestedDirsDockerignore/parent/README.md   |   0
 .../NestedDirsDockerignore/parent/a.txt       |   0
 .../parent/anotherChild/README-child.md       |   0
 .../anotherChild/grandChild/README-grand.md   |   0
 .../parent/anotherChild/grandChild/c.txt      |   0
 .../NestedDirsDockerignore/parent/child/b.txt |   0
 20 files changed, 231 insertions(+), 185 deletions(-)
 create mode 100644 src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/.dockerignore
 create mode 100644 src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/Dockerfile
 create mode 100644 src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/README-secret.md
 create mode 100644 src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/README.md
 create mode 100644 src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/.dockerignore
 create mode 100644 src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/Dockerfile
 create mode 100644 src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/README-secret.md
 create mode 100644 src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/README.md
 create mode 100644 src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/.dockerignore
 create mode 100644 src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/Dockerfile
 create mode 100644 src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/README.md
 create mode 100644 src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/a.txt
 create mode 100644 src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/README-child.md
 create mode 100644 src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/grandChild/README-grand.md
 create mode 100644 src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/grandChild/c.txt
 create mode 100644 src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/child/b.txt

diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index fa5dba722..09d5e4978 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -6,6 +6,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Pattern;
 
 import org.apache.commons.lang.StringUtils;
 
@@ -49,6 +50,8 @@ private GoLangFileMatch() {
 
     public static final boolean IS_WINDOWS = File.separatorChar == '\\';
 
+    private static final String PATTERN_CHARS_TO_ESCAPE = "\\.[]{}()*+-?^$|";
+
     public static boolean match(List<String> patterns, File file) {
         return !match(patterns, file.getPath()).isEmpty();
     }
@@ -71,196 +74,194 @@ public static List<String> match(List<String> patterns, String name) {
     }
 
     public static boolean match(String pattern, String name) {
-        Pattern: while (!pattern.isEmpty()) {
-            ScanResult scanResult = scanChunk(pattern);
-            pattern = scanResult.pattern;
-            if (scanResult.star && StringUtils.isEmpty(scanResult.chunk)) {
-                // Trailing * matches rest of string unless it has a /.
-                return name.indexOf(File.separatorChar) < 0;
-            }
-            // Look for match at current position.
-            String matchResult = matchChunk(scanResult.chunk, name);
+        return buildPattern(pattern).matcher(name).matches();
+    }
 
-            // if we're the last chunk, make sure we've exhausted the name
-            // otherwise we'll give a false result even if we could still match
-            // using the star
-            if (matchResult != null && (matchResult.isEmpty() || !pattern.isEmpty())) {
-                name = matchResult;
-                continue;
-            }
-            if (scanResult.star) {
-                for (int i = 0; i < name.length() && name.charAt(i) != File.separatorChar; i++) {
-                    matchResult = matchChunk(scanResult.chunk, name.substring(i + 1));
-                    if (matchResult != null) {
-                        // if we're the last chunk, make sure we exhausted the name
-                        if (pattern.isEmpty() && !matchResult.isEmpty()) {
-                            continue;
-                        }
-                        name = matchResult;
-                        continue Pattern;
-                    }
-                }
+    private static Pattern buildPattern(String pattern) {
+        StringBuilder patternStringBuilder = new StringBuilder("^");
+        while (!pattern.isEmpty()) {
+            pattern = appendChunkPattern(patternStringBuilder, pattern);
+
+            if (!pattern.isEmpty()) {
+                patternStringBuilder.append(quote(File.separatorChar));
             }
-            return false;
         }
-        return name.isEmpty();
+        patternStringBuilder.append("(").append(quote(File.separatorChar)).append(".*").append(")?");
+        return Pattern.compile(patternStringBuilder.toString());
     }
 
-    static ScanResult scanChunk(String pattern) {
-        boolean star = false;
-        if (!pattern.isEmpty() && pattern.charAt(0) == '*') {
-            pattern = pattern.substring(1);
-            star = true;
+    private static String quote(char separatorChar) {
+        if (StringUtils.contains(PATTERN_CHARS_TO_ESCAPE, separatorChar)) {
+            return "\\" + separatorChar;
+        } else {
+            return String.valueOf(separatorChar);
         }
+    }
+
+    private static String appendChunkPattern(StringBuilder patternStringBuilder, String pattern) {
+        if (pattern.equals("**") || pattern.startsWith("**" + File.separator)) {
+            patternStringBuilder.append("(")
+                    .append("[^").append(quote(File.separatorChar)).append("]*")
+                    .append("(")
+                    .append(quote(File.separatorChar)).append("[^").append(quote(File.separatorChar)).append("]*")
+                    .append(")*").append(")?");
+            return pattern.substring(pattern.length() == 2 ? 2 : 3);
+        }
+
         boolean inRange = false;
+        int rangeFrom = 0;
+        RangeParseState rangeParseState = RangeParseState.CHAR_EXPECTED;
+        boolean isEsc = false;
         int i;
-        Scan: for (i = 0; i < pattern.length(); i++) {
-            switch (pattern.charAt(i)) {
-                case '\\': {
-                    if (!IS_WINDOWS && i + 1 < pattern.length()) {
-                        i++;
+        for (i = 0; i < pattern.length(); i++) {
+            char c = pattern.charAt(i);
+            switch (c) {
+                case '/':
+                    if (!inRange) {
+                        if (!IS_WINDOWS && !isEsc) {
+                            // end of chunk
+                            return pattern.substring(i + 1);
+                        } else {
+                            patternStringBuilder.append(quote(c));
+                        }
+                    } else {
+                        rangeParseState = nextStateAfterChar(rangeParseState);
                     }
+                    isEsc = false;
                     break;
-                }
-                case '[':
-                    inRange = true;
-                    break;
-                case ']':
-                    inRange = false;
-                    break;
-                case '*':
+                case '\\':
                     if (!inRange) {
-                        break Scan;
+                        if (!IS_WINDOWS) {
+                            if (isEsc) {
+                                patternStringBuilder.append(quote(c));
+                                isEsc = false;
+                            } else {
+                                isEsc = true;
+                            }
+                        } else {
+                            // end of chunk
+                            return pattern.substring(i + 1);
+                        }
+                    } else {
+                        if (IS_WINDOWS || isEsc) {
+                            rangeParseState = nextStateAfterChar(rangeParseState);
+                            isEsc = false;
+                        } else {
+                            isEsc = true;
+                        }
                     }
-            }
-        }
-        return new ScanResult(star, pattern.substring(0, i), pattern.substring(i));
-    }
-
-    static String matchChunk(String chunk, String s) {
-        int chunkLength = chunk.length();
-        int chunkOffset = 0;
-        int sLength = s.length();
-        int sOffset = 0;
-        char r;
-        while (chunkOffset < chunkLength) {
-            if (sOffset == sLength) {
-                return null;
-            }
-            switch (chunk.charAt(chunkOffset)) {
+                    break;
                 case '[':
-                    r = s.charAt(sOffset);
-                    sOffset++;
-                    chunkOffset++;
-                    // We can't end right after '[', we're expecting at least
-                    // a closing bracket and possibly a caret.
-                    if (chunkOffset == chunkLength) {
-                        throw new GoLangFileMatchException();
-                    }
-                    // possibly negated
-                    boolean negated = chunk.charAt(chunkOffset) == '^';
-                    if (negated) {
-                        chunkOffset++;
+                    if (!isEsc) {
+                        if (inRange) {
+                            //"[ is not expected, ] had not reached"
+                            throw new GoLangFileMatchException();
+                        }
+                        rangeFrom = i;
+                        rangeParseState = RangeParseState.CHAR_EXPECTED;
+                        inRange = true;
+                    } else {
+                        if (!inRange) {
+                            patternStringBuilder.append(c);
+                        } else {
+                            rangeParseState = nextStateAfterChar(rangeParseState);
+                        }
                     }
-                    // parse all ranges
-                    boolean match = false;
-                    int nrange = 0;
-                    while (true) {
-                        if (chunkOffset < chunkLength && chunk.charAt(chunkOffset) == ']' && nrange > 0) {
-                            chunkOffset++;
-                            break;
+                    isEsc = false;
+                    break;
+                case ']':
+                    if (!isEsc) {
+                        if (!inRange) {
+                            //"] is not expected, [ was not met"
+                            throw new GoLangFileMatchException();
                         }
-                        GetEscResult result = getEsc(chunk, chunkOffset, chunkLength);
-                        char lo = result.lo;
-                        char hi = lo;
-                        chunkOffset = result.chunkOffset;
-                        if (chunk.charAt(chunkOffset) == '-') {
-                            result = getEsc(chunk, ++chunkOffset, chunkLength);
-                            chunkOffset = result.chunkOffset;
-                            hi = result.lo;
+                        if (rangeParseState == RangeParseState.CHAR_EXPECTED_AFTER_DASH) {
+                            // character range not finished
+                            throw new GoLangFileMatchException();
                         }
-                        if (lo <= r && r <= hi) {
-                            match = true;
+                        patternStringBuilder.append(pattern.substring(rangeFrom, i + 1));
+                        inRange = false;
+                    } else {
+                        if (!inRange) {
+                            patternStringBuilder.append(c);
+                        } else {
+                            rangeParseState = nextStateAfterChar(rangeParseState);
                         }
-                        nrange++;
                     }
-                    if (match == negated) {
-                        return null;
+                    isEsc = false;
+                    break;
+                case '*':
+                    if (!inRange) {
+                        if (!isEsc) {
+                            patternStringBuilder.append("[^").append(quote(File.separatorChar)).append("]*");
+                        } else {
+                            patternStringBuilder.append(quote(c));
+                        }
+                    } else {
+                        rangeParseState = nextStateAfterChar(rangeParseState);
                     }
+                    isEsc = false;
                     break;
-
                 case '?':
-                    if (s.charAt(sOffset) == File.separatorChar) {
-                        return null;
+                    if (!inRange) {
+                        if (!isEsc) {
+                            patternStringBuilder.append("[^").append(quote(File.separatorChar)).append("]");
+                        } else {
+                            patternStringBuilder.append(quote(c));
+                        }
+                    } else {
+                        rangeParseState = nextStateAfterChar(rangeParseState);
                     }
-                    sOffset++;
-                    chunkOffset++;
+                    isEsc = false;
                     break;
-                case '\\':
-                    if (!IS_WINDOWS) {
-                        chunkOffset++;
-                        if (chunkOffset == chunkLength) {
-                            throw new GoLangFileMatchException();
+                case '-':
+                    if (!inRange) {
+                        patternStringBuilder.append(quote(c));
+                    } else {
+                        if (!isEsc) {
+                            if (rangeParseState != RangeParseState.CHAR_OR_DASH_EXPECTED) {
+                                // - not expected
+                                throw new GoLangFileMatchException();
+                            }
+                            rangeParseState = RangeParseState.CHAR_EXPECTED_AFTER_DASH;
+                        } else {
+                            rangeParseState = nextStateAfterChar(rangeParseState);
                         }
                     }
-                    // fallthrough
+                    isEsc = false;
+                    break;
                 default:
-                    if (chunk.charAt(chunkOffset) != s.charAt(sOffset)) {
-                        return null;
+                    if (!inRange) {
+                        patternStringBuilder.append(quote(c));
+                    } else {
+                        rangeParseState = nextStateAfterChar(rangeParseState);
                     }
-                    sOffset++;
-                    chunkOffset++;
+                    isEsc = false;
             }
         }
-        return s.substring(sOffset);
-    }
-
-    static GetEscResult getEsc(String chunk, int chunkOffset, int chunkLength) {
-        if (chunkOffset == chunkLength) {
+        if (isEsc) {
+            // "Escaped character missing"
             throw new GoLangFileMatchException();
         }
-        char r = chunk.charAt(chunkOffset);
-        if (r == '-' || r == ']') {
+        if (inRange) {
+            // "Character range not finished"
             throw new GoLangFileMatchException();
         }
-        if (r == '\\' && !IS_WINDOWS) {
-            chunkOffset++;
-            if (chunkOffset == chunkLength) {
-                throw new GoLangFileMatchException();
-            }
-
-        }
-        r = chunk.charAt(chunkOffset);
-        chunkOffset++;
-        if (chunkOffset == chunkLength) {
-            throw new GoLangFileMatchException();
-        }
-        return new GetEscResult(r, chunkOffset);
+        return "";
     }
 
-    private static final class ScanResult {
-        public boolean star;
-
-        public String chunk;
-
-        public String pattern;
-
-        ScanResult(boolean star, String chunk, String pattern) {
-            this.star = star;
-            this.chunk = chunk;
-            this.pattern = pattern;
+    private static RangeParseState nextStateAfterChar(RangeParseState currentState) {
+        if (currentState == RangeParseState.CHAR_EXPECTED_AFTER_DASH) {
+            return RangeParseState.CHAR_EXPECTED;
+        } else {
+            return RangeParseState.CHAR_OR_DASH_EXPECTED;
         }
     }
 
-    private static final class GetEscResult {
-        public char lo;
-
-        public int chunkOffset;
-
-        GetEscResult(char lo, int chunkOffset) {
-            this.lo = lo;
-            this.chunkOffset = chunkOffset;
-        }
+    private enum RangeParseState {
+        CHAR_EXPECTED,
+        CHAR_OR_DASH_EXPECTED,
+        CHAR_EXPECTED_AFTER_DASH
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index c970d6c2d..9dcd20199 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -204,9 +204,10 @@ private List<String> matchingIgnorePatterns(String fileName) {
 
             int lineNumber = 0;
             for (String pattern : ignores) {
+                String goLangPattern = pattern.startsWith("!") ? pattern.substring(1) : pattern;
                 lineNumber++;
                 try {
-                    if (GoLangFileMatch.match(pattern, fileName)) {
+                    if (GoLangFileMatch.match(goLangPattern, fileName)) {
                         matches.add(pattern);
                     }
                 } catch (GoLangFileMatchException e) {
@@ -233,21 +234,7 @@ private String effectiveMatchingIgnorePattern(File file) {
 
             String lastMatchingPattern = matchingPattern.get(matchingPattern.size() - 1);
 
-            int lastMatchingPatternIndex = ignores.lastIndexOf(lastMatchingPattern);
-
-            if (lastMatchingPatternIndex == ignores.size() - 1) {
-                return lastMatchingPattern;
-            }
-
-            List<String> remainingIgnorePattern = ignores.subList(lastMatchingPatternIndex + 1, ignores.size());
-
-            for (String ignorePattern : remainingIgnorePattern) {
-                if (ignorePattern.equals("!" + relativeFilename)) {
-                    return null;
-                }
-            }
-
-            return lastMatchingPattern;
+            return !lastMatchingPattern.startsWith("!") ? lastMatchingPattern : null;
          }
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java b/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
index 0fd870194..62b342595 100644
--- a/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
+++ b/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
@@ -5,13 +5,14 @@
 
 import java.io.IOException;
 
-import com.github.dockerjava.core.exception.GoLangFileMatchException;
-import junit.framework.Assert;
-
 import org.apache.commons.io.FilenameUtils;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
+import com.github.dockerjava.core.exception.GoLangFileMatchException;
+
+import junit.framework.Assert;
+
 public class GoLangFileMatchTest {
 
     @Test(dataProvider = "getTestData")
@@ -31,7 +32,7 @@ public void testMatch(MatchTestCase testCase) throws IOException {
             if (testCase.expectException) {
                 Assert.fail("Expected GoFileMatchException");
             }
-            Assert.assertEquals(testCase.matches, matched);
+            Assert.assertEquals(testCase.toString(), testCase.matches, matched);
         } catch (GoLangFileMatchException e) {
             if (!testCase.expectException) {
                 throw e;
@@ -41,12 +42,13 @@ public void testMatch(MatchTestCase testCase) throws IOException {
 
     @DataProvider
     public Object[][] getTestData() {
-        return new Object[][] {new Object[] {new MatchTestCase("abc", "abc", true, false)},
+        return new Object[][] {new Object[] {new MatchTestCase("", "abc", false, false)},
+                new Object[] {new MatchTestCase("abc", "abc", true, false)},
                 new Object[] {new MatchTestCase("*", "abc", true, false)},
                 new Object[] {new MatchTestCase("*c", "abc", true, false)},
                 new Object[] {new MatchTestCase("a*", "a", true, false)},
                 new Object[] {new MatchTestCase("a*", "abc", true, false)},
-                new Object[] {new MatchTestCase("a*", "ab/c", false, false)},
+                new Object[] {new MatchTestCase("a*", "ab/c", true, false)},
                 new Object[] {new MatchTestCase("a*/b", "abc/b", true, false)},
                 new Object[] {new MatchTestCase("a*/b", "a/c/b", false, false)},
                 new Object[] {new MatchTestCase("a*b*c*d*e*/f", "axbxcxdxe/f", true, false)},
@@ -92,9 +94,13 @@ public Object[][] getTestData() {
                 new Object[] {new MatchTestCase("[", "a", false, true)},
                 new Object[] {new MatchTestCase("[^", "a", false, true)},
                 new Object[] {new MatchTestCase("[^bc", "a", false, true)},
-                new Object[] {new MatchTestCase("a[", "a", false, false)},
+                new Object[] {new MatchTestCase("a[", "a", false, true)},
                 new Object[] {new MatchTestCase("a[", "ab", false, true)},
-                new Object[] {new MatchTestCase("*x", "xxx", true, false)}};
+                new Object[] {new MatchTestCase("*x", "xxx", true, false)},
+                new Object[] {new MatchTestCase("a", "a/b/c", true, false)},
+                new Object[] {new MatchTestCase("*/b", "a/b/c", true, false)},
+                new Object[] {new MatchTestCase("**/b/*/d", "a/b/c/d", true, false)},
+                new Object[] {new MatchTestCase("**/c", "a/b/c", true, false)}};
     }
 
     private final class MatchTestCase {
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
index 164246957..b37754a6a 100644
--- a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
+++ b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
@@ -1,20 +1,20 @@
 package com.github.dockerjava.core.dockerfile;
 
-import com.google.common.base.Function;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.annotations.Test;
+import static com.google.common.collect.Collections2.transform;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
 
-import static com.google.common.collect.Collections2.transform;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.Test;
 
-public class DockerfileAddMultipleFilesTest  {
+import com.google.common.base.Function;
+
+public class DockerfileAddMultipleFilesTest {
 
     private static final Logger log = LoggerFactory.getLogger(DockerfileAddMultipleFilesTest.class);
 
@@ -25,6 +25,37 @@ public String apply(File file) {
         }
     };
 
+    @Test
+    public void nestedDirsPatterns() throws Exception {
+        File baseDir = fileFromBuildTestResource("dockerignore/NestedDirsDockerignore");
+        Dockerfile dockerfile = new Dockerfile(new File(baseDir, "Dockerfile"), baseDir);
+        Dockerfile.ScannedResult result = dockerfile.parse();
+        Collection<String> filesToAdd = transform(result.filesToAdd, TO_FILE_NAMES);
+
+        assertThat(filesToAdd,
+                containsInAnyOrder("Dockerfile", ".dockerignore", "README.md", "README-grand.md", "b.txt"));
+    }
+
+    @Test
+    public void effectiveIgnorePatterns() throws Exception {
+        File baseDir = fileFromBuildTestResource("dockerignore/EffectiveDockerignorePatterns");
+        Dockerfile dockerfile = new Dockerfile(new File(baseDir, "Dockerfile"), baseDir);
+        Dockerfile.ScannedResult result = dockerfile.parse();
+        Collection<String> filesToAdd = transform(result.filesToAdd, TO_FILE_NAMES);
+
+        assertThat(filesToAdd, containsInAnyOrder("Dockerfile", ".dockerignore", "README.md"));
+    }
+
+    @Test
+    public void ineffectiveIgnorePattern() throws Exception {
+        File baseDir = fileFromBuildTestResource("dockerignore/IneffectiveDockerignorePattern");
+        Dockerfile dockerfile = new Dockerfile(new File(baseDir, "Dockerfile"), baseDir);
+        Dockerfile.ScannedResult result = dockerfile.parse();
+        Collection<String> filesToAdd = transform(result.filesToAdd, TO_FILE_NAMES);
+
+        assertThat(filesToAdd, containsInAnyOrder("Dockerfile", ".dockerignore", "README.md", "README-secret.md"));
+    }
+
     @Test
     public void addFiles() throws IOException {
         File baseDir = fileFromBuildTestResource("ADD/files");
diff --git a/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/.dockerignore b/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/.dockerignore
new file mode 100644
index 000000000..f22e777b8
--- /dev/null
+++ b/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/.dockerignore
@@ -0,0 +1,3 @@
+*.md
+!README*.md
+README-secret.md
\ No newline at end of file
diff --git a/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/Dockerfile b/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/Dockerfile
new file mode 100644
index 000000000..65fa210c7
--- /dev/null
+++ b/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/Dockerfile
@@ -0,0 +1,3 @@
+FROM ubuntu:latest
+
+CMD ["echo", "Success"]
diff --git a/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/README-secret.md b/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/README-secret.md
new file mode 100644
index 000000000..64237b5a7
--- /dev/null
+++ b/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/README-secret.md
@@ -0,0 +1 @@
+No markdown files are included in the context except README files other than README-secret.md.
\ No newline at end of file
diff --git a/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/README.md b/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/README.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/.dockerignore b/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/.dockerignore
new file mode 100644
index 000000000..f1a1f3799
--- /dev/null
+++ b/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/.dockerignore
@@ -0,0 +1,3 @@
+*.md
+README-secret.md
+!README*.md
diff --git a/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/Dockerfile b/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/Dockerfile
new file mode 100644
index 000000000..65fa210c7
--- /dev/null
+++ b/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/Dockerfile
@@ -0,0 +1,3 @@
+FROM ubuntu:latest
+
+CMD ["echo", "Success"]
diff --git a/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/README-secret.md b/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/README-secret.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/README.md b/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/README.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/.dockerignore b/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/.dockerignore
new file mode 100644
index 000000000..d32df2a06
--- /dev/null
+++ b/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/.dockerignore
@@ -0,0 +1,5 @@
+**/*.txt
+parent/*/grandChild/README*.md
+parent/anotherChild/README*.md
+!parent/anotherChild/*/*.md
+!parent/child
\ No newline at end of file
diff --git a/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/Dockerfile b/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/Dockerfile
new file mode 100644
index 000000000..65fa210c7
--- /dev/null
+++ b/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/Dockerfile
@@ -0,0 +1,3 @@
+FROM ubuntu:latest
+
+CMD ["echo", "Success"]
diff --git a/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/README.md b/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/README.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/a.txt b/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/a.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/README-child.md b/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/README-child.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/grandChild/README-grand.md b/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/grandChild/README-grand.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/grandChild/c.txt b/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/grandChild/c.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/child/b.txt b/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/child/b.txt
new file mode 100644
index 000000000..e69de29bb

From 5cf12cfbeec2b38f96915563e725d6e659fc025c Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 1 Aug 2016 20:50:45 +0300
Subject: [PATCH 0613/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d28a9319..c8bf1d3c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ Change Log
 ---
 
 All changes
+* Updated all dependencies
+* [#643] (https://github.com/docker-java/docker-java/pull/643) Fixes for .dockerignore filtering 
 * [#627] (https://github.com/docker-java/docker-java/pull/627) Implementation of POST /images/load endpoint 
 * [#630] (https://github.com/docker-java/docker-java/pull/630) Fix: Second execution of a docker command in Netty implementation always fails 
 * [#596] (https://github.com/docker-java/docker-java/pull/596) Refactor configuration of SSL to allow override with custom config 

From 1221eddda9a382734eb5bd25967a079fb2d20794 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 1 Aug 2016 23:02:31 +0300
Subject: [PATCH 0614/1272] Relax checkstyle

---
 src/test/resources/checkstyle/checkstyle-config.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/test/resources/checkstyle/checkstyle-config.xml b/src/test/resources/checkstyle/checkstyle-config.xml
index 33508c723..76671ded3 100644
--- a/src/test/resources/checkstyle/checkstyle-config.xml
+++ b/src/test/resources/checkstyle/checkstyle-config.xml
@@ -92,7 +92,9 @@
             <property name="max" value="140"/>
             <property name="ignorePattern" value="^//.*|^package.*|^import.*|a href|href|http://|https://|ftp://"/>
         </module>
-        <module name="MethodLength"/>
+        <module name="MethodLength">
+            <property name="countEmpty" value="false"/>
+        </module>
         <!-- upto @marcuslinke -->
         <!--<module name="ParameterNumber"/>-->
 

From 6d8476e494280e122e4f2ef9b043d5870d28286f Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 1 Aug 2016 23:03:43 +0300
Subject: [PATCH 0615/1272] Document debug case (#641)

* Document debug case
---
 docs/devel.adoc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/devel.adoc b/docs/devel.adoc
index 50c6a7279..2305b89d0 100644
--- a/docs/devel.adoc
+++ b/docs/devel.adoc
@@ -23,3 +23,11 @@
   * Integration tests for commands.
   * If model object has builders, then fill it with data and compare by `equals()` with expected response
   from docker daemon. If failed, then some fields mappings are wrong.
+
+### Debug
+  * When there are unreproducible Travis errors:
+  ** Try locally run test 10-20 times in IDE against the same docker daemon version and same connection type (tcp or socket).
+  ** Limit `.travis.yml` to single run (to not consume their resources with matrix run).
+  ** Remove `travis-logback.xml` replacement (build can't output everything in every run because travis has log limitation).
+  ** Set single test in `pom.xml` `for maven-failsafe-plugin`
+  ** Make PR or if you are maintainer push to branch, catch log and fix.

From 227ca791733c73f2f7a413a1997c692931b37f85 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 1 Aug 2016 23:20:34 +0300
Subject: [PATCH 0616/1272] Disable java8 doc lint

---
 pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pom.xml b/pom.xml
index 1d4328f9b..39695185b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -352,6 +352,9 @@
 							<goals>
 								<goal>jar</goal>
 							</goals>
+							<configuration>
+								<additionalparam>-Xdoclint:none</additionalparam>
+							</configuration>
 						</execution>
 					</executions>
 				</plugin>

From 0d9c3c3a70050557a9989e49f5fc1c777a08d625 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 1 Aug 2016 23:25:48 +0300
Subject: [PATCH 0617/1272] [maven-release-plugin] prepare release 3.0.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 39695185b..337dae2ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.1-SNAPSHOT</version>
+	<version>3.0.1</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.0.1</tag>
 	</scm>
 
 	<developers>

From 4bd03a7e6162e2ef72c5365df1ea6d57f246688f Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 1 Aug 2016 23:25:56 +0300
Subject: [PATCH 0618/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 337dae2ed..d8db16134 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.1</version>
+	<version>3.0.2-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.0.1</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From fa3310dd02466b211c6d8256198b98533a1edb8a Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 1 Aug 2016 23:46:54 +0300
Subject: [PATCH 0619/1272] Update for release

---
 README.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 159108dd8..1ec338523 100644
--- a/README.md
+++ b/README.md
@@ -21,8 +21,8 @@ Developer forum for [docker-java](https://groups.google.com/forum/?#!forum/docke
 
 ###### Prerequisites:
 
-* Java 1.7
-* Maven 3.0.5
+* Java min 1.7
+* Maven 3
 
 Build and run integration tests as follows:
 
@@ -47,26 +47,26 @@ For secure tls (https) communication:
 
     DOCKER_HOST=tcp://127.0.0.1:2376
     DOCKER_TLS_VERIFY=1
-    DOCKER_CERT_PATH=/Users/marcus/.docker/machine/machines/docker-1.10.2
+    DOCKER_CERT_PATH=/Users/marcus/.docker/machine/machines/docker-1.11.2
 
 ### Latest release version
-Supports a subset of the Docker Remote API [v1.22](https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.22.md), Docker Server version 1.10.x
+Supports a subset of the Docker Remote API [v1.23](https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.23.md), Docker Server version 1.11.x
 
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>3.0.0</version>
+          <version>3.0.1</version>
     </dependency>
     
 ### Latest development version
-Supports a subset of the Docker Remote API [v1.22](https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.22.md), Docker Server version 1.10.x
+Supports a subset of the Docker Remote API [v1.23](https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.23.md), Docker Server version 1.11.x
 
 You can find the latest development version including javadoc and source files on [Sonatypes OSS repository](https://oss.sonatype.org/content/groups/public/com/github/docker-java/docker-java/).
 
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>3.0.1-SNAPSHOT</version>
+          <version>3.0.2-SNAPSHOT</version>
     </dependency>
     
 
@@ -82,7 +82,7 @@ There are a couple of configuration items, all of which have sensible defaults:
 * `DOCKER_TLS_VERIFY` enable/disable TLS verification (switch between `http` and `https` protocol)
 * `DOCKER_CERT_PATH` Path to the certificates needed for TLS verification
 * `DOCKER_CONFIG` Path for additional docker configuration files (like `.dockercfg`)
-* `api.version` The API version, e.g. `1.21`.
+* `api.version` The API version, e.g. `1.23`.
 * `registry.url` Your registry's address.
 * `registry.username` Your registry username (required to push containers).
 * `registry.password` Your registry password.
@@ -98,7 +98,7 @@ In your application, e.g.
         .withDockerTlsVerify(true)
         .withDockerCertPath("/home/user/.docker/certs")
         .withDockerConfig("/home/user/.docker")
-        .withApiVersion("1.21")
+        .withApiVersion("1.23")
         .withRegistryUrl("https://index.docker.io/v1/")
         .withRegistryUsername("dockeruser")
         .withRegistryPassword("ilovedocker")
@@ -112,7 +112,7 @@ In your application, e.g.
     DOCKER_TLS_VERIFY=1
     DOCKER_CERT_PATH=/home/user/.docker/certs
     DOCKER_CONFIG=/home/user/.docker
-    api.version=1.21
+    api.version=1.23
     registry.url=https://index.docker.io/v1/
     registry.username=dockeruser
     registry.password=ilovedocker

From c2e4f2c54fdd136ee9c800a38bce4c160b7d5582 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 2 Aug 2016 01:36:09 +0300
Subject: [PATCH 0620/1272] Include integration tests (#652)

---
 pom.xml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d8db16134..2e0523feb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -508,13 +508,28 @@
 									<goal>prepare-agent</goal>
 								</goals>
 							</execution>
+
 							<execution>
-								<id>report</id>
+								<id>post-unit-test</id>
 								<phase>test</phase>
 								<goals>
 									<goal>report</goal>
 								</goals>
 							</execution>
+
+							<execution>
+								<id>pre-integration-test</id>
+								<phase>pre-integration-test</phase>
+								<goals>
+									<goal>prepare-agent-integration</goal>
+								</goals>
+							</execution>
+							<execution>
+								<id>report-integration</id>
+								<goals>
+									<goal>report-integration</goal>
+								</goals>
+							</execution>
 						</executions>
 					</plugin>
 				</plugins>

From da6b013dbc169caafad565fe244356981887d27b Mon Sep 17 00:00:00 2001
From: Alexander Koshevoy <Alexander.Koshevoy@jetbrains.com>
Date: Tue, 2 Aug 2016 15:37:58 +0300
Subject: [PATCH 0621/1272] Fix checkstyle of GoLangFileMatch

---
 .../dockerjava/core/GoLangFileMatch.java       | 18 ++++++------------
 .../exception/GoLangFileMatchException.java    |  3 +++
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index 09d5e4978..b26b7db44 100644
--- a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -154,8 +154,7 @@ private static String appendChunkPattern(StringBuilder patternStringBuilder, Str
                 case '[':
                     if (!isEsc) {
                         if (inRange) {
-                            //"[ is not expected, ] had not reached"
-                            throw new GoLangFileMatchException();
+                            throw new GoLangFileMatchException("[ not expected, closing bracket ] not yet reached");
                         }
                         rangeFrom = i;
                         rangeParseState = RangeParseState.CHAR_EXPECTED;
@@ -172,12 +171,10 @@ private static String appendChunkPattern(StringBuilder patternStringBuilder, Str
                 case ']':
                     if (!isEsc) {
                         if (!inRange) {
-                            //"] is not expected, [ was not met"
-                            throw new GoLangFileMatchException();
+                            throw new GoLangFileMatchException("] is not expected, [ was not met");
                         }
                         if (rangeParseState == RangeParseState.CHAR_EXPECTED_AFTER_DASH) {
-                            // character range not finished
-                            throw new GoLangFileMatchException();
+                            throw new GoLangFileMatchException("Character range not finished");
                         }
                         patternStringBuilder.append(pattern.substring(rangeFrom, i + 1));
                         inRange = false;
@@ -220,8 +217,7 @@ private static String appendChunkPattern(StringBuilder patternStringBuilder, Str
                     } else {
                         if (!isEsc) {
                             if (rangeParseState != RangeParseState.CHAR_OR_DASH_EXPECTED) {
-                                // - not expected
-                                throw new GoLangFileMatchException();
+                                throw new GoLangFileMatchException("- character not expected");
                             }
                             rangeParseState = RangeParseState.CHAR_EXPECTED_AFTER_DASH;
                         } else {
@@ -240,12 +236,10 @@ private static String appendChunkPattern(StringBuilder patternStringBuilder, Str
             }
         }
         if (isEsc) {
-            // "Escaped character missing"
-            throw new GoLangFileMatchException();
+            throw new GoLangFileMatchException("Escaped character missing");
         }
         if (inRange) {
-            // "Character range not finished"
-            throw new GoLangFileMatchException();
+            throw new GoLangFileMatchException("Character range not finished");
         }
         return "";
     }
diff --git a/src/main/java/com/github/dockerjava/core/exception/GoLangFileMatchException.java b/src/main/java/com/github/dockerjava/core/exception/GoLangFileMatchException.java
index 3bbdc2a72..2d92389e7 100644
--- a/src/main/java/com/github/dockerjava/core/exception/GoLangFileMatchException.java
+++ b/src/main/java/com/github/dockerjava/core/exception/GoLangFileMatchException.java
@@ -7,4 +7,7 @@ public class GoLangFileMatchException extends IllegalArgumentException {
 
     private static final long serialVersionUID = -1204971075600864898L;
 
+    public GoLangFileMatchException(String s) {
+        super(s);
+    }
 }

From b87e0d668a2dfd233fd4178cd6f4a1ae3ec6b9cf Mon Sep 17 00:00:00 2001
From: monksy <crashoverride025@gmail.com>
Date: Tue, 2 Aug 2016 14:29:08 -0500
Subject: [PATCH 0622/1272] Fixed a bad implimentation reference

DockerClientConfig is an interface and does not have a method called: DockerClientConfig.createDefaultConfigBuilder().
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1ec338523..feddb82a2 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ There are three ways to configure, in descending order of precedence:
 #### Programmatic:
 In your application, e.g.
 
-    DockerClientConfig config = DockerClientConfig.createDefaultConfigBuilder()
+    DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder()
         .withDockerHost("tcp://my-docker-host.tld:2376")
         .withDockerTlsVerify(true)
         .withDockerCertPath("/home/user/.docker/certs")

From fd421d800e735efe3e860999e564f54d45219bcd Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 3 Aug 2016 03:13:53 +0300
Subject: [PATCH 0623/1272] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index feddb82a2..da474ff85 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-[![Maven Central](https://img.shields.io/maven-central/v/com.github.docker-java/docker-java.svg?maxAge=2592000)]()
+[![Maven Central](https://img.shields.io/maven-central/v/com.github.docker-java/docker-java.svg)]()
+[![Bintray](https://api.bintray.com/packages/kostyasha/maven/com.github.docker-java%3Adocker-java/images/download.svg)](https://bintray.com/kostyasha/maven/com.github.docker-java%3Adocker-java/_latestVersion) 
 [![Reference Status](https://www.versioneye.com/java/com.github.docker-java:docker-java/reference_badge.svg?style=flat)](https://www.versioneye.com/java/com.github.docker-java:docker-java/references)
 [![Build Status](https://travis-ci.org/docker-java/docker-java.svg?branch=master)](https://travis-ci.org/docker-java/docker-java)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/9177/badge.svg?flat=1)](https://scan.coverity.com/projects/9177)

From f355e6e756589804cd683e0da279435066a2dc61 Mon Sep 17 00:00:00 2001
From: Pavel Eremeev <selslack@users.noreply.github.com>
Date: Thu, 11 Aug 2016 01:31:06 +0300
Subject: [PATCH 0624/1272] Ability to set container shm size (#659)

* Added setShmSize option to 'create container' command

* Changed shmSize type to Long

* Exposed hostConfig
---
 .../api/command/CreateContainerCmd.java        |  6 ++++++
 .../dockerjava/api/model/HostConfig.java       |  6 +++---
 .../core/command/CreateContainerCmdImpl.java   | 11 +++++++++++
 .../command/CreateContainerCmdImplTest.java    | 18 ++++++++++++++++++
 .../netty/exec/CreateContainerCmdExecTest.java | 18 ++++++++++++++++++
 5 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 196763560..77bf100ac 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -6,6 +6,7 @@
 import com.github.dockerjava.api.model.Capability;
 import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Link;
 import com.github.dockerjava.api.model.LogConfig;
 import com.github.dockerjava.api.model.LxcConf;
@@ -187,6 +188,9 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     String getPidMode();
 
+    @CheckForNull
+    HostConfig getHostConfig();
+
     @CheckForNull
     String getCgroupParent();
 
@@ -436,6 +440,8 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
      */
     CreateContainerCmd withPidMode(String pidMode);
 
+    CreateContainerCmd withHostConfig(HostConfig hostConfig);
+
     /**
      * @throws NotFoundException
      *             No such container
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 19a6a9128..5dada65cc 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -190,7 +190,7 @@ public class HostConfig {
      * @since {@link RemoteApiVersion#VERSION_1_22}
      */
     @JsonProperty("ShmSize")
-    private String shmSize;
+    private Long shmSize;
 
 
     @JsonIgnore
@@ -401,7 +401,7 @@ public String getCgroupParent() {
      * @see #shmSize
      */
     @CheckForNull
-    public String getShmSize() {
+    public Long getShmSize() {
         return shmSize;
     }
 
@@ -764,7 +764,7 @@ public HostConfig withSecurityOpts(List<String> securityOpts) {
     /**
      * @see #shmSize
      */
-    public HostConfig withShmSize(String shmSize) {
+    public HostConfig withShmSize(Long shmSize) {
         this.shmSize = shmSize;
         return this;
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 0b6944b04..f3cfefa05 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -472,6 +472,11 @@ public String getPidMode() {
         return hostConfig.getPidMode();
     }
 
+    @Override
+    public HostConfig getHostConfig() {
+        return hostConfig;
+    }
+
     @Override
     public String getCgroupParent() {
         return hostConfig.getCgroupParent();
@@ -976,6 +981,12 @@ public CreateContainerCmd withPidMode(String pidMode) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withHostConfig(HostConfig hostConfig) {
+        this.hostConfig = hostConfig;
+        return this;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 214bb2f4a..7babafc91 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -10,6 +10,7 @@
 import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Link;
 import com.github.dockerjava.api.model.LogConfig;
 import com.github.dockerjava.api.model.Network;
@@ -21,6 +22,7 @@
 import com.github.dockerjava.api.model.Ports.Binding;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+import org.apache.commons.io.FileUtils;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -735,4 +737,20 @@ public void createContainerWithCgroupParent() throws DockerException {
 
         assertThat(inspectContainer.getHostConfig().getCgroupParent(), is("/parent"));
     }
+
+    @SuppressWarnings("Duplicates")
+    @Test
+    public void createContainerWithShmSize() throws DockerException {
+        HostConfig hostConfig = new HostConfig().withShmSize(96 * FileUtils.ONE_MB);
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
+            .withHostConfig(hostConfig).withCmd("true").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertEquals(inspectContainerResponse.getHostConfig().getShmSize(), hostConfig.getShmSize());
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
index ec35f930a..2213ca7b7 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
@@ -9,6 +9,7 @@
 import com.github.dockerjava.api.model.ContainerNetwork;
 import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Link;
 import com.github.dockerjava.api.model.LogConfig;
 import com.github.dockerjava.api.model.Network;
@@ -20,6 +21,7 @@
 import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 
+import org.apache.commons.io.FileUtils;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -676,4 +678,20 @@ public void createContainerWithCgroupParent() throws DockerException {
 
         assertThat(inspectContainer.getHostConfig().getCgroupParent(), is("/parent"));
     }
+
+    @SuppressWarnings("Duplicates")
+    @Test
+    public void createContainerWithShmSize() throws DockerException {
+        HostConfig hostConfig = new HostConfig().withShmSize(96 * FileUtils.ONE_MB);
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
+            .withHostConfig(hostConfig).withCmd("true").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertEquals(inspectContainerResponse.getHostConfig().getShmSize(), hostConfig.getShmSize());
+    }
 }

From 5893681e3969507afa4915ccab5636ee6c18f5b0 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 11 Aug 2016 11:25:29 +0300
Subject: [PATCH 0625/1272] [maven-release-plugin] prepare release 3.0.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2e0523feb..0dfef8ca9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.2-SNAPSHOT</version>
+	<version>3.0.2</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.0.2</tag>
 	</scm>
 
 	<developers>

From 701aa0b25bf2c0ad0f3ec0096e287b1c6660a0c5 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 11 Aug 2016 11:25:35 +0300
Subject: [PATCH 0626/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0dfef8ca9..208d52705 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.2</version>
+	<version>3.0.3-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.0.2</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From ee76c14d3b9340a3e1c0ed83d530a58afe424aa4 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 11 Aug 2016 11:38:33 +0300
Subject: [PATCH 0627/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8bf1d3c5..132f3c6b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,15 @@
 Change Log
 ===
 
-3.0.1-SNAPSHOT
----
+## 3.0.3-SNAPSHOT
+
+
+## 3.0.2
+ * Enhanced Dockerignore filtering.
+ * Added shmsize for hostconfig.
+ * Exposed HostConfig instead of spaghetty calls.
+
+## 3.0.1
 
 All changes
 * Updated all dependencies

From e8f82e829befe25e6f45a4f8363c09a4af776a46 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 14 Aug 2016 16:36:33 +0300
Subject: [PATCH 0628/1272] Update .travis.yml (#654)

---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a9e93162a..ba8c62ad0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,12 +21,12 @@ env:
     - COVERITY_SCAN_NOTIFICATION_EMAIL="kanstantsin.sha@gmail.com"
 
   matrix:
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.12.0-0~trusty"
-    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.12.0-0~trusty"
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.12.0-0~trusty" CODECOV=true
+    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.12.0-0~trusty" CODECOV=true
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" DEPLOY=true COVERITY=true CODECOV=true
-    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty"
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.10.3-0~trusty"
-    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.10.3-0~trusty"
+    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty" CODECOV=true
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.10.3-0~trusty" CODECOV=true
+    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.10.3-0~trusty" CODECOV=true
 #    - repo="testing" DOCKER_HOST="tcp://127.0.0.1:2375"
 #    - repo="testing" DOCKER_HOST="unix:///var/run/docker.sock"
 #    - repo="experimental" DOCKER_HOST="tcp://127.0.0.1:2375"

From 7af8f8f4eacb13bd4de09dfaf14b8dffc63d733c Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 14 Aug 2016 17:06:05 +0300
Subject: [PATCH 0629/1272] Fix body request for jersey.

---
 .../github/dockerjava/jaxrs/StartContainerCmdExec.java | 10 +++++-----
 .../dockerjava/netty/exec/StartContainerCmdExec.java   |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
index 0f75c4f2f..2851a26c7 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.jaxrs;
 
-import static javax.ws.rs.client.Entity.entity;
-
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
@@ -22,11 +20,13 @@ public StartContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerCl
 
     @Override
     protected Void execute(StartContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/start").resolveTemplate("id",
-                command.getContainerId());
+        WebTarget webResource = getBaseResource().path("/containers/{id}/start")
+                .resolveTemplate("id", command.getContainerId());
 
         LOGGER.trace("POST: {}", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON).post(entity(command, MediaType.APPLICATION_JSON))
+        webResource.request()
+                .accept(MediaType.APPLICATION_JSON)
+                .post(null)
                 .close();
 
         return null;
diff --git a/src/main/java/com/github/dockerjava/netty/exec/StartContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/StartContainerCmdExec.java
index 12f2d8cbc..039006f2d 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/StartContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/StartContainerCmdExec.java
@@ -23,7 +23,9 @@ protected Void execute(StartContainerCmd command) {
                 command.getContainerId());
 
         LOGGER.trace("POST: {}", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON).post(command);
+        webResource.request()
+                .accept(MediaType.APPLICATION_JSON)
+                .post(command);
 
         return null;
     }

From 8a3108fbb5cd844fff8e7eaef4bf509fe8299227 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 14 Aug 2016 17:29:57 +0300
Subject: [PATCH 0630/1272] Fix integration tests

---
 .../get-docker-com.sh                         |  2 +-
 .travis/travis-before-install.sh              | 53 +++++++++++++++++--
 2 files changed, 49 insertions(+), 6 deletions(-)
 rename get-docker-com.sh => .travis/get-docker-com.sh (99%)

diff --git a/get-docker-com.sh b/.travis/get-docker-com.sh
similarity index 99%
rename from get-docker-com.sh
rename to .travis/get-docker-com.sh
index 66ca4aefc..d9c0142a2 100755
--- a/get-docker-com.sh
+++ b/.travis/get-docker-com.sh
@@ -310,4 +310,4 @@ do_install() {
 
 # wrapped up in a function so that we have some protection against only getting
 # half the file during "curl | sh"
-do_install
\ No newline at end of file
+do_install
diff --git a/.travis/travis-before-install.sh b/.travis/travis-before-install.sh
index 13034fc74..6935f7a7d 100755
--- a/.travis/travis-before-install.sh
+++ b/.travis/travis-before-install.sh
@@ -3,6 +3,7 @@
 
 sudo apt-get install -y -q ca-certificates
 
+export HOST_PORT=2375
 echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-certificates.crt
 
 
@@ -21,7 +22,10 @@ sudo -E apt-get install -q -y wget
 sudo -E apt-get -q -y --purge remove docker-engine
 sudo -E apt-cache policy docker-engine
 
-./get-docker-com.sh
+./.travis/get-docker-com.sh
+
+sudo -E stop docker
+
 #mkdir "${HOME}/.cache" || :
 #pushd "${HOME}/.cache"
 # wget -N "https://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_${DOCKER_VERSION}_amd64.deb"
@@ -31,10 +35,49 @@ sudo -E apt-cache policy docker-engine
 #rm -f "src/test/resources/logback.xml"
 mv "src/test/resources/travis-logback.xml" "src/test/resources/logback.xml"
 
-echo 'DOCKER_OPTS="-H=unix:///var/run/docker.sock -H=tcp://127.0.0.1:2375"' | sudo tee -a /etc/default/docker
-sudo -E restart docker
-sleep 10
-docker version
+# https://github.com/docker/docker/issues/18113
+sudo rm /var/lib/docker/network/files/local-kv.db
+
+sudo cat /etc/default/docker
+
+cat << EOF | sudo tee /etc/default/docker
+DOCKER_OPTS="\
+--dns 8.8.8.8 \
+--dns 8.8.4.4 \
+-D \
+-H=unix:///var/run/docker.sock \
+-H=tcp://0.0.0.0:${HOST_PORT}  \
+"
+EOF
+
+sudo cat /etc/default/docker
+sudo bash -c ':> /var/log/upstart/docker.log'
+
+date
+sudo -E start docker
+
+tries=20
+sleep=5
+for i in $(seq 1 $tries); do
+    if sudo grep "API listen on" /var/log/upstart/docker.log ; then
+        echo "Docker started. Delay $(($i * $sleep))"
+        break
+    elif [[ $i -ge $tries ]]; then
+        echo "Docker didn't start. Exiting!"
+        sudo cat /var/log/upstart/docker.log
+        exit 1
+    else
+        echo "Docker didn't start, sleeping for 5 secs..."
+        sleep $sleep
+    fi
+done
+
+
+sudo ss -antpl
+
+curl -V
+
+docker version || sudo cat /var/log/upstart/docker.log
 docker info
 
 set +u

From 699080417ae678d77da5b46ef39a36810d620329 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 14 Aug 2016 21:30:49 +0300
Subject: [PATCH 0631/1272] Fix network test.

---
 .../command/ConnectToNetworkCmdImplTest.java  | 40 ++++++++++++------
 .../exec/ConnectToNetworkCmdExecTest.java     | 41 +++++++++++++------
 2 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java
index 84bb59a81..207d2a0d5 100644
--- a/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java
@@ -3,6 +3,7 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.CreateNetworkResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.ContainerNetwork;
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.client.AbstractDockerClientTest;
@@ -16,6 +17,10 @@
 import java.lang.reflect.Method;
 import java.util.Collections;
 
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+
 @Test(groups = "integration")
 public class ConnectToNetworkCmdImplTest extends AbstractDockerClientTest {
 
@@ -60,38 +65,49 @@ public void connectToNetwork() throws InterruptedException {
 
     @Test
     public void connectToNetworkWithContainerNetwork() throws InterruptedException {
+        final String NETWORK_SUBNET = "10.100.102.0/24";
+        final String NETWORK_NAME = "jerseyTestNetwork";
+        final String CONTAINER_IP = "10.100.102.100";
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCmd("sleep", "9999")
+                .exec();
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         dockerClient.startContainerCmd(container.getId()).exec();
 
+        try {
+            dockerClient.removeNetworkCmd(NETWORK_NAME).exec();
+        } catch (DockerException ignore) {
+        }
+
         CreateNetworkResponse network = dockerClient.createNetworkCmd()
-                .withName("testNetwork")
+                .withName(NETWORK_NAME)
                 .withIpam(new Network.Ipam()
-                    .withConfig(new Network.Ipam.Config()
-                        .withSubnet("10.100.100.0/24")))
+                        .withConfig(new Network.Ipam.Config()
+                                .withSubnet(NETWORK_SUBNET)))
                 .exec();
 
         dockerClient.connectToNetworkCmd()
                 .withNetworkId(network.getId())
                 .withContainerId(container.getId())
                 .withContainerNetwork(new ContainerNetwork()
-                    .withAliases("testing")
-                    .withIpamConfig(new ContainerNetwork.Ipam()
-                        .withIpv4Address("10.100.100.100")))
+                        .withAliases("aliasName")
+                        .withIpamConfig(new ContainerNetwork.Ipam()
+                                .withIpv4Address(CONTAINER_IP)))
                 .exec();
 
         Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
 
         Network.ContainerNetworkConfig containerNetworkConfig = updatedNetwork.getContainers().get(container.getId());
         assertNotNull(containerNetworkConfig);
-        assertEquals(containerNetworkConfig.getIpv4Address(), "10.100.100.100/24");
+        assertThat(containerNetworkConfig.getIpv4Address(), is(CONTAINER_IP + "/24"));
 
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-        ContainerNetwork testNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get("testNetwork");
+        ContainerNetwork testNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get(NETWORK_NAME);
         assertNotNull(testNetwork);
-        assertEquals(testNetwork.getAliases(), Collections.singletonList("testing"));
-        assertEquals(testNetwork.getGateway(), "10.100.100.1");
-        assertEquals(testNetwork.getIpAddress(), "10.100.100.100");
+        assertThat(testNetwork.getAliases(), hasItem("aliasName"));
+        assertEquals(testNetwork.getGateway(), "10.100.102.1");
+        assertEquals(testNetwork.getIpAddress(), CONTAINER_IP);
     }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExecTest.java
index ee1a681b6..7e290a98e 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExecTest.java
@@ -3,6 +3,8 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.CreateNetworkResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.ContainerNetwork;
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
@@ -17,6 +19,10 @@
 import java.lang.reflect.Method;
 import java.util.Collections;
 
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+
 @Test(groups = "integration")
 public class ConnectToNetworkCmdExecTest extends AbstractNettyDockerClientTest {
 
@@ -61,38 +67,49 @@ public void connectToNetwork() throws InterruptedException {
 
     @Test
     public void connectToNetworkWithContainerNetwork() throws InterruptedException {
+        final String NETWORK_SUBNET = "10.100.101.0/24";
+        final String NETWORK_NAME = "nettyTestNetwork";
+        final String CONTAINER_IP = "10.100.101.100";
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCmd("sleep", "9999")
+                .exec();
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         dockerClient.startContainerCmd(container.getId()).exec();
 
+        try {
+            dockerClient.removeNetworkCmd(NETWORK_NAME).exec();
+        } catch (DockerException ignore) {
+        }
+
         CreateNetworkResponse network = dockerClient.createNetworkCmd()
-                .withName("testNetwork")
+                .withName(NETWORK_NAME)
                 .withIpam(new Network.Ipam()
-                    .withConfig(new Network.Ipam.Config()
-                        .withSubnet("10.100.100.0/24")))
+                        .withConfig(new Network.Ipam.Config()
+                                .withSubnet(NETWORK_SUBNET)))
                 .exec();
 
         dockerClient.connectToNetworkCmd()
                 .withNetworkId(network.getId())
                 .withContainerId(container.getId())
                 .withContainerNetwork(new ContainerNetwork()
-                    .withAliases("testing")
-                    .withIpamConfig(new ContainerNetwork.Ipam()
-                        .withIpv4Address("10.100.100.100")))
+                        .withAliases("aliasName")
+                        .withIpamConfig(new ContainerNetwork.Ipam()
+                                .withIpv4Address(CONTAINER_IP)))
                 .exec();
 
         Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
 
         Network.ContainerNetworkConfig containerNetworkConfig = updatedNetwork.getContainers().get(container.getId());
         assertNotNull(containerNetworkConfig);
-        assertEquals(containerNetworkConfig.getIpv4Address(), "10.100.100.100/24");
+        assertThat(containerNetworkConfig.getIpv4Address(), is(CONTAINER_IP + "/24"));
 
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-        ContainerNetwork testNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get("testNetwork");
+        ContainerNetwork testNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get(NETWORK_NAME);
         assertNotNull(testNetwork);
-        assertEquals(testNetwork.getAliases(), Collections.singletonList("testing"));
-        assertEquals(testNetwork.getGateway(), "10.100.100.1");
-        assertEquals(testNetwork.getIpAddress(), "10.100.100.100");
+        assertThat(testNetwork.getAliases(), hasItem("aliasName"));
+        assertEquals(testNetwork.getGateway(), "10.100.101.1");
+        assertEquals(testNetwork.getIpAddress(), CONTAINER_IP);
     }
 }

From a68cf85da7918886c669e7ddc92e6c246046a4ea Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 14 Aug 2016 21:33:15 +0300
Subject: [PATCH 0632/1272] Fix create with alias tests.

---
 .../dockerjava/core/command/CreateContainerCmdImplTest.java     | 2 +-
 .../dockerjava/netty/exec/CreateContainerCmdExecTest.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 7babafc91..1f62527e9 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -375,7 +375,7 @@ public void createContainerWithAlias() throws DockerException {
                 .exec();
 
         ContainerNetwork aliasNet = inspectContainerResponse.getNetworkSettings().getNetworks().get("aliasNet");
-        assertEquals(aliasNet.getAliases(), Collections.singletonList("server"));
+        assertThat(aliasNet.getAliases(), hasItem("server"));
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
index 2213ca7b7..3694ca7fb 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
@@ -370,7 +370,7 @@ public void createContainerWithAlias() throws DockerException {
                 .exec();
 
         ContainerNetwork aliasNet = inspectContainerResponse.getNetworkSettings().getNetworks().get("aliasNet");
-        assertEquals(aliasNet.getAliases(), Collections.singletonList("server"));
+        assertThat(aliasNet.getAliases(), hasItem("server"));
     }
 
     @Test

From af891e25521d6b09f0213f458be256933caded06 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 14 Aug 2016 21:38:58 +0300
Subject: [PATCH 0633/1272] Fix test for 1.24

---
 src/main/java/com/github/dockerjava/api/DockerClient.java | 1 +
 .../core/command/CopyFileFromContainerCmdImplTest.java    | 8 ++++++++
 .../netty/exec/CopyFileFromContainerCmdExecTest.java      | 7 +++++++
 3 files changed, 16 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 491c11ac8..832890e87 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -170,6 +170,7 @@ public interface DockerClient extends Closeable {
      * @return created command
      * @see #copyArchiveFromContainerCmd(String, String)
      * @deprecated since docker API version 1.20, replaced by {@link #copyArchiveFromContainerCmd(String, String)}
+     * since 1.24 fails.
      */
     @Deprecated
     CopyFileFromContainerCmd copyFileFromContainerCmd(@Nonnull String containerId, @Nonnull String resource);
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
index 8bd2c44fe..ec66287eb 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.core.command;
 
+import static com.github.dockerjava.utils.TestUtils.getVersion;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isEmptyOrNullString;
 import static org.hamcrest.Matchers.not;
@@ -7,7 +8,10 @@
 import java.io.InputStream;
 import java.lang.reflect.Method;
 
+import com.github.dockerjava.core.RemoteApiVersion;
+import com.github.dockerjava.utils.TestUtils;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -43,6 +47,10 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void copyFromContainer() throws Exception {
+        if (getVersion(dockerClient).isGreaterOrEqual(RemoteApiVersion.VERSION_1_24)) {
+            throw new SkipException("Doesn't work since 1.24");
+        }
+
         // TODO extract this into a shared method
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
                 .withName("docker-java-itest-copyFromContainer").withCmd("touch", "/copyFromContainer").exec();
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java
index b512cfa69..1060ae82a 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.netty.exec;
 
+import static com.github.dockerjava.utils.TestUtils.getVersion;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isEmptyOrNullString;
 import static org.hamcrest.Matchers.not;
@@ -7,7 +8,9 @@
 import java.io.InputStream;
 import java.lang.reflect.Method;
 
+import com.github.dockerjava.core.RemoteApiVersion;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -43,6 +46,10 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void copyFromContainer() throws Exception {
+        if (getVersion(dockerClient).isGreaterOrEqual(RemoteApiVersion.VERSION_1_24)) {
+            throw new SkipException("Doesn't work since 1.24");
+        }
+
         // TODO extract this into a shared method
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
                 .withName("docker-java-itest-copyFromContainer").withCmd("touch", "/copyFromContainer").exec();

From 78a2a007303f93211fca4398198f977cf4bba173 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 14 Aug 2016 21:39:09 +0300
Subject: [PATCH 0634/1272] Fix typo

---
 .../com/github/dockerjava/core/command/UnpauseCmdImplTest.java  | 2 +-
 .../com/github/dockerjava/netty/exec/UnpauseCmdImplTest.java    | 2 +-
 src/test/java/com/github/dockerjava/utils/ContainerUtils.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/UnpauseCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/UnpauseCmdImplTest.java
index f640c4182..2f41b67ae 100644
--- a/src/test/java/com/github/dockerjava/core/command/UnpauseCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/UnpauseCmdImplTest.java
@@ -56,7 +56,7 @@ public void unpausePausedContainer() {
 
         ContainerUtils.pauseContainer(dockerClient, container);
 
-        ContainerUtils.unpaseContainer(dockerClient, container);
+        ContainerUtils.unpauseContainer(dockerClient, container);
     }
 
     @Test(expectedExceptions = InternalServerErrorException.class)
diff --git a/src/test/java/com/github/dockerjava/netty/exec/UnpauseCmdImplTest.java b/src/test/java/com/github/dockerjava/netty/exec/UnpauseCmdImplTest.java
index db91bc9f9..cb30babc4 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/UnpauseCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/UnpauseCmdImplTest.java
@@ -56,7 +56,7 @@ public void unpausePausedContainer() {
 
         ContainerUtils.pauseContainer(dockerClient, container);
 
-        ContainerUtils.unpaseContainer(dockerClient, container);
+        ContainerUtils.unpauseContainer(dockerClient, container);
     }
 
     @Test(expectedExceptions = InternalServerErrorException.class)
diff --git a/src/test/java/com/github/dockerjava/utils/ContainerUtils.java b/src/test/java/com/github/dockerjava/utils/ContainerUtils.java
index 75be6c4d9..206be0693 100644
--- a/src/test/java/com/github/dockerjava/utils/ContainerUtils.java
+++ b/src/test/java/com/github/dockerjava/utils/ContainerUtils.java
@@ -60,7 +60,7 @@ public static void stopContainer(DockerClient dockerClient, CreateContainerRespo
      * @param dockerClient docker client
      * @param container    container
      */
-    public static void unpaseContainer(DockerClient dockerClient, CreateContainerResponse container) {
+    public static void unpauseContainer(DockerClient dockerClient, CreateContainerResponse container) {
         dockerClient.unpauseContainerCmd(container.getId()).exec();
 
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();

From a520aaa56b0e8cb05dc7a84da7b04377418c2f55 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 15 Aug 2016 00:35:48 +0300
Subject: [PATCH 0635/1272] Fix test again?

---
 .../dockerjava/netty/exec/AttachContainerCmdExecTest.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
index 7daa59b25..d3e8094cf 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
@@ -93,7 +93,7 @@ public void attachContainerWithStdin() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        Thread.sleep(SECONDS.toMillis(3)); //wait bash initialisation
+        Thread.sleep(SECONDS.toMillis(10)); //wait bash initialisation
 
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 

From 03b1c72caced14037d3531a636508d48a16e874f Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 15 Aug 2016 13:58:19 +0300
Subject: [PATCH 0636/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 132f3c6b1..64bea7c57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,9 @@
 Change Log
 ===
+## Next
 
-## 3.0.3-SNAPSHOT
-
+## 3.0.3
+ * [JERSEY] Don't send body for start container request.
 
 ## 3.0.2
  * Enhanced Dockerignore filtering.

From ec124aeee4edf771204dd1d8d7c680df65502610 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 15 Aug 2016 14:05:51 +0300
Subject: [PATCH 0637/1272] [maven-release-plugin] prepare release 3.0.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 208d52705..4327d0b60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.3-SNAPSHOT</version>
+	<version>3.0.3</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.0.3</tag>
 	</scm>
 
 	<developers>

From 76bfdc9f4da0a280310212a53ae959b6e66834a4 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 15 Aug 2016 14:05:57 +0300
Subject: [PATCH 0638/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4327d0b60..586d2a209 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.3</version>
+	<version>3.0.4-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.0.3</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 03b8bb0ceaa45f044ef8ded07a3edf194fd8cd68 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 15 Aug 2016 14:41:19 +0300
Subject: [PATCH 0639/1272] Don't fail build because of coverity

---
 .travis/travis-script.sh | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/.travis/travis-script.sh b/.travis/travis-script.sh
index aeae555ef..1cdc84fa5 100755
--- a/.travis/travis-script.sh
+++ b/.travis/travis-script.sh
@@ -1,12 +1,34 @@
 #!/usr/bin/env bash
 
-set -ex
+
 
 IS_COVERITY_SCAN_BRANCH=`ruby -e "puts '${TRAVIS_BRANCH}' =~ /\\A$COVERITY_SCAN_BRANCH_PATTERN\\z/ ? 1 : 0"`
 
+export COVERITY_ALLOWED=true
+# Verify upload is permitted
+AUTH_RES=`curl -s --form project="$COVERITY_SCAN_PROJECT_NAME" --form token="$COVERITY_SCAN_TOKEN" $SCAN_URL/api/upload_permitted`
+if [ "$AUTH_RES" = "Access denied" ]; then
+  echo -e "\033[33;1mCoverity Scan API access denied. Check COVERITY_SCAN_PROJECT_NAME and COVERITY_SCAN_TOKEN.\033[0m"
+  COVERITY_ALLOWED=false
+else
+  AUTH=`echo $AUTH_RES | ruby -e "require 'rubygems'; require 'json'; puts JSON[STDIN.read]['upload_permitted']"`
+  if [ "$AUTH" = "true" ]; then
+    echo -e "\033[33;1mCoverity Scan analysis authorized per quota.\033[0m"
+  else
+    WHEN=`echo $AUTH_RES | ruby -e "require 'rubygems'; require 'json'; puts JSON[STDIN.read]['next_upload_permitted_at']"`
+    echo -e "\033[33;1mCoverity Scan analysis NOT authorized until $WHEN.\033[0m"
+
+    COVERITY_ALLOWED=false
+  fi
+fi
+
+set -ex
 
 if [ "${FAST_BUILD}" == "true" ]; then
-    if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$COVERITY" == "true" ] && [ "$IS_COVERITY_SCAN_BRANCH" = "1" ]; then
+    if [ "$TRAVIS_PULL_REQUEST" == "false" ] &&
+       [ "$COVERITY" == "true" ] &&
+       [ "$IS_COVERITY_SCAN_BRANCH" = "1" ] &&
+       [ "$COVERITY_ALLOWED" == "true" ]; then
         export COVERITY_SCAN_BUILD_COMMAND="mvn package"
         #curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash
         ./.travis/travisci_build_coverity_scan.sh
@@ -14,7 +36,10 @@ if [ "${FAST_BUILD}" == "true" ]; then
         mvn package
     fi
 else
-    if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$COVERITY" == "true" ] && [ "$IS_COVERITY_SCAN_BRANCH" = "1" ]; then
+    if [ "$TRAVIS_PULL_REQUEST" == "false" ] &&
+       [ "$COVERITY" == "true" ] &&
+       [ "$IS_COVERITY_SCAN_BRANCH" = "1" ] &&
+       [ "$COVERITY_ALLOWED" == "true" ]; then
         export COVERITY_SCAN_BUILD_COMMAND="mvn verify"
         #curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash
         ./.travis/travisci_build_coverity_scan.sh

From 26c0e277de537edfe623ea6ec531a08c5fbb296e Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 15 Aug 2016 14:48:52 +0300
Subject: [PATCH 0640/1272] Adjust developers

---
 pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pom.xml b/pom.xml
index 586d2a209..a14a31e5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,16 @@
 	</scm>
 
 	<developers>
+		<developer>
+			<id>marcuslinke</id>
+			<name>Marcus Linke</name>
+			<email>marcus.linke@gmx.de</email>
+		</developer>
+		<developer>
+			<id>kostyasha</id>
+			<name>Kanstantsin Shautsou</name>
+			<email>kanstantsin.sha@gmail.com</email>
+		</developer>
 		<developer>
 			<id>kpelykh</id>
 			<name>Konstantin Pelykh</name>

From f2826175e86239c85a327c10ae98c181a8f6e762 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 15 Aug 2016 15:17:23 +0300
Subject: [PATCH 0641/1272] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index da474ff85..e65215648 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ Supports a subset of the Docker Remote API [v1.23](https://github.com/docker/doc
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>3.0.1</version>
+          <version>3.0.3</version>
     </dependency>
     
 ### Latest development version
@@ -67,7 +67,7 @@ You can find the latest development version including javadoc and source files o
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>3.0.2-SNAPSHOT</version>
+          <version>3.0.4-SNAPSHOT</version>
     </dependency>
     
 

From b93d0636ef0e3c24966753c79273b19aba601d97 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 15 Aug 2016 19:59:42 +0300
Subject: [PATCH 0642/1272] Don't hide utils

---
 .../github/dockerjava/core/util/CertificateUtils.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java b/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
index c760331d6..b5a5dcae6 100644
--- a/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
+++ b/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
@@ -72,7 +72,7 @@ public static KeyStore createKeyStore(final String keypem, final String certpem)
     /**
      * from "cert.pem" String
      */
-    private static List<Certificate> loadCertificates(final String certpem) throws IOException,
+    public static List<Certificate> loadCertificates(final String certpem) throws IOException,
             CertificateException {
         final StringReader certReader = new StringReader(certpem);
         try (BufferedReader reader = new BufferedReader(certReader)) {
@@ -83,7 +83,7 @@ private static List<Certificate> loadCertificates(final String certpem) throws I
     /**
      * "cert.pem" from reader
      */
-    private static List<Certificate> loadCertificates(final Reader reader) throws IOException,
+    public static List<Certificate> loadCertificates(final Reader reader) throws IOException,
             CertificateException {
         try (PEMParser pemParser = new PEMParser(reader)) {
             List<Certificate> certificates = new ArrayList<>();
@@ -105,7 +105,7 @@ private static List<Certificate> loadCertificates(final Reader reader) throws IO
      * Return private key ("key.pem") from Reader
      */
     @CheckForNull
-    private static PrivateKey loadPrivateKey(final Reader reader) throws IOException, NoSuchAlgorithmException,
+    public static PrivateKey loadPrivateKey(final Reader reader) throws IOException, NoSuchAlgorithmException,
             InvalidKeySpecException {
         try (PEMParser pemParser = new PEMParser(reader)) {
             Object readObject = pemParser.readObject();
@@ -138,7 +138,7 @@ private static PrivateKey loadPrivateKey(final Reader reader) throws IOException
     }
 
     @CheckForNull
-    private static PrivateKey guessKey(byte[] encodedKey) throws NoSuchAlgorithmException {
+    public static PrivateKey guessKey(byte[] encodedKey) throws NoSuchAlgorithmException {
         //no way to know, so iterate
         for (String guessFactory : new String[]{"RSA", "ECDSA"}) {
             try {
@@ -157,7 +157,7 @@ private static PrivateKey guessKey(byte[] encodedKey) throws NoSuchAlgorithmExce
      * Return KeyPair from "key.pem"
      */
     @CheckForNull
-    private static PrivateKey loadPrivateKey(final String keypem) throws IOException, NoSuchAlgorithmException,
+    public static PrivateKey loadPrivateKey(final String keypem) throws IOException, NoSuchAlgorithmException,
             InvalidKeySpecException {
         try (StringReader certReader = new StringReader(keypem);
              BufferedReader reader = new BufferedReader(certReader)) {

From 203fa3903b76c0e539cb7de702dded78039853d9 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 15 Aug 2016 20:51:40 +0300
Subject: [PATCH 0643/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64bea7c57..1011a4815 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@ Change Log
 ===
 ## Next
 
+## 3.0.4
+ * Make cert util methods public.
+
 ## 3.0.3
  * [JERSEY] Don't send body for start container request.
 

From d2b511f45e14791887e1861044ca6d3cc4b44ff4 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 15 Aug 2016 20:57:23 +0300
Subject: [PATCH 0644/1272] [maven-release-plugin] prepare release 3.0.4

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a14a31e5f..854782b2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.4-SNAPSHOT</version>
+	<version>3.0.4</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.0.4</tag>
 	</scm>
 
 	<developers>

From f751dc25cc9fc38c9e643a068e793d32f54c1664 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 15 Aug 2016 20:57:31 +0300
Subject: [PATCH 0645/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 854782b2c..6d1ccca18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.4</version>
+	<version>3.0.5-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.0.4</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 36d17ca42b9fd706b864ac3d11380bd8c4ccbac6 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 16 Aug 2016 22:07:15 +0300
Subject: [PATCH 0646/1272] Update devel.adoc

https://github.com/jenkinsci/credentials-plugin/blob/master/CONTRIBUTING.md
---
 docs/devel.adoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/devel.adoc b/docs/devel.adoc
index 2305b89d0..1b6295662 100644
--- a/docs/devel.adoc
+++ b/docs/devel.adoc
@@ -13,6 +13,7 @@
   ** Provide full information on field:
   *** For models define API version with `@since {@link RemoteApiVersion#VERSION_1_X}`.
   ** getters/setters should refernce to field `@see #$field`.
+  * If it is `Serializable` it shall have a `serialVersionUID` field. Unless code has shipped to users, the initial value of the `serialVersionUID` field shall be `1L`.
 
 ### Coding style
   * TBD, some initial styling already enforced with checkstyle.

From e95f78621d4c3aeb8fad9b79f8b5a1093a8e8547 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 17 Aug 2016 10:39:14 +0300
Subject: [PATCH 0647/1272] Update Events to 1.24 model (#669)

* added event type in Event class #650
* added missing import for JsonProperty
* added CheckForNull
* Sync event model to 1.24

Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
---
 .../github/dockerjava/api/model/Event.java    | 184 ++++++++++++++++--
 .../dockerjava/api/model/EventActor.java      |  77 ++++++++
 .../dockerjava/api/model/EventType.java       |  55 ++++++
 .../dockerjava/api/model/EventsTest.java      |  64 ++++++
 .../resources/samples/1.24/events/docs1.json  |  17 ++
 5 files changed, 384 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/EventActor.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/EventType.java
 create mode 100644 src/test/java/com/github/dockerjava/api/model/EventsTest.java
 create mode 100644 src/test/resources/samples/1.24/events/docs1.json

diff --git a/src/main/java/com/github/dockerjava/api/model/Event.java b/src/main/java/com/github/dockerjava/api/model/Event.java
index 202f5a350..b8024b5ee 100644
--- a/src/main/java/com/github/dockerjava/api/model/Event.java
+++ b/src/main/java/com/github/dockerjava/api/model/Event.java
@@ -1,10 +1,17 @@
 package com.github.dockerjava.api.model;
 
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.annotation.CheckForNull;
+
+import static org.apache.commons.lang.builder.ToStringStyle.SHORT_PREFIX_STYLE;
 
 /**
  * Representation of a Docker event.
@@ -12,16 +19,60 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_NULL)
 public class Event {
+
+    /**
+     * @since 1.16
+     */
+    @JsonProperty("status")
     private String status;
 
+    /**
+     * @since 1.16
+     */
+    @JsonProperty("id")
     private String id;
 
+    /**
+     * @since 1.16
+     */
+    @JsonProperty("from")
     private String from;
 
+    /**
+     * ??
+     */
+    @JsonProperty("node")
+    private Node node;
+
+    /*
+     * @since 1.
+     */
+    @JsonProperty("Type")
+    private EventType type;
+
+    /**
+     * @since 1.22
+     */
+    @JsonProperty("Action")
+    private String action;
+
+    /**
+     * @since 1.22
+     */
+    @JsonProperty("Actor")
+    private EventActor actor;
+
+    /**
+     * @since 1.16
+     */
+    @JsonProperty("time")
     private Long time;
 
-    @JsonIgnoreProperties
-    private Node node;
+    /**
+     * @since 1.21
+     */
+    @JsonProperty("timeNano")
+    private Long timeNano;
 
     /**
      * Default constructor for the deserialization.
@@ -32,16 +83,12 @@ public Event() {
     /**
      * Constructor.
      *
-     * @param id
-     *            Container ID
-     * @param status
-     *            Status string. List of statuses is available in <a
-     *            href="https://docs.docker.com/reference/api/docker_remote_api_v1.16/#monitor-dockers-events">Docker API v.1.16</a>
-     * @param from
-     *            Image, from which the container has been created
-     * @param time
-     *            Event time The time is specified in milliseconds since January 1, 1970, 00:00:00 GMT
-     * @since TODO
+     * @param id     Container ID
+     * @param status Status string. List of statuses is available in <a
+     *               href="https://docs.docker.com/reference/api/docker_remote_api_v1.16/#monitor-dockers-events">Docker API v.1.16</a>
+     * @param from   Image, from which the container has been created
+     * @param time   Event time The time is specified in milliseconds since January 1, 1970, 00:00:00 GMT
+     * @since 1.16
      */
     public Event(String status, String id, String from, Long time) {
         this.status = status;
@@ -60,6 +107,14 @@ public String getStatus() {
         return status;
     }
 
+    /**
+     * @see #status
+     */
+    public Event withStatus(String status) {
+        this.status = status;
+        return this;
+    }
+
     /**
      * Get ID of docker container.
      *
@@ -69,6 +124,14 @@ public String getId() {
         return id;
     }
 
+    /**
+     * @see #id
+     */
+    public Event withId(String id) {
+        this.id = id;
+        return this;
+    }
+
     /**
      * Get source image of the container.
      *
@@ -78,6 +141,14 @@ public String getFrom() {
         return from;
     }
 
+    /**
+     * @see #from
+     */
+    public Event withFrom(String from) {
+        this.from = from;
+        return this;
+    }
+
     /**
      * Get the event time. The time is specified in milliseconds since January 1, 1970, 00:00:00 GMT
      *
@@ -87,6 +158,30 @@ public Long getTime() {
         return time;
     }
 
+    /**
+     * @see #time
+     */
+    public Event withTime(Long time) {
+        this.time = time;
+        return this;
+    }
+
+    /**
+     * @see #timeNano
+     */
+    @CheckForNull
+    public Long getTimeNano() {
+        return timeNano;
+    }
+
+    /**
+     * @see #timeNano
+     */
+    public Event withTimenano(Long timenano) {
+        this.timeNano = timenano;
+        return this;
+    }
+
     /**
      * Returns the node when working against docker swarm
      */
@@ -94,8 +189,71 @@ public Node getNode() {
         return node;
     }
 
+    /**
+     * @see #node
+     */
+    public Event withNode(Node node) {
+        this.node = node;
+        return this;
+    }
+
+    @CheckForNull
+    public EventType getType() {
+        return type;
+    }
+
+    /**
+     * @see #type
+     */
+    public Event withType(EventType type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * @see #action
+     */
+    @CheckForNull
+    public String getAction() {
+        return action;
+    }
+
+    /**
+     * @see #action
+     */
+    public Event withAction(String action) {
+        this.action = action;
+        return this;
+    }
+
+    /**
+     * @see #actor
+     */
+    @CheckForNull
+    public EventActor getActor() {
+        return actor;
+    }
+
+    /**
+     * @see #actor
+     */
+    public Event withEventActor(EventActor actor) {
+        this.actor = actor;
+        return this;
+    }
+
     @Override
     public String toString() {
-        return ToStringBuilder.reflectionToString(this);
+        return ToStringBuilder.reflectionToString(this, SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/EventActor.java b/src/main/java/com/github/dockerjava/api/model/EventActor.java
new file mode 100644
index 000000000..f7b0abbf3
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/EventActor.java
@@ -0,0 +1,77 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * @author Kanstantsin Shautsou
+ * @since 1.22
+ */
+public class EventActor implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * @since 1.22
+     */
+    @JsonProperty("ID")
+    private String id;
+
+    /**
+     * @since 1.22
+     */
+    @JsonProperty("Attributes")
+    private Map<String, String> attributes;
+
+    /**
+     * @see #id
+     */
+    @CheckForNull
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * @see #id
+     */
+    public EventActor withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    /**
+     * @see #attributes
+     */
+    @CheckForNull
+    public Map<String, String> getAttributes() {
+        return attributes;
+    }
+
+    /**
+     * @see #attributes
+     */
+    public EventActor withAttributes(Map<String, String> attributes) {
+        this.attributes = attributes;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/EventType.java b/src/main/java/com/github/dockerjava/api/model/EventType.java
new file mode 100644
index 000000000..697c1e429
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/EventType.java
@@ -0,0 +1,55 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import javax.annotation.Nonnull;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @since 1.24
+ */
+public enum EventType {
+    /**
+     * @since 1.24
+     */
+    CONTAINER("container"),
+
+    /**
+     * @since 1.24
+     */
+    DAEMON("daemon"),
+
+    /**
+     * @since 1.24
+     */
+    IMAGE("image"),
+    NETWORK("network"),
+    PLUGIN("plugin"),
+    VOLUME("volume");
+
+    private static final Map<String, EventType> EVENT_TYPES = new HashMap<>();
+
+    static {
+        for (EventType t : values()) {
+            EVENT_TYPES.put(t.name().toLowerCase(), t);
+        }
+    }
+
+    private String value;
+
+    EventType(@Nonnull String value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+        return value;
+    }
+
+    @JsonCreator
+    public static EventType forValue(String s) {
+        return EVENT_TYPES.get(s);
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/api/model/EventsTest.java b/src/test/java/com/github/dockerjava/api/model/EventsTest.java
new file mode 100644
index 000000000..ce62c7d5f
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/api/model/EventsTest.java
@@ -0,0 +1,64 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.util.HashMap;
+
+import static com.github.dockerjava.api.model.EventType.CONTAINER;
+import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.notNullValue;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+public class EventsTest {
+
+    @Test
+    public void serderDocs1() throws IOException {
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(Event.class);
+
+        final Event event = testRoundTrip(RemoteApiVersion.VERSION_1_24,
+                "/events/docs1.json",
+                type
+        );
+
+        assertThat(event, notNullValue());
+        assertThat(event.getType(), is(CONTAINER));
+        assertThat(event.getAction(), is("create"));
+        assertThat(event.getId(), is("ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743"));
+        assertThat(event.getFrom(), is("alpine"));
+        assertThat(event.getTime(), is(1461943101L));
+        assertThat(event.getNode(), nullValue());
+        assertThat(event.getTimeNano(), is(1461943101381709551L));
+
+        final HashMap<String, String> attributes = new HashMap<>();
+        attributes.put("com.example.some-label", "some-label-value");
+        attributes.put("image", "alpine");
+        attributes.put("name", "my-container");
+
+        final EventActor actor = new EventActor()
+                .withId("ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743")
+                .withAttributes(attributes);
+
+        final Event event1 = new Event()
+                .withType(CONTAINER)
+                .withStatus("create")
+                .withId("ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743")
+                .withFrom("alpine")
+                .withTime(1461943101L)
+                .withTimenano(1461943101381709551L)
+                .withAction("create")
+                .withEventActor(actor);
+
+        assertThat(event1, equalTo(event));
+    }
+}
diff --git a/src/test/resources/samples/1.24/events/docs1.json b/src/test/resources/samples/1.24/events/docs1.json
new file mode 100644
index 000000000..f62f2284e
--- /dev/null
+++ b/src/test/resources/samples/1.24/events/docs1.json
@@ -0,0 +1,17 @@
+{
+  "status": "create",
+  "id": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
+  "from": "alpine",
+  "Type": "container",
+  "Action": "create",
+  "Actor": {
+    "ID": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
+    "Attributes": {
+      "com.example.some-label": "some-label-value",
+      "image": "alpine",
+      "name": "my-container"
+    }
+  },
+  "time": 1461943101,
+  "timeNano": 1461943101381709551
+}

From bb83b03207cd6a641616f1112a5a5f32d40f2467 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 17 Aug 2016 12:02:14 +0300
Subject: [PATCH 0648/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1011a4815..bd6c2d278 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@ Change Log
 ===
 ## Next
 
+## 3.0.5
+ * Events updated to 1.24 API model.
+
 ## 3.0.4
  * Make cert util methods public.
 

From af8374f622d442a81ae558fa757c03d879fa2848 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 17 Aug 2016 13:37:57 +0300
Subject: [PATCH 0649/1272] [maven-release-plugin] prepare release 3.0.5

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6d1ccca18..00a4561b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.5-SNAPSHOT</version>
+	<version>3.0.5</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.0.5</tag>
 	</scm>
 
 	<developers>

From 8c456c2334c656a6ca20cc502440fdf01175f577 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 17 Aug 2016 13:38:04 +0300
Subject: [PATCH 0650/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 00a4561b5..b1b6d96a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.5</version>
+	<version>3.0.6-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.0.5</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 96d7ddbea9a442875b33406d81b9ea678c1fb5b1 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 17 Aug 2016 00:16:21 +0300
Subject: [PATCH 0651/1272] Make all models serializable

---
 .../dockerjava/api/model/AuthConfig.java      |  4 +-
 .../api/model/AuthConfigurations.java         |  4 +-
 .../dockerjava/api/model/AuthResponse.java    |  6 +-
 .../com/github/dockerjava/api/model/Bind.java |  5 +-
 .../github/dockerjava/api/model/Binds.java    |  4 +-
 .../api/model/BuildResponseItem.java          |  1 -
 .../dockerjava/api/model/ChangeLog.java       |  5 +-
 .../dockerjava/api/model/Container.java       |  4 +-
 .../dockerjava/api/model/ContainerConfig.java |  4 +-
 .../api/model/ContainerHostConfig.java        |  6 +-
 .../api/model/ContainerNetwork.java           |  5 +-
 .../api/model/ContainerNetworkSettings.java   |  5 +-
 .../dockerjava/api/model/ContainerPort.java   |  4 +-
 .../github/dockerjava/api/model/Device.java   |  4 +-
 .../dockerjava/api/model/DriverStatus.java    |  7 ++-
 .../dockerjava/api/model/ErrorDetail.java     |  6 +-
 .../dockerjava/api/model/ErrorResponse.java   |  6 +-
 .../github/dockerjava/api/model/Event.java    |  5 +-
 .../dockerjava/api/model/ExposedPort.java     |  4 +-
 .../dockerjava/api/model/ExposedPorts.java    |  4 +-
 .../github/dockerjava/api/model/Frame.java    |  5 +-
 .../dockerjava/api/model/HostConfig.java      |  4 +-
 .../dockerjava/api/model/Identifier.java      |  8 ++-
 .../github/dockerjava/api/model/Image.java    |  5 +-
 .../com/github/dockerjava/api/model/Info.java |  4 +-
 .../api/model/InfoRegistryConfig.java         |  5 +-
 .../com/github/dockerjava/api/model/Link.java |  5 +-
 .../github/dockerjava/api/model/Links.java    |  4 +-
 .../dockerjava/api/model/LogConfig.java       |  4 +-
 .../github/dockerjava/api/model/LxcConf.java  |  6 +-
 .../github/dockerjava/api/model/Network.java  |  4 +-
 .../dockerjava/api/model/NetworkSettings.java |  4 +-
 .../com/github/dockerjava/api/model/Node.java |  5 +-
 .../dockerjava/api/model/PortBinding.java     |  6 +-
 .../github/dockerjava/api/model/Ports.java    |  4 +-
 .../dockerjava/api/model/Repository.java      |  5 +-
 .../dockerjava/api/model/ResponseItem.java    |  1 -
 .../dockerjava/api/model/RestartPolicy.java   |  5 +-
 .../dockerjava/api/model/SearchItem.java      |  5 +-
 .../dockerjava/api/model/Statistics.java      |  4 +-
 .../github/dockerjava/api/model/Ulimit.java   |  5 +-
 .../github/dockerjava/api/model/Version.java  |  4 +-
 .../github/dockerjava/api/model/Volume.java   |  5 +-
 .../dockerjava/api/model/VolumeBind.java      |  6 +-
 .../dockerjava/api/model/VolumeBinds.java     |  5 +-
 .../github/dockerjava/api/model/VolumeRW.java |  4 +-
 .../github/dockerjava/api/model/Volumes.java  |  4 +-
 .../dockerjava/api/model/VolumesFrom.java     |  4 +-
 .../dockerjava/api/model/VolumesRW.java       |  5 +-
 .../dockerjava/api/model/WaitResponse.java    |  5 +-
 .../api/ModelsSerializableTest.java           | 63 +++++++++++++++++++
 51 files changed, 244 insertions(+), 52 deletions(-)
 create mode 100644 src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java

diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
index 849f26a21..074c6db61 100644
--- a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -8,9 +8,11 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.annotation.CheckForNull;
+import java.io.Serializable;
 
 @JsonInclude(Include.NON_NULL)
-public class AuthConfig {
+public class AuthConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     /**
      * For backwards compatibility. Make sure you update the properties if you change this.
diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java b/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
index e8edbc950..baa8fc0b4 100644
--- a/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
+++ b/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
@@ -1,11 +1,13 @@
 package com.github.dockerjava.api.model;
 
+import java.io.Serializable;
 import java.util.Map;
 import java.util.TreeMap;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public class AuthConfigurations {
+public class AuthConfigurations implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @JsonProperty("configs")
     private Map<String, AuthConfig> configs = new TreeMap<>();
diff --git a/src/main/java/com/github/dockerjava/api/model/AuthResponse.java b/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
index cb5d9df80..cd6908185 100644
--- a/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
+++ b/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
@@ -2,7 +2,11 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public class AuthResponse {
+import java.io.Serializable;
+
+public class AuthResponse implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     @JsonProperty("Status")
     private String status;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Bind.java b/src/main/java/com/github/dockerjava/api/model/Bind.java
index bf02bbad2..0995c87ac 100644
--- a/src/main/java/com/github/dockerjava/api/model/Bind.java
+++ b/src/main/java/com/github/dockerjava/api/model/Bind.java
@@ -3,11 +3,14 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
+import java.io.Serializable;
+
 /**
  * Represents a host path being bind mounted as a {@link Volume} in a Docker container.
  * The Bind can be in read only or read write access mode.
  */
-public class Bind {
+public class Bind implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private String path;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Binds.java b/src/main/java/com/github/dockerjava/api/model/Binds.java
index 917cfdcbd..b24c3208d 100644
--- a/src/main/java/com/github/dockerjava/api/model/Binds.java
+++ b/src/main/java/com/github/dockerjava/api/model/Binds.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.model;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -19,7 +20,8 @@
 
 @JsonSerialize(using = Binds.Serializer.class)
 @JsonDeserialize(using = Binds.Deserializer.class)
-public class Binds {
+public class Binds implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private Bind[] binds;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
index a53a1df9a..7236be23d 100644
--- a/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
@@ -8,7 +8,6 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class BuildResponseItem extends ResponseItem {
-
     private static final long serialVersionUID = -1252904184236343612L;
 
     private static final String BUILD_SUCCESS = "Successfully built";
diff --git a/src/main/java/com/github/dockerjava/api/model/ChangeLog.java b/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
index 36804362c..04b36f5ce 100644
--- a/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
+++ b/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
@@ -5,13 +5,16 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import java.io.Serializable;
+
 /**
  *
  * @author Konstantin Pelykh (kpelykh@gmail.com)
  *
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ChangeLog {
+public class ChangeLog implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @JsonProperty("Path")
     private String path;
diff --git a/src/main/java/com/github/dockerjava/api/model/Container.java b/src/main/java/com/github/dockerjava/api/model/Container.java
index 47492920d..9e04362ce 100644
--- a/src/main/java/com/github/dockerjava/api/model/Container.java
+++ b/src/main/java/com/github/dockerjava/api/model/Container.java
@@ -11,6 +11,7 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import javax.annotation.CheckForNull;
+import java.io.Serializable;
 import java.util.Map;
 
 /**
@@ -20,7 +21,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_NULL)
-public class Container {
+public class Container implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @JsonProperty("Command")
     private String command;
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
index 224da3272..191126798 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
@@ -10,6 +10,7 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import javax.annotation.CheckForNull;
+import java.io.Serializable;
 import java.util.Map;
 
 /**
@@ -19,7 +20,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_NULL)
-public class ContainerConfig {
+public class ContainerConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @JsonProperty("AttachStderr")
     private Boolean attachStderr;
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java b/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
index 43a5a94b1..8d0c3fe37 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
@@ -6,6 +6,8 @@
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
+import java.io.Serializable;
+
 /**
  * Used in {@link Container}
  *
@@ -13,7 +15,9 @@
  * @author Kanstantsin Shautsou
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ContainerHostConfig {
+public class ContainerHostConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     @JsonProperty("NetworkMode")
     private String networkMode;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java b/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
index 9b2160e98..bc7e12d33 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
@@ -9,6 +9,7 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import javax.annotation.CheckForNull;
+import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 
@@ -21,7 +22,9 @@
  * @author Kanstantsin Shautsou
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ContainerNetwork {
+public class ContainerNetwork implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     /**
      * FIXME verify
      */
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java b/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
index 7f4b17be5..bc6165874 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
@@ -7,6 +7,7 @@
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
+import java.io.Serializable;
 import java.util.Map;
 
 /**
@@ -16,7 +17,9 @@
  * @since {@link RemoteApiVersion#VERSION_1_22}
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ContainerNetworkSettings {
+public class ContainerNetworkSettings implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     /**
      * @since {@link RemoteApiVersion#VERSION_1_22}
      */
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerPort.java b/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
index 09f718ef6..5924e53df 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
@@ -7,13 +7,15 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import javax.annotation.CheckForNull;
+import java.io.Serializable;
 
 /**
  * @author Kanstantsin Shautsou
  * @see Container
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ContainerPort {
+public class ContainerPort implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @JsonProperty("IP")
     private String ip;
diff --git a/src/main/java/com/github/dockerjava/api/model/Device.java b/src/main/java/com/github/dockerjava/api/model/Device.java
index f2b75e3f5..7d73710fd 100644
--- a/src/main/java/com/github/dockerjava/api/model/Device.java
+++ b/src/main/java/com/github/dockerjava/api/model/Device.java
@@ -12,12 +12,14 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.annotation.Nonnull;
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.StringTokenizer;
 
 @JsonInclude(Include.NON_NULL)
-public class Device {
+public class Device implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @JsonProperty("CgroupPermissions")
     private String cGroupPermissions = "";
diff --git a/src/main/java/com/github/dockerjava/api/model/DriverStatus.java b/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
index 3e2b5037a..7c1374aae 100644
--- a/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
+++ b/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
@@ -7,12 +7,15 @@
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import java.io.Serializable;
+
 /**
- * Created by ben on 12/12/13.
+ * @author ben
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_NULL)
-public class DriverStatus {
+public class DriverStatus implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @JsonProperty("Root Dir")
     private String rootDir;
diff --git a/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java b/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
index 62018a4e0..92e869d2a 100644
--- a/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
+++ b/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
@@ -4,8 +4,12 @@
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import java.io.Serializable;
+
 @JsonInclude(Include.NON_NULL)
-public class ErrorDetail {
+public class ErrorDetail implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     @JsonProperty
     private String message;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java b/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
index 172bd5c79..f6abfc3eb 100644
--- a/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
+++ b/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
@@ -4,8 +4,12 @@
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import java.io.Serializable;
+
 @JsonInclude(Include.NON_NULL)
-public class ErrorResponse {
+public class ErrorResponse implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     @JsonProperty
     private ErrorDetail errorDetail;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Event.java b/src/main/java/com/github/dockerjava/api/model/Event.java
index b8024b5ee..6e4b6f3c2 100644
--- a/src/main/java/com/github/dockerjava/api/model/Event.java
+++ b/src/main/java/com/github/dockerjava/api/model/Event.java
@@ -13,12 +13,15 @@
 
 import static org.apache.commons.lang.builder.ToStringStyle.SHORT_PREFIX_STYLE;
 
+import java.io.Serializable;
+
 /**
  * Representation of a Docker event.
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_NULL)
-public class Event {
+public class Event implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     /**
      * @since 1.16
diff --git a/src/main/java/com/github/dockerjava/api/model/ExposedPort.java b/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
index ec95f6273..26d727ff4 100644
--- a/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
+++ b/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
@@ -4,6 +4,7 @@
 import static com.github.dockerjava.api.model.InternetProtocol.UDP;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.Map.Entry;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
@@ -30,7 +31,8 @@
  */
 @JsonDeserialize(using = ExposedPort.Deserializer.class)
 @JsonSerialize(using = ExposedPort.Serializer.class)
-public class ExposedPort {
+public class ExposedPort implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private final InternetProtocol protocol;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java b/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
index 0ecb879b6..7670212e1 100644
--- a/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
+++ b/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.model;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -21,7 +22,8 @@
 
 @JsonSerialize(using = ExposedPorts.Serializer.class)
 @JsonDeserialize(using = ExposedPorts.Deserializer.class)
-public class ExposedPorts {
+public class ExposedPorts implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private ExposedPort[] exposedPorts;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Frame.java b/src/main/java/com/github/dockerjava/api/model/Frame.java
index 0ad16e8c6..9b1376f82 100644
--- a/src/main/java/com/github/dockerjava/api/model/Frame.java
+++ b/src/main/java/com/github/dockerjava/api/model/Frame.java
@@ -1,11 +1,14 @@
 package com.github.dockerjava.api.model;
 
+import java.io.Serializable;
 import java.util.Arrays;
 
 /**
  * Represents a logging frame.
  */
-public class Frame {
+public class Frame implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     private final StreamType streamType;
 
     private final byte[] payload;
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 5dada65cc..062082a03 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -11,6 +11,7 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import javax.annotation.CheckForNull;
+import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
 
@@ -20,7 +21,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_NULL)
-public class HostConfig {
+public class HostConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private static final List<String> PREDEFINED_NETWORKS = Arrays.asList("bridge", "host", "none");
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Identifier.java b/src/main/java/com/github/dockerjava/api/model/Identifier.java
index 1051d857f..8f1c871a7 100644
--- a/src/main/java/com/github/dockerjava/api/model/Identifier.java
+++ b/src/main/java/com/github/dockerjava/api/model/Identifier.java
@@ -3,10 +3,14 @@
 import com.google.common.base.Objects;
 import com.google.common.base.Optional;
 
+import java.io.Serializable;
+
 /**
- * Created by magnayn on 22/07/2014.
+ * @author magnayn
  */
-public class Identifier {
+public class Identifier implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     public final Repository repository;
 
     public final Optional<String> tag;
diff --git a/src/main/java/com/github/dockerjava/api/model/Image.java b/src/main/java/com/github/dockerjava/api/model/Image.java
index 496db275e..78fee9f79 100644
--- a/src/main/java/com/github/dockerjava/api/model/Image.java
+++ b/src/main/java/com/github/dockerjava/api/model/Image.java
@@ -7,6 +7,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import java.io.Serializable;
+
 /**
  *
  * @author Konstantin Pelykh (kpelykh@gmail.com)
@@ -14,7 +16,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_NULL)
-public class Image {
+public class Image implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @JsonProperty("Created")
     private Long created;
diff --git a/src/main/java/com/github/dockerjava/api/model/Info.java b/src/main/java/com/github/dockerjava/api/model/Info.java
index 7270eceb8..51abe5dac 100644
--- a/src/main/java/com/github/dockerjava/api/model/Info.java
+++ b/src/main/java/com/github/dockerjava/api/model/Info.java
@@ -9,6 +9,7 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import javax.annotation.CheckForNull;
+import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
@@ -19,7 +20,8 @@
  */
 @JsonInclude(Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class Info {
+public class Info implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     /**
      * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
diff --git a/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java b/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
index 956aaebe3..2c2be5cfd 100644
--- a/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
@@ -7,6 +7,7 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import javax.annotation.CheckForNull;
+import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
@@ -14,7 +15,9 @@
  * @since ~{@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20}
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public final class InfoRegistryConfig {
+public final class InfoRegistryConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     @JsonProperty("IndexConfigs")
     private Map<String, IndexConfig> indexConfigs;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Link.java b/src/main/java/com/github/dockerjava/api/model/Link.java
index 89647306c..346aedcb0 100644
--- a/src/main/java/com/github/dockerjava/api/model/Link.java
+++ b/src/main/java/com/github/dockerjava/api/model/Link.java
@@ -3,12 +3,15 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
+import java.io.Serializable;
+
 /**
  * Represents a network link between two Docker containers. The container with the name {@link #getName()} is made available in the target
  * container with the aliased name {@link #getAlias()}. This involves creating an entry in <code>/etc/hosts</code> and some environment
  * variables in the target container as well as creating a network bridge between both containers.
  */
-public class Link {
+public class Link implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private final String name;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Links.java b/src/main/java/com/github/dockerjava/api/model/Links.java
index 2d678b3a3..1eb66ae42 100644
--- a/src/main/java/com/github/dockerjava/api/model/Links.java
+++ b/src/main/java/com/github/dockerjava/api/model/Links.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.model;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -20,7 +21,8 @@
 
 @JsonSerialize(using = Links.Serializer.class)
 @JsonDeserialize(using = Links.Deserializer.class)
-public class Links {
+public class Links implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private final Link[] links;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
index f4fd0e958..e2a066101 100644
--- a/src/main/java/com/github/dockerjava/api/model/LogConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.model;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -26,7 +27,8 @@
  * docker will ignore them. In most cases setting the config option to null will suffice. Consult the docker remote API for a more detailed
  * and up-to-date explanation of the available types and their options.
  */
-public class LogConfig {
+public class LogConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @JsonProperty("Type")
     public LoggingType type = null;
diff --git a/src/main/java/com/github/dockerjava/api/model/LxcConf.java b/src/main/java/com/github/dockerjava/api/model/LxcConf.java
index aeb854285..0a60086fb 100644
--- a/src/main/java/com/github/dockerjava/api/model/LxcConf.java
+++ b/src/main/java/com/github/dockerjava/api/model/LxcConf.java
@@ -4,8 +4,12 @@
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import java.io.Serializable;
+
 @JsonInclude(Include.NON_NULL)
-public class LxcConf {
+public class LxcConf implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     @JsonProperty("Key")
     public String key;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Network.java b/src/main/java/com/github/dockerjava/api/model/Network.java
index 6f4114914..c0f9f36eb 100644
--- a/src/main/java/com/github/dockerjava/api/model/Network.java
+++ b/src/main/java/com/github/dockerjava/api/model/Network.java
@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -12,7 +13,8 @@
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class Network {
+public class Network implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @JsonProperty("Id")
     private String id;
diff --git a/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java b/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
index 1d523bf4b..8fcd8fb9b 100644
--- a/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
+++ b/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
@@ -8,6 +8,7 @@
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
+import java.io.Serializable;
 import java.util.Map;
 
 /**
@@ -16,7 +17,8 @@
  *
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class NetworkSettings {
+public class NetworkSettings implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @JsonProperty("Bridge")
     private String bridge;
diff --git a/src/main/java/com/github/dockerjava/api/model/Node.java b/src/main/java/com/github/dockerjava/api/model/Node.java
index 9e8580e0a..89b391c0a 100644
--- a/src/main/java/com/github/dockerjava/api/model/Node.java
+++ b/src/main/java/com/github/dockerjava/api/model/Node.java
@@ -4,11 +4,14 @@
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import java.io.Serializable;
+
 /**
  * A node as returned by the /events API, for instance, when Swarm is used.
  */
 @JsonInclude(Include.NON_NULL)
-public class Node {
+public class Node implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @JsonProperty("Name")
     private String name;
diff --git a/src/main/java/com/github/dockerjava/api/model/PortBinding.java b/src/main/java/com/github/dockerjava/api/model/PortBinding.java
index e163272d7..9a30b6cd2 100644
--- a/src/main/java/com/github/dockerjava/api/model/PortBinding.java
+++ b/src/main/java/com/github/dockerjava/api/model/PortBinding.java
@@ -6,6 +6,8 @@
 
 import com.github.dockerjava.api.model.Ports.Binding;
 
+import java.io.Serializable;
+
 /**
  * In a {@link PortBinding}, a network socket on the Docker host, expressed as a {@link Binding}, is bound to an {@link ExposedPort} of a
  * container. A {@link PortBinding} corresponds to the <code>--publish</code> (<code>-p</code>) option of the <code>docker run</code> (and
@@ -15,7 +17,9 @@
  * existing port bindings from a container configuration in {@link NetworkSettings#getPorts()} and {@link HostConfig#getPortBindings()}. In
  * that context, a <code>Map&lt;ExposedPort, Binding[]&gt;</code> is used.</i>
  */
-public class PortBinding {
+public class PortBinding implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     private final Binding binding;
 
     private final ExposedPort exposedPort;
diff --git a/src/main/java/com/github/dockerjava/api/model/Ports.java b/src/main/java/com/github/dockerjava/api/model/Ports.java
index 904a31c4e..673852d9e 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -16,6 +16,7 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -35,7 +36,8 @@
 @SuppressWarnings(value = "checkstyle:equalshashcode")
 @JsonDeserialize(using = Ports.Deserializer.class)
 @JsonSerialize(using = Ports.Serializer.class)
-public class Ports {
+public class Ports implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private final Map<ExposedPort, Binding[]> ports = new HashMap<ExposedPort, Binding[]>();
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Repository.java b/src/main/java/com/github/dockerjava/api/model/Repository.java
index 1e814a1b5..f4e4b9ab8 100644
--- a/src/main/java/com/github/dockerjava/api/model/Repository.java
+++ b/src/main/java/com/github/dockerjava/api/model/Repository.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.model;
 
+import java.io.Serializable;
 import java.net.MalformedURLException;
 import java.net.URL;
 
@@ -8,7 +9,9 @@
 /**
  * A repository or image name.
  */
-public class Repository {
+public class Repository implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     public final String name;
 
     /**
diff --git a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
index 12a090db8..6663b4bf0 100644
--- a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
@@ -15,7 +15,6 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ResponseItem implements Serializable {
-
     private static final long serialVersionUID = -5187169652557467828L;
 
     @JsonProperty("stream")
diff --git a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
index ac6c4a318..1f77b8b9d 100644
--- a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
+++ b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
@@ -7,6 +7,8 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import java.io.Serializable;
+
 /**
  * Container restart policy
  *
@@ -26,7 +28,8 @@
  * @author Marcus Linke
  *
  */
-public class RestartPolicy {
+public class RestartPolicy implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @JsonProperty("MaximumRetryCount")
     private Integer maximumRetryCount = 0;
diff --git a/src/main/java/com/github/dockerjava/api/model/SearchItem.java b/src/main/java/com/github/dockerjava/api/model/SearchItem.java
index 0a5843838..4e1663655 100644
--- a/src/main/java/com/github/dockerjava/api/model/SearchItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/SearchItem.java
@@ -5,13 +5,16 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import java.io.Serializable;
+
 /**
  *
  * @author Konstantin Pelykh (kpelykh@gmail.com)
  *
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class SearchItem {
+public class SearchItem implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @JsonProperty("star_count")
     private Integer starCount;
diff --git a/src/main/java/com/github/dockerjava/api/model/Statistics.java b/src/main/java/com/github/dockerjava/api/model/Statistics.java
index 21b9ca923..cf8c1b77e 100644
--- a/src/main/java/com/github/dockerjava/api/model/Statistics.java
+++ b/src/main/java/com/github/dockerjava/api/model/Statistics.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.model;
 
+import java.io.Serializable;
 import java.util.Map;
 
 import javax.annotation.CheckForNull;
@@ -16,7 +17,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_NULL)
-public class Statistics {
+public class Statistics implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @JsonProperty("read")
     private String read;
diff --git a/src/main/java/com/github/dockerjava/api/model/Ulimit.java b/src/main/java/com/github/dockerjava/api/model/Ulimit.java
index 7427fb0cc..abcf298bd 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ulimit.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ulimit.java
@@ -7,10 +7,13 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import java.io.Serializable;
+
 /**
  * @author Vangie Du (duwan@live.com)
  */
-public class Ulimit {
+public class Ulimit implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @JsonProperty("Name")
     private String name;
diff --git a/src/main/java/com/github/dockerjava/api/model/Version.java b/src/main/java/com/github/dockerjava/api/model/Version.java
index 004c85f22..f08c411e2 100644
--- a/src/main/java/com/github/dockerjava/api/model/Version.java
+++ b/src/main/java/com/github/dockerjava/api/model/Version.java
@@ -8,6 +8,7 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import javax.annotation.CheckForNull;
+import java.io.Serializable;
 
 /**
  * Used for `/version`
@@ -16,7 +17,8 @@
  * @see VersionCmd
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class Version {
+public class Version implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @JsonProperty("ApiVersion")
     private String apiVersion;
diff --git a/src/main/java/com/github/dockerjava/api/model/Volume.java b/src/main/java/com/github/dockerjava/api/model/Volume.java
index 655a8dbfc..46989f79c 100644
--- a/src/main/java/com/github/dockerjava/api/model/Volume.java
+++ b/src/main/java/com/github/dockerjava/api/model/Volume.java
@@ -3,12 +3,15 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
+import java.io.Serializable;
+
 /**
  * Represents a bind mounted volume in a Docker container.
  *
  * @see Bind
  */
-public class Volume {
+public class Volume implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private String path;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeBind.java b/src/main/java/com/github/dockerjava/api/model/VolumeBind.java
index cf9c077ab..f78fc587e 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumeBind.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumeBind.java
@@ -1,6 +1,10 @@
 package com.github.dockerjava.api.model;
 
-public class VolumeBind {
+import java.io.Serializable;
+
+public class VolumeBind implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     private final String hostPath;
 
     private final String containerPath;
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java b/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
index d8303ec84..aeef19e9f 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.model;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -22,7 +23,9 @@
 // This is not going to be serialized
 @JsonDeserialize(using = VolumeBinds.Deserializer.class)
 @JsonSerialize(using = VolumeBinds.Serializer.class)
-public class VolumeBinds {
+public class VolumeBinds implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     private final VolumeBind[] binds;
 
     public VolumeBinds(VolumeBind... binds) {
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeRW.java b/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
index 7c4bdfb26..229cee3ed 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.model;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.Map.Entry;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
@@ -29,7 +30,8 @@
 @JsonDeserialize(using = VolumeRW.Deserializer.class)
 @JsonSerialize(using = VolumeRW.Serializer.class)
 @Deprecated
-public class VolumeRW {
+public class VolumeRW implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private Volume volume;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/Volumes.java b/src/main/java/com/github/dockerjava/api/model/Volumes.java
index 46175548d..3246b0e8e 100644
--- a/src/main/java/com/github/dockerjava/api/model/Volumes.java
+++ b/src/main/java/com/github/dockerjava/api/model/Volumes.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.model;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -21,7 +22,8 @@
 
 @JsonSerialize(using = Volumes.Serializer.class)
 @JsonDeserialize(using = Volumes.Deserializer.class)
-public class Volumes {
+public class Volumes implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private Volume[] volumes;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java b/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
index f027b6d71..fb52ff3f7 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.model;
 
 import java.io.IOException;
+import java.io.Serializable;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
@@ -19,7 +20,8 @@
 
 @JsonSerialize(using = VolumesFrom.Serializer.class)
 @JsonDeserialize(using = VolumesFrom.Deserializer.class)
-public class VolumesFrom {
+public class VolumesFrom implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private String container;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumesRW.java b/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
index f54f8242c..1b12bd13d 100644
--- a/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
+++ b/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.model;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -22,7 +23,9 @@
 // This is not going to be serialized
 @JsonSerialize(using = VolumesRW.Serializer.class)
 @JsonDeserialize(using = VolumesRW.Deserializer.class)
-public class VolumesRW {
+public class VolumesRW implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     private final VolumeRW[] volumesRW;
 
     public VolumesRW(VolumeRW... binds) {
diff --git a/src/main/java/com/github/dockerjava/api/model/WaitResponse.java b/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
index a2ab16f6f..0cab338b2 100644
--- a/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
+++ b/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
@@ -3,11 +3,14 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import java.io.Serializable;
+
 /**
  * Represents a wait container command response
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class WaitResponse {
+public class WaitResponse implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @JsonProperty("StatusCode")
     private Integer statusCode;
diff --git a/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java b/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java
new file mode 100644
index 000000000..770b136c9
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java
@@ -0,0 +1,63 @@
+package com.github.dockerjava.api;
+
+import com.github.dockerjava.api.model.Binds;
+import com.github.dockerjava.api.model.BuildResponseItem;
+import com.github.dockerjava.api.model.PullResponseItem;
+import com.github.dockerjava.api.model.PushResponseItem;
+import com.github.dockerjava.api.model.ResponseItem;
+import com.google.common.reflect.ClassPath.ClassInfo;
+import org.apache.commons.lang.reflect.FieldUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
+
+import static com.google.common.reflect.ClassPath.from;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.object.IsCompatibleType.typeCompatibleWith;
+import static org.junit.Assert.assertThat;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+public class ModelsSerializableTest {
+    private static final Logger LOG = LoggerFactory.getLogger(ModelsSerializableTest.class);
+
+    private List<String> excludeClasses = Arrays.asList(
+            Binds.class.getName(),
+            BuildResponseItem.class.getName(),
+            PullResponseItem.class.getName(),
+            PushResponseItem.class.getName(),
+            ResponseItem.class.getName()
+    );
+
+    @Test
+    public void allModelsSerializable() throws IOException, NoSuchFieldException, IllegalAccessException {
+        final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+        for (ClassInfo classInfo : from(contextClassLoader).getTopLevelClasses("com.github.dockerjava.api.model")) {
+            if (classInfo.getName().endsWith("Test")) {
+                continue;
+            }
+
+            final Class<?> aClass = classInfo.load();
+            if (aClass.getProtectionDomain().getCodeSource().getLocation().getPath().endsWith("test-classes/")
+                    || aClass.isEnum()) {
+                continue;
+            }
+
+            LOG.debug("aClass: {}", aClass);
+            assertThat(aClass, typeCompatibleWith(Serializable.class));
+
+            final Object serialVersionUID = FieldUtils.readDeclaredStaticField(aClass, "serialVersionUID", true);
+            if (!excludeClasses.contains(aClass.getName())) {
+                assertThat(serialVersionUID, instanceOf(Long.class));
+                assertThat("Follow devel docs", (Long) serialVersionUID, is(1L));
+            }
+        }
+    }
+}

From 0183bd6271d09be07c38bfdda27d473f44f34225 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 19 Aug 2016 00:46:48 +0300
Subject: [PATCH 0652/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd6c2d278..e2361ea85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@ Change Log
 ===
 ## Next
 
+## 3.0.7
+ * Make all models Serializable
+
 ## 3.0.5
  * Events updated to 1.24 API model.
 

From e7c5f278fcf783023a6a94c422da50aa85c84437 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 19 Aug 2016 00:47:09 +0300
Subject: [PATCH 0653/1272] Typo

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2361ea85..8582d4eef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@ Change Log
 ===
 ## Next
 
-## 3.0.7
+## 3.0.6
  * Make all models Serializable
 
 ## 3.0.5

From 75309ffdeed2dcca8e679e6580a308f2e61527aa Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 19 Aug 2016 02:13:36 +0300
Subject: [PATCH 0654/1272] Add maven-central link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e65215648..039657807 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Maven Central](https://img.shields.io/maven-central/v/com.github.docker-java/docker-java.svg)]()
+[![Maven Central](https://img.shields.io/maven-central/v/com.github.docker-java/docker-java.svg)](https://mvnrepository.com/artifact/com.github.docker-java/docker-java)
 [![Bintray](https://api.bintray.com/packages/kostyasha/maven/com.github.docker-java%3Adocker-java/images/download.svg)](https://bintray.com/kostyasha/maven/com.github.docker-java%3Adocker-java/_latestVersion) 
 [![Reference Status](https://www.versioneye.com/java/com.github.docker-java:docker-java/reference_badge.svg?style=flat)](https://www.versioneye.com/java/com.github.docker-java:docker-java/references)
 [![Build Status](https://travis-ci.org/docker-java/docker-java.svg?branch=master)](https://travis-ci.org/docker-java/docker-java)

From c8ab23f0609cb2323114f5ce41cdce87627f956e Mon Sep 17 00:00:00 2001
From: tejksat <tejksat@users.noreply.github.com>
Date: Sun, 28 Aug 2016 18:00:03 +0300
Subject: [PATCH 0655/1272] Fix for #670 (#680)

JSON decoding disabled on /images/load command execution.
---
 .../dockerjava/netty/InvocationBuilder.java   | 31 +++++++++++++++++++
 .../netty/exec/LoadImageCmdExec.java          |  7 ++---
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
index 9669d6818..d76918bcb 100644
--- 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
index 23581119f..30ee716a5 100644
--- 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;
     }
 }

From f44616f0808e1caede610594a769327a38158687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Kubry=C5=84ski?= <jkubrynski@gmail.com>
Date: Sun, 28 Aug 2016 17:43:31 +0200
Subject: [PATCH 0656/1272] Fix #682 - Add LogPath to docker inspect response
 (#683)

* Fix #682 - Add LogPath to docker inspect response

* Fix #682 - Add LogPath to docker inspect response - fixes after code review

* Fix #682 - Add LogPath to docker inspect response - add javadoc

* Fix #682 - Add LogPath to docker inspect response - clean test assertion
---
 .../api/command/InspectContainerResponse.java         | 11 +++++++++++
 .../api/command/InspectContainerResponseTest.java     |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index 59a267e9d..c8027b0ed 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -53,6 +53,12 @@ public class InspectContainerResponse {
     @JsonProperty("HostsPath")
     private String hostsPath;
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_17}
+     */
+    @JsonProperty("LogPath")
+    private String logPath;
+
     @JsonProperty("Id")
     private String id;
 
@@ -168,6 +174,11 @@ public String getHostsPath() {
         return hostsPath;
     }
 
+    @CheckForNull
+    public String getLogPath() {
+        return logPath;
+    }
+
     public String getName() {
         return name;
     }
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
index f64cf4ead..cd4562b4a 100644
--- a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
+++ b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
@@ -22,6 +22,7 @@
 import static com.github.dockerjava.test.serdes.JSONTestHelper.testRoundTrip;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.core.IsNot.not;
@@ -51,6 +52,7 @@ public void roundTrip_full() throws IOException {
         assertEquals(response.getVolumesRW()[1].getVolume().getPath(), "/bar/foo/myvol2");
         assertFalse(response.getVolumesRW()[1].getAccessMode().toBoolean());
         assertTrue(response.getVolumesRW()[0].getAccessMode().toBoolean());
+        assertThat(response.getLogPath(), is("/mnt/sda1/var/lib/docker/containers/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1-json.log"));
     }
 
     @Test

From bcb2ab947ff1020dfd89838a29d540bf802e2e31 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 28 Aug 2016 18:45:25 +0300
Subject: [PATCH 0657/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8582d4eef..735283ae8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,9 @@ Change Log
 ## Next
 
 ## 3.0.6
- * Make all models Serializable
+ * Make all models Serializable.
+ * [NETTY] Fix loadImage responce on 1.24 API.
+ * LogPath field for inspect container.
 
 ## 3.0.5
  * Events updated to 1.24 API model.

From d9f6969e0c8bb7756c0d4301b23688477e3da2d5 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 28 Aug 2016 21:10:49 +0300
Subject: [PATCH 0658/1272] Wait more for this test

---
 .../dockerjava/netty/exec/AttachContainerCmdExecTest.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
index d3e8094cf..8b5759c69 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
@@ -115,7 +115,7 @@ public void onNext(Frame frame) {
                 .withFollowStream(true)
                 .withStdIn(stdin)
                 .exec(callback)
-                .awaitCompletion(15, SECONDS);
+                .awaitCompletion(30, SECONDS);
         callback.close();
 
         assertThat(callback.toString(), containsString(snippet));

From 615c89f30ee301ba47bd5ef82a7549b251a7be5f Mon Sep 17 00:00:00 2001
From: tejksat <tejksat@users.noreply.github.com>
Date: Wed, 31 Aug 2016 01:05:13 +0300
Subject: [PATCH 0659/1272] Fix for #687

---
 .../exec/AttachContainerCmdExecTest.java      | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
index 8b5759c69..66219dc72 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
@@ -6,11 +6,10 @@
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
 
-import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.InputStream;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
 import java.lang.reflect.Method;
-import java.util.concurrent.TimeUnit;
 
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
@@ -93,8 +92,6 @@ public void attachContainerWithStdin() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        Thread.sleep(SECONDS.toMillis(10)); //wait bash initialisation
-
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
         assertTrue(inspectContainerResponse.getState().getRunning());
@@ -107,15 +104,20 @@ public void onNext(Frame frame) {
             }
         };
 
-        InputStream stdin = new ByteArrayInputStream((snippet + "\n").getBytes());
+        PipedOutputStream out = new PipedOutputStream();
+        PipedInputStream in = new PipedInputStream(out);
 
         dockerClient.attachContainerCmd(container.getId())
                 .withStdErr(true)
                 .withStdOut(true)
                 .withFollowStream(true)
-                .withStdIn(stdin)
-                .exec(callback)
-                .awaitCompletion(30, SECONDS);
+                .withStdIn(in)
+                .exec(callback);
+
+        out.write((snippet + "\n").getBytes());
+        out.flush();
+
+        callback.awaitCompletion(15, SECONDS);
         callback.close();
 
         assertThat(callback.toString(), containsString(snippet));

From 74d506dca45c0cc64f567311227c7108ca0101c6 Mon Sep 17 00:00:00 2001
From: tejksat <tejksat@users.noreply.github.com>
Date: Mon, 5 Sep 2016 08:42:35 +0300
Subject: [PATCH 0660/1272] Fix http response input stream resource leak (#633)

there are several problems in the original code:
- not releasing `ByteBuf` queued;
- queuing `ByteBuf` until all data is read what effectively leads to `OutOfDirectMemoryError` if the data read is too big. This happens if you try to copy too big file or folder from a container. To fix this `ResponseCallback` (which in `awaitResult()` waits in fact for `readComplete()` channel method invocation) replaced with `AsyncResultCallback`;
- actually queuing `ByteBuf` anyway leads to `OutOfDirectMemoryError` if data consumption is slower (the next point) than obtaining it;
- poor performance because of the byte-by-byte reads.
---
 .../dockerjava/netty/InvocationBuilder.java   |  56 ++++++-
 .../handler/HttpResponseStreamHandler.java    | 137 ++++++++++++++----
 .../netty/exec/SaveImageCmdExecTest.java      |   5 +-
 .../HttpResponseStreamHandlerTest.java        |  90 +++++++++++-
 4 files changed, 249 insertions(+), 39 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
index d76918bcb..26b950e4e 100644
--- a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
+++ b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
@@ -27,6 +27,7 @@
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.CountDownLatch;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -75,6 +76,57 @@ public void onNext(Void object) {
         }
     }
 
+    /**
+     * Implementation of {@link ResultCallback} with the single result event expected.
+     */
+    public static class AsyncResultCallback<A_RES_T>
+            extends ResultCallbackTemplate<AsyncResultCallback<A_RES_T>, A_RES_T> {
+
+        private A_RES_T result = null;
+
+        private final CountDownLatch resultReady = new CountDownLatch(1);
+
+        @Override
+        public void onNext(A_RES_T object) {
+            onResult(object);
+        }
+
+        private void onResult(A_RES_T object) {
+            if (resultReady.getCount() == 0) {
+                throw new IllegalStateException("Result has already been set");
+            }
+
+            try {
+                result = object;
+            } finally {
+                resultReady.countDown();
+            }
+        }
+
+        @Override
+        public void close() throws IOException {
+            try {
+                super.close();
+            } finally {
+                resultReady.countDown();
+            }
+        }
+
+        /**
+         * Blocks until {@link ResultCallback#onNext(Object)} was called for the first time
+         */
+        @SuppressWarnings("unchecked")
+        public A_RES_T awaitResult() {
+            try {
+                resultReady.await();
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+            getFirstError();
+            return result;
+        }
+    }
+
     private ChannelProvider channelProvider;
 
     private String resource;
@@ -203,7 +255,7 @@ public InputStream post(final Object entity) {
 
         Channel channel = getChannel();
 
-        ResponseCallback<InputStream> callback = new ResponseCallback<InputStream>();
+        AsyncResultCallback<InputStream> callback = new AsyncResultCallback<>();
 
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, callback);
         HttpResponseStreamHandler streamHandler = new HttpResponseStreamHandler(callback);
@@ -454,7 +506,7 @@ public InputStream get() {
 
         Channel channel = getChannel();
 
-        ResponseCallback<InputStream> resultCallback = new ResponseCallback<InputStream>();
+        AsyncResultCallback<InputStream> resultCallback = new AsyncResultCallback<>();
 
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
 
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
index 706228d04..596334640 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
@@ -6,9 +6,6 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.concurrent.LinkedTransferQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import com.github.dockerjava.api.async.ResultCallback;
 
@@ -19,45 +16,87 @@
  */
 public class HttpResponseStreamHandler extends SimpleChannelInboundHandler<ByteBuf> {
 
-    private HttpResponseInputStream stream = new HttpResponseInputStream();
+    private ResultCallback<InputStream> resultCallback;
+
+    private final HttpResponseInputStream stream = new HttpResponseInputStream();
 
     public HttpResponseStreamHandler(ResultCallback<InputStream> resultCallback) {
-        resultCallback.onNext(stream);
+        this.resultCallback = resultCallback;
     }
 
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) throws Exception {
+        invokeCallbackOnFirstRead();
+
         stream.write(msg.copy());
     }
 
+    private void invokeCallbackOnFirstRead() {
+        if (resultCallback != null) {
+            resultCallback.onNext(stream);
+            resultCallback = null;
+        }
+    }
+
     @Override
-    public void channelReadComplete(ChannelHandlerContext ctx) throws Exception {
-        stream.close();
-        super.channelReadComplete(ctx);
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+        stream.writeComplete();
+
+        super.channelInactive(ctx);
     }
 
     public static class HttpResponseInputStream extends InputStream {
 
-        private AtomicBoolean closed = new AtomicBoolean(false);
+        private boolean writeCompleted = false;
 
-        private LinkedTransferQueue<ByteBuf> queue = new LinkedTransferQueue<ByteBuf>();
+        private boolean closed = false;
 
         private ByteBuf current = null;
 
-        public void write(ByteBuf byteBuf) {
-            queue.put(byteBuf);
+        private final Object lock = new Object();
+
+        public void write(ByteBuf byteBuf) throws InterruptedException {
+            synchronized (lock) {
+                if (closed) {
+                    return;
+                }
+                while (current != null) {
+                    lock.wait();
+
+                    if (closed) {
+                        return;
+                    }
+                }
+                current = byteBuf;
+
+                lock.notifyAll();
+            }
+        }
+
+        public void writeComplete() {
+            synchronized (lock) {
+                writeCompleted = true;
+
+                lock.notifyAll();
+            }
         }
 
         @Override
         public void close() throws IOException {
-            closed.set(true);
-            super.close();
+            synchronized (lock) {
+                closed = true;
+                releaseCurrent();
+
+                lock.notifyAll();
+            }
         }
 
         @Override
         public int available() throws IOException {
-            poll();
-            return readableBytes();
+            synchronized (lock) {
+                poll(0);
+                return readableBytes();
+            }
         }
 
         private int readableBytes() {
@@ -66,34 +105,72 @@ private int readableBytes() {
             } else {
                 return 0;
             }
-
         }
 
         @Override
         public int read() throws IOException {
+            byte[] b = new byte[1];
+            int n = read(b, 0, 1);
+            return n != -1 ? b[0] : -1;
+        }
 
-            poll();
+        @Override
+        public int read(byte[] b, int off, int len) throws IOException {
+            synchronized (lock) {
+                off = poll(off);
 
-            if (readableBytes() == 0) {
-                if (closed.get()) {
+                if (current == null) {
                     return -1;
+                } else {
+                    int availableBytes = Math.min(len, current.readableBytes() - off);
+                    current.readBytes(b, off, availableBytes);
+                    return availableBytes;
                 }
             }
+        }
 
-            if (current != null && current.readableBytes() > 0) {
-                return current.readByte() & 0xff;
-            } else {
-                return read();
+        private int poll(int off) throws IOException {
+            synchronized (lock) {
+                while (readableBytes() <= off) {
+                    try {
+                        if (closed) {
+                            throw new IOException("Stream closed");
+                        }
+
+                        off -= releaseCurrent();
+                        if (writeCompleted) {
+                            return off;
+                        }
+                        while (current == null) {
+                            lock.wait();
+
+                            if (closed) {
+                                throw new IOException("Stream closed");
+                            }
+                            if (writeCompleted && current == null) {
+                                return off;
+                            }
+                        }
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+                return off;
             }
         }
 
-        private void poll() {
-            if (readableBytes() == 0) {
-                try {
-                    current = queue.poll(50, TimeUnit.MILLISECONDS);
-                } catch (InterruptedException e) {
-                    throw new RuntimeException(e);
+        private int releaseCurrent() {
+            synchronized (lock) {
+                if (current != null) {
+                    int n = current.readableBytes();
+                    current.release();
+                    current = null;
+
+                    lock.notifyAll();
+
+                    return n;
                 }
+                return 0;
             }
         }
     }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/SaveImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/SaveImageCmdExecTest.java
index 0527b793f..a2fab38a7 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/SaveImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/SaveImageCmdExecTest.java
@@ -47,8 +47,9 @@ public void afterMethod(ITestResult result) {
     @Test
     public void saveImage() throws Exception {
 
-        InputStream image = IOUtils.toBufferedInputStream(dockerClient.saveImageCmd("busybox").exec());
-        assertThat(image.available(), greaterThan(0));
+        try (InputStream image = dockerClient.saveImageCmd("busybox").exec()) {
+            assertThat(image.available(), greaterThan(0));
+        }
 
     }
 
diff --git a/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java b/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
index 6652f3eba..eea9ddc0f 100644
--- a/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
+++ b/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
@@ -1,13 +1,21 @@
 package com.github.dockerjava.netty.handler;
 
+import static com.github.dockerjava.netty.handler.HttpResponseStreamHandler.HttpResponseInputStream;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-import java.io.InputStream;
-
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufInputStream;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
 import org.apache.commons.io.IOUtils;
 import org.mockito.Mockito;
 import org.testng.annotations.Test;
@@ -25,9 +33,81 @@ public void testNoBytesSkipped() throws Exception {
         ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
         ByteBuf buffer = generateByteBuf();
         streamHandler.channelRead0(ctx, buffer);
-        streamHandler.channelReadComplete(ctx);
+        streamHandler.channelInactive(ctx);
+
+        try (InputStream inputStream = callback.getInputStream()) {
+            assertTrue(IOUtils.contentEquals(inputStream, new ByteBufInputStream(buffer)));
+        }
+    }
+
+    @Test
+    public void testReadByteByByte() throws Exception {
+        ResultCallbackTest callback = new ResultCallbackTest();
+        HttpResponseStreamHandler streamHandler = new HttpResponseStreamHandler(callback);
+        ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
+        ByteBuf buffer = generateByteBuf();
+        streamHandler.channelRead0(ctx, buffer);
+        streamHandler.channelInactive(ctx);
+
+        try (InputStream inputStream = callback.getInputStream()) {
+            for (int i = 0; i < buffer.readableBytes(); i++) {
+                int b = inputStream.read();
+                assertEquals(b, buffer.getByte(i));
+            }
+            assertTrue(inputStream.read() == -1);
+        }
+    }
+
+    @Test
+    public void testCloseResponseStreamBeforeWrite() throws Exception {
+        HttpResponseInputStream inputStream = new HttpResponseInputStream();
+        ByteBuf buffer = generateByteBuf();
+
+        inputStream.write(buffer);
+        inputStream.close();
+        inputStream.write(buffer);
+    }
+
+    @Test
+    public void testCloseResponseStreamOnWrite() throws Exception {
+        final HttpResponseInputStream inputStream = new HttpResponseInputStream();
+
+        final ByteBuf buffer = generateByteBuf();
+
+        final CountDownLatch firstWrite = new CountDownLatch(1);
+
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        Future<?> submit = executor.submit(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    inputStream.write(buffer);
+                    firstWrite.countDown();
+                    inputStream.write(buffer);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+
+        firstWrite.await();
+        assertTrue(inputStream.available() > 0);
+
+        // second write should have started
+        Thread.sleep(500L);
+        inputStream.close();
+
+        submit.get();
+    }
+
+    @Test(expectedExceptions = IOException.class)
+    public void testReadClosedResponseStream() throws Exception {
+        HttpResponseInputStream inputStream = new HttpResponseInputStream();
+        ByteBuf buffer = generateByteBuf();
 
-        assertTrue(IOUtils.contentEquals(callback.getInputStream(), new ByteBufInputStream(buffer)));
+        inputStream.write(buffer);
+        inputStream.close();
+        inputStream.read();
     }
 
     private ByteBuf generateByteBuf() {
@@ -46,7 +126,7 @@ public void onNext(InputStream stream) {
             this.stream = stream;
         }
 
-        public InputStream getInputStream() {
+        private InputStream getInputStream() {
             return stream;
         }
     }

From d07e2f6be5ee4f87dd97ce725e0b9fe22c66cd8b Mon Sep 17 00:00:00 2001
From: Jiapeng Yang <iGabon@163.com>
Date: Sat, 10 Sep 2016 01:26:56 +0800
Subject: [PATCH 0661/1272] =?UTF-8?q?Bugfix:donot=20throw=20RuntimeExcepti?=
 =?UTF-8?q?on=20when=20a=20error=20occured=20in=20awaitComp=E2=80=A6=20(#7?=
 =?UTF-8?q?00)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Bugfix:donot throw RuntimeException when a error occured in awaitCompletion(long,TimeUnit)

* Fix indentation

* fix format error,use docker-java-formatter.xml
---
 .../github/dockerjava/core/async/ResultCallbackTemplate.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index f120012af..2437fc878 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -99,7 +99,9 @@ public RC_T awaitCompletion() throws InterruptedException {
      *         before {@link ResultCallback#onComplete()} was called.
      */
     public boolean awaitCompletion(long timeout, TimeUnit timeUnit) throws InterruptedException {
-        return completed.await(timeout, timeUnit);
+        boolean result = completed.await(timeout, timeUnit);
+        getFirstError();
+        return result;
     }
 
     /**

From 95e5075874a355bb90a365de52082932278ed9a3 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 9 Sep 2016 20:27:56 +0300
Subject: [PATCH 0662/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 735283ae8..f8b6dcd86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Change Log
  * Make all models Serializable.
  * [NETTY] Fix loadImage responce on 1.24 API.
  * LogPath field for inspect container.
+ * [#700] (https://github.com/docker-java/docker-java/pull/700) Bugfix:donot throw RuntimeException when a error occured in awaitCompletion(long,TimeUnit)
 
 ## 3.0.5
  * Events updated to 1.24 API model.

From d39d7f210ab6c9190b21b70f3ec6117e5d4f9864 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Sat, 10 Sep 2016 18:54:03 +0200
Subject: [PATCH 0663/1272] Fix issue with jersey and unix domain sockets
 (#697)

---
 .gitignore                                    |   3 +-
 pom.xml                                       |  29 +-
 .../core/async/ResultCallbackTemplate.java    |  10 +-
 .../util/WrappedResponseInputStream.java      |   5 +-
 .../http/impl/io/ChunkedInputStream.java      | 337 ++++++++++++++
 .../newsclub/net/unix/AFUNIXSocketImpl.java   | 415 ++++++++++++++++++
 .../core/command/EventsCmdImplTest.java       | 120 ++---
 .../command/StopContainerCmdImplTest.java     |   8 +-
 .../command/UpdateContainerCmdImplTest.java   |   4 +-
 .../netty/exec/EventsCmdExecTest.java         | 116 ++---
 .../netty/exec/StopContainerCmdExecTest.java  |  12 +-
 .../exec/UpdateContainerCmdExecTest.java      |   4 +-
 12 files changed, 914 insertions(+), 149 deletions(-)
 create mode 100644 src/main/java/org/apache/http/impl/io/ChunkedInputStream.java
 create mode 100644 src/main/java/org/newsclub/net/unix/AFUNIXSocketImpl.java

diff --git a/.gitignore b/.gitignore
index 8f1fdc779..a705c1129 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,5 @@ target
 *.log
 
 #Ignore Test Output
-test-output
\ No newline at end of file
+test-output
+/.checkstyle
diff --git a/pom.xml b/pom.xml
index b1b6d96a9..5cc227ee3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -67,7 +68,7 @@
 		<slf4j-api.version>1.7.21</slf4j-api.version>
 
 		<bouncycastle.version>1.54</bouncycastle.version>
-		<unix-socket-factory.version>2015-01-27T15-02-14</unix-socket-factory.version>
+		<junixsocket.version>2.0.4</junixsocket.version>
 		<guava.version>19.0</guava.version>
 
 		<!-- test dependencies -->
@@ -115,11 +116,15 @@
 			<version>${jersey.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>de.gesellix</groupId>
-			<artifactId>unix-socket-factory</artifactId>
-			<version>${unix-socket-factory.version}</version>
+			<groupId>com.kohlschutter.junixsocket</groupId>
+			<artifactId>junixsocket-common</artifactId>
+			<version>${junixsocket.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.kohlschutter.junixsocket</groupId>
+			<artifactId>junixsocket-native-common</artifactId>
+			<version>${junixsocket.version}</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-compress</artifactId>
@@ -266,13 +271,6 @@
 	</distributionManagement>
 
 	<build>
-<!-- 		<extensions> -->
-<!-- 			<extension> -->
-<!-- 				<groupId>kr.motd.maven</groupId> -->
-<!-- 				<artifactId>os-maven-plugin</artifactId> -->
-<!-- 				<version>1.2.3.Final</version> -->
-<!-- 			</extension> -->
-<!-- 		</extensions> -->
 		<pluginManagement>
 			<plugins>
 
@@ -419,7 +417,7 @@
 							<perCoreThreadCount>true</perCoreThreadCount>
 							<threadCount>1</threadCount>
 							<groups>integration</groups>
- 							<excludedGroups>integration-auth</excludedGroups>
+							<excludedGroups>integration-auth</excludedGroups>
 							<includes>
 								<include>**/*Test.java</include>
 							</includes>
@@ -483,7 +481,8 @@
 							<failOnViolation>true</failOnViolation>
 							<logViolationsToConsole>true</logViolationsToConsole>
 							<linkXRef>false</linkXRef>
-							<!-- if some IDE has integration and requires other place, propose it -->
+							<!-- if some IDE has integration and requires other place, propose 
+								it -->
 							<configLocation>
 								src/test/resources/checkstyle/checkstyle-config.xml
 							</configLocation>
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index 2437fc878..2238dfcea 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -75,11 +75,13 @@ public void onComplete() {
 
     @Override
     public void close() throws IOException {
-        closed = true;
-        if (stream != null) {
-            stream.close();
+        if (!closed) {
+           closed = true;
+           if (stream != null) {
+               stream.close();
+           }
+           completed.countDown();
         }
-        completed.countDown();
     }
 
     /**
diff --git a/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java b/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
index afe0dce92..4ec74ddcc 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
@@ -53,9 +53,12 @@ public int available() throws IOException {
     }
 
     public void close() throws IOException {
+        if (closed) {
+            return;
+        }
         closed = true;
-        response.close();
         delegate.close();
+        response.close();
     }
 
     public void mark(int readlimit) {
diff --git a/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java b/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java
new file mode 100644
index 000000000..17c339e3e
--- /dev/null
+++ b/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java
@@ -0,0 +1,337 @@
+// Modified version (see https://github.com/docker-java/docker-java/pull/697)
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.http.impl.io;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.http.ConnectionClosedException;
+import org.apache.http.Header;
+import org.apache.http.HttpException;
+import org.apache.http.MalformedChunkCodingException;
+import org.apache.http.TruncatedChunkException;
+import org.apache.http.config.MessageConstraints;
+import org.apache.http.io.BufferInfo;
+import org.apache.http.io.SessionInputBuffer;
+import org.apache.http.util.Args;
+import org.apache.http.util.CharArrayBuffer;
+
+/**
+ * Implements chunked transfer coding. The content is received in small chunks.
+ * Entities transferred using this input stream can be of unlimited length.
+ * After the stream is read to the end, it provides access to the trailers,
+ * if any.
+ * <p>
+ * Note that this class NEVER closes the underlying stream, even when close
+ * gets called.  Instead, it will read until the "end" of its chunking on
+ * close, which allows for the seamless execution of subsequent HTTP 1.1
+ * requests, while not requiring the client to remember to read the entire
+ * contents of the response.
+ *
+ *
+ * @since 4.0
+ *
+ */
+public class ChunkedInputStream extends InputStream {
+
+    private static final int CHUNK_LEN               = 1;
+    private static final int CHUNK_DATA              = 2;
+    private static final int CHUNK_CRLF              = 3;
+    private static final int CHUNK_INVALID           = Integer.MAX_VALUE;
+
+    private static final int BUFFER_SIZE = 2048;
+
+    /** The session input buffer */
+    private final SessionInputBuffer in;
+    private final CharArrayBuffer buffer;
+    private final MessageConstraints constraints;
+
+    private int state;
+
+    /** The chunk size */
+    private long chunkSize;
+
+    /** The current position within the current chunk */
+    private long pos;
+
+    /** True if we've reached the end of stream */
+    private boolean eof = false;
+
+    /** True if this stream is closed */
+    private boolean closed = false;
+
+    private Header[] footers = new Header[] {};
+
+    /**
+     * Wraps session input stream and reads chunk coded input.
+     *
+     * @param in The session input buffer
+     * @param constraints Message constraints. If {@code null}
+     *   {@link MessageConstraints#DEFAULT} will be used.
+     *
+     * @since 4.4
+     */
+    public ChunkedInputStream(final SessionInputBuffer in, final MessageConstraints constraints) {
+        super();
+        this.in = Args.notNull(in, "Session input buffer");
+        this.pos = 0L;
+        this.buffer = new CharArrayBuffer(16);
+        this.constraints = constraints != null ? constraints : MessageConstraints.DEFAULT;
+        this.state = CHUNK_LEN;
+    }
+
+    /**
+     * Wraps session input stream and reads chunk coded input.
+     *
+     * @param in The session input buffer
+     */
+    public ChunkedInputStream(final SessionInputBuffer in) {
+        this(in, null);
+    }
+
+    @Override
+    public int available() throws IOException {
+        if (this.in instanceof BufferInfo) {
+            final int len = ((BufferInfo) this.in).length();
+            return (int) Math.min(len, this.chunkSize - this.pos);
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * <p> Returns all the data in a chunked stream in coalesced form. A chunk
+     * is followed by a CRLF. The method returns -1 as soon as a chunksize of 0
+     * is detected.</p>
+     *
+     * <p> Trailer headers are read automatically at the end of the stream and
+     * can be obtained with the getResponseFooters() method.</p>
+     *
+     * @return -1 of the end of the stream has been reached or the next data
+     * byte
+     * @throws IOException in case of an I/O error
+     */
+    @Override
+    public int read() throws IOException {
+        if (this.closed) {
+            throw new IOException("Attempted read from closed stream.");
+        }
+        if (this.eof) {
+            return -1;
+        }
+        if (state != CHUNK_DATA) {
+            nextChunk();
+            if (this.eof) {
+                return -1;
+            }
+        }
+        final int b = in.read();
+        if (b != -1) {
+            pos++;
+            if (pos >= chunkSize) {
+                state = CHUNK_CRLF;
+            }
+        }
+        return b;
+    }
+
+    /**
+     * Read some bytes from the stream.
+     * @param b The byte array that will hold the contents from the stream.
+     * @param off The offset into the byte array at which bytes will start to be
+     * placed.
+     * @param len the maximum number of bytes that can be returned.
+     * @return The number of bytes returned or -1 if the end of stream has been
+     * reached.
+     * @throws IOException in case of an I/O error
+     */
+    @Override
+    public int read(final byte[] b, final int off, final int len) throws IOException {
+
+        if (closed) {
+            throw new IOException("Attempted read from closed stream.");
+        }
+
+        if (eof) {
+            return -1;
+        }
+        if (state != CHUNK_DATA) {
+            nextChunk();
+            if (eof) {
+                return -1;
+            }
+        }
+        final int bytesRead = in.read(b, off, (int) Math.min(len, chunkSize - pos));
+        if (bytesRead != -1) {
+            pos += bytesRead;
+            if (pos >= chunkSize) {
+                state = CHUNK_CRLF;
+            }
+            return bytesRead;
+        } else {
+            eof = true;
+            throw new TruncatedChunkException("Truncated chunk "
+                    + "( expected size: " + chunkSize
+                    + "; actual size: " + pos + ")");
+        }
+    }
+
+    /**
+     * Read some bytes from the stream.
+     * @param b The byte array that will hold the contents from the stream.
+     * @return The number of bytes returned or -1 if the end of stream has been
+     * reached.
+     * @throws IOException in case of an I/O error
+     */
+    @Override
+    public int read(final byte[] b) throws IOException {
+        return read(b, 0, b.length);
+    }
+
+    /**
+     * Read the next chunk.
+     * @throws IOException in case of an I/O error
+     */
+    private void nextChunk() throws IOException {
+        if (state == CHUNK_INVALID) {
+            throw new MalformedChunkCodingException("Corrupt data stream");
+        }
+        try {
+            chunkSize = getChunkSize();
+            if (chunkSize < 0L) {
+                throw new MalformedChunkCodingException("Negative chunk size");
+            }
+            state = CHUNK_DATA;
+            pos = 0L;
+            if (chunkSize == 0L) {
+                eof = true;
+                parseTrailerHeaders();
+            }
+        } catch (MalformedChunkCodingException ex) {
+            state = CHUNK_INVALID;
+            throw ex;
+        }
+    }
+
+    /**
+     * Expects the stream to start with a chunksize in hex with optional
+     * comments after a semicolon. The line must end with a CRLF: "a3; some
+     * comment\r\n" Positions the stream at the start of the next line.
+     */
+    private long getChunkSize() throws IOException {
+        final int st = this.state;
+        switch (st) {
+        case CHUNK_CRLF:
+            this.buffer.clear();
+            final int bytesRead1 = this.in.readLine(this.buffer);
+            if (bytesRead1 == -1) {
+                throw new MalformedChunkCodingException(
+                    "CRLF expected at end of chunk");
+            }
+            if (!this.buffer.isEmpty()) {
+                throw new MalformedChunkCodingException(
+                    "Unexpected content at the end of chunk");
+            }
+            state = CHUNK_LEN;
+            //$FALL-THROUGH$
+        case CHUNK_LEN:
+            this.buffer.clear();
+            final int bytesRead2 = this.in.readLine(this.buffer);
+            if (bytesRead2 == -1) {
+                throw new ConnectionClosedException("Premature end of chunk coded message body: " +
+                        "closing chunk expected");
+            }
+            int separator = this.buffer.indexOf(';');
+            if (separator < 0) {
+                separator = this.buffer.length();
+            }
+            final String s = this.buffer.substringTrimmed(0, separator);
+            try {
+                return Long.parseLong(s, 16);
+            } catch (final NumberFormatException e) {
+                throw new MalformedChunkCodingException("Bad chunk header: " + s);
+            }
+        default:
+            throw new IllegalStateException("Inconsistent codec state");
+        }
+    }
+
+    /**
+     * Reads and stores the Trailer headers.
+     * @throws IOException in case of an I/O error
+     */
+    private void parseTrailerHeaders() throws IOException {
+        try {
+            this.footers = AbstractMessageParser.parseHeaders(in,
+                    constraints.getMaxHeaderCount(),
+                    constraints.getMaxLineLength(),
+                    null);
+        } catch (final HttpException ex) {
+            final IOException ioe = new MalformedChunkCodingException("Invalid footer: "
+                    + ex.getMessage());
+            ioe.initCause(ex);
+            throw ioe;
+        }
+    }
+
+    /**
+     * Upon close, this reads the remainder of the chunked message,
+     * leaving the underlying socket at a position to start reading the
+     * next response without scanning.
+     * @throws IOException in case of an I/O error
+     */
+    @Override
+    public void close() throws IOException {
+        if (!closed) {
+            try {
+                if (!eof && state != CHUNK_INVALID) {
+                    // read and discard the remainder of the message
+                    final byte[] buff = new byte[BUFFER_SIZE];
+                    try {
+                        while (read(buff) >= 0) {
+                           continue;
+                        }
+                    } catch (ConnectionClosedException e) {
+                        // just ignore
+                    } catch (TruncatedChunkException e) {
+                        // just ignore
+                    }
+                }
+            } finally {
+                eof = true;
+                closed = true;
+            }
+        }
+    }
+
+    public Header[] getFooters() {
+        return this.footers.clone();
+    }
+
+}
diff --git a/src/main/java/org/newsclub/net/unix/AFUNIXSocketImpl.java b/src/main/java/org/newsclub/net/unix/AFUNIXSocketImpl.java
new file mode 100644
index 000000000..869d987f2
--- /dev/null
+++ b/src/main/java/org/newsclub/net/unix/AFUNIXSocketImpl.java
@@ -0,0 +1,415 @@
+// Modified version (see https://github.com/docker-java/docker-java/pull/697)
+/**
+ * junixsocket
+ *
+ * Copyright (c) 2009,2014 Christian Kohlschütter
+ *
+ * The author licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.newsclub.net.unix;
+
+import java.io.FileDescriptor;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.net.SocketException;
+import java.net.SocketImpl;
+import java.net.SocketOptions;
+
+/**
+ * The Java-part of the {@link AFUNIXSocket} implementation.
+ *
+ * @author Christian Kohlschütter
+ */
+class AFUNIXSocketImpl extends SocketImpl {
+  private static final int SHUT_RD = 0;
+  private static final int SHUT_WR = 1;
+  private static final int SHUT_RD_WR = 2;
+
+  private String socketFile;
+  private boolean closed = false;
+  private boolean bound = false;
+  private boolean connected = false;
+
+  private boolean closedInputStream = false;
+  private boolean closedOutputStream = false;
+
+  private final AFUNIXInputStream in = new AFUNIXInputStream();
+  private final AFUNIXOutputStream out = new AFUNIXOutputStream();
+
+  AFUNIXSocketImpl() {
+    super();
+    this.fd = new FileDescriptor();
+  }
+
+  FileDescriptor getFD() {
+    return fd;
+  }
+
+  @Override
+  protected void accept(SocketImpl socket) throws IOException {
+    final AFUNIXSocketImpl si = (AFUNIXSocketImpl) socket;
+    NativeUnixSocket.accept(socketFile, fd, si.fd);
+    si.socketFile = socketFile;
+    si.connected = true;
+  }
+
+  @Override
+  protected int available() throws IOException {
+    return NativeUnixSocket.available(fd);
+  }
+
+  protected void bind(SocketAddress addr) throws IOException {
+    bind(0, addr);
+  }
+
+  protected void bind(int backlog, SocketAddress addr) throws IOException {
+    if (!(addr instanceof AFUNIXSocketAddress)) {
+      throw new SocketException("Cannot bind to this type of address: " + addr.getClass());
+    }
+    final AFUNIXSocketAddress socketAddress = (AFUNIXSocketAddress) addr;
+    socketFile = socketAddress.getSocketFile();
+    NativeUnixSocket.bind(socketFile, fd, backlog);
+    bound = true;
+    this.localport = socketAddress.getPort();
+  }
+
+  @Override
+  @SuppressWarnings("hiding")
+  protected void bind(InetAddress host, int port) throws IOException {
+    throw new SocketException("Cannot bind to this type of address: " + InetAddress.class);
+  }
+
+  private void checkClose() throws IOException {
+    //if (closedInputStream && closedOutputStream) {
+    // close();
+    //}
+  }
+
+  @Override
+  protected synchronized void close() throws IOException {
+    if (closed) {
+      return;
+    }
+    closed = true;
+    if (fd.valid()) {
+      NativeUnixSocket.shutdown(fd, SHUT_RD_WR);
+      NativeUnixSocket.close(fd);
+    }
+    if (bound) {
+      NativeUnixSocket.unlink(socketFile);
+    }
+    connected = false;
+  }
+
+  @Override
+  @SuppressWarnings("hiding")
+  protected void connect(String host, int port) throws IOException {
+    throw new SocketException("Cannot bind to this type of address: " + InetAddress.class);
+  }
+
+  @Override
+  @SuppressWarnings("hiding")
+  protected void connect(InetAddress address, int port) throws IOException {
+    throw new SocketException("Cannot bind to this type of address: " + InetAddress.class);
+  }
+
+  @Override
+  protected void connect(SocketAddress addr, int timeout) throws IOException {
+    if (!(addr instanceof AFUNIXSocketAddress)) {
+      throw new SocketException("Cannot bind to this type of address: " + addr.getClass());
+    }
+    final AFUNIXSocketAddress socketAddress = (AFUNIXSocketAddress) addr;
+    socketFile = socketAddress.getSocketFile();
+    NativeUnixSocket.connect(socketFile, fd);
+    this.address = socketAddress.getAddress();
+    this.port = socketAddress.getPort();
+    this.localport = 0;
+    this.connected = true;
+  }
+
+  @Override
+  protected void create(boolean stream) throws IOException {
+  }
+
+  @Override
+  protected InputStream getInputStream() throws IOException {
+    if (!connected && !bound) {
+      throw new IOException("Not connected/not bound");
+    }
+    return in;
+  }
+
+  @Override
+  protected OutputStream getOutputStream() throws IOException {
+    if (!connected && !bound) {
+      throw new IOException("Not connected/not bound");
+    }
+    return out;
+  }
+
+  @Override
+  protected void listen(int backlog) throws IOException {
+    NativeUnixSocket.listen(fd, backlog);
+  }
+
+  @Override
+  protected void sendUrgentData(int data) throws IOException {
+    NativeUnixSocket.write(fd, new byte[] {(byte) (data & 0xFF)}, 0, 1);
+  }
+
+  private final class AFUNIXInputStream extends InputStream {
+    private boolean streamClosed = false;
+
+    @Override
+    public int read(byte[] buf, int off, int len) throws IOException {
+      if (streamClosed) {
+        throw new IOException("This InputStream has already been closed.");
+      }
+      if (len == 0) {
+        return 0;
+      }
+      if (closed) {
+        return -1;
+      }
+      int maxRead = buf.length - off;
+      if (len > maxRead) {
+        len = maxRead;
+      }
+      try {
+        return NativeUnixSocket.read(fd, buf, off, len);
+      } catch (final IOException e) {
+        throw (IOException) new IOException(e.getMessage() + " at "
+            + AFUNIXSocketImpl.this.toString()).initCause(e);
+      }
+    }
+
+    @Override
+    public int read() throws IOException {
+      final byte[] buf1 = new byte[1];
+      final int numRead = read(buf1, 0, 1);
+      if (numRead <= 0) {
+        return -1;
+      } else {
+        return buf1[0] & 0xFF;
+      }
+    }
+
+    @Override
+    public void close() throws IOException {
+      if (streamClosed) {
+        return;
+      }
+      streamClosed = true;
+      if (fd.valid()) {
+        NativeUnixSocket.shutdown(fd, SHUT_RD);
+      }
+
+      closedInputStream = true;
+      checkClose();
+    }
+
+    @Override
+    public int available() throws IOException {
+      final int av = NativeUnixSocket.available(fd);
+      return av;
+    }
+  }
+
+  private final class AFUNIXOutputStream extends OutputStream {
+    private boolean streamClosed = false;
+
+    @Override
+    public void write(int oneByte) throws IOException {
+      final byte[] buf1 = new byte[] {(byte) oneByte};
+      write(buf1, 0, 1);
+    }
+
+    @Override
+    public void write(byte[] buf, int off, int len) throws IOException {
+      if (streamClosed) {
+        throw new AFUNIXSocketException("This OutputStream has already been closed.");
+      }
+      if (len > buf.length - off) {
+        throw new IndexOutOfBoundsException();
+      }
+      try {
+        while (len > 0 && !Thread.interrupted()) {
+          final int written = NativeUnixSocket.write(fd, buf, off, len);
+          if (written == -1) {
+            throw new IOException("Unspecific error while writing");
+          }
+          len -= written;
+          off += written;
+        }
+      } catch (final IOException e) {
+        throw (IOException) new IOException(e.getMessage() + " at "
+            + AFUNIXSocketImpl.this.toString()).initCause(e);
+      }
+    }
+
+    @Override
+    public void close() throws IOException {
+      if (streamClosed) {
+        return;
+      }
+      streamClosed = true;
+      if (fd.valid()) {
+        NativeUnixSocket.shutdown(fd, SHUT_WR);
+      }
+      closedOutputStream = true;
+      checkClose();
+    }
+  }
+
+  @Override
+  public String toString() {
+    return super.toString() + "[fd=" + fd + "; file=" + this.socketFile + "; connected="
+        + connected + "; bound=" + bound + "]";
+  }
+
+  private static int expectInteger(Object value) throws SocketException {
+    try {
+      return (Integer) value;
+    } catch (final ClassCastException e) {
+      throw new AFUNIXSocketException("Unsupported value: " + value, e);
+    } catch (final NullPointerException e) {
+      throw new AFUNIXSocketException("Value must not be null", e);
+    }
+  }
+
+  private static int expectBoolean(Object value) throws SocketException {
+    try {
+      return ((Boolean) value).booleanValue() ? 1 : 0;
+    } catch (final ClassCastException e) {
+      throw new AFUNIXSocketException("Unsupported value: " + value, e);
+    } catch (final NullPointerException e) {
+      throw new AFUNIXSocketException("Value must not be null", e);
+    }
+  }
+
+  @Override
+  public Object getOption(int optID) throws SocketException {
+    try {
+      switch (optID) {
+        case SocketOptions.SO_KEEPALIVE:
+        case SocketOptions.TCP_NODELAY:
+          return NativeUnixSocket.getSocketOptionInt(fd, optID) != 0 ? true : false;
+        case SocketOptions.SO_LINGER:
+        case SocketOptions.SO_TIMEOUT:
+        case SocketOptions.SO_RCVBUF:
+        case SocketOptions.SO_SNDBUF:
+          return NativeUnixSocket.getSocketOptionInt(fd, optID);
+        default:
+          throw new AFUNIXSocketException("Unsupported option: " + optID);
+      }
+    } catch (final AFUNIXSocketException e) {
+      throw e;
+    } catch (final Exception e) {
+      throw new AFUNIXSocketException("Error while getting option", e);
+    }
+  }
+
+  @Override
+  public void setOption(int optID, Object value) throws SocketException {
+    try {
+      switch (optID) {
+        case SocketOptions.SO_LINGER:
+
+          if (value instanceof Boolean) {
+            final boolean b = (Boolean) value;
+            if (b) {
+              throw new SocketException("Only accepting Boolean.FALSE here");
+            }
+            NativeUnixSocket.setSocketOptionInt(fd, optID, -1);
+            return;
+          }
+          NativeUnixSocket.setSocketOptionInt(fd, optID, expectInteger(value));
+          return;
+        case SocketOptions.SO_RCVBUF:
+        case SocketOptions.SO_SNDBUF:
+        case SocketOptions.SO_TIMEOUT:
+          NativeUnixSocket.setSocketOptionInt(fd, optID, expectInteger(value));
+          return;
+        case SocketOptions.SO_KEEPALIVE:
+        case SocketOptions.TCP_NODELAY:
+          NativeUnixSocket.setSocketOptionInt(fd, optID, expectBoolean(value));
+          return;
+        default:
+          throw new AFUNIXSocketException("Unsupported option: " + optID);
+      }
+    } catch (final AFUNIXSocketException e) {
+      throw e;
+    } catch (final Exception e) {
+      throw new AFUNIXSocketException("Error while setting option", e);
+    }
+  }
+
+  @Override
+  protected void shutdownInput() throws IOException {
+    if (!closed && fd.valid()) {
+      NativeUnixSocket.shutdown(fd, SHUT_RD);
+    }
+  }
+
+  @Override
+  protected void shutdownOutput() throws IOException {
+    if (!closed && fd.valid()) {
+      NativeUnixSocket.shutdown(fd, SHUT_WR);
+    }
+  }
+
+  /**
+   * Changes the behavior to be somewhat lenient with respect to the specification.
+   *
+   * In particular, we ignore calls to {@link Socket#getTcpNoDelay()} and
+   * {@link Socket#setTcpNoDelay(boolean)}.
+   */
+  static class Lenient extends AFUNIXSocketImpl {
+    Lenient() {
+      super();
+    }
+
+    @Override
+    public void setOption(int optID, Object value) throws SocketException {
+      try {
+        super.setOption(optID, value);
+      } catch (SocketException e) {
+        switch (optID) {
+          case SocketOptions.TCP_NODELAY:
+            return;
+          default:
+            throw e;
+        }
+      }
+    }
+
+    @Override
+    public Object getOption(int optID) throws SocketException {
+      try {
+        return super.getOption(optID);
+      } catch (SocketException e) {
+        switch (optID) {
+          case SocketOptions.TCP_NODELAY:
+          case SocketOptions.SO_KEEPALIVE:
+            return false;
+          default:
+            throw e;
+        }
+      }
+    }
+  }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
index 939f95087..d05327a06 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -17,11 +17,14 @@
 import com.github.dockerjava.api.model.Event;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+/*
+ * NOTE: These tests may fail if there is a difference between local and daemon time
+ * (this is especially a problem when using boot2docker as time may not in sync
+ * with the virtualbox host system)
+ */
 @Test(groups = "integration")
 public class EventsCmdImplTest extends AbstractDockerClientTest {
 
-    private static int KNOWN_NUM_EVENTS = 4;
-
     private static String getEpochTime() {
         return String.valueOf(System.currentTimeMillis() / 1000);
     }
@@ -46,9 +49,6 @@ public void afterMethod(ITestResult result) {
         super.afterMethod(result);
     }
 
-    /*
-     * This specific test may fail with boot2docker as time may not in sync with host system
-     */
     @Test
     public void testEventStreamTimeBound() throws Exception {
         // Don't include other tests events
@@ -58,82 +58,84 @@ public void testEventStreamTimeBound() throws Exception {
         int expectedEvents = generateEvents();
         String endTime = getEpochTime();
 
-        CountDownLatch countDownLatch = new CountDownLatch(expectedEvents);
-        EventsTestCallback eventCallback = new EventsTestCallback(countDownLatch);
-
-        dockerClient.eventsCmd().withSince(startTime).withUntil(endTime).exec(eventCallback);
+        EventsTestCallback eventCallback = new EventsTestCallback(expectedEvents);
 
-        Boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
+        dockerClient.eventsCmd()
+            .withSince(startTime)
+            .withUntil(endTime)
+            .exec(eventCallback);
 
-        eventCallback.close();
+        List<Event> events = eventCallback.awaitExpectedEvents(3, TimeUnit.MINUTES);
 
-        assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
+        // we may receive more events as expected
+        assertTrue(events.size() >= expectedEvents, "Received events: " + events);
     }
 
     @Test
-    public void testEventStreaming1() throws Exception {
-        // Don't include other tests events
-        TimeUnit.SECONDS.sleep(1);
-
-        CountDownLatch countDownLatch = new CountDownLatch(KNOWN_NUM_EVENTS);
-        EventsTestCallback eventCallback = new EventsTestCallback(countDownLatch);
-
-        dockerClient.eventsCmd().withSince(getEpochTime()).exec(eventCallback);
-
-        generateEvents();
-
-        Boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
-
-        eventCallback.close();
-        assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
-    }
-
-    @Test
-    public void testEventStreaming2() throws Exception {
+    public void testEventStreaming() throws Exception {
         // Don't include other tests events
         TimeUnit.SECONDS.sleep(1);
+        
+        String startTime = getEpochTime();
+        int expectedEvents = generateEvents();
 
-        CountDownLatch countDownLatch = new CountDownLatch(KNOWN_NUM_EVENTS);
-        EventsTestCallback eventCallback = new EventsTestCallback(countDownLatch);
+        EventsTestCallback eventCallback = new EventsTestCallback(expectedEvents);
 
-        dockerClient.eventsCmd().withSince(getEpochTime()).exec(eventCallback);
+        dockerClient.eventsCmd()
+            .withSince(startTime)
+            .exec(eventCallback);
 
         generateEvents();
 
-        Boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
-
-        eventCallback.close();
-        assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
+        List<Event> events = eventCallback.awaitExpectedEvents(3, TimeUnit.MINUTES);
+        
+        // we may receive more events as expected
+        assertTrue(events.size() >= expectedEvents, "Received events: " + events);
     }
 
+    
     public void testEventStreamingWithFilter() throws Exception {
         // Don't include other tests events
         TimeUnit.SECONDS.sleep(1);
+        
+        String startTime = getEpochTime();
+        int expectedEvents = 1;
 
-        CountDownLatch countDownLatch = new CountDownLatch(1);
-        EventsTestCallback eventCallback = dockerClient.eventsCmd().withEventFilter("start")
-                .exec(new EventsTestCallback(countDownLatch));
+        EventsTestCallback eventCallback = new EventsTestCallback(expectedEvents);
+        
+        dockerClient.eventsCmd()
+        	.withSince(startTime)
+        	.withEventFilter("start")
+            .exec(eventCallback);
 
         generateEvents();
 
-        Boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
-
-        eventCallback.close();
-        assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
+        List<Event> events = eventCallback.awaitExpectedEvents(3, TimeUnit.MINUTES);
+        
+        // we should get exactly one "start" event here
+        assertEquals(events.size(), expectedEvents, "Received events: " + events);
     }
 
     /**
-     * This method generates {#link KNOWN_NUM_EVENTS} events
+     * This method generates some events and returns the number of events being generated
      */
     private int generateEvents() throws Exception {
-        String testImage = "busybox";
+        String testImage = "busybox:latest";
 
         dockerClient.pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess();
-
         CreateContainerResponse container = dockerClient.createContainerCmd(testImage).withCmd("sleep", "9999").exec();
         dockerClient.startContainerCmd(container.getId()).exec();
-        dockerClient.stopContainerCmd(container.getId()).exec();
-        return KNOWN_NUM_EVENTS;
+        dockerClient.stopContainerCmd(container.getId()).withTimeout(1).exec();
+        
+        // generates 5 events with remote api 1.24:
+        
+        // Event[status=pull,id=busybox:latest,from=<null>,node=<null>,type=IMAGE,action=pull,actor=com.github.dockerjava.api.model.EventActor@417db6d7[id=busybox:latest,attributes={name=busybox}],time=1473455186,timeNano=1473455186436681587]
+        // Event[status=create,id=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c,from=busybox:latest,node=<null>,type=CONTAINER,action=create,actor=com.github.dockerjava.api.model.EventActor@40bcec[id=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c,attributes={image=busybox:latest, name=sick_lamport}],time=1473455186,timeNano=1473455186470713257]
+        // Event[status=<null>,id=<null>,from=<null>,node=<null>,type=NETWORK,action=connect,actor=com.github.dockerjava.api.model.EventActor@318a1b01[id=10870ceb13abb7cf841ea68868472da881b33c8ed08d2cde7dbb39d7c24d1d27,attributes={container=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c, name=bridge, type=bridge}],time=1473455186,timeNano=1473455186544318466]
+        // Event[status=start,id=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c,from=busybox:latest,node=<null>,type=CONTAINER,action=start,actor=com.github.dockerjava.api.model.EventActor@606f43a3[id=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c,attributes={image=busybox:latest, name=sick_lamport}],time=1473455186,timeNano=1473455186786163819]
+        // Event[status=kill,id=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c,from=busybox:latest,node=<null>,type=CONTAINER,action=kill,actor=com.github.dockerjava.api.model.EventActor@72a9ffcf[id=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c,attributes={image=busybox:latest, name=sick_lamport, signal=15}],time=1473455186,timeNano=1473455186792963392]
+
+        return 5;
     }
 
     private class EventsTestCallback extends EventsResultCallback {
@@ -142,18 +144,24 @@ private class EventsTestCallback extends EventsResultCallback {
 
         private final List<Event> events = new ArrayList<Event>();
 
-        public EventsTestCallback(CountDownLatch countDownLatch) {
-            this.countDownLatch = countDownLatch;
+        public EventsTestCallback(int expextedEvents) {
+            this.countDownLatch = new CountDownLatch(expextedEvents);
         }
 
         public void onNext(Event event) {
             LOG.info("Received event #{}: {}", countDownLatch.getCount(), event);
-            countDownLatch.countDown();
             events.add(event);
+            countDownLatch.countDown();
         }
-
-        public List<Event> getEvents() {
-            return new ArrayList<Event>(events);
+        
+        public List<Event> awaitExpectedEvents(long timeout, TimeUnit unit ) {
+        	try {
+				countDownLatch.await(timeout, unit);
+				close();
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+        	return new ArrayList<Event>(events);
         }
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
index 382e5b29c..7ae6a09cc 100644
--- a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
@@ -69,11 +69,9 @@ public void testStopContainer() throws DockerException {
         assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
 
         final Integer exitCode = inspectContainerResponse.getState().getExitCode();
-        if (apiVersion.equals(VERSION_1_22)) {
-            assertThat(exitCode, is(0));
-        } else {
-            assertThat(exitCode, not(0));
-        }
+        
+        assertThat(exitCode, is(137));
+        
     }
 
     @Test(expectedExceptions = NotFoundException.class)
diff --git a/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java
index 3c7a9fd47..df53d671b 100644
--- a/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java
@@ -79,7 +79,7 @@ public void updateContainer() throws DockerException, IOException {
 //                .withCpusetCpus("0") // depends on env
                 .withCpusetMems("0")
                 .withMemory(314572800L)
-                .withMemorySwap(514288000L)
+//                .withMemorySwap(514288000L) Your kernel does not support swap limit capabilities, memory limited without swap.
                 .withMemoryReservation(209715200L)
 //                .withKernelMemory(52428800) Can not update kernel memory to a running container, please stop it first.
                 .exec();
@@ -102,7 +102,7 @@ public void updateContainer() throws DockerException, IOException {
         assertThat(afterHostConfig.getCpusetMems(), is("0"));
 
         assertThat(afterHostConfig.getMemoryReservation(), is(209715200L));
-        assertThat(afterHostConfig.getMemorySwap(), is(514288000L));
+//       assertThat(afterHostConfig.getMemorySwap(), is(514288000L));
 
     }
 
diff --git a/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java
index a634e2562..2a446569d 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java
@@ -22,8 +22,6 @@
 @Test(groups = "integration")
 public class EventsCmdExecTest extends AbstractNettyDockerClientTest {
 
-    private static int KNOWN_NUM_EVENTS = 4;
-
     private static String getEpochTime() {
         return String.valueOf(System.currentTimeMillis() / 1000);
     }
@@ -48,9 +46,6 @@ public void afterMethod(ITestResult result) {
         super.afterMethod(result);
     }
 
-    /*
-     * This specific test may fail with boot2docker as time may not in sync with host system
-     */
     @Test
     public void testEventStreamTimeBound() throws Exception {
         // Don't include other tests events
@@ -60,82 +55,84 @@ public void testEventStreamTimeBound() throws Exception {
         int expectedEvents = generateEvents();
         String endTime = getEpochTime();
 
-        CountDownLatch countDownLatch = new CountDownLatch(expectedEvents);
-        EventsTestCallback eventCallback = new EventsTestCallback(countDownLatch);
-
-        dockerClient.eventsCmd().withSince(startTime).withUntil(endTime).exec(eventCallback);
-
-        Boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
-
-        eventCallback.close();
-
-        assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
-    }
-
-    @Test
-    public void testEventStreaming1() throws Exception {
-        // Don't include other tests events
-        TimeUnit.SECONDS.sleep(1);
-
-        CountDownLatch countDownLatch = new CountDownLatch(KNOWN_NUM_EVENTS);
-        EventsTestCallback eventCallback = new EventsTestCallback(countDownLatch);
+        EventsTestCallback eventCallback = new EventsTestCallback(expectedEvents);
 
-        dockerClient.eventsCmd().withSince(getEpochTime()).exec(eventCallback);
+        dockerClient.eventsCmd()
+            .withSince(startTime)
+            .withUntil(endTime)
+            .exec(eventCallback);
 
-        generateEvents();
-
-        Boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
+        List<Event> events = eventCallback.awaitExpectedEvents(3, TimeUnit.MINUTES);
 
-        eventCallback.close();
-        assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
+        // we may receive more events as expected
+        assertTrue(events.size() >= expectedEvents, "Received events: " + events);
     }
 
     @Test
-    public void testEventStreaming2() throws Exception {
+    public void testEventStreaming() throws Exception {
         // Don't include other tests events
         TimeUnit.SECONDS.sleep(1);
+        
+        String startTime = getEpochTime();
+        int expectedEvents = generateEvents();
 
-        CountDownLatch countDownLatch = new CountDownLatch(KNOWN_NUM_EVENTS);
-        EventsTestCallback eventCallback = new EventsTestCallback(countDownLatch);
+        EventsTestCallback eventCallback = new EventsTestCallback(expectedEvents);
 
-        dockerClient.eventsCmd().withSince(getEpochTime()).exec(eventCallback);
+        dockerClient.eventsCmd()
+            .withSince(startTime)
+            .exec(eventCallback);
 
         generateEvents();
 
-        Boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
-
-        eventCallback.close();
-        assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
+        List<Event> events = eventCallback.awaitExpectedEvents(3, TimeUnit.MINUTES);
+        
+        // we may receive more events as expected
+        assertTrue(events.size() >= expectedEvents, "Received events: " + events);
     }
 
+    
     public void testEventStreamingWithFilter() throws Exception {
         // Don't include other tests events
         TimeUnit.SECONDS.sleep(1);
+        
+        String startTime = getEpochTime();
+        int expectedEvents = 1;
 
-        CountDownLatch countDownLatch = new CountDownLatch(1);
-        EventsTestCallback eventCallback = dockerClient.eventsCmd().withEventFilter("start")
-                .exec(new EventsTestCallback(countDownLatch));
+        EventsTestCallback eventCallback = new EventsTestCallback(expectedEvents);
+        
+        dockerClient.eventsCmd()
+        	.withSince(startTime)
+        	.withEventFilter("start")
+            .exec(eventCallback);
 
         generateEvents();
 
-        Boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
-
-        eventCallback.close();
-        assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
+        List<Event> events = eventCallback.awaitExpectedEvents(3, TimeUnit.MINUTES);
+        
+        // we should get exactly one "start" event here
+        assertEquals(events.size(), expectedEvents, "Received events: " + events);
     }
 
     /**
-     * This method generates {#link KNOWN_NUM_EVENTS} events
+     * This method generates some events and returns the number of events being generated
      */
     private int generateEvents() throws Exception {
-        String testImage = "busybox";
+        String testImage = "busybox:latest";
 
         dockerClient.pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess();
-
         CreateContainerResponse container = dockerClient.createContainerCmd(testImage).withCmd("sleep", "9999").exec();
         dockerClient.startContainerCmd(container.getId()).exec();
-        dockerClient.stopContainerCmd(container.getId()).exec();
-        return KNOWN_NUM_EVENTS;
+        dockerClient.stopContainerCmd(container.getId()).withTimeout(1).exec();
+        
+        // generates 5 events with remote api 1.24:
+        
+        // Event[status=pull,id=busybox:latest,from=<null>,node=<null>,type=IMAGE,action=pull,actor=com.github.dockerjava.api.model.EventActor@417db6d7[id=busybox:latest,attributes={name=busybox}],time=1473455186,timeNano=1473455186436681587]
+        // Event[status=create,id=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c,from=busybox:latest,node=<null>,type=CONTAINER,action=create,actor=com.github.dockerjava.api.model.EventActor@40bcec[id=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c,attributes={image=busybox:latest, name=sick_lamport}],time=1473455186,timeNano=1473455186470713257]
+        // Event[status=<null>,id=<null>,from=<null>,node=<null>,type=NETWORK,action=connect,actor=com.github.dockerjava.api.model.EventActor@318a1b01[id=10870ceb13abb7cf841ea68868472da881b33c8ed08d2cde7dbb39d7c24d1d27,attributes={container=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c, name=bridge, type=bridge}],time=1473455186,timeNano=1473455186544318466]
+        // Event[status=start,id=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c,from=busybox:latest,node=<null>,type=CONTAINER,action=start,actor=com.github.dockerjava.api.model.EventActor@606f43a3[id=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c,attributes={image=busybox:latest, name=sick_lamport}],time=1473455186,timeNano=1473455186786163819]
+        // Event[status=kill,id=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c,from=busybox:latest,node=<null>,type=CONTAINER,action=kill,actor=com.github.dockerjava.api.model.EventActor@72a9ffcf[id=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c,attributes={image=busybox:latest, name=sick_lamport, signal=15}],time=1473455186,timeNano=1473455186792963392]
+
+        return 5;
     }
 
     private class EventsTestCallback extends EventsResultCallback {
@@ -144,18 +141,25 @@ private class EventsTestCallback extends EventsResultCallback {
 
         private final List<Event> events = new ArrayList<Event>();
 
-        public EventsTestCallback(CountDownLatch countDownLatch) {
-            this.countDownLatch = countDownLatch;
+        public EventsTestCallback(int expextedEvents) {
+            this.countDownLatch = new CountDownLatch(expextedEvents);
         }
 
         public void onNext(Event event) {
             LOG.info("Received event #{}: {}", countDownLatch.getCount(), event);
-            countDownLatch.countDown();
             events.add(event);
+            countDownLatch.countDown();
         }
-
-        public List<Event> getEvents() {
-            return new ArrayList<Event>(events);
+        
+        public List<Event> awaitExpectedEvents(long timeout, TimeUnit unit ) {
+        	try {
+				countDownLatch.await(timeout, unit);
+				close();
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+        	return new ArrayList<Event>(events);
         }
     }
 }
+
diff --git a/src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java
index 1dca12890..063bcee30 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java
@@ -61,7 +61,7 @@ public void testStopContainer() throws DockerException {
         dockerClient.startContainerCmd(container.getId()).exec();
 
         LOG.info("Stopping container: {}", container.getId());
-        dockerClient.stopContainerCmd(container.getId()).withTimeout(2).exec();
+        dockerClient.stopContainerCmd(container.getId()).withTimeout(10).exec();
 
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
         LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
@@ -69,17 +69,15 @@ public void testStopContainer() throws DockerException {
         assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
 
         final Integer exitCode = inspectContainerResponse.getState().getExitCode();
-        if (apiVersion.equals(VERSION_1_22)) {
-            assertThat(exitCode, is(0));
-        } else {
-            assertThat(exitCode, not(0));
-        }
+        
+        assertThat(exitCode, is(137));
+        
     }
 
     @Test(expectedExceptions = NotFoundException.class)
     public void testStopNonExistingContainer() throws DockerException {
 
-        dockerClient.stopContainerCmd("non-existing").withTimeout(2).exec();
+        dockerClient.stopContainerCmd("non-existing").withTimeout(10).exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java
index 1134afd6d..681839c17 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java
@@ -78,7 +78,7 @@ public void updateContainer() throws DockerException, IOException {
 //                .withCpusetCpus("0") // depends on env
                 .withCpusetMems("0")
                 .withMemory(314572800L)
-                .withMemorySwap(514288000L)
+//              .withMemorySwap(514288000L) Your kernel does not support swap limit capabilities, memory limited without swap.
                 .withMemoryReservation(209715200L)
 //                .withKernelMemory(52428800) Can not update kernel memory to a running container, please stop it first.
                 .exec();
@@ -101,7 +101,7 @@ public void updateContainer() throws DockerException, IOException {
         assertThat(afterHostConfig.getCpusetMems(), is("0"));
 
         assertThat(afterHostConfig.getMemoryReservation(), is(209715200L));
-        assertThat(afterHostConfig.getMemorySwap(), is(514288000L));
+//        assertThat(afterHostConfig.getMemorySwap(), is(514288000L));
     }
 
 }

From 1bfe308c5321fb3e136fd5c5add09e424f3fec86 Mon Sep 17 00:00:00 2001
From: Martin Caslavsky <mcaslavsky@gmail.com>
Date: Mon, 12 Sep 2016 18:53:50 +0200
Subject: [PATCH 0664/1272] Allow to configure connection pool timeout (#703)

The default connection pool timeout of Apache HTTP Client is -1 (unlimited)
---
 .../jaxrs/JerseyDockerCmdExecFactory.java         | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
index 3339a2696..73bab979e 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -20,6 +20,7 @@
 import com.github.dockerjava.api.command.UpdateContainerCmd;
 import com.github.dockerjava.core.SSLConfig;
 
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.conn.socket.PlainConnectionSocketFactory;
@@ -110,6 +111,8 @@ public class JerseyDockerCmdExecFactory implements DockerCmdExecFactory {
 
     private Integer maxPerRouteConnections = null;
 
+    private Integer connectionRequestTimeout = null;
+
     private ClientRequestFilter[] clientRequestFilters = null;
 
     private ClientResponseFilter[] clientResponseFilters = null;
@@ -216,9 +219,10 @@ public void shutdown() {
         clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER, connManager);
 
         // Configure connection pool timeout
-        // clientConfig.property(ApacheClientProperties.REQUEST_CONFIG, RequestConfig.custom()
-        // .setConnectionRequestTimeout(1000).build());
-
+        if (connectionRequestTimeout != null) {
+            clientConfig.property(ApacheClientProperties.REQUEST_CONFIG, RequestConfig.custom()
+                    .setConnectionRequestTimeout(connectionRequestTimeout).build());
+        }
         ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(clientConfig);
 
         if (sslContext != null) {
@@ -570,6 +574,11 @@ public JerseyDockerCmdExecFactory withMaxPerRouteConnections(Integer maxPerRoute
         return this;
     }
 
+    public JerseyDockerCmdExecFactory withConnectionRequestTimeout(Integer connectionRequestTimeout) {
+        this.connectionRequestTimeout = connectionRequestTimeout;
+        return this;
+    }
+
     public JerseyDockerCmdExecFactory withClientResponseFilters(ClientResponseFilter... clientResponseFilter) {
         this.clientResponseFilters = clientResponseFilter;
         return this;

From c31716377f29bb2ece8f83bfaefc8368c3c72abb Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 14 Sep 2016 01:15:42 +0300
Subject: [PATCH 0665/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8b6dcd86..908c2d906 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@ Change Log
 ## Next
 
 ## 3.0.6
+ * Fixed issue with jersey and unix domain sockets.
+ * [#703](https://github.com/docker-java/docker-java/pull/703) Allow to configure connection pool timeout.
  * Make all models Serializable.
  * [NETTY] Fix loadImage responce on 1.24 API.
  * LogPath field for inspect container.

From 03181feda5bbaced61edb715fec600a5236775e3 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 14 Sep 2016 01:21:10 +0300
Subject: [PATCH 0666/1272] [maven-release-plugin] prepare release 3.0.6

---
 pom.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5cc227ee3..3727ac2e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -11,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.6-SNAPSHOT</version>
+	<version>3.0.6</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -29,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.0.6</tag>
 	</scm>
 
 	<developers>

From c3e03be12299c34988980ade3dc7d7a6d3956b12 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 14 Sep 2016 01:21:17 +0300
Subject: [PATCH 0667/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3727ac2e9..216c48631 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.6</version>
+	<version>3.0.7-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.0.6</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 450a51670e5667e0789127f2a2d7e1a4d0fcbcb5 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 14 Sep 2016 01:33:47 +0300
Subject: [PATCH 0668/1272] Update .travis.yml

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ba8c62ad0..d055f76e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,8 +21,8 @@ env:
     - COVERITY_SCAN_NOTIFICATION_EMAIL="kanstantsin.sha@gmail.com"
 
   matrix:
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.12.0-0~trusty" CODECOV=true
-    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.12.0-0~trusty" CODECOV=true
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.12.1-0~trusty" CODECOV=true
+    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.12.1-0~trusty" CODECOV=true
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" DEPLOY=true COVERITY=true CODECOV=true
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty" CODECOV=true
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.10.3-0~trusty" CODECOV=true

From 305b73a9763f8d47bdc9698ecfaa9c844a6e087f Mon Sep 17 00:00:00 2001
From: Corey Beres <corey.beres@gmail.com>
Date: Wed, 28 Sep 2016 20:34:55 -0400
Subject: [PATCH 0669/1272] Label image during build #681 (#684)

* Ability to set labels on image build (#681)

* Check API version in new tests (#681)

* remove unnecessary this (#681)

* change withLabel to withLabels (#681)
---
 .../dockerjava/api/command/BuildImageCmd.java | 11 ++++++++
 .../core/command/BuildImageCmdImpl.java       | 16 ++++++++++++
 .../dockerjava/jaxrs/BuildImageCmdExec.java   | 25 +++++++++++++------
 .../netty/exec/BuildImageCmdExec.java         | 23 +++++++++++------
 .../core/command/BuildImageCmdImplTest.java   | 24 ++++++++++++++++++
 .../netty/exec/BuildImageCmdExecTest.java     | 24 ++++++++++++++++++
 .../resources/buildTests/labels/Dockerfile    |  3 +++
 7 files changed, 111 insertions(+), 15 deletions(-)
 create mode 100644 src/test/resources/buildTests/labels/Dockerfile

diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 20b23e903..ac98db2f9 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -101,6 +101,12 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     @CheckForNull
     Long getShmsize();
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_23}
+     */
+    @CheckForNull
+    Map<String, String> getLabels();
+
     // setters
 
     BuildImageCmd withTag(String tag);
@@ -145,6 +151,11 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     */
     BuildImageCmd withShmsize(Long shmsize);
 
+    /**
+    *@since {@link RemoteApiVersion#VERSION_1_23}
+    */
+    BuildImageCmd withLabels(Map<String, String> labels);
+
     interface Exec extends DockerCmdAsyncExec<BuildImageCmd, BuildResponseItem> {
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index 487f0b264..c34b05155 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -56,6 +56,8 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR
 
     private Map<String, String> buildArgs;
 
+    private Map<String, String> labels;
+
     public BuildImageCmdImpl(BuildImageCmd.Exec exec) {
         super(exec);
     }
@@ -149,6 +151,11 @@ public Map<String, String> getBuildArgs() {
         return buildArgs;
     }
 
+    @Override
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
     // getter lib specific
 
     @Override
@@ -303,6 +310,15 @@ public BuildImageCmd withShmsize(Long shmsize) {
         return this;
     }
 
+    /**
+     * @see #labels
+     */
+    @Override
+    public BuildImageCmd withLabels(Map<String, String> labels) {
+        this.labels = labels;
+        return this;
+    }
+
     @Override
     public void close() {
         super.close();
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index 43e7687eb..2a7aea40e 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -24,6 +24,7 @@
 
 import java.io.IOException;
 import java.net.URLEncoder;
+import java.util.Map;
 
 public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem> implements
         BuildImageCmd.Exec {
@@ -99,19 +100,14 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
             webTarget = webTarget.queryParam("rm", "false");
         }
 
-        if (command.getBuildArgs() != null && !command.getBuildArgs().isEmpty()) {
-            try {
-                webTarget = webTarget.queryParam("buildargs",
-                        URLEncoder.encode(MAPPER.writeValueAsString(command.getBuildArgs()), "UTF-8"));
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
+        webTarget = writeMap(webTarget, "buildargs", command.getBuildArgs());
 
         if (command.getShmsize() != null) {
             webTarget = webTarget.queryParam("shmsize", command.getShmsize());
         }
 
+        webTarget = writeMap(webTarget, "labels", command.getLabels());
+
         webTarget.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED);
         webTarget.property(ClientProperties.CHUNKED_ENCODING_SIZE, 1024 * 1024);
 
@@ -123,4 +119,17 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
                 entity(command.getTarInputStream(), "application/tar")
         );
     }
+
+    private WebTarget writeMap(WebTarget webTarget, String name, Map<String, String> value) {
+        if (value != null && !value.isEmpty()) {
+            try {
+                return webTarget.queryParam(name,
+                        URLEncoder.encode(MAPPER.writeValueAsString(value), "UTF-8"));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            return webTarget;
+        }
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
index f4ff04576..43152570e 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
@@ -15,6 +15,7 @@
 import com.github.dockerjava.netty.WebTarget;
 
 import java.io.IOException;
+import java.util.Map;
 
 public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem> implements
         BuildImageCmd.Exec {
@@ -85,18 +86,14 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
             webTarget = webTarget.queryParam("cpusetcpus", command.getCpusetcpus());
         }
 
-        if (command.getBuildArgs() != null && !command.getBuildArgs().isEmpty()) {
-            try {
-                webTarget = webTarget.queryParam("buildargs", MAPPER.writeValueAsString(command.getBuildArgs()));
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
+        webTarget = writeMap(webTarget, "buildargs", command.getBuildArgs());
 
         if (command.getShmsize() != null) {
             webTarget = webTarget.queryParam("shmsize", command.getShmsize());
         }
 
+        webTarget = writeMap(webTarget, "labels", command.getLabels());
+
         LOGGER.trace("POST: {}", webTarget);
 
         InvocationBuilder builder = resourceWithOptionalAuthConfig(command, webTarget.request())
@@ -109,4 +106,16 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
 
         return null;
     }
+
+    private WebTarget writeMap(WebTarget webTarget, String name, Map<String, String> value) {
+        if (value != null && !value.isEmpty()) {
+            try {
+                return webTarget.queryParam(name, MAPPER.writeValueAsString(value));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            return webTarget;
+        }
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 31f3c3045..cb4c1b2a8 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.core.command;
 
+import static com.github.dockerjava.utils.TestUtils.getVersion;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
@@ -12,11 +13,13 @@
 import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.TrueFileFilter;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -33,6 +36,7 @@
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports.Binding;
 import com.github.dockerjava.client.AbstractDockerClientTest;
+import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.core.util.CompressArchiveUtil;
 
 @Test(groups = "integration")
@@ -250,6 +254,26 @@ public void buildArgs() throws Exception {
         assertThat(inspectImageResponse.getConfig().getLabels().get("test"), equalTo("abc"));
     }
 
+    @Test
+    public void labels() throws Exception {
+        if (!getVersion(dockerClient).isGreaterOrEqual(RemoteApiVersion.VERSION_1_23)) {
+            throw new SkipException("API version should be >= 1.23");
+        }
+
+        File baseDir = fileFromBuildTestResource("labels");
+
+        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true)
+                .withLabels(Collections.singletonMap("test", "abc"))
+                .exec(new BuildImageResultCallback())
+                .awaitImageId();
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        assertThat(inspectImageResponse, not(nullValue()));
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+        assertThat(inspectImageResponse.getConfig().getLabels().get("test"), equalTo("abc"));
+    }
+
     public void dockerfileNotInBaseDirectory() throws Exception {
         File baseDirectory = fileFromBuildTestResource("dockerfileNotInBaseDirectory");
         File dockerfile = fileFromBuildTestResource("dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile");
diff --git a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
index 1474ef25f..f567dcfc8 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.netty.exec;
 
+import static com.github.dockerjava.utils.TestUtils.getVersion;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
@@ -12,11 +13,13 @@
 import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.TrueFileFilter;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -34,6 +37,7 @@
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.Ports.Binding;
+import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.core.command.BuildImageResultCallback;
 import com.github.dockerjava.core.command.PushImageResultCallback;
 import com.github.dockerjava.core.command.WaitContainerResultCallback;
@@ -255,6 +259,26 @@ public void buildArgs() throws Exception {
         assertThat(inspectImageResponse.getConfig().getLabels().get("test"), equalTo("abc"));
     }
 
+    @Test
+    public void labels() throws Exception {
+        if (!getVersion(dockerClient).isGreaterOrEqual(RemoteApiVersion.VERSION_1_23)) {
+            throw new SkipException("API version should be >= 1.23");
+        }
+
+        File baseDir = fileFromBuildTestResource("labels");
+
+        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true)
+                .withLabels(Collections.singletonMap("test", "abc"))
+                .exec(new BuildImageResultCallback())
+                .awaitImageId();
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        assertThat(inspectImageResponse, not(nullValue()));
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+        assertThat(inspectImageResponse.getConfig().getLabels().get("test"), equalTo("abc"));
+    }
+
     public void dockerfileNotInBaseDirectory() throws Exception {
         File baseDirectory = fileFromBuildTestResource("dockerfileNotInBaseDirectory");
         File dockerfile = fileFromBuildTestResource("dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile");
diff --git a/src/test/resources/buildTests/labels/Dockerfile b/src/test/resources/buildTests/labels/Dockerfile
new file mode 100644
index 000000000..6a8106b86
--- /dev/null
+++ b/src/test/resources/buildTests/labels/Dockerfile
@@ -0,0 +1,3 @@
+FROM      ubuntu:latest
+
+CMD ["echo", "Success"]

From 1ec83d60ea4a30a6e22aa5620fa4ca01f8d23e21 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 29 Sep 2016 03:35:36 +0300
Subject: [PATCH 0670/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 908c2d906..efbed07d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 Change Log
 ===
-## Next
+## Next 3.0.7
+ * Label image during build
 
 ## 3.0.6
  * Fixed issue with jersey and unix domain sockets.

From 069987852c842e3bba85ed3325a8877c36f9e87f Mon Sep 17 00:00:00 2001
From: Christopher Dancy <cdancy@users.noreply.github.com>
Date: Fri, 30 Sep 2016 13:39:51 -0400
Subject: [PATCH 0671/1272] Expose 'User' property on ExecCreateCmd (#707)
 (#708)

* Expose 'User' property on ExecCreateCmd (#707)
---
 .../dockerjava/api/command/ExecCreateCmd.java |  5 +++
 .../core/command/ExecCreateCmdImpl.java       | 17 +++++++++
 .../core/command/ExecCreateCmdImplTest.java   |  2 +-
 .../core/command/ExecStartCmdImplTest.java    | 37 ++++++++++++++-----
 4 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
index fe2329290..829ebf8ee 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
@@ -20,6 +20,9 @@ public interface ExecCreateCmd extends SyncDockerCmd<ExecCreateCmdResponse> {
     @CheckForNull
     Boolean hasTtyEnabled();
 
+    @CheckForNull
+    String getUser();
+
     ExecCreateCmd withAttachStderr(Boolean attachStderr);
 
     ExecCreateCmd withAttachStdin(Boolean attachStdin);
@@ -32,6 +35,8 @@ public interface ExecCreateCmd extends SyncDockerCmd<ExecCreateCmdResponse> {
 
     ExecCreateCmd withTty(Boolean tty);
 
+    ExecCreateCmd withUser(String user);
+
     interface Exec extends DockerCmdSyncExec<ExecCreateCmd, ExecCreateCmdResponse> {
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
index 14da4626a..fc8bf1c0b 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
@@ -26,6 +26,12 @@ public class ExecCreateCmdImpl extends AbstrDockerCmd<ExecCreateCmd, ExecCreateC
     @JsonProperty("Tty")
     private Boolean tty;
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_19}
+     */
+    @JsonProperty("User")
+    private String user;
+
     @JsonProperty("Cmd")
     private String[] cmd;
 
@@ -65,6 +71,12 @@ public ExecCreateCmd withTty(Boolean tty) {
         return this;
     }
 
+    @Override
+    public ExecCreateCmd withUser(String user) {
+        this.user = user;
+        return this;
+    }
+
     @Override
     public ExecCreateCmd withCmd(String... cmd) {
         this.cmd = cmd;
@@ -96,6 +108,11 @@ public Boolean hasTtyEnabled() {
         return tty;
     }
 
+    @Override
+    public String getUser() {
+        return user;
+    }
+
     /**
      * @throws NotFoundException
      *             No such container
diff --git a/src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java
index 139c81f56..d8e3326d5 100644
--- a/src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java
@@ -44,7 +44,7 @@ public void afterMethod(ITestResult result) {
     public void execCreateTest() {
         String containerName = "generated_" + new SecureRandom().nextInt();
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withUser("root").withCmd("top")
                 .withName(containerName).exec();
 
         LOG.info("Created container {}", container.toString());
diff --git a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
index c4f0b9189..8ae9e5a91 100644
--- a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
@@ -1,13 +1,15 @@
 package com.github.dockerjava.core.command;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.ExecCreateCmdResponse;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.client.AbstractDockerClientTest;
 import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.security.SecureRandom;
-
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -15,10 +17,6 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.ExecCreateCmdResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
 @Test(groups = "integration")
 public class ExecStartCmdImplTest extends AbstractDockerClientTest {
     @BeforeTest
@@ -53,7 +51,7 @@ public void execStart() throws Exception {
         dockerClient.startContainerCmd(container.getId()).exec();
 
         ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true).withCmd("touch", "/execStartTest.log").exec();
+                .withAttachStdout(true).withCmd("touch", "/execStartTest.log").withUser("root").exec();
         dockerClient.execStartCmd(execCreateCmdResponse.getId()).exec(
                 new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
 
@@ -92,4 +90,23 @@ public void execStartAttached() throws Exception {
         assertNotNull(responseAsString);
         assertTrue(responseAsString.length() > 0);
     }
+    
+    @Test(groups = "ignoreInCircleCi", expectedExceptions = NotFoundException.class)
+    public void execStartWithNonExistentUser() throws Exception {
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName(containerName).exec();
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
+                .withAttachStdout(true).withCmd("touch", "/execStartTest.log").withUser("NonExistentUser").exec();
+        dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true)
+                .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
+
+        dockerClient.copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec();
+    }
 }

From b3be4fb1b9cdf3c1cd6a7d30ac91fff2d2e31264 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 30 Sep 2016 21:32:07 +0300
Subject: [PATCH 0672/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efbed07d8..8f41b2938 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@ Change Log
 ===
 ## Next 3.0.7
  * Label image during build
+ * Expose 'User' property on ExecCreateCmd #707 #708
 
 ## 3.0.6
  * Fixed issue with jersey and unix domain sockets.

From 5736b4bb235afab960866b0d0f18bb7aa7a3e527 Mon Sep 17 00:00:00 2001
From: Hendrik-H <hendrik.haddorp@gmx.net>
Date: Fri, 7 Oct 2016 22:33:51 +0200
Subject: [PATCH 0673/1272] Support volumes propagation flags (Issue 554)
 (#705)

* Support nocopy option in volume binds (#688)

* support volumes propagation flags, fixes #554

* renamed values to match java convention
---
 .../com/github/dockerjava/api/model/Bind.java | 54 ++++++++++++-
 .../dockerjava/api/model/PropagationMode.java | 50 ++++++++++++
 .../github/dockerjava/api/model/BindTest.java | 79 +++++++++++++++++++
 .../exec/CreateContainerCmdExecTest.java      | 37 +++++++++
 4 files changed, 217 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/PropagationMode.java

diff --git a/src/main/java/com/github/dockerjava/api/model/Bind.java b/src/main/java/com/github/dockerjava/api/model/Bind.java
index 0995c87ac..9a7ebf18d 100644
--- a/src/main/java/com/github/dockerjava/api/model/Bind.java
+++ b/src/main/java/com/github/dockerjava/api/model/Bind.java
@@ -18,24 +18,48 @@ public class Bind implements Serializable {
 
     private AccessMode accessMode;
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_23}
+     */
+    private Boolean noCopy;
+
     /**
      * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_17}
      */
     private SELContext secMode;
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
+     */
+    private PropagationMode propagationMode;
+
     public Bind(String path, Volume volume) {
         this(path, volume, AccessMode.DEFAULT, SELContext.DEFAULT);
     }
 
+    public Bind(String path, Volume volume, Boolean noCopy) {
+        this(path, volume, AccessMode.DEFAULT, SELContext.DEFAULT, noCopy);
+    }
+
     public Bind(String path, Volume volume, AccessMode accessMode) {
         this(path, volume, accessMode, SELContext.DEFAULT);
     }
 
     public Bind(String path, Volume volume, AccessMode accessMode, SELContext secMode) {
+        this(path, volume, accessMode, secMode, null);
+    }
+
+    public Bind(String path, Volume volume, AccessMode accessMode, SELContext secMode, Boolean noCopy) {
+        this(path, volume, accessMode, secMode, noCopy, PropagationMode.DEFAULT_MODE);
+    }
+
+    public Bind(String path, Volume volume, AccessMode accessMode, SELContext secMode, Boolean noCopy, PropagationMode propagationMode) {
         this.path = path;
         this.volume = volume;
         this.accessMode = accessMode;
         this.secMode = secMode;
+        this.noCopy = noCopy;
+        this.propagationMode = propagationMode;
     }
 
     public String getPath() {
@@ -54,6 +78,14 @@ public SELContext getSecMode() {
         return secMode;
     }
 
+    public Boolean getNoCopy() {
+        return noCopy;
+    }
+
+    public PropagationMode getPropagationMode() {
+        return propagationMode;
+    }
+
     /**
      * Parses a bind mount specification to a {@link Bind}.
      *
@@ -74,15 +106,25 @@ public static Bind parse(String serialized) {
                 String[] flags = parts[2].split(",");
                 AccessMode accessMode = AccessMode.DEFAULT;
                 SELContext seMode = SELContext.DEFAULT;
+                Boolean nocopy = null;
+                PropagationMode propagationMode = PropagationMode.DEFAULT_MODE;
                 for (String p : flags) {
                     if (p.length() == 2) {
                         accessMode = AccessMode.valueOf(p.toLowerCase());
+                    } else if ("nocopy".equals(p)) {
+                        nocopy = true;
+                    } else if (PropagationMode.SHARED.toString().equals(p)) {
+                        propagationMode = PropagationMode.SHARED;
+                    } else if (PropagationMode.SLAVE.toString().equals(p)) {
+                        propagationMode = PropagationMode.SLAVE;
+                    } else if (PropagationMode.PRIVATE.toString().equals(p)) {
+                        propagationMode = PropagationMode.PRIVATE;
                     } else {
                         seMode = SELContext.fromString(p);
                     }
                 }
 
-                return new Bind(parts[0], new Volume(parts[1]), accessMode, seMode);
+                return new Bind(parts[0], new Volume(parts[1]), accessMode, seMode, nocopy, propagationMode);
             }
             default: {
                 throw new IllegalArgumentException();
@@ -102,6 +144,8 @@ public boolean equals(Object obj) {
                     .append(volume, other.getVolume())
                     .append(accessMode, other.getAccessMode())
                     .append(secMode, other.getSecMode())
+                    .append(noCopy, other.getNoCopy())
+                    .append(propagationMode, other.getPropagationMode())
                     .isEquals();
         } else {
             return super.equals(obj);
@@ -115,6 +159,8 @@ public int hashCode() {
                 .append(volume)
                 .append(accessMode)
                 .append(secMode)
+                .append(noCopy)
+                .append(propagationMode)
                 .toHashCode();
     }
 
@@ -127,10 +173,12 @@ public int hashCode() {
      */
     @Override
     public String toString() {
-        return String.format("%s:%s:%s%s",
+        return String.format("%s:%s:%s%s%s%s",
                 path,
                 volume.getPath(),
                 accessMode.toString(),
-                secMode != SELContext.none ? "," + secMode.toString() : "");
+                secMode != SELContext.none ? "," + secMode.toString() : "",
+                noCopy != null ? ",nocopy" : "",
+                propagationMode != PropagationMode.DEFAULT_MODE ? "," + propagationMode.toString() : "");
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/PropagationMode.java b/src/main/java/com/github/dockerjava/api/model/PropagationMode.java
new file mode 100644
index 000000000..9be7d6e43
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/PropagationMode.java
@@ -0,0 +1,50 @@
+package com.github.dockerjava.api.model;
+
+/**
+ * The propagation mode of a file system or file: <code>shared</code>, <code>slave</code> or <code>private</code>.
+ *
+ * @see https://github.com/docker/docker/pull/17034
+ * @since 1.22
+ */
+public enum PropagationMode {
+    /** default */
+    DEFAULT(""),
+
+    /** shared */
+    SHARED("shared"),
+
+    /** slave */
+    SLAVE("slave"),
+
+    /** private */
+    PRIVATE("private");
+
+    /**
+     * The default {@link PropagationMode}: {@link #DEFAULT}
+     */
+    public static final PropagationMode DEFAULT_MODE = DEFAULT;
+
+    private String value;
+
+    PropagationMode(String v) {
+        value = v;
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+
+    public static PropagationMode fromString(String v) {
+        switch (v) {
+        case "shared":
+            return SHARED;
+        case "slave":
+            return SLAVE;
+        case "private":
+            return PRIVATE;
+        default:
+            return DEFAULT;
+        }
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/api/model/BindTest.java b/src/test/java/com/github/dockerjava/api/model/BindTest.java
index 3204ee716..2e6fd8353 100644
--- a/src/test/java/com/github/dockerjava/api/model/BindTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/BindTest.java
@@ -3,6 +3,7 @@
 import static com.github.dockerjava.api.model.AccessMode.ro;
 import static com.github.dockerjava.api.model.AccessMode.rw;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.core.Is.is;
 
 import org.testng.annotations.Test;
@@ -16,6 +17,8 @@ public void parseUsingDefaultAccessMode() {
         assertThat(bind.getVolume().getPath(), is("/container"));
         assertThat(bind.getAccessMode(), is(AccessMode.DEFAULT));
         assertThat(bind.getSecMode(), is(SELContext.none));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
     }
 
     @Test
@@ -25,6 +28,52 @@ public void parseReadWrite() {
         assertThat(bind.getVolume().getPath(), is("/container"));
         assertThat(bind.getAccessMode(), is(rw));
         assertThat(bind.getSecMode(), is(SELContext.none));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
+    }
+
+    @Test
+    public void parseReadWriteNoCopy() {
+        Bind bind = Bind.parse("/host:/container:rw,nocopy");
+        assertThat(bind.getPath(), is("/host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(rw));
+        assertThat(bind.getSecMode(), is(SELContext.none));
+        assertThat(bind.getNoCopy(), is(true));
+        assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
+    }
+
+    @Test
+    public void parseReadWriteShared() {
+        Bind bind = Bind.parse("/host:/container:rw,shared");
+        assertThat(bind.getPath(), is("/host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(rw));
+        assertThat(bind.getSecMode(), is(SELContext.none));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.SHARED));
+    }
+
+    @Test
+    public void parseReadWriteSlave() {
+        Bind bind = Bind.parse("/host:/container:rw,slave");
+        assertThat(bind.getPath(), is("/host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(rw));
+        assertThat(bind.getSecMode(), is(SELContext.none));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.SLAVE));
+    }
+
+    @Test
+    public void parseReadWritePrivate() {
+        Bind bind = Bind.parse("/host:/container:rw,private");
+        assertThat(bind.getPath(), is("/host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(rw));
+        assertThat(bind.getSecMode(), is(SELContext.none));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.PRIVATE));
     }
 
     @Test
@@ -34,6 +83,8 @@ public void parseReadOnly() {
         assertThat(bind.getVolume().getPath(), is("/container"));
         assertThat(bind.getAccessMode(), is(ro));
         assertThat(bind.getSecMode(), is(SELContext.none));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
     }
 
     @Test
@@ -43,12 +94,16 @@ public void parseSELOnly() {
         assertThat(bind.getVolume().getPath(), is("/container"));
         assertThat(bind.getAccessMode(), is(AccessMode.DEFAULT));
         assertThat(bind.getSecMode(), is(SELContext.single));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
 
         bind = Bind.parse("/host:/container:z");
         assertThat(bind.getPath(), is("/host"));
         assertThat(bind.getVolume().getPath(), is("/container"));
         assertThat(bind.getAccessMode(), is(AccessMode.DEFAULT));
         assertThat(bind.getSecMode(), is(SELContext.shared));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
     }
 
     @Test
@@ -58,6 +113,8 @@ public void parseReadWriteSEL() {
         assertThat(bind.getVolume().getPath(), is("/container"));
         assertThat(bind.getAccessMode(), is(rw));
         assertThat(bind.getSecMode(), is(SELContext.single));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
     }
 
     @Test
@@ -67,6 +124,8 @@ public void parseReadOnlySEL() {
         assertThat(bind.getVolume().getPath(), is("/container"));
         assertThat(bind.getAccessMode(), is(ro));
         assertThat(bind.getSecMode(), is(SELContext.shared));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
     }
 
     @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Bind.*")
@@ -94,6 +153,26 @@ public void toStringReadWrite() {
         assertThat(Bind.parse("/host:/container:rw").toString(), is("/host:/container:rw"));
     }
 
+    @Test
+    public void toStringReadWriteNoCopy() {
+        assertThat(Bind.parse("/host:/container:rw,nocopy").toString(), is("/host:/container:rw,nocopy"));
+    }
+
+    @Test
+    public void toStringReadWriteShared() {
+        assertThat(Bind.parse("/host:/container:rw,shared").toString(), is("/host:/container:rw,shared"));
+    }
+
+    @Test
+    public void toStringReadWriteSlave() {
+        assertThat(Bind.parse("/host:/container:rw,slave").toString(), is("/host:/container:rw,slave"));
+    }
+
+    @Test
+    public void toStringReadWritePrivate() {
+        assertThat(Bind.parse("/host:/container:rw,private").toString(), is("/host:/container:rw,private"));
+    }
+
     @Test
     public void toStringDefaultAccessMode() {
         assertThat(Bind.parse("/host:/container").toString(), is("/host:/container:rw"));
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
index 3694ca7fb..aa97b8839 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
@@ -2,6 +2,7 @@
 
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.api.command.CreateVolumeResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.DockerException;
@@ -15,6 +16,7 @@
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.Ports.Binding;
+import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Ulimit;
 import com.github.dockerjava.api.model.Volume;
@@ -23,6 +25,7 @@
 
 import org.apache.commons.io.FileUtils;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -40,6 +43,7 @@
 
 import static com.github.dockerjava.api.model.Capability.MKNOD;
 import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
+import static com.github.dockerjava.utils.TestUtils.getVersion;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
@@ -138,6 +142,39 @@ public void createContainerWithReadOnlyVolume() throws DockerException {
         // assertFalse(inspectContainerResponse.getMounts().get(0).getRW());
     }
 
+    @Test
+    public void createContainerWithNoCopyVolumes() throws DockerException {
+        final RemoteApiVersion apiVersion = getVersion(dockerClient);
+        
+        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_23)) {
+            throw new SkipException("API version should be >= 1.23");
+        }
+        
+    	Volume volume1 = new Volume("/opt/webapp1");
+    	String container1Name = UUID.randomUUID().toString();
+    	
+    	CreateVolumeResponse volumeResponse = dockerClient.createVolumeCmd().withName("webapp1").exec();
+    	assertThat(volumeResponse.getName(), equalTo("webapp1"));
+        assertThat(volumeResponse.getDriver(), equalTo("local"));
+        assertThat(volumeResponse.getMountpoint(), containsString("/webapp1/"));
+    	
+    	Bind bind1 = new Bind("webapp1", volume1, true);
+    	
+    	CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName(container1Name)
+                .withBinds(bind1).exec();
+        LOG.info("Created container1 {}", container1.toString());
+        
+        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId()).exec();
+        
+        assertThat(Arrays.asList(inspectContainerResponse1.getHostConfig().getBinds()), contains(bind1));
+        assertThat(inspectContainerResponse1, mountedVolumes(contains(volume1)));
+        
+        assertThat(inspectContainerResponse1.getMounts().get(0).getDestination(), equalTo(volume1));
+        assertThat(inspectContainerResponse1.getMounts().get(0).getMode(), equalTo("rw,nocopy"));
+        assertThat(inspectContainerResponse1.getMounts().get(0).getRW(), equalTo(true));
+    }
+    
     @Test
     public void createContainerWithVolumesFrom() throws DockerException {
 

From 6c748c61330cc996c78d5c294e40d98c8294e37e Mon Sep 17 00:00:00 2001
From: valerijf <valerijf@yahoo-inc.com>
Date: Tue, 11 Oct 2016 13:23:26 +0200
Subject: [PATCH 0674/1272] Added getter for previous cpu stats

---
 .../github/dockerjava/api/model/Statistics.java    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/Statistics.java b/src/main/java/com/github/dockerjava/api/model/Statistics.java
index cf8c1b77e..6827be4e8 100644
--- a/src/main/java/com/github/dockerjava/api/model/Statistics.java
+++ b/src/main/java/com/github/dockerjava/api/model/Statistics.java
@@ -46,6 +46,12 @@ public class Statistics implements Serializable {
     @JsonProperty("cpu_stats")
     private Map<String, Object> cpuStats;
 
+    /**
+     * @since Docker Remote API 1.19
+     */
+    @JsonProperty("precpu_stats")
+    private Map<String, Object> precpuStats;
+
     /**
      * @since Docker Remote API 1.21
      */
@@ -66,6 +72,14 @@ public Map<String, Object> getCpuStats() {
         return cpuStats;
     }
 
+    /**
+     * The cpu statistic of last read, which is used for calculating the cpu usage percent.
+     * It is not the exact copy of the {@link #getCpuStats()}.
+     */
+    public Map<String, Object> getPreviousCpuStats() {
+        return precpuStats;
+    }
+
     public Map<String, Object> getMemoryStats() {
         return memoryStats;
     }

From 9d2c93e5eacf4807f5368d28c3277d85aa6bd546 Mon Sep 17 00:00:00 2001
From: valerijf <valerijf@yahoo-inc.com>
Date: Fri, 14 Oct 2016 09:49:01 +0200
Subject: [PATCH 0675/1272] Renamed getter as field

---
 src/main/java/com/github/dockerjava/api/model/Statistics.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/Statistics.java b/src/main/java/com/github/dockerjava/api/model/Statistics.java
index 6827be4e8..9307da6b3 100644
--- a/src/main/java/com/github/dockerjava/api/model/Statistics.java
+++ b/src/main/java/com/github/dockerjava/api/model/Statistics.java
@@ -76,7 +76,7 @@ public Map<String, Object> getCpuStats() {
      * The cpu statistic of last read, which is used for calculating the cpu usage percent.
      * It is not the exact copy of the {@link #getCpuStats()}.
      */
-    public Map<String, Object> getPreviousCpuStats() {
+    public Map<String, Object> getPrecpuStats() {
         return precpuStats;
     }
 

From 75e9a2cd3d1bf1489f7a94fd9dc8d624359fa430 Mon Sep 17 00:00:00 2001
From: marcuslinke <marcus.linke@gmx.de>
Date: Thu, 27 Oct 2016 20:09:07 +0200
Subject: [PATCH 0676/1272] Expose netty connect timeout (#725)

---
 .../netty/NettyDockerCmdExecFactory.java      | 42 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index cead92e92..c91d4af21 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -108,6 +108,9 @@
 import com.github.dockerjava.netty.exec.RenameContainerCmdExec;
 
 import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelFactory;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.epoll.EpollDomainSocketChannel;
@@ -178,6 +181,8 @@ public DuplexChannel getChannel() {
         }
     };
 
+    private Integer connectTimeout = null;
+
     @Override
     public void init(DockerClientConfig dockerClientConfig) {
         checkNotNull(dockerClientConfig, "config was not specified");
@@ -218,7 +223,15 @@ private class UnixDomainSocketInitializer implements NettyInitializer {
         @Override
         public EventLoopGroup init(Bootstrap bootstrap, DockerClientConfig dockerClientConfig) {
             EventLoopGroup epollEventLoopGroup = new EpollEventLoopGroup(0, new DefaultThreadFactory(threadPrefix));
-            bootstrap.group(epollEventLoopGroup).channel(EpollDomainSocketChannel.class)
+
+            ChannelFactory<EpollDomainSocketChannel> factory = new ChannelFactory<EpollDomainSocketChannel>() {
+                @Override
+                public EpollDomainSocketChannel newChannel() {
+                    return configure(new EpollDomainSocketChannel());
+                }
+            };
+
+            bootstrap.group(epollEventLoopGroup).channelFactory(factory)
                     .handler(new ChannelInitializer<UnixChannel>() {
                         @Override
                         protected void initChannel(final UnixChannel channel) throws Exception {
@@ -245,7 +258,14 @@ public EventLoopGroup init(Bootstrap bootstrap, final DockerClientConfig dockerC
 
             Security.addProvider(new BouncyCastleProvider());
 
-            bootstrap.group(nioEventLoopGroup).channel(NioSocketChannel.class)
+            ChannelFactory<NioSocketChannel> factory = new ChannelFactory<NioSocketChannel>() {
+                @Override
+                public NioSocketChannel newChannel() {
+                    return configure(new NioSocketChannel());
+                }
+            };
+
+            bootstrap.group(nioEventLoopGroup).channelFactory(factory)
                     .handler(new ChannelInitializer<SocketChannel>() {
                         @Override
                         protected void initChannel(final SocketChannel channel) throws Exception {
@@ -580,6 +600,24 @@ public void close() throws IOException {
         eventLoopGroup.shutdownGracefully();
     }
 
+    /**
+     * Configure connection timeout in milliseconds
+     */
+    public NettyDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) {
+        this.connectTimeout = connectTimeout;
+        return this;
+    }
+
+    private <T extends Channel> T configure(T channel) {
+        ChannelConfig channelConfig = channel.config();
+
+        if (connectTimeout != null) {
+            channelConfig.setConnectTimeoutMillis(connectTimeout);
+        }
+
+        return channel;
+    }
+
     private WebTarget getBaseResource() {
         return new WebTarget(channelProvider);
     }

From 39ef5d14bb7a6b217bba97525585fac08be39d00 Mon Sep 17 00:00:00 2001
From: Matt Fulgo <matt@fulgo.org>
Date: Wed, 2 Nov 2016 09:55:49 -0400
Subject: [PATCH 0677/1272] Fixes broken Docker documentation link

The official Docker documentation has moved around a bit and the link for how to configure the Docker Engine needed to be updated. The previous link pointed to a page that no longer exists.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 039657807..c2fa5d854 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ client also uses UNIX domain sockets to connect to the docker daemon by default.
 
     DOCKER_OPTS="-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock"
     
-More details about setting up Docker server can be found in official documentation: http://docs.docker.io/en/latest/use/basics/
+More details about setting up Docker Engine can be found in the official documentation: https://docs.docker.com/engine/admin/
 
 To force docker-java to use TCP (http) configure the following (see [Configuration](https://github.com/docker-java/docker-java#configuration) for details):
 

From 49b94f6fd6fd6f59c45138698051047e82719dd8 Mon Sep 17 00:00:00 2001
From: ooxi <violetland@mail.ru>
Date: Fri, 25 Nov 2016 08:32:41 +0100
Subject: [PATCH 0678/1272] Add javadoc for `saveImageCmd'

Maybe we can automatically copy the documentation from `SaveImageCmd.withName`, but I don't know how.
---
 src/main/java/com/github/dockerjava/api/DockerClient.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 832890e87..8f35fac12 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -111,6 +111,10 @@ public interface DockerClient extends Closeable {
 
     InspectImageCmd inspectImageCmd(@Nonnull String imageId);
 
+    /**
+     * @param name
+     *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
+     */
     SaveImageCmd saveImageCmd(@Nonnull String name);
 
     /**

From 3c04924a2deb4419bf6d987ed615bec88e7ed4f4 Mon Sep 17 00:00:00 2001
From: ooxi <violetland@mail.ru>
Date: Fri, 25 Nov 2016 08:36:37 +0100
Subject: [PATCH 0679/1272] Fixed Docker Remote API link (#747)

File was moved in docker repository.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 039657807..79bad7fa9 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ For secure tls (https) communication:
     DOCKER_CERT_PATH=/Users/marcus/.docker/machine/machines/docker-1.11.2
 
 ### Latest release version
-Supports a subset of the Docker Remote API [v1.23](https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.23.md), Docker Server version 1.11.x
+Supports a subset of the Docker Remote API [v1.23](https://github.com/docker/docker/blob/master/docs/api/v1.23.md), Docker Server version 1.11.x
 
     <dependency>
           <groupId>com.github.docker-java</groupId>
@@ -60,7 +60,7 @@ Supports a subset of the Docker Remote API [v1.23](https://github.com/docker/doc
     </dependency>
     
 ### Latest development version
-Supports a subset of the Docker Remote API [v1.23](https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.23.md), Docker Server version 1.11.x
+Supports a subset of the Docker Remote API [v1.23](https://github.com/docker/docker/blob/master/docs/api/v1.23.md), Docker Server version 1.11.x
 
 You can find the latest development version including javadoc and source files on [Sonatypes OSS repository](https://oss.sonatype.org/content/groups/public/com/github/docker-java/docker-java/).
 

From 15aa30eaa6ed5c40dbbe1ef4dc3e4a4caeb867ec Mon Sep 17 00:00:00 2001
From: ooxi <violetland@mail.ru>
Date: Fri, 25 Nov 2016 08:37:28 +0100
Subject: [PATCH 0680/1272] Fix Maven package version (#748)

Version `3.0.6` was released, current snapshot is `3.0.7-SNAPSHOT`
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 79bad7fa9..d5052e6b9 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ Supports a subset of the Docker Remote API [v1.23](https://github.com/docker/doc
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>3.0.3</version>
+          <version>3.0.6</version>
     </dependency>
     
 ### Latest development version
@@ -67,7 +67,7 @@ You can find the latest development version including javadoc and source files o
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>3.0.4-SNAPSHOT</version>
+          <version>3.0.7-SNAPSHOT</version>
     </dependency>
     
 

From 259b7d638e20781c3085e679176f34b1c5d92c89 Mon Sep 17 00:00:00 2001
From: Raffael Stein <rvs@mailbox.org>
Date: Wed, 4 Jan 2017 10:22:03 +0100
Subject: [PATCH 0681/1272] Clone system properties on access in default config

---
 .../com/github/dockerjava/core/DefaultDockerClientConfig.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index a9a15bb36..9d13ec71e 100644
--- a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -188,7 +188,7 @@ private static Properties overrideDockerPropertiesWithSystemProperties(Propertie
     }
 
     public static Builder createDefaultConfigBuilder() {
-        return createDefaultConfigBuilder(System.getenv(), System.getProperties());
+        return createDefaultConfigBuilder(System.getenv(), (Properties) System.getProperties().clone());
     }
 
     /**

From 5ba770cf010271632980029f73856081f45b7ef0 Mon Sep 17 00:00:00 2001
From: Aboubacar Toure <aboubacar.toure@appian.com>
Date: Thu, 12 Jan 2017 02:15:33 -0500
Subject: [PATCH 0682/1272] Add support for private docker registry version 2
 (#756)

Private docker registry version 1 expects the authentication credentials
in $DOCKER_HOME/.dockercfg while version 2 expects them
in $DOCKER_HOME/config.json. Support for both paths should be added to
make docker-java more portable.

This pull request has the following modifications:
* When resolving the path of the authentication configuration file,
  $DOCKER_HOME/config.json (v2) is tried before
  $DOCKER_HOME/.dockercfg (v1)
* When parsing the content of the authentication configuration file,
  the format of config.json (v2) is tried before .dockercfg (v1)
* Test for both config.json (v2) and dockercfg (v1) have been added
---
 .../dockerjava/core/AuthConfigFile.java       | 30 ++++++++++++---
 .../core/DefaultDockerClientConfig.java       | 30 ++++++++++++---
 .../core/DefaultDockerClientConfigTest.java   | 37 +++++++++++++++++++
 .../registry.v1/.dockercfg                    |  5 +++
 .../registry.v2/config.json                   |  7 ++++
 5 files changed, 99 insertions(+), 10 deletions(-)
 create mode 100644 src/test/resources/com.github.dockerjava.core/registry.v1/.dockercfg
 create mode 100644 src/test/resources/com.github.dockerjava.core/registry.v2/config.json

diff --git a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
index f796fd7c9..539ac7f75 100644
--- a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
+++ b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
@@ -19,8 +19,13 @@
 public class AuthConfigFile {
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
-    private static final TypeReference<Map<String, AuthConfig>> CONFIG_MAP_TYPE = new TypeReference<Map<String, AuthConfig>>() {
-    };
+    private static final TypeReference<Map<String, AuthConfig>> CONFIG_CFG_MAP_TYPE =
+        new TypeReference<Map<String, AuthConfig>>() {
+        };
+
+    private static final TypeReference<Map<String, Map<String, AuthConfig>>> CONFIG_JSON_MAP_TYPE =
+        new TypeReference<Map<String, Map<String, AuthConfig>>>() {
+        };
 
     private final Map<String, AuthConfig> authConfigMap;
 
@@ -101,12 +106,27 @@ public static AuthConfigFile loadConfig(File confFile) throws IOException {
         if (!confFile.exists()) {
             return new AuthConfigFile();
         }
+
         Map<String, AuthConfig> configMap = null;
+        /*
+        Registry v2 expects config expects config.json while v2 expects .dockercfg
+        The only difference between them is that config.json wraps "auths" around the AuthConfig
+         */
         try {
-            configMap = MAPPER.readValue(confFile, CONFIG_MAP_TYPE);
-        } catch (IOException e) {
-            // pass
+            // try registry version 2
+            Map<String, Map<String, AuthConfig>>  configJson = MAPPER.readValue(confFile, CONFIG_JSON_MAP_TYPE);
+            if (configJson != null) {
+                configMap = configJson.get("auths");
+            }
+        } catch (IOException e1) {
+            try {
+                // try registry version 1
+                configMap = MAPPER.readValue(confFile, CONFIG_CFG_MAP_TYPE);
+            } catch (IOException e2) {
+                // pass
+            }
         }
+
         if (configMap != null) {
             for (Map.Entry<String, AuthConfig> entry : configMap.entrySet()) {
                 AuthConfig authConfig = entry.getValue();
diff --git a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index 9d13ec71e..5857227ae 100644
--- a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -9,6 +9,9 @@
 import java.io.InputStream;
 import java.io.Serializable;
 import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Properties;
@@ -55,6 +58,8 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf
 
     private static final String DOCKER_CFG = ".dockercfg";
 
+    private static final String CONFIG_JSON = "config.json";
+
     private static final Set<String> CONFIG_KEYS = new HashSet<String>();
 
     static {
@@ -253,9 +258,9 @@ && getRegistryUrl() != null) {
     public AuthConfig effectiveAuthConfig(String imageName) {
         AuthConfig authConfig = null;
 
-        File dockerCfgFile = new File(getDockerConfig() + File.separator + DOCKER_CFG);
+        File dockerCfgFile = getDockerConfigFile();
 
-        if (dockerCfgFile.exists() && dockerCfgFile.isFile() && imageName != null) {
+        if (dockerCfgFile != null) {
             AuthConfigFile authConfigFile;
             try {
                 authConfigFile = AuthConfigFile.loadConfig(dockerCfgFile);
@@ -279,13 +284,15 @@ public AuthConfig effectiveAuthConfig(String imageName) {
 
     @Override
     public AuthConfigurations getAuthConfigurations() {
-        File dockerCfgFile = new File(getDockerConfig() + File.separator + DOCKER_CFG);
-        if (dockerCfgFile.exists() && dockerCfgFile.isFile()) {
+        File dockerCfgFile = getDockerConfigFile();
+
+        if (dockerCfgFile != null) {
             AuthConfigFile authConfigFile;
             try {
                 authConfigFile = AuthConfigFile.loadConfig(dockerCfgFile);
             } catch (IOException e) {
-                throw new DockerClientException("Failed to parse dockerCfgFile", e);
+                throw new DockerClientException("Failed to parse dockerCfgFile: " +
+                    dockerCfgFile.getAbsolutePath(), e);
             }
 
             return authConfigFile.getAuthConfigurations();
@@ -294,6 +301,19 @@ public AuthConfigurations getAuthConfigurations() {
         return new AuthConfigurations();
     }
 
+    private File getDockerConfigFile() {
+        final Path configJson = Paths.get(getDockerConfig(), CONFIG_JSON);
+        final Path dockerCfg = Paths.get(getDockerConfig(), DOCKER_CFG);
+
+        if (Files.exists(configJson)) {
+            return configJson.toFile();
+        } else if (Files.exists(dockerCfg)) {
+            return dockerCfg.toFile();
+        } else {
+            return null;
+        }
+    }
+
     @Override
     public SSLConfig getSSLConfig() {
         return sslConfig;
diff --git a/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
index 54e70c511..3a4238b22 100644
--- a/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
+++ b/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
@@ -2,12 +2,15 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.core.Is.is;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
 
+import java.io.File;
 import java.lang.reflect.Field;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -18,6 +21,8 @@
 
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.AuthConfigurations;
+import com.google.common.io.Resources;
 
 public class DefaultDockerClientConfigTest {
 
@@ -201,4 +206,36 @@ public void withDockerTlsVerify() throws Exception {
         assertThat((Boolean) field.get(builder), is(true));
     }
 
+    @Test
+    public void testGetAuthConfigurationsFromDockerCfg() throws URISyntaxException {
+        File cfgFile = new File(Resources.getResource("com.github.dockerjava.core/registry.v1").toURI());
+        DefaultDockerClientConfig clientConfig = new DefaultDockerClientConfig(URI.create(
+            "unix://foo"), cfgFile.getAbsolutePath(), "apiVersion", "registryUrl", "registryUsername", "registryPassword",
+            "registryEmail", null);
+
+        AuthConfigurations authConfigurations = clientConfig.getAuthConfigurations();
+        assertThat(authConfigurations, notNullValue());
+        assertThat(authConfigurations.getConfigs().get("https://test.docker.io/v1/"), notNullValue());
+
+        AuthConfig authConfig = authConfigurations.getConfigs().get("https://test.docker.io/v1/");
+        assertThat(authConfig.getUsername(), equalTo("user"));
+        assertThat(authConfig.getPassword(), equalTo("password"));
+    }
+
+    @Test
+    public void testGetAuthConfigurationsFromConfigJson() throws URISyntaxException {
+        File cfgFile = new File(Resources.getResource("com.github.dockerjava.core/registry.v2").toURI());
+        DefaultDockerClientConfig clientConfig = new DefaultDockerClientConfig(URI.create(
+            "unix://foo"), cfgFile.getAbsolutePath(), "apiVersion", "registryUrl", "registryUsername", "registryPassword",
+            "registryEmail", null);
+
+        AuthConfigurations authConfigurations = clientConfig.getAuthConfigurations();
+        assertThat(authConfigurations, notNullValue());
+        assertThat(authConfigurations.getConfigs().get("https://test.docker.io/v2/"), notNullValue());
+
+        AuthConfig authConfig = authConfigurations.getConfigs().get("https://test.docker.io/v2/");
+        assertThat(authConfig.getUsername(), equalTo("user"));
+        assertThat(authConfig.getPassword(), equalTo("password"));
+    }
+
 }
diff --git a/src/test/resources/com.github.dockerjava.core/registry.v1/.dockercfg b/src/test/resources/com.github.dockerjava.core/registry.v1/.dockercfg
new file mode 100644
index 000000000..3ab173fba
--- /dev/null
+++ b/src/test/resources/com.github.dockerjava.core/registry.v1/.dockercfg
@@ -0,0 +1,5 @@
+{
+  "https://test.docker.io/v1/": {
+    "auth": "dXNlcjpwYXNzd29yZA=="
+  }
+}
diff --git a/src/test/resources/com.github.dockerjava.core/registry.v2/config.json b/src/test/resources/com.github.dockerjava.core/registry.v2/config.json
new file mode 100644
index 000000000..73ab82aca
--- /dev/null
+++ b/src/test/resources/com.github.dockerjava.core/registry.v2/config.json
@@ -0,0 +1,7 @@
+{
+  "auths": {
+    "https://test.docker.io/v2/": {
+      "auth": "dXNlcjpwYXNzd29yZA=="
+    }
+  }
+}

From 5b8ed07cfbbd409cad344ffc7d21c905cd2d4886 Mon Sep 17 00:00:00 2001
From: Logan O'Sullivan Bruns <logan@gedanken.org>
Date: Fri, 13 Jan 2017 14:09:13 -0800
Subject: [PATCH 0683/1272] Issue 674: 3.0.x switch from docker host using
 https|http scheme to tcp breaks proxy configure (#675)

https://github.com/docker-java/docker-java/issues/674

With the 3.0.x release, the code has been changed to use docker hosts of the format:

  tcp://host:port

Instead of:

  https://host:port

This breaks some of the logic in JerseyDockerCmdExecFactory that configures the proxy setting.
---
 .../github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
index 73bab979e..4b7f2f67e 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -190,7 +190,7 @@ public void init(DockerClientConfig dockerClientConfig) {
                 throw new RuntimeException(e);
             }
 
-            configureProxy(clientConfig, protocol);
+            configureProxy(clientConfig, originalUri, protocol);
         }
 
         connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(
@@ -241,9 +241,9 @@ private URI sanitizeUrl(URI originalUri) {
         return originalUri;
     }
 
-    private void configureProxy(ClientConfig clientConfig, String protocol) {
+    private void configureProxy(ClientConfig clientConfig, URI originalUri, String protocol) {
 
-        List<Proxy> proxies = ProxySelector.getDefault().select(dockerClientConfig.getDockerHost());
+        List<Proxy> proxies = ProxySelector.getDefault().select(originalUri);
 
         for (Proxy proxy : proxies) {
             InetSocketAddress address = (InetSocketAddress) proxy.address();

From 3ad75e0870a35ac166a0e1cb33a636e152cc0dbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sekunda?= <s3michal@gmail.com>
Date: Tue, 17 Jan 2017 19:43:50 +0100
Subject: [PATCH 0684/1272] add support for PidsLimit #734 (#764)

* add support for PidsLimit #734

* add support for PidsLimit #734  - using hamcrest in assertions

* add support for PidsLimit #734  - remove proxing

* add support for PidsLimit #734  - remove proxing

* add support for PidsLimit #734  - formatting fixed
---
 .../dockerjava/api/model/HostConfig.java      | 22 +++++++++++++++
 .../command/CreateContainerCmdImplTest.java   | 28 +++++++++++++++++--
 .../exec/CreateContainerCmdExecTest.java      | 25 +++++++++++++++--
 3 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 062082a03..d808ef245 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -194,6 +194,12 @@ public class HostConfig implements Serializable {
     @JsonProperty("ShmSize")
     private Long shmSize;
 
+    /**
+     * @since ~{@link RemoteApiVersion#VERSION_1_23}
+     */
+    @JsonProperty("PidsLimit")
+    private Long pidsLimit;
+
 
     @JsonIgnore
     public Bind[] getBinds() {
@@ -415,6 +421,14 @@ public String getVolumeDriver() {
         return volumeDriver;
     }
 
+    /**
+     * @see #pidsLimit
+     */
+    @CheckForNull
+    public Long getPidsLimit() {
+        return pidsLimit;
+    }
+
     /**
      * Parse the network mode as specified at
      * {@see https://github.com/docker/engine-api/blob/master/types/container/hostconfig_unix.go}
@@ -794,6 +808,14 @@ public HostConfig withVolumesFrom(VolumesFrom[] volumesFrom) {
         this.volumesFrom = volumesFrom;
         return this;
     }
+
+    /**
+     * @see #pidsLimit
+     */
+    public HostConfig withPidsLimit(Long pidsLimit) {
+        this.pidsLimit = pidsLimit;
+        return this;
+    }
     // end of auto-generated
 
     @Override
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 1f62527e9..7c625ea94 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -22,8 +22,10 @@
 import com.github.dockerjava.api.model.Ports.Binding;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.io.FileUtils;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -34,7 +36,6 @@
 import java.lang.reflect.Method;
 import java.security.SecureRandom;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -42,6 +43,7 @@
 
 import static com.github.dockerjava.api.model.Capability.MKNOD;
 import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
+import static com.github.dockerjava.utils.TestUtils.getVersion;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
@@ -751,6 +753,28 @@ public void createContainerWithShmSize() throws DockerException {
 
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-        assertEquals(inspectContainerResponse.getHostConfig().getShmSize(), hostConfig.getShmSize());
+        assertThat(inspectContainerResponse.getHostConfig().getShmSize(), is(hostConfig.getShmSize()));
+    }
+
+    @SuppressWarnings("Duplicates")
+    @Test
+    public void createContainerWithShmPidsLimit() throws DockerException {
+        final RemoteApiVersion apiVersion = getVersion(dockerClient);
+
+        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_23)) {
+            throw new SkipException("API version should be >= 1.23");
+        }
+
+        HostConfig hostConfig = new HostConfig().withPidsLimit(2L);
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
+            .withHostConfig(hostConfig).withCmd("true").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getHostConfig().getPidsLimit(), is(hostConfig.getPidsLimit()));
     }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
index aa97b8839..ab2bd36a0 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
@@ -36,7 +36,6 @@
 import java.lang.reflect.Method;
 import java.security.SecureRandom;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -729,6 +728,28 @@ public void createContainerWithShmSize() throws DockerException {
 
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-        assertEquals(inspectContainerResponse.getHostConfig().getShmSize(), hostConfig.getShmSize());
+        assertThat(inspectContainerResponse.getHostConfig().getShmSize(), is(hostConfig.getShmSize()));
+    }
+
+    @SuppressWarnings("Duplicates")
+    @Test
+    public void createContainerWithShmPidsLimit() throws DockerException {
+        final RemoteApiVersion apiVersion = getVersion(dockerClient);
+
+        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_23)) {
+            throw new SkipException("API version should be >= 1.23");
+        }
+
+        HostConfig hostConfig = new HostConfig().withPidsLimit(2L);
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
+            .withHostConfig(hostConfig).withCmd("true").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getHostConfig().getPidsLimit(), is(hostConfig.getPidsLimit()));
     }
 }

From cccc1b6da7af0ba3fe470389478ccee7339ba4b3 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 18 Jan 2017 03:29:07 +0300
Subject: [PATCH 0685/1272] [maven-release-plugin] prepare release 3.0.7

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 216c48631..609059f0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.7-SNAPSHOT</version>
+	<version>3.0.7</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.0.7</tag>
 	</scm>
 
 	<developers>

From 15c61b33a3dd4b197fd8b1afe7fcb077b2a08b50 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 18 Jan 2017 03:29:17 +0300
Subject: [PATCH 0686/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 609059f0b..852ad8283 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.7</version>
+	<version>3.0.8-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.0.7</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From b465546f7300819103b6c614b6680e5ecf0d1fff Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 18 Jan 2017 03:45:30 +0300
Subject: [PATCH 0687/1272] 3.0.7 release link to milestone

---
 CHANGELOG.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f41b2938..ca927c2c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Change Log
 ===
-## Next 3.0.7
+## (dev) 3.1.0 (reserverd for swarm features)
+ 
+## next...
+
+## 3.0.7
+ * https://github.com/docker-java/docker-java/milestone/17?closed=1
+ * HostConfig pidLimits
  * Label image during build
  * Expose 'User' property on ExecCreateCmd #707 #708
 

From c49f598fb0ee79a4a3b463312da4aab1b55d3050 Mon Sep 17 00:00:00 2001
From: Sukhanov Stas <stas.sukhanov@gmail.com>
Date: Wed, 25 Jan 2017 22:33:49 +0500
Subject: [PATCH 0688/1272] Add support for multiple certificates in ca.pem
 file

A single PEM file can contain a number of certificates. Usually keys and certificates are split into different files, but ca.pem still can contain several certificates in some cases.
---
 .../core/util/CertificateUtils.java           | 21 +++++---
 .../core/util/CertificateUtilsTest.java       | 40 +++++++++++++++
 .../caTest/multiple_ca.pem                    | 50 +++++++++++++++++++
 .../CertificateUtilsTest/caTest/single_ca.pem | 25 ++++++++++
 4 files changed, 129 insertions(+), 7 deletions(-)
 create mode 100644 src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caTest/multiple_ca.pem
 create mode 100644 src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caTest/single_ca.pem

diff --git a/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java b/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
index b5a5dcae6..63e66952d 100644
--- a/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
+++ b/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
@@ -18,11 +18,11 @@
 import java.util.List;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
 import org.bouncycastle.cert.X509CertificateHolder;
 import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.openssl.PEMKeyPair;
 import org.bouncycastle.openssl.PEMParser;
 import org.slf4j.Logger;
@@ -88,7 +88,8 @@ public static List<Certificate> loadCertificates(final Reader reader) throws IOE
         try (PEMParser pemParser = new PEMParser(reader)) {
             List<Certificate> certificates = new ArrayList<>();
 
-            JcaX509CertificateConverter certificateConverter = new JcaX509CertificateConverter().setProvider("BC");
+            JcaX509CertificateConverter certificateConverter = new JcaX509CertificateConverter()
+                    .setProvider(BouncyCastleProvider.PROVIDER_NAME);
             Object certObj = pemParser.readObject();
 
             if (certObj instanceof X509CertificateHolder) {
@@ -181,14 +182,20 @@ public static KeyStore createTrustStore(String capem) throws IOException, Certif
     public static KeyStore createTrustStore(final Reader certReader) throws IOException, CertificateException,
             KeyStoreException, NoSuchAlgorithmException {
         try (PEMParser pemParser = new PEMParser(certReader)) {
-            X509CertificateHolder certificateHolder = (X509CertificateHolder) pemParser.readObject();
-            Certificate caCertificate = new JcaX509CertificateConverter()
-                    .setProvider("BC")
-                    .getCertificate(certificateHolder);
 
             KeyStore trustStore = KeyStore.getInstance("JKS");
             trustStore.load(null);
-            trustStore.setCertificateEntry("ca", caCertificate);
+
+            int index = 1;
+            Object pemCert;
+
+            while ((pemCert = pemParser.readObject()) != null) {
+                Certificate caCertificate = new JcaX509CertificateConverter()
+                        .setProvider(BouncyCastleProvider.PROVIDER_NAME)
+                        .getCertificate((X509CertificateHolder) pemCert);
+                trustStore.setCertificateEntry("ca-" + index, caCertificate);
+                index++;
+            }
 
             return trustStore;
         }
diff --git a/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java b/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java
index 36c00c076..9c7120d1f 100644
--- a/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java
+++ b/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java
@@ -1,5 +1,14 @@
 package com.github.dockerjava.core.util;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.KeyStore;
+import java.security.Security;
+
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -9,6 +18,16 @@ public class CertificateUtilsTest {
     private static final String baseDir = CertificateUtilsTest.class.getResource(
             CertificateUtilsTest.class.getSimpleName() + "/").getFile();
 
+    @BeforeClass
+    public static void init() {
+        Security.addProvider(new BouncyCastleProvider());
+    }
+
+    @AfterClass
+    public static void tearDown() {
+        Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
+    }
+
     @Test
     public void allFilesExist() {
         assertThat(CertificateUtils.verifyCertificatesExist(baseDir + "allFilesExist"), is(true));
@@ -48,4 +67,25 @@ public void certMissing() {
     public void keyMissing() {
         assertThat(CertificateUtils.verifyCertificatesExist(baseDir + "keyMissing"), is(false));
     }
+
+    @Test
+    public void readCaCert() throws Exception {
+        String capem = readFileAsString("caTest/single_ca.pem");
+        KeyStore keyStore = CertificateUtils.createTrustStore(capem);
+        assertThat(keyStore.size(), is(1));
+        assertThat(keyStore.isCertificateEntry("ca-1"), is(true));
+    }
+
+    @Test
+    public void readMultipleCaCerts() throws Exception {
+        String capem = readFileAsString("caTest/multiple_ca.pem");
+        KeyStore keyStore = CertificateUtils.createTrustStore(capem);
+        assertThat(keyStore.size(), is(2));
+        assertThat(keyStore.isCertificateEntry("ca-1"), is(true));
+        assertThat(keyStore.isCertificateEntry("ca-2"), is(true));
+    }
+
+    private String readFileAsString(String path) throws IOException {
+        return new String(Files.readAllBytes(Paths.get(baseDir + path)));
+    }
 }
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caTest/multiple_ca.pem b/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caTest/multiple_ca.pem
new file mode 100644
index 000000000..53b571269
--- /dev/null
+++ b/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caTest/multiple_ca.pem
@@ -0,0 +1,50 @@
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIJALOOFdRswGmDMA0GCSqGSIb3DQEBBQUAMG8xCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQxDDAKBgNVBAMTA0NBMTEaMBgGCSqGSIb3DQEJARYLY2FA
+dGVzdC5jb20wHhcNMTcwMTI1MTc0ODE5WhcNMjcwMTIzMTc0ODE5WjBvMQswCQYD
+VQQGEwJVUzETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQg
+V2lkZ2l0cyBQdHkgTHRkMQwwCgYDVQQDEwNDQTExGjAYBgkqhkiG9w0BCQEWC2Nh
+QHRlc3QuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA346h3pA5
+5Uu6t7I8oNsiwF9PNgY7FKL/fXAiGAi1GMcPvil5Sf+GOYenQNsh4unfMRu8C+Xn
+0NSnQNRkgJ2eIR5w3qDDK+UFj34rLdBK+wNze3gMGOaTFiSZLeoxrXs6fGbJ7Jmd
+GaW7u8+P1+1Iej2k7lz61SXRL7+fn5lo3Lpfi+7s44zzOHoPkbHYNyl3md5Wgsoc
+U+VGcABl1cq956ycQU1/jWZgclaTL3sQjNvLJ+dnN4+IwbFiPE9tY+cJtdNn2YXd
+jLqxkfr/MZXoxArASanzPa4S7sKl8nnGrYM8cnppMeFk2a/p1YT+507V6VEmLM1A
+IlqtzOAWpZ4vSQIDAQABo4HUMIHRMB0GA1UdDgQWBBRTvtGtQ298/2Ukc6ncXNUI
+plkkxjCBoQYDVR0jBIGZMIGWgBRTvtGtQ298/2Ukc6ncXNUIplkkxqFzpHEwbzEL
+MAkGA1UEBhMCVVMxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVy
+bmV0IFdpZGdpdHMgUHR5IEx0ZDEMMAoGA1UEAxMDQ0ExMRowGAYJKoZIhvcNAQkB
+FgtjYUB0ZXN0LmNvbYIJALOOFdRswGmDMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
+AQEFBQADggEBAIs8PjXPWvTWVDQ8xsZHLosD5BzCqM6ac+W7pjKEVNaiIo+UT3st
+bl1rZS2U924M9xtOkmAOPCQx1ozMxqKk2SVYztll3/Nw7p3qbP2/7L1tOTjoNZqT
+o2dd4Jf8txj9AaDus9FW8gmR6TLSgm7xeNb/kEa1b5ZW6l0zYRSBNT4I38d9wCa4
+QeohD8t1T1QOSc82dTHqccSiCSRiOX883I/fK+cTo8o1gdyUjYoCQlsJESr1rUun
+C3zMTZ4Lkt72vM88Hf0OyK/+sw7sqVEf+95VMx+a/UaYYkJY3Bg6JTJb9vukbtAl
+5GrDZOGM1AgW8iZyG/jSJlwkjiB9vy8RRnI=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIJAL4WwpOexcT8MA0GCSqGSIb3DQEBBQUAMG8xCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQxDDAKBgNVBAMTA0NBMjEaMBgGCSqGSIb3DQEJARYLY2FA
+dGVzdC5jb20wHhcNMTcwMTI1MTc0ODQ4WhcNMjcwMTIzMTc0ODQ4WjBvMQswCQYD
+VQQGEwJVUzETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQg
+V2lkZ2l0cyBQdHkgTHRkMQwwCgYDVQQDEwNDQTIxGjAYBgkqhkiG9w0BCQEWC2Nh
+QHRlc3QuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA346h3pA5
+5Uu6t7I8oNsiwF9PNgY7FKL/fXAiGAi1GMcPvil5Sf+GOYenQNsh4unfMRu8C+Xn
+0NSnQNRkgJ2eIR5w3qDDK+UFj34rLdBK+wNze3gMGOaTFiSZLeoxrXs6fGbJ7Jmd
+GaW7u8+P1+1Iej2k7lz61SXRL7+fn5lo3Lpfi+7s44zzOHoPkbHYNyl3md5Wgsoc
+U+VGcABl1cq956ycQU1/jWZgclaTL3sQjNvLJ+dnN4+IwbFiPE9tY+cJtdNn2YXd
+jLqxkfr/MZXoxArASanzPa4S7sKl8nnGrYM8cnppMeFk2a/p1YT+507V6VEmLM1A
+IlqtzOAWpZ4vSQIDAQABo4HUMIHRMB0GA1UdDgQWBBRTvtGtQ298/2Ukc6ncXNUI
+plkkxjCBoQYDVR0jBIGZMIGWgBRTvtGtQ298/2Ukc6ncXNUIplkkxqFzpHEwbzEL
+MAkGA1UEBhMCVVMxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVy
+bmV0IFdpZGdpdHMgUHR5IEx0ZDEMMAoGA1UEAxMDQ0EyMRowGAYJKoZIhvcNAQkB
+FgtjYUB0ZXN0LmNvbYIJAL4WwpOexcT8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
+AQEFBQADggEBAKVIxgBQ76JQYfejcaK946J6VglSKaHuPZ8bDVM9e2KB1HFwTzAA
+oRtMBIJaSO1+CSopTnzvzv/j8XeXbAUt6UHWiejGcIke1wW1CSVHeDQM7KUzXYtu
+2jWzlGHXtnni4EeSwdE628Kfk82r/NU3+3+zo/3ASkYcSGBEYgIdvLBmbvQ8sviJ
+rQZ1HCDP/TgP/ExBDi2QWBHe3XSTD0pBK153FC2YT1Q0AG5mxsIeq7C85m22aNX9
+fUmG5ORnVMkT/ktY+jg5aP+50o58MX24ZG1mh59vZtuBbvD74qZ2eNauStt1ji34
+V43XhW5Bigsp/z7GyFb2VzejH9n+VvPmTnU=
+-----END CERTIFICATE-----
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caTest/single_ca.pem b/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caTest/single_ca.pem
new file mode 100644
index 000000000..8e67cb783
--- /dev/null
+++ b/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caTest/single_ca.pem
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIJAL4WwpOexcT8MA0GCSqGSIb3DQEBBQUAMG8xCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQxDDAKBgNVBAMTA0NBMjEaMBgGCSqGSIb3DQEJARYLY2FA
+dGVzdC5jb20wHhcNMTcwMTI1MTc0ODQ4WhcNMjcwMTIzMTc0ODQ4WjBvMQswCQYD
+VQQGEwJVUzETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQg
+V2lkZ2l0cyBQdHkgTHRkMQwwCgYDVQQDEwNDQTIxGjAYBgkqhkiG9w0BCQEWC2Nh
+QHRlc3QuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA346h3pA5
+5Uu6t7I8oNsiwF9PNgY7FKL/fXAiGAi1GMcPvil5Sf+GOYenQNsh4unfMRu8C+Xn
+0NSnQNRkgJ2eIR5w3qDDK+UFj34rLdBK+wNze3gMGOaTFiSZLeoxrXs6fGbJ7Jmd
+GaW7u8+P1+1Iej2k7lz61SXRL7+fn5lo3Lpfi+7s44zzOHoPkbHYNyl3md5Wgsoc
+U+VGcABl1cq956ycQU1/jWZgclaTL3sQjNvLJ+dnN4+IwbFiPE9tY+cJtdNn2YXd
+jLqxkfr/MZXoxArASanzPa4S7sKl8nnGrYM8cnppMeFk2a/p1YT+507V6VEmLM1A
+IlqtzOAWpZ4vSQIDAQABo4HUMIHRMB0GA1UdDgQWBBRTvtGtQ298/2Ukc6ncXNUI
+plkkxjCBoQYDVR0jBIGZMIGWgBRTvtGtQ298/2Ukc6ncXNUIplkkxqFzpHEwbzEL
+MAkGA1UEBhMCVVMxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVy
+bmV0IFdpZGdpdHMgUHR5IEx0ZDEMMAoGA1UEAxMDQ0EyMRowGAYJKoZIhvcNAQkB
+FgtjYUB0ZXN0LmNvbYIJAL4WwpOexcT8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
+AQEFBQADggEBAKVIxgBQ76JQYfejcaK946J6VglSKaHuPZ8bDVM9e2KB1HFwTzAA
+oRtMBIJaSO1+CSopTnzvzv/j8XeXbAUt6UHWiejGcIke1wW1CSVHeDQM7KUzXYtu
+2jWzlGHXtnni4EeSwdE628Kfk82r/NU3+3+zo/3ASkYcSGBEYgIdvLBmbvQ8sviJ
+rQZ1HCDP/TgP/ExBDi2QWBHe3XSTD0pBK153FC2YT1Q0AG5mxsIeq7C85m22aNX9
+fUmG5ORnVMkT/ktY+jg5aP+50o58MX24ZG1mh59vZtuBbvD74qZ2eNauStt1ji34
+V43XhW5Bigsp/z7GyFb2VzejH9n+VvPmTnU=
+-----END CERTIFICATE-----

From 5d00d5e75c4e2a79b5f5ca2bfaccfbde39b8a15d Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 14 Feb 2017 00:08:26 +0300
Subject: [PATCH 0689/1272] Disable failing tests.

---
 .../dockerjava/core/command/AuthCmdImplTest.java   | 10 ++++++++++
 .../dockerjava/netty/exec/AuthCmdExecTest.java     | 14 ++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
index 887c99130..2a9ce0fbf 100644
--- a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
@@ -2,7 +2,9 @@
 
 import java.lang.reflect.Method;
 
+import com.github.dockerjava.core.RemoteApiVersion;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -14,6 +16,8 @@
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import com.github.dockerjava.core.DockerClientBuilder;
 
+import static com.github.dockerjava.utils.TestUtils.getVersion;
+
 @Test(groups = "integration")
 public class AuthCmdImplTest extends AbstractDockerClientTest {
 
@@ -39,6 +43,12 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void testAuth() throws Exception {
+        final RemoteApiVersion apiVersion = getVersion(dockerClient);
+
+        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_23)) {
+            throw new SkipException("Fails on 1.22. Temporary disabled.");
+        }
+
         AuthResponse response = dockerClient.authCmd().exec();
 
         assertEquals(response.getStatus(), "Login Succeeded");
diff --git a/src/test/java/com/github/dockerjava/netty/exec/AuthCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/AuthCmdExecTest.java
index 690d478f4..d753fca2b 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/AuthCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/AuthCmdExecTest.java
@@ -2,7 +2,9 @@
 
 import java.lang.reflect.Method;
 
+import com.github.dockerjava.core.RemoteApiVersion;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -14,6 +16,8 @@
 import com.github.dockerjava.core.DockerClientBuilder;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 
+import static com.github.dockerjava.utils.TestUtils.getVersion;
+
 @Test(groups = "integration")
 public class AuthCmdExecTest extends AbstractNettyDockerClientTest {
 
@@ -39,6 +43,11 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void testAuth() throws Exception {
+        final RemoteApiVersion apiVersion = getVersion(dockerClient);
+        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_23)) {
+            throw new SkipException("Fails on 1.22. Temporary disabled.");
+        }
+
         AuthResponse response = dockerClient.authCmd().exec();
 
         assertEquals(response.getStatus(), "Login Succeeded");
@@ -46,6 +55,11 @@ public void testAuth() throws Exception {
 
     @Test(expectedExceptions = UnauthorizedException.class)
     public void testAuthInvalid() throws Exception {
+        final RemoteApiVersion apiVersion = getVersion(dockerClient);
+        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_23)) {
+            throw new SkipException("Fails on 1.22. Temporary disabled.");
+        }
+
         DockerClientBuilder.getInstance(config("garbage")).build().authCmd().exec();
     }
 }

From acb7ee41d8d67610b882b1ac59790b1784aebfb0 Mon Sep 17 00:00:00 2001
From: John Gallagher <jgallag88@gmail.com>
Date: Sun, 5 Feb 2017 14:10:23 -0500
Subject: [PATCH 0690/1272] Add ability to add labels when running commit

---
 .../dockerjava/api/command/CommitCmd.java     | 10 ++++++++
 .../core/command/CommitCmdImpl.java           | 19 +++++++++++++++
 .../core/command/CommitCmdImplTest.java       | 24 ++++++++++++++++++-
 .../netty/exec/CommitCmdExecTest.java         | 24 ++++++++++++++++++-
 4 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
index c5da5bab6..a182751b8 100644
--- a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
@@ -3,6 +3,8 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
+import java.util.Map;
+
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.ExposedPorts;
 import com.github.dockerjava.api.model.Volumes;
@@ -29,6 +31,9 @@ public interface CommitCmd extends SyncDockerCmd<String> {
     @CheckForNull
     String getHostname();
 
+    @CheckForNull
+    Map<String, String> getLabels();
+
     @CheckForNull
     Integer getMemory();
 
@@ -88,6 +93,11 @@ public interface CommitCmd extends SyncDockerCmd<String> {
 
     CommitCmd withHostname(String hostname);
 
+    /**
+     * @since 1.19
+     */
+    CommitCmd withLabels(Map<String, String> labels);
+
     CommitCmd withMemory(Integer memory);
 
     CommitCmd withMemorySwap(Integer memorySwap);
diff --git a/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
index 534cce52c..1c8ad26a4 100644
--- a/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
@@ -2,6 +2,8 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.util.Map;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.command.CommitCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
@@ -43,6 +45,12 @@ public class CommitCmdImpl extends AbstrDockerCmd<CommitCmd, String> implements
     @JsonProperty("Hostname")
     private String hostname;
 
+    /**
+     * @since 1.19
+     */
+    @JsonProperty("Labels")
+    private Map<String, String> labels;
+
     @JsonProperty("Memory")
     private Integer memory;
 
@@ -189,6 +197,17 @@ public CommitCmdImpl withEnv(String... env) {
         return this;
     }
 
+    @Override
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
+    @Override
+    public CommitCmdImpl withLabels(Map<String, String> labels) {
+        this.labels = labels;
+        return this;
+    }
+
     @Override
     public ExposedPorts getExposedPorts() {
         return exposedPorts;
diff --git a/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
index 64e1d7ddf..a6195ed4d 100644
--- a/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
@@ -8,7 +8,9 @@
 import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
 
 import java.lang.reflect.Method;
+import java.util.Map;
 
+import com.google.common.collect.ImmutableMap;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -54,7 +56,7 @@ public void commit() throws DockerException {
         assertThat(container.getId(), not(isEmptyString()));
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        LOG.info("Commiting container: {}", container.toString());
+        LOG.info("Committing container: {}", container.toString());
         String imageId = dockerClient.commitCmd(container.getId()).exec();
 
         InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
@@ -68,6 +70,26 @@ public void commit() throws DockerException {
         assertThat(inspectImageResponse.getParent(), equalTo(busyboxImg.getId()));
     }
 
+    @Test
+    public void commitWithLabels() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("touch", "/test").exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        LOG.info("Committing container: {}", container.toString());
+        Map<String, String> labels = ImmutableMap.of("label1", "abc", "label2", "123");
+        String imageId = dockerClient.commitCmd(container.getId()).withLabels(labels).exec();
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+        Map<String, String> responseLabels = inspectImageResponse.getContainerConfig().getLabels();
+        assertThat(responseLabels.get("label1"), equalTo("abc"));
+        assertThat(responseLabels.get("label2"), equalTo("123"));
+    }
+
     @Test(expectedExceptions = NotFoundException.class)
     public void commitNonExistingContainer() throws DockerException {
 
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
index 3d1a66333..8d8f6e6bb 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
@@ -8,7 +8,9 @@
 import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
 
 import java.lang.reflect.Method;
+import java.util.Map;
 
+import com.google.common.collect.ImmutableMap;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -54,7 +56,7 @@ public void commit() throws DockerException {
         assertThat(container.getId(), not(isEmptyString()));
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        LOG.info("Commiting container: {}", container.toString());
+        LOG.info("Committing container: {}", container.toString());
         String imageId = dockerClient.commitCmd(container.getId()).exec();
 
         InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
@@ -68,6 +70,26 @@ public void commit() throws DockerException {
         assertThat(inspectImageResponse.getParent(), equalTo(busyboxImg.getId()));
     }
 
+    @Test
+    public void commitWithLabels() throws DockerException {
+
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("touch", "/test").exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        LOG.info("Committing container: {}", container.toString());
+        Map<String, String> labels = ImmutableMap.of("label1", "abc", "label2", "123");
+        String imageId = dockerClient.commitCmd(container.getId()).withLabels(labels).exec();
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+        Map<String, String> responseLabels = inspectImageResponse.getContainerConfig().getLabels();
+        assertThat(responseLabels.get("label1"), equalTo("abc"));
+        assertThat(responseLabels.get("label2"), equalTo("123"));
+    }
+
     @Test(expectedExceptions = NotFoundException.class)
     public void commitNonExistingContainer() throws DockerException {
 

From aa75982f3e43cb212cad80524fa8441617038562 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 14 Feb 2017 00:36:04 +0300
Subject: [PATCH 0691/1272] Test all latest

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d055f76e0..69aa64780 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,8 +21,10 @@ env:
     - COVERITY_SCAN_NOTIFICATION_EMAIL="kanstantsin.sha@gmail.com"
 
   matrix:
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.12.1-0~trusty" CODECOV=true
-    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.12.1-0~trusty" CODECOV=true
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.13.1-0~ubuntu-trusty" CODECOV=true
+    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.13.1-0~ubuntu-trusty" CODECOV=true
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.12.6-0~ubuntu-trusty" CODECOV=true
+    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.12.6-0~ubuntu-trusty" CODECOV=true
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" DEPLOY=true COVERITY=true CODECOV=true
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty" CODECOV=true
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.10.3-0~trusty" CODECOV=true

From 1fbe1c401a6fc97d55a80cc93b00826d51206c0a Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 14 Feb 2017 01:12:23 +0300
Subject: [PATCH 0692/1272] Disable 1.13.1

Some tests failing.
---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 69aa64780..eaf11b514 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,11 +21,11 @@ env:
     - COVERITY_SCAN_NOTIFICATION_EMAIL="kanstantsin.sha@gmail.com"
 
   matrix:
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.13.1-0~ubuntu-trusty" CODECOV=true
-    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.13.1-0~ubuntu-trusty" CODECOV=true
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.12.6-0~ubuntu-trusty" CODECOV=true
+#    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.13.1-0~ubuntu-trusty" CODECOV=true
+#    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.13.1-0~ubuntu-trusty" CODECOV=true
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.12.6-0~ubuntu-trusty"  DEPLOY=true COVERITY=true CODECOV=true
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.12.6-0~ubuntu-trusty" CODECOV=true
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" DEPLOY=true COVERITY=true CODECOV=true
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" CODECOV=true
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty" CODECOV=true
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.10.3-0~trusty" CODECOV=true
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.10.3-0~trusty" CODECOV=true

From 17d04f6d9565696c7d527da622ddc99e6e6f46c2 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 14 Feb 2017 02:22:33 +0300
Subject: [PATCH 0693/1272] rerun failing tests count to 3

---
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pom.xml b/pom.xml
index 852ad8283..726afefa4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -397,6 +397,7 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>${maven-surefire-plugin.version}</version>
 				<configuration>
+					<rerunFailingTestsCount>3</rerunFailingTestsCount>
 					<excludedGroups>integration,integration-auth</excludedGroups>
 				</configuration>
 			</plugin>
@@ -412,6 +413,7 @@
 							<goal>verify</goal>
 						</goals>
 						<configuration>
+							<rerunFailingTestsCount>3</rerunFailingTestsCount>
 							<useUnlimitedThreads>true</useUnlimitedThreads>
 							<perCoreThreadCount>true</perCoreThreadCount>
 							<threadCount>1</threadCount>

From 80ba61f434a9a67fd0428f8c5e606be7d4485f07 Mon Sep 17 00:00:00 2001
From: Valerij <valerij92@gmail.com>
Date: Wed, 15 Feb 2017 18:35:32 +0100
Subject: [PATCH 0694/1272] Capitalize variable name

---
 .../java/com/github/dockerjava/api/model/Statistics.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/Statistics.java b/src/main/java/com/github/dockerjava/api/model/Statistics.java
index 9307da6b3..6bb1930e1 100644
--- a/src/main/java/com/github/dockerjava/api/model/Statistics.java
+++ b/src/main/java/com/github/dockerjava/api/model/Statistics.java
@@ -50,7 +50,7 @@ public class Statistics implements Serializable {
      * @since Docker Remote API 1.19
      */
     @JsonProperty("precpu_stats")
-    private Map<String, Object> precpuStats;
+    private Map<String, Object> preCpuStats;
 
     /**
      * @since Docker Remote API 1.21
@@ -76,8 +76,8 @@ public Map<String, Object> getCpuStats() {
      * The cpu statistic of last read, which is used for calculating the cpu usage percent.
      * It is not the exact copy of the {@link #getCpuStats()}.
      */
-    public Map<String, Object> getPrecpuStats() {
-        return precpuStats;
+    public Map<String, Object> getPreCpuStats() {
+        return preCpuStats;
     }
 
     public Map<String, Object> getMemoryStats() {

From 1c1833709beaa1d103cc9e02827347c0c696d263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Warcha=C5=82?= <lukasz.warchal@asseco.pl>
Date: Thu, 16 Feb 2017 10:35:13 +0100
Subject: [PATCH 0695/1272] Use TLSv2 by default

---
 .../dockerjava/core/LocalDirectorySSLConfig.java       | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
index 961c282de..5e4a7fa57 100644
--- a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
@@ -45,14 +45,6 @@ public SSLContext getSSLContext() {
 
                 Security.addProvider(new BouncyCastleProvider());
 
-                // properties acrobatics not needed for java > 1.6
-                String httpProtocols = System.getProperty("https.protocols");
-                System.setProperty("https.protocols", "TLSv1");
-                SslConfigurator sslConfig = SslConfigurator.newInstance(true);
-                if (httpProtocols != null) {
-                    System.setProperty("https.protocols", httpProtocols);
-                }
-
                 String caPemPath = dockerCertPath + File.separator + "ca.pem";
                 String keyPemPath = dockerCertPath + File.separator + "key.pem";
                 String certPemPath = dockerCertPath + File.separator + "cert.pem";
@@ -61,6 +53,8 @@ public SSLContext getSSLContext() {
                 String certpem = new String(Files.readAllBytes(Paths.get(certPemPath)));
                 String capem = new String(Files.readAllBytes(Paths.get(caPemPath)));
 
+                SslConfigurator sslConfig = SslConfigurator.newInstance(true);
+                sslConfig.securityProtocol("TLSv1.2");
                 sslConfig.keyStore(CertificateUtils.createKeyStore(keypem, certpem));
                 sslConfig.keyStorePassword("docker");
                 sslConfig.trustStore(CertificateUtils.createTrustStore(capem));

From a3be9a5c32fd90c6c5d2f19e8c903b5df67fed2f Mon Sep 17 00:00:00 2001
From: "Lubos.Palisek" <lubos.palisek@ataccama.com>
Date: Thu, 15 Dec 2016 13:30:57 +0100
Subject: [PATCH 0696/1272] Added healthcheck support in container inspect JSON
 result

---
 .../dockerjava/api/command/HealthState.java   |  30 ++++
 .../api/command/HealthStateLog.java           |  36 ++++
 .../api/command/InspectContainerResponse.java |  13 +-
 .../dockerjava/api/model/ContainerConfig.java |  11 ++
 .../dockerjava/api/model/HealthCheck.java     |  45 +++++
 .../command/InspectContainerResponseTest.java |  27 ++-
 .../samples/1.24/containers/inspect/1.json    | 167 ++++++++++++++++++
 7 files changed, 326 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/command/HealthState.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/HealthCheck.java
 create mode 100644 src/test/resources/samples/1.24/containers/inspect/1.json

diff --git a/src/main/java/com/github/dockerjava/api/command/HealthState.java b/src/main/java/com/github/dockerjava/api/command/HealthState.java
new file mode 100644
index 000000000..6f5418713
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/HealthState.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.api.command;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class HealthState {
+
+    @JsonProperty("Status")
+    private String status;
+
+    @JsonProperty("FailingStreak")
+    private Integer failingStreak;
+
+    @JsonProperty("Log")
+    private List<HealthStateLog> log;
+
+    public String getStatus() {
+        return status;
+    }
+
+    public Integer getFailingStreak() {
+        return failingStreak;
+    }
+
+    public List<HealthStateLog> getLog() {
+        return log;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java b/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
new file mode 100644
index 000000000..e7f4c15a9
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
@@ -0,0 +1,36 @@
+package com.github.dockerjava.api.command;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class HealthStateLog {
+
+    @JsonProperty("Start")
+    private String start;
+
+    @JsonProperty("End")
+    private String end;
+
+    @JsonProperty("ExitCode")
+    private Integer exitCode;
+
+    @JsonProperty("Output")
+    private String output;
+
+    public String getStart() {
+        return start;
+    }
+
+    public String getEnd() {
+        return end;
+    }
+
+    public Integer getExitCode() {
+        return exitCode;
+    }
+
+    public String getOutput() {
+        return output;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index c8027b0ed..497aaad2b 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -112,7 +112,7 @@ public String getId() {
     }
 
     public Integer getSizeRootFs() {
-        return  sizeRootFs;
+        return sizeRootFs;
     }
 
     public String getCreated() {
@@ -302,6 +302,13 @@ public class ContainerState {
         @JsonProperty("FinishedAt")
         private String finishedAt;
 
+
+        /**
+         * @since Docker version 1.12
+         */
+        @JsonProperty("Health")
+        private HealthState health;
+
         /**
          * See {@link #status}
          */
@@ -390,6 +397,10 @@ public String getFinishedAt() {
             return finishedAt;
         }
 
+        public HealthState getHealth() {
+            return health;
+        }
+
         @Override
         public boolean equals(Object o) {
             return EqualsBuilder.reflectionEquals(this, o);
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
index 191126798..6d3265afa 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
@@ -86,6 +86,9 @@ public class ContainerConfig implements Serializable {
     @JsonProperty("WorkingDir")
     private String workingDir;
 
+    @JsonProperty("Healthcheck")
+    private HealthCheck healthCheck;
+
     @JsonIgnore
     public ExposedPort[] getExposedPorts() {
         return exposedPorts != null ? exposedPorts.getExposedPorts() : null;
@@ -411,6 +414,14 @@ public String getWorkingDir() {
         return workingDir;
     }
 
+    /**
+     * @see #healthCheck
+     */
+    @CheckForNull
+    public HealthCheck getHealthcheck() {
+        return healthCheck;
+    }
+
     /**
      * @see #workingDir
      */
diff --git a/src/main/java/com/github/dockerjava/api/model/HealthCheck.java b/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
new file mode 100644
index 000000000..514bf4f41
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2017 cdancy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serializable;
+
+/**
+ *
+ * @author cdancy
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class HealthCheck implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("Interval")
+    private Long interval;
+
+    @JsonProperty("Timeout")
+    private Long timeout;
+
+    public Long getInterval() {
+        return interval;
+    }
+
+    public Long getTimeout() {
+        return timeout;
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
index cd4562b4a..51e8bd1dc 100644
--- a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
+++ b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
@@ -15,10 +15,15 @@
  */
 package com.github.dockerjava.api.command;
 
-import org.testng.annotations.Test;
-
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.core.RemoteApiVersion;
+import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
 import java.io.IOException;
 
+import org.testng.annotations.Test;
+
 import static com.github.dockerjava.test.serdes.JSONTestHelper.testRoundTrip;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
@@ -55,6 +60,24 @@ public void roundTrip_full() throws IOException {
         assertThat(response.getLogPath(), is("/mnt/sda1/var/lib/docker/containers/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1-json.log"));
     }
 
+    @Test
+    public void roundTrip_full_healthcheck() throws IOException {
+
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(InspectContainerResponse.class);
+
+        final InspectContainerResponse response = testRoundTrip(RemoteApiVersion.VERSION_1_24,
+                "/containers/inspect/1.json",
+                type
+        );
+        
+        assertEquals(response.getState().getHealth().getStatus(), "healthy");
+        assertEquals(response.getState().getHealth().getFailingStreak(), new Integer(0));
+        assertEquals(response.getState().getHealth().getLog().size(), 2);
+        assertEquals(response.getState().getHealth().getLog().get(0).getOutput(), "Hello");
+        assertEquals(response.getState().getHealth().getLog().get(1).getOutput(), "World");
+    }
+
     @Test
     public void roundTrip_1_21_full() throws IOException {
         InspectContainerResponse[] responses = testRoundTrip(CommandJSONSamples.inspectContainerResponse_full_1_21,
diff --git a/src/test/resources/samples/1.24/containers/inspect/1.json b/src/test/resources/samples/1.24/containers/inspect/1.json
new file mode 100644
index 000000000..54d23923f
--- /dev/null
+++ b/src/test/resources/samples/1.24/containers/inspect/1.json
@@ -0,0 +1,167 @@
+{
+  "Id": "fc1243c01bbb791d9eca64204d76f72fc47fbebbca892d7dd0a5cd0e4e346045",
+  "Created": "2015-11-20T21:10:34.775649753Z",
+  "Path": "cat",
+  "Args": [],
+  "State": {
+    "Status": "running",
+    "Running": true,
+    "Paused": false,
+    "Restarting": false,
+    "OOMKilled": false,
+    "Dead": false,
+    "Pid": 10912,
+    "ExitCode": 0,
+    "Error": "",
+    "StartedAt": "2015-11-20T21:10:34.845546358Z",
+    "FinishedAt": "0001-01-01T00:00:00Z",
+    "Health": {
+      "Status": "healthy",
+      "FailingStreak": 0,
+      "Log": [
+        {
+          "Start": "2016-11-12T03:23:03.351561Z",
+          "End": "2016-11-12T03:23:03.422176171Z",
+          "ExitCode": 0,
+          "Output" : "Hello"
+        },
+        {
+          "Start": "2016-11-12T03:23:08.423558928Z",
+          "End": "2016-11-12T03:23:08.510122392Z",
+          "ExitCode": 0,
+          "Output" : "World"
+        }      
+      ]
+    }
+  },
+  "Image": "c51f86c283408d1749d066333f7acd5d33b053b003a61ff6a7b36819ddcbc7b7",
+  "ResolvConfPath": "/mnt/sda1/var/lib/docker/containers/fc1243c01bbb791d9eca64204d76f72fc47fbebbca892d7dd0a5cd0e4e346045/resolv.conf",
+  "HostnamePath": "/mnt/sda1/var/lib/docker/containers/fc1243c01bbb791d9eca64204d76f72fc47fbebbca892d7dd0a5cd0e4e346045/hostname",
+  "HostsPath": "/mnt/sda1/var/lib/docker/containers/fc1243c01bbb791d9eca64204d76f72fc47fbebbca892d7dd0a5cd0e4e346045/hosts",
+  "LogPath": "/mnt/sda1/var/lib/docker/containers/fc1243c01bbb791d9eca64204d76f72fc47fbebbca892d7dd0a5cd0e4e346045/fc1243c01bbb791d9eca64204d76f72fc47fbebbca892d7dd0a5cd0e4e346045-json.log",
+  "Name": "/small_hodgkin",
+  "RestartCount": 0,
+  "Driver": "aufs",
+  "ExecDriver": "native-0.2",
+  "MountLabel": "",
+  "ProcessLabel": "",
+  "AppArmorProfile": "",
+  "ExecIDs": null,
+  "HostConfig": {
+    "Binds": null,
+    "ContainerIDFile": "",
+    "LxcConf": [],
+    "Memory": 0,
+    "MemoryReservation": 0,
+    "MemorySwap": 0,
+    "KernelMemory": 0,
+    "CpuShares": 0,
+    "CpuPeriod": 0,
+    "CpusetCpus": "",
+    "CpusetMems": "",
+    "CpuQuota": 0,
+    "BlkioWeight": 0,
+    "OomKillDisable": false,
+    "MemorySwappiness": -1,
+    "Privileged": false,
+    "PortBindings": {},
+    "Links": null,
+    "PublishAllPorts": false,
+    "Dns": null,
+    "DnsOptions": null,
+    "DnsSearch": null,
+    "ExtraHosts": null,
+    "VolumesFrom": null,
+    "Devices": [],
+    "NetworkMode": "default",
+    "IpcMode": "",
+    "PidMode": "",
+    "UTSMode": "",
+    "CapAdd": null,
+    "CapDrop": null,
+    "GroupAdd": null,
+    "RestartPolicy": {
+      "Name": "no",
+      "MaximumRetryCount": 0
+    },
+    "SecurityOpt": null,
+    "ReadonlyRootfs": false,
+    "Ulimits": null,
+    "LogConfig": {
+      "Type": "json-file",
+      "Config": {}
+    },
+    "CgroupParent": "",
+    "ConsoleSize": [
+      0,
+      0
+    ],
+    "VolumeDriver": ""
+  },
+  "GraphDriver": {
+    "Name": "aufs",
+    "Data": null
+  },
+  "Mounts": [],
+  "Config": {
+    "Hostname": "fc1243c01bbb",
+    "Domainname": "",
+    "User": "",
+    "AttachStdin": false,
+    "AttachStdout": false,
+    "AttachStderr": false,
+    "Tty": false,
+    "OpenStdin": true,
+    "StdinOnce": false,
+    "Env": null,
+    "Cmd": [
+      "cat"
+    ],
+    "Healthcheck": {
+      "Test": [
+        "CMD-SHELL",
+        "mysqladmin ping --silent"
+      ],
+      "Interval": 2000000000,
+      "Timeout": 3000000000
+    },
+    "Image": "busybox",
+    "Volumes": null,
+    "WorkingDir": "",
+    "Entrypoint": null,
+    "OnBuild": null,
+    "Labels": {},
+    "StopSignal": "SIGTERM"
+  },
+  "NetworkSettings": {
+    "Bridge": "",
+    "SandboxID": "5a6ded01bf23cc180e8ba6a059449ac832f28fa1d8367127e316607f92d3228c",
+    "HairpinMode": false,
+    "LinkLocalIPv6Address": "",
+    "LinkLocalIPv6PrefixLen": 0,
+    "Ports": {},
+    "SandboxKey": "/var/run/docker/netns/5a6ded01bf23",
+    "SecondaryIPAddresses": null,
+    "SecondaryIPv6Addresses": null,
+    "EndpointID": "6b4bb2aff9981d6e132cf37ebbfd370069061fab848ae56247b154717a99aba7",
+    "Gateway": "172.17.0.1",
+    "GlobalIPv6Address": "",
+    "GlobalIPv6PrefixLen": 0,
+    "IPAddress": "172.17.0.2",
+    "IPPrefixLen": 16,
+    "IPv6Gateway": "",
+    "MacAddress": "02:42:ac:11:00:02",
+    "Networks": {
+      "bridge": {
+        "EndpointID": "6b4bb2aff9981d6e132cf37ebbfd370069061fab848ae56247b154717a99aba7",
+        "Gateway": "172.17.0.1",
+        "IPAddress": "172.17.0.2",
+        "IPPrefixLen": 16,
+        "IPv6Gateway": "",
+        "GlobalIPv6Address": "",
+        "GlobalIPv6PrefixLen": 0,
+        "MacAddress": "02:42:ac:11:00:02"
+      }
+    }
+  }
+}

From 7427db3f5d8cd03f294f1c5b0929b2fcda7122fa Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 3 Mar 2017 22:22:24 +0300
Subject: [PATCH 0697/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca927c2c3..114c66147 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,11 @@ Change Log
 ===
 ## (dev) 3.1.0 (reserverd for swarm features)
  
-## next...
+## 3.0.8
+ - Use TLSv1.2 by default
+ - Health api
+ - Labels
+ - Support for multiple certificates 
 
 ## 3.0.7
  * https://github.com/docker-java/docker-java/milestone/17?closed=1

From c57c6b184ac3fb8a347463f07bd140054d903908 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 3 Mar 2017 22:32:03 +0300
Subject: [PATCH 0698/1272] [maven-release-plugin] prepare release 3.0.8

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 726afefa4..a6f046ba4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.8-SNAPSHOT</version>
+	<version>3.0.8</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.0.8</tag>
 	</scm>
 
 	<developers>

From 0a3ac8d071b297d681d37080649a90a64ef59417 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 3 Mar 2017 22:32:16 +0300
Subject: [PATCH 0699/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a6f046ba4..bc1970e66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.8</version>
+	<version>3.0.9-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.0.8</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 32e1116d0f869597967682de18678260b4cd9e6a Mon Sep 17 00:00:00 2001
From: James Netherton <jamesnetherton@gmail.com>
Date: Sat, 4 Mar 2017 14:35:16 +0000
Subject: [PATCH 0700/1272] Fixes #807. NettyDockerCmdExecFactory ignores API
 version configuration

---
 .../netty/NettyDockerCmdExecFactory.java      |   7 +-
 .../NettyDockerCmdExecFactoryConfigTest.java  | 142 ++++++++++++++++++
 2 files changed, 148 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java

diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index c91d4af21..2c8a83b0e 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -172,6 +172,8 @@ public class NettyDockerCmdExecFactory implements DockerCmdExecFactory {
 
     private NettyInitializer nettyInitializer;
 
+    private WebTarget baseResource;
+
     private ChannelProvider channelProvider = new ChannelProvider() {
         @Override
         public DuplexChannel getChannel() {
@@ -199,6 +201,8 @@ public void init(DockerClientConfig dockerClientConfig) {
         }
 
         eventLoopGroup = nettyInitializer.init(bootstrap, dockerClientConfig);
+
+        baseResource = new WebTarget(channelProvider).path(dockerClientConfig.getApiVersion().asWebPathPart());
     }
 
     private DuplexChannel connect() {
@@ -619,6 +623,7 @@ private <T extends Channel> T configure(T channel) {
     }
 
     private WebTarget getBaseResource() {
-        return new WebTarget(channelProvider);
+        checkNotNull(baseResource, "Factory not initialized, baseResource not set. You probably forgot to call init()!");
+        return baseResource;
     }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java b/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java
new file mode 100644
index 000000000..54184f674
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java
@@ -0,0 +1,142 @@
+package com.github.dockerjava.netty;
+
+import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH;
+import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_TYPE;
+import static io.netty.handler.codec.http.HttpResponseStatus.OK;
+import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
+import static org.testng.Assert.assertEquals;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpServerCodec;
+import io.netty.util.CharsetUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.testng.annotations.Test;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.core.DefaultDockerClientConfig;
+import com.github.dockerjava.core.DefaultDockerClientConfig.Builder;
+import com.github.dockerjava.core.DockerClientBuilder;
+
+public class NettyDockerCmdExecFactoryConfigTest {
+
+    @Test
+    public void testNettyDockerCmdExecFactoryConfigWithApiVersion() throws Exception {
+        NettyDockerCmdExecFactory factory = new NettyDockerCmdExecFactory();
+        Builder configBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder()
+            .withDockerHost("tcp://localhost:2378")
+            .withApiVersion("1.23");
+
+        DockerClient client = DockerClientBuilder.getInstance(configBuilder)
+                .withDockerCmdExecFactory(factory)
+                .build();
+
+        FakeDockerServer server = new FakeDockerServer(2378);
+        server.start();
+        try {
+            client.versionCmd().exec();
+
+            List<HttpRequest> requests = server.getRequests();
+
+            assertEquals(requests.size(), 1);
+            assertEquals(requests.get(0).uri(), "/v1.23/version");
+        } finally {
+            server.stop();
+        }
+    }
+
+    @Test
+    public void testNettyDockerCmdExecFactoryConfigWithoutApiVersion() throws Exception {
+        NettyDockerCmdExecFactory factory = new NettyDockerCmdExecFactory();
+        Builder configBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder().withDockerHost("tcp://localhost:2378");
+
+        DockerClient client = DockerClientBuilder.getInstance(configBuilder)
+            .withDockerCmdExecFactory(factory)
+            .build();
+
+        FakeDockerServer server = new FakeDockerServer(2378);
+        server.start();
+        try {
+            client.versionCmd().exec();
+
+            List<HttpRequest> requests = server.getRequests();
+
+            assertEquals(requests.size(), 1);
+            assertEquals(requests.get(0).uri(), "/version");
+        } finally {
+            server.stop();
+        }
+    }
+
+    private class FakeDockerServer {
+        private final int port;
+        private final NioEventLoopGroup parent;
+        private final NioEventLoopGroup child;
+        private final List<HttpRequest> requests = new ArrayList<>();
+        private Channel channel;
+
+        private FakeDockerServer(int port) {
+            this.port = port;
+            this.parent = new NioEventLoopGroup();
+            this.child = new NioEventLoopGroup();
+        }
+
+        private void start() throws Exception {
+            ServerBootstrap bootstrap = new ServerBootstrap();
+            bootstrap.group(parent, child)
+                .channel(NioServerSocketChannel.class)
+                .childHandler(new ChannelInitializer<SocketChannel>() {
+                    @Override
+                    protected void initChannel(SocketChannel socketChannel) throws Exception {
+                        ChannelPipeline pipeline = socketChannel.pipeline();
+                        pipeline.addLast("codec", new HttpServerCodec());
+                        pipeline.addLast("httpHandler", new SimpleChannelInboundHandler<Object>() {
+                            @Override
+                            protected void channelRead0(ChannelHandlerContext context, Object message) throws Exception {
+                                if (message instanceof HttpRequest) {
+                                    // Keep track of processed requests
+                                    HttpRequest request = (HttpRequest) message;
+                                    requests.add(request);
+                                }
+
+                                if (message instanceof HttpContent) {
+                                    // Write an empty JSON response back to the client
+                                    FullHttpResponse response = new DefaultFullHttpResponse(HTTP_1_1, OK, Unpooled.copiedBuffer("{}", CharsetUtil.UTF_8));
+                                    response.headers().set(CONTENT_TYPE, "application/json; charset=UTF-8");
+                                    response.headers().set(CONTENT_LENGTH, response.content().readableBytes());
+                                    context.writeAndFlush(response);
+                                }
+                            }
+                        });
+                    }
+                });
+
+            channel = bootstrap.bind(port).syncUninterruptibly().channel();
+        }
+
+        private void stop() throws Exception {
+            parent.shutdownGracefully();
+            child.shutdownGracefully();
+            channel.closeFuture().sync();
+        }
+
+        private List<HttpRequest> getRequests() {
+            return requests;
+        }
+    }
+}

From 221fff63fba1a82296198d67679f3eb7590d15ef Mon Sep 17 00:00:00 2001
From: James Netherton <jamesnetherton@gmail.com>
Date: Mon, 6 Mar 2017 20:46:56 +0000
Subject: [PATCH 0701/1272] Ensure FakeDockerServer is started on a random free
 port

---
 .../NettyDockerCmdExecFactoryConfigTest.java  | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java b/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java
index 54184f674..d0ddccca8 100644
--- a/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java
+++ b/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java
@@ -23,6 +23,8 @@
 import io.netty.handler.codec.http.HttpServerCodec;
 import io.netty.util.CharsetUtil;
 
+import java.io.IOException;
+import java.net.ServerSocket;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -37,16 +39,18 @@ public class NettyDockerCmdExecFactoryConfigTest {
 
     @Test
     public void testNettyDockerCmdExecFactoryConfigWithApiVersion() throws Exception {
+        int dockerPort = getFreePort();
+
         NettyDockerCmdExecFactory factory = new NettyDockerCmdExecFactory();
         Builder configBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder()
-            .withDockerHost("tcp://localhost:2378")
+            .withDockerHost("tcp://localhost:" + dockerPort)
             .withApiVersion("1.23");
 
         DockerClient client = DockerClientBuilder.getInstance(configBuilder)
                 .withDockerCmdExecFactory(factory)
                 .build();
 
-        FakeDockerServer server = new FakeDockerServer(2378);
+        FakeDockerServer server = new FakeDockerServer(dockerPort);
         server.start();
         try {
             client.versionCmd().exec();
@@ -62,14 +66,16 @@ public void testNettyDockerCmdExecFactoryConfigWithApiVersion() throws Exception
 
     @Test
     public void testNettyDockerCmdExecFactoryConfigWithoutApiVersion() throws Exception {
+        int dockerPort = getFreePort();
+
         NettyDockerCmdExecFactory factory = new NettyDockerCmdExecFactory();
-        Builder configBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder().withDockerHost("tcp://localhost:2378");
+        Builder configBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder().withDockerHost("tcp://localhost:" + dockerPort);
 
         DockerClient client = DockerClientBuilder.getInstance(configBuilder)
             .withDockerCmdExecFactory(factory)
             .build();
 
-        FakeDockerServer server = new FakeDockerServer(2378);
+        FakeDockerServer server = new FakeDockerServer(dockerPort);
         server.start();
         try {
             client.versionCmd().exec();
@@ -83,6 +89,13 @@ public void testNettyDockerCmdExecFactoryConfigWithoutApiVersion() throws Except
         }
     }
 
+    private int getFreePort() throws IOException {
+        ServerSocket socket = new ServerSocket(0);
+        int freePort = socket.getLocalPort();
+        socket.close();
+        return freePort;
+    }
+
     private class FakeDockerServer {
         private final int port;
         private final NioEventLoopGroup parent;

From d9ca42c5a2f8d54f26f29ef5c2f06637254d9021 Mon Sep 17 00:00:00 2001
From: Maxim Chireychik <mchireychik@sdl.com>
Date: Tue, 14 Mar 2017 10:43:25 +0200
Subject: [PATCH 0702/1272] Unable to deserialize status response from amazon
 ECR login

---
 src/main/java/com/github/dockerjava/api/model/AuthResponse.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/AuthResponse.java b/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
index cd6908185..590fb7fb3 100644
--- a/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
+++ b/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
@@ -1,9 +1,11 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.io.Serializable;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class AuthResponse implements Serializable {
     private static final long serialVersionUID = 1L;
 

From 0b2abbc3a8bedeee1c5ab67eee65badfcd1f5d6e Mon Sep 17 00:00:00 2001
From: David Byron <david.byron@locationlabs.com>
Date: Wed, 15 Mar 2017 09:13:23 -0700
Subject: [PATCH 0703/1272] exclude commons-logging since docker-java uses
 slf4j/logback

---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index bc1970e66..acc3a160c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,6 +108,12 @@
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
 			<version>${httpclient.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.core</groupId>

From f9fdc392bc676fa667f34e4e94b851919040ff7d Mon Sep 17 00:00:00 2001
From: orzeh <lukasz.warchal@asseco.pl>
Date: Tue, 28 Mar 2017 23:53:12 +0200
Subject: [PATCH 0704/1272] Generate OSGi compliant manifest (#797)

* Generate OSGi compliant manifest

Manifest is generated by the Bundlor plugin according to the template defined in template.mf file. Import package versions are mainly derived from properties defined in pom.xml.
Imports of Netty packages are marked as optional.

* Export com.github.dockerjava.core package and subpackages
---
 pom.xml     | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 template.mf | 31 +++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 template.mf

diff --git a/pom.xml b/pom.xml
index acc3a160c..154153fe5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,6 +86,8 @@
 		<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
 		<maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
 		<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
+		<maven-bundlor-plugin.version>1.1.2.RELEASE</maven-bundlor-plugin.version>
+		<maven-build-helper-plugin.version>3.0.0</maven-build-helper-plugin.version>
 	</properties>
 
 	<dependencies>
@@ -275,6 +277,19 @@
 		</repository>
 	</distributionManagement>
 
+	<pluginRepositories>
+		<pluginRepository>
+			<id>eclipse.virgo.build.bundles.release</id>
+			<name>Eclipse Virgo Build</name>
+			<url>http://build.eclipse.org/rt/virgo/maven/bundles/release</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>com.springsource.repository.bundles.external</id>
+			<name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
+			<url>http://repository.springsource.com/maven/bundles/external</url>
+		</pluginRepository>
+	</pluginRepositories>
+
 	<build>
 		<pluginManagement>
 			<plugins>
@@ -301,6 +316,11 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
 					<version>${maven-jar-plugin.version}</version>
+					<configuration>
+						<archive>
+							<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
+						</archive>
+					</configuration>
 					<executions>
 						<execution>
 							<goals>
@@ -436,6 +456,37 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
 			</plugin>
+
+			<plugin>
+				<groupId>org.eclipse.virgo.bundlor</groupId>
+				<artifactId>org.eclipse.virgo.bundlor.maven</artifactId>
+				<version>${maven-bundlor-plugin.version}</version>
+				<executions>
+					<execution>
+						<id>bundlor</id>
+						<goals>
+							<goal>bundlor</goal>
+						</goals>
+						<configuration>
+							<failOnWarnings>true</failOnWarnings>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>${maven-build-helper-plugin.version}</version>
+				<executions>
+					<execution>
+						<id>parse-version</id>
+						<goals>
+							<goal>parse-version</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 
diff --git a/template.mf b/template.mf
new file mode 100644
index 000000000..35d278889
--- /dev/null
+++ b/template.mf
@@ -0,0 +1,31 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: com.github.docker-java
+Bundle-Version: ${parsedVersion.osgiVersion}
+Bundle-Name: ${project.name}
+Version-Patterns:
+ default;pattern="[=.=.=, =.+1.0)",
+ short;pattern="[=.=,+1.0)"
+Import-Template:
+ com.fasterxml.jackson.*;version="${jackson-jaxrs.version}",
+ com.google.common.*;version="${guava.version:short}",
+ io.netty.*;version="${netty.version:default}";resolution:=optional,
+ javax.ws.rs.*;version="[2.0.0, 2.1.0)",
+ org.apache.commons.codec.*;version="${commons-codec.version:short}",
+ org.apache.commons.compress.*;version="${commons-compress.version:short}",
+ org.apache.commons.io.*;version="${commons-io.version:short}",
+ org.apache.commons.lang.*;version="${commons-lang.version:short}",
+ org.apache.http.*;version="[4.4.0, 4.6.0)",
+ org.bouncycastle.*;version="${bouncycastle.version:short}",
+ org.glassfish.jersey.*;version="${jersey.version:default}",
+ org.slf4j.*;version="[1.7.0, 1.8.0)",
+ org.newsclub.net.unix;version="${junixsocket.version:default}";resolution:=optional
+Excluded-Exports:
+ org.apache.http.impl.io,
+ org.newsclub.net.unix,
+ com.github.dockerjava.jaxrs.*,
+ com.github.dockerjava.netty.*
+Excluded-Imports:
+ javax.annotation,
+ javax.net.ssl,
+ edu.umd.cs.findbugs.annotations

From 7016a6364e6638b126baa684209246068d57c773 Mon Sep 17 00:00:00 2001
From: nimantha siriwardana <nimantha.siriwardana@rkrepsilon.com>
Date: Wed, 29 Mar 2017 09:40:50 +0100
Subject: [PATCH 0705/1272] adding support for unless-stopped restart policy

---
 .../github/dockerjava/api/model/RestartPolicy.java    | 11 +++++++++++
 .../api/model/RestartPolicy_ParsingTest.java          |  5 +++++
 .../api/model/RestartPolicy_SerializingTest.java      |  7 +++++++
 .../api/model/RestartPolicy_toStringTest.java         |  2 +-
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
index 1f77b8b9d..98e181a1b 100644
--- a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
+++ b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
@@ -70,6 +70,13 @@ public static RestartPolicy onFailureRestart(int maximumRetryCount) {
         return new RestartPolicy(maximumRetryCount, "on-failure");
     }
 
+    /**
+     * Restart the container unless it has been stopped
+     */
+    public static RestartPolicy unlessStoppedRestart() {
+        return new RestartPolicy(0, "unless-stopped");
+    }
+
     public Integer getMaximumRetryCount() {
         return maximumRetryCount;
     }
@@ -99,6 +106,10 @@ public static RestartPolicy parse(String serialized) throws IllegalArgumentExcep
                 return alwaysRestart();
             }
 
+            if ("unless-stopped".equals(name)) {
+                return unlessStoppedRestart();
+            }
+
             if ("on-failure".equals(name)) {
                 int count = 0;
                 if (parts.length == 2) {
diff --git a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_ParsingTest.java b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_ParsingTest.java
index 3bc22c00e..85740be61 100644
--- a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_ParsingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_ParsingTest.java
@@ -16,6 +16,11 @@ public void alwaysRestart() throws Exception {
         assertEquals(RestartPolicy.parse("always"), RestartPolicy.alwaysRestart());
     }
 
+    @Test
+    public void unlessStoppedRestart() throws Exception {
+        assertEquals(RestartPolicy.parse("unless-stopped"), RestartPolicy.unlessStoppedRestart());
+    }
+
     @Test
     public void onFailureRestart() throws Exception {
         assertEquals(RestartPolicy.parse("on-failure"), RestartPolicy.onFailureRestart(0));
diff --git a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_SerializingTest.java b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_SerializingTest.java
index 74c97fcf6..06debb34f 100644
--- a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_SerializingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_SerializingTest.java
@@ -27,6 +27,13 @@ public void alwaysRestart() throws Exception {
         assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"always\"}");
     }
 
+    @Test
+    // --restart unless-stopped
+    public void unlessStoppedRestart() throws Exception {
+        String json = objectMapper.writeValueAsString(RestartPolicy.unlessStoppedRestart());
+        assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"unless-stopped\"}");
+    }
+
     @Test
     // --restart on-failure
     public void onFailureRestart() throws Exception {
diff --git a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java
index 69e1e88a2..611343736 100644
--- a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java
@@ -9,7 +9,7 @@ public class RestartPolicy_toStringTest {
 
     @DataProvider(name = "input")
     public Object[][] restartPolicies() {
-        return new Object[][] { {"no"}, {"always"}, {"on-failure"}, {"on-failure:2"}};
+        return new Object[][] { {"no"}, {"always"}, {"unless-stopped"}, {"on-failure"}, {"on-failure:2"}};
     }
 
     @Test(dataProvider = "input")

From 2d053870d546b43b8f5d18f53e5085702ace097d Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 13 Apr 2017 22:59:40 +0300
Subject: [PATCH 0706/1272] Responce may contains token.

---
 .../dockerjava/api/model/AuthResponse.java    | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/AuthResponse.java b/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
index 590fb7fb3..821d4c4ac 100644
--- a/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
+++ b/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
@@ -3,16 +3,39 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 import java.io.Serializable;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class AuthResponse implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    /**
+     * @since 1.23
+     */
     @JsonProperty("Status")
     private String status;
 
+    /**
+     * @since 1.23
+     */
+    @JsonProperty("IdentityToken")
+    private String identityToken;
+
+    /**
+     * @see #status
+     */
+    @Nonnull
     public String getStatus() {
         return status;
     }
+
+    /**
+     * @see #identityToken
+     */
+    @CheckForNull
+    public String getIdentityToken() {
+        return identityToken;
+    }
 }

From f01072d81b5d06b79ad4425a568e19c89c06a1cf Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 13 Apr 2017 23:03:33 +0300
Subject: [PATCH 0707/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 114c66147..b0c7f2237 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@ Change Log
 ===
 ## (dev) 3.1.0 (reserverd for swarm features)
  
+## 3.0.9
+- NettyDockerCmdExecFactory ignores API version 
+- exclude commons-logging from httpclient since docker-java uses slf4j/logback
+- Generate OSGi compliant manifest
+- AuthResponse may contains token.
+
 ## 3.0.8
  - Use TLSv1.2 by default
  - Health api

From 250a02baa7ae3549f4d4ebc9cd6efdd88d14bfab Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 13 Apr 2017 23:14:27 +0300
Subject: [PATCH 0708/1272] Fix test.

---
 .../netty/NettyDockerCmdExecFactoryConfigTest.java         | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java b/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java
index d0ddccca8..e36ee6b8b 100644
--- a/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java
+++ b/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java
@@ -42,7 +42,8 @@ public void testNettyDockerCmdExecFactoryConfigWithApiVersion() throws Exception
         int dockerPort = getFreePort();
 
         NettyDockerCmdExecFactory factory = new NettyDockerCmdExecFactory();
-        Builder configBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder()
+        Builder configBuilder = new DefaultDockerClientConfig.Builder()
+            .withDockerTlsVerify(false)
             .withDockerHost("tcp://localhost:" + dockerPort)
             .withApiVersion("1.23");
 
@@ -69,7 +70,9 @@ public void testNettyDockerCmdExecFactoryConfigWithoutApiVersion() throws Except
         int dockerPort = getFreePort();
 
         NettyDockerCmdExecFactory factory = new NettyDockerCmdExecFactory();
-        Builder configBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder().withDockerHost("tcp://localhost:" + dockerPort);
+        Builder configBuilder = new DefaultDockerClientConfig.Builder()
+            .withDockerTlsVerify(false)
+            .withDockerHost("tcp://localhost:" + dockerPort);
 
         DockerClient client = DockerClientBuilder.getInstance(configBuilder)
             .withDockerCmdExecFactory(factory)

From d705bfba9aea65b3556fe057e1f7fedf8622da90 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 13 Apr 2017 23:18:52 +0300
Subject: [PATCH 0709/1272] [maven-release-plugin] prepare release 3.0.9

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 154153fe5..fd58ad39c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.9-SNAPSHOT</version>
+	<version>3.0.9</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.0.9</tag>
 	</scm>
 
 	<developers>

From 53ee7e172f85ee994bc70ab5af3719cf1ab992d8 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 13 Apr 2017 23:19:03 +0300
Subject: [PATCH 0710/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index fd58ad39c..8933bad62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.9</version>
+	<version>3.0.10-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.0.9</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From dc87e0c592c133acc8ccac87a4cb0941eccdbb0e Mon Sep 17 00:00:00 2001
From: Dmitry Gusev <dmitry.gusev@gmail.com>
Date: Mon, 24 Apr 2017 01:01:36 +0300
Subject: [PATCH 0711/1272] Proposed fix for #830 (#832)

* Proposed fix for #830

* Simplify the fix for #830
---
 .../command/BuildImageResultCallback.java     | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
index 1ca276434..e622c4725 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
@@ -5,8 +5,6 @@
 
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.CheckForNull;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,12 +21,17 @@ public class BuildImageResultCallback extends ResultCallbackTemplate<BuildImageR
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageResultCallback.class);
 
-    @CheckForNull
-    private BuildResponseItem latestItem = null;
+    private String imageId;
+
+    private String error;
 
     @Override
     public void onNext(BuildResponseItem item) {
-        this.latestItem = item;
+        if (item.isBuildSuccessIndicated()) {
+            this.imageId = item.getImageId();
+        } else if (item.isErrorIndicated()) {
+            this.error = item.getError();
+        }
         LOGGER.debug(item.toString());
     }
 
@@ -65,13 +68,14 @@ public String awaitImageId(long timeout, TimeUnit timeUnit) {
     }
 
     private String getImageId() {
-        if (latestItem == null) {
+        if (imageId != null) {
+            return imageId;
+        }
+
+        if (error == null) {
             throw new DockerClientException("Could not build image");
-        } else if (!latestItem.isBuildSuccessIndicated()) {
-            throw new DockerClientException("Could not build image: " + latestItem.getError());
-        } else {
-            return latestItem.getImageId();
         }
-    }
 
+        throw new DockerClientException("Could not build image: " + error);
+    }
 }

From 842e816d0e65eba858a292ea5bd3b833fd0f66a6 Mon Sep 17 00:00:00 2001
From: Ravi Chodavarapu <rchodava@users.noreply.github.com>
Date: Sun, 23 Apr 2017 23:03:39 +0100
Subject: [PATCH 0712/1272] Allow an explicit Dockerfile location string to be
 specified to the build command (#825)

* When supplying a TAR stream to the build command, API consumers just want to pass a String location of the Dockerfile within the TAR stream they are supplying

* Add netty test for building with an explicitly specified Dockerfile location within a tar
---
 .../dockerjava/api/command/BuildImageCmd.java      |  2 ++
 .../dockerjava/core/command/BuildImageCmdImpl.java | 13 ++++++++++++-
 .../core/command/BuildImageCmdImplTest.java        | 14 ++++++++++++++
 .../netty/exec/BuildImageCmdExecTest.java          | 14 ++++++++++++++
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index ac98db2f9..0c9b7f5a4 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -117,6 +117,8 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     BuildImageCmd withDockerfile(File dockerfile);
 
+    BuildImageCmd withDockerfilePath(String dockerfilePath);
+
     BuildImageCmd withNoCache(Boolean noCache);
 
     BuildImageCmd withRemove(Boolean rm);
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index c34b05155..bced21726 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -38,6 +38,8 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR
 
     private File dockerFile;
 
+    private String dockerFilePath;
+
     private File baseDirectory;
 
     private String cpusetcpus;
@@ -119,7 +121,9 @@ public Boolean hasPullEnabled() {
 
     @Override
     public String getPathToDockerfile() {
-        if (baseDirectory != null && dockerFile != null) {
+        if (dockerFilePath != null) {
+            return dockerFilePath;
+        } else if (baseDirectory != null && dockerFile != null) {
             return FilePathUtil.relativize(baseDirectory, dockerFile);
         } else {
             return null;
@@ -287,6 +291,13 @@ public BuildImageCmdImpl withDockerfile(File dockerfile) {
         return this;
     }
 
+    @Override
+    public BuildImageCmd withDockerfilePath(String dockerfilePath) {
+        checkNotNull(dockerfilePath, "dockerfilePath is null");
+        this.dockerFilePath = dockerfilePath;
+        return this;
+    }
+
     @Override
     public BuildImageCmdImpl withTarInputStream(InputStream tarInputStream) {
         checkNotNull(tarInputStream, "tarInputStream is null");
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index cb4c1b2a8..3337d3320 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -83,6 +83,15 @@ public void buildImageFromTar() throws Exception {
         assertThat(response, containsString("Successfully executed testrun.sh"));
     }
 
+    @Test
+    public void buildImageFromTarWithDockerfileNotInBaseDirectory() throws Exception {
+        File baseDir = fileFromBuildTestResource("dockerfileNotInBaseDirectory");
+        Collection<File> files = FileUtils.listFiles(baseDir, TrueFileFilter.INSTANCE, TrueFileFilter.INSTANCE);
+        File tarFile = CompressArchiveUtil.archiveTARFiles(baseDir, files, UUID.randomUUID().toString());
+        String response = dockerfileBuild(new FileInputStream(tarFile), "dockerfileFolder/Dockerfile");
+        assertThat(response, containsString("Successfully executed testrun.sh"));
+    }
+
     @Test
     public void onBuild() throws Exception {
         File baseDir = fileFromBuildTestResource("ONBUILD/parent");
@@ -123,6 +132,11 @@ public void addFolder() throws Exception {
         assertThat(response, containsString("Successfully executed testAddFolder.sh"));
     }
 
+    private String dockerfileBuild(InputStream tarInputStream, String dockerFilePath) throws Exception {
+
+        return execBuild(dockerClient.buildImageCmd().withTarInputStream(tarInputStream).withDockerfilePath(dockerFilePath));
+    }
+
     private String dockerfileBuild(InputStream tarInputStream) throws Exception {
 
         return execBuild(dockerClient.buildImageCmd().withTarInputStream(tarInputStream));
diff --git a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
index f567dcfc8..63fcf7ea1 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
@@ -88,6 +88,15 @@ public void buildImageFromTar() throws Exception {
         assertThat(response, containsString("Successfully executed testrun.sh"));
     }
 
+    @Test
+    public void buildImageFromTarWithDockerfileNotInBaseDirectory() throws Exception {
+        File baseDir = fileFromBuildTestResource("dockerfileNotInBaseDirectory");
+        Collection<File> files = FileUtils.listFiles(baseDir, TrueFileFilter.INSTANCE, TrueFileFilter.INSTANCE);
+        File tarFile = CompressArchiveUtil.archiveTARFiles(baseDir, files, UUID.randomUUID().toString());
+        String response = dockerfileBuild(new FileInputStream(tarFile), "dockerfileFolder/Dockerfile");
+        assertThat(response, containsString("Successfully executed testrun.sh"));
+    }
+
     @Test
     public void onBuild() throws Exception {
         File baseDir = fileFromBuildTestResource("ONBUILD/parent");
@@ -128,6 +137,11 @@ public void addFolder() throws Exception {
         assertThat(response, containsString("Successfully executed testAddFolder.sh"));
     }
 
+    private String dockerfileBuild(InputStream tarInputStream, String dockerFilePath) throws Exception {
+
+        return execBuild(dockerClient.buildImageCmd().withTarInputStream(tarInputStream).withDockerfilePath(dockerFilePath));
+    }
+
     private String dockerfileBuild(InputStream tarInputStream) throws Exception {
 
         return execBuild(dockerClient.buildImageCmd().withTarInputStream(tarInputStream));

From e81067367657c6dac686cd0e613f849685a5c3c3 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 24 Apr 2017 01:51:56 +0300
Subject: [PATCH 0713/1272] Add some coding styles.

TODO sync and share eclipse files?
---
 .gitignore                  |  3 ++-
 .idea/codeStyleSettings.xml | 12 ++++++++++++
 .idea/encodings.xml         |  7 +++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 .idea/codeStyleSettings.xml
 create mode 100644 .idea/encodings.xml

diff --git a/.gitignore b/.gitignore
index a705c1129..5399371c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,8 @@ target
 
 # Ignore InteliJ Idea project files
 .idea
-.idea/*
+!.idea/codeStyleSettings.xml
+!.idea/encodings.xml
 *.iml
 *.iws
 *.ipr
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
new file mode 100644
index 000000000..6f3c789b4
--- /dev/null
+++ b/.idea/codeStyleSettings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />
+        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 000000000..c0bce7084
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file

From 3ad99322f80ecd502cbe2fc68f7185c9d2807a3e Mon Sep 17 00:00:00 2001
From: Jonas Trollvik <jonas@weightpoint.se>
Date: Thu, 27 Apr 2017 17:22:24 +0200
Subject: [PATCH 0714/1272] Add db LoggingType

Synology uses it's own logging type called db
---
 src/main/java/com/github/dockerjava/api/model/LogConfig.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
index e2a066101..2a3301287 100644
--- a/src/main/java/com/github/dockerjava/api/model/LogConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
@@ -79,6 +79,7 @@ public enum LoggingType {
         GELF("gelf"),
         FLUENTD("fluentd"),
         AWSLOGS("awslogs"),
+        DB("db"), // Synology specific driver
         SPLUNK("splunk");
 
         private String type;

From 460406705daf705ae46467f2ffa6f371aafeed12 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 5 May 2017 05:12:40 +0300
Subject: [PATCH 0715/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0c7f2237..84f2b27d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@ Change Log
 ===
 ## (dev) 3.1.0 (reserverd for swarm features)
  
+ 
+## 3.0.10
+- Custom `db` logging type 
+- Allow an explicit Dockerfile location string to be specified to theuild command
+- Fix image build for docker 17 with 'tagged' word.
+ 
 ## 3.0.9
 - NettyDockerCmdExecFactory ignores API version 
 - exclude commons-logging from httpclient since docker-java uses slf4j/logback

From c82b92d38374e242e8130af7282f8cf59c91297d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Warcha=C5=82?= <lukasz.warchal@asseco.pl>
Date: Tue, 15 Nov 2016 13:48:57 +0100
Subject: [PATCH 0716/1272] Allow multiple tags in build image command

Several tags for image can be defined by calling multiple time withTag() method of BuildImageCmd.
In Netty implementation, the WebTarget class is modified to support several query parameteres with the same name.
Fix #720
---
 .../dockerjava/api/command/BuildImageCmd.java | 19 +++++
 .../core/command/BuildImageCmdImpl.java       | 24 +++++-
 .../dockerjava/jaxrs/BuildImageCmdExec.java   |  9 +-
 .../github/dockerjava/netty/WebTarget.java    | 85 +++++++++++++++++--
 .../netty/exec/BuildImageCmdExec.java         | 34 +++-----
 .../core/command/BuildImageCmdImplTest.java   | 25 ++++++
 .../netty/exec/BuildImageCmdExecTest.java     | 25 ++++++
 7 files changed, 189 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index ac98db2f9..a36b1b17e 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -4,6 +4,7 @@
 import java.io.InputStream;
 import java.net.URI;
 import java.util.Map;
+import java.util.Set;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
@@ -34,10 +35,21 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     /**
      * "t" in API
+     *
+     * @deprecated since docker API version 1.21 there can be multiple tags
+     * specified so use {@link #getTags()}
      */
     @CheckForNull
+    @Deprecated
     String getTag();
 
+    /**
+     * Multple "t" tags.
+     * @since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    @CheckForNull
+    Set<String> getTags();
+
     /**
      * "remote" in API
      */
@@ -109,8 +121,15 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     // setters
 
+    /**
+     * @deprecated since docker API version 1.21 there can be multiple tags
+     * specified so use {@link #withTags(Set<String>)}
+     */
+    @Deprecated
     BuildImageCmd withTag(String tag);
 
+    BuildImageCmd withTags(Set<String> tags);
+
     BuildImageCmd withRemote(URI remote);
 
     BuildImageCmd withBaseDirectory(File baseDirectory);
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index c34b05155..97629568c 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -8,6 +8,7 @@
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.model.AuthConfigurations;
@@ -15,17 +16,20 @@
 import com.github.dockerjava.core.dockerfile.Dockerfile;
 import com.github.dockerjava.core.util.FilePathUtil;
 
+import javax.annotation.CheckForNull;
+
 /**
- *
  * Build an image from Dockerfile.
- *
  */
 public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildResponseItem> implements BuildImageCmd {
 
     private InputStream tarInputStream;
 
+    @Deprecated
     private String tag;
 
+    private Set<String> tags;
+
     private Boolean noCache;
 
     private Boolean remove = true;
@@ -82,11 +86,17 @@ public BuildImageCmdImpl(BuildImageCmd.Exec exec, InputStream tarInputStream) {
 
     // getters API
 
+    @Deprecated
     @Override
     public String getTag() {
         return tag;
     }
 
+    @CheckForNull
+    public Set<String> getTags() {
+        return tags;
+    }
+
     @Override
     public URI getRemote() {
         return remote;
@@ -178,6 +188,10 @@ public Long getShmsize() {
 
     // setters
 
+    /**
+     * @deprecated use #withTags()
+     */
+    @Deprecated
     @Override
     public BuildImageCmdImpl withTag(String tag) {
         checkNotNull(tag, "Tag is null");
@@ -185,6 +199,12 @@ public BuildImageCmdImpl withTag(String tag) {
         return this;
     }
 
+    @Override
+    public BuildImageCmd withTags(Set<String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
     @Override
     public BuildImageCmd withRemote(URI remote) {
         this.remote = remote;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index 2a7aea40e..ae2302b0d 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.jaxrs;
 
 import static javax.ws.rs.client.Entity.entity;
+import static org.apache.commons.lang.StringUtils.isNotBlank;
 
 import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.WebTarget;
@@ -65,9 +66,15 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
         if (dockerFilePath != null && command.getRemote() == null && !"Dockerfile".equals(dockerFilePath)) {
             webTarget = webTarget.queryParam("dockerfile", dockerFilePath);
         }
-        if (command.getTag() != null) {
+
+        if (command.getTags() != null && !command.getTags().isEmpty()) {
+            for (String t : command.getTags()) {
+                webTarget = webTarget.queryParam("t", t);
+            }
+        } else if (isNotBlank(command.getTag())) {
             webTarget = webTarget.queryParam("t", command.getTag());
         }
+
         if (command.getRemote() != null) {
             webTarget = webTarget.queryParam("remote", command.getRemote().toString());
         }
diff --git a/src/main/java/com/github/dockerjava/netty/WebTarget.java b/src/main/java/com/github/dockerjava/netty/WebTarget.java
index ef1510f5c..96fb42bec 100644
--- a/src/main/java/com/github/dockerjava/netty/WebTarget.java
+++ b/src/main/java/com/github/dockerjava/netty/WebTarget.java
@@ -1,22 +1,32 @@
 package com.github.dockerjava.netty;
 
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.nio.charset.UnsupportedCharsetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableSet;
+import io.netty.handler.codec.http.HttpConstants;
 import org.apache.commons.lang.StringUtils;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 
 /**
- * This class is basically a replacement of javax.ws.rs.client.WebTarget to allow simpler migration of JAX-RS code to a netty based
+ * This class is basically a replacement of {@link javax.ws.rs.client.WebTarget} to allow simpler migration of JAX-RS code to a netty based
  * implementation.
  *
  * @author Marcus Linke
  */
 public class WebTarget {
+    private static final ObjectMapper MAPPER = new ObjectMapper();
 
     private final ChannelProvider channelProvider;
 
@@ -24,18 +34,26 @@ public class WebTarget {
 
     private final ImmutableMap<String, String> queryParams;
 
+    /**
+     * Multiple values for the same name param.
+     */
+    private final ImmutableMap<String, Set<String>> queryParamsSet;
+
     private static final String PATH_SEPARATOR = "/";
 
     public WebTarget(ChannelProvider channelProvider) {
-        this(channelProvider, ImmutableList.<String>of(), ImmutableMap.<String, String>of());
+        this(channelProvider, ImmutableList.<String>of(), ImmutableMap.<String, String>of(),
+                ImmutableMap.<String, Set<String>>of());
     }
 
     private WebTarget(ChannelProvider channelProvider,
                       ImmutableList<String> path,
-                      ImmutableMap<String, String> queryParams) {
+                      ImmutableMap<String, String> queryParams,
+                      ImmutableMap<String, Set<String>> queryParamsSet) {
         this.channelProvider = channelProvider;
         this.path = path;
         this.queryParams = queryParams;
+        this.queryParamsSet = queryParamsSet;
     }
 
     public WebTarget path(String... components) {
@@ -45,7 +63,7 @@ public WebTarget path(String... components) {
             newPath.addAll(Arrays.asList(StringUtils.split(component, PATH_SEPARATOR)));
         }
 
-        return new WebTarget(channelProvider, newPath.build(), queryParams);
+        return new WebTarget(channelProvider, newPath.build(), queryParams, queryParamsSet);
     }
 
     public InvocationBuilder request() {
@@ -53,7 +71,13 @@ public InvocationBuilder request() {
 
         List<String> params = new ArrayList<>();
         for (Map.Entry<String, String> entry : queryParams.entrySet()) {
-            params.add(entry.getKey() + "=" + entry.getValue());
+            params.add(entry.getKey() + "=" + encodeComponent(entry.getValue(), HttpConstants.DEFAULT_CHARSET));
+        }
+
+        for (Map.Entry<String, Set<String>> entry : queryParamsSet.entrySet()) {
+            for (String entryValueValue : entry.getValue()) {
+                params.add(entry.getKey() + "=" + encodeComponent(entryValueValue, HttpConstants.DEFAULT_CHARSET));
+            }
         }
 
         if (!params.isEmpty()) {
@@ -63,13 +87,25 @@ public InvocationBuilder request() {
         return new InvocationBuilder(channelProvider, resource);
     }
 
+    /**
+     * @see io.netty.handler.codec.http.QueryStringEncoder
+     */
+    private static String encodeComponent(String s, Charset charset) {
+        // TODO: Optimize me.
+        try {
+            return URLEncoder.encode(s, charset.name()).replace("+", "%20");
+        } catch (UnsupportedEncodingException ignored) {
+            throw new UnsupportedCharsetException(charset.name());
+        }
+    }
+
     public WebTarget resolveTemplate(String name, Object value) {
         ImmutableList.Builder<String> newPath = ImmutableList.builder();
         for (String component : path) {
             component = component.replaceAll("\\{" + name + "\\}", value.toString());
             newPath.add(component);
         }
-        return new WebTarget(channelProvider, newPath.build(), queryParams);
+        return new WebTarget(channelProvider, newPath.build(), queryParams, queryParamsSet);
     }
 
     public WebTarget queryParam(String name, Object value) {
@@ -77,7 +113,32 @@ public WebTarget queryParam(String name, Object value) {
         if (value != null) {
             builder.put(name, value.toString());
         }
-        return new WebTarget(channelProvider, path, builder.build());
+        return new WebTarget(channelProvider, path, builder.build(), queryParamsSet);
+    }
+
+    public WebTarget queryParamsSet(String name, Set<?> values) {
+        ImmutableMap.Builder<String, Set<String>> builder = ImmutableMap.<String, Set<String>>builder().putAll(queryParamsSet);
+        if (values != null) {
+            ImmutableSet.Builder<String> valueBuilder = ImmutableSet.builder();
+            for (Object value : values) {
+                valueBuilder.add(value.toString());
+            }
+            builder.put(name, valueBuilder.build());
+        }
+        return new WebTarget(channelProvider, path, queryParams, builder.build());
+    }
+
+    public WebTarget queryParamsJsonMap(String name, Map<String, String> values) {
+        if (values != null && !values.isEmpty()) {
+            try {
+                // when param value is JSON string
+                return queryParam(name, MAPPER.writeValueAsString(values));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            return this;
+        }
     }
 
     @Override
@@ -97,7 +158,14 @@ public boolean equals(Object o) {
         if (path != null ? !path.equals(webTarget.path) : webTarget.path != null) {
             return false;
         }
-        return queryParams != null ? queryParams.equals(webTarget.queryParams) : webTarget.queryParams == null;
+        if (queryParams != null ? !queryParams.equals(webTarget.queryParams) : webTarget.queryParams != null) {
+            return false;
+        }
+        if (queryParamsSet != null ? !queryParamsSet.equals(webTarget.queryParamsSet) : webTarget.queryParamsSet != null) {
+            return false;
+        }
+
+        return true;
     }
 
     @Override
@@ -105,6 +173,7 @@ public int hashCode() {
         int result = channelProvider != null ? channelProvider.hashCode() : 0;
         result = 31 * result + (path != null ? path.hashCode() : 0);
         result = 31 * result + (queryParams != null ? queryParams.hashCode() : 0);
+        result = 31 * result + (queryParamsSet != null ? queryParamsSet.hashCode() : 0);
         return result;
     }
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
index 43152570e..bbca686e0 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.netty.exec;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,15 +13,12 @@
 import com.github.dockerjava.netty.MediaType;
 import com.github.dockerjava.netty.WebTarget;
 
-import java.io.IOException;
-import java.util.Map;
+import static org.apache.commons.lang.StringUtils.isNotBlank;
 
 public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem> implements
         BuildImageCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageCmdExec.class);
 
-    private static final ObjectMapper MAPPER = new ObjectMapper();
-
     public BuildImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
         super(baseResource, dockerClientConfig);
     }
@@ -55,9 +51,13 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
         if (dockerFilePath != null && command.getRemote() == null && !"Dockerfile".equals(dockerFilePath)) {
             webTarget = webTarget.queryParam("dockerfile", dockerFilePath);
         }
-        if (command.getTag() != null) {
-            webTarget = webTarget.queryParam("t", command.getTag());
+
+        if (command.getTags() != null && !command.getTags().isEmpty()) {
+            webTarget = webTarget.queryParamsSet("t", command.getTags());
+        } else if (isNotBlank(command.getTag())) {
+            webTarget = webTarget.queryParam("t", command.getTags());
         }
+
         if (command.getRemote() != null) {
             webTarget = webTarget.queryParam("remote", command.getRemote().toString());
         }
@@ -86,13 +86,17 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
             webTarget = webTarget.queryParam("cpusetcpus", command.getCpusetcpus());
         }
 
-        webTarget = writeMap(webTarget, "buildargs", command.getBuildArgs());
+        if (command.getBuildArgs() != null) {
+            webTarget = webTarget.queryParamsJsonMap("buildargs", command.getBuildArgs());
+        }
 
         if (command.getShmsize() != null) {
             webTarget = webTarget.queryParam("shmsize", command.getShmsize());
         }
 
-        webTarget = writeMap(webTarget, "labels", command.getLabels());
+        if (command.getLabels() != null) {
+            webTarget = webTarget.queryParamsJsonMap("labels", command.getLabels());
+        }
 
         LOGGER.trace("POST: {}", webTarget);
 
@@ -106,16 +110,4 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
 
         return null;
     }
-
-    private WebTarget writeMap(WebTarget webTarget, String name, Map<String, String> value) {
-        if (value != null && !value.isEmpty()) {
-            try {
-                return webTarget.queryParam(name, MAPPER.writeValueAsString(value));
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        } else {
-            return webTarget;
-        }
-    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index cb4c1b2a8..9ba283732 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -7,13 +7,16 @@
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.containsInAnyOrder;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
@@ -274,6 +277,28 @@ public void labels() throws Exception {
         assertThat(inspectImageResponse.getConfig().getLabels().get("test"), equalTo("abc"));
     }
 
+    @Test
+    public void multipleTags() throws Exception {
+        if (!getVersion(dockerClient).isGreaterOrEqual(RemoteApiVersion.VERSION_1_21)) {
+            throw new SkipException("API version should be >= 1.21");
+        }
+
+        File baseDir = fileFromBuildTestResource("labels");
+
+        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true)
+                .withTag("fallback-when-withTags-not-called")
+                .withTags(new HashSet<>(Arrays.asList("docker-java-test:tag1", "docker-java-test:tag2")))
+                .exec(new BuildImageResultCallback())
+                .awaitImageId();
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        assertThat(inspectImageResponse, not(nullValue()));
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+        assertThat(inspectImageResponse.getRepoTags().size(), equalTo(2));
+        assertThat(inspectImageResponse.getRepoTags(), containsInAnyOrder("docker-java-test:tag1", "docker-java-test:tag2"));
+    }
+
     public void dockerfileNotInBaseDirectory() throws Exception {
         File baseDirectory = fileFromBuildTestResource("dockerfileNotInBaseDirectory");
         File dockerfile = fileFromBuildTestResource("dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile");
diff --git a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
index f567dcfc8..55dcf353b 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
@@ -7,13 +7,16 @@
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.containsInAnyOrder;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
@@ -279,6 +282,28 @@ public void labels() throws Exception {
         assertThat(inspectImageResponse.getConfig().getLabels().get("test"), equalTo("abc"));
     }
 
+    @Test
+    public void multipleTags() throws Exception {
+        if (!getVersion(dockerClient).isGreaterOrEqual(RemoteApiVersion.VERSION_1_21)) {
+            throw new SkipException("API version should be >= 1.21");
+        }
+
+        File baseDir = fileFromBuildTestResource("labels");
+
+        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true)
+                .withTag("fallback-when-withTags-not-called")
+                .withTags(new HashSet<>(Arrays.asList("docker-java-test:tag1", "docker-java-test:tag2")))
+                .exec(new BuildImageResultCallback())
+                .awaitImageId();
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        assertThat(inspectImageResponse, not(nullValue()));
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+        assertThat(inspectImageResponse.getRepoTags().size(), equalTo(2));
+        assertThat(inspectImageResponse.getRepoTags(), containsInAnyOrder("docker-java-test:tag1", "docker-java-test:tag2"));
+    }
+
     public void dockerfileNotInBaseDirectory() throws Exception {
         File baseDirectory = fileFromBuildTestResource("dockerfileNotInBaseDirectory");
         File dockerfile = fileFromBuildTestResource("dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile");

From e5e674a73199633ed05817d4283ec9e160c8ec0d Mon Sep 17 00:00:00 2001
From: kannan-ca <kannan@ca.ibm.com>
Date: Thu, 11 May 2017 17:05:01 -0400
Subject: [PATCH 0717/1272] Docker API update to 1.25 and support for
 cache-from command as part of the docker build

---
 .../dockerjava/api/command/BuildImageCmd.java | 11 +++++++++
 .../dockerjava/core/RemoteApiVersion.java     |  6 +++++
 .../core/command/BuildImageCmdImpl.java       | 13 ++++++++++
 .../dockerjava/jaxrs/BuildImageCmdExec.java   |  6 +++++
 .../netty/exec/BuildImageCmdExec.java         |  8 ++++++-
 .../core/command/BuildImageCmdImplTest.java   | 24 +++++++++++++++++++
 .../netty/exec/BuildImageCmdExecTest.java     | 23 ++++++++++++++++++
 7 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 2a08f4cf5..59a0d2077 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -50,6 +50,12 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     @CheckForNull
     Set<String> getTags();
 
+    /**
+     * "Cache-from" in API
+     */
+    @CheckForNull
+    Set<String> getCacheFrom();
+
     /**
      * "remote" in API
      */
@@ -130,6 +136,11 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     BuildImageCmd withTags(Set<String> tags);
 
+    /*
+     * @since {@link RemoteApiVersion#VERSION_1_25}
+     */
+    BuildImageCmd withCacheFrom(Set<String> cacheFrom);
+
     BuildImageCmd withRemote(URI remote);
 
     BuildImageCmd withBaseDirectory(File baseDirectory);
diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index f40b5b4d5..44c4f0237 100644
--- a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -72,6 +72,12 @@ public class RemoteApiVersion implements Serializable {
      */
     public static final RemoteApiVersion VERSION_1_24 = RemoteApiVersion.create(1, 24);
 
+    /*
+     * @see <a href="https://docs.docker.com/engine/api/v1.25/">Docker API 1.25</a>
+     */
+    public static final RemoteApiVersion VERSION_1_25 = RemoteApiVersion.create(1, 25);
+
+
     /**
      * Unknown, docker doesn't reflect reality. I.e. we implemented method, but for javadoc it not clear when it was added.
      */
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index fedd8bf98..cb9e81a39 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -30,6 +30,8 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR
 
     private Set<String> tags;
 
+    private Set<String> cacheFrom;
+
     private Boolean noCache;
 
     private Boolean remove = true;
@@ -99,6 +101,11 @@ public Set<String> getTags() {
         return tags;
     }
 
+    @CheckForNull
+    public Set<String> getCacheFrom() {
+       return cacheFrom;
+    }
+
     @Override
     public URI getRemote() {
         return remote;
@@ -209,6 +216,12 @@ public BuildImageCmd withTags(Set<String> tags) {
         return this;
     }
 
+    @Override
+    public BuildImageCmd withCacheFrom(Set<String> cacheFrom) {
+        this.cacheFrom = cacheFrom;
+        return this;
+    }
+
     @Override
     public BuildImageCmd withRemote(URI remote) {
         this.remote = remote;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index ae2302b0d..7ce132963 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -75,6 +75,12 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
             webTarget = webTarget.queryParam("t", command.getTag());
         }
 
+        if (command.getCacheFrom() != null) {
+            for (String c: command.getCacheFrom()) {
+               webTarget = webTarget.queryParam("cachefrom", c);
+            }
+        }
+
         if (command.getRemote() != null) {
             webTarget = webTarget.queryParam("remote", command.getRemote().toString());
         }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
index bbca686e0..321ae63c1 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
@@ -55,7 +55,13 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
         if (command.getTags() != null && !command.getTags().isEmpty()) {
             webTarget = webTarget.queryParamsSet("t", command.getTags());
         } else if (isNotBlank(command.getTag())) {
-            webTarget = webTarget.queryParam("t", command.getTags());
+            webTarget = webTarget.queryParam("t", command.getTag());
+        }
+
+        if (command.getCacheFrom() != null) {
+            for (String c: command.getCacheFrom()) {
+               webTarget = webTarget.queryParam("cachefrom", c);
+            }
         }
 
         if (command.getRemote() != null) {
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index a655af126..20ac2b62d 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -312,6 +312,30 @@ public void multipleTags() throws Exception {
         assertThat(inspectImageResponse.getRepoTags().size(), equalTo(2));
         assertThat(inspectImageResponse.getRepoTags(), containsInAnyOrder("docker-java-test:tag1", "docker-java-test:tag2"));
     }
+    
+    @Test
+    public void cacheFrom() throws Exception {
+    	if (!getVersion(dockerClient).isGreaterOrEqual(RemoteApiVersion.VERSION_1_25)) {
+    		throw new SkipException("API version should be >= 1.25");
+    	}
+    	File baseDir1 = fileFromBuildTestResource("CacheFrom/test1");
+    	String imageId1 = dockerClient.buildImageCmd(baseDir1)
+    			.exec(new BuildImageResultCallback())
+    			.awaitImageId();
+    	InspectImageResponse inspectImageResponse1 = dockerClient.inspectImageCmd(imageId1).exec();
+    	assertThat(inspectImageResponse1, not(nullValue()));
+    	
+    	File baseDir2 = fileFromBuildTestResource("CacheFrom/test2");
+    	String imageId2 = dockerClient.buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(imageId1)))
+    			.exec(new BuildImageResultCallback())
+    			.awaitImageId();
+    	InspectImageResponse inspectImageResponse2 = dockerClient.inspectImageCmd(imageId2).exec();
+    	assertThat(inspectImageResponse2, not(nullValue()));
+    	
+    	// Compare whether the image2's parent layer is from image1 so that cache is used
+    	assertThat(inspectImageResponse2.getParent(), equalTo(inspectImageResponse1.getId()));
+    			
+    }
 
     public void dockerfileNotInBaseDirectory() throws Exception {
         File baseDirectory = fileFromBuildTestResource("dockerfileNotInBaseDirectory");
diff --git a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
index b5df27d37..54ede31dd 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
@@ -318,6 +318,29 @@ public void multipleTags() throws Exception {
         assertThat(inspectImageResponse.getRepoTags(), containsInAnyOrder("docker-java-test:tag1", "docker-java-test:tag2"));
     }
 
+    @Test
+    public void cacheFrom() throws Exception {
+    	if (!getVersion(dockerClient).isGreaterOrEqual(RemoteApiVersion.VERSION_1_25)) {
+    		throw new SkipException("API version should be >= 1.25");
+    	}
+    	File baseDir1 = fileFromBuildTestResource("CacheFrom/test1");
+    	String imageId1 = dockerClient.buildImageCmd(baseDir1)
+    			.exec(new BuildImageResultCallback())
+    			.awaitImageId();
+    	InspectImageResponse inspectImageResponse1 = dockerClient.inspectImageCmd(imageId1).exec();
+    	assertThat(inspectImageResponse1, not(nullValue()));
+    	
+    	File baseDir2 = fileFromBuildTestResource("CacheFrom/test2");
+    	String imageId2 = dockerClient.buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(imageId1)))
+    			.exec(new BuildImageResultCallback())
+    			.awaitImageId();
+    	InspectImageResponse inspectImageResponse2 = dockerClient.inspectImageCmd(imageId2).exec();
+    	assertThat(inspectImageResponse2, not(nullValue()));
+    	
+    	// Compare whether the image2's parent layer is from image1 so that cache is used
+    	assertThat(inspectImageResponse2.getParent(), equalTo(inspectImageResponse1.getId()));    			
+    }
+
     public void dockerfileNotInBaseDirectory() throws Exception {
         File baseDirectory = fileFromBuildTestResource("dockerfileNotInBaseDirectory");
         File dockerfile = fileFromBuildTestResource("dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile");

From 05a9a74d55fd321ac2285170a56e330306c3c207 Mon Sep 17 00:00:00 2001
From: kannan-ca <kannan@ca.ibm.com>
Date: Wed, 17 May 2017 10:05:05 -0400
Subject: [PATCH 0718/1272] Used existing queryParamSet method

---
 .../com/github/dockerjava/netty/exec/BuildImageCmdExec.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
index 321ae63c1..a99dac833 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
@@ -58,10 +58,8 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
             webTarget = webTarget.queryParam("t", command.getTag());
         }
 
-        if (command.getCacheFrom() != null) {
-            for (String c: command.getCacheFrom()) {
-               webTarget = webTarget.queryParam("cachefrom", c);
-            }
+        if (command.getCacheFrom() != null && !command.getCacheFrom().isEmpty()) {
+            webTarget = webTarget.queryParamsSet("cachefrom", command.getCacheFrom());
         }
 
         if (command.getRemote() != null) {

From 5444f05f88b97c4a2963964eb400678910e92e89 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 17 May 2017 19:30:07 +0300
Subject: [PATCH 0719/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84f2b27d9..d2da1378a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ Change Log
  
  
 ## 3.0.10
+- Support for cache-from in build image command
+- Allow multiple tags in build image command 
 - Custom `db` logging type 
 - Allow an explicit Dockerfile location string to be specified to theuild command
 - Fix image build for docker 17 with 'tagged' word.

From b014f26dce76e67e6c133c36079154a710e3c838 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 17 May 2017 20:01:38 +0300
Subject: [PATCH 0720/1272] [maven-release-plugin] prepare release 3.0.10

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8933bad62..0ba096dc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.10-SNAPSHOT</version>
+	<version>3.0.10</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.0.10</tag>
 	</scm>
 
 	<developers>

From a14ace4f972a3de4cac3ddc3cb0f7006f629cfdf Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 17 May 2017 20:01:49 +0300
Subject: [PATCH 0721/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0ba096dc5..10fad3860 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.10</version>
+	<version>3.0.11-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.0.10</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 342feb6f9cd2d3a7d17cf56b36aff6ad6fa02ad3 Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Tue, 23 May 2017 14:51:22 +0800
Subject: [PATCH 0722/1272] ignore application/x-tar

---
 .../github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
index 2251d8fad..36256fca0 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
@@ -24,6 +24,7 @@ public class SelectiveLoggingFilter extends LoggingFilter {
         Set<String> s = new HashSet<String>();
         s.add(MediaType.APPLICATION_OCTET_STREAM);
         s.add("application/tar");
+        s.add("application/x-tar");
         SKIPPED_CONTENT = Collections.unmodifiableSet(s);
     }
 

From c44eba80e7742195e78351ed1bf35452066ff4f1 Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Tue, 23 May 2017 21:40:06 +0800
Subject: [PATCH 0723/1272] allow user to call connectionManager's
 closeIdleConnections

---
 .../jaxrs/JerseyDockerCmdExecFactory.java           | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
index 4b7f2f67e..1d9d65f0a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -9,6 +9,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.SSLContext;
 import javax.ws.rs.client.Client;
@@ -266,7 +267,7 @@ private void configureProxy(ClientConfig clientConfig, URI originalUri, String p
     }
 
     private org.apache.http.config.Registry<ConnectionSocketFactory> getSchemeRegistry(final URI originalUri,
-            SSLContext sslContext) {
+                                                                                       SSLContext sslContext) {
         RegistryBuilder<ConnectionSocketFactory> registryBuilder = RegistryBuilder.create();
         registryBuilder.register("http", PlainConnectionSocketFactory.getSocketFactory());
         if (sslContext != null) {
@@ -589,4 +590,14 @@ public JerseyDockerCmdExecFactory withClientRequestFilters(ClientRequestFilter..
         return this;
     }
 
+
+    /**
+     * release connections from the pool
+     *
+     * @param idleSeconds idle seconds, longer than the configured value will be evicted
+     */
+    public void releaseConnection(long idleSeconds) {
+        this.connManager.closeExpiredConnections();
+        this.connManager.closeIdleConnections(idleSeconds, TimeUnit.SECONDS);
+    }
 }

From d700d721c13de2fd5b60c4e8db107652aa614843 Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Thu, 18 May 2017 19:16:16 +0800
Subject: [PATCH 0724/1272] add labels and attachable properties to network

---
 .../api/command/CreateNetworkCmd.java         | 20 ++++++++++
 .../github/dockerjava/api/model/Network.java  | 25 +++++++++++++
 .../core/command/CreateNetworkCmdImpl.java    | 37 +++++++++++++++++++
 .../command/CreateContainerCmdImplTest.java   | 24 ++++++++++++
 .../command/CreateNetworkCmdImplTest.java     | 34 +++++++++++++++++
 5 files changed, 140 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
index 39989bd13..298e05aca 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
@@ -36,6 +36,12 @@ public interface CreateNetworkCmd extends SyncDockerCmd<CreateNetworkResponse> {
     @CheckForNull
     Boolean getEnableIPv6();
 
+    @CheckForNull
+    Boolean getAttachable();
+
+    @CheckForNull
+    Map<String, String> getLabels();
+
     /** The new network's name. Required. */
     CreateNetworkCmd withName(@Nonnull String name);
 
@@ -54,6 +60,20 @@ public interface CreateNetworkCmd extends SyncDockerCmd<CreateNetworkResponse> {
 
     CreateNetworkCmd withEnableIpv6(boolean enableIpv6);
 
+    /**
+     * If enabled, and the network is in the global scope,  non-service containers on worker nodes will be able to connect to the network.
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_21}
+     */
+    CreateNetworkCmd withAttachable(Boolean attachable);
+
+    /**
+     * Add label for network
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_24}
+     */
+    CreateNetworkCmd withLabels(Map<String, String> labels);
+
     interface Exec extends DockerCmdSyncExec<CreateNetworkCmd, CreateNetworkResponse> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Network.java b/src/main/java/com/github/dockerjava/api/model/Network.java
index c0f9f36eb..2a532f88c 100644
--- a/src/main/java/com/github/dockerjava/api/model/Network.java
+++ b/src/main/java/com/github/dockerjava/api/model/Network.java
@@ -37,6 +37,12 @@ public class Network implements Serializable {
     @JsonProperty("Options")
     private Map<String, String> options;
 
+    @JsonProperty("Attachable")
+    private Boolean attachable;
+
+    @JsonProperty("Labels")
+    public Map<String, String> labels;
+
     public String getId() {
         return id;
     }
@@ -65,6 +71,14 @@ public Map<String, String> getOptions() {
         return options;
     }
 
+    public Boolean isAttachable() {
+        return attachable;
+    }
+
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
@@ -158,6 +172,9 @@ public static class Config {
             @JsonProperty("Gateway")
             private String gateway;
 
+            @JsonProperty("NetworkID")
+            private String networkID;
+
             public String getSubnet() {
                 return subnet;
             }
@@ -184,6 +201,14 @@ public Config withGateway(String gateway) {
                 this.gateway = gateway;
                 return this;
             }
+
+            public String getNetworkID() {
+                return networkID;
+            }
+
+            public void setNetworkID(String networkID) {
+                this.networkID = networkID;
+            }
         }
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
index 834aa6905..e6cff4c09 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
@@ -10,6 +10,8 @@
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.api.model.Network.Ipam;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 public class CreateNetworkCmdImpl extends AbstrDockerCmd<CreateNetworkCmd, CreateNetworkResponse>
         implements CreateNetworkCmd {
 
@@ -34,6 +36,12 @@ public class CreateNetworkCmdImpl extends AbstrDockerCmd<CreateNetworkCmd, Creat
     @JsonProperty("EnableIPv6")
     private Boolean enableIpv6;
 
+    @JsonProperty("Attachable")
+    private Boolean attachable;
+
+    @JsonProperty("Labels")
+    private Map<String, String> labels;
+
     public CreateNetworkCmdImpl(DockerCmdSyncExec<CreateNetworkCmd, CreateNetworkResponse> execution) {
         super(execution);
     }
@@ -114,4 +122,33 @@ public CreateNetworkCmd withEnableIpv6(boolean enableIpv6) {
         this.enableIpv6 = enableIpv6;
         return this;
     }
+
+    @Override
+    public Boolean getAttachable() {
+        return this.attachable;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public CreateNetworkCmd withAttachable(Boolean attachable) {
+        this.attachable = attachable;
+        return this;
+    }
+
+    @Override
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public CreateNetworkCmd withLabels(Map<String, String> labels) {
+        checkNotNull(labels, "labels was not specified");
+        this.labels = labels;
+        return this;
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 7c625ea94..53c9d9ad0 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -777,4 +777,28 @@ public void createContainerWithShmPidsLimit() throws DockerException {
 
         assertThat(inspectContainerResponse.getHostConfig().getPidsLimit(), is(hostConfig.getPidsLimit()));
     }
+
+    @Test
+    public void createContainerWithNetworkID() {
+        final RemoteApiVersion apiVersion = getVersion(dockerClient);
+        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_24)) {
+            throw new SkipException("API version should be >= 1.24");
+        }
+        String networkName = "net-" + UUID.randomUUID().toString();
+        Map<String,String> labels=new HashMap<>();
+        labels.put("com.example.label","test");
+        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName)
+                .withLabels(labels).withAttachable(true).exec();
+        String networkId = createNetworkResponse.getId();
+        CreateContainerResponse createContainerResponse = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withLabels(labels).withCmd("true").exec();
+        String containerId = createContainerResponse.getId();
+        dockerClient.connectToNetworkCmd().withContainerId(containerId).withNetworkId(networkId).exec();
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(containerId).exec();
+        ContainerNetwork containerNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get(networkName);
+        if(containerNetwork==null){
+            // swarm node used network id
+            containerNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get(networkId);
+        }
+        assertThat(containerNetwork, notNullValue());
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
index cc70331f2..7dae2e1d6 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
@@ -4,7 +4,9 @@
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.client.AbstractDockerClientTest;
+import com.github.dockerjava.core.RemoteApiVersion;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -12,6 +14,10 @@
 import org.testng.annotations.Test;
 
 import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.github.dockerjava.utils.TestUtils.getVersion;
 
 @Test(groups = "integration")
 public class CreateNetworkCmdImplTest extends AbstractDockerClientTest {
@@ -64,4 +70,32 @@ public void createNetworkWithIpamConfig() throws DockerException {
         assertEquals(network.getDriver(), "bridge");
         assertEquals("10.67.79.0/24", network.getIpam().getConfig().iterator().next().getSubnet());
     }
+
+    @Test
+    public void createAttachableNetwork() throws DockerException {
+        final RemoteApiVersion apiVersion = getVersion(dockerClient);
+        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_24)) {
+            throw new SkipException("API version should be >= 1.24");
+        }
+        String networkName = "createAttachableNetwork";
+        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).withAttachable(true).exec();
+        assertNotNull(createNetworkResponse.getId());
+        Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
+        assertTrue(network.isAttachable());
+    }
+
+    @Test
+    public void createNetworkWithLabel() throws DockerException {
+        final RemoteApiVersion apiVersion = getVersion(dockerClient);
+        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_21)) {
+            throw new SkipException("API version should be >= 1.21");
+        }
+        String networkName = "createNetworkWithLabel";
+        Map<String,String> labels=new HashMap<>();
+        labels.put("com.example.usage","test");
+        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).withLabels(labels).exec();
+        assertNotNull(createNetworkResponse.getId());
+        Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
+        assertEquals(network.getLabels(), labels);
+    }
 }

From a9b78cc4f5ec45c0bdeec2e68136f8a59b96b1c3 Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Tue, 23 May 2017 18:14:36 +0800
Subject: [PATCH 0725/1272] clean tmp file after upload

---
 .idea/codeStyleSettings.xml                   |  1 +
 .../CopyArchiveToContainerCmdImpl.java        | 30 ++++++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 6f3c789b4..9e5672189 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -5,6 +5,7 @@
       <value>
         <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />
         <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />
+        <option name="RIGHT_MARGIN" value="140" />
       </value>
     </option>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
diff --git a/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
index 0f734fde9..63e91e88e 100644
--- a/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
@@ -112,12 +112,6 @@ public String toString() {
                 .append(remotePath).toString();
     }
 
-    private InputStream buildUploadStream(String hostResource, boolean dirChildrenOnly) throws IOException {
-        Path toUpload = Files.createTempFile("docker-java", ".tar.gz");
-        CompressArchiveUtil.tar(Paths.get(hostResource), toUpload, true, dirChildrenOnly);
-        return Files.newInputStream(toUpload);
-    }
-
     /**
      * @throws com.github.dockerjava.api.exception.NotFoundException
      *             No such container
@@ -130,16 +124,30 @@ public Void exec() throws NotFoundException {
                 throw new DockerClientException(
                         "Only one of host resource or tar input stream should be defined to perform the copy, not both");
             }
-            // We compress the given path, call exec so that the stream is consumed and then close it our self
-            try (InputStream uploadStream = buildUploadStream(this.hostResource, this.dirChildrenOnly)) {
+            // create TAR package for the given path so docker can consume it
+            Path toUpload = null;
+            try {
+                toUpload = Files.createTempFile("docker-java", ".tar.gz");
+                CompressArchiveUtil.tar(Paths.get(hostResource), toUpload, true, dirChildrenOnly);
+            } catch (IOException createFileIOException) {
+                if (toUpload != null) {
+                    // remove tmp docker-javaxxx.tar.gz
+                    toUpload.toFile().delete();
+                }
+                throw new DockerClientException("Unable to perform tar on host resource " + this.hostResource, createFileIOException);
+            }
+            // send the tar stream, call exec so that the stream is consumed and then closed by try-with-resources
+            try (InputStream uploadStream = Files.newInputStream(toUpload)) {
                 this.tarInputStream = uploadStream;
                 return super.exec();
             } catch (IOException e) {
-                throw new DockerClientException("Unable to perform tar on host resource " + this.hostResource, e);
+                throw new DockerClientException("Unable to read temp file " + toUpload.toFile().getAbsolutePath(), e);
+            } finally {
+                // remove tmp docker-javaxxx.tar.gz
+                toUpload.toFile().delete();
             }
         } else if (this.tarInputStream == null) {
-            throw new DockerClientException(
-                    "One of host resource or tar input stream must be defined to perform the copy");
+            throw new DockerClientException("One of host resource or tar input stream must be defined to perform the copy");
         }
         // User set a stream, so we will just consume it and let the user close it by him self
         return super.exec();

From abf4743efa10e60c2bb9fadcefa6460011ed9fa0 Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Sat, 3 Jun 2017 13:03:42 +0800
Subject: [PATCH 0726/1272] set default socket timeout for RequestConfig

---
 .../dockerjava/jaxrs/JerseyDockerCmdExecFactory.java      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
index 1d9d65f0a..1ec3fbca0 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -134,15 +134,17 @@ public void init(DockerClientConfig dockerClientConfig) {
         clientConfig.register(ResponseStatusExceptionFilter.class);
         clientConfig.register(JsonClientFilter.class);
         clientConfig.register(JacksonJsonProvider.class);
-
+        RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
         // logging may disabled via log level
         clientConfig.register(new SelectiveLoggingFilter(LOGGER, true));
 
         if (readTimeout != null) {
+            requestConfigBuilder.setSocketTimeout(readTimeout);
             clientConfig.property(ClientProperties.READ_TIMEOUT, readTimeout);
         }
 
         if (connectTimeout != null) {
+            requestConfigBuilder.setConnectTimeout(connectTimeout);
             clientConfig.property(ClientProperties.CONNECT_TIMEOUT, connectTimeout);
         }
 
@@ -221,9 +223,9 @@ public void shutdown() {
 
         // Configure connection pool timeout
         if (connectionRequestTimeout != null) {
-            clientConfig.property(ApacheClientProperties.REQUEST_CONFIG, RequestConfig.custom()
-                    .setConnectionRequestTimeout(connectionRequestTimeout).build());
+            requestConfigBuilder.setConnectionRequestTimeout(connectionRequestTimeout);
         }
+        clientConfig.property(ApacheClientProperties.REQUEST_CONFIG, requestConfigBuilder.build());
         ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(clientConfig);
 
         if (sslContext != null) {

From 79932b0f2072433e7b0768a5d13731d0199689f9 Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Sat, 3 Jun 2017 20:16:52 +0800
Subject: [PATCH 0727/1272] skip instead of throw error on non-linux os

---
 .../dockerjava/netty/exec/AttachContainerCmdExecTest.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
index 66219dc72..7cbb17fc0 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
@@ -10,8 +10,10 @@
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.lang.reflect.Method;
+import java.util.Locale;
 
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -30,6 +32,10 @@ public class AttachContainerCmdExecTest extends AbstractNettyDockerClientTest {
 
     @BeforeTest
     public void beforeTest() throws Exception {
+        // io.netty.channel.epollNative#loadNativeLibrary only support Linux
+        if (!System.getProperty("os.name").toLowerCase(Locale.UK).trim().startsWith("linux")) {
+            throw new SkipException("only support Linux");
+        }
         super.beforeTest();
     }
 

From f9a8c46e8494743820c9f0e9c8a406ca98ee80a9 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 9 Jun 2017 18:14:15 +0300
Subject: [PATCH 0728/1272] Create README.md

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d0afc8506..6f5c3a689 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,8 @@ Supports a subset of the Docker Remote API [v1.23](https://github.com/docker/doc
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>3.0.6</version>
+          <!-- use latest version https://github.com/docker-java/docker-java/releases -->
+          <version>3.X.Y</version>
     </dependency>
     
 ### Latest development version
@@ -67,7 +68,7 @@ You can find the latest development version including javadoc and source files o
     <dependency>
           <groupId>com.github.docker-java</groupId>
           <artifactId>docker-java</artifactId>
-          <version>3.0.7-SNAPSHOT</version>
+          <version>3.X.Y-SNAPSHOT</version>
     </dependency>
     
 

From a9e6106067919e4cdcc402c6f66e783f78a9e8a3 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 28 Jun 2017 02:00:21 +0300
Subject: [PATCH 0729/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2da1378a..cbb3b155f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@ Change Log
 ===
 ## (dev) 3.1.0 (reserverd for swarm features)
  
+## 3.0.11
+- Add labels and attachable properties to network.
+- Set default socket timeout for RequestConfig.
+- Netty skip instead of throw error on non-linux os.
+- Clean tmp file after upload.
+- Filters ignore application/x-tar.
+- Allow user to call connectionManager's closeIdleConnections.
  
 ## 3.0.10
 - Support for cache-from in build image command

From 62ff5fdbb0ea0a52bc460318fcbbf09b3de16ea9 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 28 Jun 2017 02:09:58 +0300
Subject: [PATCH 0730/1272] [maven-release-plugin] prepare release 3.0.11

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 10fad3860..b54160f26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.11-SNAPSHOT</version>
+	<version>3.0.11</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.0.11</tag>
 	</scm>
 
 	<developers>

From a2b819a9c4c4dd0ff1e5daceb11cb7a86b01c5f8 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 28 Jun 2017 02:10:07 +0300
Subject: [PATCH 0731/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b54160f26..d81bbef9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.11</version>
+	<version>3.0.12-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.0.11</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 2f286772e6048a7e1afe7a8db2e2efbc97006e42 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 28 Jun 2017 03:21:22 +0300
Subject: [PATCH 0732/1272] try more versions

---
 .travis.yml                      | 25 +++++----
 .travis/travis-before-install.sh | 87 ++++++++++++++++++++++++++++++--
 2 files changed, 97 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index eaf11b514..bef44ea4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,12 +6,13 @@ services:
   - docker
 
 jdk:
- - oraclejdk7
+ - oraclejdk8
 
 install: true
 
 env:
   global:
+    - CODECOV=true
     - DOCKER_TLS_VERIFY=""
     # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
     #   via the "travis encrypt" command using the project repo's public key
@@ -21,14 +22,16 @@ env:
     - COVERITY_SCAN_NOTIFICATION_EMAIL="kanstantsin.sha@gmail.com"
 
   matrix:
-#    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.13.1-0~ubuntu-trusty" CODECOV=true
-#    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.13.1-0~ubuntu-trusty" CODECOV=true
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.12.6-0~ubuntu-trusty"  DEPLOY=true COVERITY=true CODECOV=true
-    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.12.6-0~ubuntu-trusty" CODECOV=true
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty" CODECOV=true
-    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty" CODECOV=true
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.10.3-0~trusty" CODECOV=true
-    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.10.3-0~trusty" CODECOV=true
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" DEPLOY=true COVERITY=true
+    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty"
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.13.1-0~ubuntu-trusty"
+    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.13.1-0~ubuntu-trusty"
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.12.6-0~ubuntu-trusty"
+    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.12.6-0~ubuntu-trusty"
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty"
+    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty"
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.10.3-0~trusty"
+    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.10.3-0~trusty"
 #    - repo="testing" DOCKER_HOST="tcp://127.0.0.1:2375"
 #    - repo="testing" DOCKER_HOST="unix:///var/run/docker.sock"
 #    - repo="experimental" DOCKER_HOST="tcp://127.0.0.1:2375"
@@ -50,5 +53,5 @@ script:
 after_success:
   - ./.travis/travis-after-success.sh
 
-after_script:
-  - sudo cat /var/log/upstart/docker.log
+#after_script:
+#  - sudo cat /var/log/upstart/docker.log
diff --git a/.travis/travis-before-install.sh b/.travis/travis-before-install.sh
index 6935f7a7d..113cd823b 100755
--- a/.travis/travis-before-install.sh
+++ b/.travis/travis-before-install.sh
@@ -1,19 +1,32 @@
 #!/usr/bin/env bash
 
+SWARM_VERSION="${SWARM_VERSION:-}"
+FAST_BUILD="${FAST_BUILD:-}"
 
+## fix coverity issue
 sudo apt-get install -y -q ca-certificates
-
-export HOST_PORT=2375
 echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-certificates.crt
+##
 
-
-if [ "$FAST_BUILD" == true ]; then
+if [ "$FAST_BUILD" == "true" ]; then
     echo "Fast build, skipping docker installations."
     exit 0
 fi
 
 set -exu
 
+sudo ip a ls
+sudo ip r ls
+sudo ss -antpl
+
+export HOST_PORT="2375"
+export SWARM_PORT="2377"
+export HOST_IP="$(ip a show dev eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)"
+# because of swarm use docker-engine directly
+export PRE_DOCKER_HOST="$DOCKER_HOST"
+export DOCKER_HOST="tcp://127.0.0.1:${HOST_PORT}"
+
+
 docker info
 docker version
 
@@ -89,3 +102,69 @@ registry.email=${registry_email}
 registry.url=https://index.docker.io/v1/
 
 EOF
+
+if [[ -n $SWARM_VERSION ]]; then
+#    export SWARM_PORT="${PRE_DOCKER_HOST##*:}"
+
+    docker pull swarm
+
+#    # kv store https://docs.docker.com/v1.11/engine/userguide/networking/get-started-overlay/
+#    docker run -d \
+#        -p "8500:8500" \
+#        -h "consul" \
+#        --name=consul \
+#        progrium/consul -server -bootstrap
+#
+#    sleep 5
+
+#    SWARM_TOKEN=$(docker run swarm c)
+
+#    docker run \
+#        -d \
+#        --name=swarm_manager \
+#        -p ${SWARM_PORT}:2375 \
+#        "swarm:${SWARM_VERSION}" \
+#        manage token://${SWARM_TOKEN}
+
+    docker run \
+        -d \
+        -p ${SWARM_PORT}:2375 \
+        --name=swarm_manager \
+        swarm manage --engine-refresh-min-interval "3s" --engine-refresh-max-interval "6s" "nodes://${HOST_IP}:${HOST_PORT}"
+#        swarm manage --engine-refresh-min-interval "3s" --engine-refresh-max-interval "6s" "consul://${HOST_IP}:8500"
+
+    # join engine to swarm
+    docker run \
+        -d \
+        "--name=swarm_join" \
+        "swarm:${SWARM_VERSION}" \
+        join --advertise="${HOST_IP}:${HOST_PORT}" --delay="0s" --heartbeat "5s" "nodes://${HOST_IP}:${HOST_PORT}"
+#        join --advertise="${HOST_IP}:${HOST_PORT}" --delay="0s" --heartbeat "5s" "token://${SWARM_TOKEN}"
+
+    docker run --rm \
+        "swarm:${SWARM_VERSION}" list "nodes://${HOST_IP}:${HOST_PORT}"
+
+    docker ps -a
+    sudo ss -antpl
+
+    sleep 30
+
+    docker logs swarm_join
+    docker logs swarm_manager
+#    docker logs consul
+
+    # switch to swarm connection
+    DOCKER_HOST="$PRE_DOCKER_HOST"
+
+    docker version
+    docker info
+
+    NODES=$(docker info | grep "Nodes:" | awk '{ print $2 }')
+    if [[ $NODES -eq "0" ]]; then
+        echo "Swarm didn't connect"
+        exit 1
+    fi
+
+    # test via swarm
+    docker pull busybox
+fi

From 23d7e80bc1bda61cb8a555cfb4cab8b3cb1099ba Mon Sep 17 00:00:00 2001
From: David Leischnig <david.leischnig@xcom.de>
Date: Wed, 31 May 2017 16:12:55 +0200
Subject: [PATCH 0733/1272] fix(#806): filter config.json before unmarshalling

As ObjectMapper expects all propeties of json content to match AuthConfig it fails on any other
like "credStore" or "HttpHeaders". As only "auths" is used the json is mapped to ObjectNode so
we can remove any other property. The content of this filtered node can be used as source for
unmarshalling AuthConfig.
---
 .../dockerjava/core/AuthConfigFile.java       | 26 +++++++++++++++----
 .../dockerjava/core/AuthConfigFileTest.java   | 15 ++++++++++-
 .../command/ListContainersCmdImplTest.java    |  3 ---
 .../netty/exec/ListContainersCmdExecTest.java | 23 +++++++++-------
 .../resources/testAuthConfigFile/validJson    |  1 -
 .../testAuthConfigFile/validJson.json         | 10 +++++++
 .../validJsonWithUnknown.json                 | 12 +++++++++
 7 files changed, 70 insertions(+), 20 deletions(-)
 delete mode 100644 src/test/resources/testAuthConfigFile/validJson
 create mode 100644 src/test/resources/testAuthConfigFile/validJson.json
 create mode 100644 src/test/resources/testAuthConfigFile/validJsonWithUnknown.json

diff --git a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
index 539ac7f75..1b61ff6e0 100644
--- a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
+++ b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
@@ -13,6 +13,7 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
 
@@ -26,11 +27,12 @@ public class AuthConfigFile {
     private static final TypeReference<Map<String, Map<String, AuthConfig>>> CONFIG_JSON_MAP_TYPE =
         new TypeReference<Map<String, Map<String, AuthConfig>>>() {
         };
+    private static final String AUTHS_PROPERTY = "auths";
 
     private final Map<String, AuthConfig> authConfigMap;
 
     public AuthConfigFile() {
-        authConfigMap = new HashMap<String, AuthConfig>();
+        authConfigMap = new HashMap<>();
     }
 
     void addConfig(AuthConfig config) {
@@ -114,10 +116,12 @@ public static AuthConfigFile loadConfig(File confFile) throws IOException {
          */
         try {
             // try registry version 2
-            Map<String, Map<String, AuthConfig>>  configJson = MAPPER.readValue(confFile, CONFIG_JSON_MAP_TYPE);
-            if (configJson != null) {
-                configMap = configJson.get("auths");
+            final ObjectNode node = filterNonAuthsFromJSON(confFile);
+            Map<String, Map<String, AuthConfig>>  configJson = MAPPER.convertValue(node, CONFIG_JSON_MAP_TYPE);
+            if (configJson != null && !configJson.isEmpty()) {
+                configMap = configJson.get(AUTHS_PROPERTY);
             }
+
         } catch (IOException e1) {
             try {
                 // try registry version 1
@@ -130,7 +134,10 @@ public static AuthConfigFile loadConfig(File confFile) throws IOException {
         if (configMap != null) {
             for (Map.Entry<String, AuthConfig> entry : configMap.entrySet()) {
                 AuthConfig authConfig = entry.getValue();
-                decodeAuth(authConfig.getAuth(), authConfig);
+                final String auth = authConfig.getAuth();
+                if (auth == null) continue;
+
+                decodeAuth(auth, authConfig);
                 authConfig.withAuth(null);
                 authConfig.withRegistryAddress(entry.getKey());
                 configFile.addConfig(authConfig);
@@ -158,6 +165,15 @@ public static AuthConfigFile loadConfig(File confFile) throws IOException {
 
     }
 
+    private static ObjectNode filterNonAuthsFromJSON(final File confFile) throws IOException {
+        final ObjectNode node = MAPPER.readValue(confFile, ObjectNode.class);
+        if (!node.has(AUTHS_PROPERTY)) {
+            throw new IOException("No Auth Config contained");
+        }
+        node.retain(AUTHS_PROPERTY);
+        return node;
+    }
+
     static void decodeAuth(String auth, AuthConfig config) throws IOException {
         String str = new String(Base64.decodeBase64(auth), Charset.forName("UTF-8"));
         String[] parts = str.split(":", 2);
diff --git a/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java b/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java
index 221a926b5..cbb01de08 100644
--- a/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java
+++ b/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java
@@ -64,10 +64,23 @@ public void validJson() throws IOException {
         expected.addConfig(authConfig1);
         expected.addConfig(authConfig2);
 
-        Assert.assertEquals(runTest("validJson"), expected);
+        Assert.assertEquals(runTest("validJson.json"), expected);
 
     }
 
+    @Test
+    public void validJsonWithUnknown() throws IOException {
+        AuthConfig authConfig1 = new AuthConfig()
+                .withEmail("foo@example.com")
+                .withUsername("foo")
+                .withPassword("bar")
+                .withRegistryAddress("quay.io");
+
+        AuthConfigFile expected = new AuthConfigFile();
+        expected.addConfig(authConfig1);
+        runTest("validJsonWithUnknown.json");
+    }
+
     @Test
     public void validLegacy() throws IOException {
         AuthConfig authConfig = new AuthConfig()
diff --git a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
index 7bbfb3945..4b72f8dee 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
@@ -57,9 +57,6 @@ public void testListContainers() throws Exception {
 
         String testImage = "busybox";
 
-        // need to block until image is pulled completely
-        dockerClient.pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess();
-
         List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
         assertThat(containers, notNullValue());
         LOG.info("Container List: {}", containers);
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java
index 40464c6f7..a9d888b58 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java
@@ -59,9 +59,6 @@ public void testListContainers() throws Exception {
 
         String testImage = "busybox";
 
-        // // need to block until image is pulled completely
-        // dockerClient.pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess();
-
         List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
         assertThat(containers, notNullValue());
         LOG.info("Container List: {}", containers);
@@ -107,9 +104,6 @@ public void testListContainersWithLabelsFilter() throws Exception {
 
         String testImage = "busybox";
 
-        // need to block until image is pulled completely
-        dockerClient.pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitCompletion();
-
         List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
         assertThat(containers, notNullValue());
         LOG.info("Container List: {}", containers);
@@ -152,16 +146,25 @@ public void testListContainersWithLabelsFilter() throws Exception {
         Map<String, String> labels = ImmutableMap.of("test", "docker-java");
 
         // list with filter by label
-        dockerClient.createContainerCmd(testImage).withCmd("echo").withLabels(labels).exec();
-        filteredContainers = dockerClient.listContainersCmd().withShowAll(true)
-                .withLabelFilter(labels).exec();
+        dockerClient.createContainerCmd(testImage)
+                .withCmd("echo")
+                .withLabels(labels)
+                .exec();
+
+        filteredContainers = dockerClient.listContainersCmd()
+                .withShowAll(true)
+                .withLabelFilter(labels)
+                .exec();
+
         assertThat(filteredContainers.size(), is(equalTo(1)));
         Container container3 = filteredContainers.get(0);
         assertThat(container3.getCommand(), not(isEmptyString()));
         assertThat(container3.getImage(), startsWith(testImage));
 
         filteredContainers = dockerClient.listContainersCmd().withShowAll(true)
-                .withLabelFilter("test").exec();
+                .withLabelFilter("test")
+                .exec();
+
         assertThat(filteredContainers.size(), is(equalTo(1)));
         container3 = filteredContainers.get(0);
         assertThat(container3.getCommand(), not(isEmptyString()));
diff --git a/src/test/resources/testAuthConfigFile/validJson b/src/test/resources/testAuthConfigFile/validJson
deleted file mode 100644
index 2b47e3822..000000000
--- a/src/test/resources/testAuthConfigFile/validJson
+++ /dev/null
@@ -1 +0,0 @@
-{"quay.io" : { "auth" : "Zm9vOmJhcg==", "email" :"foo@example.com"}, "https://index.docker.io/v1/" : {"auth" : "Zm9vMTpiYXIx", "email" : "moo@example.com"}}
\ No newline at end of file
diff --git a/src/test/resources/testAuthConfigFile/validJson.json b/src/test/resources/testAuthConfigFile/validJson.json
new file mode 100644
index 000000000..c94acce0d
--- /dev/null
+++ b/src/test/resources/testAuthConfigFile/validJson.json
@@ -0,0 +1,10 @@
+{
+  "quay.io": {
+    "auth": "Zm9vOmJhcg==",
+    "email": "foo@example.com"
+  },
+  "https://index.docker.io/v1/": {
+    "auth": "Zm9vMTpiYXIx",
+    "email": "moo@example.com"
+  }
+}
diff --git a/src/test/resources/testAuthConfigFile/validJsonWithUnknown.json b/src/test/resources/testAuthConfigFile/validJsonWithUnknown.json
new file mode 100644
index 000000000..557714668
--- /dev/null
+++ b/src/test/resources/testAuthConfigFile/validJsonWithUnknown.json
@@ -0,0 +1,12 @@
+{
+  "auths": {
+    "192.168.99.100:32768": {},
+    "https://index.docker.io/v1/": {
+      "auth": "Zm9vOmJhcg==",
+      "email": "foo@example.com"
+    }
+  },
+  "HttpHeaders": {
+    "User-Agent": "user agent"
+  }
+}

From 13e4e9f3942ee37d149e3547f1133e350d72544b Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 28 Jun 2017 18:27:14 +0300
Subject: [PATCH 0734/1272] Fix filter double encoding.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Jersey do contextual encoding and doesn’t fail.
Netty impl has fair encoders, so double encoding causing docker to fail.

Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>

Don’t encode filters for netty. Skip memory update.

Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
---
 .../api/command/InspectContainerResponse.java       |  3 ++-
 .../com/github/dockerjava/jaxrs/CommitCmdExec.java  |  9 ++++++---
 .../github/dockerjava/netty/exec/EventsCmdExec.java |  4 +---
 .../netty/exec/ListContainersCmdExec.java           | 13 +++++--------
 .../dockerjava/netty/exec/ListImagesCmdExec.java    |  6 ++----
 .../dockerjava/netty/exec/ListNetworksCmdExec.java  |  4 +---
 .../dockerjava/netty/exec/ListVolumesCmdExec.java   |  4 +---
 .../dockerjava/client/AbstractDockerClientTest.java |  4 ++--
 .../core/command/UpdateContainerCmdImplTest.java    | 12 +++++++-----
 .../dockerjava/netty/exec/CommitCmdExecTest.java    | 10 ++++++----
 .../netty/exec/UpdateContainerCmdExecTest.java      |  9 ++++-----
 11 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index 497aaad2b..cf6d8067a 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -20,6 +20,7 @@
 import com.github.dockerjava.api.model.VolumeRW;
 import com.github.dockerjava.api.model.VolumesRW;
 import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.ToStringStyle;
 
 /**
  *
@@ -217,7 +218,7 @@ public List<String> getExecIds() {
 
     @Override
     public String toString() {
-        return ToStringBuilder.reflectionToString(this);
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 
     @JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
index 9acb4eff5..f9ed0d5df 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
@@ -22,9 +22,12 @@ public CommitCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConf
 
     @Override
     protected String execute(CommitCmd command) {
-        WebTarget webTarget = getBaseResource().path("/commit").queryParam("container", command.getContainerId())
-                .queryParam("repo", command.getRepository()).queryParam("tag", command.getTag())
-                .queryParam("m", command.getMessage()).queryParam("author", command.getAuthor());
+        WebTarget webTarget = getBaseResource().path("/commit")
+                .queryParam("container", command.getContainerId())
+                .queryParam("repo", command.getRepository())
+                .queryParam("tag", command.getTag())
+                .queryParam("m", command.getMessage())
+                .queryParam("author", command.getAuthor());
 
         webTarget = booleanQueryParam(webTarget, "pause", command.hasPauseEnabled());
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/EventsCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/EventsCmdExec.java
index f07230c07..5640bba22 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/EventsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/EventsCmdExec.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.netty.exec;
 
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,7 +27,7 @@ protected Void execute0(EventsCmd command, ResultCallback<Event> resultCallback)
 
         if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget
-                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+                    .queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
         }
 
         LOGGER.trace("GET: {}", webTarget);
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
index e5ab4b66b..79dd49430 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
@@ -1,12 +1,5 @@
 package com.github.dockerjava.netty.exec;
 
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.model.Container;
@@ -14,6 +7,10 @@
 import com.github.dockerjava.core.util.FiltersEncoder;
 import com.github.dockerjava.netty.MediaType;
 import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
 
 public class ListContainersCmdExec extends AbstrSyncDockerCmdExec<ListContainersCmd, List<Container>> implements
         ListContainersCmd.Exec {
@@ -38,7 +35,7 @@ protected List<Container> execute(ListContainersCmd command) {
 
         if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget
-                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+                    .queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
         }
 
         LOGGER.trace("GET: {}", webTarget);
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java
index a1a38add5..27f70c712 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.netty.exec;
 
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
 import java.util.List;
 
 import org.slf4j.Logger;
@@ -30,11 +28,11 @@ protected List<Image> execute(ListImagesCmd command) {
         webTarget = booleanQueryParam(webTarget, "all", command.hasShowAllEnabled());
 
         if (command.getFilters() != null && !command.getFilters().isEmpty()) {
-            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+            webTarget = webTarget.queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
         }
 
        if (command.getImageNameFilter() != null) {
-            webTarget = webTarget.queryParam("filter", urlPathSegmentEscaper().escape(command.getImageNameFilter()));
+            webTarget = webTarget.queryParam("filter", command.getImageNameFilter());
        }
 
         LOGGER.trace("GET: {}", webTarget);
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java
index 11e5fe238..f0930cb4d 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java
@@ -13,8 +13,6 @@
 
 import java.util.List;
 
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
 public class ListNetworksCmdExec extends AbstrSyncDockerCmdExec<ListNetworksCmd, List<Network>> implements
         ListNetworksCmd.Exec {
 
@@ -29,7 +27,7 @@ protected List<Network> execute(ListNetworksCmd command) {
         WebTarget webTarget = getBaseResource().path("/networks");
 
         if (command.getFilters() != null && !command.getFilters().isEmpty()) {
-            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+            webTarget = webTarget.queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
         }
 
         LOGGER.trace("GET: {}", webTarget);
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java
index 1db5684cb..fcae2b8df 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.netty.exec;
 
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -27,7 +25,7 @@ protected ListVolumesResponse execute(ListVolumesCmd command) {
         WebTarget webTarget = getBaseResource().path("/volumes");
 
         if (command.getFilters() != null && !command.getFilters().isEmpty()) {
-            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+            webTarget = webTarget.queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
         }
 
         LOGGER.trace("GET: {}", webTarget);
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
index e6cc00ac0..8d7f896ad 100644
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -83,11 +83,11 @@ protected DefaultDockerClientConfig config(String password) {
     }
 
     public void afterTest() {
-        LOG.info("======================= END OF AFTERTEST =======================");
+        LOG.debug("======================= END OF AFTERTEST =======================");
     }
 
     public void beforeMethod(Method method) {
-        LOG.info(String.format("################################## STARTING %s ##################################",
+        LOG.debug(String.format("################################## STARTING %s ##################################",
                 method.getName()));
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java
index df53d671b..07dff8798 100644
--- a/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java
@@ -66,10 +66,13 @@ public void updateContainer() throws DockerException, IOException {
         CreateContainerResponse response = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
                 .withCmd("sleep", "9999")
                 .exec();
+
         String containerId = response.getId();
         dockerClient.startContainerCmd(containerId).exec();
 
         InspectContainerResponse inspectBefore = dockerClient.inspectContainerCmd(containerId).exec();
+        LOG.debug("Inspect: {}", inspectBefore);
+        final Long memory = inspectBefore.getHostConfig().getMemory();
 
         final UpdateContainerResponse updateResponse = dockerClient.updateContainerCmd(containerId)
                 .withBlkioWeight(300)
@@ -78,9 +81,9 @@ public void updateContainer() throws DockerException, IOException {
                 .withCpuQuota(50000)
 //                .withCpusetCpus("0") // depends on env
                 .withCpusetMems("0")
-                .withMemory(314572800L)
+//                .withMemory(209715200L + 2L)
 //                .withMemorySwap(514288000L) Your kernel does not support swap limit capabilities, memory limited without swap.
-                .withMemoryReservation(209715200L)
+//                .withMemoryReservation(209715200L)
 //                .withKernelMemory(52428800) Can not update kernel memory to a running container, please stop it first.
                 .exec();
 
@@ -92,8 +95,7 @@ public void updateContainer() throws DockerException, IOException {
         InspectContainerResponse inspectAfter = dockerClient.inspectContainerCmd(containerId).exec();
         final HostConfig afterHostConfig = inspectAfter.getHostConfig();
 
-        assertThat(afterHostConfig.getMemory(),
-                is(314572800L));
+//        assertThat(afterHostConfig.getMemory(), is(209715200L + 2L));
 
 //        assertThat(afterHostConfig.getBlkioWeight(), is(300));
         assertThat(afterHostConfig.getCpuShares(), is(512));
@@ -101,7 +103,7 @@ public void updateContainer() throws DockerException, IOException {
         assertThat(afterHostConfig.getCpuQuota(), is(50000));
         assertThat(afterHostConfig.getCpusetMems(), is("0"));
 
-        assertThat(afterHostConfig.getMemoryReservation(), is(209715200L));
+//        assertThat(afterHostConfig.getMemoryReservation(), is(209715200L));
 //       assertThat(afterHostConfig.getMemorySwap(), is(514288000L));
 
     }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
index 8d8f6e6bb..1ba9c1f10 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
@@ -73,21 +73,23 @@ public void commit() throws DockerException {
     @Test
     public void commitWithLabels() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("touch", "/test").exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCmd("touch", "/test")
+                .exec();
 
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
         dockerClient.startContainerCmd(container.getId()).exec();
 
         LOG.info("Committing container: {}", container.toString());
-        Map<String, String> labels = ImmutableMap.of("label1", "abc", "label2", "123");
+        Map<String, String> labels = ImmutableMap.of("nettyLabel1", "abc", "nettyLabel2", "123");
         String imageId = dockerClient.commitCmd(container.getId()).withLabels(labels).exec();
 
         InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
         LOG.info("Image Inspect: {}", inspectImageResponse.toString());
         Map<String, String> responseLabels = inspectImageResponse.getContainerConfig().getLabels();
-        assertThat(responseLabels.get("label1"), equalTo("abc"));
-        assertThat(responseLabels.get("label2"), equalTo("123"));
+        assertThat(responseLabels.get("nettyLabel1"), equalTo("abc"));
+        assertThat(responseLabels.get("nettyLabel2"), equalTo("123"));
     }
 
     @Test(expectedExceptions = NotFoundException.class)
diff --git a/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java
index 681839c17..0db15fb82 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java
@@ -77,9 +77,9 @@ public void updateContainer() throws DockerException, IOException {
                 .withCpuQuota(50000)
 //                .withCpusetCpus("0") // depends on env
                 .withCpusetMems("0")
-                .withMemory(314572800L)
+//                .withMemory(209715200L + 2L)
 //              .withMemorySwap(514288000L) Your kernel does not support swap limit capabilities, memory limited without swap.
-                .withMemoryReservation(209715200L)
+//                .withMemoryReservation(209715200L)
 //                .withKernelMemory(52428800) Can not update kernel memory to a running container, please stop it first.
                 .exec();
 
@@ -91,8 +91,7 @@ public void updateContainer() throws DockerException, IOException {
         InspectContainerResponse inspectAfter = dockerClient.inspectContainerCmd(containerId).exec();
         final HostConfig afterHostConfig = inspectAfter.getHostConfig();
 
-        assertThat(afterHostConfig.getMemory(),
-                is(314572800L));
+//        assertThat(afterHostConfig.getMemory(), is(209715200L + 2L));
 
 //        assertThat(afterHostConfig.getBlkioWeight(), is(300));
         assertThat(afterHostConfig.getCpuShares(), is(512));
@@ -100,7 +99,7 @@ public void updateContainer() throws DockerException, IOException {
         assertThat(afterHostConfig.getCpuQuota(), is(50000));
         assertThat(afterHostConfig.getCpusetMems(), is("0"));
 
-        assertThat(afterHostConfig.getMemoryReservation(), is(209715200L));
+//        assertThat(afterHostConfig.getMemoryReservation(), is(209715200L));
 //        assertThat(afterHostConfig.getMemorySwap(), is(514288000L));
     }
 

From 0f3d4791cfd720d22b300cb0cdc362505c66e3f7 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 14 Feb 2017 01:01:57 +0300
Subject: [PATCH 0735/1272] Swarm tests.

---
 .travis.yml                                   |  2 +
 .../api/model/PullResponseItem.java           | 10 ++++-
 .../core/command/CommitCmdImplTest.java       |  4 ++
 .../command/ConnectToNetworkCmdImplTest.java  |  5 +++
 .../CopyFileFromContainerCmdImplTest.java     |  3 ++
 .../command/CreateContainerCmdImplTest.java   | 18 +++++++--
 .../command/CreateNetworkCmdImplTest.java     |  4 ++
 .../DisconnectFromNetworkCmdImplTest.java     |  5 +++
 .../core/command/EventsCmdImplTest.java       |  7 ++++
 .../core/command/ExecStartCmdImplTest.java    | 14 +++++--
 .../core/command/FrameReaderITest.java        |  4 ++
 .../core/command/InfoCmdImplTest.java         | 30 +++++++-------
 .../command/InspectContainerCmdImplTest.java  | 11 ++++--
 .../command/InspectNetworkCmdImplTest.java    |  3 ++
 .../command/ListContainersCmdImplTest.java    |  5 ++-
 .../core/command/ListImagesCmdImplTest.java   |  6 ++-
 .../core/command/ListNetworksCmdImplTest.java |  3 ++
 .../command/RemoveNetworkCmdImplTest.java     |  4 ++
 .../netty/exec/CommitCmdExecTest.java         |  3 ++
 .../exec/ConnectToNetworkCmdExecTest.java     |  5 +++
 .../CopyFileFromContainerCmdExecTest.java     |  2 +
 .../exec/CreateContainerCmdExecTest.java      | 39 ++++++++++++-------
 .../netty/exec/CreateNetworkCmdExecTest.java  |  5 +++
 .../DisconnectFromNetworkCmdExecTest.java     |  5 +++
 .../netty/exec/EventsCmdExecTest.java         |  8 ++++
 .../netty/exec/ExecStartCmdExecTest.java      |  8 ++++
 .../netty/exec/InfoCmdExecTest.java           | 29 +++++++-------
 .../exec/InspectContainerCmdExecTest.java     | 12 ++++--
 .../netty/exec/InspectNetworkCmdExecTest.java |  3 ++
 .../netty/exec/ListContainersCmdExecTest.java |  6 ++-
 .../netty/exec/ListImagesCmdExecTest.java     | 36 +++++++++--------
 .../netty/exec/ListNetworksCmdExecTest.java   |  3 ++
 .../netty/exec/RemoveNetworkCmdExecTest.java  |  4 ++
 .../github/dockerjava/utils/TestUtils.java    |  9 +++++
 34 files changed, 239 insertions(+), 76 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bef44ea4a..0fb628c0c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,9 @@ env:
 
   matrix:
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" DEPLOY=true COVERITY=true
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2377" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" SWARM_VERSION="1.2.6"
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty"
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2377" DOCKER_VERSION="1.13.1-0~ubuntu-trusty" SWARM_VERSION="1.2.6"
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.13.1-0~ubuntu-trusty"
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.13.1-0~ubuntu-trusty"
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.12.6-0~ubuntu-trusty"
diff --git a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
index 90b3ee336..3c9d99b2e 100644
--- a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
@@ -19,6 +19,8 @@ public class PullResponseItem extends ResponseItem {
 
     private static final String DOWNLOAD_COMPLETE = "Download complete";
 
+    private static final String DOWNLOADED_SWARM = ": downloaded";
+
     /**
      * Returns whether the status indicates a successful pull operation
      *
@@ -30,7 +32,11 @@ public boolean isPullSuccessIndicated() {
             return false;
         }
 
-        return (getStatus().contains(DOWNLOAD_COMPLETE) || getStatus().contains(IMAGE_UP_TO_DATE)
-                || getStatus().contains(DOWNLOADED_NEWER_IMAGE) || getStatus().contains(LEGACY_REGISTRY));
+        return (getStatus().contains(DOWNLOAD_COMPLETE) ||
+                getStatus().contains(IMAGE_UP_TO_DATE) ||
+                getStatus().contains(DOWNLOADED_NEWER_IMAGE) ||
+                getStatus().contains(LEGACY_REGISTRY) ||
+                getStatus().contains(DOWNLOADED_SWARM)
+        );
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
index a6195ed4d..be7738c93 100644
--- a/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.core.command;
 
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.isEmptyString;
@@ -12,6 +13,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -49,6 +51,8 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void commit() throws DockerException {
+        //FIXME swarm
+        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("touch", "/test").exec();
 
diff --git a/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java
index 207d2a0d5..85fd62fa6 100644
--- a/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java
@@ -8,6 +8,7 @@
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -17,6 +18,7 @@
 import java.lang.reflect.Method;
 import java.util.Collections;
 
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
@@ -46,6 +48,7 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void connectToNetwork() throws InterruptedException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         dockerClient.startContainerCmd(container.getId()).exec();
@@ -65,6 +68,8 @@ public void connectToNetwork() throws InterruptedException {
 
     @Test
     public void connectToNetworkWithContainerNetwork() throws InterruptedException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
+
         final String NETWORK_SUBNET = "10.100.102.0/24";
         final String NETWORK_NAME = "jerseyTestNetwork";
         final String CONTAINER_IP = "10.100.102.100";
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
index ec66287eb..64443c914 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.core.command;
 
 import static com.github.dockerjava.utils.TestUtils.getVersion;
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isEmptyOrNullString;
 import static org.hamcrest.Matchers.not;
@@ -50,6 +51,8 @@ public void copyFromContainer() throws Exception {
         if (getVersion(dockerClient).isGreaterOrEqual(RemoteApiVersion.VERSION_1_24)) {
             throw new SkipException("Doesn't work since 1.24");
         }
+        //FIXME swarm
+        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
 
         // TODO extract this into a shared method
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
index 53c9d9ad0..d4c53a837 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -43,14 +43,18 @@
 
 import static com.github.dockerjava.api.model.Capability.MKNOD;
 import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static com.github.dockerjava.utils.TestUtils.getVersion;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasItemInArray;
+import static org.hamcrest.Matchers.hasItems;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
@@ -281,6 +285,7 @@ public void createContainerWithLink() throws DockerException {
 
     @Test
     public void createContainerWithLinkInCustomNetwork() throws DockerException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd()
                 .withName("linkNet")
@@ -318,11 +323,12 @@ public void createContainerWithLinkInCustomNetwork() throws DockerException {
 
         ContainerNetwork linkNet = inspectContainerResponse2.getNetworkSettings().getNetworks().get("linkNet");
         assertNotNull(linkNet);
-        ArrayAsserts.assertArrayEquals(new Link[]{ new Link("container1", "container1Link")}, linkNet.getLinks());
+        ArrayAsserts.assertArrayEquals(new Link[]{new Link("container1", "container1Link")}, linkNet.getLinks());
     }
 
     @Test
     public void createContainerWithCustomIp() throws DockerException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd()
                 .withIpam(new Network.Ipam()
@@ -355,6 +361,7 @@ public void createContainerWithCustomIp() throws DockerException {
 
     @Test
     public void createContainerWithAlias() throws DockerException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd()
                 .withName("aliasNet")
@@ -653,7 +660,12 @@ public void createContainerWithLabels() throws DockerException {
 
         // null becomes empty string
         labels.put("com.github.dockerjava.null", "");
-        assertThat(inspectContainerResponse.getConfig().getLabels(), is(equalTo(labels)));
+
+        // swarm adds 3d label
+        assertThat(inspectContainerResponse.getConfig().getLabels(), allOf(
+                hasEntry("com.github.dockerjava.null", ""),
+                hasEntry("com.github.dockerjava.Boolean", "true")
+        ));
     }
 
     @Test(groups = "ignoreInCircleCi")
@@ -745,7 +757,7 @@ public void createContainerWithCgroupParent() throws DockerException {
     public void createContainerWithShmSize() throws DockerException {
         HostConfig hostConfig = new HostConfig().withShmSize(96 * FileUtils.ONE_MB);
         CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
-            .withHostConfig(hostConfig).withCmd("true").exec();
+                .withHostConfig(hostConfig).withCmd("true").exec();
 
         LOG.info("Created container {}", container.toString());
 
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
index 7dae2e1d6..7a8e3eb3d 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
@@ -19,6 +19,8 @@
 
 import static com.github.dockerjava.utils.TestUtils.getVersion;
 
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
+
 @Test(groups = "integration")
 public class CreateNetworkCmdImplTest extends AbstractDockerClientTest {
 
@@ -44,6 +46,7 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void createNetwork() throws DockerException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         String networkName = "testNetwork";
 
@@ -58,6 +61,7 @@ public void createNetwork() throws DockerException {
 
     @Test
     public void createNetworkWithIpamConfig() throws DockerException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         String networkName = "testNetwork";
         Network.Ipam ipam = new Network.Ipam().withConfig(new Network.Ipam.Config().withSubnet("10.67.79.0/24"));
diff --git a/src/test/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImplTest.java
index c4219b54e..3d7675a55 100644
--- a/src/test/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImplTest.java
@@ -5,6 +5,7 @@
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -13,6 +14,8 @@
 
 import java.lang.reflect.Method;
 
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
+
 @Test(groups = "integration")
 public class DisconnectFromNetworkCmdImplTest extends AbstractDockerClientTest {
 
@@ -38,6 +41,7 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void disconnectFromNetwork() throws InterruptedException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         dockerClient.startContainerCmd(container.getId()).exec();
@@ -59,6 +63,7 @@ public void disconnectFromNetwork() throws InterruptedException {
 
     @Test
     public void forceDisconnectFromNetwork() throws InterruptedException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         CreateNetworkResponse network = dockerClient.createNetworkCmd().withName("testNetwork").exec();
 
diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
index d05327a06..161c671f9 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -7,6 +7,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -17,6 +18,8 @@
 import com.github.dockerjava.api.model.Event;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
+
 /*
  * NOTE: These tests may fail if there is a difference between local and daemon time
  * (this is especially a problem when using boot2docker as time may not in sync
@@ -51,6 +54,8 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void testEventStreamTimeBound() throws Exception {
+        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
+
         // Don't include other tests events
         TimeUnit.SECONDS.sleep(1);
 
@@ -95,6 +100,8 @@ public void testEventStreaming() throws Exception {
 
     
     public void testEventStreamingWithFilter() throws Exception {
+        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
+
         // Don't include other tests events
         TimeUnit.SECONDS.sleep(1);
         
diff --git a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
index 8ae9e5a91..a6a1fb66d 100644
--- a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
@@ -1,5 +1,10 @@
 package com.github.dockerjava.core.command;
 
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.ExecCreateCmdResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
@@ -7,10 +12,8 @@
 import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.security.SecureRandom;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -41,6 +44,9 @@ public void afterMethod(ITestResult result) {
 
     @Test(groups = "ignoreInCircleCi")
     public void execStart() throws Exception {
+        //FIXME swarm
+        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
+
         String containerName = "generated_" + new SecureRandom().nextInt();
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
@@ -90,7 +96,7 @@ public void execStartAttached() throws Exception {
         assertNotNull(responseAsString);
         assertTrue(responseAsString.length() > 0);
     }
-    
+
     @Test(groups = "ignoreInCircleCi", expectedExceptions = NotFoundException.class)
     public void execStartWithNonExistentUser() throws Exception {
         String containerName = "generated_" + new SecureRandom().nextInt();
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index 06d07667c..2c76fbf02 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.core.command;
 
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
@@ -15,6 +16,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 
+import org.testng.SkipException;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
@@ -47,6 +49,8 @@ public void deleteDockerContainerImage() throws Exception {
 
     @Test
     public void canCloseFrameReaderAndReadExpectedLines() throws Exception {
+        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
+
         // wait for the container to be successfully executed
         int exitCode = dockerClient.waitContainerCmd(dockerfileFixture.getContainerId())
                 .exec(new WaitContainerResultCallback()).awaitStatusCode();
diff --git a/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
index d234efe4c..63ccd0820 100644
--- a/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
@@ -1,11 +1,9 @@
 package com.github.dockerjava.core.command;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyOrNullString;
-import static org.hamcrest.Matchers.not;
-
-import java.lang.reflect.Method;
-
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.Info;
+import com.github.dockerjava.client.AbstractDockerClientTest;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -13,10 +11,12 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.model.Info;
-import com.github.dockerjava.client.AbstractDockerClientTest;
+import java.lang.reflect.Method;
+
+import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.not;
 
 @Test(groups = "integration")
 public class InfoCmdImplTest extends AbstractDockerClientTest {
@@ -64,8 +64,12 @@ public void info() throws DockerException {
 
         assertTrue(dockerInfo.getContainers() > 0);
         assertTrue(dockerInfo.getImages() > 0);
-        assertTrue(dockerInfo.getNFd() > 0);
-        assertTrue(dockerInfo.getNGoroutines() > 0);
-        assertTrue(dockerInfo.getNCPU() > 0);
+
+        if (isNotSwarm(dockerClient)) {
+            assertTrue(dockerInfo.getNFd() > 0);
+            assertTrue(dockerInfo.getNGoroutines() > 0);
+            assertTrue(dockerInfo.getNCPU() > 0);
+        }
+
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
index c0eaab3a6..2d41945a6 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.core.command;
 
+import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.isEmptyString;
@@ -76,10 +77,14 @@ public void inspectContainerWithSize() throws DockerException {
 
         InspectContainerCmd command = dockerClient.inspectContainerCmd(container.getId()).withSize(true);
         assertTrue(command.getSize());
-        InspectContainerResponse containerInfo  = command.exec();
+        InspectContainerResponse containerInfo = command.exec();
         assertEquals(containerInfo.getId(), container.getId());
-        assertNotNull(containerInfo.getSizeRootFs());
-        assertTrue(containerInfo.getSizeRootFs().intValue() > 0 );
+
+        // TODO check swarm
+        if (isNotSwarm(dockerClient)) {
+            assertNotNull(containerInfo.getSizeRootFs());
+            assertTrue(containerInfo.getSizeRootFs().intValue() > 0);
+        }
     }
 
     @Test(expectedExceptions = NotFoundException.class)
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectNetworkCmdImplTest.java
index 9d992eb15..cfd0bf74b 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectNetworkCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/InspectNetworkCmdImplTest.java
@@ -4,6 +4,7 @@
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -13,6 +14,7 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 
@@ -41,6 +43,7 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void inspectNetwork() throws DockerException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         List<Network> networks = dockerClient.listNetworksCmd().exec();
 
diff --git a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
index 4b72f8dee..f3199fcb4 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.core.command;
 
 import static ch.lambdaj.Lambda.filter;
+import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItem;
@@ -161,7 +162,9 @@ public void testListContainersWithLabelsFilter() throws Exception {
         container3 = filteredContainers.get(0);
         assertThat(container3.getCommand(), not(isEmptyString()));
         assertThat(container3.getImage(), startsWith(testImage));
-        assertEquals(container3.getLabels(), labels);
+        if (isNotSwarm(dockerClient)) {
+            assertEquals(container3.getLabels(), labels);
+        }
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
index 1b811867a..d41d8fef1 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.core.command;
 
+import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.emptyArray;
 import static org.hamcrest.Matchers.equalTo;
@@ -55,7 +57,9 @@ public void listImages() throws DockerException {
         LOG.info("Images List: {}", images);
         Info info = dockerClient.infoCmd().exec();
 
-        assertThat(images.size(), equalTo(info.getImages()));
+        if (isNotSwarm(dockerClient)) {
+            assertThat(images.size(), equalTo(info.getImages()));
+        }
 
         Image img = images.get(0);
         assertThat(img.getCreated(), is(greaterThan(0L)));
diff --git a/src/test/java/com/github/dockerjava/core/command/ListNetworksCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListNetworksCmdImplTest.java
index 192adb4bc..f24e0f7ae 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListNetworksCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListNetworksCmdImplTest.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.core.command;
 
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 
@@ -7,6 +8,7 @@
 import java.util.List;
 
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -42,6 +44,7 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void listNetworks() throws DockerException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         List<Network> networks = dockerClient.listNetworksCmd().exec();
 
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveNetworkCmdImplTest.java
index 228e48c4d..2e9e275df 100644
--- a/src/test/java/com/github/dockerjava/core/command/RemoveNetworkCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/RemoveNetworkCmdImplTest.java
@@ -9,6 +9,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -18,6 +19,7 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.not;
@@ -51,6 +53,7 @@ public void afterMethod(ITestResult result) {
 
     @Test(groups = "ignoreInCircleCi")
     public void removeNetwork() throws DockerException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         CreateNetworkResponse network = dockerClient.createNetworkCmd().withName("test-network").exec();
 
@@ -66,6 +69,7 @@ public void removeNetwork() throws DockerException {
 
     @Test(expectedExceptions = NotFoundException.class)
     public void removeNonExistingContainer() throws DockerException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         dockerClient.removeNetworkCmd("non-existing").exec();
     }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
index 1ba9c1f10..b1392e696 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.netty.exec;
 
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.isEmptyString;
@@ -12,6 +13,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -49,6 +51,7 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void commit() throws DockerException {
+        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("touch", "/test").exec();
 
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExecTest.java
index 7e290a98e..1ee4a2218 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExecTest.java
@@ -10,6 +10,7 @@
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -19,6 +20,7 @@
 import java.lang.reflect.Method;
 import java.util.Collections;
 
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
@@ -48,6 +50,7 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void connectToNetwork() throws InterruptedException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         dockerClient.startContainerCmd(container.getId()).exec();
@@ -67,6 +70,8 @@ public void connectToNetwork() throws InterruptedException {
 
     @Test
     public void connectToNetworkWithContainerNetwork() throws InterruptedException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
+
         final String NETWORK_SUBNET = "10.100.101.0/24";
         final String NETWORK_NAME = "nettyTestNetwork";
         final String CONTAINER_IP = "10.100.101.100";
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java
index 1060ae82a..269e03c10 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.netty.exec;
 
 import static com.github.dockerjava.utils.TestUtils.getVersion;
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isEmptyOrNullString;
 import static org.hamcrest.Matchers.not;
@@ -49,6 +50,7 @@ public void copyFromContainer() throws Exception {
         if (getVersion(dockerClient).isGreaterOrEqual(RemoteApiVersion.VERSION_1_24)) {
             throw new SkipException("Doesn't work since 1.24");
         }
+        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
 
         // TODO extract this into a shared method
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
index ab2bd36a0..b596e8a54 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
@@ -43,11 +43,14 @@
 import static com.github.dockerjava.api.model.Capability.MKNOD;
 import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
 import static com.github.dockerjava.utils.TestUtils.getVersion;
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasItemInArray;
 import static org.hamcrest.Matchers.is;
@@ -144,36 +147,36 @@ public void createContainerWithReadOnlyVolume() throws DockerException {
     @Test
     public void createContainerWithNoCopyVolumes() throws DockerException {
         final RemoteApiVersion apiVersion = getVersion(dockerClient);
-        
+
         if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_23)) {
             throw new SkipException("API version should be >= 1.23");
         }
-        
+
     	Volume volume1 = new Volume("/opt/webapp1");
     	String container1Name = UUID.randomUUID().toString();
-    	
+
     	CreateVolumeResponse volumeResponse = dockerClient.createVolumeCmd().withName("webapp1").exec();
     	assertThat(volumeResponse.getName(), equalTo("webapp1"));
         assertThat(volumeResponse.getDriver(), equalTo("local"));
         assertThat(volumeResponse.getMountpoint(), containsString("/webapp1/"));
-    	
+
     	Bind bind1 = new Bind("webapp1", volume1, true);
-    	
+
     	CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withName(container1Name)
                 .withBinds(bind1).exec();
         LOG.info("Created container1 {}", container1.toString());
-        
+
         InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId()).exec();
-        
+
         assertThat(Arrays.asList(inspectContainerResponse1.getHostConfig().getBinds()), contains(bind1));
         assertThat(inspectContainerResponse1, mountedVolumes(contains(volume1)));
-        
+
         assertThat(inspectContainerResponse1.getMounts().get(0).getDestination(), equalTo(volume1));
         assertThat(inspectContainerResponse1.getMounts().get(0).getMode(), equalTo("rw,nocopy"));
         assertThat(inspectContainerResponse1.getMounts().get(0).getRW(), equalTo(true));
     }
-    
+
     @Test
     public void createContainerWithVolumesFrom() throws DockerException {
 
@@ -304,12 +307,13 @@ public void createContainerWithLink() throws DockerException {
 
         InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
                 .exec();
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link("container1",
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[]{new Link("container1",
                 "container1Link")}));
     }
 
     @Test
     public void createContainerWithLinkInCustomNetwork() throws DockerException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd()
                 .withName("linkNet")
@@ -347,11 +351,12 @@ public void createContainerWithLinkInCustomNetwork() throws DockerException {
 
         ContainerNetwork linkNet = inspectContainerResponse2.getNetworkSettings().getNetworks().get("linkNet");
         assertNotNull(linkNet);
-        ArrayAsserts.assertArrayEquals(new Link[]{ new Link("container1", "container1Link")}, linkNet.getLinks());
+        ArrayAsserts.assertArrayEquals(new Link[]{new Link("container1", "container1Link")}, linkNet.getLinks());
     }
 
     @Test
     public void createContainerWithCustomIp() throws DockerException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd()
                 .withIpam(new Network.Ipam()
@@ -384,6 +389,7 @@ public void createContainerWithCustomIp() throws DockerException {
 
     @Test
     public void createContainerWithAlias() throws DockerException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd()
                 .withName("aliasNet")
@@ -569,7 +575,7 @@ public void createContainerWithLinking() throws DockerException {
         assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
         assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link("container1",
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[]{new Link("container1",
                 "container1Link")}));
         assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
         assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
@@ -682,7 +688,12 @@ public void createContainerWithLabels() throws DockerException {
 
         // null becomes empty string
         labels.put("com.github.dockerjava.null", "");
-        assertThat(inspectContainerResponse.getConfig().getLabels(), is(equalTo(labels)));
+
+        // swarm adds 3d label
+        assertThat(inspectContainerResponse.getConfig().getLabels(), allOf(
+                hasEntry("com.github.dockerjava.null", ""),
+                hasEntry("com.github.dockerjava.Boolean", "true")
+        ));
     }
 
     @Test(groups = "ignoreInCircleCi")
@@ -720,7 +731,7 @@ public void createContainerWithCgroupParent() throws DockerException {
     public void createContainerWithShmSize() throws DockerException {
         HostConfig hostConfig = new HostConfig().withShmSize(96 * FileUtils.ONE_MB);
         CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
-            .withHostConfig(hostConfig).withCmd("true").exec();
+                .withHostConfig(hostConfig).withCmd("true").exec();
 
         LOG.info("Created container {}", container.toString());
 
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
index 1e8c339b1..22337bdde 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
@@ -6,6 +6,7 @@
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -14,6 +15,8 @@
 
 import java.lang.reflect.Method;
 
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
+
 @Test(groups = "integration")
 public class CreateNetworkCmdExecTest extends AbstractNettyDockerClientTest {
 
@@ -39,6 +42,7 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void createNetwork() throws DockerException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         String networkName = "testNetwork";
 
@@ -53,6 +57,7 @@ public void createNetwork() throws DockerException {
 
     @Test
     public void createNetworkWithIpamConfig() throws DockerException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         String networkName = "testNetwork";
         Network.Ipam ipam = new Network.Ipam().withConfig(new Network.Ipam.Config().withSubnet("10.67.79.0/24"));
diff --git a/src/test/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExecTest.java
index 1f2563dec..a846172e6 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExecTest.java
@@ -6,6 +6,7 @@
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -14,6 +15,8 @@
 
 import java.lang.reflect.Method;
 
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
+
 @Test(groups = "integration")
 public class DisconnectFromNetworkCmdExecTest extends AbstractNettyDockerClientTest {
 
@@ -39,6 +42,7 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void disconnectFromNetwork() throws InterruptedException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         dockerClient.startContainerCmd(container.getId()).exec();
@@ -60,6 +64,7 @@ public void disconnectFromNetwork() throws InterruptedException {
 
     @Test
     public void forceDisconnectFromNetwork() throws InterruptedException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         CreateNetworkResponse network = dockerClient.createNetworkCmd().withName("testNetwork").exec();
 
diff --git a/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java
index 2a446569d..93bb6873d 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java
@@ -7,6 +7,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -19,6 +20,8 @@
 import com.github.dockerjava.core.command.PullImageResultCallback;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
+
 @Test(groups = "integration")
 public class EventsCmdExecTest extends AbstractNettyDockerClientTest {
 
@@ -48,6 +51,8 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void testEventStreamTimeBound() throws Exception {
+        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
+
         // Don't include other tests events
         TimeUnit.SECONDS.sleep(1);
 
@@ -92,6 +97,9 @@ public void testEventStreaming() throws Exception {
 
     
     public void testEventStreamingWithFilter() throws Exception {
+        //FIXME swarm
+        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
+
         // Don't include other tests events
         TimeUnit.SECONDS.sleep(1);
         
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
index 52db7fe44..83e90ac8f 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
@@ -3,6 +3,7 @@
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_23;
 import static com.github.dockerjava.utils.TestUtils.getVersion;
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
@@ -17,6 +18,7 @@
 
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -115,6 +117,9 @@ public void execStartAttached() throws Exception {
 
     @Test()
     public void execStartAttachStdin() throws Exception {
+        //FIXME swarm
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm");
+
         String containerName = "generated_" + new SecureRandom().nextInt();
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
@@ -147,6 +152,9 @@ public void execStartAttachStdin() throws Exception {
 
     @Test()
     public void execStartAttachStdinToShell() throws Exception {
+        //FIXME swarm
+        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
+
         String containerName = "generated_" + new SecureRandom().nextInt();
 
         CreateContainerResponse container = dockerClient
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InfoCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InfoCmdExecTest.java
index 850f98a74..9c0901152 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InfoCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/InfoCmdExecTest.java
@@ -1,11 +1,9 @@
 package com.github.dockerjava.netty.exec;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyOrNullString;
-import static org.hamcrest.Matchers.not;
-
-import java.lang.reflect.Method;
-
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.Info;
+import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
@@ -13,10 +11,12 @@
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.Info;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+import java.lang.reflect.Method;
+
+import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.not;
 
 @Test(groups = "integration")
 public class InfoCmdExecTest extends AbstractNettyDockerClientTest {
@@ -64,8 +64,11 @@ public void info() throws DockerException {
 
         assertTrue(dockerInfo.getContainers() > 0);
         assertTrue(dockerInfo.getImages() > 0);
-        assertTrue(dockerInfo.getNFd() > 0);
-        assertTrue(dockerInfo.getNGoroutines() > 0);
-        assertTrue(dockerInfo.getNCPU() > 0);
+
+        if (isNotSwarm(dockerClient)) {
+            assertTrue(dockerInfo.getNFd() > 0);
+            assertTrue(dockerInfo.getNGoroutines() > 0);
+            assertTrue(dockerInfo.getNCPU() > 0);
+        }
     }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
index af32cebce..961ba0c2b 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.netty.exec;
 
+import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.isEmptyString;
@@ -75,12 +76,15 @@ public void inspectContainerWithSize() throws DockerException {
         assertThat(container.getId(), not(isEmptyString()));
 
         InspectContainerCmd command = dockerClient.inspectContainerCmd(container.getId())
-                                                      .withSize(true);
+                .withSize(true);
         assertTrue(command.getSize());
-        InspectContainerResponse containerInfo  = command.exec();
+        InspectContainerResponse containerInfo = command.exec();
         assertEquals(containerInfo.getId(), container.getId());
-        assertNotNull(containerInfo.getSizeRootFs());
-        assertTrue(containerInfo.getSizeRootFs().intValue() > 0 );
+        // TODO check swarm
+        if (isNotSwarm(dockerClient)) {
+            assertNotNull(containerInfo.getSizeRootFs());
+            assertTrue(containerInfo.getSizeRootFs().intValue() > 0);
+        }
     }
 
     @Test(expectedExceptions = NotFoundException.class)
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectNetworkCmdExecTest.java
index 7cbab660b..966f5c4ec 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectNetworkCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/InspectNetworkCmdExecTest.java
@@ -4,6 +4,7 @@
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -13,6 +14,7 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 
@@ -41,6 +43,7 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void inspectNetwork() throws DockerException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         List<Network> networks = dockerClient.listNetworksCmd().exec();
 
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java
index a9d888b58..9befc304a 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java
@@ -1,6 +1,8 @@
 package com.github.dockerjava.netty.exec;
 
 import static ch.lambdaj.Lambda.filter;
+import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItem;
@@ -169,7 +171,9 @@ public void testListContainersWithLabelsFilter() throws Exception {
         container3 = filteredContainers.get(0);
         assertThat(container3.getCommand(), not(isEmptyString()));
         assertThat(container3.getImage(), startsWith(testImage));
-        assertEquals(container3.getLabels(), labels);
+        if (isNotSwarm(dockerClient)) {
+            assertEquals(container3.getLabels(), labels);
+        }
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java
index 170a8479f..06231d2b8 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java
@@ -1,5 +1,21 @@
 package com.github.dockerjava.netty.exec;
 
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.Image;
+import com.github.dockerjava.api.model.Info;
+import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.emptyArray;
 import static org.hamcrest.Matchers.equalTo;
@@ -9,22 +25,6 @@
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.Image;
-import com.github.dockerjava.api.model.Info;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
 @Test(groups = "integration")
 public class ListImagesCmdExecTest extends AbstractNettyDockerClientTest {
 
@@ -55,7 +55,9 @@ public void listImages() throws DockerException {
         LOG.info("Images List: {}", images);
         Info info = dockerClient.infoCmd().exec();
 
-        assertThat(images.size(), equalTo(info.getImages()));
+        if (isNotSwarm(dockerClient)) {
+            assertThat(images.size(), equalTo(info.getImages()));
+        }
 
         Image img = images.get(0);
         assertThat(img.getCreated(), is(greaterThan(0L)));
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ListNetworksCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ListNetworksCmdExecTest.java
index 8a5d975f0..d5880ea01 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ListNetworksCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/ListNetworksCmdExecTest.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.netty.exec;
 
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 
@@ -7,6 +8,7 @@
 import java.util.List;
 
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -42,6 +44,7 @@ public void afterMethod(ITestResult result) {
 
     @Test
     public void listNetworks() throws DockerException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         List<Network> networks = dockerClient.listNetworksCmd().exec();
 
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExecTest.java
index f8e7d26ca..811db4127 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExecTest.java
@@ -9,6 +9,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.ITestResult;
+import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -18,6 +19,7 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.not;
@@ -51,6 +53,7 @@ public void afterMethod(ITestResult result) {
 
     @Test(groups = "ignoreInCircleCi")
     public void removeNetwork() throws DockerException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         CreateNetworkResponse network = dockerClient.createNetworkCmd().withName("test-network").exec();
 
@@ -66,6 +69,7 @@ public void removeNetwork() throws DockerException {
 
     @Test(expectedExceptions = NotFoundException.class)
     public void removeNonExistingContainer() throws DockerException {
+        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
 
         dockerClient.removeNetworkCmd("non-existing").exec();
     }
diff --git a/src/test/java/com/github/dockerjava/utils/TestUtils.java b/src/test/java/com/github/dockerjava/utils/TestUtils.java
index b40273ecb..d8b01fd54 100644
--- a/src/test/java/com/github/dockerjava/utils/TestUtils.java
+++ b/src/test/java/com/github/dockerjava/utils/TestUtils.java
@@ -14,4 +14,13 @@ public static RemoteApiVersion getVersion(DockerClient client) {
         final String serverVersion = client.versionCmd().exec().getApiVersion();
         return RemoteApiVersion.parseConfig(serverVersion);
     }
+
+    public static boolean isSwarm(DockerClient client) {
+        final String serverVersion = client.versionCmd().exec().getVersion();
+        return serverVersion.startsWith("swarm/");
+    }
+
+    public static boolean isNotSwarm(DockerClient client) {
+        return !isSwarm(client);
+    }
 }

From 3bb58c1ff4f3201822b1ee9403780913413fd402 Mon Sep 17 00:00:00 2001
From: Martin Root <mail@martin-root.de>
Date: Thu, 25 Aug 2016 11:47:49 +0200
Subject: [PATCH 0736/1272] Add endpoints for Swarm in swarm mode

Apply changes from review

Remove unused import

Fix compile errors
---
 .../github/dockerjava/api/DockerClient.java   |  63 ++++-
 .../api/command/DockerCmdExecFactory.java     |  11 +-
 .../api/command/InitializeSwarmCmd.java       |  36 +++
 .../api/command/InspectSwarmCmd.java          |  18 ++
 .../dockerjava/api/command/JoinSwarmCmd.java  |  34 +++
 .../dockerjava/api/command/LeaveSwarmCmd.java |  18 ++
 .../api/command/UpdateSwarmCmd.java           |  35 +++
 .../dockerjava/api/model/ClusterInfo.java     | 152 +++++++++++
 .../github/dockerjava/api/model/Driver.java   |  79 ++++++
 .../dockerjava/api/model/ExternalCA.java      | 105 ++++++++
 .../api/model/ExternalCAProtocol.java         |  13 +
 .../com/github/dockerjava/api/model/Info.java |  22 ++
 .../dockerjava/api/model/LocalNodeState.java  |  22 ++
 .../github/dockerjava/api/model/PeerNode.java |  82 ++++++
 .../dockerjava/api/model/ResourceVersion.java |  60 +++++
 .../github/dockerjava/api/model/Swarm.java    |  65 +++++
 .../dockerjava/api/model/SwarmCAConfig.java   |  83 ++++++
 .../api/model/SwarmDispatcherConfig.java      |  61 +++++
 .../dockerjava/api/model/SwarmInfo.java       | 237 ++++++++++++++++++
 .../dockerjava/api/model/SwarmJoinTokens.java |  82 ++++++
 .../api/model/SwarmOrchestration.java         |  60 +++++
 .../dockerjava/api/model/SwarmRaftConfig.java | 126 ++++++++++
 .../dockerjava/api/model/SwarmSpec.java       | 172 +++++++++++++
 .../dockerjava/api/model/SwarmVersion.java    |  60 +++++
 .../dockerjava/api/model/TaskDefaults.java    |  61 +++++
 .../dockerjava/core/DockerClientImpl.java     |  53 +++-
 .../core/command/InitializeSwarmCmdImpl.java  |  95 +++++++
 .../core/command/InspectSwarmCmdImpl.java     |  21 ++
 .../core/command/JoinSwarmCmdImpl.java        |  96 +++++++
 .../core/command/LeaveSwarmCmdImpl.java       |  34 +++
 .../core/command/UpdateSwarmCmdImpl.java      |  69 +++++
 .../jaxrs/InitializeSwarmCmdExec.java         |  32 +++
 .../dockerjava/jaxrs/InspectSwarmCmdExec.java |  29 +++
 .../jaxrs/JerseyDockerCmdExecFactory.java     |  98 +++++---
 .../dockerjava/jaxrs/JoinSwarmCmdExec.java    |  32 +++
 .../dockerjava/jaxrs/LeaveSwarmCmdExec.java   |  32 +++
 .../dockerjava/jaxrs/UpdateSwarmCmdExec.java  |  35 +++
 .../netty/NettyDockerCmdExecFactory.java      |  42 +++-
 .../netty/exec/InitializeSwarmCmdExec.java    |  29 +++
 .../netty/exec/InspectSwarmCmdExec.java       |  31 +++
 .../netty/exec/JoinSwarmCmdExec.java          |  29 +++
 .../netty/exec/LeaveSwarmCmdExec.java         |  30 +++
 .../netty/exec/UpdateSwarmCmdExec.java        |  32 +++
 .../core/TestDockerCmdExecFactory.java        |  30 +++
 .../AbstractSwarmDockerClientTest.java        | 132 ++++++++++
 .../command/InitializeSwarmCmdExecTest.java   |  97 +++++++
 .../core/command/JoinSwarmCmdExecTest.java    | 116 +++++++++
 .../core/command/LeaveSwarmCmdExecTest.java   |  78 ++++++
 .../core/command/UpdateSwarmCmdExecTest.java  | 101 ++++++++
 .../AbstractNettySwarmDockerClientTest.java   |  16 ++
 .../exec/InitializeSwarmCmdExecTest.java      |  97 +++++++
 .../netty/exec/JoinSwarmCmdExecTest.java      | 117 +++++++++
 .../netty/exec/LeaveSwarmCmdExecTest.java     |  79 ++++++
 .../netty/exec/UpdateSwarmCmdExecTest.java    | 102 ++++++++
 54 files changed, 3482 insertions(+), 59 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/command/InitializeSwarmCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/InspectSwarmCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/JoinSwarmCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/LeaveSwarmCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/UpdateSwarmCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/Driver.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ExternalCA.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/LocalNodeState.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/PeerNode.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/Swarm.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/InspectSwarmCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/LeaveSwarmCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/InitializeSwarmCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/InspectSwarmCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/JoinSwarmCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/LeaveSwarmCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/UpdateSwarmCmdExec.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/AbstractSwarmDockerClientTest.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/InitializeSwarmCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/JoinSwarmCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/LeaveSwarmCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/UpdateSwarmCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/AbstractNettySwarmDockerClientTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/InitializeSwarmCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/JoinSwarmCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/LeaveSwarmCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/UpdateSwarmCmdExecTest.java

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 8f35fac12..58fa9d7c6 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -1,12 +1,5 @@
 package com.github.dockerjava.api;
 
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.annotation.Nonnull;
-
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd;
 import com.github.dockerjava.api.command.BuildImageCmd;
@@ -25,12 +18,16 @@
 import com.github.dockerjava.api.command.ExecCreateCmd;
 import com.github.dockerjava.api.command.ExecStartCmd;
 import com.github.dockerjava.api.command.InfoCmd;
+import com.github.dockerjava.api.command.InitializeSwarmCmd;
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectNetworkCmd;
+import com.github.dockerjava.api.command.InspectSwarmCmd;
 import com.github.dockerjava.api.command.InspectVolumeCmd;
+import com.github.dockerjava.api.command.JoinSwarmCmd;
 import com.github.dockerjava.api.command.KillContainerCmd;
+import com.github.dockerjava.api.command.LeaveSwarmCmd;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
@@ -45,6 +42,7 @@
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
+import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.api.command.SearchImagesCmd;
@@ -55,14 +53,21 @@
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 import com.github.dockerjava.api.command.UpdateContainerCmd;
+import com.github.dockerjava.api.command.UpdateSwarmCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
-import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Identifier;
+import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.core.RemoteApiVersion;
 
+import javax.annotation.Nonnull;
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
 // https://godoc.org/github.com/fsouza/go-dockerclient
 public interface DockerClient extends Closeable {
 
@@ -255,6 +260,48 @@ public interface DockerClient extends Closeable {
 
     DisconnectFromNetworkCmd disconnectFromNetworkCmd();
 
+    /**
+     * Enables swarm mode for the docker engine and creates a new swarm cluster
+     *
+     * @since 1.24
+     * @param swarmSpec the specification for the swarm
+     * @return the command
+     */
+    InitializeSwarmCmd initializeSwarmCmd(SwarmSpec swarmSpec);
+
+    /**
+     * Gets information about the swarm the docker engine is currently in
+     *
+     * @since 1.24
+     * @return the command
+     */
+    InspectSwarmCmd inspectSwarmCmd();
+
+    /**
+     * Enables swarm mode for the docker engine and joins an existing swarm cluster
+     *
+     * @since 1.24
+     * @return the command
+     */
+    JoinSwarmCmd joinSwarmCmd();
+
+    /**
+     * Disables swarm node for the docker engine and leaves the swarm cluster
+     *
+     * @since 1.24
+     * @return the command
+     */
+    LeaveSwarmCmd leaveSwarmCmd();
+
+    /**
+     * Updates the swarm specification
+     *
+     * @since 1.24
+     * @param swarmSpec the specification for the swarm
+     * @return the command
+     */
+    UpdateSwarmCmd updateSwarmCmd(SwarmSpec swarmSpec);
+
     @Override
     void close() throws IOException;
 
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index 671c0d535..cab6c961d 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -117,7 +117,16 @@ public interface DockerCmdExecFactory extends Closeable {
 
     DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec();
 
+    InitializeSwarmCmd.Exec createInitializeSwarmCmdExec();
+
+    InspectSwarmCmd.Exec createInspectSwarmCmdExec();
+
+    JoinSwarmCmd.Exec createJoinSwarmCmdExec();
+
+    LeaveSwarmCmd.Exec createLeaveSwarmCmdExec();
+
+    UpdateSwarmCmd.Exec createUpdateSwarmCmdExec();
+
     @Override
     void close() throws IOException;
-
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/InitializeSwarmCmd.java b/src/main/java/com/github/dockerjava/api/command/InitializeSwarmCmd.java
new file mode 100644
index 000000000..ff0fabf99
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/InitializeSwarmCmd.java
@@ -0,0 +1,36 @@
+package com.github.dockerjava.api.command;
+
+
+import com.github.dockerjava.api.model.SwarmSpec;
+
+import javax.annotation.CheckForNull;
+
+public interface InitializeSwarmCmd extends SyncDockerCmd<Void> {
+
+    @CheckForNull
+    String getListenAddr();
+
+    InitializeSwarmCmd withListenAddr(String listenAddr);
+
+    @CheckForNull
+    String getAdvertiseAddr();
+
+    InitializeSwarmCmd withAdvertiseAddr(String advertiseAddr);
+
+    @CheckForNull
+    Boolean isForceNewCluster();
+
+    InitializeSwarmCmd withForceNewCluster(Boolean forceNewCluster);
+
+    @CheckForNull
+    SwarmSpec getSwarmSpec();
+
+    InitializeSwarmCmd withSwarmSpec(SwarmSpec swarmSpec);
+
+    @Override
+    Void exec();
+
+    interface Exec extends DockerCmdSyncExec<InitializeSwarmCmd, Void> {
+
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectSwarmCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectSwarmCmd.java
new file mode 100644
index 000000000..9342d9969
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/InspectSwarmCmd.java
@@ -0,0 +1,18 @@
+package com.github.dockerjava.api.command;
+
+
+import com.github.dockerjava.api.model.Swarm;
+
+/**
+ * Inspect a swarm.
+ */
+public interface InspectSwarmCmd extends SyncDockerCmd<Swarm> {
+
+    @Override
+    Swarm exec();
+
+    interface Exec extends DockerCmdSyncExec<InspectSwarmCmd, Swarm> {
+    }
+
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/JoinSwarmCmd.java b/src/main/java/com/github/dockerjava/api/command/JoinSwarmCmd.java
new file mode 100644
index 000000000..cc2412a58
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/JoinSwarmCmd.java
@@ -0,0 +1,34 @@
+package com.github.dockerjava.api.command;
+
+
+import javax.annotation.CheckForNull;
+import java.util.List;
+
+public interface JoinSwarmCmd extends SyncDockerCmd<Void> {
+
+    @CheckForNull
+    String getListenAddr();
+
+    JoinSwarmCmd withListenAddr(String listenAddr);
+
+    @CheckForNull
+    String getAdvertiseAddr();
+
+    JoinSwarmCmd withAdvertiseAddr(String advertiseAddr);
+
+    @CheckForNull
+    List<String> getRemoteAddrs();
+
+    JoinSwarmCmd withRemoteAddrs(List<String> remoteAddrs);
+
+    @CheckForNull
+    String getJoinToken();
+
+    JoinSwarmCmd withJoinToken(String joinToken);
+
+    @Override
+    Void exec();
+
+    interface Exec extends DockerCmdSyncExec<JoinSwarmCmd, Void> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/LeaveSwarmCmd.java b/src/main/java/com/github/dockerjava/api/command/LeaveSwarmCmd.java
new file mode 100644
index 000000000..11a5b80d9
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/LeaveSwarmCmd.java
@@ -0,0 +1,18 @@
+package com.github.dockerjava.api.command;
+
+
+import javax.annotation.CheckForNull;
+
+public interface LeaveSwarmCmd extends SyncDockerCmd<Void> {
+
+    @CheckForNull
+    Boolean hasForceEnabled();
+
+    LeaveSwarmCmd withForceEnabled(Boolean force);
+
+    @Override
+    Void exec();
+
+    interface Exec extends DockerCmdSyncExec<LeaveSwarmCmd, Void> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/UpdateSwarmCmd.java b/src/main/java/com/github/dockerjava/api/command/UpdateSwarmCmd.java
new file mode 100644
index 000000000..60b69aa4e
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/UpdateSwarmCmd.java
@@ -0,0 +1,35 @@
+package com.github.dockerjava.api.command;
+
+
+import com.github.dockerjava.api.model.SwarmSpec;
+
+import javax.annotation.CheckForNull;
+
+public interface UpdateSwarmCmd extends SyncDockerCmd<Void> {
+
+    @CheckForNull
+    Long getVersion();
+
+    UpdateSwarmCmd withVersion(Long version);
+
+    @CheckForNull
+    Boolean getRotateWorkerToken();
+
+    UpdateSwarmCmd withRotateWorkerToken(Boolean rotateWorkerToken);
+
+    @CheckForNull
+    Boolean getRotateManagerToken();
+
+    UpdateSwarmCmd withRotateManagerToken(Boolean rotateManagerToken);
+
+    @CheckForNull
+    SwarmSpec getSwarmSpec();
+
+    UpdateSwarmCmd withSwarmSpec(SwarmSpec swarmSpec);
+
+    @Override
+    Void exec();
+
+    interface Exec extends DockerCmdSyncExec<UpdateSwarmCmd, Void> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java b/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
new file mode 100644
index 000000000..d1a233d05
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
@@ -0,0 +1,152 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * Used for creating swarms.
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ClusterInfo implements Serializable {
+
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("CreatedAt")
+    private Date createdAt;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Spec")
+    private SwarmSpec spec;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("ID")
+    private String id;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("UpdatedAt")
+    private Date updatedAt;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Version")
+    private ResourceVersion version;
+
+    /**
+     * @see #createdAt
+     */
+    @CheckForNull
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    /**
+     * @see #createdAt
+     */
+    public ClusterInfo withCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+        return this;
+    }
+
+    /**
+     * @see #spec
+     */
+    @CheckForNull
+    public SwarmSpec getSpec() {
+        return spec;
+    }
+
+    /**
+     * @see #spec
+     */
+    public ClusterInfo withSpec(SwarmSpec spec) {
+        this.spec = spec;
+        return this;
+    }
+    /**
+     * @see #id
+     */
+    @CheckForNull
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * @see #id
+     */
+    public ClusterInfo withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    /**
+     * @see #updatedAt
+     */
+    @CheckForNull
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    /**
+     * @see #updatedAt
+     */
+    public ClusterInfo withUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+        return this;
+    }
+
+    /**
+     * @see #version
+     */
+    @CheckForNull
+    public ResourceVersion getVersion() {
+        return version;
+    }
+
+    /**
+     * @see #version
+     */
+    public ClusterInfo withVersion(ResourceVersion version) {
+        this.version = version;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/Driver.java b/src/main/java/com/github/dockerjava/api/model/Driver.java
new file mode 100644
index 000000000..9eecf27e9
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/Driver.java
@@ -0,0 +1,79 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class Driver implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Name")
+    private String name;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Options")
+    private Map<String, String> options;
+
+    /**
+     * @see #name
+     */
+    @CheckForNull
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @see #name
+     */
+    public Driver withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * @see #options
+     */
+    @CheckForNull
+    public Map<String, String> getOptions() {
+        return options;
+    }
+
+    /**
+     * @see #options
+     */
+    public Driver withOptions(Map<String, String> options) {
+        this.options = options;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ExternalCA.java b/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
new file mode 100644
index 000000000..4377b90d4
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
@@ -0,0 +1,105 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ExternalCA implements Serializable {
+
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Protocol")
+    private ExternalCAProtocol protocol;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("URL")
+    private String url;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Options")
+    private Map<String, String> options;
+
+    /**
+     * @see #protocol
+     */
+    @CheckForNull
+    public ExternalCAProtocol getProtocol() {
+        return protocol;
+    }
+
+    /**
+     * @see #protocol
+     */
+    public ExternalCA withProtocol(ExternalCAProtocol protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * @see #url
+     */
+    @CheckForNull
+    public String getUrl() {
+        return url;
+    }
+
+    /**
+     * @see #url
+     */
+    public ExternalCA withUrl(String url) {
+        this.url = url;
+        return this;
+    }
+
+    /**
+     * @see #options
+     */
+    @CheckForNull
+    public Map<String, String> getOptions() {
+        return options;
+    }
+
+    /**
+     * @see #options
+     */
+    public ExternalCA withOptions(Map<String, String> options) {
+        this.options = options;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java b/src/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java
new file mode 100644
index 000000000..16b7ad94b
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java
@@ -0,0 +1,13 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public enum ExternalCAProtocol {
+
+    @JsonProperty("cfssl")
+    CFSSL
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/Info.java b/src/main/java/com/github/dockerjava/api/model/Info.java
index 51abe5dac..6925df5f2 100644
--- a/src/main/java/com/github/dockerjava/api/model/Info.java
+++ b/src/main/java/com/github/dockerjava/api/model/Info.java
@@ -224,6 +224,12 @@ public class Info implements Serializable {
     @JsonProperty("ClusterAdvertise")
     private String clusterAdvertise;
 
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Swarm")
+    private SwarmInfo swarm;
+
     /**
      * @see #architecture
      */
@@ -1024,6 +1030,22 @@ public Info withSystemTime(String systemTime) {
         return this;
     }
 
+    /**
+     * @see #swarm
+     */
+    @CheckForNull
+    public SwarmInfo getSwarm() {
+        return swarm;
+    }
+
+    /**
+     * @see #swarm
+     */
+    public Info withSwarm(SwarmInfo swarm) {
+        this.swarm = swarm;
+        return this;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
diff --git a/src/main/java/com/github/dockerjava/api/model/LocalNodeState.java b/src/main/java/com/github/dockerjava/api/model/LocalNodeState.java
new file mode 100644
index 000000000..7b988fa5d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/LocalNodeState.java
@@ -0,0 +1,22 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @since 1.24
+ */
+public enum LocalNodeState {
+
+    @JsonProperty("inactive")
+    INACTIVE,
+
+    @JsonProperty("pending")
+    PENDING,
+
+    @JsonProperty("active")
+    ACTIVE,
+
+    @JsonProperty("error")
+    ERROR
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/PeerNode.java b/src/main/java/com/github/dockerjava/api/model/PeerNode.java
new file mode 100644
index 000000000..5c7a1d89a
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/PeerNode.java
@@ -0,0 +1,82 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since 1.24
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class PeerNode implements Serializable {
+
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("NodeID")
+    private String nodeID;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Addr")
+    private String addr;
+
+    /**
+     * @see #nodeID
+     */
+    @CheckForNull
+    public String getNodeID() {
+        return nodeID;
+    }
+
+    /**
+     * @see #nodeID
+     */
+    public PeerNode withNodeID(String nodeID) {
+        this.nodeID = nodeID;
+        return this;
+    }
+
+    /**
+     * @see #addr
+     */
+    @CheckForNull
+    public String getAddr() {
+        return addr;
+    }
+
+    /**
+     * @see #addr
+     */
+    public PeerNode withAddr(String addr) {
+        this.addr = addr;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java b/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
new file mode 100644
index 000000000..dc5da1b85
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
@@ -0,0 +1,60 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ResourceVersion implements Serializable {
+
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Index")
+    private Long index;
+
+    /**
+     * @see #index
+     */
+    @CheckForNull
+    public Long getIndex() {
+        return index;
+    }
+
+    /**
+     * @see #index
+     */
+    public ResourceVersion withIndex(Long index) {
+        this.index = index;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/Swarm.java b/src/main/java/com/github/dockerjava/api/model/Swarm.java
new file mode 100644
index 000000000..66568544b
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/Swarm.java
@@ -0,0 +1,65 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.annotation.CheckForNull;
+import java.util.Date;
+
+/**
+ * @since 1.24
+ */
+public class Swarm extends ClusterInfo {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("JoinTokens")
+    private SwarmJoinTokens joinTokens;
+
+    /**
+     * @see #joinTokens
+     */
+    @CheckForNull
+    public SwarmJoinTokens getJoinTokens() {
+        return joinTokens;
+    }
+
+    /**
+     * @see #joinTokens
+     */
+    public Swarm withJoinTokens(SwarmJoinTokens joinTokens) {
+        this.joinTokens = joinTokens;
+        return this;
+    }
+
+    @Override
+    public Swarm withCreatedAt(Date createdAt) {
+        super.withCreatedAt(createdAt);
+        return this;
+    }
+
+    @Override
+    public Swarm withId(String id) {
+        super.withId(id);
+        return this;
+    }
+
+    @Override
+    public Swarm withSpec(SwarmSpec spec) {
+        super.withSpec(spec);
+        return this;
+    }
+
+    @Override
+    public Swarm withUpdatedAt(Date updatedAt) {
+        super.withUpdatedAt(updatedAt);
+        return this;
+    }
+
+    @Override
+    public Swarm withVersion(ResourceVersion version) {
+        super.withVersion(version);
+        return this;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java b/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
new file mode 100644
index 000000000..d2ca4ae29
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
@@ -0,0 +1,83 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SwarmCAConfig implements Serializable {
+
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("NodeCertExpiry")
+    private Long nodeCertExpiry;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("ExternalCAs")
+    private List<ExternalCA> externalCA;
+
+    /**
+     * @see #nodeCertExpiry
+     */
+    @CheckForNull
+    public Long getNodeCertExpiry() {
+        return nodeCertExpiry;
+    }
+
+    /**
+     * @see #nodeCertExpiry
+     */
+    public SwarmCAConfig withNodeCertExpiry(Long nodeCertExpiry) {
+        this.nodeCertExpiry = nodeCertExpiry;
+        return this;
+    }
+
+    /**
+     * @see #externalCA
+     */
+    @CheckForNull
+    public List<ExternalCA> getExternalCA() {
+        return externalCA;
+    }
+
+    /**
+     * @see #externalCA
+     */
+    public SwarmCAConfig withExternalCA(List<ExternalCA> externalCA) {
+        this.externalCA = externalCA;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java b/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
new file mode 100644
index 000000000..71503df1b
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
@@ -0,0 +1,61 @@
+package com.github.dockerjava.api.model;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SwarmDispatcherConfig implements Serializable {
+
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("HeartbeatPeriod")
+    private Long heartbeatPeriod;
+
+    /**
+     * @see #heartbeatPeriod
+     */
+    @CheckForNull
+    public Long getHeartbeatPeriod() {
+        return heartbeatPeriod;
+    }
+
+    /**
+     * @see #heartbeatPeriod
+     */
+    public SwarmDispatcherConfig withHeartbeatPeriod(Long heartbeatPeriod) {
+        this.heartbeatPeriod = heartbeatPeriod;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java b/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
new file mode 100644
index 000000000..98705ea30
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
@@ -0,0 +1,237 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @since 1.24
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SwarmInfo implements Serializable {
+
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("NodeID")
+    private String nodeID;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("NodeAddr")
+    private String nodeAddr;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("LocalNodeState")
+    private LocalNodeState localNodeState;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("ControlAvailable")
+    private Boolean controlAvailable;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Error")
+    private String error;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("RemoteManagers")
+    private List<PeerNode> remoteManagers;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Nodes")
+    private Integer nodes;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Managers")
+    private Integer managers;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("ClusterInfo")
+    private ClusterInfo clusterInfo;
+
+    /**
+     * @see #nodeID
+     */
+    @CheckForNull
+    public String getNodeID() {
+        return nodeID;
+    }
+
+    /**
+     * @see #nodeID
+     */
+    public SwarmInfo withNodeID(String nodeID) {
+        this.nodeID = nodeID;
+        return this;
+    }
+
+    /**
+     * @see #nodeAddr
+     */
+    @CheckForNull
+    public String getNodeAddr() {
+        return nodeAddr;
+    }
+
+    /**
+     * @see #nodeAddr
+     */
+    public SwarmInfo withNodeAddr(String nodeAddr) {
+        this.nodeAddr = nodeAddr;
+        return this;
+    }
+
+    /**
+     * @see #localNodeState
+     */
+    @CheckForNull
+    public LocalNodeState getLocalNodeState() {
+        return localNodeState;
+    }
+
+    /**
+     * @see #localNodeState
+     */
+    public SwarmInfo withLocalNodeState(LocalNodeState localNodeState) {
+        this.localNodeState = localNodeState;
+        return this;
+    }
+
+    /**
+     * @see #controlAvailable
+     */
+    @CheckForNull
+    public Boolean getControlAvailable() {
+        return controlAvailable;
+    }
+
+    /**
+     * @see #controlAvailable
+     */
+    public SwarmInfo withControlAvailable(Boolean controlAvailable) {
+        this.controlAvailable = controlAvailable;
+        return this;
+    }
+
+    /**
+     * @see #error
+     */
+    @CheckForNull
+    public String getError() {
+        return error;
+    }
+
+    /**
+     * @see #error
+     */
+    public SwarmInfo withError(String error) {
+        this.error = error;
+        return this;
+    }
+
+    /**
+     * @see #remoteManagers
+     */
+    @CheckForNull
+    public List<PeerNode> getRemoteManagers() {
+        return remoteManagers;
+    }
+
+    /**
+     * @see #remoteManagers
+     */
+    public SwarmInfo withRemoteManagers(List<PeerNode> remoteManagers) {
+        this.remoteManagers = remoteManagers;
+        return this;
+    }
+
+    /**
+     * @see #nodes
+     */
+    @CheckForNull
+    public Integer getNodes() {
+        return nodes;
+    }
+
+    /**
+     * @see #nodes
+     */
+    public SwarmInfo withNodes(Integer nodes) {
+        this.nodes = nodes;
+        return this;
+    }
+
+    /**
+     * @see #managers
+     */
+    @CheckForNull
+    public Integer getManagers() {
+        return managers;
+    }
+
+    /**
+     * @see #managers
+     */
+    public SwarmInfo withManagers(Integer managers) {
+        this.managers = managers;
+        return this;
+    }
+
+    /**
+     * @see #clusterInfo
+     */
+    @CheckForNull
+    public ClusterInfo getClusterInfo() {
+        return clusterInfo;
+    }
+
+    /**
+     * @see #clusterInfo
+     */
+    public SwarmInfo withClusterInfo(ClusterInfo clusterInfo) {
+        this.clusterInfo = clusterInfo;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java b/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
new file mode 100644
index 000000000..f4a415223
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
@@ -0,0 +1,82 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SwarmJoinTokens implements Serializable {
+
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Worker")
+    private String worker;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Manager")
+    private String manager;
+
+    /**
+     * @see #worker
+     */
+    @CheckForNull
+    public String getWorker() {
+        return worker;
+    }
+
+    /**
+     * @see #worker
+     */
+    public SwarmJoinTokens withWorker(String worker) {
+        this.worker = worker;
+        return this;
+    }
+
+    /**
+     * @see #manager
+     */
+    @CheckForNull
+    public String getManager() {
+        return manager;
+    }
+
+    /**
+     * @see #manager
+     */
+    public SwarmJoinTokens withManager(String manager) {
+        this.manager = manager;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java b/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
new file mode 100644
index 000000000..a6f0f5095
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
@@ -0,0 +1,60 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SwarmOrchestration implements Serializable {
+
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("TaskHistoryRetentionLimit")
+    private int taskHistoryRententionLimit;
+
+    /**
+     * @see #taskHistoryRententionLimit
+     */
+    @CheckForNull
+    public int getTaskHistoryRententionLimit() {
+        return taskHistoryRententionLimit;
+    }
+
+    /**
+     * @see #taskHistoryRententionLimit
+     */
+    public SwarmOrchestration withTaskHistoryRententionLimit(int taskHistoryRententionLimit) {
+        this.taskHistoryRententionLimit = taskHistoryRententionLimit;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java b/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
new file mode 100644
index 000000000..666d26017
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
@@ -0,0 +1,126 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SwarmRaftConfig implements Serializable {
+
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("LogEntriesForSlowFollowers")
+    private long logEntriesForSlowFollowers;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("HeartbeatTick")
+    private int heartbeatTick;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("SnapshotInterval")
+    private long snapshotInterval;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("ElectionTick")
+    private int electionTick;
+
+    /**
+     * @see #logEntriesForSlowFollowers
+     */
+    @CheckForNull
+    public long getLogEntriesForSlowFollowers() {
+        return logEntriesForSlowFollowers;
+    }
+
+    /**
+     * @see #logEntriesForSlowFollowers
+     */
+    public SwarmRaftConfig withLogEntriesForSlowFollowers(long logEntriesForSlowFollowers) {
+        this.logEntriesForSlowFollowers = logEntriesForSlowFollowers;
+        return this;
+    }
+
+    /**
+     * @see #heartbeatTick
+     */
+    @CheckForNull
+    public int getHeartbeatTick() {
+        return heartbeatTick;
+    }
+
+    /**
+     * @see #heartbeatTick
+     */
+    public SwarmRaftConfig withHeartbeatTick(int heartbeatTick) {
+        this.heartbeatTick = heartbeatTick;
+        return this;
+    }
+
+    /**
+     * @see #snapshotInterval
+     */
+    @CheckForNull
+    public long getSnapshotInterval() {
+        return snapshotInterval;
+    }
+
+    /**
+     * @see #snapshotInterval
+     */
+    public SwarmRaftConfig withSnapshotInterval(long snapshotInterval) {
+        this.snapshotInterval = snapshotInterval;
+        return this;
+    }
+
+    /**
+     * @see #electionTick
+     */
+    @CheckForNull
+    public int getElectionTick() {
+        return electionTick;
+    }
+
+    /**
+     * @see #electionTick
+     */
+    public SwarmRaftConfig withElectionTick(int electionTick) {
+        this.electionTick = electionTick;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java b/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
new file mode 100644
index 000000000..4ff7d7608
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
@@ -0,0 +1,172 @@
+package com.github.dockerjava.api.model;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SwarmSpec implements Serializable {
+
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Dispatcher")
+    private SwarmDispatcherConfig dispatcher;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Orchestration")
+    private SwarmOrchestration orchestration;
+
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("CAConfig")
+    private SwarmCAConfig caConfig;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Raft")
+    private SwarmRaftConfig raft;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("TaskDefaults")
+    private TaskDefaults taskDefaults;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Name")
+    private String name;
+
+    /**
+     * @see #dispatcher
+     */
+    @CheckForNull
+    public SwarmDispatcherConfig getDispatcher() {
+        return dispatcher;
+    }
+
+    /**
+     * @see #dispatcher
+     */
+    public SwarmSpec withDispatcher(SwarmDispatcherConfig dispatcher) {
+        this.dispatcher = dispatcher;
+        return this;
+    }
+
+    /**
+     * @see #orchestration
+     */
+    @CheckForNull
+    public SwarmOrchestration getOrchestration() {
+        return orchestration;
+    }
+
+    /**
+     * @see #orchestration
+     */
+    public SwarmSpec withOrchestration(SwarmOrchestration orchestration) {
+        this.orchestration = orchestration;
+        return this;
+    }
+
+    /**
+     * @see #caConfig
+     */
+    @CheckForNull
+    public SwarmCAConfig getCaConfig() {
+        return caConfig;
+    }
+
+    /**
+     * @see #caConfig
+     */
+    public SwarmSpec withCaConfig(SwarmCAConfig caConfig) {
+        this.caConfig = caConfig;
+        return this;
+    }
+
+    /**
+     * @see #raft
+     */
+    @CheckForNull
+    public SwarmRaftConfig getRaft() {
+        return raft;
+    }
+
+    /**
+     * @see #raft
+     */
+    public SwarmSpec withRaft(SwarmRaftConfig raft) {
+        this.raft = raft;
+        return this;
+    }
+
+    /**
+     * @see #taskDefaults
+     */
+    @CheckForNull
+    public TaskDefaults getTaskDefaults() {
+        return taskDefaults;
+    }
+
+    /**
+     * @see #taskDefaults
+     */
+    public SwarmSpec withTaskDefaults(TaskDefaults taskDefaults) {
+        this.taskDefaults = taskDefaults;
+        return this;
+    }
+
+    /**
+     * @see #name
+     */
+    @CheckForNull
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @see #name
+     */
+    public SwarmSpec withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java b/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
new file mode 100644
index 000000000..ee1c0cba7
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
@@ -0,0 +1,60 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SwarmVersion implements Serializable {
+
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Index")
+    private long index;
+
+    /**
+     * @see #index
+     */
+    @CheckForNull
+    public long getIndex() {
+        return index;
+    }
+
+    /**
+     * @see #index
+     */
+    public SwarmVersion withIndex(long index) {
+        this.index = index;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java b/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
new file mode 100644
index 000000000..394689127
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
@@ -0,0 +1,61 @@
+package com.github.dockerjava.api.model;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class TaskDefaults implements Serializable {
+
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("LogDriver")
+    private Driver logDriver;
+
+    /**
+     * @see #logDriver
+     */
+    @CheckForNull
+    public Driver getLogDriver() {
+        return logDriver;
+    }
+
+    /**
+     * @see #logDriver
+     */
+    public TaskDefaults withLogDriver(Driver logDriver) {
+        this.logDriver = logDriver;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 2d0b5caab..1de47fdd0 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -1,12 +1,5 @@
 package com.github.dockerjava.core;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd;
@@ -27,12 +20,16 @@
 import com.github.dockerjava.api.command.ExecCreateCmd;
 import com.github.dockerjava.api.command.ExecStartCmd;
 import com.github.dockerjava.api.command.InfoCmd;
+import com.github.dockerjava.api.command.InitializeSwarmCmd;
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectNetworkCmd;
+import com.github.dockerjava.api.command.InspectSwarmCmd;
 import com.github.dockerjava.api.command.InspectVolumeCmd;
+import com.github.dockerjava.api.command.JoinSwarmCmd;
 import com.github.dockerjava.api.command.KillContainerCmd;
+import com.github.dockerjava.api.command.LeaveSwarmCmd;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
@@ -47,6 +44,7 @@
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
+import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.api.command.SearchImagesCmd;
@@ -57,11 +55,12 @@
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 import com.github.dockerjava.api.command.UpdateContainerCmd;
+import com.github.dockerjava.api.command.UpdateSwarmCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
-import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Identifier;
+import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.core.command.AttachContainerCmdImpl;
 import com.github.dockerjava.core.command.AuthCmdImpl;
 import com.github.dockerjava.core.command.BuildImageCmdImpl;
@@ -80,12 +79,16 @@
 import com.github.dockerjava.core.command.ExecCreateCmdImpl;
 import com.github.dockerjava.core.command.ExecStartCmdImpl;
 import com.github.dockerjava.core.command.InfoCmdImpl;
+import com.github.dockerjava.core.command.InitializeSwarmCmdImpl;
 import com.github.dockerjava.core.command.InpectNetworkCmdImpl;
 import com.github.dockerjava.core.command.InspectContainerCmdImpl;
 import com.github.dockerjava.core.command.InspectExecCmdImpl;
 import com.github.dockerjava.core.command.InspectImageCmdImpl;
+import com.github.dockerjava.core.command.InspectSwarmCmdImpl;
 import com.github.dockerjava.core.command.InspectVolumeCmdImpl;
+import com.github.dockerjava.core.command.JoinSwarmCmdImpl;
 import com.github.dockerjava.core.command.KillContainerCmdImpl;
+import com.github.dockerjava.core.command.LeaveSwarmCmdImpl;
 import com.github.dockerjava.core.command.ListContainersCmdImpl;
 import com.github.dockerjava.core.command.ListImagesCmdImpl;
 import com.github.dockerjava.core.command.ListNetworksCmdImpl;
@@ -100,6 +103,7 @@
 import com.github.dockerjava.core.command.RemoveImageCmdImpl;
 import com.github.dockerjava.core.command.RemoveNetworkCmdImpl;
 import com.github.dockerjava.core.command.RemoveVolumeCmdImpl;
+import com.github.dockerjava.core.command.RenameContainerCmdImpl;
 import com.github.dockerjava.core.command.RestartContainerCmdImpl;
 import com.github.dockerjava.core.command.SaveImageCmdImpl;
 import com.github.dockerjava.core.command.SearchImagesCmdImpl;
@@ -110,11 +114,17 @@
 import com.github.dockerjava.core.command.TopContainerCmdImpl;
 import com.github.dockerjava.core.command.UnpauseContainerCmdImpl;
 import com.github.dockerjava.core.command.UpdateContainerCmdImpl;
+import com.github.dockerjava.core.command.UpdateSwarmCmdImpl;
 import com.github.dockerjava.core.command.VersionCmdImpl;
 import com.github.dockerjava.core.command.WaitContainerCmdImpl;
-import com.github.dockerjava.core.command.RenameContainerCmdImpl;
 
 import javax.annotation.Nonnull;
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * @author Konstantin Pelykh (kpelykh@gmail.com)
@@ -483,6 +493,31 @@ public DisconnectFromNetworkCmd disconnectFromNetworkCmd() {
         return new DisconnectFromNetworkCmdImpl(getDockerCmdExecFactory().createDisconnectFromNetworkCmdExec());
     }
 
+    @Override
+    public InitializeSwarmCmd initializeSwarmCmd(SwarmSpec swarmSpec) {
+        return new InitializeSwarmCmdImpl(getDockerCmdExecFactory().createInitializeSwarmCmdExec(), swarmSpec);
+    }
+
+    @Override
+    public InspectSwarmCmd inspectSwarmCmd() {
+        return new InspectSwarmCmdImpl(getDockerCmdExecFactory().createInspectSwarmCmdExec());
+    }
+
+    @Override
+    public JoinSwarmCmd joinSwarmCmd() {
+        return new JoinSwarmCmdImpl(getDockerCmdExecFactory().createJoinSwarmCmdExec());
+    }
+
+    @Override
+    public LeaveSwarmCmd leaveSwarmCmd() {
+        return new LeaveSwarmCmdImpl(getDockerCmdExecFactory().createLeaveSwarmCmdExec());
+    }
+
+    @Override
+    public UpdateSwarmCmd updateSwarmCmd(SwarmSpec swarmSpec) {
+        return new UpdateSwarmCmdImpl(getDockerCmdExecFactory().createUpdateSwarmCmdExec(), swarmSpec);
+    }
+
     @Override
     public void close() throws IOException {
         getDockerCmdExecFactory().close();
diff --git a/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java
new file mode 100644
index 000000000..6f81f1bf0
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java
@@ -0,0 +1,95 @@
+package com.github.dockerjava.core.command;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.command.InitializeSwarmCmd;
+import com.github.dockerjava.api.model.SwarmSpec;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import javax.annotation.CheckForNull;
+
+public class InitializeSwarmCmdImpl extends AbstrDockerCmd<InitializeSwarmCmd, Void> implements
+        InitializeSwarmCmd {
+
+    @JsonProperty("ListenAddr")
+    private String listenAddr = "0.0.0.0";
+
+    @JsonProperty("AdvertiseAddr")
+    private String advertiseAddr;
+
+    @JsonProperty("ForceNewCluster")
+    private boolean forceNewCluster;
+
+    @JsonProperty("Spec")
+    private SwarmSpec spec;
+
+    public InitializeSwarmCmdImpl(InitializeSwarmCmd.Exec exec, SwarmSpec swarmSpec) {
+        super(exec);
+        this.spec = swarmSpec;
+    }
+
+    @Override
+    @CheckForNull
+    public String getListenAddr() {
+        return listenAddr;
+    }
+
+    @Override
+    public InitializeSwarmCmd withListenAddr(String listenAddr) {
+        this.listenAddr = listenAddr;
+        return this;
+    }
+
+    @Override
+    @CheckForNull
+    public String getAdvertiseAddr() {
+        return advertiseAddr;
+    }
+
+    @Override
+    public InitializeSwarmCmd withAdvertiseAddr(String advertiseAddr) {
+        this.advertiseAddr = advertiseAddr;
+        return this;
+    }
+
+    @Override
+    @CheckForNull
+    public Boolean isForceNewCluster() {
+        return forceNewCluster;
+    }
+
+    @Override
+    public InitializeSwarmCmd withForceNewCluster(Boolean forceNewCluster) {
+        this.forceNewCluster = forceNewCluster;
+        return this;
+    }
+
+    @Override
+    @CheckForNull
+    public SwarmSpec getSwarmSpec() {
+        return spec;
+    }
+
+    @Override
+    public InitializeSwarmCmd withSwarmSpec(SwarmSpec swarmSpec) {
+        this.spec = swarmSpec;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectSwarmCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectSwarmCmdImpl.java
new file mode 100644
index 000000000..c084c8af9
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/InspectSwarmCmdImpl.java
@@ -0,0 +1,21 @@
+package com.github.dockerjava.core.command;
+
+
+import com.github.dockerjava.api.command.InspectSwarmCmd;
+import com.github.dockerjava.api.model.Swarm;
+
+/**
+ * Inspect a swarm.
+ */
+public class InspectSwarmCmdImpl extends AbstrDockerCmd<InspectSwarmCmd, Swarm> implements
+        InspectSwarmCmd {
+
+    public InspectSwarmCmdImpl(InspectSwarmCmd.Exec exec) {
+        super(exec);
+    }
+
+    @Override
+    public Swarm exec() {
+        return super.exec();
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java
new file mode 100644
index 000000000..08e3a7cdc
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java
@@ -0,0 +1,96 @@
+package com.github.dockerjava.core.command;
+
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.command.JoinSwarmCmd;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import javax.annotation.CheckForNull;
+import java.util.List;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class JoinSwarmCmdImpl extends AbstrDockerCmd<JoinSwarmCmd, Void> implements
+        JoinSwarmCmd {
+
+    @JsonProperty("ListenAddr")
+    private String listenAddr = "0.0.0.0";
+
+    @JsonProperty("AdvertiseAddr")
+    private String advertiseAddr;
+
+    @JsonProperty("RemoteAddrs")
+    private List<String> remoteAddrs;
+
+    @JsonProperty("JoinToken")
+    private String joinToken;
+
+    public JoinSwarmCmdImpl(JoinSwarmCmd.Exec exec) {
+        super(exec);
+    }
+
+    @Override
+    @CheckForNull
+    public String getListenAddr() {
+        return listenAddr;
+    }
+
+    @Override
+    public JoinSwarmCmd withListenAddr(String listenAddr) {
+        this.listenAddr = listenAddr;
+        return this;
+    }
+
+    @Override
+    @CheckForNull
+    public String getAdvertiseAddr() {
+        return advertiseAddr;
+    }
+
+    @Override
+    public JoinSwarmCmd withAdvertiseAddr(String advertiseAddr) {
+        this.advertiseAddr = advertiseAddr;
+        return this;
+    }
+
+    @Override
+    @CheckForNull
+    public List<String> getRemoteAddrs() {
+        return remoteAddrs;
+    }
+
+    @Override
+    public JoinSwarmCmd withRemoteAddrs(List<String> remoteAddrs) {
+        this.remoteAddrs = remoteAddrs;
+        return this;
+    }
+
+    @Override
+    @CheckForNull
+    public String getJoinToken() {
+        return joinToken;
+    }
+
+    @Override
+    public JoinSwarmCmd withJoinToken(String joinToken) {
+        this.joinToken = joinToken;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/LeaveSwarmCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/LeaveSwarmCmdImpl.java
new file mode 100644
index 000000000..a5731bc1e
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/LeaveSwarmCmdImpl.java
@@ -0,0 +1,34 @@
+package com.github.dockerjava.core.command;
+
+
+import com.github.dockerjava.api.command.LeaveSwarmCmd;
+
+import javax.annotation.CheckForNull;
+
+public class LeaveSwarmCmdImpl extends AbstrDockerCmd<LeaveSwarmCmd, Void> implements LeaveSwarmCmd {
+
+    private Boolean force;
+
+    public LeaveSwarmCmdImpl(LeaveSwarmCmd.Exec exec) {
+        super(exec);
+    }
+
+    @Override
+    @CheckForNull
+    public Boolean hasForceEnabled() {
+        return force;
+    }
+
+    @Override
+    public LeaveSwarmCmd withForceEnabled(Boolean force) {
+        this.force = force;
+        return this;
+    }
+
+    @Override
+    public Void exec() {
+        return super.exec();
+    }
+
+
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java
new file mode 100644
index 000000000..d1eefcae2
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java
@@ -0,0 +1,69 @@
+package com.github.dockerjava.core.command;
+
+
+import com.github.dockerjava.api.command.UpdateSwarmCmd;
+import com.github.dockerjava.api.model.SwarmSpec;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Update a swarm.
+ */
+public class UpdateSwarmCmdImpl extends AbstrDockerCmd<UpdateSwarmCmd, Void> implements
+        UpdateSwarmCmd {
+
+    private Long version;
+    private Boolean rotateWorkerToken;
+    private Boolean rotateManagerToken;
+    private SwarmSpec swarmSpec;
+
+    public UpdateSwarmCmdImpl(Exec exec, SwarmSpec swarmSpec) {
+        super(exec);
+        this.swarmSpec = swarmSpec;
+    }
+
+    @Override
+    public Long getVersion() {
+        return version;
+    }
+
+    @Override
+    public UpdateSwarmCmd withVersion(Long version) {
+        this.version = version;
+        return this;
+    }
+
+    @Override
+    public Boolean getRotateWorkerToken() {
+        return rotateWorkerToken;
+    }
+
+    @Override
+    public UpdateSwarmCmd withRotateWorkerToken(Boolean rotateWorkerToken) {
+        this.rotateWorkerToken = rotateWorkerToken;
+        return this;
+    }
+
+    @Override
+    public Boolean getRotateManagerToken() {
+        return rotateManagerToken;
+    }
+
+    @Override
+    public UpdateSwarmCmd withRotateManagerToken(Boolean rotateManagerToken) {
+        this.rotateManagerToken = rotateManagerToken;
+        return this;
+    }
+
+    @Override
+    public SwarmSpec getSwarmSpec() {
+        return swarmSpec;
+    }
+
+    @Override
+    public UpdateSwarmCmd withSwarmSpec(SwarmSpec swarmSpec) {
+        checkNotNull(swarmSpec, "swarmSpec was not specified");
+        this.swarmSpec = swarmSpec;
+        return this;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java
new file mode 100644
index 000000000..b3cdc83d4
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java
@@ -0,0 +1,32 @@
+package com.github.dockerjava.jaxrs;
+
+
+import com.github.dockerjava.api.command.InitializeSwarmCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import static javax.ws.rs.client.Entity.entity;
+
+public class InitializeSwarmCmdExec extends AbstrSyncDockerCmdExec<InitializeSwarmCmd, Void>
+        implements InitializeSwarmCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InitializeSwarmCmdExec.class);
+
+    public InitializeSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(InitializeSwarmCmd command) {
+        WebTarget webResource = getBaseResource().path("/swarm/init");
+
+        LOGGER.trace("POST: {} ", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(entity(command, MediaType.APPLICATION_JSON)).close();
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java
new file mode 100644
index 000000000..87aa167c6
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java
@@ -0,0 +1,29 @@
+package com.github.dockerjava.jaxrs;
+
+
+import com.github.dockerjava.api.command.InspectSwarmCmd;
+import com.github.dockerjava.api.model.Swarm;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+public class InspectSwarmCmdExec extends AbstrSyncDockerCmdExec<InspectSwarmCmd, Swarm>
+        implements InspectSwarmCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InspectSwarmCmdExec.class);
+
+    public InspectSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Swarm execute(InspectSwarmCmd command) {
+        WebTarget webResource = getBaseResource().path("/swarm");
+
+        LOGGER.debug("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(Swarm.class);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
index 1ec3fbca0..6ad19667a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -1,40 +1,5 @@
 package com.github.dockerjava.jaxrs;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.ProxySelector;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import javax.net.ssl.SSLContext;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.client.ClientResponseFilter;
-import javax.ws.rs.client.WebTarget;
-
-import com.github.dockerjava.api.command.UpdateContainerCmd;
-import com.github.dockerjava.core.SSLConfig;
-
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.glassfish.jersey.CommonProperties;
-import org.glassfish.jersey.apache.connector.ApacheClientProperties;
-import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
-import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.client.ClientProperties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd;
@@ -55,12 +20,16 @@
 import com.github.dockerjava.api.command.ExecCreateCmd;
 import com.github.dockerjava.api.command.ExecStartCmd;
 import com.github.dockerjava.api.command.InfoCmd;
+import com.github.dockerjava.api.command.InitializeSwarmCmd;
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectNetworkCmd;
+import com.github.dockerjava.api.command.InspectSwarmCmd;
 import com.github.dockerjava.api.command.InspectVolumeCmd;
+import com.github.dockerjava.api.command.JoinSwarmCmd;
 import com.github.dockerjava.api.command.KillContainerCmd;
+import com.github.dockerjava.api.command.LeaveSwarmCmd;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
@@ -75,6 +44,7 @@
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
+import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.api.command.SearchImagesCmd;
@@ -84,14 +54,46 @@
 import com.github.dockerjava.api.command.TagImageCmd;
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
+import com.github.dockerjava.api.command.UpdateContainerCmd;
+import com.github.dockerjava.api.command.UpdateSwarmCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
-import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.SSLConfig;
 import com.github.dockerjava.jaxrs.filter.JsonClientFilter;
 import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter;
 import com.github.dockerjava.jaxrs.filter.SelectiveLoggingFilter;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.glassfish.jersey.CommonProperties;
+import org.glassfish.jersey.apache.connector.ApacheClientProperties;
+import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.ClientProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.SSLContext;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.client.ClientResponseFilter;
+import javax.ws.rs.client.WebTarget;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static com.google.common.base.Preconditions.checkNotNull;
 
 //import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 // see https://github.com/docker-java/docker-java/issues/196
@@ -550,6 +552,30 @@ public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() {
         return new DisconnectFromNetworkCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public InitializeSwarmCmd.Exec createInitializeSwarmCmdExec() {
+        return new InitializeSwarmCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectSwarmCmd.Exec createInspectSwarmCmdExec() {
+        return new InspectSwarmCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public JoinSwarmCmd.Exec createJoinSwarmCmdExec() {
+        return new JoinSwarmCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public LeaveSwarmCmd.Exec createLeaveSwarmCmdExec() {
+        return new LeaveSwarmCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() {
+        return new UpdateSwarmCmdExec(getBaseResource(), getDockerClientConfig());
+    }
     @Override
     public void close() throws IOException {
         checkNotNull(client, "Factory not initialized. You probably forgot to call init()!");
diff --git a/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java
new file mode 100644
index 000000000..a19b7a18d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java
@@ -0,0 +1,32 @@
+package com.github.dockerjava.jaxrs;
+
+
+import com.github.dockerjava.api.command.JoinSwarmCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import static javax.ws.rs.client.Entity.entity;
+
+public class JoinSwarmCmdExec extends AbstrSyncDockerCmdExec<JoinSwarmCmd, Void>
+        implements JoinSwarmCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InitializeSwarmCmdExec.class);
+
+    public JoinSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(JoinSwarmCmd command) {
+        WebTarget webResource = getBaseResource().path("/swarm/join");
+
+        LOGGER.trace("POST: {} ", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(entity(command, MediaType.APPLICATION_JSON)).close();
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java
new file mode 100644
index 000000000..9723980a5
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java
@@ -0,0 +1,32 @@
+package com.github.dockerjava.jaxrs;
+
+
+import com.github.dockerjava.api.command.LeaveSwarmCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+public class LeaveSwarmCmdExec extends AbstrSyncDockerCmdExec<LeaveSwarmCmd, Void> implements LeaveSwarmCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(LeaveSwarmCmdExec.class);
+
+    public LeaveSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(LeaveSwarmCmd command) {
+        WebTarget webTarget = getBaseResource().path("/swarm/leave");
+
+        webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled());
+
+        LOGGER.trace("POST: {}", webTarget);
+        webTarget.request().accept(MediaType.APPLICATION_JSON)
+                .post(null).close();
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java
new file mode 100644
index 000000000..833dd79ae
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java
@@ -0,0 +1,35 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.command.UpdateSwarmCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import static javax.ws.rs.client.Entity.entity;
+
+public class UpdateSwarmCmdExec extends AbstrSyncDockerCmdExec<UpdateSwarmCmd, Void>
+        implements UpdateSwarmCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(UpdateSwarmCmdExec.class);
+
+    public UpdateSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(UpdateSwarmCmd command) {
+        WebTarget webResource = getBaseResource().path("/swarm/update")
+                .queryParam("version", command.getVersion());
+
+        webResource = booleanQueryParam(webResource, "rotateManagerToken", command.getRotateManagerToken());
+        webResource = booleanQueryParam(webResource, "rotateWorkerToken", command.getRotateWorkerToken());
+
+        LOGGER.trace("POST: {} ", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(entity(command.getSwarmSpec(), MediaType.APPLICATION_JSON));
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index 2c8a83b0e..ac03fa2fd 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -19,12 +19,16 @@
 import com.github.dockerjava.api.command.ExecCreateCmd;
 import com.github.dockerjava.api.command.ExecStartCmd;
 import com.github.dockerjava.api.command.InfoCmd;
+import com.github.dockerjava.api.command.InitializeSwarmCmd;
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectNetworkCmd;
+import com.github.dockerjava.api.command.InspectSwarmCmd;
 import com.github.dockerjava.api.command.InspectVolumeCmd;
+import com.github.dockerjava.api.command.JoinSwarmCmd;
 import com.github.dockerjava.api.command.KillContainerCmd;
+import com.github.dockerjava.api.command.LeaveSwarmCmd;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
@@ -39,6 +43,7 @@
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
+import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.api.command.SearchImagesCmd;
@@ -49,9 +54,9 @@
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 import com.github.dockerjava.api.command.UpdateContainerCmd;
+import com.github.dockerjava.api.command.UpdateSwarmCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
-import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.DockerClientImpl;
 import com.github.dockerjava.core.SSLConfig;
@@ -73,12 +78,16 @@
 import com.github.dockerjava.netty.exec.ExecCreateCmdExec;
 import com.github.dockerjava.netty.exec.ExecStartCmdExec;
 import com.github.dockerjava.netty.exec.InfoCmdExec;
+import com.github.dockerjava.netty.exec.InitializeSwarmCmdExec;
 import com.github.dockerjava.netty.exec.InspectContainerCmdExec;
 import com.github.dockerjava.netty.exec.InspectExecCmdExec;
 import com.github.dockerjava.netty.exec.InspectImageCmdExec;
 import com.github.dockerjava.netty.exec.InspectNetworkCmdExec;
+import com.github.dockerjava.netty.exec.InspectSwarmCmdExec;
 import com.github.dockerjava.netty.exec.InspectVolumeCmdExec;
+import com.github.dockerjava.netty.exec.JoinSwarmCmdExec;
 import com.github.dockerjava.netty.exec.KillContainerCmdExec;
+import com.github.dockerjava.netty.exec.LeaveSwarmCmdExec;
 import com.github.dockerjava.netty.exec.ListContainersCmdExec;
 import com.github.dockerjava.netty.exec.ListImagesCmdExec;
 import com.github.dockerjava.netty.exec.ListNetworksCmdExec;
@@ -93,6 +102,7 @@
 import com.github.dockerjava.netty.exec.RemoveImageCmdExec;
 import com.github.dockerjava.netty.exec.RemoveNetworkCmdExec;
 import com.github.dockerjava.netty.exec.RemoveVolumeCmdExec;
+import com.github.dockerjava.netty.exec.RenameContainerCmdExec;
 import com.github.dockerjava.netty.exec.RestartContainerCmdExec;
 import com.github.dockerjava.netty.exec.SaveImageCmdExec;
 import com.github.dockerjava.netty.exec.SearchImagesCmdExec;
@@ -103,10 +113,9 @@
 import com.github.dockerjava.netty.exec.TopContainerCmdExec;
 import com.github.dockerjava.netty.exec.UnpauseContainerCmdExec;
 import com.github.dockerjava.netty.exec.UpdateContainerCmdExec;
+import com.github.dockerjava.netty.exec.UpdateSwarmCmdExec;
 import com.github.dockerjava.netty.exec.VersionCmdExec;
 import com.github.dockerjava.netty.exec.WaitContainerCmdExec;
-import com.github.dockerjava.netty.exec.RenameContainerCmdExec;
-
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelConfig;
@@ -125,12 +134,10 @@
 import io.netty.handler.logging.LoggingHandler;
 import io.netty.handler.ssl.SslHandler;
 import io.netty.util.concurrent.DefaultThreadFactory;
-
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;
-
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -597,6 +604,31 @@ public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() {
         return new DisconnectFromNetworkCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public InitializeSwarmCmd.Exec createInitializeSwarmCmdExec() {
+        return new InitializeSwarmCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectSwarmCmd.Exec createInspectSwarmCmdExec() {
+        return new InspectSwarmCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public JoinSwarmCmd.Exec createJoinSwarmCmdExec() {
+        return new JoinSwarmCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public LeaveSwarmCmd.Exec createLeaveSwarmCmdExec() {
+        return new LeaveSwarmCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() {
+        return new UpdateSwarmCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public void close() throws IOException {
         checkNotNull(eventLoopGroup, "Factory not initialized. You probably forgot to call init()!");
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InitializeSwarmCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/InitializeSwarmCmdExec.java
new file mode 100644
index 000000000..a4a93609a
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/InitializeSwarmCmdExec.java
@@ -0,0 +1,29 @@
+package com.github.dockerjava.netty.exec;
+
+
+import com.github.dockerjava.api.command.InitializeSwarmCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class InitializeSwarmCmdExec extends AbstrSyncDockerCmdExec<InitializeSwarmCmd, Void>
+        implements InitializeSwarmCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InitializeSwarmCmdExec.class);
+
+    public InitializeSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(InitializeSwarmCmd command) {
+        WebTarget webResource = getBaseResource().path("/swarm/init");
+
+        LOGGER.trace("POST: {} ", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(command);
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectSwarmCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/InspectSwarmCmdExec.java
new file mode 100644
index 000000000..4753048b9
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/InspectSwarmCmdExec.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.netty.exec;
+
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.InspectSwarmCmd;
+import com.github.dockerjava.api.model.Swarm;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class InspectSwarmCmdExec extends AbstrSyncDockerCmdExec<InspectSwarmCmd, Swarm>
+        implements InspectSwarmCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InspectSwarmCmdExec.class);
+
+    public InspectSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Swarm execute(InspectSwarmCmd command) {
+        WebTarget webResource = getBaseResource().path("/swarm");
+
+        LOGGER.debug("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON)
+                .get(new TypeReference<Swarm>() {
+                });
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/JoinSwarmCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/JoinSwarmCmdExec.java
new file mode 100644
index 000000000..1fc3e07be
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/JoinSwarmCmdExec.java
@@ -0,0 +1,29 @@
+package com.github.dockerjava.netty.exec;
+
+
+import com.github.dockerjava.api.command.JoinSwarmCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class JoinSwarmCmdExec extends AbstrSyncDockerCmdExec<JoinSwarmCmd, Void>
+        implements JoinSwarmCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InitializeSwarmCmdExec.class);
+
+    public JoinSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(JoinSwarmCmd command) {
+        WebTarget webResource = getBaseResource().path("/swarm/join");
+
+        LOGGER.trace("POST: {} ", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(command);
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/LeaveSwarmCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/LeaveSwarmCmdExec.java
new file mode 100644
index 000000000..e9eb0d78d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/LeaveSwarmCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.LeaveSwarmCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LeaveSwarmCmdExec extends AbstrSyncDockerCmdExec<LeaveSwarmCmd, Void> implements LeaveSwarmCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(LeaveSwarmCmdExec.class);
+
+    public LeaveSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(LeaveSwarmCmd command) {
+        WebTarget webTarget = getBaseResource().path("/swarm/leave");
+
+        webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled());
+
+        LOGGER.trace("POST: {}", webTarget);
+        webTarget.request().accept(MediaType.APPLICATION_JSON)
+                .post(null);
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/UpdateSwarmCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/UpdateSwarmCmdExec.java
new file mode 100644
index 000000000..281d21afb
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/UpdateSwarmCmdExec.java
@@ -0,0 +1,32 @@
+package com.github.dockerjava.netty.exec;
+
+
+import com.github.dockerjava.api.command.UpdateSwarmCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class UpdateSwarmCmdExec extends AbstrSyncDockerCmdExec<UpdateSwarmCmd, Void>
+        implements UpdateSwarmCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(UpdateSwarmCmdExec.class);
+
+    public UpdateSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(UpdateSwarmCmd command) {
+        WebTarget webResource = getBaseResource().path("/swarm/update")
+                .queryParam("version", command.getVersion());
+        webResource = booleanQueryParam(webResource, "rotateManagerToken", command.getRotateManagerToken());
+        webResource = booleanQueryParam(webResource, "rotateWorkertoken", command.getRotateWorkerToken());
+
+        LOGGER.trace("POST: {} ", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(command.getSwarmSpec());
+        return null;
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index 46d6d4dcc..2dbf162ec 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -24,12 +24,16 @@
 import com.github.dockerjava.api.command.ExecCreateCmd;
 import com.github.dockerjava.api.command.ExecStartCmd;
 import com.github.dockerjava.api.command.InfoCmd;
+import com.github.dockerjava.api.command.InitializeSwarmCmd;
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectNetworkCmd;
+import com.github.dockerjava.api.command.InspectSwarmCmd;
 import com.github.dockerjava.api.command.InspectVolumeCmd;
+import com.github.dockerjava.api.command.JoinSwarmCmd;
 import com.github.dockerjava.api.command.KillContainerCmd;
+import com.github.dockerjava.api.command.LeaveSwarmCmd;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
@@ -55,6 +59,7 @@
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 import com.github.dockerjava.api.command.UpdateContainerCmd;
+import com.github.dockerjava.api.command.UpdateSwarmCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.BuildResponseItem;
@@ -427,6 +432,31 @@ public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() {
         return delegate.createDisconnectFromNetworkCmdExec();
     }
 
+    @Override
+    public InitializeSwarmCmd.Exec createInitializeSwarmCmdExec() {
+        return delegate.createInitializeSwarmCmdExec();
+    }
+
+    @Override
+    public InspectSwarmCmd.Exec createInspectSwarmCmdExec() {
+        return delegate.createInspectSwarmCmdExec();
+    }
+
+    @Override
+    public JoinSwarmCmd.Exec createJoinSwarmCmdExec() {
+        return delegate.createJoinSwarmCmdExec();
+    }
+
+    @Override
+    public LeaveSwarmCmd.Exec createLeaveSwarmCmdExec() {
+        return delegate.createLeaveSwarmCmdExec();
+    }
+
+    @Override
+    public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() {
+        return delegate.createUpdateSwarmCmdExec();
+    }
+
     public List<String> getContainerNames() {
         return new ArrayList<String>(containerNames);
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/AbstractSwarmDockerClientTest.java b/src/test/java/com/github/dockerjava/core/command/AbstractSwarmDockerClientTest.java
new file mode 100644
index 000000000..40c83a3e6
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/AbstractSwarmDockerClientTest.java
@@ -0,0 +1,132 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.ConflictException;
+import com.github.dockerjava.api.exception.NotAcceptableException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.PortBinding;
+import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.client.AbstractDockerClientTest;
+import com.github.dockerjava.core.DefaultDockerClientConfig;
+import com.github.dockerjava.core.DockerClientBuilder;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.testng.ITestResult;
+import org.testng.SkipException;
+
+import java.lang.reflect.Method;
+
+import static com.github.dockerjava.utils.TestUtils.getVersion;
+
+public abstract class AbstractSwarmDockerClientTest extends AbstractDockerClientTest {
+    protected DockerClient secondDockerClient;
+    private int numberOfDockersInDocker = 0;
+
+    private static final int PORT_START = 2378;
+    private static final String DOCKER_IN_DOCKER_CONTAINER_PREFIX = "docker";
+    private static final String NETWORK_NAME = "dind-network";
+    private static final int MAX_CONNECT_ATTEMPTS = 5;
+    private static final int CONNECT_ATTEMPT_INTERVAL = 200;
+    private static final String DOCKER_IN_DOCKER_IMAGE_REPOSITORY = "docker";
+    private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "1.12-dind";
+
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+
+        final RemoteApiVersion apiVersion = getVersion(dockerClient);
+        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_24)) {
+            throw new SkipException("API version should be >= 1.24");
+        }
+    }
+
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+        leaveIfInSwarm();
+    }
+
+    @Override
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+        removeDockersInDocker();
+    }
+
+    protected void removeDockersInDocker() {
+        for (int i = 1; i <= numberOfDockersInDocker; i++) {
+            try {
+                dockerClient.removeContainerCmd(DOCKER_IN_DOCKER_CONTAINER_PREFIX + i);
+            } catch (NotFoundException e) {
+                // container does not exist
+            }
+        }
+
+        try {
+            dockerClient.removeNetworkCmd(NETWORK_NAME).exec();
+        } catch (NotFoundException e) {
+            // network does not exist
+        }
+
+        numberOfDockersInDocker = 0;
+    }
+
+    protected DockerClient startDockerInDocker() {
+        numberOfDockersInDocker++;
+        String name = DOCKER_IN_DOCKER_CONTAINER_PREFIX + numberOfDockersInDocker;
+
+        // Delete if already exists
+        try {
+            dockerClient.removeContainerCmd(name).withForce(true).exec();
+        } catch (NotFoundException e) {
+            // container does not exist
+        }
+
+        // Create network if not already exists
+        try {
+            dockerClient.inspectNetworkCmd().withNetworkId(NETWORK_NAME).exec();
+        } catch (NotFoundException e) {
+            try {
+                dockerClient.createNetworkCmd().withName(NETWORK_NAME).exec();
+            } catch (ConflictException e2) {
+                // already exists
+            }
+        }
+
+        dockerClient.pullImageCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY)
+                .withTag(DOCKER_IN_DOCKER_IMAGE_TAG)
+                .exec(new PullImageResultCallback())
+                .awaitSuccess();
+
+        int port = PORT_START + (numberOfDockersInDocker - 1);
+        CreateContainerResponse response = dockerClient
+                .createContainerCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY + ":" + DOCKER_IN_DOCKER_IMAGE_TAG)
+                .withPrivileged(true)
+                .withName(name)
+                .withNetworkMode(NETWORK_NAME)
+                .withAliases(name)
+                .withPortBindings(new PortBinding(
+                        Ports.Binding.bindIpAndPort("127.0.0.1", port),
+                        ExposedPort.tcp(2375)))
+                .exec();
+        dockerClient.startContainerCmd(response.getId()).exec();
+
+        return initializeDockerClient(port);
+    }
+
+    private DockerClient initializeDockerClient(int port) {
+        DefaultDockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder()
+                .withRegistryUrl("https://index.docker.io/v1/")
+                .withDockerHost("tcp://localhost:" + port).build();
+        return DockerClientBuilder.getInstance(config)
+                .withDockerCmdExecFactory(initTestDockerCmdExecFactory())
+                .build();
+    }
+
+    private void leaveIfInSwarm() {
+        try {
+            // force in case this is a swarm manager
+            dockerClient.leaveSwarmCmd().withForceEnabled(true).exec();
+        } catch (NotAcceptableException e) {
+            // do nothing, node is not part of a swarm
+        }
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/InitializeSwarmCmdExecTest.java b/src/test/java/com/github/dockerjava/core/command/InitializeSwarmCmdExecTest.java
new file mode 100644
index 000000000..8b258af92
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/InitializeSwarmCmdExecTest.java
@@ -0,0 +1,97 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotAcceptableException;
+import com.github.dockerjava.api.model.Swarm;
+import com.github.dockerjava.api.model.SwarmCAConfig;
+import com.github.dockerjava.api.model.SwarmDispatcherConfig;
+import com.github.dockerjava.api.model.SwarmOrchestration;
+import com.github.dockerjava.api.model.SwarmRaftConfig;
+import com.github.dockerjava.api.model.SwarmSpec;
+import com.github.dockerjava.api.model.TaskDefaults;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+
+@Test(groups = "swarm-integration")
+public class InitializeSwarmCmdExecTest extends AbstractSwarmDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(InitializeSwarmCmdExecTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void initializeSwarm() throws DockerException {
+        SwarmSpec swarmSpec = new SwarmSpec()
+                .withName("swarm")
+                .withDispatcher(new SwarmDispatcherConfig()
+                        .withHeartbeatPeriod(10000000L)
+                ).withOrchestration(new SwarmOrchestration()
+                        .withTaskHistoryRententionLimit(100)
+                ).withCaConfig(new SwarmCAConfig()
+                        .withNodeCertExpiry(60 * 60 * 1000000000L /*ns */))
+                .withRaft(new SwarmRaftConfig()
+                        .withElectionTick(8)
+                        .withSnapshotInterval(20000)
+                        .withHeartbeatTick(5)
+                        .withLogEntriesForSlowFollowers(200)
+                ).withTaskDefaults(new TaskDefaults());
+
+        dockerClient.initializeSwarmCmd(swarmSpec)
+                .withListenAddr("127.0.0.1")
+                .withAdvertiseAddr("127.0.0.1")
+                .exec();
+        LOG.info("Initialized swarm: {}", swarmSpec.toString());
+
+        Swarm swarm = dockerClient.inspectSwarmCmd().exec();
+        LOG.info("Inspected swarm: {}", swarm.toString());
+        assertThat(swarm.getSpec(), is(equalTo(swarmSpec)));
+    }
+
+    @Test(expectedExceptions = NotAcceptableException.class)
+    public void initializingSwarmThrowsWhenAlreadyInSwarm() throws DockerException {
+        SwarmSpec swarmSpec = new SwarmSpec()
+                .withName("swarm");
+
+        dockerClient.initializeSwarmCmd(swarmSpec)
+                .withListenAddr("127.0.0.1")
+                .withAdvertiseAddr("127.0.0.1")
+                .exec();
+        LOG.info("Initialized swarm: {}", swarmSpec.toString());
+
+        // Initializing a swarm if already in swarm mode should fail
+        dockerClient.initializeSwarmCmd(swarmSpec)
+                .withListenAddr("127.0.0.1")
+                .exec();
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/JoinSwarmCmdExecTest.java b/src/test/java/com/github/dockerjava/core/command/JoinSwarmCmdExecTest.java
new file mode 100644
index 000000000..034091ef0
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/JoinSwarmCmdExecTest.java
@@ -0,0 +1,116 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotAcceptableException;
+import com.github.dockerjava.api.model.Info;
+import com.github.dockerjava.api.model.LocalNodeState;
+import com.github.dockerjava.api.model.Swarm;
+import com.github.dockerjava.api.model.SwarmJoinTokens;
+import com.github.dockerjava.api.model.SwarmSpec;
+import com.google.common.collect.Lists;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+
+@Test(groups = "swarm-integration")
+public class JoinSwarmCmdExecTest extends AbstractSwarmDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(JoinSwarmCmdExecTest.class);
+
+    @BeforeTest
+    @Override
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @BeforeMethod
+    @Override
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    private SwarmJoinTokens initSwarmOnDocker(DockerClient docker) {
+        SwarmSpec swarmSpec = new SwarmSpec();
+        docker.initializeSwarmCmd(swarmSpec)
+                .exec();
+        LOG.info("Initialized swarm docker1: {}", swarmSpec.toString());
+
+        Swarm swarm = docker.inspectSwarmCmd().exec();
+        LOG.info("Inspected swarm on docker1: {}", swarm.toString());
+        return swarm.getJoinTokens();
+    }
+
+    @Test
+    public void joinSwarmAsWorker() throws DockerException {
+        DockerClient docker1 = startDockerInDocker();
+        DockerClient docker2 = startDockerInDocker();
+
+        SwarmJoinTokens tokens = initSwarmOnDocker(docker1);
+
+        docker2.joinSwarmCmd()
+                .withRemoteAddrs(Lists.newArrayList("docker1"))
+                .withJoinToken(tokens.getWorker())
+                .exec();
+        LOG.info("docker2 joined docker1's swarm");
+
+        Info info = docker2.infoCmd().exec();
+        LOG.info("Inspected docker2: {}", info.toString());
+        assertThat(info.getSwarm().getLocalNodeState(), is(equalTo(LocalNodeState.ACTIVE)));
+    }
+
+    @Test
+    public void joinSwarmAsManager() throws DockerException, InterruptedException {
+        DockerClient docker1 = startDockerInDocker();
+        DockerClient docker2 = startDockerInDocker();
+
+        SwarmJoinTokens tokens = initSwarmOnDocker(docker1);
+
+        docker2.joinSwarmCmd()
+                .withRemoteAddrs(Lists.newArrayList("docker1"))
+                .withJoinToken(tokens.getManager())
+                .exec();
+        LOG.info("docker2 joined docker1's swarm");
+
+        Info info = docker2.infoCmd().exec();
+        LOG.info("Inspected docker2: {}", info.toString());
+        assertThat(info.getSwarm().getLocalNodeState(), is(equalTo(LocalNodeState.ACTIVE)));
+    }
+
+    @Test(expectedExceptions = NotAcceptableException.class)
+    public void joinSwarmIfAlreadyInSwarm() {
+        DockerClient docker1 = startDockerInDocker();
+        DockerClient docker2 = startDockerInDocker();
+
+        SwarmJoinTokens tokens = initSwarmOnDocker(docker1);
+
+        initSwarmOnDocker(docker2);
+
+        docker2.joinSwarmCmd()
+                .withRemoteAddrs(Lists.newArrayList("docker1"))
+                .withJoinToken(tokens.getWorker())
+                .exec();
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/LeaveSwarmCmdExecTest.java b/src/test/java/com/github/dockerjava/core/command/LeaveSwarmCmdExecTest.java
new file mode 100644
index 000000000..47e576452
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/LeaveSwarmCmdExecTest.java
@@ -0,0 +1,78 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotAcceptableException;
+import com.github.dockerjava.api.model.Info;
+import com.github.dockerjava.api.model.LocalNodeState;
+import com.github.dockerjava.api.model.SwarmSpec;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+@Test(groups = "swarm-integration")
+public class LeaveSwarmCmdExecTest extends AbstractSwarmDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(LeaveSwarmCmdExecTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void leaveSwarmAsMaster() throws DockerException {
+        SwarmSpec swarmSpec = new SwarmSpec().withName("firstSpec");
+        dockerClient.initializeSwarmCmd(swarmSpec)
+                .withListenAddr("127.0.0.1")
+                .withAdvertiseAddr("127.0.0.1")
+                .exec();
+        LOG.info("Initialized swarm: {}", swarmSpec.toString());
+
+        Info info = dockerClient.infoCmd().exec();
+        LOG.info("Inspected docker: {}", info.toString());
+
+        assertThat(info.getSwarm().getLocalNodeState(), is(LocalNodeState.ACTIVE));
+
+        dockerClient.leaveSwarmCmd()
+                .withForceEnabled(true)
+                .exec();
+        LOG.info("Left swarm");
+
+        info = dockerClient.infoCmd().exec();
+        LOG.info("Inspected docker: {}", info.toString());
+
+        assertThat(info.getSwarm().getLocalNodeState(), is(LocalNodeState.INACTIVE));
+
+    }
+
+    @Test(expectedExceptions = NotAcceptableException.class)
+    public void leavingSwarmThrowsWhenNotInSwarm() throws DockerException {
+        dockerClient.leaveSwarmCmd().exec();
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/UpdateSwarmCmdExecTest.java b/src/test/java/com/github/dockerjava/core/command/UpdateSwarmCmdExecTest.java
new file mode 100644
index 000000000..2fad713cb
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/UpdateSwarmCmdExecTest.java
@@ -0,0 +1,101 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotAcceptableException;
+import com.github.dockerjava.api.model.Swarm;
+import com.github.dockerjava.api.model.SwarmCAConfig;
+import com.github.dockerjava.api.model.SwarmDispatcherConfig;
+import com.github.dockerjava.api.model.SwarmOrchestration;
+import com.github.dockerjava.api.model.SwarmRaftConfig;
+import com.github.dockerjava.api.model.SwarmSpec;
+import com.github.dockerjava.api.model.TaskDefaults;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+
+@Test(groups = "swarm-integration")
+public class UpdateSwarmCmdExecTest extends AbstractSwarmDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(UpdateSwarmCmdExecTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    public void updateSwarm() throws DockerException {
+        SwarmSpec firstSpec = new SwarmSpec().withName("firstSpec");
+
+        SwarmSpec secondSpec = new SwarmSpec()
+                .withName("secondSpec")
+                .withDispatcher(new SwarmDispatcherConfig()
+                        .withHeartbeatPeriod(10000000L)
+                ).withOrchestration(new SwarmOrchestration()
+                        .withTaskHistoryRententionLimit(100)
+                ).withCaConfig(new SwarmCAConfig()
+                        .withNodeCertExpiry(60 * 60 * 1000000000L /*ns */))
+                .withRaft(new SwarmRaftConfig()
+                        .withElectionTick(8)
+                        .withSnapshotInterval(20000)
+                        .withHeartbeatTick(5)
+                        .withLogEntriesForSlowFollowers(200)
+                ).withTaskDefaults(new TaskDefaults());
+
+        dockerClient.initializeSwarmCmd(firstSpec)
+                .withListenAddr("127.0.0.1")
+                .withAdvertiseAddr("127.0.0.1")
+                .exec();
+        LOG.info("Initialized swarm: {}", firstSpec.toString());
+
+        Swarm swarm = dockerClient.inspectSwarmCmd().exec();
+        LOG.info("Inspected swarm: {}", swarm.toString());
+        assertThat(swarm.getSpec(), is(not(equalTo(secondSpec))));
+
+        dockerClient.updateSwarmCmd(secondSpec)
+                .withVersion(swarm.getVersion().getIndex())
+                .exec();
+        LOG.info("Updated swarm: {}", secondSpec.toString());
+
+        swarm = dockerClient.inspectSwarmCmd().exec();
+        LOG.info("Inspected swarm: {}", swarm.toString());
+        assertThat(swarm.getSpec(), is(equalTo(secondSpec)));
+    }
+
+    @Test(expectedExceptions = NotAcceptableException.class)
+    public void updatingSwarmThrowsWhenNotInSwarm() throws DockerException {
+        SwarmSpec swarmSpec = new SwarmSpec()
+                .withName("swarm");
+
+        dockerClient.updateSwarmCmd(swarmSpec)
+                .withVersion(1l)
+                .exec();
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/AbstractNettySwarmDockerClientTest.java b/src/test/java/com/github/dockerjava/netty/AbstractNettySwarmDockerClientTest.java
new file mode 100644
index 000000000..11a6aae73
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/AbstractNettySwarmDockerClientTest.java
@@ -0,0 +1,16 @@
+package com.github.dockerjava.netty;
+
+import com.github.dockerjava.core.TestDockerCmdExecFactory;
+import com.github.dockerjava.core.command.AbstractSwarmDockerClientTest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class AbstractNettySwarmDockerClientTest extends AbstractSwarmDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(AbstractNettySwarmDockerClientTest.class);
+
+    @Override
+    protected TestDockerCmdExecFactory initTestDockerCmdExecFactory() {
+        return new TestDockerCmdExecFactory(new NettyDockerCmdExecFactory());
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InitializeSwarmCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InitializeSwarmCmdExecTest.java
new file mode 100644
index 000000000..59a5bd01c
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/InitializeSwarmCmdExecTest.java
@@ -0,0 +1,97 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotAcceptableException;
+import com.github.dockerjava.api.model.Swarm;
+import com.github.dockerjava.api.model.SwarmCAConfig;
+import com.github.dockerjava.api.model.SwarmDispatcherConfig;
+import com.github.dockerjava.api.model.SwarmOrchestration;
+import com.github.dockerjava.api.model.SwarmRaftConfig;
+import com.github.dockerjava.api.model.SwarmSpec;
+import com.github.dockerjava.api.model.TaskDefaults;
+import com.github.dockerjava.netty.AbstractNettySwarmDockerClientTest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+
+@Test(groups = "swarm-integration")
+public class InitializeSwarmCmdExecTest extends AbstractNettySwarmDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(InitializeSwarmCmdExecTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    public void initializeSwarm() throws DockerException {
+        SwarmSpec swarmSpec = new SwarmSpec()
+                .withName("swarm")
+                .withDispatcher(new SwarmDispatcherConfig()
+                        .withHeartbeatPeriod(10000000L)
+                ).withOrchestration(new SwarmOrchestration()
+                        .withTaskHistoryRententionLimit(100)
+                ).withCaConfig(new SwarmCAConfig()
+                        .withNodeCertExpiry(60 * 60 * 1000000000L /*ns */))
+                .withRaft(new SwarmRaftConfig()
+                        .withElectionTick(8)
+                        .withSnapshotInterval(20000)
+                        .withHeartbeatTick(5)
+                        .withLogEntriesForSlowFollowers(200)
+                ).withTaskDefaults(new TaskDefaults());
+
+        dockerClient.initializeSwarmCmd(swarmSpec)
+                .withListenAddr("127.0.0.1")
+                .withAdvertiseAddr("127.0.0.1")
+                .exec();
+        LOG.info("Initialized swarm: {}", swarmSpec.toString());
+
+        Swarm swarm = dockerClient.inspectSwarmCmd().exec();
+        LOG.info("Inspected swarm: {}", swarm.toString());
+        assertThat(swarm.getSpec(), is(equalTo(swarmSpec)));
+    }
+
+    @Test(expectedExceptions = NotAcceptableException.class)
+    public void initializingSwarmThrowsWhenAlreadyInSwarm() throws DockerException {
+        SwarmSpec swarmSpec = new SwarmSpec()
+                .withName("swarm");
+
+        dockerClient.initializeSwarmCmd(swarmSpec)
+                .withListenAddr("127.0.0.1")
+                .withAdvertiseAddr("127.0.0.1")
+                .exec();
+        LOG.info("Initialized swarm: {}", swarmSpec.toString());
+
+        // Initializing a swarm if already in swarm mode should fail
+        dockerClient.initializeSwarmCmd(swarmSpec)
+                .withListenAddr("127.0.0.1")
+                .exec();
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/JoinSwarmCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/JoinSwarmCmdExecTest.java
new file mode 100644
index 000000000..5192a0d9d
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/JoinSwarmCmdExecTest.java
@@ -0,0 +1,117 @@
+package com.github.dockerjava.netty.exec;
+
+import com.beust.jcommander.internal.Lists;
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotAcceptableException;
+import com.github.dockerjava.api.model.Info;
+import com.github.dockerjava.api.model.LocalNodeState;
+import com.github.dockerjava.api.model.Swarm;
+import com.github.dockerjava.api.model.SwarmJoinTokens;
+import com.github.dockerjava.api.model.SwarmSpec;
+import com.github.dockerjava.netty.AbstractNettySwarmDockerClientTest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+
+@Test(groups = "swarm-integration")
+public class JoinSwarmCmdExecTest extends AbstractNettySwarmDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(JoinSwarmCmdExecTest.class);
+
+    @BeforeTest
+    @Override
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @BeforeMethod
+    @Override
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    private SwarmJoinTokens initSwarmOnDocker(DockerClient docker) {
+        SwarmSpec swarmSpec = new SwarmSpec();
+        docker.initializeSwarmCmd(swarmSpec)
+                .exec();
+        LOG.info("Initialized swarm docker1: {}", swarmSpec.toString());
+
+        Swarm swarm = docker.inspectSwarmCmd().exec();
+        LOG.info("Inspected swarm on docker1: {}", swarm.toString());
+        return swarm.getJoinTokens();
+    }
+
+    @Test
+    public void joinSwarmAsWorker() throws DockerException {
+        DockerClient docker1 = startDockerInDocker();
+        DockerClient docker2 = startDockerInDocker();
+
+        SwarmJoinTokens tokens = initSwarmOnDocker(docker1);
+
+        docker2.joinSwarmCmd()
+                .withRemoteAddrs(Lists.newArrayList("docker1" ))
+                .withJoinToken(tokens.getWorker())
+                .exec();
+        LOG.info("docker2 joined docker1's swarm");
+
+        Info info = docker2.infoCmd().exec();
+        LOG.info("Inspected docker2: {}", info.toString());
+        assertThat(info.getSwarm().getLocalNodeState(), is(equalTo(LocalNodeState.ACTIVE)));
+    }
+
+    @Test
+    public void joinSwarmAsManager() throws DockerException, InterruptedException {
+        DockerClient docker1 = startDockerInDocker();
+        DockerClient docker2 = startDockerInDocker();
+
+        SwarmJoinTokens tokens = initSwarmOnDocker(docker1);
+
+        docker2.joinSwarmCmd()
+                .withRemoteAddrs(Lists.newArrayList("docker1"))
+                .withJoinToken(tokens.getManager())
+                .exec();
+        LOG.info("docker2 joined docker1's swarm");
+
+        Info info = docker2.infoCmd().exec();
+        LOG.info("Inspected docker2: {}", info.toString());
+        assertThat(info.getSwarm().getLocalNodeState(), is(equalTo(LocalNodeState.ACTIVE)));
+    }
+
+    @Test(expectedExceptions = NotAcceptableException.class)
+    public void joinSwarmIfAlreadyInSwarm() {
+        DockerClient docker1 = startDockerInDocker();
+        DockerClient docker2 = startDockerInDocker();
+
+        SwarmJoinTokens tokens = initSwarmOnDocker(docker1);
+
+        initSwarmOnDocker(docker2);
+
+        docker2.joinSwarmCmd()
+                .withRemoteAddrs(Lists.<String>newArrayList("docker1"))
+                .withJoinToken(tokens.getWorker())
+                .exec();
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/LeaveSwarmCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/LeaveSwarmCmdExecTest.java
new file mode 100644
index 000000000..57cfd316e
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/LeaveSwarmCmdExecTest.java
@@ -0,0 +1,79 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotAcceptableException;
+import com.github.dockerjava.api.model.Info;
+import com.github.dockerjava.api.model.LocalNodeState;
+import com.github.dockerjava.api.model.SwarmSpec;
+import com.github.dockerjava.netty.AbstractNettySwarmDockerClientTest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+@Test(groups = "swarm-integration")
+public class LeaveSwarmCmdExecTest extends AbstractNettySwarmDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(LeaveSwarmCmdExecTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void leaveSwarmAsMaster() throws DockerException {
+        SwarmSpec swarmSpec = new SwarmSpec().withName("firstSpec");
+        dockerClient.initializeSwarmCmd(swarmSpec)
+                .withListenAddr("127.0.0.1")
+                .withAdvertiseAddr("127.0.0.1")
+                .exec();
+        LOG.info("Initialized swarm: {}", swarmSpec.toString());
+
+        Info info = dockerClient.infoCmd().exec();
+        LOG.info("Inspected docker: {}", info.toString());
+
+        assertThat(info.getSwarm().getLocalNodeState(), is(LocalNodeState.ACTIVE));
+
+        dockerClient.leaveSwarmCmd()
+                .withForceEnabled(true)
+                .exec();
+        LOG.info("Left swarm");
+
+        info = dockerClient.infoCmd().exec();
+        LOG.info("Inspected docker: {}", info.toString());
+
+        assertThat(info.getSwarm().getLocalNodeState(), is(LocalNodeState.INACTIVE));
+
+    }
+
+    @Test(expectedExceptions = NotAcceptableException.class)
+    public void leavingSwarmThrowsWhenNotInSwarm() throws DockerException {
+        dockerClient.leaveSwarmCmd().exec();
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/UpdateSwarmCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/UpdateSwarmCmdExecTest.java
new file mode 100644
index 000000000..85e0f21a9
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/UpdateSwarmCmdExecTest.java
@@ -0,0 +1,102 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotAcceptableException;
+import com.github.dockerjava.api.model.Swarm;
+import com.github.dockerjava.api.model.SwarmCAConfig;
+import com.github.dockerjava.api.model.SwarmDispatcherConfig;
+import com.github.dockerjava.api.model.SwarmOrchestration;
+import com.github.dockerjava.api.model.SwarmRaftConfig;
+import com.github.dockerjava.api.model.SwarmSpec;
+import com.github.dockerjava.api.model.TaskDefaults;
+import com.github.dockerjava.netty.AbstractNettySwarmDockerClientTest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+
+@Test(groups = "swarm-integration")
+public class UpdateSwarmCmdExecTest extends AbstractNettySwarmDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(UpdateSwarmCmdExecTest.class);
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    public void updateSwarm() throws DockerException {
+        SwarmSpec firstSpec = new SwarmSpec().withName("firstSpec");
+
+        SwarmSpec secondSpec = new SwarmSpec()
+                .withName("secondSpec")
+                .withDispatcher(new SwarmDispatcherConfig()
+                        .withHeartbeatPeriod(10000000L)
+                ).withOrchestration(new SwarmOrchestration()
+                        .withTaskHistoryRententionLimit(100)
+                ).withCaConfig(new SwarmCAConfig()
+                        .withNodeCertExpiry(60 * 60 * 1000000000L /*ns */))
+                .withRaft(new SwarmRaftConfig()
+                        .withElectionTick(8)
+                        .withSnapshotInterval(20000)
+                        .withHeartbeatTick(5)
+                        .withLogEntriesForSlowFollowers(200)
+                ).withTaskDefaults(new TaskDefaults());
+
+        dockerClient.initializeSwarmCmd(firstSpec)
+                .withListenAddr("127.0.0.1")
+                .withAdvertiseAddr("127.0.0.1")
+                .exec();
+        LOG.info("Initialized swarm: {}", firstSpec.toString());
+
+        Swarm swarm = dockerClient.inspectSwarmCmd().exec();
+        LOG.info("Inspected swarm: {}", swarm.toString());
+        assertThat(swarm.getSpec(), is(not(equalTo(secondSpec))));
+
+        dockerClient.updateSwarmCmd(secondSpec)
+                .withVersion(swarm.getVersion().getIndex())
+                .exec();
+        LOG.info("Updated swarm: {}", secondSpec.toString());
+
+        swarm = dockerClient.inspectSwarmCmd().exec();
+        LOG.info("Inspected swarm: {}", swarm.toString());
+        assertThat(swarm.getSpec(), is(equalTo(secondSpec)));
+    }
+
+    @Test(expectedExceptions = NotAcceptableException.class)
+    public void updatingSwarmThrowsWhenNotInSwarm() throws DockerException {
+        SwarmSpec swarmSpec = new SwarmSpec()
+                .withName("swarm");
+
+        dockerClient.updateSwarmCmd(swarmSpec)
+                .withVersion(1l)
+                .exec();
+    }
+
+}

From 9a341acad8c5644746312d3c3f6a8df83564a93c Mon Sep 17 00:00:00 2001
From: Martin Root <mail@martin-root.de>
Date: Wed, 17 Aug 2016 14:56:44 +0200
Subject: [PATCH 0737/1272] Add node to model package

Add ListNodes implementation

Fix error in ListNodesCmdExec

Add FilterBuilder for swarmNodes, renamed Node to SwarmNode

Update model classes for SwarmNodes

add implementation for update,list,remove and inspect of a swarmNode

Update model classes for docker-swarm-node

Add methods for swarmNode to execFactories
---
 .../api/command/DockerCmdExecFactory.java     |  34 +++
 .../api/command/InspectSwarmNodeCmd.java      |  31 +++
 .../api/command/ListSwarmNodesCmd.java        |  43 ++++
 .../api/command/RemoveSwarmNodeCmd.java       |  34 +++
 .../api/command/UpdateSwarmNodeCmd.java       |  28 +++
 .../com/github/dockerjava/api/model/Node.java |  34 +++
 .../dockerjava/api/model/Reachability.java    |  19 ++
 .../dockerjava/api/model/SwarmNode.java       | 217 ++++++++++++++++++
 .../api/model/SwarmNodeAvailability.java      |  19 ++
 .../api/model/SwarmNodeDescription.java       | 125 ++++++++++
 .../api/model/SwarmNodeEngineDescription.java | 105 +++++++++
 .../api/model/SwarmNodeManagerStatus.java     | 104 +++++++++
 .../api/model/SwarmNodePlatform.java          |  78 +++++++
 .../api/model/SwarmNodePluginDescription.java |  82 +++++++
 .../api/model/SwarmNodeResources.java         |  82 +++++++
 .../dockerjava/api/model/SwarmNodeRole.java   |  16 ++
 .../dockerjava/api/model/SwarmNodeSpec.java   | 127 ++++++++++
 .../dockerjava/api/model/SwarmNodeState.java  |  22 ++
 .../dockerjava/api/model/SwarmNodeStatus.java |  62 +++++
 .../api/model/SwarmNodeVersion.java           |  61 +++++
 .../core/command/InspectSwarmNodeCmdImpl.java |  45 ++++
 .../core/command/ListSwarmNodesCmdImpl.java   |  57 +++++
 .../core/command/RemoveSwarmNodeCmdImpl.java  |  57 +++++
 .../core/command/UpdateSwarmNodeCmdImpl.java  |  91 ++++++++
 .../core/util/SwarmNodesFiltersBuilder.java   |  94 ++++++++
 .../jaxrs/InspectSwarmNodeCmdExec.java        |  30 +++
 .../jaxrs/JerseyDockerCmdExecFactory.java     |  25 ++
 .../jaxrs/ListSwarmNodesCmdExec.java          |  42 ++++
 .../jaxrs/RemoveSwarmNodeCmdExec.java         |  31 +++
 .../jaxrs/UpdateSwarmNodeCmdExec.java         |  35 +++
 .../netty/NettyDockerCmdExecFactory.java      |  36 ++-
 .../netty/exec/InspectSwarmNodeCmdExec.java   |  32 +++
 .../netty/exec/ListSwarmNodesCmdExec.java     |  46 ++++
 .../netty/exec/RemoveSwarmNodeCmdExec.java    |  31 +++
 .../netty/exec/UpdateSwarmNodeCmdExec.java    |  33 +++
 .../core/TestDockerCmdExecFactory.java        |  27 +++
 36 files changed, 2031 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/Reachability.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmNode.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmNodeState.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/InspectSwarmNodeCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/ListSwarmNodesCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/RemoveSwarmNodeCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/UpdateSwarmNodeCmdExec.java

diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index cab6c961d..fc0ee8100 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -117,6 +117,7 @@ public interface DockerCmdExecFactory extends Closeable {
 
     DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec();
 
+    // swarm
     InitializeSwarmCmd.Exec createInitializeSwarmCmdExec();
 
     InspectSwarmCmd.Exec createInspectSwarmCmdExec();
@@ -127,6 +128,39 @@ public interface DockerCmdExecFactory extends Closeable {
 
     UpdateSwarmCmd.Exec createUpdateSwarmCmdExec();
 
+    // nodes
+    /**
+     * List all nodes. Node operations require the engine to be part of a swarm
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_24}
+     */
+    ListSwarmNodesCmd.Exec listSwarmNodeCmdExec();
+
+    /**
+     * Return low-level information on the node. Node operations require the engine to be part of a swarm
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_24}
+     */
+    InspectSwarmNodeCmd.Exec inspectSwarmNodeCmdExec();
+
+    /**
+     * Remove a node from the swarm. Node operations require the engine to be part of a swarm
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_24}
+     */
+    RemoveSwarmNodeCmd.Exec removeSwarmNodeCmdExec();
+
+    /**
+     * Update a node. Node operations require the engine to be part of a swarm
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_24}
+     */
+    UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec();
+
+
+
+
     @Override
     void close() throws IOException;
+
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java
new file mode 100644
index 000000000..13dacdd6a
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.api.command;
+
+
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.SwarmNode;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * Inspect a swarmNode.
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public interface InspectSwarmNodeCmd extends SyncDockerCmd<SwarmNode> {
+
+    @CheckForNull
+    String getSwarmNodeId();
+
+    InspectSwarmNodeCmd withSwarmNodeId(@Nonnull String swarmNodeId);
+
+    /**
+     * @throws NotFoundException No such swarmNode
+     */
+    @Override
+    SwarmNode exec() throws NotFoundException;
+
+    interface Exec extends DockerCmdSyncExec<InspectSwarmNodeCmd, SwarmNode> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java b/src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java
new file mode 100644
index 000000000..9aaac1e98
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java
@@ -0,0 +1,43 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.model.SwarmNode;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import javax.annotation.CheckForNull;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * List SwarmNodes
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public interface ListSwarmNodesCmd extends SyncDockerCmd<List<SwarmNode>> {
+
+    @CheckForNull
+    Map<String, List<String>> getFilters();
+
+    /**
+     * @param ids - Show only swarmNodes with the given ids
+     */
+    ListSwarmNodesCmd withIdFilter(List<String> ids);
+
+    /**
+     * @param names - Show only swarmNodes with the given names
+     */
+    ListSwarmNodesCmd withNameFilter(List<String> names);
+
+    /**
+     * @param memberships - Show only swarmNodes with the given memberships
+     */
+    ListSwarmNodesCmd withMembershipFilter(List<String> memberships);
+
+    /**
+     * @param roles - Show only swarmNodes with the given roles
+     */
+    ListSwarmNodesCmd withRoleFilter(List<String> roles);
+
+    interface Exec extends DockerCmdSyncExec<ListSwarmNodesCmd, List<SwarmNode>> {
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java
new file mode 100644
index 000000000..27a815bf0
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java
@@ -0,0 +1,34 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * Remove a swarmNode.
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public interface RemoveSwarmNodeCmd extends SyncDockerCmd<Void> {
+
+    @CheckForNull
+    String getSwarmNodeId();
+
+    @CheckForNull
+    Boolean hasForceEnabled();
+
+    RemoveSwarmNodeCmd withContainerId(@Nonnull String containerId);
+
+    RemoveSwarmNodeCmd withForce(Boolean force);
+
+    /**
+     * @throws NotFoundException No such swarmNode
+     */
+    @Override
+    Void exec() throws NotFoundException;
+
+    interface Exec extends DockerCmdSyncExec<RemoveSwarmNodeCmd, Void> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java b/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
new file mode 100644
index 000000000..84d069aaf
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
@@ -0,0 +1,28 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.model.SwarmNodeSpec;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * Update swarmNode spec
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public interface UpdateSwarmNodeCmd extends SyncDockerCmd<Void> {
+
+    @CheckForNull
+    String getSwarmNodeId();
+
+    UpdateSwarmNodeCmd withSwarmNodeId(@Nonnull String swarmNodeId);
+
+    @CheckForNull
+    SwarmNodeSpec getSwarmNodeSpec();
+
+    UpdateSwarmNodeCmd withSwarmNodeSpec(SwarmNodeSpec swarmNodeSpec);
+
+    interface Exec extends DockerCmdSyncExec<UpdateSwarmNodeCmd, Void> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/Node.java b/src/main/java/com/github/dockerjava/api/model/Node.java
index 89b391c0a..34916e0da 100644
--- a/src/main/java/com/github/dockerjava/api/model/Node.java
+++ b/src/main/java/com/github/dockerjava/api/model/Node.java
@@ -3,6 +3,9 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
 
 import java.io.Serializable;
 
@@ -29,15 +32,46 @@ public String getName() {
         return name;
     }
 
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public String getId() {
         return id;
     }
 
+    public void setId(String id) {
+        this.id = id;
+    }
+
     public String getAddr() {
         return addr;
     }
 
+    public void setAddr(String addr) {
+        this.addr = addr;
+    }
+
     public String getIp() {
         return ip;
     }
+
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Reachability.java b/src/main/java/com/github/dockerjava/api/model/Reachability.java
new file mode 100644
index 000000000..85e113b80
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/Reachability.java
@@ -0,0 +1,19 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public enum Reachability {
+
+    @JsonProperty("unknown")
+    UNKNOWN,
+
+    @JsonProperty("unreachable")
+    UNREACHABLE,
+
+    @JsonProperty("reachable")
+    REACHABLE
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNode.java b/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
new file mode 100644
index 000000000..47b4dfa68
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
@@ -0,0 +1,217 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * Used for Listing SwarmNodes.
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SwarmNode implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Id")
+    private String id;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Version")
+    private String[] version;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("CreatedAt")
+    private Date createdAt;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("UpdatedAt")
+    private Date updatedAt;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Spec")
+    private SwarmNodeSpec spec;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Description")
+    private SwarmNodeDescription description;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Status")
+    private SwarmNodeStatus status;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("ManagerStatus")
+    private SwarmNodeManagerStatus managerStatus;
+
+    /**
+     * @see #id
+     */
+    @CheckForNull
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * @see #id
+     */
+    public SwarmNode withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    /**
+     * @see #version
+     */
+    @CheckForNull
+    public String[] getVersion() {
+        return version;
+    }
+
+    /**
+     * @see #version
+     */
+    public SwarmNode withVersion(String[] version) {
+        this.version = version;
+        return this;
+    }
+
+    /**
+     * @see #createdAt
+     */
+    @CheckForNull
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    /**
+     * @see #createdAt
+     */
+    public SwarmNode withCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+        return this;
+    }
+
+    /**
+     * @see #updatedAt
+     */
+    @CheckForNull
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    /**
+     * @see #updatedAt
+     */
+    public SwarmNode withUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+        return this;
+    }
+
+    /**
+     * @see #spec
+     */
+    @CheckForNull
+    public SwarmNodeSpec getSpec() {
+        return spec;
+    }
+
+    /**
+     * @see #spec
+     */
+    public SwarmNode withSpec(SwarmNodeSpec spec) {
+        this.spec = spec;
+        return this;
+    }
+
+    /**
+     * @see #description
+     */
+    @CheckForNull
+    public SwarmNodeDescription getDescription() {
+        return description;
+    }
+
+    /**
+     * @see #description
+     */
+    public SwarmNode withDescription(SwarmNodeDescription description) {
+        this.description = description;
+        return this;
+    }
+
+    /**
+     * @see #status
+     */
+    @CheckForNull
+    public SwarmNodeStatus getStatus() {
+        return status;
+    }
+
+    /**
+     * @see #status
+     */
+    public SwarmNode withStatus(SwarmNodeStatus status) {
+        this.status = status;
+        return this;
+    }
+
+    /**
+     * @see #managerStatus
+     */
+    @CheckForNull
+    public SwarmNodeManagerStatus getManagerStatus() {
+        return managerStatus;
+    }
+
+    /**
+     * @see #managerStatus
+     */
+    public SwarmNode withManagerStatus(SwarmNodeManagerStatus managerStatus) {
+        this.managerStatus = managerStatus;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java b/src/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java
new file mode 100644
index 000000000..a0287129e
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java
@@ -0,0 +1,19 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public enum SwarmNodeAvailability {
+
+    @JsonProperty("active")
+    ACTIVE,
+
+    @JsonProperty("pause")
+    PAUSE,
+
+    @JsonProperty("drain")
+    DRAIN
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java b/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
new file mode 100644
index 000000000..bf758fc79
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
@@ -0,0 +1,125 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SwarmNodeDescription implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Hostname")
+    private String hostname;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Platform")
+    private SwarmNodePlatform platform;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Resources")
+    private SwarmNodeResources resources;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Engine")
+    private SwarmNodeEngineDescription engine;
+
+    /**
+     * @see #hostname
+     */
+    @CheckForNull
+    public String getHostname() {
+        return hostname;
+    }
+
+    /**
+     * @see #hostname
+     */
+    public SwarmNodeDescription withHostname(String hostname) {
+        this.hostname = hostname;
+        return this;
+    }
+
+    /**
+     * @see #platform
+     */
+    @CheckForNull
+    public SwarmNodePlatform getPlatform() {
+        return platform;
+    }
+
+    /**
+     * @see #platform
+     */
+    public SwarmNodeDescription withPlatform(SwarmNodePlatform platform) {
+        this.platform = platform;
+        return this;
+    }
+
+    /**
+     * @see #resources
+     */
+    @CheckForNull
+    public SwarmNodeResources getResources() {
+        return resources;
+    }
+
+    /**
+     * @see #resources
+     */
+    public SwarmNodeDescription withResources(SwarmNodeResources resources) {
+        this.resources = resources;
+        return this;
+    }
+
+    /**
+     * @see #engine
+     */
+    @CheckForNull
+    public SwarmNodeEngineDescription getEngine() {
+        return engine;
+    }
+
+    /**
+     * @see #engine
+     */
+    public SwarmNodeDescription withEngine(SwarmNodeEngineDescription engine) {
+        this.engine = engine;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java b/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
new file mode 100644
index 000000000..58e3ae331
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
@@ -0,0 +1,105 @@
+package com.github.dockerjava.api.model;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SwarmNodeEngineDescription implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("EngineVersion")
+    private String engineVersion;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Labels")
+    private Map<String, String> labels;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Plugins")
+    private SwarmNodePluginDescription[] plugins;
+
+    /**
+     * @see #engineVersion
+     */
+    @CheckForNull
+    public String getEngineVersion() {
+        return engineVersion;
+    }
+
+    /**
+     * @see #engineVersion
+     */
+    public SwarmNodeEngineDescription withEngineVersion(String engineVersion) {
+        this.engineVersion = engineVersion;
+        return this;
+    }
+
+    /**
+     * @see #labels
+     */
+    @CheckForNull
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
+    /**
+     * @see #labels
+     */
+    public SwarmNodeEngineDescription withLabels(Map<String, String> labels) {
+        this.labels = labels;
+        return this;
+    }
+
+    /**
+     * @see #plugins
+     */
+    @CheckForNull
+    public SwarmNodePluginDescription[] getPlugins() {
+        return plugins;
+    }
+
+    /**
+     * @see #plugins
+     */
+    public SwarmNodeEngineDescription withPlugins(SwarmNodePluginDescription[] plugins) {
+        this.plugins = plugins;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java b/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
new file mode 100644
index 000000000..f10e6cda3
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
@@ -0,0 +1,104 @@
+package com.github.dockerjava.api.model;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SwarmNodeManagerStatus implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Leader")
+    private boolean leader;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Reachability")
+    private Reachability reachability;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Addr")
+    private String addr;
+
+    /**
+     * @see #leader
+     */
+    @CheckForNull
+    public boolean isLeader() {
+        return leader;
+    }
+
+    /**
+     * @see #leader
+     */
+    public SwarmNodeManagerStatus withLeader(boolean leader) {
+        this.leader = leader;
+        return this;
+    }
+
+    /**
+     * @see #reachability
+     */
+    @CheckForNull
+    public Reachability getReachability() {
+        return reachability;
+    }
+
+    /**
+     * @see #reachability
+     */
+    public SwarmNodeManagerStatus withReachability(Reachability reachability) {
+        this.reachability = reachability;
+        return this;
+    }
+
+    /**
+     * @see #addr
+     */
+    @CheckForNull
+    public String getAddr() {
+        return addr;
+    }
+
+    /**
+     * @see #addr
+     */
+    public SwarmNodeManagerStatus withAddr(String addr) {
+        this.addr = addr;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java b/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
new file mode 100644
index 000000000..ac482570e
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
@@ -0,0 +1,78 @@
+package com.github.dockerjava.api.model;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class SwarmNodePlatform implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Architecture")
+    private String architecture;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("OS")
+    private String os;
+
+    /**
+     * @see #architecture
+     */
+    @CheckForNull
+    public String getArchitecture() {
+        return architecture;
+    }
+
+    /**
+     * @see #architecture
+     */
+    public SwarmNodePlatform withArchitecture(String architecture) {
+        this.architecture = architecture;
+        return this;
+    }
+
+    /**
+     * @see #os
+     */
+    @CheckForNull
+    public String getOs() {
+        return os;
+    }
+
+    /**
+     * @see #os
+     */
+    public SwarmNodePlatform withOs(String os) {
+        this.os = os;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java b/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
new file mode 100644
index 000000000..81c572b40
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
@@ -0,0 +1,82 @@
+package com.github.dockerjava.api.model;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SwarmNodePluginDescription implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Type")
+    private String type;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Name")
+    private String name;
+
+    /**
+     * @see #type
+     */
+    @CheckForNull
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * @see #type
+     */
+    public SwarmNodePluginDescription withType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * @see #name
+     */
+    @CheckForNull
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @see #name
+     */
+    public SwarmNodePluginDescription withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java b/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
new file mode 100644
index 000000000..3689e3da4
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
@@ -0,0 +1,82 @@
+package com.github.dockerjava.api.model;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SwarmNodeResources implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("NanoCPUs")
+    private Long nanoCPUs;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("MemoryBytes")
+    private Long memoryBytes;
+
+    /**
+     * @see #nanoCPUs
+     */
+    @CheckForNull
+    public Long getNanoCPUs() {
+        return nanoCPUs;
+    }
+
+    /**
+     * @see #nanoCPUs
+     */
+    public SwarmNodeResources withNanoCPUs(Long nanoCPUs) {
+        this.nanoCPUs = nanoCPUs;
+        return this;
+    }
+
+    /**
+     * @see #memoryBytes
+     */
+    @CheckForNull
+    public Long getMemoryBytes() {
+        return memoryBytes;
+    }
+
+    /**
+     * @see #memoryBytes
+     */
+    public SwarmNodeResources withMemoryBytes(Long memoryBytes) {
+        this.memoryBytes = memoryBytes;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java b/src/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java
new file mode 100644
index 000000000..a2341a59d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java
@@ -0,0 +1,16 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public enum SwarmNodeRole {
+
+    @JsonProperty("worker")
+    WORKER,
+
+    @JsonProperty("manager")
+    MANAGER
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java b/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
new file mode 100644
index 000000000..858f7e3f0
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
@@ -0,0 +1,127 @@
+package com.github.dockerjava.api.model;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SwarmNodeSpec implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Name")
+    private String name;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Role")
+    private SwarmNodeRole role;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Availability")
+    private SwarmNodeAvailability availability;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Labels")
+    public Map<String, String> labels;
+
+    /**
+     * @see #name
+     */
+    @CheckForNull
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @see #name
+     */
+    public SwarmNodeSpec withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * @see #role
+     */
+    @CheckForNull
+    public SwarmNodeRole getRole() {
+        return role;
+    }
+
+    /**
+     * @see #role
+     */
+    public SwarmNodeSpec withRole(SwarmNodeRole role) {
+        this.role = role;
+        return this;
+    }
+
+    /**
+     * @see #availability
+     */
+    @CheckForNull
+    public SwarmNodeAvailability getAvailability() {
+        return availability;
+    }
+
+    /**
+     * @see #availability
+     */
+    public SwarmNodeSpec withAvailability(SwarmNodeAvailability availability) {
+        this.availability = availability;
+        return this;
+    }
+
+    /**
+     * @see #labels
+     */
+    @CheckForNull
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
+    /**
+     * @see #labels
+     */
+    public SwarmNodeSpec withLabels(Map<String, String> labels) {
+        this.labels = labels;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeState.java b/src/main/java/com/github/dockerjava/api/model/SwarmNodeState.java
new file mode 100644
index 000000000..14b92a819
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNodeState.java
@@ -0,0 +1,22 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public enum SwarmNodeState {
+
+    @JsonProperty("unknown")
+    UNKNOWN,
+
+    @JsonProperty("down")
+    DOWN,
+
+    @JsonProperty("ready")
+    READY,
+
+    @JsonProperty("disconnected")
+    DISCONNECTED
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java b/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
new file mode 100644
index 000000000..0176d4d93
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
@@ -0,0 +1,62 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SwarmNodeStatus implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("State")
+    private SwarmNodeState state;
+
+    /**
+     * @see #state
+     */
+    @CheckForNull
+    public SwarmNodeState getState() {
+        return state;
+    }
+
+    /**
+     * @see #state
+     */
+    public SwarmNodeStatus withState(SwarmNodeState state) {
+        this.state = state;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java b/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
new file mode 100644
index 000000000..54b56b1c0
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
@@ -0,0 +1,61 @@
+package com.github.dockerjava.api.model;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SwarmNodeVersion implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Index")
+    private long index;
+
+    /**
+     * @see #index
+     */
+    @CheckForNull
+    public long getIndex() {
+        return index;
+    }
+
+    /**
+     * @see #index
+     */
+    public SwarmNodeVersion withIndex(long index) {
+        this.index = index;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java
new file mode 100644
index 000000000..bf5e5164f
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java
@@ -0,0 +1,45 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.InspectSwarmNodeCmd;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.SwarmNode;
+
+import javax.annotation.CheckForNull;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Inspect the details of a swarmNode.
+ */
+public class InspectSwarmNodeCmdImpl extends AbstrDockerCmd<InspectSwarmNodeCmd, SwarmNode> implements
+        InspectSwarmNodeCmd {
+
+    private String swarmNodeId;
+
+    public InspectSwarmNodeCmdImpl(Exec exec, String swarmNodeId) {
+        super(exec);
+        withSwarmNodeId(swarmNodeId);
+    }
+
+    @Override
+    @CheckForNull
+    public String getSwarmNodeId() {
+        return swarmNodeId;
+    }
+
+    @Override
+    public InspectSwarmNodeCmd withSwarmNodeId(String swarmNodeId) {
+        checkNotNull(swarmNodeId, "swarmNodeId was not specified");
+        this.swarmNodeId = swarmNodeId;
+        return this;
+    }
+
+    /**
+     * @throws NotFoundException
+     *             No such swarmNode
+     */
+    @Override
+    public SwarmNode exec() throws NotFoundException {
+        return super.exec();
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java
new file mode 100644
index 000000000..5b5c5801f
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java
@@ -0,0 +1,57 @@
+package com.github.dockerjava.core.command;
+
+
+import com.github.dockerjava.api.command.ListSwarmNodesCmd;
+import com.github.dockerjava.api.model.SwarmNode;
+import com.github.dockerjava.core.util.SwarmNodesFiltersBuilder;
+
+import java.util.List;
+import java.util.Map;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * List SwarmNodes
+ */
+public class ListSwarmNodesCmdImpl extends AbstrDockerCmd<ListSwarmNodesCmd, List<SwarmNode>> implements
+        ListSwarmNodesCmd {
+
+    private SwarmNodesFiltersBuilder filters = new SwarmNodesFiltersBuilder();
+
+    public ListSwarmNodesCmdImpl(Exec exec) {
+        super(exec);
+    }
+
+    @Override
+    public Map<String, List<String>> getFilters() {
+        return filters.build();
+    }
+
+    @Override
+    public ListSwarmNodesCmd withIdFilter(List<String> ids) {
+        checkNotNull(ids, "ids was not specified");
+        this.filters.withIds(ids);
+        return this;
+    }
+
+    @Override
+    public ListSwarmNodesCmd withNameFilter(List<String> names) {
+        checkNotNull(names, "names was not specified");
+        this.filters.withNames(names);
+        return this;
+    }
+
+    @Override
+    public ListSwarmNodesCmd withMembershipFilter(List<String> memberships) {
+        checkNotNull(memberships, "memberships was not specified");
+        this.filters.withNames(memberships);
+        return this;
+    }
+
+    @Override
+    public ListSwarmNodesCmd withRoleFilter(List<String> roles) {
+        checkNotNull(roles, "roles was not specified");
+        this.filters.withNames(roles);
+        return this;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java
new file mode 100644
index 000000000..bf9029e72
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java
@@ -0,0 +1,57 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
+import com.github.dockerjava.api.exception.NotFoundException;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Remove a container.
+ */
+public class RemoveSwarmNodeCmdImpl extends AbstrDockerCmd<RemoveSwarmNodeCmd, Void> implements RemoveSwarmNodeCmd {
+
+    private String swarmNodeId;
+
+    private Boolean force;
+
+    public RemoveSwarmNodeCmdImpl(RemoveSwarmNodeCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
+
+    @Override
+    @CheckForNull
+    public String getSwarmNodeId() {
+        return swarmNodeId;
+    }
+
+    @Override
+    @CheckForNull
+    public Boolean hasForceEnabled() {
+        return force;
+    }
+
+    @Override
+    public RemoveSwarmNodeCmd withContainerId(@Nonnull String swarmNodeId) {
+        checkNotNull(swarmNodeId, "swarmNodeId was not specified");
+        this.swarmNodeId = swarmNodeId;
+        return this;
+    }
+
+    @Override
+    public RemoveSwarmNodeCmd withForce(Boolean force) {
+        this.force = force;
+        return this;
+    }
+
+    /**
+     * @throws NotFoundException No such swarmNode
+     */
+    @Override
+    public Void exec() throws NotFoundException {
+        return super.exec();
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java
new file mode 100644
index 000000000..d7596e3dc
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java
@@ -0,0 +1,91 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.SwarmNodeSpec;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Update swarmNode spec
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class UpdateSwarmNodeCmdImpl extends AbstrDockerCmd<UpdateSwarmNodeCmd, Void>
+        implements UpdateSwarmNodeCmd {
+
+    private String swarmNodeId;
+
+    private SwarmNodeSpec swarmNodeSpec;
+
+    public UpdateSwarmNodeCmdImpl(Exec exec, String swarmNodeId, SwarmNodeSpec swarmNodeSpec) {
+        super(exec);
+        withSwarmNodeId(swarmNodeId);
+        withSwarmNodeSpec(swarmNodeSpec);
+    }
+
+    /**
+     * @see #swarmNodeId
+     */
+    @CheckForNull
+    public String getSwarmNodeId() {
+        return swarmNodeId;
+    }
+
+    /**
+     * @see #swarmNodeId
+     */
+    public UpdateSwarmNodeCmd withSwarmNodeId(@Nonnull String swarmNodeId) {
+        this.swarmNodeId = swarmNodeId;
+        return this;
+    }
+
+    /**
+     * @see #swarmNodeSpec
+     */
+    @CheckForNull
+    public SwarmNodeSpec getSwarmNodeSpec() {
+        return swarmNodeSpec;
+    }
+
+    /**
+     * @see #swarmNodeSpec
+     */
+    public UpdateSwarmNodeCmd withSwarmNodeSpec(SwarmNodeSpec swarmNodeSpec) {
+        checkNotNull(swarmNodeSpec.getAvailability(), "Availability in SwarmNodeSpec was not specified");
+        checkNotNull(swarmNodeSpec.getRole(), "Role in SwarmNodeSpec was not specified");
+        this.swarmNodeSpec = swarmNodeSpec;
+        return this;
+    }
+
+    /**
+     * @throws NotFoundException No such swarmNode
+     */
+    @Override
+    public Void exec() throws NotFoundException {
+        return super.exec();
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java b/src/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java
new file mode 100644
index 000000000..3473aa828
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java
@@ -0,0 +1,94 @@
+package com.github.dockerjava.core.util;
+
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Representation of filters to SwarmNodes lists
+ */
+public class SwarmNodesFiltersBuilder {
+
+    private Map<String, List<String>> filters = new HashMap<String, List<String>>();
+
+    public SwarmNodesFiltersBuilder() {
+
+    }
+
+    public SwarmNodesFiltersBuilder withFilter(String key, String... value) {
+        filters.put(key, Arrays.asList(value));
+        return this;
+    }
+
+    public SwarmNodesFiltersBuilder withFilter(String key, List<String> value) {
+        filters.put(key, value);
+        return this;
+    }
+
+    public List<String> getFilter(String key) {
+        return filters.get(key);
+    }
+
+    public SwarmNodesFiltersBuilder withIds(List<String> ids) {
+        withFilter("id", ids);
+        return this;
+    }
+
+    public List<String> getIds() {
+        return getFilter("id");
+    }
+
+    public SwarmNodesFiltersBuilder withNames(List<String> names) {
+        withFilter("name", names);
+        return this;
+    }
+
+    public SwarmNodesFiltersBuilder withMemberships(List<String> memberships) {
+        withFilter("membership", memberships);
+        return this;
+    }
+
+    public List<String> getMemberships() {
+        return getFilter("membership");
+    }
+
+    public SwarmNodesFiltersBuilder withRoles(List<String> roles) {
+        withFilter("role", roles);
+        return this;
+    }
+
+    public List<String> getRoles() {
+        return getFilter("role");
+    }
+
+    public List<String> getNames() {
+        return getFilter("names");
+    }
+
+    // CHECKSTYLE:OFF
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+
+        SwarmNodesFiltersBuilder filters1 = (SwarmNodesFiltersBuilder) o;
+
+        return filters.equals(filters1.filters);
+
+    }
+
+    // CHECKSTYLE:ON
+
+    @Override
+    public int hashCode() {
+        return filters.hashCode();
+    }
+
+    public Map<String, List<String>> build() {
+        return filters;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java
new file mode 100644
index 000000000..ff0075271
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.jaxrs;
+
+
+import com.github.dockerjava.api.command.InspectSwarmNodeCmd;
+import com.github.dockerjava.api.model.SwarmNode;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+public class InspectSwarmNodeCmdExec extends AbstrSyncDockerCmdExec<InspectSwarmNodeCmd, SwarmNode>
+        implements InspectSwarmNodeCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InspectSwarmNodeCmdExec.class);
+
+    public InspectSwarmNodeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected SwarmNode execute(InspectSwarmNodeCmd command) {
+        WebTarget webResource = getBaseResource().path("/nodes/{id}")
+                .resolveTemplate("id", command.getSwarmNodeId());
+
+        LOGGER.debug("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(SwarmNode.class);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
index 6ad19667a..ef457e317 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -26,6 +26,7 @@
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectNetworkCmd;
 import com.github.dockerjava.api.command.InspectSwarmCmd;
+import com.github.dockerjava.api.command.InspectSwarmNodeCmd;
 import com.github.dockerjava.api.command.InspectVolumeCmd;
 import com.github.dockerjava.api.command.JoinSwarmCmd;
 import com.github.dockerjava.api.command.KillContainerCmd;
@@ -33,6 +34,7 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.command.ListSwarmNodesCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
@@ -43,6 +45,7 @@
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
@@ -56,6 +59,7 @@
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 import com.github.dockerjava.api.command.UpdateContainerCmd;
 import com.github.dockerjava.api.command.UpdateSwarmCmd;
+import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.exception.DockerClientException;
@@ -576,6 +580,27 @@ public LeaveSwarmCmd.Exec createLeaveSwarmCmdExec() {
     public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() {
         return new UpdateSwarmCmdExec(getBaseResource(), getDockerClientConfig());
     }
+
+    @Override
+    public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() {
+        return new ListSwarmNodesCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectSwarmNodeCmd.Exec inspectSwarmNodeCmdExec() {
+        return new InspectSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveSwarmNodeCmd.Exec removeSwarmNodeCmdExec() {
+        return new RemoveSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() {
+        return new UpdateSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public void close() throws IOException {
         checkNotNull(client, "Factory not initialized. You probably forgot to call init()!");
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java
new file mode 100644
index 000000000..763ff7899
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java
@@ -0,0 +1,42 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.command.ListSwarmNodesCmd;
+import com.github.dockerjava.api.model.SwarmNode;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.util.FiltersEncoder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
+public class ListSwarmNodesCmdExec extends AbstrSyncDockerCmdExec<ListSwarmNodesCmd, List<SwarmNode>> implements
+        ListSwarmNodesCmd.Exec {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ListSwarmNodesCmdExec.class);
+
+    public ListSwarmNodesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected List<SwarmNode> execute(ListSwarmNodesCmd command) {
+        WebTarget webTarget = getBaseResource().path("/nodes");
+
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
+            webTarget = webTarget
+                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+        }
+
+        LOGGER.trace("GET: {}", webTarget);
+        List<SwarmNode> nodes = webTarget.request().accept(MediaType.APPLICATION_JSON)
+                .get(new GenericType<List<SwarmNode>>() {
+                });
+        LOGGER.trace("Response: {}", nodes);
+
+        return nodes;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java
new file mode 100644
index 000000000..6f71a468b
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+public class RemoveSwarmNodeCmdExec extends AbstrSyncDockerCmdExec<RemoveSwarmNodeCmd, Void> implements
+        RemoveSwarmNodeCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveSwarmNodeCmdExec.class);
+
+    public RemoveSwarmNodeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(RemoveSwarmNodeCmd command) {
+        WebTarget webTarget = getBaseResource().path("/nodes/" + command.getSwarmNodeId());
+
+        webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled());
+
+        LOGGER.trace("DELETE: {}", webTarget);
+        webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close();
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java
new file mode 100644
index 000000000..a1be93c42
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java
@@ -0,0 +1,35 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import static javax.ws.rs.client.Entity.entity;
+
+/**
+ * Update swarmNode spec
+ */
+public class UpdateSwarmNodeCmdExec extends AbstrSyncDockerCmdExec<UpdateSwarmNodeCmd, Void>
+        implements UpdateSwarmNodeCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(UpdateSwarmNodeCmdExec.class);
+
+    public UpdateSwarmNodeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(UpdateSwarmNodeCmd command) {
+        WebTarget webResource = getBaseResource().path("/nodes/{id}/update")
+                .resolveTemplate("id", command.getSwarmNodeId());
+
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(entity(command.getSwarmNodeSpec(), MediaType.APPLICATION_JSON)).close();
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index ac03fa2fd..aa46f8e11 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -25,6 +25,7 @@
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectNetworkCmd;
 import com.github.dockerjava.api.command.InspectSwarmCmd;
+import com.github.dockerjava.api.command.InspectSwarmNodeCmd;
 import com.github.dockerjava.api.command.InspectVolumeCmd;
 import com.github.dockerjava.api.command.JoinSwarmCmd;
 import com.github.dockerjava.api.command.KillContainerCmd;
@@ -32,6 +33,7 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.command.ListSwarmNodesCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
@@ -42,6 +44,7 @@
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
@@ -55,6 +58,7 @@
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 import com.github.dockerjava.api.command.UpdateContainerCmd;
 import com.github.dockerjava.api.command.UpdateSwarmCmd;
+import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
@@ -84,6 +88,7 @@
 import com.github.dockerjava.netty.exec.InspectImageCmdExec;
 import com.github.dockerjava.netty.exec.InspectNetworkCmdExec;
 import com.github.dockerjava.netty.exec.InspectSwarmCmdExec;
+import com.github.dockerjava.netty.exec.InspectSwarmNodeCmdExec;
 import com.github.dockerjava.netty.exec.InspectVolumeCmdExec;
 import com.github.dockerjava.netty.exec.JoinSwarmCmdExec;
 import com.github.dockerjava.netty.exec.KillContainerCmdExec;
@@ -91,6 +96,7 @@
 import com.github.dockerjava.netty.exec.ListContainersCmdExec;
 import com.github.dockerjava.netty.exec.ListImagesCmdExec;
 import com.github.dockerjava.netty.exec.ListNetworksCmdExec;
+import com.github.dockerjava.netty.exec.ListSwarmNodesCmdExec;
 import com.github.dockerjava.netty.exec.ListVolumesCmdExec;
 import com.github.dockerjava.netty.exec.LoadImageCmdExec;
 import com.github.dockerjava.netty.exec.LogContainerCmdExec;
@@ -101,6 +107,7 @@
 import com.github.dockerjava.netty.exec.RemoveContainerCmdExec;
 import com.github.dockerjava.netty.exec.RemoveImageCmdExec;
 import com.github.dockerjava.netty.exec.RemoveNetworkCmdExec;
+import com.github.dockerjava.netty.exec.RemoveSwarmNodeCmdExec;
 import com.github.dockerjava.netty.exec.RemoveVolumeCmdExec;
 import com.github.dockerjava.netty.exec.RenameContainerCmdExec;
 import com.github.dockerjava.netty.exec.RestartContainerCmdExec;
@@ -114,6 +121,7 @@
 import com.github.dockerjava.netty.exec.UnpauseContainerCmdExec;
 import com.github.dockerjava.netty.exec.UpdateContainerCmdExec;
 import com.github.dockerjava.netty.exec.UpdateSwarmCmdExec;
+import com.github.dockerjava.netty.exec.UpdateSwarmNodeCmdExec;
 import com.github.dockerjava.netty.exec.VersionCmdExec;
 import com.github.dockerjava.netty.exec.WaitContainerCmdExec;
 import io.netty.bootstrap.Bootstrap;
@@ -149,14 +157,12 @@
 /**
  * Experimental implementation of {@link DockerCmdExecFactory} that supports http connection hijacking that is needed to pass STDIN to the
  * container.
- *
+ * <p>
  * To use it just pass an instance via {@link DockerClientImpl#withDockerCmdExecFactory(DockerCmdExecFactory)}
  *
+ * @author Marcus Linke
  * @see https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#attach-to-a-container
  * @see https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#exec-start
- *
- *
- * @author Marcus Linke
  */
 public class NettyDockerCmdExecFactory implements DockerCmdExecFactory {
 
@@ -604,6 +610,7 @@ public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() {
         return new DisconnectFromNetworkCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    // swarm
     @Override
     public InitializeSwarmCmd.Exec createInitializeSwarmCmdExec() {
         return new InitializeSwarmCmdExec(getBaseResource(), getDockerClientConfig());
@@ -629,6 +636,27 @@ public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() {
         return new UpdateSwarmCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    // nodes
+    @Override
+    public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() {
+        return new ListSwarmNodesCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectSwarmNodeCmd.Exec inspectSwarmNodeCmdExec() {
+        return new InspectSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveSwarmNodeCmd.Exec removeSwarmNodeCmdExec() {
+        return new RemoveSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() {
+        return new UpdateSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public void close() throws IOException {
         checkNotNull(eventLoopGroup, "Factory not initialized. You probably forgot to call init()!");
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectSwarmNodeCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/InspectSwarmNodeCmdExec.java
new file mode 100644
index 000000000..d33c9a957
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/InspectSwarmNodeCmdExec.java
@@ -0,0 +1,32 @@
+package com.github.dockerjava.netty.exec;
+
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.InspectSwarmNodeCmd;
+import com.github.dockerjava.api.model.SwarmNode;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class InspectSwarmNodeCmdExec extends AbstrSyncDockerCmdExec<InspectSwarmNodeCmd, SwarmNode>
+        implements InspectSwarmNodeCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InspectSwarmNodeCmdExec.class);
+
+    public InspectSwarmNodeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected SwarmNode execute(InspectSwarmNodeCmd command) {
+        WebTarget webResource = getBaseResource().path("/nodes/{id}").resolveTemplate("id",
+                command.getSwarmNodeId());
+
+        LOGGER.debug("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON)
+                .get(new TypeReference<SwarmNode>() {
+                });
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListSwarmNodesCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListSwarmNodesCmdExec.java
new file mode 100644
index 000000000..c0f43580b
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListSwarmNodesCmdExec.java
@@ -0,0 +1,46 @@
+package com.github.dockerjava.netty.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.ListSwarmNodesCmd;
+import com.github.dockerjava.api.model.SwarmNode;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.util.FiltersEncoder;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
+public class ListSwarmNodesCmdExec extends AbstrSyncDockerCmdExec<ListSwarmNodesCmd, List<SwarmNode>> implements
+        ListSwarmNodesCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ListSwarmNodesCmdExec.class);
+
+    public ListSwarmNodesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+
+    @Override
+    protected List<SwarmNode> execute(ListSwarmNodesCmd command) {
+        WebTarget webTarget = getBaseResource().path("/nodes");
+
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
+            webTarget = webTarget
+                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+        }
+
+        LOGGER.trace("GET: {}", webTarget);
+
+        List<SwarmNode> nodes = webTarget.request().accept(MediaType.APPLICATION_JSON)
+                .get(new TypeReference<List<SwarmNode>>() {
+                });
+
+        LOGGER.trace("Response: {}", nodes);
+
+        return nodes;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/RemoveSwarmNodeCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/RemoveSwarmNodeCmdExec.java
new file mode 100644
index 000000000..8740e5a6d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/RemoveSwarmNodeCmdExec.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class RemoveSwarmNodeCmdExec extends AbstrSyncDockerCmdExec<RemoveSwarmNodeCmd, Void> implements
+        RemoveSwarmNodeCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(com.github.dockerjava.jaxrs.RemoveSwarmNodeCmdExec.class);
+
+    public RemoveSwarmNodeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(RemoveSwarmNodeCmd command) {
+        WebTarget webTarget = getBaseResource().path("/nodes/" + command.getSwarmNodeId());
+
+        webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled());
+
+        LOGGER.trace("DELETE: {}", webTarget);
+        webTarget.request().accept(MediaType.APPLICATION_JSON).delete();
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/UpdateSwarmNodeCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/UpdateSwarmNodeCmdExec.java
new file mode 100644
index 000000000..8c877a2f8
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/UpdateSwarmNodeCmdExec.java
@@ -0,0 +1,33 @@
+package com.github.dockerjava.netty.exec;
+
+
+import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Update swarmNode spec
+ */
+public class UpdateSwarmNodeCmdExec extends AbstrSyncDockerCmdExec<UpdateSwarmNodeCmd, Void>
+        implements UpdateSwarmNodeCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(UpdateSwarmNodeCmdExec.class);
+
+    public UpdateSwarmNodeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(UpdateSwarmNodeCmd command) {
+        WebTarget webResource = getBaseResource().path("/nodes/{id}/update")
+                .resolveTemplate("id", command.getSwarmNodeId());
+
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(command.getSwarmNodeSpec());
+        return null;
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index 2dbf162ec..3a7540bd3 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -30,6 +30,7 @@
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectNetworkCmd;
 import com.github.dockerjava.api.command.InspectSwarmCmd;
+import com.github.dockerjava.api.command.InspectSwarmNodeCmd;
 import com.github.dockerjava.api.command.InspectVolumeCmd;
 import com.github.dockerjava.api.command.JoinSwarmCmd;
 import com.github.dockerjava.api.command.KillContainerCmd;
@@ -37,6 +38,7 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.command.ListSwarmNodesCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
@@ -47,6 +49,7 @@
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
@@ -60,6 +63,7 @@
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 import com.github.dockerjava.api.command.UpdateContainerCmd;
 import com.github.dockerjava.api.command.UpdateSwarmCmd;
+import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.BuildResponseItem;
@@ -432,6 +436,7 @@ public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() {
         return delegate.createDisconnectFromNetworkCmdExec();
     }
 
+    // swarm
     @Override
     public InitializeSwarmCmd.Exec createInitializeSwarmCmdExec() {
         return delegate.createInitializeSwarmCmdExec();
@@ -457,6 +462,28 @@ public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() {
         return delegate.createUpdateSwarmCmdExec();
     }
 
+    // nodes
+    @Override
+    public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() {
+        return delegate.listSwarmNodeCmdExec();
+    }
+
+    @Override
+    public InspectSwarmNodeCmd.Exec inspectSwarmNodeCmdExec() {
+        return delegate.inspectSwarmNodeCmdExec();
+    }
+
+    @Override
+    public RemoveSwarmNodeCmd.Exec removeSwarmNodeCmdExec() {
+        return delegate.removeSwarmNodeCmdExec();
+    }
+
+    @Override
+    public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() {
+        return delegate.updateSwarmNodeCmdExec();
+    }
+
+
     public List<String> getContainerNames() {
         return new ArrayList<String>(containerNames);
     }

From 55e4869d436ea63bed0b1b6913442f8575a22b68 Mon Sep 17 00:00:00 2001
From: Jan Melcher <mail@jan-melcher.de>
Date: Wed, 17 Aug 2016 15:26:46 +0200
Subject: [PATCH 0738/1272] Add endpoints for Service in swarm mode

Fix service tests

Add missing withDriver() method

Fix json name of Networks in ServiceSpec

Add tests to add network to services

Do not fail on empty beans
---
 .../github/dockerjava/api/DockerClient.java   |  45 +++
 .../api/command/CreateServiceCmd.java         |  31 ++
 .../api/command/CreateServiceResponse.java    |  24 ++
 .../api/command/DockerCmdExecFactory.java     |  38 ++-
 .../api/command/InspectServiceCmd.java        |  25 ++
 .../api/command/ListServicesCmd.java          |  35 +++
 .../api/command/RemoveServiceCmd.java         |  28 ++
 .../api/command/UpdateServiceCmd.java         |  30 ++
 .../dockerjava/api/model/BindOptions.java     |  54 ++++
 .../dockerjava/api/model/BindPropagation.java |  27 ++
 .../dockerjava/api/model/ContainerSpec.java   | 280 ++++++++++++++++++
 .../github/dockerjava/api/model/Endpoint.java | 100 +++++++
 .../api/model/EndpointResolutionMode.java     |  17 ++
 .../dockerjava/api/model/EndpointSpec.java    |  79 +++++
 .../api/model/EndpointVirtualIP.java          |  78 +++++
 .../github/dockerjava/api/model/Mount.java    | 166 +++++++++++
 .../dockerjava/api/model/MountType.java       |  15 +
 .../github/dockerjava/api/model/Network.java  |   5 +
 .../api/model/NetworkAttachmentConfig.java    |  79 +++++
 .../dockerjava/api/model/PortConfig.java      | 120 ++++++++
 .../api/model/PortConfigProtocol.java         |  17 ++
 .../api/model/ResourceRequirements.java       |  78 +++++
 .../dockerjava/api/model/ResourceSpecs.java   |  78 +++++
 .../github/dockerjava/api/model/Service.java  | 195 ++++++++++++
 .../api/model/ServiceGlobalModeOptions.java   |  33 +++
 .../dockerjava/api/model/ServiceMode.java     |  14 +
 .../api/model/ServiceModeConfig.java          | 100 +++++++
 .../api/model/ServicePlacement.java           |  57 ++++
 .../model/ServiceReplicatedModeOptions.java   |  54 ++++
 .../api/model/ServiceRestartCondition.java    |  20 ++
 .../api/model/ServiceRestartPolicy.java       | 122 ++++++++
 .../dockerjava/api/model/ServiceSpec.java     | 166 +++++++++++
 .../api/model/ServiceUpdateState.java         |  18 ++
 .../api/model/ServiceUpdateStatus.java        | 123 ++++++++
 .../github/dockerjava/api/model/TaskSpec.java | 144 +++++++++
 .../dockerjava/api/model/UpdateConfig.java    | 100 +++++++
 .../api/model/UpdateFailureAction.java        |  17 ++
 .../dockerjava/api/model/VolumeOptions.java   |  97 ++++++
 .../dockerjava/core/DockerClientImpl.java     |  35 +++
 .../dockerjava/core/RemoteApiVersion.java     |   4 +-
 .../core/command/CreateServiceCmdImpl.java    |  34 +++
 .../core/command/InspectServiceCmdImpl.java   |  42 +++
 .../core/command/ListServicesCmdImpl.java     |  43 +++
 .../core/command/RemoveServiceCmdImpl.java    |  40 +++
 .../core/command/UpdateServiceCmdImpl.java    | 112 +++++++
 .../core/util/ServiceFiltersBuilder.java      |  66 +++++
 .../jaxrs/CreateServiceCmdExec.java           |  31 ++
 .../jaxrs/InspectServiceCmdExec.java          |  30 ++
 .../jaxrs/JerseyDockerCmdExecFactory.java     |  39 +++
 .../dockerjava/jaxrs/ListServicesCmdExec.java |  44 +++
 .../jaxrs/RemoveServiceCmdExec.java           |  30 ++
 .../jaxrs/UpdateServiceCmdExec.java           |  36 +++
 .../netty/NettyDockerCmdExecFactory.java      |  36 +++
 .../netty/exec/CreateServiceCmdExec.java      |  30 ++
 .../netty/exec/InspectServiceCmdExec.java     |  30 ++
 .../netty/exec/ListServicesCmdExec.java       |  46 +++
 .../netty/exec/RemoveServiceCmdExec.java      |  29 ++
 .../netty/exec/UpdateServiceCmdExec.java      |  32 ++
 .../netty/handler/JsonRequestHandler.java     |   5 +
 .../handler/JsonResponseCallbackHandler.java  |   2 +
 .../core/TestDockerCmdExecFactory.java        |  34 ++-
 .../command/CreateServiceCmdExecTest.java     | 121 ++++++++
 .../command/RemoveServiceCmdExecTest.java     |  83 ++++++
 .../command/UpdateServiceCmdExecTest.java     |  88 ++++++
 .../netty/exec/CreateServiceCmdExecTest.java  | 123 ++++++++
 .../netty/exec/RemoveServiceCmdExecTest.java  |  83 ++++++
 .../netty/exec/UpdateServiceCmdExecTest.java  |  90 ++++++
 67 files changed, 4121 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/InspectServiceCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/RemoveServiceCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/BindOptions.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/BindPropagation.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/Endpoint.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/Mount.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/MountType.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/PortConfig.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/Service.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ServiceMode.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/TaskSpec.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/VolumeOptions.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/util/ServiceFiltersBuilder.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/CreateServiceCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/InspectServiceCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/ListServicesCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/RemoveServiceCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/UpdateServiceCmdExec.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/CreateServiceCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/RemoveServiceCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/core/command/UpdateServiceCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/CreateServiceCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/RemoveServiceCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/netty/exec/UpdateServiceCmdExecTest.java

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 58fa9d7c6..8fe841cce 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -12,6 +12,7 @@
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.command.CreateServiceCmd;
 import com.github.dockerjava.api.command.CreateVolumeCmd;
 import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
 import com.github.dockerjava.api.command.EventsCmd;
@@ -23,6 +24,7 @@
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectNetworkCmd;
+import com.github.dockerjava.api.command.InspectServiceCmd;
 import com.github.dockerjava.api.command.InspectSwarmCmd;
 import com.github.dockerjava.api.command.InspectVolumeCmd;
 import com.github.dockerjava.api.command.JoinSwarmCmd;
@@ -31,6 +33,7 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.command.ListServicesCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
@@ -41,6 +44,7 @@
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.RemoveServiceCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
@@ -53,12 +57,14 @@
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 import com.github.dockerjava.api.command.UpdateContainerCmd;
+import com.github.dockerjava.api.command.UpdateServiceCmd;
 import com.github.dockerjava.api.command.UpdateSwarmCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Identifier;
+import com.github.dockerjava.api.model.ServiceSpec;
 import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.core.RemoteApiVersion;
 
@@ -302,6 +308,45 @@ public interface DockerClient extends Closeable {
      */
     UpdateSwarmCmd updateSwarmCmd(SwarmSpec swarmSpec);
 
+    /**
+     * Command to list all services in a docker swarm. Only applicable if docker runs in swarm mode.
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_24}
+     * @return command
+     */
+    ListServicesCmd listServicesCmd();
+
+    /**
+     * Command to create a service in a docker swarm. Only applicable if docker runs in swarm mode.
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_24}
+     * @param serviceSpec the service specification
+     * @return command
+     */
+    CreateServiceCmd createServiceCmd(ServiceSpec serviceSpec);
+
+    /**
+     * Command to inspect a service
+     * @param serviceId service id or service name
+     * @return command
+     */
+    InspectServiceCmd inspectServiceCmd(String serviceId);
+
+    /**
+     * Command to update a service specification
+     * @param serviceId service id
+     * @param serviceSpec the new service specification
+     * @return command
+     */
+    UpdateServiceCmd updateServiceCmd(String serviceId, ServiceSpec serviceSpec);
+
+    /**
+     * Command to remove a service
+     * @param serviceId service id or service name
+     * @return command
+     */
+    RemoveServiceCmd removeServiceCmd(String serviceId);
+
     @Override
     void close() throws IOException;
 
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java
new file mode 100644
index 000000000..d8c2bc5e3
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.exception.ConflictException;
+import com.github.dockerjava.api.model.ServiceSpec;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import javax.annotation.CheckForNull;
+
+/**
+ * Command to create a new service
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public interface CreateServiceCmd extends SyncDockerCmd<CreateServiceResponse> {
+
+    @CheckForNull
+    ServiceSpec getServiceSpec();
+
+    CreateServiceCmd withServiceSpec(ServiceSpec serviceSpec);
+
+    /**
+     * @throws ConflictException
+     *             Named service already exists
+     */
+    @Override
+    CreateServiceResponse exec() throws ConflictException;
+
+    interface Exec extends DockerCmdSyncExec<CreateServiceCmd, CreateServiceResponse> {
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java b/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
new file mode 100644
index 000000000..9158ec25b
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
@@ -0,0 +1,24 @@
+package com.github.dockerjava.api.command;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+/**
+ * The response of a {@link CreateServiceCmd}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CreateServiceResponse {
+    @JsonProperty("ID")
+    private String id;
+
+    public String getId() {
+        return id;
+    }
+
+    @Override
+    public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index fc0ee8100..f6cc6b903 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -128,7 +128,43 @@ public interface DockerCmdExecFactory extends Closeable {
 
     UpdateSwarmCmd.Exec createUpdateSwarmCmdExec();
 
+    /**
+     * Command to list all services in a docker swarm. Only applicable if docker runs in swarm mode.
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_24}
+     */
+    ListServicesCmd.Exec createListServicesCmdExec();
+
+    /**
+     * Command to create a new service in a docker swarm. Only applicable if docker runs in swarm mode.
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_24}
+     */
+    CreateServiceCmd.Exec createCreateServiceCmdExec();
+
+    /**
+     * Command to inspect a service in a docker swarm. Only applicable if docker runs in swarm mode.
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_24}
+     */
+    InspectServiceCmd.Exec createInspectServiceCmdExec();
+
+    /**
+     * Command to update a service specification in a docker swarm. Only applicable if docker runs in swarm mode.
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_24}
+     */
+    UpdateServiceCmd.Exec createUpdateServiceCmdExec();
+
+    /**
+     * Command to remove a service in a docker swarm. Only applicable if docker runs in swarm mode.
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_24}
+     */
+    RemoveServiceCmd.Exec createRemoveServiceCmdExec();
+
     // nodes
+
     /**
      * List all nodes. Node operations require the engine to be part of a swarm
      *
@@ -158,8 +194,6 @@ public interface DockerCmdExecFactory extends Closeable {
     UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec();
 
 
-
-
     @Override
     void close() throws IOException;
 
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectServiceCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectServiceCmd.java
new file mode 100644
index 000000000..74c52c1f3
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/InspectServiceCmd.java
@@ -0,0 +1,25 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.Service;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+public interface InspectServiceCmd extends SyncDockerCmd<Service> {
+
+    @CheckForNull
+    String getServiceId();
+
+    InspectServiceCmd withServiceId(@Nonnull String serviceId);
+
+    /**
+     * @throws NotFoundException
+     *             No such service
+     */
+    @Override
+    Service exec() throws NotFoundException;
+
+    interface Exec extends DockerCmdSyncExec<InspectServiceCmd, Service> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java b/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java
new file mode 100644
index 000000000..1370e0ab9
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java
@@ -0,0 +1,35 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.model.Service;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import javax.annotation.CheckForNull;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Command to list all services in a docker swarm. Only applicable if docker runs in swarm mode.
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public interface ListServicesCmd extends SyncDockerCmd<List<Service>> {
+
+    @CheckForNull
+    Map<String, List<String>> getFilters();
+
+    /**
+     * @param ids
+     *            - Show only services with the given ids
+     */
+    ListServicesCmd withIdFilter(List<String> ids);
+    /**
+     *
+     * @param names
+     *            - Show only services with the given names
+     */
+    ListServicesCmd withNameFilter(List<String> names);
+
+    interface Exec extends DockerCmdSyncExec<ListServicesCmd, List<Service>> {
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveServiceCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveServiceCmd.java
new file mode 100644
index 000000000..d8a58126a
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveServiceCmd.java
@@ -0,0 +1,28 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * Remove a service.
+ */
+public interface RemoveServiceCmd extends SyncDockerCmd<Void> {
+
+    @CheckForNull
+    String getServiceId();
+
+    RemoveServiceCmd withServiceId(@Nonnull String serviceId);
+
+    /**
+     * @throws NotFoundException
+     *             No such service
+     */
+    @Override
+    Void exec() throws NotFoundException;
+
+    interface Exec extends DockerCmdSyncExec<RemoveServiceCmd, Void> {
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java b/src/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java
new file mode 100644
index 000000000..fb025ea76
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.model.ServiceSpec;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public interface UpdateServiceCmd extends SyncDockerCmd<Void> {
+    @CheckForNull
+    String getServiceId();
+
+    UpdateServiceCmd withServiceId(@Nonnull String serviceId);
+
+    @CheckForNull
+    ServiceSpec getServiceSpec();
+
+    UpdateServiceCmd withServiceSpec(ServiceSpec serviceSpec);
+
+    @CheckForNull
+    Long getVersion();
+
+    UpdateServiceCmd withVersion(Long version);
+
+    interface Exec extends DockerCmdSyncExec<UpdateServiceCmd, Void> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/BindOptions.java b/src/main/java/com/github/dockerjava/api/model/BindOptions.java
new file mode 100644
index 000000000..4f0c09279
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/BindOptions.java
@@ -0,0 +1,54 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class BindOptions implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Propagation")
+    BindPropagation propagation;
+
+    /**
+     * @see #propagation
+     */
+    public BindPropagation getPropagation() {
+        return propagation;
+    }
+
+    /**
+     * @see #propagation
+     */
+    public BindOptions withPropagation(BindPropagation propagation) {
+        this.propagation = propagation;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/BindPropagation.java b/src/main/java/com/github/dockerjava/api/model/BindPropagation.java
new file mode 100644
index 000000000..c7c545e10
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/BindPropagation.java
@@ -0,0 +1,27 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public enum BindPropagation {
+    @JsonProperty("rprivate")
+    R_PRIVATE,
+
+    @JsonProperty("private")
+    PRIVATE,
+
+    @JsonProperty("rshared")
+    R_SHARED,
+
+    @JsonProperty("shared")
+    SHARED,
+
+    @JsonProperty("rslave")
+    R_SLAVE,
+
+    @JsonProperty("slave")
+    SLAVE
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java b/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
new file mode 100644
index 000000000..a8c968936
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
@@ -0,0 +1,280 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * The specification for containers as used in {@link TaskSpec}
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class ContainerSpec implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Image")
+    private String image;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Labels")
+    private Map<String, String> labels;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Command")
+    private String command;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Args")
+    private List<String> args;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Env")
+    private List<String> env;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Dir")
+    private String dir;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("User")
+    private String user;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Groups")
+    private String groups;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("TTY")
+    private Boolean tty;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Mounts")
+    private List<Mount> mounts;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Duration")
+    private Long duration;
+
+    /**
+     * @see #image
+     */
+    @CheckForNull
+    public String getImage() {
+        return image;
+    }
+
+    /**
+     * @see #image
+     */
+    public ContainerSpec withImage(String image) {
+        this.image = image;
+        return this;
+    }
+
+    /**
+     * @see #labels
+     */
+    @CheckForNull
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
+    /**
+     * @see #labels
+     */
+    public ContainerSpec withLabels(Map<String, String> labels) {
+        this.labels = labels;
+        return this;
+    }
+
+    /**
+     * @see #command
+     */
+    @CheckForNull
+    public String getCommand() {
+        return command;
+    }
+
+    /**
+     * @see #command
+     */
+    public ContainerSpec withCommand(String command) {
+        this.command = command;
+        return this;
+    }
+
+    /**
+     * @see #args
+     */
+    @CheckForNull
+    public List<String> getArgs() {
+        return args;
+    }
+
+    /**
+     * @see #args
+     */
+    public ContainerSpec withArgs(List<String> args) {
+        this.args = args;
+        return this;
+    }
+
+    /**
+     * @see #env
+     */
+    @CheckForNull
+    public List<String> getEnv() {
+        return env;
+    }
+
+    /**
+     * @see #env
+     */
+    public ContainerSpec withEnv(List<String> env) {
+        this.env = env;
+        return this;
+    }
+
+    /**
+     * @see #dir
+     */
+    @CheckForNull
+    public String getDir() {
+        return dir;
+    }
+
+    /**
+     * @see #dir
+     */
+    public ContainerSpec withDir(String dir) {
+        this.dir = dir;
+        return this;
+    }
+
+    /**
+     * @see #user
+     */
+    @CheckForNull
+    public String getUser() {
+        return user;
+    }
+
+    /**
+     * @see #user
+     */
+    public ContainerSpec withUser(String user) {
+        this.user = user;
+        return this;
+    }
+
+    /**
+     * @see #groups
+     */
+    @CheckForNull
+    public String getGroups() {
+        return groups;
+    }
+
+    /**
+     * @see #groups
+     */
+    public ContainerSpec withGroups(String groups) {
+        this.groups = groups;
+        return this;
+    }
+
+    /**
+     * @see #tty
+     */
+    @CheckForNull
+    public Boolean getTty() {
+        return tty;
+    }
+
+    /**
+     * @see #tty
+     */
+    public ContainerSpec withTty(Boolean tty) {
+        this.tty = tty;
+        return this;
+    }
+
+    /**
+     * @see #mounts
+     */
+    @CheckForNull
+    public List<Mount> getMounts() {
+        return mounts;
+    }
+
+    /**
+     * @see #mounts
+     */
+    public ContainerSpec withMounts(List<Mount> mounts) {
+        this.mounts = mounts;
+        return this;
+    }
+
+    /**
+     * @see #duration
+     */
+    @CheckForNull
+    public Long getDuration() {
+        return duration;
+    }
+
+    /**
+     * @see #duration
+     */
+    public ContainerSpec withDuration(Long duration) {
+        this.duration = duration;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/Endpoint.java b/src/main/java/com/github/dockerjava/api/model/Endpoint.java
new file mode 100644
index 000000000..54ae0cad2
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/Endpoint.java
@@ -0,0 +1,100 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class Endpoint implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Spec")
+    private EndpointSpec spec;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Ports")
+    private PortConfig[] ports;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("VirtualIPs")
+    private EndpointVirtualIP[] virtualIPs;
+
+    /**
+     * @see #spec
+     */
+    @CheckForNull
+    public EndpointSpec getSpec() {
+        return spec;
+    }
+
+    /**
+     * @see #spec
+     */
+    public Endpoint withSpec(EndpointSpec spec) {
+        this.spec = spec;
+        return this;
+    }
+
+    /**
+     * @see #ports
+     */
+    @CheckForNull
+    public PortConfig[] getPorts() {
+        return ports;
+    }
+
+    /**
+     * @see #ports
+     */
+    public Endpoint withPorts(PortConfig[] ports) {
+        this.ports = ports;
+        return this;
+    }
+
+    /**
+     * @see #virtualIPs
+     */
+    @CheckForNull
+    public EndpointVirtualIP[] getVirtualIPs() {
+        return virtualIPs;
+    }
+
+    /**
+     * @see #virtualIPs
+     */
+    public Endpoint withVirtualIPs(EndpointVirtualIP[] virtualIPs) {
+        this.virtualIPs = virtualIPs;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java b/src/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java
new file mode 100644
index 000000000..89528ce6b
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java
@@ -0,0 +1,17 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public enum EndpointResolutionMode {
+
+    @JsonProperty("vip")
+    VIP,
+
+    @JsonProperty("dnsrr")
+    DNSRR
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java b/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
new file mode 100644
index 000000000..badbc06c2
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
@@ -0,0 +1,79 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class EndpointSpec implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Mode")
+    EndpointResolutionMode mode;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Ports")
+    List<PortConfig> ports;
+
+    /**
+     * @see #mode
+     */
+    @CheckForNull
+    public EndpointResolutionMode getMode() {
+        return mode;
+    }
+
+    /**
+     * @see #mode
+     */
+    public EndpointSpec withMode(EndpointResolutionMode mode) {
+        this.mode = mode;
+        return this;
+    }
+
+    /**
+     * @see #ports
+     */
+    @CheckForNull
+    public List<PortConfig> getPorts() {
+        return ports;
+    }
+
+    /**
+     * @see #ports
+     */
+    public EndpointSpec withPorts(List<PortConfig> ports) {
+        this.ports = ports;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java b/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
new file mode 100644
index 000000000..5bc600a4d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
@@ -0,0 +1,78 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class EndpointVirtualIP implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("NetworkID")
+    private String networkID;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Addr")
+    private String addr;
+
+    /**
+     * @see #networkID
+     */
+    @CheckForNull
+    public String getNetworkID() {
+        return networkID;
+    }
+
+    /**
+     * @see #networkID
+     */
+    public EndpointVirtualIP withNetworkID(String networkID) {
+        this.networkID = networkID;
+        return this;
+    }
+
+    /**
+     * @see #addr
+     */
+    @CheckForNull
+    public String getAddr() {
+        return addr;
+    }
+
+    /**
+     * @see #addr
+     */
+    public EndpointVirtualIP withAddr(String addr) {
+        this.addr = addr;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/Mount.java b/src/main/java/com/github/dockerjava/api/model/Mount.java
new file mode 100644
index 000000000..028dd6d74
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/Mount.java
@@ -0,0 +1,166 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class Mount implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Type")
+    private MountType type;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Source")
+    private String source;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Target")
+    private String target;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("ReadOnly")
+    private Boolean readOnly;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("BindOptions")
+    private BindOptions bindOptions;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("VolumeOptions")
+    private VolumeOptions volumeOptions;
+
+    /**
+     * @see #type
+     */
+    @CheckForNull
+    public MountType getType() {
+        return type;
+    }
+
+    /**
+     * @see #type
+     */
+    public Mount withType(MountType type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * @see #source
+     */
+    @CheckForNull
+    public String getSource() {
+        return source;
+    }
+
+    /**
+     * @see #source
+     */
+    public Mount withSource(String source) {
+        this.source = source;
+        return this;
+    }
+
+    /**
+     * @see #target
+     */
+    @CheckForNull
+    public String getTarget() {
+        return target;
+    }
+
+    /**
+     * @see #target
+     */
+    public Mount withTarget(String target) {
+        this.target = target;
+        return this;
+    }
+
+    /**
+     * @see #readOnly
+     */
+    @CheckForNull
+    public Boolean getReadOnly() {
+        return readOnly;
+    }
+
+    /**
+     * @see #readOnly
+     */
+    public Mount withReadOnly(Boolean readOnly) {
+        this.readOnly = readOnly;
+        return this;
+    }
+
+    /**
+     * @see #bindOptions
+     */
+    @CheckForNull
+    public BindOptions getBindOptions() {
+        return bindOptions;
+    }
+
+    /**
+     * @see #bindOptions
+     */
+    public Mount withBindOptions(BindOptions bindOptions) {
+        this.bindOptions = bindOptions;
+        return this;
+    }
+
+    /**
+     * @see #volumeOptions
+     */
+    @CheckForNull
+    public VolumeOptions getVolumeOptions() {
+        return volumeOptions;
+    }
+
+    /**
+     * @see #volumeOptions
+     */
+    public Mount withVolumeOptions(VolumeOptions volumeOptions) {
+        this.volumeOptions = volumeOptions;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/MountType.java b/src/main/java/com/github/dockerjava/api/model/MountType.java
new file mode 100644
index 000000000..e4f4edf90
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/MountType.java
@@ -0,0 +1,15 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public enum MountType {
+    @JsonProperty("bind")
+    BIND,
+
+    @JsonProperty("volume")
+    VOLUME
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/Network.java b/src/main/java/com/github/dockerjava/api/model/Network.java
index 2a532f88c..44eb2f402 100644
--- a/src/main/java/com/github/dockerjava/api/model/Network.java
+++ b/src/main/java/com/github/dockerjava/api/model/Network.java
@@ -155,6 +155,11 @@ public Ipam withConfig(Config... ipamConfigs) {
             return this;
         }
 
+        public Ipam withDriver(String driver) {
+            this.driver = driver;
+            return this;
+        }
+
         @Override
         public String toString() {
             return ToStringBuilder.reflectionToString(this);
diff --git a/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java b/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
new file mode 100644
index 000000000..64a69f7ef
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
@@ -0,0 +1,79 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class NetworkAttachmentConfig implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Target")
+    private String target;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Aliases")
+    private List<String> aliases;
+
+    /**
+     * @see #target
+     */
+    @CheckForNull
+    public String getTarget() {
+        return target;
+    }
+
+    /**
+     * @see #target
+     */
+    public NetworkAttachmentConfig withTarget(String target) {
+        this.target = target;
+        return this;
+    }
+
+    /**
+     * @see #aliases
+     */
+    @CheckForNull
+    public List<String> getAliases() {
+        return aliases;
+    }
+
+    /**
+     * @see #aliases
+     */
+    public NetworkAttachmentConfig withAliases(List<String> aliases) {
+        this.aliases = aliases;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/PortConfig.java b/src/main/java/com/github/dockerjava/api/model/PortConfig.java
new file mode 100644
index 000000000..c9204b574
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/PortConfig.java
@@ -0,0 +1,120 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class PortConfig implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Name")
+    private String name;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Protocol")
+    private PortConfigProtocol protocol;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("TargetPort")
+    private int targetPort;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("PublishedPort")
+    private int publishedPort;
+
+    /**
+     * @see #name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @see #name
+     */
+    public PortConfig withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * @see #protocol
+     */
+    @CheckForNull
+    public PortConfigProtocol getProtocol() {
+        return protocol;
+    }
+
+    /**
+     * @see #protocol
+     */
+    public PortConfig withProtocol(PortConfigProtocol protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * @see #targetPort
+     */
+    @CheckForNull
+    public int getTargetPort() {
+        return targetPort;
+    }
+
+    /**
+     * @see #targetPort
+     */
+    public PortConfig withTargetPort(int targetPort) {
+        this.targetPort = targetPort;
+        return this;
+    }
+
+    /**
+     * @see #publishedPort
+     */
+    @CheckForNull
+    public int getPublishedPort() {
+        return publishedPort;
+    }
+
+    /**
+     * @see #publishedPort
+     */
+    public PortConfig withPublishedPort(int publishedPort) {
+        this.publishedPort = publishedPort;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java b/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java
new file mode 100644
index 000000000..02d234914
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java
@@ -0,0 +1,17 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public enum PortConfigProtocol {
+
+    @JsonProperty("tcp")
+    TCP,
+
+    @JsonProperty("udp")
+    udp
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java b/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
new file mode 100644
index 000000000..ec2fbe555
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
@@ -0,0 +1,78 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class ResourceRequirements implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Limits")
+    private ResourceSpecs limits;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Reservations")
+    private ResourceSpecs reservations;
+
+    /**
+     * @see #limits
+     */
+    @CheckForNull
+    public ResourceSpecs getLimits() {
+        return limits;
+    }
+
+    /**
+     * @see #limits
+     */
+    public ResourceRequirements withLimits(ResourceSpecs limits) {
+        this.limits = limits;
+        return this;
+    }
+
+    /**
+     * @see #reservations
+     */
+    @CheckForNull
+    public ResourceSpecs getReservations() {
+        return reservations;
+    }
+
+    /**
+     * @see #reservations
+     */
+    public ResourceRequirements withReservations(ResourceSpecs reservations) {
+        this.reservations = reservations;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java b/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
new file mode 100644
index 000000000..4458e16b6
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
@@ -0,0 +1,78 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class ResourceSpecs implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("MemoryBytes")
+    private Long memoryBytes;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("NanoCPUs")
+    private Long nanoCPUs;
+
+    /**
+     * @see #memoryBytes
+     */
+    @CheckForNull
+    public Long getMemoryBytes() {
+        return memoryBytes;
+    }
+
+    /**
+     * @see #memoryBytes
+     */
+    public ResourceSpecs withMemoryBytes(long memoryBytes) {
+        this.memoryBytes = memoryBytes;
+        return this;
+    }
+
+    /**
+     * @see #nanoCPUs
+     */
+    @CheckForNull
+    public Long getNanoCPUs() {
+        return nanoCPUs;
+    }
+
+    /**
+     * @see #nanoCPUs
+     */
+    public ResourceSpecs withNanoCPUs(long nanoCPUs) {
+        this.nanoCPUs = nanoCPUs;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/Service.java b/src/main/java/com/github/dockerjava/api/model/Service.java
new file mode 100644
index 000000000..d66cfa5ae
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/Service.java
@@ -0,0 +1,195 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Used for Listing services.
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(Include.NON_NULL)
+public class Service implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("ID")
+    private String id;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("CreatedAt")
+    private Date createdAt;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("UpdatedAt")
+    private Date updatedAt;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Spec")
+    private ServiceSpec spec;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Endpoint")
+    private Endpoint endpoint;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("UpdateStatus")
+    private ServiceUpdateStatus updateStatus;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Version")
+    private ResourceVersion version;
+
+    /**
+     * @see #id
+     */
+    @CheckForNull
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * @see #id
+     */
+    public Service withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    /**
+     * @see #createdAt
+     */
+    @CheckForNull
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    /**
+     * @see #createdAt
+     */
+    public Service withCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+        return this;
+    }
+
+    /**
+     * @see #updatedAt
+     */
+    @CheckForNull
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    /**
+     * @see #updatedAt
+     */
+    public Service withUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+        return this;
+    }
+
+    /**
+     * @see #spec
+     */
+    @CheckForNull
+    public ServiceSpec getSpec() {
+        return spec;
+    }
+
+    /**
+     * @see #spec
+     */
+    public Service withSpec(ServiceSpec spec) {
+        this.spec = spec;
+        return this;
+    }
+
+    /**
+     * @see #endpoint
+     */
+    @CheckForNull
+    public Endpoint getEndpoint() {
+        return endpoint;
+    }
+
+    /**
+     * @see #endpoint
+     */
+    public Service withEndpoint(Endpoint endpoint) {
+        this.endpoint = endpoint;
+        return this;
+    }
+
+    /**
+     * @see #updateStatus
+     */
+    @CheckForNull
+    public ServiceUpdateStatus getUpdateStatus() {
+        return updateStatus;
+    }
+
+    /**
+     * @see #updateStatus
+     */
+    public Service withUpdateStatus(ServiceUpdateStatus updateStatus) {
+        this.updateStatus = updateStatus;
+        return this;
+    }
+
+    /**
+     * @see #version
+     */
+    @CheckForNull
+    public ResourceVersion getVersion() {
+        return version;
+    }
+
+    /**
+     * @see #version
+     */
+    public Service withVersion(ResourceVersion version) {
+        this.version = version;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java b/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
new file mode 100644
index 000000000..f183f1715
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
@@ -0,0 +1,33 @@
+package com.github.dockerjava.api.model;
+
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class ServiceGlobalModeOptions implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    // Intentionally left blank, there are no options for this mode
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceMode.java b/src/main/java/com/github/dockerjava/api/model/ServiceMode.java
new file mode 100644
index 000000000..594e2f66d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceMode.java
@@ -0,0 +1,14 @@
+package com.github.dockerjava.api.model;
+
+import com.github.dockerjava.core.RemoteApiVersion;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public enum ServiceMode {
+
+    REPLICATED,
+
+    GLOBAL
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java b/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
new file mode 100644
index 000000000..d2ffe3d95
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
@@ -0,0 +1,100 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class ServiceModeConfig implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Replicated")
+    private ServiceReplicatedModeOptions replicated;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Global")
+    private ServiceGlobalModeOptions global;
+
+    /**
+     * @since 1.24
+     */
+    @CheckForNull
+    public ServiceMode getMode() {
+        if (replicated != null) {
+            return ServiceMode.REPLICATED;
+        }
+        if (global != null) {
+            return ServiceMode.GLOBAL;
+        }
+
+        return null;
+    }
+
+    /**
+     * @since 1.24
+     */
+    @CheckForNull
+    public ServiceReplicatedModeOptions getReplicated() {
+        return replicated;
+    }
+
+    /**
+     * @since 1.24
+     */
+    public ServiceModeConfig withReplicated(ServiceReplicatedModeOptions replicated) {
+        if (replicated != null && this.global != null) {
+            throw new IllegalStateException("Cannot set both replicated and global mode");
+        }
+        this.replicated = replicated;
+
+        return this;
+    }
+
+    /**
+     * @since 1.24
+     */
+    @CheckForNull
+    public ServiceGlobalModeOptions getGlobal() {
+        return global;
+    }
+
+    /**
+     * @since 1.24
+     */
+    public ServiceModeConfig withGlobal(ServiceGlobalModeOptions global) {
+        if (global != null && this.replicated != null) {
+            throw new IllegalStateException("Cannot set both global and replicated mode");
+        }
+        this.global = global;
+
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java b/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
new file mode 100644
index 000000000..fa04aeff9
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
@@ -0,0 +1,57 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class ServicePlacement implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Constraints")
+    private List<String> constraints;
+
+    /**
+     * @see #constraints
+     */
+    @CheckForNull
+    public List<String> getConstraints() {
+        return constraints;
+    }
+
+    /**
+     * @see #constraints
+     */
+    public ServicePlacement withConstraints(List<String> constraints) {
+        this.constraints = constraints;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java b/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java
new file mode 100644
index 000000000..00865c7fa
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java
@@ -0,0 +1,54 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class ServiceReplicatedModeOptions implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Replicas")
+    private long replicas;
+
+    /**
+     * @see #replicas
+     */
+    public long getReplicas() {
+        return replicas;
+    }
+
+    /**
+     * @see #replicas
+     */
+    public ServiceReplicatedModeOptions withReplicas(int replicas) {
+        this.replicas = replicas;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java b/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java
new file mode 100644
index 000000000..98ca2f064
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java
@@ -0,0 +1,20 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public enum ServiceRestartCondition {
+
+    @JsonProperty("on_failure")
+    ON_FAILURE,
+
+    @JsonProperty("any")
+    ANY,
+
+    @JsonProperty("none")
+    NONE
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java b/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
new file mode 100644
index 000000000..70ab85d46
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
@@ -0,0 +1,122 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class ServiceRestartPolicy implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Condition")
+    private ServiceRestartCondition condition;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Delay")
+    private Long delay;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("MaxAttempts")
+    private Long maxAttempts;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Window")
+    private Long window;
+
+    /**
+     * @see #condition
+     */
+    @CheckForNull
+    public ServiceRestartCondition getCondition() {
+        return condition;
+    }
+
+    /**
+     * @see #condition
+     */
+    public ServiceRestartPolicy withCondition(ServiceRestartCondition condition) {
+        this.condition = condition;
+        return this;
+    }
+
+    /**
+     * @see #delay
+     */
+    @CheckForNull
+    public Long getDelay() {
+        return delay;
+    }
+
+    /**
+     * @see #delay
+     */
+    public ServiceRestartPolicy withDelay(Long delay) {
+        this.delay = delay;
+        return this;
+    }
+
+    /**
+     * @see #maxAttempts
+     */
+    @CheckForNull
+    public Long getMaxAttempts() {
+        return maxAttempts;
+    }
+
+    /**
+     * @see #maxAttempts
+     */
+    public ServiceRestartPolicy withMaxAttempts(Long maxAttempts) {
+        this.maxAttempts = maxAttempts;
+        return this;
+    }
+
+    /**
+     * @see #window
+     */
+    @CheckForNull
+    public Long getWindow() {
+        return window;
+    }
+
+    /**
+     * @see #window
+     */
+    public ServiceRestartPolicy withWindow(Long window) {
+        this.window = window;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java b/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
new file mode 100644
index 000000000..a3fe85ba4
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
@@ -0,0 +1,166 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class ServiceSpec implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Name")
+    private String name;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("TaskTemplate")
+    private TaskSpec taskTemplate;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Mode")
+    private ServiceModeConfig mode;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("UpdateConfig")
+    private UpdateConfig updateConfig;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Networks")
+    private List<NetworkAttachmentConfig> networks;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("EndpointSpec")
+    private EndpointSpec endpointSpec;
+
+    /**
+     * @see #name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @see #name
+     */
+    public ServiceSpec withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * @see #taskTemplate
+     */
+    @CheckForNull
+    public TaskSpec getTaskTemplate() {
+        return taskTemplate;
+    }
+
+    /**
+     * @see #taskTemplate
+     */
+    public ServiceSpec withTaskTemplate(TaskSpec taskTemplate) {
+        this.taskTemplate = taskTemplate;
+        return this;
+    }
+
+    /**
+     * @see #mode
+     */
+    @CheckForNull
+    public ServiceModeConfig getMode() {
+        return mode;
+    }
+
+    /**
+     * @see #mode
+     */
+    public ServiceSpec withMode(ServiceModeConfig mode) {
+        this.mode = mode;
+        return this;
+    }
+
+    /**
+     * @see #updateConfig
+     */
+    @CheckForNull
+    public UpdateConfig getUpdateConfig() {
+        return updateConfig;
+    }
+
+    /**
+     * @see #updateConfig
+     */
+    public ServiceSpec withUpdateConfig(UpdateConfig updateConfig) {
+        this.updateConfig = updateConfig;
+        return this;
+    }
+
+    /**
+     * @see #networks
+     */
+    @CheckForNull
+    public List<NetworkAttachmentConfig> getNetworks() {
+        return networks;
+    }
+
+    /**
+     * @see #networks
+     */
+    public ServiceSpec withNetworks(List<NetworkAttachmentConfig> networks) {
+        this.networks = networks;
+        return this;
+    }
+
+    /**
+     * @see #endpointSpec
+     */
+    @CheckForNull
+    public EndpointSpec getEndpointSpec() {
+        return endpointSpec;
+    }
+
+    /**
+     * @see #endpointSpec
+     */
+    public ServiceSpec withEndpointSpec(EndpointSpec endpointSpec) {
+        this.endpointSpec = endpointSpec;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java b/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java
new file mode 100644
index 000000000..6670015dd
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java
@@ -0,0 +1,18 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public enum ServiceUpdateState {
+    @JsonProperty("updating")
+    UPDATING,
+
+    @JsonProperty("paused")
+    PAUSED,
+
+    @JsonProperty("completed")
+    COMPLETED
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java b/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
new file mode 100644
index 000000000..67ef8585e
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
@@ -0,0 +1,123 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class ServiceUpdateStatus implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("State")
+    private ServiceUpdateState state;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("StartedAt")
+    private Date startedAt;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("CompletedAt")
+    private Date completedAt;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Message")
+    private String message;
+
+    /**
+     * @see #state
+     */
+    @CheckForNull
+    public ServiceUpdateState getState() {
+        return state;
+    }
+
+    /**
+     * @see #state
+     */
+    public ServiceUpdateStatus withState(ServiceUpdateState state) {
+        this.state = state;
+        return this;
+    }
+
+    /**
+     * @see #startedAt
+     */
+    @CheckForNull
+    public Date getStartedAt() {
+        return startedAt;
+    }
+
+    /**
+     * @see #startedAt
+     */
+    public ServiceUpdateStatus withStartedAt(Date startedAt) {
+        this.startedAt = startedAt;
+        return this;
+    }
+
+    /**
+     * @see #completedAt
+     */
+    @CheckForNull
+    public Date getCompletedAt() {
+        return completedAt;
+    }
+
+    /**
+     * @see #completedAt
+     */
+    public ServiceUpdateStatus withCompletedAt(Date completedAt) {
+        this.completedAt = completedAt;
+        return this;
+    }
+
+    /**
+     * @see #message
+     */
+    @CheckForNull
+    public String getMessage() {
+        return message;
+    }
+
+    /**
+     * @see #message
+     */
+    public ServiceUpdateStatus withMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/TaskSpec.java b/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
new file mode 100644
index 000000000..3e3682324
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
@@ -0,0 +1,144 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class TaskSpec implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("ContainerSpec")
+    private ContainerSpec containerSpec;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Resources")
+    private ResourceRequirements resources;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("RestartPolicy")
+    private ServiceRestartPolicy restartPolicy;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Placement")
+    private ServicePlacement placement;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("LogDriver")
+    private Driver logDriver;
+
+    /**
+     * @see #containerSpec
+     */
+    @CheckForNull
+    public ContainerSpec getContainerSpec() {
+        return containerSpec;
+    }
+
+    /**
+     * @see #containerSpec
+     */
+    public TaskSpec withContainerSpec(ContainerSpec containerSpec) {
+        this.containerSpec = containerSpec;
+        return this;
+    }
+
+    /**
+     * @see #resources
+     */
+    @CheckForNull
+    public ResourceRequirements getResources() {
+        return resources;
+    }
+
+    /**
+     * @see #resources
+     */
+    public TaskSpec withResources(ResourceRequirements resources) {
+        this.resources = resources;
+        return this;
+    }
+
+    /**
+     * @see #restartPolicy
+     */
+    @CheckForNull
+    public ServiceRestartPolicy getRestartPolicy() {
+        return restartPolicy;
+    }
+
+    /**
+     * @see #restartPolicy
+     */
+    public TaskSpec withRestartPolicy(ServiceRestartPolicy restartPolicy) {
+        this.restartPolicy = restartPolicy;
+        return this;
+    }
+
+    /**
+     * @see #placement
+     */
+    @CheckForNull
+    public ServicePlacement getPlacement() {
+        return placement;
+    }
+
+    /**
+     * @see #placement
+     */
+    public TaskSpec withPlacement(ServicePlacement placement) {
+        this.placement = placement;
+        return this;
+    }
+
+    /**
+     * @see #logDriver
+     */
+    @CheckForNull
+    public Driver getLogDriver() {
+        return logDriver;
+    }
+
+    /**
+     * @see #logDriver
+     */
+    public TaskSpec withLogDriver(Driver logDriver) {
+        this.logDriver = logDriver;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java b/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
new file mode 100644
index 000000000..56a64467d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
@@ -0,0 +1,100 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class UpdateConfig implements Serializable {
+    public static final Long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Parallelism")
+    private Long parallelism;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Delay")
+    private Long delay;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("FailureAction")
+    private UpdateFailureAction failureAction;
+
+    /**
+     * @see #parallelism
+     */
+    @CheckForNull
+    public Long getParallelism() {
+        return parallelism;
+    }
+
+    /**
+     * @see #parallelism
+     */
+    public UpdateConfig withParallelism(long parallelism) {
+        this.parallelism = parallelism;
+        return this;
+    }
+
+    /**
+     * @see #delay
+     */
+    @CheckForNull
+    public Long getDelay() {
+        return delay;
+    }
+
+    /**
+     * @see #delay
+     */
+    public UpdateConfig setDelay(Long delay) {
+        this.delay = delay;
+        return this;
+    }
+
+    /**
+     * @see #failureAction
+     */
+    @CheckForNull
+    public UpdateFailureAction getFailureAction() {
+        return failureAction;
+    }
+
+    /**
+     * @see #failureAction
+     */
+    public UpdateConfig withFailureAction(UpdateFailureAction failureAction) {
+        this.failureAction = failureAction;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java b/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java
new file mode 100644
index 000000000..6d5a7e815
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java
@@ -0,0 +1,17 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public enum UpdateFailureAction {
+
+    @JsonProperty("pause")
+    PAUSE,
+
+    @JsonProperty("continue")
+    CONTINUE
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java b/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java
new file mode 100644
index 000000000..718d5c71d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java
@@ -0,0 +1,97 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class VolumeOptions implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("NoCopy")
+    private Boolean noCopy;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Labels")
+    private Map<String, String> labels;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("DriverConfig")
+    private Driver driverConfig;
+
+    /**
+     * @see #noCopy
+     */
+    public Boolean getNoCopy() {
+        return noCopy;
+    }
+
+    /**
+     * @see #noCopy
+     */
+    public VolumeOptions withNoCopy(Boolean noCopy) {
+        this.noCopy = noCopy;
+        return this;
+    }
+
+    /**
+     * @see #labels
+     */
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
+    /**
+     * @see #labels
+     */
+    public VolumeOptions withLabels(Map<String, String> labels) {
+        this.labels = labels;
+        return this;
+    }
+
+    /**
+     * @see #driverConfig
+     */
+    public Driver getDriverConfig() {
+        return driverConfig;
+    }
+
+    /**
+     * @see #driverConfig
+     */
+    public VolumeOptions withDriverConfig(Driver driverConfig) {
+        this.driverConfig = driverConfig;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 1de47fdd0..3abfdbe38 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -13,6 +13,7 @@
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.command.CreateServiceCmd;
 import com.github.dockerjava.api.command.CreateVolumeCmd;
 import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
@@ -25,6 +26,7 @@
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectNetworkCmd;
+import com.github.dockerjava.api.command.InspectServiceCmd;
 import com.github.dockerjava.api.command.InspectSwarmCmd;
 import com.github.dockerjava.api.command.InspectVolumeCmd;
 import com.github.dockerjava.api.command.JoinSwarmCmd;
@@ -33,6 +35,7 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.command.ListServicesCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
@@ -43,6 +46,7 @@
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.RemoveServiceCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
@@ -55,11 +59,13 @@
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 import com.github.dockerjava.api.command.UpdateContainerCmd;
+import com.github.dockerjava.api.command.UpdateServiceCmd;
 import com.github.dockerjava.api.command.UpdateSwarmCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Identifier;
+import com.github.dockerjava.api.model.ServiceSpec;
 import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.core.command.AttachContainerCmdImpl;
 import com.github.dockerjava.core.command.AuthCmdImpl;
@@ -73,6 +79,7 @@
 import com.github.dockerjava.core.command.CreateContainerCmdImpl;
 import com.github.dockerjava.core.command.CreateImageCmdImpl;
 import com.github.dockerjava.core.command.CreateNetworkCmdImpl;
+import com.github.dockerjava.core.command.CreateServiceCmdImpl;
 import com.github.dockerjava.core.command.CreateVolumeCmdImpl;
 import com.github.dockerjava.core.command.DisconnectFromNetworkCmdImpl;
 import com.github.dockerjava.core.command.EventsCmdImpl;
@@ -84,6 +91,7 @@
 import com.github.dockerjava.core.command.InspectContainerCmdImpl;
 import com.github.dockerjava.core.command.InspectExecCmdImpl;
 import com.github.dockerjava.core.command.InspectImageCmdImpl;
+import com.github.dockerjava.core.command.InspectServiceCmdImpl;
 import com.github.dockerjava.core.command.InspectSwarmCmdImpl;
 import com.github.dockerjava.core.command.InspectVolumeCmdImpl;
 import com.github.dockerjava.core.command.JoinSwarmCmdImpl;
@@ -92,6 +100,7 @@
 import com.github.dockerjava.core.command.ListContainersCmdImpl;
 import com.github.dockerjava.core.command.ListImagesCmdImpl;
 import com.github.dockerjava.core.command.ListNetworksCmdImpl;
+import com.github.dockerjava.core.command.ListServicesCmdImpl;
 import com.github.dockerjava.core.command.ListVolumesCmdImpl;
 import com.github.dockerjava.core.command.LoadImageCmdImpl;
 import com.github.dockerjava.core.command.LogContainerCmdImpl;
@@ -102,6 +111,7 @@
 import com.github.dockerjava.core.command.RemoveContainerCmdImpl;
 import com.github.dockerjava.core.command.RemoveImageCmdImpl;
 import com.github.dockerjava.core.command.RemoveNetworkCmdImpl;
+import com.github.dockerjava.core.command.RemoveServiceCmdImpl;
 import com.github.dockerjava.core.command.RemoveVolumeCmdImpl;
 import com.github.dockerjava.core.command.RenameContainerCmdImpl;
 import com.github.dockerjava.core.command.RestartContainerCmdImpl;
@@ -114,6 +124,7 @@
 import com.github.dockerjava.core.command.TopContainerCmdImpl;
 import com.github.dockerjava.core.command.UnpauseContainerCmdImpl;
 import com.github.dockerjava.core.command.UpdateContainerCmdImpl;
+import com.github.dockerjava.core.command.UpdateServiceCmdImpl;
 import com.github.dockerjava.core.command.UpdateSwarmCmdImpl;
 import com.github.dockerjava.core.command.VersionCmdImpl;
 import com.github.dockerjava.core.command.WaitContainerCmdImpl;
@@ -518,6 +529,30 @@ public UpdateSwarmCmd updateSwarmCmd(SwarmSpec swarmSpec) {
         return new UpdateSwarmCmdImpl(getDockerCmdExecFactory().createUpdateSwarmCmdExec(), swarmSpec);
     }
 
+    @Override public ListServicesCmd listServicesCmd() {
+        return new ListServicesCmdImpl(getDockerCmdExecFactory().createListServicesCmdExec());
+    }
+
+    @Override
+    public CreateServiceCmd createServiceCmd(ServiceSpec serviceSpec) {
+        return new CreateServiceCmdImpl(getDockerCmdExecFactory().createCreateServiceCmdExec(), serviceSpec);
+    }
+
+    @Override
+    public InspectServiceCmd inspectServiceCmd(String serviceId) {
+        return new InspectServiceCmdImpl(getDockerCmdExecFactory().createInspectServiceCmdExec(), serviceId);
+    }
+
+    @Override
+    public UpdateServiceCmd updateServiceCmd(String serviceId, ServiceSpec serviceSpec) {
+        return new UpdateServiceCmdImpl(getDockerCmdExecFactory().createUpdateServiceCmdExec(), serviceId, serviceSpec);
+    }
+
+    @Override
+    public RemoveServiceCmd removeServiceCmd(String serviceId) {
+        return new RemoveServiceCmdImpl(getDockerCmdExecFactory().createRemoveServiceCmdExec(), serviceId);
+    }
+
     @Override
     public void close() throws IOException {
         getDockerCmdExecFactory().close();
diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index 44c4f0237..90616ffaa 100644
--- a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -63,12 +63,12 @@ public class RemoteApiVersion implements Serializable {
     public static final RemoteApiVersion VERSION_1_22 = RemoteApiVersion.create(1, 22);
 
     /**
-     * @see <a href="https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.23.md">Docker API 1.22</a>
+     * @see <a href="https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.23.md">Docker API 1.23</a>
      */
     public static final RemoteApiVersion VERSION_1_23 = RemoteApiVersion.create(1, 23);
 
     /**
-     * @see <a href="https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.24.md">Docker API 1.22</a>
+     * @see <a href="https://github.com/docker/docker/blob/master/docs/reference/api/docker_remote_api_v1.24.md">Docker API 1.24</a>
      */
     public static final RemoteApiVersion VERSION_1_24 = RemoteApiVersion.create(1, 24);
 
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java
new file mode 100644
index 000000000..1b8e78e42
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java
@@ -0,0 +1,34 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.CreateServiceCmd;
+import com.github.dockerjava.api.command.CreateServiceResponse;
+import com.github.dockerjava.api.model.ServiceSpec;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Creates a new service
+ */
+public class CreateServiceCmdImpl extends AbstrDockerCmd<CreateServiceCmd, CreateServiceResponse> implements
+        CreateServiceCmd {
+
+    private ServiceSpec serviceSpec;
+
+    public CreateServiceCmdImpl(CreateServiceCmd.Exec exec, ServiceSpec serviceSpec) {
+        super(exec);
+        checkNotNull(serviceSpec, "serviceSpec was not specified");
+        withServiceSpec(serviceSpec);
+    }
+
+    @Override
+    public ServiceSpec getServiceSpec() {
+        return serviceSpec;
+    }
+
+    @Override
+    public CreateServiceCmd withServiceSpec(ServiceSpec serviceSpec) {
+        checkNotNull(serviceSpec, "serviceSpec was not specified");
+        this.serviceSpec = serviceSpec;
+        return this;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java
new file mode 100644
index 000000000..5b7dcd895
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java
@@ -0,0 +1,42 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.InspectServiceCmd;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.Service;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Inspect the details of a container.
+ */
+public class InspectServiceCmdImpl extends AbstrDockerCmd<InspectServiceCmd, Service> implements
+        InspectServiceCmd {
+
+    private String serviceId;
+
+    public InspectServiceCmdImpl(Exec exec, String serviceId) {
+        super(exec);
+        withServiceId(serviceId);
+    }
+
+    @Override
+    public String getServiceId() {
+        return serviceId;
+    }
+
+    @Override
+    public InspectServiceCmd withServiceId(String serviceId) {
+        checkNotNull(serviceId, "serviceId was not specified");
+        this.serviceId = serviceId;
+        return this;
+    }
+
+    /**
+     * @throws NotFoundException
+     *             No such service
+     */
+    @Override
+    public Service exec() throws NotFoundException {
+        return super.exec();
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java
new file mode 100644
index 000000000..9e76f5306
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java
@@ -0,0 +1,43 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.ListServicesCmd;
+import com.github.dockerjava.api.model.Service;
+import com.github.dockerjava.core.util.ServiceFiltersBuilder;
+
+import java.util.List;
+import java.util.Map;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * List services.
+ */
+public class ListServicesCmdImpl extends AbstrDockerCmd<ListServicesCmd, List<Service>> implements
+        ListServicesCmd {
+
+    private ServiceFiltersBuilder filters = new ServiceFiltersBuilder();
+
+    public ListServicesCmdImpl(Exec exec) {
+        super(exec);
+    }
+
+    @Override
+    public Map<String, List<String>> getFilters() {
+        return filters.build();
+    }
+
+    @Override
+    public ListServicesCmd withIdFilter(List<String> ids) {
+        checkNotNull(ids, "ids was not specified");
+        this.filters.withIds(ids);
+        return this;
+    }
+
+    @Override
+    public ListServicesCmd withNameFilter(List<String> names) {
+        checkNotNull(names, "names was not specified");
+        this.filters.withNames(names);
+        return this;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java
new file mode 100644
index 000000000..9da85847a
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java
@@ -0,0 +1,40 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.RemoveServiceCmd;
+import com.github.dockerjava.api.exception.NotFoundException;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Remove a service.
+ */
+public class RemoveServiceCmdImpl extends AbstrDockerCmd<RemoveServiceCmd, Void> implements RemoveServiceCmd {
+
+    private String serviceId;
+
+    public RemoveServiceCmdImpl(Exec exec, String serviceId) {
+        super(exec);
+        withServiceId(serviceId);
+    }
+
+    @Override
+    public String getServiceId() {
+        return serviceId;
+    }
+
+    @Override
+    public RemoveServiceCmd withServiceId(String serviceId) {
+        checkNotNull(serviceId, "serviceId was not specified");
+        this.serviceId = serviceId;
+        return this;
+    }
+
+    /**
+     * @throws NotFoundException
+     *             No such service
+     */
+    @Override
+    public Void exec() throws NotFoundException {
+        return super.exec();
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java
new file mode 100644
index 000000000..664ffd997
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java
@@ -0,0 +1,112 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.UpdateServiceCmd;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.ServiceSpec;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class UpdateServiceCmdImpl extends AbstrDockerCmd<UpdateServiceCmd, Void>
+        implements UpdateServiceCmd {
+
+    /**
+     * @since 1.24
+     */
+    private String serviceId;
+
+    /**
+     * @since 1.24
+     */
+    private ServiceSpec serviceSpec;
+
+    /**
+     * @since 1.24
+     */
+    private Long version;
+
+    public UpdateServiceCmdImpl(Exec exec, String serviceId, ServiceSpec serviceSpec) {
+        super(exec);
+        withServiceId(serviceId);
+        withServiceSpec(serviceSpec);
+    }
+
+    /**
+     * @see #serviceId
+     */
+    @CheckForNull
+    public String getServiceId() {
+        return serviceId;
+    }
+
+    /**
+     * @see #serviceId
+     */
+    public UpdateServiceCmd withServiceId(@Nonnull String serviceId) {
+        this.serviceId = serviceId;
+        return this;
+    }
+
+    /**
+     * @see #serviceSpec
+     */
+    @CheckForNull
+    public ServiceSpec getServiceSpec() {
+        return serviceSpec;
+    }
+
+    /**
+     * @see #serviceSpec
+     */
+    public UpdateServiceCmd withServiceSpec(ServiceSpec serviceSpec) {
+        this.serviceSpec = serviceSpec;
+        return this;
+    }
+
+    /**
+     * @see #version
+     */
+    @CheckForNull
+    public Long getVersion() {
+        return version;
+    }
+
+    /**
+     * @see #version
+     */
+    public UpdateServiceCmdImpl withVersion(Long version) {
+        this.version = version;
+        return this;
+    }
+
+    /**
+     * @throws NotFoundException No such service
+     */
+    @Override
+    public Void exec() throws NotFoundException {
+        return super.exec();
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/util/ServiceFiltersBuilder.java b/src/main/java/com/github/dockerjava/core/util/ServiceFiltersBuilder.java
new file mode 100644
index 000000000..83d98a2cc
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/util/ServiceFiltersBuilder.java
@@ -0,0 +1,66 @@
+package com.github.dockerjava.core.util;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Representation of filters to service lists.
+ */
+public class ServiceFiltersBuilder {
+
+    private Map<String, List<String>> filters = new HashMap<>();
+
+    public ServiceFiltersBuilder() {
+    }
+
+    public ServiceFiltersBuilder withFilter(String key, String... value) {
+        filters.put(key, Arrays.asList(value));
+        return this;
+    }
+
+    public ServiceFiltersBuilder withFilter(String key, List<String> value) {
+        filters.put(key, value);
+        return this;
+    }
+
+    public List<String> getFilter(String key) {
+        return filters.get(key);
+    }
+
+    public ServiceFiltersBuilder withIds(List<String> ids) {
+        withFilter("id", ids);
+        return this;
+    }
+
+    public List<String> getIds() {
+        return getFilter("id");
+    }
+
+    public ServiceFiltersBuilder withNames(List<String> names) {
+        withFilter("name", names);
+        return this;
+    }
+
+    public List<String> getNames() {
+        return getFilter("names");
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+
+    }
+
+    @Override
+    public int hashCode() {
+        return filters.hashCode();
+    }
+
+    public Map<String, List<String>> build() {
+        return filters;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java
new file mode 100644
index 000000000..aa000e71a
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.command.CreateServiceCmd;
+import com.github.dockerjava.api.command.CreateServiceResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import static javax.ws.rs.client.Entity.entity;
+
+public class CreateServiceCmdExec extends AbstrSyncDockerCmdExec<CreateServiceCmd, CreateServiceResponse>
+        implements CreateServiceCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateServiceCmdExec.class);
+
+    public CreateServiceCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected CreateServiceResponse execute(CreateServiceCmd command) {
+        WebTarget webResource = getBaseResource().path("/services/create");
+
+        LOGGER.trace("POST: {} ", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(entity(command.getServiceSpec(), MediaType.APPLICATION_JSON), CreateServiceResponse.class);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java
new file mode 100644
index 000000000..480103b43
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.command.InspectServiceCmd;
+import com.github.dockerjava.api.model.Service;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+public class InspectServiceCmdExec extends AbstrSyncDockerCmdExec<InspectServiceCmd, Service>
+        implements InspectServiceCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InspectServiceCmdExec.class);
+
+    public InspectServiceCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Service execute(InspectServiceCmd command) {
+        WebTarget webResource = getBaseResource().path("/services/{id}")
+                                                 .resolveTemplate("id", command.getServiceId());
+
+        LOGGER.debug("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(Service.class);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
index ef457e317..4acc89b1c 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.jaxrs;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd;
@@ -13,6 +15,7 @@
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.command.CreateServiceCmd;
 import com.github.dockerjava.api.command.CreateVolumeCmd;
 import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
@@ -25,6 +28,7 @@
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectNetworkCmd;
+import com.github.dockerjava.api.command.InspectServiceCmd;
 import com.github.dockerjava.api.command.InspectSwarmCmd;
 import com.github.dockerjava.api.command.InspectSwarmNodeCmd;
 import com.github.dockerjava.api.command.InspectVolumeCmd;
@@ -34,6 +38,7 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.command.ListServicesCmd;
 import com.github.dockerjava.api.command.ListSwarmNodesCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
@@ -45,6 +50,7 @@
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.RemoveServiceCmd;
 import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RenameContainerCmd;
@@ -58,6 +64,7 @@
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 import com.github.dockerjava.api.command.UpdateContainerCmd;
+import com.github.dockerjava.api.command.UpdateServiceCmd;
 import com.github.dockerjava.api.command.UpdateSwarmCmd;
 import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
 import com.github.dockerjava.api.command.VersionCmd;
@@ -141,6 +148,11 @@ public void init(DockerClientConfig dockerClientConfig) {
         clientConfig.register(JsonClientFilter.class);
         clientConfig.register(JacksonJsonProvider.class);
         RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
+
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+        clientConfig.register(new JacksonJsonProvider(objectMapper));
+
         // logging may disabled via log level
         clientConfig.register(new SelectiveLoggingFilter(LOGGER, true));
 
@@ -581,6 +593,33 @@ public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() {
         return new UpdateSwarmCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    // service
+    @Override
+    public ListServicesCmd.Exec createListServicesCmdExec() {
+        return new ListServicesCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CreateServiceCmd.Exec createCreateServiceCmdExec() {
+        return new CreateServiceCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectServiceCmd.Exec createInspectServiceCmdExec() {
+        return new InspectServiceCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public UpdateServiceCmd.Exec createUpdateServiceCmdExec() {
+        return new UpdateServiceCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveServiceCmd.Exec createRemoveServiceCmdExec() {
+        return new RemoveServiceCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    //node
     @Override
     public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() {
         return new ListSwarmNodesCmdExec(getBaseResource(), getDockerClientConfig());
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java
new file mode 100644
index 000000000..df9f972e6
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java
@@ -0,0 +1,44 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.command.ListServicesCmd;
+import com.github.dockerjava.api.model.Service;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.util.FiltersEncoder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
+public class ListServicesCmdExec extends AbstrSyncDockerCmdExec<ListServicesCmd, List<Service>> implements
+        ListServicesCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ListServicesCmdExec.class);
+
+    public ListServicesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected List<Service> execute(ListServicesCmd command) {
+        WebTarget webTarget = getBaseResource().path("/services");
+
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
+            webTarget = webTarget
+                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+        }
+
+        LOGGER.trace("GET: {}", webTarget);
+        List<Service> services = webTarget.request().accept(MediaType.APPLICATION_JSON)
+                .get(new GenericType<List<Service>>() {
+                });
+        LOGGER.trace("Response: {}", services);
+
+        return services;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java
new file mode 100644
index 000000000..f10f94a3c
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.command.RemoveServiceCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+public class RemoveServiceCmdExec extends AbstrSyncDockerCmdExec<RemoveServiceCmd, Void> implements
+        RemoveServiceCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveServiceCmdExec.class);
+
+    public RemoveServiceCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(RemoveServiceCmd command) {
+        WebTarget webTarget = getBaseResource().path("/services/" + command.getServiceId());
+
+        LOGGER.trace("DELETE: {}", webTarget);
+        webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close();
+
+        return null;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java
new file mode 100644
index 000000000..d6259192b
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java
@@ -0,0 +1,36 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.command.UpdateServiceCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import static javax.ws.rs.client.Entity.entity;
+
+/**
+ * Update service settings.
+ */
+public class UpdateServiceCmdExec extends AbstrSyncDockerCmdExec<UpdateServiceCmd, Void>
+        implements UpdateServiceCmd.Exec {
+    private static final Logger LOGGER = LoggerFactory.getLogger(UpdateServiceCmdExec.class);
+
+    public UpdateServiceCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(UpdateServiceCmd command) {
+        WebTarget webResource = getBaseResource().path("/services/{id}/update")
+                .resolveTemplate("id", command.getServiceId())
+                .queryParam("version", command.getVersion());
+
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(entity(command.getServiceSpec(), MediaType.APPLICATION_JSON)).close();
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index aa46f8e11..6c00721a0 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -12,6 +12,7 @@
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.command.CreateServiceCmd;
 import com.github.dockerjava.api.command.CreateVolumeCmd;
 import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
@@ -24,6 +25,7 @@
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectNetworkCmd;
+import com.github.dockerjava.api.command.InspectServiceCmd;
 import com.github.dockerjava.api.command.InspectSwarmCmd;
 import com.github.dockerjava.api.command.InspectSwarmNodeCmd;
 import com.github.dockerjava.api.command.InspectVolumeCmd;
@@ -33,6 +35,7 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.command.ListServicesCmd;
 import com.github.dockerjava.api.command.ListSwarmNodesCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
@@ -44,6 +47,7 @@
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.RemoveServiceCmd;
 import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RenameContainerCmd;
@@ -57,6 +61,7 @@
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 import com.github.dockerjava.api.command.UpdateContainerCmd;
+import com.github.dockerjava.api.command.UpdateServiceCmd;
 import com.github.dockerjava.api.command.UpdateSwarmCmd;
 import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
 import com.github.dockerjava.api.command.VersionCmd;
@@ -76,6 +81,7 @@
 import com.github.dockerjava.netty.exec.CreateContainerCmdExec;
 import com.github.dockerjava.netty.exec.CreateImageCmdExec;
 import com.github.dockerjava.netty.exec.CreateNetworkCmdExec;
+import com.github.dockerjava.netty.exec.CreateServiceCmdExec;
 import com.github.dockerjava.netty.exec.CreateVolumeCmdExec;
 import com.github.dockerjava.netty.exec.DisconnectFromNetworkCmdExec;
 import com.github.dockerjava.netty.exec.EventsCmdExec;
@@ -87,6 +93,7 @@
 import com.github.dockerjava.netty.exec.InspectExecCmdExec;
 import com.github.dockerjava.netty.exec.InspectImageCmdExec;
 import com.github.dockerjava.netty.exec.InspectNetworkCmdExec;
+import com.github.dockerjava.netty.exec.InspectServiceCmdExec;
 import com.github.dockerjava.netty.exec.InspectSwarmCmdExec;
 import com.github.dockerjava.netty.exec.InspectSwarmNodeCmdExec;
 import com.github.dockerjava.netty.exec.InspectVolumeCmdExec;
@@ -96,6 +103,7 @@
 import com.github.dockerjava.netty.exec.ListContainersCmdExec;
 import com.github.dockerjava.netty.exec.ListImagesCmdExec;
 import com.github.dockerjava.netty.exec.ListNetworksCmdExec;
+import com.github.dockerjava.netty.exec.ListServicesCmdExec;
 import com.github.dockerjava.netty.exec.ListSwarmNodesCmdExec;
 import com.github.dockerjava.netty.exec.ListVolumesCmdExec;
 import com.github.dockerjava.netty.exec.LoadImageCmdExec;
@@ -107,6 +115,7 @@
 import com.github.dockerjava.netty.exec.RemoveContainerCmdExec;
 import com.github.dockerjava.netty.exec.RemoveImageCmdExec;
 import com.github.dockerjava.netty.exec.RemoveNetworkCmdExec;
+import com.github.dockerjava.netty.exec.RemoveServiceCmdExec;
 import com.github.dockerjava.netty.exec.RemoveSwarmNodeCmdExec;
 import com.github.dockerjava.netty.exec.RemoveVolumeCmdExec;
 import com.github.dockerjava.netty.exec.RenameContainerCmdExec;
@@ -120,6 +129,7 @@
 import com.github.dockerjava.netty.exec.TopContainerCmdExec;
 import com.github.dockerjava.netty.exec.UnpauseContainerCmdExec;
 import com.github.dockerjava.netty.exec.UpdateContainerCmdExec;
+import com.github.dockerjava.netty.exec.UpdateServiceCmdExec;
 import com.github.dockerjava.netty.exec.UpdateSwarmCmdExec;
 import com.github.dockerjava.netty.exec.UpdateSwarmNodeCmdExec;
 import com.github.dockerjava.netty.exec.VersionCmdExec;
@@ -636,6 +646,32 @@ public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() {
         return new UpdateSwarmCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    // services
+    @Override
+    public ListServicesCmd.Exec createListServicesCmdExec() {
+        return new ListServicesCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CreateServiceCmd.Exec createCreateServiceCmdExec() {
+        return new CreateServiceCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectServiceCmd.Exec createInspectServiceCmdExec() {
+        return new InspectServiceCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public UpdateServiceCmd.Exec createUpdateServiceCmdExec() {
+        return new UpdateServiceCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveServiceCmd.Exec createRemoveServiceCmdExec() {
+        return new RemoveServiceCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     // nodes
     @Override
     public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CreateServiceCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/CreateServiceCmdExec.java
new file mode 100644
index 000000000..26352e1aa
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/CreateServiceCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.netty.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.CreateServiceCmd;
+import com.github.dockerjava.api.command.CreateServiceResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CreateServiceCmdExec extends AbstrSyncDockerCmdExec<CreateServiceCmd, CreateServiceResponse>
+        implements CreateServiceCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateServiceCmdExec.class);
+
+    public CreateServiceCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected CreateServiceResponse execute(CreateServiceCmd command) {
+        WebTarget webResource = getBaseResource().path("/services/create");
+
+        LOGGER.trace("POST: {} ", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(command.getServiceSpec(), new TypeReference<CreateServiceResponse>() {
+                });
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectServiceCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/InspectServiceCmdExec.java
new file mode 100644
index 000000000..cabdaa11d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/InspectServiceCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.netty.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.InspectServiceCmd;
+import com.github.dockerjava.api.model.Service;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class InspectServiceCmdExec extends AbstrSyncDockerCmdExec<InspectServiceCmd, Service>
+        implements InspectServiceCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InspectServiceCmdExec.class);
+
+    public InspectServiceCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Service execute(InspectServiceCmd command) {
+        WebTarget webResource = getBaseResource().path("/services/{id}")
+                                                 .resolveTemplate("id", command.getServiceId());
+
+        LOGGER.debug("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<Service>() { });
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListServicesCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListServicesCmdExec.java
new file mode 100644
index 000000000..de9b0e5e0
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListServicesCmdExec.java
@@ -0,0 +1,46 @@
+package com.github.dockerjava.netty.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.ListServicesCmd;
+import com.github.dockerjava.api.model.Service;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.util.FiltersEncoder;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
+public class ListServicesCmdExec extends AbstrSyncDockerCmdExec<ListServicesCmd, List<Service>> implements
+        ListServicesCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ListServicesCmdExec.class);
+
+    public ListServicesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected List<Service> execute(ListServicesCmd command) {
+        WebTarget webTarget = getBaseResource().path("/services");
+
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
+            webTarget = webTarget
+                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+        }
+
+        LOGGER.trace("GET: {}", webTarget);
+
+        List<Service> services = webTarget.request().accept(MediaType.APPLICATION_JSON)
+                .get(new TypeReference<List<Service>>() {
+                });
+
+        LOGGER.trace("Response: {}", services);
+
+        return services;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/RemoveServiceCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/RemoveServiceCmdExec.java
new file mode 100644
index 000000000..1042997bf
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/RemoveServiceCmdExec.java
@@ -0,0 +1,29 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.RemoveServiceCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RemoveServiceCmdExec extends AbstrSyncDockerCmdExec<RemoveServiceCmd, Void> implements
+        RemoveServiceCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveServiceCmdExec.class);
+
+    public RemoveServiceCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(RemoveServiceCmd command) {
+        WebTarget webTarget = getBaseResource().path("/services/" + command.getServiceId());
+
+        LOGGER.trace("DELETE: {}", webTarget);
+        webTarget.request().accept(MediaType.APPLICATION_JSON).delete();
+
+        return null;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/UpdateServiceCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/UpdateServiceCmdExec.java
new file mode 100644
index 000000000..aee2a787f
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/UpdateServiceCmdExec.java
@@ -0,0 +1,32 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.command.UpdateServiceCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Update service settings.
+ */
+public class UpdateServiceCmdExec extends AbstrSyncDockerCmdExec<UpdateServiceCmd, Void>
+        implements UpdateServiceCmd.Exec {
+    private static final Logger LOGGER = LoggerFactory.getLogger(UpdateServiceCmdExec.class);
+
+    public UpdateServiceCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(UpdateServiceCmd command) {
+        WebTarget webResource = getBaseResource().path("/services/{id}/update")
+                .resolveTemplate("id", command.getServiceId())
+                .queryParam("version", command.getVersion());
+
+        LOGGER.trace("POST: {}", webResource);
+        webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(command.getServiceSpec());
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java b/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
index cb6f60678..f1e0ed042 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.netty.handler;
 
+import com.fasterxml.jackson.databind.SerializationFeature;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
@@ -15,6 +16,10 @@ public class JsonRequestHandler extends MessageToByteEncoder<Object> {
 
     private ObjectMapper mapper = new ObjectMapper();
 
+    public JsonRequestHandler() {
+        mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+    }
+
     @Override
     protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception {
         byte[] serialized = mapper.writeValueAsBytes(msg);
diff --git a/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java b/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
index db20d6216..2b188e378 100644
--- a/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
+++ b/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.netty.handler;
 
+import com.fasterxml.jackson.databind.SerializationFeature;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
@@ -24,6 +25,7 @@ public class JsonResponseCallbackHandler<T> extends SimpleChannelInboundHandler<
     public JsonResponseCallbackHandler(TypeReference<T> typeReference, ResultCallback<T> callback) {
         this.typeReference = typeReference;
         this.callback = callback;
+        objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
     }
 
     @Override
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index 3a7540bd3..77fd775f9 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -16,6 +16,7 @@
 import com.github.dockerjava.api.command.CreateImageResponse;
 import com.github.dockerjava.api.command.CreateNetworkCmd;
 import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.api.command.CreateServiceCmd;
 import com.github.dockerjava.api.command.CreateVolumeCmd;
 import com.github.dockerjava.api.command.CreateVolumeResponse;
 import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
@@ -29,6 +30,7 @@
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectNetworkCmd;
+import com.github.dockerjava.api.command.InspectServiceCmd;
 import com.github.dockerjava.api.command.InspectSwarmCmd;
 import com.github.dockerjava.api.command.InspectSwarmNodeCmd;
 import com.github.dockerjava.api.command.InspectVolumeCmd;
@@ -38,6 +40,7 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.command.ListServicesCmd;
 import com.github.dockerjava.api.command.ListSwarmNodesCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
@@ -49,6 +52,7 @@
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.RemoveServiceCmd;
 import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RenameContainerCmd;
@@ -62,6 +66,7 @@
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 import com.github.dockerjava.api.command.UpdateContainerCmd;
+import com.github.dockerjava.api.command.UpdateServiceCmd;
 import com.github.dockerjava.api.command.UpdateSwarmCmd;
 import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
 import com.github.dockerjava.api.command.VersionCmd;
@@ -313,7 +318,7 @@ public UpdateContainerCmd.Exec createUpdateContainerCmdExec() {
     }
 
     @Override
-    public RenameContainerCmd.Exec createRenameContainerCmdExec(){
+    public RenameContainerCmd.Exec createRenameContainerCmdExec() {
         return delegate.createRenameContainerCmdExec();
     }
 
@@ -462,6 +467,32 @@ public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() {
         return delegate.createUpdateSwarmCmdExec();
     }
 
+    // services
+    @Override
+    public ListServicesCmd.Exec createListServicesCmdExec() {
+        return delegate.createListServicesCmdExec();
+    }
+
+    @Override
+    public CreateServiceCmd.Exec createCreateServiceCmdExec() {
+        return delegate.createCreateServiceCmdExec();
+    }
+
+    @Override
+    public InspectServiceCmd.Exec createInspectServiceCmdExec() {
+        return delegate.createInspectServiceCmdExec();
+    }
+
+    @Override
+    public UpdateServiceCmd.Exec createUpdateServiceCmdExec() {
+        return delegate.createUpdateServiceCmdExec();
+    }
+
+    @Override
+    public RemoveServiceCmd.Exec createRemoveServiceCmdExec() {
+        return delegate.createRemoveServiceCmdExec();
+    }
+
     // nodes
     @Override
     public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() {
@@ -483,7 +514,6 @@ public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() {
         return delegate.updateSwarmNodeCmdExec();
     }
 
-
     public List<String> getContainerNames() {
         return new ArrayList<String>(containerNames);
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateServiceCmdExecTest.java b/src/test/java/com/github/dockerjava/core/command/CreateServiceCmdExecTest.java
new file mode 100644
index 000000000..90a871e68
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/CreateServiceCmdExecTest.java
@@ -0,0 +1,121 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.ContainerSpec;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.api.model.NetworkAttachmentConfig;
+import com.github.dockerjava.api.model.Service;
+import com.github.dockerjava.api.model.ServiceModeConfig;
+import com.github.dockerjava.api.model.ServiceReplicatedModeOptions;
+import com.github.dockerjava.api.model.ServiceSpec;
+import com.github.dockerjava.api.model.SwarmSpec;
+import com.github.dockerjava.api.model.TaskSpec;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+import org.testng.collections.Lists;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+
+@Test(groups = "swarm-integration")
+public class CreateServiceCmdExecTest extends AbstractSwarmDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(CreateServiceCmdExecTest.class);
+    private static final String SERVICE_NAME = "theservice";
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void testCreateService() throws DockerException {
+        dockerClient.initializeSwarmCmd(new SwarmSpec())
+                .withListenAddr("127.0.0.1")
+                .withAdvertiseAddr("127.0.0.1")
+                .exec();
+
+        dockerClient.createServiceCmd(new ServiceSpec()
+                .withName(SERVICE_NAME)
+                .withTaskTemplate(new TaskSpec()
+                        .withContainerSpec(new ContainerSpec()
+                                .withImage("busybox"))))
+        .exec();
+
+        List<Service> services = dockerClient.listServicesCmd()
+                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
+                .exec();
+
+        assertThat(services, hasSize(1));
+
+        dockerClient.removeServiceCmd(SERVICE_NAME).exec();
+    }
+
+    @Test
+    public void testCreateServiceWithNetworks() {
+        dockerClient.initializeSwarmCmd(new SwarmSpec())
+                .withListenAddr("127.0.0.1")
+                .withAdvertiseAddr("127.0.0.1")
+                .exec();
+
+        String networkId = dockerClient.createNetworkCmd().withName("networkname")
+                .withDriver("overlay")
+                .withIpam(new Network.Ipam()
+                        .withDriver("default"))
+                .exec().getId();
+
+        ServiceSpec spec = new ServiceSpec()
+                .withName(SERVICE_NAME)
+                .withTaskTemplate(new TaskSpec()
+                        .withContainerSpec(new ContainerSpec()
+                                .withImage("busybox"))
+                )
+                .withNetworks(Lists.newArrayList(
+                        new NetworkAttachmentConfig()
+                                .withTarget(networkId)
+                                .withAliases(Lists.<String>newArrayList("alias1", "alias2"))
+                ))
+                .withMode(new ServiceModeConfig().withReplicated(
+                        new ServiceReplicatedModeOptions()
+                                .withReplicas(1)
+                ));
+
+        dockerClient.createServiceCmd(spec).exec();
+
+        List<Service> services = dockerClient.listServicesCmd()
+                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
+                .exec();
+
+        assertThat(services, hasSize(1));
+
+        assertThat(services.get(0).getSpec(), is(spec));
+
+        dockerClient.removeServiceCmd(SERVICE_NAME).exec();
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveServiceCmdExecTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveServiceCmdExecTest.java
new file mode 100644
index 000000000..870a506e4
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/RemoveServiceCmdExecTest.java
@@ -0,0 +1,83 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.ContainerSpec;
+import com.github.dockerjava.api.model.Service;
+import com.github.dockerjava.api.model.ServiceSpec;
+import com.github.dockerjava.api.model.SwarmSpec;
+import com.github.dockerjava.api.model.TaskSpec;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+import org.testng.collections.Lists;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+
+@Test(groups = "swarm-integration")
+public class RemoveServiceCmdExecTest extends AbstractSwarmDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(RemoveServiceCmdExecTest.class);
+    private static final String SERVICE_NAME = "theservice";
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void removeService() throws DockerException {
+        dockerClient.initializeSwarmCmd(new SwarmSpec()).withListenAddr("127.0.0.1").exec();
+
+        ServiceSpec spec = new ServiceSpec()
+                .withName(SERVICE_NAME)
+                .withTaskTemplate(new TaskSpec()
+                        .withContainerSpec(new ContainerSpec()
+                                .withImage("busybox")));
+
+        dockerClient.createServiceCmd(spec).exec();
+
+        spec.getTaskTemplate().getContainerSpec().withImage("ubuntu");
+
+        List<Service> services = dockerClient.listServicesCmd()
+                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
+                .exec();
+
+        assertThat(services, hasSize(1));
+
+        dockerClient.removeServiceCmd(services.get(0).getId())
+                .exec();
+
+        services = dockerClient.listServicesCmd()
+                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
+                .exec();
+
+        assertThat(services, hasSize(0));
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/UpdateServiceCmdExecTest.java b/src/test/java/com/github/dockerjava/core/command/UpdateServiceCmdExecTest.java
new file mode 100644
index 000000000..cc8f875d9
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/core/command/UpdateServiceCmdExecTest.java
@@ -0,0 +1,88 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.ContainerSpec;
+import com.github.dockerjava.api.model.Service;
+import com.github.dockerjava.api.model.ServiceSpec;
+import com.github.dockerjava.api.model.SwarmSpec;
+import com.github.dockerjava.api.model.TaskSpec;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+import org.testng.collections.Lists;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+
+@Test(groups = "swarm-integration")
+public class UpdateServiceCmdExecTest extends AbstractSwarmDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(UpdateServiceCmdExecTest.class);
+    private static final String SERVICE_NAME = "theservice";
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void updateService() throws DockerException {
+        dockerClient.initializeSwarmCmd(new SwarmSpec()).withListenAddr("127.0.0.1").exec();
+
+        ServiceSpec spec = new ServiceSpec()
+                .withName(SERVICE_NAME)
+                .withTaskTemplate(new TaskSpec()
+                        .withContainerSpec(new ContainerSpec()
+                                .withImage("busybox")));
+
+        dockerClient.createServiceCmd(spec).exec();
+
+        spec.getTaskTemplate().getContainerSpec().withImage("ubuntu");
+
+        List<Service> services = dockerClient.listServicesCmd()
+                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
+                .exec();
+
+        assertThat(services, hasSize(1));
+
+        dockerClient.updateServiceCmd(services.get(0).getId(), spec)
+                .withVersion(services.get(0).getVersion().getIndex())
+                .exec();
+
+        services = dockerClient.listServicesCmd()
+                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
+                .exec();
+
+        assertThat(services, hasSize(1));
+
+        assertThat(services.get(0).getSpec().getTaskTemplate().getContainerSpec().getImage(), is(equalTo("ubuntu")));
+
+        dockerClient.removeServiceCmd(SERVICE_NAME);
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateServiceCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateServiceCmdExecTest.java
new file mode 100644
index 000000000..17ff62951
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/CreateServiceCmdExecTest.java
@@ -0,0 +1,123 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.ContainerSpec;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.api.model.NetworkAttachmentConfig;
+import com.github.dockerjava.api.model.Service;
+import com.github.dockerjava.api.model.ServiceModeConfig;
+import com.github.dockerjava.api.model.ServiceReplicatedModeOptions;
+import com.github.dockerjava.api.model.ServiceSpec;
+import com.github.dockerjava.api.model.SwarmSpec;
+import com.github.dockerjava.api.model.TaskSpec;
+import com.github.dockerjava.netty.AbstractNettySwarmDockerClientTest;
+import com.google.common.collect.Lists;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+
+@Test(groups = "swarm-integration")
+public class CreateServiceCmdExecTest extends AbstractNettySwarmDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(CreateServiceCmdExecTest.class);
+    private static final String SERVICE_NAME = "theservice";
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void testCreateService() throws DockerException {
+        dockerClient.initializeSwarmCmd(new SwarmSpec())
+                .withListenAddr("127.0.0.1")
+                .withAdvertiseAddr("127.0.0.1")
+                .exec();
+
+        dockerClient.createServiceCmd(new ServiceSpec()
+                .withName(SERVICE_NAME)
+                .withTaskTemplate(new TaskSpec()
+                        .withContainerSpec(new ContainerSpec()
+                                .withImage("busybox"))))
+        .exec();
+
+        List<Service> services = dockerClient.listServicesCmd()
+                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
+                .exec();
+
+        assertThat(services, hasSize(1));
+
+        dockerClient.removeServiceCmd(SERVICE_NAME).exec();
+    }
+
+    @Test
+    public void testCreateServiceWithNetworks() {
+        dockerClient.initializeSwarmCmd(new SwarmSpec())
+                .withListenAddr("127.0.0.1")
+                .withAdvertiseAddr("127.0.0.1")
+                .exec();
+
+        String networkId = dockerClient.createNetworkCmd().withName("networkname")
+                .withDriver("overlay")
+                .withIpam(new Network.Ipam()
+                        .withDriver("default"))
+                .exec().getId();
+
+        ServiceSpec spec = new ServiceSpec()
+                .withName(SERVICE_NAME)
+                .withTaskTemplate(new TaskSpec()
+                        .withContainerSpec(new ContainerSpec()
+                                .withImage("busybox"))
+                        )
+                .withNetworks(Lists.newArrayList(
+                        new NetworkAttachmentConfig()
+                                .withTarget(networkId)
+                                .withAliases(Lists.<String>newArrayList("alias1", "alias2"))
+                ))
+                .withMode(new ServiceModeConfig().withReplicated(
+                        new ServiceReplicatedModeOptions()
+                                .withReplicas(1)
+                ));
+
+        dockerClient.createServiceCmd(spec).exec();
+
+        List<Service> services = dockerClient.listServicesCmd()
+                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
+                .exec();
+
+        assertThat(services, hasSize(1));
+
+        assertThat(services.get(0).getSpec(), is(spec));
+
+        dockerClient.removeServiceCmd(SERVICE_NAME).exec();
+
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RemoveServiceCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RemoveServiceCmdExecTest.java
new file mode 100644
index 000000000..29aa01240
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/RemoveServiceCmdExecTest.java
@@ -0,0 +1,83 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.ContainerSpec;
+import com.github.dockerjava.api.model.Service;
+import com.github.dockerjava.api.model.ServiceSpec;
+import com.github.dockerjava.api.model.SwarmSpec;
+import com.github.dockerjava.api.model.TaskSpec;
+import com.github.dockerjava.core.command.AbstractSwarmDockerClientTest;
+import com.github.dockerjava.netty.AbstractNettySwarmDockerClientTest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+import org.testng.collections.Lists;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
+
+@Test(groups = "swarm-integration")
+public class RemoveServiceCmdExecTest extends AbstractNettySwarmDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(RemoveServiceCmdExecTest.class);
+    private static final String SERVICE_NAME = "theservice";
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void removeService() throws DockerException {
+        dockerClient.initializeSwarmCmd(new SwarmSpec()).withListenAddr("127.0.0.1").exec();
+
+        ServiceSpec spec = new ServiceSpec()
+                .withName(SERVICE_NAME)
+                .withTaskTemplate(new TaskSpec()
+                        .withContainerSpec(new ContainerSpec()
+                                .withImage("busybox")));
+
+        dockerClient.createServiceCmd(spec).exec();
+
+        spec.getTaskTemplate().getContainerSpec().withImage("ubuntu");
+
+        List<Service> services = dockerClient.listServicesCmd()
+                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
+                .exec();
+
+        assertThat(services, hasSize(1));
+
+        dockerClient.removeServiceCmd(services.get(0).getId())
+                .exec();
+
+        services = dockerClient.listServicesCmd()
+                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
+                .exec();
+
+        assertThat(services, hasSize(0));
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/UpdateServiceCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/UpdateServiceCmdExecTest.java
new file mode 100644
index 000000000..5e2d60c96
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/exec/UpdateServiceCmdExecTest.java
@@ -0,0 +1,90 @@
+package com.github.dockerjava.netty.exec;
+
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.ContainerSpec;
+import com.github.dockerjava.api.model.Service;
+import com.github.dockerjava.api.model.ServiceSpec;
+import com.github.dockerjava.api.model.SwarmSpec;
+import com.github.dockerjava.api.model.TaskSpec;
+import com.github.dockerjava.core.command.AbstractSwarmDockerClientTest;
+import com.github.dockerjava.netty.AbstractNettySwarmDockerClientTest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.ITestResult;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+import org.testng.collections.Lists;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+
+@Test(groups = "swarm-integration")
+public class UpdateServiceCmdExecTest extends AbstractNettySwarmDockerClientTest {
+
+    public static final Logger LOG = LoggerFactory.getLogger(UpdateServiceCmdExecTest.class);
+    private static final String SERVICE_NAME = "theservice";
+
+    @BeforeTest
+    public void beforeTest() throws Exception {
+        super.beforeTest();
+    }
+
+    @AfterTest
+    public void afterTest() {
+        super.afterTest();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        super.beforeMethod(method);
+    }
+
+    @AfterMethod
+    public void afterMethod(ITestResult result) {
+        super.afterMethod(result);
+    }
+
+    @Test
+    public void updateService() throws DockerException {
+        dockerClient.initializeSwarmCmd(new SwarmSpec()).withListenAddr("127.0.0.1").exec();
+
+        ServiceSpec spec = new ServiceSpec()
+                .withName(SERVICE_NAME)
+                .withTaskTemplate(new TaskSpec()
+                        .withContainerSpec(new ContainerSpec()
+                                .withImage("busybox")));
+
+        dockerClient.createServiceCmd(spec).exec();
+
+        spec.getTaskTemplate().getContainerSpec().withImage("ubuntu");
+
+        List<Service> services = dockerClient.listServicesCmd()
+                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
+                .exec();
+
+        assertThat(services, hasSize(1));
+
+        dockerClient.updateServiceCmd(services.get(0).getId(), spec)
+                .withVersion(services.get(0).getVersion().getIndex())
+                .exec();
+
+        services = dockerClient.listServicesCmd()
+                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
+                .exec();
+
+        assertThat(services, hasSize(1));
+
+        assertThat(services.get(0).getSpec().getTaskTemplate().getContainerSpec().getImage(), is(equalTo("ubuntu")));
+
+        dockerClient.removeServiceCmd(SERVICE_NAME);
+    }
+
+}

From 349ebe86b196dbefd0aad148b5492be48c94f6c8 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 5 May 2017 17:59:05 +0300
Subject: [PATCH 0739/1272] Disable conflicting tests

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d81bbef9f..b683f2741 100644
--- a/pom.xml
+++ b/pom.xml
@@ -424,7 +424,7 @@
 				<version>${maven-surefire-plugin.version}</version>
 				<configuration>
 					<rerunFailingTestsCount>3</rerunFailingTestsCount>
-					<excludedGroups>integration,integration-auth</excludedGroups>
+					<excludedGroups>integration,integration-auth,swarm-integration</excludedGroups>
 				</configuration>
 			</plugin>
 
@@ -444,7 +444,7 @@
 							<perCoreThreadCount>true</perCoreThreadCount>
 							<threadCount>1</threadCount>
 							<groups>integration</groups>
-							<excludedGroups>integration-auth</excludedGroups>
+							<excludedGroups>integration-auth,swarm-integration</excludedGroups>
 							<includes>
 								<include>**/*Test.java</include>
 							</includes>

From 5b213be4b52a1a5825c604d7e50416c81d981f86 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 28 Jun 2017 02:46:52 +0300
Subject: [PATCH 0740/1272] 1.12 adoption

Fix swarm LocalNodeState

Change deserialiser
---
 .../dockerjava/api/model/LocalNodeState.java  | 49 +++++++++++++++----
 .../dockerjava/api/model/SwarmInfo.java       |  3 +-
 .../command/CreateNetworkCmdImplTest.java     |  3 +-
 .../core/command/LeaveSwarmCmdExecTest.java   |  1 +
 .../netty/exec/CommitCmdExecTest.java         |  1 +
 .../netty/exec/InfoCmdExecTest.java           |  3 +-
 6 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/LocalNodeState.java b/src/main/java/com/github/dockerjava/api/model/LocalNodeState.java
index 7b988fa5d..07e2e4158 100644
--- a/src/main/java/com/github/dockerjava/api/model/LocalNodeState.java
+++ b/src/main/java/com/github/dockerjava/api/model/LocalNodeState.java
@@ -1,22 +1,53 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import javax.annotation.Nonnull;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
+ * https://github.com/moby/moby/blob/master/api/types/swarm/swarm.go#L174-L188
+ *
  * @since 1.24
  */
 public enum LocalNodeState {
 
-    @JsonProperty("inactive")
-    INACTIVE,
+    INACTIVE("inactive"),
+    PENDING("pending"),
+    ACTIVE("active"),
+    ERROR("error"),
+    LOCKED("locked"),
+
+    /**
+     * Can not construct instance of com.github.dockerjava.api.model.LocalNodeState
+     * from String value '': value not one of declared Enum instance names: [error, locked, inactive, active, pending]
+     */
+    EMPTY("");
+
+    private static final Map<String, LocalNodeState> TYPES = new HashMap<>();
+
+    static {
+        for (LocalNodeState t : values()) {
+            TYPES.put(t.name().toLowerCase(), t);
+        }
+    }
+
+    private String value;
 
-    @JsonProperty("pending")
-    PENDING,
+    LocalNodeState(@Nonnull String value) {
+        this.value = value;
+    }
 
-    @JsonProperty("active")
-    ACTIVE,
+    @JsonValue
+    public String getValue() {
+        return value;
+    }
 
-    @JsonProperty("error")
-    ERROR
+    @JsonCreator
+    public static LocalNodeState forValue(String s) {
+        return TYPES.get(s);
+    }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java b/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
index 98705ea30..3accd31d8 100644
--- a/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
@@ -18,8 +18,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SwarmInfo implements Serializable {
-
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
index 7a8e3eb3d..29c10415e 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
@@ -91,9 +91,10 @@ public void createAttachableNetwork() throws DockerException {
     @Test
     public void createNetworkWithLabel() throws DockerException {
         final RemoteApiVersion apiVersion = getVersion(dockerClient);
-        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_21)) {
+        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_21) || isSwarm(dockerClient)) {
             throw new SkipException("API version should be >= 1.21");
         }
+
         String networkName = "createNetworkWithLabel";
         Map<String,String> labels=new HashMap<>();
         labels.put("com.example.usage","test");
diff --git a/src/test/java/com/github/dockerjava/core/command/LeaveSwarmCmdExecTest.java b/src/test/java/com/github/dockerjava/core/command/LeaveSwarmCmdExecTest.java
index 47e576452..4dc41716f 100644
--- a/src/test/java/com/github/dockerjava/core/command/LeaveSwarmCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/LeaveSwarmCmdExecTest.java
@@ -17,6 +17,7 @@
 import java.lang.reflect.Method;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 
 @Test(groups = "swarm-integration")
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
index b1392e696..dda610d62 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
@@ -75,6 +75,7 @@ public void commit() throws DockerException {
 
     @Test
     public void commitWithLabels() throws DockerException {
+        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
                 .withCmd("touch", "/test")
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InfoCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InfoCmdExecTest.java
index 9c0901152..b1b7b760e 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InfoCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/InfoCmdExecTest.java
@@ -47,7 +47,8 @@ public void info() throws DockerException {
         // TODO extract this into a shared method
         if (dockerClient.listContainersCmd().withShowAll(true).exec().size() == 0) {
             CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                    .withName("docker-java-itest-info").withCmd("touch", "/test").exec();
+                    .withName("docker-java-itest-info")
+                    .withCmd("touch", "/test").exec();
 
             LOG.info("Created container: {}", container);
             assertThat(container.getId(), not(isEmptyOrNullString()));

From aba519c3290e092f936cf117aaf00ede87194c13 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 30 Jun 2017 00:16:51 +0300
Subject: [PATCH 0741/1272] Skip test for swarm

---
 .../com/github/dockerjava/core/command/EventsCmdImplTest.java   | 2 ++
 .../com/github/dockerjava/netty/exec/EventsCmdExecTest.java     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
index 161c671f9..83ba214ba 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -78,6 +78,8 @@ public void testEventStreamTimeBound() throws Exception {
 
     @Test
     public void testEventStreaming() throws Exception {
+        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
+
         // Don't include other tests events
         TimeUnit.SECONDS.sleep(1);
         
diff --git a/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java
index 93bb6873d..a6528fd33 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java
@@ -75,6 +75,8 @@ public void testEventStreamTimeBound() throws Exception {
 
     @Test
     public void testEventStreaming() throws Exception {
+        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
+
         // Don't include other tests events
         TimeUnit.SECONDS.sleep(1);
         

From 7e1532ff8366ac9b7ac281d9fce71163f16d6dd5 Mon Sep 17 00:00:00 2001
From: xuchenCN <chenxu198511@gmail.com>
Date: Wed, 14 Jun 2017 09:54:41 +0800
Subject: [PATCH 0742/1272] Add OS Compatibility

---
 pom.xml                                       |  8 ++-
 .../netty/NettyDockerCmdExecFactory.java      | 64 +++++++++++++------
 2 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index 10fad3860..a3cd8e6aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
 		<!-- test dependencies -->
 		<logback.version>1.1.7</logback.version>
 		<testng.version>6.9.10</testng.version>
-		<netty.version>4.1.3.Final</netty.version>
+		<netty.version>4.1.11.Final</netty.version>
 		<hamcrest.library.version>1.3</hamcrest.library.version>
 		<hamcrest.jpa-matchers>1.8</hamcrest.jpa-matchers>
 		<lambdaj.version>2.3.3</lambdaj.version>
@@ -258,6 +258,12 @@
 			<version>${netty.version}</version>
 			<classifier>linux-x86_64</classifier>
 		</dependency>
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-transport-native-kqueue</artifactId>
+			<version>${netty.version}</version>
+			<classifier>osx-x86_64</classifier>
+		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index 2c8a83b0e..ff9f5beaa 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -1,5 +1,19 @@
 package com.github.dockerjava.netty;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.security.Security;
+
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLParameters;
+
+import org.apache.commons.lang.SystemUtils;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd;
 import com.github.dockerjava.api.command.BuildImageCmd;
@@ -39,6 +53,7 @@
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
+import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.api.command.SearchImagesCmd;
@@ -51,7 +66,6 @@
 import com.github.dockerjava.api.command.UpdateContainerCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
-import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.DockerClientImpl;
 import com.github.dockerjava.core.SSLConfig;
@@ -93,6 +107,7 @@
 import com.github.dockerjava.netty.exec.RemoveImageCmdExec;
 import com.github.dockerjava.netty.exec.RemoveNetworkCmdExec;
 import com.github.dockerjava.netty.exec.RemoveVolumeCmdExec;
+import com.github.dockerjava.netty.exec.RenameContainerCmdExec;
 import com.github.dockerjava.netty.exec.RestartContainerCmdExec;
 import com.github.dockerjava.netty.exec.SaveImageCmdExec;
 import com.github.dockerjava.netty.exec.SearchImagesCmdExec;
@@ -105,7 +120,6 @@
 import com.github.dockerjava.netty.exec.UpdateContainerCmdExec;
 import com.github.dockerjava.netty.exec.VersionCmdExec;
 import com.github.dockerjava.netty.exec.WaitContainerCmdExec;
-import com.github.dockerjava.netty.exec.RenameContainerCmdExec;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
@@ -115,6 +129,8 @@
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.epoll.EpollDomainSocketChannel;
 import io.netty.channel.epoll.EpollEventLoopGroup;
+import io.netty.channel.kqueue.KQueueDomainSocketChannel;
+import io.netty.channel.kqueue.KQueueEventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.DuplexChannel;
 import io.netty.channel.socket.SocketChannel;
@@ -126,19 +142,6 @@
 import io.netty.handler.ssl.SslHandler;
 import io.netty.util.concurrent.DefaultThreadFactory;
 
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLParameters;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.security.Security;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Experimental implementation of {@link DockerCmdExecFactory} that supports http connection hijacking that is needed to pass STDIN to the
  * container.
@@ -226,6 +229,15 @@ private interface NettyInitializer {
     private class UnixDomainSocketInitializer implements NettyInitializer {
         @Override
         public EventLoopGroup init(Bootstrap bootstrap, DockerClientConfig dockerClientConfig) {
+            if (SystemUtils.IS_OS_LINUX) {
+                return epollGroup();
+            } else if (SystemUtils.IS_OS_MAC_OSX) {
+                return kqueueGroup();
+            }
+            throw new RuntimeException("Unspported OS");
+        }
+
+        public EventLoopGroup epollGroup() {
             EventLoopGroup epollEventLoopGroup = new EpollEventLoopGroup(0, new DefaultThreadFactory(threadPrefix));
 
             ChannelFactory<EpollDomainSocketChannel> factory = new ChannelFactory<EpollDomainSocketChannel>() {
@@ -235,14 +247,28 @@ public EpollDomainSocketChannel newChannel() {
                 }
             };
 
-            bootstrap.group(epollEventLoopGroup).channelFactory(factory)
-                    .handler(new ChannelInitializer<UnixChannel>() {
+            bootstrap.group(epollEventLoopGroup).channelFactory(factory).handler(new ChannelInitializer<UnixChannel>() {
+                @Override
+                protected void initChannel(final UnixChannel channel) throws Exception {
+                    channel.pipeline().addLast(new HttpClientCodec());
+                }
+            });
+            return epollEventLoopGroup;
+        }
+
+        public EventLoopGroup kqueueGroup() {
+            EventLoopGroup nioEventLoopGroup = new KQueueEventLoopGroup(0, new DefaultThreadFactory(threadPrefix));
+
+            bootstrap.group(nioEventLoopGroup).channel(KQueueDomainSocketChannel.class)
+                    .handler(new ChannelInitializer<KQueueDomainSocketChannel>() {
                         @Override
-                        protected void initChannel(final UnixChannel channel) throws Exception {
+                        protected void initChannel(final KQueueDomainSocketChannel channel) throws Exception {
+                            channel.pipeline().addLast(new LoggingHandler(getClass()));
                             channel.pipeline().addLast(new HttpClientCodec());
                         }
                     });
-            return epollEventLoopGroup;
+
+            return nioEventLoopGroup;
         }
 
         @Override

From a56259085a606744c40ee427192e2fbcddd605ed Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 5 Jul 2017 20:33:18 +0300
Subject: [PATCH 0743/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbb3b155f..c92d788a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@ Change Log
 ===
 ## (dev) 3.1.0 (reserverd for swarm features)
  
+ 
+## 3.0.12
+- Make NettyDockerCmdExecFactory has compatibility both Linux and OSX automatically
+- Fix double encoding for netty.
+- filter config.json before unmarshalling (creds/auth)
+
 ## 3.0.11
 - Add labels and attachable properties to network.
 - Set default socket timeout for RequestConfig.

From 432eabd1e6fb9e49617f066fd3194ccc57ff447f Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 5 Jul 2017 20:38:33 +0300
Subject: [PATCH 0744/1272] [maven-release-plugin] prepare release 3.0.12

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4b39141a8..f7cdb413e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.12-SNAPSHOT</version>
+	<version>3.0.12</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.0.12</tag>
 	</scm>
 
 	<developers>

From 84639948d91e4e02604e18da5484f51968bdc33f Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 5 Jul 2017 20:38:42 +0300
Subject: [PATCH 0745/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f7cdb413e..c48de4c28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.12</version>
+	<version>3.1.0-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.0.12</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 8ac5cf9f7f6daa21cd647cab5644b881ce75326f Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 5 Jul 2017 21:32:51 +0300
Subject: [PATCH 0746/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c92d788a5..d0a41f392 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
 Change Log
 ===
-## (dev) 3.1.0 (reserverd for swarm features)
- 
+## 3.1.0 WIP
+- Swarm Mode support.
+- Classic swarm support.
  
 ## 3.0.12
 - Make NettyDockerCmdExecFactory has compatibility both Linux and OSX automatically

From cb2a467b6e00df3f84e21c2af281fb651b979ecf Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 21 Jul 2017 16:27:28 +0300
Subject: [PATCH 0747/1272] Update NettyDockerCmdExecFactory.java

---
 .../dockerjava/netty/NettyDockerCmdExecFactory.java    | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index 6cce8ec80..b843145cb 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -12,7 +12,6 @@
 import javax.net.ssl.SSLParameters;
 
 import org.apache.commons.lang.SystemUtils;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd;
@@ -170,15 +169,6 @@
 import io.netty.util.concurrent.DefaultThreadFactory;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLParameters;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.security.Security;
-
-import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * Experimental implementation of {@link DockerCmdExecFactory} that supports http connection hijacking that is needed to pass STDIN to the

From db00c49d87d0768f9cc5d077781bd87e3e436837 Mon Sep 17 00:00:00 2001
From: borlander <borlander@gmail.com>
Date: Wed, 12 Jul 2017 00:15:09 +0200
Subject: [PATCH 0748/1272] #806 - config.json now may have unstructured
 content without `auths`

- the actually observed sample added as new test
- related to https://youtrack.jetbrains.com/issue/IDEA-175307

(cherry picked from commit d171baf)
Signed-off-by: borlander <borlander@gmail.com>
---
 .../dockerjava/core/AuthConfigFile.java       | 47 ++++++++++++-------
 .../dockerjava/core/AuthConfigFileTest.java   |  7 +++
 .../validJsonWithOnlyUnknown.json             |  3 ++
 3 files changed, 40 insertions(+), 17 deletions(-)
 create mode 100644 src/test/resources/testAuthConfigFile/validJsonWithOnlyUnknown.json

diff --git a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
index 1b61ff6e0..2ecb34c2e 100644
--- a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
+++ b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
@@ -110,24 +110,29 @@ public static AuthConfigFile loadConfig(File confFile) throws IOException {
         }
 
         Map<String, AuthConfig> configMap = null;
-        /*
-        Registry v2 expects config expects config.json while v2 expects .dockercfg
-        The only difference between them is that config.json wraps "auths" around the AuthConfig
-         */
-        try {
-            // try registry version 2
-            final ObjectNode node = filterNonAuthsFromJSON(confFile);
-            Map<String, Map<String, AuthConfig>>  configJson = MAPPER.convertValue(node, CONFIG_JSON_MAP_TYPE);
-            if (configJson != null && !configJson.isEmpty()) {
-                configMap = configJson.get(AUTHS_PROPERTY);
-            }
-
-        } catch (IOException e1) {
+        if (isJSONFile(confFile)) {
+            /*
+            Registry v2 expects config expects config.json while v2 expects .dockercfg
+            The only difference between them is that config.json wraps "auths" around the AuthConfig
+             */
             try {
-                // try registry version 1
-                configMap = MAPPER.readValue(confFile, CONFIG_CFG_MAP_TYPE);
-            } catch (IOException e2) {
-                // pass
+                // try registry version 2
+                final ObjectNode node = filterNonAuthsFromJSON(confFile);
+                Map<String, Map<String, AuthConfig>> configJson = MAPPER.convertValue(node, CONFIG_JSON_MAP_TYPE);
+                if (configJson != null && !configJson.isEmpty()) {
+                    configMap = configJson.get(AUTHS_PROPERTY);
+                }
+
+            } catch (IOException e1) {
+                try {
+                    // try registry version 1
+                    configMap = MAPPER.readValue(confFile, CONFIG_CFG_MAP_TYPE);
+                } catch (IOException e2) {
+                    // we know it is JSON so it does not make sense to check for the old format
+                    // probably Docker writes some unstructured contents here, see #806
+                    // at least it is not worse than the totally absent file
+                    return new AuthConfigFile();
+                }
             }
         }
 
@@ -165,6 +170,14 @@ public static AuthConfigFile loadConfig(File confFile) throws IOException {
 
     }
 
+    private static boolean isJSONFile(final File confFile) {
+        try {
+            return MAPPER.readValue(confFile, ObjectNode.class) != null;
+        } catch (IOException e) {
+            return false;
+        }
+    }
+
     private static ObjectNode filterNonAuthsFromJSON(final File confFile) throws IOException {
         final ObjectNode node = MAPPER.readValue(confFile, ObjectNode.class);
         if (!node.has(AUTHS_PROPERTY)) {
diff --git a/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java b/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java
index cbb01de08..5f5805555 100644
--- a/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java
+++ b/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java
@@ -81,6 +81,13 @@ public void validJsonWithUnknown() throws IOException {
         runTest("validJsonWithUnknown.json");
     }
 
+    @Test
+    public void validJsonWithOnlyUnknown() throws IOException {
+        AuthConfigFile expected = new AuthConfigFile();
+        AuthConfigFile actual = runTest("validJsonWithOnlyUnknown.json");
+        Assert.assertEquals(actual, expected);
+    }
+
     @Test
     public void validLegacy() throws IOException {
         AuthConfig authConfig = new AuthConfig()
diff --git a/src/test/resources/testAuthConfigFile/validJsonWithOnlyUnknown.json b/src/test/resources/testAuthConfigFile/validJsonWithOnlyUnknown.json
new file mode 100644
index 000000000..cd5f7a124
--- /dev/null
+++ b/src/test/resources/testAuthConfigFile/validJsonWithOnlyUnknown.json
@@ -0,0 +1,3 @@
+{
+   "credsStore" : "osxkeychain"
+}

From fe3d2225d7b35be58b0d03d4165bed96d9bb69e7 Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Sat, 5 Aug 2017 23:31:44 +0800
Subject: [PATCH 0749/1272] allow user to add custom command

---
 .../com/github/dockerjava/netty/NettyDockerCmdExecFactory.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index b843145cb..525043f99 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -747,7 +747,7 @@ private <T extends Channel> T configure(T channel) {
         return channel;
     }
 
-    private WebTarget getBaseResource() {
+    protected WebTarget getBaseResource() {
         checkNotNull(baseResource, "Factory not initialized, baseResource not set. You probably forgot to call init()!");
         return baseResource;
     }

From e2bf974ef750823e58649cb95d12de1cbf3f96f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Warcha=C5=82?= <lukasz.warchal@asseco.pl>
Date: Mon, 7 Aug 2017 00:20:53 +0200
Subject: [PATCH 0750/1272] Include empty directories in build context

---
 .../core/dockerfile/Dockerfile.java           | 40 ++++++++++++++++---
 .../DockerfileAddMultipleFilesTest.java       |  3 +-
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 9dcd20199..848ae691e 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -12,7 +12,6 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.filefilter.TrueFileFilter;
 
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.core.GoLangFileMatch;
@@ -186,16 +185,45 @@ public ScannedResult() throws IOException {
                         "Dockerfile is excluded by pattern '%s' in .dockerignore file", matchingIgnorePattern));
             }
 
-            Collection<File> filesInBuildContext = FileUtils.listFiles(baseDirectory, TrueFileFilter.INSTANCE,
-                    TrueFileFilter.INSTANCE);
+            addFilesInDirectory(baseDirectory);
+        }
 
-            for (File f : filesInBuildContext) {
-                if (effectiveMatchingIgnorePattern(f) == null) {
-                    filesToAdd.add(f);
+        /**
+         * Adds all files found in <code>directory</code> and subdirectories to
+         * <code>filesToAdd</code> collection. It also adds any empty directories
+         * if found.
+         *
+         * @param directory directory
+         * @throws DockerClientException when IO error occurs
+         */
+        private void addFilesInDirectory(File directory) {
+            File[] files = directory.listFiles();
+
+            if (files == null) {
+                throw new DockerClientException("Failed to read build context directory: " + baseDirectory.getAbsolutePath());
+            }
+
+            if (files.length != 0) {
+                for (File f : files) {
+                    if (effectiveMatchingIgnorePattern(f) == null) {
+                        if (f.isDirectory()) {
+                            addFilesInDirectory(f);
+                        } else {
+                            filesToAdd.add(f);
+                        }
+                    }
                 }
+                // base directory should at least contains Dockerfile, but better check
+            } else if (!isBaseDirectory(directory)) {
+                // add empty directory
+                filesToAdd.add(directory);
             }
         }
 
+        private boolean isBaseDirectory(File directory) {
+            return directory.compareTo(baseDirectory) == 0;
+        }
+
         /**
          * Returns all matching ignore patterns for the given file name.
          */
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
index b37754a6a..b58a0fcb0 100644
--- a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
+++ b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
@@ -59,11 +59,12 @@ public void ineffectiveIgnorePattern() throws Exception {
     @Test
     public void addFiles() throws IOException {
         File baseDir = fileFromBuildTestResource("ADD/files");
+        new File(baseDir, "emptydir").mkdir();
         Dockerfile dockerfile = new Dockerfile(new File(baseDir, "Dockerfile"), baseDir);
         Dockerfile.ScannedResult result = dockerfile.parse();
         Collection<String> filesToAdd = transform(result.filesToAdd, TO_FILE_NAMES);
 
-        assertThat(filesToAdd, containsInAnyOrder("Dockerfile", "src1", "src2"));
+        assertThat(filesToAdd, containsInAnyOrder("emptydir", "Dockerfile", "src1", "src2"));
     }
 
     private File fileFromBuildTestResource(String resource) {

From 65821cf0d7f5664ee89d3abae23ca304d2550e50 Mon Sep 17 00:00:00 2001
From: root <root@stackupgrade.torolab.ibm.com>
Date: Wed, 9 Aug 2017 01:34:11 -0400
Subject: [PATCH 0751/1272] Fixed missing test resources for cacheFrom test

---
 .../dockerjava/core/command/BuildImageCmdImplTest.java   | 3 ++-
 .../dockerjava/netty/exec/BuildImageCmdExecTest.java     | 3 ++-
 src/test/resources/buildTests/CacheFrom/test1/Dockerfile | 7 +++++++
 src/test/resources/buildTests/CacheFrom/test2/Dockerfile | 9 +++++++++
 4 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 src/test/resources/buildTests/CacheFrom/test1/Dockerfile
 create mode 100644 src/test/resources/buildTests/CacheFrom/test2/Dockerfile

diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
index 20ac2b62d..db94563c4 100644
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -326,7 +326,8 @@ public void cacheFrom() throws Exception {
     	assertThat(inspectImageResponse1, not(nullValue()));
     	
     	File baseDir2 = fileFromBuildTestResource("CacheFrom/test2");
-    	String imageId2 = dockerClient.buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(imageId1)))
+    	String cacheImage = String.format("[\"%s\"]", imageId1);
+    	String imageId2 = dockerClient.buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(cacheImage)))
     			.exec(new BuildImageResultCallback())
     			.awaitImageId();
     	InspectImageResponse inspectImageResponse2 = dockerClient.inspectImageCmd(imageId2).exec();
diff --git a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
index 54ede31dd..b2c3b4b57 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
@@ -331,7 +331,8 @@ public void cacheFrom() throws Exception {
     	assertThat(inspectImageResponse1, not(nullValue()));
     	
     	File baseDir2 = fileFromBuildTestResource("CacheFrom/test2");
-    	String imageId2 = dockerClient.buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(imageId1)))
+    	String cacheImage = String.format("[\"%s\"]", imageId1);
+    	String imageId2 = dockerClient.buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(cacheImage)))
     			.exec(new BuildImageResultCallback())
     			.awaitImageId();
     	InspectImageResponse inspectImageResponse2 = dockerClient.inspectImageCmd(imageId2).exec();
diff --git a/src/test/resources/buildTests/CacheFrom/test1/Dockerfile b/src/test/resources/buildTests/CacheFrom/test1/Dockerfile
new file mode 100644
index 000000000..44cb26e00
--- /dev/null
+++ b/src/test/resources/buildTests/CacheFrom/test1/Dockerfile
@@ -0,0 +1,7 @@
+FROM ubuntu:latest
+
+RUN echo "Step 1"
+
+RUN echo "Step 2"
+
+RUN echo "Step 3"
\ No newline at end of file
diff --git a/src/test/resources/buildTests/CacheFrom/test2/Dockerfile b/src/test/resources/buildTests/CacheFrom/test2/Dockerfile
new file mode 100644
index 000000000..521ee8b78
--- /dev/null
+++ b/src/test/resources/buildTests/CacheFrom/test2/Dockerfile
@@ -0,0 +1,9 @@
+FROM ubuntu:latest
+
+RUN echo "Step 1"
+
+RUN echo "Step 2"
+
+RUN echo "Step 3"
+
+RUN echo "Step 4"
\ No newline at end of file

From 62c701a50390e5b57892544700baf9a980c2957a Mon Sep 17 00:00:00 2001
From: Tobias Gesellchen <tobias@gesellix.de>
Date: Fri, 21 Jul 2017 11:49:54 +0200
Subject: [PATCH 0752/1272] Replace the certificate algorithm guesswork with a
 delegation to the JcaPEMKeyConverter.

---
 .../core/util/CertificateUtils.java           | 54 ++++++++-----------
 1 file changed, 21 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java b/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
index 63e66952d..82563962a 100644
--- a/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
+++ b/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
@@ -5,7 +5,6 @@
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
-import java.security.KeyFactory;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
@@ -13,7 +12,6 @@
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 import java.security.spec.InvalidKeySpecException;
-import java.security.spec.PKCS8EncodedKeySpec;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,6 +23,7 @@
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.openssl.PEMKeyPair;
 import org.bouncycastle.openssl.PEMParser;
+import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -111,26 +110,10 @@ public static PrivateKey loadPrivateKey(final Reader reader) throws IOException,
         try (PEMParser pemParser = new PEMParser(reader)) {
             Object readObject = pemParser.readObject();
             while (readObject != null) {
-                if (readObject instanceof PEMKeyPair) {
-                    PEMKeyPair pemKeyPair = (PEMKeyPair) readObject;
-                    PrivateKey privateKey = guessKey(pemKeyPair.getPrivateKeyInfo().getEncoded());
-                    if (privateKey != null) {
-                        return privateKey;
-                    }
-                } else if (readObject instanceof PrivateKeyInfo) {
-                    PrivateKeyInfo privateKeyInfo = (PrivateKeyInfo) readObject;
-                    PrivateKey privateKey = guessKey(privateKeyInfo.getEncoded());
-                    if (privateKey != null) {
-                        return privateKey;
-                    }
-                } else if (readObject instanceof ASN1ObjectIdentifier) {
-                    // no idea how it can be used
-                    final ASN1ObjectIdentifier asn1ObjectIdentifier = (ASN1ObjectIdentifier) readObject;
-                    LOG.trace("Ignoring asn1ObjectIdentifier {}", asn1ObjectIdentifier);
-                } else {
-                    LOG.warn("Unknown object '{}' from PEMParser", readObject);
+                PrivateKeyInfo privateKeyInfo = getPrivateKeyInfoOrNull(readObject);
+                if (privateKeyInfo != null) {
+                    return new JcaPEMKeyConverter().getPrivateKey(privateKeyInfo);
                 }
-
                 readObject = pemParser.readObject();
             }
         }
@@ -138,20 +121,25 @@ public static PrivateKey loadPrivateKey(final Reader reader) throws IOException,
         return null;
     }
 
+    /**
+     * Find a PrivateKeyInfo in the PEM object details. Returns null if the PEM object type is unknown.
+     */
     @CheckForNull
-    public static PrivateKey guessKey(byte[] encodedKey) throws NoSuchAlgorithmException {
-        //no way to know, so iterate
-        for (String guessFactory : new String[]{"RSA", "ECDSA"}) {
-            try {
-                KeyFactory factory = KeyFactory.getInstance(guessFactory);
-
-                PKCS8EncodedKeySpec privateKeySpec = new PKCS8EncodedKeySpec(encodedKey);
-                return factory.generatePrivate(privateKeySpec);
-            } catch (InvalidKeySpecException ignore) {
-            }
+    private static PrivateKeyInfo getPrivateKeyInfoOrNull(Object pemObject) throws NoSuchAlgorithmException {
+        PrivateKeyInfo privateKeyInfo = null;
+        if (pemObject instanceof PEMKeyPair) {
+            PEMKeyPair pemKeyPair = (PEMKeyPair) pemObject;
+            privateKeyInfo = pemKeyPair.getPrivateKeyInfo();
+        } else if (pemObject instanceof PrivateKeyInfo) {
+            privateKeyInfo = (PrivateKeyInfo) pemObject;
+        } else if (pemObject instanceof ASN1ObjectIdentifier) {
+            // no idea how it can be used
+            final ASN1ObjectIdentifier asn1ObjectIdentifier = (ASN1ObjectIdentifier) pemObject;
+            LOG.trace("Ignoring asn1ObjectIdentifier {}", asn1ObjectIdentifier);
+        } else {
+            LOG.warn("Unknown object '{}' from PEMParser", pemObject);
         }
-
-        return null;
+        return privateKeyInfo;
     }
 
     /**

From 3cd85edf9fc87d897fad5befffc13662cf65c39d Mon Sep 17 00:00:00 2001
From: Unknown <lukasz.warchal@asseco.pl>
Date: Wed, 9 Aug 2017 00:57:36 +0200
Subject: [PATCH 0753/1272] Fix .dockerignore handling on Windows

---
 .../java/com/github/dockerjava/core/dockerfile/Dockerfile.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 848ae691e..c9931efbd 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -252,7 +252,8 @@ private List<String> matchingIgnorePatterns(String fileName) {
          * will be respected.
          */
         private String effectiveMatchingIgnorePattern(File file) {
-            String relativeFilename = FilePathUtil.relativize(baseDirectory, file);
+            // normalize path to replace '/' to '\' on Windows
+            String relativeFilename = FilenameUtils.normalize(FilePathUtil.relativize(baseDirectory, file));
 
             List<String> matchingPattern = matchingIgnorePatterns(relativeFilename);
 

From 8af493654dafe7dd0624151d7c110f33310f2086 Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Wed, 16 Aug 2017 08:48:24 +0800
Subject: [PATCH 0754/1272] Revert "skip instead of throw error on non-linux
 os"

This reverts commit 79932b0f2072433e7b0768a5d13731d0199689f9.
---
 .../dockerjava/netty/exec/AttachContainerCmdExecTest.java   | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
index 7cbb17fc0..66219dc72 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
@@ -10,10 +10,8 @@
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.lang.reflect.Method;
-import java.util.Locale;
 
 import org.testng.ITestResult;
-import org.testng.SkipException;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeMethod;
@@ -32,10 +30,6 @@ public class AttachContainerCmdExecTest extends AbstractNettyDockerClientTest {
 
     @BeforeTest
     public void beforeTest() throws Exception {
-        // io.netty.channel.epollNative#loadNativeLibrary only support Linux
-        if (!System.getProperty("os.name").toLowerCase(Locale.UK).trim().startsWith("linux")) {
-            throw new SkipException("only support Linux");
-        }
         super.beforeTest();
     }
 

From ea90fb090f4dd60afcef9247e14cb5f2a6b0ce78 Mon Sep 17 00:00:00 2001
From: fedor <fedor.korotkov@gmail.com>
Date: Mon, 21 Aug 2017 19:12:14 -0700
Subject: [PATCH 0755/1272] Upgrade Netty

to fix https://github.com/netty/netty/issues/6901
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 73abc1da2..9d4aee77e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
 		<!-- test dependencies -->
 		<logback.version>1.1.7</logback.version>
 		<testng.version>6.9.10</testng.version>
-		<netty.version>4.1.11.Final</netty.version>
+		<netty.version>4.1.14.Final</netty.version>
 		<hamcrest.library.version>1.3</hamcrest.library.version>
 		<hamcrest.jpa-matchers>1.8</hamcrest.jpa-matchers>
 		<lambdaj.version>2.3.3</lambdaj.version>

From 2c7ba46578ae64d930b8fe592718250e38c936d2 Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Tue, 22 Aug 2017 16:35:44 +0800
Subject: [PATCH 0756/1272] make sure ByteBuf is released

---
 .../HttpResponseStreamHandlerTest.java        | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java b/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
index eea9ddc0f..8424763de 100644
--- a/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
+++ b/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
@@ -16,6 +16,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
+import io.netty.util.ReferenceCountUtil;
 import org.apache.commons.io.IOUtils;
 import org.mockito.Mockito;
 import org.testng.annotations.Test;
@@ -32,12 +33,15 @@ public void testNoBytesSkipped() throws Exception {
         HttpResponseStreamHandler streamHandler = new HttpResponseStreamHandler(callback);
         ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
         ByteBuf buffer = generateByteBuf();
-        streamHandler.channelRead0(ctx, buffer);
+        ByteBuf readBuffer = buffer.copy();
+        assertEquals(buffer.refCnt(), 1);
+        streamHandler.channelRead(ctx, buffer);
         streamHandler.channelInactive(ctx);
-
+        assertEquals(buffer.refCnt(), 0);
         try (InputStream inputStream = callback.getInputStream()) {
-            assertTrue(IOUtils.contentEquals(inputStream, new ByteBufInputStream(buffer)));
+            assertTrue(IOUtils.contentEquals(inputStream, new ByteBufInputStream(readBuffer)));
         }
+        ReferenceCountUtil.release(readBuffer);
     }
 
     @Test
@@ -46,16 +50,19 @@ public void testReadByteByByte() throws Exception {
         HttpResponseStreamHandler streamHandler = new HttpResponseStreamHandler(callback);
         ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
         ByteBuf buffer = generateByteBuf();
-        streamHandler.channelRead0(ctx, buffer);
+        ByteBuf readBuffer = buffer.copy();
+        assertEquals(buffer.refCnt(), 1);
+        streamHandler.channelRead(ctx, buffer);
         streamHandler.channelInactive(ctx);
-
+        assertEquals(buffer.refCnt(), 0);
         try (InputStream inputStream = callback.getInputStream()) {
-            for (int i = 0; i < buffer.readableBytes(); i++) {
+            for (int i = 0; i < readBuffer.readableBytes(); i++) {
                 int b = inputStream.read();
-                assertEquals(b, buffer.getByte(i));
+                assertEquals(b, readBuffer.getByte(i));
             }
             assertTrue(inputStream.read() == -1);
         }
+        ReferenceCountUtil.release(readBuffer);
     }
 
     @Test

From f629679fa01fcf4b80071a1de4832a7c81166ee0 Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Tue, 22 Aug 2017 16:36:10 +0800
Subject: [PATCH 0757/1272] pull image use latest tag to avoid pulling all tags

---
 .../dockerjava/core/command/ListContainersCmdImplTest.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
index f3199fcb4..6dab09ec6 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
@@ -104,7 +104,7 @@ public void testListContainersWithLabelsFilter() throws Exception {
         String testImage = "busybox";
 
         // need to block until image is pulled completely
-        dockerClient.pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitCompletion();
+        dockerClient.pullImageCmd(testImage).withTag("latest").exec(new PullImageResultCallback()).awaitCompletion();
 
         List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
         assertThat(containers, notNullValue());

From 6d9dec35effdefbe53cdde50519fb052d366f3ba Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 29 Sep 2017 04:02:43 +0300
Subject: [PATCH 0758/1272] WIP Refactor tests. (#909)

- Migrate to junit.
- parametrized test, removed test code duplication
- fixed tests parallel execution issues
- pull/push image on differen api version is strange
- dropped 1.10 support
---
 .travis.yml                                   |  11 +-
 .travis/travis-before-install.sh              |   5 +-
 pom.xml                                       |  43 +-
 .../dockerjava/core/RemoteApiVersion.java     |  15 +
 .../core/command/AttachContainerCmdImpl.java  |  20 +-
 .../api/ModelsSerializableTest.java           |   2 +-
 .../command/InspectContainerResponseTest.java |  13 +-
 .../api/command/InspectExecResponseTest.java  |   2 +-
 .../api/command/InspectImageResponseTest.java |   4 +-
 .../dockerjava/api/model/AccessModeTest.java  |  15 +-
 .../dockerjava/api/model/AuthConfigTest.java  |   4 +-
 .../github/dockerjava/api/model/BindTest.java |  24 +-
 .../dockerjava/api/model/BindingTest.java     |  23 +-
 .../dockerjava/api/model/CapabilityTest.java  |   9 +-
 .../dockerjava/api/model/ContainerTest.java   |   2 +-
 .../dockerjava/api/model/DeviceTest.java      |   6 +-
 .../dockerjava/api/model/EventsTest.java      |   2 +-
 .../dockerjava/api/model/ExposedPortTest.java |  21 +-
 .../dockerjava/api/model/IdentifierTest.java  |   6 +-
 .../github/dockerjava/api/model/InfoTest.java |   2 +-
 .../api/model/InternetProtocolTest.java       |  20 +-
 .../github/dockerjava/api/model/LinkTest.java |  19 +-
 .../dockerjava/api/model/PortBindingTest.java |  24 +-
 ...ngsTest.java => PortsAddBindingsTest.java} |  10 +-
 ...ingTest.java => PortsSerializingTest.java} |   6 +-
 .../api/model/PullResponseItemTest.java       |   8 +-
 .../dockerjava/api/model/RepositoryTest.java  |   7 +-
 ...est.java => RestartPolicyParsingTest.java} |  22 +-
 ...java => RestartPolicySerializingTest.java} |   9 +-
 .../api/model/RestartPolicyToStringTest.java  |  25 +
 .../api/model/RestartPolicy_toStringTest.java |  20 -
 .../dockerjava/api/model/VersionTest.java     |   2 +-
 .../dockerjava/api/model/VolumeBindsTest.java |  11 +-
 ...st.java => VolumeFromSerializingTest.java} |   9 +-
 .../dockerjava/api/model/VolumeTest.java      |   4 +-
 .../client/AbstractDockerClientTest.java      | 275 -------
 .../dockerjava/client/DockerClientTest.java   |  77 --
 .../AttachContainerCmdIT.java}                | 187 +++--
 .../com/github/dockerjava/cmd/AuthCmdIT.java  |  47 ++
 .../BuildImageCmdIT.java}                     | 251 +++---
 .../java/com/github/dockerjava/cmd/CmdIT.java |  42 +
 .../github/dockerjava/cmd/CommitCmdIT.java    |  92 +++
 .../dockerjava/cmd/ConnectToNetworkCmdIT.java |  97 +++
 .../dockerjava/cmd/ContainerDiffCmdIT.java    |  51 ++
 .../CopyArchiveFromContainerCmdIT.java}       |  93 +--
 .../CopyArchiveToContainerCmdIT.java}         | 103 +--
 .../cmd/CopyFileFromContainerCmdIT.java       |  60 ++
 .../CreateContainerCmdIT.java}                | 402 ++++-----
 .../dockerjava/cmd/CreateNetworkCmdIT.java    |  89 ++
 .../CreateVolumeCmdIT.java}                   |  48 +-
 .../cmd/DisconnectFromNetworkCmdIT.java       |  58 ++
 .../EventsCmdIT.java}                         | 128 ++-
 .../dockerjava/cmd/ExecCreateCmdImplIT.java   |  38 +
 .../github/dockerjava/cmd/ExecStartCmdIT.java | 101 +++
 .../com/github/dockerjava/cmd/InfoCmdIT.java  |  58 ++
 .../InspectContainerCmdIT.java}               |  83 +-
 .../InspectExecCmdIT.java}                    | 101 +--
 .../dockerjava/cmd/InspectNetworkCmdIT.java   |  32 +
 .../dockerjava/cmd/InspectVolumeCmdIT.java    |  35 +
 .../dockerjava/cmd/KillContainerCmdIT.java    |  45 +
 .../ListContainersCmdIT.java}                 | 126 ++-
 .../ListImagesCmdIT.java}                     |  74 +-
 .../dockerjava/cmd/ListNetworksCmdIT.java     |  30 +
 .../dockerjava/cmd/ListVolumesCmdIT.java      |  29 +
 .../LoadImageCmdIT.java}                      |  53 +-
 .../LogContainerCmdIT.java}                   |  91 +--
 .../com/github/dockerjava/cmd/PauseCmdIT.java |  73 ++
 .../com/github/dockerjava/cmd/PingCmdIT.java  |  13 +
 .../PullImageCmdIT.java}                      |  89 +-
 .../github/dockerjava/cmd/PushImageCmdIT.java |  80 ++
 .../cmd/RemoveContainerCmdImplIT.java         |  50 ++
 .../dockerjava/cmd/RemoveImageCmdIT.java      |  54 ++
 .../dockerjava/cmd/RemoveNetworkCmdIT.java    |  51 ++
 .../dockerjava/cmd/RemoveVolumeCmdIT.java     |  32 +
 .../dockerjava/cmd/RenameContainerCmdIT.java  |  52 ++
 .../cmd/RestartContainerCmdImplIT.java        |  52 ++
 .../github/dockerjava/cmd/SaveImageCmdIT.java |  24 +
 .../dockerjava/cmd/SearchImagesCmdIT.java     |  33 +
 .../StartContainerCmdIT.java}                 | 210 +++--
 .../StatsCmdIT.java}                          |  65 +-
 .../dockerjava/cmd/StopContainerCmdIT.java    |  49 ++
 .../github/dockerjava/cmd/TagImageCmdIT.java  |  29 +
 .../github/dockerjava/cmd/UnpauseCmdIT.java   |  89 ++
 .../UpdateContainerCmdIT.java}                |  71 +-
 .../github/dockerjava/cmd/VersionCmdIT.java   |  29 +
 .../WaitContainerCmdIT.java}                  |  81 +-
 .../swarm/CreateServiceCmdExecIT.java}        |  62 +-
 .../swarm/InitializeSwarmCmdExecIT.java}      |  46 +-
 .../swarm/JoinSwarmCmdExecIT.java}            |  40 +-
 .../swarm/LeaveSwarmCmdExecIT.java}           |  51 +-
 .../swarm/SwarmCmdIT.java}                    |  66 +-
 .../swarm/UpdateSwarmCmdExecIT.java}          |  48 +-
 .../dockerjava/core/AuthConfigFileTest.java   |  50 +-
 .../core/CompressArchiveUtilTest.java         |  20 +-
 .../core/DefaultDockerClientConfigTest.java   |  27 +-
 .../core/DockerClientBuilderTest.java         |  12 +-
 .../dockerjava/core/DockerClientImplTest.java |   8 +-
 .../dockerjava/core/GoLangFileMatchTest.java  |  72 +-
 .../dockerjava/core/NameParserTest.java       |  31 +-
 .../dockerjava/core/RemoteApiVersionTest.java |   2 +-
 .../core/async/JsonStreamProcessorTest.java   |  13 +-
 .../command/AttachContainerCmdImplTest.java   | 164 ----
 .../core/command/AuthCmdImplTest.java         |  63 --
 .../core/command/BuildImageCmdImplTest.java   | 357 --------
 .../core/command/CommitCmdImplTest.java       | 102 ---
 .../command/ConnectToNetworkCmdImplTest.java  | 118 ---
 .../command/ContainerDiffCmdImplTest.java     |  75 --
 .../CopyArchiveToContainerCmdImplTest.java    | 153 ----
 .../CopyFileFromContainerCmdImplTest.java     |  81 --
 .../command/CreateNetworkCmdImplTest.java     | 106 ---
 .../DisconnectFromNetworkCmdImplTest.java     |  86 --
 .../core/command/DockerfileFixture.java       |  27 +-
 .../core/command/ExecCreateCmdImplTest.java   |  61 --
 .../core/command/ExecStartCmdImplTest.java    | 118 ---
 .../core/command/FrameReaderITest.java        |  46 +-
 .../core/command/FrameReaderTest.java         |  10 +-
 .../core/command/InfoCmdImplTest.java         |  75 --
 .../core/command/InspectExecCmdImplTest.java  | 144 ----
 .../command/InspectNetworkCmdImplTest.java    |  60 --
 .../command/InspectVolumeCmdImplTest.java     |  65 --
 .../command/KillContainerCmdImplTest.java     |  76 --
 .../command/ListContainersCmdImplTest.java    | 170 ----
 .../core/command/ListNetworksCmdImplTest.java |  58 --
 .../core/command/ListVolumesCmdImplTest.java  |  59 --
 .../core/command/LogContainerCmdImplTest.java | 222 -----
 .../core/command/PauseCmdImplTest.java        | 103 ---
 .../core/command/PullImageCmdImplTest.java    | 117 ---
 .../core/command/PushImageCmdImplTest.java    |  78 --
 .../command/RemoveContainerCmdImplTest.java   |  77 --
 .../core/command/RemoveImageCmdImplTest.java  |  83 --
 .../command/RemoveNetworkCmdImplTest.java     |  77 --
 .../command/RemoveServiceCmdExecTest.java     |  83 --
 .../core/command/RemoveVolumeCmdImplTest.java |  60 --
 .../command/RenameContainerCmdImplTest.java   |  76 --
 .../command/RestartContainerCmdImplTest.java  |  79 --
 .../core/command/SaveImageCmdImplTest.java    |  55 --
 .../core/command/SearchImagesCmdImplTest.java |  59 --
 .../command/StopContainerCmdImplTest.java     |  83 --
 .../core/command/TagImageCmdImplTest.java     |  59 --
 .../core/command/UnpauseCmdImplTest.java      | 118 ---
 .../command/UpdateServiceCmdExecTest.java     |  88 --
 .../core/command/VersionCmdImplTest.java      |  52 --
 .../command/WaitContainerCmdImplTest.java     | 125 ---
 .../DockerfileAddMultipleFilesTest.java       |  17 +-
 .../DockerfileStatementAddTest.java           |  66 +-
 .../core/util/CertificateUtilsTest.java       |  10 +-
 .../core/util/FiltersBuilderTest.java         |   7 +-
 .../github/dockerjava/junit/DockerAssume.java |  33 +
 .../dockerjava/junit/DockerMatchers.java      |  65 ++
 .../github/dockerjava/junit/DockerRule.java   | 158 ++++
 .../junit/category/AuthIntegration.java       |   4 +
 .../junit/category/Integration.java           |   4 +
 .../junit/category/SwarmModeIntegration.java  |   4 +
 .../suite/IntegrationDockerTestSuite.java     |  43 +
 .../dockerjava/junit/suite/SwarmSuite.java    |  10 +
 .../netty/AbstractNettyDockerClientTest.java  |  17 -
 .../AbstractNettySwarmDockerClientTest.java   |  16 -
 .../NettyDockerCmdExecFactoryConfigTest.java  |  22 +-
 .../dockerjava/netty/WebTargetTest.java       |  12 +-
 .../netty/exec/AuthCmdExecTest.java           |  65 --
 .../netty/exec/CommitCmdExecTest.java         | 105 ---
 .../exec/ConnectToNetworkCmdExecTest.java     | 120 ---
 .../netty/exec/ContainerDiffCmdExecTest.java  |  77 --
 .../CopyArchiveFromContainerCmdExecTest.java  | 110 ---
 .../CopyFileFromContainerCmdExecTest.java     |  79 --
 .../exec/CreateContainerCmdExecTest.java      | 766 ------------------
 .../netty/exec/CreateNetworkCmdExecTest.java  |  73 --
 .../netty/exec/CreateServiceCmdExecTest.java  | 123 ---
 .../netty/exec/CreateVolumeCmdExecTest.java   |  73 --
 .../DisconnectFromNetworkCmdExecTest.java     |  87 --
 .../netty/exec/EventsCmdExecTest.java         | 175 ----
 .../netty/exec/ExecCreateCmdExecTest.java     |  61 --
 .../netty/exec/ExecStartCmdExecTest.java      | 226 ------
 .../netty/exec/InfoCmdExecTest.java           |  75 --
 .../exec/InitializeSwarmCmdExecTest.java      |  97 ---
 .../exec/InspectContainerCmdExecTest.java     | 124 ---
 .../netty/exec/InspectNetworkCmdExecTest.java |  60 --
 .../netty/exec/InspectVolumeCmdExecTest.java  |  65 --
 .../netty/exec/JoinSwarmCmdExecTest.java      | 117 ---
 .../netty/exec/KillContainerCmdExecTest.java  |  76 --
 .../netty/exec/LeaveSwarmCmdExecTest.java     |  79 --
 .../netty/exec/ListImagesCmdExecTest.java     | 114 ---
 .../netty/exec/ListNetworksCmdExecTest.java   |  58 --
 .../netty/exec/ListVolumesCmdExecTest.java    |  59 --
 .../netty/exec/LoadImageCmdExecTest.java      |  76 --
 .../netty/exec/PauseCmdImplTest.java          | 103 ---
 .../netty/exec/PingCmdExecTest.java           |  43 -
 .../netty/exec/PushImageCmdExecTest.java      |  79 --
 .../exec/RemoveContainerCmdExecTest.java      |  78 --
 .../netty/exec/RemoveImageCmdExecTest.java    |  83 --
 .../netty/exec/RemoveNetworkCmdExecTest.java  |  77 --
 .../netty/exec/RemoveServiceCmdExecTest.java  |  83 --
 .../netty/exec/RemoveVolumeCmdExecTest.java   |  60 --
 .../exec/RenameContainerCmdExecTest.java      |  76 --
 .../exec/RestartContainerCmdExecTest.java     |  80 --
 .../netty/exec/SaveImageCmdExecTest.java      |  56 --
 .../netty/exec/SearchImagesCmdExecTest.java   |  59 --
 .../netty/exec/StartContainerCmdExecTest.java | 554 -------------
 .../netty/exec/StatsCmdExecTest.java          | 106 ---
 .../netty/exec/StopContainerCmdExecTest.java  |  83 --
 .../netty/exec/TagImageCmdExecTest.java       |  59 --
 .../netty/exec/UnpauseCmdImplTest.java        | 118 ---
 .../exec/UpdateContainerCmdExecTest.java      | 106 ---
 .../netty/exec/UpdateServiceCmdExecTest.java  |  90 --
 .../netty/exec/UpdateSwarmCmdExecTest.java    | 102 ---
 .../netty/exec/VersionCmdExecTest.java        |  52 --
 .../HttpResponseStreamHandlerTest.java        |  20 +-
 .../dockerjava/test/serdes/JSONSamples.java   |  10 +-
 .../test/serdes/JSONTestHelper.java           |  13 +-
 .../utils/LogContainerTestCallback.java       |  42 +
 .../github/dockerjava/utils/TestUtils.java    |  50 ++
 .../attachContainerTestDockerfile/Dockerfile  |   3 +-
 .../resources/buildTests/ADD/file/Dockerfile  |   4 +-
 .../buildTests/ADD/fileInSubfolder/Dockerfile |   3 +-
 .../resources/buildTests/ADD/files/Dockerfile |   2 +-
 .../ADD/filesViaWildcard/Dockerfile           |   3 +-
 .../buildTests/ADD/folder/Dockerfile          |   7 +-
 .../resources/buildTests/ADD/url/Dockerfile   |   4 +-
 .../resources/buildTests/AUTHOR/Dockerfile    |   8 +-
 .../buildTests/CacheFrom/test1/Dockerfile     |   2 +-
 .../buildTests/CacheFrom/test2/Dockerfile     |   2 +-
 src/test/resources/buildTests/ENV/Dockerfile  |   4 +-
 .../FROM/privateRegistry/Dockerfile           |   2 +-
 .../buildTests/ONBUILD/parent/Dockerfile      |   4 +-
 .../resources/buildTests/buildArgs/Dockerfile |   2 +-
 .../dockerfileFolder/Dockerfile               |   3 +-
 .../dockerignore/DockerfileIgnored/Dockerfile |   3 +-
 .../DockerfileNotIgnored/Dockerfile           |   2 +-
 .../EffectiveDockerignorePatterns/Dockerfile  |   2 +-
 .../IneffectiveDockerignorePattern/Dockerfile |   2 +-
 .../InvalidDockerignorePattern/Dockerfile     |   3 +-
 .../NestedDirsDockerignore/Dockerfile         |   2 +-
 .../ValidDockerignorePattern/Dockerfile       |   3 +-
 .../resources/buildTests/labels/Dockerfile    |   2 +-
 src/test/resources/testReadFile/Dockerfile    |   6 +-
 src/test/resources/travis-logback.xml         |   6 +-
 236 files changed, 3695 insertions(+), 11462 deletions(-)
 rename src/test/java/com/github/dockerjava/api/model/{Ports_addBindingsTest.java => PortsAddBindingsTest.java} (91%)
 rename src/test/java/com/github/dockerjava/api/model/{Ports_SerializingTest.java => PortsSerializingTest.java} (94%)
 rename src/test/java/com/github/dockerjava/api/model/{RestartPolicy_ParsingTest.java => RestartPolicyParsingTest.java} (65%)
 rename src/test/java/com/github/dockerjava/api/model/{RestartPolicy_SerializingTest.java => RestartPolicySerializingTest.java} (92%)
 create mode 100644 src/test/java/com/github/dockerjava/api/model/RestartPolicyToStringTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java
 rename src/test/java/com/github/dockerjava/api/model/{VolumeFrom_SerializingTest.java => VolumeFromSerializingTest.java} (84%)
 delete mode 100644 src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/client/DockerClientTest.java
 rename src/test/java/com/github/dockerjava/{netty/exec/AttachContainerCmdExecTest.java => cmd/AttachContainerCmdIT.java} (56%)
 create mode 100644 src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java
 rename src/test/java/com/github/dockerjava/{netty/exec/BuildImageCmdExecTest.java => cmd/BuildImageCmdIT.java} (59%)
 create mode 100644 src/test/java/com/github/dockerjava/cmd/CmdIT.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java
 rename src/test/java/com/github/dockerjava/{core/command/CopyArchiveFromContainerCmdImplTest.java => cmd/CopyArchiveFromContainerCmdIT.java} (51%)
 rename src/test/java/com/github/dockerjava/{netty/exec/CopyArchiveToContainerCmdExecTest.java => cmd/CopyArchiveToContainerCmdIT.java} (62%)
 create mode 100644 src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java
 rename src/test/java/com/github/dockerjava/{core/command/CreateContainerCmdImplTest.java => cmd/CreateContainerCmdIT.java} (63%)
 create mode 100644 src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
 rename src/test/java/com/github/dockerjava/{core/command/CreateVolumeCmdImplTest.java => cmd/CreateVolumeCmdIT.java} (53%)
 create mode 100644 src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java
 rename src/test/java/com/github/dockerjava/{core/command/EventsCmdImplTest.java => cmd/EventsCmdIT.java} (66%)
 create mode 100644 src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java
 rename src/test/java/com/github/dockerjava/{core/command/InspectContainerCmdImplTest.java => cmd/InspectContainerCmdIT.java} (60%)
 rename src/test/java/com/github/dockerjava/{netty/exec/InspectExecCmdExecTest.java => cmd/InspectExecCmdIT.java} (63%)
 create mode 100644 src/test/java/com/github/dockerjava/cmd/InspectNetworkCmdIT.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/InspectVolumeCmdIT.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/KillContainerCmdIT.java
 rename src/test/java/com/github/dockerjava/{netty/exec/ListContainersCmdExecTest.java => cmd/ListContainersCmdIT.java} (58%)
 rename src/test/java/com/github/dockerjava/{core/command/ListImagesCmdImplTest.java => cmd/ListImagesCmdIT.java} (56%)
 create mode 100644 src/test/java/com/github/dockerjava/cmd/ListNetworksCmdIT.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/ListVolumesCmdIT.java
 rename src/test/java/com/github/dockerjava/{core/command/LoadImageCmdImplTest.java => cmd/LoadImageCmdIT.java} (53%)
 rename src/test/java/com/github/dockerjava/{netty/exec/LogContainerCmdExecTest.java => cmd/LogContainerCmdIT.java} (71%)
 create mode 100644 src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/PingCmdIT.java
 rename src/test/java/com/github/dockerjava/{netty/exec/PullImageCmdExecTest.java => cmd/PullImageCmdIT.java} (60%)
 create mode 100644 src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/RemoveNetworkCmdIT.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/SearchImagesCmdIT.java
 rename src/test/java/com/github/dockerjava/{core/command/StartContainerCmdImplTest.java => cmd/StartContainerCmdIT.java} (71%)
 rename src/test/java/com/github/dockerjava/{core/command/StatsCmdImplTest.java => cmd/StatsCmdIT.java} (59%)
 create mode 100644 src/test/java/com/github/dockerjava/cmd/StopContainerCmdIT.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/UnpauseCmdIT.java
 rename src/test/java/com/github/dockerjava/{core/command/UpdateContainerCmdImplTest.java => cmd/UpdateContainerCmdIT.java} (59%)
 create mode 100644 src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java
 rename src/test/java/com/github/dockerjava/{netty/exec/WaitContainerCmdExecTest.java => cmd/WaitContainerCmdIT.java} (51%)
 rename src/test/java/com/github/dockerjava/{core/command/CreateServiceCmdExecTest.java => cmd/swarm/CreateServiceCmdExecIT.java} (64%)
 rename src/test/java/com/github/dockerjava/{core/command/InitializeSwarmCmdExecTest.java => cmd/swarm/InitializeSwarmCmdExecIT.java} (68%)
 rename src/test/java/com/github/dockerjava/{core/command/JoinSwarmCmdExecTest.java => cmd/swarm/JoinSwarmCmdExecIT.java} (76%)
 rename src/test/java/com/github/dockerjava/{core/command/LeaveSwarmCmdExecTest.java => cmd/swarm/LeaveSwarmCmdExecIT.java} (52%)
 rename src/test/java/com/github/dockerjava/{core/command/AbstractSwarmDockerClientTest.java => cmd/swarm/SwarmCmdIT.java} (65%)
 rename src/test/java/com/github/dockerjava/{core/command/UpdateSwarmCmdExecTest.java => cmd/swarm/UpdateSwarmCmdExecIT.java} (68%)
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/InspectNetworkCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/InspectVolumeCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/ListNetworksCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/ListVolumesCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/PauseCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/RemoveNetworkCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/RemoveServiceCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/RemoveVolumeCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/SaveImageCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/UnpauseCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/UpdateServiceCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
 create mode 100644 src/test/java/com/github/dockerjava/junit/DockerAssume.java
 create mode 100644 src/test/java/com/github/dockerjava/junit/DockerMatchers.java
 create mode 100644 src/test/java/com/github/dockerjava/junit/DockerRule.java
 create mode 100644 src/test/java/com/github/dockerjava/junit/category/AuthIntegration.java
 create mode 100644 src/test/java/com/github/dockerjava/junit/category/Integration.java
 create mode 100644 src/test/java/com/github/dockerjava/junit/category/SwarmModeIntegration.java
 create mode 100644 src/test/java/com/github/dockerjava/junit/suite/IntegrationDockerTestSuite.java
 create mode 100644 src/test/java/com/github/dockerjava/junit/suite/SwarmSuite.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/AbstractNettyDockerClientTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/AbstractNettySwarmDockerClientTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/AuthCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/CreateServiceCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/CreateVolumeCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/ExecCreateCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/InfoCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/InitializeSwarmCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/InspectNetworkCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/InspectVolumeCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/JoinSwarmCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/KillContainerCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/LeaveSwarmCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/ListNetworksCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/ListVolumesCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/LoadImageCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/PauseCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/PingCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/PushImageCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/RemoveImageCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/RemoveServiceCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/RemoveVolumeCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/RestartContainerCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/SaveImageCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/SearchImagesCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/StatsCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/TagImageCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/UnpauseCmdImplTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/UpdateServiceCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/UpdateSwarmCmdExecTest.java
 delete mode 100644 src/test/java/com/github/dockerjava/netty/exec/VersionCmdExecTest.java
 create mode 100644 src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java

diff --git a/.travis.yml b/.travis.yml
index 0fb628c0c..25cb64497 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,9 @@ env:
     - COVERITY_SCAN_NOTIFICATION_EMAIL="kanstantsin.sha@gmail.com"
 
   matrix:
+#    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="17.09.0~ce-0~ubuntu-trusty"
+#    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="17.09.0~ce-0~ubuntu-trusty"
+#    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="17.06.2~ce-0~ubuntu-trusty" DEPLOY=true COVERITY=true
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" DEPLOY=true COVERITY=true
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2377" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" SWARM_VERSION="1.2.6"
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty"
@@ -30,10 +33,10 @@ env:
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.13.1-0~ubuntu-trusty"
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.12.6-0~ubuntu-trusty"
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.12.6-0~ubuntu-trusty"
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty"
-    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty"
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.10.3-0~trusty"
-    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.10.3-0~trusty"
+#    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty"
+#    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty"
+#    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.10.3-0~trusty"
+#    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.10.3-0~trusty"
 #    - repo="testing" DOCKER_HOST="tcp://127.0.0.1:2375"
 #    - repo="testing" DOCKER_HOST="unix:///var/run/docker.sock"
 #    - repo="experimental" DOCKER_HOST="tcp://127.0.0.1:2375"
diff --git a/.travis/travis-before-install.sh b/.travis/travis-before-install.sh
index 113cd823b..faf9be478 100755
--- a/.travis/travis-before-install.sh
+++ b/.travis/travis-before-install.sh
@@ -45,8 +45,9 @@ sudo -E stop docker
 # sudo apt-get -f install
 # sudo dpkg -i "$(ls *${DOCKER_VERSION}*)"
 #popd
-#rm -f "src/test/resources/logback.xml"
-mv "src/test/resources/travis-logback.xml" "src/test/resources/logback.xml"
+rm -f "src/test/resources/logback.xml"
+#rm -f "src/test/resources/travis-logback.xml"
+mv "src/test/resources/travis-logback.xml" "src/test/resources/logback-test.xml"
 
 # https://github.com/docker/docker/issues/18113
 sudo rm /var/lib/docker/network/files/local-kv.db
diff --git a/pom.xml b/pom.xml
index 9d4aee77e..640885610 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
 		<jdk.source>1.7</jdk.source>
 		<jdk.target>1.7</jdk.target>
 
-		<jersey.version>2.23.1</jersey.version>
+		<jersey.version>2.26</jersey.version>
 		<jackson-jaxrs.version>2.6.4</jackson-jaxrs.version>
 		<httpclient.version>4.5</httpclient.version><!-- 4.5.1-4.5.2 broken -->
 		<commons-compress.version>1.12</commons-compress.version>
@@ -71,8 +71,7 @@
 		<guava.version>19.0</guava.version>
 
 		<!-- test dependencies -->
-		<logback.version>1.1.7</logback.version>
-		<testng.version>6.9.10</testng.version>
+		<logback.version>1.2.3</logback.version>
 		<netty.version>4.1.14.Final</netty.version>
 		<hamcrest.library.version>1.3</hamcrest.library.version>
 		<hamcrest.jpa-matchers>1.8</hamcrest.jpa-matchers>
@@ -83,8 +82,8 @@
 		<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
 		<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
 		<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
-		<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
-		<maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
+		<maven-surefire-plugin.version>2.20</maven-surefire-plugin.version>
+		<maven-failsafe-plugin.version>2.20</maven-failsafe-plugin.version>
 		<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
 		<maven-bundlor-plugin.version>1.1.2.RELEASE</maven-bundlor-plugin.version>
 		<maven-build-helper-plugin.version>3.0.0</maven-build-helper-plugin.version>
@@ -122,6 +121,11 @@
 			<artifactId>jersey-client</artifactId>
 			<version>${jersey.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.inject</groupId>
+			<artifactId>jersey-hk2</artifactId>
+			<version>${jersey.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>com.kohlschutter.junixsocket</groupId>
 			<artifactId>junixsocket-common</artifactId>
@@ -189,13 +193,6 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.testng</groupId>
-			<artifactId>testng</artifactId>
-			<version>${testng.version}</version>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-library</artifactId>
@@ -430,7 +427,7 @@
 				<version>${maven-surefire-plugin.version}</version>
 				<configuration>
 					<rerunFailingTestsCount>3</rerunFailingTestsCount>
-					<excludedGroups>integration,integration-auth,swarm-integration</excludedGroups>
+					<excludedGroups>com.github.dockerjava.junit.category.Integration</excludedGroups>
 				</configuration>
 			</plugin>
 
@@ -444,19 +441,17 @@
 							<goal>integration-test</goal>
 							<goal>verify</goal>
 						</goals>
-						<configuration>
-							<rerunFailingTestsCount>3</rerunFailingTestsCount>
-							<useUnlimitedThreads>true</useUnlimitedThreads>
-							<perCoreThreadCount>true</perCoreThreadCount>
-							<threadCount>1</threadCount>
-							<groups>integration</groups>
-							<excludedGroups>integration-auth,swarm-integration</excludedGroups>
-							<includes>
-								<include>**/*Test.java</include>
-							</includes>
-						</configuration>
 					</execution>
 				</executions>
+				<configuration>
+					<rerunFailingTestsCount>3</rerunFailingTestsCount>
+					<!--<useUnlimitedThreads>true</useUnlimitedThreads>-->
+					<perCoreThreadCount>true</perCoreThreadCount>
+					<threadCount>1</threadCount>
+					<parallel>classes</parallel>
+					<groups>com.github.dockerjava.junit.category.Integration</groups>
+					<excludedGroups>com.github.dockerjava.junit.category.AuthIntegration,com.github.dockerjava.junit.category.SwarmModeIntegration</excludedGroups>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index 90616ffaa..1525d2c28 100644
--- a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -77,6 +77,10 @@ public class RemoteApiVersion implements Serializable {
      */
     public static final RemoteApiVersion VERSION_1_25 = RemoteApiVersion.create(1, 25);
 
+    public static final RemoteApiVersion VERSION_1_26 = RemoteApiVersion.create(1, 26);
+    public static final RemoteApiVersion VERSION_1_27 = RemoteApiVersion.create(1, 27);
+    public static final RemoteApiVersion VERSION_1_29 = RemoteApiVersion.create(1, 29);
+
 
     /**
      * Unknown, docker doesn't reflect reality. I.e. we implemented method, but for javadoc it not clear when it was added.
@@ -88,6 +92,11 @@ public boolean isGreaterOrEqual(final RemoteApiVersion other) {
             return false;
         }
 
+        @Override
+        public boolean isGreater(RemoteApiVersion other) {
+            return false;
+        }
+
         @Override
         public String toString() {
             return MoreObjects.toStringHelper(this).addValue("UNKNOWN_VERSION").toString();
@@ -146,6 +155,11 @@ public boolean isGreaterOrEqual(final RemoteApiVersion other) {
         return false;
     }
 
+    public boolean isGreater(final RemoteApiVersion other) {
+        return major > other.major || (major == other.major && minor > other.minor);
+
+    }
+
     /**
      * @return String representation of version. i.e. "1.22"
      */
@@ -179,4 +193,5 @@ public String toString() {
     public String asWebPathPart() {
         return "v" + major + "." + minor;
     }
+
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
index 89e27c8ea..6c5103b27 100644
--- a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
@@ -8,24 +8,10 @@
 import com.github.dockerjava.api.model.Frame;
 
 /**
- * Attach to container
- *
- * @param logs
- *            - true or false, includes logs. Defaults to false.
- *
- * @param followStream
- *            - true or false, return stream. Defaults to false.
- * @param stdout
- *            - true or false, includes stdout log. Defaults to false.
- * @param stderr
- *            - true or false, includes stderr log. Defaults to false.
- * @param stdin
- *            - null or {@link InputStream}, pass stream to stdin of the container.
- * @param timestamps
- *            - true or false, if true, print timestamps for every log line. Defaults to false.
+ * Attach to container.
  */
-public class AttachContainerCmdImpl extends AbstrAsyncDockerCmd<AttachContainerCmd, Frame> implements
-        AttachContainerCmd {
+public class AttachContainerCmdImpl extends AbstrAsyncDockerCmd<AttachContainerCmd, Frame>
+        implements AttachContainerCmd {
 
     private String containerId;
 
diff --git a/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java b/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java
index 770b136c9..1bdb5aa7a 100644
--- a/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java
+++ b/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java
@@ -7,9 +7,9 @@
 import com.github.dockerjava.api.model.ResponseItem;
 import com.google.common.reflect.ClassPath.ClassInfo;
 import org.apache.commons.lang.reflect.FieldUtils;
+import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.io.Serializable;
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
index 51e8bd1dc..927d4977d 100644
--- a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
+++ b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
@@ -17,13 +17,12 @@
 
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.model.Event;
 import com.github.dockerjava.core.RemoteApiVersion;
-import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
-import java.io.IOException;
+import org.junit.Test;
 
-import org.testng.annotations.Test;
+import java.io.IOException;
 
+import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
 import static com.github.dockerjava.test.serdes.JSONTestHelper.testRoundTrip;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
@@ -31,9 +30,9 @@
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.core.IsNot.not;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Tests for {@link InspectContainerResponse}.
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java
index cb9264d9f..7290f121b 100644
--- a/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java
+++ b/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.core.RemoteApiVersion;
-import org.testng.annotations.Test;
+import org.junit.Test;
 
 import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
index 4c604e6a0..ca17ec58a 100644
--- a/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
+++ b/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.model.ContainerConfig;
-import org.testng.annotations.Test;
+import org.junit.Test;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -191,7 +191,7 @@ public void serder1_22_inspect_doc() throws IOException {
     }
 
     @Test
-    private void testOverlayNetworkRootDir() throws IOException {
+    public void testOverlayNetworkRootDir() throws IOException {
         final ObjectMapper mapper = new ObjectMapper();
         final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class);
 
diff --git a/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java b/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java
index bdbc2e225..9d08843dc 100644
--- a/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java
@@ -1,12 +1,18 @@
 package com.github.dockerjava.api.model;
 
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
 import static com.github.dockerjava.api.model.AccessMode.rw;
-import static org.testng.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 
-import org.testng.annotations.Test;
 
 public class AccessModeTest {
 
+    @Rule
+    public ExpectedException expectedEx = ExpectedException.none();
+
     @Test
     public void defaultAccessMode() {
         assertEquals(AccessMode.DEFAULT, rw);
@@ -22,8 +28,11 @@ public void fromString() {
         assertEquals(AccessMode.valueOf("rw"), rw);
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "No enum const.*")
+    @Test
     public void fromIllegalString() {
+        expectedEx.expect(IllegalArgumentException.class);
+        expectedEx.expectMessage("No enum const");
+
         AccessMode.valueOf("xx");
     }
 
diff --git a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
index db1553e33..351086d19 100644
--- a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.core.RemoteApiVersion;
-import org.testng.annotations.Test;
+import org.junit.Test;
 
 import java.io.IOException;
 
@@ -12,7 +12,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.testng.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 public class AuthConfigTest {
 
diff --git a/src/test/java/com/github/dockerjava/api/model/BindTest.java b/src/test/java/com/github/dockerjava/api/model/BindTest.java
index 2e6fd8353..3343bf6bd 100644
--- a/src/test/java/com/github/dockerjava/api/model/BindTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/BindTest.java
@@ -1,15 +1,20 @@
 package com.github.dockerjava.api.model;
 
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
 import static com.github.dockerjava.api.model.AccessMode.ro;
 import static com.github.dockerjava.api.model.AccessMode.rw;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.core.Is.is;
 
-import org.testng.annotations.Test;
-
 public class BindTest {
 
+    @Rule
+    public ExpectedException expectedEx = ExpectedException.none();
+
     @Test
     public void parseUsingDefaultAccessMode() {
         Bind bind = Bind.parse("/host:/container");
@@ -128,18 +133,27 @@ public void parseReadOnlySEL() {
         assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Bind.*")
+    @Test
     public void parseInvalidAccessMode() {
+        expectedEx.expect(IllegalArgumentException.class);
+        expectedEx.expectMessage( "Error parsing Bind");
+
         Bind.parse("/host:/container:xx");
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Bind 'nonsense'")
+    @Test
     public void parseInvalidInput() {
+        expectedEx.expect(IllegalArgumentException.class);
+        expectedEx.expectMessage("Error parsing Bind 'nonsense'");
+
         Bind.parse("nonsense");
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Bind 'null'")
+    @Test
     public void parseNull() {
+        expectedEx.expect(IllegalArgumentException.class);
+        expectedEx.expectMessage("Error parsing Bind 'null'");
+
         Bind.parse(null);
     }
 
diff --git a/src/test/java/com/github/dockerjava/api/model/BindingTest.java b/src/test/java/com/github/dockerjava/api/model/BindingTest.java
index 3b5ea2f6a..1d7458d85 100644
--- a/src/test/java/com/github/dockerjava/api/model/BindingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/BindingTest.java
@@ -1,13 +1,19 @@
 package com.github.dockerjava.api.model;
 
-import static org.testng.Assert.assertEquals;
+import com.github.dockerjava.api.model.Ports.Binding;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
-import org.testng.annotations.Test;
+import static org.junit.Assert.assertEquals;
 
-import com.github.dockerjava.api.model.Ports.Binding;
 
 public class BindingTest {
 
+    @Rule
+    public ExpectedException expectedEx = ExpectedException.none();
+
     @Test
     public void parseIpAndPort() {
         assertEquals(Binding.parse("127.0.0.1:80"), Binding.bindIpAndPort("127.0.0.1", 80));
@@ -29,13 +35,20 @@ public void parseEmptyString() {
     }
 
     // Strings can be used since it can be a range. Let the docker daemon do the validation.
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Binding 'nonsense'", enabled = false)
+    @Test
+    @Ignore
     public void parseInvalidInput() {
+        expectedEx.expect(IllegalArgumentException.class);
+        expectedEx.expectMessage("Error parsing Binding 'nonsense'");
+
         Binding.parse("nonsense");
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Binding 'null'")
+    @Test
     public void parseNull() {
+        expectedEx.expect(IllegalArgumentException.class);
+        expectedEx.expectMessage("Error parsing Binding 'null'");
+
         Binding.parse(null);
     }
 
diff --git a/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java b/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
index e45ad2e8e..7e1afdf17 100644
--- a/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
@@ -1,11 +1,10 @@
 package com.github.dockerjava.api.model;
 
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
 
 public class CapabilityTest {
     private final ObjectMapper objectMapper = new ObjectMapper();
@@ -22,7 +21,7 @@ public void deserializeCapability() throws Exception {
         assertEquals(capability, Capability.ALL);
     }
 
-    @Test(expectedExceptions = JsonMappingException.class)
+    @Test(expected = JsonMappingException.class)
     public void deserializeInvalidCapability() throws Exception {
         objectMapper.readValue("\"nonsense\"", Capability.class);
     }
diff --git a/src/test/java/com/github/dockerjava/api/model/ContainerTest.java b/src/test/java/com/github/dockerjava/api/model/ContainerTest.java
index a143e6c57..97b19bd01 100644
--- a/src/test/java/com/github/dockerjava/api/model/ContainerTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/ContainerTest.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.CollectionType;
 import com.github.dockerjava.core.RemoteApiVersion;
-import org.testng.annotations.Test;
+import org.junit.Test;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/src/test/java/com/github/dockerjava/api/model/DeviceTest.java b/src/test/java/com/github/dockerjava/api/model/DeviceTest.java
index 5c48c4886..776c9c98c 100644
--- a/src/test/java/com/github/dockerjava/api/model/DeviceTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/DeviceTest.java
@@ -1,10 +1,8 @@
 package com.github.dockerjava.api.model;
 
-import org.testng.annotations.Test;
+import org.junit.Test;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -12,10 +10,8 @@
 
 import static junit.framework.Assert.fail;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
 
 /**
  * @author Kanstantsin Shautsou
diff --git a/src/test/java/com/github/dockerjava/api/model/EventsTest.java b/src/test/java/com/github/dockerjava/api/model/EventsTest.java
index ce62c7d5f..c517b80a9 100644
--- a/src/test/java/com/github/dockerjava/api/model/EventsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/EventsTest.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.core.RemoteApiVersion;
-import org.testng.annotations.Test;
+import org.junit.Test;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java b/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java
index 086613045..20999a92f 100644
--- a/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java
@@ -1,13 +1,18 @@
 package com.github.dockerjava.api.model;
 
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
 import static com.github.dockerjava.api.model.InternetProtocol.DEFAULT;
 import static com.github.dockerjava.api.model.InternetProtocol.TCP;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
+import static org.junit.Assert.assertEquals;
 
 public class ExposedPortTest {
 
+    @Rule
+    public ExpectedException expectedEx = ExpectedException.none();
+
     @Test
     public void parsePortAndProtocol() {
         ExposedPort exposedPort = ExposedPort.parse("80/tcp");
@@ -20,13 +25,19 @@ public void parsePortOnly() {
         assertEquals(exposedPort, new ExposedPort(80, DEFAULT));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing ExposedPort 'nonsense'")
+    @Test
     public void parseInvalidInput() {
+        expectedEx.expect(IllegalArgumentException.class);
+        expectedEx.expectMessage("Error parsing ExposedPort 'nonsense'");
+
         ExposedPort.parse("nonsense");
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing ExposedPort 'null'")
+    @Test
     public void parseNull() {
+        expectedEx.expect(IllegalArgumentException.class);
+        expectedEx.expectMessage("Error parsing ExposedPort 'null'");
+
         ExposedPort.parse(null);
     }
 
diff --git a/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java b/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
index eb458ab4c..c39706e51 100644
--- a/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
@@ -1,10 +1,10 @@
 package com.github.dockerjava.api.model;
 
 
-import org.testng.annotations.Test;
+import org.junit.Test;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.AssertJUnit.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class IdentifierTest {
 
diff --git a/src/test/java/com/github/dockerjava/api/model/InfoTest.java b/src/test/java/com/github/dockerjava/api/model/InfoTest.java
index 806870ae6..372abf52f 100644
--- a/src/test/java/com/github/dockerjava/api/model/InfoTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/InfoTest.java
@@ -4,7 +4,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.model.InfoRegistryConfig.IndexConfig;
 import org.hamcrest.CoreMatchers;
-import org.testng.annotations.Test;
+import org.junit.Test;
 
 import java.io.IOException;
 import java.util.Collections;
diff --git a/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java b/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java
index e3e8ce17a..5efb8d2c3 100644
--- a/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java
@@ -1,11 +1,15 @@
 package com.github.dockerjava.api.model;
 
-import static com.github.dockerjava.api.model.InternetProtocol.TCP;
-import static org.testng.Assert.assertEquals;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
-import org.testng.annotations.Test;
+import static com.github.dockerjava.api.model.InternetProtocol.TCP;
+import static org.junit.Assert.assertEquals;
 
 public class InternetProtocolTest {
+    @Rule
+    public ExpectedException expectedEx = ExpectedException.none();
 
     @Test
     public void defaultProtocol() {
@@ -27,13 +31,19 @@ public void parseLowerCase() {
         assertEquals(InternetProtocol.parse("tcp"), TCP);
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Protocol.*")
+    @Test
     public void parseInvalidInput() {
+        expectedEx.expect(IllegalArgumentException.class);
+        expectedEx.expectMessage("Error parsing Protocol 'xx'");
+
         InternetProtocol.parse("xx");
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Protocol 'null'")
+    @Test
     public void parseNull() {
+        expectedEx.expect(IllegalArgumentException.class);
+        expectedEx.expectMessage("Error parsing Protocol 'null'");
+
         InternetProtocol.parse(null);
     }
 
diff --git a/src/test/java/com/github/dockerjava/api/model/LinkTest.java b/src/test/java/com/github/dockerjava/api/model/LinkTest.java
index 208e9f363..18363a9ee 100644
--- a/src/test/java/com/github/dockerjava/api/model/LinkTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/LinkTest.java
@@ -1,11 +1,16 @@
 package com.github.dockerjava.api.model;
 
-import static org.testng.Assert.assertEquals;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
-import org.testng.annotations.Test;
+import static org.junit.Assert.assertEquals;
 
 public class LinkTest {
 
+    @Rule
+    public ExpectedException expectedEx = ExpectedException.none();
+
     @Test
     public void parse() {
         Link link = Link.parse("name:alias");
@@ -20,13 +25,19 @@ public void parseWithContainerNames() {
         assertEquals(link.getAlias(), "alias");
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Link 'nonsense'")
+    @Test
     public void parseInvalidInput() {
+        expectedEx.expect(IllegalArgumentException.class);
+        expectedEx.expectMessage("Error parsing Link 'nonsense'");
+
         Link.parse("nonsense");
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing Link 'null'")
+    @Test
     public void parseNull() {
+        expectedEx.expect(IllegalArgumentException.class);
+        expectedEx.expectMessage("Error parsing Link 'null'");
+
         Link.parse(null);
     }
 
diff --git a/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java b/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
index 7603c3f1b..3849a6094 100644
--- a/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
@@ -1,15 +1,20 @@
 package com.github.dockerjava.api.model;
 
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
 import com.github.dockerjava.api.model.Ports.Binding;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import static org.junit.Assert.assertEquals;
 
 public class PortBindingTest {
 
     private static final ExposedPort TCP_8080 = ExposedPort.tcp(8080);
 
+    @Rule
+    public ExpectedException expectedEx = ExpectedException.none();
+
     @Test
     public void fullDefinition() {
         assertEquals(PortBinding.parse("127.0.0.1:80:8080/tcp"),
@@ -41,13 +46,20 @@ public void dynamicHostPort() {
         assertEquals(PortBinding.parse("127.0.0.1::8080"), new PortBinding(Binding.bindIp("127.0.0.1"), TCP_8080));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing PortBinding 'nonsense'", enabled = false)
+    @Test
+    @Ignore
     public void parseInvalidInput() {
+        expectedEx.expect(IllegalArgumentException.class);
+        expectedEx.expectMessage("Error parsing PortBinding 'nonsense'");
+
         PortBinding.parse("nonsense");
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing PortBinding 'null'")
+    @Test
     public void parseNull() {
+        expectedEx.expect(IllegalArgumentException.class);
+        expectedEx.expectMessage("Error parsing PortBinding 'null'");
+
         PortBinding.parse(null);
     }
 
diff --git a/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java b/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java
similarity index 91%
rename from src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
rename to src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java
index 26e815f3b..a5a4228e4 100644
--- a/src/test/java/com/github/dockerjava/api/model/Ports_addBindingsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java
@@ -1,18 +1,18 @@
 package com.github.dockerjava.api.model;
 
 import com.github.dockerjava.api.model.Ports.Binding;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.util.Map;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 /**
  * As there may be several {@link Binding}s per {@link ExposedPort}, it makes a difference if you add {@link PortBinding}s for the same or
  * different {@link ExposedPort}s to {@link Ports}. This test verifies that the Map in {@link Ports} is populated correctly in both cases.
  */
-public class Ports_addBindingsTest {
+public class PortsAddBindingsTest {
     private static final ExposedPort TCP_80 = ExposedPort.tcp(80);
 
     private static final ExposedPort TCP_90 = ExposedPort.tcp(90);
@@ -23,7 +23,7 @@ public class Ports_addBindingsTest {
 
     private Ports ports;
 
-    @BeforeMethod
+    @Before
     public void setup() {
         ports = new Ports();
     }
diff --git a/src/test/java/com/github/dockerjava/api/model/Ports_SerializingTest.java b/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java
similarity index 94%
rename from src/test/java/com/github/dockerjava/api/model/Ports_SerializingTest.java
rename to src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java
index fb89561e5..242b389c3 100644
--- a/src/test/java/com/github/dockerjava/api/model/Ports_SerializingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java
@@ -2,13 +2,13 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.model.Ports.Binding;
-import org.testng.annotations.Test;
+import org.junit.Test;
 
 import java.util.Map;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 
-public class Ports_SerializingTest {
+public class PortsSerializingTest {
     private final ObjectMapper objectMapper = new ObjectMapper();
 
     private final String jsonWithDoubleBindingForOnePort = "{\"80/tcp\":[{\"HostIp\":\"10.0.0.1\",\"HostPort\":\"80\"},{\"HostIp\":\"10.0.0.2\",\"HostPort\":\"80\"}]}";
diff --git a/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java b/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java
index 1850d5c42..486badd55 100644
--- a/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java
@@ -15,13 +15,13 @@
  */
 package com.github.dockerjava.api.model;
 
-import static com.github.dockerjava.test.serdes.JSONTestHelper.testRoundTrip;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
+import org.junit.Test;
 
 import java.io.IOException;
 
-import org.testng.annotations.Test;
+import static com.github.dockerjava.test.serdes.JSONTestHelper.testRoundTrip;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Tests logic of PullResponseItem's error/success handling by simulating a JSON response.
diff --git a/src/test/java/com/github/dockerjava/api/model/RepositoryTest.java b/src/test/java/com/github/dockerjava/api/model/RepositoryTest.java
index c78b61a85..835eefee7 100644
--- a/src/test/java/com/github/dockerjava/api/model/RepositoryTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/RepositoryTest.java
@@ -1,8 +1,11 @@
 package com.github.dockerjava.api.model;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
-public class RepositoryTest extends TestCase {
+import static org.junit.Assert.assertEquals;
+
+public class RepositoryTest {
+    @Test
     public void testRepository() throws Exception {
 
         Repository repo = new Repository("10.0.0.1/jim");
diff --git a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_ParsingTest.java b/src/test/java/com/github/dockerjava/api/model/RestartPolicyParsingTest.java
similarity index 65%
rename from src/test/java/com/github/dockerjava/api/model/RestartPolicy_ParsingTest.java
rename to src/test/java/com/github/dockerjava/api/model/RestartPolicyParsingTest.java
index 85740be61..fb79c0ca9 100644
--- a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_ParsingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/RestartPolicyParsingTest.java
@@ -1,10 +1,16 @@
 package com.github.dockerjava.api.model;
 
-import static org.testng.Assert.assertEquals;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
-import org.testng.annotations.Test;
+import static org.junit.Assert.assertEquals;
+
+public class RestartPolicyParsingTest {
+
+    @Rule
+    public ExpectedException expectedEx = ExpectedException.none();
 
-public class RestartPolicy_ParsingTest {
 
     @Test
     public void noRestart() throws Exception {
@@ -31,13 +37,19 @@ public void onFailureRestartWithCount() throws Exception {
         assertEquals(RestartPolicy.parse("on-failure:2"), RestartPolicy.onFailureRestart(2));
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing RestartPolicy 'nonsense'")
+    @Test
     public void illegalSyntax() throws Exception {
+        expectedEx.expect(IllegalArgumentException.class);
+        expectedEx.expectMessage("Error parsing RestartPolicy 'nonsense'");
+
         RestartPolicy.parse("nonsense");
     }
 
-    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Error parsing RestartPolicy 'on-failure:X'")
+    @Test
     public void illegalRetryCount() throws Exception {
+        expectedEx.expect(IllegalArgumentException.class);
+        expectedEx.expectMessage("Error parsing RestartPolicy 'on-failure:X'");
+
         RestartPolicy.parse("on-failure:X");
     }
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_SerializingTest.java b/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java
similarity index 92%
rename from src/test/java/com/github/dockerjava/api/model/RestartPolicy_SerializingTest.java
rename to src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java
index 06debb34f..9ac888478 100644
--- a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_SerializingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java
@@ -1,16 +1,15 @@
 package com.github.dockerjava.api.model;
 
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  * Compares serialization results of various {@link RestartPolicy}s with what Docker (as of 1.3.3) actually sends when executing
  * <code>docker run --restart xxx</code>.
  */
-public class RestartPolicy_SerializingTest {
+public class RestartPolicySerializingTest {
     private final ObjectMapper objectMapper = new ObjectMapper();
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/api/model/RestartPolicyToStringTest.java b/src/test/java/com/github/dockerjava/api/model/RestartPolicyToStringTest.java
new file mode 100644
index 000000000..4d9fa8cbc
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/api/model/RestartPolicyToStringTest.java
@@ -0,0 +1,25 @@
+package com.github.dockerjava.api.model;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(Parameterized.class)
+public class RestartPolicyToStringTest {
+
+    @Parameterized.Parameters(name = "{0}")
+    public static Object[][] restartPolicies() {
+        return new Object[][] { {"no"}, {"always"}, {"unless-stopped"}, {"on-failure"}, {"on-failure:2"}};
+    }
+
+    @Parameterized.Parameter
+    public String policy;
+
+    @Test
+    public void serializationWithoutCount() throws Exception {
+        assertEquals(RestartPolicy.parse(policy).toString(), policy);
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java b/src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java
deleted file mode 100644
index 611343736..000000000
--- a/src/test/java/com/github/dockerjava/api/model/RestartPolicy_toStringTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.github.dockerjava.api.model;
-
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-public class RestartPolicy_toStringTest {
-
-    @DataProvider(name = "input")
-    public Object[][] restartPolicies() {
-        return new Object[][] { {"no"}, {"always"}, {"unless-stopped"}, {"on-failure"}, {"on-failure:2"}};
-    }
-
-    @Test(dataProvider = "input")
-    public void serializationWithoutCount(String policy) throws Exception {
-        assertEquals(RestartPolicy.parse(policy).toString(), policy);
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/api/model/VersionTest.java b/src/test/java/com/github/dockerjava/api/model/VersionTest.java
index c32d93069..a2da244c5 100644
--- a/src/test/java/com/github/dockerjava/api/model/VersionTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/VersionTest.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.core.RemoteApiVersion;
-import org.testng.annotations.Test;
+import org.junit.Test;
 
 import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
 import static org.hamcrest.CoreMatchers.is;
diff --git a/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java b/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
index 7d35c25a3..067542c5c 100644
--- a/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
@@ -1,13 +1,12 @@
 package com.github.dockerjava.api.model;
 
-import static org.testng.Assert.assertEquals;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
 
 import java.io.IOException;
 
-import org.testng.annotations.Test;
-
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import static org.junit.Assert.assertEquals;
 
 public class VolumeBindsTest {
     @Test
@@ -21,7 +20,7 @@ public void t() throws IOException {
         assertEquals(binds[0].getContainerPath(), "/data");
     }
 
-    @Test(expectedExceptions = JsonMappingException.class)
+    @Test(expected = JsonMappingException.class)
     public void t1() throws IOException {
         String s = "{\"/data\": {} }";
         ObjectMapper objectMapper = new ObjectMapper();
diff --git a/src/test/java/com/github/dockerjava/api/model/VolumeFrom_SerializingTest.java b/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java
similarity index 84%
rename from src/test/java/com/github/dockerjava/api/model/VolumeFrom_SerializingTest.java
rename to src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java
index 55c7088c4..143ecaaca 100644
--- a/src/test/java/com/github/dockerjava/api/model/VolumeFrom_SerializingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java
@@ -1,12 +1,11 @@
 package com.github.dockerjava.api.model;
 
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
 
-public class VolumeFrom_SerializingTest {
+public class VolumeFromSerializingTest {
     private final ObjectMapper objectMapper = new ObjectMapper();
 
     private final String json = "\"container1:ro\"";
diff --git a/src/test/java/com/github/dockerjava/api/model/VolumeTest.java b/src/test/java/com/github/dockerjava/api/model/VolumeTest.java
index 5b8311425..cb1c4befd 100644
--- a/src/test/java/com/github/dockerjava/api/model/VolumeTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/VolumeTest.java
@@ -1,8 +1,8 @@
 package com.github.dockerjava.api.model;
 
-import static org.testng.Assert.assertEquals;
+import org.junit.Test;
 
-import org.testng.annotations.Test;
+import static org.junit.Assert.assertEquals;
 
 public class VolumeTest {
     @Test
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
deleted file mode 100644
index 8d7f896ad..000000000
--- a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
+++ /dev/null
@@ -1,275 +0,0 @@
-package com.github.dockerjava.client;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.lang.reflect.Method;
-import java.net.DatagramSocket;
-import java.net.ServerSocket;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.LineIterator;
-import org.apache.commons.lang.StringUtils;
-import org.hamcrest.FeatureMatcher;
-import org.hamcrest.Matcher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.ITestResult;
-
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse.Mount;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.api.model.Volume;
-import com.github.dockerjava.core.DockerClientBuilder;
-import com.github.dockerjava.core.DefaultDockerClientConfig;
-import com.github.dockerjava.core.TestDockerCmdExecFactory;
-import com.github.dockerjava.core.command.BuildImageResultCallback;
-import com.github.dockerjava.core.command.LogContainerResultCallback;
-import com.github.dockerjava.core.command.PullImageResultCallback;
-
-public abstract class AbstractDockerClientTest extends Assert {
-
-    public static final Logger LOG = LoggerFactory.getLogger(AbstractDockerClientTest.class);
-
-    protected DockerClient dockerClient;
-
-    protected TestDockerCmdExecFactory dockerCmdExecFactory = initTestDockerCmdExecFactory();
-
-    protected TestDockerCmdExecFactory initTestDockerCmdExecFactory() {
-        return new TestDockerCmdExecFactory(
-                DockerClientBuilder.getDefaultDockerCmdExecFactory());
-    }
-
-    public void beforeTest() throws Exception {
-
-        LOG.info("======================= BEFORETEST =======================");
-        LOG.info("Connecting to Docker server");
-        dockerClient = DockerClientBuilder.getInstance(config())
-                .withDockerCmdExecFactory(dockerCmdExecFactory)
-                .build();
-
-        try {
-            dockerClient.inspectImageCmd("busybox").exec();
-        } catch (NotFoundException e) {
-            LOG.info("Pulling image 'busybox'");
-            // need to block until image is pulled completely
-            dockerClient.pullImageCmd("busybox").withTag("latest").exec(new PullImageResultCallback()).awaitSuccess();
-        }
-
-        assertNotNull(dockerClient);
-        LOG.info("======================= END OF BEFORETEST =======================\n\n");
-    }
-
-    private DefaultDockerClientConfig config() {
-        return config(null);
-    }
-
-    protected DefaultDockerClientConfig config(String password) {
-        DefaultDockerClientConfig.Builder builder = DefaultDockerClientConfig.createDefaultConfigBuilder()
-                .withRegistryUrl("https://index.docker.io/v1/");
-        if (password != null) {
-            builder = builder.withRegistryPassword(password);
-        }
-
-        return builder.build();
-    }
-
-    public void afterTest() {
-        LOG.debug("======================= END OF AFTERTEST =======================");
-    }
-
-    public void beforeMethod(Method method) {
-        LOG.debug(String.format("################################## STARTING %s ##################################",
-                method.getName()));
-    }
-
-    public void afterMethod(ITestResult result) {
-
-        for (String container : dockerCmdExecFactory.getContainerNames()) {
-            LOG.info("Cleaning up temporary container {}", container);
-
-            try {
-                dockerClient.removeContainerCmd(container).withForce(true).exec();
-            } catch (DockerException ignore) {
-                // ignore.printStackTrace();
-            }
-        }
-
-        for (String image : dockerCmdExecFactory.getImageNames()) {
-            LOG.info("Cleaning up temporary image with {}", image);
-            try {
-                dockerClient.removeImageCmd(image).withForce(true).exec();
-            } catch (DockerException ignore) {
-                // ignore.printStackTrace();
-            }
-        }
-
-        for (String volume : dockerCmdExecFactory.getVolumeNames()) {
-            LOG.info("Cleaning up temporary volume with {}", volume);
-            try {
-                dockerClient.removeVolumeCmd(volume).exec();
-            } catch (DockerException ignore) {
-                // ignore.printStackTrace();
-            }
-        }
-
-        for (String networkId : dockerCmdExecFactory.getNetworkIds()) {
-            LOG.info("Cleaning up temporary network with {}", networkId);
-            try {
-                dockerClient.removeNetworkCmd(networkId).exec();
-            } catch (DockerException ignore) {
-                // ignore.printStackTrace();
-            }
-        }
-
-        LOG.info("################################## END OF {} ##################################\n", result.getName());
-    }
-
-    protected String asString(InputStream response) {
-        return consumeAsString(response);
-    }
-
-    public static String consumeAsString(InputStream response) {
-
-        StringWriter logwriter = new StringWriter();
-
-        try {
-            LineIterator itr = IOUtils.lineIterator(response, "UTF-8");
-
-            while (itr.hasNext()) {
-                String line = itr.next();
-                logwriter.write(line + (itr.hasNext() ? "\n" : ""));
-                LOG.info("line: " + line);
-            }
-            response.close();
-
-            return logwriter.toString();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        } finally {
-            IOUtils.closeQuietly(response);
-        }
-    }
-
-    // UTIL
-
-    /**
-     * Checks to see if a specific port is available.
-     *
-     * @param port
-     *            the port to check for availability
-     */
-    public static Boolean available(int port) {
-        if (port < 1100 || port > 60000) {
-            throw new IllegalArgumentException("Invalid start port: " + port);
-        }
-
-        ServerSocket ss = null;
-        DatagramSocket ds = null;
-        try {
-            ss = new ServerSocket(port);
-            ss.setReuseAddress(true);
-            ds = new DatagramSocket(port);
-            ds.setReuseAddress(true);
-            return true;
-        } catch (IOException ignored) {
-        } finally {
-            if (ds != null) {
-                ds.close();
-            }
-
-            if (ss != null) {
-                try {
-                    ss.close();
-                } catch (IOException e) {
-                    /* should not be thrown */
-                }
-            }
-        }
-
-        return false;
-    }
-
-    protected MountedVolumes mountedVolumes(Matcher<? super List<Volume>> subMatcher) {
-        return new MountedVolumes(subMatcher, "Mounted volumes", "mountedVolumes");
-    }
-
-    private static class MountedVolumes extends FeatureMatcher<InspectContainerResponse, List<Volume>> {
-        public MountedVolumes(Matcher<? super List<Volume>> subMatcher, String featureDescription, String featureName) {
-            super(subMatcher, featureDescription, featureName);
-        }
-
-        @Override
-        public List<Volume> featureValueOf(InspectContainerResponse item) {
-            List<Volume> volumes = new ArrayList<Volume>();
-            for (Mount mount : item.getMounts()) {
-                volumes.add(mount.getDestination());
-            }
-            return volumes;
-        }
-    }
-
-    protected String containerLog(String containerId) throws Exception {
-        return dockerClient.logContainerCmd(containerId).withStdOut(true).exec(new LogContainerTestCallback())
-                .awaitCompletion().toString();
-    }
-
-    public static class LogContainerTestCallback extends LogContainerResultCallback {
-        protected final StringBuffer log = new StringBuffer();
-
-        List<Frame> collectedFrames = new ArrayList<Frame>();
-
-        boolean collectFrames = false;
-
-        public LogContainerTestCallback() {
-            this(false);
-        }
-
-        public LogContainerTestCallback(boolean collectFrames) {
-            this.collectFrames = collectFrames;
-        }
-
-        @Override
-        public void onNext(Frame frame) {
-            if(collectFrames) collectedFrames.add(frame);
-            log.append(new String(frame.getPayload()));
-        }
-
-        @Override
-        public String toString() {
-            return log.toString();
-        }
-
-
-        public List<Frame> getCollectedFrames() {
-            return collectedFrames;
-        }
-    }
-
-    protected String buildImage(File baseDir) throws Exception {
-
-        return dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback())
-                .awaitImageId();
-    }
-
-    protected Network findNetwork(List<Network> networks, String name) {
-
-        for (Network network : networks) {
-            if (StringUtils.equals(network.getName(), name)) {
-                return network;
-            }
-        }
-
-        fail("No network found.");
-        return null;
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/client/DockerClientTest.java b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
deleted file mode 100644
index b124fdc9a..000000000
--- a/src/test/java/com/github/dockerjava/client/DockerClientTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.github.dockerjava.client;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-
-import java.lang.reflect.Method;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.core.command.WaitContainerResultCallback;
-
-/**
- * Unit test for DockerClient.
- *
- * @author Konstantin Pelykh (kpelykh@gmail.com)
- */
-@Test(groups = "integration")
-public class DockerClientTest extends AbstractDockerClientTest {
-    public static final Logger LOG = LoggerFactory.getLogger(DockerClientTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void testRunShlex() throws DockerException {
-
-        String[] commands = new String[] {
-                "true",
-                "echo \"The Young Descendant of Tepes & Septette for the Dead Princess\"",
-                "echo -n 'The Young Descendant of Tepes & Septette for the Dead Princess'",
-                "/bin/sh -c echo Hello World", "/bin/sh -c echo 'Hello World'", "echo 'Night of Nights'",
-                "true && echo 'Night of Nights'"
-        };
-
-        for (String command : commands) {
-            LOG.info("Running command: [{}]", command);
-
-            CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                    .withCmd(command)
-                    .exec();
-            dockerClient.startContainerCmd(container.getId());
-
-            int exitcode = dockerClient.waitContainerCmd(container.getId())
-                    .exec(new WaitContainerResultCallback())
-                    .awaitStatusCode();
-
-            assertThat(exitcode, equalTo(0));
-        }
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
similarity index 56%
rename from src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
rename to src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
index 66219dc72..9a4dd0455 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/AttachContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
@@ -1,90 +1,104 @@
-package com.github.dockerjava.netty.exec;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-import java.io.File;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.lang.reflect.Method;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+package com.github.dockerjava.cmd;
 
+import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.StreamType;
 import com.github.dockerjava.core.command.AttachContainerResultCallback;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-@Test(groups = "integration")
-public class AttachContainerCmdExecTest extends AbstractNettyDockerClientTest {
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.util.concurrent.TimeUnit;
 
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
+import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeThat;
 
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
+/**
+ * @author Kanstantsin Shautsou
+ */
+public class AttachContainerCmdIT extends CmdIT {
+    private static final Logger LOG = LoggerFactory.getLogger(AttachContainerCmdIT.class);
 
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
 
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
+    @Rule
+    public ExpectedException expectedException = ExpectedException.none();
 
     @Test
-    public void attachContainerWithoutTTY() throws Exception {
+    public void attachContainerWithStdin() throws Exception {
+        DockerClient dockerClient = dockerRule.getClient();
+
+        assumeThat(getFactoryType(), is(FactoryType.NETTY));
 
         String snippet = "hello world";
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("echo", snippet)
-                .withTty(false).exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+                .withCmd("/bin/sh", "-c", "sleep 1 && read line && echo $line")
+                .withTty(false)
+                .withStdinOpen(true)
+                .exec();
 
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
+        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getState().getRunning(), is(true));
+
         AttachContainerTestCallback callback = new AttachContainerTestCallback() {
             @Override
             public void onNext(Frame frame) {
                 assertEquals(frame.getStreamType(), StreamType.STDOUT);
                 super.onNext(frame);
-            };
+            }
         };
 
-        dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
-                .withLogs(true).exec(callback).awaitCompletion(10, SECONDS);
+        PipedOutputStream out = new PipedOutputStream();
+        PipedInputStream in = new PipedInputStream(out);
+
+        dockerClient.attachContainerCmd(container.getId())
+                .withStdErr(true)
+                .withStdOut(true)
+                .withFollowStream(true)
+                .withStdIn(in)
+                .exec(callback);
+
+        out.write((snippet + "\n").getBytes());
+        out.flush();
+
+        callback.awaitCompletion(15, SECONDS);
         callback.close();
 
         assertThat(callback.toString(), containsString(snippet));
     }
 
     @Test
-    public void attachContainerWithStdin() throws Exception {
+    public void attachContainerWithoutTTY() throws Exception {
+        DockerClient dockerClient = dockerRule.getClient();
 
         String snippet = "hello world";
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withCmd("/bin/sh", "-c", "sleep 1 && read line && echo $line")
+        CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE)
+                .withCmd("echo", snippet)
                 .withTty(false)
-                .withStdinOpen(true)
                 .exec();
 
         LOG.info("Created container: {}", container.toString());
@@ -92,32 +106,21 @@ public void attachContainerWithStdin() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertTrue(inspectContainerResponse.getState().getRunning());
-
         AttachContainerTestCallback callback = new AttachContainerTestCallback() {
             @Override
             public void onNext(Frame frame) {
-                assertEquals(frame.getStreamType(), StreamType.STDOUT);
+                assertThat(frame.getStreamType(), equalTo(StreamType.STDOUT));
                 super.onNext(frame);
-            }
+            };
         };
 
-        PipedOutputStream out = new PipedOutputStream();
-        PipedInputStream in = new PipedInputStream(out);
-
         dockerClient.attachContainerCmd(container.getId())
                 .withStdErr(true)
                 .withStdOut(true)
                 .withFollowStream(true)
-                .withStdIn(in)
-                .exec(callback);
-
-        out.write((snippet + "\n").getBytes());
-        out.flush();
-
-        callback.awaitCompletion(15, SECONDS);
+                .withLogs(true)
+                .exec(callback)
+                .awaitCompletion(30, TimeUnit.SECONDS);
         callback.close();
 
         assertThat(callback.toString(), containsString(snippet));
@@ -125,11 +128,12 @@ public void onNext(Frame frame) {
 
     @Test
     public void attachContainerWithTTY() throws Exception {
+        DockerClient dockerClient = dockerRule.getClient();
 
         File baseDir = new File(Thread.currentThread().getContextClassLoader()
                 .getResource("attachContainerTestDockerfile").getFile());
 
-        String imageId = buildImage(baseDir);
+        String imageId = dockerRule.buildImage(baseDir);
 
         CreateContainerResponse container = dockerClient.createContainerCmd(imageId).withTty(true).exec();
 
@@ -141,7 +145,7 @@ public void attachContainerWithTTY() throws Exception {
         AttachContainerTestCallback callback = new AttachContainerTestCallback() {
             @Override
             public void onNext(Frame frame) {
-                assertEquals(frame.getStreamType(), StreamType.RAW);
+                assertThat(frame.getStreamType(), equalTo(StreamType.RAW));
                 super.onNext(frame);
             };
         };
@@ -151,14 +155,56 @@ public void onNext(Frame frame) {
                 .withStdOut(true)
                 .withFollowStream(true)
                 .exec(callback)
-                .awaitCompletion(10, SECONDS);
+                .awaitCompletion(15, TimeUnit.SECONDS);
         callback.close();
 
-        // HexDump.dump(collectFramesCallback.toString().getBytes(), 0, System.out, 0);
+        LOG.debug("log: {}", callback.toString());
 
+        // HexDump.dump(collectFramesCallback.toString().getBytes(), 0, System.out, 0);
         assertThat(callback.toString(), containsString("stdout\r\nstderr"));
     }
 
+    @Test
+    public void attachContainerStdinUnsupported() throws Exception {
+
+        DockerClient dockerClient = dockerRule.getClient();
+        if (getFactoryType() == FactoryType.JERSEY) {
+            expectedException.expect(UnsupportedOperationException.class);
+        }
+
+        String snippet = "hello world";
+
+        CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE)
+                .withCmd("echo", snippet)
+                .withTty(false)
+                .exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        AttachContainerTestCallback callback = new AttachContainerTestCallback() {
+            @Override
+            public void onNext(Frame frame) {
+                assertThat(frame.getStreamType(), equalTo(StreamType.STDOUT));
+                super.onNext(frame);
+            };
+        };
+
+        InputStream stdin = new ByteArrayInputStream("".getBytes());
+
+        dockerClient.attachContainerCmd(container.getId())
+                .withStdErr(true)
+                .withStdOut(true)
+                .withFollowStream(true)
+                .withLogs(true)
+                .withStdIn(stdin)
+                .exec(callback)
+                .awaitCompletion(30, TimeUnit.SECONDS);
+        callback.close();
+    }
+
     public static class AttachContainerTestCallback extends AttachContainerResultCallback {
         private StringBuffer log = new StringBuffer();
 
@@ -168,6 +214,11 @@ public void onNext(Frame item) {
             super.onNext(item);
         }
 
+        @Override
+        public RuntimeException getFirstError() {
+            return super.getFirstError();
+        }
+
         @Override
         public String toString() {
             return log.toString();
diff --git a/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java b/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java
new file mode 100644
index 000000000..bae21acdd
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java
@@ -0,0 +1,47 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.exception.UnauthorizedException;
+import com.github.dockerjava.api.model.AuthResponse;
+import com.github.dockerjava.core.DockerClientBuilder;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
+import static com.github.dockerjava.junit.DockerMatchers.apiVersionGreater;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assume.assumeThat;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+public class AuthCmdIT extends CmdIT {
+
+    @Rule
+    public ExpectedException expectedEx = ExpectedException.none();
+
+    @Test
+    public void testAuth() throws Exception {
+        assumeThat("Fails on 1.22. Temporary disabled.", dockerRule, apiVersionGreater(VERSION_1_22));
+
+        AuthResponse response = dockerRule.getClient().authCmd().exec();
+
+        assertThat(response.getStatus(), is("Login Succeeded"));
+    }
+
+
+
+    @Ignore("Disabled because of 500/InternalServerException")
+    @Test
+    public void testAuthInvalid() throws Exception {
+        expectedEx.expect(UnauthorizedException.class);
+        expectedEx.expectMessage("Wrong login/password, please try again");
+
+        DockerClientBuilder.getInstance(dockerRule.config("garbage"))
+                .build()
+                .authCmd()
+                .exec();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java b/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
similarity index 59%
rename from src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
rename to src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
index b2c3b4b57..09e008c30 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/BuildImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
@@ -1,37 +1,7 @@
-package com.github.dockerjava.netty.exec;
-
-import static com.github.dockerjava.utils.TestUtils.getVersion;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.UUID;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.filefilter.TrueFileFilter;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+package com.github.dockerjava.cmd;
 
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.command.InspectImageResponse;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.AuthConfig;
@@ -39,43 +9,59 @@
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
-import com.github.dockerjava.api.model.Ports.Binding;
-import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.core.command.BuildImageResultCallback;
 import com.github.dockerjava.core.command.PushImageResultCallback;
 import com.github.dockerjava.core.command.WaitContainerResultCallback;
 import com.github.dockerjava.core.util.CompressArchiveUtil;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class BuildImageCmdExecTest extends AbstractNettyDockerClientTest {
+import net.jcip.annotations.NotThreadSafe;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.filefilter.TrueFileFilter;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.UUID;
 
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
+import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_21;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_23;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_27;
+import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
+import static org.apache.commons.io.FileUtils.writeStringToFile;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assume.assumeThat;
 
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
+/**
+ * @author Kanstantsin Shautsou
+ */
+@NotThreadSafe
+public class BuildImageCmdIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(BuildImageCmd.class);
 
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder(new File("target/"));
 
     @Test
     public void author() throws Exception {
 
-        String imageId = buildImage(fileFromBuildTestResource("AUTHOR"));
+        String imageId = dockerRule.buildImage(fileFromBuildTestResource("AUTHOR"));
 
-        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec();
         assertThat(inspectImageResponse, not(nullValue()));
         LOG.info("Image Inspect: {}", inspectImageResponse.toString());
 
@@ -104,8 +90,12 @@ public void buildImageFromTarWithDockerfileNotInBaseDirectory() throws Exception
     public void onBuild() throws Exception {
         File baseDir = fileFromBuildTestResource("ONBUILD/parent");
 
-        dockerClient.buildImageCmd(baseDir).withNoCache(true).withTag("docker-java-onbuild")
-                .exec(new BuildImageResultCallback()).awaitImageId();
+        dockerRule.getClient().buildImageCmd(baseDir)
+                .withNoCache(true)
+                .withTag("docker-java-onbuild")
+                .exec(new BuildImageResultCallback())
+                .awaitImageId();
+
         baseDir = fileFromBuildTestResource("ONBUILD/child");
         String response = dockerfileBuild(baseDir);
         assertThat(response, containsString("Successfully executed testrun.sh"));
@@ -142,56 +132,56 @@ public void addFolder() throws Exception {
 
     private String dockerfileBuild(InputStream tarInputStream, String dockerFilePath) throws Exception {
 
-        return execBuild(dockerClient.buildImageCmd().withTarInputStream(tarInputStream).withDockerfilePath(dockerFilePath));
+        return execBuild(dockerRule.getClient().buildImageCmd().withTarInputStream(tarInputStream).withDockerfilePath(dockerFilePath));
     }
 
     private String dockerfileBuild(InputStream tarInputStream) throws Exception {
 
-        return execBuild(dockerClient.buildImageCmd().withTarInputStream(tarInputStream));
+        return execBuild(dockerRule.getClient().buildImageCmd().withTarInputStream(tarInputStream));
     }
 
     private String dockerfileBuild(File baseDir) throws Exception {
 
-        return execBuild(dockerClient.buildImageCmd(baseDir));
+        return execBuild(dockerRule.getClient().buildImageCmd(baseDir));
     }
 
     private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
         String imageId = buildImageCmd.withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
 
         // Create container based on image
-        CreateContainerResponse container = dockerClient.createContainerCmd(imageId).exec();
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(imageId).exec();
 
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
-        dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
 
-        return containerLog(container.getId());
+        return dockerRule.containerLog(container.getId());
     }
 
-    @Test(expectedExceptions = {DockerClientException.class})
+    @Test(expected = DockerClientException.class)
     public void dockerignoreDockerfileIgnored() throws Exception {
         File baseDir = fileFromBuildTestResource("dockerignore/DockerfileIgnored");
 
-        dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
+        dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
     }
 
     @Test
     public void dockerignoreDockerfileNotIgnored() throws Exception {
         File baseDir = fileFromBuildTestResource("dockerignore/DockerfileNotIgnored");
 
-        dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
+        dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
     }
 
-    @Test(expectedExceptions = {DockerClientException.class})
+    @Test(expected = DockerClientException.class)
     public void dockerignoreInvalidDockerIgnorePattern() throws Exception {
         File baseDir = fileFromBuildTestResource("dockerignore/InvalidDockerignorePattern");
 
-        dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
+        dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
     }
 
-    @Test()
+    @Test
     public void dockerignoreValidDockerIgnorePattern() throws Exception {
         File baseDir = fileFromBuildTestResource("dockerignore/ValidDockerignorePattern");
         String response = dockerfileBuild(baseDir);
@@ -207,27 +197,40 @@ public void env() throws Exception {
 
     @Test
     public void fromPrivateRegistry() throws Exception {
+        int port = getFactoryType() == JERSEY ? 5001 : 5002;
+//        int port = 5050;
+
+        File dockerfile = folder.newFile("Dockerfile");
+        writeStringToFile(dockerfile, String.format("FROM      localhost:%d/testuser/busybox:latest", port));
+
+
+        String containerName = "registryy" + dockerRule.getKind();
+        String imageName = "testregistryy" + dockerRule.getKind();
+        dockerRule.ensureContainerRemoved(containerName);
+        dockerRule.ensureImageRemoved(imageName);
+
         File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("privateRegistry").getFile());
 
-        String imageId = buildImage(baseDir);
+        String imageId = dockerRule.buildImage(baseDir);
 
-        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec();
         assertThat(inspectImageResponse, not(nullValue()));
         LOG.info("Image Inspect: {}", inspectImageResponse.toString());
 
-        dockerClient.tagImageCmd(imageId, "testregistry", "2").withForce().exec();
+        dockerRule.getClient().tagImageCmd(imageId, imageName, "2")
+                .withForce().exec();
 
         // see https://github.com/docker/distribution/blob/master/docs/deploying.md#native-basic-auth
-        CreateContainerResponse testregistry = dockerClient
-                .createContainerCmd("testregistry:2")
-                .withName("registry")
-                .withPortBindings(new PortBinding(Binding.bindPort(5000), ExposedPort.tcp(5000)))
+        CreateContainerResponse testregistry = dockerRule.getClient()
+                .createContainerCmd(imageName + ":2")
+                .withName(containerName)
+                .withPortBindings(new PortBinding(Ports.Binding.bindPort(port), ExposedPort.tcp(5000)))
                 .withEnv("REGISTRY_AUTH=htpasswd", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm",
                         "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "REGISTRY_LOG_LEVEL=debug",
                         "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key")
                 .exec();
 
-        dockerClient.startContainerCmd(testregistry.getId()).exec();
+        dockerRule.getClient().startContainerCmd(testregistry.getId()).exec();
 
         // wait for registry to boot
         Thread.sleep(3000);
@@ -237,39 +240,48 @@ public void fromPrivateRegistry() throws Exception {
                 .withUsername("testuser")
                 .withPassword("testpassword")
                 .withEmail("foo@bar.de")
-                .withRegistryAddress("localhost:5000");
+                .withRegistryAddress("localhost:" + port);
 
-        dockerClient.authCmd().withAuthConfig(authConfig).exec();
-        dockerClient.tagImageCmd("busybox:latest", "localhost:5000/testuser/busybox", "latest").withForce().exec();
+        dockerRule.getClient().authCmd().withAuthConfig(authConfig).exec();
+        dockerRule.getClient().tagImageCmd("busybox:latest", String.format("localhost:%d/testuser/busybox", port), "latest").withForce().exec();
 
-        dockerClient.pushImageCmd("localhost:5000/testuser/busybox").withTag("latest").withAuthConfig(authConfig)
-                .exec(new PushImageResultCallback()).awaitSuccess();
+        dockerRule.getClient().pushImageCmd(String.format("localhost:%d/testuser/busybox", port))
+                .withTag("latest")
+                .withAuthConfig(authConfig)
+                .exec(new PushImageResultCallback())
+                .awaitSuccess();
 
-        dockerClient.removeImageCmd("localhost:5000/testuser/busybox").withForce(true).exec();
+        dockerRule.getClient().removeImageCmd(String.format("localhost:%d/testuser/busybox", port)).withForce(true).exec();
 
-        baseDir = fileFromBuildTestResource("FROM/privateRegistry");
+//        baseDir = fileFromBuildTestResource("FROM/privateRegistry");
+        baseDir = folder.getRoot();
 
         AuthConfigurations authConfigurations = new AuthConfigurations();
         authConfigurations.addConfig(authConfig);
 
-        imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).withBuildAuthConfigs(authConfigurations)
-                .exec(new BuildImageResultCallback()).awaitImageId();
+        imageId = dockerRule.getClient().buildImageCmd(baseDir).
+                withNoCache(true)
+                .withBuildAuthConfigs(authConfigurations)
+                .exec(new BuildImageResultCallback())
+                .awaitImageId();
 
-        inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec();
         assertThat(inspectImageResponse, not(nullValue()));
         LOG.info("Image Inspect: {}", inspectImageResponse.toString());
 
+        dockerRule.ensureContainerRemoved(containerName);
+//        dockerRule.ensureImageRemoved(imageId);
     }
 
     @Test
     public void buildArgs() throws Exception {
         File baseDir = fileFromBuildTestResource("buildArgs");
 
-        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc")
+        String imageId = dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc")
                 .exec(new BuildImageResultCallback())
                 .awaitImageId();
 
-        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec();
         assertThat(inspectImageResponse, not(nullValue()));
         LOG.info("Image Inspect: {}", inspectImageResponse.toString());
 
@@ -278,18 +290,16 @@ public void buildArgs() throws Exception {
 
     @Test
     public void labels() throws Exception {
-        if (!getVersion(dockerClient).isGreaterOrEqual(RemoteApiVersion.VERSION_1_23)) {
-            throw new SkipException("API version should be >= 1.23");
-        }
+        assumeThat("API version should be >= 1.23", dockerRule, isGreaterOrEqual(VERSION_1_23));
 
         File baseDir = fileFromBuildTestResource("labels");
 
-        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true)
+        String imageId = dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true)
                 .withLabels(Collections.singletonMap("test", "abc"))
                 .exec(new BuildImageResultCallback())
                 .awaitImageId();
 
-        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec();
         assertThat(inspectImageResponse, not(nullValue()));
         LOG.info("Image Inspect: {}", inspectImageResponse.toString());
 
@@ -298,19 +308,18 @@ public void labels() throws Exception {
 
     @Test
     public void multipleTags() throws Exception {
-        if (!getVersion(dockerClient).isGreaterOrEqual(RemoteApiVersion.VERSION_1_21)) {
-            throw new SkipException("API version should be >= 1.21");
-        }
+        assumeThat("API version should be >= 1.23", dockerRule, isGreaterOrEqual(VERSION_1_21));
+
 
         File baseDir = fileFromBuildTestResource("labels");
 
-        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true)
+        String imageId = dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true)
                 .withTag("fallback-when-withTags-not-called")
                 .withTags(new HashSet<>(Arrays.asList("docker-java-test:tag1", "docker-java-test:tag2")))
                 .exec(new BuildImageResultCallback())
                 .awaitImageId();
 
-        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
+        InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec();
         assertThat(inspectImageResponse, not(nullValue()));
         LOG.info("Image Inspect: {}", inspectImageResponse.toString());
 
@@ -320,32 +329,32 @@ public void multipleTags() throws Exception {
 
     @Test
     public void cacheFrom() throws Exception {
-    	if (!getVersion(dockerClient).isGreaterOrEqual(RemoteApiVersion.VERSION_1_25)) {
-    		throw new SkipException("API version should be >= 1.25");
-    	}
-    	File baseDir1 = fileFromBuildTestResource("CacheFrom/test1");
-    	String imageId1 = dockerClient.buildImageCmd(baseDir1)
-    			.exec(new BuildImageResultCallback())
-    			.awaitImageId();
-    	InspectImageResponse inspectImageResponse1 = dockerClient.inspectImageCmd(imageId1).exec();
-    	assertThat(inspectImageResponse1, not(nullValue()));
-    	
-    	File baseDir2 = fileFromBuildTestResource("CacheFrom/test2");
-    	String cacheImage = String.format("[\"%s\"]", imageId1);
-    	String imageId2 = dockerClient.buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(cacheImage)))
-    			.exec(new BuildImageResultCallback())
-    			.awaitImageId();
-    	InspectImageResponse inspectImageResponse2 = dockerClient.inspectImageCmd(imageId2).exec();
-    	assertThat(inspectImageResponse2, not(nullValue()));
-    	
-    	// Compare whether the image2's parent layer is from image1 so that cache is used
-    	assertThat(inspectImageResponse2.getParent(), equalTo(inspectImageResponse1.getId()));    			
+        assumeThat(dockerRule, isGreaterOrEqual(VERSION_1_27));
+
+        File baseDir1 = fileFromBuildTestResource("CacheFrom/test1");
+        String imageId1 = dockerRule.getClient().buildImageCmd(baseDir1)
+                .exec(new BuildImageResultCallback())
+                .awaitImageId();
+        InspectImageResponse inspectImageResponse1 = dockerRule.getClient().inspectImageCmd(imageId1).exec();
+        assertThat(inspectImageResponse1, not(nullValue()));
+
+        File baseDir2 = fileFromBuildTestResource("CacheFrom/test2");
+        String cacheImage = String.format("[\"%s\"]", imageId1);
+        String imageId2 = dockerRule.getClient().buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(cacheImage)))
+                .exec(new BuildImageResultCallback())
+                .awaitImageId();
+        InspectImageResponse inspectImageResponse2 = dockerRule.getClient().inspectImageCmd(imageId2).exec();
+        assertThat(inspectImageResponse2, not(nullValue()));
+
+        // Compare whether the image2's parent layer is from image1 so that cache is used
+        assertThat(inspectImageResponse2.getParent(), equalTo(inspectImageResponse1.getId()));
+
     }
 
     public void dockerfileNotInBaseDirectory() throws Exception {
         File baseDirectory = fileFromBuildTestResource("dockerfileNotInBaseDirectory");
         File dockerfile = fileFromBuildTestResource("dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile");
-        BuildImageCmd command = dockerClient.buildImageCmd()
+        BuildImageCmd command = dockerRule.getClient().buildImageCmd()
                 .withBaseDirectory(baseDirectory)
                 .withDockerfile(dockerfile);
 
diff --git a/src/test/java/com/github/dockerjava/cmd/CmdIT.java b/src/test/java/com/github/dockerjava/cmd/CmdIT.java
new file mode 100644
index 000000000..1a74a0a63
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/CmdIT.java
@@ -0,0 +1,42 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.junit.DockerRule;
+import com.github.dockerjava.junit.category.Integration;
+import org.junit.Rule;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+
+import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY;
+import static com.github.dockerjava.cmd.CmdIT.FactoryType.NETTY;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+@Category(Integration.class)
+@RunWith(Parameterized.class)
+public abstract class CmdIT {
+    public enum FactoryType {
+        NETTY, JERSEY
+    }
+
+    @Parameterized.Parameters(name = "{index}:{0}")
+    public static Iterable<FactoryType> data() {
+        return Arrays.asList(
+                NETTY, JERSEY
+        );
+    }
+
+    @Parameterized.Parameter
+    public FactoryType factoryType;
+
+    public FactoryType getFactoryType() {
+        return factoryType;
+    }
+
+    @Rule
+    public DockerRule dockerRule = new DockerRule( this);
+
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java
new file mode 100644
index 000000000..b4d1301ea
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java
@@ -0,0 +1,92 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectImageResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.core.RemoteApiVersion;
+import com.google.common.collect.ImmutableMap;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+
+import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
+import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static com.github.dockerjava.utils.TestUtils.getVersion;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.iterableWithSize;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.startsWith;
+import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
+
+
+public class CommitCmdIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(CommitCmdIT.class);
+
+    @Test
+    public void commit() throws DockerException {
+        assumeNotSwarm("", dockerRule);
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withCmd("touch", "/test")
+                .exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        LOG.info("Committing container: {}", container.toString());
+        String imageId = dockerRule.getClient().commitCmd(container.getId()).exec();
+
+        InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec();
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+        assertThat(inspectImageResponse, hasField("container", startsWith(container.getId())));
+        assertThat(inspectImageResponse.getContainerConfig().getImage(), equalTo(DEFAULT_IMAGE));
+
+        InspectImageResponse busyboxImg = dockerRule.getClient().inspectImageCmd("busybox").exec();
+
+        assertThat(inspectImageResponse.getParent(), equalTo(busyboxImg.getId()));
+    }
+
+    @Test
+    public void commitWithLabels() throws DockerException {
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+                .withCmd("touch", "/test")
+                .exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        LOG.info("Committing container: {}", container.toString());
+        Map<String, String> labels = ImmutableMap.of("label1", "abc", "label2", "123");
+        String imageId = dockerRule.getClient().commitCmd(container.getId())
+                .withLabels(labels)
+                .exec();
+
+        InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec();
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+        // docker bug?
+        if (!getVersion(dockerRule.getClient()).isGreaterOrEqual(RemoteApiVersion.VERSION_1_24)) {
+            Map<String, String> responseLabels = inspectImageResponse.getContainerConfig().getLabels();
+            assertThat(responseLabels.size(), is(2));
+            assertThat(responseLabels.get("label1"), equalTo("abc"));
+            assertThat(responseLabels.get("label2"), equalTo("123"));
+        }
+    }
+
+    @Test(expected = NotFoundException.class)
+    public void commitNonExistingContainer() throws DockerException {
+
+        dockerRule.getClient().commitCmd("non-existent").exec();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java b/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java
new file mode 100644
index 000000000..ed235fb8c
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java
@@ -0,0 +1,97 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.ContainerNetwork;
+import com.github.dockerjava.api.model.Network;
+import net.jcip.annotations.ThreadSafe;
+import org.junit.Test;
+
+import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY;
+import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
+import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * TODO fix parallel.
+ */
+@ThreadSafe
+public class ConnectToNetworkCmdIT extends CmdIT {
+
+    @Test
+    public void connectToNetwork() throws InterruptedException {
+        assumeNotSwarm("no network in swarm", dockerRule);
+        String networkName = "connectToNetwork" + dockerRule.getKind();
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999").exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd().withName(networkName).exec();
+
+        dockerRule.getClient().connectToNetworkCmd().withNetworkId(network.getId()).withContainerId(container.getId()).exec();
+
+        Network updatedNetwork = dockerRule.getClient().inspectNetworkCmd().withNetworkId(network.getId()).exec();
+
+        assertTrue(updatedNetwork.getContainers().containsKey(container.getId()));
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+
+        assertNotNull(inspectContainerResponse.getNetworkSettings().getNetworks().get(networkName));
+    }
+
+    @Test
+    public void connectToNetworkWithContainerNetwork() throws InterruptedException {
+        assumeNotSwarm("no network in swarm", dockerRule);
+
+        final String subnetPrefix = getFactoryType() == JERSEY ?  "10.100.102" : "10.100.103";
+        final String networkName = "ContainerWithNetwork" + dockerRule.getKind();
+        final String containerIp = subnetPrefix + ".100";
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withCmd("sleep", "9999")
+                .exec();
+
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        try {
+            dockerRule.getClient().removeNetworkCmd(networkName).exec();
+        } catch (DockerException ignore) {
+        }
+
+        CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd()
+                .withName(networkName)
+                .withIpam(new Network.Ipam()
+                        .withConfig(new Network.Ipam.Config()
+                                .withSubnet(subnetPrefix + ".0/24")))
+                .exec();
+
+        dockerRule.getClient().connectToNetworkCmd()
+                .withNetworkId(network.getId())
+                .withContainerId(container.getId())
+                .withContainerNetwork(new ContainerNetwork()
+                        .withAliases("aliasName" + dockerRule.getKind())
+                        .withIpamConfig(new ContainerNetwork.Ipam()
+                                .withIpv4Address(containerIp)))
+                .exec();
+
+        Network updatedNetwork = dockerRule.getClient().inspectNetworkCmd().withNetworkId(network.getId()).exec();
+
+        Network.ContainerNetworkConfig containerNetworkConfig = updatedNetwork.getContainers().get(container.getId());
+        assertNotNull(containerNetworkConfig);
+        assertThat(containerNetworkConfig.getIpv4Address(), is(containerIp + "/24"));
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+
+        ContainerNetwork testNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get(networkName);
+        assertNotNull(testNetwork);
+        assertThat(testNetwork.getAliases(), hasItem("aliasName" + dockerRule.getKind()));
+        assertThat(testNetwork.getGateway(), is(subnetPrefix + ".1"));
+        assertThat(testNetwork.getIpAddress(), is(containerIp));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java b/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java
new file mode 100644
index 000000000..bf71b2505
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java
@@ -0,0 +1,51 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.ChangeLog;
+import com.github.dockerjava.core.command.WaitContainerResultCallback;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import static ch.lambdaj.Lambda.selectUnique;
+import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
+
+public class ContainerDiffCmdIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(ContainerDiffCmdIT.class);
+
+    @Test
+    public void testContainerDiff() throws DockerException {
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("touch", "/test").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+                .awaitStatusCode();
+        assertThat(exitCode, equalTo(0));
+
+        List<ChangeLog> filesystemDiff = dockerRule.getClient().containerDiffCmd(container.getId()).exec();
+        LOG.info("Container DIFF: {}", filesystemDiff.toString());
+
+        assertThat(filesystemDiff.size(), equalTo(1));
+        ChangeLog testChangeLog = selectUnique(filesystemDiff, hasField("path", equalTo("/test")));
+
+        assertThat(testChangeLog, hasField("path", equalTo("/test")));
+        assertThat(testChangeLog, hasField("kind", equalTo(1)));
+    }
+
+    @Test(expected = NotFoundException.class)
+    public void testContainerDiffWithNonExistingContainer() throws DockerException {
+
+        dockerRule.getClient().containerDiffCmd("non-existing").exec();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java
similarity index 51%
rename from src/test/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImplTest.java
rename to src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java
index 59c459382..ce800d61a 100644
--- a/src/test/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java
@@ -1,85 +1,68 @@
-package com.github.dockerjava.core.command;
+package com.github.dockerjava.cmd;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyOrNullString;
-import static org.hamcrest.Matchers.not;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.core.util.CompressArchiveUtil;
+import com.github.dockerjava.utils.TestUtils;
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.apache.commons.io.IOUtils;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.InputStream;
-import java.lang.reflect.Method;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 
-import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
-import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.apache.commons.io.IOUtils;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import com.github.dockerjava.core.util.CompressArchiveUtil;
-
-@Test(groups = "integration")
-public class CopyArchiveFromContainerCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
+import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
+public class CopyArchiveFromContainerCmdIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(CopyArchiveFromContainerCmdIT.class);
 
     @Test
     public void copyFromContainer() throws Exception {
         // TODO extract this into a shared method
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withName("docker-java-itest-copyFromContainer").withCmd("touch", "/copyFromContainer").exec();
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withName("copyFromContainer" + dockerRule.getKind())
+                .withCmd("touch", "/copyFromContainer")
+                .exec();
 
         LOG.info("Created container: {}", container);
         assertThat(container.getId(), not(isEmptyOrNullString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/copyFromContainer").exec();
+        InputStream response = dockerRule.getClient().copyArchiveFromContainerCmd(container.getId(), "/copyFromContainer").exec();
         Boolean bytesAvailable = response.available() > 0;
-        assertTrue(bytesAvailable, "The file was not copied from the container.");
+        assertTrue("The file was not copied from the container.", bytesAvailable );
 
         // read the stream fully. Otherwise, the underlying stream will not be closed.
-        String responseAsString = asString(response);
+        String responseAsString = TestUtils.asString(response);
         assertNotNull(responseAsString);
         assertTrue(responseAsString.length() > 0);
     }
 
-    @Test(expectedExceptions = NotFoundException.class)
+    @Test(expected = NotFoundException.class)
     public void copyFromNonExistingContainer() throws Exception {
 
-        dockerClient.copyArchiveFromContainerCmd("non-existing", "/test").exec();
+        dockerRule.getClient().copyArchiveFromContainerCmd("non-existing", "/test").exec();
     }
 
     @Test
     public void copyFromContainerBinaryFile() throws Exception {
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withName("docker-java-itest-copyFromContainerBinaryFile").exec();
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withName("copyFromContainerBinaryFile" + dockerRule.getKind())
+                .exec();
 
         LOG.info("Created container: {}", container);
         assertThat(container.getId(), not(isEmptyOrNullString()));
@@ -89,12 +72,12 @@ public void copyFromContainerBinaryFile() throws Exception {
         CompressArchiveUtil.tar(binaryFile, temp, true, false);
 
         try (InputStream uploadStream = Files.newInputStream(temp)) {
-            dockerClient.copyArchiveToContainerCmd(container.getId()).withTarInputStream(uploadStream).exec();
+            dockerRule.getClient().copyArchiveToContainerCmd(container.getId()).withTarInputStream(uploadStream).exec();
         }
 
-        InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/binary.dat").exec();
+        InputStream response = dockerRule.getClient().copyArchiveFromContainerCmd(container.getId(), "/binary.dat").exec();
         Boolean bytesAvailable = response.available() > 0;
-        assertTrue(bytesAvailable, "The file was not copied from the container.");
+        assertTrue("The file was not copied from the container.", bytesAvailable);
 
         try (TarArchiveInputStream tarInputStream = new TarArchiveInputStream(response)) {
             TarArchiveEntry nextTarEntry = tarInputStream.getNextTarEntry();
@@ -104,7 +87,7 @@ public void copyFromContainerBinaryFile() throws Exception {
                 assertTrue(IOUtils.contentEquals(binaryFileInputStream, tarInputStream));
             }
 
-            assertNull(tarInputStream.getNextTarEntry(), "Nothing except binary.dat is expected to be copied.");
+            assertNull("Nothing except binary.dat is expected to be copied.", tarInputStream.getNextTarEntry());
         }
     }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
similarity index 62%
rename from src/test/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExecTest.java
rename to src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
index d75d36ea8..ae2007e48 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
@@ -1,93 +1,74 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.cmd;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.isEmptyOrNullString;
-import static org.hamcrest.Matchers.not;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.core.command.WaitContainerResultCallback;
+import com.github.dockerjava.core.util.CompressArchiveUtil;
+import org.apache.commons.io.FileUtils;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.Method;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import org.apache.commons.io.FileUtils;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.core.command.WaitContainerResultCallback;
-import com.github.dockerjava.core.util.CompressArchiveUtil;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class CopyArchiveToContainerCmdExecTest extends AbstractNettyDockerClientTest {
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertTrue;
 
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
+public class CopyArchiveToContainerCmdIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(CopyArchiveToContainerCmdIT.class);
 
     @Test
     public void copyFileToContainer() throws Exception {
-        CreateContainerResponse container = prepareContainerForCopy();
+        CreateContainerResponse container = prepareContainerForCopy("1");
         Path temp = Files.createTempFile("", ".tar.gz");
         CompressArchiveUtil.tar(Paths.get("src/test/resources/testReadFile"), temp, true, false);
         try (InputStream uploadStream = Files.newInputStream(temp)) {
-            dockerClient.copyArchiveToContainerCmd(container.getId()).withTarInputStream(uploadStream).exec();
+            dockerRule.getClient()
+                    .copyArchiveToContainerCmd(container.getId())
+                    .withTarInputStream(uploadStream)
+                    .exec();
             assertFileCopied(container);
         }
     }
 
     @Test
     public void copyStreamToContainer() throws Exception {
-        CreateContainerResponse container = prepareContainerForCopy();
-        dockerClient.copyArchiveToContainerCmd(container.getId()).withHostResource("src/test/resources/testReadFile")
+        CreateContainerResponse container = prepareContainerForCopy("2");
+        dockerRule.getClient().copyArchiveToContainerCmd(container.getId())
+                .withHostResource("src/test/resources/testReadFile")
                 .exec();
         assertFileCopied(container);
     }
 
-    private CreateContainerResponse prepareContainerForCopy() {
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withName("docker-java-itest-copyToContainer").exec();
+    private CreateContainerResponse prepareContainerForCopy(String method) {
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+                .withName("docker-java-itest-copyToContainer" + method + dockerRule.getKind())
+                .exec();
         LOG.info("Created container: {}", container);
         assertThat(container.getId(), not(isEmptyOrNullString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
         // Copy a folder to the container
         return container;
     }
 
     private void assertFileCopied(CreateContainerResponse container) throws IOException {
-        try (InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "testReadFile").exec()) {
+        try (InputStream response = dockerRule.getClient().copyArchiveFromContainerCmd(container.getId(), "testReadFile").exec()) {
             boolean bytesAvailable = response.available() > 0;
-            assertTrue(bytesAvailable, "The file was not copied to the container.");
+            assertTrue( "The file was not copied to the container.", bytesAvailable);
         }
     }
 
-    @Test(expectedExceptions = NotFoundException.class)
+    @Test(expected = NotFoundException.class)
     public void copyToNonExistingContainer() throws Exception {
 
-        dockerClient.copyArchiveToContainerCmd("non-existing").withHostResource("src/test/resources/testReadFile").exec();
+        dockerRule.getClient().copyArchiveToContainerCmd("non-existing").withHostResource("src/test/resources/testReadFile").exec();
     }
 
     @Test
@@ -103,20 +84,20 @@ public void copyDirWithLastAddedTarEntryEmptyDir() throws Exception{
         Files.createFile(dirWithFile.resolve("file"));
 
         // create a test container
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
                 .withCmd("sleep", "9999")
                 .exec();
         // start the container
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
         // copy data from local dir to container
-        dockerClient.copyArchiveToContainerCmd(container.getId())
+        dockerRule.getClient().copyArchiveToContainerCmd(container.getId())
                 .withHostResource(localDir.toString())
                 .exec();
 
         // cleanup dir
         FileUtils.deleteDirectory(localDir.toFile());
     }
-
+    
     @Test
     public void copyFileWithExecutePermission() throws Exception {
         // create script file, add permission to execute
@@ -132,19 +113,19 @@ public void copyFileWithExecutePermission() throws Exception {
         // create a test container which starts and waits 3 seconds for the
         // script to be copied to the container's home dir and then executes it
         String containerCmd = "sleep 3; /home/" + scriptPath.getFileName().toString();
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withName("test")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+                .withName("copyFileWithExecutivePerm" + dockerRule.getKind())
                 .withCmd("/bin/sh", "-c", containerCmd)
                 .exec();
         // start the container
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
         // copy script to container home dir
-        dockerClient.copyArchiveToContainerCmd(container.getId())
+        dockerRule.getClient().copyArchiveToContainerCmd(container.getId())
                 .withRemotePath("/home")
                 .withHostResource(scriptPath.toString())
                 .exec();
         // await exid code
-        int exitCode = dockerClient.waitContainerCmd(container.getId())
+        int exitCode = dockerRule.getClient().waitContainerCmd(container.getId())
                 .exec(new WaitContainerResultCallback())
                 .awaitStatusCode();
         // check result
diff --git a/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java
new file mode 100644
index 000000000..b2f033cd9
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java
@@ -0,0 +1,60 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.NotFoundException;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.InputStream;
+
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24;
+import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
+import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
+import static com.github.dockerjava.utils.TestUtils.asString;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeThat;
+
+public class CopyFileFromContainerCmdIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(CopyFileFromContainerCmdIT.class);
+
+    @Test
+    public void copyFromContainer() throws Exception {
+        assumeThat("Doesn't work since 1.24", dockerRule, not(isGreaterOrEqual(VERSION_1_24)));
+
+        assumeNotSwarm("", dockerRule);
+
+        String containerName = "copyFileFromContainer" + dockerRule.getKind();
+        dockerRule.ensureContainerRemoved(containerName);
+
+        // TODO extract this into a shared method
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+                .withName(containerName)
+                .withCmd("touch", "/copyFileFromContainer")
+                .exec();
+
+        LOG.info("Created container: {}", container);
+        assertThat(container.getId(), not(isEmptyOrNullString()));
+
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        InputStream response = dockerRule.getClient().copyFileFromContainerCmd(container.getId(), "/copyFileFromContainer").exec();
+        Boolean bytesAvailable = response.available() > 0;
+        assertTrue("The file was not copied from the container.", bytesAvailable );
+
+        // read the stream fully. Otherwise, the underlying stream will not be closed.
+        String responseAsString = asString(response);
+        assertNotNull(responseAsString);
+        assertTrue(responseAsString.length() > 0);
+    }
+
+    @Test(expected = NotFoundException.class)
+    public void copyFromNonExistingContainer() throws Exception {
+
+        dockerRule.getClient().copyFileFromContainerCmd("non-existing", "/test").exec();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
similarity index 63%
rename from src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
rename to src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index d4c53a837..6073e1506 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -1,7 +1,8 @@
-package com.github.dockerjava.core.command;
+package com.github.dockerjava.cmd;
 
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.api.command.CreateVolumeResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.DockerException;
@@ -15,25 +16,21 @@
 import com.github.dockerjava.api.model.LogConfig;
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.Ports.Binding;
 import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Ulimit;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
-import com.github.dockerjava.api.model.Ports.Binding;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-import com.github.dockerjava.core.RemoteApiVersion;
+import com.github.dockerjava.core.command.LogContainerResultCallback;
+import net.jcip.annotations.NotThreadSafe;
 import org.apache.commons.io.FileUtils;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-import org.testng.internal.junit.ArrayAsserts;
-
-import java.lang.reflect.Method;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
 import java.security.SecureRandom;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -43,8 +40,13 @@
 
 import static com.github.dockerjava.api.model.Capability.MKNOD;
 import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-import static com.github.dockerjava.utils.TestUtils.getVersion;
+import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_23;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24;
+import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
+import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
+import static com.github.dockerjava.junit.DockerMatchers.mountedVolumes;
+import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.contains;
@@ -54,50 +56,34 @@
 import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasItemInArray;
-import static org.hamcrest.Matchers.hasItems;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.startsWith;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assume.assumeThat;
 
-@Test(groups = "integration")
-public class CreateContainerCmdImplTest extends AbstractDockerClientTest {
-    public static final String BUSYBOX_IMAGE = "busybox";
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
+@NotThreadSafe
+public class CreateContainerCmdIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(CreateContainerCmdIT.class);
 
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
+    @Rule
+    public TemporaryFolder tempDir = new TemporaryFolder(new File("target/"));
 
-    @Test(expectedExceptions = ConflictException.class)
+    @Test(expected = ConflictException.class)
     public void createContainerWithExistingName() throws DockerException {
 
         String containerName = "generated_" + new SecureRandom().nextInt();
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("env")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("env")
                 .withName(containerName).exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("env").withName(containerName).exec();
+        dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("env").withName(containerName).exec();
     }
 
     @Test
@@ -105,14 +91,15 @@ public void createContainerWithVolume() throws DockerException {
 
         Volume volume = new Volume("/var/log");
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withVolumes(volume)
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withVolumes(volume)
                 .withCmd("true").exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         LOG.info("Inspect container {}", inspectContainerResponse.getConfig().getVolumes());
 
@@ -128,14 +115,14 @@ public void createContainerWithReadOnlyVolume() throws DockerException {
 
         Volume volume = new Volume("/srv/test");
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withVolumes(volume)
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withVolumes(volume)
                 .withCmd("true").exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         LOG.info("Inspect container {}", inspectContainerResponse.getConfig().getVolumes());
 
@@ -148,22 +135,26 @@ public void createContainerWithReadOnlyVolume() throws DockerException {
 
     @Test
     public void createContainerWithVolumesFrom() throws DockerException {
-
-        Volume volume1 = new Volume("/opt/webapp1");
-        Volume volume2 = new Volume("/opt/webapp2");
-
         String container1Name = UUID.randomUUID().toString();
+        CreateVolumeResponse volume1Info = dockerRule.getClient().createVolumeCmd().exec();
+        CreateVolumeResponse volume2Info = dockerRule.getClient().createVolumeCmd().exec();
+        String mountpoint1 = volume1Info.getMountpoint();
+        String mountpoint2 = volume2Info.getMountpoint();
+        Volume volume1 = new Volume(mountpoint1);
+        Volume volume2 = new Volume(mountpoint2);
 
         Bind bind1 = new Bind("/src/webapp1", volume1);
         Bind bind2 = new Bind("/src/webapp2", volume2);
 
         // create a running container with bind mounts
-        CreateContainerResponse container1 = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("sleep", "9999")
+        CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withCmd("sleep", "9999")
                 .withName(container1Name)
                 .withBinds(bind1, bind2).exec();
+
         LOG.info("Created container1 {}", container1.toString());
 
-        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+        InspectContainerResponse inspectContainerResponse1 = dockerRule.getClient().inspectContainerCmd(container1.getId())
                 .exec();
 
         assertThat(Arrays.asList(inspectContainerResponse1.getHostConfig().getBinds()), containsInAnyOrder(bind1, bind2));
@@ -171,26 +162,29 @@ public void createContainerWithVolumesFrom() throws DockerException {
         assertThat(inspectContainerResponse1, mountedVolumes(containsInAnyOrder(volume1, volume2)));
 
         // create a second container with volumes from first container
-        CreateContainerResponse container2 = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("sleep", "9999")
-                .withVolumesFrom(new VolumesFrom(container1Name)).exec();
+        CreateContainerResponse container2 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withCmd("sleep", "9999")
+                .withVolumesFrom(new VolumesFrom(container1Name))
+                .exec();
+
         LOG.info("Created container2 {}", container2.toString());
 
-        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+        InspectContainerResponse inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container2.getId())
                 .exec();
 
         // No volumes are created, the information is just stored in .HostConfig.VolumesFrom
-        assertThat(inspectContainerResponse2.getHostConfig().getVolumesFrom(), hasItemInArray(new VolumesFrom(
-                container1Name)));
+        assertThat(inspectContainerResponse2.getHostConfig().getVolumesFrom(),
+                hasItemInArray(new VolumesFrom(container1Name)));
 
         // To ensure that the information stored in VolumesFrom really is considered
         // when starting the container, we start it and verify that it has the same
         // bind mounts as the first container.
         // This is somehow out of scope here, but it helped me to understand how the
         // VolumesFrom feature really works.
-        dockerClient.startContainerCmd(container2.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container2.getId()).exec();
         LOG.info("Started container2 {}", container2.toString());
 
-        inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId()).exec();
+        inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container2.getId()).exec();
 
         assertThat(inspectContainerResponse2.getHostConfig().getVolumesFrom(), hasItemInArray(new VolumesFrom(
                 container1Name)));
@@ -202,7 +196,7 @@ public void createContainerWithVolumesFrom() throws DockerException {
     public void createContainerWithEnv() throws Exception {
         final String testVariable = "VARIABLE=success";
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withEnv(testVariable)
                 .withCmd("env")
                 .exec();
@@ -211,193 +205,210 @@ public void createContainerWithEnv() throws Exception {
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), hasItem(testVariable));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        assertThat(containerLog(container.getId()), containsString(testVariable));
+        assertThat(dockerRule.containerLog(container.getId()), containsString(testVariable));
     }
 
     @Test
     public void createContainerWithHostname() throws Exception {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withHostName("docker-java")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withHostName("docker-java")
                 .withCmd("env").exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(inspectContainerResponse.getConfig().getHostName(), equalTo("docker-java"));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        assertThat(containerLog(container.getId()), containsString("HOSTNAME=docker-java"));
+        assertThat(dockerRule.containerLog(container.getId()), containsString("HOSTNAME=docker-java"));
     }
 
-    @Test(expectedExceptions = ConflictException.class)
+    @Test(expected = ConflictException.class)
     public void createContainerWithName() throws DockerException {
+        String containerName = "container_" + dockerRule.getKind();
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withName("container")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withName(containerName)
                 .withCmd("env").exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
-        assertThat(inspectContainerResponse.getName(), equalTo("/container"));
+        assertThat(inspectContainerResponse.getName(), equalTo("/" + containerName));
 
-
-        dockerClient.createContainerCmd(BUSYBOX_IMAGE).withName("container").withCmd("env").exec();
+        dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withName(containerName)
+                .withCmd("env")
+                .exec();
     }
 
     @Test
     public void createContainerWithLink() throws DockerException {
+        String containerName1 = "containerWithlink_" + dockerRule.getKind();
+        String containerName2 = "container2Withlink_" + dockerRule.getKind();
 
-        CreateContainerResponse container1 = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("sleep", "9999")
-                .withName("container1").exec();
+        CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999")
+                .withName(containerName1).exec();
         LOG.info("Created container1 {}", container1.toString());
         assertThat(container1.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container1.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container1.getId()).exec();
 
-        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+        InspectContainerResponse inspectContainerResponse1 = dockerRule.getClient().inspectContainerCmd(container1.getId())
                 .exec();
         LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
         assertThat(inspectContainerResponse1.getState().getRunning(), is(true));
 
-        CreateContainerResponse container2 = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withName("container2")
-                .withCmd("env").withLinks(new Link("container1", "container1Link")).exec();
+        CreateContainerResponse container2 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withName(containerName2)
+                .withCmd("env").withLinks(new Link(containerName1, "container1Link")).exec();
         LOG.info("Created container {}", container2.toString());
         assertThat(container2.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+        InspectContainerResponse inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container2.getId())
                 .exec();
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[]{new Link("container1",
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[]{new Link(containerName1,
                 "container1Link")}));
     }
 
     @Test
     public void createContainerWithLinkInCustomNetwork() throws DockerException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
+        assumeNotSwarm("no network in swarm", dockerRule);
+        String containerName1 = "containerCustomlink_" + dockerRule.getKind();
+        String containerName2 = "containerCustom2link_" + dockerRule.getKind();
+        String networkName = "linkNetcustom" + dockerRule.getKind();
 
-        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd()
-                .withName("linkNet")
+        CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd()
+                .withName(networkName)
                 .exec();
 
         assertNotNull(createNetworkResponse.getId());
 
-        CreateContainerResponse container1 = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
-                .withNetworkMode("linkNet")
+        CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withNetworkMode(networkName)
                 .withCmd("sleep", "9999")
-                .withName("container1")
+                .withName(containerName1)
                 .exec();
 
         assertThat(container1.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container1.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container1.getId()).exec();
 
-        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+        InspectContainerResponse inspectContainerResponse1 = dockerRule.getClient().inspectContainerCmd(container1.getId())
                 .exec();
         LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
         assertThat(inspectContainerResponse1.getState().getRunning(), is(true));
 
-        CreateContainerResponse container2 = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
-                .withNetworkMode("linkNet")
-                .withName("container2")
+        CreateContainerResponse container2 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withNetworkMode(networkName)
+                .withName(containerName2)
                 .withCmd("env")
-                .withLinks(new Link("container1", "container1Link"))
+                .withLinks(new Link(containerName1, containerName1 + "Link"))
                 .exec();
 
         LOG.info("Created container {}", container2.toString());
         assertThat(container2.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+        InspectContainerResponse inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container2.getId())
                 .exec();
 
-        ContainerNetwork linkNet = inspectContainerResponse2.getNetworkSettings().getNetworks().get("linkNet");
+        ContainerNetwork linkNet = inspectContainerResponse2.getNetworkSettings().getNetworks().get(networkName);
         assertNotNull(linkNet);
-        ArrayAsserts.assertArrayEquals(new Link[]{new Link("container1", "container1Link")}, linkNet.getLinks());
+        assertThat(linkNet.getLinks(), equalTo(new Link[]{new Link(containerName1, containerName1 + "Link")}));
     }
 
     @Test
     public void createContainerWithCustomIp() throws DockerException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
+        assumeNotSwarm("Swarm has no network", dockerRule);
 
-        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd()
+        String containerName1 = "containerCustomIplink_" + dockerRule.getKind();
+        String networkName = "customIpNet" + dockerRule.getKind();
+        String subnetPrefix = getFactoryType() == JERSEY ? "10.100.104" : "10.100.105";
+
+        CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd()
                 .withIpam(new Network.Ipam()
                         .withConfig(new Network.Ipam.Config()
-                                .withSubnet("10.100.101.0/24")))
-                .withName("customIpNet")
+                                .withSubnet(subnetPrefix + ".0/24")))
+                .withName(networkName)
                 .exec();
 
         assertNotNull(createNetworkResponse.getId());
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
-                .withNetworkMode("customIpNet")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withNetworkMode(networkName)
                 .withCmd("sleep", "9999")
-                .withName("container")
-                .withIpv4Address("10.100.101.100")
+                .withName(containerName1)
+                .withIpv4Address(subnetPrefix +".100")
                 .exec();
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId())
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient()
+                .inspectContainerCmd(container.getId())
                 .exec();
 
-        ContainerNetwork customIpNet = inspectContainerResponse.getNetworkSettings().getNetworks().get("customIpNet");
+        ContainerNetwork customIpNet = inspectContainerResponse.getNetworkSettings().getNetworks().get(networkName);
         assertNotNull(customIpNet);
-        assertEquals(customIpNet.getGateway(), "10.100.101.1");
-        assertEquals(customIpNet.getIpAddress(), "10.100.101.100");
+        assertThat(customIpNet.getGateway(), is(subnetPrefix + ".1"));
+        assertThat(customIpNet.getIpAddress(), is(subnetPrefix + ".100"));
     }
 
     @Test
     public void createContainerWithAlias() throws DockerException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
+        assumeNotSwarm("Swarm has no network", dockerRule);
+
+        String containerName1 = "containerAlias_" + dockerRule.getKind();
+        String networkName = "aliasNet" + dockerRule.getKind();
 
-        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd()
-                .withName("aliasNet")
+        CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd()
+                .withName(networkName)
                 .exec();
 
         assertNotNull(createNetworkResponse.getId());
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
-                .withNetworkMode("aliasNet")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withNetworkMode(networkName)
                 .withCmd("sleep", "9999")
-                .withName("container")
-                .withAliases("server")
+                .withName(containerName1)
+                .withAliases("server" + dockerRule.getKind())
                 .exec();
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId())
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId())
                 .exec();
 
-        ContainerNetwork aliasNet = inspectContainerResponse.getNetworkSettings().getNetworks().get("aliasNet");
-        assertThat(aliasNet.getAliases(), hasItem("server"));
+        ContainerNetwork aliasNet = inspectContainerResponse.getNetworkSettings().getNetworks().get(networkName);
+        assertThat(aliasNet.getAliases(), hasItem("server" + dockerRule.getKind()));
     }
 
     @Test
     public void createContainerWithCapAddAndCapDrop() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCapAdd(NET_ADMIN)
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCapAdd(NET_ADMIN)
                 .withCapDrop(MKNOD).exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getCapAdd()), contains(NET_ADMIN));
 
@@ -410,14 +421,14 @@ public void createContainerWithDns() throws DockerException {
         String aDnsServer = "8.8.8.8";
         String anotherDnsServer = "8.8.4.4";
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("true")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("true")
                 .withDns(aDnsServer, anotherDnsServer).exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()),
                 contains(aDnsServer, anotherDnsServer));
@@ -426,14 +437,15 @@ public void createContainerWithDns() throws DockerException {
     @Test
     public void createContainerWithEntrypoint() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withName("container")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withName("containerEntrypoint" + dockerRule.getKind())
                 .withEntrypoint("sleep", "9999").exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEntrypoint()), contains("sleep", "9999"));
 
@@ -444,14 +456,15 @@ public void createContainerWithExtraHosts() throws DockerException {
 
         String[] extraHosts = {"dockerhost:127.0.0.1", "otherhost:10.0.0.1"};
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withName("container")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withName("containerextrahosts" + dockerRule.getKind())
                 .withExtraHosts(extraHosts).exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getExtraHosts()),
                 containsInAnyOrder("dockerhost:127.0.0.1", "otherhost:10.0.0.1"));
@@ -460,14 +473,14 @@ public void createContainerWithExtraHosts() throws DockerException {
     @Test
     public void createContainerWithDevices() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("sleep", "9999")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999")
                 .withDevices(new Device("rwm", "/dev/nulo", "/dev/zero")).exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDevices()), contains(new Device("rwm",
                 "/dev/nulo", "/dev/zero")));
@@ -484,14 +497,14 @@ public void createContainerWithPortBindings() throws DockerException {
         portBindings.bind(tcp23, Binding.bindPort(11023));
         portBindings.bind(tcp23, Binding.bindPort(11024));
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("true")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
@@ -508,23 +521,28 @@ public void createContainerWithPortBindings() throws DockerException {
 
     @Test
     public void createContainerWithLinking() throws DockerException {
+        String containerName1 = "containerWithlinking_" + dockerRule.getKind();
+        String containerName2 = "container2Withlinking_" + dockerRule.getKind();
 
-        CreateContainerResponse container1 = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("sleep", "9999")
-                .withName("container1").exec();
+
+
+        CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withCmd("sleep", "9999")
+                .withName(containerName1).exec();
 
         LOG.info("Created container1 {}", container1.toString());
         assertThat(container1.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container1.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container1.getId()).exec();
 
-        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+        InspectContainerResponse inspectContainerResponse1 = dockerRule.getClient().inspectContainerCmd(container1.getId())
                 .exec();
         LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
 
         assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
         assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
         assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId()));
-        assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
+        assertThat(inspectContainerResponse1.getName(), equalTo("/" + containerName1));
         assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
         assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
         assertThat(inspectContainerResponse1.getState().getRunning(), is(true));
@@ -533,13 +551,14 @@ public void createContainerWithLinking() throws DockerException {
             assertThat(inspectContainerResponse1.getState().getExitCode(), is(equalTo(0)));
         }
 
-        CreateContainerResponse container2 = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("sleep", "9999")
-                .withName("container2").withLinks(new Link("container1", "container1Link")).exec();
+        CreateContainerResponse container2 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999")
+                .withName(containerName2)
+                .withLinks(new Link(containerName1, containerName1 + "Link")).exec();
 
         LOG.info("Created container2 {}", container2.toString());
         assertThat(container2.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+        InspectContainerResponse inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container2.getId())
                 .exec();
         LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
 
@@ -547,10 +566,10 @@ public void createContainerWithLinking() throws DockerException {
         assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
         assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[]{new Link("container1",
-                "container1Link")}));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[]{new Link(containerName1,
+                containerName1 + "Link")}));
         assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
-        assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
+        assertThat(inspectContainerResponse2.getName(), equalTo("/" + containerName2));
         assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
 
     }
@@ -560,14 +579,14 @@ public void createContainerWithRestartPolicy() throws DockerException {
 
         RestartPolicy restartPolicy = RestartPolicy.onFailureRestart(5);
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("sleep", "9999")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999")
                 .withRestartPolicy(restartPolicy).exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(inspectContainerResponse.getHostConfig().getRestartPolicy(), is(equalTo(restartPolicy)));
     }
@@ -575,14 +594,14 @@ public void createContainerWithRestartPolicy() throws DockerException {
     @Test
     public void createContainerWithPidMode() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("true")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("true")
                 .withPidMode("host").exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(inspectContainerResponse.getHostConfig().getPidMode(), is(equalTo("host")));
     }
@@ -596,14 +615,14 @@ public void createContainerWithPidMode() throws DockerException {
     @Test
     public void createContainerWithNetworkMode() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("true")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("true")
                 .withNetworkMode("host").exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(inspectContainerResponse.getHostConfig().getNetworkMode(), is(equalTo("host")));
     }
@@ -611,52 +630,53 @@ public void createContainerWithNetworkMode() throws DockerException {
     @Test
     public void createContainerWithMacAddress() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withMacAddress("00:80:41:ae:fd:7e").withCmd("true").exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
-        assertEquals(inspectContainerResponse.getConfig().getMacAddress(), "00:80:41:ae:fd:7e");
+        assertThat(inspectContainerResponse.getConfig().getMacAddress(), is("00:80:41:ae:fd:7e"));
     }
 
-    @Test(groups = "ignoreInCircleCi")
+    @Test
     public void createContainerWithULimits() throws DockerException {
-
+        String containerName = "containerulimit" + dockerRule.getKind();
         Ulimit[] ulimits = {new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096)};
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withName("container")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withName(containerName)
                 .withUlimits(ulimits).exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getUlimits()),
                 containsInAnyOrder(new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096)));
 
     }
 
-    @Test(groups = "ignoreInCircleCi")
+    @Test
     public void createContainerWithLabels() throws DockerException {
 
         Map<String, String> labels = new HashMap<String, String>();
         labels.put("com.github.dockerjava.null", null);
         labels.put("com.github.dockerjava.Boolean", "true");
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withCmd("sleep", "9999")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999")
                 .withLabels(labels).exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         // null becomes empty string
         labels.put("com.github.dockerjava.null", "");
@@ -668,20 +688,20 @@ public void createContainerWithLabels() throws DockerException {
         ));
     }
 
-    @Test(groups = "ignoreInCircleCi")
+    @Test
     public void createContainerWithLogConfig() throws DockerException {
 
         LogConfig logConfig = new LogConfig(LogConfig.LoggingType.NONE, null);
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withLogConfig(logConfig).exec();
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withLogConfig(logConfig).exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         // null becomes empty string
-        assertEquals(inspectContainerResponse.getHostConfig().getLogConfig().type, logConfig.type);
+        assertThat(inspectContainerResponse.getHostConfig().getLogConfig().type, is(logConfig.type));
     }
 
     /**
@@ -691,7 +711,7 @@ public void createContainerWithLogConfig() throws DockerException {
     public void testWithStopSignal() throws Exception {
         Integer signal = 10; // SIGUSR1 in busybox
 
-        CreateContainerResponse resp = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
+        CreateContainerResponse resp = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withCmd("/bin/sh", "-c", "trap 'echo \"exit trapped 10\"; exit 10' USR1; while true; do sleep 1; done")
                 .withAttachStdin(true)
                 .withTty(true)
@@ -699,21 +719,21 @@ public void testWithStopSignal() throws Exception {
                 .exec();
         final String containerId = resp.getId();
         assertThat(containerId, not(isEmptyString()));
-        dockerClient.startContainerCmd(containerId).exec();
+        dockerRule.getClient().startContainerCmd(containerId).exec();
 
-        InspectContainerResponse inspect = dockerClient.inspectContainerCmd(containerId).exec();
+        InspectContainerResponse inspect = dockerRule.getClient().inspectContainerCmd(containerId).exec();
         assertThat(inspect.getState().getRunning(), is(true));
 
-        dockerClient.stopContainerCmd(containerId).exec();
+        dockerRule.getClient().stopContainerCmd(containerId).exec();
         Thread.sleep(TimeUnit.SECONDS.toMillis(3));
 
-        inspect = dockerClient.inspectContainerCmd(containerId).exec();
+        inspect = dockerRule.getClient().inspectContainerCmd(containerId).exec();
         assertThat(inspect.getState().getRunning(), is(false));
         assertThat(inspect.getState().getExitCode(), is(signal));
 
         StringBuilder stringBuilder = new StringBuilder();
         final StringBuilderLogReader callback = new StringBuilderLogReader(stringBuilder);
-        dockerClient.logContainerCmd(containerId)
+        dockerRule.getClient().logContainerCmd(containerId)
                 .withStdErr(true)
                 .withStdOut(true)
                 .withTailAll()
@@ -738,16 +758,16 @@ public void onNext(Frame item) {
         }
     }
 
-    @Test(groups = "ignoreInCircleCi")
+    @Test
     public void createContainerWithCgroupParent() throws DockerException {
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
                 .withCgroupParent("/parent").exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainer = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainer = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(inspectContainer.getHostConfig().getCgroupParent(), is("/parent"));
     }
@@ -756,14 +776,14 @@ public void createContainerWithCgroupParent() throws DockerException {
     @Test
     public void createContainerWithShmSize() throws DockerException {
         HostConfig hostConfig = new HostConfig().withShmSize(96 * FileUtils.ONE_MB);
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withHostConfig(hostConfig).withCmd("true").exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(inspectContainerResponse.getHostConfig().getShmSize(), is(hostConfig.getShmSize()));
     }
@@ -771,43 +791,37 @@ public void createContainerWithShmSize() throws DockerException {
     @SuppressWarnings("Duplicates")
     @Test
     public void createContainerWithShmPidsLimit() throws DockerException {
-        final RemoteApiVersion apiVersion = getVersion(dockerClient);
-
-        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_23)) {
-            throw new SkipException("API version should be >= 1.23");
-        }
+        assumeThat("API version should be >= 1.23", dockerRule, isGreaterOrEqual(VERSION_1_23));
 
         HostConfig hostConfig = new HostConfig().withPidsLimit(2L);
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
-            .withHostConfig(hostConfig).withCmd("true").exec();
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withHostConfig(hostConfig).withCmd("true").exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(inspectContainerResponse.getHostConfig().getPidsLimit(), is(hostConfig.getPidsLimit()));
     }
 
     @Test
     public void createContainerWithNetworkID() {
-        final RemoteApiVersion apiVersion = getVersion(dockerClient);
-        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_24)) {
-            throw new SkipException("API version should be >= 1.24");
-        }
+        assumeThat("API version should be >= 1.23", dockerRule, isGreaterOrEqual(VERSION_1_24));
+
         String networkName = "net-" + UUID.randomUUID().toString();
-        Map<String,String> labels=new HashMap<>();
-        labels.put("com.example.label","test");
-        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName)
+        Map<String, String> labels = new HashMap<>();
+        labels.put("com.example.label", "test");
+        CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd().withName(networkName)
                 .withLabels(labels).withAttachable(true).exec();
         String networkId = createNetworkResponse.getId();
-        CreateContainerResponse createContainerResponse = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withLabels(labels).withCmd("true").exec();
+        CreateContainerResponse createContainerResponse = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withLabels(labels).withCmd("true").exec();
         String containerId = createContainerResponse.getId();
-        dockerClient.connectToNetworkCmd().withContainerId(containerId).withNetworkId(networkId).exec();
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(containerId).exec();
+        dockerRule.getClient().connectToNetworkCmd().withContainerId(containerId).withNetworkId(networkId).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(containerId).exec();
         ContainerNetwork containerNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get(networkName);
-        if(containerNetwork==null){
+        if (containerNetwork == null) {
             // swarm node used network id
             containerNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get(networkId);
         }
diff --git a/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
new file mode 100644
index 000000000..510bb0cb9
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
@@ -0,0 +1,89 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.Network;
+import net.jcip.annotations.NotThreadSafe;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_21;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_25;
+import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
+import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeThat;
+
+@NotThreadSafe
+public class CreateNetworkCmdIT extends CmdIT {
+
+    @Test
+    public void createNetwork() throws DockerException {
+        assumeNotSwarm("no network in swarm", dockerRule);
+
+        String networkName = "createNetwork" + dockerRule.getKind();
+
+        CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd().withName(networkName).exec();
+
+        assertNotNull(createNetworkResponse.getId());
+
+        Network network = dockerRule.getClient().inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
+        assertThat(network.getName(), is(networkName));
+        assertThat(network.getDriver(), is("bridge"));
+    }
+
+    @Test
+    public void createNetworkWithIpamConfig() throws DockerException {
+        assumeNotSwarm("no network in swarm", dockerRule);
+
+        String networkName = "networkIpam" + dockerRule.getKind();
+        String subnet = getFactoryType() == FactoryType.JERSEY ? "10.67.79.0/24" : "10.67.90.0/24";
+
+        Network.Ipam ipam = new Network.Ipam().withConfig(new Network.Ipam.Config().withSubnet(subnet));
+        CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd().withName(networkName).withIpam(ipam).exec();
+
+        assertNotNull(createNetworkResponse.getId());
+
+        Network network = dockerRule.getClient().inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
+        assertEquals(network.getName(), networkName);
+        assertEquals("bridge", network.getDriver());
+        assertEquals(subnet, network.getIpam().getConfig().iterator().next().getSubnet());
+    }
+
+    @Test
+    public void createAttachableNetwork() throws DockerException {
+        assumeThat("API version should be > 1.24", dockerRule, isGreaterOrEqual(VERSION_1_25));
+
+        String networkName = "createAttachableNetwork" + dockerRule.getKind();
+        CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd()
+                .withName(networkName)
+                .withAttachable(true)
+                .exec();
+        assertNotNull(createNetworkResponse.getId());
+        Network network = dockerRule.getClient().inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
+        assertThat(network, notNullValue());
+        assertTrue(network.isAttachable());
+    }
+
+    @Test
+    public void createNetworkWithLabel() throws DockerException {
+        assumeNotSwarm("no network in swarm?", dockerRule);
+        assumeThat("API version should be >= 1.21", dockerRule, isGreaterOrEqual(VERSION_1_21));
+
+        String networkName = "createNetworkWithLabel" + dockerRule.getKind();
+        Map<String, String> labels = new HashMap<>();
+        labels.put("com.example.usage" + dockerRule.getKind(), "test");
+        CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd().withName(networkName).withLabels(labels).exec();
+        assertNotNull(createNetworkResponse.getId());
+        Network network = dockerRule.getClient().inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
+        assertEquals(network.getLabels(), labels);
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateVolumeCmdImplTest.java b/src/test/java/com/github/dockerjava/cmd/CreateVolumeCmdIT.java
similarity index 53%
rename from src/test/java/com/github/dockerjava/core/command/CreateVolumeCmdImplTest.java
rename to src/test/java/com/github/dockerjava/cmd/CreateVolumeCmdIT.java
index 39688b424..951b1ed6d 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateVolumeCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/CreateVolumeCmdIT.java
@@ -1,51 +1,21 @@
-package com.github.dockerjava.core.command;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-
-import java.lang.reflect.Method;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+package com.github.dockerjava.cmd;
 
 import com.github.dockerjava.api.command.CreateVolumeResponse;
 import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class CreateVolumeCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
+import org.junit.Test;
 
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
 
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
+public class CreateVolumeCmdIT extends CmdIT {
 
     @Test
     public void createVolume() throws DockerException {
 
         String volumeName = "volume1";
 
-        CreateVolumeResponse createVolumeResponse = dockerClient.createVolumeCmd().withName(volumeName)
+        CreateVolumeResponse createVolumeResponse = dockerRule.getClient().createVolumeCmd().withName(volumeName)
                 .withDriver("local").exec();
 
         assertThat(createVolumeResponse.getName(), equalTo(volumeName));
@@ -58,14 +28,14 @@ public void createVolumeWithExistingName() throws DockerException {
 
         String volumeName = "volume1";
 
-        CreateVolumeResponse createVolumeResponse1 = dockerClient.createVolumeCmd().withName(volumeName)
+        CreateVolumeResponse createVolumeResponse1 = dockerRule.getClient().createVolumeCmd().withName(volumeName)
                 .withDriver("local").exec();
 
         assertThat(createVolumeResponse1.getName(), equalTo(volumeName));
         assertThat(createVolumeResponse1.getDriver(), equalTo("local"));
         assertThat(createVolumeResponse1.getMountpoint(), containsString("/volume1/"));
 
-        CreateVolumeResponse createVolumeResponse2 = dockerClient.createVolumeCmd().withName(volumeName)
+        CreateVolumeResponse createVolumeResponse2 = dockerRule.getClient().createVolumeCmd().withName(volumeName)
                 .withDriver("local").exec();
 
         assertThat(createVolumeResponse2.getName(), equalTo(volumeName));
diff --git a/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java b/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java
new file mode 100644
index 000000000..51faa2ea8
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java
@@ -0,0 +1,58 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.api.model.Network;
+import org.junit.Test;
+
+import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class DisconnectFromNetworkCmdIT extends CmdIT {
+
+    @Test
+    public void disconnectFromNetwork() throws InterruptedException {
+        assumeNotSwarm("no network in swarm", dockerRule);
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd().withName("disconnectNetwork" + dockerRule.getKind()).exec();
+
+        dockerRule.getClient().connectToNetworkCmd().withNetworkId(network.getId()).withContainerId(container.getId()).exec();
+
+        Network updatedNetwork = dockerRule.getClient().inspectNetworkCmd().withNetworkId(network.getId()).exec();
+
+        assertTrue(updatedNetwork.getContainers().containsKey(container.getId()));
+
+        dockerRule.getClient().disconnectFromNetworkCmd().withNetworkId(network.getId()).withContainerId(container.getId()).exec();
+
+        updatedNetwork = dockerRule.getClient().inspectNetworkCmd().withNetworkId(network.getId()).exec();
+
+        assertFalse(updatedNetwork.getContainers().containsKey(container.getId()));
+    }
+
+    @Test
+    public void forceDisconnectFromNetwork() throws InterruptedException {
+        assumeNotSwarm("no network in swarm", dockerRule);
+
+        CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd().withName("testNetwork2" + dockerRule.getKind()).exec();
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+                .withNetworkMode("testNetwork2" + dockerRule.getKind())
+                .withCmd("sleep", "9999")
+                .exec();
+
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        dockerRule.getClient().disconnectFromNetworkCmd()
+                .withNetworkId(network.getId())
+                .withContainerId(container.getId())
+                .withForce(true)
+                .exec();
+
+        Network updatedNetwork = dockerRule.getClient().inspectNetworkCmd().withNetworkId(network.getId()).exec();
+        assertFalse(updatedNetwork.getContainers().containsKey(container.getId()));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java
similarity index 66%
rename from src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
rename to src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java
index 83ba214ba..3ae1c45dc 100644
--- a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java
@@ -1,60 +1,38 @@
-package com.github.dockerjava.core.command;
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.core.command.EventsResultCallback;
+import com.github.dockerjava.core.command.PullImageResultCallback;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.model.Event;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
+import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 /*
  * NOTE: These tests may fail if there is a difference between local and daemon time
  * (this is especially a problem when using boot2docker as time may not in sync
  * with the virtualbox host system)
  */
-@Test(groups = "integration")
-public class EventsCmdImplTest extends AbstractDockerClientTest {
+public class EventsCmdIT extends CmdIT {
+    private static final Logger LOG = LoggerFactory.getLogger(EventsCmdIT.class);
 
     private static String getEpochTime() {
         return String.valueOf(System.currentTimeMillis() / 1000);
     }
 
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
     @Test
     public void testEventStreamTimeBound() throws Exception {
-        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
+        assumeNotSwarm("", dockerRule);
 
         // Don't include other tests events
         TimeUnit.SECONDS.sleep(1);
@@ -65,64 +43,64 @@ public void testEventStreamTimeBound() throws Exception {
 
         EventsTestCallback eventCallback = new EventsTestCallback(expectedEvents);
 
-        dockerClient.eventsCmd()
-            .withSince(startTime)
-            .withUntil(endTime)
-            .exec(eventCallback);
+        dockerRule.getClient().eventsCmd()
+                .withSince(startTime)
+                .withUntil(endTime)
+                .exec(eventCallback);
 
         List<Event> events = eventCallback.awaitExpectedEvents(3, TimeUnit.MINUTES);
 
         // we may receive more events as expected
-        assertTrue(events.size() >= expectedEvents, "Received events: " + events);
+        assertTrue("Received events: " + events, events.size() >= expectedEvents);
     }
 
     @Test
     public void testEventStreaming() throws Exception {
-        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
+        assumeNotSwarm("", dockerRule);
 
         // Don't include other tests events
         TimeUnit.SECONDS.sleep(1);
-        
+
         String startTime = getEpochTime();
         int expectedEvents = generateEvents();
 
         EventsTestCallback eventCallback = new EventsTestCallback(expectedEvents);
 
-        dockerClient.eventsCmd()
-            .withSince(startTime)
-            .exec(eventCallback);
+        dockerRule.getClient().eventsCmd()
+                .withSince(startTime)
+                .exec(eventCallback);
 
         generateEvents();
 
         List<Event> events = eventCallback.awaitExpectedEvents(3, TimeUnit.MINUTES);
-        
+
         // we may receive more events as expected
-        assertTrue(events.size() >= expectedEvents, "Received events: " + events);
+        assertTrue("Received events: " + events, events.size() >= expectedEvents);
     }
 
-    
+
     public void testEventStreamingWithFilter() throws Exception {
-        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
+        assumeNotSwarm("", dockerRule);
 
         // Don't include other tests events
         TimeUnit.SECONDS.sleep(1);
-        
+
         String startTime = getEpochTime();
         int expectedEvents = 1;
 
         EventsTestCallback eventCallback = new EventsTestCallback(expectedEvents);
-        
-        dockerClient.eventsCmd()
-        	.withSince(startTime)
-        	.withEventFilter("start")
-            .exec(eventCallback);
+
+        dockerRule.getClient().eventsCmd()
+                .withSince(startTime)
+                .withEventFilter("start")
+                .exec(eventCallback);
 
         generateEvents();
 
         List<Event> events = eventCallback.awaitExpectedEvents(3, TimeUnit.MINUTES);
-        
+
         // we should get exactly one "start" event here
-        assertEquals(events.size(), expectedEvents, "Received events: " + events);
+        assertThat("Received events: " + events, events.size(), is(expectedEvents));
     }
 
     /**
@@ -131,13 +109,13 @@ public void testEventStreamingWithFilter() throws Exception {
     private int generateEvents() throws Exception {
         String testImage = "busybox:latest";
 
-        dockerClient.pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess();
-        CreateContainerResponse container = dockerClient.createContainerCmd(testImage).withCmd("sleep", "9999").exec();
-        dockerClient.startContainerCmd(container.getId()).exec();
-        dockerClient.stopContainerCmd(container.getId()).withTimeout(1).exec();
-        
+        dockerRule.getClient().pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess();
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(testImage).withCmd("sleep", "9999").exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().stopContainerCmd(container.getId()).withTimeout(1).exec();
+
         // generates 5 events with remote api 1.24:
-        
+
         // Event[status=pull,id=busybox:latest,from=<null>,node=<null>,type=IMAGE,action=pull,actor=com.github.dockerjava.api.model.EventActor@417db6d7[id=busybox:latest,attributes={name=busybox}],time=1473455186,timeNano=1473455186436681587]
         // Event[status=create,id=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c,from=busybox:latest,node=<null>,type=CONTAINER,action=create,actor=com.github.dockerjava.api.model.EventActor@40bcec[id=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c,attributes={image=busybox:latest, name=sick_lamport}],time=1473455186,timeNano=1473455186470713257]
         // Event[status=<null>,id=<null>,from=<null>,node=<null>,type=NETWORK,action=connect,actor=com.github.dockerjava.api.model.EventActor@318a1b01[id=10870ceb13abb7cf841ea68868472da881b33c8ed08d2cde7dbb39d7c24d1d27,attributes={container=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c, name=bridge, type=bridge}],time=1473455186,timeNano=1473455186544318466]
@@ -162,15 +140,15 @@ public void onNext(Event event) {
             events.add(event);
             countDownLatch.countDown();
         }
-        
-        public List<Event> awaitExpectedEvents(long timeout, TimeUnit unit ) {
-        	try {
-				countDownLatch.await(timeout, unit);
-				close();
-			} catch (Exception e) {
-				throw new RuntimeException(e);
-			}
-        	return new ArrayList<Event>(events);
+
+        public List<Event> awaitExpectedEvents(long timeout, TimeUnit unit) {
+            try {
+                countDownLatch.await(timeout, unit);
+                close();
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+            return new ArrayList<Event>(events);
         }
     }
 }
diff --git a/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java b/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java
new file mode 100644
index 000000000..7b7d63c1c
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java
@@ -0,0 +1,38 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.ExecCreateCmdResponse;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.security.SecureRandom;
+
+import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+public class ExecCreateCmdImplIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(ExecCreateCmdImplIT.class);
+
+
+    @Test
+    public void execCreateTest() {
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withUser("root").withCmd("top")
+                .withName(containerName).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        ExecCreateCmdResponse execCreateCmdResponse = dockerRule.getClient().execCreateCmd(container.getId())
+                .withCmd("touch", "file.log").exec();
+
+        assertThat(execCreateCmdResponse.getId(), not(isEmptyString()));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java b/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java
new file mode 100644
index 000000000..feec37155
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java
@@ -0,0 +1,101 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.ExecCreateCmdResponse;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.core.command.ExecStartResultCallback;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.InputStream;
+import java.security.SecureRandom;
+
+import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
+import static com.github.dockerjava.utils.TestUtils.asString;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class ExecStartCmdIT extends CmdIT {
+    private static final Logger LOG = LoggerFactory.getLogger(ExecStartCmdIT.class);
+
+    @Test
+    public void execStart() throws Exception {
+        assumeNotSwarm("no network in swarm", dockerRule);
+
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top")
+                .withName(containerName).exec();
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        ExecCreateCmdResponse execCreateCmdResponse = dockerRule.getClient().execCreateCmd(container.getId())
+                .withAttachStdout(true)
+                .withCmd("touch", "/execStartTest.log")
+                .withUser("root")
+                .exec();
+        dockerRule.getClient().execStartCmd(execCreateCmdResponse.getId())
+                .exec(new ExecStartResultCallback(System.out, System.err))
+                .awaitCompletion();
+
+        InputStream response = dockerRule.getClient().copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec();
+        Boolean bytesAvailable = response.available() > 0;
+        assertTrue("The file was not copied from the container.", bytesAvailable);
+
+        // read the stream fully. Otherwise, the underlying stream will not be closed.
+        String responseAsString = asString(response);
+        assertNotNull(responseAsString);
+        assertTrue(responseAsString.length() > 0);
+    }
+
+    @Test
+    public void execStartAttached() throws Exception {
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName(containerName).exec();
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        ExecCreateCmdResponse execCreateCmdResponse = dockerRule.getClient().execCreateCmd(container.getId())
+                .withAttachStdout(true).withCmd("touch", "/execStartTest.log").exec();
+        dockerRule.getClient().execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true)
+                .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
+
+        InputStream response = dockerRule.getClient().copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec();
+        Boolean bytesAvailable = response.available() > 0;
+        assertTrue( "The file was not copied from the container.", bytesAvailable);
+
+        // read the stream fully. Otherwise, the underlying stream will not be closed.
+        String responseAsString = asString(response);
+        assertNotNull(responseAsString);
+        assertTrue(responseAsString.length() > 0);
+    }
+
+    @Test(expected = NotFoundException.class)
+    public void execStartWithNonExistentUser() throws Exception {
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName(containerName).exec();
+        LOG.info("Created container {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        ExecCreateCmdResponse execCreateCmdResponse = dockerRule.getClient().execCreateCmd(container.getId())
+                .withAttachStdout(true).withCmd("touch", "/execStartTest.log").withUser("NonExistentUser").exec();
+        dockerRule.getClient().execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true)
+                .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
+
+        dockerRule.getClient().copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java b/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java
new file mode 100644
index 000000000..b4f70fe19
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java
@@ -0,0 +1,58 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.Info;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+public class InfoCmdIT extends CmdIT {
+    private static final Logger LOG = LoggerFactory.getLogger(InfoCmdIT.class);
+
+    @Test
+    public void infoTest() throws DockerException {
+        DockerClient dockerClient = dockerRule.getClient();
+        // Make sure that there is at least one container for the assertion
+        // TODO extract this into a shared method
+        if (dockerClient.listContainersCmd().withShowAll(true).exec().size() == 0) {
+            CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE)
+                    .withName("docker-java-itest-info")
+                    .withCmd("touch", "/test")
+                    .exec();
+
+            LOG.info("Created container: {}", container);
+            assertThat(container.getId(), not(isEmptyOrNullString()));
+
+            dockerClient.startContainerCmd(container.getId()).exec();
+        }
+
+        Info dockerInfo = dockerClient.infoCmd().exec();
+        LOG.info(dockerInfo.toString());
+
+        assertThat(dockerInfo.getContainers(), notNullValue());
+        assertThat(dockerInfo.getContainers(), greaterThan(0));
+
+        assertThat(dockerInfo.getImages(), notNullValue());
+        assertThat(dockerInfo.getImages(), greaterThan(0));
+        assertThat(dockerInfo.getDebug(), notNullValue());
+
+        if (isNotSwarm(dockerClient)) {
+            assertThat(dockerInfo.getNFd(), greaterThan(0));
+            assertThat(dockerInfo.getNGoroutines(), greaterThan(0));
+            assertThat(dockerInfo.getNCPU(), greaterThan(0));
+        }
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
similarity index 60%
rename from src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
rename to src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
index 2d41945a6..7b108c8a6 100644
--- a/src/test/java/com/github/dockerjava/core/command/InspectContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
@@ -1,66 +1,41 @@
-package com.github.dockerjava.core.command;
-
-import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-import java.lang.reflect.Method;
-import java.security.SecureRandom;
-
-import com.github.dockerjava.api.command.InspectContainerCmd;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+package com.github.dockerjava.cmd;
 
 import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class InspectContainerCmdImplTest extends AbstractDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(InspectContainerCmdImplTest.class);
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
+import java.security.SecureRandom;
 
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
+import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
+public class InspectContainerCmdIT extends CmdIT {
 
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
+    public static final Logger LOG = LoggerFactory.getLogger(InspectContainerCmdIT.class);
 
-    @Test()
+    @Test
     public void inspectContainer() throws DockerException {
 
         String containerName = "generated_" + new SecureRandom().nextInt();
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top")
                 .withName(containerName).exec();
         LOG.info("Created container {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse containerInfo = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
         assertEquals(containerInfo.getId(), container.getId());
 
     }
@@ -70,39 +45,39 @@ public void inspectContainerWithSize() throws DockerException {
 
         String containerName = "generated_" + new SecureRandom().nextInt();
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top")
                 .withName(containerName).exec();
         LOG.info("Created container {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerCmd command = dockerClient.inspectContainerCmd(container.getId()).withSize(true);
+        InspectContainerCmd command = dockerRule.getClient().inspectContainerCmd(container.getId()).withSize(true);
         assertTrue(command.getSize());
         InspectContainerResponse containerInfo = command.exec();
         assertEquals(containerInfo.getId(), container.getId());
 
         // TODO check swarm
-        if (isNotSwarm(dockerClient)) {
+        if (isNotSwarm(dockerRule.getClient())) {
             assertNotNull(containerInfo.getSizeRootFs());
             assertTrue(containerInfo.getSizeRootFs().intValue() > 0);
         }
     }
 
-    @Test(expectedExceptions = NotFoundException.class)
+    @Test(expected = NotFoundException.class)
     public void inspectNonExistingContainer() throws DockerException {
-        dockerClient.inspectContainerCmd("non-existing").exec();
+        dockerRule.getClient().inspectContainerCmd("non-existing").exec();
     }
 
     @Test
     public void inspectContainerRestartCount() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
                 .withCmd("env").exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(inspectContainerResponse.getRestartCount(), equalTo(0));
     }
@@ -110,14 +85,14 @@ public void inspectContainerRestartCount() throws DockerException {
     @Test
     public void inspectContainerNetworkSettings() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
                 .withCmd("env").exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertFalse(inspectContainerResponse.getNetworkSettings().getHairpinMode());
     }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java b/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java
similarity index 63%
rename from src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
rename to src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java
index d0bb5ca1f..3eecd3c33 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectExecCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java
@@ -1,125 +1,102 @@
-package com.github.dockerjava.netty.exec;
-
-import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
-import static com.github.dockerjava.utils.TestUtils.getVersion;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.security.SecureRandom;
-
-import com.github.dockerjava.core.RemoteApiVersion;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+package com.github.dockerjava.cmd;
 
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.ExecCreateCmdResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.command.InspectExecResponse;
+import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.core.command.ExecStartResultCallback;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
 import com.github.dockerjava.test.serdes.JSONTestHelper;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-@Test(groups = "integration")
-public class InspectExecCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
+import java.io.IOException;
+import java.security.SecureRandom;
 
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
+import static com.github.dockerjava.utils.TestUtils.getVersion;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
+public class InspectExecCmdIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(InspectExecCmdIT.class);
 
-    @Test(groups = "ignoreInCircleCi")
+    @Test
     public void inspectExec() throws Exception {
         String containerName = "generated_" + new SecureRandom().nextInt();
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withName(containerName).exec();
         LOG.info("Created container {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
         // Check that file does not exist
-        ExecCreateCmdResponse checkFileExec1 = dockerClient.execCreateCmd(container.getId()).withAttachStdout(true)
+        ExecCreateCmdResponse checkFileExec1 = dockerRule.getClient().execCreateCmd(container.getId()).withAttachStdout(true)
                 .withAttachStderr(true).withCmd("test", "-e", "/marker").exec();
         LOG.info("Created exec {}", checkFileExec1.toString());
         assertThat(checkFileExec1.getId(), not(isEmptyString()));
-        dockerClient.execStartCmd(checkFileExec1.getId()).withDetach(false)
+        dockerRule.getClient().execStartCmd(checkFileExec1.getId()).withDetach(false)
                 .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
-        InspectExecResponse first = dockerClient.inspectExecCmd(checkFileExec1.getId()).exec();
+        InspectExecResponse first = dockerRule.getClient().inspectExecCmd(checkFileExec1.getId()).exec();
         assertThat(first.isRunning(), is(false));
         assertThat(first.getExitCode(), is(1));
 
         // Create the file
-        ExecCreateCmdResponse touchFileExec = dockerClient.execCreateCmd(container.getId()).withAttachStdout(true)
+        ExecCreateCmdResponse touchFileExec = dockerRule.getClient().execCreateCmd(container.getId()).withAttachStdout(true)
                 .withAttachStderr(true).withCmd("touch", "/marker").exec();
         LOG.info("Created exec {}", touchFileExec.toString());
         assertThat(touchFileExec.getId(), not(isEmptyString()));
-        dockerClient.execStartCmd(touchFileExec.getId()).withDetach(false)
+        dockerRule.getClient().execStartCmd(touchFileExec.getId()).withDetach(false)
                 .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
-        InspectExecResponse second = dockerClient.inspectExecCmd(touchFileExec.getId()).exec();
+        InspectExecResponse second = dockerRule.getClient().inspectExecCmd(touchFileExec.getId()).exec();
         assertThat(second.isRunning(), is(false));
         assertThat(second.getExitCode(), is(0));
 
         // Check that file does exist now
-        ExecCreateCmdResponse checkFileExec2 = dockerClient.execCreateCmd(container.getId()).withAttachStdout(true)
+        ExecCreateCmdResponse checkFileExec2 = dockerRule.getClient().execCreateCmd(container.getId()).withAttachStdout(true)
                 .withAttachStderr(true).withCmd("test", "-e", "/marker").exec();
         LOG.info("Created exec {}", checkFileExec2.toString());
         assertThat(checkFileExec2.getId(), not(isEmptyString()));
-        dockerClient.execStartCmd(checkFileExec2.getId()).withDetach(false)
+        dockerRule.getClient().execStartCmd(checkFileExec2.getId()).withDetach(false)
                 .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
-        InspectExecResponse third = dockerClient.inspectExecCmd(checkFileExec2.getId()).exec();
+        InspectExecResponse third = dockerRule.getClient().inspectExecCmd(checkFileExec2.getId()).exec();
         assertThat(third.isRunning(), is(false));
         assertThat(third.getExitCode(), is(0));
 
         // Get container info and check its roundtrip to ensure the consistency
-        InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse containerInfo = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
         assertEquals(containerInfo.getId(), container.getId());
         JSONTestHelper.testRoundTrip(containerInfo);
     }
 
-    @Test(groups = "ignoreInCircleCi")
+    @Test
     public void inspectExecNetworkSettings() throws IOException {
-        final RemoteApiVersion apiVersion = getVersion(dockerClient);
+        final RemoteApiVersion apiVersion = getVersion(dockerRule.getClient());
+
         String containerName = "generated_" + new SecureRandom().nextInt();
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withName(containerName).exec();
         LOG.info("Created container {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        ExecCreateCmdResponse exec = dockerClient.execCreateCmd(container.getId()).withAttachStdout(true)
+        ExecCreateCmdResponse exec = dockerRule.getClient().execCreateCmd(container.getId()).withAttachStdout(true)
                 .withAttachStderr(true).withCmd("/bin/bash").exec();
         LOG.info("Created exec {}", exec.toString());
         assertThat(exec.getId(), not(isEmptyString()));
 
-        InspectExecResponse inspectExecResponse = dockerClient.inspectExecCmd(exec.getId()).exec();
+        InspectExecResponse inspectExecResponse = dockerRule.getClient().inspectExecCmd(exec.getId()).exec();
 
         if (apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_22)) {
             assertThat(inspectExecResponse.getExitCode(), is(nullValue()));
diff --git a/src/test/java/com/github/dockerjava/cmd/InspectNetworkCmdIT.java b/src/test/java/com/github/dockerjava/cmd/InspectNetworkCmdIT.java
new file mode 100644
index 000000000..eca86497d
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/InspectNetworkCmdIT.java
@@ -0,0 +1,32 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.Network;
+import org.junit.Test;
+
+import java.util.List;
+
+import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
+import static com.github.dockerjava.utils.TestUtils.findNetwork;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+public class InspectNetworkCmdIT extends CmdIT {
+
+    @Test
+    public void inspectNetwork() throws DockerException {
+        assumeNotSwarm("no network in swarm", dockerRule);
+
+        List<Network> networks = dockerRule.getClient().listNetworksCmd().exec();
+
+        Network expected = findNetwork(networks, "bridge");
+
+        Network network = dockerRule.getClient().inspectNetworkCmd().withNetworkId(expected.getId()).exec();
+
+        assertThat(network.getName(), equalTo(expected.getName()));
+        assertThat(network.getScope(), equalTo(expected.getScope()));
+        assertThat(network.getDriver(), equalTo(expected.getDriver()));
+        assertThat(network.getIpam().getConfig().get(0).getSubnet(), equalTo(expected.getIpam().getConfig().get(0).getSubnet()));
+        assertThat(network.getIpam().getDriver(), equalTo(expected.getIpam().getDriver()));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/InspectVolumeCmdIT.java b/src/test/java/com/github/dockerjava/cmd/InspectVolumeCmdIT.java
new file mode 100644
index 000000000..20e56dceb
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/InspectVolumeCmdIT.java
@@ -0,0 +1,35 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.InspectVolumeResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import org.junit.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+
+public class InspectVolumeCmdIT extends CmdIT {
+
+    @Test
+    public void inspectVolume() throws DockerException {
+
+        String volumeName = "volume1";
+
+        dockerRule.getClient().createVolumeCmd().withName(volumeName).withDriver("local").exec();
+
+        InspectVolumeResponse inspectVolumeResponse = dockerRule.getClient().inspectVolumeCmd(volumeName).exec();
+
+        assertThat(inspectVolumeResponse.getName(), equalTo("volume1"));
+        assertThat(inspectVolumeResponse.getDriver(), equalTo("local"));
+        assertThat(inspectVolumeResponse.getMountpoint(), containsString("/volume1/"));
+    }
+
+    @Test(expected = NotFoundException.class)
+    public void inspectNonExistentVolume() throws DockerException {
+
+        String volumeName = "non-existing";
+
+        dockerRule.getClient().inspectVolumeCmd(volumeName).exec();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/KillContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/KillContainerCmdIT.java
new file mode 100644
index 000000000..c79c6992b
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/KillContainerCmdIT.java
@@ -0,0 +1,45 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+public class KillContainerCmdIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(KillContainerCmdIT.class);
+
+    @Test
+    public void killContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        LOG.info("Killing container: {}", container.getId());
+        dockerRule.getClient().killContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
+        assertThat(inspectContainerResponse.getState().getExitCode(), not(equalTo(0)));
+
+    }
+
+    @Test(expected = NotFoundException.class)
+    public void killNonExistingContainer() throws DockerException {
+
+        dockerRule.getClient().killContainerCmd("non-existing").exec();
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java b/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
similarity index 58%
rename from src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java
rename to src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
index 9befc304a..73fb7704c 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
@@ -1,8 +1,20 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.Container;
+import com.google.common.collect.ImmutableMap;
+import org.hamcrest.Matcher;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.Map;
 
 import static ch.lambdaj.Lambda.filter;
 import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItem;
@@ -11,75 +23,37 @@
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.startsWith;
-import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
-
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Map;
-
-import org.hamcrest.Matcher;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.Container;
-import com.github.dockerjava.core.command.PullImageResultCallback;
-import com.github.dockerjava.core.util.FiltersBuilder;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-import com.google.common.collect.ImmutableMap;
+import static org.junit.Assert.assertEquals;
+import static org.testinfected.hamcrest.jpa.PersistenceMatchers.hasField;
 
-@Test(groups = "integration")
-public class ListContainersCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
+public class ListContainersCmdIT extends CmdIT {
+    private static final Logger LOG = LoggerFactory.getLogger(ListContainersCmdIT.class);
 
+    @Ignore("can't work in parallel and second test seems cover this")
     @Test
     public void testListContainers() throws Exception {
 
         String testImage = "busybox";
 
-        List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
+        List<Container> containers = dockerRule.getClient().listContainersCmd().withShowAll(true).exec();
         assertThat(containers, notNullValue());
         LOG.info("Container List: {}", containers);
 
         int size = containers.size();
 
-        CreateContainerResponse container1 = dockerClient.createContainerCmd(testImage).withCmd("echo").exec();
+        CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(testImage).withCmd("echo").exec();
 
         assertThat(container1.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container1.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container1.getId()).exec();
 
         assertThat(inspectContainerResponse.getConfig().getImage(), is(equalTo(testImage)));
 
-        dockerClient.startContainerCmd(container1.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container1.getId()).exec();
 
         LOG.info("container id: " + container1.getId());
 
-        List<Container> containers2 = dockerClient.listContainersCmd().withShowAll(true).exec();
+        List<Container> containers2 = dockerRule.getClient().listContainersCmd().withShowAll(true).exec();
 
         for (Container container : containers2) {
             LOG.info("listContainer: id=" + container.getId() + " image=" + container.getImage());
@@ -106,33 +80,33 @@ public void testListContainersWithLabelsFilter() throws Exception {
 
         String testImage = "busybox";
 
-        List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
+        List<Container> containers = dockerRule.getClient().listContainersCmd().withShowAll(true).exec();
         assertThat(containers, notNullValue());
         LOG.info("Container List: {}", containers);
 
-        int size = containers.size();
+//        int size = containers.size();
 
-        CreateContainerResponse container1 = dockerClient.createContainerCmd(testImage).withCmd("echo").exec();
+        CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(testImage).withCmd("echo").exec();
 
         assertThat(container1.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container1.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container1.getId()).exec();
 
         assertThat(inspectContainerResponse.getConfig().getImage(), is(equalTo(testImage)));
 
-        dockerClient.startContainerCmd(container1.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container1.getId()).exec();
 
         LOG.info("container id: " + container1.getId());
 
-        List<Container> containers2 = dockerClient.listContainersCmd().withShowAll(true).exec();
+        List<Container> containers2 = dockerRule.getClient().listContainersCmd().withShowAll(true).exec();
 
         for (Container container : containers2) {
             LOG.info("listContainer: id=" + container.getId() + " image=" + container.getImage());
         }
 
-        assertThat(size + 1, is(equalTo(containers2.size())));
-        Matcher matcher = hasItem(hasField("id", startsWith(container1.getId())));
-        assertThat(containers2, matcher);
+        // some parallel test may create containers
+//        assertThat(size + 1, is(equalTo(containers2.size())));
+        assertThat(containers2, (Matcher) hasItem(hasField("id", startsWith(container1.getId()))));
 
         List<Container> filteredContainers = filter(hasField("id", startsWith(container1.getId())), containers2);
         assertThat(filteredContainers.size(), is(equalTo(1)));
@@ -145,33 +119,43 @@ public void testListContainersWithLabelsFilter() throws Exception {
         assertThat(container2.getCommand(), not(isEmptyString()));
         assertThat(container2.getImage(), startsWith(testImage));
 
-        Map<String, String> labels = ImmutableMap.of("test", "docker-java");
 
-        // list with filter by label
-        dockerClient.createContainerCmd(testImage)
-                .withCmd("echo")
-                .withLabels(labels)
-                .exec();
 
-        filteredContainers = dockerClient.listContainersCmd()
+        Map<String, String> labels = ImmutableMap.of("test" + dockerRule.getKind(), "docker-java");
+        List<Container> containersForRemove = dockerRule.getClient().listContainersCmd().withShowAll(true)
+                .withLabelFilter(labels).exec();
+        if (containersForRemove != null) {
+            for (Container container : containersForRemove) {
+                dockerRule.getClient().removeContainerCmd(container.getId()).withForce(true).exec();
+            }
+        }
+
+        // list with filter by Map label
+        dockerRule.getClient().createContainerCmd(testImage).withCmd("echo").withLabels(labels).exec();
+
+        List<Container> filteredContainersByMap = dockerRule.getClient().listContainersCmd()
                 .withShowAll(true)
                 .withLabelFilter(labels)
                 .exec();
 
-        assertThat(filteredContainers.size(), is(equalTo(1)));
-        Container container3 = filteredContainers.get(0);
+        assertThat(filteredContainersByMap.size(), is(equalTo( 1)));
+
+        Container container3 = filteredContainersByMap.get(0);
         assertThat(container3.getCommand(), not(isEmptyString()));
         assertThat(container3.getImage(), startsWith(testImage));
 
-        filteredContainers = dockerClient.listContainersCmd().withShowAll(true)
-                .withLabelFilter("test")
+        // List by string label
+        filteredContainers = dockerRule.getClient().listContainersCmd()
+                .withShowAll(true)
+                .withLabelFilter("test" + dockerRule.getKind())
                 .exec();
 
         assertThat(filteredContainers.size(), is(equalTo(1)));
+
         container3 = filteredContainers.get(0);
         assertThat(container3.getCommand(), not(isEmptyString()));
         assertThat(container3.getImage(), startsWith(testImage));
-        if (isNotSwarm(dockerClient)) {
+        if (isNotSwarm(dockerRule.getClient())) {
             assertEquals(container3.getLabels(), labels);
         }
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java b/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java
similarity index 56%
rename from src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
rename to src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java
index d41d8fef1..73a715900 100644
--- a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java
@@ -1,7 +1,16 @@
-package com.github.dockerjava.core.command;
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.Image;
+import com.github.dockerjava.api.model.Info;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
 
 import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.emptyArray;
 import static org.hamcrest.Matchers.equalTo;
@@ -10,54 +19,19 @@
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertTrue;
 
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.model.Image;
-import com.github.dockerjava.api.model.Info;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class ListImagesCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
+public class ListImagesCmdIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(ListImagesCmdIT.class);
 
     @Test
     public void listImages() throws DockerException {
-        List<Image> images = dockerClient.listImagesCmd().withShowAll(true).exec();
+        List<Image> images = dockerRule.getClient().listImagesCmd().withShowAll(true).exec();
         assertThat(images, notNullValue());
         LOG.info("Images List: {}", images);
-        Info info = dockerClient.infoCmd().exec();
+        Info info = dockerRule.getClient().infoCmd().exec();
 
-        if (isNotSwarm(dockerClient)) {
+        if (isNotSwarm(dockerRule.getClient())) {
             assertThat(images.size(), equalTo(info.getImages()));
         }
 
@@ -68,10 +42,10 @@ public void listImages() throws DockerException {
         assertThat(img.getRepoTags(), not(emptyArray()));
     }
 
-    @Test(groups = "ignoreInCircleCi")
+    @Test
     public void listImagesWithDanglingFilter() throws DockerException {
         String imageId = createDanglingImage();
-        List<Image> images = dockerClient.listImagesCmd().withDanglingFilter(true).withShowAll(true)
+        List<Image> images = dockerRule.getClient().listImagesCmd().withDanglingFilter(true).withShowAll(true)
                 .exec();
         assertThat(images, notNullValue());
         LOG.info("Images List: {}", images);
@@ -90,16 +64,16 @@ private boolean isImageInFilteredList(List<Image> images, String expectedImageId
     }
 
     private String createDanglingImage() {
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
         LOG.info("Committing container {}", container.toString());
-        String imageId = dockerClient.commitCmd(container.getId()).exec();
+        String imageId = dockerRule.getClient().commitCmd(container.getId()).exec();
 
-        dockerClient.stopContainerCmd(container.getId()).exec();
-        dockerClient.removeContainerCmd(container.getId()).exec();
+        dockerRule.getClient().stopContainerCmd(container.getId()).exec();
+        dockerRule.getClient().removeContainerCmd(container.getId()).exec();
         return imageId;
     }
 }
diff --git a/src/test/java/com/github/dockerjava/cmd/ListNetworksCmdIT.java b/src/test/java/com/github/dockerjava/cmd/ListNetworksCmdIT.java
new file mode 100644
index 000000000..23fb24242
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/ListNetworksCmdIT.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.utils.TestUtils;
+import org.junit.Test;
+
+import java.util.List;
+
+import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+public class ListNetworksCmdIT extends CmdIT {
+
+    @Test
+    public void listNetworks() throws DockerException {
+        assumeNotSwarm("Swarm has no network", dockerRule);
+
+        List<Network> networks = dockerRule.getClient().listNetworksCmd().exec();
+
+        Network network = TestUtils.findNetwork(networks, "bridge");
+
+        assertThat(network.getName(), equalTo("bridge"));
+        assertThat(network.getScope(), equalTo("local"));
+        assertThat(network.getDriver(), equalTo("bridge"));
+        assertThat(network.getIpam().getDriver(), equalTo("default"));
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/ListVolumesCmdIT.java b/src/test/java/com/github/dockerjava/cmd/ListVolumesCmdIT.java
new file mode 100644
index 000000000..a54ae33da
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/ListVolumesCmdIT.java
@@ -0,0 +1,29 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateVolumeResponse;
+import com.github.dockerjava.api.command.ListVolumesResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import org.junit.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+
+public class ListVolumesCmdIT extends CmdIT {
+   
+    @Test
+    public void listVolumes() throws DockerException {
+
+        CreateVolumeResponse createVolumeResponse = dockerRule.getClient().createVolumeCmd().withName("volume1")
+                .withDriver("local").exec();
+
+        assertThat(createVolumeResponse.getName(), equalTo("volume1"));
+        assertThat(createVolumeResponse.getDriver(), equalTo("local"));
+        assertThat(createVolumeResponse.getMountpoint(), containsString("/volume1/"));
+
+        ListVolumesResponse listVolumesResponse = dockerRule.getClient().listVolumesCmd().exec();
+
+        assertThat(listVolumesResponse.getVolumes().size(), greaterThanOrEqualTo(1));
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/LoadImageCmdImplTest.java b/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java
similarity index 53%
rename from src/test/java/com/github/dockerjava/core/command/LoadImageCmdImplTest.java
rename to src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java
index 7cecf7334..22cb59d64 100644
--- a/src/test/java/com/github/dockerjava/core/command/LoadImageCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java
@@ -1,64 +1,47 @@
-package com.github.dockerjava.core.command;
+package com.github.dockerjava.cmd;
 
 import com.github.dockerjava.api.model.Image;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
 import com.github.dockerjava.utils.TestResources;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import net.jcip.annotations.NotThreadSafe;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.io.InputStream;
-import java.lang.reflect.Method;
 import java.nio.file.Files;
 import java.util.List;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.IsNull.notNullValue;
 import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.core.IsNull.notNullValue;
 
-@Test(groups = "integration")
-public class LoadImageCmdImplTest extends AbstractDockerClientTest {
+@NotThreadSafe
+public class LoadImageCmdIT extends CmdIT {
 
     private String expectedImageId;
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
+    
+    @Before
+    public void beforeMethod() {
         expectedImageId = "sha256:56031f66eb0cef2e2e5cb2d1dabafaa0ebcd0a18a507d313b5bdb8c0472c5eba";
-        if (findImageWithId(expectedImageId, dockerClient.listImagesCmd().exec()) != null) {
-            dockerClient.removeImageCmd(expectedImageId).exec();
+        if (findImageWithId(expectedImageId, dockerRule.getClient().listImagesCmd().exec()) != null) {
+            dockerRule.getClient().removeImageCmd(expectedImageId).exec();
         }
     }
 
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        dockerClient.removeImageCmd(expectedImageId).exec();
-        super.afterMethod(result);
+    @After
+    public void afterMethod() {
+        dockerRule.getClient().removeImageCmd(expectedImageId).exec();
     }
 
     @Test
     public void loadImageFromTar() throws Exception {
         try (InputStream uploadStream = Files.newInputStream(TestResources.getApiImagesLoadTestTarball())) {
-            dockerClient.loadImageCmd(uploadStream).exec();
+            dockerRule.getClient().loadImageCmd(uploadStream).exec();
         }
 
-        final Image image = findImageWithId(expectedImageId, dockerClient.listImagesCmd().exec());
+        final Image image = findImageWithId(expectedImageId, dockerRule.getClient().listImagesCmd().exec());
 
         assertThat("Can't find expected image after loading from a tar archive!", image, notNullValue());
         assertThat("Image after loading from a tar archive has wrong tags!",
diff --git a/src/test/java/com/github/dockerjava/netty/exec/LogContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
similarity index 71%
rename from src/test/java/com/github/dockerjava/netty/exec/LogContainerCmdExecTest.java
rename to src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
index fe408ac18..db0700ecc 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/LogContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
@@ -1,55 +1,32 @@
-package com.github.dockerjava.netty.exec;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.containsString;
-
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.concurrent.TimeUnit;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+package com.github.dockerjava.cmd;
 
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.StreamType;
 import com.github.dockerjava.core.command.WaitContainerResultCallback;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class LogContainerCmdExecTest extends AbstractNettyDockerClientTest {
+import com.github.dockerjava.utils.LogContainerTestCallback;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
 
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
+public class LogContainerCmdIT extends CmdIT {
+    private static final Logger LOG = LoggerFactory.getLogger(LogContainerCmdIT.class);
 
     @Test
     public void asyncLogContainerWithTtyEnabled() throws Exception {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
                 .withCmd("/bin/sh", "-c", "while true; do echo hello; sleep 1; done")
                 .withTty(true)
                 .exec();
@@ -57,13 +34,13 @@ public void asyncLogContainerWithTtyEnabled() throws Exception {
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId())
+        dockerRule.getClient().startContainerCmd(container.getId())
             .exec();
 
         LogContainerTestCallback loggingCallback = new LogContainerTestCallback(true);
 
         // this essentially test the since=0 case
-        dockerClient.logContainerCmd(container.getId())
+        dockerRule.getClient().logContainerCmd(container.getId())
             .withStdErr(true)
             .withStdOut(true)
             .withFollowStream(true)
@@ -80,7 +57,7 @@ public void asyncLogContainerWithTtyEnabled() throws Exception {
     @Test
     public void asyncLogContainerWithTtyDisabled() throws Exception {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
                 .withCmd("/bin/sh", "-c", "while true; do echo hello; sleep 1; done")
                 .withTty(false)
                 .exec();
@@ -88,13 +65,13 @@ public void asyncLogContainerWithTtyDisabled() throws Exception {
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId())
+        dockerRule.getClient().startContainerCmd(container.getId())
             .exec();
 
         LogContainerTestCallback loggingCallback = new LogContainerTestCallback(true);
 
         // this essentially test the since=0 case
-        dockerClient.logContainerCmd(container.getId())
+        dockerRule.getClient().logContainerCmd(container.getId())
             .withStdErr(true)
             .withStdOut(true)
             .withFollowStream(true)
@@ -129,11 +106,11 @@ public void onError(Throwable throwable) {
 
             public void onComplete() {
                 super.onComplete();
-                fail("expected NotFoundException");
+                throw new AssertionError("expected NotFoundException");
             };
         };
 
-        dockerClient.logContainerCmd("non-existing").withStdErr(true).withStdOut(true).exec(loggingCallback)
+        dockerRule.getClient().logContainerCmd("non-existing").withStdErr(true).withStdOut(true).exec(loggingCallback)
                 .awaitCompletion();
     }
 
@@ -142,16 +119,16 @@ public void asyncMultipleLogContainer() throws Exception {
 
         String snippet = "hello world";
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
                 .withCmd("/bin/echo", snippet)
                 .exec();
 
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        int exitCode = dockerClient.waitContainerCmd(container.getId())
+        int exitCode = dockerRule.getClient().waitContainerCmd(container.getId())
                 .exec(new WaitContainerResultCallback())
                 .awaitStatusCode();
 
@@ -159,7 +136,7 @@ public void asyncMultipleLogContainer() throws Exception {
 
         LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
 
-        dockerClient.logContainerCmd(container.getId())
+        dockerRule.getClient().logContainerCmd(container.getId())
                 .withStdErr(true)
                 .withStdOut(true)
                 .exec(loggingCallback);
@@ -168,7 +145,7 @@ public void asyncMultipleLogContainer() throws Exception {
 
         loggingCallback = new LogContainerTestCallback();
 
-        dockerClient.logContainerCmd(container.getId())
+        dockerRule.getClient().logContainerCmd(container.getId())
                 .withStdErr(true)
                 .withStdOut(true)
                 .exec(loggingCallback);
@@ -177,7 +154,7 @@ public void asyncMultipleLogContainer() throws Exception {
 
         loggingCallback = new LogContainerTestCallback();
 
-        dockerClient.logContainerCmd(container.getId())
+        dockerRule.getClient().logContainerCmd(container.getId())
                 .withStdErr(true)
                 .withStdOut(true)
                 .exec(loggingCallback);
@@ -191,7 +168,7 @@ public void asyncMultipleLogContainer() throws Exception {
     public void asyncLogContainerWithSince() throws Exception {
         String snippet = "hello world";
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
                 .withCmd("/bin/echo", snippet)
                 .exec();
 
@@ -200,9 +177,9 @@ public void asyncLogContainerWithSince() throws Exception {
 
         int timestamp = (int) (System.currentTimeMillis() / 1000);
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        int exitCode = dockerClient.waitContainerCmd(container.getId())
+        int exitCode = dockerRule.getClient().waitContainerCmd(container.getId())
                 .exec(new WaitContainerResultCallback())
                 .awaitStatusCode();
 
@@ -210,7 +187,7 @@ public void asyncLogContainerWithSince() throws Exception {
 
         LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
 
-        dockerClient.logContainerCmd(container.getId())
+        dockerRule.getClient().logContainerCmd(container.getId())
                 .withStdErr(true)
                 .withStdOut(true)
                 .withSince(timestamp)
diff --git a/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java b/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java
new file mode 100644
index 000000000..a2533ae82
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java
@@ -0,0 +1,73 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.InternalServerErrorException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.utils.ContainerUtils;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+public class PauseCmdIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(PauseCmdIT.class);
+    
+    @Test
+    public void pauseRunningContainer() {
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        ContainerUtils.startContainer(dockerRule.getClient(), container);
+
+        ContainerUtils.pauseContainer(dockerRule.getClient(), container);
+    }
+
+    @Test(expected = NotFoundException.class)
+    public void pauseNonExistingContainer() {
+
+        dockerRule.getClient().pauseContainerCmd("non-existing").exec();
+    }
+
+    @Test(expected = InternalServerErrorException.class)
+    public void pauseStoppedContainer() {
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        ContainerUtils.startContainer(dockerRule.getClient(), container);
+
+        ContainerUtils.stopContainer(dockerRule.getClient(), container);
+
+        dockerRule.getClient().pauseContainerCmd(container.getId()).exec();
+    }
+
+    @Test(expected = InternalServerErrorException.class)
+    public void pausePausedContainer() {
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        ContainerUtils.startContainer(dockerRule.getClient(), container);
+
+        ContainerUtils.pauseContainer(dockerRule.getClient(), container);
+
+        dockerRule.getClient().pauseContainerCmd(container.getId()).exec();
+    }
+
+    @Test(expected = InternalServerErrorException.class)
+    public void pauseCreatedContainer() {
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerRule.getClient().pauseContainerCmd(container.getId()).exec();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/PingCmdIT.java b/src/test/java/com/github/dockerjava/cmd/PingCmdIT.java
new file mode 100644
index 000000000..dde81463c
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/PingCmdIT.java
@@ -0,0 +1,13 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.exception.DockerException;
+import org.junit.Test;
+
+public class PingCmdIT extends CmdIT {
+
+    @Test
+    public void ping() throws DockerException {
+        dockerRule.getClient().pingCmd().exec();
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/PullImageCmdExecTest.java b/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
similarity index 60%
rename from src/test/java/com/github/dockerjava/netty/exec/PullImageCmdExecTest.java
rename to src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
index 53fa8d660..584ff233c 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/PullImageCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
@@ -1,30 +1,34 @@
-package com.github.dockerjava.netty.exec;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.lessThanOrEqualTo;
-import static org.hamcrest.Matchers.notNullValue;
-
-import java.lang.reflect.Method;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+package com.github.dockerjava.cmd;
 
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.InspectImageResponse;
 import com.github.dockerjava.api.command.PullImageCmd;
+import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.api.model.PullResponseItem;
+import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.core.command.PullImageCmdImpl;
 import com.github.dockerjava.core.command.PullImageResultCallback;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-@Test(groups = "integration")
-public class PullImageCmdExecTest extends AbstractNettyDockerClientTest {
+import java.util.concurrent.TimeUnit;
+
+import static com.github.dockerjava.utils.TestUtils.getVersion;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertEquals;
+
+public class PullImageCmdIT extends CmdIT {
+    private static final Logger LOG = LoggerFactory.getLogger(PullImageCmdIT.class);
+
+    @Rule
+    public ExpectedException exception = ExpectedException.none();
 
     private static final PullImageCmd.Exec NOP_EXEC = new PullImageCmd.Exec() {
         public Void exec(PullImageCmd command, ResultCallback<PullResponseItem> resultCallback) {
@@ -32,32 +36,12 @@ public Void exec(PullImageCmd command, ResultCallback<PullResponseItem> resultCa
         };
     };
 
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
     @Test
     public void nullAuthConfig() throws Exception {
         PullImageCmdImpl pullImageCmd = new PullImageCmdImpl(NOP_EXEC, null, "");
         try {
             pullImageCmd.withAuthConfig(null);
-            fail();
+            throw new AssertionError();
         } catch (Exception e) {
             assertEquals(e.getMessage(), "authConfig was not specified");
         } finally {
@@ -67,7 +51,7 @@ public void nullAuthConfig() throws Exception {
 
     @Test
     public void testPullImage() throws Exception {
-        Info info = dockerClient.infoCmd().exec();
+        Info info = dockerRule.getClient().infoCmd().exec();
         LOG.info("Client info: {}", info.toString());
 
         int imgCount = info.getImages();
@@ -83,12 +67,12 @@ public void testPullImage() throws Exception {
         LOG.info("Removing image: {}", testImage);
 
         try {
-            dockerClient.removeImageCmd(testImage).withForce(true).exec();
+            dockerRule.getClient().removeImageCmd(testImage).withForce(true).exec();
         } catch (NotFoundException e) {
             // just ignore if not exist
         }
 
-        info = dockerClient.infoCmd().exec();
+        info = dockerRule.getClient().infoCmd().exec();
         LOG.info("Client info: {}", info.toString());
 
         imgCount = info.getImages();
@@ -96,24 +80,37 @@ public void testPullImage() throws Exception {
 
         LOG.info("Pulling image: {}", testImage);
 
-        dockerClient.pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess();
+        dockerRule.getClient().pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess();
 
-        info = dockerClient.infoCmd().exec();
+        info = dockerRule.getClient().infoCmd().exec();
         LOG.info("Client info after pull, {}", info.toString());
 
         assertThat(imgCount, lessThanOrEqualTo(info.getImages()));
 
-        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(testImage).exec();
+        InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(testImage).exec();
         LOG.info("Image Inspect: {}", inspectImageResponse.toString());
         assertThat(inspectImageResponse, notNullValue());
     }
 
+
+
     @Test
     public void testPullNonExistingImage() throws Exception {
-
         // does not throw an exception
+
+        if (getVersion(dockerRule.getClient()).equals(RemoteApiVersion.VERSION_1_24)) {
+            // 1.24 - no exception
+        } else if (getVersion(dockerRule.getClient())
+                .isGreaterOrEqual(RemoteApiVersion.VERSION_1_26)) {
+            exception.expect(NotFoundException.class);
+        } else {
+            exception.expect(DockerClientException.class);
+        }
+
         // stream needs to be fully read in order to close the underlying connection
-        dockerClient.pullImageCmd("xvxcv/foo").exec(new PullImageResultCallback()).awaitCompletion();
+        dockerRule.getClient().pullImageCmd("xvxcv/foo")
+                .exec(new PullImageResultCallback())
+                .awaitCompletion(30, TimeUnit.SECONDS);
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java b/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
new file mode 100644
index 000000000..37d0b0575
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
@@ -0,0 +1,80 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.DockerClientException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.core.RemoteApiVersion;
+import com.github.dockerjava.core.command.PullImageResultCallback;
+import com.github.dockerjava.core.command.PushImageResultCallback;
+import com.github.dockerjava.junit.category.AuthIntegration;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.ExpectedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.TimeUnit;
+
+import static com.github.dockerjava.utils.TestUtils.getVersion;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+public class PushImageCmdIT extends CmdIT {
+
+    public static final Logger LOG = LoggerFactory.getLogger(PushImageCmdIT.class);
+
+    private String username;
+
+    @Rule
+    public ExpectedException exception = ExpectedException.none();
+
+    @Before
+    public void beforeTest() throws Exception {
+        username = dockerRule.getClient().authConfig().getUsername();
+    }
+
+    @Category(AuthIntegration.class)
+    @Test
+    public void pushLatest() throws Exception {
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        LOG.info("Committing container: {}", container.toString());
+        String imageId = dockerRule.getClient().commitCmd(container.getId()).withRepository(username + "/busybox").exec();
+
+        // we have to block until image is pushed
+        dockerRule.getClient().pushImageCmd(username + "/busybox").exec(new PushImageResultCallback()).awaitSuccess();
+
+        LOG.info("Removing image: {}", imageId);
+        dockerRule.getClient().removeImageCmd(imageId).exec();
+
+        dockerRule.getClient().pullImageCmd(username + "/busybox").exec(new PullImageResultCallback()).awaitSuccess();
+    }
+
+    @Test
+    public void pushNonExistentImage() throws Exception {
+
+        if (getVersion(dockerRule.getClient())
+                .isGreaterOrEqual(RemoteApiVersion.VERSION_1_26)) {
+         // no errors??
+        } else if (getVersion(dockerRule.getClient())
+                .isGreaterOrEqual(RemoteApiVersion.VERSION_1_24)) {
+            exception.expect(DockerClientException.class);
+        } else {
+            exception.expect(NotFoundException.class);
+        }
+
+        dockerRule.getClient().pushImageCmd(username + "/xxx")
+                .exec(new PushImageResultCallback())
+                .awaitCompletion(20, TimeUnit.SECONDS); // exclude infinite await sleep
+
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java b/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java
new file mode 100644
index 000000000..29abc7722
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java
@@ -0,0 +1,50 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.core.command.WaitContainerResultCallback;
+import org.hamcrest.Matcher;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.startsWith;
+import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
+
+public class RemoveContainerCmdImplIT extends CmdIT {
+
+    public static final Logger LOG = LoggerFactory.getLogger(RemoveContainerCmdImplIT.class);
+    
+
+    @Test
+    public void removeContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true").exec();
+
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
+
+        LOG.info("Removing container: {}", container.getId());
+        dockerRule.getClient().removeContainerCmd(container.getId()).exec();
+
+        List<Container> containers2 = dockerRule.getClient().listContainersCmd().withShowAll(true).exec();
+
+        Matcher matcher = not(hasItem(hasField("id", startsWith(container.getId()))));
+        assertThat(containers2, matcher);
+
+    }
+
+    @Test(expected = NotFoundException.class)
+    public void removeNonExistingContainer() throws DockerException {
+
+        dockerRule.getClient().removeContainerCmd("non-existing").exec();
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java b/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java
new file mode 100644
index 000000000..9d2325f63
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java
@@ -0,0 +1,54 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.Container;
+import org.hamcrest.Matcher;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.startsWith;
+import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
+
+public class RemoveImageCmdIT extends CmdIT {
+
+    public static final Logger LOG = LoggerFactory.getLogger(RemoveImageCmdIT.class);
+    
+    @Test
+    public void removeImage() throws DockerException, InterruptedException {
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        LOG.info("Committing container {}", container.toString());
+        String imageId = dockerRule.getClient().commitCmd(container.getId()).exec();
+
+        dockerRule.getClient().stopContainerCmd(container.getId()).exec();
+        dockerRule.getClient().removeContainerCmd(container.getId()).exec();
+
+        LOG.info("Removing image: {}", imageId);
+        dockerRule.getClient().removeImageCmd(imageId).exec();
+
+        List<Container> containers = dockerRule.getClient().listContainersCmd().withShowAll(true).exec();
+
+        Matcher matcher = not(hasItem(hasField("id", startsWith(imageId))));
+        assertThat(containers, matcher);
+    }
+
+    @Test(expected = NotFoundException.class)
+    public void removeNonExistingImage() throws DockerException, InterruptedException {
+
+        dockerRule.getClient().removeImageCmd("non-existing").exec();
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/RemoveNetworkCmdIT.java b/src/test/java/com/github/dockerjava/cmd/RemoveNetworkCmdIT.java
new file mode 100644
index 000000000..974022c20
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/RemoveNetworkCmdIT.java
@@ -0,0 +1,51 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.Network;
+import org.hamcrest.Matcher;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.startsWith;
+import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+public class RemoveNetworkCmdIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(RemoveNetworkCmdIT.class);
+
+    @Test
+    public void removeNetwork() throws DockerException {
+        assumeNotSwarm("Swarm has no network", dockerRule);
+
+        CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd()
+                .withName("test-network")
+                .exec();
+
+        LOG.info("Removing network: {}", network.getId());
+        dockerRule.getClient().removeNetworkCmd(network.getId()).exec();
+
+        List<Network> networks = dockerRule.getClient().listNetworksCmd().exec();
+
+        Matcher matcher = not(hasItem(hasField("id", startsWith(network.getId()))));
+        assertThat(networks, matcher);
+
+    }
+
+    @Test(expected = NotFoundException.class)
+    public void removeNonExistingContainer() throws DockerException {
+        assumeNotSwarm("Swarm has no network", dockerRule);
+
+        dockerRule.getClient().removeNetworkCmd("non-existing").exec();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java b/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java
new file mode 100644
index 000000000..562e43c4c
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java
@@ -0,0 +1,32 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateVolumeResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import org.junit.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+
+public class RemoveVolumeCmdIT extends CmdIT {
+
+   
+    @Test(expected = NotFoundException.class)
+    public void removeVolume() throws DockerException {
+
+        String volumeName = "volume1" + dockerRule.getKind();
+
+        CreateVolumeResponse createVolumeResponse = dockerRule.getClient().createVolumeCmd()
+                .withName(volumeName)
+                .withDriver("local").exec();
+
+        assertThat(createVolumeResponse.getName(), equalTo(volumeName));
+        assertThat(createVolumeResponse.getDriver(), equalTo("local"));
+        assertThat(createVolumeResponse.getMountpoint(), containsString(volumeName));
+
+        dockerRule.getClient().removeVolumeCmd(volumeName).exec();
+
+        dockerRule.getClient().inspectVolumeCmd(volumeName).exec();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java
new file mode 100644
index 000000000..a0708ff7a
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java
@@ -0,0 +1,52 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertNotEquals;
+
+public class RenameContainerCmdIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(RenameContainerCmdIT.class);
+
+    @Test
+    public void renameContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        String name1 = inspectContainerResponse.getName();
+
+        dockerRule.getClient().renameContainerCmd(container.getId())
+                .withName(dockerRule.getKind() + "renameContainer")
+                .exec();
+
+        InspectContainerResponse inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect After Rename: {}", inspectContainerResponse2.toString());
+
+        String name2 = inspectContainerResponse2.getName();
+
+        assertNotEquals(name1, name2);
+
+        dockerRule.getClient().killContainerCmd(container.getId()).exec();
+    }
+
+    @Test(expected = NotFoundException.class)
+    public void renameExistingContainer() throws DockerException, InterruptedException {
+        dockerRule.getClient().renameContainerCmd("non-existing")
+                .withName(dockerRule.getKind() + "renameExistingContainer")
+                .exec();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java b/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java
new file mode 100644
index 000000000..f49e7baaa
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java
@@ -0,0 +1,52 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+public class RestartContainerCmdImplIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(RestartContainerCmdImplIT.class);
+
+    @Test
+    public void restartContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        String startTime = inspectContainerResponse.getState().getStartedAt();
+
+        dockerRule.getClient().restartContainerCmd(container.getId()).withtTimeout(2).exec();
+
+        InspectContainerResponse inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect After Restart: {}", inspectContainerResponse2.toString());
+
+        String startTime2 = inspectContainerResponse2.getState().getStartedAt();
+
+        assertThat(startTime, not(equalTo(startTime2)));
+
+        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(true)));
+
+        dockerRule.getClient().killContainerCmd(container.getId()).exec();
+    }
+
+    @Test(expected = NotFoundException.class)
+    public void restartNonExistingContainer() throws DockerException, InterruptedException {
+
+        dockerRule.getClient().restartContainerCmd("non-existing").exec();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java b/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java
new file mode 100644
index 000000000..81abfcd9a
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java
@@ -0,0 +1,24 @@
+package com.github.dockerjava.cmd;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.InputStream;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
+
+public class SaveImageCmdIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(SaveImageCmdIT.class);
+
+    @Test
+    public void saveImage() throws Exception {
+
+        InputStream image = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImageCmd("busybox").exec());
+        assertThat(image.available(), greaterThan(0));
+
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/SearchImagesCmdIT.java b/src/test/java/com/github/dockerjava/cmd/SearchImagesCmdIT.java
new file mode 100644
index 000000000..0dba9aefd
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/SearchImagesCmdIT.java
@@ -0,0 +1,33 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.SearchItem;
+import org.hamcrest.Matcher;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import static ch.lambdaj.Lambda.filter;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.is;
+import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
+
+public class SearchImagesCmdIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(SearchImagesCmdIT.class);
+
+    @Test
+    public void searchImages() throws DockerException {
+        List<SearchItem> dockerSearch = dockerRule.getClient().searchImagesCmd("busybox").exec();
+        LOG.info("Search returned {}", dockerSearch.toString());
+
+        Matcher matcher = hasItem(hasField("name", equalTo("busybox")));
+        assertThat(dockerSearch, matcher);
+
+        assertThat(filter(hasField("name", is("busybox")), dockerSearch).size(), equalTo(1));
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
similarity index 71%
rename from src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
rename to src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
index 4bb8f2b99..7dd965411 100644
--- a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.core.command;
+package com.github.dockerjava.cmd;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.command.CreateContainerResponse;
@@ -12,20 +12,16 @@
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.Link;
 import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.Ports.Binding;
 import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
-import com.github.dockerjava.api.model.Ports.Binding;
-import com.github.dockerjava.client.AbstractDockerClientTest;
+import com.github.dockerjava.core.command.WaitContainerResultCallback;
+import net.jcip.annotations.NotThreadSafe;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
@@ -33,6 +29,7 @@
 import static com.github.dockerjava.api.model.AccessMode.ro;
 import static com.github.dockerjava.api.model.Capability.MKNOD;
 import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
+import static com.github.dockerjava.junit.DockerMatchers.mountedVolumes;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
@@ -44,28 +41,9 @@
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.startsWith;
 
-@Test(groups = "integration")
-public class StartContainerCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
+@NotThreadSafe
+public class StartContainerCmdIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(StartContainerCmdIT.class);
 
     @Test
     public void startContainerWithVolumes() throws DockerException {
@@ -75,7 +53,7 @@ public void startContainerWithVolumes() throws DockerException {
 
         Volume volume2 = new Volume("/opt/webapp2");
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withVolumes(volume1, volume2)
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withVolumes(volume1, volume2)
                 .withCmd("true").withBinds(new Bind("/src/webapp1", volume1, ro), new Bind("/src/webapp2", volume2))
                 .exec();
 
@@ -83,15 +61,15 @@ public void startContainerWithVolumes() throws DockerException {
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(), contains("/opt/webapp1", "/opt/webapp2"));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
+        dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
 
-        inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(inspectContainerResponse, mountedVolumes(containsInAnyOrder(volume1, volume2)));
 
@@ -115,27 +93,27 @@ public void startContainerWithVolumesFrom() throws DockerException {
 
         String container1Name = UUID.randomUUID().toString();
 
-        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+        CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withName(container1Name)
                 .withBinds(new Bind("/src/webapp1", volume1), new Bind("/src/webapp2", volume2)).exec();
         LOG.info("Created container1 {}", container1.toString());
 
-        dockerClient.startContainerCmd(container1.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container1.getId()).exec();
         LOG.info("Started container1 {}", container1.toString());
 
-        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+        InspectContainerResponse inspectContainerResponse1 = dockerRule.getClient().inspectContainerCmd(container1.getId())
                 .exec();
 
         assertThat(inspectContainerResponse1, mountedVolumes(containsInAnyOrder(volume1, volume2)));
 
-        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+        CreateContainerResponse container2 = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withVolumesFrom(new VolumesFrom(container1Name)).exec();
         LOG.info("Created container2 {}", container2.toString());
 
-        dockerClient.startContainerCmd(container2.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container2.getId()).exec();
         LOG.info("Started container2 {}", container2.toString());
 
-        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+        InspectContainerResponse inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container2.getId())
                 .exec();
 
         assertThat(inspectContainerResponse2, mountedVolumes(containsInAnyOrder(volume1, volume2)));
@@ -147,16 +125,16 @@ public void startContainerWithDns() throws DockerException {
         String aDnsServer = "8.8.8.8";
         String anotherDnsServer = "8.8.4.4";
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true")
                 .withDns(aDnsServer, anotherDnsServer).exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()),
                 contains(aDnsServer, anotherDnsServer));
@@ -167,18 +145,18 @@ public void startContainerWithDnsSearch() throws DockerException {
 
         String dnsSearch = "example.com";
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true")
                 .withDnsSearch(dnsSearch).exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDnsSearch()), contains(dnsSearch));
     }
@@ -194,18 +172,18 @@ public void startContainerWithPortBindings() throws DockerException {
         portBindings.bind(tcp23, Binding.bindPort(11023));
         portBindings.bind(tcp23, Binding.bindPort(11024));
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
@@ -230,16 +208,16 @@ public void startContainerWithRandomPortBindings() throws DockerException {
         portBindings.bind(tcp22, Binding.empty());
         portBindings.bind(tcp23, Binding.empty());
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).withPublishAllPorts(true).exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
@@ -251,7 +229,7 @@ public void startContainerWithRandomPortBindings() throws DockerException {
 
     }
 
-    @Test(expectedExceptions = InternalServerErrorException.class)
+    @Test(expected = InternalServerErrorException.class)
     public void startContainerWithConflictingPortBindings() throws DockerException {
 
         ExposedPort tcp22 = ExposedPort.tcp(22);
@@ -261,35 +239,41 @@ public void startContainerWithConflictingPortBindings() throws DockerException {
         portBindings.bind(tcp22, Binding.bindPort(11022));
         portBindings.bind(tcp23, Binding.bindPort(11022));
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
     }
 
     @Test
     public void startContainerWithLinkingDeprecated() throws DockerException {
+        String container1Name = "containerWithLink1" + dockerRule.getKind();
+        String container2Name = "containerWithLink2" + dockerRule.getKind();
+        dockerRule.ensureContainerRemoved(container1Name);
+        dockerRule.ensureContainerRemoved(container2Name);
 
-        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName("container1").exec();
+        CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd("busybox")
+                .withCmd("sleep", "9999")
+                .withName(container1Name)
+                .exec();
 
         LOG.info("Created container1 {}", container1.toString());
         assertThat(container1.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container1.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container1.getId()).exec();
 
-        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+        InspectContainerResponse inspectContainerResponse1 = dockerRule.getClient().inspectContainerCmd(container1.getId())
                 .exec();
         LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
 
         assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
         assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
         assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId()));
-        assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
+        assertThat(inspectContainerResponse1.getName(), equalTo("/" + container1Name));
         assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
         assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
         assertThat(inspectContainerResponse1.getState().getRunning(), is(true));
@@ -298,15 +282,15 @@ public void startContainerWithLinkingDeprecated() throws DockerException {
             assertThat(inspectContainerResponse1.getState().getExitCode(), is(equalTo(0)));
         }
 
-        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName("container2").withLinks(new Link("container1", "container1Link")).exec();
+        CreateContainerResponse container2 = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName(container2Name).withLinks(new Link(container1Name, container1Name + "Link")).exec();
 
         LOG.info("Created container2 {}", container2.toString());
         assertThat(container2.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container2.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container2.getId()).exec();
 
-        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+        InspectContainerResponse inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container2.getId())
                 .exec();
         LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
 
@@ -314,10 +298,10 @@ public void startContainerWithLinkingDeprecated() throws DockerException {
         assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
         assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link("container1",
-                "container1Link")}));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link(container1Name,
+                container1Name + "Link")}));
         assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
-        assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
+        assertThat(inspectContainerResponse2.getName(), equalTo("/" + container2Name));
         assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
         assertThat(inspectContainerResponse2.getState(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getState().getRunning(), is(true));
@@ -326,23 +310,29 @@ public void startContainerWithLinkingDeprecated() throws DockerException {
 
     @Test
     public void startContainerWithLinking() throws DockerException {
+        String container1Name = "containerWithLinking1" + dockerRule.getKind();
+        String container2Name = "containerWithLinking2" + dockerRule.getKind();
+        dockerRule.ensureContainerRemoved(container1Name);
+        dockerRule.ensureContainerRemoved(container2Name);
 
-        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName("container1").exec();
+        CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd("busybox")
+                .withCmd("sleep", "9999")
+                .withName(container1Name)
+                .exec();
 
         LOG.info("Created container1 {}", container1.toString());
         assertThat(container1.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container1.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container1.getId()).exec();
 
-        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
+        InspectContainerResponse inspectContainerResponse1 = dockerRule.getClient().inspectContainerCmd(container1.getId())
                 .exec();
         LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
 
         assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
         assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
         assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId()));
-        assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
+        assertThat(inspectContainerResponse1.getName(), equalTo("/" + container1Name));
         assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
         assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
         assertThat(inspectContainerResponse1.getState().getRunning(), is(true));
@@ -351,15 +341,15 @@ public void startContainerWithLinking() throws DockerException {
             assertThat(inspectContainerResponse1.getState().getExitCode(), is(equalTo(0)));
         }
 
-        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName("container2").withLinks(new Link("container1", "container1Link")).exec();
+        CreateContainerResponse container2 = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName(container2Name).withLinks(new Link(container1Name, container1Name + "Link")).exec();
 
         LOG.info("Created container2 {}", container2.toString());
         assertThat(container2.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container2.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container2.getId()).exec();
 
-        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
+        InspectContainerResponse inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container2.getId())
                 .exec();
         LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
 
@@ -367,10 +357,10 @@ public void startContainerWithLinking() throws DockerException {
         assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
         assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link("container1",
-                "container1Link")}));
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link(container1Name,
+                container1Name + "Link")}));
         assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
-        assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
+        assertThat(inspectContainerResponse2.getName(), equalTo("/" + container2Name));
         assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
         assertThat(inspectContainerResponse2.getState(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getState().getRunning(), is(true));
@@ -380,15 +370,15 @@ public void startContainerWithLinking() throws DockerException {
     @Test
     public void startContainer() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd(new String[] {"top"})
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd(new String[] {"top"})
                 .exec();
 
         LOG.info("Created container {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
         LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
 
         assertThat(inspectContainerResponse.getConfig(), is(notNullValue()));
@@ -406,10 +396,10 @@ public void startContainer() throws DockerException {
         }
     }
 
-    @Test(expectedExceptions = NotFoundException.class)
+    @Test(expected = NotFoundException.class)
     public void testStartNonExistingContainer() throws DockerException {
 
-            dockerClient.startContainerCmd("non-existing").exec();
+            dockerRule.getClient().startContainerCmd("non-existing").exec();
     }
 
     /**
@@ -421,18 +411,18 @@ public void testStartNonExistingContainer() throws DockerException {
     @Test
     public void startContainerWithNetworkMode() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true")
                 .withNetworkMode("host").exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(inspectContainerResponse.getHostConfig().getNetworkMode(), is(equalTo("host")));
     }
@@ -440,16 +430,16 @@ public void startContainerWithNetworkMode() throws DockerException {
     @Test
     public void startContainerWithCapAddAndCapDrop() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withCapAdd(NET_ADMIN).withCapDrop(MKNOD).exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(inspectContainerResponse.getState().getRunning(), is(true));
 
@@ -461,16 +451,16 @@ public void startContainerWithCapAddAndCapDrop() throws DockerException {
     @Test
     public void startContainerWithDevices() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withDevices(new Device("rwm", "/dev/nulo", "/dev/zero")).exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(inspectContainerResponse.getState().getRunning(), is(true));
 
@@ -481,16 +471,16 @@ public void startContainerWithDevices() throws DockerException {
     @Test
     public void startContainerWithExtraHosts() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withExtraHosts("dockerhost:127.0.0.1").exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(inspectContainerResponse.getState().getRunning(), is(true));
 
@@ -503,16 +493,16 @@ public void startContainerWithRestartPolicy() throws DockerException {
 
         RestartPolicy restartPolicy = RestartPolicy.onFailureRestart(5);
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withRestartPolicy(restartPolicy).exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         assertThat(inspectContainerResponse.getState().getRunning(), is(true));
 
@@ -525,7 +515,7 @@ public void existingHostConfigIsPreservedByBlankStartCmd() throws DockerExceptio
         String dnsServer = "8.8.8.8";
 
         // prepare a container with custom DNS
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withDns(dnsServer)
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withDns(dnsServer)
                 .withCmd("true").exec();
 
         LOG.info("Created container {}", container.toString());
@@ -533,9 +523,9 @@ public void existingHostConfigIsPreservedByBlankStartCmd() throws DockerExceptio
         assertThat(container.getId(), not(isEmptyString()));
 
         // start container _without_any_customization_ (important!)
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
         // The DNS setting survived.
         assertThat(inspectContainerResponse.getHostConfig().getDns(), is(notNullValue()));
@@ -545,7 +535,7 @@ public void existingHostConfigIsPreservedByBlankStartCmd() throws DockerExceptio
     @Test
     public void anUnconfiguredCommandSerializesToEmptyJson() throws Exception {
         ObjectMapper objectMapper = new ObjectMapper();
-        StartContainerCmd command = dockerClient.startContainerCmd("");
+        StartContainerCmd command = dockerRule.getClient().startContainerCmd("");
         assertThat(objectMapper.writeValueAsString(command), is("{}"));
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java b/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java
similarity index 59%
rename from src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
rename to src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java
index d7f9ec1c5..7c9fee550 100644
--- a/src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java
@@ -1,53 +1,28 @@
-package com.github.dockerjava.core.command;
+package com.github.dockerjava.cmd;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.model.Statistics;
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.lang.reflect.Method;
 import java.security.SecureRandom;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.model.Statistics;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import com.github.dockerjava.core.async.ResultCallbackTemplate;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertTrue;
 
-@Test(groups = "integration")
-public class StatsCmdImplTest extends AbstractDockerClientTest {
+public class StatsCmdIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(StatsCmdIT.class);
 
     private static int NUM_STATS = 5;
 
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
+    @Test
     public void testStatsStreaming() throws InterruptedException, IOException {
         TimeUnit.SECONDS.sleep(1);
 
@@ -55,14 +30,14 @@ public void testStatsStreaming() throws InterruptedException, IOException {
 
         String containerName = "generated_" + new SecureRandom().nextInt();
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top")
                 .withName(containerName).exec();
         LOG.info("Created container {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        StatsCallbackTest statsCallback = dockerClient.statsCmd(container.getId()).exec(
+        StatsCallbackTest statsCallback = dockerRule.getClient().statsCmd(container.getId()).exec(
                 new StatsCallbackTest(countDownLatch));
 
         countDownLatch.await(3, TimeUnit.SECONDS);
@@ -73,11 +48,11 @@ public void testStatsStreaming() throws InterruptedException, IOException {
         statsCallback.close();
 
         LOG.info("Stopping container");
-        dockerClient.stopContainerCmd(container.getId()).exec();
-        dockerClient.removeContainerCmd(container.getId()).exec();
+        dockerRule.getClient().stopContainerCmd(container.getId()).exec();
+        dockerRule.getClient().removeContainerCmd(container.getId()).exec();
 
         LOG.info("Completed test");
-        assertTrue(gotStats, "Expected true");
+        assertTrue("Expected true", gotStats);
 
     }
 
diff --git a/src/test/java/com/github/dockerjava/cmd/StopContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/StopContainerCmdIT.java
new file mode 100644
index 000000000..32c4d904f
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/StopContainerCmdIT.java
@@ -0,0 +1,49 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+public class StopContainerCmdIT extends CmdIT {
+
+    public static final Logger LOG = LoggerFactory.getLogger(StopContainerCmdIT.class);
+
+    @Test
+    public void testStopContainer() throws DockerException {
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        LOG.info("Stopping container: {}", container.getId());
+        dockerRule.getClient().stopContainerCmd(container.getId()).withTimeout(2).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+
+        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
+
+        final Integer exitCode = inspectContainerResponse.getState().getExitCode();
+        
+        assertThat(exitCode, is(137));
+        
+    }
+
+    @Test(expected = NotFoundException.class)
+    public void testStopNonExistingContainer() throws DockerException {
+
+        dockerRule.getClient().stopContainerCmd("non-existing").withTimeout(2).exec();
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java b/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java
new file mode 100644
index 000000000..88bd28fd4
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java
@@ -0,0 +1,29 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+import org.apache.commons.lang.math.RandomUtils;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TagImageCmdIT extends CmdIT {
+
+    public static final Logger LOG = LoggerFactory.getLogger(TagImageCmdIT.class);
+
+    @Test
+    public void tagImage() throws Exception {
+        String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
+
+        dockerRule.getClient().tagImageCmd("busybox:latest", "docker-java/busybox", tag).exec();
+
+        dockerRule.getClient().removeImageCmd("docker-java/busybox:" + tag).exec();
+    }
+
+    @Test(expected = NotFoundException.class)
+    public void tagNonExistingImage() throws Exception {
+
+        String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
+        dockerRule.getClient().tagImageCmd("non-existing", "docker-java/busybox", tag).exec();
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/UnpauseCmdIT.java b/src/test/java/com/github/dockerjava/cmd/UnpauseCmdIT.java
new file mode 100644
index 000000000..b28b22a23
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/UnpauseCmdIT.java
@@ -0,0 +1,89 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.InternalServerErrorException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.utils.ContainerUtils;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
+
+public class UnpauseCmdIT extends CmdIT {
+
+    public static final Logger LOG = LoggerFactory.getLogger(UnpauseCmdIT.class);
+
+    @Test
+    public void unpausePausedContainer() {
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        ContainerUtils.startContainer(dockerRule.getClient(), container);
+
+        ContainerUtils.pauseContainer(dockerRule.getClient(), container);
+
+        ContainerUtils.unpauseContainer(dockerRule.getClient(), container);
+    }
+
+    @Test(expected = InternalServerErrorException.class)
+    public void unpauseRunningContainer() {
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        ContainerUtils.startContainer(dockerRule.getClient(), container);
+
+        dockerRule.getClient().unpauseContainerCmd(container.getId()).exec();
+    }
+
+    @Test(expected = InternalServerErrorException.class)
+    public void unpauseStoppedContainer() {
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        ContainerUtils.startContainer(dockerRule.getClient(), container);
+
+        ContainerUtils.stopContainer(dockerRule.getClient(), container);
+
+        dockerRule.getClient().unpauseContainerCmd(container.getId()).exec();
+    }
+
+    @Test(expected = NotFoundException.class)
+    public void unpauseNonExistingContainer() {
+
+        dockerRule.getClient().unpauseContainerCmd("non-existing").exec();
+    }
+
+    @Test(expected = InternalServerErrorException.class)
+    public void unpauseCreatedContainer() {
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        dockerRule.getClient().unpauseContainerCmd(container.getId()).exec();
+    }
+
+    @Test(expected = InternalServerErrorException.class)
+    public void unpauseUnpausedContainer() {
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        ContainerUtils.startContainer(dockerRule.getClient(), container);
+
+        ContainerUtils.pauseContainer(dockerRule.getClient(), container);
+
+        dockerRule.getClient().unpauseContainerCmd(container.getId()).exec();
+        dockerRule.getClient().unpauseContainerCmd(container.getId()).exec();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
similarity index 59%
rename from src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java
rename to src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
index 07dff8798..d63f6aaa2 100644
--- a/src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.core.command;
+package com.github.dockerjava.cmd;
 
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -7,74 +7,46 @@
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.UpdateContainerResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import com.github.dockerjava.core.RemoteApiVersion;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import com.github.dockerjava.core.command.UpdateContainerCmdImpl;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.lang.reflect.Method;
 
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
+import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
+import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
 import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
-import static com.github.dockerjava.utils.TestUtils.getVersion;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
 import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assume.assumeThat;
 
 /**
  * @author Kanstantsin Shautsou
  */
-@Test(groups = "integration")
-public class UpdateContainerCmdImplTest extends AbstractDockerClientTest {
+public class UpdateContainerCmdIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(UpdateContainerCmdIT.class);
 
-    public static final String BUSYBOX_IMAGE = "busybox";
 
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
+    @Test
     public void updateContainer() throws DockerException, IOException {
-        final RemoteApiVersion apiVersion = getVersion(dockerClient);
-
-        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_22)) {
-            throw new SkipException("API version should be >= 1.22");
-        }
+        assumeThat("API version should be >= 1.22", dockerRule, isGreaterOrEqual(VERSION_1_22));
 
-        CreateContainerResponse response = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
+        CreateContainerResponse response = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withCmd("sleep", "9999")
                 .exec();
 
         String containerId = response.getId();
-        dockerClient.startContainerCmd(containerId).exec();
+        dockerRule.getClient().startContainerCmd(containerId).exec();
 
-        InspectContainerResponse inspectBefore = dockerClient.inspectContainerCmd(containerId).exec();
+        InspectContainerResponse inspectBefore = dockerRule.getClient().inspectContainerCmd(containerId).exec();
         LOG.debug("Inspect: {}", inspectBefore);
         final Long memory = inspectBefore.getHostConfig().getMemory();
 
-        final UpdateContainerResponse updateResponse = dockerClient.updateContainerCmd(containerId)
+        final UpdateContainerResponse updateResponse = dockerRule.getClient().updateContainerCmd(containerId)
                 .withBlkioWeight(300)
                 .withCpuShares(512)
                 .withCpuPeriod(100000)
@@ -92,7 +64,7 @@ public void updateContainer() throws DockerException, IOException {
 //        assertThat(updateResponse.getWarnings().get(0),
 //                is("Your kernel does not support Block I/O weight. Weight discarded."));
 
-        InspectContainerResponse inspectAfter = dockerClient.inspectContainerCmd(containerId).exec();
+        InspectContainerResponse inspectAfter = dockerRule.getClient().inspectContainerCmd(containerId).exec();
         final HostConfig afterHostConfig = inspectAfter.getHostConfig();
 
 //        assertThat(afterHostConfig.getMemory(), is(209715200L + 2L));
@@ -108,12 +80,13 @@ public void updateContainer() throws DockerException, IOException {
 
     }
 
-    @Test(enabled = false, description = "impossible to serder because model bundled in cmd")
+    @Ignore("impossible to serder because model bundled in cmd")
+    @Test
     public void serDerDocs1() throws IOException {
         final ObjectMapper mapper = new ObjectMapper();
         final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(UpdateContainerCmdImpl.class);
 
-        final UpdateContainerCmdImpl upd = testRoundTrip(RemoteApiVersion.VERSION_1_22,
+        final UpdateContainerCmdImpl upd = testRoundTrip(VERSION_1_22,
                 "/containers/container/update/docs.json",
                 type
         );
diff --git a/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java b/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java
new file mode 100644
index 000000000..08a198b9f
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java
@@ -0,0 +1,29 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.Version;
+import org.apache.commons.lang.StringUtils;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class VersionCmdIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(VersionCmdIT.class);
+
+    
+    @Test
+    public void version() throws DockerException {
+        Version version = dockerRule.getClient().versionCmd().exec();
+        LOG.info(version.toString());
+
+        assertTrue(version.getGoVersion().length() > 0);
+        assertTrue(version.getVersion().length() > 0);
+
+        assertEquals(StringUtils.split(version.getVersion(), ".").length, 3);
+
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/WaitContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java
similarity index 51%
rename from src/test/java/com/github/dockerjava/netty/exec/WaitContainerCmdExecTest.java
rename to src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java
index 42898974c..4298f68c3 100644
--- a/src/test/java/com/github/dockerjava/netty/exec/WaitContainerCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java
@@ -1,5 +1,6 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.cmd;
 
+import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.DockerClientException;
@@ -7,100 +8,76 @@
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.WaitResponse;
 import com.github.dockerjava.core.command.WaitContainerResultCallback;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.concurrent.TimeUnit;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
-
-@Test(groups = "integration")
-public class WaitContainerCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.not;
 
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
+public class WaitContainerCmdIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(BuildImageCmd.class);
 
     @Test
     public void testWaitContainer() throws DockerException {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true").exec();
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true").exec();
 
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+        int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
                 .awaitStatusCode();
         LOG.info("Container exit code: {}", exitCode);
 
         assertThat(exitCode, equalTo(0));
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
         LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
 
         assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
         assertThat(inspectContainerResponse.getState().getExitCode(), is(equalTo(exitCode)));
     }
 
-    @Test(expectedExceptions = NotFoundException.class)
+    @Test(expected = NotFoundException.class)
     public void testWaitNonExistingContainer() throws DockerException {
 
         WaitContainerResultCallback callback = new WaitContainerResultCallback() {
             public void onNext(WaitResponse waitResponse) {
-                fail("expected NotFoundException");
+                throw new AssertionError("expected NotFoundException");
             }
         };
 
-        dockerClient.waitContainerCmd("non-existing").exec(callback).awaitStatusCode();
+        dockerRule.getClient().waitContainerCmd("non-existing").exec(callback).awaitStatusCode();
     }
 
     @Test
     public void testWaitContainerAbort() throws Exception {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
 
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        WaitContainerResultCallback callback = dockerClient.waitContainerCmd(container.getId()).exec(
+        WaitContainerResultCallback callback = dockerRule.getClient().waitContainerCmd(container.getId()).exec(
                 new WaitContainerResultCallback());
 
         Thread.sleep(5000);
 
-        System.err.println("closing callback");
-
         callback.close();
 
-        dockerClient.killContainerCmd(container.getId()).exec();
+        dockerRule.getClient().killContainerCmd(container.getId()).exec();
 
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
         LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
 
         assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
@@ -109,19 +86,19 @@ public void testWaitContainerAbort() throws Exception {
     @Test
     public void testWaitContainerTimeout() throws Exception {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "10").exec();
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "10").exec();
 
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        WaitContainerResultCallback callback = dockerClient.waitContainerCmd(container.getId()).exec(
+        WaitContainerResultCallback callback = dockerRule.getClient().waitContainerCmd(container.getId()).exec(
                 new WaitContainerResultCallback());
         try {
             callback.awaitStatusCode(100, TimeUnit.MILLISECONDS);
-            fail("Should throw exception on timeout.");
-        } catch(DockerClientException e){
+            throw new AssertionError("Should throw exception on timeout.");
+        } catch (DockerClientException e) {
             LOG.info(e.getMessage());
         }
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateServiceCmdExecTest.java b/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
similarity index 64%
rename from src/test/java/com/github/dockerjava/core/command/CreateServiceCmdExecTest.java
rename to src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
index 90a871e68..32ec8963a 100644
--- a/src/test/java/com/github/dockerjava/core/command/CreateServiceCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.core.command;
+package com.github.dockerjava.cmd.swarm;
 
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.ContainerSpec;
@@ -10,80 +10,54 @@
 import com.github.dockerjava.api.model.ServiceSpec;
 import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.api.model.TaskSpec;
+import com.google.common.collect.Lists;
+import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-import org.testng.collections.Lists;
-
-import java.lang.reflect.Method;
+
 import java.util.List;
 
+import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 
-@Test(groups = "swarm-integration")
-public class CreateServiceCmdExecTest extends AbstractSwarmDockerClientTest {
+public class CreateServiceCmdExecIT extends SwarmCmdIT {
 
-    public static final Logger LOG = LoggerFactory.getLogger(CreateServiceCmdExecTest.class);
+    public static final Logger LOG = LoggerFactory.getLogger(CreateServiceCmdExecIT.class);
     private static final String SERVICE_NAME = "theservice";
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
+    
     @Test
     public void testCreateService() throws DockerException {
-        dockerClient.initializeSwarmCmd(new SwarmSpec())
+        dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
                 .withListenAddr("127.0.0.1")
                 .withAdvertiseAddr("127.0.0.1")
                 .exec();
 
-        dockerClient.createServiceCmd(new ServiceSpec()
+        dockerRule.getClient().createServiceCmd(new ServiceSpec()
                 .withName(SERVICE_NAME)
                 .withTaskTemplate(new TaskSpec()
                         .withContainerSpec(new ContainerSpec()
-                                .withImage("busybox"))))
+                                .withImage(DEFAULT_IMAGE))))
         .exec();
 
-        List<Service> services = dockerClient.listServicesCmd()
+        List<Service> services = dockerRule.getClient().listServicesCmd()
                 .withNameFilter(Lists.newArrayList(SERVICE_NAME))
                 .exec();
 
         assertThat(services, hasSize(1));
 
-        dockerClient.removeServiceCmd(SERVICE_NAME).exec();
+        dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec();
     }
 
     @Test
     public void testCreateServiceWithNetworks() {
-        dockerClient.initializeSwarmCmd(new SwarmSpec())
+        dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
                 .withListenAddr("127.0.0.1")
                 .withAdvertiseAddr("127.0.0.1")
                 .exec();
 
-        String networkId = dockerClient.createNetworkCmd().withName("networkname")
+        String networkId = dockerRule.getClient().createNetworkCmd().withName("networkname")
                 .withDriver("overlay")
                 .withIpam(new Network.Ipam()
                         .withDriver("default"))
@@ -105,9 +79,9 @@ public void testCreateServiceWithNetworks() {
                                 .withReplicas(1)
                 ));
 
-        dockerClient.createServiceCmd(spec).exec();
+        dockerRule.getClient().createServiceCmd(spec).exec();
 
-        List<Service> services = dockerClient.listServicesCmd()
+        List<Service> services = dockerRule.getClient().listServicesCmd()
                 .withNameFilter(Lists.newArrayList(SERVICE_NAME))
                 .exec();
 
@@ -115,7 +89,7 @@ public void testCreateServiceWithNetworks() {
 
         assertThat(services.get(0).getSpec(), is(spec));
 
-        dockerClient.removeServiceCmd(SERVICE_NAME).exec();
+        dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/InitializeSwarmCmdExecTest.java b/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java
similarity index 68%
rename from src/test/java/com/github/dockerjava/core/command/InitializeSwarmCmdExecTest.java
rename to src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java
index 8b258af92..503f22645 100644
--- a/src/test/java/com/github/dockerjava/core/command/InitializeSwarmCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.core.command;
+package com.github.dockerjava.cmd.swarm;
 
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.NotAcceptableException;
@@ -9,45 +9,17 @@
 import com.github.dockerjava.api.model.SwarmRaftConfig;
 import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.api.model.TaskDefaults;
+import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 
-@Test(groups = "swarm-integration")
-public class InitializeSwarmCmdExecTest extends AbstractSwarmDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(InitializeSwarmCmdExecTest.class);
+public class InitializeSwarmCmdExecIT extends SwarmCmdIT {
 
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
+    public static final Logger LOG = LoggerFactory.getLogger(InitializeSwarmCmdExecIT.class);
 
     @Test
     public void initializeSwarm() throws DockerException {
@@ -66,30 +38,30 @@ public void initializeSwarm() throws DockerException {
                         .withLogEntriesForSlowFollowers(200)
                 ).withTaskDefaults(new TaskDefaults());
 
-        dockerClient.initializeSwarmCmd(swarmSpec)
+        dockerRule.getClient().initializeSwarmCmd(swarmSpec)
                 .withListenAddr("127.0.0.1")
                 .withAdvertiseAddr("127.0.0.1")
                 .exec();
         LOG.info("Initialized swarm: {}", swarmSpec.toString());
 
-        Swarm swarm = dockerClient.inspectSwarmCmd().exec();
+        Swarm swarm = dockerRule.getClient().inspectSwarmCmd().exec();
         LOG.info("Inspected swarm: {}", swarm.toString());
         assertThat(swarm.getSpec(), is(equalTo(swarmSpec)));
     }
 
-    @Test(expectedExceptions = NotAcceptableException.class)
+    @Test(expected = NotAcceptableException.class)
     public void initializingSwarmThrowsWhenAlreadyInSwarm() throws DockerException {
         SwarmSpec swarmSpec = new SwarmSpec()
                 .withName("swarm");
 
-        dockerClient.initializeSwarmCmd(swarmSpec)
+        dockerRule.getClient().initializeSwarmCmd(swarmSpec)
                 .withListenAddr("127.0.0.1")
                 .withAdvertiseAddr("127.0.0.1")
                 .exec();
         LOG.info("Initialized swarm: {}", swarmSpec.toString());
 
         // Initializing a swarm if already in swarm mode should fail
-        dockerClient.initializeSwarmCmd(swarmSpec)
+        dockerRule.getClient().initializeSwarmCmd(swarmSpec)
                 .withListenAddr("127.0.0.1")
                 .exec();
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/JoinSwarmCmdExecTest.java b/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java
similarity index 76%
rename from src/test/java/com/github/dockerjava/core/command/JoinSwarmCmdExecTest.java
rename to src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java
index 034091ef0..6514f3d04 100644
--- a/src/test/java/com/github/dockerjava/core/command/JoinSwarmCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.core.command;
+package com.github.dockerjava.cmd.swarm;
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.exception.DockerException;
@@ -9,47 +9,17 @@
 import com.github.dockerjava.api.model.SwarmJoinTokens;
 import com.github.dockerjava.api.model.SwarmSpec;
 import com.google.common.collect.Lists;
+import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 
-@Test(groups = "swarm-integration")
-public class JoinSwarmCmdExecTest extends AbstractSwarmDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(JoinSwarmCmdExecTest.class);
+public class JoinSwarmCmdExecIT extends SwarmCmdIT {
 
-    @BeforeTest
-    @Override
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @BeforeMethod
-    @Override
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
+    public static final Logger LOG = LoggerFactory.getLogger(JoinSwarmCmdExecIT.class);
 
     private SwarmJoinTokens initSwarmOnDocker(DockerClient docker) {
         SwarmSpec swarmSpec = new SwarmSpec();
@@ -98,7 +68,7 @@ public void joinSwarmAsManager() throws DockerException, InterruptedException {
         assertThat(info.getSwarm().getLocalNodeState(), is(equalTo(LocalNodeState.ACTIVE)));
     }
 
-    @Test(expectedExceptions = NotAcceptableException.class)
+    @Test(expected = NotAcceptableException.class)
     public void joinSwarmIfAlreadyInSwarm() {
         DockerClient docker1 = startDockerInDocker();
         DockerClient docker2 = startDockerInDocker();
diff --git a/src/test/java/com/github/dockerjava/core/command/LeaveSwarmCmdExecTest.java b/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java
similarity index 52%
rename from src/test/java/com/github/dockerjava/core/command/LeaveSwarmCmdExecTest.java
rename to src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java
index 4dc41716f..4f093ca94 100644
--- a/src/test/java/com/github/dockerjava/core/command/LeaveSwarmCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java
@@ -1,79 +1,50 @@
-package com.github.dockerjava.core.command;
+package com.github.dockerjava.cmd.swarm;
 
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.NotAcceptableException;
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.api.model.LocalNodeState;
 import com.github.dockerjava.api.model.SwarmSpec;
+import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 
-@Test(groups = "swarm-integration")
-public class LeaveSwarmCmdExecTest extends AbstractSwarmDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(LeaveSwarmCmdExecTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
+public class LeaveSwarmCmdExecIT extends SwarmCmdIT {
 
+    public static final Logger LOG = LoggerFactory.getLogger(LeaveSwarmCmdExecIT.class);
+    
     @Test
     public void leaveSwarmAsMaster() throws DockerException {
         SwarmSpec swarmSpec = new SwarmSpec().withName("firstSpec");
-        dockerClient.initializeSwarmCmd(swarmSpec)
+        dockerRule.getClient().initializeSwarmCmd(swarmSpec)
                 .withListenAddr("127.0.0.1")
                 .withAdvertiseAddr("127.0.0.1")
                 .exec();
         LOG.info("Initialized swarm: {}", swarmSpec.toString());
 
-        Info info = dockerClient.infoCmd().exec();
+        Info info = dockerRule.getClient().infoCmd().exec();
         LOG.info("Inspected docker: {}", info.toString());
 
         assertThat(info.getSwarm().getLocalNodeState(), is(LocalNodeState.ACTIVE));
 
-        dockerClient.leaveSwarmCmd()
+        dockerRule.getClient().leaveSwarmCmd()
                 .withForceEnabled(true)
                 .exec();
         LOG.info("Left swarm");
 
-        info = dockerClient.infoCmd().exec();
+        info = dockerRule.getClient().infoCmd().exec();
         LOG.info("Inspected docker: {}", info.toString());
 
         assertThat(info.getSwarm().getLocalNodeState(), is(LocalNodeState.INACTIVE));
 
     }
 
-    @Test(expectedExceptions = NotAcceptableException.class)
+    @Test(expected = NotAcceptableException.class)
     public void leavingSwarmThrowsWhenNotInSwarm() throws DockerException {
-        dockerClient.leaveSwarmCmd().exec();
+        dockerRule.getClient().leaveSwarmCmd().exec();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/AbstractSwarmDockerClientTest.java b/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
similarity index 65%
rename from src/test/java/com/github/dockerjava/core/command/AbstractSwarmDockerClientTest.java
rename to src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
index 40c83a3e6..9c7b72c3a 100644
--- a/src/test/java/com/github/dockerjava/core/command/AbstractSwarmDockerClientTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.core.command;
+package com.github.dockerjava.cmd.swarm;
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.CreateContainerResponse;
@@ -8,18 +8,25 @@
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
-import com.github.dockerjava.client.AbstractDockerClientTest;
+import com.github.dockerjava.cmd.CmdIT;
 import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.core.DockerClientBuilder;
-import com.github.dockerjava.core.RemoteApiVersion;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-
-import java.lang.reflect.Method;
-
-import static com.github.dockerjava.utils.TestUtils.getVersion;
-
-public abstract class AbstractSwarmDockerClientTest extends AbstractDockerClientTest {
+import com.github.dockerjava.core.command.PullImageResultCallback;
+import com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory;
+import com.github.dockerjava.junit.category.Integration;
+import com.github.dockerjava.junit.category.SwarmModeIntegration;
+import com.github.dockerjava.netty.NettyDockerCmdExecFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24;
+import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
+import static org.junit.Assume.assumeThat;
+
+@Category({SwarmModeIntegration.class, Integration.class})
+public abstract class SwarmCmdIT extends CmdIT {
     protected DockerClient secondDockerClient;
     private int numberOfDockersInDocker = 0;
 
@@ -31,37 +38,32 @@ public abstract class AbstractSwarmDockerClientTest extends AbstractDockerClient
     private static final String DOCKER_IN_DOCKER_IMAGE_REPOSITORY = "docker";
     private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "1.12-dind";
 
+    @BeforeClass
     public void beforeTest() throws Exception {
-        super.beforeTest();
-
-        final RemoteApiVersion apiVersion = getVersion(dockerClient);
-        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_24)) {
-            throw new SkipException("API version should be >= 1.24");
-        }
+        assumeThat(dockerRule, isGreaterOrEqual(VERSION_1_24));
     }
 
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
+    @Before
+    public void beforeMethod() {
         leaveIfInSwarm();
     }
 
-    @Override
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
+    @After
+    public void afterMethod() {
         removeDockersInDocker();
     }
 
     protected void removeDockersInDocker() {
         for (int i = 1; i <= numberOfDockersInDocker; i++) {
             try {
-                dockerClient.removeContainerCmd(DOCKER_IN_DOCKER_CONTAINER_PREFIX + i);
+                dockerRule.getClient().removeContainerCmd(DOCKER_IN_DOCKER_CONTAINER_PREFIX + i);
             } catch (NotFoundException e) {
                 // container does not exist
             }
         }
 
         try {
-            dockerClient.removeNetworkCmd(NETWORK_NAME).exec();
+            dockerRule.getClient().removeNetworkCmd(NETWORK_NAME).exec();
         } catch (NotFoundException e) {
             // network does not exist
         }
@@ -75,29 +77,29 @@ protected DockerClient startDockerInDocker() {
 
         // Delete if already exists
         try {
-            dockerClient.removeContainerCmd(name).withForce(true).exec();
+            dockerRule.getClient().removeContainerCmd(name).withForce(true).exec();
         } catch (NotFoundException e) {
             // container does not exist
         }
 
         // Create network if not already exists
         try {
-            dockerClient.inspectNetworkCmd().withNetworkId(NETWORK_NAME).exec();
+            dockerRule.getClient().inspectNetworkCmd().withNetworkId(NETWORK_NAME).exec();
         } catch (NotFoundException e) {
             try {
-                dockerClient.createNetworkCmd().withName(NETWORK_NAME).exec();
+                dockerRule.getClient().createNetworkCmd().withName(NETWORK_NAME).exec();
             } catch (ConflictException e2) {
                 // already exists
             }
         }
 
-        dockerClient.pullImageCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY)
+        dockerRule.getClient().pullImageCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY)
                 .withTag(DOCKER_IN_DOCKER_IMAGE_TAG)
                 .exec(new PullImageResultCallback())
                 .awaitSuccess();
 
         int port = PORT_START + (numberOfDockersInDocker - 1);
-        CreateContainerResponse response = dockerClient
+        CreateContainerResponse response = dockerRule.getClient()
                 .createContainerCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY + ":" + DOCKER_IN_DOCKER_IMAGE_TAG)
                 .withPrivileged(true)
                 .withName(name)
@@ -107,7 +109,7 @@ protected DockerClient startDockerInDocker() {
                         Ports.Binding.bindIpAndPort("127.0.0.1", port),
                         ExposedPort.tcp(2375)))
                 .exec();
-        dockerClient.startContainerCmd(response.getId()).exec();
+        dockerRule.getClient().startContainerCmd(response.getId()).exec();
 
         return initializeDockerClient(port);
     }
@@ -117,14 +119,14 @@ private DockerClient initializeDockerClient(int port) {
                 .withRegistryUrl("https://index.docker.io/v1/")
                 .withDockerHost("tcp://localhost:" + port).build();
         return DockerClientBuilder.getInstance(config)
-                .withDockerCmdExecFactory(initTestDockerCmdExecFactory())
+                .withDockerCmdExecFactory(getFactoryType() == FactoryType.NETTY ? new NettyDockerCmdExecFactory() : new JerseyDockerCmdExecFactory())
                 .build();
     }
 
     private void leaveIfInSwarm() {
         try {
             // force in case this is a swarm manager
-            dockerClient.leaveSwarmCmd().withForceEnabled(true).exec();
+            dockerRule.getClient().leaveSwarmCmd().withForceEnabled(true).exec();
         } catch (NotAcceptableException e) {
             // do nothing, node is not part of a swarm
         }
diff --git a/src/test/java/com/github/dockerjava/core/command/UpdateSwarmCmdExecTest.java b/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java
similarity index 68%
rename from src/test/java/com/github/dockerjava/core/command/UpdateSwarmCmdExecTest.java
rename to src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java
index 2fad713cb..5886614dd 100644
--- a/src/test/java/com/github/dockerjava/core/command/UpdateSwarmCmdExecTest.java
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.core.command;
+package com.github.dockerjava.cmd.swarm;
 
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.NotAcceptableException;
@@ -9,46 +9,18 @@
 import com.github.dockerjava.api.model.SwarmRaftConfig;
 import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.api.model.TaskDefaults;
+import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 
-@Test(groups = "swarm-integration")
-public class UpdateSwarmCmdExecTest extends AbstractSwarmDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(UpdateSwarmCmdExecTest.class);
+public class UpdateSwarmCmdExecIT extends SwarmCmdIT {
 
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
+    public static final Logger LOG = LoggerFactory.getLogger(UpdateSwarmCmdExecIT.class);
 
     public void updateSwarm() throws DockerException {
         SwarmSpec firstSpec = new SwarmSpec().withName("firstSpec");
@@ -68,32 +40,32 @@ public void updateSwarm() throws DockerException {
                         .withLogEntriesForSlowFollowers(200)
                 ).withTaskDefaults(new TaskDefaults());
 
-        dockerClient.initializeSwarmCmd(firstSpec)
+        dockerRule.getClient().initializeSwarmCmd(firstSpec)
                 .withListenAddr("127.0.0.1")
                 .withAdvertiseAddr("127.0.0.1")
                 .exec();
         LOG.info("Initialized swarm: {}", firstSpec.toString());
 
-        Swarm swarm = dockerClient.inspectSwarmCmd().exec();
+        Swarm swarm = dockerRule.getClient().inspectSwarmCmd().exec();
         LOG.info("Inspected swarm: {}", swarm.toString());
         assertThat(swarm.getSpec(), is(not(equalTo(secondSpec))));
 
-        dockerClient.updateSwarmCmd(secondSpec)
+        dockerRule.getClient().updateSwarmCmd(secondSpec)
                 .withVersion(swarm.getVersion().getIndex())
                 .exec();
         LOG.info("Updated swarm: {}", secondSpec.toString());
 
-        swarm = dockerClient.inspectSwarmCmd().exec();
+        swarm = dockerRule.getClient().inspectSwarmCmd().exec();
         LOG.info("Inspected swarm: {}", swarm.toString());
         assertThat(swarm.getSpec(), is(equalTo(secondSpec)));
     }
 
-    @Test(expectedExceptions = NotAcceptableException.class)
+    @Test(expected = NotAcceptableException.class)
     public void updatingSwarmThrowsWhenNotInSwarm() throws DockerException {
         SwarmSpec swarmSpec = new SwarmSpec()
                 .withName("swarm");
 
-        dockerClient.updateSwarmCmd(swarmSpec)
+        dockerRule.getClient().updateSwarmCmd(swarmSpec)
                 .withVersion(1l)
                 .exec();
     }
diff --git a/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java b/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java
index 5f5805555..47bca37c8 100644
--- a/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java
+++ b/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java
@@ -3,46 +3,68 @@
  */
 package com.github.dockerjava.core;
 
+import com.github.dockerjava.api.model.AuthConfig;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
 import java.io.File;
 import java.io.IOException;
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.model.AuthConfig;
+import static org.junit.Assert.assertEquals;
 
 public class AuthConfigFileTest {
+    @Rule
+    public ExpectedException expectedEx = ExpectedException.none();
 
     private final File FILESROOT = new File(Thread.currentThread().getContextClassLoader()
             .getResource("testAuthConfigFile").getFile());
 
-    @Test(expectedExceptions = IOException.class, expectedExceptionsMessageRegExp = "The Auth Config file is empty")
+    @Test
     public void emptyFile() throws IOException {
+        expectedEx.expect(IOException.class);
+        expectedEx.expectMessage("The Auth Config file is empty");
+
         runTest("emptyFile");
     }
 
-    @Test(expectedExceptions = IOException.class, expectedExceptionsMessageRegExp = "The Auth Config file is empty")
+    @Test
     public void tooSmallFile() throws IOException {
+        expectedEx.expect(IOException.class);
+        expectedEx.expectMessage("The Auth Config file is empty");
+
         runTest("tooSmallFile");
     }
 
-    @Test(expectedExceptions = IOException.class, expectedExceptionsMessageRegExp = "Invalid auth configuration file")
+    @Test
     public void invalidJsonInvalidAuth() throws IOException {
+        expectedEx.expect(IOException.class);
+        expectedEx.expectMessage("Invalid auth configuration file");
+
         runTest("invalidJsonInvalidAuth");
     }
 
-    @Test(expectedExceptions = IOException.class, expectedExceptionsMessageRegExp = "Invalid Auth config file")
+    @Test
     public void invalidLegacyAuthLine() throws IOException {
+        expectedEx.expect(IOException.class);
+        expectedEx.expectMessage("Invalid Auth config file");
+
         runTest("invalidLegacyAuthLine");
     }
 
-    @Test(expectedExceptions = IOException.class, expectedExceptionsMessageRegExp = "Invalid auth configuration file")
+    @Test
     public void invalidLegacyInvalidAuth() throws IOException {
+        expectedEx.expect(IOException.class);
+        expectedEx.expectMessage("Invalid auth configuration file");
+
         runTest("invalidLegacyInvalidAuth");
     }
 
-    @Test(expectedExceptions = IOException.class, expectedExceptionsMessageRegExp = "Invalid Auth config file")
+    @Test
     public void invalidLegacyEmailLine() throws IOException {
+        expectedEx.expect(IOException.class);
+        expectedEx.expectMessage("Invalid Auth config file");
+
         runTest("invalidLegacyEmailLine");
     }
 
@@ -64,7 +86,7 @@ public void validJson() throws IOException {
         expected.addConfig(authConfig1);
         expected.addConfig(authConfig2);
 
-        Assert.assertEquals(runTest("validJson.json"), expected);
+        assertEquals(runTest("validJson.json"), expected);
 
     }
 
@@ -85,7 +107,7 @@ public void validJsonWithUnknown() throws IOException {
     public void validJsonWithOnlyUnknown() throws IOException {
         AuthConfigFile expected = new AuthConfigFile();
         AuthConfigFile actual = runTest("validJsonWithOnlyUnknown.json");
-        Assert.assertEquals(actual, expected);
+        assertEquals(actual, expected);
     }
 
     @Test
@@ -99,13 +121,13 @@ public void validLegacy() throws IOException {
         AuthConfigFile expected = new AuthConfigFile();
         expected.addConfig(authConfig);
 
-        Assert.assertEquals(runTest("validLegacy"), expected);
+        assertEquals(runTest("validLegacy"), expected);
     }
 
     @Test
     public void nonExistent() throws IOException {
         AuthConfigFile expected = new AuthConfigFile();
-        Assert.assertEquals(runTest("idontexist"), expected);
+        assertEquals(runTest("idontexist"), expected);
     }
 
     private AuthConfigFile runTest(String testFileName) throws IOException {
diff --git a/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java b/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
index fa4164b94..fbf319e3c 100644
--- a/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
+++ b/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
@@ -1,9 +1,11 @@
 package com.github.dockerjava.core;
 
-import static java.util.Arrays.asList;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+import com.github.dockerjava.core.util.CompressArchiveUtil;
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.junit.Test;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -12,12 +14,10 @@
 import java.io.IOException;
 import java.util.zip.GZIPInputStream;
 
-import com.github.dockerjava.core.util.CompressArchiveUtil;
-import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
-import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.testng.annotations.Test;
+import static java.util.Arrays.asList;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class CompressArchiveUtilTest {
 
diff --git a/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
index 3a4238b22..0001c96b2 100644
--- a/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
+++ b/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
@@ -1,11 +1,11 @@
 package com.github.dockerjava.core;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.core.Is.is;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
+import com.github.dockerjava.api.exception.DockerClientException;
+import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.AuthConfigurations;
+import com.google.common.io.Resources;
+import org.apache.commons.lang.SerializationUtils;
+import org.junit.Test;
 
 import java.io.File;
 import java.lang.reflect.Field;
@@ -16,13 +16,12 @@
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.commons.lang.SerializationUtils;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.DockerClientException;
-import com.github.dockerjava.api.model.AuthConfig;
-import com.github.dockerjava.api.model.AuthConfigurations;
-import com.google.common.io.Resources;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 public class DefaultDockerClientConfigTest {
 
@@ -160,7 +159,7 @@ public void testTlsVerifyAndCertPath() throws Exception {
                 new LocalDirectorySSLConfig(dockerCertPath()));
     }
 
-    @Test(expectedExceptions = DockerClientException.class)
+    @Test(expected = DockerClientException.class)
     public void testWrongHostScheme() throws Exception {
         new DefaultDockerClientConfig(URI.create("http://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
                 null);
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java b/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
index 45623c5b5..54a5287cf 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
@@ -1,8 +1,8 @@
 package com.github.dockerjava.core;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
+
+import com.github.dockerjava.api.command.DockerCmdExecFactory;
+import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -10,9 +10,9 @@
 import java.util.List;
 import java.util.Set;
 
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.DockerCmdExecFactory;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 
 public class DockerClientBuilderTest {
     // Amount of instances created in test
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
index 1df4636ba..08f658d52 100644
--- a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
@@ -1,11 +1,11 @@
 package com.github.dockerjava.core;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.AssertJUnit.fail;
+import org.junit.Test;
 
 import java.net.URI;
 
-import org.testng.annotations.Test;
+import static org.junit.Assert.assertEquals;
+
 
 public class DockerClientImplTest {
 
@@ -18,7 +18,7 @@ public void configuredInstanceAuthConfig() throws Exception {
         // when we get the auth config
         try {
             dockerClient.authConfig();
-            fail();
+            throw new AssertionError();
         } catch (NullPointerException e) {
             // then we get a NPE with expected message
             assertEquals(e.getMessage(), "Configured serverAddress is null.");
diff --git a/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java b/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
index 62b342595..2ae929c1e 100644
--- a/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
+++ b/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
@@ -3,45 +3,21 @@
  */
 package com.github.dockerjava.core;
 
-import java.io.IOException;
-
-import org.apache.commons.io.FilenameUtils;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
 import com.github.dockerjava.core.exception.GoLangFileMatchException;
-
 import junit.framework.Assert;
+import org.apache.commons.io.FilenameUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.IOException;
 
+@RunWith(Parameterized.class)
 public class GoLangFileMatchTest {
 
-    @Test(dataProvider = "getTestData")
-    public void testMatch(MatchTestCase testCase) throws IOException {
-        String pattern = testCase.pattern;
-        String s = testCase.s;
-        if (GoLangFileMatch.IS_WINDOWS) {
-            if (pattern.indexOf('\\') >= 0) {
-                // no escape allowed on windows.
-                return;
-            }
-            pattern = FilenameUtils.normalize(pattern);
-            s = FilenameUtils.normalize(s);
-        }
-        try {
-            Boolean matched = GoLangFileMatch.match(pattern, s);
-            if (testCase.expectException) {
-                Assert.fail("Expected GoFileMatchException");
-            }
-            Assert.assertEquals(testCase.toString(), testCase.matches, matched);
-        } catch (GoLangFileMatchException e) {
-            if (!testCase.expectException) {
-                throw e;
-            }
-        }
-    }
 
-    @DataProvider
-    public Object[][] getTestData() {
+    @Parameterized.Parameters
+    public static Object[][] getTestData() {
         return new Object[][] {new Object[] {new MatchTestCase("", "abc", false, false)},
                 new Object[] {new MatchTestCase("abc", "abc", true, false)},
                 new Object[] {new MatchTestCase("*", "abc", true, false)},
@@ -103,7 +79,35 @@ public Object[][] getTestData() {
                 new Object[] {new MatchTestCase("**/c", "a/b/c", true, false)}};
     }
 
-    private final class MatchTestCase {
+    @Parameterized.Parameter
+    public MatchTestCase testCase;
+
+    @Test
+    public void testMatch() throws IOException {
+        String pattern = testCase.pattern;
+        String s = testCase.s;
+        if (GoLangFileMatch.IS_WINDOWS) {
+            if (pattern.indexOf('\\') >= 0) {
+                // no escape allowed on windows.
+                return;
+            }
+            pattern = FilenameUtils.normalize(pattern);
+            s = FilenameUtils.normalize(s);
+        }
+        try {
+            Boolean matched = GoLangFileMatch.match(pattern, s);
+            if (testCase.expectException) {
+                Assert.fail("Expected GoFileMatchException");
+            }
+            Assert.assertEquals(testCase.toString(), testCase.matches, matched);
+        } catch (GoLangFileMatchException e) {
+            if (!testCase.expectException) {
+                throw e;
+            }
+        }
+    }
+
+    private final static class MatchTestCase {
         private final String pattern;
 
         private final String s;
diff --git a/src/test/java/com/github/dockerjava/core/NameParserTest.java b/src/test/java/com/github/dockerjava/core/NameParserTest.java
index 865f9a401..ba9453e1c 100644
--- a/src/test/java/com/github/dockerjava/core/NameParserTest.java
+++ b/src/test/java/com/github/dockerjava/core/NameParserTest.java
@@ -3,15 +3,14 @@
  */
 package com.github.dockerjava.core;
 
-import com.github.dockerjava.core.exception.InvalidRepositoryNameException;
-import org.apache.commons.lang.StringUtils;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.assertEquals;
-
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.core.NameParser.HostnameReposName;
 import com.github.dockerjava.core.NameParser.ReposTag;
+import com.github.dockerjava.core.exception.InvalidRepositoryNameException;
+import org.apache.commons.lang.StringUtils;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  *
@@ -33,47 +32,47 @@ public void testValidateRepoName() throws Exception {
         NameParser.validateRepoName("namespace/repository_with_underscores");
     }
 
-    @Test(expectedExceptions = InvalidRepositoryNameException.class)
+    @Test(expected = InvalidRepositoryNameException.class)
     public void testValidateRepoNameEmpty() throws Exception {
         NameParser.validateRepoName("");
     }
 
-    @Test(expectedExceptions = InvalidRepositoryNameException.class)
+    @Test(expected = InvalidRepositoryNameException.class)
     public void testValidateRepoNameExceedsMaxLength() throws Exception {
         NameParser.validateRepoName(StringUtils.repeat("repository", 255));
     }
 
-    @Test(expectedExceptions = InvalidRepositoryNameException.class)
+    @Test(expected = InvalidRepositoryNameException.class)
     public void testValidateRepoNameEndWithDash() throws Exception {
         NameParser.validateRepoName("repository-");
     }
 
-    @Test(expectedExceptions = InvalidRepositoryNameException.class)
+    @Test(expected = InvalidRepositoryNameException.class)
     public void testValidateRepoNameStartWithDash() throws Exception {
         NameParser.validateRepoName("-repository");
     }
 
-    @Test(expectedExceptions = InvalidRepositoryNameException.class)
+    @Test(expected = InvalidRepositoryNameException.class)
     public void testValidateRepoNameEndWithDot() throws Exception {
         NameParser.validateRepoName("repository.");
     }
 
-    @Test(expectedExceptions = InvalidRepositoryNameException.class)
+    @Test(expected = InvalidRepositoryNameException.class)
     public void testValidateRepoNameStartWithDot() throws Exception {
         NameParser.validateRepoName(".repository");
     }
 
-    @Test(expectedExceptions = InvalidRepositoryNameException.class)
+    @Test(expected = InvalidRepositoryNameException.class)
     public void testValidateRepoNameEndWithUnderscore() throws Exception {
         NameParser.validateRepoName("repository_");
     }
 
-    @Test(expectedExceptions = InvalidRepositoryNameException.class)
+    @Test(expected = InvalidRepositoryNameException.class)
     public void testValidateRepoNameStartWithUnderscore() throws Exception {
         NameParser.validateRepoName("_repository");
     }
 
-    @Test(expectedExceptions = InvalidRepositoryNameException.class)
+    @Test(expected = InvalidRepositoryNameException.class)
     public void testValidateRepoNameWithColon() throws Exception {
         NameParser.validateRepoName("repository:with:colon");
     }
@@ -96,7 +95,7 @@ public void testResolveRepositoryNameWithNamespaceAndHostname() throws Exception
         assertEquals(resolved, new HostnameReposName("localhost:5000", "namespace/repository"));
     }
 
-    @Test(expectedExceptions = InvalidRepositoryNameException.class)
+    @Test(expected = InvalidRepositoryNameException.class)
     public void testResolveRepositoryNameWithIndex() throws Exception {
         NameParser.resolveRepositoryName("index.docker.io/repository");
     }
diff --git a/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java b/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java
index 011f909ad..a9446ffd4 100644
--- a/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java
+++ b/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java
@@ -1,7 +1,7 @@
 package com.github.dockerjava.core;
 
 import org.apache.commons.lang.SerializationUtils;
-import org.testng.annotations.Test;
+import org.junit.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
diff --git a/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java b/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
index 6c9ee8a15..b436b14ea 100644
--- a/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
+++ b/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
@@ -3,7 +3,9 @@
  */
 package com.github.dockerjava.core.async;
 
-import static org.testng.Assert.assertFalse;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.model.PullResponseItem;
+import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.Closeable;
@@ -12,10 +14,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.model.PullResponseItem;
+import static org.junit.Assert.assertFalse;
 
 
 /**
@@ -46,7 +45,7 @@ public void onStart(Closeable closeable) {
 
             @Override
             public void onNext(PullResponseItem object) {
-                assertFalse(true, "onNext called for empty json");
+                assertFalse("onNext called for empty json", true);
             }
 
             @Override
@@ -59,7 +58,7 @@ public void onComplete() {
             }
         });
 
-        assertFalse(completed.isEmpty(), "Stream processing not completed");
+        assertFalse("Stream processing not completed", completed.isEmpty());
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
deleted file mode 100644
index ef69984f3..000000000
--- a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static org.apache.commons.lang.StringUtils.isEmpty;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.commons.codec.binary.StringUtils;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.api.model.StreamType;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class AttachContainerCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void attachContainerWithoutTTY() throws Exception {
-
-        String snippet = "hello world";
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("echo", snippet)
-                .withTty(false).exec();
-
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        AttachContainerTestCallback callback = new AttachContainerTestCallback() {
-            @Override
-            public void onNext(Frame frame) {
-                assertEquals(frame.getStreamType(), StreamType.STDOUT);
-                super.onNext(frame);
-            };
-        };
-
-        dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
-                .withLogs(true).exec(callback).awaitCompletion(30, TimeUnit.SECONDS);
-        callback.close();
-
-        assertThat(callback.toString(), containsString(snippet));
-    }
-
-    @Test
-    public void attachContainerWithTTY() throws Exception {
-
-        File baseDir = new File(Thread.currentThread().getContextClassLoader()
-                .getResource("attachContainerTestDockerfile").getFile());
-
-        String imageId = buildImage(baseDir);
-
-        CreateContainerResponse container = dockerClient.createContainerCmd(imageId).withTty(true).exec();
-
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        AttachContainerTestCallback callback = new AttachContainerTestCallback() {
-            @Override
-            public void onNext(Frame frame) {
-                assertEquals(frame.getStreamType(), StreamType.RAW);
-                super.onNext(frame);
-            };
-        };
-
-        dockerClient.attachContainerCmd(container.getId())
-                .withStdErr(true)
-                .withStdOut(true)
-                .withFollowStream(true)
-                .exec(callback)
-                .awaitCompletion(15, TimeUnit.SECONDS);
-        callback.close();
-
-        System.out.println("log: " + callback.toString());
-
-        // HexDump.dump(collectFramesCallback.toString().getBytes(), 0, System.out, 0);
-        assertThat(callback.toString(), containsString("stdout\r\nstderr"));
-    }
-
-    @Test(expectedExceptions = UnsupportedOperationException.class)
-    public void attachContainerStdinUnsupported() throws Exception {
-
-        String snippet = "hello world";
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("echo", snippet)
-                .withTty(false).exec();
-
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        AttachContainerTestCallback callback = new AttachContainerTestCallback() {
-            @Override
-            public void onNext(Frame frame) {
-                assertEquals(frame.getStreamType(), StreamType.STDOUT);
-                super.onNext(frame);
-            };
-        };
-
-        InputStream stdin = new ByteArrayInputStream("".getBytes());
-
-        dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
-                .withLogs(true).withStdIn(stdin).exec(callback).awaitCompletion(30, TimeUnit.SECONDS);
-        callback.close();
-    }
-
-    public static class AttachContainerTestCallback extends AttachContainerResultCallback {
-        private StringBuffer log = new StringBuffer();
-
-        @Override
-        public void onNext(Frame item) {
-            log.append(new String(item.getPayload()));
-            super.onNext(item);
-        }
-
-        @Override
-        public RuntimeException getFirstError() {
-            return super.getFirstError();
-        }
-
-        @Override
-        public String toString() {
-            return log.toString();
-        }
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
deleted file mode 100644
index 2a9ce0fbf..000000000
--- a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import java.lang.reflect.Method;
-
-import com.github.dockerjava.core.RemoteApiVersion;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.UnauthorizedException;
-import com.github.dockerjava.api.model.AuthResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import com.github.dockerjava.core.DockerClientBuilder;
-
-import static com.github.dockerjava.utils.TestUtils.getVersion;
-
-@Test(groups = "integration")
-public class AuthCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void testAuth() throws Exception {
-        final RemoteApiVersion apiVersion = getVersion(dockerClient);
-
-        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_23)) {
-            throw new SkipException("Fails on 1.22. Temporary disabled.");
-        }
-
-        AuthResponse response = dockerClient.authCmd().exec();
-
-        assertEquals(response.getStatus(), "Login Succeeded");
-    }
-
-    // Disabled because of 500/InternalServerException
-    @Test(enabled = false, expectedExceptions = UnauthorizedException.class, expectedExceptionsMessageRegExp = "Wrong login/password, please try again")
-    public void testAuthInvalid() throws Exception {
-
-        DockerClientBuilder.getInstance(config("garbage")).build().authCmd().exec();
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
deleted file mode 100644
index db94563c4..000000000
--- a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
+++ /dev/null
@@ -1,357 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static com.github.dockerjava.utils.TestUtils.getVersion;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.UUID;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.filefilter.TrueFileFilter;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.BuildImageCmd;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectImageResponse;
-import com.github.dockerjava.api.exception.DockerClientException;
-import com.github.dockerjava.api.model.AuthConfig;
-import com.github.dockerjava.api.model.AuthConfigurations;
-import com.github.dockerjava.api.model.ExposedPort;
-import com.github.dockerjava.api.model.PortBinding;
-import com.github.dockerjava.api.model.Ports.Binding;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import com.github.dockerjava.core.RemoteApiVersion;
-import com.github.dockerjava.core.util.CompressArchiveUtil;
-
-@Test(groups = "integration")
-public class BuildImageCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void author() throws Exception {
-
-        String imageId = buildImage(fileFromBuildTestResource("AUTHOR"));
-
-        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
-        assertThat(inspectImageResponse, not(nullValue()));
-        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-
-        assertThat(inspectImageResponse.getAuthor(), equalTo("Guillaume J. Charmes \"guillaume@dotcloud.com\""));
-    }
-
-    @Test
-    public void buildImageFromTar() throws Exception {
-        File baseDir = fileFromBuildTestResource("ADD/file");
-        Collection<File> files = FileUtils.listFiles(baseDir, TrueFileFilter.INSTANCE, TrueFileFilter.INSTANCE);
-        File tarFile = CompressArchiveUtil.archiveTARFiles(baseDir, files, UUID.randomUUID().toString());
-        String response = dockerfileBuild(new FileInputStream(tarFile));
-        assertThat(response, containsString("Successfully executed testrun.sh"));
-    }
-
-    @Test
-    public void buildImageFromTarWithDockerfileNotInBaseDirectory() throws Exception {
-        File baseDir = fileFromBuildTestResource("dockerfileNotInBaseDirectory");
-        Collection<File> files = FileUtils.listFiles(baseDir, TrueFileFilter.INSTANCE, TrueFileFilter.INSTANCE);
-        File tarFile = CompressArchiveUtil.archiveTARFiles(baseDir, files, UUID.randomUUID().toString());
-        String response = dockerfileBuild(new FileInputStream(tarFile), "dockerfileFolder/Dockerfile");
-        assertThat(response, containsString("Successfully executed testrun.sh"));
-    }
-
-    @Test
-    public void onBuild() throws Exception {
-        File baseDir = fileFromBuildTestResource("ONBUILD/parent");
-
-        dockerClient.buildImageCmd(baseDir).withNoCache(true).withTag("docker-java-onbuild")
-                .exec(new BuildImageResultCallback()).awaitImageId();
-        baseDir = fileFromBuildTestResource("ONBUILD/child");
-        String response = dockerfileBuild(baseDir);
-        assertThat(response, containsString("Successfully executed testrun.sh"));
-    }
-
-    @Test
-    public void addUrl() throws Exception {
-        File baseDir = fileFromBuildTestResource("ADD/url");
-        String response = dockerfileBuild(baseDir);
-        assertThat(response, containsString("Example Domain"));
-    }
-
-    @Test
-    public void addFileInSubfolder() throws Exception {
-        File baseDir = fileFromBuildTestResource("ADD/fileInSubfolder");
-        String response = dockerfileBuild(baseDir);
-        assertThat(response, containsString("Successfully executed testrun.sh"));
-    }
-
-    @Test
-    public void addFilesViaWildcard() throws Exception {
-        File baseDir = fileFromBuildTestResource("ADD/filesViaWildcard");
-        String response = dockerfileBuild(baseDir);
-        assertThat(response, containsString("Successfully executed testinclude1.sh"));
-        assertThat(response, not(containsString("Successfully executed testinclude2.sh")));
-    }
-
-    @Test
-    public void addFolder() throws Exception {
-        File baseDir = fileFromBuildTestResource("ADD/folder");
-        String response = dockerfileBuild(baseDir);
-        assertThat(response, containsString("Successfully executed testAddFolder.sh"));
-    }
-
-    private String dockerfileBuild(InputStream tarInputStream, String dockerFilePath) throws Exception {
-
-        return execBuild(dockerClient.buildImageCmd().withTarInputStream(tarInputStream).withDockerfilePath(dockerFilePath));
-    }
-
-    private String dockerfileBuild(InputStream tarInputStream) throws Exception {
-
-        return execBuild(dockerClient.buildImageCmd().withTarInputStream(tarInputStream));
-    }
-
-    private String dockerfileBuild(File baseDir) throws Exception {
-
-        return execBuild(dockerClient.buildImageCmd(baseDir));
-    }
-
-    private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
-        String imageId = buildImageCmd.withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
-
-        // Create container based on image
-        CreateContainerResponse container = dockerClient.createContainerCmd(imageId).exec();
-
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-        dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
-
-        return containerLog(container.getId());
-    }
-
-    @Test(expectedExceptions = {DockerClientException.class})
-    public void dockerignoreDockerfileIgnored() throws Exception {
-        File baseDir = fileFromBuildTestResource("dockerignore/DockerfileIgnored");
-
-        dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
-    }
-
-    @Test
-    public void dockerignoreDockerfileNotIgnored() throws Exception {
-        File baseDir = fileFromBuildTestResource("dockerignore/DockerfileNotIgnored");
-
-        dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
-    }
-
-    @Test(expectedExceptions = {DockerClientException.class})
-    public void dockerignoreInvalidDockerIgnorePattern() throws Exception {
-        File baseDir = fileFromBuildTestResource("dockerignore/InvalidDockerignorePattern");
-
-        dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
-    }
-
-    @Test()
-    public void dockerignoreValidDockerIgnorePattern() throws Exception {
-        File baseDir = fileFromBuildTestResource("dockerignore/ValidDockerignorePattern");
-        String response = dockerfileBuild(baseDir);
-        assertThat(response, containsString("/tmp/a/a /tmp/a/c /tmp/a/d"));
-    }
-
-    @Test
-    public void env() throws Exception {
-        File baseDir = fileFromBuildTestResource("ENV");
-        String response = dockerfileBuild(baseDir);
-        assertThat(response, containsString("testENVSubstitution successfully completed"));
-    }
-
-    @Test
-    public void fromPrivateRegistry() throws Exception {
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("privateRegistry").getFile());
-
-        String imageId = buildImage(baseDir);
-
-        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
-        assertThat(inspectImageResponse, not(nullValue()));
-        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-
-        dockerClient.tagImageCmd(imageId, "testregistry", "2").withForce().exec();
-
-        // see https://github.com/docker/distribution/blob/master/docs/deploying.md#native-basic-auth
-        CreateContainerResponse testregistry = dockerClient
-                .createContainerCmd("testregistry:2")
-                .withName("registry")
-                .withPortBindings(new PortBinding(Binding.bindPort(5000), ExposedPort.tcp(5000)))
-                .withEnv("REGISTRY_AUTH=htpasswd", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm",
-                        "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "REGISTRY_LOG_LEVEL=debug",
-                        "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key")
-                .exec();
-
-        dockerClient.startContainerCmd(testregistry.getId()).exec();
-
-        // wait for registry to boot
-        Thread.sleep(3000);
-
-        // credentials as configured in /auth/htpasswd
-        AuthConfig authConfig = new AuthConfig()
-                .withUsername("testuser")
-                .withPassword("testpassword")
-                .withEmail("foo@bar.de")
-                .withRegistryAddress("localhost:5000");
-
-        dockerClient.authCmd().withAuthConfig(authConfig).exec();
-        dockerClient.tagImageCmd("busybox:latest", "localhost:5000/testuser/busybox", "latest").withForce().exec();
-
-        dockerClient.pushImageCmd("localhost:5000/testuser/busybox").withTag("latest").withAuthConfig(authConfig)
-                .exec(new PushImageResultCallback()).awaitSuccess();
-
-        dockerClient.removeImageCmd("localhost:5000/testuser/busybox").withForce(true).exec();
-
-        baseDir = fileFromBuildTestResource("FROM/privateRegistry");
-
-        AuthConfigurations authConfigurations = new AuthConfigurations();
-        authConfigurations.addConfig(authConfig);
-
-        imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).withBuildAuthConfigs(authConfigurations)
-                .exec(new BuildImageResultCallback()).awaitImageId();
-
-        inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
-        assertThat(inspectImageResponse, not(nullValue()));
-        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-
-    }
-
-    @Test
-    public void buildArgs() throws Exception {
-        File baseDir = fileFromBuildTestResource("buildArgs");
-
-        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc")
-                .exec(new BuildImageResultCallback())
-                .awaitImageId();
-
-        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
-        assertThat(inspectImageResponse, not(nullValue()));
-        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-
-        assertThat(inspectImageResponse.getConfig().getLabels().get("test"), equalTo("abc"));
-    }
-
-    @Test
-    public void labels() throws Exception {
-        if (!getVersion(dockerClient).isGreaterOrEqual(RemoteApiVersion.VERSION_1_23)) {
-            throw new SkipException("API version should be >= 1.23");
-        }
-
-        File baseDir = fileFromBuildTestResource("labels");
-
-        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true)
-                .withLabels(Collections.singletonMap("test", "abc"))
-                .exec(new BuildImageResultCallback())
-                .awaitImageId();
-
-        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
-        assertThat(inspectImageResponse, not(nullValue()));
-        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-
-        assertThat(inspectImageResponse.getConfig().getLabels().get("test"), equalTo("abc"));
-    }
-
-    @Test
-    public void multipleTags() throws Exception {
-        if (!getVersion(dockerClient).isGreaterOrEqual(RemoteApiVersion.VERSION_1_21)) {
-            throw new SkipException("API version should be >= 1.21");
-        }
-
-        File baseDir = fileFromBuildTestResource("labels");
-
-        String imageId = dockerClient.buildImageCmd(baseDir).withNoCache(true)
-                .withTag("fallback-when-withTags-not-called")
-                .withTags(new HashSet<>(Arrays.asList("docker-java-test:tag1", "docker-java-test:tag2")))
-                .exec(new BuildImageResultCallback())
-                .awaitImageId();
-
-        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
-        assertThat(inspectImageResponse, not(nullValue()));
-        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-
-        assertThat(inspectImageResponse.getRepoTags().size(), equalTo(2));
-        assertThat(inspectImageResponse.getRepoTags(), containsInAnyOrder("docker-java-test:tag1", "docker-java-test:tag2"));
-    }
-    
-    @Test
-    public void cacheFrom() throws Exception {
-    	if (!getVersion(dockerClient).isGreaterOrEqual(RemoteApiVersion.VERSION_1_25)) {
-    		throw new SkipException("API version should be >= 1.25");
-    	}
-    	File baseDir1 = fileFromBuildTestResource("CacheFrom/test1");
-    	String imageId1 = dockerClient.buildImageCmd(baseDir1)
-    			.exec(new BuildImageResultCallback())
-    			.awaitImageId();
-    	InspectImageResponse inspectImageResponse1 = dockerClient.inspectImageCmd(imageId1).exec();
-    	assertThat(inspectImageResponse1, not(nullValue()));
-    	
-    	File baseDir2 = fileFromBuildTestResource("CacheFrom/test2");
-    	String cacheImage = String.format("[\"%s\"]", imageId1);
-    	String imageId2 = dockerClient.buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(cacheImage)))
-    			.exec(new BuildImageResultCallback())
-    			.awaitImageId();
-    	InspectImageResponse inspectImageResponse2 = dockerClient.inspectImageCmd(imageId2).exec();
-    	assertThat(inspectImageResponse2, not(nullValue()));
-    	
-    	// Compare whether the image2's parent layer is from image1 so that cache is used
-    	assertThat(inspectImageResponse2.getParent(), equalTo(inspectImageResponse1.getId()));
-    			
-    }
-
-    public void dockerfileNotInBaseDirectory() throws Exception {
-        File baseDirectory = fileFromBuildTestResource("dockerfileNotInBaseDirectory");
-        File dockerfile = fileFromBuildTestResource("dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile");
-        BuildImageCmd command = dockerClient.buildImageCmd()
-                .withBaseDirectory(baseDirectory)
-                .withDockerfile(dockerfile);
-
-        String response = execBuild(command);
-
-        assertThat(response, containsString("Successfully executed testrun.sh"));
-    }
-
-    private File fileFromBuildTestResource(String resource) {
-        return new File(Thread.currentThread().getContextClassLoader()
-                .getResource("buildTests/" + resource).getFile());
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
deleted file mode 100644
index be7738c93..000000000
--- a/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.startsWith;
-import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import com.google.common.collect.ImmutableMap;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectImageResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class CommitCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void commit() throws DockerException {
-        //FIXME swarm
-        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("touch", "/test").exec();
-
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        LOG.info("Committing container: {}", container.toString());
-        String imageId = dockerClient.commitCmd(container.getId()).exec();
-
-        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
-        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-
-        assertThat(inspectImageResponse, hasField("container", startsWith(container.getId())));
-        assertThat(inspectImageResponse.getContainerConfig().getImage(), equalTo("busybox"));
-
-        InspectImageResponse busyboxImg = dockerClient.inspectImageCmd("busybox").exec();
-
-        assertThat(inspectImageResponse.getParent(), equalTo(busyboxImg.getId()));
-    }
-
-    @Test
-    public void commitWithLabels() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("touch", "/test").exec();
-
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        LOG.info("Committing container: {}", container.toString());
-        Map<String, String> labels = ImmutableMap.of("label1", "abc", "label2", "123");
-        String imageId = dockerClient.commitCmd(container.getId()).withLabels(labels).exec();
-
-        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
-        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-        Map<String, String> responseLabels = inspectImageResponse.getContainerConfig().getLabels();
-        assertThat(responseLabels.get("label1"), equalTo("abc"));
-        assertThat(responseLabels.get("label2"), equalTo("123"));
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void commitNonExistingContainer() throws DockerException {
-
-        dockerClient.commitCmd("non-existent").exec();
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java
deleted file mode 100644
index 85fd62fa6..000000000
--- a/src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.CreateNetworkResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.ContainerNetwork;
-import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-import java.util.Collections;
-
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-
-@Test(groups = "integration")
-public class ConnectToNetworkCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void connectToNetwork() throws InterruptedException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        CreateNetworkResponse network = dockerClient.createNetworkCmd().withName("testNetwork").exec();
-
-        dockerClient.connectToNetworkCmd().withNetworkId(network.getId()).withContainerId(container.getId()).exec();
-
-        Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
-
-        assertTrue(updatedNetwork.getContainers().containsKey(container.getId()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertNotNull(inspectContainerResponse.getNetworkSettings().getNetworks().get("testNetwork"));
-    }
-
-    @Test
-    public void connectToNetworkWithContainerNetwork() throws InterruptedException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        final String NETWORK_SUBNET = "10.100.102.0/24";
-        final String NETWORK_NAME = "jerseyTestNetwork";
-        final String CONTAINER_IP = "10.100.102.100";
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withCmd("sleep", "9999")
-                .exec();
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        try {
-            dockerClient.removeNetworkCmd(NETWORK_NAME).exec();
-        } catch (DockerException ignore) {
-        }
-
-        CreateNetworkResponse network = dockerClient.createNetworkCmd()
-                .withName(NETWORK_NAME)
-                .withIpam(new Network.Ipam()
-                        .withConfig(new Network.Ipam.Config()
-                                .withSubnet(NETWORK_SUBNET)))
-                .exec();
-
-        dockerClient.connectToNetworkCmd()
-                .withNetworkId(network.getId())
-                .withContainerId(container.getId())
-                .withContainerNetwork(new ContainerNetwork()
-                        .withAliases("aliasName")
-                        .withIpamConfig(new ContainerNetwork.Ipam()
-                                .withIpv4Address(CONTAINER_IP)))
-                .exec();
-
-        Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
-
-        Network.ContainerNetworkConfig containerNetworkConfig = updatedNetwork.getContainers().get(container.getId());
-        assertNotNull(containerNetworkConfig);
-        assertThat(containerNetworkConfig.getIpv4Address(), is(CONTAINER_IP + "/24"));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        ContainerNetwork testNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get(NETWORK_NAME);
-        assertNotNull(testNetwork);
-        assertThat(testNetwork.getAliases(), hasItem("aliasName"));
-        assertEquals(testNetwork.getGateway(), "10.100.102.1");
-        assertEquals(testNetwork.getIpAddress(), CONTAINER_IP);
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
deleted file mode 100644
index e51db21f4..000000000
--- a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static ch.lambdaj.Lambda.selectUnique;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.model.ChangeLog;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class ContainerDiffCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void testContainerDiff() throws DockerException {
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("touch", "/test").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
-                .awaitStatusCode();
-        assertThat(exitCode, equalTo(0));
-
-        List<ChangeLog> filesystemDiff = dockerClient.containerDiffCmd(container.getId()).exec();
-        LOG.info("Container DIFF: {}", filesystemDiff.toString());
-
-        assertThat(filesystemDiff.size(), equalTo(1));
-        ChangeLog testChangeLog = selectUnique(filesystemDiff, hasField("path", equalTo("/test")));
-
-        assertThat(testChangeLog, hasField("path", equalTo("/test")));
-        assertThat(testChangeLog, hasField("kind", equalTo(1)));
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void testContainerDiffWithNonExistingContainer() throws DockerException {
-
-        dockerClient.containerDiffCmd("non-existing").exec();
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
deleted file mode 100644
index 658c1f090..000000000
--- a/src/test/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImplTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyOrNullString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.equalTo;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import org.apache.commons.io.FileUtils;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import com.github.dockerjava.core.util.CompressArchiveUtil;
-
-@Test(groups = "integration")
-public class CopyArchiveToContainerCmdImplTest extends AbstractDockerClientTest {
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void copyFileToContainer() throws Exception {
-        CreateContainerResponse container = prepareContainerForCopy();
-        Path temp = Files.createTempFile("", ".tar.gz");
-        CompressArchiveUtil.tar(Paths.get("src/test/resources/testReadFile"), temp, true, false);
-        try (InputStream uploadStream = Files.newInputStream(temp)) {
-            dockerClient.copyArchiveToContainerCmd(container.getId()).withTarInputStream(uploadStream).exec();
-            assertFileCopied(container);
-        }
-    }
-
-    @Test
-    public void copyStreamToContainer() throws Exception {
-        CreateContainerResponse container = prepareContainerForCopy();
-        dockerClient.copyArchiveToContainerCmd(container.getId()).withHostResource("src/test/resources/testReadFile")
-                .exec();
-        assertFileCopied(container);
-    }
-
-    private CreateContainerResponse prepareContainerForCopy() {
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withName("docker-java-itest-copyToContainer").exec();
-        LOG.info("Created container: {}", container);
-        assertThat(container.getId(), not(isEmptyOrNullString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
-        // Copy a folder to the container
-        return container;
-    }
-
-    private void assertFileCopied(CreateContainerResponse container) throws IOException {
-        try (InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "testReadFile").exec()) {
-            boolean bytesAvailable = response.available() > 0;
-            assertTrue(bytesAvailable, "The file was not copied to the container.");
-        }
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void copyToNonExistingContainer() throws Exception {
-
-        dockerClient.copyArchiveToContainerCmd("non-existing").withHostResource("src/test/resources/testReadFile").exec();
-    }
-
-    @Test
-    public void copyDirWithLastAddedTarEntryEmptyDir() throws Exception{
-        // create a temp dir
-        Path localDir = Files.createTempDirectory(null);
-        localDir.toFile().deleteOnExit();
-        // create empty sub-dir with name b
-        Files.createDirectory(localDir.resolve("b"));
-        // create sub-dir with name a
-        Path dirWithFile = Files.createDirectory(localDir.resolve("a"));
-        // create file in sub-dir b, name or conter are irrelevant
-        Files.createFile(dirWithFile.resolve("file"));
-
-        // create a test container
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withCmd("sleep", "9999")
-                .exec();
-        // start the container
-        dockerClient.startContainerCmd(container.getId()).exec();
-        // copy data from local dir to container
-        dockerClient.copyArchiveToContainerCmd(container.getId())
-                .withHostResource(localDir.toString())
-                .exec();
-
-        // cleanup dir
-        FileUtils.deleteDirectory(localDir.toFile());
-    }
-    
-    @Test
-    public void copyFileWithExecutePermission() throws Exception {
-        // create script file, add permission to execute
-        Path scriptPath = Files.createTempFile("run", ".sh");
-        boolean executable = scriptPath.toFile().setExecutable(true, false);
-        if (!executable){
-            throw new Exception("Execute permission on file not set!");
-        }
-        String snippet = "Running script with execute permission.";
-        String scriptTextStr = "#!/bin/sh\necho \"" + snippet + "\"";
-        // write content for created script
-        Files.write(scriptPath, scriptTextStr.getBytes());
-        // create a test container which starts and waits 3 seconds for the
-        // script to be copied to the container's home dir and then executes it
-        String containerCmd = "sleep 3; /home/" + scriptPath.getFileName().toString();
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withName("test")
-                .withCmd("/bin/sh", "-c", containerCmd)
-                .exec();
-        // start the container
-        dockerClient.startContainerCmd(container.getId()).exec();
-        // copy script to container home dir
-        dockerClient.copyArchiveToContainerCmd(container.getId())
-                .withRemotePath("/home")
-                .withHostResource(scriptPath.toString())
-                .exec();
-        // await exid code
-        int exitCode = dockerClient.waitContainerCmd(container.getId())
-                .exec(new WaitContainerResultCallback())
-                .awaitStatusCode();
-        // check result
-        assertThat(exitCode, equalTo(0));
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
deleted file mode 100644
index 64443c914..000000000
--- a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static com.github.dockerjava.utils.TestUtils.getVersion;
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyOrNullString;
-import static org.hamcrest.Matchers.not;
-
-import java.io.InputStream;
-import java.lang.reflect.Method;
-
-import com.github.dockerjava.core.RemoteApiVersion;
-import com.github.dockerjava.utils.TestUtils;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class CopyFileFromContainerCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void copyFromContainer() throws Exception {
-        if (getVersion(dockerClient).isGreaterOrEqual(RemoteApiVersion.VERSION_1_24)) {
-            throw new SkipException("Doesn't work since 1.24");
-        }
-        //FIXME swarm
-        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
-
-        // TODO extract this into a shared method
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withName("docker-java-itest-copyFromContainer").withCmd("touch", "/copyFromContainer").exec();
-
-        LOG.info("Created container: {}", container);
-        assertThat(container.getId(), not(isEmptyOrNullString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "/copyFromContainer").exec();
-        Boolean bytesAvailable = response.available() > 0;
-        assertTrue(bytesAvailable, "The file was not copied from the container.");
-
-        // read the stream fully. Otherwise, the underlying stream will not be closed.
-        String responseAsString = asString(response);
-        assertNotNull(responseAsString);
-        assertTrue(responseAsString.length() > 0);
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void copyFromNonExistingContainer() throws Exception {
-
-        dockerClient.copyFileFromContainerCmd("non-existing", "/test").exec();
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
deleted file mode 100644
index 29c10415e..000000000
--- a/src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import com.github.dockerjava.api.command.CreateNetworkResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import com.github.dockerjava.core.RemoteApiVersion;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-
-import static com.github.dockerjava.utils.TestUtils.getVersion;
-
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-
-@Test(groups = "integration")
-public class CreateNetworkCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void createNetwork() throws DockerException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        String networkName = "testNetwork";
-
-        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).exec();
-
-        assertNotNull(createNetworkResponse.getId());
-
-        Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
-        assertEquals(network.getName(), networkName);
-        assertEquals(network.getDriver(), "bridge");
-    }
-
-    @Test
-    public void createNetworkWithIpamConfig() throws DockerException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        String networkName = "testNetwork";
-        Network.Ipam ipam = new Network.Ipam().withConfig(new Network.Ipam.Config().withSubnet("10.67.79.0/24"));
-        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).withIpam(ipam).exec();
-
-        assertNotNull(createNetworkResponse.getId());
-
-        Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
-        assertEquals(network.getName(), networkName);
-        assertEquals(network.getDriver(), "bridge");
-        assertEquals("10.67.79.0/24", network.getIpam().getConfig().iterator().next().getSubnet());
-    }
-
-    @Test
-    public void createAttachableNetwork() throws DockerException {
-        final RemoteApiVersion apiVersion = getVersion(dockerClient);
-        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_24)) {
-            throw new SkipException("API version should be >= 1.24");
-        }
-        String networkName = "createAttachableNetwork";
-        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).withAttachable(true).exec();
-        assertNotNull(createNetworkResponse.getId());
-        Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
-        assertTrue(network.isAttachable());
-    }
-
-    @Test
-    public void createNetworkWithLabel() throws DockerException {
-        final RemoteApiVersion apiVersion = getVersion(dockerClient);
-        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_21) || isSwarm(dockerClient)) {
-            throw new SkipException("API version should be >= 1.21");
-        }
-
-        String networkName = "createNetworkWithLabel";
-        Map<String,String> labels=new HashMap<>();
-        labels.put("com.example.usage","test");
-        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).withLabels(labels).exec();
-        assertNotNull(createNetworkResponse.getId());
-        Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
-        assertEquals(network.getLabels(), labels);
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImplTest.java
deleted file mode 100644
index 3d7675a55..000000000
--- a/src/test/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImplTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.CreateNetworkResponse;
-import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-
-@Test(groups = "integration")
-public class DisconnectFromNetworkCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void disconnectFromNetwork() throws InterruptedException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        CreateNetworkResponse network = dockerClient.createNetworkCmd().withName("testNetwork").exec();
-
-        dockerClient.connectToNetworkCmd().withNetworkId(network.getId()).withContainerId(container.getId()).exec();
-
-        Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
-
-        assertTrue(updatedNetwork.getContainers().containsKey(container.getId()));
-
-        dockerClient.disconnectFromNetworkCmd().withNetworkId(network.getId()).withContainerId(container.getId()).exec();
-
-        updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
-
-        assertFalse(updatedNetwork.getContainers().containsKey(container.getId()));
-    }
-
-    @Test
-    public void forceDisconnectFromNetwork() throws InterruptedException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        CreateNetworkResponse network = dockerClient.createNetworkCmd().withName("testNetwork").exec();
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withNetworkMode("testNetwork")
-                .withCmd("sleep", "9999")
-                .exec();
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        dockerClient.disconnectFromNetworkCmd()
-                .withNetworkId(network.getId())
-                .withContainerId(container.getId())
-                .withForce(true)
-                .exec();
-
-        Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
-        assertFalse(updatedNetwork.getContainers().containsKey(container.getId()));
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
index acb8b8a5d..874684e3e 100644
--- a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
+++ b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -1,14 +1,13 @@
 package com.github.dockerjava.core.command;
 
-import java.io.File;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.exception.InternalServerErrorException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Image;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
 
 /**
  * Start and stop a single container for testing.
@@ -17,7 +16,7 @@ public class DockerfileFixture implements AutoCloseable {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DockerfileFixture.class);
 
-    private final DockerClient dockerClient;
+    private final DockerClient client;
 
     private String directory;
 
@@ -25,8 +24,8 @@ public class DockerfileFixture implements AutoCloseable {
 
     private String containerId;
 
-    public DockerfileFixture(DockerClient dockerClient, String directory) {
-        this.dockerClient = dockerClient;
+    public DockerfileFixture(DockerClient client, String directory) {
+        this.client = client;
         this.directory = directory;
     }
 
@@ -34,20 +33,20 @@ public void open() throws Exception {
 
         LOGGER.info("building {}", directory);
 
-        dockerClient.buildImageCmd(new File("src/test/resources", directory)).withNoCache(true)
+        client.buildImageCmd(new File("src/test/resources", directory)).withNoCache(true)
                 .exec(new BuildImageResultCallback()).awaitImageId();
 
-        Image lastCreatedImage = dockerClient.listImagesCmd().exec().get(0);
+        Image lastCreatedImage = client.listImagesCmd().exec().get(0);
 
         repository = lastCreatedImage.getRepoTags()[0];
 
         LOGGER.info("created {} {}", lastCreatedImage.getId(), repository);
 
-        containerId = dockerClient.createContainerCmd(lastCreatedImage.getId()).exec().getId();
+        containerId = client.createContainerCmd(lastCreatedImage.getId()).exec().getId();
 
         LOGGER.info("starting {}", containerId);
 
-        dockerClient.startContainerCmd(containerId).exec();
+        client.startContainerCmd(containerId).exec();
     }
 
     @Override
@@ -56,7 +55,7 @@ public void close() throws Exception {
         if (containerId != null) {
             LOGGER.info("removing container {}", containerId);
             try {
-                dockerClient.removeContainerCmd(containerId).withForce(true) // stop too
+                client.removeContainerCmd(containerId).withForce(true) // stop too
                         .exec();
             } catch (NotFoundException | InternalServerErrorException ignored) {
                 LOGGER.info("ignoring {}", ignored.getMessage());
@@ -67,7 +66,7 @@ public void close() throws Exception {
         if (repository != null) {
             LOGGER.info("removing repository {}", repository);
             try {
-                dockerClient.removeImageCmd(repository).withForce(true).exec();
+                client.removeImageCmd(repository).withForce(true).exec();
             } catch (NotFoundException | InternalServerErrorException e) {
                 LOGGER.info("ignoring {}", e.getMessage());
             }
diff --git a/src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java
deleted file mode 100644
index d8e3326d5..000000000
--- a/src/test/java/com/github/dockerjava/core/command/ExecCreateCmdImplTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-import java.lang.reflect.Method;
-import java.security.SecureRandom;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.ExecCreateCmdResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class ExecCreateCmdImplTest extends AbstractDockerClientTest {
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void execCreateTest() {
-        String containerName = "generated_" + new SecureRandom().nextInt();
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withUser("root").withCmd("top")
-                .withName(containerName).exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
-                .withCmd("touch", "file.log").exec();
-
-        assertThat(execCreateCmdResponse.getId(), not(isEmptyString()));
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
deleted file mode 100644
index a6a1fb66d..000000000
--- a/src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.ExecCreateCmdResponse;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.security.SecureRandom;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "integration")
-public class ExecStartCmdImplTest extends AbstractDockerClientTest {
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void execStart() throws Exception {
-        //FIXME swarm
-        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
-
-        String containerName = "generated_" + new SecureRandom().nextInt();
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
-                .withName(containerName).exec();
-        LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true).withCmd("touch", "/execStartTest.log").withUser("root").exec();
-        dockerClient.execStartCmd(execCreateCmdResponse.getId()).exec(
-                new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
-
-        InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec();
-        Boolean bytesAvailable = response.available() > 0;
-        assertTrue(bytesAvailable, "The file was not copied from the container.");
-
-        // read the stream fully. Otherwise, the underlying stream will not be closed.
-        String responseAsString = asString(response);
-        assertNotNull(responseAsString);
-        assertTrue(responseAsString.length() > 0);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void execStartAttached() throws Exception {
-        String containerName = "generated_" + new SecureRandom().nextInt();
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName(containerName).exec();
-        LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true).withCmd("touch", "/execStartTest.log").exec();
-        dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true)
-                .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
-
-        InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec();
-        Boolean bytesAvailable = response.available() > 0;
-        assertTrue(bytesAvailable, "The file was not copied from the container.");
-
-        // read the stream fully. Otherwise, the underlying stream will not be closed.
-        String responseAsString = asString(response);
-        assertNotNull(responseAsString);
-        assertTrue(responseAsString.length() > 0);
-    }
-
-    @Test(groups = "ignoreInCircleCi", expectedExceptions = NotFoundException.class)
-    public void execStartWithNonExistentUser() throws Exception {
-        String containerName = "generated_" + new SecureRandom().nextInt();
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName(containerName).exec();
-        LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true).withCmd("touch", "/execStartTest.log").withUser("NonExistentUser").exec();
-        dockerClient.execStartCmd(execCreateCmdResponse.getId()).withDetach(false).withTty(true)
-                .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
-
-        dockerClient.copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec();
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index 2c76fbf02..011e37f43 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -1,47 +1,40 @@
 package com.github.dockerjava.core.command;
 
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.Matchers.hasProperty;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.is;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.StreamType;
+import com.github.dockerjava.core.DockerClientBuilder;
+import com.github.dockerjava.junit.category.Integration;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.LinkedHashSet;
 import java.util.List;
 
-import org.testng.SkipException;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.api.model.StreamType;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import com.github.dockerjava.core.DockerClientBuilder;
+import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.hasSize;
+import static org.junit.Assert.assertEquals;
 
-@Test(groups = "integration")
+@Category(Integration.class)
 public class FrameReaderITest {
 
     private DockerClient dockerClient;
 
     private DockerfileFixture dockerfileFixture;
 
-    @BeforeTest
+    @Before
     public void beforeTest() throws Exception {
         dockerClient = DockerClientBuilder.getInstance().build();
         dockerfileFixture = new DockerfileFixture(dockerClient, "frameReaderDockerfile");
         dockerfileFixture.open();
     }
 
-    @AfterTest
+    @After
     public void deleteDockerContainerImage() throws Exception {
         dockerfileFixture.close();
         dockerClient.close();
@@ -49,7 +42,7 @@ public void deleteDockerContainerImage() throws Exception {
 
     @Test
     public void canCloseFrameReaderAndReadExpectedLines() throws Exception {
-        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
+        assumeNotSwarm("", dockerClient);
 
         // wait for the container to be successfully executed
         int exitCode = dockerClient.waitContainerCmd(dockerfileFixture.getContainerId())
@@ -84,7 +77,6 @@ public void canLogInOneThreadAndExecuteCommandsInAnother() throws Exception {
             @Override
             public void run() {
                 try {
-
                     Iterator<Frame> frames = getLoggingFrames().iterator();
 
                     while (frames.hasNext()) {
@@ -109,7 +101,7 @@ public void run() {
 
     public static class FrameReaderITestCallback extends LogContainerResultCallback {
 
-        public List<Frame> frames = new ArrayList<Frame>();
+        public List<Frame> frames = new ArrayList<>();
 
         @Override
         public void onNext(Frame item) {
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
index 38ddf1402..e8adff20b 100644
--- a/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
+++ b/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
@@ -1,17 +1,17 @@
 package com.github.dockerjava.core.command;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.StreamType;
+import org.junit.Test;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.testng.annotations.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.api.model.StreamType;
 
 public class FrameReaderTest {
     public static final int HEADER_SIZE = 8;
diff --git a/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
deleted file mode 100644
index 63ccd0820..000000000
--- a/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.Info;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-
-import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyOrNullString;
-import static org.hamcrest.Matchers.not;
-
-@Test(groups = "integration")
-public class InfoCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void info() throws DockerException {
-        // Make sure that there is at least one container for the assertion
-        // TODO extract this into a shared method
-        if (dockerClient.listContainersCmd().withShowAll(true).exec().size() == 0) {
-            CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                    .withName("docker-java-itest-info").withCmd("touch", "/test").exec();
-
-            LOG.info("Created container: {}", container);
-            assertThat(container.getId(), not(isEmptyOrNullString()));
-
-            dockerClient.startContainerCmd(container.getId()).exec();
-        }
-
-        Info dockerInfo = dockerClient.infoCmd().exec();
-        LOG.info(dockerInfo.toString());
-
-        assertTrue(dockerInfo.toString().contains("containers"));
-        assertTrue(dockerInfo.toString().contains("images"));
-        assertTrue(dockerInfo.toString().contains("debug"));
-
-        assertTrue(dockerInfo.getContainers() > 0);
-        assertTrue(dockerInfo.getImages() > 0);
-
-        if (isNotSwarm(dockerClient)) {
-            assertTrue(dockerInfo.getNFd() > 0);
-            assertTrue(dockerInfo.getNGoroutines() > 0);
-            assertTrue(dockerInfo.getNCPU() > 0);
-        }
-
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
deleted file mode 100644
index d86bcc39e..000000000
--- a/src/test/java/com/github/dockerjava/core/command/InspectExecCmdImplTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
-import static com.github.dockerjava.utils.TestUtils.getVersion;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.security.SecureRandom;
-
-import com.github.dockerjava.core.RemoteApiVersion;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.ExecCreateCmdResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.command.InspectExecResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import com.github.dockerjava.test.serdes.JSONTestHelper;
-
-@Test(groups = "integration")
-public class InspectExecCmdImplTest extends AbstractDockerClientTest {
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void inspectExec() throws Exception {
-        String containerName = "generated_" + new SecureRandom().nextInt();
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName(containerName).exec();
-        LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        // Check that file does not exist
-        ExecCreateCmdResponse checkFileExec1 = dockerClient.execCreateCmd(container.getId()).withAttachStdout(true)
-                .withAttachStderr(true).withCmd("test", "-e", "/marker").exec();
-        LOG.info("Created exec {}", checkFileExec1.toString());
-        assertThat(checkFileExec1.getId(), not(isEmptyString()));
-        dockerClient.execStartCmd(checkFileExec1.getId()).withDetach(false)
-                .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
-        InspectExecResponse first = dockerClient.inspectExecCmd(checkFileExec1.getId()).exec();
-        assertThat(first.isRunning(), is(false));
-        assertThat(first.getExitCode(), is(1));
-
-        // Create the file
-        ExecCreateCmdResponse touchFileExec = dockerClient.execCreateCmd(container.getId()).withAttachStdout(true)
-                .withAttachStderr(true).withCmd("touch", "/marker").exec();
-        LOG.info("Created exec {}", touchFileExec.toString());
-        assertThat(touchFileExec.getId(), not(isEmptyString()));
-        dockerClient.execStartCmd(touchFileExec.getId()).withDetach(false)
-                .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
-        InspectExecResponse second = dockerClient.inspectExecCmd(touchFileExec.getId()).exec();
-        assertThat(second.isRunning(), is(false));
-        assertThat(second.getExitCode(), is(0));
-
-        // Check that file does exist now
-        ExecCreateCmdResponse checkFileExec2 = dockerClient.execCreateCmd(container.getId()).withAttachStdout(true)
-                .withAttachStderr(true).withCmd("test", "-e", "/marker").exec();
-        LOG.info("Created exec {}", checkFileExec2.toString());
-        assertThat(checkFileExec2.getId(), not(isEmptyString()));
-        dockerClient.execStartCmd(checkFileExec2.getId()).withDetach(false)
-                .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
-        InspectExecResponse third = dockerClient.inspectExecCmd(checkFileExec2.getId()).exec();
-        assertThat(third.isRunning(), is(false));
-        assertThat(third.getExitCode(), is(0));
-
-        // Get container info and check its roundtrip to ensure the consistency
-        InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(container.getId()).exec();
-        assertEquals(containerInfo.getId(), container.getId());
-        JSONTestHelper.testRoundTrip(containerInfo);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void inspectExecNetworkSettings() throws IOException {
-        final RemoteApiVersion apiVersion = getVersion(dockerClient);
-
-        String containerName = "generated_" + new SecureRandom().nextInt();
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName(containerName).exec();
-        LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        ExecCreateCmdResponse exec = dockerClient.execCreateCmd(container.getId()).withAttachStdout(true)
-                .withAttachStderr(true).withCmd("/bin/bash").exec();
-        LOG.info("Created exec {}", exec.toString());
-        assertThat(exec.getId(), not(isEmptyString()));
-
-        InspectExecResponse inspectExecResponse = dockerClient.inspectExecCmd(exec.getId()).exec();
-
-        if (apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_22)) {
-            assertThat(inspectExecResponse.getExitCode(), is(nullValue()));
-            assertThat(inspectExecResponse.getCanRemove(), is(false));
-            assertThat(inspectExecResponse.getContainerID(), is(container.getId()));
-        } else {
-            assertThat(inspectExecResponse.getExitCode(), is(0));
-            assertNotNull(inspectExecResponse.getContainer().getNetworkSettings().getNetworks().get("bridge"));
-        }
-
-        assertThat(inspectExecResponse.isOpenStdin(), is(false));
-        assertThat(inspectExecResponse.isOpenStdout(), is(true));
-        assertThat(inspectExecResponse.isRunning(), is(false));
-
-        final InspectExecResponse.Container inspectContainer = inspectExecResponse.getContainer();
-        if (apiVersion.isGreaterOrEqual(VERSION_1_22)) {
-            assertThat(inspectContainer, nullValue());
-        } else {
-            assertThat(inspectContainer, notNullValue());
-            assertNotNull(inspectContainer.getNetworkSettings().getNetworks().get("bridge"));
-        }
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectNetworkCmdImplTest.java
deleted file mode 100644
index cfd0bf74b..000000000
--- a/src/test/java/com/github/dockerjava/core/command/InspectNetworkCmdImplTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-
-@Test(groups = "integration")
-public class InspectNetworkCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void inspectNetwork() throws DockerException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        List<Network> networks = dockerClient.listNetworksCmd().exec();
-
-        Network expected = findNetwork(networks, "bridge");
-
-        Network network = dockerClient.inspectNetworkCmd().withNetworkId(expected.getId()).exec();
-
-        assertThat(network.getName(), equalTo(expected.getName()));
-        assertThat(network.getScope(), equalTo(expected.getScope()));
-        assertThat(network.getDriver(), equalTo(expected.getDriver()));
-        assertThat(network.getIpam().getConfig().get(0).getSubnet(), equalTo(expected.getIpam().getConfig().get(0).getSubnet()));
-        assertThat(network.getIpam().getDriver(), equalTo(expected.getIpam().getDriver()));
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/InspectVolumeCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InspectVolumeCmdImplTest.java
deleted file mode 100644
index c24f173df..000000000
--- a/src/test/java/com/github/dockerjava/core/command/InspectVolumeCmdImplTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-
-import java.lang.reflect.Method;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.InspectVolumeResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class InspectVolumeCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void inspectVolume() throws DockerException {
-
-        String volumeName = "volume1";
-
-        dockerClient.createVolumeCmd().withName(volumeName).withDriver("local").exec();
-
-        InspectVolumeResponse inspectVolumeResponse = dockerClient.inspectVolumeCmd(volumeName).exec();
-
-        assertThat(inspectVolumeResponse.getName(), equalTo("volume1"));
-        assertThat(inspectVolumeResponse.getDriver(), equalTo("local"));
-        assertThat(inspectVolumeResponse.getMountpoint(), containsString("/volume1/"));
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void inspectNonExistentVolume() throws DockerException {
-
-        String volumeName = "non-existing";
-
-        dockerClient.inspectVolumeCmd(volumeName).exec();
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
deleted file mode 100644
index c8589271e..000000000
--- a/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-import java.lang.reflect.Method;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class KillContainerCmdImplTest extends AbstractDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(KillContainerCmdImplTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void killContainer() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        LOG.info("Killing container: {}", container.getId());
-        dockerClient.killContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
-        assertThat(inspectContainerResponse.getState().getExitCode(), not(equalTo(0)));
-
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void killNonExistingContainer() throws DockerException {
-
-        dockerClient.killContainerCmd("non-existing").exec();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
deleted file mode 100644
index 6dab09ec6..000000000
--- a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static ch.lambdaj.Lambda.filter;
-import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.startsWith;
-import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
-
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Map;
-
-import org.hamcrest.Matcher;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.Container;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import com.google.common.collect.ImmutableMap;
-
-@Test(groups = "integration")
-public class ListContainersCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void testListContainers() throws Exception {
-
-        String testImage = "busybox";
-
-        List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
-        assertThat(containers, notNullValue());
-        LOG.info("Container List: {}", containers);
-
-        int size = containers.size();
-
-        CreateContainerResponse container1 = dockerClient.createContainerCmd(testImage).withCmd("echo").exec();
-
-        assertThat(container1.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container1.getId()).exec();
-
-        assertThat(inspectContainerResponse.getConfig().getImage(), is(equalTo(testImage)));
-
-        dockerClient.startContainerCmd(container1.getId()).exec();
-
-        LOG.info("container id: " + container1.getId());
-
-        List<Container> containers2 = dockerClient.listContainersCmd().withShowAll(true).exec();
-
-        for (Container container : containers2) {
-            LOG.info("listContainer: id=" + container.getId() + " image=" + container.getImage());
-        }
-
-        assertThat(size + 1, is(equalTo(containers2.size())));
-        Matcher matcher = hasItem(hasField("id", startsWith(container1.getId())));
-        assertThat(containers2, matcher);
-
-        List<Container> filteredContainers = filter(hasField("id", startsWith(container1.getId())), containers2);
-        assertThat(filteredContainers.size(), is(equalTo(1)));
-
-        for (Container container : filteredContainers) {
-            LOG.info("filteredContainer: " + container);
-        }
-
-        Container container2 = filteredContainers.get(0);
-        assertThat(container2.getCommand(), not(isEmptyString()));
-        assertThat(container2.getImage(), startsWith(testImage));
-    }
-
-    @Test
-    public void testListContainersWithLabelsFilter() throws Exception {
-
-        String testImage = "busybox";
-
-        // need to block until image is pulled completely
-        dockerClient.pullImageCmd(testImage).withTag("latest").exec(new PullImageResultCallback()).awaitCompletion();
-
-        List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
-        assertThat(containers, notNullValue());
-        LOG.info("Container List: {}", containers);
-
-        int size = containers.size();
-
-        CreateContainerResponse container1 = dockerClient.createContainerCmd(testImage).withCmd("echo").exec();
-
-        assertThat(container1.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container1.getId()).exec();
-
-        assertThat(inspectContainerResponse.getConfig().getImage(), is(equalTo(testImage)));
-
-        dockerClient.startContainerCmd(container1.getId()).exec();
-
-        LOG.info("container id: " + container1.getId());
-
-        List<Container> containers2 = dockerClient.listContainersCmd().withShowAll(true).exec();
-
-        for (Container container : containers2) {
-            LOG.info("listContainer: id=" + container.getId() + " image=" + container.getImage());
-        }
-
-        assertThat(size + 1, is(equalTo(containers2.size())));
-        Matcher matcher = hasItem(hasField("id", startsWith(container1.getId())));
-        assertThat(containers2, matcher);
-
-        List<Container> filteredContainers = filter(hasField("id", startsWith(container1.getId())), containers2);
-        assertThat(filteredContainers.size(), is(equalTo(1)));
-
-        for (Container container : filteredContainers) {
-            LOG.info("filteredContainer: " + container);
-        }
-
-        Container container2 = filteredContainers.get(0);
-        assertThat(container2.getCommand(), not(isEmptyString()));
-        assertThat(container2.getImage(), startsWith(testImage));
-
-        Map<String, String> labels = ImmutableMap.of("test", "docker-java");
-
-        // list with filter by label
-        dockerClient.createContainerCmd(testImage).withCmd("echo").withLabels(labels).exec();
-        filteredContainers = dockerClient.listContainersCmd().withShowAll(true)
-                .withLabelFilter(labels).exec();
-        assertThat(filteredContainers.size(), is(equalTo(1)));
-        Container container3 = filteredContainers.get(0);
-        assertThat(container3.getCommand(), not(isEmptyString()));
-        assertThat(container3.getImage(), startsWith(testImage));
-
-        filteredContainers = dockerClient.listContainersCmd().withShowAll(true)
-                .withLabelFilter("test").exec();
-        assertThat(filteredContainers.size(), is(equalTo(1)));
-        container3 = filteredContainers.get(0);
-        assertThat(container3.getCommand(), not(isEmptyString()));
-        assertThat(container3.getImage(), startsWith(testImage));
-        if (isNotSwarm(dockerClient)) {
-            assertEquals(container3.getLabels(), labels);
-        }
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/ListNetworksCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListNetworksCmdImplTest.java
deleted file mode 100644
index f24e0f7ae..000000000
--- a/src/test/java/com/github/dockerjava/core/command/ListNetworksCmdImplTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class ListNetworksCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void listNetworks() throws DockerException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        List<Network> networks = dockerClient.listNetworksCmd().exec();
-
-        Network network = findNetwork(networks, "bridge");
-
-        assertThat(network.getName(), equalTo("bridge"));
-        assertThat(network.getScope(), equalTo("local"));
-        assertThat(network.getDriver(), equalTo("bridge"));
-        assertThat(network.getIpam().getDriver(), equalTo("default"));
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/ListVolumesCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListVolumesCmdImplTest.java
deleted file mode 100644
index 646f502c8..000000000
--- a/src/test/java/com/github/dockerjava/core/command/ListVolumesCmdImplTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.greaterThanOrEqualTo;
-
-import java.lang.reflect.Method;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateVolumeResponse;
-import com.github.dockerjava.api.command.ListVolumesResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class ListVolumesCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void listVolumes() throws DockerException {
-
-        CreateVolumeResponse createVolumeResponse = dockerClient.createVolumeCmd().withName("volume1")
-                .withDriver("local").exec();
-
-        assertThat(createVolumeResponse.getName(), equalTo("volume1"));
-        assertThat(createVolumeResponse.getDriver(), equalTo("local"));
-        assertThat(createVolumeResponse.getMountpoint(), containsString("/volume1/"));
-
-        ListVolumesResponse listVolumesResponse = dockerClient.listVolumesCmd().exec();
-
-        assertThat(listVolumesResponse.getVolumes().size(), greaterThanOrEqualTo(1));
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
deleted file mode 100644
index 869bcbb1a..000000000
--- a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.containsString;
-
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.concurrent.TimeUnit;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.model.StreamType;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class LogContainerCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void asyncLogContainerWithTtyEnabled() throws Exception {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withCmd("/bin/sh", "-c", "while true; do echo hello; sleep 1; done")
-                .withTty(true)
-                .exec();
-
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId())
-            .exec();
-
-        LogContainerTestCallback loggingCallback = new LogContainerTestCallback(true);
-
-        // this essentially test the since=0 case
-        dockerClient.logContainerCmd(container.getId())
-            .withStdErr(true)
-            .withStdOut(true)
-            .withFollowStream(true)
-            .withTailAll()
-            .exec(loggingCallback);
-
-        loggingCallback.awaitCompletion(3, TimeUnit.SECONDS);
-
-        assertTrue(loggingCallback.toString().contains("hello"));
-
-        assertEquals(loggingCallback.getCollectedFrames().get(0).getStreamType(), StreamType.RAW);
-    }
-
-    @Test
-    public void asyncLogContainerWithTtyDisabled() throws Exception {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withCmd("/bin/sh", "-c", "while true; do echo hello; sleep 1; done")
-                .withTty(false)
-                .exec();
-
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId())
-            .exec();
-
-        LogContainerTestCallback loggingCallback = new LogContainerTestCallback(true);
-
-        // this essentially test the since=0 case
-        dockerClient.logContainerCmd(container.getId())
-            .withStdErr(true)
-            .withStdOut(true)
-            .withFollowStream(true)
-            .withTailAll()
-            .exec(loggingCallback);
-
-        loggingCallback.awaitCompletion(3, TimeUnit.SECONDS);
-
-        assertTrue(loggingCallback.toString().contains("hello"));
-
-        assertEquals(loggingCallback.getCollectedFrames().get(0).getStreamType(), StreamType.STDOUT);
-    }
-
-    @Test
-    public void asyncLogNonExistingContainer() throws Exception {
-
-        LogContainerTestCallback loggingCallback = new LogContainerTestCallback() {
-            @Override
-            public void onError(Throwable throwable) {
-
-                assertEquals(throwable.getClass().getName(), NotFoundException.class.getName());
-
-                try {
-                    // close the callback to prevent the call to onComplete
-                    close();
-                } catch (IOException e) {
-                    throw new RuntimeException();
-                }
-
-                super.onError(throwable);
-            }
-
-            public void onComplete() {
-                super.onComplete();
-                fail("expected NotFoundException");
-            };
-        };
-
-        dockerClient.logContainerCmd("non-existing").withStdErr(true).withStdOut(true).exec(loggingCallback)
-                .awaitCompletion();
-    }
-
-    @Test
-    public void asyncMultipleLogContainer() throws Exception {
-
-        String snippet = "hello world";
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withCmd("/bin/echo", snippet)
-                .exec();
-
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        int exitCode = dockerClient.waitContainerCmd(container.getId())
-                .exec(new WaitContainerResultCallback())
-                .awaitStatusCode();
-
-        assertThat(exitCode, equalTo(0));
-
-        LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
-
-        dockerClient.logContainerCmd(container.getId())
-                .withStdErr(true)
-                .withStdOut(true)
-                .exec(loggingCallback);
-
-        loggingCallback.close();
-
-        loggingCallback = new LogContainerTestCallback();
-
-        dockerClient.logContainerCmd(container.getId())
-                .withStdErr(true)
-                .withStdOut(true)
-                .exec(loggingCallback);
-
-        loggingCallback.close();
-
-        loggingCallback = new LogContainerTestCallback();
-
-        dockerClient.logContainerCmd(container.getId())
-                .withStdErr(true)
-                .withStdOut(true)
-                .exec(loggingCallback);
-
-        loggingCallback.awaitCompletion();
-
-        assertTrue(loggingCallback.toString().contains(snippet));
-    }
-
-    @Test
-    public void asyncLogContainerWithSince() throws Exception {
-        String snippet = "hello world";
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withCmd("/bin/echo", snippet)
-                .exec();
-
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        int timestamp = (int) (System.currentTimeMillis() / 1000);
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        int exitCode = dockerClient.waitContainerCmd(container.getId())
-                .exec(new WaitContainerResultCallback())
-                .awaitStatusCode();
-
-        assertThat(exitCode, equalTo(0));
-
-        LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
-
-        dockerClient.logContainerCmd(container.getId())
-                .withStdErr(true)
-                .withStdOut(true)
-                .withSince(timestamp)
-                .exec(loggingCallback);
-
-        loggingCallback.awaitCompletion();
-
-        assertThat(loggingCallback.toString(), containsString(snippet));
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/PauseCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PauseCmdImplTest.java
deleted file mode 100644
index f100c4f89..000000000
--- a/src/test/java/com/github/dockerjava/core/command/PauseCmdImplTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.exception.InternalServerErrorException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import com.github.dockerjava.utils.ContainerUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-@Test(groups = {"integration", "ignoreInCircleCi"})
-public class PauseCmdImplTest extends AbstractDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(PauseCmdImplTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void pauseRunningContainer() {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        ContainerUtils.startContainer(dockerClient, container);
-
-        ContainerUtils.pauseContainer(dockerClient, container);
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void pauseNonExistingContainer() {
-
-        dockerClient.pauseContainerCmd("non-existing").exec();
-    }
-
-    @Test(expectedExceptions = InternalServerErrorException.class)
-    public void pauseStoppedContainer() {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        ContainerUtils.startContainer(dockerClient, container);
-
-        ContainerUtils.stopContainer(dockerClient, container);
-
-        dockerClient.pauseContainerCmd(container.getId()).exec();
-    }
-
-    @Test(expectedExceptions = InternalServerErrorException.class)
-    public void pausePausedContainer() {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        ContainerUtils.startContainer(dockerClient, container);
-
-        ContainerUtils.pauseContainer(dockerClient, container);
-
-        dockerClient.pauseContainerCmd(container.getId()).exec();
-    }
-
-    @Test(expectedExceptions = InternalServerErrorException.class)
-    public void pauseCreatedContainer() {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.pauseContainerCmd(container.getId()).exec();
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
deleted file mode 100644
index d5e6d2c48..000000000
--- a/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.lessThanOrEqualTo;
-import static org.hamcrest.Matchers.notNullValue;
-
-import java.lang.reflect.Method;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.command.InspectImageResponse;
-import com.github.dockerjava.api.command.PullImageCmd;
-import com.github.dockerjava.api.model.Info;
-import com.github.dockerjava.api.model.PullResponseItem;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class PullImageCmdImplTest extends AbstractDockerClientTest {
-
-    private static final PullImageCmd.Exec NOP_EXEC = new PullImageCmd.Exec() {
-        public Void exec(PullImageCmd command, ResultCallback<PullResponseItem> resultCallback) {
-            return null;
-        };
-    };
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void nullAuthConfig() throws Exception {
-        PullImageCmdImpl pullImageCmd = new PullImageCmdImpl(NOP_EXEC, null, "");
-        try {
-            pullImageCmd.withAuthConfig(null);
-            fail();
-        } catch (Exception e) {
-            assertEquals(e.getMessage(), "authConfig was not specified");
-        } finally {
-            pullImageCmd.close();
-        }
-    }
-
-    @Test
-    public void testPullImage() throws Exception {
-        Info info = dockerClient.infoCmd().exec();
-        LOG.info("Client info: {}", info.toString());
-
-        int imgCount = info.getImages();
-        LOG.info("imgCount1: {}", imgCount);
-
-        // This should be an image that is not used by other repositories
-        // already
-        // pulled down, preferably small in size. If tag is not used pull will
-        // download all images in that repository but tmpImgs will only
-        // deleted 'latest' image but not images with other tags
-        String testImage = "hackmann/empty";
-
-        LOG.info("Removing image: {}", testImage);
-
-        try {
-            dockerClient.removeImageCmd(testImage).withForce(true).exec();
-        } catch (NotFoundException e) {
-            // just ignore if not exist
-        }
-
-        info = dockerClient.infoCmd().exec();
-        LOG.info("Client info: {}", info.toString());
-
-        imgCount = info.getImages();
-        LOG.info("imgCount2: {}", imgCount);
-
-        LOG.info("Pulling image: {}", testImage);
-
-        dockerClient.pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess();
-
-        info = dockerClient.infoCmd().exec();
-        LOG.info("Client info after pull, {}", info.toString());
-
-        assertThat(imgCount, lessThanOrEqualTo(info.getImages()));
-
-        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(testImage).exec();
-        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-        assertThat(inspectImageResponse, notNullValue());
-    }
-
-    @Test
-    public void testPullNonExistingImage() throws Exception {
-
-        // does not throw an exception
-        // stream needs to be fully read in order to close the underlying connection
-        dockerClient.pullImageCmd("xvxcv/foo").exec(new PullImageResultCallback()).awaitCompletion();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
deleted file mode 100644
index 0fb32c311..000000000
--- a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-import java.lang.reflect.Method;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.DockerClientException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = {"integration-auth", "integration"})
-public class PushImageCmdImplTest extends AbstractDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(PushImageCmdImplTest.class);
-
-    String username;
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-        username = dockerClient.authConfig().getUsername();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void pushLatest() throws Exception {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true").exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        LOG.info("Committing container: {}", container.toString());
-        String imageId = dockerClient.commitCmd(container.getId()).withRepository(username + "/busybox").exec();
-
-        // we have to block until image is pushed
-        dockerClient.pushImageCmd(username + "/busybox").exec(new PushImageResultCallback()).awaitSuccess();
-
-        LOG.info("Removing image: {}", imageId);
-        dockerClient.removeImageCmd(imageId).exec();
-
-        dockerClient.pullImageCmd(username + "/busybox").exec(new PullImageResultCallback()).awaitSuccess();
-    }
-
-    @Test(expectedExceptions = DockerClientException.class)
-    public void pushNonExistentImage() throws Exception {
-
-        dockerClient.pushImageCmd(username + "/xxx").exec(new PushImageResultCallback()).awaitSuccess();
-
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
deleted file mode 100644
index 26c8e0e19..000000000
--- a/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.startsWith;
-import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.hamcrest.Matcher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.model.Container;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class RemoveContainerCmdImplTest extends AbstractDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(RemoveContainerCmdImplTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void removeContainer() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true").exec();
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-        dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
-
-        LOG.info("Removing container: {}", container.getId());
-        dockerClient.removeContainerCmd(container.getId()).exec();
-
-        List<Container> containers2 = dockerClient.listContainersCmd().withShowAll(true).exec();
-
-        Matcher matcher = not(hasItem(hasField("id", startsWith(container.getId()))));
-        assertThat(containers2, matcher);
-
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void removeNonExistingContainer() throws DockerException {
-
-        dockerClient.removeContainerCmd("non-existing").exec();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
deleted file mode 100644
index 4427da997..000000000
--- a/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.startsWith;
-import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.hamcrest.Matcher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.model.Container;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class RemoveImageCmdImplTest extends AbstractDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(RemoveImageCmdImplTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void removeImage() throws DockerException, InterruptedException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        LOG.info("Committing container {}", container.toString());
-        String imageId = dockerClient.commitCmd(container.getId()).exec();
-
-        dockerClient.stopContainerCmd(container.getId()).exec();
-        dockerClient.removeContainerCmd(container.getId()).exec();
-
-        LOG.info("Removing image: {}", imageId);
-        dockerClient.removeImageCmd(imageId).exec();
-
-        List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
-
-        Matcher matcher = not(hasItem(hasField("id", startsWith(imageId))));
-        assertThat(containers, matcher);
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void removeNonExistingImage() throws DockerException, InterruptedException {
-
-        dockerClient.removeImageCmd("non-existing").exec();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveNetworkCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveNetworkCmdImplTest.java
deleted file mode 100644
index 2e9e275df..000000000
--- a/src/test/java/com/github/dockerjava/core/command/RemoveNetworkCmdImplTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import com.github.dockerjava.api.command.CreateNetworkResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import org.hamcrest.Matcher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.startsWith;
-import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
-
-@Test(groups = "integration")
-public class RemoveNetworkCmdImplTest extends AbstractDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(RemoveNetworkCmdImplTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void removeNetwork() throws DockerException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        CreateNetworkResponse network = dockerClient.createNetworkCmd().withName("test-network").exec();
-
-        LOG.info("Removing network: {}", network.getId());
-        dockerClient.removeNetworkCmd(network.getId()).exec();
-
-        List<Network> networks = dockerClient.listNetworksCmd().exec();
-
-        Matcher matcher = not(hasItem(hasField("id", startsWith(network.getId()))));
-        assertThat(networks, matcher);
-
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void removeNonExistingContainer() throws DockerException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        dockerClient.removeNetworkCmd("non-existing").exec();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveServiceCmdExecTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveServiceCmdExecTest.java
deleted file mode 100644
index 870a506e4..000000000
--- a/src/test/java/com/github/dockerjava/core/command/RemoveServiceCmdExecTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.ContainerSpec;
-import com.github.dockerjava.api.model.Service;
-import com.github.dockerjava.api.model.ServiceSpec;
-import com.github.dockerjava.api.model.SwarmSpec;
-import com.github.dockerjava.api.model.TaskSpec;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-import org.testng.collections.Lists;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.is;
-
-@Test(groups = "swarm-integration")
-public class RemoveServiceCmdExecTest extends AbstractSwarmDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(RemoveServiceCmdExecTest.class);
-    private static final String SERVICE_NAME = "theservice";
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void removeService() throws DockerException {
-        dockerClient.initializeSwarmCmd(new SwarmSpec()).withListenAddr("127.0.0.1").exec();
-
-        ServiceSpec spec = new ServiceSpec()
-                .withName(SERVICE_NAME)
-                .withTaskTemplate(new TaskSpec()
-                        .withContainerSpec(new ContainerSpec()
-                                .withImage("busybox")));
-
-        dockerClient.createServiceCmd(spec).exec();
-
-        spec.getTaskTemplate().getContainerSpec().withImage("ubuntu");
-
-        List<Service> services = dockerClient.listServicesCmd()
-                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
-                .exec();
-
-        assertThat(services, hasSize(1));
-
-        dockerClient.removeServiceCmd(services.get(0).getId())
-                .exec();
-
-        services = dockerClient.listServicesCmd()
-                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
-                .exec();
-
-        assertThat(services, hasSize(0));
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveVolumeCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveVolumeCmdImplTest.java
deleted file mode 100644
index 9ed690b65..000000000
--- a/src/test/java/com/github/dockerjava/core/command/RemoveVolumeCmdImplTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-
-import java.lang.reflect.Method;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateVolumeResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class RemoveVolumeCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void removeVolume() throws DockerException {
-
-        String volumeName = "volume1";
-
-        CreateVolumeResponse createVolumeResponse = dockerClient.createVolumeCmd().withName(volumeName)
-                .withDriver("local").exec();
-
-        assertThat(createVolumeResponse.getName(), equalTo(volumeName));
-        assertThat(createVolumeResponse.getDriver(), equalTo("local"));
-        assertThat(createVolumeResponse.getMountpoint(), containsString("/volume1/"));
-
-        dockerClient.removeVolumeCmd(volumeName).exec();
-
-        dockerClient.inspectVolumeCmd(volumeName).exec();
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java
deleted file mode 100644
index 582ab2556..000000000
--- a/src/test/java/com/github/dockerjava/core/command/RenameContainerCmdImplTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-@Test(groups = "integration")
-public class RenameContainerCmdImplTest extends AbstractDockerClientTest {
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void renameContainer() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-        String name1 = inspectContainerResponse.getName();
-
-        dockerClient.renameContainerCmd(container.getId())
-                .withName(getClass().getCanonicalName() + "renameContainer")
-                .exec();
-
-        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container.getId()).exec();
-        LOG.info("Container Inspect After Rename: {}", inspectContainerResponse2.toString());
-
-        String name2 = inspectContainerResponse2.getName();
-
-        assertNotEquals(name1, name2);
-
-        dockerClient.killContainerCmd(container.getId()).exec();
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void renameExistingContainer() throws DockerException, InterruptedException {
-        dockerClient.renameContainerCmd("non-existing")
-                .withName(getClass().getCanonicalName() + "renameExistingContainer")
-                .exec();
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
deleted file mode 100644
index 84916f082..000000000
--- a/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-import java.lang.reflect.Method;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class RestartContainerCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void restartContainer() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-        String startTime = inspectContainerResponse.getState().getStartedAt();
-
-        dockerClient.restartContainerCmd(container.getId()).withtTimeout(2).exec();
-
-        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container.getId()).exec();
-        LOG.info("Container Inspect After Restart: {}", inspectContainerResponse2.toString());
-
-        String startTime2 = inspectContainerResponse2.getState().getStartedAt();
-
-        assertThat(startTime, not(equalTo(startTime2)));
-
-        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(true)));
-
-        dockerClient.killContainerCmd(container.getId()).exec();
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void restartNonExistingContainer() throws DockerException, InterruptedException {
-
-        dockerClient.restartContainerCmd("non-existing").exec();
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/SaveImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/SaveImageCmdImplTest.java
deleted file mode 100644
index ffc81d4e0..000000000
--- a/src/test/java/com/github/dockerjava/core/command/SaveImageCmdImplTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.greaterThan;
-
-import java.io.InputStream;
-import java.lang.reflect.Method;
-
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class SaveImageCmdImplTest extends AbstractDockerClientTest {
-    public static final Logger LOG = LoggerFactory.getLogger(SaveImageCmdImplTest.class);
-
-    String username;
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void saveImage() throws Exception {
-
-        InputStream image = IOUtils.toBufferedInputStream(dockerClient.saveImageCmd("busybox").exec());
-        assertThat(image.available(), greaterThan(0));
-
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java
deleted file mode 100644
index 78e018427..000000000
--- a/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static ch.lambdaj.Lambda.filter;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.is;
-import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.hamcrest.Matcher;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.SearchItem;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class SearchImagesCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void searchImages() throws DockerException {
-        List<SearchItem> dockerSearch = dockerClient.searchImagesCmd("busybox").exec();
-        LOG.info("Search returned {}", dockerSearch.toString());
-
-        Matcher matcher = hasItem(hasField("name", equalTo("busybox")));
-        assertThat(dockerSearch, matcher);
-
-        assertThat(filter(hasField("name", is("busybox")), dockerSearch).size(), equalTo(1));
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
deleted file mode 100644
index 7ae6a09cc..000000000
--- a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
-import static com.github.dockerjava.utils.TestUtils.getVersion;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-import java.lang.reflect.Method;
-
-import com.github.dockerjava.core.RemoteApiVersion;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class StopContainerCmdImplTest extends AbstractDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(StopContainerCmdImplTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void testStopContainer() throws DockerException {
-        final RemoteApiVersion apiVersion = getVersion(dockerClient);
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        LOG.info("Stopping container: {}", container.getId());
-        dockerClient.stopContainerCmd(container.getId()).withTimeout(2).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
-
-        final Integer exitCode = inspectContainerResponse.getState().getExitCode();
-        
-        assertThat(exitCode, is(137));
-        
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void testStopNonExistingContainer() throws DockerException {
-
-        dockerClient.stopContainerCmd("non-existing").withTimeout(2).exec();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java
deleted file mode 100644
index 3bf033212..000000000
--- a/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import java.lang.reflect.Method;
-
-import org.apache.commons.lang.math.RandomUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class TagImageCmdImplTest extends AbstractDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(TagImageCmdImplTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void tagImage() throws Exception {
-        String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
-
-        dockerClient.tagImageCmd("busybox:latest", "docker-java/busybox", tag).exec();
-
-        dockerClient.removeImageCmd("docker-java/busybox:" + tag).exec();
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void tagNonExistingImage() throws Exception {
-
-        String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
-        dockerClient.tagImageCmd("non-existing", "docker-java/busybox", tag).exec();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/UnpauseCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/UnpauseCmdImplTest.java
deleted file mode 100644
index 2f41b67ae..000000000
--- a/src/test/java/com/github/dockerjava/core/command/UnpauseCmdImplTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.exception.InternalServerErrorException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import com.github.dockerjava.utils.ContainerUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-@Test(groups = {"integration", "ignoreInCircleCi"})
-public class UnpauseCmdImplTest extends AbstractDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(UnpauseCmdImplTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void unpausePausedContainer() {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        ContainerUtils.startContainer(dockerClient, container);
-
-        ContainerUtils.pauseContainer(dockerClient, container);
-
-        ContainerUtils.unpauseContainer(dockerClient, container);
-    }
-
-    @Test(expectedExceptions = InternalServerErrorException.class)
-    public void unpauseRunningContainer() {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        ContainerUtils.startContainer(dockerClient, container);
-
-        dockerClient.unpauseContainerCmd(container.getId()).exec();
-    }
-
-    @Test(expectedExceptions = InternalServerErrorException.class)
-    public void unpauseStoppedContainer() {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        ContainerUtils.startContainer(dockerClient, container);
-
-        ContainerUtils.stopContainer(dockerClient, container);
-
-        dockerClient.unpauseContainerCmd(container.getId()).exec();
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void unpauseNonExistingContainer() {
-
-        dockerClient.unpauseContainerCmd("non-existing").exec();
-    }
-
-    @Test(expectedExceptions = InternalServerErrorException.class)
-    public void unpauseCreatedContainer() {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.unpauseContainerCmd(container.getId()).exec();
-    }
-
-    @Test(expectedExceptions = InternalServerErrorException.class)
-    public void unpauseUnpausedContainer() {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        ContainerUtils.startContainer(dockerClient, container);
-
-        ContainerUtils.pauseContainer(dockerClient, container);
-
-        dockerClient.unpauseContainerCmd(container.getId()).exec();
-        dockerClient.unpauseContainerCmd(container.getId()).exec();
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/UpdateServiceCmdExecTest.java b/src/test/java/com/github/dockerjava/core/command/UpdateServiceCmdExecTest.java
deleted file mode 100644
index cc8f875d9..000000000
--- a/src/test/java/com/github/dockerjava/core/command/UpdateServiceCmdExecTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.ContainerSpec;
-import com.github.dockerjava.api.model.Service;
-import com.github.dockerjava.api.model.ServiceSpec;
-import com.github.dockerjava.api.model.SwarmSpec;
-import com.github.dockerjava.api.model.TaskSpec;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-import org.testng.collections.Lists;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.is;
-
-@Test(groups = "swarm-integration")
-public class UpdateServiceCmdExecTest extends AbstractSwarmDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(UpdateServiceCmdExecTest.class);
-    private static final String SERVICE_NAME = "theservice";
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void updateService() throws DockerException {
-        dockerClient.initializeSwarmCmd(new SwarmSpec()).withListenAddr("127.0.0.1").exec();
-
-        ServiceSpec spec = new ServiceSpec()
-                .withName(SERVICE_NAME)
-                .withTaskTemplate(new TaskSpec()
-                        .withContainerSpec(new ContainerSpec()
-                                .withImage("busybox")));
-
-        dockerClient.createServiceCmd(spec).exec();
-
-        spec.getTaskTemplate().getContainerSpec().withImage("ubuntu");
-
-        List<Service> services = dockerClient.listServicesCmd()
-                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
-                .exec();
-
-        assertThat(services, hasSize(1));
-
-        dockerClient.updateServiceCmd(services.get(0).getId(), spec)
-                .withVersion(services.get(0).getVersion().getIndex())
-                .exec();
-
-        services = dockerClient.listServicesCmd()
-                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
-                .exec();
-
-        assertThat(services, hasSize(1));
-
-        assertThat(services.get(0).getSpec().getTaskTemplate().getContainerSpec().getImage(), is(equalTo("ubuntu")));
-
-        dockerClient.removeServiceCmd(SERVICE_NAME);
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java
deleted file mode 100644
index d8bfb3f23..000000000
--- a/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import java.lang.reflect.Method;
-
-import org.apache.commons.lang.StringUtils;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.Version;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-
-@Test(groups = "integration")
-public class VersionCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void version() throws DockerException {
-        Version version = dockerClient.versionCmd().exec();
-        LOG.info(version.toString());
-
-        assertTrue(version.getGoVersion().length() > 0);
-        assertTrue(version.getVersion().length() > 0);
-
-        assertEquals(StringUtils.split(version.getVersion(), ".").length, 3);
-
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
deleted file mode 100644
index b92dcc657..000000000
--- a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.exception.DockerClientException;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.model.WaitResponse;
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-import java.util.concurrent.TimeUnit;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
-
-@Test(groups = "integration")
-public class WaitContainerCmdImplTest extends AbstractDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void testWaitContainer() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true").exec();
-
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
-                .awaitStatusCode();
-        LOG.info("Container exit code: {}", exitCode);
-
-        assertThat(exitCode, equalTo(0));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
-        assertThat(inspectContainerResponse.getState().getExitCode(), is(equalTo(exitCode)));
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void testWaitNonExistingContainer() throws DockerException {
-
-        WaitContainerResultCallback callback = new WaitContainerResultCallback() {
-            public void onNext(WaitResponse waitResponse) {
-                fail("expected NotFoundException");
-            }
-        };
-
-        dockerClient.waitContainerCmd("non-existing").exec(callback).awaitStatusCode();
-    }
-
-    @Test
-    public void testWaitContainerAbort() throws Exception {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        WaitContainerResultCallback callback = dockerClient.waitContainerCmd(container.getId()).exec(
-                new WaitContainerResultCallback());
-
-        Thread.sleep(5000);
-
-        callback.close();
-
-        dockerClient.killContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
-    }
-
-    @Test
-    public void testWaitContainerTimeout() throws Exception {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "10").exec();
-
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        WaitContainerResultCallback callback = dockerClient.waitContainerCmd(container.getId()).exec(
-                new WaitContainerResultCallback());
-        try {
-            callback.awaitStatusCode(100, TimeUnit.MILLISECONDS);
-            fail("Should throw exception on timeout.");
-        } catch(DockerClientException e){
-            LOG.info(e.getMessage());
-        }
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
index b58a0fcb0..ee1f072df 100644
--- a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
+++ b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
@@ -1,22 +1,21 @@
 package com.github.dockerjava.core.dockerfile;
 
-import static com.google.common.collect.Collections2.transform;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
+import com.google.common.base.Function;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Function;
+import static com.google.common.collect.Collections2.transform;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
 
 public class DockerfileAddMultipleFilesTest {
 
-    private static final Logger log = LoggerFactory.getLogger(DockerfileAddMultipleFilesTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DockerfileAddMultipleFilesTest.class);
 
     private static final Function<File, String> TO_FILE_NAMES = new Function<File, String>() {
         @Override
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
index 102b113e3..efbf67aaf 100644
--- a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
+++ b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
@@ -3,42 +3,60 @@
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.google.common.base.Optional;
 import org.hamcrest.Matcher;
+import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.is;
 
+@RunWith(Enclosed.class)
 public class DockerfileStatementAddTest {
 
-    private static final Logger LOG = LoggerFactory.getLogger(DockerfileStatementAddTest.class);
-
-    @DataProvider(name = "valid scenarios")
-    public Object[][] validScenarios() {
-        return new Object[][] { {"ADD src dest", contains("src"), "dest"},
-                {"ADD \"src file\" \"dest\"", contains("src file"), "dest"},
-                {"ADD src\"file dest", contains("src\"file"), "dest"},
-                {"ADD src1 src2 dest", containsInAnyOrder("src1", "src2"), "dest"},
-                {"COPY src dest", contains("src"), "dest"},
-                {"COPY \"src file\" \"dest\"", contains("src file"), "dest"},
-                {"COPY src\"file dest", contains("src\"file"), "dest"},
-                {"COPY src1 src2 dest", containsInAnyOrder("src1", "src2"), "dest"}};
-    }
+    @RunWith(Parameterized.class)
+    public static final class ParamTests {
+
+        private static final Logger LOG = LoggerFactory.getLogger(DockerfileStatementAddTest.class);
+
+        @Parameterized.Parameters(name = "{0} {1} {2}")
+        public static Object[][] data() {
+            return new Object[][]{{"ADD src dest", contains("src"), "dest"},
+                    {"ADD \"src file\" \"dest\"", contains("src file"), "dest"},
+                    {"ADD src\"file dest", contains("src\"file"), "dest"},
+                    {"ADD src1 src2 dest", containsInAnyOrder("src1", "src2"), "dest"},
+                    {"COPY src dest", contains("src"), "dest"},
+                    {"COPY \"src file\" \"dest\"", contains("src file"), "dest"},
+                    {"COPY src\"file dest", contains("src\"file"), "dest"},
+                    {"COPY src1 src2 dest", containsInAnyOrder("src1", "src2"), "dest"}};
+        }
+
+        @Parameterized.Parameter
+        public String command;
+
+        @Parameterized.Parameter(1)
+        public Matcher matchesExpectation;
+
+        @Parameterized.Parameter(2)
+        public String expectedDest;
 
-    @Test(dataProvider = "valid scenarios")
-    public void testAddOrCopyPattern(String command, Matcher matchesExpectation, String expectedDest) {
-        Optional<DockerfileStatement.Add> optionalAdd = DockerfileStatement.Add.create(command);
-        assertThat(optionalAdd.isPresent(), is(true));
-        assertThat(optionalAdd.get().sources, matchesExpectation);
-        assertThat(optionalAdd.get().destination, is(expectedDest));
+        @Test
+        public void testAddOrCopyPattern() {
+            Optional<DockerfileStatement.Add> optionalAdd = DockerfileStatement.Add.create(command);
+            assertThat(optionalAdd.isPresent(), is(true));
+            assertThat(optionalAdd.get().sources, matchesExpectation);
+            assertThat(optionalAdd.get().destination, is(expectedDest));
+        }
     }
 
-    @Test(expectedExceptions = {DockerClientException.class})
-    public void shouldThrowExceptionIfDestNotSpecified() {
-        DockerfileStatement.Add.create("ADD src");
+    public static final class Tests {
+        @Test(expected = DockerClientException.class)
+        public void shouldThrowExceptionIfDestNotSpecified() {
+            DockerfileStatement.Add.create("ADD src");
+        }
     }
 }
diff --git a/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java b/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java
index 9c7120d1f..a19dd2cc4 100644
--- a/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java
+++ b/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java
@@ -1,16 +1,16 @@
 package com.github.dockerjava.core.util;
 
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.security.KeyStore;
 import java.security.Security;
 
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 
diff --git a/src/test/java/com/github/dockerjava/core/util/FiltersBuilderTest.java b/src/test/java/com/github/dockerjava/core/util/FiltersBuilderTest.java
index e70a3b057..08bf62fd3 100644
--- a/src/test/java/com/github/dockerjava/core/util/FiltersBuilderTest.java
+++ b/src/test/java/com/github/dockerjava/core/util/FiltersBuilderTest.java
@@ -1,12 +1,13 @@
 package com.github.dockerjava.core.util;
 
 import com.google.common.collect.Maps;
-import org.testng.annotations.Test;
+import org.junit.Test;
 
 import java.util.Map;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
 
 /**
  * @author Vincent Latombe <vincent@latombe.net>
diff --git a/src/test/java/com/github/dockerjava/junit/DockerAssume.java b/src/test/java/com/github/dockerjava/junit/DockerAssume.java
new file mode 100644
index 000000000..011ee2885
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/junit/DockerAssume.java
@@ -0,0 +1,33 @@
+package com.github.dockerjava.junit;
+
+import com.github.dockerjava.api.DockerClient;
+
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+public class DockerAssume {
+    public static void assumeSwarm(DockerClient client) {
+        assumeTrue(isSwarm(client));
+    }
+
+    public static void assumeSwarm(String message, DockerClient client) {
+        assumeTrue(message, isSwarm(client));
+    }
+
+    public static void assumeNotSwarm(DockerClient client) {
+        assumeFalse(isSwarm(client));
+    }
+
+    public static void assumeNotSwarm(String message, DockerRule dockerRule) {
+        assumeNotSwarm(message, dockerRule.getClient());
+    }
+
+    public static void assumeNotSwarm(String message, DockerClient client) {
+        assumeFalse(message, isSwarm(client));
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/junit/DockerMatchers.java b/src/test/java/com/github/dockerjava/junit/DockerMatchers.java
new file mode 100644
index 000000000..4d4fe2105
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/junit/DockerMatchers.java
@@ -0,0 +1,65 @@
+package com.github.dockerjava.junit;
+
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.Volume;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.hamcrest.CustomTypeSafeMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.FeatureMatcher;
+import org.hamcrest.Matcher;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.github.dockerjava.utils.TestUtils.getVersion;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+public class DockerMatchers {
+    private DockerMatchers() {
+    }
+
+    public static MountedVolumes mountedVolumes(Matcher<? super List<Volume>> subMatcher) {
+        return new MountedVolumes(subMatcher, "Mounted volumes", "mountedVolumes");
+    }
+
+    public static class MountedVolumes extends FeatureMatcher<InspectContainerResponse, List<Volume>> {
+        public MountedVolumes(Matcher<? super List<Volume>> subMatcher, String featureDescription, String featureName) {
+            super(subMatcher, featureDescription, featureName);
+        }
+
+        @Override
+        public List<Volume> featureValueOf(InspectContainerResponse item) {
+            List<Volume> volumes = new ArrayList<Volume>();
+            for (InspectContainerResponse.Mount mount : item.getMounts()) {
+                volumes.add(mount.getDestination());
+            }
+            return volumes;
+        }
+    }
+
+
+    public static Matcher<DockerRule> apiVersionGreater(final RemoteApiVersion version) {
+        return new CustomTypeSafeMatcher<DockerRule>("is greater") {
+            public boolean matchesSafely(DockerRule dockerRule) {
+                return getVersion(dockerRule.getClient()).isGreater(version);
+            }
+        };
+    }
+
+    public static Matcher<DockerRule> isGreaterOrEqual(final RemoteApiVersion version) {
+        return new CustomTypeSafeMatcher<DockerRule>("is greater or equal") {
+            public boolean matchesSafely(DockerRule dockerRule) {
+                return getVersion(dockerRule.getClient()).isGreaterOrEqual(version);
+            }
+
+            @Override
+            protected void describeMismatchSafely(DockerRule rule, Description mismatchDescription) {
+                mismatchDescription
+                        .appendText(" was ")
+                        .appendText(getVersion(rule.getClient()).toString());
+            }
+        };
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/junit/DockerRule.java b/src/test/java/com/github/dockerjava/junit/DockerRule.java
new file mode 100644
index 000000000..be8cb6b36
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/junit/DockerRule.java
@@ -0,0 +1,158 @@
+package com.github.dockerjava.junit;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.cmd.CmdIT;
+import com.github.dockerjava.core.DefaultDockerClientConfig;
+import com.github.dockerjava.core.DockerClientBuilder;
+import com.github.dockerjava.core.command.BuildImageResultCallback;
+import com.github.dockerjava.core.command.PullImageResultCallback;
+import com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory;
+import com.github.dockerjava.netty.NettyDockerCmdExecFactory;
+import com.github.dockerjava.utils.LogContainerTestCallback;
+import org.junit.rules.ExternalResource;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+
+import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY;
+import static com.github.dockerjava.cmd.CmdIT.FactoryType.NETTY;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsNull.notNullValue;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+public class DockerRule extends ExternalResource {
+    public static final Logger LOG = LoggerFactory.getLogger(DockerRule.class);
+    public static final String DEFAULT_IMAGE = "busybox:latest";
+
+    private DockerClient nettyClient;
+    private DockerClient jerseyClient;
+
+    private CmdIT cmdIT;
+    private Object cmdExecFactory;
+
+
+    public DockerRule(CmdIT cmdIT) {
+        this.cmdIT = cmdIT;
+    }
+
+
+    public DockerClient getClient() {
+        if (cmdIT.getFactoryType() == NETTY) {
+            if (nettyClient == null) {
+                nettyClient = DockerClientBuilder.getInstance(config())
+                        .withDockerCmdExecFactory((new NettyDockerCmdExecFactory())
+                                .withConnectTimeout(10 * 1000))
+                        .build();
+            }
+
+            return nettyClient;
+        } else if (cmdIT.getFactoryType() == JERSEY) {
+            if (jerseyClient == null) {
+                jerseyClient = DockerClientBuilder.getInstance(config())
+                        .withDockerCmdExecFactory((new JerseyDockerCmdExecFactory())
+                                .withConnectTimeout(10 * 1000))
+                        .build();
+            }
+            return jerseyClient;
+        }
+
+        throw new IllegalStateException("Why factory type is not set?");
+    }
+
+    @Override
+    public Statement apply(Statement base, Description description) {
+        return super.apply(base, description);
+    }
+
+    @Override
+    protected void before() throws Throwable {
+//        LOG.info("======================= BEFORETEST =======================");
+        LOG.debug("Connecting to Docker server");
+
+
+        try {
+            getClient().inspectImageCmd(DEFAULT_IMAGE).exec();
+        } catch (NotFoundException e) {
+            LOG.info("Pulling image 'busybox'");
+            // need to block until image is pulled completely
+            getClient().pullImageCmd("busybox")
+                    .withTag("latest")
+                    .exec(new PullImageResultCallback())
+                    .awaitSuccess();
+        }
+
+//        assertThat(getClient(), notNullValue());
+//        LOG.info("======================= END OF BEFORETEST =======================\n\n");
+    }
+
+    @Override
+    protected void after() {
+//        LOG.debug("======================= END OF AFTERTEST =======================");
+    }
+
+    private static DefaultDockerClientConfig config() {
+        return config(null);
+    }
+
+    public static DefaultDockerClientConfig config(String password) {
+        DefaultDockerClientConfig.Builder builder = DefaultDockerClientConfig.createDefaultConfigBuilder()
+                .withRegistryUrl("https://index.docker.io/v1/");
+        if (password != null) {
+            builder = builder.withRegistryPassword(password);
+        }
+
+        return builder.build();
+    }
+
+    public String buildImage(File baseDir) throws Exception {
+        return getClient().buildImageCmd(baseDir)
+                .withNoCache(true)
+                .exec(new BuildImageResultCallback())
+                .awaitImageId();
+    }
+
+    public String containerLog(String containerId) throws Exception {
+        return getClient().logContainerCmd(containerId)
+                .withStdOut(true)
+                .exec(new LogContainerTestCallback())
+                .awaitCompletion()
+                .toString();
+    }
+
+    public String getKind() {
+        if (cmdIT.getFactoryType() == NETTY) {
+            return "netty";
+        } else if (cmdIT.getFactoryType() == JERSEY) {
+            return "jersey";
+        }
+
+        return "default";
+    }
+
+    public void ensureContainerRemoved(String container1Name) {
+        try {
+            getClient().removeContainerCmd(container1Name)
+                    .withForce(true)
+                    .withRemoveVolumes(true)
+                    .exec();
+        } catch (NotFoundException ex) {
+            // ignore
+        }
+    }
+
+    public void ensureImageRemoved(String imageId) {
+        try {
+            getClient().removeImageCmd(imageId)
+                    .withForce(true)
+                    .exec();
+        } catch (NotFoundException ex) {
+            // ignore
+        }
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/junit/category/AuthIntegration.java b/src/test/java/com/github/dockerjava/junit/category/AuthIntegration.java
new file mode 100644
index 000000000..21dd8618c
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/junit/category/AuthIntegration.java
@@ -0,0 +1,4 @@
+package com.github.dockerjava.junit.category;
+
+public interface AuthIntegration {
+}
diff --git a/src/test/java/com/github/dockerjava/junit/category/Integration.java b/src/test/java/com/github/dockerjava/junit/category/Integration.java
new file mode 100644
index 000000000..bcd0f6db8
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/junit/category/Integration.java
@@ -0,0 +1,4 @@
+package com.github.dockerjava.junit.category;
+
+public interface Integration {
+}
diff --git a/src/test/java/com/github/dockerjava/junit/category/SwarmModeIntegration.java b/src/test/java/com/github/dockerjava/junit/category/SwarmModeIntegration.java
new file mode 100644
index 000000000..3a08d3a4f
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/junit/category/SwarmModeIntegration.java
@@ -0,0 +1,4 @@
+package com.github.dockerjava.junit.category;
+
+public interface SwarmModeIntegration {
+}
diff --git a/src/test/java/com/github/dockerjava/junit/suite/IntegrationDockerTestSuite.java b/src/test/java/com/github/dockerjava/junit/suite/IntegrationDockerTestSuite.java
new file mode 100644
index 000000000..06f6a4d25
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/junit/suite/IntegrationDockerTestSuite.java
@@ -0,0 +1,43 @@
+package com.github.dockerjava.junit.suite;
+
+import com.github.dockerjava.cmd.AttachContainerCmdIT;
+import com.github.dockerjava.cmd.AuthCmdIT;
+import com.github.dockerjava.cmd.BuildImageCmdIT;
+import com.github.dockerjava.cmd.CommitCmdIT;
+import com.github.dockerjava.cmd.ConnectToNetworkCmdIT;
+import com.github.dockerjava.cmd.CopyArchiveFromContainerCmdIT;
+import com.github.dockerjava.cmd.CopyArchiveToContainerCmdIT;
+import com.github.dockerjava.cmd.CopyFileFromContainerCmdIT;
+import com.github.dockerjava.cmd.CreateContainerCmdIT;
+import com.github.dockerjava.cmd.CreateNetworkCmdIT;
+import com.github.dockerjava.cmd.CreateVolumeCmdIT;
+import com.github.dockerjava.cmd.EventsCmdIT;
+import com.github.dockerjava.cmd.InfoCmdIT;
+import com.github.dockerjava.cmd.RemoveNetworkCmdIT;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * Tests that requires real connection to docker.
+ *
+ * @author Kanstantsin Shautsou
+ */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+        AttachContainerCmdIT.class,
+        AuthCmdIT.class,
+        BuildImageCmdIT.class,
+        CommitCmdIT.class,
+        CopyArchiveFromContainerCmdIT.class,
+        CopyArchiveToContainerCmdIT.class,
+        CopyFileFromContainerCmdIT.class,
+        ConnectToNetworkCmdIT.class,
+        CreateContainerCmdIT.class,
+        CreateNetworkCmdIT.class,
+        CreateVolumeCmdIT.class,
+        EventsCmdIT.class,
+        InfoCmdIT.class,
+        RemoveNetworkCmdIT.class,
+})
+public class IntegrationDockerTestSuite {
+}
diff --git a/src/test/java/com/github/dockerjava/junit/suite/SwarmSuite.java b/src/test/java/com/github/dockerjava/junit/suite/SwarmSuite.java
new file mode 100644
index 000000000..109a4ae62
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/junit/suite/SwarmSuite.java
@@ -0,0 +1,10 @@
+package com.github.dockerjava.junit.suite;
+
+import com.github.dockerjava.junit.category.SwarmModeIntegration;
+import org.junit.experimental.categories.Categories;
+import org.junit.runner.RunWith;
+
+//@RunWith(Categories.class)
+@Categories.IncludeCategory(SwarmModeIntegration.class)
+public class SwarmSuite {
+}
diff --git a/src/test/java/com/github/dockerjava/netty/AbstractNettyDockerClientTest.java b/src/test/java/com/github/dockerjava/netty/AbstractNettyDockerClientTest.java
deleted file mode 100644
index 57f7aa421..000000000
--- a/src/test/java/com/github/dockerjava/netty/AbstractNettyDockerClientTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.github.dockerjava.netty;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.client.AbstractDockerClientTest;
-import com.github.dockerjava.core.TestDockerCmdExecFactory;
-
-public abstract class AbstractNettyDockerClientTest extends AbstractDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(AbstractNettyDockerClientTest.class);
-
-    @Override
-    protected TestDockerCmdExecFactory initTestDockerCmdExecFactory() {
-        return new TestDockerCmdExecFactory(new NettyDockerCmdExecFactory());
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/AbstractNettySwarmDockerClientTest.java b/src/test/java/com/github/dockerjava/netty/AbstractNettySwarmDockerClientTest.java
deleted file mode 100644
index 11a6aae73..000000000
--- a/src/test/java/com/github/dockerjava/netty/AbstractNettySwarmDockerClientTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.github.dockerjava.netty;
-
-import com.github.dockerjava.core.TestDockerCmdExecFactory;
-import com.github.dockerjava.core.command.AbstractSwarmDockerClientTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public abstract class AbstractNettySwarmDockerClientTest extends AbstractSwarmDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(AbstractNettySwarmDockerClientTest.class);
-
-    @Override
-    protected TestDockerCmdExecFactory initTestDockerCmdExecFactory() {
-        return new TestDockerCmdExecFactory(new NettyDockerCmdExecFactory());
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java b/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java
index e36ee6b8b..7585a7534 100644
--- a/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java
+++ b/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java
@@ -1,11 +1,9 @@
 package com.github.dockerjava.netty;
 
-import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH;
-import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_TYPE;
-import static io.netty.handler.codec.http.HttpResponseStatus.OK;
-import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
-import static org.testng.Assert.assertEquals;
-
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.core.DefaultDockerClientConfig;
+import com.github.dockerjava.core.DefaultDockerClientConfig.Builder;
+import com.github.dockerjava.core.DockerClientBuilder;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
@@ -22,18 +20,18 @@
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpServerCodec;
 import io.netty.util.CharsetUtil;
+import org.junit.Test;
 
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.core.DefaultDockerClientConfig;
-import com.github.dockerjava.core.DefaultDockerClientConfig.Builder;
-import com.github.dockerjava.core.DockerClientBuilder;
+import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH;
+import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_TYPE;
+import static io.netty.handler.codec.http.HttpResponseStatus.OK;
+import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
+import static org.junit.Assert.assertEquals;
 
 public class NettyDockerCmdExecFactoryConfigTest {
 
diff --git a/src/test/java/com/github/dockerjava/netty/WebTargetTest.java b/src/test/java/com/github/dockerjava/netty/WebTargetTest.java
index a462eb8b5..5835b043c 100644
--- a/src/test/java/com/github/dockerjava/netty/WebTargetTest.java
+++ b/src/test/java/com/github/dockerjava/netty/WebTargetTest.java
@@ -1,19 +1,21 @@
 package com.github.dockerjava.netty;
 
-import static org.testng.Assert.assertEquals;
 
+import org.junit.Before;
+import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author Alexander Koshevoy
  */
 public class WebTargetTest {
-    @Mock private ChannelProvider channelProvider;
+    @Mock
+    private ChannelProvider channelProvider;
 
-    @BeforeMethod
+    @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
     }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/AuthCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/AuthCmdExecTest.java
deleted file mode 100644
index d753fca2b..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/AuthCmdExecTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import java.lang.reflect.Method;
-
-import com.github.dockerjava.core.RemoteApiVersion;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.UnauthorizedException;
-import com.github.dockerjava.api.model.AuthResponse;
-import com.github.dockerjava.core.DockerClientBuilder;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-import static com.github.dockerjava.utils.TestUtils.getVersion;
-
-@Test(groups = "integration")
-public class AuthCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void testAuth() throws Exception {
-        final RemoteApiVersion apiVersion = getVersion(dockerClient);
-        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_23)) {
-            throw new SkipException("Fails on 1.22. Temporary disabled.");
-        }
-
-        AuthResponse response = dockerClient.authCmd().exec();
-
-        assertEquals(response.getStatus(), "Login Succeeded");
-    }
-
-    @Test(expectedExceptions = UnauthorizedException.class)
-    public void testAuthInvalid() throws Exception {
-        final RemoteApiVersion apiVersion = getVersion(dockerClient);
-        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_23)) {
-            throw new SkipException("Fails on 1.22. Temporary disabled.");
-        }
-
-        DockerClientBuilder.getInstance(config("garbage")).build().authCmd().exec();
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
deleted file mode 100644
index dda610d62..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/CommitCmdExecTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.startsWith;
-import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import com.google.common.collect.ImmutableMap;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectImageResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class CommitCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void commit() throws DockerException {
-        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("touch", "/test").exec();
-
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        LOG.info("Committing container: {}", container.toString());
-        String imageId = dockerClient.commitCmd(container.getId()).exec();
-
-        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
-        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-
-        assertThat(inspectImageResponse, hasField("container", startsWith(container.getId())));
-        assertThat(inspectImageResponse.getContainerConfig().getImage(), equalTo("busybox"));
-
-        InspectImageResponse busyboxImg = dockerClient.inspectImageCmd("busybox").exec();
-
-        assertThat(inspectImageResponse.getParent(), equalTo(busyboxImg.getId()));
-    }
-
-    @Test
-    public void commitWithLabels() throws DockerException {
-        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withCmd("touch", "/test")
-                .exec();
-
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        LOG.info("Committing container: {}", container.toString());
-        Map<String, String> labels = ImmutableMap.of("nettyLabel1", "abc", "nettyLabel2", "123");
-        String imageId = dockerClient.commitCmd(container.getId()).withLabels(labels).exec();
-
-        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(imageId).exec();
-        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-        Map<String, String> responseLabels = inspectImageResponse.getContainerConfig().getLabels();
-        assertThat(responseLabels.get("nettyLabel1"), equalTo("abc"));
-        assertThat(responseLabels.get("nettyLabel2"), equalTo("123"));
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void commitNonExistingContainer() throws DockerException {
-
-        dockerClient.commitCmd("non-existent").exec();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExecTest.java
deleted file mode 100644
index 1ee4a2218..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExecTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.CreateNetworkResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.model.ContainerNetwork;
-import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-import java.util.Collections;
-
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-
-@Test(groups = "integration")
-public class ConnectToNetworkCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void connectToNetwork() throws InterruptedException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        CreateNetworkResponse network = dockerClient.createNetworkCmd().withName("testNetwork").exec();
-
-        dockerClient.connectToNetworkCmd().withNetworkId(network.getId()).withContainerId(container.getId()).exec();
-
-        Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
-
-        assertTrue(updatedNetwork.getContainers().containsKey(container.getId()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertNotNull(inspectContainerResponse.getNetworkSettings().getNetworks().get("testNetwork"));
-    }
-
-    @Test
-    public void connectToNetworkWithContainerNetwork() throws InterruptedException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        final String NETWORK_SUBNET = "10.100.101.0/24";
-        final String NETWORK_NAME = "nettyTestNetwork";
-        final String CONTAINER_IP = "10.100.101.100";
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withCmd("sleep", "9999")
-                .exec();
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        try {
-            dockerClient.removeNetworkCmd(NETWORK_NAME).exec();
-        } catch (DockerException ignore) {
-        }
-
-        CreateNetworkResponse network = dockerClient.createNetworkCmd()
-                .withName(NETWORK_NAME)
-                .withIpam(new Network.Ipam()
-                        .withConfig(new Network.Ipam.Config()
-                                .withSubnet(NETWORK_SUBNET)))
-                .exec();
-
-        dockerClient.connectToNetworkCmd()
-                .withNetworkId(network.getId())
-                .withContainerId(container.getId())
-                .withContainerNetwork(new ContainerNetwork()
-                        .withAliases("aliasName")
-                        .withIpamConfig(new ContainerNetwork.Ipam()
-                                .withIpv4Address(CONTAINER_IP)))
-                .exec();
-
-        Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
-
-        Network.ContainerNetworkConfig containerNetworkConfig = updatedNetwork.getContainers().get(container.getId());
-        assertNotNull(containerNetworkConfig);
-        assertThat(containerNetworkConfig.getIpv4Address(), is(CONTAINER_IP + "/24"));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        ContainerNetwork testNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get(NETWORK_NAME);
-        assertNotNull(testNetwork);
-        assertThat(testNetwork.getAliases(), hasItem("aliasName"));
-        assertEquals(testNetwork.getGateway(), "10.100.101.1");
-        assertEquals(testNetwork.getIpAddress(), CONTAINER_IP);
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExecTest.java
deleted file mode 100644
index c21c426b5..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExecTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import static ch.lambdaj.Lambda.selectUnique;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.model.ChangeLog;
-import com.github.dockerjava.core.command.WaitContainerResultCallback;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class ContainerDiffCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void testContainerDiff() throws DockerException {
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("touch", "/test").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
-                .awaitStatusCode();
-        assertThat(exitCode, equalTo(0));
-
-        List<ChangeLog> filesystemDiff = dockerClient.containerDiffCmd(container.getId()).exec();
-        LOG.info("Container DIFF: {}", filesystemDiff.toString());
-
-        assertThat(filesystemDiff.size(), equalTo(1));
-        ChangeLog testChangeLog = selectUnique(filesystemDiff, hasField("path", equalTo("/test")));
-
-        assertThat(testChangeLog, hasField("path", equalTo("/test")));
-        assertThat(testChangeLog, hasField("kind", equalTo(1)));
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void testContainerDiffWithNonExistingContainer() throws DockerException {
-
-        dockerClient.containerDiffCmd("non-existing").exec();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExecTest.java
deleted file mode 100644
index 02b56156d..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExecTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyOrNullString;
-import static org.hamcrest.Matchers.not;
-
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-
-import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
-import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.apache.commons.io.IOUtils;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.core.util.CompressArchiveUtil;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class CopyArchiveFromContainerCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void copyFromContainer() throws Exception {
-        // TODO extract this into a shared method
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withName("docker-java-itest-copyFromContainer").withCmd("touch", "/copyFromContainer").exec();
-
-        LOG.info("Created container: {}", container);
-        assertThat(container.getId(), not(isEmptyOrNullString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/copyFromContainer").exec();
-        Boolean bytesAvailable = response.available() > 0;
-        assertTrue(bytesAvailable, "The file was not copied from the container.");
-
-        // read the stream fully. Otherwise, the underlying stream will not be closed.
-        String responseAsString = asString(response);
-        assertNotNull(responseAsString);
-        assertTrue(responseAsString.length() > 0);
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void copyFromNonExistingContainer() throws Exception {
-
-        dockerClient.copyArchiveFromContainerCmd("non-existing", "/test").exec();
-    }
-
-    @Test
-    public void copyFromContainerBinaryFile() throws Exception {
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withName("docker-java-itest-copyFromContainerBinaryFile").exec();
-
-        LOG.info("Created container: {}", container);
-        assertThat(container.getId(), not(isEmptyOrNullString()));
-
-        Path temp = Files.createTempFile("", ".tar.gz");
-        Path binaryFile = Paths.get("src/test/resources/testCopyFromArchive/binary.dat");
-        CompressArchiveUtil.tar(binaryFile, temp, true, false);
-
-        try (InputStream uploadStream = Files.newInputStream(temp)) {
-            dockerClient.copyArchiveToContainerCmd(container.getId()).withTarInputStream(uploadStream).exec();
-        }
-
-        InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/binary.dat").exec();
-        Boolean bytesAvailable = response.available() > 0;
-        assertTrue(bytesAvailable, "The file was not copied from the container.");
-
-        try (TarArchiveInputStream tarInputStream = new TarArchiveInputStream(response)) {
-            TarArchiveEntry nextTarEntry = tarInputStream.getNextTarEntry();
-
-            assertEquals(nextTarEntry.getName(), "binary.dat");
-            try (InputStream binaryFileInputStream = Files.newInputStream(binaryFile, StandardOpenOption.READ)) {
-                assertTrue(IOUtils.contentEquals(binaryFileInputStream, tarInputStream));
-            }
-
-            assertNull(tarInputStream.getNextTarEntry(), "Nothing except binary.dat is expected to be copied.");
-        }
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java
deleted file mode 100644
index 269e03c10..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExecTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import static com.github.dockerjava.utils.TestUtils.getVersion;
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyOrNullString;
-import static org.hamcrest.Matchers.not;
-
-import java.io.InputStream;
-import java.lang.reflect.Method;
-
-import com.github.dockerjava.core.RemoteApiVersion;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class CopyFileFromContainerCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void copyFromContainer() throws Exception {
-        if (getVersion(dockerClient).isGreaterOrEqual(RemoteApiVersion.VERSION_1_24)) {
-            throw new SkipException("Doesn't work since 1.24");
-        }
-        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
-
-        // TODO extract this into a shared method
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withName("docker-java-itest-copyFromContainer").withCmd("touch", "/copyFromContainer").exec();
-
-        LOG.info("Created container: {}", container);
-        assertThat(container.getId(), not(isEmptyOrNullString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InputStream response = dockerClient.copyFileFromContainerCmd(container.getId(), "/copyFromContainer").exec();
-        Boolean bytesAvailable = response.available() > 0;
-        assertTrue(bytesAvailable, "The file was not copied from the container.");
-
-        // read the stream fully. Otherwise, the underlying stream will not be closed.
-        String responseAsString = asString(response);
-        assertNotNull(responseAsString);
-        assertTrue(responseAsString.length() > 0);
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void copyFromNonExistingContainer() throws Exception {
-
-        dockerClient.copyFileFromContainerCmd("non-existing", "/test").exec();
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
deleted file mode 100644
index b596e8a54..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
+++ /dev/null
@@ -1,766 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.CreateNetworkResponse;
-import com.github.dockerjava.api.command.CreateVolumeResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.exception.ConflictException;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.Bind;
-import com.github.dockerjava.api.model.ContainerNetwork;
-import com.github.dockerjava.api.model.Device;
-import com.github.dockerjava.api.model.ExposedPort;
-import com.github.dockerjava.api.model.HostConfig;
-import com.github.dockerjava.api.model.Link;
-import com.github.dockerjava.api.model.LogConfig;
-import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.api.model.Ports;
-import com.github.dockerjava.api.model.Ports.Binding;
-import com.github.dockerjava.core.RemoteApiVersion;
-import com.github.dockerjava.api.model.RestartPolicy;
-import com.github.dockerjava.api.model.Ulimit;
-import com.github.dockerjava.api.model.Volume;
-import com.github.dockerjava.api.model.VolumesFrom;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-import org.apache.commons.io.FileUtils;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-import org.testng.internal.junit.ArrayAsserts;
-
-import java.lang.reflect.Method;
-import java.security.SecureRandom;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import static com.github.dockerjava.api.model.Capability.MKNOD;
-import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
-import static com.github.dockerjava.utils.TestUtils.getVersion;
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.hasItemInArray;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.startsWith;
-
-@Test(groups = "integration")
-public class CreateContainerCmdExecTest extends AbstractNettyDockerClientTest {
-    public static final String BUSYBOX_IMAGE = "busybox";
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(expectedExceptions = ConflictException.class)
-    public void createContainerWithExistingName() throws DockerException {
-
-        String containerName = "generated_" + new SecureRandom().nextInt();
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("env")
-                .withName(containerName).exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.createContainerCmd("busybox").withCmd("env").withName(containerName).exec();
-    }
-
-    @Test
-    public void createContainerWithVolume() throws DockerException {
-
-        Volume volume = new Volume("/var/log");
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withVolumes(volume)
-                .withCmd("true").exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        LOG.info("Inspect container {}", inspectContainerResponse.getConfig().getVolumes());
-
-        assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(), contains("/var/log"));
-
-        assertThat(inspectContainerResponse.getMounts().get(0).getDestination(), equalTo(volume));
-        assertThat(inspectContainerResponse.getMounts().get(0).getMode(), equalTo(""));
-        assertThat(inspectContainerResponse.getMounts().get(0).getRW(), equalTo(true));
-    }
-
-    @Test
-    public void createContainerWithReadOnlyVolume() throws DockerException {
-
-        Volume volume = new Volume("/srv/test");
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withVolumes(volume)
-                .withCmd("true").exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        LOG.info("Inspect container {}", inspectContainerResponse.getConfig().getVolumes());
-
-        assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(), contains("/srv/test"));
-
-        assertThat(inspectContainerResponse.getMounts().get(0).getDestination(), equalTo(volume));
-        // TODO: Create a read-only volume and test like this
-        // assertFalse(inspectContainerResponse.getMounts().get(0).getRW());
-    }
-
-    @Test
-    public void createContainerWithNoCopyVolumes() throws DockerException {
-        final RemoteApiVersion apiVersion = getVersion(dockerClient);
-
-        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_23)) {
-            throw new SkipException("API version should be >= 1.23");
-        }
-
-    	Volume volume1 = new Volume("/opt/webapp1");
-    	String container1Name = UUID.randomUUID().toString();
-
-    	CreateVolumeResponse volumeResponse = dockerClient.createVolumeCmd().withName("webapp1").exec();
-    	assertThat(volumeResponse.getName(), equalTo("webapp1"));
-        assertThat(volumeResponse.getDriver(), equalTo("local"));
-        assertThat(volumeResponse.getMountpoint(), containsString("/webapp1/"));
-
-    	Bind bind1 = new Bind("webapp1", volume1, true);
-
-    	CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName(container1Name)
-                .withBinds(bind1).exec();
-        LOG.info("Created container1 {}", container1.toString());
-
-        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId()).exec();
-
-        assertThat(Arrays.asList(inspectContainerResponse1.getHostConfig().getBinds()), contains(bind1));
-        assertThat(inspectContainerResponse1, mountedVolumes(contains(volume1)));
-
-        assertThat(inspectContainerResponse1.getMounts().get(0).getDestination(), equalTo(volume1));
-        assertThat(inspectContainerResponse1.getMounts().get(0).getMode(), equalTo("rw,nocopy"));
-        assertThat(inspectContainerResponse1.getMounts().get(0).getRW(), equalTo(true));
-    }
-
-    @Test
-    public void createContainerWithVolumesFrom() throws DockerException {
-
-        Volume volume1 = new Volume("/opt/webapp1");
-        Volume volume2 = new Volume("/opt/webapp2");
-
-        String container1Name = UUID.randomUUID().toString();
-
-        Bind bind1 = new Bind("/src/webapp1", volume1);
-        Bind bind2 = new Bind("/src/webapp2", volume2);
-
-        // create a running container with bind mounts
-        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName(container1Name)
-                .withBinds(bind1, bind2).exec();
-        LOG.info("Created container1 {}", container1.toString());
-
-        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
-                .exec();
-
-        assertThat(Arrays.asList(inspectContainerResponse1.getHostConfig().getBinds()), containsInAnyOrder(bind1, bind2));
-
-        assertThat(inspectContainerResponse1, mountedVolumes(containsInAnyOrder(volume1, volume2)));
-
-        // create a second container with volumes from first container
-        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withVolumesFrom(new VolumesFrom(container1Name)).exec();
-        LOG.info("Created container2 {}", container2.toString());
-
-        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
-                .exec();
-
-        // No volumes are created, the information is just stored in .HostConfig.VolumesFrom
-        assertThat(inspectContainerResponse2.getHostConfig().getVolumesFrom(), hasItemInArray(new VolumesFrom(
-                container1Name)));
-
-        // To ensure that the information stored in VolumesFrom really is considered
-        // when starting the container, we start it and verify that it has the same
-        // bind mounts as the first container.
-        // This is somehow out of scope here, but it helped me to understand how the
-        // VolumesFrom feature really works.
-        dockerClient.startContainerCmd(container2.getId()).exec();
-        LOG.info("Started container2 {}", container2.toString());
-
-        inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId()).exec();
-
-        assertThat(inspectContainerResponse2.getHostConfig().getVolumesFrom(), hasItemInArray(new VolumesFrom(
-                container1Name)));
-
-        assertThat(inspectContainerResponse2, mountedVolumes(containsInAnyOrder(volume1, volume2)));
-    }
-
-    @Test
-    public void createContainerWithEnv() throws Exception {
-        final String testVariable = "VARIABLE=success";
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withEnv(testVariable)
-                .withCmd("env")
-                .exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), hasItem(testVariable));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        assertThat(containerLog(container.getId()), containsString(testVariable));
-    }
-
-    @Test
-    public void createContainerWithHostname() throws Exception {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withHostName("docker-java")
-                .withCmd("env").exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(inspectContainerResponse.getConfig().getHostName(), equalTo("docker-java"));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        assertThat(containerLog(container.getId()), containsString("HOSTNAME=docker-java"));
-    }
-
-    @Test
-    public void createContainerWithName() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
-                .withCmd("env").exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(inspectContainerResponse.getName(), equalTo("/container"));
-    }
-
-    @Test
-    public void createContainerWithLink() throws DockerException {
-
-        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName("container1").exec();
-        LOG.info("Created container1 {}", container1.toString());
-        assertThat(container1.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container1.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
-                .exec();
-        LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
-        assertThat(inspectContainerResponse1.getState().getRunning(), is(true));
-
-        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withName("container2")
-                .withCmd("env").withLinks(new Link("container1", "container1Link")).exec();
-        LOG.info("Created container {}", container2.toString());
-        assertThat(container2.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
-                .exec();
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[]{new Link("container1",
-                "container1Link")}));
-    }
-
-    @Test
-    public void createContainerWithLinkInCustomNetwork() throws DockerException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd()
-                .withName("linkNet")
-                .exec();
-
-        assertNotNull(createNetworkResponse.getId());
-
-        CreateContainerResponse container1 = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
-                .withNetworkMode("linkNet")
-                .withCmd("sleep", "9999")
-                .withName("container1")
-                .exec();
-
-        assertThat(container1.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container1.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
-                .exec();
-        LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
-        assertThat(inspectContainerResponse1.getState().getRunning(), is(true));
-
-        CreateContainerResponse container2 = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
-                .withNetworkMode("linkNet")
-                .withName("container2")
-                .withCmd("env")
-                .withLinks(new Link("container1", "container1Link"))
-                .exec();
-
-        LOG.info("Created container {}", container2.toString());
-        assertThat(container2.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
-                .exec();
-
-        ContainerNetwork linkNet = inspectContainerResponse2.getNetworkSettings().getNetworks().get("linkNet");
-        assertNotNull(linkNet);
-        ArrayAsserts.assertArrayEquals(new Link[]{new Link("container1", "container1Link")}, linkNet.getLinks());
-    }
-
-    @Test
-    public void createContainerWithCustomIp() throws DockerException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd()
-                .withIpam(new Network.Ipam()
-                        .withConfig(new Network.Ipam.Config()
-                                .withSubnet("10.100.101.0/24")))
-                .withName("customIpNet")
-                .exec();
-
-        assertNotNull(createNetworkResponse.getId());
-
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
-                .withNetworkMode("customIpNet")
-                .withCmd("sleep", "9999")
-                .withName("container")
-                .withIpv4Address("10.100.101.100")
-                .exec();
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId())
-                .exec();
-
-        ContainerNetwork customIpNet = inspectContainerResponse.getNetworkSettings().getNetworks().get("customIpNet");
-        assertNotNull(customIpNet);
-        assertEquals(customIpNet.getGateway(), "10.100.101.1");
-        assertEquals(customIpNet.getIpAddress(), "10.100.101.100");
-    }
-
-    @Test
-    public void createContainerWithAlias() throws DockerException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd()
-                .withName("aliasNet")
-                .exec();
-
-        assertNotNull(createNetworkResponse.getId());
-
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
-                .withNetworkMode("aliasNet")
-                .withCmd("sleep", "9999")
-                .withName("container")
-                .withAliases("server")
-                .exec();
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId())
-                .exec();
-
-        ContainerNetwork aliasNet = inspectContainerResponse.getNetworkSettings().getNetworks().get("aliasNet");
-        assertThat(aliasNet.getAliases(), hasItem("server"));
-    }
-
-    @Test
-    public void createContainerWithCapAddAndCapDrop() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCapAdd(NET_ADMIN)
-                .withCapDrop(MKNOD).exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getCapAdd()), contains(NET_ADMIN));
-
-        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getCapDrop()), contains(MKNOD));
-    }
-
-    @Test
-    public void createContainerWithDns() throws DockerException {
-
-        String aDnsServer = "8.8.8.8";
-        String anotherDnsServer = "8.8.4.4";
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
-                .withDns(aDnsServer, anotherDnsServer).exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()),
-                contains(aDnsServer, anotherDnsServer));
-    }
-
-    @Test
-    public void createContainerWithEntrypoint() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
-                .withEntrypoint("sleep", "9999").exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEntrypoint()), contains("sleep", "9999"));
-
-    }
-
-    @Test
-    public void createContainerWithExtraHosts() throws DockerException {
-
-        String[] extraHosts = {"dockerhost:127.0.0.1", "otherhost:10.0.0.1"};
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
-                .withExtraHosts(extraHosts).exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getExtraHosts()),
-                containsInAnyOrder("dockerhost:127.0.0.1", "otherhost:10.0.0.1"));
-    }
-
-    @Test
-    public void createContainerWithDevices() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withDevices(new Device("rwm", "/dev/nulo", "/dev/zero")).exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDevices()), contains(new Device("rwm",
-                "/dev/nulo", "/dev/zero")));
-    }
-
-    @Test
-    public void createContainerWithPortBindings() throws DockerException {
-
-        ExposedPort tcp22 = ExposedPort.tcp(22);
-        ExposedPort tcp23 = ExposedPort.tcp(23);
-
-        Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Binding.bindPort(11022));
-        portBindings.bind(tcp23, Binding.bindPort(11023));
-        portBindings.bind(tcp23, Binding.bindPort(11024));
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
-                .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
-
-        assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
-                is(equalTo(Binding.bindPort(11022))));
-
-        assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
-                is(equalTo(Binding.bindPort(11023))));
-
-        assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
-                is(equalTo(Binding.bindPort(11024))));
-
-    }
-
-    @Test
-    public void createContainerWithLinking() throws DockerException {
-
-        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName("container1").exec();
-
-        LOG.info("Created container1 {}", container1.toString());
-        assertThat(container1.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container1.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
-                .exec();
-        LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
-
-        assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
-        assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
-        assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId()));
-        assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
-        assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
-        assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
-        assertThat(inspectContainerResponse1.getState().getRunning(), is(true));
-
-        if (!inspectContainerResponse1.getState().getRunning()) {
-            assertThat(inspectContainerResponse1.getState().getExitCode(), is(equalTo(0)));
-        }
-
-        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName("container2").withLinks(new Link("container1", "container1Link")).exec();
-
-        LOG.info("Created container2 {}", container2.toString());
-        assertThat(container2.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
-                .exec();
-        LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
-
-        assertThat(inspectContainerResponse2.getConfig(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
-        assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[]{new Link("container1",
-                "container1Link")}));
-        assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
-        assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
-        assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
-
-    }
-
-    @Test
-    public void createContainerWithRestartPolicy() throws DockerException {
-
-        RestartPolicy restartPolicy = RestartPolicy.onFailureRestart(5);
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withRestartPolicy(restartPolicy).exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(inspectContainerResponse.getHostConfig().getRestartPolicy(), is(equalTo(restartPolicy)));
-    }
-
-    @Test
-    public void createContainerWithPidMode() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
-                .withPidMode("host").exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(inspectContainerResponse.getHostConfig().getPidMode(), is(equalTo("host")));
-    }
-
-    /**
-     * This tests support for --net option for the docker run command: --net="bridge" Set the Network mode for the container 'bridge':
-     * creates a new network stack for the container on the docker bridge 'none': no networking for this container 'container:': reuses
-     * another container network stack 'host': use the host network stack inside the container. Note: the host mode gives the container full
-     * access to local system services such as D-bus and is therefore considered insecure.
-     */
-    @Test
-    public void createContainerWithNetworkMode() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
-                .withNetworkMode("host").exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(inspectContainerResponse.getHostConfig().getNetworkMode(), is(equalTo("host")));
-    }
-
-    @Test
-    public void createContainerWithMacAddress() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withMacAddress("00:80:41:ae:fd:7e").withCmd("true").exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertEquals(inspectContainerResponse.getConfig().getMacAddress(), "00:80:41:ae:fd:7e");
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void createContainerWithULimits() throws DockerException {
-
-        Ulimit[] ulimits = {new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096)};
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withName("container")
-                .withUlimits(ulimits).exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getUlimits()),
-                containsInAnyOrder(new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096)));
-
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void createContainerWithLabels() throws DockerException {
-
-        Map<String, String> labels = new HashMap<String, String>();
-        labels.put("com.github.dockerjava.null", null);
-        labels.put("com.github.dockerjava.Boolean", "true");
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withLabels(labels).exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        // null becomes empty string
-        labels.put("com.github.dockerjava.null", "");
-
-        // swarm adds 3d label
-        assertThat(inspectContainerResponse.getConfig().getLabels(), allOf(
-                hasEntry("com.github.dockerjava.null", ""),
-                hasEntry("com.github.dockerjava.Boolean", "true")
-        ));
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void createContainerWithLogConfig() throws DockerException {
-
-        LogConfig logConfig = new LogConfig(LogConfig.LoggingType.NONE, null);
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withLogConfig(logConfig).exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        // null becomes empty string
-        assertEquals(inspectContainerResponse.getHostConfig().getLogConfig().type, logConfig.type);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void createContainerWithCgroupParent() throws DockerException {
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withCgroupParent("/parent").exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainer = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(inspectContainer.getHostConfig().getCgroupParent(), is("/parent"));
-    }
-
-    @SuppressWarnings("Duplicates")
-    @Test
-    public void createContainerWithShmSize() throws DockerException {
-        HostConfig hostConfig = new HostConfig().withShmSize(96 * FileUtils.ONE_MB);
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
-                .withHostConfig(hostConfig).withCmd("true").exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(inspectContainerResponse.getHostConfig().getShmSize(), is(hostConfig.getShmSize()));
-    }
-
-    @SuppressWarnings("Duplicates")
-    @Test
-    public void createContainerWithShmPidsLimit() throws DockerException {
-        final RemoteApiVersion apiVersion = getVersion(dockerClient);
-
-        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_23)) {
-            throw new SkipException("API version should be >= 1.23");
-        }
-
-        HostConfig hostConfig = new HostConfig().withPidsLimit(2L);
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
-            .withHostConfig(hostConfig).withCmd("true").exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(inspectContainerResponse.getHostConfig().getPidsLimit(), is(hostConfig.getPidsLimit()));
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
deleted file mode 100644
index 22337bdde..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExecTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import com.github.dockerjava.api.command.CreateNetworkResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-
-@Test(groups = "integration")
-public class CreateNetworkCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void createNetwork() throws DockerException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        String networkName = "testNetwork";
-
-        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).exec();
-
-        assertNotNull(createNetworkResponse.getId());
-
-        Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
-        assertEquals(network.getName(), networkName);
-        assertEquals(network.getDriver(), "bridge");
-    }
-
-    @Test
-    public void createNetworkWithIpamConfig() throws DockerException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        String networkName = "testNetwork";
-        Network.Ipam ipam = new Network.Ipam().withConfig(new Network.Ipam.Config().withSubnet("10.67.79.0/24"));
-        CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd().withName(networkName).withIpam(ipam).exec();
-
-        assertNotNull(createNetworkResponse.getId());
-
-        Network network = dockerClient.inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
-        assertEquals(network.getName(), networkName);
-        assertEquals(network.getDriver(), "bridge");
-        assertEquals("10.67.79.0/24", network.getIpam().getConfig().iterator().next().getSubnet());
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateServiceCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateServiceCmdExecTest.java
deleted file mode 100644
index 17ff62951..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateServiceCmdExecTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.ContainerSpec;
-import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.api.model.NetworkAttachmentConfig;
-import com.github.dockerjava.api.model.Service;
-import com.github.dockerjava.api.model.ServiceModeConfig;
-import com.github.dockerjava.api.model.ServiceReplicatedModeOptions;
-import com.github.dockerjava.api.model.ServiceSpec;
-import com.github.dockerjava.api.model.SwarmSpec;
-import com.github.dockerjava.api.model.TaskSpec;
-import com.github.dockerjava.netty.AbstractNettySwarmDockerClientTest;
-import com.google.common.collect.Lists;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.is;
-
-@Test(groups = "swarm-integration")
-public class CreateServiceCmdExecTest extends AbstractNettySwarmDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(CreateServiceCmdExecTest.class);
-    private static final String SERVICE_NAME = "theservice";
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void testCreateService() throws DockerException {
-        dockerClient.initializeSwarmCmd(new SwarmSpec())
-                .withListenAddr("127.0.0.1")
-                .withAdvertiseAddr("127.0.0.1")
-                .exec();
-
-        dockerClient.createServiceCmd(new ServiceSpec()
-                .withName(SERVICE_NAME)
-                .withTaskTemplate(new TaskSpec()
-                        .withContainerSpec(new ContainerSpec()
-                                .withImage("busybox"))))
-        .exec();
-
-        List<Service> services = dockerClient.listServicesCmd()
-                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
-                .exec();
-
-        assertThat(services, hasSize(1));
-
-        dockerClient.removeServiceCmd(SERVICE_NAME).exec();
-    }
-
-    @Test
-    public void testCreateServiceWithNetworks() {
-        dockerClient.initializeSwarmCmd(new SwarmSpec())
-                .withListenAddr("127.0.0.1")
-                .withAdvertiseAddr("127.0.0.1")
-                .exec();
-
-        String networkId = dockerClient.createNetworkCmd().withName("networkname")
-                .withDriver("overlay")
-                .withIpam(new Network.Ipam()
-                        .withDriver("default"))
-                .exec().getId();
-
-        ServiceSpec spec = new ServiceSpec()
-                .withName(SERVICE_NAME)
-                .withTaskTemplate(new TaskSpec()
-                        .withContainerSpec(new ContainerSpec()
-                                .withImage("busybox"))
-                        )
-                .withNetworks(Lists.newArrayList(
-                        new NetworkAttachmentConfig()
-                                .withTarget(networkId)
-                                .withAliases(Lists.<String>newArrayList("alias1", "alias2"))
-                ))
-                .withMode(new ServiceModeConfig().withReplicated(
-                        new ServiceReplicatedModeOptions()
-                                .withReplicas(1)
-                ));
-
-        dockerClient.createServiceCmd(spec).exec();
-
-        List<Service> services = dockerClient.listServicesCmd()
-                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
-                .exec();
-
-        assertThat(services, hasSize(1));
-
-        assertThat(services.get(0).getSpec(), is(spec));
-
-        dockerClient.removeServiceCmd(SERVICE_NAME).exec();
-
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateVolumeCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateVolumeCmdExecTest.java
deleted file mode 100644
index 1e1a30b73..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/CreateVolumeCmdExecTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-
-import java.lang.reflect.Method;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateVolumeResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class CreateVolumeCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void createVolume() throws DockerException {
-
-        CreateVolumeResponse createVolumeResponse = dockerClient.createVolumeCmd().withName("volume1")
-                .withDriver("local").exec();
-
-        assertThat(createVolumeResponse.getName(), equalTo("volume1"));
-        assertThat(createVolumeResponse.getDriver(), equalTo("local"));
-        assertThat(createVolumeResponse.getMountpoint(), containsString("/volume1/"));
-    }
-
-    @Test
-    public void createVolumeWithExistingName() throws DockerException {
-
-        String volumeName = "volume1";
-
-        CreateVolumeResponse createVolumeResponse1 = dockerClient.createVolumeCmd().withName(volumeName)
-                .withDriver("local").exec();
-
-        assertThat(createVolumeResponse1.getName(), equalTo(volumeName));
-        assertThat(createVolumeResponse1.getDriver(), equalTo("local"));
-        assertThat(createVolumeResponse1.getMountpoint(), containsString("/volume1/"));
-
-        CreateVolumeResponse createVolumeResponse2 = dockerClient.createVolumeCmd().withName(volumeName)
-                .withDriver("local").exec();
-
-        assertThat(createVolumeResponse2.getName(), equalTo(volumeName));
-        assertThat(createVolumeResponse2.getDriver(), equalTo("local"));
-        assertThat(createVolumeResponse2.getMountpoint(), equalTo(createVolumeResponse1.getMountpoint()));
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExecTest.java
deleted file mode 100644
index a846172e6..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExecTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.CreateNetworkResponse;
-import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-
-@Test(groups = "integration")
-public class DisconnectFromNetworkCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void disconnectFromNetwork() throws InterruptedException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        CreateNetworkResponse network = dockerClient.createNetworkCmd().withName("testNetwork").exec();
-
-        dockerClient.connectToNetworkCmd().withNetworkId(network.getId()).withContainerId(container.getId()).exec();
-
-        Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
-
-        assertTrue(updatedNetwork.getContainers().containsKey(container.getId()));
-
-        dockerClient.disconnectFromNetworkCmd().withNetworkId(network.getId()).withContainerId(container.getId()).exec();
-
-        updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
-
-        assertFalse(updatedNetwork.getContainers().containsKey(container.getId()));
-    }
-
-    @Test
-    public void forceDisconnectFromNetwork() throws InterruptedException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        CreateNetworkResponse network = dockerClient.createNetworkCmd().withName("testNetwork").exec();
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withNetworkMode("testNetwork")
-                .withCmd("sleep", "9999")
-                .exec();
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        dockerClient.disconnectFromNetworkCmd()
-                .withNetworkId(network.getId())
-                .withContainerId(container.getId())
-                .withForce(true)
-                .exec();
-
-        Network updatedNetwork = dockerClient.inspectNetworkCmd().withNetworkId(network.getId()).exec();
-        assertFalse(updatedNetwork.getContainers().containsKey(container.getId()));
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java
deleted file mode 100644
index a6528fd33..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/EventsCmdExecTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.model.Event;
-import com.github.dockerjava.core.command.EventsResultCallback;
-import com.github.dockerjava.core.command.PullImageResultCallback;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-
-@Test(groups = "integration")
-public class EventsCmdExecTest extends AbstractNettyDockerClientTest {
-
-    private static String getEpochTime() {
-        return String.valueOf(System.currentTimeMillis() / 1000);
-    }
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void testEventStreamTimeBound() throws Exception {
-        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
-
-        // Don't include other tests events
-        TimeUnit.SECONDS.sleep(1);
-
-        String startTime = getEpochTime();
-        int expectedEvents = generateEvents();
-        String endTime = getEpochTime();
-
-        EventsTestCallback eventCallback = new EventsTestCallback(expectedEvents);
-
-        dockerClient.eventsCmd()
-            .withSince(startTime)
-            .withUntil(endTime)
-            .exec(eventCallback);
-
-        List<Event> events = eventCallback.awaitExpectedEvents(3, TimeUnit.MINUTES);
-
-        // we may receive more events as expected
-        assertTrue(events.size() >= expectedEvents, "Received events: " + events);
-    }
-
-    @Test
-    public void testEventStreaming() throws Exception {
-        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
-
-        // Don't include other tests events
-        TimeUnit.SECONDS.sleep(1);
-        
-        String startTime = getEpochTime();
-        int expectedEvents = generateEvents();
-
-        EventsTestCallback eventCallback = new EventsTestCallback(expectedEvents);
-
-        dockerClient.eventsCmd()
-            .withSince(startTime)
-            .exec(eventCallback);
-
-        generateEvents();
-
-        List<Event> events = eventCallback.awaitExpectedEvents(3, TimeUnit.MINUTES);
-        
-        // we may receive more events as expected
-        assertTrue(events.size() >= expectedEvents, "Received events: " + events);
-    }
-
-    
-    public void testEventStreamingWithFilter() throws Exception {
-        //FIXME swarm
-        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
-
-        // Don't include other tests events
-        TimeUnit.SECONDS.sleep(1);
-        
-        String startTime = getEpochTime();
-        int expectedEvents = 1;
-
-        EventsTestCallback eventCallback = new EventsTestCallback(expectedEvents);
-        
-        dockerClient.eventsCmd()
-        	.withSince(startTime)
-        	.withEventFilter("start")
-            .exec(eventCallback);
-
-        generateEvents();
-
-        List<Event> events = eventCallback.awaitExpectedEvents(3, TimeUnit.MINUTES);
-        
-        // we should get exactly one "start" event here
-        assertEquals(events.size(), expectedEvents, "Received events: " + events);
-    }
-
-    /**
-     * This method generates some events and returns the number of events being generated
-     */
-    private int generateEvents() throws Exception {
-        String testImage = "busybox:latest";
-
-        dockerClient.pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess();
-        CreateContainerResponse container = dockerClient.createContainerCmd(testImage).withCmd("sleep", "9999").exec();
-        dockerClient.startContainerCmd(container.getId()).exec();
-        dockerClient.stopContainerCmd(container.getId()).withTimeout(1).exec();
-        
-        // generates 5 events with remote api 1.24:
-        
-        // Event[status=pull,id=busybox:latest,from=<null>,node=<null>,type=IMAGE,action=pull,actor=com.github.dockerjava.api.model.EventActor@417db6d7[id=busybox:latest,attributes={name=busybox}],time=1473455186,timeNano=1473455186436681587]
-        // Event[status=create,id=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c,from=busybox:latest,node=<null>,type=CONTAINER,action=create,actor=com.github.dockerjava.api.model.EventActor@40bcec[id=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c,attributes={image=busybox:latest, name=sick_lamport}],time=1473455186,timeNano=1473455186470713257]
-        // Event[status=<null>,id=<null>,from=<null>,node=<null>,type=NETWORK,action=connect,actor=com.github.dockerjava.api.model.EventActor@318a1b01[id=10870ceb13abb7cf841ea68868472da881b33c8ed08d2cde7dbb39d7c24d1d27,attributes={container=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c, name=bridge, type=bridge}],time=1473455186,timeNano=1473455186544318466]
-        // Event[status=start,id=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c,from=busybox:latest,node=<null>,type=CONTAINER,action=start,actor=com.github.dockerjava.api.model.EventActor@606f43a3[id=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c,attributes={image=busybox:latest, name=sick_lamport}],time=1473455186,timeNano=1473455186786163819]
-        // Event[status=kill,id=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c,from=busybox:latest,node=<null>,type=CONTAINER,action=kill,actor=com.github.dockerjava.api.model.EventActor@72a9ffcf[id=6ec10182cde227040bfead8547b63105e6bbc4e94b99f6098bfad6e158ce0d3c,attributes={image=busybox:latest, name=sick_lamport, signal=15}],time=1473455186,timeNano=1473455186792963392]
-
-        return 5;
-    }
-
-    private class EventsTestCallback extends EventsResultCallback {
-
-        private final CountDownLatch countDownLatch;
-
-        private final List<Event> events = new ArrayList<Event>();
-
-        public EventsTestCallback(int expextedEvents) {
-            this.countDownLatch = new CountDownLatch(expextedEvents);
-        }
-
-        public void onNext(Event event) {
-            LOG.info("Received event #{}: {}", countDownLatch.getCount(), event);
-            events.add(event);
-            countDownLatch.countDown();
-        }
-        
-        public List<Event> awaitExpectedEvents(long timeout, TimeUnit unit ) {
-        	try {
-				countDownLatch.await(timeout, unit);
-				close();
-			} catch (Exception e) {
-				throw new RuntimeException(e);
-			}
-        	return new ArrayList<Event>(events);
-        }
-    }
-}
-
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ExecCreateCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ExecCreateCmdExecTest.java
deleted file mode 100644
index d0ec28ac9..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/ExecCreateCmdExecTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-import java.lang.reflect.Method;
-import java.security.SecureRandom;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.ExecCreateCmdResponse;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class ExecCreateCmdExecTest extends AbstractNettyDockerClientTest {
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void execCreateTest() {
-        String containerName = "generated_" + new SecureRandom().nextInt();
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
-                .withName(containerName).exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
-                .withCmd("touch", "file.log").exec();
-
-        assertThat(execCreateCmdResponse.getId(), not(isEmptyString()));
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
deleted file mode 100644
index 83e90ac8f..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/ExecStartCmdExecTest.java
+++ /dev/null
@@ -1,226 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
-import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_23;
-import static com.github.dockerjava.utils.TestUtils.getVersion;
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.containsString;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.security.SecureRandom;
-import java.util.concurrent.TimeUnit;
-
-import com.github.dockerjava.core.RemoteApiVersion;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.ExecCreateCmdResponse;
-import com.github.dockerjava.core.command.ExecStartResultCallback;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class ExecStartCmdExecTest extends AbstractNettyDockerClientTest {
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test()
-    public void execStart() throws Exception {
-        String containerName = "generated_" + new SecureRandom().nextInt();
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
-                .withName(containerName).exec();
-        LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true)
-                .withCmd("touch", "/execStartTest.log")
-                .exec();
-
-        dockerClient.execStartCmd(execCreateCmdResponse.getId())
-                .withDetach(false)
-                .exec(new ExecStartResultCallback(System.out, System.err))
-                .awaitCompletion();
-
-        InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec();
-
-        Boolean bytesAvailable = response.available() > 0;
-        assertTrue(bytesAvailable, "The file was not copied from the container.");
-
-        // read the stream fully. Otherwise, the underlying stream will not be closed.
-        String responseAsString = asString(response);
-        assertNotNull(responseAsString);
-        assertTrue(responseAsString.length() > 0);
-    }
-
-    @Test()
-    public void execStartAttached() throws Exception {
-        String containerName = "generated_" + new SecureRandom().nextInt();
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName(containerName).exec();
-        LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true)
-                .withCmd("touch", "/execStartTest.log")
-                .exec();
-
-        dockerClient.execStartCmd(execCreateCmdResponse.getId())
-                .withDetach(false)
-                .exec(new ExecStartResultCallback(System.out, System.err))
-                .awaitCompletion();
-
-        InputStream response = dockerClient.copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec();
-        Boolean bytesAvailable = response.available() > 0;
-        assertTrue(bytesAvailable, "The file was not copied from the container.");
-
-        // read the stream fully. Otherwise, the underlying stream will not be closed.
-        String responseAsString = asString(response);
-        assertNotNull(responseAsString);
-        assertTrue(responseAsString.length() > 0);
-    }
-
-    @Test()
-    public void execStartAttachStdin() throws Exception {
-        //FIXME swarm
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm");
-
-        String containerName = "generated_" + new SecureRandom().nextInt();
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName(containerName).exec();
-        LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InputStream stdin = new ByteArrayInputStream("STDIN\n".getBytes("UTF-8"));
-
-        ByteArrayOutputStream stdout = new ByteArrayOutputStream();
-
-        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true)
-                .withAttachStdin(true)
-                .withCmd("cat")
-                .exec();
-
-        boolean completed = dockerClient.execStartCmd(execCreateCmdResponse.getId())
-                .withDetach(false)
-                .withTty(true)
-                .withStdIn(stdin)
-                .exec(new ExecStartResultCallback(stdout, System.err))
-                .awaitCompletion(5, TimeUnit.SECONDS);
-
-        assertTrue(completed, "The process was not finished.");
-        assertEquals(stdout.toString("UTF-8"), "STDIN\n");
-    }
-
-    @Test()
-    public void execStartAttachStdinToShell() throws Exception {
-        //FIXME swarm
-        if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
-
-        String containerName = "generated_" + new SecureRandom().nextInt();
-
-        CreateContainerResponse container = dockerClient
-                .createContainerCmd("busybox")
-                .withCmd("sleep", "9999")
-                .withName(containerName)
-                .exec();
-
-        LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InputStream stdin = new ByteArrayInputStream("ls\n".getBytes());
-
-        ByteArrayOutputStream stdout = new ByteArrayOutputStream();
-
-        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true)
-                .withAttachStdin(true)
-                .withTty(false)
-                .withCmd("/bin/sh").exec();
-
-        dockerClient.execStartCmd(execCreateCmdResponse.getId())
-                .withDetach(false)
-                .withStdIn(stdin)
-                .exec(new ExecStartResultCallback(stdout, System.err))
-                .awaitCompletion();
-
-        assertThat(stdout.toString(), containsString("etc\n"));
-    }
-
-    @Test()
-    public void execStartNotAttachedStdin() throws Exception {
-        String containerName = "generated_" + new SecureRandom().nextInt();
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName(containerName).exec();
-        LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InputStream stdin = new ByteArrayInputStream("echo STDIN\n".getBytes());
-
-        ByteArrayOutputStream stdout = new ByteArrayOutputStream();
-
-        ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(container.getId())
-                .withAttachStdout(true)
-                .withAttachStdin(false)
-                .withCmd("/bin/sh")
-                .exec();
-
-        boolean completed = dockerClient.execStartCmd(execCreateCmdResponse.getId())
-                .withDetach(false)
-                .withStdIn(stdin)
-                .exec(new ExecStartResultCallback(stdout, System.err))
-                .awaitCompletion(5, TimeUnit.SECONDS);
-
-        assertEquals(stdout.toString(), "");
-
-        if (getVersion(dockerClient).isGreaterOrEqual(VERSION_1_23)) {
-            assertFalse(completed, "The process was not finished.");
-        } else {
-            assertTrue(completed, "with v1.22 of the remote api the server closed the connection when no stdin " +
-                    "was attached while exec create, so completed was true");
-        }
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InfoCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InfoCmdExecTest.java
deleted file mode 100644
index b1b7b760e..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/InfoCmdExecTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.Info;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-
-import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyOrNullString;
-import static org.hamcrest.Matchers.not;
-
-@Test(groups = "integration")
-public class InfoCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void info() throws DockerException {
-        // Make sure that there is at least one container for the assertion
-        // TODO extract this into a shared method
-        if (dockerClient.listContainersCmd().withShowAll(true).exec().size() == 0) {
-            CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                    .withName("docker-java-itest-info")
-                    .withCmd("touch", "/test").exec();
-
-            LOG.info("Created container: {}", container);
-            assertThat(container.getId(), not(isEmptyOrNullString()));
-
-            dockerClient.startContainerCmd(container.getId()).exec();
-        }
-
-        Info dockerInfo = dockerClient.infoCmd().exec();
-        LOG.info(dockerInfo.toString());
-
-        assertTrue(dockerInfo.toString().contains("containers"));
-        assertTrue(dockerInfo.toString().contains("images"));
-        assertTrue(dockerInfo.toString().contains("debug"));
-
-        assertTrue(dockerInfo.getContainers() > 0);
-        assertTrue(dockerInfo.getImages() > 0);
-
-        if (isNotSwarm(dockerClient)) {
-            assertTrue(dockerInfo.getNFd() > 0);
-            assertTrue(dockerInfo.getNGoroutines() > 0);
-            assertTrue(dockerInfo.getNCPU() > 0);
-        }
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InitializeSwarmCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InitializeSwarmCmdExecTest.java
deleted file mode 100644
index 59a5bd01c..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/InitializeSwarmCmdExecTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotAcceptableException;
-import com.github.dockerjava.api.model.Swarm;
-import com.github.dockerjava.api.model.SwarmCAConfig;
-import com.github.dockerjava.api.model.SwarmDispatcherConfig;
-import com.github.dockerjava.api.model.SwarmOrchestration;
-import com.github.dockerjava.api.model.SwarmRaftConfig;
-import com.github.dockerjava.api.model.SwarmSpec;
-import com.github.dockerjava.api.model.TaskDefaults;
-import com.github.dockerjava.netty.AbstractNettySwarmDockerClientTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-
-@Test(groups = "swarm-integration")
-public class InitializeSwarmCmdExecTest extends AbstractNettySwarmDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(InitializeSwarmCmdExecTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    public void initializeSwarm() throws DockerException {
-        SwarmSpec swarmSpec = new SwarmSpec()
-                .withName("swarm")
-                .withDispatcher(new SwarmDispatcherConfig()
-                        .withHeartbeatPeriod(10000000L)
-                ).withOrchestration(new SwarmOrchestration()
-                        .withTaskHistoryRententionLimit(100)
-                ).withCaConfig(new SwarmCAConfig()
-                        .withNodeCertExpiry(60 * 60 * 1000000000L /*ns */))
-                .withRaft(new SwarmRaftConfig()
-                        .withElectionTick(8)
-                        .withSnapshotInterval(20000)
-                        .withHeartbeatTick(5)
-                        .withLogEntriesForSlowFollowers(200)
-                ).withTaskDefaults(new TaskDefaults());
-
-        dockerClient.initializeSwarmCmd(swarmSpec)
-                .withListenAddr("127.0.0.1")
-                .withAdvertiseAddr("127.0.0.1")
-                .exec();
-        LOG.info("Initialized swarm: {}", swarmSpec.toString());
-
-        Swarm swarm = dockerClient.inspectSwarmCmd().exec();
-        LOG.info("Inspected swarm: {}", swarm.toString());
-        assertThat(swarm.getSpec(), is(equalTo(swarmSpec)));
-    }
-
-    @Test(expectedExceptions = NotAcceptableException.class)
-    public void initializingSwarmThrowsWhenAlreadyInSwarm() throws DockerException {
-        SwarmSpec swarmSpec = new SwarmSpec()
-                .withName("swarm");
-
-        dockerClient.initializeSwarmCmd(swarmSpec)
-                .withListenAddr("127.0.0.1")
-                .withAdvertiseAddr("127.0.0.1")
-                .exec();
-        LOG.info("Initialized swarm: {}", swarmSpec.toString());
-
-        // Initializing a swarm if already in swarm mode should fail
-        dockerClient.initializeSwarmCmd(swarmSpec)
-                .withListenAddr("127.0.0.1")
-                .exec();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
deleted file mode 100644
index 961ba0c2b..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectContainerCmdExecTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-import java.lang.reflect.Method;
-import java.security.SecureRandom;
-
-import com.github.dockerjava.api.command.InspectContainerCmd;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class InspectContainerCmdExecTest extends AbstractNettyDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(InspectContainerCmdExecTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test()
-    public void inspectContainer() throws DockerException {
-
-        String containerName = "generated_" + new SecureRandom().nextInt();
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
-                .withName(containerName).exec();
-        LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(container.getId()).exec();
-        assertEquals(containerInfo.getId(), container.getId());
-
-    }
-
-    @Test()
-    public void inspectContainerWithSize() throws DockerException {
-
-        String containerName = "generated_" + new SecureRandom().nextInt();
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
-                .withName(containerName).exec();
-        LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerCmd command = dockerClient.inspectContainerCmd(container.getId())
-                .withSize(true);
-        assertTrue(command.getSize());
-        InspectContainerResponse containerInfo = command.exec();
-        assertEquals(containerInfo.getId(), container.getId());
-        // TODO check swarm
-        if (isNotSwarm(dockerClient)) {
-            assertNotNull(containerInfo.getSizeRootFs());
-            assertTrue(containerInfo.getSizeRootFs().intValue() > 0);
-        }
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void inspectNonExistingContainer() throws DockerException {
-        dockerClient.inspectContainerCmd("non-existing").exec();
-    }
-
-    @Test
-    public void inspectContainerRestartCount() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withCmd("env").exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(inspectContainerResponse.getRestartCount(), equalTo(0));
-    }
-
-    @Test
-    public void inspectContainerNetworkSettings() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withCmd("env").exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertFalse(inspectContainerResponse.getNetworkSettings().getHairpinMode());
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectNetworkCmdExecTest.java
deleted file mode 100644
index 966f5c4ec..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectNetworkCmdExecTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-
-@Test(groups = "integration")
-public class InspectNetworkCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void inspectNetwork() throws DockerException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        List<Network> networks = dockerClient.listNetworksCmd().exec();
-
-        Network expected = findNetwork(networks, "bridge");
-
-        Network network = dockerClient.inspectNetworkCmd().withNetworkId(expected.getId()).exec();
-
-        assertThat(network.getName(), equalTo(expected.getName()));
-        assertThat(network.getScope(), equalTo(expected.getScope()));
-        assertThat(network.getDriver(), equalTo(expected.getDriver()));
-        assertThat(network.getIpam().getConfig().get(0).getSubnet(), equalTo(expected.getIpam().getConfig().get(0).getSubnet()));
-        assertThat(network.getIpam().getDriver(), equalTo(expected.getIpam().getDriver()));
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/InspectVolumeCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/InspectVolumeCmdExecTest.java
deleted file mode 100644
index 191767f87..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/InspectVolumeCmdExecTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-
-import java.lang.reflect.Method;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.InspectVolumeResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class InspectVolumeCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void inspectVolume() throws DockerException {
-
-        String volumeName = "volume1";
-
-        dockerClient.createVolumeCmd().withName(volumeName).withDriver("local").exec();
-
-        InspectVolumeResponse inspectVolumeResponse = dockerClient.inspectVolumeCmd(volumeName).exec();
-
-        assertThat(inspectVolumeResponse.getName(), equalTo("volume1"));
-        assertThat(inspectVolumeResponse.getDriver(), equalTo("local"));
-        assertThat(inspectVolumeResponse.getMountpoint(), containsString("/volume1/"));
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void inspectNonExistentVolume() throws DockerException {
-
-        String volumeName = "non-existing";
-
-        dockerClient.inspectVolumeCmd(volumeName).exec();
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/JoinSwarmCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/JoinSwarmCmdExecTest.java
deleted file mode 100644
index 5192a0d9d..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/JoinSwarmCmdExecTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import com.beust.jcommander.internal.Lists;
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotAcceptableException;
-import com.github.dockerjava.api.model.Info;
-import com.github.dockerjava.api.model.LocalNodeState;
-import com.github.dockerjava.api.model.Swarm;
-import com.github.dockerjava.api.model.SwarmJoinTokens;
-import com.github.dockerjava.api.model.SwarmSpec;
-import com.github.dockerjava.netty.AbstractNettySwarmDockerClientTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-
-@Test(groups = "swarm-integration")
-public class JoinSwarmCmdExecTest extends AbstractNettySwarmDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(JoinSwarmCmdExecTest.class);
-
-    @BeforeTest
-    @Override
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @BeforeMethod
-    @Override
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    private SwarmJoinTokens initSwarmOnDocker(DockerClient docker) {
-        SwarmSpec swarmSpec = new SwarmSpec();
-        docker.initializeSwarmCmd(swarmSpec)
-                .exec();
-        LOG.info("Initialized swarm docker1: {}", swarmSpec.toString());
-
-        Swarm swarm = docker.inspectSwarmCmd().exec();
-        LOG.info("Inspected swarm on docker1: {}", swarm.toString());
-        return swarm.getJoinTokens();
-    }
-
-    @Test
-    public void joinSwarmAsWorker() throws DockerException {
-        DockerClient docker1 = startDockerInDocker();
-        DockerClient docker2 = startDockerInDocker();
-
-        SwarmJoinTokens tokens = initSwarmOnDocker(docker1);
-
-        docker2.joinSwarmCmd()
-                .withRemoteAddrs(Lists.newArrayList("docker1" ))
-                .withJoinToken(tokens.getWorker())
-                .exec();
-        LOG.info("docker2 joined docker1's swarm");
-
-        Info info = docker2.infoCmd().exec();
-        LOG.info("Inspected docker2: {}", info.toString());
-        assertThat(info.getSwarm().getLocalNodeState(), is(equalTo(LocalNodeState.ACTIVE)));
-    }
-
-    @Test
-    public void joinSwarmAsManager() throws DockerException, InterruptedException {
-        DockerClient docker1 = startDockerInDocker();
-        DockerClient docker2 = startDockerInDocker();
-
-        SwarmJoinTokens tokens = initSwarmOnDocker(docker1);
-
-        docker2.joinSwarmCmd()
-                .withRemoteAddrs(Lists.newArrayList("docker1"))
-                .withJoinToken(tokens.getManager())
-                .exec();
-        LOG.info("docker2 joined docker1's swarm");
-
-        Info info = docker2.infoCmd().exec();
-        LOG.info("Inspected docker2: {}", info.toString());
-        assertThat(info.getSwarm().getLocalNodeState(), is(equalTo(LocalNodeState.ACTIVE)));
-    }
-
-    @Test(expectedExceptions = NotAcceptableException.class)
-    public void joinSwarmIfAlreadyInSwarm() {
-        DockerClient docker1 = startDockerInDocker();
-        DockerClient docker2 = startDockerInDocker();
-
-        SwarmJoinTokens tokens = initSwarmOnDocker(docker1);
-
-        initSwarmOnDocker(docker2);
-
-        docker2.joinSwarmCmd()
-                .withRemoteAddrs(Lists.<String>newArrayList("docker1"))
-                .withJoinToken(tokens.getWorker())
-                .exec();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/KillContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/KillContainerCmdExecTest.java
deleted file mode 100644
index d354c8df3..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/KillContainerCmdExecTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-import java.lang.reflect.Method;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class KillContainerCmdExecTest extends AbstractNettyDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(KillContainerCmdExecTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void killContainer() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        LOG.info("Killing container: {}", container.getId());
-        dockerClient.killContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
-        assertThat(inspectContainerResponse.getState().getExitCode(), not(equalTo(0)));
-
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void killNonExistingContainer() throws DockerException {
-
-        dockerClient.killContainerCmd("non-existing").exec();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/LeaveSwarmCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/LeaveSwarmCmdExecTest.java
deleted file mode 100644
index 57cfd316e..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/LeaveSwarmCmdExecTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotAcceptableException;
-import com.github.dockerjava.api.model.Info;
-import com.github.dockerjava.api.model.LocalNodeState;
-import com.github.dockerjava.api.model.SwarmSpec;
-import com.github.dockerjava.netty.AbstractNettySwarmDockerClientTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-
-@Test(groups = "swarm-integration")
-public class LeaveSwarmCmdExecTest extends AbstractNettySwarmDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(LeaveSwarmCmdExecTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void leaveSwarmAsMaster() throws DockerException {
-        SwarmSpec swarmSpec = new SwarmSpec().withName("firstSpec");
-        dockerClient.initializeSwarmCmd(swarmSpec)
-                .withListenAddr("127.0.0.1")
-                .withAdvertiseAddr("127.0.0.1")
-                .exec();
-        LOG.info("Initialized swarm: {}", swarmSpec.toString());
-
-        Info info = dockerClient.infoCmd().exec();
-        LOG.info("Inspected docker: {}", info.toString());
-
-        assertThat(info.getSwarm().getLocalNodeState(), is(LocalNodeState.ACTIVE));
-
-        dockerClient.leaveSwarmCmd()
-                .withForceEnabled(true)
-                .exec();
-        LOG.info("Left swarm");
-
-        info = dockerClient.infoCmd().exec();
-        LOG.info("Inspected docker: {}", info.toString());
-
-        assertThat(info.getSwarm().getLocalNodeState(), is(LocalNodeState.INACTIVE));
-
-    }
-
-    @Test(expectedExceptions = NotAcceptableException.class)
-    public void leavingSwarmThrowsWhenNotInSwarm() throws DockerException {
-        dockerClient.leaveSwarmCmd().exec();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java
deleted file mode 100644
index 06231d2b8..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/ListImagesCmdExecTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.Image;
-import com.github.dockerjava.api.model.Info;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.emptyArray;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
-
-@Test(groups = "integration")
-public class ListImagesCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void listImages() throws DockerException {
-        List<Image> images = dockerClient.listImagesCmd().withShowAll(true).exec();
-        assertThat(images, notNullValue());
-        LOG.info("Images List: {}", images);
-        Info info = dockerClient.infoCmd().exec();
-
-        if (isNotSwarm(dockerClient)) {
-            assertThat(images.size(), equalTo(info.getImages()));
-        }
-
-        Image img = images.get(0);
-        assertThat(img.getCreated(), is(greaterThan(0L)));
-        assertThat(img.getVirtualSize(), is(greaterThan(0L)));
-        assertThat(img.getId(), not(isEmptyString()));
-        assertThat(img.getRepoTags(), not(emptyArray()));
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void listImagesWithDanglingFilter() throws DockerException {
-        String imageId = createDanglingImage();
-        List<Image> images = dockerClient.listImagesCmd().withDanglingFilter(true).withShowAll(true).exec();
-        assertThat(images, notNullValue());
-        LOG.info("Images List: {}", images);
-        assertThat(images.size(), is(greaterThan(0)));
-        Boolean imageInFilteredList = isImageInFilteredList(images, imageId);
-        assertTrue(imageInFilteredList);
-    }
-
-    @Test
-    public void listImagesWithNameFilter() throws DockerException {
-        String imageId = createDanglingImage();
-        dockerClient.tagImageCmd(imageId, "test_repository", "latest").exec();
-        List<Image> images = dockerClient.listImagesCmd().withImageNameFilter("test_repository:latest").exec();
-        assertThat(images, notNullValue());
-        LOG.info("Images List: {}", images);
-        assertThat(images.size(), is(equalTo(1)));
-        Boolean imageInFilteredList = isImageInFilteredList(images, imageId);
-        assertTrue(imageInFilteredList);
-    }
-
-    private boolean isImageInFilteredList(List<Image> images, String expectedImageId) {
-        for (Image image : images) {
-            if (expectedImageId.equals(image.getId())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private String createDanglingImage() {
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        LOG.info("Committing container {}", container.toString());
-        String imageId = dockerClient.commitCmd(container.getId()).exec();
-
-        dockerClient.stopContainerCmd(container.getId()).exec();
-        dockerClient.removeContainerCmd(container.getId()).exec();
-        return imageId;
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ListNetworksCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ListNetworksCmdExecTest.java
deleted file mode 100644
index d5880ea01..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/ListNetworksCmdExecTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class ListNetworksCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void listNetworks() throws DockerException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        List<Network> networks = dockerClient.listNetworksCmd().exec();
-
-        Network network = findNetwork(networks, "bridge");
-
-        assertThat(network.getName(), equalTo("bridge"));
-        assertThat(network.getScope(), equalTo("local"));
-        assertThat(network.getDriver(), equalTo("bridge"));
-        assertThat(network.getIpam().getDriver(), equalTo("default"));
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ListVolumesCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ListVolumesCmdExecTest.java
deleted file mode 100644
index bca5ebece..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/ListVolumesCmdExecTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.greaterThanOrEqualTo;
-
-import java.lang.reflect.Method;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateVolumeResponse;
-import com.github.dockerjava.api.command.ListVolumesResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class ListVolumesCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void listVolumes() throws DockerException {
-
-        CreateVolumeResponse createVolumeResponse = dockerClient.createVolumeCmd().withName("volume1")
-                .withDriver("local").exec();
-
-        assertThat(createVolumeResponse.getName(), equalTo("volume1"));
-        assertThat(createVolumeResponse.getDriver(), equalTo("local"));
-        assertThat(createVolumeResponse.getMountpoint(), containsString("/volume1/"));
-
-        ListVolumesResponse listVolumesResponse = dockerClient.listVolumesCmd().exec();
-
-        assertThat(listVolumesResponse.getVolumes().size(), greaterThanOrEqualTo(1));
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/LoadImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/LoadImageCmdExecTest.java
deleted file mode 100644
index d978f5662..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/LoadImageCmdExecTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import com.github.dockerjava.api.model.Image;
-
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-import com.github.dockerjava.utils.TestResources;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.nio.file.Files;
-import java.util.List;
-
-import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.hamcrest.core.IsEqual.equalTo;
-
-@Test(groups = "integration")
-public class LoadImageCmdExecTest extends AbstractNettyDockerClientTest {
-
-    private String expectedImageId;
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-        expectedImageId = "sha256:56031f66eb0cef2e2e5cb2d1dabafaa0ebcd0a18a507d313b5bdb8c0472c5eba";
-        if (findImageWithId(expectedImageId, dockerClient.listImagesCmd().exec()) != null) {
-            dockerClient.removeImageCmd(expectedImageId).exec();
-        }
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        dockerClient.removeImageCmd(expectedImageId).exec();
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void loadImageFromTar() throws Exception {
-        try (InputStream uploadStream = Files.newInputStream(TestResources.getApiImagesLoadTestTarball())) {
-            dockerClient.loadImageCmd(uploadStream).exec();
-        }
-
-        final Image image = findImageWithId(expectedImageId, dockerClient.listImagesCmd().exec());
-
-        assertThat("Can't find expected image after loading from a tar archive!", image, notNullValue());
-        assertThat("Image after loading from a tar archive has wrong tags!",
-                asList(image.getRepoTags()), equalTo(singletonList("docker-java/load:1.0")));
-    }
-
-    private Image findImageWithId(final String id, final List<Image> images) {
-        for (Image image : images) {
-            if (id.equals(image.getId())) {
-                return image;
-            }
-        }
-        return null;
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/PauseCmdImplTest.java b/src/test/java/com/github/dockerjava/netty/exec/PauseCmdImplTest.java
deleted file mode 100644
index 612c3efd2..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/PauseCmdImplTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.exception.InternalServerErrorException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-import com.github.dockerjava.utils.ContainerUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-@Test(groups = {"integration", "ignoreInCircleCi"})
-public class PauseCmdImplTest extends AbstractNettyDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(PauseCmdImplTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void pauseRunningContainer() {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        ContainerUtils.startContainer(dockerClient, container);
-
-        ContainerUtils.pauseContainer(dockerClient, container);
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void pauseNonExistingContainer() {
-
-        dockerClient.pauseContainerCmd("non-existing").exec();
-    }
-
-    @Test(expectedExceptions = InternalServerErrorException.class)
-    public void pauseStoppedContainer() {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        ContainerUtils.startContainer(dockerClient, container);
-
-        ContainerUtils.stopContainer(dockerClient, container);
-
-        dockerClient.pauseContainerCmd(container.getId()).exec();
-    }
-
-    @Test(expectedExceptions = InternalServerErrorException.class)
-    public void pausePausedContainer() {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        ContainerUtils.startContainer(dockerClient, container);
-
-        ContainerUtils.pauseContainer(dockerClient, container);
-
-        dockerClient.pauseContainerCmd(container.getId()).exec();
-    }
-
-    @Test(expectedExceptions = InternalServerErrorException.class)
-    public void pauseCreatedContainer() {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.pauseContainerCmd(container.getId()).exec();
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/PingCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/PingCmdExecTest.java
deleted file mode 100644
index 128c1969a..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/PingCmdExecTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import java.lang.reflect.Method;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class PingCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void ping() throws DockerException {
-        dockerClient.pingCmd().exec();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/PushImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/PushImageCmdExecTest.java
deleted file mode 100644
index 73e99af6d..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/PushImageCmdExecTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-import java.lang.reflect.Method;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.exception.DockerClientException;
-import com.github.dockerjava.core.command.PullImageResultCallback;
-import com.github.dockerjava.core.command.PushImageResultCallback;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = {"integration", "integration-auth"})
-public class PushImageCmdExecTest extends AbstractNettyDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(PushImageCmdExecTest.class);
-
-    String username;
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-        username = dockerClient.authConfig().getUsername();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void pushLatest() throws Exception {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true").exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        LOG.info("Committing container: {}", container.toString());
-        String imageId = dockerClient.commitCmd(container.getId()).withRepository(username + "/busybox").exec();
-
-        // we have to block until image is pushed
-        dockerClient.pushImageCmd(username + "/busybox").exec(new PushImageResultCallback()).awaitSuccess();
-
-        LOG.info("Removing image: {}", imageId);
-        dockerClient.removeImageCmd(imageId).exec();
-
-        dockerClient.pullImageCmd(username + "/busybox").exec(new PullImageResultCallback()).awaitSuccess();
-    }
-
-    @Test(expectedExceptions = DockerClientException.class)
-    public void pushNonExistentImage() throws Exception {
-
-        dockerClient.pushImageCmd(username + "/xxx").exec(new PushImageResultCallback()).awaitSuccess();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExecTest.java
deleted file mode 100644
index 1e7abebdb..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExecTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.startsWith;
-import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.hamcrest.Matcher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.model.Container;
-import com.github.dockerjava.core.command.WaitContainerResultCallback;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class RemoveContainerCmdExecTest extends AbstractNettyDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(RemoveContainerCmdExecTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void removeContainer() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true").exec();
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-        dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
-
-        LOG.info("Removing container: {}", container.getId());
-        dockerClient.removeContainerCmd(container.getId()).exec();
-
-        List<Container> containers2 = dockerClient.listContainersCmd().withShowAll(true).exec();
-
-        Matcher matcher = not(hasItem(hasField("id", startsWith(container.getId()))));
-        assertThat(containers2, matcher);
-
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void removeNonExistingContainer() throws DockerException {
-
-        dockerClient.removeContainerCmd("non-existing").exec();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RemoveImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RemoveImageCmdExecTest.java
deleted file mode 100644
index 857bec714..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/RemoveImageCmdExecTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.startsWith;
-import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.hamcrest.Matcher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.model.Container;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class RemoveImageCmdExecTest extends AbstractNettyDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(RemoveImageCmdExecTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void removeImage() throws DockerException, InterruptedException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        LOG.info("Committing container {}", container.toString());
-        String imageId = dockerClient.commitCmd(container.getId()).exec();
-
-        dockerClient.stopContainerCmd(container.getId()).exec();
-        dockerClient.removeContainerCmd(container.getId()).exec();
-
-        LOG.info("Removing image: {}", imageId);
-        dockerClient.removeImageCmd(imageId).exec();
-
-        List<Container> containers = dockerClient.listContainersCmd().withShowAll(true).exec();
-
-        Matcher matcher = not(hasItem(hasField("id", startsWith(imageId))));
-        assertThat(containers, matcher);
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void removeNonExistingImage() throws DockerException, InterruptedException {
-
-        dockerClient.removeImageCmd("non-existing").exec();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExecTest.java
deleted file mode 100644
index 811db4127..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExecTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import com.github.dockerjava.api.command.CreateNetworkResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-import org.hamcrest.Matcher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import static com.github.dockerjava.utils.TestUtils.isSwarm;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.startsWith;
-import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
-
-@Test(groups = "integration")
-public class RemoveNetworkCmdExecTest extends AbstractNettyDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(RemoveNetworkCmdExecTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void removeNetwork() throws DockerException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        CreateNetworkResponse network = dockerClient.createNetworkCmd().withName("test-network").exec();
-
-        LOG.info("Removing network: {}", network.getId());
-        dockerClient.removeNetworkCmd(network.getId()).exec();
-
-        List<Network> networks = dockerClient.listNetworksCmd().exec();
-
-        Matcher matcher = not(hasItem(hasField("id", startsWith(network.getId()))));
-        assertThat(networks, matcher);
-
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void removeNonExistingContainer() throws DockerException {
-        if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
-
-        dockerClient.removeNetworkCmd("non-existing").exec();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RemoveServiceCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RemoveServiceCmdExecTest.java
deleted file mode 100644
index 29aa01240..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/RemoveServiceCmdExecTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.ContainerSpec;
-import com.github.dockerjava.api.model.Service;
-import com.github.dockerjava.api.model.ServiceSpec;
-import com.github.dockerjava.api.model.SwarmSpec;
-import com.github.dockerjava.api.model.TaskSpec;
-import com.github.dockerjava.core.command.AbstractSwarmDockerClientTest;
-import com.github.dockerjava.netty.AbstractNettySwarmDockerClientTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-import org.testng.collections.Lists;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasSize;
-
-@Test(groups = "swarm-integration")
-public class RemoveServiceCmdExecTest extends AbstractNettySwarmDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(RemoveServiceCmdExecTest.class);
-    private static final String SERVICE_NAME = "theservice";
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void removeService() throws DockerException {
-        dockerClient.initializeSwarmCmd(new SwarmSpec()).withListenAddr("127.0.0.1").exec();
-
-        ServiceSpec spec = new ServiceSpec()
-                .withName(SERVICE_NAME)
-                .withTaskTemplate(new TaskSpec()
-                        .withContainerSpec(new ContainerSpec()
-                                .withImage("busybox")));
-
-        dockerClient.createServiceCmd(spec).exec();
-
-        spec.getTaskTemplate().getContainerSpec().withImage("ubuntu");
-
-        List<Service> services = dockerClient.listServicesCmd()
-                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
-                .exec();
-
-        assertThat(services, hasSize(1));
-
-        dockerClient.removeServiceCmd(services.get(0).getId())
-                .exec();
-
-        services = dockerClient.listServicesCmd()
-                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
-                .exec();
-
-        assertThat(services, hasSize(0));
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RemoveVolumeCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RemoveVolumeCmdExecTest.java
deleted file mode 100644
index d7995861c..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/RemoveVolumeCmdExecTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-
-import java.lang.reflect.Method;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateVolumeResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class RemoveVolumeCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void removeVolume() throws DockerException {
-
-        String volumeName = "volume1";
-
-        CreateVolumeResponse createVolumeResponse = dockerClient.createVolumeCmd().withName(volumeName)
-                .withDriver("local").exec();
-
-        assertThat(createVolumeResponse.getName(), equalTo(volumeName));
-        assertThat(createVolumeResponse.getDriver(), equalTo("local"));
-        assertThat(createVolumeResponse.getMountpoint(), containsString("/volume1/"));
-
-        dockerClient.removeVolumeCmd(volumeName).exec();
-
-        dockerClient.inspectVolumeCmd(volumeName).exec();
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java
deleted file mode 100644
index 100a7d772..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/RenameContainerCmdExecTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-@Test(groups = "integration")
-public class RenameContainerCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void renameContainer() throws DockerException {
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-        String name1 = inspectContainerResponse.getName();
-
-        dockerClient.renameContainerCmd(container.getId())
-                .withName(getClass().getCanonicalName() + "renameContainer")
-                .exec();
-
-        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container.getId()).exec();
-        LOG.info("Container Inspect After Rename: {}", inspectContainerResponse2.toString());
-
-        String name2 = inspectContainerResponse2.getName();
-
-        assertNotEquals(name1, name2);
-
-        dockerClient.killContainerCmd(container.getId()).exec();
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void renameNonExistingContainer() throws DockerException, InterruptedException {
-        dockerClient.renameContainerCmd("non-existing")
-                .withName(getClass().getCanonicalName() + "renameExistingContainer")
-                .exec();
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/RestartContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/RestartContainerCmdExecTest.java
deleted file mode 100644
index 3b1ada5c2..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/RestartContainerCmdExecTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-import java.lang.reflect.Method;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class RestartContainerCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void restartContainer() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-        String startTime = inspectContainerResponse.getState().getStartedAt();
-
-        dockerClient.restartContainerCmd(container.getId()).withtTimeout(2).exec();
-
-        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container.getId()).exec();
-        LOG.info("Container Inspect After Restart: {}", inspectContainerResponse2.toString());
-
-        String startTime2 = inspectContainerResponse2.getState().getStartedAt();
-
-        assertThat(startTime, not(equalTo(startTime2)));
-
-        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(true)));
-
-        dockerClient.killContainerCmd(container.getId()).exec();
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void restartNonExistingContainer() throws DockerException, InterruptedException {
-
-        dockerClient.restartContainerCmd("non-existing").exec();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/SaveImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/SaveImageCmdExecTest.java
deleted file mode 100644
index a2fab38a7..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/SaveImageCmdExecTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.greaterThan;
-
-import java.io.InputStream;
-import java.lang.reflect.Method;
-
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class SaveImageCmdExecTest extends AbstractNettyDockerClientTest {
-    public static final Logger LOG = LoggerFactory.getLogger(SaveImageCmdExecTest.class);
-
-    String username;
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void saveImage() throws Exception {
-
-        try (InputStream image = dockerClient.saveImageCmd("busybox").exec()) {
-            assertThat(image.available(), greaterThan(0));
-        }
-
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/SearchImagesCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/SearchImagesCmdExecTest.java
deleted file mode 100644
index 70e102335..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/SearchImagesCmdExecTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import static ch.lambdaj.Lambda.filter;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.is;
-import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.hamcrest.Matcher;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.SearchItem;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class SearchImagesCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void searchImages() throws DockerException {
-        List<SearchItem> dockerSearch = dockerClient.searchImagesCmd("busybox").exec();
-        LOG.info("Search returned {}", dockerSearch.toString());
-
-        Matcher matcher = hasItem(hasField("name", equalTo("busybox")));
-        assertThat(dockerSearch, matcher);
-
-        assertThat(filter(hasField("name", is("busybox")), dockerSearch).size(), equalTo(1));
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
deleted file mode 100644
index eed82fcd9..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/StartContainerCmdExecTest.java
+++ /dev/null
@@ -1,554 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.command.StartContainerCmd;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.InternalServerErrorException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.model.Bind;
-import com.github.dockerjava.api.model.Device;
-import com.github.dockerjava.api.model.ExposedPort;
-import com.github.dockerjava.api.model.Link;
-import com.github.dockerjava.api.model.Ports;
-import com.github.dockerjava.api.model.RestartPolicy;
-import com.github.dockerjava.api.model.Volume;
-import com.github.dockerjava.api.model.VolumesFrom;
-import com.github.dockerjava.api.model.Ports.Binding;
-import com.github.dockerjava.core.command.WaitContainerResultCallback;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
-
-import static com.github.dockerjava.api.model.AccessMode.ro;
-import static com.github.dockerjava.api.model.Capability.MKNOD;
-import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.startsWith;
-
-@Test(groups = "integration")
-public class StartContainerCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void startContainerWithVolumes() throws DockerException {
-
-        // see http://docs.docker.io/use/working_with_volumes/
-        Volume volume1 = new Volume("/opt/webapp1");
-
-        Volume volume2 = new Volume("/opt/webapp2");
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withVolumes(volume1, volume2)
-                .withCmd("true")
-                .withBinds(new Bind("/src/webapp1", volume1, ro), new Bind("/src/webapp2", volume2))
-                .exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(), contains("/opt/webapp1", "/opt/webapp2"));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
-
-        inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(inspectContainerResponse, mountedVolumes(containsInAnyOrder(volume1, volume2)));
-
-        final List<InspectContainerResponse.Mount> mounts = inspectContainerResponse.getMounts();
-
-        assertThat(mounts, hasSize(2));
-
-        final InspectContainerResponse.Mount mount1 = new InspectContainerResponse.Mount()
-                .withRw(false).withMode("ro").withDestination(volume1).withSource("/src/webapp1");
-        final InspectContainerResponse.Mount mount2 = new InspectContainerResponse.Mount()
-                .withRw(true).withMode("rw").withDestination(volume2).withSource("/src/webapp2");
-
-        assertThat(mounts, containsInAnyOrder(mount1, mount2));
-    }
-
-    @Test
-    public void startContainerWithVolumesFrom() throws DockerException {
-
-        Volume volume1 = new Volume("/opt/webapp1");
-        Volume volume2 = new Volume("/opt/webapp2");
-
-        String container1Name = UUID.randomUUID().toString();
-
-        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName(container1Name)
-                .withBinds(new Bind("/src/webapp1", volume1), new Bind("/src/webapp2", volume2)).exec();
-        LOG.info("Created container1 {}", container1.toString());
-
-        dockerClient.startContainerCmd(container1.getId()).exec();
-        LOG.info("Started container1 {}", container1.toString());
-
-        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
-                .exec();
-
-        assertThat(inspectContainerResponse1, mountedVolumes(containsInAnyOrder(volume1, volume2)));
-
-        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withVolumesFrom(new VolumesFrom(container1Name)).exec();
-        LOG.info("Created container2 {}", container2.toString());
-
-        dockerClient.startContainerCmd(container2.getId()).exec();
-        LOG.info("Started container2 {}", container2.toString());
-
-        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
-                .exec();
-
-        assertThat(inspectContainerResponse2, mountedVolumes(containsInAnyOrder(volume1, volume2)));
-    }
-
-    @Test
-    public void startContainerWithDns() throws DockerException {
-
-        String aDnsServer = "8.8.8.8";
-        String anotherDnsServer = "8.8.4.4";
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
-                .withDns(aDnsServer, anotherDnsServer).exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()),
-                contains(aDnsServer, anotherDnsServer));
-    }
-
-    @Test
-    public void startContainerWithDnsSearch() throws DockerException {
-
-        String dnsSearch = "example.com";
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
-                .withDnsSearch(dnsSearch).exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDnsSearch()), contains(dnsSearch));
-    }
-
-    @Test
-    public void startContainerWithPortBindings() throws DockerException {
-
-        ExposedPort tcp22 = ExposedPort.tcp(22);
-        ExposedPort tcp23 = ExposedPort.tcp(23);
-
-        Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Binding.bindPort(11022));
-        portBindings.bind(tcp23, Binding.bindPort(11023));
-        portBindings.bind(tcp23, Binding.bindPort(11024));
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
-                .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
-
-        assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
-                is(equalTo(Binding.bindPort(11022))));
-
-        assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
-                is(equalTo(Binding.bindPort(11023))));
-
-        assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
-                is(equalTo(Binding.bindPort(11024))));
-
-    }
-
-    @Test
-    public void startContainerWithRandomPortBindings() throws DockerException {
-
-        ExposedPort tcp22 = ExposedPort.tcp(22);
-        ExposedPort tcp23 = ExposedPort.tcp(23);
-
-        Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Binding.empty());
-        portBindings.bind(tcp23, Binding.empty());
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).withPublishAllPorts(true).exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
-
-        assertThat(inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(tcp22)[0].getHostPortSpec(),
-                is(not(equalTo(String.valueOf(tcp22.getPort())))));
-
-        assertThat(inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(tcp23)[0].getHostPortSpec(),
-                is(not(equalTo(String.valueOf(tcp23.getPort())))));
-
-    }
-
-    @Test(expectedExceptions = InternalServerErrorException.class)
-    public void startContainerWithConflictingPortBindings() throws DockerException {
-
-        ExposedPort tcp22 = ExposedPort.tcp(22);
-        ExposedPort tcp23 = ExposedPort.tcp(23);
-
-        Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Binding.bindPort(11022));
-        portBindings.bind(tcp23, Binding.bindPort(11022));
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
-                .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-    }
-
-    @Test
-    public void startContainerWithLinkingDeprecated() throws DockerException {
-
-        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName("container1").exec();
-
-        LOG.info("Created container1 {}", container1.toString());
-        assertThat(container1.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container1.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
-                .exec();
-        LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
-
-        assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
-        assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
-        assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId()));
-        assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
-        assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
-        assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
-        assertThat(inspectContainerResponse1.getState().getRunning(), is(true));
-
-        if (!inspectContainerResponse1.getState().getRunning()) {
-            assertThat(inspectContainerResponse1.getState().getExitCode(), is(equalTo(0)));
-        }
-
-        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName("container2").withLinks(new Link("container1", "container1Link")).exec();
-
-        LOG.info("Created container2 {}", container2.toString());
-        assertThat(container2.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container2.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
-                .exec();
-        LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
-
-        assertThat(inspectContainerResponse2.getConfig(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
-        assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link("container1",
-                "container1Link")}));
-        assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
-        assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
-        assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
-        assertThat(inspectContainerResponse2.getState(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getState().getRunning(), is(true));
-
-    }
-
-    @Test
-    public void startContainerWithLinking() throws DockerException {
-
-        CreateContainerResponse container1 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName("container1").exec();
-
-        LOG.info("Created container1 {}", container1.toString());
-        assertThat(container1.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container1.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(container1.getId())
-                .exec();
-        LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
-
-        assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
-        assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
-        assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId()));
-        assertThat(inspectContainerResponse1.getName(), equalTo("/container1"));
-        assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
-        assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
-        assertThat(inspectContainerResponse1.getState().getRunning(), is(true));
-
-        if (!inspectContainerResponse1.getState().getRunning()) {
-            assertThat(inspectContainerResponse1.getState().getExitCode(), is(equalTo(0)));
-        }
-
-        CreateContainerResponse container2 = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName("container2").withLinks(new Link("container1", "container1Link")).exec();
-
-        LOG.info("Created container2 {}", container2.toString());
-        assertThat(container2.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container2.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse2 = dockerClient.inspectContainerCmd(container2.getId())
-                .exec();
-        LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
-
-        assertThat(inspectContainerResponse2.getConfig(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
-        assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link("container1",
-                "container1Link")}));
-        assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
-        assertThat(inspectContainerResponse2.getName(), equalTo("/container2"));
-        assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
-        assertThat(inspectContainerResponse2.getState(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getState().getRunning(), is(true));
-
-    }
-
-    @Test
-    public void startContainer() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd(new String[] {"top"})
-                .exec();
-
-        LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-        assertThat(inspectContainerResponse.getConfig(), is(notNullValue()));
-        assertThat(inspectContainerResponse.getId(), not(isEmptyString()));
-
-        assertThat(inspectContainerResponse.getId(), startsWith(container.getId()));
-
-        assertThat(inspectContainerResponse.getImageId(), not(isEmptyString()));
-        assertThat(inspectContainerResponse.getState(), is(notNullValue()));
-
-        assertThat(inspectContainerResponse.getState().getRunning(), is(true));
-
-        if (!inspectContainerResponse.getState().getRunning()) {
-            assertThat(inspectContainerResponse.getState().getExitCode(), is(equalTo(0)));
-        }
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void testStartNonExistingContainer() throws DockerException {
-
-        dockerClient.startContainerCmd("non-existing").exec();
-    }
-
-    /**
-     * This tests support for --net option for the docker run command: --net="bridge" Set the Network mode for the container 'bridge':
-     * creates a new network stack for the container on the docker bridge 'none': no networking for this container 'container:': reuses
-     * another container network stack 'host': use the host network stack inside the container. Note: the host mode gives the container full
-     * access to local system services such as D-bus and is therefore considered insecure.
-     */
-    @Test
-    public void startContainerWithNetworkMode() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("true")
-                .withNetworkMode("host").exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(inspectContainerResponse.getHostConfig().getNetworkMode(), is(equalTo("host")));
-    }
-
-    @Test
-    public void startContainerWithCapAddAndCapDrop() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withCapAdd(NET_ADMIN).withCapDrop(MKNOD).exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(inspectContainerResponse.getState().getRunning(), is(true));
-
-        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getCapAdd()), contains(NET_ADMIN));
-
-        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getCapDrop()), contains(MKNOD));
-    }
-
-    @Test
-    public void startContainerWithDevices() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withDevices(new Device("rwm", "/dev/nulo", "/dev/zero")).exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(inspectContainerResponse.getState().getRunning(), is(true));
-
-        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDevices()), contains(new Device("rwm",
-                "/dev/nulo", "/dev/zero")));
-    }
-
-    @Test
-    public void startContainerWithExtraHosts() throws DockerException {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withExtraHosts("dockerhost:127.0.0.1").exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(inspectContainerResponse.getState().getRunning(), is(true));
-
-        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getExtraHosts()),
-                contains("dockerhost:127.0.0.1"));
-    }
-
-    @Test
-    public void startContainerWithRestartPolicy() throws DockerException {
-
-        RestartPolicy restartPolicy = RestartPolicy.onFailureRestart(5);
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withRestartPolicy(restartPolicy).exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(inspectContainerResponse.getState().getRunning(), is(true));
-
-        assertThat(inspectContainerResponse.getHostConfig().getRestartPolicy(), is(equalTo(restartPolicy)));
-    }
-
-    @Test
-    public void existingHostConfigIsPreservedByBlankStartCmd() throws DockerException {
-
-        String dnsServer = "8.8.8.8";
-
-        // prepare a container with custom DNS
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withDns(dnsServer)
-                .withCmd("true").exec();
-
-        LOG.info("Created container {}", container.toString());
-
-        assertThat(container.getId(), not(isEmptyString()));
-
-        // start container _without_any_customization_ (important!)
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        // The DNS setting survived.
-        assertThat(inspectContainerResponse.getHostConfig().getDns(), is(notNullValue()));
-        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()), contains(dnsServer));
-    }
-
-    @Test
-    public void anUnconfiguredCommandSerializesToEmptyJson() throws Exception {
-        ObjectMapper objectMapper = new ObjectMapper();
-        StartContainerCmd command = dockerClient.startContainerCmd("");
-        assertThat(objectMapper.writeValueAsString(command), is("{}"));
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/StatsCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/StatsCmdExecTest.java
deleted file mode 100644
index 2b84ae6b0..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/StatsCmdExecTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.security.SecureRandom;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.model.Statistics;
-import com.github.dockerjava.core.async.ResultCallbackTemplate;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class StatsCmdExecTest extends AbstractNettyDockerClientTest {
-
-    private static int NUM_STATS = 5;
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void testStatsStreaming() throws InterruptedException, IOException {
-        TimeUnit.SECONDS.sleep(1);
-
-        CountDownLatch countDownLatch = new CountDownLatch(NUM_STATS);
-
-        String containerName = "generated_" + new SecureRandom().nextInt();
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
-                .withName(containerName).exec();
-        LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        StatsCallbackTest statsCallback = dockerClient.statsCmd(container.getId())
-                .exec(new StatsCallbackTest(countDownLatch));
-
-        countDownLatch.await(3, TimeUnit.SECONDS);
-        Boolean gotStats = statsCallback.gotStats();
-
-        LOG.info("Stop stats collection");
-
-        statsCallback.close();
-
-        LOG.info("Stopping container");
-        dockerClient.stopContainerCmd(container.getId()).exec();
-        dockerClient.removeContainerCmd(container.getId()).exec();
-
-        LOG.info("Completed test");
-        assertTrue(gotStats, "Expected true");
-
-    }
-
-    private class StatsCallbackTest extends ResultCallbackTemplate<StatsCallbackTest, Statistics> {
-        private final CountDownLatch countDownLatch;
-
-        private Boolean gotStats = false;
-
-        public StatsCallbackTest(CountDownLatch countDownLatch) {
-            this.countDownLatch = countDownLatch;
-        }
-
-        @Override
-        public void onNext(Statistics stats) {
-            LOG.info("Received stats #{}: {}", countDownLatch.getCount(), stats);
-            if (stats != null) {
-                gotStats = true;
-            }
-            countDownLatch.countDown();
-        }
-
-        public Boolean gotStats() {
-            return gotStats;
-        }
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java
deleted file mode 100644
index 063bcee30..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/StopContainerCmdExecTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
-import static com.github.dockerjava.utils.TestUtils.getVersion;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-import java.lang.reflect.Method;
-
-import com.github.dockerjava.core.RemoteApiVersion;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class StopContainerCmdExecTest extends AbstractNettyDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(StopContainerCmdExecTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test(groups = "ignoreInCircleCi")
-    public void testStopContainer() throws DockerException {
-        final RemoteApiVersion apiVersion = getVersion(dockerClient);
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        LOG.info("Stopping container: {}", container.getId());
-        dockerClient.stopContainerCmd(container.getId()).withTimeout(10).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
-
-        final Integer exitCode = inspectContainerResponse.getState().getExitCode();
-        
-        assertThat(exitCode, is(137));
-        
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void testStopNonExistingContainer() throws DockerException {
-
-        dockerClient.stopContainerCmd("non-existing").withTimeout(10).exec();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/TagImageCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/TagImageCmdExecTest.java
deleted file mode 100644
index 6c84775ee..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/TagImageCmdExecTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import java.lang.reflect.Method;
-
-import org.apache.commons.lang.math.RandomUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class TagImageCmdExecTest extends AbstractNettyDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(TagImageCmdExecTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void tagImage() throws Exception {
-        String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
-
-        dockerClient.tagImageCmd("busybox:latest", "docker-java/busybox", tag).exec();
-
-        dockerClient.removeImageCmd("docker-java/busybox:" + tag).exec();
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void tagNonExistingImage() throws Exception {
-
-        String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
-        dockerClient.tagImageCmd("non-existing", "docker-java/busybox", tag).exec();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/UnpauseCmdImplTest.java b/src/test/java/com/github/dockerjava/netty/exec/UnpauseCmdImplTest.java
deleted file mode 100644
index cb30babc4..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/UnpauseCmdImplTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.exception.InternalServerErrorException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-import com.github.dockerjava.utils.ContainerUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
-
-@Test(groups = {"integration", "ignoreInCircleCi"})
-public class UnpauseCmdImplTest extends AbstractNettyDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(UnpauseCmdImplTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void unpausePausedContainer() {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        ContainerUtils.startContainer(dockerClient, container);
-
-        ContainerUtils.pauseContainer(dockerClient, container);
-
-        ContainerUtils.unpauseContainer(dockerClient, container);
-    }
-
-    @Test(expectedExceptions = InternalServerErrorException.class)
-    public void unpauseRunningContainer() {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        ContainerUtils.startContainer(dockerClient, container);
-
-        dockerClient.unpauseContainerCmd(container.getId()).exec();
-    }
-
-    @Test(expectedExceptions = InternalServerErrorException.class)
-    public void unpauseStoppedContainer() {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        ContainerUtils.startContainer(dockerClient, container);
-
-        ContainerUtils.stopContainer(dockerClient, container);
-
-        dockerClient.unpauseContainerCmd(container.getId()).exec();
-    }
-
-    @Test(expectedExceptions = NotFoundException.class)
-    public void unpauseNonExistingContainer() {
-
-        dockerClient.unpauseContainerCmd("non-existing").exec();
-    }
-
-    @Test(expectedExceptions = InternalServerErrorException.class)
-    public void unpauseCreatedContainer() {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        dockerClient.unpauseContainerCmd(container.getId()).exec();
-    }
-
-    @Test(expectedExceptions = InternalServerErrorException.class)
-    public void unpauseUnpausedContainer() {
-
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        ContainerUtils.startContainer(dockerClient, container);
-
-        ContainerUtils.pauseContainer(dockerClient, container);
-
-        dockerClient.unpauseContainerCmd(container.getId()).exec();
-        dockerClient.unpauseContainerCmd(container.getId()).exec();
-    }
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java
deleted file mode 100644
index 0db15fb82..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.HostConfig;
-import com.github.dockerjava.api.model.UpdateContainerResponse;
-import com.github.dockerjava.core.RemoteApiVersion;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.SkipException;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.lang.reflect.Method;
-
-import static com.github.dockerjava.utils.TestUtils.getVersion;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
-
-/**
- * @author Kanstantsin Shautsou
- */
-@Test(groups = "integration")
-public class UpdateContainerCmdExecTest extends AbstractNettyDockerClientTest {
-    public static final Logger LOG = LoggerFactory.getLogger(UpdateContainerCmdExecTest.class);
-    private static final String BUSYBOX_IMAGE = "busybox";
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void updateContainer() throws DockerException, IOException {
-        final RemoteApiVersion apiVersion = getVersion(dockerClient);
-
-        if (!apiVersion.isGreaterOrEqual(RemoteApiVersion.VERSION_1_22)) {
-            throw new SkipException("API version should be >= 1.22");
-        }
-
-        CreateContainerResponse response = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
-                .withCmd("sleep", "9999")
-                .exec();
-        String containerId = response.getId();
-        dockerClient.startContainerCmd(containerId).exec();
-
-        InspectContainerResponse inspectBefore = dockerClient.inspectContainerCmd(containerId).exec();
-        final HostConfig beforeHostConfig = inspectBefore.getHostConfig();
-
-        final UpdateContainerResponse updateResponse = dockerClient.updateContainerCmd(containerId)
-                .withBlkioWeight(300)
-                .withCpuShares(512)
-                .withCpuPeriod(100000)
-                .withCpuQuota(50000)
-//                .withCpusetCpus("0") // depends on env
-                .withCpusetMems("0")
-//                .withMemory(209715200L + 2L)
-//              .withMemorySwap(514288000L) Your kernel does not support swap limit capabilities, memory limited without swap.
-//                .withMemoryReservation(209715200L)
-//                .withKernelMemory(52428800) Can not update kernel memory to a running container, please stop it first.
-                .exec();
-
-        // found only on docker toolbox (1.10.1)
-//        assertThat(updateResponse.getWarnings(), hasSize(1));
-//        assertThat(updateResponse.getWarnings().get(0),
-//                is("Your kernel does not support Block I/O weight. Weight discarded."));
-
-        InspectContainerResponse inspectAfter = dockerClient.inspectContainerCmd(containerId).exec();
-        final HostConfig afterHostConfig = inspectAfter.getHostConfig();
-
-//        assertThat(afterHostConfig.getMemory(), is(209715200L + 2L));
-
-//        assertThat(afterHostConfig.getBlkioWeight(), is(300));
-        assertThat(afterHostConfig.getCpuShares(), is(512));
-        assertThat(afterHostConfig.getCpuPeriod(), is(100000));
-        assertThat(afterHostConfig.getCpuQuota(), is(50000));
-        assertThat(afterHostConfig.getCpusetMems(), is("0"));
-
-//        assertThat(afterHostConfig.getMemoryReservation(), is(209715200L));
-//        assertThat(afterHostConfig.getMemorySwap(), is(514288000L));
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/UpdateServiceCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/UpdateServiceCmdExecTest.java
deleted file mode 100644
index 5e2d60c96..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/UpdateServiceCmdExecTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.ContainerSpec;
-import com.github.dockerjava.api.model.Service;
-import com.github.dockerjava.api.model.ServiceSpec;
-import com.github.dockerjava.api.model.SwarmSpec;
-import com.github.dockerjava.api.model.TaskSpec;
-import com.github.dockerjava.core.command.AbstractSwarmDockerClientTest;
-import com.github.dockerjava.netty.AbstractNettySwarmDockerClientTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-import org.testng.collections.Lists;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.is;
-
-@Test(groups = "swarm-integration")
-public class UpdateServiceCmdExecTest extends AbstractNettySwarmDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(UpdateServiceCmdExecTest.class);
-    private static final String SERVICE_NAME = "theservice";
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void updateService() throws DockerException {
-        dockerClient.initializeSwarmCmd(new SwarmSpec()).withListenAddr("127.0.0.1").exec();
-
-        ServiceSpec spec = new ServiceSpec()
-                .withName(SERVICE_NAME)
-                .withTaskTemplate(new TaskSpec()
-                        .withContainerSpec(new ContainerSpec()
-                                .withImage("busybox")));
-
-        dockerClient.createServiceCmd(spec).exec();
-
-        spec.getTaskTemplate().getContainerSpec().withImage("ubuntu");
-
-        List<Service> services = dockerClient.listServicesCmd()
-                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
-                .exec();
-
-        assertThat(services, hasSize(1));
-
-        dockerClient.updateServiceCmd(services.get(0).getId(), spec)
-                .withVersion(services.get(0).getVersion().getIndex())
-                .exec();
-
-        services = dockerClient.listServicesCmd()
-                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
-                .exec();
-
-        assertThat(services, hasSize(1));
-
-        assertThat(services.get(0).getSpec().getTaskTemplate().getContainerSpec().getImage(), is(equalTo("ubuntu")));
-
-        dockerClient.removeServiceCmd(SERVICE_NAME);
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/UpdateSwarmCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/UpdateSwarmCmdExecTest.java
deleted file mode 100644
index 85e0f21a9..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/UpdateSwarmCmdExecTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotAcceptableException;
-import com.github.dockerjava.api.model.Swarm;
-import com.github.dockerjava.api.model.SwarmCAConfig;
-import com.github.dockerjava.api.model.SwarmDispatcherConfig;
-import com.github.dockerjava.api.model.SwarmOrchestration;
-import com.github.dockerjava.api.model.SwarmRaftConfig;
-import com.github.dockerjava.api.model.SwarmSpec;
-import com.github.dockerjava.api.model.TaskDefaults;
-import com.github.dockerjava.netty.AbstractNettySwarmDockerClientTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import java.lang.reflect.Method;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-
-@Test(groups = "swarm-integration")
-public class UpdateSwarmCmdExecTest extends AbstractNettySwarmDockerClientTest {
-
-    public static final Logger LOG = LoggerFactory.getLogger(UpdateSwarmCmdExecTest.class);
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    public void updateSwarm() throws DockerException {
-        SwarmSpec firstSpec = new SwarmSpec().withName("firstSpec");
-
-        SwarmSpec secondSpec = new SwarmSpec()
-                .withName("secondSpec")
-                .withDispatcher(new SwarmDispatcherConfig()
-                        .withHeartbeatPeriod(10000000L)
-                ).withOrchestration(new SwarmOrchestration()
-                        .withTaskHistoryRententionLimit(100)
-                ).withCaConfig(new SwarmCAConfig()
-                        .withNodeCertExpiry(60 * 60 * 1000000000L /*ns */))
-                .withRaft(new SwarmRaftConfig()
-                        .withElectionTick(8)
-                        .withSnapshotInterval(20000)
-                        .withHeartbeatTick(5)
-                        .withLogEntriesForSlowFollowers(200)
-                ).withTaskDefaults(new TaskDefaults());
-
-        dockerClient.initializeSwarmCmd(firstSpec)
-                .withListenAddr("127.0.0.1")
-                .withAdvertiseAddr("127.0.0.1")
-                .exec();
-        LOG.info("Initialized swarm: {}", firstSpec.toString());
-
-        Swarm swarm = dockerClient.inspectSwarmCmd().exec();
-        LOG.info("Inspected swarm: {}", swarm.toString());
-        assertThat(swarm.getSpec(), is(not(equalTo(secondSpec))));
-
-        dockerClient.updateSwarmCmd(secondSpec)
-                .withVersion(swarm.getVersion().getIndex())
-                .exec();
-        LOG.info("Updated swarm: {}", secondSpec.toString());
-
-        swarm = dockerClient.inspectSwarmCmd().exec();
-        LOG.info("Inspected swarm: {}", swarm.toString());
-        assertThat(swarm.getSpec(), is(equalTo(secondSpec)));
-    }
-
-    @Test(expectedExceptions = NotAcceptableException.class)
-    public void updatingSwarmThrowsWhenNotInSwarm() throws DockerException {
-        SwarmSpec swarmSpec = new SwarmSpec()
-                .withName("swarm");
-
-        dockerClient.updateSwarmCmd(swarmSpec)
-                .withVersion(1l)
-                .exec();
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/exec/VersionCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/VersionCmdExecTest.java
deleted file mode 100644
index 7709fa56d..000000000
--- a/src/test/java/com/github/dockerjava/netty/exec/VersionCmdExecTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.github.dockerjava.netty.exec;
-
-import java.lang.reflect.Method;
-
-import org.apache.commons.lang.StringUtils;
-import org.testng.ITestResult;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.Version;
-import com.github.dockerjava.netty.AbstractNettyDockerClientTest;
-
-@Test(groups = "integration")
-public class VersionCmdExecTest extends AbstractNettyDockerClientTest {
-
-    @BeforeTest
-    public void beforeTest() throws Exception {
-        super.beforeTest();
-    }
-
-    @AfterTest
-    public void afterTest() {
-        super.afterTest();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        super.beforeMethod(method);
-    }
-
-    @AfterMethod
-    public void afterMethod(ITestResult result) {
-        super.afterMethod(result);
-    }
-
-    @Test
-    public void version() throws DockerException {
-        Version version = dockerClient.versionCmd().exec();
-        LOG.info(version.toString());
-
-        assertTrue(version.getGoVersion().length() > 0);
-        assertTrue(version.getVersion().length() > 0);
-
-        assertEquals(StringUtils.split(version.getVersion(), ".").length, 3);
-
-    }
-
-}
diff --git a/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java b/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
index 8424763de..b80579b39 100644
--- a/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
+++ b/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
@@ -1,13 +1,14 @@
 package com.github.dockerjava.netty.handler;
 
-import static com.github.dockerjava.netty.handler.HttpResponseStreamHandler.HttpResponseInputStream;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufInputStream;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.ReferenceCountUtil;
+import org.apache.commons.io.IOUtils;
+import org.junit.Test;
+import org.mockito.Mockito;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -16,12 +17,9 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import io.netty.util.ReferenceCountUtil;
-import org.apache.commons.io.IOUtils;
-import org.mockito.Mockito;
-import org.testng.annotations.Test;
-
-import com.github.dockerjava.core.async.ResultCallbackTemplate;
+import static com.github.dockerjava.netty.handler.HttpResponseStreamHandler.HttpResponseInputStream;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author Alexander Koshevoy
@@ -107,7 +105,7 @@ public void run() {
         submit.get();
     }
 
-    @Test(expectedExceptions = IOException.class)
+    @Test(expected = IOException.class)
     public void testReadClosedResponseStream() throws Exception {
         HttpResponseInputStream inputStream = new HttpResponseInputStream();
         ByteBuf buffer = generateByteBuf();
diff --git a/src/test/java/com/github/dockerjava/test/serdes/JSONSamples.java b/src/test/java/com/github/dockerjava/test/serdes/JSONSamples.java
index 1b5337aa6..ca706fa14 100644
--- a/src/test/java/com/github/dockerjava/test/serdes/JSONSamples.java
+++ b/src/test/java/com/github/dockerjava/test/serdes/JSONSamples.java
@@ -10,8 +10,8 @@
 import java.io.File;
 import java.io.IOException;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotSame;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
 
 /**
  * Samples helper
@@ -57,9 +57,9 @@ public static <TClass> TClass testRoundTrip(TClass item, JavaType type)
         JsonNode json2 = mapper.readTree(serialized2);
         TClass deserialized2 = mapper.readValue(serialized2, type);
 
-        assertEquals(json2, json1, "JSONs must be equal after the second roundtrip");
-        assertEquals(deserialized2, deserialized2, "Objects must be equal after the second roundtrip");
-        assertNotSame(deserialized2, deserialized1, "Objects must be not the same");
+        assertEquals("JSONs must be equal after the second roundtrip", json2, json1);
+        assertEquals("Objects must be equal after the second roundtrip", deserialized2, deserialized2);
+        assertNotSame("Objects must be not the same", deserialized2, deserialized1);
 
         return deserialized2;
     }
diff --git a/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java b/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
index 99a90f0af..d430b0387 100644
--- a/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
+++ b/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
@@ -15,16 +15,15 @@
  */
 package com.github.dockerjava.test.serdes;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.io.IOUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.io.IOUtils;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 /**
  * Provides helper methods for serialization-deserialization tests.
@@ -135,7 +134,7 @@ public static <TClass> TClass testRoundTrip(TClass item, Class<TClass> asclass)
         JsonNode json2 = mapper.readTree(serialized2);
         TClass deserialized2 = mapper.readValue(serialized2, asclass);
 
-        assertEquals(json2, json1, "JSONs must be equal after the second roundtrip");
+        assertEquals("JSONs must be equal after the second roundtrip", json2, json1);
         return deserialized2;
     }
 }
diff --git a/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java b/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java
new file mode 100644
index 000000000..a2c9fd36c
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java
@@ -0,0 +1,42 @@
+package com.github.dockerjava.utils;
+
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.command.LogContainerResultCallback;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Kanstantsin Shautsou
+ */
+public class LogContainerTestCallback extends LogContainerResultCallback {
+    protected final StringBuffer log = new StringBuffer();
+
+    List<Frame> collectedFrames = new ArrayList<Frame>();
+
+    boolean collectFrames = false;
+
+    public LogContainerTestCallback() {
+        this(false);
+    }
+
+    public LogContainerTestCallback(boolean collectFrames) {
+        this.collectFrames = collectFrames;
+    }
+
+    @Override
+    public void onNext(Frame frame) {
+        if (collectFrames) collectedFrames.add(frame);
+        log.append(new String(frame.getPayload()));
+    }
+
+    @Override
+    public String toString() {
+        return log.toString();
+    }
+
+
+    public List<Frame> getCollectedFrames() {
+        return collectedFrames;
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/utils/TestUtils.java b/src/test/java/com/github/dockerjava/utils/TestUtils.java
index d8b01fd54..87833343b 100644
--- a/src/test/java/com/github/dockerjava/utils/TestUtils.java
+++ b/src/test/java/com/github/dockerjava/utils/TestUtils.java
@@ -1,12 +1,25 @@
 package com.github.dockerjava.utils;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.LineIterator;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.util.List;
 
 /**
  * @author Kanstantsin Shautsou
  */
 public class TestUtils {
+    public static final Logger LOG = LoggerFactory.getLogger(TestUtils.class);
+
     private TestUtils() {
     }
 
@@ -23,4 +36,41 @@ public static boolean isSwarm(DockerClient client) {
     public static boolean isNotSwarm(DockerClient client) {
         return !isSwarm(client);
     }
+
+    public static Network findNetwork(List<Network> networks, String name) {
+
+        for (Network network : networks) {
+            if (StringUtils.equals(network.getName(), name)) {
+                return network;
+            }
+        }
+
+        throw new AssertionError("No network found.");
+    }
+
+    public static String asString(InputStream response) {
+        return consumeAsString(response);
+    }
+
+    public static String consumeAsString(InputStream response) {
+
+        StringWriter logwriter = new StringWriter();
+
+        try {
+            LineIterator itr = IOUtils.lineIterator(response, "UTF-8");
+
+            while (itr.hasNext()) {
+                String line = itr.next();
+                logwriter.write(line + (itr.hasNext() ? "\n" : ""));
+                LOG.info("line: " + line);
+            }
+            response.close();
+
+            return logwriter.toString();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } finally {
+            IOUtils.closeQuietly(response);
+        }
+    }
 }
diff --git a/src/test/resources/attachContainerTestDockerfile/Dockerfile b/src/test/resources/attachContainerTestDockerfile/Dockerfile
index 90cca5e64..4c8f6bd78 100644
--- a/src/test/resources/attachContainerTestDockerfile/Dockerfile
+++ b/src/test/resources/attachContainerTestDockerfile/Dockerfile
@@ -1,7 +1,8 @@
-FROM ubuntu:latest
+FROM busybox:latest
 
 ADD	./echo.sh /tmp/
 
+RUN mkdir -p /usr/local/bin
 RUN cp /tmp/echo.sh /usr/local/bin/ && chmod +x /usr/local/bin/echo.sh
 
 CMD ["echo.sh"]
diff --git a/src/test/resources/buildTests/ADD/file/Dockerfile b/src/test/resources/buildTests/ADD/file/Dockerfile
index 8a4a67760..48faa93c6 100644
--- a/src/test/resources/buildTests/ADD/file/Dockerfile
+++ b/src/test/resources/buildTests/ADD/file/Dockerfile
@@ -1,9 +1,9 @@
-FROM      ubuntu:latest
+FROM      busybox:latest
 
 # Copy testrun.sh files into the container
 
 ADD	./testrun.sh       /tmp/
-
+RUN mkdir -p /usr/local/bin
 RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh
 
 CMD ["testrun.sh"]
diff --git a/src/test/resources/buildTests/ADD/fileInSubfolder/Dockerfile b/src/test/resources/buildTests/ADD/fileInSubfolder/Dockerfile
index eac6b0e99..440e61e81 100644
--- a/src/test/resources/buildTests/ADD/fileInSubfolder/Dockerfile
+++ b/src/test/resources/buildTests/ADD/fileInSubfolder/Dockerfile
@@ -1,9 +1,10 @@
-FROM      ubuntu:latest
+FROM      busybox:latest
 
 # Copy testrun.sh files into the container
 
 ADD ./files/testrun.sh    /tmp/
 
+RUN mkdir -p /usr/local/bin
 RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh
 
 CMD ["testrun.sh"]
diff --git a/src/test/resources/buildTests/ADD/files/Dockerfile b/src/test/resources/buildTests/ADD/files/Dockerfile
index 52c5bfc6c..8de15aed4 100644
--- a/src/test/resources/buildTests/ADD/files/Dockerfile
+++ b/src/test/resources/buildTests/ADD/files/Dockerfile
@@ -1,4 +1,4 @@
-FROM      ubuntu:latest
+FROM      busybox:latest
 
 # Copy multiple source files into the container
 
diff --git a/src/test/resources/buildTests/ADD/filesViaWildcard/Dockerfile b/src/test/resources/buildTests/ADD/filesViaWildcard/Dockerfile
index a9a9ad2b9..f62e18087 100644
--- a/src/test/resources/buildTests/ADD/filesViaWildcard/Dockerfile
+++ b/src/test/resources/buildTests/ADD/filesViaWildcard/Dockerfile
@@ -1,9 +1,10 @@
-FROM      ubuntu:latest
+FROM      busybox:latest
 
 # Copy testrun.sh files into the container
 
 ADD ./folder*/*    /tmp/
 
+RUN mkdir -p /usr/local/bin
 RUN cp /tmp/*.sh /usr/local/bin/ && chmod +x /usr/local/bin/*.sh
 
 CMD ["testrun.sh"]
diff --git a/src/test/resources/buildTests/ADD/folder/Dockerfile b/src/test/resources/buildTests/ADD/folder/Dockerfile
index 183e831c3..9d8ff411f 100644
--- a/src/test/resources/buildTests/ADD/folder/Dockerfile
+++ b/src/test/resources/buildTests/ADD/folder/Dockerfile
@@ -1,11 +1,12 @@
-FROM      ubuntu:latest
+FROM      busybox:latest
 
 # Copy testrun.sh files into the container
 
 ADD .   /src/
 
-run ls -la /src
+RUN ls -la /src
 
-run cp /src/folderA/testAddFolder.sh /usr/local/bin/ && chmod +x /usr/local/bin/testAddFolder.sh
+RUN mkdir -p /usr/local/bin
+RUN cp /src/folderA/testAddFolder.sh /usr/local/bin/ && chmod +x /usr/local/bin/testAddFolder.sh
 
 CMD ["testAddFolder.sh"]
diff --git a/src/test/resources/buildTests/ADD/url/Dockerfile b/src/test/resources/buildTests/ADD/url/Dockerfile
index 2b10c34e5..4fbfa3236 100644
--- a/src/test/resources/buildTests/ADD/url/Dockerfile
+++ b/src/test/resources/buildTests/ADD/url/Dockerfile
@@ -1,10 +1,10 @@
-FROM      ubuntu:latest
+FROM      busybox:latest
 
 # Copy testrun.sh files into the container
 
 ADD	http://www.example.com/index.html       /tmp/some.html
 ADD	./testrun.sh       /tmp/
-
+RUN mkdir -p /usr/local/bin
 RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh
 
 CMD ["testrun.sh"]
\ No newline at end of file
diff --git a/src/test/resources/buildTests/AUTHOR/Dockerfile b/src/test/resources/buildTests/AUTHOR/Dockerfile
index 32ffcedc7..86bbd1a4f 100644
--- a/src/test/resources/buildTests/AUTHOR/Dockerfile
+++ b/src/test/resources/buildTests/AUTHOR/Dockerfile
@@ -2,11 +2,11 @@
 #
 # VERSION               0.0.1
 
-FROM      ubuntu:latest
+FROM      busybox:latest
 MAINTAINER Guillaume J. Charmes "guillaume@dotcloud.com"
 
 # make sure the package repository is up to date
-RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
-RUN apt-get update
+#RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
+#RUN apt-get update
 
-RUN apt-get install -y nginx
\ No newline at end of file
+#RUN apt-get install -y nginx
\ No newline at end of file
diff --git a/src/test/resources/buildTests/CacheFrom/test1/Dockerfile b/src/test/resources/buildTests/CacheFrom/test1/Dockerfile
index 44cb26e00..b1319b7b8 100644
--- a/src/test/resources/buildTests/CacheFrom/test1/Dockerfile
+++ b/src/test/resources/buildTests/CacheFrom/test1/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM busybox:latest
 
 RUN echo "Step 1"
 
diff --git a/src/test/resources/buildTests/CacheFrom/test2/Dockerfile b/src/test/resources/buildTests/CacheFrom/test2/Dockerfile
index 521ee8b78..f45391b10 100644
--- a/src/test/resources/buildTests/CacheFrom/test2/Dockerfile
+++ b/src/test/resources/buildTests/CacheFrom/test2/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM busybox:latest
 
 RUN echo "Step 1"
 
diff --git a/src/test/resources/buildTests/ENV/Dockerfile b/src/test/resources/buildTests/ENV/Dockerfile
index 134f7a60f..f116eb96e 100644
--- a/src/test/resources/buildTests/ENV/Dockerfile
+++ b/src/test/resources/buildTests/ENV/Dockerfile
@@ -1,4 +1,4 @@
-FROM      ubuntu:latest
+FROM      busybox:latest
 
 # Copy testrun.sh files into the container
 
@@ -6,6 +6,8 @@ ENV variable abc123
 ADD ./testrun.sh /tmp/
 ADD	./subst-file-$variable.txt     /tmp/
 COPY ./subst-file-2-${variable}.txt     /tmp/
+
+RUN mkdir -p /usr/local/bin
 RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh
 
 CMD ["testrun.sh"]
diff --git a/src/test/resources/buildTests/FROM/privateRegistry/Dockerfile b/src/test/resources/buildTests/FROM/privateRegistry/Dockerfile
index b3d914c6c..f6813ad40 100644
--- a/src/test/resources/buildTests/FROM/privateRegistry/Dockerfile
+++ b/src/test/resources/buildTests/FROM/privateRegistry/Dockerfile
@@ -1 +1 @@
-FROM      localhost:5000/testuser/busybox:latest
+FROM      localhost:5050/testuser/busybox:latest
diff --git a/src/test/resources/buildTests/ONBUILD/parent/Dockerfile b/src/test/resources/buildTests/ONBUILD/parent/Dockerfile
index e482cd833..f7721dafd 100644
--- a/src/test/resources/buildTests/ONBUILD/parent/Dockerfile
+++ b/src/test/resources/buildTests/ONBUILD/parent/Dockerfile
@@ -1,8 +1,10 @@
-FROM      ubuntu:latest
+FROM      busybox:latest
 
+RUN mkdir -p /usr/local/bin
 # Copy testrun.sh files into the container
 
 ONBUILD ADD ./testrun.sh    /tmp/
+
 ONBUILD RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh
 
 CMD ["testrun.sh"]
diff --git a/src/test/resources/buildTests/buildArgs/Dockerfile b/src/test/resources/buildTests/buildArgs/Dockerfile
index c8dd0ae36..038f98e81 100644
--- a/src/test/resources/buildTests/buildArgs/Dockerfile
+++ b/src/test/resources/buildTests/buildArgs/Dockerfile
@@ -1,4 +1,4 @@
-FROM      ubuntu:latest
+FROM      busybox:latest
 
 ARG testArg
 
diff --git a/src/test/resources/buildTests/dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile b/src/test/resources/buildTests/dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile
index 9bf10088b..15d8fd7a8 100644
--- a/src/test/resources/buildTests/dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile
+++ b/src/test/resources/buildTests/dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile
@@ -1,7 +1,8 @@
-FROM ubuntu:latest
+FROM busybox:latest
 
 ADD	testrunFolder/testrun.sh       /tmp/
 
+RUN mkdir -p /usr/local/bin
 RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh
 
 CMD ["testrun.sh"]
\ No newline at end of file
diff --git a/src/test/resources/buildTests/dockerignore/DockerfileIgnored/Dockerfile b/src/test/resources/buildTests/dockerignore/DockerfileIgnored/Dockerfile
index 8a4a67760..cecc27462 100644
--- a/src/test/resources/buildTests/dockerignore/DockerfileIgnored/Dockerfile
+++ b/src/test/resources/buildTests/dockerignore/DockerfileIgnored/Dockerfile
@@ -1,9 +1,10 @@
-FROM      ubuntu:latest
+FROM      busybox:latest
 
 # Copy testrun.sh files into the container
 
 ADD	./testrun.sh       /tmp/
 
+RUN mkdir -p /usr/local/bin
 RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh
 
 CMD ["testrun.sh"]
diff --git a/src/test/resources/buildTests/dockerignore/DockerfileNotIgnored/Dockerfile b/src/test/resources/buildTests/dockerignore/DockerfileNotIgnored/Dockerfile
index 6a8106b86..e5b29ce0a 100644
--- a/src/test/resources/buildTests/dockerignore/DockerfileNotIgnored/Dockerfile
+++ b/src/test/resources/buildTests/dockerignore/DockerfileNotIgnored/Dockerfile
@@ -1,3 +1,3 @@
-FROM      ubuntu:latest
+FROM      busybox:latest
 
 CMD ["echo", "Success"]
diff --git a/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/Dockerfile b/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/Dockerfile
index 65fa210c7..3c57c5061 100644
--- a/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/Dockerfile
+++ b/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/Dockerfile
@@ -1,3 +1,3 @@
-FROM ubuntu:latest
+FROM busybox:latest
 
 CMD ["echo", "Success"]
diff --git a/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/Dockerfile b/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/Dockerfile
index 65fa210c7..3c57c5061 100644
--- a/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/Dockerfile
+++ b/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/Dockerfile
@@ -1,3 +1,3 @@
-FROM ubuntu:latest
+FROM busybox:latest
 
 CMD ["echo", "Success"]
diff --git a/src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/Dockerfile b/src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/Dockerfile
index 8a4a67760..cecc27462 100644
--- a/src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/Dockerfile
+++ b/src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/Dockerfile
@@ -1,9 +1,10 @@
-FROM      ubuntu:latest
+FROM      busybox:latest
 
 # Copy testrun.sh files into the container
 
 ADD	./testrun.sh       /tmp/
 
+RUN mkdir -p /usr/local/bin
 RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh
 
 CMD ["testrun.sh"]
diff --git a/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/Dockerfile b/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/Dockerfile
index 65fa210c7..3c57c5061 100644
--- a/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/Dockerfile
+++ b/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/Dockerfile
@@ -1,3 +1,3 @@
-FROM ubuntu:latest
+FROM busybox:latest
 
 CMD ["echo", "Success"]
diff --git a/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/Dockerfile b/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/Dockerfile
index 97b93b899..1268f56cf 100644
--- a/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/Dockerfile
+++ b/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/Dockerfile
@@ -1,10 +1,11 @@
-FROM      ubuntu:latest
+FROM      busybox:latest
 
 # Copy testrun.sh files into the container
 
 ADD	./testrun.sh       /tmp/
 ADD     ./a                /tmp/a
 
+RUN mkdir -p /usr/local/bin
 RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh
 
 CMD ["testrun.sh"]
diff --git a/src/test/resources/buildTests/labels/Dockerfile b/src/test/resources/buildTests/labels/Dockerfile
index 6a8106b86..e5b29ce0a 100644
--- a/src/test/resources/buildTests/labels/Dockerfile
+++ b/src/test/resources/buildTests/labels/Dockerfile
@@ -1,3 +1,3 @@
-FROM      ubuntu:latest
+FROM      busybox:latest
 
 CMD ["echo", "Success"]
diff --git a/src/test/resources/testReadFile/Dockerfile b/src/test/resources/testReadFile/Dockerfile
index 0f73b8ea8..af2575fa7 100644
--- a/src/test/resources/testReadFile/Dockerfile
+++ b/src/test/resources/testReadFile/Dockerfile
@@ -1,9 +1,11 @@
-FROM      ubuntu:latest
+FROM      busybox:latest
 
 # Copy testrun.sh files into the container
 
 ADD	./testrun.sh       /tmp/
-ADD ./oldFile.txt 	   /	
+ADD ./oldFile.txt 	   /
+
+RUN mkdir -p /usr/local/bin
 RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh
 
 CMD ["testrun.sh"]
diff --git a/src/test/resources/travis-logback.xml b/src/test/resources/travis-logback.xml
index 250cbd335..06574e1a5 100644
--- a/src/test/resources/travis-logback.xml
+++ b/src/test/resources/travis-logback.xml
@@ -12,8 +12,8 @@
     <!--<logger name="org.apache.http.impl.conn" level="DEBUG"/>-->
 
 
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-    </root>
+    <!--<root level="error">-->
+        <!--<appender-ref ref="STDOUT" />-->
+    <!--</root>-->
 
 </configuration>

From 9e26d894c6c22150f81402b6679973abac7e95f6 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 11 Oct 2017 05:10:46 +0300
Subject: [PATCH 0759/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0a41f392..4ab76bd2a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,14 @@ Change Log
 - Swarm Mode support.
 - Classic swarm support.
  
+ 
+## 3.0.14
+- Encode spaces as %20 rather than + in URL params
+
+## 3.0.13
+- Fix .dockerignore handling on Windows
+- Include empty directories in build context
+ 
 ## 3.0.12
 - Make NettyDockerCmdExecFactory has compatibility both Linux and OSX automatically
 - Fix double encoding for netty.

From cd0fa9d7569e7f4fd5d03dec50ce10312dcffc59 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 11 Oct 2017 18:52:54 +0300
Subject: [PATCH 0760/1272] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6f5c3a689..c3dc39825 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+[![Join the chat at https://gitter.im/docker-java/docker-java](https://badges.gitter.im/docker-java/docker-java.svg)](https://gitter.im/docker-java/docker-java?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Maven Central](https://img.shields.io/maven-central/v/com.github.docker-java/docker-java.svg)](https://mvnrepository.com/artifact/com.github.docker-java/docker-java)
 [![Bintray](https://api.bintray.com/packages/kostyasha/maven/com.github.docker-java%3Adocker-java/images/download.svg)](https://bintray.com/kostyasha/maven/com.github.docker-java%3Adocker-java/_latestVersion) 
 [![Reference Status](https://www.versioneye.com/java/com.github.docker-java:docker-java/reference_badge.svg?style=flat)](https://www.versioneye.com/java/com.github.docker-java:docker-java/references)

From b1dbac692b7061b9f4946064bdb6d5ba2eda0e27 Mon Sep 17 00:00:00 2001
From: xuchenCN <chenxu198511@gmail.com>
Date: Tue, 17 Oct 2017 09:39:39 +0800
Subject: [PATCH 0761/1272] Getter of stats read

---
 src/main/java/com/github/dockerjava/api/model/Statistics.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/Statistics.java b/src/main/java/com/github/dockerjava/api/model/Statistics.java
index 6bb1930e1..5cbe1c02c 100644
--- a/src/main/java/com/github/dockerjava/api/model/Statistics.java
+++ b/src/main/java/com/github/dockerjava/api/model/Statistics.java
@@ -52,6 +52,10 @@ public class Statistics implements Serializable {
     @JsonProperty("precpu_stats")
     private Map<String, Object> preCpuStats;
 
+    public String getRead() {
+        return read;
+    }
+
     /**
      * @since Docker Remote API 1.21
      */

From 9f13cc5ca7506e4ab0f67a74445b878282595235 Mon Sep 17 00:00:00 2001
From: James Netherton <jamesnetherton@gmail.com>
Date: Fri, 20 Oct 2017 12:14:56 +0100
Subject: [PATCH 0762/1272] Fixes #922. Remove dependency on Jersey for
 SSLContext configuration

---
 .../core/LocalDirectorySSLConfig.java         | 33 +++++++++++++++----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
index 5e4a7fa57..006d89c6c 100644
--- a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
@@ -6,12 +6,15 @@
 import java.io.Serializable;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.security.Security;
 
+import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
 
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.glassfish.jersey.SslConfigurator;
 
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.core.util.CertificateUtils;
@@ -53,13 +56,20 @@ public SSLContext getSSLContext() {
                 String certpem = new String(Files.readAllBytes(Paths.get(certPemPath)));
                 String capem = new String(Files.readAllBytes(Paths.get(caPemPath)));
 
-                SslConfigurator sslConfig = SslConfigurator.newInstance(true);
-                sslConfig.securityProtocol("TLSv1.2");
-                sslConfig.keyStore(CertificateUtils.createKeyStore(keypem, certpem));
-                sslConfig.keyStorePassword("docker");
-                sslConfig.trustStore(CertificateUtils.createTrustStore(capem));
+                String kmfAlgorithm = AccessController.doPrivileged(getSystemProperty("ssl.keyManagerFactory.algorithm",
+                    KeyManagerFactory.getDefaultAlgorithm()));
+                KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(kmfAlgorithm);
+                keyManagerFactory.init(CertificateUtils.createKeyStore(keypem, certpem), "docker".toCharArray());
 
-                return sslConfig.createSSLContext();
+                String tmfAlgorithm = AccessController.doPrivileged(getSystemProperty("ssl.trustManagerFactory.algorithm",
+                    TrustManagerFactory.getDefaultAlgorithm()));
+                TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(tmfAlgorithm);
+                trustManagerFactory.init(CertificateUtils.createTrustStore(capem));
+
+                SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
+                sslContext.init(keyManagerFactory.getKeyManagers(), trustManagerFactory.getTrustManagers(), null);
+
+                return sslContext;
 
             } catch (Exception e) {
                 throw new DockerClientException(e.getMessage(), e);
@@ -71,6 +81,15 @@ public SSLContext getSSLContext() {
 
     }
 
+    private PrivilegedAction<String> getSystemProperty(final String name, final String def) {
+        return new PrivilegedAction<String>() {
+            @Override
+            public String run() {
+                return System.getProperty(name, def);
+            }
+        };
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {

From 8902e321fc072e58b7904a29f63744fb5d147d85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20B=C3=BCcklers?= <fbuecklers@gmail.com>
Date: Tue, 31 Oct 2017 21:57:53 +0100
Subject: [PATCH 0763/1272] fix errors in tests (#938)

* Improve PullImageCmd for pulling an image through docker swarm.

* fix errors in tests

* fix errors in pull tests will also fix #939

* Fix more concurrent test issues

* Some more swarm fixes

* Fix pull handling for swarm

* More fixes

* Suggest test code fixes

* Restore original pull/push expected exception logic
---
 .travis.yml                                   |   4 +-
 .../api/command/InspectImageResponse.java     |   3 +
 .../core/async/ResultCallbackTemplate.java    |  41 +++----
 .../core/command/PullImageResultCallback.java | 102 +++++++++++++++---
 .../core/command/PushImageResultCallback.java |  28 +++--
 .../dockerjava/netty/InvocationBuilder.java   |  29 +++--
 .../dockerjava/cmd/AttachContainerCmdIT.java  |   5 -
 .../github/dockerjava/cmd/CommitCmdIT.java    |  37 ++++---
 .../dockerjava/cmd/CreateContainerCmdIT.java  |  24 ++---
 .../github/dockerjava/cmd/LoadImageCmdIT.java |   5 +
 .../github/dockerjava/cmd/PullImageCmdIT.java |  14 +--
 .../github/dockerjava/cmd/PushImageCmdIT.java |  15 ++-
 .../dockerjava/cmd/StartContainerCmdIT.java   |  13 +--
 13 files changed, 202 insertions(+), 118 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 25cb64497..35ce5e286 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,9 +26,9 @@ env:
 #    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="17.09.0~ce-0~ubuntu-trusty"
 #    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="17.06.2~ce-0~ubuntu-trusty" DEPLOY=true COVERITY=true
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" DEPLOY=true COVERITY=true
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2377" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" SWARM_VERSION="1.2.6"
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2377" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" SWARM_VERSION="1.2.8"
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty"
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2377" DOCKER_VERSION="1.13.1-0~ubuntu-trusty" SWARM_VERSION="1.2.6"
+    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2377" DOCKER_VERSION="1.13.1-0~ubuntu-trusty" SWARM_VERSION="1.2.8"
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.13.1-0~ubuntu-trusty"
     - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.13.1-0~ubuntu-trusty"
     - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.12.6-0~ubuntu-trusty"
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
index 740a1b832..c1967e384 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
@@ -122,6 +122,7 @@ public InspectImageResponse withComment(String comment) {
     }
 
     /**
+     * Get the image commit configuration
      * @see #config
      */
     @CheckForNull
@@ -154,6 +155,8 @@ public InspectImageResponse withContainer(String container) {
     }
 
     /**
+     * If the image was created from a container, this config contains the configuration of the container
+     * which was committed in this image
      * @see #containerConfig
      */
     @CheckForNull
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index 2238dfcea..f624eccd3 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -3,19 +3,16 @@
  */
 package com.github.dockerjava.core.async;
 
+import com.github.dockerjava.api.async.ResultCallback;
+import com.google.common.base.Throwables;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.CheckForNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.async.ResultCallback;
-import com.google.common.base.Throwables;
-
 /**
  * Abstract template implementation of {@link ResultCallback}
  *
@@ -91,7 +88,7 @@ public void close() throws IOException {
     public RC_T awaitCompletion() throws InterruptedException {
         completed.await();
         // eventually (re)throws RuntimeException
-        getFirstError();
+        throwFirstError();
         return (RC_T) this;
     }
 
@@ -102,13 +99,14 @@ public RC_T awaitCompletion() throws InterruptedException {
      */
     public boolean awaitCompletion(long timeout, TimeUnit timeUnit) throws InterruptedException {
         boolean result = completed.await(timeout, timeUnit);
-        getFirstError();
+        throwFirstError();
         return result;
     }
 
     /**
-     * Blocks until {@link ResultCallback#onStart()} was called. {@link ResultCallback#onStart()} is called when the request was processed
-     * on the server side and the response is incoming.
+     * Blocks until {@link ResultCallback#onStart(Closeable)} was called.
+     * {@link ResultCallback#onStart(Closeable)} is called when the request was processed on the server
+     * side and the response is incoming.
      */
     @SuppressWarnings("unchecked")
     public RC_T awaitStarted() throws InterruptedException {
@@ -117,22 +115,25 @@ public RC_T awaitStarted() throws InterruptedException {
     }
 
     /**
-     * Blocks until {@link ResultCallback#onStart()} was called or the given timeout occurs. {@link ResultCallback#onStart()} is called when
-     * the request was processed on the server side and the response is incoming.
+     * Blocks until {@link ResultCallback#onStart(Closeable)} was called or the given timeout occurs.
+     * {@link ResultCallback#onStart(Closeable)} is called when the request was processed on the server side
+     * and the response is incoming.
      * @return {@code true} if started and {@code false} if the waiting time elapsed
-     *         before {@link ResultCallback#onStart()} was called.
+     *         before {@link ResultCallback#onStart(Closeable)} was called.
      */
     public boolean awaitStarted(long timeout, TimeUnit timeUnit) throws InterruptedException {
         return started.await(timeout, timeUnit);
     }
 
-    @CheckForNull
-    protected RuntimeException getFirstError() {
+    /**
+     * Throws the first occurred error as a runtime exception
+     * @throws com.github.dockerjava.api.exception.DockerException The first docker based Error
+     * @throws RuntimeException on any other occurred error
+     */
+    protected void throwFirstError() {
         if (firstError != null) {
             // this call throws a RuntimeException
-            return Throwables.propagate(firstError);
-        } else {
-            return null;
+            Throwables.propagate(firstError);
         }
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
index ce274dbe8..eb2c30679 100644
--- a/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
@@ -3,14 +3,16 @@
  */
 package com.github.dockerjava.core.command;
 
-import javax.annotation.CheckForNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.PullResponseItem;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.CheckForNull;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  *
@@ -21,18 +23,99 @@ public class PullImageResultCallback extends ResultCallbackTemplate<PullImageRes
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PullImageResultCallback.class);
 
+    private boolean isSwarm = false;
+    private Map<String, PullResponseItem> results = null;
+
     @CheckForNull
     private PullResponseItem latestItem = null;
 
     @Override
     public void onNext(PullResponseItem item) {
-        this.latestItem = item;
+        // only do it once
+        if (results == null && latestItem == null) {
+            checkForDockerSwarmResponse(item);
+        }
+
+        if (isSwarm) {
+            handleDockerSwarmResponse(item);
+        } else {
+            handleDockerClientResponse(item);
+        }
+
         LOGGER.debug(item.toString());
     }
 
+    private void checkForDockerSwarmResponse(PullResponseItem item) {
+        if (item.getStatus().matches("Pulling\\s.+\\.{3}$")) {
+            isSwarm = true;
+            LOGGER.debug("Communicating with Docker Swarm.");
+        }
+    }
+
+    private void handleDockerSwarmResponse(final PullResponseItem item) {
+        if (results == null) {
+            results = new HashMap<>();
+        }
+
+        // Swarm terminates a pull sometimes with an empty line.
+        // Therefore keep first success message
+        PullResponseItem currentItem = results.get(item.getId());
+        if (currentItem == null || !currentItem.isPullSuccessIndicated()) {
+            results.put(item.getId(), item);
+        }
+    }
+
+    private void handleDockerClientResponse(PullResponseItem item) {
+        latestItem = item;
+    }
+
+    private void checkDockerSwarmPullSuccessful() {
+        if (results.isEmpty()) {
+            throw new DockerClientException("Could not pull image through Docker Swarm");
+        } else {
+            boolean pullFailed = false;
+            StringBuilder sb = new StringBuilder();
+
+            for (PullResponseItem pullResponseItem : results.values()) {
+                if (!pullResponseItem.isPullSuccessIndicated()) {
+                    pullFailed = true;
+                    sb.append("[" + pullResponseItem.getId() + ":" + messageFromPullResult(pullResponseItem) + "]");
+                }
+            }
+
+            if (pullFailed) {
+                throw new DockerClientException("Could not pull image: " + sb.toString());
+            }
+        }
+    }
+
+    private void checkDockerClientPullSuccessful() {
+        if (latestItem == null) {
+            throw new DockerClientException("Could not pull image");
+        } else if (!latestItem.isPullSuccessIndicated()) {
+            throw new DockerClientException("Could not pull image: " + messageFromPullResult(latestItem));
+        }
+    }
+
+    private String messageFromPullResult(PullResponseItem pullResponseItem) {
+        return (pullResponseItem.getError() != null) ? pullResponseItem.getError() : pullResponseItem.getStatus();
+    }
+
+    @Override
+    protected void throwFirstError() {
+        super.throwFirstError();
+
+        if (isSwarm) {
+            checkDockerSwarmPullSuccessful();
+        } else {
+            checkDockerClientPullSuccessful();
+        }
+    }
+
     /**
      * Awaits the image to be pulled successful.
      *
+     * @deprecated use {@link #awaitCompletion()} or {@link #awaitCompletion(long, TimeUnit)} instead
      * @throws DockerClientException
      *             if the pull fails.
      */
@@ -42,12 +125,5 @@ public void awaitSuccess() {
         } catch (InterruptedException e) {
             throw new DockerClientException("", e);
         }
-
-        if (latestItem == null) {
-            throw new DockerClientException("Could not pull image");
-        } else if (!latestItem.isPullSuccessIndicated()) {
-            String message = (latestItem.getError() != null) ? latestItem.getError() : latestItem.getStatus();
-            throw new DockerClientException("Could not pull image: " + message);
-        }
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
index 55dfb5650..5bfec3bf1 100644
--- a/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
+++ b/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
@@ -3,14 +3,14 @@
  */
 package com.github.dockerjava.core.command;
 
-import javax.annotation.CheckForNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.PushResponseItem;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.CheckForNull;
+import java.util.concurrent.TimeUnit;
 
 /**
  *
@@ -30,9 +30,21 @@ public void onNext(PushResponseItem item) {
         LOGGER.debug(item.toString());
     }
 
+    @Override
+    protected void throwFirstError() {
+        super.throwFirstError();
+
+        if (latestItem == null) {
+            throw new DockerClientException("Could not push image");
+        } else if (latestItem.isErrorIndicated()) {
+            throw new DockerClientException("Could not push image: " + latestItem.getError());
+        }
+    }
+
     /**
      * Awaits the image to be pulled successful.
      *
+     * @deprecated use {@link #awaitCompletion()} or {@link #awaitCompletion(long, TimeUnit)} instead
      * @throws DockerClientException
      *             if the push fails.
      */
@@ -42,11 +54,5 @@ public void awaitSuccess() {
         } catch (InterruptedException e) {
             throw new DockerClientException("", e);
         }
-
-        if (latestItem == null) {
-            throw new DockerClientException("Could not push image");
-        } else if (latestItem.isErrorIndicated()) {
-            throw new DockerClientException("Could not push image: " + latestItem.getError());
-        }
     }
 }
diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
index 26b950e4e..9e67a1687 100644
--- a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
+++ b/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
@@ -1,5 +1,18 @@
 package com.github.dockerjava.netty;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.exception.DockerClientException;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
+import com.github.dockerjava.netty.handler.FramedResponseStreamHandler;
+import com.github.dockerjava.netty.handler.HttpConnectionHijackHandler;
+import com.github.dockerjava.netty.handler.HttpRequestProvider;
+import com.github.dockerjava.netty.handler.HttpResponseHandler;
+import com.github.dockerjava.netty.handler.HttpResponseStreamHandler;
+import com.github.dockerjava.netty.handler.JsonResponseCallbackHandler;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
@@ -29,20 +42,6 @@
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.exception.DockerClientException;
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.core.async.ResultCallbackTemplate;
-import com.github.dockerjava.netty.handler.FramedResponseStreamHandler;
-import com.github.dockerjava.netty.handler.HttpConnectionHijackHandler;
-import com.github.dockerjava.netty.handler.HttpRequestProvider;
-import com.github.dockerjava.netty.handler.HttpResponseHandler;
-import com.github.dockerjava.netty.handler.HttpResponseStreamHandler;
-import com.github.dockerjava.netty.handler.JsonResponseCallbackHandler;
-
 /**
  * This class is basically a replacement of javax.ws.rs.client.Invocation.Builder to allow simpler migration of JAX-RS code to a netty based
  * implementation.
@@ -122,7 +121,7 @@ public A_RES_T awaitResult() {
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
-            getFirstError();
+            throwFirstError();
             return result;
         }
     }
diff --git a/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
index 9a4dd0455..bac45f63f 100644
--- a/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
@@ -214,11 +214,6 @@ public void onNext(Frame item) {
             super.onNext(item);
         }
 
-        @Override
-        public RuntimeException getFirstError() {
-            return super.getFirstError();
-        }
-
         @Override
         public String toString() {
             return log.toString();
diff --git a/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java
index b4d1301ea..dd4a23b47 100644
--- a/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java
@@ -4,7 +4,7 @@
 import com.github.dockerjava.api.command.InspectImageResponse;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.core.RemoteApiVersion;
+import com.github.dockerjava.core.command.WaitContainerResultCallback;
 import com.google.common.collect.ImmutableMap;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -12,15 +12,12 @@
 
 import java.util.Map;
 
-import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
 import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
-import static com.github.dockerjava.utils.TestUtils.getVersion;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.iterableWithSize;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.startsWith;
 import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
@@ -30,9 +27,7 @@ public class CommitCmdIT extends CmdIT {
     public static final Logger LOG = LoggerFactory.getLogger(CommitCmdIT.class);
 
     @Test
-    public void commit() throws DockerException {
-        assumeNotSwarm("", dockerRule);
-
+    public void commit() throws DockerException, InterruptedException {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withCmd("touch", "/test")
                 .exec();
@@ -44,6 +39,11 @@ public void commit() throws DockerException {
         LOG.info("Committing container: {}", container.toString());
         String imageId = dockerRule.getClient().commitCmd(container.getId()).exec();
 
+        //swarm needs some time to reflect new images
+        synchronized (this) {
+            wait(5000);
+        }
+
         InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec();
         LOG.info("Image Inspect: {}", inspectImageResponse.toString());
 
@@ -66,6 +66,12 @@ public void commitWithLabels() throws DockerException {
         assertThat(container.getId(), not(isEmptyString()));
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
+        Integer status = dockerRule.getClient().waitContainerCmd(container.getId())
+                .exec(new WaitContainerResultCallback())
+                .awaitStatusCode();
+
+        assertThat(status, is(0));
+
         LOG.info("Committing container: {}", container.toString());
         Map<String, String> labels = ImmutableMap.of("label1", "abc", "label2", "123");
         String imageId = dockerRule.getClient().commitCmd(container.getId())
@@ -75,13 +81,14 @@ public void commitWithLabels() throws DockerException {
         InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec();
         LOG.info("Image Inspect: {}", inspectImageResponse.toString());
 
-        // docker bug?
-        if (!getVersion(dockerRule.getClient()).isGreaterOrEqual(RemoteApiVersion.VERSION_1_24)) {
-            Map<String, String> responseLabels = inspectImageResponse.getContainerConfig().getLabels();
-            assertThat(responseLabels.size(), is(2));
-            assertThat(responseLabels.get("label1"), equalTo("abc"));
-            assertThat(responseLabels.get("label2"), equalTo("123"));
-        }
+        //use config here since containerConfig contains the configuration of the container which was
+        //committed to the container
+        //https://stackoverflow.com/questions/36216220/what-is-different-of-config-and-containerconfig-of-docker-inspect
+        Map<String, String> responseLabels = inspectImageResponse.getConfig().getLabels();
+        //swarm will attach additional labels here
+        assertThat(responseLabels.size(), greaterThanOrEqualTo(2));
+        assertThat(responseLabels.get("label1"), equalTo("abc"));
+        assertThat(responseLabels.get("label2"), equalTo("123"));
     }
 
     @Test(expected = NotFoundException.class)
diff --git a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index 6073e1506..c6905ef5e 100644
--- a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -43,7 +43,6 @@
 import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_23;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24;
-import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
 import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
 import static com.github.dockerjava.junit.DockerMatchers.mountedVolumes;
 import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
@@ -285,13 +284,13 @@ public void createContainerWithLink() throws DockerException {
 
     @Test
     public void createContainerWithLinkInCustomNetwork() throws DockerException {
-        assumeNotSwarm("no network in swarm", dockerRule);
         String containerName1 = "containerCustomlink_" + dockerRule.getKind();
         String containerName2 = "containerCustom2link_" + dockerRule.getKind();
         String networkName = "linkNetcustom" + dockerRule.getKind();
 
         CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd()
                 .withName(networkName)
+                .withDriver("bridge")
                 .exec();
 
         assertNotNull(createNetworkResponse.getId());
@@ -331,8 +330,6 @@ public void createContainerWithLinkInCustomNetwork() throws DockerException {
 
     @Test
     public void createContainerWithCustomIp() throws DockerException {
-        assumeNotSwarm("Swarm has no network", dockerRule);
-
         String containerName1 = "containerCustomIplink_" + dockerRule.getKind();
         String networkName = "customIpNet" + dockerRule.getKind();
         String subnetPrefix = getFactoryType() == JERSEY ? "10.100.104" : "10.100.105";
@@ -341,6 +338,7 @@ public void createContainerWithCustomIp() throws DockerException {
                 .withIpam(new Network.Ipam()
                         .withConfig(new Network.Ipam.Config()
                                 .withSubnet(subnetPrefix + ".0/24")))
+                .withDriver("bridge")
                 .withName(networkName)
                 .exec();
 
@@ -369,13 +367,12 @@ public void createContainerWithCustomIp() throws DockerException {
 
     @Test
     public void createContainerWithAlias() throws DockerException {
-        assumeNotSwarm("Swarm has no network", dockerRule);
-
         String containerName1 = "containerAlias_" + dockerRule.getKind();
         String networkName = "aliasNet" + dockerRule.getKind();
 
         CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd()
                 .withName(networkName)
+                .withDriver("bridge")
                 .exec();
 
         assertNotNull(createNetworkResponse.getId());
@@ -488,14 +485,15 @@ public void createContainerWithDevices() throws DockerException {
 
     @Test
     public void createContainerWithPortBindings() throws DockerException {
+        int baseport = getFactoryType() == FactoryType.JERSEY? 11000: 12000;
 
         ExposedPort tcp22 = ExposedPort.tcp(22);
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Binding.bindPort(11022));
-        portBindings.bind(tcp23, Binding.bindPort(11023));
-        portBindings.bind(tcp23, Binding.bindPort(11024));
+        portBindings.bind(tcp22, Binding.bindPort(baseport + 22));
+        portBindings.bind(tcp23, Binding.bindPort(baseport + 23));
+        portBindings.bind(tcp23, Binding.bindPort(baseport + 24));
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
@@ -509,13 +507,13 @@ public void createContainerWithPortBindings() throws DockerException {
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
-                is(equalTo(Binding.bindPort(11022))));
+                is(equalTo(Binding.bindPort(baseport + 22))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
-                is(equalTo(Binding.bindPort(11023))));
+                is(equalTo(Binding.bindPort(baseport + 23))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
-                is(equalTo(Binding.bindPort(11024))));
+                is(equalTo(Binding.bindPort(baseport + 24))));
 
     }
 
@@ -524,8 +522,6 @@ public void createContainerWithLinking() throws DockerException {
         String containerName1 = "containerWithlinking_" + dockerRule.getKind();
         String containerName2 = "container2Withlinking_" + dockerRule.getKind();
 
-
-
         CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withCmd("sleep", "9999")
                 .withName(containerName1).exec();
diff --git a/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java b/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java
index 22cb59d64..1660773c3 100644
--- a/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java
@@ -41,6 +41,11 @@ public void loadImageFromTar() throws Exception {
             dockerRule.getClient().loadImageCmd(uploadStream).exec();
         }
 
+        //swarm needs some time to refelct new images
+        synchronized (this) {
+            wait(5000);
+        }
+
         final Image image = findImageWithId(expectedImageId, dockerRule.getClient().listImagesCmd().exec());
 
         assertThat("Can't find expected image after loading from a tar archive!", image, notNullValue());
diff --git a/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java b/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
index 584ff233c..05dd431e8 100644
--- a/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
@@ -19,6 +19,7 @@
 import java.util.concurrent.TimeUnit;
 
 import static com.github.dockerjava.utils.TestUtils.getVersion;
+import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.lessThanOrEqualTo;
 import static org.hamcrest.Matchers.notNullValue;
@@ -80,7 +81,9 @@ public void testPullImage() throws Exception {
 
         LOG.info("Pulling image: {}", testImage);
 
-        dockerRule.getClient().pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess();
+        dockerRule.getClient().pullImageCmd(testImage)
+                .exec(new PullImageResultCallback())
+                .awaitCompletion(30, TimeUnit.SECONDS);
 
         info = dockerRule.getClient().infoCmd().exec();
         LOG.info("Client info after pull, {}", info.toString());
@@ -92,15 +95,9 @@ public void testPullImage() throws Exception {
         assertThat(inspectImageResponse, notNullValue());
     }
 
-
-
     @Test
     public void testPullNonExistingImage() throws Exception {
-        // does not throw an exception
-
-        if (getVersion(dockerRule.getClient()).equals(RemoteApiVersion.VERSION_1_24)) {
-            // 1.24 - no exception
-        } else if (getVersion(dockerRule.getClient())
+        if (isNotSwarm(dockerRule.getClient()) && getVersion(dockerRule.getClient())
                 .isGreaterOrEqual(RemoteApiVersion.VERSION_1_26)) {
             exception.expect(NotFoundException.class);
         } else {
@@ -112,5 +109,4 @@ public void testPullNonExistingImage() throws Exception {
                 .exec(new PullImageResultCallback())
                 .awaitCompletion(30, TimeUnit.SECONDS);
     }
-
 }
diff --git a/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java b/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
index 37d0b0575..7bad7b403 100644
--- a/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
@@ -18,6 +18,7 @@
 import java.util.concurrent.TimeUnit;
 
 import static com.github.dockerjava.utils.TestUtils.getVersion;
+import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
@@ -50,21 +51,20 @@ public void pushLatest() throws Exception {
         String imageId = dockerRule.getClient().commitCmd(container.getId()).withRepository(username + "/busybox").exec();
 
         // we have to block until image is pushed
-        dockerRule.getClient().pushImageCmd(username + "/busybox").exec(new PushImageResultCallback()).awaitSuccess();
+        dockerRule.getClient().pushImageCmd(username + "/busybox").exec(new PushImageResultCallback())
+                .awaitCompletion(30, TimeUnit.SECONDS);
 
         LOG.info("Removing image: {}", imageId);
         dockerRule.getClient().removeImageCmd(imageId).exec();
 
-        dockerRule.getClient().pullImageCmd(username + "/busybox").exec(new PullImageResultCallback()).awaitSuccess();
+        dockerRule.getClient().pullImageCmd(username + "/busybox").exec(new PullImageResultCallback())
+                .awaitCompletion(30, TimeUnit.SECONDS);
     }
 
     @Test
     public void pushNonExistentImage() throws Exception {
 
-        if (getVersion(dockerRule.getClient())
-                .isGreaterOrEqual(RemoteApiVersion.VERSION_1_26)) {
-         // no errors??
-        } else if (getVersion(dockerRule.getClient())
+        if (isNotSwarm(dockerRule.getClient()) && getVersion(dockerRule.getClient())
                 .isGreaterOrEqual(RemoteApiVersion.VERSION_1_24)) {
             exception.expect(DockerClientException.class);
         } else {
@@ -73,8 +73,7 @@ public void pushNonExistentImage() throws Exception {
 
         dockerRule.getClient().pushImageCmd(username + "/xxx")
                 .exec(new PushImageResultCallback())
-                .awaitCompletion(20, TimeUnit.SECONDS); // exclude infinite await sleep
+                .awaitCompletion(30, TimeUnit.SECONDS); // exclude infinite await sleep
 
     }
-
 }
diff --git a/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
index 7dd965411..f55e43247 100644
--- a/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
@@ -163,14 +163,15 @@ public void startContainerWithDnsSearch() throws DockerException {
 
     @Test
     public void startContainerWithPortBindings() throws DockerException {
+        int baseport = getFactoryType() == FactoryType.JERSEY? 13000: 14000;
 
         ExposedPort tcp22 = ExposedPort.tcp(22);
         ExposedPort tcp23 = ExposedPort.tcp(23);
 
         Ports portBindings = new Ports();
-        portBindings.bind(tcp22, Binding.bindPort(11022));
-        portBindings.bind(tcp23, Binding.bindPort(11023));
-        portBindings.bind(tcp23, Binding.bindPort(11024));
+        portBindings.bind(tcp22, Binding.bindPort(baseport + 22));
+        portBindings.bind(tcp23, Binding.bindPort(baseport + 23));
+        portBindings.bind(tcp23, Binding.bindPort(baseport + 24));
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
@@ -188,13 +189,13 @@ public void startContainerWithPortBindings() throws DockerException {
         assertThat(Arrays.asList(inspectContainerResponse.getConfig().getExposedPorts()), contains(tcp22, tcp23));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp22)[0],
-                is(equalTo(Binding.bindPort(11022))));
+                is(equalTo(Binding.bindPort(baseport + 22))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[0],
-                is(equalTo(Binding.bindPort(11023))));
+                is(equalTo(Binding.bindPort(baseport + 23))));
 
         assertThat(inspectContainerResponse.getHostConfig().getPortBindings().getBindings().get(tcp23)[1],
-                is(equalTo(Binding.bindPort(11024))));
+                is(equalTo(Binding.bindPort(baseport + 24))));
 
     }
 

From dd9f01d646b2340d4a87522d19a9c5cccec0400c Mon Sep 17 00:00:00 2001
From: fb <fb@baqend.com>
Date: Tue, 24 Nov 2015 17:35:46 +0100
Subject: [PATCH 0764/1272] Implement the swarm-classic node property in
 inspect container response and add test cases for it

---
 .travis/travis-before-install.sh              |  1 +
 .../api/command/InspectContainerResponse.java | 85 +++++++++++++++++--
 .../github/dockerjava/cmd/EventsCmdIT.java    | 45 ++++++----
 .../dockerjava/cmd/InspectContainerCmdIT.java | 42 +++++++++
 4 files changed, 148 insertions(+), 25 deletions(-)

diff --git a/.travis/travis-before-install.sh b/.travis/travis-before-install.sh
index faf9be478..e86654511 100755
--- a/.travis/travis-before-install.sh
+++ b/.travis/travis-before-install.sh
@@ -61,6 +61,7 @@ DOCKER_OPTS="\
 -D \
 -H=unix:///var/run/docker.sock \
 -H=tcp://0.0.0.0:${HOST_PORT}  \
+--label=com.github.dockerjava.test=docker-java \
 "
 EOF
 
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index cf6d8067a..7e60b0be3 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -1,13 +1,5 @@
 package com.github.dockerjava.api.command;
 
-import java.util.List;
-
-import javax.annotation.CheckForNull;
-
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -20,8 +12,15 @@
 import com.github.dockerjava.api.model.VolumeRW;
 import com.github.dockerjava.api.model.VolumesRW;
 import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 
+import javax.annotation.CheckForNull;
+import java.util.List;
+import java.util.Map;
+
 /**
  *
  * @author Konstantin Pelykh (kpelykh@gmail.com)
@@ -105,6 +104,9 @@ public class InspectContainerResponse {
     @JsonProperty("VolumesRW")
     private VolumesRW volumesRW;
 
+    @JsonProperty("Node")
+    private Node node;
+
     @JsonProperty("Mounts")
     private List<Mount> mounts;
 
@@ -216,6 +218,15 @@ public List<String> getExecIds() {
         return execIds;
     }
 
+    /**
+     * Get the underlying swarm node info. This property does only contains a value in swarm-classic
+     * @return The underlying swarm-classic node info
+     * @CheckForNull
+     */
+    public Node getNode() {
+        return node;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
@@ -556,4 +567,62 @@ public int hashCode() {
             return HashCodeBuilder.reflectionHashCode(this);
         }
     }
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public class Node {
+
+        @JsonProperty("ID")
+        private String id;
+
+        @JsonProperty("IP")
+        private String ip;
+
+        @JsonProperty("Addr")
+        private String addr;
+
+        @JsonProperty("Name")
+        private String name;
+
+        @JsonProperty("Cpus")
+        private Integer cpus;
+
+        @JsonProperty("Memory")
+        private Long memory;
+
+        @JsonProperty("Labels")
+        private Map<String, String> labels;
+
+        public String getId() {
+            return id;
+        }
+
+        public String getIp() {
+            return ip;
+        }
+
+        public String getAddr() {
+            return addr;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public Integer getCpus() {
+            return cpus;
+        }
+
+        public Long getMemory() {
+            return memory;
+        }
+
+        public Map<String, String> getLabels() {
+            return labels;
+        }
+
+        @Override
+        public String toString() {
+            return ToStringBuilder.reflectionToString(this);
+        }
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java b/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java
index 3ae1c45dc..c40fa6d31 100644
--- a/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java
@@ -4,6 +4,7 @@
 import com.github.dockerjava.api.model.Event;
 import com.github.dockerjava.core.command.EventsResultCallback;
 import com.github.dockerjava.core.command.PullImageResultCallback;
+import com.github.dockerjava.utils.TestUtils;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,6 +16,8 @@
 
 import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 
@@ -32,11 +35,10 @@ private static String getEpochTime() {
 
     @Test
     public void testEventStreamTimeBound() throws Exception {
+        //since until and filtering events is broken in swarm
+        //https://github.com/docker/swarm/issues/1203
         assumeNotSwarm("", dockerRule);
 
-        // Don't include other tests events
-        TimeUnit.SECONDS.sleep(1);
-
         String startTime = getEpochTime();
         int expectedEvents = generateEvents();
         String endTime = getEpochTime();
@@ -48,7 +50,7 @@ public void testEventStreamTimeBound() throws Exception {
                 .withUntil(endTime)
                 .exec(eventCallback);
 
-        List<Event> events = eventCallback.awaitExpectedEvents(3, TimeUnit.MINUTES);
+        List<Event> events = eventCallback.awaitExpectedEvents(30, TimeUnit.SECONDS);
 
         // we may receive more events as expected
         assertTrue("Received events: " + events, events.size() >= expectedEvents);
@@ -56,12 +58,8 @@ public void testEventStreamTimeBound() throws Exception {
 
     @Test
     public void testEventStreaming() throws Exception {
-        assumeNotSwarm("", dockerRule);
-
-        // Don't include other tests events
-        TimeUnit.SECONDS.sleep(1);
-
         String startTime = getEpochTime();
+
         int expectedEvents = generateEvents();
 
         EventsTestCallback eventCallback = new EventsTestCallback(expectedEvents);
@@ -72,19 +70,30 @@ public void testEventStreaming() throws Exception {
 
         generateEvents();
 
-        List<Event> events = eventCallback.awaitExpectedEvents(3, TimeUnit.MINUTES);
+        List<Event> events = eventCallback.awaitExpectedEvents(30, TimeUnit.SECONDS);
 
         // we may receive more events as expected
         assertTrue("Received events: " + events, events.size() >= expectedEvents);
-    }
 
+        for (Event event : events) {
+            if (TestUtils.isSwarm(dockerRule.getClient())) {
+                assertThat(event.getNode(), is(notNullValue()));
+                assertThat(event.getNode().getAddr(), is(notNullValue()));
+                assertThat(event.getNode().getId(), is(notNullValue()));
+                assertThat(event.getNode().getIp(), is(notNullValue()));
+                assertThat(event.getNode().getName(), is(notNullValue()));
+            } else {
+                assertThat(event.getNode(), is(nullValue()));
+            }
+        }
+    }
 
+    @Test
     public void testEventStreamingWithFilter() throws Exception {
+        //since until and filtering events is broken in swarm
+        //https://github.com/docker/swarm/issues/1203
         assumeNotSwarm("", dockerRule);
 
-        // Don't include other tests events
-        TimeUnit.SECONDS.sleep(1);
-
         String startTime = getEpochTime();
         int expectedEvents = 1;
 
@@ -97,10 +106,12 @@ public void testEventStreamingWithFilter() throws Exception {
 
         generateEvents();
 
-        List<Event> events = eventCallback.awaitExpectedEvents(3, TimeUnit.MINUTES);
+        List<Event> events = eventCallback.awaitExpectedEvents(30, TimeUnit.SECONDS);
 
-        // we should get exactly one "start" event here
-        assertThat("Received events: " + events, events.size(), is(expectedEvents));
+        // we should only get "start" events here
+        for (Event event : events) {
+            assertThat("Received event: " + event, event.getAction(), is("start"));
+        }
     }
 
     /**
diff --git a/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
index 7b108c8a6..75649bf2b 100644
--- a/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
@@ -5,17 +5,26 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.Container;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.security.SecureRandom;
+import java.util.Collections;
+import java.util.Map;
+import java.util.UUID;
 
 import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
+import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -40,6 +49,39 @@ public void inspectContainer() throws DockerException {
 
     }
 
+    @Test
+    public void inspectContainerNodeProperty() throws DockerException {
+        Map<String, String> label = Collections.singletonMap("inspectContainerNodeProperty", UUID.randomUUID().toString());
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+                .withLabels(label)
+                .exec();
+
+        Container containerResult = dockerRule.getClient().listContainersCmd()
+                .withShowAll(true)
+                .withLabelFilter(label)
+                .exec()
+                .get(0);
+
+        String name = containerResult.getNames()[0];
+
+        InspectContainerResponse containerInfo = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+
+        InspectContainerResponse.Node node = containerInfo.getNode();
+        if (isSwarm(dockerRule.getClient())) {
+            assertThat(node, is(notNullValue()));
+            assertThat(node.getAddr(), is(notNullValue()));
+            assertThat(node.getId(), is(notNullValue()));
+            assertThat(node.getIp(), is(notNullValue()));
+            assertThat(node.getLabels(), is(notNullValue()));
+            assertThat(node.getLabels().get("com.github.dockerjava.test"), is("docker-java"));
+            assertThat(node.getCpus(), is(greaterThanOrEqualTo(1)));
+            assertThat(node.getMemory(), is(greaterThanOrEqualTo(64 * 1024 * 1024L)));
+            assertThat("/" + node.getName() + containerInfo.getName(), is(name));
+        } else {
+            assertThat(node, is(nullValue()));
+        }
+    }
+
     @Test()
     public void inspectContainerWithSize() throws DockerException {
 

From 4fd7b8a2ebdbac7f2c65ae02cc4ae6e7ba57992c Mon Sep 17 00:00:00 2001
From: fb <fb@baqend.com>
Date: Sun, 16 Oct 2016 21:54:49 +0200
Subject: [PATCH 0765/1272] implement new docker config file format for
 authentication add auth option to create image command

---
 .../api/command/CreateContainerCmd.java       |   5 +
 .../dockerjava/core/AuthConfigFile.java       | 210 ------------------
 .../core/DefaultDockerClientConfig.java       | 108 +++------
 .../dockerjava/core/DockerClientImpl.java     |   3 +-
 .../dockerjava/core/DockerConfigFile.java     | 209 +++++++++++++++++
 .../core/command/CreateContainerCmdImpl.java  |  20 +-
 .../jaxrs/CreateContainerCmdExec.java         |  25 ++-
 .../core/DefaultDockerClientConfigTest.java   |   2 +-
 ...ileTest.java => DockerConfigFileTest.java} |  49 ++--
 .../{emptyFile => emptyFile/.dockercfg}       |   0
 .../.dockercfg}                               |   0
 .../.dockercfg}                               |   0
 .../.dockercfg}                               |   0
 .../.dockercfg}                               |   0
 .../{tooSmallFile => tooSmallFile/.dockercfg} |   0
 .../validDockerConfig/config.json             |  12 +
 .../testAuthConfigFile/validJson/.dockercfg   |   1 +
 .../{validLegacy => validLegacy/.dockercfg}   |   0
 18 files changed, 338 insertions(+), 306 deletions(-)
 delete mode 100644 src/main/java/com/github/dockerjava/core/AuthConfigFile.java
 create mode 100644 src/main/java/com/github/dockerjava/core/DockerConfigFile.java
 rename src/test/java/com/github/dockerjava/core/{AuthConfigFileTest.java => DockerConfigFileTest.java} (68%)
 rename src/test/resources/testAuthConfigFile/{emptyFile => emptyFile/.dockercfg} (100%)
 rename src/test/resources/testAuthConfigFile/{invalidJsonInvalidAuth => invalidJsonInvalidAuth/.dockercfg} (100%)
 rename src/test/resources/testAuthConfigFile/{invalidLegacyAuthLine => invalidLegacyAuthLine/.dockercfg} (100%)
 rename src/test/resources/testAuthConfigFile/{invalidLegacyEmailLine => invalidLegacyEmailLine/.dockercfg} (100%)
 rename src/test/resources/testAuthConfigFile/{invalidLegacyInvalidAuth => invalidLegacyInvalidAuth/.dockercfg} (100%)
 rename src/test/resources/testAuthConfigFile/{tooSmallFile => tooSmallFile/.dockercfg} (100%)
 create mode 100644 src/test/resources/testAuthConfigFile/validDockerConfig/config.json
 create mode 100644 src/test/resources/testAuthConfigFile/validJson/.dockercfg
 rename src/test/resources/testAuthConfigFile/{validLegacy => validLegacy/.dockercfg} (100%)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 77bf100ac..0b1c62229 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -2,6 +2,7 @@
 
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Capability;
 import com.github.dockerjava.api.model.Device;
@@ -23,6 +24,8 @@
 
 public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerResponse> {
 
+    AuthConfig getAuthConfig();
+
     @CheckForNull
     List<String> getAliases();
 
@@ -197,6 +200,8 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     Boolean isTty();
 
+    CreateContainerCmd withAuthConfig(AuthConfig authConfig);
+
     /**
      * Add network-scoped alias for the container
      * @param aliases on ore more aliases
diff --git a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java b/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
deleted file mode 100644
index 2ecb34c2e..000000000
--- a/src/main/java/com/github/dockerjava/core/AuthConfigFile.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package com.github.dockerjava.core;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.github.dockerjava.api.model.AuthConfig;
-import com.github.dockerjava.api.model.AuthConfigurations;
-
-public class AuthConfigFile {
-    private static final ObjectMapper MAPPER = new ObjectMapper();
-
-    private static final TypeReference<Map<String, AuthConfig>> CONFIG_CFG_MAP_TYPE =
-        new TypeReference<Map<String, AuthConfig>>() {
-        };
-
-    private static final TypeReference<Map<String, Map<String, AuthConfig>>> CONFIG_JSON_MAP_TYPE =
-        new TypeReference<Map<String, Map<String, AuthConfig>>>() {
-        };
-    private static final String AUTHS_PROPERTY = "auths";
-
-    private final Map<String, AuthConfig> authConfigMap;
-
-    public AuthConfigFile() {
-        authConfigMap = new HashMap<>();
-    }
-
-    void addConfig(AuthConfig config) {
-        authConfigMap.put(config.getRegistryAddress(), config);
-    }
-
-    public AuthConfig resolveAuthConfig(String hostname) {
-        if (StringUtils.isEmpty(hostname) || AuthConfig.DEFAULT_SERVER_ADDRESS.equals(hostname)) {
-            return authConfigMap.get(AuthConfig.DEFAULT_SERVER_ADDRESS);
-        }
-        AuthConfig c = authConfigMap.get(hostname);
-        if (c != null) {
-            return c;
-        }
-
-        // Maybe they have a legacy config file, we will iterate the keys converting
-        // them to the new format and testing
-        String normalizedHostname = convertToHostname(hostname);
-        for (Map.Entry<String, AuthConfig> entry : authConfigMap.entrySet()) {
-            String registry = entry.getKey();
-            AuthConfig config = entry.getValue();
-            if (convertToHostname(registry).equals(normalizedHostname)) {
-                return config;
-            }
-        }
-        return null;
-    }
-
-    public AuthConfigurations getAuthConfigurations() {
-        final AuthConfigurations authConfigurations = new AuthConfigurations();
-        for (Map.Entry<String, AuthConfig> authConfigEntry : authConfigMap.entrySet()) {
-            authConfigurations.addConfig(authConfigEntry.getValue());
-        }
-
-        return authConfigurations;
-    }
-
-    // CHECKSTYLE:OFF
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((authConfigMap == null) ? 0 : authConfigMap.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        AuthConfigFile other = (AuthConfigFile) obj;
-        if (authConfigMap == null) {
-            if (other.authConfigMap != null)
-                return false;
-        } else if (!authConfigMap.equals(other.authConfigMap))
-            return false;
-        return true;
-    }
-
-    // CHECKSTYLE:ON
-
-    @Override
-    public String toString() {
-        return "AuthConfigFile [authConfigMap=" + authConfigMap + "]";
-    }
-
-    public static AuthConfigFile loadConfig(File confFile) throws IOException {
-        AuthConfigFile configFile = new AuthConfigFile();
-        if (!confFile.exists()) {
-            return new AuthConfigFile();
-        }
-
-        Map<String, AuthConfig> configMap = null;
-        if (isJSONFile(confFile)) {
-            /*
-            Registry v2 expects config expects config.json while v2 expects .dockercfg
-            The only difference between them is that config.json wraps "auths" around the AuthConfig
-             */
-            try {
-                // try registry version 2
-                final ObjectNode node = filterNonAuthsFromJSON(confFile);
-                Map<String, Map<String, AuthConfig>> configJson = MAPPER.convertValue(node, CONFIG_JSON_MAP_TYPE);
-                if (configJson != null && !configJson.isEmpty()) {
-                    configMap = configJson.get(AUTHS_PROPERTY);
-                }
-
-            } catch (IOException e1) {
-                try {
-                    // try registry version 1
-                    configMap = MAPPER.readValue(confFile, CONFIG_CFG_MAP_TYPE);
-                } catch (IOException e2) {
-                    // we know it is JSON so it does not make sense to check for the old format
-                    // probably Docker writes some unstructured contents here, see #806
-                    // at least it is not worse than the totally absent file
-                    return new AuthConfigFile();
-                }
-            }
-        }
-
-        if (configMap != null) {
-            for (Map.Entry<String, AuthConfig> entry : configMap.entrySet()) {
-                AuthConfig authConfig = entry.getValue();
-                final String auth = authConfig.getAuth();
-                if (auth == null) continue;
-
-                decodeAuth(auth, authConfig);
-                authConfig.withAuth(null);
-                authConfig.withRegistryAddress(entry.getKey());
-                configFile.addConfig(authConfig);
-            }
-        } else {
-            List<String> authFileContent = FileUtils.readLines(confFile);
-            if (authFileContent.size() < 2) {
-                throw new IOException("The Auth Config file is empty");
-            }
-            AuthConfig config = new AuthConfig();
-            String[] origAuth = authFileContent.get(0).split(" = ");
-            if (origAuth.length != 2) {
-                throw new IOException("Invalid Auth config file");
-            }
-            decodeAuth(origAuth[1], config);
-
-            String[] origEmail = authFileContent.get(1).split(" = ");
-            if (origEmail.length != 2) {
-                throw new IOException("Invalid Auth config file");
-            }
-            config.withEmail(origEmail[1]);
-            configFile.addConfig(config);
-        }
-        return configFile;
-
-    }
-
-    private static boolean isJSONFile(final File confFile) {
-        try {
-            return MAPPER.readValue(confFile, ObjectNode.class) != null;
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
-    private static ObjectNode filterNonAuthsFromJSON(final File confFile) throws IOException {
-        final ObjectNode node = MAPPER.readValue(confFile, ObjectNode.class);
-        if (!node.has(AUTHS_PROPERTY)) {
-            throw new IOException("No Auth Config contained");
-        }
-        node.retain(AUTHS_PROPERTY);
-        return node;
-    }
-
-    static void decodeAuth(String auth, AuthConfig config) throws IOException {
-        String str = new String(Base64.decodeBase64(auth), Charset.forName("UTF-8"));
-        String[] parts = str.split(":", 2);
-        if (parts.length != 2) {
-            throw new IOException("Invalid auth configuration file");
-        }
-        config.withUsername(parts[0]);
-        config.withPassword(parts[1]);
-    }
-
-    static String convertToHostname(String server) {
-        String stripped = server;
-        if (server.startsWith("http://")) {
-            stripped = server.substring(7);
-        } else if (server.startsWith("https://")) {
-            stripped = server.substring(8);
-        }
-        String[] numParts = stripped.split("/", 2);
-        return numParts[0];
-    }
-}
diff --git a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index 5857227ae..8517d89a9 100644
--- a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -1,7 +1,15 @@
 package com.github.dockerjava.core;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.apache.commons.lang.BooleanUtils.isTrue;
+import com.github.dockerjava.api.exception.DockerClientException;
+import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.AuthConfigurations;
+import com.github.dockerjava.core.NameParser.HostnameReposName;
+import com.github.dockerjava.core.NameParser.ReposTag;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -9,25 +17,13 @@
 import java.io.InputStream;
 import java.io.Serializable;
 import java.net.URI;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
-import com.github.dockerjava.api.exception.DockerClientException;
-import com.github.dockerjava.api.model.AuthConfig;
-import com.github.dockerjava.api.model.AuthConfigurations;
-import com.github.dockerjava.core.NameParser.HostnameReposName;
-import com.github.dockerjava.core.NameParser.ReposTag;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.commons.lang.BooleanUtils.isTrue;
 
 /**
  * Respects some of the docker CLI options. See https://docs.docker.com/engine/reference/commandline/cli/#environment-variables
@@ -56,10 +52,6 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf
 
     private static final String DOCKER_JAVA_PROPERTIES = "docker-java.properties";
 
-    private static final String DOCKER_CFG = ".dockercfg";
-
-    private static final String CONFIG_JSON = "config.json";
-
     private static final Set<String> CONFIG_KEYS = new HashSet<String>();
 
     static {
@@ -76,16 +68,18 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf
 
     private final URI dockerHost;
 
-    private final String registryUsername, registryPassword, registryEmail, registryUrl, dockerConfig;
+    private final String registryUsername, registryPassword, registryEmail, registryUrl, dockerConfigPath;
 
     private final SSLConfig sslConfig;
 
     private final RemoteApiVersion apiVersion;
 
-    DefaultDockerClientConfig(URI dockerHost, String dockerConfig, String apiVersion, String registryUrl,
+    private DockerConfigFile dockerConfig = null;
+
+    DefaultDockerClientConfig(URI dockerHost, String dockerConfigPath, String apiVersion, String registryUrl,
             String registryUsername, String registryPassword, String registryEmail, SSLConfig sslConfig) {
         this.dockerHost = checkDockerHostScheme(dockerHost);
-        this.dockerConfig = dockerConfig;
+        this.dockerConfigPath = dockerConfigPath;
         this.apiVersion = RemoteApiVersion.parseConfigWithDefault(apiVersion);
         this.sslConfig = sslConfig;
         this.registryUsername = registryUsername;
@@ -237,7 +231,18 @@ public String getRegistryUrl() {
         return registryUrl;
     }
 
-    public String getDockerConfig() {
+    public String getDockerConfigPath() {
+        return dockerConfigPath;
+    }
+
+    public DockerConfigFile getDockerConfig() {
+        if (dockerConfig == null) {
+            try {
+                dockerConfig = DockerConfigFile.loadConfig(new File(getDockerConfigPath()));
+            } catch (IOException e) {
+                throw new DockerClientException("Failed to parse docker configuration file", e);
+            }
+        }
         return dockerConfig;
     }
 
@@ -256,62 +261,23 @@ && getRegistryUrl() != null) {
 
     @Override
     public AuthConfig effectiveAuthConfig(String imageName) {
-        AuthConfig authConfig = null;
-
-        File dockerCfgFile = getDockerConfigFile();
+        AuthConfig authConfig = getAuthConfig();
 
-        if (dockerCfgFile != null) {
-            AuthConfigFile authConfigFile;
-            try {
-                authConfigFile = AuthConfigFile.loadConfig(dockerCfgFile);
-            } catch (IOException e) {
-                throw new DockerClientException("Failed to parse dockerCfgFile", e);
-            }
-            ReposTag reposTag = NameParser.parseRepositoryTag(imageName);
-            HostnameReposName hostnameReposName = NameParser.resolveRepositoryName(reposTag.repos);
-
-            authConfig = authConfigFile.resolveAuthConfig(hostnameReposName.hostname);
+        if (authConfig != null) {
+            return authConfig;
         }
 
-        AuthConfig otherAuthConfig = getAuthConfig();
+        DockerConfigFile dockerCfg = getDockerConfig();
 
-        if (otherAuthConfig != null) {
-            authConfig = otherAuthConfig;
-        }
+        ReposTag reposTag = NameParser.parseRepositoryTag(imageName);
+        HostnameReposName hostnameReposName = NameParser.resolveRepositoryName(reposTag.repos);
 
-        return authConfig;
+        return dockerCfg.resolveAuthConfig(hostnameReposName.hostname);
     }
 
     @Override
     public AuthConfigurations getAuthConfigurations() {
-        File dockerCfgFile = getDockerConfigFile();
-
-        if (dockerCfgFile != null) {
-            AuthConfigFile authConfigFile;
-            try {
-                authConfigFile = AuthConfigFile.loadConfig(dockerCfgFile);
-            } catch (IOException e) {
-                throw new DockerClientException("Failed to parse dockerCfgFile: " +
-                    dockerCfgFile.getAbsolutePath(), e);
-            }
-
-            return authConfigFile.getAuthConfigurations();
-        }
-
-        return new AuthConfigurations();
-    }
-
-    private File getDockerConfigFile() {
-        final Path configJson = Paths.get(getDockerConfig(), CONFIG_JSON);
-        final Path dockerCfg = Paths.get(getDockerConfig(), DOCKER_CFG);
-
-        if (Files.exists(configJson)) {
-            return configJson.toFile();
-        } else if (Files.exists(dockerCfg)) {
-            return dockerCfg.toFile();
-        } else {
-            return null;
-        }
+        return getDockerConfig().getAuthConfigurations();
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 3abfdbe38..230fe07df 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -308,7 +308,8 @@ public ListContainersCmd listContainersCmd() {
 
     @Override
     public CreateContainerCmd createContainerCmd(String image) {
-        return new CreateContainerCmdImpl(getDockerCmdExecFactory().createCreateContainerCmdExec(), image);
+        return new CreateContainerCmdImpl(getDockerCmdExecFactory()
+                .createCreateContainerCmdExec(), dockerClientConfig.effectiveAuthConfig(image), image);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/DockerConfigFile.java b/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
new file mode 100644
index 000000000..80c45fe15
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
@@ -0,0 +1,209 @@
+package com.github.dockerjava.core;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.AuthConfigurations;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class DockerConfigFile {
+    private static final String DOCKER_LEGACY_CFG = ".dockercfg";
+    private static final String DOCKER_CFG = "config.json";
+
+    private static final ObjectMapper MAPPER = new ObjectMapper();
+    private static final TypeReference<Map<String, AuthConfig>> CONFIG_MAP_TYPE = new TypeReference<Map<String, AuthConfig>>() {
+    };
+
+    @JsonProperty()
+    private final Map<String, AuthConfig> auths;
+
+    public DockerConfigFile() {
+        this(new HashMap<String, AuthConfig>());
+    }
+
+    private DockerConfigFile(Map<String, AuthConfig> authConfigMap) {
+        auths = authConfigMap;
+    }
+
+    public Map<String, AuthConfig> getAuths() {
+        return auths;
+    }
+
+    void addAuthConfig(AuthConfig config) {
+        auths.put(config.getRegistryAddress(), config);
+    }
+
+    public AuthConfig resolveAuthConfig(String hostname) {
+        if (StringUtils.isEmpty(hostname) || AuthConfig.DEFAULT_SERVER_ADDRESS.equals(hostname)) {
+            return auths.get(AuthConfig.DEFAULT_SERVER_ADDRESS);
+        }
+
+        AuthConfig c = auths.get(hostname);
+        if (c != null) {
+            return c;
+        }
+
+        // Maybe they have a legacy config file, we will iterate the keys converting
+        // them to the new format and testing
+        String normalizedHostname = convertToHostname(hostname);
+        for (Map.Entry<String, AuthConfig> entry : auths.entrySet()) {
+            String registry = entry.getKey();
+            AuthConfig config = entry.getValue();
+            if (convertToHostname(registry).equals(normalizedHostname)) {
+                return config;
+            }
+        }
+
+        return null;
+    }
+
+    public AuthConfigurations getAuthConfigurations() {
+        final AuthConfigurations authConfigurations = new AuthConfigurations();
+        for (Map.Entry<String, AuthConfig> authConfigEntry : auths.entrySet()) {
+            authConfigurations.addConfig(authConfigEntry.getValue());
+        }
+
+        return authConfigurations;
+    }
+
+    // CHECKSTYLE:OFF
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((auths == null) ? 0 : auths.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        DockerConfigFile other = (DockerConfigFile) obj;
+        if (auths == null) {
+            if (other.auths != null)
+                return false;
+        } else if (!auths.equals(other.auths))
+            return false;
+        return true;
+    }
+
+    // CHECKSTYLE:ON
+
+    @Override
+    public String toString() {
+        return "DockerConfigFile [auths=" + auths + "]";
+    }
+
+    public static DockerConfigFile loadConfig(File dockerConfigPath) throws IOException {
+        //parse new docker config file format
+        DockerConfigFile dockerConfig = loadCurrentConfig(dockerConfigPath);
+
+        //parse old auth config file format
+        if (dockerConfig == null) {
+            dockerConfig = loadLegacyConfig(dockerConfigPath);
+        }
+
+        //otherwise create default config
+        if (dockerConfig == null) {
+            dockerConfig = new DockerConfigFile();
+        }
+
+        for (Map.Entry<String, AuthConfig> entry : dockerConfig.getAuths().entrySet()) {
+            AuthConfig authConfig = entry.getValue();
+            decodeAuth(authConfig);
+            authConfig.withAuth(null);
+            authConfig.withRegistryAddress(entry.getKey());
+        }
+
+        return dockerConfig;
+    }
+
+    private static DockerConfigFile loadCurrentConfig(File dockerConfigPath) throws IOException {
+        File dockerCfgFile = new File(dockerConfigPath, File.separator + DOCKER_CFG);
+
+        if (!dockerCfgFile.exists() || !dockerCfgFile.isFile()) {
+            return null;
+        }
+
+        try {
+            return MAPPER.readValue(dockerCfgFile, DockerConfigFile.class);
+        } catch (IOException e) {
+            throw new IOException("Failed to parse docker " + DOCKER_CFG, e);
+        }
+    }
+
+    private static DockerConfigFile loadLegacyConfig(File dockerConfigPath) throws IOException {
+        File dockerLegacyCfgFile = new File(dockerConfigPath, File.separator + DOCKER_LEGACY_CFG);
+
+        if (!dockerLegacyCfgFile.exists() || !dockerLegacyCfgFile.isFile()) {
+            return null;
+        }
+
+        //parse legacy auth config file format
+        try {
+            return new DockerConfigFile(MAPPER.<Map<String, AuthConfig>>readValue(dockerLegacyCfgFile, CONFIG_MAP_TYPE));
+        } catch (IOException e) {
+            // pass
+        }
+
+        List<String> authFileContent = FileUtils.readLines(dockerLegacyCfgFile, StandardCharsets.UTF_8);
+        if (authFileContent.size() < 2) {
+            throw new IOException("The Auth Config file is empty");
+        }
+
+        AuthConfig config = new AuthConfig();
+        String[] origAuth = authFileContent.get(0).split(" = ");
+        if (origAuth.length != 2) {
+            throw new IOException("Invalid Auth config file");
+        }
+
+        config.withAuth(origAuth[1]);
+
+        String[] origEmail = authFileContent.get(1).split(" = ");
+        if (origEmail.length != 2) {
+            throw new IOException("Invalid Auth config file");
+        }
+        config.withEmail(origEmail[1]);
+
+        return new DockerConfigFile(new HashMap<>(Collections.singletonMap(config.getRegistryAddress(), config)));
+    }
+
+    private static void decodeAuth(AuthConfig config) throws IOException {
+        String str = new String(Base64.decodeBase64(config.getAuth()), StandardCharsets.UTF_8);
+        String[] parts = str.split(":", 2);
+        if (parts.length != 2) {
+            throw new IOException("Invalid auth configuration file");
+        }
+        config.withUsername(parts[0]);
+        config.withPassword(parts[1]);
+    }
+
+    static String convertToHostname(String server) {
+        String stripped = server;
+        if (server.startsWith("http://")) {
+            stripped = server.substring(7);
+        } else if (server.startsWith("https://")) {
+            stripped = server.substring(8);
+        }
+        String[] numParts = stripped.split("/", 2);
+        return numParts[0];
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index f3cfefa05..4bccb1b79 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -8,6 +8,7 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Capability;
 import com.github.dockerjava.api.model.ContainerNetwork;
@@ -127,12 +128,29 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     @JsonIgnore
     private List<String> aliases = null;
 
-    public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, String image) {
+    private AuthConfig authConfig;
+
+    public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, AuthConfig authConfig, String image) {
         super(exec);
         checkNotNull(image, "image was not specified");
+        withOptionalAuthConfig(authConfig);
         withImage(image);
     }
 
+    public AuthConfig getAuthConfig() {
+        return authConfig;
+    }
+
+    public CreateContainerCmd withAuthConfig(AuthConfig authConfig) {
+        checkNotNull(authConfig, "authConfig was not specified");
+        return withOptionalAuthConfig(authConfig);
+    }
+
+    private CreateContainerCmd withOptionalAuthConfig(AuthConfig authConfig) {
+        this.authConfig = authConfig;
+        return this;
+    }
+
     /**
      * @throws NotFoundException
      *             No such container
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
index 651362b1c..211023987 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
@@ -1,16 +1,17 @@
 package com.github.dockerjava.jaxrs;
 
-import static javax.ws.rs.client.Entity.entity;
+import com.github.dockerjava.api.command.CreateContainerCmd;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.CreateContainerCmd;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.core.DockerClientConfig;
+import static javax.ws.rs.client.Entity.entity;
 
 public class CreateContainerCmdExec extends AbstrSyncDockerCmdExec<CreateContainerCmd, CreateContainerResponse>
         implements CreateContainerCmd.Exec {
@@ -21,6 +22,14 @@ public CreateContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerC
         super(baseResource, dockerClientConfig);
     }
 
+    private Invocation.Builder resourceWithOptionalAuthConfig(CreateContainerCmd command, Invocation.Builder request) {
+        AuthConfig authConfig = command.getAuthConfig();
+        if (authConfig != null) {
+            request = request.header("X-Registry-Auth", registryAuth(authConfig));
+        }
+        return request;
+    }
+
     @Override
     protected CreateContainerResponse execute(CreateContainerCmd command) {
         WebTarget webResource = getBaseResource().path("/containers/create");
@@ -30,7 +39,7 @@ protected CreateContainerResponse execute(CreateContainerCmd command) {
         }
 
         LOGGER.trace("POST: {} ", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON)
+        return resourceWithOptionalAuthConfig(command, webResource.request()).accept(MediaType.APPLICATION_JSON)
                 .post(entity(command, MediaType.APPLICATION_JSON), CreateContainerResponse.class);
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
index 0001c96b2..037a82690 100644
--- a/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
+++ b/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
@@ -110,7 +110,7 @@ public void defaults() throws Exception {
         assertEquals(config.getRegistryUsername(), "someUserName");
         assertEquals(config.getRegistryUrl(), AuthConfig.DEFAULT_SERVER_ADDRESS);
         assertEquals(config.getApiVersion(), RemoteApiVersion.unknown());
-        assertEquals(config.getDockerConfig(), homeDir() + "/.docker");
+        assertEquals(config.getDockerConfigPath(), homeDir() + "/.docker");
         assertNull(config.getSSLConfig());
     }
 
diff --git a/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java b/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
similarity index 68%
rename from src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java
rename to src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
index 47bca37c8..cef91b664 100644
--- a/src/test/java/com/github/dockerjava/core/AuthConfigFileTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
@@ -13,7 +13,7 @@
 
 import static org.junit.Assert.assertEquals;
 
-public class AuthConfigFileTest {
+public class DockerConfigFileTest {
     @Rule
     public ExpectedException expectedEx = ExpectedException.none();
 
@@ -82,11 +82,11 @@ public void validJson() throws IOException {
                 .withPassword("bar1")
                 .withRegistryAddress(AuthConfig.DEFAULT_SERVER_ADDRESS);
 
-        AuthConfigFile expected = new AuthConfigFile();
-        expected.addConfig(authConfig1);
-        expected.addConfig(authConfig2);
+        DockerConfigFile expected = new DockerConfigFile();
+        expected.addAuthConfig(authConfig1);
+        expected.addAuthConfig(authConfig2);
 
-        assertEquals(runTest("validJson.json"), expected);
+        assertEquals(expected, runTest("validJson"));
 
     }
 
@@ -98,15 +98,15 @@ public void validJsonWithUnknown() throws IOException {
                 .withPassword("bar")
                 .withRegistryAddress("quay.io");
 
-        AuthConfigFile expected = new AuthConfigFile();
-        expected.addConfig(authConfig1);
+        DockerConfigFile expected = new DockerConfigFile();
+        expected.addAuthConfig(authConfig1);
         runTest("validJsonWithUnknown.json");
     }
 
     @Test
     public void validJsonWithOnlyUnknown() throws IOException {
-        AuthConfigFile expected = new AuthConfigFile();
-        AuthConfigFile actual = runTest("validJsonWithOnlyUnknown.json");
+        DockerConfigFile expected = new DockerConfigFile();
+        DockerConfigFile actual = runTest("validJsonWithOnlyUnknown.json");
         assertEquals(actual, expected);
     }
 
@@ -118,20 +118,41 @@ public void validLegacy() throws IOException {
                 .withPassword("bar")
                 .withRegistryAddress(AuthConfig.DEFAULT_SERVER_ADDRESS);
 
-        AuthConfigFile expected = new AuthConfigFile();
-        expected.addConfig(authConfig);
+        DockerConfigFile expected = new DockerConfigFile();
+        expected.addAuthConfig(authConfig);
 
         assertEquals(runTest("validLegacy"), expected);
     }
 
+    @Test
+    public void validDockerConfig() throws IOException {
+        AuthConfig authConfig1 = new AuthConfig()
+                .withEmail("foo@example.com")
+                .withUsername("foo")
+                .withPassword("bar")
+                .withRegistryAddress("quay.io");
+
+        AuthConfig authConfig2 = new AuthConfig()
+                .withEmail("moo@example.com")
+                .withUsername("foo1")
+                .withPassword("bar1")
+                .withRegistryAddress(AuthConfig.DEFAULT_SERVER_ADDRESS);
+
+        DockerConfigFile expected = new DockerConfigFile();
+        expected.addAuthConfig(authConfig1);
+        expected.addAuthConfig(authConfig2);
+
+        assertEquals(runTest("validDockerConfig"), expected);
+    }
+
     @Test
     public void nonExistent() throws IOException {
-        AuthConfigFile expected = new AuthConfigFile();
+        DockerConfigFile expected = new DockerConfigFile();
         assertEquals(runTest("idontexist"), expected);
     }
 
-    private AuthConfigFile runTest(String testFileName) throws IOException {
-        return AuthConfigFile.loadConfig(new File(FILESROOT, testFileName));
+    private DockerConfigFile runTest(String testFileName) throws IOException {
+        return DockerConfigFile.loadConfig(new File(FILESROOT, testFileName));
     }
 
 }
diff --git a/src/test/resources/testAuthConfigFile/emptyFile b/src/test/resources/testAuthConfigFile/emptyFile/.dockercfg
similarity index 100%
rename from src/test/resources/testAuthConfigFile/emptyFile
rename to src/test/resources/testAuthConfigFile/emptyFile/.dockercfg
diff --git a/src/test/resources/testAuthConfigFile/invalidJsonInvalidAuth b/src/test/resources/testAuthConfigFile/invalidJsonInvalidAuth/.dockercfg
similarity index 100%
rename from src/test/resources/testAuthConfigFile/invalidJsonInvalidAuth
rename to src/test/resources/testAuthConfigFile/invalidJsonInvalidAuth/.dockercfg
diff --git a/src/test/resources/testAuthConfigFile/invalidLegacyAuthLine b/src/test/resources/testAuthConfigFile/invalidLegacyAuthLine/.dockercfg
similarity index 100%
rename from src/test/resources/testAuthConfigFile/invalidLegacyAuthLine
rename to src/test/resources/testAuthConfigFile/invalidLegacyAuthLine/.dockercfg
diff --git a/src/test/resources/testAuthConfigFile/invalidLegacyEmailLine b/src/test/resources/testAuthConfigFile/invalidLegacyEmailLine/.dockercfg
similarity index 100%
rename from src/test/resources/testAuthConfigFile/invalidLegacyEmailLine
rename to src/test/resources/testAuthConfigFile/invalidLegacyEmailLine/.dockercfg
diff --git a/src/test/resources/testAuthConfigFile/invalidLegacyInvalidAuth b/src/test/resources/testAuthConfigFile/invalidLegacyInvalidAuth/.dockercfg
similarity index 100%
rename from src/test/resources/testAuthConfigFile/invalidLegacyInvalidAuth
rename to src/test/resources/testAuthConfigFile/invalidLegacyInvalidAuth/.dockercfg
diff --git a/src/test/resources/testAuthConfigFile/tooSmallFile b/src/test/resources/testAuthConfigFile/tooSmallFile/.dockercfg
similarity index 100%
rename from src/test/resources/testAuthConfigFile/tooSmallFile
rename to src/test/resources/testAuthConfigFile/tooSmallFile/.dockercfg
diff --git a/src/test/resources/testAuthConfigFile/validDockerConfig/config.json b/src/test/resources/testAuthConfigFile/validDockerConfig/config.json
new file mode 100644
index 000000000..ee32e91ed
--- /dev/null
+++ b/src/test/resources/testAuthConfigFile/validDockerConfig/config.json
@@ -0,0 +1,12 @@
+{
+    "auths": {
+        "quay.io" : {
+            "auth" : "Zm9vOmJhcg==",
+            "email" :"foo@example.com"
+        },
+        "https://index.docker.io/v1/" : {
+            "auth" : "Zm9vMTpiYXIx",
+            "email" : "moo@example.com"
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/testAuthConfigFile/validJson/.dockercfg b/src/test/resources/testAuthConfigFile/validJson/.dockercfg
new file mode 100644
index 000000000..2b47e3822
--- /dev/null
+++ b/src/test/resources/testAuthConfigFile/validJson/.dockercfg
@@ -0,0 +1 @@
+{"quay.io" : { "auth" : "Zm9vOmJhcg==", "email" :"foo@example.com"}, "https://index.docker.io/v1/" : {"auth" : "Zm9vMTpiYXIx", "email" : "moo@example.com"}}
\ No newline at end of file
diff --git a/src/test/resources/testAuthConfigFile/validLegacy b/src/test/resources/testAuthConfigFile/validLegacy/.dockercfg
similarity index 100%
rename from src/test/resources/testAuthConfigFile/validLegacy
rename to src/test/resources/testAuthConfigFile/validLegacy/.dockercfg

From cc0b2e0954991db69dfd0654a883d855726315aa Mon Sep 17 00:00:00 2001
From: fb <fb@baqend.com>
Date: Sun, 5 Nov 2017 00:09:45 +0100
Subject: [PATCH 0766/1272] Add more config and auth tests for push / pull and
 container creation in swarm

---
 .../github/dockerjava/api/DockerClient.java   |   2 +-
 .../api/command/CreateContainerCmd.java       |   6 +
 .../dockerjava/core/DockerClientImpl.java     |   4 +-
 .../dockerjava/core/DockerConfigFile.java     |   4 +
 .../dockerjava/jaxrs/AbstrDockerCmdExec.java  |  33 +++--
 .../jaxrs/CreateContainerCmdExec.java         |  12 +-
 .../dockerjava/jaxrs/PullImageCmdExec.java    |  29 ++---
 .../dockerjava/jaxrs/PushImageCmdExec.java    |  20 ++-
 .../netty/exec/AbstrDockerCmdExec.java        |  29 +++--
 .../netty/exec/CreateContainerCmdExec.java    |   6 +-
 .../netty/exec/PullImageCmdExec.java          |  17 +--
 .../netty/exec/PushImageCmdExec.java          |   3 +-
 .../dockerjava/cmd/BuildImageCmdIT.java       |  71 +++--------
 .../dockerjava/cmd/CreateContainerCmdIT.java  |  43 +++++++
 .../github/dockerjava/cmd/PullImageCmdIT.java |  59 +++++++++
 .../github/dockerjava/cmd/PushImageCmdIT.java |  65 ++++++++--
 .../dockerjava/core/DockerConfigFileTest.java |  30 +++--
 .../dockerjava/utils/RegistryUtils.java       | 116 ++++++++++++++++++
 .../testAuthConfigFile/validJson.json         |  10 --
 .../config.json}                              |   0
 .../config.json}                              |   0
 .../{validJson => validLegacyJson}/.dockercfg |   0
 22 files changed, 390 insertions(+), 169 deletions(-)
 create mode 100644 src/test/java/com/github/dockerjava/utils/RegistryUtils.java
 delete mode 100644 src/test/resources/testAuthConfigFile/validJson.json
 rename src/test/resources/testAuthConfigFile/{validJsonWithOnlyUnknown.json => validJsonWithOnlyUnknown/config.json} (100%)
 rename src/test/resources/testAuthConfigFile/{validJsonWithUnknown.json => validJsonWithUnknown/config.json} (100%)
 rename src/test/resources/testAuthConfigFile/{validJson => validLegacyJson}/.dockercfg (100%)

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 8fe841cce..2777682c8 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -236,7 +236,7 @@ public interface DockerClient extends Closeable {
 
     TopContainerCmd topContainerCmd(String containerId);
 
-    TagImageCmd tagImageCmd(String imageId, String repository, String tag);
+    TagImageCmd tagImageCmd(String imageId, String imageNameWithRepository, String tag);
 
     PauseContainerCmd pauseContainerCmd(String containerId);
 
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 0b1c62229..62d5cfee3 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -200,6 +200,12 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     Boolean isTty();
 
+    /**
+     * While using swarm classic, you can provide an optional auth config which will be used to pull images from a private registry,
+     * if the swarm node does not already have the docker image.
+     * Note: This option does not have any effect in normal docker
+     * @param authConfig The optional auth config
+     */
     CreateContainerCmd withAuthConfig(AuthConfig authConfig);
 
     /**
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 230fe07df..e4cb26f0c 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -431,8 +431,8 @@ public TopContainerCmd topContainerCmd(String containerId) {
     }
 
     @Override
-    public TagImageCmd tagImageCmd(String imageId, String repository, String tag) {
-        return new TagImageCmdImpl(getDockerCmdExecFactory().createTagImageCmdExec(), imageId, repository, tag);
+    public TagImageCmd tagImageCmd(String imageId, String imageNameWithRepository, String tag) {
+        return new TagImageCmdImpl(getDockerCmdExecFactory().createTagImageCmdExec(), imageId, imageNameWithRepository, tag);
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/DockerConfigFile.java b/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
index 80c45fe15..01cacb5c8 100644
--- a/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
+++ b/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
@@ -187,6 +187,10 @@ private static DockerConfigFile loadLegacyConfig(File dockerConfigPath) throws I
     }
 
     private static void decodeAuth(AuthConfig config) throws IOException {
+        if (config.getAuth() == null) {
+            return;
+        }
+
         String str = new String(Base64.decodeBase64(config.getAuth()), StandardCharsets.UTF_8);
         String[] parts = str.split(":", 2);
         if (parts.length != 2) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
index ad819468a..e5852f5ea 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
@@ -1,21 +1,20 @@
 package com.github.dockerjava.jaxrs;
 
-import static com.github.dockerjava.core.RemoteApiVersion.UNKNOWN_VERSION;
-import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_19;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.io.IOException;
-
-import javax.ws.rs.client.WebTarget;
-
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.commons.codec.binary.Base64;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.codec.binary.Base64;
+
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.WebTarget;
+import java.io.IOException;
+
+import static com.github.dockerjava.core.RemoteApiVersion.UNKNOWN_VERSION;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_19;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 public abstract class AbstrDockerCmdExec {
 
@@ -46,6 +45,18 @@ protected String registryAuth(AuthConfig authConfig) {
         }
     }
 
+    protected Invocation.Builder resourceWithAuthConfig(AuthConfig authConfig, Invocation.Builder request) {
+        request = request.header("X-Registry-Auth", registryAuth(authConfig));
+        return request;
+    }
+
+    protected Invocation.Builder resourceWithOptionalAuthConfig(AuthConfig authConfig, Invocation.Builder request) {
+        if (authConfig != null) {
+            request = resourceWithAuthConfig(authConfig, request);
+        }
+        return request;
+    }
+
     protected String registryConfigs(AuthConfigurations authConfigs) {
         try {
             final String json;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
index 211023987..527b3954f 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
@@ -2,12 +2,10 @@
 
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.core.DockerClientConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
@@ -22,14 +20,6 @@ public CreateContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerC
         super(baseResource, dockerClientConfig);
     }
 
-    private Invocation.Builder resourceWithOptionalAuthConfig(CreateContainerCmd command, Invocation.Builder request) {
-        AuthConfig authConfig = command.getAuthConfig();
-        if (authConfig != null) {
-            request = request.header("X-Registry-Auth", registryAuth(authConfig));
-        }
-        return request;
-    }
-
     @Override
     protected CreateContainerResponse execute(CreateContainerCmd command) {
         WebTarget webResource = getBaseResource().path("/containers/create");
@@ -39,7 +29,7 @@ protected CreateContainerResponse execute(CreateContainerCmd command) {
         }
 
         LOGGER.trace("POST: {} ", webResource);
-        return resourceWithOptionalAuthConfig(command, webResource.request()).accept(MediaType.APPLICATION_JSON)
+        return resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request()).accept(MediaType.APPLICATION_JSON)
                 .post(entity(command, MediaType.APPLICATION_JSON), CreateContainerResponse.class);
     }
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
index 1f0b21bf7..d2b22856d 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
@@ -1,23 +1,20 @@
 package com.github.dockerjava.jaxrs;
 
-import static javax.ws.rs.client.Entity.entity;
-
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.PullImageCmd;
-import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PullResponseItem;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.async.JsonStreamProcessor;
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.Invocation.Builder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import static javax.ws.rs.client.Entity.entity;
 
 public class PullImageCmdExec extends AbstrAsyncDockerCmdExec<PullImageCmd, PullResponseItem> implements
         PullImageCmd.Exec {
@@ -28,14 +25,6 @@ public PullImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientC
         super(baseResource, dockerClientConfig);
     }
 
-    private Invocation.Builder resourceWithOptionalAuthConfig(PullImageCmd command, Invocation.Builder request) {
-        AuthConfig authConfig = command.getAuthConfig();
-        if (authConfig != null) {
-            request = request.header("X-Registry-Auth", registryAuth(authConfig));
-        }
-        return request;
-    }
-
     @Override
     protected AbstractCallbackNotifier<PullResponseItem> callbackNotifier(PullImageCmd command,
             ResultCallback<PullResponseItem> resultCallback) {
@@ -44,7 +33,7 @@ protected AbstractCallbackNotifier<PullResponseItem> callbackNotifier(PullImageC
                 .queryParam("fromImage", command.getRepository()).queryParam("registry", command.getRegistry());
 
         LOGGER.trace("POST: {}", webResource);
-        Builder builder = resourceWithOptionalAuthConfig(command, webResource.request()).accept(
+        Builder builder = resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request()).accept(
                 MediaType.APPLICATION_OCTET_STREAM_TYPE);
 
         return new POSTCallbackNotifier<PullResponseItem>(new JsonStreamProcessor<PullResponseItem>(
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
index 2943ef7e8..906487c6c 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
@@ -1,14 +1,5 @@
 package com.github.dockerjava.jaxrs;
 
-import static javax.ws.rs.client.Entity.entity;
-
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.PushImageCmd;
 import com.github.dockerjava.api.model.AuthConfig;
@@ -17,6 +8,14 @@
 import com.github.dockerjava.core.async.JsonStreamProcessor;
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.Invocation.Builder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import static javax.ws.rs.client.Entity.entity;
 
 public class PushImageCmdExec extends AbstrAsyncDockerCmdExec<PushImageCmd, PushResponseItem> implements
         PushImageCmd.Exec {
@@ -40,10 +39,9 @@ protected AbstractCallbackNotifier<PushResponseItem> callbackNotifier(PushImageC
         WebTarget webResource = getBaseResource().path("/images/" + name(command) + "/push").queryParam("tag",
                 command.getTag());
 
-        final String registryAuth = registryAuth(command.getAuthConfig());
         LOGGER.trace("POST: {}", webResource);
 
-        Builder builder = webResource.request().header("X-Registry-Auth", registryAuth)
+        Builder builder = resourceWithAuthConfig(command.getAuthConfig(), webResource.request())
                 .accept(MediaType.APPLICATION_JSON);
 
         return new POSTCallbackNotifier<PushResponseItem>(new JsonStreamProcessor<PushResponseItem>(
diff --git a/src/main/java/com/github/dockerjava/netty/exec/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/AbstrDockerCmdExec.java
index 85763b403..63e3bff12 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/AbstrDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/AbstrDockerCmdExec.java
@@ -1,20 +1,20 @@
 package com.github.dockerjava.netty.exec;
 
-import static com.github.dockerjava.core.RemoteApiVersion.UNKNOWN_VERSION;
-import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_19;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.commons.codec.binary.Base64;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.RemoteApiVersion;
+import com.github.dockerjava.netty.InvocationBuilder;
 import com.github.dockerjava.netty.WebTarget;
+import org.apache.commons.codec.binary.Base64;
+
+import java.io.IOException;
+
+import static com.github.dockerjava.core.RemoteApiVersion.UNKNOWN_VERSION;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_19;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 public abstract class AbstrDockerCmdExec {
 
@@ -68,6 +68,17 @@ protected String registryConfigs(AuthConfigurations authConfigs) {
         }
     }
 
+    protected InvocationBuilder resourceWithAuthConfig(AuthConfig authConfig, InvocationBuilder request) {
+        return request.header("X-Registry-Auth", registryAuth(authConfig));
+    }
+
+    protected InvocationBuilder resourceWithOptionalAuthConfig(AuthConfig authConfig, InvocationBuilder request) {
+        if (authConfig != null) {
+            request = resourceWithAuthConfig(authConfig, request);
+        }
+        return request;
+    }
+
     protected boolean bool(Boolean bool) {
         return bool != null && bool;
     }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CreateContainerCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/CreateContainerCmdExec.java
index f7e4e39d9..7764d4729 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/CreateContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/CreateContainerCmdExec.java
@@ -28,8 +28,8 @@ protected CreateContainerResponse execute(CreateContainerCmd command) {
         }
 
         LOGGER.trace("POST: {} ", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(command, new TypeReference<CreateContainerResponse>() {
-                });
+        return resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request())
+                .accept(MediaType.APPLICATION_JSON)
+                .post(command, new TypeReference<CreateContainerResponse>() { });
     }
 }
diff --git a/src/main/java/com/github/dockerjava/netty/exec/PullImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/PullImageCmdExec.java
index 7f15b4e62..0f75f1918 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/PullImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/PullImageCmdExec.java
@@ -1,17 +1,14 @@
 package com.github.dockerjava.netty.exec;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.PullImageCmd;
-import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PullResponseItem;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.InvocationBuilder;
 import com.github.dockerjava.netty.MediaType;
 import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PullImageCmdExec extends AbstrAsyncDockerCmdExec<PullImageCmd, PullResponseItem> implements
         PullImageCmd.Exec {
@@ -22,14 +19,6 @@ public PullImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientC
         super(baseResource, dockerClientConfig);
     }
 
-    private InvocationBuilder resourceWithOptionalAuthConfig(PullImageCmd command, InvocationBuilder request) {
-        AuthConfig authConfig = command.getAuthConfig();
-        if (authConfig != null) {
-            request = request.header("X-Registry-Auth", registryAuth(authConfig));
-        }
-        return request;
-    }
-
     @Override
     protected Void execute0(PullImageCmd command, ResultCallback<PullResponseItem> resultCallback) {
 
@@ -37,7 +26,7 @@ protected Void execute0(PullImageCmd command, ResultCallback<PullResponseItem> r
                 .queryParam("fromImage", command.getRepository()).queryParam("registry", command.getRegistry());
 
         LOGGER.trace("POST: {}", webResource);
-        resourceWithOptionalAuthConfig(command, webResource.request()).accept(MediaType.APPLICATION_OCTET_STREAM).post(
+        resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request()).accept(MediaType.APPLICATION_OCTET_STREAM).post(
                 null, new TypeReference<PullResponseItem>() {
                 }, resultCallback);
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/PushImageCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/PushImageCmdExec.java
index d6dcdbd00..964928e8f 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/PushImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/PushImageCmdExec.java
@@ -34,10 +34,9 @@ protected Void execute0(PushImageCmd command, ResultCallback<PushResponseItem> r
         WebTarget webResource = getBaseResource().path("/images/" + name(command) + "/push").queryParam("tag",
                 command.getTag());
 
-        final String registryAuth = registryAuth(command.getAuthConfig());
         LOGGER.trace("POST: {}", webResource);
 
-        InvocationBuilder builder = webResource.request().header("X-Registry-Auth", registryAuth)
+        InvocationBuilder builder = resourceWithAuthConfig(command.getAuthConfig(), webResource.request())
                 .accept(MediaType.APPLICATION_JSON);
 
         builder.post(null, new TypeReference<PushResponseItem>() {
diff --git a/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java b/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
index 09e008c30..740395ae6 100644
--- a/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
@@ -6,13 +6,11 @@
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
-import com.github.dockerjava.api.model.ExposedPort;
-import com.github.dockerjava.api.model.PortBinding;
-import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.core.command.BuildImageResultCallback;
 import com.github.dockerjava.core.command.PushImageResultCallback;
 import com.github.dockerjava.core.command.WaitContainerResultCallback;
 import com.github.dockerjava.core.util.CompressArchiveUtil;
+import com.github.dockerjava.utils.RegistryUtils;
 import net.jcip.annotations.NotThreadSafe;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.TrueFileFilter;
@@ -30,8 +28,8 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
-import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_21;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_23;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_27;
@@ -197,61 +195,29 @@ public void env() throws Exception {
 
     @Test
     public void fromPrivateRegistry() throws Exception {
-        int port = getFactoryType() == JERSEY ? 5001 : 5002;
-//        int port = 5050;
+        AuthConfig authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient());
+        String imgName = authConfig.getRegistryAddress() + "/testuser/busybox";
 
         File dockerfile = folder.newFile("Dockerfile");
-        writeStringToFile(dockerfile, String.format("FROM      localhost:%d/testuser/busybox:latest", port));
+        writeStringToFile(dockerfile, "FROM " + imgName);
 
-
-        String containerName = "registryy" + dockerRule.getKind();
-        String imageName = "testregistryy" + dockerRule.getKind();
-        dockerRule.ensureContainerRemoved(containerName);
-        dockerRule.ensureImageRemoved(imageName);
-
-        File baseDir = new File(Thread.currentThread().getContextClassLoader().getResource("privateRegistry").getFile());
-
-        String imageId = dockerRule.buildImage(baseDir);
-
-        InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec();
-        assertThat(inspectImageResponse, not(nullValue()));
-        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-
-        dockerRule.getClient().tagImageCmd(imageId, imageName, "2")
-                .withForce().exec();
-
-        // see https://github.com/docker/distribution/blob/master/docs/deploying.md#native-basic-auth
-        CreateContainerResponse testregistry = dockerRule.getClient()
-                .createContainerCmd(imageName + ":2")
-                .withName(containerName)
-                .withPortBindings(new PortBinding(Ports.Binding.bindPort(port), ExposedPort.tcp(5000)))
-                .withEnv("REGISTRY_AUTH=htpasswd", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm",
-                        "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "REGISTRY_LOG_LEVEL=debug",
-                        "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key")
-                .exec();
-
-        dockerRule.getClient().startContainerCmd(testregistry.getId()).exec();
-
-        // wait for registry to boot
-        Thread.sleep(3000);
-
-        // credentials as configured in /auth/htpasswd
-        AuthConfig authConfig = new AuthConfig()
-                .withUsername("testuser")
-                .withPassword("testpassword")
-                .withEmail("foo@bar.de")
-                .withRegistryAddress("localhost:" + port);
+        File baseDir;
+        InspectImageResponse inspectImageResponse;
 
         dockerRule.getClient().authCmd().withAuthConfig(authConfig).exec();
-        dockerRule.getClient().tagImageCmd("busybox:latest", String.format("localhost:%d/testuser/busybox", port), "latest").withForce().exec();
+        dockerRule.getClient().tagImageCmd("busybox:latest", imgName, "latest")
+                .withForce()
+                .exec();
 
-        dockerRule.getClient().pushImageCmd(String.format("localhost:%d/testuser/busybox", port))
+        dockerRule.getClient().pushImageCmd(imgName)
                 .withTag("latest")
                 .withAuthConfig(authConfig)
                 .exec(new PushImageResultCallback())
-                .awaitSuccess();
+                .awaitCompletion(30, TimeUnit.SECONDS);
 
-        dockerRule.getClient().removeImageCmd(String.format("localhost:%d/testuser/busybox", port)).withForce(true).exec();
+        dockerRule.getClient().removeImageCmd(imgName)
+                .withForce(true)
+                .exec();
 
 //        baseDir = fileFromBuildTestResource("FROM/privateRegistry");
         baseDir = folder.getRoot();
@@ -259,8 +225,8 @@ public void fromPrivateRegistry() throws Exception {
         AuthConfigurations authConfigurations = new AuthConfigurations();
         authConfigurations.addConfig(authConfig);
 
-        imageId = dockerRule.getClient().buildImageCmd(baseDir).
-                withNoCache(true)
+        String imageId = dockerRule.getClient().buildImageCmd(baseDir)
+                .withNoCache(true)
                 .withBuildAuthConfigs(authConfigurations)
                 .exec(new BuildImageResultCallback())
                 .awaitImageId();
@@ -268,9 +234,6 @@ public void fromPrivateRegistry() throws Exception {
         inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec();
         assertThat(inspectImageResponse, not(nullValue()));
         LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-
-        dockerRule.ensureContainerRemoved(containerName);
-//        dockerRule.ensureImageRemoved(imageId);
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index c6905ef5e..a38cd7885 100644
--- a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -6,6 +6,9 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.InternalServerErrorException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.ContainerNetwork;
 import com.github.dockerjava.api.model.Device;
@@ -22,10 +25,14 @@
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.core.command.LogContainerResultCallback;
+import com.github.dockerjava.junit.DockerAssume;
+import com.github.dockerjava.utils.RegistryUtils;
+import com.github.dockerjava.utils.TestUtils;
 import net.jcip.annotations.NotThreadSafe;
 import org.apache.commons.io.FileUtils;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,6 +62,7 @@
 import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasItemInArray;
+import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
@@ -70,6 +78,9 @@ public class CreateContainerCmdIT extends CmdIT {
     @Rule
     public TemporaryFolder tempDir = new TemporaryFolder(new File("target/"));
 
+    @Rule
+    public ExpectedException exception = ExpectedException.none();
+
     @Test(expected = ConflictException.class)
     public void createContainerWithExistingName() throws DockerException {
 
@@ -823,4 +834,36 @@ public void createContainerWithNetworkID() {
         }
         assertThat(containerNetwork, notNullValue());
     }
+
+    @Test
+    public void createContainerFromPrivateRegistryWithValidAuth() throws Exception {
+        DockerAssume.assumeSwarm(dockerRule.getClient());
+
+        AuthConfig authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient());
+
+        String imgName = RegistryUtils.createPrivateImage(dockerRule, "create-container-with-valid-auth");
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(imgName)
+                .withAuthConfig(authConfig)
+                .exec();
+
+        assertThat(container.getId(), is(notNullValue()));
+    }
+
+    @Test
+    public void createContainerFromPrivateRegistryWithNoAuth() throws Exception {
+        AuthConfig authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient());
+
+        String imgName = RegistryUtils.createPrivateImage(dockerRule, "create-container-with-no-auth");
+
+        if (TestUtils.isSwarm(dockerRule.getClient())) {
+            exception.expect(instanceOf(InternalServerErrorException.class));
+        } else {
+            exception.expect(instanceOf(NotFoundException.class));
+        }
+
+        dockerRule.getClient().createContainerCmd(imgName)
+                .exec();
+    }
+
 }
diff --git a/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java b/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
index 05dd431e8..6b10ddd38 100644
--- a/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
@@ -4,12 +4,15 @@
 import com.github.dockerjava.api.command.InspectImageResponse;
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.exception.DockerClientException;
+import com.github.dockerjava.api.exception.InternalServerErrorException;
 import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.api.model.PullResponseItem;
 import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.core.command.PullImageCmdImpl;
 import com.github.dockerjava.core.command.PullImageResultCallback;
+import com.github.dockerjava.utils.RegistryUtils;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -109,4 +112,60 @@ public void testPullNonExistingImage() throws Exception {
                 .exec(new PullImageResultCallback())
                 .awaitCompletion(30, TimeUnit.SECONDS);
     }
+
+    @Test
+    public void testPullImageWithValidAuth() throws Exception {
+        AuthConfig authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient());
+
+        String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-valid-auth");
+
+        // stream needs to be fully read in order to close the underlying connection
+        dockerRule.getClient().pullImageCmd(imgName)
+                .withAuthConfig(authConfig)
+                .exec(new PullImageResultCallback())
+                .awaitCompletion(30, TimeUnit.SECONDS);
+    }
+
+    @Test
+    public void testPullImageWithNoAuth() throws Exception {
+        RegistryUtils.runPrivateRegistry(dockerRule.getClient());
+
+        String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-no-auth");
+
+        if (isNotSwarm(dockerRule.getClient())) {
+            exception.expect(InternalServerErrorException.class);
+        } else {
+            exception.expect(DockerClientException.class);
+        }
+
+        // stream needs to be fully read in order to close the underlying connection
+        dockerRule.getClient().pullImageCmd(imgName)
+                .exec(new PullImageResultCallback())
+                .awaitCompletion(30, TimeUnit.SECONDS);
+    }
+
+    @Test
+    public void testPullImageWithInvalidAuth() throws Exception {
+        AuthConfig validAuthConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient());
+
+        AuthConfig authConfig = new AuthConfig()
+                .withUsername("testuser")
+                .withPassword("testwrongpassword")
+                .withEmail("foo@bar.de")
+                .withRegistryAddress(validAuthConfig.getRegistryAddress());
+
+        String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-invalid-auth");
+
+        if (isNotSwarm(dockerRule.getClient())) {
+            exception.expect(InternalServerErrorException.class);
+        } else {
+            exception.expect(DockerClientException.class);
+        }
+
+        // stream needs to be fully read in order to close the underlying connection
+        dockerRule.getClient().pullImageCmd(imgName)
+                .withAuthConfig(authConfig)
+                .exec(new PullImageResultCallback())
+                .awaitCompletion(30, TimeUnit.SECONDS);
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java b/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
index 7bad7b403..82f2dda37 100644
--- a/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
@@ -3,14 +3,14 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.core.command.PullImageResultCallback;
 import com.github.dockerjava.core.command.PushImageResultCallback;
-import com.github.dockerjava.junit.category.AuthIntegration;
+import com.github.dockerjava.utils.RegistryUtils;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.rules.ExpectedException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,33 +31,40 @@ public class PushImageCmdIT extends CmdIT {
 
     @Rule
     public ExpectedException exception = ExpectedException.none();
+    private AuthConfig authConfig;
 
     @Before
     public void beforeTest() throws Exception {
         username = dockerRule.getClient().authConfig().getUsername();
+        authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient());
     }
 
-    @Category(AuthIntegration.class)
     @Test
     public void pushLatest() throws Exception {
-
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true").exec();
 
         LOG.info("Created container {}", container.toString());
-
         assertThat(container.getId(), not(isEmptyString()));
 
         LOG.info("Committing container: {}", container.toString());
-        String imageId = dockerRule.getClient().commitCmd(container.getId()).withRepository(username + "/busybox").exec();
+        String imgName = authConfig.getRegistryAddress() + "/" + dockerRule.getKind() + "-push-latest";
+        String imageId = dockerRule.getClient().commitCmd(container.getId())
+                .withRepository(imgName)
+                .exec();
 
         // we have to block until image is pushed
-        dockerRule.getClient().pushImageCmd(username + "/busybox").exec(new PushImageResultCallback())
+        dockerRule.getClient().pushImageCmd(imgName)
+                .withAuthConfig(authConfig)
+                .exec(new PushImageResultCallback())
                 .awaitCompletion(30, TimeUnit.SECONDS);
 
         LOG.info("Removing image: {}", imageId);
         dockerRule.getClient().removeImageCmd(imageId).exec();
 
-        dockerRule.getClient().pullImageCmd(username + "/busybox").exec(new PullImageResultCallback())
+        dockerRule.getClient().pullImageCmd(imgName)
+                .withTag("latest")
+                .withAuthConfig(authConfig)
+                .exec(new PullImageResultCallback())
                 .awaitCompletion(30, TimeUnit.SECONDS);
     }
 
@@ -76,4 +83,46 @@ public void pushNonExistentImage() throws Exception {
                 .awaitCompletion(30, TimeUnit.SECONDS); // exclude infinite await sleep
 
     }
+
+    @Test
+    public void testPushImageWithValidAuth() throws Exception {
+        String imgName = RegistryUtils.createTestImage(dockerRule, "push-image-with-valid-auth");
+
+        // stream needs to be fully read in order to close the underlying connection
+        dockerRule.getClient().pushImageCmd(imgName)
+                .withAuthConfig(authConfig)
+                .exec(new PushImageResultCallback())
+                .awaitCompletion(30, TimeUnit.SECONDS);
+    }
+
+    @Test
+    public void testPushImageWithNoAuth() throws Exception {
+        String imgName = RegistryUtils.createTestImage(dockerRule, "push-image-with-no-auth");
+
+        exception.expect(DockerClientException.class);
+
+        // stream needs to be fully read in order to close the underlying connection
+        dockerRule.getClient().pushImageCmd(imgName)
+                .exec(new PushImageResultCallback())
+                .awaitCompletion(30, TimeUnit.SECONDS);
+    }
+
+    @Test
+    public void testPushImageWithInvalidAuth() throws Exception {
+        AuthConfig invalidAuthConfig = new AuthConfig()
+                .withUsername("testuser")
+                .withPassword("testwrongpassword")
+                .withEmail("foo@bar.de")
+                .withRegistryAddress(authConfig.getRegistryAddress());
+
+        String imgName = RegistryUtils.createTestImage(dockerRule, "push-image-with-invalid-auth");
+
+        exception.expect(DockerClientException.class);
+
+        // stream needs to be fully read in order to close the underlying connection
+        dockerRule.getClient().pushImageCmd(imgName)
+                .withAuthConfig(invalidAuthConfig)
+                .exec(new PushImageResultCallback())
+                .awaitCompletion(30, TimeUnit.SECONDS);
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java b/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
index cef91b664..7f121c69a 100644
--- a/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
@@ -11,14 +11,14 @@
 import java.io.File;
 import java.io.IOException;
 
-import static org.junit.Assert.assertEquals;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
 
 public class DockerConfigFileTest {
     @Rule
     public ExpectedException expectedEx = ExpectedException.none();
 
-    private final File FILESROOT = new File(Thread.currentThread().getContextClassLoader()
-            .getResource("testAuthConfigFile").getFile());
+    private final File FILESROOT = new File(DockerConfigFileTest.class.getResource("/testAuthConfigFile").getFile());
 
     @Test
     public void emptyFile() throws IOException {
@@ -69,7 +69,7 @@ public void invalidLegacyEmailLine() throws IOException {
     }
 
     @Test
-    public void validJson() throws IOException {
+    public void validLegacyJson() throws IOException {
         AuthConfig authConfig1 = new AuthConfig()
                 .withEmail("foo@example.com")
                 .withUsername("foo")
@@ -86,28 +86,32 @@ public void validJson() throws IOException {
         expected.addAuthConfig(authConfig1);
         expected.addAuthConfig(authConfig2);
 
-        assertEquals(expected, runTest("validJson"));
-
+        assertThat(runTest("validLegacyJson"), is(expected));
     }
 
     @Test
     public void validJsonWithUnknown() throws IOException {
         AuthConfig authConfig1 = new AuthConfig()
+                .withRegistryAddress("192.168.99.100:32768");
+
+        AuthConfig authConfig2 = new AuthConfig()
                 .withEmail("foo@example.com")
                 .withUsername("foo")
                 .withPassword("bar")
-                .withRegistryAddress("quay.io");
+                .withRegistryAddress("https://index.docker.io/v1/");
 
         DockerConfigFile expected = new DockerConfigFile();
         expected.addAuthConfig(authConfig1);
-        runTest("validJsonWithUnknown.json");
+        expected.addAuthConfig(authConfig2);
+        DockerConfigFile actual = runTest("validJsonWithUnknown");
+        assertThat(actual, is(expected));
     }
 
     @Test
     public void validJsonWithOnlyUnknown() throws IOException {
         DockerConfigFile expected = new DockerConfigFile();
-        DockerConfigFile actual = runTest("validJsonWithOnlyUnknown.json");
-        assertEquals(actual, expected);
+        DockerConfigFile actual = runTest("validJsonWithOnlyUnknown");
+        assertThat(actual, is(expected));
     }
 
     @Test
@@ -121,7 +125,7 @@ public void validLegacy() throws IOException {
         DockerConfigFile expected = new DockerConfigFile();
         expected.addAuthConfig(authConfig);
 
-        assertEquals(runTest("validLegacy"), expected);
+        assertThat(runTest("validLegacy"), is(expected));
     }
 
     @Test
@@ -142,13 +146,13 @@ public void validDockerConfig() throws IOException {
         expected.addAuthConfig(authConfig1);
         expected.addAuthConfig(authConfig2);
 
-        assertEquals(runTest("validDockerConfig"), expected);
+        assertThat(runTest("validDockerConfig"), is(expected));
     }
 
     @Test
     public void nonExistent() throws IOException {
         DockerConfigFile expected = new DockerConfigFile();
-        assertEquals(runTest("idontexist"), expected);
+        assertThat(runTest("idontexist"), is(expected));
     }
 
     private DockerConfigFile runTest(String testFileName) throws IOException {
diff --git a/src/test/java/com/github/dockerjava/utils/RegistryUtils.java b/src/test/java/com/github/dockerjava/utils/RegistryUtils.java
new file mode 100644
index 000000000..6e178df56
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/utils/RegistryUtils.java
@@ -0,0 +1,116 @@
+package com.github.dockerjava.utils;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectImageResponse;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.PortBinding;
+import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.core.command.BuildImageResultCallback;
+import com.github.dockerjava.core.command.PushImageResultCallback;
+import com.github.dockerjava.junit.DockerRule;
+
+import java.io.File;
+import java.util.concurrent.TimeUnit;
+
+import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.nullValue;
+
+public class RegistryUtils {
+
+    private static AuthConfig privateRegistryAuthConfig;
+
+    /**
+     * Starts a local test registry when it is not already started and returns the auth configuration for it
+     * This method is synchronized so that only the first invocation starts the registry
+     * @return The auth configuration for the started private docker registry
+     * @throws Exception
+     */
+    public static synchronized AuthConfig runPrivateRegistry(DockerClient dockerClient) throws Exception {
+        if (privateRegistryAuthConfig == null) {
+            int port = 5050;
+
+            String containerName = "private-registry";
+            String imageName = "private-registry-image";
+
+            File baseDir = new File(DockerRule.class.getResource("/privateRegistry").getFile());
+
+            try {
+                dockerClient.removeContainerCmd(containerName)
+                        .withForce(true)
+                        .withRemoveVolumes(true)
+                        .exec();
+            } catch (NotFoundException ex) {
+                // ignore
+            }
+
+            String registryImageId = dockerClient.buildImageCmd(baseDir)
+                    .withNoCache(true)
+                    .exec(new BuildImageResultCallback())
+                    .awaitImageId();
+
+            InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(registryImageId).exec();
+            assertThat(inspectImageResponse, not(nullValue()));
+            DockerRule.LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+            dockerClient.tagImageCmd(registryImageId, imageName, "2")
+                    .withForce().exec();
+
+            // see https://github.com/docker/distribution/blob/master/docs/deploying.md#native-basic-auth
+            CreateContainerResponse testregistry = dockerClient
+                    .createContainerCmd(imageName + ":2")
+                    .withName(containerName)
+                    .withPortBindings(new PortBinding(Ports.Binding.bindPort(port), ExposedPort.tcp(5000)))
+                    .withEnv("REGISTRY_AUTH=htpasswd", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm",
+                            "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "REGISTRY_LOG_LEVEL=debug",
+                            "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key")
+                    .exec();
+
+            dockerClient.startContainerCmd(testregistry.getId()).exec();
+
+            // wait for registry to boot
+            Thread.sleep(3000);
+
+            // credentials as configured in /auth/htpasswd
+            privateRegistryAuthConfig = new AuthConfig()
+                    .withUsername("testuser")
+                    .withPassword("testpassword")
+                    .withEmail("foo@bar.de")
+                    .withRegistryAddress("localhost:" + port);
+        }
+
+        return privateRegistryAuthConfig;
+    }
+
+    public static String createPrivateImage(DockerRule dockerRule, String tagName) throws InterruptedException {
+        if (privateRegistryAuthConfig == null)
+            throw new IllegalStateException("Ensure that you have invoked runPrivateRegistry beforehand.");
+
+        String imgNameWithTag = createTestImage(dockerRule, tagName);
+
+        dockerRule.getClient().pushImageCmd(imgNameWithTag)
+                .withAuthConfig(privateRegistryAuthConfig)
+                .exec(new PushImageResultCallback())
+                .awaitCompletion(30, TimeUnit.SECONDS);
+
+        Thread.sleep(5000); //ensures that the image is also purged from the swarm cache
+        dockerRule.getClient().removeImageCmd(imgNameWithTag)
+                .exec();
+
+        return imgNameWithTag;
+    }
+
+    public static String createTestImage(DockerRule dockerRule, String tagName) {
+        String tag = dockerRule.getKind() + "-" + tagName;
+        String imgName = privateRegistryAuthConfig.getRegistryAddress() + "/busybox";
+        String imgNameWithTag = imgName + ":" + tag;
+
+        dockerRule.getClient().tagImageCmd(DEFAULT_IMAGE, imgName, tag)
+                .exec();
+        return imgNameWithTag;
+    }
+}
diff --git a/src/test/resources/testAuthConfigFile/validJson.json b/src/test/resources/testAuthConfigFile/validJson.json
deleted file mode 100644
index c94acce0d..000000000
--- a/src/test/resources/testAuthConfigFile/validJson.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "quay.io": {
-    "auth": "Zm9vOmJhcg==",
-    "email": "foo@example.com"
-  },
-  "https://index.docker.io/v1/": {
-    "auth": "Zm9vMTpiYXIx",
-    "email": "moo@example.com"
-  }
-}
diff --git a/src/test/resources/testAuthConfigFile/validJsonWithOnlyUnknown.json b/src/test/resources/testAuthConfigFile/validJsonWithOnlyUnknown/config.json
similarity index 100%
rename from src/test/resources/testAuthConfigFile/validJsonWithOnlyUnknown.json
rename to src/test/resources/testAuthConfigFile/validJsonWithOnlyUnknown/config.json
diff --git a/src/test/resources/testAuthConfigFile/validJsonWithUnknown.json b/src/test/resources/testAuthConfigFile/validJsonWithUnknown/config.json
similarity index 100%
rename from src/test/resources/testAuthConfigFile/validJsonWithUnknown.json
rename to src/test/resources/testAuthConfigFile/validJsonWithUnknown/config.json
diff --git a/src/test/resources/testAuthConfigFile/validJson/.dockercfg b/src/test/resources/testAuthConfigFile/validLegacyJson/.dockercfg
similarity index 100%
rename from src/test/resources/testAuthConfigFile/validJson/.dockercfg
rename to src/test/resources/testAuthConfigFile/validLegacyJson/.dockercfg

From fe2c5eeff3d5f2f00ab27f4ce272580483adb2c5 Mon Sep 17 00:00:00 2001
From: fb <fb@baqend.com>
Date: Tue, 7 Nov 2017 12:55:44 +0100
Subject: [PATCH 0767/1272] More Test fixes

---
 src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java | 6 ++++--
 .../github/dockerjava/core/util/CertificateUtilsTest.java   | 3 ++-
 .../java/com/github/dockerjava/utils/RegistryUtils.java     | 4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java b/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
index 6b10ddd38..8dfd65744 100644
--- a/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
@@ -132,7 +132,8 @@ public void testPullImageWithNoAuth() throws Exception {
 
         String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-no-auth");
 
-        if (isNotSwarm(dockerRule.getClient())) {
+        if (isNotSwarm(dockerRule.getClient()) && getVersion(dockerRule.getClient())
+                .isGreater(RemoteApiVersion.VERSION_1_27)) {
             exception.expect(InternalServerErrorException.class);
         } else {
             exception.expect(DockerClientException.class);
@@ -156,7 +157,8 @@ public void testPullImageWithInvalidAuth() throws Exception {
 
         String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-invalid-auth");
 
-        if (isNotSwarm(dockerRule.getClient())) {
+        if (isNotSwarm(dockerRule.getClient()) && getVersion(dockerRule.getClient())
+                .isGreater(RemoteApiVersion.VERSION_1_27)) {
             exception.expect(InternalServerErrorException.class);
         } else {
             exception.expect(DockerClientException.class);
diff --git a/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java b/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java
index a19dd2cc4..28818d24c 100644
--- a/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java
+++ b/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java
@@ -5,6 +5,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -86,6 +87,6 @@ public void readMultipleCaCerts() throws Exception {
     }
 
     private String readFileAsString(String path) throws IOException {
-        return new String(Files.readAllBytes(Paths.get(baseDir + path)));
+        return new String(Files.readAllBytes(Paths.get(new File(baseDir + path).getPath())));
     }
 }
diff --git a/src/test/java/com/github/dockerjava/utils/RegistryUtils.java b/src/test/java/com/github/dockerjava/utils/RegistryUtils.java
index 6e178df56..e0f98793f 100644
--- a/src/test/java/com/github/dockerjava/utils/RegistryUtils.java
+++ b/src/test/java/com/github/dockerjava/utils/RegistryUtils.java
@@ -97,10 +97,12 @@ public static String createPrivateImage(DockerRule dockerRule, String tagName) t
                 .exec(new PushImageResultCallback())
                 .awaitCompletion(30, TimeUnit.SECONDS);
 
-        Thread.sleep(5000); //ensures that the image is also purged from the swarm cache
         dockerRule.getClient().removeImageCmd(imgNameWithTag)
                 .exec();
 
+        //ensures that the image is available
+        Thread.sleep(5000);
+
         return imgNameWithTag;
     }
 

From 9a937a3d0242b1a95b46ab84d4df62a172b1f135 Mon Sep 17 00:00:00 2001
From: fb <fb@baqend.com>
Date: Tue, 7 Nov 2017 13:21:12 +0100
Subject: [PATCH 0768/1272] Adjust the docker api version exception type

---
 .../java/com/github/dockerjava/core/RemoteApiVersion.java     | 1 +
 src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java   | 4 ++--
 src/test/java/com/github/dockerjava/utils/RegistryUtils.java  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index 1525d2c28..62da159d7 100644
--- a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -80,6 +80,7 @@ public class RemoteApiVersion implements Serializable {
     public static final RemoteApiVersion VERSION_1_26 = RemoteApiVersion.create(1, 26);
     public static final RemoteApiVersion VERSION_1_27 = RemoteApiVersion.create(1, 27);
     public static final RemoteApiVersion VERSION_1_29 = RemoteApiVersion.create(1, 29);
+    public static final RemoteApiVersion VERSION_1_30 = RemoteApiVersion.create(1, 30);
 
 
     /**
diff --git a/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java b/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
index 8dfd65744..9f728b860 100644
--- a/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
@@ -133,7 +133,7 @@ public void testPullImageWithNoAuth() throws Exception {
         String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-no-auth");
 
         if (isNotSwarm(dockerRule.getClient()) && getVersion(dockerRule.getClient())
-                .isGreater(RemoteApiVersion.VERSION_1_27)) {
+                .isGreaterOrEqual(RemoteApiVersion.VERSION_1_30)) {
             exception.expect(InternalServerErrorException.class);
         } else {
             exception.expect(DockerClientException.class);
@@ -158,7 +158,7 @@ public void testPullImageWithInvalidAuth() throws Exception {
         String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-invalid-auth");
 
         if (isNotSwarm(dockerRule.getClient()) && getVersion(dockerRule.getClient())
-                .isGreater(RemoteApiVersion.VERSION_1_27)) {
+                .isGreaterOrEqual(RemoteApiVersion.VERSION_1_30)) {
             exception.expect(InternalServerErrorException.class);
         } else {
             exception.expect(DockerClientException.class);
diff --git a/src/test/java/com/github/dockerjava/utils/RegistryUtils.java b/src/test/java/com/github/dockerjava/utils/RegistryUtils.java
index e0f98793f..ea78795a2 100644
--- a/src/test/java/com/github/dockerjava/utils/RegistryUtils.java
+++ b/src/test/java/com/github/dockerjava/utils/RegistryUtils.java
@@ -100,7 +100,7 @@ public static String createPrivateImage(DockerRule dockerRule, String tagName) t
         dockerRule.getClient().removeImageCmd(imgNameWithTag)
                 .exec();
 
-        //ensures that the image is available
+        //ensures that the image is available, the private registry needs some time to reflect a tag push
         Thread.sleep(5000);
 
         return imgNameWithTag;

From 5139cd84647a08051e65720e72146651585eb41f Mon Sep 17 00:00:00 2001
From: fb <fb@baqend.com>
Date: Sat, 18 Nov 2017 17:27:27 +0100
Subject: [PATCH 0769/1272] Normalize the authConfig handling in the different
 commands

---
 .../dockerjava/api/command/AuthCmd.java       |  7 ++--
 .../api/command/CreateContainerCmd.java       |  1 +
 .../dockerjava/api/command/PullImageCmd.java  |  7 ++--
 .../dockerjava/core/DockerClientImpl.java     |  8 +---
 .../core/command/AbstrAuthCfgDockerCmd.java   | 37 -------------------
 .../dockerjava/core/command/AuthCmdImpl.java  | 13 ++++++-
 .../core/command/CreateContainerCmdImpl.java  |  7 +---
 .../core/command/PullImageCmdImpl.java        | 11 ++----
 .../core/command/PushImageCmdImpl.java        |  9 +----
 9 files changed, 28 insertions(+), 72 deletions(-)
 delete mode 100644 src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java

diff --git a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
index a92b1593b..f9ffbf859 100644
--- a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
@@ -1,12 +1,11 @@
 package com.github.dockerjava.api.command;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
 import com.github.dockerjava.api.exception.UnauthorizedException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthResponse;
 
+import javax.annotation.CheckForNull;
+
 /**
  *
  * Authenticate with the server, useful for checking authentication.
@@ -17,7 +16,7 @@ public interface AuthCmd extends SyncDockerCmd<AuthResponse> {
     @CheckForNull
     AuthConfig getAuthConfig();
 
-    AuthCmd withAuthConfig(@Nonnull AuthConfig authConfig);
+    AuthCmd withAuthConfig(AuthConfig authConfig);
 
     /**
      * @return The status. Based on it's value you may mean you need to authorise your account, e.g.: "Account created. Please see the
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 62d5cfee3..34682a14f 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -24,6 +24,7 @@
 
 public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerResponse> {
 
+    @CheckForNull
     AuthConfig getAuthConfig();
 
     @CheckForNull
diff --git a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java b/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
index 8127f7b1f..81da24e61 100644
--- a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
@@ -1,11 +1,11 @@
 package com.github.dockerjava.api.command;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PullResponseItem;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 /**
  *
  * Pull image from repository.
@@ -22,6 +22,7 @@ public interface PullImageCmd extends AsyncDockerCmd<PullImageCmd, PullResponseI
     @CheckForNull
     String getRegistry();
 
+    @CheckForNull
     AuthConfig getAuthConfig();
 
     PullImageCmd withRepository(@Nonnull String repository);
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index e4cb26f0c..c175f83d6 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -238,12 +238,8 @@ public PullImageCmd pullImageCmd(String repository) {
 
     @Override
     public PushImageCmd pushImageCmd(String name) {
-        PushImageCmd cmd = new PushImageCmdImpl(getDockerCmdExecFactory().createPushImageCmdExec(), name);
-
-        AuthConfig cfg = dockerClientConfig.effectiveAuthConfig(name);
-        if (cfg != null) {
-            cmd.withAuthConfig(cfg);
-        }
+        PushImageCmd cmd = new PushImageCmdImpl(getDockerCmdExecFactory().createPushImageCmdExec(),
+                dockerClientConfig.effectiveAuthConfig(name), name);
         return cmd;
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
deleted file mode 100644
index 64e0e27f8..000000000
--- a/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.github.dockerjava.core.command;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.github.dockerjava.api.command.DockerCmd;
-import com.github.dockerjava.api.command.DockerCmdSyncExec;
-import com.github.dockerjava.api.model.AuthConfig;
-
-public abstract class AbstrAuthCfgDockerCmd<T extends DockerCmd<RES_T>, RES_T> extends AbstrDockerCmd<T, RES_T> {
-
-    public AbstrAuthCfgDockerCmd(DockerCmdSyncExec<T, RES_T> execution, AuthConfig authConfig) {
-        super(execution);
-        withOptionalAuthConfig(authConfig);
-    }
-
-    public AbstrAuthCfgDockerCmd(DockerCmdSyncExec<T, RES_T> execution) {
-        super(execution);
-    }
-
-    private AuthConfig authConfig;
-
-    public AuthConfig getAuthConfig() {
-        return authConfig;
-    }
-
-    public T withAuthConfig(AuthConfig authConfig) {
-        checkNotNull(authConfig, "authConfig was not specified");
-        return withOptionalAuthConfig(authConfig);
-    }
-
-    @SuppressWarnings("unchecked")
-    private T withOptionalAuthConfig(AuthConfig authConfig) {
-        this.authConfig = authConfig;
-        return (T) this;
-    }
-
-}
diff --git a/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
index e0a790c32..e22ad67f2 100644
--- a/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
@@ -10,7 +10,9 @@
  * Authenticate with the server, useful for checking authentication.
  *
  */
-public class AuthCmdImpl extends AbstrAuthCfgDockerCmd<AuthCmd, AuthResponse> implements AuthCmd {
+public class AuthCmdImpl extends AbstrDockerCmd<AuthCmd, AuthResponse> implements AuthCmd {
+
+    private AuthConfig authConfig;
 
     public AuthCmdImpl(AuthCmd.Exec exec, AuthConfig authConfig) {
         super(exec);
@@ -21,4 +23,13 @@ public AuthCmdImpl(AuthCmd.Exec exec, AuthConfig authConfig) {
     public AuthResponse exec() throws UnauthorizedException {
         return super.exec();
     }
+
+    public AuthConfig getAuthConfig() {
+        return authConfig;
+    }
+
+    public AuthCmd withAuthConfig(AuthConfig authConfig) {
+        this.authConfig = authConfig;
+        return this;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 4bccb1b79..54e41b2fd 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -133,7 +133,7 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, AuthConfig authConfig, String image) {
         super(exec);
         checkNotNull(image, "image was not specified");
-        withOptionalAuthConfig(authConfig);
+        withAuthConfig(authConfig);
         withImage(image);
     }
 
@@ -142,11 +142,6 @@ public AuthConfig getAuthConfig() {
     }
 
     public CreateContainerCmd withAuthConfig(AuthConfig authConfig) {
-        checkNotNull(authConfig, "authConfig was not specified");
-        return withOptionalAuthConfig(authConfig);
-    }
-
-    private CreateContainerCmd withOptionalAuthConfig(AuthConfig authConfig) {
         this.authConfig = authConfig;
         return this;
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
index 547fc6519..b69791fe5 100644
--- a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
@@ -1,11 +1,11 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PullResponseItem;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  *
  * Pull image from repository.
@@ -19,7 +19,7 @@ public class PullImageCmdImpl extends AbstrAsyncDockerCmd<PullImageCmd, PullResp
 
     public PullImageCmdImpl(PullImageCmd.Exec exec, AuthConfig authConfig, String repository) {
         super(exec);
-        withOptionalAuthConfig(authConfig);
+        withAuthConfig(authConfig);
         withRepository(repository);
     }
 
@@ -28,11 +28,6 @@ public AuthConfig getAuthConfig() {
     }
 
     public PullImageCmd withAuthConfig(AuthConfig authConfig) {
-        checkNotNull(authConfig, "authConfig was not specified");
-        return withOptionalAuthConfig(authConfig);
-    }
-
-    private PullImageCmd withOptionalAuthConfig(AuthConfig authConfig) {
         this.authConfig = authConfig;
         return this;
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
index 621c4a7a4..b3026c841 100644
--- a/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
@@ -20,9 +20,10 @@ public class PushImageCmdImpl extends AbstrAsyncDockerCmd<PushImageCmd, PushResp
 
     private AuthConfig authConfig;
 
-    public PushImageCmdImpl(PushImageCmd.Exec exec, String name) {
+    public PushImageCmdImpl(PushImageCmd.Exec exec, AuthConfig authConfig, String name) {
         super(exec);
         withName(name);
+        withAuthConfig(authConfig);
     }
 
     @Override
@@ -62,13 +63,7 @@ public AuthConfig getAuthConfig() {
     }
 
     public PushImageCmd withAuthConfig(AuthConfig authConfig) {
-        checkNotNull(authConfig, "authConfig was not specified");
-        return withOptionalAuthConfig(authConfig);
-    }
-
-    private PushImageCmd withOptionalAuthConfig(AuthConfig authConfig) {
         this.authConfig = authConfig;
         return this;
     }
-
 }

From b05b1bbe6f153421abb1d821e08fa36e16c4050d Mon Sep 17 00:00:00 2001
From: fb <fb@baqend.com>
Date: Sat, 18 Nov 2017 17:57:52 +0100
Subject: [PATCH 0770/1272] Small test fixes

---
 .../dockerjava/cmd/CreateContainerCmdIT.java      | 14 +++++++-------
 .../com/github/dockerjava/cmd/PullImageCmdIT.java | 15 ---------------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index a38cd7885..51f003a75 100644
--- a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -148,19 +148,18 @@ public void createContainerWithVolumesFrom() throws DockerException {
         String container1Name = UUID.randomUUID().toString();
         CreateVolumeResponse volume1Info = dockerRule.getClient().createVolumeCmd().exec();
         CreateVolumeResponse volume2Info = dockerRule.getClient().createVolumeCmd().exec();
-        String mountpoint1 = volume1Info.getMountpoint();
-        String mountpoint2 = volume2Info.getMountpoint();
-        Volume volume1 = new Volume(mountpoint1);
-        Volume volume2 = new Volume(mountpoint2);
 
-        Bind bind1 = new Bind("/src/webapp1", volume1);
-        Bind bind2 = new Bind("/src/webapp2", volume2);
+        Volume volume1 = new Volume("/src/webapp1");
+        Volume volume2 = new Volume("/src/webapp2");
+        Bind bind1 = new Bind(volume1Info.getName(), volume1);
+        Bind bind2 = new Bind(volume2Info.getName(), volume2);
 
         // create a running container with bind mounts
         CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withCmd("sleep", "9999")
                 .withName(container1Name)
-                .withBinds(bind1, bind2).exec();
+                .withBinds(bind1, bind2)
+                .exec();
 
         LOG.info("Created container1 {}", container1.toString());
 
@@ -185,6 +184,7 @@ public void createContainerWithVolumesFrom() throws DockerException {
         // No volumes are created, the information is just stored in .HostConfig.VolumesFrom
         assertThat(inspectContainerResponse2.getHostConfig().getVolumesFrom(),
                 hasItemInArray(new VolumesFrom(container1Name)));
+        assertThat(inspectContainerResponse1, mountedVolumes(containsInAnyOrder(volume1, volume2)));
 
         // To ensure that the information stored in VolumesFrom really is considered
         // when starting the container, we start it and verify that it has the same
diff --git a/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java b/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
index 9f728b860..4d7ed98b1 100644
--- a/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
@@ -10,7 +10,6 @@
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.api.model.PullResponseItem;
 import com.github.dockerjava.core.RemoteApiVersion;
-import com.github.dockerjava.core.command.PullImageCmdImpl;
 import com.github.dockerjava.core.command.PullImageResultCallback;
 import com.github.dockerjava.utils.RegistryUtils;
 import org.junit.Rule;
@@ -26,7 +25,6 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.lessThanOrEqualTo;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertEquals;
 
 public class PullImageCmdIT extends CmdIT {
     private static final Logger LOG = LoggerFactory.getLogger(PullImageCmdIT.class);
@@ -40,19 +38,6 @@ public Void exec(PullImageCmd command, ResultCallback<PullResponseItem> resultCa
         };
     };
 
-    @Test
-    public void nullAuthConfig() throws Exception {
-        PullImageCmdImpl pullImageCmd = new PullImageCmdImpl(NOP_EXEC, null, "");
-        try {
-            pullImageCmd.withAuthConfig(null);
-            throw new AssertionError();
-        } catch (Exception e) {
-            assertEquals(e.getMessage(), "authConfig was not specified");
-        } finally {
-            pullImageCmd.close();
-        }
-    }
-
     @Test
     public void testPullImage() throws Exception {
         Info info = dockerRule.getClient().infoCmd().exec();

From e80848b7c4487ff1e60b4d89e8093bd051af71b1 Mon Sep 17 00:00:00 2001
From: Ted <xiao.xj@gmail.com>
Date: Tue, 5 Dec 2017 00:32:21 +0800
Subject: [PATCH 0771/1272] update docker service related model (#917)

* add JsonIgnoreProperties(ignoreUnknown = true)
add labels and forceUpdate
add PortConfig.PublishMode
change command from String to List<String>

* use uppercase name for enum

* update test

* support ListTasksCmd

* add Platforms to ServicePlacement, supported in v1.30
---
 .../github/dockerjava/api/DockerClient.java   |   9 +
 .../api/command/DockerCmdExecFactory.java     |   6 +
 .../api/command/InspectTaskCmd.java           |  19 ++
 .../dockerjava/api/command/ListTasksCmd.java  |  56 ++++
 .../dockerjava/api/model/ContainerSpec.java   |   8 +-
 .../api/model/DiscreteResourceSpec.java       |   7 +
 .../dockerjava/api/model/GenericResource.java |  32 ++
 .../api/model/NamedResourceSpec.java          |  16 +
 .../dockerjava/api/model/ObjectVersion.java   |  40 +++
 .../dockerjava/api/model/PortConfig.java      |  27 ++
 .../api/model/PortConfigProtocol.java         |   2 +-
 .../api/model/ServicePlacement.java           |  19 ++
 .../dockerjava/api/model/ServiceSpec.java     |  25 ++
 .../com/github/dockerjava/api/model/Task.java | 297 ++++++++++++++++++
 .../github/dockerjava/api/model/TaskSpec.java |  26 ++
 .../dockerjava/api/model/TaskState.java       |  57 ++++
 .../dockerjava/api/model/TaskStatus.java      |  77 +++++
 .../api/model/TaskStatusContainerStatus.java  |  53 ++++
 .../dockerjava/core/DockerClientImpl.java     |   7 +
 .../core/command/ListTasksCmdImpl.java        |  70 +++++
 .../jaxrs/JerseyDockerCmdExecFactory.java     |   6 +
 .../dockerjava/jaxrs/ListTasksCmdExec.java    |  43 +++
 .../netty/NettyDockerCmdExecFactory.java      |   7 +
 .../netty/exec/ListTasksCmdExec.java          |  46 +++
 .../cmd/swarm/CreateServiceCmdExecIT.java     |  18 +-
 .../cmd/swarm/ListTasksCmdExecIT.java         |  65 ++++
 .../dockerjava/cmd/swarm/SwarmCmdIT.java      |   2 +-
 .../core/TestDockerCmdExecFactory.java        |   6 +
 28 files changed, 1038 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/command/InspectTaskCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/ListTasksCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/GenericResource.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/Task.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/TaskState.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/TaskStatus.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/ListTasksCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/netty/exec/ListTasksCmdExec.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 2777682c8..fe40b2a6e 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -34,6 +34,7 @@
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
 import com.github.dockerjava.api.command.ListServicesCmd;
+import com.github.dockerjava.api.command.ListTasksCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
@@ -347,6 +348,14 @@ public interface DockerClient extends Closeable {
      */
     RemoveServiceCmd removeServiceCmd(String serviceId);
 
+    /**
+     * List tasks in the swarm cluster
+     *
+     * @return the command
+     * @since 1.24
+     */
+    ListTasksCmd listTasksCmd();
+
     @Override
     void close() throws IOException;
 
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index f6cc6b903..bdc34e8be 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -193,6 +193,12 @@ public interface DockerCmdExecFactory extends Closeable {
      */
     UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec();
 
+    /**
+     * Update a node. Node operations require the engine to be part of a swarm
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_24}
+     */
+    ListTasksCmd.Exec listTasksCmdExec();
 
     @Override
     void close() throws IOException;
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectTaskCmd.java b/src/main/java/com/github/dockerjava/api/command/InspectTaskCmd.java
new file mode 100644
index 000000000..118910eee
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/InspectTaskCmd.java
@@ -0,0 +1,19 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.Task;
+
+import javax.annotation.CheckForNull;
+
+public interface InspectTaskCmd extends SyncDockerCmd<Task> {
+    @CheckForNull
+    String getTaskId();
+
+    InspectTaskCmd withTaskId();
+
+    @Override
+    Task exec() throws NotFoundException;
+
+    interface Exec extends DockerCmdSyncExec<InspectTaskCmd, Task> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/ListTasksCmd.java b/src/main/java/com/github/dockerjava/api/command/ListTasksCmd.java
new file mode 100644
index 000000000..8037ded5d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/ListTasksCmd.java
@@ -0,0 +1,56 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.Task;
+import com.github.dockerjava.api.model.TaskState;
+
+import javax.annotation.CheckForNull;
+import java.util.List;
+import java.util.Map;
+
+public interface ListTasksCmd extends SyncDockerCmd<List<Task>> {
+    @CheckForNull
+    Map<String, List<String>> getFilters();
+
+    /**
+     * @param labels - Show only tasks with the passed labels.
+     *               Labels is a {@link Map} that contains label keys and values
+     */
+    ListTasksCmd withLabelFilter(Map<String, String> labels);
+
+    /**
+     * @param labels - Show only tasks with the passed labels.
+     */
+    ListTasksCmd withLabelFilter(String... labels);
+
+    /**
+     * @param ids Task id(s)
+     */
+    ListTasksCmd withIdFilter(String... ids);
+
+    /**
+     * @param names Task name(s)
+     */
+    ListTasksCmd withNameFilter(String... names);
+
+    /**
+     * @param nodeNames Node id(s) or name(s)
+     */
+    ListTasksCmd withNodeFilter(String... nodeNames);
+
+    /**
+     * @param serviceNames Service name(s)
+     */
+    ListTasksCmd withServiceFilter(String... serviceNames);
+
+    /**
+     * @param desiredState The desired-state filter can take the values running, shutdown, or accepted.
+     */
+    ListTasksCmd withStateFilter(TaskState... desiredState);
+
+    @Override
+    List<Task> exec() throws NotFoundException;
+
+    interface Exec extends DockerCmdSyncExec<ListTasksCmd, List<Task>> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java b/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
index a8c968936..44b392f2c 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
@@ -17,6 +18,7 @@
  *
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ContainerSpec implements Serializable {
     public static final Long serialVersionUID = 1L;
 
@@ -36,7 +38,7 @@ public class ContainerSpec implements Serializable {
      * @since 1.24
      */
     @JsonProperty("Command")
-    private String command;
+    private List<String> command;
 
     /**
      * @since 1.24
@@ -122,14 +124,14 @@ public ContainerSpec withLabels(Map<String, String> labels) {
      * @see #command
      */
     @CheckForNull
-    public String getCommand() {
+    public List<String> getCommand() {
         return command;
     }
 
     /**
      * @see #command
      */
-    public ContainerSpec withCommand(String command) {
+    public ContainerSpec withCommand(List<String> command) {
         this.command = command;
         return this;
     }
diff --git a/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java b/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java
new file mode 100644
index 000000000..0771fb180
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java
@@ -0,0 +1,7 @@
+package com.github.dockerjava.api.model;
+
+import java.io.Serializable;
+
+public class DiscreteResourceSpec extends GenericResource<String> implements Serializable {
+    private static final long serialVersionUID = 1L;
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/GenericResource.java b/src/main/java/com/github/dockerjava/api/model/GenericResource.java
new file mode 100644
index 000000000..9b994d8dd
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/GenericResource.java
@@ -0,0 +1,32 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.io.Serializable;
+
+public abstract class GenericResource<T> implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("Kind")
+    String kind;
+    @JsonProperty("Value")
+    T value = null;
+
+    public String getKind() {
+        return kind;
+    }
+
+    public GenericResource withKind(String kind) {
+        this.kind = kind;
+        return this;
+    }
+
+    public T getValue() {
+        return value;
+    }
+
+    public GenericResource withValue(T value) {
+        this.value = value;
+        return this;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java b/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
new file mode 100644
index 000000000..c96c9b71b
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
@@ -0,0 +1,16 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class NamedResourceSpec extends GenericResource<Integer> implements Serializable {
+    private static final long serialVersionUID = 1L;
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java b/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
new file mode 100644
index 000000000..6181a9e70
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
@@ -0,0 +1,40 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ * The version number of the object such as node, service, etc. This is needed to avoid conflicting writes.
+ * The client must send the version number along with the modified specification when updating these objects.
+ * This approach ensures safe concurrency and determinism in that the change on the object may not be applied
+ * if the version number has changed from the last read. In other words, if two update requests specify the
+ * same base version, only one of the requests can succeed. As a result, two separate update requests that
+ * happen at the same time will not unintentionally overwrite each other.
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ObjectVersion implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("Index")
+    private Integer index = null;
+
+    public Integer getIndex() {
+        return index;
+    }
+
+    public ObjectVersion withIndex(Integer index) {
+        this.index = index;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(index);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/PortConfig.java b/src/main/java/com/github/dockerjava/api/model/PortConfig.java
index c9204b574..aca4d72ec 100644
--- a/src/main/java/com/github/dockerjava/api/model/PortConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/PortConfig.java
@@ -40,6 +40,14 @@ public class PortConfig implements Serializable {
     @JsonProperty("PublishedPort")
     private int publishedPort;
 
+    /**
+     * @since 1.25
+     * docker 1.13
+     * https://github.com/mrjana/docker/blob/14ac9f60d0174256e0713701ebffaf5ca827da71/api/types/swarm/network.go
+     */
+    @JsonProperty("PublishMode")
+    private PublishMode publishMode;
+
     /**
      * @see #name
      */
@@ -103,6 +111,16 @@ public PortConfig withPublishedPort(int publishedPort) {
         return this;
     }
 
+    @CheckForNull
+    public PublishMode getPublishMode() {
+        return publishMode;
+    }
+
+    public PortConfig withPublishMode(PublishMode publishMode) {
+        this.publishMode = publishMode;
+        return this;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
@@ -117,4 +135,13 @@ public boolean equals(Object o) {
     public int hashCode() {
         return HashCodeBuilder.reflectionHashCode(this);
     }
+
+    public enum PublishMode {
+        //ingress load balancing using routing mesh.
+        @JsonProperty("ingress")
+        ingress,
+        //direct host level access on the host where the task is running.
+        @JsonProperty("host")
+        host
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java b/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java
index 02d234914..098cff343 100644
--- a/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java
+++ b/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java
@@ -12,6 +12,6 @@ public enum PortConfigProtocol {
     TCP,
 
     @JsonProperty("udp")
-    udp
+    UDP
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java b/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
index fa04aeff9..bd3f68c9f 100644
--- a/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
+++ b/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
@@ -14,6 +15,7 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ServicePlacement implements Serializable {
     public static final Long serialVersionUID = 1L;
 
@@ -23,6 +25,12 @@ public class ServicePlacement implements Serializable {
     @JsonProperty("Constraints")
     private List<String> constraints;
 
+    /**
+     * @since 1.30
+     */
+    @JsonProperty("Platforms")
+    private List<SwarmNodePlatform> platforms;
+
     /**
      * @see #constraints
      */
@@ -39,6 +47,17 @@ public ServicePlacement withConstraints(List<String> constraints) {
         return this;
     }
 
+    /**
+     * @see #platforms
+     */
+    public List<SwarmNodePlatform> getPlatforms() {
+        return platforms;
+    }
+
+    public void setPlatforms(List<SwarmNodePlatform> platforms) {
+        this.platforms = platforms;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java b/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
index a3fe85ba4..8bdf5e2bc 100644
--- a/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
@@ -10,10 +11,12 @@
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ServiceSpec implements Serializable {
     public static final Long serialVersionUID = 1L;
 
@@ -53,6 +56,12 @@ public class ServiceSpec implements Serializable {
     @JsonProperty("EndpointSpec")
     private EndpointSpec endpointSpec;
 
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Labels")
+    private Map<String, String> labels;
+
     /**
      * @see #name
      */
@@ -148,6 +157,22 @@ public ServiceSpec withEndpointSpec(EndpointSpec endpointSpec) {
         return this;
     }
 
+    /**
+     * @see #labels
+     */
+    public ServiceSpec withLabels(Map<String, String> labels) {
+        this.labels = labels;
+        return this;
+    }
+
+    /**
+     * @see #labels
+     */
+    @CheckForNull
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
diff --git a/src/main/java/com/github/dockerjava/api/model/Task.java b/src/main/java/com/github/dockerjava/api/model/Task.java
new file mode 100644
index 000000000..14dc49e1d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/Task.java
@@ -0,0 +1,297 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class Task implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("ID")
+    private String id = null;
+
+    @JsonProperty("Version")
+    private ObjectVersion version = null;
+
+    @JsonProperty("CreatedAt")
+    private String createdAt = null;
+
+    @JsonProperty("UpdatedAt")
+    private String updatedAt = null;
+
+    @JsonProperty("Name")
+    private String name = null;
+
+    @JsonProperty("Labels")
+    private Map<String, String> labels = null;
+
+    @JsonProperty("Spec")
+    private TaskSpec spec = null;
+
+    @JsonProperty("ServiceID")
+    private String serviceId = null;
+
+    @JsonProperty("Slot")
+    private Integer slot = null;
+
+    @JsonProperty("NodeID")
+    private String nodeId = null;
+
+    @JsonProperty("AssignedGenericResources")
+    private List<GenericResource> assignedGenericResources = null;
+
+    @JsonProperty("Status")
+    private TaskStatus status = null;
+
+    @JsonProperty("DesiredState")
+    private TaskState desiredState = null;
+
+    /**
+     * The ID of the task.
+     *
+     * @return ID
+     **/
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * Get version
+     *
+     * @return version
+     **/
+    public ObjectVersion getVersion() {
+        return version;
+    }
+
+    /**
+     * Get createdAt
+     *
+     * @return createdAt
+     **/
+    public String getCreatedAt() {
+        return createdAt;
+    }
+
+    /**
+     * Get updatedAt
+     *
+     * @return updatedAt
+     **/
+    public String getUpdatedAt() {
+        return updatedAt;
+    }
+
+    /**
+     * Name of the task.
+     *
+     * @return name
+     **/
+
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * User-defined key/value metadata.
+     *
+     * @return labels
+     **/
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
+    /**
+     * Get spec
+     *
+     * @return spec
+     **/
+    public TaskSpec getSpec() {
+        return spec;
+    }
+
+    /**
+     * Get status
+     *
+     * @return status
+     **/
+    public TaskStatus getStatus() {
+        return status;
+    }
+
+    /**
+     * Get desiredState
+     *
+     * @return desiredState
+     **/
+    public TaskState getDesiredState() {
+        return desiredState;
+    }
+
+    /**
+     * The ID of the service this task is part of.
+     *
+     * @return serviceId
+     **/
+    public String getServiceId() {
+        return serviceId;
+    }
+
+    /**
+     * Get slot
+     *
+     * @return slot
+     **/
+    public Integer getSlot() {
+        return slot;
+    }
+
+    /**
+     * The ID of the node that this task is on.
+     *
+     * @return nodeId
+     **/
+    public String getNodeId() {
+        return nodeId;
+    }
+
+    public Task withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public Task withVersion(ObjectVersion version) {
+        this.version = version;
+        return this;
+    }
+
+    public Task withCreatedAt(String createdAt) {
+        this.createdAt = createdAt;
+        return this;
+    }
+
+    public Task withUpdatedAt(String updatedAt) {
+        this.updatedAt = updatedAt;
+        return this;
+    }
+
+    public Task withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public Task withLabels(Map<String, String> labels) {
+        this.labels = labels;
+        return this;
+    }
+
+    public Task withSpec(TaskSpec spec) {
+        this.spec = spec;
+        return this;
+    }
+
+    public Task withServiceId(String serviceId) {
+        this.serviceId = serviceId;
+        return this;
+    }
+
+    public Task withSlot(Integer slot) {
+        this.slot = slot;
+        return this;
+    }
+
+    public Task withNodeId(String nodeId) {
+        this.nodeId = nodeId;
+        return this;
+    }
+
+    public Task withAssignedGenericResources(List<GenericResource> assignedGenericResources) {
+        this.assignedGenericResources = assignedGenericResources;
+        return this;
+    }
+
+    public Task withStatus(TaskStatus status) {
+        this.status = status;
+        return this;
+    }
+
+    public Task withDesiredState(TaskState desiredState) {
+        this.desiredState = desiredState;
+        return this;
+    }
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Task task = (Task) o;
+        return Objects.equals(this.id, task.id) &&
+                Objects.equals(this.version, task.version) &&
+                Objects.equals(this.createdAt, task.createdAt) &&
+                Objects.equals(this.updatedAt, task.updatedAt) &&
+                Objects.equals(this.name, task.name) &&
+                Objects.equals(this.labels, task.labels) &&
+                Objects.equals(this.spec, task.spec) &&
+                Objects.equals(this.serviceId, task.serviceId) &&
+                Objects.equals(this.slot, task.slot) &&
+                Objects.equals(this.nodeId, task.nodeId) &&
+                Objects.equals(this.assignedGenericResources, task.assignedGenericResources) &&
+                Objects.equals(this.status, task.status) &&
+                Objects.equals(this.desiredState, task.desiredState);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, version, createdAt, updatedAt, name, labels, spec, serviceId, slot,
+                nodeId, assignedGenericResources, status, desiredState);
+    }
+
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class Task {\n");
+        sb.append("    ID: ").append(toIndentedString(id)).append("\n");
+        sb.append("    version: ").append(toIndentedString(version)).append("\n");
+        sb.append("    createdAt: ").append(toIndentedString(createdAt)).append("\n");
+        sb.append("    updatedAt: ").append(toIndentedString(updatedAt)).append("\n");
+        sb.append("    name: ").append(toIndentedString(name)).append("\n");
+        sb.append("    labels: ").append(toIndentedString(labels)).append("\n");
+        sb.append("    spec: ").append(toIndentedString(spec)).append("\n");
+        sb.append("    serviceId: ").append(toIndentedString(serviceId)).append("\n");
+        sb.append("    slot: ").append(toIndentedString(slot)).append("\n");
+        sb.append("    nodeId: ").append(toIndentedString(nodeId)).append("\n");
+        sb.append("    assignedGenericResources: ").append(toIndentedString(assignedGenericResources)).append("\n");
+        sb.append("    status: ").append(toIndentedString(status)).append("\n");
+        sb.append("    desiredState: ").append(toIndentedString(desiredState)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(java.lang.Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/TaskSpec.java b/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
index 3e3682324..2a5028a5f 100644
--- a/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
+++ b/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
@@ -13,6 +14,7 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class TaskSpec implements Serializable {
     public static final Long serialVersionUID = 1L;
 
@@ -46,6 +48,14 @@ public class TaskSpec implements Serializable {
     @JsonProperty("LogDriver")
     private Driver logDriver;
 
+    /**
+     * @since 1.24
+     * a counter that triggers an update even if no relevant parameters have been changed
+     * a random value will work if it is incrementing.
+     */
+    @JsonProperty("ForceUpdate")
+    private Integer forceUpdate;
+
     /**
      * @see #containerSpec
      */
@@ -126,6 +136,22 @@ public TaskSpec withLogDriver(Driver logDriver) {
         return this;
     }
 
+    /**
+     * @see #forceUpdate
+     */
+    @CheckForNull
+    public Integer getForceUpdate() {
+        return forceUpdate;
+    }
+
+    /**
+     * @see #forceUpdate
+     */
+    public TaskSpec withForceUpdate(Integer forceUpdate) {
+        this.forceUpdate = forceUpdate;
+        return this;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
diff --git a/src/main/java/com/github/dockerjava/api/model/TaskState.java b/src/main/java/com/github/dockerjava/api/model/TaskState.java
new file mode 100644
index 000000000..8cac62747
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/TaskState.java
@@ -0,0 +1,57 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public enum TaskState {
+
+    NEW("new"),
+
+    ALLOCATED("allocated"),
+
+    PENDING("pending"),
+
+    ASSIGNED("assigned"),
+
+    ACCEPTED("accepted"),
+
+    PREPARING("preparing"),
+
+    READY("ready"),
+
+    STARTING("starting"),
+
+    RUNNING("running"),
+
+    COMPLETE("complete"),
+
+    SHUTDOWN("shutdown"),
+
+    FAILED("failed"),
+
+    REJECTED("rejected");
+
+    private String value;
+
+    TaskState(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    @JsonCreator
+    public static TaskState forValue(String s) {
+        return TaskState.valueOf(s.toUpperCase());
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/TaskStatus.java b/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
new file mode 100644
index 000000000..84dd3b95f
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
@@ -0,0 +1,77 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class TaskStatus implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("Timestamp")
+    private String timestamp = null;
+
+    @JsonProperty("State")
+    private TaskState state = null;
+
+    @JsonProperty("Message")
+    private String message = null;
+
+    @JsonProperty("Err")
+    private String err = null;
+
+    @JsonProperty("ContainerStatus")
+    private TaskStatusContainerStatus containerStatus = null;
+
+    public String getTimestamp() {
+        return timestamp;
+    }
+
+    public TaskStatus withTimestamp(String timestamp) {
+        this.timestamp = timestamp;
+        return this;
+    }
+
+    public TaskState getState() {
+        return state;
+    }
+
+    public TaskStatus withState(TaskState state) {
+        this.state = state;
+        return this;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public TaskStatus withMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+    public String getErr() {
+        return err;
+    }
+
+    public TaskStatus withErr(String err) {
+        this.err = err;
+        return this;
+    }
+
+    public TaskStatusContainerStatus getContainerStatus() {
+        return containerStatus;
+    }
+
+    public TaskStatus withContainerStatus(TaskStatusContainerStatus containerStatus) {
+        this.containerStatus = containerStatus;
+        return this;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java b/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
new file mode 100644
index 000000000..89a7dfb6a
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
@@ -0,0 +1,53 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class TaskStatusContainerStatus implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("ContainerID")
+    private String containerID = null;
+
+    @JsonProperty("PID")
+    private Integer pid = null;
+
+    @JsonProperty("ExitCode")
+    private Integer exitCode = null;
+
+    public String getContainerID() {
+        return containerID;
+    }
+
+    public Integer getPid() {
+        return pid;
+    }
+
+    public Integer getExitCode() {
+        return exitCode;
+    }
+
+    public TaskStatusContainerStatus withContainerID(String containerID) {
+        this.containerID = containerID;
+        return this;
+    }
+
+    public TaskStatusContainerStatus withPid(Integer pid) {
+        this.pid = pid;
+        return this;
+    }
+
+    public TaskStatusContainerStatus withExitCode(Integer exitCode) {
+        this.exitCode = exitCode;
+        return this;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index c175f83d6..cbf06aca7 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -36,6 +36,7 @@
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
 import com.github.dockerjava.api.command.ListServicesCmd;
+import com.github.dockerjava.api.command.ListTasksCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
@@ -101,6 +102,7 @@
 import com.github.dockerjava.core.command.ListImagesCmdImpl;
 import com.github.dockerjava.core.command.ListNetworksCmdImpl;
 import com.github.dockerjava.core.command.ListServicesCmdImpl;
+import com.github.dockerjava.core.command.ListTasksCmdImpl;
 import com.github.dockerjava.core.command.ListVolumesCmdImpl;
 import com.github.dockerjava.core.command.LoadImageCmdImpl;
 import com.github.dockerjava.core.command.LogContainerCmdImpl;
@@ -550,6 +552,11 @@ public RemoveServiceCmd removeServiceCmd(String serviceId) {
         return new RemoveServiceCmdImpl(getDockerCmdExecFactory().createRemoveServiceCmdExec(), serviceId);
     }
 
+    @Override
+    public ListTasksCmd listTasksCmd() {
+        return new ListTasksCmdImpl(getDockerCmdExecFactory().listTasksCmdExec());
+    }
+
     @Override
     public void close() throws IOException {
         getDockerCmdExecFactory().close();
diff --git a/src/main/java/com/github/dockerjava/core/command/ListTasksCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListTasksCmdImpl.java
new file mode 100644
index 000000000..789922ad5
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/ListTasksCmdImpl.java
@@ -0,0 +1,70 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.ListTasksCmd;
+import com.github.dockerjava.api.model.Task;
+import com.github.dockerjava.api.model.TaskState;
+import com.github.dockerjava.core.util.FiltersBuilder;
+
+import javax.annotation.CheckForNull;
+import java.util.List;
+import java.util.Map;
+
+public class ListTasksCmdImpl extends AbstrDockerCmd<ListTasksCmd, List<Task>> implements ListTasksCmd {
+    private FiltersBuilder filters = new FiltersBuilder();
+
+    public ListTasksCmdImpl(Exec exec) {
+        super(exec);
+    }
+
+    @CheckForNull
+    @Override
+    public Map<String, List<String>> getFilters() {
+        return filters.build();
+    }
+
+    @Override
+    public ListTasksCmd withLabelFilter(Map<String, String> labels) {
+        filters.withLabels(labels);
+        return this;
+    }
+
+    @Override
+    public ListTasksCmd withLabelFilter(String... labels) {
+        filters.withLabels(labels);
+        return this;
+    }
+
+    @Override
+    public ListTasksCmd withIdFilter(String... ids) {
+        filters.withFilter("id", ids);
+        return this;
+    }
+
+    @Override
+    public ListTasksCmd withNameFilter(String... names) {
+        filters.withFilter("name", names);
+        return this;
+    }
+
+    @Override
+    public ListTasksCmd withNodeFilter(String... nodeNames) {
+        filters.withFilter("node", nodeNames);
+        return this;
+    }
+
+    @Override
+    public ListTasksCmd withServiceFilter(String... serviceNames) {
+        filters.withFilter("service", serviceNames);
+        return this;
+    }
+
+    @Override
+    public ListTasksCmd withStateFilter(TaskState... desiredStates) {
+        String[] states = new String[desiredStates.length];
+        for (int i = 0; i < desiredStates.length; i++) {
+            states[i] = desiredStates[i].getValue();
+        }
+        filters.withFilter("desired-state", states);
+        return this;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
index 4acc89b1c..01d634b6d 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -40,6 +40,7 @@
 import com.github.dockerjava.api.command.ListNetworksCmd;
 import com.github.dockerjava.api.command.ListServicesCmd;
 import com.github.dockerjava.api.command.ListSwarmNodesCmd;
+import com.github.dockerjava.api.command.ListTasksCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
@@ -640,6 +641,11 @@ public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() {
         return new UpdateSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public ListTasksCmd.Exec listTasksCmdExec() {
+        return new ListTasksCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public void close() throws IOException {
         checkNotNull(client, "Factory not initialized. You probably forgot to call init()!");
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java
new file mode 100644
index 000000000..6a4b27d40
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java
@@ -0,0 +1,43 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.command.ListTasksCmd;
+import com.github.dockerjava.api.model.Task;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.util.FiltersEncoder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
+public class ListTasksCmdExec extends AbstrSyncDockerCmdExec<ListTasksCmd, List<Task>> implements
+        ListTasksCmd.Exec {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ListTasksCmdExec.class);
+
+    public ListTasksCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected List<Task> execute(ListTasksCmd command) {
+        WebTarget webTarget = getBaseResource().path("/tasks");
+
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
+            webTarget = webTarget
+                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+        }
+
+        LOGGER.trace("GET: {}", webTarget);
+        List<Task> tasks = webTarget.request().accept(MediaType.APPLICATION_JSON)
+                .get(new GenericType<List<Task>>() {
+                });
+        LOGGER.trace("Response: {}", tasks);
+
+        return tasks;
+    }
+}
+
diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index 525043f99..be46555fd 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -11,6 +11,8 @@
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;
 
+import com.github.dockerjava.api.command.ListTasksCmd;
+import com.github.dockerjava.netty.exec.ListTasksCmdExec;
 import org.apache.commons.lang.SystemUtils;
 
 import com.github.dockerjava.api.command.AttachContainerCmd;
@@ -722,6 +724,11 @@ public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() {
         return new UpdateSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public ListTasksCmd.Exec listTasksCmdExec() {
+        return new ListTasksCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public void close() throws IOException {
         checkNotNull(eventLoopGroup, "Factory not initialized. You probably forgot to call init()!");
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListTasksCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/ListTasksCmdExec.java
new file mode 100644
index 000000000..3295a74f2
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/netty/exec/ListTasksCmdExec.java
@@ -0,0 +1,46 @@
+package com.github.dockerjava.netty.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.ListTasksCmd;
+import com.github.dockerjava.api.model.Task;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.util.FiltersEncoder;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
+public class ListTasksCmdExec extends AbstrSyncDockerCmdExec<ListTasksCmd, List<Task>> implements
+        ListTasksCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ListTasksCmdExec.class);
+
+    public ListTasksCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected List<Task> execute(ListTasksCmd command) {
+        WebTarget webTarget = getBaseResource().path("/tasks");
+
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
+            webTarget = webTarget
+                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+        }
+
+        LOGGER.trace("GET: {}", webTarget);
+
+        List<Task> tasks = webTarget.request().accept(MediaType.APPLICATION_JSON)
+                .get(new TypeReference<List<Task>>() {
+                });
+
+        LOGGER.trace("Response: {}", tasks);
+
+        return tasks;
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java b/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
index 32ec8963a..07d2f7599 100644
--- a/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
@@ -2,14 +2,19 @@
 
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.ContainerSpec;
+import com.github.dockerjava.api.model.EndpointResolutionMode;
+import com.github.dockerjava.api.model.EndpointSpec;
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.api.model.NetworkAttachmentConfig;
+import com.github.dockerjava.api.model.PortConfig;
+import com.github.dockerjava.api.model.PortConfigProtocol;
 import com.github.dockerjava.api.model.Service;
 import com.github.dockerjava.api.model.ServiceModeConfig;
 import com.github.dockerjava.api.model.ServiceReplicatedModeOptions;
 import com.github.dockerjava.api.model.ServiceSpec;
 import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.api.model.TaskSpec;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -26,7 +31,7 @@ public class CreateServiceCmdExecIT extends SwarmCmdIT {
 
     public static final Logger LOG = LoggerFactory.getLogger(CreateServiceCmdExecIT.class);
     private static final String SERVICE_NAME = "theservice";
-    
+
     @Test
     public void testCreateService() throws DockerException {
         dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
@@ -62,10 +67,10 @@ public void testCreateServiceWithNetworks() {
                 .withIpam(new Network.Ipam()
                         .withDriver("default"))
                 .exec().getId();
-
         ServiceSpec spec = new ServiceSpec()
                 .withName(SERVICE_NAME)
                 .withTaskTemplate(new TaskSpec()
+                        .withForceUpdate(0)
                         .withContainerSpec(new ContainerSpec()
                                 .withImage("busybox"))
                 )
@@ -74,10 +79,17 @@ public void testCreateServiceWithNetworks() {
                                 .withTarget(networkId)
                                 .withAliases(Lists.<String>newArrayList("alias1", "alias2"))
                 ))
+                .withLabels(ImmutableMap.of("com.docker.java.usage","SwarmServiceIT"))
                 .withMode(new ServiceModeConfig().withReplicated(
                         new ServiceReplicatedModeOptions()
                                 .withReplicas(1)
-                ));
+                )).withEndpointSpec(new EndpointSpec()
+                        .withMode(EndpointResolutionMode.VIP)
+                        .withPorts(Lists.<PortConfig>newArrayList(new PortConfig()
+                                .withPublishMode(PortConfig.PublishMode.host)
+                                .withPublishedPort(22)
+                                .withProtocol(PortConfigProtocol.TCP)
+                        )));
 
         dockerRule.getClient().createServiceCmd(spec).exec();
 
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java b/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java
new file mode 100644
index 000000000..dea82869a
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java
@@ -0,0 +1,65 @@
+package com.github.dockerjava.cmd.swarm;
+
+import com.github.dockerjava.api.command.CreateServiceResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.ContainerSpec;
+import com.github.dockerjava.api.model.ServiceModeConfig;
+import com.github.dockerjava.api.model.ServiceReplicatedModeOptions;
+import com.github.dockerjava.api.model.ServiceSpec;
+import com.github.dockerjava.api.model.SwarmSpec;
+import com.github.dockerjava.api.model.Task;
+import com.github.dockerjava.api.model.TaskSpec;
+import com.github.dockerjava.api.model.TaskState;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+
+public class ListTasksCmdExecIT extends SwarmCmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(CreateServiceCmdExecIT.class);
+    private static final String SERVICE_NAME = "inspect_task";
+
+    @Test
+    public void testListTasks() throws DockerException {
+        dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
+                .withListenAddr("127.0.0.1")
+                .withAdvertiseAddr("127.0.0.1")
+                .exec();
+
+        CreateServiceResponse response = dockerRule.getClient().createServiceCmd(new ServiceSpec()
+                .withName(SERVICE_NAME)
+                .withMode(new ServiceModeConfig().withReplicated(
+                        new ServiceReplicatedModeOptions()
+                                .withReplicas(2)
+                ))
+                .withTaskTemplate(new TaskSpec()
+                        .withContainerSpec(new ContainerSpec()
+                                .withImage(DEFAULT_IMAGE))))
+                .exec();
+        String serviceId = response.getId();
+        //filtering with service id
+        List<Task> tasks = dockerRule.getClient().listTasksCmd().withServiceFilter(serviceId).exec();
+        assertThat(tasks, hasSize(2));
+        String taskId = tasks.get(0).getId(), secondId = tasks.get(1).getId();
+        //filtering with unique id
+        tasks = dockerRule.getClient().listTasksCmd().withIdFilter(taskId).exec();
+        assertThat(tasks, hasSize(1));
+        assertThat(tasks.get(0).getId(), is(taskId));
+        //filtering with multiple id
+        tasks = dockerRule.getClient().listTasksCmd().withIdFilter(secondId, taskId).exec();
+        //filtering node id
+        String nodeId = tasks.get(0).getNodeId();
+        tasks = dockerRule.getClient().listTasksCmd().withNodeFilter(nodeId).exec();
+        assertThat(tasks.get(0).getNodeId(), is(nodeId));
+        //filtering with state
+        tasks = dockerRule.getClient().listTasksCmd().withStateFilter(TaskState.RUNNING).exec();
+        assertThat(tasks, hasSize(2));
+        dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
index 9c7b72c3a..4f45df813 100644
--- a/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
@@ -38,7 +38,7 @@ public abstract class SwarmCmdIT extends CmdIT {
     private static final String DOCKER_IN_DOCKER_IMAGE_REPOSITORY = "docker";
     private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "1.12-dind";
 
-    @BeforeClass
+    @Before
     public void beforeTest() throws Exception {
         assumeThat(dockerRule, isGreaterOrEqual(VERSION_1_24));
     }
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index 77fd775f9..f78d7eaed 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -42,6 +42,7 @@
 import com.github.dockerjava.api.command.ListNetworksCmd;
 import com.github.dockerjava.api.command.ListServicesCmd;
 import com.github.dockerjava.api.command.ListSwarmNodesCmd;
+import com.github.dockerjava.api.command.ListTasksCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
@@ -514,6 +515,11 @@ public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() {
         return delegate.updateSwarmNodeCmdExec();
     }
 
+    @Override
+    public ListTasksCmd.Exec listTasksCmdExec() {
+        return delegate.listTasksCmdExec();
+    }
+
     public List<String> getContainerNames() {
         return new ArrayList<String>(containerNames);
     }

From c775539f663f872869795a29ba93fbb7dfa40042 Mon Sep 17 00:00:00 2001
From: Ted <xiao.xj@gmail.com>
Date: Sat, 9 Dec 2017 22:38:49 +0800
Subject: [PATCH 0772/1272] allow client to update swarm node and lists swarm
 node (#963)

---
 .../github/dockerjava/api/DockerClient.java   | 18 ++++++++++
 .../api/command/UpdateSwarmNodeCmd.java       |  5 +++
 .../dockerjava/api/model/SwarmNode.java       |  8 ++---
 .../dockerjava/core/DockerClientImpl.java     | 14 ++++++++
 .../core/command/UpdateSwarmNodeCmdImpl.java  | 22 ++++++++++---
 .../jaxrs/UpdateSwarmNodeCmdExec.java         |  3 +-
 .../netty/exec/UpdateSwarmNodeCmdExec.java    |  3 +-
 .../dockerjava/cmd/swarm/SwarmCmdIT.java      |  7 +++-
 .../cmd/swarm/UpdateSwarmNodeIT.java          | 33 +++++++++++++++++++
 9 files changed, 102 insertions(+), 11 deletions(-)
 create mode 100644 src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index fe40b2a6e..43dde1832 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -34,6 +34,7 @@
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
 import com.github.dockerjava.api.command.ListServicesCmd;
+import com.github.dockerjava.api.command.ListSwarmNodesCmd;
 import com.github.dockerjava.api.command.ListTasksCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
@@ -60,6 +61,7 @@
 import com.github.dockerjava.api.command.UpdateContainerCmd;
 import com.github.dockerjava.api.command.UpdateServiceCmd;
 import com.github.dockerjava.api.command.UpdateSwarmCmd;
+import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.exception.DockerException;
@@ -309,6 +311,22 @@ public interface DockerClient extends Closeable {
      */
     UpdateSwarmCmd updateSwarmCmd(SwarmSpec swarmSpec);
 
+    /**
+     * Updates the swarm node
+     *
+     * @return the command
+     * @since 1.24
+     */
+    UpdateSwarmNodeCmd updateSwarmNodeCmd();
+
+    /**
+     * List nodes in swarm
+     *
+     * @return the command
+     * @since 1.24
+     */
+    ListSwarmNodesCmd listSwarmNodesCmd();
+
     /**
      * Command to list all services in a docker swarm. Only applicable if docker runs in swarm mode.
      *
diff --git a/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java b/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
index 84d069aaf..bdcd403e0 100644
--- a/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
@@ -23,6 +23,11 @@ public interface UpdateSwarmNodeCmd extends SyncDockerCmd<Void> {
 
     UpdateSwarmNodeCmd withSwarmNodeSpec(SwarmNodeSpec swarmNodeSpec);
 
+    UpdateSwarmNodeCmd withVersion(@Nonnull Integer versionId);
+
+    @CheckForNull
+    Integer getVersion();
+
     interface Exec extends DockerCmdSyncExec<UpdateSwarmNodeCmd, Void> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNode.java b/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
index 47b4dfa68..fd2bfe02c 100644
--- a/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
@@ -27,14 +27,14 @@ public class SwarmNode implements Serializable {
     /**
      * @since 1.24
      */
-    @JsonProperty("Id")
+    @JsonProperty("ID")
     private String id;
 
     /**
      * @since 1.24
      */
     @JsonProperty("Version")
-    private String[] version;
+    private ObjectVersion version;
 
     /**
      * @since 1.24
@@ -92,14 +92,14 @@ public SwarmNode withId(String id) {
      * @see #version
      */
     @CheckForNull
-    public String[] getVersion() {
+    public ObjectVersion getVersion() {
         return version;
     }
 
     /**
      * @see #version
      */
-    public SwarmNode withVersion(String[] version) {
+    public SwarmNode withVersion(ObjectVersion version) {
         this.version = version;
         return this;
     }
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index cbf06aca7..a040cac2a 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -36,6 +36,7 @@
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
 import com.github.dockerjava.api.command.ListServicesCmd;
+import com.github.dockerjava.api.command.ListSwarmNodesCmd;
 import com.github.dockerjava.api.command.ListTasksCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
@@ -62,6 +63,7 @@
 import com.github.dockerjava.api.command.UpdateContainerCmd;
 import com.github.dockerjava.api.command.UpdateServiceCmd;
 import com.github.dockerjava.api.command.UpdateSwarmCmd;
+import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.AuthConfig;
@@ -102,6 +104,7 @@
 import com.github.dockerjava.core.command.ListImagesCmdImpl;
 import com.github.dockerjava.core.command.ListNetworksCmdImpl;
 import com.github.dockerjava.core.command.ListServicesCmdImpl;
+import com.github.dockerjava.core.command.ListSwarmNodesCmdImpl;
 import com.github.dockerjava.core.command.ListTasksCmdImpl;
 import com.github.dockerjava.core.command.ListVolumesCmdImpl;
 import com.github.dockerjava.core.command.LoadImageCmdImpl;
@@ -128,6 +131,7 @@
 import com.github.dockerjava.core.command.UpdateContainerCmdImpl;
 import com.github.dockerjava.core.command.UpdateServiceCmdImpl;
 import com.github.dockerjava.core.command.UpdateSwarmCmdImpl;
+import com.github.dockerjava.core.command.UpdateSwarmNodeCmdImpl;
 import com.github.dockerjava.core.command.VersionCmdImpl;
 import com.github.dockerjava.core.command.WaitContainerCmdImpl;
 
@@ -528,6 +532,16 @@ public UpdateSwarmCmd updateSwarmCmd(SwarmSpec swarmSpec) {
         return new UpdateSwarmCmdImpl(getDockerCmdExecFactory().createUpdateSwarmCmdExec(), swarmSpec);
     }
 
+    @Override
+    public UpdateSwarmNodeCmd updateSwarmNodeCmd() {
+        return new UpdateSwarmNodeCmdImpl(getDockerCmdExecFactory().updateSwarmNodeCmdExec());
+    }
+
+    @Override
+    public ListSwarmNodesCmd listSwarmNodesCmd() {
+        return new ListSwarmNodesCmdImpl(getDockerCmdExecFactory().listSwarmNodeCmdExec());
+    }
+
     @Override public ListServicesCmd listServicesCmd() {
         return new ListServicesCmdImpl(getDockerCmdExecFactory().createListServicesCmdExec());
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java
index d7596e3dc..dfde7eba6 100644
--- a/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java
@@ -12,8 +12,6 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Update swarmNode spec
  *
@@ -26,6 +24,12 @@ public class UpdateSwarmNodeCmdImpl extends AbstrDockerCmd<UpdateSwarmNodeCmd, V
 
     private SwarmNodeSpec swarmNodeSpec;
 
+    private Integer version;
+
+    public UpdateSwarmNodeCmdImpl(Exec exec) {
+        super(exec);
+    }
+
     public UpdateSwarmNodeCmdImpl(Exec exec, String swarmNodeId, SwarmNodeSpec swarmNodeSpec) {
         super(exec);
         withSwarmNodeId(swarmNodeId);
@@ -60,12 +64,22 @@ public SwarmNodeSpec getSwarmNodeSpec() {
      * @see #swarmNodeSpec
      */
     public UpdateSwarmNodeCmd withSwarmNodeSpec(SwarmNodeSpec swarmNodeSpec) {
-        checkNotNull(swarmNodeSpec.getAvailability(), "Availability in SwarmNodeSpec was not specified");
-        checkNotNull(swarmNodeSpec.getRole(), "Role in SwarmNodeSpec was not specified");
         this.swarmNodeSpec = swarmNodeSpec;
         return this;
     }
 
+    @Override
+    public UpdateSwarmNodeCmd withVersion(@Nonnull Integer versionId) {
+        this.version = versionId;
+        return this;
+    }
+
+    @CheckForNull
+    @Override
+    public Integer getVersion() {
+        return version;
+    }
+
     /**
      * @throws NotFoundException No such swarmNode
      */
diff --git a/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java
index a1be93c42..efb34f062 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java
@@ -25,7 +25,8 @@ public UpdateSwarmNodeCmdExec(WebTarget baseResource, DockerClientConfig dockerC
     @Override
     protected Void execute(UpdateSwarmNodeCmd command) {
         WebTarget webResource = getBaseResource().path("/nodes/{id}/update")
-                .resolveTemplate("id", command.getSwarmNodeId());
+                .resolveTemplate("id", command.getSwarmNodeId())
+                .queryParam("version", command.getVersion());
 
         LOGGER.trace("POST: {}", webResource);
         webResource.request().accept(MediaType.APPLICATION_JSON)
diff --git a/src/main/java/com/github/dockerjava/netty/exec/UpdateSwarmNodeCmdExec.java b/src/main/java/com/github/dockerjava/netty/exec/UpdateSwarmNodeCmdExec.java
index 8c877a2f8..08d26ce38 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/UpdateSwarmNodeCmdExec.java
+++ b/src/main/java/com/github/dockerjava/netty/exec/UpdateSwarmNodeCmdExec.java
@@ -23,7 +23,8 @@ public UpdateSwarmNodeCmdExec(WebTarget baseResource, DockerClientConfig dockerC
     @Override
     protected Void execute(UpdateSwarmNodeCmd command) {
         WebTarget webResource = getBaseResource().path("/nodes/{id}/update")
-                .resolveTemplate("id", command.getSwarmNodeId());
+                .resolveTemplate("id", command.getSwarmNodeId())
+                .queryParam("version", command.getVersion());
 
         LOGGER.trace("POST: {}", webResource);
         webResource.request().accept(MediaType.APPLICATION_JSON)
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
index 4f45df813..29035cf45 100644
--- a/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
@@ -3,6 +3,7 @@
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.exception.ConflictException;
+import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.NotAcceptableException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.ExposedPort;
@@ -56,7 +57,7 @@ public void afterMethod() {
     protected void removeDockersInDocker() {
         for (int i = 1; i <= numberOfDockersInDocker; i++) {
             try {
-                dockerRule.getClient().removeContainerCmd(DOCKER_IN_DOCKER_CONTAINER_PREFIX + i);
+                dockerRule.getClient().removeContainerCmd(DOCKER_IN_DOCKER_CONTAINER_PREFIX + i).withForce(true).exec();
             } catch (NotFoundException e) {
                 // container does not exist
             }
@@ -129,6 +130,10 @@ private void leaveIfInSwarm() {
             dockerRule.getClient().leaveSwarmCmd().withForceEnabled(true).exec();
         } catch (NotAcceptableException e) {
             // do nothing, node is not part of a swarm
+        } catch (DockerException ex) {
+            if (!ex.getMessage().contains("node is not part of a swarm")) {
+                throw ex;
+            }
         }
     }
 }
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java b/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java
new file mode 100644
index 000000000..4d5162415
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java
@@ -0,0 +1,33 @@
+package com.github.dockerjava.cmd.swarm;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.model.SwarmNode;
+import com.github.dockerjava.api.model.SwarmNodeAvailability;
+import com.github.dockerjava.api.model.SwarmNodeSpec;
+import com.github.dockerjava.api.model.SwarmNodeState;
+import com.github.dockerjava.api.model.SwarmSpec;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+public class UpdateSwarmNodeIT extends SwarmCmdIT {
+    @Test
+    public void testUpdateSwarmNode() {
+        DockerClient docker1 = startDockerInDocker();
+        docker1.initializeSwarmCmd(new SwarmSpec()).exec();
+        List<SwarmNode> nodes = docker1.listSwarmNodesCmd().exec();
+        assertThat(1, is(nodes.size()));
+        SwarmNode node = nodes.get(0);
+        assertThat(SwarmNodeState.READY, is(node.getStatus().getState()));
+        //update the node availability
+        SwarmNodeSpec nodeSpec = node.getSpec().withAvailability(SwarmNodeAvailability.PAUSE);
+        docker1.updateSwarmNodeCmd().withSwarmNodeId(node.getId()).withVersion(node.getVersion().getIndex())
+                .withSwarmNodeSpec(nodeSpec).exec();
+        nodes = docker1.listSwarmNodesCmd().exec();
+        assertThat(1, is(nodes.size()));
+        assertThat(SwarmNodeAvailability.PAUSE, is(nodes.get(0).getSpec().getAvailability()));
+    }
+}

From e110a4b3ebc90544365abe3cfc595ed5bb62aaae Mon Sep 17 00:00:00 2001
From: Yuting Liu <liuyutingfish@gmail.com>
Date: Sat, 9 Dec 2017 14:40:14 +0000
Subject: [PATCH 0773/1272] Add configs for Statistics API (#957)

* Add statistics network config for Statistics API

* Update the structure of network

* Add statistics Test

* Chagne to is

* Add MemoryStatsConfig for memoryStats

* Add BlkioStatsConfig for blkioStats

* Add CpuStatsConfig and pids_stats
---
 .../api/model/BlkioStatsConfig.java           | 106 +++++
 .../dockerjava/api/model/CpuStatsConfig.java  |  61 +++
 .../dockerjava/api/model/CpuUsageConfig.java  |  62 +++
 .../api/model/MemoryStatsConfig.java          |  61 +++
 .../dockerjava/api/model/PidsStatsConfig.java |  26 ++
 .../api/model/StatisticNetworksConfig.java    | 123 ++++++
 .../dockerjava/api/model/Statistics.java      |  34 +-
 .../dockerjava/api/model/StatsConfig.java     | 384 ++++++++++++++++++
 .../api/model/ThrottlingDataConfig.java       |  50 +++
 .../dockerjava/api/model/StatisticsTest.java  | 125 ++++++
 .../containers/container/stats/stats1.json    | 132 ++++++
 11 files changed, 1152 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/StatsConfig.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
 create mode 100644 src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
 create mode 100644 src/test/resources/samples/1.27/containers/container/stats/stats1.json

diff --git a/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java b/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
new file mode 100644
index 000000000..b6699f8c3
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
@@ -0,0 +1,106 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Used in {@link Statistics}
+ *
+ * @author Yuting Liu
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+class BlkioStatsConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("io_service_bytes_recursive")
+    private List<Long> ioServiceBytesRecursive;
+
+    @JsonProperty("io_serviced_recursive")
+    private List<Long> ioServicedRecursive;
+
+    @JsonProperty("io_queue_recursive")
+    private List<Long> ioQueueRecursive;
+
+    @JsonProperty("io_service_time_recursive")
+    private List<Long> ioServiceTimeRecursive;
+
+    @JsonProperty("io_wait_time_recursive")
+    private List<Long> ioWaitTimeRecursive;
+
+    @JsonProperty("io_merged_recursive")
+    private List<Long> ioMergedRecursive;
+
+    @JsonProperty("io_time_recursive")
+    private List<Long> ioTimeRecursive;
+
+    @JsonProperty("sectors_recursive")
+    private List<Long> sectorsRecursive;
+
+    /**
+     * @see #ioServiceBytesRecursive
+     */
+    @CheckForNull
+    public List<Long> getIoServiceBytesRecursive() {
+        return ioServiceBytesRecursive;
+    }
+
+    /**
+     * @see #ioServicedRecursive
+     */
+    @CheckForNull
+    public List<Long> getIoServicedRecursive() {
+        return ioServicedRecursive;
+    }
+
+    /**
+     * @see #ioQueueRecursive
+     */
+    @CheckForNull
+    public List<Long> getIoQueueRecursive() {
+        return ioQueueRecursive;
+    }
+
+    /**
+     * @see #ioServiceTimeRecursive
+     */
+    @CheckForNull
+    public List<Long> getIoServiceTimeRecursive() {
+        return ioServiceTimeRecursive;
+    }
+
+    /**
+     * @see #ioWaitTimeRecursive
+     */
+    @CheckForNull
+    public List<Long> getIoWaitTimeRecursive() {
+        return ioWaitTimeRecursive;
+    }
+
+    /**
+     * @see #ioMergedRecursive
+     */
+    @CheckForNull
+    public List<Long> getIoMergedRecursive() {
+        return ioMergedRecursive;
+    }
+
+    /**
+     * @see #ioTimeRecursive
+     */
+    @CheckForNull
+    public List<Long> getIoTimeRecursive() {
+        return ioTimeRecursive;
+    }
+
+    /**
+     * @see #sectorsRecursive
+     */
+    @CheckForNull
+    public List<Long> getSectorsRecursive() {
+        return sectorsRecursive;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java b/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
new file mode 100644
index 000000000..7a7a699b4
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
@@ -0,0 +1,61 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * Used in {@link Statistics}
+ *
+ * @author Yuting Liu
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+class CpuStatsConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("cpu_usage")
+    private CpuUsageConfig cpuUsage;
+
+    @JsonProperty("system_cpu_usage")
+    private Long systemCpuUsage;
+
+    @JsonProperty("online_cpus")
+    private Long onlineCpus;
+
+    @JsonProperty("throttling_data")
+    private ThrottlingDataConfig throttlingData;
+
+    /**
+     * @see #cpuUsage
+     */
+    @CheckForNull
+    public CpuUsageConfig getCpuUsage() {
+        return cpuUsage;
+    }
+
+    /**
+     * @see #systemCpuUsage
+     */
+    @CheckForNull
+    public Long getSystemCpuUsage() {
+        return systemCpuUsage;
+    }
+
+    /**
+     * @see #onlineCpus
+     */
+    @CheckForNull
+    public Long getOnlineCpus() {
+        return onlineCpus;
+    }
+
+    /**
+     * @see #throttlingData
+     */
+    @CheckForNull
+    public ThrottlingDataConfig getThrottlingData() {
+        return throttlingData;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java b/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
new file mode 100644
index 000000000..73cf0c57c
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
@@ -0,0 +1,62 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Used in {@link Statistics}
+ *
+ * @author Yuting Liu
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+class CpuUsageConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("total_usage")
+    private Long totalUsage;
+
+    @JsonProperty("percpu_usage")
+    private List<Long> percpuUsage;
+
+    @JsonProperty("usage_in_kernelmode")
+    private Long usageInKernelmode;
+
+    @JsonProperty("usage_in_usermode")
+    private Long usageInUsermode;
+
+    /**
+     * @see #totalUsage
+     */
+    @CheckForNull
+    public Long getTotalUsage() {
+        return totalUsage;
+    }
+
+    /**
+     * @see #percpuUsage
+     */
+    @CheckForNull
+    public List<Long> getPercpuUsage() {
+        return percpuUsage;
+    }
+
+    /**
+     * @see #usageInKernelmode
+     */
+    @CheckForNull
+    public Long getUsageInKernelmode() {
+        return usageInKernelmode;
+    }
+
+    /**
+     * @see #usageInUsermode
+     */
+    @CheckForNull
+    public Long getUsageInUsermode() {
+        return usageInUsermode;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java b/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
new file mode 100644
index 000000000..8c1a24bc3
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
@@ -0,0 +1,61 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * Used in {@link Statistics}
+ *
+ * @author Yuting Liu
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+class MemoryStatsConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("usage")
+    private Long usage;
+
+    @JsonProperty("max_usage")
+    private Long maxUsage;
+
+    @JsonProperty("stats")
+    private StatsConfig stats;
+
+    @JsonProperty("limit")
+    private Long limit;
+
+    /**
+     * @see #usage
+     */
+    @CheckForNull
+    public Long getUsage() {
+        return usage;
+    }
+
+    /**
+     * @see #maxUsage
+     */
+    @CheckForNull
+    public Long getMaxUsage() {
+        return maxUsage;
+    }
+
+    /**
+     * @see #stats
+     */
+    @CheckForNull
+    public StatsConfig getStats() {
+        return stats;
+    }
+
+    /**
+     * @see #limit
+     */
+    @CheckForNull
+    public Long getLimit() {
+        return limit;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java b/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java
new file mode 100644
index 000000000..bbf8806a3
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java
@@ -0,0 +1,26 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * Used in {@link Statistics}
+ *
+ * @author Yuting Liu
+ */
+class PidsStatsConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("current")
+    private Long current;
+
+    /**
+     * @see #current
+     */
+    @CheckForNull
+    public Long getCurrent() {
+        return current;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java b/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
new file mode 100644
index 000000000..a6cc5ff0e
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
@@ -0,0 +1,123 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * Used in {@link Statistics}
+ *
+ * @author Yuting Liu
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+class StatisticNetWorksConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("rx_bytes")
+    private Long rxBytes;
+
+    @JsonProperty("rx_dropped")
+    private Long rxDropped;
+
+    @JsonProperty("rx_errors")
+    private Long rxErrors;
+
+    @JsonProperty("rx_packets")
+    private Long rxPackets;
+
+    @JsonProperty("tx_bytes")
+    private Long txBytes;
+
+    @JsonProperty("tx_dropped")
+    private Long txDropped;
+
+    @JsonProperty("tx_errors")
+    private Long txErrors;
+
+    @JsonProperty("tx_packets")
+    private Long txPackets;
+
+    /**
+     * @see #rxBytes
+     */
+    @CheckForNull
+    public Long getRxBytes() {
+        return rxBytes;
+    }
+
+    /**
+     * @see #rxDropped
+     */
+    @CheckForNull
+    public Long getRxDropped() {
+        return rxDropped;
+    }
+
+    /**
+     * @see #rxErrors
+     */
+    @CheckForNull
+    public Long getRxErrors() {
+        return rxErrors;
+    }
+
+    /**
+     * @see #rxPackets
+     */
+    @CheckForNull
+    public Long getRxPackets() {
+        return rxPackets;
+    }
+
+    /**
+     * @see #txBytes
+     */
+    @CheckForNull
+    public Long getTxBytes() {
+        return txBytes;
+    }
+
+    /**
+     * @see #txDropped
+     */
+    @CheckForNull
+    public Long getTxDropped() {
+        return txDropped;
+    }
+
+    /**
+     * @see #txErrors
+     */
+    @CheckForNull
+    public Long getTxErrors() {
+        return txErrors;
+    }
+
+    /**
+     * @see #txPackets
+     */
+    @CheckForNull
+    public Long getTxPackets() {
+        return txPackets;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/Statistics.java b/src/main/java/com/github/dockerjava/api/model/Statistics.java
index 5cbe1c02c..3b020c4d2 100644
--- a/src/main/java/com/github/dockerjava/api/model/Statistics.java
+++ b/src/main/java/com/github/dockerjava/api/model/Statistics.java
@@ -28,29 +28,35 @@ public class Statistics implements Serializable {
      */
     @CheckForNull
     @JsonProperty("networks")
-    private Map<String, Object> networks;
+    private Map<String, StatisticNetWorksConfig> networks;
 
     /**
      * @deprecated as of Docker Remote API 1.21, replaced by {@link #networks}
      */
     @Deprecated
     @JsonProperty("network")
-    private Map<String, Object> network;
+    private Map<String, StatisticNetWorksConfig> network;
 
     @JsonProperty("memory_stats")
-    private Map<String, Object> memoryStats;
+    private MemoryStatsConfig memoryStats;
 
     @JsonProperty("blkio_stats")
-    private Map<String, Object> blkioStats;
+    private BlkioStatsConfig blkioStats;
 
     @JsonProperty("cpu_stats")
-    private Map<String, Object> cpuStats;
+    private CpuStatsConfig cpuStats;
 
     /**
      * @since Docker Remote API 1.19
      */
     @JsonProperty("precpu_stats")
-    private Map<String, Object> preCpuStats;
+    private CpuStatsConfig preCpuStats;
+
+    /**
+     * @since Docker Remote API 1.23
+     */
+    @JsonProperty("pids_stats")
+    private PidsStatsConfig pidsStats;
 
     public String getRead() {
         return read;
@@ -60,7 +66,7 @@ public String getRead() {
      * @since Docker Remote API 1.21
      */
     @CheckForNull
-    public Map<String, Object> getNetworks() {
+    public Map<String, StatisticNetWorksConfig> getNetworks() {
         return networks;
     }
 
@@ -68,11 +74,11 @@ public Map<String, Object> getNetworks() {
      * @deprecated as of Docker Remote API 1.21, replaced by {@link #getNetworks()}
      */
     @Deprecated
-    public Map<String, Object> getNetwork() {
+    public Map<String, StatisticNetWorksConfig> getNetwork() {
         return network;
     }
 
-    public Map<String, Object> getCpuStats() {
+    public CpuStatsConfig getCpuStats() {
         return cpuStats;
     }
 
@@ -80,18 +86,22 @@ public Map<String, Object> getCpuStats() {
      * The cpu statistic of last read, which is used for calculating the cpu usage percent.
      * It is not the exact copy of the {@link #getCpuStats()}.
      */
-    public Map<String, Object> getPreCpuStats() {
+    public CpuStatsConfig getPreCpuStats() {
         return preCpuStats;
     }
 
-    public Map<String, Object> getMemoryStats() {
+    public MemoryStatsConfig getMemoryStats() {
         return memoryStats;
     }
 
-    public Map<String, Object> getBlkioStats() {
+    public BlkioStatsConfig getBlkioStats() {
         return blkioStats;
     }
 
+    public PidsStatsConfig getPidsStats() {
+        return pidsStats;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
diff --git a/src/main/java/com/github/dockerjava/api/model/StatsConfig.java b/src/main/java/com/github/dockerjava/api/model/StatsConfig.java
new file mode 100644
index 000000000..a732c78fa
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/StatsConfig.java
@@ -0,0 +1,384 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+class StatsConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("active_anon")
+    private Long activeAnon;
+
+    @JsonProperty("active_file")
+    private Long activeFile;
+
+    @JsonProperty("cache")
+    private Long cache;
+
+    @JsonProperty("dirty")
+    private Long dirty;
+
+    @JsonProperty("hierarchical_memory_limit")
+    private Long hierarchicalMemoryLimit;
+
+    @JsonProperty("hierarchical_memsw_limit")
+    private Long hierarchicalMemswLimit;
+
+    @JsonProperty("inactive_anon")
+    private Long  inactiveAnon;
+
+    @JsonProperty("inactive_file")
+    private Long inactiveFile;
+
+    @JsonProperty("mapped_file")
+    private Long mappedFile;
+
+    @JsonProperty("pgfault")
+    private Long pgfault;
+
+    @JsonProperty("pgmajfault")
+    private Long pgmajfault;
+
+    @JsonProperty("pgpgin")
+    private Long pgpgin;
+
+    @JsonProperty("pgpgout")
+    private Long pgpgout;
+
+    @JsonProperty("rss")
+    private Long rss;
+
+    @JsonProperty("rss_huge")
+    private Long rssHuge;
+
+    @JsonProperty("swap")
+    private Long swap;
+
+    @JsonProperty("total_active_anon")
+    private Long totalActiveAnon;
+
+    @JsonProperty("total_active_file")
+    private Long totalActiveFile;
+
+    @JsonProperty("total_cache")
+    private Long totalCache;
+
+    @JsonProperty("total_dirty")
+    private Long totalDirty;
+
+    @JsonProperty("total_inactive_anon")
+    private Long totalInactiveAnon;
+
+    @JsonProperty("total_inactive_file")
+    private Long totalInactiveFile;
+
+    @JsonProperty("total_mapped_file")
+    private Long totalMappedFile;
+
+    @JsonProperty("total_pgfault")
+    private Long totalPgfault;
+
+    @JsonProperty("total_pgmajfault")
+    private Long totalPgmajfault;
+
+    @JsonProperty("total_pgpgin")
+    private Long totalPgpgin;
+
+    @JsonProperty("total_pgpgout")
+    private Long totalPgpgout;
+
+    @JsonProperty("total_rss")
+    private Long totalRss;
+
+    @JsonProperty("total_rss_huge")
+    private Long totalRssHuge;
+
+    @JsonProperty("total_swap")
+    private Long totalSwap;
+
+    @JsonProperty("total_unevictable")
+    private Long totalUnevictable;
+
+    @JsonProperty("total_writeback")
+    private Long totalWriteback;
+
+    @JsonProperty("unevictable")
+    private Long unevictable;
+
+    @JsonProperty("writeback")
+    private Long writeback;
+
+    /**
+     * @see #activeAnon
+     */
+    @CheckForNull
+    public Long getActiveAnon() {
+        return activeAnon;
+    }
+
+    /**
+     * @see #activeFile
+     */
+    @CheckForNull
+    public Long getActiveFile() {
+        return activeFile;
+    }
+
+    /**
+     * @see #cache
+     */
+    @CheckForNull
+    public Long getCache() {
+        return cache;
+    }
+
+    /**
+     * @see #dirty
+     */
+    @CheckForNull
+    public Long getDirty() {
+        return dirty;
+    }
+
+    /**
+     * @see #hierarchicalMemoryLimit
+     */
+    @CheckForNull
+    public Long getHierarchicalMemoryLimit() {
+        return hierarchicalMemoryLimit;
+    }
+
+    /**
+     * @see #hierarchicalMemswLimit
+     */
+    @CheckForNull
+    public Long getHierarchicalMemswLimit() {
+        return hierarchicalMemswLimit;
+    }
+
+    /**
+     * @see #inactiveAnon
+     */
+    @CheckForNull
+    public Long getInactiveAnon() {
+        return inactiveAnon;
+    }
+
+    /**
+     * @see #inactiveFile
+     */
+    @CheckForNull
+    public Long getInactiveFile() {
+        return inactiveFile;
+    }
+
+    /**
+     * @see #mappedFile
+     */
+    @CheckForNull
+    public Long getMappedFile() {
+        return mappedFile;
+    }
+
+    /**
+     * @see #pgfault
+     */
+    @CheckForNull
+    public Long getPgfault() {
+        return pgfault;
+    }
+
+    /**
+     * @see #pgmajfault
+     */
+    @CheckForNull
+    public Long getPgmajfault() {
+        return pgmajfault;
+    }
+
+    /**
+     * @see #pgpgin
+     */
+    @CheckForNull
+    public Long getPgpgin() {
+        return pgpgin;
+    }
+
+    /**
+     * @see #pgpgout
+     */
+    @CheckForNull
+    public Long getPgpgout() {
+        return pgpgout;
+    }
+
+    /**
+     * @see #rss
+     */
+    @CheckForNull
+    public Long getRss() {
+        return rss;
+    }
+
+    /**
+     * @see #rssHuge
+     */
+    @CheckForNull
+    public Long getRssHuge() {
+        return rssHuge;
+    }
+
+    /**
+     * @see #swap
+     */
+    @CheckForNull
+    public Long getSwap() {
+        return swap;
+    }
+
+    /**
+     * @see #totalActiveAnon
+     */
+    @CheckForNull
+    public Long getTotalActiveAnon() {
+        return totalActiveAnon;
+    }
+
+    /**
+     * @see #totalActiveFile
+     */
+    @CheckForNull
+    public Long getTotalActiveFile() {
+        return totalActiveFile;
+    }
+
+    /**
+     * @see #totalCache
+     */
+    @CheckForNull
+    public Long getTotalCache() {
+        return totalCache;
+    }
+
+    /**
+     * @see #totalDirty
+     */
+    @CheckForNull
+    public Long getTotalDirty() {
+        return totalDirty;
+    }
+
+    /**
+     * @see #totalInactiveAnon
+     */
+    @CheckForNull
+    public Long getTotalInactiveAnon() {
+        return totalInactiveAnon;
+    }
+
+    /**
+     * @see #totalInactiveFile
+     */
+    @CheckForNull
+    public Long getTotalInactiveFile() {
+        return totalInactiveFile;
+    }
+
+    /**
+     * @see #totalMappedFile
+     */
+    @CheckForNull
+    public Long getTotalMappedFile() {
+        return totalMappedFile;
+    }
+
+    /**
+     * @see #totalPgfault
+     */
+    @CheckForNull
+    public Long getTotalPgfault() {
+        return totalPgfault;
+    }
+
+    /**
+     * @see #totalPgmajfault
+     */
+    @CheckForNull
+    public Long getTotalPgmajfault() {
+        return totalPgmajfault;
+    }
+
+    /**
+     * @see #totalPgpgin
+     */
+    @CheckForNull
+    public Long getTotalPgpgin() {
+        return totalPgpgin;
+    }
+
+    /**
+     * @see #totalPgpgout
+     */
+    @CheckForNull
+    public Long getTotalPgpgout() {
+        return totalPgpgout;
+    }
+
+    /**
+     * @see #totalRss
+     */
+    @CheckForNull
+    public Long getTotalRss() {
+        return totalRss;
+    }
+
+    /**
+     * @see #totalRssHuge
+     */
+    @CheckForNull
+    public Long getTotalRssHuge() {
+        return totalRssHuge;
+    }
+
+    /**
+     * @see #totalSwap
+     */
+    @CheckForNull
+    public Long getTotalSwap() {
+        return totalSwap;
+    }
+
+    /**
+     * @see #totalUnevictable
+     */
+    @CheckForNull
+    public Long getTotalUnevictable() {
+        return totalUnevictable;
+    }
+
+    /**
+     * @see #totalWriteback
+     */
+    @CheckForNull
+    public Long getTotalWriteback() {
+        return totalWriteback;
+    }
+
+    /**
+     * @see #unevictable
+     */
+    @CheckForNull
+    public Long getUnevictable() {
+        return unevictable;
+    }
+
+    /**
+     * @see #writeback
+     */
+    @CheckForNull
+    public Long getWriteback() {
+        return writeback;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java b/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
new file mode 100644
index 000000000..e08f93b6d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
@@ -0,0 +1,50 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * Used in {@link Statistics}
+ *
+ * @author Yuting Liu
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+class ThrottlingDataConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("periods")
+    private Long periods;
+
+    @JsonProperty("throttled_periods")
+    private Long throttledPeriods;
+
+    @JsonProperty("throttled_time")
+    private Long throttledTime;
+
+    /**
+     * @see #periods
+     */
+    @CheckForNull
+    public Long getPeriods() {
+        return periods;
+    }
+
+    /**
+     * @see #throttledPeriods
+     */
+    @CheckForNull
+    public Long getThrottledPeriods() {
+        return throttledPeriods;
+    }
+
+    /**
+     * @see #throttledTime
+     */
+    @CheckForNull
+    public Long getThrottledTime() {
+        return throttledTime;
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java b/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
new file mode 100644
index 000000000..d2083c4b3
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
@@ -0,0 +1,125 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.empty;
+
+/**
+ * @author Yuting Liu
+ */
+public class StatisticsTest {
+
+    @Test
+    public void serderJson1() throws IOException {
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(Statistics.class);
+
+        final Statistics statistics = testRoundTrip(RemoteApiVersion.VERSION_1_27,
+                "containers/container/stats/stats1.json",
+                type
+        );
+
+        assertThat(statistics.getRead(), equalTo("2017-12-06T00:42:03.8352972Z"));
+
+        final StatisticNetWorksConfig network = statistics.getNetworks().get("eth0");
+        assertThat(network.getRxBytes(), is(1230L));
+        assertThat(network.getRxPackets(), is(19L));
+        assertThat(network.getRxErrors(), is(0L));
+        assertThat(network.getRxDropped(), is(0L));
+        assertThat(network.getTxBytes(), is(0L));
+        assertThat(network.getTxPackets(), is(0L));
+        assertThat(network.getTxErrors(), is(0L));
+        assertThat(network.getTxDropped(), is(0L));
+
+        final MemoryStatsConfig memoryStats = statistics.getMemoryStats();
+        assertThat(memoryStats.getUsage(), is(647168L));
+        assertThat(memoryStats.getMaxUsage(), is(1703936L));
+
+        final StatsConfig stats = memoryStats.getStats();
+        assertThat(stats.getActiveAnon(), is(102400L));
+        assertThat(stats.getActiveFile(), is(0L));
+        assertThat(stats.getCache(), is(0L));
+        assertThat(stats.getDirty(), is(0L));
+        assertThat(stats.getHierarchicalMemoryLimit(), is(9223372036854771712L));
+        assertThat(stats.getHierarchicalMemswLimit(), is(9223372036854771712L));
+        assertThat(stats.getInactiveAnon(), is(0L));
+        assertThat(stats.getInactiveFile(), is(0L));
+        assertThat(stats.getMappedFile(), is(0L));
+        assertThat(stats.getPgfault(), is(9656L));
+        assertThat(stats.getPgmajfault(), is(0L));
+        assertThat(stats.getPgpgin(), is(3425L));
+        assertThat(stats.getPgpgout(), is(3400L));
+        assertThat(stats.getRss(), is(102400L));
+        assertThat(stats.getRssHuge(), is(0L));
+        assertThat(stats.getSwap(), is(0L));
+        assertThat(stats.getTotalActiveAnon(), is(102400L));
+        assertThat(stats.getTotalActiveFile(), is(0L));
+        assertThat(stats.getTotalCache(), is(0L));
+        assertThat(stats.getTotalDirty(), is(0L));
+        assertThat(stats.getTotalInactiveAnon(), is(0L));
+        assertThat(stats.getTotalInactiveFile(), is(0L));
+        assertThat(stats.getTotalMappedFile(), is(0L));
+        assertThat(stats.getTotalPgfault(), is(9656L));
+        assertThat(stats.getTotalPgmajfault(), is(0L));
+        assertThat(stats.getTotalPgpgin(), is(3425L));
+        assertThat(stats.getTotalPgpgout(), is(3400L));
+        assertThat(stats.getTotalRss(), is(102400L));
+        assertThat(stats.getTotalRssHuge(), is(0L));
+        assertThat(stats.getTotalSwap(), is(0L));
+        assertThat(stats.getTotalUnevictable(), is(0L));
+        assertThat(stats.getTotalWriteback(), is(0L));
+        assertThat(stats.getUnevictable(), is(0L));
+        assertThat(stats.getWriteback(), is(0L));
+
+        assertThat(memoryStats.getLimit(), is(2095874048L));
+
+        final BlkioStatsConfig blkioStats = statistics.getBlkioStats();
+        assertThat(blkioStats.getIoServiceBytesRecursive(), is(empty()));
+        assertThat(blkioStats.getIoServicedRecursive(), is(empty()));
+        assertThat(blkioStats.getIoQueueRecursive(), is(empty()));
+        assertThat(blkioStats.getIoServiceTimeRecursive(), is(empty()));
+        assertThat(blkioStats.getIoWaitTimeRecursive(), is(empty()));
+        assertThat(blkioStats.getIoMergedRecursive(), is(empty()));
+        assertThat(blkioStats.getIoTimeRecursive(), is(empty()));
+        assertThat(blkioStats.getSectorsRecursive(), is(empty()));
+
+        final CpuStatsConfig cpuStats = statistics.getCpuStats();
+        final CpuUsageConfig cpuUsage = cpuStats.getCpuUsage();
+        assertThat(cpuUsage.getTotalUsage(), is(212198028L));
+        assertThat(cpuUsage.getPercpuUsage(), equalTo(Arrays.asList(71592953L, 42494761L, 59298344L, 38811970L)));
+        assertThat(cpuUsage.getUsageInKernelmode(), is(170000000L));
+        assertThat(cpuUsage.getUsageInUsermode(), is(20000000L));
+        assertThat(cpuStats.getSystemCpuUsage(), is(545941980000000L));
+        assertThat(cpuStats.getOnlineCpus(), is(4L));
+        final ThrottlingDataConfig throttlingData = cpuStats.getThrottlingData();
+        assertThat(throttlingData.getPeriods(), is(0L));
+        assertThat(throttlingData.getThrottledPeriods(), is(0L));
+        assertThat(throttlingData.getThrottledTime(), is(0L));
+
+        final CpuStatsConfig preCpuStats = statistics.getPreCpuStats();
+        final CpuUsageConfig preCpuUsage = preCpuStats.getCpuUsage();
+        assertThat(preCpuUsage.getTotalUsage(), is(211307214L));
+        assertThat(preCpuUsage.getPercpuUsage(), equalTo(Arrays.asList(71451389L, 42097782L, 59298344L, 38459699L)));
+        assertThat(preCpuUsage.getUsageInKernelmode(), is(170000000L));
+        assertThat(preCpuUsage.getUsageInUsermode(), is(20000000L));
+        assertThat(preCpuStats.getSystemCpuUsage(), is(545937990000000L));
+        assertThat(preCpuStats.getOnlineCpus(), is(4L));
+        final ThrottlingDataConfig preThrottlingData = preCpuStats.getThrottlingData();
+        assertThat(preThrottlingData.getPeriods(), is(0L));
+        assertThat(preThrottlingData.getThrottledPeriods(), is(0L));
+        assertThat(preThrottlingData.getThrottledTime(), is(0L));
+
+        final PidsStatsConfig pidsStats = statistics.getPidsStats();
+        assertThat(pidsStats.getCurrent(), is(2L));
+    }
+}
diff --git a/src/test/resources/samples/1.27/containers/container/stats/stats1.json b/src/test/resources/samples/1.27/containers/container/stats/stats1.json
new file mode 100644
index 000000000..e542c10a9
--- /dev/null
+++ b/src/test/resources/samples/1.27/containers/container/stats/stats1.json
@@ -0,0 +1,132 @@
+{
+  "read":"2017-12-06T00:42:03.8352972Z",
+  "preread":"2017-12-06T00:42:02.8366736Z",
+  "pids_stats":{
+    "current":2
+  },
+  "blkio_stats":{
+    "io_service_bytes_recursive":[
+
+    ],
+    "io_serviced_recursive":[
+
+    ],
+    "io_queue_recursive":[
+
+    ],
+    "io_service_time_recursive":[
+
+    ],
+    "io_wait_time_recursive":[
+
+    ],
+    "io_merged_recursive":[
+
+    ],
+    "io_time_recursive":[
+
+    ],
+    "sectors_recursive":[
+
+    ]
+  },
+  "num_procs":0,
+  "storage_stats":{
+
+  },
+  "cpu_stats":{
+    "cpu_usage":{
+      "total_usage":212198028,
+      "percpu_usage":[
+        71592953,
+        42494761,
+        59298344,
+        38811970
+      ],
+      "usage_in_kernelmode":170000000,
+      "usage_in_usermode":20000000
+    },
+    "system_cpu_usage":545941980000000,
+    "online_cpus":4,
+    "throttling_data":{
+      "periods":0,
+      "throttled_periods":0,
+      "throttled_time":0
+    }
+  },
+  "precpu_stats":{
+    "cpu_usage":{
+      "total_usage":211307214,
+      "percpu_usage":[
+        71451389,
+        42097782,
+        59298344,
+        38459699
+      ],
+      "usage_in_kernelmode":170000000,
+      "usage_in_usermode":20000000
+    },
+    "system_cpu_usage":545937990000000,
+    "online_cpus":4,
+    "throttling_data":{
+      "periods":0,
+      "throttled_periods":0,
+      "throttled_time":0
+    }
+  },
+  "memory_stats":{
+    "usage":647168,
+    "max_usage":1703936,
+    "stats":{
+      "active_anon":102400,
+      "active_file":0,
+      "cache":0,
+      "dirty":0,
+      "hierarchical_memory_limit":9223372036854771712,
+      "hierarchical_memsw_limit":9223372036854771712,
+      "inactive_anon":0,
+      "inactive_file":0,
+      "mapped_file":0,
+      "pgfault":9656,
+      "pgmajfault":0,
+      "pgpgin":3425,
+      "pgpgout":3400,
+      "rss":102400,
+      "rss_huge":0,
+      "swap":0,
+      "total_active_anon":102400,
+      "total_active_file":0,
+      "total_cache":0,
+      "total_dirty":0,
+      "total_inactive_anon":0,
+      "total_inactive_file":0,
+      "total_mapped_file":0,
+      "total_pgfault":9656,
+      "total_pgmajfault":0,
+      "total_pgpgin":3425,
+      "total_pgpgout":3400,
+      "total_rss":102400,
+      "total_rss_huge":0,
+      "total_swap":0,
+      "total_unevictable":0,
+      "total_writeback":0,
+      "unevictable":0,
+      "writeback":0
+    },
+    "limit":2095874048
+  },
+  "name":"/gallant_hamilton",
+  "id":"b581d78b03e41d81c9fe941f03f5d35e23733ff96370456b58d2906e002b0deb",
+  "networks":{
+    "eth0":{
+      "rx_bytes":1230,
+      "rx_packets":19,
+      "rx_errors":0,
+      "rx_dropped":0,
+      "tx_bytes":0,
+      "tx_packets":0,
+      "tx_errors":0,
+      "tx_dropped":0
+    }
+  }
+}

From f6dfe3eeb715837a6544d8a47fc9cb79c925a997 Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Mon, 4 Dec 2017 22:48:03 +0800
Subject: [PATCH 0774/1272] update toString for TaskStatus

---
 .../java/com/github/dockerjava/api/model/TaskStatus.java   | 7 +++++++
 .../dockerjava/api/model/TaskStatusContainerStatus.java    | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/TaskStatus.java b/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
index 84dd3b95f..10a0598c4 100644
--- a/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
+++ b/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
@@ -4,6 +4,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
 
 import java.io.Serializable;
 
@@ -74,4 +76,9 @@ public TaskStatus withContainerStatus(TaskStatusContainerStatus containerStatus)
         this.containerStatus = containerStatus;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java b/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
index 89a7dfb6a..e5b8663b2 100644
--- a/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
+++ b/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
@@ -4,6 +4,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
 
 import java.io.Serializable;
 
@@ -50,4 +52,8 @@ public TaskStatusContainerStatus withExitCode(Integer exitCode) {
         this.exitCode = exitCode;
         return this;
     }
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();
+    }
 }

From 2ac66012ae85c4b53cb33aacdbad3b4a1b8cba72 Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Sat, 9 Dec 2017 23:00:17 +0800
Subject: [PATCH 0775/1272] add runtime field

---
 .../github/dockerjava/api/model/HostConfig.java   | 14 ++++++++++++++
 .../com/github/dockerjava/api/model/TaskSpec.java | 15 +++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index d808ef245..4d3275069 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -200,6 +200,11 @@ public class HostConfig implements Serializable {
     @JsonProperty("PidsLimit")
     private Long pidsLimit;
 
+    /**
+     * @since ~{@link RemoteApiVersion#VERSION_1_30}
+     */
+    @JsonProperty("Runtime")
+    private String runtime;
 
     @JsonIgnore
     public Bind[] getBinds() {
@@ -438,6 +443,10 @@ public boolean isUserDefinedNetwork() {
         return networkMode != null && !PREDEFINED_NETWORKS.contains(networkMode) && !networkMode.startsWith("container:");
     }
 
+    public String getRuntime() {
+        return runtime;
+    }
+
     @JsonIgnore
     public void setBinds(Bind... binds) {
         this.binds = new Binds(binds);
@@ -816,6 +825,11 @@ public HostConfig withPidsLimit(Long pidsLimit) {
         this.pidsLimit = pidsLimit;
         return this;
     }
+
+    public HostConfig withRuntime(String runtime) {
+        this.runtime = runtime;
+        return this;
+    }
     // end of auto-generated
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/api/model/TaskSpec.java b/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
index 2a5028a5f..ac281c8a4 100644
--- a/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
+++ b/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
@@ -56,6 +56,12 @@ public class TaskSpec implements Serializable {
     @JsonProperty("ForceUpdate")
     private Integer forceUpdate;
 
+    /**
+     * @since 1.30
+     */
+    @JsonProperty("Runtime")
+    private String runtime;
+
     /**
      * @see #containerSpec
      */
@@ -120,6 +126,15 @@ public TaskSpec withPlacement(ServicePlacement placement) {
         return this;
     }
 
+    public String getRuntime() {
+        return runtime;
+    }
+
+    public TaskSpec withRuntime(String runtime) {
+        this.runtime = runtime;
+        return this;
+    }
+
     /**
      * @see #logDriver
      */

From b896758ff93c0258aa754405aaa16ebd042fd18b Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Sat, 9 Dec 2017 23:02:41 +0800
Subject: [PATCH 0776/1272] change version type to long since swagger api type
 is uint64, ref:
 https://github.com/moby/moby/blob/master/api/swagger.yaml#L1969

---
 .../github/dockerjava/api/command/UpdateSwarmNodeCmd.java   | 4 ++--
 .../java/com/github/dockerjava/api/model/ObjectVersion.java | 6 +++---
 .../dockerjava/core/command/UpdateSwarmNodeCmdImpl.java     | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java b/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
index bdcd403e0..604e85ef7 100644
--- a/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
@@ -23,10 +23,10 @@ public interface UpdateSwarmNodeCmd extends SyncDockerCmd<Void> {
 
     UpdateSwarmNodeCmd withSwarmNodeSpec(SwarmNodeSpec swarmNodeSpec);
 
-    UpdateSwarmNodeCmd withVersion(@Nonnull Integer versionId);
+    UpdateSwarmNodeCmd withVersion(@Nonnull Long versionId);
 
     @CheckForNull
-    Integer getVersion();
+    Long getVersion();
 
     interface Exec extends DockerCmdSyncExec<UpdateSwarmNodeCmd, Void> {
     }
diff --git a/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java b/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
index 6181a9e70..9c8d7d902 100644
--- a/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
+++ b/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
@@ -22,13 +22,13 @@ public class ObjectVersion implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("Index")
-    private Integer index = null;
+    private Long index = null;
 
-    public Integer getIndex() {
+    public Long getIndex() {
         return index;
     }
 
-    public ObjectVersion withIndex(Integer index) {
+    public ObjectVersion withIndex(Long index) {
         this.index = index;
         return this;
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java
index dfde7eba6..278599641 100644
--- a/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java
@@ -24,7 +24,7 @@ public class UpdateSwarmNodeCmdImpl extends AbstrDockerCmd<UpdateSwarmNodeCmd, V
 
     private SwarmNodeSpec swarmNodeSpec;
 
-    private Integer version;
+    private Long version;
 
     public UpdateSwarmNodeCmdImpl(Exec exec) {
         super(exec);
@@ -69,14 +69,14 @@ public UpdateSwarmNodeCmd withSwarmNodeSpec(SwarmNodeSpec swarmNodeSpec) {
     }
 
     @Override
-    public UpdateSwarmNodeCmd withVersion(@Nonnull Integer versionId) {
+    public UpdateSwarmNodeCmd withVersion(@Nonnull Long versionId) {
         this.version = versionId;
         return this;
     }
 
     @CheckForNull
     @Override
-    public Integer getVersion() {
+    public Long getVersion() {
         return version;
     }
 

From b104afd7d0690d2ff92bceee77ebfeadd298c71d Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Sat, 9 Dec 2017 23:22:27 +0800
Subject: [PATCH 0777/1272] misplace actual and expected

---
 .../com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java b/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java
index 4d5162415..b999e71e5 100644
--- a/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java
@@ -27,7 +27,7 @@ public void testUpdateSwarmNode() {
         docker1.updateSwarmNodeCmd().withSwarmNodeId(node.getId()).withVersion(node.getVersion().getIndex())
                 .withSwarmNodeSpec(nodeSpec).exec();
         nodes = docker1.listSwarmNodesCmd().exec();
-        assertThat(1, is(nodes.size()));
-        assertThat(SwarmNodeAvailability.PAUSE, is(nodes.get(0).getSpec().getAvailability()));
+        assertThat(nodes.size(), is(1));
+        assertThat(nodes.get(0).getSpec().getAvailability(), is(SwarmNodeAvailability.PAUSE));
     }
 }

From b3fbace198c2477e8c4d3339c763ce0c969ad119 Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Thu, 14 Dec 2017 23:12:30 +0800
Subject: [PATCH 0778/1272] include non-null property for json serialization

---
 .../java/com/github/dockerjava/api/model/ContainerSpec.java   | 2 ++
 .../java/com/github/dockerjava/api/model/EndpointSpec.java    | 4 ++++
 .../java/com/github/dockerjava/api/model/ResourceSpecs.java   | 4 ++++
 .../java/com/github/dockerjava/api/model/ServiceSpec.java     | 2 ++
 src/main/java/com/github/dockerjava/api/model/TaskSpec.java   | 2 ++
 5 files changed, 14 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java b/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
index 44b392f2c..78a873dc2 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
@@ -19,6 +20,7 @@
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class ContainerSpec implements Serializable {
     public static final Long serialVersionUID = 1L;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java b/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
index badbc06c2..e036aac75 100644
--- a/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
+++ b/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
@@ -14,6 +16,8 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class EndpointSpec implements Serializable {
     public static final Long serialVersionUID = 1L;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java b/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
index 4458e16b6..19c7a2f0e 100644
--- a/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
+++ b/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
@@ -13,6 +15,8 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class ResourceSpecs implements Serializable {
     public static final Long serialVersionUID = 1L;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java b/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
index 8bdf5e2bc..4528ff222 100644
--- a/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
@@ -17,6 +18,7 @@
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class ServiceSpec implements Serializable {
     public static final Long serialVersionUID = 1L;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/TaskSpec.java b/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
index ac281c8a4..d44ddd909 100644
--- a/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
+++ b/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
@@ -15,6 +16,7 @@
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class TaskSpec implements Serializable {
     public static final Long serialVersionUID = 1L;
 

From 2582dce26e44fdecce0c1026b901966532fc72e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20B=C3=BCcklers?= <fbuecklers@gmail.com>
Date: Thu, 14 Dec 2017 18:06:25 +0100
Subject: [PATCH 0779/1272] add missing ListContainer filters (#744)

* add missing ListContainer filters

* Reimplement the list filters with collection as parameters

* Remove deprecated status method
---
 .../api/command/ListContainersCmd.java        |  53 ++-
 .../core/command/ListContainersCmdImpl.java   |  57 ++-
 .../dockerjava/core/util/FiltersBuilder.java  |   6 +
 .../dockerjava/cmd/ListContainersCmdIT.java   | 347 ++++++++++++++----
 4 files changed, 374 insertions(+), 89 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
index 7c6c9acec..879ec711c 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
@@ -1,11 +1,11 @@
 package com.github.dockerjava.api.command;
 
-import java.util.List;
-import java.util.Map;
+import com.github.dockerjava.api.model.Container;
 
 import javax.annotation.CheckForNull;
-
-import com.github.dockerjava.api.model.Container;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 /**
  * List containers
@@ -38,22 +38,52 @@ public interface ListContainersCmd extends SyncDockerCmd<List<Container>> {
     ListContainersCmd withBefore(String before);
 
     /**
-     * @param exitcode
+     * @param name
+     *            - Show only containers that has the container's name
+     */
+    ListContainersCmd withNameFilter(Collection<String> name);
+
+    /**
+     * @param id
+     *            - Show only containers that has the container's id
+     */
+    ListContainersCmd withIdFilter(Collection<String> id);
+
+    /**
+     * @param ancestor
+     *            - Show only containers created from an image or a descendant.
+     */
+    ListContainersCmd withAncestorFilter(Collection<String> ancestor);
+
+    /**
+     * @param volume
+     *            - Show only containers with volume name or mount point destination
+     */
+    ListContainersCmd withVolumeFilter(Collection<String> volume);
+
+    /**
+     * @param network
+     *            - Show only containers with network id or network name
+     */
+    ListContainersCmd withNetworkFilter(Collection<String> network);
+
+    /**
+     * @param exited
      *            - Show only containers that exited with the passed exitcode.
      */
-    ListContainersCmd withExitcodeFilter(Integer exitcode);
+    ListContainersCmd withExitedFilter(Integer exited);
 
     /**
      * @param status
      *            - Show only containers with the passed status (created|restarting|running|paused|exited).
      */
-    ListContainersCmd withStatusFilter(String status);
+    ListContainersCmd withStatusFilter(Collection<String> status);
 
     /**
      * @param labels
      *            - Show only containers with the passed labels.
      */
-    ListContainersCmd withLabelFilter(String... labels);
+    ListContainersCmd withLabelFilter(Collection<String> labels);
 
     /**
      * @param labels
@@ -85,6 +115,13 @@ public interface ListContainersCmd extends SyncDockerCmd<List<Container>> {
      */
     ListContainersCmd withSince(String since);
 
+    /**
+     * @param filterName
+     * @param filterValues
+     *            - Show only containers where the filter matches the given values
+     */
+    ListContainersCmd withFilter(String filterName, Collection<String> filterValues);
+
     interface Exec extends DockerCmdSyncExec<ListContainersCmd, List<Container>> {
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
index 8e8e194da..0d0323a65 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
@@ -1,14 +1,15 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import com.github.dockerjava.api.command.ListContainersCmd;
+import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.core.util.FiltersBuilder;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
-import com.github.dockerjava.api.command.ListContainersCmd;
-import com.github.dockerjava.api.model.Container;
-import com.github.dockerjava.core.util.FiltersBuilder;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * List containers.
@@ -93,10 +94,33 @@ public ListContainersCmd withBefore(String before) {
     }
 
     @Override
-    public ListContainersCmd withLabelFilter(String... labels) {
-        checkNotNull(labels, "labels was not specified");
-        this.filters.withLabels(labels);
-        return this;
+    public ListContainersCmd withNameFilter(Collection<String> name) {
+        return withFilter("name", name);
+    }
+
+    @Override
+    public ListContainersCmd withIdFilter(Collection<String> id) {
+        return withFilter("id", id);
+    }
+
+    @Override
+    public ListContainersCmd withAncestorFilter(Collection<String> ancestor) {
+        return withFilter("ancestor", ancestor);
+    }
+
+    @Override
+    public ListContainersCmd withVolumeFilter(Collection<String> volume) {
+        return withFilter("volume", volume);
+    }
+
+    @Override
+    public ListContainersCmd withNetworkFilter(Collection<String> network) {
+        return withFilter("network", network);
+    }
+
+    @Override
+    public ListContainersCmd withLabelFilter(Collection<String> labels) {
+        return withFilter("label", labels);
     }
 
     @Override
@@ -107,14 +131,21 @@ public ListContainersCmd withLabelFilter(Map<String, String> labels) {
     }
 
     @Override
-    public ListContainersCmd withExitcodeFilter(Integer exitcode) {
-        checkNotNull(exitcode, "exitcode was not specified");
-        this.filters.withFilter("exitcode", exitcode.toString());
+    public ListContainersCmd withExitedFilter(Integer exited) {
+        checkNotNull(exited, "exited was not specified");
+        this.filters.withFilter("exited", exited.toString());
+        return this;
+    }
+
+    @Override
+    public ListContainersCmd withFilter(String filterName, Collection<String> filterValues) {
+        checkNotNull(filterValues, filterName + " was not specified");
+        this.filters.withFilter(filterName, filterValues);
         return this;
     }
 
     @Override
-    public ListContainersCmd withStatusFilter(String status) {
+    public ListContainersCmd withStatusFilter(Collection<String> status) {
         checkNotNull(status, "status was not specified");
         this.filters.withFilter("status", status);
         return this;
diff --git a/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java b/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
index 4d71014dd..0c414f983 100644
--- a/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
+++ b/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -25,6 +26,11 @@ public FiltersBuilder withFilter(String key, String... value) {
         return this;
     }
 
+    public FiltersBuilder withFilter(String key, Collection<String> value) {
+        filters.put(key, value instanceof List ? (List<String>) value : new ArrayList<>(value));
+        return this;
+    }
+
     public List<String> getFilter(String key) {
         return filters.get(key);
     }
diff --git a/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java b/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
index 73fb7704c..b5210c171 100644
--- a/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
@@ -2,24 +2,33 @@
 
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Container;
-import com.google.common.collect.ImmutableMap;
+import com.github.dockerjava.api.model.Volume;
+import com.github.dockerjava.core.command.PullImageResultCallback;
+import com.github.dockerjava.core.command.WaitContainerResultCallback;
+import com.github.dockerjava.junit.DockerAssume;
 import org.hamcrest.Matcher;
-import org.junit.Ignore;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 import static ch.lambdaj.Lambda.filter;
-import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.isOneOf;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.startsWith;
@@ -28,33 +37,55 @@
 
 public class ListContainersCmdIT extends CmdIT {
     private static final Logger LOG = LoggerFactory.getLogger(ListContainersCmdIT.class);
+    private static final String DEFAULT_IMAGE = "busybox";
+    private Map<String, String> testLabel;
 
-    @Ignore("can't work in parallel and second test seems cover this")
-    @Test
-    public void testListContainers() throws Exception {
+    @Before
+    public void setUp() {
+        //generate unique ids per test to isolate each test case from each other
+        testLabel = Collections.singletonMap("test", UUID.randomUUID().toString());
+    }
+
+    @After
+    public void tearDown() {
+        //remove all containers created by this test
+        List<Container> containers = dockerRule.getClient().listContainersCmd()
+                .withLabelFilter(testLabel)
+                .withShowAll(true)
+                .exec();
 
-        String testImage = "busybox";
+        for (Container container : containers) {
+            removeContainer(container.getId());
+        }
+    }
 
-        List<Container> containers = dockerRule.getClient().listContainersCmd().withShowAll(true).exec();
+    @Test
+    public void testListContainers() throws Exception {
+        List<Container> containers = dockerRule.getClient().listContainersCmd()
+                .withLabelFilter(testLabel)
+                .withShowAll(true)
+                .exec();
         assertThat(containers, notNullValue());
         LOG.info("Container List: {}", containers);
 
         int size = containers.size();
 
-        CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(testImage).withCmd("echo").exec();
-
+        CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withLabels(testLabel)
+                .withCmd("echo")
+                .exec();
         assertThat(container1.getId(), not(isEmptyString()));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container1.getId()).exec();
-
-        assertThat(inspectContainerResponse.getConfig().getImage(), is(equalTo(testImage)));
+        assertThat(inspectContainerResponse.getConfig().getImage(), is(equalTo(DEFAULT_IMAGE)));
 
         dockerRule.getClient().startContainerCmd(container1.getId()).exec();
-
         LOG.info("container id: " + container1.getId());
 
-        List<Container> containers2 = dockerRule.getClient().listContainersCmd().withShowAll(true).exec();
-
+        List<Container> containers2 = dockerRule.getClient().listContainersCmd()
+                .withLabelFilter(testLabel)
+                .withShowAll(true)
+                .exec();
         for (Container container : containers2) {
             LOG.info("listContainer: id=" + container.getId() + " image=" + container.getImage());
         }
@@ -72,92 +103,272 @@ public void testListContainers() throws Exception {
 
         Container container2 = filteredContainers.get(0);
         assertThat(container2.getCommand(), not(isEmptyString()));
-        assertThat(container2.getImage(), startsWith(testImage));
+        assertThat(container2.getImage(), startsWith(DEFAULT_IMAGE));
     }
 
     @Test
     public void testListContainersWithLabelsFilter() throws Exception {
+        // list with filter by Map label
+        dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("echo")
+                .withLabels(testLabel)
+                .exec();
 
-        String testImage = "busybox";
+        List<Container> filteredContainersByMap = dockerRule.getClient().listContainersCmd()
+                .withShowAll(true)
+                .withLabelFilter(testLabel)
+                .exec();
 
-        List<Container> containers = dockerRule.getClient().listContainersCmd().withShowAll(true).exec();
-        assertThat(containers, notNullValue());
-        LOG.info("Container List: {}", containers);
+        assertThat(filteredContainersByMap.size(), is(1));
 
-//        int size = containers.size();
+        Container container3 = filteredContainersByMap.get(0);
+        assertThat(container3.getCommand(), not(isEmptyString()));
+        assertThat(container3.getImage(), startsWith(DEFAULT_IMAGE));
 
-        CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(testImage).withCmd("echo").exec();
+        // List by string label
+        List<Container> filteredContainers = dockerRule.getClient().listContainersCmd()
+                .withShowAll(true)
+                .withLabelFilter(singletonList("test=" + testLabel.get("test")))
+                .exec();
 
-        assertThat(container1.getId(), not(isEmptyString()));
+        assertThat(filteredContainers.size(), is(1));
 
-        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container1.getId()).exec();
+        container3 = filteredContainers.get(0);
+        assertThat(container3.getCommand(), not(isEmptyString()));
+        assertThat(container3.getImage(), startsWith(DEFAULT_IMAGE));
+        assertEquals(testLabel.get("test"), container3.getLabels().get("test"));
+    }
 
-        assertThat(inspectContainerResponse.getConfig().getImage(), is(equalTo(testImage)));
+    @Test
+    public void testNameFilter() throws Exception {
+        String testUUID = testLabel.get("test");
+
+        String id1, id2;
+        id1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withLabels(testLabel)
+                .withName("nameFilterTest1-" + testUUID)
+                .exec()
+                .getId();
+
+        id2 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withLabels(testLabel)
+                .withName("nameFilterTest2-" + testUUID)
+                .exec()
+                .getId();
+
+        List<Container> filteredContainers = dockerRule.getClient().listContainersCmd()
+                .withShowAll(true)
+                .withNameFilter(asList("nameFilterTest1-" + testUUID, "nameFilterTest2-" + testUUID))
+                .exec();
 
-        dockerRule.getClient().startContainerCmd(container1.getId()).exec();
+        assertThat(filteredContainers.size(), is(2));
+        assertThat(filteredContainers.get(0).getId(), isOneOf(id1, id2));
+        assertThat(filteredContainers.get(1).getId(), isOneOf(id1, id2));
+    }
 
-        LOG.info("container id: " + container1.getId());
+    @Test
+    public void testIdsFilter() throws Exception {
+        String id1, id2;
+        id1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withLabels(testLabel)
+                .exec()
+                .getId();
+
+        id2 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withLabels(testLabel)
+                .exec()
+                .getId();
+
+        List<Container> filteredContainers = dockerRule.getClient().listContainersCmd()
+                .withShowAll(true)
+                .withIdFilter(asList(id1, id2))
+                .exec();
 
-        List<Container> containers2 = dockerRule.getClient().listContainersCmd().withShowAll(true).exec();
+        assertThat(filteredContainers.size(), is(2));
+        assertThat(filteredContainers.get(0).getId(), isOneOf(id1, id2));
+        assertThat(filteredContainers.get(1).getId(), isOneOf(id1, id2));
+    }
 
-        for (Container container : containers2) {
-            LOG.info("listContainer: id=" + container.getId() + " image=" + container.getImage());
-        }
+    @Test
+    public void testStatusFilter() throws Exception {
+        String id1, id2;
+        id1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withCmd("sh", "-c", "sleep 99999")
+                .withLabels(testLabel)
+                .exec()
+                .getId();
+
+        id2 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withCmd("sh", "-c", "sleep 99999")
+                .withLabels(testLabel)
+                .exec()
+                .getId();
+
+        List<Container> filteredContainers = dockerRule.getClient().listContainersCmd()
+                .withShowAll(true)
+                .withLabelFilter(testLabel)
+                .withStatusFilter(singletonList("created"))
+                .exec();
 
-        // some parallel test may create containers
-//        assertThat(size + 1, is(equalTo(containers2.size())));
-        assertThat(containers2, (Matcher) hasItem(hasField("id", startsWith(container1.getId()))));
+        assertThat(filteredContainers.size(), is(2));
+        assertThat(filteredContainers.get(1).getId(), isOneOf(id1, id2));
 
-        List<Container> filteredContainers = filter(hasField("id", startsWith(container1.getId())), containers2);
-        assertThat(filteredContainers.size(), is(equalTo(1)));
+        dockerRule.getClient().startContainerCmd(id1).exec();
 
-        for (Container container : filteredContainers) {
-            LOG.info("filteredContainer: " + container);
-        }
+        filteredContainers = dockerRule.getClient().listContainersCmd()
+                .withShowAll(true)
+                .withLabelFilter(testLabel)
+                .withStatusFilter(singletonList("running"))
+                .exec();
 
-        Container container2 = filteredContainers.get(0);
-        assertThat(container2.getCommand(), not(isEmptyString()));
-        assertThat(container2.getImage(), startsWith(testImage));
+        assertThat(filteredContainers.size(), is(1));
+        assertThat(filteredContainers.get(0).getId(), is(id1));
 
+        dockerRule.getClient().pauseContainerCmd(id1).exec();
 
+        filteredContainers = dockerRule.getClient().listContainersCmd()
+                .withShowAll(true)
+                .withLabelFilter(testLabel)
+                .withStatusFilter(singletonList("paused"))
+                .exec();
 
-        Map<String, String> labels = ImmutableMap.of("test" + dockerRule.getKind(), "docker-java");
-        List<Container> containersForRemove = dockerRule.getClient().listContainersCmd().withShowAll(true)
-                .withLabelFilter(labels).exec();
-        if (containersForRemove != null) {
-            for (Container container : containersForRemove) {
-                dockerRule.getClient().removeContainerCmd(container.getId()).withForce(true).exec();
-            }
-        }
+        assertThat(filteredContainers.size(), is(1));
+        assertThat(filteredContainers.get(0).getId(), is(id1));
 
-        // list with filter by Map label
-        dockerRule.getClient().createContainerCmd(testImage).withCmd("echo").withLabels(labels).exec();
+        dockerRule.getClient().unpauseContainerCmd(id1).exec();
+        dockerRule.getClient().stopContainerCmd(id1).exec();
 
-        List<Container> filteredContainersByMap = dockerRule.getClient().listContainersCmd()
+        filteredContainers = dockerRule.getClient().listContainersCmd()
                 .withShowAll(true)
-                .withLabelFilter(labels)
+                .withLabelFilter(testLabel)
+                .withStatusFilter(singletonList("exited"))
                 .exec();
 
-        assertThat(filteredContainersByMap.size(), is(equalTo( 1)));
+        assertThat(filteredContainers.size(), is(1));
+        assertThat(filteredContainers.get(0).getId(), is(id1));
+    }
 
-        Container container3 = filteredContainersByMap.get(0);
-        assertThat(container3.getCommand(), not(isEmptyString()));
-        assertThat(container3.getImage(), startsWith(testImage));
+    @Test
+    public void testVolumeFilter() throws Exception {
+        String id;
+        dockerRule.getClient().createVolumeCmd()
+                .withName("TestFilterVolume")
+                .withDriver("local")
+                .exec();
 
-        // List by string label
-        filteredContainers = dockerRule.getClient().listContainersCmd()
+        id = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withLabels(testLabel)
+                .withBinds(new Bind("TestFilterVolume", new Volume("/test")))
+                .exec()
+                .getId();
+
+        dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withLabels(testLabel)
+                .exec();
+
+        List<Container> filteredContainers = dockerRule.getClient().listContainersCmd()
                 .withShowAll(true)
-                .withLabelFilter("test" + dockerRule.getKind())
+                .withLabelFilter(testLabel)
+                .withVolumeFilter(singletonList("TestFilterVolume"))
                 .exec();
 
-        assertThat(filteredContainers.size(), is(equalTo(1)));
+        assertThat(filteredContainers.size(), is(1));
+        assertThat(filteredContainers.get(0).getId(), is(id));
+    }
 
-        container3 = filteredContainers.get(0);
-        assertThat(container3.getCommand(), not(isEmptyString()));
-        assertThat(container3.getImage(), startsWith(testImage));
-        if (isNotSwarm(dockerRule.getClient())) {
-            assertEquals(container3.getLabels(), labels);
-        }
+    @Test
+    public void testNetworkFilter() throws Exception {
+        String id;
+        dockerRule.getClient().createNetworkCmd()
+                .withName("TestFilterNetwork")
+                .withDriver("bridge")
+                .exec();
+
+        id = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withLabels(testLabel)
+                .withNetworkMode("TestFilterNetwork")
+                .exec()
+                .getId();
+
+        dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withLabels(testLabel)
+                .exec();
+
+        List<Container> filteredContainers = dockerRule.getClient().listContainersCmd()
+                .withShowAll(true)
+                .withLabelFilter(testLabel)
+                .withNetworkFilter(singletonList("TestFilterNetwork"))
+                .exec();
+
+        assertThat(filteredContainers.size(), is(1));
+        assertThat(filteredContainers.get(0).getId(), is(id));
+    }
+
+    @Test
+    public void testAncestorFilter() throws Exception {
+        // ancestor filters are broken in swarm
+        // https://github.com/docker/swarm/issues/1716
+        DockerAssume.assumeNotSwarm(dockerRule.getClient());
+
+        dockerRule.getClient().pullImageCmd("busybox")
+                .withTag("1.24")
+                .exec(new PullImageResultCallback())
+                .awaitCompletion();
+
+        dockerRule.getClient().createContainerCmd("busybox:1.24")
+                .withLabels(testLabel)
+                .exec();
+
+        String imageId = dockerRule.getClient().inspectImageCmd(DEFAULT_IMAGE).exec().getId();
+
+        String id = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withLabels(testLabel)
+                .exec()
+                .getId();
+
+        List<Container> filteredContainers = dockerRule.getClient().listContainersCmd()
+                .withLabelFilter(testLabel)
+                .withShowAll(true)
+                .withAncestorFilter(singletonList(imageId))
+                .exec();
+
+        assertThat(filteredContainers.size(), is(1));
+        assertThat(filteredContainers.get(0).getId(), is(id));
     }
 
+    @Test
+    public void testExitedFilter() throws Exception {
+        dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withLabels(testLabel)
+                .exec();
+
+        String id = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withLabels(testLabel)
+                .withCmd("sh", "-c", "exit 42")
+                .exec()
+                .getId();
+
+        dockerRule.getClient().startContainerCmd(id).exec();
+
+        Integer status = dockerRule.getClient().waitContainerCmd(id).exec(new WaitContainerResultCallback())
+                .awaitStatusCode();
+
+        assertThat(status, is(42));
+
+        List<Container> filteredContainers = dockerRule.getClient().listContainersCmd()
+                .withLabelFilter(testLabel)
+                .withShowAll(true)
+                .withExitedFilter(42)
+                .exec();
+
+        assertThat(filteredContainers.size(), is(1));
+        assertThat(filteredContainers.get(0).getId(), is(id));
+    }
+
+    private void removeContainer(String id) {
+        if (id != null) {
+            try {
+                dockerRule.getClient().removeContainerCmd(id).withForce(true).exec();
+            } catch (Exception ignored) {}
+        }
+    }
 }

From a5dcc646b24bb684e9aa7677fa18d4c64ca2adc3 Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Wed, 3 Jan 2018 18:12:03 +0800
Subject: [PATCH 0780/1272] update service mode for api version 1.30

---
 .../api/model/ContainerDNSConfig.java         |  74 ++++++++
 .../dockerjava/api/model/ContainerSpec.java   | 175 ++++++++++++++++++
 .../api/model/ContainerSpecConfig.java        |  73 ++++++++
 .../api/model/ContainerSpecFile.java          |  93 ++++++++++
 .../api/model/ContainerSpecPrivileges.java    |  58 ++++++
 .../ContainerSpecPrivilegesCredential.java    |  70 +++++++
 ...ContainerSpecPrivilegesSELinuxContext.java |  97 ++++++++++
 .../api/model/ContainerSpecSecret.java        |  74 ++++++++
 .../dockerjava/api/model/HealthCheck.java     |  57 ++++++
 .../api/model/NetworkAttachmentConfig.java    |   4 +
 .../api/model/ResourceRequirements.java       |   4 +
 .../api/model/ServicePlacement.java           |   2 +
 .../dockerjava/api/model/ServiceSpec.java     |  15 ++
 .../github/dockerjava/api/model/TaskSpec.java |  16 ++
 .../dockerjava/api/model/UpdateConfig.java    |  56 ++++++
 .../dockerjava/api/model/UpdateOrder.java     |  15 ++
 .../dockerjava/core/RemoteApiVersion.java     |   6 +
 .../cmd/swarm/UpdateSwarmServiceIT.java       |  49 +++++
 18 files changed, 938 insertions(+)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/UpdateOrder.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java

diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java b/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
new file mode 100644
index 000000000..489cfcd61
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
@@ -0,0 +1,74 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Specification for DNS related configurations in resolver configuration file (&#x60;resolv.conf&#x60;).
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_25}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ContainerDNSConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("Nameservers")
+    private List<String> nameservers;
+    @JsonProperty("Search")
+    private List<String> search;
+    @JsonProperty("Options")
+    private List<String> options;
+
+    public List<String> getNameservers() {
+        return nameservers;
+    }
+
+    public ContainerDNSConfig withNameservers(List<String> nameservers) {
+        this.nameservers = nameservers;
+        return this;
+    }
+
+    public List<String> getSearch() {
+        return search;
+    }
+
+    public ContainerDNSConfig withSearch(List<String> search) {
+        this.search = search;
+        return this;
+    }
+
+    public List<String> getOptions() {
+        return options;
+    }
+
+    public ContainerDNSConfig withOptions(List<String> options) {
+        this.options = options;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java b/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
index 78a873dc2..26cfd9dfe 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
@@ -90,6 +90,82 @@ public class ContainerSpec implements Serializable {
     @JsonProperty("Duration")
     private Long duration;
 
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("StopGracePeriod")
+    private Long stopGracePeriod;
+
+    /**
+     * @since 1.25
+     * Specification for DNS related configurations in resolver configuration file
+     */
+    @JsonProperty("DNSConfig")
+    private ContainerDNSConfig dnsConfig;
+
+    /**
+     * @since 1.26
+     * Open stdin
+     */
+    @JsonProperty("OpenStdin")
+    private Boolean openStdin;
+
+    /**
+     * @since 1.26
+     * Mount the container's root filesystem as read only.
+     */
+    @JsonProperty("ReadOnly")
+    private Boolean readOnly;
+
+    /**
+     * @since 1.26
+     * A list of hostnames/IP mappings to add to the container's /etc/hosts file.
+     */
+    @JsonProperty("Hosts")
+    private List<String> hosts;
+
+    /**
+     * @since 1.26
+     * The hostname to use for the container, as a valid RFC 1123 hostname
+     */
+    @JsonProperty("Hostname")
+    private String hostname;
+
+    /**
+     * @since 1.26
+     * Secrets contains references to zero or more secrets that will be exposed to the service.
+     */
+    @JsonProperty("Secrets")
+    private List<ContainerSpecSecret> secrets;
+
+    /**
+     * @since 1.26
+     * A test to perform to check that the container is healthy.
+     */
+    @JsonProperty("HealthCheck")
+    private HealthCheck healthCheck;
+
+    /**
+     * @since 1.28
+     * Signal to stop the container.
+     */
+    @JsonProperty("StopSignal")
+    private String stopSignal;
+
+    /**
+     * @since 1.29
+     * Security options for the container
+     */
+    @JsonProperty("Privileges")
+    private ContainerSpecPrivileges privileges;
+
+    /**
+     * @since 1.29
+     * Configs contains references to zero or more configs that will be exposed to the service.
+     */
+    @JsonProperty("Configs")
+    private List<ContainerSpecConfig> configs;
+
     /**
      * @see #image
      */
@@ -266,6 +342,105 @@ public ContainerSpec withDuration(Long duration) {
         return this;
     }
 
+    public ContainerDNSConfig getDnsConfig() {
+        return dnsConfig;
+    }
+
+    public ContainerSpec withDnsConfig(ContainerDNSConfig dnsConfig) {
+        this.dnsConfig = dnsConfig;
+        return this;
+    }
+
+    public Boolean getOpenStdin() {
+        return openStdin;
+    }
+
+    public ContainerSpec withOpenStdin(Boolean openStdin) {
+        this.openStdin = openStdin;
+        return this;
+    }
+
+    public Boolean getReadOnly() {
+        return readOnly;
+    }
+
+    public ContainerSpec withReadOnly(Boolean readOnly) {
+        this.readOnly = readOnly;
+        return this;
+    }
+
+    public List<String> getHosts() {
+        return hosts;
+    }
+
+    public ContainerSpec withHosts(List<String> hosts) {
+        this.hosts = hosts;
+        return this;
+    }
+
+    public String getHostname() {
+        return hostname;
+    }
+
+    public ContainerSpec withHostname(String hostname) {
+        this.hostname = hostname;
+        return this;
+    }
+
+    public List<ContainerSpecSecret> getSecrets() {
+        return secrets;
+    }
+
+    public ContainerSpec withSecrets(List<ContainerSpecSecret> secrets) {
+        this.secrets = secrets;
+        return this;
+    }
+
+    public HealthCheck getHealthCheck() {
+        return healthCheck;
+    }
+
+    public ContainerSpec withHealthCheck(HealthCheck healthCheck) {
+        this.healthCheck = healthCheck;
+        return this;
+    }
+
+    public String getStopSignal() {
+        return stopSignal;
+    }
+
+    public ContainerSpec withStopSignal(String stopSignal) {
+        this.stopSignal = stopSignal;
+        return this;
+    }
+
+    public Long getStopGracePeriod() {
+        return stopGracePeriod;
+    }
+
+    public ContainerSpec withStopGracePeriod(Long stopGracePeriod) {
+        this.stopGracePeriod = stopGracePeriod;
+        return this;
+    }
+
+    public ContainerSpecPrivileges getPrivileges() {
+        return privileges;
+    }
+
+    public ContainerSpec withPrivileges(ContainerSpecPrivileges privileges) {
+        this.privileges = privileges;
+        return this;
+    }
+
+    public List<ContainerSpecConfig> getConfigs() {
+        return configs;
+    }
+
+    public ContainerSpec withConfigs(List<ContainerSpecConfig> configs) {
+        this.configs = configs;
+        return this;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java b/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
new file mode 100644
index 000000000..bdc90a442
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
@@ -0,0 +1,73 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import java.io.Serializable;
+
+/**
+ * docker configs that will be exposed to the service
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_29}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ContainerSpecConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @JsonProperty("File")
+    private ContainerSpecFile file;
+
+    @JsonProperty("ConfigID")
+    private String configID;
+
+    @JsonProperty("ConfigName")
+    private String configName;
+
+    public ContainerSpecFile getFile() {
+        return file;
+    }
+
+    public ContainerSpecConfig withFile(ContainerSpecFile file) {
+        this.file = file;
+        return this;
+    }
+
+    public String getConfigID() {
+        return configID;
+    }
+
+    public ContainerSpecConfig withConfigID(String configID) {
+        this.configID = configID;
+        return this;
+    }
+
+    public String getConfigName() {
+        return configName;
+    }
+
+    public ContainerSpecConfig withConfigName(String configName) {
+        this.configName = configName;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java b/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
new file mode 100644
index 000000000..b6d389a79
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
@@ -0,0 +1,93 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import java.io.Serializable;
+
+/**
+ * File represents a specific target that is backed by a file.
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_26}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ContainerSpecFile implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("Name")
+    private String name;
+    /**
+     * UID represents the file UID.
+     */
+    @JsonProperty("UID")
+    private String uid;
+    /**
+     * GID represents the file GID.
+     */
+    @JsonProperty("GID")
+    private String gid;
+    /**
+     * Mode represents the FileMode of the file.
+     */
+    @JsonProperty("Mode")
+    private Long mode;
+
+    public String getName() {
+        return name;
+    }
+
+    public ContainerSpecFile withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public ContainerSpecFile withUid(String uid) {
+        this.uid = uid;
+        return this;
+    }
+
+    public String getGid() {
+        return gid;
+    }
+
+    public ContainerSpecFile withGid(String gid) {
+        this.gid = gid;
+        return this;
+    }
+
+    public Long getMode() {
+        return mode;
+    }
+
+    public ContainerSpecFile withMode(Long mode) {
+        this.mode = mode;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java b/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java
new file mode 100644
index 000000000..d4fed423f
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java
@@ -0,0 +1,58 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import java.io.Serializable;
+
+/**
+ * Security options for the container
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_29}
+ */
+public class ContainerSpecPrivileges implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("CredentialSpec")
+    private ContainerSpecPrivilegesCredential credentialSpec;
+
+    @JsonProperty("SELinuxContext")
+    private ContainerSpecPrivilegesSELinuxContext seLinuxContext;
+
+    public ContainerSpecPrivilegesCredential getCredentialSpec() {
+        return credentialSpec;
+    }
+
+    public ContainerSpecPrivileges withCredentialSpec(ContainerSpecPrivilegesCredential credentialSpec) {
+        this.credentialSpec = credentialSpec;
+        return this;
+    }
+
+    public ContainerSpecPrivilegesSELinuxContext getSeLinuxContext() {
+        return seLinuxContext;
+    }
+
+    public ContainerSpecPrivileges withSeLinuxContext(ContainerSpecPrivilegesSELinuxContext seLinuxContext) {
+        this.seLinuxContext = seLinuxContext;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java b/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java
new file mode 100644
index 000000000..19154b1ab
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java
@@ -0,0 +1,70 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import java.io.Serializable;
+
+/**
+ * Credential for managed service account (Windows only)
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_29}
+ */
+public class ContainerSpecPrivilegesCredential implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Load credential spec from this file. The file is read by the daemon, and must be present in the
+     * `CredentialSpecs` subdirectory in the docker data directory, which defaults to
+     * <code>C:\ProgramData\Docker\</code> on Windows.
+     */
+    @JsonProperty("File")
+    private String file;
+
+    /**
+     * Load credential spec from this value in the Windows registry. The specified registry value must be
+     * located in:
+     * <code>
+     * HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Virtualization\Containers\CredentialSpecs
+     * </code>
+     */
+    @JsonProperty("Registry")
+    private String registry;
+
+    public String getFile() {
+        return file;
+    }
+
+    public ContainerSpecPrivilegesCredential withFile(String file) {
+        this.file = file;
+        return this;
+    }
+
+    public String getRegistry() {
+        return registry;
+    }
+
+    public ContainerSpecPrivilegesCredential withRegistry(String registry) {
+        this.registry = registry;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java b/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
new file mode 100644
index 000000000..152267cb0
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
@@ -0,0 +1,97 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import java.io.Serializable;
+
+/**
+ * SELinux labels of the container
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_29}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ContainerSpecPrivilegesSELinuxContext implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @JsonProperty("Disable")
+    private Boolean disable;
+
+    @JsonProperty("User")
+    private String user;
+
+    @JsonProperty("Role")
+    private String role;
+
+    @JsonProperty("Type")
+    private String type;
+
+    @JsonProperty("Level")
+    private String level;
+
+    public Boolean getDisable() {
+        return disable;
+    }
+
+    public ContainerSpecPrivilegesSELinuxContext withDisable(Boolean disable) {
+        this.disable = disable;
+        return this;
+    }
+
+    public String getUser() {
+        return user;
+    }
+
+    public ContainerSpecPrivilegesSELinuxContext withUser(String user) {
+        this.user = user;
+        return this;
+    }
+
+    public String getRole() {
+        return role;
+    }
+
+    public ContainerSpecPrivilegesSELinuxContext withRole(String role) {
+        this.role = role;
+        return this;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public ContainerSpecPrivilegesSELinuxContext withType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public ContainerSpecPrivilegesSELinuxContext withLevel(String level) {
+        this.level = level;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java b/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
new file mode 100644
index 000000000..cb424de7d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
@@ -0,0 +1,74 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import java.io.Serializable;
+
+/**
+ * docker secrets that will be exposed to the service
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_26}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ContainerSpecSecret implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("File")
+    private ContainerSpecFile file;
+
+    @JsonProperty("SecretID")
+    private String secretId;
+
+    @JsonProperty("SecretName")
+    private String secretName;
+
+    public ContainerSpecFile getFile() {
+        return file;
+    }
+
+    public ContainerSpecSecret withFile(ContainerSpecFile file) {
+        this.file = file;
+        return this;
+    }
+
+    public String getSecretId() {
+        return secretId;
+    }
+
+    public ContainerSpecSecret withSecretId(String secretId) {
+        this.secretId = secretId;
+        return this;
+    }
+
+    public String getSecretName() {
+        return secretName;
+    }
+
+    public ContainerSpecSecret withSecretName(String secretName) {
+        this.secretName = secretName;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/HealthCheck.java b/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
index 514bf4f41..d9057c11a 100644
--- a/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
+++ b/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
@@ -18,7 +18,9 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import java.io.Serializable;
+import java.util.List;
 
 /**
  *
@@ -35,6 +37,24 @@ public class HealthCheck implements Serializable {
     @JsonProperty("Timeout")
     private Long timeout;
 
+    /**
+     * @since 1.26
+     */
+    @JsonProperty("Test")
+    private List<String> test;
+
+    /**
+     * @since 1.26
+     */
+    @JsonProperty("Retries")
+    private Long retries;
+
+    /**
+     * @since 1.26
+     */
+    @JsonProperty("StartPeriod")
+    private Long startPeriod;
+
     public Long getInterval() {
         return interval;
     }
@@ -42,4 +62,41 @@ public Long getInterval() {
     public Long getTimeout() {
         return timeout;
     }
+
+    public HealthCheck withInterval(Long interval) {
+        this.interval = interval;
+        return this;
+    }
+
+    public HealthCheck withTimeout(Long timeout) {
+        this.timeout = timeout;
+        return this;
+    }
+
+    public List<String> getTest() {
+        return test;
+    }
+
+    public HealthCheck withTest(List<String> test) {
+        this.test = test;
+        return this;
+    }
+
+    public Long getRetries() {
+        return retries;
+    }
+
+    public HealthCheck withRetries(Long retries) {
+        this.retries = retries;
+        return this;
+    }
+
+    public Long getStartPeriod() {
+        return startPeriod;
+    }
+
+    public HealthCheck withStartPeriod(Long startPeriod) {
+        this.startPeriod = startPeriod;
+        return this;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java b/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
index 64a69f7ef..6b36decaf 100644
--- a/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
@@ -14,6 +16,8 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class NetworkAttachmentConfig implements Serializable {
     public static final Long serialVersionUID = 1L;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java b/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
index ec2fbe555..44ccc0def 100644
--- a/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
+++ b/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
@@ -13,6 +15,8 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class ResourceRequirements implements Serializable {
     public static final Long serialVersionUID = 1L;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java b/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
index bd3f68c9f..d88f6d8a9 100644
--- a/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
+++ b/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
@@ -16,6 +17,7 @@
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class ServicePlacement implements Serializable {
     public static final Long serialVersionUID = 1L;
 
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java b/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
index 4528ff222..f29c9c542 100644
--- a/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
@@ -64,6 +64,12 @@ public class ServiceSpec implements Serializable {
     @JsonProperty("Labels")
     private Map<String, String> labels;
 
+    /**
+     * @since 1.28
+     */
+    @JsonProperty("RollbackConfig")
+    private UpdateConfig rollbackConfig;
+
     /**
      * @see #name
      */
@@ -167,6 +173,15 @@ public ServiceSpec withLabels(Map<String, String> labels) {
         return this;
     }
 
+    public UpdateConfig getRollbackConfig() {
+        return rollbackConfig;
+    }
+
+    public ServiceSpec withRollbackConfig(UpdateConfig rollbackConfig) {
+        this.rollbackConfig = rollbackConfig;
+        return this;
+    }
+
     /**
      * @see #labels
      */
diff --git a/src/main/java/com/github/dockerjava/api/model/TaskSpec.java b/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
index d44ddd909..33123de82 100644
--- a/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
+++ b/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
@@ -11,6 +11,7 @@
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
@@ -58,6 +59,12 @@ public class TaskSpec implements Serializable {
     @JsonProperty("ForceUpdate")
     private Integer forceUpdate;
 
+    /**
+     * @since 1.25
+     */
+    @JsonProperty("Networks")
+    private List<NetworkAttachmentConfig> networks;
+
     /**
      * @since 1.30
      */
@@ -169,6 +176,15 @@ public TaskSpec withForceUpdate(Integer forceUpdate) {
         return this;
     }
 
+    public List<NetworkAttachmentConfig> getNetworks() {
+        return networks;
+    }
+
+    public TaskSpec withNetworks(List<NetworkAttachmentConfig> networks) {
+        this.networks = networks;
+        return this;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
diff --git a/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java b/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
index 56a64467d..8d3646b10 100644
--- a/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
@@ -34,6 +34,25 @@ public class UpdateConfig implements Serializable {
     @JsonProperty("FailureAction")
     private UpdateFailureAction failureAction;
 
+    /**
+     * @since 1.25
+     */
+    @JsonProperty("MaxFailureRatio")
+    private Float maxFailureRatio;
+
+    /**
+     * @since 1.25
+     */
+    @JsonProperty("Monitor")
+    private Long monitor;
+
+    /**
+     * @since 1.36
+     */
+    @JsonProperty("Order")
+    private UpdateOrder order;
+
+
     /**
      * @see #parallelism
      */
@@ -82,6 +101,43 @@ public UpdateConfig withFailureAction(UpdateFailureAction failureAction) {
         return this;
     }
 
+    public UpdateConfig withParallelism(Long parallelism) {
+        this.parallelism = parallelism;
+        return this;
+    }
+
+    public UpdateConfig withDelay(Long delay) {
+        this.delay = delay;
+        return this;
+    }
+
+    public Float getMaxFailureRatio() {
+        return maxFailureRatio;
+    }
+
+    public UpdateConfig withMaxFailureRatio(Float maxFailureRatio) {
+        this.maxFailureRatio = maxFailureRatio;
+        return this;
+    }
+
+    public Long getMonitor() {
+        return monitor;
+    }
+
+    public UpdateConfig withMonitor(Long monitor) {
+        this.monitor = monitor;
+        return this;
+    }
+
+    public UpdateOrder getOrder() {
+        return order;
+    }
+
+    public UpdateConfig withOrder(UpdateOrder order) {
+        this.order = order;
+        return this;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
diff --git a/src/main/java/com/github/dockerjava/api/model/UpdateOrder.java b/src/main/java/com/github/dockerjava/api/model/UpdateOrder.java
new file mode 100644
index 000000000..75386b938
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/UpdateOrder.java
@@ -0,0 +1,15 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_36}
+ */
+public enum UpdateOrder {
+    @JsonProperty("stop-first")
+    STOP_FIRST,
+
+    @JsonProperty("start-first")
+    START_FIRST
+}
diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index 62da159d7..dcf47d9e6 100644
--- a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -81,6 +81,12 @@ public class RemoteApiVersion implements Serializable {
     public static final RemoteApiVersion VERSION_1_27 = RemoteApiVersion.create(1, 27);
     public static final RemoteApiVersion VERSION_1_29 = RemoteApiVersion.create(1, 29);
     public static final RemoteApiVersion VERSION_1_30 = RemoteApiVersion.create(1, 30);
+    public static final RemoteApiVersion VERSION_1_31 = RemoteApiVersion.create(1, 31);
+    public static final RemoteApiVersion VERSION_1_32 = RemoteApiVersion.create(1, 32);
+    public static final RemoteApiVersion VERSION_1_33 = RemoteApiVersion.create(1, 33);
+    public static final RemoteApiVersion VERSION_1_34 = RemoteApiVersion.create(1, 34);
+    public static final RemoteApiVersion VERSION_1_35 = RemoteApiVersion.create(1, 35);
+    public static final RemoteApiVersion VERSION_1_36 = RemoteApiVersion.create(1, 36);
 
 
     /**
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java b/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
new file mode 100644
index 000000000..dc7c83a4e
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
@@ -0,0 +1,49 @@
+package com.github.dockerjava.cmd.swarm;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.model.ContainerSpec;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.api.model.NetworkAttachmentConfig;
+import com.github.dockerjava.api.model.Service;
+import com.github.dockerjava.api.model.ServiceModeConfig;
+import com.github.dockerjava.api.model.ServiceReplicatedModeOptions;
+import com.github.dockerjava.api.model.ServiceSpec;
+import com.github.dockerjava.api.model.SwarmSpec;
+import com.github.dockerjava.api.model.TaskSpec;
+import com.google.common.collect.Lists;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+public class UpdateSwarmServiceIT extends SwarmCmdIT {
+    @Test
+    public void testUpdateServiceReplicate() {
+        DockerClient docker1 = startDockerInDocker();
+        docker1.initializeSwarmCmd(new SwarmSpec()).exec();
+        //create network
+        String networkId = docker1.createNetworkCmd().withName("networkname").withDriver("overlay")
+                .withIpam(new Network.Ipam().withDriver("default")).exec().getId();
+        TaskSpec taskSpec = new TaskSpec().withContainerSpec(
+                new ContainerSpec().withImage("busybox").withArgs(Arrays.asList("sleep", "3600")));
+        ServiceSpec serviceSpec = new ServiceSpec()
+                .withMode(new ServiceModeConfig().withReplicated(new ServiceReplicatedModeOptions().withReplicas(1)))
+                .withTaskTemplate(taskSpec)
+                .withNetworks(Lists.newArrayList(new NetworkAttachmentConfig().withTarget(networkId)))
+                .withName("worker");
+        String serviceId = docker1.createServiceCmd(serviceSpec).exec().getId();
+        //list the service
+        List<Service> services = docker1.listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec();
+        assertThat(services.size(), is(1));
+        Service service = services.get(0);
+        ServiceSpec updateServiceSpec = service.getSpec()
+                .withMode(new ServiceModeConfig().withReplicated(new ServiceReplicatedModeOptions().withReplicas(2)));
+        docker1.updateServiceCmd(service.getId(), updateServiceSpec).withVersion(service.getVersion().getIndex()).exec();
+        //verify the replicate
+        Service updateService = docker1.listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec().get(0);
+        assertThat(updateService.getSpec().getMode().getReplicated().getReplicas(), is(2L));
+    }
+}

From f196c021883c3e6ccaf36632e5a302bcd06b5e60 Mon Sep 17 00:00:00 2001
From: Yuting Liu <liuyutingfish@gmail.com>
Date: Wed, 3 Jan 2018 19:18:39 +0000
Subject: [PATCH 0781/1272] Add new getter of API v1.23 (#956)

* Add getter of containers/json

* Change Mounts with List

* Add new getters of Internal and EnableIPv6 in /networks/(name)
---
 .../dockerjava/api/model/Container.java       |  21 +++
 .../dockerjava/api/model/ContainerMount.java  | 167 ++++++++++++++++++
 .../github/dockerjava/api/model/Network.java  |  14 ++
 3 files changed, 202 insertions(+)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/ContainerMount.java

diff --git a/src/main/java/com/github/dockerjava/api/model/Container.java b/src/main/java/com/github/dockerjava/api/model/Container.java
index 9e04362ce..61bd395a9 100644
--- a/src/main/java/com/github/dockerjava/api/model/Container.java
+++ b/src/main/java/com/github/dockerjava/api/model/Container.java
@@ -12,6 +12,7 @@
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -54,6 +55,12 @@ public class Container implements Serializable {
     @JsonProperty("Status")
     private String status;
 
+    /**
+     * @since ~{@link RemoteApiVersion#VERSION_1_23}
+     */
+    @JsonProperty("State")
+    private String state;
+
     /**
      * @since ~{@link RemoteApiVersion#VERSION_1_19}
      */
@@ -83,6 +90,12 @@ public class Container implements Serializable {
     @JsonProperty("NetworkSettings")
     private ContainerNetworkSettings networkSettings;
 
+    /**
+     * @since ~{@link RemoteApiVersion#VERSION_1_23}
+     */
+    @JsonProperty("Mounts")
+    private List<ContainerMount> mounts;
+
     public String getId() {
         return id;
     }
@@ -108,6 +121,10 @@ public String getStatus() {
         return status;
     }
 
+    public String getState() {
+        return state;
+    }
+
     public ContainerPort[] getPorts() {
         return ports;
     }
@@ -152,6 +169,10 @@ public ContainerHostConfig getHostConfig() {
         return hostConfig;
     }
 
+    public List<ContainerMount> getMounts() {
+        return mounts;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerMount.java b/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
new file mode 100644
index 000000000..943e8edbb
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
@@ -0,0 +1,167 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+
+/**
+ * @author Yuting Liu
+ * @see Container
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ContainerMount implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("Name")
+    String name;
+
+    @JsonProperty("Source")
+    String source;
+
+    @JsonProperty("Destination")
+    String destination;
+
+    @JsonProperty("Driver")
+    String driver;
+
+    @JsonProperty("Mode")
+    String mode;
+
+    @JsonProperty("RW")
+    boolean rw;
+
+    @JsonProperty("Propagation")
+    String propagation;
+
+    /**
+     * @see #name
+     */
+    @CheckForNull
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @see #name
+     */
+    public ContainerMount withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * @see #source
+     */
+    @CheckForNull
+    public String getSource() {
+        return source;
+    }
+
+    /**
+     * @see #source
+     */
+    public ContainerMount withSource(String source) {
+        this.source = source;
+        return this;
+    }
+
+    /**
+     * @see #destination
+     */
+    @CheckForNull
+    public String getDestination() {
+        return destination;
+    }
+
+    /**
+     * @see #destination
+     */
+    public ContainerMount withDestination(String destination) {
+        this.destination = destination;
+        return this;
+    }
+
+    /**
+     * @see #driver
+     */
+    @CheckForNull
+    public String getDriver() {
+        return driver;
+    }
+
+    /**
+     * @see #driver
+     */
+    public ContainerMount withDriver(String driver) {
+        this.driver = driver;
+        return this;
+    }
+
+    /**
+     * @see #mode
+     */
+    @CheckForNull
+    public String getMode() {
+        return driver;
+    }
+
+    /**
+     * @see #mode
+     */
+    public ContainerMount withMode(String mode) {
+        this.mode = mode;
+        return this;
+    }
+
+    /**
+     * @see #rw
+     */
+    @CheckForNull
+    public Boolean getRw() {
+        return rw;
+    }
+
+    /**
+     * @see #rw
+     */
+    public ContainerMount withRw(Boolean rw) {
+        this.rw = rw;
+        return this;
+    }
+
+    /**
+     * @see #propagation
+     */
+    @CheckForNull
+    public String getPropagation() {
+        return propagation;
+    }
+
+    /**
+     * @see #propagation
+     */
+    public ContainerMount withPropagation(String propagation) {
+        this.propagation = propagation;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/Network.java b/src/main/java/com/github/dockerjava/api/model/Network.java
index 44eb2f402..438dbc12d 100644
--- a/src/main/java/com/github/dockerjava/api/model/Network.java
+++ b/src/main/java/com/github/dockerjava/api/model/Network.java
@@ -28,6 +28,12 @@ public class Network implements Serializable {
     @JsonProperty("Driver")
     private String driver;
 
+    @JsonProperty("EnableIPv6")
+    private Boolean enableIPv6;
+
+    @JsonProperty("Internal")
+    private Boolean internal;
+
     @JsonProperty("IPAM")
     private Ipam ipam;
 
@@ -59,6 +65,14 @@ public String getDriver() {
         return driver;
     }
 
+    public Boolean getEnableIPv6() {
+        return enableIPv6;
+    }
+
+    public Boolean getInternal() {
+        return internal;
+    }
+
     public Ipam getIpam() {
         return ipam;
     }

From d0d5ae6d247ed886ca801106d7ee24821f008e7d Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Thu, 4 Jan 2018 20:32:02 +0800
Subject: [PATCH 0782/1272] fix typo: class StatisticNetWorksConfig in
 StatisticNetworksConfig.java, should be class StatisticNetworksConfig

---
 .../dockerjava/api/model/StatisticNetworksConfig.java     | 2 +-
 .../java/com/github/dockerjava/api/model/Statistics.java  | 8 ++++----
 .../com/github/dockerjava/api/model/StatisticsTest.java   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java b/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
index a6cc5ff0e..9f6271ea1 100644
--- a/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
@@ -15,7 +15,7 @@
  * @author Yuting Liu
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-class StatisticNetWorksConfig implements Serializable {
+public class StatisticNetworksConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("rx_bytes")
diff --git a/src/main/java/com/github/dockerjava/api/model/Statistics.java b/src/main/java/com/github/dockerjava/api/model/Statistics.java
index 3b020c4d2..42056a3a5 100644
--- a/src/main/java/com/github/dockerjava/api/model/Statistics.java
+++ b/src/main/java/com/github/dockerjava/api/model/Statistics.java
@@ -28,14 +28,14 @@ public class Statistics implements Serializable {
      */
     @CheckForNull
     @JsonProperty("networks")
-    private Map<String, StatisticNetWorksConfig> networks;
+    private Map<String, StatisticNetworksConfig> networks;
 
     /**
      * @deprecated as of Docker Remote API 1.21, replaced by {@link #networks}
      */
     @Deprecated
     @JsonProperty("network")
-    private Map<String, StatisticNetWorksConfig> network;
+    private Map<String, StatisticNetworksConfig> network;
 
     @JsonProperty("memory_stats")
     private MemoryStatsConfig memoryStats;
@@ -66,7 +66,7 @@ public String getRead() {
      * @since Docker Remote API 1.21
      */
     @CheckForNull
-    public Map<String, StatisticNetWorksConfig> getNetworks() {
+    public Map<String, StatisticNetworksConfig> getNetworks() {
         return networks;
     }
 
@@ -74,7 +74,7 @@ public Map<String, StatisticNetWorksConfig> getNetworks() {
      * @deprecated as of Docker Remote API 1.21, replaced by {@link #getNetworks()}
      */
     @Deprecated
-    public Map<String, StatisticNetWorksConfig> getNetwork() {
+    public Map<String, StatisticNetworksConfig> getNetwork() {
         return network;
     }
 
diff --git a/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java b/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
index d2083c4b3..6b79f54cc 100644
--- a/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
@@ -31,7 +31,7 @@ public void serderJson1() throws IOException {
 
         assertThat(statistics.getRead(), equalTo("2017-12-06T00:42:03.8352972Z"));
 
-        final StatisticNetWorksConfig network = statistics.getNetworks().get("eth0");
+        final StatisticNetworksConfig network = statistics.getNetworks().get("eth0");
         assertThat(network.getRxBytes(), is(1230L));
         assertThat(network.getRxPackets(), is(19L));
         assertThat(network.getRxErrors(), is(0L));

From bbbff927cf8adc27029cd1d2eac5eee84536a760 Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Thu, 4 Jan 2018 21:51:24 +0800
Subject: [PATCH 0783/1272] fix deserialization error of BlkioStats

---
 .../dockerjava/api/model/BlkioStatEntry.java  | 80 +++++++++++++++++++
 .../api/model/BlkioStatsConfig.java           | 53 ++++++++----
 .../dockerjava/api/model/StatisticsTest.java  |  5 +-
 .../containers/container/stats/stats1.json    | 30 ++++++-
 4 files changed, 145 insertions(+), 23 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java

diff --git a/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java b/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java
new file mode 100644
index 000000000..f83deff0d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java
@@ -0,0 +1,80 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import java.io.Serializable;
+
+/**
+ * BlkioStat is not documented in pubic docker swapper.yaml yet, reference:
+ * https://github.com/moby/moby/blob/master/api/types/stats.go
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class BlkioStatEntry implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @JsonProperty("major")
+    Long major;
+    @JsonProperty("minor")
+    Long minor;
+    @JsonProperty("op")
+    String op;
+    @JsonProperty("value")
+    Long value;
+
+    public Long getMajor() {
+        return major;
+    }
+
+    public BlkioStatEntry withMajor(Long major) {
+        this.major = major;
+        return this;
+    }
+
+    public Long getMinor() {
+        return minor;
+    }
+
+    public BlkioStatEntry withMinor(Long minor) {
+        this.minor = minor;
+        return this;
+    }
+
+    public String getOp() {
+        return op;
+    }
+
+    public BlkioStatEntry withOp(String op) {
+        this.op = op;
+        return this;
+    }
+
+    public Long getValue() {
+        return value;
+    }
+
+    public BlkioStatEntry withValue(Long value) {
+        this.value = value;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java b/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
index b6699f8c3..5e02b42ce 100644
--- a/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
@@ -2,6 +2,10 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -13,38 +17,38 @@
  * @author Yuting Liu
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-class BlkioStatsConfig implements Serializable {
+public class BlkioStatsConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("io_service_bytes_recursive")
-    private List<Long> ioServiceBytesRecursive;
+    private List<BlkioStatEntry> ioServiceBytesRecursive;
 
     @JsonProperty("io_serviced_recursive")
-    private List<Long> ioServicedRecursive;
+    private List<BlkioStatEntry> ioServicedRecursive;
 
     @JsonProperty("io_queue_recursive")
-    private List<Long> ioQueueRecursive;
+    private List<BlkioStatEntry> ioQueueRecursive;
 
     @JsonProperty("io_service_time_recursive")
-    private List<Long> ioServiceTimeRecursive;
+    private List<BlkioStatEntry> ioServiceTimeRecursive;
 
     @JsonProperty("io_wait_time_recursive")
-    private List<Long> ioWaitTimeRecursive;
+    private List<BlkioStatEntry> ioWaitTimeRecursive;
 
     @JsonProperty("io_merged_recursive")
-    private List<Long> ioMergedRecursive;
+    private List<BlkioStatEntry> ioMergedRecursive;
 
     @JsonProperty("io_time_recursive")
-    private List<Long> ioTimeRecursive;
+    private List<BlkioStatEntry> ioTimeRecursive;
 
     @JsonProperty("sectors_recursive")
-    private List<Long> sectorsRecursive;
+    private List<BlkioStatEntry> sectorsRecursive;
 
     /**
      * @see #ioServiceBytesRecursive
      */
     @CheckForNull
-    public List<Long> getIoServiceBytesRecursive() {
+    public List<BlkioStatEntry> getIoServiceBytesRecursive() {
         return ioServiceBytesRecursive;
     }
 
@@ -52,7 +56,7 @@ public List<Long> getIoServiceBytesRecursive() {
      * @see #ioServicedRecursive
      */
     @CheckForNull
-    public List<Long> getIoServicedRecursive() {
+    public List<BlkioStatEntry> getIoServicedRecursive() {
         return ioServicedRecursive;
     }
 
@@ -60,7 +64,7 @@ public List<Long> getIoServicedRecursive() {
      * @see #ioQueueRecursive
      */
     @CheckForNull
-    public List<Long> getIoQueueRecursive() {
+    public List<BlkioStatEntry> getIoQueueRecursive() {
         return ioQueueRecursive;
     }
 
@@ -68,7 +72,7 @@ public List<Long> getIoQueueRecursive() {
      * @see #ioServiceTimeRecursive
      */
     @CheckForNull
-    public List<Long> getIoServiceTimeRecursive() {
+    public List<BlkioStatEntry> getIoServiceTimeRecursive() {
         return ioServiceTimeRecursive;
     }
 
@@ -76,7 +80,7 @@ public List<Long> getIoServiceTimeRecursive() {
      * @see #ioWaitTimeRecursive
      */
     @CheckForNull
-    public List<Long> getIoWaitTimeRecursive() {
+    public List<BlkioStatEntry> getIoWaitTimeRecursive() {
         return ioWaitTimeRecursive;
     }
 
@@ -84,7 +88,7 @@ public List<Long> getIoWaitTimeRecursive() {
      * @see #ioMergedRecursive
      */
     @CheckForNull
-    public List<Long> getIoMergedRecursive() {
+    public List<BlkioStatEntry> getIoMergedRecursive() {
         return ioMergedRecursive;
     }
 
@@ -92,7 +96,7 @@ public List<Long> getIoMergedRecursive() {
      * @see #ioTimeRecursive
      */
     @CheckForNull
-    public List<Long> getIoTimeRecursive() {
+    public List<BlkioStatEntry> getIoTimeRecursive() {
         return ioTimeRecursive;
     }
 
@@ -100,7 +104,22 @@ public List<Long> getIoTimeRecursive() {
      * @see #sectorsRecursive
      */
     @CheckForNull
-    public List<Long> getSectorsRecursive() {
+    public List<BlkioStatEntry> getSectorsRecursive() {
         return sectorsRecursive;
     }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java b/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
index 6b79f54cc..c0bc01d84 100644
--- a/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
@@ -84,8 +84,9 @@ public void serderJson1() throws IOException {
         assertThat(memoryStats.getLimit(), is(2095874048L));
 
         final BlkioStatsConfig blkioStats = statistics.getBlkioStats();
-        assertThat(blkioStats.getIoServiceBytesRecursive(), is(empty()));
-        assertThat(blkioStats.getIoServicedRecursive(), is(empty()));
+        assertThat(blkioStats.getIoServiceBytesRecursive().size(), is(2));
+        assertThat(blkioStats.getIoServiceBytesRecursive().get(0).getValue(), is(26214L));
+        assertThat(blkioStats.getIoServicedRecursive().size(), is(2));
         assertThat(blkioStats.getIoQueueRecursive(), is(empty()));
         assertThat(blkioStats.getIoServiceTimeRecursive(), is(empty()));
         assertThat(blkioStats.getIoWaitTimeRecursive(), is(empty()));
diff --git a/src/test/resources/samples/1.27/containers/container/stats/stats1.json b/src/test/resources/samples/1.27/containers/container/stats/stats1.json
index e542c10a9..cb5f324f0 100644
--- a/src/test/resources/samples/1.27/containers/container/stats/stats1.json
+++ b/src/test/resources/samples/1.27/containers/container/stats/stats1.json
@@ -5,11 +5,33 @@
     "current":2
   },
   "blkio_stats":{
-    "io_service_bytes_recursive":[
-
+    "io_service_bytes_recursive": [
+      {
+        "major": 8,
+        "minor": "0",
+        "op": "Read",
+        "value": 26214
+      },
+      {
+        "major": 8,
+        "minor": "0",
+        "op": "Write",
+        "value": 26214
+      }
     ],
-    "io_serviced_recursive":[
-
+    "io_serviced_recursive": [
+      {
+        "major": 8,
+        "minor": 0,
+        "op": "Read",
+        "value": 41771
+      },
+      {
+        "major": 8,
+        "minor": 0,
+        "op": "Write",
+        "value": 72796
+      }
     ],
     "io_queue_recursive":[
 

From 63932f45f99d8731f31b9cd156c0e3eff1dd9cd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=AE=87=E9=B9=8F=EF=BC=88=E6=89=A7=E9=A3=8E?=
 =?UTF-8?q?=EF=BC=89?= <zhangyupeng.zyp@alibaba-inc.com>
Date: Fri, 5 Jan 2018 20:39:50 +0800
Subject: [PATCH 0784/1272] fix deal with repositoryName with SHA256

---
 .../github/dockerjava/core/NameParser.java    |  9 +++++++
 .../dockerjava/core/NameParserTest.java       | 24 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/core/NameParser.java b/src/main/java/com/github/dockerjava/core/NameParser.java
index 1db59e3a0..c592684be 100644
--- a/src/main/java/com/github/dockerjava/core/NameParser.java
+++ b/src/main/java/com/github/dockerjava/core/NameParser.java
@@ -5,6 +5,7 @@
 
 import java.util.regex.Pattern;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
@@ -20,6 +21,8 @@ private NameParser() {
     // CHECKSTYLE:OFF
     private static final int RepositoryNameTotalLengthMax = 255;
 
+    private static final String SHA256_SEPARATOR = "@sha256:";
+
     private static final Pattern RepositoryNameComponentRegexp = Pattern.compile("[a-z0-9]+(?:[._-][a-z0-9]+)*");
 
     private static final Pattern RepositoryNameComponentAnchoredRegexp = Pattern.compile("^"
@@ -37,6 +40,9 @@ public static ReposTag parseRepositoryTag(String name) {
             return new ReposTag(name, "");
         }
         String tag = name.substring(n + 1);
+        if (StringUtils.containsIgnoreCase(name, SHA256_SEPARATOR)) {
+            return new ReposTag(name, "");
+        }
         if (!tag.contains("/")) {
             return new ReposTag(name.substring(0, n), tag);
         }
@@ -110,6 +116,9 @@ public static HostnameReposName resolveRepositoryName(String reposName) {
             throw new InvalidRepositoryNameException(String.format("Invalid repository name, try \"%s\" instead",
                     reposName));
         }
+        if (StringUtils.containsIgnoreCase(reposName, SHA256_SEPARATOR)) {
+            reposName = StringUtils.substringBeforeLast(reposName, SHA256_SEPARATOR);
+        }
 
         validateRepoName(reposName);
         return new HostnameReposName(hostname, reposName);
diff --git a/src/test/java/com/github/dockerjava/core/NameParserTest.java b/src/test/java/com/github/dockerjava/core/NameParserTest.java
index ba9453e1c..234ed47a1 100644
--- a/src/test/java/com/github/dockerjava/core/NameParserTest.java
+++ b/src/test/java/com/github/dockerjava/core/NameParserTest.java
@@ -89,12 +89,24 @@ public void testResolveRepositoryNameWithNamespace() throws Exception {
         assertEquals(resolved, new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "namespace/repository"));
     }
 
+    @Test
+    public void testResolveRepositoryNameWithNamespaceAndSHA256() throws Exception {
+        HostnameReposName resolved = NameParser.resolveRepositoryName("namespace/repository@sha256:sha256");
+        assertEquals(resolved, new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "namespace/repository@sha256:sha256"));
+    }
+
     @Test
     public void testResolveRepositoryNameWithNamespaceAndHostname() throws Exception {
         HostnameReposName resolved = NameParser.resolveRepositoryName("localhost:5000/namespace/repository");
         assertEquals(resolved, new HostnameReposName("localhost:5000", "namespace/repository"));
     }
 
+    @Test
+    public void testResolveRepositoryNameWithNamespaceAndHostnameAndSHA256() throws Exception {
+        HostnameReposName resolved = NameParser.resolveRepositoryName("localhost:5000/namespace/repository@sha256:sha256");
+        assertEquals(resolved, new HostnameReposName("localhost:5000", "namespace/repository"));
+    }
+
     @Test(expected = InvalidRepositoryNameException.class)
     public void testResolveRepositoryNameWithIndex() throws Exception {
         NameParser.resolveRepositoryName("index.docker.io/repository");
@@ -123,4 +135,16 @@ public void testResolveReposTagWithTag() throws Exception {
         resolved = NameParser.parseRepositoryTag("localhost:5000/namespace/repository:tag");
         assertEquals(resolved, new ReposTag("localhost:5000/namespace/repository", "tag"));
     }
+
+    @Test
+    public void testResolveReposTagWithSHA256() throws Exception {
+        ReposTag resolved = NameParser.parseRepositoryTag("repository@sha256:sha256");
+        assertEquals(resolved, new ReposTag("repository@sha256:sha256", ""));
+
+        resolved = NameParser.parseRepositoryTag("namespace/repository@sha256:sha256");
+        assertEquals(resolved, new ReposTag("namespace/repository@sha256:sha256", ""));
+
+        resolved = NameParser.parseRepositoryTag("localhost:5000/namespace/repository@sha256:sha256");
+        assertEquals(resolved, new ReposTag("localhost:5000/namespace/repository@sha256:sha256", ""));
+    }
 }

From 112b3c2a931b11a945ce5195c9282b8768ce1bc9 Mon Sep 17 00:00:00 2001
From: Sebastian Binder <sebastianbinder@users.noreply.github.com>
Date: Tue, 9 Jan 2018 12:03:58 +0100
Subject: [PATCH 0785/1272] Update ServiceRestartCondition

ServiceRestartCondition.ON_FAILURE needs to be on-failure instead of on_failure
---
 .../github/dockerjava/api/model/ServiceRestartCondition.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java b/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java
index 98ca2f064..9ab390874 100644
--- a/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java
@@ -8,7 +8,7 @@
  */
 public enum ServiceRestartCondition {
 
-    @JsonProperty("on_failure")
+    @JsonProperty("on-failure")
     ON_FAILURE,
 
     @JsonProperty("any")

From 055a028e757d675bf62be49ecb11647d5c3d9e4b Mon Sep 17 00:00:00 2001
From: fb <fb@baqend.com>
Date: Mon, 15 Jan 2018 19:28:23 +0100
Subject: [PATCH 0786/1272] Fix resource leak in error the error handler

---
 .../filter/ResponseStatusExceptionFilter.java | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
index a88dccb0d..895e900cd 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.jaxrs.filter;
 
-import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
@@ -58,16 +57,7 @@ public void filter(ClientRequestContext requestContext, ClientResponseContext re
 
     private String getBodyAsMessage(ClientResponseContext responseContext) throws IOException {
         if (responseContext.hasEntity()) {
-            int contentLength = responseContext.getLength();
-            if (contentLength != -1) {
-                byte[] buffer = new byte[contentLength];
-                try {
-                    InputStream entityStream = responseContext.getEntityStream();
-                    IOUtils.readFully(entityStream, buffer);
-                    entityStream.close();
-                } catch (EOFException e) {
-                    return null;
-                }
+            try (InputStream entityStream = responseContext.getEntityStream()) {
                 Charset charset = null;
                 MediaType mediaType = responseContext.getMediaType();
                 if (mediaType != null) {
@@ -75,16 +65,16 @@ private String getBodyAsMessage(ClientResponseContext responseContext) throws IO
                     if (charsetName != null) {
                         try {
                             charset = Charset.forName(charsetName);
-                        } catch (Exception e) {
-                            // Do noting...
-                        }
+                        } catch (Exception ignored) { }
                     }
                 }
+
                 if (charset == null) {
                     charset = Charset.defaultCharset();
                 }
-                return new String(buffer, charset);
-            }
+
+                return IOUtils.toString(entityStream, charset);
+            } catch (Exception ignored) { }
         }
         return null;
     }

From 54bd2432dae06f9400603dffbb44e1573db9ed2d Mon Sep 17 00:00:00 2001
From: Yuting Liu <liuyutingfish@gmail.com>
Date: Fri, 19 Jan 2018 20:24:48 +0000
Subject: [PATCH 0787/1272] Make the class of Statistics config public (#975)

* change pom.xml

* Make the class of Statistics config public

* Fix the unit test
---
 .../com/github/dockerjava/api/model/BlkioStatsConfig.java | 2 +-
 .../com/github/dockerjava/api/model/CpuStatsConfig.java   | 2 +-
 .../com/github/dockerjava/api/model/CpuUsageConfig.java   | 2 +-
 .../github/dockerjava/api/model/MemoryStatsConfig.java    | 2 +-
 .../com/github/dockerjava/api/model/PidsStatsConfig.java  | 2 +-
 .../dockerjava/api/model/StatisticNetworksConfig.java     | 2 +-
 .../java/com/github/dockerjava/api/model/Statistics.java  | 8 ++++----
 .../github/dockerjava/api/model/ThrottlingDataConfig.java | 2 +-
 .../com/github/dockerjava/api/model/StatisticsTest.java   | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java b/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
index b6699f8c3..95e6af906 100644
--- a/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
@@ -13,7 +13,7 @@
  * @author Yuting Liu
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-class BlkioStatsConfig implements Serializable {
+public class BlkioStatsConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("io_service_bytes_recursive")
diff --git a/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java b/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
index 7a7a699b4..1444d5472 100644
--- a/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
@@ -12,7 +12,7 @@
  * @author Yuting Liu
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-class CpuStatsConfig implements Serializable {
+public class CpuStatsConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("cpu_usage")
diff --git a/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java b/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
index 73cf0c57c..e85fc637e 100644
--- a/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
@@ -13,7 +13,7 @@
  * @author Yuting Liu
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-class CpuUsageConfig implements Serializable {
+public class CpuUsageConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("total_usage")
diff --git a/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java b/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
index 8c1a24bc3..77c9f0b28 100644
--- a/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
@@ -12,7 +12,7 @@
  * @author Yuting Liu
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-class MemoryStatsConfig implements Serializable {
+public class MemoryStatsConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("usage")
diff --git a/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java b/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java
index bbf8806a3..c3d13596f 100644
--- a/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java
@@ -10,7 +10,7 @@
  *
  * @author Yuting Liu
  */
-class PidsStatsConfig implements Serializable {
+public class PidsStatsConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("current")
diff --git a/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java b/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
index a6cc5ff0e..9f6271ea1 100644
--- a/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
@@ -15,7 +15,7 @@
  * @author Yuting Liu
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-class StatisticNetWorksConfig implements Serializable {
+public class StatisticNetworksConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("rx_bytes")
diff --git a/src/main/java/com/github/dockerjava/api/model/Statistics.java b/src/main/java/com/github/dockerjava/api/model/Statistics.java
index 3b020c4d2..42056a3a5 100644
--- a/src/main/java/com/github/dockerjava/api/model/Statistics.java
+++ b/src/main/java/com/github/dockerjava/api/model/Statistics.java
@@ -28,14 +28,14 @@ public class Statistics implements Serializable {
      */
     @CheckForNull
     @JsonProperty("networks")
-    private Map<String, StatisticNetWorksConfig> networks;
+    private Map<String, StatisticNetworksConfig> networks;
 
     /**
      * @deprecated as of Docker Remote API 1.21, replaced by {@link #networks}
      */
     @Deprecated
     @JsonProperty("network")
-    private Map<String, StatisticNetWorksConfig> network;
+    private Map<String, StatisticNetworksConfig> network;
 
     @JsonProperty("memory_stats")
     private MemoryStatsConfig memoryStats;
@@ -66,7 +66,7 @@ public String getRead() {
      * @since Docker Remote API 1.21
      */
     @CheckForNull
-    public Map<String, StatisticNetWorksConfig> getNetworks() {
+    public Map<String, StatisticNetworksConfig> getNetworks() {
         return networks;
     }
 
@@ -74,7 +74,7 @@ public Map<String, StatisticNetWorksConfig> getNetworks() {
      * @deprecated as of Docker Remote API 1.21, replaced by {@link #getNetworks()}
      */
     @Deprecated
-    public Map<String, StatisticNetWorksConfig> getNetwork() {
+    public Map<String, StatisticNetworksConfig> getNetwork() {
         return network;
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java b/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
index e08f93b6d..5d38941c7 100644
--- a/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
@@ -12,7 +12,7 @@
  * @author Yuting Liu
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-class ThrottlingDataConfig implements Serializable {
+public class ThrottlingDataConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("periods")
diff --git a/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java b/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
index d2083c4b3..6b79f54cc 100644
--- a/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
@@ -31,7 +31,7 @@ public void serderJson1() throws IOException {
 
         assertThat(statistics.getRead(), equalTo("2017-12-06T00:42:03.8352972Z"));
 
-        final StatisticNetWorksConfig network = statistics.getNetworks().get("eth0");
+        final StatisticNetworksConfig network = statistics.getNetworks().get("eth0");
         assertThat(network.getRxBytes(), is(1230L));
         assertThat(network.getRxPackets(), is(19L));
         assertThat(network.getRxErrors(), is(0L));

From 6be607c036cb700bcac1d4abe1421ff4a3df4475 Mon Sep 17 00:00:00 2001
From: Peter Darton <pjdarton@gmail.com>
Date: Mon, 22 Jan 2018 16:11:00 +0000
Subject: [PATCH 0788/1272] Add withReadTimeout(Integer) method to
 NettyDockerCmdExecFactory.

This enhances our Netty support so that, like
JerseyDockerCmdExecFactory, we have a withReadTimeout(milliseconds)
method that configures the factory to implement a read timeout.
This allows clients to cope with recalcitrant docker daemons - if the
daemon stops responding then the client code will get a
SocketTimeoutException (much like it would if it was using Jersey
instead of Netty) instead of just hanging forever.
---
 .../netty/NettyDockerCmdExecFactory.java      | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index be46555fd..061e69a1f 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -6,7 +6,9 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
+import java.net.SocketTimeoutException;
 import java.security.Security;
+import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;
@@ -153,6 +155,7 @@
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelConfig;
 import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.epoll.EpollDomainSocketChannel;
@@ -168,6 +171,9 @@
 import io.netty.handler.codec.http.HttpClientCodec;
 import io.netty.handler.logging.LoggingHandler;
 import io.netty.handler.ssl.SslHandler;
+import io.netty.handler.timeout.IdleState;
+import io.netty.handler.timeout.IdleStateEvent;
+import io.netty.handler.timeout.IdleStateHandler;
 import io.netty.util.concurrent.DefaultThreadFactory;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
@@ -216,6 +222,8 @@ public DuplexChannel getChannel() {
 
     private Integer connectTimeout = null;
 
+    private Integer readTimeout = null;
+
     @Override
     public void init(DockerClientConfig dockerClientConfig) {
         checkNotNull(dockerClientConfig, "config was not specified");
@@ -744,16 +752,54 @@ public NettyDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) {
         return this;
     }
 
+    /**
+     * Configure read timeout in milliseconds
+     */
+    public NettyDockerCmdExecFactory withReadTimeout(Integer readTimeout) {
+        this.readTimeout = readTimeout;
+        return this;
+    }
+
     private <T extends Channel> T configure(T channel) {
         ChannelConfig channelConfig = channel.config();
 
         if (connectTimeout != null) {
             channelConfig.setConnectTimeoutMillis(connectTimeout);
         }
+        if (readTimeout != null) {
+            channel.pipeline().addLast("readTimeoutHandler", new ReadTimeoutHandler());
+        }
 
         return channel;
     }
 
+    private final class ReadTimeoutHandler extends IdleStateHandler {
+        private boolean alreadyTimedOut;
+
+        ReadTimeoutHandler() {
+            super(readTimeout, 0, 0, TimeUnit.MILLISECONDS);
+        }
+
+        /**
+         * Called when a read timeout was detected.
+         */
+        @Override
+        protected synchronized void channelIdle(ChannelHandlerContext ctx, IdleStateEvent evt) throws Exception {
+            assert evt.state() == IdleState.READER_IDLE;
+            final Channel channel = ctx.channel();
+            if (channel == null || !channel.isActive() || alreadyTimedOut) {
+                return;
+            }
+            final Object dockerAPIEndpoint = dockerClientConfig.getDockerHost();
+            final String msg = "Read timed out: No data received within " + readTimeout
+                    + "ms.  Perhaps the docker API (" + dockerAPIEndpoint
+                    + ") is not responding normally, or perhaps you need to increase the readTimeout value.";
+            final Exception ex = new SocketTimeoutException(msg);
+            ctx.fireExceptionCaught(ex);
+            alreadyTimedOut = true;
+        }
+    }
+
     protected WebTarget getBaseResource() {
         checkNotNull(baseResource, "Factory not initialized, baseResource not set. You probably forgot to call init()!");
         return baseResource;

From fcb791a5eb5c2f95342e5559584e03543e04d538 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 23 Jan 2018 22:11:41 +0100
Subject: [PATCH 0789/1272] Implement AbstractDockerCmdExecFactory (#980)

* Implement AbstractDockerCmdExecFactory to share code between DockerCmdExecFactory implementations

* fix code style

* remove deprecated classes as agreed with @KostyaSha

* WebTarget -> NettyWebTarget, InvocationBuilder -> NettyInvocationBuilder
---
 .../core/AbstractDockerCmdExecFactory.java    | 489 ++++++++++++++++++
 .../dockerjava/core/InvocationBuilder.java    |  94 ++++
 .../dockerjava/{netty => core}/MediaType.java |   4 +-
 .../com/github/dockerjava/core/WebTarget.java |  19 +
 .../exec/AbstrAsyncDockerCmdExec.java         |   4 +-
 .../exec/AbstrDockerCmdExec.java              |   6 +-
 .../exec/AbstrSyncDockerCmdExec.java          |   4 +-
 .../exec/AttachContainerCmdExec.java          |   4 +-
 .../{netty => core}/exec/AuthCmdExec.java     |   6 +-
 .../exec/BuildImageCmdExec.java               |   8 +-
 .../{netty => core}/exec/CommitCmdExec.java   |   6 +-
 .../exec/ConnectToNetworkCmdExec.java         |   4 +-
 .../exec/ContainerDiffCmdExec.java            |   6 +-
 .../exec/CopyArchiveFromContainerCmdExec.java |   6 +-
 .../exec/CopyArchiveToContainerCmdExec.java   |   6 +-
 .../exec/CopyFileFromContainerCmdExec.java    |   6 +-
 .../exec/CreateContainerCmdExec.java          |   6 +-
 .../exec/CreateImageCmdExec.java              |   6 +-
 .../exec/CreateNetworkCmdExec.java            |   6 +-
 .../exec/CreateServiceCmdExec.java            |   6 +-
 .../exec/CreateVolumeCmdExec.java             |   6 +-
 .../exec/DisconnectFromNetworkCmdExec.java    |   4 +-
 .../{netty => core}/exec/EventsCmdExec.java   |   4 +-
 .../exec/ExecCreateCmdExec.java               |   6 +-
 .../exec/ExecStartCmdExec.java                |   6 +-
 .../{netty => core}/exec/InfoCmdExec.java     |  11 +-
 .../exec/InitializeSwarmCmdExec.java          |   6 +-
 .../exec/InspectContainerCmdExec.java         |   6 +-
 .../exec/InspectExecCmdExec.java              |   6 +-
 .../exec/InspectImageCmdExec.java             |   6 +-
 .../exec/InspectNetworkCmdExec.java           |   6 +-
 .../exec/InspectServiceCmdExec.java           |   6 +-
 .../exec/InspectSwarmCmdExec.java             |   6 +-
 .../exec/InspectSwarmNodeCmdExec.java         |   6 +-
 .../exec/InspectVolumeCmdExec.java            |   6 +-
 .../exec/JoinSwarmCmdExec.java                |   6 +-
 .../exec/KillContainerCmdExec.java            |   6 +-
 .../exec/LeaveSwarmCmdExec.java               |   6 +-
 .../exec/ListContainersCmdExec.java           |   6 +-
 .../exec/ListImagesCmdExec.java               |   6 +-
 .../exec/ListNetworksCmdExec.java             |   6 +-
 .../exec/ListServicesCmdExec.java             |   6 +-
 .../exec/ListSwarmNodesCmdExec.java           |   6 +-
 .../exec/ListTasksCmdExec.java                |   6 +-
 .../exec/ListVolumesCmdExec.java              |   6 +-
 .../exec/LoadImageCmdExec.java                |   4 +-
 .../exec/LogContainerCmdExec.java             |   4 +-
 .../exec/PauseContainerCmdExec.java           |   6 +-
 .../{netty => core}/exec/PingCmdExec.java     |   4 +-
 .../exec/PullImageCmdExec.java                |   6 +-
 .../exec/PushImageCmdExec.java                |   8 +-
 .../exec/RemoveContainerCmdExec.java          |   6 +-
 .../exec/RemoveImageCmdExec.java              |   4 +-
 .../exec/RemoveNetworkCmdExec.java            |   6 +-
 .../exec/RemoveServiceCmdExec.java            |   6 +-
 .../exec/RemoveSwarmNodeCmdExec.java          |   6 +-
 .../exec/RemoveVolumeCmdExec.java             |   6 +-
 .../exec/RenameContainerCmdExec.java          |   6 +-
 .../exec/RestartContainerCmdExec.java         |   6 +-
 .../exec/SaveImageCmdExec.java                |   6 +-
 .../exec/SearchImagesCmdExec.java             |   6 +-
 .../exec/StartContainerCmdExec.java           |   6 +-
 .../{netty => core}/exec/StatsCmdExec.java    |   4 +-
 .../exec/StopContainerCmdExec.java            |   6 +-
 .../{netty => core}/exec/TagImageCmdExec.java |   4 +-
 .../exec/TopContainerCmdExec.java             |   6 +-
 .../exec/UnpauseContainerCmdExec.java         |   6 +-
 .../exec/UpdateContainerCmdExec.java          |   6 +-
 .../exec/UpdateServiceCmdExec.java            |   6 +-
 .../exec/UpdateSwarmCmdExec.java              |   6 +-
 .../exec/UpdateSwarmNodeCmdExec.java          |   6 +-
 .../{netty => core}/exec/VersionCmdExec.java  |   6 +-
 .../exec/WaitContainerCmdExec.java            |   6 +-
 .../netty/NettyDockerCmdExecFactory.java      | 483 +----------------
 ...ilder.java => NettyInvocationBuilder.java} |  67 +--
 .../{WebTarget.java => NettyWebTarget.java}   |  31 +-
 ...argetTest.java => NettyWebTargetTest.java} |  14 +-
 77 files changed, 837 insertions(+), 763 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
 create mode 100644 src/main/java/com/github/dockerjava/core/InvocationBuilder.java
 rename src/main/java/com/github/dockerjava/{netty => core}/MediaType.java (67%)
 create mode 100644 src/main/java/com/github/dockerjava/core/WebTarget.java
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/AbstrAsyncDockerCmdExec.java (95%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/AbstrDockerCmdExec.java (96%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/AbstrSyncDockerCmdExec.java (92%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/AttachContainerCmdExec.java (94%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/AuthCmdExec.java (87%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/BuildImageCmdExec.java (96%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/CommitCmdExec.java (90%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/ConnectToNetworkCmdExec.java (90%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/ContainerDiffCmdExec.java (89%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/CopyArchiveFromContainerCmdExec.java (89%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/CopyArchiveToContainerCmdExec.java (90%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/CopyFileFromContainerCmdExec.java (88%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/CreateContainerCmdExec.java (90%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/CreateImageCmdExec.java (89%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/CreateNetworkCmdExec.java (88%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/CreateServiceCmdExec.java (89%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/CreateVolumeCmdExec.java (88%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/DisconnectFromNetworkCmdExec.java (91%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/EventsCmdExec.java (93%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/ExecCreateCmdExec.java (89%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/ExecStartCmdExec.java (88%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/InfoCmdExec.java (56%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/InitializeSwarmCmdExec.java (86%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/InspectContainerCmdExec.java (90%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/InspectExecCmdExec.java (88%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/InspectImageCmdExec.java (88%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/InspectNetworkCmdExec.java (88%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/InspectServiceCmdExec.java (88%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/InspectSwarmCmdExec.java (87%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/InspectSwarmNodeCmdExec.java (89%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/InspectVolumeCmdExec.java (88%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/JoinSwarmCmdExec.java (86%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/KillContainerCmdExec.java (88%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/LeaveSwarmCmdExec.java (87%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/ListContainersCmdExec.java (93%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/ListImagesCmdExec.java (92%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/ListNetworksCmdExec.java (90%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/ListServicesCmdExec.java (91%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/ListSwarmNodesCmdExec.java (91%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/ListTasksCmdExec.java (91%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/ListVolumesCmdExec.java (90%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/LoadImageCmdExec.java (90%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/LogContainerCmdExec.java (94%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/PauseContainerCmdExec.java (87%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/PingCmdExec.java (89%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/PullImageCmdExec.java (91%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/PushImageCmdExec.java (89%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/RemoveContainerCmdExec.java (88%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/RemoveImageCmdExec.java (91%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/RemoveNetworkCmdExec.java (86%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/RemoveServiceCmdExec.java (86%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/RemoveSwarmNodeCmdExec.java (88%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/RemoveVolumeCmdExec.java (86%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/RenameContainerCmdExec.java (88%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/RestartContainerCmdExec.java (89%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/SaveImageCmdExec.java (87%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/SearchImagesCmdExec.java (88%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/StartContainerCmdExec.java (87%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/StatsCmdExec.java (92%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/StopContainerCmdExec.java (88%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/TagImageCmdExec.java (91%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/TopContainerCmdExec.java (90%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/UnpauseContainerCmdExec.java (87%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/UpdateContainerCmdExec.java (90%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/UpdateServiceCmdExec.java (88%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/UpdateSwarmCmdExec.java (89%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/UpdateSwarmNodeCmdExec.java (88%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/VersionCmdExec.java (87%)
 rename src/main/java/com/github/dockerjava/{netty => core}/exec/WaitContainerCmdExec.java (90%)
 rename src/main/java/com/github/dockerjava/netty/{InvocationBuilder.java => NettyInvocationBuilder.java} (90%)
 rename src/main/java/com/github/dockerjava/netty/{WebTarget.java => NettyWebTarget.java} (83%)
 rename src/test/java/com/github/dockerjava/netty/{WebTargetTest.java => NettyWebTargetTest.java} (55%)

diff --git a/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
new file mode 100644
index 000000000..3a6abcc3e
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
@@ -0,0 +1,489 @@
+package com.github.dockerjava.core;
+
+import com.github.dockerjava.api.command.AttachContainerCmd;
+import com.github.dockerjava.api.command.AuthCmd;
+import com.github.dockerjava.api.command.BuildImageCmd;
+import com.github.dockerjava.api.command.CommitCmd;
+import com.github.dockerjava.api.command.ConnectToNetworkCmd;
+import com.github.dockerjava.api.command.ContainerDiffCmd;
+import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
+import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.api.command.CreateContainerCmd;
+import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.command.CreateServiceCmd;
+import com.github.dockerjava.api.command.CreateVolumeCmd;
+import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
+import com.github.dockerjava.api.command.DockerCmdExecFactory;
+import com.github.dockerjava.api.command.EventsCmd;
+import com.github.dockerjava.api.command.ExecCreateCmd;
+import com.github.dockerjava.api.command.ExecStartCmd;
+import com.github.dockerjava.api.command.InfoCmd;
+import com.github.dockerjava.api.command.InitializeSwarmCmd;
+import com.github.dockerjava.api.command.InspectContainerCmd;
+import com.github.dockerjava.api.command.InspectExecCmd;
+import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.InspectNetworkCmd;
+import com.github.dockerjava.api.command.InspectServiceCmd;
+import com.github.dockerjava.api.command.InspectSwarmCmd;
+import com.github.dockerjava.api.command.InspectSwarmNodeCmd;
+import com.github.dockerjava.api.command.InspectVolumeCmd;
+import com.github.dockerjava.api.command.JoinSwarmCmd;
+import com.github.dockerjava.api.command.KillContainerCmd;
+import com.github.dockerjava.api.command.LeaveSwarmCmd;
+import com.github.dockerjava.api.command.ListContainersCmd;
+import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.command.ListServicesCmd;
+import com.github.dockerjava.api.command.ListSwarmNodesCmd;
+import com.github.dockerjava.api.command.ListTasksCmd;
+import com.github.dockerjava.api.command.ListVolumesCmd;
+import com.github.dockerjava.api.command.LoadImageCmd;
+import com.github.dockerjava.api.command.LogContainerCmd;
+import com.github.dockerjava.api.command.PauseContainerCmd;
+import com.github.dockerjava.api.command.PingCmd;
+import com.github.dockerjava.api.command.PullImageCmd;
+import com.github.dockerjava.api.command.PushImageCmd;
+import com.github.dockerjava.api.command.RemoveContainerCmd;
+import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.RemoveServiceCmd;
+import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
+import com.github.dockerjava.api.command.RemoveVolumeCmd;
+import com.github.dockerjava.api.command.RenameContainerCmd;
+import com.github.dockerjava.api.command.RestartContainerCmd;
+import com.github.dockerjava.api.command.SaveImageCmd;
+import com.github.dockerjava.api.command.SearchImagesCmd;
+import com.github.dockerjava.api.command.StartContainerCmd;
+import com.github.dockerjava.api.command.StatsCmd;
+import com.github.dockerjava.api.command.StopContainerCmd;
+import com.github.dockerjava.api.command.TagImageCmd;
+import com.github.dockerjava.api.command.TopContainerCmd;
+import com.github.dockerjava.api.command.UnpauseContainerCmd;
+import com.github.dockerjava.api.command.UpdateContainerCmd;
+import com.github.dockerjava.api.command.UpdateServiceCmd;
+import com.github.dockerjava.api.command.UpdateSwarmCmd;
+import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
+import com.github.dockerjava.api.command.VersionCmd;
+import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.core.exec.AttachContainerCmdExec;
+import com.github.dockerjava.core.exec.AuthCmdExec;
+import com.github.dockerjava.core.exec.BuildImageCmdExec;
+import com.github.dockerjava.core.exec.CommitCmdExec;
+import com.github.dockerjava.core.exec.ConnectToNetworkCmdExec;
+import com.github.dockerjava.core.exec.ContainerDiffCmdExec;
+import com.github.dockerjava.core.exec.CopyArchiveFromContainerCmdExec;
+import com.github.dockerjava.core.exec.CopyArchiveToContainerCmdExec;
+import com.github.dockerjava.core.exec.CopyFileFromContainerCmdExec;
+import com.github.dockerjava.core.exec.CreateContainerCmdExec;
+import com.github.dockerjava.core.exec.CreateImageCmdExec;
+import com.github.dockerjava.core.exec.CreateNetworkCmdExec;
+import com.github.dockerjava.core.exec.CreateServiceCmdExec;
+import com.github.dockerjava.core.exec.CreateVolumeCmdExec;
+import com.github.dockerjava.core.exec.DisconnectFromNetworkCmdExec;
+import com.github.dockerjava.core.exec.EventsCmdExec;
+import com.github.dockerjava.core.exec.ExecCreateCmdExec;
+import com.github.dockerjava.core.exec.ExecStartCmdExec;
+import com.github.dockerjava.core.exec.InfoCmdExec;
+import com.github.dockerjava.core.exec.InitializeSwarmCmdExec;
+import com.github.dockerjava.core.exec.InspectContainerCmdExec;
+import com.github.dockerjava.core.exec.InspectExecCmdExec;
+import com.github.dockerjava.core.exec.InspectImageCmdExec;
+import com.github.dockerjava.core.exec.InspectNetworkCmdExec;
+import com.github.dockerjava.core.exec.InspectServiceCmdExec;
+import com.github.dockerjava.core.exec.InspectSwarmCmdExec;
+import com.github.dockerjava.core.exec.InspectSwarmNodeCmdExec;
+import com.github.dockerjava.core.exec.InspectVolumeCmdExec;
+import com.github.dockerjava.core.exec.JoinSwarmCmdExec;
+import com.github.dockerjava.core.exec.KillContainerCmdExec;
+import com.github.dockerjava.core.exec.LeaveSwarmCmdExec;
+import com.github.dockerjava.core.exec.ListContainersCmdExec;
+import com.github.dockerjava.core.exec.ListImagesCmdExec;
+import com.github.dockerjava.core.exec.ListNetworksCmdExec;
+import com.github.dockerjava.core.exec.ListServicesCmdExec;
+import com.github.dockerjava.core.exec.ListSwarmNodesCmdExec;
+import com.github.dockerjava.core.exec.ListTasksCmdExec;
+import com.github.dockerjava.core.exec.ListVolumesCmdExec;
+import com.github.dockerjava.core.exec.LoadImageCmdExec;
+import com.github.dockerjava.core.exec.LogContainerCmdExec;
+import com.github.dockerjava.core.exec.PauseContainerCmdExec;
+import com.github.dockerjava.core.exec.PingCmdExec;
+import com.github.dockerjava.core.exec.PullImageCmdExec;
+import com.github.dockerjava.core.exec.PushImageCmdExec;
+import com.github.dockerjava.core.exec.RemoveContainerCmdExec;
+import com.github.dockerjava.core.exec.RemoveImageCmdExec;
+import com.github.dockerjava.core.exec.RemoveNetworkCmdExec;
+import com.github.dockerjava.core.exec.RemoveServiceCmdExec;
+import com.github.dockerjava.core.exec.RemoveSwarmNodeCmdExec;
+import com.github.dockerjava.core.exec.RemoveVolumeCmdExec;
+import com.github.dockerjava.core.exec.RenameContainerCmdExec;
+import com.github.dockerjava.core.exec.RestartContainerCmdExec;
+import com.github.dockerjava.core.exec.SaveImageCmdExec;
+import com.github.dockerjava.core.exec.SearchImagesCmdExec;
+import com.github.dockerjava.core.exec.StartContainerCmdExec;
+import com.github.dockerjava.core.exec.StatsCmdExec;
+import com.github.dockerjava.core.exec.StopContainerCmdExec;
+import com.github.dockerjava.core.exec.TagImageCmdExec;
+import com.github.dockerjava.core.exec.TopContainerCmdExec;
+import com.github.dockerjava.core.exec.UnpauseContainerCmdExec;
+import com.github.dockerjava.core.exec.UpdateContainerCmdExec;
+import com.github.dockerjava.core.exec.UpdateServiceCmdExec;
+import com.github.dockerjava.core.exec.UpdateSwarmCmdExec;
+import com.github.dockerjava.core.exec.UpdateSwarmNodeCmdExec;
+import com.github.dockerjava.core.exec.VersionCmdExec;
+import com.github.dockerjava.core.exec.WaitContainerCmdExec;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+public abstract class AbstractDockerCmdExecFactory implements DockerCmdExecFactory {
+
+    private DockerClientConfig dockerClientConfig;
+
+    protected DockerClientConfig getDockerClientConfig() {
+        checkNotNull(dockerClientConfig,
+                "Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!");
+        return dockerClientConfig;
+    }
+
+    @Override
+    public void init(DockerClientConfig dockerClientConfig) {
+        checkNotNull(dockerClientConfig, "config was not specified");
+        this.dockerClientConfig = dockerClientConfig;
+    }
+
+    @Override
+    public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() {
+        return new CopyArchiveFromContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() {
+        return new CopyArchiveToContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public AuthCmd.Exec createAuthCmdExec() {
+        return new AuthCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InfoCmd.Exec createInfoCmdExec() {
+        return new InfoCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public PingCmd.Exec createPingCmdExec() {
+        return new PingCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public VersionCmd.Exec createVersionCmdExec() {
+        return new VersionCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public PullImageCmd.Exec createPullImageCmdExec() {
+        return new PullImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public PushImageCmd.Exec createPushImageCmdExec() {
+        return new PushImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public SaveImageCmd.Exec createSaveImageCmdExec() {
+        return new SaveImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CreateImageCmd.Exec createCreateImageCmdExec() {
+        return new CreateImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public LoadImageCmd.Exec createLoadImageCmdExec() {
+        return new LoadImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public SearchImagesCmd.Exec createSearchImagesCmdExec() {
+        return new SearchImagesCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveImageCmd.Exec createRemoveImageCmdExec() {
+        return new RemoveImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ListImagesCmd.Exec createListImagesCmdExec() {
+        return new ListImagesCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectImageCmd.Exec createInspectImageCmdExec() {
+        return new InspectImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ListContainersCmd.Exec createListContainersCmdExec() {
+        return new ListContainersCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CreateContainerCmd.Exec createCreateContainerCmdExec() {
+        return new CreateContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public StartContainerCmd.Exec createStartContainerCmdExec() {
+        return new StartContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectContainerCmd.Exec createInspectContainerCmdExec() {
+        return new InspectContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ExecCreateCmd.Exec createExecCmdExec() {
+        return new ExecCreateCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
+        return new RemoveContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public WaitContainerCmd.Exec createWaitContainerCmdExec() {
+        return new WaitContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public AttachContainerCmd.Exec createAttachContainerCmdExec() {
+        return new AttachContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ExecStartCmd.Exec createExecStartCmdExec() {
+        return new ExecStartCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectExecCmd.Exec createInspectExecCmdExec() {
+        return new InspectExecCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public LogContainerCmd.Exec createLogContainerCmdExec() {
+        return new LogContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
+        return new CopyFileFromContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public StopContainerCmd.Exec createStopContainerCmdExec() {
+        return new StopContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
+        return new ContainerDiffCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public KillContainerCmd.Exec createKillContainerCmdExec() {
+        return new KillContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public UpdateContainerCmd.Exec createUpdateContainerCmdExec() {
+        return new UpdateContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RenameContainerCmd.Exec createRenameContainerCmdExec() {
+        return new RenameContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RestartContainerCmd.Exec createRestartContainerCmdExec() {
+        return new RestartContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CommitCmd.Exec createCommitCmdExec() {
+        return new CommitCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public BuildImageCmd.Exec createBuildImageCmdExec() {
+        return new BuildImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public TopContainerCmd.Exec createTopContainerCmdExec() {
+        return new TopContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public TagImageCmd.Exec createTagImageCmdExec() {
+        return new TagImageCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public PauseContainerCmd.Exec createPauseContainerCmdExec() {
+        return new PauseContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
+        return new UnpauseContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public EventsCmd.Exec createEventsCmdExec() {
+        return new EventsCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public StatsCmd.Exec createStatsCmdExec() {
+        return new StatsCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
+        return new CreateVolumeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectVolumeCmd.Exec createInspectVolumeCmdExec() {
+        return new InspectVolumeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() {
+        return new RemoveVolumeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ListVolumesCmd.Exec createListVolumesCmdExec() {
+        return new ListVolumesCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ListNetworksCmd.Exec createListNetworksCmdExec() {
+        return new ListNetworksCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectNetworkCmd.Exec createInspectNetworkCmdExec() {
+        return new InspectNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CreateNetworkCmd.Exec createCreateNetworkCmdExec() {
+        return new CreateNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() {
+        return new RemoveNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() {
+        return new ConnectToNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() {
+        return new DisconnectFromNetworkCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    // swarm
+    @Override
+    public InitializeSwarmCmd.Exec createInitializeSwarmCmdExec() {
+        return new InitializeSwarmCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectSwarmCmd.Exec createInspectSwarmCmdExec() {
+        return new InspectSwarmCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public JoinSwarmCmd.Exec createJoinSwarmCmdExec() {
+        return new JoinSwarmCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public LeaveSwarmCmd.Exec createLeaveSwarmCmdExec() {
+        return new LeaveSwarmCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() {
+        return new UpdateSwarmCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    // services
+    @Override
+    public ListServicesCmd.Exec createListServicesCmdExec() {
+        return new ListServicesCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CreateServiceCmd.Exec createCreateServiceCmdExec() {
+        return new CreateServiceCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectServiceCmd.Exec createInspectServiceCmdExec() {
+        return new InspectServiceCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public UpdateServiceCmd.Exec createUpdateServiceCmdExec() {
+        return new UpdateServiceCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveServiceCmd.Exec createRemoveServiceCmdExec() {
+        return new RemoveServiceCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    // nodes
+    @Override
+    public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() {
+        return new ListSwarmNodesCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectSwarmNodeCmd.Exec inspectSwarmNodeCmdExec() {
+        return new InspectSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveSwarmNodeCmd.Exec removeSwarmNodeCmdExec() {
+        return new RemoveSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() {
+        return new UpdateSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public ListTasksCmd.Exec listTasksCmdExec() {
+        return new ListTasksCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    protected abstract WebTarget getBaseResource();
+}
diff --git a/src/main/java/com/github/dockerjava/core/InvocationBuilder.java b/src/main/java/com/github/dockerjava/core/InvocationBuilder.java
new file mode 100644
index 000000000..88b8707cf
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/InvocationBuilder.java
@@ -0,0 +1,94 @@
+package com.github.dockerjava.core;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.concurrent.CountDownLatch;
+
+public interface InvocationBuilder {
+
+    InvocationBuilder accept(MediaType mediaType);
+
+    InvocationBuilder header(String name, String value);
+
+    void delete();
+
+    void get(ResultCallback<Frame> resultCallback);
+
+    <T> T get(TypeReference<T> typeReference);
+
+    <T> void get(TypeReference<T> typeReference, ResultCallback<T> resultCallback);
+
+    InputStream post(Object entity);
+
+    void post(Object entity, InputStream stdin, ResultCallback<Frame> resultCallback);
+
+    <T> T post(Object entity, TypeReference<T> typeReference);
+
+    <T> void post(Object entity, TypeReference<T> typeReference, ResultCallback<T> resultCallback);
+
+    <T> T post(TypeReference<T> typeReference, InputStream body);
+
+    <T> void post(TypeReference<T> typeReference, ResultCallback<T> resultCallback, InputStream body);
+
+    void postStream(InputStream body);
+
+    InputStream get();
+
+    void put(InputStream body, MediaType mediaType);
+
+    /**
+     * Implementation of {@link ResultCallback} with the single result event expected.
+     */
+    class AsyncResultCallback<A_RES_T>
+            extends ResultCallbackTemplate<InvocationBuilder.AsyncResultCallback<A_RES_T>, A_RES_T> {
+
+        private A_RES_T result = null;
+
+        private final CountDownLatch resultReady = new CountDownLatch(1);
+
+        @Override
+        public void onNext(A_RES_T object) {
+            onResult(object);
+        }
+
+        private void onResult(A_RES_T object) {
+            if (resultReady.getCount() == 0) {
+                throw new IllegalStateException("Result has already been set");
+            }
+
+            try {
+                result = object;
+            } finally {
+                resultReady.countDown();
+            }
+        }
+
+        @Override
+        public void close() throws IOException {
+            try {
+                super.close();
+            } finally {
+                resultReady.countDown();
+            }
+        }
+
+        /**
+         * Blocks until {@link ResultCallback#onNext(Object)} was called for the first time
+         */
+        @SuppressWarnings("unchecked")
+        public A_RES_T awaitResult() {
+            try {
+                resultReady.await();
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+            throwFirstError();
+            return result;
+        }
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/netty/MediaType.java b/src/main/java/com/github/dockerjava/core/MediaType.java
similarity index 67%
rename from src/main/java/com/github/dockerjava/netty/MediaType.java
rename to src/main/java/com/github/dockerjava/core/MediaType.java
index f65ca913f..dbcc77149 100644
--- a/src/main/java/com/github/dockerjava/netty/MediaType.java
+++ b/src/main/java/com/github/dockerjava/core/MediaType.java
@@ -1,8 +1,6 @@
-package com.github.dockerjava.netty;
+package com.github.dockerjava.core;
 
 /**
- * This class is basically a replacement of javax.ws.rs.core.MediaType to allow simpler migration of JAX-RS code to a netty based
- * implementation.
  *
  * @author Marcus Linke
  */
diff --git a/src/main/java/com/github/dockerjava/core/WebTarget.java b/src/main/java/com/github/dockerjava/core/WebTarget.java
new file mode 100644
index 000000000..d5a14d0a9
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/WebTarget.java
@@ -0,0 +1,19 @@
+package com.github.dockerjava.core;
+
+import java.util.Map;
+import java.util.Set;
+
+public interface WebTarget {
+
+    WebTarget path(String... components);
+
+    InvocationBuilder request();
+
+    WebTarget resolveTemplate(String name, Object value);
+
+    WebTarget queryParam(String name, Object value);
+
+    WebTarget queryParamsSet(String name, Set<?> values);
+
+    WebTarget queryParamsJsonMap(String name, Map<String, String> values);
+}
diff --git a/src/main/java/com/github/dockerjava/netty/exec/AbstrAsyncDockerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/AbstrAsyncDockerCmdExec.java
similarity index 95%
rename from src/main/java/com/github/dockerjava/netty/exec/AbstrAsyncDockerCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/AbstrAsyncDockerCmdExec.java
index 3d1d4fac3..5655d74bd 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/AbstrAsyncDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/AbstrAsyncDockerCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -7,7 +7,7 @@
 import com.github.dockerjava.api.command.AsyncDockerCmd;
 import com.github.dockerjava.api.command.DockerCmdAsyncExec;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.WebTarget;
 
 public abstract class AbstrAsyncDockerCmdExec<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T>, A_RES_T> extends
         AbstrDockerCmdExec implements DockerCmdAsyncExec<CMD_T, A_RES_T> {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
similarity index 96%
rename from src/main/java/com/github/dockerjava/netty/exec/AbstrDockerCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
index 63e3bff12..9b28ddd75 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/AbstrDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -6,8 +6,8 @@
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.RemoteApiVersion;
-import com.github.dockerjava.netty.InvocationBuilder;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.InvocationBuilder;
+import com.github.dockerjava.core.WebTarget;
 import org.apache.commons.codec.binary.Base64;
 
 import java.io.IOException;
diff --git a/src/main/java/com/github/dockerjava/netty/exec/AbstrSyncDockerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/AbstrSyncDockerCmdExec.java
similarity index 92%
rename from src/main/java/com/github/dockerjava/netty/exec/AbstrSyncDockerCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/AbstrSyncDockerCmdExec.java
index 993799dab..de3e3b029 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/AbstrSyncDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/AbstrSyncDockerCmdExec.java
@@ -1,10 +1,10 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import com.github.dockerjava.api.command.DockerCmd;
 import com.github.dockerjava.api.command.DockerCmdSyncExec;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.WebTarget;
 
 public abstract class AbstrSyncDockerCmdExec<CMD_T extends DockerCmd<RES_T>, RES_T> extends AbstrDockerCmdExec
         implements DockerCmdSyncExec<CMD_T, RES_T> {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/AttachContainerCmdExec.java
similarity index 94%
rename from src/main/java/com/github/dockerjava/netty/exec/AttachContainerCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/AttachContainerCmdExec.java
index 2fdace48a..618d4e6b1 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/AttachContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/AttachContainerCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -7,7 +7,7 @@
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.WebTarget;
 
 public class AttachContainerCmdExec extends AbstrAsyncDockerCmdExec<AttachContainerCmd, Frame> implements
         AttachContainerCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/AuthCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/AuthCmdExec.java
similarity index 87%
rename from src/main/java/com/github/dockerjava/netty/exec/AuthCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/AuthCmdExec.java
index b6f004940..ef9fe5792 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/AuthCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/AuthCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -7,8 +7,8 @@
 import com.github.dockerjava.api.command.AuthCmd;
 import com.github.dockerjava.api.model.AuthResponse;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class AuthCmdExec extends AbstrSyncDockerCmdExec<AuthCmd, AuthResponse> implements AuthCmd.Exec {
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
similarity index 96%
rename from src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
index a99dac833..4a055d9d1 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,9 +9,9 @@
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.api.model.BuildResponseItem;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.InvocationBuilder;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.InvocationBuilder;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 import static org.apache.commons.lang.StringUtils.isNotBlank;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CommitCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/CommitCmdExec.java
similarity index 90%
rename from src/main/java/com/github/dockerjava/netty/exec/CommitCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/CommitCmdExec.java
index e568345cd..e9b78890c 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/CommitCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/CommitCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -7,8 +7,8 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.dockerjava.api.command.CommitCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class CommitCmdExec extends AbstrSyncDockerCmdExec<CommitCmd, String> implements CommitCmd.Exec {
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java
similarity index 90%
rename from src/main/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java
index b7bff9d52..ab9dbd24e 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ConnectToNetworkCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java
@@ -1,8 +1,8 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import com.github.dockerjava.api.command.ConnectToNetworkCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/ContainerDiffCmdExec.java
similarity index 89%
rename from src/main/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/ContainerDiffCmdExec.java
index 662b9c1d4..bed6501cc 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ContainerDiffCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/ContainerDiffCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import java.util.List;
 
@@ -9,8 +9,8 @@
 import com.github.dockerjava.api.command.ContainerDiffCmd;
 import com.github.dockerjava.api.model.ChangeLog;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class ContainerDiffCmdExec extends AbstrSyncDockerCmdExec<ContainerDiffCmd, List<ChangeLog>> implements
         ContainerDiffCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/CopyArchiveFromContainerCmdExec.java
similarity index 89%
rename from src/main/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/CopyArchiveFromContainerCmdExec.java
index 6f4a93ba3..d9d98c923 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/CopyArchiveFromContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/CopyArchiveFromContainerCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import java.io.InputStream;
 
@@ -7,8 +7,8 @@
 
 import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class CopyArchiveFromContainerCmdExec extends AbstrSyncDockerCmdExec<CopyArchiveFromContainerCmd, InputStream>
         implements CopyArchiveFromContainerCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/CopyArchiveToContainerCmdExec.java
similarity index 90%
rename from src/main/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/CopyArchiveToContainerCmdExec.java
index c956a815d..d1effbb3e 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/CopyArchiveToContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/CopyArchiveToContainerCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import java.io.InputStream;
 
@@ -7,8 +7,8 @@
 
 import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class CopyArchiveToContainerCmdExec extends AbstrSyncDockerCmdExec<CopyArchiveToContainerCmd, Void> implements
         CopyArchiveToContainerCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/CopyFileFromContainerCmdExec.java
similarity index 88%
rename from src/main/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/CopyFileFromContainerCmdExec.java
index 338b9b973..2d54887a2 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/CopyFileFromContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/CopyFileFromContainerCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import java.io.InputStream;
 
@@ -7,8 +7,8 @@
 
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class CopyFileFromContainerCmdExec extends AbstrSyncDockerCmdExec<CopyFileFromContainerCmd, InputStream>
         implements CopyFileFromContainerCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CreateContainerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java
similarity index 90%
rename from src/main/java/com/github/dockerjava/netty/exec/CreateContainerCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java
index 7764d4729..d04233f2a 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/CreateContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -7,8 +7,8 @@
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class CreateContainerCmdExec extends AbstrSyncDockerCmdExec<CreateContainerCmd, CreateContainerResponse>
         implements CreateContainerCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CreateImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/CreateImageCmdExec.java
similarity index 89%
rename from src/main/java/com/github/dockerjava/netty/exec/CreateImageCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/CreateImageCmdExec.java
index 8fd791f53..ad3d0d283 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/CreateImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/CreateImageCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -7,8 +7,8 @@
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.CreateImageResponse;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class CreateImageCmdExec extends AbstrSyncDockerCmdExec<CreateImageCmd, CreateImageResponse> implements
         CreateImageCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/CreateNetworkCmdExec.java
similarity index 88%
rename from src/main/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/CreateNetworkCmdExec.java
index cfc825e80..c79767324 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/CreateNetworkCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/CreateNetworkCmdExec.java
@@ -1,11 +1,11 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.CreateNetworkCmd;
 import com.github.dockerjava.api.command.CreateNetworkResponse;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CreateServiceCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/CreateServiceCmdExec.java
similarity index 89%
rename from src/main/java/com/github/dockerjava/netty/exec/CreateServiceCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/CreateServiceCmdExec.java
index 26352e1aa..401e51f76 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/CreateServiceCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/CreateServiceCmdExec.java
@@ -1,11 +1,11 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.CreateServiceCmd;
 import com.github.dockerjava.api.command.CreateServiceResponse;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/CreateVolumeCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/CreateVolumeCmdExec.java
similarity index 88%
rename from src/main/java/com/github/dockerjava/netty/exec/CreateVolumeCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/CreateVolumeCmdExec.java
index 746e46067..8d8c55cc6 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/CreateVolumeCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/CreateVolumeCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -7,8 +7,8 @@
 import com.github.dockerjava.api.command.CreateVolumeCmd;
 import com.github.dockerjava.api.command.CreateVolumeResponse;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class CreateVolumeCmdExec extends AbstrSyncDockerCmdExec<CreateVolumeCmd, CreateVolumeResponse> implements
         CreateVolumeCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java
similarity index 91%
rename from src/main/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java
index ef139517f..dba6d75fd 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/DisconnectFromNetworkCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java
@@ -1,8 +1,8 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/EventsCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/EventsCmdExec.java
similarity index 93%
rename from src/main/java/com/github/dockerjava/netty/exec/EventsCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/EventsCmdExec.java
index 5640bba22..2ee95c699 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/EventsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/EventsCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,7 +9,7 @@
 import com.github.dockerjava.api.model.Event;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.util.FiltersEncoder;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.WebTarget;
 
 public class EventsCmdExec extends AbstrAsyncDockerCmdExec<EventsCmd, Event> implements EventsCmd.Exec {
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ExecCreateCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/ExecCreateCmdExec.java
similarity index 89%
rename from src/main/java/com/github/dockerjava/netty/exec/ExecCreateCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/ExecCreateCmdExec.java
index 1535cfe4f..2f0ca1c6f 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ExecCreateCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/ExecCreateCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -7,8 +7,8 @@
 import com.github.dockerjava.api.command.ExecCreateCmd;
 import com.github.dockerjava.api.command.ExecCreateCmdResponse;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class ExecCreateCmdExec extends AbstrSyncDockerCmdExec<ExecCreateCmd, ExecCreateCmdResponse> implements
         ExecCreateCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ExecStartCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/ExecStartCmdExec.java
similarity index 88%
rename from src/main/java/com/github/dockerjava/netty/exec/ExecStartCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/ExecStartCmdExec.java
index 374b2062d..54290050c 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ExecStartCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/ExecStartCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -7,8 +7,8 @@
 import com.github.dockerjava.api.command.ExecStartCmd;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class ExecStartCmdExec extends AbstrAsyncDockerCmdExec<ExecStartCmd, Frame> implements ExecStartCmd.Exec {
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InfoCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/InfoCmdExec.java
similarity index 56%
rename from src/main/java/com/github/dockerjava/netty/exec/InfoCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/InfoCmdExec.java
index 8fc211322..e6ecb81e9 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/InfoCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/InfoCmdExec.java
@@ -1,25 +1,18 @@
-package com.github.dockerjava.netty.exec;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+package com.github.dockerjava.core.exec;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.InfoCmd;
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.WebTarget;
 
 /**
- * http://stackoverflow.com/questions/33296749/netty-connect-to-unix-domain- socket-failed http://netty.io/wiki/native-transports.html
- * https://github.com/netty/netty/blob/master/example/src/main/java/io/netty/ example/http/snoop/HttpSnoopClient.java
  *
  * @author Marcus Linke
  *
  */
 public class InfoCmdExec implements InfoCmd.Exec {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(InfoCmdExec.class);
-
     private WebTarget webResource;
 
     public InfoCmdExec(WebTarget webResource, DockerClientConfig dockerClientConfig) {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InitializeSwarmCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java
similarity index 86%
rename from src/main/java/com/github/dockerjava/netty/exec/InitializeSwarmCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java
index a4a93609a..2ec197097 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/InitializeSwarmCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java
@@ -1,10 +1,10 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 
 import com.github.dockerjava.api.command.InitializeSwarmCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectContainerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/InspectContainerCmdExec.java
similarity index 90%
rename from src/main/java/com/github/dockerjava/netty/exec/InspectContainerCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/InspectContainerCmdExec.java
index b6a4a06f2..f76624be9 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/InspectContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/InspectContainerCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -7,8 +7,8 @@
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class InspectContainerCmdExec extends AbstrSyncDockerCmdExec<InspectContainerCmd, InspectContainerResponse>
         implements InspectContainerCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectExecCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/InspectExecCmdExec.java
similarity index 88%
rename from src/main/java/com/github/dockerjava/netty/exec/InspectExecCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/InspectExecCmdExec.java
index ee913f369..5235a1624 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/InspectExecCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/InspectExecCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -7,8 +7,8 @@
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectExecResponse;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class InspectExecCmdExec extends AbstrSyncDockerCmdExec<InspectExecCmd, InspectExecResponse> implements
         InspectExecCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/InspectImageCmdExec.java
similarity index 88%
rename from src/main/java/com/github/dockerjava/netty/exec/InspectImageCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/InspectImageCmdExec.java
index b86072ecb..5cd7cf7df 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/InspectImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/InspectImageCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -7,8 +7,8 @@
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectImageResponse;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class InspectImageCmdExec extends AbstrSyncDockerCmdExec<InspectImageCmd, InspectImageResponse> implements
         InspectImageCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectNetworkCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/InspectNetworkCmdExec.java
similarity index 88%
rename from src/main/java/com/github/dockerjava/netty/exec/InspectNetworkCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/InspectNetworkCmdExec.java
index 51777972f..196651c28 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/InspectNetworkCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/InspectNetworkCmdExec.java
@@ -1,11 +1,11 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.InspectNetworkCmd;
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectServiceCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/InspectServiceCmdExec.java
similarity index 88%
rename from src/main/java/com/github/dockerjava/netty/exec/InspectServiceCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/InspectServiceCmdExec.java
index cabdaa11d..c7cf9d011 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/InspectServiceCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/InspectServiceCmdExec.java
@@ -1,11 +1,11 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.InspectServiceCmd;
 import com.github.dockerjava.api.model.Service;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectSwarmCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/InspectSwarmCmdExec.java
similarity index 87%
rename from src/main/java/com/github/dockerjava/netty/exec/InspectSwarmCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/InspectSwarmCmdExec.java
index 4753048b9..41f62c7ff 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/InspectSwarmCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/InspectSwarmCmdExec.java
@@ -1,12 +1,12 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.InspectSwarmCmd;
 import com.github.dockerjava.api.model.Swarm;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectSwarmNodeCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/InspectSwarmNodeCmdExec.java
similarity index 89%
rename from src/main/java/com/github/dockerjava/netty/exec/InspectSwarmNodeCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/InspectSwarmNodeCmdExec.java
index d33c9a957..508e43b05 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/InspectSwarmNodeCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/InspectSwarmNodeCmdExec.java
@@ -1,12 +1,12 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.InspectSwarmNodeCmd;
 import com.github.dockerjava.api.model.SwarmNode;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/InspectVolumeCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/InspectVolumeCmdExec.java
similarity index 88%
rename from src/main/java/com/github/dockerjava/netty/exec/InspectVolumeCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/InspectVolumeCmdExec.java
index 1c3adf47e..5d1e84882 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/InspectVolumeCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/InspectVolumeCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -7,8 +7,8 @@
 import com.github.dockerjava.api.command.InspectVolumeCmd;
 import com.github.dockerjava.api.command.InspectVolumeResponse;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class InspectVolumeCmdExec extends AbstrSyncDockerCmdExec<InspectVolumeCmd, InspectVolumeResponse> implements
         InspectVolumeCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/JoinSwarmCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java
similarity index 86%
rename from src/main/java/com/github/dockerjava/netty/exec/JoinSwarmCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java
index 1fc3e07be..8f479675a 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/JoinSwarmCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java
@@ -1,10 +1,10 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 
 import com.github.dockerjava.api.command.JoinSwarmCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/KillContainerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java
similarity index 88%
rename from src/main/java/com/github/dockerjava/netty/exec/KillContainerCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java
index b81f6449f..a8ea6c16c 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/KillContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java
@@ -1,12 +1,12 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.command.KillContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class KillContainerCmdExec extends AbstrSyncDockerCmdExec<KillContainerCmd, Void> implements
         KillContainerCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/LeaveSwarmCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java
similarity index 87%
rename from src/main/java/com/github/dockerjava/netty/exec/LeaveSwarmCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java
index e9eb0d78d..1cded4938 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/LeaveSwarmCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java
@@ -1,9 +1,9 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import com.github.dockerjava.api.command.LeaveSwarmCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/ListContainersCmdExec.java
similarity index 93%
rename from src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/ListContainersCmdExec.java
index 79dd49430..d4fb3cee0 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListContainersCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/ListContainersCmdExec.java
@@ -1,12 +1,12 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.model.Container;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.util.FiltersEncoder;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/ListImagesCmdExec.java
similarity index 92%
rename from src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/ListImagesCmdExec.java
index 27f70c712..9f53e76bd 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListImagesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/ListImagesCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import java.util.List;
 
@@ -10,8 +10,8 @@
 import com.github.dockerjava.api.model.Image;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.util.FiltersEncoder;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class ListImagesCmdExec extends AbstrSyncDockerCmdExec<ListImagesCmd, List<Image>> implements ListImagesCmd.Exec {
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/ListNetworksCmdExec.java
similarity index 90%
rename from src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/ListNetworksCmdExec.java
index f0930cb4d..ab47a5b78 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListNetworksCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/ListNetworksCmdExec.java
@@ -1,12 +1,12 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.ListNetworksCmd;
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.util.FiltersEncoder;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListServicesCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/ListServicesCmdExec.java
similarity index 91%
rename from src/main/java/com/github/dockerjava/netty/exec/ListServicesCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/ListServicesCmdExec.java
index de9b0e5e0..91065fc20 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListServicesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/ListServicesCmdExec.java
@@ -1,12 +1,12 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.ListServicesCmd;
 import com.github.dockerjava.api.model.Service;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.util.FiltersEncoder;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListSwarmNodesCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/ListSwarmNodesCmdExec.java
similarity index 91%
rename from src/main/java/com/github/dockerjava/netty/exec/ListSwarmNodesCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/ListSwarmNodesCmdExec.java
index c0f43580b..915747d80 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListSwarmNodesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/ListSwarmNodesCmdExec.java
@@ -1,12 +1,12 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.ListSwarmNodesCmd;
 import com.github.dockerjava.api.model.SwarmNode;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.util.FiltersEncoder;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListTasksCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/ListTasksCmdExec.java
similarity index 91%
rename from src/main/java/com/github/dockerjava/netty/exec/ListTasksCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/ListTasksCmdExec.java
index 3295a74f2..7b0684423 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListTasksCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/ListTasksCmdExec.java
@@ -1,12 +1,12 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.ListTasksCmd;
 import com.github.dockerjava.api.model.Task;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.util.FiltersEncoder;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/ListVolumesCmdExec.java
similarity index 90%
rename from src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/ListVolumesCmdExec.java
index fcae2b8df..fb287ca0a 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/ListVolumesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/ListVolumesCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -8,8 +8,8 @@
 import com.github.dockerjava.api.command.ListVolumesResponse;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.util.FiltersEncoder;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class ListVolumesCmdExec extends AbstrSyncDockerCmdExec<ListVolumesCmd, ListVolumesResponse> implements
         ListVolumesCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/LoadImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/LoadImageCmdExec.java
similarity index 90%
rename from src/main/java/com/github/dockerjava/netty/exec/LoadImageCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/LoadImageCmdExec.java
index 30ee716a5..dd906d953 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/LoadImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/LoadImageCmdExec.java
@@ -1,11 +1,11 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.WebTarget;
 
 public class LoadImageCmdExec extends AbstrSyncDockerCmdExec<LoadImageCmd, Void> implements
         LoadImageCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/LogContainerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java
similarity index 94%
rename from src/main/java/com/github/dockerjava/netty/exec/LogContainerCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java
index a23bcb20d..54168bb5e 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/LogContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -7,7 +7,7 @@
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.WebTarget;
 
 public class LogContainerCmdExec extends AbstrAsyncDockerCmdExec<LogContainerCmd, Frame> implements
         LogContainerCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/PauseContainerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java
similarity index 87%
rename from src/main/java/com/github/dockerjava/netty/exec/PauseContainerCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java
index 5d8443190..b86e33611 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/PauseContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java
@@ -1,12 +1,12 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class PauseContainerCmdExec extends AbstrSyncDockerCmdExec<PauseContainerCmd, Void> implements
         PauseContainerCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/PingCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java
similarity index 89%
rename from src/main/java/com/github/dockerjava/netty/exec/PingCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java
index 1302c9730..58ff3ad93 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/PingCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java
@@ -1,11 +1,11 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.command.PingCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.WebTarget;
 
 public class PingCmdExec extends AbstrSyncDockerCmdExec<PingCmd, Void> implements PingCmd.Exec {
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/PullImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/PullImageCmdExec.java
similarity index 91%
rename from src/main/java/com/github/dockerjava/netty/exec/PullImageCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/PullImageCmdExec.java
index 0f75f1918..a6079d7eb 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/PullImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/PullImageCmdExec.java
@@ -1,12 +1,12 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.model.PullResponseItem;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/PushImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java
similarity index 89%
rename from src/main/java/com/github/dockerjava/netty/exec/PushImageCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java
index 964928e8f..0f3705089 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/PushImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,9 +9,9 @@
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PushResponseItem;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.InvocationBuilder;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.InvocationBuilder;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class PushImageCmdExec extends AbstrAsyncDockerCmdExec<PushImageCmd, PushResponseItem> implements
         PushImageCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/RemoveContainerCmdExec.java
similarity index 88%
rename from src/main/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/RemoveContainerCmdExec.java
index 63d16bda6..5408071d1 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/RemoveContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/RemoveContainerCmdExec.java
@@ -1,12 +1,12 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class RemoveContainerCmdExec extends AbstrSyncDockerCmdExec<RemoveContainerCmd, Void> implements
         RemoveContainerCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/RemoveImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/RemoveImageCmdExec.java
similarity index 91%
rename from src/main/java/com/github/dockerjava/netty/exec/RemoveImageCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/RemoveImageCmdExec.java
index 35ae053d3..205c8670d 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/RemoveImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/RemoveImageCmdExec.java
@@ -1,11 +1,11 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.WebTarget;
 
 public class RemoveImageCmdExec extends AbstrSyncDockerCmdExec<RemoveImageCmd, Void> implements RemoveImageCmd.Exec {
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/RemoveNetworkCmdExec.java
similarity index 86%
rename from src/main/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/RemoveNetworkCmdExec.java
index deb52100d..40da76774 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/RemoveNetworkCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/RemoveNetworkCmdExec.java
@@ -1,9 +1,9 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/RemoveServiceCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/RemoveServiceCmdExec.java
similarity index 86%
rename from src/main/java/com/github/dockerjava/netty/exec/RemoveServiceCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/RemoveServiceCmdExec.java
index 1042997bf..648caf28f 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/RemoveServiceCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/RemoveServiceCmdExec.java
@@ -1,9 +1,9 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import com.github.dockerjava.api.command.RemoveServiceCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/RemoveSwarmNodeCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/RemoveSwarmNodeCmdExec.java
similarity index 88%
rename from src/main/java/com/github/dockerjava/netty/exec/RemoveSwarmNodeCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/RemoveSwarmNodeCmdExec.java
index 8740e5a6d..f7c0dc955 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/RemoveSwarmNodeCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/RemoveSwarmNodeCmdExec.java
@@ -1,9 +1,9 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/RemoveVolumeCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/RemoveVolumeCmdExec.java
similarity index 86%
rename from src/main/java/com/github/dockerjava/netty/exec/RemoveVolumeCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/RemoveVolumeCmdExec.java
index baf6eabe1..482401b07 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/RemoveVolumeCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/RemoveVolumeCmdExec.java
@@ -1,12 +1,12 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class RemoveVolumeCmdExec extends AbstrSyncDockerCmdExec<RemoveVolumeCmd, Void> implements
         RemoveVolumeCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/RenameContainerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java
similarity index 88%
rename from src/main/java/com/github/dockerjava/netty/exec/RenameContainerCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java
index 43f97e961..2f16bdfb7 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/RenameContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java
@@ -1,9 +1,9 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/RestartContainerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java
similarity index 89%
rename from src/main/java/com/github/dockerjava/netty/exec/RestartContainerCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java
index df9721054..b87fbce22 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/RestartContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java
@@ -1,12 +1,12 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class RestartContainerCmdExec extends AbstrSyncDockerCmdExec<RestartContainerCmd, Void> implements
         RestartContainerCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/SaveImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/SaveImageCmdExec.java
similarity index 87%
rename from src/main/java/com/github/dockerjava/netty/exec/SaveImageCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/SaveImageCmdExec.java
index 629f49871..d79d3539a 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/SaveImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/SaveImageCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import java.io.InputStream;
 
@@ -7,8 +7,8 @@
 
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class SaveImageCmdExec extends AbstrSyncDockerCmdExec<SaveImageCmd, InputStream> implements SaveImageCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(SaveImageCmdExec.class);
diff --git a/src/main/java/com/github/dockerjava/netty/exec/SearchImagesCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java
similarity index 88%
rename from src/main/java/com/github/dockerjava/netty/exec/SearchImagesCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java
index d31d00a9f..205128190 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/SearchImagesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import java.util.List;
 
@@ -9,8 +9,8 @@
 import com.github.dockerjava.api.command.SearchImagesCmd;
 import com.github.dockerjava.api.model.SearchItem;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class SearchImagesCmdExec extends AbstrSyncDockerCmdExec<SearchImagesCmd, List<SearchItem>> implements
         SearchImagesCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/StartContainerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java
similarity index 87%
rename from src/main/java/com/github/dockerjava/netty/exec/StartContainerCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java
index 039006f2d..c773f5a56 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/StartContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java
@@ -1,12 +1,12 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.command.StartContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class StartContainerCmdExec extends AbstrSyncDockerCmdExec<StartContainerCmd, Void> implements
         StartContainerCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/StatsCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java
similarity index 92%
rename from src/main/java/com/github/dockerjava/netty/exec/StatsCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java
index d167d5686..f939a8494 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/StatsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -8,7 +8,7 @@
 import com.github.dockerjava.api.command.StatsCmd;
 import com.github.dockerjava.api.model.Statistics;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.WebTarget;
 
 public class StatsCmdExec extends AbstrAsyncDockerCmdExec<StatsCmd, Statistics> implements StatsCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(StatsCmdExec.class);
diff --git a/src/main/java/com/github/dockerjava/netty/exec/StopContainerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java
similarity index 88%
rename from src/main/java/com/github/dockerjava/netty/exec/StopContainerCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java
index cd85d92c2..90f707b93 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/StopContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java
@@ -1,12 +1,12 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.command.StopContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class StopContainerCmdExec extends AbstrSyncDockerCmdExec<StopContainerCmd, Void> implements
         StopContainerCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/TagImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java
similarity index 91%
rename from src/main/java/com/github/dockerjava/netty/exec/TagImageCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java
index 6aa171f86..a99498b91 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/TagImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java
@@ -1,11 +1,11 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.command.TagImageCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.WebTarget;
 
 public class TagImageCmdExec extends AbstrSyncDockerCmdExec<TagImageCmd, Void> implements TagImageCmd.Exec {
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/TopContainerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java
similarity index 90%
rename from src/main/java/com/github/dockerjava/netty/exec/TopContainerCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java
index c4ae9249d..c6fff7044 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/TopContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -8,8 +8,8 @@
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.TopContainerResponse;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class TopContainerCmdExec extends AbstrSyncDockerCmdExec<TopContainerCmd, TopContainerResponse> implements
         TopContainerCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/UnpauseContainerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java
similarity index 87%
rename from src/main/java/com/github/dockerjava/netty/exec/UnpauseContainerCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java
index c7cbfe017..3f7a98bf3 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/UnpauseContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java
@@ -1,12 +1,12 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class UnpauseContainerCmdExec extends AbstrSyncDockerCmdExec<UnpauseContainerCmd, Void> implements
         UnpauseContainerCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/UpdateContainerCmdExec.java
similarity index 90%
rename from src/main/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/UpdateContainerCmdExec.java
index 3c88dead8..411430d56 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/UpdateContainerCmdExec.java
@@ -1,11 +1,11 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.command.UpdateContainerCmd;
 import com.github.dockerjava.api.model.UpdateContainerResponse;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/UpdateServiceCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java
similarity index 88%
rename from src/main/java/com/github/dockerjava/netty/exec/UpdateServiceCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java
index aee2a787f..26f65cea3 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/UpdateServiceCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java
@@ -1,9 +1,9 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import com.github.dockerjava.api.command.UpdateServiceCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/UpdateSwarmCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java
similarity index 89%
rename from src/main/java/com/github/dockerjava/netty/exec/UpdateSwarmCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java
index 281d21afb..f73af5cc6 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/UpdateSwarmCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java
@@ -1,10 +1,10 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 
 import com.github.dockerjava.api.command.UpdateSwarmCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/UpdateSwarmNodeCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java
similarity index 88%
rename from src/main/java/com/github/dockerjava/netty/exec/UpdateSwarmNodeCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java
index 08d26ce38..331e93f79 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/UpdateSwarmNodeCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java
@@ -1,10 +1,10 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 
 import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/VersionCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/VersionCmdExec.java
similarity index 87%
rename from src/main/java/com/github/dockerjava/netty/exec/VersionCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/VersionCmdExec.java
index 84857c208..c673d284d 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/VersionCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/VersionCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -7,8 +7,8 @@
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.model.Version;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class VersionCmdExec extends AbstrSyncDockerCmdExec<VersionCmd, Version> implements VersionCmd.Exec {
 
diff --git a/src/main/java/com/github/dockerjava/netty/exec/WaitContainerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/WaitContainerCmdExec.java
similarity index 90%
rename from src/main/java/com/github/dockerjava/netty/exec/WaitContainerCmdExec.java
rename to src/main/java/com/github/dockerjava/core/exec/WaitContainerCmdExec.java
index 5883b7188..57cc727fe 100644
--- a/src/main/java/com/github/dockerjava/netty/exec/WaitContainerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/WaitContainerCmdExec.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.netty.exec;
+package com.github.dockerjava.core.exec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -8,8 +8,8 @@
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.WaitResponse;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.MediaType;
-import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
 
 public class WaitContainerCmdExec extends AbstrAsyncDockerCmdExec<WaitContainerCmd, WaitResponse> implements
         WaitContainerCmd.Exec {
diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index be46555fd..54e2581ba 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -11,144 +11,14 @@
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;
 
-import com.github.dockerjava.api.command.ListTasksCmd;
-import com.github.dockerjava.netty.exec.ListTasksCmdExec;
+import com.github.dockerjava.core.AbstractDockerCmdExecFactory;
+import com.github.dockerjava.core.WebTarget;
 import org.apache.commons.lang.SystemUtils;
 
-import com.github.dockerjava.api.command.AttachContainerCmd;
-import com.github.dockerjava.api.command.AuthCmd;
-import com.github.dockerjava.api.command.BuildImageCmd;
-import com.github.dockerjava.api.command.CommitCmd;
-import com.github.dockerjava.api.command.ConnectToNetworkCmd;
-import com.github.dockerjava.api.command.ContainerDiffCmd;
-import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
-import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
-import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
-import com.github.dockerjava.api.command.CreateContainerCmd;
-import com.github.dockerjava.api.command.CreateImageCmd;
-import com.github.dockerjava.api.command.CreateNetworkCmd;
-import com.github.dockerjava.api.command.CreateServiceCmd;
-import com.github.dockerjava.api.command.CreateVolumeCmd;
-import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
-import com.github.dockerjava.api.command.EventsCmd;
-import com.github.dockerjava.api.command.ExecCreateCmd;
-import com.github.dockerjava.api.command.ExecStartCmd;
-import com.github.dockerjava.api.command.InfoCmd;
-import com.github.dockerjava.api.command.InitializeSwarmCmd;
-import com.github.dockerjava.api.command.InspectContainerCmd;
-import com.github.dockerjava.api.command.InspectExecCmd;
-import com.github.dockerjava.api.command.InspectImageCmd;
-import com.github.dockerjava.api.command.InspectNetworkCmd;
-import com.github.dockerjava.api.command.InspectServiceCmd;
-import com.github.dockerjava.api.command.InspectSwarmCmd;
-import com.github.dockerjava.api.command.InspectSwarmNodeCmd;
-import com.github.dockerjava.api.command.InspectVolumeCmd;
-import com.github.dockerjava.api.command.JoinSwarmCmd;
-import com.github.dockerjava.api.command.KillContainerCmd;
-import com.github.dockerjava.api.command.LeaveSwarmCmd;
-import com.github.dockerjava.api.command.ListContainersCmd;
-import com.github.dockerjava.api.command.ListImagesCmd;
-import com.github.dockerjava.api.command.ListNetworksCmd;
-import com.github.dockerjava.api.command.ListServicesCmd;
-import com.github.dockerjava.api.command.ListSwarmNodesCmd;
-import com.github.dockerjava.api.command.ListVolumesCmd;
-import com.github.dockerjava.api.command.LoadImageCmd;
-import com.github.dockerjava.api.command.LogContainerCmd;
-import com.github.dockerjava.api.command.PauseContainerCmd;
-import com.github.dockerjava.api.command.PingCmd;
-import com.github.dockerjava.api.command.PullImageCmd;
-import com.github.dockerjava.api.command.PushImageCmd;
-import com.github.dockerjava.api.command.RemoveContainerCmd;
-import com.github.dockerjava.api.command.RemoveImageCmd;
-import com.github.dockerjava.api.command.RemoveNetworkCmd;
-import com.github.dockerjava.api.command.RemoveServiceCmd;
-import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
-import com.github.dockerjava.api.command.RemoveVolumeCmd;
-import com.github.dockerjava.api.command.RenameContainerCmd;
-import com.github.dockerjava.api.command.RestartContainerCmd;
-import com.github.dockerjava.api.command.SaveImageCmd;
-import com.github.dockerjava.api.command.SearchImagesCmd;
-import com.github.dockerjava.api.command.StartContainerCmd;
-import com.github.dockerjava.api.command.StatsCmd;
-import com.github.dockerjava.api.command.StopContainerCmd;
-import com.github.dockerjava.api.command.TagImageCmd;
-import com.github.dockerjava.api.command.TopContainerCmd;
-import com.github.dockerjava.api.command.UnpauseContainerCmd;
-import com.github.dockerjava.api.command.UpdateContainerCmd;
-import com.github.dockerjava.api.command.UpdateServiceCmd;
-import com.github.dockerjava.api.command.UpdateSwarmCmd;
-import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
-import com.github.dockerjava.api.command.VersionCmd;
-import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.DockerClientImpl;
 import com.github.dockerjava.core.SSLConfig;
-import com.github.dockerjava.netty.exec.AttachContainerCmdExec;
-import com.github.dockerjava.netty.exec.AuthCmdExec;
-import com.github.dockerjava.netty.exec.BuildImageCmdExec;
-import com.github.dockerjava.netty.exec.CommitCmdExec;
-import com.github.dockerjava.netty.exec.ConnectToNetworkCmdExec;
-import com.github.dockerjava.netty.exec.ContainerDiffCmdExec;
-import com.github.dockerjava.netty.exec.CopyArchiveFromContainerCmdExec;
-import com.github.dockerjava.netty.exec.CopyArchiveToContainerCmdExec;
-import com.github.dockerjava.netty.exec.CopyFileFromContainerCmdExec;
-import com.github.dockerjava.netty.exec.CreateContainerCmdExec;
-import com.github.dockerjava.netty.exec.CreateImageCmdExec;
-import com.github.dockerjava.netty.exec.CreateNetworkCmdExec;
-import com.github.dockerjava.netty.exec.CreateServiceCmdExec;
-import com.github.dockerjava.netty.exec.CreateVolumeCmdExec;
-import com.github.dockerjava.netty.exec.DisconnectFromNetworkCmdExec;
-import com.github.dockerjava.netty.exec.EventsCmdExec;
-import com.github.dockerjava.netty.exec.ExecCreateCmdExec;
-import com.github.dockerjava.netty.exec.ExecStartCmdExec;
-import com.github.dockerjava.netty.exec.InfoCmdExec;
-import com.github.dockerjava.netty.exec.InitializeSwarmCmdExec;
-import com.github.dockerjava.netty.exec.InspectContainerCmdExec;
-import com.github.dockerjava.netty.exec.InspectExecCmdExec;
-import com.github.dockerjava.netty.exec.InspectImageCmdExec;
-import com.github.dockerjava.netty.exec.InspectNetworkCmdExec;
-import com.github.dockerjava.netty.exec.InspectServiceCmdExec;
-import com.github.dockerjava.netty.exec.InspectSwarmCmdExec;
-import com.github.dockerjava.netty.exec.InspectSwarmNodeCmdExec;
-import com.github.dockerjava.netty.exec.InspectVolumeCmdExec;
-import com.github.dockerjava.netty.exec.JoinSwarmCmdExec;
-import com.github.dockerjava.netty.exec.KillContainerCmdExec;
-import com.github.dockerjava.netty.exec.LeaveSwarmCmdExec;
-import com.github.dockerjava.netty.exec.ListContainersCmdExec;
-import com.github.dockerjava.netty.exec.ListImagesCmdExec;
-import com.github.dockerjava.netty.exec.ListNetworksCmdExec;
-import com.github.dockerjava.netty.exec.ListServicesCmdExec;
-import com.github.dockerjava.netty.exec.ListSwarmNodesCmdExec;
-import com.github.dockerjava.netty.exec.ListVolumesCmdExec;
-import com.github.dockerjava.netty.exec.LoadImageCmdExec;
-import com.github.dockerjava.netty.exec.LogContainerCmdExec;
-import com.github.dockerjava.netty.exec.PauseContainerCmdExec;
-import com.github.dockerjava.netty.exec.PingCmdExec;
-import com.github.dockerjava.netty.exec.PullImageCmdExec;
-import com.github.dockerjava.netty.exec.PushImageCmdExec;
-import com.github.dockerjava.netty.exec.RemoveContainerCmdExec;
-import com.github.dockerjava.netty.exec.RemoveImageCmdExec;
-import com.github.dockerjava.netty.exec.RemoveNetworkCmdExec;
-import com.github.dockerjava.netty.exec.RemoveServiceCmdExec;
-import com.github.dockerjava.netty.exec.RemoveSwarmNodeCmdExec;
-import com.github.dockerjava.netty.exec.RemoveVolumeCmdExec;
-import com.github.dockerjava.netty.exec.RenameContainerCmdExec;
-import com.github.dockerjava.netty.exec.RestartContainerCmdExec;
-import com.github.dockerjava.netty.exec.SaveImageCmdExec;
-import com.github.dockerjava.netty.exec.SearchImagesCmdExec;
-import com.github.dockerjava.netty.exec.StartContainerCmdExec;
-import com.github.dockerjava.netty.exec.StatsCmdExec;
-import com.github.dockerjava.netty.exec.StopContainerCmdExec;
-import com.github.dockerjava.netty.exec.TagImageCmdExec;
-import com.github.dockerjava.netty.exec.TopContainerCmdExec;
-import com.github.dockerjava.netty.exec.UnpauseContainerCmdExec;
-import com.github.dockerjava.netty.exec.UpdateContainerCmdExec;
-import com.github.dockerjava.netty.exec.UpdateServiceCmdExec;
-import com.github.dockerjava.netty.exec.UpdateSwarmCmdExec;
-import com.github.dockerjava.netty.exec.UpdateSwarmNodeCmdExec;
-import com.github.dockerjava.netty.exec.VersionCmdExec;
-import com.github.dockerjava.netty.exec.WaitContainerCmdExec;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelConfig;
@@ -182,7 +52,7 @@
  * @see https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#attach-to-a-container
  * @see https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#exec-start
  */
-public class NettyDockerCmdExecFactory implements DockerCmdExecFactory {
+public class NettyDockerCmdExecFactory extends AbstractDockerCmdExecFactory implements DockerCmdExecFactory {
 
     private static String threadPrefix = "dockerjava-netty";
 
@@ -195,8 +65,6 @@ public class NettyDockerCmdExecFactory implements DockerCmdExecFactory {
      * https://github.com/slandelle/netty-request-chunking/blob/master/src/test/java/slandelle/ChunkingTest.java
      */
 
-    private DockerClientConfig dockerClientConfig;
-
     private Bootstrap bootstrap;
 
     private EventLoopGroup eventLoopGroup;
@@ -218,8 +86,7 @@ public DuplexChannel getChannel() {
 
     @Override
     public void init(DockerClientConfig dockerClientConfig) {
-        checkNotNull(dockerClientConfig, "config was not specified");
-        this.dockerClientConfig = dockerClientConfig;
+        super.init(dockerClientConfig);
 
         bootstrap = new Bootstrap();
 
@@ -233,7 +100,7 @@ public void init(DockerClientConfig dockerClientConfig) {
 
         eventLoopGroup = nettyInitializer.init(bootstrap, dockerClientConfig);
 
-        baseResource = new WebTarget(channelProvider).path(dockerClientConfig.getApiVersion().asWebPathPart());
+        baseResource = new NettyWebTarget(channelProvider).path(dockerClientConfig.getApiVersion().asWebPathPart());
     }
 
     private DuplexChannel connect() {
@@ -338,6 +205,7 @@ protected void initChannel(final SocketChannel channel) throws Exception {
 
         @Override
         public DuplexChannel connect(Bootstrap bootstrap) throws InterruptedException {
+            DockerClientConfig dockerClientConfig = getDockerClientConfig();
             String host = dockerClientConfig.getDockerHost().getHost();
             int port = dockerClientConfig.getDockerHost().getPort();
 
@@ -385,350 +253,11 @@ private SslHandler initSsl(DockerClientConfig dockerClientConfig) {
         }
     }
 
-    protected DockerClientConfig getDockerClientConfig() {
-        checkNotNull(dockerClientConfig,
-                "Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!");
-        return dockerClientConfig;
-    }
-
     public SSLParameters enableHostNameVerification(SSLParameters sslParameters) {
         sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
         return sslParameters;
     }
 
-    @Override
-    public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() {
-        return new CopyArchiveFromContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() {
-        return new CopyArchiveToContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public AuthCmd.Exec createAuthCmdExec() {
-        return new AuthCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InfoCmd.Exec createInfoCmdExec() {
-        return new InfoCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public PingCmd.Exec createPingCmdExec() {
-        return new PingCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public VersionCmd.Exec createVersionCmdExec() {
-        return new VersionCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public PullImageCmd.Exec createPullImageCmdExec() {
-        return new PullImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public PushImageCmd.Exec createPushImageCmdExec() {
-        return new PushImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public SaveImageCmd.Exec createSaveImageCmdExec() {
-        return new SaveImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CreateImageCmd.Exec createCreateImageCmdExec() {
-        return new CreateImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public LoadImageCmd.Exec createLoadImageCmdExec() {
-        return new LoadImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public SearchImagesCmd.Exec createSearchImagesCmdExec() {
-        return new SearchImagesCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RemoveImageCmd.Exec createRemoveImageCmdExec() {
-        return new RemoveImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ListImagesCmd.Exec createListImagesCmdExec() {
-        return new ListImagesCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectImageCmd.Exec createInspectImageCmdExec() {
-        return new InspectImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ListContainersCmd.Exec createListContainersCmdExec() {
-        return new ListContainersCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CreateContainerCmd.Exec createCreateContainerCmdExec() {
-        return new CreateContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public StartContainerCmd.Exec createStartContainerCmdExec() {
-        return new StartContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectContainerCmd.Exec createInspectContainerCmdExec() {
-        return new InspectContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ExecCreateCmd.Exec createExecCmdExec() {
-        return new ExecCreateCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
-        return new RemoveContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public WaitContainerCmd.Exec createWaitContainerCmdExec() {
-        return new WaitContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public AttachContainerCmd.Exec createAttachContainerCmdExec() {
-        return new AttachContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ExecStartCmd.Exec createExecStartCmdExec() {
-        return new ExecStartCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectExecCmd.Exec createInspectExecCmdExec() {
-        return new InspectExecCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public LogContainerCmd.Exec createLogContainerCmdExec() {
-        return new LogContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
-        return new CopyFileFromContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public StopContainerCmd.Exec createStopContainerCmdExec() {
-        return new StopContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
-        return new ContainerDiffCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public KillContainerCmd.Exec createKillContainerCmdExec() {
-        return new KillContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public UpdateContainerCmd.Exec createUpdateContainerCmdExec() {
-        return new UpdateContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RenameContainerCmd.Exec createRenameContainerCmdExec() {
-        return new RenameContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RestartContainerCmd.Exec createRestartContainerCmdExec() {
-        return new RestartContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CommitCmd.Exec createCommitCmdExec() {
-        return new CommitCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public BuildImageCmd.Exec createBuildImageCmdExec() {
-        return new BuildImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public TopContainerCmd.Exec createTopContainerCmdExec() {
-        return new TopContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public TagImageCmd.Exec createTagImageCmdExec() {
-        return new TagImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public PauseContainerCmd.Exec createPauseContainerCmdExec() {
-        return new PauseContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
-        return new UnpauseContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public EventsCmd.Exec createEventsCmdExec() {
-        return new EventsCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public StatsCmd.Exec createStatsCmdExec() {
-        return new StatsCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
-        return new CreateVolumeCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectVolumeCmd.Exec createInspectVolumeCmdExec() {
-        return new InspectVolumeCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() {
-        return new RemoveVolumeCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ListVolumesCmd.Exec createListVolumesCmdExec() {
-        return new ListVolumesCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ListNetworksCmd.Exec createListNetworksCmdExec() {
-        return new ListNetworksCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectNetworkCmd.Exec createInspectNetworkCmdExec() {
-        return new InspectNetworkCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CreateNetworkCmd.Exec createCreateNetworkCmdExec() {
-        return new CreateNetworkCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() {
-        return new RemoveNetworkCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() {
-        return new ConnectToNetworkCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() {
-        return new DisconnectFromNetworkCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    // swarm
-    @Override
-    public InitializeSwarmCmd.Exec createInitializeSwarmCmdExec() {
-        return new InitializeSwarmCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectSwarmCmd.Exec createInspectSwarmCmdExec() {
-        return new InspectSwarmCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public JoinSwarmCmd.Exec createJoinSwarmCmdExec() {
-        return new JoinSwarmCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public LeaveSwarmCmd.Exec createLeaveSwarmCmdExec() {
-        return new LeaveSwarmCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() {
-        return new UpdateSwarmCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    // services
-    @Override
-    public ListServicesCmd.Exec createListServicesCmdExec() {
-        return new ListServicesCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CreateServiceCmd.Exec createCreateServiceCmdExec() {
-        return new CreateServiceCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectServiceCmd.Exec createInspectServiceCmdExec() {
-        return new InspectServiceCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public UpdateServiceCmd.Exec createUpdateServiceCmdExec() {
-        return new UpdateServiceCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RemoveServiceCmd.Exec createRemoveServiceCmdExec() {
-        return new RemoveServiceCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    // nodes
-    @Override
-    public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() {
-        return new ListSwarmNodesCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectSwarmNodeCmd.Exec inspectSwarmNodeCmdExec() {
-        return new InspectSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RemoveSwarmNodeCmd.Exec removeSwarmNodeCmdExec() {
-        return new RemoveSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() {
-        return new UpdateSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ListTasksCmd.Exec listTasksCmdExec() {
-        return new ListTasksCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
     @Override
     public void close() throws IOException {
         checkNotNull(eventLoopGroup, "Factory not initialized. You probably forgot to call init()!");
diff --git a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
similarity index 90%
rename from src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
rename to src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
index 9e67a1687..952fea3ac 100644
--- a/src/main/java/com/github/dockerjava/netty/InvocationBuilder.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
@@ -6,6 +6,7 @@
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.InvocationBuilder;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
 import com.github.dockerjava.netty.handler.FramedResponseStreamHandler;
 import com.github.dockerjava.netty.handler.HttpConnectionHijackHandler;
@@ -40,7 +41,6 @@
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.CountDownLatch;
 
 /**
  * This class is basically a replacement of javax.ws.rs.client.Invocation.Builder to allow simpler migration of JAX-RS code to a netty based
@@ -48,7 +48,7 @@
  *
  * @author Marcus Linke
  */
-public class InvocationBuilder {
+public class NettyInvocationBuilder implements InvocationBuilder {
 
     public class ResponseCallback<T> extends ResultCallbackTemplate<ResponseCallback<T>, T> {
 
@@ -75,73 +75,23 @@ public void onNext(Void object) {
         }
     }
 
-    /**
-     * Implementation of {@link ResultCallback} with the single result event expected.
-     */
-    public static class AsyncResultCallback<A_RES_T>
-            extends ResultCallbackTemplate<AsyncResultCallback<A_RES_T>, A_RES_T> {
-
-        private A_RES_T result = null;
-
-        private final CountDownLatch resultReady = new CountDownLatch(1);
-
-        @Override
-        public void onNext(A_RES_T object) {
-            onResult(object);
-        }
-
-        private void onResult(A_RES_T object) {
-            if (resultReady.getCount() == 0) {
-                throw new IllegalStateException("Result has already been set");
-            }
-
-            try {
-                result = object;
-            } finally {
-                resultReady.countDown();
-            }
-        }
-
-        @Override
-        public void close() throws IOException {
-            try {
-                super.close();
-            } finally {
-                resultReady.countDown();
-            }
-        }
-
-        /**
-         * Blocks until {@link ResultCallback#onNext(Object)} was called for the first time
-         */
-        @SuppressWarnings("unchecked")
-        public A_RES_T awaitResult() {
-            try {
-                resultReady.await();
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-            throwFirstError();
-            return result;
-        }
-    }
-
     private ChannelProvider channelProvider;
 
     private String resource;
 
     private Map<String, String> headers = new HashMap<String, String>();
 
-    public InvocationBuilder(ChannelProvider channelProvider, String resource) {
+    public NettyInvocationBuilder(ChannelProvider channelProvider, String resource) {
         this.channelProvider = channelProvider;
         this.resource = resource;
     }
 
-    public InvocationBuilder accept(MediaType mediaType) {
+    @Override
+    public InvocationBuilder accept(com.github.dockerjava.core.MediaType mediaType) {
         return header(HttpHeaderNames.ACCEPT.toString(), mediaType.getMediaType());
     }
 
-    public InvocationBuilder header(String name, String value) {
+    public NettyInvocationBuilder header(String name, String value) {
         headers.put(name, value);
         return this;
     }
@@ -519,7 +469,8 @@ public InputStream get() {
         return resultCallback.awaitResult();
     }
 
-    public void put(InputStream body, MediaType mediaType) {
+    @Override
+    public void put(InputStream body, com.github.dockerjava.core.MediaType mediaType) {
         HttpRequestProvider requestProvider = httpPutRequestProvider(null);
 
         Channel channel = getChannel();
@@ -547,5 +498,5 @@ public void put(InputStream body, MediaType mediaType) {
         channel.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT);
 
         resultCallback.awaitResult();
-    };
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/netty/WebTarget.java b/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
similarity index 83%
rename from src/main/java/com/github/dockerjava/netty/WebTarget.java
rename to src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
index 96fb42bec..f172f10fa 100644
--- a/src/main/java/com/github/dockerjava/netty/WebTarget.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
@@ -12,6 +12,7 @@
 import java.util.Set;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.core.WebTarget;
 import com.google.common.collect.ImmutableSet;
 import io.netty.handler.codec.http.HttpConstants;
 import org.apache.commons.lang.StringUtils;
@@ -25,7 +26,7 @@
  *
  * @author Marcus Linke
  */
-public class WebTarget {
+public class NettyWebTarget implements WebTarget {
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
     private final ChannelProvider channelProvider;
@@ -41,12 +42,12 @@ public class WebTarget {
 
     private static final String PATH_SEPARATOR = "/";
 
-    public WebTarget(ChannelProvider channelProvider) {
+    public NettyWebTarget(ChannelProvider channelProvider) {
         this(channelProvider, ImmutableList.<String>of(), ImmutableMap.<String, String>of(),
                 ImmutableMap.<String, Set<String>>of());
     }
 
-    private WebTarget(ChannelProvider channelProvider,
+    private NettyWebTarget(ChannelProvider channelProvider,
                       ImmutableList<String> path,
                       ImmutableMap<String, String> queryParams,
                       ImmutableMap<String, Set<String>> queryParamsSet) {
@@ -56,17 +57,17 @@ private WebTarget(ChannelProvider channelProvider,
         this.queryParamsSet = queryParamsSet;
     }
 
-    public WebTarget path(String... components) {
+    public NettyWebTarget path(String... components) {
         ImmutableList.Builder<String> newPath = ImmutableList.<String>builder().addAll(this.path);
 
         for (String component : components) {
             newPath.addAll(Arrays.asList(StringUtils.split(component, PATH_SEPARATOR)));
         }
 
-        return new WebTarget(channelProvider, newPath.build(), queryParams, queryParamsSet);
+        return new NettyWebTarget(channelProvider, newPath.build(), queryParams, queryParamsSet);
     }
 
-    public InvocationBuilder request() {
+    public NettyInvocationBuilder request() {
         String resource = PATH_SEPARATOR + StringUtils.join(path, PATH_SEPARATOR);
 
         List<String> params = new ArrayList<>();
@@ -84,7 +85,7 @@ public InvocationBuilder request() {
             resource = resource + "?" + StringUtils.join(params, "&");
         }
 
-        return new InvocationBuilder(channelProvider, resource);
+        return new NettyInvocationBuilder(channelProvider, resource);
     }
 
     /**
@@ -99,24 +100,24 @@ private static String encodeComponent(String s, Charset charset) {
         }
     }
 
-    public WebTarget resolveTemplate(String name, Object value) {
+    public NettyWebTarget resolveTemplate(String name, Object value) {
         ImmutableList.Builder<String> newPath = ImmutableList.builder();
         for (String component : path) {
             component = component.replaceAll("\\{" + name + "\\}", value.toString());
             newPath.add(component);
         }
-        return new WebTarget(channelProvider, newPath.build(), queryParams, queryParamsSet);
+        return new NettyWebTarget(channelProvider, newPath.build(), queryParams, queryParamsSet);
     }
 
-    public WebTarget queryParam(String name, Object value) {
+    public NettyWebTarget queryParam(String name, Object value) {
         ImmutableMap.Builder<String, String> builder = ImmutableMap.<String, String>builder().putAll(queryParams);
         if (value != null) {
             builder.put(name, value.toString());
         }
-        return new WebTarget(channelProvider, path, builder.build(), queryParamsSet);
+        return new NettyWebTarget(channelProvider, path, builder.build(), queryParamsSet);
     }
 
-    public WebTarget queryParamsSet(String name, Set<?> values) {
+    public NettyWebTarget queryParamsSet(String name, Set<?> values) {
         ImmutableMap.Builder<String, Set<String>> builder = ImmutableMap.<String, Set<String>>builder().putAll(queryParamsSet);
         if (values != null) {
             ImmutableSet.Builder<String> valueBuilder = ImmutableSet.builder();
@@ -125,10 +126,10 @@ public WebTarget queryParamsSet(String name, Set<?> values) {
             }
             builder.put(name, valueBuilder.build());
         }
-        return new WebTarget(channelProvider, path, queryParams, builder.build());
+        return new NettyWebTarget(channelProvider, path, queryParams, builder.build());
     }
 
-    public WebTarget queryParamsJsonMap(String name, Map<String, String> values) {
+    public NettyWebTarget queryParamsJsonMap(String name, Map<String, String> values) {
         if (values != null && !values.isEmpty()) {
             try {
                 // when param value is JSON string
@@ -150,7 +151,7 @@ public boolean equals(Object o) {
             return false;
         }
 
-        WebTarget webTarget = (WebTarget) o;
+        NettyWebTarget webTarget = (NettyWebTarget) o;
 
         if (channelProvider != null ? !channelProvider.equals(webTarget.channelProvider) : webTarget.channelProvider != null) {
             return false;
diff --git a/src/test/java/com/github/dockerjava/netty/WebTargetTest.java b/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java
similarity index 55%
rename from src/test/java/com/github/dockerjava/netty/WebTargetTest.java
rename to src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java
index 5835b043c..822eef49c 100644
--- a/src/test/java/com/github/dockerjava/netty/WebTargetTest.java
+++ b/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java
@@ -11,7 +11,7 @@
 /**
  * @author Alexander Koshevoy
  */
-public class WebTargetTest {
+public class NettyWebTargetTest {
     @Mock
     private ChannelProvider channelProvider;
 
@@ -22,20 +22,20 @@ public void setUp() throws Exception {
 
     @Test
     public void verifyImmutability() throws Exception {
-        WebTarget emptyWebTarget = new WebTarget(channelProvider);
+        NettyWebTarget emptyWebTarget = new NettyWebTarget(channelProvider);
 
-        WebTarget initWebTarget = emptyWebTarget.path("/containers/{id}/attach").resolveTemplate("id", "d03da378b592")
+        NettyWebTarget initWebTarget = emptyWebTarget.path("/containers/{id}/attach").resolveTemplate("id", "d03da378b592")
                 .queryParam("logs", "true");
 
-        WebTarget anotherWebTarget = emptyWebTarget.path("/containers/{id}/attach")
+        NettyWebTarget anotherWebTarget = emptyWebTarget.path("/containers/{id}/attach")
                 .resolveTemplate("id", "2cfada4e3c07").queryParam("stdin", "true");
 
-        assertEquals(new WebTarget(channelProvider), emptyWebTarget);
+        assertEquals(new NettyWebTarget(channelProvider), emptyWebTarget);
 
-        assertEquals(new WebTarget(channelProvider).path("/containers/d03da378b592/attach")
+        assertEquals(new NettyWebTarget(channelProvider).path("/containers/d03da378b592/attach")
                 .queryParam("logs", "true"), initWebTarget);
 
-        assertEquals(new WebTarget(channelProvider).path("/containers/2cfada4e3c07/attach")
+        assertEquals(new NettyWebTarget(channelProvider).path("/containers/2cfada4e3c07/attach")
                 .queryParam("stdin", "true"), anotherWebTarget);
     }
 }

From cfb3f1561733d7428ece43243c348cc562034de3 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 21 Feb 2018 01:44:59 +0300
Subject: [PATCH 0790/1272] Disable failing repo

---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 640885610..1c4e974bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -281,11 +281,11 @@
 	</distributionManagement>
 
 	<pluginRepositories>
-		<pluginRepository>
-			<id>eclipse.virgo.build.bundles.release</id>
-			<name>Eclipse Virgo Build</name>
-			<url>http://build.eclipse.org/rt/virgo/maven/bundles/release</url>
-		</pluginRepository>
+		<!--<pluginRepository>-->
+			<!--<id>eclipse.virgo.build.bundles.release</id>-->
+			<!--<name>Eclipse Virgo Build</name>-->
+			<!--<url>http://build.eclipse.org/rt/virgo/maven/bundles/release</url>-->
+		<!--</pluginRepository>-->
 		<pluginRepository>
 			<id>com.springsource.repository.bundles.external</id>
 			<name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>

From 276c4957ad077f1f9ca391028fadfab1d3a6ab5e Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 21 Feb 2018 01:52:30 +0300
Subject: [PATCH 0791/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ab76bd2a..8f76b34dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,10 @@
 Change Log
 ===
-## 3.1.0 WIP
+## 3.1.0-rc-1
+  A lot of changes...
 - Swarm Mode support.
 - Classic swarm support.
+- various netty improvements
  
  
 ## 3.0.14

From 1952fa6fad94d7ff071e578f6c46e5bb81124c9a Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Fri, 2 Mar 2018 13:47:50 +0800
Subject: [PATCH 0792/1272] fix #927 avoid double encoding for url query
 string, NettyWebTarget#request will encode the string, we can skip
 urlPathSegmentEscaper The change is for netty only since jetty don't use the
 class under exec package

---
 .../com/github/dockerjava/core/exec/ListServicesCmdExec.java  | 4 +---
 .../github/dockerjava/core/exec/ListSwarmNodesCmdExec.java    | 4 +---
 .../com/github/dockerjava/core/exec/ListTasksCmdExec.java     | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/exec/ListServicesCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/ListServicesCmdExec.java
index 91065fc20..389d0cbad 100644
--- a/src/main/java/com/github/dockerjava/core/exec/ListServicesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/ListServicesCmdExec.java
@@ -12,8 +12,6 @@
 
 import java.util.List;
 
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
 public class ListServicesCmdExec extends AbstrSyncDockerCmdExec<ListServicesCmd, List<Service>> implements
         ListServicesCmd.Exec {
 
@@ -29,7 +27,7 @@ protected List<Service> execute(ListServicesCmd command) {
 
         if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget
-                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+                    .queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
         }
 
         LOGGER.trace("GET: {}", webTarget);
diff --git a/src/main/java/com/github/dockerjava/core/exec/ListSwarmNodesCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/ListSwarmNodesCmdExec.java
index 915747d80..1d6fe861f 100644
--- a/src/main/java/com/github/dockerjava/core/exec/ListSwarmNodesCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/ListSwarmNodesCmdExec.java
@@ -12,8 +12,6 @@
 
 import java.util.List;
 
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
 public class ListSwarmNodesCmdExec extends AbstrSyncDockerCmdExec<ListSwarmNodesCmd, List<SwarmNode>> implements
         ListSwarmNodesCmd.Exec {
 
@@ -30,7 +28,7 @@ protected List<SwarmNode> execute(ListSwarmNodesCmd command) {
 
         if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget
-                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+                    .queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
         }
 
         LOGGER.trace("GET: {}", webTarget);
diff --git a/src/main/java/com/github/dockerjava/core/exec/ListTasksCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/ListTasksCmdExec.java
index 7b0684423..659449078 100644
--- a/src/main/java/com/github/dockerjava/core/exec/ListTasksCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/ListTasksCmdExec.java
@@ -12,8 +12,6 @@
 
 import java.util.List;
 
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
 public class ListTasksCmdExec extends AbstrSyncDockerCmdExec<ListTasksCmd, List<Task>> implements
         ListTasksCmd.Exec {
 
@@ -29,7 +27,7 @@ protected List<Task> execute(ListTasksCmd command) {
 
         if (command.getFilters() != null && !command.getFilters().isEmpty()) {
             webTarget = webTarget
-                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+                    .queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
         }
 
         LOGGER.trace("GET: {}", webTarget);

From 845f20876741552662dcf2efb38df9b177341ae0 Mon Sep 17 00:00:00 2001
From: orzeh <orzehoo@wp.pl>
Date: Fri, 2 Mar 2018 10:28:08 +0100
Subject: [PATCH 0793/1272] Generate OSGi manifest with Apache Felix Plugin

Replaces Bundlor plugin due to dependency resolution issues.
---
 pom.xml | 58 ++++++++++-----------------------------------------------
 1 file changed, 10 insertions(+), 48 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1c4e974bb..748a73304 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
-	<packaging>jar</packaging>
+	<packaging>bundle</packaging>
 	<version>3.1.0-SNAPSHOT</version>
 
 	<name>docker-java</name>
@@ -280,19 +280,6 @@
 		</repository>
 	</distributionManagement>
 
-	<pluginRepositories>
-		<!--<pluginRepository>-->
-			<!--<id>eclipse.virgo.build.bundles.release</id>-->
-			<!--<name>Eclipse Virgo Build</name>-->
-			<!--<url>http://build.eclipse.org/rt/virgo/maven/bundles/release</url>-->
-		<!--</pluginRepository>-->
-		<pluginRepository>
-			<id>com.springsource.repository.bundles.external</id>
-			<name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
-			<url>http://repository.springsource.com/maven/bundles/external</url>
-		</pluginRepository>
-	</pluginRepositories>
-
 	<build>
 		<pluginManagement>
 			<plugins>
@@ -319,11 +306,6 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
 					<version>${maven-jar-plugin.version}</version>
-					<configuration>
-						<archive>
-							<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
-						</archive>
-					</configuration>
 					<executions>
 						<execution>
 							<goals>
@@ -457,36 +439,16 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
 			</plugin>
-
-			<plugin>
-				<groupId>org.eclipse.virgo.bundlor</groupId>
-				<artifactId>org.eclipse.virgo.bundlor.maven</artifactId>
-				<version>${maven-bundlor-plugin.version}</version>
-				<executions>
-					<execution>
-						<id>bundlor</id>
-						<goals>
-							<goal>bundlor</goal>
-						</goals>
-						<configuration>
-							<failOnWarnings>true</failOnWarnings>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>${maven-build-helper-plugin.version}</version>
-				<executions>
-					<execution>
-						<id>parse-version</id>
-						<goals>
-							<goal>parse-version</goal>
-						</goals>
-					</execution>
-				</executions>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Export-Package>!com.github.dockerjava.jaxrs.*,!com.github.dockerjava.netty.*,com.github.dockerjava.*</Export-Package>
+						<Import-Package>org.newsclub.net.unix;resolution:="optional",*</Import-Package>
+					</instructions>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

From da8d677aa7a9cb6c1ab128690f3414cdd16c5c6a Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Fri, 2 Mar 2018 17:18:54 +0800
Subject: [PATCH 0794/1272] add tmpfs mount support since v1.29

---
 .../github/dockerjava/api/model/Mount.java    | 31 ++++++++++
 .../dockerjava/api/model/MountType.java       |  7 ++-
 .../dockerjava/api/model/TmpfsOptions.java    | 61 +++++++++++++++++++
 .../cmd/swarm/CreateServiceCmdExecIT.java     | 33 +++++++++-
 4 files changed, 129 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java

diff --git a/src/main/java/com/github/dockerjava/api/model/Mount.java b/src/main/java/com/github/dockerjava/api/model/Mount.java
index 028dd6d74..6393eb176 100644
--- a/src/main/java/com/github/dockerjava/api/model/Mount.java
+++ b/src/main/java/com/github/dockerjava/api/model/Mount.java
@@ -52,6 +52,12 @@ public class Mount implements Serializable {
     @JsonProperty("VolumeOptions")
     private VolumeOptions volumeOptions;
 
+    /**
+     * @since 1.29
+     */
+    @JsonProperty("TmpfsOptions")
+    private TmpfsOptions tmpfsOptions;
+
     /**
      * @see #type
      */
@@ -129,6 +135,9 @@ public BindOptions getBindOptions() {
      */
     public Mount withBindOptions(BindOptions bindOptions) {
         this.bindOptions = bindOptions;
+        if (bindOptions != null) {
+            this.type = MountType.BIND;
+        }
         return this;
     }
 
@@ -145,6 +154,28 @@ public VolumeOptions getVolumeOptions() {
      */
     public Mount withVolumeOptions(VolumeOptions volumeOptions) {
         this.volumeOptions = volumeOptions;
+        if (volumeOptions != null) {
+            this.type = MountType.VOLUME;
+        }
+        return this;
+    }
+
+    /**
+     * @see #tmpfsOptions
+     */
+    @CheckForNull
+    public TmpfsOptions getTmpfsOptions() {
+        return tmpfsOptions;
+    }
+
+    /**
+     * @see #tmpfsOptions
+     */
+    public Mount withTmpfsOptions(TmpfsOptions tmpfsOptions) {
+        this.tmpfsOptions = tmpfsOptions;
+        if (tmpfsOptions != null) {
+            this.type = MountType.TMPFS;
+        }
         return this;
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/model/MountType.java b/src/main/java/com/github/dockerjava/api/model/MountType.java
index e4f4edf90..7e6bfc770 100644
--- a/src/main/java/com/github/dockerjava/api/model/MountType.java
+++ b/src/main/java/com/github/dockerjava/api/model/MountType.java
@@ -11,5 +11,10 @@ public enum MountType {
     BIND,
 
     @JsonProperty("volume")
-    VOLUME
+    VOLUME,
+
+    //@since 1.29
+    @JsonProperty("tmpfs")
+    TMPFS
+
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java b/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
new file mode 100644
index 000000000..68859998c
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
@@ -0,0 +1,61 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_29}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class TmpfsOptions implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @JsonProperty("SizeBytes")
+    //The size for the tmpfs mount in bytes.
+    private Long sizeBytes;
+
+    //The permission mode for the tmpfs mount in an integer.
+    @JsonProperty("Mode")
+    private Integer mode;
+
+    public Long getSizeBytes() {
+        return sizeBytes;
+    }
+
+    public TmpfsOptions withSizeBytes(Long sizeBytes) {
+        this.sizeBytes = sizeBytes;
+        return this;
+    }
+
+    public Integer getMode() {
+        return mode;
+    }
+
+    public TmpfsOptions withMode(Integer mode) {
+        this.mode = mode;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java b/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
index 07d2f7599..cc1ee325a 100644
--- a/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
@@ -4,6 +4,8 @@
 import com.github.dockerjava.api.model.ContainerSpec;
 import com.github.dockerjava.api.model.EndpointResolutionMode;
 import com.github.dockerjava.api.model.EndpointSpec;
+import com.github.dockerjava.api.model.Mount;
+import com.github.dockerjava.api.model.MountType;
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.api.model.NetworkAttachmentConfig;
 import com.github.dockerjava.api.model.PortConfig;
@@ -14,12 +16,14 @@
 import com.github.dockerjava.api.model.ServiceSpec;
 import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.api.model.TaskSpec;
+import com.github.dockerjava.api.model.TmpfsOptions;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collections;
 import java.util.List;
 
 import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
@@ -44,7 +48,7 @@ public void testCreateService() throws DockerException {
                 .withTaskTemplate(new TaskSpec()
                         .withContainerSpec(new ContainerSpec()
                                 .withImage(DEFAULT_IMAGE))))
-        .exec();
+                .exec();
 
         List<Service> services = dockerRule.getClient().listServicesCmd()
                 .withNameFilter(Lists.newArrayList(SERVICE_NAME))
@@ -79,7 +83,7 @@ public void testCreateServiceWithNetworks() {
                                 .withTarget(networkId)
                                 .withAliases(Lists.<String>newArrayList("alias1", "alias2"))
                 ))
-                .withLabels(ImmutableMap.of("com.docker.java.usage","SwarmServiceIT"))
+                .withLabels(ImmutableMap.of("com.docker.java.usage", "SwarmServiceIT"))
                 .withMode(new ServiceModeConfig().withReplicated(
                         new ServiceReplicatedModeOptions()
                                 .withReplicas(1)
@@ -104,4 +108,29 @@ public void testCreateServiceWithNetworks() {
         dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec();
     }
 
+    @Test
+    public void testCreateServiceWithTmpfs() {
+        dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
+                .withListenAddr("127.0.0.1")
+                .withAdvertiseAddr("127.0.0.1")
+                .exec();
+        Mount tmpMount = new Mount().withTmpfsOptions(new TmpfsOptions().withSizeBytes(600L)).withTarget("/tmp/foo");
+
+        dockerRule.getClient().createServiceCmd(new ServiceSpec()
+                .withName(SERVICE_NAME)
+                .withTaskTemplate(new TaskSpec()
+                        .withContainerSpec(new ContainerSpec().withImage(DEFAULT_IMAGE).withMounts(Collections.singletonList(tmpMount)))))
+                .exec();
+
+        List<Service> services = dockerRule.getClient().listServicesCmd()
+                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
+                .exec();
+
+        assertThat(services, hasSize(1));
+        List<Mount> mounts = dockerRule.getClient().inspectServiceCmd(SERVICE_NAME).exec().getSpec().getTaskTemplate()
+                .getContainerSpec().getMounts();
+        assertThat(mounts, hasSize(1));
+        assertThat(mounts.get(0), is(tmpMount));
+        dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec();
+    }
 }

From 1d52bcf71fcd4381684ea7f59a4329da1c167eaf Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Tue, 6 Mar 2018 22:32:44 +0800
Subject: [PATCH 0795/1272] add support for swarm service/task logs

---
 .../github/dockerjava/api/DockerClient.java   |  17 +++
 .../api/command/DockerCmdExecFactory.java     |   7 +
 .../api/command/LogSwarmObjectCmd.java        |  94 ++++++++++++++
 .../core/AbstractDockerCmdExecFactory.java    |   7 +
 .../dockerjava/core/DockerClientImpl.java     |  15 ++-
 .../core/command/LogSwarmObjectImpl.java      | 121 ++++++++++++++++++
 .../core/exec/LogSwarmObjectExec.java         |  48 +++++++
 .../jaxrs/JerseyDockerCmdExecFactory.java     |   6 +
 .../dockerjava/jaxrs/LogSwarmObjectExec.java  |  50 ++++++++
 .../cmd/swarm/LogSwarmObjectIT.java           |  76 +++++++++++
 .../dockerjava/cmd/swarm/SwarmCmdIT.java      |   2 +-
 .../core/TestDockerCmdExecFactory.java        |   6 +
 12 files changed, 447 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/command/LogSwarmObjectCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/LogSwarmObjectImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/exec/LogSwarmObjectExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 43dde1832..24ed54dcf 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -39,6 +39,7 @@
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
+import com.github.dockerjava.api.command.LogSwarmObjectCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.command.PingCmd;
 import com.github.dockerjava.api.command.PullImageCmd;
@@ -374,6 +375,22 @@ public interface DockerClient extends Closeable {
      */
     ListTasksCmd listTasksCmd();
 
+    /**
+     * Command to get service log
+     *
+     * @return the command
+     * @since 1.29
+     */
+    LogSwarmObjectCmd logServiceCmd(String serviceId);
+
+    /**
+     * Command to get task log
+     *
+     * @return the command
+     * @since 1.29
+     */
+    LogSwarmObjectCmd logTaskCmd(String taskId);
+
     @Override
     void close() throws IOException;
 
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index bdc34e8be..3392ce372 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -163,6 +163,13 @@ public interface DockerCmdExecFactory extends Closeable {
      */
     RemoveServiceCmd.Exec createRemoveServiceCmdExec();
 
+    /**
+     * @param endpoint endpoint name to tail logs
+     * @return
+     * @since {@link RemoteApiVersion#VERSION_1_29}
+     */
+    LogSwarmObjectCmd.Exec logSwarmObjectExec(String endpoint);
+
     // nodes
 
     /**
diff --git a/src/main/java/com/github/dockerjava/api/command/LogSwarmObjectCmd.java b/src/main/java/com/github/dockerjava/api/command/LogSwarmObjectCmd.java
new file mode 100644
index 000000000..f5e738518
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/LogSwarmObjectCmd.java
@@ -0,0 +1,94 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.model.Frame;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * Get docker service/task stdout/stderr logs
+ */
+public interface LogSwarmObjectCmd extends AsyncDockerCmd<LogSwarmObjectCmd, Frame> {
+    /**
+     * @param id ID or name of the service
+     * @return self
+     */
+    LogSwarmObjectCmd withId(@Nonnull String id);
+
+    /**
+     * @param follow Return the logs as a raw stream.
+     * @return self
+     */
+    LogSwarmObjectCmd withFollow(Boolean follow);
+
+    /**
+     * @param timestamps Add timestamps to every log line
+     * @return self
+     */
+    LogSwarmObjectCmd withTimestamps(Boolean timestamps);
+
+    /**
+     * @param stdout Return logs from stdout
+     * @return self
+     */
+    LogSwarmObjectCmd withStdout(Boolean stdout);
+
+    /**
+     * @param stderr Return logs from stderr
+     * @return self
+     */
+    LogSwarmObjectCmd withStderr(Boolean stderr);
+
+    /**
+     * @param tail only return this number of log lines from the end of the logs.
+     * @return self
+     */
+    LogSwarmObjectCmd withTail(Integer tail);
+
+    /**
+     * @param since Only return logs since this time, as a UNIX timestamp
+     * @return self
+     */
+    LogSwarmObjectCmd withSince(Integer since);
+
+    /**
+     * @param details Show service context and extra details provided to logs.
+     * @return
+     */
+    LogSwarmObjectCmd withDetails(Boolean details);
+
+    @CheckForNull
+    String getId();
+
+    @CheckForNull
+    Integer getTail();
+
+    @CheckForNull
+    Boolean getFollow();
+
+    @CheckForNull
+    Boolean getTimestamps();
+
+    @CheckForNull
+    Boolean getStdout();
+
+    @CheckForNull
+    Boolean getStderr();
+
+    @CheckForNull
+    Integer getSince();
+
+    @CheckForNull
+    Boolean getDetails();
+
+    /**
+     * @throws com.github.dockerjava.api.exception.NotFoundException no such service
+     */
+    @Override
+    <T extends ResultCallback<Frame>> T exec(T resultCallback);
+
+    interface Exec extends DockerCmdAsyncExec<LogSwarmObjectCmd, Frame> {
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
index 3a6abcc3e..91347de2b 100644
--- a/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
@@ -41,6 +41,7 @@
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
+import com.github.dockerjava.api.command.LogSwarmObjectCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.command.PingCmd;
 import com.github.dockerjava.api.command.PullImageCmd;
@@ -133,6 +134,7 @@
 import com.github.dockerjava.core.exec.UpdateSwarmNodeCmdExec;
 import com.github.dockerjava.core.exec.VersionCmdExec;
 import com.github.dockerjava.core.exec.WaitContainerCmdExec;
+import com.github.dockerjava.core.exec.LogSwarmObjectExec;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -485,5 +487,10 @@ public ListTasksCmd.Exec listTasksCmdExec() {
         return new ListTasksCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public LogSwarmObjectCmd.Exec logSwarmObjectExec(String endpoint) {
+        return new LogSwarmObjectExec(getBaseResource(), getDockerClientConfig(), endpoint);
+    }
+
     protected abstract WebTarget getBaseResource();
 }
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index a040cac2a..edc634cb9 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -41,6 +41,7 @@
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
+import com.github.dockerjava.api.command.LogSwarmObjectCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.command.PingCmd;
 import com.github.dockerjava.api.command.PullImageCmd;
@@ -109,6 +110,7 @@
 import com.github.dockerjava.core.command.ListVolumesCmdImpl;
 import com.github.dockerjava.core.command.LoadImageCmdImpl;
 import com.github.dockerjava.core.command.LogContainerCmdImpl;
+import com.github.dockerjava.core.command.LogSwarmObjectImpl;
 import com.github.dockerjava.core.command.PauseContainerCmdImpl;
 import com.github.dockerjava.core.command.PingCmdImpl;
 import com.github.dockerjava.core.command.PullImageCmdImpl;
@@ -542,7 +544,8 @@ public ListSwarmNodesCmd listSwarmNodesCmd() {
         return new ListSwarmNodesCmdImpl(getDockerCmdExecFactory().listSwarmNodeCmdExec());
     }
 
-    @Override public ListServicesCmd listServicesCmd() {
+    @Override
+    public ListServicesCmd listServicesCmd() {
         return new ListServicesCmdImpl(getDockerCmdExecFactory().createListServicesCmdExec());
     }
 
@@ -566,6 +569,16 @@ public RemoveServiceCmd removeServiceCmd(String serviceId) {
         return new RemoveServiceCmdImpl(getDockerCmdExecFactory().createRemoveServiceCmdExec(), serviceId);
     }
 
+    @Override
+    public LogSwarmObjectCmd logServiceCmd(String serviceId) {
+        return new LogSwarmObjectImpl(getDockerCmdExecFactory().logSwarmObjectExec("services"), serviceId);
+    }
+
+    @Override
+    public LogSwarmObjectCmd logTaskCmd(String taskId) {
+        return new LogSwarmObjectImpl(getDockerCmdExecFactory().logSwarmObjectExec("tasks"), taskId);
+    }
+
     @Override
     public ListTasksCmd listTasksCmd() {
         return new ListTasksCmdImpl(getDockerCmdExecFactory().listTasksCmdExec());
diff --git a/src/main/java/com/github/dockerjava/core/command/LogSwarmObjectImpl.java b/src/main/java/com/github/dockerjava/core/command/LogSwarmObjectImpl.java
new file mode 100644
index 000000000..d775582fc
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/LogSwarmObjectImpl.java
@@ -0,0 +1,121 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.DockerCmdAsyncExec;
+import com.github.dockerjava.api.command.LogSwarmObjectCmd;
+import com.github.dockerjava.api.model.Frame;
+
+import javax.annotation.Nonnull;
+
+public class LogSwarmObjectImpl extends AbstrAsyncDockerCmd<LogSwarmObjectCmd, Frame> implements LogSwarmObjectCmd {
+    private String id;
+    private Boolean followStream;
+    private Boolean timestamps;
+    private Boolean stdout;
+    private Boolean stderr;
+    private Boolean tailAll;
+    private Boolean follow;
+    private Integer tail;
+    private Integer since;
+    private Boolean details;
+
+    public LogSwarmObjectImpl(DockerCmdAsyncExec<LogSwarmObjectCmd, Frame> execution, String id) {
+        super(execution);
+        this.id = id;
+    }
+
+    @Override
+    public LogSwarmObjectImpl withId(@Nonnull String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public Boolean getFollowStream() {
+        return followStream;
+    }
+
+    public LogSwarmObjectImpl withFollowStream(Boolean followStream) {
+        this.followStream = followStream;
+        return this;
+    }
+
+    public Boolean getTimestamps() {
+        return timestamps;
+    }
+
+    @Override
+    public LogSwarmObjectImpl withTimestamps(Boolean timestamps) {
+        this.timestamps = timestamps;
+        return this;
+    }
+
+    public Boolean getStdout() {
+        return stdout;
+    }
+
+    public LogSwarmObjectImpl withStdout(Boolean stdout) {
+        this.stdout = stdout;
+        return this;
+    }
+
+    public Boolean getStderr() {
+        return stderr;
+    }
+
+    public LogSwarmObjectImpl withStderr(Boolean stderr) {
+        this.stderr = stderr;
+        return this;
+    }
+
+    public Boolean getTailAll() {
+        return tailAll;
+    }
+
+    public LogSwarmObjectImpl withTailAll(Boolean tailAll) {
+        this.tailAll = tailAll;
+        return this;
+    }
+
+    public Integer getTail() {
+        return tail;
+    }
+
+    @Override
+    public LogSwarmObjectImpl withTail(Integer tail) {
+        this.tail = tail;
+        return this;
+    }
+
+    public Integer getSince() {
+        return since;
+    }
+
+    @Override
+    public LogSwarmObjectImpl withSince(Integer since) {
+        this.since = since;
+        return this;
+    }
+
+    public Boolean getFollow() {
+        return follow;
+    }
+
+    @Override
+    public LogSwarmObjectImpl withFollow(Boolean follow) {
+        this.follow = follow;
+        return this;
+    }
+
+    @Override
+    public LogSwarmObjectCmd withDetails(Boolean details) {
+        this.details = details;
+        return this;
+    }
+
+    public Boolean getDetails() {
+        return details;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/exec/LogSwarmObjectExec.java b/src/main/java/com/github/dockerjava/core/exec/LogSwarmObjectExec.java
new file mode 100644
index 000000000..e545ddbc1
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/exec/LogSwarmObjectExec.java
@@ -0,0 +1,48 @@
+package com.github.dockerjava.core.exec;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.LogSwarmObjectCmd;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.WebTarget;
+
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LogSwarmObjectExec extends AbstrAsyncDockerCmdExec<LogSwarmObjectCmd, Frame> implements
+        LogSwarmObjectCmd.Exec {
+    private String endpoint = "";
+    private static final Logger LOGGER = LoggerFactory.getLogger(LogSwarmObjectExec.class);
+
+    public LogSwarmObjectExec(com.github.dockerjava.core.WebTarget baseResource, DockerClientConfig dockerClientConfig, String endpoint) {
+        super(baseResource, dockerClientConfig);
+        this.endpoint = endpoint;
+    }
+
+    @Override
+    protected Void execute0(LogSwarmObjectCmd command, ResultCallback<Frame> resultCallback) {
+
+        WebTarget webTarget = getBaseResource().path("/" + endpoint + "/{id}/logs").resolveTemplate("id", command.getId());
+
+        if (command.getTail() != null) {
+            webTarget = webTarget.queryParam("tail", command.getTail());
+        } else {
+            webTarget = webTarget.queryParam("tail", "all");
+        }
+
+        if (command.getSince() != null) {
+            webTarget = webTarget.queryParam("since", command.getSince());
+        }
+
+        webTarget = booleanQueryParam(webTarget, "timestamps", command.getTimestamps());
+        webTarget = booleanQueryParam(webTarget, "stdout", command.getStdout());
+        webTarget = booleanQueryParam(webTarget, "stderr", command.getStderr());
+        webTarget = booleanQueryParam(webTarget, "follow", command.getFollow());
+
+        LOGGER.trace("GET: {}", webTarget);
+
+        webTarget.request().get(resultCallback);
+
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
index 01d634b6d..e7a484903 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -44,6 +44,7 @@
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
+import com.github.dockerjava.api.command.LogSwarmObjectCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.command.PingCmd;
 import com.github.dockerjava.api.command.PullImageCmd;
@@ -620,6 +621,11 @@ public RemoveServiceCmd.Exec createRemoveServiceCmdExec() {
         return new RemoveServiceCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public LogSwarmObjectCmd.Exec logSwarmObjectExec(String endpoint) {
+        return new LogSwarmObjectExec(getBaseResource(), getDockerClientConfig(), endpoint);
+    }
+
     //node
     @Override
     public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java b/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java
new file mode 100644
index 000000000..4f59893b2
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java
@@ -0,0 +1,50 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.LogSwarmObjectCmd;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.async.FrameStreamProcessor;
+import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
+import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+
+public class LogSwarmObjectExec extends AbstrAsyncDockerCmdExec<LogSwarmObjectCmd, Frame> implements
+        LogSwarmObjectCmd.Exec {
+
+    public LogSwarmObjectExec(WebTarget baseResource, DockerClientConfig dockerClientConfig, String endpoint) {
+        super(baseResource, dockerClientConfig);
+        this.endpoint = endpoint;
+    }
+
+    private String endpoint = "";
+    private static final Logger LOGGER = LoggerFactory.getLogger(LogSwarmObjectExec.class);
+
+    @Override
+    protected AbstractCallbackNotifier<Frame> callbackNotifier(LogSwarmObjectCmd command, ResultCallback<Frame> resultCallback) {
+
+        WebTarget webTarget = getBaseResource().path("/" + endpoint + "/{id}/logs").resolveTemplate("id", command.getId());
+
+        if (command.getTail() != null) {
+            webTarget = webTarget.queryParam("tail", command.getTail());
+        } else {
+            webTarget = webTarget.queryParam("tail", "all");
+        }
+
+        if (command.getSince() != null) {
+            webTarget = webTarget.queryParam("since", command.getSince());
+        }
+
+        webTarget = booleanQueryParam(webTarget, "timestamps", command.getTimestamps());
+        webTarget = booleanQueryParam(webTarget, "stdout", command.getStdout());
+        webTarget = booleanQueryParam(webTarget, "stderr", command.getStderr());
+        webTarget = booleanQueryParam(webTarget, "follow", command.getFollow());
+        webTarget = booleanQueryParam(webTarget, "details", command.getDetails());
+        LOGGER.trace("GET: {}", webTarget);
+
+        return new GETCallbackNotifier<Frame>(new FrameStreamProcessor(), resultCallback, webTarget.request());
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java b/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java
new file mode 100644
index 000000000..82a73406f
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java
@@ -0,0 +1,76 @@
+package com.github.dockerjava.cmd.swarm;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.LogSwarmObjectCmd;
+import com.github.dockerjava.api.model.ContainerSpec;
+import com.github.dockerjava.api.model.ServiceModeConfig;
+import com.github.dockerjava.api.model.ServiceReplicatedModeOptions;
+import com.github.dockerjava.api.model.ServiceRestartCondition;
+import com.github.dockerjava.api.model.ServiceRestartPolicy;
+import com.github.dockerjava.api.model.ServiceSpec;
+import com.github.dockerjava.api.model.SwarmSpec;
+import com.github.dockerjava.api.model.Task;
+import com.github.dockerjava.api.model.TaskSpec;
+import com.github.dockerjava.api.model.TaskState;
+import com.github.dockerjava.utils.LogContainerTestCallback;
+import org.junit.Test;
+import org.mockito.internal.matchers.Contains;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+public class LogSwarmObjectIT extends SwarmCmdIT {
+    @Test
+    public void testLogsCmd() throws InterruptedException, IOException {
+        String snippet = "hello world";
+        DockerClient docker1 = startDockerInDocker();
+        docker1.initializeSwarmCmd(new SwarmSpec()).exec();
+        TaskSpec taskSpec = new TaskSpec().withContainerSpec(
+                new ContainerSpec().withImage("busybox").withCommand(Arrays.asList("echo", snippet)))
+                .withRestartPolicy(new ServiceRestartPolicy().withCondition(ServiceRestartCondition.NONE));
+        ServiceSpec serviceSpec = new ServiceSpec()
+                .withMode(new ServiceModeConfig().withReplicated(new ServiceReplicatedModeOptions().withReplicas(1)))
+                .withTaskTemplate(taskSpec)
+                .withName("log-worker");
+        String serviceId = docker1.createServiceCmd(serviceSpec).exec().getId();
+        int since = (int) System.currentTimeMillis() / 1000;
+        //wait the service to end
+        List<Task> tasks = new ArrayList<>();
+        for (int i = 0; i < 10; i++) {
+            tasks = docker1.listTasksCmd().withServiceFilter(serviceId).withStateFilter(TaskState.SHUTDOWN).exec();
+            if (tasks.size() == 1) {
+                break;
+            } else {
+                TimeUnit.SECONDS.sleep(3);
+            }
+        }
+        assertThat(tasks.size(), is(1));
+        String taskId = tasks.get(0).getId();
+        //check service log
+        validateLog(docker1.logServiceCmd(serviceId).withStdout(true), snippet);
+        //check task log
+        validateLog(docker1.logTaskCmd(taskId).withStdout(true), snippet);
+        //check details/context
+        validateLog(docker1.logServiceCmd(serviceId).withStdout(true).withDetails(true), "com.docker.swarm.service.id=" + serviceId);
+        validateLog(docker1.logTaskCmd(taskId).withStdout(true).withDetails(true), "com.docker.swarm.service.id=" + serviceId);
+        //check since
+        validateLog(docker1.logServiceCmd(serviceId).withStdout(true).withSince(since), snippet);
+        validateLog(docker1.logTaskCmd(taskId).withStdout(true).withSince(since), snippet);
+        docker1.removeServiceCmd(serviceId).exec();
+    }
+
+    private void validateLog(LogSwarmObjectCmd logCmd, String messsage) throws InterruptedException, IOException {
+        LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
+        logCmd.exec(loggingCallback);
+        loggingCallback.awaitCompletion(5, TimeUnit.SECONDS);
+        assertThat(loggingCallback.toString(), new Contains(messsage));
+        loggingCallback.close();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
index 29035cf45..112a8e689 100644
--- a/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
@@ -37,7 +37,7 @@ public abstract class SwarmCmdIT extends CmdIT {
     private static final int MAX_CONNECT_ATTEMPTS = 5;
     private static final int CONNECT_ATTEMPT_INTERVAL = 200;
     private static final String DOCKER_IN_DOCKER_IMAGE_REPOSITORY = "docker";
-    private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "1.12-dind";
+    private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "17.12-dind";
 
     @Before
     public void beforeTest() throws Exception {
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index f78d7eaed..e2986ef69 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -46,6 +46,7 @@
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
+import com.github.dockerjava.api.command.LogSwarmObjectCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.command.PingCmd;
 import com.github.dockerjava.api.command.PullImageCmd;
@@ -494,6 +495,11 @@ public RemoveServiceCmd.Exec createRemoveServiceCmdExec() {
         return delegate.createRemoveServiceCmdExec();
     }
 
+    @Override
+    public LogSwarmObjectCmd.Exec logSwarmObjectExec(String endpoint) {
+        return delegate.logSwarmObjectExec(endpoint);
+    }
+
     // nodes
     @Override
     public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() {

From 0918e7950ffd660f4b766310d39d86527bb5f8e8 Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Fri, 9 Mar 2018 17:13:42 +0800
Subject: [PATCH 0796/1272] add missing label filter in v1.24 for
 ListServiceCmd

---
 .../api/command/ListServicesCmd.java          | 13 ++--
 .../core/command/ListServicesCmdImpl.java     | 14 +++--
 .../core/util/ServiceFiltersBuilder.java      |  1 +
 .../cmd/swarm/ListServicesCmdExecIT.java      | 60 +++++++++++++++++++
 .../cmd/swarm/ListTasksCmdExecIT.java         | 13 +++-
 5 files changed, 90 insertions(+), 11 deletions(-)
 create mode 100644 src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java

diff --git a/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java b/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java
index 1370e0ab9..a993b5579 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java
@@ -18,17 +18,20 @@ public interface ListServicesCmd extends SyncDockerCmd<List<Service>> {
     Map<String, List<String>> getFilters();
 
     /**
-     * @param ids
-     *            - Show only services with the given ids
+     * @param ids - Show only services with the given ids
      */
     ListServicesCmd withIdFilter(List<String> ids);
+
     /**
-     *
-     * @param names
-     *            - Show only services with the given names
+     * @param names - Show only services with the given names
      */
     ListServicesCmd withNameFilter(List<String> names);
 
+    /**
+     * @param labels - Show only services with the passed labels. Labels is a {@link Map} that contains label keys and values
+     */
+    ListServicesCmd withLabelFilter(Map<String, String> labels);
+
     interface Exec extends DockerCmdSyncExec<ListServicesCmd, List<Service>> {
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java
index 9e76f5306..c68a0f6d7 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java
@@ -2,7 +2,7 @@
 
 import com.github.dockerjava.api.command.ListServicesCmd;
 import com.github.dockerjava.api.model.Service;
-import com.github.dockerjava.core.util.ServiceFiltersBuilder;
+import com.github.dockerjava.core.util.FiltersBuilder;
 
 import java.util.List;
 import java.util.Map;
@@ -15,7 +15,7 @@
 public class ListServicesCmdImpl extends AbstrDockerCmd<ListServicesCmd, List<Service>> implements
         ListServicesCmd {
 
-    private ServiceFiltersBuilder filters = new ServiceFiltersBuilder();
+    private FiltersBuilder filters = new FiltersBuilder();
 
     public ListServicesCmdImpl(Exec exec) {
         super(exec);
@@ -29,15 +29,21 @@ public Map<String, List<String>> getFilters() {
     @Override
     public ListServicesCmd withIdFilter(List<String> ids) {
         checkNotNull(ids, "ids was not specified");
-        this.filters.withIds(ids);
+        this.filters.withFilter("id", ids);
         return this;
     }
 
     @Override
     public ListServicesCmd withNameFilter(List<String> names) {
         checkNotNull(names, "names was not specified");
-        this.filters.withNames(names);
+        this.filters.withFilter("name", names);
         return this;
     }
 
+    @Override
+    public ListServicesCmd withLabelFilter(Map<String, String> labels) {
+        checkNotNull(labels, "labels was not specified");
+        this.filters.withLabels(labels);
+        return this;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/util/ServiceFiltersBuilder.java b/src/main/java/com/github/dockerjava/core/util/ServiceFiltersBuilder.java
index 83d98a2cc..db52df73f 100644
--- a/src/main/java/com/github/dockerjava/core/util/ServiceFiltersBuilder.java
+++ b/src/main/java/com/github/dockerjava/core/util/ServiceFiltersBuilder.java
@@ -10,6 +10,7 @@
 /**
  * Representation of filters to service lists.
  */
+@Deprecated
 public class ServiceFiltersBuilder {
 
     private Map<String, List<String>> filters = new HashMap<>();
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java b/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
new file mode 100644
index 000000000..29e819074
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
@@ -0,0 +1,60 @@
+package com.github.dockerjava.cmd.swarm;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.CreateServiceResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.ContainerSpec;
+import com.github.dockerjava.api.model.Service;
+import com.github.dockerjava.api.model.ServiceModeConfig;
+import com.github.dockerjava.api.model.ServiceReplicatedModeOptions;
+import com.github.dockerjava.api.model.ServiceSpec;
+import com.github.dockerjava.api.model.SwarmSpec;
+import com.github.dockerjava.api.model.TaskSpec;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+
+public class ListServicesCmdExecIT extends SwarmCmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(CreateServiceCmdExecIT.class);
+    private static final String SERVICE_NAME = "inspect_service";
+    private static final String LABEL_KEY = "com.github.dockerjava.usage";
+    private static final String LABEL_VALUE = "test";
+
+    @Test
+    public void testListServices() throws DockerException {
+        DockerClient docker1 = startDockerInDocker();
+        docker1.initializeSwarmCmd(new SwarmSpec()).exec();
+        Map<String, String> serviceLabels = Collections.singletonMap(LABEL_KEY, LABEL_VALUE);
+        CreateServiceResponse response = docker1.createServiceCmd(new ServiceSpec()
+                .withLabels(serviceLabels)
+                .withName(SERVICE_NAME)
+                .withMode(new ServiceModeConfig().withReplicated(
+                        new ServiceReplicatedModeOptions()
+                                .withReplicas(1)
+                ))
+                .withTaskTemplate(new TaskSpec()
+                        .withContainerSpec(new ContainerSpec()
+                                .withImage(DEFAULT_IMAGE))))
+                .exec();
+        String serviceId = response.getId();
+        //filtering with service id
+        List<Service> services = docker1.listServicesCmd().withIdFilter(Collections.singletonList(serviceId)).exec();
+        assertThat(services, hasSize(1));
+        //filtering with service name
+        services = docker1.listServicesCmd().withNameFilter(Collections.singletonList(SERVICE_NAME)).exec();
+        assertThat(services, hasSize(1));
+        //filter labels
+        services = docker1.listServicesCmd().withLabelFilter(serviceLabels).exec();
+        assertThat(services, hasSize(1));
+        docker1.removeServiceCmd(SERVICE_NAME).exec();
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java b/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java
index dea82869a..228ccbac8 100644
--- a/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java
@@ -14,7 +14,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -24,6 +26,8 @@
 public class ListTasksCmdExecIT extends SwarmCmdIT {
     public static final Logger LOG = LoggerFactory.getLogger(CreateServiceCmdExecIT.class);
     private static final String SERVICE_NAME = "inspect_task";
+    private static final String TASK_LABEL_KEY = "com.github.dockerjava.usage";
+    private static final String TASK_LABEL_VALUE = "test";
 
     @Test
     public void testListTasks() throws DockerException {
@@ -31,7 +35,7 @@ public void testListTasks() throws DockerException {
                 .withListenAddr("127.0.0.1")
                 .withAdvertiseAddr("127.0.0.1")
                 .exec();
-
+        Map<String, String> taskLabels = Collections.singletonMap(TASK_LABEL_KEY, TASK_LABEL_VALUE);
         CreateServiceResponse response = dockerRule.getClient().createServiceCmd(new ServiceSpec()
                 .withName(SERVICE_NAME)
                 .withMode(new ServiceModeConfig().withReplicated(
@@ -40,7 +44,7 @@ public void testListTasks() throws DockerException {
                 ))
                 .withTaskTemplate(new TaskSpec()
                         .withContainerSpec(new ContainerSpec()
-                                .withImage(DEFAULT_IMAGE))))
+                                .withImage(DEFAULT_IMAGE))).withLabels(taskLabels))
                 .exec();
         String serviceId = response.getId();
         //filtering with service id
@@ -60,6 +64,11 @@ public void testListTasks() throws DockerException {
         //filtering with state
         tasks = dockerRule.getClient().listTasksCmd().withStateFilter(TaskState.RUNNING).exec();
         assertThat(tasks, hasSize(2));
+        //filter labels
+        tasks = dockerRule.getClient().listTasksCmd().withLabelFilter(taskLabels).exec();
+        assertThat(tasks, hasSize(2));
+        tasks = dockerRule.getClient().listTasksCmd().withLabelFilter(TASK_LABEL_KEY + "=" + TASK_LABEL_VALUE).exec();
+        assertThat(tasks, hasSize(2));
         dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec();
     }
 }

From 9a81d925901d3cf54b6ab754a27771d30242e8ec Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Mon, 12 Mar 2018 13:44:27 +0800
Subject: [PATCH 0797/1272] tarInputStream was changed during exec and rerun
 the method will throw client error: Only one of host resource or tar input
 stream should be defined to perform the copy, not both

---
 .../core/command/CopyArchiveToContainerCmdImpl.java  |  1 +
 .../dockerjava/cmd/CopyArchiveToContainerCmdIT.java  | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
index 63e91e88e..2eb5f5835 100644
--- a/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
@@ -143,6 +143,7 @@ public Void exec() throws NotFoundException {
             } catch (IOException e) {
                 throw new DockerClientException("Unable to read temp file " + toUpload.toFile().getAbsolutePath(), e);
             } finally {
+                this.tarInputStream = null;
                 // remove tmp docker-javaxxx.tar.gz
                 toUpload.toFile().delete();
             }
diff --git a/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
index ae2007e48..a061cc5cd 100644
--- a/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.cmd;
 
+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.core.command.WaitContainerResultCallback;
@@ -47,6 +48,17 @@ public void copyStreamToContainer() throws Exception {
         assertFileCopied(container);
     }
 
+    @Test
+    public void copyStreamToContainerTwice() throws Exception {
+        CreateContainerResponse container = prepareContainerForCopy("rerun");
+        CopyArchiveToContainerCmd copyArchiveToContainerCmd=dockerRule.getClient().copyArchiveToContainerCmd(container.getId())
+                .withHostResource("src/test/resources/testReadFile");
+        copyArchiveToContainerCmd.exec();
+        assertFileCopied(container);
+        //run again to make sure no DockerClientException
+        copyArchiveToContainerCmd.exec();
+    }
+
     private CreateContainerResponse prepareContainerForCopy(String method) {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
                 .withName("docker-java-itest-copyToContainer" + method + dockerRule.getKind())

From daa003003f46bfc6c99b93d4b79b1f7a0d57b389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Frantz=C3=A9n?= <bjorn.frantzen@r2m.se>
Date: Tue, 27 Mar 2018 11:41:20 +0200
Subject: [PATCH 0798/1272] Fix compilation error

---
 .../com/github/dockerjava/netty/NettyDockerCmdExecFactory.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index 1f1ef7c81..02fe33d7e 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -319,6 +319,7 @@ protected synchronized void channelIdle(ChannelHandlerContext ctx, IdleStateEven
             if (channel == null || !channel.isActive() || alreadyTimedOut) {
                 return;
             }
+            DockerClientConfig dockerClientConfig = getDockerClientConfig();
             final Object dockerAPIEndpoint = dockerClientConfig.getDockerHost();
             final String msg = "Read timed out: No data received within " + readTimeout
                     + "ms.  Perhaps the docker API (" + dockerAPIEndpoint

From ad09bb739285295c7f377b5e8739cd07bab6f80d Mon Sep 17 00:00:00 2001
From: wreulicke <saito.masaya@classmethod.jp>
Date: Thu, 29 Mar 2018 01:07:39 +0900
Subject: [PATCH 0799/1272] update jacoco

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 748a73304..95e5a04e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -531,7 +531,7 @@
 					<plugin>
 						<groupId>org.jacoco</groupId>
 						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>0.7.7.201606060606</version>
+						<version>0.8.1</version>
 						<executions>
 							<execution>
 								<goals>

From ae16bed2aa3c3c7641b3c00f35b1898dcb809f85 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 13 Apr 2018 03:07:48 +0300
Subject: [PATCH 0800/1272] [maven-release-plugin] prepare release 3.1.0-rc-2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 748a73304..bf629c305 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.0-SNAPSHOT</version>
+	<version>3.1.0-rc-2</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.1.0-rc-2</tag>
 	</scm>
 
 	<developers>

From 39564085d2da90328830f6697f2e219d28c012f6 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 13 Apr 2018 03:07:58 +0300
Subject: [PATCH 0801/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index bf629c305..748a73304 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.0-rc-2</version>
+	<version>3.1.0-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.1.0-rc-2</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 6936734026baccaeef10b8256a2830cb78a65c45 Mon Sep 17 00:00:00 2001
From: Matthieu Baechler <matthieu.baechler@gmail.com>
Date: Tue, 4 Jul 2017 17:05:37 -0400
Subject: [PATCH 0802/1272] export TmpFs configuration for HostConfig and
 DockerClient

---
 .../api/command/CreateContainerCmd.java       |  2 ++
 .../dockerjava/api/model/HostConfig.java      | 24 +++++++++++++++++++
 .../core/command/CreateContainerCmdImpl.java  |  7 ++++++
 .../dockerjava/cmd/CreateContainerCmdIT.java  | 15 ++++++++++++
 4 files changed, 48 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 34682a14f..3fa6fa315 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -429,6 +429,8 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     CreateContainerCmd withTty(Boolean tty);
 
+    CreateContainerCmd withTmpFs(Map<String, String> tmpFs);
+
     CreateContainerCmd withUlimits(Ulimit... ulimits);
 
     CreateContainerCmd withUlimits(List<Ulimit> ulimits);
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 4d3275069..843739309 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -14,6 +14,7 @@
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Used in `/containers/create`, and in inspect container.
@@ -206,6 +207,12 @@ public class HostConfig implements Serializable {
     @JsonProperty("Runtime")
     private String runtime;
 
+    /**
+     * @since ~{@link RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("Tmpfs")
+    private Map<String, String> tmpFs;
+
     @JsonIgnore
     public Bind[] getBinds() {
         return (binds == null) ? new Bind[0] : binds.getBinds();
@@ -434,6 +441,14 @@ public Long getPidsLimit() {
         return pidsLimit;
     }
 
+    /**
+     * @see #tmpFs
+     */
+    @CheckForNull
+    public Map<String, String> getTmpFs() {
+        return tmpFs;
+    }
+
     /**
      * Parse the network mode as specified at
      * {@see https://github.com/docker/engine-api/blob/master/types/container/hostconfig_unix.go}
@@ -830,6 +845,15 @@ public HostConfig withRuntime(String runtime) {
         this.runtime = runtime;
         return this;
     }
+
+    /**
+     * @see #tmpFs
+     */
+    public HostConfig withTmpFs(Map<String, String> tmpFs) {
+        this.tmpFs = tmpFs;
+        return this;
+    }
+
     // end of auto-generated
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 54e41b2fd..0b2593475 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -920,6 +920,13 @@ public CreateContainerCmd withStdinOpen(Boolean stdinOpen) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withTmpFs(Map<String, String> tmpFs) {
+        checkNotNull(tmpFs, "no tmpFs was specified");
+        this.hostConfig.withTmpFs(tmpFs);
+        return this;
+    }
+
     @Override
     public CreateContainerCmd withTty(Boolean tty) {
         checkNotNull(tty, "no tty was specified");
diff --git a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index 51f003a75..6bb0ea03b 100644
--- a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -40,6 +40,7 @@
 import java.io.File;
 import java.security.SecureRandom;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -866,4 +867,18 @@ public void createContainerFromPrivateRegistryWithNoAuth() throws Exception {
                 .exec();
     }
 
+    @Test
+    public void createContainerWithTmpFs() throws DockerException {
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999")
+                .withTmpFs(Collections.singletonMap("/tmp", "rw,noexec,nosuid,size=50m")).exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getHostConfig().getTmpFs().keySet(), contains("/tmp"));
+    }
 }

From 75f5e173b05d3e331c62099a761f212b6af87007 Mon Sep 17 00:00:00 2001
From: Matthieu Baechler <matthieu.baechler@gmail.com>
Date: Tue, 4 Jul 2017 18:20:56 -0400
Subject: [PATCH 0803/1272] fixup! export TmpFs configuration for HostConfig
 and DockerClient

---
 .../github/dockerjava/api/command/CreateContainerCmd.java  | 2 --
 .../dockerjava/core/command/CreateContainerCmdImpl.java    | 7 -------
 .../com/github/dockerjava/cmd/CreateContainerCmdIT.java    | 2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 3fa6fa315..34682a14f 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -429,8 +429,6 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     CreateContainerCmd withTty(Boolean tty);
 
-    CreateContainerCmd withTmpFs(Map<String, String> tmpFs);
-
     CreateContainerCmd withUlimits(Ulimit... ulimits);
 
     CreateContainerCmd withUlimits(List<Ulimit> ulimits);
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 0b2593475..54e41b2fd 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -920,13 +920,6 @@ public CreateContainerCmd withStdinOpen(Boolean stdinOpen) {
         return this;
     }
 
-    @Override
-    public CreateContainerCmd withTmpFs(Map<String, String> tmpFs) {
-        checkNotNull(tmpFs, "no tmpFs was specified");
-        this.hostConfig.withTmpFs(tmpFs);
-        return this;
-    }
-
     @Override
     public CreateContainerCmd withTty(Boolean tty) {
         checkNotNull(tty, "no tty was specified");
diff --git a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index 6bb0ea03b..14f5c7418 100644
--- a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -871,7 +871,7 @@ public void createContainerFromPrivateRegistryWithNoAuth() throws Exception {
     public void createContainerWithTmpFs() throws DockerException {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999")
-                .withTmpFs(Collections.singletonMap("/tmp", "rw,noexec,nosuid,size=50m")).exec();
+                .withHostConfig(new HostConfig().withTmpFs(Collections.singletonMap("/tmp", "rw,noexec,nosuid,size=50m"))).exec();
 
         LOG.info("Created container {}", container.toString());
 

From 84eaebc4747ba9bbaa5439bb7e2aca033e07e850 Mon Sep 17 00:00:00 2001
From: fb <fb@baqend.com>
Date: Tue, 17 Apr 2018 15:56:41 +0200
Subject: [PATCH 0804/1272] Improve test case

---
 .../com/github/dockerjava/cmd/CreateContainerCmdIT.java     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index 14f5c7418..070498a4f 100644
--- a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -869,16 +869,12 @@ public void createContainerFromPrivateRegistryWithNoAuth() throws Exception {
 
     @Test
     public void createContainerWithTmpFs() throws DockerException {
-
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999")
                 .withHostConfig(new HostConfig().withTmpFs(Collections.singletonMap("/tmp", "rw,noexec,nosuid,size=50m"))).exec();
 
-        LOG.info("Created container {}", container.toString());
-
         assertThat(container.getId(), not(isEmptyString()));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
-
-        assertThat(inspectContainerResponse.getHostConfig().getTmpFs().keySet(), contains("/tmp"));
+        assertThat(inspectContainerResponse.getHostConfig().getTmpFs().get("/tmp"), equalTo("rw,noexec,nosuid,size=50m"));
     }
 }

From 56b54a098989afad2d246527e5048c4ed2bcf780 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 27 Apr 2018 01:52:30 +0300
Subject: [PATCH 0805/1272] [maven-release-plugin] prepare release 3.1.0-rc-3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 95e5a04e4..3f792cc65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.0-SNAPSHOT</version>
+	<version>3.1.0-rc-3</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.1.0-rc-3</tag>
 	</scm>
 
 	<developers>

From 1bbc59afd753d0a6a0f9f12aa5eb05c8a52cd499 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 27 Apr 2018 01:52:40 +0300
Subject: [PATCH 0806/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3f792cc65..95e5a04e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.0-rc-3</version>
+	<version>3.1.0-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.1.0-rc-3</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 8938e07e41c3087fb28b88fe9b5ec7d30712bd0f Mon Sep 17 00:00:00 2001
From: Heng WU <wuheng@otcaix.iscas.ac.cn>
Date: Wed, 9 May 2018 00:14:25 +0800
Subject: [PATCH 0807/1272] fix a Java.lang.NullPointerException

---
 .../dockerjava/core/command/UpdateContainerCmdImpl.java       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
index b8915a802..2ca771767 100644
--- a/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
@@ -55,10 +55,6 @@ public class UpdateContainerCmdImpl extends AbstrDockerCmd<UpdateContainerCmd, U
     @JsonProperty("KernelMemory")
     private Long kernelMemory;
 
-    public UpdateContainerCmdImpl() {
-        super(null);
-    }
-
     public UpdateContainerCmdImpl(UpdateContainerCmd.Exec exec, String containerId) {
         super(exec);
         withContainerId(containerId);

From 3a29844bd54e83b794adb2216ad13af55af53aab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricard=20N=C3=A0cher=20Roig?= <ricard.nacher.roig@gmail.com>
Date: Sun, 13 May 2018 12:56:43 +0200
Subject: [PATCH 0808/1272] configure JerseyDockerCmdExecFactory to avoid
 chunked encoding (default of ApacheConnector) (#1033)

* ApacheConnector used by JerseyDockerCmdExecFactory can be configured
also with sendinng content-length and avoid using chuncked encoding.

* apply comment done by KostyaSha about unification of methods regarding
setting RequestEntityProcessing.
---
 .../dockerjava/jaxrs/JerseyDockerCmdExecFactory.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
index 01d634b6d..0601871c7 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -87,6 +87,7 @@
 import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
+import org.glassfish.jersey.client.RequestEntityProcessing;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -136,6 +137,8 @@ public class JerseyDockerCmdExecFactory implements DockerCmdExecFactory {
 
     private PoolingHttpClientConnectionManager connManager = null;
 
+    private RequestEntityProcessing requestEntityProcessing;
+
     @Override
     public void init(DockerClientConfig dockerClientConfig) {
         checkNotNull(dockerClientConfig, "config was not specified");
@@ -145,6 +148,9 @@ public void init(DockerClientConfig dockerClientConfig) {
         clientConfig.connectorProvider(new ApacheConnectorProvider());
         clientConfig.property(CommonProperties.FEATURE_AUTO_DISCOVERY_DISABLE, true);
 
+        if (requestEntityProcessing != null) {
+            clientConfig.property(ClientProperties.REQUEST_ENTITY_PROCESSING, requestEntityProcessing);
+        }
         clientConfig.register(ResponseStatusExceptionFilter.class);
         clientConfig.register(JsonClientFilter.class);
         clientConfig.register(JacksonJsonProvider.class);
@@ -688,6 +694,10 @@ public JerseyDockerCmdExecFactory withClientRequestFilters(ClientRequestFilter..
         return this;
     }
 
+    public JerseyDockerCmdExecFactory withRequestEntityProcessing(RequestEntityProcessing requestEntityProcessing) {
+        this.requestEntityProcessing = requestEntityProcessing;
+        return this;
+    }
 
     /**
      * release connections from the pool

From 1d8e634a133c2f66a9ad5dbeb08bb5408b3229f5 Mon Sep 17 00:00:00 2001
From: henry <wuheng09@otcaix.iscas.ac.cn>
Date: Mon, 14 May 2018 12:29:00 +0800
Subject: [PATCH 0809/1272] remove duplicate checks

---
 .../github/dockerjava/core/command/CreateContainerCmdImpl.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 54e41b2fd..f7e2fc410 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -132,7 +132,6 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
 
     public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, AuthConfig authConfig, String image) {
         super(exec);
-        checkNotNull(image, "image was not specified");
         withAuthConfig(authConfig);
         withImage(image);
     }

From 3d5aa4de784d99e0fcba729533e8e0a89a80d2dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Kj=C3=A4ll?= <alexander.kjall@gmail.com>
Date: Wed, 16 May 2018 19:25:27 +0200
Subject: [PATCH 0810/1272] avoid warnings like 'An illegal reflective access
 operation has occurred' in netty

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 95e5a04e4..1ce397fe7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
 
 		<!-- test dependencies -->
 		<logback.version>1.2.3</logback.version>
-		<netty.version>4.1.14.Final</netty.version>
+		<netty.version>4.1.25.Final</netty.version>
 		<hamcrest.library.version>1.3</hamcrest.library.version>
 		<hamcrest.jpa-matchers>1.8</hamcrest.jpa-matchers>
 		<lambdaj.version>2.3.3</lambdaj.version>

From 6fbcc6722e3bf34370e8fd505bd2fca5037a3aad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szab=C3=B3=20Barnab=C3=A1s?= <Barnabas.Szabo@loxon.eu>
Date: Tue, 22 May 2018 16:45:16 +0200
Subject: [PATCH 0811/1272] Add new Task State

---
 .../java/com/github/dockerjava/api/model/TaskState.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/TaskState.java b/src/main/java/com/github/dockerjava/api/model/TaskState.java
index 8cac62747..e0bf84f81 100644
--- a/src/main/java/com/github/dockerjava/api/model/TaskState.java
+++ b/src/main/java/com/github/dockerjava/api/model/TaskState.java
@@ -33,7 +33,11 @@ public enum TaskState {
 
     FAILED("failed"),
 
-    REJECTED("rejected");
+    REJECTED("rejected"),
+
+    REMOVE("remove"),
+
+    ORPHANED("orphaned");
 
     private String value;
 

From 32220487c9f6fc54dceb152e774d3d09f5548943 Mon Sep 17 00:00:00 2001
From: "Prunier, Dominique" <dominique.prunier@emc.com>
Date: Wed, 23 May 2018 14:38:10 -0400
Subject: [PATCH 0812/1272] use path from the configured docker host instead of
 hardcoded "/var/run/docker.sock" in netty factory (#1040)

---
 .../github/dockerjava/netty/NettyDockerCmdExecFactory.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index 02fe33d7e..745105417 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -176,7 +176,10 @@ protected void initChannel(final KQueueDomainSocketChannel channel) throws Excep
 
         @Override
         public DuplexChannel connect(Bootstrap bootstrap) throws InterruptedException {
-            return (DuplexChannel) bootstrap.connect(new DomainSocketAddress("/var/run/docker.sock")).sync().channel();
+            DockerClientConfig dockerClientConfig = getDockerClientConfig();
+            String path = dockerClientConfig.getDockerHost().getPath();
+
+            return (DuplexChannel) bootstrap.connect(new DomainSocketAddress(path)).sync().channel();
         }
     }
 

From b1061c26b49305a965cd456f8e0e31e59d4ca14b Mon Sep 17 00:00:00 2001
From: Ted Xiao <xiao.xj@gmail.com>
Date: Thu, 24 May 2018 15:29:16 +0800
Subject: [PATCH 0813/1272] follow symbolic links when walking dir, ref:
 https://docs.oracle.com/javase/tutorial/essential/io/walk.html

---
 .../core/util/CompressArchiveUtil.java        |  5 +-
 .../dockerjava/core/util/TarDirWalker.java    |  5 +-
 .../core/CompressArchiveUtilTest.java         | 60 ++++++++++++++++---
 3 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
index 2e75bcc41..97471d7fe 100644
--- a/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
+++ b/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.core.util;
 
 import static com.github.dockerjava.core.util.FilePathUtil.relativize;
+import static java.nio.file.FileVisitOption.FOLLOW_LINKS;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -12,6 +13,7 @@
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.EnumSet;
 import java.util.zip.GZIPOutputStream;
 
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
@@ -78,7 +80,8 @@ public static void tar(Path inputPath, Path outputPath, boolean gZipped, boolean
                     // In order to have the dossier as the root entry
                     sourcePath = inputPath.getParent();
                 }
-                Files.walkFileTree(inputPath, new TarDirWalker(sourcePath, tarArchiveOutputStream));
+                Files.walkFileTree(inputPath, EnumSet.of(FOLLOW_LINKS), Integer.MAX_VALUE,
+                        new TarDirWalker(sourcePath, tarArchiveOutputStream));
             }
             tarArchiveOutputStream.flush();
         }
diff --git a/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java b/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
index bbe834ee6..ec390611d 100644
--- a/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
+++ b/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
@@ -33,9 +33,12 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) th
 
     @Override
     public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+        if (attrs.isSymbolicLink()) { // symbolic link to folder
+            return FileVisitResult.CONTINUE;
+        }
         TarArchiveEntry tarEntry = new TarArchiveEntry(FilePathUtil.relativize(basePath, file));
         if (file.toFile().canExecute()) {
-                tarEntry.setMode(tarEntry.getMode() | 0755);
+            tarEntry.setMode(tarEntry.getMode() | 0755);
         }
         CompressArchiveUtil.putTarEntry(tarArchiveOutputStream, tarEntry, file);
         return FileVisitResult.CONTINUE;
diff --git a/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java b/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
index fbf319e3c..f5f2f92e3 100644
--- a/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
+++ b/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
@@ -12,10 +12,11 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.zip.GZIPInputStream;
 
 import static java.util.Arrays.asList;
-import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
@@ -26,9 +27,11 @@ public void testExecutableFlagIsPreserved() throws Exception {
         File executableFile = createExecutableFile();
         File archive = CompressArchiveUtil.archiveTARFiles(executableFile.getParentFile(), asList(executableFile),
                 "archive");
-        File expectedFile = extractFileByName(archive, "executableFile.sh.result");
+        File expectedFile = extractFileByName(archive, "executableFile.sh", "executableFile.sh.result");
 
         assertThat("should be executable", expectedFile.canExecute());
+        expectedFile.delete();
+        archive.delete();
     }
 
     private File createExecutableFile() throws IOException {
@@ -40,25 +43,64 @@ private File createExecutableFile() throws IOException {
         return executableFile;
     }
 
-    private File extractFileByName(File archive, String filenameToExtract) throws IOException {
+    private File extractFileByName(File archive, String filenameToExtract, String outputName) throws IOException {
         File baseDir = new File(FileUtils.getTempDirectoryPath());
-        File expectedFile = new File(baseDir, filenameToExtract);
+        File expectedFile = new File(baseDir, outputName);
         expectedFile.delete();
         assertThat(expectedFile.exists(), is(false));
 
         TarArchiveInputStream tarArchiveInputStream = new TarArchiveInputStream(new GZIPInputStream(
                 new BufferedInputStream(new FileInputStream(archive))));
         TarArchiveEntry entry;
+        boolean found = false;
         while ((entry = tarArchiveInputStream.getNextTarEntry()) != null) {
             String individualFiles = entry.getName();
-            // there should be only one file in this archive
-            assertThat(individualFiles, equalTo("executableFile.sh"));
-            IOUtils.copy(tarArchiveInputStream, new FileOutputStream(expectedFile));
-            if ((entry.getMode() & 0755) == 0755) {
-                expectedFile.setExecutable(true);
+            if (individualFiles.equals(filenameToExtract) || individualFiles.endsWith("/" + filenameToExtract)) {
+                found = true;
+                IOUtils.copy(tarArchiveInputStream, new FileOutputStream(expectedFile));
+                if ((entry.getMode() & 0755) == 0755) {
+                    expectedFile.setExecutable(true);
+                }
+                break;
             }
         }
+        assertThat("should extracted the file", found);
         tarArchiveInputStream.close();
         return expectedFile;
     }
+
+    @Test
+    public void testSymbolicLinkDir() throws IOException {
+        Path uploadDir = Files.createTempDirectory("upload");
+        Path linkTarget = Files.createTempDirectory("ink-target");
+        Path tmpFile = Files.createTempFile(linkTarget, "link-dir", "rand");
+        Files.createSymbolicLink(uploadDir.resolve("link-folder"), linkTarget);
+        Path tarGzFile = Files.createTempFile("docker-java", ".tar.gz");
+        //follow link only works for childrenOnly=false
+        CompressArchiveUtil.tar(uploadDir, tarGzFile, true, false);
+        File expectedFile = extractFileByName(tarGzFile.toFile(), tmpFile.toFile().getName(), "foo1");
+        assertThat(expectedFile.canRead(), is(true));
+        uploadDir.toFile().delete();
+        linkTarget.toFile().delete();
+        tarGzFile.toFile().delete();
+    }
+
+    @Test
+    public void testSymbolicLinkFile() throws IOException {
+        Path uploadDir = Files.createTempDirectory("upload");
+        Path tmpFile = Files.createTempFile("src", "");
+        Files.createSymbolicLink(uploadDir.resolve("link-file"), tmpFile);
+        Path tarGzFile = Files.createTempFile("docker-java", ".tar.gz");
+        boolean childrenOnly = false;
+        CompressArchiveUtil.tar(uploadDir, tarGzFile, true, childrenOnly);
+        File expectedFile = extractFileByName(tarGzFile.toFile(), "link-file", "foo1");
+        assertThat(expectedFile.canRead(), is(true));
+        childrenOnly = true;
+        CompressArchiveUtil.tar(uploadDir, tarGzFile, true, childrenOnly);
+        extractFileByName(tarGzFile.toFile(), "link-file", "foo1");
+        assertThat(expectedFile.canRead(), is(true));
+        uploadDir.toFile().delete();
+        tmpFile.toFile().delete();
+        tarGzFile.toFile().delete();
+    }
 }

From c0dd1acd36fb3c96bb544a8dd40c0b41b38f0e68 Mon Sep 17 00:00:00 2001
From: Maxim Kolesnikov <xCASx@users.noreply.github.com>
Date: Tue, 12 Jun 2018 22:30:21 +0200
Subject: [PATCH 0814/1272] Fixed a typo in the exception message

---
 .../com/github/dockerjava/netty/NettyDockerCmdExecFactory.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index 745105417..63d841cf6 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -137,7 +137,7 @@ public EventLoopGroup init(Bootstrap bootstrap, DockerClientConfig dockerClientC
             } else if (SystemUtils.IS_OS_MAC_OSX) {
                 return kqueueGroup();
             }
-            throw new RuntimeException("Unspported OS");
+            throw new RuntimeException("Unsupported OS");
         }
 
         public EventLoopGroup epollGroup() {

From 0f4647d0cea48026f057ef2333ed46563ea000e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricard=20N=C3=A0cher=20Roig?= <ricard.nacher.roig@gmail.com>
Date: Wed, 13 Jun 2018 00:11:31 +0200
Subject: [PATCH 0815/1272] Add AutoRemove to HostConfig (#1050)

* Add AutoRemove to HostConfig

* fix check-style issues

* remove getAutoRemove method.

* Removed methods to set AutoRemove in CreateContainerCmd

* reverted changes on CreateContainerCmdImpl

* removed extra line
---
 .../dockerjava/api/model/HostConfig.java      | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 843739309..d2e0f5477 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -141,6 +141,12 @@ public class HostConfig implements Serializable {
     @JsonProperty("OomKillDisable")
     private Boolean oomKillDisable;
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_25}
+     */
+    @JsonProperty("AutoRemove")
+    private Boolean autoRemove;
+
     /**
      * @since {@link RemoteApiVersion#VERSION_1_22}
      */
@@ -400,6 +406,13 @@ public Integer getMemorySwappiness() {
     public Boolean getOomKillDisable() {
         return oomKillDisable;
     }
+    /**
+     * @see #autoRemove
+     */
+    @CheckForNull
+    public Boolean getAutoRemove() {
+      return autoRemove;
+    }
 
     /**
      * @see #securityOpts
@@ -712,6 +725,13 @@ public HostConfig withOomKillDisable(Boolean oomKillDisable) {
         this.oomKillDisable = oomKillDisable;
         return this;
     }
+    /**
+     * @see #autoRemove
+     */
+    public HostConfig withAutoRemove(Boolean autoRemove) {
+      this.autoRemove = autoRemove;
+      return this;
+    }
 
     /**
      * @see #oomScoreAdj

From 3b4867e82dee27b2d8e36fc8774edca4776b8a4e Mon Sep 17 00:00:00 2001
From: Silvestre Zabala <silvestre.zabala@sap.com>
Date: Wed, 13 Jun 2018 11:00:30 +0200
Subject: [PATCH 0816/1272] Add DiskQuota to HostConfig

The DiskQuota field in HostConfig first appears in the Docker API v1.25
but is not explicitely listed as API change in
https://docs.docker.com/engine/api/version-history/#v125-api-changes
---
 .../dockerjava/api/model/HostConfig.java       | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 843739309..eba0c6f74 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -99,6 +99,12 @@ public class HostConfig implements Serializable {
     @JsonProperty("Devices")
     private Device[] devices;
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_25}
+     */
+    @JsonProperty("DiskQuota")
+    private Long diskQuota;
+
     @JsonProperty("Dns")
     private String[] dns;
 
@@ -254,6 +260,10 @@ public Device[] getDevices() {
         return devices;
     }
 
+    public Long getDiskQuota() {
+        return diskQuota;
+    }
+
     public String[] getDns() {
         return dns;
     }
@@ -609,6 +619,14 @@ public HostConfig withDevices(Device[] devices) {
         return this;
     }
 
+    /**
+     * @see #diskQuota
+     */
+    public HostConfig withDiskQuota(Long diskQuota) {
+        this.diskQuota = diskQuota;
+        return this;
+    }
+
     /**
      * @see #dns
      */

From fa6d7e7524489812141cc2d579d9c21429e41de1 Mon Sep 17 00:00:00 2001
From: Silvestre Zabala <silvestre.zabala@sap.com>
Date: Tue, 19 Jun 2018 17:16:42 +0200
Subject: [PATCH 0817/1272] Add "Pid" field to InspectExecResponse
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

| GET /exec/(id)/json now returns Pid, which is the system pid for the
| exec’d process.
https://docs.docker.com/engine/api/version-history/#v125-api-changes
---
 .../api/command/InspectExecResponse.java           | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
index 2833a5ade..0058d3e1e 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
@@ -59,6 +59,12 @@ public class InspectExecResponse {
     @JsonProperty("DetachKeys")
     private String detachKeys;
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_25}
+     */
+    @JsonProperty("Pid")
+    private Integer pid;
+
     public String getId() {
         return id;
     }
@@ -119,6 +125,14 @@ public String getDetachKeys() {
         return detachKeys;
     }
 
+    /**
+     * @see #pid
+     */
+    @CheckForNull
+    public Integer getPid() {
+        return pid;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);

From 224503c39c4bb006d9825d332b1bfbe505873111 Mon Sep 17 00:00:00 2001
From: Anthony Baire <Anthony.Baire@irisa.fr>
Date: Mon, 18 Jun 2018 01:23:45 +0200
Subject: [PATCH 0818/1272] add a Host header in all HTTP requests

The Host header is mandatory in HTTP/1.1

see also:
  https://tools.ietf.org/html/rfc2616#section-14.23
  https://issues.jenkins-ci.org/browse/JENKINS-48912
---
 .../netty/NettyDockerCmdExecFactory.java      |  6 +++++-
 .../dockerjava/netty/NettyWebTarget.java      | 19 ++++++++++++-------
 .../dockerjava/netty/NettyWebTargetTest.java  |  8 ++++----
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index 745105417..88637f66c 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -99,16 +99,20 @@ public void init(DockerClientConfig dockerClientConfig) {
         bootstrap = new Bootstrap();
 
         String scheme = dockerClientConfig.getDockerHost().getScheme();
+        String host = "";
 
         if ("unix".equals(scheme)) {
             nettyInitializer = new UnixDomainSocketInitializer();
+            host = "DUMMY";
         } else if ("tcp".equals(scheme)) {
             nettyInitializer = new InetSocketInitializer();
+            host = dockerClientConfig.getDockerHost().getHost() + ":"
+                + Integer.toString(dockerClientConfig.getDockerHost().getPort());
         }
 
         eventLoopGroup = nettyInitializer.init(bootstrap, dockerClientConfig);
 
-        baseResource = new NettyWebTarget(channelProvider).path(dockerClientConfig.getApiVersion().asWebPathPart());
+        baseResource = new NettyWebTarget(channelProvider, host).path(dockerClientConfig.getApiVersion().asWebPathPart());
     }
 
     private DuplexChannel connect() {
diff --git a/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java b/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
index f172f10fa..51f50f371 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
@@ -31,6 +31,8 @@ public class NettyWebTarget implements WebTarget {
 
     private final ChannelProvider channelProvider;
 
+    private final String host;
+
     private final ImmutableList<String> path;
 
     private final ImmutableMap<String, String> queryParams;
@@ -42,16 +44,18 @@ public class NettyWebTarget implements WebTarget {
 
     private static final String PATH_SEPARATOR = "/";
 
-    public NettyWebTarget(ChannelProvider channelProvider) {
-        this(channelProvider, ImmutableList.<String>of(), ImmutableMap.<String, String>of(),
+    public NettyWebTarget(ChannelProvider channelProvider, String host) {
+        this(channelProvider, host, ImmutableList.<String>of(), ImmutableMap.<String, String>of(),
                 ImmutableMap.<String, Set<String>>of());
     }
 
     private NettyWebTarget(ChannelProvider channelProvider,
+                      String host,
                       ImmutableList<String> path,
                       ImmutableMap<String, String> queryParams,
                       ImmutableMap<String, Set<String>> queryParamsSet) {
         this.channelProvider = channelProvider;
+        this.host = host;
         this.path = path;
         this.queryParams = queryParams;
         this.queryParamsSet = queryParamsSet;
@@ -64,7 +68,7 @@ public NettyWebTarget path(String... components) {
             newPath.addAll(Arrays.asList(StringUtils.split(component, PATH_SEPARATOR)));
         }
 
-        return new NettyWebTarget(channelProvider, newPath.build(), queryParams, queryParamsSet);
+        return new NettyWebTarget(channelProvider, host, newPath.build(), queryParams, queryParamsSet);
     }
 
     public NettyInvocationBuilder request() {
@@ -85,7 +89,8 @@ public NettyInvocationBuilder request() {
             resource = resource + "?" + StringUtils.join(params, "&");
         }
 
-        return new NettyInvocationBuilder(channelProvider, resource);
+        return new NettyInvocationBuilder(channelProvider, resource)
+            .header("Host", host);
     }
 
     /**
@@ -106,7 +111,7 @@ public NettyWebTarget resolveTemplate(String name, Object value) {
             component = component.replaceAll("\\{" + name + "\\}", value.toString());
             newPath.add(component);
         }
-        return new NettyWebTarget(channelProvider, newPath.build(), queryParams, queryParamsSet);
+        return new NettyWebTarget(channelProvider, host, newPath.build(), queryParams, queryParamsSet);
     }
 
     public NettyWebTarget queryParam(String name, Object value) {
@@ -114,7 +119,7 @@ public NettyWebTarget queryParam(String name, Object value) {
         if (value != null) {
             builder.put(name, value.toString());
         }
-        return new NettyWebTarget(channelProvider, path, builder.build(), queryParamsSet);
+        return new NettyWebTarget(channelProvider, host, path, builder.build(), queryParamsSet);
     }
 
     public NettyWebTarget queryParamsSet(String name, Set<?> values) {
@@ -126,7 +131,7 @@ public NettyWebTarget queryParamsSet(String name, Set<?> values) {
             }
             builder.put(name, valueBuilder.build());
         }
-        return new NettyWebTarget(channelProvider, path, queryParams, builder.build());
+        return new NettyWebTarget(channelProvider, host, path, queryParams, builder.build());
     }
 
     public NettyWebTarget queryParamsJsonMap(String name, Map<String, String> values) {
diff --git a/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java b/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java
index 822eef49c..432878f9c 100644
--- a/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java
+++ b/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java
@@ -22,7 +22,7 @@ public void setUp() throws Exception {
 
     @Test
     public void verifyImmutability() throws Exception {
-        NettyWebTarget emptyWebTarget = new NettyWebTarget(channelProvider);
+        NettyWebTarget emptyWebTarget = new NettyWebTarget(channelProvider, "DUMMY");
 
         NettyWebTarget initWebTarget = emptyWebTarget.path("/containers/{id}/attach").resolveTemplate("id", "d03da378b592")
                 .queryParam("logs", "true");
@@ -30,12 +30,12 @@ public void verifyImmutability() throws Exception {
         NettyWebTarget anotherWebTarget = emptyWebTarget.path("/containers/{id}/attach")
                 .resolveTemplate("id", "2cfada4e3c07").queryParam("stdin", "true");
 
-        assertEquals(new NettyWebTarget(channelProvider), emptyWebTarget);
+        assertEquals(new NettyWebTarget(channelProvider, "DUMMY"), emptyWebTarget);
 
-        assertEquals(new NettyWebTarget(channelProvider).path("/containers/d03da378b592/attach")
+        assertEquals(new NettyWebTarget(channelProvider, "DUMMY").path("/containers/d03da378b592/attach")
                 .queryParam("logs", "true"), initWebTarget);
 
-        assertEquals(new NettyWebTarget(channelProvider).path("/containers/2cfada4e3c07/attach")
+        assertEquals(new NettyWebTarget(channelProvider, "DUMMY").path("/containers/2cfada4e3c07/attach")
                 .queryParam("stdin", "true"), anotherWebTarget);
     }
 }

From 41eab7f40bbfb86833c193c432ef610d960ab11f Mon Sep 17 00:00:00 2001
From: Timothy Lusk <tlusk@carbonblack.com>
Date: Tue, 26 Jun 2018 12:05:03 -0400
Subject: [PATCH 0819/1272] Support network mode as part of the docker build

This exposes the `networkmode` query parameter that was added to be
specified as part of the image build in the Docker API 1.25.
---
 .../dockerjava/api/command/BuildImageCmd.java       | 11 +++++++++++
 .../dockerjava/core/command/BuildImageCmdImpl.java  | 13 +++++++++++++
 .../dockerjava/core/exec/BuildImageCmdExec.java     |  4 ++++
 .../github/dockerjava/jaxrs/BuildImageCmdExec.java  |  4 ++++
 4 files changed, 32 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 59a0d2077..9cf3296ce 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -125,6 +125,12 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     @CheckForNull
     Map<String, String> getLabels();
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_25}
+     */
+    @CheckForNull
+    String getNetworkMode();
+
     // setters
 
     /**
@@ -188,6 +194,11 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     */
     BuildImageCmd withLabels(Map<String, String> labels);
 
+    /**
+     *@since {@link RemoteApiVersion#VERSION_1_25}
+     */
+    BuildImageCmd withNetworkMode(String networkMode);
+
     interface Exec extends DockerCmdAsyncExec<BuildImageCmd, BuildResponseItem> {
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index cb9e81a39..d5dc26af3 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -66,6 +66,8 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR
 
     private Map<String, String> labels;
 
+    private String networkMode;
+
     public BuildImageCmdImpl(BuildImageCmd.Exec exec) {
         super(exec);
     }
@@ -177,6 +179,11 @@ public Map<String, String> getLabels() {
         return labels;
     }
 
+    @Override
+    public String getNetworkMode() {
+        return networkMode;
+    }
+
     // getter lib specific
 
     @Override
@@ -363,6 +370,12 @@ public BuildImageCmd withLabels(Map<String, String> labels) {
         return this;
     }
 
+    @Override
+    public BuildImageCmd withNetworkMode(String networkMode) {
+        this.networkMode = networkMode;
+        return this;
+    }
+
     @Override
     public void close() {
         super.close();
diff --git a/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
index 4a055d9d1..9d749ae44 100644
--- a/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
@@ -102,6 +102,10 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
             webTarget = webTarget.queryParamsJsonMap("labels", command.getLabels());
         }
 
+        if (command.getNetworkMode() != null) {
+            webTarget = webTarget.queryParam("networkmode", command.getNetworkMode());
+        }
+
         LOGGER.trace("POST: {}", webTarget);
 
         InvocationBuilder builder = resourceWithOptionalAuthConfig(command, webTarget.request())
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index 7ce132963..90e3abdce 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -121,6 +121,10 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
 
         webTarget = writeMap(webTarget, "labels", command.getLabels());
 
+        if (command.getNetworkMode() != null) {
+            webTarget = webTarget.queryParam("networkmode", command.getNetworkMode());
+        }
+
         webTarget.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED);
         webTarget.property(ClientProperties.CHUNKED_ENCODING_SIZE, 1024 * 1024);
 

From b4265253c40585a035b21b3d00cfc5ffeab4d267 Mon Sep 17 00:00:00 2001
From: Julian Einwag <julian.einwag@marcapo.com>
Date: Thu, 28 Jun 2018 10:52:13 +0200
Subject: [PATCH 0820/1272] support "rollback" as value for UpdateFailureAction

---
 .../com/github/dockerjava/api/model/UpdateFailureAction.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java b/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java
index 6d5a7e815..d27dbde02 100644
--- a/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java
+++ b/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java
@@ -12,6 +12,9 @@ public enum UpdateFailureAction {
     PAUSE,
 
     @JsonProperty("continue")
-    CONTINUE
+    CONTINUE,
+
+    @JsonProperty("rollback")
+    ROLLBACK
 
 }

From 70d9cab71f54f945ee3b0f770d14d5b7aedab475 Mon Sep 17 00:00:00 2001
From: Felix Mai <8ward@chelnok.de>
Date: Mon, 2 Jul 2018 18:41:02 +0200
Subject: [PATCH 0821/1272] Add mapping annotations to custom constructor
 (#1047)

* Add mapping annotations to custom constructor

* Annotate Volume's custom constructor
* Add simple test and appropriate data
* Fix docker-java/docker-java#1046

* Add annotated factory method for inconsistent JSON

* Enable to handle both JSON responses (w/ and w/o path key)
* Add additional test case and data
* Rename test data file due to alternative version
* Add JavaDocs describing why we need both single-argument constructor
  and factory method
* Fix docker-java/docker-java#1046
---
 .../github/dockerjava/api/model/Volume.java   |  26 +++
 .../api/command/CommandJSONSamples.java       |   6 +-
 .../command/InspectContainerResponseTest.java |  34 ++++
 .../inspectContainerResponse_full_1_26a.json  | 155 +++++++++++++++
 .../inspectContainerResponse_full_1_26b.json  | 180 ++++++++++++++++++
 5 files changed, 400 insertions(+), 1 deletion(-)
 create mode 100644 src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json
 create mode 100644 src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26b.json

diff --git a/src/main/java/com/github/dockerjava/api/model/Volume.java b/src/main/java/com/github/dockerjava/api/model/Volume.java
index 46989f79c..8b5ff9db8 100644
--- a/src/main/java/com/github/dockerjava/api/model/Volume.java
+++ b/src/main/java/com/github/dockerjava/api/model/Volume.java
@@ -1,20 +1,46 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
+import javax.annotation.Nonnull;
 import java.io.Serializable;
 
 /**
  * Represents a bind mounted volume in a Docker container.
+ * <p>
+ * Due to an inconsistency in the Docker REST API implementation the response to a container
+ * command might include either {@code "Mounts" : [ { "Destination" : "/path/to/mount" } ]} or
+ * {@code "Mounts" : [ { "Destination" : { "path" : "/path/to/mount" } } ]} JSON snippets. However,
+ * both variants have to be mapped to this class. Therefore, both a single-argument constructor
+ * as well as a single-argument factory method is provided either of which handles the former or
+ * latter variant (with {@code path} key), respectively.
  *
  * @see Bind
  */
 public class Volume implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    /**
+     * Handles the {@code { "Destination" : { "path" : "/path/to/mount" } }} variant.
+     * @param path the destination path of the bind mounted volume
+     * @return a volume instance referring to the given path.
+     */
+    @Nonnull
+    @JsonCreator
+    public static Volume parse(@JsonProperty("path") String path) {
+        return new Volume(path);
+    }
+
     private String path;
 
+    /**
+     * Creates a volume referring to the given path.
+     * Handles the {@code { "Destination" : "/path/to/mount" }} variant.
+     * @param path the destination path of the bind mounted volume
+     */
     public Volume(String path) {
         this.path = path;
     }
diff --git a/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java b/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
index 7ee892487..0cf5141d4 100644
--- a/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
+++ b/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
@@ -24,7 +24,11 @@
  */
 public enum CommandJSONSamples implements JSONResourceRef {
 
-    inspectContainerResponse_full, inspectContainerResponse_full_1_21, inspectContainerResponse_empty;
+    inspectContainerResponse_full,
+    inspectContainerResponse_full_1_21,
+    inspectContainerResponse_full_1_26a,
+    inspectContainerResponse_full_1_26b,
+    inspectContainerResponse_empty;
 
     @Override
     public String getFileName() {
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
index 927d4977d..ce3a6b83e 100644
--- a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
+++ b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
@@ -17,10 +17,12 @@
 
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.util.List;
 
 import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
 import static com.github.dockerjava.test.serdes.JSONTestHelper.testRoundTrip;
@@ -93,6 +95,38 @@ public void roundTrip_1_21_full() throws IOException {
         assertThat(state.getError(), isEmptyString());
     }
 
+    @Test
+    public void roundTrip_1_26a_full() throws IOException {
+        InspectContainerResponse[] responses = testRoundTrip(CommandJSONSamples.inspectContainerResponse_full_1_26a,
+                InspectContainerResponse[].class);
+
+        assertEquals(1, responses.length);
+        final InspectContainerResponse response = responses[0];
+
+        final List<InspectContainerResponse.Mount> mounts = response.getMounts();
+        assertEquals(mounts.size(), 1);
+
+        final InspectContainerResponse.Mount mount = mounts.get(0);
+        final Volume volume = mount.getDestination();
+        assertEquals(volume.getPath(), "/var/lib/postgresql/data");
+    }
+
+    @Test
+    public void roundTrip_1_26b_full() throws IOException {
+        InspectContainerResponse[] responses = testRoundTrip(CommandJSONSamples.inspectContainerResponse_full_1_26b,
+                InspectContainerResponse[].class);
+
+        assertEquals(1, responses.length);
+        final InspectContainerResponse response = responses[0];
+
+        final List<InspectContainerResponse.Mount> mounts = response.getMounts();
+        assertEquals(mounts.size(), 1);
+
+        final InspectContainerResponse.Mount mount = mounts.get(0);
+        final Volume volume = mount.getDestination();
+        assertEquals(volume.getPath(), "/srv/test");
+    }
+
     @Test
     public void roundTrip_empty() throws IOException {
         testRoundTrip(CommandJSONSamples.inspectContainerResponse_empty, InspectContainerResponse[].class);
diff --git a/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json b/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json
new file mode 100644
index 000000000..9c505c04b
--- /dev/null
+++ b/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json
@@ -0,0 +1,155 @@
+[
+  {
+    "Driver" : "aufs",
+    "Path" : "docker-entrypoint.sh",
+    "Args" : [
+      "postgres"
+    ],
+    "SizeRootFs" : null,
+    "HostConfig" : {
+      "KernelMemory" : 0,
+      "MemorySwappiness" : -1,
+      "PidMode" : "",
+      "CpuPeriod" : 0,
+      "LogConfig" : {
+        "Type" : "json-file",
+        "Config" : {}
+      },
+      "ReadonlyRootfs" : false,
+      "CgroupParent" : "",
+      "PublishAllPorts" : false,
+      "VolumeDriver" : "",
+      "NetworkMode" : "default",
+      "BlkioWeight" : 0,
+      "OomKillDisable" : false,
+      "Privileged" : false,
+      "CpusetMems" : "",
+      "ContainerIDFile" : "",
+      "ShmSize" : 67108864,
+      "CpusetCpus" : "",
+      "CpuShares" : 0,
+      "PidsLimit" : 0,
+      "RestartPolicy" : {
+        "Name" : "",
+        "MaximumRetryCount" : 0
+      },
+      "Memory" : 0,
+      "MemorySwap" : 0,
+      "CpuQuota" : 0,
+      "OomScoreAdj" : false,
+      "MemoryReservation" : 0
+    },
+    "Id" : "58fd1abe8e43a65fb6231b76a9678e7bb4e91686f838945e782a4b74119ce959",
+    "Volumes" : null,
+    "State" : {
+      "Pid" : 0,
+      "ExitCode" : 0,
+      "FinishedAt" : "0001-01-01T00:00:00Z",
+      "Paused" : false,
+      "Error" : "",
+      "Status" : "created",
+      "OOMKilled" : false,
+      "Health" : null,
+      "oomkilled" : false,
+      "StartedAt" : "0001-01-01T00:00:00Z",
+      "Dead" : false,
+      "Running" : false,
+      "Restarting" : false
+    },
+    "Config" : {
+      "OpenStdin" : false,
+      "Hostname" : "58fd1abe8e43",
+      "StdinOnce" : false,
+      "Domainname" : "",
+      "Env" : [
+        "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/postgresql/10/bin",
+        "GOSU_VERSION=1.10",
+        "LANG=en_US.utf8",
+        "PG_MAJOR=10",
+        "PG_VERSION=10.4-2.pgdg90+1",
+        "PGDATA=/var/lib/postgresql/data"
+      ],
+      "Entrypoint" : [
+        "docker-entrypoint.sh"
+      ],
+      "User" : "",
+      "AttachStdout" : false,
+      "Cmd" : [
+        "postgres"
+      ],
+      "ExposedPorts" : {
+        "5432/tcp" : {}
+      },
+      "Image" : "postgres:latest",
+      "AttachStderr" : false,
+      "Labels" : {},
+      "Volumes" : {
+        "/var/lib/postgresql/data" : {}
+      },
+      "Tty" : false,
+      "WorkingDir" : "",
+      "AttachStdin" : false
+    },
+    "ProcessLabel" : "",
+    "HostsPath" : "",
+    "Name" : "/fmi-test01",
+    "ExecDriver" : null,
+    "LogPath" : "",
+    "ExecIDs" : null,
+    "MountLabel" : "",
+    "Created" : "2018-05-30T08:37:12.308001081Z",
+    "Image" : "sha256:61d053fc271ce1313896a2edf7719fb3b68637b53397e61d8114793b39e9ae65",
+    "ResolvConfPath" : "",
+    "HostnamePath" : "",
+    "RestartCount" : 0,
+    "NetworkSettings" : {
+      "GlobalIPv6PrefixLen" : 0,
+      "LinkLocalIPv6PrefixLen" : 0,
+      "EndpointID" : "",
+      "SandboxID" : "",
+      "GlobalIPv6Address" : "",
+      "LinkLocalIPv6Address" : "",
+      "HairpinMode" : false,
+      "PortMapping" : null,
+      "SecondaryIPv6Addresses" : null,
+      "SecondaryIPAddresses" : null,
+      "Gateway" : "",
+      "Ports" : null,
+      "MacAddress" : "",
+      "Networks" : {
+        "bridge" : {
+          "IPv6Gateway" : "",
+          "IPPrefixLen" : 0,
+          "GlobalIPv6Address" : "",
+          "IPAddress" : "",
+          "EndpointID" : "",
+          "Aliases" : null,
+          "GlobalIPv6PrefixLen" : 0,
+          "Gateway" : "",
+          "NetworkID" : "",
+          "IPAMConfig" : null,
+          "Links" : null,
+          "MacAddress" : ""
+        }
+      },
+      "IPAddress" : "",
+      "Bridge" : "",
+      "IPPrefixLen" : 0,
+      "IPv6Gateway" : "",
+      "SandboxKey" : ""
+    },
+    "VolumesRW" : null,
+    "Mounts" : [
+      {
+        "RW" : true,
+        "Driver" : "local",
+        "Name" : "d9e76cbb4f797b0b8d62f5f4cd46ee6502fc520c6ce1187a62d200bc8364dd74",
+        "Source" : "/var/lib/docker/volumes/d9e76cbb4f797b0b8d62f5f4cd46ee6502fc520c6ce1187a62d200bc8364dd74/_data",
+        "Mode" : "",
+        "Destination" : {
+          "path" : "/var/lib/postgresql/data"
+        }
+      }
+    ]
+  }
+]
diff --git a/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26b.json b/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26b.json
new file mode 100644
index 000000000..916ab3e9c
--- /dev/null
+++ b/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26b.json
@@ -0,0 +1,180 @@
+[
+  {
+    "HostsPath" : "",
+    "RestartCount" : 0,
+    "ProcessLabel" : "",
+    "Args" : [],
+    "GraphDriver" : {
+      "Name" : "aufs",
+      "Data" : null
+    },
+    "Config" : {
+      "OpenStdin" : false,
+      "Volumes" : {
+        "/srv/test" : {}
+      },
+      "User" : "",
+      "Image" : "busybox:latest",
+      "Entrypoint" : null,
+      "Tty" : false,
+      "Env" : [
+        "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+      ],
+      "StdinOnce" : false,
+      "OnBuild" : null,
+      "Hostname" : "812f8c0d2342",
+      "Domainname" : "",
+      "AttachStdout" : false,
+      "Cmd" : [
+        "true"
+      ],
+      "AttachStdin" : false,
+      "WorkingDir" : "",
+      "AttachStderr" : false,
+      "Labels" : {}
+    },
+    "Driver" : "aufs",
+    "Image" : "sha256:8c811b4aec35f259572d0f79207bc0678df4c736eeec50bc9fec37ed936a472a",
+    "LogPath" : "",
+    "Mounts" : [
+      {
+        "Source" : "/var/lib/docker/volumes/53690c8e68d587308c3b8c8c76a7912aecf5abd4851f555df687229ac625112f/_data",
+        "Name" : "53690c8e68d587308c3b8c8c76a7912aecf5abd4851f555df687229ac625112f",
+        "RW" : true,
+        "Type" : "volume",
+        "Destination" : "/srv/test",
+        "Driver" : "local",
+        "Propagation" : "",
+        "Mode" : ""
+      }
+    ],
+    "MountLabel" : "",
+    "ResolvConfPath" : "",
+    "AppArmorProfile" : "",
+    "NetworkSettings" : {
+      "MacAddress" : "",
+      "SecondaryIPv6Addresses" : null,
+      "LinkLocalIPv6PrefixLen" : 0,
+      "LinkLocalIPv6Address" : "",
+      "GlobalIPv6PrefixLen" : 0,
+      "Networks" : {
+        "bridge" : {
+          "GlobalIPv6Address" : "",
+          "NetworkID" : "",
+          "Gateway" : "",
+          "IPAddress" : "",
+          "IPPrefixLen" : 0,
+          "MacAddress" : "",
+          "EndpointID" : "",
+          "IPAMConfig" : null,
+          "IPv6Gateway" : "",
+          "GlobalIPv6PrefixLen" : 0,
+          "Aliases" : null,
+          "Links" : null
+        }
+      },
+      "SandboxKey" : "",
+      "EndpointID" : "",
+      "Bridge" : "",
+      "IPPrefixLen" : 0,
+      "Ports" : null,
+      "IPAddress" : "",
+      "IPv6Gateway" : "",
+      "SandboxID" : "",
+      "Gateway" : "",
+      "GlobalIPv6Address" : "",
+      "SecondaryIPAddresses" : null,
+      "HairpinMode" : false
+    },
+    "Name" : "/elegant_mccarthy",
+    "Id" : "812f8c0d2342c45bda537b856dd50f65f6c4cd13cded5231d0424edfb9132f38",
+    "HostConfig" : {
+      "Dns" : null,
+      "BlkioDeviceWriteBps" : null,
+      "BlkioWeight" : 0,
+      "CpuQuota" : 0,
+      "ExtraHosts" : null,
+      "NanoCpus" : 0,
+      "KernelMemory" : 0,
+      "MemorySwap" : 0,
+      "CgroupParent" : "",
+      "ShmSize" : 67108864,
+      "CpuPercent" : 0,
+      "DnsOptions" : null,
+      "PidMode" : "",
+      "BlkioDeviceWriteIOps" : null,
+      "Devices" : null,
+      "Binds" : null,
+      "Memory" : 0,
+      "RestartPolicy" : {
+        "MaximumRetryCount" : 0,
+        "Name" : ""
+      },
+      "IOMaximumIOps" : 0,
+      "CpuRealtimeRuntime" : 0,
+      "PublishAllPorts" : false,
+      "CapAdd" : null,
+      "ReadonlyRootfs" : false,
+      "GroupAdd" : null,
+      "MemoryReservation" : 0,
+      "AutoRe     ove" : false,
+      "UsernsMode" : "",
+      "Runtime" : "runc",
+      "BlkioWeightDevice" : null,
+      "Ulimits" : null,
+      "Cgroup" : "",
+      "NetworkMode" : "default",
+      "CpusetCpus" : "",
+      "Isolation" : "",
+      "CpuCount" : 0,
+      "CpuRealtimePeriod" : 0,
+      "IOMaximumBandwidth" : 0,
+      "IpcMode" : "",
+      "OomKillDisable" : false,
+      "OomScoreAdj" : 0,
+      "SecurityOpt" : null,
+      "MemorySwappiness" : -1,
+      "ContainerIDFile" : "",
+      "BlkioDeviceReadBps" : null,
+      "CpusetMems" : "",
+      "PortBindings" : null,
+      "BlkioDeviceReadIOps" : null,
+      "PidsLimit" : 0,
+      "VolumesFrom" : null,
+      "Links" : null,
+      "Privileged" : false,
+      "ConsoleSize" : [
+        0,
+        0
+      ],
+      "DnsSearch" : null,
+      "UTSMode" : "",
+      "LogConfig" : {
+        "Type" : "json-file",
+        "Config" : {}
+      },
+      "CpuShares" : 0,
+      "VolumeDriver" : "",
+      "CpuPeriod" : 0,
+      "CapDrop" : null,
+      "DiskQuota" : 0
+    },
+    "Created" : "2018-06-04T08:09:33.086574793Z",
+    "HostnamePath" : "",
+    "ExecIDs" : null,
+    "Path" : "true",
+    "State" : {
+      "Error" : "",
+      "Pid" : 0,
+      "Running" : false,
+      "Dead" : false,
+      "OOMKilled" : false,
+      "ExitCode" : 0,
+      "StartedAt" : "0001-01-01T00:00:00Z",
+      "Paused" : false,
+      "Restarting" : false,
+      "FinishedAt" : "0001-01-01T00:00:00Z",
+      "Status" : "created"
+    }
+  }
+]

From ab2e9f6c3b8977a8da15bce9a753a96bf8b5f9a6 Mon Sep 17 00:00:00 2001
From: Julian Einwag <julian.einwag@marcapo.com>
Date: Tue, 3 Jul 2018 16:38:51 +0200
Subject: [PATCH 0822/1272] support rollback_completed value in
 ServiceUpdateState

---
 .../com/github/dockerjava/api/model/ServiceUpdateState.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java b/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java
index 6670015dd..2b763e2fa 100644
--- a/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java
@@ -14,5 +14,8 @@ public enum ServiceUpdateState {
     PAUSED,
 
     @JsonProperty("completed")
-    COMPLETED
+    COMPLETED,
+
+    @JsonProperty("rollback_completed")
+    ROLLBACK_COMPLETED
 }

From a8fa3837f7d6ef99dd365ac032c16b32b07a2480 Mon Sep 17 00:00:00 2001
From: orzeh <orzehoo@wp.pl>
Date: Tue, 19 Sep 2017 23:32:11 +0200
Subject: [PATCH 0823/1272] Encode spaces as %20 rather than + in URL params

---
 .../java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java   | 2 +-
 src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index 90e3abdce..53f31050a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -141,7 +141,7 @@ private WebTarget writeMap(WebTarget webTarget, String name, Map<String, String>
         if (value != null && !value.isEmpty()) {
             try {
                 return webTarget.queryParam(name,
-                        URLEncoder.encode(MAPPER.writeValueAsString(value), "UTF-8"));
+                        URLEncoder.encode(MAPPER.writeValueAsString(value), "UTF-8").replaceAll("\\+", "%20"));
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
diff --git a/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java b/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
index 740395ae6..89d9d5b33 100644
--- a/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
@@ -240,7 +240,7 @@ public void fromPrivateRegistry() throws Exception {
     public void buildArgs() throws Exception {
         File baseDir = fileFromBuildTestResource("buildArgs");
 
-        String imageId = dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc")
+        String imageId = dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc !@#$%^&*()_+")
                 .exec(new BuildImageResultCallback())
                 .awaitImageId();
 
@@ -248,7 +248,7 @@ public void buildArgs() throws Exception {
         assertThat(inspectImageResponse, not(nullValue()));
         LOG.info("Image Inspect: {}", inspectImageResponse.toString());
 
-        assertThat(inspectImageResponse.getConfig().getLabels().get("test"), equalTo("abc"));
+        assertThat(inspectImageResponse.getConfig().getLabels().get("test"), equalTo("abc !@#$%^&*()_+"));
     }
 
     @Test

From 60cfda2910de000c5bd9c57aa722f0f9b8802488 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Sch=C3=BCth?= <j.schueth@gentics.com>
Date: Wed, 16 Aug 2017 17:14:51 +0200
Subject: [PATCH 0824/1272] Add Privileged property to ExecCreateCmd

---
 .../dockerjava/api/command/ExecCreateCmd.java   |  5 +++++
 .../core/command/ExecCreateCmdImpl.java         | 17 +++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
index 829ebf8ee..1ab974644 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
@@ -23,6 +23,9 @@ public interface ExecCreateCmd extends SyncDockerCmd<ExecCreateCmdResponse> {
     @CheckForNull
     String getUser();
 
+    @CheckForNull
+    Boolean getPrivileged();
+
     ExecCreateCmd withAttachStderr(Boolean attachStderr);
 
     ExecCreateCmd withAttachStdin(Boolean attachStdin);
@@ -37,6 +40,8 @@ public interface ExecCreateCmd extends SyncDockerCmd<ExecCreateCmdResponse> {
 
     ExecCreateCmd withUser(String user);
 
+    ExecCreateCmd withPrivileged(Boolean isPrivileged);
+
     interface Exec extends DockerCmdSyncExec<ExecCreateCmd, ExecCreateCmdResponse> {
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
index fc8bf1c0b..ed6e58211 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
@@ -26,6 +26,12 @@ public class ExecCreateCmdImpl extends AbstrDockerCmd<ExecCreateCmd, ExecCreateC
     @JsonProperty("Tty")
     private Boolean tty;
 
+    /**
+    * @since 1.21
+    **/
+    @JsonProperty("Privileged")
+    private Boolean privileged;
+
     /**
      * @since {@link RemoteApiVersion#VERSION_1_19}
      */
@@ -83,6 +89,12 @@ public ExecCreateCmd withCmd(String... cmd) {
         return this;
     }
 
+    @Override
+    public ExecCreateCmd withPrivileged(Boolean privileged) {
+        this.privileged = privileged;
+        return this;
+    }
+
     @Override
     public String getContainerId() {
         return containerId;
@@ -108,6 +120,11 @@ public Boolean hasTtyEnabled() {
         return tty;
     }
 
+    @Override
+    public Boolean getPrivileged() {
+        return privileged;
+    }
+
     @Override
     public String getUser() {
         return user;

From 2f5996b1f0187138745352c12846ec744976e560 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 23 Jul 2018 18:41:56 +0300
Subject: [PATCH 0825/1272] Update deps

---
 pom.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1ce397fe7..7f9cefc94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,22 +57,22 @@
 		<jdk.source>1.7</jdk.source>
 		<jdk.target>1.7</jdk.target>
 
-		<jersey.version>2.26</jersey.version>
-		<jackson-jaxrs.version>2.6.4</jackson-jaxrs.version>
-		<httpclient.version>4.5</httpclient.version><!-- 4.5.1-4.5.2 broken -->
-		<commons-compress.version>1.12</commons-compress.version>
-		<commons-codec.version>1.10</commons-codec.version>
-		<commons-io.version>2.5</commons-io.version>
+		<jersey.version>2.27</jersey.version>
+		<jackson-jaxrs.version>2.6.7</jackson-jaxrs.version>
+		<httpclient.version>4.5.6</httpclient.version><!-- 4.5.1-4.5.2 broken -->
+		<commons-compress.version>1.17</commons-compress.version>
+		<commons-codec.version>1.11</commons-codec.version>
+		<commons-io.version>2.6</commons-io.version>
 		<commons-lang.version>2.6</commons-lang.version>
-		<slf4j-api.version>1.7.21</slf4j-api.version>
+		<slf4j-api.version>1.7.25</slf4j-api.version>
 
-		<bouncycastle.version>1.54</bouncycastle.version>
+		<bouncycastle.version>1.60</bouncycastle.version>
 		<junixsocket.version>2.0.4</junixsocket.version>
 		<guava.version>19.0</guava.version>
 
 		<!-- test dependencies -->
 		<logback.version>1.2.3</logback.version>
-		<netty.version>4.1.25.Final</netty.version>
+		<netty.version>4.1.27.Final</netty.version>
 		<hamcrest.library.version>1.3</hamcrest.library.version>
 		<hamcrest.jpa-matchers>1.8</hamcrest.jpa-matchers>
 		<lambdaj.version>2.3.3</lambdaj.version>
@@ -103,7 +103,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpcore</artifactId>
-			<version>4.4.5</version>
+			<version>4.4.10</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
@@ -230,7 +230,7 @@
 		<dependency>
 			<groupId>com.google.code.findbugs</groupId>
 			<artifactId>annotations</artifactId>
-			<version>3.0.1</version>
+			<version>3.0.1u2</version>
 			<scope>provided</scope>
 		</dependency>
 

From 638b2ad033a281160c6545eb30f1b7d014505905 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 23 Jul 2018 19:42:16 +0300
Subject: [PATCH 0826/1272] [maven-release-plugin] prepare release 3.1.0-rc-4

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7f9cefc94..25e75bebd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.0-SNAPSHOT</version>
+	<version>3.1.0-rc-4</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.1.0-rc-4</tag>
 	</scm>
 
 	<developers>

From cdea15bb437a402a50628debde7bb7ae5b4e9a57 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 23 Jul 2018 19:42:26 +0300
Subject: [PATCH 0827/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 25e75bebd..7f9cefc94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.0-rc-4</version>
+	<version>3.1.0-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.1.0-rc-4</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 39d02d870e80d49efcd8e0e990953322dce3f611 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Mon, 13 Aug 2018 00:55:27 +0100
Subject: [PATCH 0828/1272] Allow netty to handle compressed response bodies
 Fixes #1079

---
 .../github/dockerjava/netty/NettyDockerCmdExecFactory.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index 5e63921e1..dfc740e35 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -39,6 +39,7 @@
 import io.netty.channel.unix.DomainSocketAddress;
 import io.netty.channel.unix.UnixChannel;
 import io.netty.handler.codec.http.HttpClientCodec;
+import io.netty.handler.codec.http.HttpContentDecompressor;
 import io.netty.handler.logging.LoggingHandler;
 import io.netty.handler.ssl.SslHandler;
 import io.netty.handler.timeout.IdleState;
@@ -158,6 +159,7 @@ public EpollDomainSocketChannel newChannel() {
                 @Override
                 protected void initChannel(final UnixChannel channel) throws Exception {
                     channel.pipeline().addLast(new HttpClientCodec());
+                    channel.pipeline().addLast(new HttpContentDecompressor());
                 }
             });
             return epollEventLoopGroup;
@@ -172,6 +174,7 @@ public EventLoopGroup kqueueGroup() {
                         protected void initChannel(final KQueueDomainSocketChannel channel) throws Exception {
                             channel.pipeline().addLast(new LoggingHandler(getClass()));
                             channel.pipeline().addLast(new HttpClientCodec());
+                            channel.pipeline().addLast(new HttpContentDecompressor());
                         }
                     });
 
@@ -212,6 +215,7 @@ protected void initChannel(final SocketChannel channel) throws Exception {
                             // channel.pipeline().addLast(new
                             // HttpProxyHandler(proxyAddress));
                             channel.pipeline().addLast(new HttpClientCodec());
+                            channel.pipeline().addLast(new HttpContentDecompressor());
                         }
                     });
 

From fee921e8ca4cceb929993f31cef47b49837c297e Mon Sep 17 00:00:00 2001
From: Sylvere Richard <sylvere.richard@gmail.com>
Date: Tue, 14 Aug 2018 20:18:25 +0200
Subject: [PATCH 0829/1272] Fix #921, make AuthConfig compatible with
 indentitytoken

which was introduced in DOCKER API 1.23
---
 .../dockerjava/api/model/AuthConfig.java      | 20 +++++++++++++++++++
 .../dockerjava/api/model/AuthConfigTest.java  | 17 ++++++++++++++++
 .../samples/1.23/other/AuthConfig/docs1.json  |  4 ++++
 3 files changed, 41 insertions(+)
 create mode 100644 src/test/resources/samples/1.23/other/AuthConfig/docs1.json

diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
index 074c6db61..3cba343c2 100644
--- a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -42,6 +42,12 @@ public class AuthConfig implements Serializable {
     @JsonProperty("registrytoken")
     private String registrytoken;
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_23}
+     */
+    @JsonProperty("identitytoken")
+    private String identitytoken;
+
     public String getUsername() {
         return username;
     }
@@ -87,6 +93,20 @@ public AuthConfig withAuth(String auth) {
         return this;
     }
 
+    /**
+     * @see #identitytoken
+     */
+    public String getIdentitytoken() {
+        return identitytoken;
+    }
+    /**
+     * @see #identitytoken
+     */
+    public AuthConfig withIdentityToken(String identitytoken) {
+        this.identitytoken = identitytoken;
+        return this;
+    }
+
     /**
      * @see #registrytoken
      */
diff --git a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
index 351086d19..db9bf6d60 100644
--- a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
@@ -61,4 +61,21 @@ public void serderDocs2() throws IOException {
 
         assertThat(authConfig1, equalTo(authConfig));
     }
+
+    @Test
+    public void compatibleWithIdentitytoken() throws IOException {
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(AuthConfig.class);
+        final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_23,
+                "/other/AuthConfig/docs1.json",
+                type
+        );
+        String auth = "YWRtaW46";
+        String identitytoken = "1cba468e-8cbe-4c55-9098-2c2ed769e885";
+        assertThat(authConfig, notNullValue());
+        assertThat(authConfig.getAuth(), is(auth));
+        assertThat(authConfig.getIdentitytoken(), is(identitytoken));
+        final AuthConfig authConfig1 = new AuthConfig().withAuth(auth).withIdentityToken(identitytoken);
+        assertThat(authConfig1, equalTo(authConfig));
+    }
 }
diff --git a/src/test/resources/samples/1.23/other/AuthConfig/docs1.json b/src/test/resources/samples/1.23/other/AuthConfig/docs1.json
new file mode 100644
index 000000000..1ebc88193
--- /dev/null
+++ b/src/test/resources/samples/1.23/other/AuthConfig/docs1.json
@@ -0,0 +1,4 @@
+{
+  "auth": "YWRtaW46",
+  "identitytoken": "1cba468e-8cbe-4c55-9098-2c2ed769e885"
+}
\ No newline at end of file

From 94af355c8e2d29fa95226fdde7aaa3375c980113 Mon Sep 17 00:00:00 2001
From: exfalso <0slemi0@gmail.com>
Date: Sat, 18 Aug 2018 23:17:23 +0100
Subject: [PATCH 0830/1272] Fix double-marshalling of cachefrom

---
 .../github/dockerjava/core/exec/BuildImageCmdExec.java    | 8 ++++----
 .../com/github/dockerjava/jaxrs/BuildImageCmdExec.java    | 7 +++----
 .../java/com/github/dockerjava/cmd/BuildImageCmdIT.java   | 3 +--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
index 9d749ae44..486cbe620 100644
--- a/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
@@ -1,8 +1,5 @@
 package com.github.dockerjava.core.exec;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.BuildImageCmd;
@@ -12,6 +9,9 @@
 import com.github.dockerjava.core.InvocationBuilder;
 import com.github.dockerjava.core.MediaType;
 import com.github.dockerjava.core.WebTarget;
+import com.google.common.base.Joiner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static org.apache.commons.lang.StringUtils.isNotBlank;
 
@@ -59,7 +59,7 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
         }
 
         if (command.getCacheFrom() != null && !command.getCacheFrom().isEmpty()) {
-            webTarget = webTarget.queryParamsSet("cachefrom", command.getCacheFrom());
+            webTarget = webTarget.queryParam("cachefrom", "[\"" + Joiner.on("\",\"").join(command.getCacheFrom()) + "\"]");
         }
 
         if (command.getRemote() != null) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index 53f31050a..854dec1df 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -9,6 +9,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import com.google.common.base.Joiner;
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.RequestEntityProcessing;
 import org.slf4j.Logger;
@@ -75,10 +76,8 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
             webTarget = webTarget.queryParam("t", command.getTag());
         }
 
-        if (command.getCacheFrom() != null) {
-            for (String c: command.getCacheFrom()) {
-               webTarget = webTarget.queryParam("cachefrom", c);
-            }
+        if (command.getCacheFrom() != null && !command.getCacheFrom().isEmpty()) {
+            webTarget = webTarget.queryParam("cachefrom", "[\"" + Joiner.on("\",\"").join(command.getCacheFrom()) + "\"]");
         }
 
         if (command.getRemote() != null) {
diff --git a/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java b/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
index 89d9d5b33..aae6380d8 100644
--- a/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
@@ -302,8 +302,7 @@ public void cacheFrom() throws Exception {
         assertThat(inspectImageResponse1, not(nullValue()));
 
         File baseDir2 = fileFromBuildTestResource("CacheFrom/test2");
-        String cacheImage = String.format("[\"%s\"]", imageId1);
-        String imageId2 = dockerRule.getClient().buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(cacheImage)))
+        String imageId2 = dockerRule.getClient().buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(imageId1)))
                 .exec(new BuildImageResultCallback())
                 .awaitImageId();
         InspectImageResponse inspectImageResponse2 = dockerRule.getClient().inspectImageCmd(imageId2).exec();

From 68ff59926b05c54b97a6e52b4799ab2f693a5bc7 Mon Sep 17 00:00:00 2001
From: "Kevin D. Williams" <kevin.d.williams@oracle.com>
Date: Mon, 20 Aug 2018 15:45:51 -0600
Subject: [PATCH 0831/1272] ugly fix for failure with latest docker client on
 mac

---
 .../dockerjava/api/model/AuthConfig.java      | 20 +++++++++++++++++++
 .../dockerjava/api/model/AuthConfigTest.java  | 15 ++++++++++++++
 .../1.25/other/AuthConfig/orchestrators.json  |  3 +++
 3 files changed, 38 insertions(+)
 create mode 100644 src/test/resources/samples/1.25/other/AuthConfig/orchestrators.json

diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
index 3cba343c2..72bf4ef04 100644
--- a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -48,6 +48,12 @@ public class AuthConfig implements Serializable {
     @JsonProperty("identitytoken")
     private String identitytoken;
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_25}
+     */
+    @JsonProperty("stackOrchestrator")
+    private String stackOrchestrator;
+
     public String getUsername() {
         return username;
     }
@@ -123,6 +129,20 @@ public AuthConfig withRegistrytoken(String registrytoken) {
         return this;
     }
 
+    /**
+     * @see #stackOrchestrator
+     */
+    public String getStackOrchestrator() {
+        return stackOrchestrator;
+    }
+
+    /**
+     * @see #stackOrchestrator
+     */
+    public void setStackOrchestrator(String stackOrchestrator) {
+        this.stackOrchestrator = stackOrchestrator;
+    }
+
     @Override
     public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
diff --git a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
index db9bf6d60..add1e7a25 100644
--- a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
@@ -10,6 +10,7 @@
 import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertEquals;
@@ -78,4 +79,18 @@ public void compatibleWithIdentitytoken() throws IOException {
         final AuthConfig authConfig1 = new AuthConfig().withAuth(auth).withIdentityToken(identitytoken);
         assertThat(authConfig1, equalTo(authConfig));
     }
+
+    @Test
+    public void shouldNotFailWithStackOrchestratorInConfig() throws IOException {
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(AuthConfig.class);
+        final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_25,
+                "/other/AuthConfig/orchestrators.json",
+                type
+        );
+        assertThat(authConfig, notNullValue());
+        assertThat(authConfig.getAuth(), is(nullValue()));
+        assertThat(authConfig.getStackOrchestrator(), is("kubernetes"));
+    }
+
 }
diff --git a/src/test/resources/samples/1.25/other/AuthConfig/orchestrators.json b/src/test/resources/samples/1.25/other/AuthConfig/orchestrators.json
new file mode 100644
index 000000000..3b67b1941
--- /dev/null
+++ b/src/test/resources/samples/1.25/other/AuthConfig/orchestrators.json
@@ -0,0 +1,3 @@
+{
+  "stackOrchestrator" : "kubernetes"
+}
\ No newline at end of file

From c552bb04edfa77187a76a798b8a4573f05aedf9c Mon Sep 17 00:00:00 2001
From: Andras Slemmer <andras.slemmer@r3cev.com>
Date: Fri, 24 Aug 2018 10:31:56 +0100
Subject: [PATCH 0832/1272] #1086: Address comments

---
 .../core/exec/BuildImageCmdExec.java          |  4 +--
 .../core/util/CacheFromEncoder.java           | 27 +++++++++++++++++++
 .../dockerjava/jaxrs/BuildImageCmdExec.java   |  5 ++--
 3 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java

diff --git a/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
index 486cbe620..d229a9732 100644
--- a/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
@@ -9,7 +9,7 @@
 import com.github.dockerjava.core.InvocationBuilder;
 import com.github.dockerjava.core.MediaType;
 import com.github.dockerjava.core.WebTarget;
-import com.google.common.base.Joiner;
+import com.github.dockerjava.core.util.CacheFromEncoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,7 +59,7 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
         }
 
         if (command.getCacheFrom() != null && !command.getCacheFrom().isEmpty()) {
-            webTarget = webTarget.queryParam("cachefrom", "[\"" + Joiner.on("\",\"").join(command.getCacheFrom()) + "\"]");
+            webTarget = webTarget.queryParam("cachefrom", CacheFromEncoder.jsonEncode(command.getCacheFrom()));
         }
 
         if (command.getRemote() != null) {
diff --git a/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java b/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java
new file mode 100644
index 000000000..59da5e406
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java
@@ -0,0 +1,27 @@
+package com.github.dockerjava.core.util;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
+
+import javax.ws.rs.core.MediaType;
+import java.util.Collection;
+
+/**
+ * JSON Encoder for the docker --cache-from parameter.
+ */
+public class CacheFromEncoder {
+    private CacheFromEncoder() {
+    }
+
+    private static final ObjectMapper OBJECT_MAPPER = new JacksonJaxbJsonProvider().locateMapper(Collection.class,
+            MediaType.APPLICATION_JSON_TYPE);
+
+    public static String jsonEncode(Collection<String> imageIds) {
+        try {
+            return OBJECT_MAPPER.writeValueAsString(imageIds);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index 854dec1df..a741e0a61 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -7,9 +7,10 @@
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import com.google.common.base.Joiner;
+import com.github.dockerjava.core.util.CacheFromEncoder;
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.RequestEntityProcessing;
 import org.slf4j.Logger;
@@ -77,7 +78,7 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
         }
 
         if (command.getCacheFrom() != null && !command.getCacheFrom().isEmpty()) {
-            webTarget = webTarget.queryParam("cachefrom", "[\"" + Joiner.on("\",\"").join(command.getCacheFrom()) + "\"]");
+            webTarget = webTarget.queryParam("cachefrom", CacheFromEncoder.jsonEncode(command.getCacheFrom()));
         }
 
         if (command.getRemote() != null) {

From 92a4263a9a304848c46ab11e3ee6972028ea53e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szywa=C5=82a=20Andrzej?= <aszywala@win.coig.com>
Date: Wed, 29 Aug 2018 08:43:10 +0200
Subject: [PATCH 0833/1272] InvalidDefinitionException: No serializer found for
 class com.github.dockerjava.api.model.ServiceGlobalModeOptions #1090

---
 .../com/github/dockerjava/netty/NettyInvocationBuilder.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
index 952fea3ac..39ea98c51 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.Frame;
@@ -343,7 +344,9 @@ private HttpRequest prepareEntityRequest(String uri, Object entity, HttpMethod h
 
             byte[] bytes;
             try {
-                bytes = new ObjectMapper().writeValueAsBytes(entity);
+                ObjectMapper objectMapper = new ObjectMapper();
+                objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+                bytes = objectMapper.writeValueAsBytes(entity);
             } catch (JsonProcessingException e) {
                 throw new RuntimeException(e);
             }

From 393e7cd0cd104bc5e49e896edb099ca8ec0e616b Mon Sep 17 00:00:00 2001
From: Wolfram Wingerath <wingerath@informatik.uni-hamburg.de>
Date: Tue, 4 Sep 2018 13:10:32 +0200
Subject: [PATCH 0834/1272] Added memory swappiness to create container
 command.

---
 .../api/command/CreateContainerCmd.java       |  5 +++++
 .../core/command/CreateContainerCmdImpl.java  | 13 ++++++++++++
 .../dockerjava/cmd/CreateContainerCmdIT.java  | 20 +++++++++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 34682a14f..4fc7f5f32 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -126,6 +126,9 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     Long getMemorySwap();
 
+    @CheckForNull
+    Integer getMemorySwappiness();
+
     @CheckForNull
     String getName();
 
@@ -368,6 +371,8 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     CreateContainerCmd withMemorySwap(Long memorySwap);
 
+    CreateContainerCmd withMemorySwappiness(Integer memorySwappiness);
+
     CreateContainerCmd withName(String name);
 
     CreateContainerCmd withNetworkDisabled(Boolean disableNetwork);
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index f7e2fc410..a1f4090ba 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -363,6 +363,12 @@ public Long getMemorySwap() {
         return hostConfig.getMemorySwap();
     }
 
+    @Override
+    @JsonIgnore
+    public Integer getMemorySwappiness() {
+        return hostConfig.getMemorySwappiness();
+    }
+
     @Override
     public String getName() {
         return name;
@@ -816,6 +822,13 @@ public CreateContainerCmd withMemorySwap(Long memorySwap) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withMemorySwappiness(Integer memorySwappiness) {
+        checkNotNull(memorySwappiness, "memorySwappiness was not specified");
+        hostConfig.withMemorySwappiness(memorySwappiness);
+        return this;
+    }
+
     @Override
     public CreateContainerCmd withName(String name) {
         checkNotNull(name, "name was not specified");
diff --git a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index 070498a4f..c49cbd8d4 100644
--- a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -70,6 +70,7 @@
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assume.assumeThat;
 
 @NotThreadSafe
@@ -294,6 +295,25 @@ public void createContainerWithLink() throws DockerException {
                 "container1Link")}));
     }
 
+    @Test
+    public void createContainerWithMemorySwappiness() throws DockerException {
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withCmd("sleep", "9999")
+                .withMemorySwappiness(42)
+                .exec();
+        assertThat(container.getId(), not(isEmptyString()));
+        LOG.info("Created container {}", container.toString());
+
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+        LOG.info("Started container {}", container.toString());
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient()
+                .inspectContainerCmd(container.getId())
+                .exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+        assertSame(42, inspectContainerResponse.getHostConfig().getMemorySwappiness());
+    }
+
     @Test
     public void createContainerWithLinkInCustomNetwork() throws DockerException {
         String containerName1 = "containerCustomlink_" + dockerRule.getKind();

From 9c81e41aee6c962e412d322828759ef04a8252d6 Mon Sep 17 00:00:00 2001
From: Dmitry Tretyakov <dtretyakov@gmail.com>
Date: Thu, 13 Sep 2018 18:28:30 +0200
Subject: [PATCH 0835/1272] Add OSVersion and RootFS support in
 InspectImageResponse

---
 .../dockerjava/api/command/GraphData.java     | 19 +++++
 .../api/command/InspectImageResponse.java     | 41 +++++++++++
 .../github/dockerjava/api/command/RootFS.java | 72 +++++++++++++++++++
 .../api/command/InspectImageResponseTest.java | 46 ++++++++++++
 .../samples/1.25/images/windowsImage/doc.json | 72 +++++++++++++++++++
 5 files changed, 250 insertions(+)
 create mode 100644 src/main/java/com/github/dockerjava/api/command/RootFS.java
 create mode 100644 src/test/resources/samples/1.25/images/windowsImage/doc.json

diff --git a/src/main/java/com/github/dockerjava/api/command/GraphData.java b/src/main/java/com/github/dockerjava/api/command/GraphData.java
index 5a2944e0b..518970dc6 100644
--- a/src/main/java/com/github/dockerjava/api/command/GraphData.java
+++ b/src/main/java/com/github/dockerjava/api/command/GraphData.java
@@ -28,6 +28,9 @@ public class GraphData {
     @JsonProperty("DeviceSize")
     private String deviceSize;
 
+    @JsonProperty("dir")
+    private String dir;
+
     /**
      * @see #rootDir
      */
@@ -92,6 +95,22 @@ public GraphData withDeviceSize(String deviceSize) {
         return this;
     }
 
+    /**
+     * @see #dir
+     */
+    @CheckForNull
+    public String getDir() {
+        return dir;
+    }
+
+    /**
+     * @see #dir
+     */
+    public GraphData withDir(String dir) {
+        this.dir = dir;
+        return this;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
index c1967e384..19727504e 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
@@ -49,6 +49,12 @@ public class InspectImageResponse {
     @JsonProperty("Os")
     private String os;
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_25}
+     */
+    @JsonProperty("OsVersion")
+    private String osVersion;
+
     @JsonProperty("Parent")
     private String parent;
 
@@ -73,6 +79,9 @@ public class InspectImageResponse {
     @JsonProperty("GraphDriver")
     private GraphDriver graphDriver;
 
+    @JsonProperty("RootFS")
+    private RootFS rootFS;
+
     /**
      * @see #arch
      */
@@ -236,6 +245,22 @@ public InspectImageResponse withOs(String os) {
         return this;
     }
 
+    /**
+     * @see #osVersion
+     */
+    @CheckForNull
+    public String getOsVersion() {
+        return osVersion;
+    }
+
+    /**
+     * @see #osVersion
+     */
+    public InspectImageResponse withOsVersion(String osVersion) {
+        this.osVersion = osVersion;
+        return this;
+    }
+
     /**
      * @see #parent
      */
@@ -332,6 +357,22 @@ public InspectImageResponse withVirtualSize(Long virtualSize) {
         return this;
     }
 
+    /**
+     * @see #rootFS
+     */
+    @CheckForNull
+    public RootFS getRootFS() {
+        return rootFS;
+    }
+
+    /**
+     * @see #rootFS
+     */
+    public InspectImageResponse withRootFS(RootFS rootFS) {
+        this.rootFS = rootFS;
+        return this;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
diff --git a/src/main/java/com/github/dockerjava/api/command/RootFS.java b/src/main/java/com/github/dockerjava/api/command/RootFS.java
new file mode 100644
index 000000000..82d3049d6
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/RootFS.java
@@ -0,0 +1,72 @@
+package com.github.dockerjava.api.command;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import javax.annotation.CheckForNull;
+import java.util.List;
+
+/**
+ * Part of {@link InspectImageResponse}
+ *
+ * @author Dmitry Tretyakov
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class RootFS {
+
+    @JsonProperty("Type")
+    private String type;
+
+    @JsonProperty("Layers")
+    private List<String> layers;
+
+    /**
+     * @see #type
+     */
+    @CheckForNull
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * @see #type
+     */
+    public RootFS withType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * @see #layers
+     */
+    @CheckForNull
+    public List<String> getLayers() {
+        return layers;
+    }
+
+    /**
+     * @see #layers
+     */
+    public RootFS withLayers(List<String> layers) {
+        this.layers = layers;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
index ca17ec58a..2cfde68d7 100644
--- a/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
+++ b/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
@@ -9,6 +9,7 @@
 import java.util.Collections;
 
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_25;
 import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
@@ -206,4 +207,49 @@ public void testOverlayNetworkRootDir() throws IOException {
         assertThat(graphDriver.getName(), is("overlay"));
         assertThat(graphDriver.getData(), equalTo(overlayGraphData));
     }
+
+    @Test
+    public void inspectWindowsImage() throws IOException {
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class);
+
+        final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_25,
+                "images/windowsImage/doc.json",
+                type
+        );
+
+        assertThat(inspectImage, notNullValue());
+
+        assertThat(inspectImage.getRepoTags(), hasSize(1));
+        assertThat(inspectImage.getRepoTags(), contains(
+                "microsoft/nanoserver:latest"
+        ));
+
+        assertThat(inspectImage.getRepoDigests(), hasSize(1));
+        assertThat(inspectImage.getRepoDigests(), contains("microsoft/nanoserver@" +
+                "sha256:aee7d4330fe3dc5987c808f647441c16ed2fa1c7d9c6ef49d6498e5c9860b50b")
+        );
+
+        assertThat(inspectImage.getConfig(), notNullValue());
+        assertThat(inspectImage.getConfig().getCmd(), is(new String[]{"c:\\windows\\system32\\cmd.exe"}));
+
+        assertThat(inspectImage.getOs(), is("windows"));
+        assertThat(inspectImage.getOsVersion(), is("10.0.14393"));
+        assertThat(inspectImage.getSize(), is(651862727L));
+        assertThat(inspectImage.getVirtualSize(), is(651862727L));
+
+        assertThat(inspectImage.getGraphDriver(), notNullValue());
+        assertThat(inspectImage.getGraphDriver().getName(), is("windowsfilter"));
+        assertThat(inspectImage.getGraphDriver().getData(), notNullValue());
+        assertThat(inspectImage.getGraphDriver().getData().getDir(), is("C:\\control\\windowsfilter\\" +
+                "6fe6a289b98276a6a5ca0345156ca61d7b38f3da6bb49ef95af1d0f1ac37e5bf"
+        ));
+
+        assertThat(inspectImage.getRootFS(), notNullValue());
+        assertThat(inspectImage.getRootFS().getType(), is("layers"));
+        assertThat(inspectImage.getRootFS().getLayers(), hasSize(1));
+        assertThat(inspectImage.getRootFS().getLayers(), contains(
+                "sha256:342d4e407550c52261edd20cd901b5ce438f0b1e940336de3978210612365063"
+        ));
+    }
 }
diff --git a/src/test/resources/samples/1.25/images/windowsImage/doc.json b/src/test/resources/samples/1.25/images/windowsImage/doc.json
new file mode 100644
index 000000000..e7b68c078
--- /dev/null
+++ b/src/test/resources/samples/1.25/images/windowsImage/doc.json
@@ -0,0 +1,72 @@
+{
+  "Id": "sha256:105d76d0f40e38427c63023ffe649bf36fa85058d3469551e43e4dcc2431fb31",
+  "RepoTags": [
+    "microsoft/nanoserver:latest"
+  ],
+  "RepoDigests": [
+    "microsoft/nanoserver@sha256:aee7d4330fe3dc5987c808f647441c16ed2fa1c7d9c6ef49d6498e5c9860b50b"
+  ],
+  "Parent": "",
+  "Comment": "",
+  "Created": "2016-09-22T02:39:30.9154862-07:00",
+  "Container": "",
+  "ContainerConfig": {
+    "Hostname": "",
+    "Domainname": "",
+    "User": "",
+    "AttachStdin": false,
+    "AttachStdout": false,
+    "AttachStderr": false,
+    "Tty": false,
+    "OpenStdin": false,
+    "StdinOnce": false,
+    "Env": null,
+    "Cmd": null,
+    "Image": "",
+    "Volumes": null,
+    "WorkingDir": "",
+    "Entrypoint": null,
+    "OnBuild": null,
+    "Labels": null
+  },
+  "DockerVersion": "",
+  "Author": "",
+  "Config": {
+    "Hostname": "",
+    "Domainname": "",
+    "User": "",
+    "AttachStdin": false,
+    "AttachStdout": false,
+    "AttachStderr": false,
+    "Tty": false,
+    "OpenStdin": false,
+    "StdinOnce": false,
+    "Env": null,
+    "Cmd": [
+      "c:\\windows\\system32\\cmd.exe"
+    ],
+    "Image": "",
+    "Volumes": null,
+    "WorkingDir": "",
+    "Entrypoint": null,
+    "OnBuild": null,
+    "Labels": null
+  },
+  "Architecture": "",
+  "Os": "windows",
+  "OsVersion": "10.0.14393",
+  "Size": 651862727,
+  "VirtualSize": 651862727,
+  "GraphDriver": {
+    "Name": "windowsfilter",
+    "Data": {
+      "dir": "C:\\control\\windowsfilter\\6fe6a289b98276a6a5ca0345156ca61d7b38f3da6bb49ef95af1d0f1ac37e5bf"
+    }
+  },
+  "RootFS": {
+    "Type": "layers",
+    "Layers": [
+      "sha256:342d4e407550c52261edd20cd901b5ce438f0b1e940336de3978210612365063"
+    ]
+  }
+}
\ No newline at end of file

From a5be86d945e52a82bce0526cde1e842cc60d266c Mon Sep 17 00:00:00 2001
From: Dmitry Tretyakov <dtretyakov@gmail.com>
Date: Thu, 13 Sep 2018 18:59:15 +0200
Subject: [PATCH 0836/1272] Support platform option in image build/create/pull
 commands

---
 .../dockerjava/api/command/BuildImageCmd.java    | 13 +++++++++++++
 .../dockerjava/api/command/CreateImageCmd.java   |  9 +++++++++
 .../dockerjava/api/command/PullImageCmd.java     |  8 ++++++++
 .../core/command/BuildImageCmdImpl.java          | 13 +++++++++++++
 .../core/command/CreateImageCmdImpl.java         | 16 +++++++++++++++-
 .../core/command/PullImageCmdImpl.java           | 13 ++++++++++++-
 .../dockerjava/core/exec/BuildImageCmdExec.java  |  4 ++++
 .../dockerjava/core/exec/CreateImageCmdExec.java |  4 ++++
 .../dockerjava/core/exec/PullImageCmdExec.java   |  4 ++++
 .../dockerjava/jaxrs/BuildImageCmdExec.java      |  4 ++++
 .../dockerjava/jaxrs/CreateImageCmdExec.java     |  4 ++++
 .../dockerjava/jaxrs/PullImageCmdExec.java       |  4 ++++
 12 files changed, 94 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 9cf3296ce..2c0091fcf 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -131,6 +131,14 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     @CheckForNull
     String getNetworkMode();
 
+    /**
+     * "platform" in API
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_32}
+     */
+    @CheckForNull
+    String getPlatform();
+
     // setters
 
     /**
@@ -199,6 +207,11 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
      */
     BuildImageCmd withNetworkMode(String networkMode);
 
+    /**
+     *@since {@link RemoteApiVersion#VERSION_1_32}
+     */
+    BuildImageCmd withPlatform(String platform);
+
     interface Exec extends DockerCmdAsyncExec<BuildImageCmd, BuildResponseItem> {
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
index 86935cd10..4e78dd5e0 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
@@ -13,6 +13,9 @@ public interface CreateImageCmd extends SyncDockerCmd<CreateImageResponse> {
     @CheckForNull
     String getTag();
 
+    @CheckForNull
+    String getPlatform();
+
     @CheckForNull
     InputStream getImageStream();
 
@@ -35,6 +38,12 @@ public interface CreateImageCmd extends SyncDockerCmd<CreateImageResponse> {
      */
     CreateImageCmd withTag(String tag);
 
+    /**
+     * @param platform
+     *            the platform for this image
+     */
+    CreateImageCmd withPlatform(String platform);
+
     interface Exec extends DockerCmdSyncExec<CreateImageCmd, CreateImageResponse> {
     }
 
diff --git a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java b/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
index 81da24e61..cc95161a5 100644
--- a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
@@ -19,6 +19,9 @@ public interface PullImageCmd extends AsyncDockerCmd<PullImageCmd, PullResponseI
     @CheckForNull
     String getTag();
 
+    @CheckForNull
+    String getPlatform();
+
     @CheckForNull
     String getRegistry();
 
@@ -29,6 +32,11 @@ public interface PullImageCmd extends AsyncDockerCmd<PullImageCmd, PullResponseI
 
     PullImageCmd withTag(String tag);
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_32}
+     */
+    PullImageCmd withPlatform(String tag);
+
     PullImageCmd withRegistry(String registry);
 
     PullImageCmd withAuthConfig(AuthConfig authConfig);
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index d5dc26af3..97be7d1c0 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -68,6 +68,8 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR
 
     private String networkMode;
 
+    private String platform;
+
     public BuildImageCmdImpl(BuildImageCmd.Exec exec) {
         super(exec);
     }
@@ -184,6 +186,11 @@ public String getNetworkMode() {
         return networkMode;
     }
 
+    @Override
+    public String getPlatform() {
+        return platform;
+    }
+
     // getter lib specific
 
     @Override
@@ -376,6 +383,12 @@ public BuildImageCmd withNetworkMode(String networkMode) {
         return this;
     }
 
+    @Override
+    public BuildImageCmd withPlatform(String platform) {
+        this.platform = platform;
+        return this;
+    }
+
     @Override
     public void close() {
         super.close();
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
index 57ddc2908..9ecf84430 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
@@ -12,7 +12,7 @@
  */
 public class CreateImageCmdImpl extends AbstrDockerCmd<CreateImageCmd, CreateImageResponse> implements CreateImageCmd {
 
-    private String repository, tag;
+    private String repository, tag, platform;
 
     private InputStream imageStream;
 
@@ -38,6 +38,11 @@ public String getTag() {
         return tag;
     }
 
+    @Override
+    public String getPlatform() {
+        return platform;
+    }
+
     @Override
     public InputStream getImageStream() {
         return imageStream;
@@ -75,4 +80,13 @@ public CreateImageCmdImpl withTag(String tag) {
         this.tag = tag;
         return this;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public CreateImageCmd withPlatform(String platform) {
+        this.platform = platform;
+        return this;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
index b69791fe5..a3395c21b 100644
--- a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
@@ -13,7 +13,7 @@
  */
 public class PullImageCmdImpl extends AbstrAsyncDockerCmd<PullImageCmd, PullResponseItem> implements PullImageCmd {
 
-    private String repository, tag, registry;
+    private String repository, tag, platform, registry;
 
     private AuthConfig authConfig;
 
@@ -42,6 +42,11 @@ public String getTag() {
         return tag;
     }
 
+    @Override
+    public String getPlatform() {
+        return platform;
+    }
+
     @Override
     public String getRegistry() {
         return registry;
@@ -61,6 +66,12 @@ public PullImageCmd withTag(String tag) {
         return this;
     }
 
+    @Override
+    public PullImageCmd withPlatform(String platform) {
+        this.platform = platform;
+        return this;
+    }
+
     @Override
     public PullImageCmd withRegistry(String registry) {
         checkNotNull(registry, "registry was not specified");
diff --git a/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
index 9d749ae44..06fac4ff4 100644
--- a/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
@@ -106,6 +106,10 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
             webTarget = webTarget.queryParam("networkmode", command.getNetworkMode());
         }
 
+        if (command.getPlatform() != null) {
+            webTarget = webTarget.queryParam("platform", command.getPlatform());
+        }
+
         LOGGER.trace("POST: {}", webTarget);
 
         InvocationBuilder builder = resourceWithOptionalAuthConfig(command, webTarget.request())
diff --git a/src/main/java/com/github/dockerjava/core/exec/CreateImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/CreateImageCmdExec.java
index ad3d0d283..b1f4f23c0 100644
--- a/src/main/java/com/github/dockerjava/core/exec/CreateImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/CreateImageCmdExec.java
@@ -24,6 +24,10 @@ protected CreateImageResponse execute(CreateImageCmd command) {
         WebTarget webResource = getBaseResource().path("/images/create").queryParam("repo", command.getRepository())
                 .queryParam("tag", command.getTag()).queryParam("fromSrc", "-");
 
+        if (command.getPlatform() != null) {
+            webResource = webResource.queryParam("platform", command.getPlatform());
+        }
+
         LOGGER.trace("POST: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM)
                 .post(new TypeReference<CreateImageResponse>() {
diff --git a/src/main/java/com/github/dockerjava/core/exec/PullImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/PullImageCmdExec.java
index a6079d7eb..cafb4ac30 100644
--- a/src/main/java/com/github/dockerjava/core/exec/PullImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/PullImageCmdExec.java
@@ -25,6 +25,10 @@ protected Void execute0(PullImageCmd command, ResultCallback<PullResponseItem> r
         WebTarget webResource = getBaseResource().path("/images/create").queryParam("tag", command.getTag())
                 .queryParam("fromImage", command.getRepository()).queryParam("registry", command.getRegistry());
 
+        if (command.getPlatform() != null) {
+            webResource = webResource.queryParam("platform", command.getPlatform());
+        }
+
         LOGGER.trace("POST: {}", webResource);
         resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request()).accept(MediaType.APPLICATION_OCTET_STREAM).post(
                 null, new TypeReference<PullResponseItem>() {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index 53f31050a..251857ce8 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -125,6 +125,10 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
             webTarget = webTarget.queryParam("networkmode", command.getNetworkMode());
         }
 
+        if (command.getPlatform() != null) {
+            webTarget = webTarget.queryParam("platform", command.getPlatform());
+        }
+
         webTarget.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED);
         webTarget.property(ClientProperties.CHUNKED_ENCODING_SIZE, 1024 * 1024);
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
index d5c40f83b..dc1c9e1af 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
@@ -26,6 +26,10 @@ protected CreateImageResponse execute(CreateImageCmd command) {
         WebTarget webResource = getBaseResource().path("/images/create").queryParam("repo", command.getRepository())
                 .queryParam("tag", command.getTag()).queryParam("fromSrc", "-");
 
+        if (command.getPlatform() != null) {
+            webResource = webResource.queryParam("platform", command.getPlatform());
+        }
+
         LOGGER.trace("POST: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE)
                 .post(entity(command.getImageStream(), MediaType.APPLICATION_OCTET_STREAM), CreateImageResponse.class);
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
index d2b22856d..70e1d0aac 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
@@ -32,6 +32,10 @@ protected AbstractCallbackNotifier<PullResponseItem> callbackNotifier(PullImageC
         WebTarget webResource = getBaseResource().path("/images/create").queryParam("tag", command.getTag())
                 .queryParam("fromImage", command.getRepository()).queryParam("registry", command.getRegistry());
 
+        if (command.getPlatform() != null) {
+            webResource = webResource.queryParam("platform", command.getPlatform());
+        }
+
         LOGGER.trace("POST: {}", webResource);
         Builder builder = resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request()).accept(
                 MediaType.APPLICATION_OCTET_STREAM_TYPE);

From fba4fd15ec0c10cd524adbaf50870e5ea37b10ec Mon Sep 17 00:00:00 2001
From: Dmitry Tretyakov <dtretyakov@gmail.com>
Date: Fri, 14 Sep 2018 11:20:42 +0200
Subject: [PATCH 0837/1272] Add isolation property support in Info response

---
 .../com/github/dockerjava/api/model/Info.java | 22 +++++
 .../dockerjava/core/RemoteApiVersion.java     |  2 +
 .../github/dockerjava/api/model/InfoTest.java | 37 ++++++++
 .../resources/samples/1.38/info/lcow.json     | 93 +++++++++++++++++++
 4 files changed, 154 insertions(+)
 create mode 100644 src/test/resources/samples/1.38/info/lcow.json

diff --git a/src/main/java/com/github/dockerjava/api/model/Info.java b/src/main/java/com/github/dockerjava/api/model/Info.java
index 6925df5f2..fdbaa4722 100644
--- a/src/main/java/com/github/dockerjava/api/model/Info.java
+++ b/src/main/java/com/github/dockerjava/api/model/Info.java
@@ -230,6 +230,12 @@ public class Info implements Serializable {
     @JsonProperty("Swarm")
     private SwarmInfo swarm;
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_25}
+     */
+    @JsonProperty("Isolation")
+    private String isolation;
+
     /**
      * @see #architecture
      */
@@ -1046,6 +1052,22 @@ public Info withSwarm(SwarmInfo swarm) {
         return this;
     }
 
+    /**
+     * @see #isolation
+     */
+    @CheckForNull
+    public String getIsolation() {
+        return isolation;
+    }
+
+    /**
+     * @see #isolation
+     */
+    public Info withIsolation(String isolation) {
+        this.isolation = isolation;
+        return this;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index dcf47d9e6..66b5b47f7 100644
--- a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -87,6 +87,8 @@ public class RemoteApiVersion implements Serializable {
     public static final RemoteApiVersion VERSION_1_34 = RemoteApiVersion.create(1, 34);
     public static final RemoteApiVersion VERSION_1_35 = RemoteApiVersion.create(1, 35);
     public static final RemoteApiVersion VERSION_1_36 = RemoteApiVersion.create(1, 36);
+    public static final RemoteApiVersion VERSION_1_37 = RemoteApiVersion.create(1, 37);
+    public static final RemoteApiVersion VERSION_1_38 = RemoteApiVersion.create(1, 38);
 
 
     /**
diff --git a/src/test/java/com/github/dockerjava/api/model/InfoTest.java b/src/test/java/com/github/dockerjava/api/model/InfoTest.java
index 372abf52f..6e37636ec 100644
--- a/src/test/java/com/github/dockerjava/api/model/InfoTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/InfoTest.java
@@ -3,10 +3,12 @@
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.model.InfoRegistryConfig.IndexConfig;
+import com.github.dockerjava.core.RemoteApiVersion;
 import org.hamcrest.CoreMatchers;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -327,4 +329,39 @@ public void serder2Json() throws IOException {
 
         assertThat(info, is(withInfo));
     }
+
+    @Test
+    public void info_1_38() throws IOException {
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().constructType(Info.class);
+
+        final Info info = testRoundTrip(RemoteApiVersion.VERSION_1_38,
+                "info/lcow.json",
+                type
+        );
+
+        assertThat(info, notNullValue());
+        assertThat(info.getArchitecture(), is("x86_64"));
+        assertThat(info.getDockerRootDir(), is("C:\\ProgramData\\Docker"));
+        assertThat(info.getDriver(), is("windowsfilter (windows) lcow (linux)"));
+
+        assertThat(info.getDriverStatuses(), equalTo(Arrays.asList(
+                Arrays.asList("Windows", ""),
+                Arrays.asList("LCOW", "")
+        )));
+
+        assertThat(info.getIsolation(), is("hyperv"));
+        assertThat(info.getKernelVersion(), is("10.0 17134 (17134.1.amd64fre.rs4_release.180410-1804)"));
+        assertThat(info.getOsType(), is("windows"));
+        assertThat(info.getOperatingSystem(), is("Windows 10 Pro Version 1803 (OS Build 17134.228)"));
+
+        final Map<String, List<String>> plugins = new LinkedHashMap<>();
+        plugins.put("Authorization", null);
+        plugins.put("Log", asList("awslogs", "etwlogs", "fluentd", "gelf", "json-file", "logentries", "splunk", "syslog"));
+        plugins.put("Network", asList("ics", "l2bridge", "l2tunnel", "nat", "null", "overlay", "transparent"));
+        plugins.put("Volume", singletonList("local"));
+        assertThat(info.getPlugins(), equalTo(plugins));
+
+        assertThat(info.getServerVersion(), is("18.06.1-ce"));
+    }
 }
diff --git a/src/test/resources/samples/1.38/info/lcow.json b/src/test/resources/samples/1.38/info/lcow.json
new file mode 100644
index 000000000..7ab600449
--- /dev/null
+++ b/src/test/resources/samples/1.38/info/lcow.json
@@ -0,0 +1,93 @@
+{
+  "Architecture": "x86_64",
+  "BridgeNfIp6tables": true,
+  "BridgeNfIptables": true,
+  "CPUSet": false,
+  "CPUShares": false,
+  "CgroupDriver": "",
+  "ClusterAdvertise": "",
+  "ClusterStore": "",
+  "ContainerdCommit": {
+    "Expected": "",
+    "ID": ""
+  },
+  "Containers": 3,
+  "ContainersPaused": 0,
+  "ContainersRunning": 0,
+  "ContainersStopped": 3,
+  "CpuCfsPeriod": false,
+  "CpuCfsQuota": false,
+  "Debug": true,
+  "DefaultRuntime": "",
+  "DockerRootDir": "C:\\ProgramData\\Docker",
+  "Driver": "windowsfilter (windows) lcow (linux)",
+  "DriverStatus": [["Windows", ""], ["LCOW", ""]],
+  "ExperimentalBuild": true,
+  "GenericResources": null,
+  "HttpProxy": "",
+  "HttpsProxy": "",
+  "ID": "ZOGT:VB24:YEPZ:Y7HU:JHPB:WNUE:UYQG:7YRY:VLZV:FLWV:R65B:ICZG",
+  "IPv4Forwarding": true,
+  "Images": 2,
+  "IndexServerAddress": "https://index.docker.io/v1/",
+  "InitBinary": "",
+  "InitCommit": {
+    "Expected": "",
+    "ID": ""
+  },
+  "Isolation": "hyperv",
+  "KernelMemory": false,
+  "KernelVersion": "10.0 17134 (17134.1.amd64fre.rs4_release.180410-1804)",
+  "Labels": [],
+  "LiveRestoreEnabled": false,
+  "LoggingDriver": "json-file",
+  "MemTotal": 68684476416,
+  "MemoryLimit": false,
+  "NCPU": 8,
+  "NEventsListener": 1,
+  "NFd": -1,
+  "NGoroutines": 28,
+  "Name": "somename",
+  "NoProxy": "",
+  "OSType": "windows",
+  "OomKillDisable": false,
+  "OperatingSystem": "Windows 10 Pro Version 1803 (OS Build 17134.228)",
+  "Plugins": {
+    "Authorization": null,
+    "Log": ["awslogs", "etwlogs", "fluentd", "gelf", "json-file", "logentries", "splunk", "syslog"],
+    "Network": ["ics", "l2bridge", "l2tunnel", "nat", "null", "overlay", "transparent"],
+    "Volume": ["local"]
+  },
+  "RegistryConfig": {
+    "AllowNondistributableArtifactsCIDRs": [],
+    "AllowNondistributableArtifactsHostnames": [],
+    "IndexConfigs": {
+      "docker.io": {
+        "Mirrors": [],
+        "Name": "docker.io",
+        "Official": true,
+        "Secure": true
+      }
+    },
+    "InsecureRegistryCIDRs": ["127.0.0.0/8"],
+    "Mirrors": []
+  },
+  "RuncCommit": {
+    "Expected": "",
+    "ID": ""
+  },
+  "Runtimes": null,
+  "SecurityOptions": [],
+  "ServerVersion": "18.06.1-ce",
+  "SwapLimit": false,
+  "Swarm": {
+    "ControlAvailable": false,
+    "Error": "",
+    "LocalNodeState": "inactive",
+    "NodeAddr": "",
+    "NodeID": "",
+    "RemoteManagers": null
+  },
+  "SystemStatus": null,
+  "SystemTime": "2018-09-14T09:40:05.1369294+02:00"
+}

From a091bdaf80b65e1d33a99719ed6c40793aedc51f Mon Sep 17 00:00:00 2001
From: Dmitry Tretyakov <dtretyakov@gmail.com>
Date: Fri, 14 Sep 2018 11:22:43 +0200
Subject: [PATCH 0838/1272] Add WorkingDir property in containers exec

---
 .../dockerjava/api/command/ExecCreateCmd.java |  5 +++++
 .../core/command/ExecCreateCmdImpl.java       | 19 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
index 1ab974644..902d01016 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
@@ -26,6 +26,9 @@ public interface ExecCreateCmd extends SyncDockerCmd<ExecCreateCmdResponse> {
     @CheckForNull
     Boolean getPrivileged();
 
+    @CheckForNull
+    String getWorkingDir();
+
     ExecCreateCmd withAttachStderr(Boolean attachStderr);
 
     ExecCreateCmd withAttachStdin(Boolean attachStdin);
@@ -42,6 +45,8 @@ public interface ExecCreateCmd extends SyncDockerCmd<ExecCreateCmdResponse> {
 
     ExecCreateCmd withPrivileged(Boolean isPrivileged);
 
+    ExecCreateCmd withWorkingDir(String workingDir);
+
     interface Exec extends DockerCmdSyncExec<ExecCreateCmd, ExecCreateCmdResponse> {
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
index ed6e58211..051a45f0c 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
@@ -33,7 +33,7 @@ public class ExecCreateCmdImpl extends AbstrDockerCmd<ExecCreateCmd, ExecCreateC
     private Boolean privileged;
 
     /**
-     * @since {@link RemoteApiVersion#VERSION_1_19}
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_19}
      */
     @JsonProperty("User")
     private String user;
@@ -41,6 +41,12 @@ public class ExecCreateCmdImpl extends AbstrDockerCmd<ExecCreateCmd, ExecCreateC
     @JsonProperty("Cmd")
     private String[] cmd;
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_35}
+     */
+    @JsonProperty("WorkingDir")
+    private String workingDir;
+
     public ExecCreateCmdImpl(ExecCreateCmd.Exec exec, String containerId) {
         super(exec);
         withContainerId(containerId);
@@ -95,6 +101,12 @@ public ExecCreateCmd withPrivileged(Boolean privileged) {
         return this;
     }
 
+    @Override
+    public ExecCreateCmd withWorkingDir(String workingDir) {
+        this.workingDir = workingDir;
+        return this;
+    }
+
     @Override
     public String getContainerId() {
         return containerId;
@@ -130,6 +142,11 @@ public String getUser() {
         return user;
     }
 
+    @Override
+    public String getWorkingDir() {
+        return workingDir;
+    }
+
     /**
      * @throws NotFoundException
      *             No such container

From 2b6088874b1c7582c27423abdd5aefa2bd01b084 Mon Sep 17 00:00:00 2001
From: Dmitry Tretyakov <dtretyakov@gmail.com>
Date: Fri, 14 Sep 2018 11:24:21 +0200
Subject: [PATCH 0839/1272] Add missing properties in Version response

---
 .../github/dockerjava/api/model/Version.java  | 43 +++++++++
 .../api/model/VersionComponent.java           | 91 +++++++++++++++++++
 .../dockerjava/api/model/VersionPlatform.java | 52 +++++++++++
 .../dockerjava/api/model/VersionTest.java     | 48 ++++++++++
 .../resources/samples/1.38/version/lcow.json  | 31 +++++++
 5 files changed, 265 insertions(+)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/VersionComponent.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
 create mode 100644 src/test/resources/samples/1.38/version/lcow.json

diff --git a/src/main/java/com/github/dockerjava/api/model/Version.java b/src/main/java/com/github/dockerjava/api/model/Version.java
index f08c411e2..2dcfdcb86 100644
--- a/src/main/java/com/github/dockerjava/api/model/Version.java
+++ b/src/main/java/com/github/dockerjava/api/model/Version.java
@@ -9,6 +9,7 @@
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * Used for `/version`
@@ -53,6 +54,24 @@ public class Version implements Serializable {
     @JsonProperty("Experimental")
     private Boolean experimental;
 
+    /**
+     * @since ~{@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_25}
+     */
+    @JsonProperty("MinAPIVersion")
+    private String minAPIVersion;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_35}
+     */
+    @JsonProperty("Platform")
+    private VersionPlatform platform;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_35}
+     */
+    @JsonProperty("Components")
+    private List<VersionComponent> components;
+
     public String getVersion() {
         return version;
     }
@@ -97,6 +116,30 @@ public Boolean getExperimental() {
         return experimental;
     }
 
+    /**
+     * @see #minAPIVersion
+     */
+    @CheckForNull
+    public String getMinAPIVersion() {
+        return minAPIVersion;
+    }
+
+    /**
+     * @see #platform
+     */
+    @CheckForNull
+    public VersionPlatform getPlatform() {
+        return platform;
+    }
+
+    /**
+     * @see #components
+     */
+    @CheckForNull
+    public List<VersionComponent> getComponents() {
+        return components;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
diff --git a/src/main/java/com/github/dockerjava/api/model/VersionComponent.java b/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
new file mode 100644
index 000000000..90561d326
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
@@ -0,0 +1,91 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import javax.annotation.CheckForNull;
+import java.util.Map;
+
+/**
+ * Part of {@link Version}
+ *
+ * @author Dmitry Tretyakov
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class VersionComponent {
+
+    @JsonProperty("Details")
+    private Map<String, String> details;
+
+    @JsonProperty("Name")
+    private String name;
+
+    @JsonProperty("Version")
+    private String version;
+
+    /**
+     * @see #details
+     */
+    @CheckForNull
+    public Map<String, String> getDetails() {
+        return details;
+    }
+
+    /**
+     * @see #details
+     */
+    public VersionComponent withDetails(Map<String, String> details) {
+        this.details = details;
+        return this;
+    }
+
+    /**
+     * @see #name
+     */
+    @CheckForNull
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @see #name
+     */
+    public VersionComponent withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * @see #version
+     */
+    @CheckForNull
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * @see #version
+     */
+    public VersionComponent withVersion(String version) {
+        this.version = version;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java b/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
new file mode 100644
index 000000000..1af7d3c55
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
@@ -0,0 +1,52 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import javax.annotation.CheckForNull;
+
+/**
+ * Part of {@link Version}
+ *
+ * @author Dmitry Tretyakov
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class VersionPlatform {
+
+    @JsonProperty("Name")
+    private String name;
+
+    /**
+     * @see #name
+     */
+    @CheckForNull
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @see #name
+     */
+    public VersionPlatform withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+}
diff --git a/src/test/java/com/github/dockerjava/api/model/VersionTest.java b/src/test/java/com/github/dockerjava/api/model/VersionTest.java
index a2da244c5..606420b3c 100644
--- a/src/test/java/com/github/dockerjava/api/model/VersionTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/VersionTest.java
@@ -5,9 +5,15 @@
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.junit.Test;
 
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
 import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.notNullValue;
 
 /**
@@ -37,4 +43,46 @@ public void testSerDer1() throws Exception {
         assertThat(version.getBuildTime(), is("2016-02-11T20:39:58.688092588+00:00"));
     }
 
+    @Test
+    public void version_1_38() throws Exception {
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(Version.class);
+
+        final Version version = testRoundTrip(RemoteApiVersion.VERSION_1_38,
+                "/version/lcow.json",
+                type
+        );
+
+        assertThat(version, notNullValue());
+        assertThat(version.getApiVersion(), is("1.38"));
+        assertThat(version.getArch(), is("amd64"));
+        assertThat(version.getBuildTime(), is("2018-08-21T17:36:40.000000000+00:00"));
+
+        Map<String, String> details = new LinkedHashMap<>();
+        details.put("ApiVersion", "1.38");
+        details.put("Arch", "amd64");
+        details.put("BuildTime", "2018-08-21T17:36:40.000000000+00:00");
+        details.put("Experimental", "true");
+        details.put("GitCommit", "e68fc7a");
+        details.put("GoVersion", "go1.10.3");
+        details.put("KernelVersion", "10.0 17134 (17134.1.amd64fre.rs4_release.180410-1804)");
+        details.put("MinAPIVersion", "1.24");
+        details.put("Os", "windows");
+
+        List<VersionComponent> components = Collections.singletonList(new VersionComponent()
+                .withDetails(details)
+                .withName("Engine")
+                .withVersion("18.06.1-ce")
+        );
+        assertThat(version.getComponents(), equalTo(components));
+
+        assertThat(version.getExperimental(), is(true));
+        assertThat(version.getGitCommit(), is("e68fc7a"));
+        assertThat(version.getGoVersion(), is("go1.10.3"));
+        assertThat(version.getKernelVersion(), is("10.0 17134 (17134.1.amd64fre.rs4_release.180410-1804)"));
+        assertThat(version.getMinAPIVersion(), is("1.24"));
+        assertThat(version.getOperatingSystem(), is("windows"));
+        assertThat(version.getPlatform(), equalTo(new VersionPlatform().withName("")));
+        assertThat(version.getVersion(), is("18.06.1-ce"));
+    }
 }
diff --git a/src/test/resources/samples/1.38/version/lcow.json b/src/test/resources/samples/1.38/version/lcow.json
new file mode 100644
index 000000000..21f496823
--- /dev/null
+++ b/src/test/resources/samples/1.38/version/lcow.json
@@ -0,0 +1,31 @@
+{
+  "ApiVersion": "1.38",
+  "Arch": "amd64",
+  "BuildTime": "2018-08-21T17:36:40.000000000+00:00",
+  "Components": [{
+    "Details": {
+      "ApiVersion": "1.38",
+      "Arch": "amd64",
+      "BuildTime": "2018-08-21T17:36:40.000000000+00:00",
+      "Experimental": "true",
+      "GitCommit": "e68fc7a",
+      "GoVersion": "go1.10.3",
+      "KernelVersion": "10.0 17134 (17134.1.amd64fre.rs4_release.180410-1804)",
+      "MinAPIVersion": "1.24",
+      "Os": "windows"
+    },
+    "Name": "Engine",
+    "Version": "18.06.1-ce"
+  }
+  ],
+  "Experimental": true,
+  "GitCommit": "e68fc7a",
+  "GoVersion": "go1.10.3",
+  "KernelVersion": "10.0 17134 (17134.1.amd64fre.rs4_release.180410-1804)",
+  "MinAPIVersion": "1.24",
+  "Os": "windows",
+  "Platform": {
+    "Name": ""
+  },
+  "Version": "18.06.1-ce"
+}

From 9cd049239ee5ffaacee37728d429e5209881d2b8 Mon Sep 17 00:00:00 2001
From: Dmitry Tretyakov <dtretyakov@gmail.com>
Date: Fri, 14 Sep 2018 11:36:24 +0200
Subject: [PATCH 0840/1272] Make VersionComponent and VersionPlatform
 serializable

---
 .../com/github/dockerjava/api/model/VersionComponent.java   | 6 +++++-
 .../com/github/dockerjava/api/model/VersionPlatform.java    | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/VersionComponent.java b/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
index 90561d326..11fff0abc 100644
--- a/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
+++ b/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
@@ -2,20 +2,24 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import javax.annotation.CheckForNull;
+import java.io.Serializable;
 import java.util.Map;
 
 /**
  * Part of {@link Version}
  *
+ * @since {@link RemoteApiVersion#VERSION_1_35}
  * @author Dmitry Tretyakov
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class VersionComponent {
+public class VersionComponent implements Serializable {
+    public static final Long serialVersionUID = 1L;
 
     @JsonProperty("Details")
     private Map<String, String> details;
diff --git a/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java b/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
index 1af7d3c55..b3160438f 100644
--- a/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
+++ b/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
@@ -2,19 +2,23 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import javax.annotation.CheckForNull;
+import java.io.Serializable;
 
 /**
  * Part of {@link Version}
  *
+ * @since {@link RemoteApiVersion#VERSION_1_35}
  * @author Dmitry Tretyakov
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class VersionPlatform {
+public class VersionPlatform implements Serializable {
+    public static final Long serialVersionUID = 1L;
 
     @JsonProperty("Name")
     private String name;

From 2c2e301b4fae304f495730fd00fb9c61d6c92393 Mon Sep 17 00:00:00 2001
From: Dmitry Tretyakov <dtretyakov@gmail.com>
Date: Fri, 14 Sep 2018 18:50:49 +0200
Subject: [PATCH 0841/1272] Add withFilter methods in ListNetworksCmd &
 ListVolumesCmd

---
 .../github/dockerjava/api/command/ListNetworksCmd.java |  8 ++++++++
 .../github/dockerjava/api/command/ListVolumesCmd.java  |  8 ++++++++
 .../dockerjava/core/command/ListNetworksCmdImpl.java   | 10 ++++++++++
 .../dockerjava/core/command/ListVolumesCmdImpl.java    |  8 ++++++++
 4 files changed, 34 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java b/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
index 23d92151c..40e3d421c 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
@@ -5,6 +5,7 @@
 
 import javax.annotation.CheckForNull;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -22,6 +23,13 @@ public interface ListNetworksCmd extends SyncDockerCmd<List<Network>> {
 
     ListNetworksCmd withIdFilter(String... networkId);
 
+    /**
+     * @param filterName
+     * @param filterValues
+     *            - Show only networks where the filter matches the given values
+     */
+    ListNetworksCmd withFilter(String filterName, Collection<String> filterValues);
+
     interface Exec extends DockerCmdSyncExec<ListNetworksCmd, List<Network>> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java b/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java
index 88c6ee291..bd66653eb 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.command;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -21,6 +22,13 @@ public interface ListVolumesCmd extends SyncDockerCmd<ListVolumesResponse> {
      */
     ListVolumesCmd withDanglingFilter(Boolean dangling);
 
+    /**
+     * @param filterName
+     * @param filterValues
+     *            - Show only volumes where the filter matches the given values
+     */
+    ListVolumesCmd withFilter(String filterName, Collection<String> filterValues);
+
     interface Exec extends DockerCmdSyncExec<ListVolumesCmd, ListVolumesResponse> {
     }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java
index 44a9d2cfb..65c13e255 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java
@@ -4,9 +4,12 @@
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.core.util.FiltersBuilder;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 public class ListNetworksCmdImpl extends AbstrDockerCmd<ListNetworksCmd, List<Network>> implements ListNetworksCmd {
 
     private FiltersBuilder filtersBuilder = new FiltersBuilder();
@@ -31,4 +34,11 @@ public ListNetworksCmd withNameFilter(String... networkName) {
         this.filtersBuilder.withFilter("name", networkName);
         return this;
     }
+
+    @Override
+    public ListNetworksCmd withFilter(String filterName, Collection<String> filterValues) {
+        checkNotNull(filterValues, filterName + " was not specified");
+        this.filtersBuilder.withFilter(filterName, filterValues);
+        return this;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java
index d9efe7b17..b3a18d776 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java
@@ -2,6 +2,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -33,4 +34,11 @@ public ListVolumesCmd withDanglingFilter(Boolean dangling) {
         this.filters.withFilter("dangling", dangling.toString());
         return this;
     }
+
+    @Override
+    public ListVolumesCmd withFilter(String filterName, Collection<String> filterValues) {
+        checkNotNull(filterValues, filterName + " was not specified");
+        this.filters.withFilter(filterName, filterValues);
+        return this;
+    }
 }

From ecef825e3c48819f81bf1a62b24b4eb911dee004 Mon Sep 17 00:00:00 2001
From: Dmitry Tretyakov <dtretyakov@gmail.com>
Date: Tue, 18 Sep 2018 13:19:55 +0200
Subject: [PATCH 0842/1272] Add missing properties in InspectContainer response

---
 .../dockerjava/api/command/GraphDriver.java   |   2 +-
 .../api/command/InspectContainerResponse.java |  25 +++
 .../dockerjava/api/model/HostConfig.java      |  22 +++
 .../command/InspectContainerResponseTest.java |  56 ++++++
 .../samples/1.38/containers/inspect/lcow.json | 169 ++++++++++++++++++
 5 files changed, 273 insertions(+), 1 deletion(-)
 create mode 100644 src/test/resources/samples/1.38/containers/inspect/lcow.json

diff --git a/src/main/java/com/github/dockerjava/api/command/GraphDriver.java b/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
index 1394e866e..598061168 100644
--- a/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
+++ b/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
@@ -10,7 +10,7 @@
 import javax.annotation.CheckForNull;
 
 /**
- * Part of {@link InspectImageResponse}
+ * Part of {@link InspectImageResponse} and {@link InspectContainerResponse}
  *
  * @author Kanstantsin Shautsou
  * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21}
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index 7e60b0be3..cc2761abe 100644
--- a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -110,6 +110,15 @@ public class InspectContainerResponse {
     @JsonProperty("Mounts")
     private List<Mount> mounts;
 
+    @JsonProperty("GraphDriver")
+    private GraphDriver graphDriver;
+
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_30}
+     */
+    @JsonProperty("Platform")
+    private String platform;
+
     public String getId() {
         return id;
     }
@@ -227,6 +236,22 @@ public Node getNode() {
         return node;
     }
 
+    /**
+     * @see #graphDriver
+     */
+    @CheckForNull
+    public GraphDriver getGraphDriver() {
+        return graphDriver;
+    }
+
+    /**
+     * @see #platform
+     */
+    @CheckForNull
+    public String getPlatform() {
+        return platform;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 624c4545e..b857725e3 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -225,6 +225,12 @@ public class HostConfig implements Serializable {
     @JsonProperty("Tmpfs")
     private Map<String, String> tmpFs;
 
+    /**
+     * @since ~{@link RemoteApiVersion#VERSION_1_22}
+     */
+    @JsonProperty("Isolation")
+    private String isolation;
+
     @JsonIgnore
     public Bind[] getBinds() {
         return (binds == null) ? new Bind[0] : binds.getBinds();
@@ -329,6 +335,14 @@ public String getPidMode() {
         return pidMode;
     }
 
+    /**
+     * @see #isolation
+     */
+    @CheckForNull
+    public String getIsolation() {
+        return isolation;
+    }
+
     /**
      * @see #blkioDeviceReadBps
      */
@@ -892,6 +906,14 @@ public HostConfig withTmpFs(Map<String, String> tmpFs) {
         return this;
     }
 
+    /**
+     * @see #isolation
+     */
+    public HostConfig withIsolation(String isolation) {
+        this.isolation = isolation;
+        return this;
+    }
+
     // end of auto-generated
 
     @Override
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
index ce3a6b83e..ee38b70d0 100644
--- a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
+++ b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
@@ -17,11 +17,13 @@
 
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.model.ContainerNetwork;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.List;
 
 import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
@@ -30,6 +32,7 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.core.IsNot.not;
 import static org.junit.Assert.assertEquals;
@@ -131,4 +134,57 @@ public void roundTrip_1_26b_full() throws IOException {
     public void roundTrip_empty() throws IOException {
         testRoundTrip(CommandJSONSamples.inspectContainerResponse_empty, InspectContainerResponse[].class);
     }
+
+    @Test
+    public void inspect_windows_container() throws IOException {
+
+        final ObjectMapper mapper = new ObjectMapper();
+        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(InspectContainerResponse.class);
+
+        final InspectContainerResponse response = testRoundTrip(RemoteApiVersion.VERSION_1_38,
+                "/containers/inspect/lcow.json",
+                type
+        );
+
+        assertThat(response, notNullValue());
+
+        assertThat(response.getConfig(), notNullValue());
+        assertThat(response.getConfig().getCmd(), is(new String[]{"cmd"}));
+        assertThat(response.getConfig().getImage(), is("microsoft/nanoserver"));
+
+        assertThat(response.getDriver(), is("windowsfilter"));
+
+        assertThat(response.getGraphDriver(), notNullValue());
+        assertThat(response.getGraphDriver().getName(), is("windowsfilter"));
+        assertThat(response.getGraphDriver().getData(), is(new GraphData().withDir(
+                "C:\\ProgramData\\Docker\\windowsfilter\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556"
+        )));
+
+        assertThat(response.getHostConfig(), notNullValue());
+        assertThat(response.getHostConfig().getIsolation(), is("hyperv"));
+
+        assertThat(response.getImageId(), is("sha256:1381511ec0122f197b6abff5bc0692bef19943ddafd6680eff41197afa3a6dda"));
+        assertThat(response.getLogPath(), is(
+                "C:\\ProgramData\\Docker\\containers\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556" +
+                        "\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556-json.log"
+        ));
+        assertThat(response.getName(), is("/cranky_clarke"));
+
+        assertThat(response.getNetworkSettings(), notNullValue());
+        assertThat(response.getNetworkSettings().getNetworks(), is(Collections.singletonMap("nat",
+                new ContainerNetwork()
+                        .withEndpointId("493b77d6fe7e3b92435b1eb01461fde669781330deb84a9cbada360db8997ebc")
+                        .withGateway("172.17.18.1")
+                        .withGlobalIPv6Address("")
+                        .withGlobalIPv6PrefixLen(0)
+                        .withIpv4Address("172.17.18.123")
+                        .withIpPrefixLen(16)
+                        .withIpV6Gateway("")
+                        .withMacAddress("00:aa:ff:cf:dd:09")
+                        .withNetworkID("398c0e206dd677ed4a6566f9de458311f5767d8c7a8b963275490ab64c5d10a7")
+        )));
+
+        assertThat(response.getPath(), is("cmd"));
+        assertThat(response.getPlatform(), is("windows"));
+    }
 }
diff --git a/src/test/resources/samples/1.38/containers/inspect/lcow.json b/src/test/resources/samples/1.38/containers/inspect/lcow.json
new file mode 100644
index 000000000..4e7725def
--- /dev/null
+++ b/src/test/resources/samples/1.38/containers/inspect/lcow.json
@@ -0,0 +1,169 @@
+{
+  "AppArmorProfile": "",
+  "Args": [],
+  "Config": {
+    "AttachStderr": true,
+    "AttachStdin": true,
+    "AttachStdout": true,
+    "Cmd": [
+      "cmd"
+    ],
+    "Domainname": "",
+    "Entrypoint": null,
+    "Env": null,
+    "Hostname": "35da02ca897b",
+    "Image": "microsoft/nanoserver",
+    "Labels": {},
+    "OnBuild": null,
+    "OpenStdin": true,
+    "StdinOnce": true,
+    "Tty": true,
+    "User": "",
+    "Volumes": null,
+    "WorkingDir": ""
+  },
+  "Created": "2018-09-18T10:37:25.0470753Z",
+  "Driver": "windowsfilter",
+  "ExecIDs": null,
+  "GraphDriver": {
+    "Data": {
+      "dir": "C:\\ProgramData\\Docker\\windowsfilter\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556"
+    },
+    "Name": "windowsfilter"
+  },
+  "HostConfig": {
+    "AutoRemove": true,
+    "Binds": null,
+    "BlkioDeviceReadBps": null,
+    "BlkioDeviceReadIOps": null,
+    "BlkioDeviceWriteBps": null,
+    "BlkioDeviceWriteIOps": null,
+    "BlkioWeight": 0,
+    "BlkioWeightDevice": [],
+    "CapAdd": null,
+    "CapDrop": null,
+    "Cgroup": "",
+    "CgroupParent": "",
+    "ConsoleSize": [
+      50,
+      173
+    ],
+    "ContainerIDFile": "",
+    "CpuCount": 0,
+    "CpuPercent": 0,
+    "CpuPeriod": 0,
+    "CpuQuota": 0,
+    "CpuRealtimePeriod": 0,
+    "CpuRealtimeRuntime": 0,
+    "CpuShares": 0,
+    "CpusetCpus": "",
+    "CpusetMems": "",
+    "DeviceCgroupRules": null,
+    "Devices": [],
+    "DiskQuota": 0,
+    "Dns": [],
+    "DnsOptions": [],
+    "DnsSearch": [],
+    "ExtraHosts": null,
+    "GroupAdd": null,
+    "IOMaximumBandwidth": 0,
+    "IOMaximumIOps": 0,
+    "IpcMode": "",
+    "Isolation": "hyperv",
+    "KernelMemory": 0,
+    "Links": null,
+    "LogConfig": {
+      "Config": {},
+      "Type": "json-file"
+    },
+    "MaskedPaths": null,
+    "Memory": 0,
+    "MemoryReservation": 0,
+    "MemorySwap": 0,
+    "MemorySwappiness": null,
+    "NanoCpus": 0,
+    "NetworkMode": "default",
+    "OomKillDisable": false,
+    "OomScoreAdj": 0,
+    "PidMode": "",
+    "PidsLimit": 0,
+    "PortBindings": {},
+    "Privileged": false,
+    "PublishAllPorts": false,
+    "ReadonlyPaths": null,
+    "ReadonlyRootfs": false,
+    "RestartPolicy": {
+      "MaximumRetryCount": 0,
+      "Name": "no"
+    },
+    "SecurityOpt": null,
+    "ShmSize": 0,
+    "UTSMode": "",
+    "Ulimits": null,
+    "UsernsMode": "",
+    "VolumeDriver": "",
+    "VolumesFrom": null
+  },
+  "HostnamePath": "",
+  "HostsPath": "",
+  "Id": "35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556",
+  "Image": "sha256:1381511ec0122f197b6abff5bc0692bef19943ddafd6680eff41197afa3a6dda",
+  "LogPath": "C:\\ProgramData\\Docker\\containers\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556-json.log",
+  "MountLabel": "",
+  "Mounts": [],
+  "Name": "/cranky_clarke",
+  "NetworkSettings": {
+    "Bridge": "",
+    "EndpointID": "",
+    "Gateway": "",
+    "GlobalIPv6Address": "",
+    "GlobalIPv6PrefixLen": 0,
+    "HairpinMode": false,
+    "IPAddress": "",
+    "IPPrefixLen": 0,
+    "IPv6Gateway": "",
+    "LinkLocalIPv6Address": "",
+    "LinkLocalIPv6PrefixLen": 0,
+    "MacAddress": "",
+    "Networks": {
+      "nat": {
+        "Aliases": null,
+        "DriverOpts": null,
+        "EndpointID": "493b77d6fe7e3b92435b1eb01461fde669781330deb84a9cbada360db8997ebc",
+        "Gateway": "172.17.18.1",
+        "GlobalIPv6Address": "",
+        "GlobalIPv6PrefixLen": 0,
+        "IPAMConfig": null,
+        "IPAddress": "172.17.18.123",
+        "IPPrefixLen": 16,
+        "IPv6Gateway": "",
+        "Links": null,
+        "MacAddress": "00:aa:ff:cf:dd:09",
+        "NetworkID": "398c0e206dd677ed4a6566f9de458311f5767d8c7a8b963275490ab64c5d10a7"
+      }
+    },
+    "Ports": {},
+    "SandboxID": "35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556",
+    "SandboxKey": "35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556",
+    "SecondaryIPAddresses": null,
+    "SecondaryIPv6Addresses": null
+  },
+  "Path": "cmd",
+  "Platform": "windows",
+  "ProcessLabel": "",
+  "ResolvConfPath": "",
+  "RestartCount": 0,
+  "State": {
+    "Dead": false,
+    "Error": "",
+    "ExitCode": 0,
+    "FinishedAt": "0001-01-01T00:00:00Z",
+    "OOMKilled": false,
+    "Paused": false,
+    "Pid": 1588,
+    "Restarting": false,
+    "Running": true,
+    "StartedAt": "2018-09-18T10:37:28.3668368Z",
+    "Status": "running"
+  }
+}
\ No newline at end of file

From 89d01df4c3c4bdd432edad41826c01c38cf61bcd Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 18 Sep 2018 23:44:24 +0300
Subject: [PATCH 0843/1272] [maven-release-plugin] prepare release 3.1.0-rc-5

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7f9cefc94..983bd071f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.0-SNAPSHOT</version>
+	<version>3.1.0-rc-5</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.1.0-rc-5</tag>
 	</scm>
 
 	<developers>

From cb7a56da513eda33514c649636668455c0f31fac Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 18 Sep 2018 23:44:40 +0300
Subject: [PATCH 0844/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 983bd071f..7f9cefc94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.0-rc-5</version>
+	<version>3.1.0-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.1.0-rc-5</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From a097fac99c7735c5a703e56fe1a9e07decbce673 Mon Sep 17 00:00:00 2001
From: John Erwin <joerwin69@gmail.com>
Date: Wed, 26 Sep 2018 17:33:02 -0600
Subject: [PATCH 0845/1272] Ignore all but specified files (#1105)

* Implement fix for ignore all files except specified, with a test

* Fix Typo
---
 .../github/dockerjava/core/dockerfile/Dockerfile.java | 10 ++++------
 .../dockerfile/DockerfileAddMultipleFilesTest.java    | 11 +++++++++++
 .../dockerignore/IgnoreAllBut/.dockerignore           |  3 +++
 .../buildTests/dockerignore/IgnoreAllBut/Dockerfile   |  1 +
 .../buildTests/dockerignore/IgnoreAllBut/README.MD    |  1 +
 .../dockerignore/IgnoreAllBut/build/libs/foo.jar      |  1 +
 .../buildTests/dockerignore/IgnoreAllBut/test/bar.txt |  1 +
 7 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 src/test/resources/buildTests/dockerignore/IgnoreAllBut/.dockerignore
 create mode 100644 src/test/resources/buildTests/dockerignore/IgnoreAllBut/Dockerfile
 create mode 100644 src/test/resources/buildTests/dockerignore/IgnoreAllBut/README.MD
 create mode 100644 src/test/resources/buildTests/dockerignore/IgnoreAllBut/build/libs/foo.jar
 create mode 100644 src/test/resources/buildTests/dockerignore/IgnoreAllBut/test/bar.txt

diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index c9931efbd..11ed5fc4e 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -205,12 +205,10 @@ private void addFilesInDirectory(File directory) {
 
             if (files.length != 0) {
                 for (File f : files) {
-                    if (effectiveMatchingIgnorePattern(f) == null) {
-                        if (f.isDirectory()) {
-                            addFilesInDirectory(f);
-                        } else {
-                            filesToAdd.add(f);
-                        }
+                    if (f.isDirectory()) {
+                        addFilesInDirectory(f);
+                    } else if (effectiveMatchingIgnorePattern(f) == null) {
+                        filesToAdd.add(f);
                     }
                 }
                 // base directory should at least contains Dockerfile, but better check
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
index ee1f072df..a10990d96 100644
--- a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
+++ b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
@@ -24,6 +24,17 @@ public String apply(File file) {
         }
     };
 
+    @Test
+    public void ignoreAllBut() throws Exception {
+        File baseDir = fileFromBuildTestResource("dockerignore/IgnoreAllBut");
+        Dockerfile dockerfile = new Dockerfile(new File(baseDir, "Dockerfile"), baseDir);
+        Dockerfile.ScannedResult result = dockerfile.parse();
+        Collection<String> filesToAdd = transform(result.filesToAdd, TO_FILE_NAMES);
+
+        assertThat(filesToAdd,
+                   containsInAnyOrder("Dockerfile", "foo.jar"));
+    }
+    
     @Test
     public void nestedDirsPatterns() throws Exception {
         File baseDir = fileFromBuildTestResource("dockerignore/NestedDirsDockerignore");
diff --git a/src/test/resources/buildTests/dockerignore/IgnoreAllBut/.dockerignore b/src/test/resources/buildTests/dockerignore/IgnoreAllBut/.dockerignore
new file mode 100644
index 000000000..116300b83
--- /dev/null
+++ b/src/test/resources/buildTests/dockerignore/IgnoreAllBut/.dockerignore
@@ -0,0 +1,3 @@
+*
+!Dockerfile
+!build/libs/foo.jar
\ No newline at end of file
diff --git a/src/test/resources/buildTests/dockerignore/IgnoreAllBut/Dockerfile b/src/test/resources/buildTests/dockerignore/IgnoreAllBut/Dockerfile
new file mode 100644
index 000000000..617801170
--- /dev/null
+++ b/src/test/resources/buildTests/dockerignore/IgnoreAllBut/Dockerfile
@@ -0,0 +1 @@
+FROM ubuntu:18.04
diff --git a/src/test/resources/buildTests/dockerignore/IgnoreAllBut/README.MD b/src/test/resources/buildTests/dockerignore/IgnoreAllBut/README.MD
new file mode 100644
index 000000000..ac11abdc4
--- /dev/null
+++ b/src/test/resources/buildTests/dockerignore/IgnoreAllBut/README.MD
@@ -0,0 +1 @@
+DO NOT WANT THIS IN THE DOCKER
diff --git a/src/test/resources/buildTests/dockerignore/IgnoreAllBut/build/libs/foo.jar b/src/test/resources/buildTests/dockerignore/IgnoreAllBut/build/libs/foo.jar
new file mode 100644
index 000000000..4d6bf796e
--- /dev/null
+++ b/src/test/resources/buildTests/dockerignore/IgnoreAllBut/build/libs/foo.jar
@@ -0,0 +1 @@
+foo.jar
\ No newline at end of file
diff --git a/src/test/resources/buildTests/dockerignore/IgnoreAllBut/test/bar.txt b/src/test/resources/buildTests/dockerignore/IgnoreAllBut/test/bar.txt
new file mode 100644
index 000000000..c7152c4d8
--- /dev/null
+++ b/src/test/resources/buildTests/dockerignore/IgnoreAllBut/test/bar.txt
@@ -0,0 +1 @@
+FILE

From 5c03371b8875ac3ddc1d04a7f930edd05215e7c6 Mon Sep 17 00:00:00 2001
From: Yuting Liu <yuting@sumologic.com>
Date: Thu, 4 Jan 2018 13:41:07 -0800
Subject: [PATCH 0846/1272] Add the unit test for blkioStats

---
 .../dockerjava/api/model/StatisticsTest.java  | 14 ++++
 .../containers/container/stats/stats1.json    | 72 ++++++++++++++-----
 2 files changed, 68 insertions(+), 18 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java b/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
index c0bc01d84..ceef34efd 100644
--- a/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
@@ -87,6 +87,20 @@ public void serderJson1() throws IOException {
         assertThat(blkioStats.getIoServiceBytesRecursive().size(), is(2));
         assertThat(blkioStats.getIoServiceBytesRecursive().get(0).getValue(), is(26214L));
         assertThat(blkioStats.getIoServicedRecursive().size(), is(2));
+        assertThat(blkioStats.getIoServiceBytesRecursive(), equalTo(Arrays.asList(
+            new BlkioStatEntry().withMajor(259L).withMinor(0L).withOp("Read").withValue(823296L),
+            new BlkioStatEntry().withMajor(259L).withMinor(0L).withOp("Write").withValue(122880L),
+            new BlkioStatEntry().withMajor(259L).withMinor(0L).withOp("Sync").withValue(835584L),
+            new BlkioStatEntry().withMajor(259L).withMinor(0L).withOp("Async").withValue(110592L),
+            new BlkioStatEntry().withMajor(259L).withMinor(0L).withOp("Total").withValue(946176L)
+        )));
+        assertThat(blkioStats.getIoServicedRecursive(), equalTo(Arrays.asList(
+            new BlkioStatEntry().withMajor(259L).withMinor(0L).withOp("Read").withValue(145L),
+            new BlkioStatEntry().withMajor(259L).withMinor(0L).withOp("Write").withValue(4L),
+            new BlkioStatEntry().withMajor(259L).withMinor(0L).withOp("Sync").withValue(148L),
+            new BlkioStatEntry().withMajor(259L).withMinor(0L).withOp("Async").withValue(1L),
+            new BlkioStatEntry().withMajor(259L).withMinor(0L).withOp("Total").withValue(149L)
+        )));
         assertThat(blkioStats.getIoQueueRecursive(), is(empty()));
         assertThat(blkioStats.getIoServiceTimeRecursive(), is(empty()));
         assertThat(blkioStats.getIoWaitTimeRecursive(), is(empty()));
diff --git a/src/test/resources/samples/1.27/containers/container/stats/stats1.json b/src/test/resources/samples/1.27/containers/container/stats/stats1.json
index cb5f324f0..e351d0cbd 100644
--- a/src/test/resources/samples/1.27/containers/container/stats/stats1.json
+++ b/src/test/resources/samples/1.27/containers/container/stats/stats1.json
@@ -5,32 +5,68 @@
     "current":2
   },
   "blkio_stats":{
-    "io_service_bytes_recursive": [
+    "io_service_bytes_recursive":[
       {
-        "major": 8,
-        "minor": "0",
-        "op": "Read",
-        "value": 26214
+        "major":259,
+        "minor":0,
+        "op":"Read",
+        "value":823296
       },
       {
-        "major": 8,
-        "minor": "0",
-        "op": "Write",
-        "value": 26214
+        "major":259,
+        "minor":0,
+        "op":"Write",
+        "value":122880
+      },
+      {
+        "major":259,
+        "minor":0,
+        "op":"Sync",
+        "value":835584
+      },
+      {
+        "major":259,
+        "minor":0,
+        "op":"Async",
+        "value":110592
+      },
+      {
+        "major":259,
+        "minor":0,
+        "op":"Total",
+        "value":946176
       }
     ],
-    "io_serviced_recursive": [
+    "io_serviced_recursive":[
+      {
+        "major":259,
+        "minor":0,
+        "op":"Read",
+        "value":145
+      },
+      {
+        "major":259,
+        "minor":0,
+        "op":"Write",
+        "value":4
+      },
+      {
+        "major":259,
+        "minor":0,
+        "op":"Sync",
+        "value":148
+      },
       {
-        "major": 8,
-        "minor": 0,
-        "op": "Read",
-        "value": 41771
+        "major":259,
+        "minor":0,
+        "op":"Async",
+        "value":1
       },
       {
-        "major": 8,
-        "minor": 0,
-        "op": "Write",
-        "value": 72796
+        "major":259,
+        "minor":0,
+        "op":"Total",
+        "value":149
       }
     ],
     "io_queue_recursive":[

From d7ccfa6d12f593160d9e99921f0fb878ab09db0b Mon Sep 17 00:00:00 2001
From: Yuting Liu <yuting@sumologic.com>
Date: Wed, 10 Jan 2018 10:41:19 -0800
Subject: [PATCH 0847/1272] Add failcnt into memorystatsconfig

---
 .../api/model/MemoryStatsConfig.java          | 22 ++++++++++++++-----
 .../dockerjava/api/model/StatisticsTest.java  |  8 ++++---
 .../containers/container/stats/stats1.json    |  3 ++-
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java b/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
index 77c9f0b28..4320a89ed 100644
--- a/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
@@ -15,18 +15,29 @@
 public class MemoryStatsConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    @JsonProperty("stats")
+    private StatsConfig stats;
+
     @JsonProperty("usage")
     private Long usage;
 
     @JsonProperty("max_usage")
     private Long maxUsage;
 
-    @JsonProperty("stats")
-    private StatsConfig stats;
+    @JsonProperty("failcnt")
+    private Long failcnt;
 
     @JsonProperty("limit")
     private Long limit;
 
+    /**
+     * @see #stats
+     */
+    @CheckForNull
+    public StatsConfig getStats() {
+        return stats;
+    }
+
     /**
      * @see #usage
      */
@@ -44,11 +55,10 @@ public Long getMaxUsage() {
     }
 
     /**
-     * @see #stats
+     * @see #failcnt
      */
-    @CheckForNull
-    public StatsConfig getStats() {
-        return stats;
+    public Long getFailcnt() {
+        return failcnt;
     }
 
     /**
diff --git a/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java b/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
index ceef34efd..6082731af 100644
--- a/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.core.RemoteApiVersion;
+import org.hamcrest.Matchers;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -82,11 +83,10 @@ public void serderJson1() throws IOException {
         assertThat(stats.getWriteback(), is(0L));
 
         assertThat(memoryStats.getLimit(), is(2095874048L));
+        assertThat(memoryStats.getFailcnt(), is(0L));
 
         final BlkioStatsConfig blkioStats = statistics.getBlkioStats();
-        assertThat(blkioStats.getIoServiceBytesRecursive().size(), is(2));
-        assertThat(blkioStats.getIoServiceBytesRecursive().get(0).getValue(), is(26214L));
-        assertThat(blkioStats.getIoServicedRecursive().size(), is(2));
+        assertThat(blkioStats.getIoServiceBytesRecursive(), Matchers.<BlkioStatEntry>hasSize(5));
         assertThat(blkioStats.getIoServiceBytesRecursive(), equalTo(Arrays.asList(
             new BlkioStatEntry().withMajor(259L).withMinor(0L).withOp("Read").withValue(823296L),
             new BlkioStatEntry().withMajor(259L).withMinor(0L).withOp("Write").withValue(122880L),
@@ -94,6 +94,8 @@ public void serderJson1() throws IOException {
             new BlkioStatEntry().withMajor(259L).withMinor(0L).withOp("Async").withValue(110592L),
             new BlkioStatEntry().withMajor(259L).withMinor(0L).withOp("Total").withValue(946176L)
         )));
+
+        assertThat(blkioStats.getIoServicedRecursive(), Matchers.<BlkioStatEntry>hasSize(5));
         assertThat(blkioStats.getIoServicedRecursive(), equalTo(Arrays.asList(
             new BlkioStatEntry().withMajor(259L).withMinor(0L).withOp("Read").withValue(145L),
             new BlkioStatEntry().withMajor(259L).withMinor(0L).withOp("Write").withValue(4L),
diff --git a/src/test/resources/samples/1.27/containers/container/stats/stats1.json b/src/test/resources/samples/1.27/containers/container/stats/stats1.json
index e351d0cbd..5a80cd99c 100644
--- a/src/test/resources/samples/1.27/containers/container/stats/stats1.json
+++ b/src/test/resources/samples/1.27/containers/container/stats/stats1.json
@@ -171,7 +171,8 @@
       "unevictable":0,
       "writeback":0
     },
-    "limit":2095874048
+    "limit":2095874048,
+    "failcnt":0
   },
   "name":"/gallant_hamilton",
   "id":"b581d78b03e41d81c9fe941f03f5d35e23733ff96370456b58d2906e002b0deb",

From 43cc60161100087e75b87ce4c030ea27b6e54a5c Mon Sep 17 00:00:00 2001
From: Casper Green <cbkg11@gmail.com>
Date: Fri, 28 Sep 2018 10:46:34 +0200
Subject: [PATCH 0848/1272] Change since parameter in LogContainerCmd to String

---
 .../api/command/LogContainerCmd.java          |  8 ++---
 .../core/command/LogContainerCmdImpl.java     | 11 +++---
 .../dockerjava/cmd/LogContainerCmdIT.java     | 36 ++++++++++++++++++-
 3 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
index 53674cbaa..7a92c898d 100644
--- a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -23,8 +23,8 @@
  * @param tail
  *            - `all` or `<number>`, Output specified number of lines at the end of logs
  * @param since
- *            - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default:
- *            0 (unfiltered)
+ *            - UNIX timestamp, RFC 3339 date, or Go duration string to filter logs.
+ *            Specifying a timestamp will only output log-entries since that timestamp. Default: 0 (unfiltered)
  */
 public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame> {
 
@@ -47,7 +47,7 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame>
     Boolean hasStderrEnabled();
 
     @CheckForNull
-    Integer getSince();
+    String getSince();
 
     LogContainerCmd withContainerId(@Nonnull String containerId);
 
@@ -67,7 +67,7 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame>
 
     LogContainerCmd withTail(Integer tail);
 
-    LogContainerCmd withSince(Integer since);
+    LogContainerCmd withSince(String since);
 
     /**
      * @throws com.github.dockerjava.api.NotFoundException
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
index aa267fc8f..0b18cd938 100644
--- a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -22,8 +22,8 @@
  * @param tail
  *            - `all` or `<number>`, Output specified number of lines at the end of logs
  * @param since
- *            - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default:
- *            0 (unfiltered)
+ *            - UNIX timestamp, RFC 3339 date, or Go duration string to filter logs.
+ *            Specifying a timestamp will only output log-entries since that timestamp. Default: 0 (unfiltered)
  */
 public class LogContainerCmdImpl extends AbstrAsyncDockerCmd<LogContainerCmd, Frame> implements LogContainerCmd {
 
@@ -31,7 +31,8 @@ public class LogContainerCmdImpl extends AbstrAsyncDockerCmd<LogContainerCmd, Fr
 
     private Boolean followStream, timestamps, stdout, stderr;
 
-    private Integer tail, since;
+    private Integer tail;
+    private String since;
 
     public LogContainerCmdImpl(LogContainerCmd.Exec exec, String containerId) {
         super(exec);
@@ -69,7 +70,7 @@ public Boolean hasStderrEnabled() {
     }
 
     @Override
-    public Integer getSince() {
+    public String getSince() {
         return since;
     }
 
@@ -117,7 +118,7 @@ public LogContainerCmd withTail(Integer tail) {
     }
 
     @Override
-    public LogContainerCmd withSince(Integer since) {
+    public LogContainerCmd withSince(String since) {
         this.since = since;
         return this;
     }
diff --git a/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
index db0700ecc..093415e1d 100644
--- a/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
@@ -175,7 +175,7 @@ public void asyncLogContainerWithSince() throws Exception {
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        int timestamp = (int) (System.currentTimeMillis() / 1000);
+        String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
@@ -197,4 +197,38 @@ public void asyncLogContainerWithSince() throws Exception {
 
         assertThat(loggingCallback.toString(), containsString(snippet));
     }
+
+    @Test
+    public void asyncLogContainerWithSinceNanoseconds() throws Exception {
+        String snippet = "hello world";
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+                .withCmd("/bin/echo", snippet)
+                .exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(isEmptyString()));
+
+        String timestamp = String.format("%.4f", System.currentTimeMillis() / 1000d);
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        int exitCode = dockerRule.getClient().waitContainerCmd(container.getId())
+                .exec(new WaitContainerResultCallback())
+                .awaitStatusCode();
+
+        assertThat(exitCode, equalTo(0));
+
+        LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
+
+        dockerRule.getClient().logContainerCmd(container.getId())
+                .withStdErr(true)
+                .withStdOut(true)
+                .withTimestamps(true)
+                .withSince(timestamp)
+                .exec(loggingCallback);
+
+        loggingCallback.awaitCompletion();
+
+        assertThat(loggingCallback.toString(), containsString(snippet));
+    }
 }

From d2b96e50a236b8f6f65689343ebfffa1c8d19b71 Mon Sep 17 00:00:00 2001
From: Silvestre Zabala <silvestre.zabala@sap.com>
Date: Fri, 28 Sep 2018 15:17:53 +0200
Subject: [PATCH 0849/1272] Add HostConfig.StorageOpt

API v1.24: "POST /containers/create now takes StorageOpt field."
---
 .../dockerjava/api/model/HostConfig.java      | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index b857725e3..9974622e9 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -174,6 +174,12 @@ public class HostConfig implements Serializable {
     @JsonProperty("RestartPolicy")
     private RestartPolicy restartPolicy;
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_24}
+     */
+    @JsonProperty("StorageOpt")
+    private Map<String, String> storageOpt;
+
     @JsonProperty("Ulimits")
     private Ulimit[] ulimits;
 
@@ -845,6 +851,21 @@ public HostConfig withRestartPolicy(RestartPolicy restartPolicy) {
         return this;
     }
 
+    /**
+     * @see #storageOpt
+     */
+    public Map<String, String> getStorageOpt() {
+        return storageOpt;
+    }
+
+    /**
+     * @see #storageOpt
+     */
+    public HostConfig withStorageOpt(Map<String, String> storageOpt) {
+        this.storageOpt = storageOpt;
+        return this;
+    }
+
     /**
      * @see #securityOpts
      */

From 118c3dc7dd62457adad6cbd8c770b08801ebaf9a Mon Sep 17 00:00:00 2001
From: Silvestre Zabala <silvestre.zabala@sap.com>
Date: Fri, 28 Sep 2018 15:51:25 +0200
Subject: [PATCH 0850/1272] Add ExecCreateCmd.Env

API v1.25: "POST /containers/(id or name)/exec now accepts an Env field,
which holds a list of environment variables to be set in the context of
the command execution."
---
 .../dockerjava/api/command/ExecCreateCmd.java |  7 +++++++
 .../core/command/ExecCreateCmdImpl.java       | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
index 902d01016..c03a6334a 100644
--- a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.api.command;
 
+import java.util.List;
+
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
@@ -20,6 +22,9 @@ public interface ExecCreateCmd extends SyncDockerCmd<ExecCreateCmdResponse> {
     @CheckForNull
     Boolean hasTtyEnabled();
 
+    @CheckForNull
+    List<String> getEnv();
+
     @CheckForNull
     String getUser();
 
@@ -37,6 +42,8 @@ public interface ExecCreateCmd extends SyncDockerCmd<ExecCreateCmdResponse> {
 
     ExecCreateCmd withCmd(String... cmd);
 
+    ExecCreateCmd withEnv(List<String> env);
+
     ExecCreateCmd withContainerId(@Nonnull String containerId);
 
     ExecCreateCmd withTty(Boolean tty);
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
index 051a45f0c..ecf208b7e 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
@@ -2,6 +2,8 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -41,6 +43,12 @@ public class ExecCreateCmdImpl extends AbstrDockerCmd<ExecCreateCmd, ExecCreateC
     @JsonProperty("Cmd")
     private String[] cmd;
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_25}
+     */
+    @JsonProperty("Env")
+    private List<String> env;
+
     /**
      * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_35}
      */
@@ -95,6 +103,12 @@ public ExecCreateCmd withCmd(String... cmd) {
         return this;
     }
 
+    @Override
+    public ExecCreateCmd withEnv(List<String> env) {
+        this.env = env;
+        return this;
+    }
+
     @Override
     public ExecCreateCmd withPrivileged(Boolean privileged) {
         this.privileged = privileged;
@@ -132,6 +146,11 @@ public Boolean hasTtyEnabled() {
         return tty;
     }
 
+    @Override
+    public List<String> getEnv() {
+        return env;
+    }
+
     @Override
     public Boolean getPrivileged() {
         return privileged;

From 1138c29618f00922a9ab1af1cc6bc9478bbb79af Mon Sep 17 00:00:00 2001
From: Dean Bradley <mrdeanbradley@gmail.com>
Date: Wed, 10 Oct 2018 15:22:26 +0200
Subject: [PATCH 0851/1272] Added GCPLOGS enum LoggingType

---
 src/main/java/com/github/dockerjava/api/model/LogConfig.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
index 2a3301287..6da68d434 100644
--- a/src/main/java/com/github/dockerjava/api/model/LogConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
@@ -80,7 +80,8 @@ public enum LoggingType {
         FLUENTD("fluentd"),
         AWSLOGS("awslogs"),
         DB("db"), // Synology specific driver
-        SPLUNK("splunk");
+        SPLUNK("splunk"),
+        GCPLOGS("gcplogs");
 
         private String type;
 

From 580ea407cc362276e4f5a47b24593b12a0fae26e Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 27 Sep 2018 03:16:58 +0300
Subject: [PATCH 0852/1272] Stop proxying hostconfig calls.

---
 .../api/command/CreateContainerCmd.java       | 283 -----------
 .../dockerjava/api/model/HostConfig.java      |  91 +++-
 .../core/command/CreateContainerCmdImpl.java  | 459 ------------------
 3 files changed, 85 insertions(+), 748 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 4fc7f5f32..63d53563f 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -3,20 +3,9 @@
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.AuthConfig;
-import com.github.dockerjava.api.model.Bind;
-import com.github.dockerjava.api.model.Capability;
-import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.HostConfig;
-import com.github.dockerjava.api.model.Link;
-import com.github.dockerjava.api.model.LogConfig;
-import com.github.dockerjava.api.model.LxcConf;
-import com.github.dockerjava.api.model.PortBinding;
-import com.github.dockerjava.api.model.Ports;
-import com.github.dockerjava.api.model.RestartPolicy;
-import com.github.dockerjava.api.model.Ulimit;
 import com.github.dockerjava.api.model.Volume;
-import com.github.dockerjava.api.model.VolumesFrom;
 
 import javax.annotation.CheckForNull;
 import java.util.List;
@@ -30,51 +19,9 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     List<String> getAliases();
 
-    @CheckForNull
-    Bind[] getBinds();
-
-    /**
-     * @since 1.19
-     */
-    @CheckForNull
-    Integer getBlkioWeight();
-
-    @CheckForNull
-    Capability[] getCapAdd();
-
-    @CheckForNull
-    Capability[] getCapDrop();
-
     @CheckForNull
     String[] getCmd();
 
-    /**
-     * @since 1.19
-     */
-    @CheckForNull
-    Integer getCpuPeriod();
-
-    @CheckForNull
-    String getCpusetCpus();
-
-    /**
-     * @since 1.19
-     */
-    @CheckForNull
-    String getCpusetMems();
-
-    @CheckForNull
-    Integer getCpuShares();
-
-    @CheckForNull
-    Device[] getDevices();
-
-    @CheckForNull
-    String[] getDns();
-
-    @CheckForNull
-    String[] getDnsSearch();
-
     @CheckForNull
     String getDomainName();
 
@@ -90,9 +37,6 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     String getStopSignal();
 
-    @CheckForNull
-    String[] getExtraHosts();
-
     @CheckForNull
     String getHostName();
 
@@ -108,54 +52,21 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     Map<String, String> getLabels();
 
-    @CheckForNull
-    Link[] getLinks();
-
-    @CheckForNull
-    LogConfig getLogConfig();
-
-    @CheckForNull
-    LxcConf[] getLxcConf();
-
     @CheckForNull
     String getMacAddress();
 
-    @CheckForNull
-    Long getMemory();
-
-    @CheckForNull
-    Long getMemorySwap();
-
-    @CheckForNull
-    Integer getMemorySwappiness();
-
     @CheckForNull
     String getName();
 
-    @CheckForNull
-    String getNetworkMode();
-
-    @CheckForNull
-    Ports getPortBindings();
-
     @CheckForNull
     String[] getPortSpecs();
 
-    @CheckForNull
-    RestartPolicy getRestartPolicy();
-
-    @CheckForNull
-    Ulimit[] getUlimits();
-
     @CheckForNull
     String getUser();
 
     @CheckForNull
     Volume[] getVolumes();
 
-    @CheckForNull
-    VolumesFrom[] getVolumesFrom();
-
     @CheckForNull
     String getWorkingDir();
 
@@ -171,36 +82,15 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     Boolean isNetworkDisabled();
 
-    /**
-     * @since 1.19
-     */
-    @CheckForNull
-    Boolean getOomKillDisable();
-
-    @CheckForNull
-    Boolean getPrivileged();
-
-    @CheckForNull
-    Boolean getPublishAllPorts();
-
-    @CheckForNull
-    Boolean getReadonlyRootfs();
-
     @CheckForNull
     Boolean isStdInOnce();
 
     @CheckForNull
     Boolean isStdinOpen();
 
-    @CheckForNull
-    String getPidMode();
-
     @CheckForNull
     HostConfig getHostConfig();
 
-    @CheckForNull
-    String getCgroupParent();
-
     @CheckForNull
     Boolean isTty();
 
@@ -230,89 +120,10 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     CreateContainerCmd withAttachStdout(Boolean attachStdout);
 
-    CreateContainerCmd withBinds(Bind... binds);
-
-    CreateContainerCmd withBinds(List<Bind> binds);
-
-    /**
-     * @since 1.19
-     */
-    CreateContainerCmd withBlkioWeight(Integer blkioWeight);
-
-    /**
-     * Add linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> to the container. For example:
-     * adding {@link Capability#MKNOD} allows the container to create special files using the 'mknod' command.
-     */
-    CreateContainerCmd withCapAdd(Capability... capAdd);
-
-    /**
-     * Add linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> to the container. For example:
-     * adding {@link Capability#MKNOD} allows the container to create special files using the 'mknod' command.
-     */
-    CreateContainerCmd withCapAdd(List<Capability> capAdd);
-
-    /**
-     * Drop linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> from the container. For example:
-     * dropping {@link Capability#CHOWN} prevents the container from changing the owner of any files.
-     */
-    CreateContainerCmd withCapDrop(Capability... capDrop);
-
-    /**
-     * Drop linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> from the container. For example:
-     * dropping {@link Capability#CHOWN} prevents the container from changing the owner of any files.
-     */
-    CreateContainerCmd withCapDrop(List<Capability> capDrop);
-
     CreateContainerCmd withCmd(String... cmd);
 
     CreateContainerCmd withCmd(List<String> cmd);
 
-    CreateContainerCmd withContainerIDFile(String containerIDFile);
-
-    /**
-     * @since 1.19
-     */
-    CreateContainerCmd withCpuPeriod(Integer cpuPeriod);
-
-    CreateContainerCmd withCpusetCpus(String cpusetCpus);
-
-    /**
-     * @since 1.19
-     */
-    CreateContainerCmd withCpusetMems(String cpusetMems);
-
-    CreateContainerCmd withCpuShares(Integer cpuShares);
-
-    /**
-     * Add host devices to the container
-     */
-    CreateContainerCmd withDevices(Device... devices);
-
-    /**
-     * Add host devices to the container
-     */
-    CreateContainerCmd withDevices(List<Device> devices);
-
-    /**
-     * Set custom DNS servers
-     */
-    CreateContainerCmd withDns(String... dns);
-
-    /**
-     * Set custom DNS servers
-     */
-    CreateContainerCmd withDns(List<String> dns);
-
-    /**
-     * Set custom DNS search domains
-     */
-    CreateContainerCmd withDnsSearch(String... dnsSearch);
-
-    /**
-     * Set custom DNS search domains
-     */
-    CreateContainerCmd withDnsSearch(List<String> dnsSearch);
-
     CreateContainerCmd withDomainName(String domainName);
 
     CreateContainerCmd withEntrypoint(String... entrypoint);
@@ -329,16 +140,6 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     CreateContainerCmd withExposedPorts(List<ExposedPort> exposedPorts);
 
-    /**
-     * Add hostnames to /etc/hosts in the container
-     */
-    CreateContainerCmd withExtraHosts(String... extraHosts);
-
-    /**
-     * Add hostnames to /etc/hosts in the container
-     */
-    CreateContainerCmd withExtraHosts(List<String> extraHosts);
-
     CreateContainerCmd withHostName(String hostName);
 
     CreateContainerCmd withImage(String image);
@@ -349,114 +150,30 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     CreateContainerCmd withLabels(Map<String, String> labels);
 
-    /**
-     * Add link to another container.
-     */
-    CreateContainerCmd withLinks(Link... links);
-
-    /**
-     * Add link to another container.
-     */
-    CreateContainerCmd withLinks(List<Link> links);
-
-    CreateContainerCmd withLogConfig(LogConfig logConfig);
-
-    CreateContainerCmd withLxcConf(LxcConf... lxcConf);
-
-    CreateContainerCmd withLxcConf(List<LxcConf> lxcConf);
-
     CreateContainerCmd withMacAddress(String macAddress);
 
-    CreateContainerCmd withMemory(Long memory);
-
-    CreateContainerCmd withMemorySwap(Long memorySwap);
-
-    CreateContainerCmd withMemorySwappiness(Integer memorySwappiness);
-
     CreateContainerCmd withName(String name);
 
     CreateContainerCmd withNetworkDisabled(Boolean disableNetwork);
 
-    /**
-     * Set the Network mode for the container
-     * <ul>
-     * <li>'bridge': creates a new network stack for the container on the docker bridge</li>
-     * <li>'none': no networking for this container</li>
-     * <li>'container:<name|id>': reuses another container network stack</li>
-     * <li>'host': use the host network stack inside the container. Note: the host mode gives the container full access to local system
-     * services such as D-bus and is therefore considered insecure.</li>
-     * </ul>
-     */
-    CreateContainerCmd withNetworkMode(String networkMode);
-
-    /**
-     * @since 1.19
-     */
-    CreateContainerCmd withOomKillDisable(Boolean oomKillDisable);
-
-    /**
-     * Add one or more {@link PortBinding}s. This corresponds to the <code>--publish</code> (<code>-p</code>) option of the
-     * <code>docker run</code> CLI command.
-     */
-    CreateContainerCmd withPortBindings(PortBinding... portBindings);
-
-    /**
-     * Add one or more {@link PortBinding}s. This corresponds to the <code>--publish</code> (<code>-p</code>) option of the
-     * <code>docker run</code> CLI command.
-     */
-    CreateContainerCmd withPortBindings(List<PortBinding> portBindings);
-
-    /**
-     * Add the port bindings that are contained in the given {@link Ports} object.
-     *
-     * @see #withPortBindings(PortBinding...)
-     */
-    CreateContainerCmd withPortBindings(Ports portBindings);
-
     CreateContainerCmd withPortSpecs(String... portSpecs);
 
     CreateContainerCmd withPortSpecs(List<String> portSpecs);
 
-    CreateContainerCmd withPrivileged(Boolean privileged);
-
-    CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts);
-
-    CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs);
-
-    /**
-     * Set custom {@link RestartPolicy} for the container. Defaults to {@link RestartPolicy#noRestart()}
-     */
-    CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy);
-
     CreateContainerCmd withStdInOnce(Boolean stdInOnce);
 
     CreateContainerCmd withStdinOpen(Boolean stdinOpen);
 
     CreateContainerCmd withTty(Boolean tty);
 
-    CreateContainerCmd withUlimits(Ulimit... ulimits);
-
-    CreateContainerCmd withUlimits(List<Ulimit> ulimits);
-
     CreateContainerCmd withUser(String user);
 
     CreateContainerCmd withVolumes(Volume... volumes);
 
     CreateContainerCmd withVolumes(List<Volume> volumes);
 
-    CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom);
-
-    CreateContainerCmd withVolumesFrom(List<VolumesFrom> volumesFrom);
-
     CreateContainerCmd withWorkingDir(String workingDir);
 
-    CreateContainerCmd withCgroupParent(String cgroupParent);
-
-    /**
-     * Set the PID (Process) Namespace mode for the container, 'host': use the host's PID namespace inside the container
-     */
-    CreateContainerCmd withPidMode(String pidMode);
-
     CreateContainerCmd withHostConfig(HostConfig hostConfig);
 
     /**
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index b857725e3..f2ed6ab15 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -16,6 +16,8 @@
 import java.util.List;
 import java.util.Map;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Used in `/containers/create`, and in inspect container.
  * TODO exclude usage for 2 different models.
@@ -30,6 +32,9 @@ public class HostConfig implements Serializable {
     @JsonProperty("Binds")
     private Binds binds;
 
+    /**
+     * @since 1.19
+     */
     @JsonProperty("BlkioWeight")
     private Integer blkioWeight;
 
@@ -78,6 +83,9 @@ public class HostConfig implements Serializable {
     @JsonProperty("ContainerIDFile")
     private String containerIDFile;
 
+    /**
+     * @since 1.19
+     */
     @JsonProperty("CpuPeriod")
     private Integer cpuPeriod;
 
@@ -93,6 +101,9 @@ public class HostConfig implements Serializable {
     @JsonProperty("CpusetCpus")
     private String cpusetCpus;
 
+    /**
+     * @since 1.19
+     */
     @JsonProperty("CpusetMems")
     private String cpusetMems;
 
@@ -135,7 +146,7 @@ public class HostConfig implements Serializable {
     @JsonProperty("MemoryReservation")
     private Long memoryReservation;
 
-     /**
+    /**
      * @since {@link RemoteApiVersion#VERSION_1_21}
      */
     @JsonProperty("KernelMemory")
@@ -430,12 +441,13 @@ public Integer getMemorySwappiness() {
     public Boolean getOomKillDisable() {
         return oomKillDisable;
     }
+
     /**
      * @see #autoRemove
      */
     @CheckForNull
     public Boolean getAutoRemove() {
-      return autoRemove;
+        return autoRemove;
     }
 
     /**
@@ -510,6 +522,7 @@ public void setLinks(Link... links) {
     }
 
     // auto-generated builder setters
+
     /**
      * @see #binds
      */
@@ -567,7 +580,8 @@ public HostConfig withBlkioWeightDevice(List<Object> blkioWeightDevice) {
     }
 
     /**
-     * @see #capAdd
+     * Add linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> to the container. For example:
+     * adding {@link Capability#MKNOD} allows the container to create special files using the 'mknod' command.
      */
     public HostConfig withCapAdd(Capability[] capAdd) {
         this.capAdd = capAdd;
@@ -638,6 +652,11 @@ public HostConfig withCpuShares(Integer cpuShares) {
         return this;
     }
 
+    public HostConfig withDevices(List<Device> devices) {
+        checkNotNull(devices, "devices was not specified");
+        return withDevices(devices.toArray(new Device[devices.size()]));
+    }
+
     /**
      * @see #devices
      */
@@ -662,6 +681,11 @@ public HostConfig withDns(String[] dns) {
         return this;
     }
 
+    public HostConfig withDns(List<String> dns) {
+        checkNotNull(dns, "dns was not specified");
+        return withDns(dns.toArray(new String[dns.size()]));
+    }
+
     /**
      * @see #dnsSearch
      */
@@ -670,6 +694,11 @@ public HostConfig withDnsSearch(String[] dnsSearch) {
         return this;
     }
 
+    public HostConfig withDnsSearch(List<String> dnsSearch) {
+        checkNotNull(dnsSearch, "dnsSearch was not specified");
+        return withDnsSearch(dnsSearch.toArray(new String[0]));
+    }
+
     /**
      * @see #extraHosts
      */
@@ -678,6 +707,11 @@ public HostConfig withExtraHosts(String[] extraHosts) {
         return this;
     }
 
+    public HostConfig withExtraHosts(List<String> extraHosts) {
+        checkNotNull(extraHosts, "extraHosts was not specified");
+        return withExtraHosts(extraHosts.toArray(new String[extraHosts.size()]));
+    }
+
     /**
      * @see #kernelMemory
      */
@@ -694,6 +728,12 @@ public HostConfig withLinks(Links links) {
         return this;
     }
 
+    public HostConfig withLinks(List<Link> links) {
+        checkNotNull(links, "links was not specified");
+        setLinks(links.toArray(new Link[links.size()]));
+        return this;
+    }
+
     /**
      * @see #logConfig
      */
@@ -710,6 +750,11 @@ public HostConfig withLxcConf(LxcConf[] lxcConf) {
         return this;
     }
 
+    public HostConfig withLxcConf(List<LxcConf> lxcConf) {
+        checkNotNull(lxcConf, "lxcConf was not specified");
+        return withLxcConf(lxcConf.toArray(new LxcConf[0]));
+    }
+
     /**
      * @see #memory
      */
@@ -743,6 +788,15 @@ public HostConfig withMemorySwappiness(Integer memorySwappiness) {
     }
 
     /**
+     * Set the Network mode for the container
+     * <ul>
+     * <li>'bridge': creates a new network stack for the container on the docker bridge</li>
+     * <li>'none': no networking for this container</li>
+     * <li>'container:<name|id>': reuses another container network stack</li>
+     * <li>'host': use the host network stack inside the container. Note: the host mode gives the container full access to local system
+     * services such as D-bus and is therefore considered insecure.</li>
+     * </ul>
+     *
      * @see #networkMode
      */
     public HostConfig withNetworkMode(String networkMode) {
@@ -757,12 +811,13 @@ public HostConfig withOomKillDisable(Boolean oomKillDisable) {
         this.oomKillDisable = oomKillDisable;
         return this;
     }
+
     /**
      * @see #autoRemove
      */
     public HostConfig withAutoRemove(Boolean autoRemove) {
-      this.autoRemove = autoRemove;
-      return this;
+        this.autoRemove = autoRemove;
+        return this;
     }
 
     /**
@@ -781,6 +836,19 @@ public HostConfig withPidMode(String pidMode) {
         return this;
     }
 
+    /**
+     * @see #portBindings
+     */
+    public HostConfig withPortBindings(PortBinding... portBindings) {
+        checkNotNull(portBindings, "portBindings was not specified");
+        return withPortBindings(new Ports(portBindings));
+    }
+
+    public HostConfig withPortBindings(List<PortBinding> portBindings) {
+        checkNotNull(portBindings, "portBindings was not specified");
+        return withPortBindings(portBindings.toArray(new PortBinding[0]));
+    }
+
     /**
      * @see #portBindings
      */
@@ -869,6 +937,11 @@ public HostConfig withUlimits(Ulimit[] ulimits) {
         return this;
     }
 
+    public HostConfig withUlimits(List<Ulimit> ulimits) {
+        checkNotNull(ulimits, "no ulimits was specified");
+        return withUlimits(ulimits.toArray(new Ulimit[ulimits.size()]));
+    }
+
     /**
      * @see #volumeDriver
      */
@@ -880,11 +953,17 @@ public HostConfig withVolumeDriver(String volumeDriver) {
     /**
      * @see #volumesFrom
      */
-    public HostConfig withVolumesFrom(VolumesFrom[] volumesFrom) {
+    public HostConfig withVolumesFrom(VolumesFrom... volumesFrom) {
         this.volumesFrom = volumesFrom;
         return this;
     }
 
+    public HostConfig withVolumesFrom(List<VolumesFrom> volumesFrom) {
+        checkNotNull(volumesFrom, "volumesFrom was not specified");
+        return withVolumesFrom(volumesFrom.toArray(new VolumesFrom[volumesFrom.size()]));
+    }
+
+
     /**
      * @see #pidsLimit
      */
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index a1f4090ba..8ec2561eb 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -195,77 +195,11 @@ public List<String> getAliases() {
         return aliases;
     }
 
-    @Override
-    @JsonIgnore
-    public Bind[] getBinds() {
-        return hostConfig.getBinds();
-    }
-
-    @Override
-    @JsonIgnore
-    public Integer getBlkioWeight() {
-        return hostConfig.getBlkioWeight();
-    }
-
-    @Override
-    @JsonIgnore
-    public Capability[] getCapAdd() {
-        return hostConfig.getCapAdd();
-    }
-
-    @Override
-    @JsonIgnore
-    public Capability[] getCapDrop() {
-        return hostConfig.getCapDrop();
-    }
-
     @Override
     public String[] getCmd() {
         return cmd;
     }
 
-    @Override
-    @JsonIgnore
-    public Integer getCpuPeriod() {
-        return hostConfig.getCpuPeriod();
-    }
-
-    @Override
-    @JsonIgnore
-    public String getCpusetCpus() {
-        return hostConfig.getCpusetCpus();
-    }
-
-    @Override
-    @JsonIgnore
-    public String getCpusetMems() {
-        return hostConfig.getCpusetMems();
-    }
-
-    @Override
-    @JsonIgnore
-    public Integer getCpuShares() {
-        return hostConfig.getCpuShares();
-    }
-
-    @Override
-    @JsonIgnore
-    public Device[] getDevices() {
-        return hostConfig.getDevices();
-    }
-
-    @Override
-    @JsonIgnore
-    public String[] getDns() {
-        return hostConfig.getDns();
-    }
-
-    @Override
-    @JsonIgnore
-    public String[] getDnsSearch() {
-        return hostConfig.getDnsSearch();
-    }
-
     @Override
     public String getDomainName() {
         return domainName;
@@ -296,12 +230,6 @@ public String getStopSignal() {
         return stopSignal;
     }
 
-    @Override
-    @JsonIgnore
-    public String[] getExtraHosts() {
-        return hostConfig.getExtraHosts();
-    }
-
     @Override
     public String getHostName() {
         return hostName;
@@ -328,81 +256,21 @@ public Map<String, String> getLabels() {
         return labels;
     }
 
-    @Override
-    @JsonIgnore
-    public Link[] getLinks() {
-        return hostConfig.getLinks();
-    }
-
-    @Override
-    @JsonIgnore
-    public LxcConf[] getLxcConf() {
-        return hostConfig.getLxcConf();
-    }
-
-    @Override
-    @JsonIgnore
-    public LogConfig getLogConfig() {
-        return hostConfig.getLogConfig();
-    }
-
     @Override
     public String getMacAddress() {
         return macAddress;
     }
 
-    @Override
-    @JsonIgnore
-    public Long getMemory() {
-        return hostConfig.getMemory();
-    }
-
-    @Override
-    @JsonIgnore
-    public Long getMemorySwap() {
-        return hostConfig.getMemorySwap();
-    }
-
-    @Override
-    @JsonIgnore
-    public Integer getMemorySwappiness() {
-        return hostConfig.getMemorySwappiness();
-    }
-
     @Override
     public String getName() {
         return name;
     }
 
-    @Override
-    @JsonIgnore
-    public String getNetworkMode() {
-        return hostConfig.getNetworkMode();
-    }
-
-    @Override
-    @JsonIgnore
-    public Ports getPortBindings() {
-        return hostConfig.getPortBindings();
-    }
-
     @Override
     public String[] getPortSpecs() {
         return portSpecs;
     }
 
-    @Override
-    @JsonIgnore
-    public RestartPolicy getRestartPolicy() {
-        return hostConfig.getRestartPolicy();
-    }
-
-    @Override
-    @JsonIgnore
-    public Ulimit[] getUlimits() {
-        return hostConfig.getUlimits();
-    }
-
     @Override
     public String getUser() {
         return user;
@@ -414,12 +282,6 @@ public Volume[] getVolumes() {
         return volumes.getVolumes();
     }
 
-    @Override
-    @JsonIgnore
-    public VolumesFrom[] getVolumesFrom() {
-        return hostConfig.getVolumesFrom();
-    }
-
     @Override
     public String getWorkingDir() {
         return workingDir;
@@ -445,30 +307,6 @@ public Boolean isNetworkDisabled() {
         return networkDisabled;
     }
 
-    @Override
-    @JsonIgnore
-    public Boolean getOomKillDisable() {
-        return hostConfig.getOomKillDisable();
-    }
-
-    @Override
-    @JsonIgnore
-    public Boolean getPrivileged() {
-        return hostConfig.getPrivileged();
-    }
-
-    @Override
-    @JsonIgnore
-    public Boolean getPublishAllPorts() {
-        return hostConfig.getPublishAllPorts();
-    }
-
-    @Override
-    @JsonIgnore
-    public Boolean getReadonlyRootfs() {
-        return hostConfig.getReadonlyRootfs();
-    }
-
     @Override
     public Boolean isStdInOnce() {
         return stdInOnce;
@@ -484,22 +322,11 @@ public Boolean isTty() {
         return tty;
     }
 
-    @Override
-    @JsonIgnore
-    public String getPidMode() {
-        return hostConfig.getPidMode();
-    }
-
     @Override
     public HostConfig getHostConfig() {
         return hostConfig;
     }
 
-    @Override
-    public String getCgroupParent() {
-        return hostConfig.getCgroupParent();
-    }
-
     @Override
     public CreateContainerCmd withAliases(String... aliases) {
         this.aliases = Arrays.asList(aliases);
@@ -534,51 +361,6 @@ public CreateContainerCmd withAttachStdout(Boolean attachStdout) {
         return this;
     }
 
-    @Override
-    public CreateContainerCmd withBinds(Bind... binds) {
-        checkNotNull(binds, "binds was not specified");
-        hostConfig.setBinds(binds);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withBinds(List<Bind> binds) {
-        checkNotNull(binds, "binds was not specified");
-        return withBinds(binds.toArray(new Bind[binds.size()]));
-    }
-
-    @Override
-    public CreateContainerCmd withBlkioWeight(Integer blkioWeight) {
-        checkNotNull(blkioWeight, "blkioWeight was not specified");
-        hostConfig.withBlkioWeight(blkioWeight);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withCapAdd(Capability... capAdd) {
-        checkNotNull(capAdd, "capAdd was not specified");
-        hostConfig.withCapAdd(capAdd);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withCapAdd(List<Capability> capAdd) {
-        checkNotNull(capAdd, "capAdd was not specified");
-        return withCapAdd(capAdd.toArray(new Capability[capAdd.size()]));
-    }
-
-    @Override
-    public CreateContainerCmd withCapDrop(Capability... capDrop) {
-        checkNotNull(capDrop, "capDrop was not specified");
-        hostConfig.withCapDrop(capDrop);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withCapDrop(List<Capability> capDrop) {
-        checkNotNull(capDrop, "capDrop was not specified");
-        return withCapDrop(capDrop.toArray(new Capability[capDrop.size()]));
-    }
 
     @Override
     public CreateContainerCmd withCmd(String... cmd) {
@@ -593,80 +375,6 @@ public CreateContainerCmd withCmd(List<String> cmd) {
         return withCmd(cmd.toArray(new String[cmd.size()]));
     }
 
-    @Override
-    public CreateContainerCmd withContainerIDFile(String containerIDFile) {
-        checkNotNull(containerIDFile, "no containerIDFile was specified");
-        hostConfig.withContainerIDFile(containerIDFile);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withCpuPeriod(Integer cpuPeriod) {
-        checkNotNull(cpuPeriod, "cpuPeriod was not specified");
-        hostConfig.withCpuPeriod(cpuPeriod);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withCpusetCpus(String cpusetCpus) {
-        checkNotNull(cpusetCpus, "cpusetCpus was not specified");
-        hostConfig.withCpusetCpus(cpusetCpus);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withCpusetMems(String cpusetMems) {
-        checkNotNull(cpusetMems, "cpusetMems was not specified");
-        hostConfig.withCpusetMems(cpusetMems);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withCpuShares(Integer cpuShares) {
-        checkNotNull(cpuShares, "cpuShares was not specified");
-        hostConfig.withCpuShares(cpuShares);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withDevices(Device... devices) {
-        checkNotNull(devices, "devices was not specified");
-        this.hostConfig.withDevices(devices);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withDevices(List<Device> devices) {
-        checkNotNull(devices, "devices was not specified");
-        return withDevices(devices.toArray(new Device[devices.size()]));
-    }
-
-    @Override
-    public CreateContainerCmd withDns(String... dns) {
-        checkNotNull(dns, "dns was not specified");
-        this.hostConfig.withDns(dns);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withDns(List<String> dns) {
-        checkNotNull(dns, "dns was not specified");
-        return withDns(dns.toArray(new String[dns.size()]));
-    }
-
-    @Override
-    public CreateContainerCmd withDnsSearch(String... dnsSearch) {
-        checkNotNull(dnsSearch, "dnsSearch was not specified");
-        this.hostConfig.withDnsSearch(dnsSearch);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withDnsSearch(List<String> dnsSearch) {
-        checkNotNull(dnsSearch, "dnsSearch was not specified");
-        return withDnsSearch(dnsSearch.toArray(new String[0]));
-    }
-
     @Override
     public CreateContainerCmd withDomainName(String domainName) {
         checkNotNull(domainName, "no domainName was specified");
@@ -720,19 +428,6 @@ public CreateContainerCmd withExposedPorts(List<ExposedPort> exposedPorts) {
         return withExposedPorts(exposedPorts.toArray(new ExposedPort[exposedPorts.size()]));
     }
 
-    @Override
-    public CreateContainerCmd withExtraHosts(String... extraHosts) {
-        checkNotNull(extraHosts, "extraHosts was not specified");
-        this.hostConfig.withExtraHosts(extraHosts);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withExtraHosts(List<String> extraHosts) {
-        checkNotNull(extraHosts, "extraHosts was not specified");
-        return withExtraHosts(extraHosts.toArray(new String[extraHosts.size()]));
-    }
-
     @Override
     public CreateContainerCmd withHostName(String hostName) {
         checkNotNull(hostConfig, "no hostName was specified");
@@ -768,39 +463,6 @@ public CreateContainerCmd withLabels(Map<String, String> labels) {
         return this;
     }
 
-    @Override
-    public CreateContainerCmd withLinks(Link... links) {
-        checkNotNull(links, "links was not specified");
-        this.hostConfig.setLinks(links);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withLinks(List<Link> links) {
-        checkNotNull(links, "links was not specified");
-        return withLinks(links.toArray(new Link[links.size()]));
-    }
-
-    @Override
-    public CreateContainerCmd withLxcConf(LxcConf... lxcConf) {
-        checkNotNull(lxcConf, "lxcConf was not specified");
-        this.hostConfig.withLxcConf(lxcConf);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withLxcConf(List<LxcConf> lxcConf) {
-        checkNotNull(lxcConf, "lxcConf was not specified");
-        return withLxcConf(lxcConf.toArray(new LxcConf[0]));
-    }
-
-    @Override
-    public CreateContainerCmd withLogConfig(LogConfig logConfig) {
-        checkNotNull(logConfig, "logConfig was not specified");
-        this.hostConfig.withLogConfig(logConfig);
-        return this;
-    }
-
     @Override
     public CreateContainerCmd withMacAddress(String macAddress) {
         checkNotNull(macAddress, "macAddress was not specified");
@@ -808,27 +470,6 @@ public CreateContainerCmd withMacAddress(String macAddress) {
         return this;
     }
 
-    @Override
-    public CreateContainerCmd withMemory(Long memory) {
-        checkNotNull(memory, "memory was not specified");
-        hostConfig.withMemory(memory);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withMemorySwap(Long memorySwap) {
-        checkNotNull(memorySwap, "memorySwap was not specified");
-        hostConfig.withMemorySwap(memorySwap);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withMemorySwappiness(Integer memorySwappiness) {
-        checkNotNull(memorySwappiness, "memorySwappiness was not specified");
-        hostConfig.withMemorySwappiness(memorySwappiness);
-        return this;
-    }
-
     @Override
     public CreateContainerCmd withName(String name) {
         checkNotNull(name, "name was not specified");
@@ -843,40 +484,6 @@ public CreateContainerCmd withNetworkDisabled(Boolean disableNetwork) {
         return this;
     }
 
-    @Override
-    public CreateContainerCmd withNetworkMode(String networkMode) {
-        checkNotNull(networkMode, "networkMode was not specified");
-        this.hostConfig.withNetworkMode(networkMode);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withOomKillDisable(Boolean oomKillDisable) {
-        checkNotNull(oomKillDisable, "oomKillDisable was not specified");
-        hostConfig.withOomKillDisable(oomKillDisable);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withPortBindings(PortBinding... portBindings) {
-        checkNotNull(portBindings, "portBindings was not specified");
-        this.hostConfig.withPortBindings(new Ports(portBindings));
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withPortBindings(List<PortBinding> portBindings) {
-        checkNotNull(portBindings, "portBindings was not specified");
-        return withPortBindings(portBindings.toArray(new PortBinding[0]));
-    }
-
-    @Override
-    public CreateContainerCmd withPortBindings(Ports portBindings) {
-        checkNotNull(portBindings, "portBindings was not specified");
-        this.hostConfig.withPortBindings(portBindings);
-        return this;
-    }
-
     @Override
     public CreateContainerCmd withPortSpecs(String... portSpecs) {
         checkNotNull(portSpecs, "portSpecs was not specified");
@@ -890,34 +497,6 @@ public CreateContainerCmd withPortSpecs(List<String> portSpecs) {
         return withPortSpecs(portSpecs.toArray(new String[portSpecs.size()]));
     }
 
-    @Override
-    public CreateContainerCmd withPrivileged(Boolean privileged) {
-        checkNotNull(privileged, "no privileged was specified");
-        this.hostConfig.withPrivileged(privileged);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts) {
-        checkNotNull(publishAllPorts, "no publishAllPorts was specified");
-        this.hostConfig.withPublishAllPorts(publishAllPorts);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs) {
-        checkNotNull(readonlyRootfs, "no readonlyRootfs was specified");
-        hostConfig.withReadonlyRootfs(readonlyRootfs);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) {
-        checkNotNull(restartPolicy, "restartPolicy was not specified");
-        this.hostConfig.withRestartPolicy(restartPolicy);
-        return this;
-    }
-
     @Override
     public CreateContainerCmd withStdInOnce(Boolean stdInOnce) {
         checkNotNull(stdInOnce, "no stdInOnce was specified");
@@ -939,18 +518,6 @@ public CreateContainerCmd withTty(Boolean tty) {
         return this;
     }
 
-    @Override
-    public CreateContainerCmd withUlimits(Ulimit... ulimits) {
-        checkNotNull(ulimits, "no ulimits was specified");
-        hostConfig.withUlimits(ulimits);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withUlimits(List<Ulimit> ulimits) {
-        checkNotNull(ulimits, "no ulimits was specified");
-        return withUlimits(ulimits.toArray(new Ulimit[ulimits.size()]));
-    }
 
     @Override
     public CreateContainerCmd withUser(String user) {
@@ -972,19 +539,6 @@ public CreateContainerCmd withVolumes(List<Volume> volumes) {
         return withVolumes(volumes.toArray(new Volume[volumes.size()]));
     }
 
-    @Override
-    public CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom) {
-        checkNotNull(volumesFrom, "volumesFrom was not specified");
-        this.hostConfig.withVolumesFrom(volumesFrom);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withVolumesFrom(List<VolumesFrom> volumesFrom) {
-        checkNotNull(volumesFrom, "volumesFrom was not specified");
-        return withVolumesFrom(volumesFrom.toArray(new VolumesFrom[volumesFrom.size()]));
-    }
-
     @Override
     public CreateContainerCmd withWorkingDir(String workingDir) {
         checkNotNull(workingDir, "workingDir was not specified");
@@ -992,19 +546,6 @@ public CreateContainerCmd withWorkingDir(String workingDir) {
         return this;
     }
 
-    @Override
-    public CreateContainerCmd withCgroupParent(final String cgroupParent) {
-        checkNotNull(cgroupParent, "cgroupParent was not specified");
-        this.hostConfig.withCgroupParent(cgroupParent);
-        return this;
-    }
-
-    @Override
-    public CreateContainerCmd withPidMode(String pidMode) {
-        checkNotNull(pidMode, "pidMode was not specified");
-        this.hostConfig.withPidMode(pidMode);
-        return this;
-    }
 
     @Override
     public CreateContainerCmd withHostConfig(HostConfig hostConfig) {

From 0b1850949c6eff18c9e260444b4616c8743c5053 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 2 Oct 2018 01:24:41 +0300
Subject: [PATCH 0853/1272] Fix import

---
 .../core/command/CreateContainerCmdImpl.java          | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 8ec2561eb..bb1dc1573 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -9,23 +9,12 @@
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.AuthConfig;
-import com.github.dockerjava.api.model.Bind;
-import com.github.dockerjava.api.model.Capability;
 import com.github.dockerjava.api.model.ContainerNetwork;
-import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.ExposedPorts;
 import com.github.dockerjava.api.model.HostConfig;
-import com.github.dockerjava.api.model.Link;
-import com.github.dockerjava.api.model.LogConfig;
-import com.github.dockerjava.api.model.LxcConf;
-import com.github.dockerjava.api.model.PortBinding;
-import com.github.dockerjava.api.model.Ports;
-import com.github.dockerjava.api.model.RestartPolicy;
-import com.github.dockerjava.api.model.Ulimit;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.Volumes;
-import com.github.dockerjava.api.model.VolumesFrom;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;

From d31db0618d10e5927f6ce248eda731f47fc739e2 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 2 Oct 2018 02:44:25 +0300
Subject: [PATCH 0854/1272] fix tests

---
 .../dockerjava/api/model/HostConfig.java      |  30 +++--
 .../dockerjava/cmd/CreateContainerCmdIT.java  |  78 +++++++++----
 .../cmd/DisconnectFromNetworkCmdIT.java       |   4 +-
 .../dockerjava/cmd/ListContainersCmdIT.java   |   9 +-
 .../dockerjava/cmd/StartContainerCmdIT.java   | 104 +++++++++++++-----
 .../dockerjava/cmd/swarm/SwarmCmdIT.java      |  15 ++-
 .../dockerjava/utils/RegistryUtils.java       |   4 +-
 7 files changed, 175 insertions(+), 69 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index f2ed6ab15..fbb30f187 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -242,6 +242,10 @@ public class HostConfig implements Serializable {
     @JsonProperty("Isolation")
     private String isolation;
 
+    public static HostConfig newHostConfig() {
+        return new HostConfig();
+    }
+
     @JsonIgnore
     public Bind[] getBinds() {
         return (binds == null) ? new Bind[0] : binds.getBinds();
@@ -531,6 +535,12 @@ public HostConfig withBinds(Binds binds) {
         return this;
     }
 
+    public HostConfig withBinds(Bind... binds) {
+        checkNotNull(binds, "binds was not specified");
+        setBinds(binds);
+        return this;
+    }
+
     /**
      * @see #blkioDeviceReadBps
      */
@@ -583,7 +593,7 @@ public HostConfig withBlkioWeightDevice(List<Object> blkioWeightDevice) {
      * Add linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> to the container. For example:
      * adding {@link Capability#MKNOD} allows the container to create special files using the 'mknod' command.
      */
-    public HostConfig withCapAdd(Capability[] capAdd) {
+    public HostConfig withCapAdd(Capability... capAdd) {
         this.capAdd = capAdd;
         return this;
     }
@@ -591,7 +601,7 @@ public HostConfig withCapAdd(Capability[] capAdd) {
     /**
      * @see #capDrop
      */
-    public HostConfig withCapDrop(Capability[] capDrop) {
+    public HostConfig withCapDrop(Capability... capDrop) {
         this.capDrop = capDrop;
         return this;
     }
@@ -660,7 +670,7 @@ public HostConfig withDevices(List<Device> devices) {
     /**
      * @see #devices
      */
-    public HostConfig withDevices(Device[] devices) {
+    public HostConfig withDevices(Device... devices) {
         this.devices = devices;
         return this;
     }
@@ -676,7 +686,7 @@ public HostConfig withDiskQuota(Long diskQuota) {
     /**
      * @see #dns
      */
-    public HostConfig withDns(String[] dns) {
+    public HostConfig withDns(String... dns) {
         this.dns = dns;
         return this;
     }
@@ -689,7 +699,7 @@ public HostConfig withDns(List<String> dns) {
     /**
      * @see #dnsSearch
      */
-    public HostConfig withDnsSearch(String[] dnsSearch) {
+    public HostConfig withDnsSearch(String... dnsSearch) {
         this.dnsSearch = dnsSearch;
         return this;
     }
@@ -702,7 +712,7 @@ public HostConfig withDnsSearch(List<String> dnsSearch) {
     /**
      * @see #extraHosts
      */
-    public HostConfig withExtraHosts(String[] extraHosts) {
+    public HostConfig withExtraHosts(String... extraHosts) {
         this.extraHosts = extraHosts;
         return this;
     }
@@ -734,6 +744,12 @@ public HostConfig withLinks(List<Link> links) {
         return this;
     }
 
+    public HostConfig withLinks(Link... links) {
+        checkNotNull(links, "links was not specified");
+        setLinks(links);
+        return this;
+    }
+
     /**
      * @see #logConfig
      */
@@ -993,8 +1009,6 @@ public HostConfig withIsolation(String isolation) {
         return this;
     }
 
-    // end of auto-generated
-
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
diff --git a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index c49cbd8d4..f01e60019 100644
--- a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -48,6 +48,7 @@
 
 import static com.github.dockerjava.api.model.Capability.MKNOD;
 import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
+import static com.github.dockerjava.api.model.HostConfig.newHostConfig;
 import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_23;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24;
@@ -160,7 +161,8 @@ public void createContainerWithVolumesFrom() throws DockerException {
         CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withCmd("sleep", "9999")
                 .withName(container1Name)
-                .withBinds(bind1, bind2)
+                .withHostConfig(newHostConfig()
+                        .withBinds(bind1, bind2))
                 .exec();
 
         LOG.info("Created container1 {}", container1.toString());
@@ -175,7 +177,8 @@ public void createContainerWithVolumesFrom() throws DockerException {
         // create a second container with volumes from first container
         CreateContainerResponse container2 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withCmd("sleep", "9999")
-                .withVolumesFrom(new VolumesFrom(container1Name))
+                .withHostConfig(newHostConfig()
+                        .withVolumesFrom(new VolumesFrom(container1Name)))
                 .exec();
 
         LOG.info("Created container2 {}", container2.toString());
@@ -285,7 +288,10 @@ public void createContainerWithLink() throws DockerException {
         assertThat(inspectContainerResponse1.getState().getRunning(), is(true));
 
         CreateContainerResponse container2 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withName(containerName2)
-                .withCmd("env").withLinks(new Link(containerName1, "container1Link")).exec();
+                .withCmd("env")
+                .withHostConfig(newHostConfig()
+                        .withLinks(new Link(containerName1, "container1Link")))
+                .exec();
         LOG.info("Created container {}", container2.toString());
         assertThat(container2.getId(), not(isEmptyString()));
 
@@ -299,7 +305,8 @@ public void createContainerWithLink() throws DockerException {
     public void createContainerWithMemorySwappiness() throws DockerException {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withCmd("sleep", "9999")
-                .withMemorySwappiness(42)
+                .withHostConfig(newHostConfig()
+                        .withMemorySwappiness(42))
                 .exec();
         assertThat(container.getId(), not(isEmptyString()));
         LOG.info("Created container {}", container.toString());
@@ -328,8 +335,9 @@ public void createContainerWithLinkInCustomNetwork() throws DockerException {
         assertNotNull(createNetworkResponse.getId());
 
         CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
-                .withNetworkMode(networkName)
                 .withCmd("sleep", "9999")
+                .withHostConfig(newHostConfig()
+                        .withNetworkMode(networkName))
                 .withName(containerName1)
                 .exec();
 
@@ -343,10 +351,12 @@ public void createContainerWithLinkInCustomNetwork() throws DockerException {
         assertThat(inspectContainerResponse1.getState().getRunning(), is(true));
 
         CreateContainerResponse container2 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
-                .withNetworkMode(networkName)
+                .withHostConfig(newHostConfig()
+                        .withNetworkMode(networkName)
+                        .withLinks(new Link(containerName1, containerName1 + "Link"))
+                )
                 .withName(containerName2)
                 .withCmd("env")
-                .withLinks(new Link(containerName1, containerName1 + "Link"))
                 .exec();
 
         LOG.info("Created container {}", container2.toString());
@@ -377,10 +387,11 @@ public void createContainerWithCustomIp() throws DockerException {
         assertNotNull(createNetworkResponse.getId());
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
-                .withNetworkMode(networkName)
                 .withCmd("sleep", "9999")
+                .withHostConfig(newHostConfig()
+                        .withNetworkMode(networkName))
                 .withName(containerName1)
-                .withIpv4Address(subnetPrefix +".100")
+                .withIpv4Address(subnetPrefix + ".100")
                 .exec();
 
         assertThat(container.getId(), not(isEmptyString()));
@@ -410,8 +421,9 @@ public void createContainerWithAlias() throws DockerException {
         assertNotNull(createNetworkResponse.getId());
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
-                .withNetworkMode(networkName)
                 .withCmd("sleep", "9999")
+                .withHostConfig(newHostConfig()
+                        .withNetworkMode(networkName))
                 .withName(containerName1)
                 .withAliases("server" + dockerRule.getKind())
                 .exec();
@@ -430,8 +442,11 @@ public void createContainerWithAlias() throws DockerException {
     @Test
     public void createContainerWithCapAddAndCapDrop() throws DockerException {
 
-        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCapAdd(NET_ADMIN)
-                .withCapDrop(MKNOD).exec();
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withHostConfig(newHostConfig()
+                        .withCapAdd(NET_ADMIN)
+                        .withCapDrop(MKNOD))
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -451,7 +466,9 @@ public void createContainerWithDns() throws DockerException {
         String anotherDnsServer = "8.8.4.4";
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("true")
-                .withDns(aDnsServer, anotherDnsServer).exec();
+                .withHostConfig(newHostConfig()
+                        .withDns(aDnsServer, anotherDnsServer))
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -487,7 +504,9 @@ public void createContainerWithExtraHosts() throws DockerException {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withName("containerextrahosts" + dockerRule.getKind())
-                .withExtraHosts(extraHosts).exec();
+                .withHostConfig(newHostConfig()
+                        .withExtraHosts(extraHosts))
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -503,7 +522,8 @@ public void createContainerWithExtraHosts() throws DockerException {
     public void createContainerWithDevices() throws DockerException {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999")
-                .withDevices(new Device("rwm", "/dev/nulo", "/dev/zero")).exec();
+                .withHostConfig(newHostConfig()
+                        .withDevices(new Device("rwm", "/dev/nulo", "/dev/zero"))).exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -517,7 +537,7 @@ public void createContainerWithDevices() throws DockerException {
 
     @Test
     public void createContainerWithPortBindings() throws DockerException {
-        int baseport = getFactoryType() == FactoryType.JERSEY? 11000: 12000;
+        int baseport = getFactoryType() == FactoryType.JERSEY ? 11000 : 12000;
 
         ExposedPort tcp22 = ExposedPort.tcp(22);
         ExposedPort tcp23 = ExposedPort.tcp(23);
@@ -528,7 +548,8 @@ public void createContainerWithPortBindings() throws DockerException {
         portBindings.bind(tcp23, Binding.bindPort(baseport + 24));
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("true")
-                .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
+                .withExposedPorts(tcp22, tcp23).withHostConfig(newHostConfig()
+                        .withPortBindings(portBindings)).exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -581,7 +602,8 @@ public void createContainerWithLinking() throws DockerException {
 
         CreateContainerResponse container2 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999")
                 .withName(containerName2)
-                .withLinks(new Link(containerName1, containerName1 + "Link")).exec();
+                .withHostConfig(newHostConfig()
+                        .withLinks(new Link(containerName1, containerName1 + "Link"))).exec();
 
         LOG.info("Created container2 {}", container2.toString());
         assertThat(container2.getId(), not(isEmptyString()));
@@ -608,7 +630,8 @@ public void createContainerWithRestartPolicy() throws DockerException {
         RestartPolicy restartPolicy = RestartPolicy.onFailureRestart(5);
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999")
-                .withRestartPolicy(restartPolicy).exec();
+                .withHostConfig(newHostConfig()
+                        .withRestartPolicy(restartPolicy)).exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -623,7 +646,8 @@ public void createContainerWithRestartPolicy() throws DockerException {
     public void createContainerWithPidMode() throws DockerException {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("true")
-                .withPidMode("host").exec();
+                .withHostConfig(newHostConfig()
+                        .withPidMode("host")).exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -644,7 +668,8 @@ public void createContainerWithPidMode() throws DockerException {
     public void createContainerWithNetworkMode() throws DockerException {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("true")
-                .withNetworkMode("host").exec();
+                .withHostConfig(newHostConfig()
+                        .withNetworkMode("host")).exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -677,7 +702,8 @@ public void createContainerWithULimits() throws DockerException {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withName(containerName)
-                .withUlimits(ulimits).exec();
+                .withHostConfig(newHostConfig()
+                        .withUlimits(ulimits)).exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -720,7 +746,10 @@ public void createContainerWithLabels() throws DockerException {
     public void createContainerWithLogConfig() throws DockerException {
 
         LogConfig logConfig = new LogConfig(LogConfig.LoggingType.NONE, null);
-        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withLogConfig(logConfig).exec();
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withHostConfig(newHostConfig()
+                        .withLogConfig(logConfig))
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -789,7 +818,8 @@ public void onNext(Frame item) {
     @Test
     public void createContainerWithCgroupParent() throws DockerException {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
-                .withCgroupParent("/parent").exec();
+                .withHostConfig(newHostConfig()
+                        .withCgroupParent("/parent")).exec();
 
         LOG.info("Created container {}", container.toString());
 
diff --git a/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java b/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java
index 51faa2ea8..220ad89ef 100644
--- a/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java
@@ -5,6 +5,7 @@
 import com.github.dockerjava.api.model.Network;
 import org.junit.Test;
 
+import static com.github.dockerjava.api.model.HostConfig.newHostConfig;
 import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -40,8 +41,9 @@ public void forceDisconnectFromNetwork() throws InterruptedException {
         CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd().withName("testNetwork2" + dockerRule.getKind()).exec();
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
-                .withNetworkMode("testNetwork2" + dockerRule.getKind())
                 .withCmd("sleep", "9999")
+                .withHostConfig(newHostConfig()
+                        .withNetworkMode("testNetwork2" + dockerRule.getKind()))
                 .exec();
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
diff --git a/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java b/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
index b5210c171..098c592b8 100644
--- a/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
@@ -4,6 +4,7 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.core.command.PullImageResultCallback;
 import com.github.dockerjava.core.command.WaitContainerResultCallback;
@@ -257,7 +258,9 @@ public void testVolumeFilter() throws Exception {
 
         id = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withLabels(testLabel)
-                .withBinds(new Bind("TestFilterVolume", new Volume("/test")))
+                .withHostConfig(HostConfig.newHostConfig()
+                        .withBinds(new Bind("TestFilterVolume", new Volume("/test")))
+                )
                 .exec()
                 .getId();
 
@@ -285,7 +288,9 @@ public void testNetworkFilter() throws Exception {
 
         id = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withLabels(testLabel)
-                .withNetworkMode("TestFilterNetwork")
+                .withHostConfig(HostConfig.newHostConfig()
+                        .withNetworkMode("TestFilterNetwork")
+                )
                 .exec()
                 .getId();
 
diff --git a/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
index f55e43247..bd0a53f50 100644
--- a/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
@@ -10,6 +10,7 @@
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Link;
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.Ports.Binding;
@@ -29,6 +30,7 @@
 import static com.github.dockerjava.api.model.AccessMode.ro;
 import static com.github.dockerjava.api.model.Capability.MKNOD;
 import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
+import static com.github.dockerjava.api.model.HostConfig.newHostConfig;
 import static com.github.dockerjava.junit.DockerMatchers.mountedVolumes;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
@@ -53,8 +55,12 @@ public void startContainerWithVolumes() throws DockerException {
 
         Volume volume2 = new Volume("/opt/webapp2");
 
-        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withVolumes(volume1, volume2)
-                .withCmd("true").withBinds(new Bind("/src/webapp1", volume1, ro), new Bind("/src/webapp2", volume2))
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+                .withVolumes(volume1, volume2)
+                .withCmd("true")
+                .withHostConfig(newHostConfig()
+                        .withBinds(new Bind("/src/webapp1", volume1, ro), new Bind("/src/webapp2", volume2))
+                )
                 .exec();
 
         LOG.info("Created container {}", container.toString());
@@ -95,7 +101,9 @@ public void startContainerWithVolumesFrom() throws DockerException {
 
         CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withName(container1Name)
-                .withBinds(new Bind("/src/webapp1", volume1), new Bind("/src/webapp2", volume2)).exec();
+                .withHostConfig(newHostConfig()
+                        .withBinds(new Bind("/src/webapp1", volume1), new Bind("/src/webapp2", volume2)))
+                .exec();
         LOG.info("Created container1 {}", container1.toString());
 
         dockerRule.getClient().startContainerCmd(container1.getId()).exec();
@@ -107,7 +115,9 @@ public void startContainerWithVolumesFrom() throws DockerException {
         assertThat(inspectContainerResponse1, mountedVolumes(containsInAnyOrder(volume1, volume2)));
 
         CreateContainerResponse container2 = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withVolumesFrom(new VolumesFrom(container1Name)).exec();
+                .withHostConfig(newHostConfig()
+                        .withVolumesFrom(new VolumesFrom(container1Name)))
+                .exec();
         LOG.info("Created container2 {}", container2.toString());
 
         dockerRule.getClient().startContainerCmd(container2.getId()).exec();
@@ -125,8 +135,11 @@ public void startContainerWithDns() throws DockerException {
         String aDnsServer = "8.8.8.8";
         String anotherDnsServer = "8.8.4.4";
 
-        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true")
-                .withDns(aDnsServer, anotherDnsServer).exec();
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+                .withCmd("true")
+                .withHostConfig(newHostConfig()
+                        .withDns(aDnsServer, anotherDnsServer))
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -145,8 +158,11 @@ public void startContainerWithDnsSearch() throws DockerException {
 
         String dnsSearch = "example.com";
 
-        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true")
-                .withDnsSearch(dnsSearch).exec();
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+                .withCmd("true")
+                .withHostConfig(newHostConfig()
+                        .withDnsSearch(dnsSearch))
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -163,7 +179,7 @@ public void startContainerWithDnsSearch() throws DockerException {
 
     @Test
     public void startContainerWithPortBindings() throws DockerException {
-        int baseport = getFactoryType() == FactoryType.JERSEY? 13000: 14000;
+        int baseport = getFactoryType() == FactoryType.JERSEY ? 13000 : 14000;
 
         ExposedPort tcp22 = ExposedPort.tcp(22);
         ExposedPort tcp23 = ExposedPort.tcp(23);
@@ -173,8 +189,12 @@ public void startContainerWithPortBindings() throws DockerException {
         portBindings.bind(tcp23, Binding.bindPort(baseport + 23));
         portBindings.bind(tcp23, Binding.bindPort(baseport + 24));
 
-        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true")
-                .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+                .withCmd("true")
+                .withExposedPorts(tcp22, tcp23)
+                .withHostConfig(newHostConfig()
+                        .withPortBindings(portBindings))
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -210,7 +230,11 @@ public void startContainerWithRandomPortBindings() throws DockerException {
         portBindings.bind(tcp23, Binding.empty());
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).withPublishAllPorts(true).exec();
+                .withExposedPorts(tcp22, tcp23)
+                .withHostConfig(newHostConfig()
+                        .withPortBindings(portBindings)
+                        .withPublishAllPorts(true))
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -241,7 +265,10 @@ public void startContainerWithConflictingPortBindings() throws DockerException {
         portBindings.bind(tcp23, Binding.bindPort(11022));
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true")
-                .withExposedPorts(tcp22, tcp23).withPortBindings(portBindings).exec();
+                .withExposedPorts(tcp22, tcp23)
+                .withHostConfig(newHostConfig()
+                        .withPortBindings(portBindings))
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -283,8 +310,12 @@ public void startContainerWithLinkingDeprecated() throws DockerException {
             assertThat(inspectContainerResponse1.getState().getExitCode(), is(equalTo(0)));
         }
 
-        CreateContainerResponse container2 = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName(container2Name).withLinks(new Link(container1Name, container1Name + "Link")).exec();
+        CreateContainerResponse container2 = dockerRule.getClient().createContainerCmd("busybox")
+                .withCmd("sleep", "9999")
+                .withName(container2Name)
+                .withHostConfig(newHostConfig()
+                        .withLinks(new Link(container1Name, container1Name + "Link")))
+                .exec();
 
         LOG.info("Created container2 {}", container2.toString());
         assertThat(container2.getId(), not(isEmptyString()));
@@ -299,7 +330,7 @@ public void startContainerWithLinkingDeprecated() throws DockerException {
         assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
         assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link(container1Name,
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[]{new Link(container1Name,
                 container1Name + "Link")}));
         assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
         assertThat(inspectContainerResponse2.getName(), equalTo("/" + container2Name));
@@ -343,7 +374,10 @@ public void startContainerWithLinking() throws DockerException {
         }
 
         CreateContainerResponse container2 = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName(container2Name).withLinks(new Link(container1Name, container1Name + "Link")).exec();
+                .withName(container2Name)
+                .withHostConfig(newHostConfig()
+                        .withLinks(new Link(container1Name, container1Name + "Link")))
+                .exec();
 
         LOG.info("Created container2 {}", container2.toString());
         assertThat(container2.getId(), not(isEmptyString()));
@@ -358,7 +392,7 @@ public void startContainerWithLinking() throws DockerException {
         assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
         assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[] {new Link(container1Name,
+        assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[]{new Link(container1Name,
                 container1Name + "Link")}));
         assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
         assertThat(inspectContainerResponse2.getName(), equalTo("/" + container2Name));
@@ -371,7 +405,7 @@ public void startContainerWithLinking() throws DockerException {
     @Test
     public void startContainer() throws DockerException {
 
-        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd(new String[] {"top"})
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd(new String[]{"top"})
                 .exec();
 
         LOG.info("Created container {}", container.toString());
@@ -400,7 +434,7 @@ public void startContainer() throws DockerException {
     @Test(expected = NotFoundException.class)
     public void testStartNonExistingContainer() throws DockerException {
 
-            dockerRule.getClient().startContainerCmd("non-existing").exec();
+        dockerRule.getClient().startContainerCmd("non-existing").exec();
     }
 
     /**
@@ -412,8 +446,11 @@ public void testStartNonExistingContainer() throws DockerException {
     @Test
     public void startContainerWithNetworkMode() throws DockerException {
 
-        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true")
-                .withNetworkMode("host").exec();
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+                .withCmd("true")
+                .withHostConfig(newHostConfig()
+                        .withNetworkMode("host"))
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -431,8 +468,12 @@ public void startContainerWithNetworkMode() throws DockerException {
     @Test
     public void startContainerWithCapAddAndCapDrop() throws DockerException {
 
-        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withCapAdd(NET_ADMIN).withCapDrop(MKNOD).exec();
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+                .withCmd("sleep", "9999")
+                .withHostConfig(newHostConfig()
+                        .withCapAdd(NET_ADMIN)
+                        .withCapDrop(MKNOD))
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -453,7 +494,9 @@ public void startContainerWithCapAddAndCapDrop() throws DockerException {
     public void startContainerWithDevices() throws DockerException {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withDevices(new Device("rwm", "/dev/nulo", "/dev/zero")).exec();
+                .withHostConfig(newHostConfig()
+                        .withDevices(new Device("rwm", "/dev/nulo", "/dev/zero")))
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -473,7 +516,9 @@ public void startContainerWithDevices() throws DockerException {
     public void startContainerWithExtraHosts() throws DockerException {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withExtraHosts("dockerhost:127.0.0.1").exec();
+                .withHostConfig(newHostConfig()
+                        .withExtraHosts("dockerhost:127.0.0.1"))
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -495,7 +540,8 @@ public void startContainerWithRestartPolicy() throws DockerException {
         RestartPolicy restartPolicy = RestartPolicy.onFailureRestart(5);
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withRestartPolicy(restartPolicy).exec();
+                .withHostConfig(newHostConfig()
+                        .withRestartPolicy(restartPolicy)).exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -516,7 +562,9 @@ public void existingHostConfigIsPreservedByBlankStartCmd() throws DockerExceptio
         String dnsServer = "8.8.8.8";
 
         // prepare a container with custom DNS
-        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withDns(dnsServer)
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+                .withHostConfig(newHostConfig()
+                        .withDns(dnsServer))
                 .withCmd("true").exec();
 
         LOG.info("Created container {}", container.toString());
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
index 112a8e689..79759cdd2 100644
--- a/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
@@ -7,6 +7,7 @@
 import com.github.dockerjava.api.exception.NotAcceptableException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.cmd.CmdIT;
@@ -22,6 +23,7 @@
 import org.junit.BeforeClass;
 import org.junit.experimental.categories.Category;
 
+import static com.github.dockerjava.api.model.HostConfig.newHostConfig;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24;
 import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
 import static org.junit.Assume.assumeThat;
@@ -102,14 +104,17 @@ protected DockerClient startDockerInDocker() {
         int port = PORT_START + (numberOfDockersInDocker - 1);
         CreateContainerResponse response = dockerRule.getClient()
                 .createContainerCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY + ":" + DOCKER_IN_DOCKER_IMAGE_TAG)
-                .withPrivileged(true)
+                .withHostConfig(newHostConfig()
+                        .withPrivileged(true)
+                        .withNetworkMode(NETWORK_NAME)
+                        .withPortBindings(new PortBinding(
+                                Ports.Binding.bindIpAndPort("127.0.0.1", port),
+                                ExposedPort.tcp(2375)
+                        )))
                 .withName(name)
-                .withNetworkMode(NETWORK_NAME)
                 .withAliases(name)
-                .withPortBindings(new PortBinding(
-                        Ports.Binding.bindIpAndPort("127.0.0.1", port),
-                        ExposedPort.tcp(2375)))
                 .exec();
+
         dockerRule.getClient().startContainerCmd(response.getId()).exec();
 
         return initializeDockerClient(port);
diff --git a/src/test/java/com/github/dockerjava/utils/RegistryUtils.java b/src/test/java/com/github/dockerjava/utils/RegistryUtils.java
index ea78795a2..e0251023c 100644
--- a/src/test/java/com/github/dockerjava/utils/RegistryUtils.java
+++ b/src/test/java/com/github/dockerjava/utils/RegistryUtils.java
@@ -15,6 +15,7 @@
 import java.io.File;
 import java.util.concurrent.TimeUnit;
 
+import static com.github.dockerjava.api.model.HostConfig.newHostConfig;
 import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.not;
@@ -64,7 +65,8 @@ public static synchronized AuthConfig runPrivateRegistry(DockerClient dockerClie
             CreateContainerResponse testregistry = dockerClient
                     .createContainerCmd(imageName + ":2")
                     .withName(containerName)
-                    .withPortBindings(new PortBinding(Ports.Binding.bindPort(port), ExposedPort.tcp(5000)))
+                    .withHostConfig(newHostConfig()
+                            .withPortBindings(new PortBinding(Ports.Binding.bindPort(port), ExposedPort.tcp(5000))))
                     .withEnv("REGISTRY_AUTH=htpasswd", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm",
                             "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "REGISTRY_LOG_LEVEL=debug",
                             "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key")

From 935981c69e6380437b3c80fba90ee26c8410c9d4 Mon Sep 17 00:00:00 2001
From: Artem Krivonozhko <artemkrivonozhko@gmail.com>
Date: Thu, 1 Nov 2018 15:13:17 +0300
Subject: [PATCH 0855/1272] Add missing import line for
 BuildImageResultCallback

---
 .../com/github/dockerjava/core/command/DockerfileFixture.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
index 874684e3e..b17947c30 100644
--- a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
+++ b/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -4,6 +4,7 @@
 import com.github.dockerjava.api.exception.InternalServerErrorException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Image;
+import com.github.dockerjava.core.command.BuildImageResultCallback;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

From 1d13e5b216f0f0938ab00d05ecdce29fe00a115d Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 25 Nov 2018 03:50:18 +0300
Subject: [PATCH 0856/1272] Update versions

---
 pom.xml                                                   | 8 ++++----
 .../github/dockerjava/api/model/ServiceModeConfig.java    | 2 +-
 .../java/com/github/dockerjava/api/model/VersionTest.java | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7f9cefc94..b04042770 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,9 +58,9 @@
 		<jdk.target>1.7</jdk.target>
 
 		<jersey.version>2.27</jersey.version>
-		<jackson-jaxrs.version>2.6.7</jackson-jaxrs.version>
+		<jackson-jaxrs.version>2.9.7</jackson-jaxrs.version>
 		<httpclient.version>4.5.6</httpclient.version><!-- 4.5.1-4.5.2 broken -->
-		<commons-compress.version>1.17</commons-compress.version>
+		<commons-compress.version>1.18</commons-compress.version>
 		<commons-codec.version>1.11</commons-codec.version>
 		<commons-io.version>2.6</commons-io.version>
 		<commons-lang.version>2.6</commons-lang.version>
@@ -72,7 +72,7 @@
 
 		<!-- test dependencies -->
 		<logback.version>1.2.3</logback.version>
-		<netty.version>4.1.27.Final</netty.version>
+		<netty.version>4.1.31.Final</netty.version>
 		<hamcrest.library.version>1.3</hamcrest.library.version>
 		<hamcrest.jpa-matchers>1.8</hamcrest.jpa-matchers>
 		<lambdaj.version>2.3.3</lambdaj.version>
@@ -164,7 +164,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
-			<version>1.7.21</version>
+			<version>${slf4j-api.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java b/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
index d2ffe3d95..9aeec2e1c 100644
--- a/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
@@ -14,7 +14,7 @@
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
 public class ServiceModeConfig implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/test/java/com/github/dockerjava/api/model/VersionTest.java b/src/test/java/com/github/dockerjava/api/model/VersionTest.java
index 606420b3c..1c3e55c5c 100644
--- a/src/test/java/com/github/dockerjava/api/model/VersionTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/VersionTest.java
@@ -24,7 +24,7 @@ public class VersionTest {
     @Test
     public void testSerDer1() throws Exception {
         final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(Version.class);
+        final JavaType type = mapper.getTypeFactory().constructType(Version.class);
 
         final Version version = testRoundTrip(RemoteApiVersion.VERSION_1_22,
                 "/version/1.json",
@@ -46,7 +46,7 @@ public void testSerDer1() throws Exception {
     @Test
     public void version_1_38() throws Exception {
         final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(Version.class);
+        final JavaType type = mapper.getTypeFactory().constructType(Version.class);
 
         final Version version = testRoundTrip(RemoteApiVersion.VERSION_1_38,
                 "/version/lcow.json",

From ab1a0696b4856667fc9ef3e770cfafb83b57bee7 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 25 Nov 2018 05:42:56 +0300
Subject: [PATCH 0857/1272] Fix tests

---
 .../api/command/InspectContainerResponseTest.java         | 4 ++--
 .../dockerjava/api/command/InspectExecResponseTest.java   | 2 +-
 .../com/github/dockerjava/api/model/AuthConfigTest.java   | 8 ++++----
 .../java/com/github/dockerjava/api/model/EventsTest.java  | 2 +-
 .../com/github/dockerjava/api/model/StatisticsTest.java   | 2 +-
 .../com/github/dockerjava/cmd/UpdateContainerCmdIT.java   | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
index ee38b70d0..6b4a5ec72 100644
--- a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
+++ b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
@@ -68,7 +68,7 @@ public void roundTrip_full() throws IOException {
     public void roundTrip_full_healthcheck() throws IOException {
 
         final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(InspectContainerResponse.class);
+        final JavaType type = mapper.getTypeFactory().constructType(InspectContainerResponse.class);
 
         final InspectContainerResponse response = testRoundTrip(RemoteApiVersion.VERSION_1_24,
                 "/containers/inspect/1.json",
@@ -139,7 +139,7 @@ public void roundTrip_empty() throws IOException {
     public void inspect_windows_container() throws IOException {
 
         final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(InspectContainerResponse.class);
+        final JavaType type = mapper.getTypeFactory().constructType(InspectContainerResponse.class);
 
         final InspectContainerResponse response = testRoundTrip(RemoteApiVersion.VERSION_1_38,
                 "/containers/inspect/lcow.json",
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java
index 7290f121b..9c2641885 100644
--- a/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java
+++ b/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java
@@ -21,7 +21,7 @@ public class InspectExecResponseTest {
     @Test
     public void test_1_22_SerDer1() throws Exception {
         final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(InspectExecResponse.class);
+        final JavaType type = mapper.getTypeFactory().constructType(InspectExecResponse.class);
 
         final InspectExecResponse execResponse = testRoundTrip(RemoteApiVersion.VERSION_1_22,
                 "/exec/ID/1.json",
diff --git a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
index add1e7a25..d470ff1d7 100644
--- a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
@@ -25,7 +25,7 @@ public void defaultServerAddress() throws Exception {
     @Test
     public void serderDocs1() throws IOException {
         final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(AuthConfig.class);
+        final JavaType type = mapper.getTypeFactory().constructType(AuthConfig.class);
 
         final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_22,
                 "/other/AuthConfig/docs1.json",
@@ -47,7 +47,7 @@ public void serderDocs1() throws IOException {
     @Test
     public void serderDocs2() throws IOException {
         final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(AuthConfig.class);
+        final JavaType type = mapper.getTypeFactory().constructType(AuthConfig.class);
 
         final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_22,
                 "/other/AuthConfig/docs2.json",
@@ -66,7 +66,7 @@ public void serderDocs2() throws IOException {
     @Test
     public void compatibleWithIdentitytoken() throws IOException {
         final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(AuthConfig.class);
+        final JavaType type = mapper.getTypeFactory().constructType(AuthConfig.class);
         final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_23,
                 "/other/AuthConfig/docs1.json",
                 type
@@ -83,7 +83,7 @@ public void compatibleWithIdentitytoken() throws IOException {
     @Test
     public void shouldNotFailWithStackOrchestratorInConfig() throws IOException {
         final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(AuthConfig.class);
+        final JavaType type = mapper.getTypeFactory().constructType(AuthConfig.class);
         final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_25,
                 "/other/AuthConfig/orchestrators.json",
                 type
diff --git a/src/test/java/com/github/dockerjava/api/model/EventsTest.java b/src/test/java/com/github/dockerjava/api/model/EventsTest.java
index c517b80a9..05b6a7a1d 100644
--- a/src/test/java/com/github/dockerjava/api/model/EventsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/EventsTest.java
@@ -24,7 +24,7 @@ public class EventsTest {
     @Test
     public void serderDocs1() throws IOException {
         final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(Event.class);
+        final JavaType type = mapper.getTypeFactory().constructType(Event.class);
 
         final Event event = testRoundTrip(RemoteApiVersion.VERSION_1_24,
                 "/events/docs1.json",
diff --git a/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java b/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
index 6082731af..261fe7d1b 100644
--- a/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
@@ -23,7 +23,7 @@ public class StatisticsTest {
     @Test
     public void serderJson1() throws IOException {
         final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(Statistics.class);
+        final JavaType type = mapper.getTypeFactory().constructType(Statistics.class);
 
         final Statistics statistics = testRoundTrip(RemoteApiVersion.VERSION_1_27,
                 "containers/container/stats/stats1.json",
diff --git a/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
index d63f6aaa2..238a0da73 100644
--- a/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
@@ -84,7 +84,7 @@ public void updateContainer() throws DockerException, IOException {
     @Test
     public void serDerDocs1() throws IOException {
         final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().uncheckedSimpleType(UpdateContainerCmdImpl.class);
+        final JavaType type = mapper.getTypeFactory().constructType(UpdateContainerCmdImpl.class);
 
         final UpdateContainerCmdImpl upd = testRoundTrip(VERSION_1_22,
                 "/containers/container/update/docs.json",

From d394513adc12ea094814437fee5c89d4efafbd72 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 27 Sep 2018 03:37:09 +0300
Subject: [PATCH 0858/1272] Fixup

---
 .../dockerjava/api/command/BuildImageCmd.java | 17 ++---
 .../core/exec/BuildImageCmdExec.java          |  4 +-
 .../core/util/CacheFromEncoder.java           |  5 +-
 .../dockerjava/core/util/FiltersEncoder.java  | 10 +--
 .../core/util/ServiceFiltersBuilder.java      | 67 -------------------
 .../dockerjava/jaxrs/BuildImageCmdExec.java   |  1 -
 6 files changed, 19 insertions(+), 85 deletions(-)
 delete mode 100644 src/main/java/com/github/dockerjava/core/util/ServiceFiltersBuilder.java

diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 9cf3296ce..e38d1c1d5 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -19,7 +19,7 @@
  * TODO: http://docs.docker.com/reference/builder/#dockerignore
  *
  * @see <a
- *      href="https://docs.docker.com/reference/api/docker_remote_api_v1.20/#build-image-from-a-dockerfile">build-image-from-a-dockerfile</a>
+ * href="https://docs.docker.com/reference/api/docker_remote_api_v1.20/#build-image-from-a-dockerfile">build-image-from-a-dockerfile</a>
  */
 public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildResponseItem> {
 
@@ -45,6 +45,7 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     /**
      * Multple "t" tags.
+     *
      * @since {@link RemoteApiVersion#VERSION_1_21}
      */
     @CheckForNull
@@ -114,7 +115,7 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     Map<String, String> getBuildArgs();
 
     /**
-     *@since {@link RemoteApiVersion#VERSION_1_22}
+     * @since {@link RemoteApiVersion#VERSION_1_22}
      */
     @CheckForNull
     Long getShmsize();
@@ -135,7 +136,7 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     /**
      * @deprecated since docker API version 1.21 there can be multiple tags
-     * specified so use {@link #withTags(Set<String>)}
+     * specified so use {@link BuildImageCmd#withTags(java.util.Set)}
      */
     @Deprecated
     BuildImageCmd withTag(String tag);
@@ -185,17 +186,17 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     BuildImageCmd withTarInputStream(@Nonnull InputStream tarInputStream);
 
     /**
-    *@since {@link RemoteApiVersion#VERSION_1_22}
-    */
+     * @since {@link RemoteApiVersion#VERSION_1_22}
+     */
     BuildImageCmd withShmsize(Long shmsize);
 
     /**
-    *@since {@link RemoteApiVersion#VERSION_1_23}
-    */
+     * @since {@link RemoteApiVersion#VERSION_1_23}
+     */
     BuildImageCmd withLabels(Map<String, String> labels);
 
     /**
-     *@since {@link RemoteApiVersion#VERSION_1_25}
+     * @since {@link RemoteApiVersion#VERSION_1_25}
      */
     BuildImageCmd withNetworkMode(String networkMode);
 
diff --git a/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
index d229a9732..ef7fb9e5d 100644
--- a/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
@@ -9,10 +9,10 @@
 import com.github.dockerjava.core.InvocationBuilder;
 import com.github.dockerjava.core.MediaType;
 import com.github.dockerjava.core.WebTarget;
-import com.github.dockerjava.core.util.CacheFromEncoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static com.github.dockerjava.core.util.CacheFromEncoder.jsonEncode;
 import static org.apache.commons.lang.StringUtils.isNotBlank;
 
 public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem> implements
@@ -59,7 +59,7 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
         }
 
         if (command.getCacheFrom() != null && !command.getCacheFrom().isEmpty()) {
-            webTarget = webTarget.queryParam("cachefrom", CacheFromEncoder.jsonEncode(command.getCacheFrom()));
+            webTarget = webTarget.queryParam("cachefrom", jsonEncode(command.getCacheFrom()));
         }
 
         if (command.getRemote() != null) {
diff --git a/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java b/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java
index 59da5e406..2a24f76ae 100644
--- a/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java
+++ b/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java
@@ -11,15 +11,16 @@
  * JSON Encoder for the docker --cache-from parameter.
  */
 public class CacheFromEncoder {
+
     private CacheFromEncoder() {
     }
 
-    private static final ObjectMapper OBJECT_MAPPER = new JacksonJaxbJsonProvider().locateMapper(Collection.class,
+    private static final ObjectMapper MAPPER = new JacksonJaxbJsonProvider().locateMapper(Collection.class,
             MediaType.APPLICATION_JSON_TYPE);
 
     public static String jsonEncode(Collection<String> imageIds) {
         try {
-            return OBJECT_MAPPER.writeValueAsString(imageIds);
+            return MAPPER.writeValueAsString(imageIds);
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }
diff --git a/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java b/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
index 280daad45..fd4c0d5ab 100644
--- a/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
+++ b/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
@@ -13,20 +13,20 @@
  * JSON Encoder for docker filters.
  *
  * @author Carlos Sanchez <carlos@apache.org>
- *
  */
 public class FiltersEncoder {
+
     private FiltersEncoder() {
     }
 
-    private static final ObjectMapper OBJECT_MAPPER = new JacksonJaxbJsonProvider().locateMapper(Map.class,
-            MediaType.APPLICATION_JSON_TYPE);
+    private static final ObjectMapper MAPPER = new JacksonJaxbJsonProvider().locateMapper(Map.class, MediaType.APPLICATION_JSON_TYPE);
 
-    public static String jsonEncode(Map<String, List<String>> filters) {
+    public static String jsonEncode(Map<String, List<String>> mapStringListString) {
         try {
-            return OBJECT_MAPPER.writeValueAsString(filters);
+            return MAPPER.writeValueAsString(mapStringListString);
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }
     }
+
 }
diff --git a/src/main/java/com/github/dockerjava/core/util/ServiceFiltersBuilder.java b/src/main/java/com/github/dockerjava/core/util/ServiceFiltersBuilder.java
deleted file mode 100644
index db52df73f..000000000
--- a/src/main/java/com/github/dockerjava/core/util/ServiceFiltersBuilder.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.github.dockerjava.core.util;
-
-import org.apache.commons.lang.builder.EqualsBuilder;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Representation of filters to service lists.
- */
-@Deprecated
-public class ServiceFiltersBuilder {
-
-    private Map<String, List<String>> filters = new HashMap<>();
-
-    public ServiceFiltersBuilder() {
-    }
-
-    public ServiceFiltersBuilder withFilter(String key, String... value) {
-        filters.put(key, Arrays.asList(value));
-        return this;
-    }
-
-    public ServiceFiltersBuilder withFilter(String key, List<String> value) {
-        filters.put(key, value);
-        return this;
-    }
-
-    public List<String> getFilter(String key) {
-        return filters.get(key);
-    }
-
-    public ServiceFiltersBuilder withIds(List<String> ids) {
-        withFilter("id", ids);
-        return this;
-    }
-
-    public List<String> getIds() {
-        return getFilter("id");
-    }
-
-    public ServiceFiltersBuilder withNames(List<String> names) {
-        withFilter("name", names);
-        return this;
-    }
-
-    public List<String> getNames() {
-        return getFilter("names");
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-
-    }
-
-    @Override
-    public int hashCode() {
-        return filters.hashCode();
-    }
-
-    public Map<String, List<String>> build() {
-        return filters;
-    }
-}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index a741e0a61..9aab5dffa 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -7,7 +7,6 @@
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import com.github.dockerjava.core.util.CacheFromEncoder;

From 536805767df705c384495af890d761064c42a6df Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 26 Nov 2018 21:02:53 +0300
Subject: [PATCH 0859/1272] Upd apis (#1135)

* WIP

* Update part of apis to 1.37

* Fix test

* Fix test
---
 .../api/command/CreateContainerCmd.java       | 184 +++----
 .../dockerjava/api/model/AuthConfig.java      |   6 +-
 .../dockerjava/api/model/BlkioRateDevice.java |  54 +++
 .../api/model/BlkioWeightDevice.java          |  54 +++
 .../github/dockerjava/api/model/Device.java   |  12 +-
 .../dockerjava/api/model/HealthCheck.java     |  30 +-
 .../dockerjava/api/model/HostConfig.java      | 438 ++++++++++++-----
 .../dockerjava/api/model/Isolation.java       |  41 ++
 .../dockerjava/api/model/LogConfig.java       |  63 +--
 .../github/dockerjava/api/model/Ulimit.java   |   2 -
 .../core/command/CreateContainerCmdImpl.java  | 454 ++++++++++--------
 .../command/InspectContainerResponseTest.java |   3 +-
 .../dockerjava/cmd/CreateContainerCmdIT.java  |  43 +-
 .../cmd/DisconnectFromNetworkCmdIT.java       |   2 +-
 .../dockerjava/cmd/ListContainersCmdIT.java   |  12 +-
 .../dockerjava/cmd/StartContainerCmdIT.java   |  46 +-
 .../dockerjava/cmd/UpdateContainerCmdIT.java  |   4 +-
 .../dockerjava/cmd/swarm/SwarmCmdIT.java      |   8 +-
 .../inspectContainerResponse_full_1_26a.json  |   2 +-
 19 files changed, 942 insertions(+), 516 deletions(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/Isolation.java

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 63d53563f..4fa5dd2e2 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -4,6 +4,7 @@
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.HealthCheck;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Volume;
 
@@ -16,171 +17,192 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     AuthConfig getAuthConfig();
 
+    /**
+     * While using swarm classic, you can provide an optional auth config which will be used to pull images from a private registry,
+     * if the swarm node does not already have the docker image.
+     * Note: This option does not have any effect in normal docker
+     *
+     * @param authConfig The optional auth config
+     */
+    CreateContainerCmd withAuthConfig(AuthConfig authConfig);
+
     @CheckForNull
     List<String> getAliases();
 
+    /**
+     * Add network-scoped alias for the container
+     *
+     * @param aliases on ore more aliases
+     */
+    CreateContainerCmd withAliases(List<String> aliases);
+
+    /**
+     * Add network-scoped alias for the container
+     *
+     * @param aliases on ore more aliases
+     */
+    CreateContainerCmd withAliases(String... aliases);
+
     @CheckForNull
     String[] getCmd();
 
+    CreateContainerCmd withCmd(String... cmd);
+
+    CreateContainerCmd withCmd(List<String> cmd);
+
+    @CheckForNull
+    HealthCheck getHealthcheck();
+
+    CreateContainerCmd withHealthcheck(HealthCheck healthCheck);
+
+    @CheckForNull
+    Boolean getArgsEscaped();
+
+    CreateContainerCmd withArgsEscaped(Boolean argsEscaped);
+
     @CheckForNull
     String getDomainName();
 
+    CreateContainerCmd withDomainName(String domainName);
+
     @CheckForNull
     String[] getEntrypoint();
 
+    CreateContainerCmd withEntrypoint(String... entrypoint);
+
+    CreateContainerCmd withEntrypoint(List<String> entrypoint);
+
     @CheckForNull
     String[] getEnv();
 
+    CreateContainerCmd withEnv(String... env);
+
+    CreateContainerCmd withEnv(List<String> env);
+
     @CheckForNull
     ExposedPort[] getExposedPorts();
 
+    CreateContainerCmd withExposedPorts(List<ExposedPort> exposedPorts);
+
+    CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts);
+
     @CheckForNull
     String getStopSignal();
 
+    CreateContainerCmd withStopSignal(String stopSignal);
+
+    @CheckForNull
+    Integer getStopTimeout();
+
+    CreateContainerCmd withStopTimeout(Integer stopTimeout);
+
     @CheckForNull
     String getHostName();
 
+    CreateContainerCmd withHostName(String hostName);
+
     @CheckForNull
     String getImage();
 
+    CreateContainerCmd withImage(String image);
+
     @CheckForNull
     String getIpv4Address();
 
+    CreateContainerCmd withIpv4Address(String ipv4Address);
+
     @CheckForNull
     String getIpv6Address();
 
+    CreateContainerCmd withIpv6Address(String ipv6Address);
+
     @CheckForNull
     Map<String, String> getLabels();
 
+    CreateContainerCmd withLabels(Map<String, String> labels);
+
     @CheckForNull
     String getMacAddress();
 
+    CreateContainerCmd withMacAddress(String macAddress);
+
     @CheckForNull
     String getName();
 
+    CreateContainerCmd withName(String name);
+
     @CheckForNull
     String[] getPortSpecs();
 
+    CreateContainerCmd withPortSpecs(String... portSpecs);
+
+    CreateContainerCmd withPortSpecs(List<String> portSpecs);
+
     @CheckForNull
     String getUser();
 
+    CreateContainerCmd withUser(String user);
+
     @CheckForNull
     Volume[] getVolumes();
 
+    CreateContainerCmd withVolumes(Volume... volumes);
+
+    CreateContainerCmd withVolumes(List<Volume> volumes);
+
     @CheckForNull
     String getWorkingDir();
 
+    CreateContainerCmd withWorkingDir(String workingDir);
+
     @CheckForNull
     Boolean isAttachStderr();
 
+    CreateContainerCmd withAttachStderr(Boolean attachStderr);
+
     @CheckForNull
     Boolean isAttachStdin();
 
+    CreateContainerCmd withAttachStdin(Boolean attachStdin);
+
     @CheckForNull
     Boolean isAttachStdout();
 
+    CreateContainerCmd withAttachStdout(Boolean attachStdout);
+
     @CheckForNull
     Boolean isNetworkDisabled();
 
+    CreateContainerCmd withNetworkDisabled(Boolean disableNetwork);
+
     @CheckForNull
     Boolean isStdInOnce();
 
+    CreateContainerCmd withStdInOnce(Boolean stdInOnce);
+
     @CheckForNull
     Boolean isStdinOpen();
 
-    @CheckForNull
-    HostConfig getHostConfig();
+    CreateContainerCmd withStdinOpen(Boolean stdinOpen);
 
     @CheckForNull
     Boolean isTty();
 
-    /**
-     * While using swarm classic, you can provide an optional auth config which will be used to pull images from a private registry,
-     * if the swarm node does not already have the docker image.
-     * Note: This option does not have any effect in normal docker
-     * @param authConfig The optional auth config
-     */
-    CreateContainerCmd withAuthConfig(AuthConfig authConfig);
-
-    /**
-     * Add network-scoped alias for the container
-     * @param aliases on ore more aliases
-     */
-    CreateContainerCmd withAliases(String... aliases);
-
-    /**
-     * Add network-scoped alias for the container
-     * @param aliases on ore more aliases
-     */
-    CreateContainerCmd withAliases(List<String> aliases);
-
-    CreateContainerCmd withAttachStderr(Boolean attachStderr);
-
-    CreateContainerCmd withAttachStdin(Boolean attachStdin);
-
-    CreateContainerCmd withAttachStdout(Boolean attachStdout);
-
-    CreateContainerCmd withCmd(String... cmd);
-
-    CreateContainerCmd withCmd(List<String> cmd);
-
-    CreateContainerCmd withDomainName(String domainName);
-
-    CreateContainerCmd withEntrypoint(String... entrypoint);
-
-    CreateContainerCmd withEntrypoint(List<String> entrypoint);
-
-    CreateContainerCmd withEnv(String... env);
-
-    CreateContainerCmd withEnv(List<String> env);
-
-    CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts);
-
-    CreateContainerCmd withStopSignal(String stopSignal);
-
-    CreateContainerCmd withExposedPorts(List<ExposedPort> exposedPorts);
-
-    CreateContainerCmd withHostName(String hostName);
-
-    CreateContainerCmd withImage(String image);
-
-    CreateContainerCmd withIpv4Address(String ipv4Address);
-
-    CreateContainerCmd withIpv6Address(String ipv6Address);
-
-    CreateContainerCmd withLabels(Map<String, String> labels);
-
-    CreateContainerCmd withMacAddress(String macAddress);
-
-    CreateContainerCmd withName(String name);
-
-    CreateContainerCmd withNetworkDisabled(Boolean disableNetwork);
-
-    CreateContainerCmd withPortSpecs(String... portSpecs);
-
-    CreateContainerCmd withPortSpecs(List<String> portSpecs);
-
-    CreateContainerCmd withStdInOnce(Boolean stdInOnce);
-
-    CreateContainerCmd withStdinOpen(Boolean stdinOpen);
-
     CreateContainerCmd withTty(Boolean tty);
 
-    CreateContainerCmd withUser(String user);
-
-    CreateContainerCmd withVolumes(Volume... volumes);
+    @CheckForNull
+    List<String> getOnBuild();
 
-    CreateContainerCmd withVolumes(List<Volume> volumes);
+    CreateContainerCmd withOnBuild(List<String> onBuild);
 
-    CreateContainerCmd withWorkingDir(String workingDir);
+    @CheckForNull
+    HostConfig getHostConfig();
 
     CreateContainerCmd withHostConfig(HostConfig hostConfig);
 
     /**
-     * @throws NotFoundException
-     *             No such container
-     * @throws ConflictException
-     *             Named container already exists
+     * @throws NotFoundException No such container
+     * @throws ConflictException Named container already exists
      */
     @Override
     CreateContainerResponse exec() throws NotFoundException, ConflictException;
diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
index 72bf4ef04..d2ecd7d90 100644
--- a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -21,13 +21,13 @@ public class AuthConfig implements Serializable {
      */
     public static final String DEFAULT_SERVER_ADDRESS = "https://index.docker.io/v1/";
 
-    @JsonProperty
+    @JsonProperty("username")
     private String username;
 
-    @JsonProperty
+    @JsonProperty("password")
     private String password;
 
-    @JsonProperty
+    @JsonProperty("email")
     private String email;
 
     @JsonProperty("serveraddress")
diff --git a/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java b/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java
new file mode 100644
index 000000000..4e171417f
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java
@@ -0,0 +1,54 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import java.io.Serializable;
+
+import static org.apache.commons.lang.builder.ToStringStyle.SHORT_PREFIX_STYLE;
+
+public class BlkioRateDevice implements Serializable {
+    public static final long serialVersionUID = 1L;
+
+    @JsonProperty("Path")
+    private String path;
+
+    @JsonProperty("Rate")
+    private Long rate;
+
+    public String getPath() {
+        return path;
+    }
+
+    public BlkioRateDevice withPath(String path) {
+        this.path = path;
+        return this;
+    }
+
+    public Long getRate() {
+        return rate;
+    }
+
+    public BlkioRateDevice withRate(Long rate) {
+        this.rate = rate;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java b/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java
new file mode 100644
index 000000000..1c8e5cd08
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java
@@ -0,0 +1,54 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import java.io.Serializable;
+
+import static org.apache.commons.lang.builder.ToStringStyle.SHORT_PREFIX_STYLE;
+
+public class BlkioWeightDevice implements Serializable {
+    public static final long serialVersionUID = 1L;
+
+    @JsonProperty("Path")
+    private String path;
+
+    @JsonProperty("Weight")
+    private Integer weight;
+
+    public String getPath() {
+        return path;
+    }
+
+    public BlkioWeightDevice withPath(String path) {
+        this.path = path;
+        return this;
+    }
+
+    public Integer getWeight() {
+        return weight;
+    }
+
+    public BlkioWeightDevice withWeight(Integer weight) {
+        this.weight = weight;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/Device.java b/src/main/java/com/github/dockerjava/api/model/Device.java
index 7d73710fd..32155271c 100644
--- a/src/main/java/com/github/dockerjava/api/model/Device.java
+++ b/src/main/java/com/github/dockerjava/api/model/Device.java
@@ -127,8 +127,10 @@ private static boolean validDeviceMode(String deviceMode) {
     public boolean equals(Object obj) {
         if (obj instanceof Device) {
             Device other = (Device) obj;
-            return new EqualsBuilder().append(cGroupPermissions, other.getcGroupPermissions())
-                    .append(pathInContainer, other.getPathInContainer()).append(pathOnHost, other.getPathOnHost())
+            return new EqualsBuilder()
+                    .append(cGroupPermissions, other.getcGroupPermissions())
+                    .append(pathInContainer, other.getPathInContainer())
+                    .append(pathOnHost, other.getPathOnHost())
                     .isEquals();
         } else {
             return super.equals(obj);
@@ -137,7 +139,11 @@ public boolean equals(Object obj) {
 
     @Override
     public int hashCode() {
-        return new HashCodeBuilder().append(cGroupPermissions).append(pathInContainer).append(pathOnHost).toHashCode();
+        return new HashCodeBuilder()
+                .append(cGroupPermissions)
+                .append(pathInContainer)
+                .append(pathOnHost)
+                .toHashCode();
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/HealthCheck.java b/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
index d9057c11a..a6581f261 100644
--- a/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
+++ b/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
@@ -18,6 +18,9 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
 
 import java.io.Serializable;
 import java.util.List;
@@ -47,13 +50,13 @@ public class HealthCheck implements Serializable {
      * @since 1.26
      */
     @JsonProperty("Retries")
-    private Long retries;
+    private Integer retries;
 
     /**
      * @since 1.26
      */
     @JsonProperty("StartPeriod")
-    private Long startPeriod;
+    private Integer startPeriod;
 
     public Long getInterval() {
         return interval;
@@ -82,21 +85,36 @@ public HealthCheck withTest(List<String> test) {
         return this;
     }
 
-    public Long getRetries() {
+    public Integer getRetries() {
         return retries;
     }
 
-    public HealthCheck withRetries(Long retries) {
+    public HealthCheck withRetries(Integer retries) {
         this.retries = retries;
         return this;
     }
 
-    public Long getStartPeriod() {
+    public Integer getStartPeriod() {
         return startPeriod;
     }
 
-    public HealthCheck withStartPeriod(Long startPeriod) {
+    public HealthCheck withStartPeriod(Integer startPeriod) {
         this.startPeriod = startPeriod;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 240ea237e..1eb0594b6 100644
--- a/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -29,12 +29,13 @@ public class HostConfig implements Serializable {
 
     private static final List<String> PREDEFINED_NETWORKS = Arrays.asList("bridge", "host", "none");
 
+    public static HostConfig newHostConfig() {
+        return new HostConfig();
+    }
+
     @JsonProperty("Binds")
     private Binds binds;
 
-    /**
-     * @since 1.19
-     */
     @JsonProperty("BlkioWeight")
     private Integer blkioWeight;
 
@@ -42,37 +43,40 @@ public class HostConfig implements Serializable {
      * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
      */
     @JsonProperty("BlkioWeightDevice")
-    private List<Object> blkioWeightDevice;
+    private List<BlkioWeightDevice> blkioWeightDevice;
 
     /**
      * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
      */
     @JsonProperty("BlkioDeviceReadBps")
-    private List<Object> blkioDeviceReadBps;
+    private List<BlkioRateDevice> blkioDeviceReadBps;
 
     /**
      * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
      */
-    @JsonProperty("BlkioDeviceReadIOps")
-    private List<Object> blkioDeviceReadIOps;
+    @JsonProperty("BlkioDeviceWriteBps")
+    private List<BlkioRateDevice> blkioDeviceWriteBps;
 
     /**
      * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
      */
-    @JsonProperty("BlkioDeviceWriteBps")
-    private List<Object> blkioDeviceWriteBps;
+    @JsonProperty("BlkioDeviceReadIOps")
+    private List<BlkioRateDevice> blkioDeviceReadIOps;
 
     /**
      * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_22}
      */
     @JsonProperty("BlkioDeviceWriteIOps")
-    private List<Object> blkioDeviceWriteIOps;
+    private List<BlkioRateDevice> blkioDeviceWriteIOps;
 
     /**
      * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20}
      */
     @JsonProperty("MemorySwappiness")
-    private Integer memorySwappiness;
+    private Long memorySwappiness;
+
+    @JsonProperty("NanoCPUs")
+    private Long nanoCPUs;
 
     @JsonProperty("CapAdd")
     private Capability[] capAdd;
@@ -83,11 +87,14 @@ public class HostConfig implements Serializable {
     @JsonProperty("ContainerIDFile")
     private String containerIDFile;
 
-    /**
-     * @since 1.19
-     */
     @JsonProperty("CpuPeriod")
-    private Integer cpuPeriod;
+    private Long cpuPeriod;
+
+    @JsonProperty("CpuRealtimePeriod")
+    private Long cpuRealtimePeriod;
+
+    @JsonProperty("CpuRealtimeRuntime")
+    private Long cpuRealtimeRuntime;
 
     @JsonProperty("CpuShares")
     private Integer cpuShares;
@@ -96,20 +103,20 @@ public class HostConfig implements Serializable {
      * @since ~{@link RemoteApiVersion#VERSION_1_20}
      */
     @JsonProperty("CpuQuota")
-    private Integer cpuQuota;
+    private Long cpuQuota;
 
     @JsonProperty("CpusetCpus")
     private String cpusetCpus;
 
-    /**
-     * @since 1.19
-     */
     @JsonProperty("CpusetMems")
     private String cpusetMems;
 
     @JsonProperty("Devices")
     private Device[] devices;
 
+    @JsonProperty("DeviceCgroupRules")
+    private List<String> deviceCgroupRules;
+
     /**
      * @since {@link RemoteApiVersion#VERSION_1_25}
      */
@@ -119,12 +126,24 @@ public class HostConfig implements Serializable {
     @JsonProperty("Dns")
     private String[] dns;
 
+    @JsonProperty("DnsOptions")
+    private List<String> dnsOptions;
+
     @JsonProperty("DnsSearch")
     private String[] dnsSearch;
 
     @JsonProperty("ExtraHosts")
     private String[] extraHosts;
 
+    @JsonProperty("GroupAdd")
+    private List<String> groupAdd;
+
+    @JsonProperty("IpcMode")
+    private String ipcMode;
+
+    @JsonProperty("Cgroup")
+    private String cgroup;
+
     @JsonProperty("Links")
     private Links links;
 
@@ -158,6 +177,9 @@ public class HostConfig implements Serializable {
     @JsonProperty("OomKillDisable")
     private Boolean oomKillDisable;
 
+    @JsonProperty("Init")
+    private Boolean init;
+
     /**
      * @since {@link RemoteApiVersion#VERSION_1_25}
      */
@@ -168,7 +190,7 @@ public class HostConfig implements Serializable {
      * @since {@link RemoteApiVersion#VERSION_1_22}
      */
     @JsonProperty("OomScoreAdj")
-    private Boolean oomScoreAdj;
+    private Integer oomScoreAdj;
 
     @JsonProperty("PortBindings")
     private Ports portBindings;
@@ -185,27 +207,42 @@ public class HostConfig implements Serializable {
     @JsonProperty("RestartPolicy")
     private RestartPolicy restartPolicy;
 
-    /**
-     * @since {@link RemoteApiVersion#VERSION_1_24}
-     */
-    @JsonProperty("StorageOpt")
-    private Map<String, String> storageOpt;
-
     @JsonProperty("Ulimits")
     private Ulimit[] ulimits;
 
+    @JsonProperty("CpuCount")
+    private Long cpuCount;
+
+    @JsonProperty("CpuPercent")
+    private Long cpuPercent;
+
+    @JsonProperty("IOMaximumIOps")
+    private Long ioMaximumIOps;
+
+    @JsonProperty("IOMaximumBandwidth")
+    private Long ioMaximumBandwidth;
+
     @JsonProperty("VolumesFrom")
     private VolumesFrom[] volumesFrom;
 
+    @JsonProperty("Mounts")
+    private List<Mount> mounts;
+
     @JsonProperty("PidMode")
     private String pidMode;
 
+    @JsonProperty("Isolation")
+    private Isolation isolation;
+
     /**
      * @since {@link RemoteApiVersion#VERSION_1_20}
      */
     @JsonProperty("SecurityOpt")
     private List<String> securityOpts;
 
+    @JsonProperty("StorageOpt")
+    private Map<String, String> storageOpt;
+
     /**
      * @since {@link RemoteApiVersion#VERSION_1_20}
      */
@@ -242,15 +279,17 @@ public class HostConfig implements Serializable {
     @JsonProperty("Tmpfs")
     private Map<String, String> tmpFs;
 
-    /**
-     * @since ~{@link RemoteApiVersion#VERSION_1_22}
-     */
-    @JsonProperty("Isolation")
-    private String isolation;
+    @JsonProperty("UTSMode")
+    private String utSMode;
 
-    public static HostConfig newHostConfig() {
-        return new HostConfig();
-    }
+    @JsonProperty("UsernsMode")
+    private String usernsMode;
+
+    @JsonProperty("Sysctls")
+    private Map<String, String> sysctls;
+
+    @JsonProperty("ConsoleSize")
+    private List<Integer> consoleSize;
 
     @JsonIgnore
     public Bind[] getBinds() {
@@ -273,10 +312,11 @@ public String getContainerIDFile() {
         return containerIDFile;
     }
 
-    public Integer getCpuPeriod() {
+    public Long getCpuPeriod() {
         return cpuPeriod;
     }
 
+
     public Integer getCpuShares() {
         return cpuShares;
     }
@@ -356,19 +396,11 @@ public String getPidMode() {
         return pidMode;
     }
 
-    /**
-     * @see #isolation
-     */
-    @CheckForNull
-    public String getIsolation() {
-        return isolation;
-    }
-
     /**
      * @see #blkioDeviceReadBps
      */
     @CheckForNull
-    public List<Object> getBlkioDeviceReadBps() {
+    public List<BlkioRateDevice> getBlkioDeviceReadBps() {
         return blkioDeviceReadBps;
     }
 
@@ -376,7 +408,7 @@ public List<Object> getBlkioDeviceReadBps() {
      * @see #blkioDeviceReadIOps
      */
     @CheckForNull
-    public List<Object> getBlkioDeviceReadIOps() {
+    public List<BlkioRateDevice> getBlkioDeviceReadIOps() {
         return blkioDeviceReadIOps;
     }
 
@@ -384,7 +416,7 @@ public List<Object> getBlkioDeviceReadIOps() {
      * @see #blkioDeviceWriteBps
      */
     @CheckForNull
-    public List<Object> getBlkioDeviceWriteBps() {
+    public List<BlkioRateDevice> getBlkioDeviceWriteBps() {
         return blkioDeviceWriteBps;
     }
 
@@ -392,7 +424,7 @@ public List<Object> getBlkioDeviceWriteBps() {
      * @see #blkioDeviceWriteIOps
      */
     @CheckForNull
-    public List<Object> getBlkioDeviceWriteIOps() {
+    public List<BlkioRateDevice> getBlkioDeviceWriteIOps() {
         return blkioDeviceWriteIOps;
     }
 
@@ -400,7 +432,7 @@ public List<Object> getBlkioDeviceWriteIOps() {
      * @see #blkioWeightDevice
      */
     @CheckForNull
-    public List<Object> getBlkioWeightDevice() {
+    public List<BlkioWeightDevice> getBlkioWeightDevice() {
         return blkioWeightDevice;
     }
 
@@ -408,7 +440,7 @@ public List<Object> getBlkioWeightDevice() {
      * @see #oomScoreAdj
      */
     @CheckForNull
-    public Boolean getOomScoreAdj() {
+    public Integer getOomScoreAdj() {
         return oomScoreAdj;
     }
 
@@ -416,7 +448,7 @@ public Boolean getOomScoreAdj() {
      * @see #cpuQuota
      */
     @CheckForNull
-    public Integer getCpuQuota() {
+    public Long getCpuQuota() {
         return cpuQuota;
     }
 
@@ -440,7 +472,7 @@ public Long getMemoryReservation() {
      * @see #memorySwappiness
      */
     @CheckForNull
-    public Integer getMemorySwappiness() {
+    public Long getMemorySwappiness() {
         return memorySwappiness;
     }
 
@@ -547,10 +579,15 @@ public HostConfig withBinds(Bind... binds) {
         return this;
     }
 
+    public HostConfig withBinds(List<Bind> binds) {
+        checkNotNull(binds, "binds was not specified");
+        return withBinds(binds.toArray(new Bind[binds.size()]));
+    }
+
     /**
      * @see #blkioDeviceReadBps
      */
-    public HostConfig withBlkioDeviceReadBps(List<Object> blkioDeviceReadBps) {
+    public HostConfig withBlkioDeviceReadBps(List<BlkioRateDevice> blkioDeviceReadBps) {
         this.blkioDeviceReadBps = blkioDeviceReadBps;
         return this;
     }
@@ -558,7 +595,7 @@ public HostConfig withBlkioDeviceReadBps(List<Object> blkioDeviceReadBps) {
     /**
      * @see #blkioDeviceReadIOps
      */
-    public HostConfig withBlkioDeviceReadIOps(List<Object> blkioDeviceReadIOps) {
+    public HostConfig withBlkioDeviceReadIOps(List<BlkioRateDevice> blkioDeviceReadIOps) {
         this.blkioDeviceReadIOps = blkioDeviceReadIOps;
         return this;
     }
@@ -566,7 +603,7 @@ public HostConfig withBlkioDeviceReadIOps(List<Object> blkioDeviceReadIOps) {
     /**
      * @see #blkioDeviceWriteBps
      */
-    public HostConfig withBlkioDeviceWriteBps(List<Object> blkioDeviceWriteBps) {
+    public HostConfig withBlkioDeviceWriteBps(List<BlkioRateDevice> blkioDeviceWriteBps) {
         this.blkioDeviceWriteBps = blkioDeviceWriteBps;
         return this;
     }
@@ -574,7 +611,7 @@ public HostConfig withBlkioDeviceWriteBps(List<Object> blkioDeviceWriteBps) {
     /**
      * @see #blkioDeviceWriteIOps
      */
-    public HostConfig withBlkioDeviceWriteIOps(List<Object> blkioDeviceWriteIOps) {
+    public HostConfig withBlkioDeviceWriteIOps(List<BlkioRateDevice> blkioDeviceWriteIOps) {
         this.blkioDeviceWriteIOps = blkioDeviceWriteIOps;
         return this;
     }
@@ -590,14 +627,13 @@ public HostConfig withBlkioWeight(Integer blkioWeight) {
     /**
      * @see #blkioWeightDevice
      */
-    public HostConfig withBlkioWeightDevice(List<Object> blkioWeightDevice) {
+    public HostConfig withBlkioWeightDevice(List<BlkioWeightDevice> blkioWeightDevice) {
         this.blkioWeightDevice = blkioWeightDevice;
         return this;
     }
 
     /**
-     * Add linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> to the container. For example:
-     * adding {@link Capability#MKNOD} allows the container to create special files using the 'mknod' command.
+     * @see #capAdd
      */
     public HostConfig withCapAdd(Capability... capAdd) {
         this.capAdd = capAdd;
@@ -631,7 +667,7 @@ public HostConfig withContainerIDFile(String containerIDFile) {
     /**
      * @see #cpuPeriod
      */
-    public HostConfig withCpuPeriod(Integer cpuPeriod) {
+    public HostConfig withCpuPeriod(Long cpuPeriod) {
         this.cpuPeriod = cpuPeriod;
         return this;
     }
@@ -639,7 +675,7 @@ public HostConfig withCpuPeriod(Integer cpuPeriod) {
     /**
      * @see #cpuQuota
      */
-    public HostConfig withCpuQuota(Integer cpuQuota) {
+    public HostConfig withCpuQuota(Long cpuQuota) {
         this.cpuQuota = cpuQuota;
         return this;
     }
@@ -668,11 +704,6 @@ public HostConfig withCpuShares(Integer cpuShares) {
         return this;
     }
 
-    public HostConfig withDevices(List<Device> devices) {
-        checkNotNull(devices, "devices was not specified");
-        return withDevices(devices.toArray(new Device[devices.size()]));
-    }
-
     /**
      * @see #devices
      */
@@ -681,6 +712,11 @@ public HostConfig withDevices(Device... devices) {
         return this;
     }
 
+    public HostConfig withDevices(List<Device> devices) {
+        checkNotNull(devices, "devices was not specified");
+        return withDevices(devices.toArray(new Device[0]));
+    }
+
     /**
      * @see #diskQuota
      */
@@ -699,7 +735,7 @@ public HostConfig withDns(String... dns) {
 
     public HostConfig withDns(List<String> dns) {
         checkNotNull(dns, "dns was not specified");
-        return withDns(dns.toArray(new String[dns.size()]));
+        return withDns(dns.toArray(new String[0]));
     }
 
     /**
@@ -723,11 +759,6 @@ public HostConfig withExtraHosts(String... extraHosts) {
         return this;
     }
 
-    public HostConfig withExtraHosts(List<String> extraHosts) {
-        checkNotNull(extraHosts, "extraHosts was not specified");
-        return withExtraHosts(extraHosts.toArray(new String[extraHosts.size()]));
-    }
-
     /**
      * @see #kernelMemory
      */
@@ -744,18 +775,18 @@ public HostConfig withLinks(Links links) {
         return this;
     }
 
-    public HostConfig withLinks(List<Link> links) {
+    public HostConfig withLinks(Link... links) {
         checkNotNull(links, "links was not specified");
-        setLinks(links.toArray(new Link[links.size()]));
+        setLinks(links);
         return this;
     }
 
-    public HostConfig withLinks(Link... links) {
+    public HostConfig withLinks(List<Link> links) {
         checkNotNull(links, "links was not specified");
-        setLinks(links);
-        return this;
+        return withLinks(links.toArray(new Link[0]));
     }
 
+
     /**
      * @see #logConfig
      */
@@ -772,11 +803,6 @@ public HostConfig withLxcConf(LxcConf[] lxcConf) {
         return this;
     }
 
-    public HostConfig withLxcConf(List<LxcConf> lxcConf) {
-        checkNotNull(lxcConf, "lxcConf was not specified");
-        return withLxcConf(lxcConf.toArray(new LxcConf[0]));
-    }
-
     /**
      * @see #memory
      */
@@ -804,7 +830,7 @@ public HostConfig withMemorySwap(Long memorySwap) {
     /**
      * @see #memorySwappiness
      */
-    public HostConfig withMemorySwappiness(Integer memorySwappiness) {
+    public HostConfig withMemorySwappiness(Long memorySwappiness) {
         this.memorySwappiness = memorySwappiness;
         return this;
     }
@@ -818,8 +844,6 @@ public HostConfig withMemorySwappiness(Integer memorySwappiness) {
      * <li>'host': use the host network stack inside the container. Note: the host mode gives the container full access to local system
      * services such as D-bus and is therefore considered insecure.</li>
      * </ul>
-     *
-     * @see #networkMode
      */
     public HostConfig withNetworkMode(String networkMode) {
         this.networkMode = networkMode;
@@ -828,6 +852,7 @@ public HostConfig withNetworkMode(String networkMode) {
 
     /**
      * @see #oomKillDisable
+     * @since 1.19
      */
     public HostConfig withOomKillDisable(Boolean oomKillDisable) {
         this.oomKillDisable = oomKillDisable;
@@ -845,12 +870,14 @@ public HostConfig withAutoRemove(Boolean autoRemove) {
     /**
      * @see #oomScoreAdj
      */
-    public HostConfig withOomScoreAdj(Boolean oomScoreAdj) {
+    public HostConfig withOomScoreAdj(Integer oomScoreAdj) {
         this.oomScoreAdj = oomScoreAdj;
         return this;
     }
 
     /**
+     * Set the PID (Process) Namespace mode for the container, 'host': use the host's PID namespace inside the container
+     *
      * @see #pidMode
      */
     public HostConfig withPidMode(String pidMode) {
@@ -859,11 +886,18 @@ public HostConfig withPidMode(String pidMode) {
     }
 
     /**
-     * @see #portBindings
+     * Add one or more {@link PortBinding}s. This corresponds to the <code>--publish</code> (<code>-p</code>) option of the
+     * <code>docker run</code> CLI command.
      */
+    public HostConfig withPortBindings(Ports portBindings) {
+        this.portBindings = portBindings;
+        return this;
+    }
+
     public HostConfig withPortBindings(PortBinding... portBindings) {
         checkNotNull(portBindings, "portBindings was not specified");
-        return withPortBindings(new Ports(portBindings));
+        withPortBindings(new Ports(portBindings));
+        return this;
     }
 
     public HostConfig withPortBindings(List<PortBinding> portBindings) {
@@ -871,14 +905,6 @@ public HostConfig withPortBindings(List<PortBinding> portBindings) {
         return withPortBindings(portBindings.toArray(new PortBinding[0]));
     }
 
-    /**
-     * @see #portBindings
-     */
-    public HostConfig withPortBindings(Ports portBindings) {
-        this.portBindings = portBindings;
-        return this;
-    }
-
     /**
      * @see #privileged
      */
@@ -928,28 +954,13 @@ public HostConfig withReadonlyRootfs(Boolean readonlyRootfs) {
     }
 
     /**
-     * @see #restartPolicy
+     * Set custom {@link RestartPolicy} for the container. Defaults to {@link RestartPolicy#noRestart()}
      */
     public HostConfig withRestartPolicy(RestartPolicy restartPolicy) {
         this.restartPolicy = restartPolicy;
         return this;
     }
 
-    /**
-     * @see #storageOpt
-     */
-    public Map<String, String> getStorageOpt() {
-        return storageOpt;
-    }
-
-    /**
-     * @see #storageOpt
-     */
-    public HostConfig withStorageOpt(Map<String, String> storageOpt) {
-        this.storageOpt = storageOpt;
-        return this;
-    }
-
     /**
      * @see #securityOpts
      */
@@ -976,7 +987,7 @@ public HostConfig withUlimits(Ulimit[] ulimits) {
 
     public HostConfig withUlimits(List<Ulimit> ulimits) {
         checkNotNull(ulimits, "no ulimits was specified");
-        return withUlimits(ulimits.toArray(new Ulimit[ulimits.size()]));
+        return withUlimits(ulimits.toArray(new Ulimit[0]));
     }
 
     /**
@@ -997,10 +1008,9 @@ public HostConfig withVolumesFrom(VolumesFrom... volumesFrom) {
 
     public HostConfig withVolumesFrom(List<VolumesFrom> volumesFrom) {
         checkNotNull(volumesFrom, "volumesFrom was not specified");
-        return withVolumesFrom(volumesFrom.toArray(new VolumesFrom[volumesFrom.size()]));
+        return withVolumesFrom(volumesFrom.toArray(new VolumesFrom[0]));
     }
 
-
     /**
      * @see #pidsLimit
      */
@@ -1022,14 +1032,206 @@ public HostConfig withTmpFs(Map<String, String> tmpFs) {
         return this;
     }
 
-    /**
-     * @see #isolation
-     */
-    public HostConfig withIsolation(String isolation) {
+    @CheckForNull
+    public List<String> getDeviceCgroupRules() {
+        return deviceCgroupRules;
+    }
+
+    public HostConfig withDeviceCgroupRules(List<String> deviceCgroupRules) {
+        this.deviceCgroupRules = deviceCgroupRules;
+        return this;
+    }
+
+    @CheckForNull
+    public Long getNanoCPUs() {
+        return nanoCPUs;
+    }
+
+    public HostConfig withNanoCPUs(Long nanoCPUs) {
+        this.nanoCPUs = nanoCPUs;
+        return this;
+    }
+
+    @CheckForNull
+    public Boolean getInit() {
+        return init;
+    }
+
+    public HostConfig withInit(Boolean init) {
+        this.init = init;
+        return this;
+    }
+
+    @CheckForNull
+    public Long getCpuCount() {
+        return cpuCount;
+    }
+
+    public HostConfig withCpuCount(Long cpuCount) {
+        this.cpuCount = cpuCount;
+        return this;
+    }
+
+    @CheckForNull
+    public Long getCpuPercent() {
+        return cpuPercent;
+    }
+
+    public HostConfig withCpuPercent(Long cpuPercent) {
+        this.cpuPercent = cpuPercent;
+        return this;
+    }
+
+    @CheckForNull
+    public Long getIoMaximumIOps() {
+        return ioMaximumIOps;
+    }
+
+    public HostConfig withIoMaximumIOps(Long ioMaximumIOps) {
+        this.ioMaximumIOps = ioMaximumIOps;
+        return this;
+    }
+
+    @CheckForNull
+    public Long getIoMaximumBandwidth() {
+        return ioMaximumBandwidth;
+    }
+
+    public HostConfig withIoMaximumBandwidth(Long ioMaximumBandwidth) {
+        this.ioMaximumBandwidth = ioMaximumBandwidth;
+        return this;
+    }
+
+    @CheckForNull
+    public List<Mount> getMounts() {
+        return mounts;
+    }
+
+    public HostConfig withMounts(List<Mount> mounts) {
+        this.mounts = mounts;
+        return this;
+    }
+
+    @CheckForNull
+    public List<String> getDnsOptions() {
+        return dnsOptions;
+    }
+
+    public HostConfig withDnsOptions(List<String> dnsOptions) {
+        this.dnsOptions = dnsOptions;
+        return this;
+    }
+
+    @CheckForNull
+    public List<String> getGroupAdd() {
+        return groupAdd;
+    }
+
+    public HostConfig withGroupAdd(List<String> groupAdd) {
+        this.groupAdd = groupAdd;
+        return this;
+    }
+
+    @CheckForNull
+    public String getIpcMode() {
+        return ipcMode;
+    }
+
+    public HostConfig withIpcMode(String ipcMode) {
+        this.ipcMode = ipcMode;
+        return this;
+    }
+
+    @CheckForNull
+    public String getCgroup() {
+        return cgroup;
+    }
+
+    public HostConfig withCgroup(String cgroup) {
+        this.cgroup = cgroup;
+        return this;
+    }
+
+    @CheckForNull
+    public Map<String, String> getStorageOpt() {
+        return storageOpt;
+    }
+
+    public HostConfig withStorageOpt(Map<String, String> storageOpt) {
+        this.storageOpt = storageOpt;
+        return this;
+    }
+
+    @CheckForNull
+    public String getUtSMode() {
+        return utSMode;
+    }
+
+    public HostConfig withUtSMode(String utSMode) {
+        this.utSMode = utSMode;
+        return this;
+    }
+
+    @CheckForNull
+    public String getUsernsMode() {
+        return usernsMode;
+    }
+
+    public HostConfig withUsernsMode(String usernsMode) {
+        this.usernsMode = usernsMode;
+        return this;
+    }
+
+    @CheckForNull
+    public Map<String, String> getSysctls() {
+        return sysctls;
+    }
+
+    public HostConfig withSysctls(Map<String, String> sysctls) {
+        this.sysctls = sysctls;
+        return this;
+    }
+
+    @CheckForNull
+    public List<Integer> getConsoleSize() {
+        return consoleSize;
+    }
+
+    public HostConfig withConsoleSize(List<Integer> consoleSize) {
+        this.consoleSize = consoleSize;
+        return this;
+    }
+
+    @CheckForNull
+    public Isolation getIsolation() {
+        return isolation;
+    }
+
+    public HostConfig withIsolation(Isolation isolation) {
         this.isolation = isolation;
         return this;
     }
 
+    @CheckForNull
+    public Long getCpuRealtimePeriod() {
+        return cpuRealtimePeriod;
+    }
+
+    public HostConfig withCpuRealtimePeriod(Long cpuRealtimePeriod) {
+        this.cpuRealtimePeriod = cpuRealtimePeriod;
+        return this;
+    }
+
+    @CheckForNull
+    public Long getCpuRealtimeRuntime() {
+        return cpuRealtimeRuntime;
+    }
+
+    public HostConfig withCpuRealtimeRuntime(Long cpuRealtimeRuntime) {
+        this.cpuRealtimeRuntime = cpuRealtimeRuntime;
+        return this;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
diff --git a/src/main/java/com/github/dockerjava/api/model/Isolation.java b/src/main/java/com/github/dockerjava/api/model/Isolation.java
new file mode 100644
index 000000000..c59c8848f
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/Isolation.java
@@ -0,0 +1,41 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import java.io.Serializable;
+
+public enum Isolation implements Serializable {
+    DEFAULT("default"),
+
+    PROCESS("process"),
+
+    HYPERV("hyperv");
+
+    private String value;
+
+    Isolation(String value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+        return value;
+    }
+
+    @JsonCreator
+    public static Isolation fromValue(String text) {
+        for (Isolation b : Isolation.values()) {
+            if (String.valueOf(b.value).equals(text)) {
+                return b;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
index 6da68d434..4ea19041e 100644
--- a/src/main/java/com/github/dockerjava/api/model/LogConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/LogConfig.java
@@ -1,28 +1,19 @@
 package com.github.dockerjava.api.model;
 
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Map;
-
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.ObjectCodec;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+import java.util.Map;
 
 /**
  * Log driver to use for a created/running container. The available types are:
- *
+ * <p>
  * json-file (default) syslog journald none
- *
+ * <p>
  * If a driver is specified that is NOT supported,docker will default to null. If configs are supplied that are not supported by the type
  * docker will ignore them. In most cases setting the config option to null will suffice. Consult the docker remote API for a more detailed
  * and up-to-date explanation of the available types and their options.
@@ -68,12 +59,11 @@ public LogConfig setConfig(Map<String, String> config) {
         return this;
     }
 
-    @JsonDeserialize(using = LoggingType.Deserializer.class)
-    @JsonSerialize(using = LoggingType.Serializer.class)
     public enum LoggingType {
+        NONE("none"),
         DEFAULT("json-file"),
+        ETWLOGS("etwlogs"),
         JSON_FILE("json-file"),
-        NONE("none"),
         SYSLOG("syslog"),
         JOURNALD("journald"),
         GELF("gelf"),
@@ -89,34 +79,25 @@ public enum LoggingType {
             this.type = type;
         }
 
+        @JsonValue
         public String getType() {
             return type;
         }
 
-        public static final class Serializer extends JsonSerializer<LoggingType> {
-            @Override
-            public void serialize(LoggingType value, JsonGenerator jgen, SerializerProvider provider)
-                    throws IOException, JsonProcessingException {
-                jgen.writeString(value.getType());
+        @JsonCreator
+        @CheckForNull
+        public static LoggingType fromValue(String text) {
+            for (LoggingType b : LoggingType.values()) {
+                if (String.valueOf(b.type).equals(text)) {
+                    return b;
+                }
             }
+            return null;
         }
 
-        public static final class Deserializer extends JsonDeserializer<LoggingType> {
-            @Override
-            public LoggingType deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
-                    throws IOException, JsonProcessingException {
-
-                ObjectCodec oc = jsonParser.getCodec();
-                JsonNode node = oc.readTree(jsonParser);
-
-                for (LoggingType loggingType : values()) {
-                    if (loggingType.getType().equals(node.asText())) {
-                        return loggingType;
-                    }
-                }
-
-                throw new IllegalArgumentException("No enum constant " + LoggingType.class + "." + node.asText());
-            }
+        @Override
+        public String toString() {
+            return String.valueOf(type);
         }
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Ulimit.java b/src/main/java/com/github/dockerjava/api/model/Ulimit.java
index abcf298bd..5a37810a4 100644
--- a/src/main/java/com/github/dockerjava/api/model/Ulimit.java
+++ b/src/main/java/com/github/dockerjava/api/model/Ulimit.java
@@ -25,12 +25,10 @@ public class Ulimit implements Serializable {
     private Integer hard;
 
     public Ulimit() {
-
     }
 
     public Ulimit(String name, int soft, int hard) {
         checkNotNull(name, "Name is null");
-
         this.name = name;
         this.soft = soft;
         this.hard = hard;
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index bb1dc1573..1819be0c3 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -12,6 +12,7 @@
 import com.github.dockerjava.api.model.ContainerNetwork;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.ExposedPorts;
+import com.github.dockerjava.api.model.HealthCheck;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.Volumes;
@@ -19,6 +20,7 @@
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
+import javax.annotation.CheckForNull;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -72,6 +74,12 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     @JsonProperty("Cmd")
     private String[] cmd;
 
+    @JsonProperty("Healthcheck")
+    private HealthCheck healthcheck;
+
+    @JsonProperty("ArgsEscaped")
+    private Boolean argsEscaped;
+
     @JsonProperty("Entrypoint")
     private String[] entrypoint;
 
@@ -87,6 +95,9 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     @JsonProperty("MacAddress")
     private String macAddress;
 
+    @JsonProperty("OnBuild")
+    private List<String> onBuild;
+
     @JsonProperty("NetworkDisabled")
     private Boolean networkDisabled;
 
@@ -99,12 +110,18 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     @JsonProperty("StopSignal")
     private String stopSignal;
 
+    @JsonProperty("StopTimeout")
+    private Integer stopTimeout;
+
     @JsonProperty("HostConfig")
     private HostConfig hostConfig = new HostConfig();
 
     @JsonProperty("Labels")
     private Map<String, String> labels;
 
+    @JsonProperty("Shell")
+    private List<String> shell;
+
     @JsonProperty("NetworkingConfig")
     private NetworkingConfig networkingConfig;
 
@@ -134,336 +151,322 @@ public CreateContainerCmd withAuthConfig(AuthConfig authConfig) {
         return this;
     }
 
-    /**
-     * @throws NotFoundException
-     *             No such container
-     * @throws ConflictException
-     *             Named container already exists
-     */
     @Override
-    public CreateContainerResponse exec() throws NotFoundException, ConflictException {
-        //code flow taken from https://github.com/docker/docker/blob/master/runconfig/opts/parse.go
-        ContainerNetwork containerNetwork = null;
-
-        if (ipv4Address != null || ipv6Address != null) {
-            containerNetwork = new ContainerNetwork()
-                    .withIpamConfig(new ContainerNetwork.Ipam()
-                            .withIpv4Address(ipv4Address)
-                            .withIpv6Address(ipv6Address)
-                    );
-
-        }
-
-        if (hostConfig.isUserDefinedNetwork() && hostConfig.getLinks().length > 0) {
-            if (containerNetwork == null) {
-                containerNetwork = new ContainerNetwork();
-            }
-
-            containerNetwork.withLinks(hostConfig.getLinks());
-        }
-
-        if (aliases != null) {
-            if (containerNetwork == null) {
-                containerNetwork = new ContainerNetwork();
-            }
-
-            containerNetwork.withAliases(aliases);
-        }
-
-        if (containerNetwork != null) {
-            networkingConfig = new NetworkingConfig()
-                    .withEndpointsConfig(singletonMap(hostConfig.getNetworkMode(), containerNetwork));
-        }
+    @JsonIgnore
+    public List<String> getAliases() {
+        return aliases;
+    }
 
-        return super.exec();
+    @Override
+    public CreateContainerCmd withAliases(String... aliases) {
+        this.aliases = Arrays.asList(aliases);
+        return this;
     }
 
     @Override
-    @JsonIgnore
-    public List<String> getAliases() {
-        return aliases;
+    public CreateContainerCmd withAliases(List<String> aliases) {
+        checkNotNull(aliases, "aliases was not specified");
+        this.aliases = aliases;
+        return this;
     }
 
+
     @Override
     public String[] getCmd() {
         return cmd;
     }
 
     @Override
-    public String getDomainName() {
-        return domainName;
+    public CreateContainerCmd withCmd(String... cmd) {
+        checkNotNull(cmd, "cmd was not specified");
+        this.cmd = cmd;
+        return this;
     }
 
     @Override
-    public String[] getEntrypoint() {
-        return entrypoint;
+    public CreateContainerCmd withCmd(List<String> cmd) {
+        checkNotNull(cmd, "cmd was not specified");
+        return withCmd(cmd.toArray(new String[0]));
     }
 
-    @Override
-    public String[] getEnv() {
-        return env;
+    @CheckForNull
+    public HealthCheck getHealthcheck() {
+        return healthcheck;
     }
 
-    @Override
-    @JsonIgnore
-    public ExposedPort[] getExposedPorts() {
-        return exposedPorts.getExposedPorts();
+    public CreateContainerCmdImpl withHealthcheck(HealthCheck healthcheck) {
+        this.healthcheck = healthcheck;
+        return this;
     }
 
-    /**
-     * @see #stopSignal
-     */
-    @JsonIgnore
-    @Override
-    public String getStopSignal() {
-        return stopSignal;
+    public Boolean getArgsEscaped() {
+        return argsEscaped;
     }
 
-    @Override
-    public String getHostName() {
-        return hostName;
+    public CreateContainerCmdImpl withArgsEscaped(Boolean argsEscaped) {
+        this.argsEscaped = argsEscaped;
+        return this;
     }
 
     @Override
-    public String getImage() {
-        return image;
+    public String getDomainName() {
+        return domainName;
     }
 
     @Override
-    public String getIpv4Address() {
-        return ipv4Address;
+    public CreateContainerCmd withDomainName(String domainName) {
+        checkNotNull(domainName, "no domainName was specified");
+        this.domainName = domainName;
+        return this;
     }
 
     @Override
-    public String getIpv6Address() {
-        return ipv6Address;
+    public String[] getEntrypoint() {
+        return entrypoint;
     }
 
     @Override
-    @JsonIgnore
-    public Map<String, String> getLabels() {
-        return labels;
+    public CreateContainerCmd withEntrypoint(String... entrypoint) {
+        checkNotNull(entrypoint, "entrypoint was not specified");
+        this.entrypoint = entrypoint;
+        return this;
     }
 
     @Override
-    public String getMacAddress() {
-        return macAddress;
+    public CreateContainerCmd withEntrypoint(List<String> entrypoint) {
+        checkNotNull(entrypoint, "entrypoint was not specified");
+        return withEntrypoint(entrypoint.toArray(new String[0]));
     }
 
     @Override
-    public String getName() {
-        return name;
+    public String[] getEnv() {
+        return env;
     }
 
     @Override
-    public String[] getPortSpecs() {
-        return portSpecs;
+    public CreateContainerCmd withEnv(String... env) {
+        checkNotNull(env, "env was not specified");
+        this.env = env;
+        return this;
     }
 
     @Override
-    public String getUser() {
-        return user;
+    public CreateContainerCmd withEnv(List<String> env) {
+        checkNotNull(env, "env was not specified");
+        return withEnv(env.toArray(new String[0]));
     }
 
     @Override
     @JsonIgnore
-    public Volume[] getVolumes() {
-        return volumes.getVolumes();
+    public ExposedPort[] getExposedPorts() {
+        return exposedPorts.getExposedPorts();
     }
 
     @Override
-    public String getWorkingDir() {
-        return workingDir;
+    public CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts) {
+        checkNotNull(exposedPorts, "exposedPorts was not specified");
+        this.exposedPorts = new ExposedPorts(exposedPorts);
+        return this;
     }
 
     @Override
-    public Boolean isAttachStderr() {
-        return attachStderr;
+    public CreateContainerCmd withExposedPorts(List<ExposedPort> exposedPorts) {
+        checkNotNull(exposedPorts, "exposedPorts was not specified");
+        return withExposedPorts(exposedPorts.toArray(new ExposedPort[0]));
     }
 
+    /**
+     * @see #stopSignal
+     */
+    @JsonIgnore
     @Override
-    public Boolean isAttachStdin() {
-        return attachStdin;
+    public String getStopSignal() {
+        return stopSignal;
     }
 
     @Override
-    public Boolean isAttachStdout() {
-        return attachStdout;
+    public CreateContainerCmd withStopSignal(String stopSignal) {
+        checkNotNull(stopSignal, "stopSignal wasn't specified.");
+        this.stopSignal = stopSignal;
+        return this;
     }
 
     @Override
-    public Boolean isNetworkDisabled() {
-        return networkDisabled;
+    public Integer getStopTimeout() {
+        return stopTimeout;
     }
 
     @Override
-    public Boolean isStdInOnce() {
-        return stdInOnce;
+    public CreateContainerCmd withStopTimeout(Integer stopTimeout) {
+        this.stopTimeout = stopTimeout;
+        return this;
     }
 
     @Override
-    public Boolean isStdinOpen() {
-        return stdinOpen;
+    public String getHostName() {
+        return hostName;
     }
 
     @Override
-    public Boolean isTty() {
-        return tty;
+    public CreateContainerCmd withHostName(String hostName) {
+        checkNotNull(hostName, "no hostName was specified");
+        this.hostName = hostName;
+        return this;
     }
 
     @Override
-    public HostConfig getHostConfig() {
-        return hostConfig;
+    public String getImage() {
+        return image;
     }
 
     @Override
-    public CreateContainerCmd withAliases(String... aliases) {
-        this.aliases = Arrays.asList(aliases);
+    public CreateContainerCmd withImage(String image) {
+        checkNotNull(image, "no image was specified");
+        this.image = image;
         return this;
     }
 
     @Override
-    public CreateContainerCmd withAliases(List<String> aliases) {
-        checkNotNull(aliases, "aliases was not specified");
-        this.aliases = aliases;
-        return this;
+    @JsonIgnore
+    public Map<String, String> getLabels() {
+        return labels;
     }
 
     @Override
-    public CreateContainerCmd withAttachStderr(Boolean attachStderr) {
-        checkNotNull(attachStderr, "attachStderr was not specified");
-        this.attachStderr = attachStderr;
+    public CreateContainerCmd withLabels(Map<String, String> labels) {
+        checkNotNull(labels, "labels was not specified");
+        this.labels = labels;
         return this;
     }
 
     @Override
-    public CreateContainerCmd withAttachStdin(Boolean attachStdin) {
-        checkNotNull(attachStdin, "attachStdin was not specified");
-        this.attachStdin = attachStdin;
-        return this;
+    public String getMacAddress() {
+        return macAddress;
     }
 
     @Override
-    public CreateContainerCmd withAttachStdout(Boolean attachStdout) {
-        checkNotNull(attachStdout, "attachStdout was not specified");
-        this.attachStdout = attachStdout;
+    public CreateContainerCmd withMacAddress(String macAddress) {
+        checkNotNull(macAddress, "macAddress was not specified");
+        this.macAddress = macAddress;
         return this;
     }
 
+    @Override
+    public String getName() {
+        return name;
+    }
 
     @Override
-    public CreateContainerCmd withCmd(String... cmd) {
-        checkNotNull(cmd, "cmd was not specified");
-        this.cmd = cmd;
+    public CreateContainerCmd withName(String name) {
+        checkNotNull(name, "name was not specified");
+        this.name = name;
         return this;
     }
 
     @Override
-    public CreateContainerCmd withCmd(List<String> cmd) {
-        checkNotNull(cmd, "cmd was not specified");
-        return withCmd(cmd.toArray(new String[cmd.size()]));
+    public String[] getPortSpecs() {
+        return portSpecs;
     }
 
     @Override
-    public CreateContainerCmd withDomainName(String domainName) {
-        checkNotNull(domainName, "no domainName was specified");
-        this.domainName = domainName;
+    public CreateContainerCmd withPortSpecs(String... portSpecs) {
+        checkNotNull(portSpecs, "portSpecs was not specified");
+        this.portSpecs = portSpecs;
         return this;
     }
 
     @Override
-    public CreateContainerCmd withEntrypoint(String... entrypoint) {
-        checkNotNull(entrypoint, "entrypoint was not specified");
-        this.entrypoint = entrypoint;
-        return this;
+    public CreateContainerCmd withPortSpecs(List<String> portSpecs) {
+        checkNotNull(portSpecs, "portSpecs was not specified");
+        return withPortSpecs(portSpecs.toArray(new String[0]));
     }
 
     @Override
-    public CreateContainerCmd withEntrypoint(List<String> entrypoint) {
-        checkNotNull(entrypoint, "entrypoint was not specified");
-        return withEntrypoint(entrypoint.toArray(new String[entrypoint.size()]));
+    public String getUser() {
+        return user;
     }
 
     @Override
-    public CreateContainerCmd withEnv(String... env) {
-        checkNotNull(env, "env was not specified");
-        this.env = env;
+    public CreateContainerCmd withUser(String user) {
+        checkNotNull(user, "user was not specified");
+        this.user = user;
         return this;
     }
 
+
     @Override
-    public CreateContainerCmd withEnv(List<String> env) {
-        checkNotNull(env, "env was not specified");
-        return withEnv(env.toArray(new String[env.size()]));
+    public Boolean isAttachStderr() {
+        return attachStderr;
     }
 
     @Override
-    public CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts) {
-        checkNotNull(exposedPorts, "exposedPorts was not specified");
-        this.exposedPorts = new ExposedPorts(exposedPorts);
+    public CreateContainerCmd withAttachStderr(Boolean attachStderr) {
+        checkNotNull(attachStderr, "attachStderr was not specified");
+        this.attachStderr = attachStderr;
         return this;
     }
 
+
     @Override
-    public CreateContainerCmd withStopSignal(String stopSignal) {
-        checkNotNull(stopSignal, "stopSignal wasn't specified.");
-        this.stopSignal = stopSignal;
+    public Boolean isAttachStdin() {
+        return attachStdin;
+    }
+
+    @Override
+    public CreateContainerCmd withAttachStdin(Boolean attachStdin) {
+        checkNotNull(attachStdin, "attachStdin was not specified");
+        this.attachStdin = attachStdin;
         return this;
     }
 
+
     @Override
-    public CreateContainerCmd withExposedPorts(List<ExposedPort> exposedPorts) {
-        checkNotNull(exposedPorts, "exposedPorts was not specified");
-        return withExposedPorts(exposedPorts.toArray(new ExposedPort[exposedPorts.size()]));
+    public Boolean isAttachStdout() {
+        return attachStdout;
     }
 
     @Override
-    public CreateContainerCmd withHostName(String hostName) {
-        checkNotNull(hostConfig, "no hostName was specified");
-        this.hostName = hostName;
+    public CreateContainerCmd withAttachStdout(Boolean attachStdout) {
+        checkNotNull(attachStdout, "attachStdout was not specified");
+        this.attachStdout = attachStdout;
         return this;
     }
 
+
     @Override
-    public CreateContainerCmd withImage(String image) {
-        checkNotNull(image, "no image was specified");
-        this.image = image;
-        return this;
+    @JsonIgnore
+    public Volume[] getVolumes() {
+        return volumes.getVolumes();
     }
 
     @Override
-    public CreateContainerCmd withIpv4Address(String ipv4Address) {
-        checkNotNull(ipv4Address, "no ipv4Address was specified");
-        this.ipv4Address = ipv4Address;
+    public CreateContainerCmd withVolumes(Volume... volumes) {
+        checkNotNull(volumes, "volumes was not specified");
+        this.volumes = new Volumes(volumes);
         return this;
     }
 
     @Override
-    public CreateContainerCmd withIpv6Address(String ipv6Address) {
-        checkNotNull(ipv6Address, "no ipv6Address was specified");
-        this.ipv6Address = ipv6Address;
-        return this;
+    public CreateContainerCmd withVolumes(List<Volume> volumes) {
+        checkNotNull(volumes, "volumes was not specified");
+        return withVolumes(volumes.toArray(new Volume[0]));
     }
 
     @Override
-    public CreateContainerCmd withLabels(Map<String, String> labels) {
-        checkNotNull(labels, "labels was not specified");
-        this.labels = labels;
-        return this;
+    public String getWorkingDir() {
+        return workingDir;
     }
 
     @Override
-    public CreateContainerCmd withMacAddress(String macAddress) {
-        checkNotNull(macAddress, "macAddress was not specified");
-        this.macAddress = macAddress;
+    public CreateContainerCmd withWorkingDir(String workingDir) {
+        checkNotNull(workingDir, "workingDir was not specified");
+        this.workingDir = workingDir;
         return this;
     }
 
     @Override
-    public CreateContainerCmd withName(String name) {
-        checkNotNull(name, "name was not specified");
-        this.name = name;
-        return this;
+    public Boolean isNetworkDisabled() {
+        return networkDisabled;
     }
 
     @Override
@@ -473,17 +476,10 @@ public CreateContainerCmd withNetworkDisabled(Boolean disableNetwork) {
         return this;
     }
 
-    @Override
-    public CreateContainerCmd withPortSpecs(String... portSpecs) {
-        checkNotNull(portSpecs, "portSpecs was not specified");
-        this.portSpecs = portSpecs;
-        return this;
-    }
 
     @Override
-    public CreateContainerCmd withPortSpecs(List<String> portSpecs) {
-        checkNotNull(portSpecs, "portSpecs was not specified");
-        return withPortSpecs(portSpecs.toArray(new String[portSpecs.size()]));
+    public Boolean isStdInOnce() {
+        return stdInOnce;
     }
 
     @Override
@@ -493,6 +489,11 @@ public CreateContainerCmd withStdInOnce(Boolean stdInOnce) {
         return this;
     }
 
+    @Override
+    public Boolean isStdinOpen() {
+        return stdinOpen;
+    }
+
     @Override
     public CreateContainerCmd withStdinOpen(Boolean stdinOpen) {
         checkNotNull(stdinOpen, "no stdinOpen was specified");
@@ -500,6 +501,12 @@ public CreateContainerCmd withStdinOpen(Boolean stdinOpen) {
         return this;
     }
 
+
+    @Override
+    public Boolean isTty() {
+        return tty;
+    }
+
     @Override
     public CreateContainerCmd withTty(Boolean tty) {
         checkNotNull(tty, "no tty was specified");
@@ -507,41 +514,94 @@ public CreateContainerCmd withTty(Boolean tty) {
         return this;
     }
 
+    @Override
+    public HostConfig getHostConfig() {
+        return hostConfig;
+    }
 
     @Override
-    public CreateContainerCmd withUser(String user) {
-        checkNotNull(user, "user was not specified");
-        this.user = user;
+    public CreateContainerCmd withHostConfig(HostConfig hostConfig) {
+        this.hostConfig = hostConfig;
         return this;
     }
 
     @Override
-    public CreateContainerCmd withVolumes(Volume... volumes) {
-        checkNotNull(volumes, "volumes was not specified");
-        this.volumes = new Volumes(volumes);
+    public String getIpv4Address() {
+        return ipv4Address;
+    }
+
+    @Override
+    public CreateContainerCmd withIpv4Address(String ipv4Address) {
+        checkNotNull(ipv4Address, "no ipv4Address was specified");
+        this.ipv4Address = ipv4Address;
         return this;
     }
 
     @Override
-    public CreateContainerCmd withVolumes(List<Volume> volumes) {
-        checkNotNull(volumes, "volumes was not specified");
-        return withVolumes(volumes.toArray(new Volume[volumes.size()]));
+    public String getIpv6Address() {
+        return ipv6Address;
     }
 
     @Override
-    public CreateContainerCmd withWorkingDir(String workingDir) {
-        checkNotNull(workingDir, "workingDir was not specified");
-        this.workingDir = workingDir;
+    public CreateContainerCmd withIpv6Address(String ipv6Address) {
+        checkNotNull(ipv6Address, "no ipv6Address was specified");
+        this.ipv6Address = ipv6Address;
         return this;
     }
 
+    @CheckForNull
+    public List<String> getOnBuild() {
+        return onBuild;
+    }
 
-    @Override
-    public CreateContainerCmd withHostConfig(HostConfig hostConfig) {
-        this.hostConfig = hostConfig;
+    public CreateContainerCmdImpl withOnBuild(List<String> onBuild) {
+        this.onBuild = onBuild;
         return this;
     }
 
+    /**
+     * @throws NotFoundException No such container
+     * @throws ConflictException Named container already exists
+     */
+    @Override
+    public CreateContainerResponse exec() throws NotFoundException, ConflictException {
+        //code flow taken from https://github.com/docker/docker/blob/master/runconfig/opts/parse.go
+        ContainerNetwork containerNetwork = null;
+
+        if (ipv4Address != null || ipv6Address != null) {
+            containerNetwork = new ContainerNetwork()
+                    .withIpamConfig(new ContainerNetwork.Ipam()
+                            .withIpv4Address(ipv4Address)
+                            .withIpv6Address(ipv6Address)
+                    );
+
+        }
+
+        if (hostConfig.isUserDefinedNetwork() && hostConfig.getLinks().length > 0) {
+            if (containerNetwork == null) {
+                containerNetwork = new ContainerNetwork();
+            }
+
+            containerNetwork.withLinks(hostConfig.getLinks());
+        }
+
+        if (aliases != null) {
+            if (containerNetwork == null) {
+                containerNetwork = new ContainerNetwork();
+            }
+
+            containerNetwork.withAliases(aliases);
+        }
+
+        if (containerNetwork != null) {
+            networkingConfig = new NetworkingConfig()
+                    .withEndpointsConfig(singletonMap(hostConfig.getNetworkMode(), containerNetwork));
+        }
+
+        return super.exec();
+    }
+
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
index 6b4a5ec72..c8fed9cce 100644
--- a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
+++ b/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
@@ -18,6 +18,7 @@
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.model.ContainerNetwork;
+import com.github.dockerjava.api.model.Isolation;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.junit.Test;
@@ -161,7 +162,7 @@ public void inspect_windows_container() throws IOException {
         )));
 
         assertThat(response.getHostConfig(), notNullValue());
-        assertThat(response.getHostConfig().getIsolation(), is("hyperv"));
+        assertThat(response.getHostConfig().getIsolation(), is(Isolation.HYPERV));
 
         assertThat(response.getImageId(), is("sha256:1381511ec0122f197b6abff5bc0692bef19943ddafd6680eff41197afa3a6dda"));
         assertThat(response.getLogPath(), is(
diff --git a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index f01e60019..570f20f64 100644
--- a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -306,7 +306,7 @@ public void createContainerWithMemorySwappiness() throws DockerException {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withCmd("sleep", "9999")
                 .withHostConfig(newHostConfig()
-                        .withMemorySwappiness(42))
+                        .withMemorySwappiness(42L))
                 .exec();
         assertThat(container.getId(), not(isEmptyString()));
         LOG.info("Created container {}", container.toString());
@@ -318,7 +318,7 @@ public void createContainerWithMemorySwappiness() throws DockerException {
                 .inspectContainerCmd(container.getId())
                 .exec();
         LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-        assertSame(42, inspectContainerResponse.getHostConfig().getMemorySwappiness());
+        assertSame(42L, inspectContainerResponse.getHostConfig().getMemorySwappiness());
     }
 
     @Test
@@ -335,9 +335,9 @@ public void createContainerWithLinkInCustomNetwork() throws DockerException {
         assertNotNull(createNetworkResponse.getId());
 
         CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
-                .withCmd("sleep", "9999")
                 .withHostConfig(newHostConfig()
                         .withNetworkMode(networkName))
+                .withCmd("sleep", "9999")
                 .withName(containerName1)
                 .exec();
 
@@ -352,9 +352,8 @@ public void createContainerWithLinkInCustomNetwork() throws DockerException {
 
         CreateContainerResponse container2 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withHostConfig(newHostConfig()
-                        .withNetworkMode(networkName)
                         .withLinks(new Link(containerName1, containerName1 + "Link"))
-                )
+                        .withNetworkMode(networkName))
                 .withName(containerName2)
                 .withCmd("env")
                 .exec();
@@ -387,9 +386,9 @@ public void createContainerWithCustomIp() throws DockerException {
         assertNotNull(createNetworkResponse.getId());
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
-                .withCmd("sleep", "9999")
                 .withHostConfig(newHostConfig()
                         .withNetworkMode(networkName))
+                .withCmd("sleep", "9999")
                 .withName(containerName1)
                 .withIpv4Address(subnetPrefix + ".100")
                 .exec();
@@ -421,9 +420,9 @@ public void createContainerWithAlias() throws DockerException {
         assertNotNull(createNetworkResponse.getId());
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
-                .withCmd("sleep", "9999")
                 .withHostConfig(newHostConfig()
                         .withNetworkMode(networkName))
+                .withCmd("sleep", "9999")
                 .withName(containerName1)
                 .withAliases("server" + dockerRule.getKind())
                 .exec();
@@ -505,8 +504,7 @@ public void createContainerWithExtraHosts() throws DockerException {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withName("containerextrahosts" + dockerRule.getKind())
                 .withHostConfig(newHostConfig()
-                        .withExtraHosts(extraHosts))
-                .exec();
+                        .withExtraHosts(extraHosts)).exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -523,7 +521,8 @@ public void createContainerWithDevices() throws DockerException {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999")
                 .withHostConfig(newHostConfig()
-                        .withDevices(new Device("rwm", "/dev/nulo", "/dev/zero"))).exec();
+                        .withDevices(new Device("rwm", "/dev/nulo", "/dev/zero")))
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -548,8 +547,10 @@ public void createContainerWithPortBindings() throws DockerException {
         portBindings.bind(tcp23, Binding.bindPort(baseport + 24));
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("true")
-                .withExposedPorts(tcp22, tcp23).withHostConfig(newHostConfig()
-                        .withPortBindings(portBindings)).exec();
+                .withExposedPorts(tcp22, tcp23)
+                .withHostConfig(newHostConfig()
+                        .withPortBindings(portBindings))
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -603,7 +604,8 @@ public void createContainerWithLinking() throws DockerException {
         CreateContainerResponse container2 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999")
                 .withName(containerName2)
                 .withHostConfig(newHostConfig()
-                        .withLinks(new Link(containerName1, containerName1 + "Link"))).exec();
+                        .withLinks(new Link(containerName1, containerName1 + "Link")))
+                .exec();
 
         LOG.info("Created container2 {}", container2.toString());
         assertThat(container2.getId(), not(isEmptyString()));
@@ -630,8 +632,7 @@ public void createContainerWithRestartPolicy() throws DockerException {
         RestartPolicy restartPolicy = RestartPolicy.onFailureRestart(5);
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999")
-                .withHostConfig(newHostConfig()
-                        .withRestartPolicy(restartPolicy)).exec();
+                .withHostConfig(newHostConfig().withRestartPolicy(restartPolicy)).exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -646,8 +647,7 @@ public void createContainerWithRestartPolicy() throws DockerException {
     public void createContainerWithPidMode() throws DockerException {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("true")
-                .withHostConfig(newHostConfig()
-                        .withPidMode("host")).exec();
+                .withHostConfig(newHostConfig().withPidMode("host")).exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -669,7 +669,8 @@ public void createContainerWithNetworkMode() throws DockerException {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("true")
                 .withHostConfig(newHostConfig()
-                        .withNetworkMode("host")).exec();
+                        .withNetworkMode("host"))
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -703,7 +704,8 @@ public void createContainerWithULimits() throws DockerException {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withName(containerName)
                 .withHostConfig(newHostConfig()
-                        .withUlimits(ulimits)).exec();
+                        .withUlimits(ulimits))
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -819,7 +821,8 @@ public void onNext(Frame item) {
     public void createContainerWithCgroupParent() throws DockerException {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
                 .withHostConfig(newHostConfig()
-                        .withCgroupParent("/parent")).exec();
+                        .withCgroupParent("/parent"))
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
diff --git a/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java b/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java
index 220ad89ef..3c9451545 100644
--- a/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java
@@ -41,9 +41,9 @@ public void forceDisconnectFromNetwork() throws InterruptedException {
         CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd().withName("testNetwork2" + dockerRule.getKind()).exec();
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
-                .withCmd("sleep", "9999")
                 .withHostConfig(newHostConfig()
                         .withNetworkMode("testNetwork2" + dockerRule.getKind()))
+                .withCmd("sleep", "9999")
                 .exec();
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
diff --git a/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java b/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
index 098c592b8..50ba4ca40 100644
--- a/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
@@ -4,7 +4,6 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Container;
-import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.core.command.PullImageResultCallback;
 import com.github.dockerjava.core.command.WaitContainerResultCallback;
@@ -22,6 +21,7 @@
 import java.util.UUID;
 
 import static ch.lambdaj.Lambda.filter;
+import static com.github.dockerjava.api.model.HostConfig.newHostConfig;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -258,9 +258,8 @@ public void testVolumeFilter() throws Exception {
 
         id = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withLabels(testLabel)
-                .withHostConfig(HostConfig.newHostConfig()
-                        .withBinds(new Bind("TestFilterVolume", new Volume("/test")))
-                )
+                .withHostConfig(newHostConfig()
+                        .withBinds(new Bind("TestFilterVolume", new Volume("/test"))))
                 .exec()
                 .getId();
 
@@ -288,9 +287,8 @@ public void testNetworkFilter() throws Exception {
 
         id = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withLabels(testLabel)
-                .withHostConfig(HostConfig.newHostConfig()
-                        .withNetworkMode("TestFilterNetwork")
-                )
+                .withHostConfig(newHostConfig()
+                        .withNetworkMode("TestFilterNetwork"))
                 .exec()
                 .getId();
 
diff --git a/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
index bd0a53f50..5fde7bc03 100644
--- a/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
@@ -10,7 +10,6 @@
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
-import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Link;
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.Ports.Binding;
@@ -55,12 +54,10 @@ public void startContainerWithVolumes() throws DockerException {
 
         Volume volume2 = new Volume("/opt/webapp2");
 
-        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
-                .withVolumes(volume1, volume2)
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withVolumes(volume1, volume2)
                 .withCmd("true")
                 .withHostConfig(newHostConfig()
-                        .withBinds(new Bind("/src/webapp1", volume1, ro), new Bind("/src/webapp2", volume2))
-                )
+                        .withBinds(new Bind("/src/webapp1", volume1, ro), new Bind("/src/webapp2", volume2)))
                 .exec();
 
         LOG.info("Created container {}", container.toString());
@@ -135,8 +132,7 @@ public void startContainerWithDns() throws DockerException {
         String aDnsServer = "8.8.8.8";
         String anotherDnsServer = "8.8.4.4";
 
-        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
-                .withCmd("true")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true")
                 .withHostConfig(newHostConfig()
                         .withDns(aDnsServer, anotherDnsServer))
                 .exec();
@@ -158,8 +154,7 @@ public void startContainerWithDnsSearch() throws DockerException {
 
         String dnsSearch = "example.com";
 
-        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
-                .withCmd("true")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true")
                 .withHostConfig(newHostConfig()
                         .withDnsSearch(dnsSearch))
                 .exec();
@@ -189,12 +184,10 @@ public void startContainerWithPortBindings() throws DockerException {
         portBindings.bind(tcp23, Binding.bindPort(baseport + 23));
         portBindings.bind(tcp23, Binding.bindPort(baseport + 24));
 
-        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
-                .withCmd("true")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true")
                 .withExposedPorts(tcp22, tcp23)
                 .withHostConfig(newHostConfig()
-                        .withPortBindings(portBindings))
-                .exec();
+                        .withPortBindings(portBindings)).exec();
 
         LOG.info("Created container {}", container.toString());
 
@@ -230,8 +223,7 @@ public void startContainerWithRandomPortBindings() throws DockerException {
         portBindings.bind(tcp23, Binding.empty());
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withExposedPorts(tcp22, tcp23)
-                .withHostConfig(newHostConfig()
+                .withExposedPorts(tcp22, tcp23).withHostConfig(newHostConfig()
                         .withPortBindings(portBindings)
                         .withPublishAllPorts(true))
                 .exec();
@@ -265,8 +257,7 @@ public void startContainerWithConflictingPortBindings() throws DockerException {
         portBindings.bind(tcp23, Binding.bindPort(11022));
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true")
-                .withExposedPorts(tcp22, tcp23)
-                .withHostConfig(newHostConfig()
+                .withExposedPorts(tcp22, tcp23).withHostConfig(newHostConfig()
                         .withPortBindings(portBindings))
                 .exec();
 
@@ -310,10 +301,8 @@ public void startContainerWithLinkingDeprecated() throws DockerException {
             assertThat(inspectContainerResponse1.getState().getExitCode(), is(equalTo(0)));
         }
 
-        CreateContainerResponse container2 = dockerRule.getClient().createContainerCmd("busybox")
-                .withCmd("sleep", "9999")
-                .withName(container2Name)
-                .withHostConfig(newHostConfig()
+        CreateContainerResponse container2 = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
+                .withName(container2Name).withHostConfig(newHostConfig()
                         .withLinks(new Link(container1Name, container1Name + "Link")))
                 .exec();
 
@@ -374,8 +363,7 @@ public void startContainerWithLinking() throws DockerException {
         }
 
         CreateContainerResponse container2 = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
-                .withName(container2Name)
-                .withHostConfig(newHostConfig()
+                .withName(container2Name).withHostConfig(newHostConfig()
                         .withLinks(new Link(container1Name, container1Name + "Link")))
                 .exec();
 
@@ -446,8 +434,7 @@ public void testStartNonExistingContainer() throws DockerException {
     @Test
     public void startContainerWithNetworkMode() throws DockerException {
 
-        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
-                .withCmd("true")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true")
                 .withHostConfig(newHostConfig()
                         .withNetworkMode("host"))
                 .exec();
@@ -493,7 +480,8 @@ public void startContainerWithCapAddAndCapDrop() throws DockerException {
     @Test
     public void startContainerWithDevices() throws DockerException {
 
-        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+                .withCmd("sleep", "9999")
                 .withHostConfig(newHostConfig()
                         .withDevices(new Device("rwm", "/dev/nulo", "/dev/zero")))
                 .exec();
@@ -539,9 +527,11 @@ public void startContainerWithRestartPolicy() throws DockerException {
 
         RestartPolicy restartPolicy = RestartPolicy.onFailureRestart(5);
 
-        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+                .withCmd("sleep", "9999")
                 .withHostConfig(newHostConfig()
-                        .withRestartPolicy(restartPolicy)).exec();
+                        .withRestartPolicy(restartPolicy))
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
diff --git a/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
index 238a0da73..51d967db5 100644
--- a/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
@@ -71,8 +71,8 @@ public void updateContainer() throws DockerException, IOException {
 
 //        assertThat(afterHostConfig.getBlkioWeight(), is(300));
         assertThat(afterHostConfig.getCpuShares(), is(512));
-        assertThat(afterHostConfig.getCpuPeriod(), is(100000));
-        assertThat(afterHostConfig.getCpuQuota(), is(50000));
+        assertThat(afterHostConfig.getCpuPeriod(), is(100000L));
+        assertThat(afterHostConfig.getCpuQuota(), is(50000L));
         assertThat(afterHostConfig.getCpusetMems(), is("0"));
 
 //        assertThat(afterHostConfig.getMemoryReservation(), is(209715200L));
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
index 79759cdd2..686c24794 100644
--- a/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
@@ -7,7 +7,6 @@
 import com.github.dockerjava.api.exception.NotAcceptableException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.ExposedPort;
-import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.cmd.CmdIT;
@@ -20,7 +19,6 @@
 import com.github.dockerjava.netty.NettyDockerCmdExecFactory;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.experimental.categories.Category;
 
 import static com.github.dockerjava.api.model.HostConfig.newHostConfig;
@@ -105,14 +103,14 @@ protected DockerClient startDockerInDocker() {
         CreateContainerResponse response = dockerRule.getClient()
                 .createContainerCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY + ":" + DOCKER_IN_DOCKER_IMAGE_TAG)
                 .withHostConfig(newHostConfig()
-                        .withPrivileged(true)
                         .withNetworkMode(NETWORK_NAME)
                         .withPortBindings(new PortBinding(
                                 Ports.Binding.bindIpAndPort("127.0.0.1", port),
-                                ExposedPort.tcp(2375)
-                        )))
+                                ExposedPort.tcp(2375)))
+                        .withPrivileged(true))
                 .withName(name)
                 .withAliases(name)
+
                 .exec();
 
         dockerRule.getClient().startContainerCmd(response.getId()).exec();
diff --git a/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json b/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json
index 9c505c04b..2f3428d7a 100644
--- a/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json
+++ b/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json
@@ -36,7 +36,7 @@
       "Memory" : 0,
       "MemorySwap" : 0,
       "CpuQuota" : 0,
-      "OomScoreAdj" : false,
+      "OomScoreAdj" : 500,
       "MemoryReservation" : 0
     },
     "Id" : "58fd1abe8e43a65fb6231b76a9678e7bb4e91686f838945e782a4b74119ce959",

From a57b94b0c06d4e4d61ce4fcfc8ce037192fc4fd9 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 27 Nov 2018 15:08:19 +0300
Subject: [PATCH 0860/1272] Revert "Change since parameter in LogContainerCmd
 to String"

---
 .../api/command/LogContainerCmd.java          |  8 ++---
 .../core/command/LogContainerCmdImpl.java     | 11 +++---
 .../dockerjava/cmd/LogContainerCmdIT.java     | 36 +------------------
 3 files changed, 10 insertions(+), 45 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
index 7a92c898d..53674cbaa 100644
--- a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -23,8 +23,8 @@
  * @param tail
  *            - `all` or `<number>`, Output specified number of lines at the end of logs
  * @param since
- *            - UNIX timestamp, RFC 3339 date, or Go duration string to filter logs.
- *            Specifying a timestamp will only output log-entries since that timestamp. Default: 0 (unfiltered)
+ *            - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default:
+ *            0 (unfiltered)
  */
 public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame> {
 
@@ -47,7 +47,7 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame>
     Boolean hasStderrEnabled();
 
     @CheckForNull
-    String getSince();
+    Integer getSince();
 
     LogContainerCmd withContainerId(@Nonnull String containerId);
 
@@ -67,7 +67,7 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame>
 
     LogContainerCmd withTail(Integer tail);
 
-    LogContainerCmd withSince(String since);
+    LogContainerCmd withSince(Integer since);
 
     /**
      * @throws com.github.dockerjava.api.NotFoundException
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
index 0b18cd938..aa267fc8f 100644
--- a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -22,8 +22,8 @@
  * @param tail
  *            - `all` or `<number>`, Output specified number of lines at the end of logs
  * @param since
- *            - UNIX timestamp, RFC 3339 date, or Go duration string to filter logs.
- *            Specifying a timestamp will only output log-entries since that timestamp. Default: 0 (unfiltered)
+ *            - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default:
+ *            0 (unfiltered)
  */
 public class LogContainerCmdImpl extends AbstrAsyncDockerCmd<LogContainerCmd, Frame> implements LogContainerCmd {
 
@@ -31,8 +31,7 @@ public class LogContainerCmdImpl extends AbstrAsyncDockerCmd<LogContainerCmd, Fr
 
     private Boolean followStream, timestamps, stdout, stderr;
 
-    private Integer tail;
-    private String since;
+    private Integer tail, since;
 
     public LogContainerCmdImpl(LogContainerCmd.Exec exec, String containerId) {
         super(exec);
@@ -70,7 +69,7 @@ public Boolean hasStderrEnabled() {
     }
 
     @Override
-    public String getSince() {
+    public Integer getSince() {
         return since;
     }
 
@@ -118,7 +117,7 @@ public LogContainerCmd withTail(Integer tail) {
     }
 
     @Override
-    public LogContainerCmd withSince(String since) {
+    public LogContainerCmd withSince(Integer since) {
         this.since = since;
         return this;
     }
diff --git a/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
index 093415e1d..db0700ecc 100644
--- a/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
@@ -175,7 +175,7 @@ public void asyncLogContainerWithSince() throws Exception {
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
+        int timestamp = (int) (System.currentTimeMillis() / 1000);
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
@@ -197,38 +197,4 @@ public void asyncLogContainerWithSince() throws Exception {
 
         assertThat(loggingCallback.toString(), containsString(snippet));
     }
-
-    @Test
-    public void asyncLogContainerWithSinceNanoseconds() throws Exception {
-        String snippet = "hello world";
-
-        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
-                .withCmd("/bin/echo", snippet)
-                .exec();
-
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        String timestamp = String.format("%.4f", System.currentTimeMillis() / 1000d);
-        dockerRule.getClient().startContainerCmd(container.getId()).exec();
-
-        int exitCode = dockerRule.getClient().waitContainerCmd(container.getId())
-                .exec(new WaitContainerResultCallback())
-                .awaitStatusCode();
-
-        assertThat(exitCode, equalTo(0));
-
-        LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
-
-        dockerRule.getClient().logContainerCmd(container.getId())
-                .withStdErr(true)
-                .withStdOut(true)
-                .withTimestamps(true)
-                .withSince(timestamp)
-                .exec(loggingCallback);
-
-        loggingCallback.awaitCompletion();
-
-        assertThat(loggingCallback.toString(), containsString(snippet));
-    }
 }

From 6bfc6518fa4ae2c259e9465081e792f3f73f9306 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 27 Nov 2018 21:42:04 +0300
Subject: [PATCH 0861/1272] Bump findbugs plugin

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index b04042770..d9ec8eccb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.0-SNAPSHOT</version>
+	<version>3.1.0-rc-6</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.1.0-rc-6</tag>
 	</scm>
 
 	<developers>
@@ -512,7 +512,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>findbugs-maven-plugin</artifactId>
-						<version>3.0.3</version>
+						<version>3.0.5</version>
 						<configuration>
 							<effort>Max</effort>
 							<threshold>Low</threshold>

From 0c553f140ea1c3e420e3195d9be54d31b5ff7d32 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 27 Nov 2018 21:43:10 +0300
Subject: [PATCH 0862/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d9ec8eccb..ae3627e59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.0-rc-6</version>
+	<version>3.1.0-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.1.0-rc-6</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 80cae550de7a4664e4838de3126e7f228b03af41 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 28 Nov 2018 00:17:21 +0300
Subject: [PATCH 0863/1272] Fix NPE when file doesn't exist.

Such use case existed before.
related to #727
---
 .../core/DefaultDockerClientConfig.java       |  6 ++++-
 .../dockerjava/core/DockerConfigFile.java     | 26 +++++++++++++------
 .../core/exec/AbstrDockerCmdExec.java         | 18 +++++++++----
 .../core/exec/BuildImageCmdExec.java          |  7 +++--
 .../core/exec/PullImageCmdExec.java           |  5 ++--
 .../dockerjava/core/DockerConfigFileTest.java |  2 +-
 6 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index 8517d89a9..c77cbb5b7 100644
--- a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -11,6 +11,8 @@
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -231,14 +233,16 @@ public String getRegistryUrl() {
         return registryUrl;
     }
 
+    @CheckForNull
     public String getDockerConfigPath() {
         return dockerConfigPath;
     }
 
+    @Nonnull
     public DockerConfigFile getDockerConfig() {
         if (dockerConfig == null) {
             try {
-                dockerConfig = DockerConfigFile.loadConfig(new File(getDockerConfigPath()));
+                dockerConfig = DockerConfigFile.loadConfig(getDockerConfigPath());
             } catch (IOException e) {
                 throw new DockerClientException("Failed to parse docker configuration file", e);
             }
diff --git a/src/main/java/com/github/dockerjava/core/DockerConfigFile.java b/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
index 01cacb5c8..df4fd6541 100644
--- a/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
+++ b/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
@@ -10,6 +10,8 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -27,7 +29,7 @@ public class DockerConfigFile {
     private static final TypeReference<Map<String, AuthConfig>> CONFIG_MAP_TYPE = new TypeReference<Map<String, AuthConfig>>() {
     };
 
-    @JsonProperty()
+    @JsonProperty
     private final Map<String, AuthConfig> auths;
 
     public DockerConfigFile() {
@@ -38,6 +40,7 @@ private DockerConfigFile(Map<String, AuthConfig> authConfigMap) {
         auths = authConfigMap;
     }
 
+    @Nonnull
     public Map<String, AuthConfig> getAuths() {
         return auths;
     }
@@ -46,7 +49,8 @@ void addAuthConfig(AuthConfig config) {
         auths.put(config.getRegistryAddress(), config);
     }
 
-    public AuthConfig resolveAuthConfig(String hostname) {
+    @CheckForNull
+    public AuthConfig resolveAuthConfig(@Nonnull String hostname) {
         if (StringUtils.isEmpty(hostname) || AuthConfig.DEFAULT_SERVER_ADDRESS.equals(hostname)) {
             return auths.get(AuthConfig.DEFAULT_SERVER_ADDRESS);
         }
@@ -70,6 +74,7 @@ public AuthConfig resolveAuthConfig(String hostname) {
         return null;
     }
 
+    @Nonnull
     public AuthConfigurations getAuthConfigurations() {
         final AuthConfigurations authConfigurations = new AuthConfigurations();
         for (Map.Entry<String, AuthConfig> authConfigEntry : auths.entrySet()) {
@@ -112,9 +117,12 @@ public String toString() {
         return "DockerConfigFile [auths=" + auths + "]";
     }
 
-    public static DockerConfigFile loadConfig(File dockerConfigPath) throws IOException {
+    @Nonnull
+    public static DockerConfigFile loadConfig(@CheckForNull String dockerConfigPath) throws IOException {
+        DockerConfigFile dockerConfig;
+
         //parse new docker config file format
-        DockerConfigFile dockerConfig = loadCurrentConfig(dockerConfigPath);
+        dockerConfig = loadCurrentConfig(dockerConfigPath);
 
         //parse old auth config file format
         if (dockerConfig == null) {
@@ -136,8 +144,9 @@ public static DockerConfigFile loadConfig(File dockerConfigPath) throws IOExcept
         return dockerConfig;
     }
 
-    private static DockerConfigFile loadCurrentConfig(File dockerConfigPath) throws IOException {
-        File dockerCfgFile = new File(dockerConfigPath, File.separator + DOCKER_CFG);
+    @CheckForNull
+    private static DockerConfigFile loadCurrentConfig(String dockerConfigPath) throws IOException {
+        File dockerCfgFile = new File(dockerConfigPath, DOCKER_CFG);
 
         if (!dockerCfgFile.exists() || !dockerCfgFile.isFile()) {
             return null;
@@ -150,8 +159,9 @@ private static DockerConfigFile loadCurrentConfig(File dockerConfigPath) throws
         }
     }
 
-    private static DockerConfigFile loadLegacyConfig(File dockerConfigPath) throws IOException {
-        File dockerLegacyCfgFile = new File(dockerConfigPath, File.separator + DOCKER_LEGACY_CFG);
+    @CheckForNull
+    private static DockerConfigFile loadLegacyConfig(String dockerConfigPath) throws IOException {
+        File dockerLegacyCfgFile = new File(dockerConfigPath, DOCKER_LEGACY_CFG);
 
         if (!dockerLegacyCfgFile.exists() || !dockerLegacyCfgFile.isFile()) {
             return null;
diff --git a/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
index 9b28ddd75..25f6c1f5d 100644
--- a/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
@@ -5,11 +5,13 @@
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.core.InvocationBuilder;
+import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.core.WebTarget;
 import org.apache.commons.codec.binary.Base64;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 import java.io.IOException;
 
 import static com.github.dockerjava.core.RemoteApiVersion.UNKNOWN_VERSION;
@@ -33,11 +35,12 @@ protected WebTarget getBaseResource() {
         return baseResource;
     }
 
+    @CheckForNull
     protected AuthConfigurations getBuildAuthConfigs() {
         return dockerClientConfig.getAuthConfigurations();
     }
 
-    protected String registryAuth(AuthConfig authConfig) {
+    protected String registryAuth(@Nonnull AuthConfig authConfig) {
         try {
             return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfig).getBytes());
         } catch (IOException e) {
@@ -45,7 +48,8 @@ protected String registryAuth(AuthConfig authConfig) {
         }
     }
 
-    protected String registryConfigs(AuthConfigurations authConfigs) {
+    @Nonnull
+    protected String registryConfigs(@Nonnull AuthConfigurations authConfigs) {
         try {
             final String json;
             final ObjectMapper objectMapper = new ObjectMapper();
@@ -68,11 +72,15 @@ protected String registryConfigs(AuthConfigurations authConfigs) {
         }
     }
 
-    protected InvocationBuilder resourceWithAuthConfig(AuthConfig authConfig, InvocationBuilder request) {
+    @Nonnull
+    protected InvocationBuilder resourceWithAuthConfig(@Nonnull AuthConfig authConfig,
+                                                       @Nonnull InvocationBuilder request) {
         return request.header("X-Registry-Auth", registryAuth(authConfig));
     }
 
-    protected InvocationBuilder resourceWithOptionalAuthConfig(AuthConfig authConfig, InvocationBuilder request) {
+    @Nonnull
+    protected InvocationBuilder resourceWithOptionalAuthConfig(@CheckForNull AuthConfig authConfig,
+                                                               @Nonnull InvocationBuilder request) {
         if (authConfig != null) {
             request = resourceWithAuthConfig(authConfig, request);
         }
diff --git a/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
index bc37273cb..d05be2b3c 100644
--- a/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
@@ -12,6 +12,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.CheckForNull;
+
 import static com.github.dockerjava.core.util.CacheFromEncoder.jsonEncode;
 import static org.apache.commons.lang.StringUtils.isNotBlank;
 
@@ -31,8 +33,9 @@ private InvocationBuilder resourceWithOptionalAuthConfig(BuildImageCmd command,
         return request;
     }
 
-    private static AuthConfigurations firstNonNull(final AuthConfigurations fromCommand,
-            final AuthConfigurations fromConfig) {
+    @CheckForNull
+    private static AuthConfigurations firstNonNull(@CheckForNull final AuthConfigurations fromCommand,
+            @CheckForNull final AuthConfigurations fromConfig) {
         if (fromCommand != null) {
             return fromCommand;
         }
diff --git a/src/main/java/com/github/dockerjava/core/exec/PullImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/PullImageCmdExec.java
index cafb4ac30..1ba0fd8c2 100644
--- a/src/main/java/com/github/dockerjava/core/exec/PullImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/PullImageCmdExec.java
@@ -30,8 +30,9 @@ protected Void execute0(PullImageCmd command, ResultCallback<PullResponseItem> r
         }
 
         LOGGER.trace("POST: {}", webResource);
-        resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request()).accept(MediaType.APPLICATION_OCTET_STREAM).post(
-                null, new TypeReference<PullResponseItem>() {
+        resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request())
+                .accept(MediaType.APPLICATION_OCTET_STREAM)
+                .post(null, new TypeReference<PullResponseItem>() {
                 }, resultCallback);
 
         return null;
diff --git a/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java b/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
index 7f121c69a..b7edb3001 100644
--- a/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
+++ b/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
@@ -156,7 +156,7 @@ public void nonExistent() throws IOException {
     }
 
     private DockerConfigFile runTest(String testFileName) throws IOException {
-        return DockerConfigFile.loadConfig(new File(FILESROOT, testFileName));
+        return DockerConfigFile.loadConfig(new File(FILESROOT, testFileName).getAbsolutePath());
     }
 
 }

From 92fb19bd6086ad741c01606483145415e5a06bd6 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 28 Nov 2018 00:35:56 +0300
Subject: [PATCH 0864/1272] Don't work with files

---
 .../java/com/github/dockerjava/core/DockerConfigFile.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/core/DockerConfigFile.java b/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
index df4fd6541..0cfaef1c0 100644
--- a/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
+++ b/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
@@ -119,6 +119,11 @@ public String toString() {
 
     @Nonnull
     public static DockerConfigFile loadConfig(@CheckForNull String dockerConfigPath) throws IOException {
+        // no any configs, but for empty auths return non null object
+        if (dockerConfigPath == null) {
+            return new DockerConfigFile();
+        }
+
         DockerConfigFile dockerConfig;
 
         //parse new docker config file format
@@ -145,7 +150,7 @@ public static DockerConfigFile loadConfig(@CheckForNull String dockerConfigPath)
     }
 
     @CheckForNull
-    private static DockerConfigFile loadCurrentConfig(String dockerConfigPath) throws IOException {
+    private static DockerConfigFile loadCurrentConfig(@CheckForNull String dockerConfigPath) throws IOException {
         File dockerCfgFile = new File(dockerConfigPath, DOCKER_CFG);
 
         if (!dockerCfgFile.exists() || !dockerCfgFile.isFile()) {

From 289fb1eb69a14deab1344433c5df4607282579ec Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 28 Nov 2018 00:37:07 +0300
Subject: [PATCH 0865/1272] in fact it could be null

---
 .../java/com/github/dockerjava/core/DockerConfigFile.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/DockerConfigFile.java b/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
index 0cfaef1c0..ac1e3cf28 100644
--- a/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
+++ b/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
@@ -50,7 +50,7 @@ void addAuthConfig(AuthConfig config) {
     }
 
     @CheckForNull
-    public AuthConfig resolveAuthConfig(@Nonnull String hostname) {
+    public AuthConfig resolveAuthConfig(@CheckForNull String hostname) {
         if (StringUtils.isEmpty(hostname) || AuthConfig.DEFAULT_SERVER_ADDRESS.equals(hostname)) {
             return auths.get(AuthConfig.DEFAULT_SERVER_ADDRESS);
         }
@@ -124,10 +124,8 @@ public static DockerConfigFile loadConfig(@CheckForNull String dockerConfigPath)
             return new DockerConfigFile();
         }
 
-        DockerConfigFile dockerConfig;
-
         //parse new docker config file format
-        dockerConfig = loadCurrentConfig(dockerConfigPath);
+        DockerConfigFile dockerConfig = loadCurrentConfig(dockerConfigPath);
 
         //parse old auth config file format
         if (dockerConfig == null) {

From ef7843476b48b1fd9cabc5273376415b65650fc7 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 28 Nov 2018 00:46:37 +0300
Subject: [PATCH 0866/1272] [maven-release-plugin] prepare release 3.1.0-rc-7

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae3627e59..6a52eab70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.0-SNAPSHOT</version>
+	<version>3.1.0-rc-7</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.1.0-rc-7</tag>
 	</scm>
 
 	<developers>

From eecc9045e1576a014180d747649d24e56f804a2b Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 28 Nov 2018 00:46:49 +0300
Subject: [PATCH 0867/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6a52eab70..ae3627e59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.0-rc-7</version>
+	<version>3.1.0-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.1.0-rc-7</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 3d29559f5d5330b32c40236b864c6c102c99bc3a Mon Sep 17 00:00:00 2001
From: PawelJ-PL <inne.poczta@gmail.com>
Date: Wed, 9 Jan 2019 18:00:43 +0100
Subject: [PATCH 0868/1272] Use Base64Url instead of Base64 (#1146)

* Use Base64Url instead of Base64

* Replaced Base64 from Apache Commons with Guava
---
 .../github/dockerjava/core/exec/AbstrDockerCmdExec.java    | 7 +++----
 .../com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java    | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
index 25f6c1f5d..1ec333416 100644
--- a/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
@@ -8,7 +8,7 @@
 import com.github.dockerjava.core.InvocationBuilder;
 import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.core.WebTarget;
-import org.apache.commons.codec.binary.Base64;
+import com.google.common.io.BaseEncoding;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
@@ -42,7 +42,7 @@ protected AuthConfigurations getBuildAuthConfigs() {
 
     protected String registryAuth(@Nonnull AuthConfig authConfig) {
         try {
-            return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfig).getBytes());
+            return BaseEncoding.base64Url().encode(new ObjectMapper().writeValueAsString(authConfig).getBytes());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -65,8 +65,7 @@ protected String registryConfigs(@Nonnull AuthConfigurations authConfigs) {
             } else {
                 json = objectMapper.writeValueAsString(authConfigs);
             }
-
-            return Base64.encodeBase64String(json.getBytes());
+            return BaseEncoding.base64Url().encode(json.getBytes());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
index e5852f5ea..47681e20c 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
@@ -6,7 +6,7 @@
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.RemoteApiVersion;
-import org.apache.commons.codec.binary.Base64;
+import com.google.common.io.BaseEncoding;
 
 import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.WebTarget;
@@ -39,7 +39,7 @@ protected AuthConfigurations getBuildAuthConfigs() {
 
     protected String registryAuth(AuthConfig authConfig) {
         try {
-            return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfig).getBytes());
+            return BaseEncoding.base64Url().encode(new ObjectMapper().writeValueAsString(authConfig).getBytes());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -74,7 +74,7 @@ protected String registryConfigs(AuthConfigurations authConfigs) {
                 json = objectMapper.writeValueAsString(authConfigs);
             }
 
-            return Base64.encodeBase64String(json.getBytes());
+            return BaseEncoding.base64Url().encode(json.getBytes());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

From 76053ab0d5423f089ee9f13ec49b3a0ca69a3146 Mon Sep 17 00:00:00 2001
From: Piotr Skowronek <piotr.skowronek@gmail.com>
Date: Thu, 17 Jan 2019 21:59:18 +0100
Subject: [PATCH 0869/1272] Ignore exception while closing stream to let
 awaitCompletion finish before time-out (#1149)

* Ignore exception while closing stream to let awaitCompletion finish before time-out

* Ensure completed#countDown is called even if exception is thrown while closing stream
---
 .../dockerjava/core/async/ResultCallbackTemplate.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
index f624eccd3..727c91164 100644
--- a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -74,10 +74,13 @@ public void onComplete() {
     public void close() throws IOException {
         if (!closed) {
            closed = true;
-           if (stream != null) {
-               stream.close();
+           try {
+               if (stream != null) {
+                   stream.close();
+               }
+           } finally {
+               completed.countDown();
            }
-           completed.countDown();
         }
     }
 

From ff3952c0f08c265c64c773b13b67e386dadb96ef Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 18 Jan 2019 01:21:48 +0300
Subject: [PATCH 0870/1272] [maven-release-plugin] prepare release 3.1.0-rc-8

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae3627e59..7edd08c5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.0-SNAPSHOT</version>
+	<version>3.1.0-rc-8</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.1.0-rc-8</tag>
 	</scm>
 
 	<developers>

From 7e217028836e473c75906bb69c77c54f1ab33665 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 18 Jan 2019 01:21:57 +0300
Subject: [PATCH 0871/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7edd08c5d..ae3627e59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.0-rc-8</version>
+	<version>3.1.0-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.1.0-rc-8</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 78bfa7a73b8052ff3b5c7462c058c37caccfa79e Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 18 Jan 2019 02:16:11 +0300
Subject: [PATCH 0872/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f76b34dd..1f33d52b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,69 @@
 Change Log
 ===
+
+## 3.1.0-rc-8
+- Do awaitCompletion upon socket close exception
+- Fix `X-Registry-Auth` base64 encoding
+
+## 3.1.0-rc-7
+- Fix NPE when docker config file doesn't exist
+
+## 3.1.0-rc-6
+- Add resize feature to container and exec
+- Update part of apis to 1.37
+- Update dependencies
+- Fix No serializer found for class com.githubdockerjava.api.model.ServiceGlobalModeOptions
+- Add HostConfig.StorageOpt and ExecCreateCmd.Env
+- Added GCPLOGS enum LoggingType
+- Stop proxying HostConfig class (static helper provided)
+- Add ExecCreateCmd.Env
+- Add failcnt into memorystatsconfig
+- Support some missing Engine APIs
+- Added memory swappiness to create container command.
+- Fix for ignore all files except specified
+
+## 3.1.0-rc-5
+- Add missing properties in InspectContainer response
+- Add withFilter methods in ListNetworksCmd & ListVolumesCmd
+- Add WorkingDir property in containers exec
+- Add isolation property support in Info response
+- Support platform option in image build/create/pull commands
+- Add OSVersion and RootFS support in InspectImageResponse
+- Fix double-marshalling of cachefrom
+- make AuthConfig compatible with indentitytoken
+- Allow netty to handle compressed response bodies
+
+## 3.1.0-rc-4
+- Update deps
+- fix HTTP/1.1 compliance (missing Host header)
+- support rollback_completed value in ServiceUpdateState
+- Add Privileged property to ExecCreateCmd
+- Encode spaces as %20 rather than + in URL params
+- Add tmpfs mount support since v1.29
+- Add support for swarm service/task logs
+- Add mapping annotations to custom constructor 
+- Support network mode as part of the docker build
+- support "rollback" as value for UpdateFailureAction
+- Add "Pid" field to InspectExecResponse
+- Add DiskQuota to HostConfig and CreateContainerCmd
+- Add AutoRemove to HostConfig
+- follow symbolic links when walking dir
+- Use path from the configured docker host instead of hardcoded "/var/run/docker.sock" in netty factory
+- Configure JerseyDockerCmdExecFactory to avoid chunked encoding 
+
+## 3.1.0-rc-3
+- export TmpFs configuration for HostConfig and DockerClient
+- avoid double encoding for url query string
+
+## 3.1.0-rc-2
+- https://github.com/docker-java/docker-java/pulls?q=is%3Apr+milestone%3A3.1.0-rc-2+is%3Aclosed
+
 ## 3.1.0-rc-1
   A lot of changes...
 - Swarm Mode support.
 - Classic swarm support.
 - various netty improvements
+- Implement AbstractDockerCmdExecFactory 
  
  
 ## 3.0.14

From f47a373f8b532f175d7e0d1af111099f1e4a8c1b Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 19 Jan 2019 23:42:57 +0300
Subject: [PATCH 0873/1272] [maven-release-plugin] prepare release 3.1.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae3627e59..7b4d6f117 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.0-SNAPSHOT</version>
+	<version>3.1.0</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.1.0</tag>
 	</scm>
 
 	<developers>

From 48726ea4c25d6390a77192cc5439c4d1395164c5 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 19 Jan 2019 23:43:09 +0300
Subject: [PATCH 0874/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7b4d6f117..68ed60d7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.0</version>
+	<version>3.1.1-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.1.0</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From b2dc629a74c06e084c60541b9cf4d9579df0283d Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 20 Jan 2019 17:42:56 +0300
Subject: [PATCH 0875/1272] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c3dc39825..de96156a5 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ For secure tls (https) communication:
     DOCKER_CERT_PATH=/Users/marcus/.docker/machine/machines/docker-1.11.2
 
 ### Latest release version
-Supports a subset of the Docker Remote API [v1.23](https://github.com/docker/docker/blob/master/docs/api/v1.23.md), Docker Server version 1.11.x
+Supports a subset of the Docker Remote API [v1.37](https://docs.docker.com/engine/api/v1.37/), Docker Server version since 1.12.6
 
     <dependency>
           <groupId>com.github.docker-java</groupId>
@@ -62,7 +62,7 @@ Supports a subset of the Docker Remote API [v1.23](https://github.com/docker/doc
     </dependency>
     
 ### Latest development version
-Supports a subset of the Docker Remote API [v1.23](https://github.com/docker/docker/blob/master/docs/api/v1.23.md), Docker Server version 1.11.x
+May contain new features while they are not released.
 
 You can find the latest development version including javadoc and source files on [Sonatypes OSS repository](https://oss.sonatype.org/content/groups/public/com/github/docker-java/docker-java/).
 
@@ -101,7 +101,7 @@ In your application, e.g.
         .withDockerTlsVerify(true)
         .withDockerCertPath("/home/user/.docker/certs")
         .withDockerConfig("/home/user/.docker")
-        .withApiVersion("1.23")
+        .withApiVersion("1.30") // optional
         .withRegistryUrl("https://index.docker.io/v1/")
         .withRegistryUsername("dockeruser")
         .withRegistryPassword("ilovedocker")

From a2df1fc9c40e4d40fb1e577131b5c9fa789c9a68 Mon Sep 17 00:00:00 2001
From: Benjamin Leber <benjamin.leber@bertschi.com>
Date: Mon, 21 Jan 2019 13:17:07 +0100
Subject: [PATCH 0876/1272] ! [api/healthcheck] startPeriod is now a long

As it is saved in nanoseconds, int is to small to save sensible values
---
 .../java/com/github/dockerjava/api/model/HealthCheck.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/HealthCheck.java b/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
index a6581f261..2b0269770 100644
--- a/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
+++ b/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
@@ -56,7 +56,7 @@ public class HealthCheck implements Serializable {
      * @since 1.26
      */
     @JsonProperty("StartPeriod")
-    private Integer startPeriod;
+    private Long startPeriod;
 
     public Long getInterval() {
         return interval;
@@ -94,11 +94,11 @@ public HealthCheck withRetries(Integer retries) {
         return this;
     }
 
-    public Integer getStartPeriod() {
+    public Long getStartPeriod() {
         return startPeriod;
     }
 
-    public HealthCheck withStartPeriod(Integer startPeriod) {
+    public HealthCheck withStartPeriod(Long startPeriod) {
         this.startPeriod = startPeriod;
         return this;
     }

From bac5740616352e1f2530c83488474294ec1c55ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gillouard=20Fr=C3=A9d=C3=A9ric?=
 <frederic.gillouard@arkea.com>
Date: Wed, 23 Mar 2016 16:59:16 +0100
Subject: [PATCH 0877/1272] Patch save image with tag

---
 .../core/exec/SaveImageCmdExec.java           | 20 ++++++++++++-------
 .../dockerjava/jaxrs/SaveImageCmdExec.java    | 10 ++++++++--
 .../github/dockerjava/cmd/SaveImageCmdIT.java |  4 ++++
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/exec/SaveImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/SaveImageCmdExec.java
index d79d3539a..94001bd5c 100644
--- a/src/main/java/com/github/dockerjava/core/exec/SaveImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/SaveImageCmdExec.java
@@ -1,14 +1,14 @@
 package com.github.dockerjava.core.exec;
 
-import java.io.InputStream;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.MediaType;
 import com.github.dockerjava.core.WebTarget;
+import com.google.common.base.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.InputStream;
 
 public class SaveImageCmdExec extends AbstrSyncDockerCmdExec<SaveImageCmd, InputStream> implements SaveImageCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(SaveImageCmdExec.class);
@@ -19,8 +19,14 @@ public SaveImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientC
 
     @Override
     protected InputStream execute(SaveImageCmd command) {
-        WebTarget webResource = getBaseResource().path("/images/" + command.getName() + "/get").queryParam("tag",
-                command.getTag());
+
+        String name = command.getName();
+        if (!Strings.isNullOrEmpty(command.getTag())) {
+            name += ":" + command.getTag();
+        }
+
+        WebTarget webResource = getBaseResource().
+                path("/images/" + name + "/get");
 
         LOGGER.trace("GET: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_JSON).get();
diff --git a/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
index f3f9a0d35..c386ea3a0 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
@@ -12,6 +12,7 @@
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
+import com.google.common.base.Strings;
 
 public class SaveImageCmdExec extends AbstrSyncDockerCmdExec<SaveImageCmd, InputStream> implements SaveImageCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(SaveImageCmdExec.class);
@@ -22,8 +23,13 @@ public SaveImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientC
 
     @Override
     protected InputStream execute(SaveImageCmd command) {
-        WebTarget webResource = getBaseResource().path("/images/" + command.getName() + "/get").queryParam("tag",
-                command.getTag());
+        // If tag is present, only tar the specific image
+        // else tar all the images with the same name
+        String name = command.getName();
+        if (!Strings.isNullOrEmpty(command.getTag())) {
+            name += ":" + command.getTag();
+        }
+        WebTarget webResource = getBaseResource().path("/images/" + name + "/get");
 
         LOGGER.trace("GET: {}", webResource);
         Response response = webResource.request().accept(MediaType.APPLICATION_JSON).get();
diff --git a/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java b/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java
index 81abfcd9a..a9ba8ac25 100644
--- a/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java
@@ -19,6 +19,10 @@ public void saveImage() throws Exception {
         InputStream image = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImageCmd("busybox").exec());
         assertThat(image.available(), greaterThan(0));
 
+        InputStream image2 = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImageCmd("busybox").withTag("latest").exec());
+        assertThat(image2.available(), greaterThan(0));
+
+
     }
 
 }

From 0180514dd515feadf5bf2b546f3ea61ee462d32d Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 29 Jan 2019 01:32:21 +0300
Subject: [PATCH 0878/1272] [maven-release-plugin] prepare release 3.1.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 68ed60d7d..7505c524f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.1</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.1.1</tag>
 	</scm>
 
 	<developers>

From 4eef5ed7171ef6657d93bf72d6560028bb2c3c93 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 29 Jan 2019 01:32:30 +0300
Subject: [PATCH 0879/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7505c524f..d13ae83e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.1</version>
+	<version>3.1.2-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.1.1</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 7b249adec97b16956cd13e94c5bb9f1bd70ef6c9 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 6 Feb 2019 14:31:37 +0300
Subject: [PATCH 0880/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f33d52b9..1c635aa69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Change Log
 ===
 
+## 3.1.1
+- Patch save image with tag
+- [api/healthcheck] startPeriod is now a long
+
+## 3.1.0 
+- Release
+
 ## 3.1.0-rc-8
 - Do awaitCompletion upon socket close exception
 - Fix `X-Registry-Auth` base64 encoding

From 9434b6e5357c6bf0fd635c801891f974e2a2e498 Mon Sep 17 00:00:00 2001
From: Matt Wright <mwright@quartethealth.com>
Date: Fri, 15 Feb 2019 15:14:23 -0500
Subject: [PATCH 0881/1272] Add support for `target` parameter in BuildImgCmd

---
 .../dockerjava/api/command/BuildImageCmd.java       | 11 +++++++++++
 .../dockerjava/core/command/BuildImageCmdImpl.java  | 13 +++++++++++++
 .../dockerjava/core/exec/BuildImageCmdExec.java     |  4 ++++
 .../github/dockerjava/jaxrs/BuildImageCmdExec.java  |  4 ++++
 4 files changed, 32 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 3545f116a..89d20f531 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -140,6 +140,12 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     @CheckForNull
     String getPlatform();
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_38}
+     */
+    @CheckForNull
+    String getTarget();
+
     // setters
 
     /**
@@ -213,6 +219,11 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
      */
     BuildImageCmd withPlatform(String platform);
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_38}
+     */
+    BuildImageCmd withTarget(String target);
+
     interface Exec extends DockerCmdAsyncExec<BuildImageCmd, BuildResponseItem> {
     }
 
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index 97be7d1c0..2bafce8c8 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -70,6 +70,8 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR
 
     private String platform;
 
+    private String target;
+
     public BuildImageCmdImpl(BuildImageCmd.Exec exec) {
         super(exec);
     }
@@ -191,6 +193,11 @@ public String getPlatform() {
         return platform;
     }
 
+    @Override
+    public String getTarget() {
+        return target;
+    }
+
     // getter lib specific
 
     @Override
@@ -389,6 +396,12 @@ public BuildImageCmd withPlatform(String platform) {
         return this;
     }
 
+    @Override
+    public BuildImageCmd withTarget(String target) {
+        this.target = target;
+        return this;
+    }
+
     @Override
     public void close() {
         super.close();
diff --git a/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
index d05be2b3c..1a8cd37e5 100644
--- a/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
@@ -113,6 +113,10 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
             webTarget = webTarget.queryParam("platform", command.getPlatform());
         }
 
+        if (command.getTarget() != null) {
+            webTarget = webTarget.queryParam("target", command.getTarget());
+        }
+
         LOGGER.trace("POST: {}", webTarget);
 
         InvocationBuilder builder = resourceWithOptionalAuthConfig(command, webTarget.request())
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index d1211c930..49d83eaf9 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -128,6 +128,10 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
             webTarget = webTarget.queryParam("platform", command.getPlatform());
         }
 
+        if (command.getTarget() != null) {
+            webTarget = webTarget.queryParam("target", command.getTarget());
+        }
+
         webTarget.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED);
         webTarget.property(ClientProperties.CHUNKED_ENCODING_SIZE, 1024 * 1024);
 

From 2cdefd90289c90db80fa70c9756bf94e5008fffb Mon Sep 17 00:00:00 2001
From: John Bergqvist <John.Bergqvist@diffblue.com>
Date: Mon, 18 Feb 2019 08:51:09 +0000
Subject: [PATCH 0882/1272] Add unit tests for
 netty.handler.FramedResponseStreamHandler These tests were written with the
 aid of Diffblue Cover.

---
 .../FramedResponseStreamHandlerTest.java      | 184 ++++++++++++++++++
 1 file changed, 184 insertions(+)
 create mode 100644 src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java

diff --git a/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java b/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java
new file mode 100644
index 000000000..7724b666a
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java
@@ -0,0 +1,184 @@
+package com.github.dockerjava.netty.handler;
+
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.netty.handler.FramedResponseStreamHandler;
+import java.io.Closeable;
+import java.util.ArrayList;
+import java.util.List;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class FramedResponseStreamHandlerTest {
+
+  public class MockedResponseHandler implements ResultCallback<Frame> {
+
+    public List<Frame> frames = new ArrayList<Frame>();
+    public List<Throwable> exceptions = new ArrayList<Throwable>();
+
+    @Override
+    public void close() {
+    }
+
+    @Override
+    public void onStart(Closeable closeable) {
+    }
+
+    @Override
+    public void onNext(Frame object) {
+      frames.add(object);
+    }
+
+    @Override
+    public void onError(Throwable throwable) {
+      exceptions.add(throwable);
+    }
+
+    @Override
+    public void onComplete() {
+    }
+  }
+
+
+  @Test
+  public void channelRead0emptyHeaderCount() throws Exception {
+
+    // Arrange
+    final MockedResponseHandler responseHandler = new MockedResponseHandler();
+    final FramedResponseStreamHandler objectUnderTest = new FramedResponseStreamHandler(responseHandler);
+    byte[] msg = {};
+
+    // Act
+    objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg));
+
+    // Assert result
+    assertTrue(responseHandler.frames.isEmpty());
+  }
+
+  @Test
+  public void channelRead0headerTooSmall() throws Exception {
+
+    // Arrange
+    final MockedResponseHandler responseHandler = new MockedResponseHandler();
+    final FramedResponseStreamHandler objectUnderTest = new FramedResponseStreamHandler(responseHandler);
+    byte[] msg = {0};
+
+    // Act
+    objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg));
+
+    // Assert result
+    assertTrue(responseHandler.frames.isEmpty());
+  }
+
+  @Test
+  public void channelRead0rawStream() throws Exception {
+
+    // Arrange
+    final MockedResponseHandler responseHandler = new MockedResponseHandler();
+    final FramedResponseStreamHandler objectUnderTest = new FramedResponseStreamHandler(responseHandler);
+    byte[] msg = {3, 0, 0, 0, 0, 0, 0, 0, 0};
+
+    // Act
+    objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg));
+
+    // Assert result
+    assertEquals(responseHandler.frames.get(0).toString(), "RAW: ");
+  }
+
+  @Test
+  public void channelRead0emptyNonRaw() throws Exception {
+
+    // Arrange
+    final MockedResponseHandler responseHandler = new MockedResponseHandler();
+    final FramedResponseStreamHandler objectUnderTest = new FramedResponseStreamHandler(responseHandler);
+    byte[] msg = {0, 0, 0, 0, 0, 0, 0, 0, 0};
+    
+    // Act
+    objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg));
+
+    // Assert result
+    assertTrue(responseHandler.frames.isEmpty());
+  }
+
+  @Test
+  public void channelRead0stdIn() throws Exception {
+
+    // Arrange
+    final MockedResponseHandler responseHandler = new MockedResponseHandler();
+    final FramedResponseStreamHandler objectUnderTest = new FramedResponseStreamHandler(responseHandler);
+    byte[] msg = {0, 0, 0, 0, 0, 0, 0, 1, 0};
+    
+    // Act
+    objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg));
+
+    // Assert result
+    assertEquals(responseHandler.frames.get(0).toString(), "STDIN: ");
+  }
+
+  @Test
+  public void channelRead0stdOut() throws Exception {
+
+    // Arrange
+    final MockedResponseHandler responseHandler = new MockedResponseHandler();
+    final FramedResponseStreamHandler objectUnderTest = new FramedResponseStreamHandler(responseHandler);
+    byte[] msg = {1, 0, 0, 0, 0, 0, 0, 1, 0};
+    
+    // Act
+    objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg));
+
+    // Assert result
+    assertEquals(responseHandler.frames.get(0).toString(), "STDOUT: ");
+  }
+
+  @Test
+  public void channelRead0stdErr() throws Exception {
+
+    // Arrange
+    final MockedResponseHandler responseHandler = new MockedResponseHandler();
+    final FramedResponseStreamHandler objectUnderTest = new FramedResponseStreamHandler(responseHandler);
+    byte[] msg = {2, 0, 0, 0, 0, 0, 0, 1, 0};
+    
+    // Act
+    objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg));
+
+    // Assert result
+    assertEquals(responseHandler.frames.get(0).toString(), "STDERR: ");
+  }
+
+  @Test
+  public void channelRead0largePayload() throws Exception {
+
+    // Arrange
+    final MockedResponseHandler responseHandler = new MockedResponseHandler();
+    final FramedResponseStreamHandler objectUnderTest = new FramedResponseStreamHandler(responseHandler);
+    byte[] msg = {1, 0, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 2, 0}; 
+    
+    // Act
+    objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg));
+
+    // Assert result
+    assertEquals(responseHandler.frames.get(0).toString(), "STDOUT: ");
+  }
+
+  @Test
+  public void exceptionCaught() throws Exception {
+
+    // Arrange
+    final MockedResponseHandler responseHandler = new MockedResponseHandler();
+    final FramedResponseStreamHandler objectUnderTest = new FramedResponseStreamHandler(responseHandler);
+    final Exception exception = new Exception();
+    final Throwable throwable = new Throwable();
+    throwable.initCause(exception);
+    
+    // Act
+    objectUnderTest.exceptionCaught(Mockito.mock(ChannelHandlerContext.class), throwable);
+
+    // Assert result
+    assertEquals(responseHandler.exceptions.get(0).getCause(), exception);
+  }
+}

From 89b80a969cdaec294bb6d14986cdcd5966e460da Mon Sep 17 00:00:00 2001
From: padas2 <supreeth.padavala@gmail.com>
Date: Wed, 20 Feb 2019 00:55:58 +0530
Subject: [PATCH 0883/1272] Feature/upgrade to latest junix socket dependency
 to 2.2.0 (#1159)

* Upgrading docker-java from 2.0.4 to 2.1.0

* Logged the changes in ChangeLog.md as well

* Added AFUNIXSocketException class which is missing in 2.1.0 version of junixsocket-common

* Adding whitespaces to appease the maven checkstyle plugin

* Removing AFUNIXSocketImpl and AFUNIXSocketException classes

* Update pom.xml
---
 pom.xml                                       |   2 +-
 .../newsclub/net/unix/AFUNIXSocketImpl.java   | 415 ------------------
 2 files changed, 1 insertion(+), 416 deletions(-)
 delete mode 100644 src/main/java/org/newsclub/net/unix/AFUNIXSocketImpl.java

diff --git a/pom.xml b/pom.xml
index d13ae83e7..37b44b412 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
 		<slf4j-api.version>1.7.25</slf4j-api.version>
 
 		<bouncycastle.version>1.60</bouncycastle.version>
-		<junixsocket.version>2.0.4</junixsocket.version>
+		<junixsocket.version>2.1.2</junixsocket.version>
 		<guava.version>19.0</guava.version>
 
 		<!-- test dependencies -->
diff --git a/src/main/java/org/newsclub/net/unix/AFUNIXSocketImpl.java b/src/main/java/org/newsclub/net/unix/AFUNIXSocketImpl.java
deleted file mode 100644
index 869d987f2..000000000
--- a/src/main/java/org/newsclub/net/unix/AFUNIXSocketImpl.java
+++ /dev/null
@@ -1,415 +0,0 @@
-// Modified version (see https://github.com/docker-java/docker-java/pull/697)
-/**
- * junixsocket
- *
- * Copyright (c) 2009,2014 Christian Kohlschütter
- *
- * The author licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.newsclub.net.unix;
-
-import java.io.FileDescriptor;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.net.SocketException;
-import java.net.SocketImpl;
-import java.net.SocketOptions;
-
-/**
- * The Java-part of the {@link AFUNIXSocket} implementation.
- *
- * @author Christian Kohlschütter
- */
-class AFUNIXSocketImpl extends SocketImpl {
-  private static final int SHUT_RD = 0;
-  private static final int SHUT_WR = 1;
-  private static final int SHUT_RD_WR = 2;
-
-  private String socketFile;
-  private boolean closed = false;
-  private boolean bound = false;
-  private boolean connected = false;
-
-  private boolean closedInputStream = false;
-  private boolean closedOutputStream = false;
-
-  private final AFUNIXInputStream in = new AFUNIXInputStream();
-  private final AFUNIXOutputStream out = new AFUNIXOutputStream();
-
-  AFUNIXSocketImpl() {
-    super();
-    this.fd = new FileDescriptor();
-  }
-
-  FileDescriptor getFD() {
-    return fd;
-  }
-
-  @Override
-  protected void accept(SocketImpl socket) throws IOException {
-    final AFUNIXSocketImpl si = (AFUNIXSocketImpl) socket;
-    NativeUnixSocket.accept(socketFile, fd, si.fd);
-    si.socketFile = socketFile;
-    si.connected = true;
-  }
-
-  @Override
-  protected int available() throws IOException {
-    return NativeUnixSocket.available(fd);
-  }
-
-  protected void bind(SocketAddress addr) throws IOException {
-    bind(0, addr);
-  }
-
-  protected void bind(int backlog, SocketAddress addr) throws IOException {
-    if (!(addr instanceof AFUNIXSocketAddress)) {
-      throw new SocketException("Cannot bind to this type of address: " + addr.getClass());
-    }
-    final AFUNIXSocketAddress socketAddress = (AFUNIXSocketAddress) addr;
-    socketFile = socketAddress.getSocketFile();
-    NativeUnixSocket.bind(socketFile, fd, backlog);
-    bound = true;
-    this.localport = socketAddress.getPort();
-  }
-
-  @Override
-  @SuppressWarnings("hiding")
-  protected void bind(InetAddress host, int port) throws IOException {
-    throw new SocketException("Cannot bind to this type of address: " + InetAddress.class);
-  }
-
-  private void checkClose() throws IOException {
-    //if (closedInputStream && closedOutputStream) {
-    // close();
-    //}
-  }
-
-  @Override
-  protected synchronized void close() throws IOException {
-    if (closed) {
-      return;
-    }
-    closed = true;
-    if (fd.valid()) {
-      NativeUnixSocket.shutdown(fd, SHUT_RD_WR);
-      NativeUnixSocket.close(fd);
-    }
-    if (bound) {
-      NativeUnixSocket.unlink(socketFile);
-    }
-    connected = false;
-  }
-
-  @Override
-  @SuppressWarnings("hiding")
-  protected void connect(String host, int port) throws IOException {
-    throw new SocketException("Cannot bind to this type of address: " + InetAddress.class);
-  }
-
-  @Override
-  @SuppressWarnings("hiding")
-  protected void connect(InetAddress address, int port) throws IOException {
-    throw new SocketException("Cannot bind to this type of address: " + InetAddress.class);
-  }
-
-  @Override
-  protected void connect(SocketAddress addr, int timeout) throws IOException {
-    if (!(addr instanceof AFUNIXSocketAddress)) {
-      throw new SocketException("Cannot bind to this type of address: " + addr.getClass());
-    }
-    final AFUNIXSocketAddress socketAddress = (AFUNIXSocketAddress) addr;
-    socketFile = socketAddress.getSocketFile();
-    NativeUnixSocket.connect(socketFile, fd);
-    this.address = socketAddress.getAddress();
-    this.port = socketAddress.getPort();
-    this.localport = 0;
-    this.connected = true;
-  }
-
-  @Override
-  protected void create(boolean stream) throws IOException {
-  }
-
-  @Override
-  protected InputStream getInputStream() throws IOException {
-    if (!connected && !bound) {
-      throw new IOException("Not connected/not bound");
-    }
-    return in;
-  }
-
-  @Override
-  protected OutputStream getOutputStream() throws IOException {
-    if (!connected && !bound) {
-      throw new IOException("Not connected/not bound");
-    }
-    return out;
-  }
-
-  @Override
-  protected void listen(int backlog) throws IOException {
-    NativeUnixSocket.listen(fd, backlog);
-  }
-
-  @Override
-  protected void sendUrgentData(int data) throws IOException {
-    NativeUnixSocket.write(fd, new byte[] {(byte) (data & 0xFF)}, 0, 1);
-  }
-
-  private final class AFUNIXInputStream extends InputStream {
-    private boolean streamClosed = false;
-
-    @Override
-    public int read(byte[] buf, int off, int len) throws IOException {
-      if (streamClosed) {
-        throw new IOException("This InputStream has already been closed.");
-      }
-      if (len == 0) {
-        return 0;
-      }
-      if (closed) {
-        return -1;
-      }
-      int maxRead = buf.length - off;
-      if (len > maxRead) {
-        len = maxRead;
-      }
-      try {
-        return NativeUnixSocket.read(fd, buf, off, len);
-      } catch (final IOException e) {
-        throw (IOException) new IOException(e.getMessage() + " at "
-            + AFUNIXSocketImpl.this.toString()).initCause(e);
-      }
-    }
-
-    @Override
-    public int read() throws IOException {
-      final byte[] buf1 = new byte[1];
-      final int numRead = read(buf1, 0, 1);
-      if (numRead <= 0) {
-        return -1;
-      } else {
-        return buf1[0] & 0xFF;
-      }
-    }
-
-    @Override
-    public void close() throws IOException {
-      if (streamClosed) {
-        return;
-      }
-      streamClosed = true;
-      if (fd.valid()) {
-        NativeUnixSocket.shutdown(fd, SHUT_RD);
-      }
-
-      closedInputStream = true;
-      checkClose();
-    }
-
-    @Override
-    public int available() throws IOException {
-      final int av = NativeUnixSocket.available(fd);
-      return av;
-    }
-  }
-
-  private final class AFUNIXOutputStream extends OutputStream {
-    private boolean streamClosed = false;
-
-    @Override
-    public void write(int oneByte) throws IOException {
-      final byte[] buf1 = new byte[] {(byte) oneByte};
-      write(buf1, 0, 1);
-    }
-
-    @Override
-    public void write(byte[] buf, int off, int len) throws IOException {
-      if (streamClosed) {
-        throw new AFUNIXSocketException("This OutputStream has already been closed.");
-      }
-      if (len > buf.length - off) {
-        throw new IndexOutOfBoundsException();
-      }
-      try {
-        while (len > 0 && !Thread.interrupted()) {
-          final int written = NativeUnixSocket.write(fd, buf, off, len);
-          if (written == -1) {
-            throw new IOException("Unspecific error while writing");
-          }
-          len -= written;
-          off += written;
-        }
-      } catch (final IOException e) {
-        throw (IOException) new IOException(e.getMessage() + " at "
-            + AFUNIXSocketImpl.this.toString()).initCause(e);
-      }
-    }
-
-    @Override
-    public void close() throws IOException {
-      if (streamClosed) {
-        return;
-      }
-      streamClosed = true;
-      if (fd.valid()) {
-        NativeUnixSocket.shutdown(fd, SHUT_WR);
-      }
-      closedOutputStream = true;
-      checkClose();
-    }
-  }
-
-  @Override
-  public String toString() {
-    return super.toString() + "[fd=" + fd + "; file=" + this.socketFile + "; connected="
-        + connected + "; bound=" + bound + "]";
-  }
-
-  private static int expectInteger(Object value) throws SocketException {
-    try {
-      return (Integer) value;
-    } catch (final ClassCastException e) {
-      throw new AFUNIXSocketException("Unsupported value: " + value, e);
-    } catch (final NullPointerException e) {
-      throw new AFUNIXSocketException("Value must not be null", e);
-    }
-  }
-
-  private static int expectBoolean(Object value) throws SocketException {
-    try {
-      return ((Boolean) value).booleanValue() ? 1 : 0;
-    } catch (final ClassCastException e) {
-      throw new AFUNIXSocketException("Unsupported value: " + value, e);
-    } catch (final NullPointerException e) {
-      throw new AFUNIXSocketException("Value must not be null", e);
-    }
-  }
-
-  @Override
-  public Object getOption(int optID) throws SocketException {
-    try {
-      switch (optID) {
-        case SocketOptions.SO_KEEPALIVE:
-        case SocketOptions.TCP_NODELAY:
-          return NativeUnixSocket.getSocketOptionInt(fd, optID) != 0 ? true : false;
-        case SocketOptions.SO_LINGER:
-        case SocketOptions.SO_TIMEOUT:
-        case SocketOptions.SO_RCVBUF:
-        case SocketOptions.SO_SNDBUF:
-          return NativeUnixSocket.getSocketOptionInt(fd, optID);
-        default:
-          throw new AFUNIXSocketException("Unsupported option: " + optID);
-      }
-    } catch (final AFUNIXSocketException e) {
-      throw e;
-    } catch (final Exception e) {
-      throw new AFUNIXSocketException("Error while getting option", e);
-    }
-  }
-
-  @Override
-  public void setOption(int optID, Object value) throws SocketException {
-    try {
-      switch (optID) {
-        case SocketOptions.SO_LINGER:
-
-          if (value instanceof Boolean) {
-            final boolean b = (Boolean) value;
-            if (b) {
-              throw new SocketException("Only accepting Boolean.FALSE here");
-            }
-            NativeUnixSocket.setSocketOptionInt(fd, optID, -1);
-            return;
-          }
-          NativeUnixSocket.setSocketOptionInt(fd, optID, expectInteger(value));
-          return;
-        case SocketOptions.SO_RCVBUF:
-        case SocketOptions.SO_SNDBUF:
-        case SocketOptions.SO_TIMEOUT:
-          NativeUnixSocket.setSocketOptionInt(fd, optID, expectInteger(value));
-          return;
-        case SocketOptions.SO_KEEPALIVE:
-        case SocketOptions.TCP_NODELAY:
-          NativeUnixSocket.setSocketOptionInt(fd, optID, expectBoolean(value));
-          return;
-        default:
-          throw new AFUNIXSocketException("Unsupported option: " + optID);
-      }
-    } catch (final AFUNIXSocketException e) {
-      throw e;
-    } catch (final Exception e) {
-      throw new AFUNIXSocketException("Error while setting option", e);
-    }
-  }
-
-  @Override
-  protected void shutdownInput() throws IOException {
-    if (!closed && fd.valid()) {
-      NativeUnixSocket.shutdown(fd, SHUT_RD);
-    }
-  }
-
-  @Override
-  protected void shutdownOutput() throws IOException {
-    if (!closed && fd.valid()) {
-      NativeUnixSocket.shutdown(fd, SHUT_WR);
-    }
-  }
-
-  /**
-   * Changes the behavior to be somewhat lenient with respect to the specification.
-   *
-   * In particular, we ignore calls to {@link Socket#getTcpNoDelay()} and
-   * {@link Socket#setTcpNoDelay(boolean)}.
-   */
-  static class Lenient extends AFUNIXSocketImpl {
-    Lenient() {
-      super();
-    }
-
-    @Override
-    public void setOption(int optID, Object value) throws SocketException {
-      try {
-        super.setOption(optID, value);
-      } catch (SocketException e) {
-        switch (optID) {
-          case SocketOptions.TCP_NODELAY:
-            return;
-          default:
-            throw e;
-        }
-      }
-    }
-
-    @Override
-    public Object getOption(int optID) throws SocketException {
-      try {
-        return super.getOption(optID);
-      } catch (SocketException e) {
-        switch (optID) {
-          case SocketOptions.TCP_NODELAY:
-          case SocketOptions.SO_KEEPALIVE:
-            return false;
-          default:
-            throw e;
-        }
-      }
-    }
-  }
-}

From ce113f37d784d8a727aa58acfb3c08d1873bc5ad Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 20 Feb 2019 18:14:41 +0300
Subject: [PATCH 0884/1272] Set 3 mb as limit for json responce. (#1162)

---
 .../com/github/dockerjava/netty/NettyInvocationBuilder.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java b/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
index 39ea98c51..c57f885be 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
@@ -151,7 +151,7 @@ public <T> void get(TypeReference<T> typeReference, ResultCallback<T> resultCall
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
 
         channel.pipeline().addLast(responseHandler);
-        channel.pipeline().addLast(new JsonObjectDecoder());
+        channel.pipeline().addLast(new JsonObjectDecoder(3 * 1024 * 1024));
         channel.pipeline().addLast(jsonResponseHandler);
 
         sendRequest(requestProvider, channel);
@@ -300,7 +300,7 @@ public <T> void post(final Object entity, TypeReference<T> typeReference, final
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
 
         channel.pipeline().addLast(responseHandler);
-        channel.pipeline().addLast(new JsonObjectDecoder());
+        channel.pipeline().addLast(new JsonObjectDecoder(3 * 1024 * 1024));
         channel.pipeline().addLast(jsonResponseHandler);
 
         sendRequest(requestProvider, channel);
@@ -408,7 +408,7 @@ public <T> void post(TypeReference<T> typeReference, ResultCallback<T> resultCal
 
         channel.pipeline().addLast(new ChunkedWriteHandler());
         channel.pipeline().addLast(responseHandler);
-        channel.pipeline().addLast(new JsonObjectDecoder());
+        channel.pipeline().addLast(new JsonObjectDecoder(3 * 1024 * 1024));
         channel.pipeline().addLast(jsonResponseHandler);
 
         postChunkedStreamRequest(requestProvider, channel, body);

From a856b67f80533936a238485e9cbcb638893b5e96 Mon Sep 17 00:00:00 2001
From: Michiel Leegwater <mleegwt@users.noreply.github.com>
Date: Wed, 27 Feb 2019 23:32:33 +0100
Subject: [PATCH 0885/1272] Updating Jackson due to CVEs

Jackson data bind has CVE-2018-1000873, CVE-2018-19360, CVE-2018-19361, CVE-2018-19362 reported on the library. These are fixed in version 2.9.8
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 37b44b412..855d0344c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
 		<jdk.target>1.7</jdk.target>
 
 		<jersey.version>2.27</jersey.version>
-		<jackson-jaxrs.version>2.9.7</jackson-jaxrs.version>
+		<jackson-jaxrs.version>2.9.8</jackson-jaxrs.version>
 		<httpclient.version>4.5.6</httpclient.version><!-- 4.5.1-4.5.2 broken -->
 		<commons-compress.version>1.18</commons-compress.version>
 		<commons-codec.version>1.11</commons-codec.version>

From bacbbf621df700b632a038772c8304c5a5354005 Mon Sep 17 00:00:00 2001
From: Valerij Fredriksen <freva@users.noreply.github.com>
Date: Fri, 8 Mar 2019 12:17:24 +0100
Subject: [PATCH 0886/1272] Make StatsConfig public

---
 src/main/java/com/github/dockerjava/api/model/StatsConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/StatsConfig.java b/src/main/java/com/github/dockerjava/api/model/StatsConfig.java
index a732c78fa..19b95a7ff 100644
--- a/src/main/java/com/github/dockerjava/api/model/StatsConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/StatsConfig.java
@@ -5,7 +5,7 @@
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
 
-class StatsConfig implements Serializable {
+public class StatsConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("active_anon")

From 13d53057902afce60a3d12c5e641fcbc2e5ff907 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Kov=C3=A1=C5=99?= <kowy@users.noreply.github.com>
Date: Sat, 9 Mar 2019 05:19:16 +0100
Subject: [PATCH 0887/1272] Add prune operations (#1164)

* add Prune operations

* repair method name in DockerClient

* make source code Checkstyle compliant

* make source code Checkstyle compliant

* add URL escape to filters parameter
---
 .../github/dockerjava/api/DockerClient.java   |   9 ++
 .../api/command/DockerCmdExecFactory.java     |   7 ++
 .../dockerjava/api/command/PruneCmd.java      |  54 ++++++++++
 .../dockerjava/api/model/PruneResponse.java   |  65 +++++++++++
 .../dockerjava/api/model/PruneType.java       |   9 ++
 .../core/AbstractDockerCmdExecFactory.java    |   7 ++
 .../dockerjava/core/DockerClientImpl.java     |   8 ++
 .../dockerjava/core/command/PruneCmdImpl.java | 102 ++++++++++++++++++
 .../dockerjava/core/exec/PruneCmdExec.java    |  40 +++++++
 .../dockerjava/core/util/FiltersBuilder.java  |  31 ++++++
 .../jaxrs/JerseyDockerCmdExecFactory.java     |   6 ++
 .../github/dockerjava/jaxrs/PruneCmdExec.java |  41 +++++++
 .../core/TestDockerCmdExecFactory.java        |   6 ++
 13 files changed, 385 insertions(+)
 create mode 100644 src/main/java/com/github/dockerjava/api/command/PruneCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/PruneResponse.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/PruneType.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/exec/PruneCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index 24ed54dcf..ddc23dca8 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -42,6 +42,7 @@
 import com.github.dockerjava.api.command.LogSwarmObjectCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.command.PingCmd;
+import com.github.dockerjava.api.command.PruneCmd;
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.command.PushImageCmd;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
@@ -68,6 +69,7 @@
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Identifier;
+import com.github.dockerjava.api.model.PruneType;
 import com.github.dockerjava.api.model.ServiceSpec;
 import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.core.RemoteApiVersion;
@@ -391,6 +393,13 @@ public interface DockerClient extends Closeable {
      */
     LogSwarmObjectCmd logTaskCmd(String taskId);
 
+    /**
+     * Command to delete unused containers/images/networks/volumes
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_25}
+     */
+    PruneCmd pruneCmd(PruneType pruneType);
+
     @Override
     void close() throws IOException;
 
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index 3392ce372..f9c142255 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -207,6 +207,13 @@ public interface DockerCmdExecFactory extends Closeable {
      */
     ListTasksCmd.Exec listTasksCmdExec();
 
+    /**
+     * Delete unused content (containers, images, volumes, networks, build relicts)
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_25}
+     */
+    PruneCmd.Exec pruneCmdExec();
+
     @Override
     void close() throws IOException;
 
diff --git a/src/main/java/com/github/dockerjava/api/command/PruneCmd.java b/src/main/java/com/github/dockerjava/api/command/PruneCmd.java
new file mode 100644
index 000000000..7a86434aa
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/PruneCmd.java
@@ -0,0 +1,54 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.model.PruneResponse;
+import com.github.dockerjava.api.model.PruneType;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Delete unused content (containers, images, volumes, networks, build relicts)
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_25}
+ */
+public interface PruneCmd extends SyncDockerCmd<PruneResponse> {
+
+    @Nonnull
+    PruneType getPruneType();
+
+    @Nonnull
+    String getApiPath();
+
+    @CheckForNull
+    Map<String, List<String>> getFilters();
+
+    PruneCmd withPruneType(final PruneType pruneType);
+    /**
+     * Prune containers created before this timestamp
+     * Meaningful only for CONTAINERS and IMAGES prune type
+     * @param until Can be Unix timestamps, date formatted timestamps,
+     *              or Go duration strings (e.g. 10m, 1h30m) computed relative to the daemon machine’s time.
+     */
+    PruneCmd withUntilFilter(String until);
+
+    /**
+     * When set to true, prune only unused and untagged images. When set to false, all unused images are pruned.
+     * Meaningful only for IMAGES prune type
+     */
+    PruneCmd withDangling(Boolean dangling);
+
+    /**
+     * Prune containers with the specified labels
+     */
+    PruneCmd withLabelFilter(String... label);
+
+    @Override
+    PruneResponse exec();
+
+    interface Exec extends DockerCmdSyncExec<PruneCmd, PruneResponse> {
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/PruneResponse.java b/src/main/java/com/github/dockerjava/api/model/PruneResponse.java
new file mode 100644
index 000000000..d6653cdc6
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/PruneResponse.java
@@ -0,0 +1,65 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+import java.io.Serializable;
+
+/**
+ * Delete unused content (containers, images, volumes, networks, build relicts)
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class PruneResponse implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("SpaceReclaimed")
+    private Long spaceReclaimed;
+
+    /**
+     * Default constructor for the deserialization.
+     */
+    public PruneResponse() {
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param spaceReclaimed     Space reclaimed after purification
+     */
+    public PruneResponse(Long spaceReclaimed) {
+        this.spaceReclaimed = spaceReclaimed;
+    }
+
+    /**
+     * Disk space reclaimed in bytes
+     */
+    public Long getSpaceReclaimed() {
+        return spaceReclaimed;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("PruneResponse {");
+        sb.append(" spaceReclaimed: ").append(getSpaceReclaimed());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o instanceof Ulimit) {
+            Ulimit other = (Ulimit) o;
+            return new EqualsBuilder().append(spaceReclaimed, other.getName()).isEquals();
+        } else {
+            return super.equals(o);
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(spaceReclaimed).toHashCode();
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/PruneType.java b/src/main/java/com/github/dockerjava/api/model/PruneType.java
new file mode 100644
index 000000000..10d8704fd
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/PruneType.java
@@ -0,0 +1,9 @@
+package com.github.dockerjava.api.model;
+
+public enum PruneType {
+    BUILD,
+    CONTAINERS,
+    IMAGES,
+    NETWORKS,
+    VOLUMES
+}
diff --git a/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
index 91347de2b..c822b4cc2 100644
--- a/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
@@ -44,6 +44,7 @@
 import com.github.dockerjava.api.command.LogSwarmObjectCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.command.PingCmd;
+import com.github.dockerjava.api.command.PruneCmd;
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.command.PushImageCmd;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
@@ -110,6 +111,7 @@
 import com.github.dockerjava.core.exec.LogContainerCmdExec;
 import com.github.dockerjava.core.exec.PauseContainerCmdExec;
 import com.github.dockerjava.core.exec.PingCmdExec;
+import com.github.dockerjava.core.exec.PruneCmdExec;
 import com.github.dockerjava.core.exec.PullImageCmdExec;
 import com.github.dockerjava.core.exec.PushImageCmdExec;
 import com.github.dockerjava.core.exec.RemoveContainerCmdExec;
@@ -492,5 +494,10 @@ public LogSwarmObjectCmd.Exec logSwarmObjectExec(String endpoint) {
         return new LogSwarmObjectExec(getBaseResource(), getDockerClientConfig(), endpoint);
     }
 
+    @Override
+    public PruneCmd.Exec pruneCmdExec() {
+        return new PruneCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     protected abstract WebTarget getBaseResource();
 }
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index edc634cb9..edf3bfc29 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -44,6 +44,7 @@
 import com.github.dockerjava.api.command.LogSwarmObjectCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.command.PingCmd;
+import com.github.dockerjava.api.command.PruneCmd;
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.command.PushImageCmd;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
@@ -69,6 +70,7 @@
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Identifier;
+import com.github.dockerjava.api.model.PruneType;
 import com.github.dockerjava.api.model.ServiceSpec;
 import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.core.command.AttachContainerCmdImpl;
@@ -113,6 +115,7 @@
 import com.github.dockerjava.core.command.LogSwarmObjectImpl;
 import com.github.dockerjava.core.command.PauseContainerCmdImpl;
 import com.github.dockerjava.core.command.PingCmdImpl;
+import com.github.dockerjava.core.command.PruneCmdImpl;
 import com.github.dockerjava.core.command.PullImageCmdImpl;
 import com.github.dockerjava.core.command.PushImageCmdImpl;
 import com.github.dockerjava.core.command.RemoveContainerCmdImpl;
@@ -579,6 +582,11 @@ public LogSwarmObjectCmd logTaskCmd(String taskId) {
         return new LogSwarmObjectImpl(getDockerCmdExecFactory().logSwarmObjectExec("tasks"), taskId);
     }
 
+    @Override
+    public PruneCmd pruneCmd(PruneType pruneType) {
+        return new PruneCmdImpl(getDockerCmdExecFactory().pruneCmdExec(), pruneType);
+    }
+
     @Override
     public ListTasksCmd listTasksCmd() {
         return new ListTasksCmdImpl(getDockerCmdExecFactory().listTasksCmdExec());
diff --git a/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java
new file mode 100644
index 000000000..a191099ed
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java
@@ -0,0 +1,102 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.PruneCmd;
+import com.github.dockerjava.api.model.PruneResponse;
+import com.github.dockerjava.api.model.PruneType;
+import com.github.dockerjava.core.util.FiltersBuilder;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+import java.util.List;
+import java.util.Map;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Delete unused content (containers, images, volumes, networks, build relicts)
+ */
+public class PruneCmdImpl extends AbstrDockerCmd<PruneCmd, PruneResponse> implements PruneCmd {
+
+    private static final String BUILD_API_PATH = "/build/prune";
+    private static final String CONTAINERS_API_PATH = "/containers/prune";
+    private static final String IMAGES_API_PATH = "/images/prune";
+    private static final String VOLUMES_API_PATH = "/volumes/prune";
+    private static final String NETWORKS_API_PATH = "/networks/prune";
+
+    private FiltersBuilder filters = new FiltersBuilder();
+    private PruneType pruneType;
+
+    public PruneCmdImpl(Exec exec, PruneType pruneType) {
+        super(exec);
+        this.pruneType = pruneType;
+    }
+
+    @Nonnull
+    @Override
+    public PruneType getPruneType() {
+        return pruneType;
+    }
+
+    @Nonnull
+    @Override
+    public String getApiPath() {
+        String apiPath;
+        switch (getPruneType()) {
+            case BUILD:
+                apiPath = BUILD_API_PATH;
+                break;
+            case IMAGES:
+                apiPath = IMAGES_API_PATH;
+                break;
+            case NETWORKS:
+                apiPath = NETWORKS_API_PATH;
+                break;
+            case VOLUMES:
+                apiPath = VOLUMES_API_PATH;
+                break;
+            default:
+                apiPath = CONTAINERS_API_PATH;
+                break;
+        }
+        return apiPath;
+    }
+
+    @CheckForNull
+    @Override
+    public Map<String, List<String>> getFilters() {
+        return filters.build();
+    }
+
+    @Override
+    public PruneCmd withPruneType(final PruneType pruneType) {
+        checkNotNull(pruneType, "pruneType has not been specified");
+        this.pruneType = pruneType;
+        return this;
+    }
+
+    @Override
+    public PruneCmd withDangling(Boolean dangling) {
+        checkNotNull(dangling, "dangling has not been specified");
+        filters.withFilter("dangling", dangling ? "1" : "0");
+        return this;
+    }
+
+    @Override
+    public PruneCmd withUntilFilter(final String until) {
+        checkNotNull(until, "until has not been specified");
+        filters.withUntil(until);
+        return this;
+    }
+
+    @Override
+    public PruneCmd withLabelFilter(final String... labels) {
+        checkNotNull(labels, "labels have not been specified");
+        filters.withLabels(labels);
+        return this;
+    }
+
+    @Override
+    public PruneResponse exec() {
+        return super.exec();
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/exec/PruneCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/PruneCmdExec.java
new file mode 100644
index 000000000..0b8832bcb
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/exec/PruneCmdExec.java
@@ -0,0 +1,40 @@
+package com.github.dockerjava.core.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.PruneCmd;
+import com.github.dockerjava.api.model.PruneResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
+import com.github.dockerjava.core.util.FiltersEncoder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PruneCmdExec extends AbstrSyncDockerCmdExec<PruneCmd, PruneResponse> implements PruneCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PruneCmdExec.class);
+
+
+    public PruneCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected PruneResponse execute(PruneCmd command) {
+        WebTarget webTarget = getBaseResource().path(command.getApiPath());
+
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
+            webTarget = webTarget.queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
+        }
+
+        LOGGER.trace("POST: {}", webTarget);
+
+        PruneResponse response = webTarget.request().accept(MediaType.APPLICATION_JSON)
+                .post(null, new TypeReference<PruneResponse>() { });
+
+        LOGGER.trace("Response: {}", response);
+
+        return response;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java b/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
index 0c414f983..d942e59e0 100644
--- a/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
+++ b/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.core.util;
 
+import com.google.common.base.Strings;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -7,6 +9,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.regex.Pattern;
 
 /**
  * Representation of Docker filters.
@@ -16,6 +19,14 @@
  */
 public class FiltersBuilder {
 
+    private static final Pattern UNTIL_TIMESTAMP_PATTERN =
+            Pattern.compile("^\\d{1,10}$");
+    private static final Pattern UNTIL_DATETIME_PATTERN =
+            Pattern.compile("^([0-9]+)-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])([Tt]([01][0-9]|2[0-3]):([0-5][0-9]):"
+                          + "([0-5][0-9]|60)(\\.[0-9]+)?)?(([Zz])|([\\+|\\-]([01][0-9]|2[0-3]):[0-5][0-9]))?$");
+    private static final Pattern UNTIL_GO_PATTERN =
+            Pattern.compile("^([1-9][0-9]*h)?([1-9][0-9]*m)?([1-9][0-9]*s)?$");
+
     private Map<String, List<String>> filters = new HashMap<String, List<String>>();
 
     public FiltersBuilder() {
@@ -75,6 +86,14 @@ public FiltersBuilder withLabels(Map<String, String> labels) {
         return this;
     }
 
+    public FiltersBuilder withUntil(String until) throws NumberFormatException {
+        if (!isValidUntil(until)) {
+            throw new NumberFormatException("Not valid format of 'until': " + until);
+        }
+
+        return withFilter("until", until);
+    }
+
     private static List<String> labelsMapToList(Map<String, String> labels) {
         List<String> result = new ArrayList<String>();
         for (Entry<String, String> entry : labels.entrySet()) {
@@ -87,6 +106,18 @@ private static List<String> labelsMapToList(Map<String, String> labels) {
         return result;
     }
 
+    private boolean isValidUntil(String until) {
+        if (UNTIL_DATETIME_PATTERN.matcher(until).matches()) {
+            return true;
+        } else if (!Strings.isNullOrEmpty(until) && UNTIL_GO_PATTERN.matcher(until).matches()) {
+            return true;
+        } else if (UNTIL_TIMESTAMP_PATTERN.matcher(until).matches()) {
+            return true;
+        }
+
+        return false;
+    }
+
     // CHECKSTYLE:OFF
     @Override
     public boolean equals(Object o) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
index 5712163d1..1582d5313 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -47,6 +47,7 @@
 import com.github.dockerjava.api.command.LogSwarmObjectCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.command.PingCmd;
+import com.github.dockerjava.api.command.PruneCmd;
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.command.PushImageCmd;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
@@ -658,6 +659,11 @@ public ListTasksCmd.Exec listTasksCmdExec() {
         return new ListTasksCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public PruneCmd.Exec pruneCmdExec() {
+        return new PruneCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public void close() throws IOException {
         checkNotNull(client, "Factory not initialized. You probably forgot to call init()!");
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java
new file mode 100644
index 000000000..324bc8201
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java
@@ -0,0 +1,41 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.command.PruneCmd;
+import com.github.dockerjava.api.model.PruneResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.util.FiltersEncoder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
+
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
+public class PruneCmdExec extends AbstrSyncDockerCmdExec<PruneCmd, PruneResponse> implements PruneCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PruneCmdExec.class);
+
+    public PruneCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected PruneResponse execute(PruneCmd command) {
+        WebTarget webTarget = getBaseResource().path(command.getApiPath());
+
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
+            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+        }
+
+        LOGGER.trace("POST: {}", webTarget);
+
+        PruneResponse response = webTarget.request().accept(MediaType.APPLICATION_JSON)
+                .post(null, new GenericType<PruneResponse>() { });
+        LOGGER.trace("Response: {}", response);
+
+        return response;
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index e2986ef69..a3c96e54d 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -49,6 +49,7 @@
 import com.github.dockerjava.api.command.LogSwarmObjectCmd;
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.command.PingCmd;
+import com.github.dockerjava.api.command.PruneCmd;
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.command.PushImageCmd;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
@@ -526,6 +527,11 @@ public ListTasksCmd.Exec listTasksCmdExec() {
         return delegate.listTasksCmdExec();
     }
 
+    @Override
+    public PruneCmd.Exec pruneCmdExec() {
+        return delegate.pruneCmdExec();
+    }
+
     public List<String> getContainerNames() {
         return new ArrayList<String>(containerNames);
     }

From 2f83759c6850ae219ff2261bccfa03172ec870f2 Mon Sep 17 00:00:00 2001
From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Tue, 19 Mar 2019 22:10:44 +0100
Subject: [PATCH 0888/1272] BuildImageCmdImpl: Fix an exception message

The exception is thrown is if "dockerFile" is not a file, not if it is
not a directory.
---
 .../com/github/dockerjava/core/command/BuildImageCmdImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index 2bafce8c8..0384ba145 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -327,7 +327,7 @@ public BuildImageCmdImpl withDockerfile(File dockerfile) {
             throw new IllegalArgumentException("Dockerfile does not exist");
         }
         if (!dockerfile.isFile()) {
-            throw new IllegalArgumentException("Not a directory");
+            throw new IllegalArgumentException("Dockerfile is not a file");
         }
 
         if (baseDirectory == null) {

From 8e2150a9d8880e98b2ec3e729fc191e336a124b2 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 20 Mar 2019 12:26:04 +0100
Subject: [PATCH 0889/1272] Remove `JacksonJaxbJsonProvider` from
 `FiltersEncoder`

To avoid a dependency on JAX-RS, `JacksonJaxbJsonProvider` should not be used
where a standard `ObjectMapper` instance is enough.
---
 .../java/com/github/dockerjava/core/util/FiltersEncoder.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java b/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
index fd4c0d5ab..7b1e34f74 100644
--- a/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
+++ b/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
@@ -3,11 +3,8 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.ws.rs.core.MediaType;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
 
 /**
  * JSON Encoder for docker filters.
@@ -19,7 +16,7 @@ public class FiltersEncoder {
     private FiltersEncoder() {
     }
 
-    private static final ObjectMapper MAPPER = new JacksonJaxbJsonProvider().locateMapper(Map.class, MediaType.APPLICATION_JSON_TYPE);
+    private static final ObjectMapper MAPPER = new ObjectMapper();
 
     public static String jsonEncode(Map<String, List<String>> mapStringListString) {
         try {

From 4b3d908915803f2a12bd9809a2ec1b2896a07e61 Mon Sep 17 00:00:00 2001
From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Wed, 20 Mar 2019 15:09:24 +0100
Subject: [PATCH 0890/1272] ResponseStatusExceptionFilter: Remove a "throws"
 declaration

IOException is never thrown in getBodyAsMessage().
---
 .../dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
index 895e900cd..00eb953f8 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
@@ -55,7 +55,7 @@ public void filter(ClientRequestContext requestContext, ClientResponseContext re
         }
     }
 
-    private String getBodyAsMessage(ClientResponseContext responseContext) throws IOException {
+    private String getBodyAsMessage(ClientResponseContext responseContext) {
         if (responseContext.hasEntity()) {
             try (InputStream entityStream = responseContext.getEntityStream()) {
                 Charset charset = null;

From 32b4db656a428fa6cd1f5b64e124954e9d187130 Mon Sep 17 00:00:00 2001
From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Wed, 20 Mar 2019 15:10:55 +0100
Subject: [PATCH 0891/1272] ResponseStatusExceptionFilter: Unwrap a JSON
 message

For JSON messages like

{"message":"Cannot locate specified Dockerfile: /path/to/Dockerfile"}

unwrap the message to make the exception message read nicer.
---
 .../filter/ResponseStatusExceptionFilter.java     | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
index 00eb953f8..6c2476291 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
@@ -11,6 +11,9 @@
 
 import org.apache.commons.io.IOUtils;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import com.github.dockerjava.api.exception.BadRequestException;
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.DockerException;
@@ -73,7 +76,17 @@ private String getBodyAsMessage(ClientResponseContext responseContext) {
                     charset = Charset.defaultCharset();
                 }
 
-                return IOUtils.toString(entityStream, charset);
+                String message = IOUtils.toString(entityStream, charset);
+
+                if (MediaType.APPLICATION_JSON_TYPE.equals(mediaType)) {
+                    ObjectMapper mapper = new ObjectMapper();
+                    JsonNode node = mapper.readTree(entityStream).get("message");
+                    if (node != null) {
+                        message = node.textValue();
+                    }
+                }
+
+                return message;
             } catch (Exception ignored) { }
         }
         return null;

From 2769032dc4626b5e8f7c0843655108c767e05126 Mon Sep 17 00:00:00 2001
From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Wed, 20 Mar 2019 19:18:36 +0100
Subject: [PATCH 0892/1272] LoadImageCmdIT: Trivially fix a typo in a comment

---
 src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java b/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java
index 1660773c3..5734163f9 100644
--- a/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java
@@ -41,7 +41,7 @@ public void loadImageFromTar() throws Exception {
             dockerRule.getClient().loadImageCmd(uploadStream).exec();
         }
 
-        //swarm needs some time to refelct new images
+        //swarm needs some time to reflect new images
         synchronized (this) {
             wait(5000);
         }

From 235e91a66696fabd5dfb407eed27fc4679b1e49c Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 24 Mar 2019 17:55:16 +0300
Subject: [PATCH 0893/1272] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 855d0344c..ef354cda0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
 		<slf4j-api.version>1.7.25</slf4j-api.version>
 
 		<bouncycastle.version>1.60</bouncycastle.version>
-		<junixsocket.version>2.1.2</junixsocket.version>
+		<junixsocket.version>2.2.0</junixsocket.version>
 		<guava.version>19.0</guava.version>
 
 		<!-- test dependencies -->

From c8c8e9a5f82d073887db889195489077bc25b3aa Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 25 Mar 2019 17:46:59 +0300
Subject: [PATCH 0894/1272] Update CHANGELOG.md

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c635aa69..96a1b9d6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,17 @@
 Change Log
 ===
 
+
+## 3.1.2
+- update unix-socket to 2.2.0
+- Remove `JacksonJaxbJsonProvider` from `FiltersEncoder`
+- BuildImageCmdImpl: Fix an exception message
+- Add support for target parameter in BuildImgCmd
+- Add prune operations
+- Updating Jackson due to CVEs
+- Make StatsConfig public
+- Set 3 mb as limit for json responce. 
+
 ## 3.1.1
 - Patch save image with tag
 - [api/healthcheck] startPeriod is now a long

From d01c3ebfc67f4549183a3c4386a81d6ab0e8f291 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 25 Mar 2019 17:48:55 +0300
Subject: [PATCH 0895/1272] [maven-release-plugin] prepare release 3.1.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ef354cda0..aa1e86e4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.2-SNAPSHOT</version>
+	<version>3.1.2</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.1.2</tag>
 	</scm>
 
 	<developers>

From c5c89327108abdc50aa41d7711d4743b8bac75fe Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 25 Mar 2019 17:49:04 +0300
Subject: [PATCH 0896/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index aa1e86e4d..1d1106115 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.2</version>
+	<version>3.1.3-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.1.2</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 47628ffd198ba178164da5c761954c589cf59fa4 Mon Sep 17 00:00:00 2001
From: Roni1993 <roman.weintraub@googlemail.com>
Date: Tue, 11 Jun 2019 17:01:45 +0200
Subject: [PATCH 0897/1272] Provide Exception message for wrong Schema

When a user provides a schema in the RespositoryName he receives the InvalidRepositoryNameException without an meaningful explanation. This leads to confusion. I had to look up the source to understand why this exception was thrown.
---
 src/main/java/com/github/dockerjava/core/NameParser.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/NameParser.java b/src/main/java/com/github/dockerjava/core/NameParser.java
index c592684be..ffadb6656 100644
--- a/src/main/java/com/github/dockerjava/core/NameParser.java
+++ b/src/main/java/com/github/dockerjava/core/NameParser.java
@@ -100,8 +100,7 @@ public static void validateRepoName(String name) {
 
     public static HostnameReposName resolveRepositoryName(String reposName) {
         if (reposName.contains("://")) {
-            // It cannot contain a scheme!
-            throw new InvalidRepositoryNameException();
+            throw new InvalidRepositoryNameException("RepositoryName shouldn't contain a scheme");
         }
 
         String[] nameParts = reposName.split("/", 2);

From 4de004722a72f589d4eac1357da0650cada3622b Mon Sep 17 00:00:00 2001
From: Mark Howard <mark.howard@form3.tech>
Date: Thu, 13 Jun 2019 15:55:55 +0100
Subject: [PATCH 0898/1272] remove duplicate jackson json provider registration

---
 .../com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
index 1582d5313..2c7a14c09 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -155,7 +155,6 @@ public void init(DockerClientConfig dockerClientConfig) {
         }
         clientConfig.register(ResponseStatusExceptionFilter.class);
         clientConfig.register(JsonClientFilter.class);
-        clientConfig.register(JacksonJsonProvider.class);
         RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
 
         ObjectMapper objectMapper = new ObjectMapper();

From 5cc47d98399f9d9bdccb6289bc924efa7b133a9b Mon Sep 17 00:00:00 2001
From: Pedro Cardoso <pedro.cardoso@feedzai.com>
Date: Tue, 18 Jun 2019 11:11:28 +0100
Subject: [PATCH 0899/1272] Reverts create container cmd regression.

Summary:
 - Adds Binds, Links, Network Mode, Port Bindings, Priviliged,
 VolumesFrom, PublishAllPorts, ExtraHosts related methods to
 CreateContainerCmd interface and related interface.

 This was done so that the test-containers project can bump it's
 docker-java dependency for support to the latest docker version.
 See https://github.com/testcontainers/testcontainers-java/pull/1340 for
 more.
---
 .../api/command/CreateContainerCmd.java       | 114 ++++++++++++++
 .../core/command/CreateContainerCmdImpl.java  | 147 +++++++++++++++++-
 2 files changed, 260 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 4fa5dd2e2..811413ac3 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -3,10 +3,15 @@
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.HealthCheck;
 import com.github.dockerjava.api.model.HostConfig;
+import com.github.dockerjava.api.model.Link;
+import com.github.dockerjava.api.model.PortBinding;
+import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.Volume;
+import com.github.dockerjava.api.model.VolumesFrom;
 
 import javax.annotation.CheckForNull;
 import java.util.List;
@@ -29,6 +34,16 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     List<String> getAliases();
 
+    @Deprecated
+    @CheckForNull
+    Bind[] getBinds();
+
+    @Deprecated
+    CreateContainerCmd withBinds(Bind... binds);
+
+    @Deprecated
+    CreateContainerCmd withBinds(List<Bind> binds);
+
     /**
      * Add network-scoped alias for the container
      *
@@ -111,6 +126,22 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     CreateContainerCmd withIpv4Address(String ipv4Address);
 
+    @Deprecated
+    @CheckForNull
+    Link[] getLinks();
+
+    /**
+     * Add link to another container.
+     */
+    @Deprecated
+    CreateContainerCmd withLinks(Link... links);
+
+    /**
+     * Add link to another container.
+     */
+    @Deprecated
+    CreateContainerCmd withLinks(List<Link> links);
+
     @CheckForNull
     String getIpv6Address();
 
@@ -129,6 +160,49 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     String getName();
 
+    @Deprecated
+    @CheckForNull
+    String getNetworkMode();
+
+    /**
+     * Set the Network mode for the container
+     * <ul>
+     * <li>'bridge': creates a new network stack for the container on the docker bridge</li>
+     * <li>'none': no networking for this container</li>
+     * <li>'container:<name|id>': reuses another container network stack</li>
+     * <li>'host': use the host network stack inside the container. Note: the host mode gives the container full access to local system
+     * services such as D-bus and is therefore considered insecure.</li>
+     * </ul>
+     */
+    @Deprecated
+    CreateContainerCmd withNetworkMode(String networkMode);
+
+    @Deprecated
+    @CheckForNull
+    Ports getPortBindings();
+
+    /**
+     * Add one or more {@link PortBinding}s. This corresponds to the <code>--publish</code> (<code>-p</code>) option of the
+     * <code>docker run</code> CLI command.
+     */
+    @Deprecated
+    CreateContainerCmd withPortBindings(PortBinding... portBindings);
+
+    /**
+     * Add one or more {@link PortBinding}s. This corresponds to the <code>--publish</code> (<code>-p</code>) option of the
+     * <code>docker run</code> CLI command.
+     */
+    @Deprecated
+    CreateContainerCmd withPortBindings(List<PortBinding> portBindings);
+
+    /**
+     * Add the port bindings that are contained in the given {@link Ports} object.
+     *
+     * @see #withPortBindings(PortBinding...)
+     */
+    @Deprecated
+    CreateContainerCmd withPortBindings(Ports portBindings);
+
     CreateContainerCmd withName(String name);
 
     @CheckForNull
@@ -138,6 +212,13 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     CreateContainerCmd withPortSpecs(List<String> portSpecs);
 
+    @Deprecated
+    @CheckForNull
+    Boolean getPrivileged();
+
+    @Deprecated
+    CreateContainerCmd withPrivileged(Boolean privileged);
+
     @CheckForNull
     String getUser();
 
@@ -150,6 +231,16 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     CreateContainerCmd withVolumes(List<Volume> volumes);
 
+    @Deprecated
+    @CheckForNull
+    VolumesFrom[] getVolumesFrom();
+
+    @Deprecated
+    CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom);
+
+    @Deprecated
+    CreateContainerCmd withVolumesFrom(List<VolumesFrom> volumesFrom);
+
     @CheckForNull
     String getWorkingDir();
 
@@ -190,6 +281,29 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     CreateContainerCmd withTty(Boolean tty);
 
+    @Deprecated
+    @CheckForNull
+    Boolean getPublishAllPorts();
+
+    @Deprecated
+    CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts);
+
+    @CheckForNull
+    @Deprecated
+    String[] getExtraHosts();
+
+    /**
+     * Add hostnames to /etc/hosts in the container
+     */
+    @Deprecated
+    CreateContainerCmd withExtraHosts(String... extraHosts);
+
+    /**
+     * Add hostnames to /etc/hosts in the container
+     */
+    @Deprecated
+    CreateContainerCmd withExtraHosts(List<String> extraHosts);
+
     @CheckForNull
     List<String> getOnBuild();
 
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 1819be0c3..fc62bef0e 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -9,13 +9,18 @@
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.ContainerNetwork;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.ExposedPorts;
 import com.github.dockerjava.api.model.HealthCheck;
 import com.github.dockerjava.api.model.HostConfig;
+import com.github.dockerjava.api.model.Link;
+import com.github.dockerjava.api.model.PortBinding;
+import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.Volumes;
+import com.github.dockerjava.api.model.VolumesFrom;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -157,6 +162,25 @@ public List<String> getAliases() {
         return aliases;
     }
 
+    @CheckForNull
+    @Override
+    public Bind[] getBinds() {
+        return hostConfig.getBinds();
+    }
+
+    @Override
+    public CreateContainerCmd withBinds(Bind... binds) {
+        checkNotNull(binds, "binds was not specified");
+        hostConfig.setBinds(binds);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withBinds(List<Bind> binds) {
+        checkNotNull(binds, "binds was not specified");
+        return withBinds(binds.toArray(new Bind[binds.size()]));
+    }
+
     @Override
     public CreateContainerCmd withAliases(String... aliases) {
         this.aliases = Arrays.asList(aliases);
@@ -356,6 +380,45 @@ public String getName() {
         return name;
     }
 
+    @CheckForNull
+    @Override
+    public String getNetworkMode() {
+        return hostConfig.getNetworkMode();
+    }
+
+    @Override
+    public CreateContainerCmd withNetworkMode(String networkMode) {
+        checkNotNull(networkMode, "networkMode was not specified");
+        this.hostConfig.withNetworkMode(networkMode);
+        return this;
+    }
+
+    @CheckForNull
+    @Override
+    public Ports getPortBindings() {
+        return hostConfig.getPortBindings();
+    }
+
+    @Override
+    public CreateContainerCmd withPortBindings(PortBinding... portBindings) {
+        checkNotNull(portBindings, "portBindings was not specified");
+        this.hostConfig.withPortBindings(new Ports(portBindings));
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withPortBindings(List<PortBinding> portBindings) {
+        checkNotNull(portBindings, "portBindings was not specified");
+        return withPortBindings(portBindings.toArray(new PortBinding[0]));
+    }
+
+    @Override
+    public CreateContainerCmd withPortBindings(Ports portBindings) {
+        checkNotNull(portBindings, "portBindings was not specified");
+        this.hostConfig.withPortBindings(portBindings);
+        return this;
+    }
+
     @Override
     public CreateContainerCmd withName(String name) {
         checkNotNull(name, "name was not specified");
@@ -381,6 +444,19 @@ public CreateContainerCmd withPortSpecs(List<String> portSpecs) {
         return withPortSpecs(portSpecs.toArray(new String[0]));
     }
 
+    @CheckForNull
+    @Override
+    public Boolean getPrivileged() {
+        return hostConfig.getPrivileged();
+    }
+
+    @Override
+    public CreateContainerCmd withPrivileged(Boolean privileged) {
+        checkNotNull(privileged, "no privileged was specified");
+        this.hostConfig.withPrivileged(privileged);
+        return this;
+    }
+
     @Override
     public String getUser() {
         return user;
@@ -393,7 +469,6 @@ public CreateContainerCmd withUser(String user) {
         return this;
     }
 
-
     @Override
     public Boolean isAttachStderr() {
         return attachStderr;
@@ -452,6 +527,25 @@ public CreateContainerCmd withVolumes(List<Volume> volumes) {
         return withVolumes(volumes.toArray(new Volume[0]));
     }
 
+    @CheckForNull
+    @Override
+    public VolumesFrom[] getVolumesFrom() {
+        return hostConfig.getVolumesFrom();
+    }
+
+    @Override
+    public CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom) {
+        checkNotNull(volumesFrom, "volumesFrom was not specified");
+        this.hostConfig.withVolumesFrom(volumesFrom);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withVolumesFrom(List<VolumesFrom> volumesFrom) {
+        checkNotNull(volumesFrom, "volumesFrom was not specified");
+        return withVolumesFrom(volumesFrom.toArray(new VolumesFrom[volumesFrom.size()]));
+    }
+
     @Override
     public String getWorkingDir() {
         return workingDir;
@@ -514,6 +608,38 @@ public CreateContainerCmd withTty(Boolean tty) {
         return this;
     }
 
+    @CheckForNull
+    @Override
+    public Boolean getPublishAllPorts() {
+        return hostConfig.getPublishAllPorts();
+    }
+
+    @Override
+    public CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts) {
+        checkNotNull(publishAllPorts, "no publishAllPorts was specified");
+        this.hostConfig.withPublishAllPorts(publishAllPorts);
+        return this;
+    }
+
+    @CheckForNull
+    @Override
+    public String[] getExtraHosts() {
+        return hostConfig.getExtraHosts();
+    }
+
+    @Override
+    public CreateContainerCmd withExtraHosts(String... extraHosts) {
+        checkNotNull(extraHosts, "extraHosts was not specified");
+        this.hostConfig.withExtraHosts(extraHosts);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withExtraHosts(List<String> extraHosts) {
+        checkNotNull(extraHosts, "extraHosts was not specified");
+        return withExtraHosts(extraHosts.toArray(new String[extraHosts.size()]));
+    }
+
     @Override
     public HostConfig getHostConfig() {
         return hostConfig;
@@ -537,6 +663,25 @@ public CreateContainerCmd withIpv4Address(String ipv4Address) {
         return this;
     }
 
+    @CheckForNull
+    @Override
+    public Link[] getLinks() {
+        return hostConfig.getLinks();
+    }
+
+    @Override
+    public CreateContainerCmd withLinks(Link... links) {
+        checkNotNull(links, "links was not specified");
+        this.hostConfig.setLinks(links);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withLinks(List<Link> links) {
+        checkNotNull(links, "links was not specified");
+        return withLinks(links.toArray(new Link[links.size()]));
+    }
+
     @Override
     public String getIpv6Address() {
         return ipv6Address;

From 60cbcc96780507e1356bce76da530b019d56dd59 Mon Sep 17 00:00:00 2001
From: Pedro Cardoso <pedro.cardoso@feedzai.com>
Date: Tue, 18 Jun 2019 12:04:17 +0100
Subject: [PATCH 0900/1272] Adds deprecated annotation to implementations
 methods and missing CapAdd/CapDrop methods

Manually tested that test containers repository passes gradle check
process used by their CI process.
---
 .../api/command/CreateContainerCmd.java       | 38 ++++++++++
 .../core/command/CreateContainerCmdImpl.java  | 70 ++++++++++++++++++-
 2 files changed, 105 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 811413ac3..f7b421096 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -4,6 +4,7 @@
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.Capability;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.HealthCheck;
 import com.github.dockerjava.api.model.HostConfig;
@@ -304,6 +305,43 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @Deprecated
     CreateContainerCmd withExtraHosts(List<String> extraHosts);
 
+    @CheckForNull
+    @Deprecated
+    Capability[] getCapAdd();
+
+    /**
+     * Add linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> to the container. For example:
+     * adding {@link Capability#MKNOD} allows the container to create special files using the 'mknod' command.
+     */
+    @Deprecated
+    CreateContainerCmd withCapAdd(Capability... capAdd);
+
+    /**
+     * Add linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> to the container. For example:
+     * adding {@link Capability#MKNOD} allows the container to create special files using the 'mknod' command.
+     */
+    @Deprecated
+    CreateContainerCmd withCapAdd(List<Capability> capAdd);
+
+    @CheckForNull
+    @Deprecated
+    Capability[] getCapDrop();
+
+    /**
+     * Drop linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> from the container. For example:
+     * dropping {@link Capability#CHOWN} prevents the container from changing the owner of any files.
+     */
+    @Deprecated
+    CreateContainerCmd withCapDrop(Capability... capDrop);
+
+    /**
+     * Drop linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> from the container. For example:
+     * dropping {@link Capability#CHOWN} prevents the container from changing the owner of any files.
+     */
+    @Deprecated
+    CreateContainerCmd withCapDrop(List<Capability> capDrop);
+
+
     @CheckForNull
     List<String> getOnBuild();
 
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index fc62bef0e..af7349928 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -10,6 +10,7 @@
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.Capability;
 import com.github.dockerjava.api.model.ContainerNetwork;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.ExposedPorts;
@@ -164,11 +165,13 @@ public List<String> getAliases() {
 
     @CheckForNull
     @Override
+    @Deprecated
     public Bind[] getBinds() {
         return hostConfig.getBinds();
     }
 
     @Override
+    @Deprecated
     public CreateContainerCmd withBinds(Bind... binds) {
         checkNotNull(binds, "binds was not specified");
         hostConfig.setBinds(binds);
@@ -176,6 +179,7 @@ public CreateContainerCmd withBinds(Bind... binds) {
     }
 
     @Override
+    @Deprecated
     public CreateContainerCmd withBinds(List<Bind> binds) {
         checkNotNull(binds, "binds was not specified");
         return withBinds(binds.toArray(new Bind[binds.size()]));
@@ -382,11 +386,13 @@ public String getName() {
 
     @CheckForNull
     @Override
+    @Deprecated
     public String getNetworkMode() {
         return hostConfig.getNetworkMode();
     }
 
     @Override
+    @Deprecated
     public CreateContainerCmd withNetworkMode(String networkMode) {
         checkNotNull(networkMode, "networkMode was not specified");
         this.hostConfig.withNetworkMode(networkMode);
@@ -395,11 +401,13 @@ public CreateContainerCmd withNetworkMode(String networkMode) {
 
     @CheckForNull
     @Override
+    @Deprecated
     public Ports getPortBindings() {
         return hostConfig.getPortBindings();
     }
 
     @Override
+    @Deprecated
     public CreateContainerCmd withPortBindings(PortBinding... portBindings) {
         checkNotNull(portBindings, "portBindings was not specified");
         this.hostConfig.withPortBindings(new Ports(portBindings));
@@ -407,12 +415,14 @@ public CreateContainerCmd withPortBindings(PortBinding... portBindings) {
     }
 
     @Override
+    @Deprecated
     public CreateContainerCmd withPortBindings(List<PortBinding> portBindings) {
         checkNotNull(portBindings, "portBindings was not specified");
         return withPortBindings(portBindings.toArray(new PortBinding[0]));
     }
 
     @Override
+    @Deprecated
     public CreateContainerCmd withPortBindings(Ports portBindings) {
         checkNotNull(portBindings, "portBindings was not specified");
         this.hostConfig.withPortBindings(portBindings);
@@ -446,11 +456,13 @@ public CreateContainerCmd withPortSpecs(List<String> portSpecs) {
 
     @CheckForNull
     @Override
+    @Deprecated
     public Boolean getPrivileged() {
         return hostConfig.getPrivileged();
     }
 
     @Override
+    @Deprecated
     public CreateContainerCmd withPrivileged(Boolean privileged) {
         checkNotNull(privileged, "no privileged was specified");
         this.hostConfig.withPrivileged(privileged);
@@ -481,7 +493,6 @@ public CreateContainerCmd withAttachStderr(Boolean attachStderr) {
         return this;
     }
 
-
     @Override
     public Boolean isAttachStdin() {
         return attachStdin;
@@ -494,7 +505,6 @@ public CreateContainerCmd withAttachStdin(Boolean attachStdin) {
         return this;
     }
 
-
     @Override
     public Boolean isAttachStdout() {
         return attachStdout;
@@ -507,7 +517,6 @@ public CreateContainerCmd withAttachStdout(Boolean attachStdout) {
         return this;
     }
 
-
     @Override
     @JsonIgnore
     public Volume[] getVolumes() {
@@ -529,11 +538,13 @@ public CreateContainerCmd withVolumes(List<Volume> volumes) {
 
     @CheckForNull
     @Override
+    @Deprecated
     public VolumesFrom[] getVolumesFrom() {
         return hostConfig.getVolumesFrom();
     }
 
     @Override
+    @Deprecated
     public CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom) {
         checkNotNull(volumesFrom, "volumesFrom was not specified");
         this.hostConfig.withVolumesFrom(volumesFrom);
@@ -541,6 +552,7 @@ public CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom) {
     }
 
     @Override
+    @Deprecated
     public CreateContainerCmd withVolumesFrom(List<VolumesFrom> volumesFrom) {
         checkNotNull(volumesFrom, "volumesFrom was not specified");
         return withVolumesFrom(volumesFrom.toArray(new VolumesFrom[volumesFrom.size()]));
@@ -610,11 +622,13 @@ public CreateContainerCmd withTty(Boolean tty) {
 
     @CheckForNull
     @Override
+    @Deprecated
     public Boolean getPublishAllPorts() {
         return hostConfig.getPublishAllPorts();
     }
 
     @Override
+    @Deprecated
     public CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts) {
         checkNotNull(publishAllPorts, "no publishAllPorts was specified");
         this.hostConfig.withPublishAllPorts(publishAllPorts);
@@ -623,11 +637,13 @@ public CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts) {
 
     @CheckForNull
     @Override
+    @Deprecated
     public String[] getExtraHosts() {
         return hostConfig.getExtraHosts();
     }
 
     @Override
+    @Deprecated
     public CreateContainerCmd withExtraHosts(String... extraHosts) {
         checkNotNull(extraHosts, "extraHosts was not specified");
         this.hostConfig.withExtraHosts(extraHosts);
@@ -635,11 +651,56 @@ public CreateContainerCmd withExtraHosts(String... extraHosts) {
     }
 
     @Override
+    @Deprecated
     public CreateContainerCmd withExtraHosts(List<String> extraHosts) {
         checkNotNull(extraHosts, "extraHosts was not specified");
         return withExtraHosts(extraHosts.toArray(new String[extraHosts.size()]));
     }
 
+    @CheckForNull
+    @Override
+    @Deprecated
+    public Capability[] getCapAdd() {
+        return hostConfig.getCapAdd();
+    }
+
+    @Override
+    @Deprecated
+    public CreateContainerCmd withCapAdd(Capability... capAdd) {
+        checkNotNull(capAdd, "capAdd was not specified");
+        hostConfig.withCapAdd(capAdd);
+        return this;
+    }
+
+    @Override
+    @Deprecated
+    public CreateContainerCmd withCapAdd(List<Capability> capAdd) {
+        checkNotNull(capAdd, "capAdd was not specified");
+        return withCapAdd(capAdd.toArray(new Capability[capAdd.size()]));
+    }
+
+    @CheckForNull
+    @Override
+    @Deprecated
+    public Capability[] getCapDrop() {
+        return hostConfig.getCapDrop();
+    }
+
+    @Override
+    @Deprecated
+    public CreateContainerCmd withCapDrop(Capability... capDrop) {
+        checkNotNull(capDrop, "capDrop was not specified");
+        hostConfig.withCapDrop(capDrop);
+        return this;
+    }
+
+    @Override
+    @Deprecated
+    public CreateContainerCmd withCapDrop(List<Capability> capDrop) {
+        checkNotNull(capDrop, "capDrop was not specified");
+        return withCapDrop(capDrop.toArray(new Capability[capDrop.size()]));
+    }
+
     @Override
     public HostConfig getHostConfig() {
         return hostConfig;
@@ -665,11 +726,13 @@ public CreateContainerCmd withIpv4Address(String ipv4Address) {
 
     @CheckForNull
     @Override
+    @Deprecated
     public Link[] getLinks() {
         return hostConfig.getLinks();
     }
 
     @Override
+    @Deprecated
     public CreateContainerCmd withLinks(Link... links) {
         checkNotNull(links, "links was not specified");
         this.hostConfig.setLinks(links);
@@ -677,6 +740,7 @@ public CreateContainerCmd withLinks(Link... links) {
     }
 
     @Override
+    @Deprecated
     public CreateContainerCmd withLinks(List<Link> links) {
         checkNotNull(links, "links was not specified");
         return withLinks(links.toArray(new Link[links.size()]));

From c72c314ac8cc0b67cd68924f51d264f49efad09d Mon Sep 17 00:00:00 2001
From: Pedro Cardoso <pedro.cardoso@feedzai.com>
Date: Tue, 18 Jun 2019 14:26:50 +0100
Subject: [PATCH 0901/1272] Adds JsonIgnore annotation to getter methods.

---
 .../core/command/CreateContainerCmdImpl.java           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index af7349928..d6839c1e6 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -166,6 +166,7 @@ public List<String> getAliases() {
     @CheckForNull
     @Override
     @Deprecated
+    @JsonIgnore
     public Bind[] getBinds() {
         return hostConfig.getBinds();
     }
@@ -387,6 +388,7 @@ public String getName() {
     @CheckForNull
     @Override
     @Deprecated
+    @JsonIgnore
     public String getNetworkMode() {
         return hostConfig.getNetworkMode();
     }
@@ -402,6 +404,7 @@ public CreateContainerCmd withNetworkMode(String networkMode) {
     @CheckForNull
     @Override
     @Deprecated
+    @JsonIgnore
     public Ports getPortBindings() {
         return hostConfig.getPortBindings();
     }
@@ -457,6 +460,7 @@ public CreateContainerCmd withPortSpecs(List<String> portSpecs) {
     @CheckForNull
     @Override
     @Deprecated
+    @JsonIgnore
     public Boolean getPrivileged() {
         return hostConfig.getPrivileged();
     }
@@ -539,6 +543,7 @@ public CreateContainerCmd withVolumes(List<Volume> volumes) {
     @CheckForNull
     @Override
     @Deprecated
+    @JsonIgnore
     public VolumesFrom[] getVolumesFrom() {
         return hostConfig.getVolumesFrom();
     }
@@ -623,6 +628,7 @@ public CreateContainerCmd withTty(Boolean tty) {
     @CheckForNull
     @Override
     @Deprecated
+    @JsonIgnore
     public Boolean getPublishAllPorts() {
         return hostConfig.getPublishAllPorts();
     }
@@ -638,6 +644,7 @@ public CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts) {
     @CheckForNull
     @Override
     @Deprecated
+    @JsonIgnore
     public String[] getExtraHosts() {
         return hostConfig.getExtraHosts();
     }
@@ -660,6 +667,7 @@ public CreateContainerCmd withExtraHosts(List<String> extraHosts) {
     @CheckForNull
     @Override
     @Deprecated
+    @JsonIgnore
     public Capability[] getCapAdd() {
         return hostConfig.getCapAdd();
     }
@@ -682,6 +690,7 @@ public CreateContainerCmd withCapAdd(List<Capability> capAdd) {
     @CheckForNull
     @Override
     @Deprecated
+    @JsonIgnore
     public Capability[] getCapDrop() {
         return hostConfig.getCapDrop();
     }
@@ -727,6 +736,7 @@ public CreateContainerCmd withIpv4Address(String ipv4Address) {
     @CheckForNull
     @Override
     @Deprecated
+    @JsonIgnore
     public Link[] getLinks() {
         return hostConfig.getLinks();
     }

From 14ead2ca3d31918ade2019485ec7c4aa69704ee0 Mon Sep 17 00:00:00 2001
From: Tobias Stadler <ts.stadler@gmx.de>
Date: Mon, 1 Jul 2019 20:42:53 +0200
Subject: [PATCH 0902/1272] The email field is deprected in the api and was
 removed from the cli in v17.06

---
 .../core/DefaultDockerClientConfig.java           |  3 +--
 .../com/github/dockerjava/cmd/PullImageCmdIT.java | 15 +++++++++++++++
 .../github/dockerjava/utils/RegistryUtils.java    |  1 -
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index c77cbb5b7..3710f0e8c 100644
--- a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -252,8 +252,7 @@ public DockerConfigFile getDockerConfig() {
 
     private AuthConfig getAuthConfig() {
         AuthConfig authConfig = null;
-        if (getRegistryUsername() != null && getRegistryPassword() != null && getRegistryEmail() != null
-                && getRegistryUrl() != null) {
+        if (getRegistryUsername() != null && getRegistryPassword() != null && getRegistryUrl() != null) {
             authConfig = new AuthConfig()
                     .withUsername(getRegistryUsername())
                     .withPassword(getRegistryPassword())
diff --git a/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java b/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
index 4d7ed98b1..4571041a8 100644
--- a/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
@@ -111,6 +111,20 @@ public void testPullImageWithValidAuth() throws Exception {
                 .awaitCompletion(30, TimeUnit.SECONDS);
     }
 
+    @Test
+    public void testPullImageWithValidAuthAndEmail() throws Exception {
+        AuthConfig authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient())
+                .withEmail("foo@bar.de");
+
+        String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-valid-auth");
+
+        // stream needs to be fully read in order to close the underlying connection
+        dockerRule.getClient().pullImageCmd(imgName)
+                .withAuthConfig(authConfig)
+                .exec(new PullImageResultCallback())
+                .awaitCompletion(30, TimeUnit.SECONDS);
+    }
+
     @Test
     public void testPullImageWithNoAuth() throws Exception {
         RegistryUtils.runPrivateRegistry(dockerRule.getClient());
@@ -130,6 +144,7 @@ public void testPullImageWithNoAuth() throws Exception {
                 .awaitCompletion(30, TimeUnit.SECONDS);
     }
 
+
     @Test
     public void testPullImageWithInvalidAuth() throws Exception {
         AuthConfig validAuthConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient());
diff --git a/src/test/java/com/github/dockerjava/utils/RegistryUtils.java b/src/test/java/com/github/dockerjava/utils/RegistryUtils.java
index e0251023c..614a16cc6 100644
--- a/src/test/java/com/github/dockerjava/utils/RegistryUtils.java
+++ b/src/test/java/com/github/dockerjava/utils/RegistryUtils.java
@@ -81,7 +81,6 @@ public static synchronized AuthConfig runPrivateRegistry(DockerClient dockerClie
             privateRegistryAuthConfig = new AuthConfig()
                     .withUsername("testuser")
                     .withPassword("testpassword")
-                    .withEmail("foo@bar.de")
                     .withRegistryAddress("localhost:" + port);
         }
 

From 8842fce01a96c4deb085f73c2623fc27698f7383 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= <hugares@gmail.com>
Date: Fri, 5 Jul 2019 10:22:27 -0400
Subject: [PATCH 0903/1272] Remove usage of deprecated Objects.toStringHelper

---
 .../java/com/github/dockerjava/api/model/Identifier.java    | 4 ++--
 .../java/com/github/dockerjava/api/model/Repository.java    | 4 ++--
 .../com/github/dockerjava/core/dockerfile/Dockerfile.java   | 4 ++--
 .../dockerjava/core/dockerfile/DockerfileStatement.java     | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/Identifier.java b/src/main/java/com/github/dockerjava/api/model/Identifier.java
index 8f1c871a7..183724d0e 100644
--- a/src/main/java/com/github/dockerjava/api/model/Identifier.java
+++ b/src/main/java/com/github/dockerjava/api/model/Identifier.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.api.model;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Optional;
 
 import java.io.Serializable;
@@ -55,6 +55,6 @@ public static Identifier fromCompoundString(String identifier) {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this).add("repository", repository).add("tag", tag).toString();
+        return MoreObjects.toStringHelper(this).add("repository", repository).add("tag", tag).toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/Repository.java b/src/main/java/com/github/dockerjava/api/model/Repository.java
index f4e4b9ab8..e528fe3ac 100644
--- a/src/main/java/com/github/dockerjava/api/model/Repository.java
+++ b/src/main/java/com/github/dockerjava/api/model/Repository.java
@@ -4,7 +4,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 
 /**
  * A repository or image name.
@@ -36,7 +36,7 @@ public URL getURL() throws MalformedURLException {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this).add("name", name).toString();
+        return MoreObjects.toStringHelper(this).add("name", name).toString();
     }
 
     public String getPath() {
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 11ed5fc4e..b7429f79d 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -19,7 +19,7 @@
 import com.github.dockerjava.core.util.CompressArchiveUtil;
 import com.github.dockerjava.core.util.FilePathUtil;
 import com.google.common.base.Function;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Optional;
 import com.google.common.collect.Collections2;
 
@@ -171,7 +171,7 @@ public void close() throws IOException {
 
         @Override
         public String toString() {
-            return Objects.toStringHelper(this).add("ignores", ignores).add("filesToAdd", filesToAdd).toString();
+            return MoreObjects.toStringHelper(this).add("ignores", ignores).add("filesToAdd", filesToAdd).toString();
         }
 
         public ScannedResult() throws IOException {
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java b/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
index 4f0341c7a..3f14db05a 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
@@ -12,7 +12,7 @@
 
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.google.common.base.Function;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
@@ -155,7 +155,7 @@ public static Optional<Add> create(String statement) {
 
         @Override
         public String toString() {
-            return Objects.toStringHelper(this).add("sources", sources).add("destination", destination).toString();
+            return MoreObjects.toStringHelper(this).add("sources", sources).add("destination", destination).toString();
         }
     }
 
@@ -192,7 +192,7 @@ public static Optional<Env> create(String statement) {
 
         @Override
         public String toString() {
-            return Objects.toStringHelper(this).add("variable", variable).add("value", value).toString();
+            return MoreObjects.toStringHelper(this).add("variable", variable).add("value", value).toString();
         }
     }
 

From 9900e7b77801495b54529e4e5e4bb10326550382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= <hugares@gmail.com>
Date: Fri, 5 Jul 2019 11:13:25 -0400
Subject: [PATCH 0904/1272] Use JUnit TemporaryFolder rule in
 CompressArchiveUtilTest

Instead of delete files created by the test, make use of JUnit
TemporaryFolder rule which does exatly that. Not only it simplify the
code but also fixes the issue that files where not delete when test was
failing.
---
 .../core/CompressArchiveUtilTest.java         | 45 +++++++------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java b/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
index f5f2f92e3..e22419444 100644
--- a/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
+++ b/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
@@ -3,9 +3,10 @@
 import com.github.dockerjava.core.util.CompressArchiveUtil;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -22,30 +23,24 @@
 
 public class CompressArchiveUtilTest {
 
+    @Rule
+    public TemporaryFolder tempFolder = new TemporaryFolder();
+
     @Test
     public void testExecutableFlagIsPreserved() throws Exception {
-        File executableFile = createExecutableFile();
-        File archive = CompressArchiveUtil.archiveTARFiles(executableFile.getParentFile(), asList(executableFile),
+        File executableFile = tempFolder.newFile("executableFile.sh");
+        executableFile.setExecutable(true);
+        assertThat(executableFile.canExecute(), is(true));
+
+        File archive = CompressArchiveUtil.archiveTARFiles(tempFolder.getRoot(), asList(executableFile),
                 "archive");
         File expectedFile = extractFileByName(archive, "executableFile.sh", "executableFile.sh.result");
 
         assertThat("should be executable", expectedFile.canExecute());
-        expectedFile.delete();
-        archive.delete();
-    }
-
-    private File createExecutableFile() throws IOException {
-        File baseDir = new File(FileUtils.getTempDirectoryPath());
-        File executableFile = new File(baseDir, "executableFile.sh");
-        executableFile.createNewFile();
-        executableFile.setExecutable(true);
-        assertThat(executableFile.canExecute(), is(true));
-        return executableFile;
     }
 
     private File extractFileByName(File archive, String filenameToExtract, String outputName) throws IOException {
-        File baseDir = new File(FileUtils.getTempDirectoryPath());
-        File expectedFile = new File(baseDir, outputName);
+        File expectedFile = new File(tempFolder.newFolder(), outputName);
         expectedFile.delete();
         assertThat(expectedFile.exists(), is(false));
 
@@ -71,26 +66,23 @@ private File extractFileByName(File archive, String filenameToExtract, String ou
 
     @Test
     public void testSymbolicLinkDir() throws IOException {
-        Path uploadDir = Files.createTempDirectory("upload");
-        Path linkTarget = Files.createTempDirectory("ink-target");
+        Path uploadDir = tempFolder.newFolder("upload").toPath();
+        Path linkTarget = tempFolder.newFolder("link-target").toPath();
         Path tmpFile = Files.createTempFile(linkTarget, "link-dir", "rand");
         Files.createSymbolicLink(uploadDir.resolve("link-folder"), linkTarget);
-        Path tarGzFile = Files.createTempFile("docker-java", ".tar.gz");
+        Path tarGzFile = tempFolder.newFile("docker-java.tar.gz").toPath();
         //follow link only works for childrenOnly=false
         CompressArchiveUtil.tar(uploadDir, tarGzFile, true, false);
         File expectedFile = extractFileByName(tarGzFile.toFile(), tmpFile.toFile().getName(), "foo1");
         assertThat(expectedFile.canRead(), is(true));
-        uploadDir.toFile().delete();
-        linkTarget.toFile().delete();
-        tarGzFile.toFile().delete();
     }
 
     @Test
     public void testSymbolicLinkFile() throws IOException {
-        Path uploadDir = Files.createTempDirectory("upload");
-        Path tmpFile = Files.createTempFile("src", "");
+        Path uploadDir = tempFolder.newFolder("upload").toPath();
+        Path tmpFile = tempFolder.newFile("src").toPath();
         Files.createSymbolicLink(uploadDir.resolve("link-file"), tmpFile);
-        Path tarGzFile = Files.createTempFile("docker-java", ".tar.gz");
+        Path tarGzFile = tempFolder.newFile("docker-java.tar.gz").toPath();
         boolean childrenOnly = false;
         CompressArchiveUtil.tar(uploadDir, tarGzFile, true, childrenOnly);
         File expectedFile = extractFileByName(tarGzFile.toFile(), "link-file", "foo1");
@@ -99,8 +91,5 @@ public void testSymbolicLinkFile() throws IOException {
         CompressArchiveUtil.tar(uploadDir, tarGzFile, true, childrenOnly);
         extractFileByName(tarGzFile.toFile(), "link-file", "foo1");
         assertThat(expectedFile.canRead(), is(true));
-        uploadDir.toFile().delete();
-        tmpFile.toFile().delete();
-        tarGzFile.toFile().delete();
     }
 }

From 50983c951d136bab375e4dfe1c60852ee67586c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= <hugares@gmail.com>
Date: Mon, 8 Jul 2019 21:07:22 -0400
Subject: [PATCH 0905/1272] Move CompressArchiveUtilTest to proper package

Move the test class to match the package of CompressArchiveUtil
---
 .../dockerjava/core/{ => util}/CompressArchiveUtilTest.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename src/test/java/com/github/dockerjava/core/{ => util}/CompressArchiveUtilTest.java (97%)

diff --git a/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java b/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
similarity index 97%
rename from src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
rename to src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
index e22419444..896fd9415 100644
--- a/src/test/java/com/github/dockerjava/core/CompressArchiveUtilTest.java
+++ b/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
@@ -1,6 +1,5 @@
-package com.github.dockerjava.core;
+package com.github.dockerjava.core.util;
 
-import com.github.dockerjava.core.util.CompressArchiveUtil;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.io.IOUtils;

From 6cbe5e2bc413c25d03fd9348a91a2dff5d933dfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= <hugares@gmail.com>
Date: Mon, 8 Jul 2019 21:27:18 -0400
Subject: [PATCH 0906/1272] Remove unused variables

---
 .../github/dockerjava/core/dockerfile/Dockerfile.java    | 2 --
 .../github/dockerjava/core/exec/ExecStartCmdExec.java    | 5 -----
 .../com/github/dockerjava/cmd/CreateContainerCmdIT.java  | 2 +-
 .../java/com/github/dockerjava/cmd/PullImageCmdIT.java   | 9 ---------
 .../com/github/dockerjava/cmd/UpdateContainerCmdIT.java  | 2 +-
 .../java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java | 2 --
 .../core/dockerfile/DockerfileAddMultipleFilesTest.java  | 6 +-----
 .../core/dockerfile/DockerfileStatementAddTest.java      | 4 ----
 .../java/com/github/dockerjava/junit/DockerRule.java     | 2 --
 9 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 11ed5fc4e..3e5970b87 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -134,8 +134,6 @@ public InputStream buildDockerFolderTar(File directory) {
                 dockerFolderTar = CompressArchiveUtil.archiveTARFiles(directory, filesToAdd,
                         archiveNameWithOutExtension);
 
-                long length = dockerFolderTar.length();
-
                 final FileInputStream tarInputStream = FileUtils.openInputStream(dockerFolderTar);
                 final File tarFile = dockerFolderTar;
 
diff --git a/src/main/java/com/github/dockerjava/core/exec/ExecStartCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/ExecStartCmdExec.java
index 54290050c..b33383562 100644
--- a/src/main/java/com/github/dockerjava/core/exec/ExecStartCmdExec.java
+++ b/src/main/java/com/github/dockerjava/core/exec/ExecStartCmdExec.java
@@ -1,8 +1,5 @@
 package com.github.dockerjava.core.exec;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.ExecStartCmd;
 import com.github.dockerjava.api.model.Frame;
@@ -12,8 +9,6 @@
 
 public class ExecStartCmdExec extends AbstrAsyncDockerCmdExec<ExecStartCmd, Frame> implements ExecStartCmd.Exec {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ExecStartCmdExec.class);
-
     public ExecStartCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
         super(baseResource, dockerClientConfig);
     }
diff --git a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index 570f20f64..00508a74e 100644
--- a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -906,7 +906,7 @@ public void createContainerFromPrivateRegistryWithValidAuth() throws Exception {
 
     @Test
     public void createContainerFromPrivateRegistryWithNoAuth() throws Exception {
-        AuthConfig authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient());
+        RegistryUtils.runPrivateRegistry(dockerRule.getClient());
 
         String imgName = RegistryUtils.createPrivateImage(dockerRule, "create-container-with-no-auth");
 
diff --git a/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java b/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
index 4571041a8..73ba598ff 100644
--- a/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
@@ -1,14 +1,11 @@
 package com.github.dockerjava.cmd;
 
-import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.InspectImageResponse;
-import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.exception.InternalServerErrorException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Info;
-import com.github.dockerjava.api.model.PullResponseItem;
 import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.core.command.PullImageResultCallback;
 import com.github.dockerjava.utils.RegistryUtils;
@@ -32,12 +29,6 @@ public class PullImageCmdIT extends CmdIT {
     @Rule
     public ExpectedException exception = ExpectedException.none();
 
-    private static final PullImageCmd.Exec NOP_EXEC = new PullImageCmd.Exec() {
-        public Void exec(PullImageCmd command, ResultCallback<PullResponseItem> resultCallback) {
-            return null;
-        };
-    };
-
     @Test
     public void testPullImage() throws Exception {
         Info info = dockerRule.getClient().infoCmd().exec();
diff --git a/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
index 51d967db5..9e937db52 100644
--- a/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
@@ -46,7 +46,7 @@ public void updateContainer() throws DockerException, IOException {
         LOG.debug("Inspect: {}", inspectBefore);
         final Long memory = inspectBefore.getHostConfig().getMemory();
 
-        final UpdateContainerResponse updateResponse = dockerRule.getClient().updateContainerCmd(containerId)
+        dockerRule.getClient().updateContainerCmd(containerId)
                 .withBlkioWeight(300)
                 .withCpuShares(512)
                 .withCpuPeriod(100000)
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
index 686c24794..da0dafb1f 100644
--- a/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
@@ -34,8 +34,6 @@ public abstract class SwarmCmdIT extends CmdIT {
     private static final int PORT_START = 2378;
     private static final String DOCKER_IN_DOCKER_CONTAINER_PREFIX = "docker";
     private static final String NETWORK_NAME = "dind-network";
-    private static final int MAX_CONNECT_ATTEMPTS = 5;
-    private static final int CONNECT_ATTEMPT_INTERVAL = 200;
     private static final String DOCKER_IN_DOCKER_IMAGE_REPOSITORY = "docker";
     private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "17.12-dind";
 
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
index a10990d96..1e8810b56 100644
--- a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
+++ b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
@@ -2,8 +2,6 @@
 
 import com.google.common.base.Function;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -15,8 +13,6 @@
 
 public class DockerfileAddMultipleFilesTest {
 
-    private static final Logger LOG = LoggerFactory.getLogger(DockerfileAddMultipleFilesTest.class);
-
     private static final Function<File, String> TO_FILE_NAMES = new Function<File, String>() {
         @Override
         public String apply(File file) {
@@ -34,7 +30,7 @@ public void ignoreAllBut() throws Exception {
         assertThat(filesToAdd,
                    containsInAnyOrder("Dockerfile", "foo.jar"));
     }
-    
+
     @Test
     public void nestedDirsPatterns() throws Exception {
         File baseDir = fileFromBuildTestResource("dockerignore/NestedDirsDockerignore");
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
index efbf67aaf..d36aa4f4e 100644
--- a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
+++ b/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
@@ -7,8 +7,6 @@
 import org.junit.experimental.runners.Enclosed;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
@@ -21,8 +19,6 @@ public class DockerfileStatementAddTest {
     @RunWith(Parameterized.class)
     public static final class ParamTests {
 
-        private static final Logger LOG = LoggerFactory.getLogger(DockerfileStatementAddTest.class);
-
         @Parameterized.Parameters(name = "{0} {1} {2}")
         public static Object[][] data() {
             return new Object[][]{{"ADD src dest", contains("src"), "dest"},
diff --git a/src/test/java/com/github/dockerjava/junit/DockerRule.java b/src/test/java/com/github/dockerjava/junit/DockerRule.java
index be8cb6b36..734c1d630 100644
--- a/src/test/java/com/github/dockerjava/junit/DockerRule.java
+++ b/src/test/java/com/github/dockerjava/junit/DockerRule.java
@@ -34,8 +34,6 @@ public class DockerRule extends ExternalResource {
     private DockerClient jerseyClient;
 
     private CmdIT cmdIT;
-    private Object cmdExecFactory;
-
 
     public DockerRule(CmdIT cmdIT) {
         this.cmdIT = cmdIT;

From 69ba7f3e156ee797c2e1046f189781c04df19518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= <hugares@gmail.com>
Date: Mon, 8 Jul 2019 21:40:36 -0400
Subject: [PATCH 0907/1272] Remove usage of JUnit deprecated methods

---
 .../com/github/dockerjava/api/model/DeviceTest.java    |  2 +-
 .../dockerjava/api/model/PortsAddBindingsTest.java     | 10 ++++++----
 .../dockerjava/api/model/PortsSerializingTest.java     |  3 ++-
 .../github/dockerjava/core/GoLangFileMatchTest.java    |  8 +++++---
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/api/model/DeviceTest.java b/src/test/java/com/github/dockerjava/api/model/DeviceTest.java
index 776c9c98c..18c6fbbc8 100644
--- a/src/test/java/com/github/dockerjava/api/model/DeviceTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/DeviceTest.java
@@ -8,10 +8,10 @@
 import java.util.List;
 import java.util.Map;
 
-import static junit.framework.Assert.fail;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.fail;
 
 /**
  * @author Kanstantsin Shautsou
diff --git a/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java b/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java
index a5a4228e4..02b3047e7 100644
--- a/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java
@@ -6,7 +6,9 @@
 
 import java.util.Map;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 /**
  * As there may be several {@link Binding}s per {@link ExposedPort}, it makes a difference if you add {@link PortBinding}s for the same or
@@ -35,8 +37,8 @@ public void addTwoBindingsForDifferentExposedPorts() {
         Map<ExposedPort, Binding[]> bindings = ports.getBindings();
         // two keys with one value each
         assertEquals(bindings.size(), 2);
-        assertEquals(bindings.get(TCP_80), new Binding[] {BINDING_8080});
-        assertEquals(bindings.get(TCP_90), new Binding[] {BINDING_9090});
+        assertArrayEquals(bindings.get(TCP_80), new Binding[] {BINDING_8080});
+        assertArrayEquals(bindings.get(TCP_90), new Binding[] {BINDING_9090});
     }
 
     @Test
@@ -46,7 +48,7 @@ public void addTwoBindingsForSameExposedPort() {
         Map<ExposedPort, Binding[]> bindings = ports.getBindings();
         // one key with two values
         assertEquals(bindings.size(), 1);
-        assertEquals(bindings.get(TCP_80), new Binding[] {BINDING_8080, BINDING_9090});
+        assertArrayEquals(bindings.get(TCP_80), new Binding[] {BINDING_8080, BINDING_9090});
     }
 
     @Test
@@ -55,6 +57,6 @@ public void addNullBindings() {
         Map<ExposedPort, Binding[]> bindings = ports.getBindings();
         // one key with two values
         assertEquals(bindings.size(), 1);
-        assertEquals(bindings.get(TCP_80), null);
+        assertNull(bindings.get(TCP_80));
     }
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java b/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java
index 242b389c3..818f3dd91 100644
--- a/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java
+++ b/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java
@@ -7,6 +7,7 @@
 import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 public class PortsSerializingTest {
     private final ObjectMapper objectMapper = new ObjectMapper();
@@ -47,7 +48,7 @@ public void deserializingPortWithNullBindings() throws Exception {
         Map<ExposedPort, Binding[]> map = ports.getBindings();
         assertEquals(map.size(), 1);
 
-        assertEquals(map.get(ExposedPort.tcp(80)), null);
+        assertNull(map.get(ExposedPort.tcp(80)));
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java b/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
index 2ae929c1e..b6dde97f5 100644
--- a/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
+++ b/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
@@ -4,12 +4,14 @@
 package com.github.dockerjava.core;
 
 import com.github.dockerjava.core.exception.GoLangFileMatchException;
-import junit.framework.Assert;
 import org.apache.commons.io.FilenameUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 import java.io.IOException;
 
 @RunWith(Parameterized.class)
@@ -97,9 +99,9 @@ public void testMatch() throws IOException {
         try {
             Boolean matched = GoLangFileMatch.match(pattern, s);
             if (testCase.expectException) {
-                Assert.fail("Expected GoFileMatchException");
+                fail("Expected GoFileMatchException");
             }
-            Assert.assertEquals(testCase.toString(), testCase.matches, matched);
+            assertEquals(testCase.toString(), testCase.matches, matched);
         } catch (GoLangFileMatchException e) {
             if (!testCase.expectException) {
                 throw e;

From f7506f912be3008da15f89c5b9505cdf6e39d9f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= <hugares@gmail.com>
Date: Mon, 8 Jul 2019 21:57:47 -0400
Subject: [PATCH 0908/1272] Remove unused imports

---
 src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java | 1 -
 .../com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java | 1 -
 .../com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java  | 1 -
 .../java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java  | 1 -
 src/test/java/com/github/dockerjava/junit/DockerRule.java       | 2 --
 src/test/java/com/github/dockerjava/junit/suite/SwarmSuite.java | 1 -
 6 files changed, 7 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
index 510bb0cb9..a4d251c32 100644
--- a/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
@@ -10,7 +10,6 @@
 import java.util.Map;
 
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_21;
-import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_25;
 import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
 import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java b/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
index cc1ee325a..27eae0b6e 100644
--- a/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
@@ -5,7 +5,6 @@
 import com.github.dockerjava.api.model.EndpointResolutionMode;
 import com.github.dockerjava.api.model.EndpointSpec;
 import com.github.dockerjava.api.model.Mount;
-import com.github.dockerjava.api.model.MountType;
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.api.model.NetworkAttachmentConfig;
 import com.github.dockerjava.api.model.PortConfig;
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java b/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
index 29e819074..17e3303de 100644
--- a/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
@@ -21,7 +21,6 @@
 import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.is;
 
 public class ListServicesCmdExecIT extends SwarmCmdIT {
     public static final Logger LOG = LoggerFactory.getLogger(CreateServiceCmdExecIT.class);
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java b/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java
index 82a73406f..bb96dc3ef 100644
--- a/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java
@@ -24,7 +24,6 @@
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 
 public class LogSwarmObjectIT extends SwarmCmdIT {
     @Test
diff --git a/src/test/java/com/github/dockerjava/junit/DockerRule.java b/src/test/java/com/github/dockerjava/junit/DockerRule.java
index be8cb6b36..5c726f4a7 100644
--- a/src/test/java/com/github/dockerjava/junit/DockerRule.java
+++ b/src/test/java/com/github/dockerjava/junit/DockerRule.java
@@ -20,8 +20,6 @@
 
 import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY;
 import static com.github.dockerjava.cmd.CmdIT.FactoryType.NETTY;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.IsNull.notNullValue;
 
 /**
  * @author Kanstantsin Shautsou
diff --git a/src/test/java/com/github/dockerjava/junit/suite/SwarmSuite.java b/src/test/java/com/github/dockerjava/junit/suite/SwarmSuite.java
index 109a4ae62..7f3982240 100644
--- a/src/test/java/com/github/dockerjava/junit/suite/SwarmSuite.java
+++ b/src/test/java/com/github/dockerjava/junit/suite/SwarmSuite.java
@@ -2,7 +2,6 @@
 
 import com.github.dockerjava.junit.category.SwarmModeIntegration;
 import org.junit.experimental.categories.Categories;
-import org.junit.runner.RunWith;
 
 //@RunWith(Categories.class)
 @Categories.IncludeCategory(SwarmModeIntegration.class)

From ab8398fa13ca104e2c27cf1dd5dfbd6bdc2d6019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= <hugares@gmail.com>
Date: Mon, 8 Jul 2019 22:25:16 -0400
Subject: [PATCH 0909/1272] Fix serialVersionUID type

Java serialization expect a serialVersionUID which is of primitive type
long[1]. Change the type from Long to long to prevent unnecessary
unboxing and also to fix a warning in Eclipse.

[1]https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/io/Serializable.html
---
 src/main/java/com/github/dockerjava/api/model/ClusterInfo.java  | 2 +-
 .../java/com/github/dockerjava/api/model/ContainerSpec.java     | 2 +-
 src/main/java/com/github/dockerjava/api/model/Endpoint.java     | 2 +-
 src/main/java/com/github/dockerjava/api/model/EndpointSpec.java | 2 +-
 .../java/com/github/dockerjava/api/model/EndpointVirtualIP.java | 2 +-
 src/main/java/com/github/dockerjava/api/model/ExternalCA.java   | 2 +-
 .../github/dockerjava/api/model/NetworkAttachmentConfig.java    | 2 +-
 src/main/java/com/github/dockerjava/api/model/PeerNode.java     | 2 +-
 src/main/java/com/github/dockerjava/api/model/PortConfig.java   | 2 +-
 .../com/github/dockerjava/api/model/ResourceRequirements.java   | 2 +-
 .../java/com/github/dockerjava/api/model/ResourceSpecs.java     | 2 +-
 .../java/com/github/dockerjava/api/model/ResourceVersion.java   | 2 +-
 src/main/java/com/github/dockerjava/api/model/Service.java      | 2 +-
 .../github/dockerjava/api/model/ServiceGlobalModeOptions.java   | 2 +-
 .../java/com/github/dockerjava/api/model/ServicePlacement.java  | 2 +-
 .../com/github/dockerjava/api/model/ServiceRestartPolicy.java   | 2 +-
 src/main/java/com/github/dockerjava/api/model/ServiceSpec.java  | 2 +-
 .../com/github/dockerjava/api/model/ServiceUpdateStatus.java    | 2 +-
 src/main/java/com/github/dockerjava/api/model/Swarm.java        | 2 +-
 .../java/com/github/dockerjava/api/model/SwarmCAConfig.java     | 2 +-
 .../com/github/dockerjava/api/model/SwarmDispatcherConfig.java  | 2 +-
 .../java/com/github/dockerjava/api/model/SwarmJoinTokens.java   | 2 +-
 src/main/java/com/github/dockerjava/api/model/SwarmNode.java    | 2 +-
 .../com/github/dockerjava/api/model/SwarmNodeDescription.java   | 2 +-
 .../github/dockerjava/api/model/SwarmNodeEngineDescription.java | 2 +-
 .../com/github/dockerjava/api/model/SwarmNodeManagerStatus.java | 2 +-
 .../java/com/github/dockerjava/api/model/SwarmNodePlatform.java | 2 +-
 .../github/dockerjava/api/model/SwarmNodePluginDescription.java | 2 +-
 .../com/github/dockerjava/api/model/SwarmNodeResources.java     | 2 +-
 .../java/com/github/dockerjava/api/model/SwarmNodeSpec.java     | 2 +-
 .../java/com/github/dockerjava/api/model/SwarmNodeStatus.java   | 2 +-
 .../java/com/github/dockerjava/api/model/SwarmNodeVersion.java  | 2 +-
 .../com/github/dockerjava/api/model/SwarmOrchestration.java     | 2 +-
 .../java/com/github/dockerjava/api/model/SwarmRaftConfig.java   | 2 +-
 src/main/java/com/github/dockerjava/api/model/SwarmSpec.java    | 2 +-
 src/main/java/com/github/dockerjava/api/model/SwarmVersion.java | 2 +-
 src/main/java/com/github/dockerjava/api/model/TaskDefaults.java | 2 +-
 src/main/java/com/github/dockerjava/api/model/TaskSpec.java     | 2 +-
 src/main/java/com/github/dockerjava/api/model/UpdateConfig.java | 2 +-
 .../java/com/github/dockerjava/api/model/VersionComponent.java  | 2 +-
 .../java/com/github/dockerjava/api/model/VersionPlatform.java   | 2 +-
 41 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java b/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
index d1a233d05..0ee95688b 100644
--- a/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
+++ b/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
@@ -23,7 +23,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ClusterInfo implements Serializable {
 
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java b/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
index 26cfd9dfe..f56870d01 100644
--- a/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
+++ b/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
@@ -22,7 +22,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ContainerSpec implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/Endpoint.java b/src/main/java/com/github/dockerjava/api/model/Endpoint.java
index 54ae0cad2..0602a3d21 100644
--- a/src/main/java/com/github/dockerjava/api/model/Endpoint.java
+++ b/src/main/java/com/github/dockerjava/api/model/Endpoint.java
@@ -14,7 +14,7 @@
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
 public class Endpoint implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java b/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
index e036aac75..38aebe638 100644
--- a/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
+++ b/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
@@ -19,7 +19,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class EndpointSpec implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java b/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
index 5bc600a4d..369889921 100644
--- a/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
+++ b/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
@@ -14,7 +14,7 @@
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
 public class EndpointVirtualIP implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/ExternalCA.java b/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
index 4377b90d4..ac2cb69fb 100644
--- a/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
+++ b/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
@@ -20,7 +20,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ExternalCA implements Serializable {
 
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java b/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
index 6b36decaf..b9663e1d8 100644
--- a/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
@@ -19,7 +19,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class NetworkAttachmentConfig implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/PeerNode.java b/src/main/java/com/github/dockerjava/api/model/PeerNode.java
index 5c7a1d89a..50ed7d01b 100644
--- a/src/main/java/com/github/dockerjava/api/model/PeerNode.java
+++ b/src/main/java/com/github/dockerjava/api/model/PeerNode.java
@@ -18,7 +18,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class PeerNode implements Serializable {
 
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/PortConfig.java b/src/main/java/com/github/dockerjava/api/model/PortConfig.java
index aca4d72ec..ede1a2b9f 100644
--- a/src/main/java/com/github/dockerjava/api/model/PortConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/PortConfig.java
@@ -14,7 +14,7 @@
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
 public class PortConfig implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java b/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
index 44ccc0def..75ecd1129 100644
--- a/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
+++ b/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
@@ -18,7 +18,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ResourceRequirements implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java b/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
index 19c7a2f0e..b4f529eba 100644
--- a/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
+++ b/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
@@ -18,7 +18,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ResourceSpecs implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java b/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
index dc5da1b85..ee80e571a 100644
--- a/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
+++ b/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
@@ -19,7 +19,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ResourceVersion implements Serializable {
 
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/Service.java b/src/main/java/com/github/dockerjava/api/model/Service.java
index d66cfa5ae..b00e35299 100644
--- a/src/main/java/com/github/dockerjava/api/model/Service.java
+++ b/src/main/java/com/github/dockerjava/api/model/Service.java
@@ -22,7 +22,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_NULL)
 public class Service implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java b/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
index f183f1715..dadb3c4cf 100644
--- a/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
@@ -12,7 +12,7 @@
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
 public class ServiceGlobalModeOptions implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     // Intentionally left blank, there are no options for this mode
 
diff --git a/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java b/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
index d88f6d8a9..9d6d2e353 100644
--- a/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
+++ b/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
@@ -19,7 +19,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ServicePlacement implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java b/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
index 70ab85d46..db1617c52 100644
--- a/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
@@ -14,7 +14,7 @@
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
 public class ServiceRestartPolicy implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java b/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
index f29c9c542..f6498ac62 100644
--- a/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
@@ -20,7 +20,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ServiceSpec implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java b/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
index 67ef8585e..8c995628c 100644
--- a/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
@@ -15,7 +15,7 @@
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
 public class ServiceUpdateStatus implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/Swarm.java b/src/main/java/com/github/dockerjava/api/model/Swarm.java
index 66568544b..0554c53f1 100644
--- a/src/main/java/com/github/dockerjava/api/model/Swarm.java
+++ b/src/main/java/com/github/dockerjava/api/model/Swarm.java
@@ -9,7 +9,7 @@
  * @since 1.24
  */
 public class Swarm extends ClusterInfo {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java b/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
index d2ca4ae29..2b387e0b5 100644
--- a/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
@@ -20,7 +20,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SwarmCAConfig implements Serializable {
 
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java b/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
index 71503df1b..94f74d73d 100644
--- a/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
@@ -20,7 +20,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SwarmDispatcherConfig implements Serializable {
 
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java b/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
index f4a415223..73b04361f 100644
--- a/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
@@ -19,7 +19,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SwarmJoinTokens implements Serializable {
 
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNode.java b/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
index fd2bfe02c..fb96dc2df 100644
--- a/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
@@ -22,7 +22,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SwarmNode implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java b/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
index bf758fc79..ca9e1c5a2 100644
--- a/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
@@ -18,7 +18,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SwarmNodeDescription implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java b/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
index 58e3ae331..afec7f89d 100644
--- a/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
@@ -20,7 +20,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SwarmNodeEngineDescription implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java b/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
index f10e6cda3..d721ff170 100644
--- a/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
@@ -19,7 +19,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SwarmNodeManagerStatus implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java b/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
index ac482570e..a24f0c7db 100644
--- a/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
@@ -15,7 +15,7 @@
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
 public class SwarmNodePlatform implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java b/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
index 81c572b40..375a8afee 100644
--- a/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
@@ -19,7 +19,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SwarmNodePluginDescription implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java b/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
index 3689e3da4..30612f3a4 100644
--- a/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
@@ -19,7 +19,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SwarmNodeResources implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java b/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
index 858f7e3f0..3be0096a7 100644
--- a/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
@@ -20,7 +20,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SwarmNodeSpec implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java b/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
index 0176d4d93..4ea160c85 100644
--- a/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
@@ -19,7 +19,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SwarmNodeStatus implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java b/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
index 54b56b1c0..8bcb336ba 100644
--- a/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
@@ -20,7 +20,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SwarmNodeVersion implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java b/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
index a6f0f5095..f3d736c7b 100644
--- a/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
@@ -19,7 +19,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SwarmOrchestration implements Serializable {
 
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java b/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
index 666d26017..fa788c9b6 100644
--- a/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
@@ -19,7 +19,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SwarmRaftConfig implements Serializable {
 
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java b/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
index 4ff7d7608..f40a12243 100644
--- a/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
@@ -20,7 +20,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SwarmSpec implements Serializable {
 
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java b/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
index ee1c0cba7..d270bb616 100644
--- a/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
+++ b/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
@@ -19,7 +19,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class SwarmVersion implements Serializable {
 
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java b/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
index 394689127..4d8fc508a 100644
--- a/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
+++ b/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
@@ -20,7 +20,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class TaskDefaults implements Serializable {
 
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/TaskSpec.java b/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
index 33123de82..68daa302b 100644
--- a/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
+++ b/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
@@ -19,7 +19,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class TaskSpec implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java b/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
index 8d3646b10..f6a915076 100644
--- a/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
@@ -14,7 +14,7 @@
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
 public class UpdateConfig implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     /**
      * @since 1.24
diff --git a/src/main/java/com/github/dockerjava/api/model/VersionComponent.java b/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
index 11fff0abc..ced70b13d 100644
--- a/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
+++ b/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
@@ -19,7 +19,7 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class VersionComponent implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     @JsonProperty("Details")
     private Map<String, String> details;
diff --git a/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java b/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
index b3160438f..948ae0a4b 100644
--- a/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
+++ b/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
@@ -18,7 +18,7 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class VersionPlatform implements Serializable {
-    public static final Long serialVersionUID = 1L;
+    public static final long serialVersionUID = 1L;
 
     @JsonProperty("Name")
     private String name;

From 356c209120027c893fccfc22613d551d30fc8ced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= <hugares@gmail.com>
Date: Mon, 8 Jul 2019 13:14:41 -0400
Subject: [PATCH 0910/1272] Fix CompressArchiveUtil unit tests

The tar method's contract is very clear, it creates a tar archive from
files in a folder. The unit tests should validate that the tar archive
was created and that the content is what it is supposed to be. Same
apply to the archiveTARFiles method.

Before, in order to validate that the tar archive was created, the unit
tests were un-archiving the tar. This is wrong as you end up implicitly
testing the extraction code which could be faulty.

In addition, the 2 tests for symlinks were not even checking if the
extracted file was a symlink, they were only checking if the file or
folder were readable.

Rewrite the tests to assert directly the content of the archive. Also
fix the 2 symlinks tests to make sure the tar preserve them. Fixing the
unit tests exposed that CompressArchiveUtil  methods do not preserve the
symlinks which is a bug. Add @Ignore annotation for those tests until
the bug is fixed.

This change is a preparation change to fix the archive creation to
preserve symlinks so add tests to increase archive creation code
coverage close to 100%. This will allow to fix the code while making
sure no regression are introduced.

Related to issue https://github.com/docker-java/docker-java/issues/532
---
 .../core/util/CompressArchiveUtilTest.java    | 352 +++++++++++++++---
 1 file changed, 292 insertions(+), 60 deletions(-)

diff --git a/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java b/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
index 896fd9415..c2b4a6f4b 100644
--- a/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
+++ b/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
@@ -2,23 +2,27 @@
 
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.apache.commons.io.IOUtils;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
 import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.zip.GZIPInputStream;
 
 import static java.util.Arrays.asList;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 public class CompressArchiveUtilTest {
 
@@ -26,69 +30,297 @@ public class CompressArchiveUtilTest {
     public TemporaryFolder tempFolder = new TemporaryFolder();
 
     @Test
-    public void testExecutableFlagIsPreserved() throws Exception {
+    public void tarWithRegularFileAsInput() throws Exception {
+        Path archiveSourceFile = tempFolder.getRoot().toPath().resolve("sourceFile");
+        createFileWithContent(archiveSourceFile);
+
+        // ChildrenOnly = false
+        Path tarGzFile = tempFolder.newFile("archive.tar.gz").toPath();
+        CompressArchiveUtil.tar(archiveSourceFile, tarGzFile, true, false);
+        assertEquals(1, getNumberOfEntryInArchive(tarGzFile.toFile()));
+        assertTarArchiveEntryIsNonEmptyFile(tarGzFile.toFile(), "sourceFile");
+
+        // ChildrenOnly = true, this option make no sense when input is a file but still, let's test it
+        // to make sure it behaves as expected
+        tarGzFile = tempFolder.newFile("archiveChildrenOnly.tar.gz").toPath();
+        CompressArchiveUtil.tar(archiveSourceFile, tarGzFile, true, false);
+        assertEquals(1, getNumberOfEntryInArchive(tarGzFile.toFile()));
+        assertTarArchiveEntryIsNonEmptyFile(tarGzFile.toFile(), "sourceFile");
+    }
+
+    @Test
+    public void tarWithExecutableFileAsInput() throws Exception {
+        Path archiveSourceFile = tempFolder.getRoot().toPath().resolve("executableFile.sh");
+        createFileWithContent(archiveSourceFile);
+        archiveSourceFile.toFile().setExecutable(true);
+
+        // ChildrenOnly = false
+        Path tarGzFile = tempFolder.newFile("archive.tar.gz").toPath();
+        CompressArchiveUtil.tar(archiveSourceFile, tarGzFile, true, false);
+        assertEquals(1, getNumberOfEntryInArchive(tarGzFile.toFile()));
+        assertTarArchiveEntryIsExecutableFile(tarGzFile.toFile(), "executableFile.sh");
+
+        // ChildrenOnly = true, this option make no sense when input is a file but still, let's test it
+        // to make sure it behaves as expected
+        tarGzFile = tempFolder.newFile("archiveChildrenOnly.tar.gz").toPath();
+        CompressArchiveUtil.tar(archiveSourceFile, tarGzFile, true, false);
+        assertEquals(1, getNumberOfEntryInArchive(tarGzFile.toFile()));
+        assertTarArchiveEntryIsExecutableFile(tarGzFile.toFile(), "executableFile.sh");
+    }
+
+    @Test
+    @Ignore("Symlink creation is broken so test do not pass")
+    public void tarWithSymbolicLinkFileAsInput() throws IOException {
+        Path archiveSourceFile = tempFolder.getRoot().toPath().resolve("symlinkFile");
+        Path linkTargetFile = tempFolder.newFile("link-target").toPath();
+        Files.createSymbolicLink(archiveSourceFile, linkTargetFile);
+
+        // ChildrenOnly = false
+        Path tarGzFile = tempFolder.newFile("archive.tar.gz").toPath();
+        CompressArchiveUtil.tar(archiveSourceFile, tarGzFile, true, false);
+        assertEquals(1, getNumberOfEntryInArchive(tarGzFile.toFile()));
+        assertTarArchiveEntryIsSymlink(tarGzFile.toFile(), "symlinkFile", linkTargetFile.toString());
+
+        // ChildrenOnly = true, this option make no sense when input is a file but still, let's test it
+        // to make sure it behaves as expected
+        tarGzFile = tempFolder.newFile("archiveChildrenOnly.tar.gz").toPath();
+        CompressArchiveUtil.tar(archiveSourceFile, tarGzFile, true, false);
+        assertEquals(1, getNumberOfEntryInArchive(tarGzFile.toFile()));
+        assertTarArchiveEntryIsSymlink(tarGzFile.toFile(), "symlinkFile", linkTargetFile.toString());
+    }
+
+    @Test
+    public void tarWithfolderAsInput() throws Exception {
+        Path archiveSourceDir = tempFolder.newFolder("archive-source").toPath();
+        createFoldersAndSubFolderWithFiles(archiveSourceDir);
+
+        // ChildrenOnly = false
+        Path tarGzFile = tempFolder.newFile("archive.tar.gz").toPath();
+        CompressArchiveUtil.tar(archiveSourceDir, tarGzFile, true, false);
+        assertEquals(7, getNumberOfEntryInArchive(tarGzFile.toFile()));
+        assertTarArchiveEntryIsDirectory(tarGzFile.toFile(), "archive-source");
+        assertTarArchiveEntryIsDirectory(tarGzFile.toFile(), "folderA");
+        assertTarArchiveEntryIsDirectory(tarGzFile.toFile(), "folderB");
+        assertTarArchiveEntryIsDirectory(tarGzFile.toFile(), "subFolderB");
+        assertTarArchiveEntryIsNonEmptyFile(tarGzFile.toFile(), "fileA");
+        assertTarArchiveEntryIsNonEmptyFile(tarGzFile.toFile(), "fileB");
+        assertTarArchiveEntryIsNonEmptyFile(tarGzFile.toFile(), "subFileB");
+
+        // ChildrenOnly = true
+        tarGzFile = tempFolder.newFile("archiveChildrenOnly.tar.gz").toPath();
+        CompressArchiveUtil.tar(archiveSourceDir, tarGzFile, true, true);
+        assertEquals(6, getNumberOfEntryInArchive(tarGzFile.toFile()));
+        assertTarArchiveEntryIsDirectory(tarGzFile.toFile(), "folderA");
+        assertTarArchiveEntryIsDirectory(tarGzFile.toFile(), "folderB");
+        assertTarArchiveEntryIsDirectory(tarGzFile.toFile(), "subFolderB");
+        assertTarArchiveEntryIsNonEmptyFile(tarGzFile.toFile(), "fileA");
+        assertTarArchiveEntryIsNonEmptyFile(tarGzFile.toFile(), "fileB");
+        assertTarArchiveEntryIsNonEmptyFile(tarGzFile.toFile(), "subFileB");
+    }
+
+    @Test
+    public void tarWithfolderAsInputAndNestedExecutableFile() throws Exception {
+        Path archiveSourceDir = tempFolder.newFolder("archive-source").toPath();
+        Path executableFile = archiveSourceDir.resolve("executableFile.sh");
+        createFileWithContent(executableFile);
+        executableFile.toFile().setExecutable(true);
+
+        // ChildrenOnly = false
+        Path tarGzFile = tempFolder.newFile("archive.tar.gz").toPath();
+        CompressArchiveUtil.tar(archiveSourceDir, tarGzFile, true, false);
+        assertEquals(2, getNumberOfEntryInArchive(tarGzFile.toFile()));
+        assertTarArchiveEntryIsDirectory(tarGzFile.toFile(), "archive-source");
+        assertTarArchiveEntryIsExecutableFile(tarGzFile.toFile(), "executableFile.sh");
+
+        // ChildrenOnly = true
+        tarGzFile = tempFolder.newFile("archiveChildrenOnly.tar.gz").toPath();
+        CompressArchiveUtil.tar(archiveSourceDir, tarGzFile, true, true);
+        assertEquals(1, getNumberOfEntryInArchive(tarGzFile.toFile()));
+        assertTarArchiveEntryIsExecutableFile(tarGzFile.toFile(), "executableFile.sh");
+    }
+
+    @Test
+    @Ignore("Symlink creation is broken so test do not pass")
+    public void tarWithfolderAsInputAndNestedSymbolicLinkFile() throws Exception {
+        Path archiveSourceDir = tempFolder.newFolder("archive-source").toPath();
+        Path linkTargetFile = tempFolder.newFile("link-target").toPath();
+        Path symlinkFile = archiveSourceDir.resolve("symlinkFile");
+        Files.createSymbolicLink(symlinkFile, linkTargetFile);
+
+        // ChildrenOnly = false
+        Path tarGzFile = tempFolder.newFile("archive.tar.gz").toPath();
+        CompressArchiveUtil.tar(archiveSourceDir, tarGzFile, true, false);
+        assertEquals(2, getNumberOfEntryInArchive(tarGzFile.toFile()));
+        assertTarArchiveEntryIsDirectory(tarGzFile.toFile(), "archive-source");
+        assertTarArchiveEntryIsSymlink(tarGzFile.toFile(), "symlinkFile", linkTargetFile.toString());
+
+        // ChildrenOnly = true
+        tarGzFile = tempFolder.newFile("archiveChildrenOnly.tar.gz").toPath();
+        CompressArchiveUtil.tar(archiveSourceDir, tarGzFile, true, true);
+        assertEquals(1, getNumberOfEntryInArchive(tarGzFile.toFile()));
+        assertTarArchiveEntryIsSymlink(tarGzFile.toFile(), "symlinkFile", linkTargetFile.toString());
+    }
+
+    @Test
+    @Ignore("Symlink creation is broken so test do not pass")
+    public void tarWithfolderAsInputAndNestedSymbolicLinkDir() throws Exception {
+        Path archiveSourceDir = tempFolder.newFolder("archive-source").toPath();
+        Path linkTargetDir = tempFolder.newFolder("link-target").toPath();
+        Path symlinkFile = archiveSourceDir.resolve("symlinkFile");
+        Files.createSymbolicLink(symlinkFile, linkTargetDir);
+
+        // ChildrenOnly = false
+        Path tarGzFile = tempFolder.newFile("archive.tar.gz").toPath();
+        CompressArchiveUtil.tar(archiveSourceDir, tarGzFile, true, false);
+        assertEquals(2, getNumberOfEntryInArchive(tarGzFile.toFile()));
+        assertTarArchiveEntryIsDirectory(tarGzFile.toFile(), "archive-source");
+        assertTarArchiveEntryIsSymlink(tarGzFile.toFile(), "symlinkFile", linkTargetDir.toString());
+
+        // ChildrenOnly = true
+        tarGzFile = tempFolder.newFile("archiveChildrenOnly.tar.gz").toPath();
+        CompressArchiveUtil.tar(archiveSourceDir, tarGzFile, true, true);
+        assertEquals(1, getNumberOfEntryInArchive(tarGzFile.toFile()));
+        assertTarArchiveEntryIsSymlink(tarGzFile.toFile(), "symlinkFile", linkTargetDir.toString());
+    }
+
+    @Test
+    public void archiveTARFilesWithFolderAndFiles() throws Exception {
+        File archive = CompressArchiveUtil.archiveTARFiles(tempFolder.getRoot(),
+                createFoldersAndSubFolderWithFiles(tempFolder.getRoot().toPath()), "archive");
+        assertEquals(6, getNumberOfEntryInArchive(archive));
+        assertTarArchiveEntryIsDirectory(archive, "folderA");
+        assertTarArchiveEntryIsDirectory(archive, "folderB");
+        assertTarArchiveEntryIsDirectory(archive, "subFolderB");
+        assertTarArchiveEntryIsNonEmptyFile(archive, "fileA");
+        assertTarArchiveEntryIsNonEmptyFile(archive, "fileB");
+        assertTarArchiveEntryIsNonEmptyFile(archive, "subFileB");
+    }
+
+    @Test
+    public void archiveTARFilesWithExecutableFile() throws Exception {
         File executableFile = tempFolder.newFile("executableFile.sh");
         executableFile.setExecutable(true);
-        assertThat(executableFile.canExecute(), is(true));
-
-        File archive = CompressArchiveUtil.archiveTARFiles(tempFolder.getRoot(), asList(executableFile),
-                "archive");
-        File expectedFile = extractFileByName(archive, "executableFile.sh", "executableFile.sh.result");
-
-        assertThat("should be executable", expectedFile.canExecute());
-    }
-
-    private File extractFileByName(File archive, String filenameToExtract, String outputName) throws IOException {
-        File expectedFile = new File(tempFolder.newFolder(), outputName);
-        expectedFile.delete();
-        assertThat(expectedFile.exists(), is(false));
-
-        TarArchiveInputStream tarArchiveInputStream = new TarArchiveInputStream(new GZIPInputStream(
-                new BufferedInputStream(new FileInputStream(archive))));
-        TarArchiveEntry entry;
-        boolean found = false;
-        while ((entry = tarArchiveInputStream.getNextTarEntry()) != null) {
-            String individualFiles = entry.getName();
-            if (individualFiles.equals(filenameToExtract) || individualFiles.endsWith("/" + filenameToExtract)) {
-                found = true;
-                IOUtils.copy(tarArchiveInputStream, new FileOutputStream(expectedFile));
-                if ((entry.getMode() & 0755) == 0755) {
-                    expectedFile.setExecutable(true);
-                }
-                break;
-            }
-        }
-        assertThat("should extracted the file", found);
-        tarArchiveInputStream.close();
-        return expectedFile;
+
+        File archive = CompressArchiveUtil.archiveTARFiles(tempFolder.getRoot(), asList(executableFile), "archive");
+        assertEquals(1, getNumberOfEntryInArchive(archive));
+        assertTarArchiveEntryIsExecutableFile(archive, "executableFile.sh");
     }
 
     @Test
-    public void testSymbolicLinkDir() throws IOException {
-        Path uploadDir = tempFolder.newFolder("upload").toPath();
-        Path linkTarget = tempFolder.newFolder("link-target").toPath();
-        Path tmpFile = Files.createTempFile(linkTarget, "link-dir", "rand");
-        Files.createSymbolicLink(uploadDir.resolve("link-folder"), linkTarget);
-        Path tarGzFile = tempFolder.newFile("docker-java.tar.gz").toPath();
-        //follow link only works for childrenOnly=false
-        CompressArchiveUtil.tar(uploadDir, tarGzFile, true, false);
-        File expectedFile = extractFileByName(tarGzFile.toFile(), tmpFile.toFile().getName(), "foo1");
-        assertThat(expectedFile.canRead(), is(true));
+    @Ignore("Symlink creation is broken so test do not pass")
+    public void archiveTARFilesWithSymbolicLinkFile() throws Exception {
+        Path linkTargetFile = tempFolder.newFile("link-target").toPath();
+        Path symlinkFile = tempFolder.getRoot().toPath().resolve("symlinkFile");
+        Files.createSymbolicLink(symlinkFile, linkTargetFile);
+
+        File archive = CompressArchiveUtil.archiveTARFiles(tempFolder.getRoot(), asList(symlinkFile.toFile()), "archive");
+        assertEquals(1, getNumberOfEntryInArchive(archive));
+        assertTarArchiveEntryIsSymlink(archive, "symlinkFile", linkTargetFile.toString());
     }
 
     @Test
-    public void testSymbolicLinkFile() throws IOException {
-        Path uploadDir = tempFolder.newFolder("upload").toPath();
-        Path tmpFile = tempFolder.newFile("src").toPath();
-        Files.createSymbolicLink(uploadDir.resolve("link-file"), tmpFile);
-        Path tarGzFile = tempFolder.newFile("docker-java.tar.gz").toPath();
-        boolean childrenOnly = false;
-        CompressArchiveUtil.tar(uploadDir, tarGzFile, true, childrenOnly);
-        File expectedFile = extractFileByName(tarGzFile.toFile(), "link-file", "foo1");
-        assertThat(expectedFile.canRead(), is(true));
-        childrenOnly = true;
-        CompressArchiveUtil.tar(uploadDir, tarGzFile, true, childrenOnly);
-        extractFileByName(tarGzFile.toFile(), "link-file", "foo1");
-        assertThat(expectedFile.canRead(), is(true));
+    @Ignore("Symlink creation is broken so test do not pass")
+    public void archiveTARFilesWithSymbolicLinkDir() throws Exception {
+        Path linkTargetDir = tempFolder.newFolder("link-target").toPath();
+        Path symlinkFile = tempFolder.getRoot().toPath().resolve("symlinkFile");
+        Files.createSymbolicLink(symlinkFile, linkTargetDir);
+
+        File archive = CompressArchiveUtil.archiveTARFiles(tempFolder.getRoot(), asList(symlinkFile.toFile()), "archive");
+        assertEquals(1, getNumberOfEntryInArchive(archive));
+        assertTarArchiveEntryIsSymlink(archive, "symlinkFile", linkTargetDir.toString());
+    }
+
+    private static void assertTarArchiveEntryIsDirectory(File archive, String directoryName) throws IOException {
+        TarArchiveEntry tarArchiveEntry = getTarArchiveEntry(archive, directoryName);
+        assertNotNull(tarArchiveEntry);
+        assertTrue(tarArchiveEntry.isDirectory());
+    }
+
+    private static void assertTarArchiveEntryIsNonEmptyFile(File archive, String fileName) throws IOException {
+        TarArchiveEntry tarArchiveEntry = getTarArchiveEntry(archive, fileName);
+        assertNotNull(tarArchiveEntry);
+        assertTrue(tarArchiveEntry.isFile());
+        assertTrue(tarArchiveEntry.getSize()>0);
+    }
+
+    private static void assertTarArchiveEntryIsExecutableFile(File archive, String fileName) throws IOException {
+        TarArchiveEntry tarArchiveEntry = getTarArchiveEntry(archive, fileName);
+        assertNotNull(tarArchiveEntry);
+        assertTrue(tarArchiveEntry.isFile());
+        assertEquals("should be executable", (tarArchiveEntry.getMode() & 0755), 0755);
+    }
+
+    private static void assertTarArchiveEntryIsSymlink(File archive, String fileName, String expectedTarget) throws IOException {
+        TarArchiveEntry tarArchiveEntry = getTarArchiveEntry(archive, fileName);
+        assertNotNull(tarArchiveEntry);
+        assertTrue("should be a symbolic link", tarArchiveEntry.isSymbolicLink());
+        assertEquals(expectedTarget, tarArchiveEntry.getLinkName());
+    }
+
+    /**
+     * Creates the following directory structure with files in the specified
+     * destination folder
+     *
+     *   destinationFolder
+     *   |__folderA
+     *   |  |__fileA
+     *   |__folderB
+     *      |__fileB
+     *      |__subFolderB
+     *         |__subFileB
+     *
+     *
+     * @param destinationFolder where to create the folder/files.
+     * @return the list of created files.
+     * @throws IOException if an error occurs while creating the folders/files.
+     */
+    private static List<File> createFoldersAndSubFolderWithFiles(Path destinationFolder) throws IOException {
+        List<File> createdFiles = new ArrayList<File>();
+        Path folderA = destinationFolder.resolve("folderA");
+        createdFiles.add(Files.createDirectories(folderA).toFile());
+        createdFiles.add(createFileWithContent(folderA.resolve("fileA")));
+
+        Path folderB = destinationFolder.resolve("folderB");
+        createdFiles.add(Files.createDirectories(folderB).toFile());
+        createdFiles.add(createFileWithContent(folderB.resolve("fileB")));
+
+        Path subFolderB = folderB.resolve("subFolderB");
+        createdFiles.add(Files.createDirectories(subFolderB).toFile());
+        createdFiles.add(createFileWithContent(folderA.resolve("subFileB")));
+        return createdFiles;
+    }
+
+    private static File createFileWithContent(Path fileToCreate) throws IOException {
+        try (InputStream in = new ByteArrayInputStream("some content".getBytes())) {
+            Files.copy(in, fileToCreate);
+        }
+        return fileToCreate.toFile();
+    }
+
+    private static TarArchiveEntry getTarArchiveEntry(File tarArchive, String filename) throws IOException {
+        try (TarArchiveInputStream tarArchiveInputStream = new TarArchiveInputStream(
+                new GZIPInputStream(new BufferedInputStream(new FileInputStream(tarArchive))))) {
+            TarArchiveEntry entry;
+            while ((entry = tarArchiveInputStream.getNextTarEntry()) != null) {
+                if (entry.getName().equals(filename)
+                        || entry.getName().endsWith("/" + filename)
+                        || entry.getName().equals(filename + "/")
+                        || entry.getName().endsWith("/" + filename + "/")) {
+                    return entry;
+                }
+            }
+        }
+        return null;
+    }
+
+    private static int getNumberOfEntryInArchive(File tarArchive) throws IOException {
+        int numberOfEntries = 0;
+        try (TarArchiveInputStream tarArchiveInputStream = new TarArchiveInputStream(
+                new GZIPInputStream(new BufferedInputStream(new FileInputStream(tarArchive))))) {
+            while ((tarArchiveInputStream.getNextTarEntry()) != null) {
+                numberOfEntries++;
+            }
+        }
+        return numberOfEntries;
     }
 }

From 63f693bc96ef0b46bd3db156f705c41b9aef9855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= <hugares@gmail.com>
Date: Tue, 9 Jul 2019 21:16:55 -0400
Subject: [PATCH 0911/1272] Remove duplicated code to add a file to a tar

This remove the duplicated code to handle executable file and copy of
the file content into the archive. It will also allow to fix the symlink
without duplicating the fix in 3 places.

Related to issue https://github.com/docker-java/docker-java/issues/532
---
 .../core/util/CompressArchiveUtil.java        | 37 +++++++------------
 .../dockerjava/core/util/TarDirWalker.java    |  6 +--
 2 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
index 97471d7fe..7c146bc81 100644
--- a/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
+++ b/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
@@ -28,14 +28,19 @@ private CompressArchiveUtil() {
         // utility class
     }
 
-    static void putTarEntry(TarArchiveOutputStream tarOutputStream, TarArchiveEntry tarEntry, Path file)
+    static void addFileToTar(TarArchiveOutputStream tarArchiveOutputStream, Path file, String entryName)
             throws IOException {
-        tarEntry.setSize(Files.size(file));
-        tarOutputStream.putArchiveEntry(tarEntry);
-        try (InputStream input = new BufferedInputStream(Files.newInputStream(file))) {
-            ByteStreams.copy(input, tarOutputStream);
-            tarOutputStream.closeArchiveEntry();
+        TarArchiveEntry archiveEntry = (TarArchiveEntry) tarArchiveOutputStream.createArchiveEntry(file.toFile(), entryName);
+        if (file.toFile().canExecute()) {
+            archiveEntry.setMode(archiveEntry.getMode() | 0755);
         }
+        tarArchiveOutputStream.putArchiveEntry(archiveEntry);
+        if (file.toFile().isFile()) {
+            try (InputStream input = new BufferedInputStream(Files.newInputStream(file))) {
+                ByteStreams.copy(input, tarArchiveOutputStream);
+            }
+        }
+        tarArchiveOutputStream.closeArchiveEntry();
     }
 
     private static TarArchiveOutputStream buildTarStream(Path outputPath, boolean gZipped) throws IOException {
@@ -69,11 +74,7 @@ public static void tar(Path inputPath, Path outputPath, boolean gZipped, boolean
 
         try (TarArchiveOutputStream tarArchiveOutputStream = buildTarStream(outputPath, gZipped)) {
             if (!Files.isDirectory(inputPath)) {
-                TarArchiveEntry tarEntry = new TarArchiveEntry(inputPath.getFileName().toString());
-                if (inputPath.toFile().canExecute()) {
-                    tarEntry.setMode(tarEntry.getMode() | 0755);
-                }
-                putTarEntry(tarArchiveOutputStream, tarEntry, inputPath);
+                addFileToTar(tarArchiveOutputStream, inputPath, inputPath.getFileName().toString());
             } else {
                 Path sourcePath = inputPath;
                 if (!childrenOnly) {
@@ -95,19 +96,7 @@ public static File archiveTARFiles(File base, Iterable<File> files, String archi
                 new FileOutputStream(tarFile))))) {
             tos.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
             for (File file : files) {
-                TarArchiveEntry tarEntry = new TarArchiveEntry(file);
-                tarEntry.setName(relativize(base, file));
-
-                if (!file.isDirectory() && file.canExecute()) {
-                    tarEntry.setMode(tarEntry.getMode() | 0755);
-                }
-
-                tos.putArchiveEntry(tarEntry);
-
-                if (!file.isDirectory()) {
-                    FileUtils.copyFile(file, tos);
-                }
-                tos.closeArchiveEntry();
+                addFileToTar(tos, file.toPath(), relativize(base, file));
             }
         }
 
diff --git a/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java b/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
index ec390611d..400f004d7 100644
--- a/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
+++ b/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
@@ -36,11 +36,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
         if (attrs.isSymbolicLink()) { // symbolic link to folder
             return FileVisitResult.CONTINUE;
         }
-        TarArchiveEntry tarEntry = new TarArchiveEntry(FilePathUtil.relativize(basePath, file));
-        if (file.toFile().canExecute()) {
-            tarEntry.setMode(tarEntry.getMode() | 0755);
-        }
-        CompressArchiveUtil.putTarEntry(tarArchiveOutputStream, tarEntry, file);
+        CompressArchiveUtil.addFileToTar(tarArchiveOutputStream, file, FilePathUtil.relativize(basePath, file));
         return FileVisitResult.CONTINUE;
     }
 

From 5f7349f0615f6f65ac06df20a4d46849f8668c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= <hugares@gmail.com>
Date: Tue, 9 Jul 2019 22:02:09 -0400
Subject: [PATCH 0912/1272] Fix tar creation with symbolic link

Symbolic link should be archived as is, same as what native docker
client does.

Closes https://github.com/docker-java/docker-java/issues/532
---
 .../core/util/CompressArchiveUtil.java        | 33 +++++++++++--------
 .../dockerjava/core/util/TarDirWalker.java    |  3 --
 .../core/util/CompressArchiveUtilTest.java    |  6 ----
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
index 7c146bc81..4590abb13 100644
--- a/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
+++ b/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.core.util;
 
 import static com.github.dockerjava.core.util.FilePathUtil.relativize;
-import static java.nio.file.FileVisitOption.FOLLOW_LINKS;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -13,7 +12,6 @@
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.EnumSet;
 import java.util.zip.GZIPOutputStream;
 
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
@@ -30,14 +28,21 @@ private CompressArchiveUtil() {
 
     static void addFileToTar(TarArchiveOutputStream tarArchiveOutputStream, Path file, String entryName)
             throws IOException {
-        TarArchiveEntry archiveEntry = (TarArchiveEntry) tarArchiveOutputStream.createArchiveEntry(file.toFile(), entryName);
-        if (file.toFile().canExecute()) {
-            archiveEntry.setMode(archiveEntry.getMode() | 0755);
-        }
-        tarArchiveOutputStream.putArchiveEntry(archiveEntry);
-        if (file.toFile().isFile()) {
-            try (InputStream input = new BufferedInputStream(Files.newInputStream(file))) {
-                ByteStreams.copy(input, tarArchiveOutputStream);
+        if (Files.isSymbolicLink(file)) {
+            TarArchiveEntry tarArchiveEntry = new TarArchiveEntry(entryName, TarArchiveEntry.LF_SYMLINK);
+            tarArchiveEntry.setLinkName(Files.readSymbolicLink(file).toString());
+            tarArchiveOutputStream.putArchiveEntry(tarArchiveEntry);
+        } else {
+            TarArchiveEntry tarArchiveEntry = (TarArchiveEntry) tarArchiveOutputStream.createArchiveEntry(file.toFile(),
+                    entryName);
+            if (file.toFile().canExecute()) {
+                tarArchiveEntry.setMode(tarArchiveEntry.getMode() | 0755);
+            }
+            tarArchiveOutputStream.putArchiveEntry(tarArchiveEntry);
+            if (file.toFile().isFile()) {
+                try (InputStream input = new BufferedInputStream(Files.newInputStream(file))) {
+                    ByteStreams.copy(input, tarArchiveOutputStream);
+                }
             }
         }
         tarArchiveOutputStream.closeArchiveEntry();
@@ -81,8 +86,7 @@ public static void tar(Path inputPath, Path outputPath, boolean gZipped, boolean
                     // In order to have the dossier as the root entry
                     sourcePath = inputPath.getParent();
                 }
-                Files.walkFileTree(inputPath, EnumSet.of(FOLLOW_LINKS), Integer.MAX_VALUE,
-                        new TarDirWalker(sourcePath, tarArchiveOutputStream));
+                Files.walkFileTree(inputPath, new TarDirWalker(sourcePath, tarArchiveOutputStream));
             }
             tarArchiveOutputStream.flush();
         }
@@ -96,7 +100,10 @@ public static File archiveTARFiles(File base, Iterable<File> files, String archi
                 new FileOutputStream(tarFile))))) {
             tos.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
             for (File file : files) {
-                addFileToTar(tos, file.toPath(), relativize(base, file));
+                // relativize with method using Path otherwise method with File resolves the symlinks
+                // and this is not want we want. If the file is a symlink, the relativized path should
+                // keep the symlink name and not the target it points to.
+                addFileToTar(tos, file.toPath(), relativize(base.toPath(), file.toPath()));
             }
         }
 
diff --git a/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java b/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
index 400f004d7..a2b87d7bc 100644
--- a/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
+++ b/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
@@ -33,9 +33,6 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) th
 
     @Override
     public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-        if (attrs.isSymbolicLink()) { // symbolic link to folder
-            return FileVisitResult.CONTINUE;
-        }
         CompressArchiveUtil.addFileToTar(tarArchiveOutputStream, file, FilePathUtil.relativize(basePath, file));
         return FileVisitResult.CONTINUE;
     }
diff --git a/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java b/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
index c2b4a6f4b..e8d88d246 100644
--- a/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
+++ b/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
@@ -2,7 +2,6 @@
 
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -69,7 +68,6 @@ public void tarWithExecutableFileAsInput() throws Exception {
     }
 
     @Test
-    @Ignore("Symlink creation is broken so test do not pass")
     public void tarWithSymbolicLinkFileAsInput() throws IOException {
         Path archiveSourceFile = tempFolder.getRoot().toPath().resolve("symlinkFile");
         Path linkTargetFile = tempFolder.newFile("link-target").toPath();
@@ -140,7 +138,6 @@ public void tarWithfolderAsInputAndNestedExecutableFile() throws Exception {
     }
 
     @Test
-    @Ignore("Symlink creation is broken so test do not pass")
     public void tarWithfolderAsInputAndNestedSymbolicLinkFile() throws Exception {
         Path archiveSourceDir = tempFolder.newFolder("archive-source").toPath();
         Path linkTargetFile = tempFolder.newFile("link-target").toPath();
@@ -162,7 +159,6 @@ public void tarWithfolderAsInputAndNestedSymbolicLinkFile() throws Exception {
     }
 
     @Test
-    @Ignore("Symlink creation is broken so test do not pass")
     public void tarWithfolderAsInputAndNestedSymbolicLinkDir() throws Exception {
         Path archiveSourceDir = tempFolder.newFolder("archive-source").toPath();
         Path linkTargetDir = tempFolder.newFolder("link-target").toPath();
@@ -207,7 +203,6 @@ public void archiveTARFilesWithExecutableFile() throws Exception {
     }
 
     @Test
-    @Ignore("Symlink creation is broken so test do not pass")
     public void archiveTARFilesWithSymbolicLinkFile() throws Exception {
         Path linkTargetFile = tempFolder.newFile("link-target").toPath();
         Path symlinkFile = tempFolder.getRoot().toPath().resolve("symlinkFile");
@@ -219,7 +214,6 @@ public void archiveTARFilesWithSymbolicLinkFile() throws Exception {
     }
 
     @Test
-    @Ignore("Symlink creation is broken so test do not pass")
     public void archiveTARFilesWithSymbolicLinkDir() throws Exception {
         Path linkTargetDir = tempFolder.newFolder("link-target").toPath();
         Path symlinkFile = tempFolder.getRoot().toPath().resolve("symlinkFile");

From c92920f19d511bbf36fb62c04a18b56b50ed2989 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 12 Jul 2019 20:13:03 +0300
Subject: [PATCH 0913/1272] [maven-release-plugin] prepare release 3.1.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1d1106115..7c885cd2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.3-SNAPSHOT</version>
+	<version>3.1.3</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.1.3</tag>
 	</scm>
 
 	<developers>

From 99e79bb22e0865241581ca9db26bf785512f3966 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Fri, 12 Jul 2019 20:13:12 +0300
Subject: [PATCH 0914/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7c885cd2c..33bef69a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.3</version>
+	<version>3.1.4-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.1.3</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 6f00250b3e49db5ff1b90ee1002096fdedaeb522 Mon Sep 17 00:00:00 2001
From: Pedro Cardoso <pedro.cardoso@feedzai.com>
Date: Sun, 14 Jul 2019 21:17:57 +0100
Subject: [PATCH 0915/1272] Reverts create container cmd regression.

Summary:
- Adds Memory and MemorySwap related methods to CreateContainerCmd interface and related interface.

This was done so that the test-containers project can bump it's
docker-java dependency for support to the latest docker version.
See https://github.com/testcontainers/testcontainers-java/pull/1340 for more.

Note that this commit is a continuation of
https://github.com/docker-java/docker-java/pull/1203, wherein I failed
to see that these two methods were not reverted back.
---
 .../api/command/CreateContainerCmd.java       | 14 +++++++++
 .../core/command/CreateContainerCmdImpl.java  | 31 +++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 4fa5dd2e2..cb9821361 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -126,6 +126,20 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     CreateContainerCmd withMacAddress(String macAddress);
 
+    @Deprecated
+    @CheckForNull
+    Long getMemory();
+
+    @Deprecated
+    CreateContainerCmd withMemory(Long memory);
+
+    @Deprecated
+    @CheckForNull
+    Long getMemorySwap();
+
+    @Deprecated
+    CreateContainerCmd withMemorySwap(Long memorySwap);
+
     @CheckForNull
     String getName();
 
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 1819be0c3..740e0e5e2 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -351,6 +351,37 @@ public CreateContainerCmd withMacAddress(String macAddress) {
         return this;
     }
 
+    @Deprecated
+    @Override
+    @JsonIgnore
+    public Long getMemory() {
+        return hostConfig.getMemory();
+    }
+
+    @Deprecated
+    @Override
+    public CreateContainerCmd withMemory(Long memory) {
+        checkNotNull(memory, "memory was not specified");
+        hostConfig.withMemory(memory);
+        return this;
+    }
+
+    @Deprecated
+    @Override
+    @JsonIgnore
+    public Long getMemorySwap() {
+        return hostConfig.getMemorySwap();
+    }
+
+    @Deprecated
+    @Override
+    public CreateContainerCmd withMemorySwap(Long memorySwap) {
+        checkNotNull(memorySwap, "memorySwap was not specified");
+        hostConfig.withMemorySwap(memorySwap);
+        return this;
+    }
+
+
     @Override
     public String getName() {
         return name;

From 350a806f1e91bf9f177cd76c02f319198d9138a3 Mon Sep 17 00:00:00 2001
From: Vladimir Lagunov <vladimir.lagunov@jetbrains.com>
Date: Mon, 15 Jul 2019 16:11:15 +0700
Subject: [PATCH 0916/1272] Netty factory: Close TCP connection when receive
 TLS close notify

TLS has special TLS Alert message "close_notify". After receiving such packet any conversation
should be immediately stopped. Some TLS implementations (OpenSSL for example) closes underlying TCP
connection when TLS connection being closed, some (Docker SSL server and docker-java before current
commit) does not close. AttachContainerCmd executes `onComplete` callback only when TCP connection
closes, so without this patch `onComplete` called after a long timeout, with this patch it called
when container exits.
---
 .../netty/NettyDockerCmdExecFactory.java      | 26 +++++++-
 .../dockerjava/cmd/AttachContainerCmdIT.java  | 66 +++++++++++++++++++
 2 files changed, 91 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index dfc740e35..e7aa7e790 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -15,6 +15,8 @@
 
 import com.github.dockerjava.core.AbstractDockerCmdExecFactory;
 import com.github.dockerjava.core.WebTarget;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
 import org.apache.commons.lang.SystemUtils;
 
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
@@ -232,12 +234,34 @@ public DuplexChannel connect(Bootstrap bootstrap) throws InterruptedException {
                 throw new RuntimeException("no port configured for " + host);
             }
 
-            DuplexChannel channel = (DuplexChannel) bootstrap.connect(host, port).sync().channel();
+            final DuplexChannel channel = (DuplexChannel) bootstrap.connect(host, port).sync().channel();
 
             final SslHandler ssl = initSsl(dockerClientConfig);
 
             if (ssl != null) {
                 channel.pipeline().addFirst(ssl);
+
+                // https://tools.ietf.org/html/rfc5246#section-7.2.1
+                // TLS has its own special message about connection termination. Because TLS is a
+                // session-level protocol, it can be covered by any transport-level protocol like
+                // TCP, UTP and so on. But we know exactly that data being transferred over TCP and
+                // that other side will never send any byte into this TCP connection, so this
+                // channel should be closed.
+                // RFC says that we must notify opposite side about closing. This could be done only
+                // in sun.security.ssl.SSLEngineImpl and unfortunately it does not send this
+                // message. On the other hand RFC does not enforce the opposite side to wait for
+                // such message.
+                ssl.sslCloseFuture().addListener(new GenericFutureListener<Future<? super Channel>>() {
+                    @Override
+                    public void operationComplete(Future<? super Channel> future) {
+                        channel.eventLoop().execute(new Runnable() {
+                            @Override
+                            public void run() {
+                                channel.close();
+                            }
+                        });
+                    }
+                });
             }
 
             return channel;
diff --git a/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
index bac45f63f..caaadde16 100644
--- a/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
@@ -13,11 +13,14 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayInputStream;
+import java.io.Closeable;
 import java.io.File;
 import java.io.InputStream;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
 
 import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -28,6 +31,7 @@
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeThat;
 
 /**
@@ -205,6 +209,68 @@ public void onNext(Frame frame) {
         callback.close();
     }
 
+    /**
+     * {@link AttachContainerResultCallback#onComplete()} should be called immediately after
+     * container exit. It was broken for Netty and TLS connection.
+     */
+    @Test
+    public void attachContainerClosesStdoutWhenContainerExits() throws Exception {
+        DockerClient dockerClient = dockerRule.getClient();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE)
+                .withCmd("echo", "hello world")
+                .withTty(false)
+                .exec();
+        LOG.info("Created container: {}", container.toString());
+
+        final CountDownLatch started = new CountDownLatch(1);
+        final AtomicLong startedAtNanos = new AtomicLong();
+        final CountDownLatch gotLine = new CountDownLatch(1);
+        final CountDownLatch completed = new CountDownLatch(1);
+        final AtomicLong gotLineAtNanos = new AtomicLong();
+        AttachContainerTestCallback callback = new AttachContainerTestCallback() {
+            @Override
+            public void onStart(Closeable stream) {
+                startedAtNanos.set(System.nanoTime());
+                started.countDown();
+                super.onStart(stream);
+            }
+
+            @Override
+            public void onNext(Frame item) {
+                if (item.getStreamType() == StreamType.STDOUT) {
+                    gotLineAtNanos.set(System.nanoTime());
+                    gotLine.countDown();
+                }
+                super.onNext(item);
+            }
+
+            @Override
+            public void onComplete() {
+                completed.countDown();
+                super.onComplete();
+            }
+        };
+
+        try (Closeable ignored = callback) {
+            dockerClient.attachContainerCmd(container.getId())
+                    .withStdOut(true)
+                    .withFollowStream(true)
+                    .exec(callback);
+
+            dockerClient.startContainerCmd(container.getId()).exec();
+
+            assertTrue("Should start in a reasonable time", started.await(30, SECONDS));
+            assertTrue("Should get first line quickly after the start", gotLine.await(15, SECONDS));
+
+            long gotLineDurationSeconds = (gotLineAtNanos.get() - startedAtNanos.get()) / 1_000_000_000L;
+            LOG.info("Got line from {} for {} seconds", container.getId(), gotLineDurationSeconds);
+
+            boolean finished = completed.await(1L + gotLineDurationSeconds, SECONDS);
+            assertTrue("Should get EOF in a time close to time of getting the first line", finished);
+        }
+    }
+
     public static class AttachContainerTestCallback extends AttachContainerResultCallback {
         private StringBuffer log = new StringBuffer();
 

From db750aa766f13435fb825c5031e414ad8b1e0e50 Mon Sep 17 00:00:00 2001
From: Sam Wu <40319887+samwual@users.noreply.github.com>
Date: Mon, 15 Jul 2019 10:38:52 -0400
Subject: [PATCH 0917/1272] Add annotation to ServiceGlobalModeOptions

This fixes the "No serializer found" error thrown when trying to use mode = global.
---
 .../github/dockerjava/api/model/ServiceGlobalModeOptions.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java b/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
index dadb3c4cf..5268b03fe 100644
--- a/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
@@ -11,6 +11,7 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ServiceGlobalModeOptions implements Serializable {
     public static final long serialVersionUID = 1L;
 

From 488b09db61b7c1ddd8235238697e601d41e22012 Mon Sep 17 00:00:00 2001
From: Sam Wu <40319887+samwual@users.noreply.github.com>
Date: Tue, 16 Jul 2019 09:23:47 -0400
Subject: [PATCH 0918/1272] Import

---
 .../github/dockerjava/api/model/ServiceGlobalModeOptions.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java b/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
index 5268b03fe..170f7448f 100644
--- a/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;

From 2010582057f991ea0d5d5703304ad07397f9c3b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= <hugares@gmail.com>
Date: Mon, 15 Jul 2019 15:58:10 -0400
Subject: [PATCH 0919/1272] ResponseStatusExceptionFilter: Fix unwrap of JSON
 message

Reading the entity stream a second time without resetting it was causing
the ObjectMapper to return null then a NullPointerExceptions when
calling get('message') method on it.

Fix the issue by creating the ObjectMapper from the String
representation of the entity stream instead of resetting the stream to
read it a second time. Also check to make sure the returned JsonNode is
not null and that the content is text.

Closes #1222
---
 .../filter/ResponseStatusExceptionFilter.java | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
index 6c2476291..bac31fc81 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
@@ -10,6 +10,8 @@
 import javax.ws.rs.core.MediaType;
 
 import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -31,6 +33,8 @@
  */
 public class ResponseStatusExceptionFilter implements ClientResponseFilter {
 
+    private static final Logger LOG = LoggerFactory.getLogger(ResponseStatusExceptionFilter.class);
+
     @Override
     public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException {
         int status = responseContext.getStatus();
@@ -79,13 +83,19 @@ private String getBodyAsMessage(ClientResponseContext responseContext) {
                 String message = IOUtils.toString(entityStream, charset);
 
                 if (MediaType.APPLICATION_JSON_TYPE.equals(mediaType)) {
-                    ObjectMapper mapper = new ObjectMapper();
-                    JsonNode node = mapper.readTree(entityStream).get("message");
-                    if (node != null) {
-                        message = node.textValue();
+                    try {
+                        JsonNode node = new ObjectMapper().readTree(message);
+                        if (node != null) {
+                            JsonNode messageNode = node.get("message");
+                            if (messageNode != null && messageNode.isTextual()) {
+                                message = messageNode.textValue();
+                            }
+                        }
+                    } catch (IOException e) {
+                        // ignore parsing errors and return the message as is
+                        LOG.debug("Failed to unwrap error message: {}", e.getMessage(), e);
                     }
                 }
-
                 return message;
             } catch (Exception ignored) { }
         }

From 9b1a8feaf1df31a49a7360c033a0a260326f0caf Mon Sep 17 00:00:00 2001
From: Sam Wu <40319887+samwual@users.noreply.github.com>
Date: Tue, 16 Jul 2019 10:54:44 -0400
Subject: [PATCH 0920/1272]  Add annotation to ServiceGlobalModeOptions to json
 ignore unknowns (#1221)

* Add annotation to ServiceGlobalModeOptions

This fixes the "No serializer found" error thrown when trying to use mode = global.

* Import
---
 .../github/dockerjava/api/model/ServiceGlobalModeOptions.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java b/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
index dadb3c4cf..170f7448f 100644
--- a/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
@@ -11,6 +12,7 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ServiceGlobalModeOptions implements Serializable {
     public static final long serialVersionUID = 1L;
 

From 34a6e3aae9c3b44070749c02fe24c2ff05ea8cb7 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 20 Jul 2019 23:32:14 +0300
Subject: [PATCH 0921/1272] [maven-release-plugin] prepare release 3.1.4

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 33bef69a6..0a663d046 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.4-SNAPSHOT</version>
+	<version>3.1.4</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.1.4</tag>
 	</scm>
 
 	<developers>

From 076fd41d881547f1c544d09b182851709085fc58 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 20 Jul 2019 23:32:23 +0300
Subject: [PATCH 0922/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0a663d046..9c23c97b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.4</version>
+	<version>3.1.5-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.1.4</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From cf8ee3bc8bab49c7e62149331a65dfac9d3929ae Mon Sep 17 00:00:00 2001
From: Thomas VAUTRIN <tvautrin.work@gmail.com>
Date: Sun, 21 Jul 2019 11:05:14 +0200
Subject: [PATCH 0923/1272] Add secrets management (Create / List / Remove)

---
 .../github/dockerjava/api/DockerClient.java   |  30 +++++
 .../api/command/CreateSecretCmd.java          |  30 +++++
 .../api/command/CreateSecretResponse.java     |  24 ++++
 .../api/command/DockerCmdExecFactory.java     |  21 ++++
 .../api/command/ListSecretsCmd.java           |  38 +++++++
 .../api/command/RemoveSecretCmd.java          |  28 +++++
 .../github/dockerjava/api/model/Secret.java   |  90 +++++++++++++++
 .../dockerjava/api/model/SecretSpec.java      | 105 ++++++++++++++++++
 .../core/AbstractDockerCmdExecFactory.java    |  23 +++-
 .../dockerjava/core/DockerClientImpl.java     |  22 ++++
 .../core/command/CreateSecretCmdImpl.java     |  34 ++++++
 .../core/command/ListSecretsCmdImpl.java      |  50 +++++++++
 .../core/command/RemoveSecretCmdImpl.java     |  40 +++++++
 .../core/exec/CreateSecretCmdExec.java        |  30 +++++
 .../core/exec/ListSecretsCmdExec.java         |  44 ++++++++
 .../core/exec/RemoveSecretCmdExec.java        |  29 +++++
 .../dockerjava/jaxrs/CreateSecretCmdExec.java |  36 ++++++
 .../jaxrs/JerseyDockerCmdExecFactory.java     |  18 +++
 .../dockerjava/jaxrs/ListSecretsCmdExec.java  |  43 +++++++
 .../dockerjava/jaxrs/RemoveSecretCmdExec.java |  30 +++++
 .../netty/NettyDockerCmdExecFactory.java      |   2 +
 .../cmd/swarm/CreateSecretCmdExecIT.java      |  79 +++++++++++++
 .../cmd/swarm/ListSecretCmdExecIT.java        |  60 ++++++++++
 .../core/TestDockerCmdExecFactory.java        |  18 +++
 24 files changed, 923 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/command/RemoveSecretCmd.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/Secret.java
 create mode 100644 src/main/java/com/github/dockerjava/api/model/SecretSpec.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java
 create mode 100644 src/main/java/com/github/dockerjava/core/exec/CreateSecretCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/core/exec/ListSecretsCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/core/exec/RemoveSecretCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java
 create mode 100644 src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
 create mode 100644 src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java

diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/src/main/java/com/github/dockerjava/api/DockerClient.java
index ddc23dca8..5c8dce226 100644
--- a/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -12,6 +12,7 @@
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.command.CreateSecretCmd;
 import com.github.dockerjava.api.command.CreateServiceCmd;
 import com.github.dockerjava.api.command.CreateVolumeCmd;
 import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
@@ -33,6 +34,7 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.command.ListSecretsCmd;
 import com.github.dockerjava.api.command.ListServicesCmd;
 import com.github.dockerjava.api.command.ListSwarmNodesCmd;
 import com.github.dockerjava.api.command.ListTasksCmd;
@@ -48,6 +50,7 @@
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.RemoveSecretCmd;
 import com.github.dockerjava.api.command.RemoveServiceCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RenameContainerCmd;
@@ -70,6 +73,7 @@
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Identifier;
 import com.github.dockerjava.api.model.PruneType;
+import com.github.dockerjava.api.model.SecretSpec;
 import com.github.dockerjava.api.model.ServiceSpec;
 import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.core.RemoteApiVersion;
@@ -400,6 +404,32 @@ public interface DockerClient extends Closeable {
      */
     PruneCmd pruneCmd(PruneType pruneType);
 
+    /**
+     *  Command to list all secrets. Only applicable if docker runs in swarm mode.
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_25}
+     * @return command
+     */
+    ListSecretsCmd listSecretsCmd();
+
+    /**
+     * Command to create a secret in a docker swarm. Only applicable if docker runs in swarm mode.
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_25}
+     * @param secretSpec the secret specification
+     * @return command
+     */
+    CreateSecretCmd createSecretCmd(SecretSpec secretSpec);
+
+    /**
+     * Command to remove a secret
+     * @param secretId secret id or secret name
+     * @return command
+     */
+    RemoveSecretCmd removeSecretCmd(String secretId);
+
+
+
     @Override
     void close() throws IOException;
 
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java
new file mode 100644
index 000000000..2b305f5dd
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.exception.ConflictException;
+import com.github.dockerjava.api.model.SecretSpec;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import javax.annotation.CheckForNull;
+
+/**
+ * Command to create a new secret
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_25}
+ */
+public interface CreateSecretCmd extends SyncDockerCmd<CreateSecretResponse> {
+
+    @CheckForNull
+    SecretSpec getSecretSpec();
+
+    CreateSecretCmd withSecretSpec(SecretSpec secretSpec);
+
+    /**
+     * @throws ConflictException Named secret already exists
+     */
+    @Override
+    CreateSecretResponse exec() throws ConflictException;
+
+    interface Exec extends DockerCmdSyncExec<CreateSecretCmd, CreateSecretResponse> {
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java b/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
new file mode 100644
index 000000000..5e9c7691e
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
@@ -0,0 +1,24 @@
+package com.github.dockerjava.api.command;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+/**
+ * The response of a {@link CreateSecretCmd}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CreateSecretResponse {
+    @JsonProperty("ID")
+    private String id;
+
+    public String getId() {
+        return id;
+    }
+
+    @Override
+    public String toString() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index f9c142255..1945ddd5b 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -214,6 +214,27 @@ public interface DockerCmdExecFactory extends Closeable {
      */
     PruneCmd.Exec pruneCmdExec();
 
+    /**
+     * Command to list all secrets.
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_25}
+     */
+    ListSecretsCmd.Exec createListSecretsCmdExec();
+
+    /**
+     * Command to create a new secret in a docker swarm. Only applicable if docker runs in swarm mode.
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_25}
+     */
+    CreateSecretCmd.Exec createCreateSecretCmdExec();
+
+    /**
+     * Command to remove a secret in a docker swarm. Only applicable if docker runs in swarm mode.
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_25}
+     */
+    RemoveSecretCmd.Exec createRemoveSecretCmdExec();
+
     @Override
     void close() throws IOException;
 
diff --git a/src/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java b/src/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java
new file mode 100644
index 000000000..9280247c1
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java
@@ -0,0 +1,38 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.api.model.Secret;
+import com.github.dockerjava.api.model.Service;
+
+import javax.annotation.CheckForNull;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * List secrets
+ *
+ */
+public interface ListSecretsCmd extends SyncDockerCmd<List<Secret>> {
+
+    @CheckForNull
+    Map<String, List<String>> getFilters();
+
+    /**
+     * @param ids - Show only secrets with the given ids
+     */
+    ListSecretsCmd withIdFilter(List<String> ids);
+
+    /**
+     * @param names - Show only secrets with the given names
+     */
+    ListSecretsCmd withNameFilter(List<String> names);
+
+    /**
+     * @param labels - Show only secrets with the passed labels. Labels is a {@link Map} that contains label keys and values
+     */
+    ListSecretsCmd withLabelFilter(Map<String, String> labels);
+
+    interface Exec extends DockerCmdSyncExec<ListSecretsCmd, List<Secret>> {
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveSecretCmd.java b/src/main/java/com/github/dockerjava/api/command/RemoveSecretCmd.java
new file mode 100644
index 000000000..28476da1d
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/command/RemoveSecretCmd.java
@@ -0,0 +1,28 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * Remove a secret.
+ */
+public interface RemoveSecretCmd extends SyncDockerCmd<Void> {
+
+    @CheckForNull
+    String getSecretId();
+
+    RemoveSecretCmd withSecretId(@Nonnull String secretId);
+
+    /**
+     * @throws NotFoundException
+     *             No such secret
+     */
+    @Override
+    Void exec() throws NotFoundException;
+
+    interface Exec extends DockerCmdSyncExec<RemoveSecretCmd, Void> {
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/Secret.java b/src/main/java/com/github/dockerjava/api/model/Secret.java
new file mode 100644
index 000000000..79a5e8f21
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/Secret.java
@@ -0,0 +1,90 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Used for Listing secret.
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_25}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class Secret implements Serializable {
+    public static final long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("ID")
+    private String id;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("CreatedAt")
+    private Date createdAt;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("UpdatedAt")
+    private Date updatedAt;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Spec")
+    private ServiceSpec spec;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Version")
+    private ResourceVersion version;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public ServiceSpec getSpec() {
+        return spec;
+    }
+
+    public void setSpec(ServiceSpec spec) {
+        this.spec = spec;
+    }
+
+    public ResourceVersion getVersion() {
+        return version;
+    }
+
+    public void setVersion(ResourceVersion version) {
+        this.version = version;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/api/model/SecretSpec.java b/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
new file mode 100644
index 000000000..6d615b64f
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
@@ -0,0 +1,105 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_25}
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SecretSpec implements Serializable {
+    public static final long serialVersionUID = 1L;
+
+    /**
+     * @since 1.25
+     */
+    @JsonProperty("Name")
+    private String name;
+
+    /**
+     * @since 1.25
+     */
+    @JsonProperty("Data")
+    private String data;
+
+    /**
+     * @since 1.25
+     */
+    @JsonProperty("Labels")
+    private Map<String, String> labels;
+
+    /**
+     * @see #name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @see #name
+     */
+    public SecretSpec withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * @see #data
+     */
+    public String getData() {
+        return data;
+    }
+
+    /**
+     * @see #data
+     */
+    public SecretSpec withData(String data) {
+        this.data = Base64.encodeBase64String(data.getBytes());
+        return this;
+    }
+
+    /**
+     * @see #labels
+     */
+    public SecretSpec withLabels(Map<String, String> labels) {
+        this.labels = labels;
+        return this;
+    }
+
+    /**
+     * @see #labels
+     */
+    @CheckForNull
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return EqualsBuilder.reflectionEquals(this, o);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
index c822b4cc2..ebc8b60b5 100644
--- a/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
@@ -12,6 +12,7 @@
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.command.CreateSecretCmd;
 import com.github.dockerjava.api.command.CreateServiceCmd;
 import com.github.dockerjava.api.command.CreateVolumeCmd;
 import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
@@ -35,6 +36,7 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.command.ListSecretsCmd;
 import com.github.dockerjava.api.command.ListServicesCmd;
 import com.github.dockerjava.api.command.ListSwarmNodesCmd;
 import com.github.dockerjava.api.command.ListTasksCmd;
@@ -50,6 +52,7 @@
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.RemoveSecretCmd;
 import com.github.dockerjava.api.command.RemoveServiceCmd;
 import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
@@ -81,6 +84,7 @@
 import com.github.dockerjava.core.exec.CreateContainerCmdExec;
 import com.github.dockerjava.core.exec.CreateImageCmdExec;
 import com.github.dockerjava.core.exec.CreateNetworkCmdExec;
+import com.github.dockerjava.core.exec.CreateSecretCmdExec;
 import com.github.dockerjava.core.exec.CreateServiceCmdExec;
 import com.github.dockerjava.core.exec.CreateVolumeCmdExec;
 import com.github.dockerjava.core.exec.DisconnectFromNetworkCmdExec;
@@ -103,12 +107,14 @@
 import com.github.dockerjava.core.exec.ListContainersCmdExec;
 import com.github.dockerjava.core.exec.ListImagesCmdExec;
 import com.github.dockerjava.core.exec.ListNetworksCmdExec;
+import com.github.dockerjava.core.exec.ListSecretsCmdExec;
 import com.github.dockerjava.core.exec.ListServicesCmdExec;
 import com.github.dockerjava.core.exec.ListSwarmNodesCmdExec;
 import com.github.dockerjava.core.exec.ListTasksCmdExec;
 import com.github.dockerjava.core.exec.ListVolumesCmdExec;
 import com.github.dockerjava.core.exec.LoadImageCmdExec;
 import com.github.dockerjava.core.exec.LogContainerCmdExec;
+import com.github.dockerjava.core.exec.LogSwarmObjectExec;
 import com.github.dockerjava.core.exec.PauseContainerCmdExec;
 import com.github.dockerjava.core.exec.PingCmdExec;
 import com.github.dockerjava.core.exec.PruneCmdExec;
@@ -117,6 +123,7 @@
 import com.github.dockerjava.core.exec.RemoveContainerCmdExec;
 import com.github.dockerjava.core.exec.RemoveImageCmdExec;
 import com.github.dockerjava.core.exec.RemoveNetworkCmdExec;
+import com.github.dockerjava.core.exec.RemoveSecretCmdExec;
 import com.github.dockerjava.core.exec.RemoveServiceCmdExec;
 import com.github.dockerjava.core.exec.RemoveSwarmNodeCmdExec;
 import com.github.dockerjava.core.exec.RemoveVolumeCmdExec;
@@ -136,7 +143,6 @@
 import com.github.dockerjava.core.exec.UpdateSwarmNodeCmdExec;
 import com.github.dockerjava.core.exec.VersionCmdExec;
 import com.github.dockerjava.core.exec.WaitContainerCmdExec;
-import com.github.dockerjava.core.exec.LogSwarmObjectExec;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -499,5 +505,20 @@ public PruneCmd.Exec pruneCmdExec() {
         return new PruneCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public ListSecretsCmd.Exec createListSecretsCmdExec() {
+        return new ListSecretsCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CreateSecretCmd.Exec createCreateSecretCmdExec() {
+        return new CreateSecretCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveSecretCmd.Exec createRemoveSecretCmdExec() {
+        return new RemoveSecretCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     protected abstract WebTarget getBaseResource();
 }
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index edf3bfc29..87ba0214e 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -13,6 +13,7 @@
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.command.CreateSecretCmd;
 import com.github.dockerjava.api.command.CreateServiceCmd;
 import com.github.dockerjava.api.command.CreateVolumeCmd;
 import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
@@ -35,6 +36,7 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.command.ListSecretsCmd;
 import com.github.dockerjava.api.command.ListServicesCmd;
 import com.github.dockerjava.api.command.ListSwarmNodesCmd;
 import com.github.dockerjava.api.command.ListTasksCmd;
@@ -50,6 +52,7 @@
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.RemoveSecretCmd;
 import com.github.dockerjava.api.command.RemoveServiceCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RenameContainerCmd;
@@ -71,6 +74,7 @@
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Identifier;
 import com.github.dockerjava.api.model.PruneType;
+import com.github.dockerjava.api.model.SecretSpec;
 import com.github.dockerjava.api.model.ServiceSpec;
 import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.core.command.AttachContainerCmdImpl;
@@ -85,6 +89,7 @@
 import com.github.dockerjava.core.command.CreateContainerCmdImpl;
 import com.github.dockerjava.core.command.CreateImageCmdImpl;
 import com.github.dockerjava.core.command.CreateNetworkCmdImpl;
+import com.github.dockerjava.core.command.CreateSecretCmdImpl;
 import com.github.dockerjava.core.command.CreateServiceCmdImpl;
 import com.github.dockerjava.core.command.CreateVolumeCmdImpl;
 import com.github.dockerjava.core.command.DisconnectFromNetworkCmdImpl;
@@ -106,6 +111,7 @@
 import com.github.dockerjava.core.command.ListContainersCmdImpl;
 import com.github.dockerjava.core.command.ListImagesCmdImpl;
 import com.github.dockerjava.core.command.ListNetworksCmdImpl;
+import com.github.dockerjava.core.command.ListSecretsCmdImpl;
 import com.github.dockerjava.core.command.ListServicesCmdImpl;
 import com.github.dockerjava.core.command.ListSwarmNodesCmdImpl;
 import com.github.dockerjava.core.command.ListTasksCmdImpl;
@@ -121,6 +127,7 @@
 import com.github.dockerjava.core.command.RemoveContainerCmdImpl;
 import com.github.dockerjava.core.command.RemoveImageCmdImpl;
 import com.github.dockerjava.core.command.RemoveNetworkCmdImpl;
+import com.github.dockerjava.core.command.RemoveSecretCmdImpl;
 import com.github.dockerjava.core.command.RemoveServiceCmdImpl;
 import com.github.dockerjava.core.command.RemoveVolumeCmdImpl;
 import com.github.dockerjava.core.command.RenameContainerCmdImpl;
@@ -587,6 +594,21 @@ public PruneCmd pruneCmd(PruneType pruneType) {
         return new PruneCmdImpl(getDockerCmdExecFactory().pruneCmdExec(), pruneType);
     }
 
+    @Override
+    public ListSecretsCmd listSecretsCmd() {
+        return new ListSecretsCmdImpl(getDockerCmdExecFactory().createListSecretsCmdExec());
+    }
+
+    @Override
+    public CreateSecretCmd createSecretCmd(SecretSpec secretSpec) {
+        return new CreateSecretCmdImpl(getDockerCmdExecFactory().createCreateSecretCmdExec(), secretSpec);
+    }
+
+    @Override
+    public RemoveSecretCmd removeSecretCmd(String secretId) {
+        return new RemoveSecretCmdImpl(getDockerCmdExecFactory().createRemoveSecretCmdExec(), secretId);
+    }
+
     @Override
     public ListTasksCmd listTasksCmd() {
         return new ListTasksCmdImpl(getDockerCmdExecFactory().listTasksCmdExec());
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java
new file mode 100644
index 000000000..d86b04855
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java
@@ -0,0 +1,34 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.CreateSecretCmd;
+import com.github.dockerjava.api.command.CreateSecretResponse;
+import com.github.dockerjava.api.model.SecretSpec;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Creates a new secret
+ */
+public class CreateSecretCmdImpl extends AbstrDockerCmd<CreateSecretCmd, CreateSecretResponse> implements
+        CreateSecretCmd {
+
+    private SecretSpec secretSpec;
+
+    public CreateSecretCmdImpl(Exec exec, SecretSpec secretSpec) {
+        super(exec);
+        checkNotNull(secretSpec, "secretSpec was not specified");
+        withSecretSpec(secretSpec);
+    }
+
+    @Override
+    public SecretSpec getSecretSpec() {
+        return secretSpec;
+    }
+
+    @Override
+    public CreateSecretCmd withSecretSpec(SecretSpec secretSpec) {
+        checkNotNull(secretSpec, "secretSpec was not specified");
+        this.secretSpec = secretSpec;
+        return this;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java
new file mode 100644
index 000000000..92bbd77b2
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java
@@ -0,0 +1,50 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.ListSecretsCmd;
+import com.github.dockerjava.api.model.Secret;
+import com.github.dockerjava.api.model.Service;
+import com.github.dockerjava.core.util.FiltersBuilder;
+
+import java.util.List;
+import java.util.Map;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * List services.
+ */
+public class ListSecretsCmdImpl extends AbstrDockerCmd<ListSecretsCmd, List<Secret>> implements
+        ListSecretsCmd {
+
+    private FiltersBuilder filters = new FiltersBuilder();
+
+    public ListSecretsCmdImpl(Exec exec) {
+        super(exec);
+    }
+
+    @Override
+    public Map<String, List<String>> getFilters() {
+        return filters.build();
+    }
+
+    @Override
+    public ListSecretsCmd withIdFilter(List<String> ids) {
+        checkNotNull(ids, "ids was not specified");
+        this.filters.withFilter("id", ids);
+        return this;
+    }
+
+    @Override
+    public ListSecretsCmd withNameFilter(List<String> names) {
+        checkNotNull(names, "names was not specified");
+        this.filters.withFilter("name", names);
+        return this;
+    }
+
+    @Override
+    public ListSecretsCmd withLabelFilter(Map<String, String> labels) {
+        checkNotNull(labels, "labels was not specified");
+        this.filters.withLabels(labels);
+        return this;
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java
new file mode 100644
index 000000000..6841d79bd
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java
@@ -0,0 +1,40 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.RemoveSecretCmd;
+import com.github.dockerjava.api.exception.NotFoundException;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Remove a secret.
+ */
+public class RemoveSecretCmdImpl extends AbstrDockerCmd<RemoveSecretCmd, Void> implements RemoveSecretCmd {
+
+    private String secretId;
+
+    public RemoveSecretCmdImpl(Exec exec, String secretId) {
+        super(exec);
+        withSecretId(secretId);
+    }
+
+    @Override
+    public String getSecretId() {
+        return secretId;
+    }
+
+    @Override
+    public RemoveSecretCmd withSecretId(String secretId) {
+        checkNotNull(secretId, "secretId was not specified");
+        this.secretId = secretId;
+        return this;
+    }
+
+    /**
+     * @throws NotFoundException
+     *             No such secret
+     */
+    @Override
+    public Void exec() throws NotFoundException {
+        return super.exec();
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/exec/CreateSecretCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/CreateSecretCmdExec.java
new file mode 100644
index 000000000..e2d695527
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/exec/CreateSecretCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.core.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.CreateSecretCmd;
+import com.github.dockerjava.api.command.CreateSecretResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CreateSecretCmdExec extends AbstrSyncDockerCmdExec<CreateSecretCmd, CreateSecretResponse>
+        implements CreateSecretCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateSecretCmdExec.class);
+
+    public CreateSecretCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected CreateSecretResponse execute(CreateSecretCmd command) {
+        WebTarget webResource = getBaseResource().path("/secrets/create");
+
+        LOGGER.trace("POST: {} ", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(command.getSecretSpec(), new TypeReference<CreateSecretResponse>() {
+                });
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/exec/ListSecretsCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/ListSecretsCmdExec.java
new file mode 100644
index 000000000..61a931057
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/exec/ListSecretsCmdExec.java
@@ -0,0 +1,44 @@
+package com.github.dockerjava.core.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.ListSecretsCmd;
+import com.github.dockerjava.api.model.Secret;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
+import com.github.dockerjava.core.util.FiltersEncoder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class ListSecretsCmdExec extends AbstrSyncDockerCmdExec<ListSecretsCmd, List<Secret>> implements
+        ListSecretsCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ListSecretsCmdExec.class);
+
+    public ListSecretsCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected List<Secret> execute(ListSecretsCmd command) {
+        WebTarget webTarget = getBaseResource().path("/secrets");
+
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
+            webTarget = webTarget
+                    .queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
+        }
+
+        LOGGER.trace("GET: {}", webTarget);
+
+        List<Secret> secrets = webTarget.request().accept(MediaType.APPLICATION_JSON)
+                .get(new TypeReference<List<Secret>>() {
+                });
+
+        LOGGER.trace("Response: {}", secrets);
+
+        return secrets;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/core/exec/RemoveSecretCmdExec.java b/src/main/java/com/github/dockerjava/core/exec/RemoveSecretCmdExec.java
new file mode 100644
index 000000000..b9332b27b
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/core/exec/RemoveSecretCmdExec.java
@@ -0,0 +1,29 @@
+package com.github.dockerjava.core.exec;
+
+import com.github.dockerjava.api.command.RemoveSecretCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RemoveSecretCmdExec extends AbstrSyncDockerCmdExec<RemoveSecretCmd, Void> implements
+        RemoveSecretCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveSecretCmdExec.class);
+
+    public RemoveSecretCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(RemoveSecretCmd command) {
+        WebTarget webTarget = getBaseResource().path("/secrets/" + command.getSecretId());
+
+        LOGGER.trace("DELETE: {}", webTarget);
+        webTarget.request().accept(MediaType.APPLICATION_JSON).delete();
+
+        return null;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java
new file mode 100644
index 000000000..1c09a0d24
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java
@@ -0,0 +1,36 @@
+package com.github.dockerjava.jaxrs;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.command.CreateSecretCmd;
+import com.github.dockerjava.api.command.CreateSecretResponse;
+import com.github.dockerjava.api.model.SecretSpec;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import static javax.ws.rs.client.Entity.entity;
+
+public class CreateSecretCmdExec extends AbstrSyncDockerCmdExec<CreateSecretCmd, CreateSecretResponse>
+        implements CreateSecretCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateSecretCmdExec.class);
+
+    public CreateSecretCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected CreateSecretResponse execute(CreateSecretCmd command) {
+        WebTarget webResource = getBaseResource().path("/secrets/create");
+
+
+        LOGGER.trace("POST: {} ", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(entity(command.getSecretSpec(), MediaType.APPLICATION_JSON), CreateSecretResponse.class);
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
index 2c7a14c09..96a747504 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -15,6 +15,7 @@
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.command.CreateSecretCmd;
 import com.github.dockerjava.api.command.CreateServiceCmd;
 import com.github.dockerjava.api.command.CreateVolumeCmd;
 import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
@@ -38,6 +39,7 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.command.ListSecretsCmd;
 import com.github.dockerjava.api.command.ListServicesCmd;
 import com.github.dockerjava.api.command.ListSwarmNodesCmd;
 import com.github.dockerjava.api.command.ListTasksCmd;
@@ -53,6 +55,7 @@
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.RemoveSecretCmd;
 import com.github.dockerjava.api.command.RemoveServiceCmd;
 import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
@@ -663,6 +666,21 @@ public PruneCmd.Exec pruneCmdExec() {
         return new PruneCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public ListSecretsCmd.Exec createListSecretsCmdExec() {
+        return new ListSecretsCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CreateSecretCmd.Exec createCreateSecretCmdExec() {
+        return new CreateSecretCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveSecretCmd.Exec createRemoveSecretCmdExec() {
+        return new RemoveSecretCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public void close() throws IOException {
         checkNotNull(client, "Factory not initialized. You probably forgot to call init()!");
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java
new file mode 100644
index 000000000..8052dabfd
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java
@@ -0,0 +1,43 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.command.ListSecretsCmd;
+import com.github.dockerjava.api.model.Secret;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.util.FiltersEncoder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
+public class ListSecretsCmdExec extends AbstrSyncDockerCmdExec<ListSecretsCmd, List<Secret>> implements
+        ListSecretsCmd.Exec {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ListSecretsCmdExec.class);
+
+    public ListSecretsCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected List<Secret> execute(ListSecretsCmd command) {
+        WebTarget webTarget = getBaseResource().path("/secrets");
+
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
+            webTarget = webTarget
+                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
+        }
+
+        LOGGER.trace("GET: {}", webTarget);
+        List<Secret> secrets = webTarget.request().accept(MediaType.APPLICATION_JSON)
+                .get(new GenericType<List<Secret>>() {
+                });
+        LOGGER.trace("Response: {}", secrets);
+
+        return secrets;
+    }
+}
+
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java
new file mode 100644
index 000000000..7e2bf4812
--- /dev/null
+++ b/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.command.RemoveSecretCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+public class RemoveSecretCmdExec extends AbstrSyncDockerCmdExec<RemoveSecretCmd, Void> implements
+        RemoveSecretCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveSecretCmdExec.class);
+
+    public RemoveSecretCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(RemoveSecretCmd command) {
+        WebTarget webTarget = getBaseResource().path("/secrets/" + command.getSecretId());
+
+        LOGGER.trace("DELETE: {}", webTarget);
+        webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close();
+
+        return null;
+    }
+
+}
diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index e7aa7e790..28d444b58 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -13,6 +13,7 @@
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;
 
+import com.github.dockerjava.api.command.ListSecretsCmd;
 import com.github.dockerjava.core.AbstractDockerCmdExecFactory;
 import com.github.dockerjava.core.WebTarget;
 import io.netty.util.concurrent.Future;
@@ -118,6 +119,7 @@ public void init(DockerClientConfig dockerClientConfig) {
         baseResource = new NettyWebTarget(channelProvider, host).path(dockerClientConfig.getApiVersion().asWebPathPart());
     }
 
+
     private DuplexChannel connect() {
         try {
             return connect(bootstrap);
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java b/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
new file mode 100644
index 000000000..429ec3c06
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
@@ -0,0 +1,79 @@
+package com.github.dockerjava.cmd.swarm;
+
+import com.github.dockerjava.api.command.CreateSecretResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.ContainerSpec;
+import com.github.dockerjava.api.model.EndpointResolutionMode;
+import com.github.dockerjava.api.model.EndpointSpec;
+import com.github.dockerjava.api.model.Mount;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.api.model.NetworkAttachmentConfig;
+import com.github.dockerjava.api.model.PortConfig;
+import com.github.dockerjava.api.model.PortConfigProtocol;
+import com.github.dockerjava.api.model.Secret;
+import com.github.dockerjava.api.model.SecretSpec;
+import com.github.dockerjava.api.model.Service;
+import com.github.dockerjava.api.model.ServiceModeConfig;
+import com.github.dockerjava.api.model.ServiceReplicatedModeOptions;
+import com.github.dockerjava.api.model.ServiceSpec;
+import com.github.dockerjava.api.model.SwarmSpec;
+import com.github.dockerjava.api.model.TaskSpec;
+import com.github.dockerjava.api.model.TmpfsOptions;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+import org.apache.commons.lang.RandomStringUtils;
+import org.hamcrest.collection.IsCollectionWithSize;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.charset.Charset;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
+import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+
+public class CreateSecretCmdExecIT extends SwarmCmdIT {
+
+    public static final Logger LOG = LoggerFactory.getLogger(CreateSecretCmdExecIT.class);
+    private static final String SERVICE_NAME = "theservice";
+
+    @Test
+    public void testCreateSecret() throws DockerException {
+        dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
+                .withListenAddr("127.0.0.1")
+                .withAdvertiseAddr("127.0.0.1")
+                .exec();
+
+        int length = 10;
+        boolean useLetters = true;
+        boolean useNumbers = false;
+        String secretName = RandomStringUtils.random(length, useLetters, useNumbers);
+        CreateSecretResponse exec = dockerRule.getClient().createSecretCmd(new SecretSpec().withName(secretName).withData("mon secret en clair")).exec();
+        assertThat(exec, notNullValue());
+        assertThat(exec.getId(), notNullValue());
+        LOG.info("Secret created with ID {}", exec.getId());
+
+
+        List<Secret> secrets = dockerRule.getClient().listSecretsCmd()
+                .withNameFilter(Lists.newArrayList(secretName))
+                .exec();
+
+        assertThat(secrets, IsCollectionWithSize.hasSize(1));
+
+        dockerRule.getClient().removeSecretCmd(secrets.get(0).getId())
+                .exec();
+        LOG.info("Secret removed with ID {}", exec.getId());
+        List<Secret> secretsAfterRemoved = dockerRule.getClient().listSecretsCmd()
+                .withNameFilter(Lists.newArrayList(secretName))
+                .exec();
+
+        assertThat(secretsAfterRemoved, IsCollectionWithSize.hasSize(0));
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java b/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java
new file mode 100644
index 000000000..14686f29a
--- /dev/null
+++ b/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java
@@ -0,0 +1,60 @@
+package com.github.dockerjava.cmd.swarm;
+
+import com.github.dockerjava.api.command.CreateSecretResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.Secret;
+import com.github.dockerjava.api.model.SecretSpec;
+import com.github.dockerjava.api.model.SwarmSpec;
+import com.google.common.collect.Lists;
+import org.apache.commons.lang.RandomStringUtils;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.charset.Charset;
+import java.util.List;
+import java.util.Random;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
+
+public class ListSecretCmdExecIT extends SwarmCmdIT {
+
+    public static final Logger LOG = LoggerFactory.getLogger(ListSecretCmdExecIT.class);
+
+    @Test
+    public void tesListSecret() throws DockerException {
+        dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
+                .withListenAddr("127.0.0.1")
+                .withAdvertiseAddr("127.0.0.1")
+                .exec();
+
+        int length = 10;
+        boolean useLetters = true;
+        boolean useNumbers = false;
+        String secretName = RandomStringUtils.random(length, useLetters, useNumbers);
+        CreateSecretResponse exec = dockerRule.getClient().createSecretCmd(new SecretSpec().withName(secretName).withData("mon secret en clair")).exec();
+        assertThat(exec, notNullValue());
+        assertThat(exec.getId(), notNullValue());
+        LOG.info("Secret created with ID {}", exec.getId());
+
+
+        List<Secret> secrets = dockerRule.getClient().listSecretsCmd()
+                .withNameFilter(Lists.newArrayList(secretName))
+                .exec();
+
+        assertThat(secrets, hasSize(1));
+
+        dockerRule.getClient().removeSecretCmd(secrets.get(0).getId())
+                .exec();
+        LOG.info("Secret removed with ID {}", exec.getId());
+        List<Secret> secretsAfterRemoved = dockerRule.getClient().listSecretsCmd()
+                .withNameFilter(Lists.newArrayList(secretName))
+                .exec();
+
+        assertThat(secretsAfterRemoved, hasSize(0));
+
+    }
+
+}
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index a3c96e54d..eaddb0978 100644
--- a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -16,6 +16,7 @@
 import com.github.dockerjava.api.command.CreateImageResponse;
 import com.github.dockerjava.api.command.CreateNetworkCmd;
 import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.api.command.CreateSecretCmd;
 import com.github.dockerjava.api.command.CreateServiceCmd;
 import com.github.dockerjava.api.command.CreateVolumeCmd;
 import com.github.dockerjava.api.command.CreateVolumeResponse;
@@ -40,6 +41,7 @@
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.command.ListSecretsCmd;
 import com.github.dockerjava.api.command.ListServicesCmd;
 import com.github.dockerjava.api.command.ListSwarmNodesCmd;
 import com.github.dockerjava.api.command.ListTasksCmd;
@@ -55,6 +57,7 @@
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.RemoveSecretCmd;
 import com.github.dockerjava.api.command.RemoveServiceCmd;
 import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
@@ -532,6 +535,21 @@ public PruneCmd.Exec pruneCmdExec() {
         return delegate.pruneCmdExec();
     }
 
+    @Override
+    public ListSecretsCmd.Exec createListSecretsCmdExec() {
+        return delegate.createListSecretsCmdExec();
+    }
+
+    @Override
+    public CreateSecretCmd.Exec createCreateSecretCmdExec() {
+        return delegate.createCreateSecretCmdExec();
+    }
+
+    @Override
+    public RemoveSecretCmd.Exec createRemoveSecretCmdExec() {
+        return delegate.createRemoveSecretCmdExec();
+    }
+
     public List<String> getContainerNames() {
         return new ArrayList<String>(containerNames);
     }

From 783972f79572733a7195000844ec28305e5e90c6 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 21 Jul 2019 15:38:36 +0200
Subject: [PATCH 0924/1272] Revert breaking binary change of
 `CreateContainerCmd`.

The change was introduced in:
https://github.com/docker-java/docker-java/commit/580ea407cc

While it is a good change in a long term, 3.1.x should have introduced
a deprecation, so that the users have time to update their usages.
---
 pom.xml                                       |  26 ++
 .../api/command/CreateContainerCmd.java       | 159 ++++++++++
 .../core/command/CreateContainerCmdImpl.java  | 285 ++++++++++++++++++
 3 files changed, 470 insertions(+)

diff --git a/pom.xml b/pom.xml
index 9c23c97b7..39b9516df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -450,6 +450,32 @@
 					</instructions>
 				</configuration>
 			</plugin>
+
+			<plugin>
+				<!-- use with "mvn -DskipTests clean package japicmp:cmp" -->
+				<groupId>com.github.siom79.japicmp</groupId>
+				<artifactId>japicmp-maven-plugin</artifactId>
+				<version>0.14.1</version>
+				<configuration>
+					<oldVersion>
+						<dependency>
+							<groupId>com.github.docker-java</groupId>
+							<artifactId>docker-java</artifactId>
+							<version>3.1.0-rc-4</version>
+							<type>jar</type>
+						</dependency>
+					</oldVersion>
+					<newVersion>
+						<file>
+							<path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
+						</file>
+					</newVersion>
+					<parameter>
+						<accessModifier>public</accessModifier>
+						<onlyBinaryIncompatible>true</onlyBinaryIncompatible>
+					</parameter>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index c7eb442da..1ade9bf48 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -5,12 +5,17 @@
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Capability;
+import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.HealthCheck;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Link;
+import com.github.dockerjava.api.model.LogConfig;
+import com.github.dockerjava.api.model.LxcConf;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.RestartPolicy;
+import com.github.dockerjava.api.model.Ulimit;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
 
@@ -366,6 +371,160 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     CreateContainerCmd withHostConfig(HostConfig hostConfig);
 
+    // The following methods are deprecated and should be set on {@link #getHostConfig()} instead.
+    // TODO remove in the next big release
+
+    @Deprecated
+    @CheckForNull
+    Integer getBlkioWeight();
+
+    @CheckForNull
+    @Deprecated
+    String getCgroupParent();
+
+    @Deprecated
+    @CheckForNull
+    Integer getCpuPeriod();
+
+    @Deprecated
+    @CheckForNull
+    Integer getCpuShares();
+
+    @Deprecated
+    @CheckForNull
+    String getCpusetCpus();
+
+    @Deprecated
+    @CheckForNull
+    String getCpusetMems();
+
+    @Deprecated
+    @CheckForNull
+    Device[] getDevices();
+
+    @Deprecated
+    @CheckForNull
+    String[] getDns();
+
+    @Deprecated
+    @CheckForNull
+    String[] getDnsSearch();
+
+    @Deprecated
+    @CheckForNull
+    LogConfig getLogConfig();
+
+    @Deprecated
+    @CheckForNull
+    LxcConf[] getLxcConf();
+
+    @Deprecated
+    @CheckForNull
+    Boolean getOomKillDisable();
+
+    @Deprecated
+    @CheckForNull
+    String getPidMode();
+
+    @Deprecated
+    @CheckForNull
+    Boolean getReadonlyRootfs();
+
+    @Deprecated
+    @CheckForNull
+    RestartPolicy getRestartPolicy();
+
+    @Deprecated
+    @CheckForNull
+    Ulimit[] getUlimits();
+
+    @Deprecated
+    CreateContainerCmd withBlkioWeight(Integer blkioWeight);
+
+    @Deprecated
+    CreateContainerCmd withCgroupParent(String cgroupParent);
+
+    @Deprecated
+    CreateContainerCmd withContainerIDFile(String containerIDFile);
+
+    @Deprecated
+    CreateContainerCmd withCpuPeriod(Integer cpuPeriod);
+
+    @Deprecated
+    CreateContainerCmd withCpuShares(Integer cpuShares);
+
+    @Deprecated
+    CreateContainerCmd withCpusetCpus(String cpusetCpus);
+
+    @Deprecated
+    CreateContainerCmd withCpusetMems(String cpusetMems);
+
+    @Deprecated
+    CreateContainerCmd withDevices(Device... devices);
+
+    /**
+     * Add host devices to the container
+     */
+    @Deprecated
+    CreateContainerCmd withDevices(List<Device> devices);
+
+    /**
+     * Set custom DNS servers
+     */
+    @Deprecated
+    CreateContainerCmd withDns(String... dns);
+
+    /**
+     * Set custom DNS servers
+     */
+    @Deprecated
+    CreateContainerCmd withDns(List<String> dns);
+
+    /**
+     * Set custom DNS search domains
+     */
+    @Deprecated
+    CreateContainerCmd withDnsSearch(String... dnsSearch);
+
+    /**
+     * Set custom DNS search domains
+     */
+    @Deprecated
+    CreateContainerCmd withDnsSearch(List<String> dnsSearch);
+
+    @Deprecated
+    CreateContainerCmd withLogConfig(LogConfig logConfig);
+
+    @Deprecated
+    CreateContainerCmd withLxcConf(LxcConf... lxcConf);
+
+    @Deprecated
+    CreateContainerCmd withLxcConf(List<LxcConf> lxcConf);
+
+    @Deprecated
+    CreateContainerCmd withOomKillDisable(Boolean oomKillDisable);
+
+    /**
+     * Set the PID (Process) Namespace mode for the container, 'host': use the host's PID namespace inside the container
+     */
+    @Deprecated
+    CreateContainerCmd withPidMode(String pidMode);
+
+    @Deprecated
+    CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs);
+
+    /**
+     * Set custom {@link RestartPolicy} for the container. Defaults to {@link RestartPolicy#noRestart()}
+     */
+    @Deprecated
+    CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy);
+
+    @Deprecated
+    CreateContainerCmd withUlimits(Ulimit... ulimits);
+
+    @Deprecated
+    CreateContainerCmd withUlimits(List<Ulimit> ulimits);
+
     /**
      * @throws NotFoundException No such container
      * @throws ConflictException Named container already exists
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index cb129ebd9..d32d23870 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -12,13 +12,18 @@
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Capability;
 import com.github.dockerjava.api.model.ContainerNetwork;
+import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.ExposedPorts;
 import com.github.dockerjava.api.model.HealthCheck;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Link;
+import com.github.dockerjava.api.model.LogConfig;
+import com.github.dockerjava.api.model.LxcConf;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.RestartPolicy;
+import com.github.dockerjava.api.model.Ulimit;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.Volumes;
 import com.github.dockerjava.api.model.VolumesFrom;
@@ -171,6 +176,14 @@ public Bind[] getBinds() {
         return hostConfig.getBinds();
     }
 
+    @CheckForNull
+    @Override
+    @Deprecated
+    @JsonIgnore
+    public Integer getBlkioWeight() {
+        return hostConfig.getBlkioWeight();
+    }
+
     @Override
     @Deprecated
     public CreateContainerCmd withBinds(Bind... binds) {
@@ -186,6 +199,13 @@ public CreateContainerCmd withBinds(List<Bind> binds) {
         return withBinds(binds.toArray(new Bind[binds.size()]));
     }
 
+    @Override
+    @Deprecated
+    public CreateContainerCmd withBlkioWeight(Integer blkioWeight) {
+        hostConfig.withBlkioWeight(blkioWeight);
+        return this;
+    }
+
     @Override
     public CreateContainerCmd withAliases(String... aliases) {
         this.aliases = Arrays.asList(aliases);
@@ -205,6 +225,63 @@ public String[] getCmd() {
         return cmd;
     }
 
+    @CheckForNull
+    @Override
+    @Deprecated
+    @JsonIgnore
+    public Integer getCpuPeriod() {
+        Long result = hostConfig.getCpuPeriod();
+        return result != null ? result.intValue() : null;
+    }
+
+    @CheckForNull
+    @Override
+    @Deprecated
+    @JsonIgnore
+    public Integer getCpuShares() {
+        return hostConfig.getCpuShares();
+    }
+
+    @CheckForNull
+    @Override
+    @Deprecated
+    @JsonIgnore
+    public String getCpusetCpus() {
+        return hostConfig.getCpusetCpus();
+    }
+
+    @CheckForNull
+    @Override
+    @Deprecated
+    @JsonIgnore
+    public String getCpusetMems() {
+        return hostConfig.getCpusetMems();
+    }
+
+    @CheckForNull
+    @Override
+    @Deprecated
+    @JsonIgnore
+    public Device[] getDevices() {
+        return hostConfig.getDevices();
+    }
+
+    @CheckForNull
+    @Override
+    @Deprecated
+    @JsonIgnore
+    public String[] getDns() {
+        return hostConfig.getDns();
+    }
+
+    @CheckForNull
+    @Override
+    @Deprecated
+    @JsonIgnore
+    public String[] getDnsSearch() {
+        return hostConfig.getDnsSearch();
+    }
+
     @Override
     public CreateContainerCmd withCmd(String... cmd) {
         checkNotNull(cmd, "cmd was not specified");
@@ -218,6 +295,83 @@ public CreateContainerCmd withCmd(List<String> cmd) {
         return withCmd(cmd.toArray(new String[0]));
     }
 
+    @Override
+    @Deprecated
+    public CreateContainerCmd withContainerIDFile(String containerIDFile) {
+        hostConfig.withContainerIDFile(containerIDFile);
+        return this;
+    }
+
+    @Override
+    @Deprecated
+    public CreateContainerCmd withCpuPeriod(Integer cpuPeriod) {
+        hostConfig.withCpuPeriod(cpuPeriod != null ? cpuPeriod.longValue() : null);
+        return this;
+    }
+
+    @Override
+    @Deprecated
+    public CreateContainerCmd withCpuShares(Integer cpuShares) {
+        hostConfig.withCpuShares(cpuShares);
+        return this;
+    }
+
+    @Override
+    @Deprecated
+    public CreateContainerCmd withCpusetCpus(String cpusetCpus) {
+        hostConfig.withCpusetCpus(cpusetCpus);
+        return this;
+    }
+
+    @Override
+    @Deprecated
+    public CreateContainerCmd withCpusetMems(String cpusetMems) {
+        hostConfig.withCpusetMems(cpusetMems);
+        return this;
+    }
+
+    @Override
+    @Deprecated
+    public CreateContainerCmd withDevices(Device... devices) {
+        hostConfig.withDevices(devices);
+        return this;
+    }
+
+    @Override
+    @Deprecated
+    public CreateContainerCmd withDevices(List<Device> devices) {
+        hostConfig.withDevices(devices);
+        return this;
+    }
+
+    @Override
+    @Deprecated
+    public CreateContainerCmd withDns(String... dns) {
+        hostConfig.withDns(dns);
+        return this;
+    }
+
+    @Override
+    @Deprecated
+    public CreateContainerCmd withDns(List<String> dns) {
+        hostConfig.withDns(dns);
+        return this;
+    }
+
+    @Override
+    @Deprecated
+    public CreateContainerCmd withDnsSearch(String... dnsSearch) {
+        hostConfig.withDnsSearch(dnsSearch);
+        return this;
+    }
+
+    @Override
+    @Deprecated
+    public CreateContainerCmd withDnsSearch(List<String> dnsSearch) {
+        hostConfig.withDnsSearch(dnsSearch);
+        return this;
+    }
+
     @CheckForNull
     public HealthCheck getHealthcheck() {
         return healthcheck;
@@ -325,6 +479,13 @@ public Integer getStopTimeout() {
         return stopTimeout;
     }
 
+    @CheckForNull
+    @Override
+    @Deprecated
+    public Ulimit[] getUlimits() {
+        return hostConfig.getUlimits();
+    }
+
     @Override
     public CreateContainerCmd withStopTimeout(Integer stopTimeout) {
         this.stopTimeout = stopTimeout;
@@ -656,6 +817,20 @@ public CreateContainerCmd withTty(Boolean tty) {
         return this;
     }
 
+    @Override
+    @Deprecated
+    public CreateContainerCmd withUlimits(Ulimit... ulimits) {
+        hostConfig.withUlimits(ulimits);
+        return this;
+    }
+
+    @Override
+    @Deprecated
+    public CreateContainerCmd withUlimits(List<Ulimit> ulimits) {
+        hostConfig.withUlimits(ulimits);
+        return this;
+    }
+
     @CheckForNull
     @Override
     @Deprecated
@@ -664,6 +839,22 @@ public Boolean getPublishAllPorts() {
         return hostConfig.getPublishAllPorts();
     }
 
+    @CheckForNull
+    @Override
+    @Deprecated
+    @JsonIgnore
+    public Boolean getReadonlyRootfs() {
+        return hostConfig.getReadonlyRootfs();
+    }
+
+    @CheckForNull
+    @Override
+    @Deprecated
+    @JsonIgnore
+    public RestartPolicy getRestartPolicy() {
+        return hostConfig.getRestartPolicy();
+    }
+
     @Override
     @Deprecated
     public CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts) {
@@ -672,6 +863,20 @@ public CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts) {
         return this;
     }
 
+    @Override
+    @Deprecated
+    public CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs) {
+        hostConfig.withReadonlyRootfs(readonlyRootfs);
+        return this;
+    }
+
+    @Override
+    @Deprecated
+    public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) {
+        hostConfig.withRestartPolicy(restartPolicy);
+        return this;
+    }
+
     @CheckForNull
     @Override
     @Deprecated
@@ -726,6 +931,14 @@ public Capability[] getCapDrop() {
         return hostConfig.getCapDrop();
     }
 
+    @CheckForNull
+    @Override
+    @Deprecated
+    @JsonIgnore
+    public String getCgroupParent() {
+        return hostConfig.getCgroupParent();
+    }
+
     @Override
     @Deprecated
     public CreateContainerCmd withCapDrop(Capability... capDrop) {
@@ -741,6 +954,13 @@ public CreateContainerCmd withCapDrop(List<Capability> capDrop) {
         return withCapDrop(capDrop.toArray(new Capability[capDrop.size()]));
     }
 
+    @Override
+    @Deprecated
+    public CreateContainerCmd withCgroupParent(String cgroupParent) {
+        hostConfig.withCgroupParent(cgroupParent);
+        return this;
+    }
+
     @Override
     public HostConfig getHostConfig() {
         return hostConfig;
@@ -772,6 +992,22 @@ public Link[] getLinks() {
         return hostConfig.getLinks();
     }
 
+    @CheckForNull
+    @Override
+    @Deprecated
+    @JsonIgnore
+    public LogConfig getLogConfig() {
+        return hostConfig.getLogConfig();
+    }
+
+    @CheckForNull
+    @Override
+    @Deprecated
+    @JsonIgnore
+    public LxcConf[] getLxcConf() {
+        return hostConfig.getLxcConf();
+    }
+
     @Override
     @Deprecated
     public CreateContainerCmd withLinks(Link... links) {
@@ -787,6 +1023,25 @@ public CreateContainerCmd withLinks(List<Link> links) {
         return withLinks(links.toArray(new Link[links.size()]));
     }
 
+    @Override
+    public CreateContainerCmd withLogConfig(LogConfig logConfig) {
+        return null;
+    }
+
+    @Override
+    @Deprecated
+    public CreateContainerCmd withLxcConf(LxcConf... lxcConf) {
+        hostConfig.withLxcConf(lxcConf);
+        return this;
+    }
+
+    @Override
+    @Deprecated
+    public CreateContainerCmd withLxcConf(List<LxcConf> lxcConf) {
+        hostConfig.withLxcConf(lxcConf.toArray(new LxcConf[0]));
+        return this;
+    }
+
     @Override
     public String getIpv6Address() {
         return ipv6Address;
@@ -804,11 +1059,41 @@ public List<String> getOnBuild() {
         return onBuild;
     }
 
+    @CheckForNull
+    @Override
+    @Deprecated
+    @JsonIgnore
+    public Boolean getOomKillDisable() {
+        return hostConfig.getOomKillDisable();
+    }
+
+    @CheckForNull
+    @Override
+    @Deprecated
+    @JsonIgnore
+    public String getPidMode() {
+        return hostConfig.getPidMode();
+    }
+
     public CreateContainerCmdImpl withOnBuild(List<String> onBuild) {
         this.onBuild = onBuild;
         return this;
     }
 
+    @Override
+    @Deprecated
+    public CreateContainerCmd withOomKillDisable(Boolean oomKillDisable) {
+        hostConfig.withOomKillDisable(oomKillDisable);
+        return this;
+    }
+
+    @Override
+    @Deprecated
+    public CreateContainerCmd withPidMode(String pidMode) {
+        hostConfig.withPidMode(pidMode);
+        return this;
+    }
+
     /**
      * @throws NotFoundException No such container
      * @throws ConflictException Named container already exists

From 62beea455ae7a18d673bc433df8dbd09a1bfefac Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 21 Jul 2019 15:43:15 +0200
Subject: [PATCH 0925/1272] Fix leftovers

---
 .../dockerjava/core/command/CreateContainerCmdImpl.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index d32d23870..74347e900 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -482,6 +482,7 @@ public Integer getStopTimeout() {
     @CheckForNull
     @Override
     @Deprecated
+    @JsonIgnore
     public Ulimit[] getUlimits() {
         return hostConfig.getUlimits();
     }
@@ -1024,8 +1025,10 @@ public CreateContainerCmd withLinks(List<Link> links) {
     }
 
     @Override
+    @Deprecated
     public CreateContainerCmd withLogConfig(LogConfig logConfig) {
-        return null;
+        hostConfig.withLogConfig(logConfig);
+        return this;
     }
 
     @Override

From a675fd5a5617372a1d80ec4fb8a6052a3cbb07f0 Mon Sep 17 00:00:00 2001
From: Thomas VAUTRIN <tvautrin.work@gmail.com>
Date: Mon, 22 Jul 2019 08:53:35 +0200
Subject: [PATCH 0926/1272] Fix checkstyle

---
 .../com/github/dockerjava/api/command/ListSecretsCmd.java     | 4 ----
 src/main/java/com/github/dockerjava/api/model/SecretSpec.java | 1 -
 .../github/dockerjava/core/command/ListSecretsCmdImpl.java    | 1 -
 .../java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java | 4 ----
 .../github/dockerjava/netty/NettyDockerCmdExecFactory.java    | 1 -
 5 files changed, 11 deletions(-)

diff --git a/src/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java b/src/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java
index 9280247c1..959d68831 100644
--- a/src/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java
@@ -1,17 +1,13 @@
 package com.github.dockerjava.api.command;
 
-import com.github.dockerjava.api.model.Container;
 import com.github.dockerjava.api.model.Secret;
-import com.github.dockerjava.api.model.Service;
 
 import javax.annotation.CheckForNull;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
 /**
  * List secrets
- *
  */
 public interface ListSecretsCmd extends SyncDockerCmd<List<Secret>> {
 
diff --git a/src/main/java/com/github/dockerjava/api/model/SecretSpec.java b/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
index 6d615b64f..ca3e03999 100644
--- a/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
+++ b/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
@@ -12,7 +12,6 @@
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
-import java.util.List;
 import java.util.Map;
 
 /**
diff --git a/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java
index 92bbd77b2..5c11a7a19 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java
@@ -2,7 +2,6 @@
 
 import com.github.dockerjava.api.command.ListSecretsCmd;
 import com.github.dockerjava.api.model.Secret;
-import com.github.dockerjava.api.model.Service;
 import com.github.dockerjava.core.util.FiltersBuilder;
 
 import java.util.List;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java
index 1c09a0d24..db85900de 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java
@@ -1,15 +1,11 @@
 package com.github.dockerjava.jaxrs;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.command.CreateSecretCmd;
 import com.github.dockerjava.api.command.CreateSecretResponse;
-import com.github.dockerjava.api.model.SecretSpec;
 import com.github.dockerjava.core.DockerClientConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index 28d444b58..ecb40fa95 100644
--- a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -13,7 +13,6 @@
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;
 
-import com.github.dockerjava.api.command.ListSecretsCmd;
 import com.github.dockerjava.core.AbstractDockerCmdExecFactory;
 import com.github.dockerjava.core.WebTarget;
 import io.netty.util.concurrent.Future;

From ffcd6522da105454391fdf865e1ef9ccd0e4b26c Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 22 Jul 2019 23:05:00 +0300
Subject: [PATCH 0927/1272] [maven-release-plugin] prepare release 3.1.5

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 39b9516df..09aed2bb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.5-SNAPSHOT</version>
+	<version>3.1.5</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.1.5</tag>
 	</scm>
 
 	<developers>

From db9e924be2b1f548605da46eeefa08a68d482a3c Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 22 Jul 2019 23:05:17 +0300
Subject: [PATCH 0928/1272] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 09aed2bb1..c253c1014 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.1.5</version>
+	<version>3.1.6-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.1.5</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 6181cbac7f37515a5d007d0340edcdb1da498ed9 Mon Sep 17 00:00:00 2001
From: Ole Hansen <->
Date: Mon, 22 Jul 2019 22:16:24 +0200
Subject: [PATCH 0929/1272] Clarified documentation in regards to how withEnv
 works.

---
 .../api/command/CreateContainerCmd.java       |  12 ++
 .../dockerjava/cmd/CreateContainerCmdIT.java  | 110 ++++++++++++++++++
 2 files changed, 122 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 1ade9bf48..b24b40401 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -96,8 +96,20 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     String[] getEnv();
 
+    /**
+     * Adds environment-variables. NB: Not additive, i.e. in case of multiple calls to the method, only the most recent
+     * values will be injected. Prior env-variables will be deleted.
+     *
+     * @param env the String(s) to set as ENV in the container
+     */
     CreateContainerCmd withEnv(String... env);
 
+    /**
+     * Adds environment-variables. NB: Not additive, i.e. in case of multiple calls to the method, only the most recent
+     * values will be injected. Prior env-variables will be deleted.
+     *
+     * @param env the list of Strings to set as ENV in the container
+     */
     CreateContainerCmd withEnv(List<String> env);
 
     @CheckForNull
diff --git a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index 00508a74e..d197da5a8 100644
--- a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -229,6 +229,116 @@ public void createContainerWithEnv() throws Exception {
         assertThat(dockerRule.containerLog(container.getId()), containsString(testVariable));
     }
 
+    @Test
+    public void createContainerWithEnvAdditive() throws Exception {
+
+        final String testVariable1 = "VARIABLE1=success1";
+        final String testVariable2 = "VARIABLE2=success2";
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withEnv(testVariable1)
+                .withEnv(testVariable2)
+                .withCmd("env")
+                .exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), not(hasItem(testVariable1)));
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), hasItem(testVariable2));
+
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        assertThat(dockerRule.containerLog(container.getId()), not(containsString(testVariable1)));
+        assertThat(dockerRule.containerLog(container.getId()), containsString(testVariable2));
+    }
+
+    @Test
+    public void createContainerWithEnvAdditiveMap() throws Exception {
+        final String[] testVariables1 = {"VARIABLE1=success1", "VARIABLE2=success2"};
+        final String[] testVariables2 = {"VARIABLE3=success3", "VARIABLE4=success4"};
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withEnv(testVariables1)
+                .withEnv(testVariables2)
+                .withCmd("env")
+                .exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), not(hasItem(testVariables1[0])));
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), not(hasItem(testVariables1[1])));
+
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), hasItem(testVariables2[0]));
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), hasItem(testVariables2[1]));
+
+
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        assertThat(dockerRule.containerLog(container.getId()), not(containsString(testVariables1[0])));
+        assertThat(dockerRule.containerLog(container.getId()), not(containsString(testVariables1[1])));
+
+        assertThat(dockerRule.containerLog(container.getId()), containsString(testVariables2[0]));
+        assertThat(dockerRule.containerLog(container.getId()), containsString(testVariables2[1]));
+    }
+
+    @Test
+    public void createContainerWithEnvAsVararg() throws Exception {
+
+        final String testVariable1 = "VARIABLE1=success1";
+        final String testVariable2 = "VARIABLE2=success2";
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withEnv(testVariable1, testVariable2)
+                .withCmd("env")
+                .exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), hasItem(testVariable1));
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), hasItem(testVariable2));
+
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        assertThat(dockerRule.containerLog(container.getId()), containsString(testVariable1));
+        assertThat(dockerRule.containerLog(container.getId()), containsString(testVariable2));
+    }
+
+    @Test
+    public void createContainerWithEnvAsMap() throws Exception {
+        final String[] testVariables = {"VARIABLE1=success1", "VARIABLE2=success2"};
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withEnv(testVariables)
+                .withCmd("env")
+                .exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), hasItem(testVariables[0]));
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), hasItem(testVariables[1]));
+
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        assertThat(dockerRule.containerLog(container.getId()), containsString(testVariables[0]));
+        assertThat(dockerRule.containerLog(container.getId()), containsString(testVariables[1]));
+    }
+
     @Test
     public void createContainerWithHostname() throws Exception {
 

From 636df71640cc952bc1ce27221855d85df648366f Mon Sep 17 00:00:00 2001
From: Sam Wu <40319887+samwual@users.noreply.github.com>
Date: Fri, 9 Aug 2019 12:19:47 -0400
Subject: [PATCH 0930/1272] json ignore unknown for service mode config

---
 .../java/com/github/dockerjava/api/model/ServiceModeConfig.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java b/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
index 9aeec2e1c..1a79d2a92 100644
--- a/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
+++ b/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
@@ -13,6 +14,7 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ServiceModeConfig implements Serializable {
     public static final long serialVersionUID = 1L;
 

From d71cace8ee10955bb0d53411a0dc463660d68454 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Fri, 30 Aug 2019 21:52:30 +0200
Subject: [PATCH 0931/1272] create a module

---
 docker-java/pom.xml                           | 273 ++++++++++++++++++
 .../github/dockerjava/api/DockerClient.java   |   0
 .../dockerjava/api/async/ResultCallback.java  |   0
 .../api/command/AsyncDockerCmd.java           |   0
 .../api/command/AttachContainerCmd.java       |   0
 .../dockerjava/api/command/AuthCmd.java       |   0
 .../dockerjava/api/command/BuildImageCmd.java |   0
 .../dockerjava/api/command/CommitCmd.java     |   0
 .../api/command/ConnectToNetworkCmd.java      |   0
 .../api/command/ContainerDiffCmd.java         |   0
 .../command/CopyArchiveFromContainerCmd.java  |   0
 .../command/CopyArchiveToContainerCmd.java    |   0
 .../api/command/CopyFileFromContainerCmd.java |   0
 .../api/command/CreateContainerCmd.java       |   0
 .../api/command/CreateContainerResponse.java  |   0
 .../api/command/CreateImageCmd.java           |   0
 .../api/command/CreateImageResponse.java      |   0
 .../api/command/CreateNetworkCmd.java         |   0
 .../api/command/CreateNetworkResponse.java    |   0
 .../api/command/CreateSecretCmd.java          |   0
 .../api/command/CreateSecretResponse.java     |   0
 .../api/command/CreateServiceCmd.java         |   0
 .../api/command/CreateServiceResponse.java    |   0
 .../api/command/CreateVolumeCmd.java          |   0
 .../api/command/CreateVolumeResponse.java     |   0
 .../api/command/DisconnectFromNetworkCmd.java |   0
 .../dockerjava/api/command/DockerCmd.java     |   0
 .../api/command/DockerCmdAsyncExec.java       |   0
 .../api/command/DockerCmdExecFactory.java     |   0
 .../api/command/DockerCmdSyncExec.java        |   0
 .../dockerjava/api/command/EventsCmd.java     |   0
 .../dockerjava/api/command/ExecCreateCmd.java |   0
 .../api/command/ExecCreateCmdResponse.java    |   0
 .../dockerjava/api/command/ExecStartCmd.java  |   0
 .../dockerjava/api/command/GraphData.java     |   0
 .../dockerjava/api/command/GraphDriver.java   |   0
 .../dockerjava/api/command/HealthState.java   |   0
 .../api/command/HealthStateLog.java           |   0
 .../dockerjava/api/command/InfoCmd.java       |   0
 .../api/command/InitializeSwarmCmd.java       |   0
 .../api/command/InspectContainerCmd.java      |   0
 .../api/command/InspectContainerResponse.java |   0
 .../api/command/InspectExecCmd.java           |   0
 .../api/command/InspectExecResponse.java      |   0
 .../api/command/InspectImageCmd.java          |   0
 .../api/command/InspectImageResponse.java     |   0
 .../api/command/InspectNetworkCmd.java        |   0
 .../api/command/InspectServiceCmd.java        |   0
 .../api/command/InspectSwarmCmd.java          |   0
 .../api/command/InspectSwarmNodeCmd.java      |   0
 .../api/command/InspectTaskCmd.java           |   0
 .../api/command/InspectVolumeCmd.java         |   0
 .../api/command/InspectVolumeResponse.java    |   0
 .../dockerjava/api/command/JoinSwarmCmd.java  |   0
 .../api/command/KillContainerCmd.java         |   0
 .../dockerjava/api/command/LeaveSwarmCmd.java |   0
 .../api/command/ListContainersCmd.java        |   0
 .../dockerjava/api/command/ListImagesCmd.java |   0
 .../api/command/ListNetworksCmd.java          |   0
 .../api/command/ListSecretsCmd.java           |   0
 .../api/command/ListServicesCmd.java          |   0
 .../api/command/ListSwarmNodesCmd.java        |   0
 .../dockerjava/api/command/ListTasksCmd.java  |   0
 .../api/command/ListVolumesCmd.java           |   0
 .../api/command/ListVolumesResponse.java      |   0
 .../dockerjava/api/command/LoadImageCmd.java  |   0
 .../api/command/LogContainerCmd.java          |   0
 .../api/command/LogSwarmObjectCmd.java        |   0
 .../api/command/PauseContainerCmd.java        |   0
 .../dockerjava/api/command/PingCmd.java       |   0
 .../dockerjava/api/command/PruneCmd.java      |   0
 .../dockerjava/api/command/PullImageCmd.java  |   0
 .../dockerjava/api/command/PushImageCmd.java  |   0
 .../api/command/RemoveContainerCmd.java       |   0
 .../api/command/RemoveImageCmd.java           |   0
 .../api/command/RemoveNetworkCmd.java         |   0
 .../api/command/RemoveSecretCmd.java          |   0
 .../api/command/RemoveServiceCmd.java         |   0
 .../api/command/RemoveSwarmNodeCmd.java       |   0
 .../api/command/RemoveVolumeCmd.java          |   0
 .../api/command/RenameContainerCmd.java       |   0
 .../api/command/RestartContainerCmd.java      |   0
 .../github/dockerjava/api/command/RootFS.java |   0
 .../dockerjava/api/command/SaveImageCmd.java  |   0
 .../api/command/SearchImagesCmd.java          |   0
 .../api/command/StartContainerCmd.java        |   0
 .../dockerjava/api/command/StatsCmd.java      |   0
 .../api/command/StopContainerCmd.java         |   0
 .../dockerjava/api/command/SyncDockerCmd.java |   0
 .../dockerjava/api/command/TagImageCmd.java   |   0
 .../api/command/TopContainerCmd.java          |   0
 .../api/command/TopContainerResponse.java     |   0
 .../api/command/UnpauseContainerCmd.java      |   0
 .../api/command/UpdateContainerCmd.java       |   0
 .../api/command/UpdateServiceCmd.java         |   0
 .../api/command/UpdateSwarmCmd.java           |   0
 .../api/command/UpdateSwarmNodeCmd.java       |   0
 .../dockerjava/api/command/VersionCmd.java    |   0
 .../api/command/WaitContainerCmd.java         |   0
 .../api/exception/BadRequestException.java    |   0
 .../api/exception/ConflictException.java      |   0
 .../api/exception/DockerClientException.java  |   0
 .../api/exception/DockerException.java        |   0
 .../InternalServerErrorException.java         |   0
 .../api/exception/NotAcceptableException.java |   0
 .../api/exception/NotFoundException.java      |   0
 .../api/exception/NotModifiedException.java   |   0
 .../api/exception/UnauthorizedException.java  |   0
 .../dockerjava/api/model/AccessMode.java      |   0
 .../dockerjava/api/model/AuthConfig.java      |   0
 .../api/model/AuthConfigurations.java         |   0
 .../dockerjava/api/model/AuthResponse.java    |   0
 .../com/github/dockerjava/api/model/Bind.java |   0
 .../dockerjava/api/model/BindOptions.java     |   0
 .../dockerjava/api/model/BindPropagation.java |   0
 .../github/dockerjava/api/model/Binds.java    |   0
 .../dockerjava/api/model/BlkioRateDevice.java |   0
 .../dockerjava/api/model/BlkioStatEntry.java  |   0
 .../api/model/BlkioStatsConfig.java           |   0
 .../api/model/BlkioWeightDevice.java          |   0
 .../api/model/BuildResponseItem.java          |   0
 .../dockerjava/api/model/Capability.java      |   0
 .../dockerjava/api/model/ChangeLog.java       |   0
 .../dockerjava/api/model/ClusterInfo.java     |   0
 .../dockerjava/api/model/Container.java       |   0
 .../dockerjava/api/model/ContainerConfig.java |   0
 .../api/model/ContainerDNSConfig.java         |   0
 .../api/model/ContainerHostConfig.java        |   0
 .../dockerjava/api/model/ContainerMount.java  |   0
 .../api/model/ContainerNetwork.java           |   0
 .../api/model/ContainerNetworkSettings.java   |   0
 .../dockerjava/api/model/ContainerPort.java   |   0
 .../dockerjava/api/model/ContainerSpec.java   |   0
 .../api/model/ContainerSpecConfig.java        |   0
 .../api/model/ContainerSpecFile.java          |   0
 .../api/model/ContainerSpecPrivileges.java    |   0
 .../ContainerSpecPrivilegesCredential.java    |   0
 ...ContainerSpecPrivilegesSELinuxContext.java |   0
 .../api/model/ContainerSpecSecret.java        |   0
 .../dockerjava/api/model/CpuStatsConfig.java  |   0
 .../dockerjava/api/model/CpuUsageConfig.java  |   0
 .../github/dockerjava/api/model/Device.java   |   0
 .../api/model/DiscreteResourceSpec.java       |   0
 .../github/dockerjava/api/model/Driver.java   |   0
 .../dockerjava/api/model/DriverStatus.java    |   0
 .../github/dockerjava/api/model/Endpoint.java |   0
 .../api/model/EndpointResolutionMode.java     |   0
 .../dockerjava/api/model/EndpointSpec.java    |   0
 .../api/model/EndpointVirtualIP.java          |   0
 .../dockerjava/api/model/ErrorDetail.java     |   0
 .../dockerjava/api/model/ErrorResponse.java   |   0
 .../github/dockerjava/api/model/Event.java    |   0
 .../dockerjava/api/model/EventActor.java      |   0
 .../dockerjava/api/model/EventType.java       |   0
 .../dockerjava/api/model/ExposedPort.java     |   0
 .../dockerjava/api/model/ExposedPorts.java    |   0
 .../dockerjava/api/model/ExternalCA.java      |   0
 .../api/model/ExternalCAProtocol.java         |   0
 .../github/dockerjava/api/model/Frame.java    |   0
 .../dockerjava/api/model/GenericResource.java |   0
 .../dockerjava/api/model/HealthCheck.java     |   0
 .../dockerjava/api/model/HostConfig.java      |   0
 .../dockerjava/api/model/Identifier.java      |   0
 .../github/dockerjava/api/model/Image.java    |   0
 .../com/github/dockerjava/api/model/Info.java |   0
 .../api/model/InfoRegistryConfig.java         |   0
 .../api/model/InternetProtocol.java           |   0
 .../dockerjava/api/model/Isolation.java       |   0
 .../com/github/dockerjava/api/model/Link.java |   0
 .../github/dockerjava/api/model/Links.java    |   0
 .../dockerjava/api/model/LocalNodeState.java  |   0
 .../dockerjava/api/model/LogConfig.java       |   0
 .../github/dockerjava/api/model/LxcConf.java  |   0
 .../api/model/MemoryStatsConfig.java          |   0
 .../github/dockerjava/api/model/Mount.java    |   0
 .../dockerjava/api/model/MountType.java       |   0
 .../api/model/NamedResourceSpec.java          |   0
 .../github/dockerjava/api/model/Network.java  |   0
 .../api/model/NetworkAttachmentConfig.java    |   0
 .../dockerjava/api/model/NetworkSettings.java |   0
 .../com/github/dockerjava/api/model/Node.java |   0
 .../dockerjava/api/model/ObjectVersion.java   |   0
 .../github/dockerjava/api/model/PeerNode.java |   0
 .../dockerjava/api/model/PidsStatsConfig.java |   0
 .../dockerjava/api/model/PortBinding.java     |   0
 .../dockerjava/api/model/PortConfig.java      |   0
 .../api/model/PortConfigProtocol.java         |   0
 .../github/dockerjava/api/model/Ports.java    |   0
 .../dockerjava/api/model/PropagationMode.java |   0
 .../dockerjava/api/model/PruneResponse.java   |   0
 .../dockerjava/api/model/PruneType.java       |   0
 .../api/model/PullResponseItem.java           |   0
 .../api/model/PushResponseItem.java           |   0
 .../dockerjava/api/model/Reachability.java    |   0
 .../dockerjava/api/model/Repository.java      |   0
 .../api/model/ResourceRequirements.java       |   0
 .../dockerjava/api/model/ResourceSpecs.java   |   0
 .../dockerjava/api/model/ResourceVersion.java |   0
 .../dockerjava/api/model/ResponseItem.java    |   0
 .../dockerjava/api/model/RestartPolicy.java   |   0
 .../dockerjava/api/model/SELContext.java      |   0
 .../dockerjava/api/model/SearchItem.java      |   0
 .../github/dockerjava/api/model/Secret.java   |   0
 .../dockerjava/api/model/SecretSpec.java      |   0
 .../github/dockerjava/api/model/Service.java  |   0
 .../api/model/ServiceGlobalModeOptions.java   |   0
 .../dockerjava/api/model/ServiceMode.java     |   0
 .../api/model/ServiceModeConfig.java          |   0
 .../api/model/ServicePlacement.java           |   0
 .../model/ServiceReplicatedModeOptions.java   |   0
 .../api/model/ServiceRestartCondition.java    |   0
 .../api/model/ServiceRestartPolicy.java       |   0
 .../dockerjava/api/model/ServiceSpec.java     |   0
 .../api/model/ServiceUpdateState.java         |   0
 .../api/model/ServiceUpdateStatus.java        |   0
 .../api/model/StatisticNetworksConfig.java    |   0
 .../dockerjava/api/model/Statistics.java      |   0
 .../dockerjava/api/model/StatsConfig.java     |   0
 .../dockerjava/api/model/StreamType.java      |   0
 .../github/dockerjava/api/model/Swarm.java    |   0
 .../dockerjava/api/model/SwarmCAConfig.java   |   0
 .../api/model/SwarmDispatcherConfig.java      |   0
 .../dockerjava/api/model/SwarmInfo.java       |   0
 .../dockerjava/api/model/SwarmJoinTokens.java |   0
 .../dockerjava/api/model/SwarmNode.java       |   0
 .../api/model/SwarmNodeAvailability.java      |   0
 .../api/model/SwarmNodeDescription.java       |   0
 .../api/model/SwarmNodeEngineDescription.java |   0
 .../api/model/SwarmNodeManagerStatus.java     |   0
 .../api/model/SwarmNodePlatform.java          |   0
 .../api/model/SwarmNodePluginDescription.java |   0
 .../api/model/SwarmNodeResources.java         |   0
 .../dockerjava/api/model/SwarmNodeRole.java   |   0
 .../dockerjava/api/model/SwarmNodeSpec.java   |   0
 .../dockerjava/api/model/SwarmNodeState.java  |   0
 .../dockerjava/api/model/SwarmNodeStatus.java |   0
 .../api/model/SwarmNodeVersion.java           |   0
 .../api/model/SwarmOrchestration.java         |   0
 .../dockerjava/api/model/SwarmRaftConfig.java |   0
 .../dockerjava/api/model/SwarmSpec.java       |   0
 .../dockerjava/api/model/SwarmVersion.java    |   0
 .../com/github/dockerjava/api/model/Task.java |   0
 .../dockerjava/api/model/TaskDefaults.java    |   0
 .../github/dockerjava/api/model/TaskSpec.java |   0
 .../dockerjava/api/model/TaskState.java       |   0
 .../dockerjava/api/model/TaskStatus.java      |   0
 .../api/model/TaskStatusContainerStatus.java  |   0
 .../api/model/ThrottlingDataConfig.java       |   0
 .../dockerjava/api/model/TmpfsOptions.java    |   0
 .../github/dockerjava/api/model/Ulimit.java   |   0
 .../dockerjava/api/model/UpdateConfig.java    |   0
 .../api/model/UpdateContainerResponse.java    |   0
 .../api/model/UpdateFailureAction.java        |   0
 .../dockerjava/api/model/UpdateOrder.java     |   0
 .../github/dockerjava/api/model/Version.java  |   0
 .../api/model/VersionComponent.java           |   0
 .../dockerjava/api/model/VersionPlatform.java |   0
 .../github/dockerjava/api/model/Volume.java   |   0
 .../dockerjava/api/model/VolumeBind.java      |   0
 .../dockerjava/api/model/VolumeBinds.java     |   0
 .../dockerjava/api/model/VolumeOptions.java   |   0
 .../github/dockerjava/api/model/VolumeRW.java |   0
 .../github/dockerjava/api/model/Volumes.java  |   0
 .../dockerjava/api/model/VolumesFrom.java     |   0
 .../dockerjava/api/model/VolumesRW.java       |   0
 .../dockerjava/api/model/WaitResponse.java    |   0
 .../core/AbstractDockerCmdExecFactory.java    |   0
 .../core/DefaultDockerClientConfig.java       |   0
 .../dockerjava/core/DockerClientBuilder.java  |   0
 .../dockerjava/core/DockerClientConfig.java   |   0
 .../dockerjava/core/DockerClientImpl.java     |   0
 .../dockerjava/core/DockerConfigFile.java     |   0
 .../dockerjava/core/GoLangFileMatch.java      |   0
 .../core/GoLangMatchFileFilter.java           |   0
 .../dockerjava/core/InvocationBuilder.java    |   0
 .../dockerjava/core/KeystoreSSLConfig.java    |   0
 .../core/LocalDirectorySSLConfig.java         |   0
 .../com/github/dockerjava/core/MediaType.java |   0
 .../github/dockerjava/core/NameParser.java    |   0
 .../dockerjava/core/RemoteApiVersion.java     |   0
 .../com/github/dockerjava/core/SSLConfig.java |   0
 .../com/github/dockerjava/core/WebTarget.java |   0
 .../core/async/FrameStreamProcessor.java      |   0
 .../core/async/JsonStreamProcessor.java       |   0
 .../core/async/ResponseStreamProcessor.java   |   0
 .../core/async/ResultCallbackTemplate.java    |   0
 .../core/command/AbstrAsyncDockerCmd.java     |   0
 .../core/command/AbstrDockerCmd.java          |   0
 .../core/command/AttachContainerCmdImpl.java  |   0
 .../AttachContainerResultCallback.java        |   0
 .../dockerjava/core/command/AuthCmdImpl.java  |   0
 .../core/command/BuildImageCmdImpl.java       |   0
 .../command/BuildImageResultCallback.java     |   0
 .../core/command/CommitCmdImpl.java           |   0
 .../core/command/ConnectToNetworkCmdImpl.java |   0
 .../core/command/ContainerDiffCmdImpl.java    |   0
 .../CopyArchiveFromContainerCmdImpl.java      |   0
 .../CopyArchiveToContainerCmdImpl.java        |   0
 .../command/CopyFileFromContainerCmdImpl.java |   0
 .../core/command/CreateContainerCmdImpl.java  |   0
 .../core/command/CreateImageCmdImpl.java      |   0
 .../core/command/CreateNetworkCmdImpl.java    |   0
 .../core/command/CreateSecretCmdImpl.java     |   0
 .../core/command/CreateServiceCmdImpl.java    |   0
 .../core/command/CreateVolumeCmdImpl.java     |   0
 .../command/DisconnectFromNetworkCmdImpl.java |   0
 .../core/command/EventsCmdImpl.java           |   0
 .../core/command/EventsResultCallback.java    |   0
 .../core/command/ExecCreateCmdImpl.java       |   0
 .../core/command/ExecStartCmdImpl.java        |   0
 .../core/command/ExecStartResultCallback.java |   0
 .../dockerjava/core/command/FrameReader.java  |   0
 .../dockerjava/core/command/InfoCmdImpl.java  |   0
 .../core/command/InitializeSwarmCmdImpl.java  |   0
 .../core/command/InpectNetworkCmdImpl.java    |   0
 .../core/command/InspectContainerCmdImpl.java |   0
 .../core/command/InspectExecCmdImpl.java      |   0
 .../core/command/InspectImageCmdImpl.java     |   0
 .../core/command/InspectServiceCmdImpl.java   |   0
 .../core/command/InspectSwarmCmdImpl.java     |   0
 .../core/command/InspectSwarmNodeCmdImpl.java |   0
 .../core/command/InspectVolumeCmdImpl.java    |   0
 .../core/command/JoinSwarmCmdImpl.java        |   0
 .../core/command/KillContainerCmdImpl.java    |   0
 .../core/command/LeaveSwarmCmdImpl.java       |   0
 .../core/command/ListContainersCmdImpl.java   |   0
 .../core/command/ListImagesCmdImpl.java       |   0
 .../core/command/ListNetworksCmdImpl.java     |   0
 .../core/command/ListSecretsCmdImpl.java      |   0
 .../core/command/ListServicesCmdImpl.java     |   0
 .../core/command/ListSwarmNodesCmdImpl.java   |   0
 .../core/command/ListTasksCmdImpl.java        |   0
 .../core/command/ListVolumesCmdImpl.java      |   0
 .../core/command/LoadImageCmdImpl.java        |   0
 .../core/command/LogContainerCmdImpl.java     |   0
 .../command/LogContainerResultCallback.java   |   0
 .../core/command/LogSwarmObjectImpl.java      |   0
 .../core/command/PauseContainerCmdImpl.java   |   0
 .../dockerjava/core/command/PingCmdImpl.java  |   0
 .../dockerjava/core/command/PruneCmdImpl.java |   0
 .../core/command/PullImageCmdImpl.java        |   0
 .../core/command/PullImageResultCallback.java |   0
 .../core/command/PushImageCmdImpl.java        |   0
 .../core/command/PushImageResultCallback.java |   0
 .../core/command/RemoveContainerCmdImpl.java  |   0
 .../core/command/RemoveImageCmdImpl.java      |   0
 .../core/command/RemoveNetworkCmdImpl.java    |   0
 .../core/command/RemoveSecretCmdImpl.java     |   0
 .../core/command/RemoveServiceCmdImpl.java    |   0
 .../core/command/RemoveSwarmNodeCmdImpl.java  |   0
 .../core/command/RemoveVolumeCmdImpl.java     |   0
 .../core/command/RenameContainerCmdImpl.java  |   0
 .../core/command/RestartContainerCmdImpl.java |   0
 .../core/command/SaveImageCmdImpl.java        |   0
 .../core/command/SearchImagesCmdImpl.java     |   0
 .../core/command/StartContainerCmdImpl.java   |   0
 .../dockerjava/core/command/StatsCmdImpl.java |   0
 .../core/command/StopContainerCmdImpl.java    |   0
 .../core/command/TagImageCmdImpl.java         |   0
 .../core/command/TopContainerCmdImpl.java     |   0
 .../core/command/UnpauseContainerCmdImpl.java |   0
 .../core/command/UpdateContainerCmdImpl.java  |   0
 .../core/command/UpdateServiceCmdImpl.java    |   0
 .../core/command/UpdateSwarmCmdImpl.java      |   0
 .../core/command/UpdateSwarmNodeCmdImpl.java  |   0
 .../core/command/VersionCmdImpl.java          |   0
 .../core/command/WaitContainerCmdImpl.java    |   0
 .../command/WaitContainerResultCallback.java  |   0
 .../core/dockerfile/Dockerfile.java           |   0
 .../core/dockerfile/DockerfileStatement.java  |   0
 .../exception/GoLangFileMatchException.java   |   0
 .../InvalidRepositoryNameException.java       |   0
 .../core/exec/AbstrAsyncDockerCmdExec.java    |   0
 .../core/exec/AbstrDockerCmdExec.java         |   0
 .../core/exec/AbstrSyncDockerCmdExec.java     |   0
 .../core/exec/AttachContainerCmdExec.java     |   0
 .../dockerjava/core/exec/AuthCmdExec.java     |   0
 .../core/exec/BuildImageCmdExec.java          |   0
 .../dockerjava/core/exec/CommitCmdExec.java   |   0
 .../core/exec/ConnectToNetworkCmdExec.java    |   0
 .../core/exec/ContainerDiffCmdExec.java       |   0
 .../exec/CopyArchiveFromContainerCmdExec.java |   0
 .../exec/CopyArchiveToContainerCmdExec.java   |   0
 .../exec/CopyFileFromContainerCmdExec.java    |   0
 .../core/exec/CreateContainerCmdExec.java     |   0
 .../core/exec/CreateImageCmdExec.java         |   0
 .../core/exec/CreateNetworkCmdExec.java       |   0
 .../core/exec/CreateSecretCmdExec.java        |   0
 .../core/exec/CreateServiceCmdExec.java       |   0
 .../core/exec/CreateVolumeCmdExec.java        |   0
 .../exec/DisconnectFromNetworkCmdExec.java    |   0
 .../dockerjava/core/exec/EventsCmdExec.java   |   0
 .../core/exec/ExecCreateCmdExec.java          |   0
 .../core/exec/ExecStartCmdExec.java           |   0
 .../dockerjava/core/exec/InfoCmdExec.java     |   0
 .../core/exec/InitializeSwarmCmdExec.java     |   0
 .../core/exec/InspectContainerCmdExec.java    |   0
 .../core/exec/InspectExecCmdExec.java         |   0
 .../core/exec/InspectImageCmdExec.java        |   0
 .../core/exec/InspectNetworkCmdExec.java      |   0
 .../core/exec/InspectServiceCmdExec.java      |   0
 .../core/exec/InspectSwarmCmdExec.java        |   0
 .../core/exec/InspectSwarmNodeCmdExec.java    |   0
 .../core/exec/InspectVolumeCmdExec.java       |   0
 .../core/exec/JoinSwarmCmdExec.java           |   0
 .../core/exec/KillContainerCmdExec.java       |   0
 .../core/exec/LeaveSwarmCmdExec.java          |   0
 .../core/exec/ListContainersCmdExec.java      |   0
 .../core/exec/ListImagesCmdExec.java          |   0
 .../core/exec/ListNetworksCmdExec.java        |   0
 .../core/exec/ListSecretsCmdExec.java         |   0
 .../core/exec/ListServicesCmdExec.java        |   0
 .../core/exec/ListSwarmNodesCmdExec.java      |   0
 .../core/exec/ListTasksCmdExec.java           |   0
 .../core/exec/ListVolumesCmdExec.java         |   0
 .../core/exec/LoadImageCmdExec.java           |   0
 .../core/exec/LogContainerCmdExec.java        |   0
 .../core/exec/LogSwarmObjectExec.java         |   0
 .../core/exec/PauseContainerCmdExec.java      |   0
 .../dockerjava/core/exec/PingCmdExec.java     |   0
 .../dockerjava/core/exec/PruneCmdExec.java    |   0
 .../core/exec/PullImageCmdExec.java           |   0
 .../core/exec/PushImageCmdExec.java           |   0
 .../core/exec/RemoveContainerCmdExec.java     |   0
 .../core/exec/RemoveImageCmdExec.java         |   0
 .../core/exec/RemoveNetworkCmdExec.java       |   0
 .../core/exec/RemoveSecretCmdExec.java        |   0
 .../core/exec/RemoveServiceCmdExec.java       |   0
 .../core/exec/RemoveSwarmNodeCmdExec.java     |   0
 .../core/exec/RemoveVolumeCmdExec.java        |   0
 .../core/exec/RenameContainerCmdExec.java     |   0
 .../core/exec/RestartContainerCmdExec.java    |   0
 .../core/exec/SaveImageCmdExec.java           |   0
 .../core/exec/SearchImagesCmdExec.java        |   0
 .../core/exec/StartContainerCmdExec.java      |   0
 .../dockerjava/core/exec/StatsCmdExec.java    |   0
 .../core/exec/StopContainerCmdExec.java       |   0
 .../dockerjava/core/exec/TagImageCmdExec.java |   0
 .../core/exec/TopContainerCmdExec.java        |   0
 .../core/exec/UnpauseContainerCmdExec.java    |   0
 .../core/exec/UpdateContainerCmdExec.java     |   0
 .../core/exec/UpdateServiceCmdExec.java       |   0
 .../core/exec/UpdateSwarmCmdExec.java         |   0
 .../core/exec/UpdateSwarmNodeCmdExec.java     |   0
 .../dockerjava/core/exec/VersionCmdExec.java  |   0
 .../core/exec/WaitContainerCmdExec.java       |   0
 .../core/util/CacheFromEncoder.java           |   0
 .../core/util/CertificateUtils.java           |   0
 .../core/util/CompressArchiveUtil.java        |   0
 .../dockerjava/core/util/FilePathUtil.java    |   0
 .../dockerjava/core/util/FiltersBuilder.java  |   0
 .../dockerjava/core/util/FiltersEncoder.java  |   0
 .../core/util/SwarmNodesFiltersBuilder.java   |   0
 .../dockerjava/core/util/TarDirWalker.java    |   0
 .../jaxrs/AbstrAsyncDockerCmdExec.java        |   0
 .../dockerjava/jaxrs/AbstrDockerCmdExec.java  |   0
 .../jaxrs/AbstrSyncDockerCmdExec.java         |   0
 .../dockerjava/jaxrs/ApacheUnixSocket.java    |   0
 .../jaxrs/AttachContainerCmdExec.java         |   0
 .../github/dockerjava/jaxrs/AuthCmdExec.java  |   0
 .../dockerjava/jaxrs/BuildImageCmdExec.java   |   0
 .../dockerjava/jaxrs/CommitCmdExec.java       |   0
 .../jaxrs/ConnectToNetworkCmdExec.java        |   0
 .../jaxrs/ContainerDiffCmdExec.java           |   0
 .../CopyArchiveFromContainerCmdExec.java      |   0
 .../jaxrs/CopyArchiveToContainerCmdExec.java  |   0
 .../jaxrs/CopyFileFromContainerCmdExec.java   |   0
 .../jaxrs/CreateContainerCmdExec.java         |   0
 .../dockerjava/jaxrs/CreateImageCmdExec.java  |   0
 .../jaxrs/CreateNetworkCmdExec.java           |   0
 .../dockerjava/jaxrs/CreateSecretCmdExec.java |   0
 .../jaxrs/CreateServiceCmdExec.java           |   0
 .../dockerjava/jaxrs/CreateVolumeCmdExec.java |   0
 .../jaxrs/DisconnectFromNetworkCmdExec.java   |   0
 .../jaxrs/DockerCmdExecFactoryImpl.java       |   0
 .../dockerjava/jaxrs/EventsCmdExec.java       |   0
 .../dockerjava/jaxrs/ExecCreateCmdExec.java   |   0
 .../dockerjava/jaxrs/ExecStartCmdExec.java    |   0
 .../github/dockerjava/jaxrs/InfoCmdExec.java  |   0
 .../jaxrs/InitializeSwarmCmdExec.java         |   0
 .../jaxrs/InspectContainerCmdExec.java        |   0
 .../dockerjava/jaxrs/InspectExecCmdExec.java  |   0
 .../dockerjava/jaxrs/InspectImageCmdExec.java |   0
 .../jaxrs/InspectNetworkCmdExec.java          |   0
 .../jaxrs/InspectServiceCmdExec.java          |   0
 .../dockerjava/jaxrs/InspectSwarmCmdExec.java |   0
 .../jaxrs/InspectSwarmNodeCmdExec.java        |   0
 .../jaxrs/InspectVolumeCmdExec.java           |   0
 .../jaxrs/JerseyDockerCmdExecFactory.java     |   0
 .../dockerjava/jaxrs/JoinSwarmCmdExec.java    |   0
 .../jaxrs/KillContainerCmdExec.java           |   0
 .../dockerjava/jaxrs/LeaveSwarmCmdExec.java   |   0
 .../jaxrs/ListContainersCmdExec.java          |   0
 .../dockerjava/jaxrs/ListImagesCmdExec.java   |   0
 .../dockerjava/jaxrs/ListNetworksCmdExec.java |   0
 .../dockerjava/jaxrs/ListSecretsCmdExec.java  |   0
 .../dockerjava/jaxrs/ListServicesCmdExec.java |   0
 .../jaxrs/ListSwarmNodesCmdExec.java          |   0
 .../dockerjava/jaxrs/ListTasksCmdExec.java    |   0
 .../dockerjava/jaxrs/ListVolumesCmdExec.java  |   0
 .../dockerjava/jaxrs/LoadImageCmdExec.java    |   0
 .../dockerjava/jaxrs/LogContainerCmdExec.java |   0
 .../dockerjava/jaxrs/LogSwarmObjectExec.java  |   0
 .../jaxrs/PauseContainerCmdExec.java          |   0
 .../github/dockerjava/jaxrs/PingCmdExec.java  |   0
 .../github/dockerjava/jaxrs/PruneCmdExec.java |   0
 .../dockerjava/jaxrs/PullImageCmdExec.java    |   0
 .../dockerjava/jaxrs/PushImageCmdExec.java    |   0
 .../jaxrs/RemoveContainerCmdExec.java         |   0
 .../dockerjava/jaxrs/RemoveImageCmdExec.java  |   0
 .../jaxrs/RemoveNetworkCmdExec.java           |   0
 .../dockerjava/jaxrs/RemoveSecretCmdExec.java |   0
 .../jaxrs/RemoveServiceCmdExec.java           |   0
 .../jaxrs/RemoveSwarmNodeCmdExec.java         |   0
 .../dockerjava/jaxrs/RemoveVolumeCmdExec.java |   0
 .../jaxrs/RenameContainerCmdExec.java         |   0
 .../jaxrs/RestartContainerCmdExec.java        |   0
 .../dockerjava/jaxrs/SaveImageCmdExec.java    |   0
 .../dockerjava/jaxrs/SearchImagesCmdExec.java |   0
 .../jaxrs/StartContainerCmdExec.java          |   0
 .../github/dockerjava/jaxrs/StatsCmdExec.java |   0
 .../jaxrs/StopContainerCmdExec.java           |   0
 .../dockerjava/jaxrs/TagImageCmdExec.java     |   0
 .../dockerjava/jaxrs/TopContainerCmdExec.java |   0
 .../jaxrs/UnixConnectionSocketFactory.java    |   0
 .../jaxrs/UnpauseContainerCmdExec.java        |   0
 .../jaxrs/UpdateContainerCmdExec.java         |   0
 .../jaxrs/UpdateServiceCmdExec.java           |   0
 .../dockerjava/jaxrs/UpdateSwarmCmdExec.java  |   0
 .../jaxrs/UpdateSwarmNodeCmdExec.java         |   0
 .../dockerjava/jaxrs/VersionCmdExec.java      |   0
 .../jaxrs/WaitContainerCmdExec.java           |   0
 .../jaxrs/async/AbstractCallbackNotifier.java |   0
 .../jaxrs/async/GETCallbackNotifier.java      |   0
 .../jaxrs/async/POSTCallbackNotifier.java     |   0
 .../jaxrs/filter/FollowRedirectsFilter.java   |   0
 .../jaxrs/filter/JsonClientFilter.java        |   0
 .../jaxrs/filter/LoggingFilter.java           |   0
 .../filter/ResponseStatusExceptionFilter.java |   0
 .../jaxrs/filter/SelectiveLoggingFilter.java  |   0
 .../util/WrappedResponseInputStream.java      |   0
 .../dockerjava/netty/ChannelProvider.java     |   0
 .../netty/DockerCmdExecFactoryImpl.java       |   0
 .../netty/NettyDockerCmdExecFactory.java      |   0
 .../netty/NettyInvocationBuilder.java         |   0
 .../dockerjava/netty/NettyWebTarget.java      |   0
 .../handler/FramedResponseStreamHandler.java  |   0
 .../handler/HttpConnectionHijackHandler.java  |   0
 .../netty/handler/HttpRequestProvider.java    |   0
 .../netty/handler/HttpResponseHandler.java    |   0
 .../handler/HttpResponseStreamHandler.java    |   0
 .../netty/handler/JsonRequestHandler.java     |   0
 .../handler/JsonResponseCallbackHandler.java  |   0
 .../http/impl/io/ChunkedInputStream.java      |   0
 .../main/resources/docker-java.properties     |   0
 .../api/ModelsSerializableTest.java           |   0
 .../api/command/CommandJSONSamples.java       |   0
 .../command/InspectContainerResponseTest.java |   0
 .../api/command/InspectExecResponseTest.java  |   0
 .../api/command/InspectImageResponseTest.java |   0
 .../dockerjava/api/model/AccessModeTest.java  |   0
 .../dockerjava/api/model/AuthConfigTest.java  |   0
 .../github/dockerjava/api/model/BindTest.java |   0
 .../dockerjava/api/model/BindingTest.java     |   0
 .../dockerjava/api/model/CapabilityTest.java  |   0
 .../dockerjava/api/model/ContainerTest.java   |   0
 .../dockerjava/api/model/DeviceTest.java      |   0
 .../dockerjava/api/model/EventsTest.java      |   0
 .../dockerjava/api/model/ExposedPortTest.java |   0
 .../dockerjava/api/model/IdentifierTest.java  |   0
 .../github/dockerjava/api/model/InfoTest.java |   0
 .../api/model/InternetProtocolTest.java       |   0
 .../github/dockerjava/api/model/LinkTest.java |   0
 .../dockerjava/api/model/PortBindingTest.java |   0
 .../api/model/PortsAddBindingsTest.java       |   0
 .../api/model/PortsSerializingTest.java       |   0
 .../api/model/PullResponseItemTest.java       |   0
 .../api/model/PullResponseJSONSamples.java    |   0
 .../dockerjava/api/model/RepositoryTest.java  |   0
 .../api/model/RestartPolicyParsingTest.java   |   0
 .../model/RestartPolicySerializingTest.java   |   0
 .../api/model/RestartPolicyToStringTest.java  |   0
 .../dockerjava/api/model/StatisticsTest.java  |   0
 .../dockerjava/api/model/VersionTest.java     |   0
 .../dockerjava/api/model/VolumeBindsTest.java |   0
 .../api/model/VolumeFromSerializingTest.java  |   0
 .../dockerjava/api/model/VolumeTest.java      |   0
 .../dockerjava/cmd/AttachContainerCmdIT.java  |   0
 .../com/github/dockerjava/cmd/AuthCmdIT.java  |   0
 .../dockerjava/cmd/BuildImageCmdIT.java       |   0
 .../java/com/github/dockerjava/cmd/CmdIT.java |   0
 .../github/dockerjava/cmd/CommitCmdIT.java    |   0
 .../dockerjava/cmd/ConnectToNetworkCmdIT.java |   0
 .../dockerjava/cmd/ContainerDiffCmdIT.java    |   0
 .../cmd/CopyArchiveFromContainerCmdIT.java    |   0
 .../cmd/CopyArchiveToContainerCmdIT.java      |   0
 .../cmd/CopyFileFromContainerCmdIT.java       |   0
 .../dockerjava/cmd/CreateContainerCmdIT.java  |   0
 .../dockerjava/cmd/CreateNetworkCmdIT.java    |   0
 .../dockerjava/cmd/CreateVolumeCmdIT.java     |   0
 .../cmd/DisconnectFromNetworkCmdIT.java       |   0
 .../github/dockerjava/cmd/EventsCmdIT.java    |   0
 .../dockerjava/cmd/ExecCreateCmdImplIT.java   |   0
 .../github/dockerjava/cmd/ExecStartCmdIT.java |   0
 .../com/github/dockerjava/cmd/InfoCmdIT.java  |   0
 .../dockerjava/cmd/InspectContainerCmdIT.java |   0
 .../dockerjava/cmd/InspectExecCmdIT.java      |   0
 .../dockerjava/cmd/InspectNetworkCmdIT.java   |   0
 .../dockerjava/cmd/InspectVolumeCmdIT.java    |   0
 .../dockerjava/cmd/KillContainerCmdIT.java    |   0
 .../dockerjava/cmd/ListContainersCmdIT.java   |   0
 .../dockerjava/cmd/ListImagesCmdIT.java       |   0
 .../dockerjava/cmd/ListNetworksCmdIT.java     |   0
 .../dockerjava/cmd/ListVolumesCmdIT.java      |   0
 .../github/dockerjava/cmd/LoadImageCmdIT.java |   0
 .../dockerjava/cmd/LogContainerCmdIT.java     |   0
 .../com/github/dockerjava/cmd/PauseCmdIT.java |   0
 .../com/github/dockerjava/cmd/PingCmdIT.java  |   0
 .../github/dockerjava/cmd/PullImageCmdIT.java |   0
 .../github/dockerjava/cmd/PushImageCmdIT.java |   0
 .../cmd/RemoveContainerCmdImplIT.java         |   0
 .../dockerjava/cmd/RemoveImageCmdIT.java      |   0
 .../dockerjava/cmd/RemoveNetworkCmdIT.java    |   0
 .../dockerjava/cmd/RemoveVolumeCmdIT.java     |   0
 .../dockerjava/cmd/RenameContainerCmdIT.java  |   0
 .../cmd/RestartContainerCmdImplIT.java        |   0
 .../github/dockerjava/cmd/SaveImageCmdIT.java |   0
 .../dockerjava/cmd/SearchImagesCmdIT.java     |   0
 .../dockerjava/cmd/StartContainerCmdIT.java   |   0
 .../com/github/dockerjava/cmd/StatsCmdIT.java |   0
 .../dockerjava/cmd/StopContainerCmdIT.java    |   0
 .../github/dockerjava/cmd/TagImageCmdIT.java  |   0
 .../github/dockerjava/cmd/UnpauseCmdIT.java   |   0
 .../dockerjava/cmd/UpdateContainerCmdIT.java  |   0
 .../github/dockerjava/cmd/VersionCmdIT.java   |   0
 .../dockerjava/cmd/WaitContainerCmdIT.java    |   0
 .../cmd/swarm/CreateSecretCmdExecIT.java      |   0
 .../cmd/swarm/CreateServiceCmdExecIT.java     |   0
 .../cmd/swarm/InitializeSwarmCmdExecIT.java   |   0
 .../cmd/swarm/JoinSwarmCmdExecIT.java         |   0
 .../cmd/swarm/LeaveSwarmCmdExecIT.java        |   0
 .../cmd/swarm/ListSecretCmdExecIT.java        |   0
 .../cmd/swarm/ListServicesCmdExecIT.java      |   0
 .../cmd/swarm/ListTasksCmdExecIT.java         |   0
 .../cmd/swarm/LogSwarmObjectIT.java           |   0
 .../dockerjava/cmd/swarm/SwarmCmdIT.java      |   0
 .../cmd/swarm/UpdateSwarmCmdExecIT.java       |   0
 .../cmd/swarm/UpdateSwarmNodeIT.java          |   0
 .../cmd/swarm/UpdateSwarmServiceIT.java       |   0
 .../core/DefaultDockerClientConfigTest.java   |   0
 .../core/DockerClientBuilderTest.java         |   0
 .../dockerjava/core/DockerClientImplTest.java |   0
 .../dockerjava/core/DockerConfigFileTest.java |   0
 .../dockerjava/core/GoLangFileMatchTest.java  |   0
 .../dockerjava/core/NameParserTest.java       |   0
 .../dockerjava/core/RemoteApiVersionTest.java |   0
 .../core/TestDockerCmdExecFactory.java        |   0
 .../core/async/JsonStreamProcessorTest.java   |   0
 .../core/command/DockerfileFixture.java       |   0
 .../core/command/FrameReaderITest.java        |   0
 .../core/command/FrameReaderTest.java         |   0
 .../DockerfileAddMultipleFilesTest.java       |   0
 .../DockerfileStatementAddTest.java           |   0
 .../core/util/CertificateUtilsTest.java       |   0
 .../core/util/CompressArchiveUtilTest.java    |   0
 .../core/util/FiltersBuilderTest.java         |   0
 .../github/dockerjava/junit/DockerAssume.java |   0
 .../dockerjava/junit/DockerMatchers.java      |   0
 .../github/dockerjava/junit/DockerRule.java   |   0
 .../junit/category/AuthIntegration.java       |   0
 .../junit/category/Integration.java           |   0
 .../junit/category/SwarmModeIntegration.java  |   0
 .../suite/IntegrationDockerTestSuite.java     |   0
 .../dockerjava/junit/suite/SwarmSuite.java    |   0
 .../NettyDockerCmdExecFactoryConfigTest.java  |   0
 .../dockerjava/netty/NettyWebTargetTest.java  |   0
 .../FramedResponseStreamHandlerTest.java      |   0
 .../HttpResponseStreamHandlerTest.java        |   0
 .../test/serdes/AbstractJSONResourceRef.java  |   0
 .../test/serdes/JSONResourceRef.java          |   0
 .../dockerjava/test/serdes/JSONSamples.java   |   0
 .../test/serdes/JSONTestHelper.java           |   0
 .../dockerjava/utils/ContainerUtils.java      |   0
 .../utils/LogContainerTestCallback.java       |   0
 .../dockerjava/utils/RegistryUtils.java       |   0
 .../dockerjava/utils/TestResources.java       |   0
 .../github/dockerjava/utils/TestUtils.java    |   0
 .../test/resources/api/images/load/image.tar  | Bin
 .../attachContainerTestDockerfile/Dockerfile  |   0
 .../attachContainerTestDockerfile/echo.sh     |   0
 .../resources/buildTests/ADD/file/Dockerfile  |   0
 .../resources/buildTests/ADD/file/testrun.sh  |   0
 .../buildTests/ADD/fileInSubfolder/Dockerfile |   0
 .../ADD/fileInSubfolder/files/testrun.sh      |   0
 .../resources/buildTests/ADD/files/Dockerfile |   0
 .../test/resources/buildTests/ADD/files/src1  |   0
 .../test/resources/buildTests/ADD/files/src2  |   0
 .../ADD/filesViaWildcard/Dockerfile           |   0
 .../ADD/filesViaWildcard/folder1/testrun.sh   |   0
 .../filesViaWildcard/folder2/testinclude1.sh  |   0
 .../filesViaWildcard/ignore/testinclude2.sh   |   0
 .../buildTests/ADD/folder/Dockerfile          |   0
 .../ADD/folder/folderA/testAddFolder.sh       |   0
 .../resources/buildTests/ADD/url/Dockerfile   |   0
 .../resources/buildTests/ADD/url/testrun.sh   |   0
 .../resources/buildTests/AUTHOR/Dockerfile    |   0
 .../buildTests/CacheFrom/test1/Dockerfile     |   0
 .../buildTests/CacheFrom/test2/Dockerfile     |   0
 .../test/resources/buildTests/ENV/Dockerfile  |   0
 .../buildTests/ENV/subst-file-2-abc123.txt    |   0
 .../buildTests/ENV/subst-file-abc123.txt      |   0
 .../test/resources/buildTests/ENV/testrun.sh  |   0
 .../FROM/privateRegistry/Dockerfile           |   0
 .../buildTests/ONBUILD/child/Dockerfile       |   0
 .../buildTests/ONBUILD/child/testrun.sh       |   0
 .../buildTests/ONBUILD/parent/Dockerfile      |   0
 .../resources/buildTests/buildArgs/Dockerfile |   0
 .../dockerfileFolder/Dockerfile               |   0
 .../testrunFolder/testrun.sh                  |   0
 .../DockerfileIgnored/.dockerignore           |   0
 .../dockerignore/DockerfileIgnored/Dockerfile |   0
 .../dockerignore/DockerfileIgnored/testrun.sh |   0
 .../DockerfileNotIgnored/.dockerignore        |   0
 .../DockerfileNotIgnored/Dockerfile           |   0
 .../.dockerignore                             |   0
 .../EffectiveDockerignorePatterns/Dockerfile  |   0
 .../README-secret.md                          |   0
 .../EffectiveDockerignorePatterns/README.md   |   0
 .../dockerignore/IgnoreAllBut/.dockerignore   |   0
 .../dockerignore/IgnoreAllBut/Dockerfile      |   0
 .../dockerignore/IgnoreAllBut/README.MD       |   0
 .../IgnoreAllBut/build/libs/foo.jar           |   0
 .../dockerignore/IgnoreAllBut/test/bar.txt    |   0
 .../.dockerignore                             |   0
 .../IneffectiveDockerignorePattern/Dockerfile |   0
 .../README-secret.md                          |   0
 .../IneffectiveDockerignorePattern/README.md  |   0
 .../InvalidDockerignorePattern/.dockerignore  |   0
 .../InvalidDockerignorePattern/Dockerfile     |   0
 .../InvalidDockerignorePattern/testrun.sh     |   0
 .../NestedDirsDockerignore/.dockerignore      |   0
 .../NestedDirsDockerignore/Dockerfile         |   0
 .../NestedDirsDockerignore/parent/README.md   |   0
 .../NestedDirsDockerignore/parent/a.txt       |   0
 .../parent/anotherChild/README-child.md       |   0
 .../anotherChild/grandChild/README-grand.md   |   0
 .../parent/anotherChild/grandChild/c.txt      |   0
 .../NestedDirsDockerignore/parent/child/b.txt |   0
 .../ValidDockerignorePattern/.dockerignore    |   0
 .../ValidDockerignorePattern/Dockerfile       |   0
 .../dockerignore/ValidDockerignorePattern/a/a |   0
 .../dockerignore/ValidDockerignorePattern/a/b |   0
 .../dockerignore/ValidDockerignorePattern/a/c |   0
 .../dockerignore/ValidDockerignorePattern/a/d |   0
 .../ValidDockerignorePattern/testrun.sh       |   0
 .../resources/buildTests/labels/Dockerfile    |   0
 .../resources/busyboxDockerfile/Dockerfile    |   0
 .../registry.v1/.dockercfg                    |   0
 .../registry.v2/config.json                   |   0
 .../inspectContainerResponse_empty.json       |   0
 .../inspectContainerResponse_full.json        |   0
 .../inspectContainerResponse_full_1_21.json   |   0
 .../inspectContainerResponse_full_1_26a.json  |   0
 .../inspectContainerResponse_full_1_26b.json  |   0
 .../api/model/pullImageResponse_error.json    |   0
 .../api/model/pullImageResponse_legacy.json   |   0
 .../model/pullImageResponse_newerImage.json   |   0
 .../api/model/pullImageResponse_upToDate.json |   0
 .../CertificateUtilsTest/allFilesExist/ca.pem |   0
 .../allFilesExist/cert.pem                    |   0
 .../allFilesExist/key.pem                     |   0
 .../caAndCertMissing/key.pem                  |   0
 .../caAndKeyMissing/cert.pem                  |   0
 .../CertificateUtilsTest/caMissing/cert.pem   |   0
 .../CertificateUtilsTest/caMissing/key.pem    |   0
 .../caTest/multiple_ca.pem                    |   0
 .../CertificateUtilsTest/caTest/single_ca.pem |   0
 .../certAndKeyMissing/ca.pem                  |   0
 .../CertificateUtilsTest/certMissing/ca.pem   |   0
 .../CertificateUtilsTest/certMissing/key.pem  |   0
 .../CertificateUtilsTest/keyMissing/ca.pem    |   0
 .../CertificateUtilsTest/keyMissing/cert.pem  |   0
 .../eventStreamReaderDockerfile/Dockerfile    |   0
 .../frameReaderDockerfile/Dockerfile          |   0
 .../src}/test/resources/logback.xml           |   0
 .../test/resources/privateRegistry/Dockerfile |   0
 .../resources/privateRegistry/auth/htpasswd   |   0
 .../privateRegistry/certs/README.txt          |   0
 .../privateRegistry/certs/domain.crt          |   0
 .../privateRegistry/certs/domain.key          |   0
 .../1.22/containers/container/json/1.json     |   0
 .../containers/container/update/docs.json     |   0
 .../samples/1.22/containers/create/docs.json  |   0
 .../samples/1.22/containers/json/filter1.json |   0
 .../resources/samples/1.22/exec/ID/1.json     |   0
 .../samples/1.22/images/docImage/doc.json     |   0
 .../1.22/images/docImage/inspect_doc.json     |   0
 .../samples/1.22/images/image1/inspect1.json  |   0
 .../1.22/images/overlay/inspectOverlay.json   |   0
 .../test/resources/samples/1.22/info/1.json   |   0
 .../test/resources/samples/1.22/info/2.json   |   0
 .../resources/samples/1.22/info/docs.json     |   0
 .../samples/1.22/other/AuthConfig/docs1.json  |   0
 .../samples/1.22/other/AuthConfig/docs2.json  |   0
 .../resources/samples/1.22/version/1.json     |   0
 .../samples/1.23/other/AuthConfig/docs1.json  |   0
 .../samples/1.24/containers/inspect/1.json    |   0
 .../resources/samples/1.24/events/docs1.json  |   0
 .../samples/1.25/images/windowsImage/doc.json |   0
 .../1.25/other/AuthConfig/orchestrators.json  |   0
 .../containers/container/stats/stats1.json    |   0
 .../samples/1.38/containers/inspect/lcow.json |   0
 .../resources/samples/1.38/info/lcow.json     |   0
 .../resources/samples/1.38/version/lcow.json  |   0
 .../someHomeDir/.docker/certs/dummy.txt       |   0
 .../resources/someHomeDir/.docker/config.json |   0
 .../testAuthConfigFile/emptyFile/.dockercfg   |   0
 .../invalidJsonInvalidAuth/.dockercfg         |   0
 .../invalidLegacyAuthLine/.dockercfg          |   0
 .../invalidLegacyEmailLine/.dockercfg         |   0
 .../invalidLegacyInvalidAuth/.dockercfg       |   0
 .../tooSmallFile/.dockercfg                   |   0
 .../validDockerConfig/config.json             |   0
 .../validJsonWithOnlyUnknown/config.json      |   0
 .../validJsonWithUnknown/config.json          |   0
 .../testAuthConfigFile/validLegacy/.dockercfg |   0
 .../validLegacyJson/.dockercfg                |   0
 .../resources/testCopyFromArchive/binary.dat  | Bin
 .../testImportImageFromTar/empty.tar          | Bin
 .../test/resources/testReadFile/Dockerfile    |   0
 .../test/resources/testReadFile/oldFile.txt   |   0
 .../test/resources/testReadFile/testrun.sh    |   0
 .../src}/test/resources/travis-logback.xml    |   0
 template.mf => docker-java/template.mf        |   0
 pom.xml                                       | 259 +----------------
 835 files changed, 280 insertions(+), 252 deletions(-)
 create mode 100644 docker-java/pom.xml
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/DockerClient.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/async/ResultCallback.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/AuthCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/BuildImageCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/CommitCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/CreateImageCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/CreateImageResponse.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/DockerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/DockerCmdSyncExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/EventsCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/ExecStartCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/GraphData.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/GraphDriver.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/HealthState.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/HealthStateLog.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/InfoCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/InitializeSwarmCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/InspectExecCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/InspectExecResponse.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/InspectImageCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/InspectImageResponse.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/InspectServiceCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/InspectSwarmCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/InspectTaskCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/JoinSwarmCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/KillContainerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/LeaveSwarmCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/ListContainersCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/ListImagesCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/ListServicesCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/ListTasksCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/LoadImageCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/LogContainerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/LogSwarmObjectCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/PingCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/PruneCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/PullImageCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/PushImageCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/RemoveSecretCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/RemoveServiceCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/RootFS.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/SaveImageCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/StartContainerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/StatsCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/StopContainerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/TagImageCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/TopContainerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/TopContainerResponse.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/UpdateSwarmCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/VersionCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/exception/BadRequestException.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/exception/ConflictException.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/exception/DockerClientException.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/exception/DockerException.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/exception/InternalServerErrorException.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/exception/NotAcceptableException.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/exception/NotFoundException.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/exception/NotModifiedException.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/exception/UnauthorizedException.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/AccessMode.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/AuthConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/AuthConfigurations.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/AuthResponse.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Bind.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/BindOptions.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/BindPropagation.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Binds.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/BuildResponseItem.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Capability.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ChangeLog.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ClusterInfo.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Container.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ContainerConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ContainerMount.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ContainerNetwork.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ContainerPort.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ContainerSpec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Device.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Driver.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/DriverStatus.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Endpoint.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/EndpointSpec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ErrorDetail.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ErrorResponse.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Event.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/EventActor.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/EventType.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ExposedPort.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ExposedPorts.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ExternalCA.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Frame.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/GenericResource.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/HealthCheck.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/HostConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Identifier.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Image.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Info.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/InternetProtocol.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Isolation.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Link.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Links.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/LocalNodeState.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/LogConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/LxcConf.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Mount.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/MountType.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Network.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/NetworkSettings.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Node.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ObjectVersion.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/PeerNode.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/PortBinding.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/PortConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Ports.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/PropagationMode.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/PruneResponse.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/PruneType.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/PullResponseItem.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/PushResponseItem.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Reachability.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Repository.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ResourceRequirements.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ResourceSpecs.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ResourceVersion.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ResponseItem.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/RestartPolicy.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SELContext.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SearchItem.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Secret.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SecretSpec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Service.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ServiceMode.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ServicePlacement.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ServiceSpec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Statistics.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/StatsConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/StreamType.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Swarm.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SwarmInfo.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SwarmNode.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SwarmNodeState.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SwarmSpec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/SwarmVersion.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Task.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/TaskDefaults.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/TaskSpec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/TaskState.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/TaskStatus.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/TmpfsOptions.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Ulimit.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/UpdateConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/UpdateOrder.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Version.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/VersionComponent.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/VersionPlatform.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Volume.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/VolumeBind.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/VolumeBinds.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/VolumeOptions.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/VolumeRW.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/Volumes.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/VolumesFrom.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/VolumesRW.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/api/model/WaitResponse.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/DockerClientBuilder.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/DockerClientConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/DockerClientImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/DockerConfigFile.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/GoLangFileMatch.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/InvocationBuilder.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/MediaType.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/NameParser.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/RemoteApiVersion.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/SSLConfig.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/WebTarget.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/EventsResultCallback.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/FrameReader.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/InpectNetworkCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/InspectSwarmCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/LeaveSwarmCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/ListTasksCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/LogSwarmObjectImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/PingCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/RemoveNetworkCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exception/GoLangFileMatchException.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exception/InvalidRepositoryNameException.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/AbstrAsyncDockerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/AbstrSyncDockerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/AttachContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/AuthCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/CommitCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/ContainerDiffCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/CopyArchiveFromContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/CopyArchiveToContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/CopyFileFromContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/CreateImageCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/CreateNetworkCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/CreateSecretCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/CreateServiceCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/CreateVolumeCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/EventsCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/ExecCreateCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/ExecStartCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/InfoCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/InspectContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/InspectExecCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/InspectImageCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/InspectNetworkCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/InspectServiceCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/InspectSwarmCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/InspectSwarmNodeCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/InspectVolumeCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/ListContainersCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/ListImagesCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/ListNetworksCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/ListSecretsCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/ListServicesCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/ListSwarmNodesCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/ListTasksCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/ListVolumesCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/LoadImageCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/LogSwarmObjectExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/PingCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/PruneCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/PullImageCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/RemoveContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/RemoveImageCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/RemoveNetworkCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/RemoveSecretCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/RemoveServiceCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/RemoveSwarmNodeCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/RemoveVolumeCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/SaveImageCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/UpdateContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/VersionCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/exec/WaitContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/util/CertificateUtils.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/util/FilePathUtil.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/util/FiltersBuilder.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/util/FiltersEncoder.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/core/util/TarDirWalker.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/netty/ChannelProvider.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/netty/NettyWebTarget.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/netty/handler/HttpConnectionHijackHandler.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java (100%)
 rename {src => docker-java/src}/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java (100%)
 rename {src => docker-java/src}/main/java/org/apache/http/impl/io/ChunkedInputStream.java (100%)
 rename {src => docker-java/src}/main/resources/docker-java.properties (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/ModelsSerializableTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/AccessModeTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/AuthConfigTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/BindTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/BindingTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/CapabilityTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/ContainerTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/DeviceTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/EventsTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/ExposedPortTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/IdentifierTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/InfoTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/LinkTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/PortBindingTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/RepositoryTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/RestartPolicyParsingTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/RestartPolicyToStringTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/StatisticsTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/VersionTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/api/model/VolumeTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/AuthCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/CmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/CommitCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/CreateVolumeCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/EventsCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/InfoCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/InspectNetworkCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/InspectVolumeCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/KillContainerCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/ListNetworksCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/ListVolumesCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/PauseCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/PingCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/RemoveNetworkCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/SearchImagesCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/StatsCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/StopContainerCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/UnpauseCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/VersionCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/core/DockerClientImplTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/core/DockerConfigFileTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/core/NameParserTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/core/command/DockerfileFixture.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/core/command/FrameReaderITest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/core/command/FrameReaderTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/core/util/FiltersBuilderTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/junit/DockerAssume.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/junit/DockerMatchers.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/junit/DockerRule.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/junit/category/AuthIntegration.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/junit/category/Integration.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/junit/category/SwarmModeIntegration.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/junit/suite/IntegrationDockerTestSuite.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/junit/suite/SwarmSuite.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/test/serdes/AbstractJSONResourceRef.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/test/serdes/JSONSamples.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/utils/ContainerUtils.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/utils/RegistryUtils.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/utils/TestResources.java (100%)
 rename {src => docker-java/src}/test/java/com/github/dockerjava/utils/TestUtils.java (100%)
 rename {src => docker-java/src}/test/resources/api/images/load/image.tar (100%)
 rename {src => docker-java/src}/test/resources/attachContainerTestDockerfile/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/attachContainerTestDockerfile/echo.sh (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ADD/file/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ADD/file/testrun.sh (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ADD/fileInSubfolder/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ADD/fileInSubfolder/files/testrun.sh (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ADD/files/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ADD/files/src1 (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ADD/files/src2 (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ADD/filesViaWildcard/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ADD/filesViaWildcard/folder1/testrun.sh (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ADD/filesViaWildcard/folder2/testinclude1.sh (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ADD/filesViaWildcard/ignore/testinclude2.sh (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ADD/folder/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ADD/folder/folderA/testAddFolder.sh (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ADD/url/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ADD/url/testrun.sh (100%)
 rename {src => docker-java/src}/test/resources/buildTests/AUTHOR/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/CacheFrom/test1/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/CacheFrom/test2/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ENV/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ENV/subst-file-2-abc123.txt (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ENV/subst-file-abc123.txt (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ENV/testrun.sh (100%)
 rename {src => docker-java/src}/test/resources/buildTests/FROM/privateRegistry/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ONBUILD/child/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ONBUILD/child/testrun.sh (100%)
 rename {src => docker-java/src}/test/resources/buildTests/ONBUILD/parent/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/buildArgs/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerfileNotInBaseDirectory/testrunFolder/testrun.sh (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/DockerfileIgnored/.dockerignore (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/DockerfileIgnored/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/DockerfileIgnored/testrun.sh (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/DockerfileNotIgnored/.dockerignore (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/DockerfileNotIgnored/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/.dockerignore (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/README-secret.md (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/README.md (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/IgnoreAllBut/.dockerignore (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/IgnoreAllBut/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/IgnoreAllBut/README.MD (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/IgnoreAllBut/build/libs/foo.jar (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/IgnoreAllBut/test/bar.txt (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/.dockerignore (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/README-secret.md (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/README.md (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/.dockerignore (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/testrun.sh (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/NestedDirsDockerignore/.dockerignore (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/NestedDirsDockerignore/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/README.md (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/a.txt (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/README-child.md (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/grandChild/README-grand.md (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/grandChild/c.txt (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/child/b.txt (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/ValidDockerignorePattern/.dockerignore (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/ValidDockerignorePattern/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/a (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/b (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/c (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/d (100%)
 rename {src => docker-java/src}/test/resources/buildTests/dockerignore/ValidDockerignorePattern/testrun.sh (100%)
 rename {src => docker-java/src}/test/resources/buildTests/labels/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/busyboxDockerfile/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/com.github.dockerjava.core/registry.v1/.dockercfg (100%)
 rename {src => docker-java/src}/test/resources/com.github.dockerjava.core/registry.v2/config.json (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_empty.json (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full.json (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_21.json (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26b.json (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/api/model/pullImageResponse_error.json (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/api/model/pullImageResponse_legacy.json (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/api/model/pullImageResponse_newerImage.json (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/api/model/pullImageResponse_upToDate.json (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/ca.pem (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/cert.pem (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/key.pem (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caAndCertMissing/key.pem (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caAndKeyMissing/cert.pem (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caMissing/cert.pem (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caMissing/key.pem (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caTest/multiple_ca.pem (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caTest/single_ca.pem (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certAndKeyMissing/ca.pem (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certMissing/ca.pem (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certMissing/key.pem (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/keyMissing/ca.pem (100%)
 rename {src => docker-java/src}/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/keyMissing/cert.pem (100%)
 rename {src => docker-java/src}/test/resources/eventStreamReaderDockerfile/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/frameReaderDockerfile/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/logback.xml (100%)
 rename {src => docker-java/src}/test/resources/privateRegistry/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/privateRegistry/auth/htpasswd (100%)
 rename {src => docker-java/src}/test/resources/privateRegistry/certs/README.txt (100%)
 rename {src => docker-java/src}/test/resources/privateRegistry/certs/domain.crt (100%)
 rename {src => docker-java/src}/test/resources/privateRegistry/certs/domain.key (100%)
 rename {src => docker-java/src}/test/resources/samples/1.22/containers/container/json/1.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.22/containers/container/update/docs.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.22/containers/create/docs.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.22/containers/json/filter1.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.22/exec/ID/1.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.22/images/docImage/doc.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.22/images/docImage/inspect_doc.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.22/images/image1/inspect1.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.22/images/overlay/inspectOverlay.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.22/info/1.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.22/info/2.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.22/info/docs.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.22/other/AuthConfig/docs1.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.22/other/AuthConfig/docs2.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.22/version/1.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.23/other/AuthConfig/docs1.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.24/containers/inspect/1.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.24/events/docs1.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.25/images/windowsImage/doc.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.25/other/AuthConfig/orchestrators.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.27/containers/container/stats/stats1.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.38/containers/inspect/lcow.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.38/info/lcow.json (100%)
 rename {src => docker-java/src}/test/resources/samples/1.38/version/lcow.json (100%)
 rename {src => docker-java/src}/test/resources/someHomeDir/.docker/certs/dummy.txt (100%)
 rename {src => docker-java/src}/test/resources/someHomeDir/.docker/config.json (100%)
 rename {src => docker-java/src}/test/resources/testAuthConfigFile/emptyFile/.dockercfg (100%)
 rename {src => docker-java/src}/test/resources/testAuthConfigFile/invalidJsonInvalidAuth/.dockercfg (100%)
 rename {src => docker-java/src}/test/resources/testAuthConfigFile/invalidLegacyAuthLine/.dockercfg (100%)
 rename {src => docker-java/src}/test/resources/testAuthConfigFile/invalidLegacyEmailLine/.dockercfg (100%)
 rename {src => docker-java/src}/test/resources/testAuthConfigFile/invalidLegacyInvalidAuth/.dockercfg (100%)
 rename {src => docker-java/src}/test/resources/testAuthConfigFile/tooSmallFile/.dockercfg (100%)
 rename {src => docker-java/src}/test/resources/testAuthConfigFile/validDockerConfig/config.json (100%)
 rename {src => docker-java/src}/test/resources/testAuthConfigFile/validJsonWithOnlyUnknown/config.json (100%)
 rename {src => docker-java/src}/test/resources/testAuthConfigFile/validJsonWithUnknown/config.json (100%)
 rename {src => docker-java/src}/test/resources/testAuthConfigFile/validLegacy/.dockercfg (100%)
 rename {src => docker-java/src}/test/resources/testAuthConfigFile/validLegacyJson/.dockercfg (100%)
 rename {src => docker-java/src}/test/resources/testCopyFromArchive/binary.dat (100%)
 rename {src => docker-java/src}/test/resources/testImportImageFromTar/empty.tar (100%)
 rename {src => docker-java/src}/test/resources/testReadFile/Dockerfile (100%)
 rename {src => docker-java/src}/test/resources/testReadFile/oldFile.txt (100%)
 rename {src => docker-java/src}/test/resources/testReadFile/testrun.sh (100%)
 rename {src => docker-java/src}/test/resources/travis-logback.xml (100%)
 rename template.mf => docker-java/template.mf (100%)

diff --git a/docker-java/pom.xml b/docker-java/pom.xml
new file mode 100644
index 000000000..b9fede875
--- /dev/null
+++ b/docker-java/pom.xml
@@ -0,0 +1,273 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.github.docker-java</groupId>
+		<artifactId>docker-java-parent</artifactId>
+		<version>3.1.6-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>docker-java</artifactId>
+	<packaging>bundle</packaging>
+
+	<name>docker-java</name>
+	<url>https://github.com/docker-java/docker-java</url>
+	<description>Java API Client for Docker</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.fasterxml.jackson.jaxrs</groupId>
+			<artifactId>jackson-jaxrs-json-provider</artifactId>
+			<version>${jackson-jaxrs.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.connectors</groupId>
+			<artifactId>jersey-apache-connector</artifactId>
+			<version>${jersey.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+			<version>4.4.10</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>${httpclient.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.core</groupId>
+			<artifactId>jersey-client</artifactId>
+			<version>${jersey.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.inject</groupId>
+			<artifactId>jersey-hk2</artifactId>
+			<version>${jersey.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.kohlschutter.junixsocket</groupId>
+			<artifactId>junixsocket-common</artifactId>
+			<version>${junixsocket.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.kohlschutter.junixsocket</groupId>
+			<artifactId>junixsocket-native-common</artifactId>
+			<version>${junixsocket.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-compress</artifactId>
+			<version>${commons-compress.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>${commons-codec.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>${commons-lang.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>${commons-io.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j-api.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<version>${slf4j-api.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>${guava.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.bouncycastle</groupId>
+			<artifactId>bcpkix-jdk15on</artifactId>
+			<version>${bouncycastle.version}</version>
+		</dependency>
+
+		<!-- /// Test /////////////////////////// -->
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>${logback.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>${logback.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-library</artifactId>
+			<version>${hamcrest.library.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.googlecode.lambdaj</groupId>
+			<artifactId>lambdaj</artifactId>
+			<version>${lambdaj.version}</version>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.hamcrest</groupId>
+					<artifactId>hamcrest-all</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>org.testinfected.hamcrest-matchers</groupId>
+			<artifactId>jpa-matchers</artifactId>
+			<version>${hamcrest.jpa-matchers}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>${mockito.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.google.code.findbugs</groupId>
+			<artifactId>annotations</artifactId>
+			<version>3.0.1u2</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-codec-http</artifactId>
+			<version>${netty.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-handler</artifactId>
+			<version>${netty.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-handler-proxy</artifactId>
+			<version>${netty.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-transport-native-epoll</artifactId>
+			<version>${netty.version}</version>
+			<classifier>linux-x86_64</classifier>
+		</dependency>
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-transport-native-kqueue</artifactId>
+			<version>${netty.version}</version>
+			<classifier>osx-x86_64</classifier>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>${maven-surefire-plugin.version}</version>
+				<configuration>
+					<rerunFailingTestsCount>3</rerunFailingTestsCount>
+					<excludedGroups>com.github.dockerjava.junit.category.Integration</excludedGroups>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<version>${maven-failsafe-plugin.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>integration-test</goal>
+							<goal>verify</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<rerunFailingTestsCount>3</rerunFailingTestsCount>
+					<!--<useUnlimitedThreads>true</useUnlimitedThreads>-->
+					<perCoreThreadCount>true</perCoreThreadCount>
+					<threadCount>1</threadCount>
+					<parallel>classes</parallel>
+					<groups>com.github.dockerjava.junit.category.Integration</groups>
+					<excludedGroups>com.github.dockerjava.junit.category.AuthIntegration,com.github.dockerjava.junit.category.SwarmModeIntegration</excludedGroups>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Export-Package>!com.github.dockerjava.jaxrs.*,!com.github.dockerjava.netty.*,com.github.dockerjava.*</Export-Package>
+						<Import-Package>org.newsclub.net.unix;resolution:="optional",*</Import-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<!-- use with "mvn -DskipTests clean package japicmp:cmp" -->
+				<groupId>com.github.siom79.japicmp</groupId>
+				<artifactId>japicmp-maven-plugin</artifactId>
+				<version>0.14.1</version>
+				<configuration>
+					<oldVersion>
+						<dependency>
+							<groupId>com.github.docker-java</groupId>
+							<artifactId>docker-java</artifactId>
+							<version>3.1.0</version>
+							<type>jar</type>
+						</dependency>
+					</oldVersion>
+					<newVersion>
+						<file>
+							<path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
+						</file>
+					</newVersion>
+					<parameter>
+						<accessModifier>public</accessModifier>
+						<onlyBinaryIncompatible>true</onlyBinaryIncompatible>
+					</parameter>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/src/main/java/com/github/dockerjava/api/DockerClient.java b/docker-java/src/main/java/com/github/dockerjava/api/DockerClient.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/DockerClient.java
rename to docker-java/src/main/java/com/github/dockerjava/api/DockerClient.java
diff --git a/src/main/java/com/github/dockerjava/api/async/ResultCallback.java b/docker-java/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/async/ResultCallback.java
rename to docker-java/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
diff --git a/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/AuthCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/AuthCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/CommitCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/CommitCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java b/docker-java/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java b/docker-java/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java b/docker-java/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java b/docker-java/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java b/docker-java/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java b/docker-java/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
diff --git a/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/DockerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java b/docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmdSyncExec.java b/docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmdSyncExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/DockerCmdSyncExec.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmdSyncExec.java
diff --git a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/EventsCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java b/docker-java/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
diff --git a/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/GraphData.java b/docker-java/src/main/java/com/github/dockerjava/api/command/GraphData.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/GraphData.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/GraphData.java
diff --git a/src/main/java/com/github/dockerjava/api/command/GraphDriver.java b/docker-java/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/GraphDriver.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
diff --git a/src/main/java/com/github/dockerjava/api/command/HealthState.java b/docker-java/src/main/java/com/github/dockerjava/api/command/HealthState.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/HealthState.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/HealthState.java
diff --git a/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java b/docker-java/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
diff --git a/src/main/java/com/github/dockerjava/api/command/InfoCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/InfoCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/InitializeSwarmCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/InitializeSwarmCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/InitializeSwarmCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/InitializeSwarmCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/docker-java/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java b/docker-java/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java b/docker-java/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectServiceCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/InspectServiceCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/InspectServiceCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/InspectServiceCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectSwarmCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/InspectSwarmCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/InspectSwarmCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/InspectSwarmCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectTaskCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/InspectTaskCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/InspectTaskCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/InspectTaskCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java b/docker-java/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
diff --git a/src/main/java/com/github/dockerjava/api/command/JoinSwarmCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/JoinSwarmCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/JoinSwarmCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/JoinSwarmCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/LeaveSwarmCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/LeaveSwarmCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/LeaveSwarmCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/LeaveSwarmCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/ListTasksCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/ListTasksCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/ListTasksCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/ListTasksCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java b/docker-java/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
diff --git a/src/main/java/com/github/dockerjava/api/command/LoadImageCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/LoadImageCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/LoadImageCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/LoadImageCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/LogSwarmObjectCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/LogSwarmObjectCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/LogSwarmObjectCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/LogSwarmObjectCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/PingCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/PingCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/PingCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/PingCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/PruneCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/PruneCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/PruneCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/PruneCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveSecretCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/RemoveSecretCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/RemoveSecretCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/RemoveSecretCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveServiceCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/RemoveServiceCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/RemoveServiceCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/RemoveServiceCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/RootFS.java b/docker-java/src/main/java/com/github/dockerjava/api/command/RootFS.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/RootFS.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/RootFS.java
diff --git a/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/StatsCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/StatsCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java b/docker-java/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
diff --git a/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/UpdateSwarmCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/UpdateSwarmCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/UpdateSwarmCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/UpdateSwarmCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/VersionCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/VersionCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java b/docker-java/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
diff --git a/src/main/java/com/github/dockerjava/api/exception/BadRequestException.java b/docker-java/src/main/java/com/github/dockerjava/api/exception/BadRequestException.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/exception/BadRequestException.java
rename to docker-java/src/main/java/com/github/dockerjava/api/exception/BadRequestException.java
diff --git a/src/main/java/com/github/dockerjava/api/exception/ConflictException.java b/docker-java/src/main/java/com/github/dockerjava/api/exception/ConflictException.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/exception/ConflictException.java
rename to docker-java/src/main/java/com/github/dockerjava/api/exception/ConflictException.java
diff --git a/src/main/java/com/github/dockerjava/api/exception/DockerClientException.java b/docker-java/src/main/java/com/github/dockerjava/api/exception/DockerClientException.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/exception/DockerClientException.java
rename to docker-java/src/main/java/com/github/dockerjava/api/exception/DockerClientException.java
diff --git a/src/main/java/com/github/dockerjava/api/exception/DockerException.java b/docker-java/src/main/java/com/github/dockerjava/api/exception/DockerException.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/exception/DockerException.java
rename to docker-java/src/main/java/com/github/dockerjava/api/exception/DockerException.java
diff --git a/src/main/java/com/github/dockerjava/api/exception/InternalServerErrorException.java b/docker-java/src/main/java/com/github/dockerjava/api/exception/InternalServerErrorException.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/exception/InternalServerErrorException.java
rename to docker-java/src/main/java/com/github/dockerjava/api/exception/InternalServerErrorException.java
diff --git a/src/main/java/com/github/dockerjava/api/exception/NotAcceptableException.java b/docker-java/src/main/java/com/github/dockerjava/api/exception/NotAcceptableException.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/exception/NotAcceptableException.java
rename to docker-java/src/main/java/com/github/dockerjava/api/exception/NotAcceptableException.java
diff --git a/src/main/java/com/github/dockerjava/api/exception/NotFoundException.java b/docker-java/src/main/java/com/github/dockerjava/api/exception/NotFoundException.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/exception/NotFoundException.java
rename to docker-java/src/main/java/com/github/dockerjava/api/exception/NotFoundException.java
diff --git a/src/main/java/com/github/dockerjava/api/exception/NotModifiedException.java b/docker-java/src/main/java/com/github/dockerjava/api/exception/NotModifiedException.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/exception/NotModifiedException.java
rename to docker-java/src/main/java/com/github/dockerjava/api/exception/NotModifiedException.java
diff --git a/src/main/java/com/github/dockerjava/api/exception/UnauthorizedException.java b/docker-java/src/main/java/com/github/dockerjava/api/exception/UnauthorizedException.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/exception/UnauthorizedException.java
rename to docker-java/src/main/java/com/github/dockerjava/api/exception/UnauthorizedException.java
diff --git a/src/main/java/com/github/dockerjava/api/model/AccessMode.java b/docker-java/src/main/java/com/github/dockerjava/api/model/AccessMode.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/AccessMode.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/AccessMode.java
diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/AuthConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java b/docker-java/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
diff --git a/src/main/java/com/github/dockerjava/api/model/AuthResponse.java b/docker-java/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/AuthResponse.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Bind.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Bind.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Bind.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Bind.java
diff --git a/src/main/java/com/github/dockerjava/api/model/BindOptions.java b/docker-java/src/main/java/com/github/dockerjava/api/model/BindOptions.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/BindOptions.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/BindOptions.java
diff --git a/src/main/java/com/github/dockerjava/api/model/BindPropagation.java b/docker-java/src/main/java/com/github/dockerjava/api/model/BindPropagation.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/BindPropagation.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/BindPropagation.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Binds.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Binds.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Binds.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Binds.java
diff --git a/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java b/docker-java/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java
diff --git a/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java b/docker-java/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java
diff --git a/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java b/docker-java/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java
diff --git a/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/docker-java/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Capability.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Capability.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Capability.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Capability.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ChangeLog.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ChangeLog.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Container.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Container.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Container.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Container.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerMount.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ContainerMount.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerPort.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ContainerPort.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
diff --git a/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Device.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Device.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Device.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Device.java
diff --git a/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java b/docker-java/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Driver.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Driver.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Driver.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Driver.java
diff --git a/src/main/java/com/github/dockerjava/api/model/DriverStatus.java b/docker-java/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/DriverStatus.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Endpoint.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Endpoint.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Endpoint.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Endpoint.java
diff --git a/src/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java b/docker-java/src/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java
diff --git a/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java b/docker-java/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
diff --git a/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java b/docker-java/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Event.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Event.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Event.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Event.java
diff --git a/src/main/java/com/github/dockerjava/api/model/EventActor.java b/docker-java/src/main/java/com/github/dockerjava/api/model/EventActor.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/EventActor.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/EventActor.java
diff --git a/src/main/java/com/github/dockerjava/api/model/EventType.java b/docker-java/src/main/java/com/github/dockerjava/api/model/EventType.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/EventType.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/EventType.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ExposedPort.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ExposedPort.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ExternalCA.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ExternalCA.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Frame.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Frame.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Frame.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Frame.java
diff --git a/src/main/java/com/github/dockerjava/api/model/GenericResource.java b/docker-java/src/main/java/com/github/dockerjava/api/model/GenericResource.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/GenericResource.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/GenericResource.java
diff --git a/src/main/java/com/github/dockerjava/api/model/HealthCheck.java b/docker-java/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/HealthCheck.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/HostConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/HostConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/HostConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Identifier.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Identifier.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Identifier.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Identifier.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Image.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Image.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Image.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Image.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Info.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Info.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Info.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Info.java
diff --git a/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java b/docker-java/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Isolation.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Isolation.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Isolation.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Isolation.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Link.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Link.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Link.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Link.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Links.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Links.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Links.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Links.java
diff --git a/src/main/java/com/github/dockerjava/api/model/LocalNodeState.java b/docker-java/src/main/java/com/github/dockerjava/api/model/LocalNodeState.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/LocalNodeState.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/LocalNodeState.java
diff --git a/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/LogConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/LogConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/LogConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/LxcConf.java b/docker-java/src/main/java/com/github/dockerjava/api/model/LxcConf.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/LxcConf.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/LxcConf.java
diff --git a/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Mount.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Mount.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Mount.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Mount.java
diff --git a/src/main/java/com/github/dockerjava/api/model/MountType.java b/docker-java/src/main/java/com/github/dockerjava/api/model/MountType.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/MountType.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/MountType.java
diff --git a/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java b/docker-java/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Network.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Network.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Network.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Network.java
diff --git a/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java b/docker-java/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Node.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Node.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Node.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Node.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
diff --git a/src/main/java/com/github/dockerjava/api/model/PeerNode.java b/docker-java/src/main/java/com/github/dockerjava/api/model/PeerNode.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/PeerNode.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/PeerNode.java
diff --git a/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/PortBinding.java b/docker-java/src/main/java/com/github/dockerjava/api/model/PortBinding.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/PortBinding.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/PortBinding.java
diff --git a/src/main/java/com/github/dockerjava/api/model/PortConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/PortConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/PortConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/PortConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java b/docker-java/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Ports.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Ports.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Ports.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Ports.java
diff --git a/src/main/java/com/github/dockerjava/api/model/PropagationMode.java b/docker-java/src/main/java/com/github/dockerjava/api/model/PropagationMode.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/PropagationMode.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/PropagationMode.java
diff --git a/src/main/java/com/github/dockerjava/api/model/PruneResponse.java b/docker-java/src/main/java/com/github/dockerjava/api/model/PruneResponse.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/PruneResponse.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/PruneResponse.java
diff --git a/src/main/java/com/github/dockerjava/api/model/PruneType.java b/docker-java/src/main/java/com/github/dockerjava/api/model/PruneType.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/PruneType.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/PruneType.java
diff --git a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/docker-java/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
diff --git a/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java b/docker-java/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Reachability.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Reachability.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Reachability.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Reachability.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Repository.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Repository.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Repository.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Repository.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ResponseItem.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
diff --git a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java b/docker-java/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SELContext.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SELContext.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SELContext.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SELContext.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SearchItem.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SearchItem.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SearchItem.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SearchItem.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Secret.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Secret.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Secret.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Secret.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SecretSpec.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SecretSpec.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Service.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Service.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Service.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Service.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceMode.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceMode.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ServiceMode.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ServiceMode.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
diff --git a/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Statistics.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Statistics.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Statistics.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Statistics.java
diff --git a/src/main/java/com/github/dockerjava/api/model/StatsConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/StatsConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/StatsConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/StatsConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/StreamType.java b/docker-java/src/main/java/com/github/dockerjava/api/model/StreamType.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/StreamType.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/StreamType.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Swarm.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Swarm.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Swarm.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Swarm.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNode.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SwarmNode.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeState.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeState.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SwarmNodeState.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeState.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
diff --git a/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java b/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Task.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Task.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Task.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Task.java
diff --git a/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java b/docker-java/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
diff --git a/src/main/java/com/github/dockerjava/api/model/TaskSpec.java b/docker-java/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/TaskSpec.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
diff --git a/src/main/java/com/github/dockerjava/api/model/TaskState.java b/docker-java/src/main/java/com/github/dockerjava/api/model/TaskState.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/TaskState.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/TaskState.java
diff --git a/src/main/java/com/github/dockerjava/api/model/TaskStatus.java b/docker-java/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/TaskStatus.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
diff --git a/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java b/docker-java/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
diff --git a/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java b/docker-java/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Ulimit.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Ulimit.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Ulimit.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Ulimit.java
diff --git a/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java b/docker-java/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
diff --git a/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java b/docker-java/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java
diff --git a/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java b/docker-java/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java
diff --git a/src/main/java/com/github/dockerjava/api/model/UpdateOrder.java b/docker-java/src/main/java/com/github/dockerjava/api/model/UpdateOrder.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/UpdateOrder.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/UpdateOrder.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Version.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Version.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Version.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Version.java
diff --git a/src/main/java/com/github/dockerjava/api/model/VersionComponent.java b/docker-java/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/VersionComponent.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
diff --git a/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java b/docker-java/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Volume.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Volume.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Volume.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Volume.java
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeBind.java b/docker-java/src/main/java/com/github/dockerjava/api/model/VolumeBind.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/VolumeBind.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/VolumeBind.java
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java b/docker-java/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java b/docker-java/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/VolumeOptions.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeRW.java b/docker-java/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/VolumeRW.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
diff --git a/src/main/java/com/github/dockerjava/api/model/Volumes.java b/docker-java/src/main/java/com/github/dockerjava/api/model/Volumes.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/Volumes.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/Volumes.java
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java b/docker-java/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumesRW.java b/docker-java/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/VolumesRW.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
diff --git a/src/main/java/com/github/dockerjava/api/model/WaitResponse.java b/docker-java/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/api/model/WaitResponse.java
rename to docker-java/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
diff --git a/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/docker-java/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
rename to docker-java/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
diff --git a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java b/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
rename to docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/docker-java/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/DockerClientConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/DockerClientImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/DockerConfigFile.java b/docker-java/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/DockerConfigFile.java
rename to docker-java/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/docker-java/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
rename to docker-java/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
diff --git a/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java b/docker-java/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
rename to docker-java/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
diff --git a/src/main/java/com/github/dockerjava/core/InvocationBuilder.java b/docker-java/src/main/java/com/github/dockerjava/core/InvocationBuilder.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/InvocationBuilder.java
rename to docker-java/src/main/java/com/github/dockerjava/core/InvocationBuilder.java
diff --git a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java b/docker-java/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
diff --git a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/docker-java/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
diff --git a/src/main/java/com/github/dockerjava/core/MediaType.java b/docker-java/src/main/java/com/github/dockerjava/core/MediaType.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/MediaType.java
rename to docker-java/src/main/java/com/github/dockerjava/core/MediaType.java
diff --git a/src/main/java/com/github/dockerjava/core/NameParser.java b/docker-java/src/main/java/com/github/dockerjava/core/NameParser.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/NameParser.java
rename to docker-java/src/main/java/com/github/dockerjava/core/NameParser.java
diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/docker-java/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
rename to docker-java/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
diff --git a/src/main/java/com/github/dockerjava/core/SSLConfig.java b/docker-java/src/main/java/com/github/dockerjava/core/SSLConfig.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/SSLConfig.java
rename to docker-java/src/main/java/com/github/dockerjava/core/SSLConfig.java
diff --git a/src/main/java/com/github/dockerjava/core/WebTarget.java b/docker-java/src/main/java/com/github/dockerjava/core/WebTarget.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/WebTarget.java
rename to docker-java/src/main/java/com/github/dockerjava/core/WebTarget.java
diff --git a/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java b/docker-java/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java
rename to docker-java/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java
diff --git a/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/docker-java/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
rename to docker-java/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
diff --git a/src/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java b/docker-java/src/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java
rename to docker-java/src/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/docker-java/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
rename to docker-java/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java b/docker-java/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/docker-java/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
diff --git a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java b/docker-java/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
diff --git a/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java b/docker-java/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
diff --git a/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java b/docker-java/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java b/docker-java/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
diff --git a/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/docker-java/src/main/java/com/github/dockerjava/core/command/FrameReader.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/FrameReader.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/FrameReader.java
diff --git a/src/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/InpectNetworkCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/InpectNetworkCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/InpectNetworkCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/InpectNetworkCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectSwarmCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/InspectSwarmCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/InspectSwarmCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/InspectSwarmCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/LeaveSwarmCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/LeaveSwarmCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/LeaveSwarmCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/LeaveSwarmCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/ListTasksCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/ListTasksCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/ListTasksCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/ListTasksCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java b/docker-java/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
diff --git a/src/main/java/com/github/dockerjava/core/command/LogSwarmObjectImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/LogSwarmObjectImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/LogSwarmObjectImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/LogSwarmObjectImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java b/docker-java/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
diff --git a/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java b/docker-java/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveNetworkCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/RemoveNetworkCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/RemoveNetworkCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/RemoveNetworkCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
diff --git a/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java b/docker-java/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
rename to docker-java/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/docker-java/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
rename to docker-java/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java b/docker-java/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
rename to docker-java/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
diff --git a/src/main/java/com/github/dockerjava/core/exception/GoLangFileMatchException.java b/docker-java/src/main/java/com/github/dockerjava/core/exception/GoLangFileMatchException.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exception/GoLangFileMatchException.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exception/GoLangFileMatchException.java
diff --git a/src/main/java/com/github/dockerjava/core/exception/InvalidRepositoryNameException.java b/docker-java/src/main/java/com/github/dockerjava/core/exception/InvalidRepositoryNameException.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exception/InvalidRepositoryNameException.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exception/InvalidRepositoryNameException.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/AbstrAsyncDockerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/AbstrAsyncDockerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/AbstrAsyncDockerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/AbstrAsyncDockerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/AbstrSyncDockerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/AbstrSyncDockerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/AbstrSyncDockerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/AbstrSyncDockerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/AttachContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/AttachContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/AttachContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/AttachContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/AuthCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/AuthCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/AuthCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/AuthCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/CommitCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/CommitCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/CommitCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/CommitCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/ContainerDiffCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/ContainerDiffCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/ContainerDiffCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/ContainerDiffCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/CopyArchiveFromContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/CopyArchiveFromContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/CopyArchiveFromContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/CopyArchiveFromContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/CopyArchiveToContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/CopyArchiveToContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/CopyArchiveToContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/CopyArchiveToContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/CopyFileFromContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/CopyFileFromContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/CopyFileFromContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/CopyFileFromContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/CreateImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/CreateImageCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/CreateImageCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/CreateImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/CreateNetworkCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/CreateNetworkCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/CreateNetworkCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/CreateNetworkCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/CreateSecretCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/CreateSecretCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/CreateSecretCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/CreateSecretCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/CreateServiceCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/CreateServiceCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/CreateServiceCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/CreateServiceCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/CreateVolumeCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/CreateVolumeCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/CreateVolumeCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/CreateVolumeCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/EventsCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/EventsCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/EventsCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/EventsCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/ExecCreateCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/ExecCreateCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/ExecCreateCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/ExecCreateCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/ExecStartCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/ExecStartCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/ExecStartCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/ExecStartCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/InfoCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/InfoCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/InfoCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/InfoCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/InspectContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/InspectContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/InspectContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/InspectContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/InspectExecCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/InspectExecCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/InspectExecCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/InspectExecCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/InspectImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/InspectImageCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/InspectImageCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/InspectImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/InspectNetworkCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/InspectNetworkCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/InspectNetworkCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/InspectNetworkCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/InspectServiceCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/InspectServiceCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/InspectServiceCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/InspectServiceCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/InspectSwarmCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/InspectSwarmCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/InspectSwarmCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/InspectSwarmCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/InspectSwarmNodeCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/InspectSwarmNodeCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/InspectSwarmNodeCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/InspectSwarmNodeCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/InspectVolumeCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/InspectVolumeCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/InspectVolumeCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/InspectVolumeCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/ListContainersCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/ListContainersCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/ListContainersCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/ListContainersCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/ListImagesCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/ListImagesCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/ListImagesCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/ListImagesCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/ListNetworksCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/ListNetworksCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/ListNetworksCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/ListNetworksCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/ListSecretsCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/ListSecretsCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/ListSecretsCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/ListSecretsCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/ListServicesCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/ListServicesCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/ListServicesCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/ListServicesCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/ListSwarmNodesCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/ListSwarmNodesCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/ListSwarmNodesCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/ListSwarmNodesCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/ListTasksCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/ListTasksCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/ListTasksCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/ListTasksCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/ListVolumesCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/ListVolumesCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/ListVolumesCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/ListVolumesCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/LoadImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/LoadImageCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/LoadImageCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/LoadImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/LogSwarmObjectExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/LogSwarmObjectExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/LogSwarmObjectExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/LogSwarmObjectExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/PruneCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/PruneCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/PruneCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/PruneCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/PullImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/PullImageCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/PullImageCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/PullImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/RemoveContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/RemoveContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/RemoveImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveImageCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/RemoveImageCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/RemoveNetworkCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveNetworkCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/RemoveNetworkCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveNetworkCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/RemoveSecretCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveSecretCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/RemoveSecretCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveSecretCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/RemoveServiceCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveServiceCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/RemoveServiceCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveServiceCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/RemoveSwarmNodeCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveSwarmNodeCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/RemoveSwarmNodeCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveSwarmNodeCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/RemoveVolumeCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveVolumeCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/RemoveVolumeCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveVolumeCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/SaveImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/SaveImageCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/SaveImageCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/SaveImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/UpdateContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/UpdateContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/UpdateContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/UpdateContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/VersionCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/VersionCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/VersionCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/VersionCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/exec/WaitContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/core/exec/WaitContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/exec/WaitContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/core/exec/WaitContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java b/docker-java/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java
rename to docker-java/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java
diff --git a/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java b/docker-java/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
rename to docker-java/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
diff --git a/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java b/docker-java/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
rename to docker-java/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
diff --git a/src/main/java/com/github/dockerjava/core/util/FilePathUtil.java b/docker-java/src/main/java/com/github/dockerjava/core/util/FilePathUtil.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/util/FilePathUtil.java
rename to docker-java/src/main/java/com/github/dockerjava/core/util/FilePathUtil.java
diff --git a/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java b/docker-java/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
rename to docker-java/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
diff --git a/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java b/docker-java/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
rename to docker-java/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
diff --git a/src/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java b/docker-java/src/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java
rename to docker-java/src/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java
diff --git a/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java b/docker-java/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
rename to docker-java/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
diff --git a/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
rename to docker-java/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
diff --git a/src/main/java/com/github/dockerjava/netty/ChannelProvider.java b/docker-java/src/main/java/com/github/dockerjava/netty/ChannelProvider.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/netty/ChannelProvider.java
rename to docker-java/src/main/java/com/github/dockerjava/netty/ChannelProvider.java
diff --git a/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/docker-java/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
rename to docker-java/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
diff --git a/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/docker-java/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
rename to docker-java/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
diff --git a/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java b/docker-java/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
rename to docker-java/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
diff --git a/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java b/docker-java/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
rename to docker-java/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
diff --git a/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java b/docker-java/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
rename to docker-java/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpConnectionHijackHandler.java b/docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpConnectionHijackHandler.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/netty/handler/HttpConnectionHijackHandler.java
rename to docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpConnectionHijackHandler.java
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java b/docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java
rename to docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java b/docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
rename to docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
diff --git a/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java b/docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
rename to docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
diff --git a/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java b/docker-java/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
rename to docker-java/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
diff --git a/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java b/docker-java/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
similarity index 100%
rename from src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
rename to docker-java/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
diff --git a/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java b/docker-java/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java
similarity index 100%
rename from src/main/java/org/apache/http/impl/io/ChunkedInputStream.java
rename to docker-java/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java
diff --git a/src/main/resources/docker-java.properties b/docker-java/src/main/resources/docker-java.properties
similarity index 100%
rename from src/main/resources/docker-java.properties
rename to docker-java/src/main/resources/docker-java.properties
diff --git a/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java b/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java
diff --git a/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java b/docker-java/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
rename to docker-java/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java
diff --git a/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/AccessModeTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/BindTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/BindTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/BindingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/BindingTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/BindingTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/BindingTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/ContainerTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/ContainerTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/ContainerTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/ContainerTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/DeviceTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/DeviceTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/DeviceTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/DeviceTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/EventsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/EventsTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/EventsTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/EventsTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/InfoTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/InfoTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/LinkTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/LinkTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/LinkTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/LinkTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java
diff --git a/src/test/java/com/github/dockerjava/api/model/RepositoryTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/RepositoryTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/RepositoryTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/RepositoryTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/RestartPolicyParsingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyParsingTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/RestartPolicyParsingTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyParsingTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/RestartPolicyToStringTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyToStringTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/RestartPolicyToStringTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyToStringTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/VersionTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VersionTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/VersionTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/VersionTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java
diff --git a/src/test/java/com/github/dockerjava/api/model/VolumeTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/api/model/VolumeTest.java
rename to docker-java/src/test/java/com/github/dockerjava/api/model/VolumeTest.java
diff --git a/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/CmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/CmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/CreateVolumeCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateVolumeCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/CreateVolumeCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/CreateVolumeCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/InspectNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectNetworkCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/InspectNetworkCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/InspectNetworkCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/InspectVolumeCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectVolumeCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/InspectVolumeCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/InspectVolumeCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/KillContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/KillContainerCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/KillContainerCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/KillContainerCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/ListNetworksCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListNetworksCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/ListNetworksCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/ListNetworksCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/ListVolumesCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListVolumesCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/ListVolumesCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/ListVolumesCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/PingCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PingCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/PingCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/PingCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/RemoveNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveNetworkCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/RemoveNetworkCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/RemoveNetworkCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/SearchImagesCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/SearchImagesCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/SearchImagesCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/SearchImagesCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/StopContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StopContainerCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/StopContainerCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/StopContainerCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/UnpauseCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/UnpauseCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/UnpauseCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/UnpauseCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java
diff --git a/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
rename to docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
diff --git a/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
rename to docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
rename to docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
diff --git a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
rename to docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
diff --git a/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
rename to docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
diff --git a/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java b/docker-java/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
rename to docker-java/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
diff --git a/src/test/java/com/github/dockerjava/core/NameParserTest.java b/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/core/NameParserTest.java
rename to docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java
diff --git a/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java b/docker-java/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java
rename to docker-java/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java
diff --git a/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
rename to docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
diff --git a/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java b/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
rename to docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
diff --git a/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
rename to docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
rename to docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java b/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
rename to docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java b/docker-java/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
rename to docker-java/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
diff --git a/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java b/docker-java/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
rename to docker-java/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileStatementAddTest.java
diff --git a/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java b/docker-java/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java
rename to docker-java/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java
diff --git a/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java b/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
rename to docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
diff --git a/src/test/java/com/github/dockerjava/core/util/FiltersBuilderTest.java b/docker-java/src/test/java/com/github/dockerjava/core/util/FiltersBuilderTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/core/util/FiltersBuilderTest.java
rename to docker-java/src/test/java/com/github/dockerjava/core/util/FiltersBuilderTest.java
diff --git a/src/test/java/com/github/dockerjava/junit/DockerAssume.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerAssume.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/junit/DockerAssume.java
rename to docker-java/src/test/java/com/github/dockerjava/junit/DockerAssume.java
diff --git a/src/test/java/com/github/dockerjava/junit/DockerMatchers.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/junit/DockerMatchers.java
rename to docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java
diff --git a/src/test/java/com/github/dockerjava/junit/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/junit/DockerRule.java
rename to docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java
diff --git a/src/test/java/com/github/dockerjava/junit/category/AuthIntegration.java b/docker-java/src/test/java/com/github/dockerjava/junit/category/AuthIntegration.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/junit/category/AuthIntegration.java
rename to docker-java/src/test/java/com/github/dockerjava/junit/category/AuthIntegration.java
diff --git a/src/test/java/com/github/dockerjava/junit/category/Integration.java b/docker-java/src/test/java/com/github/dockerjava/junit/category/Integration.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/junit/category/Integration.java
rename to docker-java/src/test/java/com/github/dockerjava/junit/category/Integration.java
diff --git a/src/test/java/com/github/dockerjava/junit/category/SwarmModeIntegration.java b/docker-java/src/test/java/com/github/dockerjava/junit/category/SwarmModeIntegration.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/junit/category/SwarmModeIntegration.java
rename to docker-java/src/test/java/com/github/dockerjava/junit/category/SwarmModeIntegration.java
diff --git a/src/test/java/com/github/dockerjava/junit/suite/IntegrationDockerTestSuite.java b/docker-java/src/test/java/com/github/dockerjava/junit/suite/IntegrationDockerTestSuite.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/junit/suite/IntegrationDockerTestSuite.java
rename to docker-java/src/test/java/com/github/dockerjava/junit/suite/IntegrationDockerTestSuite.java
diff --git a/src/test/java/com/github/dockerjava/junit/suite/SwarmSuite.java b/docker-java/src/test/java/com/github/dockerjava/junit/suite/SwarmSuite.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/junit/suite/SwarmSuite.java
rename to docker-java/src/test/java/com/github/dockerjava/junit/suite/SwarmSuite.java
diff --git a/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java
rename to docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java
diff --git a/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java
rename to docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java
diff --git a/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java
rename to docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java
diff --git a/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
rename to docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
diff --git a/src/test/java/com/github/dockerjava/test/serdes/AbstractJSONResourceRef.java b/docker-java/src/test/java/com/github/dockerjava/test/serdes/AbstractJSONResourceRef.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/test/serdes/AbstractJSONResourceRef.java
rename to docker-java/src/test/java/com/github/dockerjava/test/serdes/AbstractJSONResourceRef.java
diff --git a/src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java b/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java
rename to docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java
diff --git a/src/test/java/com/github/dockerjava/test/serdes/JSONSamples.java b/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONSamples.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/test/serdes/JSONSamples.java
rename to docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONSamples.java
diff --git a/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java b/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
rename to docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
diff --git a/src/test/java/com/github/dockerjava/utils/ContainerUtils.java b/docker-java/src/test/java/com/github/dockerjava/utils/ContainerUtils.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/utils/ContainerUtils.java
rename to docker-java/src/test/java/com/github/dockerjava/utils/ContainerUtils.java
diff --git a/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java b/docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java
rename to docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java
diff --git a/src/test/java/com/github/dockerjava/utils/RegistryUtils.java b/docker-java/src/test/java/com/github/dockerjava/utils/RegistryUtils.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/utils/RegistryUtils.java
rename to docker-java/src/test/java/com/github/dockerjava/utils/RegistryUtils.java
diff --git a/src/test/java/com/github/dockerjava/utils/TestResources.java b/docker-java/src/test/java/com/github/dockerjava/utils/TestResources.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/utils/TestResources.java
rename to docker-java/src/test/java/com/github/dockerjava/utils/TestResources.java
diff --git a/src/test/java/com/github/dockerjava/utils/TestUtils.java b/docker-java/src/test/java/com/github/dockerjava/utils/TestUtils.java
similarity index 100%
rename from src/test/java/com/github/dockerjava/utils/TestUtils.java
rename to docker-java/src/test/java/com/github/dockerjava/utils/TestUtils.java
diff --git a/src/test/resources/api/images/load/image.tar b/docker-java/src/test/resources/api/images/load/image.tar
similarity index 100%
rename from src/test/resources/api/images/load/image.tar
rename to docker-java/src/test/resources/api/images/load/image.tar
diff --git a/src/test/resources/attachContainerTestDockerfile/Dockerfile b/docker-java/src/test/resources/attachContainerTestDockerfile/Dockerfile
similarity index 100%
rename from src/test/resources/attachContainerTestDockerfile/Dockerfile
rename to docker-java/src/test/resources/attachContainerTestDockerfile/Dockerfile
diff --git a/src/test/resources/attachContainerTestDockerfile/echo.sh b/docker-java/src/test/resources/attachContainerTestDockerfile/echo.sh
similarity index 100%
rename from src/test/resources/attachContainerTestDockerfile/echo.sh
rename to docker-java/src/test/resources/attachContainerTestDockerfile/echo.sh
diff --git a/src/test/resources/buildTests/ADD/file/Dockerfile b/docker-java/src/test/resources/buildTests/ADD/file/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/ADD/file/Dockerfile
rename to docker-java/src/test/resources/buildTests/ADD/file/Dockerfile
diff --git a/src/test/resources/buildTests/ADD/file/testrun.sh b/docker-java/src/test/resources/buildTests/ADD/file/testrun.sh
similarity index 100%
rename from src/test/resources/buildTests/ADD/file/testrun.sh
rename to docker-java/src/test/resources/buildTests/ADD/file/testrun.sh
diff --git a/src/test/resources/buildTests/ADD/fileInSubfolder/Dockerfile b/docker-java/src/test/resources/buildTests/ADD/fileInSubfolder/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/ADD/fileInSubfolder/Dockerfile
rename to docker-java/src/test/resources/buildTests/ADD/fileInSubfolder/Dockerfile
diff --git a/src/test/resources/buildTests/ADD/fileInSubfolder/files/testrun.sh b/docker-java/src/test/resources/buildTests/ADD/fileInSubfolder/files/testrun.sh
similarity index 100%
rename from src/test/resources/buildTests/ADD/fileInSubfolder/files/testrun.sh
rename to docker-java/src/test/resources/buildTests/ADD/fileInSubfolder/files/testrun.sh
diff --git a/src/test/resources/buildTests/ADD/files/Dockerfile b/docker-java/src/test/resources/buildTests/ADD/files/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/ADD/files/Dockerfile
rename to docker-java/src/test/resources/buildTests/ADD/files/Dockerfile
diff --git a/src/test/resources/buildTests/ADD/files/src1 b/docker-java/src/test/resources/buildTests/ADD/files/src1
similarity index 100%
rename from src/test/resources/buildTests/ADD/files/src1
rename to docker-java/src/test/resources/buildTests/ADD/files/src1
diff --git a/src/test/resources/buildTests/ADD/files/src2 b/docker-java/src/test/resources/buildTests/ADD/files/src2
similarity index 100%
rename from src/test/resources/buildTests/ADD/files/src2
rename to docker-java/src/test/resources/buildTests/ADD/files/src2
diff --git a/src/test/resources/buildTests/ADD/filesViaWildcard/Dockerfile b/docker-java/src/test/resources/buildTests/ADD/filesViaWildcard/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/ADD/filesViaWildcard/Dockerfile
rename to docker-java/src/test/resources/buildTests/ADD/filesViaWildcard/Dockerfile
diff --git a/src/test/resources/buildTests/ADD/filesViaWildcard/folder1/testrun.sh b/docker-java/src/test/resources/buildTests/ADD/filesViaWildcard/folder1/testrun.sh
similarity index 100%
rename from src/test/resources/buildTests/ADD/filesViaWildcard/folder1/testrun.sh
rename to docker-java/src/test/resources/buildTests/ADD/filesViaWildcard/folder1/testrun.sh
diff --git a/src/test/resources/buildTests/ADD/filesViaWildcard/folder2/testinclude1.sh b/docker-java/src/test/resources/buildTests/ADD/filesViaWildcard/folder2/testinclude1.sh
similarity index 100%
rename from src/test/resources/buildTests/ADD/filesViaWildcard/folder2/testinclude1.sh
rename to docker-java/src/test/resources/buildTests/ADD/filesViaWildcard/folder2/testinclude1.sh
diff --git a/src/test/resources/buildTests/ADD/filesViaWildcard/ignore/testinclude2.sh b/docker-java/src/test/resources/buildTests/ADD/filesViaWildcard/ignore/testinclude2.sh
similarity index 100%
rename from src/test/resources/buildTests/ADD/filesViaWildcard/ignore/testinclude2.sh
rename to docker-java/src/test/resources/buildTests/ADD/filesViaWildcard/ignore/testinclude2.sh
diff --git a/src/test/resources/buildTests/ADD/folder/Dockerfile b/docker-java/src/test/resources/buildTests/ADD/folder/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/ADD/folder/Dockerfile
rename to docker-java/src/test/resources/buildTests/ADD/folder/Dockerfile
diff --git a/src/test/resources/buildTests/ADD/folder/folderA/testAddFolder.sh b/docker-java/src/test/resources/buildTests/ADD/folder/folderA/testAddFolder.sh
similarity index 100%
rename from src/test/resources/buildTests/ADD/folder/folderA/testAddFolder.sh
rename to docker-java/src/test/resources/buildTests/ADD/folder/folderA/testAddFolder.sh
diff --git a/src/test/resources/buildTests/ADD/url/Dockerfile b/docker-java/src/test/resources/buildTests/ADD/url/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/ADD/url/Dockerfile
rename to docker-java/src/test/resources/buildTests/ADD/url/Dockerfile
diff --git a/src/test/resources/buildTests/ADD/url/testrun.sh b/docker-java/src/test/resources/buildTests/ADD/url/testrun.sh
similarity index 100%
rename from src/test/resources/buildTests/ADD/url/testrun.sh
rename to docker-java/src/test/resources/buildTests/ADD/url/testrun.sh
diff --git a/src/test/resources/buildTests/AUTHOR/Dockerfile b/docker-java/src/test/resources/buildTests/AUTHOR/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/AUTHOR/Dockerfile
rename to docker-java/src/test/resources/buildTests/AUTHOR/Dockerfile
diff --git a/src/test/resources/buildTests/CacheFrom/test1/Dockerfile b/docker-java/src/test/resources/buildTests/CacheFrom/test1/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/CacheFrom/test1/Dockerfile
rename to docker-java/src/test/resources/buildTests/CacheFrom/test1/Dockerfile
diff --git a/src/test/resources/buildTests/CacheFrom/test2/Dockerfile b/docker-java/src/test/resources/buildTests/CacheFrom/test2/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/CacheFrom/test2/Dockerfile
rename to docker-java/src/test/resources/buildTests/CacheFrom/test2/Dockerfile
diff --git a/src/test/resources/buildTests/ENV/Dockerfile b/docker-java/src/test/resources/buildTests/ENV/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/ENV/Dockerfile
rename to docker-java/src/test/resources/buildTests/ENV/Dockerfile
diff --git a/src/test/resources/buildTests/ENV/subst-file-2-abc123.txt b/docker-java/src/test/resources/buildTests/ENV/subst-file-2-abc123.txt
similarity index 100%
rename from src/test/resources/buildTests/ENV/subst-file-2-abc123.txt
rename to docker-java/src/test/resources/buildTests/ENV/subst-file-2-abc123.txt
diff --git a/src/test/resources/buildTests/ENV/subst-file-abc123.txt b/docker-java/src/test/resources/buildTests/ENV/subst-file-abc123.txt
similarity index 100%
rename from src/test/resources/buildTests/ENV/subst-file-abc123.txt
rename to docker-java/src/test/resources/buildTests/ENV/subst-file-abc123.txt
diff --git a/src/test/resources/buildTests/ENV/testrun.sh b/docker-java/src/test/resources/buildTests/ENV/testrun.sh
similarity index 100%
rename from src/test/resources/buildTests/ENV/testrun.sh
rename to docker-java/src/test/resources/buildTests/ENV/testrun.sh
diff --git a/src/test/resources/buildTests/FROM/privateRegistry/Dockerfile b/docker-java/src/test/resources/buildTests/FROM/privateRegistry/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/FROM/privateRegistry/Dockerfile
rename to docker-java/src/test/resources/buildTests/FROM/privateRegistry/Dockerfile
diff --git a/src/test/resources/buildTests/ONBUILD/child/Dockerfile b/docker-java/src/test/resources/buildTests/ONBUILD/child/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/ONBUILD/child/Dockerfile
rename to docker-java/src/test/resources/buildTests/ONBUILD/child/Dockerfile
diff --git a/src/test/resources/buildTests/ONBUILD/child/testrun.sh b/docker-java/src/test/resources/buildTests/ONBUILD/child/testrun.sh
similarity index 100%
rename from src/test/resources/buildTests/ONBUILD/child/testrun.sh
rename to docker-java/src/test/resources/buildTests/ONBUILD/child/testrun.sh
diff --git a/src/test/resources/buildTests/ONBUILD/parent/Dockerfile b/docker-java/src/test/resources/buildTests/ONBUILD/parent/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/ONBUILD/parent/Dockerfile
rename to docker-java/src/test/resources/buildTests/ONBUILD/parent/Dockerfile
diff --git a/src/test/resources/buildTests/buildArgs/Dockerfile b/docker-java/src/test/resources/buildTests/buildArgs/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/buildArgs/Dockerfile
rename to docker-java/src/test/resources/buildTests/buildArgs/Dockerfile
diff --git a/src/test/resources/buildTests/dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile b/docker-java/src/test/resources/buildTests/dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile
rename to docker-java/src/test/resources/buildTests/dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile
diff --git a/src/test/resources/buildTests/dockerfileNotInBaseDirectory/testrunFolder/testrun.sh b/docker-java/src/test/resources/buildTests/dockerfileNotInBaseDirectory/testrunFolder/testrun.sh
similarity index 100%
rename from src/test/resources/buildTests/dockerfileNotInBaseDirectory/testrunFolder/testrun.sh
rename to docker-java/src/test/resources/buildTests/dockerfileNotInBaseDirectory/testrunFolder/testrun.sh
diff --git a/src/test/resources/buildTests/dockerignore/DockerfileIgnored/.dockerignore b/docker-java/src/test/resources/buildTests/dockerignore/DockerfileIgnored/.dockerignore
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/DockerfileIgnored/.dockerignore
rename to docker-java/src/test/resources/buildTests/dockerignore/DockerfileIgnored/.dockerignore
diff --git a/src/test/resources/buildTests/dockerignore/DockerfileIgnored/Dockerfile b/docker-java/src/test/resources/buildTests/dockerignore/DockerfileIgnored/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/DockerfileIgnored/Dockerfile
rename to docker-java/src/test/resources/buildTests/dockerignore/DockerfileIgnored/Dockerfile
diff --git a/src/test/resources/buildTests/dockerignore/DockerfileIgnored/testrun.sh b/docker-java/src/test/resources/buildTests/dockerignore/DockerfileIgnored/testrun.sh
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/DockerfileIgnored/testrun.sh
rename to docker-java/src/test/resources/buildTests/dockerignore/DockerfileIgnored/testrun.sh
diff --git a/src/test/resources/buildTests/dockerignore/DockerfileNotIgnored/.dockerignore b/docker-java/src/test/resources/buildTests/dockerignore/DockerfileNotIgnored/.dockerignore
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/DockerfileNotIgnored/.dockerignore
rename to docker-java/src/test/resources/buildTests/dockerignore/DockerfileNotIgnored/.dockerignore
diff --git a/src/test/resources/buildTests/dockerignore/DockerfileNotIgnored/Dockerfile b/docker-java/src/test/resources/buildTests/dockerignore/DockerfileNotIgnored/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/DockerfileNotIgnored/Dockerfile
rename to docker-java/src/test/resources/buildTests/dockerignore/DockerfileNotIgnored/Dockerfile
diff --git a/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/.dockerignore b/docker-java/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/.dockerignore
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/.dockerignore
rename to docker-java/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/.dockerignore
diff --git a/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/Dockerfile b/docker-java/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/Dockerfile
rename to docker-java/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/Dockerfile
diff --git a/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/README-secret.md b/docker-java/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/README-secret.md
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/README-secret.md
rename to docker-java/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/README-secret.md
diff --git a/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/README.md b/docker-java/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/README.md
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/README.md
rename to docker-java/src/test/resources/buildTests/dockerignore/EffectiveDockerignorePatterns/README.md
diff --git a/src/test/resources/buildTests/dockerignore/IgnoreAllBut/.dockerignore b/docker-java/src/test/resources/buildTests/dockerignore/IgnoreAllBut/.dockerignore
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/IgnoreAllBut/.dockerignore
rename to docker-java/src/test/resources/buildTests/dockerignore/IgnoreAllBut/.dockerignore
diff --git a/src/test/resources/buildTests/dockerignore/IgnoreAllBut/Dockerfile b/docker-java/src/test/resources/buildTests/dockerignore/IgnoreAllBut/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/IgnoreAllBut/Dockerfile
rename to docker-java/src/test/resources/buildTests/dockerignore/IgnoreAllBut/Dockerfile
diff --git a/src/test/resources/buildTests/dockerignore/IgnoreAllBut/README.MD b/docker-java/src/test/resources/buildTests/dockerignore/IgnoreAllBut/README.MD
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/IgnoreAllBut/README.MD
rename to docker-java/src/test/resources/buildTests/dockerignore/IgnoreAllBut/README.MD
diff --git a/src/test/resources/buildTests/dockerignore/IgnoreAllBut/build/libs/foo.jar b/docker-java/src/test/resources/buildTests/dockerignore/IgnoreAllBut/build/libs/foo.jar
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/IgnoreAllBut/build/libs/foo.jar
rename to docker-java/src/test/resources/buildTests/dockerignore/IgnoreAllBut/build/libs/foo.jar
diff --git a/src/test/resources/buildTests/dockerignore/IgnoreAllBut/test/bar.txt b/docker-java/src/test/resources/buildTests/dockerignore/IgnoreAllBut/test/bar.txt
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/IgnoreAllBut/test/bar.txt
rename to docker-java/src/test/resources/buildTests/dockerignore/IgnoreAllBut/test/bar.txt
diff --git a/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/.dockerignore b/docker-java/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/.dockerignore
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/.dockerignore
rename to docker-java/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/.dockerignore
diff --git a/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/Dockerfile b/docker-java/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/Dockerfile
rename to docker-java/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/Dockerfile
diff --git a/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/README-secret.md b/docker-java/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/README-secret.md
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/README-secret.md
rename to docker-java/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/README-secret.md
diff --git a/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/README.md b/docker-java/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/README.md
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/README.md
rename to docker-java/src/test/resources/buildTests/dockerignore/IneffectiveDockerignorePattern/README.md
diff --git a/src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/.dockerignore b/docker-java/src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/.dockerignore
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/.dockerignore
rename to docker-java/src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/.dockerignore
diff --git a/src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/Dockerfile b/docker-java/src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/Dockerfile
rename to docker-java/src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/Dockerfile
diff --git a/src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/testrun.sh b/docker-java/src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/testrun.sh
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/testrun.sh
rename to docker-java/src/test/resources/buildTests/dockerignore/InvalidDockerignorePattern/testrun.sh
diff --git a/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/.dockerignore b/docker-java/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/.dockerignore
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/.dockerignore
rename to docker-java/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/.dockerignore
diff --git a/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/Dockerfile b/docker-java/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/Dockerfile
rename to docker-java/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/Dockerfile
diff --git a/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/README.md b/docker-java/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/README.md
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/README.md
rename to docker-java/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/README.md
diff --git a/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/a.txt b/docker-java/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/a.txt
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/a.txt
rename to docker-java/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/a.txt
diff --git a/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/README-child.md b/docker-java/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/README-child.md
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/README-child.md
rename to docker-java/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/README-child.md
diff --git a/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/grandChild/README-grand.md b/docker-java/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/grandChild/README-grand.md
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/grandChild/README-grand.md
rename to docker-java/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/grandChild/README-grand.md
diff --git a/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/grandChild/c.txt b/docker-java/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/grandChild/c.txt
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/grandChild/c.txt
rename to docker-java/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/anotherChild/grandChild/c.txt
diff --git a/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/child/b.txt b/docker-java/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/child/b.txt
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/child/b.txt
rename to docker-java/src/test/resources/buildTests/dockerignore/NestedDirsDockerignore/parent/child/b.txt
diff --git a/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/.dockerignore b/docker-java/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/.dockerignore
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/.dockerignore
rename to docker-java/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/.dockerignore
diff --git a/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/Dockerfile b/docker-java/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/Dockerfile
rename to docker-java/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/Dockerfile
diff --git a/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/a b/docker-java/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/a
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/a
rename to docker-java/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/a
diff --git a/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/b b/docker-java/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/b
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/b
rename to docker-java/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/b
diff --git a/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/c b/docker-java/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/c
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/c
rename to docker-java/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/c
diff --git a/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/d b/docker-java/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/d
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/d
rename to docker-java/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/a/d
diff --git a/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/testrun.sh b/docker-java/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/testrun.sh
similarity index 100%
rename from src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/testrun.sh
rename to docker-java/src/test/resources/buildTests/dockerignore/ValidDockerignorePattern/testrun.sh
diff --git a/src/test/resources/buildTests/labels/Dockerfile b/docker-java/src/test/resources/buildTests/labels/Dockerfile
similarity index 100%
rename from src/test/resources/buildTests/labels/Dockerfile
rename to docker-java/src/test/resources/buildTests/labels/Dockerfile
diff --git a/src/test/resources/busyboxDockerfile/Dockerfile b/docker-java/src/test/resources/busyboxDockerfile/Dockerfile
similarity index 100%
rename from src/test/resources/busyboxDockerfile/Dockerfile
rename to docker-java/src/test/resources/busyboxDockerfile/Dockerfile
diff --git a/src/test/resources/com.github.dockerjava.core/registry.v1/.dockercfg b/docker-java/src/test/resources/com.github.dockerjava.core/registry.v1/.dockercfg
similarity index 100%
rename from src/test/resources/com.github.dockerjava.core/registry.v1/.dockercfg
rename to docker-java/src/test/resources/com.github.dockerjava.core/registry.v1/.dockercfg
diff --git a/src/test/resources/com.github.dockerjava.core/registry.v2/config.json b/docker-java/src/test/resources/com.github.dockerjava.core/registry.v2/config.json
similarity index 100%
rename from src/test/resources/com.github.dockerjava.core/registry.v2/config.json
rename to docker-java/src/test/resources/com.github.dockerjava.core/registry.v2/config.json
diff --git a/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_empty.json b/docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_empty.json
similarity index 100%
rename from src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_empty.json
rename to docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_empty.json
diff --git a/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full.json b/docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full.json
similarity index 100%
rename from src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full.json
rename to docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full.json
diff --git a/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_21.json b/docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_21.json
similarity index 100%
rename from src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_21.json
rename to docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_21.json
diff --git a/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json b/docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json
similarity index 100%
rename from src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json
rename to docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json
diff --git a/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26b.json b/docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26b.json
similarity index 100%
rename from src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26b.json
rename to docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26b.json
diff --git a/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_error.json b/docker-java/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_error.json
similarity index 100%
rename from src/test/resources/com/github/dockerjava/api/model/pullImageResponse_error.json
rename to docker-java/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_error.json
diff --git a/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_legacy.json b/docker-java/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_legacy.json
similarity index 100%
rename from src/test/resources/com/github/dockerjava/api/model/pullImageResponse_legacy.json
rename to docker-java/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_legacy.json
diff --git a/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_newerImage.json b/docker-java/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_newerImage.json
similarity index 100%
rename from src/test/resources/com/github/dockerjava/api/model/pullImageResponse_newerImage.json
rename to docker-java/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_newerImage.json
diff --git a/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_upToDate.json b/docker-java/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_upToDate.json
similarity index 100%
rename from src/test/resources/com/github/dockerjava/api/model/pullImageResponse_upToDate.json
rename to docker-java/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_upToDate.json
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/ca.pem b/docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/ca.pem
similarity index 100%
rename from src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/ca.pem
rename to docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/ca.pem
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/cert.pem b/docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/cert.pem
similarity index 100%
rename from src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/cert.pem
rename to docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/cert.pem
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/key.pem b/docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/key.pem
similarity index 100%
rename from src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/key.pem
rename to docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist/key.pem
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caAndCertMissing/key.pem b/docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caAndCertMissing/key.pem
similarity index 100%
rename from src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caAndCertMissing/key.pem
rename to docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caAndCertMissing/key.pem
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caAndKeyMissing/cert.pem b/docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caAndKeyMissing/cert.pem
similarity index 100%
rename from src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caAndKeyMissing/cert.pem
rename to docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caAndKeyMissing/cert.pem
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caMissing/cert.pem b/docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caMissing/cert.pem
similarity index 100%
rename from src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caMissing/cert.pem
rename to docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caMissing/cert.pem
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caMissing/key.pem b/docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caMissing/key.pem
similarity index 100%
rename from src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caMissing/key.pem
rename to docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caMissing/key.pem
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caTest/multiple_ca.pem b/docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caTest/multiple_ca.pem
similarity index 100%
rename from src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caTest/multiple_ca.pem
rename to docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caTest/multiple_ca.pem
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caTest/single_ca.pem b/docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caTest/single_ca.pem
similarity index 100%
rename from src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caTest/single_ca.pem
rename to docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/caTest/single_ca.pem
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certAndKeyMissing/ca.pem b/docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certAndKeyMissing/ca.pem
similarity index 100%
rename from src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certAndKeyMissing/ca.pem
rename to docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certAndKeyMissing/ca.pem
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certMissing/ca.pem b/docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certMissing/ca.pem
similarity index 100%
rename from src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certMissing/ca.pem
rename to docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certMissing/ca.pem
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certMissing/key.pem b/docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certMissing/key.pem
similarity index 100%
rename from src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certMissing/key.pem
rename to docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/certMissing/key.pem
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/keyMissing/ca.pem b/docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/keyMissing/ca.pem
similarity index 100%
rename from src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/keyMissing/ca.pem
rename to docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/keyMissing/ca.pem
diff --git a/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/keyMissing/cert.pem b/docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/keyMissing/cert.pem
similarity index 100%
rename from src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/keyMissing/cert.pem
rename to docker-java/src/test/resources/com/github/dockerjava/core/util/CertificateUtilsTest/keyMissing/cert.pem
diff --git a/src/test/resources/eventStreamReaderDockerfile/Dockerfile b/docker-java/src/test/resources/eventStreamReaderDockerfile/Dockerfile
similarity index 100%
rename from src/test/resources/eventStreamReaderDockerfile/Dockerfile
rename to docker-java/src/test/resources/eventStreamReaderDockerfile/Dockerfile
diff --git a/src/test/resources/frameReaderDockerfile/Dockerfile b/docker-java/src/test/resources/frameReaderDockerfile/Dockerfile
similarity index 100%
rename from src/test/resources/frameReaderDockerfile/Dockerfile
rename to docker-java/src/test/resources/frameReaderDockerfile/Dockerfile
diff --git a/src/test/resources/logback.xml b/docker-java/src/test/resources/logback.xml
similarity index 100%
rename from src/test/resources/logback.xml
rename to docker-java/src/test/resources/logback.xml
diff --git a/src/test/resources/privateRegistry/Dockerfile b/docker-java/src/test/resources/privateRegistry/Dockerfile
similarity index 100%
rename from src/test/resources/privateRegistry/Dockerfile
rename to docker-java/src/test/resources/privateRegistry/Dockerfile
diff --git a/src/test/resources/privateRegistry/auth/htpasswd b/docker-java/src/test/resources/privateRegistry/auth/htpasswd
similarity index 100%
rename from src/test/resources/privateRegistry/auth/htpasswd
rename to docker-java/src/test/resources/privateRegistry/auth/htpasswd
diff --git a/src/test/resources/privateRegistry/certs/README.txt b/docker-java/src/test/resources/privateRegistry/certs/README.txt
similarity index 100%
rename from src/test/resources/privateRegistry/certs/README.txt
rename to docker-java/src/test/resources/privateRegistry/certs/README.txt
diff --git a/src/test/resources/privateRegistry/certs/domain.crt b/docker-java/src/test/resources/privateRegistry/certs/domain.crt
similarity index 100%
rename from src/test/resources/privateRegistry/certs/domain.crt
rename to docker-java/src/test/resources/privateRegistry/certs/domain.crt
diff --git a/src/test/resources/privateRegistry/certs/domain.key b/docker-java/src/test/resources/privateRegistry/certs/domain.key
similarity index 100%
rename from src/test/resources/privateRegistry/certs/domain.key
rename to docker-java/src/test/resources/privateRegistry/certs/domain.key
diff --git a/src/test/resources/samples/1.22/containers/container/json/1.json b/docker-java/src/test/resources/samples/1.22/containers/container/json/1.json
similarity index 100%
rename from src/test/resources/samples/1.22/containers/container/json/1.json
rename to docker-java/src/test/resources/samples/1.22/containers/container/json/1.json
diff --git a/src/test/resources/samples/1.22/containers/container/update/docs.json b/docker-java/src/test/resources/samples/1.22/containers/container/update/docs.json
similarity index 100%
rename from src/test/resources/samples/1.22/containers/container/update/docs.json
rename to docker-java/src/test/resources/samples/1.22/containers/container/update/docs.json
diff --git a/src/test/resources/samples/1.22/containers/create/docs.json b/docker-java/src/test/resources/samples/1.22/containers/create/docs.json
similarity index 100%
rename from src/test/resources/samples/1.22/containers/create/docs.json
rename to docker-java/src/test/resources/samples/1.22/containers/create/docs.json
diff --git a/src/test/resources/samples/1.22/containers/json/filter1.json b/docker-java/src/test/resources/samples/1.22/containers/json/filter1.json
similarity index 100%
rename from src/test/resources/samples/1.22/containers/json/filter1.json
rename to docker-java/src/test/resources/samples/1.22/containers/json/filter1.json
diff --git a/src/test/resources/samples/1.22/exec/ID/1.json b/docker-java/src/test/resources/samples/1.22/exec/ID/1.json
similarity index 100%
rename from src/test/resources/samples/1.22/exec/ID/1.json
rename to docker-java/src/test/resources/samples/1.22/exec/ID/1.json
diff --git a/src/test/resources/samples/1.22/images/docImage/doc.json b/docker-java/src/test/resources/samples/1.22/images/docImage/doc.json
similarity index 100%
rename from src/test/resources/samples/1.22/images/docImage/doc.json
rename to docker-java/src/test/resources/samples/1.22/images/docImage/doc.json
diff --git a/src/test/resources/samples/1.22/images/docImage/inspect_doc.json b/docker-java/src/test/resources/samples/1.22/images/docImage/inspect_doc.json
similarity index 100%
rename from src/test/resources/samples/1.22/images/docImage/inspect_doc.json
rename to docker-java/src/test/resources/samples/1.22/images/docImage/inspect_doc.json
diff --git a/src/test/resources/samples/1.22/images/image1/inspect1.json b/docker-java/src/test/resources/samples/1.22/images/image1/inspect1.json
similarity index 100%
rename from src/test/resources/samples/1.22/images/image1/inspect1.json
rename to docker-java/src/test/resources/samples/1.22/images/image1/inspect1.json
diff --git a/src/test/resources/samples/1.22/images/overlay/inspectOverlay.json b/docker-java/src/test/resources/samples/1.22/images/overlay/inspectOverlay.json
similarity index 100%
rename from src/test/resources/samples/1.22/images/overlay/inspectOverlay.json
rename to docker-java/src/test/resources/samples/1.22/images/overlay/inspectOverlay.json
diff --git a/src/test/resources/samples/1.22/info/1.json b/docker-java/src/test/resources/samples/1.22/info/1.json
similarity index 100%
rename from src/test/resources/samples/1.22/info/1.json
rename to docker-java/src/test/resources/samples/1.22/info/1.json
diff --git a/src/test/resources/samples/1.22/info/2.json b/docker-java/src/test/resources/samples/1.22/info/2.json
similarity index 100%
rename from src/test/resources/samples/1.22/info/2.json
rename to docker-java/src/test/resources/samples/1.22/info/2.json
diff --git a/src/test/resources/samples/1.22/info/docs.json b/docker-java/src/test/resources/samples/1.22/info/docs.json
similarity index 100%
rename from src/test/resources/samples/1.22/info/docs.json
rename to docker-java/src/test/resources/samples/1.22/info/docs.json
diff --git a/src/test/resources/samples/1.22/other/AuthConfig/docs1.json b/docker-java/src/test/resources/samples/1.22/other/AuthConfig/docs1.json
similarity index 100%
rename from src/test/resources/samples/1.22/other/AuthConfig/docs1.json
rename to docker-java/src/test/resources/samples/1.22/other/AuthConfig/docs1.json
diff --git a/src/test/resources/samples/1.22/other/AuthConfig/docs2.json b/docker-java/src/test/resources/samples/1.22/other/AuthConfig/docs2.json
similarity index 100%
rename from src/test/resources/samples/1.22/other/AuthConfig/docs2.json
rename to docker-java/src/test/resources/samples/1.22/other/AuthConfig/docs2.json
diff --git a/src/test/resources/samples/1.22/version/1.json b/docker-java/src/test/resources/samples/1.22/version/1.json
similarity index 100%
rename from src/test/resources/samples/1.22/version/1.json
rename to docker-java/src/test/resources/samples/1.22/version/1.json
diff --git a/src/test/resources/samples/1.23/other/AuthConfig/docs1.json b/docker-java/src/test/resources/samples/1.23/other/AuthConfig/docs1.json
similarity index 100%
rename from src/test/resources/samples/1.23/other/AuthConfig/docs1.json
rename to docker-java/src/test/resources/samples/1.23/other/AuthConfig/docs1.json
diff --git a/src/test/resources/samples/1.24/containers/inspect/1.json b/docker-java/src/test/resources/samples/1.24/containers/inspect/1.json
similarity index 100%
rename from src/test/resources/samples/1.24/containers/inspect/1.json
rename to docker-java/src/test/resources/samples/1.24/containers/inspect/1.json
diff --git a/src/test/resources/samples/1.24/events/docs1.json b/docker-java/src/test/resources/samples/1.24/events/docs1.json
similarity index 100%
rename from src/test/resources/samples/1.24/events/docs1.json
rename to docker-java/src/test/resources/samples/1.24/events/docs1.json
diff --git a/src/test/resources/samples/1.25/images/windowsImage/doc.json b/docker-java/src/test/resources/samples/1.25/images/windowsImage/doc.json
similarity index 100%
rename from src/test/resources/samples/1.25/images/windowsImage/doc.json
rename to docker-java/src/test/resources/samples/1.25/images/windowsImage/doc.json
diff --git a/src/test/resources/samples/1.25/other/AuthConfig/orchestrators.json b/docker-java/src/test/resources/samples/1.25/other/AuthConfig/orchestrators.json
similarity index 100%
rename from src/test/resources/samples/1.25/other/AuthConfig/orchestrators.json
rename to docker-java/src/test/resources/samples/1.25/other/AuthConfig/orchestrators.json
diff --git a/src/test/resources/samples/1.27/containers/container/stats/stats1.json b/docker-java/src/test/resources/samples/1.27/containers/container/stats/stats1.json
similarity index 100%
rename from src/test/resources/samples/1.27/containers/container/stats/stats1.json
rename to docker-java/src/test/resources/samples/1.27/containers/container/stats/stats1.json
diff --git a/src/test/resources/samples/1.38/containers/inspect/lcow.json b/docker-java/src/test/resources/samples/1.38/containers/inspect/lcow.json
similarity index 100%
rename from src/test/resources/samples/1.38/containers/inspect/lcow.json
rename to docker-java/src/test/resources/samples/1.38/containers/inspect/lcow.json
diff --git a/src/test/resources/samples/1.38/info/lcow.json b/docker-java/src/test/resources/samples/1.38/info/lcow.json
similarity index 100%
rename from src/test/resources/samples/1.38/info/lcow.json
rename to docker-java/src/test/resources/samples/1.38/info/lcow.json
diff --git a/src/test/resources/samples/1.38/version/lcow.json b/docker-java/src/test/resources/samples/1.38/version/lcow.json
similarity index 100%
rename from src/test/resources/samples/1.38/version/lcow.json
rename to docker-java/src/test/resources/samples/1.38/version/lcow.json
diff --git a/src/test/resources/someHomeDir/.docker/certs/dummy.txt b/docker-java/src/test/resources/someHomeDir/.docker/certs/dummy.txt
similarity index 100%
rename from src/test/resources/someHomeDir/.docker/certs/dummy.txt
rename to docker-java/src/test/resources/someHomeDir/.docker/certs/dummy.txt
diff --git a/src/test/resources/someHomeDir/.docker/config.json b/docker-java/src/test/resources/someHomeDir/.docker/config.json
similarity index 100%
rename from src/test/resources/someHomeDir/.docker/config.json
rename to docker-java/src/test/resources/someHomeDir/.docker/config.json
diff --git a/src/test/resources/testAuthConfigFile/emptyFile/.dockercfg b/docker-java/src/test/resources/testAuthConfigFile/emptyFile/.dockercfg
similarity index 100%
rename from src/test/resources/testAuthConfigFile/emptyFile/.dockercfg
rename to docker-java/src/test/resources/testAuthConfigFile/emptyFile/.dockercfg
diff --git a/src/test/resources/testAuthConfigFile/invalidJsonInvalidAuth/.dockercfg b/docker-java/src/test/resources/testAuthConfigFile/invalidJsonInvalidAuth/.dockercfg
similarity index 100%
rename from src/test/resources/testAuthConfigFile/invalidJsonInvalidAuth/.dockercfg
rename to docker-java/src/test/resources/testAuthConfigFile/invalidJsonInvalidAuth/.dockercfg
diff --git a/src/test/resources/testAuthConfigFile/invalidLegacyAuthLine/.dockercfg b/docker-java/src/test/resources/testAuthConfigFile/invalidLegacyAuthLine/.dockercfg
similarity index 100%
rename from src/test/resources/testAuthConfigFile/invalidLegacyAuthLine/.dockercfg
rename to docker-java/src/test/resources/testAuthConfigFile/invalidLegacyAuthLine/.dockercfg
diff --git a/src/test/resources/testAuthConfigFile/invalidLegacyEmailLine/.dockercfg b/docker-java/src/test/resources/testAuthConfigFile/invalidLegacyEmailLine/.dockercfg
similarity index 100%
rename from src/test/resources/testAuthConfigFile/invalidLegacyEmailLine/.dockercfg
rename to docker-java/src/test/resources/testAuthConfigFile/invalidLegacyEmailLine/.dockercfg
diff --git a/src/test/resources/testAuthConfigFile/invalidLegacyInvalidAuth/.dockercfg b/docker-java/src/test/resources/testAuthConfigFile/invalidLegacyInvalidAuth/.dockercfg
similarity index 100%
rename from src/test/resources/testAuthConfigFile/invalidLegacyInvalidAuth/.dockercfg
rename to docker-java/src/test/resources/testAuthConfigFile/invalidLegacyInvalidAuth/.dockercfg
diff --git a/src/test/resources/testAuthConfigFile/tooSmallFile/.dockercfg b/docker-java/src/test/resources/testAuthConfigFile/tooSmallFile/.dockercfg
similarity index 100%
rename from src/test/resources/testAuthConfigFile/tooSmallFile/.dockercfg
rename to docker-java/src/test/resources/testAuthConfigFile/tooSmallFile/.dockercfg
diff --git a/src/test/resources/testAuthConfigFile/validDockerConfig/config.json b/docker-java/src/test/resources/testAuthConfigFile/validDockerConfig/config.json
similarity index 100%
rename from src/test/resources/testAuthConfigFile/validDockerConfig/config.json
rename to docker-java/src/test/resources/testAuthConfigFile/validDockerConfig/config.json
diff --git a/src/test/resources/testAuthConfigFile/validJsonWithOnlyUnknown/config.json b/docker-java/src/test/resources/testAuthConfigFile/validJsonWithOnlyUnknown/config.json
similarity index 100%
rename from src/test/resources/testAuthConfigFile/validJsonWithOnlyUnknown/config.json
rename to docker-java/src/test/resources/testAuthConfigFile/validJsonWithOnlyUnknown/config.json
diff --git a/src/test/resources/testAuthConfigFile/validJsonWithUnknown/config.json b/docker-java/src/test/resources/testAuthConfigFile/validJsonWithUnknown/config.json
similarity index 100%
rename from src/test/resources/testAuthConfigFile/validJsonWithUnknown/config.json
rename to docker-java/src/test/resources/testAuthConfigFile/validJsonWithUnknown/config.json
diff --git a/src/test/resources/testAuthConfigFile/validLegacy/.dockercfg b/docker-java/src/test/resources/testAuthConfigFile/validLegacy/.dockercfg
similarity index 100%
rename from src/test/resources/testAuthConfigFile/validLegacy/.dockercfg
rename to docker-java/src/test/resources/testAuthConfigFile/validLegacy/.dockercfg
diff --git a/src/test/resources/testAuthConfigFile/validLegacyJson/.dockercfg b/docker-java/src/test/resources/testAuthConfigFile/validLegacyJson/.dockercfg
similarity index 100%
rename from src/test/resources/testAuthConfigFile/validLegacyJson/.dockercfg
rename to docker-java/src/test/resources/testAuthConfigFile/validLegacyJson/.dockercfg
diff --git a/src/test/resources/testCopyFromArchive/binary.dat b/docker-java/src/test/resources/testCopyFromArchive/binary.dat
similarity index 100%
rename from src/test/resources/testCopyFromArchive/binary.dat
rename to docker-java/src/test/resources/testCopyFromArchive/binary.dat
diff --git a/src/test/resources/testImportImageFromTar/empty.tar b/docker-java/src/test/resources/testImportImageFromTar/empty.tar
similarity index 100%
rename from src/test/resources/testImportImageFromTar/empty.tar
rename to docker-java/src/test/resources/testImportImageFromTar/empty.tar
diff --git a/src/test/resources/testReadFile/Dockerfile b/docker-java/src/test/resources/testReadFile/Dockerfile
similarity index 100%
rename from src/test/resources/testReadFile/Dockerfile
rename to docker-java/src/test/resources/testReadFile/Dockerfile
diff --git a/src/test/resources/testReadFile/oldFile.txt b/docker-java/src/test/resources/testReadFile/oldFile.txt
similarity index 100%
rename from src/test/resources/testReadFile/oldFile.txt
rename to docker-java/src/test/resources/testReadFile/oldFile.txt
diff --git a/src/test/resources/testReadFile/testrun.sh b/docker-java/src/test/resources/testReadFile/testrun.sh
similarity index 100%
rename from src/test/resources/testReadFile/testrun.sh
rename to docker-java/src/test/resources/testReadFile/testrun.sh
diff --git a/src/test/resources/travis-logback.xml b/docker-java/src/test/resources/travis-logback.xml
similarity index 100%
rename from src/test/resources/travis-logback.xml
rename to docker-java/src/test/resources/travis-logback.xml
diff --git a/template.mf b/docker-java/template.mf
similarity index 100%
rename from template.mf
rename to docker-java/template.mf
diff --git a/pom.xml b/pom.xml
index c253c1014..46d1cfefe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,11 +8,11 @@
 	</parent>
 
 	<groupId>com.github.docker-java</groupId>
-	<artifactId>docker-java</artifactId>
-	<packaging>bundle</packaging>
+	<artifactId>docker-java-parent</artifactId>
+	<packaging>pom</packaging>
 	<version>3.1.6-SNAPSHOT</version>
 
-	<name>docker-java</name>
+	<name>docker-java-parent</name>
 	<url>https://github.com/docker-java/docker-java</url>
 	<description>Java API Client for Docker</description>
 
@@ -89,185 +89,9 @@
 		<maven-build-helper-plugin.version>3.0.0</maven-build-helper-plugin.version>
 	</properties>
 
-	<dependencies>
-		<dependency>
-			<groupId>com.fasterxml.jackson.jaxrs</groupId>
-			<artifactId>jackson-jaxrs-json-provider</artifactId>
-			<version>${jackson-jaxrs.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.connectors</groupId>
-			<artifactId>jersey-apache-connector</artifactId>
-			<version>${jersey.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpcore</artifactId>
-			<version>4.4.10</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>${httpclient.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.core</groupId>
-			<artifactId>jersey-client</artifactId>
-			<version>${jersey.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.inject</groupId>
-			<artifactId>jersey-hk2</artifactId>
-			<version>${jersey.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.kohlschutter.junixsocket</groupId>
-			<artifactId>junixsocket-common</artifactId>
-			<version>${junixsocket.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.kohlschutter.junixsocket</groupId>
-			<artifactId>junixsocket-native-common</artifactId>
-			<version>${junixsocket.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-compress</artifactId>
-			<version>${commons-compress.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>${commons-codec.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>${commons-lang.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>${commons-io.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>${slf4j-api.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<version>${slf4j-api.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>${guava.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcpkix-jdk15on</artifactId>
-			<version>${bouncycastle.version}</version>
-		</dependency>
-
-		<!-- /// Test /////////////////////////// -->
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-core</artifactId>
-			<version>${logback.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>${logback.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
-			<version>${hamcrest.library.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.googlecode.lambdaj</groupId>
-			<artifactId>lambdaj</artifactId>
-			<version>${lambdaj.version}</version>
-			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.hamcrest</groupId>
-					<artifactId>hamcrest-all</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.testinfected.hamcrest-matchers</groupId>
-			<artifactId>jpa-matchers</artifactId>
-			<version>${hamcrest.jpa-matchers}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>${mockito.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.google.code.findbugs</groupId>
-			<artifactId>annotations</artifactId>
-			<version>3.0.1u2</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>io.netty</groupId>
-			<artifactId>netty-codec-http</artifactId>
-			<version>${netty.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.netty</groupId>
-			<artifactId>netty-handler</artifactId>
-			<version>${netty.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.netty</groupId>
-			<artifactId>netty-handler-proxy</artifactId>
-			<version>${netty.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.netty</groupId>
-			<artifactId>netty-transport-native-epoll</artifactId>
-			<version>${netty.version}</version>
-			<classifier>linux-x86_64</classifier>
-		</dependency>
-		<dependency>
-			<groupId>io.netty</groupId>
-			<artifactId>netty-transport-native-kqueue</artifactId>
-			<version>${netty.version}</version>
-			<classifier>osx-x86_64</classifier>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+	<modules>
+		<module>docker-java</module>
+	</modules>
 
 	<distributionManagement>
 		<snapshotRepository>
@@ -403,79 +227,10 @@
 				</configuration>
 			</plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>${maven-surefire-plugin.version}</version>
-				<configuration>
-					<rerunFailingTestsCount>3</rerunFailingTestsCount>
-					<excludedGroups>com.github.dockerjava.junit.category.Integration</excludedGroups>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>${maven-failsafe-plugin.version}</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>integration-test</goal>
-							<goal>verify</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<rerunFailingTestsCount>3</rerunFailingTestsCount>
-					<!--<useUnlimitedThreads>true</useUnlimitedThreads>-->
-					<perCoreThreadCount>true</perCoreThreadCount>
-					<threadCount>1</threadCount>
-					<parallel>classes</parallel>
-					<groups>com.github.dockerjava.junit.category.Integration</groups>
-					<excludedGroups>com.github.dockerjava.junit.category.AuthIntegration,com.github.dockerjava.junit.category.SwarmModeIntegration</excludedGroups>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Export-Package>!com.github.dockerjava.jaxrs.*,!com.github.dockerjava.netty.*,com.github.dockerjava.*</Export-Package>
-						<Import-Package>org.newsclub.net.unix;resolution:="optional",*</Import-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<!-- use with "mvn -DskipTests clean package japicmp:cmp" -->
-				<groupId>com.github.siom79.japicmp</groupId>
-				<artifactId>japicmp-maven-plugin</artifactId>
-				<version>0.14.1</version>
-				<configuration>
-					<oldVersion>
-						<dependency>
-							<groupId>com.github.docker-java</groupId>
-							<artifactId>docker-java</artifactId>
-							<version>3.1.0-rc-4</version>
-							<type>jar</type>
-						</dependency>
-					</oldVersion>
-					<newVersion>
-						<file>
-							<path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
-						</file>
-					</newVersion>
-					<parameter>
-						<accessModifier>public</accessModifier>
-						<onlyBinaryIncompatible>true</onlyBinaryIncompatible>
-					</parameter>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
@@ -531,7 +286,7 @@
 							<!-- if some IDE has integration and requires other place, propose 
 								it -->
 							<configLocation>
-								src/test/resources/checkstyle/checkstyle-config.xml
+								${maven.multiModuleProjectDirectory}/src/test/resources/checkstyle/checkstyle-config.xml
 							</configLocation>
 						</configuration>
 					</plugin>

From 2f04be6ae5454ffb3e9a0795b1a66195b7fae74f Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Fri, 30 Aug 2019 22:02:30 +0200
Subject: [PATCH 0932/1272] fix logback config path

---
 .travis/travis-before-install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis/travis-before-install.sh b/.travis/travis-before-install.sh
index e86654511..88a1e0ecd 100755
--- a/.travis/travis-before-install.sh
+++ b/.travis/travis-before-install.sh
@@ -45,9 +45,9 @@ sudo -E stop docker
 # sudo apt-get -f install
 # sudo dpkg -i "$(ls *${DOCKER_VERSION}*)"
 #popd
-rm -f "src/test/resources/logback.xml"
+rm -f "docker-java/src/test/resources/logback.xml"
 #rm -f "src/test/resources/travis-logback.xml"
-mv "src/test/resources/travis-logback.xml" "src/test/resources/logback-test.xml"
+mv "docker-java/src/test/resources/travis-logback.xml" "docker-java/src/test/resources/logback-test.xml"
 
 # https://github.com/docker/docker/issues/18113
 sudo rm /var/lib/docker/network/files/local-kv.db

From 07a5c4e2d4b9c9788ac01bf3adb3a9a66f3e26e9 Mon Sep 17 00:00:00 2001
From: alexey <alexey@pleo.io>
Date: Mon, 2 Sep 2019 16:24:30 +0300
Subject: [PATCH 0933/1272] upgrade common-compress

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c253c1014..456b2d39e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
 		<jersey.version>2.27</jersey.version>
 		<jackson-jaxrs.version>2.9.8</jackson-jaxrs.version>
 		<httpclient.version>4.5.6</httpclient.version><!-- 4.5.1-4.5.2 broken -->
-		<commons-compress.version>1.18</commons-compress.version>
+		<commons-compress.version>1.19</commons-compress.version>
 		<commons-codec.version>1.11</commons-codec.version>
 		<commons-io.version>2.6</commons-io.version>
 		<commons-lang.version>2.6</commons-lang.version>
@@ -528,7 +528,7 @@
 							<failOnViolation>true</failOnViolation>
 							<logViolationsToConsole>true</logViolationsToConsole>
 							<linkXRef>false</linkXRef>
-							<!-- if some IDE has integration and requires other place, propose 
+							<!-- if some IDE has integration and requires other place, propose
 								it -->
 							<configLocation>
 								src/test/resources/checkstyle/checkstyle-config.xml

From 1c7e0f6b46d9de8b4d25336e57a4c9a1746c9de5 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Thu, 26 Sep 2019 19:52:27 +0300
Subject: [PATCH 0934/1272] extract API module (#1248)

---
 docker-java-api/pom.xml                       | 63 +++++++++++++++++++
 .../github/dockerjava/api/DockerClient.java   |  0
 .../dockerjava/api/async/ResultCallback.java  |  0
 .../api/command/AsyncDockerCmd.java           |  0
 .../api/command/AttachContainerCmd.java       |  0
 .../dockerjava/api/command/AuthCmd.java       |  0
 .../dockerjava/api/command/BuildImageCmd.java |  0
 .../dockerjava/api/command/CommitCmd.java     |  0
 .../api/command/ConnectToNetworkCmd.java      |  0
 .../api/command/ContainerDiffCmd.java         |  0
 .../command/CopyArchiveFromContainerCmd.java  |  0
 .../command/CopyArchiveToContainerCmd.java    |  0
 .../api/command/CopyFileFromContainerCmd.java |  0
 .../api/command/CreateContainerCmd.java       |  0
 .../api/command/CreateContainerResponse.java  |  0
 .../api/command/CreateImageCmd.java           |  0
 .../api/command/CreateImageResponse.java      |  0
 .../api/command/CreateNetworkCmd.java         |  0
 .../api/command/CreateNetworkResponse.java    |  0
 .../api/command/CreateSecretCmd.java          |  0
 .../api/command/CreateSecretResponse.java     |  0
 .../api/command/CreateServiceCmd.java         |  0
 .../api/command/CreateServiceResponse.java    |  0
 .../api/command/CreateVolumeCmd.java          |  0
 .../api/command/CreateVolumeResponse.java     |  0
 .../api/command/DisconnectFromNetworkCmd.java |  0
 .../dockerjava/api/command/DockerCmd.java     |  0
 .../api/command/DockerCmdAsyncExec.java       |  0
 .../api/command/DockerCmdExecFactory.java     |  0
 .../api/command/DockerCmdSyncExec.java        |  0
 .../dockerjava/api/command/EventsCmd.java     |  0
 .../dockerjava/api/command/ExecCreateCmd.java |  0
 .../api/command/ExecCreateCmdResponse.java    |  0
 .../dockerjava/api/command/ExecStartCmd.java  |  0
 .../dockerjava/api/command/GraphData.java     |  0
 .../dockerjava/api/command/GraphDriver.java   |  0
 .../dockerjava/api/command/HealthState.java   |  0
 .../api/command/HealthStateLog.java           |  0
 .../dockerjava/api/command/InfoCmd.java       |  0
 .../api/command/InitializeSwarmCmd.java       |  0
 .../api/command/InspectContainerCmd.java      |  0
 .../api/command/InspectContainerResponse.java |  0
 .../api/command/InspectExecCmd.java           |  0
 .../api/command/InspectExecResponse.java      |  0
 .../api/command/InspectImageCmd.java          |  0
 .../api/command/InspectImageResponse.java     |  0
 .../api/command/InspectNetworkCmd.java        |  0
 .../api/command/InspectServiceCmd.java        |  0
 .../api/command/InspectSwarmCmd.java          |  0
 .../api/command/InspectSwarmNodeCmd.java      |  0
 .../api/command/InspectTaskCmd.java           |  0
 .../api/command/InspectVolumeCmd.java         |  0
 .../api/command/InspectVolumeResponse.java    |  0
 .../dockerjava/api/command/JoinSwarmCmd.java  |  0
 .../api/command/KillContainerCmd.java         |  0
 .../dockerjava/api/command/LeaveSwarmCmd.java |  0
 .../api/command/ListContainersCmd.java        |  0
 .../dockerjava/api/command/ListImagesCmd.java |  0
 .../api/command/ListNetworksCmd.java          |  0
 .../api/command/ListSecretsCmd.java           |  0
 .../api/command/ListServicesCmd.java          |  0
 .../api/command/ListSwarmNodesCmd.java        |  0
 .../dockerjava/api/command/ListTasksCmd.java  |  0
 .../api/command/ListVolumesCmd.java           |  0
 .../api/command/ListVolumesResponse.java      |  0
 .../dockerjava/api/command/LoadImageCmd.java  |  0
 .../api/command/LogContainerCmd.java          |  0
 .../api/command/LogSwarmObjectCmd.java        |  0
 .../api/command/PauseContainerCmd.java        |  0
 .../dockerjava/api/command/PingCmd.java       |  0
 .../dockerjava/api/command/PruneCmd.java      |  0
 .../dockerjava/api/command/PullImageCmd.java  |  0
 .../dockerjava/api/command/PushImageCmd.java  |  0
 .../api/command/RemoveContainerCmd.java       |  0
 .../api/command/RemoveImageCmd.java           |  0
 .../api/command/RemoveNetworkCmd.java         |  0
 .../api/command/RemoveSecretCmd.java          |  0
 .../api/command/RemoveServiceCmd.java         |  0
 .../api/command/RemoveSwarmNodeCmd.java       |  0
 .../api/command/RemoveVolumeCmd.java          |  0
 .../api/command/RenameContainerCmd.java       |  0
 .../api/command/RestartContainerCmd.java      |  0
 .../github/dockerjava/api/command/RootFS.java |  0
 .../dockerjava/api/command/SaveImageCmd.java  |  0
 .../api/command/SearchImagesCmd.java          |  0
 .../api/command/StartContainerCmd.java        |  0
 .../dockerjava/api/command/StatsCmd.java      |  0
 .../api/command/StopContainerCmd.java         |  0
 .../dockerjava/api/command/SyncDockerCmd.java |  0
 .../dockerjava/api/command/TagImageCmd.java   |  0
 .../api/command/TopContainerCmd.java          |  0
 .../api/command/TopContainerResponse.java     |  0
 .../api/command/UnpauseContainerCmd.java      |  0
 .../api/command/UpdateContainerCmd.java       |  0
 .../api/command/UpdateServiceCmd.java         |  0
 .../api/command/UpdateSwarmCmd.java           |  0
 .../api/command/UpdateSwarmNodeCmd.java       |  0
 .../dockerjava/api/command/VersionCmd.java    |  0
 .../api/command/WaitContainerCmd.java         |  0
 .../api/exception/BadRequestException.java    |  0
 .../api/exception/ConflictException.java      |  0
 .../api/exception/DockerClientException.java  |  0
 .../api/exception/DockerException.java        |  0
 .../InternalServerErrorException.java         |  0
 .../api/exception/NotAcceptableException.java |  0
 .../api/exception/NotFoundException.java      |  0
 .../api/exception/NotModifiedException.java   |  0
 .../api/exception/UnauthorizedException.java  |  0
 .../dockerjava/api/model/AccessMode.java      |  0
 .../dockerjava/api/model/AuthConfig.java      |  0
 .../api/model/AuthConfigurations.java         |  0
 .../dockerjava/api/model/AuthResponse.java    |  0
 .../com/github/dockerjava/api/model/Bind.java |  0
 .../dockerjava/api/model/BindOptions.java     |  0
 .../dockerjava/api/model/BindPropagation.java |  0
 .../github/dockerjava/api/model/Binds.java    |  0
 .../dockerjava/api/model/BlkioRateDevice.java |  0
 .../dockerjava/api/model/BlkioStatEntry.java  |  0
 .../api/model/BlkioStatsConfig.java           |  0
 .../api/model/BlkioWeightDevice.java          |  0
 .../api/model/BuildResponseItem.java          |  0
 .../dockerjava/api/model/Capability.java      |  0
 .../dockerjava/api/model/ChangeLog.java       |  0
 .../dockerjava/api/model/ClusterInfo.java     |  0
 .../dockerjava/api/model/Container.java       |  0
 .../dockerjava/api/model/ContainerConfig.java |  0
 .../api/model/ContainerDNSConfig.java         |  0
 .../api/model/ContainerHostConfig.java        |  0
 .../dockerjava/api/model/ContainerMount.java  |  0
 .../api/model/ContainerNetwork.java           |  0
 .../api/model/ContainerNetworkSettings.java   |  0
 .../dockerjava/api/model/ContainerPort.java   |  0
 .../dockerjava/api/model/ContainerSpec.java   |  0
 .../api/model/ContainerSpecConfig.java        |  0
 .../api/model/ContainerSpecFile.java          |  0
 .../api/model/ContainerSpecPrivileges.java    |  0
 .../ContainerSpecPrivilegesCredential.java    |  0
 ...ContainerSpecPrivilegesSELinuxContext.java |  0
 .../api/model/ContainerSpecSecret.java        |  0
 .../dockerjava/api/model/CpuStatsConfig.java  |  0
 .../dockerjava/api/model/CpuUsageConfig.java  |  0
 .../github/dockerjava/api/model/Device.java   |  0
 .../api/model/DiscreteResourceSpec.java       |  0
 .../github/dockerjava/api/model/Driver.java   |  0
 .../dockerjava/api/model/DriverStatus.java    |  0
 .../github/dockerjava/api/model/Endpoint.java |  0
 .../api/model/EndpointResolutionMode.java     |  0
 .../dockerjava/api/model/EndpointSpec.java    |  0
 .../api/model/EndpointVirtualIP.java          |  0
 .../dockerjava/api/model/ErrorDetail.java     |  0
 .../dockerjava/api/model/ErrorResponse.java   |  0
 .../github/dockerjava/api/model/Event.java    |  0
 .../dockerjava/api/model/EventActor.java      |  0
 .../dockerjava/api/model/EventType.java       |  0
 .../dockerjava/api/model/ExposedPort.java     |  0
 .../dockerjava/api/model/ExposedPorts.java    |  0
 .../dockerjava/api/model/ExternalCA.java      |  0
 .../api/model/ExternalCAProtocol.java         |  0
 .../github/dockerjava/api/model/Frame.java    |  0
 .../dockerjava/api/model/GenericResource.java |  0
 .../dockerjava/api/model/HealthCheck.java     |  0
 .../dockerjava/api/model/HostConfig.java      |  0
 .../dockerjava/api/model/Identifier.java      |  0
 .../github/dockerjava/api/model/Image.java    |  0
 .../com/github/dockerjava/api/model/Info.java |  0
 .../api/model/InfoRegistryConfig.java         |  0
 .../api/model/InternetProtocol.java           |  0
 .../dockerjava/api/model/Isolation.java       |  0
 .../com/github/dockerjava/api/model/Link.java |  0
 .../github/dockerjava/api/model/Links.java    |  0
 .../dockerjava/api/model/LocalNodeState.java  |  0
 .../dockerjava/api/model/LogConfig.java       |  0
 .../github/dockerjava/api/model/LxcConf.java  |  0
 .../api/model/MemoryStatsConfig.java          |  0
 .../github/dockerjava/api/model/Mount.java    |  0
 .../dockerjava/api/model/MountType.java       |  0
 .../api/model/NamedResourceSpec.java          |  0
 .../github/dockerjava/api/model/Network.java  |  0
 .../api/model/NetworkAttachmentConfig.java    |  0
 .../dockerjava/api/model/NetworkSettings.java |  0
 .../com/github/dockerjava/api/model/Node.java |  0
 .../dockerjava/api/model/ObjectVersion.java   |  0
 .../github/dockerjava/api/model/PeerNode.java |  0
 .../dockerjava/api/model/PidsStatsConfig.java |  0
 .../dockerjava/api/model/PortBinding.java     |  0
 .../dockerjava/api/model/PortConfig.java      |  0
 .../api/model/PortConfigProtocol.java         |  0
 .../github/dockerjava/api/model/Ports.java    |  0
 .../dockerjava/api/model/PropagationMode.java |  0
 .../dockerjava/api/model/PruneResponse.java   |  0
 .../dockerjava/api/model/PruneType.java       |  0
 .../api/model/PullResponseItem.java           |  0
 .../api/model/PushResponseItem.java           |  0
 .../dockerjava/api/model/Reachability.java    |  0
 .../dockerjava/api/model/Repository.java      |  0
 .../api/model/ResourceRequirements.java       |  0
 .../dockerjava/api/model/ResourceSpecs.java   |  0
 .../dockerjava/api/model/ResourceVersion.java |  0
 .../dockerjava/api/model/ResponseItem.java    |  0
 .../dockerjava/api/model/RestartPolicy.java   |  0
 .../dockerjava/api/model/SELContext.java      |  0
 .../dockerjava/api/model/SearchItem.java      |  0
 .../github/dockerjava/api/model/Secret.java   |  0
 .../dockerjava/api/model/SecretSpec.java      |  0
 .../github/dockerjava/api/model/Service.java  |  0
 .../api/model/ServiceGlobalModeOptions.java   |  0
 .../dockerjava/api/model/ServiceMode.java     |  0
 .../api/model/ServiceModeConfig.java          |  0
 .../api/model/ServicePlacement.java           |  0
 .../model/ServiceReplicatedModeOptions.java   |  0
 .../api/model/ServiceRestartCondition.java    |  0
 .../api/model/ServiceRestartPolicy.java       |  0
 .../dockerjava/api/model/ServiceSpec.java     |  0
 .../api/model/ServiceUpdateState.java         |  0
 .../api/model/ServiceUpdateStatus.java        |  0
 .../api/model/StatisticNetworksConfig.java    |  0
 .../dockerjava/api/model/Statistics.java      |  0
 .../dockerjava/api/model/StatsConfig.java     |  0
 .../dockerjava/api/model/StreamType.java      |  0
 .../github/dockerjava/api/model/Swarm.java    |  0
 .../dockerjava/api/model/SwarmCAConfig.java   |  0
 .../api/model/SwarmDispatcherConfig.java      |  0
 .../dockerjava/api/model/SwarmInfo.java       |  0
 .../dockerjava/api/model/SwarmJoinTokens.java |  0
 .../dockerjava/api/model/SwarmNode.java       |  0
 .../api/model/SwarmNodeAvailability.java      |  0
 .../api/model/SwarmNodeDescription.java       |  0
 .../api/model/SwarmNodeEngineDescription.java |  0
 .../api/model/SwarmNodeManagerStatus.java     |  0
 .../api/model/SwarmNodePlatform.java          |  0
 .../api/model/SwarmNodePluginDescription.java |  0
 .../api/model/SwarmNodeResources.java         |  0
 .../dockerjava/api/model/SwarmNodeRole.java   |  0
 .../dockerjava/api/model/SwarmNodeSpec.java   |  0
 .../dockerjava/api/model/SwarmNodeState.java  |  0
 .../dockerjava/api/model/SwarmNodeStatus.java |  0
 .../api/model/SwarmNodeVersion.java           |  0
 .../api/model/SwarmOrchestration.java         |  0
 .../dockerjava/api/model/SwarmRaftConfig.java |  0
 .../dockerjava/api/model/SwarmSpec.java       |  0
 .../dockerjava/api/model/SwarmVersion.java    |  0
 .../com/github/dockerjava/api/model/Task.java |  0
 .../dockerjava/api/model/TaskDefaults.java    |  0
 .../github/dockerjava/api/model/TaskSpec.java |  0
 .../dockerjava/api/model/TaskState.java       |  0
 .../dockerjava/api/model/TaskStatus.java      |  0
 .../api/model/TaskStatusContainerStatus.java  |  0
 .../api/model/ThrottlingDataConfig.java       |  0
 .../dockerjava/api/model/TmpfsOptions.java    |  0
 .../github/dockerjava/api/model/Ulimit.java   |  0
 .../dockerjava/api/model/UpdateConfig.java    |  0
 .../api/model/UpdateContainerResponse.java    |  0
 .../api/model/UpdateFailureAction.java        |  0
 .../dockerjava/api/model/UpdateOrder.java     |  0
 .../github/dockerjava/api/model/Version.java  |  0
 .../api/model/VersionComponent.java           |  0
 .../dockerjava/api/model/VersionPlatform.java |  0
 .../github/dockerjava/api/model/Volume.java   |  0
 .../dockerjava/api/model/VolumeBind.java      |  0
 .../dockerjava/api/model/VolumeBinds.java     |  0
 .../dockerjava/api/model/VolumeOptions.java   |  0
 .../github/dockerjava/api/model/VolumeRW.java |  0
 .../github/dockerjava/api/model/Volumes.java  |  0
 .../dockerjava/api/model/VolumesFrom.java     |  0
 .../dockerjava/api/model/VolumesRW.java       |  0
 .../dockerjava/api/model/WaitResponse.java    |  0
 .../dockerjava/core/DockerClientConfig.java   |  0
 .../dockerjava/core/RemoteApiVersion.java     |  0
 .../com/github/dockerjava/core/SSLConfig.java |  0
 docker-java/pom.xml                           |  5 ++
 pom.xml                                       |  2 +
 271 files changed, 70 insertions(+)
 create mode 100644 docker-java-api/pom.xml
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/DockerClient.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/async/ResultCallback.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/AuthCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/CommitCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/DockerCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/DockerCmdSyncExec.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/EventsCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/GraphData.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/GraphDriver.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/HealthState.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/InfoCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/InitializeSwarmCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/InspectServiceCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/InspectSwarmCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/InspectTaskCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/JoinSwarmCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/LeaveSwarmCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/ListTasksCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/LoadImageCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/LogSwarmObjectCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/PingCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/PruneCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/RemoveSecretCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/RemoveServiceCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/RootFS.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/StatsCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/UpdateSwarmCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/VersionCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/exception/BadRequestException.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/exception/ConflictException.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/exception/DockerClientException.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/exception/DockerException.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/exception/InternalServerErrorException.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/exception/NotAcceptableException.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/exception/NotFoundException.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/exception/NotModifiedException.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/exception/UnauthorizedException.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/AccessMode.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/AuthConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/AuthResponse.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Bind.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/BindOptions.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/BindPropagation.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Binds.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Capability.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ChangeLog.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Container.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ContainerMount.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ContainerPort.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Device.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Driver.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/DriverStatus.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Endpoint.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Event.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/EventActor.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/EventType.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ExposedPort.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ExternalCA.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Frame.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/GenericResource.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/HealthCheck.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/HostConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Identifier.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Image.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Info.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Isolation.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Link.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Links.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/LocalNodeState.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/LogConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/LxcConf.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Mount.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/MountType.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Network.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Node.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/PeerNode.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/PortBinding.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/PortConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Ports.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/PropagationMode.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/PruneResponse.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/PruneType.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Reachability.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Repository.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ResponseItem.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SELContext.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SearchItem.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Secret.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SecretSpec.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Service.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ServiceMode.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Statistics.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/StatsConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/StreamType.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Swarm.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SwarmNode.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SwarmNodeState.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Task.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/TaskSpec.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/TaskState.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/TaskStatus.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Ulimit.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/UpdateOrder.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Version.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/VersionComponent.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Volume.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/VolumeBind.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/VolumeRW.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/Volumes.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/VolumesRW.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/api/model/WaitResponse.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/core/DockerClientConfig.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java (100%)
 rename {docker-java => docker-java-api}/src/main/java/com/github/dockerjava/core/SSLConfig.java (100%)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
new file mode 100644
index 000000000..a8b2328f0
--- /dev/null
+++ b/docker-java-api/pom.xml
@@ -0,0 +1,63 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.github.docker-java</groupId>
+		<artifactId>docker-java-parent</artifactId>
+		<version>3.1.6-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>docker-java-api</artifactId>
+	<packaging>bundle</packaging>
+
+	<name>docker-java-api</name>
+	<url>https://github.com/docker-java/docker-java</url>
+	<description>Java API Client for Docker</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>${commons-lang.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>${commons-codec.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>${guava.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.google.code.findbugs</groupId>
+			<artifactId>annotations</artifactId>
+			<version>3.0.1u2</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Export-Package>com.github.dockerjava.api.*</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/DockerClient.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/DockerClient.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/async/ResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/AuthCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CommitCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmdSyncExec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdSyncExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmdSyncExec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdSyncExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/EventsCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/GraphData.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/GraphData.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/GraphDriver.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/HealthState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/HealthState.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InfoCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InitializeSwarmCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InitializeSwarmCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InitializeSwarmCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InitializeSwarmCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectServiceCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectServiceCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectServiceCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectServiceCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectSwarmCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectSwarmCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectSwarmCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectSwarmCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectTaskCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectTaskCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectTaskCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectTaskCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/JoinSwarmCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/JoinSwarmCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/JoinSwarmCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/JoinSwarmCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/LeaveSwarmCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LeaveSwarmCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/LeaveSwarmCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/LeaveSwarmCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ListTasksCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListTasksCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ListTasksCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ListTasksCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/LoadImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/LoadImageCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/LogSwarmObjectCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LogSwarmObjectCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/LogSwarmObjectCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/LogSwarmObjectCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/PingCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PingCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/PingCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/PingCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/PruneCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PruneCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/PruneCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/PruneCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/RemoveSecretCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSecretCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/RemoveSecretCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSecretCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/RemoveServiceCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveServiceCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/RemoveServiceCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveServiceCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/RootFS.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/RootFS.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/StatsCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/UpdateSwarmCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateSwarmCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/UpdateSwarmCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateSwarmCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/VersionCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/exception/BadRequestException.java b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/BadRequestException.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/exception/BadRequestException.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/exception/BadRequestException.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/exception/ConflictException.java b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/ConflictException.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/exception/ConflictException.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/exception/ConflictException.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/exception/DockerClientException.java b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/DockerClientException.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/exception/DockerClientException.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/exception/DockerClientException.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/exception/DockerException.java b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/DockerException.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/exception/DockerException.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/exception/DockerException.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/exception/InternalServerErrorException.java b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/InternalServerErrorException.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/exception/InternalServerErrorException.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/exception/InternalServerErrorException.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/exception/NotAcceptableException.java b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/NotAcceptableException.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/exception/NotAcceptableException.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/exception/NotAcceptableException.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/exception/NotFoundException.java b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/NotFoundException.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/exception/NotFoundException.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/exception/NotFoundException.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/exception/NotModifiedException.java b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/NotModifiedException.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/exception/NotModifiedException.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/exception/NotModifiedException.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/exception/UnauthorizedException.java b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/UnauthorizedException.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/exception/UnauthorizedException.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/exception/UnauthorizedException.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/AccessMode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AccessMode.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/AccessMode.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/AccessMode.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/AuthResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Bind.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Bind.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/BindOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/BindOptions.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/BindPropagation.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindPropagation.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/BindPropagation.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/BindPropagation.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Binds.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Binds.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Capability.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Capability.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ChangeLog.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Container.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Container.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerMount.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerPort.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Device.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Device.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Driver.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Driver.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/DriverStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Endpoint.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Endpoint.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Event.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Event.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/EventActor.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventActor.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/EventActor.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/EventActor.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/EventType.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventType.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/EventType.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/EventType.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ExposedPort.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ExternalCA.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Frame.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Frame.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Frame.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Frame.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/GenericResource.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/GenericResource.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/GenericResource.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/GenericResource.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/HealthCheck.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/HostConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Identifier.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Identifier.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Image.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Image.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Info.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Info.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Isolation.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Isolation.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Isolation.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Isolation.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Link.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Link.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Link.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Link.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Links.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Links.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/LocalNodeState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LocalNodeState.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/LocalNodeState.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/LocalNodeState.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/LogConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/LxcConf.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/LxcConf.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Mount.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Mount.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/MountType.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/MountType.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Network.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Network.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Node.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Node.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/PeerNode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/PeerNode.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/PortBinding.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortBinding.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/PortBinding.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/PortBinding.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/PortConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/PortConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Ports.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Ports.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/PropagationMode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PropagationMode.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/PropagationMode.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/PropagationMode.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/PruneResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/PruneResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/PruneType.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneType.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/PruneType.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneType.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Reachability.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Reachability.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Reachability.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Reachability.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Repository.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Repository.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SELContext.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SELContext.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SELContext.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SELContext.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SearchItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SearchItem.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Secret.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Secret.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SecretSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Service.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Service.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceMode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceMode.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ServiceMode.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceMode.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Statistics.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Statistics.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/StatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/StatsConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/StreamType.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StreamType.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/StreamType.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/StreamType.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Swarm.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Swarm.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Swarm.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Swarm.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeState.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeState.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeState.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Task.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Task.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/TaskSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/TaskState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskState.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/TaskState.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskState.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/TaskStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Ulimit.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Ulimit.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/UpdateOrder.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateOrder.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/UpdateOrder.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateOrder.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Version.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Version.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/VersionComponent.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Volume.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Volume.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/VolumeBind.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBind.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/VolumeBind.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBind.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/VolumeRW.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Volumes.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Volumes.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/VolumesRW.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/WaitResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
rename to docker-java-api/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/SSLConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/core/SSLConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/SSLConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/core/SSLConfig.java
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index b9fede875..5a5cc22c2 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -16,6 +16,11 @@
 	<description>Java API Client for Docker</description>
 
 	<dependencies>
+		<dependency>
+			<groupId>${groupId}</groupId>
+			<artifactId>docker-java-api</artifactId>
+			<version>${version}</version>
+		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.jaxrs</groupId>
 			<artifactId>jackson-jaxrs-json-provider</artifactId>
diff --git a/pom.xml b/pom.xml
index 400cfec2b..edc09f0dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,7 @@
 		<jdk.target>1.7</jdk.target>
 
 		<jersey.version>2.27</jersey.version>
+		<jackson.version>2.9.8</jackson.version>
 		<jackson-jaxrs.version>2.9.8</jackson-jaxrs.version>
 		<httpclient.version>4.5.6</httpclient.version><!-- 4.5.1-4.5.2 broken -->
 		<commons-compress.version>1.19</commons-compress.version>
@@ -90,6 +91,7 @@
 	</properties>
 
 	<modules>
+		<module>docker-java-api</module>
 		<module>docker-java</module>
 	</modules>
 

From 83df4083db040f028d8566d8c0f701aa49ee077b Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Thu, 26 Sep 2019 20:11:05 +0300
Subject: [PATCH 0935/1272] Use Java 8 (#1249)

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index edc09f0dd..ed00423dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,8 +54,8 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<jdk.debug>true</jdk.debug>
 		<jdk.optimize>false</jdk.optimize>
-		<jdk.source>1.7</jdk.source>
-		<jdk.target>1.7</jdk.target>
+		<jdk.source>1.8</jdk.source>
+		<jdk.target>1.8</jdk.target>
 
 		<jersey.version>2.27</jersey.version>
 		<jackson.version>2.9.8</jackson.version>

From 89cdae2c3387bf0567e084617a11d69993cb35d4 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Fri, 27 Sep 2019 22:36:41 +0300
Subject: [PATCH 0936/1272] Use Java 8 features (#1250)

* Use Java 8 features

* remove unused imports
---
 .../github/dockerjava/api/model/Binds.java    |   2 +-
 .../dockerjava/api/model/ExposedPorts.java    |   2 +-
 .../github/dockerjava/api/model/Links.java    |   2 +-
 .../github/dockerjava/api/model/Ports.java    |   2 +-
 .../dockerjava/api/model/VolumeBinds.java     |   2 +-
 .../github/dockerjava/api/model/Volumes.java  |   2 +-
 .../dockerjava/api/model/VolumesRW.java       |   2 +-
 .../core/DefaultDockerClientConfig.java       |   2 +-
 .../dockerjava/core/DockerConfigFile.java     |   2 +-
 .../dockerjava/core/GoLangFileMatch.java      |   2 +-
 .../core/LocalDirectorySSLConfig.java         |   7 +-
 .../core/command/BuildImageCmdImpl.java       |   2 +-
 .../core/dockerfile/Dockerfile.java           |   6 +-
 .../core/dockerfile/DockerfileStatement.java  |  27 ++--
 .../dockerjava/core/util/FiltersBuilder.java  |   4 +-
 .../core/util/SwarmNodesFiltersBuilder.java   |   2 +-
 .../dockerjava/jaxrs/ApacheUnixSocket.java    |  58 ++------
 .../jaxrs/AttachContainerCmdExec.java         |   2 +-
 .../dockerjava/jaxrs/EventsCmdExec.java       |   2 +-
 .../dockerjava/jaxrs/ExecStartCmdExec.java    |   2 +-
 .../dockerjava/jaxrs/LogContainerCmdExec.java |   2 +-
 .../dockerjava/jaxrs/LogSwarmObjectExec.java  |   2 +-
 .../dockerjava/jaxrs/PullImageCmdExec.java    |   2 +-
 .../dockerjava/jaxrs/PushImageCmdExec.java    |   2 +-
 .../github/dockerjava/jaxrs/StatsCmdExec.java |   2 +-
 .../jaxrs/WaitContainerCmdExec.java           |   4 +-
 .../jaxrs/filter/LoggingFilter.java           |  10 +-
 .../jaxrs/filter/SelectiveLoggingFilter.java  |   2 +-
 .../netty/NettyDockerCmdExecFactory.java      |  28 +---
 .../netty/NettyInvocationBuilder.java         |  60 ++------
 .../dockerjava/netty/NettyWebTarget.java      |   9 +-
 .../netty/handler/HttpResponseHandler.java    |   8 +-
 .../http/impl/io/ChunkedInputStream.java      |   4 +-
 .../dockerjava/cmd/CreateContainerCmdIT.java  |   2 +-
 .../github/dockerjava/cmd/EventsCmdIT.java    |   4 +-
 .../dockerjava/cmd/UpdateContainerCmdIT.java  |   1 -
 .../cmd/swarm/CreateSecretCmdExecIT.java      |  21 ---
 .../cmd/swarm/ListSecretCmdExecIT.java        |   2 -
 .../core/DefaultDockerClientConfigTest.java   |   4 +-
 .../core/DockerClientBuilderTest.java         |  32 ++---
 .../core/TestDockerCmdExecFactory.java        | 132 +++++++-----------
 .../core/async/JsonStreamProcessorTest.java   |   4 +-
 .../core/command/FrameReaderITest.java        |  21 ++-
 .../DockerfileAddMultipleFilesTest.java       |   7 +-
 .../core/util/CompressArchiveUtilTest.java    |   2 +-
 .../dockerjava/junit/DockerMatchers.java      |   2 +-
 .../FramedResponseStreamHandlerTest.java      |   4 +-
 .../HttpResponseStreamHandlerTest.java        |  17 +--
 .../utils/LogContainerTestCallback.java       |   2 +-
 49 files changed, 165 insertions(+), 359 deletions(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java
index b24c3208d..a7957a945 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java
@@ -55,7 +55,7 @@ public static class Deserializer extends JsonDeserializer<Binds> {
         public Binds deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
                 throws IOException, JsonProcessingException {
 
-            List<Bind> binds = new ArrayList<Bind>();
+            List<Bind> binds = new ArrayList<>();
             ObjectCodec oc = jsonParser.getCodec();
             JsonNode node = oc.readTree(jsonParser);
             for (Iterator<JsonNode> it = node.elements(); it.hasNext();) {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
index 7670212e1..c20e84cec 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
@@ -61,7 +61,7 @@ public static class Deserializer extends JsonDeserializer<ExposedPorts> {
         public ExposedPorts deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
                 throws IOException, JsonProcessingException {
 
-            List<ExposedPort> exposedPorts = new ArrayList<ExposedPort>();
+            List<ExposedPort> exposedPorts = new ArrayList<>();
             ObjectCodec oc = jsonParser.getCodec();
             JsonNode node = oc.readTree(jsonParser);
             for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java
index 1eb66ae42..1c32984ee 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java
@@ -57,7 +57,7 @@ public static class Deserializer extends JsonDeserializer<Links> {
         @Override
         public Links deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext)
                 throws IOException, JsonProcessingException {
-            final List<Link> binds = new ArrayList<Link>();
+            final List<Link> binds = new ArrayList<>();
             final ObjectCodec oc = jsonParser.getCodec();
             final JsonNode node = oc.readTree(jsonParser);
             for (final Iterator<JsonNode> it = node.elements(); it.hasNext();) {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
index 673852d9e..f4c0b1841 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -39,7 +39,7 @@
 public class Ports implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    private final Map<ExposedPort, Binding[]> ports = new HashMap<ExposedPort, Binding[]>();
+    private final Map<ExposedPort, Binding[]> ports = new HashMap<>();
 
     /**
      * Creates a {@link Ports} object with no {@link PortBinding}s. Use {@link #bind(ExposedPort, Binding)} or {@link #add(PortBinding...)}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
index aeef19e9f..3c1d4ab47 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
@@ -54,7 +54,7 @@ public static final class Deserializer extends JsonDeserializer<VolumeBinds> {
         public VolumeBinds deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
                 throws IOException, JsonProcessingException {
 
-            List<VolumeBind> binds = new ArrayList<VolumeBind>();
+            List<VolumeBind> binds = new ArrayList<>();
             ObjectCodec oc = jsonParser.getCodec();
             JsonNode node = oc.readTree(jsonParser);
             for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java
index 3246b0e8e..b6844b987 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java
@@ -61,7 +61,7 @@ public static class Deserializer extends JsonDeserializer<Volumes> {
         public Volumes deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
                 throws IOException, JsonProcessingException {
 
-            List<Volume> volumes = new ArrayList<Volume>();
+            List<Volume> volumes = new ArrayList<>();
             ObjectCodec oc = jsonParser.getCodec();
             JsonNode node = oc.readTree(jsonParser);
             for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
index 1b12bd13d..8fcaffb8d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
@@ -55,7 +55,7 @@ public static final class Deserializer extends JsonDeserializer<VolumesRW> {
         public VolumesRW deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
                 throws IOException, JsonProcessingException {
 
-            List<VolumeRW> volumesRW = new ArrayList<VolumeRW>();
+            List<VolumeRW> volumesRW = new ArrayList<>();
             ObjectCodec oc = jsonParser.getCodec();
             JsonNode node = oc.readTree(jsonParser);
 
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index 3710f0e8c..063fbd3bf 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/docker-java/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -54,7 +54,7 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf
 
     private static final String DOCKER_JAVA_PROPERTIES = "docker-java.properties";
 
-    private static final Set<String> CONFIG_KEYS = new HashSet<String>();
+    private static final Set<String> CONFIG_KEYS = new HashSet<>();
 
     static {
         CONFIG_KEYS.add(DOCKER_HOST);
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/DockerConfigFile.java b/docker-java/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
index ac1e3cf28..e307fc990 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
+++ b/docker-java/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
@@ -33,7 +33,7 @@ public class DockerConfigFile {
     private final Map<String, AuthConfig> auths;
 
     public DockerConfigFile() {
-        this(new HashMap<String, AuthConfig>());
+        this(new HashMap<>());
     }
 
     private DockerConfigFile(Map<String, AuthConfig> authConfigMap) {
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/docker-java/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index b26b7db44..445c00120 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/docker-java/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -64,7 +64,7 @@ public static boolean match(String pattern, File file) {
      * Returns the matching patterns for the given string
      */
     public static List<String> match(List<String> patterns, String name) {
-        List<String> matches = new ArrayList<String>();
+        List<String> matches = new ArrayList<>();
         for (String pattern : patterns) {
             if (match(pattern, name)) {
                 matches.add(pattern);
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/docker-java/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
index 006d89c6c..6e39f4f94 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
+++ b/docker-java/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
@@ -82,12 +82,7 @@ public SSLContext getSSLContext() {
     }
 
     private PrivilegedAction<String> getSystemProperty(final String name, final String def) {
-        return new PrivilegedAction<String>() {
-            @Override
-            public String run() {
-                return System.getProperty(name, def);
-            }
-        };
+        return () -> System.getProperty(name, def);
     }
 
     @Override
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/docker-java/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index 0384ba145..cf24c0014 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/docker-java/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -306,7 +306,7 @@ public BuildImageCmd withCpusetcpus(String cpusetcpus) {
     @Override
     public BuildImageCmd withBuildArg(String key, String value) {
         if (this.buildArgs == null) {
-            this.buildArgs = new HashMap<String, String>();
+            this.buildArgs = new HashMap<>();
         }
         this.buildArgs.put(key, value);
         return this;
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/docker-java/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 46f6a00c2..752935e19 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/docker-java/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -84,7 +84,7 @@ public Iterable<DockerfileStatement> getStatements() throws IOException {
     }
 
     public List<String> getIgnores() throws IOException {
-        List<String> ignores = new ArrayList<String>();
+        List<String> ignores = new ArrayList<>();
         File dockerIgnoreFile = new File(baseDirectory, ".dockerignore");
         if (dockerIgnoreFile.exists()) {
             int lineNumber = 0;
@@ -118,7 +118,7 @@ public class ScannedResult {
 
         final List<String> ignores;
 
-        final List<File> filesToAdd = new ArrayList<File>();
+        final List<File> filesToAdd = new ArrayList<>();
 
         public InputStream buildDockerFolderTar() {
             return buildDockerFolderTar(baseDirectory);
@@ -224,7 +224,7 @@ private boolean isBaseDirectory(File directory) {
          * Returns all matching ignore patterns for the given file name.
          */
         private List<String> matchingIgnorePatterns(String fileName) {
-            List<String> matches = new ArrayList<String>();
+            List<String> matches = new ArrayList<>();
 
             int lineNumber = 0;
             for (String pattern : ignores) {
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java b/docker-java/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
index 3f14db05a..aefff137d 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
+++ b/docker-java/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
@@ -11,10 +11,8 @@
 import org.apache.commons.lang.StringUtils;
 
 import com.github.dockerjava.api.exception.DockerClientException;
-import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 
 /**
@@ -92,28 +90,19 @@ private Add(Collection<String> sources, String destination) {
 
         @Override
         public Add transform(final Map<String, String> env) {
-            Collection<String> resources = Collections2.transform(sources, new Function<String, String>() {
-                @Override
-                public String apply(String source) {
-                    return filterForEnvironmentVars(env, source).trim();
-                }
-            });
+            Collection<String> resources = Collections2.transform(sources, source -> filterForEnvironmentVars(env, source).trim());
             return new Add(resources, destination);
         }
 
         public Iterable<String> getFileResources() {
-            return Collections2.filter(sources, new Predicate<String>() {
-
-                @Override
-                public boolean apply(String source) {
-                    URI uri;
-                    try {
-                        uri = new URI(source);
-                    } catch (URISyntaxException e) {
-                        return false;
-                    }
-                    return uri.getScheme() == null || "file".equals(uri.getScheme());
+            return Collections2.filter(sources, source -> {
+                URI uri;
+                try {
+                    uri = new URI(source);
+                } catch (URISyntaxException e) {
+                    return false;
                 }
+                return uri.getScheme() == null || "file".equals(uri.getScheme());
             });
         }
 
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java b/docker-java/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
index d942e59e0..73b369ca7 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
+++ b/docker-java/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
@@ -27,7 +27,7 @@ public class FiltersBuilder {
     private static final Pattern UNTIL_GO_PATTERN =
             Pattern.compile("^([1-9][0-9]*h)?([1-9][0-9]*m)?([1-9][0-9]*s)?$");
 
-    private Map<String, List<String>> filters = new HashMap<String, List<String>>();
+    private Map<String, List<String>> filters = new HashMap<>();
 
     public FiltersBuilder() {
     }
@@ -95,7 +95,7 @@ public FiltersBuilder withUntil(String until) throws NumberFormatException {
     }
 
     private static List<String> labelsMapToList(Map<String, String> labels) {
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
         for (Entry<String, String> entry : labels.entrySet()) {
             String rest = (entry.getValue() != null & !entry.getValue().isEmpty()) ? "=" + entry.getValue() : "";
 
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java b/docker-java/src/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java
index 3473aa828..02a4bc8fc 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java
+++ b/docker-java/src/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java
@@ -11,7 +11,7 @@
  */
 public class SwarmNodesFiltersBuilder {
 
-    private Map<String, List<String>> filters = new HashMap<String, List<String>>();
+    private Map<String, List<String>> filters = new HashMap<>();
 
     public SwarmNodesFiltersBuilder() {
 
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
index a1b860b28..50459de8c 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
@@ -45,7 +45,7 @@ public class ApacheUnixSocket extends Socket {
 
     private final AFUNIXSocket inner;
 
-    private final Queue<SocketOptionSetter> optionsToSet = new ArrayDeque<SocketOptionSetter>();
+    private final Queue<SocketOptionSetter> optionsToSet = new ArrayDeque<>();
 
     public ApacheUnixSocket() throws IOException {
         this.inner = AFUNIXSocket.newInstance();
@@ -132,12 +132,7 @@ private void setAllSocketOptions() throws SocketException {
 
     @Override
     public void setTcpNoDelay(final boolean on) throws SocketException {
-        setSocketOption(new SocketOptionSetter() {
-            @Override
-            public void run() throws SocketException {
-                inner.setTcpNoDelay(on);
-            }
-        });
+        setSocketOption(() -> inner.setTcpNoDelay(on));
     }
 
     @Override
@@ -147,12 +142,7 @@ public boolean getTcpNoDelay() throws SocketException {
 
     @Override
     public void setSoLinger(final boolean on, final int linger) throws SocketException {
-        setSocketOption(new SocketOptionSetter() {
-            @Override
-            public void run() throws SocketException {
-                inner.setSoLinger(on, linger);
-            }
-        });
+        setSocketOption(() -> inner.setSoLinger(on, linger));
     }
 
     @Override
@@ -167,12 +157,7 @@ public void sendUrgentData(final int data) throws IOException {
 
     @Override
     public void setOOBInline(final boolean on) throws SocketException {
-        setSocketOption(new SocketOptionSetter() {
-            @Override
-            public void run() throws SocketException {
-                inner.setOOBInline(on);
-            }
-        });
+        setSocketOption(() -> inner.setOOBInline(on));
     }
 
     @Override
@@ -182,12 +167,7 @@ public boolean getOOBInline() throws SocketException {
 
     @Override
     public synchronized void setSoTimeout(final int timeout) throws SocketException {
-        setSocketOption(new SocketOptionSetter() {
-            @Override
-            public void run() throws SocketException {
-                inner.setSoTimeout(timeout);
-            }
-        });
+        setSocketOption(() -> inner.setSoTimeout(timeout));
     }
 
     @Override
@@ -197,12 +177,7 @@ public synchronized int getSoTimeout() throws SocketException {
 
     @Override
     public synchronized void setSendBufferSize(final int size) throws SocketException {
-        setSocketOption(new SocketOptionSetter() {
-            @Override
-            public void run() throws SocketException {
-                inner.setSendBufferSize(size);
-            }
-        });
+        setSocketOption(() -> inner.setSendBufferSize(size));
     }
 
     @Override
@@ -212,12 +187,7 @@ public synchronized int getSendBufferSize() throws SocketException {
 
     @Override
     public synchronized void setReceiveBufferSize(final int size) throws SocketException {
-        setSocketOption(new SocketOptionSetter() {
-            @Override
-            public void run() throws SocketException {
-                inner.setReceiveBufferSize(size);
-            }
-        });
+        setSocketOption(() -> inner.setReceiveBufferSize(size));
     }
 
     @Override
@@ -227,12 +197,7 @@ public synchronized int getReceiveBufferSize() throws SocketException {
 
     @Override
     public void setKeepAlive(final boolean on) throws SocketException {
-        setSocketOption(new SocketOptionSetter() {
-            @Override
-            public void run() throws SocketException {
-                inner.setKeepAlive(on);
-            }
-        });
+        setSocketOption(() -> inner.setKeepAlive(on));
     }
 
     @Override
@@ -242,12 +207,7 @@ public boolean getKeepAlive() throws SocketException {
 
     @Override
     public void setTrafficClass(final int tc) throws SocketException {
-        setSocketOption(new SocketOptionSetter() {
-            @Override
-            public void run() throws SocketException {
-                inner.setTrafficClass(tc);
-            }
-        });
+        setSocketOption(() -> inner.setTrafficClass(tc));
     }
 
     @Override
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
index c21c305df..6131d48a1 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
@@ -41,6 +41,6 @@ protected AbstractCallbackNotifier<Frame> callbackNotifier(AttachContainerCmd co
 
         LOGGER.trace("POST: {}", webTarget);
 
-        return new POSTCallbackNotifier<Frame>(new FrameStreamProcessor(), resultCallback, webTarget.request(), null);
+        return new POSTCallbackNotifier<>(new FrameStreamProcessor(), resultCallback, webTarget.request(), null);
     }
 }
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
index 3d4c8dc17..090fca8ac 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -36,7 +36,7 @@ protected AbstractCallbackNotifier<Event> callbackNotifier(EventsCmd command, Re
 
         LOGGER.trace("GET: {}", webTarget);
 
-        return new GETCallbackNotifier<Event>(new JsonStreamProcessor<Event>(Event.class), resultCallback,
+        return new GETCallbackNotifier<>(new JsonStreamProcessor<>(Event.class), resultCallback,
                 webTarget.request());
     }
 }
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
index dc7cf6598..291cc2212 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
@@ -30,7 +30,7 @@ protected AbstractCallbackNotifier<Frame> callbackNotifier(ExecStartCmd command,
 
         LOGGER.trace("POST: {}", webTarget);
 
-        return new POSTCallbackNotifier<Frame>(new FrameStreamProcessor(), resultCallback, webTarget.request().accept(
+        return new POSTCallbackNotifier<>(new FrameStreamProcessor(), resultCallback, webTarget.request().accept(
                 MediaType.APPLICATION_JSON), entity(command, MediaType.APPLICATION_JSON));
     }
 }
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
index 87bc83b98..19c2b24b0 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
@@ -44,6 +44,6 @@ protected AbstractCallbackNotifier<Frame> callbackNotifier(LogContainerCmd comma
 
         LOGGER.trace("GET: {}", webTarget);
 
-        return new GETCallbackNotifier<Frame>(new FrameStreamProcessor(), resultCallback, webTarget.request());
+        return new GETCallbackNotifier<>(new FrameStreamProcessor(), resultCallback, webTarget.request());
     }
 }
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java
index 4f59893b2..2fb731005 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java
@@ -45,6 +45,6 @@ protected AbstractCallbackNotifier<Frame> callbackNotifier(LogSwarmObjectCmd com
         webTarget = booleanQueryParam(webTarget, "details", command.getDetails());
         LOGGER.trace("GET: {}", webTarget);
 
-        return new GETCallbackNotifier<Frame>(new FrameStreamProcessor(), resultCallback, webTarget.request());
+        return new GETCallbackNotifier<>(new FrameStreamProcessor(), resultCallback, webTarget.request());
     }
 }
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
index 70e1d0aac..70cde2ee3 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
@@ -40,7 +40,7 @@ protected AbstractCallbackNotifier<PullResponseItem> callbackNotifier(PullImageC
         Builder builder = resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request()).accept(
                 MediaType.APPLICATION_OCTET_STREAM_TYPE);
 
-        return new POSTCallbackNotifier<PullResponseItem>(new JsonStreamProcessor<PullResponseItem>(
+        return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(
                 PullResponseItem.class), resultCallback, builder, entity(null, MediaType.APPLICATION_JSON));
     }
 }
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
index 906487c6c..d5da2915b 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
@@ -44,7 +44,7 @@ protected AbstractCallbackNotifier<PushResponseItem> callbackNotifier(PushImageC
         Builder builder = resourceWithAuthConfig(command.getAuthConfig(), webResource.request())
                 .accept(MediaType.APPLICATION_JSON);
 
-        return new POSTCallbackNotifier<PushResponseItem>(new JsonStreamProcessor<PushResponseItem>(
+        return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(
                 PushResponseItem.class), resultCallback, builder, entity(null, MediaType.APPLICATION_JSON));
     }
 }
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
index 8a604603a..4358e00fe 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
@@ -29,7 +29,7 @@ protected AbstractCallbackNotifier<Statistics> callbackNotifier(StatsCmd command
 
         LOGGER.trace("GET: {}", webTarget);
 
-        return new GETCallbackNotifier<Statistics>(new JsonStreamProcessor<Statistics>(Statistics.class),
+        return new GETCallbackNotifier<>(new JsonStreamProcessor<>(Statistics.class),
                 resultCallback, webTarget.request());
     }
 }
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
index 06bd40edc..2d5b64917 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
@@ -34,9 +34,9 @@ protected AbstractCallbackNotifier<WaitResponse> callbackNotifier(WaitContainerC
 
         LOGGER.trace("POST: {}", webResource);
 
-        return new POSTCallbackNotifier<WaitResponse>(new JsonStreamProcessor<WaitResponse>(WaitResponse.class),
+        return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(WaitResponse.class),
                 resultCallback, webResource.request().accept(MediaType.APPLICATION_JSON), entity(null,
-                        MediaType.APPLICATION_JSON));
+                MediaType.APPLICATION_JSON));
     }
 
 }
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
index 8c9848318..9a0297fdb 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
@@ -95,13 +95,7 @@ public class LoggingFilter implements ContainerRequestFilter, ClientRequestFilte
 
     private static final String ENTITY_LOGGER_PROPERTY = LoggingFilter.class.getName() + ".entityLogger";
 
-    private static final Comparator<Map.Entry<String, List<String>>> COMPARATOR = new Comparator<Map.Entry<String, List<String>>>() {
-
-        @Override
-        public int compare(final Map.Entry<String, List<String>> o1, final Map.Entry<String, List<String>> o2) {
-            return o1.getKey().compareToIgnoreCase(o2.getKey());
-        }
-    };
+    private static final Comparator<Map.Entry<String, List<String>>> COMPARATOR = (o1, o2) -> o1.getKey().compareToIgnoreCase(o2.getKey());
 
     private static final int DEFAULT_MAX_ENTITY_SIZE = 8 * 1024;
 
@@ -202,7 +196,7 @@ private void printPrefixedHeaders(final StringBuilder b, final long id, final St
     }
 
     private Set<Map.Entry<String, List<String>>> getSortedHeaders(final Set<Map.Entry<String, List<String>>> headers) {
-        final TreeSet<Map.Entry<String, List<String>>> sortedHeaders = new TreeSet<Map.Entry<String, List<String>>>(
+        final TreeSet<Map.Entry<String, List<String>>> sortedHeaders = new TreeSet<>(
                 COMPARATOR);
         sortedHeaders.addAll(headers);
         return sortedHeaders;
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
index 36256fca0..9612011fa 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
+++ b/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
@@ -21,7 +21,7 @@ public class SelectiveLoggingFilter extends LoggingFilter {
     // Immutable'ish
     private static final Set<String> SKIPPED_CONTENT;
     static {
-        Set<String> s = new HashSet<String>();
+        Set<String> s = new HashSet<>();
         s.add(MediaType.APPLICATION_OCTET_STREAM);
         s.add("application/tar");
         s.add("application/x-tar");
diff --git a/docker-java/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/docker-java/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index ecb40fa95..ae575380e 100644
--- a/docker-java/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/docker-java/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -15,8 +15,6 @@
 
 import com.github.dockerjava.core.AbstractDockerCmdExecFactory;
 import com.github.dockerjava.core.WebTarget;
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.GenericFutureListener;
 import org.apache.commons.lang.SystemUtils;
 
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
@@ -151,12 +149,7 @@ public EventLoopGroup init(Bootstrap bootstrap, DockerClientConfig dockerClientC
         public EventLoopGroup epollGroup() {
             EventLoopGroup epollEventLoopGroup = new EpollEventLoopGroup(0, new DefaultThreadFactory(threadPrefix));
 
-            ChannelFactory<EpollDomainSocketChannel> factory = new ChannelFactory<EpollDomainSocketChannel>() {
-                @Override
-                public EpollDomainSocketChannel newChannel() {
-                    return configure(new EpollDomainSocketChannel());
-                }
-            };
+            ChannelFactory<EpollDomainSocketChannel> factory = () -> configure(new EpollDomainSocketChannel());
 
             bootstrap.group(epollEventLoopGroup).channelFactory(factory).handler(new ChannelInitializer<UnixChannel>() {
                 @Override
@@ -204,12 +197,7 @@ public EventLoopGroup init(Bootstrap bootstrap, final DockerClientConfig dockerC
 
             Security.addProvider(new BouncyCastleProvider());
 
-            ChannelFactory<NioSocketChannel> factory = new ChannelFactory<NioSocketChannel>() {
-                @Override
-                public NioSocketChannel newChannel() {
-                    return configure(new NioSocketChannel());
-                }
-            };
+            ChannelFactory<NioSocketChannel> factory = () -> configure(new NioSocketChannel());
 
             bootstrap.group(nioEventLoopGroup).channelFactory(factory)
                     .handler(new ChannelInitializer<SocketChannel>() {
@@ -252,17 +240,7 @@ public DuplexChannel connect(Bootstrap bootstrap) throws InterruptedException {
                 // in sun.security.ssl.SSLEngineImpl and unfortunately it does not send this
                 // message. On the other hand RFC does not enforce the opposite side to wait for
                 // such message.
-                ssl.sslCloseFuture().addListener(new GenericFutureListener<Future<? super Channel>>() {
-                    @Override
-                    public void operationComplete(Future<? super Channel> future) {
-                        channel.eventLoop().execute(new Runnable() {
-                            @Override
-                            public void run() {
-                                channel.close();
-                            }
-                        });
-                    }
-                });
+                ssl.sslCloseFuture().addListener(future -> channel.eventLoop().execute(channel::close));
             }
 
             return channel;
diff --git a/docker-java/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java b/docker-java/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
index c57f885be..902dc24cf 100644
--- a/docker-java/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
+++ b/docker-java/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
@@ -34,8 +34,6 @@
 import io.netty.handler.codec.json.JsonObjectDecoder;
 import io.netty.handler.stream.ChunkedStream;
 import io.netty.handler.stream.ChunkedWriteHandler;
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.GenericFutureListener;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
@@ -80,7 +78,7 @@ public void onNext(Void object) {
 
     private String resource;
 
-    private Map<String, String> headers = new HashMap<String, String>();
+    private Map<String, String> headers = new HashMap<>();
 
     public NettyInvocationBuilder(ChannelProvider channelProvider, String resource) {
         this.channelProvider = channelProvider;
@@ -101,7 +99,7 @@ public void delete() {
 
         HttpRequestProvider requestProvider = httpDeleteRequestProvider();
 
-        ResponseCallback<Void> callback = new ResponseCallback<Void>();
+        ResponseCallback<Void> callback = new ResponseCallback<>();
 
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, callback);
 
@@ -132,7 +130,7 @@ public void get(ResultCallback<Frame> resultCallback) {
 
     public <T> T get(TypeReference<T> typeReference) {
 
-        ResponseCallback<T> callback = new ResponseCallback<T>();
+        ResponseCallback<T> callback = new ResponseCallback<>();
 
         get(typeReference, callback);
 
@@ -145,7 +143,7 @@ public <T> void get(TypeReference<T> typeReference, ResultCallback<T> resultCall
 
         Channel channel = getChannel();
 
-        JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<T>(typeReference,
+        JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<>(typeReference,
                 resultCallback);
 
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
@@ -164,39 +162,19 @@ private DuplexChannel getChannel() {
     }
 
     private HttpRequestProvider httpDeleteRequestProvider() {
-        return new HttpRequestProvider() {
-            @Override
-            public HttpRequest getHttpRequest(String uri) {
-                return prepareDeleteRequest(uri);
-            }
-        };
+        return this::prepareDeleteRequest;
     }
 
     private HttpRequestProvider httpGetRequestProvider() {
-        return new HttpRequestProvider() {
-            @Override
-            public HttpRequest getHttpRequest(String uri) {
-                return prepareGetRequest(uri);
-            }
-        };
+        return this::prepareGetRequest;
     }
 
     private HttpRequestProvider httpPostRequestProvider(final Object entity) {
-        return new HttpRequestProvider() {
-            @Override
-            public HttpRequest getHttpRequest(String uri) {
-                return preparePostRequest(uri, entity);
-            }
-        };
+        return uri -> preparePostRequest(uri, entity);
     }
 
     private HttpRequestProvider httpPutRequestProvider(final Object entity) {
-        return new HttpRequestProvider() {
-            @Override
-            public HttpRequest getHttpRequest(String uri) {
-                return preparePutRequest(uri, entity);
-            }
-        };
+        return uri -> preparePutRequest(uri, entity);
     }
 
     public InputStream post(final Object entity) {
@@ -227,12 +205,7 @@ public void post(final Object entity, final InputStream stdin, final ResultCallb
         final DuplexChannel channel = getChannel();
 
         // result callback's close() method must be called when the servers closes the connection
-        channel.closeFuture().addListener(new GenericFutureListener<Future<? super Void>>() {
-            @Override
-            public void operationComplete(Future<? super Void> future) throws Exception {
-                resultCallback.onComplete();
-            }
-        });
+        channel.closeFuture().addListener(future -> resultCallback.onComplete());
 
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
 
@@ -281,7 +254,7 @@ public void run() {
 
     public <T> T post(final Object entity, TypeReference<T> typeReference) {
 
-        ResponseCallback<T> callback = new ResponseCallback<T>();
+        ResponseCallback<T> callback = new ResponseCallback<>();
 
         post(entity, typeReference, callback);
 
@@ -294,7 +267,7 @@ public <T> void post(final Object entity, TypeReference<T> typeReference, final
 
         Channel channel = getChannel();
 
-        JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<T>(typeReference,
+        JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<>(typeReference,
                 resultCallback);
 
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
@@ -370,10 +343,7 @@ private void sendRequest(HttpRequestProvider requestProvider, Channel channel) {
 
         ChannelFuture channelFuture = channel.writeAndFlush(requestProvider.getHttpRequest(resource));
 
-        channelFuture.addListener(new ChannelFutureListener() {
-            @Override
-            public void operationComplete(ChannelFuture future) throws Exception {
-            }
+        channelFuture.addListener((ChannelFutureListener) future -> {
         });
     }
 
@@ -389,7 +359,7 @@ private void setDefaultHeaders(HttpRequest request) {
 
     public <T> T post(TypeReference<T> typeReference, InputStream body) {
 
-        ResponseCallback<T> callback = new ResponseCallback<T>();
+        ResponseCallback<T> callback = new ResponseCallback<>();
 
         post(typeReference, callback, body);
 
@@ -401,7 +371,7 @@ public <T> void post(TypeReference<T> typeReference, ResultCallback<T> resultCal
 
         Channel channel = getChannel();
 
-        JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<T>(typeReference,
+        JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<>(typeReference,
                 resultCallback);
 
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
@@ -478,7 +448,7 @@ public void put(InputStream body, com.github.dockerjava.core.MediaType mediaType
 
         Channel channel = getChannel();
 
-        ResponseCallback<Void> resultCallback = new ResponseCallback<Void>();
+        ResponseCallback<Void> resultCallback = new ResponseCallback<>();
 
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
 
diff --git a/docker-java/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java b/docker-java/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
index 51f50f371..7d713849f 100644
--- a/docker-java/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
+++ b/docker-java/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
@@ -9,6 +9,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -158,16 +159,16 @@ public boolean equals(Object o) {
 
         NettyWebTarget webTarget = (NettyWebTarget) o;
 
-        if (channelProvider != null ? !channelProvider.equals(webTarget.channelProvider) : webTarget.channelProvider != null) {
+        if (!Objects.equals(channelProvider, webTarget.channelProvider)) {
             return false;
         }
-        if (path != null ? !path.equals(webTarget.path) : webTarget.path != null) {
+        if (!Objects.equals(path, webTarget.path)) {
             return false;
         }
-        if (queryParams != null ? !queryParams.equals(webTarget.queryParams) : webTarget.queryParams != null) {
+        if (!Objects.equals(queryParams, webTarget.queryParams)) {
             return false;
         }
-        if (queryParamsSet != null ? !queryParamsSet.equals(webTarget.queryParamsSet) : webTarget.queryParamsSet != null) {
+        if (!Objects.equals(queryParamsSet, webTarget.queryParamsSet)) {
             return false;
         }
 
diff --git a/docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java b/docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
index 9986e10e9..548742875 100644
--- a/docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
+++ b/docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
@@ -11,7 +11,6 @@
 import io.netty.handler.codec.http.HttpResponse;
 import io.netty.handler.codec.http.LastHttpContent;
 
-import java.io.Closeable;
 import java.nio.charset.Charset;
 
 import com.github.dockerjava.api.async.ResultCallback;
@@ -52,12 +51,7 @@ protected void channelRead0(final ChannelHandlerContext ctx, HttpObject msg) thr
 
             response = (HttpResponse) msg;
 
-            resultCallback.onStart(new Closeable() {
-                @Override
-                public void close() {
-                    ctx.channel().close();
-                }
-            });
+            resultCallback.onStart(() -> ctx.channel().close());
 
         } else if (msg instanceof HttpContent) {
 
diff --git a/docker-java/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java b/docker-java/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java
index 17c339e3e..e42465418 100644
--- a/docker-java/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java
+++ b/docker-java/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java
@@ -317,9 +317,7 @@ public void close() throws IOException {
                         while (read(buff) >= 0) {
                            continue;
                         }
-                    } catch (ConnectionClosedException e) {
-                        // just ignore
-                    } catch (TruncatedChunkException e) {
+                    } catch (ConnectionClosedException | TruncatedChunkException e) {
                         // just ignore
                     }
                 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index d197da5a8..d0e9c914b 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -831,7 +831,7 @@ public void createContainerWithULimits() throws DockerException {
     @Test
     public void createContainerWithLabels() throws DockerException {
 
-        Map<String, String> labels = new HashMap<String, String>();
+        Map<String, String> labels = new HashMap<>();
         labels.put("com.github.dockerjava.null", null);
         labels.put("com.github.dockerjava.Boolean", "true");
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java
index c40fa6d31..89a186c54 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java
@@ -140,7 +140,7 @@ private class EventsTestCallback extends EventsResultCallback {
 
         private final CountDownLatch countDownLatch;
 
-        private final List<Event> events = new ArrayList<Event>();
+        private final List<Event> events = new ArrayList<>();
 
         public EventsTestCallback(int expextedEvents) {
             this.countDownLatch = new CountDownLatch(expextedEvents);
@@ -159,7 +159,7 @@ public List<Event> awaitExpectedEvents(long timeout, TimeUnit unit) {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-            return new ArrayList<Event>(events);
+            return new ArrayList<>(events);
         }
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
index 9e937db52..66fbdfd95 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
@@ -6,7 +6,6 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.HostConfig;
-import com.github.dockerjava.api.model.UpdateContainerResponse;
 import com.github.dockerjava.core.command.UpdateContainerCmdImpl;
 import org.junit.Ignore;
 import org.junit.Test;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
index 429ec3c06..7fdfeb96e 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
@@ -2,24 +2,9 @@
 
 import com.github.dockerjava.api.command.CreateSecretResponse;
 import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.model.ContainerSpec;
-import com.github.dockerjava.api.model.EndpointResolutionMode;
-import com.github.dockerjava.api.model.EndpointSpec;
-import com.github.dockerjava.api.model.Mount;
-import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.api.model.NetworkAttachmentConfig;
-import com.github.dockerjava.api.model.PortConfig;
-import com.github.dockerjava.api.model.PortConfigProtocol;
 import com.github.dockerjava.api.model.Secret;
 import com.github.dockerjava.api.model.SecretSpec;
-import com.github.dockerjava.api.model.Service;
-import com.github.dockerjava.api.model.ServiceModeConfig;
-import com.github.dockerjava.api.model.ServiceReplicatedModeOptions;
-import com.github.dockerjava.api.model.ServiceSpec;
 import com.github.dockerjava.api.model.SwarmSpec;
-import com.github.dockerjava.api.model.TaskSpec;
-import com.github.dockerjava.api.model.TmpfsOptions;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang.RandomStringUtils;
 import org.hamcrest.collection.IsCollectionWithSize;
@@ -27,15 +12,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.nio.charset.Charset;
-import java.util.Collections;
 import java.util.List;
-import java.util.Random;
 
-import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 
 public class CreateSecretCmdExecIT extends SwarmCmdIT {
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java
index 14686f29a..bb779e7f3 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java
@@ -11,9 +11,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.nio.charset.Charset;
 import java.util.List;
-import java.util.Random;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.notNullValue;
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
index 037a82690..a8fdb89c6 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
@@ -52,7 +52,7 @@ public void equals() throws Exception {
     public void environmentDockerHost() throws Exception {
 
         // given docker host in env
-        Map<String, String> env = new HashMap<String, String>();
+        Map<String, String> env = new HashMap<>();
         env.put(DefaultDockerClientConfig.DOCKER_HOST, "tcp://baz:8768");
         // and it looks to be SSL disabled
         env.remove("DOCKER_CERT_PATH");
@@ -72,7 +72,7 @@ public void environmentDockerHost() throws Exception {
     public void environment() throws Exception {
 
         // given a default config in env properties
-        Map<String, String> env = new HashMap<String, String>();
+        Map<String, String> env = new HashMap<>();
         env.put(DefaultDockerClientConfig.DOCKER_HOST, "tcp://foo");
         env.put(DefaultDockerClientConfig.API_VERSION, "apiVersion");
         env.put(DefaultDockerClientConfig.REGISTRY_USERNAME, "registryUsername");
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
index 54a5287cf..be0bfda8a 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
@@ -21,18 +21,15 @@ public class DockerClientBuilderTest {
     @Test
     public void testConcurrentClientBuilding() throws Exception {
         // we use it to check instance uniqueness
-        final Set<DockerCmdExecFactory> instances = Collections.synchronizedSet(new HashSet<DockerCmdExecFactory>());
+        final Set<DockerCmdExecFactory> instances = Collections.synchronizedSet(new HashSet<>());
 
-        Runnable runnable = new Runnable() {
-            @Override
-            public void run() {
-                DockerCmdExecFactory factory = DockerClientBuilder.getDefaultDockerCmdExecFactory();
-                // factory created
-                assertNotNull(factory);
-                // and is unique
-                assertFalse(instances.contains(factory));
-                instances.add(factory);
-            }
+        Runnable runnable = () -> {
+            DockerCmdExecFactory factory = DockerClientBuilder.getDefaultDockerCmdExecFactory();
+            // factory created
+            assertNotNull(factory);
+            // and is unique
+            assertFalse(instances.contains(factory));
+            instances.add(factory);
         };
 
         parallel(AMOUNT, runnable);
@@ -42,14 +39,11 @@ public void run() {
 
     public static void parallel(int threads, final Runnable task) throws Exception {
         final ExceptionListener exceptionListener = new ExceptionListener();
-        Runnable runnable = new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    task.run();
-                } catch (Throwable e) {
-                    exceptionListener.onException(e);
-                }
+        Runnable runnable = () -> {
+            try {
+                task.run();
+            } catch (Throwable e) {
+                exceptionListener.onException(e);
             }
         };
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index eaddb0978..f2c6d7630 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.core;
 
-import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd.Exec;
 import com.github.dockerjava.api.command.BuildImageCmd;
@@ -77,7 +76,6 @@
 import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
 import com.github.dockerjava.api.command.VersionCmd;
 import com.github.dockerjava.api.command.WaitContainerCmd;
-import com.github.dockerjava.api.model.BuildResponseItem;
 
 import java.io.IOException;
 import java.security.SecureRandom;
@@ -92,11 +90,11 @@
  */
 public class TestDockerCmdExecFactory implements DockerCmdExecFactory {
 
-    private List<String> containerNames = new ArrayList<String>();
+    private List<String> containerNames = new ArrayList<>();
 
-    private List<String> imageNames = new ArrayList<String>();
+    private List<String> imageNames = new ArrayList<>();
 
-    private List<String> volumeNames = new ArrayList<String>();
+    private List<String> volumeNames = new ArrayList<>();
 
     private List<String> networkIds = new ArrayList<>();
 
@@ -118,78 +116,60 @@ public void close() throws IOException {
 
     @Override
     public CreateContainerCmd.Exec createCreateContainerCmdExec() {
-        return new CreateContainerCmd.Exec() {
-            @Override
-            public CreateContainerResponse exec(CreateContainerCmd command) {
-                CreateContainerResponse createContainerResponse = delegate.createCreateContainerCmdExec().exec(command);
-                containerNames.add(createContainerResponse.getId());
-                return createContainerResponse;
-            }
+        return command -> {
+            CreateContainerResponse createContainerResponse = delegate.createCreateContainerCmdExec().exec(command);
+            containerNames.add(createContainerResponse.getId());
+            return createContainerResponse;
         };
     }
 
     @Override
     public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
-        return new RemoveContainerCmd.Exec() {
-            @Override
-            public Void exec(RemoveContainerCmd command) {
-                delegate.createRemoveContainerCmdExec().exec(command);
-                containerNames.remove(command.getContainerId());
-                return null;
-            }
+        return command -> {
+            delegate.createRemoveContainerCmdExec().exec(command);
+            containerNames.remove(command.getContainerId());
+            return null;
         };
     }
 
     @Override
     public CreateImageCmd.Exec createCreateImageCmdExec() {
-        return new CreateImageCmd.Exec() {
-            @Override
-            public CreateImageResponse exec(CreateImageCmd command) {
-                CreateImageResponse createImageResponse = delegate.createCreateImageCmdExec().exec(command);
-                imageNames.add(createImageResponse.getId());
-                return createImageResponse;
-            }
+        return command -> {
+            CreateImageResponse createImageResponse = delegate.createCreateImageCmdExec().exec(command);
+            imageNames.add(createImageResponse.getId());
+            return createImageResponse;
         };
     }
 
     @Override
     public LoadImageCmd.Exec createLoadImageCmdExec() {
-        return new LoadImageCmd.Exec() {
-            @Override
-            public Void exec(LoadImageCmd command) {
-                delegate.createLoadImageCmdExec().exec(command);
-                return null;
-            }
+        return command -> {
+            delegate.createLoadImageCmdExec().exec(command);
+            return null;
         };
     }
 
     @Override
     public RemoveImageCmd.Exec createRemoveImageCmdExec() {
-        return new RemoveImageCmd.Exec() {
-            @Override
-            public Void exec(RemoveImageCmd command) {
-                delegate.createRemoveImageCmdExec().exec(command);
-                imageNames.remove(command.getImageId());
-                return null;
-            }
+        return command -> {
+            delegate.createRemoveImageCmdExec().exec(command);
+            imageNames.remove(command.getImageId());
+            return null;
         };
     }
 
     @Override
     public BuildImageCmd.Exec createBuildImageCmdExec() {
-        return new BuildImageCmd.Exec() {
-            @Override
-            public Void exec(BuildImageCmd command, ResultCallback<BuildResponseItem> resultCallback) {
-                // can't detect image id here so tagging it
-                String tag = command.getTag();
-                if (tag == null || "".equals(tag.trim())) {
-                    tag = "" + new SecureRandom().nextInt(Integer.MAX_VALUE);
-                    command.withTag(tag);
-                }
-                delegate.createBuildImageCmdExec().exec(command, resultCallback);
-                imageNames.add(tag);
-                return null;
+        return (command, resultCallback) -> {
+            // can't detect image id here so tagging it
+            String tag = command.getTag();
+            if (tag == null || "".equals(tag.trim())) {
+                tag = "" + new SecureRandom().nextInt(Integer.MAX_VALUE);
+                command.withTag(tag);
             }
+            delegate.createBuildImageCmdExec().exec(command, resultCallback);
+            imageNames.add(tag);
+            return null;
         };
     }
 
@@ -370,13 +350,10 @@ public StatsCmd.Exec createStatsCmdExec() {
 
     @Override
     public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
-        return new CreateVolumeCmd.Exec() {
-            @Override
-            public CreateVolumeResponse exec(CreateVolumeCmd command) {
-                CreateVolumeResponse result = delegate.createCreateVolumeCmdExec().exec(command);
-                volumeNames.add(command.getName());
-                return result;
-            }
+        return command -> {
+            CreateVolumeResponse result = delegate.createCreateVolumeCmdExec().exec(command);
+            volumeNames.add(command.getName());
+            return result;
         };
     }
 
@@ -387,13 +364,10 @@ public InspectVolumeCmd.Exec createInspectVolumeCmdExec() {
 
     @Override
     public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() {
-        return new RemoveVolumeCmd.Exec() {
-            @Override
-            public Void exec(RemoveVolumeCmd command) {
-                delegate.createRemoveVolumeCmdExec().exec(command);
-                volumeNames.remove(command.getName());
-                return null;
-            }
+        return command -> {
+            delegate.createRemoveVolumeCmdExec().exec(command);
+            volumeNames.remove(command.getName());
+            return null;
         };
     }
 
@@ -415,25 +389,19 @@ public InspectNetworkCmd.Exec createInspectNetworkCmdExec() {
     @Override
     public CreateNetworkCmd.Exec createCreateNetworkCmdExec() {
 
-        return new CreateNetworkCmd.Exec() {
-            @Override
-            public CreateNetworkResponse exec(CreateNetworkCmd command) {
-                CreateNetworkResponse result = delegate.createCreateNetworkCmdExec().exec(command);
-                networkIds.add(result.getId());
-                return result;
-            }
+        return command -> {
+            CreateNetworkResponse result = delegate.createCreateNetworkCmdExec().exec(command);
+            networkIds.add(result.getId());
+            return result;
         };
     }
 
     @Override
     public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() {
-        return new RemoveNetworkCmd.Exec() {
-            @Override
-            public Void exec(RemoveNetworkCmd command) {
-                delegate.createRemoveNetworkCmdExec().exec(command);
-                networkIds.remove(command.getNetworkId());
-                return null;
-            }
+        return command -> {
+            delegate.createRemoveNetworkCmdExec().exec(command);
+            networkIds.remove(command.getNetworkId());
+            return null;
         };
     }
 
@@ -551,15 +519,15 @@ public RemoveSecretCmd.Exec createRemoveSecretCmdExec() {
     }
 
     public List<String> getContainerNames() {
-        return new ArrayList<String>(containerNames);
+        return new ArrayList<>(containerNames);
     }
 
     public List<String> getImageNames() {
-        return new ArrayList<String>(imageNames);
+        return new ArrayList<>(imageNames);
     }
 
     public List<String> getVolumeNames() {
-        return new ArrayList<String>(volumeNames);
+        return new ArrayList<>(volumeNames);
     }
 
     public List<String> getNetworkIds() {
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java b/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
index b436b14ea..72fdb7867 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
@@ -29,9 +29,9 @@ public void processEmptyJson() throws Exception {
 
         InputStream response = new ByteArrayInputStream("{}".getBytes());
 
-        JsonStreamProcessor<PullResponseItem> jsonStreamProcessor = new JsonStreamProcessor<PullResponseItem>(PullResponseItem.class);
+        JsonStreamProcessor<PullResponseItem> jsonStreamProcessor = new JsonStreamProcessor<>(PullResponseItem.class);
 
-        final List<Boolean> completed = new ArrayList<Boolean>();
+        final List<Boolean> completed = new ArrayList<>();
 
         jsonStreamProcessor.processResponseStream(response, new ResultCallback<PullResponseItem>() {
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index 011e37f43..096d616ca 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -73,19 +73,16 @@ private List<Frame> getLoggingFrames() throws Exception {
     @Test
     public void canLogInOneThreadAndExecuteCommandsInAnother() throws Exception {
 
-        Thread thread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    Iterator<Frame> frames = getLoggingFrames().iterator();
-
-                    while (frames.hasNext()) {
-                        frames.next();
-                    }
-
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
+        Thread thread = new Thread(() -> {
+            try {
+                Iterator<Frame> frames = getLoggingFrames().iterator();
+
+                while (frames.hasNext()) {
+                    frames.next();
                 }
+
+            } catch (Exception e) {
+                throw new RuntimeException(e);
             }
         });
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java b/docker-java/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
index 1e8810b56..6406647cf 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/dockerfile/DockerfileAddMultipleFilesTest.java
@@ -13,12 +13,7 @@
 
 public class DockerfileAddMultipleFilesTest {
 
-    private static final Function<File, String> TO_FILE_NAMES = new Function<File, String>() {
-        @Override
-        public String apply(File file) {
-            return file.getName();
-        }
-    };
+    private static final Function<File, String> TO_FILE_NAMES = File::getName;
 
     @Test
     public void ignoreAllBut() throws Exception {
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java b/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
index e8d88d246..720441e20 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
@@ -269,7 +269,7 @@ private static void assertTarArchiveEntryIsSymlink(File archive, String fileName
      * @throws IOException if an error occurs while creating the folders/files.
      */
     private static List<File> createFoldersAndSubFolderWithFiles(Path destinationFolder) throws IOException {
-        List<File> createdFiles = new ArrayList<File>();
+        List<File> createdFiles = new ArrayList<>();
         Path folderA = destinationFolder.resolve("folderA");
         createdFiles.add(Files.createDirectories(folderA).toFile());
         createdFiles.add(createFileWithContent(folderA.resolve("fileA")));
diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java
index 4d4fe2105..bc71b7dfd 100644
--- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java
+++ b/docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java
@@ -31,7 +31,7 @@ public MountedVolumes(Matcher<? super List<Volume>> subMatcher, String featureDe
 
         @Override
         public List<Volume> featureValueOf(InspectContainerResponse item) {
-            List<Volume> volumes = new ArrayList<Volume>();
+            List<Volume> volumes = new ArrayList<>();
             for (InspectContainerResponse.Mount mount : item.getMounts()) {
                 volumes.add(mount.getDestination());
             }
diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java
index 7724b666a..98161b072 100644
--- a/docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java
@@ -18,8 +18,8 @@ public class FramedResponseStreamHandlerTest {
 
   public class MockedResponseHandler implements ResultCallback<Frame> {
 
-    public List<Frame> frames = new ArrayList<Frame>();
-    public List<Throwable> exceptions = new ArrayList<Throwable>();
+    public List<Frame> frames = new ArrayList<>();
+    public List<Throwable> exceptions = new ArrayList<>();
 
     @Override
     public void close() {
diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
index b80579b39..57913313f 100644
--- a/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
@@ -82,16 +82,13 @@ public void testCloseResponseStreamOnWrite() throws Exception {
         final CountDownLatch firstWrite = new CountDownLatch(1);
 
         ExecutorService executor = Executors.newSingleThreadExecutor();
-        Future<?> submit = executor.submit(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    inputStream.write(buffer);
-                    firstWrite.countDown();
-                    inputStream.write(buffer);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
+        Future<?> submit = executor.submit(() -> {
+            try {
+                inputStream.write(buffer);
+                firstWrite.countDown();
+                inputStream.write(buffer);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
             }
         });
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java b/docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java
index a2c9fd36c..cbb5a2f17 100644
--- a/docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java
+++ b/docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java
@@ -12,7 +12,7 @@
 public class LogContainerTestCallback extends LogContainerResultCallback {
     protected final StringBuffer log = new StringBuffer();
 
-    List<Frame> collectedFrames = new ArrayList<Frame>();
+    List<Frame> collectedFrames = new ArrayList<>();
 
     boolean collectFrames = false;
 

From 14d5353b3f262c4a2c16a33bf6d90a88b5b01e08 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 28 Sep 2019 23:58:30 +0300
Subject: [PATCH 0937/1272] Version forward.

---
 docker-java-api/pom.xml | 2 +-
 docker-java/pom.xml     | 2 +-
 pom.xml                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index a8b2328f0..8ad889176 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.1.6-SNAPSHOT</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 5a5cc22c2..6d9cc0377 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.1.6-SNAPSHOT</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index ed00423dc..7287c5ae5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.1.6-SNAPSHOT</version>
+	<version>3.2.0-SNAPSHOT</version>
 
 	<name>docker-java-parent</name>
 	<url>https://github.com/docker-java/docker-java</url>

From 74a4479dee55ece739b4d498aec241aee3e457f9 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 29 Sep 2019 00:21:55 +0300
Subject: [PATCH 0938/1272] Create modules for core & transports (jersey,
 netty)  (#1251)

* Use Java 8 features

* introduce transport modules

* remove unused import
---
 .idea/encodings.xml                           |   5 +
 docker-java-api/pom.xml                       |   6 +
 .../github/dockerjava/api/DockerClient.java   |   1 -
 .../api}/async/ResultCallbackTemplate.java    |   3 +-
 .../dockerjava/api/command/BuildImageCmd.java |   1 -
 .../api/command/ConnectToNetworkCmd.java      |   1 -
 .../api/command/CreateNetworkCmd.java         |   1 -
 .../api/command/CreateSecretCmd.java          |   1 -
 .../api/command/CreateServiceCmd.java         |   1 -
 .../api/command/DisconnectFromNetworkCmd.java |   2 -
 .../api/command/DockerCmdExecFactory.java     |   5 -
 .../api/command/InspectContainerResponse.java |   1 -
 .../api/command/InspectExecResponse.java      |   1 -
 .../api/command/InspectNetworkCmd.java        |   1 -
 .../api/command/InspectSwarmNodeCmd.java      |   1 -
 .../api/command/ListNetworksCmd.java          |   1 -
 .../api/command/ListServicesCmd.java          |   1 -
 .../api/command/ListSwarmNodesCmd.java        |   1 -
 .../dockerjava/api/command/PruneCmd.java      |   1 -
 .../api/command/RemoveNetworkCmd.java         |   1 -
 .../api/command/RemoveSwarmNodeCmd.java       |   1 -
 .../api/command/RenameContainerCmd.java       |   1 -
 .../api/command/UpdateContainerCmd.java       |   1 -
 .../api/command/UpdateServiceCmd.java         |   1 -
 .../api/command/UpdateSwarmNodeCmd.java       |   1 -
 .../dockerjava/api/model/BindOptions.java     |   1 -
 .../dockerjava/api/model/BindPropagation.java |   1 -
 .../dockerjava/api/model/ClusterInfo.java     |   1 -
 .../dockerjava/api/model/Container.java       |   1 -
 .../api/model/ContainerDNSConfig.java         |   1 -
 .../api/model/ContainerNetwork.java           |   1 -
 .../api/model/ContainerNetworkSettings.java   |   1 -
 .../dockerjava/api/model/ContainerSpec.java   |   1 -
 .../api/model/ContainerSpecConfig.java        |   1 -
 .../api/model/ContainerSpecFile.java          |   1 -
 .../api/model/ContainerSpecPrivileges.java    |   1 -
 .../ContainerSpecPrivilegesCredential.java    |   1 -
 ...ContainerSpecPrivilegesSELinuxContext.java |   1 -
 .../api/model/ContainerSpecSecret.java        |   1 -
 .../github/dockerjava/api/model/Driver.java   |   1 -
 .../github/dockerjava/api/model/Endpoint.java |   1 -
 .../api/model/EndpointResolutionMode.java     |   1 -
 .../dockerjava/api/model/EndpointSpec.java    |   1 -
 .../api/model/EndpointVirtualIP.java          |   1 -
 .../dockerjava/api/model/ExternalCA.java      |   1 -
 .../api/model/ExternalCAProtocol.java         |   1 -
 .../dockerjava/api/model/HostConfig.java      |   1 -
 .../github/dockerjava/api/model/Mount.java    |   1 -
 .../dockerjava/api/model/MountType.java       |   1 -
 .../api/model/NamedResourceSpec.java          |   1 -
 .../api/model/NetworkAttachmentConfig.java    |   1 -
 .../dockerjava/api/model/NetworkSettings.java |   1 -
 .../dockerjava/api/model/ObjectVersion.java   |   1 -
 .../dockerjava/api/model/PortConfig.java      |   1 -
 .../api/model/PortConfigProtocol.java         |   1 -
 .../dockerjava/api/model/Reachability.java    |   1 -
 .../api/model/ResourceRequirements.java       |   1 -
 .../dockerjava/api/model/ResourceSpecs.java   |   1 -
 .../dockerjava/api/model/ResourceVersion.java |   1 -
 .../dockerjava/api/model/ResponseItem.java    |   1 -
 .../github/dockerjava/api/model/Secret.java   |   1 -
 .../dockerjava/api/model/SecretSpec.java      |   1 -
 .../github/dockerjava/api/model/Service.java  |   1 -
 .../api/model/ServiceGlobalModeOptions.java   |   1 -
 .../dockerjava/api/model/ServiceMode.java     |   2 -
 .../api/model/ServiceModeConfig.java          |   1 -
 .../api/model/ServicePlacement.java           |   1 -
 .../model/ServiceReplicatedModeOptions.java   |   1 -
 .../api/model/ServiceRestartCondition.java    |   1 -
 .../api/model/ServiceRestartPolicy.java       |   1 -
 .../dockerjava/api/model/ServiceSpec.java     |   1 -
 .../api/model/ServiceUpdateState.java         |   1 -
 .../api/model/ServiceUpdateStatus.java        |   1 -
 .../dockerjava/api/model/SwarmCAConfig.java   |   1 -
 .../api/model/SwarmDispatcherConfig.java      |   1 -
 .../dockerjava/api/model/SwarmJoinTokens.java |   1 -
 .../dockerjava/api/model/SwarmNode.java       |   1 -
 .../api/model/SwarmNodeAvailability.java      |   1 -
 .../api/model/SwarmNodeDescription.java       |   1 -
 .../api/model/SwarmNodeEngineDescription.java |   1 -
 .../api/model/SwarmNodeManagerStatus.java     |   1 -
 .../api/model/SwarmNodePlatform.java          |   1 -
 .../api/model/SwarmNodePluginDescription.java |   1 -
 .../api/model/SwarmNodeResources.java         |   1 -
 .../dockerjava/api/model/SwarmNodeRole.java   |   1 -
 .../dockerjava/api/model/SwarmNodeSpec.java   |   1 -
 .../dockerjava/api/model/SwarmNodeState.java  |   1 -
 .../dockerjava/api/model/SwarmNodeStatus.java |   1 -
 .../api/model/SwarmNodeVersion.java           |   1 -
 .../api/model/SwarmOrchestration.java         |   1 -
 .../dockerjava/api/model/SwarmRaftConfig.java |   1 -
 .../dockerjava/api/model/SwarmSpec.java       |   1 -
 .../dockerjava/api/model/SwarmVersion.java    |   1 -
 .../com/github/dockerjava/api/model/Task.java |   1 -
 .../dockerjava/api/model/TaskDefaults.java    |   1 -
 .../github/dockerjava/api/model/TaskSpec.java |   1 -
 .../dockerjava/api/model/TaskState.java       |   2 -
 .../dockerjava/api/model/TaskStatus.java      |   1 -
 .../api/model/TaskStatusContainerStatus.java  |   1 -
 .../dockerjava/api/model/TmpfsOptions.java    |   1 -
 .../dockerjava/api/model/UpdateConfig.java    |   1 -
 .../api/model/UpdateContainerResponse.java    |   1 -
 .../api/model/UpdateFailureAction.java        |   1 -
 .../dockerjava/api/model/UpdateOrder.java     |   1 -
 .../api/model/VersionComponent.java           |   1 -
 .../dockerjava/api/model/VersionPlatform.java |   1 -
 .../dockerjava/api/model/VolumeOptions.java   |   1 -
 .../github/dockerjava/api/model/VolumeRW.java |   1 -
 docker-java-core/pom.xml                      |  79 +++++
 .../core/AbstractDockerCmdExecFactory.java    |   2 +-
 .../core/DefaultDockerClientConfig.java       |   0
 .../dockerjava/core/DockerClientConfig.java   |   0
 .../core/DockerClientConfigAware.java         |   6 +
 .../dockerjava/core/DockerClientImpl.java     |   4 +-
 .../dockerjava/core/DockerConfigFile.java     |   0
 .../dockerjava/core/GoLangFileMatch.java      |   0
 .../core/GoLangMatchFileFilter.java           |   0
 .../dockerjava/core/InvocationBuilder.java    |   0
 .../dockerjava/core/KeystoreSSLConfig.java    |   0
 .../core/LocalDirectorySSLConfig.java         |   0
 .../com/github/dockerjava/core/MediaType.java |   0
 .../github/dockerjava/core/NameParser.java    |   0
 .../dockerjava/core/RemoteApiVersion.java     |   0
 .../com/github/dockerjava/core/SSLConfig.java |   0
 .../com/github/dockerjava/core/WebTarget.java |   0
 .../core/async/FrameStreamProcessor.java      |   0
 .../core/async/JsonStreamProcessor.java       |   0
 .../core/async/ResponseStreamProcessor.java   |   0
 .../core/async/ResultCallbackTemplate.java    |  19 +
 .../core/command/AbstrAsyncDockerCmd.java     |   0
 .../core/command/AbstrDockerCmd.java          |   0
 .../core/command/AttachContainerCmdImpl.java  |   0
 .../AttachContainerResultCallback.java        |   0
 .../dockerjava/core/command/AuthCmdImpl.java  |   0
 .../core/command/BuildImageCmdImpl.java       |   0
 .../command/BuildImageResultCallback.java     |   0
 .../core/command/CommitCmdImpl.java           |   0
 .../core/command/ConnectToNetworkCmdImpl.java |   0
 .../core/command/ContainerDiffCmdImpl.java    |   0
 .../CopyArchiveFromContainerCmdImpl.java      |   0
 .../CopyArchiveToContainerCmdImpl.java        |   0
 .../command/CopyFileFromContainerCmdImpl.java |   0
 .../core/command/CreateContainerCmdImpl.java  |   0
 .../core/command/CreateImageCmdImpl.java      |   0
 .../core/command/CreateNetworkCmdImpl.java    |   0
 .../core/command/CreateSecretCmdImpl.java     |   0
 .../core/command/CreateServiceCmdImpl.java    |   0
 .../core/command/CreateVolumeCmdImpl.java     |   0
 .../command/DisconnectFromNetworkCmdImpl.java |   0
 .../core/command/EventsCmdImpl.java           |   0
 .../core/command/EventsResultCallback.java    |   0
 .../core/command/ExecCreateCmdImpl.java       |   0
 .../core/command/ExecStartCmdImpl.java        |   0
 .../core/command/ExecStartResultCallback.java |   0
 .../dockerjava/core/command/FrameReader.java  |   0
 .../dockerjava/core/command/InfoCmdImpl.java  |   0
 .../core/command/InitializeSwarmCmdImpl.java  |   0
 .../core/command/InpectNetworkCmdImpl.java    |   0
 .../core/command/InspectContainerCmdImpl.java |   0
 .../core/command/InspectExecCmdImpl.java      |   0
 .../core/command/InspectImageCmdImpl.java     |   0
 .../core/command/InspectServiceCmdImpl.java   |   0
 .../core/command/InspectSwarmCmdImpl.java     |   0
 .../core/command/InspectSwarmNodeCmdImpl.java |   0
 .../core/command/InspectVolumeCmdImpl.java    |   0
 .../core/command/JoinSwarmCmdImpl.java        |   0
 .../core/command/KillContainerCmdImpl.java    |   0
 .../core/command/LeaveSwarmCmdImpl.java       |   0
 .../core/command/ListContainersCmdImpl.java   |   0
 .../core/command/ListImagesCmdImpl.java       |   0
 .../core/command/ListNetworksCmdImpl.java     |   0
 .../core/command/ListSecretsCmdImpl.java      |   0
 .../core/command/ListServicesCmdImpl.java     |   0
 .../core/command/ListSwarmNodesCmdImpl.java   |   0
 .../core/command/ListTasksCmdImpl.java        |   0
 .../core/command/ListVolumesCmdImpl.java      |   0
 .../core/command/LoadImageCmdImpl.java        |   0
 .../core/command/LogContainerCmdImpl.java     |   0
 .../command/LogContainerResultCallback.java   |   0
 .../core/command/LogSwarmObjectImpl.java      |   0
 .../core/command/PauseContainerCmdImpl.java   |   0
 .../dockerjava/core/command/PingCmdImpl.java  |   0
 .../dockerjava/core/command/PruneCmdImpl.java |   0
 .../core/command/PullImageCmdImpl.java        |   0
 .../core/command/PullImageResultCallback.java |   0
 .../core/command/PushImageCmdImpl.java        |   0
 .../core/command/PushImageResultCallback.java |   0
 .../core/command/RemoveContainerCmdImpl.java  |   0
 .../core/command/RemoveImageCmdImpl.java      |   0
 .../core/command/RemoveNetworkCmdImpl.java    |   0
 .../core/command/RemoveSecretCmdImpl.java     |   0
 .../core/command/RemoveServiceCmdImpl.java    |   0
 .../core/command/RemoveSwarmNodeCmdImpl.java  |   0
 .../core/command/RemoveVolumeCmdImpl.java     |   0
 .../core/command/RenameContainerCmdImpl.java  |   0
 .../core/command/RestartContainerCmdImpl.java |   0
 .../core/command/SaveImageCmdImpl.java        |   0
 .../core/command/SearchImagesCmdImpl.java     |   0
 .../core/command/StartContainerCmdImpl.java   |   0
 .../dockerjava/core/command/StatsCmdImpl.java |   0
 .../core/command/StopContainerCmdImpl.java    |   0
 .../core/command/TagImageCmdImpl.java         |   0
 .../core/command/TopContainerCmdImpl.java     |   0
 .../core/command/UnpauseContainerCmdImpl.java |   0
 .../core/command/UpdateContainerCmdImpl.java  |   0
 .../core/command/UpdateServiceCmdImpl.java    |   0
 .../core/command/UpdateSwarmCmdImpl.java      |   0
 .../core/command/UpdateSwarmNodeCmdImpl.java  |   0
 .../core/command/VersionCmdImpl.java          |   0
 .../core/command/WaitContainerCmdImpl.java    |   0
 .../command/WaitContainerResultCallback.java  |   0
 .../core/dockerfile/Dockerfile.java           |   0
 .../core/dockerfile/DockerfileStatement.java  |   0
 .../exception/GoLangFileMatchException.java   |   0
 .../InvalidRepositoryNameException.java       |   0
 .../core/exec/AbstrAsyncDockerCmdExec.java    |   0
 .../core/exec/AbstrDockerCmdExec.java         |   0
 .../core/exec/AbstrSyncDockerCmdExec.java     |   0
 .../core/exec/AttachContainerCmdExec.java     |   0
 .../dockerjava/core/exec/AuthCmdExec.java     |   0
 .../core/exec/BuildImageCmdExec.java          |   0
 .../dockerjava/core/exec/CommitCmdExec.java   |   0
 .../core/exec/ConnectToNetworkCmdExec.java    |   0
 .../core/exec/ContainerDiffCmdExec.java       |   0
 .../exec/CopyArchiveFromContainerCmdExec.java |   0
 .../exec/CopyArchiveToContainerCmdExec.java   |   0
 .../exec/CopyFileFromContainerCmdExec.java    |   0
 .../core/exec/CreateContainerCmdExec.java     |   0
 .../core/exec/CreateImageCmdExec.java         |   0
 .../core/exec/CreateNetworkCmdExec.java       |   0
 .../core/exec/CreateSecretCmdExec.java        |   0
 .../core/exec/CreateServiceCmdExec.java       |   0
 .../core/exec/CreateVolumeCmdExec.java        |   0
 .../exec/DisconnectFromNetworkCmdExec.java    |   0
 .../dockerjava/core/exec/EventsCmdExec.java   |   0
 .../core/exec/ExecCreateCmdExec.java          |   0
 .../core/exec/ExecStartCmdExec.java           |   0
 .../dockerjava/core/exec/InfoCmdExec.java     |   0
 .../core/exec/InitializeSwarmCmdExec.java     |   0
 .../core/exec/InspectContainerCmdExec.java    |   0
 .../core/exec/InspectExecCmdExec.java         |   0
 .../core/exec/InspectImageCmdExec.java        |   0
 .../core/exec/InspectNetworkCmdExec.java      |   0
 .../core/exec/InspectServiceCmdExec.java      |   0
 .../core/exec/InspectSwarmCmdExec.java        |   0
 .../core/exec/InspectSwarmNodeCmdExec.java    |   0
 .../core/exec/InspectVolumeCmdExec.java       |   0
 .../core/exec/JoinSwarmCmdExec.java           |   0
 .../core/exec/KillContainerCmdExec.java       |   0
 .../core/exec/LeaveSwarmCmdExec.java          |   0
 .../core/exec/ListContainersCmdExec.java      |   0
 .../core/exec/ListImagesCmdExec.java          |   0
 .../core/exec/ListNetworksCmdExec.java        |   0
 .../core/exec/ListSecretsCmdExec.java         |   0
 .../core/exec/ListServicesCmdExec.java        |   0
 .../core/exec/ListSwarmNodesCmdExec.java      |   0
 .../core/exec/ListTasksCmdExec.java           |   0
 .../core/exec/ListVolumesCmdExec.java         |   0
 .../core/exec/LoadImageCmdExec.java           |   0
 .../core/exec/LogContainerCmdExec.java        |   0
 .../core/exec/LogSwarmObjectExec.java         |   0
 .../core/exec/PauseContainerCmdExec.java      |   0
 .../dockerjava/core/exec/PingCmdExec.java     |   0
 .../dockerjava/core/exec/PruneCmdExec.java    |   0
 .../core/exec/PullImageCmdExec.java           |   0
 .../core/exec/PushImageCmdExec.java           |   0
 .../core/exec/RemoveContainerCmdExec.java     |   0
 .../core/exec/RemoveImageCmdExec.java         |   0
 .../core/exec/RemoveNetworkCmdExec.java       |   0
 .../core/exec/RemoveSecretCmdExec.java        |   0
 .../core/exec/RemoveServiceCmdExec.java       |   0
 .../core/exec/RemoveSwarmNodeCmdExec.java     |   2 +-
 .../core/exec/RemoveVolumeCmdExec.java        |   0
 .../core/exec/RenameContainerCmdExec.java     |   0
 .../core/exec/RestartContainerCmdExec.java    |   0
 .../core/exec/SaveImageCmdExec.java           |   0
 .../core/exec/SearchImagesCmdExec.java        |   0
 .../core/exec/StartContainerCmdExec.java      |   0
 .../dockerjava/core/exec/StatsCmdExec.java    |   0
 .../core/exec/StopContainerCmdExec.java       |   0
 .../dockerjava/core/exec/TagImageCmdExec.java |   0
 .../core/exec/TopContainerCmdExec.java        |   0
 .../core/exec/UnpauseContainerCmdExec.java    |   0
 .../core/exec/UpdateContainerCmdExec.java     |   0
 .../core/exec/UpdateServiceCmdExec.java       |   0
 .../core/exec/UpdateSwarmCmdExec.java         |   0
 .../core/exec/UpdateSwarmNodeCmdExec.java     |   0
 .../dockerjava/core/exec/VersionCmdExec.java  |   0
 .../core/exec/WaitContainerCmdExec.java       |   0
 .../core/util/CacheFromEncoder.java           |   5 +-
 .../core/util/CertificateUtils.java           |   0
 .../core/util/CompressArchiveUtil.java        |   0
 .../dockerjava/core/util/FilePathUtil.java    |   0
 .../dockerjava/core/util/FiltersBuilder.java  |   0
 .../dockerjava/core/util/FiltersEncoder.java  |   0
 .../core/util/SwarmNodesFiltersBuilder.java   |   0
 .../dockerjava/core/util/TarDirWalker.java    |   0
 docker-java-transport-jersey/pom.xml          |  87 +++++
 .../jaxrs/AbstrAsyncDockerCmdExec.java        |   0
 .../dockerjava/jaxrs/AbstrDockerCmdExec.java  |   0
 .../jaxrs/AbstrSyncDockerCmdExec.java         |   0
 .../dockerjava/jaxrs/ApacheUnixSocket.java    |   0
 .../jaxrs/AttachContainerCmdExec.java         |   0
 .../github/dockerjava/jaxrs/AuthCmdExec.java  |   0
 .../dockerjava/jaxrs/BuildImageCmdExec.java   |   0
 .../dockerjava/jaxrs/CommitCmdExec.java       |   0
 .../jaxrs/ConnectToNetworkCmdExec.java        |   0
 .../jaxrs/ContainerDiffCmdExec.java           |   0
 .../CopyArchiveFromContainerCmdExec.java      |   0
 .../jaxrs/CopyArchiveToContainerCmdExec.java  |   0
 .../jaxrs/CopyFileFromContainerCmdExec.java   |   0
 .../jaxrs/CreateContainerCmdExec.java         |   0
 .../dockerjava/jaxrs/CreateImageCmdExec.java  |   0
 .../jaxrs/CreateNetworkCmdExec.java           |   0
 .../dockerjava/jaxrs/CreateSecretCmdExec.java |   0
 .../jaxrs/CreateServiceCmdExec.java           |   0
 .../dockerjava/jaxrs/CreateVolumeCmdExec.java |   0
 .../jaxrs/DisconnectFromNetworkCmdExec.java   |   0
 .../dockerjava/jaxrs/EventsCmdExec.java       |   0
 .../dockerjava/jaxrs/ExecCreateCmdExec.java   |   0
 .../dockerjava/jaxrs/ExecStartCmdExec.java    |   0
 .../github/dockerjava/jaxrs/InfoCmdExec.java  |   0
 .../jaxrs/InitializeSwarmCmdExec.java         |   0
 .../jaxrs/InspectContainerCmdExec.java        |   0
 .../dockerjava/jaxrs/InspectExecCmdExec.java  |   0
 .../dockerjava/jaxrs/InspectImageCmdExec.java |   0
 .../jaxrs/InspectNetworkCmdExec.java          |   0
 .../jaxrs/InspectServiceCmdExec.java          |   0
 .../dockerjava/jaxrs/InspectSwarmCmdExec.java |   0
 .../jaxrs/InspectSwarmNodeCmdExec.java        |   0
 .../jaxrs/InspectVolumeCmdExec.java           |   0
 .../jaxrs/JerseyDockerCmdExecFactory.java     |   3 +-
 .../dockerjava/jaxrs/JoinSwarmCmdExec.java    |   0
 .../jaxrs/KillContainerCmdExec.java           |   0
 .../dockerjava/jaxrs/LeaveSwarmCmdExec.java   |   0
 .../jaxrs/ListContainersCmdExec.java          |   0
 .../dockerjava/jaxrs/ListImagesCmdExec.java   |   0
 .../dockerjava/jaxrs/ListNetworksCmdExec.java |   0
 .../dockerjava/jaxrs/ListSecretsCmdExec.java  |   0
 .../dockerjava/jaxrs/ListServicesCmdExec.java |   0
 .../jaxrs/ListSwarmNodesCmdExec.java          |   0
 .../dockerjava/jaxrs/ListTasksCmdExec.java    |   0
 .../dockerjava/jaxrs/ListVolumesCmdExec.java  |   0
 .../dockerjava/jaxrs/LoadImageCmdExec.java    |   0
 .../dockerjava/jaxrs/LogContainerCmdExec.java |   0
 .../dockerjava/jaxrs/LogSwarmObjectExec.java  |   0
 .../jaxrs/PauseContainerCmdExec.java          |   0
 .../github/dockerjava/jaxrs/PingCmdExec.java  |   0
 .../github/dockerjava/jaxrs/PruneCmdExec.java |   0
 .../dockerjava/jaxrs/PullImageCmdExec.java    |   0
 .../dockerjava/jaxrs/PushImageCmdExec.java    |   0
 .../jaxrs/RemoveContainerCmdExec.java         |   0
 .../dockerjava/jaxrs/RemoveImageCmdExec.java  |   0
 .../jaxrs/RemoveNetworkCmdExec.java           |   0
 .../dockerjava/jaxrs/RemoveSecretCmdExec.java |   0
 .../jaxrs/RemoveServiceCmdExec.java           |   0
 .../jaxrs/RemoveSwarmNodeCmdExec.java         |   0
 .../dockerjava/jaxrs/RemoveVolumeCmdExec.java |   0
 .../jaxrs/RenameContainerCmdExec.java         |   0
 .../jaxrs/RestartContainerCmdExec.java        |   0
 .../dockerjava/jaxrs/SaveImageCmdExec.java    |   0
 .../dockerjava/jaxrs/SearchImagesCmdExec.java |   0
 .../jaxrs/StartContainerCmdExec.java          |   0
 .../github/dockerjava/jaxrs/StatsCmdExec.java |   0
 .../jaxrs/StopContainerCmdExec.java           |   0
 .../dockerjava/jaxrs/TagImageCmdExec.java     |   0
 .../dockerjava/jaxrs/TopContainerCmdExec.java |   0
 .../jaxrs/UnixConnectionSocketFactory.java    |   0
 .../jaxrs/UnpauseContainerCmdExec.java        |   0
 .../jaxrs/UpdateContainerCmdExec.java         |   0
 .../jaxrs/UpdateServiceCmdExec.java           |   0
 .../dockerjava/jaxrs/UpdateSwarmCmdExec.java  |   0
 .../jaxrs/UpdateSwarmNodeCmdExec.java         |   0
 .../dockerjava/jaxrs/VersionCmdExec.java      |   0
 .../jaxrs/WaitContainerCmdExec.java           |   0
 .../jaxrs/async/AbstractCallbackNotifier.java |   0
 .../jaxrs/async/GETCallbackNotifier.java      |   0
 .../jaxrs/async/POSTCallbackNotifier.java     |   0
 .../jaxrs/filter/FollowRedirectsFilter.java   |   0
 .../jaxrs/filter/JsonClientFilter.java        |   0
 .../jaxrs/filter/LoggingFilter.java           |   0
 .../filter/ResponseStatusExceptionFilter.java |   0
 .../jaxrs/filter/SelectiveLoggingFilter.java  |   0
 .../util/WrappedResponseInputStream.java      |   0
 docker-java-transport-netty/pom.xml           |  68 ++++
 .../dockerjava/netty/ChannelProvider.java     |   0
 .../netty/NettyDockerCmdExecFactory.java      |   3 +-
 .../netty/NettyInvocationBuilder.java         |   0
 .../dockerjava/netty/NettyWebTarget.java      |   0
 .../handler/FramedResponseStreamHandler.java  |   0
 .../handler/HttpConnectionHijackHandler.java  |   0
 .../netty/handler/HttpRequestProvider.java    |   0
 .../netty/handler/HttpResponseHandler.java    |   0
 .../handler/HttpResponseStreamHandler.java    |   0
 .../netty/handler/JsonRequestHandler.java     |   0
 .../handler/JsonResponseCallbackHandler.java  |   0
 docker-java/pom.xml                           | 115 +-----
 .../jaxrs/DockerCmdExecFactoryImpl.java       |   9 -
 .../netty/DockerCmdExecFactoryImpl.java       |   9 -
 .../http/impl/io/ChunkedInputStream.java      | 335 ------------------
 .../core/TestDockerCmdExecFactory.java        |   6 +-
 pom.xml                                       |   3 +
 402 files changed, 295 insertions(+), 586 deletions(-)
 rename {docker-java/src/main/java/com/github/dockerjava/core => docker-java-api/src/main/java/com/github/dockerjava/api}/async/ResultCallbackTemplate.java (97%)
 create mode 100644 docker-java-core/pom.xml
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java (99%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java (100%)
 rename {docker-java-api => docker-java-core}/src/main/java/com/github/dockerjava/core/DockerClientConfig.java (100%)
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfigAware.java
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/DockerClientImpl.java (99%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/DockerConfigFile.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/InvocationBuilder.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/MediaType.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/NameParser.java (100%)
 rename {docker-java-api => docker-java-core}/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java (100%)
 rename {docker-java-api => docker-java-core}/src/main/java/com/github/dockerjava/core/SSLConfig.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/WebTarget.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java (100%)
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/FrameReader.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/InpectNetworkCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/InspectSwarmCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/LeaveSwarmCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/ListTasksCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/LogSwarmObjectImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/RemoveNetworkCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exception/GoLangFileMatchException.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exception/InvalidRepositoryNameException.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/AbstrAsyncDockerCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/AbstrSyncDockerCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/AttachContainerCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/AuthCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/CommitCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/ContainerDiffCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/CopyArchiveFromContainerCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/CopyArchiveToContainerCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/CopyFileFromContainerCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/CreateImageCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/CreateNetworkCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/CreateSecretCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/CreateServiceCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/CreateVolumeCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/EventsCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/ExecCreateCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/ExecStartCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/InfoCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/InspectContainerCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/InspectExecCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/InspectImageCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/InspectNetworkCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/InspectServiceCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/InspectSwarmCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/InspectSwarmNodeCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/InspectVolumeCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/ListContainersCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/ListImagesCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/ListNetworksCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/ListSecretsCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/ListServicesCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/ListSwarmNodesCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/ListTasksCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/ListVolumesCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/LoadImageCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/LogSwarmObjectExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/PruneCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/PullImageCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/RemoveContainerCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/RemoveImageCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/RemoveNetworkCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/RemoveSecretCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/RemoveServiceCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/RemoveSwarmNodeCmdExec.java (94%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/RemoveVolumeCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/SaveImageCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/UpdateContainerCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/VersionCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/exec/WaitContainerCmdExec.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java (68%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/util/FilePathUtil.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java (100%)
 rename {docker-java => docker-java-core}/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java (100%)
 create mode 100644 docker-java-transport-jersey/pom.xml
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java (99%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java (100%)
 rename {docker-java => docker-java-transport-jersey}/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java (100%)
 create mode 100644 docker-java-transport-netty/pom.xml
 rename {docker-java => docker-java-transport-netty}/src/main/java/com/github/dockerjava/netty/ChannelProvider.java (100%)
 rename {docker-java => docker-java-transport-netty}/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java (98%)
 rename {docker-java => docker-java-transport-netty}/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java (100%)
 rename {docker-java => docker-java-transport-netty}/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java (100%)
 rename {docker-java => docker-java-transport-netty}/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java (100%)
 rename {docker-java => docker-java-transport-netty}/src/main/java/com/github/dockerjava/netty/handler/HttpConnectionHijackHandler.java (100%)
 rename {docker-java => docker-java-transport-netty}/src/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java (100%)
 rename {docker-java => docker-java-transport-netty}/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java (100%)
 rename {docker-java => docker-java-transport-netty}/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java (100%)
 rename {docker-java => docker-java-transport-netty}/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java (100%)
 rename {docker-java => docker-java-transport-netty}/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java (100%)
 delete mode 100644 docker-java/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
 delete mode 100644 docker-java/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
 delete mode 100644 docker-java/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index c0bce7084..9e5f39465 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -2,6 +2,11 @@
 <project version="4">
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/docker-java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/docker-java-api" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/docker-java-core" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/docker-java-transport-jersey" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/docker-java-transport-netty" charset="UTF-8" />
     <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 8ad889176..868fda2e9 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -38,6 +38,12 @@
 			<version>${guava.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j-api.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>com.google.code.findbugs</groupId>
 			<artifactId>annotations</artifactId>
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
index 5c8dce226..7762be0a7 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -76,7 +76,6 @@
 import com.github.dockerjava.api.model.SecretSpec;
 import com.github.dockerjava.api.model.ServiceSpec;
 import com.github.dockerjava.api.model.SwarmSpec;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.Nonnull;
 import java.io.Closeable;
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallbackTemplate.java
similarity index 97%
rename from docker-java/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallbackTemplate.java
index 727c91164..1b988d35a 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallbackTemplate.java
@@ -1,9 +1,8 @@
 /*
  * Created on 16.06.2015
  */
-package com.github.dockerjava.core.async;
+package com.github.dockerjava.api.async;
 
-import com.github.dockerjava.api.async.ResultCallback;
 import com.google.common.base.Throwables;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 89d20f531..9cf1da7aa 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -11,7 +11,6 @@
 
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.api.model.BuildResponseItem;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 /**
  * Build an image from Dockerfile.
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java
index 0f384e043..e6868fd7d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.model.ContainerNetwork;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
index 298e05aca..544ac2083 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
@@ -2,7 +2,6 @@
 
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.api.model.Network.Ipam;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java
index 2b305f5dd..c27e42317 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java
@@ -2,7 +2,6 @@
 
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.model.SecretSpec;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.CheckForNull;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java
index d8c2bc5e3..dc78642e3 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java
@@ -2,7 +2,6 @@
 
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.model.ServiceSpec;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.CheckForNull;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java
index ce75172b4..07dadec1e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.command;
 
-import com.github.dockerjava.core.RemoteApiVersion;
-
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index 1945ddd5b..06cf8eae0 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -3,13 +3,8 @@
 import java.io.Closeable;
 import java.io.IOException;
 
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.RemoteApiVersion;
-
 public interface DockerCmdExecFactory extends Closeable {
 
-    void init(DockerClientConfig dockerClientConfig);
-
     AuthCmd.Exec createAuthCmdExec();
 
     InfoCmd.Exec createInfoCmdExec();
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index cc2761abe..be060c19b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -11,7 +11,6 @@
 import com.github.dockerjava.api.model.VolumeBinds;
 import com.github.dockerjava.api.model.VolumeRW;
 import com.github.dockerjava.api.model.VolumesRW;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
index 0058d3e1e..613e69075 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
@@ -7,7 +7,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.model.NetworkSettings;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.CheckForNull;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java
index 2e5536731..9dd462ac4 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java
@@ -2,7 +2,6 @@
 
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java
index 13dacdd6a..07750f09e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java
@@ -3,7 +3,6 @@
 
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.SwarmNode;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
index 40e3d421c..a7921824d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.CheckForNull;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java
index a993b5579..5926add1e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.model.Service;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.CheckForNull;
 import java.util.List;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java
index 9aaac1e98..6ad0205d3 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.model.SwarmNode;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.CheckForNull;
 import java.util.List;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PruneCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PruneCmd.java
index 7a86434aa..89a082eaf 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PruneCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PruneCmd.java
@@ -2,7 +2,6 @@
 
 import com.github.dockerjava.api.model.PruneResponse;
 import com.github.dockerjava.api.model.PruneType;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java
index b6ad0e652..1466fd3e4 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java
index 27a815bf0..198e7b8df 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java
index bce20251f..a69ba2a3f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
index a834b7ba0..82fbca5f8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.model.UpdateContainerResponse;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java
index fb025ea76..da4b78387 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.model.ServiceSpec;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
index 604e85ef7..f535d2b7f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.model.SwarmNodeSpec;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java
index 4f0c09279..fec0ba339 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindPropagation.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindPropagation.java
index c7c545e10..81a189e77 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindPropagation.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindPropagation.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
index 0ee95688b..e95475a64 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java
index 61bd395a9..1c2ffd7df 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java
@@ -5,7 +5,6 @@
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.command.ListContainersCmd;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
index 489cfcd61..ee7486ddf 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
index bc7e12d33..70c37c4d9 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
index bc6165874..6dcddf1b2 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
index f56870d01..ae5274d47 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
index bdc90a442..caa27eaf1 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
index b6d389a79..b9a847cb1 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java
index d4fed423f..0e9f54b01 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java
index 19154b1ab..b746e510f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
index 152267cb0..a3a83cecf 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
index cb424de7d..86c7d9147 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java
index 9eecf27e9..7cda79563 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java
index 0602a3d21..caa7c0ef2 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java
index 89528ce6b..b67cea38b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
index 38aebe638..6f5393922 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
index 369889921..080a099b3 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
index ac2cb69fb..f6fd95fc9 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java
index 16b7ad94b..b4268a3eb 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 1eb0594b6..157407f34 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -5,7 +5,6 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java
index 6393eb176..008560305 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java
index 7e6bfc770..62557df47 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
index c96c9b71b..a6d016fe2 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import java.io.Serializable;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
index b9663e1d8..3f58f3266 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
index 8fcd8fb9b..603d4685f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
@@ -5,7 +5,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 import java.io.Serializable;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
index 9c8d7d902..1e3f78a08 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import java.io.Serializable;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java
index ede1a2b9f..bdb7fe3fa 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java
index 098cff343..f47b06f1d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Reachability.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Reachability.java
index 85e113b80..a536080c3 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Reachability.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Reachability.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
index 75ecd1129..ecab4923e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
index b4f529eba..451019e41 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
index ee80e571a..58a4c1091 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
index 6663b4bf0..54bbf8b38 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java
index 79a5e8f21..fba85c13e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
index ca3e03999..4f2d41b40 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java
index b00e35299..4afa646f2 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java
@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
index 170f7448f..28c1e27e2 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceMode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceMode.java
index 594e2f66d..bfc4a3de3 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceMode.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceMode.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.github.dockerjava.core.RemoteApiVersion;
-
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
index 1a79d2a92..281f4424a 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
index 9d6d2e353..077525221 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java
index 00865c7fa..240e6c177 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java
index 9ab390874..639c84b2c 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
index db1617c52..174cec3c8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
index f6498ac62..0756024b0 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java
index 2b763e2fa..e748bbd4a 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
index 8c995628c..3240d8147 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
index 2b387e0b5..efdc1d697 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
index 94f74d73d..cc443f3e9 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
index 73b04361f..f9ca423fa 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
index fb96dc2df..1fc1f2a91 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java
index a0287129e..1ab24146f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
index ca9e1c5a2..5a7abe22f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
index afec7f89d..be1327f77 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
index d721ff170..f437ed365 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
index a24f0c7db..afb5978f3 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
@@ -2,7 +2,6 @@
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
index 375a8afee..f017f3456 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
index 30612f3a4..4312f8999 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java
index a2341a59d..224fd70f5 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
index 3be0096a7..49a038431 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeState.java
index 14b92a819..6a2776716 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeState.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeState.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
index 4ea160c85..abd596f39 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
index 8bcb336ba..99ac27c9b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
index f3d736c7b..02a571f75 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
index fa788c9b6..b0dc004eb 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
index f40a12243..02c449eab 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
index d270bb616..a18275beb 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java
index 14dc49e1d..54e8e04a0 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
index 4d8fc508a..bcbe5f0bf 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
index 68daa302b..6453c726b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskState.java
index e0bf84f81..0a2cb55d8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskState.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskState.java
@@ -1,8 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.github.dockerjava.core.RemoteApiVersion;
-
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
index 10a0598c4..f96da2877 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
index e5b8663b2..a6a4dd1d0 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
index 68859998c..08f054801 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
index f6a915076..34c63fbbe 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java
index b1b1188d0..37587de91 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 import javax.annotation.CheckForNull;
 import java.util.List;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java
index d27dbde02..f4b1fb009 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateOrder.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateOrder.java
index 75386b938..3f74388de 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateOrder.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateOrder.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_36}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
index ced70b13d..598d24c3a 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
index 948ae0a4b..8e2fbe414 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java
index 718d5c71d..c5b251aa6 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
index 229cee3ed..0d53844dd 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
@@ -19,7 +19,6 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.node.NullNode;
-import com.github.dockerjava.core.RemoteApiVersion;
 
 /**
  * Represents a bind mounted volume in a Docker container.
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
new file mode 100644
index 000000000..2a7f0cfba
--- /dev/null
+++ b/docker-java-core/pom.xml
@@ -0,0 +1,79 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.github.docker-java</groupId>
+		<artifactId>docker-java-parent</artifactId>
+		<version>3.1.6-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>docker-java-core</artifactId>
+	<packaging>bundle</packaging>
+
+	<name>docker-java-core</name>
+	<url>https://github.com/docker-java/docker-java</url>
+	<description>Java API Client for Docker</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>${groupId}</groupId>
+			<artifactId>docker-java-api</artifactId>
+			<version>${version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j-api.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>${commons-io.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-compress</artifactId>
+			<version>${commons-compress.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.bouncycastle</groupId>
+			<artifactId>bcpkix-jdk15on</artifactId>
+			<version>${bouncycastle.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.google.code.findbugs</groupId>
+			<artifactId>annotations</artifactId>
+			<version>3.0.1u2</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Export-Package>com.github.dockerjava.core.*</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>8</source>
+					<target>8</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
similarity index 99%
rename from docker-java/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
index ebc8b60b5..34fdceb37 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
@@ -146,7 +146,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-public abstract class AbstractDockerCmdExecFactory implements DockerCmdExecFactory {
+public abstract class AbstractDockerCmdExecFactory implements DockerCmdExecFactory, DockerClientConfigAware {
 
     private DockerClientConfig dockerClientConfig;
 
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
similarity index 100%
rename from docker-java-api/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfigAware.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfigAware.java
new file mode 100644
index 000000000..5cee4d6cb
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfigAware.java
@@ -0,0 +1,6 @@
+package com.github.dockerjava.core;
+
+public interface DockerClientConfigAware {
+
+    void init(DockerClientConfig dockerClientConfig);
+}
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
similarity index 99%
rename from docker-java/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 87ba0214e..3f06ec0da 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -197,7 +197,9 @@ public static DockerClientImpl getInstance(String serverUrl) {
     public DockerClientImpl withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) {
         checkNotNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified");
         this.dockerCmdExecFactory = dockerCmdExecFactory;
-        this.dockerCmdExecFactory.init(dockerClientConfig);
+        if (dockerCmdExecFactory instanceof DockerClientConfigAware) {
+            ((DockerClientConfigAware) dockerCmdExecFactory).init(dockerClientConfig);
+        }
         return this;
     }
 
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/DockerConfigFile.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java b/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/GoLangMatchFileFilter.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/InvocationBuilder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/InvocationBuilder.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/InvocationBuilder.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/InvocationBuilder.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/MediaType.java b/docker-java-core/src/main/java/com/github/dockerjava/core/MediaType.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/MediaType.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/MediaType.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/NameParser.java b/docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/NameParser.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
similarity index 100%
rename from docker-java-api/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/core/SSLConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/SSLConfig.java
similarity index 100%
rename from docker-java-api/src/main/java/com/github/dockerjava/core/SSLConfig.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/SSLConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/WebTarget.java b/docker-java-core/src/main/java/com/github/dockerjava/core/WebTarget.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/WebTarget.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/WebTarget.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java b/docker-java-core/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java b/docker-java-core/src/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/async/ResponseStreamProcessor.java
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/docker-java-core/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
new file mode 100644
index 000000000..32c5de018
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -0,0 +1,19 @@
+/*
+ * Created on 16.06.2015
+ */
+package com.github.dockerjava.core.async;
+
+import com.github.dockerjava.api.async.ResultCallback;
+
+/**
+ * Abstract template implementation of {@link ResultCallback}
+ *
+ * @author Marcus Linke
+ * @deprecated use {@link com.github.dockerjava.api.async.ResultCallbackTemplate}
+ *
+ */
+@Deprecated
+public abstract class ResultCallbackTemplate<RC_T extends ResultCallback<A_RES_T>, A_RES_T>
+        extends com.github.dockerjava.api.async.ResultCallbackTemplate<RC_T, A_RES_T> {
+
+}
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/AuthCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/FrameReader.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/FrameReader.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/FrameReader.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/InfoCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/InpectNetworkCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InpectNetworkCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/InpectNetworkCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/InpectNetworkCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/InspectSwarmCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectSwarmCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/InspectSwarmCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectSwarmCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/LeaveSwarmCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LeaveSwarmCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/LeaveSwarmCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/LeaveSwarmCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/ListTasksCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListTasksCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/ListTasksCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/ListTasksCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/LogSwarmObjectImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogSwarmObjectImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/LogSwarmObjectImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/LogSwarmObjectImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/PingCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/RemoveNetworkCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveNetworkCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/RemoveNetworkCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveNetworkCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/VersionCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/docker-java-core/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java b/docker-java-core/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exception/GoLangFileMatchException.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exception/GoLangFileMatchException.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exception/GoLangFileMatchException.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exception/GoLangFileMatchException.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exception/InvalidRepositoryNameException.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exception/InvalidRepositoryNameException.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exception/InvalidRepositoryNameException.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exception/InvalidRepositoryNameException.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/AbstrAsyncDockerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrAsyncDockerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/AbstrAsyncDockerCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrAsyncDockerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/AbstrSyncDockerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrSyncDockerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/AbstrSyncDockerCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrSyncDockerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/AttachContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AttachContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/AttachContainerCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/AttachContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/AuthCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AuthCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/AuthCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/AuthCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/CommitCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CommitCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/CommitCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/CommitCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/ContainerDiffCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ContainerDiffCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/ContainerDiffCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/ContainerDiffCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/CopyArchiveFromContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CopyArchiveFromContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/CopyArchiveFromContainerCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/CopyArchiveFromContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/CopyArchiveToContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CopyArchiveToContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/CopyArchiveToContainerCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/CopyArchiveToContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/CopyFileFromContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CopyFileFromContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/CopyFileFromContainerCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/CopyFileFromContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/CreateImageCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateImageCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/CreateImageCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateImageCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/CreateNetworkCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateNetworkCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/CreateNetworkCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateNetworkCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/CreateSecretCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateSecretCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/CreateSecretCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateSecretCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/CreateServiceCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateServiceCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/CreateServiceCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateServiceCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/CreateVolumeCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateVolumeCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/CreateVolumeCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateVolumeCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/EventsCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/EventsCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/EventsCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/EventsCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/ExecCreateCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ExecCreateCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/ExecCreateCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/ExecCreateCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/ExecStartCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ExecStartCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/ExecStartCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/ExecStartCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/InfoCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InfoCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/InfoCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/InfoCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/InspectContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/InspectContainerCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/InspectExecCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectExecCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/InspectExecCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectExecCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/InspectImageCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectImageCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/InspectImageCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectImageCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/InspectNetworkCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectNetworkCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/InspectNetworkCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectNetworkCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/InspectServiceCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectServiceCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/InspectServiceCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectServiceCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/InspectSwarmCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectSwarmCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/InspectSwarmCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectSwarmCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/InspectSwarmNodeCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectSwarmNodeCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/InspectSwarmNodeCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectSwarmNodeCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/InspectVolumeCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectVolumeCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/InspectVolumeCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectVolumeCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/ListContainersCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListContainersCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/ListContainersCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListContainersCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/ListImagesCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListImagesCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/ListImagesCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListImagesCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/ListNetworksCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListNetworksCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/ListNetworksCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListNetworksCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/ListSecretsCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListSecretsCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/ListSecretsCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListSecretsCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/ListServicesCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListServicesCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/ListServicesCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListServicesCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/ListSwarmNodesCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListSwarmNodesCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/ListSwarmNodesCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListSwarmNodesCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/ListTasksCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListTasksCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/ListTasksCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListTasksCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/ListVolumesCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListVolumesCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/ListVolumesCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListVolumesCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/LoadImageCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LoadImageCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/LoadImageCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/LoadImageCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/LogSwarmObjectExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LogSwarmObjectExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/LogSwarmObjectExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/LogSwarmObjectExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/PruneCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PruneCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/PruneCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/PruneCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/PullImageCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PullImageCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/PullImageCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/PullImageCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveContainerCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveImageCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveImageCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveImageCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveImageCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveNetworkCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveNetworkCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveNetworkCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveNetworkCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveSecretCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveSecretCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveSecretCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveSecretCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveServiceCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveServiceCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveServiceCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveServiceCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveSwarmNodeCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveSwarmNodeCmdExec.java
similarity index 94%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveSwarmNodeCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveSwarmNodeCmdExec.java
index f7c0dc955..a58954f84 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveSwarmNodeCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveSwarmNodeCmdExec.java
@@ -11,7 +11,7 @@
 public class RemoveSwarmNodeCmdExec extends AbstrSyncDockerCmdExec<RemoveSwarmNodeCmd, Void> implements
         RemoveSwarmNodeCmd.Exec {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(com.github.dockerjava.jaxrs.RemoveSwarmNodeCmdExec.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveSwarmNodeCmdExec.class);
 
     public RemoveSwarmNodeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
         super(baseResource, dockerClientConfig);
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveVolumeCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveVolumeCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/RemoveVolumeCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveVolumeCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/SaveImageCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SaveImageCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/SaveImageCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/SaveImageCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/UpdateContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/UpdateContainerCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/VersionCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/VersionCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/VersionCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/VersionCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/exec/WaitContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/WaitContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/exec/WaitContainerCmdExec.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/exec/WaitContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java
similarity index 68%
rename from docker-java/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java
index 2a24f76ae..fd2dd50b9 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java
@@ -2,9 +2,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
 
-import javax.ws.rs.core.MediaType;
 import java.util.Collection;
 
 /**
@@ -15,8 +13,7 @@ public class CacheFromEncoder {
     private CacheFromEncoder() {
     }
 
-    private static final ObjectMapper MAPPER = new JacksonJaxbJsonProvider().locateMapper(Collection.class,
-            MediaType.APPLICATION_JSON_TYPE);
+    private static final ObjectMapper MAPPER = new ObjectMapper();
 
     public static String jsonEncode(Collection<String> imageIds) {
         try {
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/util/FilePathUtil.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/FilePathUtil.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/util/FilePathUtil.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/util/FilePathUtil.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/util/SwarmNodesFiltersBuilder.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
rename to docker-java-core/src/main/java/com/github/dockerjava/core/util/TarDirWalker.java
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
new file mode 100644
index 000000000..da6d6a7d1
--- /dev/null
+++ b/docker-java-transport-jersey/pom.xml
@@ -0,0 +1,87 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.github.docker-java</groupId>
+		<artifactId>docker-java-parent</artifactId>
+		<version>3.1.6-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>docker-java-transport-jersey</artifactId>
+	<packaging>bundle</packaging>
+
+	<name>docker-java-transport-jersey</name>
+	<url>https://github.com/docker-java/docker-java</url>
+	<description>Java API Client for Docker</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>${groupId}</groupId>
+			<artifactId>docker-java-core</artifactId>
+			<version>${version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.jaxrs</groupId>
+			<artifactId>jackson-jaxrs-json-provider</artifactId>
+			<version>${jackson-jaxrs.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.connectors</groupId>
+			<artifactId>jersey-apache-connector</artifactId>
+			<version>${jersey.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+			<version>4.4.10</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>${httpclient.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.core</groupId>
+			<artifactId>jersey-client</artifactId>
+			<version>${jersey.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.inject</groupId>
+			<artifactId>jersey-hk2</artifactId>
+			<version>${jersey.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.kohlschutter.junixsocket</groupId>
+			<artifactId>junixsocket-common</artifactId>
+			<version>${junixsocket.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.kohlschutter.junixsocket</groupId>
+			<artifactId>junixsocket-native-common</artifactId>
+			<version>${junixsocket.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Export-Package>com.github.dockerjava.jaxrs.*</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
similarity index 99%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
index 96a747504..158a93706 100644
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -77,6 +77,7 @@
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.DockerClientConfigAware;
 import com.github.dockerjava.core.SSLConfig;
 import com.github.dockerjava.jaxrs.filter.JsonClientFilter;
 import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter;
@@ -116,7 +117,7 @@
 //import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 // see https://github.com/docker-java/docker-java/issues/196
 
-public class JerseyDockerCmdExecFactory implements DockerCmdExecFactory {
+public class JerseyDockerCmdExecFactory implements DockerCmdExecFactory, DockerClientConfigAware {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(JerseyDockerCmdExecFactory.class.getName());
 
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
rename to docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml
new file mode 100644
index 000000000..e8370a3a9
--- /dev/null
+++ b/docker-java-transport-netty/pom.xml
@@ -0,0 +1,68 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.github.docker-java</groupId>
+		<artifactId>docker-java-parent</artifactId>
+		<version>3.1.6-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>docker-java-transport-netty</artifactId>
+	<packaging>bundle</packaging>
+
+	<name>docker-java-transport-netty</name>
+	<url>https://github.com/docker-java/docker-java</url>
+	<description>Java API Client for Docker</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>${groupId}</groupId>
+			<artifactId>docker-java-core</artifactId>
+			<version>${version}</version>
+		</dependency>
+
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec-http</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler-proxy</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport-native-epoll</artifactId>
+            <version>${netty.version}</version>
+            <classifier>linux-x86_64</classifier>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport-native-kqueue</artifactId>
+            <version>${netty.version}</version>
+            <classifier>osx-x86_64</classifier>
+        </dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Export-Package>com.github.dockerjava.netty.*</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/docker-java/src/main/java/com/github/dockerjava/netty/ChannelProvider.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/ChannelProvider.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/netty/ChannelProvider.java
rename to docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/ChannelProvider.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
similarity index 98%
rename from docker-java/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
rename to docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index ae575380e..ff55892bf 100644
--- a/docker-java/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -19,7 +19,6 @@
 
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.DockerClientImpl;
 import com.github.dockerjava.core.SSLConfig;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
@@ -53,7 +52,7 @@
  * Experimental implementation of {@link DockerCmdExecFactory} that supports http connection hijacking that is needed to pass STDIN to the
  * container.
  * <p>
- * To use it just pass an instance via {@link DockerClientImpl#withDockerCmdExecFactory(DockerCmdExecFactory)}
+ * To use it just pass an instance via {@link com.github.dockerjava.core.DockerClientImpl#withDockerCmdExecFactory(DockerCmdExecFactory)}
  *
  * @author Marcus Linke
  * @see https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#attach-to-a-container
diff --git a/docker-java/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
rename to docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
rename to docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
rename to docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandler.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpConnectionHijackHandler.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/HttpConnectionHijackHandler.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpConnectionHijackHandler.java
rename to docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/HttpConnectionHijackHandler.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java
rename to docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/HttpRequestProvider.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
rename to docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/HttpResponseHandler.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
rename to docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandler.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
rename to docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
rename to docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 6d9cc0377..2092e575d 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -18,97 +18,26 @@
 	<dependencies>
 		<dependency>
 			<groupId>${groupId}</groupId>
-			<artifactId>docker-java-api</artifactId>
+			<artifactId>docker-java-core</artifactId>
 			<version>${version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.fasterxml.jackson.jaxrs</groupId>
-			<artifactId>jackson-jaxrs-json-provider</artifactId>
-			<version>${jackson-jaxrs.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.connectors</groupId>
-			<artifactId>jersey-apache-connector</artifactId>
-			<version>${jersey.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpcore</artifactId>
-			<version>4.4.10</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>${httpclient.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.core</groupId>
-			<artifactId>jersey-client</artifactId>
-			<version>${jersey.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.inject</groupId>
-			<artifactId>jersey-hk2</artifactId>
-			<version>${jersey.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.kohlschutter.junixsocket</groupId>
-			<artifactId>junixsocket-common</artifactId>
-			<version>${junixsocket.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.kohlschutter.junixsocket</groupId>
-			<artifactId>junixsocket-native-common</artifactId>
-			<version>${junixsocket.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-compress</artifactId>
-			<version>${commons-compress.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>${commons-codec.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>${commons-lang.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>${commons-io.version}</version>
+			<groupId>${groupId}</groupId>
+			<artifactId>docker-java-transport-jersey</artifactId>
+			<version>${version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>${slf4j-api.version}</version>
+			<groupId>${groupId}</groupId>
+			<artifactId>docker-java-transport-netty</artifactId>
+			<version>${version}</version>
 		</dependency>
+
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
 			<version>${slf4j-api.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>${guava.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcpkix-jdk15on</artifactId>
-			<version>${bouncycastle.version}</version>
-		</dependency>
-
 		<!-- /// Test /////////////////////////// -->
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
@@ -164,34 +93,6 @@
 			<version>3.0.1u2</version>
 			<scope>provided</scope>
 		</dependency>
-
-		<dependency>
-			<groupId>io.netty</groupId>
-			<artifactId>netty-codec-http</artifactId>
-			<version>${netty.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.netty</groupId>
-			<artifactId>netty-handler</artifactId>
-			<version>${netty.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.netty</groupId>
-			<artifactId>netty-handler-proxy</artifactId>
-			<version>${netty.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.netty</groupId>
-			<artifactId>netty-transport-native-epoll</artifactId>
-			<version>${netty.version}</version>
-			<classifier>linux-x86_64</classifier>
-		</dependency>
-		<dependency>
-			<groupId>io.netty</groupId>
-			<artifactId>netty-transport-native-kqueue</artifactId>
-			<version>${netty.version}</version>
-			<classifier>osx-x86_64</classifier>
-		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
diff --git a/docker-java/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/docker-java/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
deleted file mode 100644
index 1d407e233..000000000
--- a/docker-java/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-/**
- * @author Kanstantsin Shautsou
- * @deprecated clashes with netty impl.
- */
-@Deprecated
-public class DockerCmdExecFactoryImpl extends JerseyDockerCmdExecFactory {
-}
diff --git a/docker-java/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java b/docker-java/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
deleted file mode 100644
index 25825d169..000000000
--- a/docker-java/src/main/java/com/github/dockerjava/netty/DockerCmdExecFactoryImpl.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.github.dockerjava.netty;
-
-/**
- * @author Kanstantsin Shautsou
- * @deprecated old clashing name
- */
-@Deprecated
-public class DockerCmdExecFactoryImpl extends NettyDockerCmdExecFactory {
-}
diff --git a/docker-java/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java b/docker-java/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java
deleted file mode 100644
index e42465418..000000000
--- a/docker-java/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java
+++ /dev/null
@@ -1,335 +0,0 @@
-// Modified version (see https://github.com/docker-java/docker-java/pull/697)
-/*
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-
-package org.apache.http.impl.io;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.http.ConnectionClosedException;
-import org.apache.http.Header;
-import org.apache.http.HttpException;
-import org.apache.http.MalformedChunkCodingException;
-import org.apache.http.TruncatedChunkException;
-import org.apache.http.config.MessageConstraints;
-import org.apache.http.io.BufferInfo;
-import org.apache.http.io.SessionInputBuffer;
-import org.apache.http.util.Args;
-import org.apache.http.util.CharArrayBuffer;
-
-/**
- * Implements chunked transfer coding. The content is received in small chunks.
- * Entities transferred using this input stream can be of unlimited length.
- * After the stream is read to the end, it provides access to the trailers,
- * if any.
- * <p>
- * Note that this class NEVER closes the underlying stream, even when close
- * gets called.  Instead, it will read until the "end" of its chunking on
- * close, which allows for the seamless execution of subsequent HTTP 1.1
- * requests, while not requiring the client to remember to read the entire
- * contents of the response.
- *
- *
- * @since 4.0
- *
- */
-public class ChunkedInputStream extends InputStream {
-
-    private static final int CHUNK_LEN               = 1;
-    private static final int CHUNK_DATA              = 2;
-    private static final int CHUNK_CRLF              = 3;
-    private static final int CHUNK_INVALID           = Integer.MAX_VALUE;
-
-    private static final int BUFFER_SIZE = 2048;
-
-    /** The session input buffer */
-    private final SessionInputBuffer in;
-    private final CharArrayBuffer buffer;
-    private final MessageConstraints constraints;
-
-    private int state;
-
-    /** The chunk size */
-    private long chunkSize;
-
-    /** The current position within the current chunk */
-    private long pos;
-
-    /** True if we've reached the end of stream */
-    private boolean eof = false;
-
-    /** True if this stream is closed */
-    private boolean closed = false;
-
-    private Header[] footers = new Header[] {};
-
-    /**
-     * Wraps session input stream and reads chunk coded input.
-     *
-     * @param in The session input buffer
-     * @param constraints Message constraints. If {@code null}
-     *   {@link MessageConstraints#DEFAULT} will be used.
-     *
-     * @since 4.4
-     */
-    public ChunkedInputStream(final SessionInputBuffer in, final MessageConstraints constraints) {
-        super();
-        this.in = Args.notNull(in, "Session input buffer");
-        this.pos = 0L;
-        this.buffer = new CharArrayBuffer(16);
-        this.constraints = constraints != null ? constraints : MessageConstraints.DEFAULT;
-        this.state = CHUNK_LEN;
-    }
-
-    /**
-     * Wraps session input stream and reads chunk coded input.
-     *
-     * @param in The session input buffer
-     */
-    public ChunkedInputStream(final SessionInputBuffer in) {
-        this(in, null);
-    }
-
-    @Override
-    public int available() throws IOException {
-        if (this.in instanceof BufferInfo) {
-            final int len = ((BufferInfo) this.in).length();
-            return (int) Math.min(len, this.chunkSize - this.pos);
-        } else {
-            return 0;
-        }
-    }
-
-    /**
-     * <p> Returns all the data in a chunked stream in coalesced form. A chunk
-     * is followed by a CRLF. The method returns -1 as soon as a chunksize of 0
-     * is detected.</p>
-     *
-     * <p> Trailer headers are read automatically at the end of the stream and
-     * can be obtained with the getResponseFooters() method.</p>
-     *
-     * @return -1 of the end of the stream has been reached or the next data
-     * byte
-     * @throws IOException in case of an I/O error
-     */
-    @Override
-    public int read() throws IOException {
-        if (this.closed) {
-            throw new IOException("Attempted read from closed stream.");
-        }
-        if (this.eof) {
-            return -1;
-        }
-        if (state != CHUNK_DATA) {
-            nextChunk();
-            if (this.eof) {
-                return -1;
-            }
-        }
-        final int b = in.read();
-        if (b != -1) {
-            pos++;
-            if (pos >= chunkSize) {
-                state = CHUNK_CRLF;
-            }
-        }
-        return b;
-    }
-
-    /**
-     * Read some bytes from the stream.
-     * @param b The byte array that will hold the contents from the stream.
-     * @param off The offset into the byte array at which bytes will start to be
-     * placed.
-     * @param len the maximum number of bytes that can be returned.
-     * @return The number of bytes returned or -1 if the end of stream has been
-     * reached.
-     * @throws IOException in case of an I/O error
-     */
-    @Override
-    public int read(final byte[] b, final int off, final int len) throws IOException {
-
-        if (closed) {
-            throw new IOException("Attempted read from closed stream.");
-        }
-
-        if (eof) {
-            return -1;
-        }
-        if (state != CHUNK_DATA) {
-            nextChunk();
-            if (eof) {
-                return -1;
-            }
-        }
-        final int bytesRead = in.read(b, off, (int) Math.min(len, chunkSize - pos));
-        if (bytesRead != -1) {
-            pos += bytesRead;
-            if (pos >= chunkSize) {
-                state = CHUNK_CRLF;
-            }
-            return bytesRead;
-        } else {
-            eof = true;
-            throw new TruncatedChunkException("Truncated chunk "
-                    + "( expected size: " + chunkSize
-                    + "; actual size: " + pos + ")");
-        }
-    }
-
-    /**
-     * Read some bytes from the stream.
-     * @param b The byte array that will hold the contents from the stream.
-     * @return The number of bytes returned or -1 if the end of stream has been
-     * reached.
-     * @throws IOException in case of an I/O error
-     */
-    @Override
-    public int read(final byte[] b) throws IOException {
-        return read(b, 0, b.length);
-    }
-
-    /**
-     * Read the next chunk.
-     * @throws IOException in case of an I/O error
-     */
-    private void nextChunk() throws IOException {
-        if (state == CHUNK_INVALID) {
-            throw new MalformedChunkCodingException("Corrupt data stream");
-        }
-        try {
-            chunkSize = getChunkSize();
-            if (chunkSize < 0L) {
-                throw new MalformedChunkCodingException("Negative chunk size");
-            }
-            state = CHUNK_DATA;
-            pos = 0L;
-            if (chunkSize == 0L) {
-                eof = true;
-                parseTrailerHeaders();
-            }
-        } catch (MalformedChunkCodingException ex) {
-            state = CHUNK_INVALID;
-            throw ex;
-        }
-    }
-
-    /**
-     * Expects the stream to start with a chunksize in hex with optional
-     * comments after a semicolon. The line must end with a CRLF: "a3; some
-     * comment\r\n" Positions the stream at the start of the next line.
-     */
-    private long getChunkSize() throws IOException {
-        final int st = this.state;
-        switch (st) {
-        case CHUNK_CRLF:
-            this.buffer.clear();
-            final int bytesRead1 = this.in.readLine(this.buffer);
-            if (bytesRead1 == -1) {
-                throw new MalformedChunkCodingException(
-                    "CRLF expected at end of chunk");
-            }
-            if (!this.buffer.isEmpty()) {
-                throw new MalformedChunkCodingException(
-                    "Unexpected content at the end of chunk");
-            }
-            state = CHUNK_LEN;
-            //$FALL-THROUGH$
-        case CHUNK_LEN:
-            this.buffer.clear();
-            final int bytesRead2 = this.in.readLine(this.buffer);
-            if (bytesRead2 == -1) {
-                throw new ConnectionClosedException("Premature end of chunk coded message body: " +
-                        "closing chunk expected");
-            }
-            int separator = this.buffer.indexOf(';');
-            if (separator < 0) {
-                separator = this.buffer.length();
-            }
-            final String s = this.buffer.substringTrimmed(0, separator);
-            try {
-                return Long.parseLong(s, 16);
-            } catch (final NumberFormatException e) {
-                throw new MalformedChunkCodingException("Bad chunk header: " + s);
-            }
-        default:
-            throw new IllegalStateException("Inconsistent codec state");
-        }
-    }
-
-    /**
-     * Reads and stores the Trailer headers.
-     * @throws IOException in case of an I/O error
-     */
-    private void parseTrailerHeaders() throws IOException {
-        try {
-            this.footers = AbstractMessageParser.parseHeaders(in,
-                    constraints.getMaxHeaderCount(),
-                    constraints.getMaxLineLength(),
-                    null);
-        } catch (final HttpException ex) {
-            final IOException ioe = new MalformedChunkCodingException("Invalid footer: "
-                    + ex.getMessage());
-            ioe.initCause(ex);
-            throw ioe;
-        }
-    }
-
-    /**
-     * Upon close, this reads the remainder of the chunked message,
-     * leaving the underlying socket at a position to start reading the
-     * next response without scanning.
-     * @throws IOException in case of an I/O error
-     */
-    @Override
-    public void close() throws IOException {
-        if (!closed) {
-            try {
-                if (!eof && state != CHUNK_INVALID) {
-                    // read and discard the remainder of the message
-                    final byte[] buff = new byte[BUFFER_SIZE];
-                    try {
-                        while (read(buff) >= 0) {
-                           continue;
-                        }
-                    } catch (ConnectionClosedException | TruncatedChunkException e) {
-                        // just ignore
-                    }
-                }
-            } finally {
-                eof = true;
-                closed = true;
-            }
-        }
-    }
-
-    public Header[] getFooters() {
-        return this.footers.clone();
-    }
-
-}
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index f2c6d7630..a052e0d58 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -88,7 +88,7 @@
  *
  * @author Marcus Linke
  */
-public class TestDockerCmdExecFactory implements DockerCmdExecFactory {
+public class TestDockerCmdExecFactory implements DockerCmdExecFactory, DockerClientConfigAware {
 
     private List<String> containerNames = new ArrayList<>();
 
@@ -106,7 +106,9 @@ public TestDockerCmdExecFactory(DockerCmdExecFactory delegate) {
 
     @Override
     public void init(DockerClientConfig dockerClientConfig) {
-        delegate.init(dockerClientConfig);
+        if (delegate instanceof DockerClientConfigAware) {
+            ((DockerClientConfigAware) delegate).init(dockerClientConfig);
+        }
     }
 
     @Override
diff --git a/pom.xml b/pom.xml
index 7287c5ae5..556196fd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,9 @@
 
 	<modules>
 		<module>docker-java-api</module>
+		<module>docker-java-core</module>
+		<module>docker-java-transport-netty</module>
+		<module>docker-java-transport-jersey</module>
 		<module>docker-java</module>
 	</modules>
 

From bf4fb106576f9aecaa83fe51cece135eedf71ef8 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 29 Sep 2019 22:06:13 +0300
Subject: [PATCH 0939/1272] Fix parent version

---
 docker-java-core/pom.xml             | 2 +-
 docker-java-transport-jersey/pom.xml | 2 +-
 docker-java-transport-netty/pom.xml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index 2a7f0cfba..ee1800dfa 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.1.6-SNAPSHOT</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index da6d6a7d1..295440266 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.1.6-SNAPSHOT</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml
index e8370a3a9..91483c167 100644
--- a/docker-java-transport-netty/pom.xml
+++ b/docker-java-transport-netty/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.1.6-SNAPSHOT</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

From e184bb1accc447a21c58869239180bfa2f2fe93f Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 5 Oct 2019 22:20:02 +0300
Subject: [PATCH 0940/1272] [maven-release-plugin] prepare release 3.2.0-rc1

---
 docker-java-api/pom.xml              | 2 +-
 docker-java-core/pom.xml             | 2 +-
 docker-java-transport-jersey/pom.xml | 2 +-
 docker-java-transport-netty/pom.xml  | 2 +-
 docker-java/pom.xml                  | 2 +-
 pom.xml                              | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 868fda2e9..24b85d45c 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index ee1800dfa..aec209bb5 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index 295440266..e18e6124e 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml
index 91483c167..8e31ecfd2 100644
--- a/docker-java-transport-netty/pom.xml
+++ b/docker-java-transport-netty/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 2092e575d..ef342f514 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index 556196fd6..61cd6f280 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.2.0-SNAPSHOT</version>
+	<version>3.2.0-rc1</version>
 
 	<name>docker-java-parent</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.2.0-rc1</tag>
 	</scm>
 
 	<developers>

From 67c7f337cdb013ea660c0f50bc30dfb7adb3068d Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 5 Oct 2019 22:20:11 +0300
Subject: [PATCH 0941/1272] [maven-release-plugin] prepare for next development
 iteration

---
 docker-java-api/pom.xml              | 2 +-
 docker-java-core/pom.xml             | 2 +-
 docker-java-transport-jersey/pom.xml | 2 +-
 docker-java-transport-netty/pom.xml  | 2 +-
 docker-java/pom.xml                  | 2 +-
 pom.xml                              | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 24b85d45c..868fda2e9 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc1</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index aec209bb5..ee1800dfa 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc1</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index e18e6124e..295440266 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc1</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml
index 8e31ecfd2..91483c167 100644
--- a/docker-java-transport-netty/pom.xml
+++ b/docker-java-transport-netty/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc1</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index ef342f514..2092e575d 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc1</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index 61cd6f280..556196fd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.2.0-rc1</version>
+	<version>3.2.0-SNAPSHOT</version>
 
 	<name>docker-java-parent</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.2.0-rc1</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 655ae8666c506d0c38858e401a9d7e881512e725 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 6 Oct 2019 20:38:33 +0200
Subject: [PATCH 0942/1272] Remove Guava from the API module (#1255)

---
 docker-java-api/pom.xml                       |  6 -----
 .../api/async/ResultCallbackTemplate.java     | 10 +++++---
 .../api/command/TopContainerResponse.java     | 14 +++++++----
 .../github/dockerjava/api/model/Device.java   |  8 +++----
 .../dockerjava/api/model/HostConfig.java      | 24 +++++++++----------
 .../dockerjava/api/model/Identifier.java      | 15 +++++-------
 .../dockerjava/api/model/Repository.java      |  6 ++---
 .../dockerjava/api/model/RestartPolicy.java   |  6 ++---
 .../github/dockerjava/api/model/Ulimit.java   |  6 ++---
 docker-java-core/pom.xml                      |  6 +++++
 10 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 868fda2e9..ae89c4e0f 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -32,12 +32,6 @@
 			<version>${commons-codec.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>${guava.version}</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallbackTemplate.java b/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallbackTemplate.java
index 1b988d35a..8c56ab093 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallbackTemplate.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallbackTemplate.java
@@ -3,7 +3,6 @@
  */
 package com.github.dockerjava.api.async;
 
-import com.google.common.base.Throwables;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -134,8 +133,13 @@ public boolean awaitStarted(long timeout, TimeUnit timeUnit) throws InterruptedE
      */
     protected void throwFirstError() {
         if (firstError != null) {
-            // this call throws a RuntimeException
-            Throwables.propagate(firstError);
+            if (firstError instanceof Error) {
+              throw (Error) firstError;
+            }
+            if (firstError instanceof RuntimeException) {
+              throw (RuntimeException) firstError;
+            }
+            throw new RuntimeException(firstError);
         }
     }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
index cd6da6814..717a6a410 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Joiner;
 
 /**
  *
@@ -28,14 +27,19 @@ public String[][] getProcesses() {
 
     @Override
     public String toString() {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder("TopContainerResponse{");
+        buffer.append("titles=");
+        buffer.append(String.join("; ", titles));
+        buffer.append(", processes=");
         buffer.append("[");
         for (String[] fields : processes) {
-            buffer.append("[" + Joiner.on("; ").skipNulls().join(fields) + "]");
+            buffer.append("[")
+                    .append(String.join("; ", fields))
+                    .append("]");
         }
         buffer.append("]");
+        buffer.append("}");
 
-        return "TopContainerResponse{" + "titles=" + Joiner.on("; ").skipNulls().join(titles) + ", processes="
-                + buffer.toString() + '}';
+        return buffer.toString();
     }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java
index 32155271c..6edc41051 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.api.model;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
 import static org.apache.commons.lang.BooleanUtils.isNotTrue;
 import static org.apache.commons.lang.StringUtils.isEmpty;
 
@@ -34,9 +34,9 @@ public Device() {
     }
 
     public Device(String cGroupPermissions, String pathInContainer, String pathOnHost) {
-        checkNotNull(cGroupPermissions, "cGroupPermissions is null");
-        checkNotNull(pathInContainer, "pathInContainer is null");
-        checkNotNull(pathOnHost, "pathOnHost is null");
+        requireNonNull(cGroupPermissions, "cGroupPermissions is null");
+        requireNonNull(pathInContainer, "pathInContainer is null");
+        requireNonNull(pathOnHost, "pathOnHost is null");
         this.cGroupPermissions = cGroupPermissions;
         this.pathInContainer = pathInContainer;
         this.pathOnHost = pathOnHost;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 157407f34..b39705da0 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
 
 /**
  * Used in `/containers/create`, and in inspect container.
@@ -573,13 +573,13 @@ public HostConfig withBinds(Binds binds) {
     }
 
     public HostConfig withBinds(Bind... binds) {
-        checkNotNull(binds, "binds was not specified");
+        requireNonNull(binds, "binds was not specified");
         setBinds(binds);
         return this;
     }
 
     public HostConfig withBinds(List<Bind> binds) {
-        checkNotNull(binds, "binds was not specified");
+        requireNonNull(binds, "binds was not specified");
         return withBinds(binds.toArray(new Bind[binds.size()]));
     }
 
@@ -712,7 +712,7 @@ public HostConfig withDevices(Device... devices) {
     }
 
     public HostConfig withDevices(List<Device> devices) {
-        checkNotNull(devices, "devices was not specified");
+        requireNonNull(devices, "devices was not specified");
         return withDevices(devices.toArray(new Device[0]));
     }
 
@@ -733,7 +733,7 @@ public HostConfig withDns(String... dns) {
     }
 
     public HostConfig withDns(List<String> dns) {
-        checkNotNull(dns, "dns was not specified");
+        requireNonNull(dns, "dns was not specified");
         return withDns(dns.toArray(new String[0]));
     }
 
@@ -746,7 +746,7 @@ public HostConfig withDnsSearch(String... dnsSearch) {
     }
 
     public HostConfig withDnsSearch(List<String> dnsSearch) {
-        checkNotNull(dnsSearch, "dnsSearch was not specified");
+        requireNonNull(dnsSearch, "dnsSearch was not specified");
         return withDnsSearch(dnsSearch.toArray(new String[0]));
     }
 
@@ -775,13 +775,13 @@ public HostConfig withLinks(Links links) {
     }
 
     public HostConfig withLinks(Link... links) {
-        checkNotNull(links, "links was not specified");
+        requireNonNull(links, "links was not specified");
         setLinks(links);
         return this;
     }
 
     public HostConfig withLinks(List<Link> links) {
-        checkNotNull(links, "links was not specified");
+        requireNonNull(links, "links was not specified");
         return withLinks(links.toArray(new Link[0]));
     }
 
@@ -894,13 +894,13 @@ public HostConfig withPortBindings(Ports portBindings) {
     }
 
     public HostConfig withPortBindings(PortBinding... portBindings) {
-        checkNotNull(portBindings, "portBindings was not specified");
+        requireNonNull(portBindings, "portBindings was not specified");
         withPortBindings(new Ports(portBindings));
         return this;
     }
 
     public HostConfig withPortBindings(List<PortBinding> portBindings) {
-        checkNotNull(portBindings, "portBindings was not specified");
+        requireNonNull(portBindings, "portBindings was not specified");
         return withPortBindings(portBindings.toArray(new PortBinding[0]));
     }
 
@@ -985,7 +985,7 @@ public HostConfig withUlimits(Ulimit[] ulimits) {
     }
 
     public HostConfig withUlimits(List<Ulimit> ulimits) {
-        checkNotNull(ulimits, "no ulimits was specified");
+        requireNonNull(ulimits, "no ulimits was specified");
         return withUlimits(ulimits.toArray(new Ulimit[0]));
     }
 
@@ -1006,7 +1006,7 @@ public HostConfig withVolumesFrom(VolumesFrom... volumesFrom) {
     }
 
     public HostConfig withVolumesFrom(List<VolumesFrom> volumesFrom) {
-        checkNotNull(volumesFrom, "volumesFrom was not specified");
+        requireNonNull(volumesFrom, "volumesFrom was not specified");
         return withVolumesFrom(volumesFrom.toArray(new VolumesFrom[0]));
     }
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java
index 183724d0e..4605d978b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java
@@ -1,9 +1,7 @@
 package com.github.dockerjava.api.model;
 
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Optional;
-
 import java.io.Serializable;
+import java.util.Optional;
 
 /**
  * @author magnayn
@@ -18,11 +16,7 @@ public class Identifier implements Serializable {
     public Identifier(Repository repository, String tag) {
         this.repository = repository;
 
-        if (tag == null) {
-            this.tag = Optional.absent();
-        } else {
-            this.tag = Optional.of(tag);
-        }
+        this.tag = Optional.ofNullable(tag);
     }
 
     /**
@@ -55,6 +49,9 @@ public static Identifier fromCompoundString(String identifier) {
 
     @Override
     public String toString() {
-        return MoreObjects.toStringHelper(this).add("repository", repository).add("tag", tag).toString();
+        return "Identifier{" +
+                "repository=" + repository +
+                ", tag=" + tag +
+                '}';
     }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java
index e528fe3ac..62c3872fa 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java
@@ -4,8 +4,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import com.google.common.base.MoreObjects;
-
 /**
  * A repository or image name.
  */
@@ -36,7 +34,9 @@ public URL getURL() throws MalformedURLException {
 
     @Override
     public String toString() {
-        return MoreObjects.toStringHelper(this).add("name", name).toString();
+        return "Repository{" +
+                "name='" + name + '\'' +
+                '}';
     }
 
     public String getPath() {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
index 98e181a1b..4431376dc 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
@@ -9,6 +7,8 @@
 
 import java.io.Serializable;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  * Container restart policy
  *
@@ -41,7 +41,7 @@ public RestartPolicy() {
     }
 
     private RestartPolicy(int maximumRetryCount, String name) {
-        checkNotNull(name, "name is null");
+        requireNonNull(name, "name is null");
         this.maximumRetryCount = maximumRetryCount;
         this.name = name;
     }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java
index 5a37810a4..4181e422c 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
@@ -9,6 +7,8 @@
 
 import java.io.Serializable;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  * @author Vangie Du (duwan@live.com)
  */
@@ -28,7 +28,7 @@ public Ulimit() {
     }
 
     public Ulimit(String name, int soft, int hard) {
-        checkNotNull(name, "Name is null");
+        requireNonNull(name, "Name is null");
         this.name = name;
         this.soft = soft;
         this.hard = hard;
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index ee1800dfa..d559860e8 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -40,6 +40,12 @@
 			<version>${commons-compress.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>${guava.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcpkix-jdk15on</artifactId>

From fb11f94cde33e370f38e73b379f5ded366a1130e Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 27 Oct 2019 22:20:34 +0100
Subject: [PATCH 0943/1272] `exitCode` and `pid` should be long, fixes #1259

---
 .../api/command/HealthStateLog.java           | 11 ++++-
 .../api/command/InspectContainerResponse.java | 26 ++++++++++-
 .../api/command/InspectExecResponse.java      | 22 ++++++++-
 .../api/model/TaskStatusContainerStatus.java  | 46 +++++++++++++++++--
 4 files changed, 96 insertions(+), 9 deletions(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
index e7f4c15a9..9edee6127 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
@@ -13,7 +13,7 @@ public class HealthStateLog {
     private String end;
 
     @JsonProperty("ExitCode")
-    private Integer exitCode;
+    private Long exitCode;
 
     @JsonProperty("Output")
     private String output;
@@ -26,7 +26,16 @@ public String getEnd() {
         return end;
     }
 
+    /**
+     *
+     * @deprecated use {@link #getExitCodeLong()}
+     */
+    @Deprecated
     public Integer getExitCode() {
+        return exitCode != null ? exitCode.intValue() : null;
+    }
+
+    public Long getExitCodeLong() {
         return exitCode;
     }
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index be060c19b..0f4db37be 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -308,14 +308,14 @@ public class ContainerState {
          */
         @CheckForNull
         @JsonProperty("Pid")
-        private Integer pid;
+        private Long pid;
 
         /**
          * @since < {@link RemoteApiVersion#VERSION_1_16}
          */
         @CheckForNull
         @JsonProperty("ExitCode")
-        private Integer exitCode;
+        private Long exitCode;
 
         /**
          * @since {@link RemoteApiVersion#VERSION_1_17}
@@ -395,17 +395,39 @@ public Boolean getDead() {
 
         /**
          * See {@link #pid}
+         *
+         * @deprecated use {@link #getPidLong()}
          */
+        @Deprecated
         @CheckForNull
         public Integer getPid() {
+            return pid != null ? pid.intValue() : null;
+        }
+
+        /**
+         * See {@link #pid}
+         */
+        @CheckForNull
+        public Long getPidLong() {
             return pid;
         }
 
         /**
          * See {@link #exitCode}
+         *
+         * @deprecated use {@link #getExitCodeLong()}
          */
+        @Deprecated
         @CheckForNull
         public Integer getExitCode() {
+            return exitCode != null ? exitCode.intValue() : null;
+        }
+
+        /**
+         * See {@link #exitCode}
+         */
+        @CheckForNull
+        public Long getExitCodeLong() {
             return exitCode;
         }
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
index 613e69075..5f0c0e187 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
@@ -34,7 +34,7 @@ public class InspectExecResponse {
     private Boolean canRemove;
 
     @JsonProperty("ExitCode")
-    private Integer exitCode;
+    private Long exitCode;
 
     @JsonProperty("ProcessConfig")
     private ProcessConfig processConfig;
@@ -62,7 +62,7 @@ public class InspectExecResponse {
      * @since {@link RemoteApiVersion#VERSION_1_25}
      */
     @JsonProperty("Pid")
-    private Integer pid;
+    private Long pid;
 
     public String getId() {
         return id;
@@ -84,7 +84,15 @@ public Boolean isRunning() {
         return running;
     }
 
+    /**
+     * @deprecated use {@link #getExitCodeLong()}
+     */
+    @Deprecated
     public Integer getExitCode() {
+        return exitCode != null ? exitCode.intValue() : null;
+    }
+
+    public Long getExitCodeLong() {
         return exitCode;
     }
 
@@ -126,9 +134,19 @@ public String getDetachKeys() {
 
     /**
      * @see #pid
+     * @deprecated use {@link #getPidLong()}
      */
     @CheckForNull
+    @Deprecated
     public Integer getPid() {
+        return pid != null ? pid.intValue() : null;
+    }
+
+    /**
+     * @see #pid
+     */
+    @CheckForNull
+    public Long getPidLong() {
         return pid;
     }
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
index a6a4dd1d0..3f94f1dc2 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
@@ -20,20 +20,37 @@ public class TaskStatusContainerStatus implements Serializable {
     private String containerID = null;
 
     @JsonProperty("PID")
-    private Integer pid = null;
+    private Long pid = null;
 
     @JsonProperty("ExitCode")
-    private Integer exitCode = null;
+    private Long exitCode = null;
 
     public String getContainerID() {
         return containerID;
     }
 
+    /**
+     *
+     * @deprecated use {@link #getPidLong()}
+     */
+    @Deprecated
     public Integer getPid() {
+        return pid != null ? pid.intValue() : null;
+    }
+
+    public Long getPidLong() {
         return pid;
     }
 
+    /**
+     * @deprecated use {@link #getExitCodeLong()}
+     */
+    @Deprecated
     public Integer getExitCode() {
+        return exitCode != null ? exitCode.intValue() : null;
+    }
+
+    public Long getExitCodeLong() {
         return exitCode;
     }
 
@@ -42,15 +59,36 @@ public TaskStatusContainerStatus withContainerID(String containerID) {
         return this;
     }
 
-    public TaskStatusContainerStatus withPid(Integer pid) {
+    public TaskStatusContainerStatus withPid(Long pid) {
         this.pid = pid;
         return this;
     }
 
-    public TaskStatusContainerStatus withExitCode(Integer exitCode) {
+    /**
+     *
+     * @deprecated use {@link #withPid(Long)}
+     */
+    @Deprecated
+    public TaskStatusContainerStatus withPid(Integer pid) {
+        this.pid = pid != null ? pid.longValue() : null;
+        return this;
+    }
+
+    public TaskStatusContainerStatus withExitCode(Long exitCode) {
         this.exitCode = exitCode;
         return this;
     }
+
+    /**
+     *
+     * @deprecated use {@link #withExitCode(Long)}
+     */
+    @Deprecated
+    public TaskStatusContainerStatus withExitCode(Integer exitCode) {
+        this.exitCode = exitCode != null ? exitCode.longValue() : null;
+        return this;
+    }
+
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();

From 94850332e8788430548061fabf6a5e3c19f9c418 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 28 Oct 2019 22:28:20 +0100
Subject: [PATCH 0944/1272] Add GitHub Actions (#1268)

* Create ci.yml

* Update ci.yml

* Use less concrete exception type in PauseCmdIT
---
 .github/workflows/ci.yml                         | 16 ++++++++++++++++
 .../com/github/dockerjava/cmd/PauseCmdIT.java    |  8 ++++----
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000000000..57bc0a8ee
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,16 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK 8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 8
+    - name: Build with Maven
+      run: mvn verify
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java
index a2533ae82..528160951 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java
@@ -1,7 +1,7 @@
 package com.github.dockerjava.cmd;
 
 import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.exception.InternalServerErrorException;
+import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.utils.ContainerUtils;
 import org.junit.Test;
@@ -33,7 +33,7 @@ public void pauseNonExistingContainer() {
         dockerRule.getClient().pauseContainerCmd("non-existing").exec();
     }
 
-    @Test(expected = InternalServerErrorException.class)
+    @Test(expected = DockerException.class)
     public void pauseStoppedContainer() {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
@@ -47,7 +47,7 @@ public void pauseStoppedContainer() {
         dockerRule.getClient().pauseContainerCmd(container.getId()).exec();
     }
 
-    @Test(expected = InternalServerErrorException.class)
+    @Test(expected = DockerException.class)
     public void pausePausedContainer() {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
@@ -61,7 +61,7 @@ public void pausePausedContainer() {
         dockerRule.getClient().pauseContainerCmd(container.getId()).exec();
     }
 
-    @Test(expected = InternalServerErrorException.class)
+    @Test(expected = DockerException.class)
     public void pauseCreatedContainer() {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();

From 92994bd503fe7d914122165168c47fb03ed232fc Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sun, 17 Nov 2019 18:01:41 +0000
Subject: [PATCH 0945/1272] remove Apache Commons Codec dependency from API
 (#1256)

---
 docker-java-api/pom.xml                                      | 5 -----
 .../java/com/github/dockerjava/api/model/SecretSpec.java     | 4 ++--
 .../java/com/github/dockerjava/core/DockerConfigFile.java    | 4 ++--
 .../com/github/dockerjava/core/command/AbstrDockerCmd.java   | 4 ++--
 docker-java/template.mf                                      | 1 -
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index ae89c4e0f..169a6acb7 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -26,11 +26,6 @@
 			<artifactId>commons-lang</artifactId>
 			<version>${commons-lang.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>${commons-codec.version}</version>
-		</dependency>
 
 		<dependency>
 			<groupId>org.slf4j</groupId>
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
index 4f2d41b40..1364aef4b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -11,6 +10,7 @@
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
+import java.util.Base64;
 import java.util.Map;
 
 /**
@@ -65,7 +65,7 @@ public String getData() {
      * @see #data
      */
     public SecretSpec withData(String data) {
-        this.data = Base64.encodeBase64String(data.getBytes());
+        this.data = Base64.getEncoder().encodeToString(data.getBytes());
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
index e307fc990..0cef8676d 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
@@ -6,7 +6,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
-import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 
@@ -15,6 +14,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -204,7 +204,7 @@ private static void decodeAuth(AuthConfig config) throws IOException {
             return;
         }
 
-        String str = new String(Base64.decodeBase64(config.getAuth()), StandardCharsets.UTF_8);
+        String str = new String(Base64.getDecoder().decode(config.getAuth()), StandardCharsets.UTF_8);
         String[] parts = str.split(":", 2);
         if (parts.length != 2) {
             throw new IOException("Invalid auth configuration file");
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
index 9e1e775c5..c89465059 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
@@ -3,8 +3,8 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.IOException;
+import java.util.Base64;
 
-import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 import org.slf4j.Logger;
@@ -46,7 +46,7 @@ public String toString() {
 
     protected String registryAuth(AuthConfig authConfig) {
         try {
-            return Base64.encodeBase64String(new ObjectMapper().writeValueAsString(authConfig).getBytes());
+            return Base64.getEncoder().encodeToString(new ObjectMapper().writeValueAsBytes(authConfig));
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
diff --git a/docker-java/template.mf b/docker-java/template.mf
index 35d278889..274e6f917 100644
--- a/docker-java/template.mf
+++ b/docker-java/template.mf
@@ -11,7 +11,6 @@ Import-Template:
  com.google.common.*;version="${guava.version:short}",
  io.netty.*;version="${netty.version:default}";resolution:=optional,
  javax.ws.rs.*;version="[2.0.0, 2.1.0)",
- org.apache.commons.codec.*;version="${commons-codec.version:short}",
  org.apache.commons.compress.*;version="${commons-compress.version:short}",
  org.apache.commons.io.*;version="${commons-io.version:short}",
  org.apache.commons.lang.*;version="${commons-lang.version:short}",

From 18ad695482c3e307896eef62b1819dac211a029e Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Tue, 19 Nov 2019 09:37:54 +0100
Subject: [PATCH 0946/1272] Remove apache lang from api (#1267)

* WIP

* Remove `commons-lang` and `commons-codec` from the API module

* fix checkstyle errors

* Use Lombok for equals/hashCode/toString in api

* remove unused dependency
---
 docker-java-api/pom.xml                       | 12 ++--
 .../api/command/CreateContainerResponse.java  | 11 ++--
 .../api/command/CreateImageResponse.java      | 11 ++--
 .../api/command/CreateNetworkResponse.java    | 10 ++-
 .../api/command/CreateSecretResponse.java     | 11 ++--
 .../api/command/CreateServiceResponse.java    | 11 ++--
 .../api/command/CreateVolumeResponse.java     | 11 ++--
 .../api/command/ExecCreateCmdResponse.java    | 12 ++--
 .../dockerjava/api/command/GraphData.java     | 23 ++-----
 .../dockerjava/api/command/GraphDriver.java   | 23 ++-----
 .../api/command/InspectContainerResponse.java | 54 +++-------------
 .../api/command/InspectExecResponse.java      | 18 ++----
 .../api/command/InspectImageResponse.java     | 23 ++-----
 .../api/command/InspectVolumeResponse.java    | 11 ++--
 .../api/command/ListVolumesResponse.java      | 11 ++--
 .../github/dockerjava/api/command/RootFS.java | 22 ++-----
 .../api/command/TopContainerResponse.java     | 22 ++-----
 .../dockerjava/api/model/AuthConfig.java      | 63 ++-----------------
 .../com/github/dockerjava/api/model/Bind.java | 33 +---------
 .../dockerjava/api/model/BindOptions.java     | 24 ++-----
 .../dockerjava/api/model/BlkioRateDevice.java | 25 ++------
 .../dockerjava/api/model/BlkioStatEntry.java  | 23 ++-----
 .../api/model/BlkioStatsConfig.java           | 23 ++-----
 .../api/model/BlkioWeightDevice.java          | 25 ++------
 .../dockerjava/api/model/ChangeLog.java       | 11 ++--
 .../dockerjava/api/model/ClusterInfo.java     | 24 ++-----
 .../dockerjava/api/model/Container.java       | 22 ++-----
 .../dockerjava/api/model/ContainerConfig.java | 22 ++-----
 .../api/model/ContainerDNSConfig.java         | 24 ++-----
 .../api/model/ContainerHostConfig.java        | 22 ++-----
 .../dockerjava/api/model/ContainerMount.java  | 22 ++-----
 .../api/model/ContainerNetwork.java           | 22 ++-----
 .../api/model/ContainerNetworkSettings.java   | 22 ++-----
 .../dockerjava/api/model/ContainerPort.java   | 22 ++-----
 .../dockerjava/api/model/ContainerSpec.java   | 24 ++-----
 .../api/model/ContainerSpecConfig.java        | 23 ++-----
 .../api/model/ContainerSpecFile.java          | 24 ++-----
 .../api/model/ContainerSpecPrivileges.java    | 23 ++-----
 .../ContainerSpecPrivilegesCredential.java    | 23 ++-----
 ...ContainerSpecPrivilegesSELinuxContext.java | 23 ++-----
 .../api/model/ContainerSpecSecret.java        | 23 ++-----
 .../github/dockerjava/api/model/Device.java   | 39 +++---------
 .../github/dockerjava/api/model/Driver.java   | 24 ++-----
 .../dockerjava/api/model/DriverStatus.java    | 11 ++--
 .../github/dockerjava/api/model/Endpoint.java | 24 ++-----
 .../dockerjava/api/model/EndpointSpec.java    | 24 ++-----
 .../api/model/EndpointVirtualIP.java          | 24 ++-----
 .../github/dockerjava/api/model/Event.java    | 25 ++------
 .../dockerjava/api/model/EventActor.java      | 22 ++-----
 .../dockerjava/api/model/ExposedPort.java     | 20 +-----
 .../dockerjava/api/model/ExternalCA.java      | 23 ++-----
 .../github/dockerjava/api/model/Frame.java    | 26 +-------
 .../dockerjava/api/model/HealthCheck.java     | 22 ++-----
 .../dockerjava/api/model/HostConfig.java      | 22 ++-----
 .../dockerjava/api/model/Identifier.java      | 13 ++--
 .../github/dockerjava/api/model/Image.java    | 11 ++--
 .../com/github/dockerjava/api/model/Info.java | 22 ++-----
 .../api/model/InfoRegistryConfig.java         | 39 ++----------
 .../com/github/dockerjava/api/model/Link.java | 19 +-----
 .../github/dockerjava/api/model/Mount.java    | 24 ++-----
 .../github/dockerjava/api/model/Network.java  | 24 +++----
 .../api/model/NetworkAttachmentConfig.java    | 24 ++-----
 .../dockerjava/api/model/NetworkSettings.java | 10 ++-
 .../com/github/dockerjava/api/model/Node.java | 22 ++-----
 .../github/dockerjava/api/model/PeerNode.java | 24 ++-----
 .../dockerjava/api/model/PortBinding.java     | 27 ++------
 .../dockerjava/api/model/PortConfig.java      | 23 ++-----
 .../github/dockerjava/api/model/Ports.java    | 26 +++-----
 .../dockerjava/api/model/PruneResponse.java   | 30 ++-------
 .../dockerjava/api/model/Repository.java      | 12 ++--
 .../api/model/ResourceRequirements.java       | 24 ++-----
 .../dockerjava/api/model/ResourceSpecs.java   | 24 ++-----
 .../dockerjava/api/model/ResourceVersion.java | 23 ++-----
 .../dockerjava/api/model/ResponseItem.java    | 32 +++-------
 .../dockerjava/api/model/RestartPolicy.java   | 22 +------
 .../dockerjava/api/model/SearchItem.java      | 11 ++--
 .../dockerjava/api/model/SecretSpec.java      | 24 ++-----
 .../github/dockerjava/api/model/Service.java  | 23 ++-----
 .../api/model/ServiceGlobalModeOptions.java   | 24 ++-----
 .../api/model/ServiceModeConfig.java          | 23 ++-----
 .../api/model/ServicePlacement.java           | 24 ++-----
 .../model/ServiceReplicatedModeOptions.java   | 24 ++-----
 .../api/model/ServiceRestartPolicy.java       | 24 ++-----
 .../dockerjava/api/model/ServiceSpec.java     | 24 ++-----
 .../api/model/ServiceUpdateStatus.java        | 24 ++-----
 .../api/model/StatisticNetworksConfig.java    | 22 ++-----
 .../dockerjava/api/model/Statistics.java      | 11 ++--
 .../dockerjava/api/model/SwarmCAConfig.java   | 23 ++-----
 .../api/model/SwarmDispatcherConfig.java      | 23 ++-----
 .../dockerjava/api/model/SwarmInfo.java       | 24 ++-----
 .../dockerjava/api/model/SwarmJoinTokens.java | 23 ++-----
 .../dockerjava/api/model/SwarmNode.java       | 23 ++-----
 .../api/model/SwarmNodeDescription.java       | 23 ++-----
 .../api/model/SwarmNodeEngineDescription.java | 23 ++-----
 .../api/model/SwarmNodeManagerStatus.java     | 23 ++-----
 .../api/model/SwarmNodePlatform.java          | 23 ++-----
 .../api/model/SwarmNodePluginDescription.java | 23 ++-----
 .../api/model/SwarmNodeResources.java         | 23 ++-----
 .../dockerjava/api/model/SwarmNodeSpec.java   | 23 ++-----
 .../dockerjava/api/model/SwarmNodeStatus.java | 25 ++------
 .../api/model/SwarmNodeVersion.java           | 23 ++-----
 .../api/model/SwarmOrchestration.java         | 23 ++-----
 .../dockerjava/api/model/SwarmRaftConfig.java | 23 ++-----
 .../dockerjava/api/model/SwarmSpec.java       | 23 ++-----
 .../dockerjava/api/model/SwarmVersion.java    | 23 ++-----
 .../com/github/dockerjava/api/model/Task.java | 57 ++---------------
 .../dockerjava/api/model/TaskDefaults.java    | 23 ++-----
 .../github/dockerjava/api/model/TaskSpec.java | 24 ++-----
 .../dockerjava/api/model/TaskStatus.java      | 11 ++--
 .../api/model/TaskStatusContainerStatus.java  | 11 ++--
 .../dockerjava/api/model/TmpfsOptions.java    | 23 ++-----
 .../github/dockerjava/api/model/Ulimit.java   | 25 ++------
 .../dockerjava/api/model/UpdateConfig.java    | 24 ++-----
 .../github/dockerjava/api/model/Version.java  | 22 ++-----
 .../api/model/VersionComponent.java           | 22 ++-----
 .../dockerjava/api/model/VersionPlatform.java | 22 ++-----
 .../github/dockerjava/api/model/Volume.java   | 20 +-----
 .../dockerjava/api/model/VolumeOptions.java   | 24 ++-----
 .../github/dockerjava/api/model/VolumeRW.java | 21 +------
 .../dockerjava/api/model/VolumesFrom.java     | 21 +------
 docker-java-core/pom.xml                      |  6 ++
 .../command/InspectContainerResponseTest.java |  6 ++
 122 files changed, 511 insertions(+), 2195 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 169a6acb7..b8b0af838 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -21,11 +21,6 @@
 			<artifactId>jackson-databind</artifactId>
 			<version>${jackson.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>${commons-lang.version}</version>
-		</dependency>
 
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -39,6 +34,13 @@
 			<version>3.0.1u2</version>
 			<scope>provided</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.10</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
index 65234945f..091661af7 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
@@ -1,9 +1,9 @@
 package com.github.dockerjava.api.command;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 /**
  *
@@ -11,6 +11,8 @@
  *
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class CreateContainerResponse {
 
     @JsonProperty("Id")
@@ -34,9 +36,4 @@ public void setId(String id) {
     public void setWarnings(String[] warnings) {
         this.warnings = warnings;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
index 1e8c8d2e9..3cf373860 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
@@ -1,9 +1,9 @@
 package com.github.dockerjava.api.command;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 /**
  * Parse reponses from /images/create
@@ -12,6 +12,8 @@
  *
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class CreateImageResponse {
 
     @JsonProperty("status")
@@ -20,9 +22,4 @@ public class CreateImageResponse {
     public String getId() {
         return id;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
index ec4827476..c43cdca53 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
@@ -2,9 +2,12 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class CreateNetworkResponse {
 
     @JsonProperty("Id")
@@ -28,9 +31,4 @@ public void setId(String id) {
     public void setWarnings(String[] warnings) {
         this.warnings = warnings;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
index 5e9c7691e..b71adc9c0 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
@@ -2,13 +2,15 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 /**
  * The response of a {@link CreateSecretCmd}
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class CreateSecretResponse {
     @JsonProperty("ID")
     private String id;
@@ -16,9 +18,4 @@ public class CreateSecretResponse {
     public String getId() {
         return id;
     }
-
-    @Override
-    public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
index 9158ec25b..c570000e3 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
@@ -2,13 +2,15 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 /**
  * The response of a {@link CreateServiceCmd}
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class CreateServiceResponse {
     @JsonProperty("ID")
     private String id;
@@ -16,9 +18,4 @@ public class CreateServiceResponse {
     public String getId() {
         return id;
     }
-
-    @Override
-    public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
index 3a541a0cd..7b9d9eed1 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
@@ -1,15 +1,17 @@
 package com.github.dockerjava.api.command;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 /**
  *
  * @author Marcus Linke
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class CreateVolumeResponse {
 
     @JsonProperty("Name")
@@ -32,9 +34,4 @@ public String getDriver() {
     public String getMountpoint() {
         return mountpoint;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
index 9c13912fc..c7065217c 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
@@ -1,12 +1,13 @@
 package com.github.dockerjava.api.command;
 
-import org.apache.commons.lang.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class ExecCreateCmdResponse {
 
     @JsonProperty("Id")
@@ -15,9 +16,4 @@ public class ExecCreateCmdResponse {
     public String getId() {
         return id;
     }
-
-    @Override
-    public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java
index 518970dc6..f64d4df0e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java
@@ -2,10 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 
@@ -14,6 +12,8 @@
  * @author Kanstantsin Shautsou
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class GraphData {
 
     @JsonProperty("RootDir")
@@ -110,19 +110,4 @@ public GraphData withDir(String dir) {
         this.dir = dir;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
index 598061168..f9eebe8ea 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
@@ -2,10 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 
@@ -16,6 +14,8 @@
  * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21}
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class GraphDriver {
     /**
      * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21}
@@ -61,19 +61,4 @@ public GraphDriver withName(String name) {
         this.name = name;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index 0f4db37be..98d3a53cb 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -11,10 +11,8 @@
 import com.github.dockerjava.api.model.VolumeBinds;
 import com.github.dockerjava.api.model.VolumeRW;
 import com.github.dockerjava.api.model.VolumesRW;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.util.List;
@@ -26,6 +24,8 @@
  *
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class InspectContainerResponse {
 
     @JsonProperty("Args")
@@ -251,12 +251,9 @@ public String getPlatform() {
         return platform;
     }
 
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
     @JsonIgnoreProperties(ignoreUnknown = true)
+    @EqualsAndHashCode
+    @ToString
     public class ContainerState {
 
         /**
@@ -458,24 +455,11 @@ public String getFinishedAt() {
         public HealthState getHealth() {
             return health;
         }
-
-        @Override
-        public boolean equals(Object o) {
-            return EqualsBuilder.reflectionEquals(this, o);
-        }
-
-        @Override
-        public int hashCode() {
-            return HashCodeBuilder.reflectionHashCode(this);
-        }
-
-        @Override
-        public String toString() {
-            return ToStringBuilder.reflectionToString(this);
-        }
     }
 
     @JsonIgnoreProperties(ignoreUnknown = true)
+    @EqualsAndHashCode
+    @ToString
     public static class Mount {
 
         /**
@@ -597,24 +581,11 @@ public Mount withSource(String source) {
             this.source = source;
             return this;
         }
-
-        @Override
-        public String toString() {
-            return ToStringBuilder.reflectionToString(this);
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            return EqualsBuilder.reflectionEquals(this, o);
-        }
-
-        @Override
-        public int hashCode() {
-            return HashCodeBuilder.reflectionHashCode(this);
-        }
     }
 
     @JsonIgnoreProperties(ignoreUnknown = true)
+    @EqualsAndHashCode
+    @ToString
     public class Node {
 
         @JsonProperty("ID")
@@ -665,10 +636,5 @@ public Long getMemory() {
         public Map<String, String> getLabels() {
             return labels;
         }
-
-        @Override
-        public String toString() {
-            return ToStringBuilder.reflectionToString(this);
-        }
     }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
index 5f0c0e187..e479562e3 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
@@ -2,15 +2,17 @@
 
 import java.util.List;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.model.NetworkSettings;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class InspectExecResponse {
     @JsonProperty("ID")
     private String id;
@@ -150,12 +152,9 @@ public Long getPidLong() {
         return pid;
     }
 
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
     @JsonIgnoreProperties(ignoreUnknown = true)
+    @EqualsAndHashCode
+    @ToString
     public class ProcessConfig {
 
         @JsonProperty("arguments")
@@ -192,11 +191,6 @@ public Boolean isTty() {
         public String getUser() {
             return user;
         }
-
-        @Override
-        public String toString() {
-            return ToStringBuilder.reflectionToString(this);
-        }
     }
 
     @JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
index 19727504e..6d2ef6b87 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
@@ -1,12 +1,10 @@
 package com.github.dockerjava.api.command;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.model.ContainerConfig;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.util.List;
@@ -17,6 +15,8 @@
  *
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class InspectImageResponse {
 
     @JsonProperty("Architecture")
@@ -372,19 +372,4 @@ public InspectImageResponse withRootFS(RootFS rootFS) {
         this.rootFS = rootFS;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
index b5b35c563..d42a1682a 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
@@ -1,15 +1,17 @@
 package com.github.dockerjava.api.command;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 /**
  *
  * @author Marcus Linke
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class InspectVolumeResponse {
 
     @JsonProperty("Name")
@@ -32,9 +34,4 @@ public String getDriver() {
     public String getMountpoint() {
         return mountpoint;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
index c45712d09..207e65ca6 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
@@ -2,16 +2,18 @@
 
 import java.util.List;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 /**
  *
  * @author Marcus Linke
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class ListVolumesResponse {
 
     @JsonProperty("Volumes")
@@ -20,9 +22,4 @@ public class ListVolumesResponse {
     public List<InspectVolumeResponse> getVolumes() {
         return volumes;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java
index 82d3049d6..9d6834c8e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java
@@ -2,9 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.util.List;
@@ -15,6 +14,8 @@
  * @author Dmitry Tretyakov
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class RootFS {
 
     @JsonProperty("Type")
@@ -54,19 +55,4 @@ public RootFS withLayers(List<String> layers) {
         this.layers = layers;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
index 717a6a410..f3d4f8d1a 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
@@ -2,6 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 /**
  *
@@ -9,6 +11,8 @@
  *
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class TopContainerResponse {
 
     @JsonProperty("Titles")
@@ -24,22 +28,4 @@ public String[] getTitles() {
     public String[][] getProcesses() {
         return processes;
     }
-
-    @Override
-    public String toString() {
-        StringBuilder buffer = new StringBuilder("TopContainerResponse{");
-        buffer.append("titles=");
-        buffer.append(String.join("; ", titles));
-        buffer.append(", processes=");
-        buffer.append("[");
-        for (String[] fields : processes) {
-            buffer.append("[")
-                    .append(String.join("; ", fields))
-                    .append("]");
-        }
-        buffer.append("]");
-        buffer.append("}");
-
-        return buffer.toString();
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
index d2ecd7d90..41f31b42e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -1,16 +1,17 @@
 package com.github.dockerjava.api.model;
 
-import org.apache.commons.lang.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
 
 @JsonInclude(Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class AuthConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -142,60 +143,4 @@ public String getStackOrchestrator() {
     public void setStackOrchestrator(String stackOrchestrator) {
         this.stackOrchestrator = stackOrchestrator;
     }
-
-    @Override
-    public String toString() {
-        return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    // CHECKSTYLE:OFF
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((auth == null) ? 0 : auth.hashCode());
-        result = prime * result + ((email == null) ? 0 : email.hashCode());
-        result = prime * result + ((password == null) ? 0 : password.hashCode());
-        result = prime * result + ((registryAddress == null) ? 0 : registryAddress.hashCode());
-        result = prime * result + ((username == null) ? 0 : username.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        AuthConfig other = (AuthConfig) obj;
-        if (auth == null) {
-            if (other.auth != null)
-                return false;
-        } else if (!auth.equals(other.auth))
-            return false;
-        if (email == null) {
-            if (other.email != null)
-                return false;
-        } else if (!email.equals(other.email))
-            return false;
-        if (password == null) {
-            if (other.password != null)
-                return false;
-        } else if (!password.equals(other.password))
-            return false;
-        if (registryAddress == null) {
-            if (other.registryAddress != null)
-                return false;
-        } else if (!registryAddress.equals(other.registryAddress))
-            return false;
-        if (username == null) {
-            if (other.username != null)
-                return false;
-        } else if (!username.equals(other.username))
-            return false;
-        return true;
-    }
-    // CHECKSTYLE:ON
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java
index 9a7ebf18d..c9aecf9d4 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 
@@ -9,6 +8,7 @@
  * Represents a host path being bind mounted as a {@link Volume} in a Docker container.
  * The Bind can be in read only or read write access mode.
  */
+@EqualsAndHashCode
 public class Bind implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -135,35 +135,6 @@ public static Bind parse(String serialized) {
         }
     }
 
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof Bind) {
-            Bind other = (Bind) obj;
-            return new EqualsBuilder()
-                    .append(path, other.getPath())
-                    .append(volume, other.getVolume())
-                    .append(accessMode, other.getAccessMode())
-                    .append(secMode, other.getSecMode())
-                    .append(noCopy, other.getNoCopy())
-                    .append(propagationMode, other.getPropagationMode())
-                    .isEquals();
-        } else {
-            return super.equals(obj);
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder()
-                .append(path)
-                .append(volume)
-                .append(accessMode)
-                .append(secMode)
-                .append(noCopy)
-                .append(propagationMode)
-                .toHashCode();
-    }
-
     /**
      * Returns a string representation of this {@link Bind} suitable for inclusion in a JSON message.
      * The format is <code>&lt;host path&gt;:&lt;container path&gt;:&lt;access mode&gt;</code>,
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java
index fec0ba339..340921f01 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java
@@ -1,16 +1,16 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@EqualsAndHashCode
+@ToString
 public class BindOptions implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -34,20 +34,4 @@ public BindOptions withPropagation(BindPropagation propagation) {
         this.propagation = propagation;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java
index 4e171417f..e26fc0d6f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java
@@ -1,14 +1,13 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
-import static org.apache.commons.lang.builder.ToStringStyle.SHORT_PREFIX_STYLE;
-
+@EqualsAndHashCode
+@ToString
 public class BlkioRateDevice implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -35,20 +34,4 @@ public BlkioRateDevice withRate(Long rate) {
         this.rate = rate;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java
index f83deff0d..f4def9089 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -16,6 +14,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class BlkioStatEntry implements Serializable {
     private static final long serialVersionUID = 1L;
     @JsonProperty("major")
@@ -62,19 +62,4 @@ public BlkioStatEntry withValue(Long value) {
         this.value = value;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
index 5e02b42ce..4822c5e82 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
@@ -2,10 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -17,6 +15,8 @@
  * @author Yuting Liu
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class BlkioStatsConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -107,19 +107,4 @@ public List<BlkioStatEntry> getIoTimeRecursive() {
     public List<BlkioStatEntry> getSectorsRecursive() {
         return sectorsRecursive;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java
index 1c8e5cd08..24b4d87f5 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java
@@ -1,14 +1,13 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
-import static org.apache.commons.lang.builder.ToStringStyle.SHORT_PREFIX_STYLE;
-
+@EqualsAndHashCode
+@ToString
 public class BlkioWeightDevice implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -35,20 +34,4 @@ public BlkioWeightDevice withWeight(Integer weight) {
         this.weight = weight;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
index 04b36f5ce..e69eb585c 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
@@ -1,9 +1,9 @@
 package com.github.dockerjava.api.model;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -13,6 +13,8 @@
  *
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class ChangeLog implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -29,9 +31,4 @@ public String getPath() {
     public Integer getKind() {
         return kind;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
index e95475a64..c2e4fd9a5 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -20,6 +18,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class ClusterInfo implements Serializable {
 
     public static final long serialVersionUID = 1L;
@@ -132,20 +132,4 @@ public ClusterInfo withVersion(ResourceVersion version) {
         this.version = version;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java
index 1c2ffd7df..d5da8eb11 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java
@@ -5,9 +5,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.command.ListContainersCmd;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -21,6 +20,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class Container implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -171,19 +172,4 @@ public ContainerHostConfig getHostConfig() {
     public List<ContainerMount> getMounts() {
         return mounts;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-      return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
index 6d3265afa..dcb3cc99d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
@@ -5,9 +5,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -20,6 +19,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class ContainerConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -429,19 +430,4 @@ public ContainerConfig withWorkingDir(String workingDir) {
         this.workingDir = workingDir;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
index ee7486ddf..bd84d26ce 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.List;
@@ -18,6 +16,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class ContainerDNSConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -54,20 +54,4 @@ public ContainerDNSConfig withOptions(List<String> options) {
         this.options = options;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
index 8d0c3fe37..e671f8a6d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
@@ -2,9 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -15,6 +14,8 @@
  * @author Kanstantsin Shautsou
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class ContainerHostConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -32,19 +33,4 @@ public ContainerHostConfig withNetworkMode(String networkMode) {
         this.networkMode = networkMode;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
index 943e8edbb..59c2bccfc 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
@@ -2,9 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -14,6 +13,8 @@
  * @see Container
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class ContainerMount implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -149,19 +150,4 @@ public ContainerMount withPropagation(String propagation) {
         this.propagation = propagation;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
index 70c37c4d9..cb3671fe0 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
@@ -3,9 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -21,6 +20,8 @@
  * @author Kanstantsin Shautsou
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class ContainerNetwork implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -281,21 +282,6 @@ public ContainerNetwork withNetworkID(String networkID) {
         return this;
     }
 
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return  EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
     /**
      * Docker named it EndpointIPAMConfig
      */
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
index 6dcddf1b2..be05bde22 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
@@ -2,9 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.Map;
@@ -16,6 +15,8 @@
  * @since {@link RemoteApiVersion#VERSION_1_22}
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class ContainerNetworkSettings implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -39,19 +40,4 @@ public ContainerNetworkSettings withNetworks(Map<String, ContainerNetwork> netwo
         this.networks = networks;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
index 5924e53df..2fedf33d9 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
@@ -2,9 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -14,6 +13,8 @@
  * @see Container
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class ContainerPort implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -92,19 +93,4 @@ public ContainerPort withType(String type) {
         this.type = type;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
index ae5274d47..fa0c6cca5 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -20,6 +18,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class ContainerSpec implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -439,20 +439,4 @@ public ContainerSpec withConfigs(List<ContainerSpecConfig> configs) {
         this.configs = configs;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
index caa27eaf1..49c708fde 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -17,6 +15,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class ContainerSpecConfig implements Serializable {
     private static final long serialVersionUID = 1L;
     @JsonProperty("File")
@@ -54,19 +54,4 @@ public ContainerSpecConfig withConfigName(String configName) {
         this.configName = configName;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
index b9a847cb1..8b69c4a72 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -17,6 +15,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class ContainerSpecFile implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -73,20 +73,4 @@ public ContainerSpecFile withMode(Long mode) {
         this.mode = mode;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java
index 0e9f54b01..a5bb69391 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java
@@ -1,10 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -13,6 +11,8 @@
  *
  * @since {@link RemoteApiVersion#VERSION_1_29}
  */
+@EqualsAndHashCode
+@ToString
 public class ContainerSpecPrivileges implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -39,19 +39,4 @@ public ContainerSpecPrivileges withSeLinuxContext(ContainerSpecPrivilegesSELinux
         this.seLinuxContext = seLinuxContext;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java
index b746e510f..8a4294f01 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java
@@ -1,10 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -13,6 +11,8 @@
  *
  * @since {@link RemoteApiVersion#VERSION_1_29}
  */
+@EqualsAndHashCode
+@ToString
 public class ContainerSpecPrivilegesCredential implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -51,19 +51,4 @@ public ContainerSpecPrivilegesCredential withRegistry(String registry) {
         this.registry = registry;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
index a3a83cecf..c2f4d0a62 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -17,6 +15,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class ContainerSpecPrivilegesSELinuxContext implements Serializable {
     private static final long serialVersionUID = 1L;
     @JsonProperty("Disable")
@@ -78,19 +78,4 @@ public ContainerSpecPrivilegesSELinuxContext withLevel(String level) {
         this.level = level;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
index 86c7d9147..7e1b8e7e6 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -17,6 +15,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class ContainerSpecSecret implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -55,19 +55,4 @@ public ContainerSpecSecret withSecretName(String secretName) {
         this.secretName = secretName;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java
index 6edc41051..754a53df5 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java
@@ -1,15 +1,12 @@
 package com.github.dockerjava.api.model;
 
 import static java.util.Objects.requireNonNull;
-import static org.apache.commons.lang.BooleanUtils.isNotTrue;
-import static org.apache.commons.lang.StringUtils.isEmpty;
-
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.Nonnull;
 import java.io.Serializable;
@@ -18,6 +15,8 @@
 import java.util.StringTokenizer;
 
 @JsonInclude(Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class Device implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -89,7 +88,7 @@ public static Device parse(@Nonnull String deviceStr) {
             }
         }
 
-        if (isEmpty(dst)) {
+        if (dst == null || dst.length() == 0) {
             dst = src;
         }
 
@@ -108,13 +107,13 @@ private static boolean validDeviceMode(String deviceMode) {
         validModes.put("w", true);
         validModes.put("m", true);
 
-        if (isEmpty(deviceMode)) {
+        if (deviceMode == null || deviceMode.length() == 0) {
             return false;
         }
 
         for (char ch : deviceMode.toCharArray()) {
             final String mode = String.valueOf(ch);
-            if (isNotTrue(validModes.get(mode))) {
+            if (!Boolean.TRUE.equals(validModes.get(mode))) {
                 return false; // wrong mode
             }
             validModes.put(mode, false);
@@ -122,28 +121,4 @@ private static boolean validDeviceMode(String deviceMode) {
 
         return true;
     }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof Device) {
-            Device other = (Device) obj;
-            return new EqualsBuilder()
-                    .append(cGroupPermissions, other.getcGroupPermissions())
-                    .append(pathInContainer, other.getPathInContainer())
-                    .append(pathOnHost, other.getPathOnHost())
-                    .isEquals();
-        } else {
-            return super.equals(obj);
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder()
-                .append(cGroupPermissions)
-                .append(pathInContainer)
-                .append(pathOnHost)
-                .toHashCode();
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java
index 7cda79563..cde23cb2b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java
@@ -1,10 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -13,6 +11,8 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@EqualsAndHashCode
+@ToString
 public class Driver implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -59,20 +59,4 @@ public Driver withOptions(Map<String, String> options) {
         this.options = options;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
index 7c1374aae..44cdd8ee8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
@@ -1,11 +1,11 @@
 package com.github.dockerjava.api.model;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -14,6 +14,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class DriverStatus implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -30,9 +32,4 @@ public String getRootDir() {
     public Integer getDirs() {
         return dirs;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java
index caa7c0ef2..eb6c982ed 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java
@@ -1,10 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -12,6 +10,8 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@EqualsAndHashCode
+@ToString
 public class Endpoint implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -80,20 +80,4 @@ public Endpoint withVirtualIPs(EndpointVirtualIP[] virtualIPs) {
         this.virtualIPs = virtualIPs;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
index 6f5393922..73a002b55 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -17,6 +15,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class EndpointSpec implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -63,20 +63,4 @@ public EndpointSpec withPorts(List<PortConfig> ports) {
         this.ports = ports;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
index 080a099b3..fad960fb7 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
@@ -1,10 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -12,6 +10,8 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@EqualsAndHashCode
+@ToString
 public class EndpointVirtualIP implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -58,20 +58,4 @@ public EndpointVirtualIP withAddr(String addr) {
         this.addr = addr;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java
index 6e4b6f3c2..589e3e3ba 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java
@@ -1,18 +1,14 @@
 package com.github.dockerjava.api.model;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 
-import static org.apache.commons.lang.builder.ToStringStyle.SHORT_PREFIX_STYLE;
-
 import java.io.Serializable;
 
 /**
@@ -20,6 +16,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class Event implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -244,19 +242,4 @@ public Event withEventActor(EventActor actor) {
         this.actor = actor;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventActor.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventActor.java
index f7b0abbf3..e05414d34 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventActor.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventActor.java
@@ -1,9 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -13,6 +12,8 @@
  * @author Kanstantsin Shautsou
  * @since 1.22
  */
+@EqualsAndHashCode
+@ToString
 public class EventActor implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -59,19 +60,4 @@ public EventActor withAttributes(Map<String, String> attributes) {
         this.attributes = attributes;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
index 26d727ff4..1d0ac8bc8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
@@ -7,9 +7,6 @@
 import java.io.Serializable;
 import java.util.Map.Entry;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -23,6 +20,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.node.NullNode;
 import com.github.dockerjava.api.model.Ports.Binding;
+import lombok.EqualsAndHashCode;
 
 /**
  * Represents a container port that Docker exposes to external clients. The port is defined by its {@link #getPort() port number} and an
@@ -31,6 +29,7 @@
  */
 @JsonDeserialize(using = ExposedPort.Deserializer.class)
 @JsonSerialize(using = ExposedPort.Serializer.class)
+@EqualsAndHashCode
 public class ExposedPort implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -148,21 +147,6 @@ public String toString() {
         return port + "/" + protocol.toString();
     }
 
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof ExposedPort) {
-            ExposedPort other = (ExposedPort) obj;
-            return new EqualsBuilder().append(protocol, other.getProtocol()).append(port, other.getPort()).isEquals();
-        } else {
-            return super.equals(obj);
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(protocol).append(port).toHashCode();
-    }
-
     public static class Deserializer extends JsonDeserializer<ExposedPort> {
         @Override
         public ExposedPort deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
index f6fd95fc9..575498d9e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -17,6 +15,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class ExternalCA implements Serializable {
 
     public static final long serialVersionUID = 1L;
@@ -86,19 +86,4 @@ public ExternalCA withOptions(Map<String, String> options) {
         this.options = options;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Frame.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Frame.java
index 9b1376f82..041e22423 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Frame.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Frame.java
@@ -1,11 +1,13 @@
 package com.github.dockerjava.api.model;
 
+import lombok.EqualsAndHashCode;
+
 import java.io.Serializable;
-import java.util.Arrays;
 
 /**
  * Represents a logging frame.
  */
+@EqualsAndHashCode
 public class Frame implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -30,26 +32,4 @@ public byte[] getPayload() {
     public String toString() {
         return String.format("%s: %s", streamType, new String(payload).trim());
     }
-
-    // CHECKSTYLE:OFF
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        Frame frame = (Frame) o;
-
-        return streamType == frame.streamType && Arrays.equals(payload, frame.payload);
-
-    }
-
-    @Override
-    public int hashCode() {
-        int result = streamType.hashCode();
-        result = 31 * result + Arrays.hashCode(payload);
-        return result;
-    }
-    // CHECKSTYLE:ON
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
index 2b0269770..0d3181e5f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
@@ -18,9 +18,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.List;
@@ -31,6 +30,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class HealthCheck implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -102,19 +103,4 @@ public HealthCheck withStartPeriod(Long startPeriod) {
         this.startPeriod = startPeriod;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index b39705da0..f43dde1da 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -5,9 +5,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -23,6 +22,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class HostConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -1230,19 +1231,4 @@ public HostConfig withCpuRealtimeRuntime(Long cpuRealtimeRuntime) {
         this.cpuRealtimeRuntime = cpuRealtimeRuntime;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java
index 4605d978b..c214a8b16 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java
@@ -1,11 +1,16 @@
 package com.github.dockerjava.api.model;
 
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
 import java.io.Serializable;
 import java.util.Optional;
 
 /**
  * @author magnayn
  */
+@EqualsAndHashCode
+@ToString
 public class Identifier implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -46,12 +51,4 @@ public static Identifier fromCompoundString(String identifier) {
 
         return new Identifier(new Repository(parts[0] + "/" + rhs[0]), rhs[1]);
     }
-
-    @Override
-    public String toString() {
-        return "Identifier{" +
-                "repository=" + repository +
-                ", tag=" + tag +
-                '}';
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java
index 78fee9f79..e04369aac 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java
@@ -1,11 +1,11 @@
 package com.github.dockerjava.api.model;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -16,6 +16,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class Image implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -60,9 +62,4 @@ public Long getSize() {
     public Long getVirtualSize() {
         return virtualSize;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
index fdbaa4722..1226180a6 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
@@ -4,9 +4,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -20,6 +19,8 @@
  */
 @JsonInclude(Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class Info implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -1067,19 +1068,4 @@ public Info withIsolation(String isolation) {
         this.isolation = isolation;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
index 2c2be5cfd..a94716c4d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
@@ -2,9 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -15,6 +14,8 @@
  * @since ~{@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20}
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public final class InfoRegistryConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -78,25 +79,12 @@ public InfoRegistryConfig withMirrors(Object mirrors) {
         return this;
     }
 
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-       return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
     /**
      * @since ~{@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20}
      */
     @JsonIgnoreProperties(ignoreUnknown = true)
+    @EqualsAndHashCode
+    @ToString
     public static final class IndexConfig {
         @JsonProperty("Mirrors")
         private List<String> mirrors;
@@ -173,20 +161,5 @@ public IndexConfig withSecure(Boolean secure) {
             this.secure = secure;
             return this;
         }
-
-        @Override
-        public String toString() {
-            return ToStringBuilder.reflectionToString(this);
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            return EqualsBuilder.reflectionEquals(this, o);
-        }
-
-        @Override
-        public int hashCode() {
-            return HashCodeBuilder.reflectionHashCode(this);
-        }
     }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Link.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Link.java
index 346aedcb0..20b2c1b26 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Link.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Link.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 
@@ -10,6 +9,7 @@
  * container with the aliased name {@link #getAlias()}. This involves creating an entry in <code>/etc/hosts</code> and some environment
  * variables in the target container as well as creating a network bridge between both containers.
  */
+@EqualsAndHashCode
 public class Link implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -71,21 +71,6 @@ public static Link parse(final String serialized) throws IllegalArgumentExceptio
         }
     }
 
-    @Override
-    public boolean equals(final Object obj) {
-        if (obj instanceof Link) {
-            final Link other = (Link) obj;
-            return new EqualsBuilder().append(name, other.getName()).append(alias, other.getAlias()).isEquals();
-        } else {
-            return super.equals(obj);
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(name).append(alias).toHashCode();
-    }
-
     /**
      * Returns a string representation of this {@link Link} suitable for inclusion in a JSON message. The format is <code>name:alias</code>,
      * like the argument in {@link #parse(String)}.
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java
index 008560305..7254ccb19 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java
@@ -1,10 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -12,6 +10,8 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@EqualsAndHashCode
+@ToString
 public class Mount implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -177,20 +177,4 @@ public Mount withTmpfsOptions(TmpfsOptions tmpfsOptions) {
         }
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
index 438dbc12d..0945137d7 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
@@ -3,7 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -13,6 +14,8 @@
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class Network implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -93,12 +96,9 @@ public Map<String, String> getLabels() {
         return labels;
     }
 
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
     @JsonIgnoreProperties(ignoreUnknown = true)
+    @EqualsAndHashCode
+    @ToString
     public static class ContainerNetworkConfig {
 
         @JsonProperty("EndpointID")
@@ -128,14 +128,11 @@ public String getIpv4Address() {
         public String getIpv6Address() {
             return ipv6Address;
         }
-
-        @Override
-        public String toString() {
-            return ToStringBuilder.reflectionToString(this);
-        }
     }
 
     @JsonIgnoreProperties(ignoreUnknown = true)
+    @EqualsAndHashCode
+    @ToString
     public static class Ipam {
 
         @JsonProperty("Driver")
@@ -174,11 +171,6 @@ public Ipam withDriver(String driver) {
             return this;
         }
 
-        @Override
-        public String toString() {
-            return ToStringBuilder.reflectionToString(this);
-        }
-
         @JsonIgnoreProperties(ignoreUnknown = true)
         public static class Config {
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
index 3f58f3266..413803a9e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -17,6 +15,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class NetworkAttachmentConfig implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -63,20 +63,4 @@ public NetworkAttachmentConfig withAliases(List<String> aliases) {
         this.aliases = aliases;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
index 603d4685f..816604552 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
@@ -5,7 +5,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.Map;
@@ -16,6 +17,8 @@
  *
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class NetworkSettings implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -199,9 +202,4 @@ public String getGlobalIPv6Address() {
     public Integer getGlobalIPv6PrefixLen() {
         return globalIPv6PrefixLen;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java
index 34916e0da..9c901c072 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java
@@ -3,9 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -13,6 +12,8 @@
  * A node as returned by the /events API, for instance, when Swarm is used.
  */
 @JsonInclude(Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class Node implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -59,19 +60,4 @@ public String getIp() {
     public void setIp(String ip) {
         this.ip = ip;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java
index 50ed7d01b..ba9d49594 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -16,6 +14,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class PeerNode implements Serializable {
 
     public static final long serialVersionUID = 1L;
@@ -63,20 +63,4 @@ public PeerNode withAddr(String addr) {
         this.addr = addr;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortBinding.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortBinding.java
index 9a30b6cd2..47655079b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortBinding.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortBinding.java
@@ -1,10 +1,8 @@
 package com.github.dockerjava.api.model;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-
 import com.github.dockerjava.api.model.Ports.Binding;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -17,6 +15,8 @@
  * existing port bindings from a container configuration in {@link NetworkSettings#getPorts()} and {@link HostConfig#getPortBindings()}. In
  * that context, a <code>Map&lt;ExposedPort, Binding[]&gt;</code> is used.</i>
  */
+@EqualsAndHashCode
+@ToString
 public class PortBinding implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -39,7 +39,7 @@ public ExposedPort getExposedPort() {
 
     public static PortBinding parse(String serialized) throws IllegalArgumentException {
         try {
-            String[] parts = StringUtils.splitByWholeSeparator(serialized, ":");
+            String[] parts = serialized.split(":");
             switch (parts.length) {
                 case 3:
                     // 127.0.0.1:80:8080/tcp
@@ -61,21 +61,4 @@ public static PortBinding parse(String serialized) throws IllegalArgumentExcepti
     private static PortBinding createFromSubstrings(String binding, String exposedPort) throws IllegalArgumentException {
         return new PortBinding(Binding.parse(binding), ExposedPort.parse(exposedPort));
     }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof PortBinding) {
-            PortBinding other = (PortBinding) obj;
-            return new EqualsBuilder().append(binding, other.getBinding()).append(exposedPort, other.getExposedPort())
-                    .isEquals();
-        } else {
-            return super.equals(obj);
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(binding).append(exposedPort).toHashCode();
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java
index bdb7fe3fa..57f2f61b0 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java
@@ -1,10 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -12,6 +10,8 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@EqualsAndHashCode
+@ToString
 public class PortConfig implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -120,21 +120,6 @@ public PortConfig withPublishMode(PublishMode publishMode) {
         return this;
     }
 
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
     public enum PublishMode {
         //ingress load balancing using routing mesh.
         @JsonProperty("ingress")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
index f4c0b1841..a2ae85e23 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -12,8 +12,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.node.NullNode;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.builder.EqualsBuilder;
+import lombok.EqualsAndHashCode;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -22,8 +21,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import static org.apache.commons.lang.StringUtils.isEmpty;
-
 /**
  * A container for port bindings, made available as a {@link Map} via its {@link #getBindings()} method.
  * <p>
@@ -66,7 +63,10 @@ public Ports(PortBinding... portBindings) {
     public void bind(ExposedPort exposedPort, Binding binding) {
         if (ports.containsKey(exposedPort)) {
             Binding[] bindings = ports.get(exposedPort);
-            ports.put(exposedPort, (Binding[]) ArrayUtils.add(bindings, binding));
+            Binding[] newBindings = new Binding[bindings.length + 1];
+            System.arraycopy(bindings, 0, newBindings, 0, bindings.length);
+            newBindings[newBindings.length - 1] = binding;
+            ports.put(exposedPort, newBindings);
         } else {
             if (binding == null) {
                 ports.put(exposedPort, null);
@@ -117,6 +117,7 @@ public Map<ExposedPort, Binding[]> getBindings() {
      * @see Ports#bind(ExposedPort, Binding)
      * @see ExposedPort
      */
+    @EqualsAndHashCode
     public static class Binding {
 
         /**
@@ -186,7 +187,7 @@ public static Binding empty() {
          * @see ExposedPort
          */
         public Binding(String hostIp, String hostPortSpec) {
-            this.hostIp = isEmpty(hostIp) ? null : hostIp;
+            this.hostIp = hostIp == null || hostIp.length() == 0 ? null : hostIp;
             this.hostPortSpec = hostPortSpec;
         }
 
@@ -248,7 +249,7 @@ public static Binding parse(String serialized) throws IllegalArgumentException {
          */
         @Override
         public String toString() {
-            if (isEmpty(hostIp)) {
+            if (hostIp == null || hostIp.length() == 0) {
                 return hostPortSpec;
             } else if (hostPortSpec == null) {
                 return hostIp;
@@ -256,17 +257,6 @@ public String toString() {
                 return hostIp + ":" + hostPortSpec;
             }
         }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (obj instanceof Binding) {
-                Binding other = (Binding) obj;
-                return new EqualsBuilder().append(hostIp, other.getHostIp()).append(hostPortSpec, other.getHostPortSpec())
-                        .isEquals();
-            } else {
-                return super.equals(obj);
-            }
-        }
     }
 
     public static class Deserializer extends JsonDeserializer<Ports> {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java
index d6653cdc6..0bf3ebde8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java
@@ -2,8 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -11,6 +11,8 @@
  * Delete unused content (containers, images, volumes, networks, build relicts)
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class PruneResponse implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -38,28 +40,4 @@ public PruneResponse(Long spaceReclaimed) {
     public Long getSpaceReclaimed() {
         return spaceReclaimed;
     }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("PruneResponse {");
-        sb.append(" spaceReclaimed: ").append(getSpaceReclaimed());
-        sb.append("}");
-        return sb.toString();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o instanceof Ulimit) {
-            Ulimit other = (Ulimit) o;
-            return new EqualsBuilder().append(spaceReclaimed, other.getName()).isEquals();
-        } else {
-            return super.equals(o);
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(spaceReclaimed).toHashCode();
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java
index 62c3872fa..750eb6f4d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java
@@ -1,5 +1,8 @@
 package com.github.dockerjava.api.model;
 
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
 import java.io.Serializable;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -7,6 +10,8 @@
 /**
  * A repository or image name.
  */
+@EqualsAndHashCode
+@ToString
 public class Repository implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -32,13 +37,6 @@ public URL getURL() throws MalformedURLException {
         return new URL("http://" + name);
     }
 
-    @Override
-    public String toString() {
-        return "Repository{" +
-                "name='" + name + '\'' +
-                '}';
-    }
-
     public String getPath() {
         if (!name.contains("/")) {
             return name;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
index ecab4923e..f72e861d6 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -16,6 +14,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class ResourceRequirements implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -62,20 +62,4 @@ public ResourceRequirements withReservations(ResourceSpecs reservations) {
         this.reservations = reservations;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
index 451019e41..9af891b59 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -16,6 +14,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class ResourceSpecs implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -62,20 +62,4 @@ public ResourceSpecs withNanoCPUs(long nanoCPUs) {
         this.nanoCPUs = nanoCPUs;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
index 58a4c1091..14269bbe2 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -16,6 +14,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class ResourceVersion implements Serializable {
 
     public static final long serialVersionUID = 1L;
@@ -41,19 +41,4 @@ public ResourceVersion withIndex(Long index) {
         this.index = index;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
index 54bbf8b38..2d932942a 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
@@ -3,8 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -13,6 +13,8 @@
  * Represents a pull response stream item
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class ResponseItem implements Serializable {
     private static final long serialVersionUID = -5187169652557467828L;
 
@@ -117,6 +119,8 @@ public boolean isErrorIndicated() {
     }
 
     @JsonIgnoreProperties(ignoreUnknown = true)
+    @EqualsAndHashCode
+    @ToString
     public static class ProgressDetail implements Serializable {
         private static final long serialVersionUID = -1954994695645715264L;
 
@@ -143,14 +147,11 @@ public Long getTotal() {
         public Long getStart() {
             return start;
         }
-
-        @Override
-        public String toString() {
-            return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-        }
     }
 
     @JsonIgnoreProperties(ignoreUnknown = true)
+    @EqualsAndHashCode
+    @ToString
     public static class ErrorDetail implements Serializable {
         private static final long serialVersionUID = -9136704865403084083L;
 
@@ -169,14 +170,11 @@ public Integer getCode() {
         public String getMessage() {
             return message;
         }
-
-        @Override
-        public String toString() {
-            return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-        }
     }
 
     @JsonIgnoreProperties(ignoreUnknown = true)
+    @EqualsAndHashCode
+    @ToString
     public static class AuxDetail implements Serializable {
         private static final long serialVersionUID = 1L;
 
@@ -203,15 +201,5 @@ public String getTag() {
         public String getDigest() {
             return digest;
         }
-
-        @Override
-        public String toString() {
-            return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-        }
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
index 4431376dc..114d9f0d8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
@@ -1,9 +1,7 @@
 package com.github.dockerjava.api.model;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 
@@ -28,6 +26,7 @@
  * @author Marcus Linke
  *
  */
+@EqualsAndHashCode
 public class RestartPolicy implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -134,21 +133,4 @@ public String toString() {
         String result = name.isEmpty() ? "no" : name;
         return maximumRetryCount > 0 ? result + ":" + maximumRetryCount : result;
     }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof RestartPolicy) {
-            RestartPolicy other = (RestartPolicy) obj;
-            return new EqualsBuilder().append(maximumRetryCount, other.getMaximumRetryCount())
-                    .append(name, other.getName()).isEquals();
-        } else {
-            return super.equals(obj);
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(maximumRetryCount).append(name).toHashCode();
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java
index 4e1663655..eb5c04b0e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java
@@ -1,9 +1,9 @@
 package com.github.dockerjava.api.model;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -13,6 +13,8 @@
  *
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class SearchItem implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -50,9 +52,4 @@ public String getName() {
     public String getDescription() {
         return description;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
index 1364aef4b..a24e89aa2 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -18,6 +16,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class SecretSpec implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -84,20 +84,4 @@ public SecretSpec withLabels(Map<String, String> labels) {
     public Map<String, String> getLabels() {
         return labels;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java
index 4afa646f2..4a809946d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java
@@ -4,10 +4,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -20,6 +18,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class Service implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -176,19 +176,4 @@ public Service withVersion(ResourceVersion version) {
         this.version = version;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
index 28c1e27e2..f5e8455fa 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
@@ -1,10 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -12,23 +10,11 @@
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
+@SuppressWarnings("checkstyle:hideutilityclassconstructor")
 public class ServiceGlobalModeOptions implements Serializable {
     public static final long serialVersionUID = 1L;
 
     // Intentionally left blank, there are no options for this mode
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
index 281f4424a..641ff22db 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
@@ -2,10 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -14,6 +12,8 @@
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class ServiceModeConfig implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -83,19 +83,4 @@ public ServiceModeConfig withGlobal(ServiceGlobalModeOptions global) {
 
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
index 077525221..6a6c0d212 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -17,6 +15,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class ServicePlacement implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -58,20 +58,4 @@ public List<SwarmNodePlatform> getPlatforms() {
     public void setPlatforms(List<SwarmNodePlatform> platforms) {
         this.platforms = platforms;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java
index 240e6c177..c28a09370 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java
@@ -1,16 +1,16 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@EqualsAndHashCode
+@ToString
 public class ServiceReplicatedModeOptions implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -34,20 +34,4 @@ public ServiceReplicatedModeOptions withReplicas(int replicas) {
         this.replicas = replicas;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
index 174cec3c8..8b55315e0 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
@@ -1,10 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -12,6 +10,8 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@EqualsAndHashCode
+@ToString
 public class ServiceRestartPolicy implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -102,20 +102,4 @@ public ServiceRestartPolicy withWindow(Long window) {
         this.window = window;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
index 0756024b0..84d4c23ee 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -18,6 +16,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class ServiceSpec implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -188,20 +188,4 @@ public ServiceSpec withRollbackConfig(UpdateConfig rollbackConfig) {
     public Map<String, String> getLabels() {
         return labels;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
index 3240d8147..ee457d9f8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
@@ -1,10 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -13,6 +11,8 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@EqualsAndHashCode
+@ToString
 public class ServiceUpdateStatus implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -103,20 +103,4 @@ public ServiceUpdateStatus withMessage(String message) {
         this.message = message;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
index 9f6271ea1..4d2ff8d67 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
@@ -2,9 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -15,6 +14,8 @@
  * @author Yuting Liu
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class StatisticNetworksConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -105,19 +106,4 @@ public Long getTxErrors() {
     public Long getTxPackets() {
         return txPackets;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java
index 42056a3a5..4abda09d1 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java
@@ -5,18 +5,20 @@
 
 import javax.annotation.CheckForNull;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 /**
  * Representation of a Docker statistics.
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class Statistics implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -101,9 +103,4 @@ public BlkioStatsConfig getBlkioStats() {
     public PidsStatsConfig getPidsStats() {
         return pidsStats;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
index efdc1d697..0c853e57a 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -17,6 +15,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class SwarmCAConfig implements Serializable {
 
     public static final long serialVersionUID = 1L;
@@ -64,19 +64,4 @@ public SwarmCAConfig withExternalCA(List<ExternalCA> externalCA) {
         this.externalCA = externalCA;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
index cc443f3e9..c7d6d9f84 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
@@ -4,10 +4,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -17,6 +15,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class SwarmDispatcherConfig implements Serializable {
 
     public static final long serialVersionUID = 1L;
@@ -42,19 +42,4 @@ public SwarmDispatcherConfig withHeartbeatPeriod(Long heartbeatPeriod) {
         this.heartbeatPeriod = heartbeatPeriod;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
index 3accd31d8..e7bd8fdd9 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -17,6 +15,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class SwarmInfo implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -217,20 +217,4 @@ public SwarmInfo withClusterInfo(ClusterInfo clusterInfo) {
         this.clusterInfo = clusterInfo;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
index f9ca423fa..ddda93d53 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -16,6 +14,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class SwarmJoinTokens implements Serializable {
 
     public static final long serialVersionUID = 1L;
@@ -63,19 +63,4 @@ public SwarmJoinTokens withManager(String manager) {
         this.manager = manager;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
index 1fc1f2a91..ee556bd9a 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -20,6 +18,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class SwarmNode implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -198,19 +198,4 @@ public SwarmNode withManagerStatus(SwarmNodeManagerStatus managerStatus) {
         this.managerStatus = managerStatus;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
index 5a7abe22f..1044dd1f5 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -16,6 +14,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class SwarmNodeDescription implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -106,19 +106,4 @@ public SwarmNodeDescription withEngine(SwarmNodeEngineDescription engine) {
         this.engine = engine;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
index be1327f77..5eff03272 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
@@ -4,10 +4,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -18,6 +16,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class SwarmNodeEngineDescription implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -86,19 +86,4 @@ public SwarmNodeEngineDescription withPlugins(SwarmNodePluginDescription[] plugi
         this.plugins = plugins;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
index f437ed365..384c45a0f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
@@ -4,10 +4,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -17,6 +15,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class SwarmNodeManagerStatus implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -85,19 +85,4 @@ public SwarmNodeManagerStatus withAddr(String addr) {
         this.addr = addr;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
index afb5978f3..3b3747d5f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
@@ -2,10 +2,8 @@
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -13,6 +11,8 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@EqualsAndHashCode
+@ToString
 public class SwarmNodePlatform implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -59,19 +59,4 @@ public SwarmNodePlatform withOs(String os) {
         this.os = os;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
index f017f3456..9e71e6188 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
@@ -4,10 +4,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -17,6 +15,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class SwarmNodePluginDescription implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -63,19 +63,4 @@ public SwarmNodePluginDescription withName(String name) {
         this.name = name;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
index 4312f8999..298360ce7 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
@@ -4,10 +4,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -17,6 +15,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class SwarmNodeResources implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -63,19 +63,4 @@ public SwarmNodeResources withMemoryBytes(Long memoryBytes) {
         this.memoryBytes = memoryBytes;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
index 49a038431..b02366972 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
@@ -4,10 +4,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -18,6 +16,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class SwarmNodeSpec implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -108,19 +108,4 @@ public SwarmNodeSpec withLabels(Map<String, String> labels) {
         this.labels = labels;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
index abd596f39..7260f3da9 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -17,6 +15,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class SwarmNodeStatus implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -41,21 +41,4 @@ public SwarmNodeStatus withState(SwarmNodeState state) {
         this.state = state;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
index 99ac27c9b..ad2211aa5 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
@@ -4,10 +4,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -18,6 +16,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class SwarmNodeVersion implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -42,19 +42,4 @@ public SwarmNodeVersion withIndex(long index) {
         this.index = index;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
index 02a571f75..e68018c3b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -16,6 +14,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class SwarmOrchestration implements Serializable {
 
     public static final long serialVersionUID = 1L;
@@ -41,19 +41,4 @@ public SwarmOrchestration withTaskHistoryRententionLimit(int taskHistoryRententi
         this.taskHistoryRententionLimit = taskHistoryRententionLimit;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
index b0dc004eb..17c2bcc95 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -16,6 +14,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class SwarmRaftConfig implements Serializable {
 
     public static final long serialVersionUID = 1L;
@@ -107,19 +107,4 @@ public SwarmRaftConfig withElectionTick(int electionTick) {
         this.electionTick = electionTick;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
index 02c449eab..656f826b3 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
@@ -4,10 +4,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -17,6 +15,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class SwarmSpec implements Serializable {
 
     public static final long serialVersionUID = 1L;
@@ -153,19 +153,4 @@ public SwarmSpec withName(String name) {
         this.name = name;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
index a18275beb..9a2f6c317 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -16,6 +14,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class SwarmVersion implements Serializable {
 
     public static final long serialVersionUID = 1L;
@@ -41,19 +41,4 @@ public SwarmVersion withIndex(long index) {
         this.index = index;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java
index 54e8e04a0..dd8f3ac62 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java
@@ -3,17 +3,20 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class Task implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -230,58 +233,6 @@ public Task withDesiredState(TaskState desiredState) {
         return this;
     }
 
-    @Override
-    public boolean equals(java.lang.Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Task task = (Task) o;
-        return Objects.equals(this.id, task.id) &&
-                Objects.equals(this.version, task.version) &&
-                Objects.equals(this.createdAt, task.createdAt) &&
-                Objects.equals(this.updatedAt, task.updatedAt) &&
-                Objects.equals(this.name, task.name) &&
-                Objects.equals(this.labels, task.labels) &&
-                Objects.equals(this.spec, task.spec) &&
-                Objects.equals(this.serviceId, task.serviceId) &&
-                Objects.equals(this.slot, task.slot) &&
-                Objects.equals(this.nodeId, task.nodeId) &&
-                Objects.equals(this.assignedGenericResources, task.assignedGenericResources) &&
-                Objects.equals(this.status, task.status) &&
-                Objects.equals(this.desiredState, task.desiredState);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id, version, createdAt, updatedAt, name, labels, spec, serviceId, slot,
-                nodeId, assignedGenericResources, status, desiredState);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class Task {\n");
-        sb.append("    ID: ").append(toIndentedString(id)).append("\n");
-        sb.append("    version: ").append(toIndentedString(version)).append("\n");
-        sb.append("    createdAt: ").append(toIndentedString(createdAt)).append("\n");
-        sb.append("    updatedAt: ").append(toIndentedString(updatedAt)).append("\n");
-        sb.append("    name: ").append(toIndentedString(name)).append("\n");
-        sb.append("    labels: ").append(toIndentedString(labels)).append("\n");
-        sb.append("    spec: ").append(toIndentedString(spec)).append("\n");
-        sb.append("    serviceId: ").append(toIndentedString(serviceId)).append("\n");
-        sb.append("    slot: ").append(toIndentedString(slot)).append("\n");
-        sb.append("    nodeId: ").append(toIndentedString(nodeId)).append("\n");
-        sb.append("    assignedGenericResources: ").append(toIndentedString(assignedGenericResources)).append("\n");
-        sb.append("    status: ").append(toIndentedString(status)).append("\n");
-        sb.append("    desiredState: ").append(toIndentedString(desiredState)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
     /**
      * Convert the given object to string with each line indented by 4 spaces
      * (except the first line).
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
index bcbe5f0bf..710b9b344 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
@@ -4,10 +4,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -17,6 +15,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class TaskDefaults implements Serializable {
 
     public static final long serialVersionUID = 1L;
@@ -42,19 +42,4 @@ public TaskDefaults withLogDriver(Driver logDriver) {
         this.logDriver = logDriver;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
index 6453c726b..c81192164 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -17,6 +15,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class TaskSpec implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -183,20 +183,4 @@ public TaskSpec withNetworks(List<NetworkAttachmentConfig> networks) {
         this.networks = networks;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
index f96da2877..bdfdf35ea 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
@@ -3,8 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -13,6 +13,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class TaskStatus implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -75,9 +77,4 @@ public TaskStatus withContainerStatus(TaskStatusContainerStatus containerStatus)
         this.containerStatus = containerStatus;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
index 3f94f1dc2..84c760c43 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
@@ -3,8 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -13,6 +13,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class TaskStatusContainerStatus implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -88,9 +90,4 @@ public TaskStatusContainerStatus withExitCode(Integer exitCode) {
         this.exitCode = exitCode != null ? exitCode.longValue() : null;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE).toString();
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
index 08f054801..d5c4443ac 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
@@ -3,10 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -15,6 +13,8 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@EqualsAndHashCode
+@ToString
 public class TmpfsOptions implements Serializable {
     private static final long serialVersionUID = 1L;
     @JsonProperty("SizeBytes")
@@ -42,19 +42,4 @@ public TmpfsOptions withMode(Integer mode) {
         this.mode = mode;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java
index 4181e422c..b71c8c40a 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java
@@ -1,9 +1,8 @@
 package com.github.dockerjava.api.model;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -12,6 +11,8 @@
 /**
  * @author Vangie Du (duwan@live.com)
  */
+@EqualsAndHashCode
+@ToString
 public class Ulimit implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -45,22 +46,4 @@ public Integer getSoft() {
     public Integer getHard() {
         return hard;
     }
-
-    // CHECKSTYLE:OFF
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof Ulimit) {
-            Ulimit other = (Ulimit) obj;
-            return new EqualsBuilder().append(name, other.getName()).append(soft, other.getSoft())
-                    .append(hard, other.getHard()).isEquals();
-        } else
-            return super.equals(obj);
-
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(name).append(soft).append(hard).toHashCode();
-    }
-    // CHECKSTYLE:ON
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
index 34c63fbbe..ee5d4a740 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
@@ -1,10 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -12,6 +10,8 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@EqualsAndHashCode
+@ToString
 public class UpdateConfig implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -136,20 +136,4 @@ public UpdateConfig withOrder(UpdateOrder order) {
         this.order = order;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java
index 2dcfdcb86..aed730c72 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java
@@ -3,9 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.command.VersionCmd;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -18,6 +17,8 @@
  * @see VersionCmd
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class Version implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -139,19 +140,4 @@ public VersionPlatform getPlatform() {
     public List<VersionComponent> getComponents() {
         return components;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return  EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
index 598d24c3a..52579785a 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
@@ -2,9 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -17,6 +16,8 @@
  * @author Dmitry Tretyakov
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class VersionComponent implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -76,19 +77,4 @@ public VersionComponent withVersion(String version) {
         this.version = version;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
index 8e2fbe414..f86e3cb33 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
@@ -2,9 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -16,6 +15,8 @@
  * @author Dmitry Tretyakov
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
+@EqualsAndHashCode
+@ToString
 public class VersionPlatform implements Serializable {
     public static final long serialVersionUID = 1L;
 
@@ -37,19 +38,4 @@ public VersionPlatform withName(String name) {
         this.name = name;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java
index 8b5ff9db8..aad95a265 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java
@@ -2,8 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import lombok.EqualsAndHashCode;
 
 import javax.annotation.Nonnull;
 import java.io.Serializable;
@@ -20,6 +19,7 @@
  *
  * @see Bind
  */
+@EqualsAndHashCode
 public class Volume implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -53,20 +53,4 @@ public String getPath() {
     public String toString() {
         return getPath();
     }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof Volume) {
-            Volume other = (Volume) obj;
-            return new EqualsBuilder().append(path, other.getPath()).isEquals();
-        } else {
-            return super.equals(obj);
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(path).toHashCode();
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java
index c5b251aa6..f0d98fc25 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java
@@ -1,10 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.Map;
@@ -12,6 +10,8 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@EqualsAndHashCode
+@ToString
 public class VolumeOptions implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -77,20 +77,4 @@ public VolumeOptions withDriverConfig(Driver driverConfig) {
         this.driverConfig = driverConfig;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return EqualsBuilder.reflectionEquals(this, o);
-    }
-
-    @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
index 0d53844dd..0c698ae6c 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
@@ -4,9 +4,6 @@
 import java.io.Serializable;
 import java.util.Map.Entry;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -19,6 +16,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.node.NullNode;
+import lombok.EqualsAndHashCode;
 
 /**
  * Represents a bind mounted volume in a Docker container.
@@ -29,6 +27,7 @@
 @JsonDeserialize(using = VolumeRW.Deserializer.class)
 @JsonSerialize(using = VolumeRW.Serializer.class)
 @Deprecated
+@EqualsAndHashCode
 public class VolumeRW implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -64,22 +63,6 @@ public String toString() {
         return getVolume() + ":" + getAccessMode();
     }
 
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof VolumeRW) {
-            VolumeRW other = (VolumeRW) obj;
-            return new EqualsBuilder().append(getVolume(), other.getVolume()).append(accessMode, other.getAccessMode())
-                    .isEquals();
-        } else {
-            return super.equals(obj);
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(getVolume()).append(getAccessMode()).toHashCode();
-    }
-
     public static class Serializer extends JsonSerializer<VolumeRW> {
 
         @Override
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
index fb52ff3f7..b70fa0384 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
@@ -3,9 +3,6 @@
 import java.io.IOException;
 import java.io.Serializable;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -17,9 +14,11 @@
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.EqualsAndHashCode;
 
 @JsonSerialize(using = VolumesFrom.Serializer.class)
 @JsonDeserialize(using = VolumesFrom.Deserializer.class)
+@EqualsAndHashCode
 public class VolumesFrom implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -73,22 +72,6 @@ public static VolumesFrom parse(String serialized) {
         }
     }
 
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof VolumesFrom) {
-            VolumesFrom other = (VolumesFrom) obj;
-            return new EqualsBuilder().append(container, other.getContainer())
-                    .append(accessMode, other.getAccessMode()).isEquals();
-        } else {
-            return super.equals(obj);
-        }
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder().append(container).append(accessMode).toHashCode();
-    }
-
     /**
      * Returns a string representation of this {@link VolumesFrom} suitable for inclusion in a JSON message. The format is
      * <code>&lt;container&gt;:&lt;access mode&gt;</code>, like the argument in {@link #parse(String)}.
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index d559860e8..df1a74d1e 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -40,6 +40,12 @@
 			<version>${commons-compress.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>${commons-lang.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
index c8fed9cce..d664e8c73 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
@@ -31,6 +31,7 @@
 import static com.github.dockerjava.test.serdes.JSONTestHelper.testRoundTrip;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.notNullValue;
@@ -188,4 +189,9 @@ public void inspect_windows_container() throws IOException {
         assertThat(response.getPath(), is("cmd"));
         assertThat(response.getPlatform(), is("windows"));
     }
+
+    @Test
+    public void equals() {
+        assertThat(new InspectContainerResponse(), equalTo(new InspectContainerResponse()));
+    }
 }

From 41eea383d47801e6dcaa1df984cf4740fe1980df Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Wed, 20 Nov 2019 08:12:41 +0100
Subject: [PATCH 0947/1272] Replace static `ObjectMapper`s with
 `DockerClientConfig#getObjectMapper` (#1275)

* Replace static ObjectMappers with DockerClientConfig#getObjectMapper

* remove unused `ObjectMapper` field

* revert change

* simplify AbstrDockerCmdExec
---
 .../core/DefaultDockerClientConfig.java       |  2 +-
 .../dockerjava/core/DockerClientConfig.java   | 18 +++++++
 .../dockerjava/core/DockerConfigFile.java     | 21 ++++----
 .../core/async/JsonStreamProcessor.java       | 19 +++++--
 .../core/command/AbstrDockerCmd.java          |  1 +
 .../core/exec/AbstrDockerCmdExec.java         |  4 +-
 .../core/util/CacheFromEncoder.java           |  1 +
 .../dockerjava/core/util/FiltersEncoder.java  |  1 +
 .../dockerjava/jaxrs/AbstrDockerCmdExec.java  |  7 ++-
 .../dockerjava/jaxrs/BuildImageCmdExec.java   |  8 +--
 .../dockerjava/jaxrs/EventsCmdExec.java       |  2 +-
 .../jaxrs/JerseyDockerCmdExecFactory.java     |  9 ++--
 .../dockerjava/jaxrs/PullImageCmdExec.java    |  5 +-
 .../dockerjava/jaxrs/PushImageCmdExec.java    |  5 +-
 .../github/dockerjava/jaxrs/StatsCmdExec.java |  2 +-
 .../jaxrs/WaitContainerCmdExec.java           |  2 +-
 .../filter/ResponseStatusExceptionFilter.java | 14 ++++-
 .../netty/NettyDockerCmdExecFactory.java      |  3 +-
 .../netty/NettyInvocationBuilder.java         | 27 ++++++++--
 .../dockerjava/netty/NettyWebTarget.java      | 52 ++++++++++++++-----
 .../netty/handler/JsonRequestHandler.java     |  3 ++
 .../handler/JsonResponseCallbackHandler.java  | 16 +++++-
 .../command/InspectContainerResponseTest.java |  8 ++-
 .../api/command/InspectExecResponseTest.java  |  5 +-
 .../api/command/InspectImageResponseTest.java | 17 +++---
 .../dockerjava/api/model/AuthConfigTest.java  | 14 ++---
 .../dockerjava/api/model/CapabilityTest.java  |  9 ++--
 .../dockerjava/api/model/ContainerTest.java   |  5 +-
 .../dockerjava/api/model/EventsTest.java      |  5 +-
 .../github/dockerjava/api/model/InfoTest.java | 11 ++--
 .../api/model/PortsSerializingTest.java       | 13 +++--
 .../model/RestartPolicySerializingTest.java   | 13 +++--
 .../dockerjava/api/model/StatisticsTest.java  |  5 +-
 .../dockerjava/api/model/VersionTest.java     |  8 ++-
 .../dockerjava/api/model/VolumeBindsTest.java |  9 ++--
 .../api/model/VolumeFromSerializingTest.java  |  7 ++-
 .../dockerjava/cmd/StartContainerCmdIT.java   |  5 +-
 .../dockerjava/cmd/UpdateContainerCmdIT.java  |  5 +-
 .../dockerjava/core/DockerConfigFileTest.java |  3 +-
 .../core/async/JsonStreamProcessorTest.java   |  4 +-
 .../dockerjava/netty/NettyWebTargetTest.java  |  9 ++--
 .../dockerjava/test/serdes/JSONSamples.java   | 18 +++----
 .../test/serdes/JSONTestHelper.java           | 24 +++++----
 43 files changed, 248 insertions(+), 171 deletions(-)

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index 063fbd3bf..44f54bddb 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -242,7 +242,7 @@ public String getDockerConfigPath() {
     public DockerConfigFile getDockerConfig() {
         if (dockerConfig == null) {
             try {
-                dockerConfig = DockerConfigFile.loadConfig(getDockerConfigPath());
+                dockerConfig = DockerConfigFile.loadConfig(getObjectMapper(), getDockerConfigPath());
             } catch (IOException e) {
                 throw new DockerClientException("Failed to parse docker configuration file", e);
             }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index 532fe6b43..226b95c05 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -5,6 +5,8 @@
 
 import java.net.URI;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
 
@@ -37,4 +39,20 @@ public interface DockerClientConfig {
      */
     SSLConfig getSSLConfig();
 
+    default ObjectMapper getObjectMapper() {
+        return DefaultObjectMapperHolder.INSTANCE.getObjectMapper();
+    }
+}
+
+enum DefaultObjectMapperHolder {
+    INSTANCE;
+
+    private final ObjectMapper objectMapper = new ObjectMapper()
+            // TODO .setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL)
+            // TODO .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
+            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+
+    public ObjectMapper getObjectMapper() {
+        return objectMapper;
+    }
 }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
index 0cef8676d..fd04a5aa6 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.core;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -20,12 +19,10 @@
 import java.util.List;
 import java.util.Map;
 
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class DockerConfigFile {
     private static final String DOCKER_LEGACY_CFG = ".dockercfg";
     private static final String DOCKER_CFG = "config.json";
 
-    private static final ObjectMapper MAPPER = new ObjectMapper();
     private static final TypeReference<Map<String, AuthConfig>> CONFIG_MAP_TYPE = new TypeReference<Map<String, AuthConfig>>() {
     };
 
@@ -118,18 +115,24 @@ public String toString() {
     }
 
     @Nonnull
+    @Deprecated
     public static DockerConfigFile loadConfig(@CheckForNull String dockerConfigPath) throws IOException {
+        return loadConfig(DefaultObjectMapperHolder.INSTANCE.getObjectMapper(), dockerConfigPath);
+    }
+
+    @Nonnull
+    public static DockerConfigFile loadConfig(ObjectMapper objectMapper, @CheckForNull String dockerConfigPath) throws IOException {
         // no any configs, but for empty auths return non null object
         if (dockerConfigPath == null) {
             return new DockerConfigFile();
         }
 
         //parse new docker config file format
-        DockerConfigFile dockerConfig = loadCurrentConfig(dockerConfigPath);
+        DockerConfigFile dockerConfig = loadCurrentConfig(objectMapper, dockerConfigPath);
 
         //parse old auth config file format
         if (dockerConfig == null) {
-            dockerConfig = loadLegacyConfig(dockerConfigPath);
+            dockerConfig = loadLegacyConfig(objectMapper, dockerConfigPath);
         }
 
         //otherwise create default config
@@ -148,7 +151,7 @@ public static DockerConfigFile loadConfig(@CheckForNull String dockerConfigPath)
     }
 
     @CheckForNull
-    private static DockerConfigFile loadCurrentConfig(@CheckForNull String dockerConfigPath) throws IOException {
+    private static DockerConfigFile loadCurrentConfig(ObjectMapper objectMapper, @CheckForNull String dockerConfigPath) throws IOException {
         File dockerCfgFile = new File(dockerConfigPath, DOCKER_CFG);
 
         if (!dockerCfgFile.exists() || !dockerCfgFile.isFile()) {
@@ -156,14 +159,14 @@ private static DockerConfigFile loadCurrentConfig(@CheckForNull String dockerCon
         }
 
         try {
-            return MAPPER.readValue(dockerCfgFile, DockerConfigFile.class);
+            return objectMapper.readValue(dockerCfgFile, DockerConfigFile.class);
         } catch (IOException e) {
             throw new IOException("Failed to parse docker " + DOCKER_CFG, e);
         }
     }
 
     @CheckForNull
-    private static DockerConfigFile loadLegacyConfig(String dockerConfigPath) throws IOException {
+    private static DockerConfigFile loadLegacyConfig(ObjectMapper objectMapper, String dockerConfigPath) throws IOException {
         File dockerLegacyCfgFile = new File(dockerConfigPath, DOCKER_LEGACY_CFG);
 
         if (!dockerLegacyCfgFile.exists() || !dockerLegacyCfgFile.isFile()) {
@@ -172,7 +175,7 @@ private static DockerConfigFile loadLegacyConfig(String dockerConfigPath) throws
 
         //parse legacy auth config file format
         try {
-            return new DockerConfigFile(MAPPER.<Map<String, AuthConfig>>readValue(dockerLegacyCfgFile, CONFIG_MAP_TYPE));
+            return new DockerConfigFile(objectMapper.<Map<String, AuthConfig>>readValue(dockerLegacyCfgFile, CONFIG_MAP_TYPE));
         } catch (IOException e) {
             // pass
         }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
index 9da43b62b..7ad1c135a 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.dockerjava.api.async.ResultCallback;
@@ -22,19 +23,27 @@ public class JsonStreamProcessor<T> implements ResponseStreamProcessor<T> {
 
     private static final JsonFactory JSON_FACTORY = new JsonFactory();
 
-    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-
     private final Class<T> clazz;
 
+    private final ObjectMapper objectMapper;
+
+    @Deprecated
     public JsonStreamProcessor(Class<T> clazz) {
+        this(
+                new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES),
+                clazz
+        );
+    }
+
+    public JsonStreamProcessor(ObjectMapper objectMapper, Class<T> clazz) {
         this.clazz = clazz;
+        this.objectMapper = objectMapper.copy().enable(JsonParser.Feature.AUTO_CLOSE_SOURCE);
     }
 
     @Override
     public void processResponseStream(InputStream response, ResultCallback<T> resultCallback) {
 
         resultCallback.onStart(response);
-        OBJECT_MAPPER.configure(JsonParser.Feature.AUTO_CLOSE_SOURCE, true);
 
         try {
             JsonParser jp = JSON_FACTORY.createParser(response);
@@ -42,10 +51,10 @@ public void processResponseStream(InputStream response, ResultCallback<T> result
             JsonToken nextToken = jp.nextToken();
             while (!closed && nextToken != null && nextToken != JsonToken.END_OBJECT) {
                 try {
-                    ObjectNode objectNode = OBJECT_MAPPER.readTree(jp);
+                    ObjectNode objectNode = objectMapper.readTree(jp);
                     // exclude empty item serialization into class #461
                     if (!objectNode.isEmpty(null)) {
-                        T next = OBJECT_MAPPER.treeToValue(objectNode, clazz);
+                        T next = objectMapper.treeToValue(objectNode, clazz);
                         resultCallback.onNext(next);
                     }
                 } catch (Exception e) {
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
index c89465059..b2c9d36ce 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
@@ -44,6 +44,7 @@ public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SIMPLE_STYLE);
     }
 
+    @Deprecated
     protected String registryAuth(AuthConfig authConfig) {
         try {
             return Base64.getEncoder().encodeToString(new ObjectMapper().writeValueAsBytes(authConfig));
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
index 1ec333416..78211bdec 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
@@ -42,7 +42,7 @@ protected AuthConfigurations getBuildAuthConfigs() {
 
     protected String registryAuth(@Nonnull AuthConfig authConfig) {
         try {
-            return BaseEncoding.base64Url().encode(new ObjectMapper().writeValueAsString(authConfig).getBytes());
+            return BaseEncoding.base64Url().encode(dockerClientConfig.getObjectMapper().writeValueAsString(authConfig).getBytes());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -52,8 +52,8 @@ protected String registryAuth(@Nonnull AuthConfig authConfig) {
     protected String registryConfigs(@Nonnull AuthConfigurations authConfigs) {
         try {
             final String json;
-            final ObjectMapper objectMapper = new ObjectMapper();
             final RemoteApiVersion apiVersion = dockerClientConfig.getApiVersion();
+            ObjectMapper objectMapper = dockerClientConfig.getObjectMapper();
 
             if (apiVersion.equals(UNKNOWN_VERSION)) {
                 ObjectNode rootNode = objectMapper.valueToTree(authConfigs.getConfigs()); // all registries
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java
index fd2dd50b9..b5753bf57 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CacheFromEncoder.java
@@ -13,6 +13,7 @@ public class CacheFromEncoder {
     private CacheFromEncoder() {
     }
 
+    // This instance MUST NOT be used for domain-specific serialization of the docker-java types
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
     public static String jsonEncode(Collection<String> imageIds) {
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
index 7b1e34f74..975d65aa3 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java
@@ -16,6 +16,7 @@ public class FiltersEncoder {
     private FiltersEncoder() {
     }
 
+    // This instance MUST NOT be used for domain-specific serialization of the docker-java types
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
     public static String jsonEncode(Map<String, List<String>> mapStringListString) {
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
index 47681e20c..3b93a8af2 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
@@ -22,11 +22,15 @@ public abstract class AbstrDockerCmdExec {
 
     private final WebTarget baseResource;
 
+    protected final ObjectMapper objectMapper;
+
     public AbstrDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
         checkNotNull(baseResource, "baseResource was not specified");
         checkNotNull(dockerClientConfig, "dockerClientConfig was not specified");
         this.baseResource = baseResource;
         this.dockerClientConfig = dockerClientConfig;
+        this.objectMapper = dockerClientConfig.getObjectMapper();
+        checkNotNull(objectMapper, "objectMapper was not specified");
     }
 
     protected WebTarget getBaseResource() {
@@ -39,7 +43,7 @@ protected AuthConfigurations getBuildAuthConfigs() {
 
     protected String registryAuth(AuthConfig authConfig) {
         try {
-            return BaseEncoding.base64Url().encode(new ObjectMapper().writeValueAsString(authConfig).getBytes());
+            return BaseEncoding.base64Url().encode(objectMapper.writeValueAsString(authConfig).getBytes());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -60,7 +64,6 @@ protected Invocation.Builder resourceWithOptionalAuthConfig(AuthConfig authConfi
     protected String registryConfigs(AuthConfigurations authConfigs) {
         try {
             final String json;
-            final ObjectMapper objectMapper = new ObjectMapper();
             final RemoteApiVersion apiVersion = dockerClientConfig.getApiVersion();
 
             if (apiVersion.equals(UNKNOWN_VERSION)) {
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index 49d83eaf9..20dd5396d 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -7,8 +7,6 @@
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import com.github.dockerjava.core.util.CacheFromEncoder;
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.RequestEntityProcessing;
@@ -32,8 +30,6 @@ public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, Bu
         BuildImageCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageCmdExec.class);
 
-    private static final ObjectMapper MAPPER = new ObjectMapper();
-
     public BuildImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
         super(baseResource, dockerClientConfig);
     }
@@ -137,7 +133,7 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
 
         LOGGER.trace("POST: {}", webTarget);
 
-        return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(BuildResponseItem.class),
+        return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(objectMapper, BuildResponseItem.class),
                 resultCallback,
                 resourceWithOptionalAuthConfig(command, webTarget.request()).accept(MediaType.TEXT_PLAIN),
                 entity(command.getTarInputStream(), "application/tar")
@@ -148,7 +144,7 @@ private WebTarget writeMap(WebTarget webTarget, String name, Map<String, String>
         if (value != null && !value.isEmpty()) {
             try {
                 return webTarget.queryParam(name,
-                        URLEncoder.encode(MAPPER.writeValueAsString(value), "UTF-8").replaceAll("\\+", "%20"));
+                        URLEncoder.encode(objectMapper.writeValueAsString(value), "UTF-8").replaceAll("\\+", "%20"));
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
index 090fca8ac..d6cb6aeed 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -36,7 +36,7 @@ protected AbstractCallbackNotifier<Event> callbackNotifier(EventsCmd command, Re
 
         LOGGER.trace("GET: {}", webTarget);
 
-        return new GETCallbackNotifier<>(new JsonStreamProcessor<>(Event.class), resultCallback,
+        return new GETCallbackNotifier<>(new JsonStreamProcessor<>(objectMapper, Event.class), resultCallback,
                 webTarget.request());
     }
 }
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
index 158a93706..461899290 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.jaxrs;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd;
@@ -157,13 +155,12 @@ public void init(DockerClientConfig dockerClientConfig) {
         if (requestEntityProcessing != null) {
             clientConfig.property(ClientProperties.REQUEST_ENTITY_PROCESSING, requestEntityProcessing);
         }
-        clientConfig.register(ResponseStatusExceptionFilter.class);
+
+        clientConfig.register(new ResponseStatusExceptionFilter(dockerClientConfig.getObjectMapper()));
         clientConfig.register(JsonClientFilter.class);
         RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
 
-        ObjectMapper objectMapper = new ObjectMapper();
-        objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
-        clientConfig.register(new JacksonJsonProvider(objectMapper));
+        clientConfig.register(new JacksonJsonProvider(dockerClientConfig.getObjectMapper()));
 
         // logging may disabled via log level
         clientConfig.register(new SelectiveLoggingFilter(LOGGER, true));
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
index 70cde2ee3..c20691288 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
@@ -40,7 +40,8 @@ protected AbstractCallbackNotifier<PullResponseItem> callbackNotifier(PullImageC
         Builder builder = resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request()).accept(
                 MediaType.APPLICATION_OCTET_STREAM_TYPE);
 
-        return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(
-                PullResponseItem.class), resultCallback, builder, entity(null, MediaType.APPLICATION_JSON));
+        return new POSTCallbackNotifier<>(
+                new JsonStreamProcessor<>(objectMapper, PullResponseItem.class),
+                resultCallback, builder, entity(null, MediaType.APPLICATION_JSON));
     }
 }
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
index d5da2915b..3f6d5434c 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
@@ -44,7 +44,8 @@ protected AbstractCallbackNotifier<PushResponseItem> callbackNotifier(PushImageC
         Builder builder = resourceWithAuthConfig(command.getAuthConfig(), webResource.request())
                 .accept(MediaType.APPLICATION_JSON);
 
-        return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(
-                PushResponseItem.class), resultCallback, builder, entity(null, MediaType.APPLICATION_JSON));
+        return new POSTCallbackNotifier<>(
+                new JsonStreamProcessor<>(objectMapper, PushResponseItem.class),
+                resultCallback, builder, entity(null, MediaType.APPLICATION_JSON));
     }
 }
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
index 4358e00fe..b1c69b656 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
@@ -29,7 +29,7 @@ protected AbstractCallbackNotifier<Statistics> callbackNotifier(StatsCmd command
 
         LOGGER.trace("GET: {}", webTarget);
 
-        return new GETCallbackNotifier<>(new JsonStreamProcessor<>(Statistics.class),
+        return new GETCallbackNotifier<>(new JsonStreamProcessor<>(objectMapper, Statistics.class),
                 resultCallback, webTarget.request());
     }
 }
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
index 2d5b64917..644bb8f22 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
@@ -34,7 +34,7 @@ protected AbstractCallbackNotifier<WaitResponse> callbackNotifier(WaitContainerC
 
         LOGGER.trace("POST: {}", webResource);
 
-        return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(WaitResponse.class),
+        return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(objectMapper, WaitResponse.class),
                 resultCallback, webResource.request().accept(MediaType.APPLICATION_JSON), entity(null,
                 MediaType.APPLICATION_JSON));
     }
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
index bac31fc81..c0c6e3d48 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
@@ -9,6 +9,7 @@
 import javax.ws.rs.client.ClientResponseFilter;
 import javax.ws.rs.core.MediaType;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,6 +36,17 @@ public class ResponseStatusExceptionFilter implements ClientResponseFilter {
 
     private static final Logger LOG = LoggerFactory.getLogger(ResponseStatusExceptionFilter.class);
 
+    private final ObjectMapper objectMapper;
+
+    @Deprecated
+    public ResponseStatusExceptionFilter() {
+        this(new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
+    }
+
+    public ResponseStatusExceptionFilter(ObjectMapper objectMapper) {
+        this.objectMapper = objectMapper;
+    }
+
     @Override
     public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException {
         int status = responseContext.getStatus();
@@ -84,7 +96,7 @@ private String getBodyAsMessage(ClientResponseContext responseContext) {
 
                 if (MediaType.APPLICATION_JSON_TYPE.equals(mediaType)) {
                     try {
-                        JsonNode node = new ObjectMapper().readTree(message);
+                        JsonNode node = objectMapper.readTree(message);
                         if (node != null) {
                             JsonNode messageNode = node.get("message");
                             if (messageNode != null && messageNode.isTextual()) {
diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index ff55892bf..3a5a1a32b 100644
--- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -112,7 +112,8 @@ public void init(DockerClientConfig dockerClientConfig) {
 
         eventLoopGroup = nettyInitializer.init(bootstrap, dockerClientConfig);
 
-        baseResource = new NettyWebTarget(channelProvider, host).path(dockerClientConfig.getApiVersion().asWebPathPart());
+        baseResource = new NettyWebTarget(dockerClientConfig.getObjectMapper(), channelProvider, host)
+                .path(dockerClientConfig.getApiVersion().asWebPathPart());
     }
 
 
diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
index 902dc24cf..7478b83f6 100644
--- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
+++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.github.dockerjava.api.async.ResultCallback;
@@ -80,7 +81,19 @@ public void onNext(Void object) {
 
     private Map<String, String> headers = new HashMap<>();
 
+    private final ObjectMapper objectMapper;
+
+    @Deprecated
     public NettyInvocationBuilder(ChannelProvider channelProvider, String resource) {
+        this(
+                new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES),
+                channelProvider,
+                resource
+        );
+    }
+
+    public NettyInvocationBuilder(ObjectMapper objectMapper, ChannelProvider channelProvider, String resource) {
+        this.objectMapper = objectMapper.copy().disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
         this.channelProvider = channelProvider;
         this.resource = resource;
     }
@@ -143,7 +156,9 @@ public <T> void get(TypeReference<T> typeReference, ResultCallback<T> resultCall
 
         Channel channel = getChannel();
 
-        JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<>(typeReference,
+        JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<>(
+                objectMapper,
+                typeReference,
                 resultCallback);
 
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
@@ -267,7 +282,9 @@ public <T> void post(final Object entity, TypeReference<T> typeReference, final
 
         Channel channel = getChannel();
 
-        JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<>(typeReference,
+        JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<>(
+                objectMapper,
+                typeReference,
                 resultCallback);
 
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
@@ -317,8 +334,6 @@ private HttpRequest prepareEntityRequest(String uri, Object entity, HttpMethod h
 
             byte[] bytes;
             try {
-                ObjectMapper objectMapper = new ObjectMapper();
-                objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
                 bytes = objectMapper.writeValueAsBytes(entity);
             } catch (JsonProcessingException e) {
                 throw new RuntimeException(e);
@@ -371,7 +386,9 @@ public <T> void post(TypeReference<T> typeReference, ResultCallback<T> resultCal
 
         Channel channel = getChannel();
 
-        JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<>(typeReference,
+        JsonResponseCallbackHandler<T> jsonResponseHandler = new JsonResponseCallbackHandler<>(
+                objectMapper,
+                typeReference,
                 resultCallback);
 
         HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
index 7d713849f..e209cd231 100644
--- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
+++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
@@ -12,6 +12,7 @@
 import java.util.Objects;
 import java.util.Set;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.core.WebTarget;
 import com.google.common.collect.ImmutableSet;
@@ -28,7 +29,6 @@
  * @author Marcus Linke
  */
 public class NettyWebTarget implements WebTarget {
-    private static final ObjectMapper MAPPER = new ObjectMapper();
 
     private final ChannelProvider channelProvider;
 
@@ -45,16 +45,40 @@ public class NettyWebTarget implements WebTarget {
 
     private static final String PATH_SEPARATOR = "/";
 
+    private final ObjectMapper objectMapper;
+
+    @Deprecated
     public NettyWebTarget(ChannelProvider channelProvider, String host) {
-        this(channelProvider, host, ImmutableList.<String>of(), ImmutableMap.<String, String>of(),
-                ImmutableMap.<String, Set<String>>of());
+        this(
+                new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES),
+                channelProvider,
+                host,
+                ImmutableList.of(),
+                ImmutableMap.of(),
+                ImmutableMap.of()
+        );
+    }
+
+    public NettyWebTarget(ObjectMapper objectMapper, ChannelProvider channelProvider, String host) {
+        this(
+                objectMapper,
+                channelProvider,
+                host,
+                ImmutableList.of(),
+                ImmutableMap.of(),
+                ImmutableMap.of()
+        );
     }
 
-    private NettyWebTarget(ChannelProvider channelProvider,
-                      String host,
-                      ImmutableList<String> path,
-                      ImmutableMap<String, String> queryParams,
-                      ImmutableMap<String, Set<String>> queryParamsSet) {
+    private NettyWebTarget(
+            ObjectMapper objectMapper,
+            ChannelProvider channelProvider,
+            String host,
+            ImmutableList<String> path,
+            ImmutableMap<String, String> queryParams,
+            ImmutableMap<String, Set<String>> queryParamsSet
+    ) {
+        this.objectMapper = objectMapper;
         this.channelProvider = channelProvider;
         this.host = host;
         this.path = path;
@@ -69,7 +93,7 @@ public NettyWebTarget path(String... components) {
             newPath.addAll(Arrays.asList(StringUtils.split(component, PATH_SEPARATOR)));
         }
 
-        return new NettyWebTarget(channelProvider, host, newPath.build(), queryParams, queryParamsSet);
+        return new NettyWebTarget(objectMapper, channelProvider, host, newPath.build(), queryParams, queryParamsSet);
     }
 
     public NettyInvocationBuilder request() {
@@ -90,7 +114,7 @@ public NettyInvocationBuilder request() {
             resource = resource + "?" + StringUtils.join(params, "&");
         }
 
-        return new NettyInvocationBuilder(channelProvider, resource)
+        return new NettyInvocationBuilder(objectMapper, channelProvider, resource)
             .header("Host", host);
     }
 
@@ -112,7 +136,7 @@ public NettyWebTarget resolveTemplate(String name, Object value) {
             component = component.replaceAll("\\{" + name + "\\}", value.toString());
             newPath.add(component);
         }
-        return new NettyWebTarget(channelProvider, host, newPath.build(), queryParams, queryParamsSet);
+        return new NettyWebTarget(objectMapper, channelProvider, host, newPath.build(), queryParams, queryParamsSet);
     }
 
     public NettyWebTarget queryParam(String name, Object value) {
@@ -120,7 +144,7 @@ public NettyWebTarget queryParam(String name, Object value) {
         if (value != null) {
             builder.put(name, value.toString());
         }
-        return new NettyWebTarget(channelProvider, host, path, builder.build(), queryParamsSet);
+        return new NettyWebTarget(objectMapper, channelProvider, host, path, builder.build(), queryParamsSet);
     }
 
     public NettyWebTarget queryParamsSet(String name, Set<?> values) {
@@ -132,14 +156,14 @@ public NettyWebTarget queryParamsSet(String name, Set<?> values) {
             }
             builder.put(name, valueBuilder.build());
         }
-        return new NettyWebTarget(channelProvider, host, path, queryParams, builder.build());
+        return new NettyWebTarget(objectMapper, channelProvider, host, path, queryParams, builder.build());
     }
 
     public NettyWebTarget queryParamsJsonMap(String name, Map<String, String> values) {
         if (values != null && !values.isEmpty()) {
             try {
                 // when param value is JSON string
-                return queryParam(name, MAPPER.writeValueAsString(values));
+                return queryParam(name, objectMapper.writeValueAsString(values));
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
index f1e0ed042..963937061 100644
--- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
+++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
@@ -11,7 +11,10 @@
  * Handler that encodes an outgoing object to JSON.
  *
  * @author Marcus Linke
+ *
+ * @deprecated unused in docker-java
  */
+@Deprecated
 public class JsonRequestHandler extends MessageToByteEncoder<Object> {
 
     private ObjectMapper mapper = new ObjectMapper();
diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
index 2b188e378..b46d062f9 100644
--- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
+++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.netty.handler;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
@@ -16,16 +17,27 @@
  */
 public class JsonResponseCallbackHandler<T> extends SimpleChannelInboundHandler<ByteBuf> {
 
-    private static ObjectMapper objectMapper = new ObjectMapper();
+    private final ObjectMapper objectMapper;
 
     private TypeReference<T> typeReference;
 
     private ResultCallback<T> callback;
 
+    @Deprecated
     public JsonResponseCallbackHandler(TypeReference<T> typeReference, ResultCallback<T> callback) {
+        this(
+                new ObjectMapper()
+                        .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+                        .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS),
+                typeReference,
+                callback
+        );
+    }
+
+    public JsonResponseCallbackHandler(ObjectMapper objectMapper, TypeReference<T> typeReference, ResultCallback<T> callback) {
+        this.objectMapper = objectMapper;
         this.typeReference = typeReference;
         this.callback = callback;
-        objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
     }
 
     @Override
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
index d664e8c73..f19bb1663 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
@@ -16,11 +16,11 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.model.ContainerNetwork;
 import com.github.dockerjava.api.model.Isolation;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.core.RemoteApiVersion;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -69,8 +69,7 @@ public void roundTrip_full() throws IOException {
     @Test
     public void roundTrip_full_healthcheck() throws IOException {
 
-        final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().constructType(InspectContainerResponse.class);
+        final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectContainerResponse.class);
 
         final InspectContainerResponse response = testRoundTrip(RemoteApiVersion.VERSION_1_24,
                 "/containers/inspect/1.json",
@@ -140,8 +139,7 @@ public void roundTrip_empty() throws IOException {
     @Test
     public void inspect_windows_container() throws IOException {
 
-        final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().constructType(InspectContainerResponse.class);
+        final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectContainerResponse.class);
 
         final InspectContainerResponse response = testRoundTrip(RemoteApiVersion.VERSION_1_38,
                 "/containers/inspect/lcow.json",
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java
index 9c2641885..040f1c2d7 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java
@@ -1,8 +1,8 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.core.RemoteApiVersion;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
 import org.junit.Test;
 
 import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
@@ -20,8 +20,7 @@ public class InspectExecResponseTest {
 
     @Test
     public void test_1_22_SerDer1() throws Exception {
-        final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().constructType(InspectExecResponse.class);
+        final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectExecResponse.class);
 
         final InspectExecResponse execResponse = testRoundTrip(RemoteApiVersion.VERSION_1_22,
                 "/exec/ID/1.json",
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
index 2cfde68d7..d548fa329 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
@@ -1,8 +1,8 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.model.ContainerConfig;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -28,8 +28,7 @@
 public class InspectImageResponseTest {
     @Test
     public void serder1_22Json() throws IOException {
-        final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class);
+        final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectImageResponse.class);
 
         final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22,
                 "images/image1/inspect1.json",
@@ -138,8 +137,7 @@ public void serder1_22Json() throws IOException {
 
     @Test
     public void serder1_22_doc() throws IOException {
-        final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class);
+        final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectImageResponse.class);
 
         final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22,
                 "images/docImage/doc.json",
@@ -164,8 +162,7 @@ public void serder1_22_doc() throws IOException {
 
     @Test
     public void serder1_22_inspect_doc() throws IOException {
-        final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class);
+        final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectImageResponse.class);
 
         final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22,
                 "images/docImage/inspect_doc.json",
@@ -193,8 +190,7 @@ public void serder1_22_inspect_doc() throws IOException {
 
     @Test
     public void testOverlayNetworkRootDir() throws IOException {
-        final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class);
+        final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectImageResponse.class);
 
         final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_22, "images/overlay/inspectOverlay.json", type);
 
@@ -210,8 +206,7 @@ public void testOverlayNetworkRootDir() throws IOException {
 
     @Test
     public void inspectWindowsImage() throws IOException {
-        final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().constructType(InspectImageResponse.class);
+        final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectImageResponse.class);
 
         final InspectImageResponse inspectImage = testRoundTrip(VERSION_1_25,
                 "images/windowsImage/doc.json",
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
index d470ff1d7..f77ac56c9 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
@@ -1,8 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.core.RemoteApiVersion;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -24,8 +24,7 @@ public void defaultServerAddress() throws Exception {
 
     @Test
     public void serderDocs1() throws IOException {
-        final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().constructType(AuthConfig.class);
+        final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(AuthConfig.class);
 
         final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_22,
                 "/other/AuthConfig/docs1.json",
@@ -46,8 +45,7 @@ public void serderDocs1() throws IOException {
 
     @Test
     public void serderDocs2() throws IOException {
-        final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().constructType(AuthConfig.class);
+        final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(AuthConfig.class);
 
         final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_22,
                 "/other/AuthConfig/docs2.json",
@@ -65,8 +63,7 @@ public void serderDocs2() throws IOException {
 
     @Test
     public void compatibleWithIdentitytoken() throws IOException {
-        final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().constructType(AuthConfig.class);
+        final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(AuthConfig.class);
         final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_23,
                 "/other/AuthConfig/docs1.json",
                 type
@@ -82,8 +79,7 @@ public void compatibleWithIdentitytoken() throws IOException {
 
     @Test
     public void shouldNotFailWithStackOrchestratorInConfig() throws IOException {
-        final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().constructType(AuthConfig.class);
+        final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(AuthConfig.class);
         final AuthConfig authConfig = testRoundTrip(RemoteApiVersion.VERSION_1_25,
                 "/other/AuthConfig/orchestrators.json",
                 type
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
index 7e1afdf17..e76d2437c 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
@@ -1,28 +1,27 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
 public class CapabilityTest {
-    private final ObjectMapper objectMapper = new ObjectMapper();
 
     @Test
     public void serializeCapability() throws Exception {
-        String json = objectMapper.writeValueAsString(Capability.ALL);
+        String json = JSONTestHelper.getMapper().writeValueAsString(Capability.ALL);
         assertEquals(json, "\"ALL\"");
     }
 
     @Test
     public void deserializeCapability() throws Exception {
-        Capability capability = objectMapper.readValue("\"ALL\"", Capability.class);
+        Capability capability = JSONTestHelper.getMapper().readValue("\"ALL\"", Capability.class);
         assertEquals(capability, Capability.ALL);
     }
 
     @Test(expected = JsonMappingException.class)
     public void deserializeInvalidCapability() throws Exception {
-        objectMapper.readValue("\"nonsense\"", Capability.class);
+        JSONTestHelper.getMapper().readValue("\"nonsense\"", Capability.class);
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/ContainerTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/ContainerTest.java
index 97b19bd01..7b1e22f0d 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/ContainerTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/ContainerTest.java
@@ -1,8 +1,8 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.CollectionType;
 import com.github.dockerjava.core.RemoteApiVersion;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -20,8 +20,7 @@ public class ContainerTest {
 
     @Test
     public void serderJson1() throws IOException {
-        final ObjectMapper mapper = new ObjectMapper();
-        final CollectionType type = mapper.getTypeFactory().constructCollectionType(List.class, Container.class);
+        final CollectionType type = JSONTestHelper.getMapper().getTypeFactory().constructCollectionType(List.class, Container.class);
 
         final List<Container> containers = testRoundTrip(RemoteApiVersion.VERSION_1_22,
                 "containers/json/filter1.json",
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/EventsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/EventsTest.java
index 05b6a7a1d..0f0b2456d 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/EventsTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/EventsTest.java
@@ -1,8 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.core.RemoteApiVersion;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -23,8 +23,7 @@ public class EventsTest {
 
     @Test
     public void serderDocs1() throws IOException {
-        final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().constructType(Event.class);
+        final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(Event.class);
 
         final Event event = testRoundTrip(RemoteApiVersion.VERSION_1_24,
                 "/events/docs1.json",
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java
index 6e37636ec..10b401685 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java
@@ -1,9 +1,9 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.model.InfoRegistryConfig.IndexConfig;
 import com.github.dockerjava.core.RemoteApiVersion;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
 import org.hamcrest.CoreMatchers;
 import org.junit.Test;
 
@@ -35,8 +35,7 @@ public class InfoTest {
 
     @Test
     public void serder1Json() throws IOException {
-        final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().constructType(Info.class);
+        final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(Info.class);
 
         final Info info = testRoundTrip(VERSION_1_22,
                 "info/1.json",
@@ -175,8 +174,7 @@ public void serder1Json() throws IOException {
 
     @Test
     public void serder2Json() throws IOException {
-        final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().constructType(Info.class);
+        final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(Info.class);
 
         final Info info = testRoundTrip(VERSION_1_22,
                 "info/2.json",
@@ -332,8 +330,7 @@ public void serder2Json() throws IOException {
 
     @Test
     public void info_1_38() throws IOException {
-        final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().constructType(Info.class);
+        final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(Info.class);
 
         final Info info = testRoundTrip(RemoteApiVersion.VERSION_1_38,
                 "info/lcow.json",
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java
index 818f3dd91..ecbdd9a49 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java
@@ -1,7 +1,7 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.model.Ports.Binding;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
 import org.junit.Test;
 
 import java.util.Map;
@@ -10,7 +10,6 @@
 import static org.junit.Assert.assertNull;
 
 public class PortsSerializingTest {
-    private final ObjectMapper objectMapper = new ObjectMapper();
 
     private final String jsonWithDoubleBindingForOnePort = "{\"80/tcp\":[{\"HostIp\":\"10.0.0.1\",\"HostPort\":\"80\"},{\"HostIp\":\"10.0.0.2\",\"HostPort\":\"80\"}]}";
 
@@ -18,7 +17,7 @@ public class PortsSerializingTest {
 
     @Test
     public void deserializingPortWithMultipleBindings() throws Exception {
-        Ports ports = objectMapper.readValue(jsonWithDoubleBindingForOnePort, Ports.class);
+        Ports ports = JSONTestHelper.getMapper().readValue(jsonWithDoubleBindingForOnePort, Ports.class);
         Map<ExposedPort, Binding[]> map = ports.getBindings();
         assertEquals(map.size(), 1);
 
@@ -33,18 +32,18 @@ public void serializingPortWithMultipleBindings() throws Exception {
         Ports ports = new Ports();
         ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.1", "80"));
         ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.2", "80"));
-        assertEquals(objectMapper.writeValueAsString(ports), jsonWithDoubleBindingForOnePort);
+        assertEquals(JSONTestHelper.getMapper().writeValueAsString(ports), jsonWithDoubleBindingForOnePort);
     }
 
     @Test
     public void serializingEmptyBinding() throws Exception {
         Ports ports = new Ports(ExposedPort.tcp(80), new Binding(null, null));
-        assertEquals(objectMapper.writeValueAsString(ports), "{\"80/tcp\":[{\"HostIp\":\"\",\"HostPort\":\"\"}]}");
+        assertEquals(JSONTestHelper.getMapper().writeValueAsString(ports), "{\"80/tcp\":[{\"HostIp\":\"\",\"HostPort\":\"\"}]}");
     }
 
     @Test
     public void deserializingPortWithNullBindings() throws Exception {
-        Ports ports = objectMapper.readValue(jsonWithNullBindingForOnePort, Ports.class);
+        Ports ports = JSONTestHelper.getMapper().readValue(jsonWithNullBindingForOnePort, Ports.class);
         Map<ExposedPort, Binding[]> map = ports.getBindings();
         assertEquals(map.size(), 1);
 
@@ -55,6 +54,6 @@ public void deserializingPortWithNullBindings() throws Exception {
     public void serializingWithNullBindings() throws Exception {
         Ports ports = new Ports();
         ports.bind(ExposedPort.tcp(80), null);
-        assertEquals(objectMapper.writeValueAsString(ports), jsonWithNullBindingForOnePort);
+        assertEquals(JSONTestHelper.getMapper().writeValueAsString(ports), jsonWithNullBindingForOnePort);
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java
index 9ac888478..6e4524fd5 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -10,40 +10,39 @@
  * <code>docker run --restart xxx</code>.
  */
 public class RestartPolicySerializingTest {
-    private final ObjectMapper objectMapper = new ObjectMapper();
 
     @Test
     // --restart no
     public void noRestart() throws Exception {
-        String json = objectMapper.writeValueAsString(RestartPolicy.noRestart());
+        String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.noRestart());
         assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"\"}");
     }
 
     @Test
     // --restart always
     public void alwaysRestart() throws Exception {
-        String json = objectMapper.writeValueAsString(RestartPolicy.alwaysRestart());
+        String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.alwaysRestart());
         assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"always\"}");
     }
 
     @Test
     // --restart unless-stopped
     public void unlessStoppedRestart() throws Exception {
-        String json = objectMapper.writeValueAsString(RestartPolicy.unlessStoppedRestart());
+        String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.unlessStoppedRestart());
         assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"unless-stopped\"}");
     }
 
     @Test
     // --restart on-failure
     public void onFailureRestart() throws Exception {
-        String json = objectMapper.writeValueAsString(RestartPolicy.onFailureRestart(0));
+        String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.onFailureRestart(0));
         assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"on-failure\"}");
     }
 
     @Test
     // --restart on-failure:2
     public void onFailureRestartWithCount() throws Exception {
-        String json = objectMapper.writeValueAsString(RestartPolicy.onFailureRestart(2));
+        String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.onFailureRestart(2));
         assertEquals(json, "{\"MaximumRetryCount\":2,\"Name\":\"on-failure\"}");
     }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
index 261fe7d1b..9734c5e14 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/StatisticsTest.java
@@ -1,8 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.core.RemoteApiVersion;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 
@@ -22,8 +22,7 @@ public class StatisticsTest {
 
     @Test
     public void serderJson1() throws IOException {
-        final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().constructType(Statistics.class);
+        final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(Statistics.class);
 
         final Statistics statistics = testRoundTrip(RemoteApiVersion.VERSION_1_27,
                 "containers/container/stats/stats1.json",
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VersionTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VersionTest.java
index 1c3e55c5c..77fafac37 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/VersionTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VersionTest.java
@@ -1,8 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.core.RemoteApiVersion;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
 import org.junit.Test;
 
 import java.util.Collections;
@@ -23,8 +23,7 @@ public class VersionTest {
 
     @Test
     public void testSerDer1() throws Exception {
-        final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().constructType(Version.class);
+        final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(Version.class);
 
         final Version version = testRoundTrip(RemoteApiVersion.VERSION_1_22,
                 "/version/1.json",
@@ -45,8 +44,7 @@ public void testSerDer1() throws Exception {
 
     @Test
     public void version_1_38() throws Exception {
-        final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().constructType(Version.class);
+        final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(Version.class);
 
         final Version version = testRoundTrip(RemoteApiVersion.VERSION_1_38,
                 "/version/lcow.json",
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
index 067542c5c..0d509dbfa 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
@@ -1,7 +1,7 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -9,11 +9,11 @@
 import static org.junit.Assert.assertEquals;
 
 public class VolumeBindsTest {
+
     @Test
     public void t() throws IOException {
         String s = "{\"/data\":\"/some/path\"}";
-        ObjectMapper objectMapper = new ObjectMapper();
-        VolumeBinds volumeBinds = objectMapper.readValue(s, VolumeBinds.class);
+        VolumeBinds volumeBinds = JSONTestHelper.getMapper().readValue(s, VolumeBinds.class);
         VolumeBind[] binds = volumeBinds.getBinds();
         assertEquals(binds.length, 1);
         assertEquals(binds[0].getHostPath(), "/some/path");
@@ -23,8 +23,7 @@ public void t() throws IOException {
     @Test(expected = JsonMappingException.class)
     public void t1() throws IOException {
         String s = "{\"/data\": {} }";
-        ObjectMapper objectMapper = new ObjectMapper();
-        objectMapper.readValue(s, VolumeBinds.class);
+        JSONTestHelper.getMapper().readValue(s, VolumeBinds.class);
     }
 
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java
index 143ecaaca..ae343047c 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java
@@ -1,25 +1,24 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
 public class VolumeFromSerializingTest {
-    private final ObjectMapper objectMapper = new ObjectMapper();
 
     private final String json = "\"container1:ro\"";
 
     @Test
     public void deserializing() throws Exception {
-        VolumesFrom volumeFrom = objectMapper.readValue(json, VolumesFrom.class);
+        VolumesFrom volumeFrom = JSONTestHelper.getMapper().readValue(json, VolumesFrom.class);
         assertEquals(volumeFrom, new VolumesFrom("container1", AccessMode.ro));
     }
 
     @Test
     public void serializing() throws Exception {
         VolumesFrom volumeFrom = new VolumesFrom("container1", AccessMode.ro);
-        assertEquals(objectMapper.writeValueAsString(volumeFrom), json);
+        assertEquals(JSONTestHelper.getMapper().writeValueAsString(volumeFrom), json);
     }
 
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
index 5fde7bc03..3a00d2d53 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.cmd;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.command.StartContainerCmd;
@@ -17,6 +16,7 @@
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.core.command.WaitContainerResultCallback;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
 import net.jcip.annotations.NotThreadSafe;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -573,8 +573,7 @@ public void existingHostConfigIsPreservedByBlankStartCmd() throws DockerExceptio
 
     @Test
     public void anUnconfiguredCommandSerializesToEmptyJson() throws Exception {
-        ObjectMapper objectMapper = new ObjectMapper();
         StartContainerCmd command = dockerRule.getClient().startContainerCmd("");
-        assertThat(objectMapper.writeValueAsString(command), is("{}"));
+        assertThat(JSONTestHelper.getMapper().writeValueAsString(command), is("{}"));
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
index 66fbdfd95..aaa023db8 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
@@ -1,12 +1,12 @@
 package com.github.dockerjava.cmd;
 
 import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.core.command.UpdateContainerCmdImpl;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -82,8 +82,7 @@ public void updateContainer() throws DockerException, IOException {
     @Ignore("impossible to serder because model bundled in cmd")
     @Test
     public void serDerDocs1() throws IOException {
-        final ObjectMapper mapper = new ObjectMapper();
-        final JavaType type = mapper.getTypeFactory().constructType(UpdateContainerCmdImpl.class);
+        final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(UpdateContainerCmdImpl.class);
 
         final UpdateContainerCmdImpl upd = testRoundTrip(VERSION_1_22,
                 "/containers/container/update/docs.json",
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
index b7edb3001..e3b21ad8d 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
@@ -4,6 +4,7 @@
 package com.github.dockerjava.core;
 
 import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -156,7 +157,7 @@ public void nonExistent() throws IOException {
     }
 
     private DockerConfigFile runTest(String testFileName) throws IOException {
-        return DockerConfigFile.loadConfig(new File(FILESROOT, testFileName).getAbsolutePath());
+        return DockerConfigFile.loadConfig(JSONTestHelper.getMapper(), new File(FILESROOT, testFileName).getAbsolutePath());
     }
 
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java b/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
index 72fdb7867..f4d790e0e 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
@@ -5,6 +5,7 @@
 
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.model.PullResponseItem;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
@@ -29,7 +30,8 @@ public void processEmptyJson() throws Exception {
 
         InputStream response = new ByteArrayInputStream("{}".getBytes());
 
-        JsonStreamProcessor<PullResponseItem> jsonStreamProcessor = new JsonStreamProcessor<>(PullResponseItem.class);
+        JsonStreamProcessor<PullResponseItem> jsonStreamProcessor = new JsonStreamProcessor<>(
+                JSONTestHelper.getMapper(), PullResponseItem.class);
 
         final List<Boolean> completed = new ArrayList<>();
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java
index 432878f9c..adef3268f 100644
--- a/docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.netty;
 
 
+import com.github.dockerjava.test.serdes.JSONTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -22,7 +23,7 @@ public void setUp() throws Exception {
 
     @Test
     public void verifyImmutability() throws Exception {
-        NettyWebTarget emptyWebTarget = new NettyWebTarget(channelProvider, "DUMMY");
+        NettyWebTarget emptyWebTarget = new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY");
 
         NettyWebTarget initWebTarget = emptyWebTarget.path("/containers/{id}/attach").resolveTemplate("id", "d03da378b592")
                 .queryParam("logs", "true");
@@ -30,12 +31,12 @@ public void verifyImmutability() throws Exception {
         NettyWebTarget anotherWebTarget = emptyWebTarget.path("/containers/{id}/attach")
                 .resolveTemplate("id", "2cfada4e3c07").queryParam("stdin", "true");
 
-        assertEquals(new NettyWebTarget(channelProvider, "DUMMY"), emptyWebTarget);
+        assertEquals(new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY"), emptyWebTarget);
 
-        assertEquals(new NettyWebTarget(channelProvider, "DUMMY").path("/containers/d03da378b592/attach")
+        assertEquals(new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY").path("/containers/d03da378b592/attach")
                 .queryParam("logs", "true"), initWebTarget);
 
-        assertEquals(new NettyWebTarget(channelProvider, "DUMMY").path("/containers/2cfada4e3c07/attach")
+        assertEquals(new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY").path("/containers/2cfada4e3c07/attach")
                 .queryParam("stdin", "true"), anotherWebTarget);
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONSamples.java b/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONSamples.java
index ca706fa14..231d1426a 100644
--- a/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONSamples.java
+++ b/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONSamples.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.io.FileUtils;
 
@@ -35,8 +34,7 @@ public static String getSampleContent(RemoteApiVersion version, String context)
 
     public static <TClass> TClass testRoundTrip(RemoteApiVersion version, String context,
                                                 JavaType type) throws IOException {
-        ObjectMapper mapper = new ObjectMapper();
-        final TClass tObject = mapper.readValue(getSampleContent(version, context), type);
+        final TClass tObject = JSONTestHelper.getMapper().readValue(getSampleContent(version, context), type);
         return testRoundTrip(tObject, type);
     }
 
@@ -46,16 +44,14 @@ public static <TClass> TClass testRoundTrip(RemoteApiVersion version, String con
      */
     public static <TClass> TClass testRoundTrip(TClass item, JavaType type)
             throws IOException, AssertionError {
-        ObjectMapper mapper = new ObjectMapper();
+        String serialized1 = JSONTestHelper.getMapper().writeValueAsString(item);
+        JsonNode json1 = JSONTestHelper.getMapper().readTree(serialized1);
 
-        String serialized1 = mapper.writeValueAsString(item);
-        JsonNode json1 = mapper.readTree(serialized1);
+        TClass deserialized1 = JSONTestHelper.getMapper().readValue(serialized1, type);
+        String serialized2 = JSONTestHelper.getMapper().writeValueAsString(deserialized1);
 
-        TClass deserialized1 = mapper.readValue(serialized1, type);
-        String serialized2 = mapper.writeValueAsString(deserialized1);
-
-        JsonNode json2 = mapper.readTree(serialized2);
-        TClass deserialized2 = mapper.readValue(serialized2, type);
+        JsonNode json2 = JSONTestHelper.getMapper().readTree(serialized2);
+        TClass deserialized2 = JSONTestHelper.getMapper().readValue(serialized2, type);
 
         assertEquals("JSONs must be equal after the second roundtrip", json2, json1);
         assertEquals("Objects must be equal after the second roundtrip", deserialized2, deserialized2);
diff --git a/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java b/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
index d430b0387..24d7b1677 100644
--- a/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
+++ b/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
@@ -17,6 +17,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.core.DefaultDockerClientConfig;
 import org.apache.commons.io.IOUtils;
 
 import java.io.IOException;
@@ -32,6 +33,8 @@
  */
 public class JSONTestHelper {
 
+    static final ObjectMapper MAPPER = DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper();
+
     /**
      * Reads JSON String from the specified resource
      * 
@@ -64,9 +67,8 @@ public static String readString(JSONResourceRef resource) throws IOException {
      *             JSON conversion error
      */
     public static <TClass> TClass readObject(JSONResourceRef resource, Class<TClass> tclass) throws IOException {
-        ObjectMapper mapper = new ObjectMapper();
         String str = readString(resource);
-        return mapper.readValue(str, tclass);
+        return MAPPER.readValue(str, tclass);
     }
 
     /**
@@ -125,16 +127,18 @@ public static <TClass> TClass testRoundTrip(TClass item) throws IOException, Ass
      *             Validation error
      */
     public static <TClass> TClass testRoundTrip(TClass item, Class<TClass> asclass) throws IOException, AssertionError {
-        ObjectMapper mapper = new ObjectMapper();
-
-        String serialized1 = mapper.writeValueAsString(item);
-        JsonNode json1 = mapper.readTree(serialized1);
-        TClass deserialized1 = mapper.readValue(serialized1, asclass);
-        String serialized2 = mapper.writeValueAsString(deserialized1);
-        JsonNode json2 = mapper.readTree(serialized2);
-        TClass deserialized2 = mapper.readValue(serialized2, asclass);
+        String serialized1 = MAPPER.writeValueAsString(item);
+        JsonNode json1 = MAPPER.readTree(serialized1);
+        TClass deserialized1 = MAPPER.readValue(serialized1, asclass);
+        String serialized2 = MAPPER.writeValueAsString(deserialized1);
+        JsonNode json2 = MAPPER.readTree(serialized2);
+        TClass deserialized2 = MAPPER.readValue(serialized2, asclass);
 
         assertEquals("JSONs must be equal after the second roundtrip", json2, json1);
         return deserialized2;
     }
+
+    public static ObjectMapper getMapper() {
+        return MAPPER;
+    }
 }

From 066f268fa4f88687a9e7a41ca5eeaa85d63d8455 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Wed, 20 Nov 2019 21:39:45 +0100
Subject: [PATCH 0948/1272] Implicit jackson config (#1276)

* Replace static ObjectMappers with DockerClientConfig#getObjectMapper

* remove unused `ObjectMapper` field

* revert change

* simplify AbstrDockerCmdExec

* Remove unnecessary Jackson annotations

* Remove `anUnconfiguredCommandSerializesToEmptyJson` test case

* Try to disable the parallel test execution

* Add more logging, try just "hello"

* Revert the parallel change

* Back to sequential tests :(
---
 .../dockerjava/api/command/CreateContainerResponse.java  | 2 --
 .../dockerjava/api/command/CreateImageResponse.java      | 2 --
 .../dockerjava/api/command/CreateNetworkResponse.java    | 2 --
 .../dockerjava/api/command/CreateSecretResponse.java     | 2 --
 .../dockerjava/api/command/CreateServiceResponse.java    | 2 --
 .../dockerjava/api/command/CreateVolumeResponse.java     | 2 --
 .../dockerjava/api/command/ExecCreateCmdResponse.java    | 2 --
 .../com/github/dockerjava/api/command/GraphData.java     | 2 --
 .../com/github/dockerjava/api/command/GraphDriver.java   | 2 --
 .../com/github/dockerjava/api/command/HealthState.java   | 2 --
 .../github/dockerjava/api/command/HealthStateLog.java    | 2 --
 .../dockerjava/api/command/InspectContainerResponse.java | 5 -----
 .../dockerjava/api/command/InspectExecResponse.java      | 4 ----
 .../dockerjava/api/command/InspectImageResponse.java     | 2 --
 .../dockerjava/api/command/InspectVolumeResponse.java    | 2 --
 .../dockerjava/api/command/ListVolumesResponse.java      | 2 --
 .../java/com/github/dockerjava/api/command/RootFS.java   | 2 --
 .../dockerjava/api/command/TopContainerResponse.java     | 2 --
 .../java/com/github/dockerjava/api/model/AuthConfig.java | 3 ---
 .../com/github/dockerjava/api/model/AuthResponse.java    | 2 --
 .../com/github/dockerjava/api/model/BlkioStatEntry.java  | 4 ----
 .../github/dockerjava/api/model/BlkioStatsConfig.java    | 2 --
 .../github/dockerjava/api/model/BuildResponseItem.java   | 2 --
 .../java/com/github/dockerjava/api/model/ChangeLog.java  | 2 --
 .../com/github/dockerjava/api/model/ClusterInfo.java     | 4 ----
 .../java/com/github/dockerjava/api/model/Container.java  | 5 -----
 .../com/github/dockerjava/api/model/ContainerConfig.java | 5 -----
 .../github/dockerjava/api/model/ContainerDNSConfig.java  | 4 ----
 .../github/dockerjava/api/model/ContainerHostConfig.java | 2 --
 .../com/github/dockerjava/api/model/ContainerMount.java  | 2 --
 .../github/dockerjava/api/model/ContainerNetwork.java    | 2 --
 .../dockerjava/api/model/ContainerNetworkSettings.java   | 2 --
 .../com/github/dockerjava/api/model/ContainerPort.java   | 2 --
 .../com/github/dockerjava/api/model/ContainerSpec.java   | 4 ----
 .../github/dockerjava/api/model/ContainerSpecConfig.java | 4 ----
 .../github/dockerjava/api/model/ContainerSpecFile.java   | 4 ----
 .../api/model/ContainerSpecPrivilegesSELinuxContext.java | 4 ----
 .../github/dockerjava/api/model/ContainerSpecSecret.java | 4 ----
 .../com/github/dockerjava/api/model/CpuStatsConfig.java  | 2 --
 .../com/github/dockerjava/api/model/CpuUsageConfig.java  | 2 --
 .../java/com/github/dockerjava/api/model/Device.java     | 3 ---
 .../com/github/dockerjava/api/model/DriverStatus.java    | 5 -----
 .../com/github/dockerjava/api/model/EndpointSpec.java    | 4 ----
 .../com/github/dockerjava/api/model/ErrorDetail.java     | 3 ---
 .../com/github/dockerjava/api/model/ErrorResponse.java   | 3 ---
 .../main/java/com/github/dockerjava/api/model/Event.java | 5 -----
 .../java/com/github/dockerjava/api/model/ExternalCA.java | 4 ----
 .../com/github/dockerjava/api/model/HealthCheck.java     | 4 ----
 .../java/com/github/dockerjava/api/model/HostConfig.java | 5 -----
 .../main/java/com/github/dockerjava/api/model/Image.java | 5 -----
 .../main/java/com/github/dockerjava/api/model/Info.java  | 5 -----
 .../github/dockerjava/api/model/InfoRegistryConfig.java  | 3 ---
 .../java/com/github/dockerjava/api/model/LxcConf.java    | 3 ---
 .../github/dockerjava/api/model/MemoryStatsConfig.java   | 2 --
 .../github/dockerjava/api/model/NamedResourceSpec.java   | 5 -----
 .../java/com/github/dockerjava/api/model/Network.java    | 7 -------
 .../dockerjava/api/model/NetworkAttachmentConfig.java    | 4 ----
 .../com/github/dockerjava/api/model/NetworkSettings.java | 2 --
 .../main/java/com/github/dockerjava/api/model/Node.java  | 3 ---
 .../com/github/dockerjava/api/model/ObjectVersion.java   | 4 ----
 .../java/com/github/dockerjava/api/model/PeerNode.java   | 4 ----
 .../com/github/dockerjava/api/model/PruneResponse.java   | 2 --
 .../github/dockerjava/api/model/PullResponseItem.java    | 2 --
 .../github/dockerjava/api/model/PushResponseItem.java    | 3 ---
 .../dockerjava/api/model/ResourceRequirements.java       | 4 ----
 .../com/github/dockerjava/api/model/ResourceSpecs.java   | 4 ----
 .../com/github/dockerjava/api/model/ResourceVersion.java | 4 ----
 .../com/github/dockerjava/api/model/ResponseItem.java    | 5 -----
 .../java/com/github/dockerjava/api/model/SearchItem.java | 2 --
 .../java/com/github/dockerjava/api/model/Secret.java     | 4 ----
 .../java/com/github/dockerjava/api/model/SecretSpec.java | 4 ----
 .../java/com/github/dockerjava/api/model/Service.java    | 5 -----
 .../dockerjava/api/model/ServiceGlobalModeOptions.java   | 2 --
 .../github/dockerjava/api/model/ServiceModeConfig.java   | 2 --
 .../github/dockerjava/api/model/ServicePlacement.java    | 4 ----
 .../com/github/dockerjava/api/model/ServiceSpec.java     | 4 ----
 .../dockerjava/api/model/StatisticNetworksConfig.java    | 2 --
 .../java/com/github/dockerjava/api/model/Statistics.java | 5 -----
 .../com/github/dockerjava/api/model/SwarmCAConfig.java   | 4 ----
 .../dockerjava/api/model/SwarmDispatcherConfig.java      | 4 ----
 .../java/com/github/dockerjava/api/model/SwarmInfo.java  | 4 ----
 .../com/github/dockerjava/api/model/SwarmJoinTokens.java | 4 ----
 .../java/com/github/dockerjava/api/model/SwarmNode.java  | 4 ----
 .../dockerjava/api/model/SwarmNodeDescription.java       | 4 ----
 .../dockerjava/api/model/SwarmNodeEngineDescription.java | 4 ----
 .../dockerjava/api/model/SwarmNodeManagerStatus.java     | 4 ----
 .../dockerjava/api/model/SwarmNodePluginDescription.java | 4 ----
 .../github/dockerjava/api/model/SwarmNodeResources.java  | 4 ----
 .../com/github/dockerjava/api/model/SwarmNodeSpec.java   | 4 ----
 .../com/github/dockerjava/api/model/SwarmNodeStatus.java | 4 ----
 .../github/dockerjava/api/model/SwarmNodeVersion.java    | 4 ----
 .../github/dockerjava/api/model/SwarmOrchestration.java  | 4 ----
 .../com/github/dockerjava/api/model/SwarmRaftConfig.java | 4 ----
 .../java/com/github/dockerjava/api/model/SwarmSpec.java  | 4 ----
 .../com/github/dockerjava/api/model/SwarmVersion.java    | 4 ----
 .../main/java/com/github/dockerjava/api/model/Task.java  | 4 ----
 .../com/github/dockerjava/api/model/TaskDefaults.java    | 4 ----
 .../java/com/github/dockerjava/api/model/TaskSpec.java   | 4 ----
 .../java/com/github/dockerjava/api/model/TaskStatus.java | 4 ----
 .../dockerjava/api/model/TaskStatusContainerStatus.java  | 4 ----
 .../dockerjava/api/model/ThrottlingDataConfig.java       | 2 --
 .../com/github/dockerjava/api/model/TmpfsOptions.java    | 4 ----
 .../dockerjava/api/model/UpdateContainerResponse.java    | 2 --
 .../java/com/github/dockerjava/api/model/Version.java    | 2 --
 .../github/dockerjava/api/model/VersionComponent.java    | 2 --
 .../com/github/dockerjava/api/model/VersionPlatform.java | 2 --
 .../com/github/dockerjava/api/model/WaitResponse.java    | 2 --
 .../dockerjava/core/command/CreateContainerCmdImpl.java  | 3 ---
 .../dockerjava/core/command/ExecCreateCmdImpl.java       | 3 ---
 .../github/dockerjava/core/command/ExecStartCmdImpl.java | 3 ---
 .../github/dockerjava/core/command/JoinSwarmCmdImpl.java | 2 --
 .../dockerjava/core/command/StartContainerCmdImpl.java   | 3 ---
 .../dockerjava/core/command/UpdateContainerCmdImpl.java  | 5 +++--
 docker-java/pom.xml                                      | 6 +-----
 .../com/github/dockerjava/cmd/AttachContainerCmdIT.java  | 9 ++++++++-
 .../com/github/dockerjava/cmd/StartContainerCmdIT.java   | 8 --------
 116 files changed, 12 insertions(+), 383 deletions(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
index 091661af7..b19f8c6ae 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.command;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -10,7 +9,6 @@
  * @author Konstantin Pelykh (kpelykh@gmail.com)
  *
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class CreateContainerResponse {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
index 3cf373860..09b1929c0 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.command;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -11,7 +10,6 @@
  * @author Ryan Campbell (ryan.campbell@gmail.com)
  *
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class CreateImageResponse {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
index c43cdca53..a816f3f3a 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
@@ -1,11 +1,9 @@
 package com.github.dockerjava.api.command;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class CreateNetworkResponse {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
index b71adc9c0..c9da4c3ba 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.command;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -8,7 +7,6 @@
 /**
  * The response of a {@link CreateSecretCmd}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class CreateSecretResponse {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
index c570000e3..1cbd421b9 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.command;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -8,7 +7,6 @@
 /**
  * The response of a {@link CreateServiceCmd}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class CreateServiceResponse {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
index 7b9d9eed1..a6dffb94d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.command;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -9,7 +8,6 @@
  *
  * @author Marcus Linke
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class CreateVolumeResponse {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
index c7065217c..e751896de 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
@@ -1,11 +1,9 @@
 package com.github.dockerjava.api.command;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class ExecCreateCmdResponse {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java
index f64d4df0e..7852e8d59 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.command;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -11,7 +10,6 @@
  * part of {@link GraphDriver}
  * @author Kanstantsin Shautsou
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class GraphData {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
index f9eebe8ea..5ba4d456e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.command;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,7 +12,6 @@
  * @author Kanstantsin Shautsou
  * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class GraphDriver {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java
index 6f5418713..cd7290785 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java
@@ -1,10 +1,8 @@
 package com.github.dockerjava.api.command;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
 
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class HealthState {
 
     @JsonProperty("Status")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
index 9edee6127..d68dcb74f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
@@ -1,9 +1,7 @@
 package com.github.dockerjava.api.command;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class HealthStateLog {
 
     @JsonProperty("Start")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index 98d3a53cb..06e18fa21 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.model.ContainerConfig;
 import com.github.dockerjava.api.model.HostConfig;
@@ -23,7 +22,6 @@
  * @author Konstantin Pelykh (kpelykh@gmail.com)
  *
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class InspectContainerResponse {
@@ -251,7 +249,6 @@ public String getPlatform() {
         return platform;
     }
 
-    @JsonIgnoreProperties(ignoreUnknown = true)
     @EqualsAndHashCode
     @ToString
     public class ContainerState {
@@ -457,7 +454,6 @@ public HealthState getHealth() {
         }
     }
 
-    @JsonIgnoreProperties(ignoreUnknown = true)
     @EqualsAndHashCode
     @ToString
     public static class Mount {
@@ -583,7 +579,6 @@ public Mount withSource(String source) {
         }
     }
 
-    @JsonIgnoreProperties(ignoreUnknown = true)
     @EqualsAndHashCode
     @ToString
     public class Node {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
index e479562e3..06d904dc8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.model.NetworkSettings;
 import lombok.EqualsAndHashCode;
@@ -10,7 +9,6 @@
 
 import javax.annotation.CheckForNull;
 
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class InspectExecResponse {
@@ -152,7 +150,6 @@ public Long getPidLong() {
         return pid;
     }
 
-    @JsonIgnoreProperties(ignoreUnknown = true)
     @EqualsAndHashCode
     @ToString
     public class ProcessConfig {
@@ -193,7 +190,6 @@ public String getUser() {
         }
     }
 
-    @JsonIgnoreProperties(ignoreUnknown = true)
     public class Container {
 
         @JsonProperty("NetworkSettings")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
index 6d2ef6b87..b8590bfc6 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.command;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.model.ContainerConfig;
 import lombok.EqualsAndHashCode;
@@ -14,7 +13,6 @@
  * @author Konstantin Pelykh (kpelykh@gmail.com)
  *
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class InspectImageResponse {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
index d42a1682a..020e0f9ae 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.command;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -9,7 +8,6 @@
  *
  * @author Marcus Linke
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class InspectVolumeResponse {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
index 207e65ca6..4e1b449f8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -11,7 +10,6 @@
  *
  * @author Marcus Linke
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class ListVolumesResponse {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java
index 9d6834c8e..e4cc0ec54 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.command;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,7 +12,6 @@
  *
  * @author Dmitry Tretyakov
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class RootFS {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
index f3d4f8d1a..6f7b1d49f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.command;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -10,7 +9,6 @@
  * @author Marcus Linke
  *
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class TopContainerResponse {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
index 41f31b42e..1b6a01ea1 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -9,7 +7,6 @@
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
 
-@JsonInclude(Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class AuthConfig implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
index 821d4c4ac..89069fe54 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
@@ -1,13 +1,11 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import java.io.Serializable;
 
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class AuthResponse implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java
index f4def9089..d47b2fe42 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -12,8 +10,6 @@
  * BlkioStat is not documented in pubic docker swapper.yaml yet, reference:
  * https://github.com/moby/moby/blob/master/api/types/stats.go
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class BlkioStatEntry implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
index 4822c5e82..55479d024 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -14,7 +13,6 @@
  *
  * @author Yuting Liu
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class BlkioStatsConfig implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
index 7236be23d..b781bac9f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
@@ -1,12 +1,10 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 /**
  * Represents a build response stream item
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class BuildResponseItem extends ResponseItem {
     private static final long serialVersionUID = -1252904184236343612L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
index e69eb585c..922e2e2b3 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -12,7 +11,6 @@
  * @author Konstantin Pelykh (kpelykh@gmail.com)
  *
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class ChangeLog implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
index c2e4fd9a5..40055106b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -16,8 +14,6 @@
  *
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class ClusterInfo implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java
index d5da8eb11..e2723a96b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java
@@ -1,8 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import lombok.EqualsAndHashCode;
@@ -18,8 +15,6 @@
  *
  * @author Konstantin Pelykh (kpelykh@gmail.com)
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class Container implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
index dcb3cc99d..a84835277 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
@@ -1,9 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -17,8 +14,6 @@
  *
  * @author Konstantin Pelykh (kpelykh@gmail.com)
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class ContainerConfig implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
index bd84d26ce..c60414f81 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -14,8 +12,6 @@
  *
  * @since {@link RemoteApiVersion#VERSION_1_25}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class ContainerDNSConfig implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
index e671f8a6d..590d22a92 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,7 +12,6 @@
  * @see Container
  * @author Kanstantsin Shautsou
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class ContainerHostConfig implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
index 59c2bccfc..48b4c9f47 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -12,7 +11,6 @@
  * @author Yuting Liu
  * @see Container
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class ContainerMount implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
index cb3671fe0..52acf4c77 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -19,7 +18,6 @@
  * @see ContainerNetworkSettings
  * @author Kanstantsin Shautsou
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class ContainerNetwork implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
index be05bde22..19e249e29 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -14,7 +13,6 @@
  * @see Container
  * @since {@link RemoteApiVersion#VERSION_1_22}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class ContainerNetworkSettings implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
index 2fedf33d9..b22aecc0e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -12,7 +11,6 @@
  * @author Kanstantsin Shautsou
  * @see Container
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class ContainerPort implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
index fa0c6cca5..f56399ce8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -16,8 +14,6 @@
  *
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class ContainerSpec implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
index 49c708fde..274ad8f55 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,8 +11,6 @@
  *
  * @since {@link RemoteApiVersion#VERSION_1_29}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class ContainerSpecConfig implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
index 8b69c4a72..cf8471d7c 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,8 +11,6 @@
  *
  * @since {@link RemoteApiVersion#VERSION_1_26}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class ContainerSpecFile implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
index c2f4d0a62..c7fa68af8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,8 +11,6 @@
  *
  * @since {@link RemoteApiVersion#VERSION_1_29}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class ContainerSpecPrivilegesSELinuxContext implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
index 7e1b8e7e6..e92b2b07f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,8 +11,6 @@
  *
  * @since {@link RemoteApiVersion#VERSION_1_26}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class ContainerSpecSecret implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
index 1444d5472..fce6e610d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.annotation.CheckForNull;
@@ -11,7 +10,6 @@
  *
  * @author Yuting Liu
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class CpuStatsConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
index e85fc637e..e9e4d2212 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.annotation.CheckForNull;
@@ -12,7 +11,6 @@
  *
  * @author Yuting Liu
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class CpuUsageConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java
index 754a53df5..09223e52a 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java
@@ -2,8 +2,6 @@
 
 import static java.util.Objects.requireNonNull;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -14,7 +12,6 @@
 import java.util.Map;
 import java.util.StringTokenizer;
 
-@JsonInclude(Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class Device implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
index 44cdd8ee8..cca52f1d0 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
@@ -1,8 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -12,8 +9,6 @@
 /**
  * @author ben
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class DriverStatus implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
index 73a002b55..75b5056f0 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,8 +11,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class EndpointSpec implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
index 92e869d2a..10c3310d1 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
@@ -1,12 +1,9 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.io.Serializable;
 
-@JsonInclude(Include.NON_NULL)
 public class ErrorDetail implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
index f6abfc3eb..ef4f93eb1 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
@@ -1,12 +1,9 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.io.Serializable;
 
-@JsonInclude(Include.NON_NULL)
 public class ErrorResponse implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java
index 589e3e3ba..59ecc67bd 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java
@@ -1,8 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -14,8 +11,6 @@
 /**
  * Representation of a Docker event.
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class Event implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
index 575498d9e..95a80eb03 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,8 +11,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class ExternalCA implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
index 0d3181e5f..e21a0763f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
@@ -15,8 +15,6 @@
  */
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -28,8 +26,6 @@
  *
  * @author cdancy
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class HealthCheck implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index f43dde1da..bcae9a4cc 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -1,9 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -20,8 +17,6 @@
  * Used in `/containers/create`, and in inspect container.
  * TODO exclude usage for 2 different models.
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class HostConfig implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java
index e04369aac..e6552eb35 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java
@@ -1,8 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -14,8 +11,6 @@
  * @author Konstantin Pelykh (kpelykh@gmail.com)
  *
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class Image implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
index 1226180a6..e472fa622 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
@@ -1,8 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -17,8 +14,6 @@
  *
  * @author Konstantin Pelykh (kpelykh@gmail.com)
  */
-@JsonInclude(Include.NON_NULL)
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class Info implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
index a94716c4d..8c4d9f35d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,7 +12,6 @@
 /**
  * @since ~{@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public final class InfoRegistryConfig implements Serializable {
@@ -82,7 +80,6 @@ public InfoRegistryConfig withMirrors(Object mirrors) {
     /**
      * @since ~{@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20}
      */
-    @JsonIgnoreProperties(ignoreUnknown = true)
     @EqualsAndHashCode
     @ToString
     public static final class IndexConfig {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java
index 0a60086fb..ddf1bbae0 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java
@@ -1,12 +1,9 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.io.Serializable;
 
-@JsonInclude(Include.NON_NULL)
 public class LxcConf implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
index 4320a89ed..12e6abccf 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.annotation.CheckForNull;
@@ -11,7 +10,6 @@
  *
  * @author Yuting Liu
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class MemoryStatsConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
index a6d016fe2..e06f69d01 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
@@ -1,15 +1,10 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
 import java.io.Serializable;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 public class NamedResourceSpec extends GenericResource<Integer> implements Serializable {
     private static final long serialVersionUID = 1L;
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
index 0945137d7..0187d73f4 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -12,8 +10,6 @@
 import java.util.List;
 import java.util.Map;
 
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class Network implements Serializable {
@@ -96,7 +92,6 @@ public Map<String, String> getLabels() {
         return labels;
     }
 
-    @JsonIgnoreProperties(ignoreUnknown = true)
     @EqualsAndHashCode
     @ToString
     public static class ContainerNetworkConfig {
@@ -130,7 +125,6 @@ public String getIpv6Address() {
         }
     }
 
-    @JsonIgnoreProperties(ignoreUnknown = true)
     @EqualsAndHashCode
     @ToString
     public static class Ipam {
@@ -171,7 +165,6 @@ public Ipam withDriver(String driver) {
             return this;
         }
 
-        @JsonIgnoreProperties(ignoreUnknown = true)
         public static class Config {
 
             @JsonProperty("Subnet")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
index 413803a9e..2afa87b73 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,8 +11,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class NetworkAttachmentConfig implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
index 816604552..3ef92ac64 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
@@ -3,7 +3,6 @@
  */
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -16,7 +15,6 @@
  * @author Marcus Linke
  *
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class NetworkSettings implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java
index 9c901c072..2b12ab48f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -11,7 +9,6 @@
 /**
  * A node as returned by the /events API, for instance, when Swarm is used.
  */
-@JsonInclude(Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class Node implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
index 1e3f78a08..0b0259049 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.io.Serializable;
@@ -15,8 +13,6 @@
  * same base version, only one of the requests can succeed. As a result, two separate update requests that
  * happen at the same time will not unintentionally overwrite each other.
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 public class ObjectVersion implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java
index ba9d49594..e20af63b9 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -12,8 +10,6 @@
 /**
  * @since 1.24
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class PeerNode implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java
index 0bf3ebde8..3efaf47c1 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -10,7 +9,6 @@
 /**
  * Delete unused content (containers, images, volumes, networks, build relicts)
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class PruneResponse implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
index 3c9d99b2e..66a559934 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
@@ -1,12 +1,10 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 /**
  * Represents a pull response stream item
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class PullResponseItem extends ResponseItem {
 
     private static final long serialVersionUID = -2575482839766823293L;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
index 829fbbbad..0b28a46fb 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
@@ -1,11 +1,8 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
 /**
  * Represents a push response stream item
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class PushResponseItem extends ResponseItem {
 
     private static final long serialVersionUID = 8256977108011295857L;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
index f72e861d6..463b22011 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -12,8 +10,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class ResourceRequirements implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
index 9af891b59..86ab24b52 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -12,8 +10,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class ResourceSpecs implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
index 14269bbe2..4838b78d7 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -12,8 +10,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class ResourceVersion implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
index 2d932942a..d0f797a71 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -12,7 +11,6 @@
 /**
  * Represents a pull response stream item
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class ResponseItem implements Serializable {
@@ -118,7 +116,6 @@ public boolean isErrorIndicated() {
         return getError() != null || getErrorDetail() != null;
     }
 
-    @JsonIgnoreProperties(ignoreUnknown = true)
     @EqualsAndHashCode
     @ToString
     public static class ProgressDetail implements Serializable {
@@ -149,7 +146,6 @@ public Long getStart() {
         }
     }
 
-    @JsonIgnoreProperties(ignoreUnknown = true)
     @EqualsAndHashCode
     @ToString
     public static class ErrorDetail implements Serializable {
@@ -172,7 +168,6 @@ public String getMessage() {
         }
     }
 
-    @JsonIgnoreProperties(ignoreUnknown = true)
     @EqualsAndHashCode
     @ToString
     public static class AuxDetail implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java
index eb5c04b0e..a77f38053 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -12,7 +11,6 @@
  * @author Konstantin Pelykh (kpelykh@gmail.com)
  *
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class SearchItem implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java
index fba85c13e..20680f5fb 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.io.Serializable;
@@ -12,8 +10,6 @@
  *
  * @since {@link RemoteApiVersion#VERSION_1_25}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 public class Secret implements Serializable {
     public static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
index a24e89aa2..572c0c90e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -14,8 +12,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_25}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class SecretSpec implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java
index 4a809946d..63b3b4757 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java
@@ -1,8 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -16,8 +13,6 @@
  *
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class Service implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
index f5e8455fa..ccd9b4bea 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -9,7 +8,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 @SuppressWarnings("checkstyle:hideutilityclassconstructor")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
index 641ff22db..c179271bf 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -11,7 +10,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class ServiceModeConfig implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
index 6a6c0d212..9c2f0223a 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,8 +11,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class ServicePlacement implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
index 84d4c23ee..b5ca4a5dd 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -14,8 +12,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class ServiceSpec implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
index 4d2ff8d67..d22b6a787 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,7 +12,6 @@
  *
  * @author Yuting Liu
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class StatisticNetworksConfig implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java
index 4abda09d1..2bbc91777 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java
@@ -5,9 +5,6 @@
 
 import javax.annotation.CheckForNull;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -15,8 +12,6 @@
 /**
  * Representation of a Docker statistics.
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class Statistics implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
index 0c853e57a..6f632aa1b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,8 +11,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class SwarmCAConfig implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
index c7d6d9f84..bc8fd4305 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
@@ -1,8 +1,6 @@
 package com.github.dockerjava.api.model;
 
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,8 +11,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class SwarmDispatcherConfig implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
index e7bd8fdd9..3fd8e8704 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,8 +11,6 @@
 /**
  * @since 1.24
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class SwarmInfo implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
index ddda93d53..06b1f3a78 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -12,8 +10,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class SwarmJoinTokens implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
index ee556bd9a..cdb17c20d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -16,8 +14,6 @@
  *
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class SwarmNode implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
index 1044dd1f5..d0c35c873 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -12,8 +10,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class SwarmNodeDescription implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
index 5eff03272..41c369d09 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
@@ -1,8 +1,6 @@
 package com.github.dockerjava.api.model;
 
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -14,8 +12,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class SwarmNodeEngineDescription implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
index 384c45a0f..07a0e448b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
@@ -1,8 +1,6 @@
 package com.github.dockerjava.api.model;
 
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,8 +11,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class SwarmNodeManagerStatus implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
index 9e71e6188..d05bfb9c9 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
@@ -1,8 +1,6 @@
 package com.github.dockerjava.api.model;
 
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,8 +11,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class SwarmNodePluginDescription implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
index 298360ce7..05f6d0203 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
@@ -1,8 +1,6 @@
 package com.github.dockerjava.api.model;
 
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,8 +11,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class SwarmNodeResources implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
index b02366972..5162bdff7 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
@@ -1,8 +1,6 @@
 package com.github.dockerjava.api.model;
 
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -14,8 +12,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class SwarmNodeSpec implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
index 7260f3da9..ba99a194a 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,8 +11,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class SwarmNodeStatus implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
index ad2211aa5..35cbba491 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
@@ -1,8 +1,6 @@
 package com.github.dockerjava.api.model;
 
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -14,8 +12,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class SwarmNodeVersion implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
index e68018c3b..60cc1f32d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -12,8 +10,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class SwarmOrchestration implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
index 17c2bcc95..16553defc 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -12,8 +10,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class SwarmRaftConfig implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
index 656f826b3..bbc8f6db6 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
@@ -1,8 +1,6 @@
 package com.github.dockerjava.api.model;
 
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,8 +11,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class SwarmSpec implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
index 9a2f6c317..2d7fc3e43 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -12,8 +10,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class SwarmVersion implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java
index dd8f3ac62..46585eed8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,8 +11,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class Task implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
index 710b9b344..c385bd1b9 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
@@ -1,8 +1,6 @@
 package com.github.dockerjava.api.model;
 
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,8 +11,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class TaskDefaults implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
index c81192164..bef5e579d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,8 +11,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class TaskSpec implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
index bdfdf35ea..a335350e4 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -11,8 +9,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class TaskStatus implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
index 84c760c43..0349e301f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -11,8 +9,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class TaskStatusContainerStatus implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
index 5d38941c7..ce29b7057 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.annotation.CheckForNull;
@@ -11,7 +10,6 @@
  *
  * @author Yuting Liu
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class ThrottlingDataConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
index d5c4443ac..b2dc02a30 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -11,8 +9,6 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_29}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
 @EqualsAndHashCode
 @ToString
 public class TmpfsOptions implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java
index 37587de91..5b7b849b5 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.annotation.CheckForNull;
@@ -13,7 +12,6 @@
  * https://docs.docker.com/engine/reference/api/docker_remote_api_v1.22/</a>
  * @since {@link RemoteApiVersion#VERSION_1_22}
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class UpdateContainerResponse extends ResponseItem {
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java
index aed730c72..2ac89e88b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.command.VersionCmd;
 import lombok.EqualsAndHashCode;
@@ -16,7 +15,6 @@
  * @author Konstantin Pelykh (kpelykh@gmail.com)
  * @see VersionCmd
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class Version implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
index 52579785a..bee6774ba 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -15,7 +14,6 @@
  * @since {@link RemoteApiVersion#VERSION_1_35}
  * @author Dmitry Tretyakov
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class VersionComponent implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
index f86e3cb33..96b389ef6 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -14,7 +13,6 @@
  * @since {@link RemoteApiVersion#VERSION_1_35}
  * @author Dmitry Tretyakov
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 @EqualsAndHashCode
 @ToString
 public class VersionPlatform implements Serializable {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
index 0cab338b2..d80343057 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.io.Serializable;
@@ -8,7 +7,6 @@
 /**
  * Represents a wait container command response
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class WaitResponse implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 74347e900..1360598de 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -1,8 +1,6 @@
 package com.github.dockerjava.core.command;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
@@ -43,7 +41,6 @@
  * Creates a new container.
  * `/containers/create`
  */
-@JsonInclude(Include.NON_NULL)
 public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, CreateContainerResponse> implements
         CreateContainerCmd {
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
index ecf208b7e..dc410f78b 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
@@ -4,14 +4,11 @@
 
 import java.util.List;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.command.ExecCreateCmd;
 import com.github.dockerjava.api.command.ExecCreateCmdResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
 
-@JsonInclude(Include.NON_NULL)
 public class ExecCreateCmdImpl extends AbstrDockerCmd<ExecCreateCmd, ExecCreateCmdResponse> implements ExecCreateCmd {
 
     private String containerId;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
index 01532090a..9ab3bfb8e 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
@@ -5,15 +5,12 @@
 import java.io.InputStream;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.ExecStartCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Frame;
 
-@JsonInclude(Include.NON_NULL)
 public class ExecStartCmdImpl extends AbstrAsyncDockerCmd<ExecStartCmd, Frame> implements ExecStartCmd {
 
     @JsonIgnore
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java
index 08e3a7cdc..72a1cdb82 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.core.command;
 
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.command.JoinSwarmCmd;
 import org.apache.commons.lang.builder.EqualsBuilder;
@@ -11,7 +10,6 @@
 import javax.annotation.CheckForNull;
 import java.util.List;
 
-@JsonInclude(JsonInclude.Include.NON_NULL)
 public class JoinSwarmCmdImpl extends AbstrDockerCmd<JoinSwarmCmd, Void> implements
         JoinSwarmCmd {
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
index 6f127da23..c159c920e 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
@@ -1,10 +1,8 @@
 package com.github.dockerjava.core.command;
 
-import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_EMPTY;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.github.dockerjava.api.command.StartContainerCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.exception.NotModifiedException;
@@ -12,7 +10,6 @@
 /**
  * Start a container
  */
-@JsonInclude(NON_EMPTY)
 public class StartContainerCmdImpl extends AbstrDockerCmd<StartContainerCmd, Void> implements StartContainerCmd {
 
     @JsonIgnore
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
index 2ca771767..aad2b19e3 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.command.UpdateContainerCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
@@ -22,7 +22,7 @@
 public class UpdateContainerCmdImpl extends AbstrDockerCmd<UpdateContainerCmd, UpdateContainerResponse>
         implements UpdateContainerCmd {
 
-    @JsonIgnoreProperties
+    @JsonIgnore
     private String containerId;
 
     @JsonProperty("BlkioWeight")
@@ -80,6 +80,7 @@ public UpdateContainerCmd withBlkioWeight(Integer blkioWeight) {
      * @see #containerId
      */
     @CheckForNull
+    @JsonIgnore
     public String getContainerId() {
         return containerId;
     }
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 2092e575d..13b44f68b 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -127,11 +127,7 @@
 					</execution>
 				</executions>
 				<configuration>
-					<rerunFailingTestsCount>3</rerunFailingTestsCount>
-					<!--<useUnlimitedThreads>true</useUnlimitedThreads>-->
-					<perCoreThreadCount>true</perCoreThreadCount>
-					<threadCount>1</threadCount>
-					<parallel>classes</parallel>
+					<rerunFailingTestsCount>5</rerunFailingTestsCount>
 					<groups>com.github.dockerjava.junit.category.Integration</groups>
 					<excludedGroups>com.github.dockerjava.junit.category.AuthIntegration,com.github.dockerjava.junit.category.SwarmModeIntegration</excludedGroups>
 				</configuration>
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
index caaadde16..ba0128b78 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
@@ -218,7 +218,7 @@ public void attachContainerClosesStdoutWhenContainerExits() throws Exception {
         DockerClient dockerClient = dockerRule.getClient();
 
         CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE)
-                .withCmd("echo", "hello world")
+                .withCmd("echo", "hello")
                 .withTty(false)
                 .exec();
         LOG.info("Created container: {}", container.toString());
@@ -238,6 +238,7 @@ public void onStart(Closeable stream) {
 
             @Override
             public void onNext(Frame item) {
+                LOG.info("Got frame: {}", item);
                 if (item.getStreamType() == StreamType.STDOUT) {
                     gotLineAtNanos.set(System.nanoTime());
                     gotLine.countDown();
@@ -245,6 +246,12 @@ public void onNext(Frame item) {
                 super.onNext(item);
             }
 
+            @Override
+            public void onError(Throwable throwable) {
+                LOG.info("Got error: ", throwable);
+                super.onError(throwable);
+            }
+
             @Override
             public void onComplete() {
                 completed.countDown();
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
index 3a00d2d53..b0c6508a6 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
@@ -2,7 +2,6 @@
 
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.command.StartContainerCmd;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.InternalServerErrorException;
 import com.github.dockerjava.api.exception.NotFoundException;
@@ -16,7 +15,6 @@
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.core.command.WaitContainerResultCallback;
-import com.github.dockerjava.test.serdes.JSONTestHelper;
 import net.jcip.annotations.NotThreadSafe;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -570,10 +568,4 @@ public void existingHostConfigIsPreservedByBlankStartCmd() throws DockerExceptio
         assertThat(inspectContainerResponse.getHostConfig().getDns(), is(notNullValue()));
         assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getDns()), contains(dnsServer));
     }
-
-    @Test
-    public void anUnconfiguredCommandSerializesToEmptyJson() throws Exception {
-        StartContainerCmd command = dockerRule.getClient().startContainerCmd("");
-        assertThat(JSONTestHelper.getMapper().writeValueAsString(command), is("{}"));
-    }
 }

From 70a30f89df996c22a1e504b89e7b7ae22f89f9c7 Mon Sep 17 00:00:00 2001
From: Erik Orbons <erikorbons@users.noreply.github.com>
Date: Mon, 25 Nov 2019 08:19:08 +0100
Subject: [PATCH 0949/1272] Update junixsocket to version 2.2.1 (#1280)

This should add support for Java 13 and thereby fix #1245.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 556196fd6..a5a4fb3d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
 		<slf4j-api.version>1.7.25</slf4j-api.version>
 
 		<bouncycastle.version>1.60</bouncycastle.version>
-		<junixsocket.version>2.2.0</junixsocket.version>
+		<junixsocket.version>2.2.1</junixsocket.version>
 		<guava.version>19.0</guava.version>
 
 		<!-- test dependencies -->

From 255d7a6781cc5ed020e2ede64b1bc6fb6b900203 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 3 Dec 2019 18:45:52 +0100
Subject: [PATCH 0950/1272] Make API depend only on `jackson-annotations`
 (#1279)

---
 docker-java-api/pom.xml                       |  2 +-
 .../github/dockerjava/api/model/Binds.java    | 59 +++--------
 .../dockerjava/api/model/ErrorResponse.java   |  1 +
 .../dockerjava/api/model/ExposedPort.java     | 51 +---------
 .../dockerjava/api/model/ExposedPorts.java    | 64 +++---------
 .../github/dockerjava/api/model/Links.java    | 58 +++--------
 .../github/dockerjava/api/model/Ports.java    | 99 +++++++------------
 .../github/dockerjava/api/model/Volume.java   |  8 +-
 .../dockerjava/api/model/VolumeBinds.java     | 69 ++++---------
 .../github/dockerjava/api/model/VolumeRW.java | 53 +++-------
 .../github/dockerjava/api/model/Volumes.java  | 66 +++----------
 .../dockerjava/api/model/VolumesFrom.java     | 42 +-------
 .../dockerjava/api/model/VolumesRW.java       | 73 ++++----------
 docker-java-core/pom.xml                      |  6 ++
 .../dockerjava/core/DockerClientConfig.java   |  7 +-
 .../core/async/JsonStreamProcessor.java       |  4 +-
 .../core/command/AbstrAsyncDockerCmd.java     |  2 +-
 .../core/command/AbstrDockerCmd.java          |  2 +-
 .../core/exec/AbstrDockerCmdExec.java         |  4 +-
 .../filter/ResponseStatusExceptionFilter.java |  4 +-
 .../netty/NettyInvocationBuilder.java         |  7 +-
 .../dockerjava/netty/NettyWebTarget.java      |  4 +-
 .../netty/handler/JsonRequestHandler.java     |  8 +-
 .../handler/JsonResponseCallbackHandler.java  |  7 +-
 .../api/model/BindPropagationTest.java        | 24 +++++
 .../dockerjava/api/model/BindsTest.java       | 34 +++++++
 .../api/model/ExposedPortsTest.java           | 34 +++++++
 .../dockerjava/api/model/LinksTest.java       | 35 +++++++
 .../dockerjava/api/model/VolumeBindsTest.java | 13 +++
 .../dockerjava/api/model/VolumesRWTest.java   | 35 +++++++
 .../dockerjava/api/model/VolumesTest.java     | 34 +++++++
 31 files changed, 383 insertions(+), 526 deletions(-)
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/api/model/BindPropagationTest.java
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/api/model/BindsTest.java
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/api/model/LinksTest.java
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/api/model/VolumesRWTest.java
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/api/model/VolumesTest.java

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index b8b0af838..e621994c7 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -18,7 +18,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
+			<artifactId>jackson-annotations</artifactId>
 			<version>${jackson.version}</version>
 		</dependency>
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java
index a7957a945..06aff4ecf 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java
@@ -1,25 +1,11 @@
 package com.github.dockerjava.api.model;
 
-import java.io.IOException;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import java.util.stream.Stream;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.ObjectCodec;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 
-@JsonSerialize(using = Binds.Serializer.class)
-@JsonDeserialize(using = Binds.Deserializer.class)
 public class Binds implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -33,39 +19,16 @@ public Bind[] getBinds() {
         return binds;
     }
 
-    public static class Serializer extends JsonSerializer<Binds> {
-
-        @Override
-        public void serialize(Binds binds, JsonGenerator jsonGen, SerializerProvider serProvider) throws IOException,
-                JsonProcessingException {
-
-            //
-            jsonGen.writeStartArray();
-            for (Bind bind : binds.getBinds()) {
-                jsonGen.writeString(bind.toString());
-            }
-            jsonGen.writeEndArray();
-            //
-        }
-
+    @JsonValue
+    public String[] toPrimitive() {
+        return Stream.of(binds).map(Bind::toString).toArray(String[]::new);
     }
 
-    public static class Deserializer extends JsonDeserializer<Binds> {
-        @Override
-        public Binds deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
-                throws IOException, JsonProcessingException {
-
-            List<Bind> binds = new ArrayList<>();
-            ObjectCodec oc = jsonParser.getCodec();
-            JsonNode node = oc.readTree(jsonParser);
-            for (Iterator<JsonNode> it = node.elements(); it.hasNext();) {
-
-                JsonNode field = it.next();
-                binds.add(Bind.parse(field.asText()));
-
-            }
-            return new Binds(binds.toArray(new Bind[0]));
-        }
+    @JsonCreator
+    public static Binds fromPrimitive(String[] binds) {
+        return new Binds(
+                Stream.of(binds).map(Bind::parse).toArray(Bind[]::new)
+        );
     }
 
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
index ef4f93eb1..523a35729 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
@@ -4,6 +4,7 @@
 
 import java.io.Serializable;
 
+@Deprecated
 public class ErrorResponse implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
index 1d0ac8bc8..d273b60cc 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
@@ -3,22 +3,10 @@
 import static com.github.dockerjava.api.model.InternetProtocol.TCP;
 import static com.github.dockerjava.api.model.InternetProtocol.UDP;
 
-import java.io.IOException;
 import java.io.Serializable;
-import java.util.Map.Entry;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.ObjectCodec;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.node.NullNode;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 import com.github.dockerjava.api.model.Ports.Binding;
 import lombok.EqualsAndHashCode;
 
@@ -27,8 +15,6 @@
  * {@link InternetProtocol}. It can be published by Docker by {@link Ports#bind(ExposedPort, Binding) binding} it to a host port,
  * represented by a {@link Binding}.
  */
-@JsonDeserialize(using = ExposedPort.Deserializer.class)
-@JsonSerialize(using = ExposedPort.Serializer.class)
 @EqualsAndHashCode
 public class ExposedPort implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -120,6 +106,7 @@ public static ExposedPort udp(int port) {
      * @throws IllegalArgumentException
      *             if the specification cannot be parsed
      */
+    @JsonCreator
     public static ExposedPort parse(String serialized) throws IllegalArgumentException {
         try {
             String[] parts = serialized.split("/");
@@ -143,36 +130,8 @@ public static ExposedPort parse(String serialized) throws IllegalArgumentExcepti
      * @return a string representation of this {@link ExposedPort}
      */
     @Override
+    @JsonValue
     public String toString() {
         return port + "/" + protocol.toString();
     }
-
-    public static class Deserializer extends JsonDeserializer<ExposedPort> {
-        @Override
-        public ExposedPort deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
-                throws IOException, JsonProcessingException {
-            ObjectCodec oc = jsonParser.getCodec();
-            JsonNode node = oc.readTree(jsonParser);
-            if (!node.equals(NullNode.getInstance())) {
-                Entry<String, JsonNode> field = node.fields().next();
-                return ExposedPort.parse(field.getKey());
-            } else {
-                return null;
-            }
-        }
-    }
-
-    public static class Serializer extends JsonSerializer<ExposedPort> {
-
-        @Override
-        public void serialize(ExposedPort exposedPort, JsonGenerator jsonGen, SerializerProvider serProvider)
-                throws IOException, JsonProcessingException {
-
-            jsonGen.writeStartObject();
-            jsonGen.writeFieldName(exposedPort.toString());
-            jsonGen.writeEndObject();
-        }
-
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
index c20e84cec..445cba2de 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
@@ -1,27 +1,14 @@
 package com.github.dockerjava.api.model;
 
-import java.io.IOException;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.ObjectCodec;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.node.NullNode;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 
-@JsonSerialize(using = ExposedPorts.Serializer.class)
-@JsonDeserialize(using = ExposedPorts.Deserializer.class)
 public class ExposedPorts implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -39,40 +26,19 @@ public ExposedPort[] getExposedPorts() {
         return exposedPorts;
     }
 
-    public static class Serializer extends JsonSerializer<ExposedPorts> {
-
-        @Override
-        public void serialize(ExposedPorts exposedPorts, JsonGenerator jsonGen, SerializerProvider serProvider)
-                throws IOException, JsonProcessingException {
-
-            jsonGen.writeStartObject();
-            for (ExposedPort exposedPort : exposedPorts.getExposedPorts()) {
-                jsonGen.writeFieldName(exposedPort.toString());
-                jsonGen.writeStartObject();
-                jsonGen.writeEndObject();
-            }
-            jsonGen.writeEndObject();
-        }
-
+    @JsonCreator
+    public static ExposedPorts fromPrimitive(Map<String, Object> object) {
+        return new ExposedPorts(
+                object.keySet().stream().map(ExposedPort::parse).toArray(ExposedPort[]::new)
+        );
     }
 
-    public static class Deserializer extends JsonDeserializer<ExposedPorts> {
-        @Override
-        public ExposedPorts deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
-                throws IOException, JsonProcessingException {
-
-            List<ExposedPort> exposedPorts = new ArrayList<>();
-            ObjectCodec oc = jsonParser.getCodec();
-            JsonNode node = oc.readTree(jsonParser);
-            for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
-
-                Map.Entry<String, JsonNode> field = it.next();
-                if (!field.getValue().equals(NullNode.getInstance())) {
-                    exposedPorts.add(ExposedPort.parse(field.getKey()));
-                }
-            }
-            return new ExposedPorts(exposedPorts.toArray(new ExposedPort[0]));
-        }
+    @JsonValue
+    public Map<String, Object> toPrimitive() {
+        return Stream.of(exposedPorts).collect(Collectors.toMap(
+                ExposedPort::toString,
+                __ -> new Object()
+        ));
     }
 
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java
index 1c32984ee..18bfc75ba 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java
@@ -1,26 +1,12 @@
 package com.github.dockerjava.api.model;
 
-import java.io.IOException;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Stream;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.ObjectCodec;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.node.NullNode;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 
-@JsonSerialize(using = Links.Serializer.class)
-@JsonDeserialize(using = Links.Deserializer.class)
 public class Links implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -38,37 +24,15 @@ public Link[] getLinks() {
         return links;
     }
 
-    public static class Serializer extends JsonSerializer<Links> {
-
-        @Override
-        public void serialize(final Links links, final JsonGenerator jsonGen, final SerializerProvider serProvider)
-                throws IOException, JsonProcessingException {
-            jsonGen.writeStartArray();
-            for (final Link link : links.getLinks()) {
-                jsonGen.writeString(link.toString());
-            }
-            jsonGen.writeEndArray();
-        }
-
+    @JsonCreator
+    public static Links fromPrimitive(String[] links) {
+        return new Links(
+                Stream.of(links).map(Link::parse).toArray(Link[]::new)
+        );
     }
 
-    public static class Deserializer extends JsonDeserializer<Links> {
-
-        @Override
-        public Links deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext)
-                throws IOException, JsonProcessingException {
-            final List<Link> binds = new ArrayList<>();
-            final ObjectCodec oc = jsonParser.getCodec();
-            final JsonNode node = oc.readTree(jsonParser);
-            for (final Iterator<JsonNode> it = node.elements(); it.hasNext();) {
-
-                final JsonNode element = it.next();
-                if (!element.equals(NullNode.getInstance())) {
-                    binds.add(Link.parse(element.asText()));
-                }
-            }
-            return new Links(binds.toArray(new Link[0]));
-        }
+    @JsonValue
+    public String[] toPrimitive() {
+        return Stream.of(links).map(Link::toString).toArray(String[]::new);
     }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
index a2ae85e23..b278e8fc4 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -1,25 +1,16 @@
 package com.github.dockerjava.api.model;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.ObjectCodec;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.node.NullNode;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.EqualsAndHashCode;
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.util.HashMap;
-import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * A container for port bindings, made available as a {@link Map} via its {@link #getBindings()} method.
@@ -31,8 +22,6 @@
  * @see NetworkSettings#getPorts()
  */
 @SuppressWarnings(value = "checkstyle:equalshashcode")
-@JsonDeserialize(using = Ports.Deserializer.class)
-@JsonSerialize(using = Ports.Serializer.class)
 public class Ports implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -259,60 +248,40 @@ public String toString() {
         }
     }
 
-    public static class Deserializer extends JsonDeserializer<Ports> {
-        @Override
-        public Ports deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
-                throws IOException, JsonProcessingException {
-
-            Ports out = new Ports();
-            ObjectCodec oc = jsonParser.getCodec();
-            JsonNode node = oc.readTree(jsonParser);
-            for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
+    @JsonCreator
+    public static Ports fromPrimitive(Map<String, List<Map<String, String>>> map) {
+        Ports out = new Ports();
+        for (Entry<String, List<Map<String, String>>> entry : map.entrySet()) {
+            ExposedPort exposedPort = ExposedPort.parse(entry.getKey());
 
-                Map.Entry<String, JsonNode> portNode = it.next();
-                JsonNode bindingsArray = portNode.getValue();
-                if (bindingsArray.equals(NullNode.getInstance())) {
-                    out.bind(ExposedPort.parse(portNode.getKey()), null);
-                } else {
-                    for (int i = 0; i < bindingsArray.size(); i++) {
-                        JsonNode bindingNode = bindingsArray.get(i);
-                        if (!bindingNode.equals(NullNode.getInstance())) {
-                            String hostIp = bindingNode.get("HostIp").textValue();
-                            String hostPort = bindingNode.get("HostPort").textValue();
-                            out.bind(ExposedPort.parse(portNode.getKey()), new Binding(hostIp, hostPort));
-                        }
-                    }
+            if (entry.getValue() == null) {
+                out.bind(exposedPort, null);
+            } else {
+                for (Map<String, String> binding : entry.getValue()) {
+                    out.bind(exposedPort, new Binding(binding.get("HostIp"), binding.get("HostPort")));
                 }
             }
-            return out;
         }
+        return out;
     }
 
-    public static class Serializer extends JsonSerializer<Ports> {
-
-        @Override
-        public void serialize(Ports portBindings, JsonGenerator jsonGen, SerializerProvider serProvider)
-                throws IOException, JsonProcessingException {
-
-            jsonGen.writeStartObject();
-            for (Entry<ExposedPort, Binding[]> entry : portBindings.getBindings().entrySet()) {
-                jsonGen.writeFieldName(entry.getKey().toString());
-                if (entry.getValue() != null) {
-                    jsonGen.writeStartArray();
-                    for (Binding binding : entry.getValue()) {
-                        jsonGen.writeStartObject();
-                        jsonGen.writeStringField("HostIp", binding.getHostIp() == null ? "" : binding.getHostIp());
-                        jsonGen.writeStringField("HostPort", binding.getHostPortSpec() == null ? "" : binding.getHostPortSpec());
-                        jsonGen.writeEndObject();
-                    }
-                    jsonGen.writeEndArray();
-                } else {
-                    jsonGen.writeNull();
-                }
-            }
-            jsonGen.writeEndObject();
-        }
-
+    @JsonValue
+    public Map<String, List<Map<String, String>>> toPrimitive() {
+        // Use reduce-like collect to be able to put nulls into the values
+        return ports.entrySet().stream().collect(
+                HashMap::new,
+                (map, entry) -> {
+                    List<Map<String, String>> value = entry.getValue() == null ? null : Stream.of(entry.getValue())
+                            .map(binding -> {
+                                Map<String, String> result = new HashMap<>();
+                                result.put("HostIp", binding.getHostIp() == null ? "" : binding.getHostIp());
+                                result.put("HostPort", binding.getHostPortSpec() == null ? "" : binding.getHostPortSpec());
+                                return result;
+                            })
+                            .collect(Collectors.toList());
+                    map.put(entry.getKey().toString(), value);
+                },
+                HashMap::putAll
+        );
     }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java
index aad95a265..14308ef23 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java
@@ -1,11 +1,12 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.EqualsAndHashCode;
 
 import javax.annotation.Nonnull;
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * Represents a bind mounted volume in a Docker container.
@@ -30,8 +31,8 @@ public class Volume implements Serializable {
      */
     @Nonnull
     @JsonCreator
-    public static Volume parse(@JsonProperty("path") String path) {
-        return new Volume(path);
+    public static Volume parse(Map<String, String> primitive) {
+        return new Volume(primitive.get("path"));
     }
 
     private String path;
@@ -50,6 +51,7 @@ public String getPath() {
     }
 
     @Override
+    @JsonValue
     public String toString() {
         return getPath();
     }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
index 3c1d4ab47..6de15ee38 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
@@ -1,28 +1,13 @@
 package com.github.dockerjava.api.model;
 
-import java.io.IOException;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.ObjectCodec;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.node.NullNode;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 
-// This is not going to be serialized
-@JsonDeserialize(using = VolumeBinds.Deserializer.class)
-@JsonSerialize(using = VolumeBinds.Serializer.class)
 public class VolumeBinds implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -36,41 +21,21 @@ public VolumeBind[] getBinds() {
         return binds;
     }
 
-    public static final class Serializer extends JsonSerializer<VolumeBinds> {
-
-        @Override
-        public void serialize(VolumeBinds value, JsonGenerator jgen, SerializerProvider provider) throws IOException,
-                JsonProcessingException {
-            jgen.writeStartObject();
-            for (final VolumeBind bind : value.binds) {
-                jgen.writeStringField(bind.getContainerPath(), bind.getHostPath());
-            }
-            jgen.writeEndObject();
-        }
+    @JsonCreator
+    public static VolumeBinds fromPrimitive(Map<String, String> primitive) {
+        return new VolumeBinds(
+                primitive.entrySet().stream()
+                .map(it -> new VolumeBind(it.getValue(), it.getKey()))
+                .toArray(VolumeBind[]::new)
+        );
     }
 
-    public static final class Deserializer extends JsonDeserializer<VolumeBinds> {
-        @Override
-        public VolumeBinds deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
-                throws IOException, JsonProcessingException {
-
-            List<VolumeBind> binds = new ArrayList<>();
-            ObjectCodec oc = jsonParser.getCodec();
-            JsonNode node = oc.readTree(jsonParser);
-            for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
-                Map.Entry<String, JsonNode> field = it.next();
-                JsonNode value = field.getValue();
-                if (!value.equals(NullNode.getInstance())) {
-                    if (!value.isTextual()) {
-                        throw deserializationContext.mappingException("Expected path for '" + field.getKey()
-                                + "'in host but got '" + value + "'.");
-                    }
-                    VolumeBind bind = new VolumeBind(value.asText(), field.getKey());
-                    binds.add(bind);
-                }
-            }
-            return new VolumeBinds(binds.toArray(new VolumeBind[binds.size()]));
-        }
+    @JsonValue
+    public Map<String, String> toPrimitive() {
+        return Stream.of(binds).collect(Collectors.toMap(
+                VolumeBind::getContainerPath,
+                VolumeBind::getHostPath
+        ));
     }
 
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
index 0c698ae6c..66ba57ced 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
@@ -1,21 +1,12 @@
 package com.github.dockerjava.api.model;
 
-import java.io.IOException;
 import java.io.Serializable;
+import java.util.Collections;
+import java.util.Map;
 import java.util.Map.Entry;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.ObjectCodec;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.node.NullNode;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.EqualsAndHashCode;
 
 /**
@@ -24,8 +15,6 @@
  * @see Bind
  * @deprecated since {@link RemoteApiVersion#VERSION_1_20}
  */
-@JsonDeserialize(using = VolumeRW.Deserializer.class)
-@JsonSerialize(using = VolumeRW.Serializer.class)
 @Deprecated
 @EqualsAndHashCode
 public class VolumeRW implements Serializable {
@@ -63,35 +52,15 @@ public String toString() {
         return getVolume() + ":" + getAccessMode();
     }
 
-    public static class Serializer extends JsonSerializer<VolumeRW> {
-
-        @Override
-        public void serialize(VolumeRW volumeRW, JsonGenerator jsonGen, SerializerProvider serProvider)
-                throws IOException, JsonProcessingException {
-
-            jsonGen.writeStartObject();
-            jsonGen.writeFieldName(volumeRW.getVolume().getPath());
-            jsonGen.writeString(Boolean.toString(volumeRW.getAccessMode().toBoolean()));
-            jsonGen.writeEndObject();
-        }
-
+    @JsonCreator
+    public static VolumeRW fromPrimitive(Map<String, Boolean> map) {
+        Entry<String, Boolean> entry = map.entrySet().iterator().next();
+        return new VolumeRW(new Volume(entry.getKey()), AccessMode.fromBoolean(entry.getValue()));
     }
 
-    public static class Deserializer extends JsonDeserializer<VolumeRW> {
-        @Override
-        public VolumeRW deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
-                throws IOException, JsonProcessingException {
-            ObjectCodec oc = jsonParser.getCodec();
-            JsonNode node = oc.readTree(jsonParser);
-            if (!node.equals(NullNode.getInstance())) {
-                Entry<String, JsonNode> field = node.fields().next();
-                String volume = field.getKey();
-                AccessMode accessMode = AccessMode.fromBoolean(field.getValue().asBoolean());
-                return new VolumeRW(new Volume(volume), accessMode);
-            } else {
-                return null;
-            }
-        }
+    @JsonValue
+    public Map<String, Boolean> toPrimitive() {
+        return Collections.singletonMap(volume.getPath(), accessMode.toBoolean());
     }
 
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java
index b6844b987..2badd1ca8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java
@@ -1,27 +1,14 @@
 package com.github.dockerjava.api.model;
 
-import java.io.IOException;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.ObjectCodec;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.node.NullNode;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 
-@JsonSerialize(using = Volumes.Serializer.class)
-@JsonDeserialize(using = Volumes.Deserializer.class)
 public class Volumes implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -39,42 +26,19 @@ public Volume[] getVolumes() {
         return volumes;
     }
 
-    public static class Serializer extends JsonSerializer<Volumes> {
-
-        @Override
-        public void serialize(Volumes volumes, JsonGenerator jsonGen, SerializerProvider serProvider)
-                throws IOException, JsonProcessingException {
-
-            jsonGen.writeStartObject();
-            for (Volume volume : volumes.getVolumes()) {
-                jsonGen.writeFieldName(volume.getPath());
-                jsonGen.writeStartObject();
-                jsonGen.writeEndObject();
-            }
-            jsonGen.writeEndObject();
-        }
-
+    @JsonCreator
+    public static Volumes fromPrimitive(Map<String, Object> map) {
+        return new Volumes(
+                map.keySet().stream().map(Volume::new).toArray(Volume[]::new)
+        );
     }
 
-    public static class Deserializer extends JsonDeserializer<Volumes> {
-        @Override
-        public Volumes deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
-                throws IOException, JsonProcessingException {
-
-            List<Volume> volumes = new ArrayList<>();
-            ObjectCodec oc = jsonParser.getCodec();
-            JsonNode node = oc.readTree(jsonParser);
-            for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
-
-                Map.Entry<String, JsonNode> field = it.next();
-                if (!field.getValue().equals(NullNode.getInstance())) {
-                    String path = field.getKey();
-                    Volume volume = new Volume(path);
-                    volumes.add(volume);
-                }
-            }
-            return new Volumes(volumes.toArray(new Volume[0]));
-        }
+    @JsonValue
+    public Map<String, Object> toPrimitive() {
+        return Stream.of(volumes).collect(Collectors.toMap(
+                Volume::getPath,
+                __ -> new Object()
+        ));
     }
 
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
index b70fa0384..98165afa9 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
@@ -1,23 +1,11 @@
 package com.github.dockerjava.api.model;
 
-import java.io.IOException;
 import java.io.Serializable;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.ObjectCodec;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.EqualsAndHashCode;
 
-@JsonSerialize(using = VolumesFrom.Serializer.class)
-@JsonDeserialize(using = VolumesFrom.Deserializer.class)
 @EqualsAndHashCode
 public class VolumesFrom implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -52,6 +40,7 @@ public AccessMode getAccessMode() {
      * @throws IllegalArgumentException
      *             if the specification cannot be parsed
      */
+    @JsonCreator
     public static VolumesFrom parse(String serialized) {
         try {
             String[] parts = serialized.split(":");
@@ -79,32 +68,9 @@ public static VolumesFrom parse(String serialized) {
      * @return a string representation of this {@link VolumesFrom}
      */
     @Override
+    @JsonValue
     public String toString() {
         return container + ":" + accessMode.toString();
     }
 
-    public static class Serializer extends JsonSerializer<VolumesFrom> {
-
-        @Override
-        public void serialize(VolumesFrom volumeFrom, JsonGenerator jsonGen, SerializerProvider serProvider)
-                throws IOException, JsonProcessingException {
-
-            jsonGen.writeString(volumeFrom.toString());
-
-        }
-
-    }
-
-    public static class Deserializer extends JsonDeserializer<VolumesFrom> {
-        @Override
-        public VolumesFrom deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
-                throws IOException, JsonProcessingException {
-
-            ObjectCodec oc = jsonParser.getCodec();
-            JsonNode node = oc.readTree(jsonParser);
-            return VolumesFrom.parse(node.asText());
-
-        }
-    }
-
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
index 8fcaffb8d..8afd3e230 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
@@ -1,28 +1,14 @@
 package com.github.dockerjava.api.model;
 
-import java.io.IOException;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.ObjectCodec;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.node.NullNode;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 
 // This is not going to be serialized
-@JsonSerialize(using = VolumesRW.Serializer.class)
-@JsonDeserialize(using = VolumesRW.Deserializer.class)
 public class VolumesRW implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -36,45 +22,20 @@ public VolumeRW[] getVolumesRW() {
         return volumesRW;
     }
 
-    public static final class Serializer extends JsonSerializer<VolumesRW> {
-
-        @Override
-        public void serialize(VolumesRW value, JsonGenerator jgen, SerializerProvider provider) throws IOException,
-                JsonProcessingException {
-            jgen.writeStartObject();
-            for (final VolumeRW volumeRW : value.volumesRW) {
-                jgen.writeBooleanField(volumeRW.getVolume().getPath(), volumeRW.getAccessMode().toBoolean());
-            }
-            jgen.writeEndObject();
-        }
-
+    @JsonCreator
+    public static VolumesRW fromPrimitive(Map<String, Boolean> map) {
+        return new VolumesRW(
+                map.entrySet().stream()
+                    .map(entry -> new VolumeRW(new Volume(entry.getKey()), AccessMode.fromBoolean(entry.getValue())))
+                    .toArray(VolumeRW[]::new)
+        );
     }
 
-    public static final class Deserializer extends JsonDeserializer<VolumesRW> {
-        @Override
-        public VolumesRW deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
-                throws IOException, JsonProcessingException {
-
-            List<VolumeRW> volumesRW = new ArrayList<>();
-            ObjectCodec oc = jsonParser.getCodec();
-            JsonNode node = oc.readTree(jsonParser);
-
-            for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {
-                Map.Entry<String, JsonNode> field = it.next();
-                JsonNode value = field.getValue();
-
-                if (!value.equals(NullNode.getInstance())) {
-                    if (!value.isBoolean()) {
-                        throw deserializationContext.mappingException("Expected access mode for '" + field.getKey()
-                                + "' in host but got '" + value + "'.");
-                    }
-
-                    VolumeRW bind = new VolumeRW(new Volume(field.getKey()), AccessMode.fromBoolean(value.asBoolean()));
-                    volumesRW.add(bind);
-                }
-            }
-            return new VolumesRW(volumesRW.toArray(new VolumeRW[volumesRW.size()]));
-        }
+    @JsonValue
+    public Map<String, Boolean> toPrimitive() {
+        return Stream.of(volumesRW).collect(Collectors.toMap(
+                it -> it.getVolume().getPath(),
+                it -> it.getAccessMode().toBoolean()
+        ));
     }
-
 }
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index df1a74d1e..3fa7ce306 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -46,6 +46,12 @@
 			<version>${commons-lang.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index 226b95c05..b64c0e7e6 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -7,6 +7,7 @@
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
 
@@ -40,7 +41,7 @@ public interface DockerClientConfig {
     SSLConfig getSSLConfig();
 
     default ObjectMapper getObjectMapper() {
-        return DefaultObjectMapperHolder.INSTANCE.getObjectMapper();
+        return DefaultObjectMapperHolder.INSTANCE.getObjectMapper().copy();
     }
 }
 
@@ -49,8 +50,8 @@ enum DefaultObjectMapperHolder {
 
     private final ObjectMapper objectMapper = new ObjectMapper()
             // TODO .setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL)
-            // TODO .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
-            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+            .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
 
     public ObjectMapper getObjectMapper() {
         return objectMapper;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
index 7ad1c135a..0a849f4f3 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
@@ -9,10 +9,10 @@
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.core.DefaultDockerClientConfig;
 
 /**
  *
@@ -30,7 +30,7 @@ public class JsonStreamProcessor<T> implements ResponseStreamProcessor<T> {
     @Deprecated
     public JsonStreamProcessor(Class<T> clazz) {
         this(
-                new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES),
+                DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(),
                 clazz
         );
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
index 5849fc3fb..b576d7a05 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
@@ -9,7 +9,7 @@
 public abstract class AbstrAsyncDockerCmd<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T>, A_RES_T> implements
         AsyncDockerCmd<CMD_T, A_RES_T> {
 
-    protected DockerCmdAsyncExec<CMD_T, A_RES_T> execution;
+    protected transient DockerCmdAsyncExec<CMD_T, A_RES_T> execution;
 
     public AbstrAsyncDockerCmd(DockerCmdAsyncExec<CMD_T, A_RES_T> execution) {
         checkNotNull(execution, "execution was not specified");
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
index b2c9d36ce..10e6b5212 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
@@ -21,7 +21,7 @@ public abstract class AbstrDockerCmd<CMD_T extends DockerCmd<RES_T>, RES_T> impl
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstrDockerCmd.class);
 
-    protected DockerCmdSyncExec<CMD_T, RES_T> execution;
+    protected transient DockerCmdSyncExec<CMD_T, RES_T> execution;
 
     public AbstrDockerCmd(DockerCmdSyncExec<CMD_T, RES_T> execution) {
         checkNotNull(execution, "execution was not specified");
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
index 78211bdec..d1d2adc3e 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
@@ -20,9 +20,9 @@
 
 public abstract class AbstrDockerCmdExec {
 
-    private final DockerClientConfig dockerClientConfig;
+    private final transient DockerClientConfig dockerClientConfig;
 
-    private final WebTarget baseResource;
+    private final transient WebTarget baseResource;
 
     public AbstrDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
         checkNotNull(baseResource, "baseResource was not specified");
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
index c0c6e3d48..d696bc800 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
@@ -9,7 +9,7 @@
 import javax.ws.rs.client.ClientResponseFilter;
 import javax.ws.rs.core.MediaType;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.github.dockerjava.core.DefaultDockerClientConfig;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,7 +40,7 @@ public class ResponseStatusExceptionFilter implements ClientResponseFilter {
 
     @Deprecated
     public ResponseStatusExceptionFilter() {
-        this(new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
+        this(DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper());
     }
 
     public ResponseStatusExceptionFilter(ObjectMapper objectMapper) {
diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
index 7478b83f6..8830edb77 100644
--- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
+++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
@@ -2,12 +2,11 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.core.InvocationBuilder;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
 import com.github.dockerjava.netty.handler.FramedResponseStreamHandler;
@@ -86,14 +85,14 @@ public void onNext(Void object) {
     @Deprecated
     public NettyInvocationBuilder(ChannelProvider channelProvider, String resource) {
         this(
-                new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES),
+                DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(),
                 channelProvider,
                 resource
         );
     }
 
     public NettyInvocationBuilder(ObjectMapper objectMapper, ChannelProvider channelProvider, String resource) {
-        this.objectMapper = objectMapper.copy().disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+        this.objectMapper = objectMapper;
         this.channelProvider = channelProvider;
         this.resource = resource;
     }
diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
index e209cd231..492308ad6 100644
--- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
+++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
@@ -12,8 +12,8 @@
 import java.util.Objects;
 import java.util.Set;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.core.WebTarget;
 import com.google.common.collect.ImmutableSet;
 import io.netty.handler.codec.http.HttpConstants;
@@ -50,7 +50,7 @@ public class NettyWebTarget implements WebTarget {
     @Deprecated
     public NettyWebTarget(ChannelProvider channelProvider, String host) {
         this(
-                new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES),
+                DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(),
                 channelProvider,
                 host,
                 ImmutableList.of(),
diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
index 963937061..30e1831f8 100644
--- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
+++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.netty.handler;
 
-import com.fasterxml.jackson.databind.SerializationFeature;
+import com.github.dockerjava.core.DefaultDockerClientConfig;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
@@ -17,11 +17,7 @@
 @Deprecated
 public class JsonRequestHandler extends MessageToByteEncoder<Object> {
 
-    private ObjectMapper mapper = new ObjectMapper();
-
-    public JsonRequestHandler() {
-        mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
-    }
+    private ObjectMapper mapper = DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper();
 
     @Override
     protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception {
diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
index b46d062f9..0d13bd306 100644
--- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
+++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.netty.handler;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.SerializationFeature;
+import com.github.dockerjava.core.DefaultDockerClientConfig;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
@@ -26,9 +25,7 @@ public class JsonResponseCallbackHandler<T> extends SimpleChannelInboundHandler<
     @Deprecated
     public JsonResponseCallbackHandler(TypeReference<T> typeReference, ResultCallback<T> callback) {
         this(
-                new ObjectMapper()
-                        .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
-                        .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS),
+                DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(),
                 typeReference,
                 callback
         );
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/BindPropagationTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/BindPropagationTest.java
new file mode 100644
index 000000000..25c9edd26
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/BindPropagationTest.java
@@ -0,0 +1,24 @@
+package com.github.dockerjava.api.model;
+
+import com.github.dockerjava.test.serdes.JSONTestHelper;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+public class BindPropagationTest {
+
+    @Test
+    public void toJson() throws Exception {
+        String value = JSONTestHelper.getMapper().writeValueAsString(BindPropagation.R_PRIVATE);
+
+        assertThat(value, is("\"rprivate\""));
+    }
+
+    @Test
+    public void fromJson() throws Exception {
+        BindPropagation value = JSONTestHelper.getMapper().readValue("\"rprivate\"", BindPropagation.class);
+
+        assertThat(value, is(BindPropagation.R_PRIVATE));
+    }
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/BindsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/BindsTest.java
new file mode 100644
index 000000000..54ccb0e25
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/BindsTest.java
@@ -0,0 +1,34 @@
+package com.github.dockerjava.api.model;
+
+import com.github.dockerjava.test.serdes.JSONTestHelper;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.arrayContaining;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
+public class BindsTest {
+
+    @Test
+    public void usesToJson() throws Exception {
+        Binds binds = new Binds(
+                Bind.parse("/foo:/bar:rw"),
+                Bind.parse("/bip:/bop:ro")
+        );
+        String json = JSONTestHelper.getMapper().writeValueAsString(binds);
+
+        assertThat(json, is("[\"/foo:/bar:rw\",\"/bip:/bop:ro\"]"));
+    }
+
+    @Test
+    public void usesFromJson() throws Exception {
+        Binds binds = JSONTestHelper.getMapper().readValue("[\"/foo:/bar:rw\",\"/bip:/bop:ro\"]", Binds.class);
+
+        assertThat(binds, notNullValue());
+        assertThat(binds.getBinds(), arrayContaining(
+                Bind.parse("/foo:/bar:rw"),
+                Bind.parse("/bip:/bop:ro")
+        ));
+    }
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java
new file mode 100644
index 000000000..c69e1f04f
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java
@@ -0,0 +1,34 @@
+package com.github.dockerjava.api.model;
+
+import com.github.dockerjava.test.serdes.JSONTestHelper;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.arrayContaining;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
+public class ExposedPortsTest {
+
+    @Test
+    public void usesToJson() throws Exception {
+        ExposedPorts ports = new ExposedPorts(
+                new ExposedPort(80),
+                new ExposedPort(123, InternetProtocol.UDP)
+        );
+        String json = JSONTestHelper.getMapper().writeValueAsString(ports);
+
+        assertThat(json, is("{\"80/tcp\":{},\"123/udp\":{}}"));
+    }
+
+    @Test
+    public void usesFromJson() throws Exception {
+        ExposedPorts ports = JSONTestHelper.getMapper().readValue("{\"80/tcp\":{},\"123/udp\":{}}", ExposedPorts.class);
+
+        assertThat(ports, notNullValue());
+        assertThat(ports.getExposedPorts(), arrayContaining(
+                new ExposedPort(80),
+                new ExposedPort(123, InternetProtocol.UDP)
+        ));
+    }
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/LinksTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/LinksTest.java
new file mode 100644
index 000000000..379744165
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/LinksTest.java
@@ -0,0 +1,35 @@
+package com.github.dockerjava.api.model;
+
+import com.github.dockerjava.test.serdes.JSONTestHelper;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.arrayContaining;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
+public class LinksTest {
+
+    @Test
+    public void usesToJson() throws Exception {
+        Links links = new Links(
+                new Link("/foo", "/bar"),
+                new Link("bip", "bop")
+        );
+        String json = JSONTestHelper.getMapper().writeValueAsString(links);
+
+        assertThat(json, is("[\"/foo:/bar\",\"bip:bop\"]"));
+    }
+
+    @Test
+    public void usesFromJson() throws Exception {
+        Links links = JSONTestHelper.getMapper().readValue("[\"/foo:/bar\",\"bip:bop\"]", Links.class);
+
+        assertThat(links, notNullValue());
+        assertThat(links.getLinks(), arrayContaining(
+                new Link("foo", "bar"),
+                new Link("bip", "bop")
+        ));
+    }
+
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
index 0d509dbfa..f0ed49364 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
@@ -6,10 +6,23 @@
 
 import java.io.IOException;
 
+import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 
 public class VolumeBindsTest {
 
+    @Test
+    public void usesToJson() throws Exception {
+        VolumeBinds binds = new VolumeBinds(
+                new VolumeBind("/bar", "/foo"),
+                new VolumeBind("/bop", "/bip")
+        );
+        String json = JSONTestHelper.getMapper().writeValueAsString(binds);
+
+        assertThat(json, is("{\"/foo\":\"/bar\",\"/bip\":\"/bop\"}"));
+    }
+
     @Test
     public void t() throws IOException {
         String s = "{\"/data\":\"/some/path\"}";
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesRWTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesRWTest.java
new file mode 100644
index 000000000..53f1213ad
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesRWTest.java
@@ -0,0 +1,35 @@
+package com.github.dockerjava.api.model;
+
+import com.github.dockerjava.test.serdes.JSONTestHelper;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.arrayContaining;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
+public class VolumesRWTest {
+
+    @Test
+    public void usesToJson() throws Exception {
+        VolumesRW volumes = new VolumesRW(
+                new VolumeRW(new Volume("/foo")),
+                new VolumeRW(new Volume("/bar"), AccessMode.ro)
+        );
+        String json = JSONTestHelper.getMapper().writeValueAsString(volumes);
+
+        assertThat(json, is("{\"/foo\":true,\"/bar\":false}"));
+    }
+
+    @Test
+    public void usesFromJson() throws Exception {
+        VolumesRW volumes = JSONTestHelper.getMapper().readValue("{\"/foo\":true,\"/bar\":false}", VolumesRW.class);
+
+        assertThat(volumes, notNullValue());
+        assertThat(volumes.getVolumesRW(), arrayContaining(
+                new VolumeRW(new Volume("/foo")),
+                new VolumeRW(new Volume("/bar"), AccessMode.ro)
+        ));
+    }
+
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesTest.java
new file mode 100644
index 000000000..3470e4963
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesTest.java
@@ -0,0 +1,34 @@
+package com.github.dockerjava.api.model;
+
+import com.github.dockerjava.test.serdes.JSONTestHelper;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.arrayContaining;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
+public class VolumesTest {
+
+    @Test
+    public void usesToJson() throws Exception {
+        Volumes volumes = new Volumes(
+                new Volume("/foo"),
+                new Volume("/bar")
+        );
+        String json = JSONTestHelper.getMapper().writeValueAsString(volumes);
+
+        assertThat(json, is("{\"/foo\":{},\"/bar\":{}}"));
+    }
+
+    @Test
+    public void usesFromJson() throws Exception {
+        Volumes volumes = JSONTestHelper.getMapper().readValue("{\"/foo\":{},\"/bar\":{}}", Volumes.class);
+
+        assertThat(volumes, notNullValue());
+        assertThat(volumes.getVolumes(), arrayContaining(
+                new Volume("/foo"),
+                new Volume("/bar")
+        ));
+    }
+}

From f57b25850961d0d229c1a617a6b8807649ba5864 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 3 Dec 2019 23:51:02 +0300
Subject: [PATCH 0951/1272] [maven-release-plugin] prepare release 3.2.0-rc2

---
 docker-java-api/pom.xml              | 2 +-
 docker-java-core/pom.xml             | 2 +-
 docker-java-transport-jersey/pom.xml | 2 +-
 docker-java-transport-netty/pom.xml  | 2 +-
 docker-java/pom.xml                  | 2 +-
 pom.xml                              | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index e621994c7..822849da4 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index 3fa7ce306..7e0af23ce 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index 295440266..09b590076 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml
index 91483c167..0d475e82a 100644
--- a/docker-java-transport-netty/pom.xml
+++ b/docker-java-transport-netty/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 13b44f68b..cf3908c4d 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index a5a4fb3d3..03b5c84c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.2.0-SNAPSHOT</version>
+	<version>3.2.0-rc2</version>
 
 	<name>docker-java-parent</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.2.0-rc2</tag>
 	</scm>
 
 	<developers>

From 212b072418e763dcc59e840b6376c6fd713675b1 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 3 Dec 2019 23:51:11 +0300
Subject: [PATCH 0952/1272] [maven-release-plugin] prepare for next development
 iteration

---
 docker-java-api/pom.xml              | 2 +-
 docker-java-core/pom.xml             | 2 +-
 docker-java-transport-jersey/pom.xml | 2 +-
 docker-java-transport-netty/pom.xml  | 2 +-
 docker-java/pom.xml                  | 2 +-
 pom.xml                              | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 822849da4..e621994c7 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc2</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index 7e0af23ce..3fa7ce306 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc2</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index 09b590076..295440266 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc2</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml
index 0d475e82a..91483c167 100644
--- a/docker-java-transport-netty/pom.xml
+++ b/docker-java-transport-netty/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc2</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index cf3908c4d..13b44f68b 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc2</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index 03b5c84c7..a5a4fb3d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.2.0-rc2</version>
+	<version>3.2.0-SNAPSHOT</version>
 
 	<name>docker-java-parent</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.2.0-rc2</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 217c14bd936e1d9936ea9c8ff73ad4455dbc1a5a Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sat, 7 Dec 2019 20:32:44 +0200
Subject: [PATCH 0953/1272] Add OkHttp transport (#1284)

This is a backport of the OkHttp transport from http://github.com/testcontainers/testcontainers-java

OkHttp provides a lightweight API, supports the same feature set as Netty does but also has Windows Npipe support since it can use Java's Socket abstraction.
---
 docker-java-transport-okhttp/pom.xml          |  52 +++
 .../github/dockerjava/okhttp/FramedSink.java  |  73 ++++
 .../okhttp/NamedPipeSocketFactory.java        | 136 +++++++
 .../okhttp/OkHttpDockerCmdExecFactory.java    | 168 ++++++++
 .../okhttp/OkHttpInvocationBuilder.java       | 372 ++++++++++++++++++
 .../dockerjava/okhttp/OkHttpWebTarget.java    | 148 +++++++
 .../dockerjava/okhttp/UnixDomainSocket.java   | 314 +++++++++++++++
 .../dockerjava/okhttp/UnixSocketFactory.java  |  88 +++++
 docker-java/pom.xml                           |   6 +
 .../dockerjava/cmd/AttachContainerCmdIT.java  |   9 +-
 .../java/com/github/dockerjava/cmd/CmdIT.java |  44 ++-
 .../dockerjava/cmd/ConnectToNetworkCmdIT.java |   3 +-
 .../cmd/CopyArchiveFromContainerCmdIT.java    |   4 -
 .../cmd/CopyArchiveToContainerCmdIT.java      |   2 +-
 .../cmd/CopyFileFromContainerCmdIT.java       |   2 -
 .../dockerjava/cmd/CreateContainerCmdIT.java  |   5 +-
 .../dockerjava/cmd/CreateNetworkCmdIT.java    |   2 +-
 .../github/dockerjava/cmd/ExecStartCmdIT.java |   4 -
 .../github/dockerjava/cmd/SaveImageCmdIT.java |   6 +-
 .../dockerjava/cmd/StartContainerCmdIT.java   |   2 +-
 .../dockerjava/cmd/swarm/SwarmCmdIT.java      |   4 +-
 .../github/dockerjava/junit/DockerRule.java   |  40 +-
 .../HttpResponseStreamHandlerTest.java        |   2 +-
 pom.xml                                       |   1 +
 24 files changed, 1422 insertions(+), 65 deletions(-)
 create mode 100644 docker-java-transport-okhttp/pom.xml
 create mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java
 create mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java
 create mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
 create mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpInvocationBuilder.java
 create mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpWebTarget.java
 create mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java
 create mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java

diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
new file mode 100644
index 000000000..a4642dff9
--- /dev/null
+++ b/docker-java-transport-okhttp/pom.xml
@@ -0,0 +1,52 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.github.docker-java</groupId>
+		<artifactId>docker-java-parent</artifactId>
+		<version>3.2.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>docker-java-transport-okhttp</artifactId>
+	<packaging>bundle</packaging>
+
+	<name>docker-java-transport-okhttp</name>
+	<url>https://github.com/docker-java/docker-java</url>
+	<description>Java API Client for Docker</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>${groupId}</groupId>
+			<artifactId>docker-java-core</artifactId>
+			<version>${version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>okhttp</artifactId>
+			<version>3.14.4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>net.java.dev.jna</groupId>
+			<artifactId>jna-platform</artifactId>
+			<version>5.4.0</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Export-Package>com.github.dockerjava.okhttp.*</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java
new file mode 100644
index 000000000..3c0a23021
--- /dev/null
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java
@@ -0,0 +1,73 @@
+package com.github.dockerjava.okhttp;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.StreamType;
+import okio.BufferedSource;
+
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.function.Consumer;
+
+class FramedSink implements Consumer<BufferedSource> {
+
+    private static final int HEADER_SIZE = 8;
+
+    private final ResultCallback<Frame> resultCallback;
+
+    FramedSink(ResultCallback<Frame> resultCallback) {
+        this.resultCallback = resultCallback;
+    }
+
+    @Override
+    public void accept(BufferedSource source) {
+        try {
+            while (!source.exhausted()) {
+                // See https://docs.docker.com/engine/api/v1.37/#operation/ContainerAttach
+                // [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}[]byte{OUTPUT}
+
+                if (!source.request(HEADER_SIZE)) {
+                    return;
+                }
+                byte[] bytes = source.readByteArray(HEADER_SIZE);
+
+                StreamType streamType = streamType(bytes[0]);
+
+                if (streamType == StreamType.RAW) {
+                    resultCallback.onNext(new Frame(StreamType.RAW, bytes));
+                    byte[] buffer = new byte[1024];
+                    while (!source.exhausted()) {
+                        int readBytes = source.read(buffer);
+                        if (readBytes != -1) {
+                            resultCallback.onNext(new Frame(StreamType.RAW, Arrays.copyOf(buffer, readBytes)));
+                        }
+                    }
+                    return;
+                }
+
+                int payloadSize = ByteBuffer.wrap(bytes, 4, 4).getInt();
+                if (!source.request(payloadSize)) {
+                    return;
+                }
+                byte[] payload = source.readByteArray(payloadSize);
+
+                resultCallback.onNext(new Frame(streamType, payload));
+            }
+        } catch (Exception e) {
+            resultCallback.onError(e);
+        }
+    }
+
+    private static StreamType streamType(byte streamType) {
+        switch (streamType) {
+            case 0:
+                return StreamType.STDIN;
+            case 1:
+                return StreamType.STDOUT;
+            case 2:
+                return StreamType.STDERR;
+            default:
+                return StreamType.RAW;
+        }
+    }
+}
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java
new file mode 100644
index 000000000..149816ad8
--- /dev/null
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java
@@ -0,0 +1,136 @@
+package com.github.dockerjava.okhttp;
+
+import com.sun.jna.platform.win32.Kernel32;
+
+import javax.net.SocketFactory;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.RandomAccessFile;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.SocketAddress;
+
+class NamedPipeSocketFactory extends SocketFactory {
+
+    final String socketFileName;
+
+    NamedPipeSocketFactory(String socketFileName) {
+        this.socketFileName = socketFileName;
+    }
+
+    @Override
+    public Socket createSocket() {
+        return new Socket() {
+
+            RandomAccessFile file;
+            InputStream is;
+            OutputStream os;
+
+            @Override
+            public void close() throws IOException {
+                if (file != null) {
+                    file.close();
+                    file = null;
+                }
+            }
+
+            @Override
+            public void connect(SocketAddress endpoint) {
+                connect(endpoint, 0);
+            }
+
+            @Override
+            public void connect(SocketAddress endpoint, int timeout) {
+                long startedAt = System.currentTimeMillis();
+                timeout = Math.max(timeout, 10_000);
+                while (true) {
+                    try {
+                        file = new RandomAccessFile(socketFileName, "rw");
+                        break;
+                    } catch (FileNotFoundException e) {
+                        if (System.currentTimeMillis() - startedAt >= timeout) {
+                            throw new RuntimeException(e);
+                        } else {
+                            Kernel32.INSTANCE.WaitNamedPipe(socketFileName, 100);
+                        }
+                    }
+                }
+
+                is = new InputStream() {
+                    @Override
+                    public int read(byte[] bytes, int off, int len) throws IOException {
+                        if (OkHttpInvocationBuilder.CLOSING.get()) {
+                            return 0;
+                        }
+                        return file.read(bytes, off, len);
+                    }
+
+                    @Override
+                    public int read() throws IOException {
+                        if (OkHttpInvocationBuilder.CLOSING.get()) {
+                            return 0;
+                        }
+                        return file.read();
+                    }
+
+                    @Override
+                    public int read(byte[] bytes) throws IOException {
+                        if (OkHttpInvocationBuilder.CLOSING.get()) {
+                            return 0;
+                        }
+                        return file.read(bytes);
+                    }
+                };
+
+                os = new OutputStream() {
+                    @Override
+                    public void write(byte[] bytes, int off, int len) throws IOException {
+                        file.write(bytes, off, len);
+                    }
+
+                    @Override
+                    public void write(int value) throws IOException {
+                        file.write(value);
+                    }
+
+                    @Override
+                    public void write(byte[] bytes) throws IOException {
+                        file.write(bytes);
+                    }
+                };
+            }
+
+            @Override
+            public InputStream getInputStream() {
+                return is;
+            }
+
+            @Override
+            public OutputStream getOutputStream() {
+                return os;
+            }
+        };
+    }
+
+    @Override
+    public Socket createSocket(String s, int i) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Socket createSocket(String s, int i, InetAddress inetAddress, int i1) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Socket createSocket(InetAddress inetAddress, int i) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Socket createSocket(InetAddress inetAddress, int i, InetAddress inetAddress1, int i1) {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
new file mode 100644
index 000000000..57bb072c2
--- /dev/null
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
@@ -0,0 +1,168 @@
+package com.github.dockerjava.okhttp;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.command.PingCmd;
+import com.github.dockerjava.core.AbstractDockerCmdExecFactory;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.SSLConfig;
+import com.github.dockerjava.core.WebTarget;
+import com.github.dockerjava.core.exec.PingCmdExec;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.MultimapBuilder;
+import okhttp3.ConnectionPool;
+import okhttp3.Dns;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import org.apache.commons.io.IOUtils;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.X509TrustManager;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.URI;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.X509Certificate;
+import java.util.Collections;
+import java.util.concurrent.TimeUnit;
+
+public class OkHttpDockerCmdExecFactory extends AbstractDockerCmdExecFactory {
+
+    private static final String SOCKET_SUFFIX = ".socket";
+
+    private ObjectMapper objectMapper;
+
+    private OkHttpClient okHttpClient;
+
+    private HttpUrl baseUrl;
+
+    @Override
+    public void init(DockerClientConfig dockerClientConfig) {
+        super.init(dockerClientConfig);
+
+        OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder()
+            .readTimeout(0, TimeUnit.SECONDS)
+            .retryOnConnectionFailure(true);
+
+        URI dockerHost = dockerClientConfig.getDockerHost();
+        switch (dockerHost.getScheme()) {
+            case "unix":
+            case "npipe":
+                String socketPath = dockerHost.getPath();
+
+                if ("unix".equals(dockerHost.getScheme())) {
+                    clientBuilder
+                        .socketFactory(new UnixSocketFactory(socketPath));
+                } else {
+                    clientBuilder
+                        .socketFactory(new NamedPipeSocketFactory(socketPath));
+                }
+
+                clientBuilder
+                    // Disable pooling
+                    .connectionPool(new ConnectionPool(0, 1, TimeUnit.SECONDS))
+                    .dns(hostname -> {
+                        if (hostname.endsWith(SOCKET_SUFFIX)) {
+                            return Collections.singletonList(InetAddress.getByAddress(hostname, new byte[]{0, 0, 0, 0}));
+                        } else {
+                            return Dns.SYSTEM.lookup(hostname);
+                        }
+                    });
+            default:
+        }
+
+        SSLConfig sslConfig = dockerClientConfig.getSSLConfig();
+        if (sslConfig != null) {
+            try {
+                SSLContext sslContext = sslConfig.getSSLContext();
+                if (sslContext != null) {
+                    clientBuilder
+                            .sslSocketFactory(sslContext.getSocketFactory(), new TrustAllX509TrustManager());
+                }
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        okHttpClient = clientBuilder.build();
+
+        HttpUrl.Builder baseUrlBuilder;
+
+        switch (dockerHost.getScheme()) {
+            case "unix":
+            case "npipe":
+                baseUrlBuilder = new HttpUrl.Builder()
+                    .scheme("http")
+                    .host("docker" + SOCKET_SUFFIX);
+                break;
+            case "tcp":
+                SSLContext sslContext;
+                try {
+                    sslContext = sslConfig.getSSLContext();
+                } catch (KeyManagementException | UnrecoverableKeyException | NoSuchAlgorithmException | KeyStoreException e) {
+                    throw new RuntimeException(e);
+                }
+                baseUrlBuilder = new HttpUrl.Builder()
+                    .scheme(sslConfig != null && sslContext != null ? "https" : "http")
+                    .host(dockerHost.getHost())
+                    .port(dockerHost.getPort());
+                break;
+            default:
+                baseUrlBuilder = HttpUrl.get(dockerHost.toString()).newBuilder();
+        }
+        baseUrl = baseUrlBuilder.build();
+
+        objectMapper = dockerClientConfig.getObjectMapper();
+    }
+
+    @Override
+    protected OkHttpWebTarget getBaseResource() {
+        return new OkHttpWebTarget(
+            objectMapper,
+            okHttpClient,
+            baseUrl,
+            ImmutableList.of(),
+            MultimapBuilder.hashKeys().hashSetValues().build()
+        );
+    }
+
+    @Override
+    public PingCmd.Exec createPingCmdExec() {
+        return new PingCmdExec(getBaseResource(), getDockerClientConfig()) {
+
+            @Override
+            protected Void execute(PingCmd command) {
+                WebTarget webResource = getBaseResource().path("/_ping");
+
+                // TODO contribute to docker-java, make it close the stream
+                IOUtils.closeQuietly(webResource.request().get());
+
+                return null;
+            }
+        };
+    }
+
+    @Override
+    public void close() throws IOException {
+
+    }
+
+    private static class TrustAllX509TrustManager implements X509TrustManager {
+        @Override
+        public void checkClientTrusted(X509Certificate[] x509Certificates, String s) {
+
+        }
+
+        @Override
+        public void checkServerTrusted(X509Certificate[] x509Certificates, String s) {
+
+        }
+
+        @Override
+        public X509Certificate[] getAcceptedIssuers() {
+            return new X509Certificate[0];
+        }
+    }
+}
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpInvocationBuilder.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpInvocationBuilder.java
new file mode 100644
index 000000000..31c45be23
--- /dev/null
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpInvocationBuilder.java
@@ -0,0 +1,372 @@
+package com.github.dockerjava.okhttp;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.exception.BadRequestException;
+import com.github.dockerjava.api.exception.ConflictException;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.InternalServerErrorException;
+import com.github.dockerjava.api.exception.NotAcceptableException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.exception.NotModifiedException;
+import com.github.dockerjava.api.exception.UnauthorizedException;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.InvocationBuilder;
+import okhttp3.HttpUrl;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okhttp3.internal.connection.RealConnection;
+import okio.BufferedSink;
+import okio.BufferedSource;
+import okio.Okio;
+import okio.Source;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.util.Objects;
+import java.util.function.Consumer;
+
+class OkHttpInvocationBuilder implements InvocationBuilder {
+
+    static final ThreadLocal<Boolean> CLOSING = ThreadLocal.withInitial(() -> false);
+
+    private final ObjectMapper objectMapper;
+
+    private final OkHttpClient okHttpClient;
+
+    private final Request.Builder requestBuilder;
+
+    OkHttpInvocationBuilder(ObjectMapper objectMapper, OkHttpClient okHttpClient, HttpUrl httpUrl) {
+        this.objectMapper = objectMapper;
+        this.okHttpClient = okHttpClient;
+
+        requestBuilder = new Request.Builder()
+            .url(httpUrl);
+    }
+
+    @Override
+    public OkHttpInvocationBuilder accept(com.github.dockerjava.core.MediaType mediaType) {
+        return header("accept", mediaType.getMediaType());
+    }
+
+    @Override
+    public OkHttpInvocationBuilder header(String name, String value) {
+        requestBuilder.header(name, value);
+        return this;
+    }
+
+    @Override
+    public void delete() {
+        Request request = requestBuilder
+            .delete()
+            .build();
+
+        execute(request).close();
+    }
+
+    @Override
+    public void get(ResultCallback<Frame> resultCallback) {
+        Request request = requestBuilder
+            .get()
+            .build();
+
+        executeAndStream(
+            request,
+            resultCallback,
+            new FramedSink(resultCallback)
+        );
+    }
+
+    @Override
+    public <T> T get(TypeReference<T> typeReference) {
+        try (InputStream inputStream = get()) {
+            return objectMapper.readValue(inputStream, typeReference);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public <T> void get(TypeReference<T> typeReference, ResultCallback<T> resultCallback) {
+        Request request = requestBuilder
+            .get()
+            .build();
+
+        executeAndStream(
+            request,
+            resultCallback,
+            new JsonSink<>(objectMapper, typeReference, resultCallback)
+        );
+    }
+
+    @Override
+    public InputStream post(Object entity) {
+        try {
+            Request request = requestBuilder
+                    .post(RequestBody.create(MediaType.parse("application/json"), objectMapper.writeValueAsBytes(entity)))
+                    .build();
+
+            return execute(request).body().byteStream();
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public <T> T post(Object entity, TypeReference<T> typeReference) {
+        try {
+            Request request = requestBuilder
+                    .post(RequestBody.create(MediaType.parse("application/json"), objectMapper.writeValueAsBytes(entity)))
+                    .build();
+
+            try (Response response = execute(request)) {
+                String inputStream = response.body().string();
+                return objectMapper.readValue(inputStream, typeReference);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public <T> void post(Object entity, TypeReference<T> typeReference, ResultCallback<T> resultCallback) {
+        try {
+            post(typeReference, resultCallback, new ByteArrayInputStream(objectMapper.writeValueAsBytes(entity)));
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public <T> T post(TypeReference<T> typeReference, InputStream body) {
+        try (InputStream inputStream = post(body)) {
+            return objectMapper.readValue(inputStream, typeReference);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void post(Object entity, InputStream stdin, ResultCallback<Frame> resultCallback) {
+        final Request request;
+        try {
+            request = requestBuilder
+                .post(RequestBody.create(MediaType.parse("application/json"), objectMapper.writeValueAsBytes(entity)))
+                .build();
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+
+        OkHttpClient clientToUse = this.okHttpClient;
+
+        if (stdin != null) {
+            // FIXME there must be a better way of handling it
+            clientToUse = clientToUse.newBuilder()
+                .addNetworkInterceptor(chain -> {
+                    Response response = chain.proceed(chain.request());
+                    if (response.isSuccessful()) {
+                        Thread thread = new Thread(() -> {
+                            try {
+                                Field sinkField = RealConnection.class.getDeclaredField("sink");
+                                sinkField.setAccessible(true);
+
+                                try (
+                                        BufferedSink sink = (BufferedSink) sinkField.get(chain.connection());
+                                        Source source = Okio.source(stdin);
+                                ) {
+                                    while (sink.isOpen()) {
+                                        int available = stdin.available();
+                                        if (available > 0) {
+                                            sink.write(source, available);
+                                            sink.emit();
+                                        }
+                                    }
+                                }
+                            } catch (Exception e) {
+                                throw new RuntimeException(e);
+                            }
+                        });
+                        thread.start();
+                    }
+                    return response;
+                })
+                .build();
+        }
+
+        executeAndStream(
+            clientToUse,
+            request,
+            resultCallback,
+            new FramedSink(resultCallback)
+        );
+    }
+
+    @Override
+    public <T> void post(TypeReference<T> typeReference, ResultCallback<T> resultCallback, InputStream body) {
+        Request request = requestBuilder
+            .post(toRequestBody(body, null))
+            .build();
+
+        executeAndStream(
+            request,
+            resultCallback,
+            new JsonSink<>(objectMapper, typeReference, resultCallback)
+        );
+    }
+
+    @Override
+    public void postStream(InputStream body) {
+        Request request = requestBuilder
+            .post(toRequestBody(body, null))
+            .build();
+
+        execute(request).close();
+    }
+
+    @Override
+    public InputStream get() {
+        Request request = requestBuilder
+            .get()
+            .build();
+
+        return execute(request).body().byteStream();
+    }
+
+    @Override
+    public void put(InputStream body, com.github.dockerjava.core.MediaType mediaType) {
+        Request request = requestBuilder
+            .put(toRequestBody(body, mediaType.toString()))
+            .build();
+
+        execute(request).close();
+    }
+
+    protected RequestBody toRequestBody(InputStream body, String mediaType) {
+        return new RequestBody() {
+            @Override
+            public MediaType contentType() {
+                if (mediaType == null) {
+                    return null;
+                }
+                return MediaType.parse(mediaType);
+            }
+
+            @Override
+            public void writeTo(BufferedSink sink) throws IOException {
+                try (Source source = Okio.source(body)) {
+                    sink.writeAll(source);
+                }
+            }
+        };
+    }
+
+    protected Response execute(Request request) {
+        return execute(okHttpClient, request);
+    }
+
+    protected Response execute(OkHttpClient okHttpClient, Request request) {
+        try {
+            Response response = okHttpClient.newCall(request).execute();
+            if (!response.isSuccessful()) {
+                String body = response.body().string();
+                switch (response.code()) {
+                    case 304:
+                        throw new NotModifiedException(body);
+                    case 400:
+                        throw new BadRequestException(body);
+                    case 401:
+                        throw new UnauthorizedException(body);
+                    case 404:
+                        throw new NotFoundException(body);
+                    case 406:
+                        throw new NotAcceptableException(body);
+                    case 409:
+                        throw new ConflictException(body);
+                    case 500:
+                        throw new InternalServerErrorException(body);
+                    default:
+                        throw new DockerException(body, response.code());
+                }
+            } else {
+                return response;
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    protected <T> void executeAndStream(Request request, ResultCallback<T> callback, Consumer<BufferedSource> sourceConsumer) {
+        executeAndStream(okHttpClient, request, callback, sourceConsumer);
+    }
+
+    protected <T> void executeAndStream(
+            OkHttpClient okHttpClient,
+            Request request,
+            ResultCallback<T> callback,
+            Consumer<BufferedSource> sourceConsumer
+    ) {
+        Thread thread = new Thread(() -> {
+            try (
+                    Response response = execute(okHttpClient, request.newBuilder().tag("streaming").build());
+                    BufferedSource source = response.body().source();
+            ) {
+                callback.onStart(() -> {
+                    boolean previous = CLOSING.get();
+                    CLOSING.set(true);
+                    try {
+                        response.close();
+                    } finally {
+                        CLOSING.set(previous);
+                    }
+                });
+
+                sourceConsumer.accept(source);
+                callback.onComplete();
+            } catch (Exception e) {
+                callback.onError(e);
+            }
+        }, "tc-okhttp-stream-" + Objects.hashCode(request));
+        thread.setDaemon(true);
+
+        thread.start();
+    }
+
+    private static class JsonSink<T> implements Consumer<BufferedSource> {
+
+        private final ObjectMapper objectMapper;
+
+        private final TypeReference<T> typeReference;
+
+        private final ResultCallback<T> resultCallback;
+
+        JsonSink(ObjectMapper objectMapper, TypeReference<T> typeReference, ResultCallback<T> resultCallback) {
+            this.objectMapper = objectMapper;
+            this.typeReference = typeReference;
+            this.resultCallback = resultCallback;
+        }
+
+        @Override
+        public void accept(BufferedSource source) {
+            try {
+                while (true) {
+                    String line = source.readUtf8Line();
+                    if (line == null) {
+                        break;
+                    }
+
+                    resultCallback.onNext(objectMapper.readValue(line, typeReference));
+                }
+            } catch (Exception e) {
+                resultCallback.onError(e);
+            }
+        }
+    }
+
+}
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpWebTarget.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpWebTarget.java
new file mode 100644
index 000000000..e90012f8d
--- /dev/null
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpWebTarget.java
@@ -0,0 +1,148 @@
+package com.github.dockerjava.okhttp;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.core.InvocationBuilder;
+import com.github.dockerjava.core.WebTarget;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.SetMultimap;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import org.apache.commons.lang.StringUtils;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+class OkHttpWebTarget implements WebTarget {
+
+    final ObjectMapper objectMapper;
+
+    final OkHttpClient okHttpClient;
+
+    final HttpUrl baseUrl;
+
+    final ImmutableList<String> path;
+
+    final SetMultimap<String, String> queryParams;
+
+    OkHttpWebTarget(
+            ObjectMapper objectMapper,
+            OkHttpClient okHttpClient,
+            HttpUrl baseUrl,
+            ImmutableList<String> path,
+            SetMultimap<String, String> queryParams
+    ) {
+        this.objectMapper = objectMapper;
+        this.okHttpClient = okHttpClient;
+        this.baseUrl = baseUrl;
+        this.path = path;
+        this.queryParams = queryParams;
+    }
+
+    @Override
+    public InvocationBuilder request() {
+        String resource = StringUtils.join(path, "/");
+
+        if (!resource.startsWith("/")) {
+            resource = "/" + resource;
+        }
+
+        HttpUrl.Builder baseUrlBuilder = baseUrl.newBuilder()
+            .encodedPath(resource);
+
+        for (Map.Entry<String, Collection<String>> queryParamEntry : queryParams.asMap().entrySet()) {
+            String key = queryParamEntry.getKey();
+            for (String paramValue : queryParamEntry.getValue()) {
+                baseUrlBuilder.addQueryParameter(key, paramValue);
+            }
+        }
+
+        return new OkHttpInvocationBuilder(
+            objectMapper,
+            okHttpClient,
+            baseUrlBuilder.build()
+        );
+    }
+
+    @Override
+    public OkHttpWebTarget path(String... components) {
+        ImmutableList<String> newPath = ImmutableList.<String>builder()
+                .addAll(path)
+                .add(components)
+                .build();
+        return new OkHttpWebTarget(
+                objectMapper,
+                okHttpClient,
+                baseUrl,
+                newPath,
+                queryParams
+        );
+    }
+
+    @Override
+    public OkHttpWebTarget resolveTemplate(String name, Object value) {
+        ImmutableList.Builder<String> newPath = ImmutableList.builder();
+        for (String component : path) {
+            component = component.replaceAll("\\{" + name + "\\}", value.toString());
+            newPath.add(component);
+        }
+
+        return new OkHttpWebTarget(
+                objectMapper,
+                okHttpClient,
+                baseUrl,
+                newPath.build(),
+                queryParams
+        );
+    }
+
+    @Override
+    public OkHttpWebTarget queryParam(String name, Object value) {
+        if (value == null) {
+            return this;
+        }
+
+        SetMultimap<String, String> newQueryParams = HashMultimap.create(queryParams);
+        newQueryParams.put(name, value.toString());
+
+        return new OkHttpWebTarget(
+                objectMapper,
+                okHttpClient,
+                baseUrl,
+                path,
+                newQueryParams
+        );
+    }
+
+    @Override
+    public OkHttpWebTarget queryParamsSet(String name, Set<?> values) {
+        SetMultimap<String, String> newQueryParams = HashMultimap.create(queryParams);
+        newQueryParams.replaceValues(name, values.stream().filter(Objects::nonNull).map(Object::toString).collect(Collectors.toSet()));
+
+        return new OkHttpWebTarget(
+                objectMapper,
+                okHttpClient,
+                baseUrl,
+                path,
+                newQueryParams
+        );
+    }
+
+    @Override
+    public OkHttpWebTarget queryParamsJsonMap(String name, Map<String, String> values) {
+        if (values == null || values.isEmpty()) {
+            return this;
+        }
+
+        // when param value is JSON string
+        try {
+            return queryParam(name, objectMapper.writeValueAsString(values));
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java
new file mode 100644
index 000000000..e2f1002d7
--- /dev/null
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java
@@ -0,0 +1,314 @@
+/*
+ *
+ * MariaDB Client for Java
+ *
+ * Copyright (c) 2012-2014 Monty Program Ab.
+ * Copyright (c) 2015-2019 MariaDB Ab.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with this library; if not, write to Monty Program Ab info@montyprogram.com.
+ *
+ * This particular MariaDB Client for Java file is work
+ * derived from a Drizzle-JDBC. Drizzle-JDBC file which is covered by subject to
+ * the following copyright and notice provisions:
+ *
+ * Copyright (c) 2009-2011, Marcus Eriksson
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this list
+ * of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice, this
+ * list of conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.
+ *
+ * Neither the name of the driver nor the names of its contributors may not be
+ * used to endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS  AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ */
+
+package com.github.dockerjava.okhttp;
+
+import com.sun.jna.LastErrorException;
+import com.sun.jna.Native;
+import com.sun.jna.Platform;
+import com.sun.jna.Structure;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+class UnixDomainSocket extends Socket {
+
+    private static final int AF_UNIX = 1;
+    private static final int SOCK_STREAM = Platform.isSolaris() ? 2 : 1;
+    private static final int PROTOCOL = 0;
+
+    static {
+        if (Platform.isSolaris()) {
+            System.loadLibrary("nsl");
+            System.loadLibrary("socket");
+        }
+        if (!Platform.isWindows() && !Platform.isWindowsCE()) {
+            Native.register("c");
+        }
+    }
+
+    private final AtomicBoolean closeLock = new AtomicBoolean();
+    private final SockAddr sockaddr;
+    private final int fd;
+    private InputStream is;
+    private OutputStream os;
+    private boolean connected;
+
+    UnixDomainSocket(String path) throws IOException {
+        if (Platform.isWindows() || Platform.isWindowsCE()) {
+            throw new IOException("Unix domain sockets are not supported on Windows");
+        }
+        sockaddr = new SockAddr(path);
+        closeLock.set(false);
+        try {
+            fd = socket(AF_UNIX, SOCK_STREAM, PROTOCOL);
+        } catch (LastErrorException lee) {
+            throw new IOException("native socket() failed : " + formatError(lee));
+        }
+    }
+
+    public static native int socket(int domain, int type, int protocol) throws LastErrorException;
+
+    public static native int connect(int sockfd, SockAddr sockaddr, int addrlen)
+            throws LastErrorException;
+
+    public static native int recv(int fd, byte[] buffer, int count, int flags)
+            throws LastErrorException;
+
+    public static native int send(int fd, byte[] buffer, int count, int flags)
+            throws LastErrorException;
+
+    public static native int close(int fd) throws LastErrorException;
+
+    public static native String strerror(int errno);
+
+    private static String formatError(LastErrorException lee) {
+        try {
+            return strerror(lee.getErrorCode());
+        } catch (Throwable t) {
+            return lee.getMessage();
+        }
+    }
+
+    @Override
+    public boolean isConnected() {
+        return connected;
+    }
+
+    @Override
+    public void close() throws IOException {
+        if (!closeLock.getAndSet(true)) {
+            try {
+                close(fd);
+            } catch (LastErrorException lee) {
+                throw new IOException("native close() failed : " + formatError(lee));
+            }
+            connected = false;
+        }
+    }
+
+    @Override
+    public void connect(SocketAddress endpoint) throws IOException {
+        connect(endpoint, 0);
+    }
+
+    public void connect(SocketAddress endpoint, int timeout) throws IOException {
+        try {
+            int ret = connect(fd, sockaddr, sockaddr.size());
+            if (ret != 0) {
+                throw new IOException(strerror(Native.getLastError()));
+            }
+            connected = true;
+        } catch (LastErrorException lee) {
+            throw new IOException("native connect() failed : " + formatError(lee));
+        }
+        is = new UnixSocketInputStream();
+        os = new UnixSocketOutputStream();
+    }
+
+    public InputStream getInputStream() {
+        return is;
+    }
+
+    public OutputStream getOutputStream() {
+        return os;
+    }
+
+    public void setTcpNoDelay(boolean b) {
+        // do nothing
+    }
+
+    public void setKeepAlive(boolean b) {
+        // do nothing
+    }
+
+    public void setReceiveBufferSize(int size) {
+        // do nothing
+    }
+
+    public void setSendBufferSize(int size) {
+        // do nothing
+    }
+
+    public void setSoLinger(boolean b, int i) {
+        // do nothing
+    }
+
+    public void setSoTimeout(int timeout) {
+        // do nothing
+    }
+
+    public void shutdownInput() {
+        // do nothing
+    }
+
+    public void shutdownOutput() {
+        // do nothing
+    }
+
+    public static class SockAddr extends Structure {
+
+        @SuppressWarnings("checkstyle:membername")
+        public short sun_family;
+        @SuppressWarnings("checkstyle:membername")
+        public byte[] sun_path;
+
+        /**
+         * Contructor.
+         *
+         * @param sunPath path
+         */
+        SockAddr(String sunPath) {
+            sun_family = AF_UNIX;
+            byte[] arr = sunPath.getBytes();
+            sun_path = new byte[arr.length + 1];
+            System.arraycopy(arr, 0, sun_path, 0, Math.min(sun_path.length - 1, arr.length));
+            allocateMemory();
+        }
+
+        @Override
+        protected java.util.List<String> getFieldOrder() {
+            return Arrays.asList("sun_family", "sun_path");
+        }
+    }
+
+    class UnixSocketInputStream extends InputStream {
+
+        @Override
+        public int read(byte[] bytesEntry, int off, int len) throws IOException {
+            try {
+                if (off > 0) {
+                    int bytes = 0;
+                    int remainingLength = len;
+                    int size;
+                    byte[] data = new byte[(len < 10240) ? len : 10240];
+                    do {
+                        size = recv(fd, data, (remainingLength < 10240) ? remainingLength : 10240, 0);
+                        if (size > 0) {
+                            System.arraycopy(data, 0, bytesEntry, off, size);
+                            bytes += size;
+                            off += size;
+                            remainingLength -= size;
+                        }
+                    } while ((remainingLength > 0) && (size > 0));
+                    return bytes;
+                } else {
+                    return recv(fd, bytesEntry, len, 0);
+                }
+            } catch (LastErrorException lee) {
+                throw new IOException("native read() failed : " + formatError(lee));
+            }
+        }
+
+        @Override
+        public int read() throws IOException {
+            byte[] bytes = new byte[1];
+            int bytesRead = read(bytes);
+            if (bytesRead == 0) {
+                return -1;
+            }
+            return bytes[0] & 0xff;
+        }
+
+        @Override
+        public int read(byte[] bytes) throws IOException {
+            return read(bytes, 0, bytes.length);
+        }
+    }
+
+    class UnixSocketOutputStream extends OutputStream {
+
+        @Override
+        public void write(byte[] bytesEntry, int off, int len) throws IOException {
+            int bytes;
+            try {
+                if (off > 0) {
+                    int size;
+                    int remainingLength = len;
+                    byte[] data = new byte[(len < 10240) ? len : 10240];
+                    do {
+                        size = (remainingLength < 10240) ? remainingLength : 10240;
+                        System.arraycopy(bytesEntry, off, data, 0, size);
+                        bytes = send(fd, data, size, 0);
+                        if (bytes > 0) {
+                            off += bytes;
+                            remainingLength -= bytes;
+                        }
+                    } while ((remainingLength > 0) && (bytes > 0));
+                } else {
+                    bytes = send(fd, bytesEntry, len, 0);
+                }
+
+                if (bytes != len) {
+                    throw new IOException("can't write " + len + "bytes");
+                }
+            } catch (LastErrorException lee) {
+                throw new IOException("native write() failed : " + formatError(lee));
+            }
+        }
+
+        @Override
+        public void write(int value) throws IOException {
+            write(new byte[] {(byte) value});
+        }
+
+        @Override
+        public void write(byte[] bytes) throws IOException {
+            write(bytes, 0, bytes.length);
+        }
+    }
+}
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java
new file mode 100644
index 000000000..a32c28845
--- /dev/null
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java
@@ -0,0 +1,88 @@
+package com.github.dockerjava.okhttp;
+
+import javax.net.SocketFactory;
+import java.io.FilterInputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.SocketAddress;
+
+class UnixSocketFactory extends SocketFactory {
+
+    private final String socketPath;
+
+    UnixSocketFactory(String socketPath) {
+        this.socketPath = socketPath;
+    }
+
+    @Override
+    public Socket createSocket() {
+        try {
+            return new UnixDomainSocket(socketPath) {
+                @Override
+                public void connect(SocketAddress endpoint, int timeout) throws IOException {
+                    super.connect(endpoint, timeout);
+                }
+
+                @Override
+                public InputStream getInputStream() {
+                    return new FilterInputStream(super.getInputStream()) {
+                        @Override
+                        public void close() throws IOException {
+                            shutdownInput();
+                        }
+
+                        @Override
+                        public int read(byte[] b, int off, int len) throws IOException {
+                            if (OkHttpInvocationBuilder.CLOSING.get()) {
+                                return 0;
+                            }
+                            return super.read(b, off, len);
+                        }
+                    };
+                }
+
+                @Override
+                public OutputStream getOutputStream() {
+                    return new FilterOutputStream(super.getOutputStream()) {
+
+                        @Override
+                        public void write(byte[] b, int off, int len) throws IOException {
+                            out.write(b, off, len);
+                        }
+
+                        @Override
+                        public void close() throws IOException {
+                            shutdownOutput();
+                        }
+                    };
+                }
+            };
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public Socket createSocket(String s, int i) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Socket createSocket(String s, int i, InetAddress inetAddress, int i1) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Socket createSocket(InetAddress inetAddress, int i) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Socket createSocket(InetAddress inetAddress, int i, InetAddress inetAddress1, int i1) {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 13b44f68b..75ea6ac52 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -39,6 +39,12 @@
 		</dependency>
 
 		<!-- /// Test /////////////////////////// -->
+		<dependency>
+			<groupId>${groupId}</groupId>
+			<artifactId>docker-java-transport-okhttp</artifactId>
+			<version>${version}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-core</artifactId>
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
index ba0128b78..fa62d778b 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
@@ -6,6 +6,7 @@
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.StreamType;
 import com.github.dockerjava.core.command.AttachContainerResultCallback;
+import org.junit.Assume;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -32,7 +33,6 @@
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeThat;
 
 /**
  * @author Kanstantsin Shautsou
@@ -48,7 +48,7 @@ public class AttachContainerCmdIT extends CmdIT {
     public void attachContainerWithStdin() throws Exception {
         DockerClient dockerClient = dockerRule.getClient();
 
-        assumeThat(getFactoryType(), is(FactoryType.NETTY));
+        Assume.assumeTrue("supports stdin attach", getFactoryType().supportsStdinAttach());
 
         String snippet = "hello world";
 
@@ -172,9 +172,8 @@ public void onNext(Frame frame) {
     public void attachContainerStdinUnsupported() throws Exception {
 
         DockerClient dockerClient = dockerRule.getClient();
-        if (getFactoryType() == FactoryType.JERSEY) {
-            expectedException.expect(UnsupportedOperationException.class);
-        }
+        Assume.assumeFalse("does not support stdin attach", getFactoryType().supportsStdinAttach());
+        expectedException.expect(UnsupportedOperationException.class);
 
         String snippet = "hello world";
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
index 1a74a0a63..674be99fd 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
@@ -1,7 +1,11 @@
 package com.github.dockerjava.cmd;
 
+import com.github.dockerjava.api.command.DockerCmdExecFactory;
+import com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory;
 import com.github.dockerjava.junit.DockerRule;
 import com.github.dockerjava.junit.category.Integration;
+import com.github.dockerjava.netty.NettyDockerCmdExecFactory;
+import com.github.dockerjava.okhttp.OkHttpDockerCmdExecFactory;
 import org.junit.Rule;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
@@ -11,6 +15,7 @@
 
 import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY;
 import static com.github.dockerjava.cmd.CmdIT.FactoryType.NETTY;
+import static com.github.dockerjava.cmd.CmdIT.FactoryType.OKHTTP;
 
 /**
  * @author Kanstantsin Shautsou
@@ -19,13 +24,48 @@
 @RunWith(Parameterized.class)
 public abstract class CmdIT {
     public enum FactoryType {
-        NETTY, JERSEY
+        NETTY(true) {
+            @Override
+            public DockerCmdExecFactory createExecFactory() {
+                return new NettyDockerCmdExecFactory().withConnectTimeout(10 * 1000);
+            }
+        },
+        JERSEY(false) {
+            @Override
+            public DockerCmdExecFactory createExecFactory() {
+                return new JerseyDockerCmdExecFactory().withConnectTimeout(10 * 1000);
+            }
+        },
+        OKHTTP(true) {
+            @Override
+            public DockerCmdExecFactory createExecFactory() {
+                return new OkHttpDockerCmdExecFactory();
+            }
+        };
+
+        private final String subnetPrefix;
+        private final boolean supportsStdinAttach;
+
+        FactoryType(boolean supportsStdinAttach) {
+            this.subnetPrefix = "10." + (100 + ordinal()) + ".";
+            this.supportsStdinAttach = supportsStdinAttach;
+        }
+
+        public String getSubnetPrefix() {
+            return subnetPrefix;
+        }
+
+        public boolean supportsStdinAttach() {
+            return supportsStdinAttach;
+        }
+
+        public abstract DockerCmdExecFactory createExecFactory();
     }
 
     @Parameterized.Parameters(name = "{index}:{0}")
     public static Iterable<FactoryType> data() {
         return Arrays.asList(
-                NETTY, JERSEY
+                NETTY, JERSEY, OKHTTP
         );
     }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java
index ed235fb8c..6c8c2573e 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java
@@ -9,7 +9,6 @@
 import net.jcip.annotations.ThreadSafe;
 import org.junit.Test;
 
-import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY;
 import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
 import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
 import static org.hamcrest.Matchers.hasItem;
@@ -49,7 +48,7 @@ public void connectToNetwork() throws InterruptedException {
     public void connectToNetworkWithContainerNetwork() throws InterruptedException {
         assumeNotSwarm("no network in swarm", dockerRule);
 
-        final String subnetPrefix = getFactoryType() == JERSEY ?  "10.100.102" : "10.100.103";
+        final String subnetPrefix = getFactoryType().getSubnetPrefix() + "100";
         final String networkName = "ContainerWithNetwork" + dockerRule.getKind();
         final String containerIp = subnetPrefix + ".100";
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java
index ce800d61a..f04823ec0 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java
@@ -43,8 +43,6 @@ public void copyFromContainer() throws Exception {
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
         InputStream response = dockerRule.getClient().copyArchiveFromContainerCmd(container.getId(), "/copyFromContainer").exec();
-        Boolean bytesAvailable = response.available() > 0;
-        assertTrue("The file was not copied from the container.", bytesAvailable );
 
         // read the stream fully. Otherwise, the underlying stream will not be closed.
         String responseAsString = TestUtils.asString(response);
@@ -76,8 +74,6 @@ public void copyFromContainerBinaryFile() throws Exception {
         }
 
         InputStream response = dockerRule.getClient().copyArchiveFromContainerCmd(container.getId(), "/binary.dat").exec();
-        Boolean bytesAvailable = response.available() > 0;
-        assertTrue("The file was not copied from the container.", bytesAvailable);
 
         try (TarArchiveInputStream tarInputStream = new TarArchiveInputStream(response)) {
             TarArchiveEntry nextTarEntry = tarInputStream.getNextTarEntry();
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
index a061cc5cd..3adfe0514 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
@@ -72,7 +72,7 @@ private CreateContainerResponse prepareContainerForCopy(String method) {
 
     private void assertFileCopied(CreateContainerResponse container) throws IOException {
         try (InputStream response = dockerRule.getClient().copyArchiveFromContainerCmd(container.getId(), "testReadFile").exec()) {
-            boolean bytesAvailable = response.available() > 0;
+            boolean bytesAvailable = response.read() != -1;
             assertTrue( "The file was not copied to the container.", bytesAvailable);
         }
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java
index b2f033cd9..ffef0d38a 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java
@@ -43,8 +43,6 @@ public void copyFromContainer() throws Exception {
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
         InputStream response = dockerRule.getClient().copyFileFromContainerCmd(container.getId(), "/copyFileFromContainer").exec();
-        Boolean bytesAvailable = response.available() > 0;
-        assertTrue("The file was not copied from the container.", bytesAvailable );
 
         // read the stream fully. Otherwise, the underlying stream will not be closed.
         String responseAsString = asString(response);
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index d0e9c914b..22ce9d7a8 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -49,7 +49,6 @@
 import static com.github.dockerjava.api.model.Capability.MKNOD;
 import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
 import static com.github.dockerjava.api.model.HostConfig.newHostConfig;
-import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_23;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24;
 import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
@@ -483,7 +482,7 @@ public void createContainerWithLinkInCustomNetwork() throws DockerException {
     public void createContainerWithCustomIp() throws DockerException {
         String containerName1 = "containerCustomIplink_" + dockerRule.getKind();
         String networkName = "customIpNet" + dockerRule.getKind();
-        String subnetPrefix = getFactoryType() == JERSEY ? "10.100.104" : "10.100.105";
+        String subnetPrefix = getFactoryType().getSubnetPrefix() + "101";
 
         CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd()
                 .withIpam(new Network.Ipam()
@@ -646,7 +645,7 @@ public void createContainerWithDevices() throws DockerException {
 
     @Test
     public void createContainerWithPortBindings() throws DockerException {
-        int baseport = getFactoryType() == FactoryType.JERSEY ? 11000 : 12000;
+        int baseport = 10_000 + (getFactoryType().ordinal() * 1000);
 
         ExposedPort tcp22 = ExposedPort.tcp(22);
         ExposedPort tcp23 = ExposedPort.tcp(23);
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
index a4d251c32..d18d3d747 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
@@ -44,7 +44,7 @@ public void createNetworkWithIpamConfig() throws DockerException {
         assumeNotSwarm("no network in swarm", dockerRule);
 
         String networkName = "networkIpam" + dockerRule.getKind();
-        String subnet = getFactoryType() == FactoryType.JERSEY ? "10.67.79.0/24" : "10.67.90.0/24";
+        String subnet = "10.67." + (79 + getFactoryType().ordinal()) + ".0/24";
 
         Network.Ipam ipam = new Network.Ipam().withConfig(new Network.Ipam.Config().withSubnet(subnet));
         CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd().withName(networkName).withIpam(ipam).exec();
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java
index feec37155..e5bb76354 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java
@@ -45,8 +45,6 @@ public void execStart() throws Exception {
                 .awaitCompletion();
 
         InputStream response = dockerRule.getClient().copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec();
-        Boolean bytesAvailable = response.available() > 0;
-        assertTrue("The file was not copied from the container.", bytesAvailable);
 
         // read the stream fully. Otherwise, the underlying stream will not be closed.
         String responseAsString = asString(response);
@@ -71,8 +69,6 @@ public void execStartAttached() throws Exception {
                 .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
 
         InputStream response = dockerRule.getClient().copyArchiveFromContainerCmd(container.getId(), "/execStartTest.log").exec();
-        Boolean bytesAvailable = response.available() > 0;
-        assertTrue( "The file was not copied from the container.", bytesAvailable);
 
         // read the stream fully. Otherwise, the underlying stream will not be closed.
         String responseAsString = asString(response);
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java
index a9ba8ac25..ab2f3aca9 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java
@@ -8,7 +8,7 @@
 import java.io.InputStream;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.not;
 
 public class SaveImageCmdIT extends CmdIT {
     public static final Logger LOG = LoggerFactory.getLogger(SaveImageCmdIT.class);
@@ -17,10 +17,10 @@ public class SaveImageCmdIT extends CmdIT {
     public void saveImage() throws Exception {
 
         InputStream image = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImageCmd("busybox").exec());
-        assertThat(image.available(), greaterThan(0));
+        assertThat(image.read(), not(-1));
 
         InputStream image2 = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImageCmd("busybox").withTag("latest").exec());
-        assertThat(image2.available(), greaterThan(0));
+        assertThat(image2.read(), not(-1));
 
 
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
index b0c6508a6..0494f2a87 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
@@ -172,7 +172,7 @@ public void startContainerWithDnsSearch() throws DockerException {
 
     @Test
     public void startContainerWithPortBindings() throws DockerException {
-        int baseport = getFactoryType() == FactoryType.JERSEY ? 13000 : 14000;
+        int baseport = 20_000 + (getFactoryType().ordinal() * 1000);
 
         ExposedPort tcp22 = ExposedPort.tcp(22);
         ExposedPort tcp23 = ExposedPort.tcp(23);
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
index da0dafb1f..891f5f267 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
@@ -13,10 +13,8 @@
 import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.core.DockerClientBuilder;
 import com.github.dockerjava.core.command.PullImageResultCallback;
-import com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory;
 import com.github.dockerjava.junit.category.Integration;
 import com.github.dockerjava.junit.category.SwarmModeIntegration;
-import com.github.dockerjava.netty.NettyDockerCmdExecFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.experimental.categories.Category;
@@ -121,7 +119,7 @@ private DockerClient initializeDockerClient(int port) {
                 .withRegistryUrl("https://index.docker.io/v1/")
                 .withDockerHost("tcp://localhost:" + port).build();
         return DockerClientBuilder.getInstance(config)
-                .withDockerCmdExecFactory(getFactoryType() == FactoryType.NETTY ? new NettyDockerCmdExecFactory() : new JerseyDockerCmdExecFactory())
+                .withDockerCmdExecFactory(getFactoryType().createExecFactory())
                 .build();
     }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java
index c178700cc..41bb3f076 100644
--- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java
+++ b/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java
@@ -7,8 +7,6 @@
 import com.github.dockerjava.core.DockerClientBuilder;
 import com.github.dockerjava.core.command.BuildImageResultCallback;
 import com.github.dockerjava.core.command.PullImageResultCallback;
-import com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory;
-import com.github.dockerjava.netty.NettyDockerCmdExecFactory;
 import com.github.dockerjava.utils.LogContainerTestCallback;
 import org.junit.rules.ExternalResource;
 import org.junit.runner.Description;
@@ -18,9 +16,6 @@
 
 import java.io.File;
 
-import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY;
-import static com.github.dockerjava.cmd.CmdIT.FactoryType.NETTY;
-
 /**
  * @author Kanstantsin Shautsou
  */
@@ -28,8 +23,7 @@ public class DockerRule extends ExternalResource {
     public static final Logger LOG = LoggerFactory.getLogger(DockerRule.class);
     public static final String DEFAULT_IMAGE = "busybox:latest";
 
-    private DockerClient nettyClient;
-    private DockerClient jerseyClient;
+    private DockerClient dockerClient;
 
     private CmdIT cmdIT;
 
@@ -39,26 +33,12 @@ public DockerRule(CmdIT cmdIT) {
 
 
     public DockerClient getClient() {
-        if (cmdIT.getFactoryType() == NETTY) {
-            if (nettyClient == null) {
-                nettyClient = DockerClientBuilder.getInstance(config())
-                        .withDockerCmdExecFactory((new NettyDockerCmdExecFactory())
-                                .withConnectTimeout(10 * 1000))
-                        .build();
-            }
-
-            return nettyClient;
-        } else if (cmdIT.getFactoryType() == JERSEY) {
-            if (jerseyClient == null) {
-                jerseyClient = DockerClientBuilder.getInstance(config())
-                        .withDockerCmdExecFactory((new JerseyDockerCmdExecFactory())
-                                .withConnectTimeout(10 * 1000))
-                        .build();
-            }
-            return jerseyClient;
+        if (dockerClient != null) {
+            return dockerClient;
         }
-
-        throw new IllegalStateException("Why factory type is not set?");
+        return dockerClient = DockerClientBuilder.getInstance(config())
+                .withDockerCmdExecFactory(cmdIT.getFactoryType().createExecFactory())
+                .build();
     }
 
     @Override
@@ -122,13 +102,7 @@ public String containerLog(String containerId) throws Exception {
     }
 
     public String getKind() {
-        if (cmdIT.getFactoryType() == NETTY) {
-            return "netty";
-        } else if (cmdIT.getFactoryType() == JERSEY) {
-            return "jersey";
-        }
-
-        return "default";
+        return cmdIT.getFactoryType().name().toLowerCase();
     }
 
     public void ensureContainerRemoved(String container1Name) {
diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
index 57913313f..9433f97d6 100644
--- a/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
@@ -93,7 +93,7 @@ public void testCloseResponseStreamOnWrite() throws Exception {
         });
 
         firstWrite.await();
-        assertTrue(inputStream.available() > 0);
+        assertTrue(inputStream.read() != -1);
 
         // second write should have started
         Thread.sleep(500L);
diff --git a/pom.xml b/pom.xml
index a5a4fb3d3..456403b57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,6 +95,7 @@
 		<module>docker-java-core</module>
 		<module>docker-java-transport-netty</module>
 		<module>docker-java-transport-jersey</module>
+		<module>docker-java-transport-okhttp</module>
 		<module>docker-java</module>
 	</modules>
 

From 93202d1ace3813ea4333984103f52bcef13e5c17 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Mon, 9 Dec 2019 16:27:17 +0100
Subject: [PATCH 0954/1272] Try to stabilize tests (#1285)

- perform cleanup after each test
- Remove `RegistryUtils`, introduce `PrivateRegistryRule`
- Do not trim stacktraces
- Fix the OkHttp SSL support
- Improve `attachContainerClosesStdoutWhenContainerExits`
- Close DockerClient to avoid leaks
---
 .../github/dockerjava/okhttp/FramedSink.java  |  10 +-
 .../okhttp/OkHttpDockerCmdExecFactory.java    |  22 +-
 docker-java/pom.xml                           |   2 +
 .../dockerjava/cmd/AttachContainerCmdIT.java  |  76 ++-
 .../dockerjava/cmd/BuildImageCmdIT.java       |   8 +-
 .../java/com/github/dockerjava/cmd/CmdIT.java |   8 +-
 .../dockerjava/cmd/CreateContainerCmdIT.java  |  14 +-
 .../github/dockerjava/cmd/PullImageCmdIT.java |  30 +-
 .../github/dockerjava/cmd/PushImageCmdIT.java |  14 +-
 .../junit/DockerCmdExecFactoryDelegate.java   | 455 ++++++++++++++++++
 .../github/dockerjava/junit/DockerRule.java   |  94 +++-
 .../dockerjava/junit/PrivateRegistryRule.java | 120 +++++
 .../dockerjava/utils/RegistryUtils.java       | 119 -----
 13 files changed, 754 insertions(+), 218 deletions(-)
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java
 delete mode 100644 docker-java/src/test/java/com/github/dockerjava/utils/RegistryUtils.java

diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java
index 3c0a23021..f49fd9247 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java
@@ -5,6 +5,7 @@
 import com.github.dockerjava.api.model.StreamType;
 import okio.BufferedSource;
 
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.function.Consumer;
@@ -22,7 +23,14 @@ class FramedSink implements Consumer<BufferedSource> {
     @Override
     public void accept(BufferedSource source) {
         try {
-            while (!source.exhausted()) {
+            while (true) {
+                try {
+                    if (source.exhausted()) {
+                        break;
+                    }
+                } catch (IOException e) {
+                    break;
+                }
                 // See https://docs.docker.com/engine/api/v1.37/#operation/ContainerAttach
                 // [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}[]byte{OUTPUT}
 
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
index 57bb072c2..9c1b3d889 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
@@ -20,10 +20,6 @@
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URI;
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
 import java.security.cert.X509Certificate;
 import java.util.Collections;
 import java.util.concurrent.TimeUnit;
@@ -74,10 +70,12 @@ public void init(DockerClientConfig dockerClientConfig) {
         }
 
         SSLConfig sslConfig = dockerClientConfig.getSSLConfig();
+        boolean isSSL = false;
         if (sslConfig != null) {
             try {
                 SSLContext sslContext = sslConfig.getSSLContext();
                 if (sslContext != null) {
+                    isSSL = true;
                     clientBuilder
                             .sslSocketFactory(sslContext.getSocketFactory(), new TrustAllX509TrustManager());
                 }
@@ -94,20 +92,14 @@ public void init(DockerClientConfig dockerClientConfig) {
             case "unix":
             case "npipe":
                 baseUrlBuilder = new HttpUrl.Builder()
-                    .scheme("http")
-                    .host("docker" + SOCKET_SUFFIX);
+                        .scheme("http")
+                        .host("docker" + SOCKET_SUFFIX);
                 break;
             case "tcp":
-                SSLContext sslContext;
-                try {
-                    sslContext = sslConfig.getSSLContext();
-                } catch (KeyManagementException | UnrecoverableKeyException | NoSuchAlgorithmException | KeyStoreException e) {
-                    throw new RuntimeException(e);
-                }
                 baseUrlBuilder = new HttpUrl.Builder()
-                    .scheme(sslConfig != null && sslContext != null ? "https" : "http")
-                    .host(dockerHost.getHost())
-                    .port(dockerHost.getPort());
+                        .scheme(isSSL ? "https" : "http")
+                        .host(dockerHost.getHost())
+                        .port(dockerHost.getPort());
                 break;
             default:
                 baseUrlBuilder = HttpUrl.get(dockerHost.toString()).newBuilder();
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 75ea6ac52..5336a4b08 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -115,6 +115,7 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>${maven-surefire-plugin.version}</version>
 				<configuration>
+					<trimStackTrace>false</trimStackTrace>
 					<rerunFailingTestsCount>3</rerunFailingTestsCount>
 					<excludedGroups>com.github.dockerjava.junit.category.Integration</excludedGroups>
 				</configuration>
@@ -133,6 +134,7 @@
 					</execution>
 				</executions>
 				<configuration>
+					<trimStackTrace>false</trimStackTrace>
 					<rerunFailingTestsCount>5</rerunFailingTestsCount>
 					<groups>com.github.dockerjava.junit.category.Integration</groups>
 					<excludedGroups>com.github.dockerjava.junit.category.AuthIntegration,com.github.dockerjava.junit.category.SwarmModeIntegration</excludedGroups>
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
index fa62d778b..d630d6687 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
@@ -14,14 +14,12 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayInputStream;
-import java.io.Closeable;
 import java.io.File;
 import java.io.InputStream;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
 
 import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -222,58 +220,38 @@ public void attachContainerClosesStdoutWhenContainerExits() throws Exception {
                 .exec();
         LOG.info("Created container: {}", container.toString());
 
-        final CountDownLatch started = new CountDownLatch(1);
-        final AtomicLong startedAtNanos = new AtomicLong();
-        final CountDownLatch gotLine = new CountDownLatch(1);
-        final CountDownLatch completed = new CountDownLatch(1);
-        final AtomicLong gotLineAtNanos = new AtomicLong();
-        AttachContainerTestCallback callback = new AttachContainerTestCallback() {
-            @Override
-            public void onStart(Closeable stream) {
-                startedAtNanos.set(System.nanoTime());
-                started.countDown();
-                super.onStart(stream);
-            }
-
-            @Override
-            public void onNext(Frame item) {
-                LOG.info("Got frame: {}", item);
-                if (item.getStreamType() == StreamType.STDOUT) {
-                    gotLineAtNanos.set(System.nanoTime());
-                    gotLine.countDown();
-                }
-                super.onNext(item);
-            }
-
-            @Override
-            public void onError(Throwable throwable) {
-                LOG.info("Got error: ", throwable);
-                super.onError(throwable);
-            }
-
-            @Override
-            public void onComplete() {
-                completed.countDown();
-                super.onComplete();
-            }
-        };
-
-        try (Closeable ignored = callback) {
-            dockerClient.attachContainerCmd(container.getId())
-                    .withStdOut(true)
-                    .withFollowStream(true)
-                    .exec(callback);
+        CountDownLatch gotLine = new CountDownLatch(1);
+        try (
+                AttachContainerResultCallback resultCallback = dockerClient.attachContainerCmd(container.getId())
+                        .withStdOut(true)
+                        .withStdErr(true)
+                        .withFollowStream(true)
+                        .exec(new AttachContainerTestCallback() {
+                            @Override
+                            public void onNext(Frame item) {
+                                LOG.info("Got frame: {}", item);
+                                if (item.getStreamType() == StreamType.STDOUT) {
+                                    gotLine.countDown();
+                                }
+                                super.onNext(item);
+                            }
+
+                            @Override
+                            public void onComplete() {
+                                LOG.info("On complete");
+                                super.onComplete();
+                            }
+                        })
+        ) {
+            resultCallback.awaitStarted(5, SECONDS);
+            LOG.info("Attach started");
 
             dockerClient.startContainerCmd(container.getId()).exec();
+            LOG.info("Container started");
 
-            assertTrue("Should start in a reasonable time", started.await(30, SECONDS));
             assertTrue("Should get first line quickly after the start", gotLine.await(15, SECONDS));
 
-            long gotLineDurationSeconds = (gotLineAtNanos.get() - startedAtNanos.get()) / 1_000_000_000L;
-            LOG.info("Got line from {} for {} seconds", container.getId(), gotLineDurationSeconds);
-
-            boolean finished = completed.await(1L + gotLineDurationSeconds, SECONDS);
-            assertTrue("Should get EOF in a time close to time of getting the first line", finished);
+            resultCallback.awaitCompletion(5, SECONDS);
         }
     }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
index aae6380d8..b15931f3c 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
@@ -10,10 +10,11 @@
 import com.github.dockerjava.core.command.PushImageResultCallback;
 import com.github.dockerjava.core.command.WaitContainerResultCallback;
 import com.github.dockerjava.core.util.CompressArchiveUtil;
-import com.github.dockerjava.utils.RegistryUtils;
+import com.github.dockerjava.junit.PrivateRegistryRule;
 import net.jcip.annotations.NotThreadSafe;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.TrueFileFilter;
+import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -51,6 +52,9 @@
 public class BuildImageCmdIT extends CmdIT {
     public static final Logger LOG = LoggerFactory.getLogger(BuildImageCmd.class);
 
+    @ClassRule
+    public static PrivateRegistryRule REGISTRY = new PrivateRegistryRule();
+
     @Rule
     public TemporaryFolder folder = new TemporaryFolder(new File("target/"));
 
@@ -195,7 +199,7 @@ public void env() throws Exception {
 
     @Test
     public void fromPrivateRegistry() throws Exception {
-        AuthConfig authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient());
+        AuthConfig authConfig = REGISTRY.getAuthConfig();
         String imgName = authConfig.getRegistryAddress() + "/testuser/busybox";
 
         File dockerfile = folder.newFile("Dockerfile");
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
index 674be99fd..e1784f0a9 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
@@ -13,10 +13,6 @@
 
 import java.util.Arrays;
 
-import static com.github.dockerjava.cmd.CmdIT.FactoryType.JERSEY;
-import static com.github.dockerjava.cmd.CmdIT.FactoryType.NETTY;
-import static com.github.dockerjava.cmd.CmdIT.FactoryType.OKHTTP;
-
 /**
  * @author Kanstantsin Shautsou
  */
@@ -64,9 +60,7 @@ public boolean supportsStdinAttach() {
 
     @Parameterized.Parameters(name = "{index}:{0}")
     public static Iterable<FactoryType> data() {
-        return Arrays.asList(
-                NETTY, JERSEY, OKHTTP
-        );
+        return Arrays.asList(FactoryType.values());
     }
 
     @Parameterized.Parameter
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index 22ce9d7a8..559333fa8 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -26,10 +26,11 @@
 import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.core.command.LogContainerResultCallback;
 import com.github.dockerjava.junit.DockerAssume;
-import com.github.dockerjava.utils.RegistryUtils;
+import com.github.dockerjava.junit.PrivateRegistryRule;
 import com.github.dockerjava.utils.TestUtils;
 import net.jcip.annotations.NotThreadSafe;
 import org.apache.commons.io.FileUtils;
+import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -77,6 +78,9 @@
 public class CreateContainerCmdIT extends CmdIT {
     public static final Logger LOG = LoggerFactory.getLogger(CreateContainerCmdIT.class);
 
+    @ClassRule
+    public static PrivateRegistryRule REGISTRY = new PrivateRegistryRule();
+
     @Rule
     public TemporaryFolder tempDir = new TemporaryFolder(new File("target/"));
 
@@ -1002,9 +1006,9 @@ public void createContainerWithNetworkID() {
     public void createContainerFromPrivateRegistryWithValidAuth() throws Exception {
         DockerAssume.assumeSwarm(dockerRule.getClient());
 
-        AuthConfig authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient());
+        AuthConfig authConfig = REGISTRY.getAuthConfig();
 
-        String imgName = RegistryUtils.createPrivateImage(dockerRule, "create-container-with-valid-auth");
+        String imgName = REGISTRY.createPrivateImage("create-container-with-valid-auth");
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(imgName)
                 .withAuthConfig(authConfig)
@@ -1015,9 +1019,9 @@ public void createContainerFromPrivateRegistryWithValidAuth() throws Exception {
 
     @Test
     public void createContainerFromPrivateRegistryWithNoAuth() throws Exception {
-        RegistryUtils.runPrivateRegistry(dockerRule.getClient());
+        AuthConfig authConfig = REGISTRY.getAuthConfig();
 
-        String imgName = RegistryUtils.createPrivateImage(dockerRule, "create-container-with-no-auth");
+        String imgName = REGISTRY.createPrivateImage("create-container-with-no-auth");
 
         if (TestUtils.isSwarm(dockerRule.getClient())) {
             exception.expect(instanceOf(InternalServerErrorException.class));
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
index 73ba598ff..7747bc06d 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
@@ -8,7 +8,8 @@
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.core.command.PullImageResultCallback;
-import com.github.dockerjava.utils.RegistryUtils;
+import com.github.dockerjava.junit.PrivateRegistryRule;
+import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -26,6 +27,9 @@
 public class PullImageCmdIT extends CmdIT {
     private static final Logger LOG = LoggerFactory.getLogger(PullImageCmdIT.class);
 
+    @ClassRule
+    public static PrivateRegistryRule REGISTRY = new PrivateRegistryRule();
+
     @Rule
     public ExpectedException exception = ExpectedException.none();
 
@@ -91,9 +95,9 @@ public void testPullNonExistingImage() throws Exception {
 
     @Test
     public void testPullImageWithValidAuth() throws Exception {
-        AuthConfig authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient());
+        AuthConfig authConfig = REGISTRY.getAuthConfig();
 
-        String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-valid-auth");
+        String imgName = REGISTRY.createPrivateImage("pull-image-with-valid-auth");
 
         // stream needs to be fully read in order to close the underlying connection
         dockerRule.getClient().pullImageCmd(imgName)
@@ -104,10 +108,9 @@ public void testPullImageWithValidAuth() throws Exception {
 
     @Test
     public void testPullImageWithValidAuthAndEmail() throws Exception {
-        AuthConfig authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient())
-                .withEmail("foo@bar.de");
+        AuthConfig authConfig = REGISTRY.getAuthConfig().withEmail("foo@bar.de");
 
-        String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-valid-auth");
+        String imgName = REGISTRY.createPrivateImage("pull-image-with-valid-auth");
 
         // stream needs to be fully read in order to close the underlying connection
         dockerRule.getClient().pullImageCmd(imgName)
@@ -118,9 +121,9 @@ public void testPullImageWithValidAuthAndEmail() throws Exception {
 
     @Test
     public void testPullImageWithNoAuth() throws Exception {
-        RegistryUtils.runPrivateRegistry(dockerRule.getClient());
+        AuthConfig authConfig = REGISTRY.getAuthConfig();
 
-        String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-no-auth");
+        String imgName = REGISTRY.createPrivateImage("pull-image-with-no-auth");
 
         if (isNotSwarm(dockerRule.getClient()) && getVersion(dockerRule.getClient())
                 .isGreaterOrEqual(RemoteApiVersion.VERSION_1_30)) {
@@ -138,15 +141,14 @@ public void testPullImageWithNoAuth() throws Exception {
 
     @Test
     public void testPullImageWithInvalidAuth() throws Exception {
-        AuthConfig validAuthConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient());
-
-        AuthConfig authConfig = new AuthConfig()
+        AuthConfig authConfig = REGISTRY.getAuthConfig();
+        AuthConfig invalidAuthConfig = new AuthConfig()
                 .withUsername("testuser")
                 .withPassword("testwrongpassword")
                 .withEmail("foo@bar.de")
-                .withRegistryAddress(validAuthConfig.getRegistryAddress());
+                .withRegistryAddress(authConfig.getRegistryAddress());
 
-        String imgName = RegistryUtils.createPrivateImage(dockerRule, "pull-image-with-invalid-auth");
+        String imgName = REGISTRY.createPrivateImage("pull-image-with-invalid-auth");
 
         if (isNotSwarm(dockerRule.getClient()) && getVersion(dockerRule.getClient())
                 .isGreaterOrEqual(RemoteApiVersion.VERSION_1_30)) {
@@ -157,7 +159,7 @@ public void testPullImageWithInvalidAuth() throws Exception {
 
         // stream needs to be fully read in order to close the underlying connection
         dockerRule.getClient().pullImageCmd(imgName)
-                .withAuthConfig(authConfig)
+                .withAuthConfig(invalidAuthConfig)
                 .exec(new PullImageResultCallback())
                 .awaitCompletion(30, TimeUnit.SECONDS);
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
index 82f2dda37..c3156a114 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
@@ -7,8 +7,9 @@
 import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.core.command.PullImageResultCallback;
 import com.github.dockerjava.core.command.PushImageResultCallback;
-import com.github.dockerjava.utils.RegistryUtils;
+import com.github.dockerjava.junit.PrivateRegistryRule;
 import org.junit.Before;
+import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -27,6 +28,9 @@ public class PushImageCmdIT extends CmdIT {
 
     public static final Logger LOG = LoggerFactory.getLogger(PushImageCmdIT.class);
 
+    @ClassRule
+    public static PrivateRegistryRule REGISTRY = new PrivateRegistryRule();
+
     private String username;
 
     @Rule
@@ -36,7 +40,7 @@ public class PushImageCmdIT extends CmdIT {
     @Before
     public void beforeTest() throws Exception {
         username = dockerRule.getClient().authConfig().getUsername();
-        authConfig = RegistryUtils.runPrivateRegistry(dockerRule.getClient());
+        authConfig = REGISTRY.getAuthConfig();
     }
 
     @Test
@@ -86,7 +90,7 @@ public void pushNonExistentImage() throws Exception {
 
     @Test
     public void testPushImageWithValidAuth() throws Exception {
-        String imgName = RegistryUtils.createTestImage(dockerRule, "push-image-with-valid-auth");
+        String imgName = REGISTRY.createTestImage("push-image-with-valid-auth");
 
         // stream needs to be fully read in order to close the underlying connection
         dockerRule.getClient().pushImageCmd(imgName)
@@ -97,7 +101,7 @@ public void testPushImageWithValidAuth() throws Exception {
 
     @Test
     public void testPushImageWithNoAuth() throws Exception {
-        String imgName = RegistryUtils.createTestImage(dockerRule, "push-image-with-no-auth");
+        String imgName = REGISTRY.createTestImage("push-image-with-no-auth");
 
         exception.expect(DockerClientException.class);
 
@@ -115,7 +119,7 @@ public void testPushImageWithInvalidAuth() throws Exception {
                 .withEmail("foo@bar.de")
                 .withRegistryAddress(authConfig.getRegistryAddress());
 
-        String imgName = RegistryUtils.createTestImage(dockerRule, "push-image-with-invalid-auth");
+        String imgName = REGISTRY.createTestImage("push-image-with-invalid-auth");
 
         exception.expect(DockerClientException.class);
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java
new file mode 100644
index 000000000..a46c288bf
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java
@@ -0,0 +1,455 @@
+package com.github.dockerjava.junit;
+
+
+import com.github.dockerjava.api.command.AttachContainerCmd;
+import com.github.dockerjava.api.command.AuthCmd;
+import com.github.dockerjava.api.command.BuildImageCmd;
+import com.github.dockerjava.api.command.CommitCmd;
+import com.github.dockerjava.api.command.ConnectToNetworkCmd;
+import com.github.dockerjava.api.command.ContainerDiffCmd;
+import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
+import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.api.command.CreateContainerCmd;
+import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.command.CreateSecretCmd;
+import com.github.dockerjava.api.command.CreateServiceCmd;
+import com.github.dockerjava.api.command.CreateVolumeCmd;
+import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
+import com.github.dockerjava.api.command.DockerCmdExecFactory;
+import com.github.dockerjava.api.command.EventsCmd;
+import com.github.dockerjava.api.command.ExecCreateCmd;
+import com.github.dockerjava.api.command.ExecStartCmd;
+import com.github.dockerjava.api.command.InfoCmd;
+import com.github.dockerjava.api.command.InitializeSwarmCmd;
+import com.github.dockerjava.api.command.InspectContainerCmd;
+import com.github.dockerjava.api.command.InspectExecCmd;
+import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.InspectNetworkCmd;
+import com.github.dockerjava.api.command.InspectServiceCmd;
+import com.github.dockerjava.api.command.InspectSwarmCmd;
+import com.github.dockerjava.api.command.InspectSwarmNodeCmd;
+import com.github.dockerjava.api.command.InspectVolumeCmd;
+import com.github.dockerjava.api.command.JoinSwarmCmd;
+import com.github.dockerjava.api.command.KillContainerCmd;
+import com.github.dockerjava.api.command.LeaveSwarmCmd;
+import com.github.dockerjava.api.command.ListContainersCmd;
+import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.command.ListSecretsCmd;
+import com.github.dockerjava.api.command.ListServicesCmd;
+import com.github.dockerjava.api.command.ListSwarmNodesCmd;
+import com.github.dockerjava.api.command.ListTasksCmd;
+import com.github.dockerjava.api.command.ListVolumesCmd;
+import com.github.dockerjava.api.command.LoadImageCmd;
+import com.github.dockerjava.api.command.LogContainerCmd;
+import com.github.dockerjava.api.command.LogSwarmObjectCmd;
+import com.github.dockerjava.api.command.PauseContainerCmd;
+import com.github.dockerjava.api.command.PingCmd;
+import com.github.dockerjava.api.command.PruneCmd;
+import com.github.dockerjava.api.command.PullImageCmd;
+import com.github.dockerjava.api.command.PushImageCmd;
+import com.github.dockerjava.api.command.RemoveContainerCmd;
+import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.RemoveSecretCmd;
+import com.github.dockerjava.api.command.RemoveServiceCmd;
+import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
+import com.github.dockerjava.api.command.RemoveVolumeCmd;
+import com.github.dockerjava.api.command.RenameContainerCmd;
+import com.github.dockerjava.api.command.RestartContainerCmd;
+import com.github.dockerjava.api.command.SaveImageCmd;
+import com.github.dockerjava.api.command.SearchImagesCmd;
+import com.github.dockerjava.api.command.StartContainerCmd;
+import com.github.dockerjava.api.command.StatsCmd;
+import com.github.dockerjava.api.command.StopContainerCmd;
+import com.github.dockerjava.api.command.TagImageCmd;
+import com.github.dockerjava.api.command.TopContainerCmd;
+import com.github.dockerjava.api.command.UnpauseContainerCmd;
+import com.github.dockerjava.api.command.UpdateContainerCmd;
+import com.github.dockerjava.api.command.UpdateServiceCmd;
+import com.github.dockerjava.api.command.UpdateSwarmCmd;
+import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
+import com.github.dockerjava.api.command.VersionCmd;
+import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.DockerClientConfigAware;
+
+import java.io.IOException;
+
+class DockerCmdExecFactoryDelegate implements DockerCmdExecFactory, DockerClientConfigAware {
+
+    final DockerCmdExecFactory delegate;
+
+    DockerCmdExecFactoryDelegate(DockerCmdExecFactory delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public void init(DockerClientConfig dockerClientConfig) {
+        if (delegate instanceof DockerClientConfigAware) {
+            ((DockerClientConfigAware) delegate).init(dockerClientConfig);
+        }
+    }
+
+    @Override
+    public AuthCmd.Exec createAuthCmdExec() {
+        return delegate.createAuthCmdExec();
+    }
+
+    @Override
+    public InfoCmd.Exec createInfoCmdExec() {
+        return delegate.createInfoCmdExec();
+    }
+
+    @Override
+    public PingCmd.Exec createPingCmdExec() {
+        return delegate.createPingCmdExec();
+    }
+
+    @Override
+    public ExecCreateCmd.Exec createExecCmdExec() {
+        return delegate.createExecCmdExec();
+    }
+
+    @Override
+    public VersionCmd.Exec createVersionCmdExec() {
+        return delegate.createVersionCmdExec();
+    }
+
+    @Override
+    public PullImageCmd.Exec createPullImageCmdExec() {
+        return delegate.createPullImageCmdExec();
+    }
+
+    @Override
+    public PushImageCmd.Exec createPushImageCmdExec() {
+        return delegate.createPushImageCmdExec();
+    }
+
+    @Override
+    public SaveImageCmd.Exec createSaveImageCmdExec() {
+        return delegate.createSaveImageCmdExec();
+    }
+
+    @Override
+    public CreateImageCmd.Exec createCreateImageCmdExec() {
+        return delegate.createCreateImageCmdExec();
+    }
+
+    @Override
+    public LoadImageCmd.Exec createLoadImageCmdExec() {
+        return delegate.createLoadImageCmdExec();
+    }
+
+    @Override
+    public SearchImagesCmd.Exec createSearchImagesCmdExec() {
+        return delegate.createSearchImagesCmdExec();
+    }
+
+    @Override
+    public RemoveImageCmd.Exec createRemoveImageCmdExec() {
+        return delegate.createRemoveImageCmdExec();
+    }
+
+    @Override
+    public ListImagesCmd.Exec createListImagesCmdExec() {
+        return delegate.createListImagesCmdExec();
+    }
+
+    @Override
+    public InspectImageCmd.Exec createInspectImageCmdExec() {
+        return delegate.createInspectImageCmdExec();
+    }
+
+    @Override
+    public ListContainersCmd.Exec createListContainersCmdExec() {
+        return delegate.createListContainersCmdExec();
+    }
+
+    @Override
+    public CreateContainerCmd.Exec createCreateContainerCmdExec() {
+        return delegate.createCreateContainerCmdExec();
+    }
+
+    @Override
+    public StartContainerCmd.Exec createStartContainerCmdExec() {
+        return delegate.createStartContainerCmdExec();
+    }
+
+    @Override
+    public InspectContainerCmd.Exec createInspectContainerCmdExec() {
+        return delegate.createInspectContainerCmdExec();
+    }
+
+    @Override
+    public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
+        return delegate.createRemoveContainerCmdExec();
+    }
+
+    @Override
+    public WaitContainerCmd.Exec createWaitContainerCmdExec() {
+        return delegate.createWaitContainerCmdExec();
+    }
+
+    @Override
+    public AttachContainerCmd.Exec createAttachContainerCmdExec() {
+        return delegate.createAttachContainerCmdExec();
+    }
+
+    @Override
+    public ExecStartCmd.Exec createExecStartCmdExec() {
+        return delegate.createExecStartCmdExec();
+    }
+
+    @Override
+    public InspectExecCmd.Exec createInspectExecCmdExec() {
+        return delegate.createInspectExecCmdExec();
+    }
+
+    @Override
+    public LogContainerCmd.Exec createLogContainerCmdExec() {
+        return delegate.createLogContainerCmdExec();
+    }
+
+    @Override
+    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
+        return delegate.createCopyFileFromContainerCmdExec();
+    }
+
+    @Override
+    public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() {
+        return delegate.createCopyArchiveFromContainerCmdExec();
+    }
+
+    @Override
+    public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() {
+        return delegate.createCopyArchiveToContainerCmdExec();
+    }
+
+    @Override
+    public StopContainerCmd.Exec createStopContainerCmdExec() {
+        return delegate.createStopContainerCmdExec();
+    }
+
+    @Override
+    public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
+        return delegate.createContainerDiffCmdExec();
+    }
+
+    @Override
+    public KillContainerCmd.Exec createKillContainerCmdExec() {
+        return delegate.createKillContainerCmdExec();
+    }
+
+    @Override
+    public UpdateContainerCmd.Exec createUpdateContainerCmdExec() {
+        return delegate.createUpdateContainerCmdExec();
+    }
+
+    @Override
+    public RenameContainerCmd.Exec createRenameContainerCmdExec() {
+        return delegate.createRenameContainerCmdExec();
+    }
+
+    @Override
+    public RestartContainerCmd.Exec createRestartContainerCmdExec() {
+        return delegate.createRestartContainerCmdExec();
+    }
+
+    @Override
+    public CommitCmd.Exec createCommitCmdExec() {
+        return delegate.createCommitCmdExec();
+    }
+
+    @Override
+    public BuildImageCmd.Exec createBuildImageCmdExec() {
+        return delegate.createBuildImageCmdExec();
+    }
+
+    @Override
+    public TopContainerCmd.Exec createTopContainerCmdExec() {
+        return delegate.createTopContainerCmdExec();
+    }
+
+    @Override
+    public TagImageCmd.Exec createTagImageCmdExec() {
+        return delegate.createTagImageCmdExec();
+    }
+
+    @Override
+    public PauseContainerCmd.Exec createPauseContainerCmdExec() {
+        return delegate.createPauseContainerCmdExec();
+    }
+
+    @Override
+    public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
+        return delegate.createUnpauseContainerCmdExec();
+    }
+
+    @Override
+    public EventsCmd.Exec createEventsCmdExec() {
+        return delegate.createEventsCmdExec();
+    }
+
+    @Override
+    public StatsCmd.Exec createStatsCmdExec() {
+        return delegate.createStatsCmdExec();
+    }
+
+    @Override
+    public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
+        return delegate.createCreateVolumeCmdExec();
+    }
+
+    @Override
+    public InspectVolumeCmd.Exec createInspectVolumeCmdExec() {
+        return delegate.createInspectVolumeCmdExec();
+    }
+
+    @Override
+    public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() {
+        return delegate.createRemoveVolumeCmdExec();
+    }
+
+    @Override
+    public ListVolumesCmd.Exec createListVolumesCmdExec() {
+        return delegate.createListVolumesCmdExec();
+    }
+
+    @Override
+    public ListNetworksCmd.Exec createListNetworksCmdExec() {
+        return delegate.createListNetworksCmdExec();
+    }
+
+    @Override
+    public InspectNetworkCmd.Exec createInspectNetworkCmdExec() {
+        return delegate.createInspectNetworkCmdExec();
+    }
+
+    @Override
+    public CreateNetworkCmd.Exec createCreateNetworkCmdExec() {
+        return delegate.createCreateNetworkCmdExec();
+    }
+
+    @Override
+    public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() {
+        return delegate.createRemoveNetworkCmdExec();
+    }
+
+    @Override
+    public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() {
+        return delegate.createConnectToNetworkCmdExec();
+    }
+
+    @Override
+    public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() {
+        return delegate.createDisconnectFromNetworkCmdExec();
+    }
+
+    @Override
+    public InitializeSwarmCmd.Exec createInitializeSwarmCmdExec() {
+        return delegate.createInitializeSwarmCmdExec();
+    }
+
+    @Override
+    public InspectSwarmCmd.Exec createInspectSwarmCmdExec() {
+        return delegate.createInspectSwarmCmdExec();
+    }
+
+    @Override
+    public JoinSwarmCmd.Exec createJoinSwarmCmdExec() {
+        return delegate.createJoinSwarmCmdExec();
+    }
+
+    @Override
+    public LeaveSwarmCmd.Exec createLeaveSwarmCmdExec() {
+        return delegate.createLeaveSwarmCmdExec();
+    }
+
+    @Override
+    public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() {
+        return delegate.createUpdateSwarmCmdExec();
+    }
+
+    @Override
+    public ListServicesCmd.Exec createListServicesCmdExec() {
+        return delegate.createListServicesCmdExec();
+    }
+
+    @Override
+    public CreateServiceCmd.Exec createCreateServiceCmdExec() {
+        return delegate.createCreateServiceCmdExec();
+    }
+
+    @Override
+    public InspectServiceCmd.Exec createInspectServiceCmdExec() {
+        return delegate.createInspectServiceCmdExec();
+    }
+
+    @Override
+    public UpdateServiceCmd.Exec createUpdateServiceCmdExec() {
+        return delegate.createUpdateServiceCmdExec();
+    }
+
+    @Override
+    public RemoveServiceCmd.Exec createRemoveServiceCmdExec() {
+        return delegate.createRemoveServiceCmdExec();
+    }
+
+    @Override
+    public LogSwarmObjectCmd.Exec logSwarmObjectExec(String endpoint) {
+        return delegate.logSwarmObjectExec(endpoint);
+    }
+
+    @Override
+    public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() {
+        return delegate.listSwarmNodeCmdExec();
+    }
+
+    @Override
+    public InspectSwarmNodeCmd.Exec inspectSwarmNodeCmdExec() {
+        return delegate.inspectSwarmNodeCmdExec();
+    }
+
+    @Override
+    public RemoveSwarmNodeCmd.Exec removeSwarmNodeCmdExec() {
+        return delegate.removeSwarmNodeCmdExec();
+    }
+
+    @Override
+    public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() {
+        return delegate.updateSwarmNodeCmdExec();
+    }
+
+    @Override
+    public ListTasksCmd.Exec listTasksCmdExec() {
+        return delegate.listTasksCmdExec();
+    }
+
+    @Override
+    public PruneCmd.Exec pruneCmdExec() {
+        return delegate.pruneCmdExec();
+    }
+
+    @Override
+    public ListSecretsCmd.Exec createListSecretsCmdExec() {
+        return delegate.createListSecretsCmdExec();
+    }
+
+    @Override
+    public CreateSecretCmd.Exec createCreateSecretCmdExec() {
+        return delegate.createCreateSecretCmdExec();
+    }
+
+    @Override
+    public RemoveSecretCmd.Exec createRemoveSecretCmdExec() {
+        return delegate.createRemoveSecretCmdExec();
+    }
+
+    @Override
+    public void close() throws IOException {
+        delegate.close();
+    }
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java
index 41bb3f076..e7df693df 100644
--- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java
+++ b/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java
@@ -1,6 +1,14 @@
 package com.github.dockerjava.junit;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.CreateContainerCmd;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.command.CreateNetworkResponse;
+import com.github.dockerjava.api.command.CreateVolumeCmd;
+import com.github.dockerjava.api.command.CreateVolumeResponse;
+import com.github.dockerjava.api.command.DockerCmdExecFactory;
+import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.cmd.CmdIT;
 import com.github.dockerjava.core.DefaultDockerClientConfig;
@@ -15,6 +23,8 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @author Kanstantsin Shautsou
@@ -27,6 +37,12 @@ public class DockerRule extends ExternalResource {
 
     private CmdIT cmdIT;
 
+    private final Set<String> createdContainerIds = new HashSet<>();
+
+    private final Set<String> createdNetworkIds = new HashSet<>();
+
+    private final Set<String> createdVolumeNames = new HashSet<>();
+
     public DockerRule(CmdIT cmdIT) {
         this.cmdIT = cmdIT;
     }
@@ -36,8 +52,42 @@ public DockerClient getClient() {
         if (dockerClient != null) {
             return dockerClient;
         }
+        DockerCmdExecFactory execFactory = new DockerCmdExecFactoryDelegate(
+                cmdIT.getFactoryType().createExecFactory()
+        ) {
+            @Override
+            public CreateContainerCmd.Exec createCreateContainerCmdExec() {
+                CreateContainerCmd.Exec exec = super.createCreateContainerCmdExec();
+                return command -> {
+                    CreateContainerResponse response = exec.exec(command);
+                    createdContainerIds.add(response.getId());
+                    return response;
+                };
+            }
+
+            @Override
+            public CreateNetworkCmd.Exec createCreateNetworkCmdExec() {
+                CreateNetworkCmd.Exec exec = super.createCreateNetworkCmdExec();
+                return command -> {
+                    CreateNetworkResponse response = exec.exec(command);
+                    createdNetworkIds.add(response.getId());
+                    return response;
+                };
+            }
+
+            @Override
+            public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
+                CreateVolumeCmd.Exec exec = super.createCreateVolumeCmdExec();
+                return command -> {
+                    CreateVolumeResponse response = exec.exec(command);
+                    createdVolumeNames.add(response.getName());
+                    return response;
+                };
+            }
+        };
+
         return dockerClient = DockerClientBuilder.getInstance(config())
-                .withDockerCmdExecFactory(cmdIT.getFactoryType().createExecFactory())
+                .withDockerCmdExecFactory(execFactory)
                 .build();
     }
 
@@ -70,6 +120,48 @@ protected void before() throws Throwable {
     @Override
     protected void after() {
 //        LOG.debug("======================= END OF AFTERTEST =======================");
+        createdContainerIds.parallelStream().forEach(containerId -> {
+            try {
+                dockerClient.removeContainerCmd(containerId)
+                        .withForce(true)
+                        .withRemoveVolumes(true)
+                        .exec();
+            } catch (ConflictException | NotFoundException ignored) {
+            } catch (Throwable e) {
+                if (e instanceof InterruptedException) {
+                    Thread.currentThread().interrupt();
+                }
+                LOG.debug("Failed to remove container {}", containerId, e);
+            }
+        });
+        createdNetworkIds.parallelStream().forEach(networkId -> {
+            try {
+                dockerClient.removeNetworkCmd(networkId).exec();
+            } catch (ConflictException | NotFoundException ignored) {
+            } catch (Throwable e) {
+                if (e instanceof InterruptedException) {
+                    Thread.currentThread().interrupt();
+                }
+                LOG.debug("Failed to remove network {}", networkId, e);
+            }
+        });
+        createdVolumeNames.parallelStream().forEach(volumeName -> {
+            try {
+                dockerClient.removeVolumeCmd(volumeName).exec();
+            } catch (ConflictException | NotFoundException ignored) {
+            } catch (Throwable e) {
+                if (e instanceof InterruptedException) {
+                    Thread.currentThread().interrupt();
+                }
+                LOG.debug("Failed to remove volume {}", volumeName, e);
+            }
+        });
+
+        try {
+            dockerClient.close();
+        } catch (Exception e) {
+            LOG.warn("Failed to close the DockerClient", e);
+        }
     }
 
     private static DefaultDockerClientConfig config() {
diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java b/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java
new file mode 100644
index 000000000..15774ad34
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java
@@ -0,0 +1,120 @@
+package com.github.dockerjava.junit;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectImageResponse;
+import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.PortBinding;
+import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.core.DockerClientBuilder;
+import com.github.dockerjava.core.command.BuildImageResultCallback;
+import com.github.dockerjava.core.command.PushImageResultCallback;
+import org.junit.rules.ExternalResource;
+
+import java.io.File;
+import java.util.concurrent.TimeUnit;
+
+import static com.github.dockerjava.api.model.HostConfig.newHostConfig;
+import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.nullValue;
+
+public class PrivateRegistryRule extends ExternalResource {
+
+    private final DockerClient dockerClient;
+
+    private AuthConfig authConfig;
+
+    private String containerId;
+
+    public PrivateRegistryRule() {
+        this.dockerClient = DockerClientBuilder.getInstance().build();
+    }
+
+    public AuthConfig getAuthConfig() {
+        return authConfig;
+    }
+
+    public String createPrivateImage(String tagName) throws InterruptedException {
+        String imgNameWithTag = createTestImage(tagName);
+
+        dockerClient.pushImageCmd(imgNameWithTag)
+                .withAuthConfig(authConfig)
+                .exec(new PushImageResultCallback())
+                .awaitCompletion(30, TimeUnit.SECONDS);
+
+        dockerClient.removeImageCmd(imgNameWithTag).exec();
+
+        //ensures that the image is available, the private registry needs some time to reflect a tag push
+        Thread.sleep(5000);
+
+        return imgNameWithTag;
+    }
+
+    public String createTestImage(String tagName) {
+        String imgName = authConfig.getRegistryAddress() + "/busybox";
+
+        dockerClient.tagImageCmd(DEFAULT_IMAGE, imgName, tagName).exec();
+        return imgName + ":" + tagName;
+    }
+
+    /**
+     * Starts a local test registry when it is not already started and returns the auth configuration for it
+     * This method is synchronized so that only the first invocation starts the registry
+     */
+    @Override
+    protected void before() throws Throwable {
+
+        int port = 5050;
+
+        String imageName = "private-registry-image";
+
+        File baseDir = new File(DockerRule.class.getResource("/privateRegistry").getFile());
+
+        String registryImageId = dockerClient.buildImageCmd(baseDir)
+                .withNoCache(true)
+                .exec(new BuildImageResultCallback())
+                .awaitImageId();
+
+        InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(registryImageId).exec();
+        assertThat(inspectImageResponse, not(nullValue()));
+        DockerRule.LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+
+        dockerClient.tagImageCmd(registryImageId, imageName, "2")
+                .withForce().exec();
+
+        // see https://github.com/docker/distribution/blob/master/docs/deploying.md#native-basic-auth
+        CreateContainerResponse testregistry = dockerClient
+                .createContainerCmd(imageName + ":2")
+                .withHostConfig(newHostConfig()
+                        .withPortBindings(new PortBinding(Ports.Binding.bindPort(port), ExposedPort.tcp(5000))))
+                .withEnv("REGISTRY_AUTH=htpasswd", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm",
+                        "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "REGISTRY_LOG_LEVEL=debug",
+                        "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key")
+                .exec();
+
+        containerId = testregistry.getId();
+        dockerClient.startContainerCmd(containerId).exec();
+
+        // wait for registry to boot
+        Thread.sleep(3000);
+
+        // credentials as configured in /auth/htpasswd
+        authConfig = new AuthConfig()
+                .withUsername("testuser")
+                .withPassword("testpassword")
+                .withRegistryAddress("localhost:" + port);
+    }
+
+    @Override
+    protected void after() {
+        if (containerId != null) {
+            dockerClient.removeContainerCmd(containerId)
+                    .withForce(true)
+                    .withRemoveVolumes(true)
+                    .exec();
+        }
+    }
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/utils/RegistryUtils.java b/docker-java/src/test/java/com/github/dockerjava/utils/RegistryUtils.java
deleted file mode 100644
index 614a16cc6..000000000
--- a/docker-java/src/test/java/com/github/dockerjava/utils/RegistryUtils.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.github.dockerjava.utils;
-
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectImageResponse;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.model.AuthConfig;
-import com.github.dockerjava.api.model.ExposedPort;
-import com.github.dockerjava.api.model.PortBinding;
-import com.github.dockerjava.api.model.Ports;
-import com.github.dockerjava.core.command.BuildImageResultCallback;
-import com.github.dockerjava.core.command.PushImageResultCallback;
-import com.github.dockerjava.junit.DockerRule;
-
-import java.io.File;
-import java.util.concurrent.TimeUnit;
-
-import static com.github.dockerjava.api.model.HostConfig.newHostConfig;
-import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.nullValue;
-
-public class RegistryUtils {
-
-    private static AuthConfig privateRegistryAuthConfig;
-
-    /**
-     * Starts a local test registry when it is not already started and returns the auth configuration for it
-     * This method is synchronized so that only the first invocation starts the registry
-     * @return The auth configuration for the started private docker registry
-     * @throws Exception
-     */
-    public static synchronized AuthConfig runPrivateRegistry(DockerClient dockerClient) throws Exception {
-        if (privateRegistryAuthConfig == null) {
-            int port = 5050;
-
-            String containerName = "private-registry";
-            String imageName = "private-registry-image";
-
-            File baseDir = new File(DockerRule.class.getResource("/privateRegistry").getFile());
-
-            try {
-                dockerClient.removeContainerCmd(containerName)
-                        .withForce(true)
-                        .withRemoveVolumes(true)
-                        .exec();
-            } catch (NotFoundException ex) {
-                // ignore
-            }
-
-            String registryImageId = dockerClient.buildImageCmd(baseDir)
-                    .withNoCache(true)
-                    .exec(new BuildImageResultCallback())
-                    .awaitImageId();
-
-            InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(registryImageId).exec();
-            assertThat(inspectImageResponse, not(nullValue()));
-            DockerRule.LOG.info("Image Inspect: {}", inspectImageResponse.toString());
-
-            dockerClient.tagImageCmd(registryImageId, imageName, "2")
-                    .withForce().exec();
-
-            // see https://github.com/docker/distribution/blob/master/docs/deploying.md#native-basic-auth
-            CreateContainerResponse testregistry = dockerClient
-                    .createContainerCmd(imageName + ":2")
-                    .withName(containerName)
-                    .withHostConfig(newHostConfig()
-                            .withPortBindings(new PortBinding(Ports.Binding.bindPort(port), ExposedPort.tcp(5000))))
-                    .withEnv("REGISTRY_AUTH=htpasswd", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm",
-                            "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd", "REGISTRY_LOG_LEVEL=debug",
-                            "REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt", "REGISTRY_HTTP_TLS_KEY=/certs/domain.key")
-                    .exec();
-
-            dockerClient.startContainerCmd(testregistry.getId()).exec();
-
-            // wait for registry to boot
-            Thread.sleep(3000);
-
-            // credentials as configured in /auth/htpasswd
-            privateRegistryAuthConfig = new AuthConfig()
-                    .withUsername("testuser")
-                    .withPassword("testpassword")
-                    .withRegistryAddress("localhost:" + port);
-        }
-
-        return privateRegistryAuthConfig;
-    }
-
-    public static String createPrivateImage(DockerRule dockerRule, String tagName) throws InterruptedException {
-        if (privateRegistryAuthConfig == null)
-            throw new IllegalStateException("Ensure that you have invoked runPrivateRegistry beforehand.");
-
-        String imgNameWithTag = createTestImage(dockerRule, tagName);
-
-        dockerRule.getClient().pushImageCmd(imgNameWithTag)
-                .withAuthConfig(privateRegistryAuthConfig)
-                .exec(new PushImageResultCallback())
-                .awaitCompletion(30, TimeUnit.SECONDS);
-
-        dockerRule.getClient().removeImageCmd(imgNameWithTag)
-                .exec();
-
-        //ensures that the image is available, the private registry needs some time to reflect a tag push
-        Thread.sleep(5000);
-
-        return imgNameWithTag;
-    }
-
-    public static String createTestImage(DockerRule dockerRule, String tagName) {
-        String tag = dockerRule.getKind() + "-" + tagName;
-        String imgName = privateRegistryAuthConfig.getRegistryAddress() + "/busybox";
-        String imgNameWithTag = imgName + ":" + tag;
-
-        dockerRule.getClient().tagImageCmd(DEFAULT_IMAGE, imgName, tag)
-                .exec();
-        return imgNameWithTag;
-    }
-}

From 9957bf7910405996431c5160ab4ab6e5f3174b43 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Wed, 18 Dec 2019 14:35:07 +0100
Subject: [PATCH 0955/1272] Move the deprecated methods to CreateContainerCmd
 as default methods (#1291)

---
 .../api/command/CreateContainerCmd.java       | 369 +++++++++---
 .../core/command/CreateContainerCmdImpl.java  | 541 ------------------
 2 files changed, 299 insertions(+), 611 deletions(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index b24b40401..d9b9503ad 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.command;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.AuthConfig;
@@ -22,6 +23,9 @@
 import javax.annotation.CheckForNull;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+
+import static java.util.Objects.requireNonNull;
 
 public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerResponse> {
 
@@ -42,13 +46,23 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     @Deprecated
     @CheckForNull
-    Bind[] getBinds();
+    @JsonIgnore
+    default Bind[] getBinds() {
+        return getHostConfig().getBinds();
+    }
 
     @Deprecated
-    CreateContainerCmd withBinds(Bind... binds);
+    default CreateContainerCmd withBinds(Bind... binds) {
+        Objects.requireNonNull(binds, "binds was not specified");
+        getHostConfig().setBinds(binds);
+        return this;
+    }
 
     @Deprecated
-    CreateContainerCmd withBinds(List<Bind> binds);
+    default CreateContainerCmd withBinds(List<Bind> binds) {
+        Objects.requireNonNull(binds, "binds was not specified");
+        return withBinds(binds.toArray(new Bind[binds.size()]));
+    }
 
     /**
      * Add network-scoped alias for the container
@@ -146,19 +160,29 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     @Deprecated
     @CheckForNull
-    Link[] getLinks();
+    @JsonIgnore
+    default Link[] getLinks() {
+        return getHostConfig().getLinks();
+    }
 
     /**
      * Add link to another container.
      */
     @Deprecated
-    CreateContainerCmd withLinks(Link... links);
+    default CreateContainerCmd withLinks(Link... links) {
+        requireNonNull(links, "links was not specified");
+        getHostConfig().setLinks(links);
+        return this;
+    }
 
     /**
      * Add link to another container.
      */
     @Deprecated
-    CreateContainerCmd withLinks(List<Link> links);
+    default CreateContainerCmd withLinks(List<Link> links) {
+        requireNonNull(links, "links was not specified");
+        return withLinks(links.toArray(new Link[links.size()]));
+    }
 
     @CheckForNull
     String getIpv6Address();
@@ -177,24 +201,41 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     @Deprecated
     @CheckForNull
-    Long getMemory();
+    @JsonIgnore
+    default Long getMemory() {
+        return getHostConfig().getMemory();
+    }
 
     @Deprecated
-    CreateContainerCmd withMemory(Long memory);
+    default CreateContainerCmd withMemory(Long memory) {
+        Objects.requireNonNull(memory, "memory was not specified");
+        getHostConfig().withMemory(memory);
+        return this;
+    }
 
     @Deprecated
     @CheckForNull
-    Long getMemorySwap();
+    @JsonIgnore
+    default Long getMemorySwap() {
+        return getHostConfig().getMemorySwap();
+    }
 
     @Deprecated
-    CreateContainerCmd withMemorySwap(Long memorySwap);
+    default CreateContainerCmd withMemorySwap(Long memorySwap) {
+        Objects.requireNonNull(memorySwap, "memorySwap was not specified");
+        getHostConfig().withMemorySwap(memorySwap);
+        return this;
+    }
 
     @CheckForNull
     String getName();
 
     @Deprecated
     @CheckForNull
-    String getNetworkMode();
+    @JsonIgnore
+    default String getNetworkMode() {
+        return getHostConfig().getNetworkMode();
+    }
 
     /**
      * Set the Network mode for the container
@@ -207,25 +248,39 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
      * </ul>
      */
     @Deprecated
-    CreateContainerCmd withNetworkMode(String networkMode);
+    default CreateContainerCmd withNetworkMode(String networkMode) {
+        Objects.requireNonNull(networkMode, "networkMode was not specified");
+        getHostConfig().withNetworkMode(networkMode);
+        return this;
+    }
 
     @Deprecated
     @CheckForNull
-    Ports getPortBindings();
+    @JsonIgnore
+    default Ports getPortBindings() {
+        return getHostConfig().getPortBindings();
+    }
 
     /**
      * Add one or more {@link PortBinding}s. This corresponds to the <code>--publish</code> (<code>-p</code>) option of the
      * <code>docker run</code> CLI command.
      */
     @Deprecated
-    CreateContainerCmd withPortBindings(PortBinding... portBindings);
+    default CreateContainerCmd withPortBindings(PortBinding... portBindings) {
+        Objects.requireNonNull(portBindings, "portBindings was not specified");
+        getHostConfig().withPortBindings(new Ports(portBindings));
+        return this;
+    }
 
     /**
      * Add one or more {@link PortBinding}s. This corresponds to the <code>--publish</code> (<code>-p</code>) option of the
      * <code>docker run</code> CLI command.
      */
     @Deprecated
-    CreateContainerCmd withPortBindings(List<PortBinding> portBindings);
+    default CreateContainerCmd withPortBindings(List<PortBinding> portBindings) {
+        Objects.requireNonNull(portBindings, "portBindings was not specified");
+        return withPortBindings(portBindings.toArray(new PortBinding[0]));
+    }
 
     /**
      * Add the port bindings that are contained in the given {@link Ports} object.
@@ -233,7 +288,11 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
      * @see #withPortBindings(PortBinding...)
      */
     @Deprecated
-    CreateContainerCmd withPortBindings(Ports portBindings);
+    default CreateContainerCmd withPortBindings(Ports portBindings) {
+        Objects.requireNonNull(portBindings, "portBindings was not specified");
+        getHostConfig().withPortBindings(portBindings);
+        return this;
+    }
 
     CreateContainerCmd withName(String name);
 
@@ -246,10 +305,17 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     @Deprecated
     @CheckForNull
-    Boolean getPrivileged();
+    @JsonIgnore
+    default Boolean getPrivileged() {
+        return getHostConfig().getPrivileged();
+    }
 
     @Deprecated
-    CreateContainerCmd withPrivileged(Boolean privileged);
+    default CreateContainerCmd withPrivileged(Boolean privileged) {
+        Objects.requireNonNull(privileged, "no privileged was specified");
+        getHostConfig().withPrivileged(privileged);
+        return this;
+    }
 
     @CheckForNull
     String getUser();
@@ -265,13 +331,23 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     @Deprecated
     @CheckForNull
-    VolumesFrom[] getVolumesFrom();
+    @JsonIgnore
+    default VolumesFrom[] getVolumesFrom() {
+        return getHostConfig().getVolumesFrom();
+    }
 
     @Deprecated
-    CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom);
+    default CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom) {
+        Objects.requireNonNull(volumesFrom, "volumesFrom was not specified");
+        getHostConfig().withVolumesFrom(volumesFrom);
+        return this;
+    }
 
     @Deprecated
-    CreateContainerCmd withVolumesFrom(List<VolumesFrom> volumesFrom);
+    default CreateContainerCmd withVolumesFrom(List<VolumesFrom> volumesFrom) {
+        requireNonNull(volumesFrom, "volumesFrom was not specified");
+        return withVolumesFrom(volumesFrom.toArray(new VolumesFrom[volumesFrom.size()]));
+    }
 
     @CheckForNull
     String getWorkingDir();
@@ -315,62 +391,99 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     @Deprecated
     @CheckForNull
-    Boolean getPublishAllPorts();
+    @JsonIgnore
+    default Boolean getPublishAllPorts() {
+        return getHostConfig().getPublishAllPorts();
+    }
 
     @Deprecated
-    CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts);
+    default CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts) {
+        requireNonNull(publishAllPorts, "no publishAllPorts was specified");
+        getHostConfig().withPublishAllPorts(publishAllPorts);
+        return this;
+    }
 
     @CheckForNull
     @Deprecated
-    String[] getExtraHosts();
+    @JsonIgnore
+    default String[] getExtraHosts() {
+        return getHostConfig().getExtraHosts();
+    }
 
     /**
      * Add hostnames to /etc/hosts in the container
      */
     @Deprecated
-    CreateContainerCmd withExtraHosts(String... extraHosts);
+    default CreateContainerCmd withExtraHosts(String... extraHosts) {
+        requireNonNull(extraHosts, "extraHosts was not specified");
+        getHostConfig().withExtraHosts(extraHosts);
+        return this;
+    }
 
     /**
      * Add hostnames to /etc/hosts in the container
      */
     @Deprecated
-    CreateContainerCmd withExtraHosts(List<String> extraHosts);
+    default CreateContainerCmd withExtraHosts(List<String> extraHosts) {
+        requireNonNull(extraHosts, "extraHosts was not specified");
+        return withExtraHosts(extraHosts.toArray(new String[extraHosts.size()]));
+    }
 
     @CheckForNull
     @Deprecated
-    Capability[] getCapAdd();
+    @JsonIgnore
+    default Capability[] getCapAdd() {
+        return getHostConfig().getCapAdd();
+    }
 
     /**
      * Add linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> to the container. For example:
      * adding {@link Capability#MKNOD} allows the container to create special files using the 'mknod' command.
      */
     @Deprecated
-    CreateContainerCmd withCapAdd(Capability... capAdd);
+    default CreateContainerCmd withCapAdd(Capability... capAdd) {
+        requireNonNull(capAdd, "capAdd was not specified");
+        getHostConfig().withCapAdd(capAdd);
+        return this;
+    }
 
     /**
      * Add linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> to the container. For example:
      * adding {@link Capability#MKNOD} allows the container to create special files using the 'mknod' command.
      */
     @Deprecated
-    CreateContainerCmd withCapAdd(List<Capability> capAdd);
+    default CreateContainerCmd withCapAdd(List<Capability> capAdd) {
+        requireNonNull(capAdd, "capAdd was not specified");
+        return withCapAdd(capAdd.toArray(new Capability[capAdd.size()]));
+    }
 
     @CheckForNull
     @Deprecated
-    Capability[] getCapDrop();
+    @JsonIgnore
+    default Capability[] getCapDrop() {
+        return getHostConfig().getCapDrop();
+    }
 
     /**
      * Drop linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> from the container. For example:
      * dropping {@link Capability#CHOWN} prevents the container from changing the owner of any files.
      */
     @Deprecated
-    CreateContainerCmd withCapDrop(Capability... capDrop);
+    default CreateContainerCmd withCapDrop(Capability... capDrop) {
+        requireNonNull(capDrop, "capDrop was not specified");
+        getHostConfig().withCapDrop(capDrop);
+        return this;
+    }
 
     /**
      * Drop linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> from the container. For example:
      * dropping {@link Capability#CHOWN} prevents the container from changing the owner of any files.
      */
     @Deprecated
-    CreateContainerCmd withCapDrop(List<Capability> capDrop);
+    default CreateContainerCmd withCapDrop(List<Capability> capDrop) {
+        requireNonNull(capDrop, "capDrop was not specified");
+        return withCapDrop(capDrop.toArray(new Capability[capDrop.size()]));
+    }
 
 
     @CheckForNull
@@ -388,154 +501,270 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     @Deprecated
     @CheckForNull
-    Integer getBlkioWeight();
+    @JsonIgnore
+    default Integer getBlkioWeight() {
+        return getHostConfig().getBlkioWeight();
+    }
 
     @CheckForNull
     @Deprecated
-    String getCgroupParent();
+    @JsonIgnore
+    default String getCgroupParent() {
+        return getHostConfig().getCgroupParent();
+    }
 
     @Deprecated
     @CheckForNull
-    Integer getCpuPeriod();
+    @JsonIgnore
+    default Integer getCpuPeriod() {
+        Long result = getHostConfig().getCpuPeriod();
+        return result != null ? result.intValue() : null;
+    }
 
     @Deprecated
     @CheckForNull
-    Integer getCpuShares();
+    @JsonIgnore
+    default Integer getCpuShares() {
+        return getHostConfig().getCpuShares();
+    }
 
     @Deprecated
     @CheckForNull
-    String getCpusetCpus();
+    @JsonIgnore
+    default String getCpusetCpus() {
+        return getHostConfig().getCpusetCpus();
+    }
 
     @Deprecated
     @CheckForNull
-    String getCpusetMems();
+    @JsonIgnore
+    default String getCpusetMems() {
+        return getHostConfig().getCpusetMems();
+    }
 
     @Deprecated
     @CheckForNull
-    Device[] getDevices();
+    @JsonIgnore
+    default Device[] getDevices() {
+        return getHostConfig().getDevices();
+    }
 
     @Deprecated
     @CheckForNull
-    String[] getDns();
+    @JsonIgnore
+    default String[] getDns() {
+        return getHostConfig().getDns();
+    }
 
     @Deprecated
     @CheckForNull
-    String[] getDnsSearch();
+    @JsonIgnore
+    default String[] getDnsSearch() {
+        return getHostConfig().getDnsSearch();
+    }
 
     @Deprecated
     @CheckForNull
-    LogConfig getLogConfig();
+    @JsonIgnore
+    default LogConfig getLogConfig() {
+        return getHostConfig().getLogConfig();
+    }
 
     @Deprecated
     @CheckForNull
-    LxcConf[] getLxcConf();
+    @JsonIgnore
+    default LxcConf[] getLxcConf() {
+        return getHostConfig().getLxcConf();
+    }
 
     @Deprecated
     @CheckForNull
-    Boolean getOomKillDisable();
+    @JsonIgnore
+    default Boolean getOomKillDisable() {
+        return getHostConfig().getOomKillDisable();
+    }
 
     @Deprecated
     @CheckForNull
-    String getPidMode();
+    @JsonIgnore
+    default String getPidMode() {
+        return getHostConfig().getPidMode();
+    }
 
     @Deprecated
     @CheckForNull
-    Boolean getReadonlyRootfs();
+    @JsonIgnore
+    default Boolean getReadonlyRootfs() {
+        return getHostConfig().getReadonlyRootfs();
+    }
 
     @Deprecated
     @CheckForNull
-    RestartPolicy getRestartPolicy();
+    @JsonIgnore
+    default RestartPolicy getRestartPolicy() {
+        return getHostConfig().getRestartPolicy();
+    }
 
     @Deprecated
     @CheckForNull
-    Ulimit[] getUlimits();
+    @JsonIgnore
+    default Ulimit[] getUlimits() {
+        return getHostConfig().getUlimits();
+    }
 
     @Deprecated
-    CreateContainerCmd withBlkioWeight(Integer blkioWeight);
+    default CreateContainerCmd withBlkioWeight(Integer blkioWeight) {
+        getHostConfig().withBlkioWeight(blkioWeight);
+        return this;
+    }
 
     @Deprecated
-    CreateContainerCmd withCgroupParent(String cgroupParent);
+    default CreateContainerCmd withCgroupParent(String cgroupParent) {
+        getHostConfig().withCgroupParent(cgroupParent);
+        return this;
+    }
 
     @Deprecated
-    CreateContainerCmd withContainerIDFile(String containerIDFile);
+    default CreateContainerCmd withContainerIDFile(String containerIDFile) {
+        getHostConfig().withContainerIDFile(containerIDFile);
+        return this;
+    }
 
     @Deprecated
-    CreateContainerCmd withCpuPeriod(Integer cpuPeriod);
+    default CreateContainerCmd withCpuPeriod(Integer cpuPeriod) {
+        getHostConfig().withCpuPeriod(cpuPeriod != null ? cpuPeriod.longValue() : null);
+        return this;
+    }
 
     @Deprecated
-    CreateContainerCmd withCpuShares(Integer cpuShares);
+    default CreateContainerCmd withCpuShares(Integer cpuShares) {
+        getHostConfig().withCpuShares(cpuShares);
+        return this;
+    }
 
     @Deprecated
-    CreateContainerCmd withCpusetCpus(String cpusetCpus);
+    default CreateContainerCmd withCpusetCpus(String cpusetCpus) {
+        getHostConfig().withCpusetCpus(cpusetCpus);
+        return this;
+    }
 
     @Deprecated
-    CreateContainerCmd withCpusetMems(String cpusetMems);
+    default CreateContainerCmd withCpusetMems(String cpusetMems) {
+        getHostConfig().withCpusetMems(cpusetMems);
+        return this;
+    }
 
     @Deprecated
-    CreateContainerCmd withDevices(Device... devices);
+    default CreateContainerCmd withDevices(Device... devices) {
+        getHostConfig().withDevices(devices);
+        return this;
+    }
 
     /**
      * Add host devices to the container
      */
     @Deprecated
-    CreateContainerCmd withDevices(List<Device> devices);
+    default CreateContainerCmd withDevices(List<Device> devices) {
+        getHostConfig().withDevices(devices);
+        return this;
+    }
 
     /**
      * Set custom DNS servers
      */
     @Deprecated
-    CreateContainerCmd withDns(String... dns);
+    default CreateContainerCmd withDns(String... dns) {
+        getHostConfig().withDns(dns);
+        return this;
+    }
 
     /**
      * Set custom DNS servers
      */
     @Deprecated
-    CreateContainerCmd withDns(List<String> dns);
+    default CreateContainerCmd withDns(List<String> dns) {
+        getHostConfig().withDns(dns);
+        return this;
+    }
 
     /**
      * Set custom DNS search domains
      */
     @Deprecated
-    CreateContainerCmd withDnsSearch(String... dnsSearch);
+    default CreateContainerCmd withDnsSearch(String... dnsSearch) {
+        getHostConfig().withDnsSearch(dnsSearch);
+        return this;
+    }
 
     /**
      * Set custom DNS search domains
      */
     @Deprecated
-    CreateContainerCmd withDnsSearch(List<String> dnsSearch);
+    default CreateContainerCmd withDnsSearch(List<String> dnsSearch) {
+        getHostConfig().withDnsSearch(dnsSearch);
+        return this;
+    }
 
     @Deprecated
-    CreateContainerCmd withLogConfig(LogConfig logConfig);
+    default CreateContainerCmd withLogConfig(LogConfig logConfig) {
+        getHostConfig().withLogConfig(logConfig);
+        return this;
+    }
 
     @Deprecated
-    CreateContainerCmd withLxcConf(LxcConf... lxcConf);
+    default CreateContainerCmd withLxcConf(LxcConf... lxcConf) {
+        getHostConfig().withLxcConf(lxcConf);
+        return this;
+    }
 
     @Deprecated
-    CreateContainerCmd withLxcConf(List<LxcConf> lxcConf);
+    default CreateContainerCmd withLxcConf(List<LxcConf> lxcConf) {
+        getHostConfig().withLxcConf(lxcConf.toArray(new LxcConf[0]));
+        return this;
+    }
 
     @Deprecated
-    CreateContainerCmd withOomKillDisable(Boolean oomKillDisable);
+    default CreateContainerCmd withOomKillDisable(Boolean oomKillDisable) {
+        getHostConfig().withOomKillDisable(oomKillDisable);
+        return this;
+    }
 
     /**
      * Set the PID (Process) Namespace mode for the container, 'host': use the host's PID namespace inside the container
      */
     @Deprecated
-    CreateContainerCmd withPidMode(String pidMode);
+    default CreateContainerCmd withPidMode(String pidMode) {
+        getHostConfig().withPidMode(pidMode);
+        return this;
+    }
 
     @Deprecated
-    CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs);
+    default CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs) {
+        getHostConfig().withReadonlyRootfs(readonlyRootfs);
+        return this;
+    }
 
     /**
      * Set custom {@link RestartPolicy} for the container. Defaults to {@link RestartPolicy#noRestart()}
      */
     @Deprecated
-    CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy);
+    default CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) {
+        getHostConfig().withRestartPolicy(restartPolicy);
+        return this;
+    }
 
     @Deprecated
-    CreateContainerCmd withUlimits(Ulimit... ulimits);
+    @JsonIgnore
+    default CreateContainerCmd withUlimits(Ulimit... ulimits) {
+        getHostConfig().withUlimits(ulimits);
+        return this;
+    }
 
     @Deprecated
-    CreateContainerCmd withUlimits(List<Ulimit> ulimits);
+    default CreateContainerCmd withUlimits(List<Ulimit> ulimits) {
+        getHostConfig().withUlimits(ulimits);
+        return this;
+    }
 
     /**
      * @throws NotFoundException No such container
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 1360598de..f3089486e 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -7,24 +7,13 @@
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.AuthConfig;
-import com.github.dockerjava.api.model.Bind;
-import com.github.dockerjava.api.model.Capability;
 import com.github.dockerjava.api.model.ContainerNetwork;
-import com.github.dockerjava.api.model.Device;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.ExposedPorts;
 import com.github.dockerjava.api.model.HealthCheck;
 import com.github.dockerjava.api.model.HostConfig;
-import com.github.dockerjava.api.model.Link;
-import com.github.dockerjava.api.model.LogConfig;
-import com.github.dockerjava.api.model.LxcConf;
-import com.github.dockerjava.api.model.PortBinding;
-import com.github.dockerjava.api.model.Ports;
-import com.github.dockerjava.api.model.RestartPolicy;
-import com.github.dockerjava.api.model.Ulimit;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.Volumes;
-import com.github.dockerjava.api.model.VolumesFrom;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -165,44 +154,6 @@ public List<String> getAliases() {
         return aliases;
     }
 
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public Bind[] getBinds() {
-        return hostConfig.getBinds();
-    }
-
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public Integer getBlkioWeight() {
-        return hostConfig.getBlkioWeight();
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withBinds(Bind... binds) {
-        checkNotNull(binds, "binds was not specified");
-        hostConfig.setBinds(binds);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withBinds(List<Bind> binds) {
-        checkNotNull(binds, "binds was not specified");
-        return withBinds(binds.toArray(new Bind[binds.size()]));
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withBlkioWeight(Integer blkioWeight) {
-        hostConfig.withBlkioWeight(blkioWeight);
-        return this;
-    }
-
     @Override
     public CreateContainerCmd withAliases(String... aliases) {
         this.aliases = Arrays.asList(aliases);
@@ -222,63 +173,6 @@ public String[] getCmd() {
         return cmd;
     }
 
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public Integer getCpuPeriod() {
-        Long result = hostConfig.getCpuPeriod();
-        return result != null ? result.intValue() : null;
-    }
-
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public Integer getCpuShares() {
-        return hostConfig.getCpuShares();
-    }
-
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public String getCpusetCpus() {
-        return hostConfig.getCpusetCpus();
-    }
-
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public String getCpusetMems() {
-        return hostConfig.getCpusetMems();
-    }
-
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public Device[] getDevices() {
-        return hostConfig.getDevices();
-    }
-
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public String[] getDns() {
-        return hostConfig.getDns();
-    }
-
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public String[] getDnsSearch() {
-        return hostConfig.getDnsSearch();
-    }
-
     @Override
     public CreateContainerCmd withCmd(String... cmd) {
         checkNotNull(cmd, "cmd was not specified");
@@ -292,83 +186,6 @@ public CreateContainerCmd withCmd(List<String> cmd) {
         return withCmd(cmd.toArray(new String[0]));
     }
 
-    @Override
-    @Deprecated
-    public CreateContainerCmd withContainerIDFile(String containerIDFile) {
-        hostConfig.withContainerIDFile(containerIDFile);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withCpuPeriod(Integer cpuPeriod) {
-        hostConfig.withCpuPeriod(cpuPeriod != null ? cpuPeriod.longValue() : null);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withCpuShares(Integer cpuShares) {
-        hostConfig.withCpuShares(cpuShares);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withCpusetCpus(String cpusetCpus) {
-        hostConfig.withCpusetCpus(cpusetCpus);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withCpusetMems(String cpusetMems) {
-        hostConfig.withCpusetMems(cpusetMems);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withDevices(Device... devices) {
-        hostConfig.withDevices(devices);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withDevices(List<Device> devices) {
-        hostConfig.withDevices(devices);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withDns(String... dns) {
-        hostConfig.withDns(dns);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withDns(List<String> dns) {
-        hostConfig.withDns(dns);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withDnsSearch(String... dnsSearch) {
-        hostConfig.withDnsSearch(dnsSearch);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withDnsSearch(List<String> dnsSearch) {
-        hostConfig.withDnsSearch(dnsSearch);
-        return this;
-    }
-
     @CheckForNull
     public HealthCheck getHealthcheck() {
         return healthcheck;
@@ -476,14 +293,6 @@ public Integer getStopTimeout() {
         return stopTimeout;
     }
 
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public Ulimit[] getUlimits() {
-        return hostConfig.getUlimits();
-    }
-
     @Override
     public CreateContainerCmd withStopTimeout(Integer stopTimeout) {
         this.stopTimeout = stopTimeout;
@@ -539,89 +348,12 @@ public CreateContainerCmd withMacAddress(String macAddress) {
         return this;
     }
 
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public Long getMemory() {
-        return hostConfig.getMemory();
-    }
-
-    @Deprecated
-    @Override
-    public CreateContainerCmd withMemory(Long memory) {
-        checkNotNull(memory, "memory was not specified");
-        hostConfig.withMemory(memory);
-        return this;
-    }
-
-    @Deprecated
-    @Override
-    @JsonIgnore
-    public Long getMemorySwap() {
-        return hostConfig.getMemorySwap();
-    }
-
-    @Deprecated
-    @Override
-    public CreateContainerCmd withMemorySwap(Long memorySwap) {
-        checkNotNull(memorySwap, "memorySwap was not specified");
-        hostConfig.withMemorySwap(memorySwap);
-        return this;
-    }
-
 
     @Override
     public String getName() {
         return name;
     }
 
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public String getNetworkMode() {
-        return hostConfig.getNetworkMode();
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withNetworkMode(String networkMode) {
-        checkNotNull(networkMode, "networkMode was not specified");
-        this.hostConfig.withNetworkMode(networkMode);
-        return this;
-    }
-
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public Ports getPortBindings() {
-        return hostConfig.getPortBindings();
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withPortBindings(PortBinding... portBindings) {
-        checkNotNull(portBindings, "portBindings was not specified");
-        this.hostConfig.withPortBindings(new Ports(portBindings));
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withPortBindings(List<PortBinding> portBindings) {
-        checkNotNull(portBindings, "portBindings was not specified");
-        return withPortBindings(portBindings.toArray(new PortBinding[0]));
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withPortBindings(Ports portBindings) {
-        checkNotNull(portBindings, "portBindings was not specified");
-        this.hostConfig.withPortBindings(portBindings);
-        return this;
-    }
-
     @Override
     public CreateContainerCmd withName(String name) {
         checkNotNull(name, "name was not specified");
@@ -647,22 +379,6 @@ public CreateContainerCmd withPortSpecs(List<String> portSpecs) {
         return withPortSpecs(portSpecs.toArray(new String[0]));
     }
 
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public Boolean getPrivileged() {
-        return hostConfig.getPrivileged();
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withPrivileged(Boolean privileged) {
-        checkNotNull(privileged, "no privileged was specified");
-        this.hostConfig.withPrivileged(privileged);
-        return this;
-    }
-
     @Override
     public String getUser() {
         return user;
@@ -730,29 +446,6 @@ public CreateContainerCmd withVolumes(List<Volume> volumes) {
         return withVolumes(volumes.toArray(new Volume[0]));
     }
 
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public VolumesFrom[] getVolumesFrom() {
-        return hostConfig.getVolumesFrom();
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom) {
-        checkNotNull(volumesFrom, "volumesFrom was not specified");
-        this.hostConfig.withVolumesFrom(volumesFrom);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withVolumesFrom(List<VolumesFrom> volumesFrom) {
-        checkNotNull(volumesFrom, "volumesFrom was not specified");
-        return withVolumesFrom(volumesFrom.toArray(new VolumesFrom[volumesFrom.size()]));
-    }
-
     @Override
     public String getWorkingDir() {
         return workingDir;
@@ -815,150 +508,6 @@ public CreateContainerCmd withTty(Boolean tty) {
         return this;
     }
 
-    @Override
-    @Deprecated
-    public CreateContainerCmd withUlimits(Ulimit... ulimits) {
-        hostConfig.withUlimits(ulimits);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withUlimits(List<Ulimit> ulimits) {
-        hostConfig.withUlimits(ulimits);
-        return this;
-    }
-
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public Boolean getPublishAllPorts() {
-        return hostConfig.getPublishAllPorts();
-    }
-
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public Boolean getReadonlyRootfs() {
-        return hostConfig.getReadonlyRootfs();
-    }
-
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public RestartPolicy getRestartPolicy() {
-        return hostConfig.getRestartPolicy();
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts) {
-        checkNotNull(publishAllPorts, "no publishAllPorts was specified");
-        this.hostConfig.withPublishAllPorts(publishAllPorts);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs) {
-        hostConfig.withReadonlyRootfs(readonlyRootfs);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) {
-        hostConfig.withRestartPolicy(restartPolicy);
-        return this;
-    }
-
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public String[] getExtraHosts() {
-        return hostConfig.getExtraHosts();
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withExtraHosts(String... extraHosts) {
-        checkNotNull(extraHosts, "extraHosts was not specified");
-        this.hostConfig.withExtraHosts(extraHosts);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withExtraHosts(List<String> extraHosts) {
-        checkNotNull(extraHosts, "extraHosts was not specified");
-        return withExtraHosts(extraHosts.toArray(new String[extraHosts.size()]));
-    }
-
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public Capability[] getCapAdd() {
-        return hostConfig.getCapAdd();
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withCapAdd(Capability... capAdd) {
-        checkNotNull(capAdd, "capAdd was not specified");
-        hostConfig.withCapAdd(capAdd);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withCapAdd(List<Capability> capAdd) {
-        checkNotNull(capAdd, "capAdd was not specified");
-        return withCapAdd(capAdd.toArray(new Capability[capAdd.size()]));
-    }
-
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public Capability[] getCapDrop() {
-        return hostConfig.getCapDrop();
-    }
-
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public String getCgroupParent() {
-        return hostConfig.getCgroupParent();
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withCapDrop(Capability... capDrop) {
-        checkNotNull(capDrop, "capDrop was not specified");
-        hostConfig.withCapDrop(capDrop);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withCapDrop(List<Capability> capDrop) {
-        checkNotNull(capDrop, "capDrop was not specified");
-        return withCapDrop(capDrop.toArray(new Capability[capDrop.size()]));
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withCgroupParent(String cgroupParent) {
-        hostConfig.withCgroupParent(cgroupParent);
-        return this;
-    }
-
     @Override
     public HostConfig getHostConfig() {
         return hostConfig;
@@ -982,66 +531,6 @@ public CreateContainerCmd withIpv4Address(String ipv4Address) {
         return this;
     }
 
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public Link[] getLinks() {
-        return hostConfig.getLinks();
-    }
-
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public LogConfig getLogConfig() {
-        return hostConfig.getLogConfig();
-    }
-
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public LxcConf[] getLxcConf() {
-        return hostConfig.getLxcConf();
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withLinks(Link... links) {
-        checkNotNull(links, "links was not specified");
-        this.hostConfig.setLinks(links);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withLinks(List<Link> links) {
-        checkNotNull(links, "links was not specified");
-        return withLinks(links.toArray(new Link[links.size()]));
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withLogConfig(LogConfig logConfig) {
-        hostConfig.withLogConfig(logConfig);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withLxcConf(LxcConf... lxcConf) {
-        hostConfig.withLxcConf(lxcConf);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withLxcConf(List<LxcConf> lxcConf) {
-        hostConfig.withLxcConf(lxcConf.toArray(new LxcConf[0]));
-        return this;
-    }
-
     @Override
     public String getIpv6Address() {
         return ipv6Address;
@@ -1059,41 +548,11 @@ public List<String> getOnBuild() {
         return onBuild;
     }
 
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public Boolean getOomKillDisable() {
-        return hostConfig.getOomKillDisable();
-    }
-
-    @CheckForNull
-    @Override
-    @Deprecated
-    @JsonIgnore
-    public String getPidMode() {
-        return hostConfig.getPidMode();
-    }
-
     public CreateContainerCmdImpl withOnBuild(List<String> onBuild) {
         this.onBuild = onBuild;
         return this;
     }
 
-    @Override
-    @Deprecated
-    public CreateContainerCmd withOomKillDisable(Boolean oomKillDisable) {
-        hostConfig.withOomKillDisable(oomKillDisable);
-        return this;
-    }
-
-    @Override
-    @Deprecated
-    public CreateContainerCmd withPidMode(String pidMode) {
-        hostConfig.withPidMode(pidMode);
-        return this;
-    }
-
     /**
      * @throws NotFoundException No such container
      * @throws ConflictException Named container already exists

From 62d24ffd4e013f1e433e8a3cdf46d93754af0f91 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Wed, 18 Dec 2019 14:45:56 +0100
Subject: [PATCH 0956/1272] Always close unconsumed InputStreams (#1290)

---
 .../core/exec/ConnectToNetworkCmdExec.java    |  8 +++++++-
 .../exec/DisconnectFromNetworkCmdExec.java    |  8 +++++++-
 .../core/exec/InitializeSwarmCmdExec.java     |  9 +++++++--
 .../core/exec/JoinSwarmCmdExec.java           |  9 +++++++--
 .../core/exec/KillContainerCmdExec.java       |  8 +++++++-
 .../core/exec/LeaveSwarmCmdExec.java          |  9 +++++++--
 .../core/exec/PauseContainerCmdExec.java      |  8 +++++++-
 .../dockerjava/core/exec/PingCmdExec.java     |  8 +++++++-
 .../core/exec/RenameContainerCmdExec.java     |  8 +++++++-
 .../core/exec/RestartContainerCmdExec.java    |  8 +++++++-
 .../core/exec/StopContainerCmdExec.java       |  8 +++++++-
 .../dockerjava/core/exec/TagImageCmdExec.java |  8 +++++++-
 .../core/exec/UnpauseContainerCmdExec.java    |  8 +++++++-
 .../core/exec/UpdateServiceCmdExec.java       |  9 +++++++--
 .../core/exec/UpdateSwarmCmdExec.java         |  9 +++++++--
 .../core/exec/UpdateSwarmNodeCmdExec.java     |  9 +++++++--
 .../okhttp/OkHttpDockerCmdExecFactory.java    | 20 -------------------
 17 files changed, 112 insertions(+), 42 deletions(-)

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java
index ab9dbd24e..b67eb296a 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ConnectToNetworkCmdExec.java
@@ -6,6 +6,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+
 public class ConnectToNetworkCmdExec extends AbstrSyncDockerCmdExec<ConnectToNetworkCmd, Void>
         implements ConnectToNetworkCmd.Exec {
 
@@ -21,7 +23,11 @@ protected Void execute(ConnectToNetworkCmd command) {
         WebTarget webTarget = getBaseResource().path("/networks/" + command.getNetworkId() + "/connect");
 
         LOGGER.trace("POST: {}", webTarget);
-        webTarget.request().post(command);
+        try {
+            webTarget.request().post(command).close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
 
         return null;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java
index dba6d75fd..abfb5df1a 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/DisconnectFromNetworkCmdExec.java
@@ -6,6 +6,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+
 public class DisconnectFromNetworkCmdExec extends AbstrSyncDockerCmdExec<DisconnectFromNetworkCmd, Void>
         implements DisconnectFromNetworkCmd.Exec {
 
@@ -21,7 +23,11 @@ protected Void execute(DisconnectFromNetworkCmd command) {
         WebTarget webTarget = getBaseResource().path("/networks/" + command.getNetworkId() + "/disconnect");
 
         LOGGER.trace("POST: {}", webTarget);
-        webTarget.request().post(command);
+        try {
+            webTarget.request().post(command).close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
 
         return null;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java
index 2ec197097..ad7df8fd2 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InitializeSwarmCmdExec.java
@@ -8,6 +8,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+
 public class InitializeSwarmCmdExec extends AbstrSyncDockerCmdExec<InitializeSwarmCmd, Void>
         implements InitializeSwarmCmd.Exec {
 
@@ -22,8 +24,11 @@ protected Void execute(InitializeSwarmCmd command) {
         WebTarget webResource = getBaseResource().path("/swarm/init");
 
         LOGGER.trace("POST: {} ", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(command);
+        try {
+            webResource.request().accept(MediaType.APPLICATION_JSON).post(command).close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
         return null;
     }
 }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java
index 8f479675a..29070d1b6 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/JoinSwarmCmdExec.java
@@ -8,6 +8,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+
 public class JoinSwarmCmdExec extends AbstrSyncDockerCmdExec<JoinSwarmCmd, Void>
         implements JoinSwarmCmd.Exec {
 
@@ -22,8 +24,11 @@ protected Void execute(JoinSwarmCmd command) {
         WebTarget webResource = getBaseResource().path("/swarm/join");
 
         LOGGER.trace("POST: {} ", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(command);
+        try {
+            webResource.request().accept(MediaType.APPLICATION_JSON).post(command).close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
         return null;
     }
 }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java
index a8ea6c16c..c98b9f0f8 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/KillContainerCmdExec.java
@@ -8,6 +8,8 @@
 import com.github.dockerjava.core.MediaType;
 import com.github.dockerjava.core.WebTarget;
 
+import java.io.IOException;
+
 public class KillContainerCmdExec extends AbstrSyncDockerCmdExec<KillContainerCmd, Void> implements
         KillContainerCmd.Exec {
 
@@ -27,7 +29,11 @@ protected Void execute(KillContainerCmd command) {
         }
 
         LOGGER.trace("POST: {}", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON).post(null);
+        try {
+            webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
 
         return null;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java
index 1cded4938..fee9cea7a 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LeaveSwarmCmdExec.java
@@ -7,6 +7,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+
 public class LeaveSwarmCmdExec extends AbstrSyncDockerCmdExec<LeaveSwarmCmd, Void> implements LeaveSwarmCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LeaveSwarmCmdExec.class);
@@ -22,8 +24,11 @@ protected Void execute(LeaveSwarmCmd command) {
         webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled());
 
         LOGGER.trace("POST: {}", webTarget);
-        webTarget.request().accept(MediaType.APPLICATION_JSON)
-                .post(null);
+        try {
+            webTarget.request().accept(MediaType.APPLICATION_JSON).post(null).close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
 
         return null;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java
index b86e33611..a24b45a9b 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PauseContainerCmdExec.java
@@ -8,6 +8,8 @@
 import com.github.dockerjava.core.MediaType;
 import com.github.dockerjava.core.WebTarget;
 
+import java.io.IOException;
+
 public class PauseContainerCmdExec extends AbstrSyncDockerCmdExec<PauseContainerCmd, Void> implements
         PauseContainerCmd.Exec {
 
@@ -23,7 +25,11 @@ protected Void execute(PauseContainerCmd command) {
                 command.getContainerId());
 
         LOGGER.trace("POST: {}", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON).post(null);
+        try {
+            webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
 
         return null;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java
index 58ff3ad93..bbb078cf7 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PingCmdExec.java
@@ -7,6 +7,8 @@
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.WebTarget;
 
+import java.io.IOException;
+
 public class PingCmdExec extends AbstrSyncDockerCmdExec<PingCmd, Void> implements PingCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PingCmdExec.class);
@@ -20,7 +22,11 @@ protected Void execute(PingCmd command) {
         WebTarget webResource = getBaseResource().path("/_ping");
 
         LOGGER.trace("GET: {}", webResource);
-        webResource.request().get();
+        try {
+            webResource.request().get().close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
 
         return null;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java
index 2f16bdfb7..fdb312f1f 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RenameContainerCmdExec.java
@@ -7,6 +7,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+
 public class RenameContainerCmdExec extends AbstrSyncDockerCmdExec<RenameContainerCmd, Void>
         implements RenameContainerCmd.Exec {
     private static final Logger LOG = LoggerFactory.getLogger(RenameContainerCmdExec.class);
@@ -22,7 +24,11 @@ protected Void execute(RenameContainerCmd command) {
                 .queryParam("name", command.getName());
 
         LOG.trace("POST: {}", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON).post(null);
+        try {
+            webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
 
         return null;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java
index b87fbce22..ecb317a34 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java
@@ -8,6 +8,8 @@
 import com.github.dockerjava.core.MediaType;
 import com.github.dockerjava.core.WebTarget;
 
+import java.io.IOException;
+
 public class RestartContainerCmdExec extends AbstrSyncDockerCmdExec<RestartContainerCmd, Void> implements
         RestartContainerCmd.Exec {
 
@@ -27,7 +29,11 @@ protected Void execute(RestartContainerCmd command) {
         }
 
         LOGGER.trace("POST: {}", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON).post(null);
+        try {
+            webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
 
         return null;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java
index 90f707b93..85b139e93 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StopContainerCmdExec.java
@@ -8,6 +8,8 @@
 import com.github.dockerjava.core.MediaType;
 import com.github.dockerjava.core.WebTarget;
 
+import java.io.IOException;
+
 public class StopContainerCmdExec extends AbstrSyncDockerCmdExec<StopContainerCmd, Void> implements
         StopContainerCmd.Exec {
 
@@ -27,7 +29,11 @@ protected Void execute(StopContainerCmd command) {
         }
 
         LOGGER.trace("POST: {}", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON).post(null);
+        try {
+            webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
 
         return null;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java
index a99498b91..05ed13859 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TagImageCmdExec.java
@@ -7,6 +7,8 @@
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.WebTarget;
 
+import java.io.IOException;
+
 public class TagImageCmdExec extends AbstrSyncDockerCmdExec<TagImageCmd, Void> implements TagImageCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TagImageCmdExec.class);
@@ -23,7 +25,11 @@ protected Void execute(TagImageCmd command) {
         webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled());
 
         LOGGER.trace("POST: {}", webTarget);
-        webTarget.request().post(null);
+        try {
+            webTarget.request().post(null).close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
         return null;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java
index 3f7a98bf3..af23d9cb4 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UnpauseContainerCmdExec.java
@@ -8,6 +8,8 @@
 import com.github.dockerjava.core.MediaType;
 import com.github.dockerjava.core.WebTarget;
 
+import java.io.IOException;
+
 public class UnpauseContainerCmdExec extends AbstrSyncDockerCmdExec<UnpauseContainerCmd, Void> implements
         UnpauseContainerCmd.Exec {
 
@@ -23,7 +25,11 @@ protected Void execute(UnpauseContainerCmd command) {
                 command.getContainerId());
 
         LOGGER.trace("POST: {}", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON).post(null);
+        try {
+            webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
 
         return null;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java
index 26f65cea3..61eb8b271 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateServiceCmdExec.java
@@ -7,6 +7,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+
 /**
  * Update service settings.
  */
@@ -25,8 +27,11 @@ protected Void execute(UpdateServiceCmd command) {
                 .queryParam("version", command.getVersion());
 
         LOGGER.trace("POST: {}", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(command.getServiceSpec());
+        try {
+            webResource.request().accept(MediaType.APPLICATION_JSON).post(command.getServiceSpec()).close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
         return null;
     }
 }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java
index f73af5cc6..59b912dce 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmCmdExec.java
@@ -8,6 +8,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+
 public class UpdateSwarmCmdExec extends AbstrSyncDockerCmdExec<UpdateSwarmCmd, Void>
         implements UpdateSwarmCmd.Exec {
 
@@ -25,8 +27,11 @@ protected Void execute(UpdateSwarmCmd command) {
         webResource = booleanQueryParam(webResource, "rotateWorkertoken", command.getRotateWorkerToken());
 
         LOGGER.trace("POST: {} ", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(command.getSwarmSpec());
+        try {
+            webResource.request().accept(MediaType.APPLICATION_JSON).post(command.getSwarmSpec()).close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
         return null;
     }
 }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java
index 331e93f79..b050ba2bd 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/UpdateSwarmNodeCmdExec.java
@@ -8,6 +8,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+
 /**
  * Update swarmNode spec
  */
@@ -27,8 +29,11 @@ protected Void execute(UpdateSwarmNodeCmd command) {
                 .queryParam("version", command.getVersion());
 
         LOGGER.trace("POST: {}", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(command.getSwarmNodeSpec());
+        try {
+            webResource.request().accept(MediaType.APPLICATION_JSON).post(command.getSwarmNodeSpec()).close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
         return null;
     }
 }
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
index 9c1b3d889..fb34bce7a 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
@@ -1,19 +1,15 @@
 package com.github.dockerjava.okhttp;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.command.PingCmd;
 import com.github.dockerjava.core.AbstractDockerCmdExecFactory;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.SSLConfig;
-import com.github.dockerjava.core.WebTarget;
-import com.github.dockerjava.core.exec.PingCmdExec;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.MultimapBuilder;
 import okhttp3.ConnectionPool;
 import okhttp3.Dns;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
-import org.apache.commons.io.IOUtils;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.X509TrustManager;
@@ -120,22 +116,6 @@ protected OkHttpWebTarget getBaseResource() {
         );
     }
 
-    @Override
-    public PingCmd.Exec createPingCmdExec() {
-        return new PingCmdExec(getBaseResource(), getDockerClientConfig()) {
-
-            @Override
-            protected Void execute(PingCmd command) {
-                WebTarget webResource = getBaseResource().path("/_ping");
-
-                // TODO contribute to docker-java, make it close the stream
-                IOUtils.closeQuietly(webResource.request().get());
-
-                return null;
-            }
-        };
-    }
-
     @Override
     public void close() throws IOException {
 

From af15a0541fa366716a4ac2537800903221ccd994 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Wed, 18 Dec 2019 14:47:00 +0100
Subject: [PATCH 0957/1272] extend Jersey from AbstractDockerCmdExecFactory
 (#1289)

* Make Jersey transport extend from AbstractDockerCmdExecFactory

* Use Jackson directly

* fix async commands

* fix query param encoding

* restore `FactoryType.values()`
---
 .../core/async/JsonStreamProcessor.java       |  12 +-
 .../core/exec/StartContainerCmdExec.java      |  13 +-
 .../jaxrs/AbstrAsyncDockerCmdExec.java        |  68 ---
 .../dockerjava/jaxrs/AbstrDockerCmdExec.java  |  98 ----
 .../jaxrs/AbstrSyncDockerCmdExec.java         |  35 --
 .../dockerjava/jaxrs/ApacheUnixSocket.java    |   1 +
 .../jaxrs/AttachContainerCmdExec.java         |  46 --
 .../github/dockerjava/jaxrs/AuthCmdExec.java  |  39 --
 .../dockerjava/jaxrs/BuildImageCmdExec.java   | 155 ------
 .../dockerjava/jaxrs/CommitCmdExec.java       |  40 --
 .../jaxrs/ConnectToNetworkCmdExec.java        |  32 --
 .../jaxrs/ContainerDiffCmdExec.java           |  35 --
 .../CopyArchiveFromContainerCmdExec.java      |  37 --
 .../jaxrs/CopyArchiveToContainerCmdExec.java  |  37 --
 .../jaxrs/CopyFileFromContainerCmdExec.java   |  40 --
 .../jaxrs/CreateContainerCmdExec.java         |  36 --
 .../dockerjava/jaxrs/CreateImageCmdExec.java  |  37 --
 .../jaxrs/CreateNetworkCmdExec.java           |  31 --
 .../dockerjava/jaxrs/CreateSecretCmdExec.java |  32 --
 .../jaxrs/CreateServiceCmdExec.java           |  31 --
 .../dockerjava/jaxrs/CreateVolumeCmdExec.java |  32 --
 .../jaxrs/DisconnectFromNetworkCmdExec.java   |  32 --
 .../dockerjava/jaxrs/EventsCmdExec.java       |  42 --
 .../dockerjava/jaxrs/ExecCreateCmdExec.java   |  34 --
 .../dockerjava/jaxrs/ExecStartCmdExec.java    |  36 --
 .../github/dockerjava/jaxrs/InfoCmdExec.java  |  29 --
 .../jaxrs/InitializeSwarmCmdExec.java         |  32 --
 .../jaxrs/InspectContainerCmdExec.java        |  33 --
 .../dockerjava/jaxrs/InspectExecCmdExec.java  |  27 --
 .../dockerjava/jaxrs/InspectImageCmdExec.java |  30 --
 .../jaxrs/InspectNetworkCmdExec.java          |  29 --
 .../jaxrs/InspectServiceCmdExec.java          |  30 --
 .../dockerjava/jaxrs/InspectSwarmCmdExec.java |  29 --
 .../jaxrs/InspectSwarmNodeCmdExec.java        |  30 --
 .../jaxrs/InspectVolumeCmdExec.java           |  29 --
 .../jaxrs/JerseyDockerCmdExecFactory.java     | 451 +-----------------
 .../jaxrs/JerseyInvocationBuilder.java        | 193 ++++++++
 .../dockerjava/jaxrs/JerseyWebTarget.java     |  79 +++
 .../dockerjava/jaxrs/JoinSwarmCmdExec.java    |  32 --
 .../jaxrs/KillContainerCmdExec.java           |  36 --
 .../dockerjava/jaxrs/LeaveSwarmCmdExec.java   |  32 --
 .../jaxrs/ListContainersCmdExec.java          |  54 ---
 .../dockerjava/jaxrs/ListImagesCmdExec.java   |  50 --
 .../dockerjava/jaxrs/ListNetworksCmdExec.java |  46 --
 .../dockerjava/jaxrs/ListSecretsCmdExec.java  |  43 --
 .../dockerjava/jaxrs/ListServicesCmdExec.java |  44 --
 .../jaxrs/ListSwarmNodesCmdExec.java          |  42 --
 .../dockerjava/jaxrs/ListTasksCmdExec.java    |  43 --
 .../dockerjava/jaxrs/ListVolumesCmdExec.java  |  36 --
 .../dockerjava/jaxrs/LoadImageCmdExec.java    |  31 --
 .../dockerjava/jaxrs/LogContainerCmdExec.java |  49 --
 .../dockerjava/jaxrs/LogSwarmObjectExec.java  |  50 --
 .../jaxrs/PauseContainerCmdExec.java          |  32 --
 .../github/dockerjava/jaxrs/PingCmdExec.java  |  29 --
 .../github/dockerjava/jaxrs/PruneCmdExec.java |  41 --
 .../dockerjava/jaxrs/PullImageCmdExec.java    |  47 --
 .../dockerjava/jaxrs/PushImageCmdExec.java    |  51 --
 .../jaxrs/RemoveContainerCmdExec.java         |  34 --
 .../dockerjava/jaxrs/RemoveImageCmdExec.java  |  32 --
 .../jaxrs/RemoveNetworkCmdExec.java           |  30 --
 .../dockerjava/jaxrs/RemoveSecretCmdExec.java |  30 --
 .../jaxrs/RemoveServiceCmdExec.java           |  30 --
 .../jaxrs/RemoveSwarmNodeCmdExec.java         |  31 --
 .../dockerjava/jaxrs/RemoveVolumeCmdExec.java |  30 --
 .../jaxrs/RenameContainerCmdExec.java         |  30 --
 .../jaxrs/RestartContainerCmdExec.java        |  36 --
 .../dockerjava/jaxrs/SaveImageCmdExec.java    |  39 --
 .../dockerjava/jaxrs/SearchImagesCmdExec.java |  34 --
 .../jaxrs/StartContainerCmdExec.java          |  35 --
 .../github/dockerjava/jaxrs/StatsCmdExec.java |  35 --
 .../jaxrs/StopContainerCmdExec.java           |  35 --
 .../dockerjava/jaxrs/TagImageCmdExec.java     |  31 --
 .../dockerjava/jaxrs/TopContainerCmdExec.java |  36 --
 .../jaxrs/UnixConnectionSocketFactory.java    |   1 +
 .../jaxrs/UnpauseContainerCmdExec.java        |  32 --
 .../jaxrs/UpdateContainerCmdExec.java         |  36 --
 .../jaxrs/UpdateServiceCmdExec.java           |  36 --
 .../dockerjava/jaxrs/UpdateSwarmCmdExec.java  |  35 --
 .../jaxrs/UpdateSwarmNodeCmdExec.java         |  36 --
 .../dockerjava/jaxrs/VersionCmdExec.java      |  29 --
 .../jaxrs/WaitContainerCmdExec.java           |  42 --
 .../jaxrs/async/AbstractCallbackNotifier.java |  12 +-
 .../jaxrs/async/GETCallbackNotifier.java      |   3 +-
 .../jaxrs/async/POSTCallbackNotifier.java     |   1 +
 .../jaxrs/filter/FollowRedirectsFilter.java   |   1 +
 .../jaxrs/filter/JsonClientFilter.java        |   1 +
 .../jaxrs/filter/LoggingFilter.java           |   1 +
 .../filter/ResponseStatusExceptionFilter.java |   1 +
 .../jaxrs/filter/SelectiveLoggingFilter.java  |   1 +
 .../util/WrappedResponseInputStream.java      |   1 +
 .../com/github/dockerjava/cmd/StatsCmdIT.java |   6 +-
 .../core/async/JsonStreamProcessorTest.java   |   3 +-
 92 files changed, 325 insertions(+), 3321 deletions(-)
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java
 create mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyInvocationBuilder.java
 create mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyWebTarget.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
index 0a849f4f3..8829decac 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.dockerjava.api.async.ResultCallback;
@@ -23,7 +24,7 @@ public class JsonStreamProcessor<T> implements ResponseStreamProcessor<T> {
 
     private static final JsonFactory JSON_FACTORY = new JsonFactory();
 
-    private final Class<T> clazz;
+    private final TypeReference<T> typeReference;
 
     private final ObjectMapper objectMapper;
 
@@ -31,12 +32,13 @@ public class JsonStreamProcessor<T> implements ResponseStreamProcessor<T> {
     public JsonStreamProcessor(Class<T> clazz) {
         this(
                 DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(),
-                clazz
+                new TypeReference<T>() {
+                }
         );
     }
 
-    public JsonStreamProcessor(ObjectMapper objectMapper, Class<T> clazz) {
-        this.clazz = clazz;
+    public JsonStreamProcessor(ObjectMapper objectMapper, TypeReference<T> typeReference) {
+        this.typeReference = typeReference;
         this.objectMapper = objectMapper.copy().enable(JsonParser.Feature.AUTO_CLOSE_SOURCE);
     }
 
@@ -54,7 +56,7 @@ public void processResponseStream(InputStream response, ResultCallback<T> result
                     ObjectNode objectNode = objectMapper.readTree(jp);
                     // exclude empty item serialization into class #461
                     if (!objectNode.isEmpty(null)) {
-                        T next = objectMapper.treeToValue(objectNode, clazz);
+                        T next = objectMapper.convertValue(objectNode, typeReference);
                         resultCallback.onNext(next);
                     }
                 } catch (Exception e) {
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java
index c773f5a56..774a85c3d 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StartContainerCmdExec.java
@@ -8,6 +8,8 @@
 import com.github.dockerjava.core.MediaType;
 import com.github.dockerjava.core.WebTarget;
 
+import java.io.IOException;
+
 public class StartContainerCmdExec extends AbstrSyncDockerCmdExec<StartContainerCmd, Void> implements
         StartContainerCmd.Exec {
 
@@ -23,9 +25,14 @@ protected Void execute(StartContainerCmd command) {
                 command.getContainerId());
 
         LOGGER.trace("POST: {}", webResource);
-        webResource.request()
-                .accept(MediaType.APPLICATION_JSON)
-                .post(command);
+        try {
+            webResource.request()
+                    .accept(MediaType.APPLICATION_JSON)
+                    .post(null)
+                    .close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
 
         return null;
     }
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
deleted file mode 100644
index eac18ae8d..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import java.io.Closeable;
-import java.io.IOException;
-
-import javax.ws.rs.client.WebTarget;
-
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.command.AsyncDockerCmd;
-import com.github.dockerjava.api.command.DockerCmdAsyncExec;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
-
-public abstract class AbstrAsyncDockerCmdExec<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T>, A_RES_T> extends
-        AbstrDockerCmdExec implements DockerCmdAsyncExec<CMD_T, A_RES_T> {
-
-    public AbstrAsyncDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    public Void exec(CMD_T command, ResultCallback<A_RES_T> resultCallback) {
-        return execute(command, resultCallback);
-    }
-
-    protected final Void execute(final CMD_T command, final ResultCallback<A_RES_T> resultCallback) {
-
-        ResultCallback<A_RES_T> delegatingResultCallback = new ResultCallback<A_RES_T>() {
-
-            @Override
-            public void close() throws IOException {
-                resultCallback.close();
-                command.close();
-            }
-
-            @Override
-            public void onStart(Closeable closeable) {
-                resultCallback.onStart(closeable);
-            }
-
-            @Override
-            public void onNext(A_RES_T object) {
-                resultCallback.onNext(object);
-            }
-
-            @Override
-            public void onError(Throwable throwable) {
-                resultCallback.onError(throwable);
-            }
-
-            @Override
-            public void onComplete() {
-                resultCallback.onComplete();
-                command.close();
-            }
-        };
-
-        AbstractCallbackNotifier<A_RES_T> callbackNotifier = callbackNotifier(command, delegatingResultCallback);
-
-        AbstractCallbackNotifier.startAsyncProcessing(callbackNotifier);
-
-        return null;
-    }
-
-    protected abstract AbstractCallbackNotifier<A_RES_T> callbackNotifier(CMD_T command,
-            ResultCallback<A_RES_T> resultCallback);
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
deleted file mode 100644
index 3b93a8af2..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.github.dockerjava.api.model.AuthConfig;
-import com.github.dockerjava.api.model.AuthConfigurations;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.RemoteApiVersion;
-import com.google.common.io.BaseEncoding;
-
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.WebTarget;
-import java.io.IOException;
-
-import static com.github.dockerjava.core.RemoteApiVersion.UNKNOWN_VERSION;
-import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_19;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-public abstract class AbstrDockerCmdExec {
-
-    private final DockerClientConfig dockerClientConfig;
-
-    private final WebTarget baseResource;
-
-    protected final ObjectMapper objectMapper;
-
-    public AbstrDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        checkNotNull(baseResource, "baseResource was not specified");
-        checkNotNull(dockerClientConfig, "dockerClientConfig was not specified");
-        this.baseResource = baseResource;
-        this.dockerClientConfig = dockerClientConfig;
-        this.objectMapper = dockerClientConfig.getObjectMapper();
-        checkNotNull(objectMapper, "objectMapper was not specified");
-    }
-
-    protected WebTarget getBaseResource() {
-        return baseResource;
-    }
-
-    protected AuthConfigurations getBuildAuthConfigs() {
-        return dockerClientConfig.getAuthConfigurations();
-    }
-
-    protected String registryAuth(AuthConfig authConfig) {
-        try {
-            return BaseEncoding.base64Url().encode(objectMapper.writeValueAsString(authConfig).getBytes());
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    protected Invocation.Builder resourceWithAuthConfig(AuthConfig authConfig, Invocation.Builder request) {
-        request = request.header("X-Registry-Auth", registryAuth(authConfig));
-        return request;
-    }
-
-    protected Invocation.Builder resourceWithOptionalAuthConfig(AuthConfig authConfig, Invocation.Builder request) {
-        if (authConfig != null) {
-            request = resourceWithAuthConfig(authConfig, request);
-        }
-        return request;
-    }
-
-    protected String registryConfigs(AuthConfigurations authConfigs) {
-        try {
-            final String json;
-            final RemoteApiVersion apiVersion = dockerClientConfig.getApiVersion();
-
-            if (apiVersion.equals(UNKNOWN_VERSION)) {
-                ObjectNode rootNode = objectMapper.valueToTree(authConfigs.getConfigs()); // all registries
-                final ObjectNode authNodes = objectMapper.valueToTree(authConfigs); // wrapped in "configs":{}
-                rootNode.setAll(authNodes); // merge 2 variants
-                json = rootNode.toString();
-            } else if (apiVersion.isGreaterOrEqual(VERSION_1_19)) {
-                json = objectMapper.writeValueAsString(authConfigs.getConfigs());
-            } else {
-                json = objectMapper.writeValueAsString(authConfigs);
-            }
-
-            return BaseEncoding.base64Url().encode(json.getBytes());
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    protected boolean bool(Boolean bool) {
-        return bool != null && bool;
-    }
-
-    protected WebTarget booleanQueryParam(WebTarget webTarget, String name, Boolean value) {
-        if (bool(value)) {
-            webTarget = webTarget.queryParam(name, bool(value) + "");
-        }
-
-        return webTarget;
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
deleted file mode 100644
index ed7d3adf0..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.client.WebTarget;
-
-import com.github.dockerjava.api.command.DockerCmd;
-import com.github.dockerjava.api.command.DockerCmdSyncExec;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public abstract class AbstrSyncDockerCmdExec<CMD_T extends DockerCmd<RES_T>, RES_T> extends AbstrDockerCmdExec
-        implements DockerCmdSyncExec<CMD_T, RES_T> {
-
-    public AbstrSyncDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    public RES_T exec(CMD_T command) {
-        // this hack works because of ResponseStatusExceptionFilter
-        try (CMD_T cmd = command) {
-            try {
-                return execute(cmd);
-            } catch (ProcessingException e) {
-                if (e.getCause() instanceof DockerException) {
-                    throw (DockerException) e.getCause();
-                } else {
-                    throw e;
-                }
-            }
-        }
-    }
-
-    protected abstract RES_T execute(CMD_T command);
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
index 50459de8c..e64e252f8 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
@@ -41,6 +41,7 @@
  *
  * This class also noop's any calls to setReuseAddress, which is called by the Apache client but isn't supported by AFUnixSocket.
  */
+@Deprecated
 public class ApacheUnixSocket extends Socket {
 
     private final AFUNIXSocket inner;
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
deleted file mode 100644
index 6131d48a1..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.command.AttachContainerCmd;
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.async.FrameStreamProcessor;
-import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
-import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
-
-public class AttachContainerCmdExec extends AbstrAsyncDockerCmdExec<AttachContainerCmd, Frame> implements
-        AttachContainerCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(AttachContainerCmdExec.class);
-
-    public AttachContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected AbstractCallbackNotifier<Frame> callbackNotifier(AttachContainerCmd command,
-            ResultCallback<Frame> resultCallback) {
-
-        if (command.getStdin() != null) {
-            throw new UnsupportedOperationException(
-                    "Passing stdin to the container is currently not supported. Try experimental netty engine!");
-        }
-
-        WebTarget webTarget = getBaseResource().path("/containers/{id}/attach").resolveTemplate("id",
-                command.getContainerId());
-
-        webTarget = booleanQueryParam(webTarget, "logs", command.hasLogsEnabled());
-        webTarget = booleanQueryParam(webTarget, "stdout", command.hasStdoutEnabled());
-        webTarget = booleanQueryParam(webTarget, "stderr", command.hasStderrEnabled());
-        webTarget = booleanQueryParam(webTarget, "stream", command.hasFollowStreamEnabled());
-
-        LOGGER.trace("POST: {}", webTarget);
-
-        return new POSTCallbackNotifier<>(new FrameStreamProcessor(), resultCallback, webTarget.request(), null);
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
deleted file mode 100644
index 6812e397a..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/AuthCmdExec.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import static javax.ws.rs.client.Entity.entity;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.AuthCmd;
-import com.github.dockerjava.api.exception.UnauthorizedException;
-import com.github.dockerjava.api.model.AuthResponse;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class AuthCmdExec extends AbstrSyncDockerCmdExec<AuthCmd, AuthResponse> implements AuthCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(AuthCmdExec.class);
-
-    public AuthCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected AuthResponse execute(AuthCmd command) {
-        WebTarget webResource = getBaseResource().path("/auth");
-        LOGGER.trace("POST: {}", webResource);
-        Response response = webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(entity(command.getAuthConfig(), MediaType.APPLICATION_JSON));
-
-        if (response.getStatus() == 401) {
-            throw new UnauthorizedException("Unauthorized");
-        }
-
-        return response.readEntity(AuthResponse.class);
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
deleted file mode 100644
index 20dd5396d..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import static javax.ws.rs.client.Entity.entity;
-import static org.apache.commons.lang.StringUtils.isNotBlank;
-
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import com.github.dockerjava.core.util.CacheFromEncoder;
-import org.glassfish.jersey.client.ClientProperties;
-import org.glassfish.jersey.client.RequestEntityProcessing;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.command.BuildImageCmd;
-import com.github.dockerjava.api.model.AuthConfigurations;
-import com.github.dockerjava.api.model.BuildResponseItem;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.async.JsonStreamProcessor;
-import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
-import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
-
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.Map;
-
-public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem> implements
-        BuildImageCmd.Exec {
-    private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageCmdExec.class);
-
-    public BuildImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    private Invocation.Builder resourceWithOptionalAuthConfig(BuildImageCmd command, Invocation.Builder request) {
-        final AuthConfigurations authConfigs = firstNonNull(command.getBuildAuthConfigs(), getBuildAuthConfigs());
-        if (authConfigs != null && !authConfigs.getConfigs().isEmpty()) {
-            request = request.header("X-Registry-Config", registryConfigs(authConfigs));
-        }
-        return request;
-    }
-
-    private static AuthConfigurations firstNonNull(final AuthConfigurations fromCommand,
-            final AuthConfigurations fromConfig) {
-        if (fromCommand != null) {
-            return fromCommand;
-        }
-        if (fromConfig != null) {
-            return fromConfig;
-        }
-        return null;
-    }
-
-    @Override
-    protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImageCmd command,
-            ResultCallback<BuildResponseItem> resultCallback) {
-
-        WebTarget webTarget = getBaseResource().path("/build");
-        String dockerFilePath = command.getPathToDockerfile();
-
-        if (dockerFilePath != null && command.getRemote() == null && !"Dockerfile".equals(dockerFilePath)) {
-            webTarget = webTarget.queryParam("dockerfile", dockerFilePath);
-        }
-
-        if (command.getTags() != null && !command.getTags().isEmpty()) {
-            for (String t : command.getTags()) {
-                webTarget = webTarget.queryParam("t", t);
-            }
-        } else if (isNotBlank(command.getTag())) {
-            webTarget = webTarget.queryParam("t", command.getTag());
-        }
-
-        if (command.getCacheFrom() != null && !command.getCacheFrom().isEmpty()) {
-            webTarget = webTarget.queryParam("cachefrom", CacheFromEncoder.jsonEncode(command.getCacheFrom()));
-        }
-
-        if (command.getRemote() != null) {
-            webTarget = webTarget.queryParam("remote", command.getRemote().toString());
-        }
-
-        webTarget = booleanQueryParam(webTarget, "q", command.isQuiet());
-        webTarget = booleanQueryParam(webTarget, "nocache", command.hasNoCacheEnabled());
-        webTarget = booleanQueryParam(webTarget, "pull", command.hasPullEnabled());
-        webTarget = booleanQueryParam(webTarget, "rm", command.hasRemoveEnabled());
-        webTarget = booleanQueryParam(webTarget, "forcerm", command.isForcerm());
-
-        // this has to be handled differently as it should switch to 'false'
-        if (command.hasRemoveEnabled() == null || !command.hasRemoveEnabled()) {
-            webTarget = webTarget.queryParam("rm", "false");
-        }
-
-        if (command.getMemory() != null) {
-            webTarget = webTarget.queryParam("memory", command.getMemory());
-        }
-        if (command.getMemswap() != null) {
-            webTarget = webTarget.queryParam("memswap", command.getMemswap());
-        }
-        if (command.getCpushares() != null) {
-            webTarget = webTarget.queryParam("cpushares", command.getCpushares());
-        }
-        if (command.getCpusetcpus() != null) {
-            webTarget = webTarget.queryParam("cpusetcpus", command.getCpusetcpus());
-        }
-
-        if (command.hasRemoveEnabled() == null || !command.hasRemoveEnabled()) {
-            webTarget = webTarget.queryParam("rm", "false");
-        }
-
-        webTarget = writeMap(webTarget, "buildargs", command.getBuildArgs());
-
-        if (command.getShmsize() != null) {
-            webTarget = webTarget.queryParam("shmsize", command.getShmsize());
-        }
-
-        webTarget = writeMap(webTarget, "labels", command.getLabels());
-
-        if (command.getNetworkMode() != null) {
-            webTarget = webTarget.queryParam("networkmode", command.getNetworkMode());
-        }
-
-        if (command.getPlatform() != null) {
-            webTarget = webTarget.queryParam("platform", command.getPlatform());
-        }
-
-        if (command.getTarget() != null) {
-            webTarget = webTarget.queryParam("target", command.getTarget());
-        }
-
-        webTarget.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED);
-        webTarget.property(ClientProperties.CHUNKED_ENCODING_SIZE, 1024 * 1024);
-
-        LOGGER.trace("POST: {}", webTarget);
-
-        return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(objectMapper, BuildResponseItem.class),
-                resultCallback,
-                resourceWithOptionalAuthConfig(command, webTarget.request()).accept(MediaType.TEXT_PLAIN),
-                entity(command.getTarInputStream(), "application/tar")
-        );
-    }
-
-    private WebTarget writeMap(WebTarget webTarget, String name, Map<String, String> value) {
-        if (value != null && !value.isEmpty()) {
-            try {
-                return webTarget.queryParam(name,
-                        URLEncoder.encode(objectMapper.writeValueAsString(value), "UTF-8").replaceAll("\\+", "%20"));
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        } else {
-            return webTarget;
-        }
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
deleted file mode 100644
index f9ed0d5df..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CommitCmdExec.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import static javax.ws.rs.client.Entity.entity;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.github.dockerjava.api.command.CommitCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class CommitCmdExec extends AbstrSyncDockerCmdExec<CommitCmd, String> implements CommitCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CommitCmdExec.class);
-
-    public CommitCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected String execute(CommitCmd command) {
-        WebTarget webTarget = getBaseResource().path("/commit")
-                .queryParam("container", command.getContainerId())
-                .queryParam("repo", command.getRepository())
-                .queryParam("tag", command.getTag())
-                .queryParam("m", command.getMessage())
-                .queryParam("author", command.getAuthor());
-
-        webTarget = booleanQueryParam(webTarget, "pause", command.hasPauseEnabled());
-
-        LOGGER.trace("POST: {}", webTarget);
-        ObjectNode objectNode = webTarget.request().accept("application/vnd.docker.raw-stream")
-                .post(entity(command, MediaType.APPLICATION_JSON), ObjectNode.class);
-        return objectNode.get("Id").asText();
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java
deleted file mode 100644
index 8a69b31fd..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ConnectToNetworkCmdExec.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.ConnectToNetworkCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import static javax.ws.rs.client.Entity.entity;
-
-public class ConnectToNetworkCmdExec extends AbstrSyncDockerCmdExec<ConnectToNetworkCmd, Void>
-        implements ConnectToNetworkCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ConnectToNetworkCmdExec.class);
-
-    public ConnectToNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(ConnectToNetworkCmd command) {
-
-        WebTarget webTarget = getBaseResource().path("/networks/" + command.getNetworkId() + "/connect");
-
-        LOGGER.trace("POST: {}", webTarget);
-        webTarget.request().post(entity(command, MediaType.APPLICATION_JSON));
-
-        return null;
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java
deleted file mode 100644
index 29cbeebf7..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ContainerDiffCmdExec.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import java.util.List;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.ContainerDiffCmd;
-import com.github.dockerjava.api.model.ChangeLog;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class ContainerDiffCmdExec extends AbstrSyncDockerCmdExec<ContainerDiffCmd, List<ChangeLog>> implements
-        ContainerDiffCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ContainerDiffCmdExec.class);
-
-    public ContainerDiffCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected List<ChangeLog> execute(ContainerDiffCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/changes").resolveTemplate("id",
-                command.getContainerId());
-
-        LOGGER.trace("GET: {}", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON).get(new GenericType<List<ChangeLog>>() {
-        });
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java
deleted file mode 100644
index 7b6a6e2f4..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveFromContainerCmdExec.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import java.io.InputStream;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Response;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
-
-public class CopyArchiveFromContainerCmdExec extends AbstrSyncDockerCmdExec<CopyArchiveFromContainerCmd, InputStream>
-        implements CopyArchiveFromContainerCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CopyArchiveFromContainerCmdExec.class);
-
-    public CopyArchiveFromContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected InputStream execute(CopyArchiveFromContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/archive").resolveTemplate("id",
-                command.getContainerId());
-
-        LOGGER.trace("Get: " + webResource.toString());
-
-        Response response = webResource.queryParam("path", command.getResource()).request().accept("application/x-tar")
-                .get();
-
-        return new WrappedResponseInputStream(response);
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java
deleted file mode 100644
index b38d337a8..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyArchiveToContainerCmdExec.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import static javax.ws.rs.client.Entity.entity;
-
-import java.io.InputStream;
-
-import javax.ws.rs.client.WebTarget;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class CopyArchiveToContainerCmdExec extends AbstrSyncDockerCmdExec<CopyArchiveToContainerCmd, Void> implements
-        CopyArchiveToContainerCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CopyArchiveFromContainerCmdExec.class);
-
-    public CopyArchiveToContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(CopyArchiveToContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/archive").resolveTemplate("id",
-                command.getContainerId());
-
-        LOGGER.trace("PUT: " + webResource.toString());
-        InputStream streamToUpload = command.getTarInputStream();
-        webResource.queryParam("path", command.getRemotePath())
-                .queryParam("noOverwriteDirNonDir", command.isNoOverwriteDirNonDir()).request()
-                .put(entity(streamToUpload, "application/x-tar")).close();
-        return null;
-
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
deleted file mode 100644
index 6afffe0c4..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CopyFileFromContainerCmdExec.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import static javax.ws.rs.client.Entity.entity;
-
-import java.io.InputStream;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
-
-public class CopyFileFromContainerCmdExec extends AbstrSyncDockerCmdExec<CopyFileFromContainerCmd, InputStream>
-        implements CopyFileFromContainerCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CopyFileFromContainerCmdExec.class);
-
-    public CopyFileFromContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected InputStream execute(CopyFileFromContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/copy").resolveTemplate("id",
-                command.getContainerId());
-
-        LOGGER.trace("POST: " + webResource.toString());
-
-        Response response = webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE)
-                .post(entity(command, MediaType.APPLICATION_JSON));
-
-        return new WrappedResponseInputStream(response);
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
deleted file mode 100644
index 527b3954f..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateContainerCmdExec.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.CreateContainerCmd;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import static javax.ws.rs.client.Entity.entity;
-
-public class CreateContainerCmdExec extends AbstrSyncDockerCmdExec<CreateContainerCmd, CreateContainerResponse>
-        implements CreateContainerCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CreateContainerCmdExec.class);
-
-    public CreateContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected CreateContainerResponse execute(CreateContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/create");
-
-        if (command.getName() != null) {
-            webResource = webResource.queryParam("name", command.getName());
-        }
-
-        LOGGER.trace("POST: {} ", webResource);
-        return resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request()).accept(MediaType.APPLICATION_JSON)
-                .post(entity(command, MediaType.APPLICATION_JSON), CreateContainerResponse.class);
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
deleted file mode 100644
index dc1c9e1af..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateImageCmdExec.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import static javax.ws.rs.client.Entity.entity;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.CreateImageCmd;
-import com.github.dockerjava.api.command.CreateImageResponse;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class CreateImageCmdExec extends AbstrSyncDockerCmdExec<CreateImageCmd, CreateImageResponse> implements
-        CreateImageCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CreateImageCmdExec.class);
-
-    public CreateImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected CreateImageResponse execute(CreateImageCmd command) {
-        WebTarget webResource = getBaseResource().path("/images/create").queryParam("repo", command.getRepository())
-                .queryParam("tag", command.getTag()).queryParam("fromSrc", "-");
-
-        if (command.getPlatform() != null) {
-            webResource = webResource.queryParam("platform", command.getPlatform());
-        }
-
-        LOGGER.trace("POST: {}", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_OCTET_STREAM_TYPE)
-                .post(entity(command.getImageStream(), MediaType.APPLICATION_OCTET_STREAM), CreateImageResponse.class);
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java
deleted file mode 100644
index 14f22b502..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateNetworkCmdExec.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.CreateNetworkCmd;
-import com.github.dockerjava.api.command.CreateNetworkResponse;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import static javax.ws.rs.client.Entity.entity;
-
-public class CreateNetworkCmdExec extends AbstrSyncDockerCmdExec<CreateNetworkCmd, CreateNetworkResponse> implements
-        CreateNetworkCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CreateNetworkCmdExec.class);
-
-    public CreateNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected CreateNetworkResponse execute(CreateNetworkCmd command) {
-        WebTarget webResource = getBaseResource().path("/networks/create");
-
-        LOGGER.trace("POST: {}", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(entity(command, MediaType.APPLICATION_JSON), CreateNetworkResponse.class);
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java
deleted file mode 100644
index db85900de..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateSecretCmdExec.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.CreateSecretCmd;
-import com.github.dockerjava.api.command.CreateSecretResponse;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import static javax.ws.rs.client.Entity.entity;
-
-public class CreateSecretCmdExec extends AbstrSyncDockerCmdExec<CreateSecretCmd, CreateSecretResponse>
-        implements CreateSecretCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CreateSecretCmdExec.class);
-
-    public CreateSecretCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected CreateSecretResponse execute(CreateSecretCmd command) {
-        WebTarget webResource = getBaseResource().path("/secrets/create");
-
-
-        LOGGER.trace("POST: {} ", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(entity(command.getSecretSpec(), MediaType.APPLICATION_JSON), CreateSecretResponse.class);
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java
deleted file mode 100644
index aa000e71a..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateServiceCmdExec.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.CreateServiceCmd;
-import com.github.dockerjava.api.command.CreateServiceResponse;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import static javax.ws.rs.client.Entity.entity;
-
-public class CreateServiceCmdExec extends AbstrSyncDockerCmdExec<CreateServiceCmd, CreateServiceResponse>
-        implements CreateServiceCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CreateServiceCmdExec.class);
-
-    public CreateServiceCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected CreateServiceResponse execute(CreateServiceCmd command) {
-        WebTarget webResource = getBaseResource().path("/services/create");
-
-        LOGGER.trace("POST: {} ", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(entity(command.getServiceSpec(), MediaType.APPLICATION_JSON), CreateServiceResponse.class);
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java
deleted file mode 100644
index c71d2297e..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/CreateVolumeCmdExec.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import static javax.ws.rs.client.Entity.entity;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.CreateVolumeCmd;
-import com.github.dockerjava.api.command.CreateVolumeResponse;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class CreateVolumeCmdExec extends AbstrSyncDockerCmdExec<CreateVolumeCmd, CreateVolumeResponse> implements
-        CreateVolumeCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CreateVolumeCmdExec.class);
-
-    public CreateVolumeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected CreateVolumeResponse execute(CreateVolumeCmd command) {
-        WebTarget webResource = getBaseResource().path("/volumes/create");
-
-        LOGGER.trace("POST: {}", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(entity(command, MediaType.APPLICATION_JSON), CreateVolumeResponse.class);
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java
deleted file mode 100644
index 95c3f5c22..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/DisconnectFromNetworkCmdExec.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import static javax.ws.rs.client.Entity.entity;
-
-public class DisconnectFromNetworkCmdExec extends AbstrSyncDockerCmdExec<DisconnectFromNetworkCmd, Void>
-        implements DisconnectFromNetworkCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(DisconnectFromNetworkCmdExec.class);
-
-    public DisconnectFromNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(DisconnectFromNetworkCmd command) {
-
-        WebTarget webTarget = getBaseResource().path("/networks/" + command.getNetworkId() + "/disconnect");
-
-        LOGGER.trace("POST: {}", webTarget);
-        webTarget.request().post(entity(command, MediaType.APPLICATION_JSON));
-
-        return null;
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
deleted file mode 100644
index d6cb6aeed..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
-import javax.ws.rs.client.WebTarget;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.command.EventsCmd;
-import com.github.dockerjava.api.model.Event;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.async.JsonStreamProcessor;
-import com.github.dockerjava.core.util.FiltersEncoder;
-import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
-import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
-
-public class EventsCmdExec extends AbstrAsyncDockerCmdExec<EventsCmd, Event> implements EventsCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(EventsCmdExec.class);
-
-    public EventsCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected AbstractCallbackNotifier<Event> callbackNotifier(EventsCmd command, ResultCallback<Event> resultCallback) {
-        WebTarget webTarget = getBaseResource().path("/events").queryParam("since", command.getSince())
-                .queryParam("until", command.getUntil());
-
-        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
-            webTarget = webTarget
-                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
-        }
-
-        LOGGER.trace("GET: {}", webTarget);
-
-        return new GETCallbackNotifier<>(new JsonStreamProcessor<>(objectMapper, Event.class), resultCallback,
-                webTarget.request());
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
deleted file mode 100644
index 4de6eedd2..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecCreateCmdExec.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import static javax.ws.rs.client.Entity.entity;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.ExecCreateCmd;
-import com.github.dockerjava.api.command.ExecCreateCmdResponse;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class ExecCreateCmdExec extends AbstrSyncDockerCmdExec<ExecCreateCmd, ExecCreateCmdResponse> implements
-        ExecCreateCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(VersionCmdExec.class);
-
-    public ExecCreateCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected ExecCreateCmdResponse execute(ExecCreateCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/exec").resolveTemplate("id",
-                command.getContainerId());
-
-        LOGGER.trace("POST: {}", webResource);
-
-        return webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(entity(command, MediaType.APPLICATION_JSON), ExecCreateCmdResponse.class);
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
deleted file mode 100644
index 291cc2212..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ExecStartCmdExec.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import static javax.ws.rs.client.Entity.entity;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.command.ExecStartCmd;
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.async.FrameStreamProcessor;
-import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
-import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
-
-public class ExecStartCmdExec extends AbstrAsyncDockerCmdExec<ExecStartCmd, Frame> implements ExecStartCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ExecStartCmdExec.class);
-
-    public ExecStartCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected AbstractCallbackNotifier<Frame> callbackNotifier(ExecStartCmd command,
-            ResultCallback<Frame> resultCallback) {
-        WebTarget webTarget = getBaseResource().path("/exec/{id}/start").resolveTemplate("id", command.getExecId());
-
-        LOGGER.trace("POST: {}", webTarget);
-
-        return new POSTCallbackNotifier<>(new FrameStreamProcessor(), resultCallback, webTarget.request().accept(
-                MediaType.APPLICATION_JSON), entity(command, MediaType.APPLICATION_JSON));
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
deleted file mode 100644
index c544571ef..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InfoCmdExec.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.InfoCmd;
-import com.github.dockerjava.api.model.Info;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class InfoCmdExec extends AbstrSyncDockerCmdExec<InfoCmd, Info> implements InfoCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(InfoCmdExec.class);
-
-    public InfoCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Info execute(InfoCmd command) {
-        WebTarget webResource = getBaseResource().path("/info");
-
-        LOGGER.trace("GET: {}", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON).get(Info.class);
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java
deleted file mode 100644
index b3cdc83d4..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InitializeSwarmCmdExec.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-
-import com.github.dockerjava.api.command.InitializeSwarmCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import static javax.ws.rs.client.Entity.entity;
-
-public class InitializeSwarmCmdExec extends AbstrSyncDockerCmdExec<InitializeSwarmCmd, Void>
-        implements InitializeSwarmCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(InitializeSwarmCmdExec.class);
-
-    public InitializeSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(InitializeSwarmCmd command) {
-        WebTarget webResource = getBaseResource().path("/swarm/init");
-
-        LOGGER.trace("POST: {} ", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(entity(command, MediaType.APPLICATION_JSON)).close();
-        return null;
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
deleted file mode 100644
index 0599f04a1..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectContainerCmdExec.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.InspectContainerCmd;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class InspectContainerCmdExec extends AbstrSyncDockerCmdExec<InspectContainerCmd, InspectContainerResponse>
-        implements InspectContainerCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(InspectContainerCmdExec.class);
-
-    public InspectContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected InspectContainerResponse execute(InspectContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/json")
-                                                 .resolveTemplate("id", command.getContainerId());
-
-        webResource = booleanQueryParam(webResource, "size", command.getSize());
-
-        LOGGER.debug("GET: {}", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectContainerResponse.class);
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
deleted file mode 100644
index 4290d0371..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectExecCmdExec.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.InspectExecCmd;
-import com.github.dockerjava.api.command.InspectExecResponse;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class InspectExecCmdExec extends AbstrSyncDockerCmdExec<InspectExecCmd, InspectExecResponse> implements
-        InspectExecCmd.Exec {
-    private static final Logger LOGGER = LoggerFactory.getLogger(InspectExecCmdExec.class);
-
-    public InspectExecCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected InspectExecResponse execute(InspectExecCmd command) {
-        WebTarget webResource = getBaseResource().path("/exec/{id}/json").resolveTemplate("id", command.getExecId());
-        LOGGER.debug("GET: {}", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectExecResponse.class);
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java
deleted file mode 100644
index c1ef42424..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectImageCmdExec.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.InspectImageCmd;
-import com.github.dockerjava.api.command.InspectImageResponse;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class InspectImageCmdExec extends AbstrSyncDockerCmdExec<InspectImageCmd, InspectImageResponse> implements
-        InspectImageCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(InspectImageCmdExec.class);
-
-    public InspectImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected InspectImageResponse execute(InspectImageCmd command) {
-        WebTarget webResource = getBaseResource().path("/images/{id}/json").resolveTemplate("id", command.getImageId());
-
-        LOGGER.trace("GET: {}", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectImageResponse.class);
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java
deleted file mode 100644
index c9b19f881..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectNetworkCmdExec.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.InspectNetworkCmd;
-import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-public class InspectNetworkCmdExec extends AbstrSyncDockerCmdExec<InspectNetworkCmd, Network> implements InspectNetworkCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ListNetworksCmdExec.class);
-
-    public InspectNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Network execute(InspectNetworkCmd command) {
-
-        WebTarget webResource = getBaseResource().path("/networks/{id}").resolveTemplate("id",
-                command.getNetworkId());
-
-        LOGGER.debug("GET: {}", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON).get(Network.class);
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java
deleted file mode 100644
index 480103b43..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectServiceCmdExec.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.InspectServiceCmd;
-import com.github.dockerjava.api.model.Service;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-public class InspectServiceCmdExec extends AbstrSyncDockerCmdExec<InspectServiceCmd, Service>
-        implements InspectServiceCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(InspectServiceCmdExec.class);
-
-    public InspectServiceCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Service execute(InspectServiceCmd command) {
-        WebTarget webResource = getBaseResource().path("/services/{id}")
-                                                 .resolveTemplate("id", command.getServiceId());
-
-        LOGGER.debug("GET: {}", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON).get(Service.class);
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java
deleted file mode 100644
index 87aa167c6..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmCmdExec.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-
-import com.github.dockerjava.api.command.InspectSwarmCmd;
-import com.github.dockerjava.api.model.Swarm;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-public class InspectSwarmCmdExec extends AbstrSyncDockerCmdExec<InspectSwarmCmd, Swarm>
-        implements InspectSwarmCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(InspectSwarmCmdExec.class);
-
-    public InspectSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Swarm execute(InspectSwarmCmd command) {
-        WebTarget webResource = getBaseResource().path("/swarm");
-
-        LOGGER.debug("GET: {}", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON).get(Swarm.class);
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java
deleted file mode 100644
index ff0075271..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectSwarmNodeCmdExec.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-
-import com.github.dockerjava.api.command.InspectSwarmNodeCmd;
-import com.github.dockerjava.api.model.SwarmNode;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-public class InspectSwarmNodeCmdExec extends AbstrSyncDockerCmdExec<InspectSwarmNodeCmd, SwarmNode>
-        implements InspectSwarmNodeCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(InspectSwarmNodeCmdExec.class);
-
-    public InspectSwarmNodeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected SwarmNode execute(InspectSwarmNodeCmd command) {
-        WebTarget webResource = getBaseResource().path("/nodes/{id}")
-                .resolveTemplate("id", command.getSwarmNodeId());
-
-        LOGGER.debug("GET: {}", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON).get(SwarmNode.class);
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java
deleted file mode 100644
index 9ca2ac02a..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/InspectVolumeCmdExec.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.InspectVolumeCmd;
-import com.github.dockerjava.api.command.InspectVolumeResponse;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class InspectVolumeCmdExec extends AbstrSyncDockerCmdExec<InspectVolumeCmd, InspectVolumeResponse> implements
-        InspectVolumeCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(InspectVolumeCmdExec.class);
-
-    public InspectVolumeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected InspectVolumeResponse execute(InspectVolumeCmd command) {
-        WebTarget webResource = getBaseResource().path("/volumes/{name}").resolveTemplate("name", command.getName());
-
-        LOGGER.trace("GET: {}", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON).get(InspectVolumeResponse.class);
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
index 461899290..a83afd7e1 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -1,81 +1,9 @@
 package com.github.dockerjava.jaxrs;
 
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
-import com.github.dockerjava.api.command.AttachContainerCmd;
-import com.github.dockerjava.api.command.AuthCmd;
-import com.github.dockerjava.api.command.BuildImageCmd;
-import com.github.dockerjava.api.command.CommitCmd;
-import com.github.dockerjava.api.command.ConnectToNetworkCmd;
-import com.github.dockerjava.api.command.ContainerDiffCmd;
-import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
-import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
-import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
-import com.github.dockerjava.api.command.CreateContainerCmd;
-import com.github.dockerjava.api.command.CreateImageCmd;
-import com.github.dockerjava.api.command.CreateNetworkCmd;
-import com.github.dockerjava.api.command.CreateSecretCmd;
-import com.github.dockerjava.api.command.CreateServiceCmd;
-import com.github.dockerjava.api.command.CreateVolumeCmd;
-import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
-import com.github.dockerjava.api.command.DockerCmdExecFactory;
-import com.github.dockerjava.api.command.EventsCmd;
-import com.github.dockerjava.api.command.ExecCreateCmd;
-import com.github.dockerjava.api.command.ExecStartCmd;
-import com.github.dockerjava.api.command.InfoCmd;
-import com.github.dockerjava.api.command.InitializeSwarmCmd;
-import com.github.dockerjava.api.command.InspectContainerCmd;
-import com.github.dockerjava.api.command.InspectExecCmd;
-import com.github.dockerjava.api.command.InspectImageCmd;
-import com.github.dockerjava.api.command.InspectNetworkCmd;
-import com.github.dockerjava.api.command.InspectServiceCmd;
-import com.github.dockerjava.api.command.InspectSwarmCmd;
-import com.github.dockerjava.api.command.InspectSwarmNodeCmd;
-import com.github.dockerjava.api.command.InspectVolumeCmd;
-import com.github.dockerjava.api.command.JoinSwarmCmd;
-import com.github.dockerjava.api.command.KillContainerCmd;
-import com.github.dockerjava.api.command.LeaveSwarmCmd;
-import com.github.dockerjava.api.command.ListContainersCmd;
-import com.github.dockerjava.api.command.ListImagesCmd;
-import com.github.dockerjava.api.command.ListNetworksCmd;
-import com.github.dockerjava.api.command.ListSecretsCmd;
-import com.github.dockerjava.api.command.ListServicesCmd;
-import com.github.dockerjava.api.command.ListSwarmNodesCmd;
-import com.github.dockerjava.api.command.ListTasksCmd;
-import com.github.dockerjava.api.command.ListVolumesCmd;
-import com.github.dockerjava.api.command.LoadImageCmd;
-import com.github.dockerjava.api.command.LogContainerCmd;
-import com.github.dockerjava.api.command.LogSwarmObjectCmd;
-import com.github.dockerjava.api.command.PauseContainerCmd;
-import com.github.dockerjava.api.command.PingCmd;
-import com.github.dockerjava.api.command.PruneCmd;
-import com.github.dockerjava.api.command.PullImageCmd;
-import com.github.dockerjava.api.command.PushImageCmd;
-import com.github.dockerjava.api.command.RemoveContainerCmd;
-import com.github.dockerjava.api.command.RemoveImageCmd;
-import com.github.dockerjava.api.command.RemoveNetworkCmd;
-import com.github.dockerjava.api.command.RemoveSecretCmd;
-import com.github.dockerjava.api.command.RemoveServiceCmd;
-import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
-import com.github.dockerjava.api.command.RemoveVolumeCmd;
-import com.github.dockerjava.api.command.RenameContainerCmd;
-import com.github.dockerjava.api.command.RestartContainerCmd;
-import com.github.dockerjava.api.command.SaveImageCmd;
-import com.github.dockerjava.api.command.SearchImagesCmd;
-import com.github.dockerjava.api.command.StartContainerCmd;
-import com.github.dockerjava.api.command.StatsCmd;
-import com.github.dockerjava.api.command.StopContainerCmd;
-import com.github.dockerjava.api.command.TagImageCmd;
-import com.github.dockerjava.api.command.TopContainerCmd;
-import com.github.dockerjava.api.command.UnpauseContainerCmd;
-import com.github.dockerjava.api.command.UpdateContainerCmd;
-import com.github.dockerjava.api.command.UpdateServiceCmd;
-import com.github.dockerjava.api.command.UpdateSwarmCmd;
-import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
-import com.github.dockerjava.api.command.VersionCmd;
-import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.exception.DockerClientException;
+import com.github.dockerjava.core.AbstractDockerCmdExecFactory;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.DockerClientConfigAware;
 import com.github.dockerjava.core.SSLConfig;
 import com.github.dockerjava.jaxrs.filter.JsonClientFilter;
 import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter;
@@ -100,7 +28,6 @@
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.ClientRequestFilter;
 import javax.ws.rs.client.ClientResponseFilter;
-import javax.ws.rs.client.WebTarget;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.Proxy;
@@ -115,13 +42,13 @@
 //import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 // see https://github.com/docker-java/docker-java/issues/196
 
-public class JerseyDockerCmdExecFactory implements DockerCmdExecFactory, DockerClientConfigAware {
+public class JerseyDockerCmdExecFactory extends AbstractDockerCmdExecFactory {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(JerseyDockerCmdExecFactory.class.getName());
 
     private Client client;
 
-    private WebTarget baseResource;
+    private JerseyWebTarget baseResource;
 
     private Integer readTimeout = null;
 
@@ -261,7 +188,13 @@ public void shutdown() {
 
         client = clientBuilder.build();
 
-        baseResource = client.target(sanitizeUrl(originalUri).toString()).path(dockerClientConfig.getApiVersion().asWebPathPart());
+        baseResource = new JerseyWebTarget(
+                dockerClientConfig.getObjectMapper(),
+                client.target(sanitizeUrl(originalUri).toString())
+                        .path(dockerClientConfig.getApiVersion().asWebPathPart())
+        );
+
+        super.init(dockerClientConfig);
     }
 
     private URI sanitizeUrl(URI originalUri) {
@@ -306,7 +239,7 @@ private org.apache.http.config.Registry<ConnectionSocketFactory> getSchemeRegist
         return registryBuilder.build();
     }
 
-    protected WebTarget getBaseResource() {
+    protected JerseyWebTarget getBaseResource() {
         checkNotNull(baseResource, "Factory not initialized, baseResource not set. You probably forgot to call init()!");
         return baseResource;
     }
@@ -317,368 +250,6 @@ protected DockerClientConfig getDockerClientConfig() {
         return dockerClientConfig;
     }
 
-    @Override
-    public AuthCmd.Exec createAuthCmdExec() {
-        return new AuthCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InfoCmd.Exec createInfoCmdExec() {
-        return new InfoCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public PingCmd.Exec createPingCmdExec() {
-        return new PingCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public VersionCmd.Exec createVersionCmdExec() {
-        return new VersionCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public PullImageCmd.Exec createPullImageCmdExec() {
-        return new PullImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public PushImageCmd.Exec createPushImageCmdExec() {
-        return new PushImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public SaveImageCmd.Exec createSaveImageCmdExec() {
-        return new SaveImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CreateImageCmd.Exec createCreateImageCmdExec() {
-        return new CreateImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public LoadImageCmd.Exec createLoadImageCmdExec() {
-        return new LoadImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public SearchImagesCmd.Exec createSearchImagesCmdExec() {
-        return new SearchImagesCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RemoveImageCmd.Exec createRemoveImageCmdExec() {
-        return new RemoveImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ListImagesCmd.Exec createListImagesCmdExec() {
-        return new ListImagesCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectImageCmd.Exec createInspectImageCmdExec() {
-        return new InspectImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ListContainersCmd.Exec createListContainersCmdExec() {
-        return new ListContainersCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CreateContainerCmd.Exec createCreateContainerCmdExec() {
-        return new CreateContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public StartContainerCmd.Exec createStartContainerCmdExec() {
-        return new StartContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectContainerCmd.Exec createInspectContainerCmdExec() {
-        return new InspectContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ExecCreateCmd.Exec createExecCmdExec() {
-        return new ExecCreateCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
-        return new RemoveContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public WaitContainerCmd.Exec createWaitContainerCmdExec() {
-        return new WaitContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public AttachContainerCmd.Exec createAttachContainerCmdExec() {
-        return new AttachContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ExecStartCmd.Exec createExecStartCmdExec() {
-        return new ExecStartCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectExecCmd.Exec createInspectExecCmdExec() {
-        return new InspectExecCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public LogContainerCmd.Exec createLogContainerCmdExec() {
-        return new LogContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() {
-        return new CopyArchiveFromContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
-        return new CopyFileFromContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() {
-        return new CopyArchiveToContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public StopContainerCmd.Exec createStopContainerCmdExec() {
-        return new StopContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
-        return new ContainerDiffCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public KillContainerCmd.Exec createKillContainerCmdExec() {
-        return new KillContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public UpdateContainerCmd.Exec createUpdateContainerCmdExec() {
-        return new UpdateContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RenameContainerCmd.Exec createRenameContainerCmdExec() {
-        return new RenameContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RestartContainerCmd.Exec createRestartContainerCmdExec() {
-        return new RestartContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CommitCmd.Exec createCommitCmdExec() {
-        return new CommitCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public BuildImageCmd.Exec createBuildImageCmdExec() {
-        return new BuildImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public TopContainerCmd.Exec createTopContainerCmdExec() {
-        return new TopContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public TagImageCmd.Exec createTagImageCmdExec() {
-        return new TagImageCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public PauseContainerCmd.Exec createPauseContainerCmdExec() {
-        return new PauseContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
-        return new UnpauseContainerCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public EventsCmd.Exec createEventsCmdExec() {
-        return new EventsCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public StatsCmd.Exec createStatsCmdExec() {
-        return new StatsCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
-        return new CreateVolumeCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectVolumeCmd.Exec createInspectVolumeCmdExec() {
-        return new InspectVolumeCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() {
-        return new RemoveVolumeCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ListVolumesCmd.Exec createListVolumesCmdExec() {
-        return new ListVolumesCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ListNetworksCmd.Exec createListNetworksCmdExec() {
-        return new ListNetworksCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectNetworkCmd.Exec createInspectNetworkCmdExec() {
-
-        return new InspectNetworkCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CreateNetworkCmd.Exec createCreateNetworkCmdExec() {
-
-        return new CreateNetworkCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() {
-
-        return new RemoveNetworkCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() {
-
-        return new ConnectToNetworkCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() {
-
-        return new DisconnectFromNetworkCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InitializeSwarmCmd.Exec createInitializeSwarmCmdExec() {
-        return new InitializeSwarmCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectSwarmCmd.Exec createInspectSwarmCmdExec() {
-        return new InspectSwarmCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public JoinSwarmCmd.Exec createJoinSwarmCmdExec() {
-        return new JoinSwarmCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public LeaveSwarmCmd.Exec createLeaveSwarmCmdExec() {
-        return new LeaveSwarmCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() {
-        return new UpdateSwarmCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    // service
-    @Override
-    public ListServicesCmd.Exec createListServicesCmdExec() {
-        return new ListServicesCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CreateServiceCmd.Exec createCreateServiceCmdExec() {
-        return new CreateServiceCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectServiceCmd.Exec createInspectServiceCmdExec() {
-        return new InspectServiceCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public UpdateServiceCmd.Exec createUpdateServiceCmdExec() {
-        return new UpdateServiceCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RemoveServiceCmd.Exec createRemoveServiceCmdExec() {
-        return new RemoveServiceCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public LogSwarmObjectCmd.Exec logSwarmObjectExec(String endpoint) {
-        return new LogSwarmObjectExec(getBaseResource(), getDockerClientConfig(), endpoint);
-    }
-
-    //node
-    @Override
-    public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() {
-        return new ListSwarmNodesCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public InspectSwarmNodeCmd.Exec inspectSwarmNodeCmdExec() {
-        return new InspectSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RemoveSwarmNodeCmd.Exec removeSwarmNodeCmdExec() {
-        return new RemoveSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() {
-        return new UpdateSwarmNodeCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ListTasksCmd.Exec listTasksCmdExec() {
-        return new ListTasksCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public PruneCmd.Exec pruneCmdExec() {
-        return new PruneCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public ListSecretsCmd.Exec createListSecretsCmdExec() {
-        return new ListSecretsCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public CreateSecretCmd.Exec createCreateSecretCmdExec() {
-        return new CreateSecretCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
-    @Override
-    public RemoveSecretCmd.Exec createRemoveSecretCmdExec() {
-        return new RemoveSecretCmdExec(getBaseResource(), getDockerClientConfig());
-    }
-
     @Override
     public void close() throws IOException {
         checkNotNull(client, "Factory not initialized. You probably forgot to call init()!");
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyInvocationBuilder.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyInvocationBuilder.java
new file mode 100644
index 000000000..761129867
--- /dev/null
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyInvocationBuilder.java
@@ -0,0 +1,193 @@
+package com.github.dockerjava.jaxrs;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.exception.UnauthorizedException;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.InvocationBuilder;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.async.FrameStreamProcessor;
+import com.github.dockerjava.core.async.JsonStreamProcessor;
+import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
+import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
+import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
+
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.core.Response;
+import java.io.IOException;
+import java.io.InputStream;
+
+class JerseyInvocationBuilder implements InvocationBuilder {
+
+    private final ObjectMapper objectMapper;
+
+    private final Invocation.Builder resource;
+
+    JerseyInvocationBuilder(ObjectMapper objectMapper, Invocation.Builder resource) {
+        this.objectMapper = objectMapper;
+        this.resource = resource;
+    }
+
+    @Override
+    public InvocationBuilder accept(MediaType mediaType) {
+        resource.accept(mediaType.getMediaType());
+        return this;
+    }
+
+    @Override
+    public InvocationBuilder header(String name, String value) {
+        resource.header(name, value);
+        return this;
+    }
+
+    @Override
+    public void delete() {
+        resource.delete().close();
+    }
+
+    @Override
+    public void get(ResultCallback<Frame> resultCallback) {
+        try {
+            GETCallbackNotifier<Frame> getCallbackNotifier = new GETCallbackNotifier<>(
+                    new FrameStreamProcessor(),
+                    resultCallback,
+                    resource
+            );
+            getCallbackNotifier.start();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public <T> T get(TypeReference<T> typeReference) {
+        try (Response response = resource.get()) {
+            return objectMapper.readValue(response.readEntity(InputStream.class), typeReference);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public <T> void get(TypeReference<T> typeReference, ResultCallback<T> resultCallback) {
+        try {
+            GETCallbackNotifier<T> getCallbackNotifier = new GETCallbackNotifier<T>(
+                    new JsonStreamProcessor<>(objectMapper, typeReference),
+                    resultCallback,
+                    resource
+            );
+            getCallbackNotifier.start();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public InputStream post(Object entity) {
+        return new WrappedResponseInputStream(resource.post(
+                toEntity(entity, javax.ws.rs.core.MediaType.APPLICATION_JSON)
+        ));
+    }
+
+    @Override
+    public void post(Object entity, InputStream stdin, ResultCallback<Frame> resultCallback) {
+        if (stdin != null) {
+            throw new UnsupportedOperationException("Passing stdin to the container is currently not supported.");
+        }
+
+        POSTCallbackNotifier<Frame> postCallbackNotifier = new POSTCallbackNotifier<>(
+                new FrameStreamProcessor(),
+                resultCallback,
+                resource,
+                toEntity(entity, javax.ws.rs.core.MediaType.APPLICATION_JSON)
+        );
+
+        postCallbackNotifier.start();
+    }
+
+    @Override
+    public <T> T post(Object entity, TypeReference<T> typeReference) {
+        Response response = resource.post(
+                toEntity(entity, javax.ws.rs.core.MediaType.APPLICATION_JSON)
+        );
+
+        if (response.getStatus() == 401) {
+            throw new UnauthorizedException("Unauthorized");
+        }
+
+        try (InputStream inputStream = response.readEntity(InputStream.class)) {
+            return objectMapper.readValue(inputStream, typeReference);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public <T> void post(Object entity, TypeReference<T> typeReference, ResultCallback<T> resultCallback) {
+        try {
+            POSTCallbackNotifier<T> postCallbackNotifier = new POSTCallbackNotifier<>(
+                    new JsonStreamProcessor<>(objectMapper, typeReference),
+                    resultCallback,
+                    resource,
+                    toEntity(entity, javax.ws.rs.core.MediaType.APPLICATION_JSON)
+            );
+            postCallbackNotifier.start();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public <T> T post(TypeReference<T> typeReference, InputStream body) {
+        try (
+                Response response = resource.post(
+                        toEntity(body, javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM)
+                )
+        ) {
+            InputStream inputStream = response.readEntity(InputStream.class);
+            return objectMapper.readValue(inputStream, typeReference);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public <T> void post(TypeReference<T> typeReference, ResultCallback<T> resultCallback, InputStream body) {
+        try {
+            POSTCallbackNotifier<T> postCallbackNotifier = new POSTCallbackNotifier<T>(
+                    new JsonStreamProcessor<>(objectMapper, typeReference),
+                    resultCallback,
+                    resource,
+                    toEntity(body, "application/tar")
+            );
+            postCallbackNotifier.start();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void postStream(InputStream body) {
+        resource.post(toEntity(body, javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM)).close();
+    }
+
+    @Override
+    public InputStream get() {
+        return new WrappedResponseInputStream(resource.get());
+    }
+
+    @Override
+    public void put(InputStream body, MediaType mediaType) {
+        resource.put(toEntity(body, mediaType.getMediaType())).close();
+    }
+
+    private static <T> Entity<T> toEntity(T entity, String mediaType) {
+        if (entity == null) {
+            return null;
+        }
+
+        return Entity.entity(entity, mediaType);
+    }
+}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyWebTarget.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyWebTarget.java
new file mode 100644
index 000000000..123d2f7ea
--- /dev/null
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyWebTarget.java
@@ -0,0 +1,79 @@
+package com.github.dockerjava.jaxrs;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.core.InvocationBuilder;
+import com.github.dockerjava.core.WebTarget;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Set;
+
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
+class JerseyWebTarget implements WebTarget {
+
+    private static final String PATH_SEPARATOR = "/";
+
+    private final ObjectMapper objectMapper;
+
+    private final javax.ws.rs.client.WebTarget webTarget;
+
+    JerseyWebTarget(ObjectMapper objectMapper, javax.ws.rs.client.WebTarget webTarget) {
+        this.objectMapper = objectMapper;
+        this.webTarget = webTarget;
+    }
+
+    @Override
+    public InvocationBuilder request() {
+        return new JerseyInvocationBuilder(objectMapper, webTarget.request());
+    }
+
+    @Override
+    public JerseyWebTarget path(String... components) {
+        return new JerseyWebTarget(
+                objectMapper,
+                webTarget.path(String.join(PATH_SEPARATOR, components))
+        );
+    }
+
+    @Override
+    public JerseyWebTarget resolveTemplate(String name, Object value) {
+        return new JerseyWebTarget(
+                objectMapper,
+                webTarget.resolveTemplate(name, value)
+        );
+    }
+
+    @Override
+    public JerseyWebTarget queryParam(String name, Object value) {
+        if (value instanceof String) {
+            value = urlPathSegmentEscaper().escape((String) value);
+        }
+        return new JerseyWebTarget(
+                objectMapper,
+                webTarget.queryParam(name, value)
+        );
+    }
+
+    @Override
+    public JerseyWebTarget queryParamsSet(String name, Set<?> values) {
+        return new JerseyWebTarget(
+                objectMapper,
+                webTarget.queryParam(name, values.toArray())
+        );
+    }
+
+    @Override
+    public JerseyWebTarget queryParamsJsonMap(String name, Map<String, String> values) {
+        if (values != null && !values.isEmpty()) {
+            try {
+                // when param value is JSON string
+                return queryParam(name, objectMapper.writeValueAsString(values));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            return this;
+        }
+    }
+}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java
deleted file mode 100644
index a19b7a18d..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JoinSwarmCmdExec.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-
-import com.github.dockerjava.api.command.JoinSwarmCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import static javax.ws.rs.client.Entity.entity;
-
-public class JoinSwarmCmdExec extends AbstrSyncDockerCmdExec<JoinSwarmCmd, Void>
-        implements JoinSwarmCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(InitializeSwarmCmdExec.class);
-
-    public JoinSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(JoinSwarmCmd command) {
-        WebTarget webResource = getBaseResource().path("/swarm/join");
-
-        LOGGER.trace("POST: {} ", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(entity(command, MediaType.APPLICATION_JSON)).close();
-        return null;
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
deleted file mode 100644
index 95c8ef83c..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/KillContainerCmdExec.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.KillContainerCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class KillContainerCmdExec extends AbstrSyncDockerCmdExec<KillContainerCmd, Void> implements
-        KillContainerCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(KillContainerCmdExec.class);
-
-    public KillContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(KillContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/kill").resolveTemplate("id",
-                command.getContainerId());
-
-        if (command.getSignal() != null) {
-            webResource = webResource.queryParam("signal", command.getSignal());
-        }
-
-        LOGGER.trace("POST: {}", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
-
-        return null;
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java
deleted file mode 100644
index 9723980a5..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LeaveSwarmCmdExec.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-
-import com.github.dockerjava.api.command.LeaveSwarmCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-public class LeaveSwarmCmdExec extends AbstrSyncDockerCmdExec<LeaveSwarmCmd, Void> implements LeaveSwarmCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(LeaveSwarmCmdExec.class);
-
-    public LeaveSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(LeaveSwarmCmd command) {
-        WebTarget webTarget = getBaseResource().path("/swarm/leave");
-
-        webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled());
-
-        LOGGER.trace("POST: {}", webTarget);
-        webTarget.request().accept(MediaType.APPLICATION_JSON)
-                .post(null).close();
-
-        return null;
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
deleted file mode 100644
index 50311ef54..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListContainersCmdExec.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
-import java.util.List;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.ListContainersCmd;
-import com.github.dockerjava.api.model.Container;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.util.FiltersEncoder;
-
-public class ListContainersCmdExec extends AbstrSyncDockerCmdExec<ListContainersCmd, List<Container>> implements
-        ListContainersCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ListContainersCmdExec.class);
-
-    public ListContainersCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected List<Container> execute(ListContainersCmd command) {
-        WebTarget webTarget = getBaseResource().path("/containers/json").queryParam("since", command.getSinceId())
-                .queryParam("before", command.getBeforeId());
-
-        webTarget = booleanQueryParam(webTarget, "all", command.hasShowAllEnabled());
-        webTarget = booleanQueryParam(webTarget, "size", command.hasShowSizeEnabled());
-
-        if (command.getLimit() != null && command.getLimit() >= 0) {
-            webTarget = webTarget.queryParam("limit", String.valueOf(command.getLimit()));
-        }
-
-        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
-            webTarget = webTarget
-                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
-        }
-
-        LOGGER.trace("GET: {}", webTarget);
-        List<Container> containers = webTarget.request().accept(MediaType.APPLICATION_JSON)
-                .get(new GenericType<List<Container>>() {
-                });
-        LOGGER.trace("Response: {}", containers);
-
-        return containers;
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
deleted file mode 100644
index 3d6320151..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
-import java.util.List;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.ListImagesCmd;
-import com.github.dockerjava.api.model.Image;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.util.FiltersEncoder;
-
-public class ListImagesCmdExec extends AbstrSyncDockerCmdExec<ListImagesCmd, List<Image>> implements ListImagesCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ListImagesCmdExec.class);
-
-    public ListImagesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected List<Image> execute(ListImagesCmd command) {
-        WebTarget webTarget = getBaseResource().path("/images/json");
-
-        webTarget = booleanQueryParam(webTarget, "all", command.hasShowAllEnabled());
-
-        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
-            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
-        }
-
-        if (command.getImageNameFilter() != null) {
-            webTarget = webTarget.queryParam("filter", urlPathSegmentEscaper().escape(command.getImageNameFilter()));
-        }
-
-        LOGGER.trace("GET: {}", webTarget);
-
-        List<Image> images = webTarget.request().accept(MediaType.APPLICATION_JSON).get(new GenericType<List<Image>>() {
-        });
-        LOGGER.trace("Response: {}", images);
-
-        return images;
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java
deleted file mode 100644
index 9137e28d2..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListNetworksCmdExec.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.ListNetworksCmd;
-import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.util.FiltersEncoder;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MediaType;
-
-import java.util.List;
-
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
-public class ListNetworksCmdExec extends AbstrSyncDockerCmdExec<ListNetworksCmd, List<Network>> implements
-        ListNetworksCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ListNetworksCmdExec.class);
-
-    public ListNetworksCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected List<Network> execute(ListNetworksCmd command) {
-        WebTarget webTarget = getBaseResource().path("/networks");
-
-        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
-            webTarget = webTarget
-                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
-        }
-
-        LOGGER.trace("GET: {}", webTarget);
-        List<Network> networks = webTarget.request().accept(MediaType.APPLICATION_JSON)
-                .get(new GenericType<List<Network>>() {
-                });
-        LOGGER.trace("Response: {}", networks);
-
-        return networks;
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java
deleted file mode 100644
index 8052dabfd..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSecretsCmdExec.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.ListSecretsCmd;
-import com.github.dockerjava.api.model.Secret;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.util.FiltersEncoder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MediaType;
-import java.util.List;
-
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
-public class ListSecretsCmdExec extends AbstrSyncDockerCmdExec<ListSecretsCmd, List<Secret>> implements
-        ListSecretsCmd.Exec {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ListSecretsCmdExec.class);
-
-    public ListSecretsCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected List<Secret> execute(ListSecretsCmd command) {
-        WebTarget webTarget = getBaseResource().path("/secrets");
-
-        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
-            webTarget = webTarget
-                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
-        }
-
-        LOGGER.trace("GET: {}", webTarget);
-        List<Secret> secrets = webTarget.request().accept(MediaType.APPLICATION_JSON)
-                .get(new GenericType<List<Secret>>() {
-                });
-        LOGGER.trace("Response: {}", secrets);
-
-        return secrets;
-    }
-}
-
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java
deleted file mode 100644
index df9f972e6..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListServicesCmdExec.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.ListServicesCmd;
-import com.github.dockerjava.api.model.Service;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.util.FiltersEncoder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MediaType;
-import java.util.List;
-
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
-public class ListServicesCmdExec extends AbstrSyncDockerCmdExec<ListServicesCmd, List<Service>> implements
-        ListServicesCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ListServicesCmdExec.class);
-
-    public ListServicesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected List<Service> execute(ListServicesCmd command) {
-        WebTarget webTarget = getBaseResource().path("/services");
-
-        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
-            webTarget = webTarget
-                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
-        }
-
-        LOGGER.trace("GET: {}", webTarget);
-        List<Service> services = webTarget.request().accept(MediaType.APPLICATION_JSON)
-                .get(new GenericType<List<Service>>() {
-                });
-        LOGGER.trace("Response: {}", services);
-
-        return services;
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java
deleted file mode 100644
index 763ff7899..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListSwarmNodesCmdExec.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.ListSwarmNodesCmd;
-import com.github.dockerjava.api.model.SwarmNode;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.util.FiltersEncoder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MediaType;
-import java.util.List;
-
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
-public class ListSwarmNodesCmdExec extends AbstrSyncDockerCmdExec<ListSwarmNodesCmd, List<SwarmNode>> implements
-        ListSwarmNodesCmd.Exec {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ListSwarmNodesCmdExec.class);
-
-    public ListSwarmNodesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected List<SwarmNode> execute(ListSwarmNodesCmd command) {
-        WebTarget webTarget = getBaseResource().path("/nodes");
-
-        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
-            webTarget = webTarget
-                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
-        }
-
-        LOGGER.trace("GET: {}", webTarget);
-        List<SwarmNode> nodes = webTarget.request().accept(MediaType.APPLICATION_JSON)
-                .get(new GenericType<List<SwarmNode>>() {
-                });
-        LOGGER.trace("Response: {}", nodes);
-
-        return nodes;
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java
deleted file mode 100644
index 6a4b27d40..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListTasksCmdExec.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.ListTasksCmd;
-import com.github.dockerjava.api.model.Task;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.util.FiltersEncoder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MediaType;
-import java.util.List;
-
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
-public class ListTasksCmdExec extends AbstrSyncDockerCmdExec<ListTasksCmd, List<Task>> implements
-        ListTasksCmd.Exec {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ListTasksCmdExec.class);
-
-    public ListTasksCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected List<Task> execute(ListTasksCmd command) {
-        WebTarget webTarget = getBaseResource().path("/tasks");
-
-        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
-            webTarget = webTarget
-                    .queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
-        }
-
-        LOGGER.trace("GET: {}", webTarget);
-        List<Task> tasks = webTarget.request().accept(MediaType.APPLICATION_JSON)
-                .get(new GenericType<List<Task>>() {
-                });
-        LOGGER.trace("Response: {}", tasks);
-
-        return tasks;
-    }
-}
-
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
deleted file mode 100644
index 4f2165b93..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ListVolumesCmdExec.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.ListVolumesCmd;
-import com.github.dockerjava.api.command.ListVolumesResponse;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.util.FiltersEncoder;
-
-public class ListVolumesCmdExec extends AbstrSyncDockerCmdExec<ListVolumesCmd, ListVolumesResponse> implements ListVolumesCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ListVolumesCmdExec.class);
-
-    public ListVolumesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected ListVolumesResponse execute(ListVolumesCmd command) {
-        WebTarget webTarget = getBaseResource().path("/volumes");
-
-        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
-            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
-        }
-
-        LOGGER.trace("GET: {}", webTarget);
-
-        return webTarget.request().accept(MediaType.APPLICATION_JSON).get(ListVolumesResponse.class);
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java
deleted file mode 100644
index 23d6c493a..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LoadImageCmdExec.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import static javax.ws.rs.client.Entity.entity;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.LoadImageCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class LoadImageCmdExec extends AbstrSyncDockerCmdExec<LoadImageCmd, Void> implements LoadImageCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(LoadImageCmdExec.class);
-
-    public LoadImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(LoadImageCmd command) {
-        WebTarget webTarget = getBaseResource().path("/images/load");
-
-        LOGGER.trace("POST: {}", webTarget);
-        webTarget.request().post(entity(command.getImageStream(), MediaType.APPLICATION_OCTET_STREAM));
-
-        return null;
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
deleted file mode 100644
index 19c2b24b0..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.command.LogContainerCmd;
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.async.FrameStreamProcessor;
-import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
-import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
-
-public class LogContainerCmdExec extends AbstrAsyncDockerCmdExec<LogContainerCmd, Frame> implements
-        LogContainerCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(LogContainerCmdExec.class);
-
-    public LogContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected AbstractCallbackNotifier<Frame> callbackNotifier(LogContainerCmd command,
-            ResultCallback<Frame> resultCallback) {
-
-        WebTarget webTarget = getBaseResource().path("/containers/{id}/logs").resolveTemplate("id",
-                command.getContainerId());
-
-        if (command.getTail() != null) {
-            webTarget = webTarget.queryParam("tail", command.getTail());
-        }
-
-        if (command.getSince() != null) {
-            webTarget = webTarget.queryParam("since", command.getSince());
-        }
-
-        webTarget = booleanQueryParam(webTarget, "timestamps", command.hasTimestampsEnabled());
-        webTarget = booleanQueryParam(webTarget, "stdout", command.hasStdoutEnabled());
-        webTarget = booleanQueryParam(webTarget, "stderr", command.hasStderrEnabled());
-        webTarget = booleanQueryParam(webTarget, "follow", command.hasFollowStreamEnabled());
-
-        LOGGER.trace("GET: {}", webTarget);
-
-        return new GETCallbackNotifier<>(new FrameStreamProcessor(), resultCallback, webTarget.request());
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java
deleted file mode 100644
index 2fb731005..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/LogSwarmObjectExec.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.command.LogSwarmObjectCmd;
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.async.FrameStreamProcessor;
-import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
-import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-
-public class LogSwarmObjectExec extends AbstrAsyncDockerCmdExec<LogSwarmObjectCmd, Frame> implements
-        LogSwarmObjectCmd.Exec {
-
-    public LogSwarmObjectExec(WebTarget baseResource, DockerClientConfig dockerClientConfig, String endpoint) {
-        super(baseResource, dockerClientConfig);
-        this.endpoint = endpoint;
-    }
-
-    private String endpoint = "";
-    private static final Logger LOGGER = LoggerFactory.getLogger(LogSwarmObjectExec.class);
-
-    @Override
-    protected AbstractCallbackNotifier<Frame> callbackNotifier(LogSwarmObjectCmd command, ResultCallback<Frame> resultCallback) {
-
-        WebTarget webTarget = getBaseResource().path("/" + endpoint + "/{id}/logs").resolveTemplate("id", command.getId());
-
-        if (command.getTail() != null) {
-            webTarget = webTarget.queryParam("tail", command.getTail());
-        } else {
-            webTarget = webTarget.queryParam("tail", "all");
-        }
-
-        if (command.getSince() != null) {
-            webTarget = webTarget.queryParam("since", command.getSince());
-        }
-
-        webTarget = booleanQueryParam(webTarget, "timestamps", command.getTimestamps());
-        webTarget = booleanQueryParam(webTarget, "stdout", command.getStdout());
-        webTarget = booleanQueryParam(webTarget, "stderr", command.getStderr());
-        webTarget = booleanQueryParam(webTarget, "follow", command.getFollow());
-        webTarget = booleanQueryParam(webTarget, "details", command.getDetails());
-        LOGGER.trace("GET: {}", webTarget);
-
-        return new GETCallbackNotifier<>(new FrameStreamProcessor(), resultCallback, webTarget.request());
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
deleted file mode 100644
index 5e6beb835..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PauseContainerCmdExec.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.PauseContainerCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class PauseContainerCmdExec extends AbstrSyncDockerCmdExec<PauseContainerCmd, Void> implements
-        PauseContainerCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(PauseContainerCmdExec.class);
-
-    public PauseContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(PauseContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/pause").resolveTemplate("id",
-                command.getContainerId());
-
-        LOGGER.trace("POST: {}", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
-
-        return null;
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
deleted file mode 100644
index ef6215358..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PingCmdExec.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.PingCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class PingCmdExec extends AbstrSyncDockerCmdExec<PingCmd, Void> implements PingCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(PingCmdExec.class);
-
-    public PingCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(PingCmd command) {
-        WebTarget webResource = getBaseResource().path("/_ping");
-
-        LOGGER.trace("GET: {}", webResource);
-        webResource.request().get().close();
-
-        return null;
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java
deleted file mode 100644
index 324bc8201..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PruneCmdExec.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.PruneCmd;
-import com.github.dockerjava.api.model.PruneResponse;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.util.FiltersEncoder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MediaType;
-
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
-public class PruneCmdExec extends AbstrSyncDockerCmdExec<PruneCmd, PruneResponse> implements PruneCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(PruneCmdExec.class);
-
-    public PruneCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected PruneResponse execute(PruneCmd command) {
-        WebTarget webTarget = getBaseResource().path(command.getApiPath());
-
-        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
-            webTarget = webTarget.queryParam("filters", urlPathSegmentEscaper().escape(FiltersEncoder.jsonEncode(command.getFilters())));
-        }
-
-        LOGGER.trace("POST: {}", webTarget);
-
-        PruneResponse response = webTarget.request().accept(MediaType.APPLICATION_JSON)
-                .post(null, new GenericType<PruneResponse>() { });
-        LOGGER.trace("Response: {}", response);
-
-        return response;
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
deleted file mode 100644
index c20691288..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PullImageCmdExec.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.command.PullImageCmd;
-import com.github.dockerjava.api.model.PullResponseItem;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.async.JsonStreamProcessor;
-import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
-import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import static javax.ws.rs.client.Entity.entity;
-
-public class PullImageCmdExec extends AbstrAsyncDockerCmdExec<PullImageCmd, PullResponseItem> implements
-        PullImageCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(PullImageCmdExec.class);
-
-    public PullImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected AbstractCallbackNotifier<PullResponseItem> callbackNotifier(PullImageCmd command,
-            ResultCallback<PullResponseItem> resultCallback) {
-
-        WebTarget webResource = getBaseResource().path("/images/create").queryParam("tag", command.getTag())
-                .queryParam("fromImage", command.getRepository()).queryParam("registry", command.getRegistry());
-
-        if (command.getPlatform() != null) {
-            webResource = webResource.queryParam("platform", command.getPlatform());
-        }
-
-        LOGGER.trace("POST: {}", webResource);
-        Builder builder = resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request()).accept(
-                MediaType.APPLICATION_OCTET_STREAM_TYPE);
-
-        return new POSTCallbackNotifier<>(
-                new JsonStreamProcessor<>(objectMapper, PullResponseItem.class),
-                resultCallback, builder, entity(null, MediaType.APPLICATION_JSON));
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
deleted file mode 100644
index 3f6d5434c..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.command.PushImageCmd;
-import com.github.dockerjava.api.model.AuthConfig;
-import com.github.dockerjava.api.model.PushResponseItem;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.async.JsonStreamProcessor;
-import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
-import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import static javax.ws.rs.client.Entity.entity;
-
-public class PushImageCmdExec extends AbstrAsyncDockerCmdExec<PushImageCmd, PushResponseItem> implements
-        PushImageCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(PushImageCmdExec.class);
-
-    public PushImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    private String name(PushImageCmd command) {
-        String name = command.getName();
-        AuthConfig authConfig = command.getAuthConfig();
-        return (name.contains("/") || authConfig == null) ? name : authConfig.getUsername();
-    }
-
-    @Override
-    protected AbstractCallbackNotifier<PushResponseItem> callbackNotifier(PushImageCmd command,
-            ResultCallback<PushResponseItem> resultCallback) {
-
-        WebTarget webResource = getBaseResource().path("/images/" + name(command) + "/push").queryParam("tag",
-                command.getTag());
-
-        LOGGER.trace("POST: {}", webResource);
-
-        Builder builder = resourceWithAuthConfig(command.getAuthConfig(), webResource.request())
-                .accept(MediaType.APPLICATION_JSON);
-
-        return new POSTCallbackNotifier<>(
-                new JsonStreamProcessor<>(objectMapper, PushResponseItem.class),
-                resultCallback, builder, entity(null, MediaType.APPLICATION_JSON));
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
deleted file mode 100644
index d649b57a5..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveContainerCmdExec.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.RemoveContainerCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class RemoveContainerCmdExec extends AbstrSyncDockerCmdExec<RemoveContainerCmd, Void> implements
-        RemoveContainerCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveContainerCmdExec.class);
-
-    public RemoveContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(RemoveContainerCmd command) {
-        WebTarget webTarget = getBaseResource().path("/containers/" + command.getContainerId());
-
-        webTarget = booleanQueryParam(webTarget, "v", command.hasRemoveVolumesEnabled());
-        webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled());
-
-        LOGGER.trace("DELETE: {}", webTarget);
-        webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close();
-
-        return null;
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
deleted file mode 100644
index 9b362df72..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveImageCmdExec.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.RemoveImageCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class RemoveImageCmdExec extends AbstrSyncDockerCmdExec<RemoveImageCmd, Void> implements RemoveImageCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveImageCmdExec.class);
-
-    public RemoveImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(RemoveImageCmd command) {
-        WebTarget webTarget = getBaseResource().path("/images/" + command.getImageId());
-
-        webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled());
-        webTarget = booleanQueryParam(webTarget, "noprune", command.hasNoPruneEnabled());
-
-        LOGGER.trace("DELETE: {}", webTarget);
-        webTarget.request().delete().close();
-
-        return null;
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java
deleted file mode 100644
index acc2bdd27..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveNetworkCmdExec.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.RemoveNetworkCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-public class RemoveNetworkCmdExec extends AbstrSyncDockerCmdExec<RemoveNetworkCmd, Void>
-        implements RemoveNetworkCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveNetworkCmdExec.class);
-
-    public RemoveNetworkCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(RemoveNetworkCmd command) {
-
-        WebTarget webTarget = getBaseResource().path("/networks/" + command.getNetworkId());
-
-        LOGGER.trace("DELETE: {}", webTarget);
-        webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close();
-
-        return null;
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java
deleted file mode 100644
index 7e2bf4812..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSecretCmdExec.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.RemoveSecretCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-public class RemoveSecretCmdExec extends AbstrSyncDockerCmdExec<RemoveSecretCmd, Void> implements
-        RemoveSecretCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveSecretCmdExec.class);
-
-    public RemoveSecretCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(RemoveSecretCmd command) {
-        WebTarget webTarget = getBaseResource().path("/secrets/" + command.getSecretId());
-
-        LOGGER.trace("DELETE: {}", webTarget);
-        webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close();
-
-        return null;
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java
deleted file mode 100644
index f10f94a3c..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveServiceCmdExec.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.RemoveServiceCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-public class RemoveServiceCmdExec extends AbstrSyncDockerCmdExec<RemoveServiceCmd, Void> implements
-        RemoveServiceCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveServiceCmdExec.class);
-
-    public RemoveServiceCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(RemoveServiceCmd command) {
-        WebTarget webTarget = getBaseResource().path("/services/" + command.getServiceId());
-
-        LOGGER.trace("DELETE: {}", webTarget);
-        webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close();
-
-        return null;
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java
deleted file mode 100644
index 6f71a468b..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveSwarmNodeCmdExec.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-public class RemoveSwarmNodeCmdExec extends AbstrSyncDockerCmdExec<RemoveSwarmNodeCmd, Void> implements
-        RemoveSwarmNodeCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveSwarmNodeCmdExec.class);
-
-    public RemoveSwarmNodeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(RemoveSwarmNodeCmd command) {
-        WebTarget webTarget = getBaseResource().path("/nodes/" + command.getSwarmNodeId());
-
-        webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled());
-
-        LOGGER.trace("DELETE: {}", webTarget);
-        webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close();
-
-        return null;
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java
deleted file mode 100644
index 618a85ed8..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RemoveVolumeCmdExec.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.RemoveVolumeCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class RemoveVolumeCmdExec extends AbstrSyncDockerCmdExec<RemoveVolumeCmd, Void> implements
-        RemoveVolumeCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveVolumeCmdExec.class);
-
-    public RemoveVolumeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(RemoveVolumeCmd command) {
-        WebTarget webTarget = getBaseResource().path("/volumes/" + command.getName());
-
-        LOGGER.trace("DELETE: {}", webTarget);
-        webTarget.request().accept(MediaType.APPLICATION_JSON).delete().close();
-
-        return null;
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java
deleted file mode 100644
index c747ea9b0..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RenameContainerCmdExec.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import com.github.dockerjava.api.command.RenameContainerCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class RenameContainerCmdExec extends AbstrSyncDockerCmdExec<RenameContainerCmd, Void>
-        implements RenameContainerCmd.Exec {
-    private static final Logger LOG = LoggerFactory.getLogger(RenameContainerCmdExec.class);
-
-    public RenameContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(RenameContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/rename")
-                .resolveTemplate("id", command.getContainerId())
-                .queryParam("name", command.getName());
-
-        LOG.trace("POST: {}", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON).post(null);
-
-        return null;
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
deleted file mode 100644
index 765537f44..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.RestartContainerCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class RestartContainerCmdExec extends AbstrSyncDockerCmdExec<RestartContainerCmd, Void> implements
-        RestartContainerCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(RestartContainerCmdExec.class);
-
-    public RestartContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(RestartContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/restart").resolveTemplate("id",
-                command.getContainerId());
-
-        if (command.getTimeout() != null) {
-            webResource = webResource.queryParam("t", String.valueOf(command.getTimeout()));
-        }
-
-        LOGGER.trace("POST: {}", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
-
-        return null;
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
deleted file mode 100644
index c386ea3a0..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import java.io.InputStream;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.SaveImageCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
-import com.google.common.base.Strings;
-
-public class SaveImageCmdExec extends AbstrSyncDockerCmdExec<SaveImageCmd, InputStream> implements SaveImageCmd.Exec {
-    private static final Logger LOGGER = LoggerFactory.getLogger(SaveImageCmdExec.class);
-
-    public SaveImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected InputStream execute(SaveImageCmd command) {
-        // If tag is present, only tar the specific image
-        // else tar all the images with the same name
-        String name = command.getName();
-        if (!Strings.isNullOrEmpty(command.getTag())) {
-            name += ":" + command.getTag();
-        }
-        WebTarget webResource = getBaseResource().path("/images/" + name + "/get");
-
-        LOGGER.trace("GET: {}", webResource);
-        Response response = webResource.request().accept(MediaType.APPLICATION_JSON).get();
-
-        return new WrappedResponseInputStream(response);
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java
deleted file mode 100644
index 90fdd80cd..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/SearchImagesCmdExec.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import java.util.List;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.SearchImagesCmd;
-import com.github.dockerjava.api.model.SearchItem;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class SearchImagesCmdExec extends AbstrSyncDockerCmdExec<SearchImagesCmd, List<SearchItem>> implements
-        SearchImagesCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(SearchImagesCmdExec.class);
-
-    public SearchImagesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected List<SearchItem> execute(SearchImagesCmd command) {
-        WebTarget webResource = getBaseResource().path("/images/search").queryParam("term", command.getTerm());
-
-        LOGGER.trace("GET: {}", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON).get(new GenericType<List<SearchItem>>() {
-        });
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
deleted file mode 100644
index 2851a26c7..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StartContainerCmdExec.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.StartContainerCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class StartContainerCmdExec extends AbstrSyncDockerCmdExec<StartContainerCmd, Void> implements
-        StartContainerCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(StartContainerCmdExec.class);
-
-    public StartContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(StartContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/start")
-                .resolveTemplate("id", command.getContainerId());
-
-        LOGGER.trace("POST: {}", webResource);
-        webResource.request()
-                .accept(MediaType.APPLICATION_JSON)
-                .post(null)
-                .close();
-
-        return null;
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
deleted file mode 100644
index b1c69b656..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.command.StatsCmd;
-import com.github.dockerjava.api.model.Statistics;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.async.JsonStreamProcessor;
-import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
-import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
-
-public class StatsCmdExec extends AbstrAsyncDockerCmdExec<StatsCmd, Statistics> implements StatsCmd.Exec {
-    private static final Logger LOGGER = LoggerFactory.getLogger(StatsCmdExec.class);
-
-    public StatsCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected AbstractCallbackNotifier<Statistics> callbackNotifier(StatsCmd command,
-            ResultCallback<Statistics> resultCallback) {
-
-        WebTarget webTarget = getBaseResource().path("/containers/{id}/stats").resolveTemplate("id",
-                command.getContainerId());
-
-        LOGGER.trace("GET: {}", webTarget);
-
-        return new GETCallbackNotifier<>(new JsonStreamProcessor<>(objectMapper, Statistics.class),
-                resultCallback, webTarget.request());
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
deleted file mode 100644
index 930ccbb7d..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.StopContainerCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class StopContainerCmdExec extends AbstrSyncDockerCmdExec<StopContainerCmd, Void> implements
-        StopContainerCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(StopContainerCmdExec.class);
-
-    public StopContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(StopContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/stop").resolveTemplate("id",
-                command.getContainerId());
-
-        if (command.getTimeout() != null) {
-            webResource = webResource.queryParam("t", String.valueOf(command.getTimeout()));
-        }
-
-        LOGGER.trace("POST: {}", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
-
-        return null;
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
deleted file mode 100644
index aac15f9dd..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TagImageCmdExec.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.TagImageCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class TagImageCmdExec extends AbstrSyncDockerCmdExec<TagImageCmd, Void> implements TagImageCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(TagImageCmdExec.class);
-
-    public TagImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(TagImageCmd command) {
-        WebTarget webTarget = getBaseResource().path("/images/" + command.getImageId() + "/tag")
-                .queryParam("repo", command.getRepository()).queryParam("tag", command.getTag());
-
-        webTarget = booleanQueryParam(webTarget, "force", command.hasForceEnabled());
-
-        LOGGER.trace("POST: {}", webTarget);
-        webTarget.request().post(null).close();
-        return null;
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
deleted file mode 100644
index 22841d8bf..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/TopContainerCmdExec.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.TopContainerCmd;
-import com.github.dockerjava.api.command.TopContainerResponse;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class TopContainerCmdExec extends AbstrSyncDockerCmdExec<TopContainerCmd, TopContainerResponse> implements
-        TopContainerCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(TopContainerCmdExec.class);
-
-    public TopContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected TopContainerResponse execute(TopContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/top").resolveTemplate("id",
-                command.getContainerId());
-
-        if (!StringUtils.isEmpty(command.getPsArgs())) {
-            webResource = webResource.queryParam("ps_args", command.getPsArgs());
-        }
-
-        LOGGER.trace("GET: {}", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON).get(TopContainerResponse.class);
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
index 0c5400ecd..a45561de9 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
@@ -40,6 +40,7 @@
  * Provides a ConnectionSocketFactory for connecting Apache HTTP clients to Unix sockets.
  */
 @Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
+@Deprecated
 public class UnixConnectionSocketFactory implements ConnectionSocketFactory {
 
     private File socketFile;
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
deleted file mode 100644
index 5c3828358..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnpauseContainerCmdExec.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.UnpauseContainerCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class UnpauseContainerCmdExec extends AbstrSyncDockerCmdExec<UnpauseContainerCmd, Void> implements
-        UnpauseContainerCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(UnpauseContainerCmdExec.class);
-
-    public UnpauseContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(UnpauseContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/unpause").resolveTemplate("id",
-                command.getContainerId());
-
-        LOGGER.trace("POST: {}", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
-
-        return null;
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java
deleted file mode 100644
index 474d7338e..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateContainerCmdExec.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.UpdateContainerCmd;
-import com.github.dockerjava.api.model.UpdateContainerResponse;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import static javax.ws.rs.client.Entity.entity;
-
-/**
- * Update container settings.
- *
- * @author Kanstantsin Shautsou
- */
-public class UpdateContainerCmdExec extends AbstrSyncDockerCmdExec<UpdateContainerCmd, UpdateContainerResponse>
-        implements UpdateContainerCmd.Exec {
-    private static final Logger LOGGER = LoggerFactory.getLogger(UpdateContainerCmdExec.class);
-
-    public UpdateContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected UpdateContainerResponse execute(UpdateContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/update")
-                .resolveTemplate("id", command.getContainerId());
-
-        LOGGER.trace("POST: {}", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(entity(command, MediaType.APPLICATION_JSON), UpdateContainerResponse.class);
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java
deleted file mode 100644
index d6259192b..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateServiceCmdExec.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.UpdateServiceCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import static javax.ws.rs.client.Entity.entity;
-
-/**
- * Update service settings.
- */
-public class UpdateServiceCmdExec extends AbstrSyncDockerCmdExec<UpdateServiceCmd, Void>
-        implements UpdateServiceCmd.Exec {
-    private static final Logger LOGGER = LoggerFactory.getLogger(UpdateServiceCmdExec.class);
-
-    public UpdateServiceCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(UpdateServiceCmd command) {
-        WebTarget webResource = getBaseResource().path("/services/{id}/update")
-                .resolveTemplate("id", command.getServiceId())
-                .queryParam("version", command.getVersion());
-
-        LOGGER.trace("POST: {}", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(entity(command.getServiceSpec(), MediaType.APPLICATION_JSON)).close();
-
-        return null;
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java
deleted file mode 100644
index 833dd79ae..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmCmdExec.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.UpdateSwarmCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import static javax.ws.rs.client.Entity.entity;
-
-public class UpdateSwarmCmdExec extends AbstrSyncDockerCmdExec<UpdateSwarmCmd, Void>
-        implements UpdateSwarmCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(UpdateSwarmCmdExec.class);
-
-    public UpdateSwarmCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(UpdateSwarmCmd command) {
-        WebTarget webResource = getBaseResource().path("/swarm/update")
-                .queryParam("version", command.getVersion());
-
-        webResource = booleanQueryParam(webResource, "rotateManagerToken", command.getRotateManagerToken());
-        webResource = booleanQueryParam(webResource, "rotateWorkerToken", command.getRotateWorkerToken());
-
-        LOGGER.trace("POST: {} ", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(entity(command.getSwarmSpec(), MediaType.APPLICATION_JSON));
-        return null;
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java
deleted file mode 100644
index efb34f062..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UpdateSwarmNodeCmdExec.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
-import com.github.dockerjava.core.DockerClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import static javax.ws.rs.client.Entity.entity;
-
-/**
- * Update swarmNode spec
- */
-public class UpdateSwarmNodeCmdExec extends AbstrSyncDockerCmdExec<UpdateSwarmNodeCmd, Void>
-        implements UpdateSwarmNodeCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(UpdateSwarmNodeCmdExec.class);
-
-    public UpdateSwarmNodeCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Void execute(UpdateSwarmNodeCmd command) {
-        WebTarget webResource = getBaseResource().path("/nodes/{id}/update")
-                .resolveTemplate("id", command.getSwarmNodeId())
-                .queryParam("version", command.getVersion());
-
-        LOGGER.trace("POST: {}", webResource);
-        webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(entity(command.getSwarmNodeSpec(), MediaType.APPLICATION_JSON)).close();
-        return null;
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java
deleted file mode 100644
index 7fbc92784..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/VersionCmdExec.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.command.VersionCmd;
-import com.github.dockerjava.api.model.Version;
-import com.github.dockerjava.core.DockerClientConfig;
-
-public class VersionCmdExec extends AbstrSyncDockerCmdExec<VersionCmd, Version> implements VersionCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(VersionCmdExec.class);
-
-    public VersionCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected Version execute(VersionCmd command) {
-        WebTarget webResource = getBaseResource().path("/version");
-
-        LOGGER.trace("GET: {}", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON).get(Version.class);
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
deleted file mode 100644
index 644bb8f22..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import static javax.ws.rs.client.Entity.entity;
-
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.command.WaitContainerCmd;
-import com.github.dockerjava.api.model.WaitResponse;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.async.JsonStreamProcessor;
-import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
-import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
-
-public class WaitContainerCmdExec extends AbstrAsyncDockerCmdExec<WaitContainerCmd, WaitResponse> implements
-        WaitContainerCmd.Exec {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(WaitContainerCmdExec.class);
-
-    public WaitContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        super(baseResource, dockerClientConfig);
-    }
-
-    @Override
-    protected AbstractCallbackNotifier<WaitResponse> callbackNotifier(WaitContainerCmd command,
-            ResultCallback<WaitResponse> resultCallback) {
-
-        WebTarget webResource = getBaseResource().path("/containers/{id}/wait").resolveTemplate("id",
-                command.getContainerId());
-
-        LOGGER.trace("POST: {}", webResource);
-
-        return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(objectMapper, WaitResponse.class),
-                resultCallback, webResource.request().accept(MediaType.APPLICATION_JSON), entity(null,
-                MediaType.APPLICATION_JSON));
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
index cd7a7f809..b8db73b04 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
@@ -21,6 +21,7 @@
 import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
+@Deprecated
 public abstract class AbstractCallbackNotifier<T> implements Callable<Void> {
 
     private final ResponseStreamProcessor<T> responseStreamProcessor;
@@ -42,9 +43,9 @@ protected AbstractCallbackNotifier(ResponseStreamProcessor<T> responseStreamProc
     }
 
     @Override
-    public Void call() throws Exception {
+    public Void call() {
 
-        Response response = null;
+        Response response;
 
         try {
             response = response();
@@ -59,6 +60,9 @@ public Void call() throws Exception {
             }
             return null;
         }
+        if (resultCallback != null) {
+            resultCallback.onStart(response::close);
+        }
 
         try (InputStream inputStream = new WrappedResponseInputStream(response)) {
 
@@ -85,4 +89,8 @@ public static <T> Future<Void> startAsyncProcessing(AbstractCallbackNotifier<T>
         executorService.shutdown();
         return response;
     }
+
+    public void start() {
+        FACTORY.newThread(this::call).start();
+    }
 }
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java
index e6f4fd1d2..9297c2551 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java
@@ -14,6 +14,7 @@
  * @author Marcus Linke
  *
  */
+@Deprecated
 public class GETCallbackNotifier<T> extends AbstractCallbackNotifier<T> {
 
     public GETCallbackNotifier(ResponseStreamProcessor<T> responseStreamProcessor, ResultCallback<T> resultCallback,
@@ -22,7 +23,7 @@ public GETCallbackNotifier(ResponseStreamProcessor<T> responseStreamProcessor, R
     }
 
     protected Response response() {
-        return requestBuilder.get(Response.class);
+        return requestBuilder.get();
     }
 
 }
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java
index bd96e8250..76fd540fe 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java
@@ -15,6 +15,7 @@
  * @author Marcus Linke
  *
  */
+@Deprecated
 public class POSTCallbackNotifier<T> extends AbstractCallbackNotifier<T> {
 
     Entity<?> entity = null;
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java
index 4a7765d97..64f5e88f8 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java
@@ -17,6 +17,7 @@
  *
  * This filter allows arbitrary redirection for other methods.
  */
+@Deprecated
 public class FollowRedirectsFilter implements ClientResponseFilter {
 
     @Override
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java
index 2abc20618..a62034d27 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java
@@ -12,6 +12,7 @@
  * @author Konstantin Pelykh (kpelykh@gmail.com)
  *
  */
+@Deprecated
 public class JsonClientFilter implements ClientResponseFilter {
 
     @Override
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
index 9a0297fdb..986b4c10a 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java
@@ -82,6 +82,7 @@
 @PreMatching
 @Priority(Integer.MIN_VALUE)
 @SuppressWarnings("ClassWithMultipleLoggers")
+@Deprecated
 public class LoggingFilter implements ContainerRequestFilter, ClientRequestFilter, ContainerResponseFilter,
         ClientResponseFilter, WriterInterceptor {
 
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
index d696bc800..0895dbfd9 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
@@ -32,6 +32,7 @@
  * @author Marcus Linke
  *
  */
+@Deprecated
 public class ResponseStatusExceptionFilter implements ClientResponseFilter {
 
     private static final Logger LOG = LoggerFactory.getLogger(ResponseStatusExceptionFilter.class);
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
index 9612011fa..862bdf0a9 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java
@@ -16,6 +16,7 @@
  *
  * @author sfitts
  */
+@Deprecated
 public class SelectiveLoggingFilter extends LoggingFilter {
 
     // Immutable'ish
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
index 4ec74ddcc..11e9f8684 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
@@ -11,6 +11,7 @@
  *
  * @author Marcus Linke
  */
+@Deprecated
 public class WrappedResponseInputStream extends InputStream {
 
     private Response response;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java
index 7c9fee550..f60a884b0 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java
@@ -20,12 +20,10 @@
 public class StatsCmdIT extends CmdIT {
     public static final Logger LOG = LoggerFactory.getLogger(StatsCmdIT.class);
 
-    private static int NUM_STATS = 5;
+    private static int NUM_STATS = 3;
 
     @Test
     public void testStatsStreaming() throws InterruptedException, IOException {
-        TimeUnit.SECONDS.sleep(1);
-
         CountDownLatch countDownLatch = new CountDownLatch(NUM_STATS);
 
         String containerName = "generated_" + new SecureRandom().nextInt();
@@ -40,7 +38,7 @@ public void testStatsStreaming() throws InterruptedException, IOException {
         StatsCallbackTest statsCallback = dockerRule.getClient().statsCmd(container.getId()).exec(
                 new StatsCallbackTest(countDownLatch));
 
-        countDownLatch.await(3, TimeUnit.SECONDS);
+        assertTrue(countDownLatch.await(10, TimeUnit.SECONDS));
         Boolean gotStats = statsCallback.gotStats();
 
         LOG.info("Stop stats collection");
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java b/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
index f4d790e0e..f98d7d281 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
@@ -3,6 +3,7 @@
  */
 package com.github.dockerjava.core.async;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.model.PullResponseItem;
 import com.github.dockerjava.test.serdes.JSONTestHelper;
@@ -31,7 +32,7 @@ public void processEmptyJson() throws Exception {
         InputStream response = new ByteArrayInputStream("{}".getBytes());
 
         JsonStreamProcessor<PullResponseItem> jsonStreamProcessor = new JsonStreamProcessor<>(
-                JSONTestHelper.getMapper(), PullResponseItem.class);
+                JSONTestHelper.getMapper(), new TypeReference<PullResponseItem>() {});
 
         final List<Boolean> completed = new ArrayList<>();
 

From 4b303af7adeb9ab45d4466ba801ef13b2caead20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivo=20=C5=A0m=C3=ADd?= <bedla.czech@gmail.com>
Date: Sun, 26 Jan 2020 15:32:29 +0100
Subject: [PATCH 0958/1272] Bump Jersey to 2.30 (#1308)

Fixes #698
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 456403b57..2149f8624 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
 		<jdk.source>1.8</jdk.source>
 		<jdk.target>1.8</jdk.target>
 
-		<jersey.version>2.27</jersey.version>
+		<jersey.version>2.30</jersey.version>
 		<jackson.version>2.9.8</jackson.version>
 		<jackson-jaxrs.version>2.9.8</jackson-jaxrs.version>
 		<httpclient.version>4.5.6</httpclient.version><!-- 4.5.1-4.5.2 broken -->

From 0e4b1a76333ca20ec750240b53c130b263da5924 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sun, 26 Jan 2020 21:32:43 +0100
Subject: [PATCH 0959/1272] Add japicmp to the API module and fix backward
 compatibility issues (#1310)

* Add automated japicmp to the API module

* restore backward incompatible removal of `Volume.parse(String)`
---
 docker-java-api/pom.xml                       | 58 +++++++++++++++++++
 .../github/dockerjava/api/model/Volume.java   | 13 +++++
 2 files changed, 71 insertions(+)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index e621994c7..bade957b7 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -55,6 +55,64 @@
 					</instructions>
 				</configuration>
 			</plugin>
+
+			<plugin>
+				<!-- use with "mvn -DskipTests clean verify" -->
+				<groupId>com.github.siom79.japicmp</groupId>
+				<artifactId>japicmp-maven-plugin</artifactId>
+				<version>0.14.3</version>
+				<configuration>
+					<oldVersion>
+						<dependency>
+							<groupId>com.github.docker-java</groupId>
+							<artifactId>docker-java</artifactId>
+							<version>3.1.5</version>
+							<type>jar</type>
+						</dependency>
+					</oldVersion>
+					<newVersion>
+						<file>
+							<path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
+						</file>
+					</newVersion>
+					<parameter>
+						<breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
+						<accessModifier>public</accessModifier>
+						<onlyBinaryIncompatible>true</onlyBinaryIncompatible>
+						<includes>
+							<include>com.github.dockerjava.api</include>
+						</includes>
+						<excludes>
+							<!-- TODO? -->
+							<exclude>com.github.dockerjava.api.model.*$Serializer</exclude>
+							<exclude>com.github.dockerjava.api.model.*$Deserializer</exclude>
+							<!-- Known 3.2.0 breaking changes: -->
+							<exclude>com.github.dockerjava.api.command.DockerCmdExecFactory#init(com.github.dockerjava.core.DockerClientConfig)</exclude>
+							<exclude>com.github.dockerjava.api.model.Identifier#tag</exclude>
+						</excludes>
+						<overrideCompatibilityChangeParameters>
+							<overrideCompatibilityChangeParameter>
+								<compatibilityChange>METHOD_NEW_DEFAULT</compatibilityChange>
+								<binaryCompatible>true</binaryCompatible>
+								<sourceCompatible>true</sourceCompatible>
+							</overrideCompatibilityChangeParameter>
+							<overrideCompatibilityChangeParameter>
+								<compatibilityChange>METHOD_ABSTRACT_NOW_DEFAULT</compatibilityChange>
+								<binaryCompatible>true</binaryCompatible>
+								<sourceCompatible>true</sourceCompatible>
+							</overrideCompatibilityChangeParameter>
+						</overrideCompatibilityChangeParameters>
+					</parameter>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>verify</phase>
+						<goals>
+							<goal>cmp</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java
index 14308ef23..bc511476f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.EqualsAndHashCode;
 
@@ -24,6 +25,18 @@
 public class Volume implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    /**
+     * Handles the {@code { "Destination" : { "path" : "/path/to/mount" } }} variant.
+     * @param path the destination path of the bind mounted volume
+     * @return a volume instance referring to the given path.
+     * @deprecated use {@link #parse(Map)}
+     */
+    @Nonnull
+    @Deprecated
+    public static Volume parse(@JsonProperty("path") String path) {
+        return new Volume(path);
+    }
+
     /**
      * Handles the {@code { "Destination" : { "path" : "/path/to/mount" } }} variant.
      * @param path the destination path of the bind mounted volume

From 18eddcef28f0f57780766c8fc8a28c7fe50ab2bc Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 27 Jan 2020 23:18:40 +0300
Subject: [PATCH 0960/1272] [maven-release-plugin] prepare release 3.2.0-rc3

---
 docker-java-api/pom.xml              | 2 +-
 docker-java-core/pom.xml             | 2 +-
 docker-java-transport-jersey/pom.xml | 2 +-
 docker-java-transport-netty/pom.xml  | 2 +-
 docker-java-transport-okhttp/pom.xml | 2 +-
 docker-java/pom.xml                  | 2 +-
 pom.xml                              | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index bade957b7..40fcf542a 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc3</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index 3fa7ce306..2f819756a 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc3</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index 295440266..7814cf9f0 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc3</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml
index 91483c167..59ada06be 100644
--- a/docker-java-transport-netty/pom.xml
+++ b/docker-java-transport-netty/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc3</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index a4642dff9..89ab8cdd9 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc3</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 5336a4b08..4985e782c 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc3</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index 2149f8624..4a0611b05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.2.0-SNAPSHOT</version>
+	<version>3.2.0-rc3</version>
 
 	<name>docker-java-parent</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.2.0-rc3</tag>
 	</scm>
 
 	<developers>

From 690ef15f33e3ba0783eab3b6f28a699a6e621448 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 27 Jan 2020 23:18:49 +0300
Subject: [PATCH 0961/1272] [maven-release-plugin] prepare for next development
 iteration

---
 docker-java-api/pom.xml              | 2 +-
 docker-java-core/pom.xml             | 2 +-
 docker-java-transport-jersey/pom.xml | 2 +-
 docker-java-transport-netty/pom.xml  | 2 +-
 docker-java-transport-okhttp/pom.xml | 2 +-
 docker-java/pom.xml                  | 2 +-
 pom.xml                              | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 40fcf542a..bade957b7 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc3</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index 2f819756a..3fa7ce306 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc3</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index 7814cf9f0..295440266 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc3</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml
index 59ada06be..91483c167 100644
--- a/docker-java-transport-netty/pom.xml
+++ b/docker-java-transport-netty/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc3</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index 89ab8cdd9..a4642dff9 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc3</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 4985e782c..5336a4b08 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc3</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index 4a0611b05..2149f8624 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.2.0-rc3</version>
+	<version>3.2.0-SNAPSHOT</version>
 
 	<name>docker-java-parent</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.2.0-rc3</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From ba58f8b6bad54134ace1c9e6a8adec71edfd1fcd Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Thu, 30 Jan 2020 07:34:51 +0100
Subject: [PATCH 0962/1272] Add Maven Wrapper (#1313)

---
 .mvn/wrapper/MavenWrapperDownloader.java | 117 +++++++++
 .mvn/wrapper/maven-wrapper.jar           | Bin 0 -> 50710 bytes
 .mvn/wrapper/maven-wrapper.properties    |   2 +
 mvnw                                     | 310 +++++++++++++++++++++++
 mvnw.cmd                                 | 182 +++++++++++++
 5 files changed, 611 insertions(+)
 create mode 100644 .mvn/wrapper/MavenWrapperDownloader.java
 create mode 100644 .mvn/wrapper/maven-wrapper.jar
 create mode 100644 .mvn/wrapper/maven-wrapper.properties
 create mode 100755 mvnw
 create mode 100644 mvnw.cmd

diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 000000000..b901097f2
--- /dev/null
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054
GIT binary patch
literal 50710
zcmbTd1CVCTmM+|7+wQV$+qP}n>auOywyU~q+qUhh+uxis_~*a##hm*_WW<ixd#%is
z`MjA6Ps&LG0VDqa2M7Q0;|Knq_Mbn9KabMFO8nH~G9t7<Kjb9A{`%$z;6J~R`yU07
z|Er)hzl^wuu%Z%;v`A76KV%;ryzsN%20oftDT;7=Lp24s|6o<1QMlkbk(A-!`nrlz
zDWz-wcfaRHfQuSG+95`%;59>?9E7Pb7N%LRFiwbEGCJ0XP=%-6oeT$XZcYgtzC2~q
zk(K08IQL8oTl}>>+hE5YRgXTB@fZ4TH9>7=79e`%%tw*SQUa9~$xKD5rS!;ZG@ocK
zQdcH}JX?W|0_Afv?y`-NgLum62B&WSD$-w;O6G0Sm;SMX65z)l%m1e-g8Q$QTI;(Q
z+x$xth4KFvH@Bs6(zn!iF#nenk^Y^ce;XIItAoCsow38eq?Y-Auh!1in#Rt-_D>H^
z=EjbclGGGa6VnaMGmMLj`x3NcwA43Jb(0gzl;RUIRAUDcR1~99l2SAPkVhoRMMtN}
zXvC<<g{bxb|AsQDMm`XZKV7r`Y5()w1OItz>tOmX83grD8GSo_Lo?%lNfhD#EBgPo
z*nf@ppMC#B!T)Ae0RG$mlJWmGl7CkuU~B8-==5i;rS;8i6rJ=PoQxf446XDX9g|c>
zU64ePyMlsI^V5Jq5A+BPe#e73+kpc_r1tv#B)~EZ;7^67F0*QiYfrk0uVW;Qb=NsG
zN>gsuCwvb?s-KQIppEaeXtEMdc9dy6Dfduz-tMTms+i01{eD9JE&h?Kht*$eOl#&L
zJdM_-vXs(V#$Ed;5wyNWJdPNh+Z$+;$|%qR(t`4W@kDhd*{(7-33BOS6L$<Ec$2A*
zX%N|qCOg6KGF$}+*B^380SL};F@;W&Q<?0z(Oq^dk%=E)cjsZQ(gMT&6zL<+gbhl4
z-{UVq4~)HP%!ZmXZY9J@Xw|PJwn!aZq)jiuMZ6ECt21>UPDeE_53j${QfKN-0v-HG
z(QfyvFNbwPK%^!eIo4ac1;b<Cy0l6VBm^C{og@M3a>>c0vyf9}Xby@YY!lkz-UvNp
zwj#Gg|4B~?n?G^{;(W;|{SNoJbHTMpQJ*Wq5b{l9c8(%?Kd^<m!CW)Ad5}K$XYWi?
zZwEOKN&q^+9hBBYC7XXr#u0ixOzV?1jg3MO39D_%q+<J|G{O*nW+DT+z8F(<3Bnkv
zSlB9^%x<GUn#O`lgPCJj?w)X_{z_WS8e)%4p`GSlxuznbiIOnnacE`#V5>1?H<bps
z^KeTf0dV|-IHDngtUt|}GO0TGt+B<O!zR!;4N9ibD3VBh9=!Oge|SWzP#76PYQ&fw
zSGRg*MtmCNuCYQX<-5@=g(G=1C529}G9p3Iqrp_2gmQ0*le|^QrC+c;3<gL|vr&yt
zG6f0UXl+0|y|Jc}f<e%(RLJiyPNiw&KIB(38Idi9W5HAsaSQhTg)zcvVTV?7VY`UD
znkpv_w)}zZ;`Ll9=IWo4jq47DdePy{f@LB0U^QiKIJOJKY`wy>1om1de0Da9M;Q=n
zUfn{f87iVb^>Exl*n<T%tK{W>Z0hs(Yt>&V9$Pg`zX`AI%`+0SWQ4Zc(8lUDcTluS
z5a_KerZWe}a-MF9#Cd^fi!y3%@RFmg&~YnYZ6<=L`UJ0v={zr)>$A;x#MCHZy1st7
ztT+N07NR+vOwSV2pvWuN1%lO!K#Pj0Fr>Q~R40{bwdL<wm-z-wIVsTI!*3O}o;9&;
z5cTXH{O&r)mqB^q;ZeHbw*+WCuHGZ`k`go4maB>%u9i`DSM4RdtEH#cW)6}+I-eE<
z&tZs+(Ogu(H_;$a$!7w`MH0r%h&@KM+<>gJL@O~2K2?VrSYUBbhCn#yy?P)uF3qWU
z0o09mIik+kvzV6w>vEZy@&Mr)SgxPzUiDA&%07m17udz9usD82afQEps3$pe!7fUf
z0eiidkJ)m3qhOjVHC_M(RYCBO%CZKZXFb8}s0-+}@CIn&EF(rRWUX2g^yZCvl0bI}
zbP;1S)iXnRC&}5-Tl(hASKqdSnO?ASGJ*MIhOXIblmEudj(M|W!+I3eDc}7t`^mtg
z)PKlaXe(OH+q-)qcQ8a@!llRrpGI8DsjhoKvw9T;TEH&?s=LH0w$EzI>%u;oD@x83
zJL7+ncjI9nn!TlS_KYu5vn%f*@<tbI*y@KgQh-P7aV}+H4c#hKvqbJDWNeG;NaGF$
zMTU6#bBwO^n6QwXYLBOA2YCufAq_E+w1$LAL-}@2CC4-3sCkqZUuVj<&^C6hk%$w$
zPP?9f6VuIO?HcPHWY#R#)X3kV9^1Vn_}NE5?_^n&XKDWM`!%O0dq<z;PMi?H^2G{8
z_p{E&25ba{PO30LY-Sf$;Tu^*%Y$C^$EmZ2c?xntQ^!q}WXvun+UdJ5z+ZmB+{(w0
z0LYIYdXWG1Z2Iq8G{fI*(L%;1`p#BPLbk3pR<`;^#tuaE|J<P!t!0t;;eC>qa5F;|
zEFxY&B?g=IVlaF3XNm_03PA)=3|{n-UCgJoTr;|;1AU9|kPE_if8!Zvb}0q$5okF$
zHaJdmO&gg!9oN|M{!qGE=tb|3pVQ8PbL$}e;NgXz<6ZEggI}wO@aBP**2Wo=yN#ZC
z4G$m^yaM9g=|&!^ft8jOLuzc3Psca*;7`;gnHm}tS0%f4{|VGEwu45KptfNmwxlE~
z^=r30gi@?cOm8kAz!EylA4G~7kbEiRlRIzwrb~{_2(x^$-?|#e6Bi_**(vyr_~9Of
z!n>Gqf+Qwiu!xhi9f53=PM3`3tNF}pCOiPU|H4;pzjcsqbwg*{{kyrTxk<;mx~(;;
z1NMrpaQ`57yn34>Jo3b|HROE(UNcQash!<Gjf_cVClc1kwaATyDY}hUB4bg-($uix
zY7hSo_UKzVd>0p2-!Cz;{IRv#Vp5!3o$P8!%SgV~k&Hnqhp<btp}}6$qI7*vS&uZ9
zbAG2@x&Wej)TNX_!V+>`5eLjTcy93cK!3Hm-$`@yGnaE=?;*2uSpiZTs_dDd51U%i
z{|Zd9<WeM#Riq}sK3q2TIdY0+FBz3Lfj#({d`K!z8Ua*IIK2|>ou-;laGS_x=O}a+
zB<rH*!qsToxVXoFgi-Pc3Kx6-c39DfRyNjH)CeNcV1Xdn;EeR<ltYsqb^qiQ<}buC
zUkK(S{&Bhwf&LD0ivJqo6x|)2jIHJV!(sdL<mS%r>||za<795A?_~Q=r=coQ+ZK@@
zId~hWQL<%)fI_WD<Nc6^qCzK4PYOIL3}S7FBJ6Y#SwyX2B6c-zB!;1kwRv^`ZzqOf
z>IX#=(WNl!Dm$a&ROfLTd&B$vatq!M-2Jcs;N2vps$b6P1(N}=oI3<3luMTmC|0*{
zm1w8bt7vgX($!0@V0A}XIK)w!AzUn7vH=pZEp0RU0p?}ch2XC-7r#LK&vyc2=-#Q2
z^L%8)JbbcZ%g0Du;|8=q8B>X=mIQirpE=&Ox{TiuNDnOPd-FLI^KfEF729!!0x#Es
z@>3ursjFSpu%C-8WL^Zw!7a0O-#cnf`HjI+AjVCFitK}GXO`ME&on|^=~Zc}^LBp9
zj=-vlN;Uc;IDjtK38l7}5xxQF&sRtfn4^TNtnzXv4M{r&ek*(eNbIu!u$<N>>Ed%`
z5x7+&)2P&4>0J`N&ZP8$vcR+@FS0126s6+Jx_{{`3ZrIMwaJo6jdrRwE$>IU_JTZ}
z(||hyyQ)4Z1@wSlT94(-QK<hEI4XkIQYLgX<8rwPmE+=t(|@!gs6@{ux=0Y}^8qrs
zNR`*CEQ2=*7ZvlR&k8I<4Yt`~Jd)19073U0T|q{zWz*53Z&*@&iN1K(x<XfVWOZnX
zwm+u4!rk54^>qkAatMmkT7pCycEB1U8KQbFX&?%|4$yyxCtm3=W`$4fiG0WU3yI@c
zx{wfmkZAYE_5M%4{J-ygbpH|(|GD$2f$3o_Vti#&zfSGZMQ5_f3xt6~+{RX=$H8at
z?GFG1Tmp}}lmm-R->ve*Iv+XJ@58p|1_jRvfEgz$XozU8#iJS})UM6VNI!3RUU!{5
zXB(+Eqd-E;cHQ>)`h0(HO_zLmzR3Tu-UGp;08YntWwMY-9i^w_u#wR?JxR2bky5j9
z3Sl-dQQU$xrO0xa&>vsiK`QN<$Yd%YXXM7*WOhnRdSFt5$aJux8QceC?lA0_if|s>
ze{ad*opH_kb%M&~(~&UcX0nFGq^MqjxW?HJIP462v9XG>j(5Gat_)#SiNfahq2Mz2
zU`4uV8m$S~o9(W>mu*=h%Gs(Wz+%>h;R9Sg)jZ$q8vT1HxX3iQnh6&2rJ1u|<wug5
zO)e@WFa;JSSOtFV-0$1cxPn+eBsruVvnW3#;>j>^Qf`A76K%_ubL`Zu<j0}PM%5V+
z#B3wIDk3d)A}ujNM$e1J#S|R8`VAjPvZ4v6coT~mCu??Es<%#hPD1!o_ov<SnL0mu
z^!v`RC5W;uz99#ol~55F7$`ujoGG`ZRzDIZM&yEIQOl9J3{<wJNFb~f8gny*6Yr<?
zs_6)-k-Dl0gKzc)CjZjN!Fvz`nCadt)7}gOxE-d<yj>?h4`b=IyL>1!=*%!_K)=XC
z6d}4R5L+sI5<whOgpIBMZ_g*Vfer)jb&n3G#%b!yE!3FnKQouNYbA2ajy{jd2R0Sw
z!>0Q4P3upXQ3Z!~1ZXLlh!^UNcK6#QpYt-YC=^H=EPg3)z*wXo*024Q4b2sBCG4I#
zlT<G;n{_4%D%EWXfOFqi>FFY=kQ>xvR+LsuDUAk)q%5pEcqr(O_|^spjhtpb1#aC&
zghXzGkGDC_XDa%t(X`E+kvKQ4zrQ*uuQoj>7@@ykWvF332)RO?%AA&Fsn&MNzmFa$
zWk&&^=NNjxLjrli_8ESU)}U|N{%j&TQmvY~lk!~Jh}*=^INA~&QB9em!in_<Qa?j<
zqmO#O!7*4ZUV(#aq_c@nOQK(XJ2W{=3awHW4{k_f!Y|o|_G0y-q}>X%Rl1&Kd~Z(u
z9mra#<@vZQlOY+JYUwCrgoea4C8^(xv4ceCXcejq84TQ#sF~IU2V}LKc~Xlr_P=ry
zl&Hh0exdCbVd^NPCqNNlxM3vA13EI8XvZ1H9#bT7y*U8Y{H8nwGpOR!e!!}*g;<eb
z;rNL4bptqUO;1s@{82O5gjua$jm<dekvS_LF}Ul@Hd1a?B8u&Yau`nJedp21-~Y(e
zt;Gh@iNFePt5|)BfT+>mJ#}T{ekSb}5zIPmye*If(}}_=PcuAW#yidAa^9-`<8Gr0
z)Fz=NiZ{)HAvw{Pl5uu)?)&i&Us$Cx4gE}cIJ}B4Xz~-q7)R_%owbP!z_V2=Aq%Rj
z{V;7#kV1dNT9-6R+H}}(ED*_!F=~uz>&nR3gb^Ce%+0s#u|vWl<~JD3MvS0T9thdF
zioIG3c#Sdsv;LdtRv3ml7%o$6LTVL>(H`^@TNg`2KPIk*8-IB}X!MT0`hN9Ddf7yN
z?J=GxPL!uJ7lqwowsl?iRrh@#5C$%E&h~Z>XQcvFC*5%0RN-Opq|=IwX(dq(*sjs+
zqy99+v~m|6T#zR*e1AVxZ8djd5>eIeCi(b8sUk)OGjAsKSOg^-ugwl2WSL@d#?mdl
zib0v*{u-?cq}dDGy<uHZmO7`f4M%oin|l|K8(>Z%$XRY=UkQwt2oGu`zQneZh$=^!
zj;!pCBWQNtvAcwcWIBM2y9!*W|8LmQy$H~5BEx)78J`4Z0(FJO2P^!YyQU{*Al+fs
z){!4JvT1iLrJ8aU3k0t|P}{RN)_^v%$$r;+p0DY7N8CXzmS*HB*=?qaaF9D@#_$SN
zSz{moAK<*RH->%r7xX~9gVW$l7?b|_SYI)gcjf0VAUJ%FcQP(T<UI^GmLDW=>pBs;
zg$25D!Ry_`8xpS_OJd<NQAg}@GuM#Is%6^ePzKH)emeCFg+1`-FwdYjrXR}vx<@qK
z43RJ&FutS&7Y~Jw?2^674CW0rQY6&cbGNc2*L>eo$qh#7U+cepZ??TII7_%AXsT$B
z=e)Bx#v%J0j``00Zk5hsvv6%T^*xGNx%KN-=pocSoqE5_R)OK%-Pbu^1MNzfds)mL
zxz^F4lDKV9D&lEY;I+A)ui{TznB*CE$=9(wgE{m}`^<--OzV-5V4X2w9j(_!+jpTr
zJvD*y6;39&<tM)`(>T+==$F&tsRKM_lqa1HC}aGL0o`%c9mO=fts?36@8MGm7Vi{Y
z^<7m$(EtdSr#22<(rm_(l_(`j!*Pu~Y>>xc>I9M#DJYDJNHO&4=HM%YLIp?;iR&$m
z<T({U$v{GCBf+1{WW$hNjVxEbq#jLb*hb+kjl1Hara!d%A|`1T(i_is9wFMT$LvF#
z>#_$ZWYLfGLt5FJZhr3jpYb`*%9S!zCG6ivNHYzNHcI%khtgHBliM^Ou}ZVD7ehU9
zS+W@AV=?Ro!=%AJ>Kcy9aU3%VX3|XM_K0A+ZaknKDyIS3S-Hw1C7&BSW5)sqj5Ye_
z4OSW7Yu-;bCyYKHFUk}<*<(@TH?YZPHr~~Iy%9@GR2Yd}J2!N9K&CN7Eq{Ka!jdu;
zQNB*Y;i(7)OxZK%IHGt#Rt?z`I|A{q_BmoF!f^G}XVeTbe1Wnzh%1g>j}>DqFf;Rp
zz7>xIs12@Ke0gr+4-!pmFP84vCIaTjqFNg{V`5}Rdt~xE^I;Bxp4)|cs8=f)1YwHz
zqI`G~s2~qqDV+h02b`PQpUE#^^Aq8l%y2|ByQeXSADg5*qMprEAE3WFg0Q39`O+i1
z!J@iV!`Y~C$wJ!5Z+j5$i<1`+@)tBG$JL=!*uk=2k;T<@{|s1$YL079FvK%mPhyHV
zP8^KGZnp`(hVMZ;s<o6=bTk63a|d{gmA$-2FS<7$0eSF-TlR?AZ3IY<b6vyjlw+^*
zEwj5-yyMEI3=z&TduBb3HLKz9{|qCfLrTof>=n~3r2y;LTwcJwoBW-(ndU-$03{RD
zh+Qn$ja_Z^OuMf3Ub|JTY74s&Am*(n{J3~@#OJNYuEVVJd9*H%)oFoRBkySGm`hx!
zT3tG|+aAkXcx-2Apy)h^BkOyFTWQVeZ%e2@;*0DtlG9I3Et=PKaPt&<yF%{*Oa9Ou
z?0fv-L@Wq#aYQwg<&*FB!}27``9X-#8$sBgZY9F8F6O2!ko&pl;lM|sJGAG5mOc>K
zw?WI7S;P)TWED7aSH$3hL@Qde?H#tzo^<(o_sv_2ci<7M?F$|oCFWc?7@KBj-;N$P
zB;q!8@bW-WJY9do&y|6~mEruZAVe$!?{)N9rZZxD-|oltkhW9~nR8bLBGXw<632!l
z*TYQn^NnUy%Ds}$f^=yQ+BM-a<Z5BE&^HfASBBCSBYk?h>5X4^GHF=%PDrRfm_uqC
zh{sKwIu|O0&jWb27;wzg4w5uA<BJk(&g3ps<R=%CY(7QqFA5{FiGuP3;4S2PC(Mi$
zC5aTKLtzx{`nHq!$rlFcs-067FX2P^ATRXe26>@TO_j(1X?8E>5Zfma|Ly7Bklq|s
z9)H`zoAGY3n-+&JPrT!>u^qg9Evx4y@GI4$n-Uk_5wttU1_t?6><>}cZ-U+&+~JE)
zPlDbO_j;MoxdLzMd~Ew|1o^a5q_1R*JZ=#XXMzg?6Zy!^hop}qoLQlJ{(%!KYt`MK
z8umEN@Z4w!2=q_oe=;QttPCQy3Nm4F@x>@v4sz_jo{4m*0r%J(w1cSo;D_hQtJs7W
z><$QrmG^+<$4{d2bgGo&3-FV}avg9zI|Rr(k{wT<Sdtm!m&XN2&fW+_>yl3!M1q+a
zD9<of)}AueHsfP1J}234JKxcgvNA9NG}WeUj0Zbm5CmL#imino*M-yu8^dj56O^l1
zYWXWE2bd(44i?`S-6i^m({c6YwMb?3wJ)oXuwG6pkg#6OpBKYKULTjkOkS(Xk*Mz~
z7Q@V{ssRW3A8!L|*t2g!K5m7SODVEv1T?tvMEAnh%2B^+<pxcK*E^Zd6E`@?zc&{y
zX|_OJ8`w4kKd*`Rw)#C!x`_QSDAkTc6*9{J4R;Lc#MM<o0P57$n?bwwsG_|JFA+7_
z?h=+&W~by)*t5wwl<HMN8;WoZD%eD|3s6q@zGQ&~G9!L}|67$okU22M4*JIr6ZF4}
zX2}0Gn)#0u&OgE!;pkr2UOxEX@4UqLShpWwXf!NST?BDrM1k)Xq>W{pCd%il*j&Ft
z5H$nENf>><Y)QWN-8+C%b1(A+(9Im-8IpSA2E~smh4hWm>k$;SONGW`qo6`&qKs*T
z2^RS)pXk9b@(_Fw1bkb)-oqK|v}r$L!W&aXA>IpcdNZ_vWE#XO8X`#Yp1+?RshVcd
zknG%rPd*4ECEI0wD#@d+3NbHKxl}n^Sgkx==<uI|{1wy%+CL-K{xNd@Py3&PI<mi;
z25}olCw(ice=js-sk!T6A3A??n-{594W&d{Mf6jFzQ#K1VHw3n-Qr^i5vi*s53K1i
zE=3;<c5sg4CL2}%vPJ~o1sCrPw&R=v0G_X{N6^y%G*?_>Iu%}HvNliOqVBqG?P2va
zQ;kRJ$J6j;+<xEs^ttxF-^}UyLj8r}Fu@n57l(vrQE#yH8@Gep;Ig4Wy5F7>wP9cS
za#m;#GUT!qAV%+rdWolk+)6kkz4@Yh5LXP+LSvo9_T+M<xuU7dbbaY5s%w3%#p&{F
ztM*cZUwIhVTb2Pg9JUH!V&#Br+N^#Wvc!s(;)Q~g8eM`23D9;1BRUv|lC1QSt-zv6
zoq)4i%TUE(I#{SL`l7hrzsQtlSzBzh;LuWVR?Z<S_x%`~0^X%LGvyJ2D<d=aQjok{
zYGOc(|8&mS8wFk|<0el*^<FwP6+d+mA$(1{Y{Z7Mdy)XiIfqd%=)KZSET@5%dz2f$
z{Un~zG7b*I`W|M$n$o;wuExK@H`@C%?K^T(&x{PEB_5x&-9(+l2fxJJk<5y+qd5+M
zv)B^?$ftKB?B&R{Q;mp@^S%Ae)!O=eYp$cIKSZ*2h0j|4>miaP-eq6_k;)i6_@WSJ
zlT@wK$zqHu<83U2V*yJ|XJU4farT#pAA&@qu)(PO^8PxEmPD4;Txpio+2)#!9<es>
z>&=i7*#tc0`?!==v<bsniFv!RUA#@&Lyk@hN~=JDH*o=17Q463OwwFoplX_0NX6-o
zN1w#kEjtz1k+Zg;2pE57MgMenvk|UJ3o9Ef<%jZK@5Ne9Wa|yQ@G{H{smA=MpcE$t
zK;UDltfgiWtz8gFPj^Z}me|ICuRgJNi~+fgFp&$hxgOe#Rv)}-!4N-L2pTTKFK0GE
zL6;4olJ-fYa99o=tKLV@_S1xzq$ZN){E)+e#JR?p5SNk%W<_FCc@~h9E}h;!E#r9}
z-x7!Cd3qJE1zvPl0-r~j9?;WZ@j7-xzypJVH(S;^!3KL5vO0V&t0)qOKBs#UBu-~X
z6PpHB39RQgJ4P3*+EhDJFeZzeUwYTWHCGM$zF|;;LEVMcEWyyVWYsT)Tv8YOp`m?r
z)^LN!x{w5kg4lRZ1O`7dDYq^>k>s7V+PL#S1;PwSY?NIXN2=Gu89x(cToFm))7L;<
z+bhAbVD*bD=}iU`+PU+SBobTQ%<B$L&s0ur8SOhLIn6@U0dzLRHz5^E5p#yPL9a;0
z8_Y=7KwxWWl2J`f>S!=VL!>q$rfWsaaV}Smz>lO9JXT#`CcH_mRCSf4%YQAw`$^yY
z3Y*^Nzk_g$xn7a_NO(2Eb*I=^;4f!Ra#Oo~LLjlcjke*k*o$~U#0ZXOQ5@HQ&T46l
z7504MUgZkz2gNP1QFN8Y?nSEnEai^Rgyvl}xZfMUV6QrJcXp;jKGqB=D*tj{8(_pV
zqyB*DK$2lgYGejmJUW)*s_Cv65sFf&pb(Yz8oWgDtQ0~k^0-wdF|tj}MOXaN@ydF8
zNr={U?=;&Z?wr^VC+`)S2xl}QFagy;$mG=TUs7Vi2wws5zEke4hTa2)>O0U?$WYsZ
z<8bN2bB_N4AWd%+kncgknZ&}bM~eDtj#C5uRkp21hWW5gxWvc6b*4+dn<{c?w9Rmf
zIVZKsPl{W2vQAlYO3yh}-{Os=YBnL8?uN5(RqfQ=-1cOiUnJu>KcLA*tQK3FU`_bM
zM^T28w;nAj5EdAXFi&Kk1Nnl2)D!M{@+D-}bIEe+Lc4{s;YJc-{F#``iS2uk;2!Zp
zF9#myUmO!wCe<Ub=&>JIoi^A+T^e~20c+c2C}XltaR!|U-HfDA=^xF97ev}$l6#oY
z&-&T{egB)&aV$3_<F_@%fux9my8>aVA51XGiU07$s9vubh_kQG?F$FycvS6|IO!6q
zq^>9|3U^*!X_C~SxX&pqUkUjz%!j=VlXDo$!2VLH!rKj@61mDpSr~7B2yy{>X~_nc
zR<ohS^J`dGk6dIaG_i)Gd;aTd3dt9wue4&7p50t#3MF3fEaQm_e(!eLi>I+7g2V&k
zd**H++P9dg!-AOs3;GM`(g<+GRV$+&DdMVpUxY9I1@uK28$az=6oaa+PutlO9?6#?
zf-OsgT>^@8KK>ggkUQRPPgC7zjKFR5spqQb3ojCHzj^(UH~v+!y*`Smv)VpVoPwa6
zWG18WJaP<b8NF3dd`4EQ>KMi*F6Zdk*kU^`i~NNTfn3BkJniC`yN98L-Awd)Z&mY?
zprBW$!qL-OL7h@O#kvYnLsfff@kDIegt~?{-*5A7JrA;#TmTe?jICJqhub-G@e??D
zqiV#g{)M!kW1-4SDel7TO{;@*h2=_76g3NUD@|c*WO#>MfYq6_YVUP+&8e4|%4T`w
zXzhmVNziAHazWO2qXcaOu@R1MrPP{t)`N)}-1&~mq=ZH=w=;-E$IO<yffr9?K?92P
z0((ND@f`e{B%~;??Ny|=P=KRtI%m@6cA`)Elro^w{wSOJ>k=y$dOls{6sRR`I5>|X
zpq~XYW4sd;J^6OwOf**J>a7u$S>WTFPRkjY;BfVgQst)u4aMLR1|6%)CB^18XCz+r
ztkYQ}G43j~Q&1em(_EkMv0|WEiKu;z2zhb(L%$F&xWwzOmk;VLBYAZ8lOCziNoPw1
zv2BOyXA`A8z^WH!nXhKXM`t0;6D*-uGds3TYGrm8SPnJJOQ^fJU#}@aIy@MYWz**H
zvkp?7I5PE{$$|~{-ZaFxr6ZolP^nL##mHOErB^AqJqn^hFA=)HWj!m3WDaHW$C)i^
z9@6G$SzB=>jbe>4kqr#sF7#K}W*Cg-5y6kun3u&0L7BpXF9=#7IN8FOjWrWwUBZiU
zT_se3ih-GBKx+Uw0N|CwP3D@-C=5(9T#BH@M`F2!Goiqx+Js5xC9<T}`<iuZU?7g^
zD&=BWAh8}H)`P!JCWQ=&H_mj>2|Sy0%WWWp={$<c=m>(am!#l~f^W_oz78HX<0X#7
zp)p1u<E)S<Hy%f8)p*25ts$LSDkSe5AWt`*emazpyN;Hy&qA}+%@Pz^XW|M^4@iA_
z#*l+8z%;N~x^mcao{KKyg-Erj_CzJY1ma9CD7bb%0b5IFy_$k!3U=_aCQRg<4PRg@
z7VqLss(vcTz8~Pb55$JJ@2ARmDt7;jiJ!E~Ou-7*YBx0W>~M*o9W@O8P{0Qkg@Wa#
z2{Heb&oX^CQSZWSFBXKOfE|tsAm#^U-WkDnU;IowZ`Ok4!mwHwH=s|AqZ^YD4!5!@
zPxJj+Bd-q6w_YG`z_+r;S86zwXb+EO&qogOq8h-Ect5(M2+>(O7n7)^dP*ws_3U6v
zVsh)sk^@*c>)3EML|0<-YROho{lz@Nd4;R9gL{9|64xVL`n!m$-Jjrx?-Bacp!=^5
z1^T^eB{_)Y<9)y{-4Rz@9_>;<Ni;e7a(v#>_7h;5D+@QcbF4Wv7hu)s0&==&6u)33
zHRj+&Woq-vDvjwJCYES@$C4{$?f$Ibi4G()UeN11rgjF+^;YE^5nYprYoJNoudNj=
zm1pXSeG64dcWHObUetodRn1Fw|1nI$D9z}dVEYT0lQnsf_E1x2vBLql7NrHH!n&Sq
z6lc*mvU=W<?&3Y7tNdrmhnHR-*#=c(@8+WX>S6=v9Lrl}&zRiu_6u;6g%_DU{9b+R
z#YHqX7`m9eydf?KlKu6Sb%j$%_jmydig`B*TN`cZL-g!R)iE?+Q5oOqBF<tbk>Khx
z%MW>BC^(F_JuG(ayE(MT{S3eI{cKiwOtPwLc0XO*{*|(JOx;uQOfq@lp_^cZo=FZj
z4#}@e@dJ>Bn%2`2_WPeSN7si^{U#H=7N4o%Dq3NdGybrZgEU$oSm$hC)uNDC_M9xc
zGzwh5Sg?mpBIE8lT2XsqTt3j3?We8}3bzLBTQd639vyg^$0#1epq8snlDJP2(BF)K
zSx30RM+{f+b$g{9usIL8H!hCO117Xgv}ttPJm9wVRjPk;ePH@zxv%j9k5`TzdXLeT
zFgFX`V7cYIcBls5WN0Pf6SMBN+;CrQ(|EsFd*xtwr#$R{Z9FP`OWtyNsq#mCgZ7+P
z^Yn$haBJ)r96{ZJd8vlMl?IBxrgh=fdq_NF!1{jARCVz>jNdC)H^wf<?2G!*f3zl;
zdyVT?9`x`+G$!^eYN@PUum|5;j8$+`cBrBI`k*I0!jRt1BR=3gh&7e8U#!mamgR&_
z3Z&@9rms~l@GlsEKduCfx9Wt{o>y?R94#MPdUjcYX>#wEx+LB#P-#4S-%YH>t-j+w
zOFTI8gX$ard6fAh<H75EJ<)LuH_auhegZ+2E4B~a%IAJaFMvo?e6^A8l)Wuy^I?pi
zZF>&g=u&56%3^-6E2t<Yn^f-uPCm9NB$suTK>pk*wx<W&S3r;(8>3HSCQ+t7+*iOs
zPk5ysqE}i*cQocFvA68xHfL|iX(C4h*67@3|5Qwle(8wT&!&{8*{f%0(5gH+m>$tq
zp;AqrP7?XTEooYG1Dzfxc>W%*CyL16q|fQ0_jp%%Bk^k!i#Nbi(N9&T>#M{gez_Ws
zYK=l}adalV(nH}I_!hNeb;tQFk3BHX7N}}R8%pek^E`X}%ou=cx8InPU1EE0|Hen-
zyw8MoJqB5=)Z%JXlrdTXAE)eqLAdVE-=>wGHrkRet}>3Yu^lt$Kzu%$3#(ioY}@Gu
zjk3BZuQH&~7H+C*uX^4}F*|P89JX;Hg2U!pt>rDi(n(Qe-c}tzb0#6_ItoR0->LSt
zR~UT<-|@TO%O`M+_e_J4wx7^)5_%%u+J=yF_S#2Xd?C;Ss3N7KY^#-vx+|;bJX&8r
zD?|Met<uN>fhdC;^2WG`7MCgs>TKKN=^=!x&Q~Bzm<ft$_V>Qio_^l~LboTN<PA~s
ztvhkHV^TX6A<gyPqRneP;k-V;s*DXI`}cJ$*6E%w9XQN&$K(|;D9!d;Dz*l664jkU
zH#;2-C(!ut!I4z@rO6NomJDRcU5l|T$u40Cy)I1oatN8UM8v!=v?@wZKtav91=kx1
z4-I*8uU&4aiIm8&k*~&8?yrs}Q*4zuFw(bo3D%Hqk;QI)VqJr)PN^o{UIT(vi#=H=
z9m2cfv@TkDR+$~#OedTM8bgUKdawh=YD1?-b=GGS!rs?U9*&_9`8Hi1QB^7;1>T=I
zC5pme^P@ER``p$2md9>4!K#vV-Fc1an7pl>_|&>aqP}+zqR?+~Z;f2^`a+-!Te%V?
z;H<Wc=_RRR*LGsBEHu3xAdt&PDAh@%hvU_KO?Qc0RkblthZye3kgC5ar|FAvvzZzy
z5dZN1Mxh)MzaIl)qcT=a4!-}50&|$B3AXWv`5KD%cNqiXzsnd%*_xXEd%7U#59?)K
z4xQT-%Tjgh_pV$q1N?wB#Ut@8)BrjJ2?<CfBk^uTTg9@%T+@9s&TYvH;{b3J-Uq-J
z*}h{(Fj`2RxTo#3WA^-gW^<3v_Y1@hLbe$h9TVZHy4UYbApOTzxxl5kg8;wSWE}VG
zSWF3M#t^TOs$U`5P3xS<HhsD5nzlL@E-mOQJOSOipgt$0)9B$<&HZv~ky}tW35}9Q
z5*_5Aj_a$do+-~5sY56*jA#QLIeS76(hGFsa!*18efa$r<2<6`g?Jw4m-ZukILk~E
z+Da1^B-Mu5cDMA0{2yabgybylROn|Z=GUsf?fM6R$Drq%@xrqjw~_9suR#_R8wgXt
zU{ku=r+e>2SbF>jP^GE(R1@%C==<Y8b3&KH&O-3=eOv7*kQd9tI?UwT<t28PMVWZ(
zb&yE$i+8*sa|7NnujnUq6j*M5P(EydLP83}pABbYnp}h#9fwL9pl^~TRlA*50Fa8B
zEF<GcBFn{f69flKgt-u(%$yjN&TL{r%853aEKFRNX78M-GIhf%{FZJ{4g;ImRS71`
z3Yyo6P*Ki0@e;hhPWD(bhz2*>XQ@J=G9<S3k+D*)z%97N7^1&&l9}OAEHi077O(On
z7noWoH(DE8z|Ah_o?LvO$02OkEQ~{&Ha}?tE!dW%$NLAI0!b<NKmM?+t^bzaLi=}c
zlKzW%t@;mw^IyEz{~#53VX0z#_pH<z9o8RkgfU_gPu3c1j+xCdiHBHG4%}8=t~k#v
zX&p3FDYYxgltjWp7V)VY*Dyd9$+4J2)t8zpsz4cE%Rg-q^7#P<eRm`@QDNP`6SsR_
zcRx>lKX+Z<@5}PO(EYkJh=GCv#)Nj{DkWJM2}F&oAZ6xu8&g7pn1ps2U5srwQ7CAK
zN&*~@t{`31lUf`O;2w^)M3B@o)_mbRu{-`PrfNpF!R^q>yTR&ETS7^-b2*{-tZAZz
zw@q5x9B5V8Qd7dZ!Ai$9hk%Q!wqbE1F1c96&zwBBaRW}(^axoPpN^4Aw}&a5d<X6d
zH@0s>Me+*Gomky_l^54*rz<JzyAnm5XmBkSe<g?3k}Pfe82t7g;_<e&aU+v+4)y$m
zeRb}%59lYn5f}Nk?%BSnMqF!Ws^_X#@=Md_1O^7%$uR2oA!FtlReDyCcd=Q;>Xro$
z>LL)U5Ry>~FJi=*{JDc)_**c)-<XP_l4Gyvx}^77eE5(E^L$hk;37Mzdo6^f)`}K#
z{THLSWCZ0(xW^hpwR%@^?}>&faPz`6v`YU3HQa}pLtb5K)u%K+BOqXP0)rj5Au$zB
zW1?vr?mDv7Fsxtsr+S6ucp2l#(4dnr9sD*v+@*>g#M4b|U?~s93>Pg{{a5|rm2xfI
z`>E}?9S@|IoUX{Q1zjm5YJT|3S>&09D}|2~BiMo=z4YEjXlWh)V&qs;*C{`UMxp$9
zX)QB?G$fPD6z5_pNs>Jeh{^&U^)Wbr?2D6-q?)`*1k@!UvwQgl8eG$r+)NnFoT)L6
zg7lEh+E6J17krfYJCSjWzm67hEth24pomhz71|Qod<y$kjUFGaYg({=ldyCfYpI@C
zyQ_HeVXg^DSqhfa!y3S&hsT8J`qen*_5BW6wev2f-(!PE#XLIRvJ}X&_<)kgBfX&i
zXBwmuwju7ZzI8>n#oAILN)*Vwu2qpJirG)4Wnv}9GWOFrQg%Je+gNrPl8mw7ykE8{
z=|B4+uwC&bpp%eFcRU6{mxRV32VeH8XxX>v$du<$(Dfin<wZp$Q4H)Pfaukv*H0sf
z)WRtvk$o*4iMkf%^PAH#OI%3p*MbxQ{|t!*E9l0YI=&v-fja=}q?f)Qn_@69k!D6S
zU&b#%z(rw9E4Sc?(mn@@6~ZbrsZ)CkrY_Z_{e}wQyVA*eEj2w{-Fk?e+oaUR*{gY?
zEa8nD&St2JfiZ`&wn?g&EX9U~E9THj#k{MW89{=ii7l$h{u>aaWxP<+Y97Z#n#U~V
zVEu-GoPD=9$}P;xv+S~Ob#mmi$JQmE;Iz4(){y*9pFyW-jjgdk#oG$fl4o9E8bo|L
zWjo4l%n51@Kz-n%<M_TV#ts1K0mYf1F47fBmqr!jgmKJ;=;j+@iNEaC9YoqI$#UMP
z_DaJ2MCm5+3Oh~T3-;SBiloB1nPS#zeR<eAGEaOf_{>zeSCD`uB?T%FVk+KBI}=ve
zvlcS#wt`U6wrJo}6I6Rwb=1GzZfwE=I&Ne@p7*pH84XShXYJRgvK)UjQL%R9Zbm(m
zxzTQsLTON$WO7vM)*vl%Pc0JH7WhP;$z@j=y#avW4X8iqy6mEYr@-}PW?H)xfP6fQ
z&tI$F{NNct4rRMSHhaelo<5kTYq+(?pY)Ieh8*sa83EQfMrFupMM@nfEV@EmdHUv9
z35uzIrIuo4#WnF^_jcpC<Vx)$tdI1T+R0zF_1D69+(CLtgvu$DXs}SSIOZ=$O=$Tn
zaEnCWJLI`n(9-SZByUYExxoO5StnL+1}iT+O(sgx<tf>@uNN<y@{a4!Rk|T=JKwWu
z!7Ksm?(29@|82jxaWJ&J!h^=%7h_BILeeeVlcqsXEYb)h&nSL#k+zMZSWTVXSB1;v
zcincQjatdYZz&~RpYg)uv%?lxT?<Zsq?obm6opmdnN38QjL|d&ENMRSCHfKu#cN{A
z%39=~vu7H;eE>aYTQ~uZWOE6P@LFT^1@$o&q+9Qr8YR+ObBkpP9=F+$s5+B!mX2~T
zAuQ6<kEiwW$%NhT4*3<zOaDr}Z>RenX?O{IlLMl1%)OK{S7oL}X%;!XUxU~xJN8xk
z`xywS*naF(J#?vOpB(K=o~lE;m$zhgPWDB@=p#dQIW>xe_p1OLoWInJRKbEuoncf;
zmS1!u-ycc1qWnDg5Nk2D)BY%jmOwCLC+Ny>`f&UxFowIsHnOXfR^S;&F(KXd{ODlm
z$6#1ccqt-HIH9)|@fHnrKudu!6B$_R{fbCIkSIb#aUN|3RM>zuO>dpMbROZ`^hvS@
z$FU-;e4W<M6y)Im8hoQA=P7%y98J6KEu0HTxWM%F4mhK6fdz22r_7zojFNGozEHHo
zZ6t#r0+n!O8IcEbaV(>}!ubzKrU@R*dW*($tFZ>}dd*4_mv)#O>X{U@zSzQt*<TlT
z?xHfG&f%?cm8K`gA<4t?5S*}81_7DjS+k<qTYIP(W)#9ktlsV1(r@t))QC6{76sj<
zSDYlnN;zf1jb?p&^L1o92%17&l2%#SFX4ma`TR1OP=xe^Wo;nC57Jd4;a=hTEHIUo
zUTaP|OpJKI$FAQSAQg0isqRP6vdhWN{SUhKkmD}a0P9?^Y~x`OD0PxwVfo>83l9mI
zI$8O<5AIDx`wo0}f2fsPC_l>ONx_`E7kdXu{YIZbp1$(^oBAH({T~&oQ&1{X951QW
zmhHUxd)t%GQ9#a<w3bmSRr~u}n$(7~pxPXRs&HyeAkRa(uozm&0)oYXyEx}pl7@=l
zcIw|R0#t97`$=~Q6HK(sul=o>k5fTjk-cahWC;>^Rg7(`TVlvy0W@Y!Jc%QL3Ozu#
zDPIqBCy&T2PWBj+d-JA-pxZlM=9ja2ce|3B(^VCF+a*MMp`(rH>Rt6W1$;r{n1(VK
zLs>UtkT43LR2G$AOYHV<kZo|EwiHy^!;YnPn|GnJdBf0T_68MO4c!oFW%p6st$`xJ
zYNOt)N_;rcqascZwO7I=X9Bss)*~eA@TglO8}1LAmBDblZ!tTUnvDRn+;A?-M1X6K
z*8v^cV1c|Ue%9zi&ypq`xDaps;yjH)T{>ailiqk7naz2yZGLo*xQs!T9VN5Q>eE(w
zw$4&)&6xIV$IO^>1N-jrEUg>O8G4^@y+-hQv6@OmF@gy^nL_n1P1-Rtyy$Bl;|VcV
zF=p*&41-qI5gG9UhKmmnjs932!6hceXa#-qfK;3d*a{)BrwNFeKU|ge?N!;zk+kB!
zMD_uHJR#%b54c2tr~uGPLTRLg$`fupo}cRJ<c5uHhf<@e$Dvk#I8qC&ccQe;ntP%8
z_U(N)zE+)oc_Zr99;>eTwK;~}A>(Acy4k-Xk&Aa1&eWYS1ULWUj@fhBiWY$pdfy+F
z@G{OG{*v*mYtH3OdUjwEr6%_ZPZ3P{@rfbNPQG!BZ7lRyC^xlMpWH`@YRar`tr}d>
z#wz87t?#2FsH-jM6m{U=gp6WPrZ%*w0bFm(T#7m#v^;f%Z!kCeB5oiF`W33W5Srdt
zdU?YeOdPG@98H7NpI{(uN{FJdu14r(URPH^F6tOpXuhU7T9a{3G3_#Ldfx_nT(Hec
zo<1dyhsVsTw;ZkVcJ_0-<D$ec4j7wm40@(EHB@IX^JbTgh0!!UjeH%Uq#M*+_NKFU
z9zw+rX&^+LMjUjtp89z{*`hHlcg5sAPu<FN2>h-T3G1W@q)_Q30LNv)W?FbMH+XJ*
zy=$@39Op|kZv`Rt>X`zg&at(?PO^I=X8d9&myFEx#S`dYTg1W+iE?vt#b47QwoHI9
zNP+|3WjtXo{u}VG(lLUaW0&@yD|O?4TS4dfJI`HC-^q;M(b3r2;7|FONXphw-%7~*
z&;2!X17|05+kZOpQ3~3!Nb>O94b&ZSs%p)TK)n3m=4eiblVtSx@KNFgB<VaadJgM4
zYwK3786BD*n&~U4FFSBMq6kMim<E0!-4_#SX^f^<quJS?pI~}$8MxSe6;jUz^oUvA
zks*6R#kX+OB7|l8)A=WO2W{BRNM$YQ>Y_xV6ts;NF;GcGxMP8OKV^h6LmSb2E#Qnw
ze!6Mnz7>lE9u{AgQ~8u2zM8CYD5US8dMDX-5iMlgpE9m*s+Lh~A#P1er*rF}GHV3h
z=`STo?kIXw8I<`W0^*@mB1$}pj60R{aJ7<j>>C2m=oghKyxMbFNq#EVLgP0cH3q7H
z%0?L93-z6|+jiN|@v>ix?tRBU(v-4RV`}cQH*fp|)vd3)8i9hJ3hkuh^8dz{F5-~_
zUUr1T3cP%cCaTooM8dj|4*M=e6flH0&8ve32Q)0dyisl))XkZ7Wg~N}6y`+Qi2l+e
zUd#F!nJp{#KIjbQdI`%oZ`?h=5G^kZ_uN`<(`3;a!~EMsWV|j-o>c?x#;zR2ktiB!
z);5rrHl?GPtr6-o!tYd|uK;Vbsp4P{v_4??=^a>>U4_aUXPWQ$FPLE4PK$T^3Gkf$
zHo&9$U&G`d(Os6xt1r?sg14n)G8HNyWa^q8#nf0lbr4A-Fi;q6t-`pAx1T*$eKM*$
z|CX|gDrk#&1}>5H+`EjV$9Bm)Njw&7-ZR{1!CJTaXuP!$Pcg69`{w5BRHysB$<zDw
zcjqh1uY?!XAJULAYA!ToD2)^T*;)(9PK@sJOOPO&GSQY-0y+C95%=z!u)j<6o}I15
zC6AaHQ?N67s!g>(tWUes@@6aM69kb|Lx$%BRY^-o6bjH#0!7b;5~{6J+jKxU!Kmi#
zndh@+?}WKSRY2gZ?Q`{(Uj|kb1%VWmRryOH0T)f3cKtG4oIF=F7R<H74An-VM089e
zlN*A~TaQtgL_187UqCA>aRnH0Rc_&37<WST&k6<y-8Zx6Qq%dG7&LrD8erOLcploI
zf(w3f)N}iwyU98+CRV4Zke$fYA$6d$lyn3H3z8f~RO_cf+H?k7OD0jCwwoM;H<NIB
zbTo$@rlw2}>2={_3lRNsr95%ZO{IX{p@YJ^EI%+gvvKes5cY+PE@unghjdY5#9A!G
z70u6}?zmd?v+{`vCu<jrsG`-7e4C+GWyOg}Mw<0>-53_v5@z)X{oPC@P)iA3jK$`r
zSA2a7&!^zmUiZ82R2=1cumBQwOJUPz5<k9c_WcKM(Vn+kk3W1%7<t`tnq}-udm*5k
zR_|Ap%BL`4&Z2eie8rv>Ay<A3{M7#FkL;C&VH7xux0z`g&G=^Qj^-lpBpq9=z<Kn<
zZiDqJOJH9T@F_rI@?dfl*<BzjIsA<Yh4A%qCuUAs6^+5tLNuqUv2l1rbhICMg}5yb
zx`b?fvxVX0_5=sI^pJf$T-oyW=KY5HRKL_gO1`&?p>`RLfY(EiwKkrx%@YN^^X<Nj
zStykG?*NLV?~c;!i<JFWHMT*GPEThv<NV<3#lUiF#=F;M^K~Ij_}f)mB}`>uET;tE
zmr-6~I7j!R!KrHu5CWGSChO6deaLWa<u2N+!y-e&UAhtX)uSIDcFN$fk%4m8fwJ2Q
zOv9UZX-MbW_s!U!6lGksP$XN`(`3o78xr(sNUv$zhjcuMvy4&jdPT)knJ(%p?#Fi`
zTqYl(Vq?l)*m!!CB7!Q97y@}YmbaOaev`5Ta19gb;jh{rC=^#57s}&!X$+bU=u0j^
zA@<$7@i*QP;0Y_%>*9LLJbcAJsFd%Dy>a!>J`N)Z&oiU4OEP-!Ti^_!p<rXzhQC@3
zG;WLll1HMO<ei9MPYV(Rrra7syrY2Bi5NC~8Cmo;+l-aesVcl<ib{QIQxo*6a*exs
z5Qaf=Y{wbKv*_kEnMVhR;YYlSU;>}O?7`}i7Lsf$-g<xhdYrU`h00vC9X+sM3sx}r
zCPd*Kl0|Oh7<_e3w4PNWG*Q={KZh*(tt-K?n?m73ypPWZQYkyX9Xgy+j>BkuY*`Zb
z7=!nTT;5z$_5$=J=Ko+Cp|Q0J=%oFr>hBgnL3!tvFoLNhf#D0O=X^h+<D%s)KbSG+
zM{s4oZjjM2&HxP-;1<DeRGJkAY@dRP&>x08iB;@8pXdRHxX}6R4k@i6%vmsQwu^5z
zk1ip`#^N)^#Lg#HOW3sPI33xqFB4#bOPVnY%d6prwxf;Y-w9{ky4{O6&94Ra8VN@K
zb-lY;&`HtxW@sF!doT5T$2&lIvJpbKGMuDAFM#!QPXW87>}=<kY=DIbR`-HsR^z#P
z$j>Q4J3JeXlwHys?!1^#37q_k?N@+u&Ns20pEoBeZC*np;i;M{2C0Z4_br2gsh6eL
z#8`#sn41+$iD?^GL%5?cbRcaa-Nx0vE(D=*WY%rXy3B%gNz0l?#noGJGP728RMY#q
z=2&aJf@DcR?QbMmN)ItUe+VM_U!ryqA@1VVt$^*xYt~-qvW!J4Tp<-3>jT=7Zow5M
z8mSKp0v4b%a8bxFr>3MwZHSWD73D@+$5?nZAqGM#>H@`)mIeC#->B)P8T$zh-Pxnc
z8)~Zx?TWF4(YfKuF3WN_ckpCe5;x4V4AA3(i$pm|78{%!q?|~*eH0f=?j6i)n~Hso
zmTo>vqEtB)`%hP55INf7HM@taH)v`Fw40Ayc*R!T?O{ziUpYmP)AH`euTK!zg9*6Z
z!>M=$3pd0!&TzU=hc_@@^Yd3eUQpX4-33}b{?~5t5lgW=ldJ@dUAH%`l5US1y_`40
zs(X`Qk}vvMDYYq+@Rm+~IyCX;iD<kEtC|r#XuMTVlQJLByw3)=nc7jt^BNycu`#-Z
z9m4E2+1EzDuad50wi$^(+Hvb9$Eha2<sG<&CWgZd3<Q-qEaW+FG(V#0KfK;OWdSIX
ze%=;Qa8;`8Zx;tGw9w+hCfD9U`qwSbb|b=F-(0ywZ1mUE<SPxWg(nI#;e9b4;-cmC
zbkW@PY-|EL1~YUG#HK))B|}VGpDcA_PVjsz5|%*t-amcgeBTh2*yZ^93cTX|bufo`
zQReW1{rIs3`*(?amcKig|NA{cF?}1O|0Dt`t7{^uqWi=EgZ8!NmGTQO<imr@BQyb<
zFB%lVL<Hx{bwKZ?LX$A=8xhP*UR7Kw+dlM--*I*2cYzmi$#z}GSiENw#R40&w6U2^
zwPam;_8fkE4cGJluti-nSs}3*cZAjMqTd!mmqfkKK~8rB?~AcwYfiW^a9^!)xfM@n
zF;=c7Ix)WhyG&v{N7;?lBJS3uv12>~pMgq^KY)T*aBz@<c&T2fpNhg@IxXbO=$S4w
z9+<Ik6K+Bnk`RNW=eul(Nn=)*O$p~uOQvJ^G0uLUsS4@I3V39+0g7_uyW2{0dM!$g
zika@FK29jP4cL_~!!sf!?;2}w@jg7y{U6reF}Tup-5TwVI<{?V#<p$Sw%M_5+qP{x
z>DYEB={PxA>)mI6tM*sx-DmGQHEaHwRrAmNjO!ZLHO4b;;5mf@zzlPhkP($JeZGE7
z?^XN}Gf_feGoG~BjUgVa*)O`>l<h*IpQ!z2CW{ns`;EbZK%SB&68g{f@GzLs;1_hP
z3|8#wF*;&Im!eeBlov5`2~+&il<&t*jr$-3va7?Dy?*g>X=$BSR2)uD<<!f=iY_7+
zCx~VgL*7J|?j{<rG=oL^Y0X6hjaO<Iv?&cH7Aoxz;856j4%+M18L|=;(%P~v84U>9
z>o^|nb1^oVDhQbfW>>!;8-7<}nL6L^V*4pB=>wwW+RXAeRvKED(n1;R`A6<f&`KXK
zfD&?Dt(5bu;DN{UB7piRVUy%Z<Ey!ADARS8_d#8xObY02AD!+&INw_XsW544fRkiv
zsgN89xNO|AooI0A^u_oh*3HRu5%VnYg>v$6<SBgAN0_0JGCLdqq}<97hmgd=n75Q7
zOhTZ|s`O5g29c?$OeSv4RJAn%uB~Dve&?a)t$o2;<4XX)6*Yrots9mCjmaoXL^Nc~
z7AGnF^zS7wG1fC!o)f^`@k|@3oheBwS}G8pg}FkGEw{zNtmQiz$aA;JXH45T3+c-9
z!O<9l>gy0I(;Vf?!4;&sgn7F%LpM}6PQ?0%2Z@b{It<(G1CZ|>913E0nR2r^Pa*Bp
z@tFGi*<dAvc$qjHT6XD6wTz&&N_7u(Rl1@oBi^7tlbIL_CL@ADr>CQ~@Yc-?{cwu1
zsilf=k^+Qs>&WZG(3WDixisHpR>`+ihiRwkL(3T|=xsoNP*@XX3BU8hr57l3k;pni
zI``=3Nl4xh4oDj<%>Q1zYXHr%Xg_xrK3Nq?vKX3|^Hb(Bj+lONTz>4yhU-UdXt2>j
z<>S4NB&!iE+ao{0Tx^N*^|EZU;0kJkx@zh}S^P{ieQjGl468CbC`SWnwLRYYiStXm
zOxt~Rb3D{dz=nH<w<gcr0@Smh4?7*NpxM$L=7%^NSAFm@#nvp#8qWCc6XLxOp05m;
zm+Vq=;6Q;TxJ*@^XL*?^Xi4dI#=!F|B%y2um~UT1!6v(w_7D}&dy`}<a;f$Z+oyNl
zPr8sXY@0tTpl1$l?+9za&ct1tHK2{yCONrnRJqPnW$cjE{pEeqMN^ABAC6U)X#ni~
zUfB89Z_@>McY)#r^kF8|q8KZHVb9FCX2m^X*(|L9FZg!5a7((!J8%MjT$#Fs)M1Pb
zq6hBGp%O1A+&%2>l0mpaIz<Trj|_4|8tOfqtA{6qYlUp*AW=6wyaR8GVPG#YUBW`2
zz?f&&D9xup7E7}pxSU<br&5#ywm1K0k5E*vu$t7Enh18PU+-VB2_er`-mhr?sHL7j
zdNe0r@5Qcsr6&D*8};8txBQ2IC1`77Vs7f}p#Ogc;H1QDMJ#3HksdSw#QC5=kn+%`
zd5hJ-U>bo&jc^!oN^3zxap3V2dNj3x<=TwZ&0eKX5<Dl7;b^#b;I{(onaxeU`VFpo
z0#Bcu*HzEyqwUWRcPKs3DfD6V-^rWHZYg+KCu<bE3(}VxN1N3)mY&_z>PIso9j1;e
zwUg+C&}FJ`k(M|%%}p=6RPUq4sT3-Y;k-<68ciZ~_j|bt>&9ZLHNVrp#+pk}XvM{8
z`?k}o-!if>hVlCP9j%&WI2V`5SW)BCeR5>MQhF)po=p~AYN%cNa_BbV6EEh_kk^@a
zD>4&>uCGCUmyA-c)%DIcF4R6!>?6T~Mj_m{Hpq`*(wj>foHL;;%;?(((YOxGt)Bhx
zuS+K{{CUsaC++%}S6~CJ=|vr(iIs-je)e9uJEU8ZJAz)w166q)R^2XI?@E2vUQ!R%
zn@dxS!JcOimXkWJBz8Y?2JKQr>`~SmE2F2SL38$SyR1^yqj8_mkBp)o$@+3BQ~Mid
z9U$XVqxX3P=X<VH60STdy0sB@jX}+Y_TBg#FKwe*aYaFRRb%;;%q$^Iyf2|Z9YYlw
z%Jt8hwodbGdJaNxw5cPU2RS=7SORg_h_1qR>CKj0*W>}L0~Em`(vG<>srF8+*kPrw
z20{z(=^w+ybdGe~Oo_i|hYJ@kZl*(9sHw#Chi&OIc?w`nBODp?ia$uF%Hs(X>xm?j
zqZQ`Ybf@g#wli`!-al~3GWiE$K+LCe=Ndi!#C<Hn52U9|8K~Ro$I%*RemIf>VjzUZ
z!sD2O*;d28zk<D+-Enbah_#E$&gZ)`AdRl_O}jIQbDwnNAHN#Ci};At$G&3SwK=`P
zpl<2i0!g;rM|EdU74dfP@uV!%*6y8FWa~UFSiX{QU&G^{<bvxL*Ya&&SpTLG7}BO*
zVEuYNLK5?yLUyUVq~muHmVx1;3PYt2J_P<eP7KS>l))m)YN7HDi^z5IuNo3^w(zy8
zszJ<n=2-mJ3CZwLndLXzyBh4<7UNIu$A>G#mp#Cj)Q@E@r-=NP2FVxxEAeOI2e=<s
zqQBD3JtlZm1u~d=N%{y8-ymvOK+jMz2r(X*J0Ylh@G(QI7kZ%-a}ol+`87x|nnG+6
z{b(|BA>|KshybNB6HgE^(r>HD{*}S}m<qA!*hb9IzvC@5i1<u^W80An;lZADAm?KP
zko)m@6{ci~_>O>LuRGJT{*tfTzw_#+er-0${}%YPe@CMJ1Ng#j#)i)SnY@ss3gL;g
zg2D~#Kpdfu#G;q1qz_TwSz1VJT(b3zby$Vk&;Y#1(A)|xj`_?i5YQ;TR%jice5E;0
zYHg;`zS5{S*9xI6o^j>rE8Ua*XhIw{_-*&@(R|C(am8__>+Ws&Q^ymy*X4~hR2b5r
zm^p3sw}yv=tdyncy_Ui7{BQS732et~Z_@{-IhHDXAV`(W<!Q69%H#|w=%}3Kg=YWc
zt&hb~JKx8-xR1O(MbVHSG9)1(@!kVOhLD87%Fl_`7;R(RkjZ~i+x)8zFXU-77X{6f
zYPk%NpFBFvuuQH>lay<#hb>%H%WDi+K$862nA@BDtM#UCKMu+kM`!JHyWSi?&)A7_
z3{cyNG%a~nnH_!+;g&JxEMAmh-Z}rC!o7>OVzW&PoMyTA_g{hqXG)SLraA^OP**<7
zjWbr7z!o2n3hnx7A=2O=WL;`@9N{vQIM@&|G-ljrPvIuJHYtss0Er0fT5cMXNUf1B
z7FAwBDixt0X7C3S)mPe5g`YtME23wAnbU)+AtV}z+e8G;0BP=bI;?(#|Ep!vVfDbK
zvx+|CKF>yt0hWQ3drchU#XBU+HiuG*V^snFAPUp-5<#R&BUAzoB<hHU=m37G!KV!9
zs~61*+Hcg^$oOSo5g9ycnV9qCP&Q;3{o<yJQWFe=Yh1|Y)*C9d35V8SB$g)x4!&YT
z9d!w9=cZ#b{*g~^@EzhO7VrZ@nbuP0-lhv4I*V+9U65<q8FQ4Wa}XL)HtQO{P^VHi
zj-)s#FI|G`@U9{D_@sL{)yhu<Sb_Bt7ceo}s9YE~$iU7@K*Agnl+Zh7seWE5&R!S_
zCmI0O0@x~Z_p8Nlh6x&3>!aZ+e*KIxa26V}s6?nBK(U-7REa573wg-jqCg>H8~>O{
z*C0JL-?X-k_y%hpUFL?I>0WV{oV`Nb)nZbJG01R~AG>flIJf)3O*oB2i8~;!P?Wo_
z0|QEB*fifiL6E6%>tlAYHm2cjTFE@*<);#>689Z6S#BySQ@VTMhf9vYQyLeDg1*F}
zjq>i1*x>5|CGKN{l9br3kB0EHY|k4{%^t7-uhjd#NVipUZa=EUuE5kS1_~qYX?>hJ
z$}!jc9$O$>J&wnu0SgfYods^z?J4X;X7c77Me0kS-dO_VUQ39T(Kv(Y#s}Qqz-0AH
z^?WRL(4RzpkD+T5FG_0NyPq-a-B7A5LHOCqwObRJi&oRi(<;OuIN7SV5PeHU$<@Zh
zPozEV`dYmu0Z&Tqd>t>8JVde9#Pt+l95iHe$4Xwfy1AhI<n`R9oH@0SV-qw)kv`%>
zDM4XJ;bBTTvRFtW>E+GzkN)9k!hA5z;xU<Ypbch46*+?z6ODVueTOx78M~}ZZ>OL2
zq4}zn-DP{qc^i|Y%rvi|^5k-*8;JZ~9a;>-+q_EOX+p1Wz;>i7c}M6Nv`^NY&{J->
z`(mzDJDM}QPu5i4<c4By441WIqZqp>4**2Qbo(XzZ-ZDu%6vm8w@DUarqXj41VqP~
zs&4Y8F^Waik3y1fQo`bVUH;b=!^QrWb)3Gl=QVKr+6sxc=ygauUG|cm?|X=;Q)kQ8
zM(xrICifa2p``I7>g2R~?a{hmw@{!NS5`VhH8+;cV(F>B94M*S;5#O`YzZH1Z%yD?
zZ61w(M`#aS-*~Fj;x|J!KM|^o;MI#Xkh0ULJcA?o4u~f%Z^16ViA27FxU5GM*rKq(
z7cS~MrZ=f>_OWx8j#-Q3%!aEU2hVuTu(7`TQk-Bi6*!<}0WQi;_FpO;fhpL4`DcWp
zGOw9vx0N~6#}lz(r+dxIGZM3ah-8qrqMmeRh%{z@dbUD2w15*_4P?I~UZr^anP}DB
zU9CCrNiy9I3~d#&!$DX9e?A});BjBtQ7oGAyoI$8YQrkLBIH@2;lt4E^)|d6Jwj}z
z&2_E}Y;H#6I4<10d_&P0{4|EUacwFHauvrjAnAm6yeR#}f}Rk27CN)vhgRqEy<?cr
z6R5`U_Sc@<8Rnm)Sx4=ssMmH)((fLzBDe-8oZL2?8;gVE_E7eCE*q4brE|Rr5x0o2
z^Y;YlS3Tj6!|OE$_**V00k_c=V$Fb3v>PMMS7zvunj2?`f;%?alsJ+-K+IzjJx>h8
zu~m_y$!J5RWAh|C<6+uiCNsOKu)E72M3xKK(a9Okw3e_*O&}7llNV!=P87VM2DkAk
zci!YXS2&=P0}Hx|wwSc9JP%m8dMJA*q&VFB0yMI@5vWoAGraygwn){R+Cj6B1a2Px
z5)u(K5{+;z2n*_XD!+Auv#LJEM)(~Hx{$Yb^ldQmcYF2zNH1V30*)CN_<GsyFjVmb
zD)h_|Q}^G(^TxQkX_gf#v;s8zRbbF@HZgig3fX7Y_C%KW^4;Mzb1Q_mbv<K`san7p
zr<VAL=_8V?wGQ9W#OCB6w#j#s*xTCOq{>|1$v2|`LnFUT$%-tO0Eg|c5$BB~yDfzS
zcOXJ$wpzVK0MfTjBJ0b$r#_OvAJ3WRt+YOLlJPYMx~qp>^$$$h#bc|`g0pF-Ao43?
z>*A+8lx>}L{p(Tni2Vvk)dtzg$hUKjSjXRagj)$h#8=KV>5s)J4vGtRn5kP|AXIz!
zPgbbVxW{2o4s-UM;c#We8P&mPN|DW7_uLF!a|^0S=wr6Esx9Z$2|c1?GaupU6$tb|
zY<J=2bwPXwbBG}bpBO&`HtCU`sQ3|>_KU`(_29O_%k(;>^|6*pZURH3`@%EuKS;Ns
z1lujmf;r{qAN&Q0&m{wJSZ8MeE7RM5+Sq<f50&3KEB%;ap5IYu9&*^L3pcVFcAVGW
z04UqHZaI^y_@+2E#<{--P$9fmBw58@VQ=7%^zveD0O(QSrIoS+oGEl}3S0B`>;ul_
z`+ADrd_Um+G37js6tKsArNB}n{p*zTUxQ<D{*LSzTK#>r>3@wA;{EUbjNjlNd6$Mx
zg0|MyU)v`sa~tEY5$en7^PkC=S<2@!nEdG6L=h(vT__0F=S8Y&eM=hal#7eM(o^Lu
z2?<VnV9$|PdIge&&n55GFYu(+3gKo$EMBH)g%fG=d0l9?y&R{Xr=bU~d3k-ls||~Q
zdqZ2Ibd=svvcd-G9F6qP%UbDFL29x}6nCqava_&eR!Ou?Rs~d=hgF3;Q(KAtA|Qt@
z5PeHMC$T|!hzTOnXCt_0q;>^;05&|CNliYrq6gUv;|i!(W{0N)LWd*@{2q*u)}u*>
z7MQgk6t9OqqXMln?zo<KXCh}0JB2C8;d$OZ4?Q<ATC(JOVrvVRF?KkQ6^O&o2`<Q$
z-DPJRqChOl5!YowVXd(3%Ph16pi-d;JaH~r7U?lZJ2%#6uX=|Lcr}^Zli4ixQ1C%y
zu&(nSVW}d7kd1wVFUCOiEZW+4k^V(lOke1~%a8sQs^wAs8KLfUs=BxNe!(Y6_8ZZT
zCo;rs5WaGpeBh67<^|*xA#S65VbLU+e&jyIK!;_a^VJ`2wxD(4_GkoNZ>MAJcc<qR
zn=|0eY#rHX{fDEbS#wEN)PdQ$L3*RG1e}T^y9xXbBKsT-;}=KsEl9zS;lM1nZWo<>
zMKaof_Up})q#DzdF?w^%tTI7STI^@8=Wk#enR*)&%8yje>+tKvUYbW8UAPg55xb70
zEn5&Ba~NmOJlgI#iS8W3-@N%>V!#z-ZRwf<nAQuk$4XsbA2?xvz!lf8!A9&u)@oCJ
z>PO1)dQdQkaHsiqG|~we2ALqG7Ruup(DqSOft2RFg_X%3w?6VqvV1uzX_@F(diNVp
z4{I|}35=11u$;?|JFBEE*gb;T<e_J|zDJ1_W|BYXEUQsj_Ekmr-1GFuSJ!fD#Jwt6
z^IPIC_5NN>`dy+8gWJ9~pNsecrO`t#V9jW-6mnfO@ff9od}b(3<kFPLL`V`PrepA!
znVLswD&Ch_A#nGnS!pm`W^|6KlQj9e0x>s4>p0i30gbGIv~1@a^F2kl7YO;DxmF3?
zWi-RoXhzRJV0&XE@ACc?+@<sd-G9HF5dZ&*wEq(u_wO-RrDCaxC5-G7V)cvIY8~D$
zoG?hk!X_5=BuWn1Z*9@8ZV{ixBE=X&GGWu%bzo>6?)LQ2XNm4KfalMtsc%4!Fn0rl
zpHTrHwR>t>7W?t!Yc{*-^xN%9P0cs0kr=`?bQ5T*oOo&VRRu+1chM!qj%2I!@+1XF
z4GWJ=7ix9;Wa@xoZ0RP`NCWw0*8247Y4jIZ>GEW7zuoCFXl6xIvz$ezsWgKdVMBH>
z{o!A7f;R-@eK9V<P+C5DN?NK_qQ5=(jYExKglP|qB=@(M#QRp~t%BPwuyztnP9`ft
z1YRSG3otkYRhg1ElU)y#_?Pd>j7R40xx)T<2$?F2E<>Jy3F;;=Yt}WE59J!1WN367
zA^6pu_zLoZIf*x031CcwotS{L8bJE(<_F%j_KJ2P_IusaZXwN$&^t716W{M6X2r_~
zaiMwdISX7Y&Qi&Uh0upS3TyEIXNDICQlT5fHXC`aji-c{U(J@qh-mWl-uMN|T&435
z5)a1dvB|oe%b2mefc=Vpm0C%IUYYh7HI*;3UdgNIz}R##(#{(_<BD95FF;ZFGV&qz
z8Pn8EL}R(PV6KpLWp*(tnj`ERy@}m*TiM3BfE$7{gi4TPp(o3PTBV#018`5lT6LcC
z+PH<CSJwzhW!is6r}03ir}GTleL`F(Zdpu?5Nr&E5EjcwAj64ex8MP|*gW4nq?Q<t
z3@5`=_0esGb^Ece<ag$xQWKy^lIB?y(A?CgT;_3FV}1}aB!)jwA@T?(6XedlQ*(k9
zDadBI6m!U;qSg`{#7%mtl6VD&C{a5(&zN`4qOG(j4~hS{3H95A$%A5tpnCEbP+wqO
z>>82|zB0L*1i4B5j-xi9O4x10rs_J6*gdRBX=@VJ+==sWb&_Qc6tS<KlKZn<VwU!n
zLnOnI&WJ&J91(5%V9y=4Jq_eBfm9!BCKO-W6RKLW6dVby&S8C>OowM{BX@(zawtjl
zdU!F4OYw2@Tk1L^%~JCwb|e#3CC>srRHQ*(N%!7$Mu_sKh@|*XtR>)BmWw!;8-mq7
zBBnbjwx8Kyv|hd*`5}84flTHR1Y@@uqjG`UG+jN_YK&RYTt7DVwfEDXDW4U+iO{>K
zw1hr{_XE*S*K9TzzUlJH2rh^hUm2v7_XjwTuYap|>zeEDY$HOq3X4Tz^X}E9z)x4F
zs+T?Ed+Hj<#jY-`Va~fT2C$=qFT-5q$@p9~0{G&eeL~tiIAHXA!f6C(rAlS^)&k<-
zXU|ZVs}XQ>s5iONo~t!XXZgtaP$Iau;JT%h)>}v54yut~pykaNye4axEK#5@?TSsQ
zE;Jvf9I$GVb|S`7$pG)4vgo9NXsKr?u=F!GnA%VS2z$@Z(!MR9?EPcAqi5f<pK5;t
zb&cukw)8-|x31H1(Fj&i+kM40=Y04i9gus|j!y(ah9bVAH`yCx;#-MJ&6<Uo;364L
z>t)Iz6sNl`%kj+_H-X`R<>BFrBW=fSlD|{`D%@Rcbu2?%>t7i34k?Ujb)2@J-`j#4
zLK<69qcUuni<uOj0}C`gMaESz)GI|*Grst&fPD8oZr)bKc^}~YN0GER#uusn+Tc!q
zWrF<sBKhCak$)+P{0^qh)?a~|!fuAfcK>Ian-$A1+fR=?@+thwDIXtF1Tks@Br-xY
zfB+zblrR(ke`U;6U~-;p1Kg8Lh6v~LjW@9l2P6s+?$2!Z<IDB+yY4ox&h|I0y;-5?
z9m>RPX`(ZkRGe7~q(4&g<OcID-Zqc@__+obc6~O5DPU5>Ei<$ch`5kQ?*1=GSqkeV
z{SA1EaW_A!t{@^UY2D^YO0(H@+kFVzZaAh0_`A`f(}G~EP~?B|%gtxu&g%^x{EYSz
zk+T;_c@d;+n@$<>V%P=nk36?L!}?*=vK4>nJSm+1%a}9UlmTJTrfX4{Lb7smNQn@T
zw9<w{mDNj#YVY((v>p2%(Zjl^bWGo1;DuMHN(djsEm)P8mEC2sL@KyPjwD@d%QnZ$
zMJ3cnn!_!iP{MzWk%PI&D?m?C(y2d|2VChluN^yHya(b`h>~GkI1y;}O_E57zOs!{
zt2C@M$^PR2U#(dZmA-sNreB@z-yb0Bf7j*y<pBQ+k4*aVp?w`(S5_}b&kg4X@Sofy
zcqHS%!CX>ONhZG=onhx>t4)RB`<CY&xEoOnNq|`4TwO?Um+51s<NDq0^B>r6&TP$n
zgmN*)eCqvgriBO-a<gb-@gO7*f-;=;$N<27Yp)D7Ln4I)79>bHQ8ECN0bw?z5Bxpx
z=jF@?zFdVn?@gD5egM4o$m`}lV(CWrOKKq(sv*`mNcHcvw&Xryfw<{ch{O&qc<L-M
zVmpiaS&dR>#WCTXX6=#{MV@q#iHYba!OUY+MGeNTjP%Fj!WgM&`&RlI^=AWTOqy-o
zHo9YFt!gQ*p7{Fl86>#-JLZo(b^O`LdFK~OsZBRR@6P?ad^Ujbqm_j^XycM4ZHFyg
ziUbIFW#2tj`65~#2<ophCAkOZ($XwYEX-9Vd`-+%7JN?3GR#=*po_llExeP58!Yyh
zfBFZx*>V!4z7DM8Z;fG0|APaQ{a2VNYpNotB7eZ5kp+tPDz&Lqs0j%Y4tA*URpcfi
z_M(FD=fRGdqf430j}1z`O0I=;tLu81bwJXdYiN7_&a-?ly|-<ApEerJYO+vWo=kI`
z-rD}hhy8i~TGtoY4s6@Z3<13<OR9eqt4um=6eFf6$!!n)xzh=;tTHXN(UE;Xf=pU+
z`dE9RnW+)N$rd9fN@%&3A?!JdCd~nqX?>j*+=--XGvCq#32Gh(=|qj5F?kmihk{<M
zgEPC5kES)++<3TpUXV3Y3P48VdaIr-^IB0!+8~n0mjL`=xeqv8O-l|+H1rq)7sA{H
z^$*$;DIbhLHBWOj8khSs5o|aYh+3RPX=5iXJy_n`ZNI><Spn2FM>%M&$}udW5)DHK
zF_>}5R8&&API}o0osZJRL3n~>76nUZ&L&iy^s>PMnNcYZ|9*1$v-bzbT3rpWsJ+y{
zPrg>5Zlery96Um?lc6L|)}&{992{_$J&=4%nRp9BAC6!IB=A&=tF>r8S*O-=!G(_(
zwXbX_rGZgeiK*&n5E;f=k{ktyA1(;x_kiMEt0*gpp_4&(twlS2e5C?NoD{n>X2AT#
zY@Zp?#!b1zNq96MQqeO*M1MMBin5v#RH52&Xd~DO6-BZLnA6xO1$sou(YJ1Dlc{WF
zVa%2DyYm`V#81jP@70IJ;DX@y*iUt$MLm)ByAD$eUuji|5{ptFYq(q)mE(5bOpxjM
z^Q`AHWq44SG3`_LxC9fwR)XRVIp=B%<(-lOC3jI#bb@dK(*vjom!=t|#<@dZql%>O
z15y^{4tQoeW9L<H_624p3-b_rHm8YIC$k6&3$GlwdQslWx5!&!3m}i*?tl5@6;yzj
zoc!Vo*Hbq)-jJ59Sg;T*C)b6<j+VKKLixts|L96bm4=Is0j?L(vXBm$urwF-{$0-V
z<$e6HsrcrOqq`p)uFW!qJ}rO<YKXdHxyO`G#Bia+f>u%G&V$90x6F)xN6y_oIn;!Q
zs)8jT$;&;u%Y>=T3hg34A-+Y*na=|glcStr5D;&5*t5*DmD~x;zQAV5{}Ya`?RRGa
zT*t9@$a~!co;pD^!J5bo?lDOWFx%)Y=-fJ+PDGc0>;=q=s?P4aHForSB+)v0WY2JH
z?*`O;RHum6j%#LG)Vu#ciO#+jRC3!>T(9fr+XE7T2B7Z|0nR5jw@WG)kDDzTJ=o4~
zUpeyt7}_nd`t}j9<K48+u@DhA3`4r+FJ677MR6&8E4f2zla%l|D9N*11$;?agx3`X
zQKMo3I0~ZlYkbWEu`x`yJ@krOwxENL$Rt=$8{!>BKqryOha{34erm)RmST)_9Aw)@
zHbiyg5n&E{_CQR@h<}34d7WM{s{%5wdty1l+KX8*?+-YkNK2Be*6&jc>@{Fd;Ps||
z26LqdI3#9le?;}risDq$K5G3yoqK}C^@-8z^wj%tdgw-6@F#Ju{Sg7+y)L?)U$ez>
zoOaP$UFZ?y5BiFycir*pnaAaY+|%1%8&|(<reOyuH4oC{Ih*Lwy|NYzPCQRQ`ehMF
zEg-;Objn(%#1qC@!zAnKQl4zHMlo)Q+E4pW2QKLde|EyLnXTvQOMSI7T)74sZOfHC
z#$kL6q5^qb8eY0TS0xZc5`Q++ann{Wm9&lnoQ^h6%~gFm-4lj+U9&Zp#WzNXX62+9
zmFZ)1ML^9;#Ht15k!kkQ%3qdk7S&owgs=Ge>@VB)zweR%?IidwJyK5J!STzw&2RFx
zZV@qeaCB01Hu#U9|1#=Msc8Pgz5P*4Lrp!Q+~(G!OiNR{qa7|r^H?FC6gV<apFHH!
zvPyd+`3A>hkk3y7=uW#Sh;&>78bZ}aK*C#NH$9rX@M3f{nckYI+5QG?Aj1DM)@~z_
zw!UAD@gedTlePB*%4+55naJ8ak_;))#S;4ji!LOqY5VRI){GMwHR~}6t4g>5C_#U#
ztYC!tjKjrKvRy=GAsJVK++~$|+s!w9z3H4G^mACv=EErXNSmH<U!EM^MvZ)wb9KT%
z#OZQ%D1oeCN~H?$e4PM)Oo0Nf#@aY_z^1AJ$yBSx5w>7qN}%PKcN|8%9=i)qS5+$L
zu&ya~HW%RMVJi4T^pv?>mw*Gf<)-7gf#Qj|e#w2|v4#t!%Jk{&xlf;$_?jW*n!Pyx
zkG$<18kiLOAUPuFfyu-EfWX%4jYnjBYc~~*9JEz6oa)_R|8wjZA|RNrAp%}14L7fW
zi7A5Wym<E#i_(~)bst!ffFAM+k<@$mzUh70rTL<McKqdHe%2p~vi~IR0fXQ|S)y{r
z;Wp!8-s^RV8y06<5VY%~W5!C@67mJ2juFL?Aei!n9$#?Mxz(e*!?C%d!S^;<NyuK;
z=jOZo@63!X2t3{<2mbRO+M4mhSli$HyTwM2v=i7dSS7zmGorTVUNCfrp5V7W@5-EM
z9Ys`dT15QQomjL6GHVaWEvXi+QV5957MiWw!x~2qrLvvTs8)?0#wqmp4@3O@LG<r!
zk6}xyfn=$w96=KT^BPtNWe<ruqW3j0;LxgBeA49=6TD<@C_{gG$<X&CyDE03IM5)z
zgD@jrZu<T4d;HFH;~S7D52VZ#%z-INbhoB9d^{Iug5R?T=;fLQ(uh#mu6u`Ha62Gc
zoH09p_pkWwHF6o$jc2wh?8ZJGKMj7F>*<L$XY6i+<~=c|V{+>K+V8pkqq<QnfGNr(
zou6uoQ0mUzl`senrxj^LkjsGe;0#a$G>O-X#3ft{0qs?KVt^)?kS>AicmeO&q+~J~
z<sSV8bNrd3A9xC%f$yWrWh#?+O1^-<;70xvO=?7-Uc1E*o02qDCg>p0YJ_P~_a8j=
zsAs~G=8F=M{4GZL{|B__UorX@MRNQLn?*_gym4aW(~+i13knnk1P=khoC-ViMZk+x
zLW(l}oAg1H`dU+Fv**;qw|ANDSRs<RLAc%!hUu-WqF+F5Oeq^z)6;J*CN3_IJ2Nxe
z-;V6)AOdQ4T2Ukyh0P^3nCpm=n$E*LwA)q6EHoozsz{aE^r+ehzxp>>cGqL!Yw^`;
zv;{E&8CNJcc)GHzTYM}f&NPw<6j{C3gaeelU#y!M)w-utYEHOCCJo|Vgp7K6C_$14
zqIrLUB0bsgz^D%V%fbo2f9#yb#CntTX?55X<qx;!okXD~axKjmLH&*OdaOWEc{H0%
zi0MH-X|Jusi;#0rf&N*g-GE;RD$1qdO=oS*<<v&3;DB9~Mn>y|Kps&Xek*4_r=KDZ
z+`TQuv|$l}MWLzA5Ay6C<xwUE$SDueIt18G;rIq+PKrqK)-e%dH7kKgSCZrM6VWd%
zl2lnN?N}w!k%oj}Sb=F~WfJ?Oq-~KxZEt%C$Km;<HWP-Far<SWJWbkJ@m6yOcWFyW
z_Q8799P2jX-Hi_v*fxw=bGS(JHHq<82FgsB@wT053kvhY`h#<lj?p)b>vsa^7x<Dm
z7*W`&66pKXgHH%Ml6<<#8|Qv`3H|XpxHPw;J1j{B-l=VGuJ@O>vwXpy?`w(6vx4XJ
zWuf1bVSb#U8{xlY4<q^>+wlZ$9jjPk)X_;NFMqdgq>m&W=!KtP+6NL57`AMljW+es
zzqjUjgz;V*kktJI?!NOg^s_)ph45>4UDA!Vo0<s{;e|6~VP^gWUU3XjQk;=Xix6pU
zwO|=D;X5iLwh8JKU!FTBb9nZax_m$0O`m}PntuM|vT@{$W}A^6FgT)aaou}yP9OHt
z+BRQkg}S5r2LiCLG|3XarntT@bLzkEQWF1j1PB<L*g6>hn>KZ+h-3=?Y3*R=#!fOX
zP$Y~+14$f66ix?UWB_6r#fMcC^~X4R-<&OD1CSDNuX~y^YwJ>sW0j`T<2+3F9>cLo
z#!j57$ll2K9(%$4>eA7(>FJX5e)pR5&EZK!IMQzOfik#FU*o*LGz~7u(8}XzIQRy-
z!U7AlMTIe|DgQFmc%cHy_9^{o`eD%ja_L>ckU6$O4*U**o5uR7`FzqkU8k4gxtI=o
z^P^oGFPm5jwZMI{;nH}$?p@uV8FT4r=|#GziKXK07bHJLtK}X%I0TON$uj(iJ`SY^
zc$b2CoxCQ>7LH@nxcdW&_C#fMYBtTxcg46dL{vf%EFCZ~eErMvZq&Z%Lhumnkn^4A
zsx$ay(FnN7kYah}tZ@0?-0Niroa~13`?hVi6`ndno`G+E8;$<6^gsE-K3)TxyoJ4M
zb6pj5=I8^FD5H@`^V#Qb2^0cx7wUz&cruA5g>6>qR5)O^t1(-qqP&1g=qvY#s&{bx
zq8Hc%LsbK1*%n|Y=FfojpE;w~)G0-X4i*K3{o|J7`krhIOd*c*$y{WIKz2n2*EXEH
zT{oml3Th5k*vkswuFXdGDlcLj15Nec5pFfZ*0?XHaF_lVuiB%Pv&p7z)%38}%$Gup
z<b3uaN}F=Gim_ol$%3|sHjkH6w3NkSvTNg|$pNIrx_?n%{%+0R`;99PC4<xOluBpR
zU2O5CB{+faJ?d^o`6UNaOpdi{6Wxcn#ldUE@c7sS0hQ<d1bwc@5-Mup64Y_byI5~E
ze(1Scv9rryWVG=>VTa~C8=cw%6BKn_|4E?bPNW4PT7}jZQLhDJhvf4z;~L)506IE0
zX!tWXX(QOQPRj-p80QG79t8T2^az4Zp2hOHziQlvT!|H)jv{Ixodabzv6lBj)6WRB
z{)Kg@$~~(7$-az?lw$4@L%I&DI0Lo)PEJJziWP33a3azb?jyXt1v0N>2kxwA6b%l>
zZqRpAo)Npi&loWbjFWtEV)783BbeIAhqyuc+~>i7aQ8shIXt)bjCWT6$~ro^>99G}
z2<k!)pJyc8u<yVadbWX)2!_&!K=lyrD}wj>XfmT0(|l!)XJb^E!#3z4oEGIsL(xd;
zYX1`1I(cG|u#4R4T&C|m*9KB1`UzKvho5R@1e<V*TeB>YtUL9B72{i(ir&ls8g!pD
ztR|25xGaF!4z5M+U@@lQf(12?xGy`!|3E}7pI$k`jOIFjiDr{tqf0va&3pOn6Pu)%
z@xtG2zjYuJXrV)DUrIF*y<1O1<$#54kZ#2;=X51J^F#0nZ0(;S$OZDt_U2bx{RZ=Q
zMMdd<UQ`729gV*taE)yo&7I6$j1|A$UbHd&qQG|gUmni?yhum!iv{x|f0(p56<HNE
z{|r}=llKTf(UnY3B_)-{B&Ilhl?!Gt;#{A!Ik&y#y&po8@}lQ?&FRcs-Q>$fH|!s{
zXq#l;{`xfV`gp&C>A`WrQU?d{!Ey5(1u*VLJt>i27aZ-^&2IIk=zP5p+{$q(K?2(b
z8?<F{C+DO@u0&46j?yJ2$y`_qSmA<f41gBg&6I6Bc4WTi!On@`Kfs@;Mf4<#yYH%S
z3%=-9Vz2=GO0viySb&ugf@Mk8Vrw0#wF<}kN;VR}yEW9MNABqR`RZL=RHtZ4%8@`Y
zp#Ny|%!HB2ZzUgfDe)Mtj<}lnsKm*hSbL^-xJDeWiDv0GDklMm@t>9h)kvj9SF!Dr
zoyF}?V|9;6abHxWk2cEvGs$-}Pg}D+ZzgkaN&$Snp%;5m%zh1E#?Wac-}x?B<FLY5
z^#|qyQLq|K>YlGN#U#Mek*}kek#I9XaHt?mz3*fDrRTQ#&#~xyeqJk1QJ~E$7qsw6
z?sV;|?*=-{M<1+hXoj?@-$y+(^<DUw2Jr;Zm>BJ1H~wQ9G8C<M!|<37p=^5w$PQ1k
zI75RU({o}zBXPvTFlczyZ!+pcQxRXL4k5~P@IP4UP@{7*ml`gS8j=i(N(J0~3#|$W
z#`Dx?eM5{^y|kSL=^5rzID`fXlPhQ2@)omgy?3h*!>0#^aEAyhDduNX@haoa=PuPp
zYsGv8UBfQaRHgBgLjmP^eh>fLMeh{8ic)?xz?#3kX-D#Z{;W#cd_`9OMFIaJg<n@h
zIvM{(1~1i4U6GYhKf4MAnWumaiROMvmVJ+(p3e<6pce!gGy~U5HS%XPE9#Jf<W#m+
zb_QyVUZ<wCu_xG@9z9_*)RPK9x8IJ=-v7b-iuW|s!`IbP-rnHkSc}B#!RFNU;ClVO
zdDxXw<Lhw^{LS*V&7Z-qDtQxaWnLp+HwMlupdACRzR5|WWj`ztVcQA@+RUVWll~zq
z{qn?RDyo>-=t`_3*!YDgtNQ2+QUEAJB9M{~AvT$H`E)IKmCR21H532+ata8_i_MR@
z2Xj<3w<`isF~Ah$W{|9;51ub*f4#9ziKrOR&jM{x7I_7()O@`F*5o$KtZ?fxU~g`t
zUovNEVKYn$U~VX8eR)qb`7;D8pn*Pp$(otYTqL)5KH$lUS-jf}PGBjy$weoceAcPp
z&5ZYB$r&P$MN{0H0AxCe4Qmd3T%M*5d4i%#!nmBCN-WU-4m4Tjxn-%j3HagwTxCZ9
z)j5vO-C7%s%D!&UfO>bi2oXiCw<-w{vVTK^rVbv#W=WjdADJy8$khnU!`ZWCIU`>#
zyjc^1W~pcu>@lDZ{zr6gv%)2X4n27~Ve+cQqcND%0?IFSP4sH#yIaXXYAq^z3|cg`
z`I3$m%jra>e2W-=DiD@84T!cb%||k)nPmEE<W?@Vxzv1;a$T#%C913?i}`t+rADo#
zC7TuHDW#@wx#E3b<A)T6uJ>09NC%@PS_OLhkrX*U!cgD*;;&gIaA(DyVT4QD+q_xu
z>r`tg{hiGY&DvD-)B*h+YEd+Zn)WylQl}<4>(_NlsKXCRV;a)Rcw!wtelM2_rWX`j
zTh5A|i6=2BA(iMCnj_fob@*eA;V?oa4Z1kRBGaU07O70fb6-qmA$Hg$ps@^ka1=RO
zTbE_2#)1bndC3VuK@e!Sftxq4=Uux}fDxXE#Q5_<FeRxZ5dX0w7NJ1YRHU#Z$BTr$
z`)wN5bJJ+RrkSP-+5&DxF;{yTydOK?&E@|n6{$zZ<l<h_OVq<pLy3}Cs(@^!AKS3v
zs^%D02yP?T1JsVkG_$W1M_(HQj2}0PQ({upTh0DEflgHzkrq_3uQ#o~Xh$r*Hn#XK
z%fUd@E{I)?SYMJGeI}L~)B<FkO~@J|q(Wd60IQ&6Okb!cr?;u~jpWb%H+9jmSrjds
z{3hpy8rDopSBZ_GusW_B)^$dTmE4P&V_Eb^Ih;|L<NY!D5GPH#JeEzeTh$HO@A|Fn
zRc*;Ma?FBd&3c(9Zt!qaZlR5|nMqGrA2Lj7O7tMpWmQy_rjuK|B)Gc_ouOQrj6wEz
z32X<-{ytN?=>x=E1h>T5`D<dtR&xu@*|Ta7Hd8EJn!lw8o@cR!8z8eO@)Vx=X>PHz
zbH<_OjWx$wy7=%0!mo*qH*7N4tySm+R0~(rbus`7;+wGh;C0O%x~fEMkt!eV>U$`i
z5<d_k7|L{*P&u(7rQp7047h3UbY|wjh)RQP$TKl{D0~b7ZKVczu31g*{+{-g>>Q(o
z=t$<p=<~hN1+_h{HfNMhdBWq=6u*-jH!6viz%~sWI#`^RvV~7ac*8S<+(K#fxEe_p
zLbZpanYgH()OwCJr$ckxd~mD)xi7!XCK7P^_y9>gPjgGh0&I7KY#k50V7DJRX<%^X
z>6+ebc9efB3@eE2Tr){;?_w`vhgF>`-<wt92+tk>GDY(YkR{9RH(MiCny<y~1rmBT
z=dU8?rS7ETruzC)etiYZ9@H0U1&xhKdLlcsjIHpes0+3l0*A?A>Rtd!LxXJ75z+?2
zGi<cz0hpHP10;3BfW^UbK|?i^ifVMhOM5tgNDo@PRVaec;GG(&PVVC}!WSnGP1++_
zj7X7}wOo$N4wU`G{9dEHd)iC0+__;{cSTS$w5A&CA{~0{tkn5{Q%AiVsW(Kt{2;Uv
zBC}hb{rgu(YvCPnHSS0;+<C*VukDNqo3wS450JI-3281)fjd<)Bk-Ox`5w9XCzwi@
zp&5d0zI5lIy4<1UjOMJL%mwKt$VX@f5Kf1<C;xU5aS>@m^+2hKJ5sB<T$2V@SQod{
zRaF6_FrEJ05N9c3f!q*;Z05ZmkiEaIoL}q&R~{c5{BIXr)9*1zAB!J$KA+W@@dk7V
zW5l1MLb$_c=9n*)B;obV;jd(QuL`!dk1d-7e1RQ0`^&R)nTJ0daa%iDe~{YM@Qnb3
zu*hzH_KKQq>1@Xi@s_@p_Kwbc<*LQ_`mr^Y%j}(sV_$`J(?_FWP)4NW*BIL~sR>t6
zM;qTJZ~GoY36&{h-Pf}L#y2UtR}>ZaI%A6VkU>vG4~}9^i$5WP2Tj?Cc}5oQxe2=q
z8BeLa$hwCg_psjZyC2+?yX4*hJ58Wu^w9}}7X*+i5Rjqu5^@GzXiw#SUir1G1`jY%
zOL=GE_ENYxhcyUrEt9Xl<FD`E@a9>MNP6kx6h&%6^u3@zB8KUCAa18T(R2J`%JjWZ
z!{7cXaEW+Qu*iJPu+m>QqW}Lo$4Z+!I)0JNzZ&_M%=|B1yejFRM04bGAvu{=lNPd+
zJRI^DRQ(?FcVUD+bgEcAi@o(msqys9RTCG#)TjI!9~3-dc`>gW;HSJuQ<oHtTsmp-
zg)H_2N1wZGNAu6O_Xn(AY+RFAJ-6Mm_93j!W*X|0Ye@4;iY+s6<0b5MjXzo`6IJyz
zLtv`iatXFp+bzc4T?oIjwG<wve*Pc~KpyZ4DKvxF$C%dvH*(Xtf=8k-_oIQotfRTq
zi_<6B=B}307o+ji?B_%DCS{<<$aaC|iJtV&+ZKYGhX!7=v>vH~d`MQs86R$|SKXHh
zqS9Qy)u;T`>>a!$LuaE2keJV%;8g)tr&Nnc;EkvA-RanHXsy)D@XN0a>h}z2j81R;
zsUNJf&g&rKpuD0WD@=dD<sR9w8N7Z}d}V2@hrPnkI(}2BnH&b8WlGN_J`E#!LaROL
zT6x>rPHdBoK42WoBU|nMo17o(5^;M|dB4?|FsAGVrSyWcI`+FVw^vTVC`y}f(BwJl
zrw3Sp151^9=}B})6<JlvqOAvKIjM>@H*i4-dIN_o^br+BkcLa^H56|^2XsT0dESw2
zMX>(KqNl=x2K5=zIKg}2JpGAZu{I_IO}0$EQ5P{4zol**PCt3F4`GX}2@vr8#Y)~J
zKb)gJeHcFnR@4SSh%b;c%J`l=W*40UPjF#q{<}ywv-=vHRFmDjv<xPiJ;i|>)NtmC
zQx9qm)d%0zH&qG7AFa3VAU1S^(n8VFTC~Hb+HjYMjX8r#&_0MzlNR*mnLH5hi}`@{
zK$8qiDDvS_(L9_2vHgzEQ${DYSE;DqB!g*jhJghE&=LTnbgl&Xepo<*uRtV{2wDHN
z)l;Kg$TA>Y|K8Lc&LjWGj<+bp4Hiye_@BfU(y#nF{fpR&|Ltbye?e^j0}8JC4#xi%
zv29ZR%8%hk=3ZDvO-@1u8KmQ@6p%E|dlHuy#H1&MiC<*$YdLkHmR#F3ae;bKd;@*i
z2_VfELG=B}JMLCO-6UQy^>RDE%K4b>c%9ki`f~Z2Qu8hO7C#t%Aeg8E%+}6P7Twtg
z-)dj(w}_zFK&86KR@q9MHicUAucLVshUdmz_2@32(V`y3`&Kf8Q2I)+!n0mR=rrDU
zXvv^$ho;yh*kNqJ#r1}b0|i|xRUF6;lhx$M*uG3SNLUTC@<I49P80xma07<{`YgPN
z)(Ac#bc{dhY#Cu3)v`Q}DZFuLMQN2u7xe+7PIX*m0qDp<6Jkno{rglXV)U;4>|htC
z-=fsw^F%$qqz4%QdjBrS+ov}Qv!z00E+JWas>p?z@=t!WWU3K*?Z(0meTuTOC7OTx
zU|kFLE0bLZ+WGcL$u4E}5dB0g`h|uwv3=H6f+{5z9oLv-=Q45+n~V4WwgO=CabjM%
zBAN+RjM65(-}>Q2V#i1Na@a0`08g&y;W#@sBiX6Tpy8r}*+{RnyGUT`?XeHSqo#|J
z^ww~c;ou|iyzpErDtlV<Y_SCc(_7{}MrPO4rVB@7&Rjy#O2fj5to>U=`8N7JSu>4M
z_pr9=tX0edVn9B}YFO2y(88j#S{w%E8vVOpAboK*27a7e4Ekjt0)hIX99*1oE;vex
z7#%jhY=bPijA=Ce@9rRO(Vl_vnd00!^TAc<+wVvRM9{;hP*rqEL_(RzfK$er_^SN;
z)1a8vo8~Dr5?;0X0J62Cusw$A*c^Sx1)dom`-)Pl7hsW4i(r*^Mw`z5K>!2ixB_mu
z*Ddqjh}zceRFdmuX1akM1$3>G=#~|y?eYv(e-`Qy?bRHIq=fMaN~<jAL}PWcQidRH
zK2yekhS2Lj<8?b`xr58UAX4(T5E1^L&whVF<i9Q^ij@9ed9E_ifd+pE6vaZ5Ry#aY
zA}&HXAstN0LhSxhPG&s*OQPG{+rA08*@HqCho1SsE9gc)wqnJnfgB2HU^I0xnVxj*
zX4m!g{s6*{GQ|W6M46yH&8H0KRHzB%Hb1+zmame~q)Ue3wp6C<-<ZZK_M)*8T|>fB
zUa6I8Rt=)jnplP>yuS+P&PxeWpJ#1$F`iqRl|jF$WL_aZFZl@kLo&d$VJtu&w?Q0O
zzuXK>6gmygq(yXJy0C1SL}T8AplK|AGNUOhzlGeK_oo|haD@)5PxF}rV+5`-w{Aag
zus45t=FU*{LguJ11Sr-28EZkq;!mJO7AQGih1L4rEyUmp>B!%X0YemsrV3QFvlgt*
z5kwlPzaiJ+kZ^PMd-RRbl(Y?F*m`4*UIhIuf#8q<Nz@soPkY1ALkT*eHhnbbIB_gT
zwEAmPh9_mjMLG@Ns1qCf8u)<9ISwg$Bqf?2y^HBtk5P?|2w6>>H_M=fM*L_Op-<_r
zBZagV=4B|EW+KTja?srADTZXCd3Yv%^Chfpi)cg{ED${SI>InNpRj5!euKv?=Xn92
zsS&FH(*w`qLI<rdK|7Qb<c1TJj-yb9%q!4Kl-gZhZ0&i~?1Smlus~@u79ojelr}e=
z=(jH{&~FQJuR)VS@A!!<bs@smdUy8&t|3w(Ru!w~g8*dFaH0ct>y$doc>RE&A5R?u
zzkl1sxX|{*fLp<pkJUphzMYHr37AZg0<9Q!);Dms#VK@7w$(ZE_TiLt!QccO&=fNh
z83;??=IfxriuU6rn*5zF)5oJ^dWG?|gwh&}q9z`cmSZSRKGM<9JUXgj2HP@ki@EyB
zPj?ggbGP#(J(EMkDShSp(c?_>XvIW>9d<$ePROttn3oc6R!sN{&Y+>Jr@yeQN$sFR
z;w6A<2-0%UA?c8Qf;sX7>>uKRBv3Ni)E9pI{uVzX|6Bb0U)`lhLE3hK58ivfRs1}d
zNjlGK0hdq0qjV@q1qI%ZFMLgcpWSY~mB^LK)4GZ^h_@H+3?dAe_a~k*;9P_<R7XN(
z&HGNI!PYhVXyq^_=bMf}N6^ok_FD5wiKI-2%nC=ATeOPtc<W3f4qR0C>d7%NEFP6+
zgV(oGr*?W(ql?6SQ~`lUsjLb%MbfC4V$)1E0Y_b|OIYxz4?O|!kRb?BGrgiH5+(>s
zoqM}v*;OBfg-D1l`M6T6{K`LG+0dJ1)!??G5g(2*vlNkm%Q(MPABT$r13q?|+kL4-
zf)Mi5r$sn;u41aK(K#!m+goyd$c!KPl~-&-({j#D4^7hQkV3W|&>l_b!}!z?4($OA
z5IrkfuT#F&S1(`?modY&I40%gtroig{YMvF{K{>5u^I51k8RriGd${z<Y3I3im=|8
z%$wv|wOEi8mu|yn0sn9E+Qi~7!OCIls-XU^J6|DHO_&{OHFY6TnAa~}E2>)=5k2tG
zM|&Bp5kDTfb#vfu<Z8(fb`i1z5wam|g63@h@f<+rCe0^)xyy?F)?N0$kWv4tqkpY=
z|3gMq{41bNQKPxivJ4dRDGYL+wvozbM|9~2fRq%3DHYS}cYPOyWb;?dy#H5(Ih0qD
zkVJkMZ*Py0(6NmwNO)Lq$X1r;R}D>TTd?)a=>bX=lokw^y9+2LS?kwHQIWI~pYgy7
zb<qS%zT{Z;-?o6LsXKA|-3BgzAw}ClH1epD-+P;mIUo2I{0lLes<XJMvzg#Bbe7DY
zG_Uq)WFe{s;pIJbW*B(HF<&(BRKZq@PN5oU9?D1X>?A-RKVm_vM5!9?C%qYdfRAw&
zAU7`up~%g=p@}pg#b7E)BFYx3g%(J36Nw(Dij!b>cMl@CSNbrW!DBDbTD4OXk!G4x
zi}JBKc8HBYx$J~31PXH+4^x|UxK~(<@I;^3pWN$E=sYma@JP|8YL`L(zI6Y#c%Q{6
z*APf`DU$S4pr#_!60BH$FGViP14iJmbrzSrOkR;f3YZa{#E7Wpd@^4E-zH8EgPc-#
zKWFPvh%WbqU_%ZEt`=Q?odKHc7@SUmY{GK`?40VuL~o)bS|is$Hn=<=KGHOsEC5tB
zFb|q}gGlL97NUf$G$>^1b^3E18PZ~Pm9kX%*ftnolljiEt@2#F2R5ah$zbXd%V_Ev
zyDd{1o_uuoBga$fB@Fw!V5F3jIr=a-yk<G{P%>qrK?WWZ#a(bglI_-8pq74RK*KfQ
z0~Dzus7_l;pMJYf>Bk`)`S8gF!To-BdMnVw5M-pyu+aCiC5dwNH|6fgRsIKZcF&)g
zr}1|?VOp}I3)IR@m1&HX1~#wsS!4iYqES<Oq!z^aMIT{Q??S@v&*GbF7q97kSl@?K
zC$z`Bzx+I?h3E?|U&YSk%hU7kC(QpfpZ+&mhLZFbpGNmFX*V`jC*LO2kmEO_Z~=`>
zK}4J{Ei>;e3>LB#Oly>EZkW14^@YmpbgxCDi#0RgdM${&wxR+LiX}B+<h)+#yyKdg
zysFvW_W7nZ&<-(uGY@AGZ5D2!%>iRioOB0(pDKpVEI;ND?wNx>%e|m{RsqR_{(nmQ
z3ZS}@t!p4a(BKx_-CYwrcyJ5u1TO9bcXti$8sy>xcLKqKCc#~UOZYD{llKTSFEjJ~
zyNWt>tLU}*>^`TvPxtP%F`ZJQw@W0^>x;!^@?k_)9#bF$j0)S3;mH-IR5y82l|%=F
z2lR8zhP?XNP-ucZZ6A+o$xOyF!w;RaLHGh57GZ|TCXhJqY~GCh)aXEV$1O&$c}La1
zjuJxkY9SM4av^Hb;i7efiYaMwI%jGy`3NdY)+mcJhF(3XEiSlU3c|jMBi|;m-c?~T
z+x0_@;SxcoY=(6xNgO$bBt~Pj8`-<1S|;Bsjrzw3@zSjt^JC3X3*$HI79i~!$RmTz
zsblZsLYs7L$|=1CB$8qS!tXrWs!F@BVuh?kN(PvE5Av-*r^iYu+L^j^m9JG^#=m>@
z=1soa)H*w6KzoR$B8mBCXoU;f5^bVuwQ3~2LKg!yxo<XQ$IAc;ya0F4IP5hmZW0n(
zeoH>mG1#XPmn(?YH<r<yFVclsbGRF9L2n2S9>@E~_ED+W6mxs%x{%Z<$pW`~ON<jr
zb@Rh%`t#?I<L3yZl{J^|&N^NYcBZh%My>1~2XjP5v(0{C{+6Dm$00tsd3w=f=ZENy
zOgb-=f}|Hb*LQ$YdWg<(u7<GTVlvJ^WI42~hhU2v*|!uo(`G=2+{}i#sqV$xDASf<
z@BJ)K+GlMseqK(xbd0N8;flrWX{U|f6iVUhp2C8U6V%`<#w1zFsPHlj&@qhoQ^=nF
z6v6aigM_Vb$5&}LkM25m&fIkuPtbE8{LAP5`M)3J|2(|M4gtoWqx*l9ndfm(jDdbS
z;F;wqL8@O#jzJ_!L@a8Vr=(ty%9Ya<&mYkPK-upKKzu>x3`PKF)B7ZfZ6;1FrNM63
z?O6tE%EiU@6%rVuwIQjvGtOofZBGZT1Sh(xLIYt9c4VI8`!=UJd2BfLjdRI#SbVAX
ziT(f*RI^T!IL5Ac>ql7uduF#nuCRJ1)2bdvAyMxp-5^Ww5p#X{rb5)(X|fEhDHHW{
zw(Lfc$g;+Q`B0AiPGtmK%*aWfQQ$d!*U<|-@n2HZvCWSiw^<SosZid&Mq7{pz6&V3
zd@R%+SsepGL-*aKdhzR%Vvbs43uAoIdC_3qKoUK@QdY*}5w2umG!7DWQeEKlHV6q$
z_Vh)Q-FM<!WD1@h?zMdvF;}=nMKN{e&z-e2q1E@fiAqu40_=<UFNQe-L84I;Y_c%j
zXOf_0V-dW;=^lZ_p{hCK<*1Qn9RCXL-o=HCfl~b1_&}HQrR3DMhN0xaXs&X+H^PhX
zjG$NyjtoK3(r=AP7}oP%4fb^}B?XNlaB{n~xP1Xi9IZ>I>#vh+LyC;aaVWGbmkENr
z&kl*8o^_FW$T?rDYLO1Pyi%>@&kJKQoH2E0F`HjcN}Zlnx1ddoDA>G4Xu_jyp6vuT
zPvC}pT&Owx+qB`zUeR|4G;OH(<<^_bzkjln0k40t`PQxc$7h(T8Ya~X+9gDc8Z9{Z
z&y0RAU}#_kQGrM;__MK9vwIwK^aoqFhk~dK!ARf1zJqHMxF2?7-8|~yo<mfEO9=@^
zS^!0=f8b>O@_~Ed;_wvT%Vs{9RK$6uUQ|&@#6vyBsFK9eZW1Ft#D2)VpQRwpR(;x^
zdoTgMqfF9iBl%{`QDv7B0~8{8`8k`C4@cbZAXBu00v#kYl!#_Wug{)2PwD5cNp?K^
z9+|d-4z|gZ!L{57>!Ogfbzchm>J1)Y%?NThxIS8frAw@z>Zb9v%3_3~F@<=LG%r*U
zaTov}{{^z~SeX!qgSYow`_5)ij*QtGp4lvF`aIGQ>@3ZTkDmsl#@^5*NGjOuu82}o
zzLF~Q9SW+mP=>88%eSA1W4_W7-Q>rdq^?t=m6}^tDPaBRGFLg%ak93W!kOp#EO{6&
zP%}Iff5HZQ9VW$~+9r=|Quj#z*=YwcnssS~9|ub2>v|u1JXP47vZ1&L1O%Z1Ds<y1
zKGhYGqMl$%q``Pf)AeU^htE>OrDfSIMHU{VT>&>H=9}G3i@2rP+rx@eU@uE8rJNec
zij~#FmuEBj03F1~ct@C@$>y)zB+tVyjV3*n`mtAhI<Hd#M@#m|U%%fPzKpS=8^jh0
zL8{$eQBGDxNs#cZ9W_F*%I@t0Ecr241+VZB`dP=cQbRx5C6V0E8hva(E`B^pdHgL|
z{&5>M0$58vM9jOQC}JJOem|EpwqeMuYPxu3sv}oMS?S#o6GGK@8PN59)m&K4Dc&X%
z(;XL_kKeYkafzS3Wn5DD>Yiw{LACy_#jY4op(>9q>>-*9@C0M+=b#bknAWZ37^(Ij
zq>H%<@>o4a#6NydoF{_M4i4zB_KG)#PSye9bk0Ou8h%1Dtl7Q_y#7*n%g)?m>xF~(
zjqvOwC;*qvN_3(*a+w2|ao0D?@okOvg8JskUw(l7n`0fncglavwKd?~l_ryKJ^Ky!
zKCHkIC-o7%fFvPa$)YNh022lakMar^dgL=t#@XLyNHHw!b?%WlM)R@^!)I!smZL@k
zBi=6wE<uBK&#|s)0id-YUbF|8EPGSGH#_Nnlfmnx-A{yYewA#u&;8}f{mZTU`V%Vx
zw+kY#P{Vftbb_Kx6Y^&ExMgX^Mv0aE2ugq_I13BLg;kULC8h9=4mjSmMlD_q9Weew
zQP6=zR=$<}g~zzw5d*9AxF4p1bS)})m*Am0;N4P5h;=f3SqJHg(}O<h%;?&y!q3aJ
zM0lZW!Y2FVPfVs5!A8r2PY%jXR;(thZCy+-4If<jrsBG5eyH8BP$MdVS}wcThQNK)
zKIDBa>5)2v&!UNV(&)oOYW(6Qa!nUjDKKBf-~Da=#^HE4(@mWk)<uU{=obsLdUI3h
zHmqdEK8EB5g|CJ1waElw;@$z(IDUSb4jynL@<Dcx{+7nmSS)kq1|+E@VN%nmRkMiR
zs=e6GO30hK26C#QIG|w8+|fawvH;IKl%paiw=s1CoUBE@_O7IxK{t{GeiX5Bw#IBg
zy}V!1(_y)p_WaM*T{~mUh~q`irqOUPd<%ojktmiS@MD>LPvhyN3i4goB$3K8iV7uh
zsv+a?#c4&NWeK(3AH;ETrMOIFgu{_@%XRwCZ;L=^8Ts)hix4Pf3yJRQ<8xb^CkdmC
z?c_gB)XmRsk`9ch#tx4*hO=#qS7={~Vb4*tTf<5P%*-XMfUUY<TA8uu1Q&SE*j^Oz
z=-_T`Y_dFx=4yScs+$!sJ58a1Qi$jurfsZ>kI9T1cEF;ObfxxI-yNuA=I$dCtz3ey
znVkctYD*`fUuZ(5<dGK9+E5m(x+j!E1gBD<m;epCW&-dEFrxIWm6v|{RNP287N@@(
z&RwFD-KScCNJ<>7+^B*R=Q}~{1z#2!ca?)+YsRQb+lt^LmEvZt_`=j^wqig+wz@n@
z`LIMQJT3bxMzuKg8EGBU+Q-6cs5(@5W?N>JpZL{$9VF)veF`L5%DSYTNQEypW%6$u
zm_~}T{HeHj1bAlKl<bNiI7kGAT=WJaCg#3PHf(sw37beu4irZqPQM6)OVU((ZqiFe
zh7}c1t^`(7HQ`GHm>8ii92l9~$dm=UM21kLemA&b$;^!wB7#IKWGnF$TVq!!lBlG4
z{?Rjz?P(uvid+|i$VH?`-C&Gcb3{(~Vpg`w+O);Wk1|Mrjxrht0GfRUnZqz2MhrXa
zqgVC9nemD5)H$to=~hp)c=l9?#~Z_7i~=U-`FZxb-|TR9@YCxx;Zjo-WpMNOn2)z)
zFPGGVl%3N$f`gp$gPnWC+f4(rmts%fidpo^BJx72zAd7|*Xi{2VXmbOm)1`w^tm9%
znM=0Fg4bDxH5PxPEm{P3#A(mxqlM7SIARP?|2&+c7qmU8kP&iApzL|F>Dz)Ixp_`O
zP%xrP<k$wQk~?_FT73lz;bX*6=D5hHv{$OG+ESaX)ae8>1M6@oYhgo$ZWwrAsYLa4
z|I;DAvJxno9HkQrhLPQk-8}=De{9U3U%)dJ$955?_AOms!9gia%)0E$Mp}$+0er@<
zq7J&_SzvShM?e%V?_zUu{niL@gt5UFOjFJUJ}L?$f%eU%jUSoujr{^O=?=^{19`ON
zlRIy8Uo_nqcPa6@yyz`CM?pMJ^^SN^Fqtt`GQ8Q#W4kE7`V9^LT}j#pMChl!j#g#J
zr-=CCaV%xyFeQ9SK+mG(cTwW*)xa(eK;_Z(jy)wo<nmrLjO|ztv*nplaAl0pOFIhc
zZe;A@?4xmZHrI(+Y#%y4JBydr1g6#IYFihmK+)HufuUTxq$8qVOdp3boOq1P;Wv@K
zwXG&kim4YnysqJGu(l+!DM|q?7$}thxr;l?%GuKali@m896TRH<j~86OHh|?hFiON
zoVTO2Q4vtq%AS1ZzYe5%=fvKeF$UDaWs%{qd@6uW$5nPva?M$)-R6sQz?-*9>Zp~>
zA(4}-&VH+TEeLzPTqw&FOoK(ZjD~m{KW05fiGLe@E3Z2`rLukIDahE*`u!ubU)9`o
zn^-lyht#E#-dt~S>}4y$-mSbR8{T@}22cn^refuQ08NjLOv?JiEWjyOnzk<^R5%gO
zhUH_B{oz~u#IYwVnUg8?3P*#DqD8#X;%q%HY**=I>>-S|!X*-!x1{^l#OnR56O>iD
zc;i;KS+t$koh)E3)w0<sr_&V$&&^jwvKZE>OjWJl_aW2;xF=9D9Kr>)(5}4FqUbk#
zI#$N8o0w;IChL49m9CJTzoC!|u{Ljd%ECgBOf$}&jA^$(V#P#~)`&g`H8E{uv52pp
zwto`xUL-L&WTAVREEm$0g_gYPL(^vHq(*t1WCH_6alhkeW&GCZ3hL)|{O-jiFOBrF
z!EW=Jej|dqQitT6!B-7&io2K)WIm~Q)v@yq%U|VpV+I?{y0@Yd%n8~-NuuM*pM~KA
z85YB};IS~M(c<}4Hxx>qRK0cdl&e?t253N%vefkgds>Ubn8X}j6Vpgs>a#nFq$osY
z1ZRwLqFv=+BTb=i%D2Wv>_yE0z}+n<tX7=B(@omRDE4?_eQVXQv?Hdp3mP%L7_)rJ
zceU9n0F0eAb5q_*CY^$%aws@y6mOF934p6R@I02AiG$kI%gnd`UPSCop=0b3KK$X-
zk-)b~vVG#IP{XT_WwHf9Y*n)4+*X%H1=HFzGgIreH<FzmQ(C#KDP;be%rXl#(zren
z3;Gheo^MEIift!$({sqVYci@r6Dj9mg`Hdp*Tg83DVhi6WX!_~b2|?rFE`d=h~~1X
z6i36B4#G%u>iZ4?rE|*a3d7^kndWGwnFqt+iZ(7+aln<}jzbAQ(#Z2SS}3S$%Bd}^
zc9ghB%O)Z_mTZMRC&H#)I#fiLuIkGa^`4e~9oM5zKPx?zjkC&Xy0~r{;S?FS%c7w<
zWbMpzc(xSw?9tGxG~_l}Acq}zjt5ClaB7-!vzqnlrX;}$#+PyQ9oU)_DfePh2E1<7
ztok6g6K^k^DuHR*iJ?jw?bs_whk|bx`dxu^nC6#e{1*m~z1eq7m}Cf$*^Eua(oi_I
zAL+3opNhJteu&mWQ@kQWPucm<ysMdVUPHbq+gV?rGqRHPp%uV!-l3=Q6r-oAMj1Uf
z?b8Zw!CdncfJ4Z*7>iP)4|nFG`b2tpC;h{-PI@`+h?9v=9mn|0R-n8#t=+Z*FD(c5
zjj79Jxkgck*DV=wpFgRZuwr%}KTm+dx?RT@aUHJdaX-ODh~gByS?WGx&czAkvkg;x
zrf92l8$Or_zOwJVwh>5rB`Q5_5}ef6DjS*$x30nZbuO3dijS*wvNEqTY5p1_A0gWr
znH<(Qvb!os14|R)n2Ost>jS2;d1zyLHu`Svm|&dZD<e=++}X$(_vT!eDWbK#-aOcb
zi(KgPl`rO!O(9j=^cVi}IJNF4xy!cZ^|4Qs?8*Y{23A~ZFVr#LH`z~t(_yzQt&2M^
z#F0(lV{PSkxR!@r$_LIxAwOO4D~UhYNt;i4b$LF+l)!<Mlhtrc{(+#www<UPw<{4h
zpfbM!C=Fd%YcqvBrKlm>+PpP{Bh>U&`Md;gRl64q;>{8MJJM$?UNUd`aC>BiLe>*{
zJY15->yW+<3rLgYeTruFDtk1ovU<$(_y7#HgUq>)r0{^}Xbth}V#6?%5jeFYt;SG^
z3qF)=uWRU;Jj)Q}cpY8-H+l_n$2$6{ZR?&*IGr{>ek!69ZH0ZoJ*Ji+ezzlJ^%qL3
zO5a`6gwFw(moEzqxh=yJ9M1FTn<T5L*i(<zj`a8@-`*Y*d1O*$5VlE~&#SB+H9}iw
zB3)>!eo&qD#y5AZXErHs%22?A+JmS&GIolml!)rZTnUDM3YgzYfT#;OXn)`PWv3Ta
z!-i|-Wojv*k&bC}_JJDjiAK(Ba|YZgUI{f}TdEOFT2+}nPmttytw7j%@bQZDV1vvj
z^rp{gRkCDmYJHGrE1~e~AE!-&6B6`7UxVQuvRrfdFkGX8H~SNP_X4<w;C2T`tyKC_
zi-<IDL>EodVd;lXd^>eV1jN+Tt4}Rsn)R0LxBz0c=NXU|pUe!MQQFkGBWbR3&(jLm
z%RSLc#p}5_dO{GD<NWe-r|=Q6-4PleiDwT(2|~KO8GT0gfR~)=qKWhs>=DEFr=Fc%
z85CBF>*t!6ugI?soX(*JNxBp+-DdZ4<rEK)&M`6wOoocN!#y@nw+fsyKHosdUZSs#
zY>X0LldiK}+WWGvXV(C(Ht|!3$psR=&c*HIM=BmX;pRIpz@Ale{9dhGe(U2|Giv;#
zOc|;?p67J=Q(kamB*aus=|XP|m{jN^6@V*Bpm?ye56Njh#vyJqE=DweC;?Rv7faX~
zde03n^I~0B2vUmr;w^X37tVxUK?4}ifsSH5_kpKZIzpYu0;Kv}SBGfI2AKNp+VN<s
z&%`{SSX=7`cuk&HSpr5=9(NBlPiF6=d$2k4+qBuZEtEp{q9rXkkSlz~m$@K5d@1sb
zV&-+U{A<aWf$z&7U9^^scEEAOgD13Kt{%E-i<cL-_`0>#z`nI{UNDRbo-wqa4NEls
zICRJpu)??cj^*WcZ^MAv+;bDbh~gpN$1Cor<{Y2oyIDws^JsfW^5AL$azE(T0p&pP
z1Mv~6Q44R&RHoH95&OuGx2srIr<@zYJTOMKiVs;Bx3py89I87LOb@%mr`0)#;7_~Z
zzcZj8?w=)>%5@HoCHE_&hnu(n_yQ-L(~VjpjjkbT7e)Dk5??fApg(d>vwLRJ-x{um
z*Nt?DqTSxh_MIyogY!vf1mU1`Gld-&L)*43f6dilz`Q@HEz;+>MDDYv9u!s;WXeao
zUq=TaL$P*IFgJzrGc>j1dDOd<P6obJsU?i;%~VO18%pw+u7Z7zDM{)mIn14~Q_iX3
zT{Tx9IMu^l8)U&uPF2B_@;$LfUzf<C;nO$|L9fQPGc5pM<ix6!$F5fSR4J=#3pL1>
zed+=ZBo?w4mr$2)Ya}?vedDopomhW1`#P<%YOJ_j=WwClX0xJH-<Xq=YwhDDH5<ir
z)fn*!W2|$oe({@J6>f@s?<R{WuTm{#vF3!6EowIp1Yl(A5Iq}el2(>^tmzs_j7t!k
zK@j^zS0Q|mM4tVP5Ram$VbS6|YDY&y?Q1r1joe9dj08#CM{RSMTU}(RCh`hp_Rkl-
zGd|C<M{UA`Ev@3>v~G@F{DLhCizAm9AN!^{rNs8hu!G@8RpnGx7e`-+K$ffN<0qjR
zGq^$dj_Tv!n*?zOSyk5skI7JVKJ)3jysnjIu-@VSzQiP8r6MzudCU=~?v-U8yzo^7
zGf~SUTvEp+S*!X9uX!sq=o}lH;r{pzk~M*VA(uyQ`3C8!{C;)&6)95fv(cK!%Cuz$
z_Zal57H6kPN>25KNiI6z6F)jzEkh#%OqU#-__Xzy)KyH};81#N6OfX$$IXWzOn`Q&
z4f$Z1t>)8&8PcYfEwY5UadU1yg+U*(1m2ZlHoC-!2?gB!!fLhmTl))D@dhvkx#+Yj
z1O=LV{(T%{^IeCuFK>%QR!VZ4GnO5t<M8oXd(Iwnd!%6;G4+b$sfV@nF>K8a+thWE
zg4VytZ<!+^Z3OxbQ{Q^NT}C^&{w?l_efsLU3K<LxNcF3In!jBW`E4P@@Q>rwcS?7^
zuZfhYnB8dwd%VLO?DK7pV5Wi<(`~DYqOXn8#jUIL^)12*Dbhk4GmL_E2`WX&iT16o
zk(t|hok(Y|v-wzn?4x34T)|+SfZP>fiq!><*%vnxGN~ypST-FtC+@TPv*vYv@iU!_
z@2gf|PrgQ?Ktf*9^CnJ(x*CtZVB8!OBfg0%!wL;Z8(tYYre0vcnPGlyCc$V(Ipl*P
z_(J!a=o@vp^%Efme!K74(Ke7A>Y}|sxV+JL^<EBm?s93Gk}89>aYa{~m%5#$$+R1?
zGaQhZTTX!#s#=Xtpegqero$RNt&`4xn3g$)=y*;=N=Qai)}~`xtxI<AZ4F;JTD<8R
zj!)c(h~W5ym&ztJHonI$wOw!ilm$MYm9Bza-hgQlyVgU%3gL7ZR{DGw;SC3(2jmN#
zEN0r*A}At(0W#Ah$kNBdq7}-SmKb}m?}0D&ayCSIp<(7rh{N(>_N*#MMCIq#HFifT
zz(-*m;pVH&+4bixL&Bbg)W5FN^bH87pAHp)<cHV|Z#UZzRmhx)v+J#b;z4`Q?k?-R
z?Mwe6>zPkWNMfTFqS=l~AC$3FX3kQUSh_C?-ZftyClgM)o_D7cX$RGlEYblux0jv5
zTr|i-I3@ZPCGheCl~BGhImF)K4!9@?pC(gi3ozX=a!|r1)LFxy_8c&wY0<^{2cm|P
zv6Y`QktY*;I)IUd5y3ne1CqpVanlY45z8hf4&$EUBnucDj16pDa4&GI&TArYhf*xh
zdj>*%APH8(h~c>o@l#%T>R$e>rwVx_WUB|~V`p^JHsg*y12lzj&zF}w6W09HwB2yb
z%Q~`es&(;7#*DUC_w-Dmt7|$*?TA_m;zB+-u{2;Bg{O}nV7G_@7~<)Bv8fH^G$<M*
z&d&;aLbJI7DA_i+KF+_Y*db5T=T0$Yb3d-`R$T@3wLZQCDrGFAM6Hy)P81(B7I-}^
zZ#X&{ChGm1hJg}`oiCWrMyeKG-CKZgKD^F(ua7wxm46IP%8KAiuDjGgHkpHlqY{44
z6u+EZH5*`-Tmv@0q-e$H7@qYxb=7lP*Uw9V-%F*BSf3gnl(tEHIo~UWGwgNM?yNh+
z4`DXIz*~q@Zt5=B?(4}yS%0CI2f?0DXy#?0A|S`Rsho0pv40`;)dJpwh<81-^iiuK
z%Vi?_s~)&i)z1SmPY1<XW`lTd<YCBKxgcl4zKk4DeAbUOOvIYr?)CoiY>XG8$(&{A
zwXJK5LRK%M34(t$&NI~MHT{UQ9qN-V_yn|%PqC81EIiSzmMM=2zb`mIwiP_b)x+2M
z7Gd`83h79j#SItpQ}luuf2uOU`my_rY5T{6P#BNlb%h%<#MZb=m@y5aW;#o1^<f$w
z=h?@HX|<iV!fmbN2X4(oxX(FwV@xQ6hBb_M4Z>2Z)SWo+b`y0gV^iRcZtz5!-05vF
z7wNo=hc6h4hc&s@uL^jqRvD6thVYtbErDK9k!;+a0xoE0WL7zLixjn5;$fXvT=O3I
zT6jI&^A7k6R{&5#lVjz#8%_RiAa2{di{`kx79K+j72$H(!ass|B%@l%KeeKchYLe_
z>!(JC2fxsv>XVen+Y42GeYPxMWqm`6F$(E<6^s|g(slNk!lL*6v^W2>f6hh^mE$s=
z3D$)}{V5(Qm&A6bp%2Q}*GZ5Qrf}n7*Hr51?bJOyA-?B4vg6y_EX<*-e20h{=0Mxs
zbuQGZ$fLyO5v$nQ&^kuH+mNq9O#MWSfThtH|0q1i!NrWj^S}_P;Q1OkYLW6U^?_7G
zx2wg?CULj7))QU(n{$0JE%1t2dWrMi2g-Os{v|8^wK{@qlj%+1b^?<vxdN3hhv>NI
z$}l2tjp0g>K3O+p%yK<9!XqmQ?E9>z&(|^Pi~aSRwI5x$jaA62GFz9%fmO3t3a>cq
zK8Xbv=5Ps~4mKN5+Eqw12(!PEyedFXv~VLxMB~HwT1Vfo51pQ#D8e$e4pFZ{&RC2P
z5gTIzl{3!&(tor^BwZfR8j4k{<RRDK>7Rq#`riKXP2O-Bh66#WWK2w=z;iD9GLl+3
zpHIaI4#lQ&S-xBK8PiQ%dwOh?%BO~DCo06pN7<^dnZCN@NzY{_Z1>rrB0U|nC&+!2
z2y!oBcTd2;@lzyk(B=TkyZ)zy0deK05*Q0zk+<m@@d`~L>o$@nun`VI1Er7pjq>8V
zNmlW{p7S^Btgb(TA}jL(uR>`0w8gHP^T~Sh5Tkip^spk4SBAhC{TZU}_Z)UJw-}zm
zPq{KBm!k)?P{`-(9?LFt&YN4s%SIZ-9lJ!Ws~B%exHOeVFk3~}HewnnH(d)qkLQ_d
z6h><vmhITb#1N_8X1Z(L5Z-Mt1QD-4--ZSQa|I2k|2yb`=kK=Y{xq2W9@z8ykeYTE
z(sLIxoB*Jf@`g}u$%PTp1k#3_<Y0()`Q@U-raX1Vot0=ZY_hD?M86FdNIhTjrJxZ+
zJ((diYOZbq`Uha?I6CglyX`fAgexzumMOh3N@)+6OQ*_0dT^VSFf_smVHDjg55<Jl
zH2Ozsu;$G}j>O)pEE{vbOVw}E+jdYC^wM+AAhaI(YAibUc@B#_mDss0Ji&BK{WG`4
zOk>vSNq(Bq2IB@s>>Rxm6Wv?h;Z<HWsJXErNyl(WAMS;TU3O?s5_Llui-|!JglEvo
z$E2mYL3+SPK!E!7%WQv?cHL*#*)*5PhS)J5GV09TI$ZnD5J-@RK1t0}*-9n4F=AJg
z@YsA@xfMsv#w~_vqJq-JmLhW#heOMgz)(!epQo{MZD5-(_n`&FvWL)jB4Ys1EdZfI
zoaBo@7-CroK$CL=LyAo`ptq!pX?Uo!KIaWj7|yHs%MYw!l&%tFp^xeV$e}_JqO0pN
zNxaGWM<%{B0&9iTjFXOdP?w#{jHX>Xkpb1l8u|+_qXWdC*jjcPCixq;!%BVPSp#hP
zqo`%cNf&YoQXHC$D=D45RiT|5ngPlh?0T~?lUf*O)){K@*Kbh?3RW1j9-T?%lDk@y
z4+~?wKI%Y!-=O|_IuKz|=)F;V7ps=5@g)RrE;;tvM$gUhG>jHcw2Hr@fS+k^Zr~>G
z^JvPrZc}_&d_kEsqAEMTMJw!!CBw)u&ZVzmq+ZworuaE&TT>$pYsd9|g9O^0orAe8
z221?Va!l1|Y5X1Y?<Q2k@C>{G7rt1sX#qFA^?RLG^VjoxPf63;AS=_mVDfGJKg73L
zsGdnTUD40y(>S##2l|W2Cy!H(@@5KBa(#gs`vlz}Y~$ot5VsqPQ{{YtjYFvIumZzt
zA{CcxZLJR|4<x-MAle2Nd|D%3<KvN6^~LMtrTQKT11XTUTsz-QKf89?*YA3bbocsv
z<tG;Y1lpf_{>#{j7k~Tu*jkwz8QA|5G1$Cl895R`<bW@zkRsPYS`N#4&EBxmd{@y_
z#&U+_?ao#Kwx+DC{AN!PZYAX?2(H1uQyF~p>Zyp;irp1{KN){kB<t|Lg})VytK%aH
zCJdJ3Re6v<r!FVDLBzZp{ZdlRHq_XzsY7pir9Q3LQAJ+IOOcz}u=>30O8P1W5;@bG
znvX74roeMmQlUi=v9Y%(wl$ZC#9tKNFpvi3!C}f1m6Ct|l2g%psc{TJp)@yu)*e2>
z((p0Fg*8gJ!|3WZke9;Z{8}&NRkv7iP=#_y-F}x^y?2m%-D_aj^)f04%mneyjo_;)
z6qc_Zu$q37d~X``*eP~Q>I2gg%rrV8v=kD<S$$Du%7)9vB5*3kar-m(rC|$tWLh`b
zcoxYH(*j~EVZ>fpp$=%Vj}hF)^dsSWygoN(A$g*E=Do6FX?&(@F#7pbiJ`;c0c@Ul
zDqW_90Wm#5f2L<(Lf3)3TeXtI7nhYwRm(F;*r_G6K@OPW4H(Y3O5SjUzBC}<?|Tm0
zRP=fu|E~4-g)9SuK=BRizYL2M|GU<InE379H^~Fl#JuQ1SzKoHfLmc9R0#Sg+k((d
zhN8HzM*VhCp<uO4>u3d|eQ8<Ba^oJ-NVK>*8d@?;zUPE+i#QNMn=r(ap?2SH@vo*m
z3HJ%XuG_S6;QbWy-l%qU;8x;>z>4pMW7>R}J%QLf%@1BY(4f_1iixd-6GlO7Vp*yU
zp{VU^3?s?90i=!#>H`lxT!q8rk>W_$2~kbpz7eV{3wR|8E=8**5?qn8#n`*(bt1<M
zlk{?%Mh@~#mQl*b5K-2c;P;AWttPx=rB~Os`<u!ZxgjvPCt_!HNidwq(fg-i3DKTv
z?L6K*ehZ#KPjHDJ5vWuMs>xRQrdGxyx2y%B$qmw#>ZV$c7%cO#%JM1lY$Y0q?Yuo>
ze9KdJoiM)RH*SB%^;TAdX-zEj<!({s>A7@%<k)#%bD2GjyYCHnZiy-B)zMUf<(h`v
z6r)G0@ahyae4&QsKnOdXX44T}#dpO3&z>y=!0=Zg%iWK7jVI9b&Dk}0$Af&08KHo+
zOwDhFvA(E|ER%a^cdh@<ajPmA)cO>^wLUlmIv6?_3=BvX8jKk92L=Y}7Jf5OGMfh`
zBdR1wFCi-i5@`9km{isRb0O%TX+f~)KNaEz{rXQa89`YIF;EN&gN)cigu6mNh>?Cm
zAO&Im2f<R$(FpJ-`ul}(ek!d0=fY-I4EB1j^=!?42}Ai4Ov$fceybC`ldYb$wUO<g
zK&64tq3)(3caC8H2^0c!zYlKgzjgZ=)Y{6D!P?degl}(VWcMrIfg+afSq6y0%GTsh
zmAd<vAKnHjOx?5bKT7CX>lv6D{jwm+y<%WsPe4!89n~KN|7}Cb{Z;XweER73r}Qp2
zz}WP4j}U0&(uD&9yGy6`!+_v-S(yG*iytsTR#x_Rc>=6u^vnRD<C6c)4)B{t?-8)?
z2xp^$Jh2LbWBGv&x&py@L2t$XBoHw&)^o717Xj%jSXk*9f+X>nf1gP{#2>`ffrAC%
zTZ5WQ@hAK;P;>kX{D)mIXe4%a5p=LO1xXH@8T?mz<Y5Jb+5IA|K_bV-ptS8wKUIJe
zlnC^nSKzO2&(G!zwE~2?4Em$~2^|XeSLpxo+h4=3W@$d22XziXgrHPgKfxm4{Q?%G
z%VMu*@t=&O4_)C$NxOUvdcQ3}ZB70YssJb-`Tul<w3Ug8k?mhs6vf)^y%wk;2SMIt
z{0TA~lmzU5Ldx8AZhs^KyL&|c8vK4Lb%CG2#X<ed{{(-jXKyNKXJ=%o5Ap<=w3UIL
zg@_sGZ7|b!_^&MWL*Lxb4hwR|e+&o?;QOase|;DCb0ywom;GTt@W&#*Kz{hV|CDR?
zVeRjyW&63CPz0%4{!dT+(E^|;%)=av4+-w4Lb=QC_QQbS(xBkbza#iL*V}K{|6?S+
zOQ!N)<5u|v_FZa~ht<5F`r%Hy{D%R-1O5)`?-Q#$B)c!64)XGU3<!Rp{x|jhLH18R
zCmzz?7ykbF9x-(OhW6gH^?#_fKP0;^T79P_{=<OaQ@a10?7<xQA<2E2*1JuC9|i;u
z)c@xs_t!HXGTaxL{JE(vP5wE<?}3@W5PyA0dtcd4@W)+&u0Zhg*Z()#-*55{J<Er5
z_cg!n<N|*f5Ihs`ujzgv9{7;=zJ8O^4^q$-2!3MwuX+EGzSzSW+?Sq^`l$w44*$9a
zzfz5QNPPc<|IaQree<u0f1z{nkoW$v>7Q@d)$3pL{{B!2{-v70L*o1AO+|n5beiw~
zk@(>m?T3{2k2c;NWc^`4@P&Z?BjxXJ@;x1qhn)9Mn*IFdt_J-dIqx5#d`NfyfX~m(
zIS~5)MfZ2Uy?_4W`47i}u0ZgPh<{D|w_d#;D}Q&U<c9&l@uL4V+pkZUJoNDWE$N@f
z811-!Oa0gLy!-3)KQq|o{SCvP*5?13;r>$Q-G}xM1A@1f{#%A$jh6Qp&0hQ<0bPOM
z-{1Wm&p%%#eb_?x7i;bo<bD_s{JQdQSRc-n@6B`mH1&W2ZKd3Ot1yB=qk@55R^R>l
EfAhh=DF6Tf

literal 0
HcmV?d00001

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 000000000..642d572ce
--- /dev/null
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/mvnw b/mvnw
new file mode 100755
index 000000000..41c0f0c23
--- /dev/null
+++ b/mvnw
@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/mvnw.cmd b/mvnw.cmd
new file mode 100644
index 000000000..86115719e
--- /dev/null
+++ b/mvnw.cmd
@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%

From aec7efa56445abcd4246b33183f3d49b3bfe8847 Mon Sep 17 00:00:00 2001
From: orzeh <orzehoo@wp.pl>
Date: Fri, 14 Feb 2020 11:58:54 +0100
Subject: [PATCH 0963/1272] Fix support for quiet option in `BuildImageCmd`
 (#1318)

Fixes #1246
---
 .../dockerjava/api/model/BuildResponseItem.java |  7 ++++++-
 .../github/dockerjava/cmd/BuildImageCmdIT.java  | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
index b781bac9f..25ff14664 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
@@ -9,6 +9,7 @@ public class BuildResponseItem extends ResponseItem {
     private static final long serialVersionUID = -1252904184236343612L;
 
     private static final String BUILD_SUCCESS = "Successfully built";
+    private static final String SHA256 = "sha256:";
 
     /**
      * Returns whether the stream field indicates a successful build operation
@@ -19,7 +20,7 @@ public boolean isBuildSuccessIndicated() {
             return false;
         }
 
-        return getStream().contains(BUILD_SUCCESS);
+        return getStream().contains(BUILD_SUCCESS) || getStream().startsWith(SHA256);
     }
 
     @JsonIgnore
@@ -28,6 +29,10 @@ public String getImageId() {
             return null;
         }
 
+        if (getStream().startsWith(SHA256)) {
+            return getStream().replaceFirst(SHA256, "").trim();
+        }
+
         return getStream().replaceFirst(BUILD_SUCCESS, "").trim();
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
index b15931f3c..b30c26f4b 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
@@ -39,6 +39,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
@@ -317,6 +318,22 @@ public void cacheFrom() throws Exception {
 
     }
 
+    @Test
+    public void quiet() {
+        File baseDir = fileFromBuildTestResource("labels");
+
+        String imageId = dockerRule.getClient()
+                .buildImageCmd(baseDir)
+                .withQuiet(true)
+                .exec(new BuildImageResultCallback())
+                .awaitImageId();
+
+        InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec();
+        assertThat(inspectImageResponse, not(nullValue()));
+        assertThat(inspectImageResponse.getId(), endsWith(imageId));
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+    }
+
     public void dockerfileNotInBaseDirectory() throws Exception {
         File baseDirectory = fileFromBuildTestResource("dockerfileNotInBaseDirectory");
         File dockerfile = fileFromBuildTestResource("dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile");

From ffec4f598f1ef46c2192b34470781bd38c6e2e59 Mon Sep 17 00:00:00 2001
From: Alexey Atiskov <atiskov@gmail.com>
Date: Fri, 14 Feb 2020 14:04:43 +0300
Subject: [PATCH 0964/1272] Introduce boolean nostream parameter to StatsCmd.
 (#1287)

* BUG-1278: Introduce boolean nostream parameter to StatsCmd.

* BUG-1278: Fix review. User try-with-resources. Remove sleep. Use null-safe check.

* BUG-1278: Fix review. Removed useless assertions and logs. Fix namings. Fix container names. Revert encodings.xml.

* BUG-1278: Remove not used imports.

Fixes #1278
---
 .../dockerjava/api/command/StatsCmd.java      |  5 ++
 .../dockerjava/core/command/StatsCmdImpl.java | 12 +++++
 .../dockerjava/core/exec/StatsCmdExec.java    |  4 ++
 .../com/github/dockerjava/cmd/StatsCmdIT.java | 49 ++++++++++++-------
 4 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/StatsCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
index 6085a810b..c85ca2b2f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
@@ -16,6 +16,11 @@ public interface StatsCmd extends AsyncDockerCmd<StatsCmd, Statistics> {
 
     StatsCmd withContainerId(@Nonnull String containerId);
 
+    @CheckForNull
+    Boolean hasNoStream();
+
+    StatsCmd withNoStream(boolean noStream);
+
     interface Exec extends DockerCmdAsyncExec<StatsCmd, Statistics> {
     }
 }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
index 69d9a02d7..e1cc86e68 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
@@ -12,6 +12,8 @@ public class StatsCmdImpl extends AbstrAsyncDockerCmd<StatsCmd, Statistics> impl
 
     private String containerId;
 
+    private Boolean noStream;
+
     public StatsCmdImpl(StatsCmd.Exec exec, String containerId) {
         super(exec);
         withContainerId(containerId);
@@ -29,4 +31,14 @@ public String getContainerId() {
         return containerId;
     }
 
+    @Override
+    public Boolean hasNoStream() {
+        return noStream;
+    }
+
+    @Override
+    public StatsCmd withNoStream(boolean noStream) {
+        this.noStream = noStream;
+        return this;
+    }
 }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java
index f939a8494..6668ace04 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/StatsCmdExec.java
@@ -23,6 +23,10 @@ protected Void execute0(StatsCmd command, ResultCallback<Statistics> resultCallb
         WebTarget webTarget = getBaseResource().path("/containers/{id}/stats").resolveTemplate("id",
                 command.getContainerId());
 
+        if (Boolean.TRUE.equals(command.hasNoStream())) {
+            webTarget = webTarget.queryParam("stream", "0");
+        }
+
         LOGGER.trace("GET: {}", webTarget);
 
         webTarget.request().get(new TypeReference<Statistics>() {
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java
index f60a884b0..377d4765c 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java
@@ -8,13 +8,10 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.security.SecureRandom;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
-import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 public class StatsCmdIT extends CmdIT {
@@ -26,24 +23,18 @@ public class StatsCmdIT extends CmdIT {
     public void testStatsStreaming() throws InterruptedException, IOException {
         CountDownLatch countDownLatch = new CountDownLatch(NUM_STATS);
 
-        String containerName = "generated_" + new SecureRandom().nextInt();
-
-        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top")
-                .withName(containerName).exec();
-        LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top").exec();
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        StatsCallbackTest statsCallback = dockerRule.getClient().statsCmd(container.getId()).exec(
-                new StatsCallbackTest(countDownLatch));
-
-        assertTrue(countDownLatch.await(10, TimeUnit.SECONDS));
-        Boolean gotStats = statsCallback.gotStats();
-
-        LOG.info("Stop stats collection");
+        boolean gotStats = false;
+        try (StatsCallbackTest statsCallback = dockerRule.getClient().statsCmd(container.getId()).exec(
+                new StatsCallbackTest(countDownLatch))) {
+            assertTrue(countDownLatch.await(10, TimeUnit.SECONDS));
+            gotStats = statsCallback.gotStats();
 
-        statsCallback.close();
+            LOG.info("Stop stats collection");
+        }
 
         LOG.info("Stopping container");
         dockerRule.getClient().stopContainerCmd(container.getId()).exec();
@@ -51,7 +42,29 @@ public void testStatsStreaming() throws InterruptedException, IOException {
 
         LOG.info("Completed test");
         assertTrue("Expected true", gotStats);
+    }
 
+    @Test
+    public void testStatsNoStreaming() throws InterruptedException, IOException {
+        CountDownLatch countDownLatch = new CountDownLatch(NUM_STATS);
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top").exec();
+
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        try (StatsCallbackTest statsCallback = dockerRule.getClient().statsCmd(container.getId()).withNoStream(true).exec(
+                new StatsCallbackTest(countDownLatch))) {
+            countDownLatch.await(5, TimeUnit.SECONDS);
+
+            LOG.info("Stop stats collection");
+        }
+
+        LOG.info("Stopping container");
+        dockerRule.getClient().stopContainerCmd(container.getId()).exec();
+        dockerRule.getClient().removeContainerCmd(container.getId()).exec();
+
+        LOG.info("Completed test");
+        assertEquals("Expected stats called only once", countDownLatch.getCount(), NUM_STATS - 1);
     }
 
     private class StatsCallbackTest extends ResultCallbackTemplate<StatsCallbackTest, Statistics> {

From 23ad597c2755db56ae2b298a2fb7080754345a7f Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Fri, 14 Feb 2020 23:31:25 +0100
Subject: [PATCH 0965/1272] do not store default properties in
 `docker-java.properties` file (#1311)

---
 .../core/DefaultDockerClientConfig.java        | 18 ++++++++++++++----
 .../src/main/resources/docker-java.properties  | 11 -----------
 2 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 docker-java/src/main/resources/docker-java.properties

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index 44f54bddb..f552ea626 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -56,6 +56,8 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf
 
     private static final Set<String> CONFIG_KEYS = new HashSet<>();
 
+    private static final Properties DEFAULT_PROPERTIES = new Properties();
+
     static {
         CONFIG_KEYS.add(DOCKER_HOST);
         CONFIG_KEYS.add(DOCKER_TLS_VERIFY);
@@ -66,6 +68,11 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf
         CONFIG_KEYS.add(REGISTRY_PASSWORD);
         CONFIG_KEYS.add(REGISTRY_EMAIL);
         CONFIG_KEYS.add(REGISTRY_URL);
+
+        DEFAULT_PROPERTIES.put(DOCKER_HOST, "unix:///var/run/docker.sock");
+        DEFAULT_PROPERTIES.put(DOCKER_CONFIG, "${user.home}/.docker");
+        DEFAULT_PROPERTIES.put(REGISTRY_URL, "https://index.docker.io/v1/");
+        DEFAULT_PROPERTIES.put(REGISTRY_USERNAME, "${user.name}");
     }
 
     private final URI dockerHost;
@@ -100,14 +107,17 @@ private URI checkDockerHostScheme(URI dockerHost) {
     }
 
     private static Properties loadIncludedDockerProperties(Properties systemProperties) {
+        Properties p = new Properties();
+        p.putAll(DEFAULT_PROPERTIES);
         try (InputStream is = DefaultDockerClientConfig.class.getResourceAsStream("/" + DOCKER_JAVA_PROPERTIES)) {
-            Properties p = new Properties();
-            p.load(is);
-            replaceProperties(p, systemProperties);
-            return p;
+            if (is != null) {
+                p.load(is);
+            }
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
+        replaceProperties(p, systemProperties);
+        return p;
     }
 
     private static void replaceProperties(Properties properties, Properties replacements) {
diff --git a/docker-java/src/main/resources/docker-java.properties b/docker-java/src/main/resources/docker-java.properties
deleted file mode 100644
index fc9209c97..000000000
--- a/docker-java/src/main/resources/docker-java.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-DOCKER_HOST=unix:///var/run/docker.sock
-DOCKER_CONFIG=${user.home}/.docker
-#DOCKER_TLS_VERIFY=1
-#DOCKER_CERT_PATH=${user.home}/.docker/certs
-
-api.version=
-registry.url=https://index.docker.io/v1/
-registry.username=${user.name}
-#registry.password=
-#registry.email=
-

From 33ebafbf85d2380461e336da807c50527c25a084 Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@users.noreply.github.com>
Date: Sat, 15 Feb 2020 00:32:11 +0200
Subject: [PATCH 0966/1272] Make Ulimit use Long to hold soft/hard values
 exceeding Integer bounds (#1302)

- core ulimits can exceed integer bounds
- preserve binary compatibility of Ulimit class so that API doesn't break
- preserve JSON serdes of Ulimit class
- fixes #1088
---
 .../github/dockerjava/api/model/Ulimit.java   | 32 ++++++++++++++---
 .../dockerjava/api/model/UlimitsTest.java     | 36 +++++++++++++++++++
 .../dockerjava/cmd/CreateContainerCmdIT.java  | 22 ++++++++++++
 3 files changed, 85 insertions(+), 5 deletions(-)
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/api/model/UlimitsTest.java

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java
index b71c8c40a..ab21cb36f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java
@@ -1,6 +1,9 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -11,6 +14,7 @@
 /**
  * @author Vangie Du (duwan@live.com)
  */
+@JsonPropertyOrder({"Name", "Soft", "Hard"})
 @EqualsAndHashCode
 @ToString
 public class Ulimit implements Serializable {
@@ -19,16 +23,20 @@ public class Ulimit implements Serializable {
     @JsonProperty("Name")
     private String name;
 
-    @JsonProperty("Soft")
-    private Integer soft;
+    private Long soft;
 
-    @JsonProperty("Hard")
-    private Integer hard;
+    private Long hard;
 
     public Ulimit() {
     }
 
+    @Deprecated
     public Ulimit(String name, int soft, int hard) {
+        this(name, (long) soft, (long) hard);
+    }
+
+    @JsonCreator
+    public Ulimit(@JsonProperty("Name") String name, @JsonProperty("Soft") long soft, @JsonProperty("Hard") long hard) {
         requireNonNull(name, "Name is null");
         this.name = name;
         this.soft = soft;
@@ -39,11 +47,25 @@ public String getName() {
         return name;
     }
 
+    @Deprecated
+    @JsonIgnore
     public Integer getSoft() {
-        return soft;
+        return soft != null ? soft.intValue() : null;
     }
 
+    @Deprecated
+    @JsonIgnore
     public Integer getHard() {
+        return hard != null ? hard.intValue() : null;
+    }
+
+    @JsonProperty("Soft")
+    public Long getSoftLong() {
+        return soft;
+    }
+
+    @JsonProperty("Hard")
+    public Long getHardLong() {
         return hard;
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/UlimitsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/UlimitsTest.java
new file mode 100644
index 000000000..6c2f23655
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/UlimitsTest.java
@@ -0,0 +1,36 @@
+package com.github.dockerjava.api.model;
+
+import com.github.dockerjava.test.serdes.JSONTestHelper;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.arrayContaining;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
+public class UlimitsTest {
+
+    @Test
+    public void usesToJson() throws Exception {
+        Ulimit[] ulimits = new Ulimit[]{
+                new Ulimit("nproc", 709, 1026),
+                new Ulimit("nofile", 1024, 4096),
+                new Ulimit("core", 99999999998L, 99999999999L)
+        };
+        String json = JSONTestHelper.getMapper().writeValueAsString(ulimits);
+
+        assertThat(json, is("[{\"Name\":\"nproc\",\"Soft\":709,\"Hard\":1026},{\"Name\":\"nofile\",\"Soft\":1024,\"Hard\":4096},{\"Name\":\"core\",\"Soft\":99999999998,\"Hard\":99999999999}]"));
+    }
+
+    @Test
+    public void usesFromJson() throws Exception {
+        Ulimit[] ulimits = JSONTestHelper.getMapper().readValue("[{\"Name\":\"nproc\",\"Soft\":709,\"Hard\":1026},{\"Name\":\"nofile\",\"Soft\":1024,\"Hard\":4096},{\"Name\":\"core\",\"Soft\":99999999998,\"Hard\":99999999999}]", Ulimit[].class);
+
+        assertThat(ulimits, notNullValue());
+        assertThat(ulimits, arrayContaining(
+                new Ulimit("nproc", 709, 1026),
+                new Ulimit("nofile", 1024, 4096),
+                new Ulimit("core", 99999999998L, 99999999999L)
+        ));
+    }
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index 559333fa8..6a048b4aa 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -831,6 +831,28 @@ public void createContainerWithULimits() throws DockerException {
 
     }
 
+    @Test
+    public void createContainerWithIntegerBoundsExceedingULimit() throws DockerException {
+        String containerName = "containercoreulimit" + dockerRule.getKind();
+        Ulimit[] ulimits = {new Ulimit("core", 99999999998L, 99999999999L)};
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withName(containerName)
+                .withHostConfig(newHostConfig()
+                        .withUlimits(ulimits))
+                .exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(isEmptyString()));
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+
+        assertThat(Arrays.asList(inspectContainerResponse.getHostConfig().getUlimits()),
+                contains(new Ulimit("core", 99999999998L, 99999999999L)));
+
+    }
+
     @Test
     public void createContainerWithLabels() throws DockerException {
 

From bfdbbbbc930e97f8a45dde90957217e6ea404ae9 Mon Sep 17 00:00:00 2001
From: Andrii Mazurok <andrew_maz@ukr.net>
Date: Sat, 15 Feb 2020 20:35:45 +0200
Subject: [PATCH 0967/1272] Labels for volume has been added (#1320)

---
 .../dockerjava/api/command/CreateVolumeCmd.java   |  9 +++++++++
 .../api/command/CreateVolumeResponse.java         |  9 +++++++++
 .../api/command/InspectVolumeResponse.java        |  9 +++++++++
 .../core/command/CreateVolumeCmdImpl.java         | 15 +++++++++++++++
 .../github/dockerjava/cmd/CreateVolumeCmdIT.java  | 11 ++++++++---
 .../github/dockerjava/cmd/InspectVolumeCmdIT.java |  6 +++++-
 .../github/dockerjava/cmd/ListVolumesCmdIT.java   |  5 ++++-
 .../github/dockerjava/cmd/RemoveVolumeCmdIT.java  |  6 +++++-
 8 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java
index 3d052033f..4a3ef9819 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java
@@ -9,6 +9,9 @@ public interface CreateVolumeCmd extends SyncDockerCmd<CreateVolumeResponse> {
     @CheckForNull
     String getName();
 
+    @CheckForNull
+    Map<String, String> getLabels();
+
     @CheckForNull
     String getDriver();
 
@@ -21,6 +24,12 @@ public interface CreateVolumeCmd extends SyncDockerCmd<CreateVolumeResponse> {
      */
     CreateVolumeCmd withName(String name);
 
+    /**
+     * @param labels
+     *            - A mapping of labels keys and values. Labels are a mechanism for applying metadata to Docker objects.
+     */
+    CreateVolumeCmd withLabels(Map<String, String> labels);
+
     /**
      * @param driver
      *            - Name of the volume driver to use. Defaults to local for the name.
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
index a6dffb94d..9c31b8dc4 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
@@ -4,6 +4,8 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import java.util.Map;
+
 /**
  *
  * @author Marcus Linke
@@ -15,6 +17,9 @@ public class CreateVolumeResponse {
     @JsonProperty("Name")
     private String name;
 
+    @JsonProperty("Labels")
+    private Map<String, String> labels;
+
     @JsonProperty("Driver")
     private String driver;
 
@@ -25,6 +30,10 @@ public String getName() {
         return name;
     }
 
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
     public String getDriver() {
         return driver;
     }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
index 020e0f9ae..c79232811 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
@@ -4,6 +4,8 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import java.util.Map;
+
 /**
  *
  * @author Marcus Linke
@@ -15,6 +17,9 @@ public class InspectVolumeResponse {
     @JsonProperty("Name")
     private String name;
 
+    @JsonProperty("Labels")
+    private Map<String, String> labels;
+
     @JsonProperty("Driver")
     private String driver;
 
@@ -25,6 +30,10 @@ public String getName() {
         return name;
     }
 
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
     public String getDriver() {
         return driver;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java
index 46b12ebea..48dbcfa1e 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java
@@ -19,6 +19,9 @@ public class CreateVolumeCmdImpl extends AbstrDockerCmd<CreateVolumeCmd, CreateV
     @JsonProperty("Name")
     private String name;
 
+    @JsonProperty("Labels")
+    private Map<String, String> labels;
+
     @JsonProperty("Driver")
     private String driver;
 
@@ -34,6 +37,11 @@ public String getName() {
         return name;
     }
 
+    @Override
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
     @Override
     public String getDriver() {
         return driver;
@@ -51,6 +59,13 @@ public CreateVolumeCmdImpl withName(String name) {
         return this;
     }
 
+    @Override
+    public CreateVolumeCmdImpl withLabels(Map<String, String> labels) {
+        checkNotNull(labels, "labels was not specified");
+        this.labels = labels;
+        return this;
+    }
+
     @Override
     public CreateVolumeCmdImpl withDriver(String driver) {
         checkNotNull(driver, "driver was not specified");
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateVolumeCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateVolumeCmdIT.java
index 951b1ed6d..f59907afa 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateVolumeCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateVolumeCmdIT.java
@@ -4,6 +4,8 @@
 import com.github.dockerjava.api.exception.DockerException;
 import org.junit.Test;
 
+import java.util.Collections;
+
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
@@ -16,10 +18,11 @@ public void createVolume() throws DockerException {
         String volumeName = "volume1";
 
         CreateVolumeResponse createVolumeResponse = dockerRule.getClient().createVolumeCmd().withName(volumeName)
-                .withDriver("local").exec();
+                .withDriver("local").withLabels(Collections.singletonMap("is-timelord", "yes")).exec();
 
         assertThat(createVolumeResponse.getName(), equalTo(volumeName));
         assertThat(createVolumeResponse.getDriver(), equalTo("local"));
+        assertThat(createVolumeResponse.getLabels(), equalTo(Collections.singletonMap("is-timelord", "yes")));
         assertThat(createVolumeResponse.getMountpoint(), containsString("/volume1/"));
     }
 
@@ -29,17 +32,19 @@ public void createVolumeWithExistingName() throws DockerException {
         String volumeName = "volume1";
 
         CreateVolumeResponse createVolumeResponse1 = dockerRule.getClient().createVolumeCmd().withName(volumeName)
-                .withDriver("local").exec();
+                .withDriver("local").withLabels(Collections.singletonMap("is-timelord", "yes")).exec();
 
         assertThat(createVolumeResponse1.getName(), equalTo(volumeName));
         assertThat(createVolumeResponse1.getDriver(), equalTo("local"));
+        assertThat(createVolumeResponse1.getLabels(), equalTo(Collections.singletonMap("is-timelord", "yes")));
         assertThat(createVolumeResponse1.getMountpoint(), containsString("/volume1/"));
 
         CreateVolumeResponse createVolumeResponse2 = dockerRule.getClient().createVolumeCmd().withName(volumeName)
-                .withDriver("local").exec();
+                .withDriver("local").withLabels(Collections.singletonMap("is-timelord", "yes")).exec();
 
         assertThat(createVolumeResponse2.getName(), equalTo(volumeName));
         assertThat(createVolumeResponse2.getDriver(), equalTo("local"));
+        assertThat(createVolumeResponse2.getLabels(), equalTo(Collections.singletonMap("is-timelord", "yes")));
         assertThat(createVolumeResponse2.getMountpoint(), equalTo(createVolumeResponse1.getMountpoint()));
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectVolumeCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectVolumeCmdIT.java
index 20e56dceb..2e9b806b2 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectVolumeCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectVolumeCmdIT.java
@@ -5,6 +5,8 @@
 import com.github.dockerjava.api.exception.NotFoundException;
 import org.junit.Test;
 
+import java.util.Collections;
+
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
@@ -16,12 +18,14 @@ public void inspectVolume() throws DockerException {
 
         String volumeName = "volume1";
 
-        dockerRule.getClient().createVolumeCmd().withName(volumeName).withDriver("local").exec();
+        dockerRule.getClient().createVolumeCmd().withName(volumeName).withDriver("local")
+                .withLabels(Collections.singletonMap("is-timelord", "yes")).exec();
 
         InspectVolumeResponse inspectVolumeResponse = dockerRule.getClient().inspectVolumeCmd(volumeName).exec();
 
         assertThat(inspectVolumeResponse.getName(), equalTo("volume1"));
         assertThat(inspectVolumeResponse.getDriver(), equalTo("local"));
+        assertThat(inspectVolumeResponse.getLabels(), equalTo(Collections.singletonMap("is-timelord", "yes")));
         assertThat(inspectVolumeResponse.getMountpoint(), containsString("/volume1/"));
     }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListVolumesCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListVolumesCmdIT.java
index a54ae33da..df073e16d 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListVolumesCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListVolumesCmdIT.java
@@ -5,6 +5,8 @@
 import com.github.dockerjava.api.exception.DockerException;
 import org.junit.Test;
 
+import java.util.Collections;
+
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
@@ -16,10 +18,11 @@ public class ListVolumesCmdIT extends CmdIT {
     public void listVolumes() throws DockerException {
 
         CreateVolumeResponse createVolumeResponse = dockerRule.getClient().createVolumeCmd().withName("volume1")
-                .withDriver("local").exec();
+                .withDriver("local").withLabels(Collections.singletonMap("is-timelord", "yes")).exec();
 
         assertThat(createVolumeResponse.getName(), equalTo("volume1"));
         assertThat(createVolumeResponse.getDriver(), equalTo("local"));
+        assertThat(createVolumeResponse.getLabels(), equalTo(Collections.singletonMap("is-timelord", "yes")));
         assertThat(createVolumeResponse.getMountpoint(), containsString("/volume1/"));
 
         ListVolumesResponse listVolumesResponse = dockerRule.getClient().listVolumesCmd().exec();
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java
index 562e43c4c..76037e1e3 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java
@@ -5,6 +5,8 @@
 import com.github.dockerjava.api.exception.NotFoundException;
 import org.junit.Test;
 
+import java.util.Collections;
+
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
@@ -19,10 +21,12 @@ public void removeVolume() throws DockerException {
 
         CreateVolumeResponse createVolumeResponse = dockerRule.getClient().createVolumeCmd()
                 .withName(volumeName)
-                .withDriver("local").exec();
+                .withDriver("local")
+                .withLabels(Collections.singletonMap("is-timelord", "yes")).exec();
 
         assertThat(createVolumeResponse.getName(), equalTo(volumeName));
         assertThat(createVolumeResponse.getDriver(), equalTo("local"));
+        assertThat(createVolumeResponse.getLabels(), equalTo(Collections.singletonMap("is-timelord", "yes")));
         assertThat(createVolumeResponse.getMountpoint(), containsString(volumeName));
 
         dockerRule.getClient().removeVolumeCmd(volumeName).exec();

From 69f0d428e5e82c716f5becfd58c5b8d916186355 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 15 Feb 2020 22:16:29 +0300
Subject: [PATCH 0968/1272] [maven-release-plugin] prepare release 3.2.0-rc4

---
 docker-java-api/pom.xml              | 2 +-
 docker-java-core/pom.xml             | 2 +-
 docker-java-transport-jersey/pom.xml | 2 +-
 docker-java-transport-netty/pom.xml  | 2 +-
 docker-java-transport-okhttp/pom.xml | 2 +-
 docker-java/pom.xml                  | 2 +-
 pom.xml                              | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index bade957b7..275a6ed1a 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc4</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index 3fa7ce306..3ccdf8510 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc4</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index 295440266..8cf46217c 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc4</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml
index 91483c167..9e7eb9a90 100644
--- a/docker-java-transport-netty/pom.xml
+++ b/docker-java-transport-netty/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc4</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index a4642dff9..03b4cdfbf 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc4</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 5336a4b08..91ea721b9 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc4</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index 2149f8624..06c69098a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.2.0-SNAPSHOT</version>
+	<version>3.2.0-rc4</version>
 
 	<name>docker-java-parent</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.2.0-rc4</tag>
 	</scm>
 
 	<developers>

From 79206527d594c6598ed13842aa4e199578a2c676 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sat, 15 Feb 2020 22:16:41 +0300
Subject: [PATCH 0969/1272] [maven-release-plugin] prepare for next development
 iteration

---
 docker-java-api/pom.xml              | 2 +-
 docker-java-core/pom.xml             | 2 +-
 docker-java-transport-jersey/pom.xml | 2 +-
 docker-java-transport-netty/pom.xml  | 2 +-
 docker-java-transport-okhttp/pom.xml | 2 +-
 docker-java/pom.xml                  | 2 +-
 pom.xml                              | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 275a6ed1a..bade957b7 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc4</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index 3ccdf8510..3fa7ce306 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc4</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index 8cf46217c..295440266 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc4</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml
index 9e7eb9a90..91483c167 100644
--- a/docker-java-transport-netty/pom.xml
+++ b/docker-java-transport-netty/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc4</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index 03b4cdfbf..a4642dff9 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc4</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 91ea721b9..5336a4b08 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc4</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index 06c69098a..2149f8624 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.2.0-rc4</version>
+	<version>3.2.0-SNAPSHOT</version>
 
 	<name>docker-java-parent</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.2.0-rc4</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 35ad7d997bd6679cbc2685224cda49c4e17873a0 Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@symphonious.net>
Date: Sun, 16 Feb 2020 05:27:44 +1000
Subject: [PATCH 0970/1272] Add local enum value to LoggingType. (#1307)

Fixes #1306

Signed-off-by: Adrian Sutton <adrian.sutton@consensys.net>
---
 .../src/main/java/com/github/dockerjava/api/model/LogConfig.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java
index 4ea19041e..c2cd0efc8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java
@@ -62,6 +62,7 @@ public LogConfig setConfig(Map<String, String> config) {
     public enum LoggingType {
         NONE("none"),
         DEFAULT("json-file"),
+        LOCAL("local"),
         ETWLOGS("etwlogs"),
         JSON_FILE("json-file"),
         SYSLOG("syslog"),

From 9be9c5e5d0f673a5b7ac417bf4a0f930b185f734 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Mon, 17 Feb 2020 21:33:26 +0100
Subject: [PATCH 0971/1272] Move callbacks to the API package, add
 `ResultCallback.Adapter` (#1321)

These classes belong to the API and essential for calling some of the API methods.

Also, sometimes they are not needed, actually, but the current API (`ResultCallbackTemplate`) is hard to use due to the generic signature, hence the addition of `ResultCallback.Adapter`.
---
 .../dockerjava/api/async/ResultCallback.java  |   8 ++
 .../api/command/AsyncDockerCmd.java           |   4 +
 .../dockerjava/api/command/BuildImageCmd.java |   5 +
 .../api/command/BuildImageResultCallback.java |  80 +++++++++++++
 .../dockerjava/api/command/PullImageCmd.java  |   6 +
 .../api/command/PullImageResultCallback.java  | 113 ++++++++++++++++++
 .../dockerjava/api/command/PushImageCmd.java  |  27 +++++
 .../api/command/WaitContainerCmd.java         |   5 +
 .../command/WaitContainerResultCallback.java  |  74 ++++++++++++
 .../AttachContainerResultCallback.java        |   1 +
 .../command/BuildImageResultCallback.java     |   1 +
 .../core/command/EventsResultCallback.java    |   1 +
 .../core/command/ExecStartResultCallback.java |   1 +
 .../command/LogContainerResultCallback.java   |   1 +
 .../core/command/PullImageResultCallback.java |   1 +
 .../core/command/PushImageResultCallback.java |   1 +
 .../command/WaitContainerResultCallback.java  |   1 +
 .../dockerjava/cmd/AttachContainerCmdIT.java  |  10 +-
 .../dockerjava/cmd/BuildImageCmdIT.java       |  31 +++--
 .../github/dockerjava/cmd/CommitCmdIT.java    |   3 +-
 .../dockerjava/cmd/ContainerDiffCmdIT.java    |   3 +-
 .../cmd/CopyArchiveToContainerCmdIT.java      |   3 +-
 .../dockerjava/cmd/CreateContainerCmdIT.java  |   4 +-
 .../github/dockerjava/cmd/EventsCmdIT.java    |   7 +-
 .../dockerjava/cmd/ListContainersCmdIT.java   |   6 +-
 .../dockerjava/cmd/LogContainerCmdIT.java     |   5 +-
 .../github/dockerjava/cmd/PullImageCmdIT.java |  13 +-
 .../github/dockerjava/cmd/PushImageCmdIT.java |  14 +--
 .../cmd/RemoveContainerCmdImplIT.java         |   5 +-
 .../dockerjava/cmd/StartContainerCmdIT.java   |   5 +-
 .../dockerjava/cmd/WaitContainerCmdIT.java    |  14 +--
 .../cmd/swarm/JoinSwarmCmdExecIT.java         |   4 +-
 .../cmd/swarm/ListServicesCmdExecIT.java      |   2 +-
 .../dockerjava/cmd/swarm/SwarmCmdIT.java      |   7 +-
 .../cmd/swarm/UpdateSwarmNodeIT.java          |   2 +-
 .../cmd/swarm/UpdateSwarmServiceIT.java       |   2 +-
 .../core/command/DockerfileFixture.java       |   3 +-
 .../core/command/FrameReaderITest.java        |   5 +-
 .../github/dockerjava/junit/DockerRule.java   |   8 +-
 .../dockerjava/junit/PrivateRegistryRule.java |   6 +-
 .../utils/LogContainerTestCallback.java       |   4 +-
 41 files changed, 403 insertions(+), 93 deletions(-)
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerResultCallback.java

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
index 5b9fdb81c..6a244d620 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
@@ -6,6 +6,14 @@
  * Result callback
  */
 public interface ResultCallback<A_RES_T> extends Closeable {
+
+    class Adapter<A_RES_T> extends ResultCallbackTemplate<Adapter<A_RES_T>, A_RES_T> {
+        @Override
+        public void onNext(A_RES_T object) {
+
+        }
+    }
+
     /**
      * Called when the async processing starts respectively when the response arrives from the server. The passed {@link Closeable} can be
      * used to close/interrupt the processing.
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
index 3218a8419..b2f287cc2 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
@@ -4,6 +4,7 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.async.ResultCallbackTemplate;
 
 /**
  *
@@ -15,4 +16,7 @@ public interface AsyncDockerCmd<CMD_T extends AsyncDockerCmd<CMD_T, A_RES_T>, A_
 
     <T extends ResultCallback<A_RES_T>> T exec(T resultCallback);
 
+    default ResultCallbackTemplate<?, A_RES_T> start() {
+        return exec(new ResultCallback.Adapter<>());
+    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 9cf1da7aa..2556930c0 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -223,6 +223,11 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
      */
     BuildImageCmd withTarget(String target);
 
+    @Override
+    default BuildImageResultCallback start() {
+        return exec(new BuildImageResultCallback());
+    }
+
     interface Exec extends DockerCmdAsyncExec<BuildImageCmd, BuildResponseItem> {
     }
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java
new file mode 100644
index 000000000..0bb0f0884
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java
@@ -0,0 +1,80 @@
+/*
+ * Created on 21.07.2015
+ */
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.async.ResultCallbackTemplate;
+import com.github.dockerjava.api.exception.DockerClientException;
+import com.github.dockerjava.api.model.BuildResponseItem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ *
+ * @author Marcus Linke
+ *
+ */
+public class BuildImageResultCallback extends ResultCallbackTemplate<BuildImageResultCallback, BuildResponseItem> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageResultCallback.class);
+
+    private String imageId;
+
+    private String error;
+
+    @Override
+    public void onNext(BuildResponseItem item) {
+        if (item.isBuildSuccessIndicated()) {
+            this.imageId = item.getImageId();
+        } else if (item.isErrorIndicated()) {
+            this.error = item.getError();
+        }
+        LOGGER.debug(item.toString());
+    }
+
+    /**
+     * Awaits the image id from the response stream.
+     *
+     * @throws DockerClientException
+     *             if the build fails.
+     */
+    public String awaitImageId() {
+        try {
+            awaitCompletion();
+        } catch (InterruptedException e) {
+            throw new DockerClientException("", e);
+        }
+
+        return getImageId();
+    }
+
+    /**
+     * Awaits the image id from the response stream.
+     *
+     * @throws DockerClientException
+     *             if the build fails or the timeout occurs.
+     */
+    public String awaitImageId(long timeout, TimeUnit timeUnit) {
+        try {
+            awaitCompletion(timeout, timeUnit);
+        } catch (InterruptedException e) {
+            throw new DockerClientException("Awaiting image id interrupted: ", e);
+        }
+
+        return getImageId();
+    }
+
+    private String getImageId() {
+        if (imageId != null) {
+            return imageId;
+        }
+
+        if (error == null) {
+            throw new DockerClientException("Could not build image");
+        }
+
+        throw new DockerClientException("Could not build image: " + error);
+    }
+}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
index cc95161a5..d86bddfe3 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.command;
 
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PullResponseItem;
 
@@ -41,6 +42,11 @@ public interface PullImageCmd extends AsyncDockerCmd<PullImageCmd, PullResponseI
 
     PullImageCmd withAuthConfig(AuthConfig authConfig);
 
+    @Override
+    default ResultCallback.Adapter<PullResponseItem> start() {
+        return exec(new PullImageResultCallback());
+    }
+
     interface Exec extends DockerCmdAsyncExec<PullImageCmd, PullResponseItem> {
     }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java
new file mode 100644
index 000000000..e0a405e43
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java
@@ -0,0 +1,113 @@
+/*
+ * Created on 21.07.2015
+ */
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.exception.DockerClientException;
+import com.github.dockerjava.api.model.PullResponseItem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.CheckForNull;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @author Marcus Linke
+ *
+ */
+class PullImageResultCallback extends ResultCallback.Adapter<PullResponseItem> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PullImageResultCallback.class);
+
+    private boolean isSwarm = false;
+    private Map<String, PullResponseItem> results = null;
+
+    @CheckForNull
+    private PullResponseItem latestItem = null;
+
+    @Override
+    public void onNext(PullResponseItem item) {
+        // only do it once
+        if (results == null && latestItem == null) {
+            checkForDockerSwarmResponse(item);
+        }
+
+        if (isSwarm) {
+            handleDockerSwarmResponse(item);
+        } else {
+            handleDockerClientResponse(item);
+        }
+
+        LOGGER.debug(item.toString());
+    }
+
+    private void checkForDockerSwarmResponse(PullResponseItem item) {
+        if (item.getStatus().matches("Pulling\\s.+\\.{3}$")) {
+            isSwarm = true;
+            LOGGER.debug("Communicating with Docker Swarm.");
+        }
+    }
+
+    private void handleDockerSwarmResponse(final PullResponseItem item) {
+        if (results == null) {
+            results = new HashMap<>();
+        }
+
+        // Swarm terminates a pull sometimes with an empty line.
+        // Therefore keep first success message
+        PullResponseItem currentItem = results.get(item.getId());
+        if (currentItem == null || !currentItem.isPullSuccessIndicated()) {
+            results.put(item.getId(), item);
+        }
+    }
+
+    private void handleDockerClientResponse(PullResponseItem item) {
+        latestItem = item;
+    }
+
+    private void checkDockerSwarmPullSuccessful() {
+        if (results.isEmpty()) {
+            throw new DockerClientException("Could not pull image through Docker Swarm");
+        } else {
+            boolean pullFailed = false;
+            StringBuilder sb = new StringBuilder();
+
+            for (PullResponseItem pullResponseItem : results.values()) {
+                if (!pullResponseItem.isPullSuccessIndicated()) {
+                    pullFailed = true;
+                    sb.append("[" + pullResponseItem.getId() + ":" + messageFromPullResult(pullResponseItem) + "]");
+                }
+            }
+
+            if (pullFailed) {
+                throw new DockerClientException("Could not pull image: " + sb.toString());
+            }
+        }
+    }
+
+    private void checkDockerClientPullSuccessful() {
+        if (latestItem == null) {
+            throw new DockerClientException("Could not pull image");
+        } else if (!latestItem.isPullSuccessIndicated()) {
+            throw new DockerClientException("Could not pull image: " + messageFromPullResult(latestItem));
+        }
+    }
+
+    private String messageFromPullResult(PullResponseItem pullResponseItem) {
+        return (pullResponseItem.getError() != null) ? pullResponseItem.getError() : pullResponseItem.getStatus();
+    }
+
+    @Override
+    protected void throwFirstError() {
+        super.throwFirstError();
+
+        if (isSwarm) {
+            checkDockerSwarmPullSuccessful();
+        } else {
+            checkDockerClientPullSuccessful();
+        }
+    }
+}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
index abd86c53c..01f9d0567 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
@@ -2,8 +2,10 @@
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PushResponseItem;
@@ -46,6 +48,31 @@ public interface PushImageCmd extends AsyncDockerCmd<PushImageCmd, PushResponseI
     @Override
     <T extends ResultCallback<PushResponseItem>> T exec(T resultCallback);
 
+    @Override
+    default ResultCallback.Adapter<PushResponseItem> start() {
+        return exec(new ResultCallback.Adapter<PushResponseItem>() {
+
+            @Nullable
+            private PushResponseItem latestItem = null;
+
+            @Override
+            public void onNext(PushResponseItem item) {
+                this.latestItem = item;
+            }
+
+            @Override
+            protected void throwFirstError() {
+                super.throwFirstError();
+
+                if (latestItem == null) {
+                    throw new DockerClientException("Could not push image");
+                } else if (latestItem.isErrorIndicated()) {
+                    throw new DockerClientException("Could not push image: " + latestItem.getError());
+                }
+            }
+        });
+    }
+
     interface Exec extends DockerCmdAsyncExec<PushImageCmd, PushResponseItem> {
     }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
index daa4e5d3c..3117cf7e4 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
@@ -26,6 +26,11 @@ public interface WaitContainerCmd extends AsyncDockerCmd<WaitContainerCmd, WaitR
     @Override
     <T extends ResultCallback<WaitResponse>> T exec(T resultCallback);
 
+    @Override
+    default WaitContainerResultCallback start() {
+        return exec(new WaitContainerResultCallback());
+    }
+
     interface Exec extends DockerCmdAsyncExec<WaitContainerCmd, WaitResponse> {
     }
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerResultCallback.java
new file mode 100644
index 000000000..b4a6d3cc6
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerResultCallback.java
@@ -0,0 +1,74 @@
+/*
+ * Created on 21.07.2015
+ */
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.async.ResultCallbackTemplate;
+import com.github.dockerjava.api.exception.DockerClientException;
+import com.github.dockerjava.api.model.WaitResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.CheckForNull;
+import java.util.concurrent.TimeUnit;
+
+/**
+ *
+ * @author Marcus Linke
+ *
+ */
+public class WaitContainerResultCallback extends ResultCallbackTemplate<WaitContainerResultCallback, WaitResponse> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(WaitContainerResultCallback.class);
+
+    @CheckForNull
+    private WaitResponse waitResponse = null;
+
+    @Override
+    public void onNext(WaitResponse waitResponse) {
+        this.waitResponse = waitResponse;
+        LOGGER.debug(waitResponse.toString());
+    }
+
+    /**
+     * Awaits the status code from the container.
+     *
+     * @throws DockerClientException
+     *             if the wait operation fails.
+     */
+    public Integer awaitStatusCode() {
+        try {
+            awaitCompletion();
+        } catch (InterruptedException e) {
+            throw new DockerClientException("", e);
+        }
+
+        return getStatusCode();
+    }
+
+    /**
+     * Awaits the status code from the container.
+     *
+     * @throws DockerClientException
+     *             if the wait operation fails.
+     */
+    public Integer awaitStatusCode(long timeout, TimeUnit timeUnit) {
+        try {
+            if (!awaitCompletion(timeout, timeUnit)) {
+                throw new DockerClientException("Awaiting status code timeout.");
+            }
+        } catch (InterruptedException e) {
+            throw new DockerClientException("Awaiting status code interrupted: ", e);
+        }
+
+        return getStatusCode();
+    }
+
+    private Integer getStatusCode() {
+        if (waitResponse == null) {
+            throw new DockerClientException("Error while wait container");
+        } else {
+            return waitResponse.getStatusCode();
+        }
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
index bddddfd4f..f445789fc 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
@@ -14,6 +14,7 @@
  * @author Marcus Linke
  *
  */
+@Deprecated
 public class AttachContainerResultCallback extends ResultCallbackTemplate<AttachContainerResultCallback, Frame> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AttachContainerResultCallback.class);
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
index e622c4725..fbe22170c 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
@@ -17,6 +17,7 @@
  * @author Marcus Linke
  *
  */
+@Deprecated
 public class BuildImageResultCallback extends ResultCallbackTemplate<BuildImageResultCallback, BuildResponseItem> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageResultCallback.class);
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
index cd6205f6d..45b5b83e9 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
@@ -14,6 +14,7 @@
  * @author Marcus Linke
  *
  */
+@Deprecated
 public class EventsResultCallback extends ResultCallbackTemplate<EventsResultCallback, Event> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(EventsResultCallback.class);
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
index 847d62057..8a8235ac6 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
@@ -14,6 +14,7 @@
  * @author Marcus Linke
  *
  */
+@Deprecated
 public class ExecStartResultCallback extends ResultCallbackTemplate<ExecStartResultCallback, Frame> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ExecStartResultCallback.class);
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
index 677e5fb64..45657bef8 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
@@ -14,6 +14,7 @@
  * @author Marcus Linke
  *
  */
+@Deprecated
 public class LogContainerResultCallback extends ResultCallbackTemplate<LogContainerResultCallback, Frame> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LogContainerResultCallback.class);
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
index eb2c30679..d7bad3256 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
@@ -19,6 +19,7 @@
  * @author Marcus Linke
  *
  */
+@Deprecated
 public class PullImageResultCallback extends ResultCallbackTemplate<PullImageResultCallback, PullResponseItem> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PullImageResultCallback.class);
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
index 5bfec3bf1..3e16eec2f 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
@@ -17,6 +17,7 @@
  * @author Marcus Linke
  *
  */
+@Deprecated
 public class PushImageResultCallback extends ResultCallbackTemplate<PushImageResultCallback, PushResponseItem> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PushImageResultCallback.class);
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
index df415d555..caefc1b49 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
@@ -19,6 +19,7 @@
  * @author Marcus Linke
  *
  */
+@Deprecated
 public class WaitContainerResultCallback extends ResultCallbackTemplate<WaitContainerResultCallback, WaitResponse> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(WaitContainerResultCallback.class);
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
index d630d6687..5444c4012 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
@@ -1,11 +1,11 @@
 package com.github.dockerjava.cmd;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.StreamType;
-import com.github.dockerjava.core.command.AttachContainerResultCallback;
 import org.junit.Assume;
 import org.junit.Rule;
 import org.junit.Test;
@@ -207,7 +207,7 @@ public void onNext(Frame frame) {
     }
 
     /**
-     * {@link AttachContainerResultCallback#onComplete()} should be called immediately after
+     * {@link ResultCallback#onComplete()} should be called immediately after
      * container exit. It was broken for Netty and TLS connection.
      */
     @Test
@@ -222,11 +222,11 @@ public void attachContainerClosesStdoutWhenContainerExits() throws Exception {
 
         CountDownLatch gotLine = new CountDownLatch(1);
         try (
-                AttachContainerResultCallback resultCallback = dockerClient.attachContainerCmd(container.getId())
+                ResultCallback.Adapter<Frame> resultCallback = dockerClient.attachContainerCmd(container.getId())
                         .withStdOut(true)
                         .withStdErr(true)
                         .withFollowStream(true)
-                        .exec(new AttachContainerTestCallback() {
+                        .exec(new ResultCallback.Adapter<Frame>() {
                             @Override
                             public void onNext(Frame item) {
                                 LOG.info("Got frame: {}", item);
@@ -255,7 +255,7 @@ public void onComplete() {
         }
     }
 
-    public static class AttachContainerTestCallback extends AttachContainerResultCallback {
+    public static class AttachContainerTestCallback extends ResultCallback.Adapter<Frame> {
         private StringBuffer log = new StringBuffer();
 
         @Override
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
index b30c26f4b..1431fc2ab 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
@@ -6,9 +6,6 @@
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
-import com.github.dockerjava.core.command.BuildImageResultCallback;
-import com.github.dockerjava.core.command.PushImageResultCallback;
-import com.github.dockerjava.core.command.WaitContainerResultCallback;
 import com.github.dockerjava.core.util.CompressArchiveUtil;
 import com.github.dockerjava.junit.PrivateRegistryRule;
 import net.jcip.annotations.NotThreadSafe;
@@ -96,7 +93,7 @@ public void onBuild() throws Exception {
         dockerRule.getClient().buildImageCmd(baseDir)
                 .withNoCache(true)
                 .withTag("docker-java-onbuild")
-                .exec(new BuildImageResultCallback())
+                .start()
                 .awaitImageId();
 
         baseDir = fileFromBuildTestResource("ONBUILD/child");
@@ -149,7 +146,7 @@ private String dockerfileBuild(File baseDir) throws Exception {
     }
 
     private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
-        String imageId = buildImageCmd.withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
+        String imageId = buildImageCmd.withNoCache(true).start().awaitImageId();
 
         // Create container based on image
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(imageId).exec();
@@ -158,7 +155,7 @@ private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
         assertThat(container.getId(), not(isEmptyString()));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
-        dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
+        dockerRule.getClient().waitContainerCmd(container.getId()).start().awaitStatusCode();
 
         return dockerRule.containerLog(container.getId());
     }
@@ -167,21 +164,21 @@ private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
     public void dockerignoreDockerfileIgnored() throws Exception {
         File baseDir = fileFromBuildTestResource("dockerignore/DockerfileIgnored");
 
-        dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
+        dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).start().awaitImageId();
     }
 
     @Test
     public void dockerignoreDockerfileNotIgnored() throws Exception {
         File baseDir = fileFromBuildTestResource("dockerignore/DockerfileNotIgnored");
 
-        dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
+        dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).start().awaitImageId();
     }
 
     @Test(expected = DockerClientException.class)
     public void dockerignoreInvalidDockerIgnorePattern() throws Exception {
         File baseDir = fileFromBuildTestResource("dockerignore/InvalidDockerignorePattern");
 
-        dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
+        dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).start().awaitImageId();
     }
 
     @Test
@@ -217,7 +214,7 @@ public void fromPrivateRegistry() throws Exception {
         dockerRule.getClient().pushImageCmd(imgName)
                 .withTag("latest")
                 .withAuthConfig(authConfig)
-                .exec(new PushImageResultCallback())
+                .start()
                 .awaitCompletion(30, TimeUnit.SECONDS);
 
         dockerRule.getClient().removeImageCmd(imgName)
@@ -233,7 +230,7 @@ public void fromPrivateRegistry() throws Exception {
         String imageId = dockerRule.getClient().buildImageCmd(baseDir)
                 .withNoCache(true)
                 .withBuildAuthConfigs(authConfigurations)
-                .exec(new BuildImageResultCallback())
+                .start()
                 .awaitImageId();
 
         inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec();
@@ -246,7 +243,7 @@ public void buildArgs() throws Exception {
         File baseDir = fileFromBuildTestResource("buildArgs");
 
         String imageId = dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc !@#$%^&*()_+")
-                .exec(new BuildImageResultCallback())
+                .start()
                 .awaitImageId();
 
         InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec();
@@ -264,7 +261,7 @@ public void labels() throws Exception {
 
         String imageId = dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true)
                 .withLabels(Collections.singletonMap("test", "abc"))
-                .exec(new BuildImageResultCallback())
+                .start()
                 .awaitImageId();
 
         InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec();
@@ -284,7 +281,7 @@ public void multipleTags() throws Exception {
         String imageId = dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true)
                 .withTag("fallback-when-withTags-not-called")
                 .withTags(new HashSet<>(Arrays.asList("docker-java-test:tag1", "docker-java-test:tag2")))
-                .exec(new BuildImageResultCallback())
+                .start()
                 .awaitImageId();
 
         InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec();
@@ -301,14 +298,14 @@ public void cacheFrom() throws Exception {
 
         File baseDir1 = fileFromBuildTestResource("CacheFrom/test1");
         String imageId1 = dockerRule.getClient().buildImageCmd(baseDir1)
-                .exec(new BuildImageResultCallback())
+                .start()
                 .awaitImageId();
         InspectImageResponse inspectImageResponse1 = dockerRule.getClient().inspectImageCmd(imageId1).exec();
         assertThat(inspectImageResponse1, not(nullValue()));
 
         File baseDir2 = fileFromBuildTestResource("CacheFrom/test2");
         String imageId2 = dockerRule.getClient().buildImageCmd(baseDir2).withCacheFrom(new HashSet<>(Arrays.asList(imageId1)))
-                .exec(new BuildImageResultCallback())
+                .start()
                 .awaitImageId();
         InspectImageResponse inspectImageResponse2 = dockerRule.getClient().inspectImageCmd(imageId2).exec();
         assertThat(inspectImageResponse2, not(nullValue()));
@@ -325,7 +322,7 @@ public void quiet() {
         String imageId = dockerRule.getClient()
                 .buildImageCmd(baseDir)
                 .withQuiet(true)
-                .exec(new BuildImageResultCallback())
+                .start()
                 .awaitImageId();
 
         InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec();
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java
index dd4a23b47..f2aa664de 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java
@@ -4,7 +4,6 @@
 import com.github.dockerjava.api.command.InspectImageResponse;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.core.command.WaitContainerResultCallback;
 import com.google.common.collect.ImmutableMap;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -67,7 +66,7 @@ public void commitWithLabels() throws DockerException {
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
         Integer status = dockerRule.getClient().waitContainerCmd(container.getId())
-                .exec(new WaitContainerResultCallback())
+                .start()
                 .awaitStatusCode();
 
         assertThat(status, is(0));
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java
index bf71b2505..30d4853d7 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java
@@ -4,7 +4,6 @@
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.ChangeLog;
-import com.github.dockerjava.core.command.WaitContainerResultCallback;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,7 +28,7 @@ public void testContainerDiff() throws DockerException {
         assertThat(container.getId(), not(isEmptyString()));
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+        int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).start()
                 .awaitStatusCode();
         assertThat(exitCode, equalTo(0));
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
index 3adfe0514..307c1e17c 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
@@ -3,7 +3,6 @@
 import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.core.command.WaitContainerResultCallback;
 import com.github.dockerjava.core.util.CompressArchiveUtil;
 import org.apache.commons.io.FileUtils;
 import org.junit.Test;
@@ -138,7 +137,7 @@ public void copyFileWithExecutePermission() throws Exception {
                 .exec();
         // await exid code
         int exitCode = dockerRule.getClient().waitContainerCmd(container.getId())
-                .exec(new WaitContainerResultCallback())
+                .start()
                 .awaitStatusCode();
         // check result
         assertThat(exitCode, equalTo(0));
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index 6a048b4aa..036861d45 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.cmd;
 
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.CreateNetworkResponse;
 import com.github.dockerjava.api.command.CreateVolumeResponse;
@@ -24,7 +25,6 @@
 import com.github.dockerjava.api.model.Ulimit;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
-import com.github.dockerjava.core.command.LogContainerResultCallback;
 import com.github.dockerjava.junit.DockerAssume;
 import com.github.dockerjava.junit.PrivateRegistryRule;
 import com.github.dockerjava.utils.TestUtils;
@@ -938,7 +938,7 @@ public void testWithStopSignal() throws Exception {
         assertThat(log, is("exit trapped 10"));
     }
 
-    private static class StringBuilderLogReader extends LogContainerResultCallback {
+    private static class StringBuilderLogReader extends ResultCallback.Adapter<Frame> {
         public StringBuilder builder;
 
         public StringBuilderLogReader(StringBuilder builder) {
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java
index 89a186c54..897c6fd25 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java
@@ -1,9 +1,8 @@
 package com.github.dockerjava.cmd;
 
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.model.Event;
-import com.github.dockerjava.core.command.EventsResultCallback;
-import com.github.dockerjava.core.command.PullImageResultCallback;
 import com.github.dockerjava.utils.TestUtils;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -120,7 +119,7 @@ public void testEventStreamingWithFilter() throws Exception {
     private int generateEvents() throws Exception {
         String testImage = "busybox:latest";
 
-        dockerRule.getClient().pullImageCmd(testImage).exec(new PullImageResultCallback()).awaitSuccess();
+        dockerRule.getClient().pullImageCmd(testImage).start().awaitCompletion();
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(testImage).withCmd("sleep", "9999").exec();
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
         dockerRule.getClient().stopContainerCmd(container.getId()).withTimeout(1).exec();
@@ -136,7 +135,7 @@ private int generateEvents() throws Exception {
         return 5;
     }
 
-    private class EventsTestCallback extends EventsResultCallback {
+    private class EventsTestCallback extends ResultCallback.Adapter<Event> {
 
         private final CountDownLatch countDownLatch;
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
index 50ba4ca40..1cdfbdf21 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
@@ -5,8 +5,6 @@
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Container;
 import com.github.dockerjava.api.model.Volume;
-import com.github.dockerjava.core.command.PullImageResultCallback;
-import com.github.dockerjava.core.command.WaitContainerResultCallback;
 import com.github.dockerjava.junit.DockerAssume;
 import org.hamcrest.Matcher;
 import org.junit.After;
@@ -314,7 +312,7 @@ public void testAncestorFilter() throws Exception {
 
         dockerRule.getClient().pullImageCmd("busybox")
                 .withTag("1.24")
-                .exec(new PullImageResultCallback())
+                .start()
                 .awaitCompletion();
 
         dockerRule.getClient().createContainerCmd("busybox:1.24")
@@ -352,7 +350,7 @@ public void testExitedFilter() throws Exception {
 
         dockerRule.getClient().startContainerCmd(id).exec();
 
-        Integer status = dockerRule.getClient().waitContainerCmd(id).exec(new WaitContainerResultCallback())
+        Integer status = dockerRule.getClient().waitContainerCmd(id).start()
                 .awaitStatusCode();
 
         assertThat(status, is(42));
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
index db0700ecc..3ece47809 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
@@ -3,7 +3,6 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.StreamType;
-import com.github.dockerjava.core.command.WaitContainerResultCallback;
 import com.github.dockerjava.utils.LogContainerTestCallback;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -129,7 +128,7 @@ public void asyncMultipleLogContainer() throws Exception {
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
         int exitCode = dockerRule.getClient().waitContainerCmd(container.getId())
-                .exec(new WaitContainerResultCallback())
+                .start()
                 .awaitStatusCode();
 
         assertThat(exitCode, equalTo(0));
@@ -180,7 +179,7 @@ public void asyncLogContainerWithSince() throws Exception {
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
         int exitCode = dockerRule.getClient().waitContainerCmd(container.getId())
-                .exec(new WaitContainerResultCallback())
+                .start()
                 .awaitStatusCode();
 
         assertThat(exitCode, equalTo(0));
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
index 7747bc06d..79932f580 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
@@ -7,7 +7,6 @@
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.core.RemoteApiVersion;
-import com.github.dockerjava.core.command.PullImageResultCallback;
 import com.github.dockerjava.junit.PrivateRegistryRule;
 import org.junit.ClassRule;
 import org.junit.Rule;
@@ -65,7 +64,7 @@ public void testPullImage() throws Exception {
         LOG.info("Pulling image: {}", testImage);
 
         dockerRule.getClient().pullImageCmd(testImage)
-                .exec(new PullImageResultCallback())
+                .start()
                 .awaitCompletion(30, TimeUnit.SECONDS);
 
         info = dockerRule.getClient().infoCmd().exec();
@@ -89,7 +88,7 @@ public void testPullNonExistingImage() throws Exception {
 
         // stream needs to be fully read in order to close the underlying connection
         dockerRule.getClient().pullImageCmd("xvxcv/foo")
-                .exec(new PullImageResultCallback())
+                .start()
                 .awaitCompletion(30, TimeUnit.SECONDS);
     }
 
@@ -102,7 +101,7 @@ public void testPullImageWithValidAuth() throws Exception {
         // stream needs to be fully read in order to close the underlying connection
         dockerRule.getClient().pullImageCmd(imgName)
                 .withAuthConfig(authConfig)
-                .exec(new PullImageResultCallback())
+                .start()
                 .awaitCompletion(30, TimeUnit.SECONDS);
     }
 
@@ -115,7 +114,7 @@ public void testPullImageWithValidAuthAndEmail() throws Exception {
         // stream needs to be fully read in order to close the underlying connection
         dockerRule.getClient().pullImageCmd(imgName)
                 .withAuthConfig(authConfig)
-                .exec(new PullImageResultCallback())
+                .start()
                 .awaitCompletion(30, TimeUnit.SECONDS);
     }
 
@@ -134,7 +133,7 @@ public void testPullImageWithNoAuth() throws Exception {
 
         // stream needs to be fully read in order to close the underlying connection
         dockerRule.getClient().pullImageCmd(imgName)
-                .exec(new PullImageResultCallback())
+                .start()
                 .awaitCompletion(30, TimeUnit.SECONDS);
     }
 
@@ -160,7 +159,7 @@ public void testPullImageWithInvalidAuth() throws Exception {
         // stream needs to be fully read in order to close the underlying connection
         dockerRule.getClient().pullImageCmd(imgName)
                 .withAuthConfig(invalidAuthConfig)
-                .exec(new PullImageResultCallback())
+                .start()
                 .awaitCompletion(30, TimeUnit.SECONDS);
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
index c3156a114..4881cc2db 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
@@ -5,8 +5,6 @@
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.core.RemoteApiVersion;
-import com.github.dockerjava.core.command.PullImageResultCallback;
-import com.github.dockerjava.core.command.PushImageResultCallback;
 import com.github.dockerjava.junit.PrivateRegistryRule;
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -59,7 +57,7 @@ public void pushLatest() throws Exception {
         // we have to block until image is pushed
         dockerRule.getClient().pushImageCmd(imgName)
                 .withAuthConfig(authConfig)
-                .exec(new PushImageResultCallback())
+                .start()
                 .awaitCompletion(30, TimeUnit.SECONDS);
 
         LOG.info("Removing image: {}", imageId);
@@ -68,7 +66,7 @@ public void pushLatest() throws Exception {
         dockerRule.getClient().pullImageCmd(imgName)
                 .withTag("latest")
                 .withAuthConfig(authConfig)
-                .exec(new PullImageResultCallback())
+                .start()
                 .awaitCompletion(30, TimeUnit.SECONDS);
     }
 
@@ -83,7 +81,7 @@ public void pushNonExistentImage() throws Exception {
         }
 
         dockerRule.getClient().pushImageCmd(username + "/xxx")
-                .exec(new PushImageResultCallback())
+                .start()
                 .awaitCompletion(30, TimeUnit.SECONDS); // exclude infinite await sleep
 
     }
@@ -95,7 +93,7 @@ public void testPushImageWithValidAuth() throws Exception {
         // stream needs to be fully read in order to close the underlying connection
         dockerRule.getClient().pushImageCmd(imgName)
                 .withAuthConfig(authConfig)
-                .exec(new PushImageResultCallback())
+                .start()
                 .awaitCompletion(30, TimeUnit.SECONDS);
     }
 
@@ -107,7 +105,7 @@ public void testPushImageWithNoAuth() throws Exception {
 
         // stream needs to be fully read in order to close the underlying connection
         dockerRule.getClient().pushImageCmd(imgName)
-                .exec(new PushImageResultCallback())
+                .start()
                 .awaitCompletion(30, TimeUnit.SECONDS);
     }
 
@@ -126,7 +124,7 @@ public void testPushImageWithInvalidAuth() throws Exception {
         // stream needs to be fully read in order to close the underlying connection
         dockerRule.getClient().pushImageCmd(imgName)
                 .withAuthConfig(invalidAuthConfig)
-                .exec(new PushImageResultCallback())
+                .start()
                 .awaitCompletion(30, TimeUnit.SECONDS);
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java
index 29abc7722..01dfd954c 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java
@@ -4,7 +4,6 @@
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Container;
-import com.github.dockerjava.core.command.WaitContainerResultCallback;
 import org.hamcrest.Matcher;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -24,12 +23,12 @@ public class RemoveContainerCmdImplIT extends CmdIT {
     
 
     @Test
-    public void removeContainer() throws DockerException {
+    public void removeContainer() throws Exception {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true").exec();
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
-        dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
+        dockerRule.getClient().waitContainerCmd(container.getId()).start().awaitStatusCode();
 
         LOG.info("Removing container: {}", container.getId());
         dockerRule.getClient().removeContainerCmd(container.getId()).exec();
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
index 0494f2a87..18a1f8ff0 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
@@ -14,7 +14,6 @@
 import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
-import com.github.dockerjava.core.command.WaitContainerResultCallback;
 import net.jcip.annotations.NotThreadSafe;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -45,7 +44,7 @@ public class StartContainerCmdIT extends CmdIT {
     public static final Logger LOG = LoggerFactory.getLogger(StartContainerCmdIT.class);
 
     @Test
-    public void startContainerWithVolumes() throws DockerException {
+    public void startContainerWithVolumes() throws Exception {
 
         // see http://docs.docker.io/use/working_with_volumes/
         Volume volume1 = new Volume("/opt/webapp1");
@@ -68,7 +67,7 @@ public void startContainerWithVolumes() throws DockerException {
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
+        dockerRule.getClient().waitContainerCmd(container.getId()).start().awaitStatusCode();
 
         inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java
index 4298f68c3..ed7fb058b 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java
@@ -1,13 +1,14 @@
 package com.github.dockerjava.cmd;
 
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.command.WaitContainerResultCallback;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.WaitResponse;
-import com.github.dockerjava.core.command.WaitContainerResultCallback;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,7 +34,7 @@ public void testWaitContainer() throws DockerException {
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+        int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).start()
                 .awaitStatusCode();
         LOG.info("Container exit code: {}", exitCode);
 
@@ -47,15 +48,15 @@ public void testWaitContainer() throws DockerException {
     }
 
     @Test(expected = NotFoundException.class)
-    public void testWaitNonExistingContainer() throws DockerException {
+    public void testWaitNonExistingContainer() throws Exception {
 
-        WaitContainerResultCallback callback = new WaitContainerResultCallback() {
+        ResultCallback.Adapter<WaitResponse> callback = new ResultCallback.Adapter<WaitResponse>() {
             public void onNext(WaitResponse waitResponse) {
                 throw new AssertionError("expected NotFoundException");
             }
         };
 
-        dockerRule.getClient().waitContainerCmd("non-existing").exec(callback).awaitStatusCode();
+        dockerRule.getClient().waitContainerCmd("non-existing").exec(callback).awaitCompletion();
     }
 
     @Test
@@ -68,8 +69,7 @@ public void testWaitContainerAbort() throws Exception {
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        WaitContainerResultCallback callback = dockerRule.getClient().waitContainerCmd(container.getId()).exec(
-                new WaitContainerResultCallback());
+        WaitContainerResultCallback callback = dockerRule.getClient().waitContainerCmd(container.getId()).start();
 
         Thread.sleep(5000);
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java
index 6514f3d04..383f9e54d 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java
@@ -33,7 +33,7 @@ private SwarmJoinTokens initSwarmOnDocker(DockerClient docker) {
     }
 
     @Test
-    public void joinSwarmAsWorker() throws DockerException {
+    public void joinSwarmAsWorker() throws Exception {
         DockerClient docker1 = startDockerInDocker();
         DockerClient docker2 = startDockerInDocker();
 
@@ -69,7 +69,7 @@ public void joinSwarmAsManager() throws DockerException, InterruptedException {
     }
 
     @Test(expected = NotAcceptableException.class)
-    public void joinSwarmIfAlreadyInSwarm() {
+    public void joinSwarmIfAlreadyInSwarm() throws Exception {
         DockerClient docker1 = startDockerInDocker();
         DockerClient docker2 = startDockerInDocker();
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
index 17e3303de..27df40001 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
@@ -29,7 +29,7 @@ public class ListServicesCmdExecIT extends SwarmCmdIT {
     private static final String LABEL_VALUE = "test";
 
     @Test
-    public void testListServices() throws DockerException {
+    public void testListServices() throws Exception {
         DockerClient docker1 = startDockerInDocker();
         docker1.initializeSwarmCmd(new SwarmSpec()).exec();
         Map<String, String> serviceLabels = Collections.singletonMap(LABEL_KEY, LABEL_VALUE);
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
index 891f5f267..fd6a0c630 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
@@ -12,7 +12,6 @@
 import com.github.dockerjava.cmd.CmdIT;
 import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.core.DockerClientBuilder;
-import com.github.dockerjava.core.command.PullImageResultCallback;
 import com.github.dockerjava.junit.category.Integration;
 import com.github.dockerjava.junit.category.SwarmModeIntegration;
 import org.junit.After;
@@ -68,7 +67,7 @@ protected void removeDockersInDocker() {
         numberOfDockersInDocker = 0;
     }
 
-    protected DockerClient startDockerInDocker() {
+    protected DockerClient startDockerInDocker() throws InterruptedException {
         numberOfDockersInDocker++;
         String name = DOCKER_IN_DOCKER_CONTAINER_PREFIX + numberOfDockersInDocker;
 
@@ -92,8 +91,8 @@ protected DockerClient startDockerInDocker() {
 
         dockerRule.getClient().pullImageCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY)
                 .withTag(DOCKER_IN_DOCKER_IMAGE_TAG)
-                .exec(new PullImageResultCallback())
-                .awaitSuccess();
+                .start()
+                .awaitCompletion();
 
         int port = PORT_START + (numberOfDockersInDocker - 1);
         CreateContainerResponse response = dockerRule.getClient()
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java
index b999e71e5..d55334ec6 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java
@@ -15,7 +15,7 @@
 
 public class UpdateSwarmNodeIT extends SwarmCmdIT {
     @Test
-    public void testUpdateSwarmNode() {
+    public void testUpdateSwarmNode() throws Exception {
         DockerClient docker1 = startDockerInDocker();
         docker1.initializeSwarmCmd(new SwarmSpec()).exec();
         List<SwarmNode> nodes = docker1.listSwarmNodesCmd().exec();
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
index dc7c83a4e..3e5b948b6 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
@@ -21,7 +21,7 @@
 
 public class UpdateSwarmServiceIT extends SwarmCmdIT {
     @Test
-    public void testUpdateServiceReplicate() {
+    public void testUpdateServiceReplicate() throws Exception {
         DockerClient docker1 = startDockerInDocker();
         docker1.initializeSwarmCmd(new SwarmSpec()).exec();
         //create network
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
index b17947c30..104ea9f6f 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -4,7 +4,6 @@
 import com.github.dockerjava.api.exception.InternalServerErrorException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Image;
-import com.github.dockerjava.core.command.BuildImageResultCallback;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,7 +34,7 @@ public void open() throws Exception {
         LOGGER.info("building {}", directory);
 
         client.buildImageCmd(new File("src/test/resources", directory)).withNoCache(true)
-                .exec(new BuildImageResultCallback()).awaitImageId();
+                .start().awaitImageId();
 
         Image lastCreatedImage = client.listImagesCmd().exec().get(0);
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
index 096d616ca..16c456164 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.core.command;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.StreamType;
 import com.github.dockerjava.core.DockerClientBuilder;
@@ -46,7 +47,7 @@ public void canCloseFrameReaderAndReadExpectedLines() throws Exception {
 
         // wait for the container to be successfully executed
         int exitCode = dockerClient.waitContainerCmd(dockerfileFixture.getContainerId())
-                .exec(new WaitContainerResultCallback()).awaitStatusCode();
+                .start().awaitStatusCode();
         assertEquals(0, exitCode);
 
         final List<Frame> loggingFrames = getLoggingFrames();
@@ -96,7 +97,7 @@ public void canLogInOneThreadAndExecuteCommandsInAnother() throws Exception {
 
     }
 
-    public static class FrameReaderITestCallback extends LogContainerResultCallback {
+    public static class FrameReaderITestCallback extends ResultCallback.Adapter<Frame> {
 
         public List<Frame> frames = new ArrayList<>();
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java
index e7df693df..2edefb14a 100644
--- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java
+++ b/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java
@@ -13,8 +13,6 @@
 import com.github.dockerjava.cmd.CmdIT;
 import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.core.DockerClientBuilder;
-import com.github.dockerjava.core.command.BuildImageResultCallback;
-import com.github.dockerjava.core.command.PullImageResultCallback;
 import com.github.dockerjava.utils.LogContainerTestCallback;
 import org.junit.rules.ExternalResource;
 import org.junit.runner.Description;
@@ -109,8 +107,8 @@ protected void before() throws Throwable {
             // need to block until image is pulled completely
             getClient().pullImageCmd("busybox")
                     .withTag("latest")
-                    .exec(new PullImageResultCallback())
-                    .awaitSuccess();
+                    .start()
+                    .awaitCompletion();
         }
 
 //        assertThat(getClient(), notNullValue());
@@ -181,7 +179,7 @@ public static DefaultDockerClientConfig config(String password) {
     public String buildImage(File baseDir) throws Exception {
         return getClient().buildImageCmd(baseDir)
                 .withNoCache(true)
-                .exec(new BuildImageResultCallback())
+                .start()
                 .awaitImageId();
     }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java b/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java
index 15774ad34..cd7989afd 100644
--- a/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java
+++ b/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java
@@ -8,8 +8,6 @@
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.core.DockerClientBuilder;
-import com.github.dockerjava.core.command.BuildImageResultCallback;
-import com.github.dockerjava.core.command.PushImageResultCallback;
 import org.junit.rules.ExternalResource;
 
 import java.io.File;
@@ -42,7 +40,7 @@ public String createPrivateImage(String tagName) throws InterruptedException {
 
         dockerClient.pushImageCmd(imgNameWithTag)
                 .withAuthConfig(authConfig)
-                .exec(new PushImageResultCallback())
+                .start()
                 .awaitCompletion(30, TimeUnit.SECONDS);
 
         dockerClient.removeImageCmd(imgNameWithTag).exec();
@@ -75,7 +73,7 @@ protected void before() throws Throwable {
 
         String registryImageId = dockerClient.buildImageCmd(baseDir)
                 .withNoCache(true)
-                .exec(new BuildImageResultCallback())
+                .start()
                 .awaitImageId();
 
         InspectImageResponse inspectImageResponse = dockerClient.inspectImageCmd(registryImageId).exec();
diff --git a/docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java b/docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java
index cbb5a2f17..e21a55465 100644
--- a/docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java
+++ b/docker-java/src/test/java/com/github/dockerjava/utils/LogContainerTestCallback.java
@@ -1,7 +1,7 @@
 package com.github.dockerjava.utils;
 
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.core.command.LogContainerResultCallback;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,7 +9,7 @@
 /**
  * @author Kanstantsin Shautsou
  */
-public class LogContainerTestCallback extends LogContainerResultCallback {
+public class LogContainerTestCallback extends ResultCallback.Adapter<Frame> {
     protected final StringBuffer log = new StringBuffer();
 
     List<Frame> collectedFrames = new ArrayList<>();

From ed26c47f3dcadc90d62b674c2a7ee724c468700f Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Mon, 17 Feb 2020 21:42:18 +0100
Subject: [PATCH 0972/1272] Replace IDEA's codestyle with editorconfig (#1312)

---
 .editorconfig               | 18 ++++++++++++++++++
 .gitignore                  |  4 +---
 .idea/codeStyleSettings.xml | 13 -------------
 .idea/encodings.xml         | 12 ------------
 4 files changed, 19 insertions(+), 28 deletions(-)
 create mode 100644 .editorconfig
 delete mode 100644 .idea/codeStyleSettings.xml
 delete mode 100644 .idea/encodings.xml

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..137af4fbf
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,18 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+max_line_length = 140
+indent_style = space
+indent_size = 4
+tab_width = 4
+insert_final_newline = true
+
+[*.java]
+ij_java_class_count_to_use_import_on_demand = 9999
+ij_java_names_count_to_use_import_on_demand = 9999
+
+[{*.pom,*.xml}]
+indent_style = tab
+ij_xml_attribute_wrap = off
diff --git a/.gitignore b/.gitignore
index 5399371c4..cc29f27cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,9 +11,7 @@
 target
 
 # Ignore InteliJ Idea project files
-.idea
-!.idea/codeStyleSettings.xml
-!.idea/encodings.xml
+.idea/
 *.iml
 *.iws
 *.ipr
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 9e5672189..000000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />
-        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />
-        <option name="RIGHT_MARGIN" value="140" />
-      </value>
-    </option>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 9e5f39465..000000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/docker-java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/docker-java-api" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/docker-java-core" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/docker-java-transport-jersey" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/docker-java-transport-netty" charset="UTF-8" />
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file

From 61e8c8f07664fce6ba614a5f8b1ef585d035f530 Mon Sep 17 00:00:00 2001
From: saffis <54270632+saffis@users.noreply.github.com>
Date: Mon, 17 Feb 2020 21:45:47 +0100
Subject: [PATCH 0973/1272] Fields `preread` and `num_procs` added to
 `Statistics` (#1269)

---
 .../github/dockerjava/api/model/Statistics.java    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java
index 2bbc91777..f28ea983a 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java
@@ -20,6 +20,9 @@ public class Statistics implements Serializable {
     @JsonProperty("read")
     private String read;
 
+    @JsonProperty("preread")
+    private String preread;
+
     /**
      * @since Docker Remote API 1.21
      */
@@ -43,6 +46,9 @@ public class Statistics implements Serializable {
     @JsonProperty("cpu_stats")
     private CpuStatsConfig cpuStats;
 
+    @JsonProperty("num_procs")
+    private Long numProcs;
+
     /**
      * @since Docker Remote API 1.19
      */
@@ -59,6 +65,10 @@ public String getRead() {
         return read;
     }
 
+    public String getPreread() {
+        return preread;
+    }
+
     /**
      * @since Docker Remote API 1.21
      */
@@ -79,6 +89,10 @@ public CpuStatsConfig getCpuStats() {
         return cpuStats;
     }
 
+    public Long getNumProcs() {
+        return numProcs;
+    }
+
     /**
      * The cpu statistic of last read, which is used for calculating the cpu usage percent.
      * It is not the exact copy of the {@link #getCpuStats()}.

From 6aa95c350650349ebe2b5b8f6c3050cd1cbfe159 Mon Sep 17 00:00:00 2001
From: hturki <turki.haithem@gmail.com>
Date: Mon, 17 Feb 2020 16:10:52 -0500
Subject: [PATCH 0974/1272] add support for DeviceRequests parameter (#1303)

---
 .../dockerjava/api/model/DeviceRequest.java   | 75 +++++++++++++++++++
 .../dockerjava/api/model/HostConfig.java      | 16 ++++
 .../dockerjava/core/RemoteApiVersion.java     |  1 +
 3 files changed, 92 insertions(+)
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/model/DeviceRequest.java

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DeviceRequest.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DeviceRequest.java
new file mode 100644
index 000000000..9f8942182
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DeviceRequest.java
@@ -0,0 +1,75 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+@EqualsAndHashCode
+@ToString
+public class DeviceRequest implements Serializable {
+    public static final long serialVersionUID = 1L;
+
+    @JsonProperty("Driver")
+    private String driver;
+
+    @JsonProperty("Count")
+    private Integer count;
+
+    @JsonProperty("DeviceIDs")
+    private List<String> deviceIds;
+
+    @JsonProperty("Capabilities")
+    private List<List<String>> capabilities;
+
+    @JsonProperty("Options")
+    private Map<String, String> options;
+
+    public String getDriver() {
+        return driver;
+    }
+
+    public DeviceRequest withDriver(String driver) {
+        this.driver = driver;
+        return this;
+    }
+
+    public Integer getCount() {
+        return count;
+    }
+
+    public DeviceRequest withCount(Integer count) {
+        this.count = count;
+        return this;
+    }
+
+    public List<String> getDeviceIds() {
+        return deviceIds;
+    }
+
+    public DeviceRequest withDeviceIds(List<String> deviceIds) {
+        this.deviceIds = deviceIds;
+        return this;
+    }
+
+    public List<List<String>> getCapabilities() {
+        return capabilities;
+    }
+
+    public DeviceRequest withCapabilities(List<List<String>> capabilities) {
+        this.capabilities = capabilities;
+        return this;
+    }
+
+    public Map<String, String> getOptions() {
+        return options;
+    }
+
+    public DeviceRequest withOptions(Map<String, String> options) {
+        this.options = options;
+        return this;
+    }
+}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index bcae9a4cc..afe38d245 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -112,6 +112,12 @@ public static HostConfig newHostConfig() {
     @JsonProperty("DeviceCgroupRules")
     private List<String> deviceCgroupRules;
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_40}
+     */
+    @JsonProperty("DeviceRequests")
+    private List<DeviceRequest> deviceRequests;
+
     /**
      * @since {@link RemoteApiVersion#VERSION_1_25}
      */
@@ -1037,6 +1043,16 @@ public HostConfig withDeviceCgroupRules(List<String> deviceCgroupRules) {
         return this;
     }
 
+    @CheckForNull
+    public List<DeviceRequest> getDeviceRequests() {
+        return deviceRequests;
+    }
+
+    public HostConfig withDeviceRequests(List<DeviceRequest> deviceRequests) {
+        this.deviceRequests = deviceRequests;
+        return this;
+    }
+
     @CheckForNull
     public Long getNanoCPUs() {
         return nanoCPUs;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index 66b5b47f7..859d6f0b5 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -89,6 +89,7 @@ public class RemoteApiVersion implements Serializable {
     public static final RemoteApiVersion VERSION_1_36 = RemoteApiVersion.create(1, 36);
     public static final RemoteApiVersion VERSION_1_37 = RemoteApiVersion.create(1, 37);
     public static final RemoteApiVersion VERSION_1_38 = RemoteApiVersion.create(1, 38);
+    public static final RemoteApiVersion VERSION_1_40 = RemoteApiVersion.create(1, 40);
 
 
     /**

From b4ce5ae0145d1b0143eabfb7e3c0abc07fccfc64 Mon Sep 17 00:00:00 2001
From: phillip-h <phillip-h@users.noreply.github.com>
Date: Tue, 18 Feb 2020 01:25:53 -0700
Subject: [PATCH 0975/1272] Update httpclient to version 4.5.9 (#1234)

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2149f8624..25493863b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
 		<jersey.version>2.30</jersey.version>
 		<jackson.version>2.9.8</jackson.version>
 		<jackson-jaxrs.version>2.9.8</jackson-jaxrs.version>
-		<httpclient.version>4.5.6</httpclient.version><!-- 4.5.1-4.5.2 broken -->
+		<httpclient.version>4.5.11</httpclient.version><!-- 4.5.1-4.5.2 broken -->
 		<commons-compress.version>1.19</commons-compress.version>
 		<commons-codec.version>1.11</commons-codec.version>
 		<commons-io.version>2.6</commons-io.version>

From e0ea277ae657b086d010f0f519f324e4447a2f7c Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Tue, 18 Feb 2020 23:23:37 +0100
Subject: [PATCH 0976/1272] Allow `npipe` protocol in
 `DefaultDockerClientConfig` (#1325)

Fixes #1324
---
 .../core/DefaultDockerClientConfig.java       | 12 ++++++-----
 .../jaxrs/JerseyDockerCmdExecFactory.java     | 21 ++++++++++++-------
 .../netty/NettyDockerCmdExecFactory.java      | 19 ++++++++++-------
 .../core/DefaultDockerClientConfigTest.java   |  6 ++++++
 4 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index f552ea626..be00cd7ea 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -98,11 +98,13 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf
     }
 
     private URI checkDockerHostScheme(URI dockerHost) {
-        if ("tcp".equals(dockerHost.getScheme()) || "unix".equals(dockerHost.getScheme())) {
-            return dockerHost;
-        } else {
-            throw new DockerClientException("Unsupported protocol scheme found: '" + dockerHost
-                    + "'. Only 'tcp://' or 'unix://' supported.");
+        switch (dockerHost.getScheme()) {
+            case "tcp":
+            case "unix":
+            case "npipe":
+                return dockerHost;
+            default:
+                throw new DockerClientException("Unsupported protocol scheme found: '" + dockerHost);
         }
     }
 
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
index a83afd7e1..edd659678 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -139,15 +139,20 @@ public void init(DockerClientConfig dockerClientConfig) {
             protocol = "http";
         }
 
-        if (!originalUri.getScheme().equals("unix")) {
-
-            try {
-                originalUri = new URI(originalUri.toString().replaceFirst("tcp", protocol));
-            } catch (URISyntaxException e) {
-                throw new RuntimeException(e);
-            }
+        switch (originalUri.getScheme()) {
+            case "unix":
+                break;
+            case "tcp":
+                try {
+                    originalUri = new URI(originalUri.toString().replaceFirst("tcp", protocol));
+                } catch (URISyntaxException e) {
+                    throw new RuntimeException(e);
+                }
 
-            configureProxy(clientConfig, originalUri, protocol);
+                configureProxy(clientConfig, originalUri, protocol);
+                break;
+            default:
+                throw new IllegalArgumentException("Unsupported protocol scheme: " + originalUri);
         }
 
         connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(
diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index 3a5a1a32b..efc47a742 100644
--- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -101,13 +101,18 @@ public void init(DockerClientConfig dockerClientConfig) {
         String scheme = dockerClientConfig.getDockerHost().getScheme();
         String host = "";
 
-        if ("unix".equals(scheme)) {
-            nettyInitializer = new UnixDomainSocketInitializer();
-            host = "DUMMY";
-        } else if ("tcp".equals(scheme)) {
-            nettyInitializer = new InetSocketInitializer();
-            host = dockerClientConfig.getDockerHost().getHost() + ":"
-                + Integer.toString(dockerClientConfig.getDockerHost().getPort());
+        switch (scheme) {
+            case "unix":
+                nettyInitializer = new UnixDomainSocketInitializer();
+                host = "DUMMY";
+                break;
+            case "tcp":
+                nettyInitializer = new InetSocketInitializer();
+                host = dockerClientConfig.getDockerHost().getHost() + ":"
+                    + Integer.toString(dockerClientConfig.getDockerHost().getPort());
+                break;
+            default:
+                throw new IllegalArgumentException("Unsupported protocol scheme: " + dockerClientConfig.getDockerHost());
         }
 
         eventLoopGroup = nettyInitializer.init(bootstrap, dockerClientConfig);
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
index a8fdb89c6..107512da1 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
@@ -177,6 +177,12 @@ public void testUnixHostScheme() throws Exception {
                 null);
     }
 
+    @Test()
+    public void testNpipeHostScheme() throws Exception {
+        new DefaultDockerClientConfig(URI.create("npipe://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
+                null);
+    }
+
     @Test
     public void withDockerTlsVerify() throws Exception {
         DefaultDockerClientConfig.Builder builder = new DefaultDockerClientConfig.Builder();

From a371a6a043f63df2d7c1d8c96da1355be4957ae4 Mon Sep 17 00:00:00 2001
From: jarebudev <23311805+jarebudev@users.noreply.github.com>
Date: Wed, 19 Feb 2020 08:00:00 +0000
Subject: [PATCH 0977/1272] allow optional `authConfig` to be supplied to
 `createServiceCmd` (#1314)

Fixes #1205
---
 .../api/command/CreateServiceCmd.java         |  6 ++
 .../core/command/CreateServiceCmdImpl.java    | 15 +++++
 .../core/exec/CreateServiceCmdExec.java       | 10 ++-
 .../cmd/swarm/CreateServiceCmdExecIT.java     | 67 +++++++++++++++++++
 4 files changed, 95 insertions(+), 3 deletions(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java
index dc78642e3..bfcce27ad 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.exception.ConflictException;
+import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.ServiceSpec;
 
 import javax.annotation.CheckForNull;
@@ -15,8 +16,13 @@ public interface CreateServiceCmd extends SyncDockerCmd<CreateServiceResponse> {
     @CheckForNull
     ServiceSpec getServiceSpec();
 
+    @CheckForNull
+    AuthConfig getAuthConfig();
+
     CreateServiceCmd withServiceSpec(ServiceSpec serviceSpec);
 
+    CreateServiceCmd withAuthConfig(AuthConfig authConfig);
+
     /**
      * @throws ConflictException
      *             Named service already exists
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java
index 1b8e78e42..a664569a1 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java
@@ -2,6 +2,7 @@
 
 import com.github.dockerjava.api.command.CreateServiceCmd;
 import com.github.dockerjava.api.command.CreateServiceResponse;
+import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.ServiceSpec;
 
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -14,6 +15,8 @@ public class CreateServiceCmdImpl extends AbstrDockerCmd<CreateServiceCmd, Creat
 
     private ServiceSpec serviceSpec;
 
+    private AuthConfig authConfig;
+
     public CreateServiceCmdImpl(CreateServiceCmd.Exec exec, ServiceSpec serviceSpec) {
         super(exec);
         checkNotNull(serviceSpec, "serviceSpec was not specified");
@@ -25,10 +28,22 @@ public ServiceSpec getServiceSpec() {
         return serviceSpec;
     }
 
+    @Override
+    public AuthConfig getAuthConfig() {
+        return authConfig;
+    }
+
     @Override
     public CreateServiceCmd withServiceSpec(ServiceSpec serviceSpec) {
         checkNotNull(serviceSpec, "serviceSpec was not specified");
         this.serviceSpec = serviceSpec;
         return this;
     }
+
+    @Override
+    public CreateServiceCmd withAuthConfig(AuthConfig authConfig) {
+        checkNotNull(authConfig, "authConfig was not specified");
+        this.authConfig = authConfig;
+        return this;
+    }
 }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateServiceCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateServiceCmdExec.java
index 401e51f76..6537aa930 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateServiceCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateServiceCmdExec.java
@@ -4,6 +4,7 @@
 import com.github.dockerjava.api.command.CreateServiceCmd;
 import com.github.dockerjava.api.command.CreateServiceResponse;
 import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.InvocationBuilder;
 import com.github.dockerjava.core.MediaType;
 import com.github.dockerjava.core.WebTarget;
 import org.slf4j.Logger;
@@ -23,8 +24,11 @@ protected CreateServiceResponse execute(CreateServiceCmd command) {
         WebTarget webResource = getBaseResource().path("/services/create");
 
         LOGGER.trace("POST: {} ", webResource);
-        return webResource.request().accept(MediaType.APPLICATION_JSON)
-                .post(command.getServiceSpec(), new TypeReference<CreateServiceResponse>() {
-                });
+
+        InvocationBuilder builder = resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request())
+                .accept(MediaType.APPLICATION_JSON);
+
+        return builder.post(command.getServiceSpec(), new TypeReference<CreateServiceResponse>() {
+        });
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
index 27eae0b6e..a28d0e83b 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
@@ -1,6 +1,8 @@
 package com.github.dockerjava.cmd.swarm;
 
+import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.ContainerSpec;
 import com.github.dockerjava.api.model.EndpointResolutionMode;
 import com.github.dockerjava.api.model.EndpointSpec;
@@ -16,9 +18,14 @@
 import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.api.model.TaskSpec;
 import com.github.dockerjava.api.model.TmpfsOptions;
+import com.github.dockerjava.junit.PrivateRegistryRule;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,6 +42,18 @@ public class CreateServiceCmdExecIT extends SwarmCmdIT {
     public static final Logger LOG = LoggerFactory.getLogger(CreateServiceCmdExecIT.class);
     private static final String SERVICE_NAME = "theservice";
 
+    @ClassRule
+    public static PrivateRegistryRule REGISTRY = new PrivateRegistryRule();
+
+    @Rule
+    public ExpectedException exception = ExpectedException.none();
+    private AuthConfig authConfig;
+
+    @Before
+    public void beforeTest() throws Exception {
+        authConfig = REGISTRY.getAuthConfig();
+    }
+
     @Test
     public void testCreateService() throws DockerException {
         dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
@@ -132,4 +151,52 @@ public void testCreateServiceWithTmpfs() {
         assertThat(mounts.get(0), is(tmpMount));
         dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec();
     }
+
+    @Test
+    public void testCreateServiceWithValidAuth() throws DockerException {
+        dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
+                .withListenAddr("127.0.0.1")
+                .withAdvertiseAddr("127.0.0.1")
+                .exec();
+
+        dockerRule.getClient().createServiceCmd(new ServiceSpec()
+                .withName(SERVICE_NAME)
+                .withTaskTemplate(new TaskSpec()
+                        .withContainerSpec(new ContainerSpec()
+                                .withImage(DEFAULT_IMAGE))))
+                .withAuthConfig(authConfig)
+                .exec();
+
+        List<Service> services = dockerRule.getClient().listServicesCmd()
+                .withNameFilter(Lists.newArrayList(SERVICE_NAME))
+                .exec();
+
+        assertThat(services, hasSize(1));
+
+        dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec();
+    }
+
+    @Test
+    public void testCreateServiceWithInvalidAuth() throws DockerException {
+        dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
+                .withListenAddr("127.0.0.1")
+                .withAdvertiseAddr("127.0.0.1")
+                .exec();
+
+        AuthConfig invalidAuthConfig = new AuthConfig()
+                .withUsername("testuser")
+                .withPassword("testwrongpassword")
+                .withEmail("foo@bar.de")
+                .withRegistryAddress(authConfig.getRegistryAddress());
+
+        exception.expect(ConflictException.class);
+
+        dockerRule.getClient().createServiceCmd(new ServiceSpec()
+                .withName(SERVICE_NAME)
+                .withTaskTemplate(new TaskSpec()
+                        .withContainerSpec(new ContainerSpec()
+                                .withImage(DEFAULT_IMAGE))))
+                .withAuthConfig(invalidAuthConfig)
+                .exec();
+    }
 }

From 4cd61118756dc126421c9d4dc8b631ece14e2d8e Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Wed, 19 Feb 2020 20:52:20 +0100
Subject: [PATCH 0978/1272] Make `PullImageResultCallback` public (#1326)

---
 .../github/dockerjava/api/command/PullImageResultCallback.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java
index e0a405e43..2c2b48b24 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java
@@ -18,7 +18,7 @@
  * @author Marcus Linke
  *
  */
-class PullImageResultCallback extends ResultCallback.Adapter<PullResponseItem> {
+public class PullImageResultCallback extends ResultCallback.Adapter<PullResponseItem> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PullImageResultCallback.class);
 

From 8bdcf912fbb920121635720f08e168b7fa22fa82 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 20 Feb 2020 01:33:45 +0300
Subject: [PATCH 0979/1272] [maven-release-plugin] prepare release 3.2.0-rc5

---
 docker-java-api/pom.xml              | 2 +-
 docker-java-core/pom.xml             | 2 +-
 docker-java-transport-jersey/pom.xml | 2 +-
 docker-java-transport-netty/pom.xml  | 2 +-
 docker-java-transport-okhttp/pom.xml | 2 +-
 docker-java/pom.xml                  | 2 +-
 pom.xml                              | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index bade957b7..a350ac5c2 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc5</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index 3fa7ce306..6287c915a 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc5</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index 295440266..353490b99 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc5</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml
index 91483c167..ffda7c676 100644
--- a/docker-java-transport-netty/pom.xml
+++ b/docker-java-transport-netty/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc5</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index a4642dff9..c2ee29fb4 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc5</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 5336a4b08..25c04b9a8 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc5</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index 25493863b..3e5c332ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.2.0-SNAPSHOT</version>
+	<version>3.2.0-rc5</version>
 
 	<name>docker-java-parent</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.2.0-rc5</tag>
 	</scm>
 
 	<developers>

From 49d8e297d2be3afb798f2906f18b42638b5de44e Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Thu, 20 Feb 2020 01:33:54 +0300
Subject: [PATCH 0980/1272] [maven-release-plugin] prepare for next development
 iteration

---
 docker-java-api/pom.xml              | 2 +-
 docker-java-core/pom.xml             | 2 +-
 docker-java-transport-jersey/pom.xml | 2 +-
 docker-java-transport-netty/pom.xml  | 2 +-
 docker-java-transport-okhttp/pom.xml | 2 +-
 docker-java/pom.xml                  | 2 +-
 pom.xml                              | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index a350ac5c2..bade957b7 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc5</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index 6287c915a..3fa7ce306 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc5</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index 353490b99..295440266 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc5</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml
index ffda7c676..91483c167 100644
--- a/docker-java-transport-netty/pom.xml
+++ b/docker-java-transport-netty/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc5</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index c2ee29fb4..a4642dff9 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc5</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 25c04b9a8..5336a4b08 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc5</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index 3e5c332ed..25493863b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.2.0-rc5</version>
+	<version>3.2.0-SNAPSHOT</version>
 
 	<name>docker-java-parent</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.2.0-rc5</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From afb24e4e41c74fe033d5cf54a371e13d7493f7dd Mon Sep 17 00:00:00 2001
From: Danushka Herath <Danushkaherath96@gmail.com>
Date: Tue, 3 Mar 2020 12:49:05 +0530
Subject: [PATCH 0981/1272] Fixed Dead Link

Fixed Dead Link for test cases

Previous Link: https://github.com/docker-java/docker-java/tree/master/src/test/java/com/github/dockerjava/core/command
Current Link: https://github.com/docker-java/docker-java/tree/master/docker-java/src/test/java/com/github/dockerjava/core/command
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index de96156a5..ef504a1e8 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,7 @@ You can find the latest development version including javadoc and source files o
 
 ## Documentation
 
-For code examples, please look at the [Wiki](https://github.com/docker-java/docker-java/wiki) or [Test cases](https://github.com/docker-java/docker-java/tree/master/src/test/java/com/github/dockerjava/core/command "Test cases")
+For code examples, please look at the [Wiki](https://github.com/docker-java/docker-java/wiki) or [Test cases](https://github.com/docker-java/docker-java/tree/master/docker-java/src/test/java/com/github/dockerjava/core/command "Test cases")
 
 ## Configuration
 

From 96a5f21016d8e8a9af005b0474b9842b9b24631b Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 4 Mar 2020 02:03:00 +0300
Subject: [PATCH 0982/1272] Update ci.yml

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 57bc0a8ee..0a925af32 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,4 +13,4 @@ jobs:
       with:
         java-version: 8
     - name: Build with Maven
-      run: mvn verify
+      run: ./mvnw --no-transfer-progress verify

From 6da5ce6231d59c333aea42446c5cbaebc5ba36a8 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 4 Mar 2020 03:16:24 +0300
Subject: [PATCH 0983/1272] Update ci.yml

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0a925af32..72e32d7d9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,5 +12,7 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 8
+    - name: Prepare ws
+      run: rm -f "docker-java/src/test/resources/logback.xml" && mv "docker-java/src/test/resources/travis-logback.xml" "docker-java/src/test/resources/logback-test.xml"
     - name: Build with Maven
       run: ./mvnw --no-transfer-progress verify

From 906e1a2ed8c9dc1d615983a0a033882265b7e2d4 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Wed, 4 Mar 2020 13:52:37 +0300
Subject: [PATCH 0984/1272] Jar packaging. (#1337)

* Jar packaging.

bundle is duplicating everything.

* fix maven warnings
---
 docker-java-api/pom.xml              |  2 +-
 docker-java-core/pom.xml             |  6 +++---
 docker-java-transport-jersey/pom.xml |  6 +++---
 docker-java-transport-netty/pom.xml  |  6 +++---
 docker-java-transport-okhttp/pom.xml |  6 +++---
 docker-java/pom.xml                  | 18 +++++++++---------
 pom.xml                              |  5 +++++
 7 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index bade957b7..008ec87ba 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 
 	<artifactId>docker-java-api</artifactId>
-	<packaging>bundle</packaging>
+	<packaging>jar</packaging>
 
 	<name>docker-java-api</name>
 	<url>https://github.com/docker-java/docker-java</url>
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index 3fa7ce306..a26e07d87 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 
 	<artifactId>docker-java-core</artifactId>
-	<packaging>bundle</packaging>
+	<packaging>jar</packaging>
 
 	<name>docker-java-core</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -17,9 +17,9 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>${groupId}</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>docker-java-api</artifactId>
-			<version>${version}</version>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index 295440266..8928cb86d 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 
 	<artifactId>docker-java-transport-jersey</artifactId>
-	<packaging>bundle</packaging>
+	<packaging>jar</packaging>
 
 	<name>docker-java-transport-jersey</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -17,9 +17,9 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>${groupId}</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>docker-java-core</artifactId>
-			<version>${version}</version>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml
index 91483c167..c939be262 100644
--- a/docker-java-transport-netty/pom.xml
+++ b/docker-java-transport-netty/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 
 	<artifactId>docker-java-transport-netty</artifactId>
-	<packaging>bundle</packaging>
+	<packaging>jar</packaging>
 
 	<name>docker-java-transport-netty</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -17,9 +17,9 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>${groupId}</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>docker-java-core</artifactId>
-			<version>${version}</version>
+			<version>${project.version}</version>
 		</dependency>
 
         <dependency>
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index a4642dff9..fd920185f 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 
 	<artifactId>docker-java-transport-okhttp</artifactId>
-	<packaging>bundle</packaging>
+	<packaging>jar</packaging>
 
 	<name>docker-java-transport-okhttp</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -17,9 +17,9 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>${groupId}</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>docker-java-core</artifactId>
-			<version>${version}</version>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 5336a4b08..3c127de28 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 
 	<artifactId>docker-java</artifactId>
-	<packaging>bundle</packaging>
+	<packaging>jar</packaging>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -17,19 +17,19 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>${groupId}</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>docker-java-core</artifactId>
-			<version>${version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>${groupId}</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>docker-java-transport-jersey</artifactId>
-			<version>${version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>${groupId}</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>docker-java-transport-netty</artifactId>
-			<version>${version}</version>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
@@ -40,9 +40,9 @@
 
 		<!-- /// Test /////////////////////////// -->
 		<dependency>
-			<groupId>${groupId}</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>docker-java-transport-okhttp</artifactId>
-			<version>${version}</version>
+			<version>${project.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 25493863b..c8deb44dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -206,6 +206,11 @@
 						</execution>
 					</executions>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.felix</groupId>
+					<artifactId>maven-bundle-plugin</artifactId>
+					<version>4.2.1</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>

From 472f9275c44a6f1156c39827856d4da6cb3a3704 Mon Sep 17 00:00:00 2001
From: elliotsayes <elliotsayes@gmail.com>
Date: Sat, 7 Mar 2020 00:57:16 +1300
Subject: [PATCH 0985/1272] SCTP Support (#1341)

* Add SCTP as InternetProtocol

* Add SCTP as ExposedPort

* Fix documentation in InternetProtocol

* Change import format to how it was previously

* Fixed test failing as JSON mapper uses alphabetical order.

* Tests now use "arrayContainingInAnyOrder" instead of "arrayContaining". Casting test/expected JSON to Map for unordered comparison rather than strict text comparison

* Changed to cast to generic JsonNode class, can then compare entries as arrays

Co-authored-by: Elliot Sayes <Elliot.Sayes@mbie.govt.nz>
---
 .../dockerjava/api/model/ExposedPort.java     | 13 ++++++--
 .../api/model/InternetProtocol.java           |  8 ++++-
 .../api/model/PortConfigProtocol.java         |  5 +++-
 .../api/model/ExposedPortsTest.java           | 30 ++++++++++++++-----
 4 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
index d273b60cc..4226fd94b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
@@ -2,6 +2,7 @@
 
 import static com.github.dockerjava.api.model.InternetProtocol.TCP;
 import static com.github.dockerjava.api.model.InternetProtocol.UDP;
+import static com.github.dockerjava.api.model.InternetProtocol.SCTP;
 
 import java.io.Serializable;
 
@@ -50,7 +51,7 @@ public ExposedPort(int port) {
      * Creates an {@link ExposedPort} for the given parameters.
      *
      * @param scheme
-     *            the {@link #getScheme() scheme}, <code>tcp</code> or <code>udp</code>
+     *            the {@link #getScheme() scheme}, <code>tcp</code>, <code>udp</code> or <code>sctp</code>
      * @param port
      *            the {@link #getPort() port number}
      * @deprecated use {@link #ExposedPort(int, InternetProtocol)}
@@ -68,7 +69,7 @@ public InternetProtocol getProtocol() {
     }
 
     /**
-     * @return the scheme (internet protocol), <code>tcp</code> or <code>udp</code>
+     * @return the scheme (internet protocol), <code>tcp</code>, <code>udp</code> or <code>sctp</code>
      * @deprecated use {@link #getProtocol()}
      */
     @Deprecated
@@ -97,6 +98,14 @@ public static ExposedPort udp(int port) {
         return new ExposedPort(port, UDP);
     }
 
+    /**
+     * Creates an {@link ExposedPort} for {@link InternetProtocol#SCTP}. This is a shortcut for
+     * <code>new ExposedPort(port, {@link InternetProtocol#SCTP})</code>
+     */
+    public static ExposedPort sctp(int port) {
+        return new ExposedPort(port, SCTP);
+    }
+
     /**
      * Parses a textual port specification (as used by the Docker CLI) to an {@link ExposedPort}.
      *
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
index 2bb4db285..ab400fcc8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
@@ -5,6 +5,7 @@
  *
  * @see #TCP
  * @see #UDP
+ * @see #SCTP
  */
 public enum InternetProtocol {
     /**
@@ -15,7 +16,12 @@ public enum InternetProtocol {
     /**
      * The <i>User Datagram Protocol</i>
      */
-    UDP;
+    UDP,
+
+    /**
+     * The <i>Stream Control Transmission Protocol</i>
+     */
+    SCTP;
 
     /**
      * The default {@link InternetProtocol}: {@link #TCP}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java
index f47b06f1d..8af2fe02c 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java
@@ -11,6 +11,9 @@ public enum PortConfigProtocol {
     TCP,
 
     @JsonProperty("udp")
-    UDP
+    UDP,
+
+    @JsonProperty("sctp")
+    SCTP
 
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java
index c69e1f04f..4f774c063 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java
@@ -1,10 +1,15 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.github.dockerjava.test.serdes.JSONTestHelper;
+import org.apache.commons.compress.utils.Lists;
 import org.junit.Test;
 
-import static org.hamcrest.Matchers.arrayContaining;
-import static org.hamcrest.Matchers.is;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map.Entry;
+
+import static org.hamcrest.Matchers.arrayContainingInAnyOrder;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertThat;
 
@@ -14,21 +19,32 @@ public class ExposedPortsTest {
     public void usesToJson() throws Exception {
         ExposedPorts ports = new ExposedPorts(
                 new ExposedPort(80),
-                new ExposedPort(123, InternetProtocol.UDP)
+                new ExposedPort(123, InternetProtocol.UDP),
+                new ExposedPort(3868, InternetProtocol.SCTP)
         );
         String json = JSONTestHelper.getMapper().writeValueAsString(ports);
+        List<Entry<String, JsonNode>> jsonEntries = getJsonEntries(json);
+
+        String jsonExpected = "{\"80/tcp\":{},\"123/udp\":{},\"3868/sctp\":{}}";
+        List<Entry<String, JsonNode>> jsonEntriesExpected = getJsonEntries(jsonExpected);
+
+        assertThat(jsonEntries.toArray(), arrayContainingInAnyOrder(jsonEntriesExpected.toArray()));
+    }
 
-        assertThat(json, is("{\"80/tcp\":{},\"123/udp\":{}}"));
+    private List<Entry<String, JsonNode>> getJsonEntries(String json) throws Exception {
+        JsonNode jsonNode = JSONTestHelper.getMapper().readValue(json, JsonNode.class);
+        return Lists.newArrayList(jsonNode.fields());
     }
 
     @Test
     public void usesFromJson() throws Exception {
-        ExposedPorts ports = JSONTestHelper.getMapper().readValue("{\"80/tcp\":{},\"123/udp\":{}}", ExposedPorts.class);
+        ExposedPorts ports = JSONTestHelper.getMapper().readValue("{\"80/tcp\":{},\"123/udp\":{},\"3868/sctp\":{}}", ExposedPorts.class);
 
         assertThat(ports, notNullValue());
-        assertThat(ports.getExposedPorts(), arrayContaining(
+        assertThat(ports.getExposedPorts(), arrayContainingInAnyOrder(
                 new ExposedPort(80),
-                new ExposedPort(123, InternetProtocol.UDP)
+                new ExposedPort(123, InternetProtocol.UDP),
+                new ExposedPort(3868, InternetProtocol.SCTP)
         ));
     }
 }

From fe0ce6674e4add002e2bdf30c7df9bfd0a5430c4 Mon Sep 17 00:00:00 2001
From: Benjamin Muschko <benjamin.muschko@gmail.com>
Date: Sat, 7 Mar 2020 14:36:29 -0700
Subject: [PATCH 0986/1272] Introduce extrahosts parameter for building an
 image (#1340)

* Introduce extrahosts parameter for building an image

* Pass in a Set of extra hosts
---
 .../dockerjava/api/command/BuildImageCmd.java | 22 +++++++++++----
 .../dockerjava/core/RemoteApiVersion.java     |  1 +
 .../core/command/BuildImageCmdImpl.java       | 28 +++++++++++++------
 .../core/exec/BuildImageCmdExec.java          |  4 +++
 .../dockerjava/cmd/BuildImageCmdIT.java       | 18 ++++++++++++
 5 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 2556930c0..1b7b76a67 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -1,17 +1,16 @@
 package com.github.dockerjava.api.command;
 
+import com.github.dockerjava.api.model.AuthConfigurations;
+import com.github.dockerjava.api.model.BuildResponseItem;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 import java.io.File;
 import java.io.InputStream;
 import java.net.URI;
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
-import com.github.dockerjava.api.model.AuthConfigurations;
-import com.github.dockerjava.api.model.BuildResponseItem;
-
 /**
  * Build an image from Dockerfile.
  * <p>
@@ -145,6 +144,12 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
     @CheckForNull
     String getTarget();
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_28}
+     */
+    @CheckForNull
+    Set<String> getExtraHosts();
+
     // setters
 
     /**
@@ -223,6 +228,11 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
      */
     BuildImageCmd withTarget(String target);
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_28}
+     */
+    BuildImageCmd withExtraHosts(Set<String> extraHosts);
+
     @Override
     default BuildImageResultCallback start() {
         return exec(new BuildImageResultCallback());
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index 859d6f0b5..a38930cb3 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -79,6 +79,7 @@ public class RemoteApiVersion implements Serializable {
 
     public static final RemoteApiVersion VERSION_1_26 = RemoteApiVersion.create(1, 26);
     public static final RemoteApiVersion VERSION_1_27 = RemoteApiVersion.create(1, 27);
+    public static final RemoteApiVersion VERSION_1_28 = RemoteApiVersion.create(1, 28);
     public static final RemoteApiVersion VERSION_1_29 = RemoteApiVersion.create(1, 29);
     public static final RemoteApiVersion VERSION_1_30 = RemoteApiVersion.create(1, 30);
     public static final RemoteApiVersion VERSION_1_31 = RemoteApiVersion.create(1, 31);
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index cf24c0014..1bd1af576 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -1,7 +1,12 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import com.github.dockerjava.api.command.BuildImageCmd;
+import com.github.dockerjava.api.model.AuthConfigurations;
+import com.github.dockerjava.api.model.BuildResponseItem;
+import com.github.dockerjava.core.dockerfile.Dockerfile;
+import com.github.dockerjava.core.util.FilePathUtil;
 
+import javax.annotation.CheckForNull;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -10,13 +15,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import com.github.dockerjava.api.command.BuildImageCmd;
-import com.github.dockerjava.api.model.AuthConfigurations;
-import com.github.dockerjava.api.model.BuildResponseItem;
-import com.github.dockerjava.core.dockerfile.Dockerfile;
-import com.github.dockerjava.core.util.FilePathUtil;
-
-import javax.annotation.CheckForNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * Build an image from Dockerfile.
@@ -72,6 +71,8 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR
 
     private String target;
 
+    private Set<String> extraHosts;
+
     public BuildImageCmdImpl(BuildImageCmd.Exec exec) {
         super(exec);
     }
@@ -218,6 +219,11 @@ public Long getShmsize() {
         return shmsize;
     }
 
+    @Override
+    public Set<String> getExtraHosts() {
+        return extraHosts;
+    }
+
     // setters
 
     /**
@@ -402,6 +408,12 @@ public BuildImageCmd withTarget(String target) {
         return this;
     }
 
+    @Override
+    public BuildImageCmd withExtraHosts(Set<String> extraHosts) {
+        this.extraHosts = extraHosts;
+        return this;
+    }
+
     @Override
     public void close() {
         super.close();
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
index 1a8cd37e5..edf9b6bf9 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
@@ -117,6 +117,10 @@ protected Void execute0(BuildImageCmd command, ResultCallback<BuildResponseItem>
             webTarget = webTarget.queryParam("target", command.getTarget());
         }
 
+        if (command.getExtraHosts() != null) {
+            webTarget = webTarget.queryParamsSet("extrahosts", command.getExtraHosts());
+        }
+
         LOGGER.trace("POST: {}", webTarget);
 
         InvocationBuilder builder = resourceWithOptionalAuthConfig(command, webTarget.request())
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
index 1431fc2ab..a0402b975 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
@@ -31,6 +31,7 @@
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_21;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_23;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_27;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_28;
 import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
 import static org.apache.commons.io.FileUtils.writeStringToFile;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -331,6 +332,23 @@ public void quiet() {
         LOG.info("Image Inspect: {}", inspectImageResponse.toString());
     }
 
+    @Test
+    public void extraHosts() {
+        assumeThat(dockerRule, isGreaterOrEqual(VERSION_1_28));
+
+        File baseDir = fileFromBuildTestResource("labels");
+
+        String imageId = dockerRule.getClient()
+                .buildImageCmd(baseDir)
+                .withExtraHosts(new HashSet<>(Arrays.asList("host1")))
+                .start()
+                .awaitImageId();
+
+        InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec();
+        assertThat(inspectImageResponse, not(nullValue()));
+        LOG.info("Image Inspect: {}", inspectImageResponse.toString());
+    }
+
     public void dockerfileNotInBaseDirectory() throws Exception {
         File baseDirectory = fileFromBuildTestResource("dockerfileNotInBaseDirectory");
         File dockerfile = fileFromBuildTestResource("dockerfileNotInBaseDirectory/dockerfileFolder/Dockerfile");

From 978ac882a2c004e8edd317c2c80e4e2c855a1bc3 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 8 Mar 2020 00:36:51 +0300
Subject: [PATCH 0987/1272] Add timeouts, cleanup (#1336)

* Add timeouts, cleanup

* Enlarge timeout

* restore value ffor tests

* Mac ttypos

* Configurable options with default

* allign

* Comment

* Unformat
---
 .../core/AbstractDockerCmdExecFactory.java    | 19 ++++++++
 .../jaxrs/JerseyDockerCmdExecFactory.java     | 14 ------
 .../netty/NettyDockerCmdExecFactory.java      | 27 ++---------
 .../okhttp/OkHttpDockerCmdExecFactory.java    | 47 +++++++++++++------
 .../java/com/github/dockerjava/cmd/CmdIT.java |  6 +--
 .../com/github/dockerjava/cmd/StatsCmdIT.java | 15 +++---
 6 files changed, 68 insertions(+), 60 deletions(-)

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
index 34fdceb37..7088b7277 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
@@ -150,6 +150,9 @@ public abstract class AbstractDockerCmdExecFactory implements DockerCmdExecFacto
 
     private DockerClientConfig dockerClientConfig;
 
+    protected Integer connectTimeout;
+    protected Integer readTimeout;
+
     protected DockerClientConfig getDockerClientConfig() {
         checkNotNull(dockerClientConfig,
                 "Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!");
@@ -172,6 +175,22 @@ public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() {
         return new CopyArchiveToContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    /**
+     * Configure connection timeout in milliseconds
+     */
+    public AbstractDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) {
+        this.connectTimeout = connectTimeout;
+        return this;
+    }
+
+    /**
+     * Configure read timeout in milliseconds
+     */
+    public AbstractDockerCmdExecFactory withReadTimeout(Integer readTimeout) {
+        this.readTimeout = readTimeout;
+        return this;
+    }
+
     @Override
     public AuthCmd.Exec createAuthCmdExec() {
         return new AuthCmdExec(getBaseResource(), getDockerClientConfig());
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
index edd659678..97ec72384 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -50,10 +50,6 @@ public class JerseyDockerCmdExecFactory extends AbstractDockerCmdExecFactory {
 
     private JerseyWebTarget baseResource;
 
-    private Integer readTimeout = null;
-
-    private Integer connectTimeout = null;
-
     private Integer maxTotalConnections = null;
 
     private Integer maxPerRouteConnections = null;
@@ -262,16 +258,6 @@ public void close() throws IOException {
         connManager.close();
     }
 
-    public JerseyDockerCmdExecFactory withReadTimeout(Integer readTimeout) {
-        this.readTimeout = readTimeout;
-        return this;
-    }
-
-    public JerseyDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) {
-        this.connectTimeout = connectTimeout;
-        return this;
-    }
-
     public JerseyDockerCmdExecFactory withMaxTotalConnections(Integer maxTotalConnections) {
         this.maxTotalConnections = maxTotalConnections;
         return this;
diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index efc47a742..cc1c4452b 100644
--- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.netty;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.nonNull;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -58,7 +59,7 @@
  * @see https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#attach-to-a-container
  * @see https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#exec-start
  */
-public class NettyDockerCmdExecFactory extends AbstractDockerCmdExecFactory implements DockerCmdExecFactory {
+public class NettyDockerCmdExecFactory extends AbstractDockerCmdExecFactory {
 
     private static String threadPrefix = "dockerjava-netty";
 
@@ -88,10 +89,6 @@ public DuplexChannel getChannel() {
         }
     };
 
-    private Integer connectTimeout = null;
-
-    private Integer readTimeout = null;
-
     @Override
     public void init(DockerClientConfig dockerClientConfig) {
         super.init(dockerClientConfig);
@@ -292,29 +289,13 @@ public void close() throws IOException {
         eventLoopGroup.shutdownGracefully();
     }
 
-    /**
-     * Configure connection timeout in milliseconds
-     */
-    public NettyDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) {
-        this.connectTimeout = connectTimeout;
-        return this;
-    }
-
-    /**
-     * Configure read timeout in milliseconds
-     */
-    public NettyDockerCmdExecFactory withReadTimeout(Integer readTimeout) {
-        this.readTimeout = readTimeout;
-        return this;
-    }
-
     private <T extends Channel> T configure(T channel) {
         ChannelConfig channelConfig = channel.config();
 
-        if (connectTimeout != null) {
+        if (nonNull(connectTimeout)) {
             channelConfig.setConnectTimeoutMillis(connectTimeout);
         }
-        if (readTimeout != null) {
+        if (nonNull(readTimeout)) {
             channel.pipeline().addLast("readTimeoutHandler", new ReadTimeoutHandler());
         }
 
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
index fb34bce7a..7b0030e40 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
@@ -20,6 +20,8 @@
 import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 
+import static java.util.Objects.nonNull;
+
 public class OkHttpDockerCmdExecFactory extends AbstractDockerCmdExecFactory {
 
     private static final String SOCKET_SUFFIX = ".socket";
@@ -27,16 +29,36 @@ public class OkHttpDockerCmdExecFactory extends AbstractDockerCmdExecFactory {
     private ObjectMapper objectMapper;
 
     private OkHttpClient okHttpClient;
+    private Boolean retryOnConnectionFailure;
 
     private HttpUrl baseUrl;
 
+    public OkHttpDockerCmdExecFactory setRetryOnConnectionFailure(Boolean retryOnConnectionFailure) {
+        this.retryOnConnectionFailure = retryOnConnectionFailure;
+        return this;
+    }
+
     @Override
     public void init(DockerClientConfig dockerClientConfig) {
         super.init(dockerClientConfig);
 
-        OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder()
-            .readTimeout(0, TimeUnit.SECONDS)
-            .retryOnConnectionFailure(true);
+        OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
+        if (nonNull(readTimeout)) {
+            clientBuilder.readTimeout(readTimeout, TimeUnit.MILLISECONDS);
+        } else {
+            // default is too small for most docker commands, set default like in jersey/netty
+            clientBuilder.readTimeout(0, TimeUnit.MILLISECONDS);
+        }
+
+        if (nonNull(connectTimeout)) {
+            clientBuilder.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS);
+        }
+
+        if (nonNull(retryOnConnectionFailure)) {
+            clientBuilder.retryOnConnectionFailure(retryOnConnectionFailure);
+        } else {
+            clientBuilder.retryOnConnectionFailure(true);
+        }
 
         URI dockerHost = dockerClientConfig.getDockerHost();
         switch (dockerHost.getScheme()) {
@@ -45,11 +67,9 @@ public void init(DockerClientConfig dockerClientConfig) {
                 String socketPath = dockerHost.getPath();
 
                 if ("unix".equals(dockerHost.getScheme())) {
-                    clientBuilder
-                        .socketFactory(new UnixSocketFactory(socketPath));
+                    clientBuilder.socketFactory(new UnixSocketFactory(socketPath));
                 } else {
-                    clientBuilder
-                        .socketFactory(new NamedPipeSocketFactory(socketPath));
+                    clientBuilder.socketFactory(new NamedPipeSocketFactory(socketPath));
                 }
 
                 clientBuilder
@@ -72,8 +92,7 @@ public void init(DockerClientConfig dockerClientConfig) {
                 SSLContext sslContext = sslConfig.getSSLContext();
                 if (sslContext != null) {
                     isSSL = true;
-                    clientBuilder
-                            .sslSocketFactory(sslContext.getSocketFactory(), new TrustAllX509TrustManager());
+                    clientBuilder.sslSocketFactory(sslContext.getSocketFactory(), new TrustAllX509TrustManager());
                 }
             } catch (Exception e) {
                 throw new RuntimeException(e);
@@ -88,14 +107,14 @@ public void init(DockerClientConfig dockerClientConfig) {
             case "unix":
             case "npipe":
                 baseUrlBuilder = new HttpUrl.Builder()
-                        .scheme("http")
-                        .host("docker" + SOCKET_SUFFIX);
+                    .scheme("http")
+                    .host("docker" + SOCKET_SUFFIX);
                 break;
             case "tcp":
                 baseUrlBuilder = new HttpUrl.Builder()
-                        .scheme(isSSL ? "https" : "http")
-                        .host(dockerHost.getHost())
-                        .port(dockerHost.getPort());
+                    .scheme(isSSL ? "https" : "http")
+                    .host(dockerHost.getHost())
+                    .port(dockerHost.getPort());
                 break;
             default:
                 baseUrlBuilder = HttpUrl.get(dockerHost.toString()).newBuilder();
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
index e1784f0a9..215a552b6 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
@@ -23,19 +23,19 @@ public enum FactoryType {
         NETTY(true) {
             @Override
             public DockerCmdExecFactory createExecFactory() {
-                return new NettyDockerCmdExecFactory().withConnectTimeout(10 * 1000);
+                return new NettyDockerCmdExecFactory().withConnectTimeout(30 * 1000);
             }
         },
         JERSEY(false) {
             @Override
             public DockerCmdExecFactory createExecFactory() {
-                return new JerseyDockerCmdExecFactory().withConnectTimeout(10 * 1000);
+                return new JerseyDockerCmdExecFactory().withConnectTimeout(30 * 1000);
             }
         },
         OKHTTP(true) {
             @Override
             public DockerCmdExecFactory createExecFactory() {
-                return new OkHttpDockerCmdExecFactory();
+                return new OkHttpDockerCmdExecFactory().withConnectTimeout(30 * 1000);
             }
         };
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java
index 377d4765c..c4f9fef57 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StatsCmdIT.java
@@ -1,8 +1,8 @@
 package com.github.dockerjava.cmd;
 
+import com.github.dockerjava.api.async.ResultCallbackTemplate;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.model.Statistics;
-import com.github.dockerjava.core.async.ResultCallbackTemplate;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,8 +28,10 @@ public void testStatsStreaming() throws InterruptedException, IOException {
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
         boolean gotStats = false;
-        try (StatsCallbackTest statsCallback = dockerRule.getClient().statsCmd(container.getId()).exec(
-                new StatsCallbackTest(countDownLatch))) {
+        try (StatsCallbackTest statsCallback = dockerRule.getClient()
+            .statsCmd(container.getId())
+            .exec(new StatsCallbackTest(countDownLatch))) {
+
             assertTrue(countDownLatch.await(10, TimeUnit.SECONDS));
             gotStats = statsCallback.gotStats();
 
@@ -52,8 +54,9 @@ public void testStatsNoStreaming() throws InterruptedException, IOException {
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        try (StatsCallbackTest statsCallback = dockerRule.getClient().statsCmd(container.getId()).withNoStream(true).exec(
-                new StatsCallbackTest(countDownLatch))) {
+        try (StatsCallbackTest statsCallback = dockerRule.getClient().statsCmd(container.getId())
+            .withNoStream(true)
+            .exec(new StatsCallbackTest(countDownLatch))) {
             countDownLatch.await(5, TimeUnit.SECONDS);
 
             LOG.info("Stop stats collection");
@@ -67,7 +70,7 @@ public void testStatsNoStreaming() throws InterruptedException, IOException {
         assertEquals("Expected stats called only once", countDownLatch.getCount(), NUM_STATS - 1);
     }
 
-    private class StatsCallbackTest extends ResultCallbackTemplate<StatsCallbackTest, Statistics> {
+    private static class StatsCallbackTest extends ResultCallbackTemplate<StatsCallbackTest, Statistics> {
         private final CountDownLatch countDownLatch;
 
         private Boolean gotStats = false;

From 52c2abf848a923f14ae271f46cd142966e2c6fd4 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 8 Mar 2020 00:40:14 +0300
Subject: [PATCH 0988/1272] [maven-release-plugin] prepare release 3.2.0-rc6

---
 docker-java-api/pom.xml              | 2 +-
 docker-java-core/pom.xml             | 2 +-
 docker-java-transport-jersey/pom.xml | 2 +-
 docker-java-transport-netty/pom.xml  | 2 +-
 docker-java-transport-okhttp/pom.xml | 2 +-
 docker-java/pom.xml                  | 2 +-
 pom.xml                              | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 008ec87ba..dd983a01a 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc6</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index a26e07d87..2d6ab7420 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc6</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index 8928cb86d..0d63946d8 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc6</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml
index c939be262..f5e0e308d 100644
--- a/docker-java-transport-netty/pom.xml
+++ b/docker-java-transport-netty/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc6</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index fd920185f..b77b8c016 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc6</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 3c127de28..05ba3b2c0 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-rc6</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index c8deb44dc..e6bc79cff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.2.0-SNAPSHOT</version>
+	<version>3.2.0-rc6</version>
 
 	<name>docker-java-parent</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.2.0-rc6</tag>
 	</scm>
 
 	<developers>

From a9d11db50a18f2b08c778dad2117cbe8cbd0a7f6 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Sun, 8 Mar 2020 00:40:23 +0300
Subject: [PATCH 0989/1272] [maven-release-plugin] prepare for next development
 iteration

---
 docker-java-api/pom.xml              | 2 +-
 docker-java-core/pom.xml             | 2 +-
 docker-java-transport-jersey/pom.xml | 2 +-
 docker-java-transport-netty/pom.xml  | 2 +-
 docker-java-transport-okhttp/pom.xml | 2 +-
 docker-java/pom.xml                  | 2 +-
 pom.xml                              | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index dd983a01a..008ec87ba 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc6</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index 2d6ab7420..a26e07d87 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc6</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index 0d63946d8..8928cb86d 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc6</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml
index f5e0e308d..c939be262 100644
--- a/docker-java-transport-netty/pom.xml
+++ b/docker-java-transport-netty/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc6</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index b77b8c016..fd920185f 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc6</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 05ba3b2c0..3c127de28 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-rc6</version>
+		<version>3.2.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index e6bc79cff..c8deb44dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.2.0-rc6</version>
+	<version>3.2.0-SNAPSHOT</version>
 
 	<name>docker-java-parent</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.2.0-rc6</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 2ef692cedc1aae49f9a8c891867163b5e0d56ecf Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 9 Mar 2020 00:42:01 +0300
Subject: [PATCH 0990/1272] Create main.yml

---
 .github/workflows/main.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 000000000..2c30bcdb1
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,16 @@
+name: Release Drafter
+
+on:
+  push:
+    # branches to consider in the event; optional, defaults to all
+    branches:
+      - master
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      # Drafts your next Release notes as Pull Requests are merged into "master"
+      - uses: release-drafter/release-drafter@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 63216521aae8b335d071f3b56f990cd7e8087b34 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 9 Mar 2020 00:44:11 +0300
Subject: [PATCH 0991/1272] Create release-drafter.yml

---
 .github/release-drafter.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/release-drafter.yml

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
new file mode 100644
index 000000000..6b0cb0261
--- /dev/null
+++ b/.github/release-drafter.yml
@@ -0,0 +1,17 @@
+categories:
+  - title: '🚀 Features'
+    labels:
+      - 'feature'
+      - 'enhancement'
+  - title: '🐛 Bug Fixes'
+    labels:
+      - 'fix'
+      - 'bugfix'
+      - 'bug'
+  - title: '🧰 Maintenance'
+    label: 'chore'
+change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+template: |
+  ## Changes
+
+  $CHANGES

From 0698e9c7aef6faf6df6fdcf8ea13cb67f780bbc1 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 9 Mar 2020 23:02:59 +0300
Subject: [PATCH 0992/1272] Update README.md

---
 README.md | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index ef504a1e8..af7ed6803 100644
--- a/README.md
+++ b/README.md
@@ -12,10 +12,6 @@
 
 Java API client for [Docker](http://docs.docker.io/ "Docker")
 
-<b>The current implementation is based on Jersey 2.x and therefore classpath incompatible with older Jersey 1.x dependent libraries!</b>
-
-Developer forum for [docker-java](https://groups.google.com/forum/?#!forum/docker-java-dev "docker-java")
-
 [Changelog](https://github.com/docker-java/docker-java/blob/master/CHANGELOG.md)<br/>
 [Wiki](https://github.com/docker-java/docker-java/wiki)
 
@@ -23,7 +19,7 @@ Developer forum for [docker-java](https://groups.google.com/forum/?#!forum/docke
 
 ###### Prerequisites:
 
-* Java min 1.7
+* Java min 1.8
 * Maven 3
 
 Build and run integration tests as follows:
@@ -52,7 +48,14 @@ For secure tls (https) communication:
     DOCKER_CERT_PATH=/Users/marcus/.docker/machine/machines/docker-1.11.2
 
 ### Latest release version
-Supports a subset of the Docker Remote API [v1.37](https://docs.docker.com/engine/api/v1.37/), Docker Server version since 1.12.6
+[Maven repository modules](https://mvnrepository.com/artifact/com.github.docker-java)
+
+Since 3.2.0 project provides 3 transports:
+- `docker-java-transport-jersey` (doesn't support streams)
+- `docker-java-transport-netty`
+- `docker-java-transport-okhttp`
+
+For backward compatibility `docker-java` module keeping dependency only on jersey and netty transports. 
 
     <dependency>
           <groupId>com.github.docker-java</groupId>
@@ -139,4 +142,3 @@ In `$HOME/.docker-java.properties`
 ##### Class Path
 
 In the class path at `/docker-java.properties`
-    

From 18b57e2a0ae6b9d08676454ceee819f08374ea7e Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 9 Mar 2020 23:09:35 +0300
Subject: [PATCH 0993/1272] Breaf update

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96a1b9d6e..0ca44ee2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@ Change Log
 ===
 
 
+## 3.2.0
+- **Changelog is not maintained in this file. Please follow git diff or github releases.**
+- Library was split into multiple modules to get ability to choose transports.
+Okhttp was added (say thanks to @bsideup).
+- Various cleanup, tests de-duplication internally. Planned binary compatibility breakage was reverted by @testcontainers project, so migration should work smoothly. Please switch to non-deprecated methods.
+- Appeared various new commands and Fields(command options for existing commands).
+
 ## 3.1.2
 - update unix-socket to 2.2.0
 - Remove `JacksonJaxbJsonProvider` from `FiltersEncoder`

From 024cbb64c81f09333fdf07c38703c11ff2bf9b28 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 9 Mar 2020 23:12:13 +0300
Subject: [PATCH 0994/1272] [maven-release-plugin] prepare release 3.2.0

---
 docker-java-api/pom.xml              | 2 +-
 docker-java-core/pom.xml             | 2 +-
 docker-java-transport-jersey/pom.xml | 2 +-
 docker-java-transport-netty/pom.xml  | 2 +-
 docker-java-transport-okhttp/pom.xml | 2 +-
 docker-java/pom.xml                  | 2 +-
 pom.xml                              | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 008ec87ba..76fb910ea 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index a26e07d87..f455b2678 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index 8928cb86d..db6a837ba 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml
index c939be262..0557b5040 100644
--- a/docker-java-transport-netty/pom.xml
+++ b/docker-java-transport-netty/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index fd920185f..e63d22404 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 3c127de28..1800453d4 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index c8deb44dc..f0a401417 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.2.0-SNAPSHOT</version>
+	<version>3.2.0</version>
 
 	<name>docker-java-parent</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>HEAD</tag>
+		<tag>3.2.0</tag>
 	</scm>
 
 	<developers>

From d808c962192c3b9f4219ca20e406bc8c073eca0b Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 9 Mar 2020 23:12:22 +0300
Subject: [PATCH 0995/1272] [maven-release-plugin] prepare for next development
 iteration

---
 docker-java-api/pom.xml              | 2 +-
 docker-java-core/pom.xml             | 2 +-
 docker-java-transport-jersey/pom.xml | 2 +-
 docker-java-transport-netty/pom.xml  | 2 +-
 docker-java-transport-okhttp/pom.xml | 2 +-
 docker-java/pom.xml                  | 2 +-
 pom.xml                              | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 76fb910ea..005cdf16f 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index f455b2678..f8c4ee07d 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index db6a837ba..971f8e997 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml
index 0557b5040..c205e0802 100644
--- a/docker-java-transport-netty/pom.xml
+++ b/docker-java-transport-netty/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index e63d22404..d8d72de6e 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 1800453d4..151bde4c6 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index f0a401417..7f0bd6713 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.2.0</version>
+	<version>3.2.1-SNAPSHOT</version>
 
 	<name>docker-java-parent</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -28,7 +28,7 @@
 		<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
 		<url>git@github.com:docker-java/docker-java.git</url>
 		<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
-		<tag>3.2.0</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<developers>

From 1f2aa6d84cc98dd62ba125389245c1e5b2798dc5 Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Mon, 9 Mar 2020 23:45:16 +0300
Subject: [PATCH 0996/1272] Update README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index af7ed6803..a67905b35 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 [![Join the chat at https://gitter.im/docker-java/docker-java](https://badges.gitter.im/docker-java/docker-java.svg)](https://gitter.im/docker-java/docker-java?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Maven Central](https://img.shields.io/maven-central/v/com.github.docker-java/docker-java.svg)](https://mvnrepository.com/artifact/com.github.docker-java/docker-java)
 [![Bintray](https://api.bintray.com/packages/kostyasha/maven/com.github.docker-java%3Adocker-java/images/download.svg)](https://bintray.com/kostyasha/maven/com.github.docker-java%3Adocker-java/_latestVersion) 
-[![Reference Status](https://www.versioneye.com/java/com.github.docker-java:docker-java/reference_badge.svg?style=flat)](https://www.versioneye.com/java/com.github.docker-java:docker-java/references)
 [![Build Status](https://travis-ci.org/docker-java/docker-java.svg?branch=master)](https://travis-ci.org/docker-java/docker-java)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/9177/badge.svg?flat=1)](https://scan.coverity.com/projects/9177)
 [![codecov.io](http://codecov.io/github/docker-java/docker-java/coverage.svg?branch=master)](http://codecov.io/github/docker-java/docker-java?branch=master)

From 466de94b3eb4becfffb84e92d5927294e2d27dbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=2E=20Trouv=C3=A9?=
 <30981607+objecttrouve@users.noreply.github.com>
Date: Mon, 9 Mar 2020 21:47:03 +0100
Subject: [PATCH 0997/1272] #1005: Added command to download multiple images.
 (#1343)

Tried to mimic existing patterns as much as possible.
Stick to Java 7.
Rely on the "busybox" image in tests since the test for the single image command does so, too.
---
 .../github/dockerjava/api/DockerClient.java   |  7 +++
 .../api/command/DockerCmdExecFactory.java     |  2 +
 .../dockerjava/api/command/SaveImagesCmd.java | 47 ++++++++++++++
 .../core/AbstractDockerCmdExecFactory.java    |  7 +++
 .../dockerjava/core/DockerClientImpl.java     |  7 +++
 .../core/command/SaveImagesCmdImpl.java       | 63 +++++++++++++++++++
 .../core/exec/SaveImagesCmdExec.java          | 39 ++++++++++++
 .../dockerjava/cmd/SaveImagesCmdIT.java       | 45 +++++++++++++
 .../core/TestDockerCmdExecFactory.java        |  6 ++
 .../junit/DockerCmdExecFactoryDelegate.java   |  6 ++
 10 files changed, 229 insertions(+)
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/SaveImagesCmd.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImagesCmdImpl.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/exec/SaveImagesCmdExec.java
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/SaveImagesCmdIT.java

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
index 7762be0a7..3857f2fa2 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -56,6 +56,7 @@
 import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
+import com.github.dockerjava.api.command.SaveImagesCmd;
 import com.github.dockerjava.api.command.SearchImagesCmd;
 import com.github.dockerjava.api.command.StartContainerCmd;
 import com.github.dockerjava.api.command.StatsCmd;
@@ -137,6 +138,12 @@ public interface DockerClient extends Closeable {
      */
     SaveImageCmd saveImageCmd(@Nonnull String name);
 
+    /**
+     * Command to download multiple images at once.
+     * @return command (builder)
+     */
+    SaveImagesCmd saveImagesCmd();
+
     /**
      * * CONTAINER API *
      */
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index 06cf8eae0..e01d9239f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -21,6 +21,8 @@ public interface DockerCmdExecFactory extends Closeable {
 
     SaveImageCmd.Exec createSaveImageCmdExec();
 
+    SaveImagesCmd.Exec createSaveImagesCmdExec();
+
     CreateImageCmd.Exec createCreateImageCmdExec();
 
     LoadImageCmd.Exec createLoadImageCmdExec();
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/SaveImagesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/SaveImagesCmd.java
new file mode 100644
index 000000000..1dd504434
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/SaveImagesCmd.java
@@ -0,0 +1,47 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+
+import javax.annotation.Nonnull;
+import java.io.InputStream;
+import java.util.List;
+
+/** Command for downloading multiple images at once. */
+public interface SaveImagesCmd extends SyncDockerCmd<InputStream> {
+
+    /** Image name and tag. */
+    interface TaggedImage {
+
+        /**
+         * The (tagged) image name.
+         * @return "name:tag" if a tag was specified, otherwise "name"
+         */
+        String asString();
+    }
+
+    /**
+     * Adds an image to the list of images to download.
+     * @param name image name (not null)
+     * @param tag tag
+     * @return this
+     */
+    SaveImagesCmd withImage(@Nonnull String name, @Nonnull String tag);
+
+
+    /**
+     * Gets the images that were added by {@link #withImage(String, String)}.
+     * @return images to be downloaded
+     */
+    List<TaggedImage> getImages();
+
+    /**
+     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
+     *
+     * @throws NotFoundException no such image
+     */
+    InputStream exec() throws NotFoundException;
+
+    interface Exec extends DockerCmdSyncExec<SaveImagesCmd, InputStream> {
+    }
+
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
index 7088b7277..e93260b8a 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
@@ -59,6 +59,7 @@
 import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
+import com.github.dockerjava.api.command.SaveImagesCmd;
 import com.github.dockerjava.api.command.SearchImagesCmd;
 import com.github.dockerjava.api.command.StartContainerCmd;
 import com.github.dockerjava.api.command.StatsCmd;
@@ -130,6 +131,7 @@
 import com.github.dockerjava.core.exec.RenameContainerCmdExec;
 import com.github.dockerjava.core.exec.RestartContainerCmdExec;
 import com.github.dockerjava.core.exec.SaveImageCmdExec;
+import com.github.dockerjava.core.exec.SaveImagesCmdExec;
 import com.github.dockerjava.core.exec.SearchImagesCmdExec;
 import com.github.dockerjava.core.exec.StartContainerCmdExec;
 import com.github.dockerjava.core.exec.StatsCmdExec;
@@ -226,6 +228,11 @@ public SaveImageCmd.Exec createSaveImageCmdExec() {
         return new SaveImageCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public SaveImagesCmd.Exec createSaveImagesCmdExec() {
+        return new SaveImagesCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public CreateImageCmd.Exec createCreateImageCmdExec() {
         return new CreateImageCmdExec(getBaseResource(), getDockerClientConfig());
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 3f06ec0da..85f21d476 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -58,6 +58,7 @@
 import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
+import com.github.dockerjava.api.command.SaveImagesCmd;
 import com.github.dockerjava.api.command.SearchImagesCmd;
 import com.github.dockerjava.api.command.StartContainerCmd;
 import com.github.dockerjava.api.command.StatsCmd;
@@ -133,6 +134,7 @@
 import com.github.dockerjava.core.command.RenameContainerCmdImpl;
 import com.github.dockerjava.core.command.RestartContainerCmdImpl;
 import com.github.dockerjava.core.command.SaveImageCmdImpl;
+import com.github.dockerjava.core.command.SaveImagesCmdImpl;
 import com.github.dockerjava.core.command.SearchImagesCmdImpl;
 import com.github.dockerjava.core.command.StartContainerCmdImpl;
 import com.github.dockerjava.core.command.StatsCmdImpl;
@@ -283,6 +285,11 @@ public SaveImageCmd saveImageCmd(String name) {
         return new SaveImageCmdImpl(getDockerCmdExecFactory().createSaveImageCmdExec(), name);
     }
 
+    @Override
+    public SaveImagesCmd saveImagesCmd() {
+        return new SaveImagesCmdImpl(getDockerCmdExecFactory().createSaveImagesCmdExec());
+    }
+
     @Override
     public CreateImageCmd createImageCmd(String repository, InputStream imageStream) {
         return new CreateImageCmdImpl(getDockerCmdExecFactory().createCreateImageCmdExec(), repository, imageStream);
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImagesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImagesCmdImpl.java
new file mode 100644
index 000000000..0563e16fe
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImagesCmdImpl.java
@@ -0,0 +1,63 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.SaveImagesCmd;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.google.common.collect.ImmutableList;
+
+import javax.annotation.Nonnull;
+import java.io.InputStream;
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+public class SaveImagesCmdImpl extends AbstrDockerCmd<SaveImagesCmd, InputStream> implements SaveImagesCmd {
+
+    private static class TaggedImageImpl implements TaggedImage {
+        private final String name;
+        private final String tag;
+
+        private TaggedImageImpl(String name, String tag) {
+            checkNotNull(name, "image name was not specified");
+            checkNotNull(tag, "image tag was not specified");
+            this.name = name;
+            this.tag = tag;
+        }
+
+        @Override
+        public String asString() {
+            return name + ":" + tag;
+        }
+
+        @Override
+        public String toString() {
+            return asString();
+        }
+    }
+
+    private final ImmutableList.Builder<TaggedImage> taggedImages = ImmutableList.builder();
+
+    public SaveImagesCmdImpl(final SaveImagesCmd.Exec exec) {
+        super(exec);
+    }
+
+    @Override
+    public SaveImagesCmd withImage(@Nonnull final String name, @Nonnull final String tag) {
+        taggedImages.add(new TaggedImageImpl(name, tag));
+        return this;
+    }
+
+
+
+    @Override
+    public List<TaggedImage> getImages() {
+        return taggedImages.build();
+    }
+
+    /**
+     * @throws NotFoundException No such images
+     */
+    @Override
+    public InputStream exec() throws NotFoundException {
+        return super.exec();
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SaveImagesCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SaveImagesCmdExec.java
new file mode 100644
index 000000000..a1bb47c05
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SaveImagesCmdExec.java
@@ -0,0 +1,39 @@
+package com.github.dockerjava.core.exec;
+
+import com.github.dockerjava.api.command.SaveImagesCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
+import com.google.common.collect.ImmutableSet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.InputStream;
+import java.util.List;
+
+public class SaveImagesCmdExec extends AbstrSyncDockerCmdExec<SaveImagesCmd, InputStream> implements SaveImagesCmd.Exec {
+    private static final Logger LOGGER = LoggerFactory.getLogger(SaveImagesCmdExec.class);
+
+    public SaveImagesCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected InputStream execute(SaveImagesCmd command) {
+
+        final List<SaveImagesCmd.TaggedImage> images = command.getImages();
+        if (images.isEmpty()) {
+            LOGGER.warn("No images specified for " + SaveImagesCmd.class.getName() + ".");
+        }
+        final ImmutableSet.Builder<String> queryParamSet = ImmutableSet.builder();
+        for (SaveImagesCmd.TaggedImage image : images) {
+            queryParamSet.add(image.asString());
+        }
+        final WebTarget webResource = getBaseResource()
+            .path("/images/get")
+            .queryParamsSet("names", queryParamSet.build());
+
+        LOGGER.trace("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get();
+    }
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImagesCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImagesCmdIT.java
new file mode 100644
index 000000000..2b5305d68
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImagesCmdIT.java
@@ -0,0 +1,45 @@
+package com.github.dockerjava.cmd;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.InputStream;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.not;
+
+public class SaveImagesCmdIT extends CmdIT {
+    public static final Logger LOG = LoggerFactory.getLogger(SaveImagesCmdIT.class);
+
+    @Test
+    public void saveNoImages() throws Exception {
+        try(final InputStream image = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImagesCmd().exec())){
+            assertThat(image.read(), not(-1));
+        }
+
+    }
+
+    @Test
+    public void saveImagesWithNameAndTag() throws Exception {
+
+        try(final InputStream image = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImagesCmd().withImage("busybox", "latest").exec())) {
+            assertThat(image.read(), not(-1));
+        }
+
+    }
+
+    @Test
+    public void saveMultipleImages() throws Exception {
+
+        try(final InputStream image = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImagesCmd()
+            // Not a real life use-case but "busybox" is the only one I dare to assume is really there.
+            .withImage("busybox", "latest")
+            .withImage("busybox", "latest")
+            .exec())) {
+            assertThat(image.read(), not(-1));
+        }
+    }
+
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
index a052e0d58..64280c386 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
@@ -63,6 +63,7 @@
 import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
+import com.github.dockerjava.api.command.SaveImagesCmd;
 import com.github.dockerjava.api.command.SearchImagesCmd;
 import com.github.dockerjava.api.command.StartContainerCmd;
 import com.github.dockerjava.api.command.StatsCmd;
@@ -215,6 +216,11 @@ public SaveImageCmd.Exec createSaveImageCmdExec() {
         return delegate.createSaveImageCmdExec();
     }
 
+    @Override
+    public SaveImagesCmd.Exec createSaveImagesCmdExec() {
+        return delegate.createSaveImagesCmdExec();
+    }
+
     @Override
     public SearchImagesCmd.Exec createSearchImagesCmdExec() {
         return delegate.createSearchImagesCmdExec();
diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java
index a46c288bf..dba592a4d 100644
--- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java
+++ b/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java
@@ -60,6 +60,7 @@
 import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
+import com.github.dockerjava.api.command.SaveImagesCmd;
 import com.github.dockerjava.api.command.SearchImagesCmd;
 import com.github.dockerjava.api.command.StartContainerCmd;
 import com.github.dockerjava.api.command.StatsCmd;
@@ -133,6 +134,11 @@ public SaveImageCmd.Exec createSaveImageCmdExec() {
         return delegate.createSaveImageCmdExec();
     }
 
+    @Override
+    public SaveImagesCmd.Exec createSaveImagesCmdExec() {
+        return delegate.createSaveImagesCmdExec();
+    }
+
     @Override
     public CreateImageCmd.Exec createCreateImageCmdExec() {
         return delegate.createCreateImageCmdExec();

From c3d03d6bc2770cf57769479bcfa07ca32344ecda Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 10 Mar 2020 15:01:16 +0300
Subject: [PATCH 0998/1272] Update deps and mvn plugins. (#1344)

Cleanup some deprecated warns from test code
---
 docker-java-api/pom.xml                       |  2 +-
 .../api/model/ContainerNetwork.java           |  3 +-
 .../api/model/InfoRegistryConfig.java         |  4 +-
 .../github/dockerjava/api/model/Network.java  |  9 +-
 .../github/dockerjava/api/model/Ports.java    |  3 +-
 docker-java-transport-jersey/pom.xml          |  2 +-
 docker-java-transport-okhttp/pom.xml          |  2 +-
 docker-java/pom.xml                           |  3 +-
 .../api/ModelsSerializableTest.java           | 17 ++--
 .../command/InspectContainerResponseTest.java | 48 +++++------
 .../api/command/InspectExecResponseTest.java  |  6 +-
 .../api/command/InspectImageResponseTest.java |  6 +-
 .../api/model/BindPropagationTest.java        |  2 +-
 .../dockerjava/api/model/BindsTest.java       |  2 +-
 .../api/model/ExposedPortsTest.java           | 15 ++--
 .../github/dockerjava/api/model/InfoTest.java | 14 +--
 .../dockerjava/api/model/LinksTest.java       |  2 +-
 .../dockerjava/api/model/UlimitsTest.java     |  2 +-
 .../dockerjava/api/model/VolumeBindsTest.java |  2 +-
 .../dockerjava/api/model/VolumesRWTest.java   |  2 +-
 .../dockerjava/api/model/VolumesTest.java     |  2 +-
 .../dockerjava/cmd/AttachContainerCmdIT.java  | 10 +--
 .../com/github/dockerjava/cmd/AuthCmdIT.java  | 16 ++--
 .../dockerjava/cmd/BuildImageCmdIT.java       |  5 +-
 .../github/dockerjava/cmd/CommitCmdIT.java    |  6 +-
 .../dockerjava/cmd/ConnectToNetworkCmdIT.java | 30 +++----
 .../dockerjava/cmd/ContainerDiffCmdIT.java    |  5 +-
 .../dockerjava/cmd/CreateContainerCmdIT.java  | 86 +++++++++----------
 .../dockerjava/cmd/CreateNetworkCmdIT.java    |  2 +-
 .../dockerjava/cmd/ExecCreateCmdImplIT.java   |  7 +-
 .../github/dockerjava/cmd/ExecStartCmdIT.java |  9 +-
 .../dockerjava/cmd/InspectContainerCmdIT.java | 10 +--
 .../dockerjava/cmd/InspectExecCmdIT.java      | 14 +--
 .../dockerjava/cmd/KillContainerCmdIT.java    |  4 +-
 .../dockerjava/cmd/ListContainersCmdIT.java   | 10 +--
 .../dockerjava/cmd/ListImagesCmdIT.java       |  6 +-
 .../dockerjava/cmd/LogContainerCmdIT.java     | 11 +--
 .../com/github/dockerjava/cmd/PauseCmdIT.java | 11 +--
 .../github/dockerjava/cmd/PushImageCmdIT.java |  5 +-
 .../dockerjava/cmd/RemoveImageCmdIT.java      |  5 +-
 .../dockerjava/cmd/RenameContainerCmdIT.java  |  5 +-
 .../cmd/RestartContainerCmdImplIT.java        |  4 +-
 .../dockerjava/cmd/StartContainerCmdIT.java   | 56 ++++++------
 .../dockerjava/cmd/StopContainerCmdIT.java    |  4 +-
 .../github/dockerjava/cmd/UnpauseCmdIT.java   | 13 +--
 .../dockerjava/cmd/WaitContainerCmdIT.java    |  8 +-
 .../cmd/swarm/CreateServiceCmdExecIT.java     |  1 +
 .../cmd/swarm/LogSwarmObjectIT.java           |  6 +-
 .../dockerjava/core/DockerConfigFileTest.java |  2 +-
 pom.xml                                       | 84 +++++++++++-------
 50 files changed, 312 insertions(+), 271 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 005cdf16f..e963d1478 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.10</version>
+			<version>1.18.12</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
index 52acf4c77..6433e15f6 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
@@ -283,7 +283,8 @@ public ContainerNetwork withNetworkID(String networkID) {
     /**
      * Docker named it EndpointIPAMConfig
      */
-    public static class Ipam {
+    public static class Ipam implements Serializable {
+        private static final long serialVersionUID = 1L;
 
         @JsonProperty("IPv4Address")
         private String ipv4Address;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
index 8c4d9f35d..113a4af0a 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
@@ -82,7 +82,9 @@ public InfoRegistryConfig withMirrors(Object mirrors) {
      */
     @EqualsAndHashCode
     @ToString
-    public static final class IndexConfig {
+    public static final class IndexConfig implements Serializable {
+        private static final long serialVersionUID = 1L;
+
         @JsonProperty("Mirrors")
         private List<String> mirrors;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
index 0187d73f4..852746924 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
@@ -94,7 +94,8 @@ public Map<String, String> getLabels() {
 
     @EqualsAndHashCode
     @ToString
-    public static class ContainerNetworkConfig {
+    public static class ContainerNetworkConfig implements Serializable {
+        private static final long serialVersionUID = 1L;
 
         @JsonProperty("EndpointID")
         private String endpointId;
@@ -127,7 +128,8 @@ public String getIpv6Address() {
 
     @EqualsAndHashCode
     @ToString
-    public static class Ipam {
+    public static class Ipam implements Serializable {
+        private static final long serialVersionUID = 1L;
 
         @JsonProperty("Driver")
         private String driver;
@@ -165,7 +167,8 @@ public Ipam withDriver(String driver) {
             return this;
         }
 
-        public static class Config {
+        public static class Config implements Serializable {
+            private static final long serialVersionUID = 1L;
 
             @JsonProperty("Subnet")
             private String subnet;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
index b278e8fc4..897261a09 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -107,7 +107,8 @@ public Map<ExposedPort, Binding[]> getBindings() {
      * @see ExposedPort
      */
     @EqualsAndHashCode
-    public static class Binding {
+    public static class Binding implements Serializable {
+        private static final long serialVersionUID = 1L;
 
         /**
          * Creates a {@link Binding} for the given {@link #getHostPortSpec() port spec}, leaving the {@link #getHostIp() IP address}
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index 971f8e997..6ce1d131e 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpcore</artifactId>
-			<version>4.4.10</version>
+			<version>4.4.13</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index d8d72de6e..5787c1aa5 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna-platform</artifactId>
-			<version>5.4.0</version>
+			<version>5.5.0</version>
 		</dependency>
 	</dependencies>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 151bde4c6..619bd3f8c 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -102,7 +102,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>4.13</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -113,7 +113,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>${maven-surefire-plugin.version}</version>
 				<configuration>
 					<trimStackTrace>false</trimStackTrace>
 					<rerunFailingTestsCount>3</rerunFailingTestsCount>
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java b/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java
index 1bdb5aa7a..183121a3d 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java
@@ -7,6 +7,7 @@
 import com.github.dockerjava.api.model.ResponseItem;
 import com.google.common.reflect.ClassPath.ClassInfo;
 import org.apache.commons.lang.reflect.FieldUtils;
+import org.hamcrest.MatcherAssert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,10 +18,10 @@
 import java.util.List;
 
 import static com.google.common.reflect.ClassPath.from;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.object.IsCompatibleType.typeCompatibleWith;
-import static org.junit.Assert.assertThat;
 
 /**
  * @author Kanstantsin Shautsou
@@ -33,13 +34,19 @@ public class ModelsSerializableTest {
             BuildResponseItem.class.getName(),
             PullResponseItem.class.getName(),
             PushResponseItem.class.getName(),
-            ResponseItem.class.getName()
+            ResponseItem.class.getName(),
+            ResponseItem.ErrorDetail.class.getName(),
+            ResponseItem.ProgressDetail.class.getName()
     );
 
     @Test
     public void allModelsSerializable() throws IOException, NoSuchFieldException, IllegalAccessException {
         final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
-        for (ClassInfo classInfo : from(contextClassLoader).getTopLevelClasses("com.github.dockerjava.api.model")) {
+        for (ClassInfo classInfo : from(contextClassLoader).getAllClasses()) {
+            if (!classInfo.getPackageName().equals("com.github.dockerjava.api.model")) {
+                continue;
+            }
+
             if (classInfo.getName().endsWith("Test")) {
                 continue;
             }
@@ -50,13 +57,13 @@ public void allModelsSerializable() throws IOException, NoSuchFieldException, Il
                 continue;
             }
 
-            LOG.debug("aClass: {}", aClass);
+            LOG.debug("Checking: {}", aClass);
             assertThat(aClass, typeCompatibleWith(Serializable.class));
 
             final Object serialVersionUID = FieldUtils.readDeclaredStaticField(aClass, "serialVersionUID", true);
             if (!excludeClasses.contains(aClass.getName())) {
                 assertThat(serialVersionUID, instanceOf(Long.class));
-                assertThat("Follow devel docs", (Long) serialVersionUID, is(1L));
+                assertThat("Follow devel docs for " + aClass, (Long) serialVersionUID, is(1L));
             }
         }
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
index f19bb1663..062088316 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
@@ -31,9 +31,9 @@
 import static com.github.dockerjava.test.serdes.JSONTestHelper.testRoundTrip;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.core.IsNot.not;
@@ -51,7 +51,7 @@ public class InspectContainerResponseTest {
     @Test
     public void roundTrip_full() throws IOException {
         InspectContainerResponse[] responses = testRoundTrip(CommandJSONSamples.inspectContainerResponse_full,
-                InspectContainerResponse[].class);
+            InspectContainerResponse[].class);
         assertEquals(1, responses.length);
         final InspectContainerResponse response = responses[0];
 
@@ -72,10 +72,10 @@ public void roundTrip_full_healthcheck() throws IOException {
         final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectContainerResponse.class);
 
         final InspectContainerResponse response = testRoundTrip(RemoteApiVersion.VERSION_1_24,
-                "/containers/inspect/1.json",
-                type
+            "/containers/inspect/1.json",
+            type
         );
-        
+
         assertEquals(response.getState().getHealth().getStatus(), "healthy");
         assertEquals(response.getState().getHealth().getFailingStreak(), new Integer(0));
         assertEquals(response.getState().getHealth().getLog().size(), 2);
@@ -86,7 +86,7 @@ public void roundTrip_full_healthcheck() throws IOException {
     @Test
     public void roundTrip_1_21_full() throws IOException {
         InspectContainerResponse[] responses = testRoundTrip(CommandJSONSamples.inspectContainerResponse_full_1_21,
-                InspectContainerResponse[].class);
+            InspectContainerResponse[].class);
         assertEquals(1, responses.length);
         final InspectContainerResponse response = responses[0];
         final InspectContainerResponse.ContainerState state = response.getState();
@@ -96,13 +96,13 @@ public void roundTrip_1_21_full() throws IOException {
         assertThat(state.getStatus(), containsString("running"));
         assertFalse(state.getRestarting());
         assertFalse(state.getOOMKilled());
-        assertThat(state.getError(), isEmptyString());
+        assertThat(state.getError(), is(emptyString()));
     }
 
     @Test
     public void roundTrip_1_26a_full() throws IOException {
         InspectContainerResponse[] responses = testRoundTrip(CommandJSONSamples.inspectContainerResponse_full_1_26a,
-                InspectContainerResponse[].class);
+            InspectContainerResponse[].class);
 
         assertEquals(1, responses.length);
         final InspectContainerResponse response = responses[0];
@@ -118,7 +118,7 @@ public void roundTrip_1_26a_full() throws IOException {
     @Test
     public void roundTrip_1_26b_full() throws IOException {
         InspectContainerResponse[] responses = testRoundTrip(CommandJSONSamples.inspectContainerResponse_full_1_26b,
-                InspectContainerResponse[].class);
+            InspectContainerResponse[].class);
 
         assertEquals(1, responses.length);
         final InspectContainerResponse response = responses[0];
@@ -142,8 +142,8 @@ public void inspect_windows_container() throws IOException {
         final JavaType type = JSONTestHelper.getMapper().getTypeFactory().constructType(InspectContainerResponse.class);
 
         final InspectContainerResponse response = testRoundTrip(RemoteApiVersion.VERSION_1_38,
-                "/containers/inspect/lcow.json",
-                type
+            "/containers/inspect/lcow.json",
+            type
         );
 
         assertThat(response, notNullValue());
@@ -157,7 +157,7 @@ public void inspect_windows_container() throws IOException {
         assertThat(response.getGraphDriver(), notNullValue());
         assertThat(response.getGraphDriver().getName(), is("windowsfilter"));
         assertThat(response.getGraphDriver().getData(), is(new GraphData().withDir(
-                "C:\\ProgramData\\Docker\\windowsfilter\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556"
+            "C:\\ProgramData\\Docker\\windowsfilter\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556"
         )));
 
         assertThat(response.getHostConfig(), notNullValue());
@@ -165,23 +165,23 @@ public void inspect_windows_container() throws IOException {
 
         assertThat(response.getImageId(), is("sha256:1381511ec0122f197b6abff5bc0692bef19943ddafd6680eff41197afa3a6dda"));
         assertThat(response.getLogPath(), is(
-                "C:\\ProgramData\\Docker\\containers\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556" +
-                        "\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556-json.log"
+            "C:\\ProgramData\\Docker\\containers\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556" +
+                "\\35da02ca897bd378ee52be3066c847fee396ba1a28a00b4be36f42c6686bf556-json.log"
         ));
         assertThat(response.getName(), is("/cranky_clarke"));
 
         assertThat(response.getNetworkSettings(), notNullValue());
         assertThat(response.getNetworkSettings().getNetworks(), is(Collections.singletonMap("nat",
-                new ContainerNetwork()
-                        .withEndpointId("493b77d6fe7e3b92435b1eb01461fde669781330deb84a9cbada360db8997ebc")
-                        .withGateway("172.17.18.1")
-                        .withGlobalIPv6Address("")
-                        .withGlobalIPv6PrefixLen(0)
-                        .withIpv4Address("172.17.18.123")
-                        .withIpPrefixLen(16)
-                        .withIpV6Gateway("")
-                        .withMacAddress("00:aa:ff:cf:dd:09")
-                        .withNetworkID("398c0e206dd677ed4a6566f9de458311f5767d8c7a8b963275490ab64c5d10a7")
+            new ContainerNetwork()
+                .withEndpointId("493b77d6fe7e3b92435b1eb01461fde669781330deb84a9cbada360db8997ebc")
+                .withGateway("172.17.18.1")
+                .withGlobalIPv6Address("")
+                .withGlobalIPv6PrefixLen(0)
+                .withIpv4Address("172.17.18.123")
+                .withIpPrefixLen(16)
+                .withIpV6Gateway("")
+                .withMacAddress("00:aa:ff:cf:dd:09")
+                .withNetworkID("398c0e206dd677ed4a6566f9de458311f5767d8c7a8b963275490ab64c5d10a7")
         )));
 
         assertThat(response.getPath(), is("cmd"));
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java
index 040f1c2d7..2449d39be 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectExecResponseTest.java
@@ -9,7 +9,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.core.IsNull.notNullValue;
 import static org.hamcrest.core.IsNull.nullValue;
 
@@ -40,7 +40,7 @@ public void test_1_22_SerDer1() throws Exception {
         assertThat(processConfig.getEntryPoint(), is("/bin/bash"));
         assertThat(processConfig.getArguments(), hasSize(0));
         assertThat(processConfig.isPrivileged(), is(false));
-        assertThat(processConfig.getUser(), isEmptyString());
+        assertThat(processConfig.getUser(), is(emptyString()));
 
 
         assertThat(execResponse.isOpenStdin(), is(false));
@@ -50,6 +50,6 @@ public void test_1_22_SerDer1() throws Exception {
         assertThat(execResponse.getContainerID(),
                 is("ffa39805f089af3099e36452a985481f96170a9dff40be69d34d1722c7660d38"));
 
-        assertThat(execResponse.getDetachKeys(), isEmptyString());
+        assertThat(execResponse.getDetachKeys(), is(emptyString()));
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
index d548fa329..a7ec3a78d 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectImageResponseTest.java
@@ -18,7 +18,7 @@
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 
@@ -84,7 +84,7 @@ public void serder1_22Json() throws IOException {
         assertThat(inspectImage, notNullValue());
         assertThat(inspectImage.getArch(), is("amd64"));
         assertThat(inspectImage.getAuthor(), is("hack@worldticket.net"));
-        assertThat(inspectImage.getComment(), isEmptyString());
+        assertThat(inspectImage.getComment(), is(emptyString()));
 
         assertThat(inspectImage.getConfig(), notNullValue());
         assertThat(inspectImage.getConfig(), equalTo(config));
@@ -98,7 +98,7 @@ public void serder1_22Json() throws IOException {
         assertThat(inspectImage.getDockerVersion(), is("0.8.1"));
         assertThat(inspectImage.getId(), is("sha256:ee45fe0d1fcdf1a0f9c2d1e36c6f4b3202bbb2032f14d7c9312b27bfcf6aee24"));
         assertThat(inspectImage.getOs(), is("linux"));
-        assertThat(inspectImage.getParent(), isEmptyString());
+        assertThat(inspectImage.getParent(), is(emptyString()));
         assertThat(inspectImage.getSize(), is(0L));
 
         assertThat(inspectImage.getRepoTags(), hasSize(1));
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/BindPropagationTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/BindPropagationTest.java
index 25c9edd26..0fe65c048 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/BindPropagationTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/BindPropagationTest.java
@@ -4,7 +4,7 @@
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class BindPropagationTest {
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/BindsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/BindsTest.java
index 54ccb0e25..83c5ba788 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/BindsTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/BindsTest.java
@@ -6,7 +6,7 @@
 import static org.hamcrest.Matchers.arrayContaining;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class BindsTest {
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java
index 4f774c063..c64d5ace2 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java
@@ -5,22 +5,21 @@
 import org.apache.commons.compress.utils.Lists;
 import org.junit.Test;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.Map.Entry;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.arrayContainingInAnyOrder;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
 
 public class ExposedPortsTest {
 
     @Test
     public void usesToJson() throws Exception {
         ExposedPorts ports = new ExposedPorts(
-                new ExposedPort(80),
-                new ExposedPort(123, InternetProtocol.UDP),
-                new ExposedPort(3868, InternetProtocol.SCTP)
+            new ExposedPort(80),
+            new ExposedPort(123, InternetProtocol.UDP),
+            new ExposedPort(3868, InternetProtocol.SCTP)
         );
         String json = JSONTestHelper.getMapper().writeValueAsString(ports);
         List<Entry<String, JsonNode>> jsonEntries = getJsonEntries(json);
@@ -42,9 +41,9 @@ public void usesFromJson() throws Exception {
 
         assertThat(ports, notNullValue());
         assertThat(ports.getExposedPorts(), arrayContainingInAnyOrder(
-                new ExposedPort(80),
-                new ExposedPort(123, InternetProtocol.UDP),
-                new ExposedPort(3868, InternetProtocol.SCTP)
+            new ExposedPort(80),
+            new ExposedPort(123, InternetProtocol.UDP),
+            new ExposedPort(3868, InternetProtocol.SCTP)
         ));
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java
index 10b401685..71d4d60d4 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/InfoTest.java
@@ -24,7 +24,7 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 
@@ -80,9 +80,9 @@ public void serder1Json() throws IOException {
 
         assertThat(info.getExperimentalBuild(), is(false));
 
-        assertThat(info.getHttpProxy(), isEmptyString());
-        assertThat(info.getHttpsProxy(), isEmptyString());
-        assertThat(info.getNoProxy(), isEmptyString());
+        assertThat(info.getHttpProxy(), is(emptyString()));
+        assertThat(info.getHttpsProxy(), is(emptyString()));
+        assertThat(info.getNoProxy(), is(emptyString()));
         assertThat(info.getOomKillDisable(), is(true));
         assertThat(info.getOsType(), equalTo("linux"));
 
@@ -234,9 +234,9 @@ public void serder2Json() throws IOException {
 
         assertThat(info.getExperimentalBuild(), is(false));
 
-        assertThat(info.getHttpProxy(), isEmptyString());
-        assertThat(info.getHttpsProxy(), isEmptyString());
-        assertThat(info.getNoProxy(), isEmptyString());
+        assertThat(info.getHttpProxy(), is(emptyString()));
+        assertThat(info.getHttpsProxy(), is(emptyString()));
+        assertThat(info.getNoProxy(), is(emptyString()));
         assertThat(info.getOomKillDisable(), is(true));
         assertThat(info.getOsType(), equalTo("linux"));
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/LinksTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/LinksTest.java
index 379744165..0cf496412 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/LinksTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/LinksTest.java
@@ -6,7 +6,7 @@
 import static org.hamcrest.Matchers.arrayContaining;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class LinksTest {
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/UlimitsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/UlimitsTest.java
index 6c2f23655..12d1a0d36 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/UlimitsTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/UlimitsTest.java
@@ -6,7 +6,7 @@
 import static org.hamcrest.Matchers.arrayContaining;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class UlimitsTest {
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
index f0ed49364..b413cf029 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
@@ -8,7 +8,7 @@
 
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class VolumeBindsTest {
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesRWTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesRWTest.java
index 53f1213ad..ed52ff82d 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesRWTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesRWTest.java
@@ -6,7 +6,7 @@
 import static org.hamcrest.Matchers.arrayContaining;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class VolumesRWTest {
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesTest.java
index 3470e4963..d39e02583 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumesTest.java
@@ -6,7 +6,7 @@
 import static org.hamcrest.Matchers.arrayContaining;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class VolumesTest {
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
index 5444c4012..41eac8d27 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
@@ -27,7 +27,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -57,7 +57,7 @@ public void attachContainerWithStdin() throws Exception {
                 .exec();
 
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
@@ -104,7 +104,7 @@ public void attachContainerWithoutTTY() throws Exception {
                 .exec();
 
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
@@ -140,7 +140,7 @@ public void attachContainerWithTTY() throws Exception {
         CreateContainerResponse container = dockerClient.createContainerCmd(imageId).withTty(true).exec();
 
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
@@ -181,7 +181,7 @@ public void attachContainerStdinUnsupported() throws Exception {
                 .exec();
 
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java
index bae21acdd..887f97334 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java
@@ -4,14 +4,13 @@
 import com.github.dockerjava.api.model.AuthResponse;
 import com.github.dockerjava.core.DockerClientBuilder;
 import org.junit.Ignore;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
 import static com.github.dockerjava.junit.DockerMatchers.apiVersionGreater;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assume.assumeThat;
 
 /**
@@ -19,9 +18,6 @@
  */
 public class AuthCmdIT extends CmdIT {
 
-    @Rule
-    public ExpectedException expectedEx = ExpectedException.none();
-
     @Test
     public void testAuth() throws Exception {
         assumeThat("Fails on 1.22. Temporary disabled.", dockerRule, apiVersionGreater(VERSION_1_22));
@@ -32,16 +28,14 @@ public void testAuth() throws Exception {
     }
 
 
-
     @Ignore("Disabled because of 500/InternalServerException")
     @Test
     public void testAuthInvalid() throws Exception {
-        expectedEx.expect(UnauthorizedException.class);
-        expectedEx.expectMessage("Wrong login/password, please try again");
-
-        DockerClientBuilder.getInstance(dockerRule.config("garbage"))
+        assertThrows("Wrong login/password, please try again", UnauthorizedException.class, () -> {
+            DockerClientBuilder.getInstance(dockerRule.config("garbage"))
                 .build()
                 .authCmd()
                 .exec();
+        });
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
index a0402b975..cd9b1ef9c 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
@@ -34,12 +34,13 @@
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_28;
 import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
 import static org.apache.commons.io.FileUtils.writeStringToFile;
+import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assume.assumeThat;
@@ -153,7 +154,7 @@ private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(imageId).exec();
 
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
         dockerRule.getClient().waitContainerCmd(container.getId()).start().awaitStatusCode();
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java
index f2aa664de..4bba98a5f 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java
@@ -16,7 +16,7 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.startsWith;
 import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
@@ -32,7 +32,7 @@ public void commit() throws DockerException, InterruptedException {
                 .exec();
 
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
         LOG.info("Committing container: {}", container.toString());
@@ -62,7 +62,7 @@ public void commitWithLabels() throws DockerException {
                 .exec();
 
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
         Integer status = dockerRule.getClient().waitContainerCmd(container.getId())
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java
index 6c8c2573e..42934c03e 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java
@@ -11,10 +11,10 @@
 
 import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
 import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -53,8 +53,8 @@ public void connectToNetworkWithContainerNetwork() throws InterruptedException {
         final String containerIp = subnetPrefix + ".100";
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
-                .withCmd("sleep", "9999")
-                .exec();
+            .withCmd("sleep", "9999")
+            .exec();
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
@@ -64,20 +64,20 @@ public void connectToNetworkWithContainerNetwork() throws InterruptedException {
         }
 
         CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd()
-                .withName(networkName)
-                .withIpam(new Network.Ipam()
-                        .withConfig(new Network.Ipam.Config()
-                                .withSubnet(subnetPrefix + ".0/24")))
-                .exec();
+            .withName(networkName)
+            .withIpam(new Network.Ipam()
+                .withConfig(new Network.Ipam.Config()
+                    .withSubnet(subnetPrefix + ".0/24")))
+            .exec();
 
         dockerRule.getClient().connectToNetworkCmd()
-                .withNetworkId(network.getId())
-                .withContainerId(container.getId())
-                .withContainerNetwork(new ContainerNetwork()
-                        .withAliases("aliasName" + dockerRule.getKind())
-                        .withIpamConfig(new ContainerNetwork.Ipam()
-                                .withIpv4Address(containerIp)))
-                .exec();
+            .withNetworkId(network.getId())
+            .withContainerId(container.getId())
+            .withContainerNetwork(new ContainerNetwork()
+                .withAliases("aliasName" + dockerRule.getKind())
+                .withIpamConfig(new ContainerNetwork.Ipam()
+                    .withIpv4Address(containerIp)))
+            .exec();
 
         Network updatedNetwork = dockerRule.getClient().inspectNetworkCmd().withNetworkId(network.getId()).exec();
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java
index 30d4853d7..bc8bd67f1 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java
@@ -12,9 +12,10 @@
 
 import static ch.lambdaj.Lambda.selectUnique;
 import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
 
@@ -25,7 +26,7 @@ public class ContainerDiffCmdIT extends CmdIT {
     public void testContainerDiff() throws DockerException {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("touch", "/test").exec();
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
         int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).start()
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index 036861d45..1d15e447e 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -66,7 +66,7 @@
 import static org.hamcrest.Matchers.hasItemInArray;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.startsWith;
@@ -97,7 +97,7 @@ public void createContainerWithExistingName() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("env").withName(containerName).exec();
     }
@@ -113,7 +113,7 @@ public void createContainerWithVolume() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -136,7 +136,7 @@ public void createContainerWithReadOnlyVolume() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -221,7 +221,7 @@ public void createContainerWithEnv() throws Exception {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -246,7 +246,7 @@ public void createContainerWithEnvAdditive() throws Exception {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -272,7 +272,7 @@ public void createContainerWithEnvAdditiveMap() throws Exception {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -305,7 +305,7 @@ public void createContainerWithEnvAsVararg() throws Exception {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -329,7 +329,7 @@ public void createContainerWithEnvAsMap() throws Exception {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -350,7 +350,7 @@ public void createContainerWithHostname() throws Exception {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -371,7 +371,7 @@ public void createContainerWithName() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -391,7 +391,7 @@ public void createContainerWithLink() throws DockerException {
         CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999")
                 .withName(containerName1).exec();
         LOG.info("Created container1 {}", container1.toString());
-        assertThat(container1.getId(), not(isEmptyString()));
+        assertThat(container1.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container1.getId()).exec();
 
@@ -406,7 +406,7 @@ public void createContainerWithLink() throws DockerException {
                         .withLinks(new Link(containerName1, "container1Link")))
                 .exec();
         LOG.info("Created container {}", container2.toString());
-        assertThat(container2.getId(), not(isEmptyString()));
+        assertThat(container2.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container2.getId())
                 .exec();
@@ -421,7 +421,7 @@ public void createContainerWithMemorySwappiness() throws DockerException {
                 .withHostConfig(newHostConfig()
                         .withMemorySwappiness(42L))
                 .exec();
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
         LOG.info("Created container {}", container.toString());
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
@@ -454,7 +454,7 @@ public void createContainerWithLinkInCustomNetwork() throws DockerException {
                 .withName(containerName1)
                 .exec();
 
-        assertThat(container1.getId(), not(isEmptyString()));
+        assertThat(container1.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container1.getId()).exec();
 
@@ -472,7 +472,7 @@ public void createContainerWithLinkInCustomNetwork() throws DockerException {
                 .exec();
 
         LOG.info("Created container {}", container2.toString());
-        assertThat(container2.getId(), not(isEmptyString()));
+        assertThat(container2.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container2.getId())
                 .exec();
@@ -506,7 +506,7 @@ public void createContainerWithCustomIp() throws DockerException {
                 .withIpv4Address(subnetPrefix + ".100")
                 .exec();
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
@@ -540,7 +540,7 @@ public void createContainerWithAlias() throws DockerException {
                 .withAliases("server" + dockerRule.getKind())
                 .exec();
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
@@ -562,7 +562,7 @@ public void createContainerWithCapAddAndCapDrop() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -584,7 +584,7 @@ public void createContainerWithDns() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -601,7 +601,7 @@ public void createContainerWithEntrypoint() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -621,7 +621,7 @@ public void createContainerWithExtraHosts() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -639,7 +639,7 @@ public void createContainerWithDevices() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -667,7 +667,7 @@ public void createContainerWithPortBindings() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -694,7 +694,7 @@ public void createContainerWithLinking() throws DockerException {
                 .withName(containerName1).exec();
 
         LOG.info("Created container1 {}", container1.toString());
-        assertThat(container1.getId(), not(isEmptyString()));
+        assertThat(container1.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container1.getId()).exec();
 
@@ -703,10 +703,10 @@ public void createContainerWithLinking() throws DockerException {
         LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
 
         assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
-        assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse1.getId(), not(is(emptyString())));
         assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId()));
         assertThat(inspectContainerResponse1.getName(), equalTo("/" + containerName1));
-        assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse1.getImageId(), not(is(emptyString())));
         assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
         assertThat(inspectContainerResponse1.getState().getRunning(), is(true));
 
@@ -721,21 +721,21 @@ public void createContainerWithLinking() throws DockerException {
                 .exec();
 
         LOG.info("Created container2 {}", container2.toString());
-        assertThat(container2.getId(), not(isEmptyString()));
+        assertThat(container2.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container2.getId())
                 .exec();
         LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
 
         assertThat(inspectContainerResponse2.getConfig(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse2.getId(), not(is(emptyString())));
         assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[]{new Link(containerName1,
                 containerName1 + "Link")}));
         assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
         assertThat(inspectContainerResponse2.getName(), equalTo("/" + containerName2));
-        assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse2.getImageId(), not(is(emptyString())));
 
     }
 
@@ -749,7 +749,7 @@ public void createContainerWithRestartPolicy() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -764,7 +764,7 @@ public void createContainerWithPidMode() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -787,7 +787,7 @@ public void createContainerWithNetworkMode() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -802,7 +802,7 @@ public void createContainerWithMacAddress() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -822,7 +822,7 @@ public void createContainerWithULimits() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -844,7 +844,7 @@ public void createContainerWithIntegerBoundsExceedingULimit() throws DockerExcep
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -865,7 +865,7 @@ public void createContainerWithLabels() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -890,7 +890,7 @@ public void createContainerWithLogConfig() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -912,7 +912,7 @@ public void testWithStopSignal() throws Exception {
                 .withStopSignal(signal.toString())
                 .exec();
         final String containerId = resp.getId();
-        assertThat(containerId, not(isEmptyString()));
+        assertThat(containerId, not(is(emptyString())));
         dockerRule.getClient().startContainerCmd(containerId).exec();
 
         InspectContainerResponse inspect = dockerRule.getClient().inspectContainerCmd(containerId).exec();
@@ -961,7 +961,7 @@ public void createContainerWithCgroupParent() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainer = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -977,7 +977,7 @@ public void createContainerWithShmSize() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -995,7 +995,7 @@ public void createContainerWithShmPidsLimit() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -1060,7 +1060,7 @@ public void createContainerWithTmpFs() throws DockerException {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999")
                 .withHostConfig(new HostConfig().withTmpFs(Collections.singletonMap("/tmp", "rw,noexec,nosuid,size=50m"))).exec();
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
         assertThat(inspectContainerResponse.getHostConfig().getTmpFs().get("/tmp"), equalTo("rw,noexec,nosuid,size=50m"));
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
index d18d3d747..36776bdb1 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
@@ -17,7 +17,7 @@
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeThat;
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java
index 7b7d63c1c..495b8cdb9 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java
@@ -9,8 +9,9 @@
 import java.security.SecureRandom;
 
 import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 
 public class ExecCreateCmdImplIT extends CmdIT {
@@ -26,13 +27,13 @@ public void execCreateTest() {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
         ExecCreateCmdResponse execCreateCmdResponse = dockerRule.getClient().execCreateCmd(container.getId())
                 .withCmd("touch", "file.log").exec();
 
-        assertThat(execCreateCmdResponse.getId(), not(isEmptyString()));
+        assertThat(execCreateCmdResponse.getId(), not(is(emptyString())));
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java
index e5bb76354..cf096aa26 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java
@@ -13,8 +13,9 @@
 
 import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
 import static com.github.dockerjava.utils.TestUtils.asString;
+import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -31,7 +32,7 @@ public void execStart() throws Exception {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top")
                 .withName(containerName).exec();
         LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
@@ -59,7 +60,7 @@ public void execStartAttached() throws Exception {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withName(containerName).exec();
         LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
@@ -83,7 +84,7 @@ public void execStartWithNonExistentUser() throws Exception {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withName(containerName).exec();
         LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
index 75649bf2b..25b9aff18 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
@@ -21,7 +21,7 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
@@ -42,7 +42,7 @@ public void inspectContainer() throws DockerException {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top")
                 .withName(containerName).exec();
         LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse containerInfo = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
         assertEquals(containerInfo.getId(), container.getId());
@@ -90,7 +90,7 @@ public void inspectContainerWithSize() throws DockerException {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("top")
                 .withName(containerName).exec();
         LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerCmd command = dockerRule.getClient().inspectContainerCmd(container.getId()).withSize(true);
         assertTrue(command.getSize());
@@ -117,7 +117,7 @@ public void inspectContainerRestartCount() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -132,7 +132,7 @@ public void inspectContainerNetworkSettings() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java
index 3eecd3c33..3f22fca33 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java
@@ -17,8 +17,8 @@
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
 import static com.github.dockerjava.utils.TestUtils.getVersion;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
@@ -35,7 +35,7 @@ public void inspectExec() throws Exception {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withName(containerName).exec();
         LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
@@ -43,7 +43,7 @@ public void inspectExec() throws Exception {
         ExecCreateCmdResponse checkFileExec1 = dockerRule.getClient().execCreateCmd(container.getId()).withAttachStdout(true)
                 .withAttachStderr(true).withCmd("test", "-e", "/marker").exec();
         LOG.info("Created exec {}", checkFileExec1.toString());
-        assertThat(checkFileExec1.getId(), not(isEmptyString()));
+        assertThat(checkFileExec1.getId(), not(is(emptyString())));
         dockerRule.getClient().execStartCmd(checkFileExec1.getId()).withDetach(false)
                 .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
         InspectExecResponse first = dockerRule.getClient().inspectExecCmd(checkFileExec1.getId()).exec();
@@ -54,7 +54,7 @@ public void inspectExec() throws Exception {
         ExecCreateCmdResponse touchFileExec = dockerRule.getClient().execCreateCmd(container.getId()).withAttachStdout(true)
                 .withAttachStderr(true).withCmd("touch", "/marker").exec();
         LOG.info("Created exec {}", touchFileExec.toString());
-        assertThat(touchFileExec.getId(), not(isEmptyString()));
+        assertThat(touchFileExec.getId(), not(is(emptyString())));
         dockerRule.getClient().execStartCmd(touchFileExec.getId()).withDetach(false)
                 .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
         InspectExecResponse second = dockerRule.getClient().inspectExecCmd(touchFileExec.getId()).exec();
@@ -65,7 +65,7 @@ public void inspectExec() throws Exception {
         ExecCreateCmdResponse checkFileExec2 = dockerRule.getClient().execCreateCmd(container.getId()).withAttachStdout(true)
                 .withAttachStderr(true).withCmd("test", "-e", "/marker").exec();
         LOG.info("Created exec {}", checkFileExec2.toString());
-        assertThat(checkFileExec2.getId(), not(isEmptyString()));
+        assertThat(checkFileExec2.getId(), not(is(emptyString())));
         dockerRule.getClient().execStartCmd(checkFileExec2.getId()).withDetach(false)
                 .exec(new ExecStartResultCallback(System.out, System.err)).awaitCompletion();
         InspectExecResponse third = dockerRule.getClient().inspectExecCmd(checkFileExec2.getId()).exec();
@@ -87,14 +87,14 @@ public void inspectExecNetworkSettings() throws IOException {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withName(containerName).exec();
         LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
         ExecCreateCmdResponse exec = dockerRule.getClient().execCreateCmd(container.getId()).withAttachStdout(true)
                 .withAttachStderr(true).withCmd("/bin/bash").exec();
         LOG.info("Created exec {}", exec.toString());
-        assertThat(exec.getId(), not(isEmptyString()));
+        assertThat(exec.getId(), not(is(emptyString())));
 
         InspectExecResponse inspectExecResponse = dockerRule.getClient().inspectExecCmd(exec.getId()).exec();
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/KillContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/KillContainerCmdIT.java
index c79c6992b..617e547cb 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/KillContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/KillContainerCmdIT.java
@@ -11,7 +11,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 
 public class KillContainerCmdIT extends CmdIT {
@@ -22,7 +22,7 @@ public void killContainer() throws DockerException {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
         LOG.info("Killing container: {}", container.getId());
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
index 1cdfbdf21..9ada9d7ad 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
@@ -26,7 +26,7 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.isOneOf;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
@@ -73,7 +73,7 @@ public void testListContainers() throws Exception {
                 .withLabels(testLabel)
                 .withCmd("echo")
                 .exec();
-        assertThat(container1.getId(), not(isEmptyString()));
+        assertThat(container1.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container1.getId()).exec();
         assertThat(inspectContainerResponse.getConfig().getImage(), is(equalTo(DEFAULT_IMAGE)));
@@ -101,7 +101,7 @@ public void testListContainers() throws Exception {
         }
 
         Container container2 = filteredContainers.get(0);
-        assertThat(container2.getCommand(), not(isEmptyString()));
+        assertThat(container2.getCommand(), not(is(emptyString())));
         assertThat(container2.getImage(), startsWith(DEFAULT_IMAGE));
     }
 
@@ -120,7 +120,7 @@ public void testListContainersWithLabelsFilter() throws Exception {
         assertThat(filteredContainersByMap.size(), is(1));
 
         Container container3 = filteredContainersByMap.get(0);
-        assertThat(container3.getCommand(), not(isEmptyString()));
+        assertThat(container3.getCommand(), not(is(emptyString())));
         assertThat(container3.getImage(), startsWith(DEFAULT_IMAGE));
 
         // List by string label
@@ -132,7 +132,7 @@ public void testListContainersWithLabelsFilter() throws Exception {
         assertThat(filteredContainers.size(), is(1));
 
         container3 = filteredContainers.get(0);
-        assertThat(container3.getCommand(), not(isEmptyString()));
+        assertThat(container3.getCommand(), not(is(emptyString())));
         assertThat(container3.getImage(), startsWith(DEFAULT_IMAGE));
         assertEquals(testLabel.get("test"), container3.getLabels().get("test"));
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java
index 73a715900..c89b98a0a 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java
@@ -16,7 +16,7 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertTrue;
@@ -38,7 +38,7 @@ public void listImages() throws DockerException {
         Image img = images.get(0);
         assertThat(img.getCreated(), is(greaterThan(0L)));
         assertThat(img.getVirtualSize(), is(greaterThan(0L)));
-        assertThat(img.getId(), not(isEmptyString()));
+        assertThat(img.getId(), not(is(emptyString())));
         assertThat(img.getRepoTags(), not(emptyArray()));
     }
 
@@ -66,7 +66,7 @@ private boolean isImageInFilteredList(List<Image> images, String expectedImageId
     private String createDanglingImage() {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
         LOG.info("Committing container {}", container.toString());
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
index 3ece47809..6be307d88 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
@@ -11,10 +11,11 @@
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
+import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -31,7 +32,7 @@ public void asyncLogContainerWithTtyEnabled() throws Exception {
                 .exec();
 
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId())
             .exec();
@@ -62,7 +63,7 @@ public void asyncLogContainerWithTtyDisabled() throws Exception {
                 .exec();
 
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId())
             .exec();
@@ -123,7 +124,7 @@ public void asyncMultipleLogContainer() throws Exception {
                 .exec();
 
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
@@ -172,7 +173,7 @@ public void asyncLogContainerWithSince() throws Exception {
                 .exec();
 
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         int timestamp = (int) (System.currentTimeMillis() / 1000);
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java
index 528160951..3647e713a 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PauseCmdIT.java
@@ -8,8 +8,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 
 public class PauseCmdIT extends CmdIT {
@@ -20,7 +21,7 @@ public void pauseRunningContainer() {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         ContainerUtils.startContainer(dockerRule.getClient(), container);
 
@@ -38,7 +39,7 @@ public void pauseStoppedContainer() {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         ContainerUtils.startContainer(dockerRule.getClient(), container);
 
@@ -52,7 +53,7 @@ public void pausePausedContainer() {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         ContainerUtils.startContainer(dockerRule.getClient(), container);
 
@@ -66,7 +67,7 @@ public void pauseCreatedContainer() {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().pauseContainerCmd(container.getId()).exec();
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
index 4881cc2db..438748cc0 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
@@ -18,8 +18,9 @@
 
 import static com.github.dockerjava.utils.TestUtils.getVersion;
 import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
+import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 
 public class PushImageCmdIT extends CmdIT {
@@ -46,7 +47,7 @@ public void pushLatest() throws Exception {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true").exec();
 
         LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         LOG.info("Committing container: {}", container.toString());
         String imgName = authConfig.getRegistryAddress() + "/" + dockerRule.getKind() + "-push-latest";
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java
index 9d2325f63..c072eaf90 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java
@@ -11,9 +11,10 @@
 
 import java.util.List;
 
+import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.startsWith;
 import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
@@ -27,7 +28,7 @@ public void removeImage() throws DockerException, InterruptedException {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
         LOG.info("Committing container {}", container.toString());
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java
index a0708ff7a..fed3920b7 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java
@@ -8,8 +8,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertNotEquals;
 
@@ -21,7 +22,7 @@ public void renameContainer() throws DockerException {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java
index f49e7baaa..cf2f43e92 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java
@@ -11,7 +11,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 
 public class RestartContainerCmdImplIT extends CmdIT {
@@ -22,7 +22,7 @@ public void restartContainer() throws DockerException {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
index 18a1f8ff0..f4180e81a 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
@@ -34,7 +34,7 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.startsWith;
@@ -59,7 +59,7 @@ public void startContainerWithVolumes() throws Exception {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -136,7 +136,7 @@ public void startContainerWithDns() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
@@ -158,7 +158,7 @@ public void startContainerWithDnsSearch() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -188,7 +188,7 @@ public void startContainerWithPortBindings() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -227,7 +227,7 @@ public void startContainerWithRandomPortBindings() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
@@ -260,7 +260,7 @@ public void startContainerWithConflictingPortBindings() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
     }
@@ -278,7 +278,7 @@ public void startContainerWithLinkingDeprecated() throws DockerException {
                 .exec();
 
         LOG.info("Created container1 {}", container1.toString());
-        assertThat(container1.getId(), not(isEmptyString()));
+        assertThat(container1.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container1.getId()).exec();
 
@@ -287,10 +287,10 @@ public void startContainerWithLinkingDeprecated() throws DockerException {
         LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
 
         assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
-        assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse1.getId(), not(is(emptyString())));
         assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId()));
         assertThat(inspectContainerResponse1.getName(), equalTo("/" + container1Name));
-        assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse1.getImageId(), not(is(emptyString())));
         assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
         assertThat(inspectContainerResponse1.getState().getRunning(), is(true));
 
@@ -304,7 +304,7 @@ public void startContainerWithLinkingDeprecated() throws DockerException {
                 .exec();
 
         LOG.info("Created container2 {}", container2.toString());
-        assertThat(container2.getId(), not(isEmptyString()));
+        assertThat(container2.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container2.getId()).exec();
 
@@ -313,14 +313,14 @@ public void startContainerWithLinkingDeprecated() throws DockerException {
         LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
 
         assertThat(inspectContainerResponse2.getConfig(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse2.getId(), not(is(emptyString())));
         assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[]{new Link(container1Name,
                 container1Name + "Link")}));
         assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
         assertThat(inspectContainerResponse2.getName(), equalTo("/" + container2Name));
-        assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse2.getImageId(), not(is(emptyString())));
         assertThat(inspectContainerResponse2.getState(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getState().getRunning(), is(true));
 
@@ -339,7 +339,7 @@ public void startContainerWithLinking() throws DockerException {
                 .exec();
 
         LOG.info("Created container1 {}", container1.toString());
-        assertThat(container1.getId(), not(isEmptyString()));
+        assertThat(container1.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container1.getId()).exec();
 
@@ -348,10 +348,10 @@ public void startContainerWithLinking() throws DockerException {
         LOG.info("Container1 Inspect: {}", inspectContainerResponse1.toString());
 
         assertThat(inspectContainerResponse1.getConfig(), is(notNullValue()));
-        assertThat(inspectContainerResponse1.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse1.getId(), not(is(emptyString())));
         assertThat(inspectContainerResponse1.getId(), startsWith(container1.getId()));
         assertThat(inspectContainerResponse1.getName(), equalTo("/" + container1Name));
-        assertThat(inspectContainerResponse1.getImageId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse1.getImageId(), not(is(emptyString())));
         assertThat(inspectContainerResponse1.getState(), is(notNullValue()));
         assertThat(inspectContainerResponse1.getState().getRunning(), is(true));
 
@@ -365,7 +365,7 @@ public void startContainerWithLinking() throws DockerException {
                 .exec();
 
         LOG.info("Created container2 {}", container2.toString());
-        assertThat(container2.getId(), not(isEmptyString()));
+        assertThat(container2.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container2.getId()).exec();
 
@@ -374,14 +374,14 @@ public void startContainerWithLinking() throws DockerException {
         LOG.info("Container2 Inspect: {}", inspectContainerResponse2.toString());
 
         assertThat(inspectContainerResponse2.getConfig(), is(notNullValue()));
-        assertThat(inspectContainerResponse2.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse2.getId(), not(is(emptyString())));
         assertThat(inspectContainerResponse2.getHostConfig(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getHostConfig().getLinks(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getHostConfig().getLinks(), equalTo(new Link[]{new Link(container1Name,
                 container1Name + "Link")}));
         assertThat(inspectContainerResponse2.getId(), startsWith(container2.getId()));
         assertThat(inspectContainerResponse2.getName(), equalTo("/" + container2Name));
-        assertThat(inspectContainerResponse2.getImageId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse2.getImageId(), not(is(emptyString())));
         assertThat(inspectContainerResponse2.getState(), is(notNullValue()));
         assertThat(inspectContainerResponse2.getState().getRunning(), is(true));
 
@@ -394,7 +394,7 @@ public void startContainer() throws DockerException {
                 .exec();
 
         LOG.info("Created container {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
@@ -402,11 +402,11 @@ public void startContainer() throws DockerException {
         LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
 
         assertThat(inspectContainerResponse.getConfig(), is(notNullValue()));
-        assertThat(inspectContainerResponse.getId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse.getId(), not(is(emptyString())));
 
         assertThat(inspectContainerResponse.getId(), startsWith(container.getId()));
 
-        assertThat(inspectContainerResponse.getImageId(), not(isEmptyString()));
+        assertThat(inspectContainerResponse.getImageId(), not(is(emptyString())));
         assertThat(inspectContainerResponse.getState(), is(notNullValue()));
 
         assertThat(inspectContainerResponse.getState().getRunning(), is(true));
@@ -438,7 +438,7 @@ public void startContainerWithNetworkMode() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
 
@@ -461,7 +461,7 @@ public void startContainerWithCapAddAndCapDrop() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
@@ -485,7 +485,7 @@ public void startContainerWithDevices() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
@@ -507,7 +507,7 @@ public void startContainerWithExtraHosts() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
@@ -532,7 +532,7 @@ public void startContainerWithRestartPolicy() throws DockerException {
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
@@ -556,7 +556,7 @@ public void existingHostConfigIsPreservedByBlankStartCmd() throws DockerExceptio
 
         LOG.info("Created container {}", container.toString());
 
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         // start container _without_any_customization_ (important!)
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StopContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StopContainerCmdIT.java
index 32c4d904f..7e88cf088 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/StopContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StopContainerCmdIT.java
@@ -11,7 +11,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 
 public class StopContainerCmdIT extends CmdIT {
@@ -23,7 +23,7 @@ public void testStopContainer() throws DockerException {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
         LOG.info("Stopping container: {}", container.getId());
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/UnpauseCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/UnpauseCmdIT.java
index b28b22a23..2c970aee1 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/UnpauseCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/UnpauseCmdIT.java
@@ -8,8 +8,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 
 public class UnpauseCmdIT extends CmdIT {
@@ -21,7 +22,7 @@ public void unpausePausedContainer() {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         ContainerUtils.startContainer(dockerRule.getClient(), container);
 
@@ -35,7 +36,7 @@ public void unpauseRunningContainer() {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         ContainerUtils.startContainer(dockerRule.getClient(), container);
 
@@ -47,7 +48,7 @@ public void unpauseStoppedContainer() {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         ContainerUtils.startContainer(dockerRule.getClient(), container);
 
@@ -67,7 +68,7 @@ public void unpauseCreatedContainer() {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().unpauseContainerCmd(container.getId()).exec();
     }
@@ -77,7 +78,7 @@ public void unpauseUnpausedContainer() {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         ContainerUtils.startContainer(dockerRule.getClient(), container);
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java
index ed7fb058b..a8269c82f 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java
@@ -18,7 +18,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 
 public class WaitContainerCmdIT extends CmdIT {
@@ -30,7 +30,7 @@ public void testWaitContainer() throws DockerException {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true").exec();
 
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
@@ -65,7 +65,7 @@ public void testWaitContainerAbort() throws Exception {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
 
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
@@ -89,7 +89,7 @@ public void testWaitContainerTimeout() throws Exception {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "10").exec();
 
         LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
+        assertThat(container.getId(), not(is(emptyString())));
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
index a28d0e83b..ca450be02 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
@@ -51,6 +51,7 @@ public class CreateServiceCmdExecIT extends SwarmCmdIT {
 
     @Before
     public void beforeTest() throws Exception {
+        super.beforeTest();
         authConfig = REGISTRY.getAuthConfig();
     }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java
index bb96dc3ef..9a3aa3768 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java
@@ -14,7 +14,6 @@
 import com.github.dockerjava.api.model.TaskState;
 import com.github.dockerjava.utils.LogContainerTestCallback;
 import org.junit.Test;
-import org.mockito.internal.matchers.Contains;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -22,8 +21,9 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
+import static org.mockito.Matchers.contains;
 
 public class LogSwarmObjectIT extends SwarmCmdIT {
     @Test
@@ -69,7 +69,7 @@ private void validateLog(LogSwarmObjectCmd logCmd, String messsage) throws Inter
         LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
         logCmd.exec(loggingCallback);
         loggingCallback.awaitCompletion(5, TimeUnit.SECONDS);
-        assertThat(loggingCallback.toString(), new Contains(messsage));
+        assertThat(loggingCallback.toString(), is(contains(messsage)));
         loggingCallback.close();
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
index e3b21ad8d..83bc124e9 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
@@ -13,7 +13,7 @@
 import java.io.IOException;
 
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class DockerConfigFileTest {
     @Rule
diff --git a/pom.xml b/pom.xml
index 7f0bd6713..06951ed05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.sonatype.oss</groupId>
-		<artifactId>oss-parent</artifactId>
-		<version>9</version>
-	</parent>
-
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java-parent</artifactId>
 	<packaging>pom</packaging>
@@ -57,37 +52,38 @@
 		<jdk.source>1.8</jdk.source>
 		<jdk.target>1.8</jdk.target>
 
-		<jersey.version>2.30</jersey.version>
-		<jackson.version>2.9.8</jackson.version>
-		<jackson-jaxrs.version>2.9.8</jackson-jaxrs.version>
-		<httpclient.version>4.5.11</httpclient.version><!-- 4.5.1-4.5.2 broken -->
-		<commons-compress.version>1.19</commons-compress.version>
+		<jersey.version>2.30.1</jersey.version>
+		<jackson.version>2.10.3</jackson.version>
+		<jackson-jaxrs.version>2.10.3</jackson-jaxrs.version>
+		<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
+		<commons-compress.version>1.20</commons-compress.version>
 		<commons-codec.version>1.11</commons-codec.version>
 		<commons-io.version>2.6</commons-io.version>
 		<commons-lang.version>2.6</commons-lang.version>
-		<slf4j-api.version>1.7.25</slf4j-api.version>
+		<slf4j-api.version>1.7.30</slf4j-api.version>
 
-		<bouncycastle.version>1.60</bouncycastle.version>
-		<junixsocket.version>2.2.1</junixsocket.version>
-		<guava.version>19.0</guava.version>
+		<bouncycastle.version>1.64</bouncycastle.version>
+		<junixsocket.version>2.3.2</junixsocket.version>
+		<guava.version>19.0</guava.version> <!-- todo remove from project -->
 
 		<!-- test dependencies -->
 		<logback.version>1.2.3</logback.version>
-		<netty.version>4.1.31.Final</netty.version>
-		<hamcrest.library.version>1.3</hamcrest.library.version>
+		<netty.version>4.1.46.Final</netty.version>
+		<hamcrest.library.version>2.2</hamcrest.library.version>
 		<hamcrest.jpa-matchers>1.8</hamcrest.jpa-matchers>
 		<lambdaj.version>2.3.3</lambdaj.version>
-		<mockito.version>1.10.19</mockito.version>
+		<mockito.version>3.3.0</mockito.version>
 
 
 		<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
-		<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
-		<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
-		<maven-surefire-plugin.version>2.20</maven-surefire-plugin.version>
-		<maven-failsafe-plugin.version>2.20</maven-failsafe-plugin.version>
+		<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+		<maven-release-plugin.version>3.0.0-M1</maven-release-plugin.version>
+		<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
+		<maven-failsafe-plugin.version>3.0.0-M4</maven-failsafe-plugin.version>
 		<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
 		<maven-bundlor-plugin.version>1.1.2.RELEASE</maven-bundlor-plugin.version>
 		<maven-build-helper-plugin.version>3.0.0</maven-build-helper-plugin.version>
+		<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
 	</properties>
 
 	<modules>
@@ -113,11 +109,39 @@
 	<build>
 		<pluginManagement>
 			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-clean-plugin</artifactId>
+					<version>3.1.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<version>3.0.0-M1</version>
+					<configuration>
+						<skip>true</skip>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-resources-plugin</artifactId>
+					<version>3.1.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-gpg-plugin</artifactId>
+					<version>1.6</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-install-plugin</artifactId>
+					<version>3.0.0-M1</version>
+				</plugin>
 
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-release-plugin</artifactId>
-					<version>${maven-release-plugin.version}</version>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>${maven-surefire-plugin.version}</version>
 				</plugin>
 
 				<plugin>
@@ -217,7 +241,7 @@
 			<plugin>
 				<groupId>org.sonatype.plugins</groupId>
 				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
+				<version>${nexus-staging-maven-plugin.version}</version>
 				<extensions>true</extensions>
 				<configuration>
 					<serverId>ossrh</serverId>
@@ -302,9 +326,9 @@
 						</configuration>
 					</plugin>
 					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>findbugs-maven-plugin</artifactId>
-						<version>3.0.5</version>
+						<groupId>com.github.spotbugs</groupId>
+						<artifactId>spotbugs-maven-plugin</artifactId>
+						<version>3.1.12.2</version>
 						<configuration>
 							<effort>Max</effort>
 							<threshold>Low</threshold>
@@ -323,7 +347,7 @@
 					<plugin>
 						<groupId>org.jacoco</groupId>
 						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>0.8.1</version>
+						<version>0.8.5</version>
 						<executions>
 							<execution>
 								<goals>

From a180a017de289f3c1bfc2776ca7ac578a0675c7a Mon Sep 17 00:00:00 2001
From: jarebudev <23311805+jarebudev@users.noreply.github.com>
Date: Tue, 10 Mar 2020 12:02:38 +0000
Subject: [PATCH 0999/1272] Add optional limit to searchimagescmd (#1332)

* added limit to SeachImagesCmd

* formatting fixes

* add limit only if set as per PR comments

* removed empty line as per pr comment
---
 .../api/command/SearchImagesCmd.java          |  2 +
 .../core/command/SearchImagesCmdImpl.java     | 20 ++++++++++
 .../core/exec/SearchImagesCmdExec.java        |  8 +++-
 .../dockerjava/cmd/SearchImagesCmdIT.java     | 37 +++++++++++++++++--
 4 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
index 2bc87cc73..8dc38ee3e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
@@ -18,8 +18,10 @@ public interface SearchImagesCmd extends SyncDockerCmd<List<SearchItem>> {
 
     @CheckForNull
     String getTerm();
+    Integer getLimit();
 
     SearchImagesCmd withTerm(@Nonnull String term);
+    SearchImagesCmd withLimit(@Nonnull Integer limit);
 
     interface Exec extends DockerCmdSyncExec<SearchImagesCmd, List<SearchItem>> {
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
index 342a7fbd2..dab946b1c 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.core.command;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.List;
@@ -7,6 +8,8 @@
 import com.github.dockerjava.api.command.SearchImagesCmd;
 import com.github.dockerjava.api.model.SearchItem;
 
+import javax.annotation.Nonnull;
+
 /**
  * Search images
  *
@@ -16,7 +19,11 @@
  */
 public class SearchImagesCmdImpl extends AbstrDockerCmd<SearchImagesCmd, List<SearchItem>> implements SearchImagesCmd {
 
+    private static final int MIN_LIMIT = 1;
+    private static final int MAX_LIMIT = 100;
+
     private String term;
+    private Integer limit;
 
     public SearchImagesCmdImpl(SearchImagesCmd.Exec exec, String term) {
         super(exec);
@@ -35,4 +42,17 @@ public SearchImagesCmd withTerm(String term) {
         return this;
     }
 
+    @Override
+    public Integer getLimit() {
+        return limit;
+    }
+
+    @Override
+    public SearchImagesCmd withLimit(@Nonnull Integer limit) {
+        String errorMessage = String.format("Limit %s is outside the range of [%s, %s]", limit, MIN_LIMIT, MAX_LIMIT);
+        checkArgument(limit <= MAX_LIMIT, errorMessage);
+        checkArgument(limit >= MIN_LIMIT, errorMessage);
+        this.limit = limit;
+        return this;
+    }
 }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java
index 205128190..0e92c9f97 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/SearchImagesCmdExec.java
@@ -23,11 +23,15 @@ public SearchImagesCmdExec(WebTarget baseResource, DockerClientConfig dockerClie
 
     @Override
     protected List<SearchItem> execute(SearchImagesCmd command) {
-        WebTarget webResource = getBaseResource().path("/images/search").queryParam("term", command.getTerm());
+        WebTarget webResource = getBaseResource().path("/images/search")
+            .queryParam("term", command.getTerm());
+
+        if (command.getLimit() != null) {
+            webResource = webResource.queryParam("limit", command.getLimit());
+        }
 
         LOGGER.trace("GET: {}", webResource);
         return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<List<SearchItem>>() {
         });
     }
-
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/SearchImagesCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/SearchImagesCmdIT.java
index 0dba9aefd..26dcebbeb 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/SearchImagesCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/SearchImagesCmdIT.java
@@ -11,9 +11,7 @@
 
 import static ch.lambdaj.Lambda.filter;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.*;
 import static org.testinfected.hamcrest.jpa.HasFieldWithValue.hasField;
 
 public class SearchImagesCmdIT extends CmdIT {
@@ -30,4 +28,37 @@ public void searchImages() throws DockerException {
         assertThat(filter(hasField("name", is("busybox")), dockerSearch).size(), equalTo(1));
     }
 
+    @Test(expected = IllegalArgumentException.class)
+    public void searchImagesWithInvalidMinimumLimit() throws DockerException {
+        dockerRule.getClient().searchImagesCmd("busybox").withLimit(0).exec();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void searchImagesWithInvalidMaximumLimit() throws DockerException {
+        dockerRule.getClient().searchImagesCmd("busybox").withLimit(101).exec();
+    }
+
+    @Test
+    public void searchImagesWithValidMinimumLimit() throws DockerException {
+        List<SearchItem> dockerSearch = dockerRule.getClient().searchImagesCmd("busybox").withLimit(1).exec();
+        LOG.info("Search returned {}", dockerSearch.toString());
+
+        Matcher matcher = hasItem(hasField("name", equalTo("busybox")));
+        assertThat(dockerSearch, matcher);
+
+        assertThat(filter(hasField("name", is("busybox")), dockerSearch).size(), equalTo(1));
+
+        assertThat(dockerSearch.size(), equalTo(1));
+    }
+
+    @Test
+    public void searchImagesWithValidMaximumLimit() throws DockerException {
+        List<SearchItem> dockerSearch = dockerRule.getClient().searchImagesCmd("busybox").withLimit(1).exec();
+        LOG.info("Search returned {}", dockerSearch.toString());
+
+        Matcher matcher = hasItem(hasField("name", equalTo("busybox")));
+        assertThat(dockerSearch, matcher);
+
+        assertThat(filter(hasField("name", is("busybox")), dockerSearch).size(), equalTo(1));
+    }
 }

From b899057b4e05a8909edabb4a766f4d90e3a1daec Mon Sep 17 00:00:00 2001
From: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Date: Tue, 10 Mar 2020 15:38:37 +0300
Subject: [PATCH 1000/1272] Update release-drafter.yml

---
 .github/release-drafter.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 6b0cb0261..d03efd7d9 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -1,3 +1,5 @@
+tag-template: $NEXT_PATCH_VERSION
+name-template: '$NEXT_PATCH_VERSION 🌈'
 categories:
   - title: '🚀 Features'
     labels:

From 1ecdd7c7751e7da8b06115decbca22f05b84113f Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 15 Mar 2020 22:20:46 +0100
Subject: [PATCH 1001/1272] prepare release 3.2.1

---
 docker-java-api/pom.xml              |  2 +-
 docker-java-core/pom.xml             |  2 +-
 docker-java-transport-jersey/pom.xml |  2 +-
 docker-java-transport-netty/pom.xml  |  2 +-
 docker-java-transport-okhttp/pom.xml |  2 +-
 docker-java/pom.xml                  |  2 +-
 pom.xml                              | 44 ++++++----------------------
 7 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index e963d1478..3ba8c7099 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.1-SNAPSHOT</version>
+		<version>3.2.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index f8c4ee07d..c6c194383 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.1-SNAPSHOT</version>
+		<version>3.2.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index 6ce1d131e..bd1ae373d 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.1-SNAPSHOT</version>
+		<version>3.2.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml
index c205e0802..6c34a310f 100644
--- a/docker-java-transport-netty/pom.xml
+++ b/docker-java-transport-netty/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.1-SNAPSHOT</version>
+		<version>3.2.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index 5787c1aa5..4f8da716e 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.1-SNAPSHOT</version>
+		<version>3.2.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 619bd3f8c..18a24a843 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.1-SNAPSHOT</version>
+		<version>3.2.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index 06951ed05..633632629 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.2.1-SNAPSHOT</version>
+	<version>3.2.1</version>
 
 	<name>docker-java-parent</name>
 	<url>https://github.com/docker-java/docker-java</url>
@@ -96,13 +96,10 @@
 	</modules>
 
 	<distributionManagement>
-		<snapshotRepository>
-			<id>ossrh</id>
-			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-		</snapshotRepository>
 		<repository>
-			<id>ossrh</id>
-			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+			<id>bintray-docker-java-releases</id>
+			<name>docker-java-releases</name>
+			<url>https://api.bintray.com/maven/docker-java/releases/docker-java/;publish=0</url>
 		</repository>
 	</distributionManagement>
 
@@ -118,9 +115,6 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-deploy-plugin</artifactId>
 					<version>3.0.0-M1</version>
-					<configuration>
-						<skip>true</skip>
-					</configuration>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -218,15 +212,15 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
 					<version>2.10.4</version>
+					<configuration>
+						<additionalparam>-Xdoclint:none</additionalparam>
+					</configuration>
 					<executions>
 						<execution>
 							<id>attach-javadocs</id>
 							<goals>
 								<goal>jar</goal>
 							</goals>
-							<configuration>
-								<additionalparam>-Xdoclint:none</additionalparam>
-							</configuration>
 						</execution>
 					</executions>
 				</plugin>
@@ -238,33 +232,13 @@
 			</plugins>
 		</pluginManagement>
 		<plugins>
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>${nexus-staging-maven-plugin.version}</version>
-				<extensions>true</extensions>
-				<configuration>
-					<serverId>ossrh</serverId>
-					<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-					<autoReleaseAfterClose>true</autoReleaseAfterClose>
-				</configuration>
-			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-release-plugin</artifactId>
-				<version>${maven-release-plugin.version}</version>
-				<configuration>
-					<autoVersionSubmodules>true</autoVersionSubmodules>
-					<useReleaseProfile>false</useReleaseProfile>
-					<releaseProfiles>release</releaseProfiles>
-					<goals>deploy nexus-staging:release</goals>
-				</configuration>
+				<artifactId>maven-source-plugin</artifactId>
 			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
+				<artifactId>maven-javadoc-plugin</artifactId>
 			</plugin>
 		</plugins>
 	</build>

From 21583b51e02c129ead0732fbe235d02eb608e341 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 15 Mar 2020 22:21:58 +0100
Subject: [PATCH 1002/1272] prepare for next development iteration

---
 docker-java-api/pom.xml              | 2 +-
 docker-java-core/pom.xml             | 2 +-
 docker-java-transport-jersey/pom.xml | 2 +-
 docker-java-transport-netty/pom.xml  | 2 +-
 docker-java-transport-okhttp/pom.xml | 2 +-
 docker-java/pom.xml                  | 2 +-
 pom.xml                              | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 3ba8c7099..f84228cac 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.1</version>
+		<version>3.2.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index c6c194383..5238f816a 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.1</version>
+		<version>3.2.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index bd1ae373d..7165cdf39 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.1</version>
+		<version>3.2.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml
index 6c34a310f..7741aea95 100644
--- a/docker-java-transport-netty/pom.xml
+++ b/docker-java-transport-netty/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.1</version>
+		<version>3.2.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index 4f8da716e..f7303d894 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.1</version>
+		<version>3.2.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 18a24a843..b52fcdcd6 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.1</version>
+		<version>3.2.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index 633632629..38880e712 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.2.1</version>
+	<version>3.2.2-SNAPSHOT</version>
 
 	<name>docker-java-parent</name>
 	<url>https://github.com/docker-java/docker-java</url>

From a77b7deda1d8e51f4495497e5373faa3b21b59be Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sat, 4 Apr 2020 11:29:03 +0200
Subject: [PATCH 1003/1272] Rework Travis setup (#1357)

---
 .travis.yml                                   |  51 ++-----
 .travis/travis-after-success.sh               |  21 ---
 .travis/travis-before-install.sh              | 140 +++++-------------
 .travis/travis-script.sh                      |  49 ------
 .travis/travisci_build_coverity_scan.sh       | 113 --------------
 .../github/dockerjava/cmd/PullImageCmdIT.java |   6 +-
 6 files changed, 52 insertions(+), 328 deletions(-)
 delete mode 100755 .travis/travis-after-success.sh
 delete mode 100755 .travis/travis-script.sh
 delete mode 100755 .travis/travisci_build_coverity_scan.sh

diff --git a/.travis.yml b/.travis.yml
index 35ce5e286..b671e87f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,62 +1,39 @@
 sudo: required
-dist: trusty
+dist: xenial
 language: java
 
 services:
   - docker
 
 jdk:
- - oraclejdk8
+ - openjdk8
 
 install: true
 
 env:
   global:
-    - CODECOV=true
     - DOCKER_TLS_VERIFY=""
-    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
-    #   via the "travis encrypt" command using the project repo's public key
-    - secure: "GonzmzvnXsTNQV+6sKtBSSPiwbpMZjxumNt5LFp1g77/afLxw9kl2EQOXbUe308vFOwRVqeY7drBvNJa8aJkTUClfMaGRjfZ9DUwm6doMKMUYrdEkYoQTcH7yDX5K5w9MT6m+Izj+BK2gB7nK3yFlYG6COeXCdFbQ4/cf3/xfRc="
-    - COVERITY_SCAN_PROJECT_NAME="docker-java/docker-java"
-    - COVERITY_SCAN_BRANCH_PATTERN="master"
-    - COVERITY_SCAN_NOTIFICATION_EMAIL="kanstantsin.sha@gmail.com"
 
   matrix:
-#    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="17.09.0~ce-0~ubuntu-trusty"
-#    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="17.09.0~ce-0~ubuntu-trusty"
-#    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="17.06.2~ce-0~ubuntu-trusty" DEPLOY=true COVERITY=true
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" DEPLOY=true COVERITY=true
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2377" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" SWARM_VERSION="1.2.8"
-    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty"
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2377" DOCKER_VERSION="1.13.1-0~ubuntu-trusty" SWARM_VERSION="1.2.8"
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.13.1-0~ubuntu-trusty"
-    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.13.1-0~ubuntu-trusty"
-    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.12.6-0~ubuntu-trusty"
-    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.12.6-0~ubuntu-trusty"
-#    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.11.2-0~trusty"
-#    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.11.2-0~trusty"
-#    - repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.10.3-0~trusty"
-#    - repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.10.3-0~trusty"
-#    - repo="testing" DOCKER_HOST="tcp://127.0.0.1:2375"
-#    - repo="testing" DOCKER_HOST="unix:///var/run/docker.sock"
-#    - repo="experimental" DOCKER_HOST="tcp://127.0.0.1:2375"
-#    - repo="experimental" DOCKER_HOST="unix:///var/run/docker.sock"
+    - DEPLOY=true
+
+    # TCP transport
+    - DOCKER_HOST="tcp://127.0.0.1:2375"
+
+    # Older versions of Docker
+    - DOCKER_VERSION="17.06.2~ce-0~ubuntu"
+    - DOCKER_VERSION="18.06.3~ce~3-0~ubuntu"
+
+    # Swarm
+    - SWARM_VERSION="1.2.8"
 
 cache:
   directories:
   - $HOME/.travis_cache
-  - /tmp/coverity-cache
   - $HOME/.m2 # install will pollute it
 
 before_install:
-  - pip install --user codecov
   - ./.travis/travis-before-install.sh
 
 script:
-  - ./.travis/travis-script.sh
-
-after_success:
-  - ./.travis/travis-after-success.sh
-
-#after_script:
-#  - sudo cat /var/log/upstart/docker.log
+  - mvn verify
diff --git a/.travis/travis-after-success.sh b/.travis/travis-after-success.sh
deleted file mode 100755
index 695358122..000000000
--- a/.travis/travis-after-success.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-if [[ $CODECOV == "true" ]]; then
-    codecov
-fi
-
-if [[ $TRAVIS_BRANCH == "master" ]] && [[ $TRAVIS_PULL_REQUEST == "false" ]] && [[ $DEPLOY == "true" ]];
-then
-    cat <<EOF >> ~/settings.xml
-<settings>
- <servers>
-   <server>
-    <id>ossrh</id>
-    <username>\${env.OSSRH_USER}</username>
-    <password>\${env.OSSRH_PASS}</password>
-    </server>
-   </servers>
-</settings>
-EOF
-    mvn deploy -DskipITs --settings ~/settings.xml
- fi
diff --git a/.travis/travis-before-install.sh b/.travis/travis-before-install.sh
index 88a1e0ecd..592b3fcdf 100755
--- a/.travis/travis-before-install.sh
+++ b/.travis/travis-before-install.sh
@@ -1,98 +1,47 @@
 #!/usr/bin/env bash
 
-SWARM_VERSION="${SWARM_VERSION:-}"
-FAST_BUILD="${FAST_BUILD:-}"
-
-## fix coverity issue
-sudo apt-get install -y -q ca-certificates
-echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-certificates.crt
-##
-
-if [ "$FAST_BUILD" == "true" ]; then
-    echo "Fast build, skipping docker installations."
-    exit 0
-fi
-
 set -exu
 
-sudo ip a ls
-sudo ip r ls
-sudo ss -antpl
+SWARM_VERSION="${SWARM_VERSION:-}"
+DOCKER_VERSION="${DOCKER_VERSION:-}"
+DOCKER_HOST="${DOCKER_HOST:-}"
 
 export HOST_PORT="2375"
-export SWARM_PORT="2377"
-export HOST_IP="$(ip a show dev eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)"
-# because of swarm use docker-engine directly
-export PRE_DOCKER_HOST="$DOCKER_HOST"
-export DOCKER_HOST="tcp://127.0.0.1:${HOST_PORT}"
-
 
-docker info
-docker version
-
-sudo -E apt-get update
-sudo -E apt-get install -q -y wget
-sudo -E apt-get -q -y --purge remove docker-engine
-sudo -E apt-cache policy docker-engine
-
-./.travis/get-docker-com.sh
-
-sudo -E stop docker
-
-#mkdir "${HOME}/.cache" || :
-#pushd "${HOME}/.cache"
-# wget -N "https://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_${DOCKER_VERSION}_amd64.deb"
-# sudo apt-get -f install
-# sudo dpkg -i "$(ls *${DOCKER_VERSION}*)"
-#popd
 rm -f "docker-java/src/test/resources/logback.xml"
-#rm -f "src/test/resources/travis-logback.xml"
 mv "docker-java/src/test/resources/travis-logback.xml" "docker-java/src/test/resources/logback-test.xml"
 
-# https://github.com/docker/docker/issues/18113
-sudo rm /var/lib/docker/network/files/local-kv.db
-
-sudo cat /etc/default/docker
+if [[ -n $DOCKER_VERSION ]]; then
+    sudo -E apt-get -q -y --purge remove docker-engine docker-ce
 
-cat << EOF | sudo tee /etc/default/docker
-DOCKER_OPTS="\
---dns 8.8.8.8 \
---dns 8.8.4.4 \
--D \
--H=unix:///var/run/docker.sock \
--H=tcp://0.0.0.0:${HOST_PORT}  \
---label=com.github.dockerjava.test=docker-java \
-"
-EOF
+    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+    sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+    sudo apt-get update
+    sudo apt-cache madison docker-ce
+    sudo apt-get install "docker-ce=$DOCKER_VERSION"
+fi
 
-sudo cat /etc/default/docker
-sudo bash -c ':> /var/log/upstart/docker.log'
-
-date
-sudo -E start docker
-
-tries=20
-sleep=5
-for i in $(seq 1 $tries); do
-    if sudo grep "API listen on" /var/log/upstart/docker.log ; then
-        echo "Docker started. Delay $(($i * $sleep))"
-        break
-    elif [[ $i -ge $tries ]]; then
-        echo "Docker didn't start. Exiting!"
-        sudo cat /var/log/upstart/docker.log
-        exit 1
-    else
-        echo "Docker didn't start, sleeping for 5 secs..."
-        sleep $sleep
-    fi
-done
+if [[ -n $DOCKER_HOST ]]; then
+    sudo mkdir -p /etc/systemd/system/docker.service.d/
 
+    echo "
+[Service]
+ExecStart=
+ExecStart=/usr/bin/dockerd -H unix:///var/run/docker.sock -H tcp://0.0.0.0:${HOST_PORT}
+    " | sudo tee -a /etc/systemd/system/docker.service.d/override.conf
 
-sudo ss -antpl
+    sudo systemctl daemon-reload
+    sudo service docker restart || sudo journalctl -xe
+    sudo service docker status
+fi
 
-curl -V
+while (! docker ps ); do
+  # Docker takes a few seconds to initialize
+  echo "Waiting for Docker to launch..."
+  sleep 1
+done
 
-docker version || sudo cat /var/log/upstart/docker.log
+docker version
 docker info
 
 set +u
@@ -106,34 +55,17 @@ registry.url=https://index.docker.io/v1/
 EOF
 
 if [[ -n $SWARM_VERSION ]]; then
-#    export SWARM_PORT="${PRE_DOCKER_HOST##*:}"
+    export SWARM_PORT="2377"
+    export HOST_IP="$(ip a show dev eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)"
 
     docker pull swarm
 
-#    # kv store https://docs.docker.com/v1.11/engine/userguide/networking/get-started-overlay/
-#    docker run -d \
-#        -p "8500:8500" \
-#        -h "consul" \
-#        --name=consul \
-#        progrium/consul -server -bootstrap
-#
-#    sleep 5
-
-#    SWARM_TOKEN=$(docker run swarm c)
-
-#    docker run \
-#        -d \
-#        --name=swarm_manager \
-#        -p ${SWARM_PORT}:2375 \
-#        "swarm:${SWARM_VERSION}" \
-#        manage token://${SWARM_TOKEN}
-
     docker run \
         -d \
         -p ${SWARM_PORT}:2375 \
         --name=swarm_manager \
-        swarm manage --engine-refresh-min-interval "3s" --engine-refresh-max-interval "6s" "nodes://${HOST_IP}:${HOST_PORT}"
-#        swarm manage --engine-refresh-min-interval "3s" --engine-refresh-max-interval "6s" "consul://${HOST_IP}:8500"
+        "swarm:${SWARM_VERSION}" \
+        manage --engine-refresh-min-interval "3s" --engine-refresh-max-interval "6s" "nodes://${HOST_IP}:${HOST_PORT}"
 
     # join engine to swarm
     docker run \
@@ -141,22 +73,20 @@ if [[ -n $SWARM_VERSION ]]; then
         "--name=swarm_join" \
         "swarm:${SWARM_VERSION}" \
         join --advertise="${HOST_IP}:${HOST_PORT}" --delay="0s" --heartbeat "5s" "nodes://${HOST_IP}:${HOST_PORT}"
-#        join --advertise="${HOST_IP}:${HOST_PORT}" --delay="0s" --heartbeat "5s" "token://${SWARM_TOKEN}"
 
     docker run --rm \
-        "swarm:${SWARM_VERSION}" list "nodes://${HOST_IP}:${HOST_PORT}"
+        "swarm:${SWARM_VERSION}" \
+        list "nodes://${HOST_IP}:${HOST_PORT}"
 
     docker ps -a
-    sudo ss -antpl
 
     sleep 30
 
     docker logs swarm_join
     docker logs swarm_manager
-#    docker logs consul
 
     # switch to swarm connection
-    DOCKER_HOST="$PRE_DOCKER_HOST"
+    export DOCKER_HOST="tcp://127.0.0.1:${SWARM_PORT}"
 
     docker version
     docker info
diff --git a/.travis/travis-script.sh b/.travis/travis-script.sh
deleted file mode 100755
index 1cdc84fa5..000000000
--- a/.travis/travis-script.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-
-
-
-IS_COVERITY_SCAN_BRANCH=`ruby -e "puts '${TRAVIS_BRANCH}' =~ /\\A$COVERITY_SCAN_BRANCH_PATTERN\\z/ ? 1 : 0"`
-
-export COVERITY_ALLOWED=true
-# Verify upload is permitted
-AUTH_RES=`curl -s --form project="$COVERITY_SCAN_PROJECT_NAME" --form token="$COVERITY_SCAN_TOKEN" $SCAN_URL/api/upload_permitted`
-if [ "$AUTH_RES" = "Access denied" ]; then
-  echo -e "\033[33;1mCoverity Scan API access denied. Check COVERITY_SCAN_PROJECT_NAME and COVERITY_SCAN_TOKEN.\033[0m"
-  COVERITY_ALLOWED=false
-else
-  AUTH=`echo $AUTH_RES | ruby -e "require 'rubygems'; require 'json'; puts JSON[STDIN.read]['upload_permitted']"`
-  if [ "$AUTH" = "true" ]; then
-    echo -e "\033[33;1mCoverity Scan analysis authorized per quota.\033[0m"
-  else
-    WHEN=`echo $AUTH_RES | ruby -e "require 'rubygems'; require 'json'; puts JSON[STDIN.read]['next_upload_permitted_at']"`
-    echo -e "\033[33;1mCoverity Scan analysis NOT authorized until $WHEN.\033[0m"
-
-    COVERITY_ALLOWED=false
-  fi
-fi
-
-set -ex
-
-if [ "${FAST_BUILD}" == "true" ]; then
-    if [ "$TRAVIS_PULL_REQUEST" == "false" ] &&
-       [ "$COVERITY" == "true" ] &&
-       [ "$IS_COVERITY_SCAN_BRANCH" = "1" ] &&
-       [ "$COVERITY_ALLOWED" == "true" ]; then
-        export COVERITY_SCAN_BUILD_COMMAND="mvn package"
-        #curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash
-        ./.travis/travisci_build_coverity_scan.sh
-    else
-        mvn package
-    fi
-else
-    if [ "$TRAVIS_PULL_REQUEST" == "false" ] &&
-       [ "$COVERITY" == "true" ] &&
-       [ "$IS_COVERITY_SCAN_BRANCH" = "1" ] &&
-       [ "$COVERITY_ALLOWED" == "true" ]; then
-        export COVERITY_SCAN_BUILD_COMMAND="mvn verify"
-        #curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash
-        ./.travis/travisci_build_coverity_scan.sh
-    else
-        mvn verify
-    fi
-fi
diff --git a/.travis/travisci_build_coverity_scan.sh b/.travis/travisci_build_coverity_scan.sh
deleted file mode 100755
index 074d0a46f..000000000
--- a/.travis/travisci_build_coverity_scan.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Environment check
-echo -e "\033[33;1mNote: COVERITY_SCAN_PROJECT_NAME and COVERITY_SCAN_TOKEN are available on Project Settings page on scan.coverity.com\033[0m"
-[ -z "$COVERITY_SCAN_PROJECT_NAME" ] && echo "ERROR: COVERITY_SCAN_PROJECT_NAME must be set" && exit 1
-[ -z "$COVERITY_SCAN_NOTIFICATION_EMAIL" ] && echo "ERROR: COVERITY_SCAN_NOTIFICATION_EMAIL must be set" && exit 1
-[ -z "$COVERITY_SCAN_BRANCH_PATTERN" ] && echo "ERROR: COVERITY_SCAN_BRANCH_PATTERN must be set" && exit 1
-[ -z "$COVERITY_SCAN_BUILD_COMMAND" ] && echo "ERROR: COVERITY_SCAN_BUILD_COMMAND must be set" && exit 1
-[ -z "$COVERITY_SCAN_TOKEN" ] && echo "ERROR: COVERITY_SCAN_TOKEN must be set" && exit 1
-
-PLATFORM=`uname`
-TOOL_ARCHIVE=/tmp/coverity-cache/cov-analysis-${PLATFORM}.tgz
-TOOL_URL=https://scan.coverity.com/download/${PLATFORM}
-TOOL_BASE=/tmp/coverity-scan-analysis
-UPLOAD_URL="https://scan.coverity.com/builds"
-SCAN_URL="https://scan.coverity.com"
-
-# Do not run on pull requests
-if [ "${TRAVIS_PULL_REQUEST}" = "true" ]; then
-  echo -e "\033[33;1mINFO: Skipping Coverity Analysis: branch is a pull request.\033[0m"
-  exit 0
-fi
-
-# Verify this branch should run
-IS_COVERITY_SCAN_BRANCH=`ruby -e "puts '${TRAVIS_BRANCH}' =~ /\\A$COVERITY_SCAN_BRANCH_PATTERN\\z/ ? 1 : 0"`
-if [ "$IS_COVERITY_SCAN_BRANCH" = "1" ]; then
-  echo -e "\033[33;1mCoverity Scan configured to run on branch ${TRAVIS_BRANCH}\033[0m"
-else
-  echo -e "\033[33;1mCoverity Scan NOT configured to run on branch ${TRAVIS_BRANCH}\033[0m"
-  exit 1
-fi
-
-# Verify upload is permitted
-AUTH_RES=`curl -s --form project="$COVERITY_SCAN_PROJECT_NAME" --form token="$COVERITY_SCAN_TOKEN" $SCAN_URL/api/upload_permitted`
-if [ "$AUTH_RES" = "Access denied" ]; then
-  echo -e "\033[33;1mCoverity Scan API access denied. Check COVERITY_SCAN_PROJECT_NAME and COVERITY_SCAN_TOKEN.\033[0m"
-  exit 1
-else
-  AUTH=`echo $AUTH_RES | ruby -e "require 'rubygems'; require 'json'; puts JSON[STDIN.read]['upload_permitted']"`
-  if [ "$AUTH" = "true" ]; then
-    echo -e "\033[33;1mCoverity Scan analysis authorized per quota.\033[0m"
-  else
-    WHEN=`echo $AUTH_RES | ruby -e "require 'rubygems'; require 'json'; puts JSON[STDIN.read]['next_upload_permitted_at']"`
-    echo -e "\033[33;1mCoverity Scan analysis NOT authorized until $WHEN.\033[0m"
-
-    exit 1
-  fi
-fi
-
-mkdir -p /tmp/coverity-cache || :
-
-if [ ! -d $TOOL_BASE ]; then
-
-  # verify that binary is right
-  if file $TOOL_ARCHIVE | grep HTML ; then
-    echo "Removing $TOOL_ARCHIVE"
-    rm -f $TOOL_ARCHIVE
-  fi
-  
-  # Download Coverity Scan Analysis Tool
-  if [ ! -e $TOOL_ARCHIVE ]; then
-    echo -e "\033[33;1mDownloading Coverity Scan Analysis Tool...\033[0m"
-    wget -nv -N -O $TOOL_ARCHIVE $TOOL_URL --post-data "project=$COVERITY_SCAN_PROJECT_NAME&token=$COVERITY_SCAN_TOKEN"
-  fi
-
-  # Extract Coverity Scan Analysis Tool
-  echo -e "\033[33;1mExtracting Coverity Scan Analysis Tool...\033[0m"
-  mkdir -p $TOOL_BASE
-  pushd $TOOL_BASE
-    du -sh $TOOL_ARCHIVE
-    file $TOOL_ARCHIVE
-    file $TOOL_ARCHIVE | grep HTML && cat $TOOL_ARCHIVE || :
-    ls -la $TOOL_ARCHIVE
-    tar -xf $TOOL_ARCHIVE #|& grep -v "Ignoring unknown extended header keyword"
-  popd
-fi
-
-TOOL_DIR=`find $TOOL_BASE -type d -name 'cov-analysis*'`
-export PATH=$TOOL_DIR/bin:$PATH
-
-# Build
-echo -e "\033[33;1mRunning Coverity Scan Analysis Tool...\033[0m"
-COV_BUILD_OPTIONS=""
-#COV_BUILD_OPTIONS="--return-emit-failures 8 --parse-error-threshold 85"
-RESULTS_DIR="cov-int"
-eval "${COVERITY_SCAN_BUILD_COMMAND_PREPEND}"
-COVERITY_UNSUPPORTED=1 cov-build --dir $RESULTS_DIR $COV_BUILD_OPTIONS $COVERITY_SCAN_BUILD_COMMAND
-cov-import-scm --dir $RESULTS_DIR --scm git --log $RESULTS_DIR/scm_log.txt 2>&1
-
-# Upload results
-echo -e "\033[33;1mTarring Coverity Scan Analysis results...\033[0m"
-RESULTS_ARCHIVE=analysis-results.tgz
-tar czf $RESULTS_ARCHIVE $RESULTS_DIR
-SHA=`git rev-parse --short HEAD`
-
-echo -e "\033[33;1mUploading Coverity Scan Analysis results...\033[0m"
-response=$(curl \
-  --silent --write-out "\n%{http_code}\n" \
-  --form project=$COVERITY_SCAN_PROJECT_NAME \
-  --form token=$COVERITY_SCAN_TOKEN \
-  --form email=$COVERITY_SCAN_NOTIFICATION_EMAIL \
-  --form file=@$RESULTS_ARCHIVE \
-  --form version=$SHA \
-  --form description="Travis CI build" \
-  $UPLOAD_URL)
-status_code=$(echo "$response" | sed -n '$p')
-if [ "$status_code" != "201" ]; then
-  TEXT=$(echo "$response" | sed '$d')
-  echo -e "\033[33;1mCoverity Scan upload failed: $TEXT.\033[0m"
-  exit 1
-fi
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
index 79932f580..539a2b606 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
@@ -2,7 +2,7 @@
 
 import com.github.dockerjava.api.command.InspectImageResponse;
 import com.github.dockerjava.api.exception.DockerClientException;
-import com.github.dockerjava.api.exception.InternalServerErrorException;
+import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Info;
@@ -126,7 +126,7 @@ public void testPullImageWithNoAuth() throws Exception {
 
         if (isNotSwarm(dockerRule.getClient()) && getVersion(dockerRule.getClient())
                 .isGreaterOrEqual(RemoteApiVersion.VERSION_1_30)) {
-            exception.expect(InternalServerErrorException.class);
+            exception.expect(DockerException.class);
         } else {
             exception.expect(DockerClientException.class);
         }
@@ -151,7 +151,7 @@ public void testPullImageWithInvalidAuth() throws Exception {
 
         if (isNotSwarm(dockerRule.getClient()) && getVersion(dockerRule.getClient())
                 .isGreaterOrEqual(RemoteApiVersion.VERSION_1_30)) {
-            exception.expect(InternalServerErrorException.class);
+            exception.expect(DockerException.class);
         } else {
             exception.expect(DockerClientException.class);
         }

From 77103e319060e8fa3a4d0caaf2773597a907687c Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sat, 4 Apr 2020 14:32:11 +0200
Subject: [PATCH 1004/1272] Introduce DockerHttpClient abstraction (#1351)

To simplify writing custom transports, we can separate the `DockerCmdExecFactory`
and the underlying http transport.

This change introduces a new type, `DockerHttpClient`, that consists of a bare minimum
abstraction for making calls against the Docker's HTTP API.
It also allows implementing custom commands over existing transports.
---
 docker-java-api/pom.xml                       |  58 ---
 .../DelegatingDockerCmdExecFactory.java       | 377 +++++++++++++++
 docker-java-core/pom.xml                      |   7 +
 .../core/DefaultDockerCmdExecFactory.java     | 154 ++++++
 .../core/DefaultInvocationBuilder.java        | 296 ++++++++++++
 .../dockerjava/core/DockerClientImpl.java     |  23 +
 .../dockerjava/core/DockerHttpClient.java     |  80 ++++
 .../core/FramedInputStreamConsumer.java       |  99 ++++
 .../core/async/FrameStreamProcessor.java      |   2 +
 .../core/async/JsonStreamProcessor.java       |   2 +
 .../dockerjava/core/command/FrameReader.java  |   1 +
 docker-java-transport-jersey/pom.xml          |  27 ++
 .../dockerjava/jaxrs/ApacheUnixSocket.java    |   5 +-
 .../jaxrs/JerseyDockerCmdExecFactory.java     | 297 ++----------
 .../jaxrs/JerseyDockerHttpClient.java         | 381 +++++++++++++++
 .../jaxrs/JerseyInvocationBuilder.java        | 193 --------
 .../dockerjava/jaxrs/JerseyWebTarget.java     |  79 ---
 .../jaxrs/UnixConnectionSocketFactory.java    |   5 +-
 .../jaxrs/async/AbstractCallbackNotifier.java |  96 ----
 .../jaxrs/async/GETCallbackNotifier.java      |  29 --
 .../jaxrs/async/POSTCallbackNotifier.java     |  33 --
 docker-java-transport-okhttp/pom.xml          |  16 +
 .../github/dockerjava/okhttp/FramedSink.java  |  81 ----
 .../okhttp/HijackingInterceptor.java          |  61 +++
 .../okhttp/NamedPipeSocketFactory.java        |   7 +-
 .../dockerjava/okhttp/OkDockerHttpClient.java | 284 +++++++++++
 .../okhttp/OkHttpDockerCmdExecFactory.java    | 179 ++-----
 .../okhttp/OkHttpInvocationBuilder.java       | 372 ---------------
 .../dockerjava/okhttp/OkHttpWebTarget.java    | 148 ------
 .../dockerjava/okhttp/UnixSocketFactory.java  |   4 +-
 docker-java/pom.xml                           |  26 -
 .../dockerjava/cmd/AttachContainerCmdIT.java  |  18 +-
 .../dockerjava/cmd/CreateContainerCmdIT.java  |   4 +-
 .../dockerjava/cmd/LogContainerCmdIT.java     |   4 +-
 .../dockerjava/cmd/StartContainerCmdIT.java   |   8 +-
 .../core/async/JsonStreamProcessorTest.java   |  67 ---
 .../junit/DockerCmdExecFactoryDelegate.java   | 448 +-----------------
 pom.xml                                       |  48 ++
 38 files changed, 1982 insertions(+), 2037 deletions(-)
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/DockerHttpClient.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/FramedInputStreamConsumer.java
 create mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyInvocationBuilder.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyWebTarget.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java
 delete mode 100644 docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java
 delete mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java
 create mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java
 create mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
 delete mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpInvocationBuilder.java
 delete mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpWebTarget.java
 delete mode 100644 docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index f84228cac..f23df928c 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -55,64 +55,6 @@
 					</instructions>
 				</configuration>
 			</plugin>
-
-			<plugin>
-				<!-- use with "mvn -DskipTests clean verify" -->
-				<groupId>com.github.siom79.japicmp</groupId>
-				<artifactId>japicmp-maven-plugin</artifactId>
-				<version>0.14.3</version>
-				<configuration>
-					<oldVersion>
-						<dependency>
-							<groupId>com.github.docker-java</groupId>
-							<artifactId>docker-java</artifactId>
-							<version>3.1.5</version>
-							<type>jar</type>
-						</dependency>
-					</oldVersion>
-					<newVersion>
-						<file>
-							<path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
-						</file>
-					</newVersion>
-					<parameter>
-						<breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
-						<accessModifier>public</accessModifier>
-						<onlyBinaryIncompatible>true</onlyBinaryIncompatible>
-						<includes>
-							<include>com.github.dockerjava.api</include>
-						</includes>
-						<excludes>
-							<!-- TODO? -->
-							<exclude>com.github.dockerjava.api.model.*$Serializer</exclude>
-							<exclude>com.github.dockerjava.api.model.*$Deserializer</exclude>
-							<!-- Known 3.2.0 breaking changes: -->
-							<exclude>com.github.dockerjava.api.command.DockerCmdExecFactory#init(com.github.dockerjava.core.DockerClientConfig)</exclude>
-							<exclude>com.github.dockerjava.api.model.Identifier#tag</exclude>
-						</excludes>
-						<overrideCompatibilityChangeParameters>
-							<overrideCompatibilityChangeParameter>
-								<compatibilityChange>METHOD_NEW_DEFAULT</compatibilityChange>
-								<binaryCompatible>true</binaryCompatible>
-								<sourceCompatible>true</sourceCompatible>
-							</overrideCompatibilityChangeParameter>
-							<overrideCompatibilityChangeParameter>
-								<compatibilityChange>METHOD_ABSTRACT_NOW_DEFAULT</compatibilityChange>
-								<binaryCompatible>true</binaryCompatible>
-								<sourceCompatible>true</sourceCompatible>
-							</overrideCompatibilityChangeParameter>
-						</overrideCompatibilityChangeParameters>
-					</parameter>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>verify</phase>
-						<goals>
-							<goal>cmp</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java
new file mode 100644
index 000000000..dbd691974
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java
@@ -0,0 +1,377 @@
+package com.github.dockerjava.api.command;
+
+import java.io.IOException;
+
+public class DelegatingDockerCmdExecFactory implements DockerCmdExecFactory {
+
+    // We're not using abstract class because we want
+    // the compiler to force us to implement new DockerCmdExecFactory when added
+    public DockerCmdExecFactory getDockerCmdExecFactory() {
+        throw new IllegalStateException("Implement me!");
+    }
+
+    @Override
+    public AuthCmd.Exec createAuthCmdExec() {
+        return getDockerCmdExecFactory().createAuthCmdExec();
+    }
+
+    @Override
+    public InfoCmd.Exec createInfoCmdExec() {
+        return getDockerCmdExecFactory().createInfoCmdExec();
+    }
+
+    @Override
+    public PingCmd.Exec createPingCmdExec() {
+        return getDockerCmdExecFactory().createPingCmdExec();
+    }
+
+    @Override
+    public ExecCreateCmd.Exec createExecCmdExec() {
+        return getDockerCmdExecFactory().createExecCmdExec();
+    }
+
+    @Override
+    public VersionCmd.Exec createVersionCmdExec() {
+        return getDockerCmdExecFactory().createVersionCmdExec();
+    }
+
+    @Override
+    public PullImageCmd.Exec createPullImageCmdExec() {
+        return getDockerCmdExecFactory().createPullImageCmdExec();
+    }
+
+    @Override
+    public PushImageCmd.Exec createPushImageCmdExec() {
+        return getDockerCmdExecFactory().createPushImageCmdExec();
+    }
+
+    @Override
+    public SaveImageCmd.Exec createSaveImageCmdExec() {
+        return getDockerCmdExecFactory().createSaveImageCmdExec();
+    }
+
+    @Override
+    public SaveImagesCmd.Exec createSaveImagesCmdExec() {
+        return getDockerCmdExecFactory().createSaveImagesCmdExec();
+    }
+
+    @Override
+    public CreateImageCmd.Exec createCreateImageCmdExec() {
+        return getDockerCmdExecFactory().createCreateImageCmdExec();
+    }
+
+    @Override
+    public LoadImageCmd.Exec createLoadImageCmdExec() {
+        return getDockerCmdExecFactory().createLoadImageCmdExec();
+    }
+
+    @Override
+    public SearchImagesCmd.Exec createSearchImagesCmdExec() {
+        return getDockerCmdExecFactory().createSearchImagesCmdExec();
+    }
+
+    @Override
+    public RemoveImageCmd.Exec createRemoveImageCmdExec() {
+        return getDockerCmdExecFactory().createRemoveImageCmdExec();
+    }
+
+    @Override
+    public ListImagesCmd.Exec createListImagesCmdExec() {
+        return getDockerCmdExecFactory().createListImagesCmdExec();
+    }
+
+    @Override
+    public InspectImageCmd.Exec createInspectImageCmdExec() {
+        return getDockerCmdExecFactory().createInspectImageCmdExec();
+    }
+
+    @Override
+    public ListContainersCmd.Exec createListContainersCmdExec() {
+        return getDockerCmdExecFactory().createListContainersCmdExec();
+    }
+
+    @Override
+    public CreateContainerCmd.Exec createCreateContainerCmdExec() {
+        return getDockerCmdExecFactory().createCreateContainerCmdExec();
+    }
+
+    @Override
+    public StartContainerCmd.Exec createStartContainerCmdExec() {
+        return getDockerCmdExecFactory().createStartContainerCmdExec();
+    }
+
+    @Override
+    public InspectContainerCmd.Exec createInspectContainerCmdExec() {
+        return getDockerCmdExecFactory().createInspectContainerCmdExec();
+    }
+
+    @Override
+    public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
+        return getDockerCmdExecFactory().createRemoveContainerCmdExec();
+    }
+
+    @Override
+    public WaitContainerCmd.Exec createWaitContainerCmdExec() {
+        return getDockerCmdExecFactory().createWaitContainerCmdExec();
+    }
+
+    @Override
+    public AttachContainerCmd.Exec createAttachContainerCmdExec() {
+        return getDockerCmdExecFactory().createAttachContainerCmdExec();
+    }
+
+    @Override
+    public ExecStartCmd.Exec createExecStartCmdExec() {
+        return getDockerCmdExecFactory().createExecStartCmdExec();
+    }
+
+    @Override
+    public InspectExecCmd.Exec createInspectExecCmdExec() {
+        return getDockerCmdExecFactory().createInspectExecCmdExec();
+    }
+
+    @Override
+    public LogContainerCmd.Exec createLogContainerCmdExec() {
+        return getDockerCmdExecFactory().createLogContainerCmdExec();
+    }
+
+    @Override
+    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
+        return getDockerCmdExecFactory().createCopyFileFromContainerCmdExec();
+    }
+
+    @Override
+    public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() {
+        return getDockerCmdExecFactory().createCopyArchiveFromContainerCmdExec();
+    }
+
+    @Override
+    public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() {
+        return getDockerCmdExecFactory().createCopyArchiveToContainerCmdExec();
+    }
+
+    @Override
+    public StopContainerCmd.Exec createStopContainerCmdExec() {
+        return getDockerCmdExecFactory().createStopContainerCmdExec();
+    }
+
+    @Override
+    public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
+        return getDockerCmdExecFactory().createContainerDiffCmdExec();
+    }
+
+    @Override
+    public KillContainerCmd.Exec createKillContainerCmdExec() {
+        return getDockerCmdExecFactory().createKillContainerCmdExec();
+    }
+
+    @Override
+    public UpdateContainerCmd.Exec createUpdateContainerCmdExec() {
+        return getDockerCmdExecFactory().createUpdateContainerCmdExec();
+    }
+
+    @Override
+    public RenameContainerCmd.Exec createRenameContainerCmdExec() {
+        return getDockerCmdExecFactory().createRenameContainerCmdExec();
+    }
+
+    @Override
+    public RestartContainerCmd.Exec createRestartContainerCmdExec() {
+        return getDockerCmdExecFactory().createRestartContainerCmdExec();
+    }
+
+    @Override
+    public CommitCmd.Exec createCommitCmdExec() {
+        return getDockerCmdExecFactory().createCommitCmdExec();
+    }
+
+    @Override
+    public BuildImageCmd.Exec createBuildImageCmdExec() {
+        return getDockerCmdExecFactory().createBuildImageCmdExec();
+    }
+
+    @Override
+    public TopContainerCmd.Exec createTopContainerCmdExec() {
+        return getDockerCmdExecFactory().createTopContainerCmdExec();
+    }
+
+    @Override
+    public TagImageCmd.Exec createTagImageCmdExec() {
+        return getDockerCmdExecFactory().createTagImageCmdExec();
+    }
+
+    @Override
+    public PauseContainerCmd.Exec createPauseContainerCmdExec() {
+        return getDockerCmdExecFactory().createPauseContainerCmdExec();
+    }
+
+    @Override
+    public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
+        return getDockerCmdExecFactory().createUnpauseContainerCmdExec();
+    }
+
+    @Override
+    public EventsCmd.Exec createEventsCmdExec() {
+        return getDockerCmdExecFactory().createEventsCmdExec();
+    }
+
+    @Override
+    public StatsCmd.Exec createStatsCmdExec() {
+        return getDockerCmdExecFactory().createStatsCmdExec();
+    }
+
+    @Override
+    public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
+        return getDockerCmdExecFactory().createCreateVolumeCmdExec();
+    }
+
+    @Override
+    public InspectVolumeCmd.Exec createInspectVolumeCmdExec() {
+        return getDockerCmdExecFactory().createInspectVolumeCmdExec();
+    }
+
+    @Override
+    public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() {
+        return getDockerCmdExecFactory().createRemoveVolumeCmdExec();
+    }
+
+    @Override
+    public ListVolumesCmd.Exec createListVolumesCmdExec() {
+        return getDockerCmdExecFactory().createListVolumesCmdExec();
+    }
+
+    @Override
+    public ListNetworksCmd.Exec createListNetworksCmdExec() {
+        return getDockerCmdExecFactory().createListNetworksCmdExec();
+    }
+
+    @Override
+    public InspectNetworkCmd.Exec createInspectNetworkCmdExec() {
+        return getDockerCmdExecFactory().createInspectNetworkCmdExec();
+    }
+
+    @Override
+    public CreateNetworkCmd.Exec createCreateNetworkCmdExec() {
+        return getDockerCmdExecFactory().createCreateNetworkCmdExec();
+    }
+
+    @Override
+    public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() {
+        return getDockerCmdExecFactory().createRemoveNetworkCmdExec();
+    }
+
+    @Override
+    public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() {
+        return getDockerCmdExecFactory().createConnectToNetworkCmdExec();
+    }
+
+    @Override
+    public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() {
+        return getDockerCmdExecFactory().createDisconnectFromNetworkCmdExec();
+    }
+
+    @Override
+    public InitializeSwarmCmd.Exec createInitializeSwarmCmdExec() {
+        return getDockerCmdExecFactory().createInitializeSwarmCmdExec();
+    }
+
+    @Override
+    public InspectSwarmCmd.Exec createInspectSwarmCmdExec() {
+        return getDockerCmdExecFactory().createInspectSwarmCmdExec();
+    }
+
+    @Override
+    public JoinSwarmCmd.Exec createJoinSwarmCmdExec() {
+        return getDockerCmdExecFactory().createJoinSwarmCmdExec();
+    }
+
+    @Override
+    public LeaveSwarmCmd.Exec createLeaveSwarmCmdExec() {
+        return getDockerCmdExecFactory().createLeaveSwarmCmdExec();
+    }
+
+    @Override
+    public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() {
+        return getDockerCmdExecFactory().createUpdateSwarmCmdExec();
+    }
+
+    @Override
+    public ListServicesCmd.Exec createListServicesCmdExec() {
+        return getDockerCmdExecFactory().createListServicesCmdExec();
+    }
+
+    @Override
+    public CreateServiceCmd.Exec createCreateServiceCmdExec() {
+        return getDockerCmdExecFactory().createCreateServiceCmdExec();
+    }
+
+    @Override
+    public InspectServiceCmd.Exec createInspectServiceCmdExec() {
+        return getDockerCmdExecFactory().createInspectServiceCmdExec();
+    }
+
+    @Override
+    public UpdateServiceCmd.Exec createUpdateServiceCmdExec() {
+        return getDockerCmdExecFactory().createUpdateServiceCmdExec();
+    }
+
+    @Override
+    public RemoveServiceCmd.Exec createRemoveServiceCmdExec() {
+        return getDockerCmdExecFactory().createRemoveServiceCmdExec();
+    }
+
+    @Override
+    public LogSwarmObjectCmd.Exec logSwarmObjectExec(String endpoint) {
+        return getDockerCmdExecFactory().logSwarmObjectExec(endpoint);
+    }
+
+    @Override
+    public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() {
+        return getDockerCmdExecFactory().listSwarmNodeCmdExec();
+    }
+
+    @Override
+    public InspectSwarmNodeCmd.Exec inspectSwarmNodeCmdExec() {
+        return getDockerCmdExecFactory().inspectSwarmNodeCmdExec();
+    }
+
+    @Override
+    public RemoveSwarmNodeCmd.Exec removeSwarmNodeCmdExec() {
+        return getDockerCmdExecFactory().removeSwarmNodeCmdExec();
+    }
+
+    @Override
+    public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() {
+        return getDockerCmdExecFactory().updateSwarmNodeCmdExec();
+    }
+
+    @Override
+    public ListTasksCmd.Exec listTasksCmdExec() {
+        return getDockerCmdExecFactory().listTasksCmdExec();
+    }
+
+    @Override
+    public PruneCmd.Exec pruneCmdExec() {
+        return getDockerCmdExecFactory().pruneCmdExec();
+    }
+
+    @Override
+    public ListSecretsCmd.Exec createListSecretsCmdExec() {
+        return getDockerCmdExecFactory().createListSecretsCmdExec();
+    }
+
+    @Override
+    public CreateSecretCmd.Exec createCreateSecretCmdExec() {
+        return getDockerCmdExecFactory().createCreateSecretCmdExec();
+    }
+
+    @Override
+    public RemoveSecretCmd.Exec createRemoveSecretCmdExec() {
+        return getDockerCmdExecFactory().createRemoveSecretCmdExec();
+    }
+
+    @Override
+    public void close() throws IOException {
+        getDockerCmdExecFactory().close();
+    }
+}
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index 5238f816a..ed77c9db7 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -70,6 +70,13 @@
 			<version>3.0.1u2</version>
 			<scope>provided</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>org.immutables</groupId>
+			<artifactId>value</artifactId>
+			<version>2.8.2</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java
new file mode 100644
index 000000000..5e13824ef
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java
@@ -0,0 +1,154 @@
+package com.github.dockerjava.core;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.MultimapBuilder;
+import com.google.common.collect.SetMultimap;
+import com.google.common.escape.Escaper;
+import com.google.common.net.UrlEscapers;
+import org.apache.commons.lang.StringUtils;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public final class DefaultDockerCmdExecFactory extends AbstractDockerCmdExecFactory {
+
+    private final DockerHttpClient dockerHttpClient;
+
+    private final ObjectMapper objectMapper;
+
+    public DefaultDockerCmdExecFactory(
+        DockerHttpClient dockerHttpClient,
+        ObjectMapper objectMapper
+    ) {
+        this.dockerHttpClient = dockerHttpClient;
+        this.objectMapper = objectMapper;
+    }
+
+    public DockerHttpClient getDockerHttpClient() {
+        return dockerHttpClient;
+    }
+
+    @Override
+    protected WebTarget getBaseResource() {
+        return new DefaultWebTarget();
+    }
+
+    @Override
+    public void close() throws IOException {
+        dockerHttpClient.close();
+    }
+
+    private class DefaultWebTarget implements WebTarget {
+
+        final ImmutableList<String> path;
+
+        final SetMultimap<String, String> queryParams;
+
+        DefaultWebTarget() {
+            this(
+                ImmutableList.of(),
+                MultimapBuilder.hashKeys().hashSetValues().build()
+            );
+        }
+
+        DefaultWebTarget(
+            ImmutableList<String> path,
+            SetMultimap<String, String> queryParams
+        ) {
+            this.path = path;
+            this.queryParams = queryParams;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("DefaultWebTarget{path=%s, queryParams=%s}", path, queryParams);
+        }
+
+        @Override
+        public InvocationBuilder request() {
+            String resource = StringUtils.join(path, "/");
+
+            if (!resource.startsWith("/")) {
+                resource = "/" + resource;
+            }
+
+            if (!queryParams.isEmpty()) {
+                Escaper urlFormParameterEscaper = UrlEscapers.urlFormParameterEscaper();
+                resource = queryParams.asMap().entrySet().stream()
+                    .flatMap(entry -> {
+                        return entry.getValue().stream().map(s -> {
+                            return entry.getKey() + "=" + urlFormParameterEscaper.escape(s);
+                        });
+                    })
+                    .collect(Collectors.joining("&", resource + "?", ""));
+            }
+
+            return new DefaultInvocationBuilder(
+                dockerHttpClient, objectMapper, resource
+            );
+        }
+
+        @Override
+        public DefaultWebTarget path(String... components) {
+            ImmutableList<String> newPath = ImmutableList.<String>builder()
+                .addAll(path)
+                .add(components)
+                .build();
+            return new DefaultWebTarget(newPath, queryParams);
+        }
+
+        @Override
+        public DefaultWebTarget resolveTemplate(String name, Object value) {
+            ImmutableList.Builder<String> newPath = ImmutableList.builder();
+            for (String component : path) {
+                component = component.replaceAll(
+                    "\\{" + name + "\\}",
+                    UrlEscapers.urlPathSegmentEscaper().escape(value.toString())
+                );
+                newPath.add(component);
+            }
+
+            return new DefaultWebTarget(newPath.build(), queryParams);
+        }
+
+        @Override
+        public DefaultWebTarget queryParam(String name, Object value) {
+            if (value == null) {
+                return this;
+            }
+
+            SetMultimap<String, String> newQueryParams = HashMultimap.create(queryParams);
+            newQueryParams.put(name, value.toString());
+
+            return new DefaultWebTarget(path, newQueryParams);
+        }
+
+        @Override
+        public DefaultWebTarget queryParamsSet(String name, Set<?> values) {
+            SetMultimap<String, String> newQueryParams = HashMultimap.create(queryParams);
+            newQueryParams.replaceValues(name, values.stream().filter(Objects::nonNull).map(Object::toString).collect(Collectors.toSet()));
+
+            return new DefaultWebTarget(path, newQueryParams);
+        }
+
+        @Override
+        public DefaultWebTarget queryParamsJsonMap(String name, Map<String, String> values) {
+            if (values == null || values.isEmpty()) {
+                return this;
+            }
+
+            // when param value is JSON string
+            try {
+                return queryParam(name, objectMapper.writeValueAsString(values));
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java
new file mode 100644
index 000000000..50bd4612b
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java
@@ -0,0 +1,296 @@
+package com.github.dockerjava.core;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.MappingIterator;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.exception.BadRequestException;
+import com.github.dockerjava.api.exception.ConflictException;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.exception.InternalServerErrorException;
+import com.github.dockerjava.api.exception.NotAcceptableException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.exception.NotModifiedException;
+import com.github.dockerjava.api.exception.UnauthorizedException;
+import com.github.dockerjava.api.model.Frame;
+import org.apache.commons.io.IOUtils;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Objects;
+import java.util.function.Consumer;
+
+class DefaultInvocationBuilder implements InvocationBuilder {
+
+    private final DockerHttpClient.Request.Builder requestBuilder;
+    private final DockerHttpClient dockerHttpClient;
+    private final ObjectMapper objectMapper;
+
+    DefaultInvocationBuilder(DockerHttpClient dockerHttpClient, ObjectMapper objectMapper, String path) {
+        this.requestBuilder = DockerHttpClient.Request.builder().path(path);
+        this.dockerHttpClient = dockerHttpClient;
+        this.objectMapper = objectMapper;
+    }
+
+    @Override
+    public DefaultInvocationBuilder accept(MediaType mediaType) {
+        return header("accept", mediaType.getMediaType());
+    }
+
+    @Override
+    public DefaultInvocationBuilder header(String name, String value) {
+        requestBuilder.putHeader(name, value);
+        return this;
+    }
+
+    @Override
+    public void delete() {
+        DockerHttpClient.Request request = requestBuilder
+            .method(DockerHttpClient.Request.Method.DELETE)
+            .build();
+
+        execute(request).close();
+    }
+
+    @Override
+    public void get(ResultCallback<Frame> resultCallback) {
+        DockerHttpClient.Request request = requestBuilder
+            .method(DockerHttpClient.Request.Method.GET)
+            .build();
+
+        executeAndStream(
+            request,
+            resultCallback,
+            new FramedInputStreamConsumer(resultCallback)
+        );
+    }
+
+    @Override
+    public <T> T get(TypeReference<T> typeReference) {
+        try (InputStream inputStream = get()) {
+            return objectMapper.readValue(inputStream, typeReference);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public <T> void get(TypeReference<T> typeReference, ResultCallback<T> resultCallback) {
+        DockerHttpClient.Request request = requestBuilder
+            .method(DockerHttpClient.Request.Method.GET)
+            .build();
+
+        executeAndStream(
+            request,
+            resultCallback,
+            new JsonSink<>(typeReference, resultCallback)
+        );
+    }
+
+    @Override
+    public InputStream post(Object entity) {
+        DockerHttpClient.Request request = requestBuilder
+            .method(DockerHttpClient.Request.Method.POST)
+            .putHeader("content-type", "application/json")
+            .body(encode(entity))
+            .build();
+
+        return execute(request).getBody();
+    }
+
+    @Override
+    public <T> T post(Object entity, TypeReference<T> typeReference) {
+        try {
+            DockerHttpClient.Request request = requestBuilder
+                .method(DockerHttpClient.Request.Method.POST)
+                .putHeader("content-type", "application/json")
+                .body(new ByteArrayInputStream(objectMapper.writeValueAsBytes(entity)))
+                .build();
+
+            try (DockerHttpClient.Response response = execute(request)) {
+                return objectMapper.readValue(response.getBody(), typeReference);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public <T> void post(Object entity, TypeReference<T> typeReference, ResultCallback<T> resultCallback) {
+        try {
+            post(typeReference, resultCallback, new ByteArrayInputStream(objectMapper.writeValueAsBytes(entity)));
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public <T> T post(TypeReference<T> typeReference, InputStream body) {
+        try (InputStream inputStream = post(body)) {
+            return objectMapper.readValue(inputStream, typeReference);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void post(Object entity, InputStream stdin, ResultCallback<Frame> resultCallback) {
+        final DockerHttpClient.Request request;
+        try {
+            request = requestBuilder
+                .method(DockerHttpClient.Request.Method.POST)
+                .putHeader("content-type", "application/json")
+                .body(new ByteArrayInputStream(objectMapper.writeValueAsBytes(entity)))
+                .hijackedInput(stdin)
+                .build();
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+
+        executeAndStream(
+            request,
+            resultCallback,
+            new FramedInputStreamConsumer(resultCallback)
+        );
+    }
+
+    @Override
+    public <T> void post(TypeReference<T> typeReference, ResultCallback<T> resultCallback, InputStream body) {
+        DockerHttpClient.Request request = requestBuilder
+            .method(DockerHttpClient.Request.Method.POST)
+            .body(body)
+            .build();
+
+        executeAndStream(
+            request,
+            resultCallback,
+            new JsonSink<>(typeReference, resultCallback)
+        );
+    }
+
+    @Override
+    public void postStream(InputStream body) {
+        DockerHttpClient.Request request = requestBuilder
+            .method(DockerHttpClient.Request.Method.POST)
+            .body(body)
+            .build();
+
+        execute(request).close();
+    }
+
+    @Override
+    public InputStream get() {
+        DockerHttpClient.Request request = requestBuilder
+            .method(DockerHttpClient.Request.Method.GET)
+            .build();
+
+        return execute(request).getBody();
+    }
+
+    @Override
+    public void put(InputStream body, MediaType mediaType) {
+        DockerHttpClient.Request request = requestBuilder
+            .method(DockerHttpClient.Request.Method.PUT)
+            .putHeader("content-type", mediaType.toString())
+            .body(body)
+            .build();
+
+        execute(request).close();
+    }
+
+    protected DockerHttpClient.Response execute(DockerHttpClient.Request request) {
+        try {
+            DockerHttpClient.Response response = dockerHttpClient.execute(request);
+            int statusCode = response.getStatusCode();
+            if (statusCode < 200 || statusCode > 299) {
+                try {
+                    String body = IOUtils.toString(response.getBody(), StandardCharsets.UTF_8);
+                    switch (statusCode) {
+                        case 304:
+                            throw new NotModifiedException(body);
+                        case 400:
+                            throw new BadRequestException(body);
+                        case 401:
+                            throw new UnauthorizedException(body);
+                        case 404:
+                            throw new NotFoundException(body);
+                        case 406:
+                            throw new NotAcceptableException(body);
+                        case 409:
+                            throw new ConflictException(body);
+                        case 500:
+                            throw new InternalServerErrorException(body);
+                        default:
+                            throw new DockerException(body, statusCode);
+                    }
+                } finally {
+                    response.close();
+                }
+            } else {
+                return response;
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    protected <T> void executeAndStream(
+        DockerHttpClient.Request request,
+        ResultCallback<T> callback,
+        Consumer<DockerHttpClient.Response> sourceConsumer
+    ) {
+        Thread thread = new Thread(() -> {
+            try (DockerHttpClient.Response response = execute(request)) {
+                callback.onStart(response);
+
+                sourceConsumer.accept(response);
+                callback.onComplete();
+            } catch (Exception e) {
+                callback.onError(e);
+            }
+        }, "docker-java-stream-" + Objects.hashCode(request));
+        thread.setDaemon(true);
+
+        thread.start();
+    }
+
+    private InputStream encode(Object entity) {
+        if (entity == null) {
+            return null;
+        }
+
+        try {
+            return new ByteArrayInputStream(objectMapper.writeValueAsBytes(entity));
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private class JsonSink<T> implements Consumer<DockerHttpClient.Response> {
+
+        private final TypeReference<T> typeReference;
+
+        private final ResultCallback<T> resultCallback;
+
+        JsonSink(TypeReference<T> typeReference, ResultCallback<T> resultCallback) {
+            this.typeReference = typeReference;
+            this.resultCallback = resultCallback;
+        }
+
+        @Override
+        public void accept(DockerHttpClient.Response response) {
+            try {
+                InputStream body = response.getBody();
+                MappingIterator<Object> iterator = objectMapper.readerFor(typeReference).readValues(body);
+                while (iterator.hasNextValue()) {
+                    resultCallback.onNext((T) iterator.nextValue());
+                }
+            } catch (Exception e) {
+                resultCallback.onError(e);
+            }
+        }
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 85f21d476..3e1b59b1e 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -150,6 +150,7 @@
 import com.github.dockerjava.core.command.WaitContainerCmdImpl;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
@@ -196,6 +197,27 @@ public static DockerClientImpl getInstance(String serverUrl) {
         return new DockerClientImpl(serverUrl);
     }
 
+    public DockerClientImpl withHttpClient(DockerHttpClient httpClient) {
+        return withDockerCmdExecFactory(new DefaultDockerCmdExecFactory(httpClient, dockerClientConfig.getObjectMapper()));
+    }
+
+    /**
+     *
+     * @return {@link DockerHttpClient} or null if not set
+     */
+    @Nullable
+    public DockerHttpClient getHttpClient() {
+        if (dockerCmdExecFactory instanceof DefaultDockerCmdExecFactory) {
+            return ((DefaultDockerCmdExecFactory) dockerCmdExecFactory).getDockerHttpClient();
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * @deprecated use {{@link #withHttpClient(DockerHttpClient)}}
+     */
+    @Deprecated
     public DockerClientImpl withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) {
         checkNotNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified");
         this.dockerCmdExecFactory = dockerCmdExecFactory;
@@ -205,6 +227,7 @@ public DockerClientImpl withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdE
         return this;
     }
 
+    @Deprecated
     private DockerCmdExecFactory getDockerCmdExecFactory() {
         checkNotNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified");
         return dockerCmdExecFactory;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerHttpClient.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerHttpClient.java
new file mode 100644
index 000000000..6b56fd07f
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerHttpClient.java
@@ -0,0 +1,80 @@
+package com.github.dockerjava.core;
+
+import org.immutables.value.Value;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.io.Closeable;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+
+public interface DockerHttpClient extends Closeable {
+
+    Response execute(Request request);
+
+    interface Response extends Closeable {
+
+        int getStatusCode();
+
+        Map<String, List<String>> getHeaders();
+
+        InputStream getBody();
+
+        @Override
+        void close();
+
+        @Nullable
+        default String getHeader(@Nonnull String name) {
+            for (Map.Entry<String, List<String>> entry : getHeaders().entrySet()) {
+                if (name.equalsIgnoreCase(entry.getKey())) {
+                    List<String> values = entry.getValue();
+                    return values.isEmpty() ? null : values.get(0);
+                }
+            }
+
+            return null;
+        }
+    }
+
+    @Value.Immutable
+    @Value.Style(
+        visibility = Value.Style.ImplementationVisibility.PACKAGE,
+        overshadowImplementation = true,
+        depluralize = true
+    )
+    abstract class Request {
+
+        public enum Method {
+            GET,
+            POST,
+            PUT,
+            DELETE,
+            OPTIONS,
+            PATCH,
+        }
+
+        public static class Builder extends ImmutableRequest.Builder {
+
+            public Builder method(Method method) {
+                return method(method.name());
+            }
+        }
+
+        public static Builder builder() {
+            return new Builder();
+        }
+
+        public abstract String method();
+
+        public abstract String path();
+
+        @Nullable
+        public abstract InputStream body();
+
+        @Nullable
+        public abstract InputStream hijackedInput();
+
+        public abstract Map<String, String> headers();
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/FramedInputStreamConsumer.java b/docker-java-core/src/main/java/com/github/dockerjava/core/FramedInputStreamConsumer.java
new file mode 100644
index 000000000..fde82647e
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/FramedInputStreamConsumer.java
@@ -0,0 +1,99 @@
+package com.github.dockerjava.core;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.StreamType;
+
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.function.Consumer;
+
+class FramedInputStreamConsumer implements Consumer<DockerHttpClient.Response> {
+
+    private final ResultCallback<Frame> resultCallback;
+
+    FramedInputStreamConsumer(ResultCallback<Frame> resultCallback) {
+        this.resultCallback = resultCallback;
+    }
+
+    @Override
+    public void accept(DockerHttpClient.Response response) {
+        try {
+            InputStream body = response.getBody();
+
+            byte[] buffer = new byte[1024];
+            while (true) {
+                // See https://docs.docker.com/engine/api/v1.37/#operation/ContainerAttach
+                // [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}[]byte{OUTPUT}
+
+                int streamTypeByte = body.read();
+                if (streamTypeByte < 0) {
+                    return;
+                }
+
+                StreamType streamType = streamType(streamTypeByte);
+
+                if (streamType == StreamType.RAW) {
+                    resultCallback.onNext(new Frame(StreamType.RAW, new byte[]{(byte) streamTypeByte}));
+
+                    int readBytes;
+                    while ((readBytes = body.read(buffer)) >= 0) {
+                        if (readBytes == buffer.length) {
+                            resultCallback.onNext(new Frame(StreamType.RAW, buffer));
+                        } else {
+                            resultCallback.onNext(new Frame(StreamType.RAW, Arrays.copyOf(buffer, readBytes)));
+                        }
+                    }
+                    return;
+                }
+
+                // Skip 3 bytes
+                for (int i = 0; i < 3; i++) {
+                    if (body.read() < 0) {
+                        return;
+                    }
+                }
+
+                // uint32 encoded as big endian.
+                int bytesToRead = 0;
+                for (int i = 0; i < 4; i++) {
+                    int readByte = body.read();
+                    if (readByte < 0) {
+                        return;
+                    }
+                    bytesToRead |= (readByte & 0xff) << (8 * (3 - i));
+                }
+
+                do {
+                    int readBytes = body.read(buffer, 0, Math.min(buffer.length, bytesToRead));
+                    if (readBytes < 0) {
+                        // TODO log?
+                        return;
+                    }
+
+                    if (readBytes == buffer.length) {
+                        resultCallback.onNext(new Frame(streamType, buffer));
+                    } else {
+                        resultCallback.onNext(new Frame(streamType, Arrays.copyOf(buffer, readBytes)));
+                    }
+                    bytesToRead -= readBytes;
+                } while (bytesToRead > 0);
+            }
+        } catch (Exception e) {
+            resultCallback.onError(e);
+        }
+    }
+
+    private static StreamType streamType(int streamType) {
+        switch (streamType) {
+            case 0:
+                return StreamType.STDIN;
+            case 1:
+                return StreamType.STDOUT;
+            case 2:
+                return StreamType.STDERR;
+            default:
+                return StreamType.RAW;
+        }
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java b/docker-java-core/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java
index 3070930d6..4c3136417 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/async/FrameStreamProcessor.java
@@ -16,6 +16,8 @@
  * @author Marcus Linke
  *
  */
+@SuppressWarnings("unused")
+@Deprecated
 public class FrameStreamProcessor implements ResponseStreamProcessor<Frame> {
 
     @Override
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
index 8829decac..64aabd999 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
@@ -20,6 +20,8 @@
  * @author Marcus Linke
  *
  */
+@SuppressWarnings("unused")
+@Deprecated
 public class JsonStreamProcessor<T> implements ResponseStreamProcessor<T> {
 
     private static final JsonFactory JSON_FACTORY = new JsonFactory();
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/FrameReader.java
index 9c9c31e74..1dc5d3503 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/FrameReader.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/FrameReader.java
@@ -14,6 +14,7 @@
  * <p/>
  * See: {@link }http://docs.docker.com/v1.6/reference/api/docker_remote_api_v1.13/#attach-to-a-container}
  */
+@Deprecated
 public class FrameReader implements AutoCloseable {
 
     private static final int HEADER_SIZE = 8;
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index 7165cdf39..37de78f58 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -72,6 +72,33 @@
 
 	<build>
 		<plugins>
+
+			<plugin>
+				<groupId>com.github.siom79.japicmp</groupId>
+				<artifactId>japicmp-maven-plugin</artifactId>
+				<configuration>
+					<parameter>
+						<excludes>
+							<!-- Previously deprecated -->
+							<exclude>com.github.dockerjava.jaxrs.ApacheUnixSocket</exclude>
+							<exclude>com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier</exclude>
+							<exclude>com.github.dockerjava.jaxrs.async.GETCallbackNotifier</exclude>
+							<exclude>com.github.dockerjava.jaxrs.async.GETCallbackNotifier</exclude>
+							<exclude>com.github.dockerjava.jaxrs.async.POSTCallbackNotifier</exclude>
+							<exclude>com.github.dockerjava.jaxrs.UnixConnectionSocketFactory</exclude>
+							<exclude>com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory#releaseConnection(long)</exclude>
+						</excludes>
+						<overrideCompatibilityChangeParameters>
+							<overrideCompatibilityChangeParameter>
+								<compatibilityChange>SUPERCLASS_REMOVED</compatibilityChange>
+								<binaryCompatible>true</binaryCompatible>
+								<sourceCompatible>true</sourceCompatible>
+							</overrideCompatibilityChangeParameter>
+						</overrideCompatibilityChangeParameters>
+					</parameter>
+				</configuration>
+			</plugin>
+
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
index e64e252f8..72a851560 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/ApacheUnixSocket.java
@@ -41,14 +41,13 @@
  *
  * This class also noop's any calls to setReuseAddress, which is called by the Apache client but isn't supported by AFUnixSocket.
  */
-@Deprecated
-public class ApacheUnixSocket extends Socket {
+class ApacheUnixSocket extends Socket {
 
     private final AFUNIXSocket inner;
 
     private final Queue<SocketOptionSetter> optionsToSet = new ArrayDeque<>();
 
-    public ApacheUnixSocket() throws IOException {
+    ApacheUnixSocket() throws IOException {
         this.inner = AFUNIXSocket.newInstance();
     }
 
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
index 97ec72384..82d7b8324 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -1,300 +1,95 @@
 package com.github.dockerjava.jaxrs;
 
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
-import com.github.dockerjava.api.exception.DockerClientException;
-import com.github.dockerjava.core.AbstractDockerCmdExecFactory;
+import com.github.dockerjava.api.command.DelegatingDockerCmdExecFactory;
+import com.github.dockerjava.api.command.DockerCmdExecFactory;
+import com.github.dockerjava.core.DefaultDockerCmdExecFactory;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.SSLConfig;
-import com.github.dockerjava.jaxrs.filter.JsonClientFilter;
-import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter;
-import com.github.dockerjava.jaxrs.filter.SelectiveLoggingFilter;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.glassfish.jersey.CommonProperties;
-import org.glassfish.jersey.apache.connector.ApacheClientProperties;
-import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
-import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.client.ClientProperties;
+import com.github.dockerjava.core.DockerClientConfigAware;
+import com.github.dockerjava.core.DockerClientImpl;
+import com.github.dockerjava.core.DockerHttpClient;
 import org.glassfish.jersey.client.RequestEntityProcessing;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import javax.net.ssl.SSLContext;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.ClientRequestFilter;
 import javax.ws.rs.client.ClientResponseFilter;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.ProxySelector;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import static com.google.common.base.Preconditions.checkNotNull;
 
 //import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 // see https://github.com/docker-java/docker-java/issues/196
+/**
+ * @deprecated use {@link JerseyDockerHttpClient} with {@link DockerClientImpl#withHttpClient(DockerHttpClient)}
+ */
+@Deprecated
+public class JerseyDockerCmdExecFactory extends DelegatingDockerCmdExecFactory implements DockerClientConfigAware {
 
-public class JerseyDockerCmdExecFactory extends AbstractDockerCmdExecFactory {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(JerseyDockerCmdExecFactory.class.getName());
-
-    private Client client;
-
-    private JerseyWebTarget baseResource;
-
-    private Integer maxTotalConnections = null;
-
-    private Integer maxPerRouteConnections = null;
-
-    private Integer connectionRequestTimeout = null;
-
-    private ClientRequestFilter[] clientRequestFilters = null;
+    private JerseyDockerHttpClient.Factory clientFactory = new JerseyDockerHttpClient.Factory();
 
-    private ClientResponseFilter[] clientResponseFilters = null;
+    @Deprecated
+    protected Integer connectTimeout;
 
-    private DockerClientConfig dockerClientConfig;
+    @Deprecated
+    protected Integer readTimeout;
 
-    private PoolingHttpClientConnectionManager connManager = null;
+    private DefaultDockerCmdExecFactory dockerCmdExecFactory;
 
-    private RequestEntityProcessing requestEntityProcessing;
+    @Override
+    public final DockerCmdExecFactory getDockerCmdExecFactory() {
+        return dockerCmdExecFactory;
+    }
 
     @Override
     public void init(DockerClientConfig dockerClientConfig) {
-        checkNotNull(dockerClientConfig, "config was not specified");
-        this.dockerClientConfig = dockerClientConfig;
-
-        ClientConfig clientConfig = new ClientConfig();
-        clientConfig.connectorProvider(new ApacheConnectorProvider());
-        clientConfig.property(CommonProperties.FEATURE_AUTO_DISCOVERY_DISABLE, true);
-
-        if (requestEntityProcessing != null) {
-            clientConfig.property(ClientProperties.REQUEST_ENTITY_PROCESSING, requestEntityProcessing);
-        }
-
-        clientConfig.register(new ResponseStatusExceptionFilter(dockerClientConfig.getObjectMapper()));
-        clientConfig.register(JsonClientFilter.class);
-        RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
-
-        clientConfig.register(new JacksonJsonProvider(dockerClientConfig.getObjectMapper()));
-
-        // logging may disabled via log level
-        clientConfig.register(new SelectiveLoggingFilter(LOGGER, true));
-
-        if (readTimeout != null) {
-            requestConfigBuilder.setSocketTimeout(readTimeout);
-            clientConfig.property(ClientProperties.READ_TIMEOUT, readTimeout);
-        }
-
-        if (connectTimeout != null) {
-            requestConfigBuilder.setConnectTimeout(connectTimeout);
-            clientConfig.property(ClientProperties.CONNECT_TIMEOUT, connectTimeout);
-        }
-
-        if (clientResponseFilters != null) {
-            for (ClientResponseFilter clientResponseFilter : clientResponseFilters) {
-                if (clientResponseFilter != null) {
-                    clientConfig.register(clientResponseFilter);
-                }
-            }
-        }
-
-        if (clientRequestFilters != null) {
-            for (ClientRequestFilter clientRequestFilter : clientRequestFilters) {
-                if (clientRequestFilter != null) {
-                    clientConfig.register(clientRequestFilter);
-                }
-            }
-        }
-
-        URI originalUri = dockerClientConfig.getDockerHost();
-
-        String protocol = null;
-
-        SSLContext sslContext = null;
-
-        try {
-            final SSLConfig sslConfig = dockerClientConfig.getSSLConfig();
-            if (sslConfig != null) {
-                sslContext = sslConfig.getSSLContext();
-            }
-        } catch (Exception ex) {
-            throw new DockerClientException("Error in SSL Configuration", ex);
-        }
-
-        if (sslContext != null) {
-            protocol = "https";
-        } else {
-            protocol = "http";
-        }
-
-        switch (originalUri.getScheme()) {
-            case "unix":
-                break;
-            case "tcp":
-                try {
-                    originalUri = new URI(originalUri.toString().replaceFirst("tcp", protocol));
-                } catch (URISyntaxException e) {
-                    throw new RuntimeException(e);
-                }
-
-                configureProxy(clientConfig, originalUri, protocol);
-                break;
-            default:
-                throw new IllegalArgumentException("Unsupported protocol scheme: " + originalUri);
-        }
-
-        connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(
-                originalUri, sslContext)) {
-
-            @Override
-            public void close() {
-                super.shutdown();
-            }
-
-            @Override
-            public void shutdown() {
-                // Disable shutdown of the pool. This will be done later, when this factory is closed
-                // This is a workaround for finalize method on jerseys ClientRuntime which
-                // closes the client and shuts down the connection pool when it is garbage collected
-            }
-        };
-
-        if (maxTotalConnections != null) {
-            connManager.setMaxTotal(maxTotalConnections);
-        }
-        if (maxPerRouteConnections != null) {
-            connManager.setDefaultMaxPerRoute(maxPerRouteConnections);
-        }
-
-        clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER, connManager);
-
-        // Configure connection pool timeout
-        if (connectionRequestTimeout != null) {
-            requestConfigBuilder.setConnectionRequestTimeout(connectionRequestTimeout);
-        }
-        clientConfig.property(ApacheClientProperties.REQUEST_CONFIG, requestConfigBuilder.build());
-        ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(clientConfig);
-
-        if (sslContext != null) {
-            clientBuilder.sslContext(sslContext);
-        }
-
-        client = clientBuilder.build();
-
-        baseResource = new JerseyWebTarget(
-                dockerClientConfig.getObjectMapper(),
-                client.target(sanitizeUrl(originalUri).toString())
-                        .path(dockerClientConfig.getApiVersion().asWebPathPart())
+        clientFactory = clientFactory.dockerClientConfig(dockerClientConfig);
+        dockerCmdExecFactory = new DefaultDockerCmdExecFactory(
+            clientFactory.build(),
+            dockerClientConfig.getObjectMapper()
         );
-
-        super.init(dockerClientConfig);
-    }
-
-    private URI sanitizeUrl(URI originalUri) {
-        if (originalUri.getScheme().equals("unix")) {
-            return UnixConnectionSocketFactory.sanitizeUri(originalUri);
-        }
-        return originalUri;
+        dockerCmdExecFactory.init(dockerClientConfig);
     }
 
-    private void configureProxy(ClientConfig clientConfig, URI originalUri, String protocol) {
-
-        List<Proxy> proxies = ProxySelector.getDefault().select(originalUri);
-
-        for (Proxy proxy : proxies) {
-            InetSocketAddress address = (InetSocketAddress) proxy.address();
-            if (address != null) {
-                String hostname = address.getHostName();
-                int port = address.getPort();
-
-                clientConfig.property(ClientProperties.PROXY_URI, "http://" + hostname + ":" + port);
-
-                String httpProxyUser = System.getProperty(protocol + ".proxyUser");
-                if (httpProxyUser != null) {
-                    clientConfig.property(ClientProperties.PROXY_USERNAME, httpProxyUser);
-                    String httpProxyPassword = System.getProperty(protocol + ".proxyPassword");
-                    if (httpProxyPassword != null) {
-                        clientConfig.property(ClientProperties.PROXY_PASSWORD, httpProxyPassword);
-                    }
-                }
-            }
-        }
-    }
-
-    private org.apache.http.config.Registry<ConnectionSocketFactory> getSchemeRegistry(final URI originalUri,
-                                                                                       SSLContext sslContext) {
-        RegistryBuilder<ConnectionSocketFactory> registryBuilder = RegistryBuilder.create();
-        registryBuilder.register("http", PlainConnectionSocketFactory.getSocketFactory());
-        if (sslContext != null) {
-            registryBuilder.register("https", new SSLConnectionSocketFactory(sslContext));
-        }
-        registryBuilder.register("unix", new UnixConnectionSocketFactory(originalUri));
-        return registryBuilder.build();
-    }
-
-    protected JerseyWebTarget getBaseResource() {
-        checkNotNull(baseResource, "Factory not initialized, baseResource not set. You probably forgot to call init()!");
-        return baseResource;
-    }
-
-    protected DockerClientConfig getDockerClientConfig() {
-        checkNotNull(dockerClientConfig,
-                "Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!");
-        return dockerClientConfig;
+    /**
+     * Configure connection timeout in milliseconds
+     */
+    public JerseyDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) {
+        clientFactory = clientFactory.connectTimeout(connectTimeout);
+        this.connectTimeout = connectTimeout;
+        return this;
     }
 
-    @Override
-    public void close() throws IOException {
-        checkNotNull(client, "Factory not initialized. You probably forgot to call init()!");
-        client.close();
-        connManager.close();
+    /**
+     * Configure read timeout in milliseconds
+     */
+    public JerseyDockerCmdExecFactory withReadTimeout(Integer readTimeout) {
+        clientFactory = clientFactory.readTimeout(readTimeout);
+        this.readTimeout = readTimeout;
+        return this;
     }
 
     public JerseyDockerCmdExecFactory withMaxTotalConnections(Integer maxTotalConnections) {
-        this.maxTotalConnections = maxTotalConnections;
+        clientFactory = clientFactory.maxTotalConnections(maxTotalConnections);
         return this;
     }
 
     public JerseyDockerCmdExecFactory withMaxPerRouteConnections(Integer maxPerRouteConnections) {
-        this.maxPerRouteConnections = maxPerRouteConnections;
+        clientFactory = clientFactory.maxPerRouteConnections(maxPerRouteConnections);
         return this;
     }
 
     public JerseyDockerCmdExecFactory withConnectionRequestTimeout(Integer connectionRequestTimeout) {
-        this.connectionRequestTimeout = connectionRequestTimeout;
+        clientFactory = clientFactory.connectionRequestTimeout(connectionRequestTimeout);
         return this;
     }
 
     public JerseyDockerCmdExecFactory withClientResponseFilters(ClientResponseFilter... clientResponseFilter) {
-        this.clientResponseFilters = clientResponseFilter;
+        clientFactory = clientFactory.clientResponseFilters(clientResponseFilter);
         return this;
     }
 
     public JerseyDockerCmdExecFactory withClientRequestFilters(ClientRequestFilter... clientRequestFilters) {
-        this.clientRequestFilters = clientRequestFilters;
+        clientFactory = clientFactory.clientRequestFilters(clientRequestFilters);
         return this;
     }
 
     public JerseyDockerCmdExecFactory withRequestEntityProcessing(RequestEntityProcessing requestEntityProcessing) {
-        this.requestEntityProcessing = requestEntityProcessing;
+        clientFactory = clientFactory.requestEntityProcessing(requestEntityProcessing);
         return this;
     }
-
-    /**
-     * release connections from the pool
-     *
-     * @param idleSeconds idle seconds, longer than the configured value will be evicted
-     */
-    public void releaseConnection(long idleSeconds) {
-        this.connManager.closeExpiredConnections();
-        this.connManager.closeIdleConnections(idleSeconds, TimeUnit.SECONDS);
-    }
 }
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
new file mode 100644
index 000000000..c2f9f78da
--- /dev/null
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
@@ -0,0 +1,381 @@
+package com.github.dockerjava.jaxrs;
+
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+import com.github.dockerjava.api.exception.DockerClientException;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.DockerHttpClient;
+import com.github.dockerjava.core.SSLConfig;
+import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter;
+import com.github.dockerjava.jaxrs.filter.SelectiveLoggingFilter;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.config.Registry;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.impl.io.EmptyInputStream;
+import org.glassfish.jersey.CommonProperties;
+import org.glassfish.jersey.apache.connector.ApacheClientProperties;
+import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.ClientProperties;
+import org.glassfish.jersey.client.RequestEntityProcessing;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.SSLContext;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.client.ClientResponseFilter;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.core.MediaType;
+import java.io.InputStream;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+import java.util.Map;
+
+public final class JerseyDockerHttpClient implements DockerHttpClient {
+
+    public static final class Factory {
+
+        private DockerClientConfig dockerClientConfig = null;
+
+        private Integer readTimeout = null;
+
+        private Integer connectTimeout = null;
+
+        private Integer maxTotalConnections = null;
+
+        private Integer maxPerRouteConnections = null;
+
+        private Integer connectionRequestTimeout = null;
+
+        private ClientRequestFilter[] clientRequestFilters = null;
+
+        private ClientResponseFilter[] clientResponseFilters = null;
+
+        private RequestEntityProcessing requestEntityProcessing;
+
+        public Factory dockerClientConfig(DockerClientConfig value) {
+            this.dockerClientConfig = value;
+            return this;
+        }
+
+        public Factory readTimeout(Integer value) {
+            this.readTimeout = value;
+            return this;
+        }
+
+        public Factory connectTimeout(Integer value) {
+            this.connectTimeout = value;
+            return this;
+        }
+
+        public Factory maxTotalConnections(Integer value) {
+            this.maxTotalConnections = value;
+            return this;
+        }
+
+        public Factory maxPerRouteConnections(Integer value) {
+            this.maxPerRouteConnections = value;
+            return this;
+        }
+
+        public Factory connectionRequestTimeout(Integer value) {
+            this.connectionRequestTimeout = value;
+            return this;
+        }
+
+        public Factory clientResponseFilters(ClientResponseFilter[] value) {
+            this.clientResponseFilters = value;
+            return this;
+        }
+
+        public Factory clientRequestFilters(ClientRequestFilter[] value) {
+            this.clientRequestFilters = value;
+            return this;
+        }
+
+        public Factory requestEntityProcessing(RequestEntityProcessing value) {
+            this.requestEntityProcessing = value;
+            return this;
+        }
+
+        public JerseyDockerHttpClient build() {
+            return new JerseyDockerHttpClient(
+                dockerClientConfig,
+                maxTotalConnections,
+                maxPerRouteConnections,
+                connectionRequestTimeout,
+                readTimeout,
+                connectTimeout,
+                clientRequestFilters,
+                clientResponseFilters,
+                requestEntityProcessing
+            );
+        }
+    }
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(JerseyDockerHttpClient.class.getName());
+
+    private final Client client;
+
+    private final PoolingHttpClientConnectionManager connManager;
+
+    private final URI originalUri;
+
+    private JerseyDockerHttpClient(
+        DockerClientConfig dockerClientConfig,
+        Integer maxTotalConnections,
+        Integer maxPerRouteConnections,
+        Integer connectionRequestTimeout,
+        Integer readTimeout,
+        Integer connectTimeout,
+        ClientRequestFilter[] clientRequestFilters,
+        ClientResponseFilter[] clientResponseFilters,
+        RequestEntityProcessing requestEntityProcessing
+    ) {
+        ClientConfig clientConfig = new ClientConfig();
+        clientConfig.connectorProvider(new ApacheConnectorProvider());
+        clientConfig.property(CommonProperties.FEATURE_AUTO_DISCOVERY_DISABLE, true);
+
+        if (requestEntityProcessing != null) {
+            clientConfig.property(ClientProperties.REQUEST_ENTITY_PROCESSING, requestEntityProcessing);
+        }
+
+        clientConfig.register(new ResponseStatusExceptionFilter(dockerClientConfig.getObjectMapper()));
+        // clientConfig.register(JsonClientFilter.class);
+        RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
+
+        clientConfig.register(new JacksonJsonProvider(dockerClientConfig.getObjectMapper()));
+
+        // logging may disabled via log level
+        clientConfig.register(new SelectiveLoggingFilter(LOGGER, true));
+
+        if (readTimeout != null) {
+            requestConfigBuilder.setSocketTimeout(readTimeout);
+            clientConfig.property(ClientProperties.READ_TIMEOUT, readTimeout);
+        }
+
+        if (connectTimeout != null) {
+            requestConfigBuilder.setConnectTimeout(connectTimeout);
+            clientConfig.property(ClientProperties.CONNECT_TIMEOUT, connectTimeout);
+        }
+
+        if (clientResponseFilters != null) {
+            for (ClientResponseFilter clientResponseFilter : clientResponseFilters) {
+                if (clientResponseFilter != null) {
+                    clientConfig.register(clientResponseFilter);
+                }
+            }
+        }
+
+        if (clientRequestFilters != null) {
+            for (ClientRequestFilter clientRequestFilter : clientRequestFilters) {
+                if (clientRequestFilter != null) {
+                    clientConfig.register(clientRequestFilter);
+                }
+            }
+        }
+
+        URI dockerHost = dockerClientConfig.getDockerHost();
+
+        SSLContext sslContext = null;
+
+        try {
+            final SSLConfig sslConfig = dockerClientConfig.getSSLConfig();
+            if (sslConfig != null) {
+                sslContext = sslConfig.getSSLContext();
+            }
+        } catch (Exception ex) {
+            throw new DockerClientException("Error in SSL Configuration", ex);
+        }
+
+        final String protocol = sslContext != null ? "https" : "http";
+
+        switch (dockerHost.getScheme()) {
+            case "unix":
+                break;
+            case "tcp":
+                try {
+                    dockerHost = new URI(dockerHost.toString().replaceFirst("tcp", protocol));
+                } catch (URISyntaxException e) {
+                    throw new RuntimeException(e);
+                }
+
+                configureProxy(clientConfig, dockerHost, protocol);
+                break;
+            default:
+                throw new IllegalArgumentException("Unsupported protocol scheme: " + dockerHost);
+        }
+
+        connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(dockerHost, sslContext)) {
+
+            @Override
+            public void close() {
+                super.shutdown();
+            }
+
+            @Override
+            public void shutdown() {
+                // Disable shutdown of the pool. This will be done later, when this factory is closed
+                // This is a workaround for finalize method on jerseys ClientRuntime which
+                // closes the client and shuts down the connection pool when it is garbage collected
+            }
+        };
+
+        if (maxTotalConnections != null) {
+            connManager.setMaxTotal(maxTotalConnections);
+        }
+        if (maxPerRouteConnections != null) {
+            connManager.setDefaultMaxPerRoute(maxPerRouteConnections);
+        }
+
+        clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER, connManager);
+
+        // Configure connection pool timeout
+        if (connectionRequestTimeout != null) {
+            requestConfigBuilder.setConnectionRequestTimeout(connectionRequestTimeout);
+        }
+        clientConfig.property(ApacheClientProperties.REQUEST_CONFIG, requestConfigBuilder.build());
+        ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(clientConfig);
+
+        if (sslContext != null) {
+            clientBuilder.sslContext(sslContext);
+        }
+
+        client = clientBuilder.build();
+
+        this.originalUri = dockerHost;
+    }
+
+    private URI sanitizeUrl(URI originalUri) {
+        if (originalUri.getScheme().equals("unix")) {
+            return UnixConnectionSocketFactory.sanitizeUri(originalUri);
+        }
+        return originalUri;
+    }
+
+    private Registry<ConnectionSocketFactory> getSchemeRegistry(URI originalUri, SSLContext sslContext) {
+        RegistryBuilder<ConnectionSocketFactory> registryBuilder = RegistryBuilder.create();
+        registryBuilder.register("http", PlainConnectionSocketFactory.getSocketFactory());
+        if (sslContext != null) {
+            registryBuilder.register("https", new SSLConnectionSocketFactory(sslContext));
+        }
+        registryBuilder.register("unix", new UnixConnectionSocketFactory(originalUri));
+        return registryBuilder.build();
+    }
+
+    @Override
+    public Response execute(Request request) {
+        if (request.hijackedInput() != null) {
+            throw new UnsupportedOperationException("Does not support hijacking");
+        }
+        String url = sanitizeUrl(originalUri).toString();
+        if (url.endsWith("/") && request.path().startsWith("/")) {
+            url = url.substring(0, url.length() - 1);
+        }
+
+        Invocation.Builder builder = client.target(url + request.path()).request();
+
+        request.headers().forEach(builder::header);
+
+        try {
+            return new JerseyResponse(
+                builder.build(request.method(), toEntity(request)).invoke()
+            );
+        } catch (ProcessingException e) {
+            if (e.getCause() instanceof DockerException) {
+                throw (DockerException) e.getCause();
+            }
+            throw e;
+        }
+    }
+
+    private Entity<InputStream> toEntity(Request request) {
+        InputStream body = request.body();
+        if (body != null) {
+            return Entity.entity(body, MediaType.APPLICATION_JSON_TYPE);
+        }
+        switch (request.method()) {
+            case "POST":
+                return Entity.json(null);
+            default:
+                return null;
+        }
+    }
+
+    private void configureProxy(ClientConfig clientConfig, URI originalUri, String protocol) {
+        List<Proxy> proxies = ProxySelector.getDefault().select(originalUri);
+
+        for (Proxy proxy : proxies) {
+            InetSocketAddress address = (InetSocketAddress) proxy.address();
+            if (address != null) {
+                String hostname = address.getHostName();
+                int port = address.getPort();
+
+                clientConfig.property(ClientProperties.PROXY_URI, "http://" + hostname + ":" + port);
+
+                String httpProxyUser = System.getProperty(protocol + ".proxyUser");
+                if (httpProxyUser != null) {
+                    clientConfig.property(ClientProperties.PROXY_USERNAME, httpProxyUser);
+                    String httpProxyPassword = System.getProperty(protocol + ".proxyPassword");
+                    if (httpProxyPassword != null) {
+                        clientConfig.property(ClientProperties.PROXY_PASSWORD, httpProxyPassword);
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public void close() {
+        if (client != null) {
+            client.close();
+        }
+
+        if (connManager != null) {
+            connManager.close();
+        }
+    }
+
+    private static class JerseyResponse implements Response {
+
+        private final javax.ws.rs.core.Response response;
+
+        JerseyResponse(javax.ws.rs.core.Response response) {
+            this.response = response;
+        }
+
+        @Override
+        public int getStatusCode() {
+            return response.getStatus();
+        }
+
+        @Override
+        public Map<String, List<String>> getHeaders() {
+            return response.getStringHeaders();
+        }
+
+        @Override
+        public InputStream getBody() {
+            return response.hasEntity()
+                ? response.readEntity(InputStream.class)
+                : EmptyInputStream.INSTANCE;
+        }
+
+        @Override
+        public void close() {
+            response.close();
+        }
+    }
+}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyInvocationBuilder.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyInvocationBuilder.java
deleted file mode 100644
index 761129867..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyInvocationBuilder.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.exception.UnauthorizedException;
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.core.InvocationBuilder;
-import com.github.dockerjava.core.MediaType;
-import com.github.dockerjava.core.async.FrameStreamProcessor;
-import com.github.dockerjava.core.async.JsonStreamProcessor;
-import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
-import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
-import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
-
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.core.Response;
-import java.io.IOException;
-import java.io.InputStream;
-
-class JerseyInvocationBuilder implements InvocationBuilder {
-
-    private final ObjectMapper objectMapper;
-
-    private final Invocation.Builder resource;
-
-    JerseyInvocationBuilder(ObjectMapper objectMapper, Invocation.Builder resource) {
-        this.objectMapper = objectMapper;
-        this.resource = resource;
-    }
-
-    @Override
-    public InvocationBuilder accept(MediaType mediaType) {
-        resource.accept(mediaType.getMediaType());
-        return this;
-    }
-
-    @Override
-    public InvocationBuilder header(String name, String value) {
-        resource.header(name, value);
-        return this;
-    }
-
-    @Override
-    public void delete() {
-        resource.delete().close();
-    }
-
-    @Override
-    public void get(ResultCallback<Frame> resultCallback) {
-        try {
-            GETCallbackNotifier<Frame> getCallbackNotifier = new GETCallbackNotifier<>(
-                    new FrameStreamProcessor(),
-                    resultCallback,
-                    resource
-            );
-            getCallbackNotifier.start();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public <T> T get(TypeReference<T> typeReference) {
-        try (Response response = resource.get()) {
-            return objectMapper.readValue(response.readEntity(InputStream.class), typeReference);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public <T> void get(TypeReference<T> typeReference, ResultCallback<T> resultCallback) {
-        try {
-            GETCallbackNotifier<T> getCallbackNotifier = new GETCallbackNotifier<T>(
-                    new JsonStreamProcessor<>(objectMapper, typeReference),
-                    resultCallback,
-                    resource
-            );
-            getCallbackNotifier.start();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public InputStream post(Object entity) {
-        return new WrappedResponseInputStream(resource.post(
-                toEntity(entity, javax.ws.rs.core.MediaType.APPLICATION_JSON)
-        ));
-    }
-
-    @Override
-    public void post(Object entity, InputStream stdin, ResultCallback<Frame> resultCallback) {
-        if (stdin != null) {
-            throw new UnsupportedOperationException("Passing stdin to the container is currently not supported.");
-        }
-
-        POSTCallbackNotifier<Frame> postCallbackNotifier = new POSTCallbackNotifier<>(
-                new FrameStreamProcessor(),
-                resultCallback,
-                resource,
-                toEntity(entity, javax.ws.rs.core.MediaType.APPLICATION_JSON)
-        );
-
-        postCallbackNotifier.start();
-    }
-
-    @Override
-    public <T> T post(Object entity, TypeReference<T> typeReference) {
-        Response response = resource.post(
-                toEntity(entity, javax.ws.rs.core.MediaType.APPLICATION_JSON)
-        );
-
-        if (response.getStatus() == 401) {
-            throw new UnauthorizedException("Unauthorized");
-        }
-
-        try (InputStream inputStream = response.readEntity(InputStream.class)) {
-            return objectMapper.readValue(inputStream, typeReference);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public <T> void post(Object entity, TypeReference<T> typeReference, ResultCallback<T> resultCallback) {
-        try {
-            POSTCallbackNotifier<T> postCallbackNotifier = new POSTCallbackNotifier<>(
-                    new JsonStreamProcessor<>(objectMapper, typeReference),
-                    resultCallback,
-                    resource,
-                    toEntity(entity, javax.ws.rs.core.MediaType.APPLICATION_JSON)
-            );
-            postCallbackNotifier.start();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public <T> T post(TypeReference<T> typeReference, InputStream body) {
-        try (
-                Response response = resource.post(
-                        toEntity(body, javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM)
-                )
-        ) {
-            InputStream inputStream = response.readEntity(InputStream.class);
-            return objectMapper.readValue(inputStream, typeReference);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public <T> void post(TypeReference<T> typeReference, ResultCallback<T> resultCallback, InputStream body) {
-        try {
-            POSTCallbackNotifier<T> postCallbackNotifier = new POSTCallbackNotifier<T>(
-                    new JsonStreamProcessor<>(objectMapper, typeReference),
-                    resultCallback,
-                    resource,
-                    toEntity(body, "application/tar")
-            );
-            postCallbackNotifier.start();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public void postStream(InputStream body) {
-        resource.post(toEntity(body, javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM)).close();
-    }
-
-    @Override
-    public InputStream get() {
-        return new WrappedResponseInputStream(resource.get());
-    }
-
-    @Override
-    public void put(InputStream body, MediaType mediaType) {
-        resource.put(toEntity(body, mediaType.getMediaType())).close();
-    }
-
-    private static <T> Entity<T> toEntity(T entity, String mediaType) {
-        if (entity == null) {
-            return null;
-        }
-
-        return Entity.entity(entity, mediaType);
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyWebTarget.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyWebTarget.java
deleted file mode 100644
index 123d2f7ea..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyWebTarget.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.github.dockerjava.jaxrs;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.core.InvocationBuilder;
-import com.github.dockerjava.core.WebTarget;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.Set;
-
-import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
-
-class JerseyWebTarget implements WebTarget {
-
-    private static final String PATH_SEPARATOR = "/";
-
-    private final ObjectMapper objectMapper;
-
-    private final javax.ws.rs.client.WebTarget webTarget;
-
-    JerseyWebTarget(ObjectMapper objectMapper, javax.ws.rs.client.WebTarget webTarget) {
-        this.objectMapper = objectMapper;
-        this.webTarget = webTarget;
-    }
-
-    @Override
-    public InvocationBuilder request() {
-        return new JerseyInvocationBuilder(objectMapper, webTarget.request());
-    }
-
-    @Override
-    public JerseyWebTarget path(String... components) {
-        return new JerseyWebTarget(
-                objectMapper,
-                webTarget.path(String.join(PATH_SEPARATOR, components))
-        );
-    }
-
-    @Override
-    public JerseyWebTarget resolveTemplate(String name, Object value) {
-        return new JerseyWebTarget(
-                objectMapper,
-                webTarget.resolveTemplate(name, value)
-        );
-    }
-
-    @Override
-    public JerseyWebTarget queryParam(String name, Object value) {
-        if (value instanceof String) {
-            value = urlPathSegmentEscaper().escape((String) value);
-        }
-        return new JerseyWebTarget(
-                objectMapper,
-                webTarget.queryParam(name, value)
-        );
-    }
-
-    @Override
-    public JerseyWebTarget queryParamsSet(String name, Set<?> values) {
-        return new JerseyWebTarget(
-                objectMapper,
-                webTarget.queryParam(name, values.toArray())
-        );
-    }
-
-    @Override
-    public JerseyWebTarget queryParamsJsonMap(String name, Map<String, String> values) {
-        if (values != null && !values.isEmpty()) {
-            try {
-                // when param value is JSON string
-                return queryParam(name, objectMapper.writeValueAsString(values));
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        } else {
-            return this;
-        }
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
index a45561de9..84a72f077 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/UnixConnectionSocketFactory.java
@@ -40,12 +40,11 @@
  * Provides a ConnectionSocketFactory for connecting Apache HTTP clients to Unix sockets.
  */
 @Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
-@Deprecated
-public class UnixConnectionSocketFactory implements ConnectionSocketFactory {
+class UnixConnectionSocketFactory implements ConnectionSocketFactory {
 
     private File socketFile;
 
-    public UnixConnectionSocketFactory(final URI socketUri) {
+    UnixConnectionSocketFactory(final URI socketUri) {
         super();
 
         final String filename = socketUri.toString().replaceAll("^unix:///", "unix://localhost/")
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
deleted file mode 100644
index b8db73b04..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Created on 17.06.2015
- */
-package com.github.dockerjava.jaxrs.async;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.io.InputStream;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
-
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.core.Response;
-
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.core.async.ResponseStreamProcessor;
-import com.github.dockerjava.jaxrs.util.WrappedResponseInputStream;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
-@Deprecated
-public abstract class AbstractCallbackNotifier<T> implements Callable<Void> {
-
-    private final ResponseStreamProcessor<T> responseStreamProcessor;
-
-    private final ResultCallback<T> resultCallback;
-
-    private static final ThreadFactory FACTORY =
-            new ThreadFactoryBuilder().setDaemon(true).setNameFormat("dockerjava-jaxrs-async-%d").build();
-
-    protected final Builder requestBuilder;
-
-    protected AbstractCallbackNotifier(ResponseStreamProcessor<T> responseStreamProcessor,
-            ResultCallback<T> resultCallback, Builder requestBuilder) {
-        checkNotNull(requestBuilder, "An WebTarget must be provided");
-        checkNotNull(responseStreamProcessor, "A ResponseStreamProcessor must be provided");
-        this.responseStreamProcessor = responseStreamProcessor;
-        this.resultCallback = resultCallback;
-        this.requestBuilder = requestBuilder;
-    }
-
-    @Override
-    public Void call() {
-
-        Response response;
-
-        try {
-            response = response();
-        } catch (ProcessingException e) {
-            if (resultCallback != null) {
-                resultCallback.onError(e.getCause());
-            }
-            return null;
-        } catch (Exception e) {
-            if (resultCallback != null) {
-                resultCallback.onError(e);
-            }
-            return null;
-        }
-        if (resultCallback != null) {
-            resultCallback.onStart(response::close);
-        }
-
-        try (InputStream inputStream = new WrappedResponseInputStream(response)) {
-
-            if (resultCallback != null) {
-                responseStreamProcessor.processResponseStream(inputStream, resultCallback);
-            }
-
-            return null;
-        } catch (Exception e) {
-            if (resultCallback != null) {
-                resultCallback.onError(e);
-            }
-
-            return null;
-        }
-    }
-
-    protected abstract Response response();
-
-    public static <T> Future<Void> startAsyncProcessing(AbstractCallbackNotifier<T> callbackNotifier) {
-
-        ExecutorService executorService = Executors.newSingleThreadExecutor(FACTORY);
-        Future<Void> response = executorService.submit(callbackNotifier);
-        executorService.shutdown();
-        return response;
-    }
-
-    public void start() {
-        FACTORY.newThread(this::call).start();
-    }
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java
deleted file mode 100644
index 9297c2551..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/GETCallbackNotifier.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Created on 23.06.2015
- */
-package com.github.dockerjava.jaxrs.async;
-
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.core.Response;
-
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.core.async.ResponseStreamProcessor;
-
-/**
- *
- * @author Marcus Linke
- *
- */
-@Deprecated
-public class GETCallbackNotifier<T> extends AbstractCallbackNotifier<T> {
-
-    public GETCallbackNotifier(ResponseStreamProcessor<T> responseStreamProcessor, ResultCallback<T> resultCallback,
-            Builder requestBuilder) {
-        super(responseStreamProcessor, resultCallback, requestBuilder);
-    }
-
-    protected Response response() {
-        return requestBuilder.get();
-    }
-
-}
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java
deleted file mode 100644
index 76fd540fe..000000000
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/async/POSTCallbackNotifier.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Created on 23.06.2015
- */
-package com.github.dockerjava.jaxrs.async;
-
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.core.Response;
-
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.core.async.ResponseStreamProcessor;
-
-/**
- *
- * @author Marcus Linke
- *
- */
-@Deprecated
-public class POSTCallbackNotifier<T> extends AbstractCallbackNotifier<T> {
-
-    Entity<?> entity = null;
-
-    public POSTCallbackNotifier(ResponseStreamProcessor<T> responseStreamProcessor, ResultCallback<T> resultCallback,
-            Builder requestBuilder, Entity<?> entity) {
-        super(responseStreamProcessor, resultCallback, requestBuilder);
-        this.entity = entity;
-    }
-
-    protected Response response() {
-        return requestBuilder.post(entity, Response.class);
-    }
-
-}
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index f7303d894..3e6de70c2 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -37,6 +37,22 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>com.github.siom79.japicmp</groupId>
+				<artifactId>japicmp-maven-plugin</artifactId>
+				<configuration>
+					<parameter>
+						<overrideCompatibilityChangeParameters>
+							<overrideCompatibilityChangeParameter>
+								<compatibilityChange>SUPERCLASS_REMOVED</compatibilityChange>
+								<binaryCompatible>true</binaryCompatible>
+								<sourceCompatible>true</sourceCompatible>
+							</overrideCompatibilityChangeParameter>
+						</overrideCompatibilityChangeParameters>
+					</parameter>
+				</configuration>
+			</plugin>
+
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java
deleted file mode 100644
index f49fd9247..000000000
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/FramedSink.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.github.dockerjava.okhttp;
-
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.api.model.StreamType;
-import okio.BufferedSource;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.function.Consumer;
-
-class FramedSink implements Consumer<BufferedSource> {
-
-    private static final int HEADER_SIZE = 8;
-
-    private final ResultCallback<Frame> resultCallback;
-
-    FramedSink(ResultCallback<Frame> resultCallback) {
-        this.resultCallback = resultCallback;
-    }
-
-    @Override
-    public void accept(BufferedSource source) {
-        try {
-            while (true) {
-                try {
-                    if (source.exhausted()) {
-                        break;
-                    }
-                } catch (IOException e) {
-                    break;
-                }
-                // See https://docs.docker.com/engine/api/v1.37/#operation/ContainerAttach
-                // [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}[]byte{OUTPUT}
-
-                if (!source.request(HEADER_SIZE)) {
-                    return;
-                }
-                byte[] bytes = source.readByteArray(HEADER_SIZE);
-
-                StreamType streamType = streamType(bytes[0]);
-
-                if (streamType == StreamType.RAW) {
-                    resultCallback.onNext(new Frame(StreamType.RAW, bytes));
-                    byte[] buffer = new byte[1024];
-                    while (!source.exhausted()) {
-                        int readBytes = source.read(buffer);
-                        if (readBytes != -1) {
-                            resultCallback.onNext(new Frame(StreamType.RAW, Arrays.copyOf(buffer, readBytes)));
-                        }
-                    }
-                    return;
-                }
-
-                int payloadSize = ByteBuffer.wrap(bytes, 4, 4).getInt();
-                if (!source.request(payloadSize)) {
-                    return;
-                }
-                byte[] payload = source.readByteArray(payloadSize);
-
-                resultCallback.onNext(new Frame(streamType, payload));
-            }
-        } catch (Exception e) {
-            resultCallback.onError(e);
-        }
-    }
-
-    private static StreamType streamType(byte streamType) {
-        switch (streamType) {
-            case 0:
-                return StreamType.STDIN;
-            case 1:
-                return StreamType.STDOUT;
-            case 2:
-                return StreamType.STDERR;
-            default:
-                return StreamType.RAW;
-        }
-    }
-}
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java
new file mode 100644
index 000000000..29aa524e7
--- /dev/null
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java
@@ -0,0 +1,61 @@
+package com.github.dockerjava.okhttp;
+
+import com.github.dockerjava.core.DockerHttpClient;
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.internal.connection.Exchange;
+import okhttp3.internal.http.RealInterceptorChain;
+import okhttp3.internal.ws.RealWebSocket;
+import okio.BufferedSink;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+class HijackingInterceptor implements Interceptor {
+
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        Request request = chain.request();
+        Response response = chain.proceed(request);
+        if (!response.isSuccessful()) {
+            return response;
+        }
+
+        DockerHttpClient.Request originalRequest = request.tag(DockerHttpClient.Request.class);
+
+        if (originalRequest == null) {
+            // WTF?
+            return response;
+        }
+
+        InputStream stdin = originalRequest.hijackedInput();
+
+        if (stdin == null) {
+            return response;
+        }
+
+        chain.call().timeout().clearTimeout().clearDeadline();
+
+        Exchange exchange = ((RealInterceptorChain) chain).exchange();
+        RealWebSocket.Streams streams = exchange.newWebSocketStreams();
+        Thread thread = new Thread(() -> {
+            try (BufferedSink sink = streams.sink) {
+                while (sink.isOpen()) {
+                    int aByte = stdin.read();
+                    if (aByte < 0) {
+                        break;
+                    }
+                    sink.writeByte(aByte);
+                    sink.emit();
+                }
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+        thread.setName("okhttp-hijack-streaming-" + System.identityHashCode(request));
+        thread.setDaemon(true);
+        thread.start();
+        return response;
+    }
+}
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java
index 149816ad8..d993a9c52 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.okhttp;
 
+import com.github.dockerjava.okhttp.OkDockerHttpClient.OkResponse;
 import com.sun.jna.platform.win32.Kernel32;
 
 import javax.net.SocketFactory;
@@ -61,7 +62,7 @@ public void connect(SocketAddress endpoint, int timeout) {
                 is = new InputStream() {
                     @Override
                     public int read(byte[] bytes, int off, int len) throws IOException {
-                        if (OkHttpInvocationBuilder.CLOSING.get()) {
+                        if (OkResponse.CLOSING.get()) {
                             return 0;
                         }
                         return file.read(bytes, off, len);
@@ -69,7 +70,7 @@ public int read(byte[] bytes, int off, int len) throws IOException {
 
                     @Override
                     public int read() throws IOException {
-                        if (OkHttpInvocationBuilder.CLOSING.get()) {
+                        if (OkResponse.CLOSING.get()) {
                             return 0;
                         }
                         return file.read();
@@ -77,7 +78,7 @@ public int read() throws IOException {
 
                     @Override
                     public int read(byte[] bytes) throws IOException {
-                        if (OkHttpInvocationBuilder.CLOSING.get()) {
+                        if (OkResponse.CLOSING.get()) {
                             return 0;
                         }
                         return file.read(bytes);
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
new file mode 100644
index 000000000..8853dd815
--- /dev/null
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
@@ -0,0 +1,284 @@
+package com.github.dockerjava.okhttp;
+
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.DockerHttpClient;
+import com.github.dockerjava.core.SSLConfig;
+import okhttp3.ConnectionPool;
+import okhttp3.Dns;
+import okhttp3.HttpUrl;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import okio.BufferedSink;
+import okio.Okio;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.X509TrustManager;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
+import java.net.InetAddress;
+import java.net.URI;
+import java.security.cert.X509Certificate;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+public final class OkDockerHttpClient implements DockerHttpClient {
+
+    public static final class Factory {
+
+        private DockerClientConfig dockerClientConfig = null;
+
+        private Integer readTimeout = null;
+
+        private Integer connectTimeout = null;
+
+        private Boolean retryOnConnectionFailure = null;
+
+        public Factory dockerClientConfig(DockerClientConfig value) {
+            this.dockerClientConfig = value;
+            return this;
+        }
+
+        public Factory readTimeout(Integer value) {
+            this.readTimeout = value;
+            return this;
+        }
+
+        public Factory connectTimeout(Integer value) {
+            this.connectTimeout = value;
+            return this;
+        }
+
+        Factory retryOnConnectionFailure(Boolean value) {
+            this.retryOnConnectionFailure = value;
+            return this;
+        }
+
+        public OkDockerHttpClient build() {
+            return new OkDockerHttpClient(
+                dockerClientConfig,
+                readTimeout,
+                connectTimeout,
+                retryOnConnectionFailure
+            );
+        }
+    }
+
+    private static final String SOCKET_SUFFIX = ".socket";
+
+    final OkHttpClient client;
+
+    final OkHttpClient streamingClient;
+
+    private final HttpUrl baseUrl;
+
+    private OkDockerHttpClient(
+        DockerClientConfig dockerClientConfig,
+        Integer readTimeout,
+        Integer connectTimeout,
+        Boolean retryOnConnectionFailure
+    ) {
+        okhttp3.OkHttpClient.Builder clientBuilder = new okhttp3.OkHttpClient.Builder()
+            .addNetworkInterceptor(new HijackingInterceptor())
+            .readTimeout(0, TimeUnit.MILLISECONDS)
+            .retryOnConnectionFailure(true);
+
+        if (readTimeout != null) {
+            clientBuilder.readTimeout(readTimeout, TimeUnit.MILLISECONDS);
+        }
+
+        if (connectTimeout != null) {
+            clientBuilder.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS);
+        }
+
+        if (retryOnConnectionFailure != null) {
+            clientBuilder.retryOnConnectionFailure(retryOnConnectionFailure);
+        }
+
+        URI dockerHost = dockerClientConfig.getDockerHost();
+        switch (dockerHost.getScheme()) {
+            case "unix":
+            case "npipe":
+                String socketPath = dockerHost.getPath();
+
+                if ("unix".equals(dockerHost.getScheme())) {
+                    clientBuilder.socketFactory(new UnixSocketFactory(socketPath));
+                } else {
+                    clientBuilder.socketFactory(new NamedPipeSocketFactory(socketPath));
+                }
+
+                clientBuilder
+                    .connectionPool(new ConnectionPool(0, 1, TimeUnit.SECONDS))
+                    .dns(hostname -> {
+                        if (hostname.endsWith(SOCKET_SUFFIX)) {
+                            return Collections.singletonList(InetAddress.getByAddress(hostname, new byte[]{0, 0, 0, 0}));
+                        } else {
+                            return Dns.SYSTEM.lookup(hostname);
+                        }
+                    });
+                break;
+            default:
+        }
+
+        boolean isSSL = false;
+        SSLConfig sslConfig = dockerClientConfig.getSSLConfig();
+        if (sslConfig != null) {
+            try {
+                SSLContext sslContext = sslConfig.getSSLContext();
+                if (sslContext != null) {
+                    isSSL = true;
+                    clientBuilder.sslSocketFactory(sslContext.getSocketFactory(), new TrustAllX509TrustManager());
+                }
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        client = clientBuilder.build();
+
+        streamingClient = client.newBuilder().build();
+
+        HttpUrl.Builder baseUrlBuilder;
+
+        switch (dockerHost.getScheme()) {
+            case "unix":
+            case "npipe":
+                baseUrlBuilder = new HttpUrl.Builder()
+                    .scheme("http")
+                    .host("docker" + SOCKET_SUFFIX);
+                break;
+            case "tcp":
+                baseUrlBuilder = new HttpUrl.Builder()
+                    .scheme(isSSL ? "https" : "http")
+                    .host(dockerHost.getHost())
+                    .port(dockerHost.getPort());
+                break;
+            default:
+                baseUrlBuilder = HttpUrl.get(dockerHost.toString()).newBuilder();
+        }
+        baseUrl = baseUrlBuilder.build();
+    }
+
+    private RequestBody toRequestBody(Request request) {
+        InputStream body = request.body();
+        if (body != null) {
+            return new RequestBody() {
+                @Override
+                public MediaType contentType() {
+                    return null;
+                }
+
+                @Override
+                public void writeTo(BufferedSink sink) throws IOException {
+                    sink.writeAll(Okio.source(body));
+                }
+            };
+        }
+        switch (request.method()) {
+            case "POST":
+                return RequestBody.create(null, "");
+            default:
+                return null;
+        }
+    }
+
+    @Override
+    public Response execute(Request request) {
+        String url = baseUrl.toString();
+        if (url.endsWith("/") && request.path().startsWith("/")) {
+            url = url.substring(0, url.length() - 1);
+        }
+        okhttp3.Request.Builder requestBuilder = new okhttp3.Request.Builder()
+            .url(url + request.path())
+            .tag(Request.class, request)
+            .method(request.method(), toRequestBody(request));
+
+        request.headers().forEach(requestBuilder::header);
+
+        final OkHttpClient clientToUse;
+
+        if (request.hijackedInput() == null) {
+            clientToUse = client;
+        } else {
+            clientToUse = streamingClient;
+        }
+
+        try {
+            return new OkResponse(clientToUse.newCall(requestBuilder.build()).execute());
+        } catch (IOException e) {
+            throw new UncheckedIOException("Error while executing " + request, e);
+        }
+    }
+
+    @Override
+    public void close() throws IOException {
+        for (OkHttpClient clientToClose : new OkHttpClient[]{client, streamingClient}) {
+            clientToClose.dispatcher().cancelAll();
+            clientToClose.dispatcher().executorService().shutdown();
+            clientToClose.connectionPool().evictAll();
+        }
+    }
+
+    static class OkResponse implements Response {
+
+        static final ThreadLocal<Boolean> CLOSING = ThreadLocal.withInitial(() -> false);
+
+        private final okhttp3.Response response;
+
+        OkResponse(okhttp3.Response response) {
+            this.response = response;
+        }
+
+        @Override
+        public int getStatusCode() {
+            return response.code();
+        }
+
+        @Override
+        public Map<String, List<String>> getHeaders() {
+            return response.headers().toMultimap();
+        }
+
+        @Override
+        public InputStream getBody() {
+            ResponseBody body = response.body();
+            if (body == null) {
+                return null;
+            }
+
+            return body.source().inputStream();
+        }
+
+        @Override
+        public void close() {
+            boolean previous = CLOSING.get();
+            CLOSING.set(true);
+            try {
+                response.close();
+            } finally {
+                CLOSING.set(previous);
+            }
+        }
+    }
+
+    static class TrustAllX509TrustManager implements X509TrustManager {
+        @Override
+        public void checkClientTrusted(X509Certificate[] x509Certificates, String s) {
+
+        }
+
+        @Override
+        public void checkServerTrusted(X509Certificate[] x509Certificates, String s) {
+
+        }
+
+        @Override
+        public X509Certificate[] getAcceptedIssuers() {
+            return new X509Certificate[0];
+        }
+    }
+}
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
index 7b0030e40..90f37b7d8 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
@@ -1,159 +1,64 @@
 package com.github.dockerjava.okhttp;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.core.AbstractDockerCmdExecFactory;
+import com.github.dockerjava.api.command.DelegatingDockerCmdExecFactory;
+import com.github.dockerjava.api.command.DockerCmdExecFactory;
+import com.github.dockerjava.core.DefaultDockerCmdExecFactory;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.SSLConfig;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.MultimapBuilder;
-import okhttp3.ConnectionPool;
-import okhttp3.Dns;
-import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
+import com.github.dockerjava.core.DockerClientConfigAware;
+import com.github.dockerjava.core.DockerClientImpl;
+import com.github.dockerjava.core.DockerHttpClient;
 
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.X509TrustManager;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.URI;
-import java.security.cert.X509Certificate;
-import java.util.Collections;
-import java.util.concurrent.TimeUnit;
+/**
+ * @deprecated use {@link OkDockerHttpClient} with {@link DockerClientImpl#withHttpClient(DockerHttpClient)}
+ */
+@Deprecated
+public class OkHttpDockerCmdExecFactory extends DelegatingDockerCmdExecFactory implements DockerClientConfigAware {
 
-import static java.util.Objects.nonNull;
+    private OkDockerHttpClient.Factory clientFactory = new OkDockerHttpClient.Factory();
 
-public class OkHttpDockerCmdExecFactory extends AbstractDockerCmdExecFactory {
+    @Deprecated
+    protected Integer connectTimeout;
 
-    private static final String SOCKET_SUFFIX = ".socket";
+    @Deprecated
+    protected Integer readTimeout;
 
-    private ObjectMapper objectMapper;
+    private DefaultDockerCmdExecFactory dockerCmdExecFactory;
 
-    private OkHttpClient okHttpClient;
-    private Boolean retryOnConnectionFailure;
+    /**
+     * Configure connection timeout in milliseconds
+     */
+    public OkHttpDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) {
+        clientFactory = clientFactory.connectTimeout(connectTimeout);
+        this.connectTimeout = connectTimeout;
+        return this;
+    }
 
-    private HttpUrl baseUrl;
+    /**
+     * Configure read timeout in milliseconds
+     */
+    public OkHttpDockerCmdExecFactory withReadTimeout(Integer readTimeout) {
+        clientFactory = clientFactory.readTimeout(readTimeout);
+        this.readTimeout = readTimeout;
+        return this;
+    }
 
     public OkHttpDockerCmdExecFactory setRetryOnConnectionFailure(Boolean retryOnConnectionFailure) {
-        this.retryOnConnectionFailure = retryOnConnectionFailure;
+        this.clientFactory = clientFactory.retryOnConnectionFailure(retryOnConnectionFailure);
         return this;
     }
 
     @Override
-    public void init(DockerClientConfig dockerClientConfig) {
-        super.init(dockerClientConfig);
-
-        OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
-        if (nonNull(readTimeout)) {
-            clientBuilder.readTimeout(readTimeout, TimeUnit.MILLISECONDS);
-        } else {
-            // default is too small for most docker commands, set default like in jersey/netty
-            clientBuilder.readTimeout(0, TimeUnit.MILLISECONDS);
-        }
-
-        if (nonNull(connectTimeout)) {
-            clientBuilder.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS);
-        }
-
-        if (nonNull(retryOnConnectionFailure)) {
-            clientBuilder.retryOnConnectionFailure(retryOnConnectionFailure);
-        } else {
-            clientBuilder.retryOnConnectionFailure(true);
-        }
-
-        URI dockerHost = dockerClientConfig.getDockerHost();
-        switch (dockerHost.getScheme()) {
-            case "unix":
-            case "npipe":
-                String socketPath = dockerHost.getPath();
-
-                if ("unix".equals(dockerHost.getScheme())) {
-                    clientBuilder.socketFactory(new UnixSocketFactory(socketPath));
-                } else {
-                    clientBuilder.socketFactory(new NamedPipeSocketFactory(socketPath));
-                }
-
-                clientBuilder
-                    // Disable pooling
-                    .connectionPool(new ConnectionPool(0, 1, TimeUnit.SECONDS))
-                    .dns(hostname -> {
-                        if (hostname.endsWith(SOCKET_SUFFIX)) {
-                            return Collections.singletonList(InetAddress.getByAddress(hostname, new byte[]{0, 0, 0, 0}));
-                        } else {
-                            return Dns.SYSTEM.lookup(hostname);
-                        }
-                    });
-            default:
-        }
-
-        SSLConfig sslConfig = dockerClientConfig.getSSLConfig();
-        boolean isSSL = false;
-        if (sslConfig != null) {
-            try {
-                SSLContext sslContext = sslConfig.getSSLContext();
-                if (sslContext != null) {
-                    isSSL = true;
-                    clientBuilder.sslSocketFactory(sslContext.getSocketFactory(), new TrustAllX509TrustManager());
-                }
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        okHttpClient = clientBuilder.build();
-
-        HttpUrl.Builder baseUrlBuilder;
-
-        switch (dockerHost.getScheme()) {
-            case "unix":
-            case "npipe":
-                baseUrlBuilder = new HttpUrl.Builder()
-                    .scheme("http")
-                    .host("docker" + SOCKET_SUFFIX);
-                break;
-            case "tcp":
-                baseUrlBuilder = new HttpUrl.Builder()
-                    .scheme(isSSL ? "https" : "http")
-                    .host(dockerHost.getHost())
-                    .port(dockerHost.getPort());
-                break;
-            default:
-                baseUrlBuilder = HttpUrl.get(dockerHost.toString()).newBuilder();
-        }
-        baseUrl = baseUrlBuilder.build();
-
-        objectMapper = dockerClientConfig.getObjectMapper();
+    public final DockerCmdExecFactory getDockerCmdExecFactory() {
+        return dockerCmdExecFactory;
     }
 
     @Override
-    protected OkHttpWebTarget getBaseResource() {
-        return new OkHttpWebTarget(
-            objectMapper,
-            okHttpClient,
-            baseUrl,
-            ImmutableList.of(),
-            MultimapBuilder.hashKeys().hashSetValues().build()
+    public void init(DockerClientConfig dockerClientConfig) {
+        clientFactory = clientFactory.dockerClientConfig(dockerClientConfig);
+        dockerCmdExecFactory = new DefaultDockerCmdExecFactory(
+            clientFactory.build(),
+            dockerClientConfig.getObjectMapper()
         );
-    }
-
-    @Override
-    public void close() throws IOException {
-
-    }
-
-    private static class TrustAllX509TrustManager implements X509TrustManager {
-        @Override
-        public void checkClientTrusted(X509Certificate[] x509Certificates, String s) {
-
-        }
-
-        @Override
-        public void checkServerTrusted(X509Certificate[] x509Certificates, String s) {
-
-        }
-
-        @Override
-        public X509Certificate[] getAcceptedIssuers() {
-            return new X509Certificate[0];
-        }
+        dockerCmdExecFactory.init(dockerClientConfig);
     }
 }
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpInvocationBuilder.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpInvocationBuilder.java
deleted file mode 100644
index 31c45be23..000000000
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpInvocationBuilder.java
+++ /dev/null
@@ -1,372 +0,0 @@
-package com.github.dockerjava.okhttp;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.exception.BadRequestException;
-import com.github.dockerjava.api.exception.ConflictException;
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.InternalServerErrorException;
-import com.github.dockerjava.api.exception.NotAcceptableException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.exception.NotModifiedException;
-import com.github.dockerjava.api.exception.UnauthorizedException;
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.core.InvocationBuilder;
-import okhttp3.HttpUrl;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-import okhttp3.internal.connection.RealConnection;
-import okio.BufferedSink;
-import okio.BufferedSource;
-import okio.Okio;
-import okio.Source;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.util.Objects;
-import java.util.function.Consumer;
-
-class OkHttpInvocationBuilder implements InvocationBuilder {
-
-    static final ThreadLocal<Boolean> CLOSING = ThreadLocal.withInitial(() -> false);
-
-    private final ObjectMapper objectMapper;
-
-    private final OkHttpClient okHttpClient;
-
-    private final Request.Builder requestBuilder;
-
-    OkHttpInvocationBuilder(ObjectMapper objectMapper, OkHttpClient okHttpClient, HttpUrl httpUrl) {
-        this.objectMapper = objectMapper;
-        this.okHttpClient = okHttpClient;
-
-        requestBuilder = new Request.Builder()
-            .url(httpUrl);
-    }
-
-    @Override
-    public OkHttpInvocationBuilder accept(com.github.dockerjava.core.MediaType mediaType) {
-        return header("accept", mediaType.getMediaType());
-    }
-
-    @Override
-    public OkHttpInvocationBuilder header(String name, String value) {
-        requestBuilder.header(name, value);
-        return this;
-    }
-
-    @Override
-    public void delete() {
-        Request request = requestBuilder
-            .delete()
-            .build();
-
-        execute(request).close();
-    }
-
-    @Override
-    public void get(ResultCallback<Frame> resultCallback) {
-        Request request = requestBuilder
-            .get()
-            .build();
-
-        executeAndStream(
-            request,
-            resultCallback,
-            new FramedSink(resultCallback)
-        );
-    }
-
-    @Override
-    public <T> T get(TypeReference<T> typeReference) {
-        try (InputStream inputStream = get()) {
-            return objectMapper.readValue(inputStream, typeReference);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public <T> void get(TypeReference<T> typeReference, ResultCallback<T> resultCallback) {
-        Request request = requestBuilder
-            .get()
-            .build();
-
-        executeAndStream(
-            request,
-            resultCallback,
-            new JsonSink<>(objectMapper, typeReference, resultCallback)
-        );
-    }
-
-    @Override
-    public InputStream post(Object entity) {
-        try {
-            Request request = requestBuilder
-                    .post(RequestBody.create(MediaType.parse("application/json"), objectMapper.writeValueAsBytes(entity)))
-                    .build();
-
-            return execute(request).body().byteStream();
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public <T> T post(Object entity, TypeReference<T> typeReference) {
-        try {
-            Request request = requestBuilder
-                    .post(RequestBody.create(MediaType.parse("application/json"), objectMapper.writeValueAsBytes(entity)))
-                    .build();
-
-            try (Response response = execute(request)) {
-                String inputStream = response.body().string();
-                return objectMapper.readValue(inputStream, typeReference);
-            }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public <T> void post(Object entity, TypeReference<T> typeReference, ResultCallback<T> resultCallback) {
-        try {
-            post(typeReference, resultCallback, new ByteArrayInputStream(objectMapper.writeValueAsBytes(entity)));
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public <T> T post(TypeReference<T> typeReference, InputStream body) {
-        try (InputStream inputStream = post(body)) {
-            return objectMapper.readValue(inputStream, typeReference);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public void post(Object entity, InputStream stdin, ResultCallback<Frame> resultCallback) {
-        final Request request;
-        try {
-            request = requestBuilder
-                .post(RequestBody.create(MediaType.parse("application/json"), objectMapper.writeValueAsBytes(entity)))
-                .build();
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
-
-        OkHttpClient clientToUse = this.okHttpClient;
-
-        if (stdin != null) {
-            // FIXME there must be a better way of handling it
-            clientToUse = clientToUse.newBuilder()
-                .addNetworkInterceptor(chain -> {
-                    Response response = chain.proceed(chain.request());
-                    if (response.isSuccessful()) {
-                        Thread thread = new Thread(() -> {
-                            try {
-                                Field sinkField = RealConnection.class.getDeclaredField("sink");
-                                sinkField.setAccessible(true);
-
-                                try (
-                                        BufferedSink sink = (BufferedSink) sinkField.get(chain.connection());
-                                        Source source = Okio.source(stdin);
-                                ) {
-                                    while (sink.isOpen()) {
-                                        int available = stdin.available();
-                                        if (available > 0) {
-                                            sink.write(source, available);
-                                            sink.emit();
-                                        }
-                                    }
-                                }
-                            } catch (Exception e) {
-                                throw new RuntimeException(e);
-                            }
-                        });
-                        thread.start();
-                    }
-                    return response;
-                })
-                .build();
-        }
-
-        executeAndStream(
-            clientToUse,
-            request,
-            resultCallback,
-            new FramedSink(resultCallback)
-        );
-    }
-
-    @Override
-    public <T> void post(TypeReference<T> typeReference, ResultCallback<T> resultCallback, InputStream body) {
-        Request request = requestBuilder
-            .post(toRequestBody(body, null))
-            .build();
-
-        executeAndStream(
-            request,
-            resultCallback,
-            new JsonSink<>(objectMapper, typeReference, resultCallback)
-        );
-    }
-
-    @Override
-    public void postStream(InputStream body) {
-        Request request = requestBuilder
-            .post(toRequestBody(body, null))
-            .build();
-
-        execute(request).close();
-    }
-
-    @Override
-    public InputStream get() {
-        Request request = requestBuilder
-            .get()
-            .build();
-
-        return execute(request).body().byteStream();
-    }
-
-    @Override
-    public void put(InputStream body, com.github.dockerjava.core.MediaType mediaType) {
-        Request request = requestBuilder
-            .put(toRequestBody(body, mediaType.toString()))
-            .build();
-
-        execute(request).close();
-    }
-
-    protected RequestBody toRequestBody(InputStream body, String mediaType) {
-        return new RequestBody() {
-            @Override
-            public MediaType contentType() {
-                if (mediaType == null) {
-                    return null;
-                }
-                return MediaType.parse(mediaType);
-            }
-
-            @Override
-            public void writeTo(BufferedSink sink) throws IOException {
-                try (Source source = Okio.source(body)) {
-                    sink.writeAll(source);
-                }
-            }
-        };
-    }
-
-    protected Response execute(Request request) {
-        return execute(okHttpClient, request);
-    }
-
-    protected Response execute(OkHttpClient okHttpClient, Request request) {
-        try {
-            Response response = okHttpClient.newCall(request).execute();
-            if (!response.isSuccessful()) {
-                String body = response.body().string();
-                switch (response.code()) {
-                    case 304:
-                        throw new NotModifiedException(body);
-                    case 400:
-                        throw new BadRequestException(body);
-                    case 401:
-                        throw new UnauthorizedException(body);
-                    case 404:
-                        throw new NotFoundException(body);
-                    case 406:
-                        throw new NotAcceptableException(body);
-                    case 409:
-                        throw new ConflictException(body);
-                    case 500:
-                        throw new InternalServerErrorException(body);
-                    default:
-                        throw new DockerException(body, response.code());
-                }
-            } else {
-                return response;
-            }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    protected <T> void executeAndStream(Request request, ResultCallback<T> callback, Consumer<BufferedSource> sourceConsumer) {
-        executeAndStream(okHttpClient, request, callback, sourceConsumer);
-    }
-
-    protected <T> void executeAndStream(
-            OkHttpClient okHttpClient,
-            Request request,
-            ResultCallback<T> callback,
-            Consumer<BufferedSource> sourceConsumer
-    ) {
-        Thread thread = new Thread(() -> {
-            try (
-                    Response response = execute(okHttpClient, request.newBuilder().tag("streaming").build());
-                    BufferedSource source = response.body().source();
-            ) {
-                callback.onStart(() -> {
-                    boolean previous = CLOSING.get();
-                    CLOSING.set(true);
-                    try {
-                        response.close();
-                    } finally {
-                        CLOSING.set(previous);
-                    }
-                });
-
-                sourceConsumer.accept(source);
-                callback.onComplete();
-            } catch (Exception e) {
-                callback.onError(e);
-            }
-        }, "tc-okhttp-stream-" + Objects.hashCode(request));
-        thread.setDaemon(true);
-
-        thread.start();
-    }
-
-    private static class JsonSink<T> implements Consumer<BufferedSource> {
-
-        private final ObjectMapper objectMapper;
-
-        private final TypeReference<T> typeReference;
-
-        private final ResultCallback<T> resultCallback;
-
-        JsonSink(ObjectMapper objectMapper, TypeReference<T> typeReference, ResultCallback<T> resultCallback) {
-            this.objectMapper = objectMapper;
-            this.typeReference = typeReference;
-            this.resultCallback = resultCallback;
-        }
-
-        @Override
-        public void accept(BufferedSource source) {
-            try {
-                while (true) {
-                    String line = source.readUtf8Line();
-                    if (line == null) {
-                        break;
-                    }
-
-                    resultCallback.onNext(objectMapper.readValue(line, typeReference));
-                }
-            } catch (Exception e) {
-                resultCallback.onError(e);
-            }
-        }
-    }
-
-}
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpWebTarget.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpWebTarget.java
deleted file mode 100644
index e90012f8d..000000000
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpWebTarget.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.github.dockerjava.okhttp;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.core.InvocationBuilder;
-import com.github.dockerjava.core.WebTarget;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.SetMultimap;
-import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
-import org.apache.commons.lang.StringUtils;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-class OkHttpWebTarget implements WebTarget {
-
-    final ObjectMapper objectMapper;
-
-    final OkHttpClient okHttpClient;
-
-    final HttpUrl baseUrl;
-
-    final ImmutableList<String> path;
-
-    final SetMultimap<String, String> queryParams;
-
-    OkHttpWebTarget(
-            ObjectMapper objectMapper,
-            OkHttpClient okHttpClient,
-            HttpUrl baseUrl,
-            ImmutableList<String> path,
-            SetMultimap<String, String> queryParams
-    ) {
-        this.objectMapper = objectMapper;
-        this.okHttpClient = okHttpClient;
-        this.baseUrl = baseUrl;
-        this.path = path;
-        this.queryParams = queryParams;
-    }
-
-    @Override
-    public InvocationBuilder request() {
-        String resource = StringUtils.join(path, "/");
-
-        if (!resource.startsWith("/")) {
-            resource = "/" + resource;
-        }
-
-        HttpUrl.Builder baseUrlBuilder = baseUrl.newBuilder()
-            .encodedPath(resource);
-
-        for (Map.Entry<String, Collection<String>> queryParamEntry : queryParams.asMap().entrySet()) {
-            String key = queryParamEntry.getKey();
-            for (String paramValue : queryParamEntry.getValue()) {
-                baseUrlBuilder.addQueryParameter(key, paramValue);
-            }
-        }
-
-        return new OkHttpInvocationBuilder(
-            objectMapper,
-            okHttpClient,
-            baseUrlBuilder.build()
-        );
-    }
-
-    @Override
-    public OkHttpWebTarget path(String... components) {
-        ImmutableList<String> newPath = ImmutableList.<String>builder()
-                .addAll(path)
-                .add(components)
-                .build();
-        return new OkHttpWebTarget(
-                objectMapper,
-                okHttpClient,
-                baseUrl,
-                newPath,
-                queryParams
-        );
-    }
-
-    @Override
-    public OkHttpWebTarget resolveTemplate(String name, Object value) {
-        ImmutableList.Builder<String> newPath = ImmutableList.builder();
-        for (String component : path) {
-            component = component.replaceAll("\\{" + name + "\\}", value.toString());
-            newPath.add(component);
-        }
-
-        return new OkHttpWebTarget(
-                objectMapper,
-                okHttpClient,
-                baseUrl,
-                newPath.build(),
-                queryParams
-        );
-    }
-
-    @Override
-    public OkHttpWebTarget queryParam(String name, Object value) {
-        if (value == null) {
-            return this;
-        }
-
-        SetMultimap<String, String> newQueryParams = HashMultimap.create(queryParams);
-        newQueryParams.put(name, value.toString());
-
-        return new OkHttpWebTarget(
-                objectMapper,
-                okHttpClient,
-                baseUrl,
-                path,
-                newQueryParams
-        );
-    }
-
-    @Override
-    public OkHttpWebTarget queryParamsSet(String name, Set<?> values) {
-        SetMultimap<String, String> newQueryParams = HashMultimap.create(queryParams);
-        newQueryParams.replaceValues(name, values.stream().filter(Objects::nonNull).map(Object::toString).collect(Collectors.toSet()));
-
-        return new OkHttpWebTarget(
-                objectMapper,
-                okHttpClient,
-                baseUrl,
-                path,
-                newQueryParams
-        );
-    }
-
-    @Override
-    public OkHttpWebTarget queryParamsJsonMap(String name, Map<String, String> values) {
-        if (values == null || values.isEmpty()) {
-            return this;
-        }
-
-        // when param value is JSON string
-        try {
-            return queryParam(name, objectMapper.writeValueAsString(values));
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java
index a32c28845..6c9dbe10b 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.okhttp;
 
+import com.github.dockerjava.okhttp.OkDockerHttpClient.OkResponse;
+
 import javax.net.SocketFactory;
 import java.io.FilterInputStream;
 import java.io.FilterOutputStream;
@@ -37,7 +39,7 @@ public void close() throws IOException {
 
                         @Override
                         public int read(byte[] b, int off, int len) throws IOException {
-                            if (OkHttpInvocationBuilder.CLOSING.get()) {
+                            if (OkResponse.CLOSING.get()) {
                                 return 0;
                             }
                             return super.read(b, off, len);
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index b52fcdcd6..beaf5d4c9 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -151,32 +151,6 @@
 					</instructions>
 				</configuration>
 			</plugin>
-
-			<plugin>
-				<!-- use with "mvn -DskipTests clean package japicmp:cmp" -->
-				<groupId>com.github.siom79.japicmp</groupId>
-				<artifactId>japicmp-maven-plugin</artifactId>
-				<version>0.14.1</version>
-				<configuration>
-					<oldVersion>
-						<dependency>
-							<groupId>com.github.docker-java</groupId>
-							<artifactId>docker-java</artifactId>
-							<version>3.1.0</version>
-							<type>jar</type>
-						</dependency>
-					</oldVersion>
-					<newVersion>
-						<file>
-							<path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
-						</file>
-					</newVersion>
-					<parameter>
-						<accessModifier>public</accessModifier>
-						<onlyBinaryIncompatible>true</onlyBinaryIncompatible>
-					</parameter>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
index 41eac8d27..299213216 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
@@ -73,21 +73,23 @@ public void onNext(Frame frame) {
             }
         };
 
-        PipedOutputStream out = new PipedOutputStream();
-        PipedInputStream in = new PipedInputStream(out);
-
-        dockerClient.attachContainerCmd(container.getId())
+        try (
+            PipedOutputStream out = new PipedOutputStream();
+            PipedInputStream in = new PipedInputStream(out);
+        ) {
+            dockerClient.attachContainerCmd(container.getId())
                 .withStdErr(true)
                 .withStdOut(true)
                 .withFollowStream(true)
                 .withStdIn(in)
                 .exec(callback);
 
-        out.write((snippet + "\n").getBytes());
-        out.flush();
+            out.write((snippet + "\n").getBytes());
+            out.flush();
 
-        callback.awaitCompletion(15, SECONDS);
-        callback.close();
+            callback.awaitCompletion(15, SECONDS);
+            callback.close();
+        }
 
         assertThat(callback.toString(), containsString(snippet));
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index 1d15e447e..227c0acc9 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -935,7 +935,7 @@ public void testWithStopSignal() throws Exception {
                 .awaitCompletion();
 
         String log = callback.builder.toString();
-        assertThat(log, is("exit trapped 10"));
+        assertThat(log.trim(), is("exit trapped 10"));
     }
 
     private static class StringBuilderLogReader extends ResultCallback.Adapter<Frame> {
@@ -947,7 +947,7 @@ public StringBuilderLogReader(StringBuilder builder) {
 
         @Override
         public void onNext(Frame item) {
-            builder.append(new String(item.getPayload()).trim());
+            builder.append(new String(item.getPayload()));
             super.onNext(item);
         }
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
index 6be307d88..37bf5f393 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
@@ -82,7 +82,7 @@ public void asyncLogContainerWithTtyDisabled() throws Exception {
 
         assertTrue(loggingCallback.toString().contains("hello"));
 
-        assertEquals(loggingCallback.getCollectedFrames().get(0).getStreamType(), StreamType.STDOUT);
+        assertEquals(StreamType.STDOUT, loggingCallback.getCollectedFrames().get(0).getStreamType());
     }
 
     @Test
@@ -92,7 +92,7 @@ public void asyncLogNonExistingContainer() throws Exception {
             @Override
             public void onError(Throwable throwable) {
 
-                assertEquals(throwable.getClass().getName(), NotFoundException.class.getName());
+                assertEquals(NotFoundException.class.getName(), throwable.getClass().getName());
 
                 try {
                     // close the callback to prevent the call to onComplete
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
index f4180e81a..76e4fe329 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
@@ -54,7 +54,7 @@ public void startContainerWithVolumes() throws Exception {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withVolumes(volume1, volume2)
                 .withCmd("true")
                 .withHostConfig(newHostConfig()
-                        .withBinds(new Bind("/src/webapp1", volume1, ro), new Bind("/src/webapp2", volume2)))
+                        .withBinds(new Bind("/tmp/webapp1", volume1, ro), new Bind("/tmp/webapp2", volume2)))
                 .exec();
 
         LOG.info("Created container {}", container.toString());
@@ -78,9 +78,9 @@ public void startContainerWithVolumes() throws Exception {
         assertThat(mounts, hasSize(2));
 
         final InspectContainerResponse.Mount mount1 = new InspectContainerResponse.Mount()
-                .withRw(false).withMode("ro").withDestination(volume1).withSource("/src/webapp1");
+                .withRw(false).withMode("ro").withDestination(volume1).withSource("/tmp/webapp1");
         final InspectContainerResponse.Mount mount2 = new InspectContainerResponse.Mount()
-                .withRw(true).withMode("rw").withDestination(volume2).withSource("/src/webapp2");
+                .withRw(true).withMode("rw").withDestination(volume2).withSource("/tmp/webapp2");
 
         assertThat(mounts, containsInAnyOrder(mount1, mount2));
     }
@@ -96,7 +96,7 @@ public void startContainerWithVolumesFrom() throws DockerException {
         CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999")
                 .withName(container1Name)
                 .withHostConfig(newHostConfig()
-                        .withBinds(new Bind("/src/webapp1", volume1), new Bind("/src/webapp2", volume2)))
+                        .withBinds(new Bind("/tmp/webapp1", volume1), new Bind("/tmp/webapp2", volume2)))
                 .exec();
         LOG.info("Created container1 {}", container1.toString());
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java b/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
deleted file mode 100644
index f98d7d281..000000000
--- a/docker-java/src/test/java/com/github/dockerjava/core/async/JsonStreamProcessorTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Created on 16.02.2016
- */
-package com.github.dockerjava.core.async;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.model.PullResponseItem;
-import com.github.dockerjava.test.serdes.JSONTestHelper;
-import org.junit.Test;
-
-import java.io.ByteArrayInputStream;
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.Assert.assertFalse;
-
-
-/**
- *
- * @author Marcus Linke
- *
- */
-public class JsonStreamProcessorTest {
-
-    @Test
-    public void processEmptyJson() throws Exception {
-
-        InputStream response = new ByteArrayInputStream("{}".getBytes());
-
-        JsonStreamProcessor<PullResponseItem> jsonStreamProcessor = new JsonStreamProcessor<>(
-                JSONTestHelper.getMapper(), new TypeReference<PullResponseItem>() {});
-
-        final List<Boolean> completed = new ArrayList<>();
-
-        jsonStreamProcessor.processResponseStream(response, new ResultCallback<PullResponseItem>() {
-
-            @Override
-            public void close() throws IOException {
-            }
-
-            @Override
-            public void onStart(Closeable closeable) {
-            }
-
-            @Override
-            public void onNext(PullResponseItem object) {
-                assertFalse("onNext called for empty json", true);
-            }
-
-            @Override
-            public void onError(Throwable throwable) {
-            }
-
-            @Override
-            public void onComplete() {
-                completed.add(true);
-            }
-        });
-
-        assertFalse("Stream processing not completed", completed.isEmpty());
-    }
-
-}
diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java
index dba592a4d..807b92a4b 100644
--- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java
+++ b/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java
@@ -1,85 +1,11 @@
 package com.github.dockerjava.junit;
 
-
-import com.github.dockerjava.api.command.AttachContainerCmd;
-import com.github.dockerjava.api.command.AuthCmd;
-import com.github.dockerjava.api.command.BuildImageCmd;
-import com.github.dockerjava.api.command.CommitCmd;
-import com.github.dockerjava.api.command.ConnectToNetworkCmd;
-import com.github.dockerjava.api.command.ContainerDiffCmd;
-import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
-import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
-import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
-import com.github.dockerjava.api.command.CreateContainerCmd;
-import com.github.dockerjava.api.command.CreateImageCmd;
-import com.github.dockerjava.api.command.CreateNetworkCmd;
-import com.github.dockerjava.api.command.CreateSecretCmd;
-import com.github.dockerjava.api.command.CreateServiceCmd;
-import com.github.dockerjava.api.command.CreateVolumeCmd;
-import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
+import com.github.dockerjava.api.command.DelegatingDockerCmdExecFactory;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
-import com.github.dockerjava.api.command.EventsCmd;
-import com.github.dockerjava.api.command.ExecCreateCmd;
-import com.github.dockerjava.api.command.ExecStartCmd;
-import com.github.dockerjava.api.command.InfoCmd;
-import com.github.dockerjava.api.command.InitializeSwarmCmd;
-import com.github.dockerjava.api.command.InspectContainerCmd;
-import com.github.dockerjava.api.command.InspectExecCmd;
-import com.github.dockerjava.api.command.InspectImageCmd;
-import com.github.dockerjava.api.command.InspectNetworkCmd;
-import com.github.dockerjava.api.command.InspectServiceCmd;
-import com.github.dockerjava.api.command.InspectSwarmCmd;
-import com.github.dockerjava.api.command.InspectSwarmNodeCmd;
-import com.github.dockerjava.api.command.InspectVolumeCmd;
-import com.github.dockerjava.api.command.JoinSwarmCmd;
-import com.github.dockerjava.api.command.KillContainerCmd;
-import com.github.dockerjava.api.command.LeaveSwarmCmd;
-import com.github.dockerjava.api.command.ListContainersCmd;
-import com.github.dockerjava.api.command.ListImagesCmd;
-import com.github.dockerjava.api.command.ListNetworksCmd;
-import com.github.dockerjava.api.command.ListSecretsCmd;
-import com.github.dockerjava.api.command.ListServicesCmd;
-import com.github.dockerjava.api.command.ListSwarmNodesCmd;
-import com.github.dockerjava.api.command.ListTasksCmd;
-import com.github.dockerjava.api.command.ListVolumesCmd;
-import com.github.dockerjava.api.command.LoadImageCmd;
-import com.github.dockerjava.api.command.LogContainerCmd;
-import com.github.dockerjava.api.command.LogSwarmObjectCmd;
-import com.github.dockerjava.api.command.PauseContainerCmd;
-import com.github.dockerjava.api.command.PingCmd;
-import com.github.dockerjava.api.command.PruneCmd;
-import com.github.dockerjava.api.command.PullImageCmd;
-import com.github.dockerjava.api.command.PushImageCmd;
-import com.github.dockerjava.api.command.RemoveContainerCmd;
-import com.github.dockerjava.api.command.RemoveImageCmd;
-import com.github.dockerjava.api.command.RemoveNetworkCmd;
-import com.github.dockerjava.api.command.RemoveSecretCmd;
-import com.github.dockerjava.api.command.RemoveServiceCmd;
-import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
-import com.github.dockerjava.api.command.RemoveVolumeCmd;
-import com.github.dockerjava.api.command.RenameContainerCmd;
-import com.github.dockerjava.api.command.RestartContainerCmd;
-import com.github.dockerjava.api.command.SaveImageCmd;
-import com.github.dockerjava.api.command.SaveImagesCmd;
-import com.github.dockerjava.api.command.SearchImagesCmd;
-import com.github.dockerjava.api.command.StartContainerCmd;
-import com.github.dockerjava.api.command.StatsCmd;
-import com.github.dockerjava.api.command.StopContainerCmd;
-import com.github.dockerjava.api.command.TagImageCmd;
-import com.github.dockerjava.api.command.TopContainerCmd;
-import com.github.dockerjava.api.command.UnpauseContainerCmd;
-import com.github.dockerjava.api.command.UpdateContainerCmd;
-import com.github.dockerjava.api.command.UpdateServiceCmd;
-import com.github.dockerjava.api.command.UpdateSwarmCmd;
-import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
-import com.github.dockerjava.api.command.VersionCmd;
-import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.DockerClientConfigAware;
 
-import java.io.IOException;
-
-class DockerCmdExecFactoryDelegate implements DockerCmdExecFactory, DockerClientConfigAware {
+class DockerCmdExecFactoryDelegate extends DelegatingDockerCmdExecFactory implements DockerClientConfigAware {
 
     final DockerCmdExecFactory delegate;
 
@@ -87,375 +13,15 @@ class DockerCmdExecFactoryDelegate implements DockerCmdExecFactory, DockerClient
         this.delegate = delegate;
     }
 
+    @Override
+    public final DockerCmdExecFactory getDockerCmdExecFactory() {
+        return delegate;
+    }
+
     @Override
     public void init(DockerClientConfig dockerClientConfig) {
         if (delegate instanceof DockerClientConfigAware) {
             ((DockerClientConfigAware) delegate).init(dockerClientConfig);
         }
     }
-
-    @Override
-    public AuthCmd.Exec createAuthCmdExec() {
-        return delegate.createAuthCmdExec();
-    }
-
-    @Override
-    public InfoCmd.Exec createInfoCmdExec() {
-        return delegate.createInfoCmdExec();
-    }
-
-    @Override
-    public PingCmd.Exec createPingCmdExec() {
-        return delegate.createPingCmdExec();
-    }
-
-    @Override
-    public ExecCreateCmd.Exec createExecCmdExec() {
-        return delegate.createExecCmdExec();
-    }
-
-    @Override
-    public VersionCmd.Exec createVersionCmdExec() {
-        return delegate.createVersionCmdExec();
-    }
-
-    @Override
-    public PullImageCmd.Exec createPullImageCmdExec() {
-        return delegate.createPullImageCmdExec();
-    }
-
-    @Override
-    public PushImageCmd.Exec createPushImageCmdExec() {
-        return delegate.createPushImageCmdExec();
-    }
-
-    @Override
-    public SaveImageCmd.Exec createSaveImageCmdExec() {
-        return delegate.createSaveImageCmdExec();
-    }
-
-    @Override
-    public SaveImagesCmd.Exec createSaveImagesCmdExec() {
-        return delegate.createSaveImagesCmdExec();
-    }
-
-    @Override
-    public CreateImageCmd.Exec createCreateImageCmdExec() {
-        return delegate.createCreateImageCmdExec();
-    }
-
-    @Override
-    public LoadImageCmd.Exec createLoadImageCmdExec() {
-        return delegate.createLoadImageCmdExec();
-    }
-
-    @Override
-    public SearchImagesCmd.Exec createSearchImagesCmdExec() {
-        return delegate.createSearchImagesCmdExec();
-    }
-
-    @Override
-    public RemoveImageCmd.Exec createRemoveImageCmdExec() {
-        return delegate.createRemoveImageCmdExec();
-    }
-
-    @Override
-    public ListImagesCmd.Exec createListImagesCmdExec() {
-        return delegate.createListImagesCmdExec();
-    }
-
-    @Override
-    public InspectImageCmd.Exec createInspectImageCmdExec() {
-        return delegate.createInspectImageCmdExec();
-    }
-
-    @Override
-    public ListContainersCmd.Exec createListContainersCmdExec() {
-        return delegate.createListContainersCmdExec();
-    }
-
-    @Override
-    public CreateContainerCmd.Exec createCreateContainerCmdExec() {
-        return delegate.createCreateContainerCmdExec();
-    }
-
-    @Override
-    public StartContainerCmd.Exec createStartContainerCmdExec() {
-        return delegate.createStartContainerCmdExec();
-    }
-
-    @Override
-    public InspectContainerCmd.Exec createInspectContainerCmdExec() {
-        return delegate.createInspectContainerCmdExec();
-    }
-
-    @Override
-    public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
-        return delegate.createRemoveContainerCmdExec();
-    }
-
-    @Override
-    public WaitContainerCmd.Exec createWaitContainerCmdExec() {
-        return delegate.createWaitContainerCmdExec();
-    }
-
-    @Override
-    public AttachContainerCmd.Exec createAttachContainerCmdExec() {
-        return delegate.createAttachContainerCmdExec();
-    }
-
-    @Override
-    public ExecStartCmd.Exec createExecStartCmdExec() {
-        return delegate.createExecStartCmdExec();
-    }
-
-    @Override
-    public InspectExecCmd.Exec createInspectExecCmdExec() {
-        return delegate.createInspectExecCmdExec();
-    }
-
-    @Override
-    public LogContainerCmd.Exec createLogContainerCmdExec() {
-        return delegate.createLogContainerCmdExec();
-    }
-
-    @Override
-    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
-        return delegate.createCopyFileFromContainerCmdExec();
-    }
-
-    @Override
-    public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() {
-        return delegate.createCopyArchiveFromContainerCmdExec();
-    }
-
-    @Override
-    public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() {
-        return delegate.createCopyArchiveToContainerCmdExec();
-    }
-
-    @Override
-    public StopContainerCmd.Exec createStopContainerCmdExec() {
-        return delegate.createStopContainerCmdExec();
-    }
-
-    @Override
-    public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
-        return delegate.createContainerDiffCmdExec();
-    }
-
-    @Override
-    public KillContainerCmd.Exec createKillContainerCmdExec() {
-        return delegate.createKillContainerCmdExec();
-    }
-
-    @Override
-    public UpdateContainerCmd.Exec createUpdateContainerCmdExec() {
-        return delegate.createUpdateContainerCmdExec();
-    }
-
-    @Override
-    public RenameContainerCmd.Exec createRenameContainerCmdExec() {
-        return delegate.createRenameContainerCmdExec();
-    }
-
-    @Override
-    public RestartContainerCmd.Exec createRestartContainerCmdExec() {
-        return delegate.createRestartContainerCmdExec();
-    }
-
-    @Override
-    public CommitCmd.Exec createCommitCmdExec() {
-        return delegate.createCommitCmdExec();
-    }
-
-    @Override
-    public BuildImageCmd.Exec createBuildImageCmdExec() {
-        return delegate.createBuildImageCmdExec();
-    }
-
-    @Override
-    public TopContainerCmd.Exec createTopContainerCmdExec() {
-        return delegate.createTopContainerCmdExec();
-    }
-
-    @Override
-    public TagImageCmd.Exec createTagImageCmdExec() {
-        return delegate.createTagImageCmdExec();
-    }
-
-    @Override
-    public PauseContainerCmd.Exec createPauseContainerCmdExec() {
-        return delegate.createPauseContainerCmdExec();
-    }
-
-    @Override
-    public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
-        return delegate.createUnpauseContainerCmdExec();
-    }
-
-    @Override
-    public EventsCmd.Exec createEventsCmdExec() {
-        return delegate.createEventsCmdExec();
-    }
-
-    @Override
-    public StatsCmd.Exec createStatsCmdExec() {
-        return delegate.createStatsCmdExec();
-    }
-
-    @Override
-    public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
-        return delegate.createCreateVolumeCmdExec();
-    }
-
-    @Override
-    public InspectVolumeCmd.Exec createInspectVolumeCmdExec() {
-        return delegate.createInspectVolumeCmdExec();
-    }
-
-    @Override
-    public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() {
-        return delegate.createRemoveVolumeCmdExec();
-    }
-
-    @Override
-    public ListVolumesCmd.Exec createListVolumesCmdExec() {
-        return delegate.createListVolumesCmdExec();
-    }
-
-    @Override
-    public ListNetworksCmd.Exec createListNetworksCmdExec() {
-        return delegate.createListNetworksCmdExec();
-    }
-
-    @Override
-    public InspectNetworkCmd.Exec createInspectNetworkCmdExec() {
-        return delegate.createInspectNetworkCmdExec();
-    }
-
-    @Override
-    public CreateNetworkCmd.Exec createCreateNetworkCmdExec() {
-        return delegate.createCreateNetworkCmdExec();
-    }
-
-    @Override
-    public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() {
-        return delegate.createRemoveNetworkCmdExec();
-    }
-
-    @Override
-    public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() {
-        return delegate.createConnectToNetworkCmdExec();
-    }
-
-    @Override
-    public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() {
-        return delegate.createDisconnectFromNetworkCmdExec();
-    }
-
-    @Override
-    public InitializeSwarmCmd.Exec createInitializeSwarmCmdExec() {
-        return delegate.createInitializeSwarmCmdExec();
-    }
-
-    @Override
-    public InspectSwarmCmd.Exec createInspectSwarmCmdExec() {
-        return delegate.createInspectSwarmCmdExec();
-    }
-
-    @Override
-    public JoinSwarmCmd.Exec createJoinSwarmCmdExec() {
-        return delegate.createJoinSwarmCmdExec();
-    }
-
-    @Override
-    public LeaveSwarmCmd.Exec createLeaveSwarmCmdExec() {
-        return delegate.createLeaveSwarmCmdExec();
-    }
-
-    @Override
-    public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() {
-        return delegate.createUpdateSwarmCmdExec();
-    }
-
-    @Override
-    public ListServicesCmd.Exec createListServicesCmdExec() {
-        return delegate.createListServicesCmdExec();
-    }
-
-    @Override
-    public CreateServiceCmd.Exec createCreateServiceCmdExec() {
-        return delegate.createCreateServiceCmdExec();
-    }
-
-    @Override
-    public InspectServiceCmd.Exec createInspectServiceCmdExec() {
-        return delegate.createInspectServiceCmdExec();
-    }
-
-    @Override
-    public UpdateServiceCmd.Exec createUpdateServiceCmdExec() {
-        return delegate.createUpdateServiceCmdExec();
-    }
-
-    @Override
-    public RemoveServiceCmd.Exec createRemoveServiceCmdExec() {
-        return delegate.createRemoveServiceCmdExec();
-    }
-
-    @Override
-    public LogSwarmObjectCmd.Exec logSwarmObjectExec(String endpoint) {
-        return delegate.logSwarmObjectExec(endpoint);
-    }
-
-    @Override
-    public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() {
-        return delegate.listSwarmNodeCmdExec();
-    }
-
-    @Override
-    public InspectSwarmNodeCmd.Exec inspectSwarmNodeCmdExec() {
-        return delegate.inspectSwarmNodeCmdExec();
-    }
-
-    @Override
-    public RemoveSwarmNodeCmd.Exec removeSwarmNodeCmdExec() {
-        return delegate.removeSwarmNodeCmdExec();
-    }
-
-    @Override
-    public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() {
-        return delegate.updateSwarmNodeCmdExec();
-    }
-
-    @Override
-    public ListTasksCmd.Exec listTasksCmdExec() {
-        return delegate.listTasksCmdExec();
-    }
-
-    @Override
-    public PruneCmd.Exec pruneCmdExec() {
-        return delegate.pruneCmdExec();
-    }
-
-    @Override
-    public ListSecretsCmd.Exec createListSecretsCmdExec() {
-        return delegate.createListSecretsCmdExec();
-    }
-
-    @Override
-    public CreateSecretCmd.Exec createCreateSecretCmdExec() {
-        return delegate.createCreateSecretCmdExec();
-    }
-
-    @Override
-    public RemoveSecretCmd.Exec createRemoveSecretCmdExec() {
-        return delegate.createRemoveSecretCmdExec();
-    }
-
-    @Override
-    public void close() throws IOException {
-        delegate.close();
-    }
 }
diff --git a/pom.xml b/pom.xml
index 38880e712..2d3fb78b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -229,6 +229,54 @@
 					<artifactId>maven-bundle-plugin</artifactId>
 					<version>4.2.1</version>
 				</plugin>
+
+
+				<plugin>
+					<!-- use with "mvn -DskipTests clean verify" -->
+					<groupId>com.github.siom79.japicmp</groupId>
+					<artifactId>japicmp-maven-plugin</artifactId>
+					<version>0.14.3</version>
+					<configuration>
+						<oldVersion>
+							<dependency>
+								<groupId>com.github.docker-java</groupId>
+								<artifactId>${project.artifactId}</artifactId>
+								<version>3.2.0</version>
+								<type>jar</type>
+							</dependency>
+						</oldVersion>
+						<newVersion>
+							<file>
+								<path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
+							</file>
+						</newVersion>
+						<parameter>
+							<breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
+							<accessModifier>public</accessModifier>
+							<onlyBinaryIncompatible>true</onlyBinaryIncompatible>
+							<overrideCompatibilityChangeParameters>
+								<overrideCompatibilityChangeParameter>
+									<compatibilityChange>METHOD_NEW_DEFAULT</compatibilityChange>
+									<binaryCompatible>true</binaryCompatible>
+									<sourceCompatible>true</sourceCompatible>
+								</overrideCompatibilityChangeParameter>
+								<overrideCompatibilityChangeParameter>
+									<compatibilityChange>METHOD_ABSTRACT_NOW_DEFAULT</compatibilityChange>
+									<binaryCompatible>true</binaryCompatible>
+									<sourceCompatible>true</sourceCompatible>
+								</overrideCompatibilityChangeParameter>
+							</overrideCompatibilityChangeParameters>
+						</parameter>
+					</configuration>
+					<executions>
+						<execution>
+							<phase>verify</phase>
+							<goals>
+								<goal>cmp</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>

From e4eb048e29c54da67c85f2ae96727852af87bee2 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Tue, 7 Apr 2020 14:29:41 +0200
Subject: [PATCH 1005/1272] Add Apache HttpClient 5 transport (#1358)

Adds a new, Apache HttpClient 5 based transport (without Jersey) that implements `DockerHttpClient` and supports input hijacking
---
 docker-java-transport-httpclient5/pom.xml     |  67 ++++
 .../httpclient5/ApacheDockerHttpClient.java   | 240 +++++++++++++
 .../HijackingHttpRequestExecutor.java         | 146 ++++++++
 .../httpclient5/NamedPipeSocket.java          | 101 ++++++
 .../httpclient5/UnixDomainSocket.java         | 333 ++++++++++++++++++
 docker-java/pom.xml                           |   6 +
 .../java/com/github/dockerjava/cmd/CmdIT.java |  31 ++
 pom.xml                                       |   1 +
 8 files changed, 925 insertions(+)
 create mode 100644 docker-java-transport-httpclient5/pom.xml
 create mode 100644 docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java
 create mode 100644 docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java
 create mode 100644 docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java
 create mode 100644 docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java

diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml
new file mode 100644
index 000000000..2ed959e83
--- /dev/null
+++ b/docker-java-transport-httpclient5/pom.xml
@@ -0,0 +1,67 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.github.docker-java</groupId>
+		<artifactId>docker-java-parent</artifactId>
+		<version>3.2.2-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>docker-java-transport-httpclient5</artifactId>
+	<packaging>jar</packaging>
+
+	<name>docker-java-transport-httpclient5</name>
+	<url>https://github.com/docker-java/docker-java</url>
+	<description>Java API Client for Docker</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.httpcomponents.client5</groupId>
+			<artifactId>httpclient5</artifactId>
+			<version>5.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.httpcomponents.core5</groupId>
+					<artifactId>httpcore5-h2</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>net.java.dev.jna</groupId>
+			<artifactId>jna-platform</artifactId>
+			<version>5.5.0</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>com.github.siom79.japicmp</groupId>
+				<artifactId>japicmp-maven-plugin</artifactId>
+				<configuration>
+					<!-- TODO remove once this module is released -->
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Export-Package>com.github.dockerjava.httpclient5.*</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java
new file mode 100644
index 000000000..997a7d57a
--- /dev/null
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java
@@ -0,0 +1,240 @@
+package com.github.dockerjava.httpclient5;
+
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.DockerHttpClient;
+import com.github.dockerjava.core.SSLConfig;
+import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.impl.io.ManagedHttpClientConnectionFactory;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
+import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.core5.http.ConnectionClosedException;
+import org.apache.hc.core5.http.ContentLengthStrategy;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.config.Registry;
+import org.apache.hc.core5.http.config.RegistryBuilder;
+import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy;
+import org.apache.hc.core5.http.impl.io.EmptyInputStream;
+import org.apache.hc.core5.http.io.entity.InputStreamEntity;
+import org.apache.hc.core5.http.protocol.BasicHttpContext;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.net.URIAuthority;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.Socket;
+import java.net.URI;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public final class ApacheDockerHttpClient implements DockerHttpClient {
+
+    public static final class Factory {
+
+        private DockerClientConfig dockerClientConfig = null;
+
+        public Factory dockerClientConfig(DockerClientConfig value) {
+            this.dockerClientConfig = value;
+            return this;
+        }
+
+        public ApacheDockerHttpClient build() {
+            Objects.requireNonNull(dockerClientConfig, "dockerClientConfig");
+            return new ApacheDockerHttpClient(dockerClientConfig);
+        }
+    }
+
+    private final CloseableHttpClient httpClient;
+
+    private final HttpHost host;
+
+    private ApacheDockerHttpClient(DockerClientConfig dockerClientConfig) {
+        Registry<ConnectionSocketFactory> socketFactoryRegistry = createConnectionSocketFactoryRegistry(dockerClientConfig);
+
+        URI dockerHost = dockerClientConfig.getDockerHost();
+
+        switch (dockerHost.getScheme()) {
+            case "unix":
+            case "npipe":
+                host = new HttpHost(dockerHost.getScheme(), "localhost", 2375);
+                break;
+            case "tcp":
+                host = new HttpHost(
+                    socketFactoryRegistry.lookup("https") != null ? "https" : "http",
+                    dockerHost.getHost(),
+                    dockerHost.getPort()
+                );
+                break;
+            default:
+                host = HttpHost.create(dockerHost);
+        }
+
+        httpClient = HttpClients.custom()
+            .setRequestExecutor(new HijackingHttpRequestExecutor(null))
+            .setConnectionManager(new PoolingHttpClientConnectionManager(
+                socketFactoryRegistry,
+                new ManagedHttpClientConnectionFactory(
+                    null,
+                    null,
+                    null,
+                    null,
+                    message -> {
+                        Header transferEncodingHeader = message.getFirstHeader(HttpHeaders.TRANSFER_ENCODING);
+                        if (transferEncodingHeader != null) {
+                            if ("identity".equalsIgnoreCase(transferEncodingHeader.getValue())) {
+                                return ContentLengthStrategy.UNDEFINED;
+                            }
+                        }
+                        return DefaultContentLengthStrategy.INSTANCE.determineLength(message);
+                    },
+                    null
+                )
+            ))
+            .build();
+    }
+
+    private Registry<ConnectionSocketFactory> createConnectionSocketFactoryRegistry(DockerClientConfig dockerClientConfig) {
+        RegistryBuilder<ConnectionSocketFactory> socketFactoryRegistryBuilder = RegistryBuilder.create();
+
+        SSLConfig sslConfig = dockerClientConfig.getSSLConfig();
+        if (sslConfig != null) {
+            try {
+                SSLContext sslContext = sslConfig.getSSLContext();
+                if (sslContext != null) {
+                    socketFactoryRegistryBuilder.register("https", new SSLConnectionSocketFactory(sslContext));
+                }
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        return socketFactoryRegistryBuilder
+            .register("tcp", PlainConnectionSocketFactory.INSTANCE)
+            .register("http", PlainConnectionSocketFactory.INSTANCE)
+            .register("unix", new PlainConnectionSocketFactory() {
+                @Override
+                public Socket createSocket(HttpContext context) throws IOException {
+                    URI dockerHost = dockerClientConfig.getDockerHost();
+
+                    return new UnixDomainSocket(dockerHost.getPath());
+                }
+            })
+            .register("npipe", new PlainConnectionSocketFactory() {
+                @Override
+                public Socket createSocket(HttpContext context) {
+                    URI dockerHost = dockerClientConfig.getDockerHost();
+
+                    return new NamedPipeSocket(dockerHost.getPath());
+                }
+            })
+            .build();
+    }
+
+    @Override
+    public Response execute(Request request) {
+        HttpContext context = new BasicHttpContext();
+        HttpUriRequestBase httpUriRequest = new HttpUriRequestBase(request.method(), URI.create(request.path()));
+        httpUriRequest.setScheme(host.getSchemeName());
+        httpUriRequest.setAuthority(new URIAuthority(host.getHostName(), host.getPort()));
+
+        request.headers().forEach(httpUriRequest::addHeader);
+
+        InputStream body = request.body();
+        if (body != null) {
+            httpUriRequest.setEntity(new InputStreamEntity(body, null));
+        }
+
+        if (request.hijackedInput() != null) {
+            context.setAttribute(HijackingHttpRequestExecutor.HIJACKED_INPUT_ATTRIBUTE, request.hijackedInput());
+            httpUriRequest.setHeader("Upgrade", "tcp");
+            httpUriRequest.setHeader("Connection", "Upgrade");
+        }
+
+        try {
+            CloseableHttpResponse response = httpClient.execute(host, httpUriRequest, context);
+
+            return new ApacheResponse(httpUriRequest, response);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void close() throws IOException {
+        httpClient.close();
+    }
+
+    static class ApacheResponse implements Response {
+
+        private static final Logger LOGGER = LoggerFactory.getLogger(ApacheResponse.class);
+
+        private final HttpUriRequestBase request;
+
+        private final CloseableHttpResponse response;
+
+        ApacheResponse(HttpUriRequestBase httpUriRequest, CloseableHttpResponse response) {
+            this.request = httpUriRequest;
+            this.response = response;
+        }
+
+        @Override
+        public int getStatusCode() {
+            return response.getCode();
+        }
+
+        @Override
+        public Map<String, List<String>> getHeaders() {
+            return Stream.of(response.getHeaders()).collect(Collectors.groupingBy(
+                NameValuePair::getName,
+                Collectors.mapping(NameValuePair::getValue, Collectors.toList())
+            ));
+        }
+
+        @Override
+        public String getHeader(String name) {
+            Header firstHeader = response.getFirstHeader(name);
+            return firstHeader != null ? firstHeader.getValue() : null;
+        }
+
+        @Override
+        public InputStream getBody() {
+            try {
+                return response.getEntity() != null
+                    ? response.getEntity().getContent()
+                    : EmptyInputStream.INSTANCE;
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        @Override
+        public void close() {
+            try {
+                request.abort();
+            } catch (Exception e) {
+                LOGGER.debug("Failed to abort the request", e);
+            }
+
+            try {
+                response.close();
+            } catch (ConnectionClosedException e) {
+                LOGGER.trace("Failed to close the response", e);
+            } catch (Exception e) {
+                LOGGER.debug("Failed to close the response", e);
+            }
+        }
+    }
+}
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java
new file mode 100644
index 000000000..59888a5dd
--- /dev/null
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java
@@ -0,0 +1,146 @@
+package com.github.dockerjava.httpclient5;
+
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
+import org.apache.hc.core5.http.ConnectionReuseStrategy;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.ProtocolException;
+import org.apache.hc.core5.http.ProtocolVersion;
+import org.apache.hc.core5.http.impl.io.HttpRequestExecutor;
+import org.apache.hc.core5.http.io.HttpClientConnection;
+import org.apache.hc.core5.http.io.HttpResponseInformationCallback;
+import org.apache.hc.core5.http.io.entity.AbstractHttpEntity;
+import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
+import org.apache.hc.core5.http.message.StatusLine;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
+import org.apache.hc.core5.io.Closer;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Objects;
+
+class HijackingHttpRequestExecutor extends HttpRequestExecutor {
+
+    static final String HIJACKED_INPUT_ATTRIBUTE = "com.github.docker-java.hijackedInput";
+
+    HijackingHttpRequestExecutor(ConnectionReuseStrategy connectionReuseStrategy) {
+        super(connectionReuseStrategy);
+    }
+
+    @Override
+    public ClassicHttpResponse execute(
+        ClassicHttpRequest request,
+        HttpClientConnection conn,
+        HttpResponseInformationCallback informationCallback,
+        HttpContext context
+    ) throws IOException, HttpException {
+        Objects.requireNonNull(request, "HTTP request");
+        Objects.requireNonNull(conn, "Client connection");
+        Objects.requireNonNull(context, "HTTP context");
+
+        InputStream hijackedInput = (InputStream) context.getAttribute(HIJACKED_INPUT_ATTRIBUTE);
+        if (hijackedInput != null) {
+            return executeHijacked(request, conn, context, hijackedInput);
+        }
+
+        return super.execute(request, conn, informationCallback, context);
+    }
+
+    private ClassicHttpResponse executeHijacked(
+        ClassicHttpRequest request,
+        HttpClientConnection conn,
+        HttpContext context,
+        InputStream hijackedInput
+    ) throws HttpException, IOException {
+        try {
+            context.setAttribute(HttpCoreContext.SSL_SESSION, conn.getSSLSession());
+            context.setAttribute(HttpCoreContext.CONNECTION_ENDPOINT, conn.getEndpointDetails());
+            final ProtocolVersion transportVersion = request.getVersion();
+            if (transportVersion != null) {
+                context.setProtocolVersion(transportVersion);
+            }
+
+            conn.sendRequestHeader(request);
+            conn.sendRequestEntity(request);
+            conn.flush();
+
+            ClassicHttpResponse response = conn.receiveResponseHeader();
+            if (response.getCode() != HttpStatus.SC_SWITCHING_PROTOCOLS) {
+                conn.terminateRequest(request);
+                throw new ProtocolException("Expected 101 Switching Protocols, got: " + new StatusLine(response));
+            }
+
+            Thread thread = new Thread(() -> {
+                try {
+                    BasicClassicHttpRequest fakeRequest = new BasicClassicHttpRequest("POST", "/");
+                    fakeRequest.setHeader(HttpHeaders.CONTENT_LENGTH, Long.MAX_VALUE);
+                    fakeRequest.setEntity(new HijackedEntity(hijackedInput));
+                    conn.sendRequestEntity(fakeRequest);
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            });
+            thread.setName("docker-java-httpclient5-hijacking-stream-" + System.identityHashCode(request));
+            thread.setDaemon(true);
+            thread.start();
+
+            // 101 -> 200
+            response.setCode(200);
+            conn.receiveResponseEntity(response);
+            return response;
+
+        } catch (final HttpException | IOException | RuntimeException ex) {
+            Closer.closeQuietly(conn);
+            throw ex;
+        }
+    }
+
+    private static class HijackedEntity extends AbstractHttpEntity {
+
+        private final InputStream inStream;
+
+        HijackedEntity(InputStream inStream) {
+            super((String) null, null, false);
+            this.inStream = inStream;
+        }
+
+        @Override
+        public void writeTo(OutputStream outStream) throws IOException {
+            byte[] buffer = new byte[1024];
+            int read;
+            while ((read = inStream.read(buffer)) != -1) {
+                outStream.write(buffer, 0, read);
+                outStream.flush();
+            }
+        }
+
+        @Override
+        public InputStream getContent() {
+            return inStream;
+        }
+
+        @Override
+        public boolean isStreaming() {
+            return true;
+        }
+
+        @Override
+        public boolean isRepeatable() {
+            return false;
+        }
+
+        @Override
+        public void close() throws IOException {
+            inStream.close();
+        }
+
+        @Override
+        public long getContentLength() {
+            return -1;
+        }
+    }
+}
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java
new file mode 100644
index 000000000..b016c03d2
--- /dev/null
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java
@@ -0,0 +1,101 @@
+package com.github.dockerjava.httpclient5;
+
+import com.sun.jna.platform.win32.Kernel32;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.RandomAccessFile;
+import java.net.Socket;
+import java.net.SocketAddress;
+
+class NamedPipeSocket extends Socket {
+
+    private final String socketFileName;
+
+    private RandomAccessFile file;
+
+    private InputStream is;
+
+    private OutputStream os;
+
+    NamedPipeSocket(String socketFileName) {
+        this.socketFileName = socketFileName;
+    }
+
+    @Override
+    public void close() throws IOException {
+        if (file != null) {
+            file.close();
+            file = null;
+        }
+    }
+
+    @Override
+    public void connect(SocketAddress endpoint) {
+        connect(endpoint, 0);
+    }
+
+    @Override
+    public void connect(SocketAddress endpoint, int timeout) {
+        long startedAt = System.currentTimeMillis();
+        timeout = Math.max(timeout, 10_000);
+        while (true) {
+            try {
+                file = new RandomAccessFile(socketFileName, "rw");
+                break;
+            } catch (FileNotFoundException e) {
+                if (System.currentTimeMillis() - startedAt >= timeout) {
+                    throw new RuntimeException(e);
+                } else {
+                    Kernel32.INSTANCE.WaitNamedPipe(socketFileName, 100);
+                }
+            }
+        }
+
+        is = new InputStream() {
+            @Override
+            public int read(byte[] bytes, int off, int len) throws IOException {
+                return file.read(bytes, off, len);
+            }
+
+            @Override
+            public int read() throws IOException {
+                return file.read();
+            }
+
+            @Override
+            public int read(byte[] bytes) throws IOException {
+                return file.read(bytes);
+            }
+        };
+
+        os = new OutputStream() {
+            @Override
+            public void write(byte[] bytes, int off, int len) throws IOException {
+                file.write(bytes, off, len);
+            }
+
+            @Override
+            public void write(int value) throws IOException {
+                file.write(value);
+            }
+
+            @Override
+            public void write(byte[] bytes) throws IOException {
+                file.write(bytes);
+            }
+        };
+    }
+
+    @Override
+    public InputStream getInputStream() {
+        return is;
+    }
+
+    @Override
+    public OutputStream getOutputStream() {
+        return os;
+    }
+}
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java
new file mode 100644
index 000000000..cbbfd16a1
--- /dev/null
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java
@@ -0,0 +1,333 @@
+/*
+ *
+ * MariaDB Client for Java
+ *
+ * Copyright (c) 2012-2014 Monty Program Ab.
+ * Copyright (c) 2015-2019 MariaDB Ab.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with this library; if not, write to Monty Program Ab info@montyprogram.com.
+ *
+ * This particular MariaDB Client for Java file is work
+ * derived from a Drizzle-JDBC. Drizzle-JDBC file which is covered by subject to
+ * the following copyright and notice provisions:
+ *
+ * Copyright (c) 2009-2011, Marcus Eriksson
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this list
+ * of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice, this
+ * list of conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.
+ *
+ * Neither the name of the driver nor the names of its contributors may not be
+ * used to endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS  AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ */
+
+package com.github.dockerjava.httpclient5;
+
+import com.sun.jna.LastErrorException;
+import com.sun.jna.Native;
+import com.sun.jna.Platform;
+import com.sun.jna.Structure;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+class UnixDomainSocket extends Socket {
+
+    private static final int AF_UNIX = 1;
+    private static final int SOCK_STREAM = Platform.isSolaris() ? 2 : 1;
+    private static final int PROTOCOL = 0;
+
+    static {
+        if (Platform.isSolaris()) {
+            System.loadLibrary("nsl");
+            System.loadLibrary("socket");
+        }
+        if (!Platform.isWindows() && !Platform.isWindowsCE()) {
+            Native.register("c");
+        }
+    }
+
+    private final AtomicBoolean closeLock = new AtomicBoolean();
+    private final SockAddr sockaddr;
+    private final int fd;
+    private InputStream is;
+    private OutputStream os;
+    private boolean connected;
+
+    UnixDomainSocket(String path) throws IOException {
+        if (Platform.isWindows() || Platform.isWindowsCE()) {
+            throw new IOException("Unix domain sockets are not supported on Windows");
+        }
+        sockaddr = new SockAddr(path);
+        closeLock.set(false);
+        try {
+            fd = socket(AF_UNIX, SOCK_STREAM, PROTOCOL);
+        } catch (LastErrorException lee) {
+            throw new IOException("native socket() failed : " + formatError(lee));
+        }
+    }
+
+    public static native int socket(int domain, int type, int protocol) throws LastErrorException;
+
+    public static native int connect(int sockfd, SockAddr sockaddr, int addrlen)
+            throws LastErrorException;
+
+    public static native int read(int fd, byte[] buffer, long size)
+            throws LastErrorException;
+
+    public static native int send(int fd, byte[] buffer, int count, int flags)
+            throws LastErrorException;
+
+    public static native int close(int fd) throws LastErrorException;
+
+    public static native String strerror(int errno);
+
+    private static String formatError(LastErrorException lee) {
+        try {
+            return strerror(lee.getErrorCode());
+        } catch (Throwable t) {
+            return lee.getMessage();
+        }
+    }
+
+    @Override
+    public boolean isConnected() {
+        return connected;
+    }
+
+    @Override
+    public void close() throws IOException {
+        if (!closeLock.getAndSet(true)) {
+            try {
+                close(fd);
+            } catch (LastErrorException lee) {
+                throw new IOException("native close() failed : " + formatError(lee));
+            }
+            connected = false;
+        }
+    }
+
+    @Override
+    public void connect(SocketAddress endpoint) throws IOException {
+        connect(endpoint, 0);
+    }
+
+    public void connect(SocketAddress endpoint, int timeout) throws IOException {
+        try {
+            int ret = connect(fd, sockaddr, sockaddr.size());
+            if (ret != 0) {
+                throw new IOException(strerror(Native.getLastError()));
+            }
+            connected = true;
+        } catch (LastErrorException lee) {
+            throw new IOException("native connect() failed : " + formatError(lee));
+        }
+        is = new UnixSocketInputStream();
+        os = new UnixSocketOutputStream();
+    }
+
+    public InputStream getInputStream() {
+        return is;
+    }
+
+    public OutputStream getOutputStream() {
+        return os;
+    }
+
+    public void setTcpNoDelay(boolean b) {
+        // do nothing
+    }
+
+    public void setKeepAlive(boolean b) {
+        // do nothing
+    }
+
+    public void setReceiveBufferSize(int size) {
+        // do nothing
+    }
+
+    public void setSendBufferSize(int size) {
+        // do nothing
+    }
+
+    public void setSoLinger(boolean b, int i) {
+        // do nothing
+    }
+
+    public void setSoTimeout(int timeout) {
+    }
+
+    public void shutdownInput() {
+        // do nothing
+    }
+
+    public void shutdownOutput() {
+        // do nothing
+    }
+
+    public static class SockAddr extends Structure {
+
+        @SuppressWarnings("checkstyle:membername")
+        public short sun_family;
+        @SuppressWarnings("checkstyle:membername")
+        public byte[] sun_path;
+
+        /**
+         * Contructor.
+         *
+         * @param sunPath path
+         */
+        SockAddr(String sunPath) {
+            sun_family = AF_UNIX;
+            byte[] arr = sunPath.getBytes();
+            sun_path = new byte[arr.length + 1];
+            System.arraycopy(arr, 0, sun_path, 0, Math.min(sun_path.length - 1, arr.length));
+            allocateMemory();
+        }
+
+        @Override
+        protected java.util.List<String> getFieldOrder() {
+            return Arrays.asList("sun_family", "sun_path");
+        }
+    }
+
+    class UnixSocketInputStream extends InputStream {
+
+        @Override
+        public int read(byte[] bytesEntry, int off, int len) throws IOException {
+            try {
+                if (off > 0) {
+                    int bytes = 0;
+                    int remainingLength = len;
+                    int size;
+                    byte[] data = new byte[(len < 10240) ? len : 10240];
+                    do {
+                        if (!isConnected()) {
+                            return -1;
+                        }
+                        size = UnixDomainSocket.read(fd, data, (remainingLength < 10240) ? remainingLength : 10240);
+                        if (size <= 0) {
+                            return -1;
+                        }
+                        System.arraycopy(data, 0, bytesEntry, off, size);
+                        bytes += size;
+                        off += size;
+                        remainingLength -= size;
+                    } while ((remainingLength > 0) && (size > 0));
+                    return bytes;
+                } else {
+                    if (!isConnected()) {
+                        return -1;
+                    }
+                    int size = UnixDomainSocket.read(fd, bytesEntry, len);
+                    if (size <= 0) {
+                        return -1;
+                    }
+                    return size;
+                }
+            } catch (LastErrorException lee) {
+                throw new IOException("native read() failed : " + formatError(lee));
+            }
+        }
+
+        @Override
+        public int read() throws IOException {
+            byte[] bytes = new byte[1];
+            int bytesRead = read(bytes);
+            if (bytesRead == 0) {
+                return -1;
+            }
+            return bytes[0] & 0xff;
+        }
+
+        @Override
+        public int read(byte[] bytes) throws IOException {
+            if (!isConnected()) {
+                return -1;
+            }
+            return read(bytes, 0, bytes.length);
+        }
+    }
+
+    class UnixSocketOutputStream extends OutputStream {
+
+        @Override
+        public void write(byte[] bytesEntry, int off, int len) throws IOException {
+            int bytes;
+            try {
+                if (off > 0) {
+                    int size;
+                    int remainingLength = len;
+                    byte[] data = new byte[(len < 10240) ? len : 10240];
+                    do {
+                        size = (remainingLength < 10240) ? remainingLength : 10240;
+                        System.arraycopy(bytesEntry, off, data, 0, size);
+                        if (!isConnected()) {
+                            return;
+                        }
+                        bytes = UnixDomainSocket.send(fd, data, size, 0);
+                        if (bytes > 0) {
+                            off += bytes;
+                            remainingLength -= bytes;
+                        }
+                    } while ((remainingLength > 0) && (bytes > 0));
+                } else {
+                    if (!isConnected()) {
+                        return;
+                    }
+                    bytes = UnixDomainSocket.send(fd, bytesEntry, len, 0);
+                }
+
+                if (bytes != len) {
+                    throw new IOException("can't write " + len + "bytes");
+                }
+            } catch (LastErrorException lee) {
+                throw new IOException("native write() failed : " + formatError(lee));
+            }
+        }
+
+        @Override
+        public void write(int value) throws IOException {
+            write(new byte[] {(byte) value});
+        }
+
+        @Override
+        public void write(byte[] bytes) throws IOException {
+            write(bytes, 0, bytes.length);
+        }
+    }
+}
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index beaf5d4c9..6952d7751 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -45,6 +45,12 @@
 			<version>${project.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java-transport-httpclient5</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-core</artifactId>
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
index 215a552b6..ecb66d089 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
@@ -1,6 +1,11 @@
 package com.github.dockerjava.cmd;
 
+import com.github.dockerjava.api.command.DelegatingDockerCmdExecFactory;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
+import com.github.dockerjava.core.DefaultDockerCmdExecFactory;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.DockerClientConfigAware;
+import com.github.dockerjava.httpclient5.ApacheDockerHttpClient;
 import com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory;
 import com.github.dockerjava.junit.DockerRule;
 import com.github.dockerjava.junit.category.Integration;
@@ -37,6 +42,32 @@ public DockerCmdExecFactory createExecFactory() {
             public DockerCmdExecFactory createExecFactory() {
                 return new OkHttpDockerCmdExecFactory().withConnectTimeout(30 * 1000);
             }
+        },
+        HTTPCLIENT5(true) {
+            @Override
+            public DockerCmdExecFactory createExecFactory() {
+                class FakeFactory extends DelegatingDockerCmdExecFactory implements DockerClientConfigAware {
+
+                    private DefaultDockerCmdExecFactory dockerCmdExecFactory;
+
+                    @Override
+                    public final DockerCmdExecFactory getDockerCmdExecFactory() {
+                        return dockerCmdExecFactory;
+                    }
+
+                    @Override
+                    public void init(DockerClientConfig dockerClientConfig) {
+                        dockerCmdExecFactory = new DefaultDockerCmdExecFactory(
+                            new ApacheDockerHttpClient.Factory()
+                                .dockerClientConfig(dockerClientConfig)
+                                .build(),
+                            dockerClientConfig.getObjectMapper()
+                        );
+                        dockerCmdExecFactory.init(dockerClientConfig);
+                    }
+                }
+                return new FakeFactory();
+            }
         };
 
         private final String subnetPrefix;
diff --git a/pom.xml b/pom.xml
index 2d3fb78b2..76a0c1bd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,7 @@
 		<module>docker-java-transport-netty</module>
 		<module>docker-java-transport-jersey</module>
 		<module>docker-java-transport-okhttp</module>
+		<module>docker-java-transport-httpclient5</module>
 		<module>docker-java</module>
 	</modules>
 

From 367411777deb761971f2448597d071bc21f58896 Mon Sep 17 00:00:00 2001
From: silme <frasigal@gmail.com>
Date: Fri, 22 May 2020 15:10:41 +0300
Subject: [PATCH 1006/1272] Add Lombok's EHC/ToString to LogConfig (#1374)

Fixes #1373
---
 .../github/dockerjava/api/model/LogConfig.java    |  4 ++++
 .../dockerjava/api/model/HostConfigTest.java      | 15 +++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/api/model/HostConfigTest.java

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java
index c2cd0efc8..2dd7c54fa 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java
@@ -4,6 +4,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -18,6 +20,8 @@
  * docker will ignore them. In most cases setting the config option to null will suffice. Consult the docker remote API for a more detailed
  * and up-to-date explanation of the available types and their options.
  */
+@EqualsAndHashCode
+@ToString
 public class LogConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/HostConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/HostConfigTest.java
new file mode 100644
index 000000000..d69c31ba9
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/HostConfigTest.java
@@ -0,0 +1,15 @@
+package com.github.dockerjava.api.model;
+
+import org.junit.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+public class HostConfigTest {
+
+    @Test
+    public void testNewObjectsEqual() throws Exception {
+        assertThat(HostConfig.newHostConfig(),
+                equalTo(HostConfig.newHostConfig()));
+    }
+}

From a09fefe832fc87df70e80b74fa0891fc3aed246d Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sat, 23 May 2020 19:39:01 +0200
Subject: [PATCH 1007/1272] Port Travis to GHA (#1396)

- removes Travis config
- adds "Docker 18.x" and "Docker over TCP" to GHA Build Matrix
- adds ciMate
- Fixes Swarm tests
---
 {.travis => .ci}/get-docker-com.sh            |   0
 .ci/setup_docker.sh                           |  39 ++++++
 .editorconfig                                 |   5 +
 .github/workflows/ci.yml                      |  45 +++++--
 .travis.yml                                   |  39 ------
 .travis/travis-before-install.sh              | 102 ----------------
 .../api/command/PullImageResultCallback.java  |   6 +-
 .../api/exception/DockerException.java        |   5 +-
 .../core/DefaultDockerClientConfig.java       |  12 +-
 docker-java/pom.xml                           |   6 +-
 .../github/dockerjava/cmd/PushImageCmdIT.java |   6 +-
 .../cmd/swarm/CreateSecretCmdExecIT.java      |   7 --
 .../cmd/swarm/CreateServiceCmdExecIT.java     |  31 +----
 .../cmd/swarm/InitializeSwarmCmdExecIT.java   |  13 +-
 .../cmd/swarm/JoinSwarmCmdExecIT.java         |  26 ++--
 .../cmd/swarm/LeaveSwarmCmdExecIT.java        |  14 ++-
 .../cmd/swarm/ListSecretCmdExecIT.java        |   6 -
 .../cmd/swarm/ListServicesCmdExecIT.java      |  15 +--
 .../cmd/swarm/ListTasksCmdExecIT.java         |  29 +++--
 .../cmd/swarm/LogSwarmObjectIT.java           |  34 +++---
 .../cmd/swarm/MultiNodeSwarmCmdIT.java        | 115 ++++++++++++++++++
 .../dockerjava/cmd/swarm/SwarmCmdIT.java      | 108 ++--------------
 .../cmd/swarm/UpdateSwarmCmdExecIT.java       |  31 ++---
 .../cmd/swarm/UpdateSwarmNodeIT.java          |  10 +-
 .../cmd/swarm/UpdateSwarmServiceIT.java       |  14 +--
 .../core/DefaultDockerClientConfigTest.java   |  13 ++
 .../test/serdes/JSONTestHelper.java           |  11 +-
 27 files changed, 338 insertions(+), 404 deletions(-)
 rename {.travis => .ci}/get-docker-com.sh (100%)
 create mode 100755 .ci/setup_docker.sh
 delete mode 100644 .travis.yml
 delete mode 100755 .travis/travis-before-install.sh
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java

diff --git a/.travis/get-docker-com.sh b/.ci/get-docker-com.sh
similarity index 100%
rename from .travis/get-docker-com.sh
rename to .ci/get-docker-com.sh
diff --git a/.ci/setup_docker.sh b/.ci/setup_docker.sh
new file mode 100755
index 000000000..fd71ffd48
--- /dev/null
+++ b/.ci/setup_docker.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+set -exu
+
+DOCKER_VERSION="${DOCKER_VERSION:-}"
+DOCKER_HOST="${DOCKER_HOST:-}"
+
+if [[ -n $DOCKER_VERSION ]]; then
+    sudo -E apt-get -q -y --purge remove docker-engine docker-ce
+
+    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+    sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+    sudo apt-get update
+    sudo apt-cache madison docker-ce
+    sudo apt-get install "docker-ce=$DOCKER_VERSION"
+fi
+
+if [[ -n $DOCKER_HOST ]]; then
+    sudo mkdir -p /etc/systemd/system/docker.service.d/
+
+    echo "
+[Service]
+ExecStart=
+ExecStart=/usr/bin/dockerd -H $DOCKER_HOST
+    " | sudo tee -a /etc/systemd/system/docker.service.d/override.conf
+
+    sudo systemctl daemon-reload
+    sudo service docker restart || sudo journalctl -xe
+    sudo service docker status
+fi
+
+while (! docker ps ); do
+  echo "Waiting for Docker to launch..."
+  sleep 1
+done
+docker version
+docker info
+
+docker run --rm hello-world
diff --git a/.editorconfig b/.editorconfig
index 137af4fbf..5bbffc51f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -16,3 +16,8 @@ ij_java_names_count_to_use_import_on_demand = 9999
 [{*.pom,*.xml}]
 indent_style = tab
 ij_xml_attribute_wrap = off
+
+
+[*.{yaml,yml}]
+indent_size = 2
+ij_yaml_keep_indents_on_empty_lines = false
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 72e32d7d9..d07be0d7f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,18 +1,41 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  pull_request: {}
+  push: { branches: [ master ] }
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { name: "default" }
+          - { name: "over TCP", dockerHost: "tcp://127.0.0.1:2375" }
+          - { name: "Docker 18.06.3", dockerVersion: "18.06.3~ce~3-0~ubuntu" }
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up JDK 8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 8
-    - name: Prepare ws
-      run: rm -f "docker-java/src/test/resources/logback.xml" && mv "docker-java/src/test/resources/travis-logback.xml" "docker-java/src/test/resources/logback-test.xml"
-    - name: Build with Maven
-      run: ./mvnw --no-transfer-progress verify
+      - uses: actions/checkout@v1
+      - name: Set up JDK 8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 8
+      - name: Configure Docker
+        env:
+          DOCKER_VERSION: ${{matrix.dockerVersion}}
+          DOCKER_HOST: ${{matrix.dockerHost}}
+        run: .ci/setup_docker.sh
+      - name: Build with Maven
+        env:
+          DOCKER_HOST: ${{matrix.dockerHost}}
+        run: ./mvnw --no-transfer-progress verify
+      - name: Aggregate test reports with ciMate
+        if: always()
+        env:
+          CIMATE_PROJECT_ID: lodr9d83
+          CIMATE_CI_KEY: "CI / ${{matrix.name}}"
+        run: |
+          wget -q https://get.cimate.io/release/linux/cimate
+          chmod +x cimate
+          ./cimate "**/TEST-*.xml"
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index b671e87f6..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-sudo: required
-dist: xenial
-language: java
-
-services:
-  - docker
-
-jdk:
- - openjdk8
-
-install: true
-
-env:
-  global:
-    - DOCKER_TLS_VERIFY=""
-
-  matrix:
-    - DEPLOY=true
-
-    # TCP transport
-    - DOCKER_HOST="tcp://127.0.0.1:2375"
-
-    # Older versions of Docker
-    - DOCKER_VERSION="17.06.2~ce-0~ubuntu"
-    - DOCKER_VERSION="18.06.3~ce~3-0~ubuntu"
-
-    # Swarm
-    - SWARM_VERSION="1.2.8"
-
-cache:
-  directories:
-  - $HOME/.travis_cache
-  - $HOME/.m2 # install will pollute it
-
-before_install:
-  - ./.travis/travis-before-install.sh
-
-script:
-  - mvn verify
diff --git a/.travis/travis-before-install.sh b/.travis/travis-before-install.sh
deleted file mode 100755
index 592b3fcdf..000000000
--- a/.travis/travis-before-install.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/env bash
-
-set -exu
-
-SWARM_VERSION="${SWARM_VERSION:-}"
-DOCKER_VERSION="${DOCKER_VERSION:-}"
-DOCKER_HOST="${DOCKER_HOST:-}"
-
-export HOST_PORT="2375"
-
-rm -f "docker-java/src/test/resources/logback.xml"
-mv "docker-java/src/test/resources/travis-logback.xml" "docker-java/src/test/resources/logback-test.xml"
-
-if [[ -n $DOCKER_VERSION ]]; then
-    sudo -E apt-get -q -y --purge remove docker-engine docker-ce
-
-    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-    sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-    sudo apt-get update
-    sudo apt-cache madison docker-ce
-    sudo apt-get install "docker-ce=$DOCKER_VERSION"
-fi
-
-if [[ -n $DOCKER_HOST ]]; then
-    sudo mkdir -p /etc/systemd/system/docker.service.d/
-
-    echo "
-[Service]
-ExecStart=
-ExecStart=/usr/bin/dockerd -H unix:///var/run/docker.sock -H tcp://0.0.0.0:${HOST_PORT}
-    " | sudo tee -a /etc/systemd/system/docker.service.d/override.conf
-
-    sudo systemctl daemon-reload
-    sudo service docker restart || sudo journalctl -xe
-    sudo service docker status
-fi
-
-while (! docker ps ); do
-  # Docker takes a few seconds to initialize
-  echo "Waiting for Docker to launch..."
-  sleep 1
-done
-
-docker version
-docker info
-
-set +u
-
-cat <<EOF > "${HOME}/.docker-java.properties"
-registry.username=${registry_username}
-registry.password=${registry_password}
-registry.email=${registry_email}
-registry.url=https://index.docker.io/v1/
-
-EOF
-
-if [[ -n $SWARM_VERSION ]]; then
-    export SWARM_PORT="2377"
-    export HOST_IP="$(ip a show dev eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)"
-
-    docker pull swarm
-
-    docker run \
-        -d \
-        -p ${SWARM_PORT}:2375 \
-        --name=swarm_manager \
-        "swarm:${SWARM_VERSION}" \
-        manage --engine-refresh-min-interval "3s" --engine-refresh-max-interval "6s" "nodes://${HOST_IP}:${HOST_PORT}"
-
-    # join engine to swarm
-    docker run \
-        -d \
-        "--name=swarm_join" \
-        "swarm:${SWARM_VERSION}" \
-        join --advertise="${HOST_IP}:${HOST_PORT}" --delay="0s" --heartbeat "5s" "nodes://${HOST_IP}:${HOST_PORT}"
-
-    docker run --rm \
-        "swarm:${SWARM_VERSION}" \
-        list "nodes://${HOST_IP}:${HOST_PORT}"
-
-    docker ps -a
-
-    sleep 30
-
-    docker logs swarm_join
-    docker logs swarm_manager
-
-    # switch to swarm connection
-    export DOCKER_HOST="tcp://127.0.0.1:${SWARM_PORT}"
-
-    docker version
-    docker info
-
-    NODES=$(docker info | grep "Nodes:" | awk '{ print $2 }')
-    if [[ $NODES -eq "0" ]]; then
-        echo "Swarm didn't connect"
-        exit 1
-    fi
-
-    # test via swarm
-    docker pull busybox
-fi
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java
index 2c2b48b24..a4e9e9f9b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java
@@ -90,8 +90,10 @@ private void checkDockerSwarmPullSuccessful() {
 
     private void checkDockerClientPullSuccessful() {
         if (latestItem == null) {
-            throw new DockerClientException("Could not pull image");
-        } else if (!latestItem.isPullSuccessIndicated()) {
+            return;
+        }
+
+        if (!latestItem.isPullSuccessIndicated()) {
             throw new DockerClientException("Could not pull image: " + messageFromPullResult(latestItem));
         }
     }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/exception/DockerException.java b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/DockerException.java
index 5b511ff96..69baf047e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/exception/DockerException.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/DockerException.java
@@ -13,12 +13,13 @@ public class DockerException extends RuntimeException {
     private int httpStatus = 0;
 
     public DockerException(String message, int httpStatus) {
-        super(message);
+        super(String.format("Status %d: %s", httpStatus, message));
         this.httpStatus = httpStatus;
     }
 
     public DockerException(String message, int httpStatus, Throwable cause) {
-        super(message, cause);
+        super(String.format("Status %d: %s", httpStatus, message), cause);
+        this.httpStatus = httpStatus;
     }
 
     public int getHttpStatus() {
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index be00cd7ea..274363fac 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -56,7 +56,7 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf
 
     private static final Set<String> CONFIG_KEYS = new HashSet<>();
 
-    private static final Properties DEFAULT_PROPERTIES = new Properties();
+    static final Properties DEFAULT_PROPERTIES = new Properties();
 
     static {
         CONFIG_KEYS.add(DOCKER_HOST);
@@ -168,13 +168,19 @@ private static Properties overrideDockerPropertiesWithEnv(Properties properties,
 
         // special case which is a sensible default
         if (env.containsKey(DOCKER_HOST)) {
-            overriddenProperties.setProperty(DOCKER_HOST, env.get(DOCKER_HOST));
+            String value = env.get(DOCKER_HOST);
+            if (value != null && value.trim().length() != 0) {
+                overriddenProperties.setProperty(DOCKER_HOST, value);
+            }
         }
 
         for (Map.Entry<String, String> envEntry : env.entrySet()) {
             String envKey = envEntry.getKey();
             if (CONFIG_KEYS.contains(envKey)) {
-                overriddenProperties.setProperty(envKey, envEntry.getValue());
+                String value = envEntry.getValue();
+                if (value != null && value.trim().length() != 0) {
+                    overriddenProperties.setProperty(envKey, value);
+                }
             }
         }
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 6952d7751..b9965ac46 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -111,6 +111,11 @@
 			<version>4.13</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.awaitility</groupId>
+			<artifactId>awaitility</artifactId>
+			<version>4.0.1</version>
+		</dependency>
 	</dependencies>
 
 
@@ -142,7 +147,6 @@
 					<trimStackTrace>false</trimStackTrace>
 					<rerunFailingTestsCount>5</rerunFailingTestsCount>
 					<groups>com.github.dockerjava.junit.category.Integration</groups>
-					<excludedGroups>com.github.dockerjava.junit.category.AuthIntegration,com.github.dockerjava.junit.category.SwarmModeIntegration</excludedGroups>
 				</configuration>
 			</plugin>
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
index 438748cc0..e05ca151e 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
@@ -14,6 +14,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 import static com.github.dockerjava.utils.TestUtils.getVersion;
@@ -30,15 +31,12 @@ public class PushImageCmdIT extends CmdIT {
     @ClassRule
     public static PrivateRegistryRule REGISTRY = new PrivateRegistryRule();
 
-    private String username;
-
     @Rule
     public ExpectedException exception = ExpectedException.none();
     private AuthConfig authConfig;
 
     @Before
     public void beforeTest() throws Exception {
-        username = dockerRule.getClient().authConfig().getUsername();
         authConfig = REGISTRY.getAuthConfig();
     }
 
@@ -81,7 +79,7 @@ public void pushNonExistentImage() throws Exception {
             exception.expect(NotFoundException.class);
         }
 
-        dockerRule.getClient().pushImageCmd(username + "/xxx")
+        dockerRule.getClient().pushImageCmd("local/" + UUID.randomUUID().toString().replace("-", ""))
                 .start()
                 .awaitCompletion(30, TimeUnit.SECONDS); // exclude infinite await sleep
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
index 7fdfeb96e..687bbb243 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
@@ -4,7 +4,6 @@
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.Secret;
 import com.github.dockerjava.api.model.SecretSpec;
-import com.github.dockerjava.api.model.SwarmSpec;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang.RandomStringUtils;
 import org.hamcrest.collection.IsCollectionWithSize;
@@ -20,15 +19,9 @@
 public class CreateSecretCmdExecIT extends SwarmCmdIT {
 
     public static final Logger LOG = LoggerFactory.getLogger(CreateSecretCmdExecIT.class);
-    private static final String SERVICE_NAME = "theservice";
 
     @Test
     public void testCreateSecret() throws DockerException {
-        dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
-                .withListenAddr("127.0.0.1")
-                .withAdvertiseAddr("127.0.0.1")
-                .exec();
-
         int length = 10;
         boolean useLetters = true;
         boolean useNumbers = false;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
index ca450be02..c797ef4de 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
@@ -15,7 +15,6 @@
 import com.github.dockerjava.api.model.ServiceModeConfig;
 import com.github.dockerjava.api.model.ServiceReplicatedModeOptions;
 import com.github.dockerjava.api.model.ServiceSpec;
-import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.api.model.TaskSpec;
 import com.github.dockerjava.api.model.TmpfsOptions;
 import com.github.dockerjava.junit.PrivateRegistryRule;
@@ -23,6 +22,7 @@
 import com.google.common.collect.Lists;
 import org.junit.Before;
 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -50,18 +50,12 @@ public class CreateServiceCmdExecIT extends SwarmCmdIT {
     private AuthConfig authConfig;
 
     @Before
-    public void beforeTest() throws Exception {
-        super.beforeTest();
+    public final void setUpCreateServiceCmdExecIT() throws Exception {
         authConfig = REGISTRY.getAuthConfig();
     }
 
     @Test
     public void testCreateService() throws DockerException {
-        dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
-                .withListenAddr("127.0.0.1")
-                .withAdvertiseAddr("127.0.0.1")
-                .exec();
-
         dockerRule.getClient().createServiceCmd(new ServiceSpec()
                 .withName(SERVICE_NAME)
                 .withTaskTemplate(new TaskSpec()
@@ -80,11 +74,6 @@ public void testCreateService() throws DockerException {
 
     @Test
     public void testCreateServiceWithNetworks() {
-        dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
-                .withListenAddr("127.0.0.1")
-                .withAdvertiseAddr("127.0.0.1")
-                .exec();
-
         String networkId = dockerRule.getClient().createNetworkCmd().withName("networkname")
                 .withDriver("overlay")
                 .withIpam(new Network.Ipam()
@@ -94,6 +83,7 @@ public void testCreateServiceWithNetworks() {
                 .withName(SERVICE_NAME)
                 .withTaskTemplate(new TaskSpec()
                         .withForceUpdate(0)
+                        .withRuntime("container")
                         .withContainerSpec(new ContainerSpec()
                                 .withImage("busybox"))
                 )
@@ -129,10 +119,6 @@ public void testCreateServiceWithNetworks() {
 
     @Test
     public void testCreateServiceWithTmpfs() {
-        dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
-                .withListenAddr("127.0.0.1")
-                .withAdvertiseAddr("127.0.0.1")
-                .exec();
         Mount tmpMount = new Mount().withTmpfsOptions(new TmpfsOptions().withSizeBytes(600L)).withTarget("/tmp/foo");
 
         dockerRule.getClient().createServiceCmd(new ServiceSpec()
@@ -155,11 +141,6 @@ public void testCreateServiceWithTmpfs() {
 
     @Test
     public void testCreateServiceWithValidAuth() throws DockerException {
-        dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
-                .withListenAddr("127.0.0.1")
-                .withAdvertiseAddr("127.0.0.1")
-                .exec();
-
         dockerRule.getClient().createServiceCmd(new ServiceSpec()
                 .withName(SERVICE_NAME)
                 .withTaskTemplate(new TaskSpec()
@@ -178,12 +159,8 @@ public void testCreateServiceWithValidAuth() throws DockerException {
     }
 
     @Test
+    @Ignore // TODO rework test (does not throw as expected atm)
     public void testCreateServiceWithInvalidAuth() throws DockerException {
-        dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
-                .withListenAddr("127.0.0.1")
-                .withAdvertiseAddr("127.0.0.1")
-                .exec();
-
         AuthConfig invalidAuthConfig = new AuthConfig()
                 .withUsername("testuser")
                 .withPassword("testwrongpassword")
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java
index 503f22645..e17429006 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.cmd.swarm;
 
 import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotAcceptableException;
 import com.github.dockerjava.api.model.Swarm;
 import com.github.dockerjava.api.model.SwarmCAConfig;
 import com.github.dockerjava.api.model.SwarmDispatcherConfig;
@@ -21,10 +20,15 @@ public class InitializeSwarmCmdExecIT extends SwarmCmdIT {
 
     public static final Logger LOG = LoggerFactory.getLogger(InitializeSwarmCmdExecIT.class);
 
+    @Override
+    protected boolean shouldInitializeByDefault() {
+        return false;
+    }
+
     @Test
     public void initializeSwarm() throws DockerException {
         SwarmSpec swarmSpec = new SwarmSpec()
-                .withName("swarm")
+                .withName("default")
                 .withDispatcher(new SwarmDispatcherConfig()
                         .withHeartbeatPeriod(10000000L)
                 ).withOrchestration(new SwarmOrchestration()
@@ -49,10 +53,9 @@ public void initializeSwarm() throws DockerException {
         assertThat(swarm.getSpec(), is(equalTo(swarmSpec)));
     }
 
-    @Test(expected = NotAcceptableException.class)
+    @Test(expected = DockerException.class)
     public void initializingSwarmThrowsWhenAlreadyInSwarm() throws DockerException {
-        SwarmSpec swarmSpec = new SwarmSpec()
-                .withName("swarm");
+        SwarmSpec swarmSpec = new SwarmSpec();
 
         dockerRule.getClient().initializeSwarmCmd(swarmSpec)
                 .withListenAddr("127.0.0.1")
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java
index 383f9e54d..3dd3910dc 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java
@@ -2,13 +2,13 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotAcceptableException;
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.api.model.LocalNodeState;
 import com.github.dockerjava.api.model.Swarm;
 import com.github.dockerjava.api.model.SwarmJoinTokens;
 import com.github.dockerjava.api.model.SwarmSpec;
 import com.google.common.collect.Lists;
+import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,10 +17,20 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 
-public class JoinSwarmCmdExecIT extends SwarmCmdIT {
+public class JoinSwarmCmdExecIT extends MultiNodeSwarmCmdIT {
 
     public static final Logger LOG = LoggerFactory.getLogger(JoinSwarmCmdExecIT.class);
 
+    private DockerClient docker1;
+
+    private DockerClient docker2;
+
+    @Before
+    public void setUp() throws Exception {
+        docker1 = startDockerInDocker();
+        docker2 = startDockerInDocker();
+    }
+
     private SwarmJoinTokens initSwarmOnDocker(DockerClient docker) {
         SwarmSpec swarmSpec = new SwarmSpec();
         docker.initializeSwarmCmd(swarmSpec)
@@ -34,9 +44,6 @@ private SwarmJoinTokens initSwarmOnDocker(DockerClient docker) {
 
     @Test
     public void joinSwarmAsWorker() throws Exception {
-        DockerClient docker1 = startDockerInDocker();
-        DockerClient docker2 = startDockerInDocker();
-
         SwarmJoinTokens tokens = initSwarmOnDocker(docker1);
 
         docker2.joinSwarmCmd()
@@ -52,9 +59,6 @@ public void joinSwarmAsWorker() throws Exception {
 
     @Test
     public void joinSwarmAsManager() throws DockerException, InterruptedException {
-        DockerClient docker1 = startDockerInDocker();
-        DockerClient docker2 = startDockerInDocker();
-
         SwarmJoinTokens tokens = initSwarmOnDocker(docker1);
 
         docker2.joinSwarmCmd()
@@ -68,11 +72,8 @@ public void joinSwarmAsManager() throws DockerException, InterruptedException {
         assertThat(info.getSwarm().getLocalNodeState(), is(equalTo(LocalNodeState.ACTIVE)));
     }
 
-    @Test(expected = NotAcceptableException.class)
+    @Test(expected = DockerException.class)
     public void joinSwarmIfAlreadyInSwarm() throws Exception {
-        DockerClient docker1 = startDockerInDocker();
-        DockerClient docker2 = startDockerInDocker();
-
         SwarmJoinTokens tokens = initSwarmOnDocker(docker1);
 
         initSwarmOnDocker(docker2);
@@ -82,5 +83,4 @@ public void joinSwarmIfAlreadyInSwarm() throws Exception {
                 .withJoinToken(tokens.getWorker())
                 .exec();
     }
-
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java
index 4f093ca94..41e3023d1 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.cmd.swarm;
 
 import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotAcceptableException;
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.api.model.LocalNodeState;
 import com.github.dockerjava.api.model.SwarmSpec;
@@ -15,15 +14,18 @@
 public class LeaveSwarmCmdExecIT extends SwarmCmdIT {
 
     public static final Logger LOG = LoggerFactory.getLogger(LeaveSwarmCmdExecIT.class);
-    
+
+    @Override
+    protected boolean shouldInitializeByDefault() {
+        return false;
+    }
+
     @Test
     public void leaveSwarmAsMaster() throws DockerException {
-        SwarmSpec swarmSpec = new SwarmSpec().withName("firstSpec");
-        dockerRule.getClient().initializeSwarmCmd(swarmSpec)
+        dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
                 .withListenAddr("127.0.0.1")
                 .withAdvertiseAddr("127.0.0.1")
                 .exec();
-        LOG.info("Initialized swarm: {}", swarmSpec.toString());
 
         Info info = dockerRule.getClient().infoCmd().exec();
         LOG.info("Inspected docker: {}", info.toString());
@@ -42,7 +44,7 @@ public void leaveSwarmAsMaster() throws DockerException {
 
     }
 
-    @Test(expected = NotAcceptableException.class)
+    @Test(expected = DockerException.class)
     public void leavingSwarmThrowsWhenNotInSwarm() throws DockerException {
         dockerRule.getClient().leaveSwarmCmd().exec();
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java
index bb779e7f3..4b6f26f9c 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java
@@ -4,7 +4,6 @@
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.Secret;
 import com.github.dockerjava.api.model.SecretSpec;
-import com.github.dockerjava.api.model.SwarmSpec;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang.RandomStringUtils;
 import org.junit.Test;
@@ -23,11 +22,6 @@ public class ListSecretCmdExecIT extends SwarmCmdIT {
 
     @Test
     public void tesListSecret() throws DockerException {
-        dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
-                .withListenAddr("127.0.0.1")
-                .withAdvertiseAddr("127.0.0.1")
-                .exec();
-
         int length = 10;
         boolean useLetters = true;
         boolean useNumbers = false;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
index 27df40001..27f703037 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
@@ -1,14 +1,11 @@
 package com.github.dockerjava.cmd.swarm;
 
-import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.CreateServiceResponse;
-import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.ContainerSpec;
 import com.github.dockerjava.api.model.Service;
 import com.github.dockerjava.api.model.ServiceModeConfig;
 import com.github.dockerjava.api.model.ServiceReplicatedModeOptions;
 import com.github.dockerjava.api.model.ServiceSpec;
-import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.api.model.TaskSpec;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -30,10 +27,8 @@ public class ListServicesCmdExecIT extends SwarmCmdIT {
 
     @Test
     public void testListServices() throws Exception {
-        DockerClient docker1 = startDockerInDocker();
-        docker1.initializeSwarmCmd(new SwarmSpec()).exec();
         Map<String, String> serviceLabels = Collections.singletonMap(LABEL_KEY, LABEL_VALUE);
-        CreateServiceResponse response = docker1.createServiceCmd(new ServiceSpec()
+        CreateServiceResponse response = dockerRule.getClient().createServiceCmd(new ServiceSpec()
                 .withLabels(serviceLabels)
                 .withName(SERVICE_NAME)
                 .withMode(new ServiceModeConfig().withReplicated(
@@ -46,14 +41,14 @@ public void testListServices() throws Exception {
                 .exec();
         String serviceId = response.getId();
         //filtering with service id
-        List<Service> services = docker1.listServicesCmd().withIdFilter(Collections.singletonList(serviceId)).exec();
+        List<Service> services = dockerRule.getClient().listServicesCmd().withIdFilter(Collections.singletonList(serviceId)).exec();
         assertThat(services, hasSize(1));
         //filtering with service name
-        services = docker1.listServicesCmd().withNameFilter(Collections.singletonList(SERVICE_NAME)).exec();
+        services = dockerRule.getClient().listServicesCmd().withNameFilter(Collections.singletonList(SERVICE_NAME)).exec();
         assertThat(services, hasSize(1));
         //filter labels
-        services = docker1.listServicesCmd().withLabelFilter(serviceLabels).exec();
+        services = dockerRule.getClient().listServicesCmd().withLabelFilter(serviceLabels).exec();
         assertThat(services, hasSize(1));
-        docker1.removeServiceCmd(SERVICE_NAME).exec();
+        dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec();
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java
index 228ccbac8..b2d5fe588 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java
@@ -6,10 +6,10 @@
 import com.github.dockerjava.api.model.ServiceModeConfig;
 import com.github.dockerjava.api.model.ServiceReplicatedModeOptions;
 import com.github.dockerjava.api.model.ServiceSpec;
-import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.api.model.Task;
 import com.github.dockerjava.api.model.TaskSpec;
 import com.github.dockerjava.api.model.TaskState;
+import org.junit.After;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,24 +17,27 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static org.awaitility.Awaitility.await;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 
 public class ListTasksCmdExecIT extends SwarmCmdIT {
     public static final Logger LOG = LoggerFactory.getLogger(CreateServiceCmdExecIT.class);
-    private static final String SERVICE_NAME = "inspect_task";
+    private final String SERVICE_NAME = "inspect_task";
     private static final String TASK_LABEL_KEY = "com.github.dockerjava.usage";
     private static final String TASK_LABEL_VALUE = "test";
 
+    @After
+    public void tearDown() {
+        dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec();
+    }
+
     @Test
     public void testListTasks() throws DockerException {
-        dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
-                .withListenAddr("127.0.0.1")
-                .withAdvertiseAddr("127.0.0.1")
-                .exec();
         Map<String, String> taskLabels = Collections.singletonMap(TASK_LABEL_KEY, TASK_LABEL_VALUE);
         CreateServiceResponse response = dockerRule.getClient().createServiceCmd(new ServiceSpec()
                 .withName(SERVICE_NAME)
@@ -50,15 +53,22 @@ public void testListTasks() throws DockerException {
         //filtering with service id
         List<Task> tasks = dockerRule.getClient().listTasksCmd().withServiceFilter(serviceId).exec();
         assertThat(tasks, hasSize(2));
-        String taskId = tasks.get(0).getId(), secondId = tasks.get(1).getId();
+        String taskId = tasks.get(0).getId();
+        String secondTaskId = tasks.get(1).getId();
         //filtering with unique id
         tasks = dockerRule.getClient().listTasksCmd().withIdFilter(taskId).exec();
         assertThat(tasks, hasSize(1));
         assertThat(tasks.get(0).getId(), is(taskId));
         //filtering with multiple id
-        tasks = dockerRule.getClient().listTasksCmd().withIdFilter(secondId, taskId).exec();
+        tasks = dockerRule.getClient().listTasksCmd().withIdFilter(secondTaskId, taskId).exec();
+        assertThat(tasks, hasSize(2));
         //filtering node id
-        String nodeId = tasks.get(0).getNodeId();
+        // Wait for node assignment
+        String nodeId = await().until(() -> {
+            return dockerRule.getClient().listTasksCmd().withIdFilter(secondTaskId).exec()
+                .get(0)
+                .getNodeId();
+        }, Objects::nonNull);
         tasks = dockerRule.getClient().listTasksCmd().withNodeFilter(nodeId).exec();
         assertThat(tasks.get(0).getNodeId(), is(nodeId));
         //filtering with state
@@ -69,6 +79,5 @@ public void testListTasks() throws DockerException {
         assertThat(tasks, hasSize(2));
         tasks = dockerRule.getClient().listTasksCmd().withLabelFilter(TASK_LABEL_KEY + "=" + TASK_LABEL_VALUE).exec();
         assertThat(tasks, hasSize(2));
-        dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec();
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java
index 9a3aa3768..985d4967c 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.cmd.swarm;
 
-import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.LogSwarmObjectCmd;
 import com.github.dockerjava.api.model.ContainerSpec;
 import com.github.dockerjava.api.model.ServiceModeConfig;
@@ -8,7 +7,6 @@
 import com.github.dockerjava.api.model.ServiceRestartCondition;
 import com.github.dockerjava.api.model.ServiceRestartPolicy;
 import com.github.dockerjava.api.model.ServiceSpec;
-import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.api.model.Task;
 import com.github.dockerjava.api.model.TaskSpec;
 import com.github.dockerjava.api.model.TaskState;
@@ -22,15 +20,13 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.core.Is.is;
-import static org.mockito.Matchers.contains;
 
 public class LogSwarmObjectIT extends SwarmCmdIT {
     @Test
     public void testLogsCmd() throws InterruptedException, IOException {
         String snippet = "hello world";
-        DockerClient docker1 = startDockerInDocker();
-        docker1.initializeSwarmCmd(new SwarmSpec()).exec();
         TaskSpec taskSpec = new TaskSpec().withContainerSpec(
                 new ContainerSpec().withImage("busybox").withCommand(Arrays.asList("echo", snippet)))
                 .withRestartPolicy(new ServiceRestartPolicy().withCondition(ServiceRestartCondition.NONE));
@@ -38,12 +34,12 @@ public void testLogsCmd() throws InterruptedException, IOException {
                 .withMode(new ServiceModeConfig().withReplicated(new ServiceReplicatedModeOptions().withReplicas(1)))
                 .withTaskTemplate(taskSpec)
                 .withName("log-worker");
-        String serviceId = docker1.createServiceCmd(serviceSpec).exec().getId();
+        String serviceId = dockerRule.getClient().createServiceCmd(serviceSpec).exec().getId();
         int since = (int) System.currentTimeMillis() / 1000;
         //wait the service to end
         List<Task> tasks = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
-            tasks = docker1.listTasksCmd().withServiceFilter(serviceId).withStateFilter(TaskState.SHUTDOWN).exec();
+            tasks = dockerRule.getClient().listTasksCmd().withServiceFilter(serviceId).withStateFilter(TaskState.SHUTDOWN).exec();
             if (tasks.size() == 1) {
                 break;
             } else {
@@ -53,23 +49,23 @@ public void testLogsCmd() throws InterruptedException, IOException {
         assertThat(tasks.size(), is(1));
         String taskId = tasks.get(0).getId();
         //check service log
-        validateLog(docker1.logServiceCmd(serviceId).withStdout(true), snippet);
+        validateLog(dockerRule.getClient().logServiceCmd(serviceId).withStdout(true), snippet);
         //check task log
-        validateLog(docker1.logTaskCmd(taskId).withStdout(true), snippet);
+        validateLog(dockerRule.getClient().logTaskCmd(taskId).withStdout(true), snippet);
         //check details/context
-        validateLog(docker1.logServiceCmd(serviceId).withStdout(true).withDetails(true), "com.docker.swarm.service.id=" + serviceId);
-        validateLog(docker1.logTaskCmd(taskId).withStdout(true).withDetails(true), "com.docker.swarm.service.id=" + serviceId);
+        // FIXME
+        // validateLog(docker1.logServiceCmd(serviceId).withStdout(true).withDetails(true), "com.docker.swarm.service.id=" + serviceId);
+        // validateLog(docker1.logTaskCmd(taskId).withStdout(true).withDetails(true), "com.docker.swarm.service.id=" + serviceId);
         //check since
-        validateLog(docker1.logServiceCmd(serviceId).withStdout(true).withSince(since), snippet);
-        validateLog(docker1.logTaskCmd(taskId).withStdout(true).withSince(since), snippet);
-        docker1.removeServiceCmd(serviceId).exec();
+        validateLog(dockerRule.getClient().logServiceCmd(serviceId).withStdout(true).withSince(since), snippet);
+        validateLog(dockerRule.getClient().logTaskCmd(taskId).withStdout(true).withSince(since), snippet);
+        dockerRule.getClient().removeServiceCmd(serviceId).exec();
     }
 
     private void validateLog(LogSwarmObjectCmd logCmd, String messsage) throws InterruptedException, IOException {
-        LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
-        logCmd.exec(loggingCallback);
-        loggingCallback.awaitCompletion(5, TimeUnit.SECONDS);
-        assertThat(loggingCallback.toString(), is(contains(messsage)));
-        loggingCallback.close();
+        try (LogContainerTestCallback loggingCallback = logCmd.exec(new LogContainerTestCallback(true))) {
+            loggingCallback.awaitCompletion(5, TimeUnit.SECONDS);
+            assertThat(loggingCallback.toString(), containsString(messsage));
+        }
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java
new file mode 100644
index 000000000..d66f50895
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java
@@ -0,0 +1,115 @@
+package com.github.dockerjava.cmd.swarm;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.exception.ConflictException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.PortBinding;
+import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.cmd.CmdIT;
+import com.github.dockerjava.core.DefaultDockerClientConfig;
+import com.github.dockerjava.core.DockerClientBuilder;
+import com.github.dockerjava.junit.category.Integration;
+import com.github.dockerjava.junit.category.SwarmModeIntegration;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.experimental.categories.Category;
+
+import static com.github.dockerjava.api.model.HostConfig.newHostConfig;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24;
+import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
+import static org.junit.Assume.assumeThat;
+
+@Category({SwarmModeIntegration.class, Integration.class})
+public abstract class MultiNodeSwarmCmdIT extends CmdIT {
+
+    private static final int PORT_START = 2378;
+
+    private static final String DOCKER_IN_DOCKER_IMAGE_REPOSITORY = "docker";
+
+    private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "17.12-dind";
+
+    private static final String DOCKER_IN_DOCKER_CONTAINER_PREFIX = "docker";
+
+    private static final String NETWORK_NAME = "dind-network";
+
+    private int numberOfDockersInDocker = 0;
+
+    @Before
+    public void setUp() throws Exception {
+        assumeThat(dockerRule, isGreaterOrEqual(VERSION_1_24));
+    }
+
+    @After
+    public final void tearDownMultiNodeSwarmCmdIT() {
+        for (int i = 1; i <= numberOfDockersInDocker; i++) {
+            try {
+                dockerRule.getClient().removeContainerCmd(DOCKER_IN_DOCKER_CONTAINER_PREFIX + i).withForce(true).exec();
+            } catch (NotFoundException e) {
+                // container does not exist
+            }
+        }
+
+        try {
+            dockerRule.getClient().removeNetworkCmd(NETWORK_NAME).exec();
+        } catch (NotFoundException e) {
+            // network does not exist
+        }
+    }
+
+    protected DockerClient startDockerInDocker() throws InterruptedException {
+        numberOfDockersInDocker++;
+        String name = DOCKER_IN_DOCKER_CONTAINER_PREFIX + numberOfDockersInDocker;
+
+        // Delete if already exists
+        try {
+            dockerRule.getClient().removeContainerCmd(name).withForce(true).exec();
+        } catch (NotFoundException e) {
+            // container does not exist
+        }
+
+        // Create network if not already exists
+        try {
+            dockerRule.getClient().inspectNetworkCmd().withNetworkId(NETWORK_NAME).exec();
+        } catch (NotFoundException e) {
+            try {
+                dockerRule.getClient().createNetworkCmd().withName(NETWORK_NAME).exec();
+            } catch (ConflictException e2) {
+                // already exists
+            }
+        }
+
+        dockerRule.getClient().pullImageCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY)
+            .withTag(DOCKER_IN_DOCKER_IMAGE_TAG)
+            .start()
+            .awaitCompletion();
+
+        int port = PORT_START + (numberOfDockersInDocker - 1);
+        CreateContainerResponse response = dockerRule.getClient()
+            .createContainerCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY + ":" + DOCKER_IN_DOCKER_IMAGE_TAG)
+            .withHostConfig(newHostConfig()
+                .withNetworkMode(NETWORK_NAME)
+                .withPortBindings(new PortBinding(
+                    Ports.Binding.bindIpAndPort("127.0.0.1", port),
+                    ExposedPort.tcp(2375)))
+                .withPrivileged(true))
+            .withName(name)
+            .withAliases(name)
+
+            .exec();
+
+        dockerRule.getClient().startContainerCmd(response.getId()).exec();
+
+        return initializeDockerClient(port);
+    }
+
+    private DockerClient initializeDockerClient(int port) {
+        DefaultDockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder()
+            .withRegistryUrl("https://index.docker.io/v1/")
+            .withDockerHost("tcp://localhost:" + port).build();
+        return DockerClientBuilder.getInstance(config)
+            .withDockerCmdExecFactory(getFactoryType().createExecFactory())
+            .build();
+    }
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
index fd6a0c630..7400a9d32 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
@@ -1,125 +1,35 @@
 package com.github.dockerjava.cmd.swarm;
 
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.NotAcceptableException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.model.ExposedPort;
-import com.github.dockerjava.api.model.PortBinding;
-import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.cmd.CmdIT;
-import com.github.dockerjava.core.DefaultDockerClientConfig;
-import com.github.dockerjava.core.DockerClientBuilder;
 import com.github.dockerjava.junit.category.Integration;
 import com.github.dockerjava.junit.category.SwarmModeIntegration;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.experimental.categories.Category;
 
-import static com.github.dockerjava.api.model.HostConfig.newHostConfig;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24;
 import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
 import static org.junit.Assume.assumeThat;
 
 @Category({SwarmModeIntegration.class, Integration.class})
 public abstract class SwarmCmdIT extends CmdIT {
-    protected DockerClient secondDockerClient;
-    private int numberOfDockersInDocker = 0;
-
-    private static final int PORT_START = 2378;
-    private static final String DOCKER_IN_DOCKER_CONTAINER_PREFIX = "docker";
-    private static final String NETWORK_NAME = "dind-network";
-    private static final String DOCKER_IN_DOCKER_IMAGE_REPOSITORY = "docker";
-    private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "17.12-dind";
 
     @Before
-    public void beforeTest() throws Exception {
+    public final void setUpSwarmCmdIT() {
         assumeThat(dockerRule, isGreaterOrEqual(VERSION_1_24));
-    }
-
-    @Before
-    public void beforeMethod() {
         leaveIfInSwarm();
-    }
-
-    @After
-    public void afterMethod() {
-        removeDockersInDocker();
-    }
-
-    protected void removeDockersInDocker() {
-        for (int i = 1; i <= numberOfDockersInDocker; i++) {
-            try {
-                dockerRule.getClient().removeContainerCmd(DOCKER_IN_DOCKER_CONTAINER_PREFIX + i).withForce(true).exec();
-            } catch (NotFoundException e) {
-                // container does not exist
-            }
-        }
-
-        try {
-            dockerRule.getClient().removeNetworkCmd(NETWORK_NAME).exec();
-        } catch (NotFoundException e) {
-            // network does not exist
-        }
-
-        numberOfDockersInDocker = 0;
-    }
-
-    protected DockerClient startDockerInDocker() throws InterruptedException {
-        numberOfDockersInDocker++;
-        String name = DOCKER_IN_DOCKER_CONTAINER_PREFIX + numberOfDockersInDocker;
-
-        // Delete if already exists
-        try {
-            dockerRule.getClient().removeContainerCmd(name).withForce(true).exec();
-        } catch (NotFoundException e) {
-            // container does not exist
-        }
-
-        // Create network if not already exists
-        try {
-            dockerRule.getClient().inspectNetworkCmd().withNetworkId(NETWORK_NAME).exec();
-        } catch (NotFoundException e) {
-            try {
-                dockerRule.getClient().createNetworkCmd().withName(NETWORK_NAME).exec();
-            } catch (ConflictException e2) {
-                // already exists
-            }
-        }
-
-        dockerRule.getClient().pullImageCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY)
-                .withTag(DOCKER_IN_DOCKER_IMAGE_TAG)
-                .start()
-                .awaitCompletion();
-
-        int port = PORT_START + (numberOfDockersInDocker - 1);
-        CreateContainerResponse response = dockerRule.getClient()
-                .createContainerCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY + ":" + DOCKER_IN_DOCKER_IMAGE_TAG)
-                .withHostConfig(newHostConfig()
-                        .withNetworkMode(NETWORK_NAME)
-                        .withPortBindings(new PortBinding(
-                                Ports.Binding.bindIpAndPort("127.0.0.1", port),
-                                ExposedPort.tcp(2375)))
-                        .withPrivileged(true))
-                .withName(name)
-                .withAliases(name)
-
+        if (shouldInitializeByDefault()) {
+            dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
+                .withListenAddr("127.0.0.1")
+                .withAdvertiseAddr("127.0.0.1")
                 .exec();
-
-        dockerRule.getClient().startContainerCmd(response.getId()).exec();
-
-        return initializeDockerClient(port);
+        }
     }
 
-    private DockerClient initializeDockerClient(int port) {
-        DefaultDockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder()
-                .withRegistryUrl("https://index.docker.io/v1/")
-                .withDockerHost("tcp://localhost:" + port).build();
-        return DockerClientBuilder.getInstance(config)
-                .withDockerCmdExecFactory(getFactoryType().createExecFactory())
-                .build();
+    protected boolean shouldInitializeByDefault() {
+        return true;
     }
 
     private void leaveIfInSwarm() {
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java
index 5886614dd..50a784291 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.cmd.swarm;
 
 import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotAcceptableException;
 import com.github.dockerjava.api.model.Swarm;
 import com.github.dockerjava.api.model.SwarmCAConfig;
 import com.github.dockerjava.api.model.SwarmDispatcherConfig;
@@ -22,11 +21,10 @@ public class UpdateSwarmCmdExecIT extends SwarmCmdIT {
 
     public static final Logger LOG = LoggerFactory.getLogger(UpdateSwarmCmdExecIT.class);
 
+    @Test
     public void updateSwarm() throws DockerException {
-        SwarmSpec firstSpec = new SwarmSpec().withName("firstSpec");
-
-        SwarmSpec secondSpec = new SwarmSpec()
-                .withName("secondSpec")
+        SwarmSpec newSpec = new SwarmSpec()
+                .withName("default")
                 .withDispatcher(new SwarmDispatcherConfig()
                         .withHeartbeatPeriod(10000000L)
                 ).withOrchestration(new SwarmOrchestration()
@@ -40,33 +38,24 @@ public void updateSwarm() throws DockerException {
                         .withLogEntriesForSlowFollowers(200)
                 ).withTaskDefaults(new TaskDefaults());
 
-        dockerRule.getClient().initializeSwarmCmd(firstSpec)
-                .withListenAddr("127.0.0.1")
-                .withAdvertiseAddr("127.0.0.1")
-                .exec();
-        LOG.info("Initialized swarm: {}", firstSpec.toString());
-
         Swarm swarm = dockerRule.getClient().inspectSwarmCmd().exec();
         LOG.info("Inspected swarm: {}", swarm.toString());
-        assertThat(swarm.getSpec(), is(not(equalTo(secondSpec))));
+        assertThat(swarm.getSpec(), is(not(equalTo(newSpec))));
 
-        dockerRule.getClient().updateSwarmCmd(secondSpec)
+        dockerRule.getClient().updateSwarmCmd(newSpec)
                 .withVersion(swarm.getVersion().getIndex())
                 .exec();
-        LOG.info("Updated swarm: {}", secondSpec.toString());
+        LOG.info("Updated swarm: {}", newSpec.toString());
 
         swarm = dockerRule.getClient().inspectSwarmCmd().exec();
         LOG.info("Inspected swarm: {}", swarm.toString());
-        assertThat(swarm.getSpec(), is(equalTo(secondSpec)));
+        assertThat(swarm.getSpec(), is(equalTo(newSpec)));
     }
 
-    @Test(expected = NotAcceptableException.class)
+    @Test(expected = DockerException.class)
     public void updatingSwarmThrowsWhenNotInSwarm() throws DockerException {
-        SwarmSpec swarmSpec = new SwarmSpec()
-                .withName("swarm");
-
-        dockerRule.getClient().updateSwarmCmd(swarmSpec)
-                .withVersion(1l)
+        dockerRule.getClient().updateSwarmCmd(new SwarmSpec())
+                .withVersion(1L)
                 .exec();
     }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java
index d55334ec6..a4ce630f2 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java
@@ -1,11 +1,9 @@
 package com.github.dockerjava.cmd.swarm;
 
-import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.model.SwarmNode;
 import com.github.dockerjava.api.model.SwarmNodeAvailability;
 import com.github.dockerjava.api.model.SwarmNodeSpec;
 import com.github.dockerjava.api.model.SwarmNodeState;
-import com.github.dockerjava.api.model.SwarmSpec;
 import org.junit.Test;
 
 import java.util.List;
@@ -16,17 +14,15 @@
 public class UpdateSwarmNodeIT extends SwarmCmdIT {
     @Test
     public void testUpdateSwarmNode() throws Exception {
-        DockerClient docker1 = startDockerInDocker();
-        docker1.initializeSwarmCmd(new SwarmSpec()).exec();
-        List<SwarmNode> nodes = docker1.listSwarmNodesCmd().exec();
+        List<SwarmNode> nodes = dockerRule.getClient().listSwarmNodesCmd().exec();
         assertThat(1, is(nodes.size()));
         SwarmNode node = nodes.get(0);
         assertThat(SwarmNodeState.READY, is(node.getStatus().getState()));
         //update the node availability
         SwarmNodeSpec nodeSpec = node.getSpec().withAvailability(SwarmNodeAvailability.PAUSE);
-        docker1.updateSwarmNodeCmd().withSwarmNodeId(node.getId()).withVersion(node.getVersion().getIndex())
+        dockerRule.getClient().updateSwarmNodeCmd().withSwarmNodeId(node.getId()).withVersion(node.getVersion().getIndex())
                 .withSwarmNodeSpec(nodeSpec).exec();
-        nodes = docker1.listSwarmNodesCmd().exec();
+        nodes = dockerRule.getClient().listSwarmNodesCmd().exec();
         assertThat(nodes.size(), is(1));
         assertThat(nodes.get(0).getSpec().getAvailability(), is(SwarmNodeAvailability.PAUSE));
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
index 3e5b948b6..196da92e8 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.cmd.swarm;
 
-import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.model.ContainerSpec;
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.api.model.NetworkAttachmentConfig;
@@ -8,7 +7,6 @@
 import com.github.dockerjava.api.model.ServiceModeConfig;
 import com.github.dockerjava.api.model.ServiceReplicatedModeOptions;
 import com.github.dockerjava.api.model.ServiceSpec;
-import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.api.model.TaskSpec;
 import com.google.common.collect.Lists;
 import org.junit.Test;
@@ -22,10 +20,8 @@
 public class UpdateSwarmServiceIT extends SwarmCmdIT {
     @Test
     public void testUpdateServiceReplicate() throws Exception {
-        DockerClient docker1 = startDockerInDocker();
-        docker1.initializeSwarmCmd(new SwarmSpec()).exec();
         //create network
-        String networkId = docker1.createNetworkCmd().withName("networkname").withDriver("overlay")
+        String networkId = dockerRule.getClient().createNetworkCmd().withName("networkname").withDriver("overlay")
                 .withIpam(new Network.Ipam().withDriver("default")).exec().getId();
         TaskSpec taskSpec = new TaskSpec().withContainerSpec(
                 new ContainerSpec().withImage("busybox").withArgs(Arrays.asList("sleep", "3600")));
@@ -34,16 +30,16 @@ public void testUpdateServiceReplicate() throws Exception {
                 .withTaskTemplate(taskSpec)
                 .withNetworks(Lists.newArrayList(new NetworkAttachmentConfig().withTarget(networkId)))
                 .withName("worker");
-        String serviceId = docker1.createServiceCmd(serviceSpec).exec().getId();
+        String serviceId = dockerRule.getClient().createServiceCmd(serviceSpec).exec().getId();
         //list the service
-        List<Service> services = docker1.listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec();
+        List<Service> services = dockerRule.getClient().listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec();
         assertThat(services.size(), is(1));
         Service service = services.get(0);
         ServiceSpec updateServiceSpec = service.getSpec()
                 .withMode(new ServiceModeConfig().withReplicated(new ServiceReplicatedModeOptions().withReplicas(2)));
-        docker1.updateServiceCmd(service.getId(), updateServiceSpec).withVersion(service.getVersion().getIndex()).exec();
+        dockerRule.getClient().updateServiceCmd(service.getId(), updateServiceSpec).withVersion(service.getVersion().getIndex()).exec();
         //verify the replicate
-        Service updateService = docker1.listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec().get(0);
+        Service updateService = dockerRule.getClient().listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec().get(0);
         assertThat(updateService.getSpec().getMode().getReplicated().getReplicas(), is(2L));
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
index 107512da1..83568edf1 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
@@ -90,6 +90,19 @@ public void environment() throws Exception {
         assertEquals(config, EXAMPLE_CONFIG);
     }
 
+    @Test
+    public void emptyHost() {
+        Map<String, String> env = new HashMap<>();
+        env.put(DefaultDockerClientConfig.DOCKER_HOST, " ");
+
+        DefaultDockerClientConfig config = buildConfig(env, new Properties());
+
+        assertEquals(
+            config.getDockerHost().toString(),
+            DefaultDockerClientConfig.DEFAULT_PROPERTIES.get(DefaultDockerClientConfig.DOCKER_HOST)
+        );
+    }
+
     private DefaultDockerClientConfig buildConfig(Map<String, String> env, Properties systemProperties) {
         return DefaultDockerClientConfig.createDefaultConfigBuilder(env, systemProperties).build();
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java b/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
index 24d7b1677..3f2f6831d 100644
--- a/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
+++ b/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
@@ -33,7 +33,16 @@
  */
 public class JSONTestHelper {
 
-    static final ObjectMapper MAPPER = DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper();
+    static final ObjectMapper MAPPER;
+
+    static {
+        try {
+            MAPPER = DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper();
+        } catch (Throwable e) {
+            e.printStackTrace();
+            throw e;
+        }
+    }
 
     /**
      * Reads JSON String from the specified resource

From 708f4f4069f59dec0fc216d6a5f9ef410ccd7158 Mon Sep 17 00:00:00 2001
From: saffis <54270632+saffis@users.noreply.github.com>
Date: Sat, 23 May 2020 21:17:33 +0200
Subject: [PATCH 1008/1272] Add missing fields to Image (#1345)

* Fields sharedSize, labels, containers added and array replaced by list

* Replaced list with arrays to not break the public API

Co-authored-by: Sergei Egorov <segorov@pivotal.io>
---
 .../github/dockerjava/api/model/Image.java    | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java
index e6552eb35..697cf13f2 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java
@@ -1,10 +1,12 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  *
@@ -28,12 +30,24 @@ public class Image implements Serializable {
     @JsonProperty("RepoTags")
     private String[] repoTags;
 
+    @JsonProperty("RepoDigests")
+    private String[] repoDigests;
+
     @JsonProperty("Size")
     private Long size;
 
     @JsonProperty("VirtualSize")
     private Long virtualSize;
 
+    @JsonProperty("SharedSize")
+    private Long sharedSize;
+
+    @JsonProperty("Labels")
+    public Map<String, String> labels;
+
+    @JsonProperty("Containers")
+    private Integer containers;
+
     public String getId() {
         return id;
     }
@@ -42,6 +56,10 @@ public String[] getRepoTags() {
         return repoTags;
     }
 
+    public String[] getRepoDigests() {
+        return repoDigests;
+    }
+
     public String getParentId() {
         return parentId;
     }
@@ -57,4 +75,17 @@ public Long getSize() {
     public Long getVirtualSize() {
         return virtualSize;
     }
+
+
+    public Long getSharedSize() {
+        return sharedSize;
+    }
+
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
+    public Integer getContainers() {
+        return containers;
+    }
 }

From e14732ac70852ddf74a904518568eed4afd91964 Mon Sep 17 00:00:00 2001
From: Archimedes Trajano <developer@trajano.net>
Date: Sat, 23 May 2020 15:48:04 -0400
Subject: [PATCH 1009/1272] Add other event types (#1366)

* Add service event type

* Added "node", "secret", "config"

Co-authored-by: Sergei Egorov <segorov@pivotal.io>
---
 .../main/java/com/github/dockerjava/api/model/EventType.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventType.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventType.java
index 697c1e429..b7c64ecc5 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventType.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventType.java
@@ -11,6 +11,7 @@
  * @since 1.24
  */
 public enum EventType {
+    CONFIG("config"),
     /**
      * @since 1.24
      */
@@ -26,7 +27,10 @@ public enum EventType {
      */
     IMAGE("image"),
     NETWORK("network"),
+    NODE("node"),
     PLUGIN("plugin"),
+    SECRET("secret"),
+    SERVICE("service"),
     VOLUME("volume");
 
     private static final Map<String, EventType> EVENT_TYPES = new HashMap<>();

From 37ddf09520ad07964a5a4a26f67d2c1a39cb4b8f Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 24 May 2020 10:27:30 +0200
Subject: [PATCH 1010/1272] Stabilize tests

---
 .../cmd/swarm/ListTasksCmdExecIT.java         |  6 ++++--
 .../cmd/swarm/UpdateSwarmServiceIT.java       | 20 ++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java
index b2d5fe588..a9b2eed8f 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java
@@ -51,8 +51,10 @@ public void testListTasks() throws DockerException {
                 .exec();
         String serviceId = response.getId();
         //filtering with service id
-        List<Task> tasks = dockerRule.getClient().listTasksCmd().withServiceFilter(serviceId).exec();
-        assertThat(tasks, hasSize(2));
+        List<Task> tasks = await().until(
+            () -> dockerRule.getClient().listTasksCmd().withServiceFilter(serviceId).exec(),
+            hasSize(2)
+        );
         String taskId = tasks.get(0).getId();
         String secondTaskId = tasks.get(1).getId();
         //filtering with unique id
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
index 196da92e8..9aaea3961 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
@@ -14,6 +14,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import static org.awaitility.Awaitility.await;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
@@ -31,15 +32,16 @@ public void testUpdateServiceReplicate() throws Exception {
                 .withNetworks(Lists.newArrayList(new NetworkAttachmentConfig().withTarget(networkId)))
                 .withName("worker");
         String serviceId = dockerRule.getClient().createServiceCmd(serviceSpec).exec().getId();
-        //list the service
-        List<Service> services = dockerRule.getClient().listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec();
-        assertThat(services.size(), is(1));
-        Service service = services.get(0);
-        ServiceSpec updateServiceSpec = service.getSpec()
+        await().untilAsserted(() -> {
+            List<Service> services = dockerRule.getClient().listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec();
+            assertThat(services.size(), is(1));
+            Service service = services.get(0);
+            ServiceSpec updateServiceSpec = service.getSpec()
                 .withMode(new ServiceModeConfig().withReplicated(new ServiceReplicatedModeOptions().withReplicas(2)));
-        dockerRule.getClient().updateServiceCmd(service.getId(), updateServiceSpec).withVersion(service.getVersion().getIndex()).exec();
-        //verify the replicate
-        Service updateService = dockerRule.getClient().listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec().get(0);
-        assertThat(updateService.getSpec().getMode().getReplicated().getReplicas(), is(2L));
+            dockerRule.getClient().updateServiceCmd(service.getId(), updateServiceSpec).withVersion(service.getVersion().getIndex()).exec();
+            //verify the replicate
+            Service updateService = dockerRule.getClient().listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec().get(0);
+            assertThat(updateService.getSpec().getMode().getReplicated().getReplicas(), is(2L));
+        });
     }
 }

From b8d5e37c28bbac58656d97a49aaa2dba8cc493c2 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 24 May 2020 11:56:43 +0200
Subject: [PATCH 1011/1272] Fix Netty leaks (#1397)

---
 .../netty/NettyInvocationBuilder.java         | 84 ++++++++++---------
 1 file changed, 46 insertions(+), 38 deletions(-)

diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
index 8830edb77..18b82533e 100644
--- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
+++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
@@ -111,17 +111,20 @@ public void delete() {
 
         HttpRequestProvider requestProvider = httpDeleteRequestProvider();
 
-        ResponseCallback<Void> callback = new ResponseCallback<>();
+        try (ResponseCallback<Void> callback = new ResponseCallback<>()) {
 
-        HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, callback);
+            HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, callback);
 
-        Channel channel = getChannel();
+            Channel channel = getChannel();
 
-        channel.pipeline().addLast(responseHandler);
+            channel.pipeline().addLast(responseHandler);
 
-        sendRequest(requestProvider, channel);
+            sendRequest(requestProvider, channel);
 
-        callback.awaitResult();
+            callback.awaitResult();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     public void get(ResultCallback<Frame> resultCallback) {
@@ -141,12 +144,13 @@ public void get(ResultCallback<Frame> resultCallback) {
     }
 
     public <T> T get(TypeReference<T> typeReference) {
+        try (ResponseCallback<T> callback = new ResponseCallback<>()) {
+            get(typeReference, callback);
 
-        ResponseCallback<T> callback = new ResponseCallback<>();
-
-        get(typeReference, callback);
-
-        return callback.awaitResult();
+            return callback.awaitResult();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     public <T> void get(TypeReference<T> typeReference, ResultCallback<T> resultCallback) {
@@ -267,12 +271,13 @@ public void run() {
     }
 
     public <T> T post(final Object entity, TypeReference<T> typeReference) {
+        try (ResponseCallback<T> callback = new ResponseCallback<>()) {
+            post(entity, typeReference, callback);
 
-        ResponseCallback<T> callback = new ResponseCallback<>();
-
-        post(entity, typeReference, callback);
-
-        return callback.awaitResult();
+            return callback.awaitResult();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     public <T> void post(final Object entity, TypeReference<T> typeReference, final ResultCallback<T> resultCallback) {
@@ -372,12 +377,13 @@ private void setDefaultHeaders(HttpRequest request) {
     }
 
     public <T> T post(TypeReference<T> typeReference, InputStream body) {
+        try (ResponseCallback<T> callback = new ResponseCallback<>()) {
+            post(typeReference, callback, body);
 
-        ResponseCallback<T> callback = new ResponseCallback<>();
-
-        post(typeReference, callback, body);
-
-        return callback.awaitResult();
+            return callback.awaitResult();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     public <T> void post(TypeReference<T> typeReference, ResultCallback<T> resultCallback, InputStream body) {
@@ -464,28 +470,30 @@ public void put(InputStream body, com.github.dockerjava.core.MediaType mediaType
 
         Channel channel = getChannel();
 
-        ResponseCallback<Void> resultCallback = new ResponseCallback<>();
+        try (ResponseCallback<Void> resultCallback = new ResponseCallback<>()) {
+            HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
 
-        HttpResponseHandler responseHandler = new HttpResponseHandler(requestProvider, resultCallback);
+            channel.pipeline().addLast(new ChunkedWriteHandler());
+            channel.pipeline().addLast(responseHandler);
 
-        channel.pipeline().addLast(new ChunkedWriteHandler());
-        channel.pipeline().addLast(responseHandler);
-
-        HttpRequest request = requestProvider.getHttpRequest(resource);
+            HttpRequest request = requestProvider.getHttpRequest(resource);
 
-        // don't accept FullHttpRequest here
-        if (request instanceof FullHttpRequest) {
-            throw new DockerClientException("fatal: request is instance of FullHttpRequest");
-        }
+            // don't accept FullHttpRequest here
+            if (request instanceof FullHttpRequest) {
+                throw new DockerClientException("fatal: request is instance of FullHttpRequest");
+            }
 
-        request.headers().set(HttpHeaderNames.TRANSFER_ENCODING, HttpHeaderValues.CHUNKED);
-        request.headers().remove(HttpHeaderNames.CONTENT_LENGTH);
-        request.headers().set(HttpHeaderNames.CONTENT_TYPE, mediaType.getMediaType());
+            request.headers().set(HttpHeaderNames.TRANSFER_ENCODING, HttpHeaderValues.CHUNKED);
+            request.headers().remove(HttpHeaderNames.CONTENT_LENGTH);
+            request.headers().set(HttpHeaderNames.CONTENT_TYPE, mediaType.getMediaType());
 
-        channel.write(request);
-        channel.write(new ChunkedStream(new BufferedInputStream(body, 1024 * 1024)));
-        channel.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT);
+            channel.write(request);
+            channel.write(new ChunkedStream(new BufferedInputStream(body, 1024 * 1024)));
+            channel.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT);
 
-        resultCallback.awaitResult();
+            resultCallback.awaitResult();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 }

From b3ca31e67cba439d451acd31ae3e291f381256b0 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 24 May 2020 12:45:42 +0200
Subject: [PATCH 1012/1272] Do not use fixed names/ports in
 `MultiNodeSwarmCmdIT` (#1398)

---
 .../cmd/swarm/MultiNodeSwarmCmdIT.java        | 74 +++++++++++--------
 1 file changed, 45 insertions(+), 29 deletions(-)

diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java
index d66f50895..1d2c7a5c2 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java
@@ -1,12 +1,15 @@
 package com.github.dockerjava.cmd.swarm;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.PullResponseItem;
 import com.github.dockerjava.cmd.CmdIT;
 import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.core.DockerClientBuilder;
@@ -16,16 +19,21 @@
 import org.junit.Before;
 import org.junit.experimental.categories.Category;
 
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
 import static com.github.dockerjava.api.model.HostConfig.newHostConfig;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24;
 import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
+import static org.awaitility.Awaitility.await;
 import static org.junit.Assume.assumeThat;
 
 @Category({SwarmModeIntegration.class, Integration.class})
 public abstract class MultiNodeSwarmCmdIT extends CmdIT {
 
-    private static final int PORT_START = 2378;
-
     private static final String DOCKER_IN_DOCKER_IMAGE_REPOSITORY = "docker";
 
     private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "17.12-dind";
@@ -34,7 +42,9 @@ public abstract class MultiNodeSwarmCmdIT extends CmdIT {
 
     private static final String NETWORK_NAME = "dind-network";
 
-    private int numberOfDockersInDocker = 0;
+    private final AtomicInteger numberOfDockersInDocker = new AtomicInteger();
+
+    private final Set<String> startedContainerIds = new HashSet<>();
 
     @Before
     public void setUp() throws Exception {
@@ -43,9 +53,9 @@ public void setUp() throws Exception {
 
     @After
     public final void tearDownMultiNodeSwarmCmdIT() {
-        for (int i = 1; i <= numberOfDockersInDocker; i++) {
+        for (String containerId : startedContainerIds) {
             try {
-                dockerRule.getClient().removeContainerCmd(DOCKER_IN_DOCKER_CONTAINER_PREFIX + i).withForce(true).exec();
+                dockerRule.getClient().removeContainerCmd(containerId).withForce(true).exec();
             } catch (NotFoundException e) {
                 // container does not exist
             }
@@ -59,16 +69,6 @@ public final void tearDownMultiNodeSwarmCmdIT() {
     }
 
     protected DockerClient startDockerInDocker() throws InterruptedException {
-        numberOfDockersInDocker++;
-        String name = DOCKER_IN_DOCKER_CONTAINER_PREFIX + numberOfDockersInDocker;
-
-        // Delete if already exists
-        try {
-            dockerRule.getClient().removeContainerCmd(name).withForce(true).exec();
-        } catch (NotFoundException e) {
-            // container does not exist
-        }
-
         // Create network if not already exists
         try {
             dockerRule.getClient().inspectNetworkCmd().withNetworkId(NETWORK_NAME).exec();
@@ -80,34 +80,50 @@ protected DockerClient startDockerInDocker() throws InterruptedException {
             }
         }
 
-        dockerRule.getClient().pullImageCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY)
-            .withTag(DOCKER_IN_DOCKER_IMAGE_TAG)
-            .start()
-            .awaitCompletion();
+        try (
+            ResultCallback.Adapter<PullResponseItem> callback = dockerRule.getClient().pullImageCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY)
+                .withTag(DOCKER_IN_DOCKER_IMAGE_TAG)
+                .start()
+        ) {
+            callback.awaitCompletion();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
 
-        int port = PORT_START + (numberOfDockersInDocker - 1);
+        ExposedPort exposedPort = ExposedPort.tcp(2375);
         CreateContainerResponse response = dockerRule.getClient()
             .createContainerCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY + ":" + DOCKER_IN_DOCKER_IMAGE_TAG)
             .withHostConfig(newHostConfig()
                 .withNetworkMode(NETWORK_NAME)
                 .withPortBindings(new PortBinding(
-                    Ports.Binding.bindIpAndPort("127.0.0.1", port),
-                    ExposedPort.tcp(2375)))
+                    Ports.Binding.bindIp("127.0.0.1"),
+                    exposedPort))
                 .withPrivileged(true))
-            .withName(name)
-            .withAliases(name)
-
+            .withAliases(DOCKER_IN_DOCKER_CONTAINER_PREFIX + numberOfDockersInDocker.incrementAndGet())
             .exec();
 
-        dockerRule.getClient().startContainerCmd(response.getId()).exec();
+        String containerId = response.getId();
+        startedContainerIds.add(containerId);
+
+        dockerRule.getClient().startContainerCmd(containerId).exec();
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(containerId).exec();
+
+        Ports.Binding binding = inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(exposedPort)[0];
+
+        DockerClient dockerClient = initializeDockerClient(binding);
+
+        await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
+            dockerClient.pingCmd().exec();
+        });
 
-        return initializeDockerClient(port);
+        return dockerClient;
     }
 
-    private DockerClient initializeDockerClient(int port) {
+    private DockerClient initializeDockerClient(Ports.Binding binding) {
         DefaultDockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder()
             .withRegistryUrl("https://index.docker.io/v1/")
-            .withDockerHost("tcp://localhost:" + port).build();
+            .withDockerHost("tcp://" + binding).build();
         return DockerClientBuilder.getInstance(config)
             .withDockerCmdExecFactory(getFactoryType().createExecFactory())
             .build();

From 6a0ecaa482922b48b18fddcac5b43371ba6a6e9b Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 24 May 2020 15:22:41 +0200
Subject: [PATCH 1013/1272] Continue on ciMate's error

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d07be0d7f..84f562a8a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,6 +32,7 @@ jobs:
         run: ./mvnw --no-transfer-progress verify
       - name: Aggregate test reports with ciMate
         if: always()
+        continue-on-error: true
         env:
           CIMATE_PROJECT_ID: lodr9d83
           CIMATE_CI_KEY: "CI / ${{matrix.name}}"

From 175329f4ff6b1cddd126b2297cd7acabddbd1628 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 24 May 2020 16:28:47 +0200
Subject: [PATCH 1014/1272] Alwlays use DinD in Swarm tests (#1399)

---
 .../cmd/swarm/CreateSecretCmdExecIT.java      |  13 +-
 .../cmd/swarm/CreateServiceCmdExecIT.java     |  34 +++--
 .../cmd/swarm/InitializeSwarmCmdExecIT.java   |  23 +--
 .../cmd/swarm/JoinSwarmCmdExecIT.java         |   2 +-
 .../cmd/swarm/LeaveSwarmCmdExecIT.java        |  23 ++-
 .../cmd/swarm/ListSecretCmdExecIT.java        |  10 +-
 .../cmd/swarm/ListServicesCmdExecIT.java      |  12 +-
 .../cmd/swarm/ListTasksCmdExecIT.java         |  28 ++--
 .../cmd/swarm/LogSwarmObjectIT.java           |  16 ++-
 .../cmd/swarm/MultiNodeSwarmCmdIT.java        | 131 -----------------
 .../dockerjava/cmd/swarm/SwarmCmdIT.java      | 135 +++++++++++++++---
 .../cmd/swarm/UpdateSwarmCmdExecIT.java       |  14 +-
 .../cmd/swarm/UpdateSwarmNodeIT.java          |   8 +-
 .../cmd/swarm/UpdateSwarmServiceIT.java       |  12 +-
 14 files changed, 213 insertions(+), 248 deletions(-)
 delete mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java

diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
index 687bbb243..34a106af9 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
@@ -1,7 +1,7 @@
 package com.github.dockerjava.cmd.swarm;
 
+import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.CreateSecretResponse;
-import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.Secret;
 import com.github.dockerjava.api.model.SecretSpec;
 import com.google.common.collect.Lists;
@@ -21,27 +21,28 @@ public class CreateSecretCmdExecIT extends SwarmCmdIT {
     public static final Logger LOG = LoggerFactory.getLogger(CreateSecretCmdExecIT.class);
 
     @Test
-    public void testCreateSecret() throws DockerException {
+    public void testCreateSecret() throws Exception {
+        DockerClient dockerClient = startSwarm();
         int length = 10;
         boolean useLetters = true;
         boolean useNumbers = false;
         String secretName = RandomStringUtils.random(length, useLetters, useNumbers);
-        CreateSecretResponse exec = dockerRule.getClient().createSecretCmd(new SecretSpec().withName(secretName).withData("mon secret en clair")).exec();
+        CreateSecretResponse exec = dockerClient.createSecretCmd(new SecretSpec().withName(secretName).withData("mon secret en clair")).exec();
         assertThat(exec, notNullValue());
         assertThat(exec.getId(), notNullValue());
         LOG.info("Secret created with ID {}", exec.getId());
 
 
-        List<Secret> secrets = dockerRule.getClient().listSecretsCmd()
+        List<Secret> secrets = dockerClient.listSecretsCmd()
                 .withNameFilter(Lists.newArrayList(secretName))
                 .exec();
 
         assertThat(secrets, IsCollectionWithSize.hasSize(1));
 
-        dockerRule.getClient().removeSecretCmd(secrets.get(0).getId())
+        dockerClient.removeSecretCmd(secrets.get(0).getId())
                 .exec();
         LOG.info("Secret removed with ID {}", exec.getId());
-        List<Secret> secretsAfterRemoved = dockerRule.getClient().listSecretsCmd()
+        List<Secret> secretsAfterRemoved = dockerClient.listSecretsCmd()
                 .withNameFilter(Lists.newArrayList(secretName))
                 .exec();
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
index c797ef4de..66ee0e836 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.cmd.swarm;
 
+import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.AuthConfig;
@@ -49,32 +50,35 @@ public class CreateServiceCmdExecIT extends SwarmCmdIT {
     public ExpectedException exception = ExpectedException.none();
     private AuthConfig authConfig;
 
+    private DockerClient dockerClient;
+
     @Before
     public final void setUpCreateServiceCmdExecIT() throws Exception {
         authConfig = REGISTRY.getAuthConfig();
+        dockerClient = startSwarm();
     }
 
     @Test
     public void testCreateService() throws DockerException {
-        dockerRule.getClient().createServiceCmd(new ServiceSpec()
+        dockerClient.createServiceCmd(new ServiceSpec()
                 .withName(SERVICE_NAME)
                 .withTaskTemplate(new TaskSpec()
                         .withContainerSpec(new ContainerSpec()
                                 .withImage(DEFAULT_IMAGE))))
                 .exec();
 
-        List<Service> services = dockerRule.getClient().listServicesCmd()
+        List<Service> services = dockerClient.listServicesCmd()
                 .withNameFilter(Lists.newArrayList(SERVICE_NAME))
                 .exec();
 
         assertThat(services, hasSize(1));
 
-        dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec();
+        dockerClient.removeServiceCmd(SERVICE_NAME).exec();
     }
 
     @Test
     public void testCreateServiceWithNetworks() {
-        String networkId = dockerRule.getClient().createNetworkCmd().withName("networkname")
+        String networkId = dockerClient.createNetworkCmd().withName("networkname")
                 .withDriver("overlay")
                 .withIpam(new Network.Ipam()
                         .withDriver("default"))
@@ -104,9 +108,9 @@ public void testCreateServiceWithNetworks() {
                                 .withProtocol(PortConfigProtocol.TCP)
                         )));
 
-        dockerRule.getClient().createServiceCmd(spec).exec();
+        dockerClient.createServiceCmd(spec).exec();
 
-        List<Service> services = dockerRule.getClient().listServicesCmd()
+        List<Service> services = dockerClient.listServicesCmd()
                 .withNameFilter(Lists.newArrayList(SERVICE_NAME))
                 .exec();
 
@@ -114,34 +118,34 @@ public void testCreateServiceWithNetworks() {
 
         assertThat(services.get(0).getSpec(), is(spec));
 
-        dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec();
+        dockerClient.removeServiceCmd(SERVICE_NAME).exec();
     }
 
     @Test
     public void testCreateServiceWithTmpfs() {
         Mount tmpMount = new Mount().withTmpfsOptions(new TmpfsOptions().withSizeBytes(600L)).withTarget("/tmp/foo");
 
-        dockerRule.getClient().createServiceCmd(new ServiceSpec()
+        dockerClient.createServiceCmd(new ServiceSpec()
                 .withName(SERVICE_NAME)
                 .withTaskTemplate(new TaskSpec()
                         .withContainerSpec(new ContainerSpec().withImage(DEFAULT_IMAGE).withMounts(Collections.singletonList(tmpMount)))))
                 .exec();
 
-        List<Service> services = dockerRule.getClient().listServicesCmd()
+        List<Service> services = dockerClient.listServicesCmd()
                 .withNameFilter(Lists.newArrayList(SERVICE_NAME))
                 .exec();
 
         assertThat(services, hasSize(1));
-        List<Mount> mounts = dockerRule.getClient().inspectServiceCmd(SERVICE_NAME).exec().getSpec().getTaskTemplate()
+        List<Mount> mounts = dockerClient.inspectServiceCmd(SERVICE_NAME).exec().getSpec().getTaskTemplate()
                 .getContainerSpec().getMounts();
         assertThat(mounts, hasSize(1));
         assertThat(mounts.get(0), is(tmpMount));
-        dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec();
+        dockerClient.removeServiceCmd(SERVICE_NAME).exec();
     }
 
     @Test
     public void testCreateServiceWithValidAuth() throws DockerException {
-        dockerRule.getClient().createServiceCmd(new ServiceSpec()
+        dockerClient.createServiceCmd(new ServiceSpec()
                 .withName(SERVICE_NAME)
                 .withTaskTemplate(new TaskSpec()
                         .withContainerSpec(new ContainerSpec()
@@ -149,13 +153,13 @@ public void testCreateServiceWithValidAuth() throws DockerException {
                 .withAuthConfig(authConfig)
                 .exec();
 
-        List<Service> services = dockerRule.getClient().listServicesCmd()
+        List<Service> services = dockerClient.listServicesCmd()
                 .withNameFilter(Lists.newArrayList(SERVICE_NAME))
                 .exec();
 
         assertThat(services, hasSize(1));
 
-        dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec();
+        dockerClient.removeServiceCmd(SERVICE_NAME).exec();
     }
 
     @Test
@@ -169,7 +173,7 @@ public void testCreateServiceWithInvalidAuth() throws DockerException {
 
         exception.expect(ConflictException.class);
 
-        dockerRule.getClient().createServiceCmd(new ServiceSpec()
+        dockerClient.createServiceCmd(new ServiceSpec()
                 .withName(SERVICE_NAME)
                 .withTaskTemplate(new TaskSpec()
                         .withContainerSpec(new ContainerSpec()
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java
index e17429006..6341f4b30 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InitializeSwarmCmdExecIT.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.cmd.swarm;
 
+import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.Swarm;
 import com.github.dockerjava.api.model.SwarmCAConfig;
@@ -20,13 +21,9 @@ public class InitializeSwarmCmdExecIT extends SwarmCmdIT {
 
     public static final Logger LOG = LoggerFactory.getLogger(InitializeSwarmCmdExecIT.class);
 
-    @Override
-    protected boolean shouldInitializeByDefault() {
-        return false;
-    }
-
     @Test
-    public void initializeSwarm() throws DockerException {
+    public void initializeSwarm() throws Exception {
+        DockerClient dockerClient = startDockerInDocker();
         SwarmSpec swarmSpec = new SwarmSpec()
                 .withName("default")
                 .withDispatcher(new SwarmDispatcherConfig()
@@ -42,29 +39,23 @@ public void initializeSwarm() throws DockerException {
                         .withLogEntriesForSlowFollowers(200)
                 ).withTaskDefaults(new TaskDefaults());
 
-        dockerRule.getClient().initializeSwarmCmd(swarmSpec)
+        dockerClient.initializeSwarmCmd(swarmSpec)
                 .withListenAddr("127.0.0.1")
                 .withAdvertiseAddr("127.0.0.1")
                 .exec();
         LOG.info("Initialized swarm: {}", swarmSpec.toString());
 
-        Swarm swarm = dockerRule.getClient().inspectSwarmCmd().exec();
+        Swarm swarm = dockerClient.inspectSwarmCmd().exec();
         LOG.info("Inspected swarm: {}", swarm.toString());
         assertThat(swarm.getSpec(), is(equalTo(swarmSpec)));
     }
 
     @Test(expected = DockerException.class)
     public void initializingSwarmThrowsWhenAlreadyInSwarm() throws DockerException {
-        SwarmSpec swarmSpec = new SwarmSpec();
-
-        dockerRule.getClient().initializeSwarmCmd(swarmSpec)
-                .withListenAddr("127.0.0.1")
-                .withAdvertiseAddr("127.0.0.1")
-                .exec();
-        LOG.info("Initialized swarm: {}", swarmSpec.toString());
+        DockerClient dockerClient = startSwarm();
 
         // Initializing a swarm if already in swarm mode should fail
-        dockerRule.getClient().initializeSwarmCmd(swarmSpec)
+        dockerClient.initializeSwarmCmd(new SwarmSpec())
                 .withListenAddr("127.0.0.1")
                 .exec();
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java
index 3dd3910dc..7d8838d5a 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java
@@ -17,7 +17,7 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 
-public class JoinSwarmCmdExecIT extends MultiNodeSwarmCmdIT {
+public class JoinSwarmCmdExecIT extends SwarmCmdIT {
 
     public static final Logger LOG = LoggerFactory.getLogger(JoinSwarmCmdExecIT.class);
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java
index 41e3023d1..e6d652d43 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LeaveSwarmCmdExecIT.java
@@ -1,9 +1,9 @@
 package com.github.dockerjava.cmd.swarm;
 
+import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.api.model.LocalNodeState;
-import com.github.dockerjava.api.model.SwarmSpec;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,29 +15,21 @@ public class LeaveSwarmCmdExecIT extends SwarmCmdIT {
 
     public static final Logger LOG = LoggerFactory.getLogger(LeaveSwarmCmdExecIT.class);
 
-    @Override
-    protected boolean shouldInitializeByDefault() {
-        return false;
-    }
-
     @Test
     public void leaveSwarmAsMaster() throws DockerException {
-        dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
-                .withListenAddr("127.0.0.1")
-                .withAdvertiseAddr("127.0.0.1")
-                .exec();
+        DockerClient dockerClient = startSwarm();
 
-        Info info = dockerRule.getClient().infoCmd().exec();
+        Info info = dockerClient.infoCmd().exec();
         LOG.info("Inspected docker: {}", info.toString());
 
         assertThat(info.getSwarm().getLocalNodeState(), is(LocalNodeState.ACTIVE));
 
-        dockerRule.getClient().leaveSwarmCmd()
+        dockerClient.leaveSwarmCmd()
                 .withForceEnabled(true)
                 .exec();
         LOG.info("Left swarm");
 
-        info = dockerRule.getClient().infoCmd().exec();
+        info = dockerClient.infoCmd().exec();
         LOG.info("Inspected docker: {}", info.toString());
 
         assertThat(info.getSwarm().getLocalNodeState(), is(LocalNodeState.INACTIVE));
@@ -45,8 +37,9 @@ public void leaveSwarmAsMaster() throws DockerException {
     }
 
     @Test(expected = DockerException.class)
-    public void leavingSwarmThrowsWhenNotInSwarm() throws DockerException {
-        dockerRule.getClient().leaveSwarmCmd().exec();
+    public void leavingSwarmThrowsWhenNotInSwarm() throws Exception {
+        DockerClient dockerClient = startDockerInDocker();
+        dockerClient.leaveSwarmCmd().exec();
     }
 
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java
index 4b6f26f9c..a4b8f1288 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.cmd.swarm;
 
+import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.CreateSecretResponse;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.Secret;
@@ -22,26 +23,27 @@ public class ListSecretCmdExecIT extends SwarmCmdIT {
 
     @Test
     public void tesListSecret() throws DockerException {
+        DockerClient dockerClient = startSwarm();
         int length = 10;
         boolean useLetters = true;
         boolean useNumbers = false;
         String secretName = RandomStringUtils.random(length, useLetters, useNumbers);
-        CreateSecretResponse exec = dockerRule.getClient().createSecretCmd(new SecretSpec().withName(secretName).withData("mon secret en clair")).exec();
+        CreateSecretResponse exec = dockerClient.createSecretCmd(new SecretSpec().withName(secretName).withData("mon secret en clair")).exec();
         assertThat(exec, notNullValue());
         assertThat(exec.getId(), notNullValue());
         LOG.info("Secret created with ID {}", exec.getId());
 
 
-        List<Secret> secrets = dockerRule.getClient().listSecretsCmd()
+        List<Secret> secrets = dockerClient.listSecretsCmd()
                 .withNameFilter(Lists.newArrayList(secretName))
                 .exec();
 
         assertThat(secrets, hasSize(1));
 
-        dockerRule.getClient().removeSecretCmd(secrets.get(0).getId())
+        dockerClient.removeSecretCmd(secrets.get(0).getId())
                 .exec();
         LOG.info("Secret removed with ID {}", exec.getId());
-        List<Secret> secretsAfterRemoved = dockerRule.getClient().listSecretsCmd()
+        List<Secret> secretsAfterRemoved = dockerClient.listSecretsCmd()
                 .withNameFilter(Lists.newArrayList(secretName))
                 .exec();
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
index 27f703037..8f7778655 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.cmd.swarm;
 
+import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.CreateServiceResponse;
 import com.github.dockerjava.api.model.ContainerSpec;
 import com.github.dockerjava.api.model.Service;
@@ -27,8 +28,9 @@ public class ListServicesCmdExecIT extends SwarmCmdIT {
 
     @Test
     public void testListServices() throws Exception {
+        DockerClient dockerClient = startSwarm();
         Map<String, String> serviceLabels = Collections.singletonMap(LABEL_KEY, LABEL_VALUE);
-        CreateServiceResponse response = dockerRule.getClient().createServiceCmd(new ServiceSpec()
+        CreateServiceResponse response = dockerClient.createServiceCmd(new ServiceSpec()
                 .withLabels(serviceLabels)
                 .withName(SERVICE_NAME)
                 .withMode(new ServiceModeConfig().withReplicated(
@@ -41,14 +43,14 @@ public void testListServices() throws Exception {
                 .exec();
         String serviceId = response.getId();
         //filtering with service id
-        List<Service> services = dockerRule.getClient().listServicesCmd().withIdFilter(Collections.singletonList(serviceId)).exec();
+        List<Service> services = dockerClient.listServicesCmd().withIdFilter(Collections.singletonList(serviceId)).exec();
         assertThat(services, hasSize(1));
         //filtering with service name
-        services = dockerRule.getClient().listServicesCmd().withNameFilter(Collections.singletonList(SERVICE_NAME)).exec();
+        services = dockerClient.listServicesCmd().withNameFilter(Collections.singletonList(SERVICE_NAME)).exec();
         assertThat(services, hasSize(1));
         //filter labels
-        services = dockerRule.getClient().listServicesCmd().withLabelFilter(serviceLabels).exec();
+        services = dockerClient.listServicesCmd().withLabelFilter(serviceLabels).exec();
         assertThat(services, hasSize(1));
-        dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec();
+        dockerClient.removeServiceCmd(SERVICE_NAME).exec();
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java
index a9b2eed8f..221e6699b 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.cmd.swarm;
 
+import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.CreateServiceResponse;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.ContainerSpec;
@@ -9,7 +10,6 @@
 import com.github.dockerjava.api.model.Task;
 import com.github.dockerjava.api.model.TaskSpec;
 import com.github.dockerjava.api.model.TaskState;
-import org.junit.After;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,19 +27,15 @@
 
 public class ListTasksCmdExecIT extends SwarmCmdIT {
     public static final Logger LOG = LoggerFactory.getLogger(CreateServiceCmdExecIT.class);
-    private final String SERVICE_NAME = "inspect_task";
+    private static final String SERVICE_NAME = "inspect_task";
     private static final String TASK_LABEL_KEY = "com.github.dockerjava.usage";
     private static final String TASK_LABEL_VALUE = "test";
 
-    @After
-    public void tearDown() {
-        dockerRule.getClient().removeServiceCmd(SERVICE_NAME).exec();
-    }
-
     @Test
     public void testListTasks() throws DockerException {
+        DockerClient dockerClient = startSwarm();
         Map<String, String> taskLabels = Collections.singletonMap(TASK_LABEL_KEY, TASK_LABEL_VALUE);
-        CreateServiceResponse response = dockerRule.getClient().createServiceCmd(new ServiceSpec()
+        CreateServiceResponse response = dockerClient.createServiceCmd(new ServiceSpec()
                 .withName(SERVICE_NAME)
                 .withMode(new ServiceModeConfig().withReplicated(
                         new ServiceReplicatedModeOptions()
@@ -52,34 +48,34 @@ public void testListTasks() throws DockerException {
         String serviceId = response.getId();
         //filtering with service id
         List<Task> tasks = await().until(
-            () -> dockerRule.getClient().listTasksCmd().withServiceFilter(serviceId).exec(),
+            () -> dockerClient.listTasksCmd().withServiceFilter(serviceId).exec(),
             hasSize(2)
         );
         String taskId = tasks.get(0).getId();
         String secondTaskId = tasks.get(1).getId();
         //filtering with unique id
-        tasks = dockerRule.getClient().listTasksCmd().withIdFilter(taskId).exec();
+        tasks = dockerClient.listTasksCmd().withIdFilter(taskId).exec();
         assertThat(tasks, hasSize(1));
         assertThat(tasks.get(0).getId(), is(taskId));
         //filtering with multiple id
-        tasks = dockerRule.getClient().listTasksCmd().withIdFilter(secondTaskId, taskId).exec();
+        tasks = dockerClient.listTasksCmd().withIdFilter(secondTaskId, taskId).exec();
         assertThat(tasks, hasSize(2));
         //filtering node id
         // Wait for node assignment
         String nodeId = await().until(() -> {
-            return dockerRule.getClient().listTasksCmd().withIdFilter(secondTaskId).exec()
+            return dockerClient.listTasksCmd().withIdFilter(secondTaskId).exec()
                 .get(0)
                 .getNodeId();
         }, Objects::nonNull);
-        tasks = dockerRule.getClient().listTasksCmd().withNodeFilter(nodeId).exec();
+        tasks = dockerClient.listTasksCmd().withNodeFilter(nodeId).exec();
         assertThat(tasks.get(0).getNodeId(), is(nodeId));
         //filtering with state
-        tasks = dockerRule.getClient().listTasksCmd().withStateFilter(TaskState.RUNNING).exec();
+        tasks = dockerClient.listTasksCmd().withStateFilter(TaskState.RUNNING).exec();
         assertThat(tasks, hasSize(2));
         //filter labels
-        tasks = dockerRule.getClient().listTasksCmd().withLabelFilter(taskLabels).exec();
+        tasks = dockerClient.listTasksCmd().withLabelFilter(taskLabels).exec();
         assertThat(tasks, hasSize(2));
-        tasks = dockerRule.getClient().listTasksCmd().withLabelFilter(TASK_LABEL_KEY + "=" + TASK_LABEL_VALUE).exec();
+        tasks = dockerClient.listTasksCmd().withLabelFilter(TASK_LABEL_KEY + "=" + TASK_LABEL_VALUE).exec();
         assertThat(tasks, hasSize(2));
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java
index 985d4967c..ddaf86fb6 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.cmd.swarm;
 
+import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.LogSwarmObjectCmd;
 import com.github.dockerjava.api.model.ContainerSpec;
 import com.github.dockerjava.api.model.ServiceModeConfig;
@@ -26,6 +27,7 @@
 public class LogSwarmObjectIT extends SwarmCmdIT {
     @Test
     public void testLogsCmd() throws InterruptedException, IOException {
+        DockerClient dockerClient = startSwarm();
         String snippet = "hello world";
         TaskSpec taskSpec = new TaskSpec().withContainerSpec(
                 new ContainerSpec().withImage("busybox").withCommand(Arrays.asList("echo", snippet)))
@@ -34,12 +36,12 @@ public void testLogsCmd() throws InterruptedException, IOException {
                 .withMode(new ServiceModeConfig().withReplicated(new ServiceReplicatedModeOptions().withReplicas(1)))
                 .withTaskTemplate(taskSpec)
                 .withName("log-worker");
-        String serviceId = dockerRule.getClient().createServiceCmd(serviceSpec).exec().getId();
+        String serviceId = dockerClient.createServiceCmd(serviceSpec).exec().getId();
         int since = (int) System.currentTimeMillis() / 1000;
         //wait the service to end
         List<Task> tasks = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
-            tasks = dockerRule.getClient().listTasksCmd().withServiceFilter(serviceId).withStateFilter(TaskState.SHUTDOWN).exec();
+            tasks = dockerClient.listTasksCmd().withServiceFilter(serviceId).withStateFilter(TaskState.SHUTDOWN).exec();
             if (tasks.size() == 1) {
                 break;
             } else {
@@ -49,17 +51,17 @@ public void testLogsCmd() throws InterruptedException, IOException {
         assertThat(tasks.size(), is(1));
         String taskId = tasks.get(0).getId();
         //check service log
-        validateLog(dockerRule.getClient().logServiceCmd(serviceId).withStdout(true), snippet);
+        validateLog(dockerClient.logServiceCmd(serviceId).withStdout(true), snippet);
         //check task log
-        validateLog(dockerRule.getClient().logTaskCmd(taskId).withStdout(true), snippet);
+        validateLog(dockerClient.logTaskCmd(taskId).withStdout(true), snippet);
         //check details/context
         // FIXME
         // validateLog(docker1.logServiceCmd(serviceId).withStdout(true).withDetails(true), "com.docker.swarm.service.id=" + serviceId);
         // validateLog(docker1.logTaskCmd(taskId).withStdout(true).withDetails(true), "com.docker.swarm.service.id=" + serviceId);
         //check since
-        validateLog(dockerRule.getClient().logServiceCmd(serviceId).withStdout(true).withSince(since), snippet);
-        validateLog(dockerRule.getClient().logTaskCmd(taskId).withStdout(true).withSince(since), snippet);
-        dockerRule.getClient().removeServiceCmd(serviceId).exec();
+        validateLog(dockerClient.logServiceCmd(serviceId).withStdout(true).withSince(since), snippet);
+        validateLog(dockerClient.logTaskCmd(taskId).withStdout(true).withSince(since), snippet);
+        dockerClient.removeServiceCmd(serviceId).exec();
     }
 
     private void validateLog(LogSwarmObjectCmd logCmd, String messsage) throws InterruptedException, IOException {
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java
deleted file mode 100644
index 1d2c7a5c2..000000000
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/MultiNodeSwarmCmdIT.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.github.dockerjava.cmd.swarm;
-
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.exception.ConflictException;
-import com.github.dockerjava.api.exception.NotFoundException;
-import com.github.dockerjava.api.model.ExposedPort;
-import com.github.dockerjava.api.model.PortBinding;
-import com.github.dockerjava.api.model.Ports;
-import com.github.dockerjava.api.model.PullResponseItem;
-import com.github.dockerjava.cmd.CmdIT;
-import com.github.dockerjava.core.DefaultDockerClientConfig;
-import com.github.dockerjava.core.DockerClientBuilder;
-import com.github.dockerjava.junit.category.Integration;
-import com.github.dockerjava.junit.category.SwarmModeIntegration;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.experimental.categories.Category;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static com.github.dockerjava.api.model.HostConfig.newHostConfig;
-import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24;
-import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
-import static org.awaitility.Awaitility.await;
-import static org.junit.Assume.assumeThat;
-
-@Category({SwarmModeIntegration.class, Integration.class})
-public abstract class MultiNodeSwarmCmdIT extends CmdIT {
-
-    private static final String DOCKER_IN_DOCKER_IMAGE_REPOSITORY = "docker";
-
-    private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "17.12-dind";
-
-    private static final String DOCKER_IN_DOCKER_CONTAINER_PREFIX = "docker";
-
-    private static final String NETWORK_NAME = "dind-network";
-
-    private final AtomicInteger numberOfDockersInDocker = new AtomicInteger();
-
-    private final Set<String> startedContainerIds = new HashSet<>();
-
-    @Before
-    public void setUp() throws Exception {
-        assumeThat(dockerRule, isGreaterOrEqual(VERSION_1_24));
-    }
-
-    @After
-    public final void tearDownMultiNodeSwarmCmdIT() {
-        for (String containerId : startedContainerIds) {
-            try {
-                dockerRule.getClient().removeContainerCmd(containerId).withForce(true).exec();
-            } catch (NotFoundException e) {
-                // container does not exist
-            }
-        }
-
-        try {
-            dockerRule.getClient().removeNetworkCmd(NETWORK_NAME).exec();
-        } catch (NotFoundException e) {
-            // network does not exist
-        }
-    }
-
-    protected DockerClient startDockerInDocker() throws InterruptedException {
-        // Create network if not already exists
-        try {
-            dockerRule.getClient().inspectNetworkCmd().withNetworkId(NETWORK_NAME).exec();
-        } catch (NotFoundException e) {
-            try {
-                dockerRule.getClient().createNetworkCmd().withName(NETWORK_NAME).exec();
-            } catch (ConflictException e2) {
-                // already exists
-            }
-        }
-
-        try (
-            ResultCallback.Adapter<PullResponseItem> callback = dockerRule.getClient().pullImageCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY)
-                .withTag(DOCKER_IN_DOCKER_IMAGE_TAG)
-                .start()
-        ) {
-            callback.awaitCompletion();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-
-        ExposedPort exposedPort = ExposedPort.tcp(2375);
-        CreateContainerResponse response = dockerRule.getClient()
-            .createContainerCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY + ":" + DOCKER_IN_DOCKER_IMAGE_TAG)
-            .withHostConfig(newHostConfig()
-                .withNetworkMode(NETWORK_NAME)
-                .withPortBindings(new PortBinding(
-                    Ports.Binding.bindIp("127.0.0.1"),
-                    exposedPort))
-                .withPrivileged(true))
-            .withAliases(DOCKER_IN_DOCKER_CONTAINER_PREFIX + numberOfDockersInDocker.incrementAndGet())
-            .exec();
-
-        String containerId = response.getId();
-        startedContainerIds.add(containerId);
-
-        dockerRule.getClient().startContainerCmd(containerId).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(containerId).exec();
-
-        Ports.Binding binding = inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(exposedPort)[0];
-
-        DockerClient dockerClient = initializeDockerClient(binding);
-
-        await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
-            dockerClient.pingCmd().exec();
-        });
-
-        return dockerClient;
-    }
-
-    private DockerClient initializeDockerClient(Ports.Binding binding) {
-        DefaultDockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder()
-            .withRegistryUrl("https://index.docker.io/v1/")
-            .withDockerHost("tcp://" + binding).build();
-        return DockerClientBuilder.getInstance(config)
-            .withDockerCmdExecFactory(getFactoryType().createExecFactory())
-            .build();
-    }
-}
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
index 7400a9d32..8c2a80b6e 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
@@ -1,47 +1,144 @@
 package com.github.dockerjava.cmd.swarm;
 
-import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.api.exception.NotAcceptableException;
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.exception.ConflictException;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.PortBinding;
+import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.PullResponseItem;
 import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.cmd.CmdIT;
+import com.github.dockerjava.core.DefaultDockerClientConfig;
+import com.github.dockerjava.core.DockerClientBuilder;
 import com.github.dockerjava.junit.category.Integration;
 import com.github.dockerjava.junit.category.SwarmModeIntegration;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.experimental.categories.Category;
 
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static com.github.dockerjava.api.model.HostConfig.newHostConfig;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24;
 import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
+import static org.awaitility.Awaitility.await;
 import static org.junit.Assume.assumeThat;
 
 @Category({SwarmModeIntegration.class, Integration.class})
 public abstract class SwarmCmdIT extends CmdIT {
 
+    private static final String DOCKER_IN_DOCKER_IMAGE_REPOSITORY = "docker";
+
+    private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "17.12-dind";
+
+    private static final String DOCKER_IN_DOCKER_CONTAINER_PREFIX = "docker";
+
+    private static final String NETWORK_NAME = "dind-network";
+
+    private final AtomicInteger numberOfDockersInDocker = new AtomicInteger();
+
+    private final Set<String> startedContainerIds = new HashSet<>();
+
     @Before
-    public final void setUpSwarmCmdIT() {
+    public final void setUpMultiNodeSwarmCmdIT() throws Exception {
         assumeThat(dockerRule, isGreaterOrEqual(VERSION_1_24));
-        leaveIfInSwarm();
-        if (shouldInitializeByDefault()) {
-            dockerRule.getClient().initializeSwarmCmd(new SwarmSpec())
-                .withListenAddr("127.0.0.1")
-                .withAdvertiseAddr("127.0.0.1")
-                .exec();
+    }
+
+    protected DockerClient startSwarm() {
+        DockerClient dockerClient;
+        try {
+            dockerClient = startDockerInDocker();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
         }
+        dockerClient.initializeSwarmCmd(new SwarmSpec()).exec();
+        return dockerClient;
     }
 
-    protected boolean shouldInitializeByDefault() {
-        return true;
+    @After
+    public final void tearDownMultiNodeSwarmCmdIT() {
+        for (String containerId : startedContainerIds) {
+            try {
+                dockerRule.getClient().removeContainerCmd(containerId).withForce(true).exec();
+            } catch (NotFoundException e) {
+                // container does not exist
+            }
+        }
+
+        try {
+            dockerRule.getClient().removeNetworkCmd(NETWORK_NAME).exec();
+        } catch (NotFoundException e) {
+            // network does not exist
+        }
     }
 
-    private void leaveIfInSwarm() {
+    protected DockerClient startDockerInDocker() throws InterruptedException {
+        // Create network if not already exists
+        DockerClient hostDockerClient = dockerRule.getClient();
         try {
-            // force in case this is a swarm manager
-            dockerRule.getClient().leaveSwarmCmd().withForceEnabled(true).exec();
-        } catch (NotAcceptableException e) {
-            // do nothing, node is not part of a swarm
-        } catch (DockerException ex) {
-            if (!ex.getMessage().contains("node is not part of a swarm")) {
-                throw ex;
+            hostDockerClient.inspectNetworkCmd().withNetworkId(NETWORK_NAME).exec();
+        } catch (NotFoundException e) {
+            try {
+                hostDockerClient.createNetworkCmd().withName(NETWORK_NAME).exec();
+            } catch (ConflictException e2) {
+                // already exists
             }
         }
+
+        try (
+            ResultCallback.Adapter<PullResponseItem> callback = hostDockerClient.pullImageCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY)
+                .withTag(DOCKER_IN_DOCKER_IMAGE_TAG)
+                .start()
+        ) {
+            callback.awaitCompletion();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        ExposedPort exposedPort = ExposedPort.tcp(2375);
+        CreateContainerResponse response = hostDockerClient
+            .createContainerCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY + ":" + DOCKER_IN_DOCKER_IMAGE_TAG)
+            .withHostConfig(newHostConfig()
+                .withNetworkMode(NETWORK_NAME)
+                .withPortBindings(new PortBinding(
+                    Ports.Binding.bindIp("127.0.0.1"),
+                    exposedPort))
+                .withPrivileged(true))
+            .withAliases(DOCKER_IN_DOCKER_CONTAINER_PREFIX + numberOfDockersInDocker.incrementAndGet())
+            .exec();
+
+        String containerId = response.getId();
+        startedContainerIds.add(containerId);
+
+        hostDockerClient.startContainerCmd(containerId).exec();
+
+        InspectContainerResponse inspectContainerResponse = hostDockerClient.inspectContainerCmd(containerId).exec();
+
+        Ports.Binding binding = inspectContainerResponse.getNetworkSettings().getPorts().getBindings().get(exposedPort)[0];
+
+        DockerClient dockerClient = initializeDockerClient(binding);
+
+        await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
+            dockerClient.pingCmd().exec();
+        });
+
+        return dockerClient;
+    }
+
+    private DockerClient initializeDockerClient(Ports.Binding binding) {
+        DefaultDockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder()
+            .withRegistryUrl("https://index.docker.io/v1/")
+            .withDockerHost("tcp://" + binding).build();
+        return DockerClientBuilder.getInstance(config)
+            .withDockerCmdExecFactory(getFactoryType().createExecFactory())
+            .build();
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java
index 50a784291..ea3818836 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmCmdExecIT.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.cmd.swarm;
 
+import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.Swarm;
 import com.github.dockerjava.api.model.SwarmCAConfig;
@@ -23,6 +24,8 @@ public class UpdateSwarmCmdExecIT extends SwarmCmdIT {
 
     @Test
     public void updateSwarm() throws DockerException {
+        DockerClient dockerClient = startSwarm();
+
         SwarmSpec newSpec = new SwarmSpec()
                 .withName("default")
                 .withDispatcher(new SwarmDispatcherConfig()
@@ -38,23 +41,24 @@ public void updateSwarm() throws DockerException {
                         .withLogEntriesForSlowFollowers(200)
                 ).withTaskDefaults(new TaskDefaults());
 
-        Swarm swarm = dockerRule.getClient().inspectSwarmCmd().exec();
+        Swarm swarm = dockerClient.inspectSwarmCmd().exec();
         LOG.info("Inspected swarm: {}", swarm.toString());
         assertThat(swarm.getSpec(), is(not(equalTo(newSpec))));
 
-        dockerRule.getClient().updateSwarmCmd(newSpec)
+        dockerClient.updateSwarmCmd(newSpec)
                 .withVersion(swarm.getVersion().getIndex())
                 .exec();
         LOG.info("Updated swarm: {}", newSpec.toString());
 
-        swarm = dockerRule.getClient().inspectSwarmCmd().exec();
+        swarm = dockerClient.inspectSwarmCmd().exec();
         LOG.info("Inspected swarm: {}", swarm.toString());
         assertThat(swarm.getSpec(), is(equalTo(newSpec)));
     }
 
     @Test(expected = DockerException.class)
-    public void updatingSwarmThrowsWhenNotInSwarm() throws DockerException {
-        dockerRule.getClient().updateSwarmCmd(new SwarmSpec())
+    public void updatingSwarmThrowsWhenNotInSwarm() throws Exception {
+        DockerClient dockerClient = startDockerInDocker();
+        dockerClient.updateSwarmCmd(new SwarmSpec())
                 .withVersion(1L)
                 .exec();
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java
index a4ce630f2..e307f671a 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.cmd.swarm;
 
+import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.model.SwarmNode;
 import com.github.dockerjava.api.model.SwarmNodeAvailability;
 import com.github.dockerjava.api.model.SwarmNodeSpec;
@@ -14,15 +15,16 @@
 public class UpdateSwarmNodeIT extends SwarmCmdIT {
     @Test
     public void testUpdateSwarmNode() throws Exception {
-        List<SwarmNode> nodes = dockerRule.getClient().listSwarmNodesCmd().exec();
+        DockerClient dockerClient = startSwarm();
+        List<SwarmNode> nodes = dockerClient.listSwarmNodesCmd().exec();
         assertThat(1, is(nodes.size()));
         SwarmNode node = nodes.get(0);
         assertThat(SwarmNodeState.READY, is(node.getStatus().getState()));
         //update the node availability
         SwarmNodeSpec nodeSpec = node.getSpec().withAvailability(SwarmNodeAvailability.PAUSE);
-        dockerRule.getClient().updateSwarmNodeCmd().withSwarmNodeId(node.getId()).withVersion(node.getVersion().getIndex())
+        dockerClient.updateSwarmNodeCmd().withSwarmNodeId(node.getId()).withVersion(node.getVersion().getIndex())
                 .withSwarmNodeSpec(nodeSpec).exec();
-        nodes = dockerRule.getClient().listSwarmNodesCmd().exec();
+        nodes = dockerClient.listSwarmNodesCmd().exec();
         assertThat(nodes.size(), is(1));
         assertThat(nodes.get(0).getSpec().getAvailability(), is(SwarmNodeAvailability.PAUSE));
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
index 9aaea3961..f98c3ed36 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.cmd.swarm;
 
+import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.model.ContainerSpec;
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.api.model.NetworkAttachmentConfig;
@@ -21,8 +22,9 @@
 public class UpdateSwarmServiceIT extends SwarmCmdIT {
     @Test
     public void testUpdateServiceReplicate() throws Exception {
+        DockerClient dockerClient = startSwarm();
         //create network
-        String networkId = dockerRule.getClient().createNetworkCmd().withName("networkname").withDriver("overlay")
+        String networkId = dockerClient.createNetworkCmd().withName("networkname").withDriver("overlay")
                 .withIpam(new Network.Ipam().withDriver("default")).exec().getId();
         TaskSpec taskSpec = new TaskSpec().withContainerSpec(
                 new ContainerSpec().withImage("busybox").withArgs(Arrays.asList("sleep", "3600")));
@@ -31,16 +33,16 @@ public void testUpdateServiceReplicate() throws Exception {
                 .withTaskTemplate(taskSpec)
                 .withNetworks(Lists.newArrayList(new NetworkAttachmentConfig().withTarget(networkId)))
                 .withName("worker");
-        String serviceId = dockerRule.getClient().createServiceCmd(serviceSpec).exec().getId();
+        String serviceId = dockerClient.createServiceCmd(serviceSpec).exec().getId();
         await().untilAsserted(() -> {
-            List<Service> services = dockerRule.getClient().listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec();
+            List<Service> services = dockerClient.listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec();
             assertThat(services.size(), is(1));
             Service service = services.get(0);
             ServiceSpec updateServiceSpec = service.getSpec()
                 .withMode(new ServiceModeConfig().withReplicated(new ServiceReplicatedModeOptions().withReplicas(2)));
-            dockerRule.getClient().updateServiceCmd(service.getId(), updateServiceSpec).withVersion(service.getVersion().getIndex()).exec();
+            dockerClient.updateServiceCmd(service.getId(), updateServiceSpec).withVersion(service.getVersion().getIndex()).exec();
             //verify the replicate
-            Service updateService = dockerRule.getClient().listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec().get(0);
+            Service updateService = dockerClient.listServicesCmd().withIdFilter(Arrays.asList(serviceId)).exec().get(0);
             assertThat(updateService.getSpec().getMode().getReplicated().getReplicas(), is(2L));
         });
     }

From a5b9b0be5722734936beb380a702b2874cbe48ca Mon Sep 17 00:00:00 2001
From: klmntoth <47834753+klmntoth@users.noreply.github.com>
Date: Mon, 25 May 2020 09:03:57 +0200
Subject: [PATCH 1015/1272] Fix ListSwarmNodesCmdImpl and Add basic tests
 (#1385)

* Fix ListSwarmNodesCmdImpl and Add basic tests

- fixes withMembershipsFilter
- fixes withRoleFilter
- adds basic tests for the class.

* Update docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSwarmNodesCmdExecIT.java

* Update ListSwarmNodesCmdExecIT.java

* use `startSwarm()`

Co-authored-by: Sergei Egorov <segorov@pivotal.io>
Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../core/command/ListSwarmNodesCmdImpl.java   |  4 +-
 .../cmd/swarm/ListSwarmNodesCmdExecIT.java    | 89 +++++++++++++++++++
 2 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSwarmNodesCmdExecIT.java

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java
index 5b5c5801f..88a06ae04 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java
@@ -44,14 +44,14 @@ public ListSwarmNodesCmd withNameFilter(List<String> names) {
     @Override
     public ListSwarmNodesCmd withMembershipFilter(List<String> memberships) {
         checkNotNull(memberships, "memberships was not specified");
-        this.filters.withNames(memberships);
+        this.filters.withMemberships(memberships);
         return this;
     }
 
     @Override
     public ListSwarmNodesCmd withRoleFilter(List<String> roles) {
         checkNotNull(roles, "roles was not specified");
-        this.filters.withNames(roles);
+        this.filters.withRoles(roles);
         return this;
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSwarmNodesCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSwarmNodesCmdExecIT.java
new file mode 100644
index 000000000..1a4f94c1d
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSwarmNodesCmdExecIT.java
@@ -0,0 +1,89 @@
+package com.github.dockerjava.cmd.swarm;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.model.SwarmNode;
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+public class ListSwarmNodesCmdExecIT extends SwarmCmdIT {
+    @Test
+    public void testListSwarmNodes() throws Exception {
+        DockerClient dockerClient = startSwarm();
+
+        List<SwarmNode> nodes = dockerClient.listSwarmNodesCmd().exec();
+        assertThat(nodes.size(), is(1));
+    }
+
+    @Test
+    public void testListSwarmNodesWithIdFilter() throws Exception {
+        DockerClient dockerClient = startSwarm();
+
+        List<SwarmNode> nodes = dockerClient.listSwarmNodesCmd().exec();
+        assertThat(nodes.size(), is(1));
+
+        String nodeId = nodes.get(0).getId();
+        List<SwarmNode> nodesWithId = dockerClient.listSwarmNodesCmd()
+            .withIdFilter(Collections.singletonList(nodeId))
+            .exec();
+        assertThat(nodesWithId.size(), is(1));
+
+        List<SwarmNode> nodesWithNonexistentId = dockerClient.listSwarmNodesCmd()
+            .withIdFilter(Collections.singletonList("__nonexistent__"))
+            .exec();
+        assertThat(nodesWithNonexistentId.size(), is(0));
+    }
+
+    @Test
+    public void testListSwarmNodesWithNameFilter() throws Exception {
+        DockerClient dockerClient = startSwarm();
+
+        List<SwarmNode> nodes = dockerClient.listSwarmNodesCmd().exec();
+        assertThat(nodes.size(), is(1));
+
+        String nodeName = nodes.get(0).getSpec().getName();
+        List<SwarmNode> nodesWithFirstNodesName = dockerClient.listSwarmNodesCmd()
+            .withNameFilter(Collections.singletonList(nodeName))
+            .exec();
+        assertThat(nodesWithFirstNodesName.size(), is(1));
+
+        List<SwarmNode> nodesWithNonexistentName = dockerClient.listSwarmNodesCmd()
+            .withNameFilter(Collections.singletonList("__nonexistent__"))
+            .exec();
+        assertThat(nodesWithNonexistentName.size(), is(0));
+    }
+
+    @Test
+    public void testListSwarmNodesWithMembershipFilter() throws Exception {
+        DockerClient dockerClient = startSwarm();
+
+        List<SwarmNode> nodesWithAcceptedMembership = dockerClient.listSwarmNodesCmd()
+            .withMembershipFilter(Collections.singletonList("accepted"))
+            .exec();
+        assertThat(nodesWithAcceptedMembership.size(), is(1));
+
+        List<SwarmNode> nodesWithPendingMembership = dockerClient.listSwarmNodesCmd()
+            .withMembershipFilter(Collections.singletonList("pending"))
+            .exec();
+        assertThat(nodesWithPendingMembership.size(), is(0));
+    }
+
+    @Test
+    public void testListSwarmNodesWithRoleFilter() throws Exception {
+        DockerClient dockerClient = startSwarm();
+
+        List<SwarmNode> nodesWithManagerRole = dockerClient.listSwarmNodesCmd()
+            .withRoleFilter(Collections.singletonList("manager"))
+            .exec();
+        assertThat(nodesWithManagerRole.size(), is(1));
+
+        List<SwarmNode> nodesWithWorkerRole = dockerClient.listSwarmNodesCmd()
+            .withRoleFilter(Collections.singletonList("worker"))
+            .exec();
+        assertThat(nodesWithWorkerRole.size(), is(0));
+    }
+}

From 55cdfa44af313bf640600a7c7dd8c93f85813f75 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Wed, 27 May 2020 21:58:22 +0200
Subject: [PATCH 1016/1272] Explain deprecations (#1401)

---
 .../api/command/CreateContainerCmd.java       | 242 +++++++++++++++++-
 .../dockerjava/core/DockerClientImpl.java     |   2 +-
 .../AttachContainerResultCallback.java        |   1 +
 .../command/BuildImageResultCallback.java     |  10 +-
 .../core/command/EventsResultCallback.java    |   1 +
 .../core/command/ExecStartResultCallback.java |  10 +-
 .../command/LogContainerResultCallback.java   |   1 +
 .../core/command/PullImageResultCallback.java |   1 +
 .../core/command/PushImageResultCallback.java |   1 +
 .../command/WaitContainerResultCallback.java  |  13 +-
 10 files changed, 263 insertions(+), 19 deletions(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index d9b9503ad..2fc6e6faa 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -44,6 +44,10 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     List<String> getAliases();
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -51,6 +55,10 @@ default Bind[] getBinds() {
         return getHostConfig().getBinds();
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withBinds(Bind... binds) {
         Objects.requireNonNull(binds, "binds was not specified");
@@ -58,6 +66,10 @@ default CreateContainerCmd withBinds(Bind... binds) {
         return this;
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withBinds(List<Bind> binds) {
         Objects.requireNonNull(binds, "binds was not specified");
@@ -158,6 +170,10 @@ default CreateContainerCmd withBinds(List<Bind> binds) {
 
     CreateContainerCmd withIpv4Address(String ipv4Address);
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -167,6 +183,8 @@ default Link[] getLinks() {
 
     /**
      * Add link to another container.
+     *
+     * @deprecated see {@link #getHostConfig()}
      */
     @Deprecated
     default CreateContainerCmd withLinks(Link... links) {
@@ -177,6 +195,8 @@ default CreateContainerCmd withLinks(Link... links) {
 
     /**
      * Add link to another container.
+     *
+     * @deprecated see {@link #getHostConfig()}
      */
     @Deprecated
     default CreateContainerCmd withLinks(List<Link> links) {
@@ -199,6 +219,10 @@ default CreateContainerCmd withLinks(List<Link> links) {
 
     CreateContainerCmd withMacAddress(String macAddress);
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -206,6 +230,10 @@ default Long getMemory() {
         return getHostConfig().getMemory();
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withMemory(Long memory) {
         Objects.requireNonNull(memory, "memory was not specified");
@@ -213,6 +241,10 @@ default CreateContainerCmd withMemory(Long memory) {
         return this;
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -220,6 +252,10 @@ default Long getMemorySwap() {
         return getHostConfig().getMemorySwap();
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withMemorySwap(Long memorySwap) {
         Objects.requireNonNull(memorySwap, "memorySwap was not specified");
@@ -230,6 +266,10 @@ default CreateContainerCmd withMemorySwap(Long memorySwap) {
     @CheckForNull
     String getName();
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -246,6 +286,8 @@ default String getNetworkMode() {
      * <li>'host': use the host network stack inside the container. Note: the host mode gives the container full access to local system
      * services such as D-bus and is therefore considered insecure.</li>
      * </ul>
+     *
+     * @deprecated see {@link #getHostConfig()}
      */
     @Deprecated
     default CreateContainerCmd withNetworkMode(String networkMode) {
@@ -254,6 +296,10 @@ default CreateContainerCmd withNetworkMode(String networkMode) {
         return this;
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -264,6 +310,8 @@ default Ports getPortBindings() {
     /**
      * Add one or more {@link PortBinding}s. This corresponds to the <code>--publish</code> (<code>-p</code>) option of the
      * <code>docker run</code> CLI command.
+     *
+     * @deprecated see {@link #getHostConfig()}
      */
     @Deprecated
     default CreateContainerCmd withPortBindings(PortBinding... portBindings) {
@@ -275,6 +323,8 @@ default CreateContainerCmd withPortBindings(PortBinding... portBindings) {
     /**
      * Add one or more {@link PortBinding}s. This corresponds to the <code>--publish</code> (<code>-p</code>) option of the
      * <code>docker run</code> CLI command.
+     *
+     * @deprecated see {@link #getHostConfig()}
      */
     @Deprecated
     default CreateContainerCmd withPortBindings(List<PortBinding> portBindings) {
@@ -285,7 +335,7 @@ default CreateContainerCmd withPortBindings(List<PortBinding> portBindings) {
     /**
      * Add the port bindings that are contained in the given {@link Ports} object.
      *
-     * @see #withPortBindings(PortBinding...)
+     * @deprecated see {@link #getHostConfig()}
      */
     @Deprecated
     default CreateContainerCmd withPortBindings(Ports portBindings) {
@@ -303,6 +353,10 @@ default CreateContainerCmd withPortBindings(Ports portBindings) {
 
     CreateContainerCmd withPortSpecs(List<String> portSpecs);
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -310,6 +364,10 @@ default Boolean getPrivileged() {
         return getHostConfig().getPrivileged();
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withPrivileged(Boolean privileged) {
         Objects.requireNonNull(privileged, "no privileged was specified");
@@ -329,6 +387,10 @@ default CreateContainerCmd withPrivileged(Boolean privileged) {
 
     CreateContainerCmd withVolumes(List<Volume> volumes);
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -336,6 +398,10 @@ default VolumesFrom[] getVolumesFrom() {
         return getHostConfig().getVolumesFrom();
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom) {
         Objects.requireNonNull(volumesFrom, "volumesFrom was not specified");
@@ -343,6 +409,10 @@ default CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom) {
         return this;
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withVolumesFrom(List<VolumesFrom> volumesFrom) {
         requireNonNull(volumesFrom, "volumesFrom was not specified");
@@ -389,6 +459,10 @@ default CreateContainerCmd withVolumesFrom(List<VolumesFrom> volumesFrom) {
 
     CreateContainerCmd withTty(Boolean tty);
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -396,6 +470,10 @@ default Boolean getPublishAllPorts() {
         return getHostConfig().getPublishAllPorts();
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts) {
         requireNonNull(publishAllPorts, "no publishAllPorts was specified");
@@ -403,6 +481,10 @@ default CreateContainerCmd withPublishAllPorts(Boolean publishAllPorts) {
         return this;
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @CheckForNull
     @Deprecated
     @JsonIgnore
@@ -412,6 +494,8 @@ default String[] getExtraHosts() {
 
     /**
      * Add hostnames to /etc/hosts in the container
+     *
+     * @deprecated see {@link #getHostConfig()}
      */
     @Deprecated
     default CreateContainerCmd withExtraHosts(String... extraHosts) {
@@ -422,6 +506,8 @@ default CreateContainerCmd withExtraHosts(String... extraHosts) {
 
     /**
      * Add hostnames to /etc/hosts in the container
+     *
+     * @deprecated see {@link #getHostConfig()}
      */
     @Deprecated
     default CreateContainerCmd withExtraHosts(List<String> extraHosts) {
@@ -429,6 +515,10 @@ default CreateContainerCmd withExtraHosts(List<String> extraHosts) {
         return withExtraHosts(extraHosts.toArray(new String[extraHosts.size()]));
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @CheckForNull
     @Deprecated
     @JsonIgnore
@@ -439,6 +529,8 @@ default Capability[] getCapAdd() {
     /**
      * Add linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> to the container. For example:
      * adding {@link Capability#MKNOD} allows the container to create special files using the 'mknod' command.
+     *
+     * @deprecated see {@link #getHostConfig()}
      */
     @Deprecated
     default CreateContainerCmd withCapAdd(Capability... capAdd) {
@@ -450,6 +542,8 @@ default CreateContainerCmd withCapAdd(Capability... capAdd) {
     /**
      * Add linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> to the container. For example:
      * adding {@link Capability#MKNOD} allows the container to create special files using the 'mknod' command.
+     *
+     * @deprecated see {@link #getHostConfig()}
      */
     @Deprecated
     default CreateContainerCmd withCapAdd(List<Capability> capAdd) {
@@ -457,6 +551,10 @@ default CreateContainerCmd withCapAdd(List<Capability> capAdd) {
         return withCapAdd(capAdd.toArray(new Capability[capAdd.size()]));
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @CheckForNull
     @Deprecated
     @JsonIgnore
@@ -467,6 +565,8 @@ default Capability[] getCapDrop() {
     /**
      * Drop linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> from the container. For example:
      * dropping {@link Capability#CHOWN} prevents the container from changing the owner of any files.
+     *
+     * @deprecated see {@link #getHostConfig()}
      */
     @Deprecated
     default CreateContainerCmd withCapDrop(Capability... capDrop) {
@@ -478,6 +578,8 @@ default CreateContainerCmd withCapDrop(Capability... capDrop) {
     /**
      * Drop linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> from the container. For example:
      * dropping {@link Capability#CHOWN} prevents the container from changing the owner of any files.
+     *
+     * @deprecated see {@link #getHostConfig()}
      */
     @Deprecated
     default CreateContainerCmd withCapDrop(List<Capability> capDrop) {
@@ -499,6 +601,10 @@ default CreateContainerCmd withCapDrop(List<Capability> capDrop) {
     // The following methods are deprecated and should be set on {@link #getHostConfig()} instead.
     // TODO remove in the next big release
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -506,6 +612,10 @@ default Integer getBlkioWeight() {
         return getHostConfig().getBlkioWeight();
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @CheckForNull
     @Deprecated
     @JsonIgnore
@@ -513,6 +623,10 @@ default String getCgroupParent() {
         return getHostConfig().getCgroupParent();
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -521,6 +635,10 @@ default Integer getCpuPeriod() {
         return result != null ? result.intValue() : null;
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -528,6 +646,10 @@ default Integer getCpuShares() {
         return getHostConfig().getCpuShares();
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -535,6 +657,10 @@ default String getCpusetCpus() {
         return getHostConfig().getCpusetCpus();
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -542,6 +668,10 @@ default String getCpusetMems() {
         return getHostConfig().getCpusetMems();
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -549,6 +679,10 @@ default Device[] getDevices() {
         return getHostConfig().getDevices();
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -556,6 +690,10 @@ default String[] getDns() {
         return getHostConfig().getDns();
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -563,6 +701,10 @@ default String[] getDnsSearch() {
         return getHostConfig().getDnsSearch();
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -570,6 +712,10 @@ default LogConfig getLogConfig() {
         return getHostConfig().getLogConfig();
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -577,6 +723,10 @@ default LxcConf[] getLxcConf() {
         return getHostConfig().getLxcConf();
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -584,6 +734,10 @@ default Boolean getOomKillDisable() {
         return getHostConfig().getOomKillDisable();
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -591,6 +745,10 @@ default String getPidMode() {
         return getHostConfig().getPidMode();
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -598,6 +756,10 @@ default Boolean getReadonlyRootfs() {
         return getHostConfig().getReadonlyRootfs();
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -605,6 +767,10 @@ default RestartPolicy getRestartPolicy() {
         return getHostConfig().getRestartPolicy();
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @CheckForNull
     @JsonIgnore
@@ -612,48 +778,80 @@ default Ulimit[] getUlimits() {
         return getHostConfig().getUlimits();
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withBlkioWeight(Integer blkioWeight) {
         getHostConfig().withBlkioWeight(blkioWeight);
         return this;
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withCgroupParent(String cgroupParent) {
         getHostConfig().withCgroupParent(cgroupParent);
         return this;
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withContainerIDFile(String containerIDFile) {
         getHostConfig().withContainerIDFile(containerIDFile);
         return this;
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withCpuPeriod(Integer cpuPeriod) {
         getHostConfig().withCpuPeriod(cpuPeriod != null ? cpuPeriod.longValue() : null);
         return this;
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withCpuShares(Integer cpuShares) {
         getHostConfig().withCpuShares(cpuShares);
         return this;
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withCpusetCpus(String cpusetCpus) {
         getHostConfig().withCpusetCpus(cpusetCpus);
         return this;
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withCpusetMems(String cpusetMems) {
         getHostConfig().withCpusetMems(cpusetMems);
         return this;
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withDevices(Device... devices) {
         getHostConfig().withDevices(devices);
@@ -662,6 +860,8 @@ default CreateContainerCmd withDevices(Device... devices) {
 
     /**
      * Add host devices to the container
+     *
+     * @deprecated see {@link #getHostConfig()}
      */
     @Deprecated
     default CreateContainerCmd withDevices(List<Device> devices) {
@@ -671,6 +871,8 @@ default CreateContainerCmd withDevices(List<Device> devices) {
 
     /**
      * Set custom DNS servers
+     *
+     * @deprecated see {@link #getHostConfig()}
      */
     @Deprecated
     default CreateContainerCmd withDns(String... dns) {
@@ -680,6 +882,8 @@ default CreateContainerCmd withDns(String... dns) {
 
     /**
      * Set custom DNS servers
+     *
+     * @deprecated see {@link #getHostConfig()}
      */
     @Deprecated
     default CreateContainerCmd withDns(List<String> dns) {
@@ -689,6 +893,8 @@ default CreateContainerCmd withDns(List<String> dns) {
 
     /**
      * Set custom DNS search domains
+     *
+     * @deprecated see {@link #getHostConfig()}
      */
     @Deprecated
     default CreateContainerCmd withDnsSearch(String... dnsSearch) {
@@ -698,6 +904,8 @@ default CreateContainerCmd withDnsSearch(String... dnsSearch) {
 
     /**
      * Set custom DNS search domains
+     *
+     * @deprecated see {@link #getHostConfig()}
      */
     @Deprecated
     default CreateContainerCmd withDnsSearch(List<String> dnsSearch) {
@@ -705,24 +913,40 @@ default CreateContainerCmd withDnsSearch(List<String> dnsSearch) {
         return this;
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withLogConfig(LogConfig logConfig) {
         getHostConfig().withLogConfig(logConfig);
         return this;
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withLxcConf(LxcConf... lxcConf) {
         getHostConfig().withLxcConf(lxcConf);
         return this;
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withLxcConf(List<LxcConf> lxcConf) {
         getHostConfig().withLxcConf(lxcConf.toArray(new LxcConf[0]));
         return this;
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withOomKillDisable(Boolean oomKillDisable) {
         getHostConfig().withOomKillDisable(oomKillDisable);
@@ -731,6 +955,8 @@ default CreateContainerCmd withOomKillDisable(Boolean oomKillDisable) {
 
     /**
      * Set the PID (Process) Namespace mode for the container, 'host': use the host's PID namespace inside the container
+     *
+     * @deprecated see {@link #getHostConfig()}
      */
     @Deprecated
     default CreateContainerCmd withPidMode(String pidMode) {
@@ -738,6 +964,10 @@ default CreateContainerCmd withPidMode(String pidMode) {
         return this;
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs) {
         getHostConfig().withReadonlyRootfs(readonlyRootfs);
@@ -746,6 +976,8 @@ default CreateContainerCmd withReadonlyRootfs(Boolean readonlyRootfs) {
 
     /**
      * Set custom {@link RestartPolicy} for the container. Defaults to {@link RestartPolicy#noRestart()}
+     *
+     * @deprecated see {@link #getHostConfig()}
      */
     @Deprecated
     default CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) {
@@ -753,6 +985,10 @@ default CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) {
         return this;
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     @JsonIgnore
     default CreateContainerCmd withUlimits(Ulimit... ulimits) {
@@ -760,6 +996,10 @@ default CreateContainerCmd withUlimits(Ulimit... ulimits) {
         return this;
     }
 
+    /**
+     *
+     * @deprecated see {@link #getHostConfig()}
+     */
     @Deprecated
     default CreateContainerCmd withUlimits(List<Ulimit> ulimits) {
         getHostConfig().withUlimits(ulimits);
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 3e1b59b1e..34018ddc9 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -215,7 +215,7 @@ public DockerHttpClient getHttpClient() {
     }
 
     /**
-     * @deprecated use {{@link #withHttpClient(DockerHttpClient)}}
+     * @deprecated use {@link #withHttpClient(DockerHttpClient)}
      */
     @Deprecated
     public DockerClientImpl withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) {
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
index f445789fc..1e4d22cc8 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerResultCallback.java
@@ -13,6 +13,7 @@
  *
  * @author Marcus Linke
  *
+ * @deprecated use {@link com.github.dockerjava.api.async.ResultCallback.Adapter}
  */
 @Deprecated
 public class AttachContainerResultCallback extends ResultCallbackTemplate<AttachContainerResultCallback, Frame> {
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
index fbe22170c..f94a751d4 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
@@ -3,19 +3,19 @@
  */
 package com.github.dockerjava.core.command;
 
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.BuildResponseItem;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.TimeUnit;
 
 /**
  *
  * @author Marcus Linke
  *
+ * @deprecated use {@link com.github.dockerjava.api.command.BuildImageResultCallback}
  */
 @Deprecated
 public class BuildImageResultCallback extends ResultCallbackTemplate<BuildImageResultCallback, BuildResponseItem> {
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
index 45b5b83e9..e6df7fbc1 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsResultCallback.java
@@ -13,6 +13,7 @@
  *
  * @author Marcus Linke
  *
+ * @deprecated use {@link com.github.dockerjava.api.async.ResultCallback.Adapter}
  */
 @Deprecated
 public class EventsResultCallback extends ResultCallbackTemplate<EventsResultCallback, Event> {
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
index 8a8235ac6..39c0e1e8c 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartResultCallback.java
@@ -1,18 +1,18 @@
 package com.github.dockerjava.core.command;
 
-import java.io.IOException;
-import java.io.OutputStream;
-
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.async.ResultCallbackTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.core.async.ResultCallbackTemplate;
+import java.io.IOException;
+import java.io.OutputStream;
 
 /**
  *
  * @author Marcus Linke
  *
+ * @deprecated use {@link com.github.dockerjava.api.async.ResultCallback.Adapter}
  */
 @Deprecated
 public class ExecStartResultCallback extends ResultCallbackTemplate<ExecStartResultCallback, Frame> {
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
index 45657bef8..d80a765ef 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerResultCallback.java
@@ -13,6 +13,7 @@
  *
  * @author Marcus Linke
  *
+ * @deprecated use {@link com.github.dockerjava.api.async.ResultCallback.Adapter}
  */
 @Deprecated
 public class LogContainerResultCallback extends ResultCallbackTemplate<LogContainerResultCallback, Frame> {
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
index d7bad3256..67b6b5e48 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
@@ -18,6 +18,7 @@
  *
  * @author Marcus Linke
  *
+ * @deprecated use {@link com.github.dockerjava.api.command.PullImageResultCallback}
  */
 @Deprecated
 public class PullImageResultCallback extends ResultCallbackTemplate<PullImageResultCallback, PullResponseItem> {
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
index 3e16eec2f..06f1fbc8d 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
@@ -16,6 +16,7 @@
  *
  * @author Marcus Linke
  *
+ * @deprecated use {@link com.github.dockerjava.api.async.ResultCallback.Adapter}
  */
 @Deprecated
 public class PushImageResultCallback extends ResultCallbackTemplate<PushImageResultCallback, PushResponseItem> {
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
index caefc1b49..b9cd245e7 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerResultCallback.java
@@ -3,21 +3,20 @@
  */
 package com.github.dockerjava.core.command;
 
-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.CheckForNull;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.WaitResponse;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.CheckForNull;
+import java.util.concurrent.TimeUnit;
 
 /**
  *
  * @author Marcus Linke
  *
+ * @deprecated use {@link com.github.dockerjava.api.command.WaitContainerResultCallback}
  */
 @Deprecated
 public class WaitContainerResultCallback extends ResultCallbackTemplate<WaitContainerResultCallback, WaitResponse> {

From 0992a76ec9c2a339210643d3c5f2001d0460f9a2 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Wed, 27 May 2020 22:37:22 +0200
Subject: [PATCH 1017/1272] Add release pipeline

---
 .github/workflows/release.yml | 23 +++++++++++++++++++++++
 pom.xml                       | 13 +++++--------
 2 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 000000000..741eaf9ab
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,23 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - ".*"
+
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up JDK 8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 8
+      - name: Set version
+        run: ./mvnw versions:set -DnewVersion="${{github.event.release.tag_name}}"
+      # TODO check master's CI status
+      - name: Deploy with Maven
+        env:
+          MAVEN_DEPLOYMENT_REPOSITORY: ${{ secrets.MAVEN_DEPLOYMENT_REPOSITORY }}
+        run: ./mvnw deploy -DaltReleaseDeploymentRepository="$MAVEN_DEPLOYMENT_REPOSITORY"
diff --git a/pom.xml b/pom.xml
index 76a0c1bd9..d875f2ee0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,11 @@
 			<name>Konstantin Pelykh</name>
 			<email>kpelykh@gmail.com</email>
 		</developer>
+		<developer>
+			<id>bsideup</id>
+			<name>Sergei Egorov</name>
+			<email>bsideup@gmail.com</email>
+		</developer>
 	</developers>
 
 	<properties>
@@ -96,14 +101,6 @@
 		<module>docker-java</module>
 	</modules>
 
-	<distributionManagement>
-		<repository>
-			<id>bintray-docker-java-releases</id>
-			<name>docker-java-releases</name>
-			<url>https://api.bintray.com/maven/docker-java/releases/docker-java/;publish=0</url>
-		</repository>
-	</distributionManagement>
-
 	<build>
 		<pluginManagement>
 			<plugins>

From 44ac9f2372091eabea85ef24190aa740e6071e6b Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Wed, 27 May 2020 22:42:07 +0200
Subject: [PATCH 1018/1272] change the trigger type

---
 .github/workflows/release.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 741eaf9ab..b9e2bc8b4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,9 +1,9 @@
 name: Release
 
 on:
-  push:
-    tags:
-      - ".*"
+  release:
+    types:
+      - created
 
 jobs:
   build:

From 0d6745255a83e31aeba27b2764a8eb0029b651b3 Mon Sep 17 00:00:00 2001
From: klmntoth <47834753+klmntoth@users.noreply.github.com>
Date: Fri, 29 May 2020 12:07:54 +0200
Subject: [PATCH 1019/1272] Fix HostConfig's NanoCpus JsonProperty wrong casing
 (#1387)

* Fix HostConfig's NanoCpus JsonProperty wrong casing

- fixes HostConfig's NanoCpus JsonProperty casing
- adds basic tests related to HostConfig NanoCPUs

* Remove unnecessary NanoCPUs test

Co-authored-by: Sergei Egorov <segorov@pivotal.io>
---
 .../dockerjava/api/model/HostConfig.java      |  2 +-
 .../dockerjava/cmd/CreateContainerCmdIT.java  | 19 +++++++++++++++++++
 .../dockerjava/cmd/InspectContainerCmdIT.java | 15 +++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index afe38d245..0151076fd 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -70,7 +70,7 @@ public static HostConfig newHostConfig() {
     @JsonProperty("MemorySwappiness")
     private Long memorySwappiness;
 
-    @JsonProperty("NanoCPUs")
+    @JsonProperty("NanoCpus")
     private Long nanoCPUs;
 
     @JsonProperty("CapAdd")
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index 227c0acc9..0ae715b5d 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -1065,4 +1065,23 @@ public void createContainerWithTmpFs() throws DockerException {
         InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
         assertThat(inspectContainerResponse.getHostConfig().getTmpFs().get("/tmp"), equalTo("rw,noexec,nosuid,size=50m"));
     }
+
+    @Test
+    public void createContainerWithNanoCPUs() throws DockerException {
+        Long nanoCPUs = 1000000000L;
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+            .withCmd("sleep", "9999")
+            .withHostConfig(newHostConfig()
+                .withNanoCPUs(nanoCPUs))
+            .exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(is(emptyString())));
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getHostConfig().getNanoCPUs(), is(nanoCPUs));
+    }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
index 25b9aff18..9e47cfd9f 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
@@ -138,4 +138,19 @@ public void inspectContainerNetworkSettings() throws DockerException {
 
         assertFalse(inspectContainerResponse.getNetworkSettings().getHairpinMode());
     }
+
+    @Test
+    public void inspectContainerNanoCPUs() throws DockerException {
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+            .withCmd("env").exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(is(emptyString())));
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getHostConfig().getNanoCPUs(), is(0L));
+    }
 }

From 4de9f79d5081bbaf735990efa302d98784a41668 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Fri, 29 May 2020 21:33:36 +0200
Subject: [PATCH 1020/1272] Introduce `docker-java-transport` module (#1402)

* Introduce `docker-java-transport` module

* cleanups
---
 docker-java-core/pom.xml                      | 12 ++---
 .../core/DefaultDockerCmdExecFactory.java     |  1 +
 .../core/DefaultInvocationBuilder.java        |  1 +
 .../dockerjava/core/DockerClientImpl.java     |  1 +
 .../core/FramedInputStreamConsumer.java       |  1 +
 .../com/github/dockerjava/core/SSLConfig.java | 20 ++------
 docker-java-transport-httpclient5/pom.xml     |  2 +-
 .../httpclient5/ApacheDockerHttpClient.java   | 41 +++++++++-------
 .../jaxrs/JerseyDockerCmdExecFactory.java     |  6 ++-
 .../jaxrs/JerseyDockerHttpClient.java         | 33 +++++++------
 .../filter/ResponseStatusExceptionFilter.java | 28 +++++------
 .../okhttp/HijackingInterceptor.java          |  2 +-
 .../dockerjava/okhttp/OkDockerHttpClient.java | 28 +++++++----
 .../okhttp/OkHttpDockerCmdExecFactory.java    |  6 ++-
 docker-java-transport/pom.xml                 | 48 +++++++++++++++++++
 .../transport}/DockerHttpClient.java          |  2 +-
 .../dockerjava/transport/SSLConfig.java       | 21 ++++++++
 .../java/com/github/dockerjava/cmd/CmdIT.java |  3 +-
 .../core/command/DockerfileFixture.java       |  3 +-
 pom.xml                                       |  1 +
 20 files changed, 169 insertions(+), 91 deletions(-)
 create mode 100644 docker-java-transport/pom.xml
 rename {docker-java-core/src/main/java/com/github/dockerjava/core => docker-java-transport/src/main/java/com/github/dockerjava/transport}/DockerHttpClient.java (97%)
 create mode 100644 docker-java-transport/src/main/java/com/github/dockerjava/transport/SSLConfig.java

diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index ed77c9db7..660dc66cd 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -21,6 +21,11 @@
 			<artifactId>docker-java-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java-transport</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -70,13 +75,6 @@
 			<version>3.0.1u2</version>
 			<scope>provided</scope>
 		</dependency>
-
-		<dependency>
-			<groupId>org.immutables</groupId>
-			<artifactId>value</artifactId>
-			<version>2.8.2</version>
-			<scope>provided</scope>
-		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java
index 5e13824ef..75e27c365 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.transport.DockerHttpClient;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.MultimapBuilder;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java
index 50bd4612b..100904d7f 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java
@@ -14,6 +14,7 @@
 import com.github.dockerjava.api.exception.NotModifiedException;
 import com.github.dockerjava.api.exception.UnauthorizedException;
 import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.transport.DockerHttpClient;
 import org.apache.commons.io.IOUtils;
 
 import java.io.ByteArrayInputStream;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 34018ddc9..36c56b32c 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -148,6 +148,7 @@
 import com.github.dockerjava.core.command.UpdateSwarmNodeCmdImpl;
 import com.github.dockerjava.core.command.VersionCmdImpl;
 import com.github.dockerjava.core.command.WaitContainerCmdImpl;
+import com.github.dockerjava.transport.DockerHttpClient;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/FramedInputStreamConsumer.java b/docker-java-core/src/main/java/com/github/dockerjava/core/FramedInputStreamConsumer.java
index fde82647e..c81521076 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/FramedInputStreamConsumer.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/FramedInputStreamConsumer.java
@@ -3,6 +3,7 @@
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.StreamType;
+import com.github.dockerjava.transport.DockerHttpClient;
 
 import java.io.InputStream;
 import java.util.Arrays;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/SSLConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/SSLConfig.java
index 0346aa610..c3a05efb2 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/SSLConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/SSLConfig.java
@@ -1,22 +1,10 @@
 package com.github.dockerjava.core;
 
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-
-import javax.net.ssl.SSLContext;
-
 /**
- * Get an SSL Config. Allows for various different implementations.
+ *
+ * @deprecated use {@link com.github.dockerjava.transport.SSLConfig}
  */
-public interface SSLConfig {
+@Deprecated
+public interface SSLConfig extends com.github.dockerjava.transport.SSLConfig {
 
-    /**
-     * Get the SSL Context, from wherever it comes (file, keystore).
-     *
-     * @return an SSL context.
-     */
-    SSLContext getSSLContext() throws KeyManagementException, UnrecoverableKeyException, NoSuchAlgorithmException,
-            KeyStoreException;
 }
diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml
index 2ed959e83..41300602f 100644
--- a/docker-java-transport-httpclient5/pom.xml
+++ b/docker-java-transport-httpclient5/pom.xml
@@ -18,7 +18,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>docker-java-core</artifactId>
+			<artifactId>docker-java-transport</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java
index 997a7d57a..abb8b1fb7 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java
@@ -1,8 +1,7 @@
 package com.github.dockerjava.httpclient5;
 
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.DockerHttpClient;
-import com.github.dockerjava.core.SSLConfig;
+import com.github.dockerjava.transport.SSLConfig;
+import com.github.dockerjava.transport.DockerHttpClient;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
@@ -44,16 +43,23 @@ public final class ApacheDockerHttpClient implements DockerHttpClient {
 
     public static final class Factory {
 
-        private DockerClientConfig dockerClientConfig = null;
+        private URI dockerHost = null;
 
-        public Factory dockerClientConfig(DockerClientConfig value) {
-            this.dockerClientConfig = value;
+        private SSLConfig sslConfig = null;
+
+        public Factory dockerHost(URI value) {
+            this.dockerHost = Objects.requireNonNull(value, "dockerHost");
+            return this;
+        }
+
+        public Factory sslConfig(SSLConfig value) {
+            this.sslConfig = value;
             return this;
         }
 
         public ApacheDockerHttpClient build() {
-            Objects.requireNonNull(dockerClientConfig, "dockerClientConfig");
-            return new ApacheDockerHttpClient(dockerClientConfig);
+            Objects.requireNonNull(dockerHost, "dockerHost");
+            return new ApacheDockerHttpClient(dockerHost, sslConfig);
         }
     }
 
@@ -61,10 +67,11 @@ public ApacheDockerHttpClient build() {
 
     private final HttpHost host;
 
-    private ApacheDockerHttpClient(DockerClientConfig dockerClientConfig) {
-        Registry<ConnectionSocketFactory> socketFactoryRegistry = createConnectionSocketFactoryRegistry(dockerClientConfig);
-
-        URI dockerHost = dockerClientConfig.getDockerHost();
+    private ApacheDockerHttpClient(
+        URI dockerHost,
+        SSLConfig sslConfig
+    ) {
+        Registry<ConnectionSocketFactory> socketFactoryRegistry = createConnectionSocketFactoryRegistry(sslConfig, dockerHost);
 
         switch (dockerHost.getScheme()) {
             case "unix":
@@ -106,10 +113,12 @@ private ApacheDockerHttpClient(DockerClientConfig dockerClientConfig) {
             .build();
     }
 
-    private Registry<ConnectionSocketFactory> createConnectionSocketFactoryRegistry(DockerClientConfig dockerClientConfig) {
+    private Registry<ConnectionSocketFactory> createConnectionSocketFactoryRegistry(
+        SSLConfig sslConfig,
+        URI dockerHost
+    ) {
         RegistryBuilder<ConnectionSocketFactory> socketFactoryRegistryBuilder = RegistryBuilder.create();
 
-        SSLConfig sslConfig = dockerClientConfig.getSSLConfig();
         if (sslConfig != null) {
             try {
                 SSLContext sslContext = sslConfig.getSSLContext();
@@ -127,16 +136,12 @@ private Registry<ConnectionSocketFactory> createConnectionSocketFactoryRegistry(
             .register("unix", new PlainConnectionSocketFactory() {
                 @Override
                 public Socket createSocket(HttpContext context) throws IOException {
-                    URI dockerHost = dockerClientConfig.getDockerHost();
-
                     return new UnixDomainSocket(dockerHost.getPath());
                 }
             })
             .register("npipe", new PlainConnectionSocketFactory() {
                 @Override
                 public Socket createSocket(HttpContext context) {
-                    URI dockerHost = dockerClientConfig.getDockerHost();
-
                     return new NamedPipeSocket(dockerHost.getPath());
                 }
             })
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
index 82d7b8324..37e1ba3f5 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -6,7 +6,7 @@
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.DockerClientConfigAware;
 import com.github.dockerjava.core.DockerClientImpl;
-import com.github.dockerjava.core.DockerHttpClient;
+import com.github.dockerjava.transport.DockerHttpClient;
 import org.glassfish.jersey.client.RequestEntityProcessing;
 
 import javax.ws.rs.client.ClientRequestFilter;
@@ -37,7 +37,9 @@ public final DockerCmdExecFactory getDockerCmdExecFactory() {
 
     @Override
     public void init(DockerClientConfig dockerClientConfig) {
-        clientFactory = clientFactory.dockerClientConfig(dockerClientConfig);
+        clientFactory = clientFactory
+            .dockerHost(dockerClientConfig.getDockerHost())
+            .sslConfig(dockerClientConfig.getSSLConfig());
         dockerCmdExecFactory = new DefaultDockerCmdExecFactory(
             clientFactory.build(),
             dockerClientConfig.getObjectMapper()
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
index c2f9f78da..dd0b57a30 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
@@ -1,11 +1,9 @@
 package com.github.dockerjava.jaxrs;
 
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.exception.DockerException;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.DockerHttpClient;
-import com.github.dockerjava.core.SSLConfig;
+import com.github.dockerjava.transport.DockerHttpClient;
+import com.github.dockerjava.transport.SSLConfig;
 import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter;
 import com.github.dockerjava.jaxrs.filter.SelectiveLoggingFilter;
 import org.apache.http.client.config.RequestConfig;
@@ -42,12 +40,15 @@
 import java.net.URISyntaxException;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 public final class JerseyDockerHttpClient implements DockerHttpClient {
 
     public static final class Factory {
 
-        private DockerClientConfig dockerClientConfig = null;
+        private URI dockerHost = null;
+
+        private SSLConfig sslConfig = null;
 
         private Integer readTimeout = null;
 
@@ -65,8 +66,13 @@ public static final class Factory {
 
         private RequestEntityProcessing requestEntityProcessing;
 
-        public Factory dockerClientConfig(DockerClientConfig value) {
-            this.dockerClientConfig = value;
+        public Factory dockerHost(URI value) {
+            this.dockerHost = Objects.requireNonNull(value, "dockerHost");
+            return this;
+        }
+
+        public Factory sslConfig(SSLConfig value) {
+            this.sslConfig = value;
             return this;
         }
 
@@ -112,7 +118,8 @@ public Factory requestEntityProcessing(RequestEntityProcessing value) {
 
         public JerseyDockerHttpClient build() {
             return new JerseyDockerHttpClient(
-                dockerClientConfig,
+                dockerHost,
+                sslConfig,
                 maxTotalConnections,
                 maxPerRouteConnections,
                 connectionRequestTimeout,
@@ -134,7 +141,8 @@ public JerseyDockerHttpClient build() {
     private final URI originalUri;
 
     private JerseyDockerHttpClient(
-        DockerClientConfig dockerClientConfig,
+        URI dockerHost,
+        SSLConfig sslConfig,
         Integer maxTotalConnections,
         Integer maxPerRouteConnections,
         Integer connectionRequestTimeout,
@@ -152,12 +160,10 @@ private JerseyDockerHttpClient(
             clientConfig.property(ClientProperties.REQUEST_ENTITY_PROCESSING, requestEntityProcessing);
         }
 
-        clientConfig.register(new ResponseStatusExceptionFilter(dockerClientConfig.getObjectMapper()));
+        clientConfig.register(new ResponseStatusExceptionFilter());
         // clientConfig.register(JsonClientFilter.class);
         RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
 
-        clientConfig.register(new JacksonJsonProvider(dockerClientConfig.getObjectMapper()));
-
         // logging may disabled via log level
         clientConfig.register(new SelectiveLoggingFilter(LOGGER, true));
 
@@ -187,12 +193,9 @@ private JerseyDockerHttpClient(
             }
         }
 
-        URI dockerHost = dockerClientConfig.getDockerHost();
-
         SSLContext sslContext = null;
 
         try {
-            final SSLConfig sslConfig = dockerClientConfig.getSSLConfig();
             if (sslConfig != null) {
                 sslContext = sslConfig.getSSLContext();
             }
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
index 0895dbfd9..8cc0a0746 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java
@@ -1,22 +1,7 @@
 package com.github.dockerjava.jaxrs.filter;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientResponseContext;
-import javax.ws.rs.client.ClientResponseFilter;
-import javax.ws.rs.core.MediaType;
-
-import com.github.dockerjava.core.DefaultDockerClientConfig;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import com.github.dockerjava.api.exception.BadRequestException;
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.DockerException;
@@ -25,6 +10,17 @@
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.exception.NotModifiedException;
 import com.github.dockerjava.api.exception.UnauthorizedException;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientResponseContext;
+import javax.ws.rs.client.ClientResponseFilter;
+import javax.ws.rs.core.MediaType;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
 
 /**
  * This {@link ClientResponseFilter} implementation detects http status codes and throws {@link DockerException}s
@@ -41,7 +37,7 @@ public class ResponseStatusExceptionFilter implements ClientResponseFilter {
 
     @Deprecated
     public ResponseStatusExceptionFilter() {
-        this(DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper());
+        this(new ObjectMapper());
     }
 
     public ResponseStatusExceptionFilter(ObjectMapper objectMapper) {
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java
index 29aa524e7..275d8290b 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.okhttp;
 
-import com.github.dockerjava.core.DockerHttpClient;
+import com.github.dockerjava.transport.DockerHttpClient;
 import okhttp3.Interceptor;
 import okhttp3.Request;
 import okhttp3.Response;
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
index 8853dd815..eee20cd84 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
@@ -1,8 +1,7 @@
 package com.github.dockerjava.okhttp;
 
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.DockerHttpClient;
-import com.github.dockerjava.core.SSLConfig;
+import com.github.dockerjava.transport.DockerHttpClient;
+import com.github.dockerjava.transport.SSLConfig;
 import okhttp3.ConnectionPool;
 import okhttp3.Dns;
 import okhttp3.HttpUrl;
@@ -24,13 +23,16 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 public final class OkDockerHttpClient implements DockerHttpClient {
 
     public static final class Factory {
 
-        private DockerClientConfig dockerClientConfig = null;
+        private URI dockerHost = null;
+
+        private SSLConfig sslConfig = null;
 
         private Integer readTimeout = null;
 
@@ -38,8 +40,13 @@ public static final class Factory {
 
         private Boolean retryOnConnectionFailure = null;
 
-        public Factory dockerClientConfig(DockerClientConfig value) {
-            this.dockerClientConfig = value;
+        public Factory dockerHost(URI value) {
+            this.dockerHost = Objects.requireNonNull(value, "dockerHost");
+            return this;
+        }
+
+        public Factory sslConfig(SSLConfig value) {
+            this.sslConfig = value;
             return this;
         }
 
@@ -59,8 +66,10 @@ Factory retryOnConnectionFailure(Boolean value) {
         }
 
         public OkDockerHttpClient build() {
+            Objects.requireNonNull(dockerHost, "dockerHost");
             return new OkDockerHttpClient(
-                dockerClientConfig,
+                dockerHost,
+                sslConfig,
                 readTimeout,
                 connectTimeout,
                 retryOnConnectionFailure
@@ -77,7 +86,8 @@ public OkDockerHttpClient build() {
     private final HttpUrl baseUrl;
 
     private OkDockerHttpClient(
-        DockerClientConfig dockerClientConfig,
+        URI dockerHost,
+        SSLConfig sslConfig,
         Integer readTimeout,
         Integer connectTimeout,
         Boolean retryOnConnectionFailure
@@ -99,7 +109,6 @@ private OkDockerHttpClient(
             clientBuilder.retryOnConnectionFailure(retryOnConnectionFailure);
         }
 
-        URI dockerHost = dockerClientConfig.getDockerHost();
         switch (dockerHost.getScheme()) {
             case "unix":
             case "npipe":
@@ -125,7 +134,6 @@ private OkDockerHttpClient(
         }
 
         boolean isSSL = false;
-        SSLConfig sslConfig = dockerClientConfig.getSSLConfig();
         if (sslConfig != null) {
             try {
                 SSLContext sslContext = sslConfig.getSSLContext();
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
index 90f37b7d8..f7e22a13a 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
@@ -6,7 +6,7 @@
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.DockerClientConfigAware;
 import com.github.dockerjava.core.DockerClientImpl;
-import com.github.dockerjava.core.DockerHttpClient;
+import com.github.dockerjava.transport.DockerHttpClient;
 
 /**
  * @deprecated use {@link OkDockerHttpClient} with {@link DockerClientImpl#withHttpClient(DockerHttpClient)}
@@ -54,7 +54,9 @@ public final DockerCmdExecFactory getDockerCmdExecFactory() {
 
     @Override
     public void init(DockerClientConfig dockerClientConfig) {
-        clientFactory = clientFactory.dockerClientConfig(dockerClientConfig);
+        clientFactory = clientFactory
+            .dockerHost(dockerClientConfig.getDockerHost())
+            .sslConfig(dockerClientConfig.getSSLConfig());
         dockerCmdExecFactory = new DefaultDockerCmdExecFactory(
             clientFactory.build(),
             dockerClientConfig.getObjectMapper()
diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml
new file mode 100644
index 000000000..857664bcf
--- /dev/null
+++ b/docker-java-transport/pom.xml
@@ -0,0 +1,48 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.github.docker-java</groupId>
+		<artifactId>docker-java-parent</artifactId>
+		<version>3.2.2-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>docker-java-transport</artifactId>
+	<packaging>jar</packaging>
+
+	<name>docker-java-transport</name>
+	<url>https://github.com/docker-java/docker-java</url>
+	<description>Java API Client for Docker</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.google.code.findbugs</groupId>
+			<artifactId>annotations</artifactId>
+			<version>3.0.1u2</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.immutables</groupId>
+			<artifactId>value</artifactId>
+			<version>2.8.2</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Export-Package>com.github.dockerjava.transport.*</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerHttpClient.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DockerHttpClient.java
similarity index 97%
rename from docker-java-core/src/main/java/com/github/dockerjava/core/DockerHttpClient.java
rename to docker-java-transport/src/main/java/com/github/dockerjava/transport/DockerHttpClient.java
index 6b56fd07f..8c3fa580d 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerHttpClient.java
+++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DockerHttpClient.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.core;
+package com.github.dockerjava.transport;
 
 import org.immutables.value.Value;
 
diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/SSLConfig.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/SSLConfig.java
new file mode 100644
index 000000000..a2840cb5f
--- /dev/null
+++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/SSLConfig.java
@@ -0,0 +1,21 @@
+package com.github.dockerjava.transport;
+
+import javax.net.ssl.SSLContext;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
+
+/**
+ * Get an SSL Config. Allows for various different implementations.
+ */
+public interface SSLConfig {
+
+    /**
+     * Get the SSL Context, from wherever it comes (file, keystore).
+     *
+     * @return an SSL context.
+     */
+    SSLContext getSSLContext() throws KeyManagementException, UnrecoverableKeyException, NoSuchAlgorithmException,
+            KeyStoreException;
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
index ecb66d089..803a749aa 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
@@ -59,7 +59,8 @@ public final DockerCmdExecFactory getDockerCmdExecFactory() {
                     public void init(DockerClientConfig dockerClientConfig) {
                         dockerCmdExecFactory = new DefaultDockerCmdExecFactory(
                             new ApacheDockerHttpClient.Factory()
-                                .dockerClientConfig(dockerClientConfig)
+                                .dockerHost(dockerClientConfig.getDockerHost())
+                                .sslConfig(dockerClientConfig.getSSLConfig())
                                 .build(),
                             dockerClientConfig.getObjectMapper()
                         );
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java b/docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
index 104ea9f6f..913d1758b 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/command/DockerfileFixture.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.core.command;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.InternalServerErrorException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Image;
@@ -67,7 +68,7 @@ public void close() throws Exception {
             LOGGER.info("removing repository {}", repository);
             try {
                 client.removeImageCmd(repository).withForce(true).exec();
-            } catch (NotFoundException | InternalServerErrorException e) {
+            } catch (DockerException e) {
                 LOGGER.info("ignoring {}", e.getMessage());
             }
             repository = null;
diff --git a/pom.xml b/pom.xml
index d875f2ee0..4faa09eaf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,7 @@
 	<modules>
 		<module>docker-java-api</module>
 		<module>docker-java-core</module>
+		<module>docker-java-transport</module>
 		<module>docker-java-transport-netty</module>
 		<module>docker-java-transport-jersey</module>
 		<module>docker-java-transport-okhttp</module>

From 01d0822c2060955f36893248c95830274203446c Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sat, 30 May 2020 21:01:48 +0200
Subject: [PATCH 1021/1272] Rework DockerHttpClient API (#1403)

* Rework DockerHttpClient API

* Add `DockerClientImpl#getInstance(DockerClientConfig,DockerHttpClient)`

* fix the test resource tracker

* fix the comment
---
 .../dockerjava/core/DockerClientImpl.java     |  48 +-
 .../httpclient5/ApacheDockerHttpClient.java   |   6 +-
 .../jaxrs/JerseyDockerCmdExecFactory.java     |  24 +-
 .../jaxrs/JerseyDockerHttpClient.java         |  22 +-
 .../dockerjava/okhttp/OkDockerHttpClient.java |  12 +-
 .../okhttp/OkHttpDockerCmdExecFactory.java    |  14 +-
 docker-java/pom.xml                           |   7 +
 .../dockerjava/core/DockerClientBuilder.java  |  84 ++-
 .../dockerjava/cmd/AttachContainerCmdIT.java  |   2 +-
 .../java/com/github/dockerjava/cmd/CmdIT.java |  79 +--
 .../github/dockerjava/cmd/CommitCmdIT.java    |   2 +-
 .../dockerjava/cmd/ConnectToNetworkCmdIT.java |   2 +-
 .../dockerjava/cmd/ContainerDiffCmdIT.java    |   2 +-
 .../cmd/CopyArchiveFromContainerCmdIT.java    |   2 +-
 .../dockerjava/cmd/CreateContainerCmdIT.java  |   2 +-
 .../dockerjava/cmd/CustomCommandIT.java       |  34 ++
 .../dockerjava/cmd/ExecCreateCmdImplIT.java   |   2 +-
 .../com/github/dockerjava/cmd/InfoCmdIT.java  |   2 +-
 .../dockerjava/cmd/UpdateContainerCmdIT.java  |   2 +-
 .../cmd/swarm/CreateServiceCmdExecIT.java     |   2 +-
 .../cmd/swarm/ListServicesCmdExecIT.java      |   2 +-
 .../cmd/swarm/ListTasksCmdExecIT.java         |   2 +-
 .../dockerjava/cmd/swarm/SwarmCmdIT.java      |   5 +-
 .../dockerjava/core/DockerClientDelegate.java |  14 +
 .../DockerCmdExecFactoryDelegate.java         |   4 +-
 .../{junit => core}/DockerRule.java           | 119 ++--
 .../core/TestDockerCmdExecFactory.java        | 544 ------------------
 .../github/dockerjava/junit/DockerAssume.java |   1 +
 .../dockerjava/junit/DockerMatchers.java      |   1 +
 .../dockerjava/junit/PrivateRegistryRule.java |   3 +-
 30 files changed, 339 insertions(+), 706 deletions(-)
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/core/DockerClientDelegate.java
 rename docker-java/src/test/java/com/github/dockerjava/{junit => core}/DockerCmdExecFactoryDelegate.java (83%)
 rename docker-java/src/test/java/com/github/dockerjava/{junit => core}/DockerRule.java (65%)
 delete mode 100644 docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 36c56b32c..4caae102c 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -167,38 +167,50 @@ public class DockerClientImpl implements Closeable, DockerClient {
 
     private final DockerClientConfig dockerClientConfig;
 
-    private DockerCmdExecFactory dockerCmdExecFactory;
+    DockerCmdExecFactory dockerCmdExecFactory;
 
-    private DockerClientImpl() {
-        this(DefaultDockerClientConfig.createDefaultConfigBuilder().build());
-    }
-
-    private DockerClientImpl(String serverUrl) {
-        this(configWithServerUrl(serverUrl));
-    }
-
-    private DockerClientImpl(DockerClientConfig dockerClientConfig) {
+    DockerClientImpl(DockerClientConfig dockerClientConfig) {
         checkNotNull(dockerClientConfig, "config was not specified");
         this.dockerClientConfig = dockerClientConfig;
     }
 
-    private static DockerClientConfig configWithServerUrl(String serverUrl) {
-        return DefaultDockerClientConfig.createDefaultConfigBuilder().withDockerHost(serverUrl).build();
-    }
-
+    /**
+     *
+     * @deprecated use {@link #getInstance(DockerClientConfig, DockerHttpClient)}
+     */
+    @Deprecated
     public static DockerClientImpl getInstance() {
-        return new DockerClientImpl();
+        return new DockerClientImpl(DefaultDockerClientConfig.createDefaultConfigBuilder().build());
     }
 
+    /**
+     *
+     * @deprecated use {@link #getInstance(DockerClientConfig, DockerHttpClient)}
+     */
+    @Deprecated
     public static DockerClientImpl getInstance(DockerClientConfig dockerClientConfig) {
         return new DockerClientImpl(dockerClientConfig);
     }
 
+    public static DockerClient getInstance(DockerClientConfig dockerClientConfig, DockerHttpClient dockerHttpClient) {
+        return new DockerClientImpl(dockerClientConfig)
+            .withHttpClient(dockerHttpClient);
+    }
+
+    /**
+     *
+     * @deprecated use {@link #getInstance(DockerClientConfig, DockerHttpClient)}
+     */
+    @Deprecated
     public static DockerClientImpl getInstance(String serverUrl) {
-        return new DockerClientImpl(serverUrl);
+        return new DockerClientImpl(
+            DefaultDockerClientConfig.createDefaultConfigBuilder()
+                .withDockerHost(serverUrl)
+                .build()
+        );
     }
 
-    public DockerClientImpl withHttpClient(DockerHttpClient httpClient) {
+    DockerClientImpl withHttpClient(DockerHttpClient httpClient) {
         return withDockerCmdExecFactory(new DefaultDockerCmdExecFactory(httpClient, dockerClientConfig.getObjectMapper()));
     }
 
@@ -216,7 +228,7 @@ public DockerHttpClient getHttpClient() {
     }
 
     /**
-     * @deprecated use {@link #withHttpClient(DockerHttpClient)}
+     * @deprecated use {@link #getInstance(DockerClientConfig, DockerHttpClient)}
      */
     @Deprecated
     public DockerClientImpl withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) {
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java
index abb8b1fb7..0a018cd06 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java
@@ -41,18 +41,18 @@
 
 public final class ApacheDockerHttpClient implements DockerHttpClient {
 
-    public static final class Factory {
+    public static final class Builder {
 
         private URI dockerHost = null;
 
         private SSLConfig sslConfig = null;
 
-        public Factory dockerHost(URI value) {
+        public Builder dockerHost(URI value) {
             this.dockerHost = Objects.requireNonNull(value, "dockerHost");
             return this;
         }
 
-        public Factory sslConfig(SSLConfig value) {
+        public Builder sslConfig(SSLConfig value) {
             this.sslConfig = value;
             return this;
         }
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
index 37e1ba3f5..6298cae3b 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -15,12 +15,12 @@
 //import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 // see https://github.com/docker-java/docker-java/issues/196
 /**
- * @deprecated use {@link JerseyDockerHttpClient} with {@link DockerClientImpl#withHttpClient(DockerHttpClient)}
+ * @deprecated use {@link JerseyDockerHttpClient} with {@link DockerClientImpl#getInstance(DockerClientConfig, DockerHttpClient)}
  */
 @Deprecated
 public class JerseyDockerCmdExecFactory extends DelegatingDockerCmdExecFactory implements DockerClientConfigAware {
 
-    private JerseyDockerHttpClient.Factory clientFactory = new JerseyDockerHttpClient.Factory();
+    private JerseyDockerHttpClient.Builder clientBuilder = new JerseyDockerHttpClient.Builder();
 
     @Deprecated
     protected Integer connectTimeout;
@@ -37,11 +37,11 @@ public final DockerCmdExecFactory getDockerCmdExecFactory() {
 
     @Override
     public void init(DockerClientConfig dockerClientConfig) {
-        clientFactory = clientFactory
+        clientBuilder = clientBuilder
             .dockerHost(dockerClientConfig.getDockerHost())
             .sslConfig(dockerClientConfig.getSSLConfig());
         dockerCmdExecFactory = new DefaultDockerCmdExecFactory(
-            clientFactory.build(),
+            clientBuilder.build(),
             dockerClientConfig.getObjectMapper()
         );
         dockerCmdExecFactory.init(dockerClientConfig);
@@ -51,7 +51,7 @@ public void init(DockerClientConfig dockerClientConfig) {
      * Configure connection timeout in milliseconds
      */
     public JerseyDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) {
-        clientFactory = clientFactory.connectTimeout(connectTimeout);
+        clientBuilder = clientBuilder.connectTimeout(connectTimeout);
         this.connectTimeout = connectTimeout;
         return this;
     }
@@ -60,38 +60,38 @@ public JerseyDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) {
      * Configure read timeout in milliseconds
      */
     public JerseyDockerCmdExecFactory withReadTimeout(Integer readTimeout) {
-        clientFactory = clientFactory.readTimeout(readTimeout);
+        clientBuilder = clientBuilder.readTimeout(readTimeout);
         this.readTimeout = readTimeout;
         return this;
     }
 
     public JerseyDockerCmdExecFactory withMaxTotalConnections(Integer maxTotalConnections) {
-        clientFactory = clientFactory.maxTotalConnections(maxTotalConnections);
+        clientBuilder = clientBuilder.maxTotalConnections(maxTotalConnections);
         return this;
     }
 
     public JerseyDockerCmdExecFactory withMaxPerRouteConnections(Integer maxPerRouteConnections) {
-        clientFactory = clientFactory.maxPerRouteConnections(maxPerRouteConnections);
+        clientBuilder = clientBuilder.maxPerRouteConnections(maxPerRouteConnections);
         return this;
     }
 
     public JerseyDockerCmdExecFactory withConnectionRequestTimeout(Integer connectionRequestTimeout) {
-        clientFactory = clientFactory.connectionRequestTimeout(connectionRequestTimeout);
+        clientBuilder = clientBuilder.connectionRequestTimeout(connectionRequestTimeout);
         return this;
     }
 
     public JerseyDockerCmdExecFactory withClientResponseFilters(ClientResponseFilter... clientResponseFilter) {
-        clientFactory = clientFactory.clientResponseFilters(clientResponseFilter);
+        clientBuilder = clientBuilder.clientResponseFilters(clientResponseFilter);
         return this;
     }
 
     public JerseyDockerCmdExecFactory withClientRequestFilters(ClientRequestFilter... clientRequestFilters) {
-        clientFactory = clientFactory.clientRequestFilters(clientRequestFilters);
+        clientBuilder = clientBuilder.clientRequestFilters(clientRequestFilters);
         return this;
     }
 
     public JerseyDockerCmdExecFactory withRequestEntityProcessing(RequestEntityProcessing requestEntityProcessing) {
-        clientFactory = clientFactory.requestEntityProcessing(requestEntityProcessing);
+        clientBuilder = clientBuilder.requestEntityProcessing(requestEntityProcessing);
         return this;
     }
 }
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
index dd0b57a30..3afea4617 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
@@ -44,7 +44,7 @@
 
 public final class JerseyDockerHttpClient implements DockerHttpClient {
 
-    public static final class Factory {
+    public static final class Builder {
 
         private URI dockerHost = null;
 
@@ -66,52 +66,52 @@ public static final class Factory {
 
         private RequestEntityProcessing requestEntityProcessing;
 
-        public Factory dockerHost(URI value) {
+        public Builder dockerHost(URI value) {
             this.dockerHost = Objects.requireNonNull(value, "dockerHost");
             return this;
         }
 
-        public Factory sslConfig(SSLConfig value) {
+        public Builder sslConfig(SSLConfig value) {
             this.sslConfig = value;
             return this;
         }
 
-        public Factory readTimeout(Integer value) {
+        public Builder readTimeout(Integer value) {
             this.readTimeout = value;
             return this;
         }
 
-        public Factory connectTimeout(Integer value) {
+        public Builder connectTimeout(Integer value) {
             this.connectTimeout = value;
             return this;
         }
 
-        public Factory maxTotalConnections(Integer value) {
+        public Builder maxTotalConnections(Integer value) {
             this.maxTotalConnections = value;
             return this;
         }
 
-        public Factory maxPerRouteConnections(Integer value) {
+        public Builder maxPerRouteConnections(Integer value) {
             this.maxPerRouteConnections = value;
             return this;
         }
 
-        public Factory connectionRequestTimeout(Integer value) {
+        public Builder connectionRequestTimeout(Integer value) {
             this.connectionRequestTimeout = value;
             return this;
         }
 
-        public Factory clientResponseFilters(ClientResponseFilter[] value) {
+        public Builder clientResponseFilters(ClientResponseFilter[] value) {
             this.clientResponseFilters = value;
             return this;
         }
 
-        public Factory clientRequestFilters(ClientRequestFilter[] value) {
+        public Builder clientRequestFilters(ClientRequestFilter[] value) {
             this.clientRequestFilters = value;
             return this;
         }
 
-        public Factory requestEntityProcessing(RequestEntityProcessing value) {
+        public Builder requestEntityProcessing(RequestEntityProcessing value) {
             this.requestEntityProcessing = value;
             return this;
         }
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
index eee20cd84..53d52dd7f 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
@@ -28,7 +28,7 @@
 
 public final class OkDockerHttpClient implements DockerHttpClient {
 
-    public static final class Factory {
+    public static final class Builder {
 
         private URI dockerHost = null;
 
@@ -40,27 +40,27 @@ public static final class Factory {
 
         private Boolean retryOnConnectionFailure = null;
 
-        public Factory dockerHost(URI value) {
+        public Builder dockerHost(URI value) {
             this.dockerHost = Objects.requireNonNull(value, "dockerHost");
             return this;
         }
 
-        public Factory sslConfig(SSLConfig value) {
+        public Builder sslConfig(SSLConfig value) {
             this.sslConfig = value;
             return this;
         }
 
-        public Factory readTimeout(Integer value) {
+        public Builder readTimeout(Integer value) {
             this.readTimeout = value;
             return this;
         }
 
-        public Factory connectTimeout(Integer value) {
+        public Builder connectTimeout(Integer value) {
             this.connectTimeout = value;
             return this;
         }
 
-        Factory retryOnConnectionFailure(Boolean value) {
+        Builder retryOnConnectionFailure(Boolean value) {
             this.retryOnConnectionFailure = value;
             return this;
         }
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
index f7e22a13a..a824e9954 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkHttpDockerCmdExecFactory.java
@@ -9,12 +9,12 @@
 import com.github.dockerjava.transport.DockerHttpClient;
 
 /**
- * @deprecated use {@link OkDockerHttpClient} with {@link DockerClientImpl#withHttpClient(DockerHttpClient)}
+ * @deprecated use {@link OkDockerHttpClient} with {@link DockerClientImpl#getInstance(DockerClientConfig, DockerHttpClient)}
  */
 @Deprecated
 public class OkHttpDockerCmdExecFactory extends DelegatingDockerCmdExecFactory implements DockerClientConfigAware {
 
-    private OkDockerHttpClient.Factory clientFactory = new OkDockerHttpClient.Factory();
+    private OkDockerHttpClient.Builder clientBuilder = new OkDockerHttpClient.Builder();
 
     @Deprecated
     protected Integer connectTimeout;
@@ -28,7 +28,7 @@ public class OkHttpDockerCmdExecFactory extends DelegatingDockerCmdExecFactory i
      * Configure connection timeout in milliseconds
      */
     public OkHttpDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) {
-        clientFactory = clientFactory.connectTimeout(connectTimeout);
+        clientBuilder = clientBuilder.connectTimeout(connectTimeout);
         this.connectTimeout = connectTimeout;
         return this;
     }
@@ -37,13 +37,13 @@ public OkHttpDockerCmdExecFactory withConnectTimeout(Integer connectTimeout) {
      * Configure read timeout in milliseconds
      */
     public OkHttpDockerCmdExecFactory withReadTimeout(Integer readTimeout) {
-        clientFactory = clientFactory.readTimeout(readTimeout);
+        clientBuilder = clientBuilder.readTimeout(readTimeout);
         this.readTimeout = readTimeout;
         return this;
     }
 
     public OkHttpDockerCmdExecFactory setRetryOnConnectionFailure(Boolean retryOnConnectionFailure) {
-        this.clientFactory = clientFactory.retryOnConnectionFailure(retryOnConnectionFailure);
+        this.clientBuilder = clientBuilder.retryOnConnectionFailure(retryOnConnectionFailure);
         return this;
     }
 
@@ -54,11 +54,11 @@ public final DockerCmdExecFactory getDockerCmdExecFactory() {
 
     @Override
     public void init(DockerClientConfig dockerClientConfig) {
-        clientFactory = clientFactory
+        clientBuilder = clientBuilder
             .dockerHost(dockerClientConfig.getDockerHost())
             .sslConfig(dockerClientConfig.getSSLConfig());
         dockerCmdExecFactory = new DefaultDockerCmdExecFactory(
-            clientFactory.build(),
+            clientBuilder.build(),
             dockerClientConfig.getObjectMapper()
         );
         dockerCmdExecFactory.init(dockerClientConfig);
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index b9965ac46..578bee865 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -116,6 +116,13 @@
 			<artifactId>awaitility</artifactId>
 			<version>4.0.1</version>
 		</dependency>
+
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.12</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java b/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
index 991bdbb86..8db149221 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
+++ b/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
@@ -2,51 +2,109 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
-import com.github.dockerjava.core.DefaultDockerClientConfig.Builder;
 import com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory;
+import com.github.dockerjava.jaxrs.JerseyDockerHttpClient;
+import com.github.dockerjava.transport.DockerHttpClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DockerClientBuilder {
 
-    private DockerClientImpl dockerClient = null;
+    private final DockerClientConfig dockerClientConfig;
 
     private DockerCmdExecFactory dockerCmdExecFactory = null;
 
-    private DockerClientBuilder(DockerClientImpl dockerClient) {
-        this.dockerClient = dockerClient;
+    private DockerHttpClient dockerHttpClient = null;
+
+    private DockerClientBuilder(DockerClientConfig dockerClientConfig) {
+        this.dockerClientConfig = dockerClientConfig;
     }
 
     public static DockerClientBuilder getInstance() {
-        return new DockerClientBuilder(DockerClientImpl.getInstance());
+        return new DockerClientBuilder(
+            DefaultDockerClientConfig.createDefaultConfigBuilder().build()
+        );
     }
 
-    public static DockerClientBuilder getInstance(Builder dockerClientConfigBuilder) {
+    /**
+     *
+     * @deprecated use {@link #getInstance(DockerClientConfig)}
+     */
+    @Deprecated
+    public static DockerClientBuilder getInstance(DefaultDockerClientConfig.Builder dockerClientConfigBuilder) {
         return getInstance(dockerClientConfigBuilder.build());
     }
 
     public static DockerClientBuilder getInstance(DockerClientConfig dockerClientConfig) {
-        return new DockerClientBuilder(DockerClientImpl.getInstance(dockerClientConfig));
+        return new DockerClientBuilder(dockerClientConfig);
     }
 
+    /**
+     *
+     * @deprecated use {@link DefaultDockerClientConfig.Builder#withDockerHost(String)}
+     */
+    @Deprecated
     public static DockerClientBuilder getInstance(String serverUrl) {
-        return new DockerClientBuilder(DockerClientImpl.getInstance(serverUrl));
+        return new DockerClientBuilder(
+            DefaultDockerClientConfig.createDefaultConfigBuilder()
+                .withDockerHost(serverUrl)
+                .build()
+        );
     }
 
+    /**
+     *
+     * @deprecated no replacement, use one of {@link DockerHttpClient}
+     */
+    @Deprecated
     public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() {
         return new JerseyDockerCmdExecFactory();
     }
 
+    /**
+     * Note that this method overrides {@link DockerHttpClient} if it was previously set
+     *
+     * @deprecated use {@link #withHttpClient(DockerHttpClient)}
+     */
+    @Deprecated
     public DockerClientBuilder withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) {
         this.dockerCmdExecFactory = dockerCmdExecFactory;
+        this.dockerHttpClient = null;
+        return this;
+    }
+
+    /**
+     * Note that this method overrides {@link DockerCmdExecFactory} if it was previously set
+     */
+    public DockerClientBuilder withDockerHttpClient(DockerHttpClient dockerHttpClient) {
+        this.dockerCmdExecFactory = null;
+        this.dockerHttpClient = dockerHttpClient;
         return this;
     }
 
     public DockerClient build() {
-        if (dockerCmdExecFactory != null) {
-            dockerClient.withDockerCmdExecFactory(dockerCmdExecFactory);
+        if (dockerHttpClient != null) {
+            return DockerClientImpl.getInstance(
+                dockerClientConfig,
+                dockerHttpClient
+            );
+        } else if (dockerCmdExecFactory != null) {
+            return DockerClientImpl.getInstance(dockerClientConfig)
+                .withDockerCmdExecFactory(dockerCmdExecFactory);
         } else {
-            dockerClient.withDockerCmdExecFactory(getDefaultDockerCmdExecFactory());
-        }
+            Logger log = LoggerFactory.getLogger(DockerClientBuilder.class);
+            log.warn(
+                "'dockerHttpClient' should be set." +
+                    "Falling back to Jersey, will be an error in future releases."
+            );
 
-        return dockerClient;
+            return DockerClientImpl.getInstance(
+                dockerClientConfig,
+                new JerseyDockerHttpClient.Builder()
+                    .dockerHost(dockerClientConfig.getDockerHost())
+                    .sslConfig(dockerClientConfig.getSSLConfig())
+                    .build()
+            );
+        }
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
index 299213216..055eb640b 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
@@ -21,7 +21,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
index 803a749aa..8dab7f96c 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
@@ -1,16 +1,14 @@
 package com.github.dockerjava.cmd;
 
-import com.github.dockerjava.api.command.DelegatingDockerCmdExecFactory;
-import com.github.dockerjava.api.command.DockerCmdExecFactory;
-import com.github.dockerjava.core.DefaultDockerCmdExecFactory;
+import com.github.dockerjava.core.DockerClientBuilder;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.DockerClientConfigAware;
+import com.github.dockerjava.core.DockerClientImpl;
+import com.github.dockerjava.core.DockerRule;
 import com.github.dockerjava.httpclient5.ApacheDockerHttpClient;
-import com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory;
-import com.github.dockerjava.junit.DockerRule;
+import com.github.dockerjava.jaxrs.JerseyDockerHttpClient;
 import com.github.dockerjava.junit.category.Integration;
 import com.github.dockerjava.netty.NettyDockerCmdExecFactory;
-import com.github.dockerjava.okhttp.OkHttpDockerCmdExecFactory;
+import com.github.dockerjava.okhttp.OkDockerHttpClient;
 import org.junit.Rule;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
@@ -27,47 +25,54 @@ public abstract class CmdIT {
     public enum FactoryType {
         NETTY(true) {
             @Override
-            public DockerCmdExecFactory createExecFactory() {
-                return new NettyDockerCmdExecFactory().withConnectTimeout(30 * 1000);
+            public DockerClientImpl createDockerClient(DockerClientConfig config) {
+                return (DockerClientImpl) DockerClientBuilder.getInstance(config)
+                    .withDockerCmdExecFactory(
+                        new NettyDockerCmdExecFactory()
+                            .withConnectTimeout(30 * 1000)
+                    )
+                    .build();
             }
         },
         JERSEY(false) {
             @Override
-            public DockerCmdExecFactory createExecFactory() {
-                return new JerseyDockerCmdExecFactory().withConnectTimeout(30 * 1000);
+            public DockerClientImpl createDockerClient(DockerClientConfig config) {
+                return (DockerClientImpl) DockerClientBuilder.getInstance(config)
+                    .withDockerHttpClient(
+                        new JerseyDockerHttpClient.Builder()
+                            .dockerHost(config.getDockerHost())
+                            .sslConfig(config.getSSLConfig())
+                            .connectTimeout(30 * 1000)
+                            .build()
+                    )
+                    .build();
             }
         },
         OKHTTP(true) {
             @Override
-            public DockerCmdExecFactory createExecFactory() {
-                return new OkHttpDockerCmdExecFactory().withConnectTimeout(30 * 1000);
+            public DockerClientImpl createDockerClient(DockerClientConfig config) {
+                return (DockerClientImpl) DockerClientBuilder.getInstance(config)
+                    .withDockerHttpClient(
+                        new OkDockerHttpClient.Builder()
+                            .dockerHost(config.getDockerHost())
+                            .sslConfig(config.getSSLConfig())
+                            .connectTimeout(30 * 100)
+                            .build()
+                    )
+                    .build();
             }
         },
         HTTPCLIENT5(true) {
             @Override
-            public DockerCmdExecFactory createExecFactory() {
-                class FakeFactory extends DelegatingDockerCmdExecFactory implements DockerClientConfigAware {
-
-                    private DefaultDockerCmdExecFactory dockerCmdExecFactory;
-
-                    @Override
-                    public final DockerCmdExecFactory getDockerCmdExecFactory() {
-                        return dockerCmdExecFactory;
-                    }
-
-                    @Override
-                    public void init(DockerClientConfig dockerClientConfig) {
-                        dockerCmdExecFactory = new DefaultDockerCmdExecFactory(
-                            new ApacheDockerHttpClient.Factory()
-                                .dockerHost(dockerClientConfig.getDockerHost())
-                                .sslConfig(dockerClientConfig.getSSLConfig())
-                                .build(),
-                            dockerClientConfig.getObjectMapper()
-                        );
-                        dockerCmdExecFactory.init(dockerClientConfig);
-                    }
-                }
-                return new FakeFactory();
+            public DockerClientImpl createDockerClient(DockerClientConfig config) {
+                return (DockerClientImpl) DockerClientBuilder.getInstance(config)
+                    .withDockerHttpClient(
+                        new ApacheDockerHttpClient.Builder()
+                            .dockerHost(config.getDockerHost())
+                            .sslConfig(config.getSSLConfig())
+                            .build()
+                    )
+                    .build();
             }
         };
 
@@ -87,7 +92,7 @@ public boolean supportsStdinAttach() {
             return supportsStdinAttach;
         }
 
-        public abstract DockerCmdExecFactory createExecFactory();
+        public abstract DockerClientImpl createDockerClient(DockerClientConfig config);
     }
 
     @Parameterized.Parameters(name = "{index}:{0}")
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java
index 4bba98a5f..39f51adc7 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java
@@ -11,7 +11,7 @@
 
 import java.util.Map;
 
-import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java
index 42934c03e..b7c28e8bc 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java
@@ -10,7 +10,7 @@
 import org.junit.Test;
 
 import static com.github.dockerjava.junit.DockerAssume.assumeNotSwarm;
-import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.core.Is.is;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java
index bc8bd67f1..7ff39f3fa 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ContainerDiffCmdIT.java
@@ -11,7 +11,7 @@
 import java.util.List;
 
 import static ch.lambdaj.Lambda.selectUnique;
-import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java
index f04823ec0..9cede72e8 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java
@@ -17,7 +17,7 @@
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 
-import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isEmptyOrNullString;
 import static org.hamcrest.Matchers.not;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index 0ae715b5d..365b56275 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -54,7 +54,7 @@
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24;
 import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
 import static com.github.dockerjava.junit.DockerMatchers.mountedVolumes;
-import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.contains;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java
new file mode 100644
index 000000000..514ead0bd
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java
@@ -0,0 +1,34 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.core.DockerClientImpl;
+import com.github.dockerjava.transport.DockerHttpClient;
+import com.github.dockerjava.transport.DockerHttpClient.Request;
+import com.github.dockerjava.transport.DockerHttpClient.Response;
+import org.apache.commons.io.IOUtils;
+import org.junit.Assume;
+import org.junit.Test;
+
+import java.nio.charset.StandardCharsets;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+public class CustomCommandIT extends CmdIT {
+
+    @Test
+    public void testCustomCommand() throws Exception {
+        DockerHttpClient httpClient = ((DockerClientImpl) dockerRule.getClient()).getHttpClient();
+
+        Assume.assumeNotNull(httpClient);
+
+        Request request = Request.builder()
+            .method(Request.Method.GET)
+            .path("/_ping")
+            .build();
+
+        try (Response response = httpClient.execute(request)) {
+            assertThat(response.getStatusCode(), equalTo(200));
+            assertThat(IOUtils.toString(response.getBody(), StandardCharsets.UTF_8), equalTo("OK"));
+        }
+    }
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java
index 495b8cdb9..2f18d7e85 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecCreateCmdImplIT.java
@@ -8,7 +8,7 @@
 
 import java.security.SecureRandom;
 
-import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.emptyString;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java
index b4f70fe19..d7917326b 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java
@@ -8,7 +8,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE;
 import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.greaterThan;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
index aaa023db8..b21bbb533 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
@@ -16,7 +16,7 @@
 
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
 import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
-import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE;
 import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
index 66ee0e836..e50f35dd3 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
@@ -33,7 +33,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
index 8f7778655..432c7d4bd 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
@@ -16,7 +16,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java
index 221e6699b..8ce672b1b 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListTasksCmdExecIT.java
@@ -19,7 +19,7 @@
 import java.util.Map;
 import java.util.Objects;
 
-import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE;
 import static org.awaitility.Awaitility.await;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
index 8c2a80b6e..f88cb9873 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
@@ -13,7 +13,6 @@
 import com.github.dockerjava.api.model.SwarmSpec;
 import com.github.dockerjava.cmd.CmdIT;
 import com.github.dockerjava.core.DefaultDockerClientConfig;
-import com.github.dockerjava.core.DockerClientBuilder;
 import com.github.dockerjava.junit.category.Integration;
 import com.github.dockerjava.junit.category.SwarmModeIntegration;
 import org.junit.After;
@@ -137,8 +136,6 @@ private DockerClient initializeDockerClient(Ports.Binding binding) {
         DefaultDockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder()
             .withRegistryUrl("https://index.docker.io/v1/")
             .withDockerHost("tcp://" + binding).build();
-        return DockerClientBuilder.getInstance(config)
-            .withDockerCmdExecFactory(getFactoryType().createExecFactory())
-            .build();
+        return getFactoryType().createDockerClient(config);
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientDelegate.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientDelegate.java
new file mode 100644
index 000000000..84715ca25
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientDelegate.java
@@ -0,0 +1,14 @@
+package com.github.dockerjava.core;
+
+import lombok.experimental.Delegate;
+
+public class DockerClientDelegate extends DockerClientImpl {
+
+    @Delegate
+    private final DockerClientImpl delegate;
+
+    public DockerClientDelegate(DockerClientImpl delegate) {
+        super(DefaultDockerClientConfig.createDefaultConfigBuilder().build());
+        this.delegate = delegate;
+    }
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerCmdExecFactoryDelegate.java
similarity index 83%
rename from docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java
rename to docker-java/src/test/java/com/github/dockerjava/core/DockerCmdExecFactoryDelegate.java
index 807b92a4b..463c63ffe 100644
--- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerCmdExecFactoryDelegate.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerCmdExecFactoryDelegate.java
@@ -1,9 +1,7 @@
-package com.github.dockerjava.junit;
+package com.github.dockerjava.core;
 
 import com.github.dockerjava.api.command.DelegatingDockerCmdExecFactory;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.DockerClientConfigAware;
 
 class DockerCmdExecFactoryDelegate extends DelegatingDockerCmdExecFactory implements DockerClientConfigAware {
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
similarity index 65%
rename from docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java
rename to docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
index 2edefb14a..c7ca2c0d9 100644
--- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerRule.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.junit;
+package com.github.dockerjava.core;
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.CreateContainerCmd;
@@ -7,19 +7,19 @@
 import com.github.dockerjava.api.command.CreateNetworkResponse;
 import com.github.dockerjava.api.command.CreateVolumeCmd;
 import com.github.dockerjava.api.command.CreateVolumeResponse;
-import com.github.dockerjava.api.command.DockerCmdExecFactory;
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.cmd.CmdIT;
-import com.github.dockerjava.core.DefaultDockerClientConfig;
-import com.github.dockerjava.core.DockerClientBuilder;
+import com.github.dockerjava.transport.DockerHttpClient;
 import com.github.dockerjava.utils.LogContainerTestCallback;
+import lombok.experimental.Delegate;
 import org.junit.rules.ExternalResource;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.Closeable;
 import java.io.File;
 import java.util.HashSet;
 import java.util.Set;
@@ -50,43 +50,50 @@ public DockerClient getClient() {
         if (dockerClient != null) {
             return dockerClient;
         }
-        DockerCmdExecFactory execFactory = new DockerCmdExecFactoryDelegate(
-                cmdIT.getFactoryType().createExecFactory()
-        ) {
-            @Override
-            public CreateContainerCmd.Exec createCreateContainerCmdExec() {
-                CreateContainerCmd.Exec exec = super.createCreateContainerCmdExec();
-                return command -> {
-                    CreateContainerResponse response = exec.exec(command);
-                    createdContainerIds.add(response.getId());
-                    return response;
-                };
-            }
 
-            @Override
-            public CreateNetworkCmd.Exec createCreateNetworkCmdExec() {
-                CreateNetworkCmd.Exec exec = super.createCreateNetworkCmdExec();
-                return command -> {
-                    CreateNetworkResponse response = exec.exec(command);
-                    createdNetworkIds.add(response.getId());
-                    return response;
-                };
+        DockerClientImpl dockerClient = cmdIT.getFactoryType().createDockerClient(config());
+        DockerHttpClient dockerHttpClient = dockerClient.getHttpClient();
+
+        dockerClient.withDockerCmdExecFactory(
+            new DockerCmdExecFactoryDelegate(dockerClient.dockerCmdExecFactory) {
+                @Override
+                public CreateContainerCmd.Exec createCreateContainerCmdExec() {
+                    CreateContainerCmd.Exec exec = super.createCreateContainerCmdExec();
+                    return command -> {
+                        CreateContainerResponse response = exec.exec(command);
+                        createdContainerIds.add(response.getId());
+                        return response;
+                    };
+                }
+
+                @Override
+                public CreateNetworkCmd.Exec createCreateNetworkCmdExec() {
+                    CreateNetworkCmd.Exec exec = super.createCreateNetworkCmdExec();
+                    return command -> {
+                        CreateNetworkResponse response = exec.exec(command);
+                        createdNetworkIds.add(response.getId());
+                        return response;
+                    };
+                }
+
+                @Override
+                public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
+                    CreateVolumeCmd.Exec exec = super.createCreateVolumeCmdExec();
+                    return command -> {
+                        CreateVolumeResponse response = exec.exec(command);
+                        createdVolumeNames.add(response.getName());
+                        return response;
+                    };
+                }
             }
+        );
 
+        return this.dockerClient = new DockerClientDelegate(dockerClient) {
             @Override
-            public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
-                CreateVolumeCmd.Exec exec = super.createCreateVolumeCmdExec();
-                return command -> {
-                    CreateVolumeResponse response = exec.exec(command);
-                    createdVolumeNames.add(response.getName());
-                    return response;
-                };
+            public DockerHttpClient getHttpClient() {
+                return dockerHttpClient;
             }
         };
-
-        return dockerClient = DockerClientBuilder.getInstance(config())
-                .withDockerCmdExecFactory(execFactory)
-                .build();
     }
 
     @Override
@@ -215,4 +222,46 @@ public void ensureImageRemoved(String imageId) {
             // ignore
         }
     }
+
+    private static class CreateContainerCmdDelegate implements CreateContainerCmd {
+        @Delegate(excludes = Closeable.class)
+        private final CreateContainerCmd delegate;
+
+        private CreateContainerCmdDelegate(CreateContainerCmd delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public void close() {
+            delegate.close();
+        }
+    }
+
+    private static class CreateNetworkCmdDelegate implements CreateNetworkCmd {
+        @Delegate(excludes = Closeable.class)
+        private final CreateNetworkCmd delegate;
+
+        private CreateNetworkCmdDelegate(CreateNetworkCmd delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public void close() {
+            delegate.close();
+        }
+    }
+
+    private static class CreateVolumeCmdDelegate implements CreateVolumeCmd {
+        @Delegate(excludes = Closeable.class)
+        private final CreateVolumeCmd delegate;
+
+        private CreateVolumeCmdDelegate(CreateVolumeCmd delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public void close() {
+            delegate.close();
+        }
+    }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java b/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
deleted file mode 100644
index 64280c386..000000000
--- a/docker-java/src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java
+++ /dev/null
@@ -1,544 +0,0 @@
-package com.github.dockerjava.core;
-
-import com.github.dockerjava.api.command.AttachContainerCmd;
-import com.github.dockerjava.api.command.AuthCmd.Exec;
-import com.github.dockerjava.api.command.BuildImageCmd;
-import com.github.dockerjava.api.command.CommitCmd;
-import com.github.dockerjava.api.command.ConnectToNetworkCmd;
-import com.github.dockerjava.api.command.ContainerDiffCmd;
-import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
-import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
-import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
-import com.github.dockerjava.api.command.CreateContainerCmd;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.CreateImageCmd;
-import com.github.dockerjava.api.command.CreateImageResponse;
-import com.github.dockerjava.api.command.CreateNetworkCmd;
-import com.github.dockerjava.api.command.CreateNetworkResponse;
-import com.github.dockerjava.api.command.CreateSecretCmd;
-import com.github.dockerjava.api.command.CreateServiceCmd;
-import com.github.dockerjava.api.command.CreateVolumeCmd;
-import com.github.dockerjava.api.command.CreateVolumeResponse;
-import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
-import com.github.dockerjava.api.command.DockerCmdExecFactory;
-import com.github.dockerjava.api.command.EventsCmd;
-import com.github.dockerjava.api.command.ExecCreateCmd;
-import com.github.dockerjava.api.command.ExecStartCmd;
-import com.github.dockerjava.api.command.InfoCmd;
-import com.github.dockerjava.api.command.InitializeSwarmCmd;
-import com.github.dockerjava.api.command.InspectContainerCmd;
-import com.github.dockerjava.api.command.InspectExecCmd;
-import com.github.dockerjava.api.command.InspectImageCmd;
-import com.github.dockerjava.api.command.InspectNetworkCmd;
-import com.github.dockerjava.api.command.InspectServiceCmd;
-import com.github.dockerjava.api.command.InspectSwarmCmd;
-import com.github.dockerjava.api.command.InspectSwarmNodeCmd;
-import com.github.dockerjava.api.command.InspectVolumeCmd;
-import com.github.dockerjava.api.command.JoinSwarmCmd;
-import com.github.dockerjava.api.command.KillContainerCmd;
-import com.github.dockerjava.api.command.LeaveSwarmCmd;
-import com.github.dockerjava.api.command.ListContainersCmd;
-import com.github.dockerjava.api.command.ListImagesCmd;
-import com.github.dockerjava.api.command.ListNetworksCmd;
-import com.github.dockerjava.api.command.ListSecretsCmd;
-import com.github.dockerjava.api.command.ListServicesCmd;
-import com.github.dockerjava.api.command.ListSwarmNodesCmd;
-import com.github.dockerjava.api.command.ListTasksCmd;
-import com.github.dockerjava.api.command.ListVolumesCmd;
-import com.github.dockerjava.api.command.LoadImageCmd;
-import com.github.dockerjava.api.command.LogContainerCmd;
-import com.github.dockerjava.api.command.LogSwarmObjectCmd;
-import com.github.dockerjava.api.command.PauseContainerCmd;
-import com.github.dockerjava.api.command.PingCmd;
-import com.github.dockerjava.api.command.PruneCmd;
-import com.github.dockerjava.api.command.PullImageCmd;
-import com.github.dockerjava.api.command.PushImageCmd;
-import com.github.dockerjava.api.command.RemoveContainerCmd;
-import com.github.dockerjava.api.command.RemoveImageCmd;
-import com.github.dockerjava.api.command.RemoveNetworkCmd;
-import com.github.dockerjava.api.command.RemoveSecretCmd;
-import com.github.dockerjava.api.command.RemoveServiceCmd;
-import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
-import com.github.dockerjava.api.command.RemoveVolumeCmd;
-import com.github.dockerjava.api.command.RenameContainerCmd;
-import com.github.dockerjava.api.command.RestartContainerCmd;
-import com.github.dockerjava.api.command.SaveImageCmd;
-import com.github.dockerjava.api.command.SaveImagesCmd;
-import com.github.dockerjava.api.command.SearchImagesCmd;
-import com.github.dockerjava.api.command.StartContainerCmd;
-import com.github.dockerjava.api.command.StatsCmd;
-import com.github.dockerjava.api.command.StopContainerCmd;
-import com.github.dockerjava.api.command.TagImageCmd;
-import com.github.dockerjava.api.command.TopContainerCmd;
-import com.github.dockerjava.api.command.UnpauseContainerCmd;
-import com.github.dockerjava.api.command.UpdateContainerCmd;
-import com.github.dockerjava.api.command.UpdateServiceCmd;
-import com.github.dockerjava.api.command.UpdateSwarmCmd;
-import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
-import com.github.dockerjava.api.command.VersionCmd;
-import com.github.dockerjava.api.command.WaitContainerCmd;
-
-import java.io.IOException;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Special {@link DockerCmdExecFactory} implementation that collects container and image creations while test execution for the purpose of
- * automatically cleanup.
- *
- * @author Marcus Linke
- */
-public class TestDockerCmdExecFactory implements DockerCmdExecFactory, DockerClientConfigAware {
-
-    private List<String> containerNames = new ArrayList<>();
-
-    private List<String> imageNames = new ArrayList<>();
-
-    private List<String> volumeNames = new ArrayList<>();
-
-    private List<String> networkIds = new ArrayList<>();
-
-    private DockerCmdExecFactory delegate;
-
-    public TestDockerCmdExecFactory(DockerCmdExecFactory delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public void init(DockerClientConfig dockerClientConfig) {
-        if (delegate instanceof DockerClientConfigAware) {
-            ((DockerClientConfigAware) delegate).init(dockerClientConfig);
-        }
-    }
-
-    @Override
-    public void close() throws IOException {
-        delegate.close();
-    }
-
-    @Override
-    public CreateContainerCmd.Exec createCreateContainerCmdExec() {
-        return command -> {
-            CreateContainerResponse createContainerResponse = delegate.createCreateContainerCmdExec().exec(command);
-            containerNames.add(createContainerResponse.getId());
-            return createContainerResponse;
-        };
-    }
-
-    @Override
-    public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
-        return command -> {
-            delegate.createRemoveContainerCmdExec().exec(command);
-            containerNames.remove(command.getContainerId());
-            return null;
-        };
-    }
-
-    @Override
-    public CreateImageCmd.Exec createCreateImageCmdExec() {
-        return command -> {
-            CreateImageResponse createImageResponse = delegate.createCreateImageCmdExec().exec(command);
-            imageNames.add(createImageResponse.getId());
-            return createImageResponse;
-        };
-    }
-
-    @Override
-    public LoadImageCmd.Exec createLoadImageCmdExec() {
-        return command -> {
-            delegate.createLoadImageCmdExec().exec(command);
-            return null;
-        };
-    }
-
-    @Override
-    public RemoveImageCmd.Exec createRemoveImageCmdExec() {
-        return command -> {
-            delegate.createRemoveImageCmdExec().exec(command);
-            imageNames.remove(command.getImageId());
-            return null;
-        };
-    }
-
-    @Override
-    public BuildImageCmd.Exec createBuildImageCmdExec() {
-        return (command, resultCallback) -> {
-            // can't detect image id here so tagging it
-            String tag = command.getTag();
-            if (tag == null || "".equals(tag.trim())) {
-                tag = "" + new SecureRandom().nextInt(Integer.MAX_VALUE);
-                command.withTag(tag);
-            }
-            delegate.createBuildImageCmdExec().exec(command, resultCallback);
-            imageNames.add(tag);
-            return null;
-        };
-    }
-
-    @Override
-    public Exec createAuthCmdExec() {
-        return delegate.createAuthCmdExec();
-    }
-
-    @Override
-    public InfoCmd.Exec createInfoCmdExec() {
-        return delegate.createInfoCmdExec();
-    }
-
-    @Override
-    public PingCmd.Exec createPingCmdExec() {
-        return delegate.createPingCmdExec();
-    }
-
-    @Override
-    public ExecCreateCmd.Exec createExecCmdExec() {
-        return delegate.createExecCmdExec();
-    }
-
-    @Override
-    public VersionCmd.Exec createVersionCmdExec() {
-        return delegate.createVersionCmdExec();
-    }
-
-    @Override
-    public PullImageCmd.Exec createPullImageCmdExec() {
-        return delegate.createPullImageCmdExec();
-    }
-
-    @Override
-    public PushImageCmd.Exec createPushImageCmdExec() {
-        return delegate.createPushImageCmdExec();
-    }
-
-    @Override
-    public SaveImageCmd.Exec createSaveImageCmdExec() {
-        return delegate.createSaveImageCmdExec();
-    }
-
-    @Override
-    public SaveImagesCmd.Exec createSaveImagesCmdExec() {
-        return delegate.createSaveImagesCmdExec();
-    }
-
-    @Override
-    public SearchImagesCmd.Exec createSearchImagesCmdExec() {
-        return delegate.createSearchImagesCmdExec();
-    }
-
-    @Override
-    public ListImagesCmd.Exec createListImagesCmdExec() {
-        return delegate.createListImagesCmdExec();
-    }
-
-    @Override
-    public InspectImageCmd.Exec createInspectImageCmdExec() {
-        return delegate.createInspectImageCmdExec();
-    }
-
-    @Override
-    public ListContainersCmd.Exec createListContainersCmdExec() {
-        return delegate.createListContainersCmdExec();
-    }
-
-    @Override
-    public StartContainerCmd.Exec createStartContainerCmdExec() {
-        return delegate.createStartContainerCmdExec();
-    }
-
-    @Override
-    public InspectContainerCmd.Exec createInspectContainerCmdExec() {
-        return delegate.createInspectContainerCmdExec();
-    }
-
-    @Override
-    public WaitContainerCmd.Exec createWaitContainerCmdExec() {
-        return delegate.createWaitContainerCmdExec();
-    }
-
-    @Override
-    public AttachContainerCmd.Exec createAttachContainerCmdExec() {
-        return delegate.createAttachContainerCmdExec();
-    }
-
-    @Override
-    public ExecStartCmd.Exec createExecStartCmdExec() {
-        return delegate.createExecStartCmdExec();
-    }
-
-    @Override
-    public InspectExecCmd.Exec createInspectExecCmdExec() {
-        return delegate.createInspectExecCmdExec();
-    }
-
-    @Override
-    public LogContainerCmd.Exec createLogContainerCmdExec() {
-        return delegate.createLogContainerCmdExec();
-    }
-
-    @Override
-    public CopyFileFromContainerCmd.Exec createCopyFileFromContainerCmdExec() {
-        return delegate.createCopyFileFromContainerCmdExec();
-    }
-
-    @Override
-    public CopyArchiveFromContainerCmd.Exec createCopyArchiveFromContainerCmdExec() {
-        return delegate.createCopyArchiveFromContainerCmdExec();
-    }
-
-    @Override
-    public CopyArchiveToContainerCmd.Exec createCopyArchiveToContainerCmdExec() {
-        return delegate.createCopyArchiveToContainerCmdExec();
-    }
-
-    @Override
-    public StopContainerCmd.Exec createStopContainerCmdExec() {
-        return delegate.createStopContainerCmdExec();
-    }
-
-    @Override
-    public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
-        return delegate.createContainerDiffCmdExec();
-    }
-
-    @Override
-    public KillContainerCmd.Exec createKillContainerCmdExec() {
-        return delegate.createKillContainerCmdExec();
-    }
-
-    @Override
-    public UpdateContainerCmd.Exec createUpdateContainerCmdExec() {
-        return delegate.createUpdateContainerCmdExec();
-    }
-
-    @Override
-    public RenameContainerCmd.Exec createRenameContainerCmdExec() {
-        return delegate.createRenameContainerCmdExec();
-    }
-
-    @Override
-    public RestartContainerCmd.Exec createRestartContainerCmdExec() {
-        return delegate.createRestartContainerCmdExec();
-    }
-
-    @Override
-    public CommitCmd.Exec createCommitCmdExec() {
-        return delegate.createCommitCmdExec();
-    }
-
-    @Override
-    public TopContainerCmd.Exec createTopContainerCmdExec() {
-        return delegate.createTopContainerCmdExec();
-    }
-
-    @Override
-    public TagImageCmd.Exec createTagImageCmdExec() {
-        return delegate.createTagImageCmdExec();
-    }
-
-    @Override
-    public PauseContainerCmd.Exec createPauseContainerCmdExec() {
-        return delegate.createPauseContainerCmdExec();
-    }
-
-    @Override
-    public UnpauseContainerCmd.Exec createUnpauseContainerCmdExec() {
-        return delegate.createUnpauseContainerCmdExec();
-    }
-
-    @Override
-    public EventsCmd.Exec createEventsCmdExec() {
-        return delegate.createEventsCmdExec();
-    }
-
-    @Override
-    public StatsCmd.Exec createStatsCmdExec() {
-        return delegate.createStatsCmdExec();
-    }
-
-    @Override
-    public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
-        return command -> {
-            CreateVolumeResponse result = delegate.createCreateVolumeCmdExec().exec(command);
-            volumeNames.add(command.getName());
-            return result;
-        };
-    }
-
-    @Override
-    public InspectVolumeCmd.Exec createInspectVolumeCmdExec() {
-        return delegate.createInspectVolumeCmdExec();
-    }
-
-    @Override
-    public RemoveVolumeCmd.Exec createRemoveVolumeCmdExec() {
-        return command -> {
-            delegate.createRemoveVolumeCmdExec().exec(command);
-            volumeNames.remove(command.getName());
-            return null;
-        };
-    }
-
-    @Override
-    public ListVolumesCmd.Exec createListVolumesCmdExec() {
-        return delegate.createListVolumesCmdExec();
-    }
-
-    @Override
-    public ListNetworksCmd.Exec createListNetworksCmdExec() {
-        return delegate.createListNetworksCmdExec();
-    }
-
-    @Override
-    public InspectNetworkCmd.Exec createInspectNetworkCmdExec() {
-        return delegate.createInspectNetworkCmdExec();
-    }
-
-    @Override
-    public CreateNetworkCmd.Exec createCreateNetworkCmdExec() {
-
-        return command -> {
-            CreateNetworkResponse result = delegate.createCreateNetworkCmdExec().exec(command);
-            networkIds.add(result.getId());
-            return result;
-        };
-    }
-
-    @Override
-    public RemoveNetworkCmd.Exec createRemoveNetworkCmdExec() {
-        return command -> {
-            delegate.createRemoveNetworkCmdExec().exec(command);
-            networkIds.remove(command.getNetworkId());
-            return null;
-        };
-    }
-
-    @Override
-    public ConnectToNetworkCmd.Exec createConnectToNetworkCmdExec() {
-        return delegate.createConnectToNetworkCmdExec();
-    }
-
-    @Override
-    public DisconnectFromNetworkCmd.Exec createDisconnectFromNetworkCmdExec() {
-        return delegate.createDisconnectFromNetworkCmdExec();
-    }
-
-    // swarm
-    @Override
-    public InitializeSwarmCmd.Exec createInitializeSwarmCmdExec() {
-        return delegate.createInitializeSwarmCmdExec();
-    }
-
-    @Override
-    public InspectSwarmCmd.Exec createInspectSwarmCmdExec() {
-        return delegate.createInspectSwarmCmdExec();
-    }
-
-    @Override
-    public JoinSwarmCmd.Exec createJoinSwarmCmdExec() {
-        return delegate.createJoinSwarmCmdExec();
-    }
-
-    @Override
-    public LeaveSwarmCmd.Exec createLeaveSwarmCmdExec() {
-        return delegate.createLeaveSwarmCmdExec();
-    }
-
-    @Override
-    public UpdateSwarmCmd.Exec createUpdateSwarmCmdExec() {
-        return delegate.createUpdateSwarmCmdExec();
-    }
-
-    // services
-    @Override
-    public ListServicesCmd.Exec createListServicesCmdExec() {
-        return delegate.createListServicesCmdExec();
-    }
-
-    @Override
-    public CreateServiceCmd.Exec createCreateServiceCmdExec() {
-        return delegate.createCreateServiceCmdExec();
-    }
-
-    @Override
-    public InspectServiceCmd.Exec createInspectServiceCmdExec() {
-        return delegate.createInspectServiceCmdExec();
-    }
-
-    @Override
-    public UpdateServiceCmd.Exec createUpdateServiceCmdExec() {
-        return delegate.createUpdateServiceCmdExec();
-    }
-
-    @Override
-    public RemoveServiceCmd.Exec createRemoveServiceCmdExec() {
-        return delegate.createRemoveServiceCmdExec();
-    }
-
-    @Override
-    public LogSwarmObjectCmd.Exec logSwarmObjectExec(String endpoint) {
-        return delegate.logSwarmObjectExec(endpoint);
-    }
-
-    // nodes
-    @Override
-    public ListSwarmNodesCmd.Exec listSwarmNodeCmdExec() {
-        return delegate.listSwarmNodeCmdExec();
-    }
-
-    @Override
-    public InspectSwarmNodeCmd.Exec inspectSwarmNodeCmdExec() {
-        return delegate.inspectSwarmNodeCmdExec();
-    }
-
-    @Override
-    public RemoveSwarmNodeCmd.Exec removeSwarmNodeCmdExec() {
-        return delegate.removeSwarmNodeCmdExec();
-    }
-
-    @Override
-    public UpdateSwarmNodeCmd.Exec updateSwarmNodeCmdExec() {
-        return delegate.updateSwarmNodeCmdExec();
-    }
-
-    @Override
-    public ListTasksCmd.Exec listTasksCmdExec() {
-        return delegate.listTasksCmdExec();
-    }
-
-    @Override
-    public PruneCmd.Exec pruneCmdExec() {
-        return delegate.pruneCmdExec();
-    }
-
-    @Override
-    public ListSecretsCmd.Exec createListSecretsCmdExec() {
-        return delegate.createListSecretsCmdExec();
-    }
-
-    @Override
-    public CreateSecretCmd.Exec createCreateSecretCmdExec() {
-        return delegate.createCreateSecretCmdExec();
-    }
-
-    @Override
-    public RemoveSecretCmd.Exec createRemoveSecretCmdExec() {
-        return delegate.createRemoveSecretCmdExec();
-    }
-
-    public List<String> getContainerNames() {
-        return new ArrayList<>(containerNames);
-    }
-
-    public List<String> getImageNames() {
-        return new ArrayList<>(imageNames);
-    }
-
-    public List<String> getVolumeNames() {
-        return new ArrayList<>(volumeNames);
-    }
-
-    public List<String> getNetworkIds() {
-        return new ArrayList<>(networkIds);
-    }
-}
diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerAssume.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerAssume.java
index 011ee2885..2971d7bf3 100644
--- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerAssume.java
+++ b/docker-java/src/test/java/com/github/dockerjava/junit/DockerAssume.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.junit;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.core.DockerRule;
 
 import static com.github.dockerjava.utils.TestUtils.isSwarm;
 import static org.junit.Assume.assumeFalse;
diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java b/docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java
index bc71b7dfd..d0c2a22e6 100644
--- a/docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java
+++ b/docker-java/src/test/java/com/github/dockerjava/junit/DockerMatchers.java
@@ -2,6 +2,7 @@
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Volume;
+import com.github.dockerjava.core.DockerRule;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.hamcrest.CustomTypeSafeMatcher;
 import org.hamcrest.Description;
diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java b/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java
index cd7989afd..7aae924f9 100644
--- a/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java
+++ b/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java
@@ -7,6 +7,7 @@
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.core.DockerRule;
 import com.github.dockerjava.core.DockerClientBuilder;
 import org.junit.rules.ExternalResource;
 
@@ -14,7 +15,7 @@
 import java.util.concurrent.TimeUnit;
 
 import static com.github.dockerjava.api.model.HostConfig.newHostConfig;
-import static com.github.dockerjava.junit.DockerRule.DEFAULT_IMAGE;
+import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;

From 4fd7bbcdfae567abf6155e1110a0d27ed0696122 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 31 May 2020 10:32:33 +0200
Subject: [PATCH 1022/1272] fix the method link in DockerClientBuilder's
 Javadoc

---
 .../java/com/github/dockerjava/core/DockerClientBuilder.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java b/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
index 8db149221..a3e4c3909 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
+++ b/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
@@ -64,7 +64,7 @@ public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() {
     /**
      * Note that this method overrides {@link DockerHttpClient} if it was previously set
      *
-     * @deprecated use {@link #withHttpClient(DockerHttpClient)}
+     * @deprecated use {@link #withDockerHttpClient(DockerHttpClient)}
      */
     @Deprecated
     public DockerClientBuilder withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) {

From 5fc3864cee2e1e9d3896279110cc281cf5d8c72c Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 31 May 2020 17:45:17 +0200
Subject: [PATCH 1023/1272] Add a new "zerodep" transport based on AHC5 (#1404)

---
 docker-java-transport-httpclient5/pom.xml     |   2 +-
 .../httpclient5/ApacheDockerHttpClient.java   | 216 +----------------
 .../ApacheDockerHttpClientImpl.java           | 222 ++++++++++++++++++
 .../httpclient5/NamedPipeSocket.java          |  12 +-
 docker-java-transport-zerodep/pom.xml         | 104 ++++++++
 .../httpclient5/ZerodepDockerHttpClient.java  |  36 +++
 pom.xml                                       |   1 +
 7 files changed, 378 insertions(+), 215 deletions(-)
 create mode 100644 docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
 create mode 100644 docker-java-transport-zerodep/pom.xml
 create mode 100644 docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java

diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml
index 41300602f..5f204724f 100644
--- a/docker-java-transport-httpclient5/pom.xml
+++ b/docker-java-transport-httpclient5/pom.xml
@@ -36,7 +36,7 @@
 
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
-			<artifactId>jna-platform</artifactId>
+			<artifactId>jna</artifactId>
 			<version>5.5.0</version>
 		</dependency>
 	</dependencies>
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java
index 0a018cd06..cf2b7300d 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java
@@ -1,45 +1,11 @@
 package com.github.dockerjava.httpclient5;
 
 import com.github.dockerjava.transport.SSLConfig;
-import com.github.dockerjava.transport.DockerHttpClient;
-import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
-import org.apache.hc.client5.http.impl.classic.HttpClients;
-import org.apache.hc.client5.http.impl.io.ManagedHttpClientConnectionFactory;
-import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
-import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
-import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
-import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
-import org.apache.hc.core5.http.ConnectionClosedException;
-import org.apache.hc.core5.http.ContentLengthStrategy;
-import org.apache.hc.core5.http.Header;
-import org.apache.hc.core5.http.HttpHeaders;
-import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.NameValuePair;
-import org.apache.hc.core5.http.config.Registry;
-import org.apache.hc.core5.http.config.RegistryBuilder;
-import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy;
-import org.apache.hc.core5.http.impl.io.EmptyInputStream;
-import org.apache.hc.core5.http.io.entity.InputStreamEntity;
-import org.apache.hc.core5.http.protocol.BasicHttpContext;
-import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.core5.net.URIAuthority;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import javax.net.ssl.SSLContext;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.Socket;
 import java.net.URI;
-import java.util.List;
-import java.util.Map;
 import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
-public final class ApacheDockerHttpClient implements DockerHttpClient {
+public final class ApacheDockerHttpClient extends ApacheDockerHttpClientImpl {
 
     public static final class Builder {
 
@@ -63,183 +29,7 @@ public ApacheDockerHttpClient build() {
         }
     }
 
-    private final CloseableHttpClient httpClient;
-
-    private final HttpHost host;
-
-    private ApacheDockerHttpClient(
-        URI dockerHost,
-        SSLConfig sslConfig
-    ) {
-        Registry<ConnectionSocketFactory> socketFactoryRegistry = createConnectionSocketFactoryRegistry(sslConfig, dockerHost);
-
-        switch (dockerHost.getScheme()) {
-            case "unix":
-            case "npipe":
-                host = new HttpHost(dockerHost.getScheme(), "localhost", 2375);
-                break;
-            case "tcp":
-                host = new HttpHost(
-                    socketFactoryRegistry.lookup("https") != null ? "https" : "http",
-                    dockerHost.getHost(),
-                    dockerHost.getPort()
-                );
-                break;
-            default:
-                host = HttpHost.create(dockerHost);
-        }
-
-        httpClient = HttpClients.custom()
-            .setRequestExecutor(new HijackingHttpRequestExecutor(null))
-            .setConnectionManager(new PoolingHttpClientConnectionManager(
-                socketFactoryRegistry,
-                new ManagedHttpClientConnectionFactory(
-                    null,
-                    null,
-                    null,
-                    null,
-                    message -> {
-                        Header transferEncodingHeader = message.getFirstHeader(HttpHeaders.TRANSFER_ENCODING);
-                        if (transferEncodingHeader != null) {
-                            if ("identity".equalsIgnoreCase(transferEncodingHeader.getValue())) {
-                                return ContentLengthStrategy.UNDEFINED;
-                            }
-                        }
-                        return DefaultContentLengthStrategy.INSTANCE.determineLength(message);
-                    },
-                    null
-                )
-            ))
-            .build();
-    }
-
-    private Registry<ConnectionSocketFactory> createConnectionSocketFactoryRegistry(
-        SSLConfig sslConfig,
-        URI dockerHost
-    ) {
-        RegistryBuilder<ConnectionSocketFactory> socketFactoryRegistryBuilder = RegistryBuilder.create();
-
-        if (sslConfig != null) {
-            try {
-                SSLContext sslContext = sslConfig.getSSLContext();
-                if (sslContext != null) {
-                    socketFactoryRegistryBuilder.register("https", new SSLConnectionSocketFactory(sslContext));
-                }
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        return socketFactoryRegistryBuilder
-            .register("tcp", PlainConnectionSocketFactory.INSTANCE)
-            .register("http", PlainConnectionSocketFactory.INSTANCE)
-            .register("unix", new PlainConnectionSocketFactory() {
-                @Override
-                public Socket createSocket(HttpContext context) throws IOException {
-                    return new UnixDomainSocket(dockerHost.getPath());
-                }
-            })
-            .register("npipe", new PlainConnectionSocketFactory() {
-                @Override
-                public Socket createSocket(HttpContext context) {
-                    return new NamedPipeSocket(dockerHost.getPath());
-                }
-            })
-            .build();
-    }
-
-    @Override
-    public Response execute(Request request) {
-        HttpContext context = new BasicHttpContext();
-        HttpUriRequestBase httpUriRequest = new HttpUriRequestBase(request.method(), URI.create(request.path()));
-        httpUriRequest.setScheme(host.getSchemeName());
-        httpUriRequest.setAuthority(new URIAuthority(host.getHostName(), host.getPort()));
-
-        request.headers().forEach(httpUriRequest::addHeader);
-
-        InputStream body = request.body();
-        if (body != null) {
-            httpUriRequest.setEntity(new InputStreamEntity(body, null));
-        }
-
-        if (request.hijackedInput() != null) {
-            context.setAttribute(HijackingHttpRequestExecutor.HIJACKED_INPUT_ATTRIBUTE, request.hijackedInput());
-            httpUriRequest.setHeader("Upgrade", "tcp");
-            httpUriRequest.setHeader("Connection", "Upgrade");
-        }
-
-        try {
-            CloseableHttpResponse response = httpClient.execute(host, httpUriRequest, context);
-
-            return new ApacheResponse(httpUriRequest, response);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public void close() throws IOException {
-        httpClient.close();
-    }
-
-    static class ApacheResponse implements Response {
-
-        private static final Logger LOGGER = LoggerFactory.getLogger(ApacheResponse.class);
-
-        private final HttpUriRequestBase request;
-
-        private final CloseableHttpResponse response;
-
-        ApacheResponse(HttpUriRequestBase httpUriRequest, CloseableHttpResponse response) {
-            this.request = httpUriRequest;
-            this.response = response;
-        }
-
-        @Override
-        public int getStatusCode() {
-            return response.getCode();
-        }
-
-        @Override
-        public Map<String, List<String>> getHeaders() {
-            return Stream.of(response.getHeaders()).collect(Collectors.groupingBy(
-                NameValuePair::getName,
-                Collectors.mapping(NameValuePair::getValue, Collectors.toList())
-            ));
-        }
-
-        @Override
-        public String getHeader(String name) {
-            Header firstHeader = response.getFirstHeader(name);
-            return firstHeader != null ? firstHeader.getValue() : null;
-        }
-
-        @Override
-        public InputStream getBody() {
-            try {
-                return response.getEntity() != null
-                    ? response.getEntity().getContent()
-                    : EmptyInputStream.INSTANCE;
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        @Override
-        public void close() {
-            try {
-                request.abort();
-            } catch (Exception e) {
-                LOGGER.debug("Failed to abort the request", e);
-            }
-
-            try {
-                response.close();
-            } catch (ConnectionClosedException e) {
-                LOGGER.trace("Failed to close the response", e);
-            } catch (Exception e) {
-                LOGGER.debug("Failed to close the response", e);
-            }
-        }
+    private ApacheDockerHttpClient(URI dockerHost, SSLConfig sslConfig) {
+        super(dockerHost, sslConfig);
     }
 }
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
new file mode 100644
index 000000000..d06bd81ab
--- /dev/null
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
@@ -0,0 +1,222 @@
+package com.github.dockerjava.httpclient5;
+
+import com.github.dockerjava.transport.DockerHttpClient;
+import com.github.dockerjava.transport.SSLConfig;
+import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.impl.io.ManagedHttpClientConnectionFactory;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
+import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.core5.http.ConnectionClosedException;
+import org.apache.hc.core5.http.ContentLengthStrategy;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.config.Registry;
+import org.apache.hc.core5.http.config.RegistryBuilder;
+import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy;
+import org.apache.hc.core5.http.impl.io.EmptyInputStream;
+import org.apache.hc.core5.http.io.entity.InputStreamEntity;
+import org.apache.hc.core5.http.protocol.BasicHttpContext;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.net.URIAuthority;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.Socket;
+import java.net.URI;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+class ApacheDockerHttpClientImpl implements DockerHttpClient {
+
+    private final CloseableHttpClient httpClient;
+
+    private final HttpHost host;
+
+    protected ApacheDockerHttpClientImpl(
+        URI dockerHost,
+        SSLConfig sslConfig
+    ) {
+        Registry<ConnectionSocketFactory> socketFactoryRegistry = createConnectionSocketFactoryRegistry(sslConfig, dockerHost);
+
+        switch (dockerHost.getScheme()) {
+            case "unix":
+            case "npipe":
+                host = new HttpHost(dockerHost.getScheme(), "localhost", 2375);
+                break;
+            case "tcp":
+                host = new HttpHost(
+                    socketFactoryRegistry.lookup("https") != null ? "https" : "http",
+                    dockerHost.getHost(),
+                    dockerHost.getPort()
+                );
+                break;
+            default:
+                host = HttpHost.create(dockerHost);
+        }
+
+        httpClient = HttpClients.custom()
+            .setRequestExecutor(new HijackingHttpRequestExecutor(null))
+            .setConnectionManager(new PoolingHttpClientConnectionManager(
+                socketFactoryRegistry,
+                new ManagedHttpClientConnectionFactory(
+                    null,
+                    null,
+                    null,
+                    null,
+                    message -> {
+                        Header transferEncodingHeader = message.getFirstHeader(HttpHeaders.TRANSFER_ENCODING);
+                        if (transferEncodingHeader != null) {
+                            if ("identity".equalsIgnoreCase(transferEncodingHeader.getValue())) {
+                                return ContentLengthStrategy.UNDEFINED;
+                            }
+                        }
+                        return DefaultContentLengthStrategy.INSTANCE.determineLength(message);
+                    },
+                    null
+                )
+            ))
+            .build();
+    }
+
+    private Registry<ConnectionSocketFactory> createConnectionSocketFactoryRegistry(
+        SSLConfig sslConfig,
+        URI dockerHost
+    ) {
+        RegistryBuilder<ConnectionSocketFactory> socketFactoryRegistryBuilder = RegistryBuilder.create();
+
+        if (sslConfig != null) {
+            try {
+                SSLContext sslContext = sslConfig.getSSLContext();
+                if (sslContext != null) {
+                    socketFactoryRegistryBuilder.register("https", new SSLConnectionSocketFactory(sslContext));
+                }
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        return socketFactoryRegistryBuilder
+            .register("tcp", PlainConnectionSocketFactory.INSTANCE)
+            .register("http", PlainConnectionSocketFactory.INSTANCE)
+            .register("unix", new PlainConnectionSocketFactory() {
+                @Override
+                public Socket createSocket(HttpContext context) throws IOException {
+                    return new UnixDomainSocket(dockerHost.getPath());
+                }
+            })
+            .register("npipe", new PlainConnectionSocketFactory() {
+                @Override
+                public Socket createSocket(HttpContext context) {
+                    return new NamedPipeSocket(dockerHost.getPath());
+                }
+            })
+            .build();
+    }
+
+    @Override
+    public Response execute(Request request) {
+        HttpContext context = new BasicHttpContext();
+        HttpUriRequestBase httpUriRequest = new HttpUriRequestBase(request.method(), URI.create(request.path()));
+        httpUriRequest.setScheme(host.getSchemeName());
+        httpUriRequest.setAuthority(new URIAuthority(host.getHostName(), host.getPort()));
+
+        request.headers().forEach(httpUriRequest::addHeader);
+
+        InputStream body = request.body();
+        if (body != null) {
+            httpUriRequest.setEntity(new InputStreamEntity(body, null));
+        }
+
+        if (request.hijackedInput() != null) {
+            context.setAttribute(HijackingHttpRequestExecutor.HIJACKED_INPUT_ATTRIBUTE, request.hijackedInput());
+            httpUriRequest.setHeader("Upgrade", "tcp");
+            httpUriRequest.setHeader("Connection", "Upgrade");
+        }
+
+        try {
+            CloseableHttpResponse response = httpClient.execute(host, httpUriRequest, context);
+
+            return new ApacheResponse(httpUriRequest, response);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void close() throws IOException {
+        httpClient.close();
+    }
+
+    static class ApacheResponse implements Response {
+
+        private static final Logger LOGGER = LoggerFactory.getLogger(ApacheResponse.class);
+
+        private final HttpUriRequestBase request;
+
+        private final CloseableHttpResponse response;
+
+        ApacheResponse(HttpUriRequestBase httpUriRequest, CloseableHttpResponse response) {
+            this.request = httpUriRequest;
+            this.response = response;
+        }
+
+        @Override
+        public int getStatusCode() {
+            return response.getCode();
+        }
+
+        @Override
+        public Map<String, List<String>> getHeaders() {
+            return Stream.of(response.getHeaders()).collect(Collectors.groupingBy(
+                NameValuePair::getName,
+                Collectors.mapping(NameValuePair::getValue, Collectors.toList())
+            ));
+        }
+
+        @Override
+        public String getHeader(String name) {
+            Header firstHeader = response.getFirstHeader(name);
+            return firstHeader != null ? firstHeader.getValue() : null;
+        }
+
+        @Override
+        public InputStream getBody() {
+            try {
+                return response.getEntity() != null
+                    ? response.getEntity().getContent()
+                    : EmptyInputStream.INSTANCE;
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        @Override
+        public void close() {
+            try {
+                request.abort();
+            } catch (Exception e) {
+                LOGGER.debug("Failed to abort the request", e);
+            }
+
+            try {
+                response.close();
+            } catch (ConnectionClosedException e) {
+                LOGGER.trace("Failed to close the response", e);
+            } catch (Exception e) {
+                LOGGER.debug("Failed to close the response", e);
+            }
+        }
+    }
+}
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java
index b016c03d2..130b5e16c 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java
@@ -1,6 +1,8 @@
 package com.github.dockerjava.httpclient5;
 
-import com.sun.jna.platform.win32.Kernel32;
+import com.sun.jna.Native;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -98,4 +100,12 @@ public InputStream getInputStream() {
     public OutputStream getOutputStream() {
         return os;
     }
+
+    interface Kernel32 extends StdCallLibrary {
+
+        Kernel32 INSTANCE = Native.load("kernel32", Kernel32.class, W32APIOptions.DEFAULT_OPTIONS);
+
+        @SuppressWarnings("checkstyle:methodname")
+        boolean WaitNamedPipe(String lpNamedPipeName, int nTimeOut);
+    }
 }
diff --git a/docker-java-transport-zerodep/pom.xml b/docker-java-transport-zerodep/pom.xml
new file mode 100644
index 000000000..cec907067
--- /dev/null
+++ b/docker-java-transport-zerodep/pom.xml
@@ -0,0 +1,104 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.github.docker-java</groupId>
+		<artifactId>docker-java-parent</artifactId>
+		<version>3.2.2-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>docker-java-transport-zerodep</artifactId>
+	<packaging>jar</packaging>
+
+	<name>docker-java-transport-zerodep</name>
+	<url>https://github.com/docker-java/docker-java</url>
+	<description>Java API Client for Docker</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java-transport-httpclient5</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>com.github.siom79.japicmp</groupId>
+				<artifactId>japicmp-maven-plugin</artifactId>
+				<configuration>
+					<!-- TODO remove once this module is released -->
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Export-Package>com.github.dockerjava.zerodep.*</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<configuration>
+					<createDependencyReducedPom>true</createDependencyReducedPom>
+					<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+					<createSourcesJar>true</createSourcesJar>
+
+					<artifactSet>
+						<excludes>
+							<exclude>com.github.docker-java:docker-java-transport</exclude>
+							<exclude>net.java.dev.jna:jna-platform</exclude>
+							<exclude>net.java.dev.jna:*</exclude>
+							<exclude>org.slf4j:slf4j-api</exclude>
+						</excludes>
+					</artifactSet>
+					<filters>
+						<filter>
+							<artifact>com.github.docker-java:docker-java-transport-httpclient5</artifact>
+							<excludes>
+								<exclude>com/github/dockerjava/httpclient5/ApacheDockerHttpClient.class</exclude>
+								<exclude>com/github/dockerjava/httpclient5/ApacheDockerHttpClient$*</exclude>
+							</excludes>
+						</filter>
+						<filter>
+							<artifact>org.apache.httpcomponents.client5:httpclient5</artifact>
+							<excludes>
+								<exclude>mozilla/*</exclude>
+							</excludes>
+						</filter>
+					</filters>
+					<relocations>
+						<relocation>
+							<pattern>org.apache</pattern>
+							<shadedPattern>com.github.dockerjava.zerodep.shaded.org.apache</shadedPattern>
+						</relocation>
+						<relocation>
+							<pattern>com.github.dockerjava.httpclient5</pattern>
+							<shadedPattern>com.github.dockerjava.zerodep</shadedPattern>
+						</relocation>
+					</relocations>
+					<transformers>
+						<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+					</transformers>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java b/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java
new file mode 100644
index 000000000..2298da816
--- /dev/null
+++ b/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java
@@ -0,0 +1,36 @@
+package com.github.dockerjava.httpclient5;
+
+import com.github.dockerjava.transport.SSLConfig;
+
+import java.net.URI;
+import java.util.Objects;
+
+@SuppressWarnings("unused")
+public final class ZerodepDockerHttpClient extends ApacheDockerHttpClientImpl {
+
+    public static final class Builder {
+
+        private URI dockerHost = null;
+
+        private SSLConfig sslConfig = null;
+
+        public Builder dockerHost(URI value) {
+            this.dockerHost = Objects.requireNonNull(value, "dockerHost");
+            return this;
+        }
+
+        public Builder sslConfig(SSLConfig value) {
+            this.sslConfig = value;
+            return this;
+        }
+
+        public ZerodepDockerHttpClient build() {
+            Objects.requireNonNull(dockerHost, "dockerHost");
+            return new ZerodepDockerHttpClient(dockerHost, sslConfig);
+        }
+    }
+
+    protected ZerodepDockerHttpClient(URI dockerHost, SSLConfig sslConfig) {
+        super(dockerHost, sslConfig);
+    }
+}
diff --git a/pom.xml b/pom.xml
index 4faa09eaf..57809069a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,6 +99,7 @@
 		<module>docker-java-transport-jersey</module>
 		<module>docker-java-transport-okhttp</module>
 		<module>docker-java-transport-httpclient5</module>
+		<module>docker-java-transport-zerodep</module>
 		<module>docker-java</module>
 	</modules>
 

From 8864acd71e1665f2ab031ec1b4bb5ed04c12a270 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Sun, 31 May 2020 21:11:08 +0200
Subject: [PATCH 1024/1272] Initial docs

---
 CONTRIBUTING.md         |  58 +++++++++++++++++
 README.md               | 136 +---------------------------------------
 docs/README.md          |   2 +
 docs/devel.adoc         |  34 ----------
 docs/getting_started.md | 121 +++++++++++++++++++++++++++++++++++
 docs/transports.md      |  74 ++++++++++++++++++++++
 6 files changed, 256 insertions(+), 169 deletions(-)
 create mode 100644 CONTRIBUTING.md
 create mode 100644 docs/README.md
 delete mode 100644 docs/devel.adoc
 create mode 100644 docs/getting_started.md
 create mode 100644 docs/transports.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..5072b0864
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,58 @@
+# Build with Maven
+
+#### Prerequisites:
+
+* Java min 1.8
+* Maven 3
+
+Build and run integration tests as follows:
+
+    $ mvn clean install
+
+If you do not have access to a Docker server or just want to execute the build quickly, you can run the build without the integration tests:
+
+    $ mvn clean install -DskipITs
+
+By default the docker engine is using local UNIX sockets for communication with the docker CLI so docker-java
+client also uses UNIX domain sockets to connect to the docker daemon by default. To make the docker daemon listening on a TCP (http/https) port you have to configure it by setting the DOCKER_OPTS environment variable to something like the following: 
+
+    DOCKER_OPTS="-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock"
+    
+More details about setting up Docker Engine can be found in the official documentation: https://docs.docker.com/engine/admin/
+
+To force docker-java to use TCP (http) configure the following (see [Configuration](https://github.com/docker-java/docker-java#configuration) for details):
+
+    DOCKER_HOST=tcp://127.0.0.1:2375
+    
+For secure tls (https) communication:   
+
+    DOCKER_HOST=tcp://127.0.0.1:2376
+    DOCKER_TLS_VERIFY=1
+    DOCKER_CERT_PATH=/Users/marcus/.docker/machine/machines/docker-1.11.2
+
+
+# Code Design
+  * Model is based on Objects and not primitives that allows nullify requests and have null values for data
+  that wasn't provided by docker daemon.
+  * For null safeness findbugs annotations are used.
+  ** Every method that may return `null` (and we are unsure in any fields as docker daemon may change something)
+     should be annotated with `@CheckForNull` return qualifier from `javax.annotation` package.
+  ** Methods that can't return `null` must be annotated with `@Nonnull`.
+  ** The same for Arguments.
+  ** `@Nullable` must be used only for changing inherited (other typed) qualifier.
+  * Setters in builder style must be prefixed with `withXX`.
+  * All classes should provide `toString()` `equals()` and `hashCode()` defined methods.
+  * Javadocs
+  ** Provide full information on field:
+  *** For models define API version with `@since {@link RemoteApiVersion#VERSION_1_X}`.
+  ** getters/setters should refernce to field `@see #$field`.
+  * If it is `Serializable` it shall have a `serialVersionUID` field. Unless code has shipped to users, the initial value of the `serialVersionUID` field shall be `1L`.
+
+# Coding style
+  * Some initial styling already enforced with checkstyle. Please aim for consistency with the existing code.
+
+# Testing
+  * Unit tests for serder (serialization-deserialization).
+  * Integration tests for commands.
+  * If model object has builders, then fill it with data and compare by `equals()` with expected response
+  from docker daemon. If failed, then some fields mappings are wrong.
\ No newline at end of file
diff --git a/README.md b/README.md
index a67905b35..c60907548 100644
--- a/README.md
+++ b/README.md
@@ -1,143 +1,9 @@
 [![Join the chat at https://gitter.im/docker-java/docker-java](https://badges.gitter.im/docker-java/docker-java.svg)](https://gitter.im/docker-java/docker-java?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Maven Central](https://img.shields.io/maven-central/v/com.github.docker-java/docker-java.svg)](https://mvnrepository.com/artifact/com.github.docker-java/docker-java)
-[![Bintray](https://api.bintray.com/packages/kostyasha/maven/com.github.docker-java%3Adocker-java/images/download.svg)](https://bintray.com/kostyasha/maven/com.github.docker-java%3Adocker-java/_latestVersion) 
-[![Build Status](https://travis-ci.org/docker-java/docker-java.svg?branch=master)](https://travis-ci.org/docker-java/docker-java)
-[![Coverity Scan Build Status](https://scan.coverity.com/projects/9177/badge.svg?flat=1)](https://scan.coverity.com/projects/9177)
 [![codecov.io](http://codecov.io/github/docker-java/docker-java/coverage.svg?branch=master)](http://codecov.io/github/docker-java/docker-java?branch=master)
 [![License](http://img.shields.io/:license-apache-blue.svg?style=flat)](https://github.com/docker-java/docker-java/blob/master/LICENSE)
-
-<!--[![Circle CI](https://circleci.com/gh/docker-java/docker-java.svg?style=svg)](https://circleci.com/gh/docker-java/docker-java)-->
 # docker-java 
 
 Java API client for [Docker](http://docs.docker.io/ "Docker")
 
-[Changelog](https://github.com/docker-java/docker-java/blob/master/CHANGELOG.md)<br/>
-[Wiki](https://github.com/docker-java/docker-java/wiki)
-
-## Build with Maven
-
-###### Prerequisites:
-
-* Java min 1.8
-* Maven 3
-
-Build and run integration tests as follows:
-
-    $ mvn clean install
-
-If you do not have access to a Docker server or just want to execute the build quickly, you can run the build without the integration tests:
-
-    $ mvn clean install -DskipITs
-
-By default the docker engine is using local UNIX sockets for communication with the docker CLI so docker-java
-client also uses UNIX domain sockets to connect to the docker daemon by default. To make the docker daemon listening on a TCP (http/https) port you have to configure it by setting the DOCKER_OPTS environment variable to something like the following: 
-
-    DOCKER_OPTS="-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock"
-    
-More details about setting up Docker Engine can be found in the official documentation: https://docs.docker.com/engine/admin/
-
-To force docker-java to use TCP (http) configure the following (see [Configuration](https://github.com/docker-java/docker-java#configuration) for details):
-
-    DOCKER_HOST=tcp://127.0.0.1:2375
-    
-For secure tls (https) communication:   
-
-    DOCKER_HOST=tcp://127.0.0.1:2376
-    DOCKER_TLS_VERIFY=1
-    DOCKER_CERT_PATH=/Users/marcus/.docker/machine/machines/docker-1.11.2
-
-### Latest release version
-[Maven repository modules](https://mvnrepository.com/artifact/com.github.docker-java)
-
-Since 3.2.0 project provides 3 transports:
-- `docker-java-transport-jersey` (doesn't support streams)
-- `docker-java-transport-netty`
-- `docker-java-transport-okhttp`
-
-For backward compatibility `docker-java` module keeping dependency only on jersey and netty transports. 
-
-    <dependency>
-          <groupId>com.github.docker-java</groupId>
-          <artifactId>docker-java</artifactId>
-          <!-- use latest version https://github.com/docker-java/docker-java/releases -->
-          <version>3.X.Y</version>
-    </dependency>
-    
-### Latest development version
-May contain new features while they are not released.
-
-You can find the latest development version including javadoc and source files on [Sonatypes OSS repository](https://oss.sonatype.org/content/groups/public/com/github/docker-java/docker-java/).
-
-    <dependency>
-          <groupId>com.github.docker-java</groupId>
-          <artifactId>docker-java</artifactId>
-          <version>3.X.Y-SNAPSHOT</version>
-    </dependency>
-    
-
-## Documentation
-
-For code examples, please look at the [Wiki](https://github.com/docker-java/docker-java/wiki) or [Test cases](https://github.com/docker-java/docker-java/tree/master/docker-java/src/test/java/com/github/dockerjava/core/command "Test cases")
-
-## Configuration
-
-There are a couple of configuration items, all of which have sensible defaults:
-
-* `DOCKER_HOST` The Docker Host URL, e.g. `tcp://localhost:2376` or `unix:///var/run/docker.sock`
-* `DOCKER_TLS_VERIFY` enable/disable TLS verification (switch between `http` and `https` protocol)
-* `DOCKER_CERT_PATH` Path to the certificates needed for TLS verification
-* `DOCKER_CONFIG` Path for additional docker configuration files (like `.dockercfg`)
-* `api.version` The API version, e.g. `1.23`.
-* `registry.url` Your registry's address.
-* `registry.username` Your registry username (required to push containers).
-* `registry.password` Your registry password.
-* `registry.email` Your registry email.
-
-There are three ways to configure, in descending order of precedence:
-
-#### Programmatic:
-In your application, e.g.
-
-    DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder()
-        .withDockerHost("tcp://my-docker-host.tld:2376")
-        .withDockerTlsVerify(true)
-        .withDockerCertPath("/home/user/.docker/certs")
-        .withDockerConfig("/home/user/.docker")
-        .withApiVersion("1.30") // optional
-        .withRegistryUrl("https://index.docker.io/v1/")
-        .withRegistryUsername("dockeruser")
-        .withRegistryPassword("ilovedocker")
-        .withRegistryEmail("dockeruser@github.com")
-        .build();
-    DockerClient docker = DockerClientBuilder.getInstance(config).build();
-
-#### Properties (docker-java.properties)
-
-    DOCKER_HOST=tcp://localhost:2376
-    DOCKER_TLS_VERIFY=1
-    DOCKER_CERT_PATH=/home/user/.docker/certs
-    DOCKER_CONFIG=/home/user/.docker
-    api.version=1.23
-    registry.url=https://index.docker.io/v1/
-    registry.username=dockeruser
-    registry.password=ilovedocker
-    registry.email=dockeruser@github.com
-
-##### System Properties:
-
-    java -DDOCKER_HOST=tcp://localhost:2375 -Dregistry.username=dockeruser pkg.Main
-
-##### System Environment
-
-    export DOCKER_HOST=tcp://localhost:2376
-    export DOCKER_TLS_VERIFY=1
-    export DOCKER_CERT_PATH=/home/user/.docker/certs
-    export DOCKER_CONFIG=/home/user/.docker
-
-##### File System
-
-In `$HOME/.docker-java.properties`
-
-##### Class Path
-
-In the class path at `/docker-java.properties`
+# [Read the documentation here](docs/README.md)
\ No newline at end of file
diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 000000000..4b8ef0798
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,2 @@
+* [Getting Started](./getting_started.md)
+* [Available transports](./transports.md)
diff --git a/docs/devel.adoc b/docs/devel.adoc
deleted file mode 100644
index 1b6295662..000000000
--- a/docs/devel.adoc
+++ /dev/null
@@ -1,34 +0,0 @@
-### Code Design
-  * Model is based on Objects and not primitives that allows nullify requests and have null values for data
-  that wasn't provided by docker daemon.
-  * For null safeness findbugs annotations are used.
-  ** Every method that may return `null` (and we are unsure in any fields as docker daemon may change something)
-     should be annotated with `@CheckForNull` return qualifier from `javax.annotation` package.
-  ** Methods that can't return `null` must be annotated with `@Nonnull`.
-  ** The same for Arguments.
-  ** `@Nullable` must be used only for changing inherited (other typed) qualifier.
-  * Setters in builder style must be prefixed with `withXX`.
-  * All classes should provide `toString()` `equals()` and `hashCode()` defined methods.
-  * Javadocs
-  ** Provide full information on field:
-  *** For models define API version with `@since {@link RemoteApiVersion#VERSION_1_X}`.
-  ** getters/setters should refernce to field `@see #$field`.
-  * If it is `Serializable` it shall have a `serialVersionUID` field. Unless code has shipped to users, the initial value of the `serialVersionUID` field shall be `1L`.
-
-### Coding style
-  * TBD, some initial styling already enforced with checkstyle.
-  IDEA/checkstyle file analogues will be provided soon.
-
-### Testing
-  * Unit tests for serder (serialization-deserialization).
-  * Integration tests for commands.
-  * If model object has builders, then fill it with data and compare by `equals()` with expected response
-  from docker daemon. If failed, then some fields mappings are wrong.
-
-### Debug
-  * When there are unreproducible Travis errors:
-  ** Try locally run test 10-20 times in IDE against the same docker daemon version and same connection type (tcp or socket).
-  ** Limit `.travis.yml` to single run (to not consume their resources with matrix run).
-  ** Remove `travis-logback.xml` replacement (build can't output everything in every run because travis has log limitation).
-  ** Set single test in `pom.xml` `for maven-failsafe-plugin`
-  ** Make PR or if you are maintainer push to branch, catch log and fix.
diff --git a/docs/getting_started.md b/docs/getting_started.md
new file mode 100644
index 000000000..ebc41d62e
--- /dev/null
+++ b/docs/getting_started.md
@@ -0,0 +1,121 @@
+# Getting Started
+
+## Dependencies
+
+To start using `docker-java` , you need to add at least two dependencies:
+1. `com.github.docker-java:docker-java-core` for the `DockerClient`
+1. one of `com.github.docker-java:docker-java-transport-*` to communicate with the Docker daemon. See [Available Transports](./transports.md) for more info.
+
+The latest available version: 
+[![Maven Central](https://img.shields.io/maven-central/v/com.github.docker-java/docker-java.svg)](https://mvnrepository.com/artifact/com.github.docker-java/docker-java)
+
+
+## Instantiating a `DockerClientConfig`
+
+You will need an instance of `DockerClientConfig` to tell the library how to access Docker, which credentials to use to pull from Docker registries, etc etc.
+
+The builder is available and allows you to configure every property of the client:
+```java
+DockerClientConfig standard = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
+```
+
+```java
+DockerClientConfig custom = DefaultDockerClientConfig.createDefaultConfigBuilder()
+    .withDockerHost("tcp://docker.somewhere.tld:2376")
+    .withDockerTlsVerify(true)
+    .withDockerCertPath("/home/user/.docker")
+    .withRegistryUsername(registryUser)
+    .withRegistryPassword(registryPass)
+    .withRegistryEmail(registryMail)
+    .withRegistryUrl(registryUrl)
+    .build();
+```
+
+Here you can tune registry auth, DOCKER_HOST and other options.
+
+There are a couple of configuration items, all of which have sensible defaults:
+
+* `DOCKER_HOST` The Docker Host URL, e.g. `tcp://localhost:2376` or `unix:///var/run/docker.sock`
+* `DOCKER_TLS_VERIFY` enable/disable TLS verification (switch between `http` and `https` protocol)
+* `DOCKER_CERT_PATH` Path to the certificates needed for TLS verification
+* `DOCKER_CONFIG` Path for additional docker configuration files (like `.dockercfg`)
+* `api.version` The API version, e.g. `1.23`.
+* `registry.url` Your registry's address.
+* `registry.username` Your registry username (required to push containers).
+* `registry.password` Your registry password.
+* `registry.email` Your registry email.
+
+There are three ways to configure, in descending order of precedence:
+
+##### Properties (docker-java.properties)
+
+    DOCKER_HOST=tcp://localhost:2376
+    DOCKER_TLS_VERIFY=1
+    DOCKER_CERT_PATH=/home/user/.docker/certs
+    DOCKER_CONFIG=/home/user/.docker
+    api.version=1.23
+    registry.url=https://index.docker.io/v1/
+    registry.username=dockeruser
+    registry.password=ilovedocker
+    registry.email=dockeruser@github.com
+
+##### System Properties:
+
+    java -DDOCKER_HOST=tcp://localhost:2375 -Dregistry.username=dockeruser pkg.Main
+
+##### System Environment
+
+    export DOCKER_HOST=tcp://localhost:2376
+    export DOCKER_TLS_VERIFY=1
+    export DOCKER_CERT_PATH=/home/user/.docker/certs
+    export DOCKER_CONFIG=/home/user/.docker
+
+##### File System
+
+In `$HOME/.docker-java.properties`
+
+##### Class Path
+
+In the class path at `/docker-java.properties`
+
+### Jackson
+
+Should you need to customize the Jackson's `ObjectMapper` used by `docker-java`, you can create your own `DockerClientConfig` and override `DockerClientConfig#getObjectMapper()`.
+
+## Instantiating a `DockerHttpClient`
+Once you decided which transport to use, you will need to instantiate an HTTP client:
+```java
+DockerClientConfig config = ...;
+
+DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder()
+    .dockerHost(config.getDockerHost())
+    .sslConfig(config.getSSLConfig())
+    .build();
+```
+
+Please refer to selected transport's builder for other available configuration options (like timeouts).
+
+Once you have an HTTP client, you can make raw requests to the Docker daemon directly:
+```java
+Request request = Request.builder()
+    .method(Request.Method.GET)
+    .path("/_ping")
+    .build();
+
+try (Response response = httpClient.execute(request)) {
+    assertThat(response.getStatusCode(), equalTo(200));
+    assertThat(IOUtils.toString(response.getBody()), equalTo("OK"));
+}
+```
+
+## Instantiating a `DockerClient`
+
+To get an instance of `DockerClient`, you need to pass both `DockerClientConfig` and `DockerHttpClient`:
+```java
+DockerClient dockerClient = DockerClientImpl.getInstance(config, httpClient);
+```
+
+Once you have it, you can start executing Docker commands:
+```java
+dockerClient.pingCmd().exec();
+```
\ No newline at end of file
diff --git a/docs/transports.md b/docs/transports.md
new file mode 100644
index 000000000..0daa429ab
--- /dev/null
+++ b/docs/transports.md
@@ -0,0 +1,74 @@
+# Available transports
+
+## Apache HttpClient 5
+| | |
+|---|---|
+| Maven coordinates | `com.github.docker-java:docker-java-transport-httpclient5` |
+| Stabilitty | 🙂|
+| Long term support plans | ✅ |
+| Unix sockets support | ✅ |
+| Windows Npipe support | ✅ |
+| Stdin attachment support | ✅ |
+
+This transport is based on Apache HttpClient library version 5, which has a great flexibility and allows us to implement all Docker-specific features and protocols required, without having to use internal APIs or anything.
+
+It has everything to become the default transport of docker-java in future releases.
+
+## "Zerodep"
+| | |
+|---|---|
+| Maven coordinates | `com.github.docker-java:docker-java-transport-zerodep` |
+| Stabilitty | 🙂|
+| Long term support plans | ✅ |
+| Unix sockets support | ✅ |
+| Windows Npipe support | ✅ |
+| Stdin attachment support | ✅ |
+
+The idea of this transport is to provide a transport that supports 100% of the features without having to sorry about transitive dependencies.
+
+Note: due to the implementation details, it cannot be true "0 dependencies" module, so it needs to depend on `slf4j-api` and JNA.
+
+## OkHttp
+| | |
+|---|---|
+| Maven coordinates | `com.github.docker-java:docker-java-transport-okhttp` |
+| Stabilitty | 🧐|
+| Long term support plans | ❓ |
+| Unix sockets support | ✅ |
+| Windows Npipe support | ✅ |
+| Stdin attachment support | ✅ |
+
+The OkHttp transport was first implemented in [the Testcontainers library](http://github.com/testcontainers/testcontainers-java) as a replacement for Netty. The main motivation for it was to not have heavy-weight Netty-specific native dependencies and the lack of Npipe support in the Netty one.
+
+OkHttp's migration to Kotlin and the need to use internal APIs for doing stdin hijacking makes us question the future of this transport (still under the consideration).
+
+## Netty
+| | |
+|---|---|
+| Maven coordinates | `com.github.docker-java:docker-java-transport-netty` |
+| Stabilitty | 🧐|
+| Long term support plans | ❌ |
+| Unix sockets support | ✅ |
+| Windows Npipe support | ❌ |
+| Stdin attachment support | ✅ |
+
+Netty was the first alternative transport introduced as an alternative to Jersey.
+
+Although it gives a very low level access to the protocol, the lack of Windows Npipe support and the native library dependency for Unix Sockets make it hard to maintain and there are no plans to continue including this transport option in future versions.
+
+The community may decide to pick it up and continue the development as a 3rd party transport based on the existing abstractions `docker-java` provides.
+
+## Jersey
+| | |
+|---|---|
+| Maven coordinates | `com.github.docker-java:docker-java-transport-jersey` |
+| Stabilitty | 🙃|
+| Long term support plans | ❌ |
+| Unix sockets support | ✅ |
+| Windows Npipe support | ❌ |
+| Stdin attachment support | ❌ |
+
+Jersey was the initial transport of the project. And, while working well, it was lacking support for connection hijacking (e.g. stdin attachment) or Windows Npipes.
+The big amount of dependencies was also causing issues.
+
+Since Apache HttpClient 5-based transport is available now, there is no reason to keep Jersey and it will eventually be removed.
\ No newline at end of file

From ee2b24911b03d2d25bda0c41a194ef8000363a8f Mon Sep 17 00:00:00 2001
From: silme <frasigal@gmail.com>
Date: Mon, 1 Jun 2020 10:56:55 +0300
Subject: [PATCH 1025/1272] Support for client certificate chains (#1371)

* Support for client certificate chains

* Add test for client certificate chains

Co-authored-by: Sergei Egorov <segorov@pivotal.io>
---
 .../dockerjava/core/util/CertificateUtils.java   | 10 ++++++----
 .../core/util/CertificateUtilsTest.java          | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
index 82563962a..7cb1a19d4 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CertificateUtils.java
@@ -89,11 +89,13 @@ public static List<Certificate> loadCertificates(final Reader reader) throws IOE
 
             JcaX509CertificateConverter certificateConverter = new JcaX509CertificateConverter()
                     .setProvider(BouncyCastleProvider.PROVIDER_NAME);
-            Object certObj = pemParser.readObject();
+            Object certObj;
 
-            if (certObj instanceof X509CertificateHolder) {
-                X509CertificateHolder certificateHolder = (X509CertificateHolder) certObj;
-                certificates.add(certificateConverter.getCertificate(certificateHolder));
+            while ((certObj = pemParser.readObject()) != null) {
+                if (certObj instanceof X509CertificateHolder) {
+                    X509CertificateHolder certificateHolder = (X509CertificateHolder) certObj;
+                    certificates.add(certificateConverter.getCertificate(certificateHolder));
+                }
             }
 
             return certificates;
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java b/docker-java/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java
index 28818d24c..c29cedcf9 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/util/CertificateUtilsTest.java
@@ -11,6 +11,8 @@
 import java.nio.file.Paths;
 import java.security.KeyStore;
 import java.security.Security;
+import java.security.cert.Certificate;
+import java.util.List;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
@@ -86,6 +88,20 @@ public void readMultipleCaCerts() throws Exception {
         assertThat(keyStore.isCertificateEntry("ca-2"), is(true));
     }
 
+    @Test
+    public void readCert() throws Exception {
+        String certpem = readFileAsString("caTest/single_ca.pem");
+        List<Certificate> certs = CertificateUtils.loadCertificates(certpem);
+        assertThat(certs.size(), is(1));
+    }
+
+    @Test
+    public void readMultipleCerts() throws Exception {
+        String certpem = readFileAsString("caTest/multiple_ca.pem");
+        List<Certificate> certs = CertificateUtils.loadCertificates(certpem);
+        assertThat(certs.size(), is(2));
+    }
+
     private String readFileAsString(String path) throws IOException {
         return new String(Files.readAllBytes(Paths.get(new File(baseDir + path).getPath())));
     }

From fd1dc0ca53a2d1538619a309a254184f3ccf6279 Mon Sep 17 00:00:00 2001
From: Amelia <42555115+missmoode@users.noreply.github.com>
Date: Mon, 1 Jun 2020 08:59:21 +0100
Subject: [PATCH 1026/1272] Add SwarmNodeStatus#address field (#1405)

* Add SwarmNodeInfo address field

* Update docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java

Co-authored-by: Amy Harris <42555115+amelinya@users.noreply.github.com>
Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../dockerjava/api/model/SwarmNodeStatus.java | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
index ba99a194a..804efe2f1 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
@@ -22,6 +22,12 @@ public class SwarmNodeStatus implements Serializable {
     @JsonProperty("State")
     private SwarmNodeState state;
 
+    /**
+     * @since 1.25
+     */
+    @JsonProperty("Addr")
+    private String address;
+
     /**
      * @see #state
      */
@@ -37,4 +43,20 @@ public SwarmNodeStatus withState(SwarmNodeState state) {
         this.state = state;
         return this;
     }
+
+    /**
+     * @see #address
+     */
+    @CheckForNull
+    public String getAddress() {
+        return address;
+    }
+
+    /**
+     * @see #address
+     */
+    public SwarmNodeStatus withAddress(String address) {
+        this.address = address;
+        return this;
+    }
 }

From 0ecee0c192a2a048e87e176ec5091b74ea45ab93 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 1 Jun 2020 10:07:12 +0200
Subject: [PATCH 1027/1272] Update release-drafter.yml

---
 .github/release-drafter.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index d03efd7d9..d03b3f5f5 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -3,15 +3,15 @@ name-template: '$NEXT_PATCH_VERSION 🌈'
 categories:
   - title: '🚀 Features'
     labels:
-      - 'feature'
-      - 'enhancement'
+      - 'type/feature'
+  - title: '📈 Enhancements'
+    labels:
+      - 'type/enhancement'
   - title: '🐛 Bug Fixes'
     labels:
-      - 'fix'
-      - 'bugfix'
-      - 'bug'
+      - 'type/bug'
   - title: '🧰 Maintenance'
-    label: 'chore'
+    label: 'type/housekeeping'
 change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
 template: |
   ## Changes

From 3d2c7a0ac8f968507037bc27e5f8c4c3d00b8fd5 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 1 Jun 2020 10:29:27 +0200
Subject: [PATCH 1028/1272] Fix for duplicate key violation for exposed ports
 (#1406)

* Fix for duplicate key violation for exposed ports #1391

* use 3-arg `toMap`

Co-authored-by: coestre <c@optum.com>
Co-authored-by: Christian Oestreich <acetrike@yahoo.com>
---
 .../dockerjava/api/model/ExposedPorts.java     | 11 ++++++-----
 .../dockerjava/api/model/ExposedPortsTest.java | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
index 445cba2de..9fb9910bd 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
@@ -1,14 +1,14 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
 public class ExposedPorts implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -36,8 +36,9 @@ public static ExposedPorts fromPrimitive(Map<String, Object> object) {
     @JsonValue
     public Map<String, Object> toPrimitive() {
         return Stream.of(exposedPorts).collect(Collectors.toMap(
-                ExposedPort::toString,
-                __ -> new Object()
+            ExposedPort::toString,
+            __ -> new Object(),
+            (a, b) -> a
         ));
     }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java
index c64d5ace2..456e65ca4 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java
@@ -6,10 +6,13 @@
 import org.junit.Test;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.aMapWithSize;
 import static org.hamcrest.Matchers.arrayContainingInAnyOrder;
+import static org.hamcrest.Matchers.arrayWithSize;
 import static org.hamcrest.Matchers.notNullValue;
 
 public class ExposedPortsTest {
@@ -46,4 +49,19 @@ public void usesFromJson() throws Exception {
             new ExposedPort(3868, InternetProtocol.SCTP)
         ));
     }
+
+    @Test
+    public void usesFromJsonWithDuplicate() throws Exception {
+        ExposedPorts ports = new ExposedPorts(
+            new ExposedPort(80, InternetProtocol.UDP),
+            new ExposedPort(80),
+            new ExposedPort(80)
+        );
+
+        assertThat(ports, notNullValue());
+        assertThat(ports.getExposedPorts(), arrayWithSize(3));
+
+        Map<String, Object> map = ports.toPrimitive();
+        assertThat(map, aMapWithSize(2));
+    }
 }

From 5bfb6c03287fecad9466e190745a7b5d513e12ef Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 1 Jun 2020 11:18:24 +0200
Subject: [PATCH 1029/1272] do not override pushed image's name (#1407)

---
 .../dockerjava/core/exec/PushImageCmdExec.java      | 13 +++----------
 .../com/github/dockerjava/cmd/PushImageCmdIT.java   |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java
index 0f3705089..4f4540891 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/PushImageCmdExec.java
@@ -6,7 +6,6 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.PushImageCmd;
-import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PushResponseItem;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.InvocationBuilder;
@@ -22,17 +21,11 @@ public PushImageCmdExec(WebTarget baseResource, DockerClientConfig dockerClientC
         super(baseResource, dockerClientConfig);
     }
 
-    private String name(PushImageCmd command) {
-        String name = command.getName();
-        AuthConfig authConfig = command.getAuthConfig();
-        return (name.contains("/") || authConfig == null) ? name : authConfig.getUsername();
-    }
-
     @Override
     protected Void execute0(PushImageCmd command, ResultCallback<PushResponseItem> resultCallback) {
-
-        WebTarget webResource = getBaseResource().path("/images/" + name(command) + "/push").queryParam("tag",
-                command.getTag());
+        WebTarget webResource = getBaseResource().path("/images/{imageName}/push")
+            .resolveTemplate("imageName", command.getName())
+            .queryParam("tag", command.getTag());
 
         LOGGER.trace("POST: {}", webResource);
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
index e05ca151e..7f55d5f9e 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
@@ -79,7 +79,7 @@ public void pushNonExistentImage() throws Exception {
             exception.expect(NotFoundException.class);
         }
 
-        dockerRule.getClient().pushImageCmd("local/" + UUID.randomUUID().toString().replace("-", ""))
+        dockerRule.getClient().pushImageCmd(UUID.randomUUID().toString().replace("-", ""))
                 .start()
                 .awaitCompletion(30, TimeUnit.SECONDS); // exclude infinite await sleep
 

From 6044357cab3d83b386e7020dbbddea6bc492d34c Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 4 Jun 2020 11:12:26 +0200
Subject: [PATCH 1030/1272] Use `AsynchronousFileChannel` for npipe (#1408)

* Use `AsynchronousFileChannel` for npipe

* ignore `AsynchronousCloseException` on read

* Replace `FileNotFoundException` with `NoSuchFileException`
---
 .../httpclient5/NamedPipeSocket.java          | 147 ++++++++++------
 .../dockerjava/okhttp/NamedPipeSocket.java    | 159 ++++++++++++++++++
 .../okhttp/NamedPipeSocketFactory.java        | 100 +----------
 3 files changed, 257 insertions(+), 149 deletions(-)
 create mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java

diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java
index 130b5e16c..fd080d90f 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java
@@ -4,23 +4,28 @@
 import com.sun.jna.win32.StdCallLibrary;
 import com.sun.jna.win32.W32APIOptions;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.RandomAccessFile;
 import java.net.Socket;
 import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.AsynchronousByteChannel;
+import java.nio.channels.AsynchronousCloseException;
+import java.nio.channels.AsynchronousFileChannel;
+import java.nio.channels.Channels;
+import java.nio.channels.CompletionHandler;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Future;
 
 class NamedPipeSocket extends Socket {
 
     private final String socketFileName;
 
-    private RandomAccessFile file;
-
-    private InputStream is;
-
-    private OutputStream os;
+    private AsynchronousFileByteChannel channel;
 
     NamedPipeSocket(String socketFileName) {
         this.socketFileName = socketFileName;
@@ -28,26 +33,31 @@ class NamedPipeSocket extends Socket {
 
     @Override
     public void close() throws IOException {
-        if (file != null) {
-            file.close();
-            file = null;
+        if (channel != null) {
+            channel.close();
         }
     }
 
     @Override
-    public void connect(SocketAddress endpoint) {
+    public void connect(SocketAddress endpoint) throws IOException {
         connect(endpoint, 0);
     }
 
     @Override
-    public void connect(SocketAddress endpoint, int timeout) {
+    public void connect(SocketAddress endpoint, int timeout) throws IOException {
         long startedAt = System.currentTimeMillis();
         timeout = Math.max(timeout, 10_000);
         while (true) {
             try {
-                file = new RandomAccessFile(socketFileName, "rw");
+                channel = new AsynchronousFileByteChannel(
+                    AsynchronousFileChannel.open(
+                        Paths.get(socketFileName),
+                        StandardOpenOption.READ,
+                        StandardOpenOption.WRITE
+                    )
+                );
                 break;
-            } catch (FileNotFoundException e) {
+            } catch (NoSuchFileException e) {
                 if (System.currentTimeMillis() - startedAt >= timeout) {
                     throw new RuntimeException(e);
                 } else {
@@ -55,50 +65,16 @@ public void connect(SocketAddress endpoint, int timeout) {
                 }
             }
         }
-
-        is = new InputStream() {
-            @Override
-            public int read(byte[] bytes, int off, int len) throws IOException {
-                return file.read(bytes, off, len);
-            }
-
-            @Override
-            public int read() throws IOException {
-                return file.read();
-            }
-
-            @Override
-            public int read(byte[] bytes) throws IOException {
-                return file.read(bytes);
-            }
-        };
-
-        os = new OutputStream() {
-            @Override
-            public void write(byte[] bytes, int off, int len) throws IOException {
-                file.write(bytes, off, len);
-            }
-
-            @Override
-            public void write(int value) throws IOException {
-                file.write(value);
-            }
-
-            @Override
-            public void write(byte[] bytes) throws IOException {
-                file.write(bytes);
-            }
-        };
     }
 
     @Override
     public InputStream getInputStream() {
-        return is;
+        return Channels.newInputStream(channel);
     }
 
     @Override
     public OutputStream getOutputStream() {
-        return os;
+        return Channels.newOutputStream(channel);
     }
 
     interface Kernel32 extends StdCallLibrary {
@@ -108,4 +84,75 @@ interface Kernel32 extends StdCallLibrary {
         @SuppressWarnings("checkstyle:methodname")
         boolean WaitNamedPipe(String lpNamedPipeName, int nTimeOut);
     }
+
+    private static class AsynchronousFileByteChannel implements AsynchronousByteChannel {
+        private final AsynchronousFileChannel fileChannel;
+
+        AsynchronousFileByteChannel(AsynchronousFileChannel fileChannel) {
+            this.fileChannel = fileChannel;
+        }
+
+        @Override
+        public <A> void read(ByteBuffer dst, A attachment, CompletionHandler<Integer, ? super A> handler) {
+            fileChannel.read(dst, 0, attachment, new CompletionHandler<Integer, A>() {
+                @Override
+                public void completed(Integer read, A attachment) {
+                    handler.completed(read > 0 ? read : -1, attachment);
+                }
+
+                @Override
+                public void failed(Throwable exc, A attachment) {
+                    if (exc instanceof AsynchronousCloseException) {
+                        handler.completed(-1, attachment);
+                        return;
+                    }
+                    handler.failed(exc, attachment);
+                }
+            });
+        }
+
+        @Override
+        public Future<Integer> read(ByteBuffer dst) {
+            CompletableFutureHandler future = new CompletableFutureHandler();
+            fileChannel.read(dst, 0, null, future);
+            return future;
+        }
+
+        @Override
+        public <A> void write(ByteBuffer src, A attachment, CompletionHandler<Integer, ? super A> handler) {
+            fileChannel.write(src, 0, attachment, handler);
+        }
+
+        @Override
+        public Future<Integer> write(ByteBuffer src) {
+            return fileChannel.write(src, 0);
+        }
+
+        @Override
+        public void close() throws IOException {
+            fileChannel.close();
+        }
+
+        @Override
+        public boolean isOpen() {
+            return fileChannel.isOpen();
+        }
+
+        private static class CompletableFutureHandler extends CompletableFuture<Integer> implements CompletionHandler<Integer, Object> {
+
+            @Override
+            public void completed(Integer read, Object attachment) {
+                complete(read > 0 ? read : -1);
+            }
+
+            @Override
+            public void failed(Throwable exc, Object attachment) {
+                if (exc instanceof AsynchronousCloseException) {
+                    complete(-1);
+                    return;
+                }
+                completeExceptionally(exc);
+            }
+        }
+    }
 }
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java
new file mode 100644
index 000000000..f63e92019
--- /dev/null
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java
@@ -0,0 +1,159 @@
+package com.github.dockerjava.okhttp;
+
+import com.sun.jna.Native;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.AsynchronousByteChannel;
+import java.nio.channels.AsynchronousCloseException;
+import java.nio.channels.AsynchronousFileChannel;
+import java.nio.channels.Channels;
+import java.nio.channels.CompletionHandler;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Future;
+
+class NamedPipeSocket extends Socket {
+
+    private final String socketFileName;
+
+    private AsynchronousFileByteChannel channel;
+
+    NamedPipeSocket(String socketFileName) {
+        this.socketFileName = socketFileName;
+    }
+
+    @Override
+    public void close() throws IOException {
+        if (channel != null) {
+            channel.close();
+        }
+    }
+
+    @Override
+    public void connect(SocketAddress endpoint) throws IOException {
+        connect(endpoint, 0);
+    }
+
+    @Override
+    public void connect(SocketAddress endpoint, int timeout) throws IOException {
+        long startedAt = System.currentTimeMillis();
+
+        timeout = Math.max(timeout, 10_000);
+        while (true) {
+            try {
+                channel = new AsynchronousFileByteChannel(
+                    AsynchronousFileChannel.open(
+                        Paths.get(socketFileName),
+                        StandardOpenOption.READ,
+                        StandardOpenOption.WRITE
+                    )
+                );
+                break;
+            } catch (NoSuchFileException e) {
+                if (System.currentTimeMillis() - startedAt >= timeout) {
+                    throw new RuntimeException(e);
+                } else {
+                    Kernel32.INSTANCE.WaitNamedPipe(socketFileName, 100);
+                }
+            }
+        }
+    }
+
+    @Override
+    public InputStream getInputStream() {
+        return Channels.newInputStream(channel);
+    }
+
+    @Override
+    public OutputStream getOutputStream() {
+        return Channels.newOutputStream(channel);
+    }
+
+    interface Kernel32 extends StdCallLibrary {
+
+        Kernel32 INSTANCE = Native.load("kernel32", Kernel32.class, W32APIOptions.DEFAULT_OPTIONS);
+
+        @SuppressWarnings("checkstyle:methodname")
+        boolean WaitNamedPipe(String lpNamedPipeName, int nTimeOut);
+    }
+
+    private static class AsynchronousFileByteChannel implements AsynchronousByteChannel {
+        private final AsynchronousFileChannel fileChannel;
+
+        AsynchronousFileByteChannel(AsynchronousFileChannel fileChannel) {
+            this.fileChannel = fileChannel;
+        }
+
+        @Override
+        public <A> void read(ByteBuffer dst, A attachment, CompletionHandler<Integer, ? super A> handler) {
+            fileChannel.read(dst, 0, attachment, new CompletionHandler<Integer, A>() {
+                @Override
+                public void completed(Integer read, A attachment) {
+                    handler.completed(read > 0 ? read : -1, attachment);
+                }
+
+                @Override
+                public void failed(Throwable exc, A attachment) {
+                    if (exc instanceof AsynchronousCloseException) {
+                        handler.completed(-1, attachment);
+                        return;
+                    }
+                    handler.failed(exc, attachment);
+                }
+            });
+        }
+
+        @Override
+        public Future<Integer> read(ByteBuffer dst) {
+            CompletableFutureHandler future = new CompletableFutureHandler();
+            fileChannel.read(dst, 0, null, future);
+            return future;
+        }
+
+        @Override
+        public <A> void write(ByteBuffer src, A attachment, CompletionHandler<Integer, ? super A> handler) {
+            fileChannel.write(src, 0, attachment, handler);
+        }
+
+        @Override
+        public Future<Integer> write(ByteBuffer src) {
+            return fileChannel.write(src, 0);
+        }
+
+        @Override
+        public void close() throws IOException {
+            fileChannel.close();
+        }
+
+        @Override
+        public boolean isOpen() {
+            return fileChannel.isOpen();
+        }
+
+        private static class CompletableFutureHandler extends CompletableFuture<Integer> implements CompletionHandler<Integer, Object> {
+
+            @Override
+            public void completed(Integer read, Object attachment) {
+                complete(read > 0 ? read : -1);
+            }
+
+            @Override
+            public void failed(Throwable exc, Object attachment) {
+                if (exc instanceof AsynchronousCloseException) {
+                    complete(-1);
+                    return;
+                }
+                completeExceptionally(exc);
+            }
+        }
+    }
+}
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java
index d993a9c52..464910b04 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java
@@ -1,17 +1,8 @@
 package com.github.dockerjava.okhttp;
 
-import com.github.dockerjava.okhttp.OkDockerHttpClient.OkResponse;
-import com.sun.jna.platform.win32.Kernel32;
-
 import javax.net.SocketFactory;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.RandomAccessFile;
 import java.net.InetAddress;
 import java.net.Socket;
-import java.net.SocketAddress;
 
 class NamedPipeSocketFactory extends SocketFactory {
 
@@ -23,96 +14,7 @@ class NamedPipeSocketFactory extends SocketFactory {
 
     @Override
     public Socket createSocket() {
-        return new Socket() {
-
-            RandomAccessFile file;
-            InputStream is;
-            OutputStream os;
-
-            @Override
-            public void close() throws IOException {
-                if (file != null) {
-                    file.close();
-                    file = null;
-                }
-            }
-
-            @Override
-            public void connect(SocketAddress endpoint) {
-                connect(endpoint, 0);
-            }
-
-            @Override
-            public void connect(SocketAddress endpoint, int timeout) {
-                long startedAt = System.currentTimeMillis();
-                timeout = Math.max(timeout, 10_000);
-                while (true) {
-                    try {
-                        file = new RandomAccessFile(socketFileName, "rw");
-                        break;
-                    } catch (FileNotFoundException e) {
-                        if (System.currentTimeMillis() - startedAt >= timeout) {
-                            throw new RuntimeException(e);
-                        } else {
-                            Kernel32.INSTANCE.WaitNamedPipe(socketFileName, 100);
-                        }
-                    }
-                }
-
-                is = new InputStream() {
-                    @Override
-                    public int read(byte[] bytes, int off, int len) throws IOException {
-                        if (OkResponse.CLOSING.get()) {
-                            return 0;
-                        }
-                        return file.read(bytes, off, len);
-                    }
-
-                    @Override
-                    public int read() throws IOException {
-                        if (OkResponse.CLOSING.get()) {
-                            return 0;
-                        }
-                        return file.read();
-                    }
-
-                    @Override
-                    public int read(byte[] bytes) throws IOException {
-                        if (OkResponse.CLOSING.get()) {
-                            return 0;
-                        }
-                        return file.read(bytes);
-                    }
-                };
-
-                os = new OutputStream() {
-                    @Override
-                    public void write(byte[] bytes, int off, int len) throws IOException {
-                        file.write(bytes, off, len);
-                    }
-
-                    @Override
-                    public void write(int value) throws IOException {
-                        file.write(value);
-                    }
-
-                    @Override
-                    public void write(byte[] bytes) throws IOException {
-                        file.write(bytes);
-                    }
-                };
-            }
-
-            @Override
-            public InputStream getInputStream() {
-                return is;
-            }
-
-            @Override
-            public OutputStream getOutputStream() {
-                return os;
-            }
-        };
+        return new NamedPipeSocket(socketFileName);
     }
 
     @Override

From c285fe511a54773de3331d194b75f300e6f9b31b Mon Sep 17 00:00:00 2001
From: Archimedes Trajano <developer@trajano.net>
Date: Thu, 4 Jun 2020 05:56:41 -0400
Subject: [PATCH 1031/1272] Allow filtering by event type (#1367)

* Allow filtering by event type

* Update EventsCmdImpl.java

* Update EventsCmd.java

* Update EventsCmd.java

* Update EventsCmdImpl.java

* Update FiltersBuilder.java

* default

* Implements withEventTypeFilter with string

https://github.com/docker-java/docker-java/pull/1367#pullrequestreview-417304293

* fixed imports

* Update docker-java-api/src/main/java/com/github/dockerjava/api/command/EventsCmd.java

Co-authored-by: Sergei Egorov <bsideup@gmail.com>

* Update docker-java-api/src/main/java/com/github/dockerjava/api/command/EventsCmd.java

Co-authored-by: Sergei Egorov <bsideup@gmail.com>

* Update docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java

Co-authored-by: Sergei Egorov <bsideup@gmail.com>

* Update docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java

Co-authored-by: Sergei Egorov <bsideup@gmail.com>

* Added IT

* Added IT

* Update EventsCmdIT.java

Co-authored-by: Archimedes Trajano <archimedes.trajano@devhaus.com>
Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../dockerjava/api/command/EventsCmd.java     | 20 +++++++++++
 .../core/command/EventsCmdImpl.java           |  7 ++++
 .../dockerjava/core/util/FiltersBuilder.java  | 12 +++++++
 .../github/dockerjava/cmd/EventsCmdIT.java    | 33 +++++++++++++++++++
 4 files changed, 72 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/EventsCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
index c52706226..34a0c5ad5 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
@@ -2,10 +2,12 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Stream;
 
 import javax.annotation.CheckForNull;
 
 import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.api.model.EventType;
 
 /**
  * Get events
@@ -33,6 +35,24 @@ public interface EventsCmd extends AsyncDockerCmd<EventsCmd, Event> {
      */
     EventsCmd withEventFilter(String... event);
 
+    /**
+     * @param eventTypes event types to filter
+     */
+    EventsCmd withEventTypeFilter(String... eventTypes);
+
+    /**
+     * This provides a type safe version of {@link #withEventTypeFilter(String...)}.
+     *
+     * @param eventTypes event types to filter
+     */
+    default EventsCmd withEventTypeFilter(EventType... eventTypes) {
+        return withEventTypeFilter(
+            Stream.of(eventTypes)
+                .map(EventType::getValue)
+                .toArray(String[]::new)
+        );
+    }
+
     /**
      * @param image
      *            - image to filter
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
index 230f6dd5a..d6cca6899 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
@@ -57,6 +57,13 @@ public EventsCmd withEventFilter(String... event) {
         return this;
     }
 
+    @Override
+    public EventsCmd withEventTypeFilter(String... eventTypes) {
+        checkNotNull(eventTypes, "event types have not been specified");
+        this.filters.withEventTypes(eventTypes);
+        return this;
+    }
+
     @Override
     public EventsCmd withLabelFilter(String... label) {
         checkNotNull(label, "label have not been specified");
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
index 73b369ca7..0d6c1d268 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/util/FiltersBuilder.java
@@ -10,6 +10,8 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Representation of Docker filters.
@@ -64,6 +66,16 @@ public List<String> getContainer() {
         return getFilter("container");
     }
 
+    /**
+     * Filter by event types
+     *
+     * @param eventTypes an array of event types
+     */
+    public FiltersBuilder withEventTypes(String... eventTypes) {
+        withFilter("type", Stream.of(eventTypes).collect(Collectors.toList()));
+        return this;
+    }
+
     /**
      * Filter by labels
      *
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java
index 897c6fd25..2a16e5474 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/EventsCmdIT.java
@@ -3,6 +3,7 @@
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.api.model.EventType;
 import com.github.dockerjava.utils.TestUtils;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -10,6 +11,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -113,6 +115,37 @@ public void testEventStreamingWithFilter() throws Exception {
         }
     }
 
+    @Test
+    public void testEventStreamingWithEventTypeFilter() throws Exception {
+        assumeNotSwarm("", dockerRule);
+
+        String startTime = getEpochTime();
+        generateEvents();
+        String endTime = getEpochTime();
+
+        for (EventType eventType : EventType.values()) {
+            List<Event> events = new CopyOnWriteArrayList<>();
+            try (
+                ResultCallback.Adapter<?> eventCallback = dockerRule.getClient().eventsCmd()
+                    .withSince(startTime)
+                    .withUntil(endTime)
+                    .withEventTypeFilter(eventType)
+                    .exec(new ResultCallback.Adapter<Event>() {
+                        @Override
+                        public void onNext(Event event) {
+                            events.add(event);
+                        }
+                    })
+            ) {
+                eventCallback.awaitCompletion(30, TimeUnit.SECONDS);
+
+                for (Event event : events) {
+                    assertThat("Received event: " + event, event.getType(), is(eventType));
+                }
+            }
+        }
+    }
+
     /**
      * This method generates some events and returns the number of events being generated
      */

From 732c0f55c9ea166bc39feccc3da4a8cd000f545d Mon Sep 17 00:00:00 2001
From: derteufelqwe <44213358+derteufelqwe@users.noreply.github.com>
Date: Thu, 4 Jun 2020 12:30:53 +0200
Subject: [PATCH 1032/1272] Added support for "--replicas-max-per-node" (#1383)

* Added support for "--replicas-max-per-node"

* Update ServicePlacement.java

Replaced DockerClientException with IllegalArgumentException

* Update ServicePlacement.java

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../api/model/ServicePlacement.java           | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
index 9c2f0223a..777be8668 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
@@ -28,6 +28,12 @@ public class ServicePlacement implements Serializable {
     @JsonProperty("Platforms")
     private List<SwarmNodePlatform> platforms;
 
+    /**
+     * @since 1.40
+     */
+    @JsonProperty("MaxReplicas")
+    private Integer maxReplicas;
+
     /**
      * @see #constraints
      */
@@ -54,4 +60,31 @@ public List<SwarmNodePlatform> getPlatforms() {
     public void setPlatforms(List<SwarmNodePlatform> platforms) {
         this.platforms = platforms;
     }
+
+    /**
+     * Specifies the maximum amount of replicas / tasks that can run on one node.
+     * 0 means unlimited replicas per node.
+     *
+     * @param maxReplicas Max number of replicas
+     * @return This instance of ServicePlacement
+     * @throws IllegalArgumentException if maxReplicas is less than 0
+     */
+    public ServicePlacement withMaxReplicas(int maxReplicas) {
+        if (maxReplicas < 0) {
+            throw new IllegalArgumentException("The Value for MaxReplicas must be greater or equal to 0");
+        }
+
+        this.maxReplicas = maxReplicas;
+        return this;
+    }
+
+    /**
+     * Getter for maxReplicas
+     *
+     * @return The maximum amount of replicas / tasks that can run on one node.
+     */
+    public Integer getMaxReplicas() {
+        return this.maxReplicas;
+    }
+
 }

From 0ac24bd5a3664c80d3d30a3b9fe7f9f4a43e80fb Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 4 Jun 2020 12:34:25 +0200
Subject: [PATCH 1033/1272] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b9e2bc8b4..f566d3264 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,7 +3,7 @@ name: Release
 on:
   release:
     types:
-      - created
+      - published
 
 jobs:
   build:

From 36669387d162d58be06bfe76d411689292f89b6f Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 4 Jun 2020 12:34:52 +0200
Subject: [PATCH 1034/1272] Update release.yml

---
 .github/workflows/release.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f566d3264..af27a5718 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,7 +3,8 @@ name: Release
 on:
   release:
     types:
-      - published
+      - prereleased
+      - released
 
 jobs:
   build:

From e1586ccb94140d6c3c2cfd28d50510cb16b1ae3f Mon Sep 17 00:00:00 2001
From: Creaink <455372644@qq.com>
Date: Mon, 8 Jun 2020 16:53:15 +0800
Subject: [PATCH 1035/1272] Add resize container and exec command (#1262)

* Add resize container and exec command

* Apply suggestions from code review

fix code style

Co-authored-by: Sergei Egorov <bsideup@gmail.com>

* remove DEFAULT_IMAGE in resize exec

* add validation of resize exec test case

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../github/dockerjava/api/DockerClient.java   |  6 ++
 .../DelegatingDockerCmdExecFactory.java       | 10 ++++
 .../api/command/DockerCmdExecFactory.java     |  4 ++
 .../api/command/ResizeContainerCmd.java       | 30 ++++++++++
 .../dockerjava/api/command/ResizeExecCmd.java | 29 ++++++++++
 .../core/AbstractDockerCmdExecFactory.java    | 14 +++++
 .../dockerjava/core/DockerClientImpl.java     | 14 +++++
 .../core/command/ResizeContainerCmdImpl.java  | 57 ++++++++++++++++++
 .../core/command/ResizeExecCmdImpl.java       | 58 +++++++++++++++++++
 .../core/exec/ResizeContainerCmdExec.java     | 30 ++++++++++
 .../core/exec/ResizeExecCmdExec.java          | 31 ++++++++++
 .../dockerjava/cmd/ResizeContainerCmdIT.java  | 39 +++++++++++++
 .../dockerjava/cmd/ResizeExecCmdIT.java       | 48 +++++++++++++++
 13 files changed, 370 insertions(+)
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeContainerCmd.java
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeExecCmd.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeContainerCmdImpl.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeExecCmdImpl.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeContainerCmdExec.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeExecCmdExec.java
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/ResizeContainerCmdIT.java
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/ResizeExecCmdIT.java

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
index 3857f2fa2..59c90aa0b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -54,6 +54,8 @@
 import com.github.dockerjava.api.command.RemoveServiceCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RenameContainerCmd;
+import com.github.dockerjava.api.command.ResizeContainerCmd;
+import com.github.dockerjava.api.command.ResizeExecCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.api.command.SaveImagesCmd;
@@ -165,6 +167,8 @@ public interface DockerClient extends Closeable {
 
     ExecCreateCmd execCreateCmd(@Nonnull String containerId);
 
+    ResizeExecCmd resizeExecCmd(@Nonnull String execId);
+
     InspectContainerCmd inspectContainerCmd(@Nonnull String containerId);
 
     RemoveContainerCmd removeContainerCmd(@Nonnull String containerId);
@@ -242,6 +246,8 @@ public interface DockerClient extends Closeable {
 
     RestartContainerCmd restartContainerCmd(@Nonnull String containerId);
 
+    ResizeContainerCmd resizeContainerCmd(@Nonnull String containerId);
+
     CommitCmd commitCmd(@Nonnull String containerId);
 
     BuildImageCmd buildImageCmd();
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java
index dbd691974..c414a6d21 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java
@@ -25,11 +25,21 @@ public PingCmd.Exec createPingCmdExec() {
         return getDockerCmdExecFactory().createPingCmdExec();
     }
 
+    @Override
+    public ResizeContainerCmd.Exec createResizeContainerCmdExec() {
+        return getDockerCmdExecFactory().createResizeContainerCmdExec();
+    }
+
     @Override
     public ExecCreateCmd.Exec createExecCmdExec() {
         return getDockerCmdExecFactory().createExecCmdExec();
     }
 
+    @Override
+    public ResizeExecCmd.Exec createResizeExecCmdExec() {
+        return getDockerCmdExecFactory().createResizeExecCmdExec();
+    }
+
     @Override
     public VersionCmd.Exec createVersionCmdExec() {
         return getDockerCmdExecFactory().createVersionCmdExec();
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index e01d9239f..27084bf76 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -49,8 +49,12 @@ public interface DockerCmdExecFactory extends Closeable {
 
     AttachContainerCmd.Exec createAttachContainerCmdExec();
 
+    ResizeContainerCmd.Exec createResizeContainerCmdExec();
+
     ExecStartCmd.Exec createExecStartCmdExec();
 
+    ResizeExecCmd.Exec createResizeExecCmdExec();
+
     InspectExecCmd.Exec createInspectExecCmdExec();
 
     LogContainerCmd.Exec createLogContainerCmdExec();
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeContainerCmd.java
new file mode 100644
index 000000000..fef0087ed
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeContainerCmd.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+public interface ResizeContainerCmd extends SyncDockerCmd<Void> {
+
+    @CheckForNull
+    String getContainerId();
+
+    Integer getHeight();
+
+    Integer getWidth();
+
+    ResizeContainerCmd withContainerId(@Nonnull String execId);
+
+    ResizeContainerCmd withSize(int height, int width);
+
+    /**
+     * @throws NotFoundException no such container instance
+     */
+    @Override
+    Void exec() throws NotFoundException;
+
+    interface Exec extends DockerCmdSyncExec<ResizeContainerCmd, Void> {
+    }
+
+}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeExecCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeExecCmd.java
new file mode 100644
index 000000000..5910705e0
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ResizeExecCmd.java
@@ -0,0 +1,29 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+public interface ResizeExecCmd extends SyncDockerCmd<Void> {
+    @CheckForNull
+    String getExecId();
+
+    Integer getHeight();
+
+    Integer getWidth();
+
+    ResizeExecCmd withExecId(@Nonnull String execId);
+
+    ResizeExecCmd withSize(int height, int width);
+
+    /**
+     * @throws NotFoundException no such exec instance
+     */
+    @Override
+    Void exec() throws NotFoundException;
+
+    interface Exec extends DockerCmdSyncExec<ResizeExecCmd, Void> {
+    }
+
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
index e93260b8a..e31431741 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
@@ -57,6 +57,8 @@
 import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RenameContainerCmd;
+import com.github.dockerjava.api.command.ResizeContainerCmd;
+import com.github.dockerjava.api.command.ResizeExecCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.api.command.SaveImagesCmd;
@@ -92,6 +94,8 @@
 import com.github.dockerjava.core.exec.EventsCmdExec;
 import com.github.dockerjava.core.exec.ExecCreateCmdExec;
 import com.github.dockerjava.core.exec.ExecStartCmdExec;
+import com.github.dockerjava.core.exec.ResizeContainerCmdExec;
+import com.github.dockerjava.core.exec.ResizeExecCmdExec;
 import com.github.dockerjava.core.exec.InfoCmdExec;
 import com.github.dockerjava.core.exec.InitializeSwarmCmdExec;
 import com.github.dockerjava.core.exec.InspectContainerCmdExec;
@@ -303,11 +307,21 @@ public AttachContainerCmd.Exec createAttachContainerCmdExec() {
         return new AttachContainerCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public ResizeContainerCmd.Exec createResizeContainerCmdExec() {
+        return new ResizeContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public ExecStartCmd.Exec createExecStartCmdExec() {
         return new ExecStartCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public ResizeExecCmd.Exec createResizeExecCmdExec() {
+        return new ResizeExecCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public InspectExecCmd.Exec createInspectExecCmdExec() {
         return new InspectExecCmdExec(getBaseResource(), getDockerClientConfig());
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 4caae102c..eddddc220 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -56,6 +56,8 @@
 import com.github.dockerjava.api.command.RemoveServiceCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RenameContainerCmd;
+import com.github.dockerjava.api.command.ResizeContainerCmd;
+import com.github.dockerjava.api.command.ResizeExecCmd;
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.api.command.SaveImagesCmd;
@@ -132,6 +134,8 @@
 import com.github.dockerjava.core.command.RemoveServiceCmdImpl;
 import com.github.dockerjava.core.command.RemoveVolumeCmdImpl;
 import com.github.dockerjava.core.command.RenameContainerCmdImpl;
+import com.github.dockerjava.core.command.ResizeContainerCmdImpl;
+import com.github.dockerjava.core.command.ResizeExecCmdImpl;
 import com.github.dockerjava.core.command.RestartContainerCmdImpl;
 import com.github.dockerjava.core.command.SaveImageCmdImpl;
 import com.github.dockerjava.core.command.SaveImagesCmdImpl;
@@ -386,6 +390,11 @@ public ExecCreateCmd execCreateCmd(String containerId) {
         return new ExecCreateCmdImpl(getDockerCmdExecFactory().createExecCmdExec(), containerId);
     }
 
+    @Override
+    public ResizeExecCmd resizeExecCmd(@Nonnull String execId) {
+        return new ResizeExecCmdImpl(getDockerCmdExecFactory().createResizeExecCmdExec(), execId);
+    }
+
     @Override
     public RemoveContainerCmd removeContainerCmd(String containerId) {
         return new RemoveContainerCmdImpl(getDockerCmdExecFactory().createRemoveContainerCmdExec(), containerId);
@@ -464,6 +473,11 @@ public RestartContainerCmd restartContainerCmd(String containerId) {
         return new RestartContainerCmdImpl(getDockerCmdExecFactory().createRestartContainerCmdExec(), containerId);
     }
 
+    @Override
+    public ResizeContainerCmd resizeContainerCmd(@Nonnull String containerId) {
+        return new ResizeContainerCmdImpl(getDockerCmdExecFactory().createResizeContainerCmdExec(), containerId);
+    }
+
     @Override
     public CommitCmd commitCmd(String containerId) {
         return new CommitCmdImpl(getDockerCmdExecFactory().createCommitCmdExec(), containerId);
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeContainerCmdImpl.java
new file mode 100644
index 000000000..de1b6ac20
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeContainerCmdImpl.java
@@ -0,0 +1,57 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.ResizeContainerCmd;
+import com.github.dockerjava.api.exception.NotFoundException;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+public class ResizeContainerCmdImpl extends AbstrDockerCmd<ResizeContainerCmd, Void> implements ResizeContainerCmd {
+
+    private String containerId;
+
+    private Integer height;
+
+    private Integer width;
+
+    public ResizeContainerCmdImpl(ResizeContainerCmd.Exec exec, String execId) {
+        super(exec);
+        withContainerId(execId);
+    }
+
+    @Override
+    public String getContainerId() {
+        return containerId;
+    }
+
+    @Override
+    public Integer getHeight() {
+        return height;
+    }
+
+    @Override
+    public Integer getWidth() {
+        return width;
+    }
+
+    @Override
+    public ResizeContainerCmd withContainerId(String containerId) {
+        checkNotNull(containerId, "containerId was not specified");
+        this.containerId = containerId;
+        return this;
+    }
+
+    @Override
+    public ResizeContainerCmd withSize(int height, int width) {
+        this.height = height;
+        this.width = width;
+        return this;
+    }
+
+    /**
+     * @throws NotFoundException no such exec instance
+     */
+    @Override
+    public Void exec() throws NotFoundException {
+        return super.exec();
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeExecCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeExecCmdImpl.java
new file mode 100644
index 000000000..80b1fef88
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeExecCmdImpl.java
@@ -0,0 +1,58 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.ResizeExecCmd;
+import com.github.dockerjava.api.exception.NotFoundException;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+public class ResizeExecCmdImpl extends AbstrDockerCmd<ResizeExecCmd, Void> implements ResizeExecCmd {
+
+    private String execId;
+
+    private Integer height;
+
+    private Integer width;
+
+    public ResizeExecCmdImpl(ResizeExecCmd.Exec exec, String execId) {
+        super(exec);
+        withExecId(execId);
+    }
+
+    @Override
+    public String getExecId() {
+        return execId;
+    }
+
+    @Override
+    public Integer getHeight() {
+        return height;
+    }
+
+    @Override
+    public Integer getWidth() {
+        return width;
+    }
+
+    @Override
+    public ResizeExecCmd withExecId(String execId) {
+        checkNotNull(execId, "execId was not specified");
+        this.execId = execId;
+        return this;
+    }
+
+    @Override
+    public ResizeExecCmd withSize(int height, int width) {
+        this.height = height;
+        this.width = width;
+        return this;
+    }
+
+    /**
+     * @throws NotFoundException no such exec instance
+     */
+    @Override
+    public Void exec() throws NotFoundException {
+        return super.exec();
+    }
+
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeContainerCmdExec.java
new file mode 100644
index 000000000..f13fc582a
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeContainerCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.core.exec;
+
+import com.github.dockerjava.api.command.ResizeContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ResizeContainerCmdExec extends AbstrSyncDockerCmdExec<ResizeContainerCmd, Void> implements ResizeContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ResizeContainerCmdExec.class);
+
+    public ResizeContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(ResizeContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/resize")
+            .resolveTemplate("id", command.getContainerId()).queryParam("h", command.getHeight())
+            .queryParam("w", command.getWidth());
+
+        LOGGER.trace("POST: {}", webResource);
+
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(command);
+
+        return null;
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeExecCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeExecCmdExec.java
new file mode 100644
index 000000000..ba01c5ffe
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeExecCmdExec.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.core.exec;
+
+import com.github.dockerjava.api.command.ResizeExecCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class ResizeExecCmdExec extends AbstrSyncDockerCmdExec<ResizeExecCmd, Void> implements ResizeExecCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ResizeExecCmdExec.class);
+
+    public ResizeExecCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(ResizeExecCmd command) {
+        WebTarget webResource = getBaseResource().path("/exec/{id}/resize")
+            .resolveTemplate("id", command.getExecId()).queryParam("h", command.getHeight()).queryParam("w", command.getWidth());
+
+        LOGGER.trace("POST: {}", webResource);
+
+        webResource.request().accept(MediaType.APPLICATION_JSON).post(null);
+
+        return null;
+    }
+
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ResizeContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ResizeContainerCmdIT.java
new file mode 100644
index 000000000..eeb79b2ff
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ResizeContainerCmdIT.java
@@ -0,0 +1,39 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.security.SecureRandom;
+import java.util.concurrent.TimeUnit;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+public class ResizeContainerCmdIT extends CmdIT {
+    private static final Logger LOG = LoggerFactory.getLogger(ResizeContainerCmdIT.class);
+
+    private static final int TTY_HEIGHT = 30;
+    private static final int TTY_WIDTH = 120;
+
+    @Test
+    public void resizeContainerTtyTest() {
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        // wait until tty size changed to target size
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withUser("root")
+            .withCmd("sh", "-c", String.format("until stty size | grep '%d %d'; do : ; done", TTY_HEIGHT, TTY_WIDTH))
+            .withName(containerName).withTty(true).withStdinOpen(true).exec();
+
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+        dockerRule.getClient().resizeContainerCmd(container.getId()).withSize(TTY_HEIGHT, TTY_WIDTH).exec();
+
+        int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).start()
+            .awaitStatusCode(10, TimeUnit.SECONDS);
+
+        LOG.info("Container exit code: {}", exitCode);
+
+        assertThat(exitCode, equalTo(0));
+    }
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ResizeExecCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ResizeExecCmdIT.java
new file mode 100644
index 000000000..9e5c9b65f
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ResizeExecCmdIT.java
@@ -0,0 +1,48 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.ExecCreateCmdResponse;
+import com.github.dockerjava.core.command.ExecStartResultCallback;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.security.SecureRandom;
+import java.util.concurrent.TimeUnit;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+
+public class ResizeExecCmdIT extends CmdIT {
+    private static final Logger LOG = LoggerFactory.getLogger(ResizeExecCmdIT.class);
+
+    private static final int TTY_HEIGHT = 30;
+    private static final int TTY_WIDTH = 120;
+
+    @Test
+    public void resizeExecInstanceTtyTest() throws Exception {
+        String containerName = "generated_" + new SecureRandom().nextInt();
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withUser("root")
+                .withCmd("sleep", "9999").withName(containerName).exec();
+
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        // wait until tty size changed to target size
+        ExecCreateCmdResponse execCreateCmdResponse = dockerRule.getClient().execCreateCmd(container.getId()).withTty(true)
+            .withAttachStdout(true).withAttachStderr(true)
+            .withCmd("sh", "-c", String.format("until stty size | grep '%d %d'; do : ; done", TTY_HEIGHT, TTY_WIDTH)).exec();
+
+        final ExecStartResultCallback execStartResultCallback = new ExecStartResultCallback(System.out, System.err);
+
+        dockerRule.getClient().execStartCmd(execCreateCmdResponse.getId()).exec(execStartResultCallback).awaitStarted();
+
+        dockerRule.getClient().resizeExecCmd(execCreateCmdResponse.getId()).withSize(TTY_HEIGHT, TTY_WIDTH).exec();
+
+        // time out, exec instance resize failed
+        boolean waitResult = execStartResultCallback.awaitCompletion(10, TimeUnit.SECONDS);
+
+        assertThat(waitResult, equalTo(true));
+    }
+}

From 6086c7db6e9bc36b622fcd1281a09636ed789ff7 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 16 Jun 2020 14:58:24 +0200
Subject: [PATCH 1036/1272] Always catch exceptions from `close()` (#1414)

---
 .../com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java | 6 +++++-
 .../com/github/dockerjava/okhttp/OkDockerHttpClient.java    | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
index 3afea4617..b6c723f5d 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
@@ -378,7 +378,11 @@ public InputStream getBody() {
 
         @Override
         public void close() {
-            response.close();
+            try {
+                response.close();
+            } catch (Exception e) {
+                LOGGER.debug("Failed to close the response", e);
+            }
         }
     }
 }
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
index 53d52dd7f..fa36c211f 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
@@ -11,6 +11,8 @@
 import okhttp3.ResponseBody;
 import okio.BufferedSink;
 import okio.Okio;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.X509TrustManager;
@@ -28,6 +30,8 @@
 
 public final class OkDockerHttpClient implements DockerHttpClient {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(OkDockerHttpClient.class);
+
     public static final class Builder {
 
         private URI dockerHost = null;
@@ -267,6 +271,8 @@ public void close() {
             CLOSING.set(true);
             try {
                 response.close();
+            } catch (Exception e) {
+                LOGGER.debug("Failed to close the response", e);
             } finally {
                 CLOSING.set(previous);
             }

From 75b328f41684d38c3c668f7331ffd027a1c495b5 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 16 Jun 2020 14:58:45 +0200
Subject: [PATCH 1037/1272] auto close in `ResultCallback#awaitCompletion`
 (#1415)

---
 .../api/async/ResultCallbackTemplate.java     | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallbackTemplate.java b/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallbackTemplate.java
index 8c56ab093..911e67826 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallbackTemplate.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallbackTemplate.java
@@ -87,10 +87,18 @@ public void close() throws IOException {
      */
     @SuppressWarnings("unchecked")
     public RC_T awaitCompletion() throws InterruptedException {
-        completed.await();
-        // eventually (re)throws RuntimeException
-        throwFirstError();
-        return (RC_T) this;
+        try {
+            completed.await();
+            // eventually (re)throws RuntimeException
+            throwFirstError();
+            return (RC_T) this;
+        } finally {
+            try {
+                close();
+            } catch (IOException e) {
+                LOGGER.debug("Failed to close", e);
+            }
+        }
     }
 
     /**
@@ -99,9 +107,17 @@ public RC_T awaitCompletion() throws InterruptedException {
      *         before {@link ResultCallback#onComplete()} was called.
      */
     public boolean awaitCompletion(long timeout, TimeUnit timeUnit) throws InterruptedException {
-        boolean result = completed.await(timeout, timeUnit);
-        throwFirstError();
-        return result;
+        try {
+            boolean result = completed.await(timeout, timeUnit);
+            throwFirstError();
+            return result;
+        } finally {
+            try {
+                close();
+            } catch (IOException e) {
+                LOGGER.debug("Failed to close", e);
+            }
+        }
     }
 
     /**

From ea624681aef915a7bfecfab5f0bbbfb0d1230aa9 Mon Sep 17 00:00:00 2001
From: "Santiago M. Mola" <santi@mola.io>
Date: Wed, 17 Jun 2020 13:35:07 +0200
Subject: [PATCH 1038/1272] docs: fix typo in transports.md (#1416)

---
 docs/transports.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/transports.md b/docs/transports.md
index 0daa429ab..0b7a5f1d4 100644
--- a/docs/transports.md
+++ b/docs/transports.md
@@ -4,7 +4,7 @@
 | | |
 |---|---|
 | Maven coordinates | `com.github.docker-java:docker-java-transport-httpclient5` |
-| Stabilitty | 🙂|
+| Stability | 🙂|
 | Long term support plans | ✅ |
 | Unix sockets support | ✅ |
 | Windows Npipe support | ✅ |
@@ -18,7 +18,7 @@ It has everything to become the default transport of docker-java in future relea
 | | |
 |---|---|
 | Maven coordinates | `com.github.docker-java:docker-java-transport-zerodep` |
-| Stabilitty | 🙂|
+| Stability | 🙂|
 | Long term support plans | ✅ |
 | Unix sockets support | ✅ |
 | Windows Npipe support | ✅ |
@@ -32,7 +32,7 @@ Note: due to the implementation details, it cannot be true "0 dependencies" modu
 | | |
 |---|---|
 | Maven coordinates | `com.github.docker-java:docker-java-transport-okhttp` |
-| Stabilitty | 🧐|
+| Stability | 🧐|
 | Long term support plans | ❓ |
 | Unix sockets support | ✅ |
 | Windows Npipe support | ✅ |
@@ -46,7 +46,7 @@ OkHttp's migration to Kotlin and the need to use internal APIs for doing stdin h
 | | |
 |---|---|
 | Maven coordinates | `com.github.docker-java:docker-java-transport-netty` |
-| Stabilitty | 🧐|
+| Stability | 🧐|
 | Long term support plans | ❌ |
 | Unix sockets support | ✅ |
 | Windows Npipe support | ❌ |
@@ -62,7 +62,7 @@ The community may decide to pick it up and continue the development as a 3rd par
 | | |
 |---|---|
 | Maven coordinates | `com.github.docker-java:docker-java-transport-jersey` |
-| Stabilitty | 🙃|
+| Stability | 🙃|
 | Long term support plans | ❌ |
 | Unix sockets support | ✅ |
 | Windows Npipe support | ❌ |
@@ -71,4 +71,4 @@ The community may decide to pick it up and continue the development as a 3rd par
 Jersey was the initial transport of the project. And, while working well, it was lacking support for connection hijacking (e.g. stdin attachment) or Windows Npipes.
 The big amount of dependencies was also causing issues.
 
-Since Apache HttpClient 5-based transport is available now, there is no reason to keep Jersey and it will eventually be removed.
\ No newline at end of file
+Since Apache HttpClient 5-based transport is available now, there is no reason to keep Jersey and it will eventually be removed.

From c7756e76d0bbf965e5f72baf7fa20295b3ab17a1 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 19 Jun 2020 08:53:10 +0200
Subject: [PATCH 1039/1272] Create stale.yml

---
 .github/stale.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 .github/stale.yml

diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 000000000..3d7e98954
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,15 @@
+
+daysUntilStale: 30
+
+daysUntilClose: 7
+
+exemptLabels: []
+
+staleLabel: resolution/wontfix
+
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+
+closeComment: false

From 4497e18bd39f59e9033a09b16bba390de3706985 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 19 Jun 2020 10:07:58 +0200
Subject: [PATCH 1040/1272] Update stale.yml

---
 .github/stale.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/stale.yml b/.github/stale.yml
index 3d7e98954..5bf537daf 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -3,9 +3,10 @@ daysUntilStale: 30
 
 daysUntilClose: 7
 
-exemptLabels: []
+exemptLabels:
+  - resolution/acknowledged
 
-staleLabel: resolution/wontfix
+staleLabel: resolution/stale
 
 markComment: >
   This issue has been automatically marked as stale because it has not had

From 54c86cee58e85f2dc07e5466e6196bca8db08ac2 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 19 Jun 2020 14:10:09 +0200
Subject: [PATCH 1041/1272] Catch more generic `FileSystemException` in
 `NamedPipeSocket` (#1418)

When npipe is busy, it throws the following exception:
`java.nio.file.FileSystemException: \\.\pipe\docker_engine: All pipe instances are busy.`

The previous, RandomAccessFile-base implementation was catching it as `FileNotFoundException`.
But the NIO-based one seems to be throwing a generic `FileSystemException`.
---
 .../com/github/dockerjava/httpclient5/NamedPipeSocket.java    | 4 ++--
 .../java/com/github/dockerjava/okhttp/NamedPipeSocket.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java
index fd080d90f..384b18033 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java
@@ -15,7 +15,7 @@
 import java.nio.channels.AsynchronousFileChannel;
 import java.nio.channels.Channels;
 import java.nio.channels.CompletionHandler;
-import java.nio.file.NoSuchFileException;
+import java.nio.file.FileSystemException;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 import java.util.concurrent.CompletableFuture;
@@ -57,7 +57,7 @@ public void connect(SocketAddress endpoint, int timeout) throws IOException {
                     )
                 );
                 break;
-            } catch (NoSuchFileException e) {
+            } catch (FileSystemException e) {
                 if (System.currentTimeMillis() - startedAt >= timeout) {
                     throw new RuntimeException(e);
                 } else {
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java
index f63e92019..69f283fe0 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java
@@ -15,7 +15,7 @@
 import java.nio.channels.AsynchronousFileChannel;
 import java.nio.channels.Channels;
 import java.nio.channels.CompletionHandler;
-import java.nio.file.NoSuchFileException;
+import java.nio.file.FileSystemException;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 import java.util.concurrent.CompletableFuture;
@@ -58,7 +58,7 @@ public void connect(SocketAddress endpoint, int timeout) throws IOException {
                     )
                 );
                 break;
-            } catch (NoSuchFileException e) {
+            } catch (FileSystemException e) {
                 if (System.currentTimeMillis() - startedAt >= timeout) {
                     throw new RuntimeException(e);
                 } else {

From 17307333f2c8a783dc2d4cf9bc988183c7b4fda1 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 23 Jun 2020 08:50:46 +0200
Subject: [PATCH 1042/1272] Catch `AssertionError` when closing OkHttp's
 response (#1420)

---
 .../java/com/github/dockerjava/okhttp/OkDockerHttpClient.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
index fa36c211f..dad9e478d 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
@@ -271,7 +271,7 @@ public void close() {
             CLOSING.set(true);
             try {
                 response.close();
-            } catch (Exception e) {
+            } catch (Exception | AssertionError e) {
                 LOGGER.debug("Failed to close the response", e);
             } finally {
                 CLOSING.set(previous);

From dbc47619bb19ce559e6ad1433fbb85014b935ab9 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 23 Jun 2020 20:50:51 +0200
Subject: [PATCH 1043/1272] Detect leaked `DockerHttpClient.Response` objects
 (#1421)

---
 .../core/DefaultInvocationBuilder.java        | 31 ++++++-
 .../core/exec/ResizeContainerCmdExec.java     |  8 +-
 .../core/exec/ResizeExecCmdExec.java          |  8 +-
 .../dockerjava/okhttp/OkDockerHttpClient.java | 13 ++-
 .../java/com/github/dockerjava/cmd/CmdIT.java | 36 +++++---
 .../cmd/DockerHttpClientLeakDetector.java     | 31 +++++++
 .../github/dockerjava/cmd/SaveImageCmdIT.java | 20 ++--
 .../dockerjava/cmd/SaveImagesCmdIT.java       | 25 +++--
 .../cmd/TrackingDockerHttpClient.java         | 91 +++++++++++++++++++
 9 files changed, 225 insertions(+), 38 deletions(-)
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/DockerHttpClientLeakDetector.java
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/TrackingDockerHttpClient.java

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java
index 100904d7f..c63daf42d 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java
@@ -18,6 +18,7 @@
 import org.apache.commons.io.IOUtils;
 
 import java.io.ByteArrayInputStream;
+import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -99,7 +100,17 @@ public InputStream post(Object entity) {
             .body(encode(entity))
             .build();
 
-        return execute(request).getBody();
+        DockerHttpClient.Response response = execute(request);
+        return new FilterInputStream(response.getBody()) {
+            @Override
+            public void close() throws IOException {
+                try {
+                    super.close();
+                } finally {
+                    response.close();
+                }
+            }
+        };
     }
 
     @Override
@@ -188,7 +199,17 @@ public InputStream get() {
             .method(DockerHttpClient.Request.Method.GET)
             .build();
 
-        return execute(request).getBody();
+        DockerHttpClient.Response response = execute(request);
+        return new FilterInputStream(response.getBody()) {
+            @Override
+            public void close() throws IOException {
+                try {
+                    super.close();
+                } finally {
+                    response.close();
+                }
+            }
+        };
     }
 
     @Override
@@ -244,8 +265,12 @@ protected <T> void executeAndStream(
         Consumer<DockerHttpClient.Response> sourceConsumer
     ) {
         Thread thread = new Thread(() -> {
+            Thread streamingThread = Thread.currentThread();
             try (DockerHttpClient.Response response = execute(request)) {
-                callback.onStart(response);
+                callback.onStart(() -> {
+                    streamingThread.interrupt();
+                    response.close();
+                });
 
                 sourceConsumer.accept(response);
                 callback.onComplete();
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeContainerCmdExec.java
index f13fc582a..4913bde79 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeContainerCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeContainerCmdExec.java
@@ -7,6 +7,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+
 public class ResizeContainerCmdExec extends AbstrSyncDockerCmdExec<ResizeContainerCmd, Void> implements ResizeContainerCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ResizeContainerCmdExec.class);
@@ -23,7 +25,11 @@ protected Void execute(ResizeContainerCmd command) {
 
         LOGGER.trace("POST: {}", webResource);
 
-        webResource.request().accept(MediaType.APPLICATION_JSON).post(command);
+        try {
+            webResource.request().accept(MediaType.APPLICATION_JSON).post(command).close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
 
         return null;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeExecCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeExecCmdExec.java
index ba01c5ffe..e799a95d5 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeExecCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ResizeExecCmdExec.java
@@ -7,6 +7,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+
 
 public class ResizeExecCmdExec extends AbstrSyncDockerCmdExec<ResizeExecCmd, Void> implements ResizeExecCmd.Exec {
 
@@ -23,7 +25,11 @@ protected Void execute(ResizeExecCmd command) {
 
         LOGGER.trace("POST: {}", webResource);
 
-        webResource.request().accept(MediaType.APPLICATION_JSON).post(null);
+        try {
+            webResource.request().accept(MediaType.APPLICATION_JSON).post(null).close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
 
         return null;
     }
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
index dad9e478d..5bb943bef 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
@@ -2,6 +2,7 @@
 
 import com.github.dockerjava.transport.DockerHttpClient;
 import com.github.dockerjava.transport.SSLConfig;
+import okhttp3.Call;
 import okhttp3.ConnectionPool;
 import okhttp3.Dns;
 import okhttp3.HttpUrl;
@@ -219,9 +220,11 @@ public Response execute(Request request) {
             clientToUse = streamingClient;
         }
 
+        Call call = clientToUse.newCall(requestBuilder.build());
         try {
-            return new OkResponse(clientToUse.newCall(requestBuilder.build()).execute());
+            return new OkResponse(call);
         } catch (IOException e) {
+            call.cancel();
             throw new UncheckedIOException("Error while executing " + request, e);
         }
     }
@@ -239,10 +242,13 @@ static class OkResponse implements Response {
 
         static final ThreadLocal<Boolean> CLOSING = ThreadLocal.withInitial(() -> false);
 
+        private final Call call;
+
         private final okhttp3.Response response;
 
-        OkResponse(okhttp3.Response response) {
-            this.response = response;
+        OkResponse(Call call) throws IOException {
+            this.call = call;
+            this.response = call.execute();
         }
 
         @Override
@@ -270,6 +276,7 @@ public void close() {
             boolean previous = CLOSING.get();
             CLOSING.set(true);
             try {
+                call.cancel();
                 response.close();
             } catch (Exception | AssertionError e) {
                 LOGGER.debug("Failed to close the response", e);
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
index 8dab7f96c..12664c4e5 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
@@ -39,11 +39,13 @@ public DockerClientImpl createDockerClient(DockerClientConfig config) {
             public DockerClientImpl createDockerClient(DockerClientConfig config) {
                 return (DockerClientImpl) DockerClientBuilder.getInstance(config)
                     .withDockerHttpClient(
-                        new JerseyDockerHttpClient.Builder()
-                            .dockerHost(config.getDockerHost())
-                            .sslConfig(config.getSSLConfig())
-                            .connectTimeout(30 * 1000)
-                            .build()
+                        new TrackingDockerHttpClient(
+                            new JerseyDockerHttpClient.Builder()
+                                .dockerHost(config.getDockerHost())
+                                .sslConfig(config.getSSLConfig())
+                                .connectTimeout(30 * 1000)
+                                .build()
+                        )
                     )
                     .build();
             }
@@ -53,11 +55,13 @@ public DockerClientImpl createDockerClient(DockerClientConfig config) {
             public DockerClientImpl createDockerClient(DockerClientConfig config) {
                 return (DockerClientImpl) DockerClientBuilder.getInstance(config)
                     .withDockerHttpClient(
-                        new OkDockerHttpClient.Builder()
-                            .dockerHost(config.getDockerHost())
-                            .sslConfig(config.getSSLConfig())
-                            .connectTimeout(30 * 100)
-                            .build()
+                        new TrackingDockerHttpClient(
+                            new OkDockerHttpClient.Builder()
+                                .dockerHost(config.getDockerHost())
+                                .sslConfig(config.getSSLConfig())
+                                .connectTimeout(30 * 100)
+                                .build()
+                        )
                     )
                     .build();
             }
@@ -67,10 +71,12 @@ public DockerClientImpl createDockerClient(DockerClientConfig config) {
             public DockerClientImpl createDockerClient(DockerClientConfig config) {
                 return (DockerClientImpl) DockerClientBuilder.getInstance(config)
                     .withDockerHttpClient(
-                        new ApacheDockerHttpClient.Builder()
-                            .dockerHost(config.getDockerHost())
-                            .sslConfig(config.getSSLConfig())
-                            .build()
+                        new TrackingDockerHttpClient(
+                            new ApacheDockerHttpClient.Builder()
+                                .dockerHost(config.getDockerHost())
+                                .sslConfig(config.getSSLConfig())
+                                .build()
+                        )
                     )
                     .build();
             }
@@ -110,4 +116,6 @@ public FactoryType getFactoryType() {
     @Rule
     public DockerRule dockerRule = new DockerRule( this);
 
+    @Rule
+    public DockerHttpClientLeakDetector leakDetector = new DockerHttpClientLeakDetector();
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/DockerHttpClientLeakDetector.java b/docker-java/src/test/java/com/github/dockerjava/cmd/DockerHttpClientLeakDetector.java
new file mode 100644
index 000000000..1da12f3e0
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/DockerHttpClientLeakDetector.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.cmd;
+
+import org.junit.rules.ExternalResource;
+
+public class DockerHttpClientLeakDetector extends ExternalResource {
+
+    @Override
+    protected void before() {
+        synchronized (TrackingDockerHttpClient.ACTIVE_RESPONSES) {
+            TrackingDockerHttpClient.ACTIVE_RESPONSES.clear();
+        }
+    }
+
+    @Override
+    protected void after() {
+        synchronized (TrackingDockerHttpClient.ACTIVE_RESPONSES) {
+            if (TrackingDockerHttpClient.ACTIVE_RESPONSES.isEmpty()) {
+                return;
+            }
+
+            System.out.println("Leaked responses:");
+            IllegalStateException exception = new IllegalStateException("Leaked responses!");
+            exception.setStackTrace(new StackTraceElement[0]);
+
+            TrackingDockerHttpClient.ACTIVE_RESPONSES.forEach(response -> {
+                exception.addSuppressed(response.allocatedAt);
+            });
+            throw exception;
+        }
+    }
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java
index ab2f3aca9..cb5a4666c 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImageCmdIT.java
@@ -16,13 +16,19 @@ public class SaveImageCmdIT extends CmdIT {
     @Test
     public void saveImage() throws Exception {
 
-        InputStream image = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImageCmd("busybox").exec());
-        assertThat(image.read(), not(-1));
-
-        InputStream image2 = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImageCmd("busybox").withTag("latest").exec());
-        assertThat(image2.read(), not(-1));
-
-
+        try (
+            InputStream inputStream = dockerRule.getClient().saveImageCmd("busybox").exec();
+            InputStream image = IOUtils.toBufferedInputStream(inputStream)
+        ) {
+            assertThat(image.read(), not(-1));
+        }
+
+        try (
+            InputStream inputStream = dockerRule.getClient().saveImageCmd("busybox").withTag("latest").exec();
+            InputStream image2 = IOUtils.toBufferedInputStream(inputStream)
+        ) {
+            assertThat(image2.read(), not(-1));
+        }
     }
 
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImagesCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImagesCmdIT.java
index 2b5305d68..86b246029 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImagesCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/SaveImagesCmdIT.java
@@ -15,7 +15,10 @@ public class SaveImagesCmdIT extends CmdIT {
 
     @Test
     public void saveNoImages() throws Exception {
-        try(final InputStream image = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImagesCmd().exec())){
+        try (
+            InputStream inputStream = dockerRule.getClient().saveImagesCmd().exec();
+            InputStream image = IOUtils.toBufferedInputStream(inputStream)
+        ){
             assertThat(image.read(), not(-1));
         }
 
@@ -23,8 +26,10 @@ public void saveNoImages() throws Exception {
 
     @Test
     public void saveImagesWithNameAndTag() throws Exception {
-
-        try(final InputStream image = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImagesCmd().withImage("busybox", "latest").exec())) {
+        try (
+            InputStream inputStream = dockerRule.getClient().saveImagesCmd().withImage("busybox", "latest").exec();
+            InputStream image = IOUtils.toBufferedInputStream(inputStream)
+        ) {
             assertThat(image.read(), not(-1));
         }
 
@@ -32,12 +37,14 @@ public void saveImagesWithNameAndTag() throws Exception {
 
     @Test
     public void saveMultipleImages() throws Exception {
-
-        try(final InputStream image = IOUtils.toBufferedInputStream(dockerRule.getClient().saveImagesCmd()
-            // Not a real life use-case but "busybox" is the only one I dare to assume is really there.
-            .withImage("busybox", "latest")
-            .withImage("busybox", "latest")
-            .exec())) {
+        try (
+            InputStream inputStream = dockerRule.getClient().saveImagesCmd()
+                // Not a real life use-case but "busybox" is the only one I dare to assume is really there.
+                .withImage("busybox", "latest")
+                .withImage("busybox", "latest")
+                .exec();
+            InputStream image = IOUtils.toBufferedInputStream(inputStream)
+        ) {
             assertThat(image.read(), not(-1));
         }
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/TrackingDockerHttpClient.java b/docker-java/src/test/java/com/github/dockerjava/cmd/TrackingDockerHttpClient.java
new file mode 100644
index 000000000..3c991a8f1
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/TrackingDockerHttpClient.java
@@ -0,0 +1,91 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.transport.DockerHttpClient;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+class TrackingDockerHttpClient implements DockerHttpClient {
+
+    static final Set<TrackedResponse> ACTIVE_RESPONSES = Collections.newSetFromMap(new ConcurrentHashMap<>());
+
+    private final DockerHttpClient delegate;
+
+    TrackingDockerHttpClient(DockerHttpClient delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public Response execute(Request request) {
+        return new TrackedResponse(delegate.execute(request)) {
+            {
+                synchronized (ACTIVE_RESPONSES) {
+                    ACTIVE_RESPONSES.add(this);
+                }
+            }
+
+            @Override
+            public void close() {
+                synchronized (ACTIVE_RESPONSES) {
+                    ACTIVE_RESPONSES.remove(this);
+                }
+                super.close();
+            }
+        };
+    }
+
+    @Override
+    public void close() throws IOException {
+        delegate.close();
+    }
+
+    static class TrackedResponse implements Response {
+
+        private static class AllocatedAt extends Exception {
+            public AllocatedAt(String message) {
+                super(message);
+            }
+        }
+
+        final Exception allocatedAt = new AllocatedAt(this.toString());
+
+        private final Response delegate;
+
+        TrackedResponse(Response delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public int getStatusCode() {
+            return delegate.getStatusCode();
+        }
+
+        @Override
+        public Map<String, List<String>> getHeaders() {
+            return delegate.getHeaders();
+        }
+
+        @Override
+        public InputStream getBody() {
+            return delegate.getBody();
+        }
+
+        @Override
+        public void close() {
+            delegate.close();
+        }
+
+        @Override
+        @Nullable
+        public String getHeader(@Nonnull String name) {
+            return delegate.getHeader(name);
+        }
+    }
+}

From 3870a256cb166f7ec92df4df71eec2904740848d Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 24 Jun 2020 10:05:42 +0200
Subject: [PATCH 1044/1272] Update "checkout" action to v2 (#1422)

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 84f562a8a..73c35f57a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
           - { name: "Docker 18.06.3", dockerVersion: "18.06.3~ce~3-0~ubuntu" }
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Set up JDK 8
         uses: actions/setup-java@v1
         with:

From 10338b121f2a1e57a8277aebc850e8261432a08b Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Wed, 24 Jun 2020 15:13:24 +0200
Subject: [PATCH 1045/1272] Update transports.md

---
 docs/transports.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/transports.md b/docs/transports.md
index 0b7a5f1d4..18a93d9e0 100644
--- a/docs/transports.md
+++ b/docs/transports.md
@@ -24,7 +24,7 @@ It has everything to become the default transport of docker-java in future relea
 | Windows Npipe support | ✅ |
 | Stdin attachment support | ✅ |
 
-The idea of this transport is to provide a transport that supports 100% of the features without having to sorry about transitive dependencies.
+The idea of this transport is to provide a transport that supports 100% of the features without having to worry about transitive dependencies.
 
 Note: due to the implementation details, it cannot be true "0 dependencies" module, so it needs to depend on `slf4j-api` and JNA.
 

From c3661f3da85ebf4f9caea5a75d1c9224d2937876 Mon Sep 17 00:00:00 2001
From: Sascha Wiedenfeld <44531686+swiedenfeld@users.noreply.github.com>
Date: Thu, 25 Jun 2020 10:54:43 +0200
Subject: [PATCH 1046/1272] Memoize file match patterns (#1412)

* Compile each file match pattern only once

#1409

* Update GoLangFileMatch.java

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../github/dockerjava/core/GoLangFileMatch.java | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index 445c00120..094834cfd 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -6,8 +6,14 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.common.util.concurrent.UncheckedExecutionException;
 import org.apache.commons.lang.StringUtils;
 
 import com.github.dockerjava.core.exception.GoLangFileMatchException;
@@ -52,6 +58,11 @@ private GoLangFileMatch() {
 
     private static final String PATTERN_CHARS_TO_ESCAPE = "\\.[]{}()*+-?^$|";
 
+    private static final LoadingCache<String, Pattern> PATTERN_CACHE = CacheBuilder.newBuilder()
+        .expireAfterAccess(1, TimeUnit.HOURS)
+        .maximumSize(10_000)
+        .build(CacheLoader.from(GoLangFileMatch::buildPattern));
+
     public static boolean match(List<String> patterns, File file) {
         return !match(patterns, file.getPath()).isEmpty();
     }
@@ -74,7 +85,11 @@ public static List<String> match(List<String> patterns, String name) {
     }
 
     public static boolean match(String pattern, String name) {
-        return buildPattern(pattern).matcher(name).matches();
+        try {
+            return PATTERN_CACHE.get(pattern).matcher(name).matches();
+        } catch (ExecutionException | UncheckedExecutionException e) {
+            throw new GoLangFileMatchException(e.getCause().getMessage());
+        }
     }
 
     private static Pattern buildPattern(String pattern) {

From ce5e9eba3b8d0f31b00b64de74c4b90cb5ec9ee9 Mon Sep 17 00:00:00 2001
From: Alexander Koshevoy <tejksat@users.noreply.github.com>
Date: Fri, 6 Nov 2020 12:39:15 +0300
Subject: [PATCH 1047/1272] Fix sporadic failures of AttachContainerCmdIT tests
 (#1483)

* Remove unnecessary semicolons

* Make log field of AttachContainerTestCallback final

* Reformat AttachContainerCmdIT.java

* Fix sporadic failures of AttachContainerCmdIT tests

* Remove no longer required "sleep 1" before reading line and echoing it in "attachContainerWithStdin" test

* Remove no longer required cyclic output to stdout and stderr in "attachContainerWithTTY" test

Co-authored-by: Alexander Koshevoy <Alexander.Koshevoy@jetbrains.com>
---
 .../dockerjava/cmd/AttachContainerCmdIT.java  | 155 ++++++++++--------
 .../attachContainerTestDockerfile/echo.sh     |   2 +-
 2 files changed, 85 insertions(+), 72 deletions(-)

diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
index 055eb640b..68d1867ad 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
@@ -3,7 +3,6 @@
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.StreamType;
 import org.junit.Assume;
@@ -26,8 +25,8 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.emptyString;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -51,20 +50,17 @@ public void attachContainerWithStdin() throws Exception {
         String snippet = "hello world";
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
-                .withCmd("/bin/sh", "-c", "sleep 1 && read line && echo $line")
-                .withTty(false)
-                .withStdinOpen(true)
-                .exec();
+            .withCmd("/bin/sh", "-c", "read line && echo $line")
+            .withTty(false)
+            .withAttachStdin(true)
+            .withAttachStdout(true)
+            .withAttachStderr(true)
+            .withStdinOpen(true)
+            .exec();
 
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(is(emptyString())));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-
-        assertThat(inspectContainerResponse.getState().getRunning(), is(true));
-
         AttachContainerTestCallback callback = new AttachContainerTestCallback() {
             @Override
             public void onNext(Frame frame) {
@@ -75,7 +71,7 @@ public void onNext(Frame frame) {
 
         try (
             PipedOutputStream out = new PipedOutputStream();
-            PipedInputStream in = new PipedInputStream(out);
+            PipedInputStream in = new PipedInputStream(out)
         ) {
             dockerClient.attachContainerCmd(container.getId())
                 .withStdErr(true)
@@ -84,6 +80,8 @@ public void onNext(Frame frame) {
                 .withStdIn(in)
                 .exec(callback);
 
+            dockerClient.startContainerCmd(container.getId()).exec();
+
             out.write((snippet + "\n").getBytes());
             out.flush();
 
@@ -101,30 +99,33 @@ public void attachContainerWithoutTTY() throws Exception {
         String snippet = "hello world";
 
         CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE)
-                .withCmd("echo", snippet)
-                .withTty(false)
-                .exec();
+            .withCmd("echo", snippet)
+            .withTty(false)
+            .withAttachStdout(true)
+            .withAttachStderr(true)
+            .exec();
 
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(is(emptyString())));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
-
         AttachContainerTestCallback callback = new AttachContainerTestCallback() {
             @Override
             public void onNext(Frame frame) {
                 assertThat(frame.getStreamType(), equalTo(StreamType.STDOUT));
                 super.onNext(frame);
-            };
+            }
         };
 
         dockerClient.attachContainerCmd(container.getId())
-                .withStdErr(true)
-                .withStdOut(true)
-                .withFollowStream(true)
-                .withLogs(true)
-                .exec(callback)
-                .awaitCompletion(30, TimeUnit.SECONDS);
+            .withStdErr(true)
+            .withStdOut(true)
+            .withFollowStream(true)
+            .withLogs(true)
+            .exec(callback);
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        callback.awaitCompletion(30, TimeUnit.SECONDS);
         callback.close();
 
         assertThat(callback.toString(), containsString(snippet));
@@ -135,31 +136,37 @@ public void attachContainerWithTTY() throws Exception {
         DockerClient dockerClient = dockerRule.getClient();
 
         File baseDir = new File(Thread.currentThread().getContextClassLoader()
-                .getResource("attachContainerTestDockerfile").getFile());
+            .getResource("attachContainerTestDockerfile").getFile());
 
         String imageId = dockerRule.buildImage(baseDir);
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(imageId).withTty(true).exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd(imageId)
+            .withTty(true)
+            .withAttachStdout(true)
+            .withAttachStderr(true)
+            .exec();
 
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(is(emptyString())));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
 
         AttachContainerTestCallback callback = new AttachContainerTestCallback() {
             @Override
             public void onNext(Frame frame) {
                 assertThat(frame.getStreamType(), equalTo(StreamType.RAW));
                 super.onNext(frame);
-            };
+            }
         };
 
         dockerClient.attachContainerCmd(container.getId())
-                .withStdErr(true)
-                .withStdOut(true)
-                .withFollowStream(true)
-                .exec(callback)
-                .awaitCompletion(15, TimeUnit.SECONDS);
+            .withStdErr(true)
+            .withStdOut(true)
+            .withFollowStream(true)
+            .exec(callback);
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        callback.awaitCompletion(15, TimeUnit.SECONDS);
         callback.close();
 
         LOG.debug("log: {}", callback.toString());
@@ -178,33 +185,37 @@ public void attachContainerStdinUnsupported() throws Exception {
         String snippet = "hello world";
 
         CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE)
-                .withCmd("echo", snippet)
-                .withTty(false)
-                .exec();
+            .withCmd("echo", snippet)
+            .withTty(false)
+            .withAttachStdin(true)
+            .withAttachStdout(true)
+            .withAttachStderr(true)
+            .exec();
 
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(is(emptyString())));
 
-        dockerClient.startContainerCmd(container.getId()).exec();
-
         AttachContainerTestCallback callback = new AttachContainerTestCallback() {
             @Override
             public void onNext(Frame frame) {
                 assertThat(frame.getStreamType(), equalTo(StreamType.STDOUT));
                 super.onNext(frame);
-            };
+            }
         };
 
         InputStream stdin = new ByteArrayInputStream("".getBytes());
 
         dockerClient.attachContainerCmd(container.getId())
-                .withStdErr(true)
-                .withStdOut(true)
-                .withFollowStream(true)
-                .withLogs(true)
-                .withStdIn(stdin)
-                .exec(callback)
-                .awaitCompletion(30, TimeUnit.SECONDS);
+            .withStdErr(true)
+            .withStdOut(true)
+            .withFollowStream(true)
+            .withLogs(true)
+            .withStdIn(stdin)
+            .exec(callback);
+
+        dockerClient.startContainerCmd(container.getId()).exec();
+
+        callback.awaitCompletion(30, TimeUnit.SECONDS);
         callback.close();
     }
 
@@ -217,33 +228,35 @@ public void attachContainerClosesStdoutWhenContainerExits() throws Exception {
         DockerClient dockerClient = dockerRule.getClient();
 
         CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE)
-                .withCmd("echo", "hello")
-                .withTty(false)
-                .exec();
+            .withCmd("echo", "hello")
+            .withTty(false)
+            .withAttachStdout(true)
+            .withAttachStderr(true)
+            .exec();
         LOG.info("Created container: {}", container.toString());
 
         CountDownLatch gotLine = new CountDownLatch(1);
         try (
-                ResultCallback.Adapter<Frame> resultCallback = dockerClient.attachContainerCmd(container.getId())
-                        .withStdOut(true)
-                        .withStdErr(true)
-                        .withFollowStream(true)
-                        .exec(new ResultCallback.Adapter<Frame>() {
-                            @Override
-                            public void onNext(Frame item) {
-                                LOG.info("Got frame: {}", item);
-                                if (item.getStreamType() == StreamType.STDOUT) {
-                                    gotLine.countDown();
-                                }
-                                super.onNext(item);
-                            }
-
-                            @Override
-                            public void onComplete() {
-                                LOG.info("On complete");
-                                super.onComplete();
-                            }
-                        })
+            ResultCallback.Adapter<Frame> resultCallback = dockerClient.attachContainerCmd(container.getId())
+                .withStdOut(true)
+                .withStdErr(true)
+                .withFollowStream(true)
+                .exec(new ResultCallback.Adapter<Frame>() {
+                    @Override
+                    public void onNext(Frame item) {
+                        LOG.info("Got frame: {}", item);
+                        if (item.getStreamType() == StreamType.STDOUT) {
+                            gotLine.countDown();
+                        }
+                        super.onNext(item);
+                    }
+
+                    @Override
+                    public void onComplete() {
+                        LOG.info("On complete");
+                        super.onComplete();
+                    }
+                })
         ) {
             resultCallback.awaitStarted(5, SECONDS);
             LOG.info("Attach started");
@@ -258,7 +271,7 @@ public void onComplete() {
     }
 
     public static class AttachContainerTestCallback extends ResultCallback.Adapter<Frame> {
-        private StringBuffer log = new StringBuffer();
+        private final StringBuffer log = new StringBuffer();
 
         @Override
         public void onNext(Frame item) {
diff --git a/docker-java/src/test/resources/attachContainerTestDockerfile/echo.sh b/docker-java/src/test/resources/attachContainerTestDockerfile/echo.sh
index 88b444bf0..370cda203 100644
--- a/docker-java/src/test/resources/attachContainerTestDockerfile/echo.sh
+++ b/docker-java/src/test/resources/attachContainerTestDockerfile/echo.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-while sleep 2; do echo stdout && echo stderr >&2; done
\ No newline at end of file
+echo stdout && echo stderr >&2

From 0d08a33dbbd39a2cc0046e7eddba1f5814eb2c88 Mon Sep 17 00:00:00 2001
From: Alexander Koshevoy <tejksat@users.noreply.github.com>
Date: Mon, 16 Nov 2020 17:31:45 +0300
Subject: [PATCH 1048/1272] Fix #1492  by using `awaitStarted()` to preserve
 the order if invocations (#1494)

The problem is that using `awaitStarted()` on `attach`'s callback on a non-running container leads to the infinite wait for Jersey transport implementation.

This happens when `SelectiveLoggingFilter` is used in `DefaultInvocationBuilder` where it is created with `printEntity = true` parameter. In this case the implementation of `ClientResponseFilter.filter(...)` method in the base `LoggingFilter` class blocks at `responseContext.hasEntity()` until the data is available in the response. This happens because `hasEntity()` reads a single byte to check whether there is any data available in the stream. In the case of `attach` command this method blocks until there is data in stdout/stderr streams. Having data from the streams requires container running, which we cannot do safely without `awaitStarted()` because `attach` command is performed in a separate thread and we need to run `start` only _after_ `attach` request is executed not to loose the data from stdout/stderr streams.
---
 .../dockerjava/jaxrs/JerseyDockerHttpClient.java  |  2 +-
 .../dockerjava/cmd/AttachContainerCmdIT.java      | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
index b6c723f5d..8eb3c2c6a 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
@@ -165,7 +165,7 @@ private JerseyDockerHttpClient(
         RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
 
         // logging may disabled via log level
-        clientConfig.register(new SelectiveLoggingFilter(LOGGER, true));
+        clientConfig.register(new SelectiveLoggingFilter(LOGGER, false));
 
         if (readTimeout != null) {
             requestConfigBuilder.setSocketTimeout(readTimeout);
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
index 68d1867ad..6913c21c0 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
@@ -28,8 +28,7 @@
 import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 /**
  * @author Kanstantsin Shautsou
@@ -80,6 +79,9 @@ public void onNext(Frame frame) {
                 .withStdIn(in)
                 .exec(callback);
 
+            assertTrue("Processing of the response should start shortly after executing `attachContainerCmd`",
+                callback.awaitStarted(5, SECONDS));
+
             dockerClient.startContainerCmd(container.getId()).exec();
 
             out.write((snippet + "\n").getBytes());
@@ -123,6 +125,9 @@ public void onNext(Frame frame) {
             .withLogs(true)
             .exec(callback);
 
+        assertTrue("Processing of the response should start shortly after executing `attachContainerCmd`",
+            callback.awaitStarted(5, SECONDS));
+
         dockerClient.startContainerCmd(container.getId()).exec();
 
         callback.awaitCompletion(30, TimeUnit.SECONDS);
@@ -164,6 +169,9 @@ public void onNext(Frame frame) {
             .withFollowStream(true)
             .exec(callback);
 
+        assertTrue("Processing of the response should start shortly after executing `attachContainerCmd`",
+            callback.awaitStarted(5, SECONDS));
+
         dockerClient.startContainerCmd(container.getId()).exec();
 
         callback.awaitCompletion(15, TimeUnit.SECONDS);
@@ -213,6 +221,9 @@ public void onNext(Frame frame) {
             .withStdIn(stdin)
             .exec(callback);
 
+        assertFalse("Processing of the response is not expected to be started" +
+            " because `attachContainerCmd` with stdin is not supported", callback.awaitStarted(5, SECONDS));
+
         dockerClient.startContainerCmd(container.getId()).exec();
 
         callback.awaitCompletion(30, TimeUnit.SECONDS);

From d85ea79eaf7b2a3117f2cf04fac61b354c53e0d2 Mon Sep 17 00:00:00 2001
From: Alexander Koshevoy <tejksat@users.noreply.github.com>
Date: Mon, 16 Nov 2020 18:59:04 +0300
Subject: [PATCH 1049/1272] Fix "docker-java-stream" thread stuck at
 UnixDomainSocket.recv() (#1476)

* Fix "docker-java-stream" thread stuck at UnixDomainSocket.recv() (OkHttp transport) (#1475)

Prevent unnecessary recurring calls of `recv()` on UNIX socket, which sometimes results in blocking read and causes hanging of "docker-java-stream" thread.

* Fix potential stuck at UnixDomainSocket.read() (HttpClient transport) (#1475)

Prevent unnecessary recurring calls of `read()` on UNIX socket, which may result in blocking read and cause hanging of "docker-java-stream" thread.

* Use data's length value instead of calculating length once again

* Let UnixSocketInputStream.read(..) return -1 when the socket is disconnected or EOF is reached

* Move isConnected() check to the beginning of read(..) method

* Make UnixSocketInputStream.read() return -1 if EOF has been reached

Co-authored-by: Alexander Koshevoy <Alexander.Koshevoy@jetbrains.com>
Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../httpclient5/UnixDomainSocket.java         | 29 +++++-----------
 .../dockerjava/okhttp/UnixDomainSocket.java   | 33 ++++++++++---------
 2 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java
index cbbfd16a1..5bdbb85f0 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java
@@ -229,30 +229,19 @@ class UnixSocketInputStream extends InputStream {
 
         @Override
         public int read(byte[] bytesEntry, int off, int len) throws IOException {
+            if (!isConnected()) {
+                return -1;
+            }
             try {
                 if (off > 0) {
-                    int bytes = 0;
-                    int remainingLength = len;
-                    int size;
                     byte[] data = new byte[(len < 10240) ? len : 10240];
-                    do {
-                        if (!isConnected()) {
-                            return -1;
-                        }
-                        size = UnixDomainSocket.read(fd, data, (remainingLength < 10240) ? remainingLength : 10240);
-                        if (size <= 0) {
-                            return -1;
-                        }
-                        System.arraycopy(data, 0, bytesEntry, off, size);
-                        bytes += size;
-                        off += size;
-                        remainingLength -= size;
-                    } while ((remainingLength > 0) && (size > 0));
-                    return bytes;
-                } else {
-                    if (!isConnected()) {
+                    int size = UnixDomainSocket.read(fd, data, data.length);
+                    if (size <= 0) {
                         return -1;
                     }
+                    System.arraycopy(data, 0, bytesEntry, off, size);
+                    return size;
+                } else {
                     int size = UnixDomainSocket.read(fd, bytesEntry, len);
                     if (size <= 0) {
                         return -1;
@@ -268,7 +257,7 @@ public int read(byte[] bytesEntry, int off, int len) throws IOException {
         public int read() throws IOException {
             byte[] bytes = new byte[1];
             int bytesRead = read(bytes);
-            if (bytesRead == 0) {
+            if (bytesRead <= 0) {
                 return -1;
             }
             return bytes[0] & 0xff;
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java
index e2f1002d7..0ced8a7ed 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java
@@ -230,24 +230,24 @@ class UnixSocketInputStream extends InputStream {
 
         @Override
         public int read(byte[] bytesEntry, int off, int len) throws IOException {
+            if (!isConnected()) {
+                return -1;
+            }
             try {
                 if (off > 0) {
-                    int bytes = 0;
-                    int remainingLength = len;
-                    int size;
                     byte[] data = new byte[(len < 10240) ? len : 10240];
-                    do {
-                        size = recv(fd, data, (remainingLength < 10240) ? remainingLength : 10240, 0);
-                        if (size > 0) {
-                            System.arraycopy(data, 0, bytesEntry, off, size);
-                            bytes += size;
-                            off += size;
-                            remainingLength -= size;
-                        }
-                    } while ((remainingLength > 0) && (size > 0));
-                    return bytes;
+                    int size = recv(fd, data, data.length, 0);
+                    if (size <= 0) {
+                        return -1;
+                    }
+                    System.arraycopy(data, 0, bytesEntry, off, size);
+                    return size;
                 } else {
-                    return recv(fd, bytesEntry, len, 0);
+                    int size = recv(fd, bytesEntry, len, 0);
+                    if (size <= 0) {
+                        return -1;
+                    }
+                    return size;
                 }
             } catch (LastErrorException lee) {
                 throw new IOException("native read() failed : " + formatError(lee));
@@ -258,7 +258,7 @@ public int read(byte[] bytesEntry, int off, int len) throws IOException {
         public int read() throws IOException {
             byte[] bytes = new byte[1];
             int bytesRead = read(bytes);
-            if (bytesRead == 0) {
+            if (bytesRead <= 0) {
                 return -1;
             }
             return bytes[0] & 0xff;
@@ -266,6 +266,9 @@ public int read() throws IOException {
 
         @Override
         public int read(byte[] bytes) throws IOException {
+            if (!isConnected()) {
+                return -1;
+            }
             return read(bytes, 0, bytes.length);
         }
     }

From f6de60d8e42d6933130c36d409c307390c476bef Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 20 Nov 2020 18:42:16 +0100
Subject: [PATCH 1050/1272] Make max connections configurable (#1501)

* Allow configuring http connection pool size (#1474)

See: https://github.com/docker-java/docker-java/issues/1466

* Add a test, set default to max

* remove unused class

Co-authored-by: Kris De Volder <kdevolder@pivotal.io>
---
 .gitignore                                    |  1 +
 .../httpclient5/ApacheDockerHttpClient.java   | 13 +++-
 .../ApacheDockerHttpClientImpl.java           | 45 +++++++------
 .../jaxrs/JerseyDockerHttpClient.java         |  4 +-
 .../httpclient5/ZerodepDockerHttpClient.java  | 13 +++-
 .../dockerjava/cmd/LogContainerCmdIT.java     | 65 ++++++++++++++++++-
 .../github/dockerjava/core/DockerRule.java    | 15 +++--
 7 files changed, 120 insertions(+), 36 deletions(-)

diff --git a/.gitignore b/.gitignore
index cc29f27cb..201acaa5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 .project
 .settings
 .classpath
+.factorypath
 
 # Ignore all build/dist directories
 target
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java
index cf2b7300d..2c1890f80 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java
@@ -13,6 +13,8 @@ public static final class Builder {
 
         private SSLConfig sslConfig = null;
 
+        private int maxConnections = Integer.MAX_VALUE;
+
         public Builder dockerHost(URI value) {
             this.dockerHost = Objects.requireNonNull(value, "dockerHost");
             return this;
@@ -23,13 +25,18 @@ public Builder sslConfig(SSLConfig value) {
             return this;
         }
 
+        public Builder maxConnections(int value) {
+            this.maxConnections = value;
+            return this;
+        }
+
         public ApacheDockerHttpClient build() {
             Objects.requireNonNull(dockerHost, "dockerHost");
-            return new ApacheDockerHttpClient(dockerHost, sslConfig);
+            return new ApacheDockerHttpClient(dockerHost, sslConfig, maxConnections);
         }
     }
 
-    private ApacheDockerHttpClient(URI dockerHost, SSLConfig sslConfig) {
-        super(dockerHost, sslConfig);
+    private ApacheDockerHttpClient(URI dockerHost, SSLConfig sslConfig, int maxConnections) {
+        super(dockerHost, sslConfig, maxConnections);
     }
 }
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
index d06bd81ab..40b13025f 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
@@ -41,12 +41,12 @@
 class ApacheDockerHttpClientImpl implements DockerHttpClient {
 
     private final CloseableHttpClient httpClient;
-
     private final HttpHost host;
 
     protected ApacheDockerHttpClientImpl(
         URI dockerHost,
-        SSLConfig sslConfig
+        SSLConfig sslConfig,
+        int maxConnections
     ) {
         Registry<ConnectionSocketFactory> socketFactoryRegistry = createConnectionSocketFactoryRegistry(sslConfig, dockerHost);
 
@@ -66,27 +66,30 @@ protected ApacheDockerHttpClientImpl(
                 host = HttpHost.create(dockerHost);
         }
 
+        PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(
+            socketFactoryRegistry,
+            new ManagedHttpClientConnectionFactory(
+                null,
+                null,
+                null,
+                null,
+                message -> {
+                    Header transferEncodingHeader = message.getFirstHeader(HttpHeaders.TRANSFER_ENCODING);
+                    if (transferEncodingHeader != null) {
+                        if ("identity".equalsIgnoreCase(transferEncodingHeader.getValue())) {
+                            return ContentLengthStrategy.UNDEFINED;
+                        }
+                    }
+                    return DefaultContentLengthStrategy.INSTANCE.determineLength(message);
+                },
+                null
+            )
+        );
+        connectionManager.setMaxTotal(maxConnections);
+        connectionManager.setDefaultMaxPerRoute(maxConnections);
         httpClient = HttpClients.custom()
             .setRequestExecutor(new HijackingHttpRequestExecutor(null))
-            .setConnectionManager(new PoolingHttpClientConnectionManager(
-                socketFactoryRegistry,
-                new ManagedHttpClientConnectionFactory(
-                    null,
-                    null,
-                    null,
-                    null,
-                    message -> {
-                        Header transferEncodingHeader = message.getFirstHeader(HttpHeaders.TRANSFER_ENCODING);
-                        if (transferEncodingHeader != null) {
-                            if ("identity".equalsIgnoreCase(transferEncodingHeader.getValue())) {
-                                return ContentLengthStrategy.UNDEFINED;
-                            }
-                        }
-                        return DefaultContentLengthStrategy.INSTANCE.determineLength(message);
-                    },
-                    null
-                )
-            ))
+            .setConnectionManager(connectionManager)
             .build();
     }
 
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
index 8eb3c2c6a..74ef77e4b 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
@@ -54,9 +54,9 @@ public static final class Builder {
 
         private Integer connectTimeout = null;
 
-        private Integer maxTotalConnections = null;
+        private Integer maxTotalConnections = Integer.MAX_VALUE;
 
-        private Integer maxPerRouteConnections = null;
+        private Integer maxPerRouteConnections = Integer.MAX_VALUE;
 
         private Integer connectionRequestTimeout = null;
 
diff --git a/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java b/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java
index 2298da816..a0d2abaaf 100644
--- a/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java
+++ b/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java
@@ -14,6 +14,8 @@ public static final class Builder {
 
         private SSLConfig sslConfig = null;
 
+        private int maxConnections = Integer.MAX_VALUE;
+
         public Builder dockerHost(URI value) {
             this.dockerHost = Objects.requireNonNull(value, "dockerHost");
             return this;
@@ -24,13 +26,18 @@ public Builder sslConfig(SSLConfig value) {
             return this;
         }
 
+        public Builder maxConnections(int value) {
+            this.maxConnections = value;
+            return this;
+        }
+
         public ZerodepDockerHttpClient build() {
             Objects.requireNonNull(dockerHost, "dockerHost");
-            return new ZerodepDockerHttpClient(dockerHost, sslConfig);
+            return new ZerodepDockerHttpClient(dockerHost, sslConfig, maxConnections);
         }
     }
 
-    protected ZerodepDockerHttpClient(URI dockerHost, SSLConfig sslConfig) {
-        super(dockerHost, sslConfig);
+    protected ZerodepDockerHttpClient(URI dockerHost, SSLConfig sslConfig, int maxConnections) {
+        super(dockerHost, sslConfig, maxConnections);
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
index 37bf5f393..b0de380db 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
@@ -1,7 +1,10 @@
 package com.github.dockerjava.cmd;
 
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.StreamType;
 import com.github.dockerjava.utils.LogContainerTestCallback;
 import org.junit.Test;
@@ -9,13 +12,25 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+import java.util.stream.LongStream;
 
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.CoreMatchers.everyItem;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.emptyString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.hasToString;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -197,4 +212,52 @@ public void asyncLogContainerWithSince() throws Exception {
 
         assertThat(loggingCallback.toString(), containsString(snippet));
     }
+
+    @Test(timeout = 10_000)
+    public void simultaneousCommands() throws Exception {
+        // Create a new client to not affect other tests
+        DockerClient client = dockerRule.newClient();
+        CreateContainerResponse container = client.createContainerCmd("busybox")
+                .withCmd("/bin/sh", "-c", "echo hello world; sleep infinity")
+                .exec();
+
+        client.startContainerCmd(container.getId()).exec();
+
+        // Simulate 100 simultaneous connections
+        int connections = 100;
+
+        ExecutorService executor = Executors.newFixedThreadPool(connections);
+        try {
+            List<Frame> firstFrames = new CopyOnWriteArrayList<>();
+            executor.invokeAll(
+                LongStream.range(0, connections).<Callable<Object>>mapToObj(__ -> {
+                    return () -> {
+                        return client.logContainerCmd(container.getId())
+                            .withStdOut(true)
+                            .withFollowStream(true)
+                            .exec(new ResultCallback.Adapter<Frame>() {
+
+                                final AtomicBoolean first = new AtomicBoolean(true);
+
+                                @Override
+                                public void onNext(Frame object) {
+                                    if (first.compareAndSet(true, false)) {
+                                        firstFrames.add(object);
+                                    }
+                                    super.onNext(object);
+                                }
+                            });
+                    };
+                }).collect(Collectors.toList())
+            );
+
+            await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
+                assertThat(firstFrames, hasSize(connections));
+            });
+
+            assertThat(firstFrames, everyItem(hasToString("STDOUT: hello world")));
+        } finally {
+            executor.shutdownNow();
+        }
+    }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
index c7ca2c0d9..e6e922bc6 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
@@ -46,11 +46,7 @@ public DockerRule(CmdIT cmdIT) {
     }
 
 
-    public DockerClient getClient() {
-        if (dockerClient != null) {
-            return dockerClient;
-        }
-
+    public DockerClient newClient() {
         DockerClientImpl dockerClient = cmdIT.getFactoryType().createDockerClient(config());
         DockerHttpClient dockerHttpClient = dockerClient.getHttpClient();
 
@@ -88,7 +84,7 @@ public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
             }
         );
 
-        return this.dockerClient = new DockerClientDelegate(dockerClient) {
+        return new DockerClientDelegate(dockerClient) {
             @Override
             public DockerHttpClient getHttpClient() {
                 return dockerHttpClient;
@@ -96,6 +92,13 @@ public DockerHttpClient getHttpClient() {
         };
     }
 
+    public DockerClient getClient() {
+        if (dockerClient != null) {
+            return dockerClient;
+        }
+        return this.dockerClient = newClient();
+    }
+
     @Override
     public Statement apply(Statement base, Description description) {
         return super.apply(base, description);

From 7f97462a4a8c9f9ca33d69bd5714088925b28611 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 20 Nov 2020 18:43:27 +0100
Subject: [PATCH 1051/1272] pass request body as `byte[]` where possible
 (#1495)

* pass request body as `byte[]` where possible

Helps with #1467

* Add missing content-type header
---
 .../core/DefaultInvocationBuilder.java        | 42 +++++++++----------
 .../ApacheDockerHttpClientImpl.java           | 12 ++++--
 .../jaxrs/JerseyDockerHttpClient.java         |  6 ++-
 .../dockerjava/okhttp/OkDockerHttpClient.java |  5 +++
 .../transport/DockerHttpClient.java           | 12 +++++-
 5 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java
index c63daf42d..c7525279c 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultInvocationBuilder.java
@@ -17,7 +17,6 @@
 import com.github.dockerjava.transport.DockerHttpClient;
 import org.apache.commons.io.IOUtils;
 
-import java.io.ByteArrayInputStream;
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -97,7 +96,7 @@ public InputStream post(Object entity) {
         DockerHttpClient.Request request = requestBuilder
             .method(DockerHttpClient.Request.Method.POST)
             .putHeader("content-type", "application/json")
-            .body(encode(entity))
+            .bodyBytes(encode(entity))
             .build();
 
         DockerHttpClient.Response response = execute(request);
@@ -119,7 +118,7 @@ public <T> T post(Object entity, TypeReference<T> typeReference) {
             DockerHttpClient.Request request = requestBuilder
                 .method(DockerHttpClient.Request.Method.POST)
                 .putHeader("content-type", "application/json")
-                .body(new ByteArrayInputStream(objectMapper.writeValueAsBytes(entity)))
+                .bodyBytes(encode(entity))
                 .build();
 
             try (DockerHttpClient.Response response = execute(request)) {
@@ -132,11 +131,17 @@ public <T> T post(Object entity, TypeReference<T> typeReference) {
 
     @Override
     public <T> void post(Object entity, TypeReference<T> typeReference, ResultCallback<T> resultCallback) {
-        try {
-            post(typeReference, resultCallback, new ByteArrayInputStream(objectMapper.writeValueAsBytes(entity)));
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
+        DockerHttpClient.Request request = requestBuilder
+            .method(DockerHttpClient.Request.Method.POST)
+            .putHeader("content-type", "application/json")
+            .bodyBytes(encode(entity))
+            .build();
+
+        executeAndStream(
+            request,
+            resultCallback,
+            new JsonSink<>(typeReference, resultCallback)
+        );
     }
 
     @Override
@@ -150,17 +155,12 @@ public <T> T post(TypeReference<T> typeReference, InputStream body) {
 
     @Override
     public void post(Object entity, InputStream stdin, ResultCallback<Frame> resultCallback) {
-        final DockerHttpClient.Request request;
-        try {
-            request = requestBuilder
-                .method(DockerHttpClient.Request.Method.POST)
-                .putHeader("content-type", "application/json")
-                .body(new ByteArrayInputStream(objectMapper.writeValueAsBytes(entity)))
-                .hijackedInput(stdin)
-                .build();
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
+        DockerHttpClient.Request request = requestBuilder
+            .method(DockerHttpClient.Request.Method.POST)
+            .putHeader("content-type", "application/json")
+            .bodyBytes(encode(entity))
+            .hijackedInput(stdin)
+            .build();
 
         executeAndStream(
             request,
@@ -283,13 +283,13 @@ protected <T> void executeAndStream(
         thread.start();
     }
 
-    private InputStream encode(Object entity) {
+    private byte[] encode(Object entity) {
         if (entity == null) {
             return null;
         }
 
         try {
-            return new ByteArrayInputStream(objectMapper.writeValueAsBytes(entity));
+            return objectMapper.writeValueAsBytes(entity);
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
index 40b13025f..24ff57efa 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
@@ -21,6 +21,7 @@
 import org.apache.hc.core5.http.config.RegistryBuilder;
 import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy;
 import org.apache.hc.core5.http.impl.io.EmptyInputStream;
+import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
 import org.apache.hc.core5.http.io.entity.InputStreamEntity;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
@@ -137,9 +138,14 @@ public Response execute(Request request) {
 
         request.headers().forEach(httpUriRequest::addHeader);
 
-        InputStream body = request.body();
-        if (body != null) {
-            httpUriRequest.setEntity(new InputStreamEntity(body, null));
+        byte[] bodyBytes = request.bodyBytes();
+        if (bodyBytes != null) {
+            httpUriRequest.setEntity(new ByteArrayEntity(bodyBytes, null));
+        } else {
+            InputStream body = request.body();
+            if (body != null) {
+                httpUriRequest.setEntity(new InputStreamEntity(body, null));
+            }
         }
 
         if (request.hijackedInput() != null) {
diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
index 74ef77e4b..f15e97712 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
@@ -304,7 +304,11 @@ public Response execute(Request request) {
         }
     }
 
-    private Entity<InputStream> toEntity(Request request) {
+    private Entity<?> toEntity(Request request) {
+        byte[] bodyBytes = request.bodyBytes();
+        if (bodyBytes != null) {
+            return Entity.json(bodyBytes);
+        }
         InputStream body = request.body();
         if (body != null) {
             return Entity.entity(body, MediaType.APPLICATION_JSON_TYPE);
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
index 5bb943bef..3778d8bb4 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
@@ -177,6 +177,11 @@ private OkDockerHttpClient(
     }
 
     private RequestBody toRequestBody(Request request) {
+        byte[] bodyBytes = request.bodyBytes();
+        if (bodyBytes != null) {
+            return RequestBody.create(null, bodyBytes);
+        }
+
         InputStream body = request.body();
         if (body != null) {
             return new RequestBody() {
diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/DockerHttpClient.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DockerHttpClient.java
index 8c3fa580d..7b780cb06 100644
--- a/docker-java-transport/src/main/java/com/github/dockerjava/transport/DockerHttpClient.java
+++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DockerHttpClient.java
@@ -4,6 +4,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.io.ByteArrayInputStream;
 import java.io.Closeable;
 import java.io.InputStream;
 import java.util.List;
@@ -70,7 +71,16 @@ public static Builder builder() {
         public abstract String path();
 
         @Nullable
-        public abstract InputStream body();
+        @Value.Default
+        public InputStream body() {
+            byte[] bodyBytes = bodyBytes();
+            return bodyBytes != null
+                ? new ByteArrayInputStream(bodyBytes)
+                : null;
+        }
+
+        @Nullable
+        public abstract byte[] bodyBytes();
 
         @Nullable
         public abstract InputStream hijackedInput();

From c9c64cd91821ba10377d5951c2ea8c018458e7eb Mon Sep 17 00:00:00 2001
From: Stefano Franz <roastario@gmail.com>
Date: Fri, 20 Nov 2020 18:44:15 +0100
Subject: [PATCH 1052/1272] add support for docker-for-windows new bind
 serialization format (#1463)

* add support for docker-for-windows new bind serialization format

* add shade version plugin to fix CI

* Update pom.xml

* Update Bind.java

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../com/github/dockerjava/api/model/Bind.java |   3 +-
 .../github/dockerjava/api/model/BindTest.java | 107 ++++++++++++++++++
 2 files changed, 109 insertions(+), 1 deletion(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java
index c9aecf9d4..f82e5d482 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java
@@ -97,7 +97,8 @@ public PropagationMode getPropagationMode() {
      */
     public static Bind parse(String serialized) {
         try {
-            String[] parts = serialized.split(":");
+            // Split by ':' but not ':\' (Windows-style path)
+            String[] parts = serialized.split(":(?!\\\\)");
             switch (parts.length) {
             case 2: {
                 return new Bind(parts[0], new Volume(parts[1]));
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java
index 3343bf6bd..663231151 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java
@@ -26,6 +26,113 @@ public void parseUsingDefaultAccessMode() {
         assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
     }
 
+    @Test
+    public void parseReadWriteWindows() {
+        Bind bind = Bind.parse("C:\\host:/container:rw");
+        assertThat(bind.getPath(), is("C:\\host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(rw));
+        assertThat(bind.getSecMode(), is(SELContext.none));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
+    }
+
+    @Test
+    public void parseReadWriteNoCopyWindows() {
+        Bind bind = Bind.parse("C:\\host:/container:rw,nocopy");
+        assertThat(bind.getPath(), is("C:\\host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(rw));
+        assertThat(bind.getSecMode(), is(SELContext.none));
+        assertThat(bind.getNoCopy(), is(true));
+        assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
+    }
+
+    @Test
+    public void parseReadWriteSharedWindows() {
+        Bind bind = Bind.parse("C:\\host:/container:rw,shared");
+        assertThat(bind.getPath(), is("C:\\host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(rw));
+        assertThat(bind.getSecMode(), is(SELContext.none));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.SHARED));
+    }
+
+    @Test
+    public void parseReadWriteSlaveWindows() {
+        Bind bind = Bind.parse("C:\\host:/container:rw,slave");
+        assertThat(bind.getPath(), is("C:\\host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(rw));
+        assertThat(bind.getSecMode(), is(SELContext.none));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.SLAVE));
+    }
+
+    @Test
+    public void parseReadWritePrivateWindows() {
+        Bind bind = Bind.parse("C:\\host:/container:rw,private");
+        assertThat(bind.getPath(), is("C:\\host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(rw));
+        assertThat(bind.getSecMode(), is(SELContext.none));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.PRIVATE));
+    }
+
+    @Test
+    public void parseReadOnlyWindows() {
+        Bind bind = Bind.parse("C:\\host:/container:ro");
+        assertThat(bind.getPath(), is("C:\\host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(ro));
+        assertThat(bind.getSecMode(), is(SELContext.none));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
+    }
+
+    @Test
+    public void parseSELOnlyWindows() {
+        Bind bind = Bind.parse("C:\\host:/container:Z");
+        assertThat(bind.getPath(), is("C:\\host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(AccessMode.DEFAULT));
+        assertThat(bind.getSecMode(), is(SELContext.single));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
+
+        bind = Bind.parse("C:\\host:/container:z");
+        assertThat(bind.getPath(), is("C:\\host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(AccessMode.DEFAULT));
+        assertThat(bind.getSecMode(), is(SELContext.shared));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
+    }
+
+    @Test
+    public void parseReadWriteSELWindows() {
+        Bind bind = Bind.parse("C:\\host:/container:rw,Z");
+        assertThat(bind.getPath(), is("C:\\host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(rw));
+        assertThat(bind.getSecMode(), is(SELContext.single));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
+    }
+
+    @Test
+    public void parseReadOnlySELWindows() {
+        Bind bind = Bind.parse("C:\\host:/container:ro,z");
+        assertThat(bind.getPath(), is("C:\\host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(ro));
+        assertThat(bind.getSecMode(), is(SELContext.shared));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.DEFAULT_MODE));
+    }
+
     @Test
     public void parseReadWrite() {
         Bind bind = Bind.parse("/host:/container:rw");

From b09d82042c244aef0a6544b2180f5f9e280681bc Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 26 Nov 2020 16:12:01 +0000
Subject: [PATCH 1053/1272] Replace AuthConfig toString implementation (#1506)

* Obfuscate sensitive values in AuthConfig toString

* Update AuthConfig.java

Co-authored-by: Sergei Egorov <segorov@vmware.com>
---
 .../dockerjava/api/model/AuthConfig.java      |  6 ++++-
 .../dockerjava/api/model/AuthConfigTest.java  | 24 ++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
index 1b6a01ea1..00db940df 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -8,7 +8,7 @@
 import java.io.Serializable;
 
 @EqualsAndHashCode
-@ToString
+@ToString(onlyExplicitlyIncluded = true)
 public class AuthConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -20,15 +20,18 @@ public class AuthConfig implements Serializable {
     public static final String DEFAULT_SERVER_ADDRESS = "https://index.docker.io/v1/";
 
     @JsonProperty("username")
+    @ToString.Include
     private String username;
 
     @JsonProperty("password")
     private String password;
 
     @JsonProperty("email")
+    @ToString.Include
     private String email;
 
     @JsonProperty("serveraddress")
+    @ToString.Include
     private String registryAddress = DEFAULT_SERVER_ADDRESS;
 
     @JsonProperty("auth")
@@ -50,6 +53,7 @@ public class AuthConfig implements Serializable {
      * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_25}
      */
     @JsonProperty("stackOrchestrator")
+    @ToString.Include
     private String stackOrchestrator;
 
     public String getUsername() {
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
index f77ac56c9..86120733b 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
@@ -8,10 +8,9 @@
 import java.io.IOException;
 
 import static com.github.dockerjava.test.serdes.JSONSamples.testRoundTrip;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertEquals;
 
@@ -89,4 +88,23 @@ public void shouldNotFailWithStackOrchestratorInConfig() throws IOException {
         assertThat(authConfig.getStackOrchestrator(), is("kubernetes"));
     }
 
+    @Test
+    public void toStringDoesNotContainSensitiveStrings() {
+        AuthConfig authConfig = new AuthConfig()
+            .withAuth("authValue")
+            .withEmail("emailValue")
+            .withPassword("passwordValue")
+            .withIdentityToken("identityTokenValue")
+            .withRegistrytoken("registryTokenValue")
+            .withRegistryAddress("registryAddressValue");
+        String toStringValue = authConfig.toString();
+
+        assertThat(toStringValue, not(containsString("authValue")));
+        assertThat(toStringValue, not(containsString("passwordValue")));
+        assertThat(toStringValue, not(containsString("identityTokenValue")));
+        assertThat(toStringValue, not(containsString("registryTokenValue")));
+
+        assertThat(toStringValue, containsString("emailValue"));
+        assertThat(toStringValue, containsString("registryAddressValue"));
+    }
 }

From cd69879d4c8d4d8c26a5bdcfcca9a5b30e516ca0 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <segorov@pivotal.io>
Date: Thu, 10 Dec 2020 10:41:24 +0100
Subject: [PATCH 1054/1272] CI version

---
 docker-java-api/pom.xml                   | 2 +-
 docker-java-core/pom.xml                  | 2 +-
 docker-java-transport-httpclient5/pom.xml | 2 +-
 docker-java-transport-jersey/pom.xml      | 2 +-
 docker-java-transport-netty/pom.xml       | 2 +-
 docker-java-transport-okhttp/pom.xml      | 2 +-
 docker-java-transport-zerodep/pom.xml     | 2 +-
 docker-java-transport/pom.xml             | 2 +-
 docker-java/pom.xml                       | 2 +-
 pom.xml                                   | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index f23df928c..08b5236c2 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.2-SNAPSHOT</version>
+		<version>0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index 660dc66cd..ef24fed34 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.2-SNAPSHOT</version>
+		<version>0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml
index 5f204724f..b8ad54c5f 100644
--- a/docker-java-transport-httpclient5/pom.xml
+++ b/docker-java-transport-httpclient5/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.2-SNAPSHOT</version>
+		<version>0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index 37de78f58..3a257414b 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.2-SNAPSHOT</version>
+		<version>0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml
index 7741aea95..f9bc3bed9 100644
--- a/docker-java-transport-netty/pom.xml
+++ b/docker-java-transport-netty/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.2-SNAPSHOT</version>
+		<version>0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index 3e6de70c2..3fd74c2fb 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.2-SNAPSHOT</version>
+		<version>0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport-zerodep/pom.xml b/docker-java-transport-zerodep/pom.xml
index cec907067..7d3fb4034 100644
--- a/docker-java-transport-zerodep/pom.xml
+++ b/docker-java-transport-zerodep/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.2-SNAPSHOT</version>
+		<version>0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml
index 857664bcf..13383817e 100644
--- a/docker-java-transport/pom.xml
+++ b/docker-java-transport/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.2-SNAPSHOT</version>
+		<version>0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 578bee865..084a8a40c 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.docker-java</groupId>
 		<artifactId>docker-java-parent</artifactId>
-		<version>3.2.2-SNAPSHOT</version>
+		<version>0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index 57809069a..b293e0e85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.2.2-SNAPSHOT</version>
+	<version>0-SNAPSHOT</version>
 
 	<name>docker-java-parent</name>
 	<url>https://github.com/docker-java/docker-java</url>

From c60bcb2882e54346e58606689300274a4ff53f49 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 10 Dec 2020 12:28:44 +0100
Subject: [PATCH 1055/1272] Append the API version to all requests if set
 (#1514)

* Append the API version to all requests if set

* Use older API version
---
 .../github/dockerjava/core/DefaultDockerCmdExecFactory.java  | 5 +++++
 .../src/test/java/com/github/dockerjava/core/DockerRule.java | 1 +
 2 files changed, 6 insertions(+)

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java
index 75e27c365..5376997bc 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java
@@ -79,6 +79,11 @@ public InvocationBuilder request() {
                 resource = "/" + resource;
             }
 
+            RemoteApiVersion apiVersion = getDockerClientConfig().getApiVersion();
+            if (apiVersion != RemoteApiVersion.UNKNOWN_VERSION) {
+                resource = "/" + apiVersion.asWebPathPart() + resource;
+            }
+
             if (!queryParams.isEmpty()) {
                 Escaper urlFormParameterEscaper = UrlEscapers.urlFormParameterEscaper();
                 resource = queryParams.asMap().entrySet().stream()
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
index e6e922bc6..6b137485f 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
@@ -178,6 +178,7 @@ private static DefaultDockerClientConfig config() {
 
     public static DefaultDockerClientConfig config(String password) {
         DefaultDockerClientConfig.Builder builder = DefaultDockerClientConfig.createDefaultConfigBuilder()
+                .withApiVersion(RemoteApiVersion.VERSION_1_30)
                 .withRegistryUrl("https://index.docker.io/v1/");
         if (password != null) {
             builder = builder.withRegistryPassword(password);

From 4387250b17fee090bf5be4ee2e2a795dd663dd80 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 10 Dec 2020 12:29:06 +0100
Subject: [PATCH 1056/1272] Add security options to `Info` (#1515)

---
 .../main/java/com/github/dockerjava/api/model/Info.java    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
index e472fa622..ffaee5794 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
@@ -232,6 +232,9 @@ public class Info implements Serializable {
     @JsonProperty("Isolation")
     private String isolation;
 
+    @JsonProperty("SecurityOptions")
+    private List<String> securityOptions;
+
     /**
      * @see #architecture
      */
@@ -1063,4 +1066,8 @@ public Info withIsolation(String isolation) {
         this.isolation = isolation;
         return this;
     }
+
+    public List<String> getSecurityOptions() {
+        return securityOptions;
+    }
 }

From 2dc6b0ad1411cf72f5175d9633ec786964d1a9b6 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 25 Jan 2021 14:59:10 +0100
Subject: [PATCH 1057/1272] Update stale.yml

---
 .github/stale.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/stale.yml b/.github/stale.yml
index 5bf537daf..23aefd1f3 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,7 +1,7 @@
 
-daysUntilStale: 30
+daysUntilStale: 90
 
-daysUntilClose: 7
+daysUntilClose: 30
 
 exemptLabels:
   - resolution/acknowledged

From 9ba70a99352438812093578b1511889e12d3d760 Mon Sep 17 00:00:00 2001
From: doejoe <44942667+dvallant@users.noreply.github.com>
Date: Mon, 25 Jan 2021 15:02:59 +0100
Subject: [PATCH 1058/1272] fix JsonProperty annotation for container
 healthchecks (#1511) (#1539)

---
 .../java/com/github/dockerjava/api/model/ContainerSpec.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
index f56399ce8..943d5eb14 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
@@ -137,7 +137,7 @@ public class ContainerSpec implements Serializable {
      * @since 1.26
      * A test to perform to check that the container is healthy.
      */
-    @JsonProperty("HealthCheck")
+    @JsonProperty("Healthcheck")
     private HealthCheck healthCheck;
 
     /**

From f9d2db6efff4d7fc7092b53209027d6846de1894 Mon Sep 17 00:00:00 2001
From: jrietdijk <52025611+jrietdijk@users.noreply.github.com>
Date: Fri, 5 Feb 2021 16:06:12 +0100
Subject: [PATCH 1059/1272] Support Swarm config operations (#1482)

Co-authored-by: Sergei Egorov <segorov@vmware.com>
---
 .../github/dockerjava/api/DockerClient.java   | 39 ++++++++
 .../api/command/CreateConfigCmd.java          | 51 +++++++++++
 .../api/command/CreateConfigResponse.java     | 19 ++++
 .../DelegatingDockerCmdExecFactory.java       | 20 +++++
 .../api/command/DockerCmdExecFactory.java     | 29 ++++++
 .../api/command/InspectConfigCmd.java         | 25 ++++++
 .../api/command/ListConfigsCmd.java           | 21 +++++
 .../api/command/RemoveConfigCmd.java          | 28 ++++++
 .../github/dockerjava/api/model/Config.java   | 90 +++++++++++++++++++
 .../dockerjava/api/model/ConfigSpec.java      | 24 +++++
 .../core/AbstractDockerCmdExecFactory.java    | 29 ++++++
 .../dockerjava/core/DockerClientImpl.java     | 30 +++++++
 .../core/command/CreateConfigCmdImpl.java     | 66 ++++++++++++++
 .../core/command/InspectConfigCmdImpl.java    | 41 +++++++++
 .../core/command/ListConfigsCmdImpl.java      | 33 +++++++
 .../core/command/RemoveConfigCmdImpl.java     | 40 +++++++++
 .../core/exec/CreateConfigCmdExec.java        | 30 +++++++
 .../core/exec/InspectConfigCmdExec.java       | 30 +++++++
 .../core/exec/ListConfigsCmdExec.java         | 43 +++++++++
 .../core/exec/RemoveConfigCmdExec.java        | 28 ++++++
 .../cmd/swarm/CreateConfigCmdExecIT.java      | 31 +++++++
 .../cmd/swarm/InspectConfigCmdIT.java         | 35 ++++++++
 .../cmd/swarm/ListConfigCmdExecIT.java        | 54 +++++++++++
 23 files changed, 836 insertions(+)
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigCmd.java
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectConfigCmd.java
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/ListConfigsCmd.java
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveConfigCmd.java
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/model/Config.java
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/model/ConfigSpec.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateConfigCmdImpl.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectConfigCmdImpl.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/command/ListConfigsCmdImpl.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveConfigCmdImpl.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateConfigCmdExec.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectConfigCmdExec.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListConfigsCmdExec.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveConfigCmdExec.java
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateConfigCmdExecIT.java
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListConfigCmdExecIT.java

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
index 59c90aa0b..7805300f5 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -9,6 +9,7 @@
 import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
 import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.api.command.CreateConfigCmd;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.CreateNetworkCmd;
@@ -21,6 +22,7 @@
 import com.github.dockerjava.api.command.ExecStartCmd;
 import com.github.dockerjava.api.command.InfoCmd;
 import com.github.dockerjava.api.command.InitializeSwarmCmd;
+import com.github.dockerjava.api.command.InspectConfigCmd;
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
@@ -31,6 +33,7 @@
 import com.github.dockerjava.api.command.JoinSwarmCmd;
 import com.github.dockerjava.api.command.KillContainerCmd;
 import com.github.dockerjava.api.command.LeaveSwarmCmd;
+import com.github.dockerjava.api.command.ListConfigsCmd;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
@@ -47,6 +50,7 @@
 import com.github.dockerjava.api.command.PruneCmd;
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.command.PushImageCmd;
+import com.github.dockerjava.api.command.RemoveConfigCmd;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
@@ -435,12 +439,47 @@ public interface DockerClient extends Closeable {
 
     /**
      * Command to remove a secret
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_25}
      * @param secretId secret id or secret name
      * @return command
      */
     RemoveSecretCmd removeSecretCmd(String secretId);
 
 
+    /**
+     *  Command to list all configs. Only applicable if docker runs in swarm mode.
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_30}
+     * @return command
+     */
+    ListConfigsCmd listConfigsCmd();
+
+    /**
+     * Command to create a config in a docker swarm. Only applicable if docker runs in swarm mode.
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_30}
+     * @return command
+     */
+    CreateConfigCmd createConfigCmd();
+
+    /**
+     * Command to inspect a service
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_30}
+     * @param configId config id or config name
+     * @return command
+     */
+    InspectConfigCmd inspectConfigCmd(String configId);
+
+    /**
+     * Command to remove a config
+     * @since {@link RemoteApiVersion#VERSION_1_30}
+     * @param configId config id or config name
+     * @return command
+     */
+    RemoveConfigCmd removeConfigCmd(String configId);
+
 
     @Override
     void close() throws IOException;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigCmd.java
new file mode 100644
index 000000000..205bc7a7d
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigCmd.java
@@ -0,0 +1,51 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.exception.ConflictException;
+
+import javax.annotation.CheckForNull;
+import java.util.Map;
+
+/**
+ * Command to create a new config
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_30}
+ */
+public interface CreateConfigCmd extends SyncDockerCmd<CreateConfigResponse> {
+
+    @CheckForNull
+    String getName();
+
+    @CheckForNull
+    String getData();
+
+    @CheckForNull
+    Map<String, String> getLabels();
+
+    /**
+     * @param name
+     *            - The new config name.
+     */
+    CreateConfigCmd withName(String name);
+
+    /**
+     * @param data
+     *            - The new config data.
+     */
+    CreateConfigCmd withData(byte[] data);
+
+    /**
+     * @param labels
+     *            - A mapping of labels keys and values. Labels are a mechanism for applying metadata to Docker objects.
+     */
+    CreateConfigCmd withLabels(Map<String, String> labels);
+
+    /**
+     * @throws ConflictException Named config already exists
+     */
+    @Override
+    CreateConfigResponse exec() throws ConflictException;
+
+    interface Exec extends DockerCmdSyncExec<CreateConfigCmd, CreateConfigResponse> {
+    }
+
+}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java
new file mode 100644
index 000000000..273022b49
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java
@@ -0,0 +1,19 @@
+package com.github.dockerjava.api.command;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * The response of a {@link CreateConfigCmd}
+ */
+@EqualsAndHashCode
+@ToString
+public class CreateConfigResponse {
+    @JsonProperty("ID")
+    private String id;
+
+    public String getId() {
+        return id;
+    }
+}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java
index c414a6d21..37639a072 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java
@@ -380,6 +380,26 @@ public RemoveSecretCmd.Exec createRemoveSecretCmdExec() {
         return getDockerCmdExecFactory().createRemoveSecretCmdExec();
     }
 
+    @Override
+    public ListConfigsCmd.Exec createListConfigsCmdExec() {
+        return getDockerCmdExecFactory().createListConfigsCmdExec();
+    }
+
+    @Override
+    public CreateConfigCmd.Exec createCreateConfigCmdExec() {
+        return getDockerCmdExecFactory().createCreateConfigCmdExec();
+    }
+
+    @Override
+    public InspectConfigCmd.Exec createInspectConfigCmdExec() {
+        return getDockerCmdExecFactory().createInspectConfigCmdExec();
+    }
+
+    @Override
+    public RemoveConfigCmd.Exec createRemoveConfigCmdExec() {
+        return getDockerCmdExecFactory().createRemoveConfigCmdExec();
+    }
+
     @Override
     public void close() throws IOException {
         getDockerCmdExecFactory().close();
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index 27084bf76..d49606680 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -236,6 +236,35 @@ public interface DockerCmdExecFactory extends Closeable {
      */
     RemoveSecretCmd.Exec createRemoveSecretCmdExec();
 
+    /**
+     * Command to list all configs.
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_30}
+     */
+    ListConfigsCmd.Exec createListConfigsCmdExec();
+
+    /**
+     * Command to inspect a config in a docker swarm. Only applicable if docker runs in swarm mode.
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_30}
+     */
+    InspectConfigCmd.Exec createInspectConfigCmdExec();
+
+    /**
+     * Command to create a new config in a docker swarm. Only applicable if docker runs in swarm mode.
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_30}
+     */
+    CreateConfigCmd.Exec createCreateConfigCmdExec();
+
+    /**
+     * Command to remove a config in a docker swarm. Only applicable if docker runs in swarm mode.
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_30}
+     */
+    RemoveConfigCmd.Exec createRemoveConfigCmdExec();
+
+
     @Override
     void close() throws IOException;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectConfigCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectConfigCmd.java
new file mode 100644
index 000000000..96374d795
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectConfigCmd.java
@@ -0,0 +1,25 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.Config;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+public interface InspectConfigCmd extends SyncDockerCmd<Config> {
+
+    @CheckForNull
+    String getConfigId();
+
+    InspectConfigCmd withConfigId(@Nonnull String configId);
+
+    /**
+     * @throws NotFoundException
+     *             No such config
+     */
+    @Override
+    Config exec() throws NotFoundException;
+
+    interface Exec extends DockerCmdSyncExec<InspectConfigCmd, Config> {
+    }
+}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListConfigsCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListConfigsCmd.java
new file mode 100644
index 000000000..38d34816a
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListConfigsCmd.java
@@ -0,0 +1,21 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.model.Config;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Command to list all configs in a docker swarm. Only applicable if docker runs in swarm mode.
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_30}
+ */
+public interface ListConfigsCmd extends SyncDockerCmd<List<Config>> {
+
+    Map<String, List<String>> getFilters();
+
+    ListConfigsCmd withFilters(Map<String, List<String>> filters);
+
+    interface Exec extends DockerCmdSyncExec<ListConfigsCmd, List<Config>> {
+    }
+}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveConfigCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveConfigCmd.java
new file mode 100644
index 000000000..741fe32c0
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveConfigCmd.java
@@ -0,0 +1,28 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * Remove a config.
+ */
+public interface RemoveConfigCmd extends SyncDockerCmd<Void> {
+
+    @CheckForNull
+    String getConfigId();
+
+    RemoveConfigCmd withConfigId(@Nonnull String secretId);
+
+    /**
+     * @throws NotFoundException
+     *             No such config
+     */
+    @Override
+    Void exec() throws NotFoundException;
+
+    interface Exec extends DockerCmdSyncExec<RemoveConfigCmd, Void> {
+    }
+
+}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Config.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Config.java
new file mode 100644
index 000000000..277526ec0
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Config.java
@@ -0,0 +1,90 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Used for Listing config.
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_30}
+ */
+@ToString
+@EqualsAndHashCode
+public class Config implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * @since 1.30
+     */
+    @JsonProperty("ID")
+    private String id;
+
+    /**
+     * @since 1.30
+     */
+    @JsonProperty("CreatedAt")
+    private Date createdAt;
+
+    /**
+     * @since 1.30
+     */
+    @JsonProperty("UpdatedAt")
+    private Date updatedAt;
+
+    /**
+     * @since 1.30
+     */
+    @JsonProperty("Spec")
+    private ConfigSpec spec;
+
+    /**
+     * @since 1.30
+     */
+    @JsonProperty("Version")
+    private ResourceVersion version;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public ConfigSpec getSpec() {
+        return spec;
+    }
+
+    public void setSpec(ConfigSpec spec) {
+        this.spec = spec;
+    }
+
+    public ResourceVersion getVersion() {
+        return version;
+    }
+
+    public void setVersion(ResourceVersion version) {
+        this.version = version;
+    }
+}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ConfigSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ConfigSpec.java
new file mode 100644
index 000000000..b89bdab35
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ConfigSpec.java
@@ -0,0 +1,24 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_30}
+ */
+@EqualsAndHashCode
+@ToString
+public class ConfigSpec implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("Name")
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
index e31431741..3e329911f 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
@@ -9,6 +9,7 @@
 import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
 import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.api.command.CreateConfigCmd;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.CreateNetworkCmd;
@@ -22,6 +23,7 @@
 import com.github.dockerjava.api.command.ExecStartCmd;
 import com.github.dockerjava.api.command.InfoCmd;
 import com.github.dockerjava.api.command.InitializeSwarmCmd;
+import com.github.dockerjava.api.command.InspectConfigCmd;
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
@@ -33,6 +35,7 @@
 import com.github.dockerjava.api.command.JoinSwarmCmd;
 import com.github.dockerjava.api.command.KillContainerCmd;
 import com.github.dockerjava.api.command.LeaveSwarmCmd;
+import com.github.dockerjava.api.command.ListConfigsCmd;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
@@ -49,6 +52,7 @@
 import com.github.dockerjava.api.command.PruneCmd;
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.command.PushImageCmd;
+import com.github.dockerjava.api.command.RemoveConfigCmd;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
@@ -84,6 +88,7 @@
 import com.github.dockerjava.core.exec.CopyArchiveFromContainerCmdExec;
 import com.github.dockerjava.core.exec.CopyArchiveToContainerCmdExec;
 import com.github.dockerjava.core.exec.CopyFileFromContainerCmdExec;
+import com.github.dockerjava.core.exec.CreateConfigCmdExec;
 import com.github.dockerjava.core.exec.CreateContainerCmdExec;
 import com.github.dockerjava.core.exec.CreateImageCmdExec;
 import com.github.dockerjava.core.exec.CreateNetworkCmdExec;
@@ -94,6 +99,9 @@
 import com.github.dockerjava.core.exec.EventsCmdExec;
 import com.github.dockerjava.core.exec.ExecCreateCmdExec;
 import com.github.dockerjava.core.exec.ExecStartCmdExec;
+import com.github.dockerjava.core.exec.InspectConfigCmdExec;
+import com.github.dockerjava.core.exec.ListConfigsCmdExec;
+import com.github.dockerjava.core.exec.RemoveConfigCmdExec;
 import com.github.dockerjava.core.exec.ResizeContainerCmdExec;
 import com.github.dockerjava.core.exec.ResizeExecCmdExec;
 import com.github.dockerjava.core.exec.InfoCmdExec;
@@ -560,5 +568,26 @@ public RemoveSecretCmd.Exec createRemoveSecretCmdExec() {
         return new RemoveSecretCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public ListConfigsCmd.Exec createListConfigsCmdExec() {
+        return new ListConfigsCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public CreateConfigCmd.Exec createCreateConfigCmdExec() {
+        return new CreateConfigCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public InspectConfigCmd.Exec createInspectConfigCmdExec() {
+        return new InspectConfigCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+    @Override
+    public RemoveConfigCmd.Exec createRemoveConfigCmdExec() {
+        return new RemoveConfigCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
+
     protected abstract WebTarget getBaseResource();
 }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index eddddc220..277dada80 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -10,6 +10,7 @@
 import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
 import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.api.command.CreateConfigCmd;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.CreateNetworkCmd;
@@ -23,6 +24,7 @@
 import com.github.dockerjava.api.command.ExecStartCmd;
 import com.github.dockerjava.api.command.InfoCmd;
 import com.github.dockerjava.api.command.InitializeSwarmCmd;
+import com.github.dockerjava.api.command.InspectConfigCmd;
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
@@ -33,6 +35,7 @@
 import com.github.dockerjava.api.command.JoinSwarmCmd;
 import com.github.dockerjava.api.command.KillContainerCmd;
 import com.github.dockerjava.api.command.LeaveSwarmCmd;
+import com.github.dockerjava.api.command.ListConfigsCmd;
 import com.github.dockerjava.api.command.ListContainersCmd;
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.command.ListNetworksCmd;
@@ -49,6 +52,7 @@
 import com.github.dockerjava.api.command.PruneCmd;
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.command.PushImageCmd;
+import com.github.dockerjava.api.command.RemoveConfigCmd;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
@@ -89,6 +93,7 @@
 import com.github.dockerjava.core.command.CopyArchiveFromContainerCmdImpl;
 import com.github.dockerjava.core.command.CopyArchiveToContainerCmdImpl;
 import com.github.dockerjava.core.command.CopyFileFromContainerCmdImpl;
+import com.github.dockerjava.core.command.CreateConfigCmdImpl;
 import com.github.dockerjava.core.command.CreateContainerCmdImpl;
 import com.github.dockerjava.core.command.CreateImageCmdImpl;
 import com.github.dockerjava.core.command.CreateNetworkCmdImpl;
@@ -102,6 +107,7 @@
 import com.github.dockerjava.core.command.InfoCmdImpl;
 import com.github.dockerjava.core.command.InitializeSwarmCmdImpl;
 import com.github.dockerjava.core.command.InpectNetworkCmdImpl;
+import com.github.dockerjava.core.command.InspectConfigCmdImpl;
 import com.github.dockerjava.core.command.InspectContainerCmdImpl;
 import com.github.dockerjava.core.command.InspectExecCmdImpl;
 import com.github.dockerjava.core.command.InspectImageCmdImpl;
@@ -111,6 +117,7 @@
 import com.github.dockerjava.core.command.JoinSwarmCmdImpl;
 import com.github.dockerjava.core.command.KillContainerCmdImpl;
 import com.github.dockerjava.core.command.LeaveSwarmCmdImpl;
+import com.github.dockerjava.core.command.ListConfigsCmdImpl;
 import com.github.dockerjava.core.command.ListContainersCmdImpl;
 import com.github.dockerjava.core.command.ListImagesCmdImpl;
 import com.github.dockerjava.core.command.ListNetworksCmdImpl;
@@ -127,6 +134,7 @@
 import com.github.dockerjava.core.command.PruneCmdImpl;
 import com.github.dockerjava.core.command.PullImageCmdImpl;
 import com.github.dockerjava.core.command.PushImageCmdImpl;
+import com.github.dockerjava.core.command.RemoveConfigCmdImpl;
 import com.github.dockerjava.core.command.RemoveContainerCmdImpl;
 import com.github.dockerjava.core.command.RemoveImageCmdImpl;
 import com.github.dockerjava.core.command.RemoveNetworkCmdImpl;
@@ -668,6 +676,28 @@ public RemoveSecretCmd removeSecretCmd(String secretId) {
         return new RemoveSecretCmdImpl(getDockerCmdExecFactory().createRemoveSecretCmdExec(), secretId);
     }
 
+    @Override
+    public ListConfigsCmd listConfigsCmd() {
+        return new ListConfigsCmdImpl(getDockerCmdExecFactory().createListConfigsCmdExec());
+    }
+
+    @Override
+    public CreateConfigCmd createConfigCmd() {
+        return new CreateConfigCmdImpl(getDockerCmdExecFactory().createCreateConfigCmdExec());
+    }
+
+    @Override
+    public InspectConfigCmd inspectConfigCmd(String configId) {
+        return new InspectConfigCmdImpl(getDockerCmdExecFactory().createInspectConfigCmdExec(), configId);
+    }
+
+
+    @Override
+    public RemoveConfigCmd removeConfigCmd(String configId) {
+        return new RemoveConfigCmdImpl(getDockerCmdExecFactory().createRemoveConfigCmdExec(), configId);
+    }
+
+
     @Override
     public ListTasksCmd listTasksCmd() {
         return new ListTasksCmdImpl(getDockerCmdExecFactory().listTasksCmdExec());
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateConfigCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateConfigCmdImpl.java
new file mode 100644
index 000000000..6c21e39c9
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateConfigCmdImpl.java
@@ -0,0 +1,66 @@
+package com.github.dockerjava.core.command;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.command.CreateConfigCmd;
+import com.github.dockerjava.api.command.CreateConfigResponse;
+
+import java.util.Base64;
+import java.util.Map;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Creates a new config
+ */
+public class CreateConfigCmdImpl extends AbstrDockerCmd<CreateConfigCmd, CreateConfigResponse> implements CreateConfigCmd {
+
+    @JsonProperty("Name")
+    private String name;
+
+    @JsonProperty("Data")
+    private String data;
+
+    @JsonProperty("Labels")
+    private Map<String, String> labels;
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getData() {
+        return data;
+    }
+
+    @Override
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
+    public CreateConfigCmdImpl(CreateConfigCmd.Exec exec) {
+        super(exec);
+    }
+
+    @Override
+    public CreateConfigCmd withName(String name) {
+        checkNotNull(name, "name was not specified");
+        this.name = name;
+        return this;
+    }
+
+    @Override
+    public CreateConfigCmd withData(byte[] data) {
+        checkNotNull(data, "data was not specified");
+        this.data = Base64.getEncoder().encodeToString(data);
+        return this;
+    }
+
+    @Override
+    public CreateConfigCmd withLabels(Map<String, String> labels) {
+        checkNotNull(labels, "labels was not specified");
+        this.labels = labels;
+        return this;
+    }
+
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectConfigCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectConfigCmdImpl.java
new file mode 100644
index 000000000..0fdef4a71
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectConfigCmdImpl.java
@@ -0,0 +1,41 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.InspectConfigCmd;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.Config;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Inspect the details of a config.
+ */
+public class InspectConfigCmdImpl extends AbstrDockerCmd<InspectConfigCmd, Config> implements InspectConfigCmd {
+
+    private String configId;
+
+    public InspectConfigCmdImpl(Exec exec, String configId) {
+        super(exec);
+        withConfigId(configId);
+    }
+
+    @Override
+    public String getConfigId() {
+        return configId;
+    }
+
+    @Override
+    public InspectConfigCmd withConfigId(String configId) {
+        checkNotNull(configId, "configId was not specified");
+        this.configId = configId;
+        return this;
+    }
+
+    /**
+     * @throws NotFoundException
+     *             No such config
+     */
+    @Override
+    public Config exec() throws NotFoundException {
+        return super.exec();
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListConfigsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListConfigsCmdImpl.java
new file mode 100644
index 000000000..9cd48e9a7
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListConfigsCmdImpl.java
@@ -0,0 +1,33 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.ListConfigsCmd;
+import com.github.dockerjava.api.model.Config;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * List configs.
+ */
+public class ListConfigsCmdImpl extends AbstrDockerCmd<ListConfigsCmd, List<Config>> implements ListConfigsCmd {
+
+    private Map<String, List<String>> filters = Collections.emptyMap();
+
+    public ListConfigsCmdImpl(Exec exec) {
+        super(exec);
+    }
+
+    @Override
+    public Map<String, List<String>> getFilters() {
+        return filters;
+    }
+
+    public ListConfigsCmd withFilters(Map<String, List<String>> filters) {
+        checkNotNull(filters, "filters was not specified");
+        this.filters = filters;
+        return this;
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveConfigCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveConfigCmdImpl.java
new file mode 100644
index 000000000..32203cfe2
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveConfigCmdImpl.java
@@ -0,0 +1,40 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.RemoveConfigCmd;
+import com.github.dockerjava.api.exception.NotFoundException;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Remove a config.
+ */
+public class RemoveConfigCmdImpl extends AbstrDockerCmd<RemoveConfigCmd, Void> implements RemoveConfigCmd {
+
+    private String configId;
+
+    public RemoveConfigCmdImpl(Exec exec, String configId) {
+        super(exec);
+        withConfigId(configId);
+    }
+
+    @Override
+    public String getConfigId() {
+        return configId;
+    }
+
+    @Override
+    public RemoveConfigCmd withConfigId(String configId) {
+        checkNotNull(configId, "configId was not specified");
+        this.configId = configId;
+        return this;
+    }
+
+    /**
+     * @throws NotFoundException
+     *             No such secret
+     */
+    @Override
+    public Void exec() throws NotFoundException {
+        return super.exec();
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateConfigCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateConfigCmdExec.java
new file mode 100644
index 000000000..4ead9cb48
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateConfigCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.core.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.CreateConfigCmd;
+import com.github.dockerjava.api.command.CreateConfigResponse;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CreateConfigCmdExec extends AbstrSyncDockerCmdExec<CreateConfigCmd, CreateConfigResponse>
+        implements CreateConfigCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateConfigCmdExec.class);
+
+    public CreateConfigCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected CreateConfigResponse execute(CreateConfigCmd command) {
+        WebTarget webResource = getBaseResource().path("/configs/create");
+
+        LOGGER.trace("POST: {} ", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON)
+                .post(command, new TypeReference<CreateConfigResponse>() {
+                });
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectConfigCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectConfigCmdExec.java
new file mode 100644
index 000000000..b751c4655
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/InspectConfigCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.core.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.InspectConfigCmd;
+import com.github.dockerjava.api.model.Config;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class InspectConfigCmdExec extends AbstrSyncDockerCmdExec<InspectConfigCmd, Config>
+        implements InspectConfigCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(InspectConfigCmdExec.class);
+
+    public InspectConfigCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Config execute(InspectConfigCmd command) {
+        WebTarget webResource = getBaseResource().path("/configs/{id}")
+                                                 .resolveTemplate("id", command.getConfigId());
+
+        LOGGER.debug("GET: {}", webResource);
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<Config>() { });
+    }
+
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListConfigsCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListConfigsCmdExec.java
new file mode 100644
index 000000000..89a1b83b1
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ListConfigsCmdExec.java
@@ -0,0 +1,43 @@
+package com.github.dockerjava.core.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.ListConfigsCmd;
+import com.github.dockerjava.api.model.Config;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
+import com.github.dockerjava.core.util.FiltersEncoder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class ListConfigsCmdExec extends AbstrSyncDockerCmdExec<ListConfigsCmd, List<Config>> implements ListConfigsCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ListConfigsCmdExec.class);
+
+    public ListConfigsCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected List<Config> execute(ListConfigsCmd command) {
+        WebTarget webTarget = getBaseResource().path("/configs");
+
+        if (command.getFilters() != null && !command.getFilters().isEmpty()) {
+            webTarget = webTarget
+                    .queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
+        }
+
+        LOGGER.trace("GET: {}", webTarget);
+
+        List<Config> configs = webTarget.request().accept(MediaType.APPLICATION_JSON)
+                .get(new TypeReference<List<Config>>() {
+                });
+
+        LOGGER.trace("Response: {}", configs);
+
+        return configs;
+    }
+
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveConfigCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveConfigCmdExec.java
new file mode 100644
index 000000000..1b81ef644
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RemoveConfigCmdExec.java
@@ -0,0 +1,28 @@
+package com.github.dockerjava.core.exec;
+
+import com.github.dockerjava.api.command.RemoveConfigCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RemoveConfigCmdExec extends AbstrSyncDockerCmdExec<RemoveConfigCmd, Void> implements RemoveConfigCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveConfigCmdExec.class);
+
+    public RemoveConfigCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute(RemoveConfigCmd command) {
+        WebTarget webTarget = getBaseResource().path("/configs/" + command.getConfigId());
+
+        LOGGER.trace("DELETE: {}", webTarget);
+        webTarget.request().accept(MediaType.APPLICATION_JSON).delete();
+
+        return null;
+    }
+
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateConfigCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateConfigCmdExecIT.java
new file mode 100644
index 000000000..aad681534
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateConfigCmdExecIT.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.cmd.swarm;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.CreateConfigResponse;
+import org.apache.commons.lang.RandomStringUtils;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.notNullValue;
+
+public class CreateConfigCmdExecIT extends SwarmCmdIT {
+
+    public static final Logger LOG = LoggerFactory.getLogger(CreateConfigCmdExecIT.class);
+
+    @Test
+    public void testCreateConfig() {
+        DockerClient dockerClient = startSwarm();
+        String configName = RandomStringUtils.random(10, true, false);
+        CreateConfigResponse response = dockerClient.createConfigCmd()
+            .withName(configName)
+            .withData("configuration data".getBytes()).exec();
+        assertThat(response, notNullValue());
+        String configId = response.getId();
+        assertThat(configId, notNullValue());
+
+        dockerClient.removeConfigCmd(configId).exec();
+    }
+
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java
new file mode 100644
index 000000000..44fe845e0
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java
@@ -0,0 +1,35 @@
+package com.github.dockerjava.cmd.swarm;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.CreateConfigResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.Config;
+import org.apache.commons.lang.RandomStringUtils;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertEquals;
+
+public class InspectConfigCmdIT extends SwarmCmdIT {
+
+    public static final Logger LOG = LoggerFactory.getLogger(InspectConfigCmdIT.class);
+
+    @Test
+    public void inspectConfig() throws DockerException {
+        DockerClient dockerClient = startSwarm();
+
+        String configName = RandomStringUtils.random(10, true, false);
+
+        CreateConfigResponse configResponse = dockerClient.createConfigCmd()
+            .withName(configName)
+            .withData("configuration data".getBytes()).exec();
+        LOG.info("Config created with ID {}", configResponse.getId());
+
+        Config config = dockerClient.inspectConfigCmd(configResponse.getId()).exec();
+        assertEquals(configResponse.getId(), config.getId());
+        assertEquals(configName, config.getSpec().getName());
+    }
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListConfigCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListConfigCmdExecIT.java
new file mode 100644
index 000000000..c13689c8c
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListConfigCmdExecIT.java
@@ -0,0 +1,54 @@
+package com.github.dockerjava.cmd.swarm;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.CreateConfigResponse;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.Config;
+import org.apache.commons.lang.RandomStringUtils;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
+
+public class ListConfigCmdExecIT extends SwarmCmdIT {
+
+    public static final Logger LOG = LoggerFactory.getLogger(ListConfigCmdExecIT.class);
+
+    @Test
+    public void tesListConfig() throws DockerException {
+        DockerClient dockerClient = startSwarm();
+        String configName = RandomStringUtils.random(10, true, false);
+        CreateConfigResponse response = dockerClient.createConfigCmd()
+            .withName(configName)
+            .withData("configuration data".getBytes())
+            .exec();
+        String configId = response.getId();
+
+        try {
+            LOG.info("Config created with ID {}", configId);
+
+            List<Config> configs = dockerClient.listConfigsCmd()
+                .withFilters(Collections.singletonMap("name", Arrays.asList(configName)))
+                .exec();
+
+            assertThat(configs, hasSize(1));
+        } finally {
+            dockerClient.removeConfigCmd(configId).exec();
+            LOG.info("Config removed with ID {}", configId);
+        }
+
+        List<Config> configsAfterRemoved = dockerClient.listConfigsCmd()
+            .withFilters(Collections.singletonMap("name", Arrays.asList(configName)))
+            .exec();
+
+        assertThat(configsAfterRemoved, hasSize(0));
+
+    }
+
+}

From 1da0e3ce211d963248b64484fc38101869a5a61e Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 26 Mar 2021 08:47:24 +0100
Subject: [PATCH 1060/1272] Share the unix socket impl between OkHttp &
 HttpClient5 (#1566)

---
 docker-java-transport-httpclient5/pom.xml     |   2 +-
 .../ApacheDockerHttpClientImpl.java           |   4 +-
 .../httpclient5/UnixDomainSocket.java         | 322 ------------------
 docker-java-transport-okhttp/pom.xml          |   5 +-
 .../dockerjava/okhttp/NamedPipeSocket.java    | 159 ---------
 .../okhttp/NamedPipeSocketFactory.java        |   2 +
 .../dockerjava/okhttp/UnixDomainSocket.java   | 317 -----------------
 .../dockerjava/okhttp/UnixSocketFactory.java  |  48 +--
 docker-java-transport/pom.xml                 |   7 +
 .../dockerjava/transport/AbstractSocket.java  |  87 +++++
 .../dockerjava/transport/BsdDomainSocket.java |  83 +++++
 .../dockerjava/transport/DomainSocket.java    | 189 ++++++++++
 .../dockerjava/transport/FileDescriptor.java  | 121 +++++++
 .../transport/LinuxDomainSocket.java          |  80 +++++
 .../transport}/NamedPipeSocket.java           |   6 +-
 15 files changed, 582 insertions(+), 850 deletions(-)
 delete mode 100644 docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java
 delete mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java
 delete mode 100644 docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java
 create mode 100644 docker-java-transport/src/main/java/com/github/dockerjava/transport/AbstractSocket.java
 create mode 100644 docker-java-transport/src/main/java/com/github/dockerjava/transport/BsdDomainSocket.java
 create mode 100644 docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java
 create mode 100644 docker-java-transport/src/main/java/com/github/dockerjava/transport/FileDescriptor.java
 create mode 100644 docker-java-transport/src/main/java/com/github/dockerjava/transport/LinuxDomainSocket.java
 rename {docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5 => docker-java-transport/src/main/java/com/github/dockerjava/transport}/NamedPipeSocket.java (97%)

diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml
index b8ad54c5f..c31347e56 100644
--- a/docker-java-transport-httpclient5/pom.xml
+++ b/docker-java-transport-httpclient5/pom.xml
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.5.0</version>
+			<version>5.8.0</version>
 		</dependency>
 	</dependencies>
 
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
index 24ff57efa..ffa6cf395 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
@@ -1,6 +1,8 @@
 package com.github.dockerjava.httpclient5;
 
 import com.github.dockerjava.transport.DockerHttpClient;
+import com.github.dockerjava.transport.DomainSocket;
+import com.github.dockerjava.transport.NamedPipeSocket;
 import com.github.dockerjava.transport.SSLConfig;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
@@ -117,7 +119,7 @@ private Registry<ConnectionSocketFactory> createConnectionSocketFactoryRegistry(
             .register("unix", new PlainConnectionSocketFactory() {
                 @Override
                 public Socket createSocket(HttpContext context) throws IOException {
-                    return new UnixDomainSocket(dockerHost.getPath());
+                    return DomainSocket.get(dockerHost.getPath());
                 }
             })
             .register("npipe", new PlainConnectionSocketFactory() {
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java
deleted file mode 100644
index 5bdbb85f0..000000000
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/UnixDomainSocket.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- *
- * MariaDB Client for Java
- *
- * Copyright (c) 2012-2014 Monty Program Ab.
- * Copyright (c) 2015-2019 MariaDB Ab.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along
- * with this library; if not, write to Monty Program Ab info@montyprogram.com.
- *
- * This particular MariaDB Client for Java file is work
- * derived from a Drizzle-JDBC. Drizzle-JDBC file which is covered by subject to
- * the following copyright and notice provisions:
- *
- * Copyright (c) 2009-2011, Marcus Eriksson
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this list
- * of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice, this
- * list of conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.
- *
- * Neither the name of the driver nor the names of its contributors may not be
- * used to endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS  AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- */
-
-package com.github.dockerjava.httpclient5;
-
-import com.sun.jna.LastErrorException;
-import com.sun.jna.Native;
-import com.sun.jna.Platform;
-import com.sun.jna.Structure;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.util.Arrays;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-class UnixDomainSocket extends Socket {
-
-    private static final int AF_UNIX = 1;
-    private static final int SOCK_STREAM = Platform.isSolaris() ? 2 : 1;
-    private static final int PROTOCOL = 0;
-
-    static {
-        if (Platform.isSolaris()) {
-            System.loadLibrary("nsl");
-            System.loadLibrary("socket");
-        }
-        if (!Platform.isWindows() && !Platform.isWindowsCE()) {
-            Native.register("c");
-        }
-    }
-
-    private final AtomicBoolean closeLock = new AtomicBoolean();
-    private final SockAddr sockaddr;
-    private final int fd;
-    private InputStream is;
-    private OutputStream os;
-    private boolean connected;
-
-    UnixDomainSocket(String path) throws IOException {
-        if (Platform.isWindows() || Platform.isWindowsCE()) {
-            throw new IOException("Unix domain sockets are not supported on Windows");
-        }
-        sockaddr = new SockAddr(path);
-        closeLock.set(false);
-        try {
-            fd = socket(AF_UNIX, SOCK_STREAM, PROTOCOL);
-        } catch (LastErrorException lee) {
-            throw new IOException("native socket() failed : " + formatError(lee));
-        }
-    }
-
-    public static native int socket(int domain, int type, int protocol) throws LastErrorException;
-
-    public static native int connect(int sockfd, SockAddr sockaddr, int addrlen)
-            throws LastErrorException;
-
-    public static native int read(int fd, byte[] buffer, long size)
-            throws LastErrorException;
-
-    public static native int send(int fd, byte[] buffer, int count, int flags)
-            throws LastErrorException;
-
-    public static native int close(int fd) throws LastErrorException;
-
-    public static native String strerror(int errno);
-
-    private static String formatError(LastErrorException lee) {
-        try {
-            return strerror(lee.getErrorCode());
-        } catch (Throwable t) {
-            return lee.getMessage();
-        }
-    }
-
-    @Override
-    public boolean isConnected() {
-        return connected;
-    }
-
-    @Override
-    public void close() throws IOException {
-        if (!closeLock.getAndSet(true)) {
-            try {
-                close(fd);
-            } catch (LastErrorException lee) {
-                throw new IOException("native close() failed : " + formatError(lee));
-            }
-            connected = false;
-        }
-    }
-
-    @Override
-    public void connect(SocketAddress endpoint) throws IOException {
-        connect(endpoint, 0);
-    }
-
-    public void connect(SocketAddress endpoint, int timeout) throws IOException {
-        try {
-            int ret = connect(fd, sockaddr, sockaddr.size());
-            if (ret != 0) {
-                throw new IOException(strerror(Native.getLastError()));
-            }
-            connected = true;
-        } catch (LastErrorException lee) {
-            throw new IOException("native connect() failed : " + formatError(lee));
-        }
-        is = new UnixSocketInputStream();
-        os = new UnixSocketOutputStream();
-    }
-
-    public InputStream getInputStream() {
-        return is;
-    }
-
-    public OutputStream getOutputStream() {
-        return os;
-    }
-
-    public void setTcpNoDelay(boolean b) {
-        // do nothing
-    }
-
-    public void setKeepAlive(boolean b) {
-        // do nothing
-    }
-
-    public void setReceiveBufferSize(int size) {
-        // do nothing
-    }
-
-    public void setSendBufferSize(int size) {
-        // do nothing
-    }
-
-    public void setSoLinger(boolean b, int i) {
-        // do nothing
-    }
-
-    public void setSoTimeout(int timeout) {
-    }
-
-    public void shutdownInput() {
-        // do nothing
-    }
-
-    public void shutdownOutput() {
-        // do nothing
-    }
-
-    public static class SockAddr extends Structure {
-
-        @SuppressWarnings("checkstyle:membername")
-        public short sun_family;
-        @SuppressWarnings("checkstyle:membername")
-        public byte[] sun_path;
-
-        /**
-         * Contructor.
-         *
-         * @param sunPath path
-         */
-        SockAddr(String sunPath) {
-            sun_family = AF_UNIX;
-            byte[] arr = sunPath.getBytes();
-            sun_path = new byte[arr.length + 1];
-            System.arraycopy(arr, 0, sun_path, 0, Math.min(sun_path.length - 1, arr.length));
-            allocateMemory();
-        }
-
-        @Override
-        protected java.util.List<String> getFieldOrder() {
-            return Arrays.asList("sun_family", "sun_path");
-        }
-    }
-
-    class UnixSocketInputStream extends InputStream {
-
-        @Override
-        public int read(byte[] bytesEntry, int off, int len) throws IOException {
-            if (!isConnected()) {
-                return -1;
-            }
-            try {
-                if (off > 0) {
-                    byte[] data = new byte[(len < 10240) ? len : 10240];
-                    int size = UnixDomainSocket.read(fd, data, data.length);
-                    if (size <= 0) {
-                        return -1;
-                    }
-                    System.arraycopy(data, 0, bytesEntry, off, size);
-                    return size;
-                } else {
-                    int size = UnixDomainSocket.read(fd, bytesEntry, len);
-                    if (size <= 0) {
-                        return -1;
-                    }
-                    return size;
-                }
-            } catch (LastErrorException lee) {
-                throw new IOException("native read() failed : " + formatError(lee));
-            }
-        }
-
-        @Override
-        public int read() throws IOException {
-            byte[] bytes = new byte[1];
-            int bytesRead = read(bytes);
-            if (bytesRead <= 0) {
-                return -1;
-            }
-            return bytes[0] & 0xff;
-        }
-
-        @Override
-        public int read(byte[] bytes) throws IOException {
-            if (!isConnected()) {
-                return -1;
-            }
-            return read(bytes, 0, bytes.length);
-        }
-    }
-
-    class UnixSocketOutputStream extends OutputStream {
-
-        @Override
-        public void write(byte[] bytesEntry, int off, int len) throws IOException {
-            int bytes;
-            try {
-                if (off > 0) {
-                    int size;
-                    int remainingLength = len;
-                    byte[] data = new byte[(len < 10240) ? len : 10240];
-                    do {
-                        size = (remainingLength < 10240) ? remainingLength : 10240;
-                        System.arraycopy(bytesEntry, off, data, 0, size);
-                        if (!isConnected()) {
-                            return;
-                        }
-                        bytes = UnixDomainSocket.send(fd, data, size, 0);
-                        if (bytes > 0) {
-                            off += bytes;
-                            remainingLength -= bytes;
-                        }
-                    } while ((remainingLength > 0) && (bytes > 0));
-                } else {
-                    if (!isConnected()) {
-                        return;
-                    }
-                    bytes = UnixDomainSocket.send(fd, bytesEntry, len, 0);
-                }
-
-                if (bytes != len) {
-                    throw new IOException("can't write " + len + "bytes");
-                }
-            } catch (LastErrorException lee) {
-                throw new IOException("native write() failed : " + formatError(lee));
-            }
-        }
-
-        @Override
-        public void write(int value) throws IOException {
-            write(new byte[] {(byte) value});
-        }
-
-        @Override
-        public void write(byte[] bytes) throws IOException {
-            write(bytes, 0, bytes.length);
-        }
-    }
-}
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index 3fd74c2fb..18ba1d000 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna-platform</artifactId>
-			<version>5.5.0</version>
+			<version>5.8.0</version>
 		</dependency>
 	</dependencies>
 
@@ -49,6 +49,9 @@
 								<sourceCompatible>true</sourceCompatible>
 							</overrideCompatibilityChangeParameter>
 						</overrideCompatibilityChangeParameters>
+						<excludes>
+							<exclude>com.github.dockerjava.okhttp.UnixDomainSocket$SockAddr</exclude>
+						</excludes>
 					</parameter>
 				</configuration>
 			</plugin>
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java
deleted file mode 100644
index 69f283fe0..000000000
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocket.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.github.dockerjava.okhttp;
-
-import com.sun.jna.Native;
-import com.sun.jna.win32.StdCallLibrary;
-import com.sun.jna.win32.W32APIOptions;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.channels.AsynchronousByteChannel;
-import java.nio.channels.AsynchronousCloseException;
-import java.nio.channels.AsynchronousFileChannel;
-import java.nio.channels.Channels;
-import java.nio.channels.CompletionHandler;
-import java.nio.file.FileSystemException;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Future;
-
-class NamedPipeSocket extends Socket {
-
-    private final String socketFileName;
-
-    private AsynchronousFileByteChannel channel;
-
-    NamedPipeSocket(String socketFileName) {
-        this.socketFileName = socketFileName;
-    }
-
-    @Override
-    public void close() throws IOException {
-        if (channel != null) {
-            channel.close();
-        }
-    }
-
-    @Override
-    public void connect(SocketAddress endpoint) throws IOException {
-        connect(endpoint, 0);
-    }
-
-    @Override
-    public void connect(SocketAddress endpoint, int timeout) throws IOException {
-        long startedAt = System.currentTimeMillis();
-
-        timeout = Math.max(timeout, 10_000);
-        while (true) {
-            try {
-                channel = new AsynchronousFileByteChannel(
-                    AsynchronousFileChannel.open(
-                        Paths.get(socketFileName),
-                        StandardOpenOption.READ,
-                        StandardOpenOption.WRITE
-                    )
-                );
-                break;
-            } catch (FileSystemException e) {
-                if (System.currentTimeMillis() - startedAt >= timeout) {
-                    throw new RuntimeException(e);
-                } else {
-                    Kernel32.INSTANCE.WaitNamedPipe(socketFileName, 100);
-                }
-            }
-        }
-    }
-
-    @Override
-    public InputStream getInputStream() {
-        return Channels.newInputStream(channel);
-    }
-
-    @Override
-    public OutputStream getOutputStream() {
-        return Channels.newOutputStream(channel);
-    }
-
-    interface Kernel32 extends StdCallLibrary {
-
-        Kernel32 INSTANCE = Native.load("kernel32", Kernel32.class, W32APIOptions.DEFAULT_OPTIONS);
-
-        @SuppressWarnings("checkstyle:methodname")
-        boolean WaitNamedPipe(String lpNamedPipeName, int nTimeOut);
-    }
-
-    private static class AsynchronousFileByteChannel implements AsynchronousByteChannel {
-        private final AsynchronousFileChannel fileChannel;
-
-        AsynchronousFileByteChannel(AsynchronousFileChannel fileChannel) {
-            this.fileChannel = fileChannel;
-        }
-
-        @Override
-        public <A> void read(ByteBuffer dst, A attachment, CompletionHandler<Integer, ? super A> handler) {
-            fileChannel.read(dst, 0, attachment, new CompletionHandler<Integer, A>() {
-                @Override
-                public void completed(Integer read, A attachment) {
-                    handler.completed(read > 0 ? read : -1, attachment);
-                }
-
-                @Override
-                public void failed(Throwable exc, A attachment) {
-                    if (exc instanceof AsynchronousCloseException) {
-                        handler.completed(-1, attachment);
-                        return;
-                    }
-                    handler.failed(exc, attachment);
-                }
-            });
-        }
-
-        @Override
-        public Future<Integer> read(ByteBuffer dst) {
-            CompletableFutureHandler future = new CompletableFutureHandler();
-            fileChannel.read(dst, 0, null, future);
-            return future;
-        }
-
-        @Override
-        public <A> void write(ByteBuffer src, A attachment, CompletionHandler<Integer, ? super A> handler) {
-            fileChannel.write(src, 0, attachment, handler);
-        }
-
-        @Override
-        public Future<Integer> write(ByteBuffer src) {
-            return fileChannel.write(src, 0);
-        }
-
-        @Override
-        public void close() throws IOException {
-            fileChannel.close();
-        }
-
-        @Override
-        public boolean isOpen() {
-            return fileChannel.isOpen();
-        }
-
-        private static class CompletableFutureHandler extends CompletableFuture<Integer> implements CompletionHandler<Integer, Object> {
-
-            @Override
-            public void completed(Integer read, Object attachment) {
-                complete(read > 0 ? read : -1);
-            }
-
-            @Override
-            public void failed(Throwable exc, Object attachment) {
-                if (exc instanceof AsynchronousCloseException) {
-                    complete(-1);
-                    return;
-                }
-                completeExceptionally(exc);
-            }
-        }
-    }
-}
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java
index 464910b04..066ae7ce8 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/NamedPipeSocketFactory.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.okhttp;
 
+import com.github.dockerjava.transport.NamedPipeSocket;
+
 import javax.net.SocketFactory;
 import java.net.InetAddress;
 import java.net.Socket;
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java
deleted file mode 100644
index 0ced8a7ed..000000000
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixDomainSocket.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- *
- * MariaDB Client for Java
- *
- * Copyright (c) 2012-2014 Monty Program Ab.
- * Copyright (c) 2015-2019 MariaDB Ab.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along
- * with this library; if not, write to Monty Program Ab info@montyprogram.com.
- *
- * This particular MariaDB Client for Java file is work
- * derived from a Drizzle-JDBC. Drizzle-JDBC file which is covered by subject to
- * the following copyright and notice provisions:
- *
- * Copyright (c) 2009-2011, Marcus Eriksson
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this list
- * of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice, this
- * list of conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.
- *
- * Neither the name of the driver nor the names of its contributors may not be
- * used to endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS  AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- */
-
-package com.github.dockerjava.okhttp;
-
-import com.sun.jna.LastErrorException;
-import com.sun.jna.Native;
-import com.sun.jna.Platform;
-import com.sun.jna.Structure;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.util.Arrays;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-class UnixDomainSocket extends Socket {
-
-    private static final int AF_UNIX = 1;
-    private static final int SOCK_STREAM = Platform.isSolaris() ? 2 : 1;
-    private static final int PROTOCOL = 0;
-
-    static {
-        if (Platform.isSolaris()) {
-            System.loadLibrary("nsl");
-            System.loadLibrary("socket");
-        }
-        if (!Platform.isWindows() && !Platform.isWindowsCE()) {
-            Native.register("c");
-        }
-    }
-
-    private final AtomicBoolean closeLock = new AtomicBoolean();
-    private final SockAddr sockaddr;
-    private final int fd;
-    private InputStream is;
-    private OutputStream os;
-    private boolean connected;
-
-    UnixDomainSocket(String path) throws IOException {
-        if (Platform.isWindows() || Platform.isWindowsCE()) {
-            throw new IOException("Unix domain sockets are not supported on Windows");
-        }
-        sockaddr = new SockAddr(path);
-        closeLock.set(false);
-        try {
-            fd = socket(AF_UNIX, SOCK_STREAM, PROTOCOL);
-        } catch (LastErrorException lee) {
-            throw new IOException("native socket() failed : " + formatError(lee));
-        }
-    }
-
-    public static native int socket(int domain, int type, int protocol) throws LastErrorException;
-
-    public static native int connect(int sockfd, SockAddr sockaddr, int addrlen)
-            throws LastErrorException;
-
-    public static native int recv(int fd, byte[] buffer, int count, int flags)
-            throws LastErrorException;
-
-    public static native int send(int fd, byte[] buffer, int count, int flags)
-            throws LastErrorException;
-
-    public static native int close(int fd) throws LastErrorException;
-
-    public static native String strerror(int errno);
-
-    private static String formatError(LastErrorException lee) {
-        try {
-            return strerror(lee.getErrorCode());
-        } catch (Throwable t) {
-            return lee.getMessage();
-        }
-    }
-
-    @Override
-    public boolean isConnected() {
-        return connected;
-    }
-
-    @Override
-    public void close() throws IOException {
-        if (!closeLock.getAndSet(true)) {
-            try {
-                close(fd);
-            } catch (LastErrorException lee) {
-                throw new IOException("native close() failed : " + formatError(lee));
-            }
-            connected = false;
-        }
-    }
-
-    @Override
-    public void connect(SocketAddress endpoint) throws IOException {
-        connect(endpoint, 0);
-    }
-
-    public void connect(SocketAddress endpoint, int timeout) throws IOException {
-        try {
-            int ret = connect(fd, sockaddr, sockaddr.size());
-            if (ret != 0) {
-                throw new IOException(strerror(Native.getLastError()));
-            }
-            connected = true;
-        } catch (LastErrorException lee) {
-            throw new IOException("native connect() failed : " + formatError(lee));
-        }
-        is = new UnixSocketInputStream();
-        os = new UnixSocketOutputStream();
-    }
-
-    public InputStream getInputStream() {
-        return is;
-    }
-
-    public OutputStream getOutputStream() {
-        return os;
-    }
-
-    public void setTcpNoDelay(boolean b) {
-        // do nothing
-    }
-
-    public void setKeepAlive(boolean b) {
-        // do nothing
-    }
-
-    public void setReceiveBufferSize(int size) {
-        // do nothing
-    }
-
-    public void setSendBufferSize(int size) {
-        // do nothing
-    }
-
-    public void setSoLinger(boolean b, int i) {
-        // do nothing
-    }
-
-    public void setSoTimeout(int timeout) {
-        // do nothing
-    }
-
-    public void shutdownInput() {
-        // do nothing
-    }
-
-    public void shutdownOutput() {
-        // do nothing
-    }
-
-    public static class SockAddr extends Structure {
-
-        @SuppressWarnings("checkstyle:membername")
-        public short sun_family;
-        @SuppressWarnings("checkstyle:membername")
-        public byte[] sun_path;
-
-        /**
-         * Contructor.
-         *
-         * @param sunPath path
-         */
-        SockAddr(String sunPath) {
-            sun_family = AF_UNIX;
-            byte[] arr = sunPath.getBytes();
-            sun_path = new byte[arr.length + 1];
-            System.arraycopy(arr, 0, sun_path, 0, Math.min(sun_path.length - 1, arr.length));
-            allocateMemory();
-        }
-
-        @Override
-        protected java.util.List<String> getFieldOrder() {
-            return Arrays.asList("sun_family", "sun_path");
-        }
-    }
-
-    class UnixSocketInputStream extends InputStream {
-
-        @Override
-        public int read(byte[] bytesEntry, int off, int len) throws IOException {
-            if (!isConnected()) {
-                return -1;
-            }
-            try {
-                if (off > 0) {
-                    byte[] data = new byte[(len < 10240) ? len : 10240];
-                    int size = recv(fd, data, data.length, 0);
-                    if (size <= 0) {
-                        return -1;
-                    }
-                    System.arraycopy(data, 0, bytesEntry, off, size);
-                    return size;
-                } else {
-                    int size = recv(fd, bytesEntry, len, 0);
-                    if (size <= 0) {
-                        return -1;
-                    }
-                    return size;
-                }
-            } catch (LastErrorException lee) {
-                throw new IOException("native read() failed : " + formatError(lee));
-            }
-        }
-
-        @Override
-        public int read() throws IOException {
-            byte[] bytes = new byte[1];
-            int bytesRead = read(bytes);
-            if (bytesRead <= 0) {
-                return -1;
-            }
-            return bytes[0] & 0xff;
-        }
-
-        @Override
-        public int read(byte[] bytes) throws IOException {
-            if (!isConnected()) {
-                return -1;
-            }
-            return read(bytes, 0, bytes.length);
-        }
-    }
-
-    class UnixSocketOutputStream extends OutputStream {
-
-        @Override
-        public void write(byte[] bytesEntry, int off, int len) throws IOException {
-            int bytes;
-            try {
-                if (off > 0) {
-                    int size;
-                    int remainingLength = len;
-                    byte[] data = new byte[(len < 10240) ? len : 10240];
-                    do {
-                        size = (remainingLength < 10240) ? remainingLength : 10240;
-                        System.arraycopy(bytesEntry, off, data, 0, size);
-                        bytes = send(fd, data, size, 0);
-                        if (bytes > 0) {
-                            off += bytes;
-                            remainingLength -= bytes;
-                        }
-                    } while ((remainingLength > 0) && (bytes > 0));
-                } else {
-                    bytes = send(fd, bytesEntry, len, 0);
-                }
-
-                if (bytes != len) {
-                    throw new IOException("can't write " + len + "bytes");
-                }
-            } catch (LastErrorException lee) {
-                throw new IOException("native write() failed : " + formatError(lee));
-            }
-        }
-
-        @Override
-        public void write(int value) throws IOException {
-            write(new byte[] {(byte) value});
-        }
-
-        @Override
-        public void write(byte[] bytes) throws IOException {
-            write(bytes, 0, bytes.length);
-        }
-    }
-}
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java
index 6c9dbe10b..fd7499386 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java
@@ -1,16 +1,11 @@
 package com.github.dockerjava.okhttp;
 
-import com.github.dockerjava.okhttp.OkDockerHttpClient.OkResponse;
+import com.github.dockerjava.transport.DomainSocket;
 
 import javax.net.SocketFactory;
-import java.io.FilterInputStream;
-import java.io.FilterOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.Socket;
-import java.net.SocketAddress;
 
 class UnixSocketFactory extends SocketFactory {
 
@@ -23,46 +18,7 @@ class UnixSocketFactory extends SocketFactory {
     @Override
     public Socket createSocket() {
         try {
-            return new UnixDomainSocket(socketPath) {
-                @Override
-                public void connect(SocketAddress endpoint, int timeout) throws IOException {
-                    super.connect(endpoint, timeout);
-                }
-
-                @Override
-                public InputStream getInputStream() {
-                    return new FilterInputStream(super.getInputStream()) {
-                        @Override
-                        public void close() throws IOException {
-                            shutdownInput();
-                        }
-
-                        @Override
-                        public int read(byte[] b, int off, int len) throws IOException {
-                            if (OkResponse.CLOSING.get()) {
-                                return 0;
-                            }
-                            return super.read(b, off, len);
-                        }
-                    };
-                }
-
-                @Override
-                public OutputStream getOutputStream() {
-                    return new FilterOutputStream(super.getOutputStream()) {
-
-                        @Override
-                        public void write(byte[] b, int off, int len) throws IOException {
-                            out.write(b, off, len);
-                        }
-
-                        @Override
-                        public void close() throws IOException {
-                            shutdownOutput();
-                        }
-                    };
-                }
-            };
+            return DomainSocket.get(socketPath);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml
index 13383817e..a7e76095d 100644
--- a/docker-java-transport/pom.xml
+++ b/docker-java-transport/pom.xml
@@ -29,6 +29,13 @@
 			<version>2.8.2</version>
 			<scope>provided</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>net.java.dev.jna</groupId>
+			<artifactId>jna</artifactId>
+			<version>5.8.0</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/AbstractSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/AbstractSocket.java
new file mode 100644
index 000000000..37a538bc9
--- /dev/null
+++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/AbstractSocket.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2012-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.github.dockerjava.transport;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.SocketAddress;
+
+/**
+ * Abstract base class for custom socket implementation.
+ *
+ * @author Phillip Webb
+ */
+class AbstractSocket extends Socket {
+
+    @Override
+    public void connect(SocketAddress endpoint) throws IOException {
+    }
+
+    @Override
+    public void connect(SocketAddress endpoint, int timeout) throws IOException {
+    }
+
+    @Override
+    public boolean isConnected() {
+        return true;
+    }
+
+    @Override
+    public boolean isBound() {
+        return true;
+    }
+
+    @Override
+    public void shutdownInput() throws IOException {
+        throw new UnsupportedSocketOperationException();
+    }
+
+    @Override
+    public void shutdownOutput() throws IOException {
+        throw new UnsupportedSocketOperationException();
+    }
+
+    @Override
+    public InetAddress getInetAddress() {
+        return null;
+    }
+
+    @Override
+    public InetAddress getLocalAddress() {
+        return null;
+    }
+
+    @Override
+    public SocketAddress getLocalSocketAddress() {
+        return null;
+    }
+
+    @Override
+    public SocketAddress getRemoteSocketAddress() {
+        return null;
+    }
+
+    private static class UnsupportedSocketOperationException extends UnsupportedOperationException {
+
+        UnsupportedSocketOperationException() {
+            super("Unsupported socket operation");
+        }
+
+    }
+
+}
diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/BsdDomainSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/BsdDomainSocket.java
new file mode 100644
index 000000000..12d2004e6
--- /dev/null
+++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/BsdDomainSocket.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2012-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.github.dockerjava.transport;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.List;
+
+import com.sun.jna.LastErrorException;
+import com.sun.jna.Native;
+import com.sun.jna.Platform;
+import com.sun.jna.Structure;
+
+/**
+ * {@link DomainSocket} implementation for BSD based platforms.
+ *
+ * @author Phillip Webb
+ */
+class BsdDomainSocket extends DomainSocket {
+
+    private static final int MAX_PATH_LENGTH = 104;
+
+    static {
+        Native.register(Platform.C_LIBRARY_NAME);
+    }
+
+    BsdDomainSocket(String path) throws IOException {
+        super(path);
+    }
+
+    @Override
+    protected void connect(String path, int handle) {
+        SockaddrUn address = new SockaddrUn(AF_LOCAL, path.getBytes(StandardCharsets.UTF_8));
+        connect(handle, address, address.size());
+    }
+
+    private native int connect(int fd, SockaddrUn address, int addressLen) throws LastErrorException;
+
+    /**
+     * Native {@code sockaddr_un} structure as defined in {@code sys/un.h}.
+     */
+    public static class SockaddrUn extends Structure implements Structure.ByReference {
+
+        public byte sunLen;
+
+        public byte sunFamily;
+
+        public byte[] sunPath = new byte[MAX_PATH_LENGTH];
+
+        private SockaddrUn(byte sunFamily, byte[] path) {
+            if (path.length > MAX_PATH_LENGTH) {
+                throw new IllegalArgumentException("Path cannot exceed " + MAX_PATH_LENGTH + " bytes");
+            }
+            System.arraycopy(path, 0, this.sunPath, 0, path.length);
+            this.sunPath[path.length] = 0;
+            this.sunLen = (byte) (fieldOffset("sunPath") + path.length);
+            this.sunFamily = sunFamily;
+            allocateMemory();
+        }
+
+        @Override
+        protected List<String> getFieldOrder() {
+            return Arrays.asList("sunLen", "sunFamily", "sunPath");
+        }
+
+    }
+
+}
diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java
new file mode 100644
index 000000000..ff77c3830
--- /dev/null
+++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2012-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.github.dockerjava.transport;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.nio.ByteBuffer;
+
+import com.github.dockerjava.transport.FileDescriptor.Handle;
+import com.sun.jna.LastErrorException;
+import com.sun.jna.Native;
+import com.sun.jna.Platform;
+
+/**
+ * A {@link Socket} implementation for Linux of BSD domain sockets.
+ *
+ * @author Phillip Webb
+ */
+public abstract class DomainSocket extends AbstractSocket {
+
+    private static final int SHUT_RD = 0;
+
+    private static final int SHUT_WR = 1;
+
+    protected static final int PF_LOCAL = 1;
+
+    protected static final byte AF_LOCAL = 1;
+
+    protected static final int SOCK_STREAM = 1;
+
+    private final FileDescriptor fileDescriptor;
+
+    private final InputStream inputStream;
+
+    private final OutputStream outputStream;
+
+    static {
+        Native.register(Platform.C_LIBRARY_NAME);
+    }
+
+    DomainSocket(String path) throws IOException {
+        try {
+            this.fileDescriptor = open(path);
+            this.inputStream = new DomainSocketInputStream();
+            this.outputStream = new DomainSocketOutputStream();
+        } catch (LastErrorException ex) {
+            throw new IOException(ex);
+        }
+    }
+
+    private FileDescriptor open(String path) {
+        int handle = socket(PF_LOCAL, SOCK_STREAM, 0);
+        connect(path, handle);
+        return new FileDescriptor(handle, this::close);
+    }
+
+    private int read(ByteBuffer buffer) throws IOException {
+        try (Handle handle = this.fileDescriptor.acquire()) {
+            if (handle.isClosed()) {
+                return -1;
+            }
+            try {
+                return read(handle.intValue(), buffer, buffer.remaining());
+            } catch (LastErrorException ex) {
+                throw new IOException(ex);
+            }
+        }
+    }
+
+    public void write(ByteBuffer buffer) throws IOException {
+        try (Handle handle = this.fileDescriptor.acquire()) {
+            if (!handle.isClosed()) {
+                try {
+                    write(handle.intValue(), buffer, buffer.remaining());
+                } catch (LastErrorException ex) {
+                    throw new IOException(ex);
+                }
+            }
+        }
+    }
+
+    @Override
+    public InputStream getInputStream() {
+        return this.inputStream;
+    }
+
+    @Override
+    public OutputStream getOutputStream() {
+        return this.outputStream;
+    }
+
+    @Override
+    public void close() throws IOException {
+        super.close();
+        try {
+            this.fileDescriptor.close();
+        } catch (LastErrorException ex) {
+            throw new IOException(ex);
+        }
+    }
+
+    protected abstract void connect(String path, int handle);
+
+    private native int socket(int domain, int type, int protocol) throws LastErrorException;
+
+    private native int read(int fd, ByteBuffer buffer, int count) throws LastErrorException;
+
+    private native int write(int fd, ByteBuffer buffer, int count) throws LastErrorException;
+
+    private native int close(int fd) throws LastErrorException;
+
+    /**
+     * Return a new {@link DomainSocket} for the given path.
+     * @param path the path to the domain socket
+     * @return a {@link DomainSocket} instance
+     * @throws IOException if the socket cannot be opened
+     */
+    public static DomainSocket get(String path) throws IOException {
+        if (Platform.isMac() || isBsdPlatform()) {
+            return new BsdDomainSocket(path);
+        }
+        return new LinuxDomainSocket(path);
+    }
+
+    private static boolean isBsdPlatform() {
+        return Platform.isFreeBSD() || Platform.iskFreeBSD() || Platform.isNetBSD() || Platform.isOpenBSD();
+    }
+
+    /**
+     * {@link InputStream} returned from the {@link DomainSocket}.
+     */
+    private class DomainSocketInputStream extends InputStream {
+
+        @Override
+        public int read() throws IOException {
+            ByteBuffer buffer = ByteBuffer.allocate(1);
+            int amountRead = DomainSocket.this.read(buffer);
+            return (amountRead != 1) ? -1 : buffer.get() & 0xFF;
+        }
+
+        @Override
+        public int read(byte[] b, int off, int len) throws IOException {
+            if (len == 0) {
+                return 0;
+            }
+            int amountRead = DomainSocket.this.read(ByteBuffer.wrap(b, off, len));
+            return (amountRead > 0) ? amountRead : -1;
+        }
+
+    }
+
+    /**
+     * {@link OutputStream} returned from the {@link DomainSocket}.
+     */
+    private class DomainSocketOutputStream extends OutputStream {
+
+        @Override
+        public void write(int b) throws IOException {
+            ByteBuffer buffer = ByteBuffer.allocate(1);
+            buffer.put(0, (byte) (b & 0xFF));
+            DomainSocket.this.write(buffer);
+        }
+
+        @Override
+        public void write(byte[] b, int off, int len) throws IOException {
+            if (len != 0) {
+                DomainSocket.this.write(ByteBuffer.wrap(b, off, len));
+            }
+        }
+
+    }
+
+}
diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/FileDescriptor.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/FileDescriptor.java
new file mode 100644
index 000000000..31960f949
--- /dev/null
+++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/FileDescriptor.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2012-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.github.dockerjava.transport;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.function.IntConsumer;
+
+/**
+ * Provides access to the underlying file system representation of an open file.
+ *
+ * @author Phillip Webb
+ * @see #acquire()
+ */
+class FileDescriptor {
+
+    private final Handle openHandle;
+
+    private final Handle closedHandler;
+
+    private final IntConsumer closer;
+
+    private Status status = Status.OPEN;
+
+    private int referenceCount;
+
+    FileDescriptor(int handle, IntConsumer closer) {
+        this.openHandle = new Handle(handle);
+        this.closedHandler = new Handle(-1);
+        this.closer = closer;
+    }
+
+    @Override
+    protected void finalize() throws Throwable {
+        close();
+    }
+
+    /**
+     * Acquire an instance of the actual {@link Handle}. The caller must
+     * {@link Handle#close() close} the resulting handle when done.
+     * @return the handle
+     */
+    synchronized Handle acquire() {
+        this.referenceCount++;
+        return (this.status != Status.OPEN) ? this.closedHandler : this.openHandle;
+    }
+
+    private synchronized void release() {
+        this.referenceCount--;
+        if (this.referenceCount == 0 && this.status == Status.CLOSE_PENDING) {
+            this.closer.accept(this.openHandle.value);
+            this.status = Status.CLOSED;
+        }
+    }
+
+    /**
+     * Close the underlying file when all handles have been released.
+     */
+    synchronized void close() {
+        if (this.status == Status.OPEN) {
+            if (this.referenceCount == 0) {
+                this.closer.accept(this.openHandle.value);
+                this.status = Status.CLOSED;
+            } else {
+                this.status = Status.CLOSE_PENDING;
+            }
+        }
+    }
+
+    /**
+     * The status of the file descriptor.
+     */
+    private enum Status {
+
+        OPEN, CLOSE_PENDING, CLOSED
+
+    }
+
+    /**
+     * Provides access to the actual file descriptor handle.
+     */
+    final class Handle implements Closeable {
+
+        private final int value;
+
+        private Handle(int value) {
+            this.value = value;
+        }
+
+        boolean isClosed() {
+            return this.value == -1;
+        }
+
+        int intValue() {
+            return this.value;
+        }
+
+        @Override
+        public void close() throws IOException {
+            if (!isClosed()) {
+                release();
+            }
+        }
+
+    }
+
+}
diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/LinuxDomainSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/LinuxDomainSocket.java
new file mode 100644
index 000000000..e1467858a
--- /dev/null
+++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/LinuxDomainSocket.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2012-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.github.dockerjava.transport;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.List;
+
+import com.sun.jna.LastErrorException;
+import com.sun.jna.Native;
+import com.sun.jna.Platform;
+import com.sun.jna.Structure;
+
+/**
+ * {@link DomainSocket} implementation for Linux based platforms.
+ *
+ * @author Phillip Webb
+ */
+class LinuxDomainSocket extends DomainSocket {
+
+    static {
+        Native.register(Platform.C_LIBRARY_NAME);
+    }
+
+    LinuxDomainSocket(String path) throws IOException {
+        super(path);
+    }
+
+    private static final int MAX_PATH_LENGTH = 108;
+
+    @Override
+    protected void connect(String path, int handle) {
+        SockaddrUn address = new SockaddrUn(AF_LOCAL, path.getBytes(StandardCharsets.UTF_8));
+        connect(handle, address, address.size());
+    }
+
+    private native int connect(int fd, SockaddrUn address, int addressLen) throws LastErrorException;
+
+    /**
+     * Native {@code sockaddr_un} structure as defined in {@code sys/un.h}.
+     */
+    public static class SockaddrUn extends Structure implements Structure.ByReference {
+
+        public short sunFamily;
+
+        public byte[] sunPath = new byte[MAX_PATH_LENGTH];
+
+        private SockaddrUn(byte sunFamily, byte[] path) {
+            if (path.length > MAX_PATH_LENGTH) {
+                throw new IllegalArgumentException("Path cannot exceed " + MAX_PATH_LENGTH + " bytes");
+            }
+            System.arraycopy(path, 0, this.sunPath, 0, path.length);
+            this.sunPath[path.length] = 0;
+            this.sunFamily = sunFamily;
+            allocateMemory();
+        }
+
+        @Override
+        protected List<String> getFieldOrder() {
+            return Arrays.asList("sunFamily", "sunPath");
+        }
+
+    }
+
+}
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/NamedPipeSocket.java
similarity index 97%
rename from docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java
rename to docker-java-transport/src/main/java/com/github/dockerjava/transport/NamedPipeSocket.java
index 384b18033..e4aa315eb 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/NamedPipeSocket.java
+++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/NamedPipeSocket.java
@@ -1,4 +1,4 @@
-package com.github.dockerjava.httpclient5;
+package com.github.dockerjava.transport;
 
 import com.sun.jna.Native;
 import com.sun.jna.win32.StdCallLibrary;
@@ -21,13 +21,13 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
 
-class NamedPipeSocket extends Socket {
+public class NamedPipeSocket extends Socket {
 
     private final String socketFileName;
 
     private AsynchronousFileByteChannel channel;
 
-    NamedPipeSocket(String socketFileName) {
+    public NamedPipeSocket(String socketFileName) {
         this.socketFileName = socketFileName;
     }
 

From 5f416a7bdf808979a1f7232dda383f3eac1aeae2 Mon Sep 17 00:00:00 2001
From: internalerror <internalerror@users.noreply.github.com>
Date: Fri, 26 Mar 2021 15:55:44 +0800
Subject: [PATCH 1061/1272] Disable httpclient5 connection state tracking to
 avoid leaks (#1560)

Co-authored-by: internalerror <goubilian@gmail.com>

fixes #1559
---
 .../dockerjava/httpclient5/ApacheDockerHttpClientImpl.java     | 1 +
 docs/getting_started.md                                        | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
index ffa6cf395..174270f1e 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
@@ -93,6 +93,7 @@ protected ApacheDockerHttpClientImpl(
         httpClient = HttpClients.custom()
             .setRequestExecutor(new HijackingHttpRequestExecutor(null))
             .setConnectionManager(connectionManager)
+            .disableConnectionState()
             .build();
     }
 
diff --git a/docs/getting_started.md b/docs/getting_started.md
index ebc41d62e..c389fba71 100644
--- a/docs/getting_started.md
+++ b/docs/getting_started.md
@@ -90,6 +90,7 @@ DockerClientConfig config = ...;
 DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder()
     .dockerHost(config.getDockerHost())
     .sslConfig(config.getSSLConfig())
+    .maxConnections(100)
     .build();
 ```
 
@@ -118,4 +119,4 @@ DockerClient dockerClient = DockerClientImpl.getInstance(config, httpClient);
 Once you have it, you can start executing Docker commands:
 ```java
 dockerClient.pingCmd().exec();
-```
\ No newline at end of file
+```

From c86a53a82f16a4ca9b8873f31a65f95b7e29736e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 29 Mar 2021 15:27:58 +0200
Subject: [PATCH 1062/1272] Create Dependabot config file (#1571)

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 .github/dependabot.yml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..7dec19aef
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: maven
+  directory: "/"
+  schedule:
+    interval: weekly
+  open-pull-requests-limit: 99
+  rebase-strategy: disabled

From af0d1f74b924026c9504298fdf362d9d80d418be Mon Sep 17 00:00:00 2001
From: smeetsn <81557963+smeetsn@users.noreply.github.com>
Date: Thu, 1 Apr 2021 10:46:01 +0200
Subject: [PATCH 1063/1272] Options for volume has been added (#1569)

* Options for volume has been added

* Correction of indentation.

Co-authored-by: Nele Smeets <nele.smeets@vito.be>
---
 .../dockerjava/api/command/InspectVolumeResponse.java     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
index c79232811..c819a6b32 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
@@ -26,6 +26,9 @@ public class InspectVolumeResponse {
     @JsonProperty("Mountpoint")
     private String mountpoint;
 
+    @JsonProperty("Options")
+    private Map<String, String> options;
+
     public String getName() {
         return name;
     }
@@ -41,4 +44,9 @@ public String getDriver() {
     public String getMountpoint() {
         return mountpoint;
     }
+
+    public Map<String, String> getOptions() {
+        return options;
+    }
+
 }

From 09b4c96fe0ad06166d1ed36c00f4df7f8f6c161d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Apr 2021 10:46:44 +0200
Subject: [PATCH 1064/1272] Bump httpclient5 from 5.0 to 5.0.3 (#1590)

Bumps [httpclient5](https://github.com/apache/httpcomponents-client) from 5.0 to 5.0.3.
- [Release notes](https://github.com/apache/httpcomponents-client/releases)
- [Changelog](https://github.com/apache/httpcomponents-client/blob/master/RELEASE_NOTES.txt)
- [Commits](https://github.com/apache/httpcomponents-client/compare/rel/v5.0...rel/v5.0.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-httpclient5/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml
index c31347e56..aff37f383 100644
--- a/docker-java-transport-httpclient5/pom.xml
+++ b/docker-java-transport-httpclient5/pom.xml
@@ -25,7 +25,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents.client5</groupId>
 			<artifactId>httpclient5</artifactId>
-			<version>5.0</version>
+			<version>5.0.3</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.apache.httpcomponents.core5</groupId>

From 0306031832432454fbbdbf5c20e16fe881c7b065 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 1 Apr 2021 10:48:09 +0200
Subject: [PATCH 1065/1272] Bump lombok from 1.18.12 to 1.18.18 (#1570)

Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.12 to 1.18.18.
- [Release notes](https://github.com/rzwitserloot/lombok/releases)
- [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.12...v1.18.18)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 docker-java-api/pom.xml | 2 +-
 docker-java/pom.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 08b5236c2..d147a4a45 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.12</version>
+			<version>1.18.18</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 084a8a40c..194c08ce2 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -120,7 +120,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.12</version>
+			<version>1.18.18</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

From e01dd42d4041870147163dc78323bfc94b51bb57 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Sun, 11 Apr 2021 11:16:48 +0200
Subject: [PATCH 1066/1272] Update OkHttp (#1599)

---
 docker-java-transport-okhttp/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index 18ba1d000..fda31db4f 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -25,7 +25,7 @@
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
-			<version>3.14.4</version>
+			<version>3.14.9</version>
 		</dependency>
 
 		<dependency>

From 47deba37bf1c6bc051b0b50faa0349f9dc8de41b Mon Sep 17 00:00:00 2001
From: Yuting Liu <yuting@sumologic.com>
Date: Tue, 11 May 2021 23:25:49 -0700
Subject: [PATCH 1067/1272] Fix missing equals and toString annotation for
 Statistics Objects (#1618)

---
 .../java/com/github/dockerjava/api/model/CpuStatsConfig.java  | 4 ++++
 .../java/com/github/dockerjava/api/model/CpuUsageConfig.java  | 4 ++++
 .../com/github/dockerjava/api/model/MemoryStatsConfig.java    | 4 ++++
 .../java/com/github/dockerjava/api/model/StatsConfig.java     | 4 ++++
 .../com/github/dockerjava/api/model/ThrottlingDataConfig.java | 4 ++++
 5 files changed, 20 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
index fce6e610d..fcd53b475 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
@@ -1,6 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -10,6 +12,8 @@
  *
  * @author Yuting Liu
  */
+@EqualsAndHashCode
+@ToString
 public class CpuStatsConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
index e9e4d2212..587c2d74b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
@@ -1,6 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -11,6 +13,8 @@
  *
  * @author Yuting Liu
  */
+@EqualsAndHashCode
+@ToString
 public class CpuUsageConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
index 12e6abccf..5646cc07e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
@@ -1,6 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -10,6 +12,8 @@
  *
  * @author Yuting Liu
  */
+@EqualsAndHashCode
+@ToString
 public class MemoryStatsConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java
index 19b95a7ff..add7f0d50 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java
@@ -1,10 +1,14 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
 
+@EqualsAndHashCode
+@ToString
 public class StatsConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
index ce29b7057..ed4d53bb5 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
@@ -1,6 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -10,6 +12,8 @@
  *
  * @author Yuting Liu
  */
+@EqualsAndHashCode
+@ToString
 public class ThrottlingDataConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 

From 6bf8b3ca74ab7f753404bcce11ed42eaabc2c7b3 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 27 May 2021 17:49:42 +0200
Subject: [PATCH 1068/1272] Remove Jacoco and Spotbugs

---
 pom.xml | 53 -----------------------------------------------------
 1 file changed, 53 deletions(-)

diff --git a/pom.xml b/pom.xml
index b293e0e85..ec6115158 100644
--- a/pom.xml
+++ b/pom.xml
@@ -347,59 +347,6 @@
 							</configLocation>
 						</configuration>
 					</plugin>
-					<plugin>
-						<groupId>com.github.spotbugs</groupId>
-						<artifactId>spotbugs-maven-plugin</artifactId>
-						<version>3.1.12.2</version>
-						<configuration>
-							<effort>Max</effort>
-							<threshold>Low</threshold>
-							<xmlOutput>true</xmlOutput>
-							<!-- until all will be fixed -->
-							<failOnError>false</failOnError>
-						</configuration>
-						<executions>
-							<execution>
-								<goals>
-									<goal>check</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.jacoco</groupId>
-						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>0.8.5</version>
-						<executions>
-							<execution>
-								<goals>
-									<goal>prepare-agent</goal>
-								</goals>
-							</execution>
-
-							<execution>
-								<id>post-unit-test</id>
-								<phase>test</phase>
-								<goals>
-									<goal>report</goal>
-								</goals>
-							</execution>
-
-							<execution>
-								<id>pre-integration-test</id>
-								<phase>pre-integration-test</phase>
-								<goals>
-									<goal>prepare-agent-integration</goal>
-								</goals>
-							</execution>
-							<execution>
-								<id>report-integration</id>
-								<goals>
-									<goal>report-integration</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
 				</plugins>
 			</build>
 		</profile>

From 29217e1db676bbcbd71ad83539b3c330d4617117 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 27 May 2021 19:20:22 +0200
Subject: [PATCH 1069/1272] Reduce logging (#1636)

---
 docker-java/src/test/resources/logback.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docker-java/src/test/resources/logback.xml b/docker-java/src/test/resources/logback.xml
index b4309b868..8fb1a7a6d 100644
--- a/docker-java/src/test/resources/logback.xml
+++ b/docker-java/src/test/resources/logback.xml
@@ -7,13 +7,14 @@
     </appender>
 
     <logger name="com.github.dockerjava" level="DEBUG"/>
-    <logger name="com.github.dockerjava.jaxrs" level="DEBUG"/>
-    <logger name="com.github.dockerjava.netty" level="DEBUG"/>
-    <logger name="org.apache.http.impl.conn" level="DEBUG"/>
+    <logger name="com.github.dockerjava.jaxrs" level="INFO"/>
+    <logger name="com.github.dockerjava.netty" level="INFO"/>
+    <logger name="com.github.dockerjava.httpclient5" level="INFO"/>
+    <logger name="com.github.dockerjava.okhttp" level="INFO"/>
 
 
     <root level="INFO">
         <appender-ref ref="STDOUT" />
     </root>
 
-</configuration>
\ No newline at end of file
+</configuration>

From a53119420bd83f771d48f51ff21875c6a8b9385a Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 27 May 2021 21:49:24 +0200
Subject: [PATCH 1070/1272] Make it easy to provide a custom ObjectMapper
 (#1637)

---
 .../dockerjava/core/DockerClientConfig.java   |  6 +-
 .../core/DockerClientConfigDelegate.java      | 57 +++++++++++++++++++
 .../core/async/JsonStreamProcessor.java       |  4 +-
 .../netty/NettyInvocationBuilder.java         |  4 +-
 .../dockerjava/netty/NettyWebTarget.java      |  4 +-
 .../netty/handler/JsonRequestHandler.java     |  7 +--
 .../handler/JsonResponseCallbackHandler.java  |  4 +-
 .../test/serdes/JSONTestHelper.java           |  4 +-
 8 files changed, 75 insertions(+), 15 deletions(-)
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfigDelegate.java

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index b64c0e7e6..67539f00c 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -19,6 +19,10 @@
  */
 public interface DockerClientConfig {
 
+    static ObjectMapper getDefaultObjectMapper() {
+        return DefaultObjectMapperHolder.INSTANCE.getObjectMapper().copy();
+    }
+
     URI getDockerHost();
 
     RemoteApiVersion getApiVersion();
@@ -41,7 +45,7 @@ public interface DockerClientConfig {
     SSLConfig getSSLConfig();
 
     default ObjectMapper getObjectMapper() {
-        return DefaultObjectMapperHolder.INSTANCE.getObjectMapper().copy();
+        return getDefaultObjectMapper();
     }
 }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfigDelegate.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfigDelegate.java
new file mode 100644
index 000000000..86c6ac5de
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfigDelegate.java
@@ -0,0 +1,57 @@
+package com.github.dockerjava.core;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.AuthConfigurations;
+
+import java.net.URI;
+
+@SuppressWarnings("unused")
+public class DockerClientConfigDelegate implements DockerClientConfig {
+
+    final DockerClientConfig original;
+
+    public DockerClientConfigDelegate(DockerClientConfig original) {
+        this.original = original;
+    }
+
+    public URI getDockerHost() {
+        return original.getDockerHost();
+    }
+
+    public RemoteApiVersion getApiVersion() {
+        return original.getApiVersion();
+    }
+
+    public String getRegistryUsername() {
+        return original.getRegistryUsername();
+    }
+
+    public String getRegistryPassword() {
+        return original.getRegistryPassword();
+    }
+
+    public String getRegistryEmail() {
+        return original.getRegistryEmail();
+    }
+
+    public String getRegistryUrl() {
+        return original.getRegistryUrl();
+    }
+
+    public AuthConfig effectiveAuthConfig(String imageName) {
+        return original.effectiveAuthConfig(imageName);
+    }
+
+    public AuthConfigurations getAuthConfigurations() {
+        return original.getAuthConfigurations();
+    }
+
+    public SSLConfig getSSLConfig() {
+        return original.getSSLConfig();
+    }
+
+    public ObjectMapper getObjectMapper() {
+        return original.getObjectMapper();
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
index 64aabd999..6bc5ad385 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/async/JsonStreamProcessor.java
@@ -13,7 +13,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.core.DefaultDockerClientConfig;
+import com.github.dockerjava.core.DockerClientConfig;
 
 /**
  *
@@ -33,7 +33,7 @@ public class JsonStreamProcessor<T> implements ResponseStreamProcessor<T> {
     @Deprecated
     public JsonStreamProcessor(Class<T> clazz) {
         this(
-                DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(),
+                DockerClientConfig.getDefaultObjectMapper(),
                 new TypeReference<T>() {
                 }
         );
diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
index 18b82533e..ab13dc7b7 100644
--- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
+++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyInvocationBuilder.java
@@ -6,7 +6,7 @@
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.core.DefaultDockerClientConfig;
+import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.InvocationBuilder;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
 import com.github.dockerjava.netty.handler.FramedResponseStreamHandler;
@@ -85,7 +85,7 @@ public void onNext(Void object) {
     @Deprecated
     public NettyInvocationBuilder(ChannelProvider channelProvider, String resource) {
         this(
-                DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(),
+                DockerClientConfig.getDefaultObjectMapper(),
                 channelProvider,
                 resource
         );
diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
index 492308ad6..17672b0b4 100644
--- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
+++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
@@ -13,7 +13,7 @@
 import java.util.Set;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.core.DefaultDockerClientConfig;
+import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.WebTarget;
 import com.google.common.collect.ImmutableSet;
 import io.netty.handler.codec.http.HttpConstants;
@@ -50,7 +50,7 @@ public class NettyWebTarget implements WebTarget {
     @Deprecated
     public NettyWebTarget(ChannelProvider channelProvider, String host) {
         this(
-                DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(),
+                DockerClientConfig.getDefaultObjectMapper(),
                 channelProvider,
                 host,
                 ImmutableList.of(),
diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
index 30e1831f8..b122c5090 100644
--- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
+++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonRequestHandler.java
@@ -1,12 +1,11 @@
 package com.github.dockerjava.netty.handler;
 
-import com.github.dockerjava.core.DefaultDockerClientConfig;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.dockerjava.core.DockerClientConfig;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 /**
  * Handler that encodes an outgoing object to JSON.
  *
@@ -17,7 +16,7 @@
 @Deprecated
 public class JsonRequestHandler extends MessageToByteEncoder<Object> {
 
-    private ObjectMapper mapper = DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper();
+    private ObjectMapper mapper = DockerClientConfig.getDefaultObjectMapper();
 
     @Override
     protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception {
diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
index 0d13bd306..f6e8af3c3 100644
--- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
+++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/handler/JsonResponseCallbackHandler.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.netty.handler;
 
-import com.github.dockerjava.core.DefaultDockerClientConfig;
+import com.github.dockerjava.core.DockerClientConfig;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
@@ -25,7 +25,7 @@ public class JsonResponseCallbackHandler<T> extends SimpleChannelInboundHandler<
     @Deprecated
     public JsonResponseCallbackHandler(TypeReference<T> typeReference, ResultCallback<T> callback) {
         this(
-                DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper(),
+                DockerClientConfig.getDefaultObjectMapper(),
                 typeReference,
                 callback
         );
diff --git a/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java b/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
index 3f2f6831d..0c03bdcc2 100644
--- a/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
+++ b/docker-java/src/test/java/com/github/dockerjava/test/serdes/JSONTestHelper.java
@@ -17,7 +17,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.dockerjava.core.DefaultDockerClientConfig;
+import com.github.dockerjava.core.DockerClientConfig;
 import org.apache.commons.io.IOUtils;
 
 import java.io.IOException;
@@ -37,7 +37,7 @@ public class JSONTestHelper {
 
     static {
         try {
-            MAPPER = DefaultDockerClientConfig.createDefaultConfigBuilder().build().getObjectMapper();
+            MAPPER = DockerClientConfig.getDefaultObjectMapper();
         } catch (Throwable e) {
             e.printStackTrace();
             throw e;

From 8db70eaf2a95ffc802b7acb6a4006f648af6be53 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 28 May 2021 15:22:34 +0200
Subject: [PATCH 1071/1272] Use UnixDocket in OkHttp as well

---
 .../java/com/github/dockerjava/okhttp/UnixSocketFactory.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java
index fd7499386..dc19b1351 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.okhttp;
 
-import com.github.dockerjava.transport.DomainSocket;
+import com.github.dockerjava.transport.UnixSocket;
 
 import javax.net.SocketFactory;
 import java.io.IOException;
@@ -18,7 +18,7 @@ class UnixSocketFactory extends SocketFactory {
     @Override
     public Socket createSocket() {
         try {
-            return DomainSocket.get(socketPath);
+            return UnixSocket.get(socketPath);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

From 0ae59306d098c0c91efa5e66e390c5de84865ccc Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 28 May 2021 15:24:33 +0200
Subject: [PATCH 1072/1272] Revert accidental change (8db70eaf2a)

---
 .../java/com/github/dockerjava/okhttp/UnixSocketFactory.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java
index dc19b1351..fd7499386 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.okhttp;
 
-import com.github.dockerjava.transport.UnixSocket;
+import com.github.dockerjava.transport.DomainSocket;
 
 import javax.net.SocketFactory;
 import java.io.IOException;
@@ -18,7 +18,7 @@ class UnixSocketFactory extends SocketFactory {
     @Override
     public Socket createSocket() {
         try {
-            return UnixSocket.get(socketPath);
+            return DomainSocket.get(socketPath);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

From 4f8f7b9890b96b88d0105eb9059955d8074ee331 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 10 Jun 2021 15:57:10 +0200
Subject: [PATCH 1073/1272] Add `platform` to `CreateContainerCmd` (#1638)

---
 .../dockerjava/api/command/CreateContainerCmd.java |  5 +++++
 .../core/command/CreateContainerCmdImpl.java       | 14 ++++++++++++++
 .../core/exec/CreateContainerCmdExec.java          |  4 ++++
 3 files changed, 23 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 2fc6e6faa..5da8be6f6 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -1006,6 +1006,11 @@ default CreateContainerCmd withUlimits(List<Ulimit> ulimits) {
         return this;
     }
 
+    @CheckForNull
+    String getPlatform();
+
+    CreateContainerCmd withPlatform(String platform);
+
     /**
      * @throws NotFoundException No such container
      * @throws ConflictException Named container already exists
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index f3089486e..040e716e1 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -133,6 +133,8 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
 
     private AuthConfig authConfig;
 
+    private String platform;
+
     public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, AuthConfig authConfig, String image) {
         super(exec);
         withAuthConfig(authConfig);
@@ -553,6 +555,18 @@ public CreateContainerCmdImpl withOnBuild(List<String> onBuild) {
         return this;
     }
 
+    @CheckForNull
+    @Override
+    public String getPlatform() {
+        return platform;
+    }
+
+    @Override
+    public CreateContainerCmd withPlatform(String platform) {
+        this.platform = platform;
+        return this;
+    }
+
     /**
      * @throws NotFoundException No such container
      * @throws ConflictException Named container already exists
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java
index d04233f2a..87d2cca81 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CreateContainerCmdExec.java
@@ -27,6 +27,10 @@ protected CreateContainerResponse execute(CreateContainerCmd command) {
             webResource = webResource.queryParam("name", command.getName());
         }
 
+        if (command.getPlatform() != null) {
+            webResource = webResource.queryParam("platform", command.getPlatform());
+        }
+
         LOGGER.trace("POST: {} ", webResource);
         return resourceWithOptionalAuthConfig(command.getAuthConfig(), webResource.request())
                 .accept(MediaType.APPLICATION_JSON)

From ca0b78a0683cb9f6812bfaae9313f16c69e1b2d5 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 17 Jun 2021 15:59:13 +0200
Subject: [PATCH 1074/1272] Add common `DockerObject` parent to every model
 class (#1635)

* Add common `DockerObject` parent to every model class

* Fix `DockerObjectArchTest`

* Remove `callSuper`, do not extend meta-objects from `DockerObject`

* Do not extend `@JsonCreator`-based objects from `DockerObject`

* Put back `@EqualsAndHashCode` on `Volume`

* Put back `@EqualsAndHashCode` on `ExposedPort`

* Add exclusions to `ModelsSerializableTest`

* Properly add exclusions to `ModelsSerializableTest`

* Use `DeserializationContext#readTree`
---
 docker-java-api/pom.xml                       | 22 +++++
 .../api/command/CreateConfigResponse.java     |  3 +-
 .../api/command/CreateContainerResponse.java  |  3 +-
 .../api/command/CreateImageResponse.java      |  3 +-
 .../api/command/CreateNetworkResponse.java    |  3 +-
 .../api/command/CreateSecretResponse.java     |  3 +-
 .../api/command/CreateServiceResponse.java    |  3 +-
 .../api/command/CreateVolumeResponse.java     |  3 +-
 .../api/command/ExecCreateCmdResponse.java    |  3 +-
 .../dockerjava/api/command/GraphData.java     |  3 +-
 .../dockerjava/api/command/GraphDriver.java   |  3 +-
 .../dockerjava/api/command/HealthState.java   |  8 +-
 .../api/command/HealthStateLog.java           |  7 +-
 .../api/command/InspectContainerResponse.java |  9 +-
 .../api/command/InspectExecResponse.java      |  9 +-
 .../api/command/InspectImageResponse.java     |  3 +-
 .../api/command/InspectVolumeResponse.java    |  3 +-
 .../api/command/ListVolumesResponse.java      |  3 +-
 .../github/dockerjava/api/command/RootFS.java |  3 +-
 .../api/command/TopContainerResponse.java     |  3 +-
 .../dockerjava/api/model/AuthConfig.java      |  2 +-
 .../api/model/AuthConfigurations.java         |  6 +-
 .../dockerjava/api/model/AuthResponse.java    |  7 +-
 .../com/github/dockerjava/api/model/Bind.java |  4 +-
 .../dockerjava/api/model/BindOptions.java     |  2 +-
 .../dockerjava/api/model/BlkioRateDevice.java |  2 +-
 .../dockerjava/api/model/BlkioStatEntry.java  |  2 +-
 .../api/model/BlkioStatsConfig.java           |  2 +-
 .../api/model/BlkioWeightDevice.java          |  2 +-
 .../api/model/BuildResponseItem.java          |  4 +
 .../dockerjava/api/model/ChangeLog.java       |  2 +-
 .../dockerjava/api/model/ClusterInfo.java     |  2 +-
 .../github/dockerjava/api/model/Config.java   |  2 +-
 .../dockerjava/api/model/ConfigSpec.java      |  2 +-
 .../dockerjava/api/model/Container.java       |  2 +-
 .../dockerjava/api/model/ContainerConfig.java |  2 +-
 .../api/model/ContainerDNSConfig.java         |  2 +-
 .../api/model/ContainerHostConfig.java        |  2 +-
 .../dockerjava/api/model/ContainerMount.java  |  2 +-
 .../api/model/ContainerNetwork.java           |  6 +-
 .../api/model/ContainerNetworkSettings.java   |  2 +-
 .../dockerjava/api/model/ContainerPort.java   |  2 +-
 .../dockerjava/api/model/ContainerSpec.java   |  2 +-
 .../api/model/ContainerSpecConfig.java        |  2 +-
 .../api/model/ContainerSpecFile.java          |  2 +-
 .../api/model/ContainerSpecPrivileges.java    |  2 +-
 .../ContainerSpecPrivilegesCredential.java    |  2 +-
 ...ContainerSpecPrivilegesSELinuxContext.java |  2 +-
 .../api/model/ContainerSpecSecret.java        |  2 +-
 .../dockerjava/api/model/CpuStatsConfig.java  |  2 +-
 .../dockerjava/api/model/CpuUsageConfig.java  |  2 +-
 .../github/dockerjava/api/model/Device.java   |  2 +-
 .../dockerjava/api/model/DeviceRequest.java   |  2 +-
 .../api/model/DiscreteResourceSpec.java       |  1 +
 .../dockerjava/api/model/DockerObject.java    | 20 +++++
 .../api/model/DockerObjectAccessor.java       | 27 ++++++
 .../github/dockerjava/api/model/Driver.java   |  2 +-
 .../dockerjava/api/model/DriverStatus.java    |  2 +-
 .../github/dockerjava/api/model/Endpoint.java |  2 +-
 .../dockerjava/api/model/EndpointSpec.java    |  2 +-
 .../api/model/EndpointVirtualIP.java          |  2 +-
 .../dockerjava/api/model/ErrorDetail.java     |  6 +-
 .../github/dockerjava/api/model/Event.java    |  2 +-
 .../dockerjava/api/model/EventActor.java      |  2 +-
 .../dockerjava/api/model/ExposedPorts.java    |  2 +
 .../dockerjava/api/model/ExternalCA.java      |  2 +-
 .../github/dockerjava/api/model/Frame.java    |  2 +-
 .../dockerjava/api/model/GenericResource.java |  6 +-
 .../dockerjava/api/model/HealthCheck.java     |  2 +-
 .../dockerjava/api/model/HostConfig.java      |  2 +-
 .../dockerjava/api/model/Identifier.java      |  2 +-
 .../github/dockerjava/api/model/Image.java    |  2 +-
 .../com/github/dockerjava/api/model/Info.java |  2 +-
 .../api/model/InfoRegistryConfig.java         |  4 +-
 .../com/github/dockerjava/api/model/Link.java |  4 +-
 .../dockerjava/api/model/LogConfig.java       |  2 +-
 .../github/dockerjava/api/model/LxcConf.java  |  6 +-
 .../api/model/MemoryStatsConfig.java          |  2 +-
 .../github/dockerjava/api/model/Mount.java    |  2 +-
 .../api/model/NamedResourceSpec.java          |  1 +
 .../github/dockerjava/api/model/Network.java  | 10 ++-
 .../api/model/NetworkAttachmentConfig.java    |  2 +-
 .../dockerjava/api/model/NetworkSettings.java |  2 +-
 .../com/github/dockerjava/api/model/Node.java |  2 +-
 .../dockerjava/api/model/ObjectVersion.java   |  4 +-
 .../github/dockerjava/api/model/PeerNode.java |  2 +-
 .../dockerjava/api/model/PidsStatsConfig.java |  6 +-
 .../dockerjava/api/model/PortBinding.java     |  2 +-
 .../dockerjava/api/model/PortConfig.java      |  2 +-
 .../github/dockerjava/api/model/Ports.java    |  3 +-
 .../dockerjava/api/model/PruneResponse.java   |  2 +-
 .../dockerjava/api/model/Repository.java      |  2 +-
 .../api/model/ResourceRequirements.java       |  2 +-
 .../dockerjava/api/model/ResourceSpecs.java   |  2 +-
 .../dockerjava/api/model/ResourceVersion.java |  2 +-
 .../dockerjava/api/model/ResponseItem.java    |  8 +-
 .../dockerjava/api/model/RestartPolicy.java   |  4 +-
 .../dockerjava/api/model/SearchItem.java      |  2 +-
 .../github/dockerjava/api/model/Secret.java   |  6 +-
 .../dockerjava/api/model/SecretSpec.java      |  2 +-
 .../github/dockerjava/api/model/Service.java  |  2 +-
 .../api/model/ServiceGlobalModeOptions.java   |  2 +-
 .../api/model/ServiceModeConfig.java          |  2 +-
 .../api/model/ServicePlacement.java           |  2 +-
 .../model/ServiceReplicatedModeOptions.java   |  2 +-
 .../api/model/ServiceRestartPolicy.java       |  2 +-
 .../dockerjava/api/model/ServiceSpec.java     |  2 +-
 .../api/model/ServiceUpdateStatus.java        |  2 +-
 .../api/model/StatisticNetworksConfig.java    |  2 +-
 .../dockerjava/api/model/Statistics.java      |  2 +-
 .../dockerjava/api/model/StatsConfig.java     |  2 +-
 .../dockerjava/api/model/SwarmCAConfig.java   |  2 +-
 .../api/model/SwarmDispatcherConfig.java      |  2 +-
 .../dockerjava/api/model/SwarmInfo.java       |  2 +-
 .../dockerjava/api/model/SwarmJoinTokens.java |  2 +-
 .../dockerjava/api/model/SwarmNode.java       |  2 +-
 .../api/model/SwarmNodeDescription.java       |  2 +-
 .../api/model/SwarmNodeEngineDescription.java |  2 +-
 .../api/model/SwarmNodeManagerStatus.java     |  2 +-
 .../api/model/SwarmNodePlatform.java          |  2 +-
 .../api/model/SwarmNodePluginDescription.java |  2 +-
 .../api/model/SwarmNodeResources.java         |  2 +-
 .../dockerjava/api/model/SwarmNodeSpec.java   |  2 +-
 .../dockerjava/api/model/SwarmNodeStatus.java |  2 +-
 .../api/model/SwarmNodeVersion.java           |  2 +-
 .../api/model/SwarmOrchestration.java         |  2 +-
 .../dockerjava/api/model/SwarmRaftConfig.java |  2 +-
 .../dockerjava/api/model/SwarmSpec.java       |  2 +-
 .../dockerjava/api/model/SwarmVersion.java    |  2 +-
 .../com/github/dockerjava/api/model/Task.java |  2 +-
 .../dockerjava/api/model/TaskDefaults.java    |  2 +-
 .../github/dockerjava/api/model/TaskSpec.java |  2 +-
 .../dockerjava/api/model/TaskStatus.java      |  2 +-
 .../api/model/TaskStatusContainerStatus.java  |  2 +-
 .../api/model/ThrottlingDataConfig.java       |  2 +-
 .../dockerjava/api/model/TmpfsOptions.java    |  2 +-
 .../github/dockerjava/api/model/Ulimit.java   |  2 +-
 .../dockerjava/api/model/UpdateConfig.java    |  2 +-
 .../github/dockerjava/api/model/Version.java  |  2 +-
 .../api/model/VersionComponent.java           |  2 +-
 .../dockerjava/api/model/VersionPlatform.java |  2 +-
 .../dockerjava/api/model/VolumeBind.java      |  5 +-
 .../dockerjava/api/model/VolumeBinds.java     |  2 +
 .../dockerjava/api/model/VolumeOptions.java   |  2 +-
 .../github/dockerjava/api/model/Volumes.java  |  2 +
 .../dockerjava/api/model/VolumesRW.java       |  2 +
 .../dockerjava/api/model/WaitResponse.java    |  6 +-
 .../api/model/DockerObjectArchTest.java       | 46 ++++++++++
 .../dockerjava/core/DockerClientConfig.java   | 84 ++++++++++++++++++-
 .../api/ModelsSerializableTest.java           | 10 ++-
 .../dockerjava/cmd/CreateContainerCmdIT.java  | 24 ++++++
 151 files changed, 472 insertions(+), 154 deletions(-)
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObject.java
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObjectAccessor.java
 create mode 100644 docker-java-api/src/test/java/com/github/dockerjava/api/model/DockerObjectArchTest.java

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index d147a4a45..92b46a613 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -41,6 +41,28 @@
 			<version>1.18.18</version>
 			<scope>provided</scope>
 		</dependency>
+
+
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>5.7.2</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.tngtech.archunit</groupId>
+			<artifactId>archunit-junit5</artifactId>
+			<version>0.18.0</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.tngtech.archunit</groupId>
+			<artifactId>archunit</artifactId>
+			<version>0.18.0</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java
index 273022b49..5836275ff 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateConfigResponse.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -9,7 +10,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class CreateConfigResponse {
+public class CreateConfigResponse extends DockerObject {
     @JsonProperty("ID")
     private String id;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
index b19f8c6ae..ad24d7ec8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -11,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class CreateContainerResponse {
+public class CreateContainerResponse extends DockerObject {
 
     @JsonProperty("Id")
     private String id;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
index 09b1929c0..53b2b5367 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -12,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class CreateImageResponse {
+public class CreateImageResponse extends DockerObject {
 
     @JsonProperty("status")
     private String id;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
index a816f3f3a..3f6f219e1 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
@@ -1,12 +1,13 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
 @EqualsAndHashCode
 @ToString
-public class CreateNetworkResponse {
+public class CreateNetworkResponse extends DockerObject {
 
     @JsonProperty("Id")
     private String id;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
index c9da4c3ba..2c1b6f11b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -9,7 +10,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class CreateSecretResponse {
+public class CreateSecretResponse extends DockerObject {
     @JsonProperty("ID")
     private String id;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
index 1cbd421b9..b68343f55 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -9,7 +10,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class CreateServiceResponse {
+public class CreateServiceResponse extends DockerObject {
     @JsonProperty("ID")
     private String id;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
index 9c31b8dc4..4afc6f6ba 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -12,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class CreateVolumeResponse {
+public class CreateVolumeResponse extends DockerObject {
 
     @JsonProperty("Name")
     private String name;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
index e751896de..449803236 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
@@ -1,12 +1,13 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
 @EqualsAndHashCode
 @ToString
-public class ExecCreateCmdResponse {
+public class ExecCreateCmdResponse extends DockerObject {
 
     @JsonProperty("Id")
     private String id;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java
index 7852e8d59..44abc176d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -12,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class GraphData {
+public class GraphData extends DockerObject {
 
     @JsonProperty("RootDir")
     private String rootDir;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
index 5ba4d456e..4d6679416 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -14,7 +15,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class GraphDriver {
+public class GraphDriver extends DockerObject {
     /**
      * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_21}
      */
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java
index cd7290785..0d8e399c1 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java
@@ -1,9 +1,15 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
 import java.util.List;
 
-public class HealthState {
+@EqualsAndHashCode
+@ToString
+public class HealthState extends DockerObject {
 
     @JsonProperty("Status")
     private String status;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
index d68dcb74f..71939f872 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
@@ -1,8 +1,13 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
-public class HealthStateLog {
+@EqualsAndHashCode
+@ToString
+public class HealthStateLog extends DockerObject {
 
     @JsonProperty("Start")
     private String start;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index 06e18fa21..05492c51f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.model.ContainerConfig;
+import com.github.dockerjava.api.model.DockerObject;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.NetworkSettings;
 import com.github.dockerjava.api.model.Volume;
@@ -24,7 +25,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class InspectContainerResponse {
+public class InspectContainerResponse extends DockerObject {
 
     @JsonProperty("Args")
     private String[] args;
@@ -251,7 +252,7 @@ public String getPlatform() {
 
     @EqualsAndHashCode
     @ToString
-    public class ContainerState {
+    public class ContainerState extends DockerObject {
 
         /**
          * @since {@link RemoteApiVersion#VERSION_1_20}
@@ -456,7 +457,7 @@ public HealthState getHealth() {
 
     @EqualsAndHashCode
     @ToString
-    public static class Mount {
+    public static class Mount extends DockerObject {
 
         /**
          * @since {@link RemoteApiVersion#VERSION_1_20}
@@ -581,7 +582,7 @@ public Mount withSource(String source) {
 
     @EqualsAndHashCode
     @ToString
-    public class Node {
+    public class Node extends DockerObject {
 
         @JsonProperty("ID")
         private String id;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
index 06d904dc8..307fdd873 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
@@ -3,6 +3,7 @@
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import com.github.dockerjava.api.model.NetworkSettings;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -11,7 +12,7 @@
 
 @EqualsAndHashCode
 @ToString
-public class InspectExecResponse {
+public class InspectExecResponse extends DockerObject {
     @JsonProperty("ID")
     private String id;
 
@@ -152,7 +153,7 @@ public Long getPidLong() {
 
     @EqualsAndHashCode
     @ToString
-    public class ProcessConfig {
+    public class ProcessConfig extends DockerObject {
 
         @JsonProperty("arguments")
         private List<String> arguments;
@@ -190,7 +191,9 @@ public String getUser() {
         }
     }
 
-    public class Container {
+    @EqualsAndHashCode
+    @ToString
+    public class Container extends DockerObject {
 
         @JsonProperty("NetworkSettings")
         private NetworkSettings networkSettings;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
index b8590bfc6..bf48ba8f0 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.model.ContainerConfig;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -15,7 +16,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class InspectImageResponse {
+public class InspectImageResponse extends DockerObject {
 
     @JsonProperty("Architecture")
     private String arch;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
index c819a6b32..bc0008817 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -12,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class InspectVolumeResponse {
+public class InspectVolumeResponse extends DockerObject {
 
     @JsonProperty("Name")
     private String name;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
index 4e1b449f8..7c434a48d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
@@ -3,6 +3,7 @@
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -12,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ListVolumesResponse {
+public class ListVolumesResponse extends DockerObject {
 
     @JsonProperty("Volumes")
     private List<InspectVolumeResponse> volumes;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java
index e4cc0ec54..c190852af 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -14,7 +15,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class RootFS {
+public class RootFS extends DockerObject {
 
     @JsonProperty("Type")
     private String type;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
index 6f7b1d49f..e604c20ae 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dockerjava.api.model.DockerObject;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
@@ -11,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class TopContainerResponse {
+public class TopContainerResponse extends DockerObject {
 
     @JsonProperty("Titles")
     private String[] titles;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
index 00db940df..cbb108571 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -9,7 +9,7 @@
 
 @EqualsAndHashCode
 @ToString(onlyExplicitlyIncluded = true)
-public class AuthConfig implements Serializable {
+public class AuthConfig extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
index baa8fc0b4..cbb7240f4 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
@@ -5,8 +5,12 @@
 import java.util.TreeMap;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
-public class AuthConfigurations implements Serializable {
+@EqualsAndHashCode
+@ToString
+public class AuthConfigurations extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("configs")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
index 89069fe54..0703cab68 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
@@ -1,18 +1,23 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import java.io.Serializable;
 
-public class AuthResponse implements Serializable {
+@EqualsAndHashCode
+@ToString(onlyExplicitlyIncluded = true)
+public class AuthResponse extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
      * @since 1.23
      */
     @JsonProperty("Status")
+    @ToString.Include
     private String status;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java
index f82e5d482..a7c8dba26 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.model;
 
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -9,7 +10,8 @@
  * The Bind can be in read only or read write access mode.
  */
 @EqualsAndHashCode
-public class Bind implements Serializable {
+@ToString
+public class Bind extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private String path;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java
index 340921f01..801e7719a 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java
@@ -11,7 +11,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class BindOptions implements Serializable {
+public class BindOptions extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java
index e26fc0d6f..300bcbf24 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java
@@ -8,7 +8,7 @@
 
 @EqualsAndHashCode
 @ToString
-public class BlkioRateDevice implements Serializable {
+public class BlkioRateDevice extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     @JsonProperty("Path")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java
index d47b2fe42..2fccabaa2 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java
@@ -12,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class BlkioStatEntry implements Serializable {
+public class BlkioStatEntry extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
     @JsonProperty("major")
     Long major;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
index 55479d024..5a7db4d8b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
@@ -15,7 +15,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class BlkioStatsConfig implements Serializable {
+public class BlkioStatsConfig extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("io_service_bytes_recursive")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java
index 24b4d87f5..3fd9704d8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java
@@ -8,7 +8,7 @@
 
 @EqualsAndHashCode
 @ToString
-public class BlkioWeightDevice implements Serializable {
+public class BlkioWeightDevice extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     @JsonProperty("Path")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
index 25ff14664..80356e55c 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
@@ -1,10 +1,14 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 /**
  * Represents a build response stream item
  */
+@EqualsAndHashCode
+@ToString
 public class BuildResponseItem extends ResponseItem {
     private static final long serialVersionUID = -1252904184236343612L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
index 922e2e2b3..c8a5be890 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ChangeLog implements Serializable {
+public class ChangeLog extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("Path")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
index 40055106b..b6e1e5566 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
@@ -16,7 +16,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ClusterInfo implements Serializable {
+public class ClusterInfo extends DockerObject implements Serializable {
 
     public static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Config.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Config.java
index 277526ec0..2c5b87aa8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Config.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Config.java
@@ -14,7 +14,7 @@
  */
 @ToString
 @EqualsAndHashCode
-public class Config implements Serializable {
+public class Config extends DockerObject implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ConfigSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ConfigSpec.java
index b89bdab35..62e525d0b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ConfigSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ConfigSpec.java
@@ -11,7 +11,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ConfigSpec implements Serializable {
+public class ConfigSpec extends DockerObject implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java
index e2723a96b..3b4bdf394 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java
@@ -17,7 +17,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class Container implements Serializable {
+public class Container extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("Command")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
index a84835277..db5437220 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
@@ -16,7 +16,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ContainerConfig implements Serializable {
+public class ContainerConfig extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("AttachStderr")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
index c60414f81..63d3cae11 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
@@ -14,7 +14,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ContainerDNSConfig implements Serializable {
+public class ContainerDNSConfig extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("Nameservers")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
index 590d22a92..cdc446282 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
@@ -14,7 +14,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ContainerHostConfig implements Serializable {
+public class ContainerHostConfig extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("NetworkMode")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
index 48b4c9f47..b8e53ae3b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ContainerMount implements Serializable {
+public class ContainerMount extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("Name")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
index 6433e15f6..823828900 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
@@ -20,7 +20,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ContainerNetwork implements Serializable {
+public class ContainerNetwork extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -283,7 +283,9 @@ public ContainerNetwork withNetworkID(String networkID) {
     /**
      * Docker named it EndpointIPAMConfig
      */
-    public static class Ipam implements Serializable {
+    @EqualsAndHashCode
+    @ToString
+    public static class Ipam extends DockerObject implements Serializable {
         private static final long serialVersionUID = 1L;
 
         @JsonProperty("IPv4Address")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
index 19e249e29..9e8381500 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
@@ -15,7 +15,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ContainerNetworkSettings implements Serializable {
+public class ContainerNetworkSettings extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
index b22aecc0e..35f9f6ab9 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ContainerPort implements Serializable {
+public class ContainerPort extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("IP")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
index 943d5eb14..d80d04316 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
@@ -16,7 +16,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ContainerSpec implements Serializable {
+public class ContainerSpec extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
index 274ad8f55..fbd93b606 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ContainerSpecConfig implements Serializable {
+public class ContainerSpecConfig extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
     @JsonProperty("File")
     private ContainerSpecFile file;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
index cf8471d7c..ac9ef4d81 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ContainerSpecFile implements Serializable {
+public class ContainerSpecFile extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("Name")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java
index a5bb69391..5d8d7cd55 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ContainerSpecPrivileges implements Serializable {
+public class ContainerSpecPrivileges extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("CredentialSpec")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java
index 8a4294f01..e6ca62fd4 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ContainerSpecPrivilegesCredential implements Serializable {
+public class ContainerSpecPrivilegesCredential extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
index c7fa68af8..d1b2cc15b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ContainerSpecPrivilegesSELinuxContext implements Serializable {
+public class ContainerSpecPrivilegesSELinuxContext extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
     @JsonProperty("Disable")
     private Boolean disable;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
index e92b2b07f..742272e16 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ContainerSpecSecret implements Serializable {
+public class ContainerSpecSecret extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("File")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
index fcd53b475..04d91c826 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
@@ -14,7 +14,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class CpuStatsConfig implements Serializable {
+public class CpuStatsConfig extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("cpu_usage")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
index 587c2d74b..f87afeec8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
@@ -15,7 +15,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class CpuUsageConfig implements Serializable {
+public class CpuUsageConfig extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("total_usage")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java
index 09223e52a..b6f16029e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java
@@ -14,7 +14,7 @@
 
 @EqualsAndHashCode
 @ToString
-public class Device implements Serializable {
+public class Device extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("CgroupPermissions")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DeviceRequest.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DeviceRequest.java
index 9f8942182..549d51b57 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DeviceRequest.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DeviceRequest.java
@@ -10,7 +10,7 @@
 
 @EqualsAndHashCode
 @ToString
-public class DeviceRequest implements Serializable {
+public class DeviceRequest extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     @JsonProperty("Driver")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java
index 0771fb180..80feee509 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java
@@ -2,6 +2,7 @@
 
 import java.io.Serializable;
 
+@Deprecated
 public class DiscreteResourceSpec extends GenericResource<String> implements Serializable {
     private static final long serialVersionUID = 1L;
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObject.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObject.java
new file mode 100644
index 000000000..463dc15a1
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObject.java
@@ -0,0 +1,20 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @see DockerObjectAccessor
+ */
+public abstract class DockerObject {
+
+    HashMap<String, Object> rawValues = new HashMap<>();
+
+    @JsonAnyGetter
+    public Map<String, Object> getRawValues() {
+        return Collections.unmodifiableMap(this.rawValues);
+    }
+}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObjectAccessor.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObjectAccessor.java
new file mode 100644
index 000000000..0827c4a34
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DockerObjectAccessor.java
@@ -0,0 +1,27 @@
+package com.github.dockerjava.api.model;
+
+import java.util.HashMap;
+
+public final class DockerObjectAccessor {
+
+    /**
+     * @deprecated not for public usage, unless you _really_ understand what you're doing
+     */
+    @Deprecated
+    public static void overrideRawValues(DockerObject o, HashMap<String, Object> rawValues) {
+        o.rawValues = rawValues != null ? rawValues : new HashMap<>();
+    }
+
+    /**
+     * This is an advanced method for setting raw values on the resulting object
+     * that will fully overwrite any previously set value for given key.
+     *
+     * Make sure to check Docker's API before using it.
+     */
+    public static void overrideRawValue(DockerObject o, String key, Object value) {
+        o.rawValues.put(key, value);
+    }
+
+    private DockerObjectAccessor() {
+    }
+}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java
index cde23cb2b..bdc05e53b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class Driver implements Serializable {
+public class Driver extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
index cca52f1d0..57fe32247 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
@@ -11,7 +11,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class DriverStatus implements Serializable {
+public class DriverStatus extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("Root Dir")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java
index eb6c982ed..cebbfea1c 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java
@@ -12,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class Endpoint implements Serializable {
+public class Endpoint extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
index 75b5056f0..c0ce386fa 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class EndpointSpec implements Serializable {
+public class EndpointSpec extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
index fad960fb7..0babfba4c 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
@@ -12,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class EndpointVirtualIP implements Serializable {
+public class EndpointVirtualIP extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
index 10c3310d1..63e670772 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
@@ -1,10 +1,14 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
-public class ErrorDetail implements Serializable {
+@EqualsAndHashCode
+@ToString
+public class ErrorDetail extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java
index 59ecc67bd..0eedbc553 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class Event implements Serializable {
+public class Event extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventActor.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventActor.java
index e05414d34..fbcf088f7 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventActor.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventActor.java
@@ -14,7 +14,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class EventActor implements Serializable {
+public class EventActor extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
index 9fb9910bd..6f5ae9ebd 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.List;
@@ -9,6 +10,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+@ToString
 public class ExposedPorts implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
index 95a80eb03..3a68410d8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ExternalCA implements Serializable {
+public class ExternalCA extends DockerObject implements Serializable {
 
     public static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Frame.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Frame.java
index 041e22423..fdd5dd62e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Frame.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Frame.java
@@ -8,7 +8,7 @@
  * Represents a logging frame.
  */
 @EqualsAndHashCode
-public class Frame implements Serializable {
+public class Frame extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private final StreamType streamType;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/GenericResource.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/GenericResource.java
index 9b994d8dd..f6ddfabe5 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/GenericResource.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/GenericResource.java
@@ -1,10 +1,14 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
-public abstract class GenericResource<T> implements Serializable {
+@EqualsAndHashCode
+@ToString
+public abstract class GenericResource<T> extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("Kind")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
index e21a0763f..24873a74f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
@@ -28,7 +28,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class HealthCheck implements Serializable {
+public class HealthCheck extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("Interval")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 0151076fd..974ac8920 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -19,7 +19,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class HostConfig implements Serializable {
+public class HostConfig extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private static final List<String> PREDEFINED_NETWORKS = Arrays.asList("bridge", "host", "none");
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java
index c214a8b16..a690548b4 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java
@@ -11,7 +11,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class Identifier implements Serializable {
+public class Identifier extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     public final Repository repository;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java
index 697cf13f2..732dcfe4f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java
@@ -15,7 +15,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class Image implements Serializable {
+public class Image extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("Created")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
index ffaee5794..0752778e3 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
@@ -16,7 +16,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class Info implements Serializable {
+public class Info extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
index 113a4af0a..80bf803d8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
@@ -14,7 +14,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public final class InfoRegistryConfig implements Serializable {
+public final class InfoRegistryConfig extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("IndexConfigs")
@@ -82,7 +82,7 @@ public InfoRegistryConfig withMirrors(Object mirrors) {
      */
     @EqualsAndHashCode
     @ToString
-    public static final class IndexConfig implements Serializable {
+    public static final class IndexConfig extends DockerObject implements Serializable {
         private static final long serialVersionUID = 1L;
 
         @JsonProperty("Mirrors")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Link.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Link.java
index 20b2c1b26..4b9b27acf 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Link.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Link.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.model;
 
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -10,7 +11,8 @@
  * variables in the target container as well as creating a network bridge between both containers.
  */
 @EqualsAndHashCode
-public class Link implements Serializable {
+@ToString
+public class Link extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private final String name;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java
index 2dd7c54fa..949663c7f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java
@@ -22,7 +22,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class LogConfig implements Serializable {
+public class LogConfig extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("Type")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java
index ddf1bbae0..36fc1a9cb 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java
@@ -1,10 +1,14 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
-public class LxcConf implements Serializable {
+@EqualsAndHashCode
+@ToString
+public class LxcConf extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("Key")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
index 5646cc07e..b57f05135 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
@@ -14,7 +14,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class MemoryStatsConfig implements Serializable {
+public class MemoryStatsConfig extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("stats")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java
index 7254ccb19..9bfe9b16e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java
@@ -12,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class Mount implements Serializable {
+public class Mount extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
index e06f69d01..198c75543 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
@@ -5,6 +5,7 @@
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
+@Deprecated
 public class NamedResourceSpec extends GenericResource<Integer> implements Serializable {
     private static final long serialVersionUID = 1L;
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
index 852746924..f6d989d3f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
@@ -12,7 +12,7 @@
 
 @EqualsAndHashCode
 @ToString
-public class Network implements Serializable {
+public class Network extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("Id")
@@ -94,7 +94,7 @@ public Map<String, String> getLabels() {
 
     @EqualsAndHashCode
     @ToString
-    public static class ContainerNetworkConfig implements Serializable {
+    public static class ContainerNetworkConfig extends DockerObject implements Serializable {
         private static final long serialVersionUID = 1L;
 
         @JsonProperty("EndpointID")
@@ -128,7 +128,7 @@ public String getIpv6Address() {
 
     @EqualsAndHashCode
     @ToString
-    public static class Ipam implements Serializable {
+    public static class Ipam extends DockerObject implements Serializable {
         private static final long serialVersionUID = 1L;
 
         @JsonProperty("Driver")
@@ -167,7 +167,9 @@ public Ipam withDriver(String driver) {
             return this;
         }
 
-        public static class Config implements Serializable {
+        @EqualsAndHashCode
+        @ToString
+        public static class Config extends DockerObject implements Serializable {
             private static final long serialVersionUID = 1L;
 
             @JsonProperty("Subnet")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
index 2afa87b73..db0eb1ded 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class NetworkAttachmentConfig implements Serializable {
+public class NetworkAttachmentConfig extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
index 3ef92ac64..e28d8f52c 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
@@ -17,7 +17,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class NetworkSettings implements Serializable {
+public class NetworkSettings extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("Bridge")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java
index 2b12ab48f..2bb832e48 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java
@@ -11,7 +11,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class Node implements Serializable {
+public class Node extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("Name")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
index 0b0259049..5fa361977 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 
@@ -13,7 +14,8 @@
  * same base version, only one of the requests can succeed. As a result, two separate update requests that
  * happen at the same time will not unintentionally overwrite each other.
  */
-public class ObjectVersion implements Serializable {
+@EqualsAndHashCode
+public class ObjectVersion extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("Index")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java
index e20af63b9..8937b9593 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java
@@ -12,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class PeerNode implements Serializable {
+public class PeerNode extends DockerObject implements Serializable {
 
     public static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java
index c3d13596f..df953e140 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java
@@ -1,6 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
@@ -10,7 +12,9 @@
  *
  * @author Yuting Liu
  */
-public class PidsStatsConfig implements Serializable {
+@EqualsAndHashCode
+@ToString
+public class PidsStatsConfig extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("current")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortBinding.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortBinding.java
index 47655079b..2b7901e92 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortBinding.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortBinding.java
@@ -17,7 +17,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class PortBinding implements Serializable {
+public class PortBinding extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private final Binding binding;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java
index 57f2f61b0..cec07d9cd 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java
@@ -12,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class PortConfig implements Serializable {
+public class PortConfig extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
index 897261a09..0411ca218 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
@@ -21,7 +21,6 @@
  * @see HostConfig#getPortBindings()
  * @see NetworkSettings#getPorts()
  */
-@SuppressWarnings(value = "checkstyle:equalshashcode")
 public class Ports implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -107,7 +106,7 @@ public Map<ExposedPort, Binding[]> getBindings() {
      * @see ExposedPort
      */
     @EqualsAndHashCode
-    public static class Binding implements Serializable {
+    public static class Binding extends DockerObject implements Serializable {
         private static final long serialVersionUID = 1L;
 
         /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java
index 3efaf47c1..2ccdf72c4 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java
@@ -11,7 +11,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class PruneResponse implements Serializable {
+public class PruneResponse extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("SpaceReclaimed")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java
index 750eb6f4d..5dd636981 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java
@@ -12,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class Repository implements Serializable {
+public class Repository extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     public final String name;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
index 463b22011..54e3001b8 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
@@ -12,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ResourceRequirements implements Serializable {
+public class ResourceRequirements extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
index 86ab24b52..00f2de7e1 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
@@ -12,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ResourceSpecs implements Serializable {
+public class ResourceSpecs extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
index 4838b78d7..babee6a50 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
@@ -12,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ResourceVersion implements Serializable {
+public class ResourceVersion extends DockerObject implements Serializable {
 
     public static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
index d0f797a71..cd90b78f3 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ResponseItem implements Serializable {
+public class ResponseItem extends DockerObject implements Serializable {
     private static final long serialVersionUID = -5187169652557467828L;
 
     @JsonProperty("stream")
@@ -118,7 +118,7 @@ public boolean isErrorIndicated() {
 
     @EqualsAndHashCode
     @ToString
-    public static class ProgressDetail implements Serializable {
+    public static class ProgressDetail extends DockerObject implements Serializable {
         private static final long serialVersionUID = -1954994695645715264L;
 
         @JsonProperty("current")
@@ -148,7 +148,7 @@ public Long getStart() {
 
     @EqualsAndHashCode
     @ToString
-    public static class ErrorDetail implements Serializable {
+    public static class ErrorDetail extends DockerObject implements Serializable {
         private static final long serialVersionUID = -9136704865403084083L;
 
         @JsonProperty("code")
@@ -170,7 +170,7 @@ public String getMessage() {
 
     @EqualsAndHashCode
     @ToString
-    public static class AuxDetail implements Serializable {
+    public static class AuxDetail extends DockerObject implements Serializable {
         private static final long serialVersionUID = 1L;
 
         @JsonProperty("Size")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
index 114d9f0d8..53453915c 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -27,7 +28,8 @@
  *
  */
 @EqualsAndHashCode
-public class RestartPolicy implements Serializable {
+@ToString
+public class RestartPolicy extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("MaximumRetryCount")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java
index a77f38053..23a5c3bbf 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class SearchItem implements Serializable {
+public class SearchItem extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("star_count")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java
index 20680f5fb..bfbd7caf4 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java
@@ -1,6 +1,8 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -10,7 +12,9 @@
  *
  * @since {@link RemoteApiVersion#VERSION_1_25}
  */
-public class Secret implements Serializable {
+@EqualsAndHashCode
+@ToString
+public class Secret extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
index 572c0c90e..6b10239b9 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
@@ -14,7 +14,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class SecretSpec implements Serializable {
+public class SecretSpec extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java
index 63b3b4757..fd76be259 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java
@@ -15,7 +15,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class Service implements Serializable {
+public class Service extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
index ccd9b4bea..37feec292 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
@@ -11,7 +11,7 @@
 @EqualsAndHashCode
 @ToString
 @SuppressWarnings("checkstyle:hideutilityclassconstructor")
-public class ServiceGlobalModeOptions implements Serializable {
+public class ServiceGlobalModeOptions extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     // Intentionally left blank, there are no options for this mode
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
index c179271bf..82d1b3b20 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
@@ -12,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ServiceModeConfig implements Serializable {
+public class ServiceModeConfig extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
index 777be8668..4c0953508 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ServicePlacement implements Serializable {
+public class ServicePlacement extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java
index c28a09370..eea2a5211 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java
@@ -11,7 +11,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ServiceReplicatedModeOptions implements Serializable {
+public class ServiceReplicatedModeOptions extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
index 8b55315e0..11b54f666 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
@@ -12,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ServiceRestartPolicy implements Serializable {
+public class ServiceRestartPolicy extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
index b5ca4a5dd..a1fbec916 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
@@ -14,7 +14,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ServiceSpec implements Serializable {
+public class ServiceSpec extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
index ee457d9f8..18cb54603 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ServiceUpdateStatus implements Serializable {
+public class ServiceUpdateStatus extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
index d22b6a787..2ba57d76b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
@@ -14,7 +14,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class StatisticNetworksConfig implements Serializable {
+public class StatisticNetworksConfig extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("rx_bytes")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java
index f28ea983a..3800363eb 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java
@@ -14,7 +14,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class Statistics implements Serializable {
+public class Statistics extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("read")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java
index add7f0d50..8afbc34d9 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java
@@ -9,7 +9,7 @@
 
 @EqualsAndHashCode
 @ToString
-public class StatsConfig implements Serializable {
+public class StatsConfig extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("active_anon")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
index 6f632aa1b..8ebc97ffd 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class SwarmCAConfig implements Serializable {
+public class SwarmCAConfig extends DockerObject implements Serializable {
 
     public static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
index bc8fd4305..2a45b84cd 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class SwarmDispatcherConfig implements Serializable {
+public class SwarmDispatcherConfig extends DockerObject implements Serializable {
 
     public static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
index 3fd8e8704..faed0fcf3 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class SwarmInfo implements Serializable {
+public class SwarmInfo extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
index 06b1f3a78..9e5f63aea 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
@@ -12,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class SwarmJoinTokens implements Serializable {
+public class SwarmJoinTokens extends DockerObject implements Serializable {
 
     public static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
index cdb17c20d..9b5aff96c 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
@@ -16,7 +16,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class SwarmNode implements Serializable {
+public class SwarmNode extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
index d0c35c873..f929327d1 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
@@ -12,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class SwarmNodeDescription implements Serializable {
+public class SwarmNodeDescription extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
index 41c369d09..a2f38531e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
@@ -14,7 +14,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class SwarmNodeEngineDescription implements Serializable {
+public class SwarmNodeEngineDescription extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
index 07a0e448b..0307d18e7 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class SwarmNodeManagerStatus implements Serializable {
+public class SwarmNodeManagerStatus extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
index 3b3747d5f..9688f10b0 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class SwarmNodePlatform implements Serializable {
+public class SwarmNodePlatform extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
index d05bfb9c9..aa051aaa3 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class SwarmNodePluginDescription implements Serializable {
+public class SwarmNodePluginDescription extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
index 05f6d0203..c9586e921 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class SwarmNodeResources implements Serializable {
+public class SwarmNodeResources extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
index 5162bdff7..241c2be58 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
@@ -14,7 +14,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class SwarmNodeSpec implements Serializable {
+public class SwarmNodeSpec extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
index 804efe2f1..34f40e80b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class SwarmNodeStatus implements Serializable {
+public class SwarmNodeStatus extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
index 35cbba491..4182c120e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
@@ -14,7 +14,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class SwarmNodeVersion implements Serializable {
+public class SwarmNodeVersion extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
index 60cc1f32d..0479a3a6c 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
@@ -12,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class SwarmOrchestration implements Serializable {
+public class SwarmOrchestration extends DockerObject implements Serializable {
 
     public static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
index 16553defc..69138ed2d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
@@ -12,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class SwarmRaftConfig implements Serializable {
+public class SwarmRaftConfig extends DockerObject implements Serializable {
 
     public static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
index bbc8f6db6..ee041a2a7 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class SwarmSpec implements Serializable {
+public class SwarmSpec extends DockerObject implements Serializable {
 
     public static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
index 2d7fc3e43..161c0d7e5 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
@@ -12,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class SwarmVersion implements Serializable {
+public class SwarmVersion extends DockerObject implements Serializable {
 
     public static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java
index 46585eed8..0f1e77a2a 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class Task implements Serializable {
+public class Task extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("ID")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
index c385bd1b9..ae03c2136 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class TaskDefaults implements Serializable {
+public class TaskDefaults extends DockerObject implements Serializable {
 
     public static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
index bef5e579d..c60ca3b8d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
@@ -13,7 +13,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class TaskSpec implements Serializable {
+public class TaskSpec extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
index a335350e4..9ae2a72ad 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
@@ -11,7 +11,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class TaskStatus implements Serializable {
+public class TaskStatus extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("Timestamp")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
index 0349e301f..1f6f61d1d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
@@ -11,7 +11,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class TaskStatusContainerStatus implements Serializable {
+public class TaskStatusContainerStatus extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("ContainerID")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
index ed4d53bb5..e908ce8de 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
@@ -14,7 +14,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class ThrottlingDataConfig implements Serializable {
+public class ThrottlingDataConfig extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("periods")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
index b2dc02a30..e64adaac2 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
@@ -11,7 +11,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class TmpfsOptions implements Serializable {
+public class TmpfsOptions extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
     @JsonProperty("SizeBytes")
     //The size for the tmpfs mount in bytes.
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java
index ab21cb36f..24dbd764e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java
@@ -17,7 +17,7 @@
 @JsonPropertyOrder({"Name", "Soft", "Hard"})
 @EqualsAndHashCode
 @ToString
-public class Ulimit implements Serializable {
+public class Ulimit extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("Name")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
index ee5d4a740..a70e137a9 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
@@ -12,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class UpdateConfig implements Serializable {
+public class UpdateConfig extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java
index 2ac89e88b..1a05726fc 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java
@@ -17,7 +17,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class Version implements Serializable {
+public class Version extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("ApiVersion")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
index bee6774ba..9a9fb9071 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
@@ -16,7 +16,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class VersionComponent implements Serializable {
+public class VersionComponent extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     @JsonProperty("Details")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
index 96b389ef6..72d29a44b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
@@ -15,7 +15,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class VersionPlatform implements Serializable {
+public class VersionPlatform extends DockerObject implements Serializable {
     public static final long serialVersionUID = 1L;
 
     @JsonProperty("Name")
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBind.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBind.java
index f78fc587e..93c106070 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBind.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBind.java
@@ -1,8 +1,11 @@
 package com.github.dockerjava.api.model;
 
+import lombok.EqualsAndHashCode;
+
 import java.io.Serializable;
 
-public class VolumeBind implements Serializable {
+@EqualsAndHashCode
+public class VolumeBind extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private final String hostPath;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
index 6de15ee38..1fbc0ca12 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
@@ -7,7 +7,9 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.ToString;
 
+@ToString
 public class VolumeBinds implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java
index f0d98fc25..740ffcd51 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java
@@ -12,7 +12,7 @@
  */
 @EqualsAndHashCode
 @ToString
-public class VolumeOptions implements Serializable {
+public class VolumeOptions extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java
index 2badd1ca8..825b8481a 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java
@@ -8,7 +8,9 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.ToString;
 
+@ToString
 public class Volumes implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
index 8afd3e230..93e95b68c 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
@@ -7,8 +7,10 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.ToString;
 
 // This is not going to be serialized
+@ToString
 public class VolumesRW implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
index d80343057..eed22870f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
@@ -1,13 +1,17 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
 /**
  * Represents a wait container command response
  */
-public class WaitResponse implements Serializable {
+@EqualsAndHashCode
+@ToString
+public class WaitResponse extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @JsonProperty("StatusCode")
diff --git a/docker-java-api/src/test/java/com/github/dockerjava/api/model/DockerObjectArchTest.java b/docker-java-api/src/test/java/com/github/dockerjava/api/model/DockerObjectArchTest.java
new file mode 100644
index 000000000..2df7051e9
--- /dev/null
+++ b/docker-java-api/src/test/java/com/github/dockerjava/api/model/DockerObjectArchTest.java
@@ -0,0 +1,46 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.CreateConfigResponse;
+import com.github.dockerjava.api.command.DockerCmdExecFactory;
+import com.tngtech.archunit.base.DescribedPredicate;
+import com.tngtech.archunit.core.domain.JavaClass;
+import com.tngtech.archunit.core.domain.JavaClasses;
+import com.tngtech.archunit.core.importer.ClassFileImporter;
+import com.tngtech.archunit.core.importer.ImportOption;
+import org.junit.jupiter.api.Test;
+
+import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
+
+class DockerObjectArchTest {
+
+    static JavaClasses CLASSES = new ClassFileImporter()
+        .withImportOption(ImportOption.Predefined.DO_NOT_INCLUDE_TESTS)
+        .withImportOption(ImportOption.Predefined.DO_NOT_INCLUDE_JARS)
+        .importPackagesOf(
+            Container.class,
+            CreateConfigResponse.class
+        );
+
+    @Test
+    void modelClassMustExtendDockerObject() {
+        classes()
+            .that().areNotEnums()
+            .and().areNotInterfaces()
+            .and().areNotAnnotatedWith(Deprecated.class)
+            .and().doNotImplement(ResultCallback.class)
+            .and().doNotImplement(DockerCmdExecFactory.class)
+            .and().doNotBelongToAnyOf(DockerObjectAccessor.class)
+            .and(new DescribedPredicate<JavaClass>("not @JsonCreator-based object") {
+                @Override
+                public boolean apply(JavaClass input) {
+                    return input.getAllMethods().stream().noneMatch(method -> {
+                        return method.isAnnotatedWith(JsonCreator.class);
+                    });
+                }
+            })
+            .should().beAssignableTo(DockerObject.class)
+            .check(CLASSES);
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index 67539f00c..f8bbf8bed 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -3,13 +3,26 @@
  */
 package com.github.dockerjava.core;
 
-import java.net.URI;
-
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.BeanDescription;
+import com.fasterxml.jackson.databind.DeserializationConfig;
+import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier;
+import com.fasterxml.jackson.databind.deser.std.DelegatingDeserializer;
+import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
+import com.github.dockerjava.api.model.DockerObject;
+import com.github.dockerjava.api.model.DockerObjectAccessor;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.HashMap;
 
 /**
  * Interface that describes the docker client configuration.
@@ -57,7 +70,74 @@ enum DefaultObjectMapperHolder {
             .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
             .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
 
+    {
+        ObjectMapper originalObjectMapper = objectMapper.copy();
+        objectMapper.registerModule(new SimpleModule("docker-java") {
+            @Override
+            public void setupModule(SetupContext context) {
+                super.setupModule(context);
+                context.addBeanDeserializerModifier(new BeanDeserializerModifier() {
+                    @Override
+                    public JsonDeserializer<?> modifyDeserializer(
+                        DeserializationConfig config,
+                        BeanDescription beanDescription,
+                        JsonDeserializer<?> originalDeserializer
+                    ) {
+                        if (!beanDescription.getType().isTypeOrSubTypeOf(DockerObject.class)) {
+                            return originalDeserializer;
+                        }
+
+                        return new DockerObjectDeserializer(
+                            originalDeserializer,
+                            beanDescription,
+                            originalObjectMapper
+                        );
+                    }
+                });
+            }
+        });
+    }
+
     public ObjectMapper getObjectMapper() {
         return objectMapper;
     }
 }
+
+class DockerObjectDeserializer extends DelegatingDeserializer {
+
+    private final BeanDescription beanDescription;
+
+    private final ObjectMapper originalMapper;
+
+    DockerObjectDeserializer(
+        JsonDeserializer<?> delegate,
+        BeanDescription beanDescription,
+        ObjectMapper originalMapper
+    ) {
+        super(delegate);
+        this.beanDescription = beanDescription;
+        this.originalMapper = originalMapper;
+    }
+
+    @Override
+    protected JsonDeserializer<?> newDelegatingInstance(JsonDeserializer<?> newDelegatee) {
+        return new DockerObjectDeserializer(newDelegatee, beanDescription, originalMapper);
+    }
+
+    @Override
+    @SuppressWarnings({"deprecation", "unchecked"})
+    public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+        JsonNode jsonNode = ctxt.readTree(p);
+
+        Object deserializedObject = originalMapper.treeToValue(jsonNode, beanDescription.getBeanClass());
+
+        if (deserializedObject instanceof DockerObject) {
+            DockerObjectAccessor.overrideRawValues(
+                ((DockerObject) deserializedObject),
+                originalMapper.convertValue(jsonNode, HashMap.class)
+            );
+        }
+
+        return deserializedObject;
+    }
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java b/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java
index 183121a3d..18bc76ea8 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java
@@ -2,6 +2,8 @@
 
 import com.github.dockerjava.api.model.Binds;
 import com.github.dockerjava.api.model.BuildResponseItem;
+import com.github.dockerjava.api.model.DockerObject;
+import com.github.dockerjava.api.model.DockerObjectAccessor;
 import com.github.dockerjava.api.model.PullResponseItem;
 import com.github.dockerjava.api.model.PushResponseItem;
 import com.github.dockerjava.api.model.ResponseItem;
@@ -24,6 +26,8 @@
 import static org.hamcrest.object.IsCompatibleType.typeCompatibleWith;
 
 /**
+ * TODO use ArchUnit
+ *
  * @author Kanstantsin Shautsou
  */
 public class ModelsSerializableTest {
@@ -47,7 +51,11 @@ public void allModelsSerializable() throws IOException, NoSuchFieldException, Il
                 continue;
             }
 
-            if (classInfo.getName().endsWith("Test")) {
+            if (
+                classInfo.getName().endsWith("Test")
+                    || DockerObject.class.getName().equals(classInfo.getName())
+                    || DockerObjectAccessor.class.getName().equals(classInfo.getName())
+            ) {
                 continue;
             }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index 365b56275..b70d6fc08 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -13,6 +13,7 @@
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.ContainerNetwork;
 import com.github.dockerjava.api.model.Device;
+import com.github.dockerjava.api.model.DockerObjectAccessor;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.HostConfig;
@@ -1084,4 +1085,27 @@ public void createContainerWithNanoCPUs() throws DockerException {
 
         assertThat(inspectContainerResponse.getHostConfig().getNanoCPUs(), is(nanoCPUs));
     }
+
+    @Test
+    public void overrideHostConfigWithRawValues() {
+        HostConfig hostConfig = new HostConfig()
+            .withNanoCPUs(1_000_000_000L);
+
+        DockerObjectAccessor.overrideRawValue(
+            hostConfig,
+            "NanoCPUs",
+            500_000_000L
+        );
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+            .withCmd("sleep", "9999")
+            .withHostConfig(hostConfig)
+            .exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getHostConfig().getNanoCPUs(), is(500_000_000L));
+    }
 }

From 5c6ac2581452217686ee3c898affb7984eb01655 Mon Sep 17 00:00:00 2001
From: Dimukhametov Maksim <dmmax.me@gmail.com>
Date: Thu, 17 Jun 2021 16:55:00 +0200
Subject: [PATCH 1075/1272] Allow overriding timeouts of Apache HttpClient5
 transport (#1617)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

– Provided two new parameters (Connection/Response timeouts) for Apache HttpClient5
– Updated getting started page to show how to use it
---
 .../httpclient5/ApacheDockerHttpClient.java   | 22 +++++++++++++---
 .../ApacheDockerHttpClientImpl.java           | 16 +++++++++++-
 .../httpclient5/ZerodepDockerHttpClient.java  | 25 +++++++++++++++----
 docs/getting_started.md                       |  2 ++
 4 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java
index 2c1890f80..68e0eeddf 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClient.java
@@ -3,6 +3,7 @@
 import com.github.dockerjava.transport.SSLConfig;
 
 import java.net.URI;
+import java.time.Duration;
 import java.util.Objects;
 
 public final class ApacheDockerHttpClient extends ApacheDockerHttpClientImpl {
@@ -15,6 +16,10 @@ public static final class Builder {
 
         private int maxConnections = Integer.MAX_VALUE;
 
+        private Duration connectionTimeout;
+
+        private Duration responseTimeout;
+
         public Builder dockerHost(URI value) {
             this.dockerHost = Objects.requireNonNull(value, "dockerHost");
             return this;
@@ -30,13 +35,24 @@ public Builder maxConnections(int value) {
             return this;
         }
 
+        public Builder connectionTimeout(Duration connectionTimeout) {
+            this.connectionTimeout = connectionTimeout;
+            return this;
+        }
+
+        public Builder responseTimeout(Duration responseTimeout) {
+            this.responseTimeout = responseTimeout;
+            return this;
+        }
+
         public ApacheDockerHttpClient build() {
             Objects.requireNonNull(dockerHost, "dockerHost");
-            return new ApacheDockerHttpClient(dockerHost, sslConfig, maxConnections);
+            return new ApacheDockerHttpClient(dockerHost, sslConfig, maxConnections, connectionTimeout, responseTimeout);
         }
     }
 
-    private ApacheDockerHttpClient(URI dockerHost, SSLConfig sslConfig, int maxConnections) {
-        super(dockerHost, sslConfig, maxConnections);
+    private ApacheDockerHttpClient(URI dockerHost, SSLConfig sslConfig, int maxConnections, Duration connectionTimeout,
+        Duration responseTimeout) {
+        super(dockerHost, sslConfig, maxConnections, connectionTimeout, responseTimeout);
     }
 }
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
index 174270f1e..c3fbc6755 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
@@ -5,6 +5,7 @@
 import com.github.dockerjava.transport.NamedPipeSocket;
 import com.github.dockerjava.transport.SSLConfig;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
+import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
 import org.apache.hc.client5.http.impl.classic.HttpClients;
@@ -36,8 +37,10 @@
 import java.io.InputStream;
 import java.net.Socket;
 import java.net.URI;
+import java.time.Duration;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -49,7 +52,9 @@ class ApacheDockerHttpClientImpl implements DockerHttpClient {
     protected ApacheDockerHttpClientImpl(
         URI dockerHost,
         SSLConfig sslConfig,
-        int maxConnections
+        int maxConnections,
+        Duration connectionTimeout,
+        Duration responseTimeout
     ) {
         Registry<ConnectionSocketFactory> socketFactoryRegistry = createConnectionSocketFactoryRegistry(sslConfig, dockerHost);
 
@@ -90,9 +95,18 @@ protected ApacheDockerHttpClientImpl(
         );
         connectionManager.setMaxTotal(maxConnections);
         connectionManager.setDefaultMaxPerRoute(maxConnections);
+        RequestConfig.Builder defaultRequest = RequestConfig.custom();
+        if (connectionTimeout != null) {
+            defaultRequest.setConnectTimeout(connectionTimeout.toNanos(), TimeUnit.NANOSECONDS);
+        }
+        if (responseTimeout != null) {
+            defaultRequest.setResponseTimeout(responseTimeout.toNanos(), TimeUnit.NANOSECONDS);
+        }
+
         httpClient = HttpClients.custom()
             .setRequestExecutor(new HijackingHttpRequestExecutor(null))
             .setConnectionManager(connectionManager)
+            .setDefaultRequestConfig(defaultRequest.build())
             .disableConnectionState()
             .build();
     }
diff --git a/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java b/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java
index a0d2abaaf..fcacc6d1b 100644
--- a/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java
+++ b/docker-java-transport-zerodep/src/main/java/com/github/dockerjava/httpclient5/ZerodepDockerHttpClient.java
@@ -1,9 +1,9 @@
 package com.github.dockerjava.httpclient5;
 
-import com.github.dockerjava.transport.SSLConfig;
-
 import java.net.URI;
+import java.time.Duration;
 import java.util.Objects;
+import com.github.dockerjava.transport.SSLConfig;
 
 @SuppressWarnings("unused")
 public final class ZerodepDockerHttpClient extends ApacheDockerHttpClientImpl {
@@ -16,6 +16,10 @@ public static final class Builder {
 
         private int maxConnections = Integer.MAX_VALUE;
 
+        private Duration connectionTimeout;
+
+        private Duration responseTimeout;
+
         public Builder dockerHost(URI value) {
             this.dockerHost = Objects.requireNonNull(value, "dockerHost");
             return this;
@@ -31,13 +35,24 @@ public Builder maxConnections(int value) {
             return this;
         }
 
+        public Builder connectionTimeout(Duration connectionTimeout) {
+            this.connectionTimeout = connectionTimeout;
+            return this;
+        }
+
+        public Builder responseTimeout(Duration responseTimeout) {
+            this.responseTimeout = responseTimeout;
+            return this;
+        }
+
         public ZerodepDockerHttpClient build() {
             Objects.requireNonNull(dockerHost, "dockerHost");
-            return new ZerodepDockerHttpClient(dockerHost, sslConfig, maxConnections);
+            return new ZerodepDockerHttpClient(dockerHost, sslConfig, maxConnections, connectionTimeout, responseTimeout);
         }
     }
 
-    protected ZerodepDockerHttpClient(URI dockerHost, SSLConfig sslConfig, int maxConnections) {
-        super(dockerHost, sslConfig, maxConnections);
+    private ZerodepDockerHttpClient(URI dockerHost, SSLConfig sslConfig, int maxConnections, Duration connectionTimeout,
+        Duration responseTimeout) {
+        super(dockerHost, sslConfig, maxConnections, connectionTimeout, responseTimeout);
     }
 }
diff --git a/docs/getting_started.md b/docs/getting_started.md
index c389fba71..012b721d4 100644
--- a/docs/getting_started.md
+++ b/docs/getting_started.md
@@ -91,6 +91,8 @@ DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder()
     .dockerHost(config.getDockerHost())
     .sslConfig(config.getSSLConfig())
     .maxConnections(100)
+    .connectionTimeout(Duration.ofSeconds(30))
+    .responseTimeout(Duration.ofSeconds(45))
     .build();
 ```
 

From 777639af1d8d20d11816e26e8e0551d4feb2e98b Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 17 Jun 2021 18:28:56 +0200
Subject: [PATCH 1076/1272] Ensure the compatibility with old (2.8.8) Jackson
 versions (#1652)

---
 .../dockerjava/core/DockerClientConfig.java     |  2 +-
 docker-java/pom.xml                             | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index f8bbf8bed..e3961661a 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -127,7 +127,7 @@ protected JsonDeserializer<?> newDelegatingInstance(JsonDeserializer<?> newDeleg
     @Override
     @SuppressWarnings({"deprecation", "unchecked"})
     public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
-        JsonNode jsonNode = ctxt.readTree(p);
+        JsonNode jsonNode = p.readValueAsTree();
 
         Object deserializedObject = originalMapper.treeToValue(jsonNode, beanDescription.getBeanClass());
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 194c08ce2..b9db85b9c 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -115,6 +115,23 @@
 			<groupId>org.awaitility</groupId>
 			<artifactId>awaitility</artifactId>
 			<version>4.0.1</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<!-- Force the version to 2.8.8 to ensure the compatibility with old projects -->
+			<version>2.8.8</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<!-- Force the version to 2.8.8 to ensure the compatibility with old projects -->
+			<version>2.8.8</version>
+			<scope>test</scope>
 		</dependency>
 
 		<dependency>

From 6a44f43963e4e96979539b99d6291779a6525d84 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 17 Jun 2021 20:19:17 +0200
Subject: [PATCH 1077/1272] skip tests on release

Since the main branch is already tested, there is no point in re-running the same tests.
---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index af27a5718..9f0acaa02 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,4 +21,4 @@ jobs:
       - name: Deploy with Maven
         env:
           MAVEN_DEPLOYMENT_REPOSITORY: ${{ secrets.MAVEN_DEPLOYMENT_REPOSITORY }}
-        run: ./mvnw deploy -DaltReleaseDeploymentRepository="$MAVEN_DEPLOYMENT_REPOSITORY"
+        run: ./mvnw deploy -DaltReleaseDeploymentRepository="$MAVEN_DEPLOYMENT_REPOSITORY" -DskipTests

From 3c287ec8bc7b099e137f56b5c7aecf11f0e16ee3 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 29 Jun 2021 11:44:54 +0200
Subject: [PATCH 1078/1272] Make #1638 less breaking by implementing
 getPlatform (#1661)

---
 .../com/github/dockerjava/api/command/CreateContainerCmd.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 5da8be6f6..fba83f50c 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -1007,7 +1007,9 @@ default CreateContainerCmd withUlimits(List<Ulimit> ulimits) {
     }
 
     @CheckForNull
-    String getPlatform();
+    default String getPlatform() {
+        return null;
+    }
 
     CreateContainerCmd withPlatform(String platform);
 

From 0047efcc99053f1937333f8a5220a284ec8f92c4 Mon Sep 17 00:00:00 2001
From: david-cooke <cookedavid637@gmail.com>
Date: Wed, 28 Jul 2021 10:01:14 +0100
Subject: [PATCH 1079/1272] Fix typo in CreateNetworkCmd (#1680)

---
 .../com/github/dockerjava/api/command/CreateNetworkCmd.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
index 544ac2083..56b9df17a 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
@@ -47,7 +47,7 @@ public interface CreateNetworkCmd extends SyncDockerCmd<CreateNetworkResponse> {
     /** Name of the network driver to use. Defaults to <code>bridge</code>. */
     CreateNetworkCmd withDriver(String driver);
 
-    /** Ipam config, such es subnet, gateway and ip range of the network */
+    /** Ipam config, such as subnet, gateway and ip range of the network */
     CreateNetworkCmd withIpam(Ipam ipam);
 
     /** Driver specific options */

From e6f4adebf940e3dd4443e4d87fc120f4c6ecc0b1 Mon Sep 17 00:00:00 2001
From: Kevin Wittek <kiview@users.noreply.github.com>
Date: Mon, 23 Aug 2021 22:58:08 +0200
Subject: [PATCH 1080/1272] Add
 `DefaultDockerClientConfig.Builder#isDockerHostSetExplicitly` (#1692)

---
 .../core/DefaultDockerClientConfig.java       | 19 ++++++--
 .../core/DefaultDockerClientConfigTest.java   | 44 ++++++++++++++++++-
 2 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index 274363fac..6c7c907c4 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -58,6 +58,8 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf
 
     static final Properties DEFAULT_PROPERTIES = new Properties();
 
+    static final String DEFAULT_DOCKER_HOST = "unix:///var/run/docker.sock";
+
     static {
         CONFIG_KEYS.add(DOCKER_HOST);
         CONFIG_KEYS.add(DOCKER_TLS_VERIFY);
@@ -69,7 +71,6 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf
         CONFIG_KEYS.add(REGISTRY_EMAIL);
         CONFIG_KEYS.add(REGISTRY_URL);
 
-        DEFAULT_PROPERTIES.put(DOCKER_HOST, "unix:///var/run/docker.sock");
         DEFAULT_PROPERTIES.put(DOCKER_CONFIG, "${user.home}/.docker");
         DEFAULT_PROPERTIES.put(REGISTRY_URL, "https://index.docker.io/v1/");
         DEFAULT_PROPERTIES.put(REGISTRY_USERNAME, "${user.name}");
@@ -337,8 +338,12 @@ public static class Builder {
          * registry.email, DOCKER_CERT_PATH, and DOCKER_CONFIG.
          */
         public Builder withProperties(Properties p) {
-            return withDockerHost(p.getProperty(DOCKER_HOST))
-                    .withDockerTlsVerify(p.getProperty(DOCKER_TLS_VERIFY))
+
+            if (p.getProperty(DOCKER_HOST) != null) {
+                withDockerHost(p.getProperty(DOCKER_HOST));
+            }
+
+            return withDockerTlsVerify(p.getProperty(DOCKER_TLS_VERIFY))
                     .withDockerConfig(p.getProperty(DOCKER_CONFIG))
                     .withDockerCertPath(p.getProperty(DOCKER_CERT_PATH))
                     .withApiVersion(p.getProperty(API_VERSION))
@@ -412,6 +417,10 @@ public final Builder withDockerTlsVerify(Boolean dockerTlsVerify) {
             return this;
         }
 
+        public final boolean isDockerHostSetExplicitly() {
+            return dockerHost != null;
+        }
+
         /**
          * Overrides the default {@link SSLConfig} that is used when calling {@link Builder#withDockerTlsVerify(java.lang.Boolean)} and
          * {@link Builder#withDockerCertPath(String)}. This way it is possible to pass a custom {@link SSLConfig} to the resulting
@@ -435,7 +444,9 @@ public DefaultDockerClientConfig build() {
                 sslConfig = customSslConfig;
             }
 
-            return new DefaultDockerClientConfig(dockerHost, dockerConfig, apiVersion, registryUrl, registryUsername,
+            URI dockerHostUri = (dockerHost != null) ? dockerHost : URI.create(DEFAULT_DOCKER_HOST);
+
+            return new DefaultDockerClientConfig(dockerHostUri, dockerConfig, apiVersion, registryUrl, registryUsername,
                     registryPassword, registryEmail, sslConfig);
         }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
index 83568edf1..f7964f0dd 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
@@ -98,8 +98,8 @@ public void emptyHost() {
         DefaultDockerClientConfig config = buildConfig(env, new Properties());
 
         assertEquals(
-            config.getDockerHost().toString(),
-            DefaultDockerClientConfig.DEFAULT_PROPERTIES.get(DefaultDockerClientConfig.DOCKER_HOST)
+            DefaultDockerClientConfig.DEFAULT_DOCKER_HOST,
+            config.getDockerHost().toString()
         );
     }
 
@@ -224,6 +224,46 @@ public void withDockerTlsVerify() throws Exception {
         assertThat((Boolean) field.get(builder), is(true));
     }
 
+    @Test
+    public void dockerHostSetExplicitlyOnSetter() {
+        DefaultDockerClientConfig.Builder builder = DefaultDockerClientConfig.createDefaultConfigBuilder(Collections.emptyMap(), new Properties());
+        assertThat(builder.isDockerHostSetExplicitly(), is(false));
+
+        builder.withDockerHost("tcp://foo");
+        assertThat(builder.isDockerHostSetExplicitly(), is(true));
+    }
+
+    @Test
+    public void dockerHostSetExplicitlyOnSystemProperty() {
+        Properties systemProperties = new Properties();
+        systemProperties.put(DefaultDockerClientConfig.DOCKER_HOST, "tcp://foo");
+
+        DefaultDockerClientConfig.Builder builder =  DefaultDockerClientConfig.createDefaultConfigBuilder(Collections.emptyMap(), systemProperties);
+
+        assertThat(builder.isDockerHostSetExplicitly(), is(true));
+    }
+
+    @Test
+    public void dockerHostSetExplicitlyOnEnv() {
+        Map<String, String> env = new HashMap<>();
+        env.put(DefaultDockerClientConfig.DOCKER_HOST, "tcp://foo");
+
+        DefaultDockerClientConfig.Builder builder =  DefaultDockerClientConfig.createDefaultConfigBuilder(env, new Properties());
+
+        assertThat(builder.isDockerHostSetExplicitly(), is(true));
+    }
+
+    @Test
+    public void dockerHostSetExplicitlyIfSetToDefaultByUser() {
+        Map<String, String> env = new HashMap<>();
+        env.put(DefaultDockerClientConfig.DOCKER_HOST, DefaultDockerClientConfig.DEFAULT_DOCKER_HOST);
+
+        DefaultDockerClientConfig.Builder builder =  DefaultDockerClientConfig.createDefaultConfigBuilder(env, new Properties());
+
+        assertThat(builder.isDockerHostSetExplicitly(), is(true));
+    }
+
+
     @Test
     public void testGetAuthConfigurationsFromDockerCfg() throws URISyntaxException {
         File cfgFile = new File(Resources.getResource("com.github.dockerjava.core/registry.v1").toURI());

From 28e32b0aca77ef71958eec3ad75212e1bd2dcfdf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 26 Aug 2021 07:44:53 +0200
Subject: [PATCH 1081/1272] Bump commons-compress from 1.20 to 1.21 (#1674)

Bumps commons-compress from 1.20 to 1.21.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-compress
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ec6115158..213c88b5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
 		<jackson.version>2.10.3</jackson.version>
 		<jackson-jaxrs.version>2.10.3</jackson-jaxrs.version>
 		<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
-		<commons-compress.version>1.20</commons-compress.version>
+		<commons-compress.version>1.21</commons-compress.version>
 		<commons-codec.version>1.11</commons-codec.version>
 		<commons-io.version>2.6</commons-io.version>
 		<commons-lang.version>2.6</commons-lang.version>

From b53872b3459fcb310a56ba0a919dd21b4f98d9df Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 9 Sep 2021 10:24:24 +0200
Subject: [PATCH 1082/1272] Update DomainSocket.java

---
 .../main/java/com/github/dockerjava/transport/DomainSocket.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java
index ff77c3830..a2a3503f5 100644
--- a/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java
+++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java
@@ -130,7 +130,9 @@ public void close() throws IOException {
      * @param path the path to the domain socket
      * @return a {@link DomainSocket} instance
      * @throws IOException if the socket cannot be opened
+     * @deprecated use {@link UnixSocket#get(String)}
      */
+    @Deprecated
     public static DomainSocket get(String path) throws IOException {
         if (Platform.isMac() || isBsdPlatform()) {
             return new BsdDomainSocket(path);

From b1430f31686be25f76616e961dda137c16a0c621 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 9 Sep 2021 10:27:26 +0200
Subject: [PATCH 1083/1272] Revert "Update DomainSocket.java"

This reverts commit b53872b3459fcb310a56ba0a919dd21b4f98d9df.
---
 .../main/java/com/github/dockerjava/transport/DomainSocket.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java
index a2a3503f5..ff77c3830 100644
--- a/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java
+++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java
@@ -130,9 +130,7 @@ public void close() throws IOException {
      * @param path the path to the domain socket
      * @return a {@link DomainSocket} instance
      * @throws IOException if the socket cannot be opened
-     * @deprecated use {@link UnixSocket#get(String)}
      */
-    @Deprecated
     public static DomainSocket get(String path) throws IOException {
         if (Platform.isMac() || isBsdPlatform()) {
             return new BsdDomainSocket(path);

From dd1735831f12f787070b667d33ac1c4103630c95 Mon Sep 17 00:00:00 2001
From: Clayton Walker <clayton.m.walker@gmail.com>
Date: Thu, 9 Sep 2021 03:55:52 -0600
Subject: [PATCH 1084/1272] Add java16 unix socket support (#1627)

* Add java16 unix socket support

* Update docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java

* Update ApacheDockerHttpClientImpl.java

* Use UnixSocket in OkHttp as well

* Update UnixSocket.java

* Update DomainSocket.java

* Update UnixSocket.java

Co-authored-by: Clayton Walker <cwalker@sofi.org>
Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../ApacheDockerHttpClientImpl.java           |  4 +-
 .../dockerjava/okhttp/UnixSocketFactory.java  |  4 +-
 .../dockerjava/transport/DomainSocket.java    |  2 +
 .../dockerjava/transport/UnixSocket.java      | 88 +++++++++++++++++++
 4 files changed, 94 insertions(+), 4 deletions(-)
 create mode 100644 docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java

diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
index c3fbc6755..c19c222c7 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
@@ -1,9 +1,9 @@
 package com.github.dockerjava.httpclient5;
 
 import com.github.dockerjava.transport.DockerHttpClient;
-import com.github.dockerjava.transport.DomainSocket;
 import com.github.dockerjava.transport.NamedPipeSocket;
 import com.github.dockerjava.transport.SSLConfig;
+import com.github.dockerjava.transport.UnixSocket;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
@@ -134,7 +134,7 @@ private Registry<ConnectionSocketFactory> createConnectionSocketFactoryRegistry(
             .register("unix", new PlainConnectionSocketFactory() {
                 @Override
                 public Socket createSocket(HttpContext context) throws IOException {
-                    return DomainSocket.get(dockerHost.getPath());
+                    return UnixSocket.get(dockerHost.getPath());
                 }
             })
             .register("npipe", new PlainConnectionSocketFactory() {
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java
index fd7499386..dc19b1351 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.okhttp;
 
-import com.github.dockerjava.transport.DomainSocket;
+import com.github.dockerjava.transport.UnixSocket;
 
 import javax.net.SocketFactory;
 import java.io.IOException;
@@ -18,7 +18,7 @@ class UnixSocketFactory extends SocketFactory {
     @Override
     public Socket createSocket() {
         try {
-            return DomainSocket.get(socketPath);
+            return UnixSocket.get(socketPath);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java
index ff77c3830..a2a3503f5 100644
--- a/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java
+++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java
@@ -130,7 +130,9 @@ public void close() throws IOException {
      * @param path the path to the domain socket
      * @return a {@link DomainSocket} instance
      * @throws IOException if the socket cannot be opened
+     * @deprecated use {@link UnixSocket#get(String)}
      */
+    @Deprecated
     public static DomainSocket get(String path) throws IOException {
         if (Platform.isMac() || isBsdPlatform()) {
             return new BsdDomainSocket(path);
diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java
new file mode 100644
index 000000000..0a9338771
--- /dev/null
+++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java
@@ -0,0 +1,88 @@
+package com.github.dockerjava.transport;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.net.SocketException;
+import java.nio.channels.Channels;
+import java.nio.channels.SocketChannel;
+
+public class UnixSocket extends AbstractSocket {
+
+    /**
+     * Return a new {@link Socket} for the given path. Will use JDK's {@link java.net.UnixDomainSocketAddress}
+     * if available and fallback to {@link DomainSocket} otherwise.
+     *
+     * @param path the path to the domain socket
+     * @return a {@link Socket} instance
+     * @throws IOException if the socket cannot be opened
+     */
+    public static Socket get(String path) throws IOException {
+        try {
+            return new UnixSocket(path);
+        } catch (Exception e) {
+            //noinspection deprecation
+            return DomainSocket.get(path);
+        }
+    }
+
+    private final SocketAddress socketAddress;
+
+    private final SocketChannel socketChannel;
+
+    private UnixSocket(String path) throws Exception {
+        Class<?> unixDomainSocketAddress = Class.forName("java.net.UnixDomainSocketAddress");
+        this.socketAddress =
+            (SocketAddress) unixDomainSocketAddress.getMethod("of", String.class)
+                .invoke(null, path);
+        this.socketChannel = SocketChannel.open(this.socketAddress);
+    }
+
+    @Override
+    public InputStream getInputStream() throws IOException {
+        if (isClosed()) {
+            throw new SocketException("Socket is closed");
+        }
+        if (!isConnected()) {
+            throw new SocketException("Socket is not connected");
+        }
+        if (isInputShutdown()) {
+            throw new SocketException("Socket input is shutdown");
+        }
+
+        return Channels.newInputStream(socketChannel);
+    }
+
+    @Override
+    public OutputStream getOutputStream() throws IOException {
+        if (isClosed()) {
+            throw new SocketException("Socket is closed");
+        }
+        if (!isConnected()) {
+            throw new SocketException("Socket is not connected");
+        }
+        if (isOutputShutdown()) {
+            throw new SocketException("Socket output is shutdown");
+        }
+
+        return Channels.newOutputStream(socketChannel);
+    }
+
+    @Override
+    public SocketAddress getLocalSocketAddress() {
+        return socketAddress;
+    }
+
+    @Override
+    public SocketAddress getRemoteSocketAddress() {
+        return socketAddress;
+    }
+
+    @Override
+    public void close() throws IOException {
+        super.close();
+        this.socketChannel.close();
+    }
+}

From de2627d5eee481dc9843dc4e54a0c5ff2b0e8eb5 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 9 Sep 2021 12:30:48 +0200
Subject: [PATCH 1085/1272] Disable socket timeout of 3min introduced in #1590
 (#1702)

---
 .../httpclient5/ApacheDockerHttpClientImpl.java           | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
index c19c222c7..aaafd3d58 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
@@ -24,11 +24,13 @@
 import org.apache.hc.core5.http.config.RegistryBuilder;
 import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy;
 import org.apache.hc.core5.http.impl.io.EmptyInputStream;
+import org.apache.hc.core5.http.io.SocketConfig;
 import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
 import org.apache.hc.core5.http.io.entity.InputStreamEntity;
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.net.URIAuthority;
+import org.apache.hc.core5.util.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -93,6 +95,12 @@ protected ApacheDockerHttpClientImpl(
                 null
             )
         );
+        // See https://github.com/docker-java/docker-java/pull/1590#issuecomment-870581289
+        connectionManager.setDefaultSocketConfig(
+            SocketConfig.copy(SocketConfig.DEFAULT)
+                .setSoTimeout(Timeout.ZERO_MILLISECONDS)
+                .build()
+        );
         connectionManager.setMaxTotal(maxConnections);
         connectionManager.setDefaultMaxPerRoute(maxConnections);
         RequestConfig.Builder defaultRequest = RequestConfig.custom();

From e0275e04937a3eb57e173c3d21fc783a99cf2f48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A8=BE=E6=98=8E=E5=8D=8E?= <565209960@qq.com>
Date: Thu, 9 Sep 2021 19:43:14 +0800
Subject: [PATCH 1086/1272] Use npipe as the default DOCKER_HOST on Windows
 (#1701)

* support default config by windows

if os is windows use windows  default host

* Update DefaultDockerClientConfig.java

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../github/dockerjava/core/DefaultDockerClientConfig.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index 6c7c907c4..d69de8334 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -6,6 +6,7 @@
 import com.github.dockerjava.core.NameParser.HostnameReposName;
 import com.github.dockerjava.core.NameParser.ReposTag;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.SystemUtils;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -60,6 +61,8 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf
 
     static final String DEFAULT_DOCKER_HOST = "unix:///var/run/docker.sock";
 
+    static final String WINDOWS_DEFAULT_DOCKER_HOST = "npipe:////./pipe/docker_engine";
+
     static {
         CONFIG_KEYS.add(DOCKER_HOST);
         CONFIG_KEYS.add(DOCKER_TLS_VERIFY);
@@ -444,7 +447,9 @@ public DefaultDockerClientConfig build() {
                 sslConfig = customSslConfig;
             }
 
-            URI dockerHostUri = (dockerHost != null) ? dockerHost : URI.create(DEFAULT_DOCKER_HOST);
+            URI dockerHostUri = dockerHost != null
+                ? dockerHost
+                : URI.create(SystemUtils.IS_OS_WINDOWS ? WINDOWS_DEFAULT_DOCKER_HOST : DEFAULT_DOCKER_HOST);
 
             return new DefaultDockerClientConfig(dockerHostUri, dockerConfig, apiVersion, registryUrl, registryUsername,
                     registryPassword, registryEmail, sslConfig);

From 5847a6d8cebc8a37d7c1730723a7defef38822f7 Mon Sep 17 00:00:00 2001
From: faucct <faucct@gmail.com>
Date: Mon, 13 Sep 2021 17:17:58 +0300
Subject: [PATCH 1087/1272] Recursive `PropagationMode` values (#1640)

* Recursive PropagationMode values

* Update PropagationMode.java

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../dockerjava/api/model/PropagationMode.java   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PropagationMode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PropagationMode.java
index 9be7d6e43..3e1db4438 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PropagationMode.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PropagationMode.java
@@ -13,11 +13,20 @@ public enum PropagationMode {
     /** shared */
     SHARED("shared"),
 
+    /** rshared */
+    RSHARED("rshared"),
+
     /** slave */
     SLAVE("slave"),
 
+    /** rslave */
+    RSLAVE("rslave"),
+
     /** private */
-    PRIVATE("private");
+    PRIVATE("private"),
+
+    /** rprivate */
+    RPRIVATE("rprivate");
 
     /**
      * The default {@link PropagationMode}: {@link #DEFAULT}
@@ -39,10 +48,16 @@ public static PropagationMode fromString(String v) {
         switch (v) {
         case "shared":
             return SHARED;
+        case "rshared":
+            return RSHARED;
         case "slave":
             return SLAVE;
+        case "rslave":
+            return RSLAVE;
         case "private":
             return PRIVATE;
+        case "rprivate":
+            return RPRIVATE;
         default:
             return DEFAULT;
         }

From 957bddab148515314531dd367a44a1c090c5c353 Mon Sep 17 00:00:00 2001
From: Peter Trifanov <peter.trifanov@mail.ru>
Date: Mon, 13 Sep 2021 17:18:38 +0300
Subject: [PATCH 1088/1272] Add `loki` driver to `LoggingType` enum (#1676)

Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../main/java/com/github/dockerjava/api/model/LogConfig.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java
index 949663c7f..218cdd827 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java
@@ -76,7 +76,8 @@ public enum LoggingType {
         AWSLOGS("awslogs"),
         DB("db"), // Synology specific driver
         SPLUNK("splunk"),
-        GCPLOGS("gcplogs");
+        GCPLOGS("gcplogs"),
+        LOKI("loki");
 
         private String type;
 

From a94e4d574f7d81e2accc00b4ff9b1677f4d475bc Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 13 Sep 2021 23:30:01 +0200
Subject: [PATCH 1089/1272] Add `DockerClientDelegate` (#1707)

* Add `DockerClientDelegate`

* Use `DockerClientDelegate` in tests
---
 .../dockerjava/api/DockerClientDelegate.java  | 515 ++++++++++++++++++
 .../dockerjava/cmd/CustomCommandIT.java       |   4 +-
 .../dockerjava/core/DockerClientDelegate.java |  14 -
 .../github/dockerjava/core/DockerRule.java    |   8 +-
 4 files changed, 522 insertions(+), 19 deletions(-)
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java
 delete mode 100644 docker-java/src/test/java/com/github/dockerjava/core/DockerClientDelegate.java

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java
new file mode 100644
index 000000000..bb5db859e
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java
@@ -0,0 +1,515 @@
+package com.github.dockerjava.api;
+
+import com.github.dockerjava.api.command.AttachContainerCmd;
+import com.github.dockerjava.api.command.AuthCmd;
+import com.github.dockerjava.api.command.BuildImageCmd;
+import com.github.dockerjava.api.command.CommitCmd;
+import com.github.dockerjava.api.command.ConnectToNetworkCmd;
+import com.github.dockerjava.api.command.ContainerDiffCmd;
+import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
+import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
+import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
+import com.github.dockerjava.api.command.CreateConfigCmd;
+import com.github.dockerjava.api.command.CreateContainerCmd;
+import com.github.dockerjava.api.command.CreateImageCmd;
+import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.command.CreateSecretCmd;
+import com.github.dockerjava.api.command.CreateServiceCmd;
+import com.github.dockerjava.api.command.CreateVolumeCmd;
+import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
+import com.github.dockerjava.api.command.EventsCmd;
+import com.github.dockerjava.api.command.ExecCreateCmd;
+import com.github.dockerjava.api.command.ExecStartCmd;
+import com.github.dockerjava.api.command.InfoCmd;
+import com.github.dockerjava.api.command.InitializeSwarmCmd;
+import com.github.dockerjava.api.command.InspectConfigCmd;
+import com.github.dockerjava.api.command.InspectContainerCmd;
+import com.github.dockerjava.api.command.InspectExecCmd;
+import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.InspectNetworkCmd;
+import com.github.dockerjava.api.command.InspectServiceCmd;
+import com.github.dockerjava.api.command.InspectSwarmCmd;
+import com.github.dockerjava.api.command.InspectVolumeCmd;
+import com.github.dockerjava.api.command.JoinSwarmCmd;
+import com.github.dockerjava.api.command.KillContainerCmd;
+import com.github.dockerjava.api.command.LeaveSwarmCmd;
+import com.github.dockerjava.api.command.ListConfigsCmd;
+import com.github.dockerjava.api.command.ListContainersCmd;
+import com.github.dockerjava.api.command.ListImagesCmd;
+import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.command.ListSecretsCmd;
+import com.github.dockerjava.api.command.ListServicesCmd;
+import com.github.dockerjava.api.command.ListSwarmNodesCmd;
+import com.github.dockerjava.api.command.ListTasksCmd;
+import com.github.dockerjava.api.command.ListVolumesCmd;
+import com.github.dockerjava.api.command.LoadImageCmd;
+import com.github.dockerjava.api.command.LogContainerCmd;
+import com.github.dockerjava.api.command.LogSwarmObjectCmd;
+import com.github.dockerjava.api.command.PauseContainerCmd;
+import com.github.dockerjava.api.command.PingCmd;
+import com.github.dockerjava.api.command.PruneCmd;
+import com.github.dockerjava.api.command.PullImageCmd;
+import com.github.dockerjava.api.command.PushImageCmd;
+import com.github.dockerjava.api.command.RemoveConfigCmd;
+import com.github.dockerjava.api.command.RemoveContainerCmd;
+import com.github.dockerjava.api.command.RemoveImageCmd;
+import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.RemoveSecretCmd;
+import com.github.dockerjava.api.command.RemoveServiceCmd;
+import com.github.dockerjava.api.command.RemoveVolumeCmd;
+import com.github.dockerjava.api.command.RenameContainerCmd;
+import com.github.dockerjava.api.command.ResizeContainerCmd;
+import com.github.dockerjava.api.command.ResizeExecCmd;
+import com.github.dockerjava.api.command.RestartContainerCmd;
+import com.github.dockerjava.api.command.SaveImageCmd;
+import com.github.dockerjava.api.command.SaveImagesCmd;
+import com.github.dockerjava.api.command.SearchImagesCmd;
+import com.github.dockerjava.api.command.StartContainerCmd;
+import com.github.dockerjava.api.command.StatsCmd;
+import com.github.dockerjava.api.command.StopContainerCmd;
+import com.github.dockerjava.api.command.TagImageCmd;
+import com.github.dockerjava.api.command.TopContainerCmd;
+import com.github.dockerjava.api.command.UnpauseContainerCmd;
+import com.github.dockerjava.api.command.UpdateContainerCmd;
+import com.github.dockerjava.api.command.UpdateServiceCmd;
+import com.github.dockerjava.api.command.UpdateSwarmCmd;
+import com.github.dockerjava.api.command.UpdateSwarmNodeCmd;
+import com.github.dockerjava.api.command.VersionCmd;
+import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.model.AuthConfig;
+import com.github.dockerjava.api.model.Identifier;
+import com.github.dockerjava.api.model.PruneType;
+import com.github.dockerjava.api.model.SecretSpec;
+import com.github.dockerjava.api.model.ServiceSpec;
+import com.github.dockerjava.api.model.SwarmSpec;
+
+import javax.annotation.Nonnull;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @apiNote implementations MUST override {{@link #getDockerClient()}}
+ * @implNote We're not using an abstract class here because we want
+ * Java compiler to force us to implement every {@link DockerClient}'s method,
+ * especially when new methods are added
+ */
+@SuppressWarnings("unused")
+public class DockerClientDelegate implements DockerClient {
+
+    protected DockerClient getDockerClient() {
+        throw new IllegalStateException("Implement me!");
+    }
+
+    @Override
+    public AuthConfig authConfig() throws DockerException {
+        return getDockerClient().authConfig();
+    }
+
+    @Override
+    public AuthCmd authCmd() {
+        return getDockerClient().authCmd();
+    }
+
+    @Override
+    public InfoCmd infoCmd() {
+        return getDockerClient().infoCmd();
+    }
+
+    @Override
+    public PingCmd pingCmd() {
+        return getDockerClient().pingCmd();
+    }
+
+    @Override
+    public VersionCmd versionCmd() {
+        return getDockerClient().versionCmd();
+    }
+
+    @Override
+    public PullImageCmd pullImageCmd(@Nonnull String repository) {
+        return getDockerClient().pullImageCmd(repository);
+    }
+
+    @Override
+    public PushImageCmd pushImageCmd(@Nonnull String name) {
+        return getDockerClient().pushImageCmd(name);
+    }
+
+    @Override
+    public PushImageCmd pushImageCmd(@Nonnull Identifier identifier) {
+        return getDockerClient().pushImageCmd(identifier);
+    }
+
+    @Override
+    public CreateImageCmd createImageCmd(@Nonnull String repository, @Nonnull InputStream imageStream) {
+        return getDockerClient().createImageCmd(repository, imageStream);
+    }
+
+    @Override
+    public LoadImageCmd loadImageCmd(@Nonnull InputStream imageStream) {
+        return getDockerClient().loadImageCmd(imageStream);
+    }
+
+    @Override
+    public SearchImagesCmd searchImagesCmd(@Nonnull String term) {
+        return getDockerClient().searchImagesCmd(term);
+    }
+
+    @Override
+    public RemoveImageCmd removeImageCmd(@Nonnull String imageId) {
+        return getDockerClient().removeImageCmd(imageId);
+    }
+
+    @Override
+    public ListImagesCmd listImagesCmd() {
+        return getDockerClient().listImagesCmd();
+    }
+
+    @Override
+    public InspectImageCmd inspectImageCmd(@Nonnull String imageId) {
+        return getDockerClient().inspectImageCmd(imageId);
+    }
+
+    @Override
+    public SaveImageCmd saveImageCmd(@Nonnull String name) {
+        return getDockerClient().saveImageCmd(name);
+    }
+
+    @Override
+    public SaveImagesCmd saveImagesCmd() {
+        return getDockerClient().saveImagesCmd();
+    }
+
+    @Override
+    public ListContainersCmd listContainersCmd() {
+        return getDockerClient().listContainersCmd();
+    }
+
+    @Override
+    public CreateContainerCmd createContainerCmd(@Nonnull String image) {
+        return getDockerClient().createContainerCmd(image);
+    }
+
+    @Override
+    public StartContainerCmd startContainerCmd(@Nonnull String containerId) {
+        return getDockerClient().startContainerCmd(containerId);
+    }
+
+    @Override
+    public ExecCreateCmd execCreateCmd(@Nonnull String containerId) {
+        return getDockerClient().execCreateCmd(containerId);
+    }
+
+    @Override
+    public ResizeExecCmd resizeExecCmd(@Nonnull String execId) {
+        return getDockerClient().resizeExecCmd(execId);
+    }
+
+    @Override
+    public InspectContainerCmd inspectContainerCmd(@Nonnull String containerId) {
+        return getDockerClient().inspectContainerCmd(containerId);
+    }
+
+    @Override
+    public RemoveContainerCmd removeContainerCmd(@Nonnull String containerId) {
+        return getDockerClient().removeContainerCmd(containerId);
+    }
+
+    @Override
+    public WaitContainerCmd waitContainerCmd(@Nonnull String containerId) {
+        return getDockerClient().waitContainerCmd(containerId);
+    }
+
+    @Override
+    public AttachContainerCmd attachContainerCmd(@Nonnull String containerId) {
+        return getDockerClient().attachContainerCmd(containerId);
+    }
+
+    @Override
+    public ExecStartCmd execStartCmd(@Nonnull String execId) {
+        return getDockerClient().execStartCmd(execId);
+    }
+
+    @Override
+    public InspectExecCmd inspectExecCmd(@Nonnull String execId) {
+        return getDockerClient().inspectExecCmd(execId);
+    }
+
+    @Override
+    public LogContainerCmd logContainerCmd(@Nonnull String containerId) {
+        return getDockerClient().logContainerCmd(containerId);
+    }
+
+    @Override
+    public CopyArchiveFromContainerCmd copyArchiveFromContainerCmd(@Nonnull String containerId, @Nonnull String resource) {
+        return getDockerClient().copyArchiveFromContainerCmd(containerId, resource);
+    }
+
+    @Override
+    @Deprecated
+    public CopyFileFromContainerCmd copyFileFromContainerCmd(@Nonnull String containerId, @Nonnull String resource) {
+        return getDockerClient().copyFileFromContainerCmd(containerId, resource);
+    }
+
+    @Override
+    public CopyArchiveToContainerCmd copyArchiveToContainerCmd(@Nonnull String containerId) {
+        return getDockerClient().copyArchiveToContainerCmd(containerId);
+    }
+
+    @Override
+    public ContainerDiffCmd containerDiffCmd(@Nonnull String containerId) {
+        return getDockerClient().containerDiffCmd(containerId);
+    }
+
+    @Override
+    public StopContainerCmd stopContainerCmd(@Nonnull String containerId) {
+        return getDockerClient().stopContainerCmd(containerId);
+    }
+
+    @Override
+    public KillContainerCmd killContainerCmd(@Nonnull String containerId) {
+        return getDockerClient().killContainerCmd(containerId);
+    }
+
+    @Override
+    public UpdateContainerCmd updateContainerCmd(@Nonnull String containerId) {
+        return getDockerClient().updateContainerCmd(containerId);
+    }
+
+    @Override
+    public RenameContainerCmd renameContainerCmd(@Nonnull String containerId) {
+        return getDockerClient().renameContainerCmd(containerId);
+    }
+
+    @Override
+    public RestartContainerCmd restartContainerCmd(@Nonnull String containerId) {
+        return getDockerClient().restartContainerCmd(containerId);
+    }
+
+    @Override
+    public ResizeContainerCmd resizeContainerCmd(@Nonnull String containerId) {
+        return getDockerClient().resizeContainerCmd(containerId);
+    }
+
+    @Override
+    public CommitCmd commitCmd(@Nonnull String containerId) {
+        return getDockerClient().commitCmd(containerId);
+    }
+
+    @Override
+    public BuildImageCmd buildImageCmd() {
+        return getDockerClient().buildImageCmd();
+    }
+
+    @Override
+    public BuildImageCmd buildImageCmd(File dockerFileOrFolder) {
+        return getDockerClient().buildImageCmd(dockerFileOrFolder);
+    }
+
+    @Override
+    public BuildImageCmd buildImageCmd(InputStream tarInputStream) {
+        return getDockerClient().buildImageCmd(tarInputStream);
+    }
+
+    @Override
+    public TopContainerCmd topContainerCmd(String containerId) {
+        return getDockerClient().topContainerCmd(containerId);
+    }
+
+    @Override
+    public TagImageCmd tagImageCmd(String imageId, String imageNameWithRepository, String tag) {
+        return getDockerClient().tagImageCmd(imageId, imageNameWithRepository, tag);
+    }
+
+    @Override
+    public PauseContainerCmd pauseContainerCmd(String containerId) {
+        return getDockerClient().pauseContainerCmd(containerId);
+    }
+
+    @Override
+    public UnpauseContainerCmd unpauseContainerCmd(String containerId) {
+        return getDockerClient().unpauseContainerCmd(containerId);
+    }
+
+    @Override
+    public EventsCmd eventsCmd() {
+        return getDockerClient().eventsCmd();
+    }
+
+    @Override
+    public StatsCmd statsCmd(String containerId) {
+        return getDockerClient().statsCmd(containerId);
+    }
+
+    @Override
+    public CreateVolumeCmd createVolumeCmd() {
+        return getDockerClient().createVolumeCmd();
+    }
+
+    @Override
+    public InspectVolumeCmd inspectVolumeCmd(String name) {
+        return getDockerClient().inspectVolumeCmd(name);
+    }
+
+    @Override
+    public RemoveVolumeCmd removeVolumeCmd(String name) {
+        return getDockerClient().removeVolumeCmd(name);
+    }
+
+    @Override
+    public ListVolumesCmd listVolumesCmd() {
+        return getDockerClient().listVolumesCmd();
+    }
+
+    @Override
+    public ListNetworksCmd listNetworksCmd() {
+        return getDockerClient().listNetworksCmd();
+    }
+
+    @Override
+    public InspectNetworkCmd inspectNetworkCmd() {
+        return getDockerClient().inspectNetworkCmd();
+    }
+
+    @Override
+    public CreateNetworkCmd createNetworkCmd() {
+        return getDockerClient().createNetworkCmd();
+    }
+
+    @Override
+    public RemoveNetworkCmd removeNetworkCmd(@Nonnull String networkId) {
+        return getDockerClient().removeNetworkCmd(networkId);
+    }
+
+    @Override
+    public ConnectToNetworkCmd connectToNetworkCmd() {
+        return getDockerClient().connectToNetworkCmd();
+    }
+
+    @Override
+    public DisconnectFromNetworkCmd disconnectFromNetworkCmd() {
+        return getDockerClient().disconnectFromNetworkCmd();
+    }
+
+    @Override
+    public InitializeSwarmCmd initializeSwarmCmd(SwarmSpec swarmSpec) {
+        return getDockerClient().initializeSwarmCmd(swarmSpec);
+    }
+
+    @Override
+    public InspectSwarmCmd inspectSwarmCmd() {
+        return getDockerClient().inspectSwarmCmd();
+    }
+
+    @Override
+    public JoinSwarmCmd joinSwarmCmd() {
+        return getDockerClient().joinSwarmCmd();
+    }
+
+    @Override
+    public LeaveSwarmCmd leaveSwarmCmd() {
+        return getDockerClient().leaveSwarmCmd();
+    }
+
+    @Override
+    public UpdateSwarmCmd updateSwarmCmd(SwarmSpec swarmSpec) {
+        return getDockerClient().updateSwarmCmd(swarmSpec);
+    }
+
+    @Override
+    public UpdateSwarmNodeCmd updateSwarmNodeCmd() {
+        return getDockerClient().updateSwarmNodeCmd();
+    }
+
+    @Override
+    public ListSwarmNodesCmd listSwarmNodesCmd() {
+        return getDockerClient().listSwarmNodesCmd();
+    }
+
+    @Override
+    public ListServicesCmd listServicesCmd() {
+        return getDockerClient().listServicesCmd();
+    }
+
+    @Override
+    public CreateServiceCmd createServiceCmd(ServiceSpec serviceSpec) {
+        return getDockerClient().createServiceCmd(serviceSpec);
+    }
+
+    @Override
+    public InspectServiceCmd inspectServiceCmd(String serviceId) {
+        return getDockerClient().inspectServiceCmd(serviceId);
+    }
+
+    @Override
+    public UpdateServiceCmd updateServiceCmd(String serviceId, ServiceSpec serviceSpec) {
+        return getDockerClient().updateServiceCmd(serviceId, serviceSpec);
+    }
+
+    @Override
+    public RemoveServiceCmd removeServiceCmd(String serviceId) {
+        return getDockerClient().removeServiceCmd(serviceId);
+    }
+
+    @Override
+    public ListTasksCmd listTasksCmd() {
+        return getDockerClient().listTasksCmd();
+    }
+
+    @Override
+    public LogSwarmObjectCmd logServiceCmd(String serviceId) {
+        return getDockerClient().logServiceCmd(serviceId);
+    }
+
+    @Override
+    public LogSwarmObjectCmd logTaskCmd(String taskId) {
+        return getDockerClient().logTaskCmd(taskId);
+    }
+
+    @Override
+    public PruneCmd pruneCmd(PruneType pruneType) {
+        return getDockerClient().pruneCmd(pruneType);
+    }
+
+    @Override
+    public ListSecretsCmd listSecretsCmd() {
+        return getDockerClient().listSecretsCmd();
+    }
+
+    @Override
+    public CreateSecretCmd createSecretCmd(SecretSpec secretSpec) {
+        return getDockerClient().createSecretCmd(secretSpec);
+    }
+
+    @Override
+    public RemoveSecretCmd removeSecretCmd(String secretId) {
+        return getDockerClient().removeSecretCmd(secretId);
+    }
+
+    @Override
+    public ListConfigsCmd listConfigsCmd() {
+        return getDockerClient().listConfigsCmd();
+    }
+
+    @Override
+    public CreateConfigCmd createConfigCmd() {
+        return getDockerClient().createConfigCmd();
+    }
+
+    @Override
+    public InspectConfigCmd inspectConfigCmd(String configId) {
+        return getDockerClient().inspectConfigCmd(configId);
+    }
+
+    @Override
+    public RemoveConfigCmd removeConfigCmd(String configId) {
+        return getDockerClient().removeConfigCmd(configId);
+    }
+
+    @Override
+    public void close() throws IOException {
+        getDockerClient().close();
+    }
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java
index 514ead0bd..e7899f84a 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.cmd;
 
 import com.github.dockerjava.core.DockerClientImpl;
+import com.github.dockerjava.core.DockerRule;
 import com.github.dockerjava.transport.DockerHttpClient;
 import com.github.dockerjava.transport.DockerHttpClient.Request;
 import com.github.dockerjava.transport.DockerHttpClient.Response;
@@ -17,7 +18,8 @@ public class CustomCommandIT extends CmdIT {
 
     @Test
     public void testCustomCommand() throws Exception {
-        DockerHttpClient httpClient = ((DockerClientImpl) dockerRule.getClient()).getHttpClient();
+        DockerClientImpl dockerClient = getFactoryType().createDockerClient(DockerRule.config(null));
+        DockerHttpClient httpClient = dockerClient.getHttpClient();
 
         Assume.assumeNotNull(httpClient);
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientDelegate.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientDelegate.java
deleted file mode 100644
index 84715ca25..000000000
--- a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientDelegate.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.github.dockerjava.core;
-
-import lombok.experimental.Delegate;
-
-public class DockerClientDelegate extends DockerClientImpl {
-
-    @Delegate
-    private final DockerClientImpl delegate;
-
-    public DockerClientDelegate(DockerClientImpl delegate) {
-        super(DefaultDockerClientConfig.createDefaultConfigBuilder().build());
-        this.delegate = delegate;
-    }
-}
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
index 6b137485f..c4a66fb10 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.core;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.DockerClientDelegate;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.CreateNetworkCmd;
@@ -48,7 +49,6 @@ public DockerRule(CmdIT cmdIT) {
 
     public DockerClient newClient() {
         DockerClientImpl dockerClient = cmdIT.getFactoryType().createDockerClient(config());
-        DockerHttpClient dockerHttpClient = dockerClient.getHttpClient();
 
         dockerClient.withDockerCmdExecFactory(
             new DockerCmdExecFactoryDelegate(dockerClient.dockerCmdExecFactory) {
@@ -84,10 +84,10 @@ public CreateVolumeCmd.Exec createCreateVolumeCmdExec() {
             }
         );
 
-        return new DockerClientDelegate(dockerClient) {
+        return new DockerClientDelegate() {
             @Override
-            public DockerHttpClient getHttpClient() {
-                return dockerHttpClient;
+            protected DockerClient getDockerClient() {
+                return dockerClient;
             }
         };
     }

From e550b5b3d12b007db88574a6f7f546bfbfa02929 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 14 Sep 2021 16:06:06 +0200
Subject: [PATCH 1090/1272] Add BOM (#1708)

---
 docker-java-bom/pom.xml | 65 +++++++++++++++++++++++++++++++++++++++++
 pom.xml                 |  1 +
 2 files changed, 66 insertions(+)
 create mode 100644 docker-java-bom/pom.xml

diff --git a/docker-java-bom/pom.xml b/docker-java-bom/pom.xml
new file mode 100644
index 000000000..b24dcf2e9
--- /dev/null
+++ b/docker-java-bom/pom.xml
@@ -0,0 +1,65 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.github.docker-java</groupId>
+		<artifactId>docker-java-parent</artifactId>
+		<version>0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>docker-java-bom</artifactId>
+	<packaging>pom</packaging>
+
+	<name>docker-java</name>
+	<url>https://github.com/docker-java/docker-java</url>
+	<description>Java API Client for Docker</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java-transport</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java-transport-httpclient5</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java-transport-jersey</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java-transport-netty</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java-transport-okhttp</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java-transport-zerodep</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/pom.xml b/pom.xml
index 213c88b5a..bb1a424e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,6 +93,7 @@
 
 	<modules>
 		<module>docker-java-api</module>
+		<module>docker-java-bom</module>
 		<module>docker-java-core</module>
 		<module>docker-java-transport</module>
 		<module>docker-java-transport-netty</module>

From 4ead9a45ecf79b0aa3d2728756631a22f699e5bb Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 14 Sep 2021 16:21:06 +0200
Subject: [PATCH 1091/1272] fix BOM (use `dependencyManagement`)

---
 docker-java-bom/pom.xml | 96 +++++++++++++++++++++--------------------
 1 file changed, 49 insertions(+), 47 deletions(-)

diff --git a/docker-java-bom/pom.xml b/docker-java-bom/pom.xml
index b24dcf2e9..7066b3a67 100644
--- a/docker-java-bom/pom.xml
+++ b/docker-java-bom/pom.xml
@@ -15,51 +15,53 @@
 	<url>https://github.com/docker-java/docker-java</url>
 	<description>Java API Client for Docker</description>
 
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>docker-java</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>docker-java-api</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>docker-java-core</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>docker-java-transport</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>docker-java-transport-httpclient5</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>docker-java-transport-jersey</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>docker-java-transport-netty</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>docker-java-transport-okhttp</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>docker-java-transport-zerodep</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>docker-java</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>docker-java-api</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>docker-java-core</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>docker-java-transport</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>docker-java-transport-httpclient5</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>docker-java-transport-jersey</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>docker-java-transport-netty</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>docker-java-transport-okhttp</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>${project.groupId}</groupId>
+				<artifactId>docker-java-transport-zerodep</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 </project>

From c61da29a09517c43f8ea2255f9abf26b2f3deba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thierry=20Yg=C3=A9?= <thierry.yge@gmail.com>
Date: Tue, 2 Nov 2021 10:56:30 +0100
Subject: [PATCH 1092/1272] Fix #1726 by disabling stale connection checking in
 AHC5 (#1727)

---
 .../dockerjava/httpclient5/ApacheDockerHttpClientImpl.java      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
index aaafd3d58..468786295 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
@@ -30,6 +30,7 @@
 import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.net.URIAuthority;
+import org.apache.hc.core5.util.TimeValue;
 import org.apache.hc.core5.util.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -101,6 +102,7 @@ protected ApacheDockerHttpClientImpl(
                 .setSoTimeout(Timeout.ZERO_MILLISECONDS)
                 .build()
         );
+        connectionManager.setValidateAfterInactivity(TimeValue.NEG_ONE_SECOND);
         connectionManager.setMaxTotal(maxConnections);
         connectionManager.setDefaultMaxPerRoute(maxConnections);
         RequestConfig.Builder defaultRequest = RequestConfig.custom();

From 8e77a69467814c8500e5a360bfce46602ca841fb Mon Sep 17 00:00:00 2001
From: Eric Bariaux <375613+ebariaux@users.noreply.github.com>
Date: Tue, 14 Dec 2021 02:37:22 +0100
Subject: [PATCH 1093/1272] Update apache commons-lang (2) to current
 commons-lang3 (#1746)

---
 docker-java-core/pom.xml                           |  6 +++---
 .../dockerjava/core/DefaultDockerClientConfig.java | 14 +++++++-------
 .../core/DefaultDockerCmdExecFactory.java          |  2 +-
 .../github/dockerjava/core/DockerConfigFile.java   |  2 +-
 .../github/dockerjava/core/GoLangFileMatch.java    |  2 +-
 .../com/github/dockerjava/core/NameParser.java     |  8 ++++----
 .../dockerjava/core/command/AbstrDockerCmd.java    |  4 ++--
 .../command/CopyArchiveToContainerCmdImpl.java     |  4 ++--
 .../core/command/CreateContainerCmdImpl.java       |  6 +++---
 .../core/command/InitializeSwarmCmdImpl.java       |  6 +++---
 .../dockerjava/core/command/JoinSwarmCmdImpl.java  |  6 +++---
 .../dockerjava/core/command/ListImagesCmdImpl.java |  4 ++--
 .../core/command/LogContainerCmdImpl.java          |  4 ++--
 .../core/command/UpdateContainerCmdImpl.java       |  6 +++---
 .../core/command/UpdateServiceCmdImpl.java         |  8 ++++----
 .../core/command/UpdateSwarmNodeCmdImpl.java       |  8 ++++----
 .../core/dockerfile/DockerfileStatement.java       |  2 +-
 .../dockerjava/core/exec/BuildImageCmdExec.java    |  2 +-
 .../dockerjava/core/exec/TopContainerCmdExec.java  |  2 +-
 .../netty/NettyDockerCmdExecFactory.java           |  2 +-
 .../github/dockerjava/netty/NettyWebTarget.java    |  2 +-
 .../dockerjava/api/ModelsSerializableTest.java     |  2 +-
 .../com/github/dockerjava/cmd/TagImageCmdIT.java   |  6 +++---
 .../com/github/dockerjava/cmd/VersionCmdIT.java    |  2 +-
 .../cmd/swarm/CreateConfigCmdExecIT.java           |  2 +-
 .../cmd/swarm/CreateSecretCmdExecIT.java           |  2 +-
 .../dockerjava/cmd/swarm/InspectConfigCmdIT.java   |  2 +-
 .../dockerjava/cmd/swarm/ListConfigCmdExecIT.java  |  2 +-
 .../dockerjava/cmd/swarm/ListSecretCmdExecIT.java  |  2 +-
 .../core/DefaultDockerClientConfigTest.java        |  2 +-
 .../com/github/dockerjava/core/NameParserTest.java |  2 +-
 .../dockerjava/core/RemoteApiVersionTest.java      |  2 +-
 .../com/github/dockerjava/utils/TestUtils.java     |  2 +-
 docker-java/template.mf                            |  2 +-
 pom.xml                                            |  2 +-
 35 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index ef24fed34..fed62f1a6 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -46,9 +46,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>${commons-lang.version}</version>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>${commons-lang3.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index d69de8334..c22d5cd71 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -5,12 +5,12 @@
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.core.NameParser.HostnameReposName;
 import com.github.dockerjava.core.NameParser.ReposTag;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.SystemUtils;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.SystemUtils;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
@@ -26,7 +26,7 @@
 import java.util.Set;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.apache.commons.lang.BooleanUtils.isTrue;
+import static org.apache.commons.lang3.BooleanUtils.isTrue;
 
 /**
  * Respects some of the docker CLI options. See https://docs.docker.com/engine/reference/commandline/cli/#environment-variables
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java
index 5376997bc..54722e6c7 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java
@@ -9,7 +9,7 @@
 import com.google.common.collect.SetMultimap;
 import com.google.common.escape.Escaper;
 import com.google.common.net.UrlEscapers;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 import java.util.Map;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
index fd04a5aa6..eb5a94e2e 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
@@ -6,7 +6,7 @@
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
index 094834cfd..811b60ce5 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -14,7 +14,7 @@
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.google.common.util.concurrent.UncheckedExecutionException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.github.dockerjava.core.exception.GoLangFileMatchException;
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java b/docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java
index ffadb6656..ae39029ed 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java
@@ -5,10 +5,10 @@
 
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.core.exception.InvalidRepositoryNameException;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
index 10e6b5212..9fbeb0a75 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
@@ -5,8 +5,8 @@
 import java.io.IOException;
 import java.util.Base64;
 
-import org.apache.commons.lang.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
index 2eb5f5835..cac15fadf 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
@@ -8,8 +8,8 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 import com.github.dockerjava.api.exception.DockerClientException;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 040e716e1..d4cd05a63 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -14,9 +14,9 @@
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.Volumes;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import javax.annotation.CheckForNull;
 import java.util.Arrays;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java
index 6f81f1bf0..f13f307ad 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InitializeSwarmCmdImpl.java
@@ -4,9 +4,9 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.command.InitializeSwarmCmd;
 import com.github.dockerjava.api.model.SwarmSpec;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import javax.annotation.CheckForNull;
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java
index 72a1cdb82..d19ed8ea2 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/JoinSwarmCmdImpl.java
@@ -3,9 +3,9 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.command.JoinSwarmCmd;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import javax.annotation.CheckForNull;
 import java.util.List;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
index 1033b43ec..a98be8f53 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
@@ -5,8 +5,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.github.dockerjava.api.command.ListImagesCmd;
 import com.github.dockerjava.api.model.Image;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
index aa267fc8f..5ba6261e8 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -2,8 +2,8 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.apache.commons.lang.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.model.Frame;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
index aad2b19e3..14357ba08 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
@@ -6,9 +6,9 @@
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.UpdateContainerResponse;
 import com.github.dockerjava.core.RemoteApiVersion;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java
index 664ffd997..7ff9412a9 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateServiceCmdImpl.java
@@ -4,10 +4,10 @@
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.ServiceSpec;
 import com.github.dockerjava.core.RemoteApiVersion;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java
index 278599641..a2f22fa14 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmNodeCmdImpl.java
@@ -4,10 +4,10 @@
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.SwarmNodeSpec;
 import com.github.dockerjava.core.RemoteApiVersion;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java b/docker-java-core/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
index aefff137d..fb2447c2d 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
@@ -8,7 +8,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.google.common.base.MoreObjects;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
index edf9b6bf9..aa65fff40 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/BuildImageCmdExec.java
@@ -15,7 +15,7 @@
 import javax.annotation.CheckForNull;
 
 import static com.github.dockerjava.core.util.CacheFromEncoder.jsonEncode;
-import static org.apache.commons.lang.StringUtils.isNotBlank;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem> implements
         BuildImageCmd.Exec {
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java
index c6fff7044..f0ce0f71a 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/TopContainerCmdExec.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.exec;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index cc1c4452b..cd122b3bc 100644
--- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -16,7 +16,7 @@
 
 import com.github.dockerjava.core.AbstractDockerCmdExecFactory;
 import com.github.dockerjava.core.WebTarget;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
 
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
 import com.github.dockerjava.core.DockerClientConfig;
diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
index 17672b0b4..8f2ffce27 100644
--- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
+++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyWebTarget.java
@@ -17,7 +17,7 @@
 import com.github.dockerjava.core.WebTarget;
 import com.google.common.collect.ImmutableSet;
 import io.netty.handler.codec.http.HttpConstants;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java b/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java
index 18bc76ea8..4dc87cafb 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java
@@ -8,7 +8,7 @@
 import com.github.dockerjava.api.model.PushResponseItem;
 import com.github.dockerjava.api.model.ResponseItem;
 import com.google.common.reflect.ClassPath.ClassInfo;
-import org.apache.commons.lang.reflect.FieldUtils;
+import org.apache.commons.lang3.reflect.FieldUtils;
 import org.hamcrest.MatcherAssert;
 import org.junit.Test;
 import org.slf4j.Logger;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java
index 88bd28fd4..8f33fcc1e 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java
@@ -1,7 +1,7 @@
 package com.github.dockerjava.cmd;
 
 import com.github.dockerjava.api.exception.NotFoundException;
-import org.apache.commons.lang.math.RandomUtils;
+import org.apache.commons.lang3.RandomUtils;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,7 +12,7 @@ public class TagImageCmdIT extends CmdIT {
 
     @Test
     public void tagImage() throws Exception {
-        String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
+        String tag = "" + RandomUtils.nextInt(0, Integer.MAX_VALUE);
 
         dockerRule.getClient().tagImageCmd("busybox:latest", "docker-java/busybox", tag).exec();
 
@@ -22,7 +22,7 @@ public void tagImage() throws Exception {
     @Test(expected = NotFoundException.class)
     public void tagNonExistingImage() throws Exception {
 
-        String tag = "" + RandomUtils.nextInt(Integer.MAX_VALUE);
+        String tag = "" + RandomUtils.nextInt(0, Integer.MAX_VALUE);
         dockerRule.getClient().tagImageCmd("non-existing", "docker-java/busybox", tag).exec();
     }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java
index 08a198b9f..08d27db03 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java
@@ -2,7 +2,7 @@
 
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.Version;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateConfigCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateConfigCmdExecIT.java
index aad681534..8ebb610b9 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateConfigCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateConfigCmdExecIT.java
@@ -2,7 +2,7 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.CreateConfigResponse;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
index 34a106af9..e1564ea91 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
@@ -5,7 +5,7 @@
 import com.github.dockerjava.api.model.Secret;
 import com.github.dockerjava.api.model.SecretSpec;
 import com.google.common.collect.Lists;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.hamcrest.collection.IsCollectionWithSize;
 import org.junit.Test;
 import org.slf4j.Logger;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java
index 44fe845e0..cd80ec118 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java
@@ -4,7 +4,7 @@
 import com.github.dockerjava.api.command.CreateConfigResponse;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.Config;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListConfigCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListConfigCmdExecIT.java
index c13689c8c..2c19a7f0e 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListConfigCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListConfigCmdExecIT.java
@@ -4,7 +4,7 @@
 import com.github.dockerjava.api.command.CreateConfigResponse;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.Config;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java
index a4b8f1288..ce90f23a0 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSecretCmdExecIT.java
@@ -6,7 +6,7 @@
 import com.github.dockerjava.api.model.Secret;
 import com.github.dockerjava.api.model.SecretSpec;
 import com.google.common.collect.Lists;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
index f7964f0dd..8c1071aa6 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
@@ -4,7 +4,7 @@
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.google.common.io.Resources;
-import org.apache.commons.lang.SerializationUtils;
+import org.apache.commons.lang3.SerializationUtils;
 import org.junit.Test;
 
 import java.io.File;
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java b/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java
index 234ed47a1..d828f3c7b 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java
@@ -7,7 +7,7 @@
 import com.github.dockerjava.core.NameParser.HostnameReposName;
 import com.github.dockerjava.core.NameParser.ReposTag;
 import com.github.dockerjava.core.exception.InvalidRepositoryNameException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java b/docker-java/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java
index a9446ffd4..06b825868 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/RemoteApiVersionTest.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core;
 
-import org.apache.commons.lang.SerializationUtils;
+import org.apache.commons.lang3.SerializationUtils;
 import org.junit.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/docker-java/src/test/java/com/github/dockerjava/utils/TestUtils.java b/docker-java/src/test/java/com/github/dockerjava/utils/TestUtils.java
index 87833343b..eb3af8deb 100644
--- a/docker-java/src/test/java/com/github/dockerjava/utils/TestUtils.java
+++ b/docker-java/src/test/java/com/github/dockerjava/utils/TestUtils.java
@@ -5,7 +5,7 @@
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.LineIterator;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/docker-java/template.mf b/docker-java/template.mf
index 274e6f917..2ce26d092 100644
--- a/docker-java/template.mf
+++ b/docker-java/template.mf
@@ -13,7 +13,7 @@ Import-Template:
  javax.ws.rs.*;version="[2.0.0, 2.1.0)",
  org.apache.commons.compress.*;version="${commons-compress.version:short}",
  org.apache.commons.io.*;version="${commons-io.version:short}",
- org.apache.commons.lang.*;version="${commons-lang.version:short}",
+ org.apache.commons.lang3.*;version="${commons-lang3.version:short}",
  org.apache.http.*;version="[4.4.0, 4.6.0)",
  org.bouncycastle.*;version="${bouncycastle.version:short}",
  org.glassfish.jersey.*;version="${jersey.version:default}",
diff --git a/pom.xml b/pom.xml
index bb1a424e1..4a036a8e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
 		<commons-compress.version>1.21</commons-compress.version>
 		<commons-codec.version>1.11</commons-codec.version>
 		<commons-io.version>2.6</commons-io.version>
-		<commons-lang.version>2.6</commons-lang.version>
+		<commons-lang3.version>3.12.0</commons-lang3.version>
 		<slf4j-api.version>1.7.30</slf4j-api.version>
 
 		<bouncycastle.version>1.64</bouncycastle.version>

From 599aeb7650440ed545bfadf32b5b618502c15f16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A8=BE=E6=98=8E=E5=8D=8E?= <565209960@qq.com>
Date: Fri, 17 Dec 2021 19:51:46 +0800
Subject: [PATCH 1094/1272] add `RemoveSwarmNodeCmd` (#1735)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add missing cmd `RemoveSwarmNodeCmd` in client

* Update docker-java/src/test/java/com/github/dockerjava/cmd/swarm/RemoveSwarmNodeCmdExecIT.java

Co-authored-by: Sergei Egorov <bsideup@gmail.com>

* Update docker-java/src/test/java/com/github/dockerjava/cmd/swarm/RemoveSwarmNodeCmdExecIT.java

Co-authored-by: Sergei Egorov <bsideup@gmail.com>

* force remove node

Co-authored-by: 訾明华 <zmh01@digibird.com.cn>
Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../github/dockerjava/api/DockerClient.java   | 10 +++++
 .../dockerjava/api/DockerClientDelegate.java  |  6 +++
 .../api/command/RemoveSwarmNodeCmd.java       |  2 +-
 .../dockerjava/core/DockerClientImpl.java     |  7 +++
 .../core/command/RemoveSwarmNodeCmdImpl.java  |  6 +--
 .../cmd/swarm/RemoveSwarmNodeCmdExecIT.java   | 44 +++++++++++++++++++
 6 files changed, 71 insertions(+), 4 deletions(-)
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/swarm/RemoveSwarmNodeCmdExecIT.java

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
index 7805300f5..9df5c5f11 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -56,6 +56,7 @@
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
 import com.github.dockerjava.api.command.RemoveSecretCmd;
 import com.github.dockerjava.api.command.RemoveServiceCmd;
+import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.command.ResizeContainerCmd;
@@ -342,6 +343,15 @@ public interface DockerClient extends Closeable {
      */
     UpdateSwarmNodeCmd updateSwarmNodeCmd();
 
+    /**
+     * Remove the swarm node
+     *
+     * @param swarmNodeId swarmNodeId
+     * @return the command
+     * @since 1.24
+     */
+    RemoveSwarmNodeCmd removeSwarmNodeCmd(String swarmNodeId);
+
     /**
      * List nodes in swarm
      *
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java
index bb5db859e..15f96df45 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java
@@ -56,6 +56,7 @@
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
 import com.github.dockerjava.api.command.RemoveSecretCmd;
 import com.github.dockerjava.api.command.RemoveServiceCmd;
+import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.command.ResizeContainerCmd;
@@ -423,6 +424,11 @@ public UpdateSwarmNodeCmd updateSwarmNodeCmd() {
         return getDockerClient().updateSwarmNodeCmd();
     }
 
+    @Override
+    public RemoveSwarmNodeCmd removeSwarmNodeCmd(String swarmNodeId) {
+        return getDockerClient().removeSwarmNodeCmd(swarmNodeId);
+    }
+
     @Override
     public ListSwarmNodesCmd listSwarmNodesCmd() {
         return getDockerClient().listSwarmNodesCmd();
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java
index 198e7b8df..603c610b3 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java
@@ -18,7 +18,7 @@ public interface RemoveSwarmNodeCmd extends SyncDockerCmd<Void> {
     @CheckForNull
     Boolean hasForceEnabled();
 
-    RemoveSwarmNodeCmd withContainerId(@Nonnull String containerId);
+    RemoveSwarmNodeCmd withSwarmNodeId(@Nonnull String swarmNodeId);
 
     RemoveSwarmNodeCmd withForce(Boolean force);
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 277dada80..c27a33260 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -58,6 +58,7 @@
 import com.github.dockerjava.api.command.RemoveNetworkCmd;
 import com.github.dockerjava.api.command.RemoveSecretCmd;
 import com.github.dockerjava.api.command.RemoveServiceCmd;
+import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.command.RenameContainerCmd;
 import com.github.dockerjava.api.command.ResizeContainerCmd;
@@ -140,6 +141,7 @@
 import com.github.dockerjava.core.command.RemoveNetworkCmdImpl;
 import com.github.dockerjava.core.command.RemoveSecretCmdImpl;
 import com.github.dockerjava.core.command.RemoveServiceCmdImpl;
+import com.github.dockerjava.core.command.RemoveSwarmNodeCmdImpl;
 import com.github.dockerjava.core.command.RemoveVolumeCmdImpl;
 import com.github.dockerjava.core.command.RenameContainerCmdImpl;
 import com.github.dockerjava.core.command.ResizeContainerCmdImpl;
@@ -616,6 +618,11 @@ public UpdateSwarmNodeCmd updateSwarmNodeCmd() {
         return new UpdateSwarmNodeCmdImpl(getDockerCmdExecFactory().updateSwarmNodeCmdExec());
     }
 
+    @Override
+    public RemoveSwarmNodeCmd removeSwarmNodeCmd(String swarmNodeId) {
+        return new RemoveSwarmNodeCmdImpl(getDockerCmdExecFactory().removeSwarmNodeCmdExec(), swarmNodeId);
+    }
+
     @Override
     public ListSwarmNodesCmd listSwarmNodesCmd() {
         return new ListSwarmNodesCmdImpl(getDockerCmdExecFactory().listSwarmNodeCmdExec());
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java
index bf9029e72..e3efea938 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java
@@ -17,9 +17,9 @@ public class RemoveSwarmNodeCmdImpl extends AbstrDockerCmd<RemoveSwarmNodeCmd, V
 
     private Boolean force;
 
-    public RemoveSwarmNodeCmdImpl(RemoveSwarmNodeCmd.Exec exec, String containerId) {
+    public RemoveSwarmNodeCmdImpl(RemoveSwarmNodeCmd.Exec exec, String swarmNodeId) {
         super(exec);
-        withContainerId(containerId);
+        withSwarmNodeId(swarmNodeId);
     }
 
     @Override
@@ -35,7 +35,7 @@ public Boolean hasForceEnabled() {
     }
 
     @Override
-    public RemoveSwarmNodeCmd withContainerId(@Nonnull String swarmNodeId) {
+    public RemoveSwarmNodeCmd withSwarmNodeId(@Nonnull String swarmNodeId) {
         checkNotNull(swarmNodeId, "swarmNodeId was not specified");
         this.swarmNodeId = swarmNodeId;
         return this;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/RemoveSwarmNodeCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/RemoveSwarmNodeCmdExecIT.java
new file mode 100644
index 000000000..8bdee6947
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/RemoveSwarmNodeCmdExecIT.java
@@ -0,0 +1,44 @@
+package com.github.dockerjava.cmd.swarm;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.model.Swarm;
+import com.github.dockerjava.api.model.SwarmNode;
+import com.github.dockerjava.api.model.SwarmNodeRole;
+import com.google.common.collect.Lists;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.Optional;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+public class RemoveSwarmNodeCmdExecIT extends SwarmCmdIT {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoveSwarmNodeCmdExecIT.class);
+
+    @Test
+    public void testRemoveSwarmNode() throws Exception {
+        DockerClient dockerClient = startSwarm();
+        Swarm swarm = dockerClient.inspectSwarmCmd().exec();
+
+        DockerClient docker2 = startDockerInDocker();
+        docker2.joinSwarmCmd()
+               .withRemoteAddrs(Lists.newArrayList("docker1"))
+               .withJoinToken(swarm.getJoinTokens().getWorker())
+               .exec();
+        LOGGER.info("docker2 joined docker's swarm");
+
+        List<SwarmNode> nodes = dockerClient.listSwarmNodesCmd().exec();
+        assertThat(2, is(nodes.size()));
+        Optional<SwarmNode> firstWorkNode = nodes.stream().filter(node -> node.getSpec().getRole() == SwarmNodeRole.WORKER)
+                                                 .findFirst();
+        dockerClient.removeSwarmNodeCmd(firstWorkNode.get().getId())
+                    .withForce(true)
+                    .exec();
+        nodes = dockerClient.listSwarmNodesCmd().exec();
+        assertThat(nodes.size(), is(1));
+    }
+}

From a135d21fb308014adfe3ad184557354689f528b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A8=BE=E6=98=8E=E5=8D=8E?= <565209960@qq.com>
Date: Fri, 17 Dec 2021 19:56:08 +0800
Subject: [PATCH 1095/1272] add `until` param to `LogContainerCmd` (#1734)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add `until` param with LogContainerCmd

* Update LogContainerCmdIT.java

Co-authored-by: 訾明华 <zmh01@digibird.com.cn>
Co-authored-by: Sergei Egorov <bsideup@gmail.com>
---
 .../dockerjava/api/command/LogContainerCmd.java   |  7 +++++++
 .../core/command/LogContainerCmdImpl.java         | 15 ++++++++++++++-
 .../dockerjava/core/exec/LogContainerCmdExec.java |  4 ++++
 .../github/dockerjava/cmd/LogContainerCmdIT.java  |  1 +
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
index 53674cbaa..29c4516cd 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -25,6 +25,8 @@
  * @param since
  *            - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default:
  *            0 (unfiltered)
+ * @param until
+ *            - Only return logs before this time, as a UNIX timestamp. Default: 0
  */
 public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame> {
 
@@ -49,6 +51,9 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame>
     @CheckForNull
     Integer getSince();
 
+    @CheckForNull
+    Integer getUntil();
+
     LogContainerCmd withContainerId(@Nonnull String containerId);
 
     /**
@@ -69,6 +74,8 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame>
 
     LogContainerCmd withSince(Integer since);
 
+    LogContainerCmd withUntil(Integer until);
+
     /**
      * @throws com.github.dockerjava.api.NotFoundException
      *             No such container
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
index 5ba6261e8..d820ab1b9 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -24,6 +24,8 @@
  * @param since
  *            - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default:
  *            0 (unfiltered)
+ * @param until
+ *            - Only return logs before this time, as a UNIX timestamp. Default: 0
  */
 public class LogContainerCmdImpl extends AbstrAsyncDockerCmd<LogContainerCmd, Frame> implements LogContainerCmd {
 
@@ -31,7 +33,7 @@ public class LogContainerCmdImpl extends AbstrAsyncDockerCmd<LogContainerCmd, Fr
 
     private Boolean followStream, timestamps, stdout, stderr;
 
-    private Integer tail, since;
+    private Integer tail, since, until;
 
     public LogContainerCmdImpl(LogContainerCmd.Exec exec, String containerId) {
         super(exec);
@@ -73,6 +75,11 @@ public Integer getSince() {
         return since;
     }
 
+    @Override
+    public Integer getUntil() {
+        return until;
+    }
+
     @Override
     public LogContainerCmd withContainerId(String containerId) {
         checkNotNull(containerId, "containerId was not specified");
@@ -122,6 +129,12 @@ public LogContainerCmd withSince(Integer since) {
         return this;
     }
 
+    @Override
+    public LogContainerCmd withUntil(Integer until) {
+        this.until = until;
+        return this;
+    }
+
     @Override
     public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java
index 54168bb5e..357af6d0e 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java
@@ -32,6 +32,10 @@ protected Void execute0(LogContainerCmd command, ResultCallback<Frame> resultCal
             webTarget = webTarget.queryParam("since", command.getSince());
         }
 
+        if (command.getUntil() != null) {
+            webTarget = webTarget.queryParam("until", command.getUntil());
+        }
+
         webTarget = booleanQueryParam(webTarget, "timestamps", command.hasTimestampsEnabled());
         webTarget = booleanQueryParam(webTarget, "stdout", command.hasStdoutEnabled());
         webTarget = booleanQueryParam(webTarget, "stderr", command.hasStderrEnabled());
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
index b0de380db..6ab68abff 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
@@ -206,6 +206,7 @@ public void asyncLogContainerWithSince() throws Exception {
                 .withStdErr(true)
                 .withStdOut(true)
                 .withSince(timestamp)
+                .withUntil(timestamp + 1000)
                 .exec(loggingCallback);
 
         loggingCallback.awaitCompletion();

From a31aff8cf0eb14f12161e9cdc05d586feb68afef Mon Sep 17 00:00:00 2001
From: Chris <celers.dev@gmail.com>
Date: Mon, 27 Dec 2021 12:59:01 +0100
Subject: [PATCH 1096/1272] Fix wrong field returned from
 `ContainerMount#getMode` (#1713)

Co-authored-by: Chris <christofer@quedro.com>
---
 .../java/com/github/dockerjava/api/model/ContainerMount.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
index b8e53ae3b..a08a6ea3f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
@@ -106,7 +106,7 @@ public ContainerMount withDriver(String driver) {
      */
     @CheckForNull
     public String getMode() {
-        return driver;
+        return mode;
     }
 
     /**

From 38ee502e0cda73eaec9dcaa1054356ddf117d23d Mon Sep 17 00:00:00 2001
From: Quentin Loos <contact@quentinloos.be>
Date: Tue, 18 Jan 2022 18:27:31 +0100
Subject: [PATCH 1097/1272] Use POSIX extensions for tar archives (#1787)

Closes #1747

triggered error like
```
group id '1718009175' is too big ( > 2097151 ). Use STAR or POSIX extensions to overcome this limit
```

Use POSIX/PAX extensions to store big numbers in the archive.
Use POSIX/PAX extensions to store long file names in the archive.
---
 .../com/github/dockerjava/core/util/CompressArchiveUtil.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
index 4590abb13..797559077 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
@@ -98,7 +98,8 @@ public static File archiveTARFiles(File base, Iterable<File> files, String archi
         tarFile.deleteOnExit();
         try (TarArchiveOutputStream tos = new TarArchiveOutputStream(new GZIPOutputStream(new BufferedOutputStream(
                 new FileOutputStream(tarFile))))) {
-            tos.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
+            tos.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX);
+            tos.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_POSIX);
             for (File file : files) {
                 // relativize with method using Path otherwise method with File resolves the symlinks
                 // and this is not want we want. If the file is a symlink, the relativized path should

From 078348f2df64a4974276deadfe36f4f30f1cc028 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Thu, 27 Jan 2022 16:04:33 -0500
Subject: [PATCH 1098/1272] Add Java 17 to the CI matrix (#1794)

* Add Java 17 to the CI matrix

* Update ci.yml

* Update Lombok

* update japicmp

* Update Lombok, use Java 17
---
 .github/workflows/ci.yml | 11 ++++++-----
 docker-java-api/pom.xml  |  2 +-
 docker-java/pom.xml      |  2 +-
 pom.xml                  |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 73c35f57a..4ec27099e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,16 +11,17 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { name: "default" }
-          - { name: "over TCP", dockerHost: "tcp://127.0.0.1:2375" }
-          - { name: "Docker 18.06.3", dockerVersion: "18.06.3~ce~3-0~ubuntu" }
+          - { name: "default", javaVersion: 8 }
+          - { name: "default", javaVersion: 17 }
+          - { name: "over TCP", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 }
+          - { name: "Docker 18.06.3", dockerVersion: "18.06.3~ce~3-0~ubuntu", javaVersion: 8 }
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 8
+      - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 8
+          java-version: ${{matrix.javaVersion}}
       - name: Configure Docker
         env:
           DOCKER_VERSION: ${{matrix.dockerVersion}}
diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 92b46a613..1016da4ec 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.18</version>
+			<version>1.18.22</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index b9db85b9c..453851ce1 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -137,7 +137,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.18</version>
+			<version>1.18.22</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
diff --git a/pom.xml b/pom.xml
index 4a036a8e3..070fc2e74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -236,7 +236,7 @@
 					<!-- use with "mvn -DskipTests clean verify" -->
 					<groupId>com.github.siom79.japicmp</groupId>
 					<artifactId>japicmp-maven-plugin</artifactId>
-					<version>0.14.3</version>
+					<version>0.15.4</version>
 					<configuration>
 						<oldVersion>
 							<dependency>

From e100e2581fd5ffcbfb3b5b65cfcd38b924de9b9a Mon Sep 17 00:00:00 2001
From: Pasqual Koschmieder <pasqual.koschmieder@gmail.com>
Date: Fri, 4 Feb 2022 23:13:16 +0100
Subject: [PATCH 1099/1272] Use a non-blocking output stream for socket writes
 (#1769)

Essentially: Channels.newOutputStream and Channels.newInputStream are synchronizing on the blocking lock provided by the SelectableChannel#blockingLock method. This prevents writing a command to a container stdin while there is no output printed to stdout. This is a long known issue in java and was fixed partially in java 13 (see https://bugs.java.com/bugdatabase/view_bug.do?bug_id=8222774). Concurrent read/writes aren't a problem there anymore as well.

References:

https://bugs.java.com/bugdatabase/view_bug.do?bug_id=4509080
https://bugs.java.com/bugdatabase/view_bug.do?bug_id=4774871
https://bugs.java.com/bugdatabase/view_bug.do?bug_id=6977788
Closes #1768
---
 .../dockerjava/transport/UnixSocket.java      | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java
index 0a9338771..de447db61 100644
--- a/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java
+++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java
@@ -6,8 +6,10 @@
 import java.net.Socket;
 import java.net.SocketAddress;
 import java.net.SocketException;
+import java.nio.ByteBuffer;
 import java.nio.channels.Channels;
 import java.nio.channels.SocketChannel;
+import java.nio.channels.WritableByteChannel;
 
 public class UnixSocket extends AbstractSocket {
 
@@ -67,7 +69,7 @@ public OutputStream getOutputStream() throws IOException {
             throw new SocketException("Socket output is shutdown");
         }
 
-        return Channels.newOutputStream(socketChannel);
+        return Channels.newOutputStream(new WrappedWritableByteChannel());
     }
 
     @Override
@@ -85,4 +87,22 @@ public void close() throws IOException {
         super.close();
         this.socketChannel.close();
     }
+
+    private class WrappedWritableByteChannel implements WritableByteChannel {
+
+        @Override
+        public int write(ByteBuffer src) throws IOException {
+            return UnixSocket.this.socketChannel.write(src);
+        }
+
+        @Override
+        public boolean isOpen() {
+            return UnixSocket.this.socketChannel.isOpen();
+        }
+
+        @Override
+        public void close() throws IOException {
+            UnixSocket.this.socketChannel.close();
+        }
+    }
 }

From d44a7a1d2169df217a9ca26d687d0613f22895ca Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 4 Feb 2022 18:04:55 -0500
Subject: [PATCH 1100/1272] Support path of DOCKER_HOST (#1801)

* Support path of DOCKER_HOST

* use a more advanced path

* Fix path-less scenario in `OkDockerHttpClient`
---
 docker-java-transport-httpclient5/pom.xml     |  7 +++
 .../ApacheDockerHttpClientImpl.java           |  9 ++-
 .../transport/HttpClient5Tests.java           | 16 ++++++
 docker-java-transport-jersey/pom.xml          | 14 +++++
 .../dockerjava/transport/JerseyTests.java     | 17 ++++++
 docker-java-transport-okhttp/pom.xml          |  7 +++
 .../dockerjava/okhttp/OkDockerHttpClient.java |  4 ++
 .../transport/OkHttpClientTests.java          | 17 ++++++
 docker-java-transport-tck/pom.xml             | 49 +++++++++++++++++
 .../transport/DockerHttpClientTCK.java        | 55 +++++++++++++++++++
 pom.xml                                       |  1 +
 11 files changed, 195 insertions(+), 1 deletion(-)
 create mode 100644 docker-java-transport-httpclient5/src/test/java/com/github/dockerjava/transport/HttpClient5Tests.java
 create mode 100644 docker-java-transport-jersey/src/test/java/com/github/dockerjava/transport/JerseyTests.java
 create mode 100644 docker-java-transport-okhttp/src/test/java/com/github/dockerjava/transport/OkHttpClientTests.java
 create mode 100644 docker-java-transport-tck/pom.xml
 create mode 100644 docker-java-transport-tck/src/main/java/com/github/dockerjava/transport/DockerHttpClientTCK.java

diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml
index aff37f383..057739a39 100644
--- a/docker-java-transport-httpclient5/pom.xml
+++ b/docker-java-transport-httpclient5/pom.xml
@@ -39,6 +39,13 @@
 			<artifactId>jna</artifactId>
 			<version>5.8.0</version>
 		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java-transport-tck</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
index 468786295..268efe4af 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
@@ -51,6 +51,7 @@ class ApacheDockerHttpClientImpl implements DockerHttpClient {
 
     private final CloseableHttpClient httpClient;
     private final HttpHost host;
+    private final String pathPrefix;
 
     protected ApacheDockerHttpClientImpl(
         URI dockerHost,
@@ -64,9 +65,14 @@ protected ApacheDockerHttpClientImpl(
         switch (dockerHost.getScheme()) {
             case "unix":
             case "npipe":
+                pathPrefix = "";
                 host = new HttpHost(dockerHost.getScheme(), "localhost", 2375);
                 break;
             case "tcp":
+                String rawPath = dockerHost.getRawPath();
+                pathPrefix = rawPath.endsWith("/")
+                    ? rawPath.substring(0, rawPath.length() - 1)
+                    : rawPath;
                 host = new HttpHost(
                     socketFactoryRegistry.lookup("https") != null ? "https" : "http",
                     dockerHost.getHost(),
@@ -74,6 +80,7 @@ protected ApacheDockerHttpClientImpl(
                 );
                 break;
             default:
+                pathPrefix = "";
                 host = HttpHost.create(dockerHost);
         }
 
@@ -159,7 +166,7 @@ public Socket createSocket(HttpContext context) {
     @Override
     public Response execute(Request request) {
         HttpContext context = new BasicHttpContext();
-        HttpUriRequestBase httpUriRequest = new HttpUriRequestBase(request.method(), URI.create(request.path()));
+        HttpUriRequestBase httpUriRequest = new HttpUriRequestBase(request.method(), URI.create(pathPrefix + request.path()));
         httpUriRequest.setScheme(host.getSchemeName());
         httpUriRequest.setAuthority(new URIAuthority(host.getHostName(), host.getPort()));
 
diff --git a/docker-java-transport-httpclient5/src/test/java/com/github/dockerjava/transport/HttpClient5Tests.java b/docker-java-transport-httpclient5/src/test/java/com/github/dockerjava/transport/HttpClient5Tests.java
new file mode 100644
index 000000000..d83621f78
--- /dev/null
+++ b/docker-java-transport-httpclient5/src/test/java/com/github/dockerjava/transport/HttpClient5Tests.java
@@ -0,0 +1,16 @@
+package com.github.dockerjava.transport;
+
+import com.github.dockerjava.httpclient5.ApacheDockerHttpClient;
+
+import java.net.URI;
+
+public class HttpClient5Tests extends DockerHttpClientTCK {
+
+    @Override
+    protected DockerHttpClient createDockerHttpClient(URI dockerHost, SSLConfig sslConfig) {
+        return new ApacheDockerHttpClient.Builder()
+            .dockerHost(dockerHost)
+            .sslConfig(sslConfig)
+            .build();
+    }
+}
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index 3a257414b..c6e778c89 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -68,6 +68,20 @@
 			<artifactId>junixsocket-native-common</artifactId>
 			<version>${junixsocket.version}</version>
 		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<version>1.7.30</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java-transport-tck</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/docker-java-transport-jersey/src/test/java/com/github/dockerjava/transport/JerseyTests.java b/docker-java-transport-jersey/src/test/java/com/github/dockerjava/transport/JerseyTests.java
new file mode 100644
index 000000000..46626d496
--- /dev/null
+++ b/docker-java-transport-jersey/src/test/java/com/github/dockerjava/transport/JerseyTests.java
@@ -0,0 +1,17 @@
+package com.github.dockerjava.transport;
+
+import com.github.dockerjava.jaxrs.JerseyDockerHttpClient;
+
+import java.net.URI;
+
+public class JerseyTests extends DockerHttpClientTCK {
+
+    @Override
+    protected DockerHttpClient createDockerHttpClient(URI dockerHost, SSLConfig sslConfig) {
+        return new JerseyDockerHttpClient.Builder()
+            .dockerHost(dockerHost)
+            .sslConfig(sslConfig)
+            .connectTimeout(30 * 1000)
+            .build();
+    }
+}
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index fda31db4f..0178b96c2 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -33,6 +33,13 @@
 			<artifactId>jna-platform</artifactId>
 			<version>5.8.0</version>
 		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java-transport-tck</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
index 3778d8bb4..5b8593d1e 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
@@ -169,6 +169,10 @@ private OkDockerHttpClient(
                     .scheme(isSSL ? "https" : "http")
                     .host(dockerHost.getHost())
                     .port(dockerHost.getPort());
+
+                if (dockerHost.getPath().length() > 0) {
+                    baseUrlBuilder = baseUrlBuilder.encodedPath(dockerHost.getPath());
+                }
                 break;
             default:
                 baseUrlBuilder = HttpUrl.get(dockerHost.toString()).newBuilder();
diff --git a/docker-java-transport-okhttp/src/test/java/com/github/dockerjava/transport/OkHttpClientTests.java b/docker-java-transport-okhttp/src/test/java/com/github/dockerjava/transport/OkHttpClientTests.java
new file mode 100644
index 000000000..9a5b77ff3
--- /dev/null
+++ b/docker-java-transport-okhttp/src/test/java/com/github/dockerjava/transport/OkHttpClientTests.java
@@ -0,0 +1,17 @@
+package com.github.dockerjava.transport;
+
+import com.github.dockerjava.okhttp.OkDockerHttpClient;
+
+import java.net.URI;
+
+public class OkHttpClientTests extends DockerHttpClientTCK {
+
+    @Override
+    protected DockerHttpClient createDockerHttpClient(URI dockerHost, SSLConfig sslConfig) {
+        return new OkDockerHttpClient.Builder()
+            .dockerHost(dockerHost)
+            .sslConfig(sslConfig)
+            .connectTimeout(30 * 100)
+            .build();
+    }
+}
diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml
new file mode 100644
index 000000000..a92a6b002
--- /dev/null
+++ b/docker-java-transport-tck/pom.xml
@@ -0,0 +1,49 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.github.docker-java</groupId>
+		<artifactId>docker-java-parent</artifactId>
+		<version>0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>docker-java-transport-tck</artifactId>
+	<packaging>jar</packaging>
+
+	<name>docker-java-transport-tck</name>
+	<url>https://github.com/docker-java/docker-java</url>
+	<description>Java API Client for Docker</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java-transport</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>3.22.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>mockwebserver</artifactId>
+			<version>3.14.9</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/docker-java-transport-tck/src/main/java/com/github/dockerjava/transport/DockerHttpClientTCK.java b/docker-java-transport-tck/src/main/java/com/github/dockerjava/transport/DockerHttpClientTCK.java
new file mode 100644
index 000000000..344ef7f32
--- /dev/null
+++ b/docker-java-transport-tck/src/main/java/com/github/dockerjava/transport/DockerHttpClientTCK.java
@@ -0,0 +1,55 @@
+package com.github.dockerjava.transport;
+
+import com.github.dockerjava.transport.DockerHttpClient.Request;
+import com.github.dockerjava.transport.DockerHttpClient.Request.Method;
+import com.github.dockerjava.transport.DockerHttpClient.Response;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import org.junit.Test;
+
+import java.net.URI;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public abstract class DockerHttpClientTCK {
+
+    protected abstract DockerHttpClient createDockerHttpClient(URI dockerHost, SSLConfig sslConfig);
+
+    /**
+     * Test that docker-java supports path in DOCKER_HOST
+     *
+     * @see <a href="https://github.com/moby/moby/blob/7b9275c0da707b030e62c96b679a976f31f929d3/opts/hosts_test.go#L64">valid values</a>
+     */
+    @Test
+    public final void testPath() throws Exception {
+        try (MockWebServer server = new MockWebServer()) {
+            String dockerHost = server.url("/%20some/path/").toString()
+                .replace("http://", "tcp://");
+
+            try (DockerHttpClient client = createDockerHttpClient(dockerHost)) {
+                server.enqueue(new MockResponse().setResponseCode(200));
+                ping(client);
+                assertThat(server.takeRequest().getPath())
+                    .as("recorded path")
+                    .isEqualTo("/%20some/path/_ping");
+            }
+        }
+    }
+
+    private DockerHttpClient createDockerHttpClient(String dockerHost) {
+        return createDockerHttpClient(URI.create(dockerHost), null);
+    }
+
+    private void ping(DockerHttpClient client) {
+        Request pingRequest = Request.builder()
+            .method(Method.GET)
+            .path("/_ping")
+            .build();
+
+        try (Response response = client.execute(pingRequest)) {
+            assertThat(response.getStatusCode())
+                .as("status code")
+                .isEqualTo(200);
+        }
+    }
+}
diff --git a/pom.xml b/pom.xml
index 070fc2e74..7da7062b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,7 @@
 		<module>docker-java-bom</module>
 		<module>docker-java-core</module>
 		<module>docker-java-transport</module>
+		<module>docker-java-transport-tck</module>
 		<module>docker-java-transport-netty</module>
 		<module>docker-java-transport-jersey</module>
 		<module>docker-java-transport-okhttp</module>

From 7a0a11182401332100bbe28cdd1eba995b4dce1b Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Fri, 4 Feb 2022 20:58:33 -0500
Subject: [PATCH 1101/1272] Do not parameterize command tests, use TCK (#1803)

* Do not parameterize command tests, use TCK

* Cleanups

* debug

* cleanup

* debug

* debug

* debug

* debug

* debug

* Unset DOCKER_HOST if empty

* always listen on unix socket
---
 .ci/setup_docker.sh                           |   2 +-
 .github/workflows/ci.yml                      |  12 +-
 .../core/DefaultDockerClientConfig.java       |   6 +-
 .../dockerjava/transport/JerseyTests.java     |   9 ++
 docker-java-transport-tck/pom.xml             |  17 +++
 .../transport/DockerHttpClientTCK.java        |  93 +++++++++++++++
 .../dockerjava/cmd/AttachContainerCmdIT.java  |  49 --------
 .../java/com/github/dockerjava/cmd/CmdIT.java | 108 +++---------------
 .../dockerjava/cmd/ConnectToNetworkCmdIT.java |  10 +-
 .../cmd/CopyArchiveFromContainerCmdIT.java    |   4 +-
 .../cmd/CopyArchiveToContainerCmdIT.java      |   4 +-
 .../cmd/CopyFileFromContainerCmdIT.java       |   2 +-
 .../dockerjava/cmd/CreateContainerCmdIT.java  |  40 +++----
 .../dockerjava/cmd/CreateNetworkCmdIT.java    |  12 +-
 .../dockerjava/cmd/CustomCommandIT.java       |   3 +-
 .../cmd/DisconnectFromNetworkCmdIT.java       |   6 +-
 .../github/dockerjava/cmd/PushImageCmdIT.java |   2 +-
 .../dockerjava/cmd/RemoveVolumeCmdIT.java     |   2 +-
 .../dockerjava/cmd/RenameContainerCmdIT.java  |   4 +-
 .../dockerjava/cmd/StartContainerCmdIT.java   |  10 +-
 .../dockerjava/cmd/swarm/SwarmCmdIT.java      |   2 +-
 .../github/dockerjava/core/DockerRule.java    |  67 +----------
 .../dockerjava/junit/PrivateRegistryRule.java |   4 +-
 23 files changed, 193 insertions(+), 275 deletions(-)

diff --git a/.ci/setup_docker.sh b/.ci/setup_docker.sh
index fd71ffd48..df9cf205a 100755
--- a/.ci/setup_docker.sh
+++ b/.ci/setup_docker.sh
@@ -21,7 +21,7 @@ if [[ -n $DOCKER_HOST ]]; then
     echo "
 [Service]
 ExecStart=
-ExecStart=/usr/bin/dockerd -H $DOCKER_HOST
+ExecStart=/usr/bin/dockerd -H $DOCKER_HOST -H unix:///var/run/docker.sock
     " | sudo tee -a /etc/systemd/system/docker.service.d/override.conf
 
     sudo systemctl daemon-reload
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4ec27099e..255ad5a43 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,14 +30,6 @@ jobs:
       - name: Build with Maven
         env:
           DOCKER_HOST: ${{matrix.dockerHost}}
-        run: ./mvnw --no-transfer-progress verify
-      - name: Aggregate test reports with ciMate
-        if: always()
-        continue-on-error: true
-        env:
-          CIMATE_PROJECT_ID: lodr9d83
-          CIMATE_CI_KEY: "CI / ${{matrix.name}}"
         run: |
-          wget -q https://get.cimate.io/release/linux/cimate
-          chmod +x cimate
-          ./cimate "**/TEST-*.xml"
+          [[ -z "$DOCKER_HOST" ]] && unset DOCKER_HOST
+          ./mvnw --no-transfer-progress verify
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index c22d5cd71..9637e27aa 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -22,6 +22,7 @@
 import java.net.URI;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
 
@@ -102,7 +103,10 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf
     }
 
     private URI checkDockerHostScheme(URI dockerHost) {
-        switch (dockerHost.getScheme()) {
+        if (dockerHost == null) {
+            throw new DockerClientException("'dockerHost' is null");
+        }
+        switch (Objects.toString(dockerHost.getScheme())) {
             case "tcp":
             case "unix":
             case "npipe":
diff --git a/docker-java-transport-jersey/src/test/java/com/github/dockerjava/transport/JerseyTests.java b/docker-java-transport-jersey/src/test/java/com/github/dockerjava/transport/JerseyTests.java
index 46626d496..64dfe3966 100644
--- a/docker-java-transport-jersey/src/test/java/com/github/dockerjava/transport/JerseyTests.java
+++ b/docker-java-transport-jersey/src/test/java/com/github/dockerjava/transport/JerseyTests.java
@@ -1,6 +1,8 @@
 package com.github.dockerjava.transport;
 
 import com.github.dockerjava.jaxrs.JerseyDockerHttpClient;
+import org.junit.Ignore;
+import org.junit.Test;
 
 import java.net.URI;
 
@@ -14,4 +16,11 @@ protected DockerHttpClient createDockerHttpClient(URI dockerHost, SSLConfig sslC
             .connectTimeout(30 * 1000)
             .build();
     }
+
+    @Test
+    @Ignore("does not support hijacking")
+    @Override
+    public void testHijacking() throws Exception {
+        super.testHijacking();
+    }
 }
diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml
index a92a6b002..f65fead09 100644
--- a/docker-java-transport-tck/pom.xml
+++ b/docker-java-transport-tck/pom.xml
@@ -16,6 +16,11 @@
 	<description>Java API Client for Docker</description>
 
 	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>docker-java-transport</artifactId>
@@ -33,6 +38,18 @@
 			<artifactId>mockwebserver</artifactId>
 			<version>3.14.9</version>
 		</dependency>
+
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>testcontainers</artifactId>
+			<version>1.16.3</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-jdk14</artifactId>
+			<version>1.7.35</version>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/docker-java-transport-tck/src/main/java/com/github/dockerjava/transport/DockerHttpClientTCK.java b/docker-java-transport-tck/src/main/java/com/github/dockerjava/transport/DockerHttpClientTCK.java
index 344ef7f32..f90973be6 100644
--- a/docker-java-transport-tck/src/main/java/com/github/dockerjava/transport/DockerHttpClientTCK.java
+++ b/docker-java-transport-tck/src/main/java/com/github/dockerjava/transport/DockerHttpClientTCK.java
@@ -1,20 +1,64 @@
 package com.github.dockerjava.transport;
 
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.DefaultDockerClientConfig;
+import com.github.dockerjava.core.DockerClientImpl;
 import com.github.dockerjava.transport.DockerHttpClient.Request;
 import com.github.dockerjava.transport.DockerHttpClient.Request.Method;
 import com.github.dockerjava.transport.DockerHttpClient.Response;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import org.junit.Test;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.dockerclient.TransportConfig;
 
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
 import java.net.URI;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public abstract class DockerHttpClientTCK {
 
     protected abstract DockerHttpClient createDockerHttpClient(URI dockerHost, SSLConfig sslConfig);
 
+    @Test
+    public void testHijacking() throws Exception {
+        try (
+            DockerClient client = createDockerClient();
+
+            PipedOutputStream out = new PipedOutputStream();
+            PipedInputStream in = new PipedInputStream(out);
+
+            AttachContainerTestCallback callback = new AttachContainerTestCallback();
+
+            AttacheableContainer container = new AttacheableContainer() {
+                @Override
+                protected void containerIsCreated(String containerId) {
+                    client.attachContainerCmd(containerId)
+                        .withStdOut(true)
+                        .withFollowStream(true)
+                        .withStdIn(in)
+                        .exec(callback);
+                }
+            };
+        ) {
+            container.start();
+            assertThat(callback.awaitStarted(5, SECONDS)).as("attached").isTrue();
+
+            String snippet = "hello world";
+            out.write((snippet + "\n").getBytes());
+            out.flush();
+
+            assertThat(callback.awaitCompletion(15, SECONDS)).as("completed").isTrue();
+            assertThat(callback.toString()).contains("STDOUT: " + snippet);
+        }
+    }
+
     /**
      * Test that docker-java supports path in DOCKER_HOST
      *
@@ -36,10 +80,27 @@ public final void testPath() throws Exception {
         }
     }
 
+    private DockerHttpClient createDockerHttpClient() {
+        // Use Testcontainers to detect Docker environment
+        TransportConfig transportConfig = DockerClientFactory.instance().getTransportConfig();
+        return createDockerHttpClient(transportConfig.getDockerHost(), transportConfig.getSslConfig());
+    }
+
     private DockerHttpClient createDockerHttpClient(String dockerHost) {
         return createDockerHttpClient(URI.create(dockerHost), null);
     }
 
+    private DockerClient createDockerClient() {
+        return createDockerClient(createDockerHttpClient());
+    }
+
+    private DockerClient createDockerClient(DockerHttpClient dockerHttpClient) {
+        return DockerClientImpl.getInstance(
+            DefaultDockerClientConfig.createDefaultConfigBuilder().build(),
+            dockerHttpClient
+        );
+    }
+
     private void ping(DockerHttpClient client) {
         Request pingRequest = Request.builder()
             .method(Method.GET)
@@ -52,4 +113,36 @@ private void ping(DockerHttpClient client) {
                 .isEqualTo(200);
         }
     }
+
+    private static class AttachContainerTestCallback extends ResultCallback.Adapter<Frame> {
+
+        private final StringBuffer log = new StringBuffer();
+
+        @Override
+        public void onNext(Frame item) {
+            log.append(item.toString());
+            super.onNext(item);
+        }
+
+        @Override
+        public String toString() {
+            return log.toString();
+        }
+    }
+
+    private static class AttacheableContainer extends GenericContainer<AttacheableContainer> {
+
+        private AttacheableContainer() {
+            super("busybox:1.35.0");
+
+            withCommand("/bin/sh", "-c", "read line && echo $line");
+            withCreateContainerCmdModifier(it -> {
+                it.withTty(false);
+                it.withAttachStdin(true);
+                it.withAttachStdout(true);
+                it.withAttachStderr(true);
+                it.withStdinOpen(true);
+            });
+        }
+    }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
index 6913c21c0..0e2df4cd4 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
@@ -44,8 +44,6 @@ public class AttachContainerCmdIT extends CmdIT {
     public void attachContainerWithStdin() throws Exception {
         DockerClient dockerClient = dockerRule.getClient();
 
-        Assume.assumeTrue("supports stdin attach", getFactoryType().supportsStdinAttach());
-
         String snippet = "hello world";
 
         CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
@@ -183,53 +181,6 @@ public void onNext(Frame frame) {
         assertThat(callback.toString(), containsString("stdout\r\nstderr"));
     }
 
-    @Test
-    public void attachContainerStdinUnsupported() throws Exception {
-
-        DockerClient dockerClient = dockerRule.getClient();
-        Assume.assumeFalse("does not support stdin attach", getFactoryType().supportsStdinAttach());
-        expectedException.expect(UnsupportedOperationException.class);
-
-        String snippet = "hello world";
-
-        CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE)
-            .withCmd("echo", snippet)
-            .withTty(false)
-            .withAttachStdin(true)
-            .withAttachStdout(true)
-            .withAttachStderr(true)
-            .exec();
-
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(is(emptyString())));
-
-        AttachContainerTestCallback callback = new AttachContainerTestCallback() {
-            @Override
-            public void onNext(Frame frame) {
-                assertThat(frame.getStreamType(), equalTo(StreamType.STDOUT));
-                super.onNext(frame);
-            }
-        };
-
-        InputStream stdin = new ByteArrayInputStream("".getBytes());
-
-        dockerClient.attachContainerCmd(container.getId())
-            .withStdErr(true)
-            .withStdOut(true)
-            .withFollowStream(true)
-            .withLogs(true)
-            .withStdIn(stdin)
-            .exec(callback);
-
-        assertFalse("Processing of the response is not expected to be started" +
-            " because `attachContainerCmd` with stdin is not supported", callback.awaitStarted(5, SECONDS));
-
-        dockerClient.startContainerCmd(container.getId()).exec();
-
-        callback.awaitCompletion(30, TimeUnit.SECONDS);
-        callback.close();
-    }
-
     /**
      * {@link ResultCallback#onComplete()} should be called immediately after
      * container exit. It was broken for Netty and TLS connection.
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
index 12664c4e5..b01cb1e90 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CmdIT.java
@@ -5,116 +5,34 @@
 import com.github.dockerjava.core.DockerClientImpl;
 import com.github.dockerjava.core.DockerRule;
 import com.github.dockerjava.httpclient5.ApacheDockerHttpClient;
-import com.github.dockerjava.jaxrs.JerseyDockerHttpClient;
 import com.github.dockerjava.junit.category.Integration;
-import com.github.dockerjava.netty.NettyDockerCmdExecFactory;
-import com.github.dockerjava.okhttp.OkDockerHttpClient;
+import com.github.dockerjava.transport.DockerHttpClient;
 import org.junit.Rule;
 import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
 
 /**
  * @author Kanstantsin Shautsou
  */
 @Category(Integration.class)
-@RunWith(Parameterized.class)
 public abstract class CmdIT {
-    public enum FactoryType {
-        NETTY(true) {
-            @Override
-            public DockerClientImpl createDockerClient(DockerClientConfig config) {
-                return (DockerClientImpl) DockerClientBuilder.getInstance(config)
-                    .withDockerCmdExecFactory(
-                        new NettyDockerCmdExecFactory()
-                            .withConnectTimeout(30 * 1000)
-                    )
-                    .build();
-            }
-        },
-        JERSEY(false) {
-            @Override
-            public DockerClientImpl createDockerClient(DockerClientConfig config) {
-                return (DockerClientImpl) DockerClientBuilder.getInstance(config)
-                    .withDockerHttpClient(
-                        new TrackingDockerHttpClient(
-                            new JerseyDockerHttpClient.Builder()
-                                .dockerHost(config.getDockerHost())
-                                .sslConfig(config.getSSLConfig())
-                                .connectTimeout(30 * 1000)
-                                .build()
-                        )
-                    )
-                    .build();
-            }
-        },
-        OKHTTP(true) {
-            @Override
-            public DockerClientImpl createDockerClient(DockerClientConfig config) {
-                return (DockerClientImpl) DockerClientBuilder.getInstance(config)
-                    .withDockerHttpClient(
-                        new TrackingDockerHttpClient(
-                            new OkDockerHttpClient.Builder()
-                                .dockerHost(config.getDockerHost())
-                                .sslConfig(config.getSSLConfig())
-                                .connectTimeout(30 * 100)
-                                .build()
-                        )
-                    )
-                    .build();
-            }
-        },
-        HTTPCLIENT5(true) {
-            @Override
-            public DockerClientImpl createDockerClient(DockerClientConfig config) {
-                return (DockerClientImpl) DockerClientBuilder.getInstance(config)
-                    .withDockerHttpClient(
-                        new TrackingDockerHttpClient(
-                            new ApacheDockerHttpClient.Builder()
-                                .dockerHost(config.getDockerHost())
-                                .sslConfig(config.getSSLConfig())
-                                .build()
-                        )
-                    )
-                    .build();
-            }
-        };
-
-        private final String subnetPrefix;
-        private final boolean supportsStdinAttach;
-
-        FactoryType(boolean supportsStdinAttach) {
-            this.subnetPrefix = "10." + (100 + ordinal()) + ".";
-            this.supportsStdinAttach = supportsStdinAttach;
-        }
-
-        public String getSubnetPrefix() {
-            return subnetPrefix;
-        }
 
-        public boolean supportsStdinAttach() {
-            return supportsStdinAttach;
-        }
-
-        public abstract DockerClientImpl createDockerClient(DockerClientConfig config);
-    }
-
-    @Parameterized.Parameters(name = "{index}:{0}")
-    public static Iterable<FactoryType> data() {
-        return Arrays.asList(FactoryType.values());
+    public static DockerHttpClient createDockerHttpClient(DockerClientConfig config) {
+        return new TrackingDockerHttpClient(
+            new ApacheDockerHttpClient.Builder()
+                .dockerHost(config.getDockerHost())
+                .sslConfig(config.getSSLConfig())
+                .build()
+        );
     }
 
-    @Parameterized.Parameter
-    public FactoryType factoryType;
-
-    public FactoryType getFactoryType() {
-        return factoryType;
+    public static DockerClientImpl createDockerClient(DockerClientConfig config) {
+        return (DockerClientImpl) DockerClientBuilder.getInstance(config)
+            .withDockerHttpClient(createDockerHttpClient(config))
+            .build();
     }
 
     @Rule
-    public DockerRule dockerRule = new DockerRule( this);
+    public DockerRule dockerRule = new DockerRule();
 
     @Rule
     public DockerHttpClientLeakDetector leakDetector = new DockerHttpClientLeakDetector();
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java
index b7c28e8bc..40b552611 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ConnectToNetworkCmdIT.java
@@ -26,7 +26,7 @@ public class ConnectToNetworkCmdIT extends CmdIT {
     @Test
     public void connectToNetwork() throws InterruptedException {
         assumeNotSwarm("no network in swarm", dockerRule);
-        String networkName = "connectToNetwork" + dockerRule.getKind();
+        String networkName = "connectToNetwork";
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999").exec();
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
@@ -48,8 +48,8 @@ public void connectToNetwork() throws InterruptedException {
     public void connectToNetworkWithContainerNetwork() throws InterruptedException {
         assumeNotSwarm("no network in swarm", dockerRule);
 
-        final String subnetPrefix = getFactoryType().getSubnetPrefix() + "100";
-        final String networkName = "ContainerWithNetwork" + dockerRule.getKind();
+        final String subnetPrefix = "10.100.100";
+        final String networkName = "ContainerWithNetwork";
         final String containerIp = subnetPrefix + ".100";
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
@@ -74,7 +74,7 @@ public void connectToNetworkWithContainerNetwork() throws InterruptedException {
             .withNetworkId(network.getId())
             .withContainerId(container.getId())
             .withContainerNetwork(new ContainerNetwork()
-                .withAliases("aliasName" + dockerRule.getKind())
+                .withAliases("aliasName")
                 .withIpamConfig(new ContainerNetwork.Ipam()
                     .withIpv4Address(containerIp)))
             .exec();
@@ -89,7 +89,7 @@ public void connectToNetworkWithContainerNetwork() throws InterruptedException {
 
         ContainerNetwork testNetwork = inspectContainerResponse.getNetworkSettings().getNetworks().get(networkName);
         assertNotNull(testNetwork);
-        assertThat(testNetwork.getAliases(), hasItem("aliasName" + dockerRule.getKind()));
+        assertThat(testNetwork.getAliases(), hasItem("aliasName"));
         assertThat(testNetwork.getGateway(), is(subnetPrefix + ".1"));
         assertThat(testNetwork.getIpAddress(), is(containerIp));
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java
index 9cede72e8..a0eb585eb 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java
@@ -33,7 +33,7 @@ public class CopyArchiveFromContainerCmdIT extends CmdIT {
     public void copyFromContainer() throws Exception {
         // TODO extract this into a shared method
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
-                .withName("copyFromContainer" + dockerRule.getKind())
+                .withName("copyFromContainer")
                 .withCmd("touch", "/copyFromContainer")
                 .exec();
 
@@ -59,7 +59,7 @@ public void copyFromNonExistingContainer() throws Exception {
     @Test
     public void copyFromContainerBinaryFile() throws Exception {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
-                .withName("copyFromContainerBinaryFile" + dockerRule.getKind())
+                .withName("copyFromContainerBinaryFile")
                 .exec();
 
         LOG.info("Created container: {}", container);
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
index 307c1e17c..c8bac183a 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
@@ -60,7 +60,7 @@ public void copyStreamToContainerTwice() throws Exception {
 
     private CreateContainerResponse prepareContainerForCopy(String method) {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
-                .withName("docker-java-itest-copyToContainer" + method + dockerRule.getKind())
+                .withName("docker-java-itest-copyToContainer" + method)
                 .exec();
         LOG.info("Created container: {}", container);
         assertThat(container.getId(), not(isEmptyOrNullString()));
@@ -125,7 +125,7 @@ public void copyFileWithExecutePermission() throws Exception {
         // script to be copied to the container's home dir and then executes it
         String containerCmd = "sleep 3; /home/" + scriptPath.getFileName().toString();
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
-                .withName("copyFileWithExecutivePerm" + dockerRule.getKind())
+                .withName("copyFileWithExecutivePerm")
                 .withCmd("/bin/sh", "-c", containerCmd)
                 .exec();
         // start the container
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java
index ffef0d38a..74bbad671 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java
@@ -28,7 +28,7 @@ public void copyFromContainer() throws Exception {
 
         assumeNotSwarm("", dockerRule);
 
-        String containerName = "copyFileFromContainer" + dockerRule.getKind();
+        String containerName = "copyFileFromContainer";
         dockerRule.ensureContainerRemoved(containerName);
 
         // TODO extract this into a shared method
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index b70d6fc08..3eb63770f 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -364,7 +364,7 @@ public void createContainerWithHostname() throws Exception {
 
     @Test(expected = ConflictException.class)
     public void createContainerWithName() throws DockerException {
-        String containerName = "container_" + dockerRule.getKind();
+        String containerName = "container_";
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withName(containerName)
@@ -386,8 +386,8 @@ public void createContainerWithName() throws DockerException {
 
     @Test
     public void createContainerWithLink() throws DockerException {
-        String containerName1 = "containerWithlink_" + dockerRule.getKind();
-        String containerName2 = "container2Withlink_" + dockerRule.getKind();
+        String containerName1 = "containerWithlink_";
+        String containerName2 = "container2Withlink_";
 
         CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("sleep", "9999")
                 .withName(containerName1).exec();
@@ -437,9 +437,9 @@ public void createContainerWithMemorySwappiness() throws DockerException {
 
     @Test
     public void createContainerWithLinkInCustomNetwork() throws DockerException {
-        String containerName1 = "containerCustomlink_" + dockerRule.getKind();
-        String containerName2 = "containerCustom2link_" + dockerRule.getKind();
-        String networkName = "linkNetcustom" + dockerRule.getKind();
+        String containerName1 = "containerCustomlink_";
+        String containerName2 = "containerCustom2link_";
+        String networkName = "linkNetcustom";
 
         CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd()
                 .withName(networkName)
@@ -485,9 +485,9 @@ public void createContainerWithLinkInCustomNetwork() throws DockerException {
 
     @Test
     public void createContainerWithCustomIp() throws DockerException {
-        String containerName1 = "containerCustomIplink_" + dockerRule.getKind();
-        String networkName = "customIpNet" + dockerRule.getKind();
-        String subnetPrefix = getFactoryType().getSubnetPrefix() + "101";
+        String containerName1 = "containerCustomIplink_";
+        String networkName = "customIpNet";
+        String subnetPrefix = "10.100.101";
 
         CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd()
                 .withIpam(new Network.Ipam()
@@ -523,8 +523,8 @@ public void createContainerWithCustomIp() throws DockerException {
 
     @Test
     public void createContainerWithAlias() throws DockerException {
-        String containerName1 = "containerAlias_" + dockerRule.getKind();
-        String networkName = "aliasNet" + dockerRule.getKind();
+        String containerName1 = "containerAlias_";
+        String networkName = "aliasNet";
 
         CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd()
                 .withName(networkName)
@@ -538,7 +538,7 @@ public void createContainerWithAlias() throws DockerException {
                         .withNetworkMode(networkName))
                 .withCmd("sleep", "9999")
                 .withName(containerName1)
-                .withAliases("server" + dockerRule.getKind())
+                .withAliases("server")
                 .exec();
 
         assertThat(container.getId(), not(is(emptyString())));
@@ -549,7 +549,7 @@ public void createContainerWithAlias() throws DockerException {
                 .exec();
 
         ContainerNetwork aliasNet = inspectContainerResponse.getNetworkSettings().getNetworks().get(networkName);
-        assertThat(aliasNet.getAliases(), hasItem("server" + dockerRule.getKind()));
+        assertThat(aliasNet.getAliases(), hasItem("server"));
     }
 
     @Test
@@ -597,7 +597,7 @@ public void createContainerWithDns() throws DockerException {
     public void createContainerWithEntrypoint() throws DockerException {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
-                .withName("containerEntrypoint" + dockerRule.getKind())
+                .withName("containerEntrypoint")
                 .withEntrypoint("sleep", "9999").exec();
 
         LOG.info("Created container {}", container.toString());
@@ -616,7 +616,7 @@ public void createContainerWithExtraHosts() throws DockerException {
         String[] extraHosts = {"dockerhost:127.0.0.1", "otherhost:10.0.0.1"};
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
-                .withName("containerextrahosts" + dockerRule.getKind())
+                .withName("containerextrahosts")
                 .withHostConfig(newHostConfig()
                         .withExtraHosts(extraHosts)).exec();
 
@@ -650,7 +650,7 @@ public void createContainerWithDevices() throws DockerException {
 
     @Test
     public void createContainerWithPortBindings() throws DockerException {
-        int baseport = 10_000 + (getFactoryType().ordinal() * 1000);
+        int baseport = 10_000;
 
         ExposedPort tcp22 = ExposedPort.tcp(22);
         ExposedPort tcp23 = ExposedPort.tcp(23);
@@ -687,8 +687,8 @@ public void createContainerWithPortBindings() throws DockerException {
 
     @Test
     public void createContainerWithLinking() throws DockerException {
-        String containerName1 = "containerWithlinking_" + dockerRule.getKind();
-        String containerName2 = "container2Withlinking_" + dockerRule.getKind();
+        String containerName1 = "containerWithlinking_";
+        String containerName2 = "container2Withlinking_";
 
         CreateContainerResponse container1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withCmd("sleep", "9999")
@@ -812,7 +812,7 @@ public void createContainerWithMacAddress() throws DockerException {
 
     @Test
     public void createContainerWithULimits() throws DockerException {
-        String containerName = "containerulimit" + dockerRule.getKind();
+        String containerName = "containerulimit";
         Ulimit[] ulimits = {new Ulimit("nproc", 709, 1026), new Ulimit("nofile", 1024, 4096)};
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
@@ -834,7 +834,7 @@ public void createContainerWithULimits() throws DockerException {
 
     @Test
     public void createContainerWithIntegerBoundsExceedingULimit() throws DockerException {
-        String containerName = "containercoreulimit" + dockerRule.getKind();
+        String containerName = "containercoreulimit";
         Ulimit[] ulimits = {new Ulimit("core", 99999999998L, 99999999999L)};
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
index 36776bdb1..36363b056 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
@@ -28,7 +28,7 @@ public class CreateNetworkCmdIT extends CmdIT {
     public void createNetwork() throws DockerException {
         assumeNotSwarm("no network in swarm", dockerRule);
 
-        String networkName = "createNetwork" + dockerRule.getKind();
+        String networkName = "createNetwork";
 
         CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd().withName(networkName).exec();
 
@@ -43,8 +43,8 @@ public void createNetwork() throws DockerException {
     public void createNetworkWithIpamConfig() throws DockerException {
         assumeNotSwarm("no network in swarm", dockerRule);
 
-        String networkName = "networkIpam" + dockerRule.getKind();
-        String subnet = "10.67." + (79 + getFactoryType().ordinal()) + ".0/24";
+        String networkName = "networkIpam";
+        String subnet = "10.67.79.0/24";
 
         Network.Ipam ipam = new Network.Ipam().withConfig(new Network.Ipam.Config().withSubnet(subnet));
         CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd().withName(networkName).withIpam(ipam).exec();
@@ -61,7 +61,7 @@ public void createNetworkWithIpamConfig() throws DockerException {
     public void createAttachableNetwork() throws DockerException {
         assumeThat("API version should be > 1.24", dockerRule, isGreaterOrEqual(VERSION_1_25));
 
-        String networkName = "createAttachableNetwork" + dockerRule.getKind();
+        String networkName = "createAttachableNetwork";
         CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd()
                 .withName(networkName)
                 .withAttachable(true)
@@ -77,9 +77,9 @@ public void createNetworkWithLabel() throws DockerException {
         assumeNotSwarm("no network in swarm?", dockerRule);
         assumeThat("API version should be >= 1.21", dockerRule, isGreaterOrEqual(VERSION_1_21));
 
-        String networkName = "createNetworkWithLabel" + dockerRule.getKind();
+        String networkName = "createNetworkWithLabel";
         Map<String, String> labels = new HashMap<>();
-        labels.put("com.example.usage" + dockerRule.getKind(), "test");
+        labels.put("com.example.usage", "test");
         CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd().withName(networkName).withLabels(labels).exec();
         assertNotNull(createNetworkResponse.getId());
         Network network = dockerRule.getClient().inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java
index e7899f84a..b36002f10 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java
@@ -18,8 +18,7 @@ public class CustomCommandIT extends CmdIT {
 
     @Test
     public void testCustomCommand() throws Exception {
-        DockerClientImpl dockerClient = getFactoryType().createDockerClient(DockerRule.config(null));
-        DockerHttpClient httpClient = dockerClient.getHttpClient();
+        DockerHttpClient httpClient = CmdIT.createDockerHttpClient(DockerRule.config(null));
 
         Assume.assumeNotNull(httpClient);
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java
index 3c9451545..7d9591bfe 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java
@@ -19,7 +19,7 @@ public void disconnectFromNetwork() throws InterruptedException {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
-        CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd().withName("disconnectNetwork" + dockerRule.getKind()).exec();
+        CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd().withName("disconnectNetwork").exec();
 
         dockerRule.getClient().connectToNetworkCmd().withNetworkId(network.getId()).withContainerId(container.getId()).exec();
 
@@ -38,11 +38,11 @@ public void disconnectFromNetwork() throws InterruptedException {
     public void forceDisconnectFromNetwork() throws InterruptedException {
         assumeNotSwarm("no network in swarm", dockerRule);
 
-        CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd().withName("testNetwork2" + dockerRule.getKind()).exec();
+        CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd().withName("testNetwork2").exec();
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
                 .withHostConfig(newHostConfig()
-                        .withNetworkMode("testNetwork2" + dockerRule.getKind()))
+                        .withNetworkMode("testNetwork2"))
                 .withCmd("sleep", "9999")
                 .exec();
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
index 7f55d5f9e..f98d24563 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
@@ -48,7 +48,7 @@ public void pushLatest() throws Exception {
         assertThat(container.getId(), not(is(emptyString())));
 
         LOG.info("Committing container: {}", container.toString());
-        String imgName = authConfig.getRegistryAddress() + "/" + dockerRule.getKind() + "-push-latest";
+        String imgName = authConfig.getRegistryAddress() + "/push-latest";
         String imageId = dockerRule.getClient().commitCmd(container.getId())
                 .withRepository(imgName)
                 .exec();
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java
index 76037e1e3..6d0fdf981 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveVolumeCmdIT.java
@@ -17,7 +17,7 @@ public class RemoveVolumeCmdIT extends CmdIT {
     @Test(expected = NotFoundException.class)
     public void removeVolume() throws DockerException {
 
-        String volumeName = "volume1" + dockerRule.getKind();
+        String volumeName = "volume1";
 
         CreateVolumeResponse createVolumeResponse = dockerRule.getClient().createVolumeCmd()
                 .withName(volumeName)
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java
index fed3920b7..d6b91c2a4 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java
@@ -31,7 +31,7 @@ public void renameContainer() throws DockerException {
         String name1 = inspectContainerResponse.getName();
 
         dockerRule.getClient().renameContainerCmd(container.getId())
-                .withName(dockerRule.getKind() + "renameContainer")
+                .withName("renameContainer")
                 .exec();
 
         InspectContainerResponse inspectContainerResponse2 = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
@@ -47,7 +47,7 @@ public void renameContainer() throws DockerException {
     @Test(expected = NotFoundException.class)
     public void renameExistingContainer() throws DockerException, InterruptedException {
         dockerRule.getClient().renameContainerCmd("non-existing")
-                .withName(dockerRule.getKind() + "renameExistingContainer")
+                .withName("renameExistingContainer")
                 .exec();
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
index 76e4fe329..b882a88bd 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
@@ -171,7 +171,7 @@ public void startContainerWithDnsSearch() throws DockerException {
 
     @Test
     public void startContainerWithPortBindings() throws DockerException {
-        int baseport = 20_000 + (getFactoryType().ordinal() * 1000);
+        int baseport = 20_000;
 
         ExposedPort tcp22 = ExposedPort.tcp(22);
         ExposedPort tcp23 = ExposedPort.tcp(23);
@@ -267,8 +267,8 @@ public void startContainerWithConflictingPortBindings() throws DockerException {
 
     @Test
     public void startContainerWithLinkingDeprecated() throws DockerException {
-        String container1Name = "containerWithLink1" + dockerRule.getKind();
-        String container2Name = "containerWithLink2" + dockerRule.getKind();
+        String container1Name = "containerWithLink1";
+        String container2Name = "containerWithLink2";
         dockerRule.ensureContainerRemoved(container1Name);
         dockerRule.ensureContainerRemoved(container2Name);
 
@@ -328,8 +328,8 @@ public void startContainerWithLinkingDeprecated() throws DockerException {
 
     @Test
     public void startContainerWithLinking() throws DockerException {
-        String container1Name = "containerWithLinking1" + dockerRule.getKind();
-        String container2Name = "containerWithLinking2" + dockerRule.getKind();
+        String container1Name = "containerWithLinking1";
+        String container2Name = "containerWithLinking2";
         dockerRule.ensureContainerRemoved(container1Name);
         dockerRule.ensureContainerRemoved(container2Name);
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
index f88cb9873..8e653b564 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
@@ -136,6 +136,6 @@ private DockerClient initializeDockerClient(Ports.Binding binding) {
         DefaultDockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder()
             .withRegistryUrl("https://index.docker.io/v1/")
             .withDockerHost("tcp://" + binding).build();
-        return getFactoryType().createDockerClient(config);
+        return createDockerClient(config);
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
index c4a66fb10..98050d934 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
@@ -11,16 +11,13 @@
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.cmd.CmdIT;
-import com.github.dockerjava.transport.DockerHttpClient;
 import com.github.dockerjava.utils.LogContainerTestCallback;
-import lombok.experimental.Delegate;
 import org.junit.rules.ExternalResource;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.Closeable;
 import java.io.File;
 import java.util.HashSet;
 import java.util.Set;
@@ -34,21 +31,14 @@ public class DockerRule extends ExternalResource {
 
     private DockerClient dockerClient;
 
-    private CmdIT cmdIT;
-
     private final Set<String> createdContainerIds = new HashSet<>();
 
     private final Set<String> createdNetworkIds = new HashSet<>();
 
     private final Set<String> createdVolumeNames = new HashSet<>();
 
-    public DockerRule(CmdIT cmdIT) {
-        this.cmdIT = cmdIT;
-    }
-
-
     public DockerClient newClient() {
-        DockerClientImpl dockerClient = cmdIT.getFactoryType().createDockerClient(config());
+        DockerClientImpl dockerClient = CmdIT.createDockerClient(config());
 
         dockerClient.withDockerCmdExecFactory(
             new DockerCmdExecFactoryDelegate(dockerClient.dockerCmdExecFactory) {
@@ -202,10 +192,6 @@ public String containerLog(String containerId) throws Exception {
                 .toString();
     }
 
-    public String getKind() {
-        return cmdIT.getFactoryType().name().toLowerCase();
-    }
-
     public void ensureContainerRemoved(String container1Name) {
         try {
             getClient().removeContainerCmd(container1Name)
@@ -217,55 +203,4 @@ public void ensureContainerRemoved(String container1Name) {
         }
     }
 
-    public void ensureImageRemoved(String imageId) {
-        try {
-            getClient().removeImageCmd(imageId)
-                    .withForce(true)
-                    .exec();
-        } catch (NotFoundException ex) {
-            // ignore
-        }
-    }
-
-    private static class CreateContainerCmdDelegate implements CreateContainerCmd {
-        @Delegate(excludes = Closeable.class)
-        private final CreateContainerCmd delegate;
-
-        private CreateContainerCmdDelegate(CreateContainerCmd delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public void close() {
-            delegate.close();
-        }
-    }
-
-    private static class CreateNetworkCmdDelegate implements CreateNetworkCmd {
-        @Delegate(excludes = Closeable.class)
-        private final CreateNetworkCmd delegate;
-
-        private CreateNetworkCmdDelegate(CreateNetworkCmd delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public void close() {
-            delegate.close();
-        }
-    }
-
-    private static class CreateVolumeCmdDelegate implements CreateVolumeCmd {
-        @Delegate(excludes = Closeable.class)
-        private final CreateVolumeCmd delegate;
-
-        private CreateVolumeCmdDelegate(CreateVolumeCmd delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public void close() {
-            delegate.close();
-        }
-    }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java b/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java
index 7aae924f9..327bfc941 100644
--- a/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java
+++ b/docker-java/src/test/java/com/github/dockerjava/junit/PrivateRegistryRule.java
@@ -7,8 +7,8 @@
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.cmd.CmdIT;
 import com.github.dockerjava.core.DockerRule;
-import com.github.dockerjava.core.DockerClientBuilder;
 import org.junit.rules.ExternalResource;
 
 import java.io.File;
@@ -29,7 +29,7 @@ public class PrivateRegistryRule extends ExternalResource {
     private String containerId;
 
     public PrivateRegistryRule() {
-        this.dockerClient = DockerClientBuilder.getInstance().build();
+        this.dockerClient = CmdIT.createDockerClient(DockerRule.config(null));
     }
 
     public AuthConfig getAuthConfig() {

From fd27cc25e280d89291de46b9ef4f8d8716d78b05 Mon Sep 17 00:00:00 2001
From: aroskuski <aroskuski@gmail.com>
Date: Sat, 5 Feb 2022 07:27:54 -0500
Subject: [PATCH 1102/1272] Add "npipe" as a valid mount type (#1788)

---
 .../java/com/github/dockerjava/api/model/MountType.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java
index 62557df47..219782a56 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java
@@ -14,6 +14,10 @@ public enum MountType {
 
     //@since 1.29
     @JsonProperty("tmpfs")
-    TMPFS
+    TMPFS,
+
+    //@since 1.40
+    @JsonProperty("npipe")
+    NPIPE
 
 }

From 554acf676f65db262c84e6ffe6fe822107959f14 Mon Sep 17 00:00:00 2001
From: David Lefever <lefever.d@gmail.com>
Date: Fri, 11 Feb 2022 02:16:40 +0100
Subject: [PATCH 1103/1272] Use POSIX for tar long file mode and big number
 mode. (#1805)

---
 .../com/github/dockerjava/core/util/CompressArchiveUtil.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
index 797559077..eb7b90aca 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/util/CompressArchiveUtil.java
@@ -54,7 +54,8 @@ private static TarArchiveOutputStream buildTarStream(Path outputPath, boolean gZ
             outputStream = new GzipCompressorOutputStream(outputStream);
         }
         TarArchiveOutputStream tarArchiveOutputStream = new TarArchiveOutputStream(outputStream);
-        tarArchiveOutputStream.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
+        tarArchiveOutputStream.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX);
+        tarArchiveOutputStream.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_POSIX);
         return tarArchiveOutputStream;
     }
 

From 2e7764d14c5abafc9b4e617e6ef83ea37479c8a8 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 14 Feb 2022 07:39:55 -0500
Subject: [PATCH 1104/1272] Do not leak `AuthConfig` into
 `CreateContainerCmd`'s JSON (#1807)

---
 .../core/command/CreateContainerCmdImpl.java    | 17 ++++++++---------
 .../dockerjava/cmd/CreateContainerCmdIT.java    | 17 +++++++++++++++++
 .../com/github/dockerjava/core/DockerRule.java  |  8 +++++++-
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index d4cd05a63..65839a658 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
@@ -30,6 +30,13 @@
  * Creates a new container.
  * `/containers/create`
  */
+@JsonAutoDetect(
+    fieldVisibility = JsonAutoDetect.Visibility.NONE,
+    setterVisibility = JsonAutoDetect.Visibility.NONE,
+    getterVisibility = JsonAutoDetect.Visibility.NONE,
+    isGetterVisibility = JsonAutoDetect.Visibility.NONE,
+    creatorVisibility = JsonAutoDetect.Visibility.NONE
+)
 public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, CreateContainerResponse> implements
         CreateContainerCmd {
 
@@ -122,13 +129,10 @@ public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, C
     @JsonProperty("NetworkingConfig")
     private NetworkingConfig networkingConfig;
 
-    @JsonIgnore
     private String ipv4Address = null;
 
-    @JsonIgnore
     private String ipv6Address = null;
 
-    @JsonIgnore
     private List<String> aliases = null;
 
     private AuthConfig authConfig;
@@ -151,7 +155,6 @@ public CreateContainerCmd withAuthConfig(AuthConfig authConfig) {
     }
 
     @Override
-    @JsonIgnore
     public List<String> getAliases() {
         return aliases;
     }
@@ -256,7 +259,6 @@ public CreateContainerCmd withEnv(List<String> env) {
     }
 
     @Override
-    @JsonIgnore
     public ExposedPort[] getExposedPorts() {
         return exposedPorts.getExposedPorts();
     }
@@ -277,7 +279,6 @@ public CreateContainerCmd withExposedPorts(List<ExposedPort> exposedPorts) {
     /**
      * @see #stopSignal
      */
-    @JsonIgnore
     @Override
     public String getStopSignal() {
         return stopSignal;
@@ -326,7 +327,6 @@ public CreateContainerCmd withImage(String image) {
     }
 
     @Override
-    @JsonIgnore
     public Map<String, String> getLabels() {
         return labels;
     }
@@ -430,7 +430,6 @@ public CreateContainerCmd withAttachStdout(Boolean attachStdout) {
     }
 
     @Override
-    @JsonIgnore
     public Volume[] getVolumes() {
         return volumes.getVolumes();
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index 3eb63770f..c8c755a54 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -1,6 +1,9 @@
 package com.github.dockerjava.cmd;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.CreateNetworkResponse;
 import com.github.dockerjava.api.command.CreateVolumeResponse;
@@ -70,6 +73,7 @@
 import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
@@ -1108,4 +1112,17 @@ public void overrideHostConfigWithRawValues() {
 
         assertThat(inspectContainerResponse.getHostConfig().getNanoCPUs(), is(500_000_000L));
     }
+
+    @Test
+    public void shouldNotEncodeAuth() {
+        CreateContainerCmd cmd = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+            .withAuthConfig(new AuthConfig().withEmail("test@test.com"))
+            .withCmd("sleep", "9999");
+
+        ObjectMapper objectMapper = dockerRule.getConfig().getObjectMapper();
+
+        ObjectNode jsonNode = objectMapper.valueToTree(cmd);
+
+        assertThat(jsonNode.get("authConfig"), nullValue());
+    }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
index 98050d934..3fc5c40d7 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
@@ -37,8 +37,10 @@ public class DockerRule extends ExternalResource {
 
     private final Set<String> createdVolumeNames = new HashSet<>();
 
+    private final DefaultDockerClientConfig config = config();
+
     public DockerClient newClient() {
-        DockerClientImpl dockerClient = CmdIT.createDockerClient(config());
+        DockerClientImpl dockerClient = CmdIT.createDockerClient(config);
 
         dockerClient.withDockerCmdExecFactory(
             new DockerCmdExecFactoryDelegate(dockerClient.dockerCmdExecFactory) {
@@ -82,6 +84,10 @@ protected DockerClient getDockerClient() {
         };
     }
 
+    public DefaultDockerClientConfig getConfig() {
+        return config;
+    }
+
     public DockerClient getClient() {
         if (dockerClient != null) {
             return dockerClient;

From 61f4e559583970fb088a365c7ea16c509e637f97 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 14 Feb 2022 09:30:00 -0500
Subject: [PATCH 1105/1272] Add `CgroupnsMode` to `HostConfig` (#1808)

---
 .../com/github/dockerjava/api/model/HostConfig.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 974ac8920..f140f9f33 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -292,6 +292,9 @@ public static HostConfig newHostConfig() {
     @JsonProperty("ConsoleSize")
     private List<Integer> consoleSize;
 
+    @JsonProperty("CgroupnsMode")
+    private String cgroupnsMode;
+
     @JsonIgnore
     public Bind[] getBinds() {
         return (binds == null) ? new Bind[0] : binds.getBinds();
@@ -1193,6 +1196,16 @@ public HostConfig withUsernsMode(String usernsMode) {
         return this;
     }
 
+    @CheckForNull
+    public String getCgroupnsMode() {
+        return cgroupnsMode;
+    }
+
+    public HostConfig withCgroupnsMode(String cgroupnsMode) {
+        this.cgroupnsMode = cgroupnsMode;
+        return this;
+    }
+
     @CheckForNull
     public Map<String, String> getSysctls() {
         return sysctls;

From 0169cc42c680acc350b24dad82d010474d9d729e Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 14 Feb 2022 21:03:45 -0500
Subject: [PATCH 1106/1272] Remove `jna-transport` dependency from `okhttp`
 (#1816)

---
 docker-java-transport-okhttp/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index 0178b96c2..41598807a 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -30,7 +30,7 @@
 
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
-			<artifactId>jna-platform</artifactId>
+			<artifactId>jna</artifactId>
 			<version>5.8.0</version>
 		</dependency>
 

From 8fd8953a561e3d02d030c8a1f9db2af70ffb976c Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 14 Feb 2022 21:23:20 -0500
Subject: [PATCH 1107/1272] Rename `RestartContainerCmd#withtTimeout` to
 `#withTimeout` (#1817)

Fixes #1792
---
 .../dockerjava/api/command/RestartContainerCmd.java    | 10 +++++++++-
 .../core/command/RestartContainerCmdImpl.java          |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
index 5dcc59c24..5f60f1125 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
@@ -22,7 +22,15 @@ public interface RestartContainerCmd extends SyncDockerCmd<Void> {
 
     RestartContainerCmd withContainerId(@Nonnull String containerId);
 
-    RestartContainerCmd withtTimeout(Integer timeout);
+    /**
+     * @deprecated wrong name, use {@link #withTimeout(Integer)}
+     */
+    @Deprecated
+    default RestartContainerCmd withtTimeout(Integer timeout) {
+        return withTimeout(timeout);
+    }
+
+    RestartContainerCmd withTimeout(Integer timeout);
 
     /**
      * @throws NotFoundException
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
index e3621af4f..7d0bf413e 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
@@ -42,7 +42,7 @@ public RestartContainerCmd withContainerId(String containerId) {
     }
 
     @Override
-    public RestartContainerCmd withtTimeout(Integer timeout) {
+    public RestartContainerCmd withTimeout(Integer timeout) {
         checkNotNull(timeout, "timeout was not specified");
         checkArgument(timeout >= 0, "timeout must be greater or equal 0");
         this.timeout = timeout;

From ddfaf5634475786b0392c7c632cf1c3473f635a7 Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Mon, 14 Feb 2022 21:33:53 -0500
Subject: [PATCH 1108/1272] Relax protocol check in `DefaultDockerClientConfig`
 (#1818)

---
 .../core/DefaultDockerClientConfig.java       | 10 +------
 .../ApacheDockerHttpClientImpl.java           |  3 +--
 .../dockerjava/okhttp/OkDockerHttpClient.java |  2 +-
 .../core/DefaultDockerClientConfigTest.java   | 26 ++++---------------
 4 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index 9637e27aa..7f17295f3 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -22,7 +22,6 @@
 import java.net.URI;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
 
@@ -106,14 +105,7 @@ private URI checkDockerHostScheme(URI dockerHost) {
         if (dockerHost == null) {
             throw new DockerClientException("'dockerHost' is null");
         }
-        switch (Objects.toString(dockerHost.getScheme())) {
-            case "tcp":
-            case "unix":
-            case "npipe":
-                return dockerHost;
-            default:
-                throw new DockerClientException("Unsupported protocol scheme found: '" + dockerHost);
-        }
+        return dockerHost;
     }
 
     private static Properties loadIncludedDockerProperties(Properties systemProperties) {
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
index 268efe4af..93677bd36 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
@@ -80,8 +80,7 @@ protected ApacheDockerHttpClientImpl(
                 );
                 break;
             default:
-                pathPrefix = "";
-                host = HttpHost.create(dockerHost);
+                throw new IllegalArgumentException("Unsupported protocol scheme: " + dockerHost);
         }
 
         PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
index 5b8593d1e..ee58acb09 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
@@ -175,7 +175,7 @@ private OkDockerHttpClient(
                 }
                 break;
             default:
-                baseUrlBuilder = HttpUrl.get(dockerHost.toString()).newBuilder();
+                throw new IllegalArgumentException("Unsupported protocol scheme: " + dockerHost);
         }
         baseUrl = baseUrlBuilder.build();
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
index 8c1071aa6..66d5bcf11 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
@@ -15,6 +15,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
+import java.util.UUID;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
@@ -172,28 +173,11 @@ public void testTlsVerifyAndCertPath() throws Exception {
                 new LocalDirectorySSLConfig(dockerCertPath()));
     }
 
-    @Test(expected = DockerClientException.class)
-    public void testWrongHostScheme() throws Exception {
-        new DefaultDockerClientConfig(URI.create("http://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
-                null);
-    }
-
     @Test()
-    public void testTcpHostScheme() throws Exception {
-        new DefaultDockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
-                null);
-    }
-
-    @Test()
-    public void testUnixHostScheme() throws Exception {
-        new DefaultDockerClientConfig(URI.create("unix://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
-                null);
-    }
-
-    @Test()
-    public void testNpipeHostScheme() throws Exception {
-        new DefaultDockerClientConfig(URI.create("npipe://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
-                null);
+    public void testAnyHostScheme() throws Exception {
+        URI dockerHost = URI.create(UUID.randomUUID().toString().replace("-", "") + "://foo");
+        new DefaultDockerClientConfig(dockerHost, "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
+            null);
     }
 
     @Test

From 8253a999825d430df35148da835b37f1d731df0f Mon Sep 17 00:00:00 2001
From: Sergei Egorov <bsideup@gmail.com>
Date: Tue, 22 Feb 2022 08:10:44 -0500
Subject: [PATCH 1109/1272] Stabilize tests

---
 .../github/dockerjava/core/DefaultDockerClientConfigTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
index 66d5bcf11..02b7e34ae 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
@@ -175,7 +175,7 @@ public void testTlsVerifyAndCertPath() throws Exception {
 
     @Test()
     public void testAnyHostScheme() throws Exception {
-        URI dockerHost = URI.create(UUID.randomUUID().toString().replace("-", "") + "://foo");
+        URI dockerHost = URI.create("a" + UUID.randomUUID().toString().replace("-", "") + "://foo");
         new DefaultDockerClientConfig(dockerHost, "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
             null);
     }

From a961200d46f6bd86040ff6bc22c9ad9c2cf31a1c Mon Sep 17 00:00:00 2001
From: Aidan Do <43259657+REslim30@users.noreply.github.com>
Date: Wed, 14 Sep 2022 02:06:43 +0930
Subject: [PATCH 1110/1272] Handle network aliases without a custom network
 gracefully (#1942)

Fixes #1940
---
 .../com/github/dockerjava/api/model/HostConfig.java  |  1 +
 .../core/command/CreateContainerCmdImpl.java         |  2 +-
 .../github/dockerjava/cmd/CreateContainerCmdIT.java  | 12 ++++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index f140f9f33..2ad622ca6 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -848,6 +848,7 @@ public HostConfig withMemorySwappiness(Long memorySwappiness) {
      * <li>'host': use the host network stack inside the container. Note: the host mode gives the container full access to local system
      * services such as D-bus and is therefore considered insecure.</li>
      * </ul>
+     * Any other value is interpreted as a custom network's name for this container to connect to.
      */
     public HostConfig withNetworkMode(String networkMode) {
         this.networkMode = networkMode;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 65839a658..fd4653559 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -600,7 +600,7 @@ public CreateContainerResponse exec() throws NotFoundException, ConflictExceptio
             containerNetwork.withAliases(aliases);
         }
 
-        if (containerNetwork != null) {
+        if (containerNetwork != null && hostConfig.getNetworkMode() != null) {
             networkingConfig = new NetworkingConfig()
                     .withEndpointsConfig(singletonMap(hostConfig.getNetworkMode(), containerNetwork));
         }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index c8c755a54..7bb26eaa0 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -23,6 +23,7 @@
 import com.github.dockerjava.api.model.Link;
 import com.github.dockerjava.api.model.LogConfig;
 import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.Ports.Binding;
 import com.github.dockerjava.api.model.RestartPolicy;
@@ -1125,4 +1126,15 @@ public void shouldNotEncodeAuth() {
 
         assertThat(jsonNode.get("authConfig"), nullValue());
     }
+
+    @Test
+    public void shouldHandleANetworkAliasWithoutACustomNetworkGracefully() {
+        // Should not throw
+        dockerRule.getClient()
+            .createContainerCmd(DEFAULT_IMAGE)
+            .withAliases("hello-world")
+            .withHostConfig(newHostConfig())
+            .withCmd("sleep", "9999")
+            .exec();
+    }
 }

From 3ea46f9a1d279d8653f528d91c6ab6f5a8259b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A8=BE=E6=98=8E=E5=8D=8E?= <565209960@qq.com>
Date: Mon, 19 Sep 2022 18:22:11 +0800
Subject: [PATCH 1111/1272] Add Init attribute in ContainerSpec (#1927)

---
 .../dockerjava/api/model/ContainerSpec.java     | 17 +++++++++++++++++
 .../cmd/swarm/UpdateSwarmServiceIT.java         |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
index d80d04316..0a26e54fd 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
@@ -161,6 +161,14 @@ public class ContainerSpec extends DockerObject implements Serializable {
     @JsonProperty("Configs")
     private List<ContainerSpecConfig> configs;
 
+    /**
+     * @since 1.38
+     * Run an init inside the container that forwards signals and reaps processes.
+     * This field is omitted if empty, and the default (as configured on the daemon) is used.
+     */
+    @JsonProperty("Init")
+    private Boolean init;
+
     /**
      * @see #image
      */
@@ -435,4 +443,13 @@ public ContainerSpec withConfigs(List<ContainerSpecConfig> configs) {
         this.configs = configs;
         return this;
     }
+
+    public Boolean getInit() {
+        return init;
+    }
+
+    public ContainerSpec withInit(Boolean init) {
+        this.init = init;
+        return this;
+    }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
index f98c3ed36..deb959475 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
@@ -27,7 +27,7 @@ public void testUpdateServiceReplicate() throws Exception {
         String networkId = dockerClient.createNetworkCmd().withName("networkname").withDriver("overlay")
                 .withIpam(new Network.Ipam().withDriver("default")).exec().getId();
         TaskSpec taskSpec = new TaskSpec().withContainerSpec(
-                new ContainerSpec().withImage("busybox").withArgs(Arrays.asList("sleep", "3600")));
+                new ContainerSpec().withImage("busybox").withArgs(Arrays.asList("sleep", "3600")).withInit(true));
         ServiceSpec serviceSpec = new ServiceSpec()
                 .withMode(new ServiceModeConfig().withReplicated(new ServiceReplicatedModeOptions().withReplicas(1)))
                 .withTaskTemplate(taskSpec)

From 83f95f0ec806a80af8e8a83915d46475136a1096 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Sep 2022 05:58:51 -0500
Subject: [PATCH 1112/1272] Bump jna from 5.8.0 to 5.12.1 (#1898)

Bumps [jna](https://github.com/java-native-access/jna) from 5.8.0 to 5.12.1.
- [Release notes](https://github.com/java-native-access/jna/releases)
- [Changelog](https://github.com/java-native-access/jna/blob/master/CHANGES.md)
- [Commits](https://github.com/java-native-access/jna/compare/5.8.0...5.12.1)

---
updated-dependencies:
- dependency-name: net.java.dev.jna:jna
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-httpclient5/pom.xml | 2 +-
 docker-java-transport-okhttp/pom.xml      | 2 +-
 docker-java-transport/pom.xml             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml
index 057739a39..938c25342 100644
--- a/docker-java-transport-httpclient5/pom.xml
+++ b/docker-java-transport-httpclient5/pom.xml
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.8.0</version>
+			<version>5.12.1</version>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index 41598807a..60e669007 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.8.0</version>
+			<version>5.12.1</version>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml
index a7e76095d..ffc6ba52a 100644
--- a/docker-java-transport/pom.xml
+++ b/docker-java-transport/pom.xml
@@ -33,7 +33,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.8.0</version>
+			<version>5.12.1</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

From ffb09202701bf2a4494f7023b28abd3c1c9e7b88 Mon Sep 17 00:00:00 2001
From: jmformenti <jmformenti@gmail.com>
Date: Thu, 22 Sep 2022 06:29:16 +0200
Subject: [PATCH 1113/1272] Add capability values (#1955)

See https://docs.docker.com/engine/reference/run/#runtime-privilege-and-linux-capabilities
---
 .../github/dockerjava/api/model/Capability.java  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java
index 6237a65ae..fe71864c0 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java
@@ -18,6 +18,10 @@ public enum Capability {
      * </ul>
      */
     AUDIT_CONTROL,
+    /**
+     * Allow reading the audit log via multicast netlink socket.
+     */
+    AUDIT_READ,
     /**
      * Write records to kernel auditing log.
      */
@@ -26,6 +30,14 @@ public enum Capability {
      * Employ features that can block system suspend.
      */
     BLOCK_SUSPEND,
+    /**
+     * Allow creating BPF maps, loading BPF Type Format (BTF) data, retrieve JITed code of BPF programs, and more.
+     */
+    BPF,
+    /**
+     * Allow checkpoint/restore related operations. Introduced in kernel 5.9.
+     */
+    CHECKPOINT_RESTORE,
     /**
      * Make arbitrary changes to file UIDs and GIDs (see chown(2)).
      */
@@ -120,6 +132,10 @@ public enum Capability {
      * </ul>
      */
     NET_RAW,
+    /**
+     * Allow system performance and observability privileged operations using perf_events, i915_perf and other kernel subsystems
+     */
+    PERFMON,
     /**
      * Set file capabilities.
      */

From 2c690f35a273d090a3a3cc46dab1dfdd771021b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 26 Sep 2022 12:08:18 -0500
Subject: [PATCH 1114/1272] Add Automatic-Module-Name (#1962)

---
 docker-java-api/pom.xml                   | 4 ++++
 docker-java-core/pom.xml                  | 4 ++++
 docker-java-transport-httpclient5/pom.xml | 4 ++++
 docker-java-transport-jersey/pom.xml      | 4 ++++
 docker-java-transport-netty/pom.xml       | 4 ++++
 docker-java-transport-okhttp/pom.xml      | 4 ++++
 docker-java-transport-tck/pom.xml         | 4 ++++
 docker-java-transport-zerodep/pom.xml     | 4 ++++
 docker-java-transport/pom.xml             | 4 ++++
 docker-java/pom.xml                       | 4 ++++
 pom.xml                                   | 7 +++++++
 11 files changed, 47 insertions(+)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 1016da4ec..dca404bc1 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -15,6 +15,10 @@
 	<url>https://github.com/docker-java/docker-java</url>
 	<description>Java API Client for Docker</description>
 
+	<properties>
+		<automatic.module.name>com.github.dockerjava.api</automatic.module.name>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index fed62f1a6..cec97d25d 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -15,6 +15,10 @@
 	<url>https://github.com/docker-java/docker-java</url>
 	<description>Java API Client for Docker</description>
 
+	<properties>
+		<automatic.module.name>com.github.dockerjava.core</automatic.module.name>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml
index 938c25342..5800fb994 100644
--- a/docker-java-transport-httpclient5/pom.xml
+++ b/docker-java-transport-httpclient5/pom.xml
@@ -15,6 +15,10 @@
 	<url>https://github.com/docker-java/docker-java</url>
 	<description>Java API Client for Docker</description>
 
+	<properties>
+		<automatic.module.name>com.github.dockerjava.transport.httpclient5</automatic.module.name>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index c6e778c89..fbef13f1e 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -15,6 +15,10 @@
 	<url>https://github.com/docker-java/docker-java</url>
 	<description>Java API Client for Docker</description>
 
+	<properties>
+		<automatic.module.name>com.github.dockerjava.transport.jersey</automatic.module.name>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/docker-java-transport-netty/pom.xml b/docker-java-transport-netty/pom.xml
index f9bc3bed9..42fdd34b7 100644
--- a/docker-java-transport-netty/pom.xml
+++ b/docker-java-transport-netty/pom.xml
@@ -15,6 +15,10 @@
 	<url>https://github.com/docker-java/docker-java</url>
 	<description>Java API Client for Docker</description>
 
+	<properties>
+		<automatic.module.name>com.github.dockerjava.transport.netty</automatic.module.name>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index 60e669007..351005461 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -15,6 +15,10 @@
 	<url>https://github.com/docker-java/docker-java</url>
 	<description>Java API Client for Docker</description>
 
+	<properties>
+		<automatic.module.name>com.github.dockerjava.transport.okhttp</automatic.module.name>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml
index f65fead09..9ad692c1f 100644
--- a/docker-java-transport-tck/pom.xml
+++ b/docker-java-transport-tck/pom.xml
@@ -15,6 +15,10 @@
 	<url>https://github.com/docker-java/docker-java</url>
 	<description>Java API Client for Docker</description>
 
+	<properties>
+		<automatic.module.name>com.github.dockerjava.transport.tck</automatic.module.name>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/docker-java-transport-zerodep/pom.xml b/docker-java-transport-zerodep/pom.xml
index 7d3fb4034..3cccafa33 100644
--- a/docker-java-transport-zerodep/pom.xml
+++ b/docker-java-transport-zerodep/pom.xml
@@ -15,6 +15,10 @@
 	<url>https://github.com/docker-java/docker-java</url>
 	<description>Java API Client for Docker</description>
 
+	<properties>
+		<automatic.module.name>com.github.dockerjava.transport.zerodep</automatic.module.name>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml
index ffc6ba52a..633053c39 100644
--- a/docker-java-transport/pom.xml
+++ b/docker-java-transport/pom.xml
@@ -15,6 +15,10 @@
 	<url>https://github.com/docker-java/docker-java</url>
 	<description>Java API Client for Docker</description>
 
+	<properties>
+		<automatic.module.name>com.github.dockerjava.transport</automatic.module.name>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>com.google.code.findbugs</groupId>
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 453851ce1..39e1b1b65 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -15,6 +15,10 @@
 	<url>https://github.com/docker-java/docker-java</url>
 	<description>Java API Client for Docker</description>
 
+	<properties>
+		<automatic.module.name>com.github.dockerjava</automatic.module.name>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/pom.xml b/pom.xml
index 7da7062b3..6976c5c74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,6 +163,13 @@
 							</goals>
 						</execution>
 					</executions>
+					<configuration>
+						<archive>
+							<manifestEntries>
+								<Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
+							</manifestEntries>
+						</archive>
+					</configuration>
 				</plugin>
 
 				<plugin>

From 3951333e3593f05b9c6c3cfc01a86193b8687df3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 6 Oct 2022 09:33:38 -0500
Subject: [PATCH 1115/1272] Add support for `reference` query param in List
 Images (#1941)

`filter` query param was removed in Docker API 1.41. Using `reference`
query param will allow to use format <image-name>[:<tag>]. Also,
`withFilter(String name, Collection<String> value)` is provided.

Fixes #1935
---
 .../dockerjava/api/command/ListImagesCmd.java | 10 ++++++
 .../core/command/ListImagesCmdImpl.java       | 19 ++++++++++-
 .../dockerjava/cmd/ListImagesCmdIT.java       | 33 +++++++++++++++++++
 3 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
index 7741df743..cc60a5bcc 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.api.command;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -44,6 +45,15 @@ public interface ListImagesCmd extends SyncDockerCmd<List<Image>> {
      */
     ListImagesCmd withLabelFilter(Map<String, String> labels);
 
+    /**
+     * Filter images by reference
+     *
+     * @param reference string in the form {@code <image-name>[:<tag>]}
+     */
+    ListImagesCmd withReferenceFilter(String reference);
+
+    ListImagesCmd withFilter(String key, Collection<String> values);
+
     interface Exec extends DockerCmdSyncExec<ListImagesCmd, List<Image>> {
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
index a98be8f53..b4fb1e0d9 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
@@ -2,6 +2,8 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -46,7 +48,7 @@ public ListImagesCmd withShowAll(Boolean showAll) {
     @Override
     public ListImagesCmd withDanglingFilter(Boolean dangling) {
         checkNotNull(dangling, "dangling have not been specified");
-        filters.withFilter("dangling", dangling.toString());
+        withFilter("dangling", Collections.singletonList(dangling.toString()));
         return this;
     }
 
@@ -71,6 +73,21 @@ public ListImagesCmd withImageNameFilter(String imageNameFilter) {
         return this;
     }
 
+    @Override
+    public ListImagesCmd withReferenceFilter(String reference) {
+        checkNotNull(reference, "reference filter not specified");
+        withFilter("reference", Collections.singletonList(reference));
+        return this;
+    }
+
+    @Override
+    public ListImagesCmd withFilter(String key, Collection<String> values) {
+        checkNotNull(key, "key not specified");
+        checkNotNull(values, "values not specified");
+        filters.withFilter(key, values);
+        return this;
+    }
+
     @Override
     public String getImageNameFilter() {
         return this.imageNameFilter;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java
index c89b98a0a..38b756dab 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java
@@ -4,10 +4,12 @@
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.Image;
 import com.github.dockerjava.api.model.Info;
+import org.apache.commons.lang3.RandomUtils;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collections;
 import java.util.List;
 
 import static com.github.dockerjava.utils.TestUtils.isNotSwarm;
@@ -15,6 +17,7 @@
 import static org.hamcrest.Matchers.emptyArray;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
@@ -54,6 +57,36 @@ public void listImagesWithDanglingFilter() throws DockerException {
         assertTrue(imageInFilteredList);
     }
 
+    @Test
+    public void listImagesWithReferenceFilter() throws DockerException {
+        String tag = "" + RandomUtils.nextInt(0, Integer.MAX_VALUE);
+
+        dockerRule.getClient().tagImageCmd("busybox:latest", "docker-java/busybox", tag).exec();
+        try {
+            List<Image> images = dockerRule.getClient().listImagesCmd().withReferenceFilter("docker-java/busybox")
+                .exec();
+            assertThat(images, hasSize(1));
+        }
+        finally {
+            dockerRule.getClient().removeImageCmd("docker-java/busybox:" + tag).exec();
+        }
+    }
+
+    @Test
+    public void listImagesWithFilter() throws DockerException {
+        String tag = "" + RandomUtils.nextInt(0, Integer.MAX_VALUE);
+
+        dockerRule.getClient().tagImageCmd("busybox:latest", "docker-java/busybox", tag).exec();
+        try {
+            List<Image> images = dockerRule.getClient().listImagesCmd().withFilter("reference", Collections.singletonList("docker-java/busybox"))
+                .exec();
+            assertThat(images, hasSize(1));
+        }
+        finally {
+            dockerRule.getClient().removeImageCmd("docker-java/busybox:" + tag).exec();
+        }
+    }
+
     private boolean isImageInFilteredList(List<Image> images, String expectedImageId) {
         for (Image image : images) {
             if (expectedImageId.equals(image.getId())) {

From d7db365f345fb1a989983018850698647c603097 Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@redhat.com>
Date: Mon, 17 Oct 2022 18:24:05 +0100
Subject: [PATCH 1116/1272] Support copyUIDGID option in
 CopyArchiveToContainerCmd (#1963)

Fix #1258

Signed-off-by: kwall <kwall@apache.org>
---
 .../command/CopyArchiveToContainerCmd.java    |  9 +++
 .../CopyArchiveToContainerCmdImpl.java        | 17 ++++-
 .../exec/CopyArchiveToContainerCmdExec.java   |  4 +-
 .../cmd/CopyArchiveToContainerCmdIT.java      | 72 +++++++++++++++++++
 4 files changed, 99 insertions(+), 3 deletions(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
index a4dfb5c03..19b3c3843 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
@@ -16,6 +16,7 @@ public interface CopyArchiveToContainerCmd extends SyncDockerCmd<Void> {
 
     boolean isDirChildrenOnly();
 
+    boolean isCopyUIDGID();
     /**
      * Set container's id
      *
@@ -49,6 +50,14 @@ public interface CopyArchiveToContainerCmd extends SyncDockerCmd<Void> {
      */
     CopyArchiveToContainerCmd withNoOverwriteDirNonDir(boolean noOverwriteDirNonDir);
 
+    /**
+     * If set to true then ownership is set to the user and primary group at the destination
+     *
+     * @param copyUIDGID
+     *            flag to know if ownership should be set to the user and primary group at the destination
+     */
+    CopyArchiveToContainerCmd withCopyUIDGID(boolean copyUIDGID);
+
     /**
      * If this flag is set to true, all children of the local directory will be copied to the remote without the root directory. For ex: if
      * I have root/titi and root/tata and the remote path is /var/data. dirChildrenOnly = true will create /var/data/titi and /var/data/tata
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
index cac15fadf..a915a3b02 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
@@ -31,6 +31,8 @@ public class CopyArchiveToContainerCmdImpl extends AbstrDockerCmd<CopyArchiveToC
 
     private boolean dirChildrenOnly = false;
 
+    private boolean copyUIDGID = false;
+
     public CopyArchiveToContainerCmdImpl(CopyArchiveToContainerCmd.Exec exec, String containerId) {
         super(exec);
         withContainerId(containerId);
@@ -56,6 +58,12 @@ public CopyArchiveToContainerCmd withNoOverwriteDirNonDir(boolean noOverwriteDir
         return this;
     }
 
+    @Override
+    public CopyArchiveToContainerCmd withCopyUIDGID(boolean copyUIDGID) {
+        this.copyUIDGID = copyUIDGID;
+        return this;
+    }
+
     @Override
     public CopyArchiveToContainerCmd withRemotePath(String remotePath) {
         checkNotNull(remotePath, "remotePath was not specified");
@@ -106,10 +114,15 @@ public boolean isDirChildrenOnly() {
         return this.dirChildrenOnly;
     }
 
+    @Override
+    public boolean isCopyUIDGID() {
+        return this.copyUIDGID;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this).append("cp ").append(hostResource).append(" ").append(containerId).append(":")
-                .append(remotePath).toString();
+        return new ToStringBuilder(this).append("cp ").append(String.format("-a=%b ", isCopyUIDGID()))
+            .append(hostResource).append(" ").append(containerId).append(":").append(remotePath).toString();
     }
 
     /**
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CopyArchiveToContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CopyArchiveToContainerCmdExec.java
index d1effbb3e..ea4a527b1 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CopyArchiveToContainerCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/CopyArchiveToContainerCmdExec.java
@@ -28,7 +28,9 @@ protected Void execute(CopyArchiveToContainerCmd command) {
         InputStream streamToUpload = command.getTarInputStream();
 
         webResource.queryParam("path", command.getRemotePath())
-                .queryParam("noOverwriteDirNonDir", command.isNoOverwriteDirNonDir()).request()
+                .queryParam("noOverwriteDirNonDir", command.isNoOverwriteDirNonDir())
+                .queryParam("copyUIDGID", command.isCopyUIDGID())
+                .request()
                 .put(streamToUpload, MediaType.APPLICATION_X_TAR);
 
         return null;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
index c8bac183a..d2a0a3406 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
@@ -4,6 +4,7 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.core.util.CompressArchiveUtil;
+import com.github.dockerjava.utils.LogContainerTestCallback;
 import org.apache.commons.io.FileUtils;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -14,12 +15,16 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.concurrent.TimeUnit;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.isEmptyOrNullString;
 import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeThat;
 
 public class CopyArchiveToContainerCmdIT extends CmdIT {
     public static final Logger LOG = LoggerFactory.getLogger(CopyArchiveToContainerCmdIT.class);
@@ -143,4 +148,71 @@ public void copyFileWithExecutePermission() throws Exception {
         assertThat(exitCode, equalTo(0));
     }
 
+    @Test
+    public void copyFileWithUIDGID() throws Exception {
+        Path with = Files.createFile(Files.createTempDirectory("copyFileWithUIDGID").resolve("uidgid.with"));
+        Files.write(with, "with".getBytes());
+
+        Path without = Files.createFile(Files.createTempDirectory("copyFileWithUIDGID").resolve("uidgid.without"));
+        Files.write(without, "without".getBytes());
+
+        String containerCmd = "while [ ! -f /home/uidgid.with ]; do true; done && stat -c %n:%u /home/uidgid.with /home/uidgid.without";
+        Long syncUserUid = 4L; // sync user in busybox uses uid=4
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+                .withName("copyFileWithUIDGID")
+                .withCmd("/bin/sh", "-c", containerCmd)
+                .withUser(syncUserUid.toString())
+                .exec();
+        // start the container
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        dockerRule.getClient().copyArchiveToContainerCmd(container.getId())
+                .withRemotePath("/home/")
+                .withHostResource(without.toString())
+                .withCopyUIDGID(false)
+                .exec();
+        dockerRule.getClient().copyArchiveToContainerCmd(container.getId())
+                .withRemotePath("/home/")
+                .withHostResource(with.toString())
+                .withCopyUIDGID(true)
+                .exec();
+
+        // await exit code
+        int exitCode = dockerRule.getClient().waitContainerCmd(container.getId())
+                .start()
+                .awaitStatusCode();
+        // check result
+        assertThat(exitCode, equalTo(0));
+
+        LogContainerTestCallback loggingCallback = new LogContainerTestCallback(true);
+
+        dockerRule.getClient().logContainerCmd(container.getId())
+            .withStdOut(true)
+            .withTailAll()
+            .exec(loggingCallback);
+
+        loggingCallback.awaitCompletion(3, TimeUnit.SECONDS);
+        String containerOutput = loggingCallback.toString();
+
+        assertThat(containerOutput, containsString(String.format("/home/uidgid.with:%d", syncUserUid)));
+
+        Long hostUid = getHostUidIfPossible();
+        assumeThat("could not get the uid on host platform", hostUid, notNullValue(Long.class));
+        assertThat(containerOutput, containsString(String.format("/home/uidgid.without:%d", hostUid)));
+    }
+
+    private static Long getHostUidIfPossible() {
+        try {
+            Class<?> unixSystemClazz = Class.forName("com.sun.security.auth.module.UnixSystem");
+            Object unixSystem = unixSystemClazz.newInstance();
+            Object uid = unixSystemClazz.getMethod("getUid").invoke(unixSystem);
+            if (uid == null) {
+                return null;
+            }
+
+            return uid instanceof Long ? (Long) uid : Long.parseLong(uid.toString());
+        } catch (Exception e) {
+            return null;
+        }
+    }
 }

From f6f9d676d9244d6048fdf85c5db6f2c4813d5c23 Mon Sep 17 00:00:00 2001
From: aryeh <aryeh@looker.com>
Date: Mon, 17 Oct 2022 10:28:51 -0700
Subject: [PATCH 1117/1272] Improve getting_started.md (#1966)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 docs/getting_started.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/getting_started.md b/docs/getting_started.md
index 012b721d4..7781e38ec 100644
--- a/docs/getting_started.md
+++ b/docs/getting_started.md
@@ -16,10 +16,15 @@ You will need an instance of `DockerClientConfig` to tell the library how to acc
 
 The builder is available and allows you to configure every property of the client:
 ```java
+import com.github.dockerjava.core.DockerClientConfig
+import com.github.dockerjava.core.DefaultDockerClientConfig
 DockerClientConfig standard = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
 ```
 
 ```java
+import com.github.dockerjava.core.DockerClientConfig
+import com.github.dockerjava.core.DefaultDockerClientConfig
+
 DockerClientConfig custom = DefaultDockerClientConfig.createDefaultConfigBuilder()
     .withDockerHost("tcp://docker.somewhere.tld:2376")
     .withDockerTlsVerify(true)

From 9b7adaeb0c7d616f7ff7550059fca5b3f01cbcad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 22 Nov 2022 09:15:10 -0800
Subject: [PATCH 1118/1272] Add load async operation (#1982)

---
 .../github/dockerjava/api/DockerClient.java   |  3 ++
 .../dockerjava/api/DockerClientDelegate.java  |  6 +++
 .../DelegatingDockerCmdExecFactory.java       |  5 ++
 .../api/command/DockerCmdExecFactory.java     |  2 +
 .../api/command/LoadImageAsyncCmd.java        | 22 +++++++++
 .../api/command/LoadImageCallback.java        | 49 +++++++++++++++++++
 .../api/model/LoadResponseItem.java           | 33 +++++++++++++
 .../core/AbstractDockerCmdExecFactory.java    |  7 +++
 .../dockerjava/core/DockerClientImpl.java     |  7 +++
 .../core/command/LoadImageAsyncCmdImpl.java   | 42 ++++++++++++++++
 .../core/exec/LoadImageAsyncCmdExec.java      | 30 ++++++++++++
 .../github/dockerjava/cmd/LoadImageCmdIT.java | 14 ++++++
 12 files changed, 220 insertions(+)
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageAsyncCmd.java
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCallback.java
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/model/LoadResponseItem.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageAsyncCmdImpl.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/exec/LoadImageAsyncCmdExec.java

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
index 9df5c5f11..e5f57e1bb 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -42,6 +42,7 @@
 import com.github.dockerjava.api.command.ListSwarmNodesCmd;
 import com.github.dockerjava.api.command.ListTasksCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
+import com.github.dockerjava.api.command.LoadImageAsyncCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.command.LogSwarmObjectCmd;
@@ -131,6 +132,8 @@ public interface DockerClient extends Closeable {
      */
     LoadImageCmd loadImageCmd(@Nonnull InputStream imageStream);
 
+    LoadImageAsyncCmd loadImageAsyncCmd(@Nonnull InputStream imageStream);
+
     SearchImagesCmd searchImagesCmd(@Nonnull String term);
 
     RemoveImageCmd removeImageCmd(@Nonnull String imageId);
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java
index 15f96df45..5de64641f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java
@@ -42,6 +42,7 @@
 import com.github.dockerjava.api.command.ListSwarmNodesCmd;
 import com.github.dockerjava.api.command.ListTasksCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
+import com.github.dockerjava.api.command.LoadImageAsyncCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.command.LogSwarmObjectCmd;
@@ -153,6 +154,11 @@ public LoadImageCmd loadImageCmd(@Nonnull InputStream imageStream) {
         return getDockerClient().loadImageCmd(imageStream);
     }
 
+    @Override
+    public LoadImageAsyncCmd loadImageAsyncCmd(@Nonnull InputStream imageStream) {
+        return getDockerClient().loadImageAsyncCmd(imageStream);
+    }
+
     @Override
     public SearchImagesCmd searchImagesCmd(@Nonnull String term) {
         return getDockerClient().searchImagesCmd(term);
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java
index 37639a072..161ff2c29 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java
@@ -75,6 +75,11 @@ public LoadImageCmd.Exec createLoadImageCmdExec() {
         return getDockerCmdExecFactory().createLoadImageCmdExec();
     }
 
+    @Override
+    public LoadImageAsyncCmd.Exec createLoadImageAsyncCmdExec() {
+        return getDockerCmdExecFactory().createLoadImageAsyncCmdExec();
+    }
+
     @Override
     public SearchImagesCmd.Exec createSearchImagesCmdExec() {
         return getDockerCmdExecFactory().createSearchImagesCmdExec();
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index d49606680..cedf6d40d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -27,6 +27,8 @@ public interface DockerCmdExecFactory extends Closeable {
 
     LoadImageCmd.Exec createLoadImageCmdExec();
 
+    LoadImageAsyncCmd.Exec createLoadImageAsyncCmdExec();
+
     SearchImagesCmd.Exec createSearchImagesCmdExec();
 
     RemoveImageCmd.Exec createRemoveImageCmdExec();
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageAsyncCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageAsyncCmd.java
new file mode 100644
index 000000000..4f054db22
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageAsyncCmd.java
@@ -0,0 +1,22 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.model.LoadResponseItem;
+
+import java.io.InputStream;
+
+public interface LoadImageAsyncCmd extends AsyncDockerCmd<LoadImageAsyncCmd, LoadResponseItem> {
+    InputStream getImageStream();
+
+    /**
+     * @param imageStream the InputStream of the tar file
+     */
+    LoadImageAsyncCmd withImageStream(InputStream imageStream);
+
+    @Override
+    default LoadImageCallback start() {
+        return exec(new LoadImageCallback());
+    }
+
+    interface Exec extends DockerCmdAsyncExec<LoadImageAsyncCmd, LoadResponseItem> {
+    }
+}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCallback.java
new file mode 100644
index 000000000..741598465
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCallback.java
@@ -0,0 +1,49 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.async.ResultCallbackTemplate;
+import com.github.dockerjava.api.exception.DockerClientException;
+import com.github.dockerjava.api.model.LoadResponseItem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LoadImageCallback extends ResultCallbackTemplate<LoadImageCallback, LoadResponseItem> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(LoadImageCallback.class);
+
+    private String message;
+
+    private String error;
+
+    @Override
+    public void onNext(LoadResponseItem item) {
+        if (item.isBuildSuccessIndicated()) {
+            this.message = item.getMessage();
+        } else if (item.isErrorIndicated()) {
+            this.error = item.getError();
+        }
+
+        LOGGER.debug(item.toString());
+    }
+
+    public String awaitMessage() {
+        try {
+            awaitCompletion();
+        } catch (InterruptedException e) {
+            throw new DockerClientException("", e);
+        }
+
+        return getMessage();
+    }
+
+    private String getMessage() {
+        if (this.message != null) {
+            return this.message;
+        }
+
+        if (this.error == null) {
+            throw new DockerClientException("Could not build image");
+        }
+
+        throw new DockerClientException("Could not build image: " + this.error);
+    }
+}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/LoadResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LoadResponseItem.java
new file mode 100644
index 000000000..bf90c69bf
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LoadResponseItem.java
@@ -0,0 +1,33 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public class LoadResponseItem extends ResponseItem {
+
+    private static final long serialVersionUID = 1L;
+
+    private static final String IMPORT_SUCCESS = "Loaded image:";
+
+    /**
+     * Returns whether the stream field indicates a successful build operation
+     */
+    @JsonIgnore
+    public boolean isBuildSuccessIndicated() {
+        if (isErrorIndicated() || getStream() == null) {
+            return false;
+        }
+
+        return getStream().contains(IMPORT_SUCCESS);
+    }
+
+    @JsonIgnore
+    public String getMessage() {
+        if (!isBuildSuccessIndicated()) {
+            return null;
+        } else if (getStream().contains(IMPORT_SUCCESS)) {
+            return getStream();
+        }
+
+        return null;
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
index 3e329911f..4b49da035 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
@@ -44,6 +44,7 @@
 import com.github.dockerjava.api.command.ListSwarmNodesCmd;
 import com.github.dockerjava.api.command.ListTasksCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
+import com.github.dockerjava.api.command.LoadImageAsyncCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.command.LogSwarmObjectCmd;
@@ -101,6 +102,7 @@
 import com.github.dockerjava.core.exec.ExecStartCmdExec;
 import com.github.dockerjava.core.exec.InspectConfigCmdExec;
 import com.github.dockerjava.core.exec.ListConfigsCmdExec;
+import com.github.dockerjava.core.exec.LoadImageAsyncCmdExec;
 import com.github.dockerjava.core.exec.RemoveConfigCmdExec;
 import com.github.dockerjava.core.exec.ResizeContainerCmdExec;
 import com.github.dockerjava.core.exec.ResizeExecCmdExec;
@@ -255,6 +257,11 @@ public LoadImageCmd.Exec createLoadImageCmdExec() {
         return new LoadImageCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public LoadImageAsyncCmd.Exec createLoadImageAsyncCmdExec() {
+        return new LoadImageAsyncCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public SearchImagesCmd.Exec createSearchImagesCmdExec() {
         return new SearchImagesCmdExec(getBaseResource(), getDockerClientConfig());
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index c27a33260..8de900279 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -44,6 +44,7 @@
 import com.github.dockerjava.api.command.ListSwarmNodesCmd;
 import com.github.dockerjava.api.command.ListTasksCmd;
 import com.github.dockerjava.api.command.ListVolumesCmd;
+import com.github.dockerjava.api.command.LoadImageAsyncCmd;
 import com.github.dockerjava.api.command.LoadImageCmd;
 import com.github.dockerjava.api.command.LogContainerCmd;
 import com.github.dockerjava.api.command.LogSwarmObjectCmd;
@@ -127,6 +128,7 @@
 import com.github.dockerjava.core.command.ListSwarmNodesCmdImpl;
 import com.github.dockerjava.core.command.ListTasksCmdImpl;
 import com.github.dockerjava.core.command.ListVolumesCmdImpl;
+import com.github.dockerjava.core.command.LoadImageAsyncCmdImpl;
 import com.github.dockerjava.core.command.LoadImageCmdImpl;
 import com.github.dockerjava.core.command.LogContainerCmdImpl;
 import com.github.dockerjava.core.command.LogSwarmObjectImpl;
@@ -350,6 +352,11 @@ public LoadImageCmd loadImageCmd(@Nonnull InputStream imageStream) {
         return new LoadImageCmdImpl(getDockerCmdExecFactory().createLoadImageCmdExec(), imageStream);
     }
 
+    @Override
+    public LoadImageAsyncCmd loadImageAsyncCmd(@Nonnull InputStream imageStream) {
+        return new LoadImageAsyncCmdImpl(getDockerCmdExecFactory().createLoadImageAsyncCmdExec(), imageStream);
+    }
+
     @Override
     public SearchImagesCmd searchImagesCmd(String term) {
         return new SearchImagesCmdImpl(getDockerCmdExecFactory().createSearchImagesCmdExec(), term);
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageAsyncCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageAsyncCmdImpl.java
new file mode 100644
index 000000000..92311b4bf
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageAsyncCmdImpl.java
@@ -0,0 +1,42 @@
+package com.github.dockerjava.core.command;
+
+import com.github.dockerjava.api.command.LoadImageAsyncCmd;
+import com.github.dockerjava.api.model.LoadResponseItem;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+public class LoadImageAsyncCmdImpl extends AbstrAsyncDockerCmd<LoadImageAsyncCmd, LoadResponseItem> implements LoadImageAsyncCmd {
+
+    private InputStream inputStream;
+
+    public LoadImageAsyncCmdImpl(LoadImageAsyncCmd.Exec exec, InputStream inputStream) {
+        super(exec);
+        this.inputStream = inputStream;
+    }
+
+    @Override
+    public InputStream getImageStream() {
+        return this.inputStream;
+    }
+
+    @Override
+    public LoadImageAsyncCmd withImageStream(InputStream imageStream) {
+        checkNotNull(imageStream, "imageStream was not specified");
+        this.inputStream = imageStream;
+        return this;
+    }
+
+    @Override
+    public void close() {
+        super.close();
+
+        try {
+            this.inputStream.close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LoadImageAsyncCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LoadImageAsyncCmdExec.java
new file mode 100644
index 000000000..47f1d52fc
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LoadImageAsyncCmdExec.java
@@ -0,0 +1,30 @@
+package com.github.dockerjava.core.exec;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.LoadImageAsyncCmd;
+import com.github.dockerjava.api.model.LoadResponseItem;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.WebTarget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LoadImageAsyncCmdExec extends AbstrAsyncDockerCmdExec<LoadImageAsyncCmd, LoadResponseItem> implements LoadImageAsyncCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(LoadImageAsyncCmdExec.class);
+
+    public LoadImageAsyncCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected Void execute0(LoadImageAsyncCmd command, ResultCallback<LoadResponseItem> resultCallback) {
+        WebTarget webTarget = getBaseResource().path("/images/load");
+
+        LOGGER.trace("POST: {}", webTarget);
+
+        webTarget.request().post(new TypeReference<LoadResponseItem>() { }, resultCallback, command.getImageStream());
+
+        return null;
+    }
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java
index 5734163f9..5b87f17a6 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.cmd;
 
+import com.github.dockerjava.api.command.LoadImageCallback;
 import com.github.dockerjava.api.model.Image;
 import com.github.dockerjava.utils.TestResources;
 import net.jcip.annotations.NotThreadSafe;
@@ -53,6 +54,19 @@ public void loadImageFromTar() throws Exception {
                 asList(image.getRepoTags()), equalTo(singletonList("docker-java/load:1.0")));
     }
 
+    @Test
+    public void loadImageFromTarAsync() throws Exception {
+        try (InputStream uploadStream = Files.newInputStream(TestResources.getApiImagesLoadTestTarball())) {
+            dockerRule.getClient().loadImageAsyncCmd(uploadStream).exec(new LoadImageCallback()).awaitMessage();
+        }
+
+        final Image image = findImageWithId(expectedImageId, dockerRule.getClient().listImagesCmd().exec());
+
+        assertThat("Can't find expected image after loading from a tar archive!", image, notNullValue());
+        assertThat("Image after loading from a tar archive has wrong tags!",
+                   asList(image.getRepoTags()), equalTo(singletonList("docker-java/load:1.0")));
+    }
+
     private Image findImageWithId(final String id, final List<Image> images) {
         for (Image image : images) {
             if (id.equals(image.getId())) {

From 079797ffb278a48ebc5db6d1032f36f0f1ec7243 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Dec 2022 16:56:10 -0600
Subject: [PATCH 1119/1272] Bump junixsocket.version from 2.3.2 to 2.6.1
 (#1988)

Bumps `junixsocket.version` from 2.3.2 to 2.6.1.

Updates `junixsocket-common` from 2.3.2 to 2.6.1
- [Release notes](https://github.com/kohlschutter/junixsocket/releases)
- [Commits](https://github.com/kohlschutter/junixsocket/compare/junixsocket-parent-2.3.2...junixsocket-2.6.1)

Updates `junixsocket-native-common` from 2.3.2 to 2.6.1
- [Release notes](https://github.com/kohlschutter/junixsocket/releases)
- [Commits](https://github.com/kohlschutter/junixsocket/compare/junixsocket-parent-2.3.2...junixsocket-2.6.1)

---
updated-dependencies:
- dependency-name: com.kohlschutter.junixsocket:junixsocket-common
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.kohlschutter.junixsocket:junixsocket-native-common
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6976c5c74..b2c2c876a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
 		<slf4j-api.version>1.7.30</slf4j-api.version>
 
 		<bouncycastle.version>1.64</bouncycastle.version>
-		<junixsocket.version>2.3.2</junixsocket.version>
+		<junixsocket.version>2.6.1</junixsocket.version>
 		<guava.version>19.0</guava.version> <!-- todo remove from project -->
 
 		<!-- test dependencies -->

From 0867f5b43317f13353be7c48a8e3879aeeee13d6 Mon Sep 17 00:00:00 2001
From: belugabehr <12578579+belugabehr@users.noreply.github.com>
Date: Fri, 3 Feb 2023 12:30:19 -0500
Subject: [PATCH 1120/1272] Fix typo of certificate (#2053)

---
 .../com/github/dockerjava/core/DefaultDockerClientConfig.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index 7f17295f3..1fe22ceeb 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -454,7 +454,7 @@ public DefaultDockerClientConfig build() {
         private String checkDockerCertPath(String dockerCertPath) {
             if (StringUtils.isEmpty(dockerCertPath)) {
                 throw new DockerClientException(
-                        "Enabled TLS verification (DOCKER_TLS_VERIFY=1) but certifate path (DOCKER_CERT_PATH) is not defined.");
+                        "Enabled TLS verification (DOCKER_TLS_VERIFY=1) but certificate path (DOCKER_CERT_PATH) is not defined.");
             }
 
             File certPath = new File(dockerCertPath);

From db508d877ab9e573af43c0bcc90c735d024ddbed Mon Sep 17 00:00:00 2001
From: Harald Albers <albers@users.noreply.github.com>
Date: Sun, 5 Feb 2023 23:38:06 +0000
Subject: [PATCH 1121/1272] Add `Name` to `ContainerNetworkConfig` (#2052)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Harald Albers <github@albersweb.de>
Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../java/com/github/dockerjava/api/model/Network.java  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
index f6d989d3f..7e5110ce6 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
@@ -97,6 +97,12 @@ public Map<String, String> getLabels() {
     public static class ContainerNetworkConfig extends DockerObject implements Serializable {
         private static final long serialVersionUID = 1L;
 
+        /**
+         * @since {@link RemoteApiVersion#VERSION_1_22}
+         */
+        @JsonProperty("Name")
+        private String name;
+
         @JsonProperty("EndpointID")
         private String endpointId;
 
@@ -109,6 +115,10 @@ public static class ContainerNetworkConfig extends DockerObject implements Seria
         @JsonProperty("IPv6Address")
         private String ipv6Address;
 
+        public String getName() {
+            return name;
+        }
+
         public String getEndpointId() {
             return endpointId;
         }

From f8fd4924dbb0c4ef4d018a86b83da3d44767e5a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20K=C3=A5gedal=20Reimer?= <skagedal@gmail.com>
Date: Tue, 7 Feb 2023 15:53:27 +0100
Subject: [PATCH 1122/1272] Support docker context (#2036)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Resolve Docker Client Config by reading `DOCKER_CONTEXT` env var or
`currentContext` from `~/.docker/config.json`.

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../core/DefaultDockerClientConfig.java       | 56 +++++++++++----
 .../dockerjava/core/DockerConfigFile.java     | 17 ++++-
 .../core/DockerContextMetaFile.java           | 66 +++++++++++++++++
 .../core/DefaultDockerClientConfigTest.java   | 72 +++++++++++++++----
 .../core/DockerClientBuilderTest.java         |  5 ++
 .../dockerjava/core/DockerClientImplTest.java |  3 +-
 .../dockerjava/core/DockerConfigFileTest.java |  8 +++
 .../dockerContextHomeDir/.docker/config.json  |  4 ++
 .../meta.json                                 | 12 ++++
 .../meta.json                                 | 12 ++++
 .../resources/someHomeDir/.docker/config.json |  4 +-
 .../config.json                               |  4 ++
 12 files changed, 234 insertions(+), 29 deletions(-)
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java
 create mode 100644 docker-java/src/test/resources/dockerContextHomeDir/.docker/config.json
 create mode 100644 docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/51699a7c75211315f1dbf6ecc40dfb0ffdd4ee11ecb2ce7853c9751aea1f9444/meta.json
 create mode 100644 docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/d090e08f0c9167acd72adef6d9fa07ec2de3a873cdd545dd8cb7fc7a10a1331a/meta.json
 create mode 100644 docker-java/src/test/resources/testAuthConfigFile/validDockerConfigWithCurrentContext/config.json

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index 1fe22ceeb..88d9e49f0 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -5,6 +5,7 @@
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.core.NameParser.HostnameReposName;
 import com.github.dockerjava.core.NameParser.ReposTag;
+import java.util.Optional;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.apache.commons.lang3.builder.EqualsBuilder;
@@ -37,6 +38,8 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf
 
     public static final String DOCKER_HOST = "DOCKER_HOST";
 
+    public static final String DOCKER_CONTEXT = "DOCKER_CONTEXT";
+
     public static final String DOCKER_TLS_VERIFY = "DOCKER_TLS_VERIFY";
 
     public static final String DOCKER_CONFIG = "DOCKER_CONFIG";
@@ -87,11 +90,13 @@ public class DefaultDockerClientConfig implements Serializable, DockerClientConf
 
     private final RemoteApiVersion apiVersion;
 
-    private DockerConfigFile dockerConfig = null;
+    private final DockerConfigFile dockerConfig;
 
-    DefaultDockerClientConfig(URI dockerHost, String dockerConfigPath, String apiVersion, String registryUrl,
-            String registryUsername, String registryPassword, String registryEmail, SSLConfig sslConfig) {
+    DefaultDockerClientConfig(URI dockerHost, DockerConfigFile dockerConfigFile, String dockerConfigPath, String apiVersion,
+                              String registryUrl, String registryUsername, String registryPassword, String registryEmail,
+                              SSLConfig sslConfig) {
         this.dockerHost = checkDockerHostScheme(dockerHost);
+        this.dockerConfig = dockerConfigFile;
         this.dockerConfigPath = dockerConfigPath;
         this.apiVersion = RemoteApiVersion.parseConfigWithDefault(apiVersion);
         this.sslConfig = sslConfig;
@@ -174,6 +179,13 @@ private static Properties overrideDockerPropertiesWithEnv(Properties properties,
             }
         }
 
+        if (env.containsKey(DOCKER_CONTEXT)) {
+            String value = env.get(DOCKER_CONTEXT);
+            if (value != null && value.trim().length() != 0) {
+                overriddenProperties.setProperty(DOCKER_CONTEXT, value);
+            }
+        }
+
         for (Map.Entry<String, String> envEntry : env.entrySet()) {
             String envKey = envEntry.getKey();
             if (CONFIG_KEYS.contains(envKey)) {
@@ -258,13 +270,6 @@ public String getDockerConfigPath() {
 
     @Nonnull
     public DockerConfigFile getDockerConfig() {
-        if (dockerConfig == null) {
-            try {
-                dockerConfig = DockerConfigFile.loadConfig(getObjectMapper(), getDockerConfigPath());
-            } catch (IOException e) {
-                throw new DockerClientException("Failed to parse docker configuration file", e);
-            }
-        }
         return dockerConfig;
     }
 
@@ -325,7 +330,7 @@ public static class Builder {
         private URI dockerHost;
 
         private String apiVersion, registryUsername, registryPassword, registryEmail, registryUrl, dockerConfig,
-                dockerCertPath;
+                dockerCertPath, dockerContext;
 
         private Boolean dockerTlsVerify;
 
@@ -343,6 +348,7 @@ public Builder withProperties(Properties p) {
             }
 
             return withDockerTlsVerify(p.getProperty(DOCKER_TLS_VERIFY))
+                    .withDockerContext(p.getProperty(DOCKER_CONTEXT))
                     .withDockerConfig(p.getProperty(DOCKER_CONFIG))
                     .withDockerCertPath(p.getProperty(DOCKER_CERT_PATH))
                     .withApiVersion(p.getProperty(API_VERSION))
@@ -401,6 +407,11 @@ public final Builder withDockerConfig(String dockerConfig) {
             return this;
         }
 
+        public final Builder withDockerContext(String dockerContext) {
+            this.dockerContext = dockerContext;
+            return this;
+        }
+
         public final Builder withDockerTlsVerify(String dockerTlsVerify) {
             if (dockerTlsVerify != null) {
                 String trimmed = dockerTlsVerify.trim();
@@ -443,14 +454,33 @@ public DefaultDockerClientConfig build() {
                 sslConfig = customSslConfig;
             }
 
+            final DockerConfigFile dockerConfigFile = readDockerConfig();
+
+            final String context = (dockerContext != null) ? dockerContext : dockerConfigFile.getCurrentContext();
             URI dockerHostUri = dockerHost != null
                 ? dockerHost
-                : URI.create(SystemUtils.IS_OS_WINDOWS ? WINDOWS_DEFAULT_DOCKER_HOST : DEFAULT_DOCKER_HOST);
+                : resolveDockerHost(context);
 
-            return new DefaultDockerClientConfig(dockerHostUri, dockerConfig, apiVersion, registryUrl, registryUsername,
+            return new DefaultDockerClientConfig(dockerHostUri, dockerConfigFile, dockerConfig, apiVersion, registryUrl, registryUsername,
                     registryPassword, registryEmail, sslConfig);
         }
 
+        private DockerConfigFile readDockerConfig() {
+            try {
+                return DockerConfigFile.loadConfig(DockerClientConfig.getDefaultObjectMapper(), dockerConfig);
+            } catch (IOException e) {
+                throw new DockerClientException("Failed to parse docker configuration file", e);
+            }
+        }
+
+        private URI resolveDockerHost(String dockerContext) {
+            return URI.create(Optional.ofNullable(dockerContext)
+                .flatMap(context -> DockerContextMetaFile.resolveContextMetaFile(
+                    DockerClientConfig.getDefaultObjectMapper(), new File(dockerConfig), context))
+                .flatMap(DockerContextMetaFile::host)
+                .orElse(SystemUtils.IS_OS_WINDOWS ? WINDOWS_DEFAULT_DOCKER_HOST : DEFAULT_DOCKER_HOST));
+        }
+
         private String checkDockerCertPath(String dockerCertPath) {
             if (StringUtils.isEmpty(dockerCertPath)) {
                 throw new DockerClientException(
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
index eb5a94e2e..825796a74 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
+import java.util.Objects;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -29,6 +30,9 @@ public class DockerConfigFile {
     @JsonProperty
     private final Map<String, AuthConfig> auths;
 
+    @JsonProperty
+    private String currentContext;
+
     public DockerConfigFile() {
         this(new HashMap<>());
     }
@@ -46,6 +50,14 @@ void addAuthConfig(AuthConfig config) {
         auths.put(config.getRegistryAddress(), config);
     }
 
+    void setCurrentContext(String currentContext) {
+        this.currentContext = currentContext;
+    }
+
+    public String getCurrentContext() {
+        return currentContext;
+    }
+
     @CheckForNull
     public AuthConfig resolveAuthConfig(@CheckForNull String hostname) {
         if (StringUtils.isEmpty(hostname) || AuthConfig.DEFAULT_SERVER_ADDRESS.equals(hostname)) {
@@ -104,6 +116,9 @@ public boolean equals(Object obj) {
                 return false;
         } else if (!auths.equals(other.auths))
             return false;
+        if (!Objects.equals(currentContext, other.currentContext)) {
+            return false;
+        }
         return true;
     }
 
@@ -111,7 +126,7 @@ public boolean equals(Object obj) {
 
     @Override
     public String toString() {
-        return "DockerConfigFile [auths=" + auths + "]";
+        return "DockerConfigFile [auths=" + auths + ", currentContext='" + currentContext + "']";
     }
 
     @Nonnull
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java
new file mode 100644
index 000000000..a52304c8e
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java
@@ -0,0 +1,66 @@
+package com.github.dockerjava.core;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.hash.HashFunction;
+import com.google.common.hash.Hashing;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Optional;
+
+public class DockerContextMetaFile {
+    private static HashFunction metaHashFunction = Hashing.sha256();
+
+    @JsonProperty("Name")
+    String name;
+
+    @JsonProperty("Endpoints")
+    Endpoints endpoints;
+
+    public static class Endpoints {
+        @JsonProperty("docker")
+        Docker docker;
+
+        public static class Docker {
+            @JsonProperty("Host")
+            String host;
+
+            @JsonProperty("SkipTLSVerify")
+            boolean skipTLSVerify;
+        }
+    }
+
+    public Optional<String> host() {
+        if (endpoints != null && endpoints.docker != null) {
+            return Optional.ofNullable(endpoints.docker.host);
+        }
+        return Optional.empty();
+    }
+
+    public static Optional<DockerContextMetaFile> resolveContextMetaFile(ObjectMapper objectMapper, File dockerConfigPath, String context) {
+        final File path = dockerConfigPath.toPath()
+            .resolve("contexts")
+            .resolve("meta")
+            .resolve(metaHashFunction.hashString(context, StandardCharsets.UTF_8).toString())
+            .resolve("meta.json")
+            .toFile();
+        return Optional.ofNullable(loadContextMetaFile(objectMapper, path));
+    }
+
+    public static DockerContextMetaFile loadContextMetaFile(ObjectMapper objectMapper, File dockerContextMetaFile) {
+        try {
+            return parseContextMetaFile(objectMapper, dockerContextMetaFile);
+        } catch (Exception exception) {
+            return null;
+        }
+    }
+
+    public static DockerContextMetaFile parseContextMetaFile(ObjectMapper objectMapper, File dockerContextMetaFile) throws IOException {
+        try {
+            return objectMapper.readValue(dockerContextMetaFile, DockerContextMetaFile.class);
+        } catch (IOException e) {
+            throw new IOException("Failed to parse docker context meta file " + dockerContextMetaFile, e);
+        }
+    }
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
index 02b7e34ae..d5b751145 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
@@ -1,9 +1,9 @@
 package com.github.dockerjava.core;
 
-import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.google.common.io.Resources;
+import java.io.IOException;
 import org.apache.commons.lang3.SerializationUtils;
 import org.junit.Test;
 
@@ -27,13 +27,26 @@
 public class DefaultDockerClientConfigTest {
 
     public static final DefaultDockerClientConfig EXAMPLE_CONFIG = newExampleConfig();
+    public static final DefaultDockerClientConfig EXAMPLE_CONFIG_FULLY_LOADED = newExampleConfigFullyLoaded();
 
     private static DefaultDockerClientConfig newExampleConfig() {
-
         String dockerCertPath = dockerCertPath();
+        return new DefaultDockerClientConfig(URI.create("tcp://foo"), null, "dockerConfig", "apiVersion", "registryUrl",
+            "registryUsername", "registryPassword", "registryEmail",
+            new LocalDirectorySSLConfig(dockerCertPath));
+    }
 
-        return new DefaultDockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
+    private static DefaultDockerClientConfig newExampleConfigFullyLoaded() {
+        try {
+            String dockerCertPath = dockerCertPath();
+            String dockerConfig = "dockerConfig";
+            DockerConfigFile loadedConfigFile = DockerConfigFile.loadConfig(DockerClientConfig.getDefaultObjectMapper(), dockerConfig);
+            return new DefaultDockerClientConfig(URI.create("tcp://foo"), loadedConfigFile, dockerConfig, "apiVersion", "registryUrl",
+                "registryUsername", "registryPassword", "registryEmail",
                 new LocalDirectorySSLConfig(dockerCertPath));
+        } catch (IOException exception) {
+            throw new RuntimeException(exception);
+        }
     }
 
     private static String homeDir() {
@@ -69,6 +82,37 @@ public void environmentDockerHost() throws Exception {
         assertEquals(config.getDockerHost(), URI.create("tcp://baz:8768"));
     }
 
+    @Test
+    public void dockerContextFromConfig() throws Exception {
+        // given home directory with docker contexts configured
+        Properties systemProperties = new Properties();
+        systemProperties.setProperty("user.home", "target/test-classes/dockerContextHomeDir");
+
+        // and an empty environment
+        Map<String, String> env = new HashMap<>();
+
+        // when you build a config
+        DefaultDockerClientConfig config = buildConfig(env, systemProperties);
+
+        assertEquals(URI.create("unix:///configcontext.sock"), config.getDockerHost());
+    }
+
+    @Test
+    public void dockerContextFromEnvironmentVariable() throws Exception {
+        // given home directory with docker contexts
+        Properties systemProperties = new Properties();
+        systemProperties.setProperty("user.home", "target/test-classes/dockerContextHomeDir");
+
+        // and an environment variable that overrides docker context
+        Map<String, String> env = new HashMap<>();
+        env.put(DefaultDockerClientConfig.DOCKER_CONTEXT, "envvarcontext");
+
+        // when you build a config
+        DefaultDockerClientConfig config = buildConfig(env, systemProperties);
+
+        assertEquals(URI.create("unix:///envvarcontext.sock"), config.getDockerHost());
+    }
+
     @Test
     public void environment() throws Exception {
 
@@ -88,7 +132,7 @@ public void environment() throws Exception {
         DefaultDockerClientConfig config = buildConfig(env, new Properties());
 
         // then we get the example object
-        assertEquals(config, EXAMPLE_CONFIG);
+        assertEquals(EXAMPLE_CONFIG_FULLY_LOADED, config);
     }
 
     @Test
@@ -147,7 +191,7 @@ public void systemProperties() throws Exception {
         DefaultDockerClientConfig config = buildConfig(Collections.<String, String> emptyMap(), systemProperties);
 
         // then it is the same as the example
-        assertEquals(config, EXAMPLE_CONFIG);
+        assertEquals(EXAMPLE_CONFIG_FULLY_LOADED, config);
 
     }
 
@@ -161,7 +205,7 @@ public void serializableTest() {
 
     @Test()
     public void testSslContextEmpty() throws Exception {
-        new DefaultDockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
+        new DefaultDockerClientConfig(URI.create("tcp://foo"), new DockerConfigFile(), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
                 null);
     }
 
@@ -169,14 +213,14 @@ public void testSslContextEmpty() throws Exception {
 
     @Test()
     public void testTlsVerifyAndCertPath() throws Exception {
-        new DefaultDockerClientConfig(URI.create("tcp://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
+        new DefaultDockerClientConfig(URI.create("tcp://foo"), new DockerConfigFile(), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
                 new LocalDirectorySSLConfig(dockerCertPath()));
     }
 
     @Test()
     public void testAnyHostScheme() throws Exception {
         URI dockerHost = URI.create("a" + UUID.randomUUID().toString().replace("-", "") + "://foo");
-        new DefaultDockerClientConfig(dockerHost, "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
+        new DefaultDockerClientConfig(dockerHost, new DockerConfigFile(), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
             null);
     }
 
@@ -249,10 +293,12 @@ public void dockerHostSetExplicitlyIfSetToDefaultByUser() {
 
 
     @Test
-    public void testGetAuthConfigurationsFromDockerCfg() throws URISyntaxException {
+    public void testGetAuthConfigurationsFromDockerCfg() throws URISyntaxException, IOException {
         File cfgFile = new File(Resources.getResource("com.github.dockerjava.core/registry.v1").toURI());
+        DockerConfigFile dockerConfigFile =
+            DockerConfigFile.loadConfig(DockerClientConfig.getDefaultObjectMapper(), cfgFile.getAbsolutePath());
         DefaultDockerClientConfig clientConfig = new DefaultDockerClientConfig(URI.create(
-            "unix://foo"), cfgFile.getAbsolutePath(), "apiVersion", "registryUrl", "registryUsername", "registryPassword",
+            "unix://foo"), dockerConfigFile, cfgFile.getAbsolutePath(), "apiVersion", "registryUrl", "registryUsername", "registryPassword",
             "registryEmail", null);
 
         AuthConfigurations authConfigurations = clientConfig.getAuthConfigurations();
@@ -265,10 +311,12 @@ public void testGetAuthConfigurationsFromDockerCfg() throws URISyntaxException {
     }
 
     @Test
-    public void testGetAuthConfigurationsFromConfigJson() throws URISyntaxException {
+    public void testGetAuthConfigurationsFromConfigJson() throws URISyntaxException, IOException {
         File cfgFile = new File(Resources.getResource("com.github.dockerjava.core/registry.v2").toURI());
+        DockerConfigFile dockerConfigFile =
+            DockerConfigFile.loadConfig(DockerClientConfig.getDefaultObjectMapper(), cfgFile.getAbsolutePath());
         DefaultDockerClientConfig clientConfig = new DefaultDockerClientConfig(URI.create(
-            "unix://foo"), cfgFile.getAbsolutePath(), "apiVersion", "registryUrl", "registryUsername", "registryPassword",
+            "unix://foo"), dockerConfigFile, cfgFile.getAbsolutePath(), "apiVersion", "registryUrl", "registryUsername", "registryPassword",
             "registryEmail", null);
 
         AuthConfigurations authConfigurations = clientConfig.getAuthConfigurations();
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
index be0bfda8a..43e700fd8 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
@@ -1,7 +1,12 @@
 package com.github.dockerjava.core;
 
 
+import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
+import com.github.dockerjava.api.model.PushResponseItem;
+import com.github.dockerjava.httpclient5.ApacheDockerHttpClient;
+import com.github.dockerjava.transport.DockerHttpClient;
+import java.time.Duration;
 import org.junit.Test;
 
 import java.util.ArrayList;
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
index 08f658d52..8ff17857f 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
@@ -12,7 +12,8 @@ public class DockerClientImplTest {
     @Test
     public void configuredInstanceAuthConfig() throws Exception {
         // given a config with null serverAddress
-        DefaultDockerClientConfig dockerClientConfig = new DefaultDockerClientConfig(URI.create("tcp://foo"), null, null, null, "", "", "", null);
+        DefaultDockerClientConfig dockerClientConfig = new DefaultDockerClientConfig(URI.create("tcp://foo"),
+            new DockerConfigFile(), null, null, null, "", "", "", null);
         DockerClientImpl dockerClient = DockerClientImpl.getInstance(dockerClientConfig);
 
         // when we get the auth config
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
index 83bc124e9..ce1a59cc0 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
@@ -150,6 +150,14 @@ public void validDockerConfig() throws IOException {
         assertThat(runTest("validDockerConfig"), is(expected));
     }
 
+    @Test
+    public void validDockerConfigWithCurrentContext() throws IOException {
+        DockerConfigFile expected = new DockerConfigFile();
+        expected.setCurrentContext("expectedContext");
+
+        assertThat(runTest("validDockerConfigWithCurrentContext"), is(expected));
+    }
+
     @Test
     public void nonExistent() throws IOException {
         DockerConfigFile expected = new DockerConfigFile();
diff --git a/docker-java/src/test/resources/dockerContextHomeDir/.docker/config.json b/docker-java/src/test/resources/dockerContextHomeDir/.docker/config.json
new file mode 100644
index 000000000..5bb2ebebe
--- /dev/null
+++ b/docker-java/src/test/resources/dockerContextHomeDir/.docker/config.json
@@ -0,0 +1,4 @@
+{
+	"auths": {},
+	"currentContext": "configcontext"
+}
diff --git a/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/51699a7c75211315f1dbf6ecc40dfb0ffdd4ee11ecb2ce7853c9751aea1f9444/meta.json b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/51699a7c75211315f1dbf6ecc40dfb0ffdd4ee11ecb2ce7853c9751aea1f9444/meta.json
new file mode 100644
index 000000000..c6456d6b8
--- /dev/null
+++ b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/51699a7c75211315f1dbf6ecc40dfb0ffdd4ee11ecb2ce7853c9751aea1f9444/meta.json
@@ -0,0 +1,12 @@
+{
+    "Name": "envvarcontext",
+    "Metadata": {
+        "Description": "envvarcontext"
+    },
+    "Endpoints": {
+        "docker": {
+            "Host": "unix:///envvarcontext.sock",
+            "SkipTLSVerify": false
+        }
+    }
+}
diff --git a/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/d090e08f0c9167acd72adef6d9fa07ec2de3a873cdd545dd8cb7fc7a10a1331a/meta.json b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/d090e08f0c9167acd72adef6d9fa07ec2de3a873cdd545dd8cb7fc7a10a1331a/meta.json
new file mode 100644
index 000000000..adff3b1c9
--- /dev/null
+++ b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/d090e08f0c9167acd72adef6d9fa07ec2de3a873cdd545dd8cb7fc7a10a1331a/meta.json
@@ -0,0 +1,12 @@
+{
+    "Name": "configcontext",
+    "Metadata": {
+        "Description": "configcontext"
+    },
+    "Endpoints": {
+        "docker": {
+            "Host": "unix:///configcontext.sock",
+            "SkipTLSVerify": false
+        }
+    }
+}
diff --git a/docker-java/src/test/resources/someHomeDir/.docker/config.json b/docker-java/src/test/resources/someHomeDir/.docker/config.json
index 630394039..02ed0cf7f 100644
--- a/docker-java/src/test/resources/someHomeDir/.docker/config.json
+++ b/docker-java/src/test/resources/someHomeDir/.docker/config.json
@@ -1,9 +1,9 @@
 {
     "auths":{
         "https://index.docker.io/v1/":{
-            "auth":"XXXX=",
+            "auth":"dXNlcm5hbWU6cGFzc3dvcmQ=",
             "email":"foo.bar@test.com"
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/docker-java/src/test/resources/testAuthConfigFile/validDockerConfigWithCurrentContext/config.json b/docker-java/src/test/resources/testAuthConfigFile/validDockerConfigWithCurrentContext/config.json
new file mode 100644
index 000000000..8c5963f87
--- /dev/null
+++ b/docker-java/src/test/resources/testAuthConfigFile/validDockerConfigWithCurrentContext/config.json
@@ -0,0 +1,4 @@
+{
+	"auths": {},
+	"currentContext": "expectedContext"
+}

From 26cd13ced7aa9e605910b77a62200db2eded92c7 Mon Sep 17 00:00:00 2001
From: Harald Albers <albers@users.noreply.github.com>
Date: Thu, 9 Feb 2023 21:49:21 +0000
Subject: [PATCH 1123/1272] Fix parameter order in `assertEquals` (#2066)

Signed-off-by: Harald Albers <github@albersweb.de>

Fixes #1923
---
 .../api/ModelsSerializableTest.java           |  1 -
 .../command/InspectContainerResponseTest.java | 28 ++++----
 .../dockerjava/api/model/AccessModeTest.java  |  6 +-
 .../dockerjava/api/model/AuthConfigTest.java  |  2 +-
 .../dockerjava/api/model/CapabilityTest.java  |  4 +-
 .../dockerjava/api/model/DeviceTest.java      |  2 +-
 .../dockerjava/api/model/ExposedPortTest.java |  6 +-
 .../api/model/ExposedPortsTest.java           |  2 +-
 .../dockerjava/api/model/HostConfigTest.java  |  2 +-
 .../dockerjava/api/model/IdentifierTest.java  | 18 ++---
 .../api/model/InternetProtocolTest.java       |  8 +--
 .../github/dockerjava/api/model/LinkTest.java | 10 +--
 .../dockerjava/api/model/PortBindingTest.java | 10 +--
 .../api/model/PortsAddBindingsTest.java       | 12 ++--
 .../api/model/PortsSerializingTest.java       | 16 ++---
 .../api/model/RestartPolicyParsingTest.java   | 24 +++----
 .../model/RestartPolicySerializingTest.java   | 10 +--
 .../api/model/RestartPolicyToStringTest.java  |  4 +-
 .../dockerjava/api/model/VolumeBindsTest.java |  6 +-
 .../api/model/VolumeFromSerializingTest.java  |  2 +-
 .../dockerjava/api/model/VolumeTest.java      |  2 +-
 .../dockerjava/cmd/AttachContainerCmdIT.java  |  5 +-
 .../com/github/dockerjava/cmd/AuthCmdIT.java  |  4 +-
 .../dockerjava/cmd/BuildImageCmdIT.java       | 14 ++--
 .../cmd/CopyArchiveFromContainerCmdIT.java    |  6 +-
 .../cmd/CopyArchiveToContainerCmdIT.java      |  2 +-
 .../cmd/CopyFileFromContainerCmdIT.java       |  4 +-
 .../dockerjava/cmd/CreateContainerCmdIT.java  |  1 -
 .../dockerjava/cmd/CreateNetworkCmdIT.java    |  4 +-
 .../dockerjava/cmd/CustomCommandIT.java       |  1 -
 .../cmd/DisconnectFromNetworkCmdIT.java       |  4 +-
 .../dockerjava/cmd/InspectContainerCmdIT.java |  2 +-
 .../dockerjava/cmd/InspectExecCmdIT.java      |  2 +-
 .../dockerjava/cmd/ListContainersCmdIT.java   | 16 ++---
 .../dockerjava/cmd/LogContainerCmdIT.java     |  2 +-
 .../github/dockerjava/cmd/PushImageCmdIT.java |  2 +-
 .../cmd/RemoveContainerCmdImplIT.java         |  2 +-
 .../dockerjava/cmd/RemoveImageCmdIT.java      |  4 +-
 .../dockerjava/cmd/RenameContainerCmdIT.java  |  2 +-
 .../cmd/RestartContainerCmdImplIT.java        |  2 +-
 .../dockerjava/cmd/StartContainerCmdIT.java   |  2 +-
 .../github/dockerjava/cmd/TagImageCmdIT.java  |  4 +-
 .../dockerjava/cmd/UpdateContainerCmdIT.java  |  2 +-
 .../github/dockerjava/cmd/VersionCmdIT.java   |  2 +-
 .../dockerjava/cmd/WaitContainerCmdIT.java    |  2 +-
 .../cmd/swarm/CreateSecretCmdExecIT.java      |  2 +-
 .../cmd/swarm/CreateServiceCmdExecIT.java     |  2 +-
 .../cmd/swarm/InspectConfigCmdIT.java         |  2 -
 .../cmd/swarm/JoinSwarmCmdExecIT.java         |  6 +-
 .../cmd/swarm/ListServicesCmdExecIT.java      |  2 +-
 .../cmd/swarm/ListSwarmNodesCmdExecIT.java    | 10 +--
 .../dockerjava/cmd/swarm/SwarmCmdIT.java      |  2 +-
 .../cmd/swarm/UpdateSwarmNodeIT.java          |  2 +-
 .../cmd/swarm/UpdateSwarmServiceIT.java       |  2 +-
 .../core/DefaultDockerClientConfigTest.java   | 32 ++++-----
 .../core/DockerClientBuilderTest.java         |  7 +-
 .../dockerjava/core/DockerClientImplTest.java |  6 +-
 .../dockerjava/core/GoLangFileMatchTest.java  |  2 +-
 .../dockerjava/core/NameParserTest.java       | 66 +++++++++----------
 .../core/command/FrameReaderTest.java         |  6 +-
 .../core/util/CompressArchiveUtilTest.java    |  2 +-
 .../NettyDockerCmdExecFactoryConfigTest.java  |  8 +--
 .../dockerjava/netty/NettyWebTargetTest.java  | 14 ++--
 .../FramedResponseStreamHandlerTest.java      | 12 ++--
 .../HttpResponseStreamHandlerTest.java        |  8 +--
 65 files changed, 223 insertions(+), 236 deletions(-)

diff --git a/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java b/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java
index 4dc87cafb..1c7c1de6c 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/ModelsSerializableTest.java
@@ -9,7 +9,6 @@
 import com.github.dockerjava.api.model.ResponseItem;
 import com.google.common.reflect.ClassPath.ClassInfo;
 import org.apache.commons.lang3.reflect.FieldUtils;
-import org.hamcrest.MatcherAssert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
index 062088316..12105e8a1 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/command/InspectContainerResponseTest.java
@@ -56,11 +56,11 @@ public void roundTrip_full() throws IOException {
         final InspectContainerResponse response = responses[0];
 
         // Check volumes: https://github.com/docker-java/docker-java/issues/211
-        assertEquals(response.getVolumes().length, 2);
-        assertEquals(response.getVolumesRW().length, 2);
-        assertEquals(response.getVolumes()[1].getContainerPath(), "/bar/foo/myvol2");
-        assertEquals(response.getVolumes()[1].getHostPath(), "/path2");
-        assertEquals(response.getVolumesRW()[1].getVolume().getPath(), "/bar/foo/myvol2");
+        assertEquals(2, response.getVolumes().length);
+        assertEquals(2, response.getVolumesRW().length);
+        assertEquals("/bar/foo/myvol2" ,response.getVolumes()[1].getContainerPath());
+        assertEquals("/path2", response.getVolumes()[1].getHostPath());
+        assertEquals("/bar/foo/myvol2", response.getVolumesRW()[1].getVolume().getPath());
         assertFalse(response.getVolumesRW()[1].getAccessMode().toBoolean());
         assertTrue(response.getVolumesRW()[0].getAccessMode().toBoolean());
         assertThat(response.getLogPath(), is("/mnt/sda1/var/lib/docker/containers/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1/469e5edd8d5b33e3c905a7ffc97360ec6ee211d6782815fbcd144568045819e1-json.log"));
@@ -76,11 +76,11 @@ public void roundTrip_full_healthcheck() throws IOException {
             type
         );
 
-        assertEquals(response.getState().getHealth().getStatus(), "healthy");
-        assertEquals(response.getState().getHealth().getFailingStreak(), new Integer(0));
-        assertEquals(response.getState().getHealth().getLog().size(), 2);
-        assertEquals(response.getState().getHealth().getLog().get(0).getOutput(), "Hello");
-        assertEquals(response.getState().getHealth().getLog().get(1).getOutput(), "World");
+        assertEquals("healthy", response.getState().getHealth().getStatus());
+        assertEquals(new Integer(0), response.getState().getHealth().getFailingStreak());
+        assertEquals(2, response.getState().getHealth().getLog().size());
+        assertEquals("Hello", response.getState().getHealth().getLog().get(0).getOutput());
+        assertEquals("World", response.getState().getHealth().getLog().get(1).getOutput());
     }
 
     @Test
@@ -108,11 +108,11 @@ public void roundTrip_1_26a_full() throws IOException {
         final InspectContainerResponse response = responses[0];
 
         final List<InspectContainerResponse.Mount> mounts = response.getMounts();
-        assertEquals(mounts.size(), 1);
+        assertEquals(1, mounts.size());
 
         final InspectContainerResponse.Mount mount = mounts.get(0);
         final Volume volume = mount.getDestination();
-        assertEquals(volume.getPath(), "/var/lib/postgresql/data");
+        assertEquals("/var/lib/postgresql/data", volume.getPath());
     }
 
     @Test
@@ -124,11 +124,11 @@ public void roundTrip_1_26b_full() throws IOException {
         final InspectContainerResponse response = responses[0];
 
         final List<InspectContainerResponse.Mount> mounts = response.getMounts();
-        assertEquals(mounts.size(), 1);
+        assertEquals(1, mounts.size());
 
         final InspectContainerResponse.Mount mount = mounts.get(0);
         final Volume volume = mount.getDestination();
-        assertEquals(volume.getPath(), "/srv/test");
+        assertEquals("/srv/test", volume.getPath());
     }
 
     @Test
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java
index 9d08843dc..d5ff7044a 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/AccessModeTest.java
@@ -15,17 +15,17 @@ public class AccessModeTest {
 
     @Test
     public void defaultAccessMode() {
-        assertEquals(AccessMode.DEFAULT, rw);
+        assertEquals(rw, AccessMode.DEFAULT);
     }
 
     @Test
     public void stringify() {
-        assertEquals(AccessMode.rw.toString(), "rw");
+        assertEquals("rw", AccessMode.rw.toString());
     }
 
     @Test
     public void fromString() {
-        assertEquals(AccessMode.valueOf("rw"), rw);
+        assertEquals(rw, AccessMode.valueOf("rw"));
     }
 
     @Test
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
index 86120733b..ae3e4a91b 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/AuthConfigTest.java
@@ -17,7 +17,7 @@
 public class AuthConfigTest {
 
     @Test
-    public void defaultServerAddress() throws Exception {
+    public void defaultServerAddress() {
         assertEquals(new AuthConfig().getRegistryAddress(), "https://index.docker.io/v1/");
     }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
index e76d2437c..aa6167b8c 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
@@ -11,13 +11,13 @@ public class CapabilityTest {
     @Test
     public void serializeCapability() throws Exception {
         String json = JSONTestHelper.getMapper().writeValueAsString(Capability.ALL);
-        assertEquals(json, "\"ALL\"");
+        assertEquals("\"ALL\"", json);
     }
 
     @Test
     public void deserializeCapability() throws Exception {
         Capability capability = JSONTestHelper.getMapper().readValue("\"ALL\"", Capability.class);
-        assertEquals(capability, Capability.ALL);
+        assertEquals(Capability.ALL, capability);
     }
 
     @Test(expected = JsonMappingException.class)
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/DeviceTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/DeviceTest.java
index 18c6fbbc8..9d191fe52 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/DeviceTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/DeviceTest.java
@@ -54,7 +54,7 @@ public class DeviceTest {
     }};
 
     @Test
-    public void testParse() throws Exception {
+    public void testParse() {
         assertThat(Device.parse("/dev/sda:/dev/xvdc:r"),
                 equalTo(new Device("r", "/dev/xvdc", "/dev/sda")));
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java
index 20999a92f..fce761380 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortTest.java
@@ -16,13 +16,13 @@ public class ExposedPortTest {
     @Test
     public void parsePortAndProtocol() {
         ExposedPort exposedPort = ExposedPort.parse("80/tcp");
-        assertEquals(exposedPort, new ExposedPort(80, TCP));
+        assertEquals(new ExposedPort(80, TCP), exposedPort);
     }
 
     @Test
     public void parsePortOnly() {
         ExposedPort exposedPort = ExposedPort.parse("80");
-        assertEquals(exposedPort, new ExposedPort(80, DEFAULT));
+        assertEquals(new ExposedPort(80, DEFAULT), exposedPort);
     }
 
     @Test
@@ -43,7 +43,7 @@ public void parseNull() {
 
     @Test
     public void stringify() {
-        assertEquals(ExposedPort.parse("80/tcp").toString(), "80/tcp");
+        assertEquals("80/tcp", ExposedPort.parse("80/tcp").toString());
     }
 
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java
index 456e65ca4..f46dddc68 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/ExposedPortsTest.java
@@ -51,7 +51,7 @@ public void usesFromJson() throws Exception {
     }
 
     @Test
-    public void usesFromJsonWithDuplicate() throws Exception {
+    public void usesFromJsonWithDuplicate() {
         ExposedPorts ports = new ExposedPorts(
             new ExposedPort(80, InternetProtocol.UDP),
             new ExposedPort(80),
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/HostConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/HostConfigTest.java
index d69c31ba9..5e13103dd 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/HostConfigTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/HostConfigTest.java
@@ -8,7 +8,7 @@
 public class HostConfigTest {
 
     @Test
-    public void testNewObjectsEqual() throws Exception {
+    public void testNewObjectsEqual() {
         assertThat(HostConfig.newHostConfig(),
                 equalTo(HostConfig.newHostConfig()));
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
index c39706e51..3b8efa2c5 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/IdentifierTest.java
@@ -17,26 +17,26 @@ public void testFromCompoundString() throws Exception {
         Identifier i3A = Identifier.fromCompoundString("10.0.0.1:123/jim:latest");
 
         assertTrue(!i1.tag.isPresent());
-        assertEquals(i1.repository.name, "10.0.0.1/jim");
+        assertEquals("10.0.0.1/jim", i1.repository.name);
 
         assertTrue(i2.tag.isPresent());
-        assertEquals(i2.tag.get(), "123");
-        assertEquals(i2.repository.name, "10.0.0.1/jim");
+        assertEquals("123", i2.tag.get());
+        assertEquals("10.0.0.1/jim", i2.repository.name);
 
         assertTrue(i3.tag.isPresent());
-        assertEquals(i3.tag.get(), "124");
-        assertEquals(i3.repository.name, "10.0.0.1:123/jim");
-        assertEquals(i3.repository.getURL().getPort(), 123);
-        assertEquals(i3A.tag.get(), "latest");
+        assertEquals("124", i3.tag.get());
+        assertEquals("10.0.0.1:123/jim", i3.repository.name);
+        assertEquals(123, i3.repository.getURL().getPort());
+        assertEquals("latest", i3A.tag.get());
 
         Identifier i4 = Identifier.fromCompoundString("centos:latest");
         assertTrue(i4.tag.isPresent());
-        assertEquals(i4.tag.get(), "latest");
+        assertEquals("latest", i4.tag.get());
 
         Identifier i5 = Identifier.fromCompoundString("busybox");
         assertTrue(!i5.tag.isPresent());
 
         Identifier i6 = Identifier.fromCompoundString("10.0.0.1:5000/my-test-image:1234");
-        assertEquals(i6.repository.getPath(), "my-test-image");
+        assertEquals("my-test-image", i6.repository.getPath());
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java
index 5efb8d2c3..0421e1411 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/InternetProtocolTest.java
@@ -13,22 +13,22 @@ public class InternetProtocolTest {
 
     @Test
     public void defaultProtocol() {
-        assertEquals(InternetProtocol.DEFAULT, TCP);
+        assertEquals(TCP, InternetProtocol.DEFAULT);
     }
 
     @Test
     public void stringify() {
-        assertEquals(TCP.toString(), "tcp");
+        assertEquals("tcp", TCP.toString());
     }
 
     @Test
     public void parseUpperCase() {
-        assertEquals(InternetProtocol.parse("TCP"), TCP);
+        assertEquals(TCP, InternetProtocol.parse("TCP"));
     }
 
     @Test
     public void parseLowerCase() {
-        assertEquals(InternetProtocol.parse("tcp"), TCP);
+        assertEquals(TCP, InternetProtocol.parse("tcp"));
     }
 
     @Test
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/LinkTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/LinkTest.java
index 18363a9ee..b780eb22f 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/LinkTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/LinkTest.java
@@ -14,15 +14,15 @@ public class LinkTest {
     @Test
     public void parse() {
         Link link = Link.parse("name:alias");
-        assertEquals(link.getName(), "name");
-        assertEquals(link.getAlias(), "alias");
+        assertEquals("name", link.getName());
+        assertEquals("alias", link.getAlias());
     }
 
     @Test
     public void parseWithContainerNames() {
         Link link = Link.parse("/name:/conatiner/alias");
-        assertEquals(link.getName(), "name");
-        assertEquals(link.getAlias(), "alias");
+        assertEquals("name", link.getName());
+        assertEquals("alias", link.getAlias());
     }
 
     @Test
@@ -43,7 +43,7 @@ public void parseNull() {
 
     @Test
     public void stringify() {
-        assertEquals(Link.parse("name:alias").toString(), "name:alias");
+        assertEquals("name:alias", Link.parse("name:alias").toString());
     }
 
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
index 3849a6094..9190cfda4 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/PortBindingTest.java
@@ -23,27 +23,27 @@ public void fullDefinition() {
 
     @Test
     public void noProtocol() {
-        assertEquals(PortBinding.parse("127.0.0.1:80:8080"), new PortBinding(Binding.bindIpAndPort("127.0.0.1", 80), TCP_8080));
+        assertEquals(new PortBinding(Binding.bindIpAndPort("127.0.0.1", 80), TCP_8080), PortBinding.parse("127.0.0.1:80:8080"));
     }
 
     @Test
     public void noHostIp() {
-        assertEquals(PortBinding.parse("80:8080/tcp"), new PortBinding(Binding.bindPort(80), TCP_8080));
+        assertEquals(new PortBinding(Binding.bindPort(80), TCP_8080), PortBinding.parse("80:8080/tcp"));
     }
 
     @Test
     public void portsOnly() {
-        assertEquals(PortBinding.parse("80:8080"), new PortBinding(Binding.bindPort(80), TCP_8080));
+        assertEquals(new PortBinding(Binding.bindPort(80), TCP_8080), PortBinding.parse("80:8080"));
     }
 
     @Test
     public void exposedPortOnly() {
-        assertEquals(PortBinding.parse("8080"), new PortBinding(Binding.empty(), TCP_8080));
+        assertEquals(new PortBinding(Binding.empty(), TCP_8080), PortBinding.parse("8080"));
     }
 
     @Test
     public void dynamicHostPort() {
-        assertEquals(PortBinding.parse("127.0.0.1::8080"), new PortBinding(Binding.bindIp("127.0.0.1"), TCP_8080));
+        assertEquals(new PortBinding(Binding.bindIp("127.0.0.1"), TCP_8080), PortBinding.parse("127.0.0.1::8080"));
     }
 
     @Test
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java
index 02b3047e7..484e5897f 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java
@@ -36,9 +36,9 @@ public void addTwoBindingsForDifferentExposedPorts() {
 
         Map<ExposedPort, Binding[]> bindings = ports.getBindings();
         // two keys with one value each
-        assertEquals(bindings.size(), 2);
-        assertArrayEquals(bindings.get(TCP_80), new Binding[] {BINDING_8080});
-        assertArrayEquals(bindings.get(TCP_90), new Binding[] {BINDING_9090});
+        assertEquals(2, bindings.size());
+        assertArrayEquals(new Binding[] {BINDING_8080}, bindings.get(TCP_80));
+        assertArrayEquals(new Binding[] {BINDING_9090}, bindings.get(TCP_90));
     }
 
     @Test
@@ -47,8 +47,8 @@ public void addTwoBindingsForSameExposedPort() {
 
         Map<ExposedPort, Binding[]> bindings = ports.getBindings();
         // one key with two values
-        assertEquals(bindings.size(), 1);
-        assertArrayEquals(bindings.get(TCP_80), new Binding[] {BINDING_8080, BINDING_9090});
+        assertEquals(1, bindings.size());
+        assertArrayEquals(new Binding[] {BINDING_8080, BINDING_9090}, bindings.get(TCP_80));
     }
 
     @Test
@@ -56,7 +56,7 @@ public void addNullBindings() {
         ports.add(new PortBinding(null, TCP_80));
         Map<ExposedPort, Binding[]> bindings = ports.getBindings();
         // one key with two values
-        assertEquals(bindings.size(), 1);
+        assertEquals(1, bindings.size());
         assertNull(bindings.get(TCP_80));
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java
index ecbdd9a49..2f528556f 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java
@@ -19,12 +19,12 @@ public class PortsSerializingTest {
     public void deserializingPortWithMultipleBindings() throws Exception {
         Ports ports = JSONTestHelper.getMapper().readValue(jsonWithDoubleBindingForOnePort, Ports.class);
         Map<ExposedPort, Binding[]> map = ports.getBindings();
-        assertEquals(map.size(), 1);
+        assertEquals(1, map.size());
 
         Binding[] bindings = map.get(ExposedPort.tcp(80));
-        assertEquals(bindings.length, 2);
-        assertEquals(bindings[0], new Binding("10.0.0.1", "80"));
-        assertEquals(bindings[1], new Binding("10.0.0.2", "80"));
+        assertEquals(2, bindings.length);
+        assertEquals(new Binding("10.0.0.1", "80"), bindings[0]);
+        assertEquals(new Binding("10.0.0.2", "80"), bindings[1]);
     }
 
     @Test
@@ -32,20 +32,20 @@ public void serializingPortWithMultipleBindings() throws Exception {
         Ports ports = new Ports();
         ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.1", "80"));
         ports.bind(ExposedPort.tcp(80), new Binding("10.0.0.2", "80"));
-        assertEquals(JSONTestHelper.getMapper().writeValueAsString(ports), jsonWithDoubleBindingForOnePort);
+        assertEquals(jsonWithDoubleBindingForOnePort, JSONTestHelper.getMapper().writeValueAsString(ports));
     }
 
     @Test
     public void serializingEmptyBinding() throws Exception {
         Ports ports = new Ports(ExposedPort.tcp(80), new Binding(null, null));
-        assertEquals(JSONTestHelper.getMapper().writeValueAsString(ports), "{\"80/tcp\":[{\"HostIp\":\"\",\"HostPort\":\"\"}]}");
+        assertEquals("{\"80/tcp\":[{\"HostIp\":\"\",\"HostPort\":\"\"}]}", JSONTestHelper.getMapper().writeValueAsString(ports));
     }
 
     @Test
     public void deserializingPortWithNullBindings() throws Exception {
         Ports ports = JSONTestHelper.getMapper().readValue(jsonWithNullBindingForOnePort, Ports.class);
         Map<ExposedPort, Binding[]> map = ports.getBindings();
-        assertEquals(map.size(), 1);
+        assertEquals(1, map.size());
 
         assertNull(map.get(ExposedPort.tcp(80)));
     }
@@ -54,6 +54,6 @@ public void deserializingPortWithNullBindings() throws Exception {
     public void serializingWithNullBindings() throws Exception {
         Ports ports = new Ports();
         ports.bind(ExposedPort.tcp(80), null);
-        assertEquals(JSONTestHelper.getMapper().writeValueAsString(ports), jsonWithNullBindingForOnePort);
+        assertEquals(jsonWithNullBindingForOnePort, JSONTestHelper.getMapper().writeValueAsString(ports));
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyParsingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyParsingTest.java
index fb79c0ca9..57dbc1b9f 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyParsingTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyParsingTest.java
@@ -13,32 +13,32 @@ public class RestartPolicyParsingTest {
 
 
     @Test
-    public void noRestart() throws Exception {
-        assertEquals(RestartPolicy.parse("no"), RestartPolicy.noRestart());
+    public void noRestart() {
+        assertEquals(RestartPolicy.noRestart(), RestartPolicy.parse("no"));
     }
 
     @Test
-    public void alwaysRestart() throws Exception {
-        assertEquals(RestartPolicy.parse("always"), RestartPolicy.alwaysRestart());
+    public void alwaysRestart() {
+        assertEquals(RestartPolicy.alwaysRestart(), RestartPolicy.parse("always"));
     }
 
     @Test
-    public void unlessStoppedRestart() throws Exception {
-        assertEquals(RestartPolicy.parse("unless-stopped"), RestartPolicy.unlessStoppedRestart());
+    public void unlessStoppedRestart() {
+        assertEquals(RestartPolicy.unlessStoppedRestart(), RestartPolicy.parse("unless-stopped"));
     }
 
     @Test
-    public void onFailureRestart() throws Exception {
-        assertEquals(RestartPolicy.parse("on-failure"), RestartPolicy.onFailureRestart(0));
+    public void onFailureRestart() {
+        assertEquals(RestartPolicy.onFailureRestart(0), RestartPolicy.parse("on-failure"));
     }
 
     @Test
-    public void onFailureRestartWithCount() throws Exception {
-        assertEquals(RestartPolicy.parse("on-failure:2"), RestartPolicy.onFailureRestart(2));
+    public void onFailureRestartWithCount() {
+        assertEquals(RestartPolicy.onFailureRestart(2), RestartPolicy.parse("on-failure:2"));
     }
 
     @Test
-    public void illegalSyntax() throws Exception {
+    public void illegalSyntax() {
         expectedEx.expect(IllegalArgumentException.class);
         expectedEx.expectMessage("Error parsing RestartPolicy 'nonsense'");
 
@@ -46,7 +46,7 @@ public void illegalSyntax() throws Exception {
     }
 
     @Test
-    public void illegalRetryCount() throws Exception {
+    public void illegalRetryCount() {
         expectedEx.expect(IllegalArgumentException.class);
         expectedEx.expectMessage("Error parsing RestartPolicy 'on-failure:X'");
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java
index 6e4524fd5..c9c6a897d 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicySerializingTest.java
@@ -15,35 +15,35 @@ public class RestartPolicySerializingTest {
     // --restart no
     public void noRestart() throws Exception {
         String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.noRestart());
-        assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"\"}");
+        assertEquals("{\"MaximumRetryCount\":0,\"Name\":\"\"}", json);
     }
 
     @Test
     // --restart always
     public void alwaysRestart() throws Exception {
         String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.alwaysRestart());
-        assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"always\"}");
+        assertEquals("{\"MaximumRetryCount\":0,\"Name\":\"always\"}", json);
     }
 
     @Test
     // --restart unless-stopped
     public void unlessStoppedRestart() throws Exception {
         String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.unlessStoppedRestart());
-        assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"unless-stopped\"}");
+        assertEquals("{\"MaximumRetryCount\":0,\"Name\":\"unless-stopped\"}", json);
     }
 
     @Test
     // --restart on-failure
     public void onFailureRestart() throws Exception {
         String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.onFailureRestart(0));
-        assertEquals(json, "{\"MaximumRetryCount\":0,\"Name\":\"on-failure\"}");
+        assertEquals("{\"MaximumRetryCount\":0,\"Name\":\"on-failure\"}", json);
     }
 
     @Test
     // --restart on-failure:2
     public void onFailureRestartWithCount() throws Exception {
         String json = JSONTestHelper.getMapper().writeValueAsString(RestartPolicy.onFailureRestart(2));
-        assertEquals(json, "{\"MaximumRetryCount\":2,\"Name\":\"on-failure\"}");
+        assertEquals("{\"MaximumRetryCount\":2,\"Name\":\"on-failure\"}", json);
     }
 
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyToStringTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyToStringTest.java
index 4d9fa8cbc..e32f97341 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyToStringTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/RestartPolicyToStringTest.java
@@ -18,8 +18,8 @@ public static Object[][] restartPolicies() {
     public String policy;
 
     @Test
-    public void serializationWithoutCount() throws Exception {
-        assertEquals(RestartPolicy.parse(policy).toString(), policy);
+    public void serializationWithoutCount() {
+        assertEquals(policy, RestartPolicy.parse(policy).toString());
     }
 
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
index b413cf029..7f38eb0f0 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeBindsTest.java
@@ -28,9 +28,9 @@ public void t() throws IOException {
         String s = "{\"/data\":\"/some/path\"}";
         VolumeBinds volumeBinds = JSONTestHelper.getMapper().readValue(s, VolumeBinds.class);
         VolumeBind[] binds = volumeBinds.getBinds();
-        assertEquals(binds.length, 1);
-        assertEquals(binds[0].getHostPath(), "/some/path");
-        assertEquals(binds[0].getContainerPath(), "/data");
+        assertEquals(1, binds.length);
+        assertEquals("/some/path", binds[0].getHostPath());
+        assertEquals("/data", binds[0].getContainerPath());
     }
 
     @Test(expected = JsonMappingException.class)
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java
index ae343047c..6155f88e3 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeFromSerializingTest.java
@@ -18,7 +18,7 @@ public void deserializing() throws Exception {
     @Test
     public void serializing() throws Exception {
         VolumesFrom volumeFrom = new VolumesFrom("container1", AccessMode.ro);
-        assertEquals(JSONTestHelper.getMapper().writeValueAsString(volumeFrom), json);
+        assertEquals(json, JSONTestHelper.getMapper().writeValueAsString(volumeFrom));
     }
 
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeTest.java
index cb1c4befd..20e28a55d 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/VolumeTest.java
@@ -7,6 +7,6 @@
 public class VolumeTest {
     @Test
     public void getPath() {
-        assertEquals(new Volume("/path").getPath(), "/path");
+        assertEquals("/path", new Volume("/path").getPath());
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
index 0e2df4cd4..dde47e2d8 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
@@ -5,16 +5,13 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.StreamType;
-import org.junit.Assume;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.InputStream;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.util.concurrent.CountDownLatch;
@@ -61,7 +58,7 @@ public void attachContainerWithStdin() throws Exception {
         AttachContainerTestCallback callback = new AttachContainerTestCallback() {
             @Override
             public void onNext(Frame frame) {
-                assertEquals(frame.getStreamType(), StreamType.STDOUT);
+                assertEquals(StreamType.STDOUT, frame.getStreamType());
                 super.onNext(frame);
             }
         };
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java
index 887f97334..d37bea819 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/AuthCmdIT.java
@@ -19,7 +19,7 @@
 public class AuthCmdIT extends CmdIT {
 
     @Test
-    public void testAuth() throws Exception {
+    public void testAuth() {
         assumeThat("Fails on 1.22. Temporary disabled.", dockerRule, apiVersionGreater(VERSION_1_22));
 
         AuthResponse response = dockerRule.getClient().authCmd().exec();
@@ -30,7 +30,7 @@ public void testAuth() throws Exception {
 
     @Ignore("Disabled because of 500/InternalServerException")
     @Test
-    public void testAuthInvalid() throws Exception {
+    public void testAuthInvalid() {
         assertThrows("Wrong login/password, please try again", UnauthorizedException.class, () -> {
             DockerClientBuilder.getInstance(dockerRule.config("garbage"))
                 .build()
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
index cd9b1ef9c..d514ed59c 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/BuildImageCmdIT.java
@@ -163,21 +163,21 @@ private String execBuild(BuildImageCmd buildImageCmd) throws Exception {
     }
 
     @Test(expected = DockerClientException.class)
-    public void dockerignoreDockerfileIgnored() throws Exception {
+    public void dockerignoreDockerfileIgnored() {
         File baseDir = fileFromBuildTestResource("dockerignore/DockerfileIgnored");
 
         dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).start().awaitImageId();
     }
 
     @Test
-    public void dockerignoreDockerfileNotIgnored() throws Exception {
+    public void dockerignoreDockerfileNotIgnored() {
         File baseDir = fileFromBuildTestResource("dockerignore/DockerfileNotIgnored");
 
         dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).start().awaitImageId();
     }
 
     @Test(expected = DockerClientException.class)
-    public void dockerignoreInvalidDockerIgnorePattern() throws Exception {
+    public void dockerignoreInvalidDockerIgnorePattern() {
         File baseDir = fileFromBuildTestResource("dockerignore/InvalidDockerignorePattern");
 
         dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).start().awaitImageId();
@@ -241,7 +241,7 @@ public void fromPrivateRegistry() throws Exception {
     }
 
     @Test
-    public void buildArgs() throws Exception {
+    public void buildArgs() {
         File baseDir = fileFromBuildTestResource("buildArgs");
 
         String imageId = dockerRule.getClient().buildImageCmd(baseDir).withNoCache(true).withBuildArg("testArg", "abc !@#$%^&*()_+")
@@ -256,7 +256,7 @@ public void buildArgs() throws Exception {
     }
 
     @Test
-    public void labels() throws Exception {
+    public void labels() {
         assumeThat("API version should be >= 1.23", dockerRule, isGreaterOrEqual(VERSION_1_23));
 
         File baseDir = fileFromBuildTestResource("labels");
@@ -274,7 +274,7 @@ public void labels() throws Exception {
     }
 
     @Test
-    public void multipleTags() throws Exception {
+    public void multipleTags() {
         assumeThat("API version should be >= 1.23", dockerRule, isGreaterOrEqual(VERSION_1_21));
 
 
@@ -295,7 +295,7 @@ public void multipleTags() throws Exception {
     }
 
     @Test
-    public void cacheFrom() throws Exception {
+    public void cacheFrom() {
         assumeThat(dockerRule, isGreaterOrEqual(VERSION_1_27));
 
         File baseDir1 = fileFromBuildTestResource("CacheFrom/test1");
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java
index a0eb585eb..c434c0cb4 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java
@@ -30,7 +30,7 @@ public class CopyArchiveFromContainerCmdIT extends CmdIT {
     public static final Logger LOG = LoggerFactory.getLogger(CopyArchiveFromContainerCmdIT.class);
 
     @Test
-    public void copyFromContainer() throws Exception {
+    public void copyFromContainer() {
         // TODO extract this into a shared method
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withName("copyFromContainer")
@@ -51,7 +51,7 @@ public void copyFromContainer() throws Exception {
     }
 
     @Test(expected = NotFoundException.class)
-    public void copyFromNonExistingContainer() throws Exception {
+    public void copyFromNonExistingContainer() {
 
         dockerRule.getClient().copyArchiveFromContainerCmd("non-existing", "/test").exec();
     }
@@ -78,7 +78,7 @@ public void copyFromContainerBinaryFile() throws Exception {
         try (TarArchiveInputStream tarInputStream = new TarArchiveInputStream(response)) {
             TarArchiveEntry nextTarEntry = tarInputStream.getNextTarEntry();
 
-            assertEquals(nextTarEntry.getName(), "binary.dat");
+            assertEquals("binary.dat", nextTarEntry.getName());
             try (InputStream binaryFileInputStream = Files.newInputStream(binaryFile, StandardOpenOption.READ)) {
                 assertTrue(IOUtils.contentEquals(binaryFileInputStream, tarInputStream));
             }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
index d2a0a3406..f931061e5 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
@@ -82,7 +82,7 @@ private void assertFileCopied(CreateContainerResponse container) throws IOExcept
     }
 
     @Test(expected = NotFoundException.class)
-    public void copyToNonExistingContainer() throws Exception {
+    public void copyToNonExistingContainer() {
 
         dockerRule.getClient().copyArchiveToContainerCmd("non-existing").withHostResource("src/test/resources/testReadFile").exec();
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java
index 74bbad671..3864aa9e4 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyFileFromContainerCmdIT.java
@@ -23,7 +23,7 @@ public class CopyFileFromContainerCmdIT extends CmdIT {
     public static final Logger LOG = LoggerFactory.getLogger(CopyFileFromContainerCmdIT.class);
 
     @Test
-    public void copyFromContainer() throws Exception {
+    public void copyFromContainer() {
         assumeThat("Doesn't work since 1.24", dockerRule, not(isGreaterOrEqual(VERSION_1_24)));
 
         assumeNotSwarm("", dockerRule);
@@ -51,7 +51,7 @@ public void copyFromContainer() throws Exception {
     }
 
     @Test(expected = NotFoundException.class)
-    public void copyFromNonExistingContainer() throws Exception {
+    public void copyFromNonExistingContainer() {
 
         dockerRule.getClient().copyFileFromContainerCmd("non-existing", "/test").exec();
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index 7bb26eaa0..de9f564e4 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -23,7 +23,6 @@
 import com.github.dockerjava.api.model.Link;
 import com.github.dockerjava.api.model.LogConfig;
 import com.github.dockerjava.api.model.Network;
-import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.Ports.Binding;
 import com.github.dockerjava.api.model.RestartPolicy;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
index 36363b056..deb8a4718 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
@@ -52,7 +52,7 @@ public void createNetworkWithIpamConfig() throws DockerException {
         assertNotNull(createNetworkResponse.getId());
 
         Network network = dockerRule.getClient().inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
-        assertEquals(network.getName(), networkName);
+        assertEquals(networkName, network.getName());
         assertEquals("bridge", network.getDriver());
         assertEquals(subnet, network.getIpam().getConfig().iterator().next().getSubnet());
     }
@@ -83,6 +83,6 @@ public void createNetworkWithLabel() throws DockerException {
         CreateNetworkResponse createNetworkResponse = dockerRule.getClient().createNetworkCmd().withName(networkName).withLabels(labels).exec();
         assertNotNull(createNetworkResponse.getId());
         Network network = dockerRule.getClient().inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
-        assertEquals(network.getLabels(), labels);
+        assertEquals(labels, network.getLabels());
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java
index b36002f10..bf273a98c 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CustomCommandIT.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.cmd;
 
-import com.github.dockerjava.core.DockerClientImpl;
 import com.github.dockerjava.core.DockerRule;
 import com.github.dockerjava.transport.DockerHttpClient;
 import com.github.dockerjava.transport.DockerHttpClient.Request;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java
index 7d9591bfe..2d932cc24 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/DisconnectFromNetworkCmdIT.java
@@ -13,7 +13,7 @@
 public class DisconnectFromNetworkCmdIT extends CmdIT {
 
     @Test
-    public void disconnectFromNetwork() throws InterruptedException {
+    public void disconnectFromNetwork() {
         assumeNotSwarm("no network in swarm", dockerRule);
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
@@ -35,7 +35,7 @@ public void disconnectFromNetwork() throws InterruptedException {
     }
 
     @Test
-    public void forceDisconnectFromNetwork() throws InterruptedException {
+    public void forceDisconnectFromNetwork() {
         assumeNotSwarm("no network in swarm", dockerRule);
 
         CreateNetworkResponse network = dockerRule.getClient().createNetworkCmd().withName("testNetwork2").exec();
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
index 9e47cfd9f..fed85df73 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
@@ -45,7 +45,7 @@ public void inspectContainer() throws DockerException {
         assertThat(container.getId(), not(is(emptyString())));
 
         InspectContainerResponse containerInfo = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
-        assertEquals(containerInfo.getId(), container.getId());
+        assertEquals(container.getId(), containerInfo.getId());
 
     }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java
index 3f22fca33..b256c6a7c 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectExecCmdIT.java
@@ -79,7 +79,7 @@ public void inspectExec() throws Exception {
     }
 
     @Test
-    public void inspectExecNetworkSettings() throws IOException {
+    public void inspectExecNetworkSettings() {
         final RemoteApiVersion apiVersion = getVersion(dockerRule.getClient());
 
         String containerName = "generated_" + new SecureRandom().nextInt();
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
index 9ada9d7ad..a94a02f82 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
@@ -59,7 +59,7 @@ public void tearDown() {
     }
 
     @Test
-    public void testListContainers() throws Exception {
+    public void testListContainers() {
         List<Container> containers = dockerRule.getClient().listContainersCmd()
                 .withLabelFilter(testLabel)
                 .withShowAll(true)
@@ -106,7 +106,7 @@ public void testListContainers() throws Exception {
     }
 
     @Test
-    public void testListContainersWithLabelsFilter() throws Exception {
+    public void testListContainersWithLabelsFilter() {
         // list with filter by Map label
         dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE).withCmd("echo")
                 .withLabels(testLabel)
@@ -138,7 +138,7 @@ public void testListContainersWithLabelsFilter() throws Exception {
     }
 
     @Test
-    public void testNameFilter() throws Exception {
+    public void testNameFilter() {
         String testUUID = testLabel.get("test");
 
         String id1, id2;
@@ -165,7 +165,7 @@ public void testNameFilter() throws Exception {
     }
 
     @Test
-    public void testIdsFilter() throws Exception {
+    public void testIdsFilter() {
         String id1, id2;
         id1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withLabels(testLabel)
@@ -188,7 +188,7 @@ public void testIdsFilter() throws Exception {
     }
 
     @Test
-    public void testStatusFilter() throws Exception {
+    public void testStatusFilter() {
         String id1, id2;
         id1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withCmd("sh", "-c", "sleep 99999")
@@ -247,7 +247,7 @@ public void testStatusFilter() throws Exception {
     }
 
     @Test
-    public void testVolumeFilter() throws Exception {
+    public void testVolumeFilter() {
         String id;
         dockerRule.getClient().createVolumeCmd()
                 .withName("TestFilterVolume")
@@ -276,7 +276,7 @@ public void testVolumeFilter() throws Exception {
     }
 
     @Test
-    public void testNetworkFilter() throws Exception {
+    public void testNetworkFilter() {
         String id;
         dockerRule.getClient().createNetworkCmd()
                 .withName("TestFilterNetwork")
@@ -337,7 +337,7 @@ public void testAncestorFilter() throws Exception {
     }
 
     @Test
-    public void testExitedFilter() throws Exception {
+    public void testExitedFilter() {
         dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withLabels(testLabel)
                 .exec();
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
index 6ab68abff..8593d6ccf 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
@@ -66,7 +66,7 @@ public void asyncLogContainerWithTtyEnabled() throws Exception {
 
         assertTrue(loggingCallback.toString().contains("hello"));
 
-        assertEquals(loggingCallback.getCollectedFrames().get(0).getStreamType(), StreamType.RAW);
+        assertEquals(StreamType.RAW, loggingCallback.getCollectedFrames().get(0).getStreamType());
     }
 
     @Test
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
index f98d24563..00cd11d51 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PushImageCmdIT.java
@@ -36,7 +36,7 @@ public class PushImageCmdIT extends CmdIT {
     private AuthConfig authConfig;
 
     @Before
-    public void beforeTest() throws Exception {
+    public void beforeTest() {
         authConfig = REGISTRY.getAuthConfig();
     }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java
index 01dfd954c..408098148 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveContainerCmdImplIT.java
@@ -23,7 +23,7 @@ public class RemoveContainerCmdImplIT extends CmdIT {
     
 
     @Test
-    public void removeContainer() throws Exception {
+    public void removeContainer() {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("true").exec();
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java
index c072eaf90..00d2e6cc1 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RemoveImageCmdIT.java
@@ -24,7 +24,7 @@ public class RemoveImageCmdIT extends CmdIT {
     public static final Logger LOG = LoggerFactory.getLogger(RemoveImageCmdIT.class);
     
     @Test
-    public void removeImage() throws DockerException, InterruptedException {
+    public void removeImage() throws DockerException {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "9999").exec();
         LOG.info("Created container: {}", container.toString());
@@ -47,7 +47,7 @@ public void removeImage() throws DockerException, InterruptedException {
     }
 
     @Test(expected = NotFoundException.class)
-    public void removeNonExistingImage() throws DockerException, InterruptedException {
+    public void removeNonExistingImage() throws DockerException {
 
         dockerRule.getClient().removeImageCmd("non-existing").exec();
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java
index d6b91c2a4..c50ebcf43 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RenameContainerCmdIT.java
@@ -45,7 +45,7 @@ public void renameContainer() throws DockerException {
     }
 
     @Test(expected = NotFoundException.class)
-    public void renameExistingContainer() throws DockerException, InterruptedException {
+    public void renameExistingContainer() throws DockerException {
         dockerRule.getClient().renameContainerCmd("non-existing")
                 .withName("renameExistingContainer")
                 .exec();
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java
index cf2f43e92..8017d229f 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java
@@ -45,7 +45,7 @@ public void restartContainer() throws DockerException {
     }
 
     @Test(expected = NotFoundException.class)
-    public void restartNonExistingContainer() throws DockerException, InterruptedException {
+    public void restartNonExistingContainer() throws DockerException {
 
         dockerRule.getClient().restartContainerCmd("non-existing").exec();
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
index b882a88bd..5d41889ca 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/StartContainerCmdIT.java
@@ -44,7 +44,7 @@ public class StartContainerCmdIT extends CmdIT {
     public static final Logger LOG = LoggerFactory.getLogger(StartContainerCmdIT.class);
 
     @Test
-    public void startContainerWithVolumes() throws Exception {
+    public void startContainerWithVolumes() {
 
         // see http://docs.docker.io/use/working_with_volumes/
         Volume volume1 = new Volume("/opt/webapp1");
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java
index 8f33fcc1e..fc5894455 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/TagImageCmdIT.java
@@ -11,7 +11,7 @@ public class TagImageCmdIT extends CmdIT {
     public static final Logger LOG = LoggerFactory.getLogger(TagImageCmdIT.class);
 
     @Test
-    public void tagImage() throws Exception {
+    public void tagImage() {
         String tag = "" + RandomUtils.nextInt(0, Integer.MAX_VALUE);
 
         dockerRule.getClient().tagImageCmd("busybox:latest", "docker-java/busybox", tag).exec();
@@ -20,7 +20,7 @@ public void tagImage() throws Exception {
     }
 
     @Test(expected = NotFoundException.class)
-    public void tagNonExistingImage() throws Exception {
+    public void tagNonExistingImage() {
 
         String tag = "" + RandomUtils.nextInt(0, Integer.MAX_VALUE);
         dockerRule.getClient().tagImageCmd("non-existing", "docker-java/busybox", tag).exec();
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
index b21bbb533..e5bb55499 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
@@ -31,7 +31,7 @@ public class UpdateContainerCmdIT extends CmdIT {
 
 
     @Test
-    public void updateContainer() throws DockerException, IOException {
+    public void updateContainer() throws DockerException {
         assumeThat("API version should be >= 1.22", dockerRule, isGreaterOrEqual(VERSION_1_22));
 
         CreateContainerResponse response = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java
index 08d27db03..90c7e534e 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/VersionCmdIT.java
@@ -22,7 +22,7 @@ public void version() throws DockerException {
         assertTrue(version.getGoVersion().length() > 0);
         assertTrue(version.getVersion().length() > 0);
 
-        assertEquals(StringUtils.split(version.getVersion(), ".").length, 3);
+        assertEquals(3, StringUtils.split(version.getVersion(), ".").length);
 
     }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java
index a8269c82f..e2ad2a643 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java
@@ -84,7 +84,7 @@ public void testWaitContainerAbort() throws Exception {
     }
 
     @Test
-    public void testWaitContainerTimeout() throws Exception {
+    public void testWaitContainerTimeout() {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox").withCmd("sleep", "10").exec();
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
index e1564ea91..4644a8330 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateSecretCmdExecIT.java
@@ -21,7 +21,7 @@ public class CreateSecretCmdExecIT extends SwarmCmdIT {
     public static final Logger LOG = LoggerFactory.getLogger(CreateSecretCmdExecIT.class);
 
     @Test
-    public void testCreateSecret() throws Exception {
+    public void testCreateSecret() {
         DockerClient dockerClient = startSwarm();
         int length = 10;
         boolean useLetters = true;
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
index e50f35dd3..e221d9cd3 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/CreateServiceCmdExecIT.java
@@ -53,7 +53,7 @@ public class CreateServiceCmdExecIT extends SwarmCmdIT {
     private DockerClient dockerClient;
 
     @Before
-    public final void setUpCreateServiceCmdExecIT() throws Exception {
+    public final void setUpCreateServiceCmdExecIT() {
         authConfig = REGISTRY.getAuthConfig();
         dockerClient = startSwarm();
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java
index cd80ec118..12c69c996 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/InspectConfigCmdIT.java
@@ -9,8 +9,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertEquals;
 
 public class InspectConfigCmdIT extends SwarmCmdIT {
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java
index 7d8838d5a..16f1b0911 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/JoinSwarmCmdExecIT.java
@@ -43,7 +43,7 @@ private SwarmJoinTokens initSwarmOnDocker(DockerClient docker) {
     }
 
     @Test
-    public void joinSwarmAsWorker() throws Exception {
+    public void joinSwarmAsWorker() {
         SwarmJoinTokens tokens = initSwarmOnDocker(docker1);
 
         docker2.joinSwarmCmd()
@@ -58,7 +58,7 @@ public void joinSwarmAsWorker() throws Exception {
     }
 
     @Test
-    public void joinSwarmAsManager() throws DockerException, InterruptedException {
+    public void joinSwarmAsManager() throws DockerException {
         SwarmJoinTokens tokens = initSwarmOnDocker(docker1);
 
         docker2.joinSwarmCmd()
@@ -73,7 +73,7 @@ public void joinSwarmAsManager() throws DockerException, InterruptedException {
     }
 
     @Test(expected = DockerException.class)
-    public void joinSwarmIfAlreadyInSwarm() throws Exception {
+    public void joinSwarmIfAlreadyInSwarm() {
         SwarmJoinTokens tokens = initSwarmOnDocker(docker1);
 
         initSwarmOnDocker(docker2);
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
index 432c7d4bd..715ba60c8 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListServicesCmdExecIT.java
@@ -27,7 +27,7 @@ public class ListServicesCmdExecIT extends SwarmCmdIT {
     private static final String LABEL_VALUE = "test";
 
     @Test
-    public void testListServices() throws Exception {
+    public void testListServices() {
         DockerClient dockerClient = startSwarm();
         Map<String, String> serviceLabels = Collections.singletonMap(LABEL_KEY, LABEL_VALUE);
         CreateServiceResponse response = dockerClient.createServiceCmd(new ServiceSpec()
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSwarmNodesCmdExecIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSwarmNodesCmdExecIT.java
index 1a4f94c1d..853dc6c03 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSwarmNodesCmdExecIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/ListSwarmNodesCmdExecIT.java
@@ -12,7 +12,7 @@
 
 public class ListSwarmNodesCmdExecIT extends SwarmCmdIT {
     @Test
-    public void testListSwarmNodes() throws Exception {
+    public void testListSwarmNodes() {
         DockerClient dockerClient = startSwarm();
 
         List<SwarmNode> nodes = dockerClient.listSwarmNodesCmd().exec();
@@ -20,7 +20,7 @@ public void testListSwarmNodes() throws Exception {
     }
 
     @Test
-    public void testListSwarmNodesWithIdFilter() throws Exception {
+    public void testListSwarmNodesWithIdFilter() {
         DockerClient dockerClient = startSwarm();
 
         List<SwarmNode> nodes = dockerClient.listSwarmNodesCmd().exec();
@@ -39,7 +39,7 @@ public void testListSwarmNodesWithIdFilter() throws Exception {
     }
 
     @Test
-    public void testListSwarmNodesWithNameFilter() throws Exception {
+    public void testListSwarmNodesWithNameFilter() {
         DockerClient dockerClient = startSwarm();
 
         List<SwarmNode> nodes = dockerClient.listSwarmNodesCmd().exec();
@@ -58,7 +58,7 @@ public void testListSwarmNodesWithNameFilter() throws Exception {
     }
 
     @Test
-    public void testListSwarmNodesWithMembershipFilter() throws Exception {
+    public void testListSwarmNodesWithMembershipFilter() {
         DockerClient dockerClient = startSwarm();
 
         List<SwarmNode> nodesWithAcceptedMembership = dockerClient.listSwarmNodesCmd()
@@ -73,7 +73,7 @@ public void testListSwarmNodesWithMembershipFilter() throws Exception {
     }
 
     @Test
-    public void testListSwarmNodesWithRoleFilter() throws Exception {
+    public void testListSwarmNodesWithRoleFilter() {
         DockerClient dockerClient = startSwarm();
 
         List<SwarmNode> nodesWithManagerRole = dockerClient.listSwarmNodesCmd()
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
index 8e653b564..87f35161c 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
@@ -47,7 +47,7 @@ public abstract class SwarmCmdIT extends CmdIT {
     private final Set<String> startedContainerIds = new HashSet<>();
 
     @Before
-    public final void setUpMultiNodeSwarmCmdIT() throws Exception {
+    public final void setUpMultiNodeSwarmCmdIT() {
         assumeThat(dockerRule, isGreaterOrEqual(VERSION_1_24));
     }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java
index e307f671a..d26e051b1 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmNodeIT.java
@@ -14,7 +14,7 @@
 
 public class UpdateSwarmNodeIT extends SwarmCmdIT {
     @Test
-    public void testUpdateSwarmNode() throws Exception {
+    public void testUpdateSwarmNode() {
         DockerClient dockerClient = startSwarm();
         List<SwarmNode> nodes = dockerClient.listSwarmNodesCmd().exec();
         assertThat(1, is(nodes.size()));
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
index deb959475..c477320bf 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/UpdateSwarmServiceIT.java
@@ -21,7 +21,7 @@
 
 public class UpdateSwarmServiceIT extends SwarmCmdIT {
     @Test
-    public void testUpdateServiceReplicate() throws Exception {
+    public void testUpdateServiceReplicate() {
         DockerClient dockerClient = startSwarm();
         //create network
         String networkId = dockerClient.createNetworkCmd().withName("networkname").withDriver("overlay")
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
index d5b751145..b1def2409 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
@@ -58,12 +58,12 @@ private static String dockerCertPath() {
     }
 
     @Test
-    public void equals() throws Exception {
+    public void equals() {
         assertEquals(EXAMPLE_CONFIG, newExampleConfig());
     }
 
     @Test
-    public void environmentDockerHost() throws Exception {
+    public void environmentDockerHost() {
 
         // given docker host in env
         Map<String, String> env = new HashMap<>();
@@ -79,11 +79,11 @@ public void environmentDockerHost() throws Exception {
         // when you build a config
         DefaultDockerClientConfig config = buildConfig(env, systemProperties);
 
-        assertEquals(config.getDockerHost(), URI.create("tcp://baz:8768"));
+        assertEquals(URI.create("tcp://baz:8768"), config.getDockerHost());
     }
 
     @Test
-    public void dockerContextFromConfig() throws Exception {
+    public void dockerContextFromConfig() {
         // given home directory with docker contexts configured
         Properties systemProperties = new Properties();
         systemProperties.setProperty("user.home", "target/test-classes/dockerContextHomeDir");
@@ -98,7 +98,7 @@ public void dockerContextFromConfig() throws Exception {
     }
 
     @Test
-    public void dockerContextFromEnvironmentVariable() throws Exception {
+    public void dockerContextFromEnvironmentVariable() {
         // given home directory with docker contexts
         Properties systemProperties = new Properties();
         systemProperties.setProperty("user.home", "target/test-classes/dockerContextHomeDir");
@@ -114,7 +114,7 @@ public void dockerContextFromEnvironmentVariable() throws Exception {
     }
 
     @Test
-    public void environment() throws Exception {
+    public void environment() {
 
         // given a default config in env properties
         Map<String, String> env = new HashMap<>();
@@ -153,7 +153,7 @@ private DefaultDockerClientConfig buildConfig(Map<String, String> env, Propertie
     }
 
     @Test
-    public void defaults() throws Exception {
+    public void defaults() {
 
         // given default cert path
         Properties systemProperties = new Properties();
@@ -164,16 +164,16 @@ public void defaults() throws Exception {
         DefaultDockerClientConfig config = buildConfig(Collections.<String, String> emptyMap(), systemProperties);
 
         // then the cert path is as expected
-        assertEquals(config.getDockerHost(), URI.create("unix:///var/run/docker.sock"));
-        assertEquals(config.getRegistryUsername(), "someUserName");
-        assertEquals(config.getRegistryUrl(), AuthConfig.DEFAULT_SERVER_ADDRESS);
-        assertEquals(config.getApiVersion(), RemoteApiVersion.unknown());
-        assertEquals(config.getDockerConfigPath(), homeDir() + "/.docker");
+        assertEquals(URI.create("unix:///var/run/docker.sock"), config.getDockerHost());
+        assertEquals("someUserName", config.getRegistryUsername());
+        assertEquals(AuthConfig.DEFAULT_SERVER_ADDRESS, config.getRegistryUrl());
+        assertEquals(RemoteApiVersion.unknown(), config.getApiVersion());
+        assertEquals(homeDir() + "/.docker", config.getDockerConfigPath());
         assertNull(config.getSSLConfig());
     }
 
     @Test
-    public void systemProperties() throws Exception {
+    public void systemProperties() {
 
         // given system properties based on the example
         Properties systemProperties = new Properties();
@@ -204,7 +204,7 @@ public void serializableTest() {
     }
 
     @Test()
-    public void testSslContextEmpty() throws Exception {
+    public void testSslContextEmpty() {
         new DefaultDockerClientConfig(URI.create("tcp://foo"), new DockerConfigFile(), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
                 null);
     }
@@ -212,13 +212,13 @@ public void testSslContextEmpty() throws Exception {
 
 
     @Test()
-    public void testTlsVerifyAndCertPath() throws Exception {
+    public void testTlsVerifyAndCertPath() {
         new DefaultDockerClientConfig(URI.create("tcp://foo"), new DockerConfigFile(), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
                 new LocalDirectorySSLConfig(dockerCertPath()));
     }
 
     @Test()
-    public void testAnyHostScheme() throws Exception {
+    public void testAnyHostScheme() {
         URI dockerHost = URI.create("a" + UUID.randomUUID().toString().replace("-", "") + "://foo");
         new DefaultDockerClientConfig(dockerHost, new DockerConfigFile(), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail",
             null);
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
index 43e700fd8..d826a98ce 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientBuilderTest.java
@@ -1,12 +1,7 @@
 package com.github.dockerjava.core;
 
 
-import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;
-import com.github.dockerjava.api.model.PushResponseItem;
-import com.github.dockerjava.httpclient5.ApacheDockerHttpClient;
-import com.github.dockerjava.transport.DockerHttpClient;
-import java.time.Duration;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -39,7 +34,7 @@ public void testConcurrentClientBuilding() throws Exception {
 
         parallel(AMOUNT, runnable);
         // set contains all required unique instances
-        assertEquals(instances.size(), AMOUNT);
+        assertEquals(AMOUNT, instances.size());
     }
 
     public static void parallel(int threads, final Runnable task) throws Exception {
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
index 8ff17857f..6ae88ffd1 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java
@@ -10,7 +10,7 @@
 public class DockerClientImplTest {
 
     @Test
-    public void configuredInstanceAuthConfig() throws Exception {
+    public void configuredInstanceAuthConfig() {
         // given a config with null serverAddress
         DefaultDockerClientConfig dockerClientConfig = new DefaultDockerClientConfig(URI.create("tcp://foo"),
             new DockerConfigFile(), null, null, null, "", "", "", null);
@@ -22,12 +22,12 @@ public void configuredInstanceAuthConfig() throws Exception {
             throw new AssertionError();
         } catch (NullPointerException e) {
             // then we get a NPE with expected message
-            assertEquals(e.getMessage(), "Configured serverAddress is null.");
+            assertEquals("Configured serverAddress is null.", e.getMessage());
         }
     }
 
     @Test
-    public void defaultInstanceAuthConfig() throws Exception {
+    public void defaultInstanceAuthConfig() {
 
         System.setProperty("user.home", "target/test-classes/someHomeDir");
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java b/docker-java/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
index b6dde97f5..11ea90e57 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
@@ -85,7 +85,7 @@ public static Object[][] getTestData() {
     public MatchTestCase testCase;
 
     @Test
-    public void testMatch() throws IOException {
+    public void testMatch() {
         String pattern = testCase.pattern;
         String s = testCase.s;
         if (GoLangFileMatch.IS_WINDOWS) {
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java b/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java
index d828f3c7b..c6332ba4b 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java
@@ -21,7 +21,7 @@
 public class NameParserTest {
 
     @Test
-    public void testValidateRepoName() throws Exception {
+    public void testValidateRepoName() {
         NameParser.validateRepoName("repository");
         NameParser.validateRepoName("namespace/repository");
         NameParser.validateRepoName("namespace-with-dashes/repository");
@@ -33,118 +33,118 @@ public void testValidateRepoName() throws Exception {
     }
 
     @Test(expected = InvalidRepositoryNameException.class)
-    public void testValidateRepoNameEmpty() throws Exception {
+    public void testValidateRepoNameEmpty() {
         NameParser.validateRepoName("");
     }
 
     @Test(expected = InvalidRepositoryNameException.class)
-    public void testValidateRepoNameExceedsMaxLength() throws Exception {
+    public void testValidateRepoNameExceedsMaxLength() {
         NameParser.validateRepoName(StringUtils.repeat("repository", 255));
     }
 
     @Test(expected = InvalidRepositoryNameException.class)
-    public void testValidateRepoNameEndWithDash() throws Exception {
+    public void testValidateRepoNameEndWithDash() {
         NameParser.validateRepoName("repository-");
     }
 
     @Test(expected = InvalidRepositoryNameException.class)
-    public void testValidateRepoNameStartWithDash() throws Exception {
+    public void testValidateRepoNameStartWithDash() {
         NameParser.validateRepoName("-repository");
     }
 
     @Test(expected = InvalidRepositoryNameException.class)
-    public void testValidateRepoNameEndWithDot() throws Exception {
+    public void testValidateRepoNameEndWithDot() {
         NameParser.validateRepoName("repository.");
     }
 
     @Test(expected = InvalidRepositoryNameException.class)
-    public void testValidateRepoNameStartWithDot() throws Exception {
+    public void testValidateRepoNameStartWithDot() {
         NameParser.validateRepoName(".repository");
     }
 
     @Test(expected = InvalidRepositoryNameException.class)
-    public void testValidateRepoNameEndWithUnderscore() throws Exception {
+    public void testValidateRepoNameEndWithUnderscore() {
         NameParser.validateRepoName("repository_");
     }
 
     @Test(expected = InvalidRepositoryNameException.class)
-    public void testValidateRepoNameStartWithUnderscore() throws Exception {
+    public void testValidateRepoNameStartWithUnderscore() {
         NameParser.validateRepoName("_repository");
     }
 
     @Test(expected = InvalidRepositoryNameException.class)
-    public void testValidateRepoNameWithColon() throws Exception {
+    public void testValidateRepoNameWithColon() {
         NameParser.validateRepoName("repository:with:colon");
     }
 
     @Test
-    public void testResolveSimpleRepositoryName() throws Exception {
+    public void testResolveSimpleRepositoryName() {
         HostnameReposName resolved = NameParser.resolveRepositoryName("repository");
-        assertEquals(resolved, new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "repository"));
+        assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "repository"), resolved);
     }
 
     @Test
-    public void testResolveRepositoryNameWithNamespace() throws Exception {
+    public void testResolveRepositoryNameWithNamespace() {
         HostnameReposName resolved = NameParser.resolveRepositoryName("namespace/repository");
-        assertEquals(resolved, new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "namespace/repository"));
+        assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "namespace/repository"), resolved);
     }
 
     @Test
-    public void testResolveRepositoryNameWithNamespaceAndSHA256() throws Exception {
+    public void testResolveRepositoryNameWithNamespaceAndSHA256() {
         HostnameReposName resolved = NameParser.resolveRepositoryName("namespace/repository@sha256:sha256");
-        assertEquals(resolved, new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "namespace/repository@sha256:sha256"));
+        assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "namespace/repository@sha256:sha256"), resolved);
     }
 
     @Test
-    public void testResolveRepositoryNameWithNamespaceAndHostname() throws Exception {
+    public void testResolveRepositoryNameWithNamespaceAndHostname() {
         HostnameReposName resolved = NameParser.resolveRepositoryName("localhost:5000/namespace/repository");
-        assertEquals(resolved, new HostnameReposName("localhost:5000", "namespace/repository"));
+        assertEquals(new HostnameReposName("localhost:5000", "namespace/repository"), resolved);
     }
 
     @Test
-    public void testResolveRepositoryNameWithNamespaceAndHostnameAndSHA256() throws Exception {
+    public void testResolveRepositoryNameWithNamespaceAndHostnameAndSHA256() {
         HostnameReposName resolved = NameParser.resolveRepositoryName("localhost:5000/namespace/repository@sha256:sha256");
-        assertEquals(resolved, new HostnameReposName("localhost:5000", "namespace/repository"));
+        assertEquals(new HostnameReposName("localhost:5000", "namespace/repository"), resolved);
     }
 
     @Test(expected = InvalidRepositoryNameException.class)
-    public void testResolveRepositoryNameWithIndex() throws Exception {
+    public void testResolveRepositoryNameWithIndex() {
         NameParser.resolveRepositoryName("index.docker.io/repository");
     }
 
     @Test
-    public void testResolveReposTagWithoutTagSimple() throws Exception {
+    public void testResolveReposTagWithoutTagSimple() {
         ReposTag resolved = NameParser.parseRepositoryTag("repository");
-        assertEquals(resolved, new ReposTag("repository", ""));
+        assertEquals(new ReposTag("repository", ""), resolved);
 
         resolved = NameParser.parseRepositoryTag("namespace/repository");
-        assertEquals(resolved, new ReposTag("namespace/repository", ""));
+        assertEquals(new ReposTag("namespace/repository", ""), resolved);
 
         resolved = NameParser.parseRepositoryTag("localhost:5000/namespace/repository");
-        assertEquals(resolved, new ReposTag("localhost:5000/namespace/repository", ""));
+        assertEquals(new ReposTag("localhost:5000/namespace/repository", ""), resolved);
     }
 
     @Test
-    public void testResolveReposTagWithTag() throws Exception {
+    public void testResolveReposTagWithTag() {
         ReposTag resolved = NameParser.parseRepositoryTag("repository:tag");
-        assertEquals(resolved, new ReposTag("repository", "tag"));
+        assertEquals(new ReposTag("repository", "tag"), resolved);
 
         resolved = NameParser.parseRepositoryTag("namespace/repository:tag");
-        assertEquals(resolved, new ReposTag("namespace/repository", "tag"));
+        assertEquals(new ReposTag("namespace/repository", "tag"), resolved);
 
         resolved = NameParser.parseRepositoryTag("localhost:5000/namespace/repository:tag");
-        assertEquals(resolved, new ReposTag("localhost:5000/namespace/repository", "tag"));
+        assertEquals(new ReposTag("localhost:5000/namespace/repository", "tag"), resolved);
     }
 
     @Test
-    public void testResolveReposTagWithSHA256() throws Exception {
+    public void testResolveReposTagWithSHA256() {
         ReposTag resolved = NameParser.parseRepositoryTag("repository@sha256:sha256");
-        assertEquals(resolved, new ReposTag("repository@sha256:sha256", ""));
+        assertEquals(new ReposTag("repository@sha256:sha256", ""), resolved);
 
         resolved = NameParser.parseRepositoryTag("namespace/repository@sha256:sha256");
-        assertEquals(resolved, new ReposTag("namespace/repository@sha256:sha256", ""));
+        assertEquals(new ReposTag("namespace/repository@sha256:sha256", ""), resolved);
 
         resolved = NameParser.parseRepositoryTag("localhost:5000/namespace/repository@sha256:sha256");
-        assertEquals(resolved, new ReposTag("localhost:5000/namespace/repository@sha256:sha256", ""));
+        assertEquals(new ReposTag("localhost:5000/namespace/repository@sha256:sha256", ""), resolved);
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java b/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
index e8adff20b..580e278f4 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/command/FrameReaderTest.java
@@ -34,7 +34,7 @@ public void endOfStreamReturnsNull() throws Exception {
 
     @Test
     public void stdInBytesFrameReturnsFrame() throws Exception {
-        assertEquals(nextFrame(0, 0, 0, 0, 0, 0, 0, 0), new Frame(StreamType.STDIN, new byte[0]));
+        assertEquals(new Frame(StreamType.STDIN, new byte[0]), nextFrame(0, 0, 0, 0, 0, 0, 0, 0));
     }
 
     private Frame nextFrame(int... bytes) throws IOException {
@@ -44,12 +44,12 @@ private Frame nextFrame(int... bytes) throws IOException {
 
     @Test
     public void stdOutBytesFrameReturnsFrame() throws Exception {
-        assertEquals(nextFrame(1, 0, 0, 0, 0, 0, 0, 0), new Frame(StreamType.STDOUT, new byte[0]));
+        assertEquals(new Frame(StreamType.STDOUT, new byte[0]), nextFrame(1, 0, 0, 0, 0, 0, 0, 0));
     }
 
     @Test
     public void stdErrBytesFrameReturnsFrame() throws Exception {
-        assertEquals(nextFrame(2, 0, 0, 0, 0, 0, 0, 0), new Frame(StreamType.STDERR, new byte[0]));
+        assertEquals(new Frame(StreamType.STDERR, new byte[0]), nextFrame(2, 0, 0, 0, 0, 0, 0, 0));
     }
 
     private void setBytes(int... bytes) {
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java b/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
index 720441e20..f15085d1c 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
@@ -241,7 +241,7 @@ private static void assertTarArchiveEntryIsExecutableFile(File archive, String f
         TarArchiveEntry tarArchiveEntry = getTarArchiveEntry(archive, fileName);
         assertNotNull(tarArchiveEntry);
         assertTrue(tarArchiveEntry.isFile());
-        assertEquals("should be executable", (tarArchiveEntry.getMode() & 0755), 0755);
+        assertEquals("should be executable", 0755, (tarArchiveEntry.getMode() & 0755));
     }
 
     private static void assertTarArchiveEntryIsSymlink(File archive, String fileName, String expectedTarget) throws IOException {
diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java
index 7585a7534..5f7d200bf 100644
--- a/docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java
@@ -56,8 +56,8 @@ public void testNettyDockerCmdExecFactoryConfigWithApiVersion() throws Exception
 
             List<HttpRequest> requests = server.getRequests();
 
-            assertEquals(requests.size(), 1);
-            assertEquals(requests.get(0).uri(), "/v1.23/version");
+            assertEquals(1, requests.size());
+            assertEquals("/v1.23/version", requests.get(0).uri());
         } finally {
             server.stop();
         }
@@ -83,8 +83,8 @@ public void testNettyDockerCmdExecFactoryConfigWithoutApiVersion() throws Except
 
             List<HttpRequest> requests = server.getRequests();
 
-            assertEquals(requests.size(), 1);
-            assertEquals(requests.get(0).uri(), "/version");
+            assertEquals(1, requests.size());
+            assertEquals("/version", requests.get(0).uri());
         } finally {
             server.stop();
         }
diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java
index adef3268f..4e7bb1da2 100644
--- a/docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/netty/NettyWebTargetTest.java
@@ -17,12 +17,12 @@ public class NettyWebTargetTest {
     private ChannelProvider channelProvider;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         MockitoAnnotations.initMocks(this);
     }
 
     @Test
-    public void verifyImmutability() throws Exception {
+    public void verifyImmutability() {
         NettyWebTarget emptyWebTarget = new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY");
 
         NettyWebTarget initWebTarget = emptyWebTarget.path("/containers/{id}/attach").resolveTemplate("id", "d03da378b592")
@@ -31,12 +31,12 @@ public void verifyImmutability() throws Exception {
         NettyWebTarget anotherWebTarget = emptyWebTarget.path("/containers/{id}/attach")
                 .resolveTemplate("id", "2cfada4e3c07").queryParam("stdin", "true");
 
-        assertEquals(new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY"), emptyWebTarget);
+        assertEquals(emptyWebTarget, new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY"));
 
-        assertEquals(new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY").path("/containers/d03da378b592/attach")
-                .queryParam("logs", "true"), initWebTarget);
+        assertEquals(initWebTarget, new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY").path("/containers/d03da378b592/attach")
+                .queryParam("logs", "true"));
 
-        assertEquals(new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY").path("/containers/2cfada4e3c07/attach")
-                .queryParam("stdin", "true"), anotherWebTarget);
+        assertEquals(anotherWebTarget, new NettyWebTarget(JSONTestHelper.getMapper(), channelProvider, "DUMMY").path("/containers/2cfada4e3c07/attach")
+                .queryParam("stdin", "true"));
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java
index 98161b072..ef903f942 100644
--- a/docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/netty/handler/FramedResponseStreamHandlerTest.java
@@ -87,7 +87,7 @@ public void channelRead0rawStream() throws Exception {
     objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg));
 
     // Assert result
-    assertEquals(responseHandler.frames.get(0).toString(), "RAW: ");
+    assertEquals("RAW: ", responseHandler.frames.get(0).toString());
   }
 
   @Test
@@ -117,7 +117,7 @@ public void channelRead0stdIn() throws Exception {
     objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg));
 
     // Assert result
-    assertEquals(responseHandler.frames.get(0).toString(), "STDIN: ");
+    assertEquals("STDIN: ", responseHandler.frames.get(0).toString());
   }
 
   @Test
@@ -132,7 +132,7 @@ public void channelRead0stdOut() throws Exception {
     objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg));
 
     // Assert result
-    assertEquals(responseHandler.frames.get(0).toString(), "STDOUT: ");
+    assertEquals("STDOUT: ", responseHandler.frames.get(0).toString());
   }
 
   @Test
@@ -147,7 +147,7 @@ public void channelRead0stdErr() throws Exception {
     objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg));
 
     // Assert result
-    assertEquals(responseHandler.frames.get(0).toString(), "STDERR: ");
+    assertEquals("STDERR: ", responseHandler.frames.get(0).toString());
   }
 
   @Test
@@ -162,7 +162,7 @@ public void channelRead0largePayload() throws Exception {
     objectUnderTest.channelRead0(Mockito.mock(ChannelHandlerContext.class), Unpooled.wrappedBuffer(msg));
 
     // Assert result
-    assertEquals(responseHandler.frames.get(0).toString(), "STDOUT: ");
+    assertEquals("STDOUT: ", responseHandler.frames.get(0).toString());
   }
 
   @Test
@@ -179,6 +179,6 @@ public void exceptionCaught() throws Exception {
     objectUnderTest.exceptionCaught(Mockito.mock(ChannelHandlerContext.class), throwable);
 
     // Assert result
-    assertEquals(responseHandler.exceptions.get(0).getCause(), exception);
+    assertEquals(exception, responseHandler.exceptions.get(0).getCause());
   }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
index 9433f97d6..9a2492062 100644
--- a/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java
@@ -32,10 +32,10 @@ public void testNoBytesSkipped() throws Exception {
         ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
         ByteBuf buffer = generateByteBuf();
         ByteBuf readBuffer = buffer.copy();
-        assertEquals(buffer.refCnt(), 1);
+        assertEquals(1, buffer.refCnt());
         streamHandler.channelRead(ctx, buffer);
         streamHandler.channelInactive(ctx);
-        assertEquals(buffer.refCnt(), 0);
+        assertEquals(0, buffer.refCnt());
         try (InputStream inputStream = callback.getInputStream()) {
             assertTrue(IOUtils.contentEquals(inputStream, new ByteBufInputStream(readBuffer)));
         }
@@ -49,10 +49,10 @@ public void testReadByteByByte() throws Exception {
         ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
         ByteBuf buffer = generateByteBuf();
         ByteBuf readBuffer = buffer.copy();
-        assertEquals(buffer.refCnt(), 1);
+        assertEquals(1, buffer.refCnt());
         streamHandler.channelRead(ctx, buffer);
         streamHandler.channelInactive(ctx);
-        assertEquals(buffer.refCnt(), 0);
+        assertEquals(0, buffer.refCnt());
         try (InputStream inputStream = callback.getInputStream()) {
             for (int i = 0; i < readBuffer.readableBytes(); i++) {
                 int b = inputStream.read();

From 59b2b8c0738e00a0df71f5515276c41a5df7edf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 9 Feb 2023 17:21:47 -0600
Subject: [PATCH 1124/1272] Deprecate `JerseyDockerHttpClient` (#2067)

---
 .../com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
index f15e97712..78a65cf63 100644
--- a/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
+++ b/docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
@@ -42,6 +42,10 @@
 import java.util.Map;
 import java.util.Objects;
 
+/**
+ * @deprecated use Apache HttpClient 5-based transport
+ */
+@Deprecated
 public final class JerseyDockerHttpClient implements DockerHttpClient {
 
     public static final class Builder {

From f306650d6d696b7abdf0f1c7cde423b2c1262993 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 9 Feb 2023 18:54:11 -0600
Subject: [PATCH 1125/1272] Rename default branch to main (#2070)

---
 .github/workflows/ci.yml      | 2 +-
 .github/workflows/main.yml    | 2 +-
 .github/workflows/release.yml | 2 +-
 CHANGELOG.md                  | 2 +-
 README.md                     | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 255ad5a43..b947ddbbb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: CI
 
 on:
   pull_request: {}
-  push: { branches: [ master ] }
+  push: { branches: [ main ] }
 
 jobs:
   build:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2c30bcdb1..99cd01cfc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,7 +4,7 @@ on:
   push:
     # branches to consider in the event; optional, defaults to all
     branches:
-      - master
+      - main
 
 jobs:
   update_release_draft:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9f0acaa02..106c1d340 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
           java-version: 8
       - name: Set version
         run: ./mvnw versions:set -DnewVersion="${{github.event.release.tag_name}}"
-      # TODO check master's CI status
+      # TODO check main's CI status
       - name: Deploy with Maven
         env:
           MAVEN_DEPLOYMENT_REPOSITORY: ${{ secrets.MAVEN_DEPLOYMENT_REPOSITORY }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ca44ee2e..5d344d93b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -301,7 +301,7 @@ v2.0.0
 Release notes
 
 * Some commands APIs has been changed to be callback-driven now to simplify the processing of the result streams for the client application. This affects namely the events, stats, log, attach, build, push and pull commands. Look at the Wiki how to [process events](https://github.com/docker-java/docker-java/wiki#handle-events) or how to [build an image](https://github.com/docker-java/docker-java/wiki#build-image-from-dockerfile) from dockerfile for example.
-* The `DockerClientConfig` API has changed to free it from implementation specific configuration options like `readTimeout`, `maxTotalConnections`, `maxPerRouteConnections` and `enableLoggingFilter`. Most options can be configured via `DockerCmdExecFactoryImpl` [programmatically](https://github.com/docker-java/docker-java/wiki#intialize-docker-client-advanced) now. Logging is configurable via [logback](https://github.com/docker-java/docker-java/blob/master/src/test/resources/logback.xml) configuration file in the classpath.
+* The `DockerClientConfig` API has changed to free it from implementation specific configuration options like `readTimeout`, `maxTotalConnections`, `maxPerRouteConnections` and `enableLoggingFilter`. Most options can be configured via `DockerCmdExecFactoryImpl` [programmatically](https://github.com/docker-java/docker-java/wiki#intialize-docker-client-advanced) now. Logging is configurable via [logback](https://github.com/docker-java/docker-java/blob/main/src/test/resources/logback.xml) configuration file in the classpath.
 
 All changes
 
diff --git a/README.md b/README.md
index c60907548..b1fa9c89e 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 [![Join the chat at https://gitter.im/docker-java/docker-java](https://badges.gitter.im/docker-java/docker-java.svg)](https://gitter.im/docker-java/docker-java?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Maven Central](https://img.shields.io/maven-central/v/com.github.docker-java/docker-java.svg)](https://mvnrepository.com/artifact/com.github.docker-java/docker-java)
-[![codecov.io](http://codecov.io/github/docker-java/docker-java/coverage.svg?branch=master)](http://codecov.io/github/docker-java/docker-java?branch=master)
-[![License](http://img.shields.io/:license-apache-blue.svg?style=flat)](https://github.com/docker-java/docker-java/blob/master/LICENSE)
+[![codecov.io](http://codecov.io/github/docker-java/docker-java/coverage.svg?branch=main)](http://codecov.io/github/docker-java/docker-java?branch=master)
+[![License](http://img.shields.io/:license-apache-blue.svg?style=flat)](https://github.com/docker-java/docker-java/blob/main/LICENSE)
 # docker-java 
 
 Java API client for [Docker](http://docs.docker.io/ "Docker")
 
-# [Read the documentation here](docs/README.md)
\ No newline at end of file
+# [Read the documentation here](docs/README.md)

From fbc29d85733c6b23be151e06ae2eb9114c48457e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 1 Mar 2023 19:29:28 -0600
Subject: [PATCH 1126/1272] Update checkout and setup-java actions (#2083)

---
 .github/workflows/ci.yml      | 5 +++--
 .github/workflows/release.yml | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b947ddbbb..f616b6e53 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,11 +17,12 @@ jobs:
           - { name: "Docker 18.06.3", dockerVersion: "18.06.3~ce~3-0~ubuntu", javaVersion: 8 }
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: ${{matrix.javaVersion}}
+          distribution: temurin
       - name: Configure Docker
         env:
           DOCKER_VERSION: ${{matrix.dockerVersion}}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 106c1d340..03a866caa 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,11 +10,12 @@ jobs:
   build:
     runs-on: ubuntu-18.04
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Set up JDK 8
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: 8
+          distribution: temurin
       - name: Set version
         run: ./mvnw versions:set -DnewVersion="${{github.event.release.tag_name}}"
       # TODO check main's CI status

From 1d5ec65550935bbc56f0794ab7219cca4f761991 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 6 Mar 2023 20:40:05 -0600
Subject: [PATCH 1127/1272] Update ubuntu version to 20.04 and 22.04 (#2058)

ubuntu-18.04 is deprecated.
---
 .github/workflows/ci.yml      | 4 ++--
 .github/workflows/release.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f616b6e53..4f1ef43de 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -14,7 +14,7 @@ jobs:
           - { name: "default", javaVersion: 8 }
           - { name: "default", javaVersion: 17 }
           - { name: "over TCP", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 }
-          - { name: "Docker 18.06.3", dockerVersion: "18.06.3~ce~3-0~ubuntu", javaVersion: 8 }
+          - { name: "Docker 19.03.9", dockerVersion: "5:19.03.9~3-0~ubuntu-focal", javaVersion: 8 }
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 03a866caa..7ee128801 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK 8

From 980e5d1b7bdc3ddf434edaaaac62306505d0b3d4 Mon Sep 17 00:00:00 2001
From: belugabehr <12578579+belugabehr@users.noreply.github.com>
Date: Wed, 8 Mar 2023 09:03:01 -0500
Subject: [PATCH 1128/1272] Remove reference to unused commons-codec (#2028)

---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b2c2c876a..fe1e6d472 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,6 @@
 		<jackson-jaxrs.version>2.10.3</jackson-jaxrs.version>
 		<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
 		<commons-compress.version>1.21</commons-compress.version>
-		<commons-codec.version>1.11</commons-codec.version>
 		<commons-io.version>2.6</commons-io.version>
 		<commons-lang3.version>3.12.0</commons-lang3.version>
 		<slf4j-api.version>1.7.30</slf4j-api.version>

From f4cffbd6dd2df300d20c7ec0b35528f06ac26229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 8 Mar 2023 17:08:59 -0600
Subject: [PATCH 1129/1272] Add CODEOWNERS (#2085)

---
 .github/CODEOWNERS | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 000000000..e5a6b0376
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,2 @@
+* @docker-java/team
+

From 7ce35f42b813757ccb5bfe79f275abc38f020762 Mon Sep 17 00:00:00 2001
From: Matthias Wiedemann <mwiede@gmx.de>
Date: Thu, 9 Mar 2023 01:02:33 +0100
Subject: [PATCH 1130/1272] Load test resources from classpath (#1823)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../cmd/CopyArchiveFromContainerCmdIT.java       |  2 +-
 .../cmd/CopyArchiveToContainerCmdIT.java         | 16 ++++++++--------
 .../github/dockerjava/utils/TestResources.java   |  5 +++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java
index c434c0cb4..e0c2ca03e 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveFromContainerCmdIT.java
@@ -66,7 +66,7 @@ public void copyFromContainerBinaryFile() throws Exception {
         assertThat(container.getId(), not(isEmptyOrNullString()));
 
         Path temp = Files.createTempFile("", ".tar.gz");
-        Path binaryFile = Paths.get("src/test/resources/testCopyFromArchive/binary.dat");
+        Path binaryFile = Paths.get(ClassLoader.getSystemResource("testCopyFromArchive/binary.dat").toURI());
         CompressArchiveUtil.tar(binaryFile, temp, true, false);
 
         try (InputStream uploadStream = Files.newInputStream(temp)) {
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
index f931061e5..bbd98932f 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
@@ -33,7 +33,7 @@ public class CopyArchiveToContainerCmdIT extends CmdIT {
     public void copyFileToContainer() throws Exception {
         CreateContainerResponse container = prepareContainerForCopy("1");
         Path temp = Files.createTempFile("", ".tar.gz");
-        CompressArchiveUtil.tar(Paths.get("src/test/resources/testReadFile"), temp, true, false);
+        CompressArchiveUtil.tar(Paths.get(ClassLoader.getSystemResource("testReadFile").toURI()), temp, true, false);
         try (InputStream uploadStream = Files.newInputStream(temp)) {
             dockerRule.getClient()
                     .copyArchiveToContainerCmd(container.getId())
@@ -47,7 +47,7 @@ public void copyFileToContainer() throws Exception {
     public void copyStreamToContainer() throws Exception {
         CreateContainerResponse container = prepareContainerForCopy("2");
         dockerRule.getClient().copyArchiveToContainerCmd(container.getId())
-                .withHostResource("src/test/resources/testReadFile")
+                .withHostResource(Paths.get(ClassLoader.getSystemResource("testReadFile").toURI()).toString())
                 .exec();
         assertFileCopied(container);
     }
@@ -55,8 +55,8 @@ public void copyStreamToContainer() throws Exception {
     @Test
     public void copyStreamToContainerTwice() throws Exception {
         CreateContainerResponse container = prepareContainerForCopy("rerun");
-        CopyArchiveToContainerCmd copyArchiveToContainerCmd=dockerRule.getClient().copyArchiveToContainerCmd(container.getId())
-                .withHostResource("src/test/resources/testReadFile");
+        CopyArchiveToContainerCmd copyArchiveToContainerCmd = dockerRule.getClient().copyArchiveToContainerCmd(container.getId())
+                .withHostResource(Paths.get(ClassLoader.getSystemResource("testReadFile").toURI()).toString());
         copyArchiveToContainerCmd.exec();
         assertFileCopied(container);
         //run again to make sure no DockerClientException
@@ -82,9 +82,9 @@ private void assertFileCopied(CreateContainerResponse container) throws IOExcept
     }
 
     @Test(expected = NotFoundException.class)
-    public void copyToNonExistingContainer() {
-
-        dockerRule.getClient().copyArchiveToContainerCmd("non-existing").withHostResource("src/test/resources/testReadFile").exec();
+    public void copyToNonExistingContainer() throws Exception {
+        dockerRule.getClient().copyArchiveToContainerCmd("non-existing")
+                .withHostResource(Paths.get(ClassLoader.getSystemResource("testReadFile").toURI()).toString()).exec();
     }
 
     @Test
@@ -113,7 +113,7 @@ public void copyDirWithLastAddedTarEntryEmptyDir() throws Exception{
         // cleanup dir
         FileUtils.deleteDirectory(localDir.toFile());
     }
-    
+
     @Test
     public void copyFileWithExecutePermission() throws Exception {
         // create script file, add permission to execute
diff --git a/docker-java/src/test/java/com/github/dockerjava/utils/TestResources.java b/docker-java/src/test/java/com/github/dockerjava/utils/TestResources.java
index 35ece680f..2a56333f1 100644
--- a/docker-java/src/test/java/com/github/dockerjava/utils/TestResources.java
+++ b/docker-java/src/test/java/com/github/dockerjava/utils/TestResources.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.utils;
 
+import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
@@ -8,7 +9,7 @@ public class TestResources {
     private TestResources() {
     }
 
-    public static Path getApiImagesLoadTestTarball() {
-        return Paths.get("src/test/resources/api/images/load/image.tar");
+    public static Path getApiImagesLoadTestTarball() throws URISyntaxException {
+        return Paths.get(ClassLoader.getSystemResource("api/images/load/image.tar").toURI());
     }
 }

From 97579e5e330e16ed26fef25ada4de472aa998c56 Mon Sep 17 00:00:00 2001
From: belugabehr <12578579+belugabehr@users.noreply.github.com>
Date: Thu, 30 Mar 2023 02:29:16 -0400
Subject: [PATCH 1131/1272] Use JDK Objects requireNonNull over Guava
 checkNotNull (#1981)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../core/AbstractDockerCmdExecFactory.java    |  9 ++-
 .../core/DefaultDockerClientConfig.java       |  4 +-
 .../dockerjava/core/DockerClientImpl.java     | 14 ++--
 .../dockerjava/core/KeystoreSSLConfig.java    | 10 ++-
 .../core/LocalDirectorySSLConfig.java         |  6 +-
 .../core/command/AbstrAsyncDockerCmd.java     |  5 +-
 .../core/command/AbstrDockerCmd.java          |  6 +-
 .../core/command/AttachContainerCmdImpl.java  |  8 +--
 .../core/command/BuildImageCmdImpl.java       | 21 +++---
 .../core/command/CommitCmdImpl.java           | 51 +++++----------
 .../core/command/ContainerDiffCmdImpl.java    |  6 +-
 .../CopyArchiveFromContainerCmdImpl.java      | 12 ++--
 .../CopyArchiveToContainerCmdImpl.java        | 15 ++---
 .../command/CopyFileFromContainerCmdImpl.java | 12 ++--
 .../core/command/CreateConfigCmdImpl.java     | 11 ++--
 .../core/command/CreateContainerCmdImpl.java  | 64 +++++++++----------
 .../core/command/CreateImageCmdImpl.java      |  9 ++-
 .../core/command/CreateNetworkCmdImpl.java    |  5 +-
 .../core/command/CreateSecretCmdImpl.java     |  6 +-
 .../core/command/CreateServiceCmdImpl.java    |  8 +--
 .../core/command/CreateVolumeCmdImpl.java     | 11 ++--
 .../core/command/EventsCmdImpl.java           | 15 ++---
 .../core/command/ExecCreateCmdImpl.java       |  6 +-
 .../core/command/ExecStartCmdImpl.java        |  6 +-
 .../core/command/InspectConfigCmdImpl.java    |  7 +-
 .../core/command/InspectContainerCmdImpl.java |  5 +-
 .../core/command/InspectExecCmdImpl.java      |  6 +-
 .../core/command/InspectImageCmdImpl.java     |  5 +-
 .../core/command/InspectServiceCmdImpl.java   |  7 +-
 .../core/command/InspectSwarmNodeCmdImpl.java |  5 +-
 .../core/command/InspectVolumeCmdImpl.java    |  5 +-
 .../core/command/KillContainerCmdImpl.java    |  8 +--
 .../core/command/ListConfigsCmdImpl.java      |  6 +-
 .../core/command/ListContainersCmdImpl.java   | 18 +++---
 .../core/command/ListImagesCmdImpl.java       | 17 +++--
 .../core/command/ListNetworksCmdImpl.java     |  5 +-
 .../core/command/ListSecretsCmdImpl.java      |  9 ++-
 .../core/command/ListServicesCmdImpl.java     |  9 ++-
 .../core/command/ListSwarmNodesCmdImpl.java   | 11 ++--
 .../core/command/ListVolumesCmdImpl.java      |  7 +-
 .../core/command/LoadImageAsyncCmdImpl.java   |  5 +-
 .../core/command/LoadImageCmdImpl.java        |  6 +-
 .../core/command/LogContainerCmdImpl.java     |  5 +-
 .../core/command/PauseContainerCmdImpl.java   |  5 +-
 .../dockerjava/core/command/PruneCmdImpl.java | 11 ++--
 .../core/command/PullImageCmdImpl.java        | 13 ++--
 .../core/command/PushImageCmdImpl.java        |  8 +--
 .../core/command/RemoveConfigCmdImpl.java     |  7 +-
 .../core/command/RemoveContainerCmdImpl.java  |  5 +-
 .../core/command/RemoveImageCmdImpl.java      |  5 +-
 .../core/command/RemoveSecretCmdImpl.java     |  5 +-
 .../core/command/RemoveServiceCmdImpl.java    |  5 +-
 .../core/command/RemoveSwarmNodeCmdImpl.java  |  7 +-
 .../core/command/RemoveVolumeCmdImpl.java     |  5 +-
 .../core/command/RenameContainerCmdImpl.java  |  8 +--
 .../core/command/ResizeContainerCmdImpl.java  |  5 +-
 .../core/command/ResizeExecCmdImpl.java       |  7 +-
 .../core/command/RestartContainerCmdImpl.java |  7 +-
 .../core/command/SaveImageCmdImpl.java        |  9 +--
 .../core/command/SaveImagesCmdImpl.java       |  9 +--
 .../core/command/SearchImagesCmdImpl.java     |  5 +-
 .../core/command/StartContainerCmdImpl.java   |  5 +-
 .../dockerjava/core/command/StatsCmdImpl.java |  5 +-
 .../core/command/StopContainerCmdImpl.java    |  8 +--
 .../core/command/TagImageCmdImpl.java         | 11 ++--
 .../core/command/TopContainerCmdImpl.java     |  8 +--
 .../core/command/UnpauseContainerCmdImpl.java |  5 +-
 .../core/command/UpdateSwarmCmdImpl.java      |  7 +-
 .../core/command/WaitContainerCmdImpl.java    |  5 +-
 .../core/exec/AbstrDockerCmdExec.java         |  8 +--
 .../netty/NettyDockerCmdExecFactory.java      |  6 +-
 71 files changed, 271 insertions(+), 389 deletions(-)

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
index 4b49da035..e04ab8e3e 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.core;
 
+import java.util.Objects;
+
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.command.AuthCmd;
 import com.github.dockerjava.api.command.BuildImageCmd;
@@ -160,8 +162,6 @@
 import com.github.dockerjava.core.exec.VersionCmdExec;
 import com.github.dockerjava.core.exec.WaitContainerCmdExec;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 public abstract class AbstractDockerCmdExecFactory implements DockerCmdExecFactory, DockerClientConfigAware {
 
     private DockerClientConfig dockerClientConfig;
@@ -170,15 +170,14 @@ public abstract class AbstractDockerCmdExecFactory implements DockerCmdExecFacto
     protected Integer readTimeout;
 
     protected DockerClientConfig getDockerClientConfig() {
-        checkNotNull(dockerClientConfig,
+        Objects.requireNonNull(dockerClientConfig,
                 "Factor not initialized, dockerClientConfig not set. You probably forgot to call init()!");
         return dockerClientConfig;
     }
 
     @Override
     public void init(DockerClientConfig dockerClientConfig) {
-        checkNotNull(dockerClientConfig, "config was not specified");
-        this.dockerClientConfig = dockerClientConfig;
+        this.dockerClientConfig = Objects.requireNonNull(dockerClientConfig, "config was not specified");
     }
 
     @Override
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index 88d9e49f0..b4e1aa0a5 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -23,10 +23,10 @@
 import java.net.URI;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
 
-import static com.google.common.base.Preconditions.checkNotNull;
 import static org.apache.commons.lang3.BooleanUtils.isTrue;
 
 /**
@@ -362,7 +362,7 @@ public Builder withProperties(Properties p) {
          * configure DOCKER_HOST
          */
         public final Builder withDockerHost(String dockerHost) {
-            checkNotNull(dockerHost, "uri was not specified");
+            Objects.requireNonNull(dockerHost, "uri was not specified");
             this.dockerHost = URI.create(dockerHost);
             return this;
         }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 8de900279..55f530057 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -172,8 +172,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 /**
  * @author Konstantin Pelykh (kpelykh@gmail.com)
@@ -186,8 +185,7 @@ public class DockerClientImpl implements Closeable, DockerClient {
     DockerCmdExecFactory dockerCmdExecFactory;
 
     DockerClientImpl(DockerClientConfig dockerClientConfig) {
-        checkNotNull(dockerClientConfig, "config was not specified");
-        this.dockerClientConfig = dockerClientConfig;
+        this.dockerClientConfig = Objects.requireNonNull(dockerClientConfig, "config was not specified");
     }
 
     /**
@@ -248,7 +246,7 @@ public DockerHttpClient getHttpClient() {
      */
     @Deprecated
     public DockerClientImpl withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdExecFactory) {
-        checkNotNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified");
+        Objects.requireNonNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified");
         this.dockerCmdExecFactory = dockerCmdExecFactory;
         if (dockerCmdExecFactory instanceof DockerClientConfigAware) {
             ((DockerClientConfigAware) dockerCmdExecFactory).init(dockerClientConfig);
@@ -258,14 +256,14 @@ public DockerClientImpl withDockerCmdExecFactory(DockerCmdExecFactory dockerCmdE
 
     @Deprecated
     private DockerCmdExecFactory getDockerCmdExecFactory() {
-        checkNotNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified");
+        Objects.requireNonNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified");
         return dockerCmdExecFactory;
     }
 
     @Override
     public AuthConfig authConfig() {
-        checkNotNull(dockerClientConfig.getRegistryUsername(), "Configured username is null.");
-        checkNotNull(dockerClientConfig.getRegistryUrl(), "Configured serverAddress is null.");
+        Objects.requireNonNull(dockerClientConfig.getRegistryUsername(), "Configured username is null.");
+        Objects.requireNonNull(dockerClientConfig.getRegistryUrl(), "Configured serverAddress is null.");
 
         return new AuthConfig()
                 .withUsername(dockerClientConfig.getRegistryUsername())
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
index 43946a53b..73491bb43 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.core;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -14,6 +12,7 @@
 import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
+import java.util.Objects;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
@@ -37,8 +36,7 @@ public class KeystoreSSLConfig implements SSLConfig, Serializable {
      */
     public KeystoreSSLConfig(KeyStore keystore, String keystorePassword) {
         this.keystorePassword = keystorePassword;
-        checkNotNull(keystore);
-        this.keystore = keystore;
+        this.keystore = Objects.requireNonNull(keystore);
     }
 
     /**
@@ -54,8 +52,8 @@ public KeystoreSSLConfig(KeyStore keystore, String keystorePassword) {
      */
     public KeystoreSSLConfig(File pfxFile, String password) throws KeyStoreException, IOException,
             CertificateException, NoSuchAlgorithmException {
-        checkNotNull(pfxFile);
-        checkNotNull(password);
+        Objects.requireNonNull(pfxFile);
+        Objects.requireNonNull(password);
         keystore = KeyStore.getInstance("pkcs12");
         try (FileInputStream fs = new FileInputStream(pfxFile)) {
             keystore.load(fs, password.toCharArray());
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
index 6e39f4f94..665f48f06 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.core;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.io.File;
 import java.io.Serializable;
 import java.nio.file.Files;
@@ -9,6 +7,7 @@
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.security.Security;
+import java.util.Objects;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
@@ -29,8 +28,7 @@ public class LocalDirectorySSLConfig implements SSLConfig, Serializable {
     private final String dockerCertPath;
 
     public LocalDirectorySSLConfig(String dockerCertPath) {
-        checkNotNull(dockerCertPath);
-        this.dockerCertPath = dockerCertPath;
+        this.dockerCertPath = Objects.requireNonNull(dockerCertPath);
     }
 
     public String getDockerCertPath() {
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
index b576d7a05..9f83c0b4f 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.AsyncDockerCmd;
@@ -12,8 +12,7 @@ public abstract class AbstrAsyncDockerCmd<CMD_T extends AsyncDockerCmd<CMD_T, A_
     protected transient DockerCmdAsyncExec<CMD_T, A_RES_T> execution;
 
     public AbstrAsyncDockerCmd(DockerCmdAsyncExec<CMD_T, A_RES_T> execution) {
-        checkNotNull(execution, "execution was not specified");
-        this.execution = execution;
+        this.execution = Objects.requireNonNull(execution, "execution was not specified");
     }
 
     @Override
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
index 9fbeb0a75..17ff9a88e 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
@@ -1,9 +1,8 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.io.IOException;
 import java.util.Base64;
+import java.util.Objects;
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -24,8 +23,7 @@ public abstract class AbstrDockerCmd<CMD_T extends DockerCmd<RES_T>, RES_T> impl
     protected transient DockerCmdSyncExec<CMD_T, RES_T> execution;
 
     public AbstrDockerCmd(DockerCmdSyncExec<CMD_T, RES_T> execution) {
-        checkNotNull(execution, "execution was not specified");
-        this.execution = execution;
+        this.execution = Objects.requireNonNull(execution, "execution was not specified");
     }
 
     @Override
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
index 6c5103b27..30a411dba 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
@@ -1,8 +1,7 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.io.InputStream;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.model.Frame;
@@ -61,7 +60,7 @@ public InputStream getStdin() {
 
     @Override
     public AttachContainerCmd withContainerId(String containerId) {
-        checkNotNull(containerId, "containerId was not specified");
+        Objects.requireNonNull(containerId, "containerId was not specified");
         this.containerId = containerId;
         return this;
     }
@@ -92,8 +91,7 @@ public AttachContainerCmd withStdErr(Boolean stderr) {
 
     @Override
     public AttachContainerCmd withStdIn(InputStream stdin) {
-        checkNotNull(stdin, "stdin was not specified");
-        this.stdin = stdin;
+        this.stdin = Objects.requireNonNull(stdin, "stdin was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index 1bd1af576..5d9e62909 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -13,10 +13,9 @@
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Build an image from Dockerfile.
  */
@@ -79,7 +78,7 @@ public BuildImageCmdImpl(BuildImageCmd.Exec exec) {
 
     public BuildImageCmdImpl(BuildImageCmd.Exec exec, File dockerFileOrFolder) {
         super(exec);
-        checkNotNull(dockerFileOrFolder, "dockerFolder is null");
+        Objects.requireNonNull(dockerFileOrFolder, "dockerFolder is null");
 
         if (dockerFileOrFolder.isDirectory()) {
             withBaseDirectory(dockerFileOrFolder);
@@ -91,7 +90,7 @@ public BuildImageCmdImpl(BuildImageCmd.Exec exec, File dockerFileOrFolder) {
 
     public BuildImageCmdImpl(BuildImageCmd.Exec exec, InputStream tarInputStream) {
         super(exec);
-        checkNotNull(tarInputStream, "tarInputStream is null");
+        Objects.requireNonNull(tarInputStream, "tarInputStream is null");
         withTarInputStream(tarInputStream);
     }
 
@@ -232,8 +231,7 @@ public Set<String> getExtraHosts() {
     @Deprecated
     @Override
     public BuildImageCmdImpl withTag(String tag) {
-        checkNotNull(tag, "Tag is null");
-        this.tag = tag;
+        this.tag = Objects.requireNonNull(tag, "Tag is null");
         return this;
     }
 
@@ -328,7 +326,7 @@ public BuildImageCmd withBaseDirectory(File baseDirectory) {
 
     @Override
     public BuildImageCmdImpl withDockerfile(File dockerfile) {
-        checkNotNull(dockerfile);
+        Objects.requireNonNull(dockerfile);
         if (!dockerfile.exists()) {
             throw new IllegalArgumentException("Dockerfile does not exist");
         }
@@ -353,22 +351,19 @@ public BuildImageCmdImpl withDockerfile(File dockerfile) {
 
     @Override
     public BuildImageCmd withDockerfilePath(String dockerfilePath) {
-        checkNotNull(dockerfilePath, "dockerfilePath is null");
-        this.dockerFilePath = dockerfilePath;
+        this.dockerFilePath = Objects.requireNonNull(dockerfilePath, "dockerfilePath is null");
         return this;
     }
 
     @Override
     public BuildImageCmdImpl withTarInputStream(InputStream tarInputStream) {
-        checkNotNull(tarInputStream, "tarInputStream is null");
-        this.tarInputStream = tarInputStream;
+        this.tarInputStream = Objects.requireNonNull(tarInputStream, "tarInputStream is null");
         return this;
     }
 
     @Override
     public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfigs) {
-        checkNotNull(authConfigs, "authConfig is null");
-        this.buildAuthConfigs = authConfigs;
+        this.buildAuthConfigs = Objects.requireNonNull(authConfigs, "authConfig is null");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
index 1c8ad26a4..8458c7f7e 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
@@ -1,8 +1,7 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.util.Map;
+import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.command.CommitCmd;
@@ -90,8 +89,7 @@ public String getContainerId() {
 
     @Override
     public CommitCmdImpl withContainerId(String containerId) {
-        checkNotNull(containerId, "containerId was not specified");
-        this.containerId = containerId;
+        this.containerId = Objects.requireNonNull(containerId, "containerId was not specified");
         return this;
     }
 
@@ -140,8 +138,7 @@ public CommitCmdImpl withAttachStdout(Boolean attachStdout) {
 
     @Override
     public CommitCmdImpl withCmd(String... cmd) {
-        checkNotNull(cmd, "cmd was not specified");
-        this.cmd = cmd;
+        this.cmd = Objects.requireNonNull(cmd, "cmd was not specified");
         return this;
     }
 
@@ -153,29 +150,25 @@ public CommitCmdImpl withDisableNetwork(Boolean disableNetwork) {
 
     @Override
     public CommitCmdImpl withAuthor(String author) {
-        checkNotNull(author, "author was not specified");
-        this.author = author;
+        this.author = Objects.requireNonNull(author, "author was not specified");
         return this;
     }
 
     @Override
     public CommitCmdImpl withMessage(String message) {
-        checkNotNull(message, "message was not specified");
-        this.message = message;
+        this.message = Objects.requireNonNull(message, "message was not specified");
         return this;
     }
 
     @Override
     public CommitCmdImpl withTag(String tag) {
-        checkNotNull(tag, "tag was not specified");
-        this.tag = tag;
+        this.tag = Objects.requireNonNull(tag, "tag was not specified");
         return this;
     }
 
     @Override
     public CommitCmdImpl withRepository(String repository) {
-        checkNotNull(repository, "repository was not specified");
-        this.repository = repository;
+        this.repository = Objects.requireNonNull(repository, "repository was not specified");
         return this;
     }
 
@@ -192,8 +185,7 @@ public String[] getEnv() {
 
     @Override
     public CommitCmdImpl withEnv(String... env) {
-        checkNotNull(env, "env was not specified");
-        this.env = env;
+        this.env = Objects.requireNonNull(env, "env was not specified");
         return this;
     }
 
@@ -215,8 +207,7 @@ public ExposedPorts getExposedPorts() {
 
     @Override
     public CommitCmdImpl withExposedPorts(ExposedPorts exposedPorts) {
-        checkNotNull(exposedPorts, "exposedPorts was not specified");
-        this.exposedPorts = exposedPorts;
+        this.exposedPorts = Objects.requireNonNull(exposedPorts, "exposedPorts was not specified");
         return this;
     }
 
@@ -227,8 +218,7 @@ public String getHostname() {
 
     @Override
     public CommitCmdImpl withHostname(String hostname) {
-        checkNotNull(hostname, "hostname was not specified");
-        this.hostname = hostname;
+        this.hostname = Objects.requireNonNull(hostname, "hostname was not specified");
         return this;
     }
 
@@ -239,8 +229,7 @@ public Integer getMemory() {
 
     @Override
     public CommitCmdImpl withMemory(Integer memory) {
-        checkNotNull(memory, "memory was not specified");
-        this.memory = memory;
+        this.memory = Objects.requireNonNull(memory, "memory was not specified");
         return this;
     }
 
@@ -251,8 +240,7 @@ public Integer getMemorySwap() {
 
     @Override
     public CommitCmdImpl withMemorySwap(Integer memorySwap) {
-        checkNotNull(memorySwap, "memorySwap was not specified");
-        this.memorySwap = memorySwap;
+        this.memorySwap = Objects.requireNonNull(memorySwap, "memorySwap was not specified");
         return this;
     }
 
@@ -263,8 +251,7 @@ public Boolean isOpenStdin() {
 
     @Override
     public CommitCmdImpl withOpenStdin(Boolean openStdin) {
-        checkNotNull(openStdin, "openStdin was not specified");
-        this.openStdin = openStdin;
+        this.openStdin = Objects.requireNonNull(openStdin, "openStdin was not specified");
         return this;
     }
 
@@ -275,8 +262,7 @@ public String[] getPortSpecs() {
 
     @Override
     public CommitCmdImpl withPortSpecs(String... portSpecs) {
-        checkNotNull(portSpecs, "portSpecs was not specified");
-        this.portSpecs = portSpecs;
+        this.portSpecs = Objects.requireNonNull(portSpecs, "portSpecs was not specified");
         return this;
     }
 
@@ -309,8 +295,7 @@ public String getUser() {
 
     @Override
     public CommitCmdImpl withUser(String user) {
-        checkNotNull(user, "user was not specified");
-        this.user = user;
+        this.user = Objects.requireNonNull(user, "user was not specified");
         return this;
     }
 
@@ -321,8 +306,7 @@ public Volumes getVolumes() {
 
     @Override
     public CommitCmdImpl withVolumes(Volumes volumes) {
-        checkNotNull(volumes, "volumes was not specified");
-        this.volumes = volumes;
+        this.volumes = Objects.requireNonNull(volumes, "volumes was not specified");
         return this;
     }
 
@@ -333,8 +317,7 @@ public String getWorkingDir() {
 
     @Override
     public CommitCmdImpl withWorkingDir(String workingDir) {
-        checkNotNull(workingDir, "workingDir was not specified");
-        this.workingDir = workingDir;
+        this.workingDir = Objects.requireNonNull(workingDir, "workingDir was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
index eb6baa5ab..14fc683ce 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
@@ -1,8 +1,7 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.util.List;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.ContainerDiffCmd;
 import com.github.dockerjava.api.exception.DockerException;
@@ -33,8 +32,7 @@ public String getContainerId() {
 
     @Override
     public ContainerDiffCmdImpl withContainerId(String containerId) {
-        checkNotNull(containerId, "containerId was not specified");
-        this.containerId = containerId;
+        this.containerId = Objects.requireNonNull(containerId, "containerId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java
index 8ca305616..e827b37c8 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveFromContainerCmdImpl.java
@@ -1,8 +1,7 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.io.InputStream;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
@@ -37,15 +36,13 @@ public String getResource() {
 
     @Override
     public CopyArchiveFromContainerCmdImpl withContainerId(String containerId) {
-        checkNotNull(containerId, "containerId was not specified");
-        this.containerId = containerId;
+        this.containerId = Objects.requireNonNull(containerId, "containerId was not specified");
         return this;
     }
 
     @Override
     public CopyArchiveFromContainerCmdImpl withResource(String resource) {
-        checkNotNull(resource, "resource was not specified");
-        this.resource = resource;
+        this.resource = Objects.requireNonNull(resource, "resource was not specified");
         return this;
     }
 
@@ -56,8 +53,7 @@ public String getHostPath() {
 
     @Override
     public CopyArchiveFromContainerCmdImpl withHostPath(String hostPath) {
-        checkNotNull(hostPath, "hostPath was not specified");
-        this.hostPath = hostPath;
+        this.hostPath = Objects.requireNonNull(hostPath, "hostPath was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
index a915a3b02..a9b42e921 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyArchiveToContainerCmdImpl.java
@@ -1,12 +1,11 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Objects;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -40,15 +39,13 @@ public CopyArchiveToContainerCmdImpl(CopyArchiveToContainerCmd.Exec exec, String
 
     @Override
     public CopyArchiveToContainerCmd withContainerId(String containerId) {
-        checkNotNull(containerId, "containerId was not specified");
-        this.containerId = containerId;
+        this.containerId = Objects.requireNonNull(containerId, "containerId was not specified");
         return this;
     }
 
     @Override
     public CopyArchiveToContainerCmd withHostResource(String hostResource) {
-        checkNotNull(hostResource, "hostResource was not specified");
-        this.hostResource = hostResource;
+        this.hostResource = Objects.requireNonNull(hostResource, "hostResource was not specified");
         return this;
     }
 
@@ -66,15 +63,13 @@ public CopyArchiveToContainerCmd withCopyUIDGID(boolean copyUIDGID) {
 
     @Override
     public CopyArchiveToContainerCmd withRemotePath(String remotePath) {
-        checkNotNull(remotePath, "remotePath was not specified");
-        this.remotePath = remotePath;
+        this.remotePath = Objects.requireNonNull(remotePath, "remotePath was not specified");
         return this;
     }
 
     @Override
     public CopyArchiveToContainerCmd withTarInputStream(InputStream tarInputStream) {
-        checkNotNull(tarInputStream, "tarInputStream was not specified");
-        this.tarInputStream = tarInputStream;
+        this.tarInputStream = Objects.requireNonNull(tarInputStream, "tarInputStream was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
index 3976834a4..4c8b3447d 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
@@ -1,8 +1,7 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.io.InputStream;
+import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
@@ -42,15 +41,13 @@ public String getResource() {
 
     @Override
     public CopyFileFromContainerCmdImpl withContainerId(String containerId) {
-        checkNotNull(containerId, "containerId was not specified");
-        this.containerId = containerId;
+        this.containerId = Objects.requireNonNull(containerId, "containerId was not specified");
         return this;
     }
 
     @Override
     public CopyFileFromContainerCmdImpl withResource(String resource) {
-        checkNotNull(resource, "resource was not specified");
-        this.resource = resource;
+        this.resource = Objects.requireNonNull(resource, "resource was not specified");
         return this;
     }
 
@@ -61,8 +58,7 @@ public String getHostPath() {
 
     @Override
     public CopyFileFromContainerCmdImpl withHostPath(String hostPath) {
-        checkNotNull(hostPath, "hostPath was not specified");
-        this.hostPath = hostPath;
+        this.hostPath = Objects.requireNonNull(hostPath, "hostPath was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateConfigCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateConfigCmdImpl.java
index 6c21e39c9..3a4f1cf01 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateConfigCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateConfigCmdImpl.java
@@ -6,8 +6,7 @@
 
 import java.util.Base64;
 import java.util.Map;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 /**
  * Creates a new config
@@ -44,22 +43,20 @@ public CreateConfigCmdImpl(CreateConfigCmd.Exec exec) {
 
     @Override
     public CreateConfigCmd withName(String name) {
-        checkNotNull(name, "name was not specified");
-        this.name = name;
+        this.name = Objects.requireNonNull(name, "name was not specified");
         return this;
     }
 
     @Override
     public CreateConfigCmd withData(byte[] data) {
-        checkNotNull(data, "data was not specified");
+        Objects.requireNonNull(data, "data was not specified");
         this.data = Base64.getEncoder().encodeToString(data);
         return this;
     }
 
     @Override
     public CreateConfigCmd withLabels(Map<String, String> labels) {
-        checkNotNull(labels, "labels was not specified");
-        this.labels = labels;
+        this.labels = Objects.requireNonNull(labels, "labels was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index fd4653559..9b7f8a8fe 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -22,8 +22,8 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
-import static com.google.common.base.Preconditions.checkNotNull;
 import static java.util.Collections.singletonMap;
 
 /**
@@ -167,7 +167,7 @@ public CreateContainerCmd withAliases(String... aliases) {
 
     @Override
     public CreateContainerCmd withAliases(List<String> aliases) {
-        checkNotNull(aliases, "aliases was not specified");
+        Objects.requireNonNull(aliases, "aliases was not specified");
         this.aliases = aliases;
         return this;
     }
@@ -180,14 +180,14 @@ public String[] getCmd() {
 
     @Override
     public CreateContainerCmd withCmd(String... cmd) {
-        checkNotNull(cmd, "cmd was not specified");
+        Objects.requireNonNull(cmd, "cmd was not specified");
         this.cmd = cmd;
         return this;
     }
 
     @Override
     public CreateContainerCmd withCmd(List<String> cmd) {
-        checkNotNull(cmd, "cmd was not specified");
+        Objects.requireNonNull(cmd, "cmd was not specified");
         return withCmd(cmd.toArray(new String[0]));
     }
 
@@ -217,7 +217,7 @@ public String getDomainName() {
 
     @Override
     public CreateContainerCmd withDomainName(String domainName) {
-        checkNotNull(domainName, "no domainName was specified");
+        Objects.requireNonNull(domainName, "no domainName was specified");
         this.domainName = domainName;
         return this;
     }
@@ -229,14 +229,14 @@ public String[] getEntrypoint() {
 
     @Override
     public CreateContainerCmd withEntrypoint(String... entrypoint) {
-        checkNotNull(entrypoint, "entrypoint was not specified");
+        Objects.requireNonNull(entrypoint, "entrypoint was not specified");
         this.entrypoint = entrypoint;
         return this;
     }
 
     @Override
     public CreateContainerCmd withEntrypoint(List<String> entrypoint) {
-        checkNotNull(entrypoint, "entrypoint was not specified");
+        Objects.requireNonNull(entrypoint, "entrypoint was not specified");
         return withEntrypoint(entrypoint.toArray(new String[0]));
     }
 
@@ -247,14 +247,14 @@ public String[] getEnv() {
 
     @Override
     public CreateContainerCmd withEnv(String... env) {
-        checkNotNull(env, "env was not specified");
+        Objects.requireNonNull(env, "env was not specified");
         this.env = env;
         return this;
     }
 
     @Override
     public CreateContainerCmd withEnv(List<String> env) {
-        checkNotNull(env, "env was not specified");
+        Objects.requireNonNull(env, "env was not specified");
         return withEnv(env.toArray(new String[0]));
     }
 
@@ -265,14 +265,14 @@ public ExposedPort[] getExposedPorts() {
 
     @Override
     public CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts) {
-        checkNotNull(exposedPorts, "exposedPorts was not specified");
+        Objects.requireNonNull(exposedPorts, "exposedPorts was not specified");
         this.exposedPorts = new ExposedPorts(exposedPorts);
         return this;
     }
 
     @Override
     public CreateContainerCmd withExposedPorts(List<ExposedPort> exposedPorts) {
-        checkNotNull(exposedPorts, "exposedPorts was not specified");
+        Objects.requireNonNull(exposedPorts, "exposedPorts was not specified");
         return withExposedPorts(exposedPorts.toArray(new ExposedPort[0]));
     }
 
@@ -286,7 +286,7 @@ public String getStopSignal() {
 
     @Override
     public CreateContainerCmd withStopSignal(String stopSignal) {
-        checkNotNull(stopSignal, "stopSignal wasn't specified.");
+        Objects.requireNonNull(stopSignal, "stopSignal wasn't specified.");
         this.stopSignal = stopSignal;
         return this;
     }
@@ -309,7 +309,7 @@ public String getHostName() {
 
     @Override
     public CreateContainerCmd withHostName(String hostName) {
-        checkNotNull(hostName, "no hostName was specified");
+        Objects.requireNonNull(hostName, "no hostName was specified");
         this.hostName = hostName;
         return this;
     }
@@ -321,7 +321,7 @@ public String getImage() {
 
     @Override
     public CreateContainerCmd withImage(String image) {
-        checkNotNull(image, "no image was specified");
+        Objects.requireNonNull(image, "no image was specified");
         this.image = image;
         return this;
     }
@@ -333,7 +333,7 @@ public Map<String, String> getLabels() {
 
     @Override
     public CreateContainerCmd withLabels(Map<String, String> labels) {
-        checkNotNull(labels, "labels was not specified");
+        Objects.requireNonNull(labels, "labels was not specified");
         this.labels = labels;
         return this;
     }
@@ -345,7 +345,7 @@ public String getMacAddress() {
 
     @Override
     public CreateContainerCmd withMacAddress(String macAddress) {
-        checkNotNull(macAddress, "macAddress was not specified");
+        Objects.requireNonNull(macAddress, "macAddress was not specified");
         this.macAddress = macAddress;
         return this;
     }
@@ -358,7 +358,7 @@ public String getName() {
 
     @Override
     public CreateContainerCmd withName(String name) {
-        checkNotNull(name, "name was not specified");
+        Objects.requireNonNull(name, "name was not specified");
         this.name = name;
         return this;
     }
@@ -370,14 +370,14 @@ public String[] getPortSpecs() {
 
     @Override
     public CreateContainerCmd withPortSpecs(String... portSpecs) {
-        checkNotNull(portSpecs, "portSpecs was not specified");
+        Objects.requireNonNull(portSpecs, "portSpecs was not specified");
         this.portSpecs = portSpecs;
         return this;
     }
 
     @Override
     public CreateContainerCmd withPortSpecs(List<String> portSpecs) {
-        checkNotNull(portSpecs, "portSpecs was not specified");
+        Objects.requireNonNull(portSpecs, "portSpecs was not specified");
         return withPortSpecs(portSpecs.toArray(new String[0]));
     }
 
@@ -388,7 +388,7 @@ public String getUser() {
 
     @Override
     public CreateContainerCmd withUser(String user) {
-        checkNotNull(user, "user was not specified");
+        Objects.requireNonNull(user, "user was not specified");
         this.user = user;
         return this;
     }
@@ -400,7 +400,7 @@ public Boolean isAttachStderr() {
 
     @Override
     public CreateContainerCmd withAttachStderr(Boolean attachStderr) {
-        checkNotNull(attachStderr, "attachStderr was not specified");
+        Objects.requireNonNull(attachStderr, "attachStderr was not specified");
         this.attachStderr = attachStderr;
         return this;
     }
@@ -412,7 +412,7 @@ public Boolean isAttachStdin() {
 
     @Override
     public CreateContainerCmd withAttachStdin(Boolean attachStdin) {
-        checkNotNull(attachStdin, "attachStdin was not specified");
+        Objects.requireNonNull(attachStdin, "attachStdin was not specified");
         this.attachStdin = attachStdin;
         return this;
     }
@@ -424,7 +424,7 @@ public Boolean isAttachStdout() {
 
     @Override
     public CreateContainerCmd withAttachStdout(Boolean attachStdout) {
-        checkNotNull(attachStdout, "attachStdout was not specified");
+        Objects.requireNonNull(attachStdout, "attachStdout was not specified");
         this.attachStdout = attachStdout;
         return this;
     }
@@ -436,14 +436,14 @@ public Volume[] getVolumes() {
 
     @Override
     public CreateContainerCmd withVolumes(Volume... volumes) {
-        checkNotNull(volumes, "volumes was not specified");
+        Objects.requireNonNull(volumes, "volumes was not specified");
         this.volumes = new Volumes(volumes);
         return this;
     }
 
     @Override
     public CreateContainerCmd withVolumes(List<Volume> volumes) {
-        checkNotNull(volumes, "volumes was not specified");
+        Objects.requireNonNull(volumes, "volumes was not specified");
         return withVolumes(volumes.toArray(new Volume[0]));
     }
 
@@ -454,7 +454,7 @@ public String getWorkingDir() {
 
     @Override
     public CreateContainerCmd withWorkingDir(String workingDir) {
-        checkNotNull(workingDir, "workingDir was not specified");
+        Objects.requireNonNull(workingDir, "workingDir was not specified");
         this.workingDir = workingDir;
         return this;
     }
@@ -466,7 +466,7 @@ public Boolean isNetworkDisabled() {
 
     @Override
     public CreateContainerCmd withNetworkDisabled(Boolean disableNetwork) {
-        checkNotNull(disableNetwork, "disableNetwork was not specified");
+        Objects.requireNonNull(disableNetwork, "disableNetwork was not specified");
         this.networkDisabled = disableNetwork;
         return this;
     }
@@ -479,7 +479,7 @@ public Boolean isStdInOnce() {
 
     @Override
     public CreateContainerCmd withStdInOnce(Boolean stdInOnce) {
-        checkNotNull(stdInOnce, "no stdInOnce was specified");
+        Objects.requireNonNull(stdInOnce, "no stdInOnce was specified");
         this.stdInOnce = stdInOnce;
         return this;
     }
@@ -491,7 +491,7 @@ public Boolean isStdinOpen() {
 
     @Override
     public CreateContainerCmd withStdinOpen(Boolean stdinOpen) {
-        checkNotNull(stdinOpen, "no stdinOpen was specified");
+        Objects.requireNonNull(stdinOpen, "no stdinOpen was specified");
         this.stdinOpen = stdinOpen;
         return this;
     }
@@ -504,7 +504,7 @@ public Boolean isTty() {
 
     @Override
     public CreateContainerCmd withTty(Boolean tty) {
-        checkNotNull(tty, "no tty was specified");
+        Objects.requireNonNull(tty, "no tty was specified");
         this.tty = tty;
         return this;
     }
@@ -527,7 +527,7 @@ public String getIpv4Address() {
 
     @Override
     public CreateContainerCmd withIpv4Address(String ipv4Address) {
-        checkNotNull(ipv4Address, "no ipv4Address was specified");
+        Objects.requireNonNull(ipv4Address, "no ipv4Address was specified");
         this.ipv4Address = ipv4Address;
         return this;
     }
@@ -539,7 +539,7 @@ public String getIpv6Address() {
 
     @Override
     public CreateContainerCmd withIpv6Address(String ipv6Address) {
-        checkNotNull(ipv6Address, "no ipv6Address was specified");
+        Objects.requireNonNull(ipv6Address, "no ipv6Address was specified");
         this.ipv6Address = ipv6Address;
         return this;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
index 9ecf84430..cab9607d0 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
@@ -1,8 +1,7 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.io.InputStream;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.CreateImageCmd;
 import com.github.dockerjava.api.command.CreateImageResponse;
@@ -54,7 +53,7 @@ public InputStream getImageStream() {
      */
     @Override
     public CreateImageCmdImpl withRepository(String repository) {
-        checkNotNull(repository, "repository was not specified");
+        Objects.requireNonNull(repository, "repository was not specified");
         this.repository = repository;
         return this;
     }
@@ -65,7 +64,7 @@ public CreateImageCmdImpl withRepository(String repository) {
      */
     @Override
     public CreateImageCmdImpl withImageStream(InputStream imageStream) {
-        checkNotNull(imageStream, "imageStream was not specified");
+        Objects.requireNonNull(imageStream, "imageStream was not specified");
         this.imageStream = imageStream;
         return this;
     }
@@ -76,7 +75,7 @@ public CreateImageCmdImpl withImageStream(InputStream imageStream) {
      */
     @Override
     public CreateImageCmdImpl withTag(String tag) {
-        checkNotNull(tag, "tag was not specified");
+        Objects.requireNonNull(tag, "tag was not specified");
         this.tag = tag;
         return this;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
index e6cff4c09..db2766796 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateNetworkCmdImpl.java
@@ -2,6 +2,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.command.CreateNetworkCmd;
@@ -10,8 +11,6 @@
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.api.model.Network.Ipam;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 public class CreateNetworkCmdImpl extends AbstrDockerCmd<CreateNetworkCmd, CreateNetworkResponse>
         implements CreateNetworkCmd {
 
@@ -147,7 +146,7 @@ public Map<String, String> getLabels() {
      */
     @Override
     public CreateNetworkCmd withLabels(Map<String, String> labels) {
-        checkNotNull(labels, "labels was not specified");
+        Objects.requireNonNull(labels, "labels was not specified");
         this.labels = labels;
         return this;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java
index d86b04855..19891325a 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateSecretCmdImpl.java
@@ -4,7 +4,7 @@
 import com.github.dockerjava.api.command.CreateSecretResponse;
 import com.github.dockerjava.api.model.SecretSpec;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 /**
  * Creates a new secret
@@ -16,7 +16,7 @@ public class CreateSecretCmdImpl extends AbstrDockerCmd<CreateSecretCmd, CreateS
 
     public CreateSecretCmdImpl(Exec exec, SecretSpec secretSpec) {
         super(exec);
-        checkNotNull(secretSpec, "secretSpec was not specified");
+        Objects.requireNonNull(secretSpec, "secretSpec was not specified");
         withSecretSpec(secretSpec);
     }
 
@@ -27,7 +27,7 @@ public SecretSpec getSecretSpec() {
 
     @Override
     public CreateSecretCmd withSecretSpec(SecretSpec secretSpec) {
-        checkNotNull(secretSpec, "secretSpec was not specified");
+        Objects.requireNonNull(secretSpec, "secretSpec was not specified");
         this.secretSpec = secretSpec;
         return this;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java
index a664569a1..1da533b88 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateServiceCmdImpl.java
@@ -5,7 +5,7 @@
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.ServiceSpec;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 /**
  * Creates a new service
@@ -19,7 +19,7 @@ public class CreateServiceCmdImpl extends AbstrDockerCmd<CreateServiceCmd, Creat
 
     public CreateServiceCmdImpl(CreateServiceCmd.Exec exec, ServiceSpec serviceSpec) {
         super(exec);
-        checkNotNull(serviceSpec, "serviceSpec was not specified");
+        Objects.requireNonNull(serviceSpec, "serviceSpec was not specified");
         withServiceSpec(serviceSpec);
     }
 
@@ -35,14 +35,14 @@ public AuthConfig getAuthConfig() {
 
     @Override
     public CreateServiceCmd withServiceSpec(ServiceSpec serviceSpec) {
-        checkNotNull(serviceSpec, "serviceSpec was not specified");
+        Objects.requireNonNull(serviceSpec, "serviceSpec was not specified");
         this.serviceSpec = serviceSpec;
         return this;
     }
 
     @Override
     public CreateServiceCmd withAuthConfig(AuthConfig authConfig) {
-        checkNotNull(authConfig, "authConfig was not specified");
+        Objects.requireNonNull(authConfig, "authConfig was not specified");
         this.authConfig = authConfig;
         return this;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java
index 48dbcfa1e..6d3a8bb7b 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/CreateVolumeCmdImpl.java
@@ -1,8 +1,7 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.util.Map;
+import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.command.CreateVolumeCmd;
@@ -54,28 +53,28 @@ public Map<String, String> getDriverOpts() {
 
     @Override
     public CreateVolumeCmdImpl withName(String name) {
-        checkNotNull(name, "name was not specified");
+        Objects.requireNonNull(name, "name was not specified");
         this.name = name;
         return this;
     }
 
     @Override
     public CreateVolumeCmdImpl withLabels(Map<String, String> labels) {
-        checkNotNull(labels, "labels was not specified");
+        Objects.requireNonNull(labels, "labels was not specified");
         this.labels = labels;
         return this;
     }
 
     @Override
     public CreateVolumeCmdImpl withDriver(String driver) {
-        checkNotNull(driver, "driver was not specified");
+        Objects.requireNonNull(driver, "driver was not specified");
         this.driver = driver;
         return this;
     }
 
     @Override
     public CreateVolumeCmd withDriverOpts(Map<String, String> driverOpts) {
-        checkNotNull(driverOpts, "driverOpts was not specified");
+        Objects.requireNonNull(driverOpts, "driverOpts was not specified");
         this.driverOpts = driverOpts;
         return this;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
index d6cca6899..f578b3a19 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
@@ -1,9 +1,8 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.model.Event;
@@ -38,42 +37,42 @@ public EventsCmd withUntil(String until) {
 
     @Override
     public EventsCmd withContainerFilter(String... container) {
-        checkNotNull(container, "container have not been specified");
+        Objects.requireNonNull(container, "container have not been specified");
         this.filters.withContainers(container);
         return this;
     }
 
     @Override
     public EventsCmd withImageFilter(String... image) {
-        checkNotNull(image, "image have not been specified");
+        Objects.requireNonNull(image, "image have not been specified");
         this.filters.withImages(image);
         return this;
     }
 
     @Override
     public EventsCmd withEventFilter(String... event) {
-        checkNotNull(event, "event have not been specified");
+        Objects.requireNonNull(event, "event have not been specified");
         this.filters.withFilter("event", event);
         return this;
     }
 
     @Override
     public EventsCmd withEventTypeFilter(String... eventTypes) {
-        checkNotNull(eventTypes, "event types have not been specified");
+        Objects.requireNonNull(eventTypes, "event types have not been specified");
         this.filters.withEventTypes(eventTypes);
         return this;
     }
 
     @Override
     public EventsCmd withLabelFilter(String... label) {
-        checkNotNull(label, "label have not been specified");
+        Objects.requireNonNull(label, "label have not been specified");
         this.filters.withLabels(label);
         return this;
     }
 
     @Override
     public EventsCmd withLabelFilter(Map<String, String> labels) {
-        checkNotNull(labels, "labels have not been specified");
+        Objects.requireNonNull(labels, "labels have not been specified");
         this.filters.withLabels(labels);
         return this;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
index dc410f78b..8ea6e275f 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
@@ -1,8 +1,7 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.util.List;
+import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.command.ExecCreateCmd;
@@ -59,8 +58,7 @@ public ExecCreateCmdImpl(ExecCreateCmd.Exec exec, String containerId) {
 
     @Override
     public ExecCreateCmd withContainerId(String containerId) {
-        checkNotNull(containerId, "containerId was not specified");
-        this.containerId = containerId;
+        this.containerId = Objects.requireNonNull(containerId, "containerId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
index 9ab3bfb8e..d5990ef80 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
@@ -1,8 +1,7 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.io.InputStream;
+import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -37,8 +36,7 @@ public String getExecId() {
 
     @Override
     public ExecStartCmd withExecId(String execId) {
-        checkNotNull(execId, "execId was not specified");
-        this.execId = execId;
+        this.execId = Objects.requireNonNull(execId, "execId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectConfigCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectConfigCmdImpl.java
index 0fdef4a71..eff4170cb 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectConfigCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectConfigCmdImpl.java
@@ -1,11 +1,11 @@
 package com.github.dockerjava.core.command;
 
+import java.util.Objects;
+
 import com.github.dockerjava.api.command.InspectConfigCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Config;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Inspect the details of a config.
  */
@@ -25,8 +25,7 @@ public String getConfigId() {
 
     @Override
     public InspectConfigCmd withConfigId(String configId) {
-        checkNotNull(configId, "configId was not specified");
-        this.configId = configId;
+        this.configId = Objects.requireNonNull(configId, "configId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
index ed3c01b00..ab8c2989a 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectContainerResponse;
@@ -27,8 +27,7 @@ public String getContainerId() {
 
     @Override
     public InspectContainerCmd withContainerId(String containerId) {
-        checkNotNull(containerId, "containerId was not specified");
-        this.containerId = containerId;
+        this.containerId = Objects.requireNonNull(containerId, "containerId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
index 22d6d70f4..36ad73e28 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectExecCmdImpl.java
@@ -1,9 +1,10 @@
 package com.github.dockerjava.core.command;
 
+import java.util.Objects;
+
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectExecResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
-import com.google.common.base.Preconditions;
 
 public class InspectExecCmdImpl extends AbstrDockerCmd<InspectExecCmd, InspectExecResponse> implements InspectExecCmd {
     private String execId;
@@ -20,8 +21,7 @@ public String getExecId() {
 
     @Override
     public InspectExecCmd withExecId(String execId) {
-        Preconditions.checkNotNull(execId, "execId was not specified");
-        this.execId = execId;
+        this.execId = Objects.requireNonNull(execId, "execId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
index 48dd30757..5ffa7c5d7 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.InspectImageCmd;
 import com.github.dockerjava.api.command.InspectImageResponse;
@@ -26,8 +26,7 @@ public String getImageId() {
 
     @Override
     public InspectImageCmd withImageId(String imageId) {
-        checkNotNull(imageId, "imageId was not specified");
-        this.imageId = imageId;
+        this.imageId = Objects.requireNonNull(imageId, "imageId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java
index 5b7dcd895..804710ce1 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectServiceCmdImpl.java
@@ -1,11 +1,11 @@
 package com.github.dockerjava.core.command;
 
+import java.util.Objects;
+
 import com.github.dockerjava.api.command.InspectServiceCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Service;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Inspect the details of a container.
  */
@@ -26,8 +26,7 @@ public String getServiceId() {
 
     @Override
     public InspectServiceCmd withServiceId(String serviceId) {
-        checkNotNull(serviceId, "serviceId was not specified");
-        this.serviceId = serviceId;
+        this.serviceId = Objects.requireNonNull(serviceId, "serviceId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java
index bf5e5164f..9289878d1 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectSwarmNodeCmdImpl.java
@@ -6,7 +6,7 @@
 
 import javax.annotation.CheckForNull;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 /**
  * Inspect the details of a swarmNode.
@@ -29,8 +29,7 @@ public String getSwarmNodeId() {
 
     @Override
     public InspectSwarmNodeCmd withSwarmNodeId(String swarmNodeId) {
-        checkNotNull(swarmNodeId, "swarmNodeId was not specified");
-        this.swarmNodeId = swarmNodeId;
+        this.swarmNodeId = Objects.requireNonNull(swarmNodeId, "swarmNodeId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java
index c789d91c9..5b76310db 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/InspectVolumeCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.InspectVolumeCmd;
 import com.github.dockerjava.api.command.InspectVolumeResponse;
@@ -26,8 +26,7 @@ public String getName() {
 
     @Override
     public InspectVolumeCmd withName(String name) {
-        checkNotNull(name, "name was not specified");
-        this.name = name;
+        this.name = Objects.requireNonNull(name, "name was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
index a23d0caa5..bc7207829 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.KillContainerCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
@@ -29,15 +29,13 @@ public String getSignal() {
 
     @Override
     public KillContainerCmd withContainerId(String containerId) {
-        checkNotNull(containerId, "containerId was not specified");
-        this.containerId = containerId;
+        this.containerId = Objects.requireNonNull(containerId, "containerId was not specified");
         return this;
     }
 
     @Override
     public KillContainerCmd withSignal(String signal) {
-        checkNotNull(signal, "signal was not specified");
-        this.signal = signal;
+        this.signal = Objects.requireNonNull(signal, "signal was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListConfigsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListConfigsCmdImpl.java
index 9cd48e9a7..f67dd30b8 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListConfigsCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListConfigsCmdImpl.java
@@ -6,8 +6,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 /**
  * List configs.
@@ -26,8 +25,7 @@ public Map<String, List<String>> getFilters() {
     }
 
     public ListConfigsCmd withFilters(Map<String, List<String>> filters) {
-        checkNotNull(filters, "filters was not specified");
-        this.filters = filters;
+        this.filters = Objects.requireNonNull(filters, "filters was not specified");
         return this;
     }
 }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
index 0d0323a65..94de5daff 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
@@ -7,9 +7,9 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * List containers.
@@ -73,7 +73,7 @@ public ListContainersCmd withShowSize(Boolean showSize) {
 
     @Override
     public ListContainersCmd withLimit(Integer limit) {
-        checkNotNull(limit, "limit was not specified");
+        Objects.requireNonNull(limit, "limit was not specified");
         checkArgument(limit > 0, "limit must be greater 0");
         this.limit = limit;
         return this;
@@ -81,15 +81,13 @@ public ListContainersCmd withLimit(Integer limit) {
 
     @Override
     public ListContainersCmd withSince(String since) {
-        checkNotNull(since, "since was not specified");
-        this.sinceId = since;
+        this.sinceId = Objects.requireNonNull(since, "since was not specified");
         return this;
     }
 
     @Override
     public ListContainersCmd withBefore(String before) {
-        checkNotNull(before, "before was not specified");
-        this.beforeId = before;
+        this.beforeId = Objects.requireNonNull(before, "before was not specified");
         return this;
     }
 
@@ -125,28 +123,28 @@ public ListContainersCmd withLabelFilter(Collection<String> labels) {
 
     @Override
     public ListContainersCmd withLabelFilter(Map<String, String> labels) {
-        checkNotNull(labels, "labels was not specified");
+        Objects.requireNonNull(labels, "labels was not specified");
         this.filters.withLabels(labels);
         return this;
     }
 
     @Override
     public ListContainersCmd withExitedFilter(Integer exited) {
-        checkNotNull(exited, "exited was not specified");
+        Objects.requireNonNull(exited, "exited was not specified");
         this.filters.withFilter("exited", exited.toString());
         return this;
     }
 
     @Override
     public ListContainersCmd withFilter(String filterName, Collection<String> filterValues) {
-        checkNotNull(filterValues, filterName + " was not specified");
+        Objects.requireNonNull(filterValues, filterName + " was not specified");
         this.filters.withFilter(filterName, filterValues);
         return this;
     }
 
     @Override
     public ListContainersCmd withStatusFilter(Collection<String> status) {
-        checkNotNull(status, "status was not specified");
+        Objects.requireNonNull(status, "status was not specified");
         this.filters.withFilter("status", status);
         return this;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
index b4fb1e0d9..40d378c8c 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
@@ -1,11 +1,10 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -47,43 +46,43 @@ public ListImagesCmd withShowAll(Boolean showAll) {
 
     @Override
     public ListImagesCmd withDanglingFilter(Boolean dangling) {
-        checkNotNull(dangling, "dangling have not been specified");
+        Objects.requireNonNull(dangling, "dangling have not been specified");
         withFilter("dangling", Collections.singletonList(dangling.toString()));
         return this;
     }
 
     @Override
     public ListImagesCmd withLabelFilter(String... labels) {
-        checkNotNull(labels, "labels have not been specified");
+        Objects.requireNonNull(labels, "labels have not been specified");
         filters.withLabels(labels);
         return this;
     }
 
     @Override
     public ListImagesCmd withLabelFilter(Map<String, String> labels) {
-        checkNotNull(labels, "labels have not been specified");
+        Objects.requireNonNull(labels, "labels have not been specified");
         filters.withLabels(labels);
         return this;
     }
 
     @Override
     public ListImagesCmd withImageNameFilter(String imageNameFilter) {
-        checkNotNull(imageNameFilter, "image name filter not specified");
+        Objects.requireNonNull(imageNameFilter, "image name filter not specified");
         this.imageNameFilter = imageNameFilter;
         return this;
     }
 
     @Override
     public ListImagesCmd withReferenceFilter(String reference) {
-        checkNotNull(reference, "reference filter not specified");
+        Objects.requireNonNull(reference, "reference filter not specified");
         withFilter("reference", Collections.singletonList(reference));
         return this;
     }
 
     @Override
     public ListImagesCmd withFilter(String key, Collection<String> values) {
-        checkNotNull(key, "key not specified");
-        checkNotNull(values, "values not specified");
+        Objects.requireNonNull(key, "key not specified");
+        Objects.requireNonNull(values, "values not specified");
         filters.withFilter(key, values);
         return this;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java
index 65c13e255..b3be94b8e 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListNetworksCmdImpl.java
@@ -7,8 +7,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 public class ListNetworksCmdImpl extends AbstrDockerCmd<ListNetworksCmd, List<Network>> implements ListNetworksCmd {
 
@@ -37,7 +36,7 @@ public ListNetworksCmd withNameFilter(String... networkName) {
 
     @Override
     public ListNetworksCmd withFilter(String filterName, Collection<String> filterValues) {
-        checkNotNull(filterValues, filterName + " was not specified");
+        Objects.requireNonNull(filterValues, filterName + " was not specified");
         this.filtersBuilder.withFilter(filterName, filterValues);
         return this;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java
index 5c11a7a19..bed3f9e51 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSecretsCmdImpl.java
@@ -6,8 +6,7 @@
 
 import java.util.List;
 import java.util.Map;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 /**
  * List services.
@@ -28,21 +27,21 @@ public Map<String, List<String>> getFilters() {
 
     @Override
     public ListSecretsCmd withIdFilter(List<String> ids) {
-        checkNotNull(ids, "ids was not specified");
+        Objects.requireNonNull(ids, "ids was not specified");
         this.filters.withFilter("id", ids);
         return this;
     }
 
     @Override
     public ListSecretsCmd withNameFilter(List<String> names) {
-        checkNotNull(names, "names was not specified");
+        Objects.requireNonNull(names, "names was not specified");
         this.filters.withFilter("name", names);
         return this;
     }
 
     @Override
     public ListSecretsCmd withLabelFilter(Map<String, String> labels) {
-        checkNotNull(labels, "labels was not specified");
+        Objects.requireNonNull(labels, "labels was not specified");
         this.filters.withLabels(labels);
         return this;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java
index c68a0f6d7..1245d14b3 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListServicesCmdImpl.java
@@ -6,8 +6,7 @@
 
 import java.util.List;
 import java.util.Map;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 /**
  * List services.
@@ -28,21 +27,21 @@ public Map<String, List<String>> getFilters() {
 
     @Override
     public ListServicesCmd withIdFilter(List<String> ids) {
-        checkNotNull(ids, "ids was not specified");
+        Objects.requireNonNull(ids, "ids was not specified");
         this.filters.withFilter("id", ids);
         return this;
     }
 
     @Override
     public ListServicesCmd withNameFilter(List<String> names) {
-        checkNotNull(names, "names was not specified");
+        Objects.requireNonNull(names, "names was not specified");
         this.filters.withFilter("name", names);
         return this;
     }
 
     @Override
     public ListServicesCmd withLabelFilter(Map<String, String> labels) {
-        checkNotNull(labels, "labels was not specified");
+        Objects.requireNonNull(labels, "labels was not specified");
         this.filters.withLabels(labels);
         return this;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java
index 88a06ae04..a35751627 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListSwarmNodesCmdImpl.java
@@ -7,8 +7,7 @@
 
 import java.util.List;
 import java.util.Map;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 /**
  * List SwarmNodes
@@ -29,28 +28,28 @@ public Map<String, List<String>> getFilters() {
 
     @Override
     public ListSwarmNodesCmd withIdFilter(List<String> ids) {
-        checkNotNull(ids, "ids was not specified");
+        Objects.requireNonNull(ids, "ids was not specified");
         this.filters.withIds(ids);
         return this;
     }
 
     @Override
     public ListSwarmNodesCmd withNameFilter(List<String> names) {
-        checkNotNull(names, "names was not specified");
+        Objects.requireNonNull(names, "names was not specified");
         this.filters.withNames(names);
         return this;
     }
 
     @Override
     public ListSwarmNodesCmd withMembershipFilter(List<String> memberships) {
-        checkNotNull(memberships, "memberships was not specified");
+        Objects.requireNonNull(memberships, "memberships was not specified");
         this.filters.withMemberships(memberships);
         return this;
     }
 
     @Override
     public ListSwarmNodesCmd withRoleFilter(List<String> roles) {
-        checkNotNull(roles, "roles was not specified");
+        Objects.requireNonNull(roles, "roles was not specified");
         this.filters.withRoles(roles);
         return this;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java
index b3a18d776..78d39c2c7 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ListVolumesCmdImpl.java
@@ -1,10 +1,9 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.ListVolumesCmd;
 import com.github.dockerjava.api.command.ListVolumesResponse;
@@ -30,14 +29,14 @@ public Map<String, List<String>> getFilters() {
 
     @Override
     public ListVolumesCmd withDanglingFilter(Boolean dangling) {
-        checkNotNull(dangling, "dangling have not been specified");
+        Objects.requireNonNull(dangling, "dangling have not been specified");
         this.filters.withFilter("dangling", dangling.toString());
         return this;
     }
 
     @Override
     public ListVolumesCmd withFilter(String filterName, Collection<String> filterValues) {
-        checkNotNull(filterValues, filterName + " was not specified");
+        Objects.requireNonNull(filterValues, filterName + " was not specified");
         this.filters.withFilter(filterName, filterValues);
         return this;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageAsyncCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageAsyncCmdImpl.java
index 92311b4bf..3de1dfa4d 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageAsyncCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageAsyncCmdImpl.java
@@ -5,8 +5,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 public class LoadImageAsyncCmdImpl extends AbstrAsyncDockerCmd<LoadImageAsyncCmd, LoadResponseItem> implements LoadImageAsyncCmd {
 
@@ -24,7 +23,7 @@ public InputStream getImageStream() {
 
     @Override
     public LoadImageAsyncCmd withImageStream(InputStream imageStream) {
-        checkNotNull(imageStream, "imageStream was not specified");
+        Objects.requireNonNull(imageStream, "imageStream was not specified");
         this.inputStream = imageStream;
         return this;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java
index 496ea3176..0b8cbea94 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LoadImageCmdImpl.java
@@ -1,8 +1,7 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.io.InputStream;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.LoadImageCmd;
 
@@ -32,8 +31,7 @@ public InputStream getImageStream() {
      */
     @Override
     public LoadImageCmdImpl withImageStream(@Nonnull InputStream imageStream) {
-        checkNotNull(imageStream, "imageStream was not specified");
-        this.imageStream = imageStream;
+        this.imageStream = Objects.requireNonNull(imageStream, "imageStream was not specified");
         return this;
     }
 }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
index d820ab1b9..65321a318 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -82,8 +82,7 @@ public Integer getUntil() {
 
     @Override
     public LogContainerCmd withContainerId(String containerId) {
-        checkNotNull(containerId, "containerId was not specified");
-        this.containerId = containerId;
+        this.containerId = Objects.requireNonNull(containerId, "containerId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
index a8caf3091..f646e8ced 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.PauseContainerCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
@@ -28,8 +28,7 @@ public String getContainerId() {
 
     @Override
     public PauseContainerCmd withContainerId(String containerId) {
-        checkNotNull(containerId, "containerId was not specified");
-        this.containerId = containerId;
+        this.containerId = Objects.requireNonNull(containerId, "containerId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java
index a191099ed..e08f64b02 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PruneCmdImpl.java
@@ -9,8 +9,7 @@
 import javax.annotation.Nonnull;
 import java.util.List;
 import java.util.Map;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 /**
  * Delete unused content (containers, images, volumes, networks, build relicts)
@@ -69,28 +68,28 @@ public Map<String, List<String>> getFilters() {
 
     @Override
     public PruneCmd withPruneType(final PruneType pruneType) {
-        checkNotNull(pruneType, "pruneType has not been specified");
+        Objects.requireNonNull(pruneType, "pruneType has not been specified");
         this.pruneType = pruneType;
         return this;
     }
 
     @Override
     public PruneCmd withDangling(Boolean dangling) {
-        checkNotNull(dangling, "dangling has not been specified");
+        Objects.requireNonNull(dangling, "dangling has not been specified");
         filters.withFilter("dangling", dangling ? "1" : "0");
         return this;
     }
 
     @Override
     public PruneCmd withUntilFilter(final String until) {
-        checkNotNull(until, "until has not been specified");
+        Objects.requireNonNull(until, "until has not been specified");
         filters.withUntil(until);
         return this;
     }
 
     @Override
     public PruneCmd withLabelFilter(final String... labels) {
-        checkNotNull(labels, "labels have not been specified");
+        Objects.requireNonNull(labels, "labels have not been specified");
         filters.withLabels(labels);
         return this;
     }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
index a3395c21b..7f70ac3b7 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
@@ -1,11 +1,11 @@
 package com.github.dockerjava.core.command;
 
+import java.util.Objects;
+
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PullResponseItem;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  *
  * Pull image from repository.
@@ -54,15 +54,13 @@ public String getRegistry() {
 
     @Override
     public PullImageCmd withRepository(String repository) {
-        checkNotNull(repository, "repository was not specified");
-        this.repository = repository;
+        this.repository = Objects.requireNonNull(repository, "repository was not specified");
         return this;
     }
 
     @Override
     public PullImageCmd withTag(String tag) {
-        checkNotNull(tag, "tag was not specified");
-        this.tag = tag;
+        this.tag = Objects.requireNonNull(tag, "tag was not specified");
         return this;
     }
 
@@ -74,8 +72,7 @@ public PullImageCmd withPlatform(String platform) {
 
     @Override
     public PullImageCmd withRegistry(String registry) {
-        checkNotNull(registry, "registry was not specified");
-        this.registry = registry;
+        this.registry = Objects.requireNonNull(registry, "registry was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
index b3026c841..8e1fa5cec 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.PushImageCmd;
 import com.github.dockerjava.api.model.AuthConfig;
@@ -42,8 +42,7 @@ public String getTag() {
      */
     @Override
     public PushImageCmd withName(String name) {
-        checkNotNull(name, "name was not specified");
-        this.name = name;
+        this.name = Objects.requireNonNull(name, "name was not specified");
         return this;
     }
 
@@ -53,8 +52,7 @@ public PushImageCmd withName(String name) {
      */
     @Override
     public PushImageCmd withTag(String tag) {
-        checkNotNull(tag, "tag was not specified");
-        this.tag = tag;
+        this.tag = Objects.requireNonNull(tag, "tag was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveConfigCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveConfigCmdImpl.java
index 32203cfe2..e2e7d06fd 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveConfigCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveConfigCmdImpl.java
@@ -1,10 +1,10 @@
 package com.github.dockerjava.core.command;
 
+import java.util.Objects;
+
 import com.github.dockerjava.api.command.RemoveConfigCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Remove a config.
  */
@@ -24,8 +24,7 @@ public String getConfigId() {
 
     @Override
     public RemoveConfigCmd withConfigId(String configId) {
-        checkNotNull(configId, "configId was not specified");
-        this.configId = configId;
+        this.configId = Objects.requireNonNull(configId, "configId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
index 0fc2ab626..cd8f4a9f3 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.RemoveContainerCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
@@ -41,8 +41,7 @@ public Boolean hasForceEnabled() {
 
     @Override
     public RemoveContainerCmd withContainerId(String containerId) {
-        checkNotNull(containerId, "containerId was not specified");
-        this.containerId = containerId;
+        this.containerId = Objects.requireNonNull(containerId, "containerId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
index 038a27f2d..a77357b59 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.RemoveImageCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
@@ -38,8 +38,7 @@ public Boolean hasNoPruneEnabled() {
 
     @Override
     public RemoveImageCmd withImageId(String imageId) {
-        checkNotNull(imageId, "imageId was not specified");
-        this.imageId = imageId;
+        this.imageId = Objects.requireNonNull(imageId, "imageId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java
index 6841d79bd..5c8d0e075 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSecretCmdImpl.java
@@ -3,7 +3,7 @@
 import com.github.dockerjava.api.command.RemoveSecretCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 /**
  * Remove a secret.
@@ -24,8 +24,7 @@ public String getSecretId() {
 
     @Override
     public RemoveSecretCmd withSecretId(String secretId) {
-        checkNotNull(secretId, "secretId was not specified");
-        this.secretId = secretId;
+        this.secretId = Objects.requireNonNull(secretId, "secretId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java
index 9da85847a..6fed721c7 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveServiceCmdImpl.java
@@ -3,7 +3,7 @@
 import com.github.dockerjava.api.command.RemoveServiceCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 /**
  * Remove a service.
@@ -24,8 +24,7 @@ public String getServiceId() {
 
     @Override
     public RemoveServiceCmd withServiceId(String serviceId) {
-        checkNotNull(serviceId, "serviceId was not specified");
-        this.serviceId = serviceId;
+        this.serviceId = Objects.requireNonNull(serviceId, "serviceId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java
index e3efea938..ef8a86943 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveSwarmNodeCmdImpl.java
@@ -3,11 +3,11 @@
 import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
 
+import java.util.Objects;
+
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Remove a container.
  */
@@ -36,8 +36,7 @@ public Boolean hasForceEnabled() {
 
     @Override
     public RemoveSwarmNodeCmd withSwarmNodeId(@Nonnull String swarmNodeId) {
-        checkNotNull(swarmNodeId, "swarmNodeId was not specified");
-        this.swarmNodeId = swarmNodeId;
+        this.swarmNodeId = Objects.requireNonNull(swarmNodeId, "swarmNodeId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java
index ee294a130..c62316842 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RemoveVolumeCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.RemoveVolumeCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
@@ -26,8 +26,7 @@ public String getName() {
 
     @Override
     public RemoveVolumeCmd withName(String name) {
-        checkNotNull(name, "name was not specified");
-        this.name = name;
+        this.name = Objects.requireNonNull(name, "name was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java
index ebf3ebabf..b146382f3 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RenameContainerCmdImpl.java
@@ -5,7 +5,7 @@
 
 import javax.annotation.Nonnull;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 public class RenameContainerCmdImpl extends AbstrDockerCmd<RenameContainerCmd, Void> implements RenameContainerCmd {
 
@@ -30,15 +30,13 @@ public String getName() {
 
     @Override
     public RenameContainerCmd withContainerId(@Nonnull String containerId) {
-        checkNotNull(containerId, "containerId was not specified");
-        this.containerId = containerId;
+        this.containerId = Objects.requireNonNull(containerId, "containerId was not specified");
         return this;
     }
 
     @Override
     public RenameContainerCmd withName(@Nonnull String name) {
-        checkNotNull(name, "name was not specified");
-        this.name = name;
+        this.name = Objects.requireNonNull(name, "name was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeContainerCmdImpl.java
index de1b6ac20..188802a41 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeContainerCmdImpl.java
@@ -3,7 +3,7 @@
 import com.github.dockerjava.api.command.ResizeContainerCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 public class ResizeContainerCmdImpl extends AbstrDockerCmd<ResizeContainerCmd, Void> implements ResizeContainerCmd {
 
@@ -35,8 +35,7 @@ public Integer getWidth() {
 
     @Override
     public ResizeContainerCmd withContainerId(String containerId) {
-        checkNotNull(containerId, "containerId was not specified");
-        this.containerId = containerId;
+        this.containerId = Objects.requireNonNull(containerId, "containerId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeExecCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeExecCmdImpl.java
index 80b1fef88..3aa02c7e9 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeExecCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ResizeExecCmdImpl.java
@@ -1,10 +1,10 @@
 package com.github.dockerjava.core.command;
 
+import java.util.Objects;
+
 import com.github.dockerjava.api.command.ResizeExecCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 public class ResizeExecCmdImpl extends AbstrDockerCmd<ResizeExecCmd, Void> implements ResizeExecCmd {
 
     private String execId;
@@ -35,8 +35,7 @@ public Integer getWidth() {
 
     @Override
     public ResizeExecCmd withExecId(String execId) {
-        checkNotNull(execId, "execId was not specified");
-        this.execId = execId;
+        this.execId = Objects.requireNonNull(execId, "execId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
index 7d0bf413e..03454d6a8 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
@@ -1,7 +1,8 @@
 package com.github.dockerjava.core.command;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
@@ -36,14 +37,14 @@ public Integer getTimeout() {
 
     @Override
     public RestartContainerCmd withContainerId(String containerId) {
-        checkNotNull(containerId, "containerId was not specified");
+        Objects.requireNonNull(containerId, "containerId was not specified");
         this.containerId = containerId;
         return this;
     }
 
     @Override
     public RestartContainerCmd withTimeout(Integer timeout) {
-        checkNotNull(timeout, "timeout was not specified");
+        Objects.requireNonNull(timeout, "timeout was not specified");
         checkArgument(timeout >= 0, "timeout must be greater or equal 0");
         this.timeout = timeout;
         return this;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
index 333e32df7..0ec72bcc5 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
@@ -1,8 +1,7 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.io.InputStream;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
@@ -33,8 +32,7 @@ public String getTag() {
      */
     @Override
     public SaveImageCmd withName(String name) {
-        checkNotNull(name, "name was not specified");
-        this.name = name;
+        this.name = Objects.requireNonNull(name, "name was not specified");
         return this;
     }
 
@@ -44,8 +42,7 @@ public SaveImageCmd withName(String name) {
      */
     @Override
     public SaveImageCmd withTag(String tag) {
-        checkNotNull(tag, "tag was not specified");
-        this.tag = tag;
+        this.tag = Objects.requireNonNull(tag, "tag was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImagesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImagesCmdImpl.java
index 0563e16fe..43e11f609 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImagesCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SaveImagesCmdImpl.java
@@ -7,8 +7,7 @@
 import javax.annotation.Nonnull;
 import java.io.InputStream;
 import java.util.List;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 public class SaveImagesCmdImpl extends AbstrDockerCmd<SaveImagesCmd, InputStream> implements SaveImagesCmd {
 
@@ -17,10 +16,8 @@ private static class TaggedImageImpl implements TaggedImage {
         private final String tag;
 
         private TaggedImageImpl(String name, String tag) {
-            checkNotNull(name, "image name was not specified");
-            checkNotNull(tag, "image tag was not specified");
-            this.name = name;
-            this.tag = tag;
+            this.name = Objects.requireNonNull(name, "image name was not specified");
+            this.tag = Objects.requireNonNull(tag, "image tag was not specified");
         }
 
         @Override
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
index dab946b1c..41b8cc844 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
@@ -1,9 +1,9 @@
 package com.github.dockerjava.core.command;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.List;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.SearchImagesCmd;
 import com.github.dockerjava.api.model.SearchItem;
@@ -37,8 +37,7 @@ public String getTerm() {
 
     @Override
     public SearchImagesCmd withTerm(String term) {
-        checkNotNull(term, "term was not specified");
-        this.term = term;
+        this.term = Objects.requireNonNull(term, "term was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
index c159c920e..2c0e2c2b8 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.github.dockerjava.api.command.StartContainerCmd;
@@ -22,8 +22,7 @@ public StartContainerCmdImpl(StartContainerCmd.Exec exec, String containerId) {
 
     @Override
     public StartContainerCmd withContainerId(String containerId) {
-        checkNotNull(containerId, "containerId was not specified");
-        this.containerId = containerId;
+        this.containerId = Objects.requireNonNull(containerId, "containerId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
index e1cc86e68..3e24bd5af 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.StatsCmd;
 import com.github.dockerjava.api.model.Statistics;
@@ -21,8 +21,7 @@ public StatsCmdImpl(StatsCmd.Exec exec, String containerId) {
 
     @Override
     public StatsCmd withContainerId(String containerId) {
-        checkNotNull(containerId, "containerId was not specified");
-        this.containerId = containerId;
+        this.containerId = Objects.requireNonNull(containerId, "containerId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
index 7b1e165f5..2cf5e37ae 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
@@ -1,7 +1,8 @@
 package com.github.dockerjava.core.command;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.StopContainerCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
@@ -39,14 +40,13 @@ public Integer getTimeout() {
 
     @Override
     public StopContainerCmd withContainerId(String containerId) {
-        checkNotNull(containerId, "containerId was not specified");
-        this.containerId = containerId;
+        this.containerId = Objects.requireNonNull(containerId, "containerId was not specified");
         return this;
     }
 
     @Override
     public StopContainerCmd withTimeout(Integer timeout) {
-        checkNotNull(timeout, "timeout was not specified");
+        Objects.requireNonNull(timeout, "timeout was not specified");
         checkArgument(timeout >= 0, "timeout must be greater or equal 0");
         this.timeout = timeout;
         return this;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
index c1337112d..f7eebb8a4 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.TagImageCmd;
 
@@ -50,22 +50,19 @@ public Boolean hasForceEnabled() {
 
     @Override
     public TagImageCmd withImageId(String imageId) {
-        checkNotNull(imageId, "imageId was not specified");
-        this.imageId = imageId;
+        this.imageId = Objects.requireNonNull(imageId, "imageId was not specified");
         return this;
     }
 
     @Override
     public TagImageCmd withRepository(String repository) {
-        checkNotNull(repository, "repository was not specified");
-        this.repository = repository;
+        this.repository = Objects.requireNonNull(repository, "repository was not specified");
         return this;
     }
 
     @Override
     public TagImageCmd withTag(String tag) {
-        checkNotNull(tag, "tag was not specified");
-        this.tag = tag;
+        this.tag = Objects.requireNonNull(tag, "tag was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
index 19faed3f2..5f5eee8d0 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.TopContainerCmd;
 import com.github.dockerjava.api.command.TopContainerResponse;
@@ -33,15 +33,13 @@ public String getPsArgs() {
 
     @Override
     public TopContainerCmd withContainerId(String containerId) {
-        checkNotNull(containerId, "containerId was not specified");
-        this.containerId = containerId;
+        this.containerId = Objects.requireNonNull(containerId, "containerId was not specified");
         return this;
     }
 
     @Override
     public TopContainerCmd withPsArgs(String psArgs) {
-        checkNotNull(psArgs, "psArgs was not specified");
-        this.psArgs = psArgs;
+        this.psArgs = Objects.requireNonNull(psArgs, "psArgs was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
index 26e9992b0..ef94c1979 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
@@ -28,8 +28,7 @@ public String getContainerId() {
 
     @Override
     public UnpauseContainerCmd withContainerId(String containerId) {
-        checkNotNull(containerId, "containerId was not specified");
-        this.containerId = containerId;
+        this.containerId = Objects.requireNonNull(containerId, "containerId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java
index d1eefcae2..372cd34ce 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateSwarmCmdImpl.java
@@ -1,11 +1,11 @@
 package com.github.dockerjava.core.command;
 
 
+import java.util.Objects;
+
 import com.github.dockerjava.api.command.UpdateSwarmCmd;
 import com.github.dockerjava.api.model.SwarmSpec;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Update a swarm.
  */
@@ -62,8 +62,7 @@ public SwarmSpec getSwarmSpec() {
 
     @Override
     public UpdateSwarmCmd withSwarmSpec(SwarmSpec swarmSpec) {
-        checkNotNull(swarmSpec, "swarmSpec was not specified");
-        this.swarmSpec = swarmSpec;
+        this.swarmSpec = Objects.requireNonNull(swarmSpec, "swarmSpec was not specified");
         return this;
     }
 }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
index eeb05ff60..91b2255bc 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 import com.github.dockerjava.api.command.WaitContainerCmd;
 import com.github.dockerjava.api.model.WaitResponse;
@@ -27,8 +27,7 @@ public String getContainerId() {
 
     @Override
     public WaitContainerCmd withContainerId(String containerId) {
-        checkNotNull(containerId, "containerId was not specified");
-        this.containerId = containerId;
+        this.containerId = Objects.requireNonNull(containerId, "containerId was not specified");
         return this;
     }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
index d1d2adc3e..ad7f285f4 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/AbstrDockerCmdExec.java
@@ -13,10 +13,10 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import java.io.IOException;
+import java.util.Objects;
 
 import static com.github.dockerjava.core.RemoteApiVersion.UNKNOWN_VERSION;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_19;
-import static com.google.common.base.Preconditions.checkNotNull;
 
 public abstract class AbstrDockerCmdExec {
 
@@ -25,10 +25,8 @@ public abstract class AbstrDockerCmdExec {
     private final transient WebTarget baseResource;
 
     public AbstrDockerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
-        checkNotNull(baseResource, "baseResource was not specified");
-        checkNotNull(dockerClientConfig, "dockerClientConfig was not specified");
-        this.baseResource = baseResource;
-        this.dockerClientConfig = dockerClientConfig;
+        this.baseResource = Objects.requireNonNull(baseResource, "baseResource was not specified");
+        this.dockerClientConfig = Objects.requireNonNull(dockerClientConfig, "dockerClientConfig was not specified");
     }
 
     protected WebTarget getBaseResource() {
diff --git a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
index cd122b3bc..ed66a6db8 100644
--- a/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
+++ b/docker-java-transport-netty/src/main/java/com/github/dockerjava/netty/NettyDockerCmdExecFactory.java
@@ -1,6 +1,5 @@
 package com.github.dockerjava.netty;
 
-import static com.google.common.base.Preconditions.checkNotNull;
 import static java.util.Objects.nonNull;
 
 import java.io.IOException;
@@ -9,6 +8,7 @@
 import java.net.SocketAddress;
 import java.net.SocketTimeoutException;
 import java.security.Security;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.SSLEngine;
@@ -284,7 +284,7 @@ public SSLParameters enableHostNameVerification(SSLParameters sslParameters) {
 
     @Override
     public void close() throws IOException {
-        checkNotNull(eventLoopGroup, "Factory not initialized. You probably forgot to call init()!");
+        Objects.requireNonNull(eventLoopGroup, "Factory not initialized. You probably forgot to call init()!");
 
         eventLoopGroup.shutdownGracefully();
     }
@@ -331,7 +331,7 @@ protected synchronized void channelIdle(ChannelHandlerContext ctx, IdleStateEven
     }
 
     protected WebTarget getBaseResource() {
-        checkNotNull(baseResource, "Factory not initialized, baseResource not set. You probably forgot to call init()!");
+        Objects.requireNonNull(baseResource, "Factory not initialized, baseResource not set. You probably forgot to call init()!");
         return baseResource;
     }
 }

From dddd439ceb3fd95e1bde7fd65fcdbd6424670627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Wielgo=C5=82aski?= <piotr.wielgolaski@tomtom.com>
Date: Mon, 29 May 2023 20:50:47 +0200
Subject: [PATCH 1132/1272] Support TLS configuration from docker context
 (#2105)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../core/DefaultDockerClientConfig.java       | 39 +++++++++++++------
 .../core/DockerContextMetaFile.java           | 14 ++++---
 .../core/DefaultDockerClientConfigTest.java   | 20 ++++++++++
 .../meta.json                                 | 15 +++++++
 4 files changed, 71 insertions(+), 17 deletions(-)
 create mode 100644 docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/meta.json

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index b4e1aa0a5..8a1f6193a 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -441,7 +441,33 @@ public final Builder withCustomSslConfig(SSLConfig customSslConfig) {
             return this;
         }
 
+        private void applyContextConfiguration(final String context) {
+            final Optional<DockerContextMetaFile> dockerContextMetaFile =
+                Optional.ofNullable(context)
+                    .flatMap(ctx -> DockerContextMetaFile.resolveContextMetaFile(DockerClientConfig.getDefaultObjectMapper(),
+                            new File(this.dockerConfig), ctx));
+
+            if (dockerContextMetaFile.isPresent()) {
+                final Optional<DockerContextMetaFile.Endpoints.Docker> dockerEndpoint =
+                    dockerContextMetaFile.map(metaFile -> metaFile.endpoints).map(endpoint -> endpoint.docker);
+                if (this.dockerHost == null) {
+                    this.dockerHost = dockerEndpoint.map(endpoint -> endpoint.host).map(URI::create).orElse(null);
+                }
+                if (this.dockerCertPath == null) {
+                    this.dockerCertPath = dockerContextMetaFile.map(metaFile -> metaFile.storage)
+                        .map(storage -> storage.tlsPath)
+                        .filter(file -> new File(file).exists()).orElse(null);
+                    if (this.dockerCertPath != null) {
+                        this.dockerTlsVerify = dockerEndpoint.map(endpoint -> !endpoint.skipTLSVerify).orElse(true);
+                    }
+                }
+            }
+        }
+
         public DefaultDockerClientConfig build() {
+            final DockerConfigFile dockerConfigFile = readDockerConfig();
+            final String context = (dockerContext != null) ? dockerContext : dockerConfigFile.getCurrentContext();
+            applyContextConfiguration(context);
 
             SSLConfig sslConfig = null;
 
@@ -454,12 +480,9 @@ public DefaultDockerClientConfig build() {
                 sslConfig = customSslConfig;
             }
 
-            final DockerConfigFile dockerConfigFile = readDockerConfig();
-
-            final String context = (dockerContext != null) ? dockerContext : dockerConfigFile.getCurrentContext();
             URI dockerHostUri = dockerHost != null
                 ? dockerHost
-                : resolveDockerHost(context);
+                : URI.create(SystemUtils.IS_OS_WINDOWS ? WINDOWS_DEFAULT_DOCKER_HOST : DEFAULT_DOCKER_HOST);
 
             return new DefaultDockerClientConfig(dockerHostUri, dockerConfigFile, dockerConfig, apiVersion, registryUrl, registryUsername,
                     registryPassword, registryEmail, sslConfig);
@@ -473,14 +496,6 @@ private DockerConfigFile readDockerConfig() {
             }
         }
 
-        private URI resolveDockerHost(String dockerContext) {
-            return URI.create(Optional.ofNullable(dockerContext)
-                .flatMap(context -> DockerContextMetaFile.resolveContextMetaFile(
-                    DockerClientConfig.getDefaultObjectMapper(), new File(dockerConfig), context))
-                .flatMap(DockerContextMetaFile::host)
-                .orElse(SystemUtils.IS_OS_WINDOWS ? WINDOWS_DEFAULT_DOCKER_HOST : DEFAULT_DOCKER_HOST));
-        }
-
         private String checkDockerCertPath(String dockerCertPath) {
             if (StringUtils.isEmpty(dockerCertPath)) {
                 throw new DockerClientException(
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java
index a52304c8e..d74c4949f 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java
@@ -18,6 +18,9 @@ public class DockerContextMetaFile {
     @JsonProperty("Endpoints")
     Endpoints endpoints;
 
+    @JsonProperty("Storage")
+    Storage storage;
+
     public static class Endpoints {
         @JsonProperty("docker")
         Docker docker;
@@ -31,11 +34,12 @@ public static class Docker {
         }
     }
 
-    public Optional<String> host() {
-        if (endpoints != null && endpoints.docker != null) {
-            return Optional.ofNullable(endpoints.docker.host);
-        }
-        return Optional.empty();
+    public static class Storage {
+
+        @JsonProperty("TLSPath")
+        String tlsPath;
+        @JsonProperty("MetadataPath")
+        String metadataPath;
     }
 
     public static Optional<DockerContextMetaFile> resolveContextMetaFile(ObjectMapper objectMapper, File dockerConfigPath, String context) {
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
index b1def2409..7e03a9159 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
@@ -23,6 +23,7 @@
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 public class DefaultDockerClientConfigTest {
 
@@ -113,6 +114,25 @@ public void dockerContextFromEnvironmentVariable() {
         assertEquals(URI.create("unix:///envvarcontext.sock"), config.getDockerHost());
     }
 
+    @Test
+    public void dockerContextWithDockerHostAndTLS() {
+        // given home directory with docker contexts
+        Properties systemProperties = new Properties();
+        systemProperties.setProperty("user.home", "target/test-classes/dockerContextHomeDir");
+
+        // and an environment variable that overrides docker context
+        Map<String, String> env = new HashMap<>();
+        env.put(DefaultDockerClientConfig.DOCKER_CONTEXT, "remote");
+
+        // when you build a config
+        DefaultDockerClientConfig config = buildConfig(env, systemProperties);
+
+        assertEquals(URI.create("tcp://remote:2376"), config.getDockerHost());
+        assertTrue("SSL config is set", config.getSSLConfig() instanceof LocalDirectorySSLConfig);
+        assertEquals("target/test-classes/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist",
+            ((LocalDirectorySSLConfig)config.getSSLConfig()).getDockerCertPath());
+    }
+
     @Test
     public void environment() {
 
diff --git a/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/meta.json b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/meta.json
new file mode 100644
index 000000000..a4ff5b460
--- /dev/null
+++ b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/meta/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/meta.json
@@ -0,0 +1,15 @@
+{
+    "Name": "remote",
+    "Metadata": {
+        "Description": "remote"
+    },
+    "Endpoints": {
+        "docker": {
+            "Host": "tcp://remote:2376",
+            "SkipTLSVerify": false
+        }
+    },
+    "Storage": {
+        "TLSPath": "target/test-classes/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist"
+    }
+}

From a1243d6493ed6c367c232edff23d9ea68e56ae40 Mon Sep 17 00:00:00 2001
From: belugabehr <12578579+belugabehr@users.noreply.github.com>
Date: Mon, 19 Jun 2023 10:49:44 -0400
Subject: [PATCH 1133/1272] Use anchor instead of building toString() for debug
 logging (#2035)

---
 .../github/dockerjava/api/command/BuildImageResultCallback.java | 2 +-
 .../com/github/dockerjava/api/command/LoadImageCallback.java    | 2 +-
 .../github/dockerjava/api/command/PullImageResultCallback.java  | 2 +-
 .../dockerjava/api/command/WaitContainerResultCallback.java     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java
index 0bb0f0884..331f69509 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java
@@ -31,7 +31,7 @@ public void onNext(BuildResponseItem item) {
         } else if (item.isErrorIndicated()) {
             this.error = item.getError();
         }
-        LOGGER.debug(item.toString());
+        LOGGER.debug("{}", item);
     }
 
     /**
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCallback.java
index 741598465..80cca18de 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCallback.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCallback.java
@@ -22,7 +22,7 @@ public void onNext(LoadResponseItem item) {
             this.error = item.getError();
         }
 
-        LOGGER.debug(item.toString());
+        LOGGER.debug("{}", item);
     }
 
     public String awaitMessage() {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java
index a4e9e9f9b..5980ce3df 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageResultCallback.java
@@ -41,7 +41,7 @@ public void onNext(PullResponseItem item) {
             handleDockerClientResponse(item);
         }
 
-        LOGGER.debug(item.toString());
+        LOGGER.debug("{}", item);
     }
 
     private void checkForDockerSwarmResponse(PullResponseItem item) {
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerResultCallback.java
index b4a6d3cc6..6cb160151 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerResultCallback.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerResultCallback.java
@@ -27,7 +27,7 @@ public class WaitContainerResultCallback extends ResultCallbackTemplate<WaitCont
     @Override
     public void onNext(WaitResponse waitResponse) {
         this.waitResponse = waitResponse;
-        LOGGER.debug(waitResponse.toString());
+        LOGGER.debug("{}", waitResponse);
     }
 
     /**

From dd0de7c83c8a2691d96c50edbf5c48f1bced0c7c Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Mon, 19 Jun 2023 11:18:07 -0400
Subject: [PATCH 1134/1272] Handle repoNames with tags (#2128)

Fixes #2127
---
 .../github/dockerjava/core/NameParser.java    | 12 ++++++
 .../dockerjava/core/NameParserTest.java       | 43 ++++++++++++++++++-
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java b/docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java
index ae39029ed..f06adb6d8 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/NameParser.java
@@ -22,6 +22,7 @@ private NameParser() {
     private static final int RepositoryNameTotalLengthMax = 255;
 
     private static final String SHA256_SEPARATOR = "@sha256:";
+    private static final String COLON_SEPARATOR = ":";
 
     private static final Pattern RepositoryNameComponentRegexp = Pattern.compile("[a-z0-9]+(?:[._-][a-z0-9]+)*");
 
@@ -106,6 +107,13 @@ public static HostnameReposName resolveRepositoryName(String reposName) {
         String[] nameParts = reposName.split("/", 2);
         if (nameParts.length == 1
                 || (!nameParts[0].contains(".") && !nameParts[0].contains(":") && !nameParts[0].equals("localhost"))) {
+            if (StringUtils.containsIgnoreCase(reposName, SHA256_SEPARATOR)) {
+                reposName = StringUtils.substringBeforeLast(reposName, SHA256_SEPARATOR);
+            }
+
+            if (StringUtils.contains(reposName, COLON_SEPARATOR)) {
+                reposName = StringUtils.substringBeforeLast(reposName, COLON_SEPARATOR);
+            }
             return new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, reposName);
         }
 
@@ -119,6 +127,10 @@ public static HostnameReposName resolveRepositoryName(String reposName) {
             reposName = StringUtils.substringBeforeLast(reposName, SHA256_SEPARATOR);
         }
 
+        if (StringUtils.contains(reposName, COLON_SEPARATOR)) {
+            reposName = StringUtils.substringBeforeLast(reposName, COLON_SEPARATOR);
+        }
+
         validateRepoName(reposName);
         return new HostnameReposName(hostname, reposName);
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java b/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java
index c6332ba4b..89ad131f6 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/NameParserTest.java
@@ -83,6 +83,24 @@ public void testResolveSimpleRepositoryName() {
         assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "repository"), resolved);
     }
 
+    @Test
+    public void testResolveRepositoryNameWithTag() {
+        HostnameReposName resolved = NameParser.resolveRepositoryName("repository:tag");
+        assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "repository"), resolved);
+    }
+
+    @Test
+    public void testResolveRepositoryNameWithSHA256() {
+        HostnameReposName resolved = NameParser.resolveRepositoryName("repository@sha256:sha256");
+        assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "repository"), resolved);
+    }
+
+    @Test
+    public void testResolveRepositoryNameWithTagAndSHA256() {
+        HostnameReposName resolved = NameParser.resolveRepositoryName("repository:tag@sha256:sha256");
+        assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "repository"), resolved);
+    }
+
     @Test
     public void testResolveRepositoryNameWithNamespace() {
         HostnameReposName resolved = NameParser.resolveRepositoryName("namespace/repository");
@@ -92,7 +110,7 @@ public void testResolveRepositoryNameWithNamespace() {
     @Test
     public void testResolveRepositoryNameWithNamespaceAndSHA256() {
         HostnameReposName resolved = NameParser.resolveRepositoryName("namespace/repository@sha256:sha256");
-        assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "namespace/repository@sha256:sha256"), resolved);
+        assertEquals(new HostnameReposName(AuthConfig.DEFAULT_SERVER_ADDRESS, "namespace/repository"), resolved);
     }
 
     @Test
@@ -107,6 +125,17 @@ public void testResolveRepositoryNameWithNamespaceAndHostnameAndSHA256() {
         assertEquals(new HostnameReposName("localhost:5000", "namespace/repository"), resolved);
     }
 
+    @Test
+    public void testResolveRepositoryNameWithNamespaceAndHostnameAndTag() {
+        HostnameReposName resolved = NameParser.resolveRepositoryName("localhost:5000/namespace/repository:tag");
+        assertEquals(new HostnameReposName("localhost:5000", "namespace/repository"), resolved);
+    }
+    @Test
+    public void testResolveRepositoryNameWithNamespaceAndHostnameAndTagAndSHA256() {
+        HostnameReposName resolved = NameParser.resolveRepositoryName("localhost:5000/namespace/repository:tag@sha256:sha256");
+        assertEquals(new HostnameReposName("localhost:5000", "namespace/repository"), resolved);
+    }
+
     @Test(expected = InvalidRepositoryNameException.class)
     public void testResolveRepositoryNameWithIndex() {
         NameParser.resolveRepositoryName("index.docker.io/repository");
@@ -147,4 +176,16 @@ public void testResolveReposTagWithSHA256() {
         resolved = NameParser.parseRepositoryTag("localhost:5000/namespace/repository@sha256:sha256");
         assertEquals(new ReposTag("localhost:5000/namespace/repository@sha256:sha256", ""), resolved);
     }
+
+    @Test
+    public void testResolveReposTagWithTagAndSHA256() {
+        ReposTag resolved = NameParser.parseRepositoryTag("repository:tag@sha256:sha256");
+        assertEquals(new ReposTag("repository:tag@sha256:sha256", ""), resolved);
+
+        resolved = NameParser.parseRepositoryTag("namespace/repository:tag@sha256:sha256");
+        assertEquals(new ReposTag("namespace/repository:tag@sha256:sha256", ""), resolved);
+
+        resolved = NameParser.parseRepositoryTag("localhost:5000/namespace/repository:tag@sha256:sha256");
+        assertEquals(new ReposTag("localhost:5000/namespace/repository:tag@sha256:sha256", ""), resolved);
+    }
 }

From 95f65e2a7a6feefa2704c3c39cccbaf8841dfc88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Wielgo=C5=82aski?= <piotr.wielgolaski@tomtom.com>
Date: Fri, 7 Jul 2023 01:50:18 +0200
Subject: [PATCH 1135/1272] Fix support TLS configuration from docker context
 (#2130)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .../core/DefaultDockerClientConfig.java       | 15 +++++++--------
 .../core/DockerContextMetaFile.java           | 19 ++++++++++---------
 .../core/DefaultDockerClientConfigTest.java   |  3 +--
 .../docker/ca.pem                             |  0
 .../docker/cert.pem                           |  0
 .../docker/key.pem                            |  0
 6 files changed, 18 insertions(+), 19 deletions(-)
 create mode 100644 docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/ca.pem
 create mode 100644 docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/cert.pem
 create mode 100644 docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/key.pem

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index 8a1f6193a..8011a2a5e 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -446,6 +446,9 @@ private void applyContextConfiguration(final String context) {
                 Optional.ofNullable(context)
                     .flatMap(ctx -> DockerContextMetaFile.resolveContextMetaFile(DockerClientConfig.getDefaultObjectMapper(),
                             new File(this.dockerConfig), ctx));
+            final Optional<File> dockerContextTLSFile =
+                Optional.ofNullable(context)
+                    .flatMap(ctx -> DockerContextMetaFile.resolveContextTLSFile(new File(this.dockerConfig), ctx));
 
             if (dockerContextMetaFile.isPresent()) {
                 final Optional<DockerContextMetaFile.Endpoints.Docker> dockerEndpoint =
@@ -453,14 +456,10 @@ private void applyContextConfiguration(final String context) {
                 if (this.dockerHost == null) {
                     this.dockerHost = dockerEndpoint.map(endpoint -> endpoint.host).map(URI::create).orElse(null);
                 }
-                if (this.dockerCertPath == null) {
-                    this.dockerCertPath = dockerContextMetaFile.map(metaFile -> metaFile.storage)
-                        .map(storage -> storage.tlsPath)
-                        .filter(file -> new File(file).exists()).orElse(null);
-                    if (this.dockerCertPath != null) {
-                        this.dockerTlsVerify = dockerEndpoint.map(endpoint -> !endpoint.skipTLSVerify).orElse(true);
-                    }
-                }
+            }
+            if (dockerContextTLSFile.isPresent() && this.dockerCertPath == null) {
+                this.dockerCertPath = dockerContextTLSFile.get().getAbsolutePath();
+                this.dockerTlsVerify = true;
             }
         }
 
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java
index d74c4949f..e10db4498 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerContextMetaFile.java
@@ -18,8 +18,6 @@ public class DockerContextMetaFile {
     @JsonProperty("Endpoints")
     Endpoints endpoints;
 
-    @JsonProperty("Storage")
-    Storage storage;
 
     public static class Endpoints {
         @JsonProperty("docker")
@@ -34,13 +32,6 @@ public static class Docker {
         }
     }
 
-    public static class Storage {
-
-        @JsonProperty("TLSPath")
-        String tlsPath;
-        @JsonProperty("MetadataPath")
-        String metadataPath;
-    }
 
     public static Optional<DockerContextMetaFile> resolveContextMetaFile(ObjectMapper objectMapper, File dockerConfigPath, String context) {
         final File path = dockerConfigPath.toPath()
@@ -52,6 +43,16 @@ public static Optional<DockerContextMetaFile> resolveContextMetaFile(ObjectMappe
         return Optional.ofNullable(loadContextMetaFile(objectMapper, path));
     }
 
+    public static Optional<File> resolveContextTLSFile(File dockerConfigPath, String context) {
+        final File path = dockerConfigPath.toPath()
+            .resolve("contexts")
+            .resolve("tls")
+            .resolve(metaHashFunction.hashString(context, StandardCharsets.UTF_8).toString())
+            .resolve("docker")
+            .toFile();
+        return  Optional.ofNullable(path).filter(File::exists);
+    }
+
     public static DockerContextMetaFile loadContextMetaFile(ObjectMapper objectMapper, File dockerContextMetaFile) {
         try {
             return parseContextMetaFile(objectMapper, dockerContextMetaFile);
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
index 7e03a9159..6c7787caf 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
@@ -129,8 +129,7 @@ public void dockerContextWithDockerHostAndTLS() {
 
         assertEquals(URI.create("tcp://remote:2376"), config.getDockerHost());
         assertTrue("SSL config is set", config.getSSLConfig() instanceof LocalDirectorySSLConfig);
-        assertEquals("target/test-classes/com/github/dockerjava/core/util/CertificateUtilsTest/allFilesExist",
-            ((LocalDirectorySSLConfig)config.getSSLConfig()).getDockerCertPath());
+        assertTrue("SSL directory is set", ((LocalDirectorySSLConfig)config.getSSLConfig()).getDockerCertPath().endsWith("dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker"));
     }
 
     @Test
diff --git a/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/ca.pem b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/ca.pem
new file mode 100644
index 000000000..e69de29bb
diff --git a/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/cert.pem b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/cert.pem
new file mode 100644
index 000000000..e69de29bb
diff --git a/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/key.pem b/docker-java/src/test/resources/dockerContextHomeDir/.docker/contexts/tls/b71199ebd070b36beab7317920c2c2f1d777df8d05e5527d8458fda57cb17a7a/docker/key.pem
new file mode 100644
index 000000000..e69de29bb

From 33f510ac95785aeef1e3a9ffbd013c36bd2ea37a Mon Sep 17 00:00:00 2001
From: Julian <33688601+cmdjulian@users.noreply.github.com>
Date: Fri, 7 Jul 2023 03:04:39 +0200
Subject: [PATCH 1136/1272] Update bouncy castle to bcpkix-jdk18on:1.75 (#2135)

---
 docker-java-core/pom.xml | 2 +-
 pom.xml                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index cec97d25d..b8369fa37 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -69,7 +69,7 @@
 
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcpkix-jdk15on</artifactId>
+			<artifactId>bcpkix-jdk18on</artifactId>
 			<version>${bouncycastle.version}</version>
 		</dependency>
 
diff --git a/pom.xml b/pom.xml
index fe1e6d472..532ea0c4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
 		<commons-lang3.version>3.12.0</commons-lang3.version>
 		<slf4j-api.version>1.7.30</slf4j-api.version>
 
-		<bouncycastle.version>1.64</bouncycastle.version>
+		<bouncycastle.version>1.75</bouncycastle.version>
 		<junixsocket.version>2.6.1</junixsocket.version>
 		<guava.version>19.0</guava.version> <!-- todo remove from project -->
 

From 78472c912cd0a239ea48a971fd9ef0a25cb4d55e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 7 Jul 2023 23:33:21 -0600
Subject: [PATCH 1137/1272] Ad ddependency-submission action (#2139)

---
 .github/workflows/dependency-submission.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .github/workflows/dependency-submission.yml

diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
new file mode 100644
index 000000000..ac365b973
--- /dev/null
+++ b/.github/workflows/dependency-submission.yml
@@ -0,0 +1,19 @@
+name: Dependency Submission
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  dependency_submission:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: 8
+          distribution: temurin
+      - name: Submit Dependency Snapshot
+        uses: advanced-security/maven-dependency-submission-action@v3

From ca8b8598297df5b62feb02f88e748abf02fb3610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Fri, 7 Jul 2023 23:35:42 -0600
Subject: [PATCH 1138/1272] Revert "Ad ddependency-submission action (#2139)"

This reverts commit 78472c912cd0a239ea48a971fd9ef0a25cb4d55e.
---
 .github/workflows/dependency-submission.yml | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 .github/workflows/dependency-submission.yml

diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
deleted file mode 100644
index ac365b973..000000000
--- a/.github/workflows/dependency-submission.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Dependency Submission
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  dependency_submission:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK
-        uses: actions/setup-java@v3
-        with:
-          java-version: 8
-          distribution: temurin
-      - name: Submit Dependency Snapshot
-        uses: advanced-security/maven-dependency-submission-action@v3

From e92c30e403da5d9a1f9be7f9c1250f609d36c82c Mon Sep 17 00:00:00 2001
From: chunweilim <117911826+chunweilim@users.noreply.github.com>
Date: Mon, 31 Jul 2023 09:26:49 +1000
Subject: [PATCH 1139/1272] Prevent auths field in config.json to be null
 (#2142)

Fixes #2138
---
 .../com/github/dockerjava/core/DockerConfigFile.java     | 8 +++++++-
 .../com/github/dockerjava/core/DockerConfigFileTest.java | 6 ++++++
 .../testAuthConfigFile/validJsonAuthsNull/config.json    | 9 +++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 docker-java/src/test/resources/testAuthConfigFile/validJsonAuthsNull/config.json

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
index 825796a74..39ef15271 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerConfigFile.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.core;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.model.AuthConfig;
@@ -28,7 +29,7 @@ public class DockerConfigFile {
     };
 
     @JsonProperty
-    private final Map<String, AuthConfig> auths;
+    private Map<String, AuthConfig> auths;
 
     @JsonProperty
     private String currentContext;
@@ -46,6 +47,11 @@ public Map<String, AuthConfig> getAuths() {
         return auths;
     }
 
+    @JsonSetter
+    public void setAuths(Map<String, AuthConfig> authConfigMap) {
+        auths = (authConfigMap == null || authConfigMap.size() == 0) ? new HashMap<>() : authConfigMap;
+    }
+
     void addAuthConfig(AuthConfig config) {
         auths.put(config.getRegistryAddress(), config);
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
index ce1a59cc0..76211fc55 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerConfigFileTest.java
@@ -164,6 +164,12 @@ public void nonExistent() throws IOException {
         assertThat(runTest("idontexist"), is(expected));
     }
 
+    @Test
+    public void validJsonAuthsNull() throws IOException {
+        DockerConfigFile expected = new DockerConfigFile();
+        assertThat(runTest("validJsonAuthsNull"), is(expected));
+    }
+
     private DockerConfigFile runTest(String testFileName) throws IOException {
         return DockerConfigFile.loadConfig(JSONTestHelper.getMapper(), new File(FILESROOT, testFileName).getAbsolutePath());
     }
diff --git a/docker-java/src/test/resources/testAuthConfigFile/validJsonAuthsNull/config.json b/docker-java/src/test/resources/testAuthConfigFile/validJsonAuthsNull/config.json
new file mode 100644
index 000000000..d104c357c
--- /dev/null
+++ b/docker-java/src/test/resources/testAuthConfigFile/validJsonAuthsNull/config.json
@@ -0,0 +1,9 @@
+{
+    "auths": null,
+    "credsStore": "desktop",
+    "plugins": {
+        "-x-cli-hints": {
+            "enabled": "true"
+        }
+    }
+}

From aa13c7fdcc9804ad039a582a456d69488f616ba2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Aug 2023 16:08:35 -0600
Subject: [PATCH 1140/1272] Bump org.bouncycastle:bcpkix-jdk18on from 1.75 to
 1.76 (#2169)

Bumps [org.bouncycastle:bcpkix-jdk18on](https://github.com/bcgit/bc-java) from 1.75 to 1.76.
- [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html)
- [Commits](https://github.com/bcgit/bc-java/commits)

---
updated-dependencies:
- dependency-name: org.bouncycastle:bcpkix-jdk18on
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 532ea0c4a..536f069b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
 		<commons-lang3.version>3.12.0</commons-lang3.version>
 		<slf4j-api.version>1.7.30</slf4j-api.version>
 
-		<bouncycastle.version>1.75</bouncycastle.version>
+		<bouncycastle.version>1.76</bouncycastle.version>
 		<junixsocket.version>2.6.1</junixsocket.version>
 		<guava.version>19.0</guava.version> <!-- todo remove from project -->
 

From f5455eaf5bd3c2e58842d5459a74efa675954896 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Aug 2023 16:08:47 -0600
Subject: [PATCH 1141/1272] Bump org.junit.jupiter:junit-jupiter from 5.7.2 to
 5.10.0 (#2163)

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.7.2 to 5.10.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.7.2...r5.10.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index dca404bc1..f49e7723f 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.7.2</version>
+			<version>5.10.0</version>
 			<scope>test</scope>
 		</dependency>
 

From 5d03c4c8f060fb1d05eca20593ed93dfa696e384 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Aug 2023 16:10:26 -0600
Subject: [PATCH 1142/1272] Bump commons-io from 2.6 to 2.13.0 (#2153)

Bumps commons-io from 2.6 to 2.13.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 536f069b7..1538bb3a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
 		<jackson-jaxrs.version>2.10.3</jackson-jaxrs.version>
 		<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
 		<commons-compress.version>1.21</commons-compress.version>
-		<commons-io.version>2.6</commons-io.version>
+		<commons-io.version>2.13.0</commons-io.version>
 		<commons-lang3.version>3.12.0</commons-lang3.version>
 		<slf4j-api.version>1.7.30</slf4j-api.version>
 

From 2babed862d9820921962e66dad14e5dab8741901 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Aug 2023 16:11:57 -0600
Subject: [PATCH 1143/1272] Bump jna from 5.12.1 to 5.13.0 (#2047)

Bumps [jna](https://github.com/java-native-access/jna) from 5.12.1 to 5.13.0.
- [Release notes](https://github.com/java-native-access/jna/releases)
- [Changelog](https://github.com/java-native-access/jna/blob/master/CHANGES.md)
- [Commits](https://github.com/java-native-access/jna/compare/5.12.1...5.13.0)

---
updated-dependencies:
- dependency-name: net.java.dev.jna:jna
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-httpclient5/pom.xml | 2 +-
 docker-java-transport-okhttp/pom.xml      | 2 +-
 docker-java-transport/pom.xml             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml
index 5800fb994..4eb9f41df 100644
--- a/docker-java-transport-httpclient5/pom.xml
+++ b/docker-java-transport-httpclient5/pom.xml
@@ -41,7 +41,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.12.1</version>
+			<version>5.13.0</version>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index 351005461..df14ad077 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.12.1</version>
+			<version>5.13.0</version>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml
index 633053c39..2ca377dd6 100644
--- a/docker-java-transport/pom.xml
+++ b/docker-java-transport/pom.xml
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.12.1</version>
+			<version>5.13.0</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

From 12ecc2bcbf0b6fbfe64cc658101ebccd6a1d06d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Aug 2023 16:12:14 -0600
Subject: [PATCH 1144/1272] Bump assertj-core from 3.22.0 to 3.24.2 (#2051)

Bumps assertj-core from 3.22.0 to 3.24.2.

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-tck/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml
index 9ad692c1f..491b42bc9 100644
--- a/docker-java-transport-tck/pom.xml
+++ b/docker-java-transport-tck/pom.xml
@@ -34,7 +34,7 @@
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<version>3.22.0</version>
+			<version>3.24.2</version>
 		</dependency>
 
 		<dependency>

From 1da9515043f1ca290c6779a65a21a74f11fad2ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 26 Oct 2023 11:56:02 -0600
Subject: [PATCH 1145/1272] Disable
 CopyArchiveToContainerCmdIT#copyFileWithUIDGID (#2228)

See https://github.com/moby/moby/issues/46388
---
 .../com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
index bbd98932f..efce65c29 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CopyArchiveToContainerCmdIT.java
@@ -6,6 +6,7 @@
 import com.github.dockerjava.core.util.CompressArchiveUtil;
 import com.github.dockerjava.utils.LogContainerTestCallback;
 import org.apache.commons.io.FileUtils;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -148,6 +149,7 @@ public void copyFileWithExecutePermission() throws Exception {
         assertThat(exitCode, equalTo(0));
     }
 
+    @Ignore("Docker issue https://github.com/moby/moby/issues/46388")
     @Test
     public void copyFileWithUIDGID() throws Exception {
         Path with = Files.createFile(Files.createTempDirectory("copyFileWithUIDGID").resolve("uidgid.with"));

From ede20db9870476fe51a8b376a36921d99177d3bf Mon Sep 17 00:00:00 2001
From: Maksim Dimukhametov <maksim.dimukhametov@gmail.com>
Date: Thu, 26 Oct 2023 22:11:01 +0200
Subject: [PATCH 1146/1272] Fixing flaky test
 `ListContainersCmdIT.testStatusFilter` (#2188)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../dockerjava/cmd/ListContainersCmdIT.java   | 62 ++++++++++++-------
 1 file changed, 40 insertions(+), 22 deletions(-)

diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
index a94a02f82..c03df2a55 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
@@ -17,6 +17,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
 import static ch.lambdaj.Lambda.filter;
 import static com.github.dockerjava.api.model.HostConfig.newHostConfig;
@@ -188,16 +189,8 @@ public void testIdsFilter() {
     }
 
     @Test
-    public void testStatusFilter() {
-        String id1, id2;
-        id1 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
-                .withCmd("sh", "-c", "sleep 99999")
-                .withLabels(testLabel)
-                .exec()
-                .getId();
-
-        id2 = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
-                .withCmd("sh", "-c", "sleep 99999")
+    public void shouldFilterByCreatedStatus() {
+        String containerId = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withLabels(testLabel)
                 .exec()
                 .getId();
@@ -208,42 +201,67 @@ public void testStatusFilter() {
                 .withStatusFilter(singletonList("created"))
                 .exec();
 
-        assertThat(filteredContainers.size(), is(2));
-        assertThat(filteredContainers.get(1).getId(), isOneOf(id1, id2));
+        assertThat(filteredContainers.size(), is(1));
+        assertThat(filteredContainers.get(0).getId(), is(containerId));
+    }
 
-        dockerRule.getClient().startContainerCmd(id1).exec();
+    @Test
+    public void shouldFilterByRunningStatus() {
+        String containerId = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withLabels(testLabel)
+                .exec()
+                .getId();
+        dockerRule.getClient().startContainerCmd(containerId).exec();
 
-        filteredContainers = dockerRule.getClient().listContainersCmd()
+        List<Container> filteredContainers = dockerRule.getClient().listContainersCmd()
                 .withShowAll(true)
                 .withLabelFilter(testLabel)
                 .withStatusFilter(singletonList("running"))
                 .exec();
 
         assertThat(filteredContainers.size(), is(1));
-        assertThat(filteredContainers.get(0).getId(), is(id1));
+        assertThat(filteredContainers.get(0).getId(), is(containerId));
+    }
 
-        dockerRule.getClient().pauseContainerCmd(id1).exec();
+    @Test
+    public void shouldFilterByPausedStatus() {
+        String containerId = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withCmd("sh", "-c", "sleep 99999")
+                .withLabels(testLabel)
+                .exec()
+                .getId();
+        dockerRule.getClient().startContainerCmd(containerId).exec();
+        dockerRule.getClient().pauseContainerCmd(containerId).exec();
 
-        filteredContainers = dockerRule.getClient().listContainersCmd()
+        List<Container> filteredContainers = dockerRule.getClient().listContainersCmd()
                 .withShowAll(true)
                 .withLabelFilter(testLabel)
                 .withStatusFilter(singletonList("paused"))
                 .exec();
 
         assertThat(filteredContainers.size(), is(1));
-        assertThat(filteredContainers.get(0).getId(), is(id1));
+        assertThat(filteredContainers.get(0).getId(), is(containerId));
+    }
 
-        dockerRule.getClient().unpauseContainerCmd(id1).exec();
-        dockerRule.getClient().stopContainerCmd(id1).exec();
+    @Test
+    public void shouldFilterByExitedStatus() throws InterruptedException {
+        String containerId = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withCmd("sh", "-c", "sleep 99999")
+                .withLabels(testLabel)
+                .exec()
+                .getId();
+        dockerRule.getClient().startContainerCmd(containerId).exec();
+        dockerRule.getClient().stopContainerCmd(containerId).exec();
+        dockerRule.getClient().waitContainerCmd(containerId).start().awaitCompletion(15, TimeUnit.SECONDS);
 
-        filteredContainers = dockerRule.getClient().listContainersCmd()
+        List<Container> filteredContainers = dockerRule.getClient().listContainersCmd()
                 .withShowAll(true)
                 .withLabelFilter(testLabel)
                 .withStatusFilter(singletonList("exited"))
                 .exec();
 
         assertThat(filteredContainers.size(), is(1));
-        assertThat(filteredContainers.get(0).getId(), is(id1));
+        assertThat(filteredContainers.get(0).getId(), is(containerId));
     }
 
     @Test

From d138d51999cde27ff89fbe5b070045a37203192f Mon Sep 17 00:00:00 2001
From: Sietse Ludger Geertsema <github@slbg.nl>
Date: Thu, 26 Oct 2023 22:25:06 +0200
Subject: [PATCH 1147/1272] Add units (nanoseconds) to HealthCheck (#2187)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../com/github/dockerjava/api/model/HealthCheck.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
index 24873a74f..6c8d425e1 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
@@ -63,11 +63,19 @@ public Long getTimeout() {
         return timeout;
     }
 
+    /**
+     * Set interval in nanoseconds
+     * @return this {@link HealthCheck} instance
+     */
     public HealthCheck withInterval(Long interval) {
         this.interval = interval;
         return this;
     }
 
+    /**
+     * Set timeout in nanoseconds
+     * @return this {@link HealthCheck} instance
+     */
     public HealthCheck withTimeout(Long timeout) {
         this.timeout = timeout;
         return this;
@@ -95,6 +103,10 @@ public Long getStartPeriod() {
         return startPeriod;
     }
 
+    /**
+     * Set startPeriod in nanoseconds
+     * @return this {@link HealthCheck} instance
+     */
     public HealthCheck withStartPeriod(Long startPeriod) {
         this.startPeriod = startPeriod;
         return this;

From fea93ec68ac29e8befeab3c85922283406ea15e2 Mon Sep 17 00:00:00 2001
From: Lars <60571459+LarsSven@users.noreply.github.com>
Date: Thu, 26 Oct 2023 22:30:49 +0200
Subject: [PATCH 1148/1272] Implemented the `SizeRw` field in the
 `InspectContainerResponse` class. (#2216)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../dockerjava/api/command/InspectContainerResponse.java   | 7 +++++++
 .../com/github/dockerjava/cmd/InspectContainerCmdIT.java   | 2 ++
 .../api/command/inspectContainerResponse_full_1_26a.json   | 1 +
 .../resources/samples/1.22/containers/json/filter1.json    | 1 +
 4 files changed, 11 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index 05492c51f..94207fd2c 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -63,6 +63,9 @@ public class InspectContainerResponse extends DockerObject {
     @JsonProperty("SizeRootFs")
     private Integer sizeRootFs;
 
+    @JsonProperty("SizeRw")
+    private Integer sizeRw;
+
     @JsonProperty("Image")
     private String imageId;
 
@@ -125,6 +128,10 @@ public Integer getSizeRootFs() {
         return sizeRootFs;
     }
 
+    public Integer getSizeRw() {
+        return sizeRw;
+    }
+
     public String getCreated() {
         return created;
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
index fed85df73..54d900db8 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
@@ -101,6 +101,8 @@ public void inspectContainerWithSize() throws DockerException {
         if (isNotSwarm(dockerRule.getClient())) {
             assertNotNull(containerInfo.getSizeRootFs());
             assertTrue(containerInfo.getSizeRootFs().intValue() > 0);
+            assertNotNull(containerInfo.getSizeRw());
+            assertTrue(containerInfo.getSizeRw().intValue() == 0);
         }
     }
 
diff --git a/docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json b/docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json
index 2f3428d7a..688ea2689 100644
--- a/docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json
+++ b/docker-java/src/test/resources/com/github/dockerjava/api/command/inspectContainerResponse_full_1_26a.json
@@ -6,6 +6,7 @@
       "postgres"
     ],
     "SizeRootFs" : null,
+    "SizeRw" : null,
     "HostConfig" : {
       "KernelMemory" : 0,
       "MemorySwappiness" : -1,
diff --git a/docker-java/src/test/resources/samples/1.22/containers/json/filter1.json b/docker-java/src/test/resources/samples/1.22/containers/json/filter1.json
index 159e62da6..51329bb63 100644
--- a/docker-java/src/test/resources/samples/1.22/containers/json/filter1.json
+++ b/docker-java/src/test/resources/samples/1.22/containers/json/filter1.json
@@ -10,6 +10,7 @@
     "Created": 1455662451,
     "Ports": [],
     "SizeRootFs": 1113554,
+    "SizeRw": 0,
     "Labels": {},
     "Status": "Up Less than a second",
     "HostConfig": {

From a437d0e0670069c40518ea9fe730f709c121f031 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 26 Oct 2023 19:24:38 -0600
Subject: [PATCH 1149/1272] Bump com.github.siom79.japicmp:japicmp-maven-plugin
 (#2226)

Bumps [com.github.siom79.japicmp:japicmp-maven-plugin](https://github.com/siom79/japicmp) from 0.15.4 to 0.18.2.
- [Release notes](https://github.com/siom79/japicmp/releases)
- [Changelog](https://github.com/siom79/japicmp/blob/master/release.py)
- [Commits](https://github.com/siom79/japicmp/compare/japicmp-base-0.15.4...japicmp-base-0.18.2)

---
updated-dependencies:
- dependency-name: com.github.siom79.japicmp:japicmp-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1538bb3a5..327612045 100644
--- a/pom.xml
+++ b/pom.xml
@@ -243,7 +243,7 @@
 					<!-- use with "mvn -DskipTests clean verify" -->
 					<groupId>com.github.siom79.japicmp</groupId>
 					<artifactId>japicmp-maven-plugin</artifactId>
-					<version>0.15.4</version>
+					<version>0.18.2</version>
 					<configuration>
 						<oldVersion>
 							<dependency>

From 8a840511ad9417d71e8293ba04310fb92d5e87eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 26 Oct 2023 19:24:54 -0600
Subject: [PATCH 1150/1272] Bump org.testcontainers:testcontainers from 1.16.3
 to 1.19.1 (#2218)

Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.16.3 to 1.19.1.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.16.3...1.19.1)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-tck/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml
index 491b42bc9..2e4bd79ce 100644
--- a/docker-java-transport-tck/pom.xml
+++ b/docker-java-transport-tck/pom.xml
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>testcontainers</artifactId>
-			<version>1.16.3</version>
+			<version>1.19.1</version>
 		</dependency>
 
 		<dependency>

From 278a3ac6428ae88b652d7e2dab2db12354af4f3f Mon Sep 17 00:00:00 2001
From: Clayton Walker <clayton.m.walker@gmail.com>
Date: Fri, 27 Oct 2023 12:58:03 -0600
Subject: [PATCH 1151/1272] Replace deprecated match methods (#2189)

---
 .../dockerjava/cmd/ListContainersCmdIT.java   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
index c03df2a55..30667671f 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
@@ -26,11 +26,12 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.emptyString;
-import static org.hamcrest.Matchers.isOneOf;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.oneOf;
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.assertEquals;
 import static org.testinfected.hamcrest.jpa.PersistenceMatchers.hasField;
@@ -161,8 +162,8 @@ public void testNameFilter() {
                 .exec();
 
         assertThat(filteredContainers.size(), is(2));
-        assertThat(filteredContainers.get(0).getId(), isOneOf(id1, id2));
-        assertThat(filteredContainers.get(1).getId(), isOneOf(id1, id2));
+        assertThat(filteredContainers.get(0).getId(), is(oneOf(id1, id2)));
+        assertThat(filteredContainers.get(1).getId(), is(oneOf(id1, id2)));
     }
 
     @Test
@@ -184,8 +185,8 @@ public void testIdsFilter() {
                 .exec();
 
         assertThat(filteredContainers.size(), is(2));
-        assertThat(filteredContainers.get(0).getId(), isOneOf(id1, id2));
-        assertThat(filteredContainers.get(1).getId(), isOneOf(id1, id2));
+        assertThat(filteredContainers.get(0).getId(), is(oneOf(id1, id2)));
+        assertThat(filteredContainers.get(1).getId(), is(oneOf(id1, id2)));
     }
 
     @Test
@@ -219,7 +220,7 @@ public void shouldFilterByRunningStatus() {
                 .withStatusFilter(singletonList("running"))
                 .exec();
 
-        assertThat(filteredContainers.size(), is(1));
+        assertThat(filteredContainers, hasSize(1));
         assertThat(filteredContainers.get(0).getId(), is(containerId));
     }
 
@@ -239,7 +240,7 @@ public void shouldFilterByPausedStatus() {
                 .withStatusFilter(singletonList("paused"))
                 .exec();
 
-        assertThat(filteredContainers.size(), is(1));
+        assertThat(filteredContainers, hasSize(1));
         assertThat(filteredContainers.get(0).getId(), is(containerId));
     }
 
@@ -260,7 +261,7 @@ public void shouldFilterByExitedStatus() throws InterruptedException {
                 .withStatusFilter(singletonList("exited"))
                 .exec();
 
-        assertThat(filteredContainers.size(), is(1));
+        assertThat(filteredContainers, hasSize(1));
         assertThat(filteredContainers.get(0).getId(), is(containerId));
     }
 
@@ -289,7 +290,7 @@ public void testVolumeFilter() {
                 .withVolumeFilter(singletonList("TestFilterVolume"))
                 .exec();
 
-        assertThat(filteredContainers.size(), is(1));
+        assertThat(filteredContainers, hasSize(1));
         assertThat(filteredContainers.get(0).getId(), is(id));
     }
 

From fd5da167a4cd437e51b7fcda1a6ab63a31c59185 Mon Sep 17 00:00:00 2001
From: Maksim Dimukhametov <maksim.dimukhametov@gmail.com>
Date: Fri, 27 Oct 2023 23:49:35 +0200
Subject: [PATCH 1152/1272] Add signal query argument for Restart Container
 command (#2186)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../api/command/RestartContainerCmd.java      | 16 ++++---
 .../dockerjava/core/RemoteApiVersion.java     |  2 +
 .../core/command/RestartContainerCmdImpl.java | 28 +++++++++---
 .../core/exec/RestartContainerCmdExec.java    |  4 ++
 .../cmd/RestartContainerCmdImplIT.java        | 43 ++++++++++++++++++-
 5 files changed, 82 insertions(+), 11 deletions(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
index 5f60f1125..372456813 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
@@ -8,9 +8,8 @@
 /**
  * Restart a running container.
  *
- * @param timeout
- *            - Timeout in seconds before killing the container. Defaults to 10 seconds.
- *
+ * @param signal  - Signal to send to the container as an integer or string (e.g. SIGINT).
+ * @param timeout - Timeout in seconds before killing the container. Defaults to 10 seconds.
  */
 public interface RestartContainerCmd extends SyncDockerCmd<Void> {
 
@@ -20,6 +19,12 @@ public interface RestartContainerCmd extends SyncDockerCmd<Void> {
     @CheckForNull
     Integer getTimeout();
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_42}
+     */
+    @CheckForNull
+    String getSignal();
+
     RestartContainerCmd withContainerId(@Nonnull String containerId);
 
     /**
@@ -32,9 +37,10 @@ default RestartContainerCmd withtTimeout(Integer timeout) {
 
     RestartContainerCmd withTimeout(Integer timeout);
 
+    RestartContainerCmd withSignal(String signal);
+
     /**
-     * @throws NotFoundException
-     *             No such container
+     * @throws NotFoundException No such container
      */
     @Override
     Void exec() throws NotFoundException;
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index a38930cb3..57b15b240 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -91,6 +91,8 @@ public class RemoteApiVersion implements Serializable {
     public static final RemoteApiVersion VERSION_1_37 = RemoteApiVersion.create(1, 37);
     public static final RemoteApiVersion VERSION_1_38 = RemoteApiVersion.create(1, 38);
     public static final RemoteApiVersion VERSION_1_40 = RemoteApiVersion.create(1, 40);
+    public static final RemoteApiVersion VERSION_1_41 = RemoteApiVersion.create(1, 41);
+    public static final RemoteApiVersion VERSION_1_42 = RemoteApiVersion.create(1, 42);
 
 
     /**
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
index 03454d6a8..3b1df465b 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
@@ -7,12 +7,13 @@
 import com.github.dockerjava.api.command.RestartContainerCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
 
+import javax.annotation.CheckForNull;
+
 /**
  * Restart a running container.
  *
- * @param timeout
- *            - Timeout in seconds before killing the container. Defaults to 10 seconds.
- *
+ * @param signal  - Signal to send to the container as an integer or string (e.g. SIGINT).
+ * @param timeout - Timeout in seconds before killing the container. Defaults to 10 seconds.
  */
 public class RestartContainerCmdImpl extends AbstrDockerCmd<RestartContainerCmd, Void> implements RestartContainerCmd {
 
@@ -20,6 +21,8 @@ public class RestartContainerCmdImpl extends AbstrDockerCmd<RestartContainerCmd,
 
     private Integer timeout = 10;
 
+    private String signal;
+
     public RestartContainerCmdImpl(RestartContainerCmd.Exec exec, String containerId) {
         super(exec);
         withContainerId(containerId);
@@ -35,6 +38,15 @@ public Integer getTimeout() {
         return timeout;
     }
 
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_42}
+     */
+    @CheckForNull
+    @Override
+    public String getSignal() {
+        return signal;
+    }
+
     @Override
     public RestartContainerCmd withContainerId(String containerId) {
         Objects.requireNonNull(containerId, "containerId was not specified");
@@ -50,9 +62,15 @@ public RestartContainerCmd withTimeout(Integer timeout) {
         return this;
     }
 
+    @Override
+    public RestartContainerCmd withSignal(String signal) {
+        Objects.requireNonNull(signal, "signal was not specified");
+        this.signal = signal;
+        return this;
+    }
+
     /**
-     * @throws NotFoundException
-     *             No such container
+     * @throws NotFoundException No such container
      */
     @Override
     public Void exec() throws NotFoundException {
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java
index ecb317a34..42f2579e6 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/RestartContainerCmdExec.java
@@ -24,6 +24,10 @@ protected Void execute(RestartContainerCmd command) {
         WebTarget webResource = getBaseResource().path("/containers/{id}/restart").resolveTemplate("id",
                 command.getContainerId());
 
+        if (command.getSignal() != null) {
+            webResource = webResource.queryParam("signal", command.getSignal());
+        }
+
         if (command.getTimeout() != null) {
             webResource = webResource.queryParam("t", String.valueOf(command.getTimeout()));
         }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java
index 8017d229f..ac2415281 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java
@@ -1,18 +1,24 @@
 package com.github.dockerjava.cmd;
 
+import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.core.DefaultDockerClientConfig;
+import com.github.dockerjava.core.RemoteApiVersion;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE;
+import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
+import static org.junit.Assume.assumeThat;
 
 public class RestartContainerCmdImplIT extends CmdIT {
     public static final Logger LOG = LoggerFactory.getLogger(RestartContainerCmdImplIT.class);
@@ -44,6 +50,41 @@ public void restartContainer() throws DockerException {
         dockerRule.getClient().killContainerCmd(container.getId()).exec();
     }
 
+    @Test
+    public void restartContainerWithSignal() throws Exception {
+        assumeThat("API version should be >= 1.42", dockerRule, isGreaterOrEqual(RemoteApiVersion.VERSION_1_42));
+
+        DefaultDockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder()
+            .withApiVersion(RemoteApiVersion.VERSION_1_42)
+            .withRegistryUrl("https://index.docker.io/v1/")
+            .build();
+        try (DockerClient dockerClient = createDockerClient(dockerClientConfig)) {
+            String expectedUserSignal = "10";
+            String initialCommandWithTrap = "trap 'echo \"exit trapped\"' %s; sleep 9999;";
+            final String containerId = dockerClient
+                .createContainerCmd(DEFAULT_IMAGE)
+                .withCmd(
+                    "/bin/sh",
+                    "-c",
+                    String.format(initialCommandWithTrap, expectedUserSignal))
+                .exec()
+                .getId();
+            assertThat(containerId, not(is(emptyString())));
+            dockerClient.startContainerCmd(containerId).exec();
+
+            // Restart container without signal
+            dockerClient.restartContainerCmd(containerId).exec();
+            String log = dockerRule.containerLog(containerId);
+            assertThat(log.trim(), emptyString());
+
+            dockerClient.restartContainerCmd(containerId).withSignal(expectedUserSignal).exec();
+            log = dockerRule.containerLog(containerId);
+            assertThat(log.trim(), is("exit trapped"));
+
+            dockerClient.removeContainerCmd(containerId).withForce(true).withRemoveVolumes(true).exec();
+        }
+    }
+
     @Test(expected = NotFoundException.class)
     public void restartNonExistingContainer() throws DockerException {
 

From 84d7750d7f290c66f0ae18c88ab92a3cde2c804d Mon Sep 17 00:00:00 2001
From: Lars <60571459+LarsSven@users.noreply.github.com>
Date: Tue, 19 Dec 2023 23:57:02 +0100
Subject: [PATCH 1153/1272] Use long rather than int for sizeRw and sizeRootFs
 (#2230)

Fixes #2237
---
 .../dockerjava/api/command/InspectContainerResponse.java  | 8 ++++----
 .../com/github/dockerjava/cmd/InspectContainerCmdIT.java  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index 94207fd2c..f06bd4ed9 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -61,10 +61,10 @@ public class InspectContainerResponse extends DockerObject {
     private String id;
 
     @JsonProperty("SizeRootFs")
-    private Integer sizeRootFs;
+    private Long sizeRootFs;
 
     @JsonProperty("SizeRw")
-    private Integer sizeRw;
+    private Long sizeRw;
 
     @JsonProperty("Image")
     private String imageId;
@@ -124,11 +124,11 @@ public String getId() {
         return id;
     }
 
-    public Integer getSizeRootFs() {
+    public Long getSizeRootFs() {
         return sizeRootFs;
     }
 
-    public Integer getSizeRw() {
+    public Long getSizeRw() {
         return sizeRw;
     }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
index 54d900db8..22ccd577b 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
@@ -100,9 +100,9 @@ public void inspectContainerWithSize() throws DockerException {
         // TODO check swarm
         if (isNotSwarm(dockerRule.getClient())) {
             assertNotNull(containerInfo.getSizeRootFs());
-            assertTrue(containerInfo.getSizeRootFs().intValue() > 0);
+            assertTrue(containerInfo.getSizeRootFs().longValue() > 0L);
             assertNotNull(containerInfo.getSizeRw());
-            assertTrue(containerInfo.getSizeRw().intValue() == 0);
+            assertTrue(containerInfo.getSizeRw().longValue() == 0L);
         }
     }
 

From b56497a01b50aaacb73cb34aa8de9f2d2fb0f780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 1 Feb 2024 19:02:17 -0500
Subject: [PATCH 1154/1272] Ignore LogSwarmObjectIT#testLogsCmd (#2280)

---
 .../java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java
index ddaf86fb6..11606dce0 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/LogSwarmObjectIT.java
@@ -12,6 +12,7 @@
 import com.github.dockerjava.api.model.TaskSpec;
 import com.github.dockerjava.api.model.TaskState;
 import com.github.dockerjava.utils.LogContainerTestCallback;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -25,6 +26,8 @@
 import static org.hamcrest.core.Is.is;
 
 public class LogSwarmObjectIT extends SwarmCmdIT {
+
+    @Ignore
     @Test
     public void testLogsCmd() throws InterruptedException, IOException {
         DockerClient dockerClient = startSwarm();

From 1c6fcdbce655bc60c5fe291465809934b1b4ac76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 1 Feb 2024 19:11:34 -0500
Subject: [PATCH 1155/1272] Enable japicmp in docker-java-api module (#2279)

* Enable japicmp in docker-java-api

* Revert "Use long rather than int for sizeRw and sizeRootFs (#2230)"

This reverts commit 84d7750d7f290c66f0ae18c88ab92a3cde2c804d.
---
 docker-java-api/pom.xml                                   | 4 ++++
 .../dockerjava/api/command/InspectContainerResponse.java  | 8 ++++----
 .../com/github/dockerjava/cmd/InspectContainerCmdIT.java  | 4 ++--
 pom.xml                                                   | 4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index f49e7723f..da19bba47 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -81,6 +81,10 @@
 					</instructions>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>com.github.siom79.japicmp</groupId>
+				<artifactId>japicmp-maven-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index f06bd4ed9..94207fd2c 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -61,10 +61,10 @@ public class InspectContainerResponse extends DockerObject {
     private String id;
 
     @JsonProperty("SizeRootFs")
-    private Long sizeRootFs;
+    private Integer sizeRootFs;
 
     @JsonProperty("SizeRw")
-    private Long sizeRw;
+    private Integer sizeRw;
 
     @JsonProperty("Image")
     private String imageId;
@@ -124,11 +124,11 @@ public String getId() {
         return id;
     }
 
-    public Long getSizeRootFs() {
+    public Integer getSizeRootFs() {
         return sizeRootFs;
     }
 
-    public Long getSizeRw() {
+    public Integer getSizeRw() {
         return sizeRw;
     }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
index 22ccd577b..54d900db8 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
@@ -100,9 +100,9 @@ public void inspectContainerWithSize() throws DockerException {
         // TODO check swarm
         if (isNotSwarm(dockerRule.getClient())) {
             assertNotNull(containerInfo.getSizeRootFs());
-            assertTrue(containerInfo.getSizeRootFs().longValue() > 0L);
+            assertTrue(containerInfo.getSizeRootFs().intValue() > 0);
             assertNotNull(containerInfo.getSizeRw());
-            assertTrue(containerInfo.getSizeRw().longValue() == 0L);
+            assertTrue(containerInfo.getSizeRw().intValue() == 0);
         }
     }
 
diff --git a/pom.xml b/pom.xml
index 327612045..3ada79555 100644
--- a/pom.xml
+++ b/pom.xml
@@ -243,13 +243,13 @@
 					<!-- use with "mvn -DskipTests clean verify" -->
 					<groupId>com.github.siom79.japicmp</groupId>
 					<artifactId>japicmp-maven-plugin</artifactId>
-					<version>0.18.2</version>
+					<version>0.18.3</version>
 					<configuration>
 						<oldVersion>
 							<dependency>
 								<groupId>com.github.docker-java</groupId>
 								<artifactId>${project.artifactId}</artifactId>
-								<version>3.2.0</version>
+								<version>3.3.4</version>
 								<type>jar</type>
 							</dependency>
 						</oldVersion>

From 7957a142809184817483aaebd2eb03398f0e6394 Mon Sep 17 00:00:00 2001
From: Henri Tremblay <henri.tremblay@gmail.com>
Date: Thu, 1 Feb 2024 19:12:11 -0500
Subject: [PATCH 1156/1272] Add StartInterval to health check since it will be
 supported by the 1.44 docker API (#2244)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
---
 .gitignore                                    |  1 +
 .../dockerjava/api/model/HealthCheck.java     | 19 ++++
 .../dockerjava/core/RemoteApiVersion.java     |  2 +
 .../github/dockerjava/cmd/HealthCmdIT.java    | 88 +++++++++++++++++++
 4 files changed, 110 insertions(+)
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/HealthCmdIT.java

diff --git a/.gitignore b/.gitignore
index 201acaa5f..006641e8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
 
 # Ignore all build/dist directories
 target
+dependency-reduced-pom.xml
 
 # Ignore InteliJ Idea project files
 .idea/
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
index 6c8d425e1..0e41b873f 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
@@ -55,6 +55,12 @@ public class HealthCheck extends DockerObject implements Serializable {
     @JsonProperty("StartPeriod")
     private Long startPeriod;
 
+    /**
+     * @since 1.44
+     */
+    @JsonProperty("StartInterval")
+    private Long startInterval;
+
     public Long getInterval() {
         return interval;
     }
@@ -111,4 +117,17 @@ public HealthCheck withStartPeriod(Long startPeriod) {
         this.startPeriod = startPeriod;
         return this;
     }
+
+    public Long getStartInterval() {
+        return startInterval;
+    }
+
+    /**
+     * Set startInterval in nanoseconds
+     * @return this {@link HealthCheck} instance
+     */
+    public HealthCheck withStartInterval(Long startInterval) {
+        this.startInterval = startInterval;
+        return this;
+    }
 }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
index 57b15b240..373a67332 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -93,6 +93,8 @@ public class RemoteApiVersion implements Serializable {
     public static final RemoteApiVersion VERSION_1_40 = RemoteApiVersion.create(1, 40);
     public static final RemoteApiVersion VERSION_1_41 = RemoteApiVersion.create(1, 41);
     public static final RemoteApiVersion VERSION_1_42 = RemoteApiVersion.create(1, 42);
+    public static final RemoteApiVersion VERSION_1_43 = RemoteApiVersion.create(1, 43);
+    public static final RemoteApiVersion VERSION_1_44 = RemoteApiVersion.create(1, 44);
 
 
     /**
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/HealthCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/HealthCmdIT.java
new file mode 100644
index 000000000..bdca27572
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/HealthCmdIT.java
@@ -0,0 +1,88 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import com.github.dockerjava.api.command.HealthStateLog;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.HealthCheck;
+import com.github.dockerjava.core.RemoteApiVersion;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.emptyString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assume.assumeThat;
+
+public class HealthCmdIT extends CmdIT {
+    private final Logger LOG = LoggerFactory.getLogger(HealthCmdIT.class);
+
+    @Test
+    public void healthiness() {
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+            .withCmd("nc", "-l",  "-p", "8080")
+            .withHealthcheck(new HealthCheck()
+                .withTest(Arrays.asList("CMD", "sh", "-c", "netstat -ltn | grep 8080"))
+                .withInterval(TimeUnit.SECONDS.toNanos(1))
+                .withTimeout(TimeUnit.MINUTES.toNanos(1))
+                .withStartPeriod(TimeUnit.SECONDS.toNanos(30))
+                .withRetries(10))
+            .exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(is(emptyString())));
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        await().atMost(60L, TimeUnit.SECONDS).untilAsserted(
+            () -> {
+                InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+                assertThat(inspectContainerResponse.getState().getHealth().getStatus(), is(equalTo("healthy")));
+            }
+        );
+    }
+
+    @Test
+    public void healthiness_startInterval() {
+        assumeThat("API version should be >= 1.44", dockerRule, isGreaterOrEqual(RemoteApiVersion.VERSION_1_44));
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+            .withCmd("nc", "-l",  "-p", "8080")
+            .withHealthcheck(new HealthCheck()
+                .withTest(Arrays.asList("CMD", "sh", "-c", "netstat -ltn | grep 8080"))
+                .withInterval(TimeUnit.SECONDS.toNanos(5))
+                .withTimeout(TimeUnit.MINUTES.toNanos(1))
+                .withStartPeriod(TimeUnit.SECONDS.toNanos(2))
+                .withStartInterval(TimeUnit.SECONDS.toNanos(1))
+                .withRetries(10))
+            .exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(is(emptyString())));
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        await().atMost(60L, TimeUnit.SECONDS).untilAsserted(
+            () -> {
+                InspectContainerResponse inspectContainerResponse = dockerRule.getClient().inspectContainerCmd(container.getId()).exec();
+                List<HealthStateLog> healthStateLogs = inspectContainerResponse.getState().getHealth().getLog();
+                assertThat(healthStateLogs.size(), is(greaterThanOrEqualTo(2)));
+                healthStateLogs.forEach(log -> LOG.info("Health log: {}", log.getStart()));
+                HealthStateLog log1 = healthStateLogs.get(healthStateLogs.size() - 1);
+                HealthStateLog log2 = healthStateLogs.get(healthStateLogs.size() - 2);
+                long diff = ChronoUnit.NANOS.between(ZonedDateTime.parse(log2.getStart()), ZonedDateTime.parse(log1.getStart()));
+                assertThat(diff, is(greaterThanOrEqualTo(inspectContainerResponse.getConfig().getHealthcheck().getInterval())));
+            }
+        );
+    }
+
+}

From 1bac81fa0afdae18d30bd62b1ba666375ee20147 Mon Sep 17 00:00:00 2001
From: Sylvere Richard <Sylvere.Richard@gmail.com>
Date: Fri, 2 Feb 2024 01:12:57 +0100
Subject: [PATCH 1157/1272] Add missing states in ServiceUpdateState (#2292)

---
 .../github/dockerjava/api/model/ServiceUpdateState.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java
index e748bbd4a..d22f8999e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java
@@ -6,6 +6,9 @@
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
 public enum ServiceUpdateState {
+    @JsonProperty("unknown")
+    UNKNOWN,
+
     @JsonProperty("updating")
     UPDATING,
 
@@ -15,6 +18,12 @@ public enum ServiceUpdateState {
     @JsonProperty("completed")
     COMPLETED,
 
+    @JsonProperty("rollback_started")
+    ROLLBACK_STARTED,
+
+    @JsonProperty("rollback_paused")
+    ROLLBACK_PAUSED,
+
     @JsonProperty("rollback_completed")
     ROLLBACK_COMPLETED
 }

From 129f7868a0463bad09f74dcfb26391b224be6784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 19 Feb 2024 12:54:35 -0500
Subject: [PATCH 1158/1272] Update actions/checkout and actions/setup-java
 version to v4 (#2309)

---
 .github/workflows/ci.yml      | 4 ++--
 .github/workflows/release.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4f1ef43de..dcfa853f2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,9 +17,9 @@ jobs:
           - { name: "Docker 19.03.9", dockerVersion: "5:19.03.9~3-0~ubuntu-focal", javaVersion: 8 }
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{matrix.javaVersion}}
           distribution: temurin
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7ee128801..ec59b2603 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,9 +10,9 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 8
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 8
           distribution: temurin

From 4d8c436d6cbe312be22b157c3ebdb6eb973140ae Mon Sep 17 00:00:00 2001
From: Colin Alworth <colin@vertispan.com>
Date: Mon, 26 Feb 2024 12:19:07 -0600
Subject: [PATCH 1159/1272] If BuildImage fails but logs something about
 success, don't succeed (#2305)

This patch ensures that if the docker build commands result in logging
the string "Successfully built", the callback from that build will still
fail if there was an error in building.

Fixes #2184
---
 .../api/command/BuildImageResultCallback.java          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java
index 331f69509..9db21a6c4 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageResultCallback.java
@@ -67,14 +67,14 @@ public String awaitImageId(long timeout, TimeUnit timeUnit) {
     }
 
     private String getImageId() {
-        if (imageId != null) {
-            return imageId;
+        if (error != null) {
+            throw new DockerClientException("Could not build image: " + error);
         }
 
-        if (error == null) {
-            throw new DockerClientException("Could not build image");
+        if (imageId != null) {
+            return imageId;
         }
 
-        throw new DockerClientException("Could not build image: " + error);
+        throw new DockerClientException("Could not build image");
     }
 }

From 3514b3ba9c6d938e2a0435ad8d84905cb1cdfed1 Mon Sep 17 00:00:00 2001
From: Clayton Walker <clayton.m.walker@gmail.com>
Date: Mon, 26 Feb 2024 12:08:02 -0700
Subject: [PATCH 1160/1272] Remove exclusion and fix httpclient5 compatibility
 (#2294)

Fixes #2290
---
 docker-java-transport-httpclient5/pom.xml     |  6 ------
 .../ApacheDockerHttpClientImpl.java           | 19 +++++++++++++++++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml
index 4eb9f41df..48b751d56 100644
--- a/docker-java-transport-httpclient5/pom.xml
+++ b/docker-java-transport-httpclient5/pom.xml
@@ -30,12 +30,6 @@
 			<groupId>org.apache.httpcomponents.client5</groupId>
 			<artifactId>httpclient5</artifactId>
 			<version>5.0.3</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.httpcomponents.core5</groupId>
-					<artifactId>httpcore5-h2</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
index 93677bd36..4820c65e5 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
@@ -38,6 +38,7 @@
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.URI;
 import java.time.Duration;
@@ -147,17 +148,31 @@ private Registry<ConnectionSocketFactory> createConnectionSocketFactoryRegistry(
         return socketFactoryRegistryBuilder
             .register("tcp", PlainConnectionSocketFactory.INSTANCE)
             .register("http", PlainConnectionSocketFactory.INSTANCE)
-            .register("unix", new PlainConnectionSocketFactory() {
+            .register("unix", new ConnectionSocketFactory() {
                 @Override
                 public Socket createSocket(HttpContext context) throws IOException {
                     return UnixSocket.get(dockerHost.getPath());
                 }
+
+                @Override
+                public Socket connectSocket(TimeValue timeValue, Socket socket, HttpHost httpHost, InetSocketAddress inetSocketAddress,
+                                            InetSocketAddress inetSocketAddress1, HttpContext httpContext) throws IOException {
+                    return PlainConnectionSocketFactory.INSTANCE.connectSocket(timeValue, socket, httpHost, inetSocketAddress,
+                        inetSocketAddress1, httpContext);
+                }
             })
-            .register("npipe", new PlainConnectionSocketFactory() {
+            .register("npipe", new ConnectionSocketFactory() {
                 @Override
                 public Socket createSocket(HttpContext context) {
                     return new NamedPipeSocket(dockerHost.getPath());
                 }
+
+                @Override
+                public Socket connectSocket(TimeValue timeValue, Socket socket, HttpHost httpHost, InetSocketAddress inetSocketAddress,
+                                            InetSocketAddress inetSocketAddress1, HttpContext httpContext) throws IOException {
+                    return PlainConnectionSocketFactory.INSTANCE.connectSocket(timeValue, socket, httpHost, inetSocketAddress,
+                        inetSocketAddress1, httpContext);
+                }
             })
             .build();
     }

From 4f6c5937983ff4ae7cc82bead44afe3afee4d0ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 26 Feb 2024 14:11:30 -0500
Subject: [PATCH 1161/1272] Test against Java 21 (#2304)

---
 .github/workflows/ci.yml | 1 +
 docker-java-api/pom.xml  | 2 +-
 docker-java/pom.xml      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dcfa853f2..0335a352e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,6 +13,7 @@ jobs:
         include:
           - { name: "default", javaVersion: 8 }
           - { name: "default", javaVersion: 17 }
+          - { name: "default", javaVersion: 21 }
           - { name: "over TCP", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 }
           - { name: "Docker 19.03.9", dockerVersion: "5:19.03.9~3-0~ubuntu-focal", javaVersion: 8 }
 
diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index da19bba47..82d176e38 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -42,7 +42,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.22</version>
+			<version>1.18.30</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 39e1b1b65..e3c3690f1 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -141,7 +141,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.22</version>
+			<version>1.18.30</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

From b29527510d9f7c16b30b138ae4a2f6703d88bb01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 26 Feb 2024 18:30:42 -0500
Subject: [PATCH 1162/1272] Add `Runtimes` to `Info` response (#2311)

---
 .../com/github/dockerjava/api/model/Info.java | 10 ++++++++
 .../dockerjava/api/model/RuntimeInfo.java     | 23 +++++++++++++++++++
 .../com/github/dockerjava/cmd/InfoCmdIT.java  |  1 +
 3 files changed, 34 insertions(+)
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/model/RuntimeInfo.java

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
index 0752778e3..c436e7391 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
@@ -235,6 +235,9 @@ public class Info extends DockerObject implements Serializable {
     @JsonProperty("SecurityOptions")
     private List<String> securityOptions;
 
+    @JsonProperty("Runtimes")
+    private Map<String, RuntimeInfo> runtimes;
+
     /**
      * @see #architecture
      */
@@ -1070,4 +1073,11 @@ public Info withIsolation(String isolation) {
     public List<String> getSecurityOptions() {
         return securityOptions;
     }
+
+    /**
+     * @see #runtimes
+     */
+    public Map<String, RuntimeInfo> getRuntimes() {
+        return runtimes;
+    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/RuntimeInfo.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/RuntimeInfo.java
new file mode 100644
index 000000000..c64511cda
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/RuntimeInfo.java
@@ -0,0 +1,23 @@
+package com.github.dockerjava.api.model;
+
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@EqualsAndHashCode
+@ToString
+public class RuntimeInfo extends DockerObject implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String path;
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java
index d7917326b..74fc2cbda 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InfoCmdIT.java
@@ -48,6 +48,7 @@ public void infoTest() throws DockerException {
         assertThat(dockerInfo.getImages(), notNullValue());
         assertThat(dockerInfo.getImages(), greaterThan(0));
         assertThat(dockerInfo.getDebug(), notNullValue());
+        assertThat(dockerInfo.getRuntimes(), notNullValue());
 
         if (isNotSwarm(dockerClient)) {
             assertThat(dockerInfo.getNFd(), greaterThan(0));

From f146f9696db7b4d4180d95677a879f8597d34ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 9 Jul 2024 11:39:37 -0600
Subject: [PATCH 1163/1272] Update images (#2346)

---
 .../java/com/github/dockerjava/cmd/ListContainersCmdIT.java   | 4 ++--
 .../test/java/com/github/dockerjava/cmd/PullImageCmdIT.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
index 30667671f..3490924c7 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListContainersCmdIT.java
@@ -330,11 +330,11 @@ public void testAncestorFilter() throws Exception {
         DockerAssume.assumeNotSwarm(dockerRule.getClient());
 
         dockerRule.getClient().pullImageCmd("busybox")
-                .withTag("1.24")
+                .withTag("1.35")
                 .start()
                 .awaitCompletion();
 
-        dockerRule.getClient().createContainerCmd("busybox:1.24")
+        dockerRule.getClient().createContainerCmd("busybox:1.35")
                 .withLabels(testLabel)
                 .exec();
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
index 539a2b606..3b8dde3ff 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/PullImageCmdIT.java
@@ -45,7 +45,7 @@ public void testPullImage() throws Exception {
         // pulled down, preferably small in size. If tag is not used pull will
         // download all images in that repository but tmpImgs will only
         // deleted 'latest' image but not images with other tags
-        String testImage = "hackmann/empty";
+        String testImage = "alpine:3.17";
 
         LOG.info("Removing image: {}", testImage);
 

From b28b0dc267bc3ab9feb5645957311e5fa42ce94e Mon Sep 17 00:00:00 2001
From: Niklas Gehlen <mail@niklasgehlen.de>
Date: Tue, 9 Jul 2024 22:05:48 +0200
Subject: [PATCH 1164/1272] Consider already existing images as successful pull
 (#2335)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../com/github/dockerjava/api/model/PullResponseItem.java | 5 ++++-
 .../github/dockerjava/api/model/PullResponseItemTest.java | 8 ++++++++
 .../dockerjava/api/model/PullResponseJSONSamples.java     | 4 +++-
 .../api/model/pullImageResponse_alreadyExists.json        | 1 +
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 docker-java/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_alreadyExists.json

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
index 66a559934..1d3f33c8e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
@@ -19,6 +19,8 @@ public class PullResponseItem extends ResponseItem {
 
     private static final String DOWNLOADED_SWARM = ": downloaded";
 
+    private static final String ALREADY_EXISTS = "Already exists";
+
     /**
      * Returns whether the status indicates a successful pull operation
      *
@@ -34,7 +36,8 @@ public boolean isPullSuccessIndicated() {
                 getStatus().contains(IMAGE_UP_TO_DATE) ||
                 getStatus().contains(DOWNLOADED_NEWER_IMAGE) ||
                 getStatus().contains(LEGACY_REGISTRY) ||
-                getStatus().contains(DOWNLOADED_SWARM)
+                getStatus().contains(DOWNLOADED_SWARM) ||
+                getStatus().contains(ALREADY_EXISTS)
         );
     }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java
index 486badd55..f73036864 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseItemTest.java
@@ -29,6 +29,14 @@
  * @author Zach Marshall
  */
 public class PullResponseItemTest {
+    @Test
+    public void imageAlreadyExists() throws IOException {
+        PullResponseItem response = testRoundTrip(PullResponseJSONSamples.pullImageResponse_alreadyExists,
+                PullResponseItem.class);
+        assertTrue(response.isPullSuccessIndicated());
+        assertFalse(response.isErrorIndicated());
+    }
+
     @Test
     public void pullNewerImage() throws IOException {
         PullResponseItem response = testRoundTrip(PullResponseJSONSamples.pullImageResponse_newerImage,
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java b/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java
index 31cdf0f3b..4997a390a 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/PullResponseJSONSamples.java
@@ -23,7 +23,9 @@
  * @author Zach Marshall
  */
 public enum PullResponseJSONSamples implements JSONResourceRef {
-    pullImageResponse_legacy, pullImageResponse_error, pullImageResponse_newerImage, pullImageResponse_upToDate;
+    pullImageResponse_legacy, pullImageResponse_error, 
+    pullImageResponse_newerImage, pullImageResponse_upToDate,
+    pullImageResponse_alreadyExists;
 
     @Override
     public String getFileName() {
diff --git a/docker-java/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_alreadyExists.json b/docker-java/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_alreadyExists.json
new file mode 100644
index 000000000..ae318e29d
--- /dev/null
+++ b/docker-java/src/test/resources/com/github/dockerjava/api/model/pullImageResponse_alreadyExists.json
@@ -0,0 +1 @@
+{"status":"Already exists"}

From 242c76ae01aea5c965ee5f1037ba84bafb84015c Mon Sep 17 00:00:00 2001
From: Juan Manuel Olle <jolle@salesforce.com>
Date: Tue, 9 Jul 2024 17:16:04 -0300
Subject: [PATCH 1165/1272] Add Network create attribute (#2344)

---
 .../java/com/github/dockerjava/api/model/Network.java     | 8 ++++++++
 .../com/github/dockerjava/cmd/CreateNetworkCmdIT.java     | 3 +++
 .../com/github/dockerjava/cmd/InspectNetworkCmdIT.java    | 2 ++
 3 files changed, 13 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
index 7e5110ce6..7e9d3b2fd 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
@@ -7,6 +7,7 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -18,6 +19,9 @@ public class Network extends DockerObject implements Serializable {
     @JsonProperty("Id")
     private String id;
 
+    @JsonProperty("Created")
+    private Date created;
+
     @JsonProperty("Name")
     private String name;
 
@@ -52,6 +56,10 @@ public String getId() {
         return id;
     }
 
+    public Date getCreated() {
+        return created;
+    }
+
     public String getName() {
         return name;
     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
index deb8a4718..d60425a2a 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateNetworkCmdIT.java
@@ -15,9 +15,11 @@
 import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeThat;
 
@@ -37,6 +39,7 @@ public void createNetwork() throws DockerException {
         Network network = dockerRule.getClient().inspectNetworkCmd().withNetworkId(createNetworkResponse.getId()).exec();
         assertThat(network.getName(), is(networkName));
         assertThat(network.getDriver(), is("bridge"));
+        assertThat(network.getCreated().getTime(), greaterThan(0L));
     }
 
     @Test
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectNetworkCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectNetworkCmdIT.java
index eca86497d..035d3d767 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectNetworkCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectNetworkCmdIT.java
@@ -10,6 +10,7 @@
 import static com.github.dockerjava.utils.TestUtils.findNetwork;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
 
 public class InspectNetworkCmdIT extends CmdIT {
 
@@ -28,5 +29,6 @@ public void inspectNetwork() throws DockerException {
         assertThat(network.getDriver(), equalTo(expected.getDriver()));
         assertThat(network.getIpam().getConfig().get(0).getSubnet(), equalTo(expected.getIpam().getConfig().get(0).getSubnet()));
         assertThat(network.getIpam().getDriver(), equalTo(expected.getIpam().getDriver()));
+        assertThat(network.getCreated().getTime(), greaterThan(0L));
     }
 }

From f14cff90924f7aa5bf570ab49e6e91532ba8a362 Mon Sep 17 00:00:00 2001
From: Holger Stolzenberg <h.stolzenberg@ewerk.com>
Date: Wed, 10 Jul 2024 19:26:49 +0200
Subject: [PATCH 1166/1272] Add -parameters option for compilation of project
 (#2317)

Fixes #2316
---
 docker-java-core/pom.xml | 1 +
 pom.xml                  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index b8369fa37..290a1fed9 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -99,6 +99,7 @@
 				<configuration>
 					<source>8</source>
 					<target>8</target>
+					<parameters>true</parameters>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/pom.xml b/pom.xml
index 3ada79555..f58a3d448 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,6 +148,7 @@
 						<target>${jdk.target}</target>
 						<debug>${jdk.debug}</debug>
 						<optimize>${jdk.optimize}</optimize>
+						<parameters>true</parameters>
 					</configuration>
 				</plugin>
 

From a1393bf2e1265ba1e6eca4240af55396852f8a7c Mon Sep 17 00:00:00 2001
From: Torsten Krah <krah.tm@gmail.com>
Date: Thu, 11 Jul 2024 19:03:02 +0200
Subject: [PATCH 1167/1272] Enable protocol configuration of SSLContext (#2337)

Fixes #2332
---
 .../com/github/dockerjava/core/LocalDirectorySSLConfig.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
index 665f48f06..0f50f561d 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
@@ -64,7 +64,8 @@ public SSLContext getSSLContext() {
                 TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(tmfAlgorithm);
                 trustManagerFactory.init(CertificateUtils.createTrustStore(capem));
 
-                SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
+                SSLContext sslContext = SSLContext.getInstance(AccessController.doPrivileged(getSystemProperty("ssl.protocol",
+                    "TLSv1.2")));
                 sslContext.init(keyManagerFactory.getKeyManagers(), trustManagerFactory.getTrustManagers(), null);
 
                 return sslContext;

From 818eedb754375e6705d9f2ec124f5b2ccdefa059 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 10 Dec 2024 15:56:16 -0600
Subject: [PATCH 1168/1272] Rename main workflow to release-drafter

---
 .github/workflows/{main.yml => release-drafter.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{main.yml => release-drafter.yml} (100%)

diff --git a/.github/workflows/main.yml b/.github/workflows/release-drafter.yml
similarity index 100%
rename from .github/workflows/main.yml
rename to .github/workflows/release-drafter.yml

From 996f206602bae64d9e2e3f31caf4c0d9ad656776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 10 Dec 2024 15:56:33 -0600
Subject: [PATCH 1169/1272] Allow to start workflow manually

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0335a352e..03cc0034d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,6 +3,7 @@ name: CI
 on:
   pull_request: {}
   push: { branches: [ main ] }
+  workflow_dispatch:
 
 jobs:
   build:

From fc505c1f0f1de7c180e5ec9532ebf2b8585afe3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 10 Dec 2024 19:21:05 -0500
Subject: [PATCH 1170/1272] Fix restart test (#2375)

---
 .../com/github/dockerjava/cmd/RestartContainerCmdImplIT.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java
index ac2415281..bdf309dc2 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java
@@ -60,7 +60,7 @@ public void restartContainerWithSignal() throws Exception {
             .build();
         try (DockerClient dockerClient = createDockerClient(dockerClientConfig)) {
             String expectedUserSignal = "10";
-            String initialCommandWithTrap = "trap 'echo \"exit trapped\"' %s; sleep 9999;";
+            String initialCommandWithTrap = "trap 'echo \"exit trapped\"' %s; while :; do sleep 1; done";
             final String containerId = dockerClient
                 .createContainerCmd(DEFAULT_IMAGE)
                 .withCmd(

From 61dc04260a67e134aa76777d7db5988e7647893f Mon Sep 17 00:00:00 2001
From: Lars <60571459+LarsSven@users.noreply.github.com>
Date: Wed, 11 Dec 2024 01:30:51 +0100
Subject: [PATCH 1171/1272] Add support for CgroupVersion and CgroupDriver
 (#2360)

---
 .../com/github/dockerjava/api/model/Info.java | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
index c436e7391..75afefd2b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
@@ -97,6 +97,12 @@ public class Info extends DockerObject implements Serializable {
     @JsonProperty("LoggingDriver")
     private String loggingDriver;
 
+    @JsonProperty("CgroupDriver")
+    private String cGroupDriver;
+
+    @JsonProperty("CgroupVersion")
+    private String cGroupVersion;
+
     /**
      * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_20}
      */
@@ -486,6 +492,22 @@ public String getLoggingDriver() {
         return loggingDriver;
     }
 
+    /**
+     * @see #cGroupDriver
+     */
+    @CheckForNull
+    public String getCGroupDriver() {
+        return cGroupDriver;
+    }
+
+    /**
+     * @see #cGroupVersion
+     */
+    @CheckForNull
+    public String getCGroupVersion() {
+        return cGroupVersion;
+    }
+
     /**
      * @see #loggingDriver
      */
@@ -494,6 +516,22 @@ public Info withLoggingDriver(String loggingDriver) {
         return this;
     }
 
+    /**
+     * @see #cGroupDriver
+     */
+    public Info withCGroupDriver(String cGroupDriver) {
+        this.cGroupDriver = cGroupDriver;
+        return this;
+    }
+
+    /**
+     * @see #cGroupVersion
+     */
+    public Info withCGroupVersion(String cGroupVersion) {
+        this.cGroupVersion = cGroupVersion;
+        return this;
+    }
+
     /**
      * @see #experimentalBuild
      */

From 721f09f4bf723de9d97ddc8d4a107928ceda50c6 Mon Sep 17 00:00:00 2001
From: Clayton Walker <clayton.m.walker@gmail.com>
Date: Wed, 11 Dec 2024 12:02:20 -0700
Subject: [PATCH 1172/1272] Don't swallow IOException caused by opening socket
 (#2041)

Add additional context to socket exception
---
 .../com/github/dockerjava/okhttp/UnixSocketFactory.java    | 2 +-
 .../java/com/github/dockerjava/transport/UnixSocket.java   | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java
index dc19b1351..d25bcb3d3 100644
--- a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java
+++ b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/UnixSocketFactory.java
@@ -20,7 +20,7 @@ public Socket createSocket() {
         try {
             return UnixSocket.get(socketPath);
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new RuntimeException("Failed create socket with path " + socketPath, e);
         }
     }
 
diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java
index de447db61..eb7a49b51 100644
--- a/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java
+++ b/docker-java-transport/src/main/java/com/github/dockerjava/transport/UnixSocket.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.lang.reflect.InvocationTargetException;
 import java.net.Socket;
 import java.net.SocketAddress;
 import java.net.SocketException;
@@ -24,7 +25,8 @@ public class UnixSocket extends AbstractSocket {
     public static Socket get(String path) throws IOException {
         try {
             return new UnixSocket(path);
-        } catch (Exception e) {
+        } catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException |
+                 IllegalAccessException e) {
             //noinspection deprecation
             return DomainSocket.get(path);
         }
@@ -34,7 +36,8 @@ public static Socket get(String path) throws IOException {
 
     private final SocketChannel socketChannel;
 
-    private UnixSocket(String path) throws Exception {
+    private UnixSocket(String path) throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
+        IllegalAccessException, IOException {
         Class<?> unixDomainSocketAddress = Class.forName("java.net.UnixDomainSocketAddress");
         this.socketAddress =
             (SocketAddress) unixDomainSocketAddress.getMethod("of", String.class)

From 9f3d369bd6db48d99d8fc41109a8bca28cc604b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 11 Dec 2024 13:53:49 -0600
Subject: [PATCH 1173/1272] Set OSSRH credentials for release workflow

---
 .github/workflows/release.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ec59b2603..1517a1167 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,10 +16,15 @@ jobs:
         with:
           java-version: 8
           distribution: temurin
+          server-id: default
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_CENTRAL_TOKEN
       - name: Set version
         run: ./mvnw versions:set -DnewVersion="${{github.event.release.tag_name}}"
       # TODO check main's CI status
       - name: Deploy with Maven
         env:
           MAVEN_DEPLOYMENT_REPOSITORY: ${{ secrets.MAVEN_DEPLOYMENT_REPOSITORY }}
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          MAVEN_CENTRAL_TOKEN: ${{ secrets.OSSRH_PASSWORD }}
         run: ./mvnw deploy -DaltReleaseDeploymentRepository="$MAVEN_DEPLOYMENT_REPOSITORY" -DskipTests

From 93d1aae98fcee8bf3bcce4ed20b890c59841d0bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 16 Dec 2024 11:22:21 -0500
Subject: [PATCH 1174/1272] Switch to docker/setup-docker-action (#2374)

---
 .ci/get-docker-com.sh    | 313 ---------------------------------------
 .ci/setup_docker.sh      |  39 -----
 .github/workflows/ci.yml |  37 +++--
 3 files changed, 27 insertions(+), 362 deletions(-)
 delete mode 100755 .ci/get-docker-com.sh
 delete mode 100755 .ci/setup_docker.sh

diff --git a/.ci/get-docker-com.sh b/.ci/get-docker-com.sh
deleted file mode 100755
index d9c0142a2..000000000
--- a/.ci/get-docker-com.sh
+++ /dev/null
@@ -1,313 +0,0 @@
-#!/bin/sh
-set -e
-#
-# This script is meant for quick & easy install via:
-#   'curl -sSL https://get.docker.com/ | sh'
-# or:
-#   'wget -qO- https://get.docker.com/ | sh'
-#
-# For test builds (ie. release candidates):
-#   'curl -fsSL https://test.docker.com/ | sh'
-# or:
-#   'wget -qO- https://test.docker.com/ | sh'
-#
-# For experimental builds:
-#   'curl -fsSL https://experimental.docker.com/ | sh'
-# or:
-#   'wget -qO- https://experimental.docker.com/ | sh'
-#
-# Docker Maintainers:
-#   To update this script on https://get.docker.com,
-#   use hack/release.sh during a normal release,
-#   or the following one-liner for script hotfixes:
-#     aws s3 cp --acl public-read hack/install.sh s3://get.docker.com/index
-#
-
-url="https://get.docker.com/"
-apt_url="https://apt.dockerproject.org"
-yum_url="https://yum.dockerproject.org"
-gpg_fingerprint="58118E89F3A912897C070ADBF76221572C52609D"
-
-key_servers="
-ha.pool.sks-keyservers.net
-pgp.mit.edu
-keyserver.ubuntu.com
-"
-
-command_exists() {
-	command -v "$@" > /dev/null 2>&1
-}
-
-semverParse() {
-	major="${1%%.*}"
-	minor="${1#$major.}"
-	minor="${minor%%.*}"
-	patch="${1#$major.$minor.}"
-	patch="${patch%%[-.]*}"
-}
-
-do_install() {
-	case "$(uname -m)" in
-		*64)
-			;;
-		*)
-			cat >&2 <<-'EOF'
-			Error: you are not using a 64bit platform.
-			Docker currently only supports 64bit platforms.
-			EOF
-			exit 1
-			;;
-	esac
-
-	user="$(id -un 2>/dev/null || true)"
-
-	sh_c='sh -c'
-	if [ "$user" != 'root' ]; then
-		if command_exists sudo; then
-			sh_c='sudo -E sh -c'
-		elif command_exists su; then
-			sh_c='su -c'
-		else
-			cat >&2 <<-'EOF'
-			Error: this installer needs the ability to run commands as root.
-			We are unable to find either "sudo" or "su" available to make this happen.
-			EOF
-			exit 1
-		fi
-	fi
-
-	curl=''
-	if command_exists curl; then
-		curl='curl -sSL'
-	elif command_exists wget; then
-		curl='wget -qO-'
-	elif command_exists busybox && busybox --list-modules | grep -q wget; then
-		curl='busybox wget -qO-'
-	fi
-
-	# check to see which repo they are trying to install from
-	if [ -z "$repo" ]; then
-		repo='main'
-		if [ "https://test.docker.com/" = "$url" ]; then
-			repo='testing'
-		elif [ "https://experimental.docker.com/" = "$url" ]; then
-			repo='experimental'
-		fi
-	fi
-
-	# perform some very rudimentary platform detection
-	lsb_dist=''
-	dist_version=''
-	if command_exists lsb_release; then
-		lsb_dist="$(lsb_release -si)"
-	fi
-	if [ -z "$lsb_dist" ] && [ -r /etc/lsb-release ]; then
-		lsb_dist="$(. /etc/lsb-release && echo "$DISTRIB_ID")"
-	fi
-	if [ -z "$lsb_dist" ] && [ -r /etc/debian_version ]; then
-		lsb_dist='debian'
-	fi
-	if [ -z "$lsb_dist" ] && [ -r /etc/fedora-release ]; then
-		lsb_dist='fedora'
-	fi
-	if [ -z "$lsb_dist" ] && [ -r /etc/oracle-release ]; then
-		lsb_dist='oracleserver'
-	fi
-	if [ -z "$lsb_dist" ]; then
-		if [ -r /etc/centos-release ] || [ -r /etc/redhat-release ]; then
-			lsb_dist='centos'
-		fi
-	fi
-	if [ -z "$lsb_dist" ] && [ -r /etc/os-release ]; then
-		lsb_dist="$(. /etc/os-release && echo "$ID")"
-	fi
-
-	lsb_dist="$(echo "$lsb_dist" | tr '[:upper:]' '[:lower:]')"
-
-	case "$lsb_dist" in
-
-		ubuntu)
-			if command_exists lsb_release; then
-				dist_version="$(lsb_release --codename | cut -f2)"
-			fi
-			if [ -z "$dist_version" ] && [ -r /etc/lsb-release ]; then
-				dist_version="$(. /etc/lsb-release && echo "$DISTRIB_CODENAME")"
-			fi
-		;;
-
-		debian)
-			dist_version="$(cat /etc/debian_version | sed 's/\/.*//' | sed 's/\..*//')"
-			case "$dist_version" in
-				8)
-					dist_version="jessie"
-				;;
-				7)
-					dist_version="wheezy"
-				;;
-			esac
-		;;
-
-		oracleserver)
-			# need to switch lsb_dist to match yum repo URL
-			lsb_dist="oraclelinux"
-			dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//')"
-		;;
-
-		fedora|centos)
-			dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//')"
-		;;
-
-		*)
-			if command_exists lsb_release; then
-				dist_version="$(lsb_release --codename | cut -f2)"
-			fi
-			if [ -z "$dist_version" ] && [ -r /etc/os-release ]; then
-				dist_version="$(. /etc/os-release && echo "$VERSION_ID")"
-			fi
-		;;
-
-
-	esac
-
-
-	# Run setup for each distro accordingly
-	case "$lsb_dist" in
-		ubuntu|debian)
-			export DEBIAN_FRONTEND=noninteractive
-
-			did_apt_get_update=
-			apt_get_update() {
-				if [ -z "$did_apt_get_update" ]; then
-					( set -x; $sh_c 'sleep 3; apt-get update' )
-					did_apt_get_update=1
-				fi
-			}
-
-			# aufs is preferred over devicemapper; try to ensure the driver is available.
-			if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then
-				if uname -r | grep -q -- '-generic' && dpkg -l 'linux-image-*-generic' | grep -qE '^ii|^hi' 2>/dev/null; then
-					kern_extras="linux-image-extra-$(uname -r) linux-image-extra-virtual"
-
-					apt_get_update
-					( set -x; $sh_c 'sleep 3; apt-get install -y -q '"$kern_extras" ) || true
-
-					if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then
-						echo >&2 'Warning: tried to install '"$kern_extras"' (for AUFS)'
-						echo >&2 ' but we still have no AUFS.  Docker may not work. Proceeding anyways!'
-						( set -x; sleep 10 )
-					fi
-				else
-					echo >&2 'Warning: current kernel is not supported by the linux-image-extra-virtual'
-					echo >&2 ' package.  We have no AUFS support.  Consider installing the packages'
-					echo >&2 ' linux-image-virtual kernel and linux-image-extra-virtual for AUFS support.'
-					( set -x; sleep 10 )
-				fi
-			fi
-
-			# install apparmor utils if they're missing and apparmor is enabled in the kernel
-			# otherwise Docker will fail to start
-			if [ "$(cat /sys/module/apparmor/parameters/enabled 2>/dev/null)" = 'Y' ]; then
-				if command -v apparmor_parser >/dev/null 2>&1; then
-					echo 'apparmor is enabled in the kernel and apparmor utils were already installed'
-				else
-					echo 'apparmor is enabled in the kernel, but apparmor_parser missing'
-					apt_get_update
-					( set -x; $sh_c 'sleep 3; apt-get install -y -q apparmor' )
-				fi
-			fi
-
-			if [ ! -e /usr/lib/apt/methods/https ]; then
-				apt_get_update
-				( set -x; $sh_c 'sleep 3; apt-get install -y -q apt-transport-https ca-certificates' )
-			fi
-			if [ -z "$curl" ]; then
-				apt_get_update
-				( set -x; $sh_c 'sleep 3; apt-get install -y -q curl ca-certificates' )
-				curl='curl -sSL'
-			fi
-			(
-			set -x
-			for key_server in $key_servers ; do
-				$sh_c "apt-key adv --keyserver hkp://${key_server}:80 --recv-keys ${gpg_fingerprint}" && break
-			done
-			$sh_c "apt-key adv -k ${gpg_fingerprint} >/dev/null"
-			$sh_c "mkdir -p /etc/apt/sources.list.d"
-			$sh_c "echo deb [arch=$(dpkg --print-architecture)] ${apt_url}/repo ${lsb_dist}-${dist_version} ${repo} > /etc/apt/sources.list.d/docker.list"
-			$sh_c 'sleep 3; apt-get update'
-			if [ -z "$DOCKER_VERSION" ]; then
-			    $sh_c 'apt-get -o Dpkg::Options::="--force-confnew" install -y -q docker-engine'
-			else
-			    $sh_c "apt-get -o Dpkg::Options::=\"--force-confnew\" install -y -q docker-engine=$DOCKER_VERSION"
-			fi
-			)
-			exit 0
-			;;
-
-		fedora|centos|oraclelinux)
-			$sh_c "cat >/etc/yum.repos.d/docker-${repo}.repo" <<-EOF
-			[docker-${repo}-repo]
-			name=Docker ${repo} Repository
-			baseurl=${yum_url}/repo/${repo}/${lsb_dist}/${dist_version}
-			enabled=1
-			gpgcheck=1
-			gpgkey=${yum_url}/gpg
-			EOF
-			if [ "$lsb_dist" = "fedora" ] && [ "$dist_version" -ge "22" ]; then
-				(
-					set -x
-					$sh_c 'sleep 3; dnf -y -q install docker-engine'
-				)
-			else
-				(
-					set -x
-					$sh_c 'sleep 3; yum -y -q install docker-engine'
-				)
-			fi
-			exit 0
-			;;
-		gentoo)
-			if [ "$url" = "https://test.docker.com/" ]; then
-				# intentionally mixed spaces and tabs here -- tabs are stripped by "<<-'EOF'", spaces are kept in the output
-				cat >&2 <<-'EOF'
-
-				  You appear to be trying to install the latest nightly build in Gentoo.'
-				  The portage tree should contain the latest stable release of Docker, but'
-				  if you want something more recent, you can always use the live ebuild'
-				  provided in the "docker" overlay available via layman.  For more'
-				  instructions, please see the following URL:'
-
-				    https://github.com/tianon/docker-overlay#using-this-overlay'
-
-				  After adding the "docker" overlay, you should be able to:'
-
-				    emerge -av =app-emulation/docker-9999'
-
-				EOF
-				exit 1
-			fi
-
-			(
-				set -x
-				$sh_c 'sleep 3; emerge app-emulation/docker'
-			)
-			exit 0
-			;;
-	esac
-
-	# intentionally mixed spaces and tabs here -- tabs are stripped by "<<-'EOF'", spaces are kept in the output
-	cat >&2 <<-'EOF'
-
-	  Either your platform is not easily detectable, is not supported by this
-	  installer script (yet - PRs welcome! [hack/install.sh]), or does not yet have
-	  a package for Docker.  Please visit the following URL for more detailed
-	  installation instructions:
-
-	    https://docs.docker.com/engine/installation/
-
-	EOF
-	exit 1
-}
-
-# wrapped up in a function so that we have some protection against only getting
-# half the file during "curl | sh"
-do_install
diff --git a/.ci/setup_docker.sh b/.ci/setup_docker.sh
deleted file mode 100755
index df9cf205a..000000000
--- a/.ci/setup_docker.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-
-set -exu
-
-DOCKER_VERSION="${DOCKER_VERSION:-}"
-DOCKER_HOST="${DOCKER_HOST:-}"
-
-if [[ -n $DOCKER_VERSION ]]; then
-    sudo -E apt-get -q -y --purge remove docker-engine docker-ce
-
-    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-    sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-    sudo apt-get update
-    sudo apt-cache madison docker-ce
-    sudo apt-get install "docker-ce=$DOCKER_VERSION"
-fi
-
-if [[ -n $DOCKER_HOST ]]; then
-    sudo mkdir -p /etc/systemd/system/docker.service.d/
-
-    echo "
-[Service]
-ExecStart=
-ExecStart=/usr/bin/dockerd -H $DOCKER_HOST -H unix:///var/run/docker.sock
-    " | sudo tee -a /etc/systemd/system/docker.service.d/override.conf
-
-    sudo systemctl daemon-reload
-    sudo service docker restart || sudo journalctl -xe
-    sudo service docker status
-fi
-
-while (! docker ps ); do
-  echo "Waiting for Docker to launch..."
-  sleep 1
-done
-docker version
-docker info
-
-docker run --rm hello-world
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 03cc0034d..b7aaef550 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,9 +15,7 @@ jobs:
           - { name: "default", javaVersion: 8 }
           - { name: "default", javaVersion: 17 }
           - { name: "default", javaVersion: 21 }
-          - { name: "over TCP", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 }
-          - { name: "Docker 19.03.9", dockerVersion: "5:19.03.9~3-0~ubuntu-focal", javaVersion: 8 }
-
+          - { name: "Docker 19.03.9", dockerVersion: "v19.03.9", javaVersion: 8 }
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
@@ -26,13 +24,32 @@ jobs:
           java-version: ${{matrix.javaVersion}}
           distribution: temurin
       - name: Configure Docker
+        id: setup_docker
+        uses: docker/setup-docker-action@v4
+        with:
+          version: ${{matrix.dockerVersion}}
+          channel: stable
+      - name: Build with Maven
         env:
-          DOCKER_VERSION: ${{matrix.dockerVersion}}
-          DOCKER_HOST: ${{matrix.dockerHost}}
-        run: .ci/setup_docker.sh
+          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
+        run: ./mvnw --no-transfer-progress verify
+
+  tcp:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: 8
+          distribution: temurin
+      - name: Configure Docker
+        id: setup_docker
+        uses: docker/setup-docker-action@v4
+        with:
+          channel: stable
+          tcp-port: 2375
       - name: Build with Maven
         env:
-          DOCKER_HOST: ${{matrix.dockerHost}}
-        run: |
-          [[ -z "$DOCKER_HOST" ]] && unset DOCKER_HOST
-          ./mvnw --no-transfer-progress verify
+          DOCKER_HOST: ${{steps.setup_docker.outputs.tcp}}
+        run: ./mvnw --no-transfer-progress verify

From 2d129c317e47a9f3a92d0739a8be775f1452ea02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 6 Mar 2025 11:01:07 -0600
Subject: [PATCH 1175/1272] Add MountType.Image and ImageOptions (#2386)

Supported in API v1.48
---
 .../dockerjava/api/model/ImageOptions.java    | 27 +++++++++++++++++++
 .../github/dockerjava/api/model/Mount.java    | 25 +++++++++++++++++
 .../dockerjava/api/model/MountType.java       |  6 ++++-
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageOptions.java

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageOptions.java
new file mode 100644
index 000000000..bc8b89acb
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageOptions.java
@@ -0,0 +1,27 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_48}
+ */
+@EqualsAndHashCode
+@ToString
+public class ImageOptions extends DockerObject implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @JsonProperty("Subpath")
+    private String subpath;
+
+    public String getSubpath() {
+        return subpath;
+    }
+
+    public ImageOptions withSubpath(String subpath) {
+        this.subpath = subpath;
+        return this;
+    }
+}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java
index 9bfe9b16e..3f17343c3 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java
@@ -57,6 +57,12 @@ public class Mount extends DockerObject implements Serializable {
     @JsonProperty("TmpfsOptions")
     private TmpfsOptions tmpfsOptions;
 
+    /**
+     * @since 1.48
+     */
+    @JsonProperty("ImageOptions")
+    private ImageOptions imageOptions;
+
     /**
      * @see #type
      */
@@ -177,4 +183,23 @@ public Mount withTmpfsOptions(TmpfsOptions tmpfsOptions) {
         }
         return this;
     }
+
+    /**
+     * @see #imageOptions
+     */
+    @CheckForNull
+    public ImageOptions getImageOptions() {
+        return imageOptions;
+    }
+
+    /**
+     * @see #imageOptions
+     */
+    public Mount withImageOptions(ImageOptions imageOptions) {
+        this.imageOptions = imageOptions;
+        if (imageOptions != null) {
+            this.type = MountType.IMAGE;
+        }
+        return this;
+    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java
index 219782a56..b522c9612 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java
@@ -18,6 +18,10 @@ public enum MountType {
 
     //@since 1.40
     @JsonProperty("npipe")
-    NPIPE
+    NPIPE,
+
+    //@since 1.48
+    @JsonProperty("image")
+    IMAGE,
 
 }

From 6ae1eb4481d22985018ec3bcd1c5e51628d14b5a Mon Sep 17 00:00:00 2001
From: Lars <60571459+LarsSven@users.noreply.github.com>
Date: Thu, 20 Mar 2025 16:38:54 +0100
Subject: [PATCH 1176/1272] Add setters for security options and runtimes
 (#2384)

---
 .../com/github/dockerjava/api/model/Info.java | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
index 75afefd2b..67348b86b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
@@ -1108,14 +1108,33 @@ public Info withIsolation(String isolation) {
         return this;
     }
 
+    /**
+     * @see #securityOptions
+     */
     public List<String> getSecurityOptions() {
         return securityOptions;
     }
 
+    /**
+     * @see #securityOptions
+     */
+    public Info withSecurityOptions(List<String> securityOptions) {
+        this.securityOptions = securityOptions;
+        return this;
+    }
+
     /**
      * @see #runtimes
      */
     public Map<String, RuntimeInfo> getRuntimes() {
         return runtimes;
     }
+
+    /**
+     * @see #runtimes
+     */
+    public Info withRuntimes(Map<String, RuntimeInfo> runtimes) {
+        this.runtimes = runtimes;
+        return this;
+    }
 }

From ece155bc78dd48cdea2b75219e5950c70be29437 Mon Sep 17 00:00:00 2001
From: Oleg Kalnichevski <olegk@apache.org>
Date: Tue, 1 Apr 2025 17:44:59 +0200
Subject: [PATCH 1177/1272] Upgrade Apache HttpClient to version 5.4 (#2364)

* Upgraded Apache HttpClient to version 5.4.2; Fixed connection initialization for non-HTTP protocol

* Remove usage of deprecated API
---
 docker-java-transport-httpclient5/pom.xml     |   2 +-
 .../ApacheDockerHttpClientImpl.java           | 123 ++++++++----------
 .../HijackingHttpRequestExecutor.java         |   8 +-
 3 files changed, 58 insertions(+), 75 deletions(-)

diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml
index 48b751d56..54c90185a 100644
--- a/docker-java-transport-httpclient5/pom.xml
+++ b/docker-java-transport-httpclient5/pom.xml
@@ -29,7 +29,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents.client5</groupId>
 			<artifactId>httpclient5</artifactId>
-			<version>5.0.3</version>
+			<version>5.4.2</version>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
index 4820c65e5..c97a2bc45 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
@@ -4,31 +4,34 @@
 import com.github.dockerjava.transport.NamedPipeSocket;
 import com.github.dockerjava.transport.SSLConfig;
 import com.github.dockerjava.transport.UnixSocket;
+
+import org.apache.hc.client5.http.SystemDefaultDnsResolver;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
+import org.apache.hc.client5.http.config.ConnectionConfig;
 import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.DefaultSchemePortResolver;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
 import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.impl.io.DefaultHttpClientConnectionOperator;
 import org.apache.hc.client5.http.impl.io.ManagedHttpClientConnectionFactory;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
-import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
-import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
-import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.client5.http.io.HttpClientConnectionOperator;
+import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
+import org.apache.hc.client5.http.ssl.TlsSocketStrategy;
+import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.ConnectionClosedException;
 import org.apache.hc.core5.http.ContentLengthStrategy;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.NameValuePair;
-import org.apache.hc.core5.http.config.Registry;
-import org.apache.hc.core5.http.config.RegistryBuilder;
 import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy;
-import org.apache.hc.core5.http.impl.io.EmptyInputStream;
 import org.apache.hc.core5.http.io.SocketConfig;
 import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
+import org.apache.hc.core5.http.io.entity.EmptyInputStream;
 import org.apache.hc.core5.http.io.entity.InputStreamEntity;
-import org.apache.hc.core5.http.protocol.BasicHttpContext;
 import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
 import org.apache.hc.core5.net.URIAuthority;
 import org.apache.hc.core5.util.TimeValue;
 import org.apache.hc.core5.util.Timeout;
@@ -38,7 +41,6 @@
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.URI;
 import java.time.Duration;
@@ -61,7 +63,13 @@ protected ApacheDockerHttpClientImpl(
         Duration connectionTimeout,
         Duration responseTimeout
     ) {
-        Registry<ConnectionSocketFactory> socketFactoryRegistry = createConnectionSocketFactoryRegistry(sslConfig, dockerHost);
+        SSLContext sslContext;
+        try {
+            sslContext = sslConfig != null ? sslConfig.getSSLContext() : null;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        HttpClientConnectionOperator connectionOperator = createConnectionOperator(dockerHost, sslContext);
 
         switch (dockerHost.getScheme()) {
             case "unix":
@@ -75,7 +83,7 @@ protected ApacheDockerHttpClientImpl(
                     ? rawPath.substring(0, rawPath.length() - 1)
                     : rawPath;
                 host = new HttpHost(
-                    socketFactoryRegistry.lookup("https") != null ? "https" : "http",
+                    sslContext != null ? "https" : "http",
                     dockerHost.getHost(),
                     dockerHost.getPort()
                 );
@@ -85,7 +93,10 @@ protected ApacheDockerHttpClientImpl(
         }
 
         PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(
-            socketFactoryRegistry,
+            connectionOperator,
+            null,
+            null,
+            null,
             new ManagedHttpClientConnectionFactory(
                 null,
                 null,
@@ -109,77 +120,49 @@ protected ApacheDockerHttpClientImpl(
                 .setSoTimeout(Timeout.ZERO_MILLISECONDS)
                 .build()
         );
-        connectionManager.setValidateAfterInactivity(TimeValue.NEG_ONE_SECOND);
         connectionManager.setMaxTotal(maxConnections);
         connectionManager.setDefaultMaxPerRoute(maxConnections);
-        RequestConfig.Builder defaultRequest = RequestConfig.custom();
-        if (connectionTimeout != null) {
-            defaultRequest.setConnectTimeout(connectionTimeout.toNanos(), TimeUnit.NANOSECONDS);
-        }
-        if (responseTimeout != null) {
-            defaultRequest.setResponseTimeout(responseTimeout.toNanos(), TimeUnit.NANOSECONDS);
-        }
+        connectionManager.setDefaultConnectionConfig(ConnectionConfig.custom()
+            .setValidateAfterInactivity(TimeValue.NEG_ONE_SECOND)
+            .setConnectTimeout(connectionTimeout != null ? Timeout.of(connectionTimeout.toNanos(), TimeUnit.NANOSECONDS) : null)
+            .build());
 
         httpClient = HttpClients.custom()
             .setRequestExecutor(new HijackingHttpRequestExecutor(null))
             .setConnectionManager(connectionManager)
-            .setDefaultRequestConfig(defaultRequest.build())
+            .setDefaultRequestConfig(RequestConfig.custom()
+                .setResponseTimeout(responseTimeout != null ? Timeout.of(responseTimeout.toNanos(), TimeUnit.NANOSECONDS) : null)
+                .build())
             .disableConnectionState()
             .build();
     }
 
-    private Registry<ConnectionSocketFactory> createConnectionSocketFactoryRegistry(
-        SSLConfig sslConfig,
-        URI dockerHost
+    private HttpClientConnectionOperator createConnectionOperator(
+        URI dockerHost,
+        SSLContext sslContext
     ) {
-        RegistryBuilder<ConnectionSocketFactory> socketFactoryRegistryBuilder = RegistryBuilder.create();
-
-        if (sslConfig != null) {
-            try {
-                SSLContext sslContext = sslConfig.getSSLContext();
-                if (sslContext != null) {
-                    socketFactoryRegistryBuilder.register("https", new SSLConnectionSocketFactory(sslContext));
-                }
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        return socketFactoryRegistryBuilder
-            .register("tcp", PlainConnectionSocketFactory.INSTANCE)
-            .register("http", PlainConnectionSocketFactory.INSTANCE)
-            .register("unix", new ConnectionSocketFactory() {
-                @Override
-                public Socket createSocket(HttpContext context) throws IOException {
-                    return UnixSocket.get(dockerHost.getPath());
+        String dockerHostScheme = dockerHost.getScheme();
+        String dockerHostPath = dockerHost.getPath();
+        TlsSocketStrategy tlsSocketStrategy = sslContext != null ?
+            new DefaultClientTlsStrategy(sslContext) : DefaultClientTlsStrategy.createSystemDefault();
+        return new DefaultHttpClientConnectionOperator(
+            socksProxy -> {
+                if ("unix".equalsIgnoreCase(dockerHostScheme)) {
+                    return UnixSocket.get(dockerHostPath);
+                } else if ("npipe".equalsIgnoreCase(dockerHostScheme)) {
+                    return new NamedPipeSocket(dockerHostPath);
+                } else {
+                    return socksProxy == null ? new Socket() : new Socket(socksProxy);
                 }
-
-                @Override
-                public Socket connectSocket(TimeValue timeValue, Socket socket, HttpHost httpHost, InetSocketAddress inetSocketAddress,
-                                            InetSocketAddress inetSocketAddress1, HttpContext httpContext) throws IOException {
-                    return PlainConnectionSocketFactory.INSTANCE.connectSocket(timeValue, socket, httpHost, inetSocketAddress,
-                        inetSocketAddress1, httpContext);
-                }
-            })
-            .register("npipe", new ConnectionSocketFactory() {
-                @Override
-                public Socket createSocket(HttpContext context) {
-                    return new NamedPipeSocket(dockerHost.getPath());
-                }
-
-                @Override
-                public Socket connectSocket(TimeValue timeValue, Socket socket, HttpHost httpHost, InetSocketAddress inetSocketAddress,
-                                            InetSocketAddress inetSocketAddress1, HttpContext httpContext) throws IOException {
-                    return PlainConnectionSocketFactory.INSTANCE.connectSocket(timeValue, socket, httpHost, inetSocketAddress,
-                        inetSocketAddress1, httpContext);
-                }
-            })
-            .build();
+            },
+            DefaultSchemePortResolver.INSTANCE,
+            SystemDefaultDnsResolver.INSTANCE,
+            name -> "https".equalsIgnoreCase(name) ? tlsSocketStrategy : null);
     }
 
     @Override
     public Response execute(Request request) {
-        HttpContext context = new BasicHttpContext();
+        HttpContext context = new HttpCoreContext();
         HttpUriRequestBase httpUriRequest = new HttpUriRequestBase(request.method(), URI.create(pathPrefix + request.path()));
         httpUriRequest.setScheme(host.getSchemeName());
         httpUriRequest.setAuthority(new URIAuthority(host.getHostName(), host.getPort()));
@@ -203,7 +186,7 @@ public Response execute(Request request) {
         }
 
         try {
-            CloseableHttpResponse response = httpClient.execute(host, httpUriRequest, context);
+            ClassicHttpResponse response = httpClient.executeOpen(host, httpUriRequest, context);
 
             return new ApacheResponse(httpUriRequest, response);
         } catch (IOException e) {
@@ -222,9 +205,9 @@ static class ApacheResponse implements Response {
 
         private final HttpUriRequestBase request;
 
-        private final CloseableHttpResponse response;
+        private final ClassicHttpResponse response;
 
-        ApacheResponse(HttpUriRequestBase httpUriRequest, CloseableHttpResponse response) {
+        ApacheResponse(HttpUriRequestBase httpUriRequest, ClassicHttpResponse response) {
             this.request = httpUriRequest;
             this.response = response;
         }
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java
index 59888a5dd..df8fbd059 100644
--- a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java
+++ b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java
@@ -44,7 +44,7 @@ public ClassicHttpResponse execute(
 
         InputStream hijackedInput = (InputStream) context.getAttribute(HIJACKED_INPUT_ATTRIBUTE);
         if (hijackedInput != null) {
-            return executeHijacked(request, conn, context, hijackedInput);
+            return executeHijacked(request, conn, (HttpCoreContext) context, hijackedInput);
         }
 
         return super.execute(request, conn, informationCallback, context);
@@ -53,12 +53,12 @@ public ClassicHttpResponse execute(
     private ClassicHttpResponse executeHijacked(
         ClassicHttpRequest request,
         HttpClientConnection conn,
-        HttpContext context,
+        HttpCoreContext context,
         InputStream hijackedInput
     ) throws HttpException, IOException {
         try {
-            context.setAttribute(HttpCoreContext.SSL_SESSION, conn.getSSLSession());
-            context.setAttribute(HttpCoreContext.CONNECTION_ENDPOINT, conn.getEndpointDetails());
+            context.setSSLSession(conn.getSSLSession());
+            context.setEndpointDetails(conn.getEndpointDetails());
             final ProtocolVersion transportVersion = request.getVersion();
             if (transportVersion != null) {
                 context.setProtocolVersion(transportVersion);

From 3a367b6ab2336cf1f61106ffa2c30545277b7ad3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 10:24:18 -0600
Subject: [PATCH 1178/1272] Bump org.assertj:assertj-core from 3.24.2 to 3.27.3
 (#2291)

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.27.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.27.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-tck/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml
index 2e4bd79ce..4d6dd5738 100644
--- a/docker-java-transport-tck/pom.xml
+++ b/docker-java-transport-tck/pom.xml
@@ -34,7 +34,7 @@
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<version>3.24.2</version>
+			<version>3.27.3</version>
 		</dependency>
 
 		<dependency>

From 97ea93b416d1e29b8614a7278f8a5850111735d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 10:25:34 -0600
Subject: [PATCH 1179/1272] Bump org.apache.httpcomponents.client5:httpclient5
 from 5.4.2 to 5.4.3 (#2272)

Bumps [org.apache.httpcomponents.client5:httpclient5](https://github.com/apache/httpcomponents-client) from 5.4.2 to 5.4.3.
- [Changelog](https://github.com/apache/httpcomponents-client/blob/master/RELEASE_NOTES.txt)
- [Commits](https://github.com/apache/httpcomponents-client/compare/rel/v5.4.2...rel/v5.4.3)

---
updated-dependencies:
- dependency-name: org.apache.httpcomponents.client5:httpclient5
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-httpclient5/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml
index 54c90185a..71f0ada1d 100644
--- a/docker-java-transport-httpclient5/pom.xml
+++ b/docker-java-transport-httpclient5/pom.xml
@@ -29,7 +29,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents.client5</groupId>
 			<artifactId>httpclient5</artifactId>
-			<version>5.4.2</version>
+			<version>5.4.3</version>
 		</dependency>
 
 		<dependency>

From 24204a57ca95ea8108709843eba5750ba3a3bc33 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 10:30:51 -0600
Subject: [PATCH 1180/1272] Bump junixsocket.version from 2.6.1 to 2.10.1
 (#2249)

Bumps `junixsocket.version` from 2.6.1 to 2.10.1.

Updates `com.kohlschutter.junixsocket:junixsocket-common` from 2.6.1 to 2.10.1
- [Release notes](https://github.com/kohlschutter/junixsocket/releases)
- [Commits](https://github.com/kohlschutter/junixsocket/compare/junixsocket-2.6.1...junixsocket-2.10.1)

---
updated-dependencies:
- dependency-name: com.kohlschutter.junixsocket:junixsocket-common
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.kohlschutter.junixsocket:junixsocket-native-common
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f58a3d448..00125501f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
 		<slf4j-api.version>1.7.30</slf4j-api.version>
 
 		<bouncycastle.version>1.76</bouncycastle.version>
-		<junixsocket.version>2.6.1</junixsocket.version>
+		<junixsocket.version>2.10.1</junixsocket.version>
 		<guava.version>19.0</guava.version> <!-- todo remove from project -->
 
 		<!-- test dependencies -->

From ed50e5c186fb66e462d5d77c9371c874e8bf6eef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 10:31:35 -0600
Subject: [PATCH 1181/1272] Bump org.junit.jupiter:junit-jupiter from 5.10.0 to
 5.12.1 (#2241)

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.10.0 to 5.12.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.0...r5.12.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 82d176e38..ce52af8c2 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.10.0</version>
+			<version>5.12.1</version>
 			<scope>test</scope>
 		</dependency>
 

From 37a7d00e6fca2e4d33bfd37163af77ef50c19bb6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 10:32:17 -0600
Subject: [PATCH 1182/1272] Bump com.github.siom79.japicmp:japicmp-maven-plugin
 (#2238)

Bumps [com.github.siom79.japicmp:japicmp-maven-plugin](https://github.com/siom79/japicmp) from 0.18.2 to 0.23.1.
- [Release notes](https://github.com/siom79/japicmp/releases)
- [Changelog](https://github.com/siom79/japicmp/blob/master/release.py)
- [Commits](https://github.com/siom79/japicmp/compare/japicmp-base-0.18.2...japicmp-base-0.23.1)

---
updated-dependencies:
- dependency-name: com.github.siom79.japicmp:japicmp-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 00125501f..ca273f658 100644
--- a/pom.xml
+++ b/pom.xml
@@ -244,7 +244,7 @@
 					<!-- use with "mvn -DskipTests clean verify" -->
 					<groupId>com.github.siom79.japicmp</groupId>
 					<artifactId>japicmp-maven-plugin</artifactId>
-					<version>0.18.3</version>
+					<version>0.23.1</version>
 					<configuration>
 						<oldVersion>
 							<dependency>

From b7415f805d39071e3484d2bdcb8177013aad9aac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 10:33:06 -0600
Subject: [PATCH 1183/1272] Bump org.apache.commons:commons-lang3 from 3.12.0
 to 3.17.0 (#2259)

Bumps org.apache.commons:commons-lang3 from 3.12.0 to 3.17.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ca273f658..c05699a5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
 		<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
 		<commons-compress.version>1.21</commons-compress.version>
 		<commons-io.version>2.13.0</commons-io.version>
-		<commons-lang3.version>3.12.0</commons-lang3.version>
+		<commons-lang3.version>3.17.0</commons-lang3.version>
 		<slf4j-api.version>1.7.30</slf4j-api.version>
 
 		<bouncycastle.version>1.76</bouncycastle.version>

From 3580299112bf27953a64f80c7de1bb0c7075a7bf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 10:40:00 -0600
Subject: [PATCH 1184/1272] Bump net.java.dev.jna:jna from 5.13.0 to 5.17.0
 (#2273)

Bumps [net.java.dev.jna:jna](https://github.com/java-native-access/jna) from 5.13.0 to 5.17.0.
- [Changelog](https://github.com/java-native-access/jna/blob/master/CHANGES.md)
- [Commits](https://github.com/java-native-access/jna/compare/5.13.0...5.17.0)

---
updated-dependencies:
- dependency-name: net.java.dev.jna:jna
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-httpclient5/pom.xml | 2 +-
 docker-java-transport-okhttp/pom.xml      | 2 +-
 docker-java-transport/pom.xml             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml
index 71f0ada1d..0e82715e9 100644
--- a/docker-java-transport-httpclient5/pom.xml
+++ b/docker-java-transport-httpclient5/pom.xml
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.13.0</version>
+			<version>5.17.0</version>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index df14ad077..3bac0cead 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.13.0</version>
+			<version>5.17.0</version>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml
index 2ca377dd6..3f595903a 100644
--- a/docker-java-transport/pom.xml
+++ b/docker-java-transport/pom.xml
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.13.0</version>
+			<version>5.17.0</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

From 31d5a2126569d30b7c630a573c3dfe600237f1b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 10:49:07 -0600
Subject: [PATCH 1185/1272] Bump commons-io:commons-io from 2.13.0 to 2.18.0
 (#2263)

Bumps commons-io:commons-io from 2.13.0 to 2.18.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c05699a5f..ba67f88c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
 		<jackson-jaxrs.version>2.10.3</jackson-jaxrs.version>
 		<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
 		<commons-compress.version>1.21</commons-compress.version>
-		<commons-io.version>2.13.0</commons-io.version>
+		<commons-io.version>2.18.0</commons-io.version>
 		<commons-lang3.version>3.17.0</commons-lang3.version>
 		<slf4j-api.version>1.7.30</slf4j-api.version>
 

From 41acb642c1209089fa3af875e4f4b3bcc4603817 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 10:55:01 -0600
Subject: [PATCH 1186/1272] Bump org.bouncycastle:bcpkix-jdk18on from 1.76 to
 1.80 (#2254)

Bumps [org.bouncycastle:bcpkix-jdk18on](https://github.com/bcgit/bc-java) from 1.76 to 1.80.
- [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html)
- [Commits](https://github.com/bcgit/bc-java/commits)

---
updated-dependencies:
- dependency-name: org.bouncycastle:bcpkix-jdk18on
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ba67f88c6..3c75097d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
 		<commons-lang3.version>3.17.0</commons-lang3.version>
 		<slf4j-api.version>1.7.30</slf4j-api.version>
 
-		<bouncycastle.version>1.76</bouncycastle.version>
+		<bouncycastle.version>1.80</bouncycastle.version>
 		<junixsocket.version>2.10.1</junixsocket.version>
 		<guava.version>19.0</guava.version> <!-- todo remove from project -->
 

From 4a9bf71248a15c35896ffbd56d737d562e8e909a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 10:56:40 -0600
Subject: [PATCH 1187/1272] Bump netty.version from 4.1.46.Final to
 4.1.119.Final (#2302)

Bumps `netty.version` from 4.1.46.Final to 4.1.119.Final.

Updates `io.netty:netty-codec-http` from 4.1.46.Final to 4.1.119.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.46.Final...netty-4.1.119.Final)

Updates `io.netty:netty-handler` from 4.1.46.Final to 4.1.106.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.46.Final...netty-4.1.119.Final)

Updates `io.netty:netty-handler-proxy` from 4.1.46.Final to 4.1.106.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.46.Final...netty-4.1.119.Final)

Updates `io.netty:netty-transport-native-epoll` from 4.1.46.Final to 4.1.106.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.46.Final...netty-4.1.119.Final)

Updates `io.netty:netty-transport-native-kqueue` from 4.1.46.Final to 4.1.106.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.46.Final...netty-4.1.119.Final)

---
updated-dependencies:
- dependency-name: io.netty:netty-codec-http
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-handler
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-handler-proxy
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-transport-native-epoll
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-transport-native-kqueue
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3c75097d6..71c5c6025 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
 
 		<!-- test dependencies -->
 		<logback.version>1.2.3</logback.version>
-		<netty.version>4.1.46.Final</netty.version>
+		<netty.version>4.1.119.Final</netty.version>
 		<hamcrest.library.version>2.2</hamcrest.library.version>
 		<hamcrest.jpa-matchers>1.8</hamcrest.jpa-matchers>
 		<lambdaj.version>2.3.3</lambdaj.version>

From 353554b001ecdbf556326b83e7d56d0b56b9dd1f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 11:19:35 -0600
Subject: [PATCH 1188/1272] Bump jackson.version from 2.8.8 to 2.18.3 (#2283)

Bumps `jackson.version` from 2.8.8 to 2.18.3.

Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.8.8 to 2.18.3
- [Commits](https://github.com/FasterXML/jackson/commits)

Updates `com.fasterxml.jackson.core:jackson-databind` from 2.8.8 to 2.18.3
- [Commits](https://github.com/FasterXML/jackson/commits)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-annotations
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java/pom.xml | 8 ++++----
 pom.xml             | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index e3c3690f1..a80e7eeef 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -125,16 +125,16 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<!-- Force the version to 2.8.8 to ensure the compatibility with old projects -->
-			<version>2.8.8</version>
+			<!-- Force the version to 2.18.3 to ensure the compatibility with old projects -->
+			<version>2.18.3</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<!-- Force the version to 2.8.8 to ensure the compatibility with old projects -->
-			<version>2.8.8</version>
+			<!-- Force the version to 2.18.3 to ensure the compatibility with old projects -->
+			<version>2.18.3</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/pom.xml b/pom.xml
index 71c5c6025..63d09355c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
 		<jdk.target>1.8</jdk.target>
 
 		<jersey.version>2.30.1</jersey.version>
-		<jackson.version>2.10.3</jackson.version>
+		<jackson.version>2.18.3</jackson.version>
 		<jackson-jaxrs.version>2.10.3</jackson-jaxrs.version>
 		<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
 		<commons-compress.version>1.21</commons-compress.version>

From 4fe0ae49268e873eb358b994fdd277718e287402 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 11:31:36 -0600
Subject: [PATCH 1189/1272] Bump
 com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider (#2281)

Bumps com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider from 2.10.3 to 2.18.3.

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 63d09355c..05585d331 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
 
 		<jersey.version>2.30.1</jersey.version>
 		<jackson.version>2.18.3</jackson.version>
-		<jackson-jaxrs.version>2.10.3</jackson-jaxrs.version>
+		<jackson-jaxrs.version>2.18.3</jackson-jaxrs.version>
 		<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
 		<commons-compress.version>1.21</commons-compress.version>
 		<commons-io.version>2.18.0</commons-io.version>

From 4bfb74f88485a36dd0c09ae093edbcaa66d93722 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 11:38:22 -0600
Subject: [PATCH 1190/1272] Bump org.projectlombok:lombok from 1.18.22 to
 1.18.38 (#2210)

Bumps [org.projectlombok:lombok](https://github.com/projectlombok/lombok) from 1.18.22 to 1.18.38.
- [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/projectlombok/lombok/compare/v1.18.22...v1.18.38)

---
updated-dependencies:
- dependency-name: org.projectlombok:lombok
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-api/pom.xml | 2 +-
 docker-java/pom.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index ce52af8c2..839d6ccb2 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -42,7 +42,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.30</version>
+			<version>1.18.38</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index a80e7eeef..de8cb9c88 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -141,7 +141,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.30</version>
+			<version>1.18.38</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

From a349b48b20b51c35129c6bbbb9535d226d9c1c36 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 12:04:25 -0600
Subject: [PATCH 1191/1272] Bump org.apache.commons:commons-compress from 1.21
 to 1.27.1 (#2256)

Bumps org.apache.commons:commons-compress from 1.21 to 1.27.1.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-compress
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 05585d331..8ec664b11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
 		<jackson.version>2.18.3</jackson.version>
 		<jackson-jaxrs.version>2.18.3</jackson-jaxrs.version>
 		<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
-		<commons-compress.version>1.21</commons-compress.version>
+		<commons-compress.version>1.27.1</commons-compress.version>
 		<commons-io.version>2.18.0</commons-io.version>
 		<commons-lang3.version>3.17.0</commons-lang3.version>
 		<slf4j-api.version>1.7.30</slf4j-api.version>

From 77766d0081468ccc2595b92bf2c6ef8ec4ebc455 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 12:18:08 -0600
Subject: [PATCH 1192/1272] Bump org.immutables:value from 2.8.2 to 2.10.1
 (#2220)

Bumps [org.immutables:value](https://github.com/immutables/immutables) from 2.8.2 to 2.10.1.
- [Release notes](https://github.com/immutables/immutables/releases)
- [Commits](https://github.com/immutables/immutables/compare/2.8.2...2.10.1)

---
updated-dependencies:
- dependency-name: org.immutables:value
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml
index 3f595903a..96f1f850a 100644
--- a/docker-java-transport/pom.xml
+++ b/docker-java-transport/pom.xml
@@ -30,7 +30,7 @@
 		<dependency>
 			<groupId>org.immutables</groupId>
 			<artifactId>value</artifactId>
-			<version>2.8.2</version>
+			<version>2.10.1</version>
 			<scope>provided</scope>
 		</dependency>
 

From a404bd1aa4ad692da58c10b5a75e8774468216de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 1 Apr 2025 12:36:28 -0600
Subject: [PATCH 1193/1272] Fix InspectContainerResponse data types to be able
 to hold an int64 (#2392)

* Fix data types to be able to hold an int64
* Add japicmp exclusions in docker-java-api

Fixes #2321

---------

Co-authored-by: Torsten Krah <krah.tm@gmail.com>
---
 docker-java-api/pom.xml                                  | 9 +++++++++
 .../dockerjava/api/command/InspectContainerResponse.java | 8 ++++----
 .../com/github/dockerjava/cmd/InspectContainerCmdIT.java | 4 ++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 839d6ccb2..1138a27f7 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -84,6 +84,15 @@
 			<plugin>
 				<groupId>com.github.siom79.japicmp</groupId>
 				<artifactId>japicmp-maven-plugin</artifactId>
+				<configuration>
+					<parameter>
+						<excludes>
+							<!-- Breaking change -->
+							<exclude>com.github.dockerjava.api.command.InspectContainerResponse#getSizeRootFs()</exclude>
+							<exclude>com.github.dockerjava.api.command.InspectContainerResponse#getSizeRw()</exclude>
+						</excludes>
+					</parameter>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
index 94207fd2c..f06bd4ed9 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -61,10 +61,10 @@ public class InspectContainerResponse extends DockerObject {
     private String id;
 
     @JsonProperty("SizeRootFs")
-    private Integer sizeRootFs;
+    private Long sizeRootFs;
 
     @JsonProperty("SizeRw")
-    private Integer sizeRw;
+    private Long sizeRw;
 
     @JsonProperty("Image")
     private String imageId;
@@ -124,11 +124,11 @@ public String getId() {
         return id;
     }
 
-    public Integer getSizeRootFs() {
+    public Long getSizeRootFs() {
         return sizeRootFs;
     }
 
-    public Integer getSizeRw() {
+    public Long getSizeRw() {
         return sizeRw;
     }
 
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
index 54d900db8..cc1468f7f 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
@@ -100,9 +100,9 @@ public void inspectContainerWithSize() throws DockerException {
         // TODO check swarm
         if (isNotSwarm(dockerRule.getClient())) {
             assertNotNull(containerInfo.getSizeRootFs());
-            assertTrue(containerInfo.getSizeRootFs().intValue() > 0);
+            assertTrue(containerInfo.getSizeRootFs() > 0L);
             assertNotNull(containerInfo.getSizeRw());
-            assertTrue(containerInfo.getSizeRw().intValue() == 0);
+            assertEquals(0L, containerInfo.getSizeRw().longValue());
         }
     }
 

From cb72675f16ce0f5c3561a9c6cf8925bc048d1034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 1 Apr 2025 12:41:44 -0600
Subject: [PATCH 1194/1272] Run dependabot on Tuesday

---
 .github/dependabot.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 7dec19aef..d301147be 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,5 +4,6 @@ updates:
   directory: "/"
   schedule:
     interval: weekly
+    day: tuesday
   open-pull-requests-limit: 99
   rebase-strategy: disabled

From 1d6c3445c7877e0511e1fcb55708568b254831f6 Mon Sep 17 00:00:00 2001
From: Nikita Nikolenko <nikit011418@gmail.com>
Date: Tue, 1 Apr 2025 20:46:49 +0200
Subject: [PATCH 1195/1272] Add some missed options to UpdateContainerCmd
 (#2389)

* Add some missed options to UpdateContainerCmd

* Delete old cpuPeriod and cpuQuota functions

* Add update container response tests
---
 docker-java-api/pom.xml                       |   5 +-
 .../api/command/UpdateContainerCmd.java       |  97 +++++-
 .../core/command/UpdateContainerCmdImpl.java  | 293 +++++++++++++++++-
 .../api/command/CommandJSONSamples.java       |   4 +-
 .../command/UpdateContainerResponseTest.java  |  33 ++
 .../dockerjava/cmd/UpdateContainerCmdIT.java  |   4 +-
 .../updateContainerResponse_empty.json        |   1 +
 .../updateContainerResponse_warnings.json     |   5 +
 8 files changed, 420 insertions(+), 22 deletions(-)
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/api/command/UpdateContainerResponseTest.java
 create mode 100644 docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_empty.json
 create mode 100644 docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_warnings.json

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 1138a27f7..8bfd9e8d4 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -87,7 +87,10 @@
 				<configuration>
 					<parameter>
 						<excludes>
-							<!-- Breaking change -->
+							<exclude>com.github.dockerjava.api.command.UpdateContainerCmd#getCpuPeriod()</exclude>
+							<exclude>com.github.dockerjava.api.command.UpdateContainerCmd#withCpuPeriod(java.lang.Integer)</exclude>
+							<exclude>com.github.dockerjava.api.command.UpdateContainerCmd#getCpuQuota()</exclude>
+							<exclude>com.github.dockerjava.api.command.UpdateContainerCmd#withCpuQuota(java.lang.Integer)</exclude>
 							<exclude>com.github.dockerjava.api.command.InspectContainerResponse#getSizeRootFs()</exclude>
 							<exclude>com.github.dockerjava.api.command.InspectContainerResponse#getSizeRw()</exclude>
 						</excludes>
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
index 82fbca5f8..d53bcdcdf 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
@@ -1,9 +1,16 @@
 package com.github.dockerjava.api.command;
 
+import com.github.dockerjava.api.model.BlkioRateDevice;
+import com.github.dockerjava.api.model.BlkioWeightDevice;
+import com.github.dockerjava.api.model.Device;
+import com.github.dockerjava.api.model.DeviceRequest;
+import com.github.dockerjava.api.model.RestartPolicy;
+import com.github.dockerjava.api.model.Ulimit;
 import com.github.dockerjava.api.model.UpdateContainerResponse;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
+import java.util.List;
 
 /**
  * @author Kanstantsin Shautsou
@@ -13,22 +20,47 @@ public interface UpdateContainerCmd extends SyncDockerCmd<UpdateContainerRespons
     @CheckForNull
     String getContainerId();
 
+    UpdateContainerCmd withContainerId(@Nonnull String containerId);
+
     @CheckForNull
     Integer getBlkioWeight();
 
     UpdateContainerCmd withBlkioWeight(Integer blkioWeight);
 
-    UpdateContainerCmd withContainerId(@Nonnull String containerId);
+    @CheckForNull
+    List<BlkioWeightDevice> getBlkioWeightDevice();
+
+    UpdateContainerCmd withBlkioWeightDevice(List<BlkioWeightDevice> blkioWeightDevice);
 
     @CheckForNull
-    Integer getCpuPeriod();
+    List<BlkioRateDevice> getBlkioDeviceReadBps();
 
-    UpdateContainerCmd withCpuPeriod(Integer cpuPeriod);
+    UpdateContainerCmd withBlkioDeviceReadBps(List<BlkioRateDevice> blkioDeviceReadBps);
 
     @CheckForNull
-    Integer getCpuQuota();
+    List<BlkioRateDevice> getBlkioDeviceWriteBps();
 
-    UpdateContainerCmd withCpuQuota(Integer cpuQuota);
+    UpdateContainerCmd withBlkioDeviceWriteBps(List<BlkioRateDevice> blkioDeviceWriteBps);
+
+    @CheckForNull
+    List<BlkioRateDevice> getBlkioDeviceReadIOps();
+
+    UpdateContainerCmd withBlkioDeviceReadIOps(List<BlkioRateDevice> blkioDeviceReadIOps);
+
+    @CheckForNull
+    List<BlkioRateDevice> getBlkioDeviceWriteIOps();
+
+    UpdateContainerCmd withBlkioDeviceWriteIOps(List<BlkioRateDevice> blkioDeviceWriteIOps);
+
+    @CheckForNull
+    Long getCpuPeriod();
+
+    UpdateContainerCmd withCpuPeriod(Long cpuPeriod);
+
+    @CheckForNull
+    Long getCpuQuota();
+
+    UpdateContainerCmd withCpuQuota(Long cpuQuota);
 
     @CheckForNull
     String getCpusetCpus();
@@ -45,6 +77,31 @@ public interface UpdateContainerCmd extends SyncDockerCmd<UpdateContainerRespons
 
     UpdateContainerCmd withCpuShares(Integer cpuShares);
 
+    @CheckForNull
+    Long getCpuRealtimePeriod();
+
+    UpdateContainerCmd withCpuRealtimePeriod(Long cpuRealtimePeriod);
+
+    @CheckForNull
+    Long getCpuRealtimeRuntime();
+
+    UpdateContainerCmd withCpuRealtimeRuntime(Long cpuRealtimeRuntime);
+
+    @CheckForNull
+    List<Device> getDevices();
+
+    UpdateContainerCmd withDevices(List<Device> devices);
+
+    @CheckForNull
+    List<String> getDeviceCgroupRules();
+
+    UpdateContainerCmd withDeviceCgroupRules(List<String> deviceCgroupRules);
+
+    @CheckForNull
+    List<DeviceRequest> getDeviceRequests();
+
+    UpdateContainerCmd withDeviceRequests(List<DeviceRequest> deviceRequests);
+
     @CheckForNull
     Long getKernelMemory();
 
@@ -65,6 +122,36 @@ public interface UpdateContainerCmd extends SyncDockerCmd<UpdateContainerRespons
 
     UpdateContainerCmd withMemorySwap(Long memorySwap);
 
+    @CheckForNull
+    Long getNanoCPUs();
+
+    UpdateContainerCmd withNanoCPUs(Long nanoCPUs);
+
+    @CheckForNull
+    Boolean getOomKillDisable();
+
+    UpdateContainerCmd withOomKillDisable(Boolean oomKillDisable);
+
+    @CheckForNull
+    Boolean getInit();
+
+    UpdateContainerCmd withInit(Boolean init);
+
+    @CheckForNull
+    Long getPidsLimit();
+
+    UpdateContainerCmd withPidsLimit(Long pidsLimit);
+
+    @CheckForNull
+    List<Ulimit> getUlimits();
+
+    UpdateContainerCmd withUlimits(List<Ulimit> ulimits);
+
+    @CheckForNull
+    RestartPolicy getRestartPolicy();
+
+    UpdateContainerCmd withRestartPolicy(RestartPolicy restartPolicy);
+
     interface Exec extends DockerCmdSyncExec<UpdateContainerCmd, UpdateContainerResponse> {
     }
 }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
index 14357ba08..47ab710eb 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/UpdateContainerCmdImpl.java
@@ -4,6 +4,12 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.command.UpdateContainerCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.BlkioRateDevice;
+import com.github.dockerjava.api.model.BlkioWeightDevice;
+import com.github.dockerjava.api.model.Device;
+import com.github.dockerjava.api.model.DeviceRequest;
+import com.github.dockerjava.api.model.RestartPolicy;
+import com.github.dockerjava.api.model.Ulimit;
 import com.github.dockerjava.api.model.UpdateContainerResponse;
 import com.github.dockerjava.core.RemoteApiVersion;
 import org.apache.commons.lang3.builder.EqualsBuilder;
@@ -12,6 +18,7 @@
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
+import java.util.List;
 
 /**
  * @author Kanstantsin Shautsou
@@ -28,14 +35,38 @@ public class UpdateContainerCmdImpl extends AbstrDockerCmd<UpdateContainerCmd, U
     @JsonProperty("BlkioWeight")
     private Integer blkioWeight;
 
+    @JsonProperty("BlkioWeightDevice")
+    private List<BlkioWeightDevice> blkioWeightDevice;
+
+    @JsonProperty("BlkioDeviceReadBps")
+    private List<BlkioRateDevice> blkioDeviceReadBps;
+
+    @JsonProperty("BlkioDeviceWriteBps")
+    private List<BlkioRateDevice> blkioDeviceWriteBps;
+
+    @JsonProperty("BlkioDeviceReadIOps")
+    private List<BlkioRateDevice> blkioDeviceReadIOps;
+
+    @JsonProperty("BlkioDeviceWriteIOps")
+    private List<BlkioRateDevice> blkioDeviceWriteIOps;
+
     @JsonProperty("CpuShares")
     private Integer cpuShares;
 
     @JsonProperty("CpuPeriod")
-    private Integer cpuPeriod;
+    private Long cpuPeriod;
 
     @JsonProperty("CpuQuota")
-    private Integer cpuQuota;
+    private Long cpuQuota;
+
+    @JsonProperty("CpuRealtimePeriod")
+    private Long cpuRealtimePeriod;
+
+    @JsonProperty("CpuRealtimeRuntime")
+    private Long cpuRealtimeRuntime;
+
+    @JsonProperty("NanoCpus")
+    private Long nanoCPUs;
 
     @JsonProperty("CpusetCpus")
     private String cpusetCpus;
@@ -43,6 +74,18 @@ public class UpdateContainerCmdImpl extends AbstrDockerCmd<UpdateContainerCmd, U
     @JsonProperty("CpusetMems")
     private String cpusetMems;
 
+    @JsonProperty("Devices")
+    private List<Device> devices;
+
+    @JsonProperty("DeviceCgroupRules")
+    private List<String> deviceCgroupRules;
+
+    /**
+     * @since {@link com.github.dockerjava.core.RemoteApiVersion#VERSION_1_40}
+     */
+    @JsonProperty("DeviceRequests")
+    private List<DeviceRequest> deviceRequests;
+
     @JsonProperty("Memory")
     private Long memory;
 
@@ -55,11 +98,43 @@ public class UpdateContainerCmdImpl extends AbstrDockerCmd<UpdateContainerCmd, U
     @JsonProperty("KernelMemory")
     private Long kernelMemory;
 
+    @JsonProperty("OomKillDisable")
+    private Boolean oomKillDisable;
+
+    @JsonProperty("Init")
+    private Boolean init;
+
+    @JsonProperty("PidsLimit")
+    private Long pidsLimit;
+
+    @JsonProperty("Ulimits")
+    private List<Ulimit> ulimits;
+
+    @JsonProperty("RestartPolicy")
+    private RestartPolicy restartPolicy;
+
     public UpdateContainerCmdImpl(UpdateContainerCmd.Exec exec, String containerId) {
         super(exec);
         withContainerId(containerId);
     }
 
+    /**
+     * @see #containerId
+     */
+    @CheckForNull
+    @JsonIgnore
+    public String getContainerId() {
+        return containerId;
+    }
+
+    /**
+     * @see #containerId
+     */
+    public UpdateContainerCmd withContainerId(@Nonnull String containerId) {
+        this.containerId = containerId;
+        return this;
+    }
+
     /**
      * @see #blkioWeight
      */
@@ -77,19 +152,68 @@ public UpdateContainerCmd withBlkioWeight(Integer blkioWeight) {
     }
 
     /**
-     * @see #containerId
+     * @see #blkioWeightDevice
      */
     @CheckForNull
-    @JsonIgnore
-    public String getContainerId() {
-        return containerId;
+    public List<BlkioWeightDevice> getBlkioWeightDevice() {
+        return blkioWeightDevice;
+    }
+
+    public UpdateContainerCmd withBlkioWeightDevice(List<BlkioWeightDevice> blkioWeightDevice) {
+        this.blkioWeightDevice = blkioWeightDevice;
+        return this;
     }
 
     /**
-     * @see #containerId
+     * @see #blkioDeviceReadBps
      */
-    public UpdateContainerCmd withContainerId(@Nonnull String containerId) {
-        this.containerId = containerId;
+    @CheckForNull
+    public List<BlkioRateDevice> getBlkioDeviceReadBps() {
+        return blkioDeviceReadBps;
+    }
+
+    public UpdateContainerCmd withBlkioDeviceReadBps(List<BlkioRateDevice> blkioDeviceReadBps) {
+        this.blkioDeviceReadBps = blkioDeviceReadBps;
+        return this;
+    }
+
+    /**
+     * @see #blkioDeviceWriteBps
+     */
+    @CheckForNull
+    public List<BlkioRateDevice> getBlkioDeviceWriteBps() {
+        return blkioDeviceWriteBps;
+    }
+
+    public UpdateContainerCmd withBlkioDeviceWriteBps(List<BlkioRateDevice> blkioDeviceWriteBps) {
+        this.blkioDeviceWriteBps = blkioDeviceWriteBps;
+        return this;
+    }
+
+    /**
+     * @see #blkioDeviceReadIOps
+     */
+    @CheckForNull
+    public List<BlkioRateDevice> getBlkioDeviceReadIOps() {
+        return blkioDeviceReadIOps;
+    }
+
+    public UpdateContainerCmd withBlkioDeviceReadIOps(List<BlkioRateDevice> blkioDeviceReadIOps) {
+        this.blkioDeviceReadIOps = blkioDeviceReadIOps;
+        return this;
+    }
+
+    /**
+     * @see #blkioDeviceWriteIOps
+     */
+    @CheckForNull
+    public List<BlkioRateDevice> getBlkioDeviceWriteIOps() {
+        return blkioDeviceWriteIOps;
+    }
+
+    @Override
+    public UpdateContainerCmd withBlkioDeviceWriteIOps(List<BlkioRateDevice> blkioDeviceWriteIOps) {
+        this.blkioDeviceWriteIOps = blkioDeviceWriteIOps;
         return this;
     }
 
@@ -97,14 +221,14 @@ public UpdateContainerCmd withContainerId(@Nonnull String containerId) {
      * @see #cpuPeriod
      */
     @CheckForNull
-    public Integer getCpuPeriod() {
+    public Long getCpuPeriod() {
         return cpuPeriod;
     }
 
     /**
      * @see #cpuPeriod
      */
-    public UpdateContainerCmd withCpuPeriod(Integer cpuPeriod) {
+    public UpdateContainerCmd withCpuPeriod(Long cpuPeriod) {
         this.cpuPeriod = cpuPeriod;
         return this;
     }
@@ -113,14 +237,14 @@ public UpdateContainerCmd withCpuPeriod(Integer cpuPeriod) {
      * @see #cpuQuota
      */
     @CheckForNull
-    public Integer getCpuQuota() {
+    public Long getCpuQuota() {
         return cpuQuota;
     }
 
     /**
      * @see #cpuQuota
      */
-    public UpdateContainerCmd withCpuQuota(Integer cpuQuota) {
+    public UpdateContainerCmd withCpuQuota(Long cpuQuota) {
         this.cpuQuota = cpuQuota;
         return this;
     }
@@ -173,6 +297,71 @@ public UpdateContainerCmd withCpuShares(Integer cpuShares) {
         return this;
     }
 
+    /**
+     * @see #cpuRealtimePeriod
+     */
+    @CheckForNull
+    public Long getCpuRealtimePeriod() {
+        return cpuRealtimePeriod;
+    }
+
+    public UpdateContainerCmd withCpuRealtimePeriod(Long cpuRealtimePeriod) {
+        this.cpuRealtimePeriod = cpuRealtimePeriod;
+        return this;
+    }
+
+    /**
+     * @see #cpuRealtimeRuntime
+     */
+    @CheckForNull
+    public Long getCpuRealtimeRuntime() {
+        return cpuRealtimeRuntime;
+    }
+
+    public UpdateContainerCmd withCpuRealtimeRuntime(Long cpuRealtimeRuntime) {
+        this.cpuRealtimeRuntime = cpuRealtimeRuntime;
+        return this;
+    }
+
+    /**
+     * @see #devices
+     */
+    @CheckForNull
+    public List<Device> getDevices() {
+        return devices;
+    }
+
+    public UpdateContainerCmd withDevices(List<Device> devices) {
+        this.devices = devices;
+        return this;
+    }
+
+    /**
+     * @see #deviceCgroupRules
+     */
+    @CheckForNull
+    public List<String> getDeviceCgroupRules() {
+        return deviceCgroupRules;
+    }
+
+    public UpdateContainerCmd withDeviceCgroupRules(List<String> deviceCgroupRules) {
+        this.deviceCgroupRules = deviceCgroupRules;
+        return this;
+    }
+
+    /**
+     * @see #deviceRequests
+     */
+    @CheckForNull
+    public List<DeviceRequest> getDeviceRequests() {
+        return deviceRequests;
+    }
+
+    public UpdateContainerCmd withDeviceRequests(List<DeviceRequest> deviceRequests) {
+        this.deviceRequests = deviceRequests;
+        return this;
+    }
+
     /**
      * @see #kernelMemory
      */
@@ -237,6 +426,84 @@ public UpdateContainerCmd withMemorySwap(Long memorySwap) {
         return this;
     }
 
+    /**
+     * @see #nanoCPUs
+     */
+    @CheckForNull
+    public Long getNanoCPUs() {
+        return nanoCPUs;
+    }
+
+    public UpdateContainerCmd withNanoCPUs(Long nanoCPUs) {
+        this.nanoCPUs = nanoCPUs;
+        return this;
+    }
+
+    /**
+     * @see #oomKillDisable
+     */
+    @CheckForNull
+    public Boolean getOomKillDisable() {
+        return oomKillDisable;
+    }
+
+    public UpdateContainerCmd withOomKillDisable(Boolean oomKillDisable) {
+        this.oomKillDisable = oomKillDisable;
+        return this;
+    }
+
+    /**
+     * @see #init
+     */
+    @CheckForNull
+    public Boolean getInit() {
+        return init;
+    }
+
+    public UpdateContainerCmd withInit(Boolean init) {
+        this.init = init;
+        return this;
+    }
+
+    /**
+     * @see #pidsLimit
+     */
+    @CheckForNull
+    public Long getPidsLimit() {
+        return pidsLimit;
+    }
+
+    public UpdateContainerCmd withPidsLimit(Long pidsLimit) {
+        this.pidsLimit = pidsLimit;
+        return this;
+    }
+
+    /**
+     * @see #ulimits
+     */
+    @CheckForNull
+    public List<Ulimit> getUlimits() {
+        return ulimits;
+    }
+
+    public UpdateContainerCmd withUlimits(List<Ulimit> ulimits) {
+        this.ulimits = ulimits;
+        return this;
+    }
+
+    /**
+     * @see #restartPolicy
+     */
+    @CheckForNull
+    public RestartPolicy getRestartPolicy() {
+        return restartPolicy;
+    }
+
+    public UpdateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) {
+        this.restartPolicy = restartPolicy;
+        return this;
+    }
+
     /**
      * @throws NotFoundException No such container
      */
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java b/docker-java/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
index 0cf5141d4..23ef4b7f2 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/command/CommandJSONSamples.java
@@ -28,7 +28,9 @@ public enum CommandJSONSamples implements JSONResourceRef {
     inspectContainerResponse_full_1_21,
     inspectContainerResponse_full_1_26a,
     inspectContainerResponse_full_1_26b,
-    inspectContainerResponse_empty;
+    inspectContainerResponse_empty,
+    updateContainerResponse_empty,
+    updateContainerResponse_warnings;
 
     @Override
     public String getFileName() {
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/command/UpdateContainerResponseTest.java b/docker-java/src/test/java/com/github/dockerjava/api/command/UpdateContainerResponseTest.java
new file mode 100644
index 000000000..300a5c324
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/api/command/UpdateContainerResponseTest.java
@@ -0,0 +1,33 @@
+package com.github.dockerjava.api.command;
+
+import com.github.dockerjava.api.model.UpdateContainerResponse;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.List;
+
+import static com.github.dockerjava.test.serdes.JSONTestHelper.testRoundTrip;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+public class UpdateContainerResponseTest {
+    @Test
+    public void roundTrip_empty() throws IOException {
+        UpdateContainerResponse response = testRoundTrip(CommandJSONSamples.updateContainerResponse_empty, UpdateContainerResponse.class);
+        assertNull(response.getWarnings());
+    }
+
+    @Test
+    public void roundTrip_warnings() throws IOException {
+        UpdateContainerResponse response = testRoundTrip(CommandJSONSamples.updateContainerResponse_warnings,
+            UpdateContainerResponse.class);
+
+        List<String> warnings = response.getWarnings();
+        assertNotNull(warnings);
+        assertEquals(1, warnings.size());
+
+        final String warning = warnings.get(0);
+        assertEquals("Published ports are discarded when using host network mode", warning);
+    }
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
index e5bb55499..e1e637809 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/UpdateContainerCmdIT.java
@@ -48,8 +48,8 @@ public void updateContainer() throws DockerException {
         dockerRule.getClient().updateContainerCmd(containerId)
                 .withBlkioWeight(300)
                 .withCpuShares(512)
-                .withCpuPeriod(100000)
-                .withCpuQuota(50000)
+                .withCpuPeriod(100000L)
+                .withCpuQuota(50000L)
 //                .withCpusetCpus("0") // depends on env
                 .withCpusetMems("0")
 //                .withMemory(209715200L + 2L)
diff --git a/docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_empty.json b/docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_empty.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_empty.json
@@ -0,0 +1 @@
+{}
diff --git a/docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_warnings.json b/docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_warnings.json
new file mode 100644
index 000000000..edeaedc7a
--- /dev/null
+++ b/docker-java/src/test/resources/com/github/dockerjava/api/command/updateContainerResponse_warnings.json
@@ -0,0 +1,5 @@
+{
+    "Warnings": [
+        "Published ports are discarded when using host network mode"
+    ]
+}

From d9b653361df9ace172a65f5267a1a80907558ebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 1 Apr 2025 14:43:32 -0600
Subject: [PATCH 1196/1272] Fix possible CME while replacing properties (#2416)

Fixes #2274

---------

Co-authored-by: Torsten Krah <krah.tm@gmail.com>
---
 .../dockerjava/core/DefaultDockerClientConfig.java     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
index 8011a2a5e..dad75b360 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java
@@ -5,6 +5,8 @@
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.core.NameParser.HostnameReposName;
 import com.github.dockerjava.core.NameParser.ReposTag;
+
+import java.util.Map.Entry;
 import java.util.Optional;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
@@ -128,9 +130,11 @@ private static Properties loadIncludedDockerProperties(Properties systemProperti
     }
 
     private static void replaceProperties(Properties properties, Properties replacements) {
-        for (Object objectKey : properties.keySet()) {
-            String key = objectKey.toString();
-            properties.setProperty(key, replaceProperties(properties.getProperty(key), replacements));
+        for (Entry<Object, Object> entry : properties.entrySet()) {
+            final String key = entry.getKey().toString();
+            // no entry.getValue here because it does not have the same semantics as getProperty (defaults handling)
+            final String value = properties.getProperty(key);
+            entry.setValue(replaceProperties(value, replacements));
         }
     }
 

From 2fa2eb51d0b21f0e4bc455a1f4e710b978b17272 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 14:55:07 -0600
Subject: [PATCH 1197/1272] Bump org.awaitility:awaitility from 4.0.1 to 4.3.0
 (#2408)

Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.0.1 to 4.3.0.
- [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt)
- [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.0.1...awaitility-4.3.0)

---
updated-dependencies:
- dependency-name: org.awaitility:awaitility
  dependency-version: 4.3.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index de8cb9c88..e00c974d3 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -118,7 +118,7 @@
 		<dependency>
 			<groupId>org.awaitility</groupId>
 			<artifactId>awaitility</artifactId>
-			<version>4.0.1</version>
+			<version>4.3.0</version>
 			<scope>test</scope>
 		</dependency>
 

From 5af2d3abf59bc50a8e551c74c482ac08ab201fc1 Mon Sep 17 00:00:00 2001
From: artragis <artragis@gmail.com>
Date: Tue, 1 Apr 2025 22:58:11 +0200
Subject: [PATCH 1198/1272] chore(deps): update guava so that it is not
 vulnerable (#2300)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: fdambrine <francois.dambrine@wiiisdom.com>
Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8ec664b11..603b1ac48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
 
 		<bouncycastle.version>1.80</bouncycastle.version>
 		<junixsocket.version>2.10.1</junixsocket.version>
-		<guava.version>19.0</guava.version> <!-- todo remove from project -->
+		<guava.version>33.4.6-jre</guava.version> <!-- todo remove from project -->
 
 		<!-- test dependencies -->
 		<logback.version>1.2.3</logback.version>

From 1f1e60d2efe2c495c3c43a59b4534d3316fb0b75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Mon, 12 May 2025 19:14:20 -0500
Subject: [PATCH 1199/1272] Update ubuntu version to 24.04 (#2376)

---
 .github/workflows/ci.yml                                  | 6 ++----
 .github/workflows/release.yml                             | 2 +-
 .../com/github/dockerjava/cmd/CreateContainerCmdIT.java   | 5 +++++
 .../java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java  | 8 ++++++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b7aaef550..5d6f8d370 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -15,7 +15,6 @@ jobs:
           - { name: "default", javaVersion: 8 }
           - { name: "default", javaVersion: 17 }
           - { name: "default", javaVersion: 21 }
-          - { name: "Docker 19.03.9", dockerVersion: "v19.03.9", javaVersion: 8 }
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
@@ -27,7 +26,6 @@ jobs:
         id: setup_docker
         uses: docker/setup-docker-action@v4
         with:
-          version: ${{matrix.dockerVersion}}
           channel: stable
       - name: Build with Maven
         env:
@@ -35,7 +33,7 @@ jobs:
         run: ./mvnw --no-transfer-progress verify
 
   tcp:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1517a1167..3e9f64348 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 8
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index de9f564e4..50623c029 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -34,7 +34,9 @@
 import com.github.dockerjava.utils.TestUtils;
 import net.jcip.annotations.NotThreadSafe;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -420,6 +422,7 @@ public void createContainerWithLink() throws DockerException {
     }
 
     @Test
+    @Ignore
     public void createContainerWithMemorySwappiness() throws DockerException {
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
                 .withCmd("sleep", "9999")
@@ -959,6 +962,8 @@ public void onNext(Frame item) {
 
     @Test
     public void createContainerWithCgroupParent() throws DockerException {
+        assumeThat(!SystemUtils.IS_OS_LINUX, is(true));
+
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
                 .withHostConfig(newHostConfig()
                         .withCgroupParent("/parent"))
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
index 87f35161c..36bcab840 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/swarm/SwarmCmdIT.java
@@ -20,6 +20,8 @@
 import org.junit.experimental.categories.Category;
 
 import java.io.IOException;
+import java.time.Duration;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -36,7 +38,7 @@ public abstract class SwarmCmdIT extends CmdIT {
 
     private static final String DOCKER_IN_DOCKER_IMAGE_REPOSITORY = "docker";
 
-    private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "17.12-dind";
+    private static final String DOCKER_IN_DOCKER_IMAGE_TAG = "26.1.3-dind";
 
     private static final String DOCKER_IN_DOCKER_CONTAINER_PREFIX = "docker";
 
@@ -105,6 +107,8 @@ protected DockerClient startDockerInDocker() throws InterruptedException {
         ExposedPort exposedPort = ExposedPort.tcp(2375);
         CreateContainerResponse response = hostDockerClient
             .createContainerCmd(DOCKER_IN_DOCKER_IMAGE_REPOSITORY + ":" + DOCKER_IN_DOCKER_IMAGE_TAG)
+            .withEntrypoint("dockerd")
+            .withCmd(Arrays.asList("--host=tcp://0.0.0.0:2375", "--host=unix:///var/run/docker.sock", "--tls=false"))
             .withHostConfig(newHostConfig()
                 .withNetworkMode(NETWORK_NAME)
                 .withPortBindings(new PortBinding(
@@ -125,7 +129,7 @@ protected DockerClient startDockerInDocker() throws InterruptedException {
 
         DockerClient dockerClient = initializeDockerClient(binding);
 
-        await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
+        await().pollDelay(Duration.ofSeconds(5)).atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
             dockerClient.pingCmd().exec();
         });
 

From 33a58b6b54709bd67a2ee0ac8357fb9019661b2f Mon Sep 17 00:00:00 2001
From: Ian Sigmon <2955005+Sigmonia@users.noreply.github.com>
Date: Mon, 12 May 2025 17:27:05 -0700
Subject: [PATCH 1200/1272] Parse prefixed Capability values (#2418)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../com/github/dockerjava/api/model/Capability.java    | 10 +++++++++-
 .../github/dockerjava/api/model/CapabilityTest.java    |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java
index fe71864c0..57fb97c7b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+
 /**
  * The Linux capabilities supported by Docker. The list of capabilities is defined in Docker's types.go, {@link #ALL} was added manually.
  *
@@ -299,5 +301,11 @@ public enum Capability {
     /**
      * Trigger something that will wake up the system (set CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM timers).
      */
-    WAKE_ALARM
+    WAKE_ALARM;
+
+    @JsonCreator
+    public static Capability fromValue(String cap) {
+        String result = !cap.startsWith("CAP_") ? cap : cap.split("_", 2)[1];
+        return Capability.valueOf(result);
+    }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
index aa6167b8c..b0652d945 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
@@ -18,6 +18,9 @@ public void serializeCapability() throws Exception {
     public void deserializeCapability() throws Exception {
         Capability capability = JSONTestHelper.getMapper().readValue("\"ALL\"", Capability.class);
         assertEquals(Capability.ALL, capability);
+
+        Capability compatibleCapability = JSONTestHelper.getMapper().readValue("\"CAP_ALL\"", Capability.class);
+        assertEquals(Capability.ALL, compatibleCapability);
     }
 
     @Test(expected = JsonMappingException.class)

From 006c793dfff188a1b92dda943f77fbfc66bd11ec Mon Sep 17 00:00:00 2001
From: Simon Ohlsen <100684567+simohlsen@users.noreply.github.com>
Date: Tue, 13 May 2025 02:32:08 +0200
Subject: [PATCH 1201/1272] Fix missing space in log (#2417)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
---
 .../java/com/github/dockerjava/core/DockerClientBuilder.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java b/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
index a3e4c3909..8100f285e 100644
--- a/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
+++ b/docker-java/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
@@ -94,7 +94,7 @@ public DockerClient build() {
         } else {
             Logger log = LoggerFactory.getLogger(DockerClientBuilder.class);
             log.warn(
-                "'dockerHttpClient' should be set." +
+                "'dockerHttpClient' should be set. " +
                     "Falling back to Jersey, will be an error in future releases."
             );
 

From fc731d1da6b1dcc708e020783209b0f6839a4fc2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 May 2025 19:53:09 -0500
Subject: [PATCH 1202/1272] Bump org.apache.httpcomponents.client5:httpclient5
 from 5.4.3 to 5.4.4 (#2436)

Bumps [org.apache.httpcomponents.client5:httpclient5](https://github.com/apache/httpcomponents-client) from 5.4.3 to 5.4.4.
- [Changelog](https://github.com/apache/httpcomponents-client/blob/rel/v5.4.4/RELEASE_NOTES.txt)
- [Commits](https://github.com/apache/httpcomponents-client/compare/rel/v5.4.3...rel/v5.4.4)

---
updated-dependencies:
- dependency-name: org.apache.httpcomponents.client5:httpclient5
  dependency-version: 5.4.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-httpclient5/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml
index 0e82715e9..261922992 100644
--- a/docker-java-transport-httpclient5/pom.xml
+++ b/docker-java-transport-httpclient5/pom.xml
@@ -29,7 +29,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents.client5</groupId>
 			<artifactId>httpclient5</artifactId>
-			<version>5.4.3</version>
+			<version>5.4.4</version>
 		</dependency>
 
 		<dependency>

From 5be7be7c344bd242670f74005c9e85bfe1c07f0e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 May 2025 19:53:43 -0500
Subject: [PATCH 1203/1272] Bump org.testcontainers:testcontainers from 1.19.1
 to 1.21.0 (#2435)

Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.19.1 to 1.21.0.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.1...1.21.0)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers
  dependency-version: 1.21.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-tck/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml
index 4d6dd5738..73161b458 100644
--- a/docker-java-transport-tck/pom.xml
+++ b/docker-java-transport-tck/pom.xml
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>testcontainers</artifactId>
-			<version>1.19.1</version>
+			<version>1.21.0</version>
 		</dependency>
 
 		<dependency>

From 7386eb82783b14842b54f0f4319dcadc0cf08893 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 May 2025 19:53:59 -0500
Subject: [PATCH 1204/1272] Bump org.junit.jupiter:junit-jupiter from 5.12.1 to
 5.12.2 (#2430)

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.12.1 to 5.12.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.12.1...r5.12.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-version: 5.12.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 8bfd9e8d4..9a9c9f390 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.12.1</version>
+			<version>5.12.2</version>
 			<scope>test</scope>
 		</dependency>
 

From 89372695e59f207518aa2b24f29c3146b6aa5245 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 May 2025 20:48:36 -0500
Subject: [PATCH 1205/1272] Bump com.tngtech.archunit:archunit-junit5 from
 0.18.0 to 1.4.1 (#2439)

Bumps [com.tngtech.archunit:archunit-junit5](https://github.com/TNG/ArchUnit) from 0.18.0 to 1.4.1.
- [Release notes](https://github.com/TNG/ArchUnit/releases)
- [Commits](https://github.com/TNG/ArchUnit/compare/v0.18.0...v1.4.1)

---
updated-dependencies:
- dependency-name: com.tngtech.archunit:archunit-junit5
  dependency-version: 1.4.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 9a9c9f390..d801546c0 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -57,7 +57,7 @@
 		<dependency>
 			<groupId>com.tngtech.archunit</groupId>
 			<artifactId>archunit-junit5</artifactId>
-			<version>0.18.0</version>
+			<version>1.4.1</version>
 			<scope>test</scope>
 		</dependency>
 

From 20f08311d1613d8819c4548f34046b0557a43117 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 May 2025 20:49:03 -0500
Subject: [PATCH 1206/1272] Bump com.google.guava:guava from 33.4.6-jre to
 33.4.8-jre (#2429)

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.4.6-jre to 33.4.8-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-version: 33.4.8-jre
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 603b1ac48..4acf4e175 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
 
 		<bouncycastle.version>1.80</bouncycastle.version>
 		<junixsocket.version>2.10.1</junixsocket.version>
-		<guava.version>33.4.6-jre</guava.version> <!-- todo remove from project -->
+		<guava.version>33.4.8-jre</guava.version> <!-- todo remove from project -->
 
 		<!-- test dependencies -->
 		<logback.version>1.2.3</logback.version>

From 7fabc1b21a840fb512b1249fbc795b9d05fe8c46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 25 Jun 2025 11:12:02 -0600
Subject: [PATCH 1207/1272] Switch to Sonatype Central Publishing Portal

---
 .github/workflows/release.yml | 12 +++++++-----
 pom.xml                       | 20 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3e9f64348..16777daa6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,15 +16,17 @@ jobs:
         with:
           java-version: 8
           distribution: temurin
-          server-id: default
+          server-id: central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_CENTRAL_TOKEN
+          gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE
       - name: Set version
         run: ./mvnw versions:set -DnewVersion="${{github.event.release.tag_name}}"
       # TODO check main's CI status
       - name: Deploy with Maven
         env:
-          MAVEN_DEPLOYMENT_REPOSITORY: ${{ secrets.MAVEN_DEPLOYMENT_REPOSITORY }}
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_CENTRAL_TOKEN: ${{ secrets.OSSRH_PASSWORD }}
-        run: ./mvnw deploy -DaltReleaseDeploymentRepository="$MAVEN_DEPLOYMENT_REPOSITORY" -DskipTests
+          MAVEN_USERNAME: ${{ secrets.SONATYPE_CENTRAL_USERNAME }}
+          MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_CENTRAL_PASSWORD }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+        run: ./mvnw -Prelease deploy -DskipTests
diff --git a/pom.xml b/pom.xml
index 4acf4e175..fee54253a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -286,6 +286,16 @@
 						</execution>
 					</executions>
 				</plugin>
+				<plugin>
+					<groupId>org.sonatype.central</groupId>
+					<artifactId>central-publishing-maven-plugin</artifactId>
+					<version>0.8.0</version>
+					<extensions>true</extensions>
+					<configuration>
+						<publishingServerId>central</publishingServerId>
+						<excludeArtifacts>docker-java-transport-tck</excludeArtifacts>
+					</configuration>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
@@ -297,6 +307,9 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.sonatype.central</groupId>
+				<artifactId>central-publishing-maven-plugin</artifactId></plugin>
 		</plugins>
 	</build>
 
@@ -308,6 +321,13 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
+						<configuration>
+							<!-- Prevent gpg from using pinentry programs -->
+							<gpgArguments>
+								<arg>--pinentry-mode</arg>
+								<arg>loopback</arg>
+							</gpgArguments>
+						</configuration>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>

From 0d7db3527e1b69b6859f2cfe7b3065e6782250b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 25 Jun 2025 11:37:13 -0600
Subject: [PATCH 1208/1272] Disable ExecStartCmdIT#execStartWithNonExistentUser

---
 .../src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java
index cf096aa26..fc111f0e2 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ExecStartCmdIT.java
@@ -4,6 +4,7 @@
 import com.github.dockerjava.api.command.ExecCreateCmdResponse;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.core.command.ExecStartResultCallback;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -77,6 +78,7 @@ public void execStartAttached() throws Exception {
         assertTrue(responseAsString.length() > 0);
     }
 
+    @Ignore
     @Test(expected = NotFoundException.class)
     public void execStartWithNonExistentUser() throws Exception {
         String containerName = "generated_" + new SecureRandom().nextInt();

From 5b0c7e89380462c847298132d1cdb593a661b943 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Jun 2025 11:52:49 -0600
Subject: [PATCH 1209/1272] Bump org.testcontainers:testcontainers from 1.21.0
 to 1.21.2 (#2463)

Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.21.0 to 1.21.2.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.21.0...1.21.2)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers
  dependency-version: 1.21.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-tck/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml
index 73161b458..a05ac5d9a 100644
--- a/docker-java-transport-tck/pom.xml
+++ b/docker-java-transport-tck/pom.xml
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>testcontainers</artifactId>
-			<version>1.21.0</version>
+			<version>1.21.2</version>
 		</dependency>
 
 		<dependency>

From 0d4638ab40c8bdb2da26659c85054b70106e01b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Jun 2025 11:53:04 -0600
Subject: [PATCH 1210/1272] Bump org.junit.jupiter:junit-jupiter from 5.12.2 to
 5.13.2 (#2462)

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit-framework) from 5.12.2 to 5.13.2.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.12.2...r5.13.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-version: 5.13.2
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index d801546c0..0c9cde9ba 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.12.2</version>
+			<version>5.13.2</version>
 			<scope>test</scope>
 		</dependency>
 

From bcd0f88eef48954ee133571bb6525b977a0d89fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Jun 2025 11:53:15 -0600
Subject: [PATCH 1211/1272] Bump org.bouncycastle:bcpkix-jdk18on from 1.80 to
 1.81 (#2455)

Bumps [org.bouncycastle:bcpkix-jdk18on](https://github.com/bcgit/bc-java) from 1.80 to 1.81.
- [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html)
- [Commits](https://github.com/bcgit/bc-java/commits)

---
updated-dependencies:
- dependency-name: org.bouncycastle:bcpkix-jdk18on
  dependency-version: '1.81'
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fee54253a..d0b9df2ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
 		<commons-lang3.version>3.17.0</commons-lang3.version>
 		<slf4j-api.version>1.7.30</slf4j-api.version>
 
-		<bouncycastle.version>1.80</bouncycastle.version>
+		<bouncycastle.version>1.81</bouncycastle.version>
 		<junixsocket.version>2.10.1</junixsocket.version>
 		<guava.version>33.4.8-jre</guava.version> <!-- todo remove from project -->
 

From 1ece58adbfa3432ec910f53deae61ce274b64488 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Jun 2025 20:19:32 -0600
Subject: [PATCH 1212/1272] Bump org.apache.httpcomponents.client5:httpclient5
 from 5.4.4 to 5.5 (#2445)

Bumps [org.apache.httpcomponents.client5:httpclient5](https://github.com/apache/httpcomponents-client) from 5.4.4 to 5.5.
- [Changelog](https://github.com/apache/httpcomponents-client/blob/master/RELEASE_NOTES.txt)
- [Commits](https://github.com/apache/httpcomponents-client/compare/rel/v5.4.4...rel/v5.5)

---
updated-dependencies:
- dependency-name: org.apache.httpcomponents.client5:httpclient5
  dependency-version: '5.5'
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-httpclient5/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml
index 261922992..872c28e40 100644
--- a/docker-java-transport-httpclient5/pom.xml
+++ b/docker-java-transport-httpclient5/pom.xml
@@ -29,7 +29,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents.client5</groupId>
 			<artifactId>httpclient5</artifactId>
-			<version>5.4.4</version>
+			<version>5.5</version>
 		</dependency>
 
 		<dependency>

From da24f1953d3eaa64ce7eddcdc0fa28747e4498db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Jun 2025 20:19:45 -0600
Subject: [PATCH 1213/1272] Bump netty.version from 4.1.119.Final to
 4.2.2.Final (#2454)

Bumps `netty.version` from 4.1.119.Final to 4.2.2.Final.

Updates `io.netty:netty-codec-http` from 4.1.119.Final to 4.2.2.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.119.Final...netty-4.2.2.Final)

Updates `io.netty:netty-handler` from 4.1.119.Final to 4.2.2.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.119.Final...netty-4.2.2.Final)

Updates `io.netty:netty-handler-proxy` from 4.1.119.Final to 4.2.2.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.119.Final...netty-4.2.2.Final)

Updates `io.netty:netty-transport-native-epoll` from 4.1.119.Final to 4.2.2.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.119.Final...netty-4.2.2.Final)

Updates `io.netty:netty-transport-native-kqueue` from 4.1.119.Final to 4.2.2.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.119.Final...netty-4.2.2.Final)

---
updated-dependencies:
- dependency-name: io.netty:netty-codec-http
  dependency-version: 4.2.2.Final
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.netty:netty-handler
  dependency-version: 4.2.2.Final
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.netty:netty-handler-proxy
  dependency-version: 4.2.2.Final
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.netty:netty-transport-native-epoll
  dependency-version: 4.2.2.Final
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.netty:netty-transport-native-kqueue
  dependency-version: 4.2.2.Final
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d0b9df2ec..48de3acfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
 
 		<!-- test dependencies -->
 		<logback.version>1.2.3</logback.version>
-		<netty.version>4.1.119.Final</netty.version>
+		<netty.version>4.2.2.Final</netty.version>
 		<hamcrest.library.version>2.2</hamcrest.library.version>
 		<hamcrest.jpa-matchers>1.8</hamcrest.jpa-matchers>
 		<lambdaj.version>2.3.3</lambdaj.version>

From e17e11e716b13b63b492f44e048e4f8ddda9f586 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Jun 2025 20:24:21 -0600
Subject: [PATCH 1214/1272] Bump commons-io:commons-io from 2.18.0 to 2.19.0
 (#2428)

Bumps commons-io:commons-io from 2.18.0 to 2.19.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-version: 2.19.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 48de3acfe..38a999f79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
 		<jackson-jaxrs.version>2.18.3</jackson-jaxrs.version>
 		<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
 		<commons-compress.version>1.27.1</commons-compress.version>
-		<commons-io.version>2.18.0</commons-io.version>
+		<commons-io.version>2.19.0</commons-io.version>
 		<commons-lang3.version>3.17.0</commons-lang3.version>
 		<slf4j-api.version>1.7.30</slf4j-api.version>
 

From 05ac7d7e52e5e43cb7101ee81a73871596f3ed36 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Jul 2025 09:38:19 -0600
Subject: [PATCH 1215/1272] Bump org.testcontainers:testcontainers from 1.21.2
 to 1.21.3 (#2467)

Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.21.2 to 1.21.3.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.21.2...1.21.3)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers
  dependency-version: 1.21.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-tck/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml
index a05ac5d9a..654ad17b8 100644
--- a/docker-java-transport-tck/pom.xml
+++ b/docker-java-transport-tck/pom.xml
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>testcontainers</artifactId>
-			<version>1.21.2</version>
+			<version>1.21.3</version>
 		</dependency>
 
 		<dependency>

From dfb97962a5c378573988e7aedb9f20525673c2a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 1 Jul 2025 12:54:47 -0600
Subject: [PATCH 1216/1272] Drop jackson-jaxrs-json-provider dependency (#2468)

---
 docker-java-transport-jersey/pom.xml | 5 -----
 pom.xml                              | 1 -
 2 files changed, 6 deletions(-)

diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
index fbef13f1e..a600c208d 100644
--- a/docker-java-transport-jersey/pom.xml
+++ b/docker-java-transport-jersey/pom.xml
@@ -26,11 +26,6 @@
 			<version>${project.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>com.fasterxml.jackson.jaxrs</groupId>
-			<artifactId>jackson-jaxrs-json-provider</artifactId>
-			<version>${jackson-jaxrs.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.connectors</groupId>
 			<artifactId>jersey-apache-connector</artifactId>
diff --git a/pom.xml b/pom.xml
index 38a999f79..022451fbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,6 @@
 
 		<jersey.version>2.30.1</jersey.version>
 		<jackson.version>2.18.3</jackson.version>
-		<jackson-jaxrs.version>2.18.3</jackson-jaxrs.version>
 		<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
 		<commons-compress.version>1.27.1</commons-compress.version>
 		<commons-io.version>2.19.0</commons-io.version>

From 9ccbd8fdfc85be619c2f012f9d041fe932dd588f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emirhan=20Durmu=C5=9F?=
 <51929176+emirhandurmus@users.noreply.github.com>
Date: Fri, 4 Jul 2025 16:31:33 +0300
Subject: [PATCH 1217/1272] Add Annotations option to HostConfig (#2422)

---
 .../dockerjava/api/model/HostConfig.java      | 13 ++++++++
 .../dockerjava/cmd/CreateContainerCmdIT.java  | 32 +++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
index 2ad622ca6..603bc6347 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -73,6 +73,9 @@ public static HostConfig newHostConfig() {
     @JsonProperty("NanoCpus")
     private Long nanoCPUs;
 
+    @JsonProperty("Annotations")
+    private Map<String, String> annotations;
+
     @JsonProperty("CapAdd")
     private Capability[] capAdd;
 
@@ -304,6 +307,11 @@ public Integer getBlkioWeight() {
         return blkioWeight;
     }
 
+    @CheckForNull
+    public Map<String, String> getAnnotations() {
+        return annotations;
+    }
+
     public Capability[] getCapAdd() {
         return capAdd;
     }
@@ -636,6 +644,11 @@ public HostConfig withBlkioWeightDevice(List<BlkioWeightDevice> blkioWeightDevic
         return this;
     }
 
+    public HostConfig withAnnotations(Map<String, String> annotations) {
+        this.annotations = annotations;
+        return this;
+    }
+
     /**
      * @see #capAdd
      */
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index 50623c029..d91791cbc 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -10,6 +10,8 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.exception.ConflictException;
 import com.github.dockerjava.api.exception.DockerException;
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.api.exception.InternalServerErrorException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.AuthConfig;
@@ -58,6 +60,7 @@
 import static com.github.dockerjava.api.model.HostConfig.newHostConfig;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_23;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_43;
 import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
 import static com.github.dockerjava.junit.DockerMatchers.mountedVolumes;
 import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE;
@@ -1141,4 +1144,33 @@ public void shouldHandleANetworkAliasWithoutACustomNetworkGracefully() {
             .withCmd("sleep", "9999")
             .exec();
     }
+
+    @Test
+    public void createContainerWithAnnotations() throws DockerException {
+        DefaultDockerClientConfig forcedConfig = DefaultDockerClientConfig.createDefaultConfigBuilder()
+        .withApiVersion(VERSION_1_43)
+        .withRegistryUrl("https://index.docker.io/v1/")
+        .build();
+        
+        DockerClient forcedClient = CmdIT.createDockerClient(forcedConfig);
+        Map<String, String> annotations = new HashMap<>();
+        annotations.put("com.example.key1", "value1");
+        annotations.put("com.example.key2", "value2");
+
+        CreateContainerResponse container = forcedClient.createContainerCmd(DEFAULT_IMAGE)
+                .withCmd("sleep", "9999")
+                .withHostConfig(newHostConfig()
+                        .withAnnotations(annotations))
+                .exec();
+
+        LOG.info("Created container {}", container.toString());
+
+        assertThat(container.getId(), not(is(emptyString())));
+
+        InspectContainerResponse inspectContainerResponse = forcedClient.inspectContainerCmd(container.getId()).exec();
+
+        assertThat(inspectContainerResponse.getHostConfig().getAnnotations(), equalTo(annotations));
+        assertThat(inspectContainerResponse.getHostConfig().getAnnotations().get("com.example.key1"), equalTo("value1"));
+        assertThat(inspectContainerResponse.getHostConfig().getAnnotations().get("com.example.key2"), equalTo("value2"));
+    }
 }

From b1d9e9155257d848b8d790a68ed407d4a8233d45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 7 Jul 2025 08:55:34 -0600
Subject: [PATCH 1218/1272] Ignore jackson minor version updates

---
 .github/dependabot.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d301147be..f0541701a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -7,3 +7,6 @@ updates:
     day: tuesday
   open-pull-requests-limit: 99
   rebase-strategy: disabled
+  ignore:
+    - dependency-name: "com.fasterxml.jackson.core:*"
+      update-types: [ "version-update:semver-minor" ]

From d9f2aad71ef0f0f02b6c14559474d7f337b4876e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Mon, 7 Jul 2025 11:36:52 -0600
Subject: [PATCH 1219/1272] Add deploymentName

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 022451fbe..acd77627d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -293,6 +293,7 @@
 					<configuration>
 						<publishingServerId>central</publishingServerId>
 						<excludeArtifacts>docker-java-transport-tck</excludeArtifacts>
+						<deploymentName>com.github.docker-java</deploymentName>
 					</configuration>
 				</plugin>
 			</plugins>

From ad1e26a58c605e040ee989131e4c69c70018e38d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Jul 2025 11:40:46 -0600
Subject: [PATCH 1220/1272] Bump jackson.version from 2.18.3 to 2.18.4 (#2473)

Bumps `jackson.version` from 2.18.3 to 2.18.4.

Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.18.3 to 2.18.4
- [Commits](https://github.com/FasterXML/jackson/commits)

Updates `com.fasterxml.jackson.core:jackson-databind` from 2.18.3 to 2.18.4
- [Commits](https://github.com/FasterXML/jackson/commits)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-annotations
  dependency-version: 2.18.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-version: 2.18.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java/pom.xml | 8 ++++----
 pom.xml             | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index e00c974d3..f72d1d6c2 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -125,16 +125,16 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<!-- Force the version to 2.18.3 to ensure the compatibility with old projects -->
-			<version>2.18.3</version>
+			<!-- Force the version to 2.18.4 to ensure the compatibility with old projects -->
+			<version>2.18.4</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<!-- Force the version to 2.18.3 to ensure the compatibility with old projects -->
-			<version>2.18.3</version>
+			<!-- Force the version to 2.18.4 to ensure the compatibility with old projects -->
+			<version>2.18.4</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/pom.xml b/pom.xml
index acd77627d..6cefe8d3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
 		<jdk.target>1.8</jdk.target>
 
 		<jersey.version>2.30.1</jersey.version>
-		<jackson.version>2.18.3</jackson.version>
+		<jackson.version>2.18.4</jackson.version>
 		<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
 		<commons-compress.version>1.27.1</commons-compress.version>
 		<commons-io.version>2.19.0</commons-io.version>

From 692ee29d34d363ab18b77b3e0fc9400d805e68ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9E=84=EC=84=B8=ED=98=81?=
 <164876765+sehyuk080101@users.noreply.github.com>
Date: Thu, 17 Jul 2025 06:22:21 +0900
Subject: [PATCH 1221/1272] Fix typo 'deamon' to 'daemon' (#2476)

---
 circle.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.sh b/circle.sh
index c84ca3fe6..b5b7cdbb0 100755
--- a/circle.sh
+++ b/circle.sh
@@ -6,7 +6,7 @@ case "$1" in
         mkdir .docker
         cp $CIRCLE_PROJECT_REPONAME/etc/certs/* .docker
 
-        # configure docker deamon to use SSL and provide the path to the certificates
+        # configure docker daemon to use SSL and provide the path to the certificates
         docker_opts='DOCKER_OPTS="$DOCKER_OPTS -H tcp://127.0.0.1:2376 --tlsverify --tlscacert='$HOME'/.docker/ca.pem --tlscert='$HOME'/.docker/server-cert.pem --tlskey='$HOME'/.docker/server-key.pem"'
         sudo sh -c "echo '$docker_opts' >> /etc/default/docker"
 

From 8762fe8616320f4f68802757af41c60088ccae48 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 15:22:41 -0600
Subject: [PATCH 1222/1272] Bump org.apache.commons:commons-lang3 from 3.17.0
 to 3.18.0 (#2478)

Bumps org.apache.commons:commons-lang3 from 3.17.0 to 3.18.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-version: 3.18.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6cefe8d3b..3ea1afce3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
 		<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
 		<commons-compress.version>1.27.1</commons-compress.version>
 		<commons-io.version>2.19.0</commons-io.version>
-		<commons-lang3.version>3.17.0</commons-lang3.version>
+		<commons-lang3.version>3.18.0</commons-lang3.version>
 		<slf4j-api.version>1.7.30</slf4j-api.version>
 
 		<bouncycastle.version>1.81</bouncycastle.version>

From 64324e194d9c388521f4812a382f5315e403cb7d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 15:22:53 -0600
Subject: [PATCH 1223/1272] Bump netty.version from 4.2.2.Final to 4.2.3.Final
 (#2477)

Bumps `netty.version` from 4.2.2.Final to 4.2.3.Final.

Updates `io.netty:netty-codec-http` from 4.2.2.Final to 4.2.3.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.2.Final...netty-4.2.3.Final)

Updates `io.netty:netty-handler` from 4.2.2.Final to 4.2.3.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.2.Final...netty-4.2.3.Final)

Updates `io.netty:netty-handler-proxy` from 4.2.2.Final to 4.2.3.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.2.Final...netty-4.2.3.Final)

Updates `io.netty:netty-transport-native-epoll` from 4.2.2.Final to 4.2.3.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.2.Final...netty-4.2.3.Final)

Updates `io.netty:netty-transport-native-kqueue` from 4.2.2.Final to 4.2.3.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.2.Final...netty-4.2.3.Final)

---
updated-dependencies:
- dependency-name: io.netty:netty-codec-http
  dependency-version: 4.2.3.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-handler
  dependency-version: 4.2.3.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-handler-proxy
  dependency-version: 4.2.3.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-transport-native-epoll
  dependency-version: 4.2.3.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-transport-native-kqueue
  dependency-version: 4.2.3.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3ea1afce3..d3eab7db7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
 
 		<!-- test dependencies -->
 		<logback.version>1.2.3</logback.version>
-		<netty.version>4.2.2.Final</netty.version>
+		<netty.version>4.2.3.Final</netty.version>
 		<hamcrest.library.version>2.2</hamcrest.library.version>
 		<hamcrest.jpa-matchers>1.8</hamcrest.jpa-matchers>
 		<lambdaj.version>2.3.3</lambdaj.version>

From b5597dde3f00ee2ee32b1c137c04b1dfedf184bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 15:23:14 -0600
Subject: [PATCH 1224/1272] Bump org.junit.jupiter:junit-jupiter from 5.13.2 to
 5.13.3 (#2469)

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit-framework) from 5.13.2 to 5.13.3.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.2...r5.13.3)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-version: 5.13.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index 0c9cde9ba..c5da3a385 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.13.2</version>
+			<version>5.13.3</version>
 			<scope>test</scope>
 		</dependency>
 

From a187d8274f452c14a14b952444005ca76d081527 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Jul 2025 10:42:43 -0600
Subject: [PATCH 1225/1272] Bump org.junit.jupiter:junit-jupiter from 5.13.3 to
 5.13.4 (#2482)

Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit-framework) from 5.13.3 to 5.13.4.
- [Release notes](https://github.com/junit-team/junit-framework/releases)
- [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.3...r5.13.4)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-version: 5.13.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index c5da3a385..aafe5cde0 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.13.3</version>
+			<version>5.13.4</version>
 			<scope>test</scope>
 		</dependency>
 

From 3d64d8d845f043eba4aa58448ec4c25fc757f2c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Jul 2025 10:43:43 -0600
Subject: [PATCH 1226/1272] Bump commons-io:commons-io from 2.19.0 to 2.20.0
 (#2480)

Bumps [commons-io:commons-io](https://github.com/apache/commons-io) from 2.19.0 to 2.20.0.
- [Changelog](https://github.com/apache/commons-io/blob/master/RELEASE-NOTES.txt)
- [Commits](https://github.com/apache/commons-io/compare/rel/commons-io-2.19.0...rel/commons-io-2.20.0)

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-version: 2.20.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d3eab7db7..df34bd07a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
 		<jackson.version>2.18.4</jackson.version>
 		<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
 		<commons-compress.version>1.27.1</commons-compress.version>
-		<commons-io.version>2.19.0</commons-io.version>
+		<commons-io.version>2.20.0</commons-io.version>
 		<commons-lang3.version>3.18.0</commons-lang3.version>
 		<slf4j-api.version>1.7.30</slf4j-api.version>
 

From af2a9472d4f4bc73a05adf27d111fa92762b398d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 30 Jul 2025 20:41:48 -0600
Subject: [PATCH 1227/1272] Revert "Ignore jackson minor version updates"

This reverts commit b1d9e9155257d848b8d790a68ed407d4a8233d45.
---
 .github/dependabot.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index f0541701a..d301147be 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -7,6 +7,3 @@ updates:
     day: tuesday
   open-pull-requests-limit: 99
   rebase-strategy: disabled
-  ignore:
-    - dependency-name: "com.fasterxml.jackson.core:*"
-      update-types: [ "version-update:semver-minor" ]

From 9c40b40d59526981ee89c0043f5820402a0b67a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Jul 2025 10:13:10 -0600
Subject: [PATCH 1228/1272] Bump jackson.version from 2.18.4 to 2.19.2 (#2485)

Bumps `jackson.version` from 2.18.4 to 2.19.2.

Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.18.4 to 2.19.2
- [Commits](https://github.com/FasterXML/jackson/commits)

Updates `com.fasterxml.jackson.core:jackson-databind` from 2.18.4 to 2.19.2
- [Commits](https://github.com/FasterXML/jackson/commits)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-annotations
  dependency-version: 2.19.2
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-version: 2.19.2
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java/pom.xml | 8 ++++----
 pom.xml             | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index f72d1d6c2..f1cc09f64 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -125,16 +125,16 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<!-- Force the version to 2.18.4 to ensure the compatibility with old projects -->
-			<version>2.18.4</version>
+			<!-- Force the version to 2.19.2 to ensure the compatibility with old projects -->
+			<version>2.19.2</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<!-- Force the version to 2.18.4 to ensure the compatibility with old projects -->
-			<version>2.18.4</version>
+			<!-- Force the version to 2.19.2 to ensure the compatibility with old projects -->
+			<version>2.19.2</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/pom.xml b/pom.xml
index df34bd07a..9122d5bda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
 		<jdk.target>1.8</jdk.target>
 
 		<jersey.version>2.30.1</jersey.version>
-		<jackson.version>2.18.4</jackson.version>
+		<jackson.version>2.19.2</jackson.version>
 		<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
 		<commons-compress.version>1.27.1</commons-compress.version>
 		<commons-io.version>2.20.0</commons-io.version>

From 464c112003eb1b7e0d42aac8fbfb3af038ba18b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 19 Aug 2025 12:20:11 -0600
Subject: [PATCH 1229/1272] Ignore major update for jersey

---
 .github/dependabot.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d301147be..43fe26c4d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -7,3 +7,10 @@ updates:
     day: tuesday
   open-pull-requests-limit: 99
   rebase-strategy: disabled
+  ignore:
+    - dependency-name: "org.glassfish.jersey.connectors:jersey-apache-connector"
+      update-types: [ "version-update:semver-major" ]
+    - dependency-name: "org.glassfish.jersey.core:jersey-client"
+      update-types: [ "version-update:semver-major" ]
+    - dependency-name: "org.glassfish.jersey.inject:jersey-hk2"
+      update-types: [ "version-update:semver-major" ]

From 39743d1b633f79e882c0ab994f3cc6be389efa8c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Aug 2025 12:25:39 -0600
Subject: [PATCH 1230/1272] Bump org.assertj:assertj-core from 3.27.3 to 3.27.4
 (#2489)

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.3 to 3.27.4.
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.3...assertj-build-3.27.4)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-tck/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml
index 654ad17b8..69d40cc3c 100644
--- a/docker-java-transport-tck/pom.xml
+++ b/docker-java-transport-tck/pom.xml
@@ -34,7 +34,7 @@
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<version>3.27.3</version>
+			<version>3.27.4</version>
 		</dependency>
 
 		<dependency>

From 718fc382cb1923ce434c4f77c927cd6806f45a7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 19 Aug 2025 15:17:25 -0600
Subject: [PATCH 1231/1272] Add cache for maven

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5d6f8d370..d7b105d1d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,6 +22,7 @@ jobs:
         with:
           java-version: ${{matrix.javaVersion}}
           distribution: temurin
+          cache: maven
       - name: Configure Docker
         id: setup_docker
         uses: docker/setup-docker-action@v4
@@ -41,6 +42,7 @@ jobs:
         with:
           java-version: 8
           distribution: temurin
+          cache: maven
       - name: Configure Docker
         id: setup_docker
         uses: docker/setup-docker-action@v4

From 95d0fa703bf81fb20648a794e31b410216e6d5be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 19 Aug 2025 15:21:33 -0600
Subject: [PATCH 1232/1272] Switch dependabot to daily

---
 .github/dependabot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 43fe26c4d..9bcef2d88 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,7 +4,7 @@ updates:
   directory: "/"
   schedule:
     interval: weekly
-    day: tuesday
+    day: monday
   open-pull-requests-limit: 99
   rebase-strategy: disabled
   ignore:

From 9165f4191c5c52fce24c57665fd8007f4d902605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 19 Aug 2025 15:25:48 -0600
Subject: [PATCH 1233/1272] Update name-template in release-drafter

---
 .github/release-drafter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index d03b3f5f5..f570cce43 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -1,5 +1,5 @@
 tag-template: $NEXT_PATCH_VERSION
-name-template: '$NEXT_PATCH_VERSION 🌈'
+name-template: '$NEXT_PATCH_VERSION'
 categories:
   - title: '🚀 Features'
     labels:

From dfe1866d956f64fd4b91834f9b09ee973ac1f270 Mon Sep 17 00:00:00 2001
From: Alexander Koshevoy <11692026+tejksat@users.noreply.github.com>
Date: Tue, 19 Aug 2025 23:53:58 +0200
Subject: [PATCH 1234/1272] Add support for container wait conditions (#2487)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Expose the `condition` query parameter (added in Docker Engine API v1.30) on `WaitContainerCmd`. When the parameter is omitted, we keep the daemon’s default `not-running` behaviour.

Practical implications
----------------------
* **create → wait (no condition) → start**
  Calling `wait` right after `create` but **before** `start` returns immediately with whatever exit-code the daemon reports for a container that has never run (typically `0`). In other words, you learn nothing about the future process.

* **create → start → wait (no condition)**
  For short-lived containers started with `--rm`, the container may be auto-removed before the client manages to issue `wait`, resulting in a *"container not found"* error.

* **create → wait(condition=removed) → start**
  Passing the new `removed` condition eliminates both races: the wait call blocks until the container has exited *and* been removed, reliably yielding the actual exit code even for `--rm` containers.
---
 .../api/command/WaitContainerCmd.java         | 18 ++++-
 .../api/model/WaitContainerCondition.java     | 26 ++++++
 .../core/command/WaitContainerCmdImpl.java    | 17 ++++
 .../core/exec/WaitContainerCmdExec.java       |  6 ++
 .../dockerjava/cmd/WaitContainerCmdIT.java    | 80 +++++++++++++++++++
 5 files changed, 145 insertions(+), 2 deletions(-)
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitContainerCondition.java

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
index 3117cf7e4..7b910cd69 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
@@ -2,9 +2,11 @@
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.WaitContainerCondition;
 import com.github.dockerjava.api.model.WaitResponse;
 
 /**
@@ -20,8 +22,20 @@ public interface WaitContainerCmd extends AsyncDockerCmd<WaitContainerCmd, WaitR
     WaitContainerCmd withContainerId(@Nonnull String containerId);
 
     /**
-     * @throws NotFoundException
-     *             container not found
+     * Defaults to {@link WaitContainerCondition#NOT_RUNNING} if omitted or empty.
+     *
+     * @since {@link RemoteApiVersion#VERSION_1_30}
+     */
+    @Nullable
+    WaitContainerCondition getCondition();
+
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_30}
+     */
+    WaitContainerCmd withCondition(@Nullable WaitContainerCondition condition);
+
+    /**
+     * @throws NotFoundException container not found
      */
     @Override
     <T extends ResultCallback<WaitResponse>> T exec(T resultCallback);
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitContainerCondition.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitContainerCondition.java
new file mode 100644
index 000000000..8af0efa35
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitContainerCondition.java
@@ -0,0 +1,26 @@
+package com.github.dockerjava.api.model;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Docker Engine API <em>wait</em> conditions (added in v1.30).
+ *
+ * @since {@link RemoteApiVersion#VERSION_1_30}
+ */
+public enum WaitContainerCondition {
+    NOT_RUNNING("not-running"),
+    NEXT_EXIT("next-exit"),
+    REMOVED("removed");
+
+    @Nonnull
+    private final String value;
+
+    WaitContainerCondition(@Nonnull String value) {
+        this.value = value;
+    }
+
+    @Nonnull
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
index 91b2255bc..b627e2ccd 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
@@ -2,7 +2,10 @@
 
 import java.util.Objects;
 
+import javax.annotation.Nullable;
+
 import com.github.dockerjava.api.command.WaitContainerCmd;
+import com.github.dockerjava.api.model.WaitContainerCondition;
 import com.github.dockerjava.api.model.WaitResponse;
 
 /**
@@ -15,6 +18,8 @@ public class WaitContainerCmdImpl extends AbstrAsyncDockerCmd<WaitContainerCmd,
 
     private String containerId;
 
+    private WaitContainerCondition condition;
+
     public WaitContainerCmdImpl(WaitContainerCmd.Exec exec, String containerId) {
         super(exec);
         withContainerId(containerId);
@@ -31,4 +36,16 @@ public WaitContainerCmd withContainerId(String containerId) {
         return this;
     }
 
+    @Nullable
+    @Override
+    public WaitContainerCondition getCondition() {
+        return condition;
+    }
+
+    @Override
+    public WaitContainerCmd withCondition(@Nullable WaitContainerCondition condition) {
+        this.condition = condition;
+        return this;
+    }
+
 }
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/WaitContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/WaitContainerCmdExec.java
index 57cc727fe..3d2b2fa8e 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/WaitContainerCmdExec.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/WaitContainerCmdExec.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.core.exec;
 
+import com.github.dockerjava.api.model.WaitContainerCondition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,6 +26,11 @@ protected Void execute0(WaitContainerCmd command, ResultCallback<WaitResponse> r
         WebTarget webTarget = getBaseResource().path("/containers/{id}/wait").resolveTemplate("id",
                 command.getContainerId());
 
+        WaitContainerCondition condition = command.getCondition();
+        if (condition != null) {
+            webTarget = webTarget.queryParam("condition", condition.getValue());
+        }
+
         LOGGER.trace("POST: {}", webTarget);
 
         webTarget.request().accept(MediaType.APPLICATION_JSON).post((Object) null, new TypeReference<WaitResponse>() {
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java
index e2ad2a643..3a39b3eea 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/WaitContainerCmdIT.java
@@ -8,18 +8,25 @@
 import com.github.dockerjava.api.exception.DockerClientException;
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.WaitContainerCondition;
 import com.github.dockerjava.api.model.WaitResponse;
+import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.concurrent.TimeUnit;
 
+import static com.github.dockerjava.api.model.HostConfig.newHostConfig;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_25;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_30;
+import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
+import static org.junit.Assume.assumeThat;
 
 public class WaitContainerCmdIT extends CmdIT {
     public static final Logger LOG = LoggerFactory.getLogger(BuildImageCmd.class);
@@ -102,4 +109,77 @@ public void testWaitContainerTimeout() {
             LOG.info(e.getMessage());
         }
     }
+
+    @Test
+    public void testWaitNotStartedContainer() {
+        assumeThat("API version should be > 1.25", dockerRule, isGreaterOrEqual(VERSION_1_25));
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+            .withHostConfig(newHostConfig().withAutoRemove(true))
+            .exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(is(emptyString())));
+
+        WaitContainerResultCallback callback = dockerRule.getClient().waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback());
+
+        Integer statusCode = callback.awaitStatusCode(100, TimeUnit.MILLISECONDS);
+        Assert.assertEquals(0, statusCode.intValue());
+    }
+
+    @Test
+    public void testWaitContainerWithAutoRemoval() {
+        assumeThat("API version should be > 1.30", dockerRule, isGreaterOrEqual(VERSION_1_30));
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+            .withCmd("false")
+            .withHostConfig(newHostConfig().withAutoRemove(true))
+            .exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(is(emptyString())));
+
+        WaitContainerResultCallback removedCondition = dockerRule.getClient().waitContainerCmd(container.getId())
+            .withCondition(WaitContainerCondition.REMOVED)
+            .exec(new WaitContainerResultCallback());
+
+        WaitContainerResultCallback nextExitCondition = dockerRule.getClient().waitContainerCmd(container.getId())
+            .withCondition(WaitContainerCondition.NEXT_EXIT)
+            .exec(new WaitContainerResultCallback());
+
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        Assert.assertEquals(1, removedCondition.awaitStatusCode(100, TimeUnit.MILLISECONDS).intValue());
+        Assert.assertEquals(1, nextExitCondition.awaitStatusCode(100, TimeUnit.MILLISECONDS).intValue());
+    }
+
+    @Test
+    public void testWaitRestartedContainer() {
+        assumeThat("API version should be > 1.30", dockerRule, isGreaterOrEqual(VERSION_1_30));
+
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
+            .withCmd("sh", "-c", "[ -f \"$HOME/.first_run_marker\" ] && exit 2 || { touch \"$HOME/.first_run_marker\"; exit 1; }")
+            .exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(is(emptyString())));
+
+        WaitContainerResultCallback firstExitCallback = dockerRule.getClient().waitContainerCmd(container.getId())
+            .withCondition(WaitContainerCondition.NEXT_EXIT)
+            .exec(new WaitContainerResultCallback());
+
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        Integer firstStatusCode = firstExitCallback.awaitStatusCode(100, TimeUnit.MILLISECONDS);
+        Assert.assertEquals(1, firstStatusCode.intValue());
+
+        WaitContainerResultCallback callback = dockerRule.getClient().waitContainerCmd(container.getId())
+            .withCondition(WaitContainerCondition.NEXT_EXIT)
+            .exec(new WaitContainerResultCallback());
+
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        Integer statusCode = callback.awaitStatusCode(100, TimeUnit.MILLISECONDS);
+        Assert.assertEquals(2, statusCode.intValue());
+    }
 }

From ce05588c61724ad3b03350fd1556d413740257c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Aug 2025 18:25:33 -0600
Subject: [PATCH 1235/1272] Bump netty.version from 4.2.3.Final to 4.2.4.Final
 (#2494)

Bumps `netty.version` from 4.2.3.Final to 4.2.4.Final.

Updates `io.netty:netty-codec-http` from 4.2.3.Final to 4.2.4.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.3.Final...netty-4.2.4.Final)

Updates `io.netty:netty-handler` from 4.2.3.Final to 4.2.4.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.3.Final...netty-4.2.4.Final)

Updates `io.netty:netty-handler-proxy` from 4.2.3.Final to 4.2.4.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.3.Final...netty-4.2.4.Final)

Updates `io.netty:netty-transport-native-epoll` from 4.2.3.Final to 4.2.4.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.3.Final...netty-4.2.4.Final)

Updates `io.netty:netty-transport-native-kqueue` from 4.2.3.Final to 4.2.4.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.3.Final...netty-4.2.4.Final)

---
updated-dependencies:
- dependency-name: io.netty:netty-codec-http
  dependency-version: 4.2.4.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-handler
  dependency-version: 4.2.4.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-handler-proxy
  dependency-version: 4.2.4.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-transport-native-epoll
  dependency-version: 4.2.4.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-transport-native-kqueue
  dependency-version: 4.2.4.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9122d5bda..83542af74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
 
 		<!-- test dependencies -->
 		<logback.version>1.2.3</logback.version>
-		<netty.version>4.2.3.Final</netty.version>
+		<netty.version>4.2.4.Final</netty.version>
 		<hamcrest.library.version>2.2</hamcrest.library.version>
 		<hamcrest.jpa-matchers>1.8</hamcrest.jpa-matchers>
 		<lambdaj.version>2.3.3</lambdaj.version>

From 4df8cbb4d90d6d88378493d78a691342e95769ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Aug 2025 18:42:40 -0600
Subject: [PATCH 1236/1272] Bump jersey.version from 2.30.1 to 2.47 (#2496)

Bumps `jersey.version` from 2.30.1 to 2.47.

Updates `org.glassfish.jersey.connectors:jersey-apache-connector` from 2.30.1 to 2.47

Updates `org.glassfish.jersey.core:jersey-client` from 2.30.1 to 2.47

Updates `org.glassfish.jersey.inject:jersey-hk2` from 2.30.1 to 2.47

---
updated-dependencies:
- dependency-name: org.glassfish.jersey.connectors:jersey-apache-connector
  dependency-version: '2.47'
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.glassfish.jersey.core:jersey-client
  dependency-version: '2.47'
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.glassfish.jersey.inject:jersey-hk2
  dependency-version: '2.47'
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 83542af74..fe10d4302 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
 		<jdk.source>1.8</jdk.source>
 		<jdk.target>1.8</jdk.target>
 
-		<jersey.version>2.30.1</jersey.version>
+		<jersey.version>2.47</jersey.version>
 		<jackson.version>2.19.2</jackson.version>
 		<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
 		<commons-compress.version>1.27.1</commons-compress.version>

From 150293d945f34e54c562ac82a803fd738fed4be4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Aug 2025 18:58:21 -0600
Subject: [PATCH 1237/1272] Bump org.apache.commons:commons-compress from
 1.27.1 to 1.28.0 (#2486)

Bumps [org.apache.commons:commons-compress](https://github.com/apache/commons-compress) from 1.27.1 to 1.28.0.
- [Changelog](https://github.com/apache/commons-compress/blob/master/RELEASE-NOTES.txt)
- [Commits](https://github.com/apache/commons-compress/compare/rel/commons-compress-1.27.1...rel/commons-compress-1.28.0)

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-compress
  dependency-version: 1.28.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fe10d4302..58fa183e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
 		<jersey.version>2.47</jersey.version>
 		<jackson.version>2.19.2</jackson.version>
 		<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
-		<commons-compress.version>1.27.1</commons-compress.version>
+		<commons-compress.version>1.28.0</commons-compress.version>
 		<commons-io.version>2.20.0</commons-io.version>
 		<commons-lang3.version>3.18.0</commons-lang3.version>
 		<slf4j-api.version>1.7.30</slf4j-api.version>

From 89a5188317df187727d9fcd7ec7bc617097e12bc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Sep 2025 21:58:35 -0600
Subject: [PATCH 1238/1272] Bump org.bouncycastle:bcpkix-jdk18on from 1.81 to
 1.82 (#2512)

Bumps [org.bouncycastle:bcpkix-jdk18on](https://github.com/bcgit/bc-java) from 1.81 to 1.82.
- [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html)
- [Commits](https://github.com/bcgit/bc-java/commits)

---
updated-dependencies:
- dependency-name: org.bouncycastle:bcpkix-jdk18on
  dependency-version: '1.82'
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 58fa183e8..b800eb77f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
 		<commons-lang3.version>3.18.0</commons-lang3.version>
 		<slf4j-api.version>1.7.30</slf4j-api.version>
 
-		<bouncycastle.version>1.81</bouncycastle.version>
+		<bouncycastle.version>1.82</bouncycastle.version>
 		<junixsocket.version>2.10.1</junixsocket.version>
 		<guava.version>33.4.8-jre</guava.version> <!-- todo remove from project -->
 

From fc44c4dcad1e930202c5c1b99dafffc3dc960d58 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Sep 2025 21:58:46 -0600
Subject: [PATCH 1239/1272] Bump org.assertj:assertj-core from 3.27.4 to 3.27.5
 (#2508)

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.4 to 3.27.5.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.4...assertj-build-3.27.5)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-tck/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml
index 69d40cc3c..2e24aed4c 100644
--- a/docker-java-transport-tck/pom.xml
+++ b/docker-java-transport-tck/pom.xml
@@ -34,7 +34,7 @@
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<version>3.27.4</version>
+			<version>3.27.5</version>
 		</dependency>
 
 		<dependency>

From 9953383e48d2c8ba28a3487c8601688f5a1b1396 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Sep 2025 22:23:08 -0600
Subject: [PATCH 1240/1272] Bump netty.version from 4.2.4.Final to 4.2.6.Final
 (#2501)

Bumps `netty.version` from 4.2.4.Final to 4.2.6.Final.

Updates `io.netty:netty-codec-http` from 4.2.4.Final to 4.2.6.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.4.Final...netty-4.2.6.Final)

Updates `io.netty:netty-handler` from 4.2.4.Final to 4.2.6.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.4.Final...netty-4.2.6.Final)

Updates `io.netty:netty-handler-proxy` from 4.2.4.Final to 4.2.6.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.4.Final...netty-4.2.6.Final)

Updates `io.netty:netty-transport-native-epoll` from 4.2.4.Final to 4.2.6.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.4.Final...netty-4.2.6.Final)

Updates `io.netty:netty-transport-native-kqueue` from 4.2.4.Final to 4.2.6.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.4.Final...netty-4.2.6.Final)

---
updated-dependencies:
- dependency-name: io.netty:netty-codec-http
  dependency-version: 4.2.6.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-handler
  dependency-version: 4.2.6.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-handler-proxy
  dependency-version: 4.2.6.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-transport-native-epoll
  dependency-version: 4.2.6.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-transport-native-kqueue
  dependency-version: 4.2.6.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b800eb77f..300b154a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
 
 		<!-- test dependencies -->
 		<logback.version>1.2.3</logback.version>
-		<netty.version>4.2.4.Final</netty.version>
+		<netty.version>4.2.6.Final</netty.version>
 		<hamcrest.library.version>2.2</hamcrest.library.version>
 		<hamcrest.jpa-matchers>1.8</hamcrest.jpa-matchers>
 		<lambdaj.version>2.3.3</lambdaj.version>

From 745c977b57ec2f2514e1c600c22ed97655dde9f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Sep 2025 17:03:55 -0600
Subject: [PATCH 1241/1272] Bump org.apache.httpcomponents.client5:httpclient5
 from 5.5 to 5.5.1 (#2518)

Bumps [org.apache.httpcomponents.client5:httpclient5](https://github.com/apache/httpcomponents-client) from 5.5 to 5.5.1.
- [Changelog](https://github.com/apache/httpcomponents-client/blob/rel/v5.5.1/RELEASE_NOTES.txt)
- [Commits](https://github.com/apache/httpcomponents-client/compare/rel/v5.5...rel/v5.5.1)

---
updated-dependencies:
- dependency-name: org.apache.httpcomponents.client5:httpclient5
  dependency-version: 5.5.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-httpclient5/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml
index 872c28e40..013aa63f7 100644
--- a/docker-java-transport-httpclient5/pom.xml
+++ b/docker-java-transport-httpclient5/pom.xml
@@ -29,7 +29,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents.client5</groupId>
 			<artifactId>httpclient5</artifactId>
-			<version>5.5</version>
+			<version>5.5.1</version>
 		</dependency>
 
 		<dependency>

From ad0e3d2e54962772ae503a582eecc255c5251f14 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Sep 2025 17:04:07 -0600
Subject: [PATCH 1242/1272] Bump
 org.sonatype.central:central-publishing-maven-plugin (#2517)

Bumps [org.sonatype.central:central-publishing-maven-plugin](https://github.com/sonatype/central-publishing-maven-plugin) from 0.8.0 to 0.9.0.
- [Commits](https://github.com/sonatype/central-publishing-maven-plugin/commits)

---
updated-dependencies:
- dependency-name: org.sonatype.central:central-publishing-maven-plugin
  dependency-version: 0.9.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 300b154a8..0ae416d1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -288,7 +288,7 @@
 				<plugin>
 					<groupId>org.sonatype.central</groupId>
 					<artifactId>central-publishing-maven-plugin</artifactId>
-					<version>0.8.0</version>
+					<version>0.9.0</version>
 					<extensions>true</extensions>
 					<configuration>
 						<publishingServerId>central</publishingServerId>

From 55e45932aa684291222e9e63a6512f232ac69b23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Sep 2025 17:04:28 -0600
Subject: [PATCH 1243/1272] Bump org.assertj:assertj-core from 3.27.5 to 3.27.6
 (#2513)

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.5 to 3.27.6.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.5...assertj-build-3.27.6)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-tck/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml
index 2e24aed4c..a7a74101b 100644
--- a/docker-java-transport-tck/pom.xml
+++ b/docker-java-transport-tck/pom.xml
@@ -34,7 +34,7 @@
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<version>3.27.5</version>
+			<version>3.27.6</version>
 		</dependency>
 
 		<dependency>

From 717152e854db314f8fc2ef6ee650db1ab54551e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20G=C3=B6ller?= <cgoeller@gmx.de>
Date: Wed, 1 Oct 2025 01:09:41 +0200
Subject: [PATCH 1244/1272] Support propagation modes rslave, rshared and
 rprivate in Bind.parse (#2519)

Fixes #2271
---
 .../com/github/dockerjava/api/model/Bind.java |  6 +++
 .../github/dockerjava/api/model/BindTest.java | 48 +++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java
index a7c8dba26..ea7c22e69 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java
@@ -118,10 +118,16 @@ public static Bind parse(String serialized) {
                         nocopy = true;
                     } else if (PropagationMode.SHARED.toString().equals(p)) {
                         propagationMode = PropagationMode.SHARED;
+                    } else if (PropagationMode.RSHARED.toString().equals(p)) {
+                        propagationMode = PropagationMode.RSHARED;
                     } else if (PropagationMode.SLAVE.toString().equals(p)) {
                         propagationMode = PropagationMode.SLAVE;
+                    } else if (PropagationMode.RSLAVE.toString().equals(p)) {
+                        propagationMode = PropagationMode.RSLAVE;
                     } else if (PropagationMode.PRIVATE.toString().equals(p)) {
                         propagationMode = PropagationMode.PRIVATE;
+                    } else if (PropagationMode.RPRIVATE.toString().equals(p)) {
+                        propagationMode = PropagationMode.RPRIVATE;
                     } else {
                         seMode = SELContext.fromString(p);
                     }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java
index 663231151..d31a66dde 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/BindTest.java
@@ -166,6 +166,17 @@ public void parseReadWriteShared() {
         assertThat(bind.getPropagationMode(), is(PropagationMode.SHARED));
     }
 
+    @Test
+    public void parseReadWriteRshared() {
+        Bind bind = Bind.parse("/host:/container:rw,rshared");
+        assertThat(bind.getPath(), is("/host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(rw));
+        assertThat(bind.getSecMode(), is(SELContext.none));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.RSHARED));
+    }
+
     @Test
     public void parseReadWriteSlave() {
         Bind bind = Bind.parse("/host:/container:rw,slave");
@@ -177,6 +188,17 @@ public void parseReadWriteSlave() {
         assertThat(bind.getPropagationMode(), is(PropagationMode.SLAVE));
     }
 
+    @Test
+    public void parseReadWriteRslave() {
+        Bind bind = Bind.parse("/host:/container:rw,rslave");
+        assertThat(bind.getPath(), is("/host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(rw));
+        assertThat(bind.getSecMode(), is(SELContext.none));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.RSLAVE));
+    }
+
     @Test
     public void parseReadWritePrivate() {
         Bind bind = Bind.parse("/host:/container:rw,private");
@@ -188,6 +210,17 @@ public void parseReadWritePrivate() {
         assertThat(bind.getPropagationMode(), is(PropagationMode.PRIVATE));
     }
 
+    @Test
+    public void parseReadWriteRprivate() {
+        Bind bind = Bind.parse("/host:/container:rw,rprivate");
+        assertThat(bind.getPath(), is("/host"));
+        assertThat(bind.getVolume().getPath(), is("/container"));
+        assertThat(bind.getAccessMode(), is(rw));
+        assertThat(bind.getSecMode(), is(SELContext.none));
+        assertThat(bind.getNoCopy(), nullValue());
+        assertThat(bind.getPropagationMode(), is(PropagationMode.RPRIVATE));
+    }
+
     @Test
     public void parseReadOnly() {
         Bind bind = Bind.parse("/host:/container:ro");
@@ -284,16 +317,31 @@ public void toStringReadWriteShared() {
         assertThat(Bind.parse("/host:/container:rw,shared").toString(), is("/host:/container:rw,shared"));
     }
 
+    @Test
+    public void toStringReadWriteRshared() {
+        assertThat(Bind.parse("/host:/container:rw,rshared").toString(), is("/host:/container:rw,rshared"));
+    }
+
     @Test
     public void toStringReadWriteSlave() {
         assertThat(Bind.parse("/host:/container:rw,slave").toString(), is("/host:/container:rw,slave"));
     }
 
+    @Test
+    public void toStringReadWriteRslave() {
+        assertThat(Bind.parse("/host:/container:rw,rslave").toString(), is("/host:/container:rw,rslave"));
+    }
+
     @Test
     public void toStringReadWritePrivate() {
         assertThat(Bind.parse("/host:/container:rw,private").toString(), is("/host:/container:rw,private"));
     }
 
+    @Test
+    public void toStringReadWriteRprivate() {
+        assertThat(Bind.parse("/host:/container:rw,rprivate").toString(), is("/host:/container:rw,rprivate"));
+    }
+
     @Test
     public void toStringDefaultAccessMode() {
         assertThat(Bind.parse("/host:/container").toString(), is("/host:/container:rw"));

From 3a709b8844e2cb20b78e14b2183417aa67f94b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Tue, 30 Sep 2025 17:30:31 -0600
Subject: [PATCH 1245/1272] Manage jackson versions independently (#2520)

---
 docker-java-api/pom.xml  | 2 +-
 docker-java-core/pom.xml | 2 +-
 pom.xml                  | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index aafe5cde0..c3e17887a 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -23,7 +23,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<version>${jackson.version}</version>
+			<version>2.19.2</version>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index 290a1fed9..90fa3a813 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -58,7 +58,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>${jackson.version}</version>
+			<version>2.19.2</version>
 		</dependency>
 
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 0ae416d1b..fcd48b50a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,6 @@
 		<jdk.target>1.8</jdk.target>
 
 		<jersey.version>2.47</jersey.version>
-		<jackson.version>2.19.2</jackson.version>
 		<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
 		<commons-compress.version>1.28.0</commons-compress.version>
 		<commons-io.version>2.20.0</commons-io.version>

From 4447932fef9c9e5de84249fe3c1b00c69186e359 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Sep 2025 17:56:28 -0600
Subject: [PATCH 1246/1272] Bump org.apache.commons:commons-lang3 from 3.18.0
 to 3.19.0 (#2516)

Bumps org.apache.commons:commons-lang3 from 3.18.0 to 3.19.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-lang3
  dependency-version: 3.19.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fcd48b50a..8eb0a3ade 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
 		<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
 		<commons-compress.version>1.28.0</commons-compress.version>
 		<commons-io.version>2.20.0</commons-io.version>
-		<commons-lang3.version>3.18.0</commons-lang3.version>
+		<commons-lang3.version>3.19.0</commons-lang3.version>
 		<slf4j-api.version>1.7.30</slf4j-api.version>
 
 		<bouncycastle.version>1.82</bouncycastle.version>

From 75829faa346d0ff98a31a52a1cfdfec8a58a9627 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Sep 2025 17:56:48 -0600
Subject: [PATCH 1247/1272] Bump net.java.dev.jna:jna from 5.17.0 to 5.18.0
 (#2515)

Bumps [net.java.dev.jna:jna](https://github.com/java-native-access/jna) from 5.17.0 to 5.18.0.
- [Changelog](https://github.com/java-native-access/jna/blob/master/CHANGES.md)
- [Commits](https://github.com/java-native-access/jna/compare/5.17.0...5.18.0)

---
updated-dependencies:
- dependency-name: net.java.dev.jna:jna
  dependency-version: 5.18.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-httpclient5/pom.xml | 2 +-
 docker-java-transport-okhttp/pom.xml      | 2 +-
 docker-java-transport/pom.xml             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml
index 013aa63f7..744676f81 100644
--- a/docker-java-transport-httpclient5/pom.xml
+++ b/docker-java-transport-httpclient5/pom.xml
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.17.0</version>
+			<version>5.18.0</version>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index 3bac0cead..c30e369a0 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.17.0</version>
+			<version>5.18.0</version>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml
index 96f1f850a..6a9e95270 100644
--- a/docker-java-transport/pom.xml
+++ b/docker-java-transport/pom.xml
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.17.0</version>
+			<version>5.18.0</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

From 476b88b81929e5af0f59c10d1ac5d55b21abcc74 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Sep 2025 18:01:16 -0600
Subject: [PATCH 1248/1272] Bump com.fasterxml.jackson.core:jackson-annotations
 from 2.19.2 to 2.20 (#2521)

Bumps [com.fasterxml.jackson.core:jackson-annotations](https://github.com/FasterXML/jackson) from 2.19.2 to 2.20.
- [Commits](https://github.com/FasterXML/jackson/commits)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-annotations
  dependency-version: '2.20'
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-api/pom.xml | 2 +-
 docker-java/pom.xml     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index c3e17887a..dda682ab1 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -23,7 +23,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<version>2.19.2</version>
+			<version>2.20</version>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index f1cc09f64..b6f5c8564 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -133,8 +133,8 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<!-- Force the version to 2.19.2 to ensure the compatibility with old projects -->
-			<version>2.19.2</version>
+			<!-- Force the version to 2.20 to ensure the compatibility with old projects -->
+			<version>2.20</version>
 			<scope>test</scope>
 		</dependency>
 

From 0873a609e55d4ff15a504b38c9a664fdc73322bd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Oct 2025 09:24:06 -0600
Subject: [PATCH 1249/1272] Bump com.github.siom79.japicmp:japicmp-maven-plugin
 (#2529)

Bumps [com.github.siom79.japicmp:japicmp-maven-plugin](https://github.com/siom79/japicmp) from 0.23.1 to 0.24.2.
- [Release notes](https://github.com/siom79/japicmp/releases)
- [Changelog](https://github.com/siom79/japicmp/blob/master/release.py)
- [Commits](https://github.com/siom79/japicmp/compare/japicmp-base-0.23.1...japicmp-base-0.24.2)

---
updated-dependencies:
- dependency-name: com.github.siom79.japicmp:japicmp-maven-plugin
  dependency-version: 0.24.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8eb0a3ade..f8b0fe93c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -242,7 +242,7 @@
 					<!-- use with "mvn -DskipTests clean verify" -->
 					<groupId>com.github.siom79.japicmp</groupId>
 					<artifactId>japicmp-maven-plugin</artifactId>
-					<version>0.23.1</version>
+					<version>0.24.2</version>
 					<configuration>
 						<oldVersion>
 							<dependency>

From 9c2ac260d18589807cfb7819dbabc0994af0e611 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Oct 2025 10:29:34 -0600
Subject: [PATCH 1250/1272] Bump netty.version from 4.2.6.Final to 4.2.7.Final
 (#2531)

Bumps `netty.version` from 4.2.6.Final to 4.2.7.Final.

Updates `io.netty:netty-codec-http` from 4.2.6.Final to 4.2.7.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.6.Final...netty-4.2.7.Final)

Updates `io.netty:netty-handler` from 4.2.6.Final to 4.2.7.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.6.Final...netty-4.2.7.Final)

Updates `io.netty:netty-handler-proxy` from 4.2.6.Final to 4.2.7.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.6.Final...netty-4.2.7.Final)

Updates `io.netty:netty-transport-native-epoll` from 4.2.6.Final to 4.2.7.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.6.Final...netty-4.2.7.Final)

Updates `io.netty:netty-transport-native-kqueue` from 4.2.6.Final to 4.2.7.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.6.Final...netty-4.2.7.Final)

---
updated-dependencies:
- dependency-name: io.netty:netty-codec-http
  dependency-version: 4.2.7.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-handler
  dependency-version: 4.2.7.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-handler-proxy
  dependency-version: 4.2.7.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-transport-native-epoll
  dependency-version: 4.2.7.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-transport-native-kqueue
  dependency-version: 4.2.7.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f8b0fe93c..c7c05864c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
 
 		<!-- test dependencies -->
 		<logback.version>1.2.3</logback.version>
-		<netty.version>4.2.6.Final</netty.version>
+		<netty.version>4.2.7.Final</netty.version>
 		<hamcrest.library.version>2.2</hamcrest.library.version>
 		<hamcrest.jpa-matchers>1.8</hamcrest.jpa-matchers>
 		<lambdaj.version>2.3.3</lambdaj.version>

From 0bc94c6b305412c39a4abf2b4c5c69a01b182641 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Oct 2025 10:30:02 -0600
Subject: [PATCH 1251/1272] Bump net.java.dev.jna:jna from 5.18.0 to 5.18.1
 (#2524)

Bumps [net.java.dev.jna:jna](https://github.com/java-native-access/jna) from 5.18.0 to 5.18.1.
- [Changelog](https://github.com/java-native-access/jna/blob/master/CHANGES.md)
- [Commits](https://github.com/java-native-access/jna/compare/5.18.0...5.18.1)

---
updated-dependencies:
- dependency-name: net.java.dev.jna:jna
  dependency-version: 5.18.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-httpclient5/pom.xml | 2 +-
 docker-java-transport-okhttp/pom.xml      | 2 +-
 docker-java-transport/pom.xml             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml
index 744676f81..52cf66de2 100644
--- a/docker-java-transport-httpclient5/pom.xml
+++ b/docker-java-transport-httpclient5/pom.xml
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.18.0</version>
+			<version>5.18.1</version>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
index c30e369a0..2a0ae4227 100644
--- a/docker-java-transport-okhttp/pom.xml
+++ b/docker-java-transport-okhttp/pom.xml
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.18.0</version>
+			<version>5.18.1</version>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java-transport/pom.xml b/docker-java-transport/pom.xml
index 6a9e95270..8be456dd1 100644
--- a/docker-java-transport/pom.xml
+++ b/docker-java-transport/pom.xml
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.18.0</version>
+			<version>5.18.1</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

From cbf88f5a6d3407159c69fd0ffc715a6ff4d11ef8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Nov 2025 11:06:35 -0600
Subject: [PATCH 1252/1272] Bump com.fasterxml.jackson.core:jackson-databind
 from 2.19.2 to 2.20.1 (#2537)

Bumps [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) from 2.19.2 to 2.20.1.
- [Commits](https://github.com/FasterXML/jackson/commits)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-version: 2.20.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-core/pom.xml | 2 +-
 docker-java/pom.xml      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-java-core/pom.xml b/docker-java-core/pom.xml
index 90fa3a813..89c72c024 100644
--- a/docker-java-core/pom.xml
+++ b/docker-java-core/pom.xml
@@ -58,7 +58,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.19.2</version>
+			<version>2.20.1</version>
 		</dependency>
 
 		<dependency>
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index b6f5c8564..3cfd7f255 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -125,8 +125,8 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<!-- Force the version to 2.19.2 to ensure the compatibility with old projects -->
-			<version>2.19.2</version>
+			<!-- Force the version to 2.20.1 to ensure the compatibility with old projects -->
+			<version>2.20.1</version>
 			<scope>test</scope>
 		</dependency>
 

From d72d7418ecb1aea54fffb32924960822029910c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Nov 2025 11:25:27 -0600
Subject: [PATCH 1253/1272] Bump commons-io:commons-io from 2.20.0 to 2.21.0
 (#2539)

Bumps [commons-io:commons-io](https://github.com/apache/commons-io) from 2.20.0 to 2.21.0.
- [Changelog](https://github.com/apache/commons-io/blob/master/RELEASE-NOTES.txt)
- [Commits](https://github.com/apache/commons-io/compare/rel/commons-io-2.20.0...rel/commons-io-2.21.0)

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-version: 2.21.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c7c05864c..72add3980 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
 		<jersey.version>2.47</jersey.version>
 		<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
 		<commons-compress.version>1.28.0</commons-compress.version>
-		<commons-io.version>2.20.0</commons-io.version>
+		<commons-io.version>2.21.0</commons-io.version>
 		<commons-lang3.version>3.19.0</commons-lang3.version>
 		<slf4j-api.version>1.7.30</slf4j-api.version>
 

From 7ca5a47190dc4c9c9499a88a79369e436784ad94 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Nov 2025 11:25:49 -0600
Subject: [PATCH 1254/1272] Bump org.testcontainers:testcontainers from 1.21.3
 to 2.0.1 (#2530)

Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.21.3 to 2.0.1.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.21.3...2.0.1)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers
  dependency-version: 2.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-tck/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml
index a7a74101b..3d38f9dfc 100644
--- a/docker-java-transport-tck/pom.xml
+++ b/docker-java-transport-tck/pom.xml
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>testcontainers</artifactId>
-			<version>1.21.3</version>
+			<version>2.0.1</version>
 		</dependency>
 
 		<dependency>

From c6f0c7202e3e50d9b5e234bd7cb5643551dd5ff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 12 Nov 2025 18:33:11 -0600
Subject: [PATCH 1255/1272] Set default docker API version to 1.44 (#2540)

---
 .../src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java  | 3 ---
 .../java/com/github/dockerjava/cmd/CreateContainerCmdIT.java  | 4 ++--
 .../java/com/github/dockerjava/cmd/InspectContainerCmdIT.java | 4 +++-
 .../test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java  | 4 ++--
 .../test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java   | 2 +-
 .../com/github/dockerjava/cmd/RestartContainerCmdImplIT.java  | 2 +-
 .../src/test/java/com/github/dockerjava/core/DockerRule.java  | 2 +-
 .../dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java | 4 ++--
 8 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java
index 39f51adc7..bd87d4aab 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CommitCmdIT.java
@@ -46,9 +46,6 @@ public void commit() throws DockerException, InterruptedException {
         InspectImageResponse inspectImageResponse = dockerRule.getClient().inspectImageCmd(imageId).exec();
         LOG.info("Image Inspect: {}", inspectImageResponse.toString());
 
-        assertThat(inspectImageResponse, hasField("container", startsWith(container.getId())));
-        assertThat(inspectImageResponse.getContainerConfig().getImage(), equalTo(DEFAULT_IMAGE));
-
         InspectImageResponse busyboxImg = dockerRule.getClient().inspectImageCmd("busybox").exec();
 
         assertThat(inspectImageResponse.getParent(), equalTo(busyboxImg.getId()));
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index d91791cbc..99d5dd997 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -60,7 +60,7 @@
 import static com.github.dockerjava.api.model.HostConfig.newHostConfig;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_23;
 import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_24;
-import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_43;
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_44;
 import static com.github.dockerjava.junit.DockerMatchers.isGreaterOrEqual;
 import static com.github.dockerjava.junit.DockerMatchers.mountedVolumes;
 import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE;
@@ -1148,7 +1148,7 @@ public void shouldHandleANetworkAliasWithoutACustomNetworkGracefully() {
     @Test
     public void createContainerWithAnnotations() throws DockerException {
         DefaultDockerClientConfig forcedConfig = DefaultDockerClientConfig.createDefaultConfigBuilder()
-        .withApiVersion(VERSION_1_43)
+        .withApiVersion(VERSION_1_44)
         .withRegistryUrl("https://index.docker.io/v1/")
         .build();
         
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
index cc1468f7f..e47a911d7 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/InspectContainerCmdIT.java
@@ -6,6 +6,7 @@
 import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.api.model.Container;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -102,7 +103,7 @@ public void inspectContainerWithSize() throws DockerException {
             assertNotNull(containerInfo.getSizeRootFs());
             assertTrue(containerInfo.getSizeRootFs() > 0L);
             assertNotNull(containerInfo.getSizeRw());
-            assertEquals(0L, containerInfo.getSizeRw().longValue());
+            assertEquals(4096, containerInfo.getSizeRw().longValue());
         }
     }
 
@@ -127,6 +128,7 @@ public void inspectContainerRestartCount() throws DockerException {
     }
 
     @Test
+    @Ignore
     public void inspectContainerNetworkSettings() throws DockerException {
 
         CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java
index 38b756dab..67ba85672 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ListImagesCmdIT.java
@@ -40,9 +40,9 @@ public void listImages() throws DockerException {
 
         Image img = images.get(0);
         assertThat(img.getCreated(), is(greaterThan(0L)));
-        assertThat(img.getVirtualSize(), is(greaterThan(0L)));
+        assertThat(img.getSize(), is(greaterThan(0L)));
         assertThat(img.getId(), not(is(emptyString())));
-        assertThat(img.getRepoTags(), not(emptyArray()));
+        assertThat(img.getRepoTags(), emptyArray());
     }
 
     @Test
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java
index 5b87f17a6..36a8d51fc 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/LoadImageCmdIT.java
@@ -25,7 +25,7 @@ public class LoadImageCmdIT extends CmdIT {
     
     @Before
     public void beforeMethod() {
-        expectedImageId = "sha256:56031f66eb0cef2e2e5cb2d1dabafaa0ebcd0a18a507d313b5bdb8c0472c5eba";
+        expectedImageId = "sha256:28a8ed28c8b7bd9d7fc00f22ac7df6d385436b93e88ac978943f3dba06d836b4";
         if (findImageWithId(expectedImageId, dockerRule.getClient().listImagesCmd().exec()) != null) {
             dockerRule.getClient().removeImageCmd(expectedImageId).exec();
         }
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java
index bdf309dc2..592c9c650 100644
--- a/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/RestartContainerCmdImplIT.java
@@ -55,7 +55,7 @@ public void restartContainerWithSignal() throws Exception {
         assumeThat("API version should be >= 1.42", dockerRule, isGreaterOrEqual(RemoteApiVersion.VERSION_1_42));
 
         DefaultDockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder()
-            .withApiVersion(RemoteApiVersion.VERSION_1_42)
+            .withApiVersion(RemoteApiVersion.VERSION_1_44)
             .withRegistryUrl("https://index.docker.io/v1/")
             .build();
         try (DockerClient dockerClient = createDockerClient(dockerClientConfig)) {
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
index 3fc5c40d7..af606a5b1 100644
--- a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
+++ b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
@@ -174,7 +174,7 @@ private static DefaultDockerClientConfig config() {
 
     public static DefaultDockerClientConfig config(String password) {
         DefaultDockerClientConfig.Builder builder = DefaultDockerClientConfig.createDefaultConfigBuilder()
-                .withApiVersion(RemoteApiVersion.VERSION_1_30)
+                .withApiVersion(RemoteApiVersion.VERSION_1_44)
                 .withRegistryUrl("https://index.docker.io/v1/");
         if (password != null) {
             builder = builder.withRegistryPassword(password);
diff --git a/docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java
index 5f7d200bf..03019f383 100644
--- a/docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/netty/NettyDockerCmdExecFactoryConfigTest.java
@@ -43,7 +43,7 @@ public void testNettyDockerCmdExecFactoryConfigWithApiVersion() throws Exception
         Builder configBuilder = new DefaultDockerClientConfig.Builder()
             .withDockerTlsVerify(false)
             .withDockerHost("tcp://localhost:" + dockerPort)
-            .withApiVersion("1.23");
+            .withApiVersion("1.44");
 
         DockerClient client = DockerClientBuilder.getInstance(configBuilder)
                 .withDockerCmdExecFactory(factory)
@@ -57,7 +57,7 @@ public void testNettyDockerCmdExecFactoryConfigWithApiVersion() throws Exception
             List<HttpRequest> requests = server.getRequests();
 
             assertEquals(1, requests.size());
-            assertEquals("/v1.23/version", requests.get(0).uri());
+            assertEquals("/v1.44/version", requests.get(0).uri());
         } finally {
             server.stop();
         }

From faa88e16460a8cb321c9695cdbc34cb7a662458e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Nov 2025 07:57:35 -0600
Subject: [PATCH 1256/1272] Bump org.testcontainers:testcontainers from 2.0.1
 to 2.0.2 (#2546)

Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/2.0.1...2.0.2)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers
  dependency-version: 2.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-tck/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml
index 3d38f9dfc..d7253c786 100644
--- a/docker-java-transport-tck/pom.xml
+++ b/docker-java-transport-tck/pom.xml
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>testcontainers</artifactId>
-			<version>2.0.1</version>
+			<version>2.0.2</version>
 		</dependency>
 
 		<dependency>

From 37424b0039296979fcf272b08112e942d7f9d978 Mon Sep 17 00:00:00 2001
From: Matthias Wiedemann <mwiede@gmx.de>
Date: Thu, 5 Mar 2026 22:40:31 +0100
Subject: [PATCH 1257/1272] Fix Docker image build (#2562)

---
 docker-java/src/test/resources/buildTests/ADD/url/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-java/src/test/resources/buildTests/ADD/url/Dockerfile b/docker-java/src/test/resources/buildTests/ADD/url/Dockerfile
index 4fbfa3236..3036dbbe6 100644
--- a/docker-java/src/test/resources/buildTests/ADD/url/Dockerfile
+++ b/docker-java/src/test/resources/buildTests/ADD/url/Dockerfile
@@ -2,9 +2,9 @@ FROM      busybox:latest
 
 # Copy testrun.sh files into the container
 
-ADD	http://www.example.com/index.html       /tmp/some.html
+ADD	https://www.example.com/       /tmp/some.html
 ADD	./testrun.sh       /tmp/
 RUN mkdir -p /usr/local/bin
 RUN cp /tmp/testrun.sh /usr/local/bin/ && chmod +x /usr/local/bin/testrun.sh
 
-CMD ["testrun.sh"]
\ No newline at end of file
+CMD ["testrun.sh"]

From ea48fd6e742e35d5c4629df9a251a00026cc140d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Thu, 5 Mar 2026 16:12:39 -0600
Subject: [PATCH 1258/1272] Update maven version to 3.9.12 (#2591)

---
 .mvn/wrapper/MavenWrapperDownloader.java | 117 ------
 .mvn/wrapper/maven-wrapper.jar           | Bin 50710 -> 0 bytes
 .mvn/wrapper/maven-wrapper.properties    |   5 +-
 mvnw                                     | 475 +++++++++++------------
 mvnw.cmd                                 | 321 +++++++--------
 5 files changed, 397 insertions(+), 521 deletions(-)
 delete mode 100644 .mvn/wrapper/MavenWrapperDownloader.java
 delete mode 100644 .mvn/wrapper/maven-wrapper.jar

diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
deleted file mode 100644
index b901097f2..000000000
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2007-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    private static final String WRAPPER_VERSION = "0.5.6";
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
-        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-            ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-            ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if(mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if(mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if(!outputFile.getParentFile().exists()) {
-            if(!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
-            String username = System.getenv("MVNW_USERNAME");
-            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
-            Authenticator.setDefault(new Authenticator() {
-                @Override
-                protected PasswordAuthentication getPasswordAuthentication() {
-                    return new PasswordAuthentication(username, password);
-                }
-            });
-        }
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
deleted file mode 100644
index 2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 50710
zcmbTd1CVCTmM+|7+wQV$+qP}n>auOywyU~q+qUhh+uxis_~*a##hm*_WW<ixd#%is
z`MjA6Ps&LG0VDqa2M7Q0;|Knq_Mbn9KabMFO8nH~G9t7<Kjb9A{`%$z;6J~R`yU07
z|Er)hzl^wuu%Z%;v`A76KV%;ryzsN%20oftDT;7=Lp24s|6o<1QMlkbk(A-!`nrlz
zDWz-wcfaRHfQuSG+95`%;59>?9E7Pb7N%LRFiwbEGCJ0XP=%-6oeT$XZcYgtzC2~q
zk(K08IQL8oTl}>>+hE5YRgXTB@fZ4TH9>7=79e`%%tw*SQUa9~$xKD5rS!;ZG@ocK
zQdcH}JX?W|0_Afv?y`-NgLum62B&WSD$-w;O6G0Sm;SMX65z)l%m1e-g8Q$QTI;(Q
z+x$xth4KFvH@Bs6(zn!iF#nenk^Y^ce;XIItAoCsow38eq?Y-Auh!1in#Rt-_D>H^
z=EjbclGGGa6VnaMGmMLj`x3NcwA43Jb(0gzl;RUIRAUDcR1~99l2SAPkVhoRMMtN}
zXvC<<g{bxb|AsQDMm`XZKV7r`Y5()w1OItz>tOmX83grD8GSo_Lo?%lNfhD#EBgPo
z*nf@ppMC#B!T)Ae0RG$mlJWmGl7CkuU~B8-==5i;rS;8i6rJ=PoQxf446XDX9g|c>
zU64ePyMlsI^V5Jq5A+BPe#e73+kpc_r1tv#B)~EZ;7^67F0*QiYfrk0uVW;Qb=NsG
zN>gsuCwvb?s-KQIppEaeXtEMdc9dy6Dfduz-tMTms+i01{eD9JE&h?Kht*$eOl#&L
zJdM_-vXs(V#$Ed;5wyNWJdPNh+Z$+;$|%qR(t`4W@kDhd*{(7-33BOS6L$<Ec$2A*
zX%N|qCOg6KGF$}+*B^380SL};F@;W&Q<?0z(Oq^dk%=E)cjsZQ(gMT&6zL<+gbhl4
z-{UVq4~)HP%!ZmXZY9J@Xw|PJwn!aZq)jiuMZ6ECt21>UPDeE_53j${QfKN-0v-HG
z(QfyvFNbwPK%^!eIo4ac1;b<Cy0l6VBm^C{og@M3a>>c0vyf9}Xby@YY!lkz-UvNp
zwj#Gg|4B~?n?G^{;(W;|{SNoJbHTMpQJ*Wq5b{l9c8(%?Kd^<m!CW)Ad5}K$XYWi?
zZwEOKN&q^+9hBBYC7XXr#u0ixOzV?1jg3MO39D_%q+<J|G{O*nW+DT+z8F(<3Bnkv
zSlB9^%x<GUn#O`lgPCJj?w)X_{z_WS8e)%4p`GSlxuznbiIOnnacE`#V5>1?H<bps
z^KeTf0dV|-IHDngtUt|}GO0TGt+B<O!zR!;4N9ibD3VBh9=!Oge|SWzP#76PYQ&fw
zSGRg*MtmCNuCYQX<-5@=g(G=1C529}G9p3Iqrp_2gmQ0*le|^QrC+c;3<gL|vr&yt
zG6f0UXl+0|y|Jc}f<e%(RLJiyPNiw&KIB(38Idi9W5HAsaSQhTg)zcvVTV?7VY`UD
znkpv_w)}zZ;`Ll9=IWo4jq47DdePy{f@LB0U^QiKIJOJKY`wy>1om1de0Da9M;Q=n
zUfn{f87iVb^>Exl*n<T%tK{W>Z0hs(Yt>&V9$Pg`zX`AI%`+0SWQ4Zc(8lUDcTluS
z5a_KerZWe}a-MF9#Cd^fi!y3%@RFmg&~YnYZ6<=L`UJ0v={zr)>$A;x#MCHZy1st7
ztT+N07NR+vOwSV2pvWuN1%lO!K#Pj0Fr>Q~R40{bwdL<wm-z-wIVsTI!*3O}o;9&;
z5cTXH{O&r)mqB^q;ZeHbw*+WCuHGZ`k`go4maB>%u9i`DSM4RdtEH#cW)6}+I-eE<
z&tZs+(Ogu(H_;$a$!7w`MH0r%h&@KM+<>gJL@O~2K2?VrSYUBbhCn#yy?P)uF3qWU
z0o09mIik+kvzV6w>vEZy@&Mr)SgxPzUiDA&%07m17udz9usD82afQEps3$pe!7fUf
z0eiidkJ)m3qhOjVHC_M(RYCBO%CZKZXFb8}s0-+}@CIn&EF(rRWUX2g^yZCvl0bI}
zbP;1S)iXnRC&}5-Tl(hASKqdSnO?ASGJ*MIhOXIblmEudj(M|W!+I3eDc}7t`^mtg
z)PKlaXe(OH+q-)qcQ8a@!llRrpGI8DsjhoKvw9T;TEH&?s=LH0w$EzI>%u;oD@x83
zJL7+ncjI9nn!TlS_KYu5vn%f*@<tbI*y@KgQh-P7aV}+H4c#hKvqbJDWNeG;NaGF$
zMTU6#bBwO^n6QwXYLBOA2YCufAq_E+w1$LAL-}@2CC4-3sCkqZUuVj<&^C6hk%$w$
zPP?9f6VuIO?HcPHWY#R#)X3kV9^1Vn_}NE5?_^n&XKDWM`!%O0dq<z;PMi?H^2G{8
z_p{E&25ba{PO30LY-Sf$;Tu^*%Y$C^$EmZ2c?xntQ^!q}WXvun+UdJ5z+ZmB+{(w0
z0LYIYdXWG1Z2Iq8G{fI*(L%;1`p#BPLbk3pR<`;^#tuaE|J<P!t!0t;;eC>qa5F;|
zEFxY&B?g=IVlaF3XNm_03PA)=3|{n-UCgJoTr;|;1AU9|kPE_if8!Zvb}0q$5okF$
zHaJdmO&gg!9oN|M{!qGE=tb|3pVQ8PbL$}e;NgXz<6ZEggI}wO@aBP**2Wo=yN#ZC
z4G$m^yaM9g=|&!^ft8jOLuzc3Psca*;7`;gnHm}tS0%f4{|VGEwu45KptfNmwxlE~
z^=r30gi@?cOm8kAz!EylA4G~7kbEiRlRIzwrb~{_2(x^$-?|#e6Bi_**(vyr_~9Of
z!n>Gqf+Qwiu!xhi9f53=PM3`3tNF}pCOiPU|H4;pzjcsqbwg*{{kyrTxk<;mx~(;;
z1NMrpaQ`57yn34>Jo3b|HROE(UNcQash!<Gjf_cVClc1kwaATyDY}hUB4bg-($uix
zY7hSo_UKzVd>0p2-!Cz;{IRv#Vp5!3o$P8!%SgV~k&Hnqhp<btp}}6$qI7*vS&uZ9
zbAG2@x&Wej)TNX_!V+>`5eLjTcy93cK!3Hm-$`@yGnaE=?;*2uSpiZTs_dDd51U%i
z{|Zd9<WeM#Riq}sK3q2TIdY0+FBz3Lfj#({d`K!z8Ua*IIK2|>ou-;laGS_x=O}a+
zB<rH*!qsToxVXoFgi-Pc3Kx6-c39DfRyNjH)CeNcV1Xdn;EeR<ltYsqb^qiQ<}buC
zUkK(S{&Bhwf&LD0ivJqo6x|)2jIHJV!(sdL<mS%r>||za<795A?_~Q=r=coQ+ZK@@
zId~hWQL<%)fI_WD<Nc6^qCzK4PYOIL3}S7FBJ6Y#SwyX2B6c-zB!;1kwRv^`ZzqOf
z>IX#=(WNl!Dm$a&ROfLTd&B$vatq!M-2Jcs;N2vps$b6P1(N}=oI3<3luMTmC|0*{
zm1w8bt7vgX($!0@V0A}XIK)w!AzUn7vH=pZEp0RU0p?}ch2XC-7r#LK&vyc2=-#Q2
z^L%8)JbbcZ%g0Du;|8=q8B>X=mIQirpE=&Ox{TiuNDnOPd-FLI^KfEF729!!0x#Es
z@>3ursjFSpu%C-8WL^Zw!7a0O-#cnf`HjI+AjVCFitK}GXO`ME&on|^=~Zc}^LBp9
zj=-vlN;Uc;IDjtK38l7}5xxQF&sRtfn4^TNtnzXv4M{r&ek*(eNbIu!u$<N>>Ed%`
z5x7+&)2P&4>0J`N&ZP8$vcR+@FS0126s6+Jx_{{`3ZrIMwaJo6jdrRwE$>IU_JTZ}
z(||hyyQ)4Z1@wSlT94(-QK<hEI4XkIQYLgX<8rwPmE+=t(|@!gs6@{ux=0Y}^8qrs
zNR`*CEQ2=*7ZvlR&k8I<4Yt`~Jd)19073U0T|q{zWz*53Z&*@&iN1K(x<XfVWOZnX
zwm+u4!rk54^>qkAatMmkT7pCycEB1U8KQbFX&?%|4$yyxCtm3=W`$4fiG0WU3yI@c
zx{wfmkZAYE_5M%4{J-ygbpH|(|GD$2f$3o_Vti#&zfSGZMQ5_f3xt6~+{RX=$H8at
z?GFG1Tmp}}lmm-R->ve*Iv+XJ@58p|1_jRvfEgz$XozU8#iJS})UM6VNI!3RUU!{5
zXB(+Eqd-E;cHQ>)`h0(HO_zLmzR3Tu-UGp;08YntWwMY-9i^w_u#wR?JxR2bky5j9
z3Sl-dQQU$xrO0xa&>vsiK`QN<$Yd%YXXM7*WOhnRdSFt5$aJux8QceC?lA0_if|s>
ze{ad*opH_kb%M&~(~&UcX0nFGq^MqjxW?HJIP462v9XG>j(5Gat_)#SiNfahq2Mz2
zU`4uV8m$S~o9(W>mu*=h%Gs(Wz+%>h;R9Sg)jZ$q8vT1HxX3iQnh6&2rJ1u|<wug5
zO)e@WFa;JSSOtFV-0$1cxPn+eBsruVvnW3#;>j>^Qf`A76K%_ubL`Zu<j0}PM%5V+
z#B3wIDk3d)A}ujNM$e1J#S|R8`VAjPvZ4v6coT~mCu??Es<%#hPD1!o_ov<SnL0mu
z^!v`RC5W;uz99#ol~55F7$`ujoGG`ZRzDIZM&yEIQOl9J3{<wJNFb~f8gny*6Yr<?
zs_6)-k-Dl0gKzc)CjZjN!Fvz`nCadt)7}gOxE-d<yj>?h4`b=IyL>1!=*%!_K)=XC
z6d}4R5L+sI5<whOgpIBMZ_g*Vfer)jb&n3G#%b!yE!3FnKQouNYbA2ajy{jd2R0Sw
z!>0Q4P3upXQ3Z!~1ZXLlh!^UNcK6#QpYt-YC=^H=EPg3)z*wXo*024Q4b2sBCG4I#
zlT<G;n{_4%D%EWXfOFqi>FFY=kQ>xvR+LsuDUAk)q%5pEcqr(O_|^spjhtpb1#aC&
zghXzGkGDC_XDa%t(X`E+kvKQ4zrQ*uuQoj>7@@ykWvF332)RO?%AA&Fsn&MNzmFa$
zWk&&^=NNjxLjrli_8ESU)}U|N{%j&TQmvY~lk!~Jh}*=^INA~&QB9em!in_<Qa?j<
zqmO#O!7*4ZUV(#aq_c@nOQK(XJ2W{=3awHW4{k_f!Y|o|_G0y-q}>X%Rl1&Kd~Z(u
z9mra#<@vZQlOY+JYUwCrgoea4C8^(xv4ceCXcejq84TQ#sF~IU2V}LKc~Xlr_P=ry
zl&Hh0exdCbVd^NPCqNNlxM3vA13EI8XvZ1H9#bT7y*U8Y{H8nwGpOR!e!!}*g;<eb
z;rNL4bptqUO;1s@{82O5gjua$jm<dekvS_LF}Ul@Hd1a?B8u&Yau`nJedp21-~Y(e
zt;Gh@iNFePt5|)BfT+>mJ#}T{ekSb}5zIPmye*If(}}_=PcuAW#yidAa^9-`<8Gr0
z)Fz=NiZ{)HAvw{Pl5uu)?)&i&Us$Cx4gE}cIJ}B4Xz~-q7)R_%owbP!z_V2=Aq%Rj
z{V;7#kV1dNT9-6R+H}}(ED*_!F=~uz>&nR3gb^Ce%+0s#u|vWl<~JD3MvS0T9thdF
zioIG3c#Sdsv;LdtRv3ml7%o$6LTVL>(H`^@TNg`2KPIk*8-IB}X!MT0`hN9Ddf7yN
z?J=GxPL!uJ7lqwowsl?iRrh@#5C$%E&h~Z>XQcvFC*5%0RN-Opq|=IwX(dq(*sjs+
zqy99+v~m|6T#zR*e1AVxZ8djd5>eIeCi(b8sUk)OGjAsKSOg^-ugwl2WSL@d#?mdl
zib0v*{u-?cq}dDGy<uHZmO7`f4M%oin|l|K8(>Z%$XRY=UkQwt2oGu`zQneZh$=^!
zj;!pCBWQNtvAcwcWIBM2y9!*W|8LmQy$H~5BEx)78J`4Z0(FJO2P^!YyQU{*Al+fs
z){!4JvT1iLrJ8aU3k0t|P}{RN)_^v%$$r;+p0DY7N8CXzmS*HB*=?qaaF9D@#_$SN
zSz{moAK<*RH->%r7xX~9gVW$l7?b|_SYI)gcjf0VAUJ%FcQP(T<UI^GmLDW=>pBs;
zg$25D!Ry_`8xpS_OJd<NQAg}@GuM#Is%6^ePzKH)emeCFg+1`-FwdYjrXR}vx<@qK
z43RJ&FutS&7Y~Jw?2^674CW0rQY6&cbGNc2*L>eo$qh#7U+cepZ??TII7_%AXsT$B
z=e)Bx#v%J0j``00Zk5hsvv6%T^*xGNx%KN-=pocSoqE5_R)OK%-Pbu^1MNzfds)mL
zxz^F4lDKV9D&lEY;I+A)ui{TznB*CE$=9(wgE{m}`^<--OzV-5V4X2w9j(_!+jpTr
zJvD*y6;39&<tM)`(>T+==$F&tsRKM_lqa1HC}aGL0o`%c9mO=fts?36@8MGm7Vi{Y
z^<7m$(EtdSr#22<(rm_(l_(`j!*Pu~Y>>xc>I9M#DJYDJNHO&4=HM%YLIp?;iR&$m
z<T({U$v{GCBf+1{WW$hNjVxEbq#jLb*hb+kjl1Hara!d%A|`1T(i_is9wFMT$LvF#
z>#_$ZWYLfGLt5FJZhr3jpYb`*%9S!zCG6ivNHYzNHcI%khtgHBliM^Ou}ZVD7ehU9
zS+W@AV=?Ro!=%AJ>Kcy9aU3%VX3|XM_K0A+ZaknKDyIS3S-Hw1C7&BSW5)sqj5Ye_
z4OSW7Yu-;bCyYKHFUk}<*<(@TH?YZPHr~~Iy%9@GR2Yd}J2!N9K&CN7Eq{Ka!jdu;
zQNB*Y;i(7)OxZK%IHGt#Rt?z`I|A{q_BmoF!f^G}XVeTbe1Wnzh%1g>j}>DqFf;Rp
zz7>xIs12@Ke0gr+4-!pmFP84vCIaTjqFNg{V`5}Rdt~xE^I;Bxp4)|cs8=f)1YwHz
zqI`G~s2~qqDV+h02b`PQpUE#^^Aq8l%y2|ByQeXSADg5*qMprEAE3WFg0Q39`O+i1
z!J@iV!`Y~C$wJ!5Z+j5$i<1`+@)tBG$JL=!*uk=2k;T<@{|s1$YL079FvK%mPhyHV
zP8^KGZnp`(hVMZ;s<o6=bTk63a|d{gmA$-2FS<7$0eSF-TlR?AZ3IY<b6vyjlw+^*
zEwj5-yyMEI3=z&TduBb3HLKz9{|qCfLrTof>=n~3r2y;LTwcJwoBW-(ndU-$03{RD
zh+Qn$ja_Z^OuMf3Ub|JTY74s&Am*(n{J3~@#OJNYuEVVJd9*H%)oFoRBkySGm`hx!
zT3tG|+aAkXcx-2Apy)h^BkOyFTWQVeZ%e2@;*0DtlG9I3Et=PKaPt&<yF%{*Oa9Ou
z?0fv-L@Wq#aYQwg<&*FB!}27``9X-#8$sBgZY9F8F6O2!ko&pl;lM|sJGAG5mOc>K
zw?WI7S;P)TWED7aSH$3hL@Qde?H#tzo^<(o_sv_2ci<7M?F$|oCFWc?7@KBj-;N$P
zB;q!8@bW-WJY9do&y|6~mEruZAVe$!?{)N9rZZxD-|oltkhW9~nR8bLBGXw<632!l
z*TYQn^NnUy%Ds}$f^=yQ+BM-a<Z5BE&^HfASBBCSBYk?h>5X4^GHF=%PDrRfm_uqC
zh{sKwIu|O0&jWb27;wzg4w5uA<BJk(&g3ps<R=%CY(7QqFA5{FiGuP3;4S2PC(Mi$
zC5aTKLtzx{`nHq!$rlFcs-067FX2P^ATRXe26>@TO_j(1X?8E>5Zfma|Ly7Bklq|s
z9)H`zoAGY3n-+&JPrT!>u^qg9Evx4y@GI4$n-Uk_5wttU1_t?6><>}cZ-U+&+~JE)
zPlDbO_j;MoxdLzMd~Ew|1o^a5q_1R*JZ=#XXMzg?6Zy!^hop}qoLQlJ{(%!KYt`MK
z8umEN@Z4w!2=q_oe=;QttPCQy3Nm4F@x>@v4sz_jo{4m*0r%J(w1cSo;D_hQtJs7W
z><$QrmG^+<$4{d2bgGo&3-FV}avg9zI|Rr(k{wT<Sdtm!m&XN2&fW+_>yl3!M1q+a
zD9<of)}AueHsfP1J}234JKxcgvNA9NG}WeUj0Zbm5CmL#imino*M-yu8^dj56O^l1
zYWXWE2bd(44i?`S-6i^m({c6YwMb?3wJ)oXuwG6pkg#6OpBKYKULTjkOkS(Xk*Mz~
z7Q@V{ssRW3A8!L|*t2g!K5m7SODVEv1T?tvMEAnh%2B^+<pxcK*E^Zd6E`@?zc&{y
zX|_OJ8`w4kKd*`Rw)#C!x`_QSDAkTc6*9{J4R;Lc#MM<o0P57$n?bwwsG_|JFA+7_
z?h=+&W~by)*t5wwl<HMN8;WoZD%eD|3s6q@zGQ&~G9!L}|67$okU22M4*JIr6ZF4}
zX2}0Gn)#0u&OgE!;pkr2UOxEX@4UqLShpWwXf!NST?BDrM1k)Xq>W{pCd%il*j&Ft
z5H$nENf>><Y)QWN-8+C%b1(A+(9Im-8IpSA2E~smh4hWm>k$;SONGW`qo6`&qKs*T
z2^RS)pXk9b@(_Fw1bkb)-oqK|v}r$L!W&aXA>IpcdNZ_vWE#XO8X`#Yp1+?RshVcd
zknG%rPd*4ECEI0wD#@d+3NbHKxl}n^Sgkx==<uI|{1wy%+CL-K{xNd@Py3&PI<mi;
z25}olCw(ice=js-sk!T6A3A??n-{594W&d{Mf6jFzQ#K1VHw3n-Qr^i5vi*s53K1i
zE=3;<c5sg4CL2}%vPJ~o1sCrPw&R=v0G_X{N6^y%G*?_>Iu%}HvNliOqVBqG?P2va
zQ;kRJ$J6j;+<xEs^ttxF-^}UyLj8r}Fu@n57l(vrQE#yH8@Gep;Ig4Wy5F7>wP9cS
za#m;#GUT!qAV%+rdWolk+)6kkz4@Yh5LXP+LSvo9_T+M<xuU7dbbaY5s%w3%#p&{F
ztM*cZUwIhVTb2Pg9JUH!V&#Br+N^#Wvc!s(;)Q~g8eM`23D9;1BRUv|lC1QSt-zv6
zoq)4i%TUE(I#{SL`l7hrzsQtlSzBzh;LuWVR?Z<S_x%`~0^X%LGvyJ2D<d=aQjok{
zYGOc(|8&mS8wFk|<0el*^<FwP6+d+mA$(1{Y{Z7Mdy)XiIfqd%=)KZSET@5%dz2f$
z{Un~zG7b*I`W|M$n$o;wuExK@H`@C%?K^T(&x{PEB_5x&-9(+l2fxJJk<5y+qd5+M
zv)B^?$ftKB?B&R{Q;mp@^S%Ae)!O=eYp$cIKSZ*2h0j|4>miaP-eq6_k;)i6_@WSJ
zlT@wK$zqHu<83U2V*yJ|XJU4farT#pAA&@qu)(PO^8PxEmPD4;Txpio+2)#!9<es>
z>&=i7*#tc0`?!==v<bsniFv!RUA#@&Lyk@hN~=JDH*o=17Q463OwwFoplX_0NX6-o
zN1w#kEjtz1k+Zg;2pE57MgMenvk|UJ3o9Ef<%jZK@5Ne9Wa|yQ@G{H{smA=MpcE$t
zK;UDltfgiWtz8gFPj^Z}me|ICuRgJNi~+fgFp&$hxgOe#Rv)}-!4N-L2pTTKFK0GE
zL6;4olJ-fYa99o=tKLV@_S1xzq$ZN){E)+e#JR?p5SNk%W<_FCc@~h9E}h;!E#r9}
z-x7!Cd3qJE1zvPl0-r~j9?;WZ@j7-xzypJVH(S;^!3KL5vO0V&t0)qOKBs#UBu-~X
z6PpHB39RQgJ4P3*+EhDJFeZzeUwYTWHCGM$zF|;;LEVMcEWyyVWYsT)Tv8YOp`m?r
z)^LN!x{w5kg4lRZ1O`7dDYq^>k>s7V+PL#S1;PwSY?NIXN2=Gu89x(cToFm))7L;<
z+bhAbVD*bD=}iU`+PU+SBobTQ%<B$L&s0ur8SOhLIn6@U0dzLRHz5^E5p#yPL9a;0
z8_Y=7KwxWWl2J`f>S!=VL!>q$rfWsaaV}Smz>lO9JXT#`CcH_mRCSf4%YQAw`$^yY
z3Y*^Nzk_g$xn7a_NO(2Eb*I=^;4f!Ra#Oo~LLjlcjke*k*o$~U#0ZXOQ5@HQ&T46l
z7504MUgZkz2gNP1QFN8Y?nSEnEai^Rgyvl}xZfMUV6QrJcXp;jKGqB=D*tj{8(_pV
zqyB*DK$2lgYGejmJUW)*s_Cv65sFf&pb(Yz8oWgDtQ0~k^0-wdF|tj}MOXaN@ydF8
zNr={U?=;&Z?wr^VC+`)S2xl}QFagy;$mG=TUs7Vi2wws5zEke4hTa2)>O0U?$WYsZ
z<8bN2bB_N4AWd%+kncgknZ&}bM~eDtj#C5uRkp21hWW5gxWvc6b*4+dn<{c?w9Rmf
zIVZKsPl{W2vQAlYO3yh}-{Os=YBnL8?uN5(RqfQ=-1cOiUnJu>KcLA*tQK3FU`_bM
zM^T28w;nAj5EdAXFi&Kk1Nnl2)D!M{@+D-}bIEe+Lc4{s;YJc-{F#``iS2uk;2!Zp
zF9#myUmO!wCe<Ub=&>JIoi^A+T^e~20c+c2C}XltaR!|U-HfDA=^xF97ev}$l6#oY
z&-&T{egB)&aV$3_<F_@%fux9my8>aVA51XGiU07$s9vubh_kQG?F$FycvS6|IO!6q
zq^>9|3U^*!X_C~SxX&pqUkUjz%!j=VlXDo$!2VLH!rKj@61mDpSr~7B2yy{>X~_nc
zR<ohS^J`dGk6dIaG_i)Gd;aTd3dt9wue4&7p50t#3MF3fEaQm_e(!eLi>I+7g2V&k
zd**H++P9dg!-AOs3;GM`(g<+GRV$+&DdMVpUxY9I1@uK28$az=6oaa+PutlO9?6#?
zf-OsgT>^@8KK>ggkUQRPPgC7zjKFR5spqQb3ojCHzj^(UH~v+!y*`Smv)VpVoPwa6
zWG18WJaP<b8NF3dd`4EQ>KMi*F6Zdk*kU^`i~NNTfn3BkJniC`yN98L-Awd)Z&mY?
zprBW$!qL-OL7h@O#kvYnLsfff@kDIegt~?{-*5A7JrA;#TmTe?jICJqhub-G@e??D
zqiV#g{)M!kW1-4SDel7TO{;@*h2=_76g3NUD@|c*WO#>MfYq6_YVUP+&8e4|%4T`w
zXzhmVNziAHazWO2qXcaOu@R1MrPP{t)`N)}-1&~mq=ZH=w=;-E$IO<yffr9?K?92P
z0((ND@f`e{B%~;??Ny|=P=KRtI%m@6cA`)Elro^w{wSOJ>k=y$dOls{6sRR`I5>|X
zpq~XYW4sd;J^6OwOf**J>a7u$S>WTFPRkjY;BfVgQst)u4aMLR1|6%)CB^18XCz+r
ztkYQ}G43j~Q&1em(_EkMv0|WEiKu;z2zhb(L%$F&xWwzOmk;VLBYAZ8lOCziNoPw1
zv2BOyXA`A8z^WH!nXhKXM`t0;6D*-uGds3TYGrm8SPnJJOQ^fJU#}@aIy@MYWz**H
zvkp?7I5PE{$$|~{-ZaFxr6ZolP^nL##mHOErB^AqJqn^hFA=)HWj!m3WDaHW$C)i^
z9@6G$SzB=>jbe>4kqr#sF7#K}W*Cg-5y6kun3u&0L7BpXF9=#7IN8FOjWrWwUBZiU
zT_se3ih-GBKx+Uw0N|CwP3D@-C=5(9T#BH@M`F2!Goiqx+Js5xC9<T}`<iuZU?7g^
zD&=BWAh8}H)`P!JCWQ=&H_mj>2|Sy0%WWWp={$<c=m>(am!#l~f^W_oz78HX<0X#7
zp)p1u<E)S<Hy%f8)p*25ts$LSDkSe5AWt`*emazpyN;Hy&qA}+%@Pz^XW|M^4@iA_
z#*l+8z%;N~x^mcao{KKyg-Erj_CzJY1ma9CD7bb%0b5IFy_$k!3U=_aCQRg<4PRg@
z7VqLss(vcTz8~Pb55$JJ@2ARmDt7;jiJ!E~Ou-7*YBx0W>~M*o9W@O8P{0Qkg@Wa#
z2{Heb&oX^CQSZWSFBXKOfE|tsAm#^U-WkDnU;IowZ`Ok4!mwHwH=s|AqZ^YD4!5!@
zPxJj+Bd-q6w_YG`z_+r;S86zwXb+EO&qogOq8h-Ect5(M2+>(O7n7)^dP*ws_3U6v
zVsh)sk^@*c>)3EML|0<-YROho{lz@Nd4;R9gL{9|64xVL`n!m$-Jjrx?-Bacp!=^5
z1^T^eB{_)Y<9)y{-4Rz@9_>;<Ni;e7a(v#>_7h;5D+@QcbF4Wv7hu)s0&==&6u)33
zHRj+&Woq-vDvjwJCYES@$C4{$?f$Ibi4G()UeN11rgjF+^;YE^5nYprYoJNoudNj=
zm1pXSeG64dcWHObUetodRn1Fw|1nI$D9z}dVEYT0lQnsf_E1x2vBLql7NrHH!n&Sq
z6lc*mvU=W<?&3Y7tNdrmhnHR-*#=c(@8+WX>S6=v9Lrl}&zRiu_6u;6g%_DU{9b+R
z#YHqX7`m9eydf?KlKu6Sb%j$%_jmydig`B*TN`cZL-g!R)iE?+Q5oOqBF<tbk>Khx
z%MW>BC^(F_JuG(ayE(MT{S3eI{cKiwOtPwLc0XO*{*|(JOx;uQOfq@lp_^cZo=FZj
z4#}@e@dJ>Bn%2`2_WPeSN7si^{U#H=7N4o%Dq3NdGybrZgEU$oSm$hC)uNDC_M9xc
zGzwh5Sg?mpBIE8lT2XsqTt3j3?We8}3bzLBTQd639vyg^$0#1epq8snlDJP2(BF)K
zSx30RM+{f+b$g{9usIL8H!hCO117Xgv}ttPJm9wVRjPk;ePH@zxv%j9k5`TzdXLeT
zFgFX`V7cYIcBls5WN0Pf6SMBN+;CrQ(|EsFd*xtwr#$R{Z9FP`OWtyNsq#mCgZ7+P
z^Yn$haBJ)r96{ZJd8vlMl?IBxrgh=fdq_NF!1{jARCVz>jNdC)H^wf<?2G!*f3zl;
zdyVT?9`x`+G$!^eYN@PUum|5;j8$+`cBrBI`k*I0!jRt1BR=3gh&7e8U#!mamgR&_
z3Z&@9rms~l@GlsEKduCfx9Wt{o>y?R94#MPdUjcYX>#wEx+LB#P-#4S-%YH>t-j+w
zOFTI8gX$ard6fAh<H75EJ<)LuH_auhegZ+2E4B~a%IAJaFMvo?e6^A8l)Wuy^I?pi
zZF>&g=u&56%3^-6E2t<Yn^f-uPCm9NB$suTK>pk*wx<W&S3r;(8>3HSCQ+t7+*iOs
zPk5ysqE}i*cQocFvA68xHfL|iX(C4h*67@3|5Qwle(8wT&!&{8*{f%0(5gH+m>$tq
zp;AqrP7?XTEooYG1Dzfxc>W%*CyL16q|fQ0_jp%%Bk^k!i#Nbi(N9&T>#M{gez_Ws
zYK=l}adalV(nH}I_!hNeb;tQFk3BHX7N}}R8%pek^E`X}%ou=cx8InPU1EE0|Hen-
zyw8MoJqB5=)Z%JXlrdTXAE)eqLAdVE-=>wGHrkRet}>3Yu^lt$Kzu%$3#(ioY}@Gu
zjk3BZuQH&~7H+C*uX^4}F*|P89JX;Hg2U!pt>rDi(n(Qe-c}tzb0#6_ItoR0->LSt
zR~UT<-|@TO%O`M+_e_J4wx7^)5_%%u+J=yF_S#2Xd?C;Ss3N7KY^#-vx+|;bJX&8r
zD?|Met<uN>fhdC;^2WG`7MCgs>TKKN=^=!x&Q~Bzm<ft$_V>Qio_^l~LboTN<PA~s
ztvhkHV^TX6A<gyPqRneP;k-V;s*DXI`}cJ$*6E%w9XQN&$K(|;D9!d;Dz*l664jkU
zH#;2-C(!ut!I4z@rO6NomJDRcU5l|T$u40Cy)I1oatN8UM8v!=v?@wZKtav91=kx1
z4-I*8uU&4aiIm8&k*~&8?yrs}Q*4zuFw(bo3D%Hqk;QI)VqJr)PN^o{UIT(vi#=H=
z9m2cfv@TkDR+$~#OedTM8bgUKdawh=YD1?-b=GGS!rs?U9*&_9`8Hi1QB^7;1>T=I
zC5pme^P@ER``p$2md9>4!K#vV-Fc1an7pl>_|&>aqP}+zqR?+~Z;f2^`a+-!Te%V?
z;H<Wc=_RRR*LGsBEHu3xAdt&PDAh@%hvU_KO?Qc0RkblthZye3kgC5ar|FAvvzZzy
z5dZN1Mxh)MzaIl)qcT=a4!-}50&|$B3AXWv`5KD%cNqiXzsnd%*_xXEd%7U#59?)K
z4xQT-%Tjgh_pV$q1N?wB#Ut@8)BrjJ2?<CfBk^uTTg9@%T+@9s&TYvH;{b3J-Uq-J
z*}h{(Fj`2RxTo#3WA^-gW^<3v_Y1@hLbe$h9TVZHy4UYbApOTzxxl5kg8;wSWE}VG
zSWF3M#t^TOs$U`5P3xS<HhsD5nzlL@E-mOQJOSOipgt$0)9B$<&HZv~ky}tW35}9Q
z5*_5Aj_a$do+-~5sY56*jA#QLIeS76(hGFsa!*18efa$r<2<6`g?Jw4m-ZukILk~E
z+Da1^B-Mu5cDMA0{2yabgybylROn|Z=GUsf?fM6R$Drq%@xrqjw~_9suR#_R8wgXt
zU{ku=r+e>2SbF>jP^GE(R1@%C==<Y8b3&KH&O-3=eOv7*kQd9tI?UwT<t28PMVWZ(
zb&yE$i+8*sa|7NnujnUq6j*M5P(EydLP83}pABbYnp}h#9fwL9pl^~TRlA*50Fa8B
zEF<GcBFn{f69flKgt-u(%$yjN&TL{r%853aEKFRNX78M-GIhf%{FZJ{4g;ImRS71`
z3Yyo6P*Ki0@e;hhPWD(bhz2*>XQ@J=G9<S3k+D*)z%97N7^1&&l9}OAEHi077O(On
z7noWoH(DE8z|Ah_o?LvO$02OkEQ~{&Ha}?tE!dW%$NLAI0!b<NKmM?+t^bzaLi=}c
zlKzW%t@;mw^IyEz{~#53VX0z#_pH<z9o8RkgfU_gPu3c1j+xCdiHBHG4%}8=t~k#v
zX&p3FDYYxgltjWp7V)VY*Dyd9$+4J2)t8zpsz4cE%Rg-q^7#P<eRm`@QDNP`6SsR_
zcRx>lKX+Z<@5}PO(EYkJh=GCv#)Nj{DkWJM2}F&oAZ6xu8&g7pn1ps2U5srwQ7CAK
zN&*~@t{`31lUf`O;2w^)M3B@o)_mbRu{-`PrfNpF!R^q>yTR&ETS7^-b2*{-tZAZz
zw@q5x9B5V8Qd7dZ!Ai$9hk%Q!wqbE1F1c96&zwBBaRW}(^axoPpN^4Aw}&a5d<X6d
zH@0s>Me+*Gomky_l^54*rz<JzyAnm5XmBkSe<g?3k}Pfe82t7g;_<e&aU+v+4)y$m
zeRb}%59lYn5f}Nk?%BSnMqF!Ws^_X#@=Md_1O^7%$uR2oA!FtlReDyCcd=Q;>Xro$
z>LL)U5Ry>~FJi=*{JDc)_**c)-<XP_l4Gyvx}^77eE5(E^L$hk;37Mzdo6^f)`}K#
z{THLSWCZ0(xW^hpwR%@^?}>&faPz`6v`YU3HQa}pLtb5K)u%K+BOqXP0)rj5Au$zB
zW1?vr?mDv7Fsxtsr+S6ucp2l#(4dnr9sD*v+@*>g#M4b|U?~s93>Pg{{a5|rm2xfI
z`>E}?9S@|IoUX{Q1zjm5YJT|3S>&09D}|2~BiMo=z4YEjXlWh)V&qs;*C{`UMxp$9
zX)QB?G$fPD6z5_pNs>Jeh{^&U^)Wbr?2D6-q?)`*1k@!UvwQgl8eG$r+)NnFoT)L6
zg7lEh+E6J17krfYJCSjWzm67hEth24pomhz71|Qod<y$kjUFGaYg({=ldyCfYpI@C
zyQ_HeVXg^DSqhfa!y3S&hsT8J`qen*_5BW6wev2f-(!PE#XLIRvJ}X&_<)kgBfX&i
zXBwmuwju7ZzI8>n#oAILN)*Vwu2qpJirG)4Wnv}9GWOFrQg%Je+gNrPl8mw7ykE8{
z=|B4+uwC&bpp%eFcRU6{mxRV32VeH8XxX>v$du<$(Dfin<wZp$Q4H)Pfaukv*H0sf
z)WRtvk$o*4iMkf%^PAH#OI%3p*MbxQ{|t!*E9l0YI=&v-fja=}q?f)Qn_@69k!D6S
zU&b#%z(rw9E4Sc?(mn@@6~ZbrsZ)CkrY_Z_{e}wQyVA*eEj2w{-Fk?e+oaUR*{gY?
zEa8nD&St2JfiZ`&wn?g&EX9U~E9THj#k{MW89{=ii7l$h{u>aaWxP<+Y97Z#n#U~V
zVEu-GoPD=9$}P;xv+S~Ob#mmi$JQmE;Iz4(){y*9pFyW-jjgdk#oG$fl4o9E8bo|L
zWjo4l%n51@Kz-n%<M_TV#ts1K0mYf1F47fBmqr!jgmKJ;=;j+@iNEaC9YoqI$#UMP
z_DaJ2MCm5+3Oh~T3-;SBiloB1nPS#zeR<eAGEaOf_{>zeSCD`uB?T%FVk+KBI}=ve
zvlcS#wt`U6wrJo}6I6Rwb=1GzZfwE=I&Ne@p7*pH84XShXYJRgvK)UjQL%R9Zbm(m
zxzTQsLTON$WO7vM)*vl%Pc0JH7WhP;$z@j=y#avW4X8iqy6mEYr@-}PW?H)xfP6fQ
z&tI$F{NNct4rRMSHhaelo<5kTYq+(?pY)Ieh8*sa83EQfMrFupMM@nfEV@EmdHUv9
z35uzIrIuo4#WnF^_jcpC<Vx)$tdI1T+R0zF_1D69+(CLtgvu$DXs}SSIOZ=$O=$Tn
zaEnCWJLI`n(9-SZByUYExxoO5StnL+1}iT+O(sgx<tf>@uNN<y@{a4!Rk|T=JKwWu
z!7Ksm?(29@|82jxaWJ&J!h^=%7h_BILeeeVlcqsXEYb)h&nSL#k+zMZSWTVXSB1;v
zcincQjatdYZz&~RpYg)uv%?lxT?<Zsq?obm6opmdnN38QjL|d&ENMRSCHfKu#cN{A
z%39=~vu7H;eE>aYTQ~uZWOE6P@LFT^1@$o&q+9Qr8YR+ObBkpP9=F+$s5+B!mX2~T
zAuQ6<kEiwW$%NhT4*3<zOaDr}Z>RenX?O{IlLMl1%)OK{S7oL}X%;!XUxU~xJN8xk
z`xywS*naF(J#?vOpB(K=o~lE;m$zhgPWDB@=p#dQIW>xe_p1OLoWInJRKbEuoncf;
zmS1!u-ycc1qWnDg5Nk2D)BY%jmOwCLC+Ny>`f&UxFowIsHnOXfR^S;&F(KXd{ODlm
z$6#1ccqt-HIH9)|@fHnrKudu!6B$_R{fbCIkSIb#aUN|3RM>zuO>dpMbROZ`^hvS@
z$FU-;e4W<M6y)Im8hoQA=P7%y98J6KEu0HTxWM%F4mhK6fdz22r_7zojFNGozEHHo
zZ6t#r0+n!O8IcEbaV(>}!ubzKrU@R*dW*($tFZ>}dd*4_mv)#O>X{U@zSzQt*<TlT
z?xHfG&f%?cm8K`gA<4t?5S*}81_7DjS+k<qTYIP(W)#9ktlsV1(r@t))QC6{76sj<
zSDYlnN;zf1jb?p&^L1o92%17&l2%#SFX4ma`TR1OP=xe^Wo;nC57Jd4;a=hTEHIUo
zUTaP|OpJKI$FAQSAQg0isqRP6vdhWN{SUhKkmD}a0P9?^Y~x`OD0PxwVfo>83l9mI
zI$8O<5AIDx`wo0}f2fsPC_l>ONx_`E7kdXu{YIZbp1$(^oBAH({T~&oQ&1{X951QW
zmhHUxd)t%GQ9#a<w3bmSRr~u}n$(7~pxPXRs&HyeAkRa(uozm&0)oYXyEx}pl7@=l
zcIw|R0#t97`$=~Q6HK(sul=o>k5fTjk-cahWC;>^Rg7(`TVlvy0W@Y!Jc%QL3Ozu#
zDPIqBCy&T2PWBj+d-JA-pxZlM=9ja2ce|3B(^VCF+a*MMp`(rH>Rt6W1$;r{n1(VK
zLs>UtkT43LR2G$AOYHV<kZo|EwiHy^!;YnPn|GnJdBf0T_68MO4c!oFW%p6st$`xJ
zYNOt)N_;rcqascZwO7I=X9Bss)*~eA@TglO8}1LAmBDblZ!tTUnvDRn+;A?-M1X6K
z*8v^cV1c|Ue%9zi&ypq`xDaps;yjH)T{>ailiqk7naz2yZGLo*xQs!T9VN5Q>eE(w
zw$4&)&6xIV$IO^>1N-jrEUg>O8G4^@y+-hQv6@OmF@gy^nL_n1P1-Rtyy$Bl;|VcV
zF=p*&41-qI5gG9UhKmmnjs932!6hceXa#-qfK;3d*a{)BrwNFeKU|ge?N!;zk+kB!
zMD_uHJR#%b54c2tr~uGPLTRLg$`fupo}cRJ<c5uHhf<@e$Dvk#I8qC&ccQe;ntP%8
z_U(N)zE+)oc_Zr99;>eTwK;~}A>(Acy4k-Xk&Aa1&eWYS1ULWUj@fhBiWY$pdfy+F
z@G{OG{*v*mYtH3OdUjwEr6%_ZPZ3P{@rfbNPQG!BZ7lRyC^xlMpWH`@YRar`tr}d>
z#wz87t?#2FsH-jM6m{U=gp6WPrZ%*w0bFm(T#7m#v^;f%Z!kCeB5oiF`W33W5Srdt
zdU?YeOdPG@98H7NpI{(uN{FJdu14r(URPH^F6tOpXuhU7T9a{3G3_#Ldfx_nT(Hec
zo<1dyhsVsTw;ZkVcJ_0-<D$ec4j7wm40@(EHB@IX^JbTgh0!!UjeH%Uq#M*+_NKFU
z9zw+rX&^+LMjUjtp89z{*`hHlcg5sAPu<FN2>h-T3G1W@q)_Q30LNv)W?FbMH+XJ*
zy=$@39Op|kZv`Rt>X`zg&at(?PO^I=X8d9&myFEx#S`dYTg1W+iE?vt#b47QwoHI9
zNP+|3WjtXo{u}VG(lLUaW0&@yD|O?4TS4dfJI`HC-^q;M(b3r2;7|FONXphw-%7~*
z&;2!X17|05+kZOpQ3~3!Nb>O94b&ZSs%p)TK)n3m=4eiblVtSx@KNFgB<VaadJgM4
zYwK3786BD*n&~U4FFSBMq6kMim<E0!-4_#SX^f^<quJS?pI~}$8MxSe6;jUz^oUvA
zks*6R#kX+OB7|l8)A=WO2W{BRNM$YQ>Y_xV6ts;NF;GcGxMP8OKV^h6LmSb2E#Qnw
ze!6Mnz7>lE9u{AgQ~8u2zM8CYD5US8dMDX-5iMlgpE9m*s+Lh~A#P1er*rF}GHV3h
z=`STo?kIXw8I<`W0^*@mB1$}pj60R{aJ7<j>>C2m=oghKyxMbFNq#EVLgP0cH3q7H
z%0?L93-z6|+jiN|@v>ix?tRBU(v-4RV`}cQH*fp|)vd3)8i9hJ3hkuh^8dz{F5-~_
zUUr1T3cP%cCaTooM8dj|4*M=e6flH0&8ve32Q)0dyisl))XkZ7Wg~N}6y`+Qi2l+e
zUd#F!nJp{#KIjbQdI`%oZ`?h=5G^kZ_uN`<(`3;a!~EMsWV|j-o>c?x#;zR2ktiB!
z);5rrHl?GPtr6-o!tYd|uK;Vbsp4P{v_4??=^a>>U4_aUXPWQ$FPLE4PK$T^3Gkf$
zHo&9$U&G`d(Os6xt1r?sg14n)G8HNyWa^q8#nf0lbr4A-Fi;q6t-`pAx1T*$eKM*$
z|CX|gDrk#&1}>5H+`EjV$9Bm)Njw&7-ZR{1!CJTaXuP!$Pcg69`{w5BRHysB$<zDw
zcjqh1uY?!XAJULAYA!ToD2)^T*;)(9PK@sJOOPO&GSQY-0y+C95%=z!u)j<6o}I15
zC6AaHQ?N67s!g>(tWUes@@6aM69kb|Lx$%BRY^-o6bjH#0!7b;5~{6J+jKxU!Kmi#
zndh@+?}WKSRY2gZ?Q`{(Uj|kb1%VWmRryOH0T)f3cKtG4oIF=F7R<H74An-VM089e
zlN*A~TaQtgL_187UqCA>aRnH0Rc_&37<WST&k6<y-8Zx6Qq%dG7&LrD8erOLcploI
zf(w3f)N}iwyU98+CRV4Zke$fYA$6d$lyn3H3z8f~RO_cf+H?k7OD0jCwwoM;H<NIB
zbTo$@rlw2}>2={_3lRNsr95%ZO{IX{p@YJ^EI%+gvvKes5cY+PE@unghjdY5#9A!G
z70u6}?zmd?v+{`vCu<jrsG`-7e4C+GWyOg}Mw<0>-53_v5@z)X{oPC@P)iA3jK$`r
zSA2a7&!^zmUiZ82R2=1cumBQwOJUPz5<k9c_WcKM(Vn+kk3W1%7<t`tnq}-udm*5k
zR_|Ap%BL`4&Z2eie8rv>Ay<A3{M7#FkL;C&VH7xux0z`g&G=^Qj^-lpBpq9=z<Kn<
zZiDqJOJH9T@F_rI@?dfl*<BzjIsA<Yh4A%qCuUAs6^+5tLNuqUv2l1rbhICMg}5yb
zx`b?fvxVX0_5=sI^pJf$T-oyW=KY5HRKL_gO1`&?p>`RLfY(EiwKkrx%@YN^^X<Nj
zStykG?*NLV?~c;!i<JFWHMT*GPEThv<NV<3#lUiF#=F;M^K~Ij_}f)mB}`>uET;tE
zmr-6~I7j!R!KrHu5CWGSChO6deaLWa<u2N+!y-e&UAhtX)uSIDcFN$fk%4m8fwJ2Q
zOv9UZX-MbW_s!U!6lGksP$XN`(`3o78xr(sNUv$zhjcuMvy4&jdPT)knJ(%p?#Fi`
zTqYl(Vq?l)*m!!CB7!Q97y@}YmbaOaev`5Ta19gb;jh{rC=^#57s}&!X$+bU=u0j^
zA@<$7@i*QP;0Y_%>*9LLJbcAJsFd%Dy>a!>J`N)Z&oiU4OEP-!Ti^_!p<rXzhQC@3
zG;WLll1HMO<ei9MPYV(Rrra7syrY2Bi5NC~8Cmo;+l-aesVcl<ib{QIQxo*6a*exs
z5Qaf=Y{wbKv*_kEnMVhR;YYlSU;>}O?7`}i7Lsf$-g<xhdYrU`h00vC9X+sM3sx}r
zCPd*Kl0|Oh7<_e3w4PNWG*Q={KZh*(tt-K?n?m73ypPWZQYkyX9Xgy+j>BkuY*`Zb
z7=!nTT;5z$_5$=J=Ko+Cp|Q0J=%oFr>hBgnL3!tvFoLNhf#D0O=X^h+<D%s)KbSG+
zM{s4oZjjM2&HxP-;1<DeRGJkAY@dRP&>x08iB;@8pXdRHxX}6R4k@i6%vmsQwu^5z
zk1ip`#^N)^#Lg#HOW3sPI33xqFB4#bOPVnY%d6prwxf;Y-w9{ky4{O6&94Ra8VN@K
zb-lY;&`HtxW@sF!doT5T$2&lIvJpbKGMuDAFM#!QPXW87>}=<kY=DIbR`-HsR^z#P
z$j>Q4J3JeXlwHys?!1^#37q_k?N@+u&Ns20pEoBeZC*np;i;M{2C0Z4_br2gsh6eL
z#8`#sn41+$iD?^GL%5?cbRcaa-Nx0vE(D=*WY%rXy3B%gNz0l?#noGJGP728RMY#q
z=2&aJf@DcR?QbMmN)ItUe+VM_U!ryqA@1VVt$^*xYt~-qvW!J4Tp<-3>jT=7Zow5M
z8mSKp0v4b%a8bxFr>3MwZHSWD73D@+$5?nZAqGM#>H@`)mIeC#->B)P8T$zh-Pxnc
z8)~Zx?TWF4(YfKuF3WN_ckpCe5;x4V4AA3(i$pm|78{%!q?|~*eH0f=?j6i)n~Hso
zmTo>vqEtB)`%hP55INf7HM@taH)v`Fw40Ayc*R!T?O{ziUpYmP)AH`euTK!zg9*6Z
z!>M=$3pd0!&TzU=hc_@@^Yd3eUQpX4-33}b{?~5t5lgW=ldJ@dUAH%`l5US1y_`40
zs(X`Qk}vvMDYYq+@Rm+~IyCX;iD<kEtC|r#XuMTVlQJLByw3)=nc7jt^BNycu`#-Z
z9m4E2+1EzDuad50wi$^(+Hvb9$Eha2<sG<&CWgZd3<Q-qEaW+FG(V#0KfK;OWdSIX
ze%=;Qa8;`8Zx;tGw9w+hCfD9U`qwSbb|b=F-(0ywZ1mUE<SPxWg(nI#;e9b4;-cmC
zbkW@PY-|EL1~YUG#HK))B|}VGpDcA_PVjsz5|%*t-amcgeBTh2*yZ^93cTX|bufo`
zQReW1{rIs3`*(?amcKig|NA{cF?}1O|0Dt`t7{^uqWi=EgZ8!NmGTQO<imr@BQyb<
zFB%lVL<Hx{bwKZ?LX$A=8xhP*UR7Kw+dlM--*I*2cYzmi$#z}GSiENw#R40&w6U2^
zwPam;_8fkE4cGJluti-nSs}3*cZAjMqTd!mmqfkKK~8rB?~AcwYfiW^a9^!)xfM@n
zF;=c7Ix)WhyG&v{N7;?lBJS3uv12>~pMgq^KY)T*aBz@<c&T2fpNhg@IxXbO=$S4w
z9+<Ik6K+Bnk`RNW=eul(Nn=)*O$p~uOQvJ^G0uLUsS4@I3V39+0g7_uyW2{0dM!$g
zika@FK29jP4cL_~!!sf!?;2}w@jg7y{U6reF}Tup-5TwVI<{?V#<p$Sw%M_5+qP{x
z>DYEB={PxA>)mI6tM*sx-DmGQHEaHwRrAmNjO!ZLHO4b;;5mf@zzlPhkP($JeZGE7
z?^XN}Gf_feGoG~BjUgVa*)O`>l<h*IpQ!z2CW{ns`;EbZK%SB&68g{f@GzLs;1_hP
z3|8#wF*;&Im!eeBlov5`2~+&il<&t*jr$-3va7?Dy?*g>X=$BSR2)uD<<!f=iY_7+
zCx~VgL*7J|?j{<rG=oL^Y0X6hjaO<Iv?&cH7Aoxz;856j4%+M18L|=;(%P~v84U>9
z>o^|nb1^oVDhQbfW>>!;8-7<}nL6L^V*4pB=>wwW+RXAeRvKED(n1;R`A6<f&`KXK
zfD&?Dt(5bu;DN{UB7piRVUy%Z<Ey!ADARS8_d#8xObY02AD!+&INw_XsW544fRkiv
zsgN89xNO|AooI0A^u_oh*3HRu5%VnYg>v$6<SBgAN0_0JGCLdqq}<97hmgd=n75Q7
zOhTZ|s`O5g29c?$OeSv4RJAn%uB~Dve&?a)t$o2;<4XX)6*Yrots9mCjmaoXL^Nc~
z7AGnF^zS7wG1fC!o)f^`@k|@3oheBwS}G8pg}FkGEw{zNtmQiz$aA;JXH45T3+c-9
z!O<9l>gy0I(;Vf?!4;&sgn7F%LpM}6PQ?0%2Z@b{It<(G1CZ|>913E0nR2r^Pa*Bp
z@tFGi*<dAvc$qjHT6XD6wTz&&N_7u(Rl1@oBi^7tlbIL_CL@ADr>CQ~@Yc-?{cwu1
zsilf=k^+Qs>&WZG(3WDixisHpR>`+ihiRwkL(3T|=xsoNP*@XX3BU8hr57l3k;pni
zI``=3Nl4xh4oDj<%>Q1zYXHr%Xg_xrK3Nq?vKX3|^Hb(Bj+lONTz>4yhU-UdXt2>j
z<>S4NB&!iE+ao{0Tx^N*^|EZU;0kJkx@zh}S^P{ieQjGl468CbC`SWnwLRYYiStXm
zOxt~Rb3D{dz=nH<w<gcr0@Smh4?7*NpxM$L=7%^NSAFm@#nvp#8qWCc6XLxOp05m;
zm+Vq=;6Q;TxJ*@^XL*?^Xi4dI#=!F|B%y2um~UT1!6v(w_7D}&dy`}<a;f$Z+oyNl
zPr8sXY@0tTpl1$l?+9za&ct1tHK2{yCONrnRJqPnW$cjE{pEeqMN^ABAC6U)X#ni~
zUfB89Z_@>McY)#r^kF8|q8KZHVb9FCX2m^X*(|L9FZg!5a7((!J8%MjT$#Fs)M1Pb
zq6hBGp%O1A+&%2>l0mpaIz<Trj|_4|8tOfqtA{6qYlUp*AW=6wyaR8GVPG#YUBW`2
zz?f&&D9xup7E7}pxSU<br&5#ywm1K0k5E*vu$t7Enh18PU+-VB2_er`-mhr?sHL7j
zdNe0r@5Qcsr6&D*8};8txBQ2IC1`77Vs7f}p#Ogc;H1QDMJ#3HksdSw#QC5=kn+%`
zd5hJ-U>bo&jc^!oN^3zxap3V2dNj3x<=TwZ&0eKX5<Dl7;b^#b;I{(onaxeU`VFpo
z0#Bcu*HzEyqwUWRcPKs3DfD6V-^rWHZYg+KCu<bE3(}VxN1N3)mY&_z>PIso9j1;e
zwUg+C&}FJ`k(M|%%}p=6RPUq4sT3-Y;k-<68ciZ~_j|bt>&9ZLHNVrp#+pk}XvM{8
z`?k}o-!if>hVlCP9j%&WI2V`5SW)BCeR5>MQhF)po=p~AYN%cNa_BbV6EEh_kk^@a
zD>4&>uCGCUmyA-c)%DIcF4R6!>?6T~Mj_m{Hpq`*(wj>foHL;;%;?(((YOxGt)Bhx
zuS+K{{CUsaC++%}S6~CJ=|vr(iIs-je)e9uJEU8ZJAz)w166q)R^2XI?@E2vUQ!R%
zn@dxS!JcOimXkWJBz8Y?2JKQr>`~SmE2F2SL38$SyR1^yqj8_mkBp)o$@+3BQ~Mid
z9U$XVqxX3P=X<VH60STdy0sB@jX}+Y_TBg#FKwe*aYaFRRb%;;%q$^Iyf2|Z9YYlw
z%Jt8hwodbGdJaNxw5cPU2RS=7SORg_h_1qR>CKj0*W>}L0~Em`(vG<>srF8+*kPrw
z20{z(=^w+ybdGe~Oo_i|hYJ@kZl*(9sHw#Chi&OIc?w`nBODp?ia$uF%Hs(X>xm?j
zqZQ`Ybf@g#wli`!-al~3GWiE$K+LCe=Ndi!#C<Hn52U9|8K~Ro$I%*RemIf>VjzUZ
z!sD2O*;d28zk<D+-Enbah_#E$&gZ)`AdRl_O}jIQbDwnNAHN#Ci};At$G&3SwK=`P
zpl<2i0!g;rM|EdU74dfP@uV!%*6y8FWa~UFSiX{QU&G^{<bvxL*Ya&&SpTLG7}BO*
zVEuYNLK5?yLUyUVq~muHmVx1;3PYt2J_P<eP7KS>l))m)YN7HDi^z5IuNo3^w(zy8
zszJ<n=2-mJ3CZwLndLXzyBh4<7UNIu$A>G#mp#Cj)Q@E@r-=NP2FVxxEAeOI2e=<s
zqQBD3JtlZm1u~d=N%{y8-ymvOK+jMz2r(X*J0Ylh@G(QI7kZ%-a}ol+`87x|nnG+6
z{b(|BA>|KshybNB6HgE^(r>HD{*}S}m<qA!*hb9IzvC@5i1<u^W80An;lZADAm?KP
zko)m@6{ci~_>O>LuRGJT{*tfTzw_#+er-0${}%YPe@CMJ1Ng#j#)i)SnY@ss3gL;g
zg2D~#Kpdfu#G;q1qz_TwSz1VJT(b3zby$Vk&;Y#1(A)|xj`_?i5YQ;TR%jice5E;0
zYHg;`zS5{S*9xI6o^j>rE8Ua*XhIw{_-*&@(R|C(am8__>+Ws&Q^ymy*X4~hR2b5r
zm^p3sw}yv=tdyncy_Ui7{BQS732et~Z_@{-IhHDXAV`(W<!Q69%H#|w=%}3Kg=YWc
zt&hb~JKx8-xR1O(MbVHSG9)1(@!kVOhLD87%Fl_`7;R(RkjZ~i+x)8zFXU-77X{6f
zYPk%NpFBFvuuQH>lay<#hb>%H%WDi+K$862nA@BDtM#UCKMu+kM`!JHyWSi?&)A7_
z3{cyNG%a~nnH_!+;g&JxEMAmh-Z}rC!o7>OVzW&PoMyTA_g{hqXG)SLraA^OP**<7
zjWbr7z!o2n3hnx7A=2O=WL;`@9N{vQIM@&|G-ljrPvIuJHYtss0Er0fT5cMXNUf1B
z7FAwBDixt0X7C3S)mPe5g`YtME23wAnbU)+AtV}z+e8G;0BP=bI;?(#|Ep!vVfDbK
zvx+|CKF>yt0hWQ3drchU#XBU+HiuG*V^snFAPUp-5<#R&BUAzoB<hHU=m37G!KV!9
zs~61*+Hcg^$oOSo5g9ycnV9qCP&Q;3{o<yJQWFe=Yh1|Y)*C9d35V8SB$g)x4!&YT
z9d!w9=cZ#b{*g~^@EzhO7VrZ@nbuP0-lhv4I*V+9U65<q8FQ4Wa}XL)HtQO{P^VHi
zj-)s#FI|G`@U9{D_@sL{)yhu<Sb_Bt7ceo}s9YE~$iU7@K*Agnl+Zh7seWE5&R!S_
zCmI0O0@x~Z_p8Nlh6x&3>!aZ+e*KIxa26V}s6?nBK(U-7REa573wg-jqCg>H8~>O{
z*C0JL-?X-k_y%hpUFL?I>0WV{oV`Nb)nZbJG01R~AG>flIJf)3O*oB2i8~;!P?Wo_
z0|QEB*fifiL6E6%>tlAYHm2cjTFE@*<);#>689Z6S#BySQ@VTMhf9vYQyLeDg1*F}
zjq>i1*x>5|CGKN{l9br3kB0EHY|k4{%^t7-uhjd#NVipUZa=EUuE5kS1_~qYX?>hJ
z$}!jc9$O$>J&wnu0SgfYods^z?J4X;X7c77Me0kS-dO_VUQ39T(Kv(Y#s}Qqz-0AH
z^?WRL(4RzpkD+T5FG_0NyPq-a-B7A5LHOCqwObRJi&oRi(<;OuIN7SV5PeHU$<@Zh
zPozEV`dYmu0Z&Tqd>t>8JVde9#Pt+l95iHe$4Xwfy1AhI<n`R9oH@0SV-qw)kv`%>
zDM4XJ;bBTTvRFtW>E+GzkN)9k!hA5z;xU<Ypbch46*+?z6ODVueTOx78M~}ZZ>OL2
zq4}zn-DP{qc^i|Y%rvi|^5k-*8;JZ~9a;>-+q_EOX+p1Wz;>i7c}M6Nv`^NY&{J->
z`(mzDJDM}QPu5i4<c4By441WIqZqp>4**2Qbo(XzZ-ZDu%6vm8w@DUarqXj41VqP~
zs&4Y8F^Waik3y1fQo`bVUH;b=!^QrWb)3Gl=QVKr+6sxc=ygauUG|cm?|X=;Q)kQ8
zM(xrICifa2p``I7>g2R~?a{hmw@{!NS5`VhH8+;cV(F>B94M*S;5#O`YzZH1Z%yD?
zZ61w(M`#aS-*~Fj;x|J!KM|^o;MI#Xkh0ULJcA?o4u~f%Z^16ViA27FxU5GM*rKq(
z7cS~MrZ=f>_OWx8j#-Q3%!aEU2hVuTu(7`TQk-Bi6*!<}0WQi;_FpO;fhpL4`DcWp
zGOw9vx0N~6#}lz(r+dxIGZM3ah-8qrqMmeRh%{z@dbUD2w15*_4P?I~UZr^anP}DB
zU9CCrNiy9I3~d#&!$DX9e?A});BjBtQ7oGAyoI$8YQrkLBIH@2;lt4E^)|d6Jwj}z
z&2_E}Y;H#6I4<10d_&P0{4|EUacwFHauvrjAnAm6yeR#}f}Rk27CN)vhgRqEy<?cr
z6R5`U_Sc@<8Rnm)Sx4=ssMmH)((fLzBDe-8oZL2?8;gVE_E7eCE*q4brE|Rr5x0o2
z^Y;YlS3Tj6!|OE$_**V00k_c=V$Fb3v>PMMS7zvunj2?`f;%?alsJ+-K+IzjJx>h8
zu~m_y$!J5RWAh|C<6+uiCNsOKu)E72M3xKK(a9Okw3e_*O&}7llNV!=P87VM2DkAk
zci!YXS2&=P0}Hx|wwSc9JP%m8dMJA*q&VFB0yMI@5vWoAGraygwn){R+Cj6B1a2Px
z5)u(K5{+;z2n*_XD!+Auv#LJEM)(~Hx{$Yb^ldQmcYF2zNH1V30*)CN_<GsyFjVmb
zD)h_|Q}^G(^TxQkX_gf#v;s8zRbbF@HZgig3fX7Y_C%KW^4;Mzb1Q_mbv<K`san7p
zr<VAL=_8V?wGQ9W#OCB6w#j#s*xTCOq{>|1$v2|`LnFUT$%-tO0Eg|c5$BB~yDfzS
zcOXJ$wpzVK0MfTjBJ0b$r#_OvAJ3WRt+YOLlJPYMx~qp>^$$$h#bc|`g0pF-Ao43?
z>*A+8lx>}L{p(Tni2Vvk)dtzg$hUKjSjXRagj)$h#8=KV>5s)J4vGtRn5kP|AXIz!
zPgbbVxW{2o4s-UM;c#We8P&mPN|DW7_uLF!a|^0S=wr6Esx9Z$2|c1?GaupU6$tb|
zY<J=2bwPXwbBG}bpBO&`HtCU`sQ3|>_KU`(_29O_%k(;>^|6*pZURH3`@%EuKS;Ns
z1lujmf;r{qAN&Q0&m{wJSZ8MeE7RM5+Sq<f50&3KEB%;ap5IYu9&*^L3pcVFcAVGW
z04UqHZaI^y_@+2E#<{--P$9fmBw58@VQ=7%^zveD0O(QSrIoS+oGEl}3S0B`>;ul_
z`+ADrd_Um+G37js6tKsArNB}n{p*zTUxQ<D{*LSzTK#>r>3@wA;{EUbjNjlNd6$Mx
zg0|MyU)v`sa~tEY5$en7^PkC=S<2@!nEdG6L=h(vT__0F=S8Y&eM=hal#7eM(o^Lu
z2?<VnV9$|PdIge&&n55GFYu(+3gKo$EMBH)g%fG=d0l9?y&R{Xr=bU~d3k-ls||~Q
zdqZ2Ibd=svvcd-G9F6qP%UbDFL29x}6nCqava_&eR!Ou?Rs~d=hgF3;Q(KAtA|Qt@
z5PeHMC$T|!hzTOnXCt_0q;>^;05&|CNliYrq6gUv;|i!(W{0N)LWd*@{2q*u)}u*>
z7MQgk6t9OqqXMln?zo<KXCh}0JB2C8;d$OZ4?Q<ATC(JOVrvVRF?KkQ6^O&o2`<Q$
z-DPJRqChOl5!YowVXd(3%Ph16pi-d;JaH~r7U?lZJ2%#6uX=|Lcr}^Zli4ixQ1C%y
zu&(nSVW}d7kd1wVFUCOiEZW+4k^V(lOke1~%a8sQs^wAs8KLfUs=BxNe!(Y6_8ZZT
zCo;rs5WaGpeBh67<^|*xA#S65VbLU+e&jyIK!;_a^VJ`2wxD(4_GkoNZ>MAJcc<qR
zn=|0eY#rHX{fDEbS#wEN)PdQ$L3*RG1e}T^y9xXbBKsT-;}=KsEl9zS;lM1nZWo<>
zMKaof_Up})q#DzdF?w^%tTI7STI^@8=Wk#enR*)&%8yje>+tKvUYbW8UAPg55xb70
zEn5&Ba~NmOJlgI#iS8W3-@N%>V!#z-ZRwf<nAQuk$4XsbA2?xvz!lf8!A9&u)@oCJ
z>PO1)dQdQkaHsiqG|~we2ALqG7Ruup(DqSOft2RFg_X%3w?6VqvV1uzX_@F(diNVp
z4{I|}35=11u$;?|JFBEE*gb;T<e_J|zDJ1_W|BYXEUQsj_Ekmr-1GFuSJ!fD#Jwt6
z^IPIC_5NN>`dy+8gWJ9~pNsecrO`t#V9jW-6mnfO@ff9od}b(3<kFPLL`V`PrepA!
znVLswD&Ch_A#nGnS!pm`W^|6KlQj9e0x>s4>p0i30gbGIv~1@a^F2kl7YO;DxmF3?
zWi-RoXhzRJV0&XE@ACc?+@<sd-G9HF5dZ&*wEq(u_wO-RrDCaxC5-G7V)cvIY8~D$
zoG?hk!X_5=BuWn1Z*9@8ZV{ixBE=X&GGWu%bzo>6?)LQ2XNm4KfalMtsc%4!Fn0rl
zpHTrHwR>t>7W?t!Yc{*-^xN%9P0cs0kr=`?bQ5T*oOo&VRRu+1chM!qj%2I!@+1XF
z4GWJ=7ix9;Wa@xoZ0RP`NCWw0*8247Y4jIZ>GEW7zuoCFXl6xIvz$ezsWgKdVMBH>
z{o!A7f;R-@eK9V<P+C5DN?NK_qQ5=(jYExKglP|qB=@(M#QRp~t%BPwuyztnP9`ft
z1YRSG3otkYRhg1ElU)y#_?Pd>j7R40xx)T<2$?F2E<>Jy3F;;=Yt}WE59J!1WN367
zA^6pu_zLoZIf*x031CcwotS{L8bJE(<_F%j_KJ2P_IusaZXwN$&^t716W{M6X2r_~
zaiMwdISX7Y&Qi&Uh0upS3TyEIXNDICQlT5fHXC`aji-c{U(J@qh-mWl-uMN|T&435
z5)a1dvB|oe%b2mefc=Vpm0C%IUYYh7HI*;3UdgNIz}R##(#{(_<BD95FF;ZFGV&qz
z8Pn8EL}R(PV6KpLWp*(tnj`ERy@}m*TiM3BfE$7{gi4TPp(o3PTBV#018`5lT6LcC
z+PH<CSJwzhW!is6r}03ir}GTleL`F(Zdpu?5Nr&E5EjcwAj64ex8MP|*gW4nq?Q<t
z3@5`=_0esGb^Ece<ag$xQWKy^lIB?y(A?CgT;_3FV}1}aB!)jwA@T?(6XedlQ*(k9
zDadBI6m!U;qSg`{#7%mtl6VD&C{a5(&zN`4qOG(j4~hS{3H95A$%A5tpnCEbP+wqO
z>>82|zB0L*1i4B5j-xi9O4x10rs_J6*gdRBX=@VJ+==sWb&_Qc6tS<KlKZn<VwU!n
zLnOnI&WJ&J91(5%V9y=4Jq_eBfm9!BCKO-W6RKLW6dVby&S8C>OowM{BX@(zawtjl
zdU!F4OYw2@Tk1L^%~JCwb|e#3CC>srRHQ*(N%!7$Mu_sKh@|*XtR>)BmWw!;8-mq7
zBBnbjwx8Kyv|hd*`5}84flTHR1Y@@uqjG`UG+jN_YK&RYTt7DVwfEDXDW4U+iO{>K
zw1hr{_XE*S*K9TzzUlJH2rh^hUm2v7_XjwTuYap|>zeEDY$HOq3X4Tz^X}E9z)x4F
zs+T?Ed+Hj<#jY-`Va~fT2C$=qFT-5q$@p9~0{G&eeL~tiIAHXA!f6C(rAlS^)&k<-
zXU|ZVs}XQ>s5iONo~t!XXZgtaP$Iau;JT%h)>}v54yut~pykaNye4axEK#5@?TSsQ
zE;Jvf9I$GVb|S`7$pG)4vgo9NXsKr?u=F!GnA%VS2z$@Z(!MR9?EPcAqi5f<pK5;t
zb&cukw)8-|x31H1(Fj&i+kM40=Y04i9gus|j!y(ah9bVAH`yCx;#-MJ&6<Uo;364L
z>t)Iz6sNl`%kj+_H-X`R<>BFrBW=fSlD|{`D%@Rcbu2?%>t7i34k?Ujb)2@J-`j#4
zLK<69qcUuni<uOj0}C`gMaESz)GI|*Grst&fPD8oZr)bKc^}~YN0GER#uusn+Tc!q
zWrF<sBKhCak$)+P{0^qh)?a~|!fuAfcK>Ian-$A1+fR=?@+thwDIXtF1Tks@Br-xY
zfB+zblrR(ke`U;6U~-;p1Kg8Lh6v~LjW@9l2P6s+?$2!Z<IDB+yY4ox&h|I0y;-5?
z9m>RPX`(ZkRGe7~q(4&g<OcID-Zqc@__+obc6~O5DPU5>Ei<$ch`5kQ?*1=GSqkeV
z{SA1EaW_A!t{@^UY2D^YO0(H@+kFVzZaAh0_`A`f(}G~EP~?B|%gtxu&g%^x{EYSz
zk+T;_c@d;+n@$<>V%P=nk36?L!}?*=vK4>nJSm+1%a}9UlmTJTrfX4{Lb7smNQn@T
zw9<w{mDNj#YVY((v>p2%(Zjl^bWGo1;DuMHN(djsEm)P8mEC2sL@KyPjwD@d%QnZ$
zMJ3cnn!_!iP{MzWk%PI&D?m?C(y2d|2VChluN^yHya(b`h>~GkI1y;}O_E57zOs!{
zt2C@M$^PR2U#(dZmA-sNreB@z-yb0Bf7j*y<pBQ+k4*aVp?w`(S5_}b&kg4X@Sofy
zcqHS%!CX>ONhZG=onhx>t4)RB`<CY&xEoOnNq|`4TwO?Um+51s<NDq0^B>r6&TP$n
zgmN*)eCqvgriBO-a<gb-@gO7*f-;=;$N<27Yp)D7Ln4I)79>bHQ8ECN0bw?z5Bxpx
z=jF@?zFdVn?@gD5egM4o$m`}lV(CWrOKKq(sv*`mNcHcvw&Xryfw<{ch{O&qc<L-M
zVmpiaS&dR>#WCTXX6=#{MV@q#iHYba!OUY+MGeNTjP%Fj!WgM&`&RlI^=AWTOqy-o
zHo9YFt!gQ*p7{Fl86>#-JLZo(b^O`LdFK~OsZBRR@6P?ad^Ujbqm_j^XycM4ZHFyg
ziUbIFW#2tj`65~#2<ophCAkOZ($XwYEX-9Vd`-+%7JN?3GR#=*po_llExeP58!Yyh
zfBFZx*>V!4z7DM8Z;fG0|APaQ{a2VNYpNotB7eZ5kp+tPDz&Lqs0j%Y4tA*URpcfi
z_M(FD=fRGdqf430j}1z`O0I=;tLu81bwJXdYiN7_&a-?ly|-<ApEerJYO+vWo=kI`
z-rD}hhy8i~TGtoY4s6@Z3<13<OR9eqt4um=6eFf6$!!n)xzh=;tTHXN(UE;Xf=pU+
z`dE9RnW+)N$rd9fN@%&3A?!JdCd~nqX?>j*+=--XGvCq#32Gh(=|qj5F?kmihk{<M
zgEPC5kES)++<3TpUXV3Y3P48VdaIr-^IB0!+8~n0mjL`=xeqv8O-l|+H1rq)7sA{H
z^$*$;DIbhLHBWOj8khSs5o|aYh+3RPX=5iXJy_n`ZNI><Spn2FM>%M&$}udW5)DHK
zF_>}5R8&&API}o0osZJRL3n~>76nUZ&L&iy^s>PMnNcYZ|9*1$v-bzbT3rpWsJ+y{
zPrg>5Zlery96Um?lc6L|)}&{992{_$J&=4%nRp9BAC6!IB=A&=tF>r8S*O-=!G(_(
zwXbX_rGZgeiK*&n5E;f=k{ktyA1(;x_kiMEt0*gpp_4&(twlS2e5C?NoD{n>X2AT#
zY@Zp?#!b1zNq96MQqeO*M1MMBin5v#RH52&Xd~DO6-BZLnA6xO1$sou(YJ1Dlc{WF
zVa%2DyYm`V#81jP@70IJ;DX@y*iUt$MLm)ByAD$eUuji|5{ptFYq(q)mE(5bOpxjM
z^Q`AHWq44SG3`_LxC9fwR)XRVIp=B%<(-lOC3jI#bb@dK(*vjom!=t|#<@dZql%>O
z15y^{4tQoeW9L<H_624p3-b_rHm8YIC$k6&3$GlwdQslWx5!&!3m}i*?tl5@6;yzj
zoc!Vo*Hbq)-jJ59Sg;T*C)b6<j+VKKLixts|L96bm4=Is0j?L(vXBm$urwF-{$0-V
z<$e6HsrcrOqq`p)uFW!qJ}rO<YKXdHxyO`G#Bia+f>u%G&V$90x6F)xN6y_oIn;!Q
zs)8jT$;&;u%Y>=T3hg34A-+Y*na=|glcStr5D;&5*t5*DmD~x;zQAV5{}Ya`?RRGa
zT*t9@$a~!co;pD^!J5bo?lDOWFx%)Y=-fJ+PDGc0>;=q=s?P4aHForSB+)v0WY2JH
z?*`O;RHum6j%#LG)Vu#ciO#+jRC3!>T(9fr+XE7T2B7Z|0nR5jw@WG)kDDzTJ=o4~
zUpeyt7}_nd`t}j9<K48+u@DhA3`4r+FJ677MR6&8E4f2zla%l|D9N*11$;?agx3`X
zQKMo3I0~ZlYkbWEu`x`yJ@krOwxENL$Rt=$8{!>BKqryOha{34erm)RmST)_9Aw)@
zHbiyg5n&E{_CQR@h<}34d7WM{s{%5wdty1l+KX8*?+-YkNK2Be*6&jc>@{Fd;Ps||
z26LqdI3#9le?;}risDq$K5G3yoqK}C^@-8z^wj%tdgw-6@F#Ju{Sg7+y)L?)U$ez>
zoOaP$UFZ?y5BiFycir*pnaAaY+|%1%8&|(<reOyuH4oC{Ih*Lwy|NYzPCQRQ`ehMF
zEg-;Objn(%#1qC@!zAnKQl4zHMlo)Q+E4pW2QKLde|EyLnXTvQOMSI7T)74sZOfHC
z#$kL6q5^qb8eY0TS0xZc5`Q++ann{Wm9&lnoQ^h6%~gFm-4lj+U9&Zp#WzNXX62+9
zmFZ)1ML^9;#Ht15k!kkQ%3qdk7S&owgs=Ge>@VB)zweR%?IidwJyK5J!STzw&2RFx
zZV@qeaCB01Hu#U9|1#=Msc8Pgz5P*4Lrp!Q+~(G!OiNR{qa7|r^H?FC6gV<apFHH!
zvPyd+`3A>hkk3y7=uW#Sh;&>78bZ}aK*C#NH$9rX@M3f{nckYI+5QG?Aj1DM)@~z_
zw!UAD@gedTlePB*%4+55naJ8ak_;))#S;4ji!LOqY5VRI){GMwHR~}6t4g>5C_#U#
ztYC!tjKjrKvRy=GAsJVK++~$|+s!w9z3H4G^mACv=EErXNSmH<U!EM^MvZ)wb9KT%
z#OZQ%D1oeCN~H?$e4PM)Oo0Nf#@aY_z^1AJ$yBSx5w>7qN}%PKcN|8%9=i)qS5+$L
zu&ya~HW%RMVJi4T^pv?>mw*Gf<)-7gf#Qj|e#w2|v4#t!%Jk{&xlf;$_?jW*n!Pyx
zkG$<18kiLOAUPuFfyu-EfWX%4jYnjBYc~~*9JEz6oa)_R|8wjZA|RNrAp%}14L7fW
zi7A5Wym<E#i_(~)bst!ffFAM+k<@$mzUh70rTL<McKqdHe%2p~vi~IR0fXQ|S)y{r
z;Wp!8-s^RV8y06<5VY%~W5!C@67mJ2juFL?Aei!n9$#?Mxz(e*!?C%d!S^;<NyuK;
z=jOZo@63!X2t3{<2mbRO+M4mhSli$HyTwM2v=i7dSS7zmGorTVUNCfrp5V7W@5-EM
z9Ys`dT15QQomjL6GHVaWEvXi+QV5957MiWw!x~2qrLvvTs8)?0#wqmp4@3O@LG<r!
zk6}xyfn=$w96=KT^BPtNWe<ruqW3j0;LxgBeA49=6TD<@C_{gG$<X&CyDE03IM5)z
zgD@jrZu<T4d;HFH;~S7D52VZ#%z-INbhoB9d^{Iug5R?T=;fLQ(uh#mu6u`Ha62Gc
zoH09p_pkWwHF6o$jc2wh?8ZJGKMj7F>*<L$XY6i+<~=c|V{+>K+V8pkqq<QnfGNr(
zou6uoQ0mUzl`senrxj^LkjsGe;0#a$G>O-X#3ft{0qs?KVt^)?kS>AicmeO&q+~J~
z<sSV8bNrd3A9xC%f$yWrWh#?+O1^-<;70xvO=?7-Uc1E*o02qDCg>p0YJ_P~_a8j=
zsAs~G=8F=M{4GZL{|B__UorX@MRNQLn?*_gym4aW(~+i13knnk1P=khoC-ViMZk+x
zLW(l}oAg1H`dU+Fv**;qw|ANDSRs<RLAc%!hUu-WqF+F5Oeq^z)6;J*CN3_IJ2Nxe
z-;V6)AOdQ4T2Ukyh0P^3nCpm=n$E*LwA)q6EHoozsz{aE^r+ehzxp>>cGqL!Yw^`;
zv;{E&8CNJcc)GHzTYM}f&NPw<6j{C3gaeelU#y!M)w-utYEHOCCJo|Vgp7K6C_$14
zqIrLUB0bsgz^D%V%fbo2f9#yb#CntTX?55X<qx;!okXD~axKjmLH&*OdaOWEc{H0%
zi0MH-X|Jusi;#0rf&N*g-GE;RD$1qdO=oS*<<v&3;DB9~Mn>y|Kps&Xek*4_r=KDZ
z+`TQuv|$l}MWLzA5Ay6C<xwUE$SDueIt18G;rIq+PKrqK)-e%dH7kKgSCZrM6VWd%
zl2lnN?N}w!k%oj}Sb=F~WfJ?Oq-~KxZEt%C$Km;<HWP-Far<SWJWbkJ@m6yOcWFyW
z_Q8799P2jX-Hi_v*fxw=bGS(JHHq<82FgsB@wT053kvhY`h#<lj?p)b>vsa^7x<Dm
z7*W`&66pKXgHH%Ml6<<#8|Qv`3H|XpxHPw;J1j{B-l=VGuJ@O>vwXpy?`w(6vx4XJ
zWuf1bVSb#U8{xlY4<q^>+wlZ$9jjPk)X_;NFMqdgq>m&W=!KtP+6NL57`AMljW+es
zzqjUjgz;V*kktJI?!NOg^s_)ph45>4UDA!Vo0<s{;e|6~VP^gWUU3XjQk;=Xix6pU
zwO|=D;X5iLwh8JKU!FTBb9nZax_m$0O`m}PntuM|vT@{$W}A^6FgT)aaou}yP9OHt
z+BRQkg}S5r2LiCLG|3XarntT@bLzkEQWF1j1PB<L*g6>hn>KZ+h-3=?Y3*R=#!fOX
zP$Y~+14$f66ix?UWB_6r#fMcC^~X4R-<&OD1CSDNuX~y^YwJ>sW0j`T<2+3F9>cLo
z#!j57$ll2K9(%$4>eA7(>FJX5e)pR5&EZK!IMQzOfik#FU*o*LGz~7u(8}XzIQRy-
z!U7AlMTIe|DgQFmc%cHy_9^{o`eD%ja_L>ckU6$O4*U**o5uR7`FzqkU8k4gxtI=o
z^P^oGFPm5jwZMI{;nH}$?p@uV8FT4r=|#GziKXK07bHJLtK}X%I0TON$uj(iJ`SY^
zc$b2CoxCQ>7LH@nxcdW&_C#fMYBtTxcg46dL{vf%EFCZ~eErMvZq&Z%Lhumnkn^4A
zsx$ay(FnN7kYah}tZ@0?-0Niroa~13`?hVi6`ndno`G+E8;$<6^gsE-K3)TxyoJ4M
zb6pj5=I8^FD5H@`^V#Qb2^0cx7wUz&cruA5g>6>qR5)O^t1(-qqP&1g=qvY#s&{bx
zq8Hc%LsbK1*%n|Y=FfojpE;w~)G0-X4i*K3{o|J7`krhIOd*c*$y{WIKz2n2*EXEH
zT{oml3Th5k*vkswuFXdGDlcLj15Nec5pFfZ*0?XHaF_lVuiB%Pv&p7z)%38}%$Gup
z<b3uaN}F=Gim_ol$%3|sHjkH6w3NkSvTNg|$pNIrx_?n%{%+0R`;99PC4<xOluBpR
zU2O5CB{+faJ?d^o`6UNaOpdi{6Wxcn#ldUE@c7sS0hQ<d1bwc@5-Mup64Y_byI5~E
ze(1Scv9rryWVG=>VTa~C8=cw%6BKn_|4E?bPNW4PT7}jZQLhDJhvf4z;~L)506IE0
zX!tWXX(QOQPRj-p80QG79t8T2^az4Zp2hOHziQlvT!|H)jv{Ixodabzv6lBj)6WRB
z{)Kg@$~~(7$-az?lw$4@L%I&DI0Lo)PEJJziWP33a3azb?jyXt1v0N>2kxwA6b%l>
zZqRpAo)Npi&loWbjFWtEV)783BbeIAhqyuc+~>i7aQ8shIXt)bjCWT6$~ro^>99G}
z2<k!)pJyc8u<yVadbWX)2!_&!K=lyrD}wj>XfmT0(|l!)XJb^E!#3z4oEGIsL(xd;
zYX1`1I(cG|u#4R4T&C|m*9KB1`UzKvho5R@1e<V*TeB>YtUL9B72{i(ir&ls8g!pD
ztR|25xGaF!4z5M+U@@lQf(12?xGy`!|3E}7pI$k`jOIFjiDr{tqf0va&3pOn6Pu)%
z@xtG2zjYuJXrV)DUrIF*y<1O1<$#54kZ#2;=X51J^F#0nZ0(;S$OZDt_U2bx{RZ=Q
zMMdd<UQ`729gV*taE)yo&7I6$j1|A$UbHd&qQG|gUmni?yhum!iv{x|f0(p56<HNE
z{|r}=llKTf(UnY3B_)-{B&Ilhl?!Gt;#{A!Ik&y#y&po8@}lQ?&FRcs-Q>$fH|!s{
zXq#l;{`xfV`gp&C>A`WrQU?d{!Ey5(1u*VLJt>i27aZ-^&2IIk=zP5p+{$q(K?2(b
z8?<F{C+DO@u0&46j?yJ2$y`_qSmA<f41gBg&6I6Bc4WTi!On@`Kfs@;Mf4<#yYH%S
z3%=-9Vz2=GO0viySb&ugf@Mk8Vrw0#wF<}kN;VR}yEW9MNABqR`RZL=RHtZ4%8@`Y
zp#Ny|%!HB2ZzUgfDe)Mtj<}lnsKm*hSbL^-xJDeWiDv0GDklMm@t>9h)kvj9SF!Dr
zoyF}?V|9;6abHxWk2cEvGs$-}Pg}D+ZzgkaN&$Snp%;5m%zh1E#?Wac-}x?B<FLY5
z^#|qyQLq|K>YlGN#U#Mek*}kek#I9XaHt?mz3*fDrRTQ#&#~xyeqJk1QJ~E$7qsw6
z?sV;|?*=-{M<1+hXoj?@-$y+(^<DUw2Jr;Zm>BJ1H~wQ9G8C<M!|<37p=^5w$PQ1k
zI75RU({o}zBXPvTFlczyZ!+pcQxRXL4k5~P@IP4UP@{7*ml`gS8j=i(N(J0~3#|$W
z#`Dx?eM5{^y|kSL=^5rzID`fXlPhQ2@)omgy?3h*!>0#^aEAyhDduNX@haoa=PuPp
zYsGv8UBfQaRHgBgLjmP^eh>fLMeh{8ic)?xz?#3kX-D#Z{;W#cd_`9OMFIaJg<n@h
zIvM{(1~1i4U6GYhKf4MAnWumaiROMvmVJ+(p3e<6pce!gGy~U5HS%XPE9#Jf<W#m+
zb_QyVUZ<wCu_xG@9z9_*)RPK9x8IJ=-v7b-iuW|s!`IbP-rnHkSc}B#!RFNU;ClVO
zdDxXw<Lhw^{LS*V&7Z-qDtQxaWnLp+HwMlupdACRzR5|WWj`ztVcQA@+RUVWll~zq
z{qn?RDyo>-=t`_3*!YDgtNQ2+QUEAJB9M{~AvT$H`E)IKmCR21H532+ata8_i_MR@
z2Xj<3w<`isF~Ah$W{|9;51ub*f4#9ziKrOR&jM{x7I_7()O@`F*5o$KtZ?fxU~g`t
zUovNEVKYn$U~VX8eR)qb`7;D8pn*Pp$(otYTqL)5KH$lUS-jf}PGBjy$weoceAcPp
z&5ZYB$r&P$MN{0H0AxCe4Qmd3T%M*5d4i%#!nmBCN-WU-4m4Tjxn-%j3HagwTxCZ9
z)j5vO-C7%s%D!&UfO>bi2oXiCw<-w{vVTK^rVbv#W=WjdADJy8$khnU!`ZWCIU`>#
zyjc^1W~pcu>@lDZ{zr6gv%)2X4n27~Ve+cQqcND%0?IFSP4sH#yIaXXYAq^z3|cg`
z`I3$m%jra>e2W-=DiD@84T!cb%||k)nPmEE<W?@Vxzv1;a$T#%C913?i}`t+rADo#
zC7TuHDW#@wx#E3b<A)T6uJ>09NC%@PS_OLhkrX*U!cgD*;;&gIaA(DyVT4QD+q_xu
z>r`tg{hiGY&DvD-)B*h+YEd+Zn)WylQl}<4>(_NlsKXCRV;a)Rcw!wtelM2_rWX`j
zTh5A|i6=2BA(iMCnj_fob@*eA;V?oa4Z1kRBGaU07O70fb6-qmA$Hg$ps@^ka1=RO
zTbE_2#)1bndC3VuK@e!Sftxq4=Uux}fDxXE#Q5_<FeRxZ5dX0w7NJ1YRHU#Z$BTr$
z`)wN5bJJ+RrkSP-+5&DxF;{yTydOK?&E@|n6{$zZ<l<h_OVq<pLy3}Cs(@^!AKS3v
zs^%D02yP?T1JsVkG_$W1M_(HQj2}0PQ({upTh0DEflgHzkrq_3uQ#o~Xh$r*Hn#XK
z%fUd@E{I)?SYMJGeI}L~)B<FkO~@J|q(Wd60IQ&6Okb!cr?;u~jpWb%H+9jmSrjds
z{3hpy8rDopSBZ_GusW_B)^$dTmE4P&V_Eb^Ih;|L<NY!D5GPH#JeEzeTh$HO@A|Fn
zRc*;Ma?FBd&3c(9Zt!qaZlR5|nMqGrA2Lj7O7tMpWmQy_rjuK|B)Gc_ouOQrj6wEz
z32X<-{ytN?=>x=E1h>T5`D<dtR&xu@*|Ta7Hd8EJn!lw8o@cR!8z8eO@)Vx=X>PHz
zbH<_OjWx$wy7=%0!mo*qH*7N4tySm+R0~(rbus`7;+wGh;C0O%x~fEMkt!eV>U$`i
z5<d_k7|L{*P&u(7rQp7047h3UbY|wjh)RQP$TKl{D0~b7ZKVczu31g*{+{-g>>Q(o
z=t$<p=<~hN1+_h{HfNMhdBWq=6u*-jH!6viz%~sWI#`^RvV~7ac*8S<+(K#fxEe_p
zLbZpanYgH()OwCJr$ckxd~mD)xi7!XCK7P^_y9>gPjgGh0&I7KY#k50V7DJRX<%^X
z>6+ebc9efB3@eE2Tr){;?_w`vhgF>`-<wt92+tk>GDY(YkR{9RH(MiCny<y~1rmBT
z=dU8?rS7ETruzC)etiYZ9@H0U1&xhKdLlcsjIHpes0+3l0*A?A>Rtd!LxXJ75z+?2
zGi<cz0hpHP10;3BfW^UbK|?i^ifVMhOM5tgNDo@PRVaec;GG(&PVVC}!WSnGP1++_
zj7X7}wOo$N4wU`G{9dEHd)iC0+__;{cSTS$w5A&CA{~0{tkn5{Q%AiVsW(Kt{2;Uv
zBC}hb{rgu(YvCPnHSS0;+<C*VukDNqo3wS450JI-3281)fjd<)Bk-Ox`5w9XCzwi@
zp&5d0zI5lIy4<1UjOMJL%mwKt$VX@f5Kf1<C;xU5aS>@m^+2hKJ5sB<T$2V@SQod{
zRaF6_FrEJ05N9c3f!q*;Z05ZmkiEaIoL}q&R~{c5{BIXr)9*1zAB!J$KA+W@@dk7V
zW5l1MLb$_c=9n*)B;obV;jd(QuL`!dk1d-7e1RQ0`^&R)nTJ0daa%iDe~{YM@Qnb3
zu*hzH_KKQq>1@Xi@s_@p_Kwbc<*LQ_`mr^Y%j}(sV_$`J(?_FWP)4NW*BIL~sR>t6
zM;qTJZ~GoY36&{h-Pf}L#y2UtR}>ZaI%A6VkU>vG4~}9^i$5WP2Tj?Cc}5oQxe2=q
z8BeLa$hwCg_psjZyC2+?yX4*hJ58Wu^w9}}7X*+i5Rjqu5^@GzXiw#SUir1G1`jY%
zOL=GE_ENYxhcyUrEt9Xl<FD`E@a9>MNP6kx6h&%6^u3@zB8KUCAa18T(R2J`%JjWZ
z!{7cXaEW+Qu*iJPu+m>QqW}Lo$4Z+!I)0JNzZ&_M%=|B1yejFRM04bGAvu{=lNPd+
zJRI^DRQ(?FcVUD+bgEcAi@o(msqys9RTCG#)TjI!9~3-dc`>gW;HSJuQ<oHtTsmp-
zg)H_2N1wZGNAu6O_Xn(AY+RFAJ-6Mm_93j!W*X|0Ye@4;iY+s6<0b5MjXzo`6IJyz
zLtv`iatXFp+bzc4T?oIjwG<wve*Pc~KpyZ4DKvxF$C%dvH*(Xtf=8k-_oIQotfRTq
zi_<6B=B}307o+ji?B_%DCS{<<$aaC|iJtV&+ZKYGhX!7=v>vH~d`MQs86R$|SKXHh
zqS9Qy)u;T`>>a!$LuaE2keJV%;8g)tr&Nnc;EkvA-RanHXsy)D@XN0a>h}z2j81R;
zsUNJf&g&rKpuD0WD@=dD<sR9w8N7Z}d}V2@hrPnkI(}2BnH&b8WlGN_J`E#!LaROL
zT6x>rPHdBoK42WoBU|nMo17o(5^;M|dB4?|FsAGVrSyWcI`+FVw^vTVC`y}f(BwJl
zrw3Sp151^9=}B})6<JlvqOAvKIjM>@H*i4-dIN_o^br+BkcLa^H56|^2XsT0dESw2
zMX>(KqNl=x2K5=zIKg}2JpGAZu{I_IO}0$EQ5P{4zol**PCt3F4`GX}2@vr8#Y)~J
zKb)gJeHcFnR@4SSh%b;c%J`l=W*40UPjF#q{<}ywv-=vHRFmDjv<xPiJ;i|>)NtmC
zQx9qm)d%0zH&qG7AFa3VAU1S^(n8VFTC~Hb+HjYMjX8r#&_0MzlNR*mnLH5hi}`@{
zK$8qiDDvS_(L9_2vHgzEQ${DYSE;DqB!g*jhJghE&=LTnbgl&Xepo<*uRtV{2wDHN
z)l;Kg$TA>Y|K8Lc&LjWGj<+bp4Hiye_@BfU(y#nF{fpR&|Ltbye?e^j0}8JC4#xi%
zv29ZR%8%hk=3ZDvO-@1u8KmQ@6p%E|dlHuy#H1&MiC<*$YdLkHmR#F3ae;bKd;@*i
z2_VfELG=B}JMLCO-6UQy^>RDE%K4b>c%9ki`f~Z2Qu8hO7C#t%Aeg8E%+}6P7Twtg
z-)dj(w}_zFK&86KR@q9MHicUAucLVshUdmz_2@32(V`y3`&Kf8Q2I)+!n0mR=rrDU
zXvv^$ho;yh*kNqJ#r1}b0|i|xRUF6;lhx$M*uG3SNLUTC@<I49P80xma07<{`YgPN
z)(Ac#bc{dhY#Cu3)v`Q}DZFuLMQN2u7xe+7PIX*m0qDp<6Jkno{rglXV)U;4>|htC
z-=fsw^F%$qqz4%QdjBrS+ov}Qv!z00E+JWas>p?z@=t!WWU3K*?Z(0meTuTOC7OTx
zU|kFLE0bLZ+WGcL$u4E}5dB0g`h|uwv3=H6f+{5z9oLv-=Q45+n~V4WwgO=CabjM%
zBAN+RjM65(-}>Q2V#i1Na@a0`08g&y;W#@sBiX6Tpy8r}*+{RnyGUT`?XeHSqo#|J
z^ww~c;ou|iyzpErDtlV<Y_SCc(_7{}MrPO4rVB@7&Rjy#O2fj5to>U=`8N7JSu>4M
z_pr9=tX0edVn9B}YFO2y(88j#S{w%E8vVOpAboK*27a7e4Ekjt0)hIX99*1oE;vex
z7#%jhY=bPijA=Ce@9rRO(Vl_vnd00!^TAc<+wVvRM9{;hP*rqEL_(RzfK$er_^SN;
z)1a8vo8~Dr5?;0X0J62Cusw$A*c^Sx1)dom`-)Pl7hsW4i(r*^Mw`z5K>!2ixB_mu
z*Ddqjh}zceRFdmuX1akM1$3>G=#~|y?eYv(e-`Qy?bRHIq=fMaN~<jAL}PWcQidRH
zK2yekhS2Lj<8?b`xr58UAX4(T5E1^L&whVF<i9Q^ij@9ed9E_ifd+pE6vaZ5Ry#aY
zA}&HXAstN0LhSxhPG&s*OQPG{+rA08*@HqCho1SsE9gc)wqnJnfgB2HU^I0xnVxj*
zX4m!g{s6*{GQ|W6M46yH&8H0KRHzB%Hb1+zmame~q)Ue3wp6C<-<ZZK_M)*8T|>fB
zUa6I8Rt=)jnplP>yuS+P&PxeWpJ#1$F`iqRl|jF$WL_aZFZl@kLo&d$VJtu&w?Q0O
zzuXK>6gmygq(yXJy0C1SL}T8AplK|AGNUOhzlGeK_oo|haD@)5PxF}rV+5`-w{Aag
zus45t=FU*{LguJ11Sr-28EZkq;!mJO7AQGih1L4rEyUmp>B!%X0YemsrV3QFvlgt*
z5kwlPzaiJ+kZ^PMd-RRbl(Y?F*m`4*UIhIuf#8q<Nz@soPkY1ALkT*eHhnbbIB_gT
zwEAmPh9_mjMLG@Ns1qCf8u)<9ISwg$Bqf?2y^HBtk5P?|2w6>>H_M=fM*L_Op-<_r
zBZagV=4B|EW+KTja?srADTZXCd3Yv%^Chfpi)cg{ED${SI>InNpRj5!euKv?=Xn92
zsS&FH(*w`qLI<rdK|7Qb<c1TJj-yb9%q!4Kl-gZhZ0&i~?1Smlus~@u79ojelr}e=
z=(jH{&~FQJuR)VS@A!!<bs@smdUy8&t|3w(Ru!w~g8*dFaH0ct>y$doc>RE&A5R?u
zzkl1sxX|{*fLp<pkJUphzMYHr37AZg0<9Q!);Dms#VK@7w$(ZE_TiLt!QccO&=fNh
z83;??=IfxriuU6rn*5zF)5oJ^dWG?|gwh&}q9z`cmSZSRKGM<9JUXgj2HP@ki@EyB
zPj?ggbGP#(J(EMkDShSp(c?_>XvIW>9d<$ePROttn3oc6R!sN{&Y+>Jr@yeQN$sFR
z;w6A<2-0%UA?c8Qf;sX7>>uKRBv3Ni)E9pI{uVzX|6Bb0U)`lhLE3hK58ivfRs1}d
zNjlGK0hdq0qjV@q1qI%ZFMLgcpWSY~mB^LK)4GZ^h_@H+3?dAe_a~k*;9P_<R7XN(
z&HGNI!PYhVXyq^_=bMf}N6^ok_FD5wiKI-2%nC=ATeOPtc<W3f4qR0C>d7%NEFP6+
zgV(oGr*?W(ql?6SQ~`lUsjLb%MbfC4V$)1E0Y_b|OIYxz4?O|!kRb?BGrgiH5+(>s
zoqM}v*;OBfg-D1l`M6T6{K`LG+0dJ1)!??G5g(2*vlNkm%Q(MPABT$r13q?|+kL4-
zf)Mi5r$sn;u41aK(K#!m+goyd$c!KPl~-&-({j#D4^7hQkV3W|&>l_b!}!z?4($OA
z5IrkfuT#F&S1(`?modY&I40%gtroig{YMvF{K{>5u^I51k8RriGd${z<Y3I3im=|8
z%$wv|wOEi8mu|yn0sn9E+Qi~7!OCIls-XU^J6|DHO_&{OHFY6TnAa~}E2>)=5k2tG
zM|&Bp5kDTfb#vfu<Z8(fb`i1z5wam|g63@h@f<+rCe0^)xyy?F)?N0$kWv4tqkpY=
z|3gMq{41bNQKPxivJ4dRDGYL+wvozbM|9~2fRq%3DHYS}cYPOyWb;?dy#H5(Ih0qD
zkVJkMZ*Py0(6NmwNO)Lq$X1r;R}D>TTd?)a=>bX=lokw^y9+2LS?kwHQIWI~pYgy7
zb<qS%zT{Z;-?o6LsXKA|-3BgzAw}ClH1epD-+P;mIUo2I{0lLes<XJMvzg#Bbe7DY
zG_Uq)WFe{s;pIJbW*B(HF<&(BRKZq@PN5oU9?D1X>?A-RKVm_vM5!9?C%qYdfRAw&
zAU7`up~%g=p@}pg#b7E)BFYx3g%(J36Nw(Dij!b>cMl@CSNbrW!DBDbTD4OXk!G4x
zi}JBKc8HBYx$J~31PXH+4^x|UxK~(<@I;^3pWN$E=sYma@JP|8YL`L(zI6Y#c%Q{6
z*APf`DU$S4pr#_!60BH$FGViP14iJmbrzSrOkR;f3YZa{#E7Wpd@^4E-zH8EgPc-#
zKWFPvh%WbqU_%ZEt`=Q?odKHc7@SUmY{GK`?40VuL~o)bS|is$Hn=<=KGHOsEC5tB
zFb|q}gGlL97NUf$G$>^1b^3E18PZ~Pm9kX%*ftnolljiEt@2#F2R5ah$zbXd%V_Ev
zyDd{1o_uuoBga$fB@Fw!V5F3jIr=a-yk<G{P%>qrK?WWZ#a(bglI_-8pq74RK*KfQ
z0~Dzus7_l;pMJYf>Bk`)`S8gF!To-BdMnVw5M-pyu+aCiC5dwNH|6fgRsIKZcF&)g
zr}1|?VOp}I3)IR@m1&HX1~#wsS!4iYqES<Oq!z^aMIT{Q??S@v&*GbF7q97kSl@?K
zC$z`Bzx+I?h3E?|U&YSk%hU7kC(QpfpZ+&mhLZFbpGNmFX*V`jC*LO2kmEO_Z~=`>
zK}4J{Ei>;e3>LB#Oly>EZkW14^@YmpbgxCDi#0RgdM${&wxR+LiX}B+<h)+#yyKdg
zysFvW_W7nZ&<-(uGY@AGZ5D2!%>iRioOB0(pDKpVEI;ND?wNx>%e|m{RsqR_{(nmQ
z3ZS}@t!p4a(BKx_-CYwrcyJ5u1TO9bcXti$8sy>xcLKqKCc#~UOZYD{llKTSFEjJ~
zyNWt>tLU}*>^`TvPxtP%F`ZJQw@W0^>x;!^@?k_)9#bF$j0)S3;mH-IR5y82l|%=F
z2lR8zhP?XNP-ucZZ6A+o$xOyF!w;RaLHGh57GZ|TCXhJqY~GCh)aXEV$1O&$c}La1
zjuJxkY9SM4av^Hb;i7efiYaMwI%jGy`3NdY)+mcJhF(3XEiSlU3c|jMBi|;m-c?~T
z+x0_@;SxcoY=(6xNgO$bBt~Pj8`-<1S|;Bsjrzw3@zSjt^JC3X3*$HI79i~!$RmTz
zsblZsLYs7L$|=1CB$8qS!tXrWs!F@BVuh?kN(PvE5Av-*r^iYu+L^j^m9JG^#=m>@
z=1soa)H*w6KzoR$B8mBCXoU;f5^bVuwQ3~2LKg!yxo<XQ$IAc;ya0F4IP5hmZW0n(
zeoH>mG1#XPmn(?YH<r<yFVclsbGRF9L2n2S9>@E~_ED+W6mxs%x{%Z<$pW`~ON<jr
zb@Rh%`t#?I<L3yZl{J^|&N^NYcBZh%My>1~2XjP5v(0{C{+6Dm$00tsd3w=f=ZENy
zOgb-=f}|Hb*LQ$YdWg<(u7<GTVlvJ^WI42~hhU2v*|!uo(`G=2+{}i#sqV$xDASf<
z@BJ)K+GlMseqK(xbd0N8;flrWX{U|f6iVUhp2C8U6V%`<#w1zFsPHlj&@qhoQ^=nF
z6v6aigM_Vb$5&}LkM25m&fIkuPtbE8{LAP5`M)3J|2(|M4gtoWqx*l9ndfm(jDdbS
z;F;wqL8@O#jzJ_!L@a8Vr=(ty%9Ya<&mYkPK-upKKzu>x3`PKF)B7ZfZ6;1FrNM63
z?O6tE%EiU@6%rVuwIQjvGtOofZBGZT1Sh(xLIYt9c4VI8`!=UJd2BfLjdRI#SbVAX
ziT(f*RI^T!IL5Ac>ql7uduF#nuCRJ1)2bdvAyMxp-5^Ww5p#X{rb5)(X|fEhDHHW{
zw(Lfc$g;+Q`B0AiPGtmK%*aWfQQ$d!*U<|-@n2HZvCWSiw^<SosZid&Mq7{pz6&V3
zd@R%+SsepGL-*aKdhzR%Vvbs43uAoIdC_3qKoUK@QdY*}5w2umG!7DWQeEKlHV6q$
z_Vh)Q-FM<!WD1@h?zMdvF;}=nMKN{e&z-e2q1E@fiAqu40_=<UFNQe-L84I;Y_c%j
zXOf_0V-dW;=^lZ_p{hCK<*1Qn9RCXL-o=HCfl~b1_&}HQrR3DMhN0xaXs&X+H^PhX
zjG$NyjtoK3(r=AP7}oP%4fb^}B?XNlaB{n~xP1Xi9IZ>I>#vh+LyC;aaVWGbmkENr
z&kl*8o^_FW$T?rDYLO1Pyi%>@&kJKQoH2E0F`HjcN}Zlnx1ddoDA>G4Xu_jyp6vuT
zPvC}pT&Owx+qB`zUeR|4G;OH(<<^_bzkjln0k40t`PQxc$7h(T8Ya~X+9gDc8Z9{Z
z&y0RAU}#_kQGrM;__MK9vwIwK^aoqFhk~dK!ARf1zJqHMxF2?7-8|~yo<mfEO9=@^
zS^!0=f8b>O@_~Ed;_wvT%Vs{9RK$6uUQ|&@#6vyBsFK9eZW1Ft#D2)VpQRwpR(;x^
zdoTgMqfF9iBl%{`QDv7B0~8{8`8k`C4@cbZAXBu00v#kYl!#_Wug{)2PwD5cNp?K^
z9+|d-4z|gZ!L{57>!Ogfbzchm>J1)Y%?NThxIS8frAw@z>Zb9v%3_3~F@<=LG%r*U
zaTov}{{^z~SeX!qgSYow`_5)ij*QtGp4lvF`aIGQ>@3ZTkDmsl#@^5*NGjOuu82}o
zzLF~Q9SW+mP=>88%eSA1W4_W7-Q>rdq^?t=m6}^tDPaBRGFLg%ak93W!kOp#EO{6&
zP%}Iff5HZQ9VW$~+9r=|Quj#z*=YwcnssS~9|ub2>v|u1JXP47vZ1&L1O%Z1Ds<y1
zKGhYGqMl$%q``Pf)AeU^htE>OrDfSIMHU{VT>&>H=9}G3i@2rP+rx@eU@uE8rJNec
zij~#FmuEBj03F1~ct@C@$>y)zB+tVyjV3*n`mtAhI<Hd#M@#m|U%%fPzKpS=8^jh0
zL8{$eQBGDxNs#cZ9W_F*%I@t0Ecr241+VZB`dP=cQbRx5C6V0E8hva(E`B^pdHgL|
z{&5>M0$58vM9jOQC}JJOem|EpwqeMuYPxu3sv}oMS?S#o6GGK@8PN59)m&K4Dc&X%
z(;XL_kKeYkafzS3Wn5DD>Yiw{LACy_#jY4op(>9q>>-*9@C0M+=b#bknAWZ37^(Ij
zq>H%<@>o4a#6NydoF{_M4i4zB_KG)#PSye9bk0Ou8h%1Dtl7Q_y#7*n%g)?m>xF~(
zjqvOwC;*qvN_3(*a+w2|ao0D?@okOvg8JskUw(l7n`0fncglavwKd?~l_ryKJ^Ky!
zKCHkIC-o7%fFvPa$)YNh022lakMar^dgL=t#@XLyNHHw!b?%WlM)R@^!)I!smZL@k
zBi=6wE<uBK&#|s)0id-YUbF|8EPGSGH#_Nnlfmnx-A{yYewA#u&;8}f{mZTU`V%Vx
zw+kY#P{Vftbb_Kx6Y^&ExMgX^Mv0aE2ugq_I13BLg;kULC8h9=4mjSmMlD_q9Weew
zQP6=zR=$<}g~zzw5d*9AxF4p1bS)})m*Am0;N4P5h;=f3SqJHg(}O<h%;?&y!q3aJ
zM0lZW!Y2FVPfVs5!A8r2PY%jXR;(thZCy+-4If<jrsBG5eyH8BP$MdVS}wcThQNK)
zKIDBa>5)2v&!UNV(&)oOYW(6Qa!nUjDKKBf-~Da=#^HE4(@mWk)<uU{=obsLdUI3h
zHmqdEK8EB5g|CJ1waElw;@$z(IDUSb4jynL@<Dcx{+7nmSS)kq1|+E@VN%nmRkMiR
zs=e6GO30hK26C#QIG|w8+|fawvH;IKl%paiw=s1CoUBE@_O7IxK{t{GeiX5Bw#IBg
zy}V!1(_y)p_WaM*T{~mUh~q`irqOUPd<%ojktmiS@MD>LPvhyN3i4goB$3K8iV7uh
zsv+a?#c4&NWeK(3AH;ETrMOIFgu{_@%XRwCZ;L=^8Ts)hix4Pf3yJRQ<8xb^CkdmC
z?c_gB)XmRsk`9ch#tx4*hO=#qS7={~Vb4*tTf<5P%*-XMfUUY<TA8uu1Q&SE*j^Oz
z=-_T`Y_dFx=4yScs+$!sJ58a1Qi$jurfsZ>kI9T1cEF;ObfxxI-yNuA=I$dCtz3ey
znVkctYD*`fUuZ(5<dGK9+E5m(x+j!E1gBD<m;epCW&-dEFrxIWm6v|{RNP287N@@(
z&RwFD-KScCNJ<>7+^B*R=Q}~{1z#2!ca?)+YsRQb+lt^LmEvZt_`=j^wqig+wz@n@
z`LIMQJT3bxMzuKg8EGBU+Q-6cs5(@5W?N>JpZL{$9VF)veF`L5%DSYTNQEypW%6$u
zm_~}T{HeHj1bAlKl<bNiI7kGAT=WJaCg#3PHf(sw37beu4irZqPQM6)OVU((ZqiFe
zh7}c1t^`(7HQ`GHm>8ii92l9~$dm=UM21kLemA&b$;^!wB7#IKWGnF$TVq!!lBlG4
z{?Rjz?P(uvid+|i$VH?`-C&Gcb3{(~Vpg`w+O);Wk1|Mrjxrht0GfRUnZqz2MhrXa
zqgVC9nemD5)H$to=~hp)c=l9?#~Z_7i~=U-`FZxb-|TR9@YCxx;Zjo-WpMNOn2)z)
zFPGGVl%3N$f`gp$gPnWC+f4(rmts%fidpo^BJx72zAd7|*Xi{2VXmbOm)1`w^tm9%
znM=0Fg4bDxH5PxPEm{P3#A(mxqlM7SIARP?|2&+c7qmU8kP&iApzL|F>Dz)Ixp_`O
zP%xrP<k$wQk~?_FT73lz;bX*6=D5hHv{$OG+ESaX)ae8>1M6@oYhgo$ZWwrAsYLa4
z|I;DAvJxno9HkQrhLPQk-8}=De{9U3U%)dJ$955?_AOms!9gia%)0E$Mp}$+0er@<
zq7J&_SzvShM?e%V?_zUu{niL@gt5UFOjFJUJ}L?$f%eU%jUSoujr{^O=?=^{19`ON
zlRIy8Uo_nqcPa6@yyz`CM?pMJ^^SN^Fqtt`GQ8Q#W4kE7`V9^LT}j#pMChl!j#g#J
zr-=CCaV%xyFeQ9SK+mG(cTwW*)xa(eK;_Z(jy)wo<nmrLjO|ztv*nplaAl0pOFIhc
zZe;A@?4xmZHrI(+Y#%y4JBydr1g6#IYFihmK+)HufuUTxq$8qVOdp3boOq1P;Wv@K
zwXG&kim4YnysqJGu(l+!DM|q?7$}thxr;l?%GuKali@m896TRH<j~86OHh|?hFiON
zoVTO2Q4vtq%AS1ZzYe5%=fvKeF$UDaWs%{qd@6uW$5nPva?M$)-R6sQz?-*9>Zp~>
zA(4}-&VH+TEeLzPTqw&FOoK(ZjD~m{KW05fiGLe@E3Z2`rLukIDahE*`u!ubU)9`o
zn^-lyht#E#-dt~S>}4y$-mSbR8{T@}22cn^refuQ08NjLOv?JiEWjyOnzk<^R5%gO
zhUH_B{oz~u#IYwVnUg8?3P*#DqD8#X;%q%HY**=I>>-S|!X*-!x1{^l#OnR56O>iD
zc;i;KS+t$koh)E3)w0<sr_&V$&&^jwvKZE>OjWJl_aW2;xF=9D9Kr>)(5}4FqUbk#
zI#$N8o0w;IChL49m9CJTzoC!|u{Ljd%ECgBOf$}&jA^$(V#P#~)`&g`H8E{uv52pp
zwto`xUL-L&WTAVREEm$0g_gYPL(^vHq(*t1WCH_6alhkeW&GCZ3hL)|{O-jiFOBrF
z!EW=Jej|dqQitT6!B-7&io2K)WIm~Q)v@yq%U|VpV+I?{y0@Yd%n8~-NuuM*pM~KA
z85YB};IS~M(c<}4Hxx>qRK0cdl&e?t253N%vefkgds>Ubn8X}j6Vpgs>a#nFq$osY
z1ZRwLqFv=+BTb=i%D2Wv>_yE0z}+n<tX7=B(@omRDE4?_eQVXQv?Hdp3mP%L7_)rJ
zceU9n0F0eAb5q_*CY^$%aws@y6mOF934p6R@I02AiG$kI%gnd`UPSCop=0b3KK$X-
zk-)b~vVG#IP{XT_WwHf9Y*n)4+*X%H1=HFzGgIreH<FzmQ(C#KDP;be%rXl#(zren
z3;Gheo^MEIift!$({sqVYci@r6Dj9mg`Hdp*Tg83DVhi6WX!_~b2|?rFE`d=h~~1X
z6i36B4#G%u>iZ4?rE|*a3d7^kndWGwnFqt+iZ(7+aln<}jzbAQ(#Z2SS}3S$%Bd}^
zc9ghB%O)Z_mTZMRC&H#)I#fiLuIkGa^`4e~9oM5zKPx?zjkC&Xy0~r{;S?FS%c7w<
zWbMpzc(xSw?9tGxG~_l}Acq}zjt5ClaB7-!vzqnlrX;}$#+PyQ9oU)_DfePh2E1<7
ztok6g6K^k^DuHR*iJ?jw?bs_whk|bx`dxu^nC6#e{1*m~z1eq7m}Cf$*^Eua(oi_I
zAL+3opNhJteu&mWQ@kQWPucm<ysMdVUPHbq+gV?rGqRHPp%uV!-l3=Q6r-oAMj1Uf
z?b8Zw!CdncfJ4Z*7>iP)4|nFG`b2tpC;h{-PI@`+h?9v=9mn|0R-n8#t=+Z*FD(c5
zjj79Jxkgck*DV=wpFgRZuwr%}KTm+dx?RT@aUHJdaX-ODh~gByS?WGx&czAkvkg;x
zrf92l8$Or_zOwJVwh>5rB`Q5_5}ef6DjS*$x30nZbuO3dijS*wvNEqTY5p1_A0gWr
znH<(Qvb!os14|R)n2Ost>jS2;d1zyLHu`Svm|&dZD<e=++}X$(_vT!eDWbK#-aOcb
zi(KgPl`rO!O(9j=^cVi}IJNF4xy!cZ^|4Qs?8*Y{23A~ZFVr#LH`z~t(_yzQt&2M^
z#F0(lV{PSkxR!@r$_LIxAwOO4D~UhYNt;i4b$LF+l)!<Mlhtrc{(+#www<UPw<{4h
zpfbM!C=Fd%YcqvBrKlm>+PpP{Bh>U&`Md;gRl64q;>{8MJJM$?UNUd`aC>BiLe>*{
zJY15->yW+<3rLgYeTruFDtk1ovU<$(_y7#HgUq>)r0{^}Xbth}V#6?%5jeFYt;SG^
z3qF)=uWRU;Jj)Q}cpY8-H+l_n$2$6{ZR?&*IGr{>ek!69ZH0ZoJ*Ji+ezzlJ^%qL3
zO5a`6gwFw(moEzqxh=yJ9M1FTn<T5L*i(<zj`a8@-`*Y*d1O*$5VlE~&#SB+H9}iw
zB3)>!eo&qD#y5AZXErHs%22?A+JmS&GIolml!)rZTnUDM3YgzYfT#;OXn)`PWv3Ta
z!-i|-Wojv*k&bC}_JJDjiAK(Ba|YZgUI{f}TdEOFT2+}nPmttytw7j%@bQZDV1vvj
z^rp{gRkCDmYJHGrE1~e~AE!-&6B6`7UxVQuvRrfdFkGX8H~SNP_X4<w;C2T`tyKC_
zi-<IDL>EodVd;lXd^>eV1jN+Tt4}Rsn)R0LxBz0c=NXU|pUe!MQQFkGBWbR3&(jLm
z%RSLc#p}5_dO{GD<NWe-r|=Q6-4PleiDwT(2|~KO8GT0gfR~)=qKWhs>=DEFr=Fc%
z85CBF>*t!6ugI?soX(*JNxBp+-DdZ4<rEK)&M`6wOoocN!#y@nw+fsyKHosdUZSs#
zY>X0LldiK}+WWGvXV(C(Ht|!3$psR=&c*HIM=BmX;pRIpz@Ale{9dhGe(U2|Giv;#
zOc|;?p67J=Q(kamB*aus=|XP|m{jN^6@V*Bpm?ye56Njh#vyJqE=DweC;?Rv7faX~
zde03n^I~0B2vUmr;w^X37tVxUK?4}ifsSH5_kpKZIzpYu0;Kv}SBGfI2AKNp+VN<s
z&%`{SSX=7`cuk&HSpr5=9(NBlPiF6=d$2k4+qBuZEtEp{q9rXkkSlz~m$@K5d@1sb
zV&-+U{A<aWf$z&7U9^^scEEAOgD13Kt{%E-i<cL-_`0>#z`nI{UNDRbo-wqa4NEls
zICRJpu)??cj^*WcZ^MAv+;bDbh~gpN$1Cor<{Y2oyIDws^JsfW^5AL$azE(T0p&pP
z1Mv~6Q44R&RHoH95&OuGx2srIr<@zYJTOMKiVs;Bx3py89I87LOb@%mr`0)#;7_~Z
zzcZj8?w=)>%5@HoCHE_&hnu(n_yQ-L(~VjpjjkbT7e)Dk5??fApg(d>vwLRJ-x{um
z*Nt?DqTSxh_MIyogY!vf1mU1`Gld-&L)*43f6dilz`Q@HEz;+>MDDYv9u!s;WXeao
zUq=TaL$P*IFgJzrGc>j1dDOd<P6obJsU?i;%~VO18%pw+u7Z7zDM{)mIn14~Q_iX3
zT{Tx9IMu^l8)U&uPF2B_@;$LfUzf<C;nO$|L9fQPGc5pM<ix6!$F5fSR4J=#3pL1>
zed+=ZBo?w4mr$2)Ya}?vedDopomhW1`#P<%YOJ_j=WwClX0xJH-<Xq=YwhDDH5<ir
z)fn*!W2|$oe({@J6>f@s?<R{WuTm{#vF3!6EowIp1Yl(A5Iq}el2(>^tmzs_j7t!k
zK@j^zS0Q|mM4tVP5Ram$VbS6|YDY&y?Q1r1joe9dj08#CM{RSMTU}(RCh`hp_Rkl-
zGd|C<M{UA`Ev@3>v~G@F{DLhCizAm9AN!^{rNs8hu!G@8RpnGx7e`-+K$ffN<0qjR
zGq^$dj_Tv!n*?zOSyk5skI7JVKJ)3jysnjIu-@VSzQiP8r6MzudCU=~?v-U8yzo^7
zGf~SUTvEp+S*!X9uX!sq=o}lH;r{pzk~M*VA(uyQ`3C8!{C;)&6)95fv(cK!%Cuz$
z_Zal57H6kPN>25KNiI6z6F)jzEkh#%OqU#-__Xzy)KyH};81#N6OfX$$IXWzOn`Q&
z4f$Z1t>)8&8PcYfEwY5UadU1yg+U*(1m2ZlHoC-!2?gB!!fLhmTl))D@dhvkx#+Yj
z1O=LV{(T%{^IeCuFK>%QR!VZ4GnO5t<M8oXd(Iwnd!%6;G4+b$sfV@nF>K8a+thWE
zg4VytZ<!+^Z3OxbQ{Q^NT}C^&{w?l_efsLU3K<LxNcF3In!jBW`E4P@@Q>rwcS?7^
zuZfhYnB8dwd%VLO?DK7pV5Wi<(`~DYqOXn8#jUIL^)12*Dbhk4GmL_E2`WX&iT16o
zk(t|hok(Y|v-wzn?4x34T)|+SfZP>fiq!><*%vnxGN~ypST-FtC+@TPv*vYv@iU!_
z@2gf|PrgQ?Ktf*9^CnJ(x*CtZVB8!OBfg0%!wL;Z8(tYYre0vcnPGlyCc$V(Ipl*P
z_(J!a=o@vp^%Efme!K74(Ke7A>Y}|sxV+JL^<EBm?s93Gk}89>aYa{~m%5#$$+R1?
zGaQhZTTX!#s#=Xtpegqero$RNt&`4xn3g$)=y*;=N=Qai)}~`xtxI<AZ4F;JTD<8R
zj!)c(h~W5ym&ztJHonI$wOw!ilm$MYm9Bza-hgQlyVgU%3gL7ZR{DGw;SC3(2jmN#
zEN0r*A}At(0W#Ah$kNBdq7}-SmKb}m?}0D&ayCSIp<(7rh{N(>_N*#MMCIq#HFifT
zz(-*m;pVH&+4bixL&Bbg)W5FN^bH87pAHp)<cHV|Z#UZzRmhx)v+J#b;z4`Q?k?-R
z?Mwe6>zPkWNMfTFqS=l~AC$3FX3kQUSh_C?-ZftyClgM)o_D7cX$RGlEYblux0jv5
zTr|i-I3@ZPCGheCl~BGhImF)K4!9@?pC(gi3ozX=a!|r1)LFxy_8c&wY0<^{2cm|P
zv6Y`QktY*;I)IUd5y3ne1CqpVanlY45z8hf4&$EUBnucDj16pDa4&GI&TArYhf*xh
zdj>*%APH8(h~c>o@l#%T>R$e>rwVx_WUB|~V`p^JHsg*y12lzj&zF}w6W09HwB2yb
z%Q~`es&(;7#*DUC_w-Dmt7|$*?TA_m;zB+-u{2;Bg{O}nV7G_@7~<)Bv8fH^G$<M*
z&d&;aLbJI7DA_i+KF+_Y*db5T=T0$Yb3d-`R$T@3wLZQCDrGFAM6Hy)P81(B7I-}^
zZ#X&{ChGm1hJg}`oiCWrMyeKG-CKZgKD^F(ua7wxm46IP%8KAiuDjGgHkpHlqY{44
z6u+EZH5*`-Tmv@0q-e$H7@qYxb=7lP*Uw9V-%F*BSf3gnl(tEHIo~UWGwgNM?yNh+
z4`DXIz*~q@Zt5=B?(4}yS%0CI2f?0DXy#?0A|S`Rsho0pv40`;)dJpwh<81-^iiuK
z%Vi?_s~)&i)z1SmPY1<XW`lTd<YCBKxgcl4zKk4DeAbUOOvIYr?)CoiY>XG8$(&{A
zwXJK5LRK%M34(t$&NI~MHT{UQ9qN-V_yn|%PqC81EIiSzmMM=2zb`mIwiP_b)x+2M
z7Gd`83h79j#SItpQ}luuf2uOU`my_rY5T{6P#BNlb%h%<#MZb=m@y5aW;#o1^<f$w
z=h?@HX|<iV!fmbN2X4(oxX(FwV@xQ6hBb_M4Z>2Z)SWo+b`y0gV^iRcZtz5!-05vF
z7wNo=hc6h4hc&s@uL^jqRvD6thVYtbErDK9k!;+a0xoE0WL7zLixjn5;$fXvT=O3I
zT6jI&^A7k6R{&5#lVjz#8%_RiAa2{di{`kx79K+j72$H(!ass|B%@l%KeeKchYLe_
z>!(JC2fxsv>XVen+Y42GeYPxMWqm`6F$(E<6^s|g(slNk!lL*6v^W2>f6hh^mE$s=
z3D$)}{V5(Qm&A6bp%2Q}*GZ5Qrf}n7*Hr51?bJOyA-?B4vg6y_EX<*-e20h{=0Mxs
zbuQGZ$fLyO5v$nQ&^kuH+mNq9O#MWSfThtH|0q1i!NrWj^S}_P;Q1OkYLW6U^?_7G
zx2wg?CULj7))QU(n{$0JE%1t2dWrMi2g-Os{v|8^wK{@qlj%+1b^?<vxdN3hhv>NI
z$}l2tjp0g>K3O+p%yK<9!XqmQ?E9>z&(|^Pi~aSRwI5x$jaA62GFz9%fmO3t3a>cq
zK8Xbv=5Ps~4mKN5+Eqw12(!PEyedFXv~VLxMB~HwT1Vfo51pQ#D8e$e4pFZ{&RC2P
z5gTIzl{3!&(tor^BwZfR8j4k{<RRDK>7Rq#`riKXP2O-Bh66#WWK2w=z;iD9GLl+3
zpHIaI4#lQ&S-xBK8PiQ%dwOh?%BO~DCo06pN7<^dnZCN@NzY{_Z1>rrB0U|nC&+!2
z2y!oBcTd2;@lzyk(B=TkyZ)zy0deK05*Q0zk+<m@@d`~L>o$@nun`VI1Er7pjq>8V
zNmlW{p7S^Btgb(TA}jL(uR>`0w8gHP^T~Sh5Tkip^spk4SBAhC{TZU}_Z)UJw-}zm
zPq{KBm!k)?P{`-(9?LFt&YN4s%SIZ-9lJ!Ws~B%exHOeVFk3~}HewnnH(d)qkLQ_d
z6h><vmhITb#1N_8X1Z(L5Z-Mt1QD-4--ZSQa|I2k|2yb`=kK=Y{xq2W9@z8ykeYTE
z(sLIxoB*Jf@`g}u$%PTp1k#3_<Y0()`Q@U-raX1Vot0=ZY_hD?M86FdNIhTjrJxZ+
zJ((diYOZbq`Uha?I6CglyX`fAgexzumMOh3N@)+6OQ*_0dT^VSFf_smVHDjg55<Jl
zH2Ozsu;$G}j>O)pEE{vbOVw}E+jdYC^wM+AAhaI(YAibUc@B#_mDss0Ji&BK{WG`4
zOk>vSNq(Bq2IB@s>>Rxm6Wv?h;Z<HWsJXErNyl(WAMS;TU3O?s5_Llui-|!JglEvo
z$E2mYL3+SPK!E!7%WQv?cHL*#*)*5PhS)J5GV09TI$ZnD5J-@RK1t0}*-9n4F=AJg
z@YsA@xfMsv#w~_vqJq-JmLhW#heOMgz)(!epQo{MZD5-(_n`&FvWL)jB4Ys1EdZfI
zoaBo@7-CroK$CL=LyAo`ptq!pX?Uo!KIaWj7|yHs%MYw!l&%tFp^xeV$e}_JqO0pN
zNxaGWM<%{B0&9iTjFXOdP?w#{jHX>Xkpb1l8u|+_qXWdC*jjcPCixq;!%BVPSp#hP
zqo`%cNf&YoQXHC$D=D45RiT|5ngPlh?0T~?lUf*O)){K@*Kbh?3RW1j9-T?%lDk@y
z4+~?wKI%Y!-=O|_IuKz|=)F;V7ps=5@g)RrE;;tvM$gUhG>jHcw2Hr@fS+k^Zr~>G
z^JvPrZc}_&d_kEsqAEMTMJw!!CBw)u&ZVzmq+ZworuaE&TT>$pYsd9|g9O^0orAe8
z221?Va!l1|Y5X1Y?<Q2k@C>{G7rt1sX#qFA^?RLG^VjoxPf63;AS=_mVDfGJKg73L
zsGdnTUD40y(>S##2l|W2Cy!H(@@5KBa(#gs`vlz}Y~$ot5VsqPQ{{YtjYFvIumZzt
zA{CcxZLJR|4<x-MAle2Nd|D%3<KvN6^~LMtrTQKT11XTUTsz-QKf89?*YA3bbocsv
z<tG;Y1lpf_{>#{j7k~Tu*jkwz8QA|5G1$Cl895R`<bW@zkRsPYS`N#4&EBxmd{@y_
z#&U+_?ao#Kwx+DC{AN!PZYAX?2(H1uQyF~p>Zyp;irp1{KN){kB<t|Lg})VytK%aH
zCJdJ3Re6v<r!FVDLBzZp{ZdlRHq_XzsY7pir9Q3LQAJ+IOOcz}u=>30O8P1W5;@bG
znvX74roeMmQlUi=v9Y%(wl$ZC#9tKNFpvi3!C}f1m6Ct|l2g%psc{TJp)@yu)*e2>
z((p0Fg*8gJ!|3WZke9;Z{8}&NRkv7iP=#_y-F}x^y?2m%-D_aj^)f04%mneyjo_;)
z6qc_Zu$q37d~X``*eP~Q>I2gg%rrV8v=kD<S$$Du%7)9vB5*3kar-m(rC|$tWLh`b
zcoxYH(*j~EVZ>fpp$=%Vj}hF)^dsSWygoN(A$g*E=Do6FX?&(@F#7pbiJ`;c0c@Ul
zDqW_90Wm#5f2L<(Lf3)3TeXtI7nhYwRm(F;*r_G6K@OPW4H(Y3O5SjUzBC}<?|Tm0
zRP=fu|E~4-g)9SuK=BRizYL2M|GU<InE379H^~Fl#JuQ1SzKoHfLmc9R0#Sg+k((d
zhN8HzM*VhCp<uO4>u3d|eQ8<Ba^oJ-NVK>*8d@?;zUPE+i#QNMn=r(ap?2SH@vo*m
z3HJ%XuG_S6;QbWy-l%qU;8x;>z>4pMW7>R}J%QLf%@1BY(4f_1iixd-6GlO7Vp*yU
zp{VU^3?s?90i=!#>H`lxT!q8rk>W_$2~kbpz7eV{3wR|8E=8**5?qn8#n`*(bt1<M
zlk{?%Mh@~#mQl*b5K-2c;P;AWttPx=rB~Os`<u!ZxgjvPCt_!HNidwq(fg-i3DKTv
z?L6K*ehZ#KPjHDJ5vWuMs>xRQrdGxyx2y%B$qmw#>ZV$c7%cO#%JM1lY$Y0q?Yuo>
ze9KdJoiM)RH*SB%^;TAdX-zEj<!({s>A7@%<k)#%bD2GjyYCHnZiy-B)zMUf<(h`v
z6r)G0@ahyae4&QsKnOdXX44T}#dpO3&z>y=!0=Zg%iWK7jVI9b&Dk}0$Af&08KHo+
zOwDhFvA(E|ER%a^cdh@<ajPmA)cO>^wLUlmIv6?_3=BvX8jKk92L=Y}7Jf5OGMfh`
zBdR1wFCi-i5@`9km{isRb0O%TX+f~)KNaEz{rXQa89`YIF;EN&gN)cigu6mNh>?Cm
zAO&Im2f<R$(FpJ-`ul}(ek!d0=fY-I4EB1j^=!?42}Ai4Ov$fceybC`ldYb$wUO<g
zK&64tq3)(3caC8H2^0c!zYlKgzjgZ=)Y{6D!P?degl}(VWcMrIfg+afSq6y0%GTsh
zmAd<vAKnHjOx?5bKT7CX>lv6D{jwm+y<%WsPe4!89n~KN|7}Cb{Z;XweER73r}Qp2
zz}WP4j}U0&(uD&9yGy6`!+_v-S(yG*iytsTR#x_Rc>=6u^vnRD<C6c)4)B{t?-8)?
z2xp^$Jh2LbWBGv&x&py@L2t$XBoHw&)^o717Xj%jSXk*9f+X>nf1gP{#2>`ffrAC%
zTZ5WQ@hAK;P;>kX{D)mIXe4%a5p=LO1xXH@8T?mz<Y5Jb+5IA|K_bV-ptS8wKUIJe
zlnC^nSKzO2&(G!zwE~2?4Em$~2^|XeSLpxo+h4=3W@$d22XziXgrHPgKfxm4{Q?%G
z%VMu*@t=&O4_)C$NxOUvdcQ3}ZB70YssJb-`Tul<w3Ug8k?mhs6vf)^y%wk;2SMIt
z{0TA~lmzU5Ldx8AZhs^KyL&|c8vK4Lb%CG2#X<ed{{(-jXKyNKXJ=%o5Ap<=w3UIL
zg@_sGZ7|b!_^&MWL*Lxb4hwR|e+&o?;QOase|;DCb0ywom;GTt@W&#*Kz{hV|CDR?
zVeRjyW&63CPz0%4{!dT+(E^|;%)=av4+-w4Lb=QC_QQbS(xBkbza#iL*V}K{|6?S+
zOQ!N)<5u|v_FZa~ht<5F`r%Hy{D%R-1O5)`?-Q#$B)c!64)XGU3<!Rp{x|jhLH18R
zCmzz?7ykbF9x-(OhW6gH^?#_fKP0;^T79P_{=<OaQ@a10?7<xQA<2E2*1JuC9|i;u
z)c@xs_t!HXGTaxL{JE(vP5wE<?}3@W5PyA0dtcd4@W)+&u0Zhg*Z()#-*55{J<Er5
z_cg!n<N|*f5Ihs`ujzgv9{7;=zJ8O^4^q$-2!3MwuX+EGzSzSW+?Sq^`l$w44*$9a
zzfz5QNPPc<|IaQree<u0f1z{nkoW$v>7Q@d)$3pL{{B!2{-v70L*o1AO+|n5beiw~
zk@(>m?T3{2k2c;NWc^`4@P&Z?BjxXJ@;x1qhn)9Mn*IFdt_J-dIqx5#d`NfyfX~m(
zIS~5)MfZ2Uy?_4W`47i}u0ZgPh<{D|w_d#;D}Q&U<c9&l@uL4V+pkZUJoNDWE$N@f
z811-!Oa0gLy!-3)KQq|o{SCvP*5?13;r>$Q-G}xM1A@1f{#%A$jh6Qp&0hQ<0bPOM
z-{1Wm&p%%#eb_?x7i;bo<bD_s{JQdQSRc-n@6B`mH1&W2ZKd3Ot1yB=qk@55R^R>l
EfAhh=DF6Tf

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 642d572ce..8dea6c227 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,3 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+wrapperVersion=3.3.4
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
diff --git a/mvnw b/mvnw
index 41c0f0c23..bd8896bf2 100755
--- a/mvnw
+++ b/mvnw
@@ -19,292 +19,277 @@
 # ----------------------------------------------------------------------------
 
 # ----------------------------------------------------------------------------
-# Maven Start Up Batch script
-#
-# Required ENV vars:
-# ------------------
-#   JAVA_HOME - location of a JDK home dir
+# Apache Maven Wrapper startup batch script, version 3.3.4
 #
 # Optional ENV vars
 # -----------------
-#   M2_HOME - location of maven2's installed home dir
-#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
-#     e.g. to debug Maven itself, use
-#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+#   JAVA_HOME - location of a JDK home dir, required when download maven via java source
+#   MVNW_REPOURL - repo url base for downloading maven distribution
+#   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+#   MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
 # ----------------------------------------------------------------------------
 
-if [ -z "$MAVEN_SKIP_RC" ] ; then
-
-  if [ -f /etc/mavenrc ] ; then
-    . /etc/mavenrc
-  fi
+set -euf
+[ "${MVNW_VERBOSE-}" != debug ] || set -x
 
-  if [ -f "$HOME/.mavenrc" ] ; then
-    . "$HOME/.mavenrc"
-  fi
+# OS specific support.
+native_path() { printf %s\\n "$1"; }
+case "$(uname)" in
+CYGWIN* | MINGW*)
+  [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
+  native_path() { cygpath --path --windows "$1"; }
+  ;;
+esac
 
-fi
+# set JAVACMD and JAVACCMD
+set_java_home() {
+  # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
+  if [ -n "${JAVA_HOME-}" ]; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ]; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+      JAVACCMD="$JAVA_HOME/jre/sh/javac"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+      JAVACCMD="$JAVA_HOME/bin/javac"
 
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-mingw=false
-case "`uname`" in
-  CYGWIN*) cygwin=true ;;
-  MINGW*) mingw=true;;
-  Darwin*) darwin=true
-    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
-    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
-    if [ -z "$JAVA_HOME" ]; then
-      if [ -x "/usr/libexec/java_home" ]; then
-        export JAVA_HOME="`/usr/libexec/java_home`"
-      else
-        export JAVA_HOME="/Library/Java/Home"
+      if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
+        echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
+        echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
+        return 1
       fi
     fi
-    ;;
-esac
-
-if [ -z "$JAVA_HOME" ] ; then
-  if [ -r /etc/gentoo-release ] ; then
-    JAVA_HOME=`java-config --jre-home`
+  else
+    JAVACMD="$(
+      'set' +e
+      'unset' -f command 2>/dev/null
+      'command' -v java
+    )" || :
+    JAVACCMD="$(
+      'set' +e
+      'unset' -f command 2>/dev/null
+      'command' -v javac
+    )" || :
+
+    if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
+      echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
+      return 1
+    fi
   fi
-fi
-
-if [ -z "$M2_HOME" ] ; then
-  ## resolve links - $0 may be a link to maven's home
-  PRG="$0"
+}
 
-  # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-      PRG="$link"
-    else
-      PRG="`dirname "$PRG"`/$link"
-    fi
+# hash string like Java String::hashCode
+hash_string() {
+  str="${1:-}" h=0
+  while [ -n "$str" ]; do
+    char="${str%"${str#?}"}"
+    h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
+    str="${str#?}"
   done
+  printf %x\\n $h
+}
 
-  saveddir=`pwd`
+verbose() { :; }
+[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
 
-  M2_HOME=`dirname "$PRG"`/..
+die() {
+  printf %s\\n "$1" >&2
+  exit 1
+}
 
-  # make it fully qualified
-  M2_HOME=`cd "$M2_HOME" && pwd`
+trim() {
+  # MWRAPPER-139:
+  #   Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
+  #   Needed for removing poorly interpreted newline sequences when running in more
+  #   exotic environments such as mingw bash on Windows.
+  printf "%s" "${1}" | tr -d '[:space:]'
+}
 
-  cd "$saveddir"
-  # echo Using m2 at $M2_HOME
-fi
+scriptDir="$(dirname "$0")"
+scriptName="$(basename "$0")"
+
+# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
+while IFS="=" read -r key value; do
+  case "${key-}" in
+  distributionUrl) distributionUrl=$(trim "${value-}") ;;
+  distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
+  esac
+done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties"
+[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+
+case "${distributionUrl##*/}" in
+maven-mvnd-*bin.*)
+  MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
+  case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
+  *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
+  :Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
+  :Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
+  :Linux*x86_64*) distributionPlatform=linux-amd64 ;;
+  *)
+    echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
+    distributionPlatform=linux-amd64
+    ;;
+  esac
+  distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
+  ;;
+maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
+*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
+esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --unix "$M2_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
+distributionUrlName="${distributionUrl##*/}"
+distributionUrlNameMain="${distributionUrlName%.*}"
+distributionUrlNameMain="${distributionUrlNameMain%-bin}"
+MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
+MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
+
+exec_maven() {
+  unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
+  exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
+}
 
-# For Mingw, ensure paths are in UNIX format before anything is touched
-if $mingw ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME="`(cd "$M2_HOME"; pwd)`"
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+if [ -d "$MAVEN_HOME" ]; then
+  verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+  exec_maven "$@"
 fi
 
-if [ -z "$JAVA_HOME" ]; then
-  javaExecutable="`which javac`"
-  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
-    # readlink(1) is not available as standard on Solaris 10.
-    readLink=`which readlink`
-    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
-      if $darwin ; then
-        javaHome="`dirname \"$javaExecutable\"`"
-        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
-      else
-        javaExecutable="`readlink -f \"$javaExecutable\"`"
-      fi
-      javaHome="`dirname \"$javaExecutable\"`"
-      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
-      JAVA_HOME="$javaHome"
-      export JAVA_HOME
-    fi
-  fi
-fi
+case "${distributionUrl-}" in
+*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
+*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
+esac
 
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-    fi
-  else
-    JAVACMD="`which java`"
-  fi
+# prepare tmp dir
+if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
+  clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
+  trap clean HUP INT TERM EXIT
+else
+  die "cannot create temp dir"
 fi
 
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly." >&2
-  echo "  We cannot execute $JAVACMD" >&2
-  exit 1
-fi
+mkdir -p -- "${MAVEN_HOME%/*}"
 
-if [ -z "$JAVA_HOME" ] ; then
-  echo "Warning: JAVA_HOME environment variable is not set."
+# Download and Install Apache Maven
+verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+verbose "Downloading from: $distributionUrl"
+verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+# select .zip or .tar.gz
+if ! command -v unzip >/dev/null; then
+  distributionUrl="${distributionUrl%.zip}.tar.gz"
+  distributionUrlName="${distributionUrl##*/}"
 fi
 
-CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+# verbose opt
+__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
+[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
 
-# traverses directory structure from process work directory to filesystem root
-# first directory with .mvn subdirectory is considered project base directory
-find_maven_basedir() {
+# normalize http auth
+case "${MVNW_PASSWORD:+has-password}" in
+'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+esac
 
-  if [ -z "$1" ]
-  then
-    echo "Path not specified to find_maven_basedir"
-    return 1
-  fi
+if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
+  verbose "Found wget ... using wget"
+  wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
+elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
+  verbose "Found curl ... using curl"
+  curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
+elif set_java_home; then
+  verbose "Falling back to use Java to download"
+  javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
+  targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
+  cat >"$javaSource" <<-END
+	public class Downloader extends java.net.Authenticator
+	{
+	  protected java.net.PasswordAuthentication getPasswordAuthentication()
+	  {
+	    return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
+	  }
+	  public static void main( String[] args ) throws Exception
+	  {
+	    setDefault( new Downloader() );
+	    java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
+	  }
+	}
+	END
+  # For Cygwin/MinGW, switch paths to Windows format before running javac and java
+  verbose " - Compiling Downloader.java ..."
+  "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
+  verbose " - Running Downloader.java ..."
+  "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
+fi
 
-  basedir="$1"
-  wdir="$1"
-  while [ "$wdir" != '/' ] ; do
-    if [ -d "$wdir"/.mvn ] ; then
-      basedir=$wdir
-      break
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+if [ -n "${distributionSha256Sum-}" ]; then
+  distributionSha256Result=false
+  if [ "$MVN_CMD" = mvnd.sh ]; then
+    echo "Checksum validation is not supported for maven-mvnd." >&2
+    echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+    exit 1
+  elif command -v sha256sum >/dev/null; then
+    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then
+      distributionSha256Result=true
     fi
-    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
-    if [ -d "${wdir}" ]; then
-      wdir=`cd "$wdir/.."; pwd`
+  elif command -v shasum >/dev/null; then
+    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
+      distributionSha256Result=true
     fi
-    # end of workaround
-  done
-  echo "${basedir}"
-}
-
-# concatenates all lines of a file
-concat_lines() {
-  if [ -f "$1" ]; then
-    echo "$(tr -s '\n' ' ' < "$1")"
+  else
+    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
+    echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+    exit 1
+  fi
+  if [ $distributionSha256Result = false ]; then
+    echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
+    echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
+    exit 1
   fi
-}
-
-BASE_DIR=`find_maven_basedir "$(pwd)"`
-if [ -z "$BASE_DIR" ]; then
-  exit 1;
 fi
 
-##########################################################################################
-# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-# This allows using the maven wrapper in projects that prohibit checking in binary data.
-##########################################################################################
-if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Found .mvn/wrapper/maven-wrapper.jar"
-    fi
+# unzip and move
+if command -v unzip >/dev/null; then
+  unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
 else
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
-    fi
-    if [ -n "$MVNW_REPOURL" ]; then
-      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-    else
-      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-    fi
-    while IFS="=" read key value; do
-      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
-      esac
-    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Downloading from: $jarUrl"
-    fi
-    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
-    if $cygwin; then
-      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
-    fi
+  tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
+fi
 
-    if command -v wget > /dev/null; then
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found wget ... using wget"
-        fi
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            wget "$jarUrl" -O "$wrapperJarPath"
-        else
-            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
-        fi
-    elif command -v curl > /dev/null; then
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found curl ... using curl"
-        fi
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            curl -o "$wrapperJarPath" "$jarUrl" -f
-        else
-            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
-        fi
+# Find the actual extracted directory name (handles snapshots where filename != directory name)
+actualDistributionDir=""
 
-    else
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Falling back to using Java to download"
-        fi
-        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
-        # For Cygwin, switch paths to Windows format before running javac
-        if $cygwin; then
-          javaClass=`cygpath --path --windows "$javaClass"`
-        fi
-        if [ -e "$javaClass" ]; then
-            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Compiling MavenWrapperDownloader.java ..."
-                fi
-                # Compiling the Java class
-                ("$JAVA_HOME/bin/javac" "$javaClass")
-            fi
-            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-                # Running the downloader
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Running MavenWrapperDownloader.java ..."
-                fi
-                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
-            fi
-        fi
-    fi
+# First try the expected directory name (for regular distributions)
+if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then
+  if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then
+    actualDistributionDir="$distributionUrlNameMain"
+  fi
 fi
-##########################################################################################
-# End of extension
-##########################################################################################
 
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
-if [ "$MVNW_VERBOSE" = true ]; then
-  echo $MAVEN_PROJECTBASEDIR
-fi
-MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --path --windows "$M2_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
-  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
-    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+# If not found, search for any directory with the Maven executable (for snapshots)
+if [ -z "$actualDistributionDir" ]; then
+  # enable globbing to iterate over items
+  set +f
+  for dir in "$TMP_DOWNLOAD_DIR"/*; do
+    if [ -d "$dir" ]; then
+      if [ -f "$dir/bin/$MVN_CMD" ]; then
+        actualDistributionDir="$(basename "$dir")"
+        break
+      fi
+    fi
+  done
+  set -f
 fi
 
-# Provide a "standardized" way to retrieve the CLI args that will
-# work with both Windows and non-Windows executions.
-MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
-export MAVEN_CMD_LINE_ARGS
+if [ -z "$actualDistributionDir" ]; then
+  verbose "Contents of $TMP_DOWNLOAD_DIR:"
+  verbose "$(ls -la "$TMP_DOWNLOAD_DIR")"
+  die "Could not find Maven distribution directory in extracted archive"
+fi
 
-WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+verbose "Found extracted Maven distribution directory: $actualDistributionDir"
+printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url"
+mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
 
-exec "$JAVACMD" \
-  $MAVEN_OPTS \
-  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
+clean || :
+exec_maven "$@"
diff --git a/mvnw.cmd b/mvnw.cmd
index 86115719e..92450f932 100644
--- a/mvnw.cmd
+++ b/mvnw.cmd
@@ -1,3 +1,4 @@
+<# : batch portion
 @REM ----------------------------------------------------------------------------
 @REM Licensed to the Apache Software Foundation (ASF) under one
 @REM or more contributor license agreements.  See the NOTICE file
@@ -18,165 +19,171 @@
 @REM ----------------------------------------------------------------------------
 
 @REM ----------------------------------------------------------------------------
-@REM Maven Start Up Batch script
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
+@REM Apache Maven Wrapper startup batch script, version 3.3.4
 @REM
 @REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM     e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM   MVNW_REPOURL - repo url base for downloading maven distribution
+@REM   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+@REM   MVNW_VERBOSE - true: enable verbose log; others: silence the output
 @REM ----------------------------------------------------------------------------
 
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM set title of command window
-title %0
-@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-
-FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
-    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
-)
-
-@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
-if exist %WRAPPER_JAR% (
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Found %WRAPPER_JAR%
-    )
-) else (
-    if not "%MVNW_REPOURL%" == "" (
-        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-    )
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Couldn't find %WRAPPER_JAR%, downloading it ...
-        echo Downloading from: %DOWNLOAD_URL%
-    )
-
-    powershell -Command "&{"^
-		"$webclient = new-object System.Net.WebClient;"^
-		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
-		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
-		"}"^
-		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
-		"}"
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Finished downloading %WRAPPER_JAR%
-    )
+@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
+@SET __MVNW_CMD__=
+@SET __MVNW_ERROR__=
+@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
+@SET PSModulePath=
+@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
+  IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
 )
-@REM End of extension
-
-@REM Provide a "standardized" way to retrieve the CLI args that will
-@REM work with both Windows and non-Windows executions.
-set MAVEN_CMD_LINE_ARGS=%*
-
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
-
-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
-
-exit /B %ERROR_CODE%
+@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
+@SET __MVNW_PSMODULEP_SAVE=
+@SET __MVNW_ARG0_NAME__=
+@SET MVNW_USERNAME=
+@SET MVNW_PASSWORD=
+@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*)
+@echo Cannot start maven from wrapper >&2 && exit /b 1
+@GOTO :EOF
+: end batch / begin powershell #>
+
+$ErrorActionPreference = "Stop"
+if ($env:MVNW_VERBOSE -eq "true") {
+  $VerbosePreference = "Continue"
+}
+
+# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
+$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
+if (!$distributionUrl) {
+  Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+}
+
+switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
+  "maven-mvnd-*" {
+    $USE_MVND = $true
+    $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
+    $MVN_CMD = "mvnd.cmd"
+    break
+  }
+  default {
+    $USE_MVND = $false
+    $MVN_CMD = $script -replace '^mvnw','mvn'
+    break
+  }
+}
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+if ($env:MVNW_REPOURL) {
+  $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" }
+  $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')"
+}
+$distributionUrlName = $distributionUrl -replace '^.*/',''
+$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
+
+$MAVEN_M2_PATH = "$HOME/.m2"
+if ($env:MAVEN_USER_HOME) {
+  $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME"
+}
+
+if (-not (Test-Path -Path $MAVEN_M2_PATH)) {
+    New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null
+}
+
+$MAVEN_WRAPPER_DISTS = $null
+if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) {
+  $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists"
+} else {
+  $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists"
+}
+
+$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain"
+$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
+$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
+
+if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
+  Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+  Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
+  exit $?
+}
+
+if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
+  Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
+}
+
+# prepare tmp dir
+$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
+$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
+$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
+trap {
+  if ($TMP_DOWNLOAD_DIR.Exists) {
+    try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+    catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+  }
+}
+
+New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
+
+# Download and Install Apache Maven
+Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+Write-Verbose "Downloading from: $distributionUrl"
+Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+$webclient = New-Object System.Net.WebClient
+if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
+  $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
+}
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
+if ($distributionSha256Sum) {
+  if ($USE_MVND) {
+    Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
+  }
+  Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
+  if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
+    Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
+  }
+}
+
+# unzip and move
+Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
+
+# Find the actual extracted directory name (handles snapshots where filename != directory name)
+$actualDistributionDir = ""
+
+# First try the expected directory name (for regular distributions)
+$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain"
+$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD"
+if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) {
+  $actualDistributionDir = $distributionUrlNameMain
+}
+
+# If not found, search for any directory with the Maven executable (for snapshots)
+if (!$actualDistributionDir) {
+  Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object {
+    $testPath = Join-Path $_.FullName "bin/$MVN_CMD"
+    if (Test-Path -Path $testPath -PathType Leaf) {
+      $actualDistributionDir = $_.Name
+    }
+  }
+}
+
+if (!$actualDistributionDir) {
+  Write-Error "Could not find Maven distribution directory in extracted archive"
+}
+
+Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir"
+Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null
+try {
+  Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
+} catch {
+  if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
+    Write-Error "fail to move MAVEN_HOME"
+  }
+} finally {
+  try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+  catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+}
+
+Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"

From c7f0c0b394ac314312d17e8158469bab23e49f4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Fri, 6 Mar 2026 16:00:26 -0600
Subject: [PATCH 1259/1272] Add support to get the history of an image (#2592)

---
 .../github/dockerjava/api/DockerClient.java   |  3 +
 .../dockerjava/api/DockerClientDelegate.java  |  6 ++
 .../DelegatingDockerCmdExecFactory.java       |  5 +
 .../api/command/DockerCmdExecFactory.java     |  2 +
 .../api/command/ImageHistoryCmd.java          | 31 ++++++
 .../dockerjava/api/model/ImageHistory.java    | 97 +++++++++++++++++++
 .../core/AbstractDockerCmdExecFactory.java    |  7 ++
 .../dockerjava/core/DockerClientImpl.java     |  7 ++
 .../core/command/ImageHistoryCmdImpl.java     | 42 ++++++++
 .../core/exec/ImageHistoryCmdExec.java        | 35 +++++++
 .../api/model/ImageHistoryTest.java           | 90 +++++++++++++++++
 .../dockerjava/cmd/ImageHistoryCmdIT.java     | 29 ++++++
 .../samples/1.22/images/history/history.json  | 32 ++++++
 13 files changed, 386 insertions(+)
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/ImageHistoryCmd.java
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageHistory.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/command/ImageHistoryCmdImpl.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/exec/ImageHistoryCmdExec.java
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/api/model/ImageHistoryTest.java
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/ImageHistoryCmdIT.java
 create mode 100644 docker-java/src/test/resources/samples/1.22/images/history/history.json

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
index e5f57e1bb..441decad3 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -26,6 +26,7 @@
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.ImageHistoryCmd;
 import com.github.dockerjava.api.command.InspectNetworkCmd;
 import com.github.dockerjava.api.command.InspectServiceCmd;
 import com.github.dockerjava.api.command.InspectSwarmCmd;
@@ -142,6 +143,8 @@ public interface DockerClient extends Closeable {
 
     InspectImageCmd inspectImageCmd(@Nonnull String imageId);
 
+    ImageHistoryCmd imageHistoryCmd(@Nonnull String imageId);
+
     /**
      * @param name
      *            The name, e.g. "alexec/busybox" or just "busybox" if you want to default. Not null.
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java
index 5de64641f..fe1f72670 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java
@@ -26,6 +26,7 @@
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.ImageHistoryCmd;
 import com.github.dockerjava.api.command.InspectNetworkCmd;
 import com.github.dockerjava.api.command.InspectServiceCmd;
 import com.github.dockerjava.api.command.InspectSwarmCmd;
@@ -179,6 +180,11 @@ public InspectImageCmd inspectImageCmd(@Nonnull String imageId) {
         return getDockerClient().inspectImageCmd(imageId);
     }
 
+    @Override
+    public ImageHistoryCmd imageHistoryCmd(@Nonnull String imageId) {
+        return getDockerClient().imageHistoryCmd(imageId);
+    }
+
     @Override
     public SaveImageCmd saveImageCmd(@Nonnull String name) {
         return getDockerClient().saveImageCmd(name);
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java
index 161ff2c29..8f102a10e 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java
@@ -100,6 +100,11 @@ public InspectImageCmd.Exec createInspectImageCmdExec() {
         return getDockerCmdExecFactory().createInspectImageCmdExec();
     }
 
+    @Override
+    public ImageHistoryCmd.Exec createImageHistoryCmdExec() {
+        return getDockerCmdExecFactory().createImageHistoryCmdExec();
+    }
+
     @Override
     public ListContainersCmd.Exec createListContainersCmdExec() {
         return getDockerCmdExecFactory().createListContainersCmdExec();
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index cedf6d40d..29c001737 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -37,6 +37,8 @@ public interface DockerCmdExecFactory extends Closeable {
 
     InspectImageCmd.Exec createInspectImageCmdExec();
 
+    ImageHistoryCmd.Exec createImageHistoryCmdExec();
+
     ListContainersCmd.Exec createListContainersCmdExec();
 
     CreateContainerCmd.Exec createCreateContainerCmdExec();
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ImageHistoryCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ImageHistoryCmd.java
new file mode 100644
index 000000000..d93796ad2
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ImageHistoryCmd.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.api.command;
+
+import java.util.List;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.ImageHistory;
+
+/**
+ * Get the history of an image.
+ */
+public interface ImageHistoryCmd extends SyncDockerCmd<List<ImageHistory>> {
+
+    @CheckForNull
+    String getImageId();
+
+    ImageHistoryCmd withImageId(@Nonnull String imageId);
+
+    /**
+     * @throws NotFoundException
+     *             No such image
+     */
+    @Override
+    List<ImageHistory> exec() throws NotFoundException;
+
+    interface Exec extends DockerCmdSyncExec<ImageHistoryCmd, List<ImageHistory>> {
+    }
+
+}
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageHistory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageHistory.java
new file mode 100644
index 000000000..fb8f5d95c
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ImageHistory.java
@@ -0,0 +1,97 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.annotation.CheckForNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Represents an individual image layer information in response to the ImageHistory operation.
+ */
+@EqualsAndHashCode
+@ToString
+public class ImageHistory extends DockerObject implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("Id")
+    private String id;
+
+    @JsonProperty("Created")
+    private Long created;
+
+    @JsonProperty("CreatedBy")
+    private String createdBy;
+
+    @JsonProperty("Tags")
+    private List<String> tags;
+
+    @JsonProperty("Size")
+    private Long size;
+
+    @JsonProperty("Comment")
+    private String comment;
+
+    @CheckForNull
+    public String getId() {
+        return id;
+    }
+
+    public ImageHistory withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    @CheckForNull
+    public Long getCreated() {
+        return created;
+    }
+
+    public ImageHistory withCreated(Long created) {
+        this.created = created;
+        return this;
+    }
+
+    @CheckForNull
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public ImageHistory withCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+        return this;
+    }
+
+    @CheckForNull
+    public List<String> getTags() {
+        return tags;
+    }
+
+    public ImageHistory withTags(List<String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
+    @CheckForNull
+    public Long getSize() {
+        return size;
+    }
+
+    public ImageHistory withSize(Long size) {
+        this.size = size;
+        return this;
+    }
+
+    @CheckForNull
+    public String getComment() {
+        return comment;
+    }
+
+    public ImageHistory withComment(String comment) {
+        this.comment = comment;
+        return this;
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
index e04ab8e3e..5b908dff4 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
@@ -29,6 +29,7 @@
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.ImageHistoryCmd;
 import com.github.dockerjava.api.command.InspectNetworkCmd;
 import com.github.dockerjava.api.command.InspectServiceCmd;
 import com.github.dockerjava.api.command.InspectSwarmCmd;
@@ -113,6 +114,7 @@
 import com.github.dockerjava.core.exec.InspectContainerCmdExec;
 import com.github.dockerjava.core.exec.InspectExecCmdExec;
 import com.github.dockerjava.core.exec.InspectImageCmdExec;
+import com.github.dockerjava.core.exec.ImageHistoryCmdExec;
 import com.github.dockerjava.core.exec.InspectNetworkCmdExec;
 import com.github.dockerjava.core.exec.InspectServiceCmdExec;
 import com.github.dockerjava.core.exec.InspectSwarmCmdExec;
@@ -281,6 +283,11 @@ public InspectImageCmd.Exec createInspectImageCmdExec() {
         return new InspectImageCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public ImageHistoryCmd.Exec createImageHistoryCmdExec() {
+        return new ImageHistoryCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public ListContainersCmd.Exec createListContainersCmdExec() {
         return new ListContainersCmdExec(getBaseResource(), getDockerClientConfig());
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 55f530057..b17c1b481 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -28,6 +28,7 @@
 import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectExecCmd;
 import com.github.dockerjava.api.command.InspectImageCmd;
+import com.github.dockerjava.api.command.ImageHistoryCmd;
 import com.github.dockerjava.api.command.InspectNetworkCmd;
 import com.github.dockerjava.api.command.InspectServiceCmd;
 import com.github.dockerjava.api.command.InspectSwarmCmd;
@@ -113,6 +114,7 @@
 import com.github.dockerjava.core.command.InspectContainerCmdImpl;
 import com.github.dockerjava.core.command.InspectExecCmdImpl;
 import com.github.dockerjava.core.command.InspectImageCmdImpl;
+import com.github.dockerjava.core.command.ImageHistoryCmdImpl;
 import com.github.dockerjava.core.command.InspectServiceCmdImpl;
 import com.github.dockerjava.core.command.InspectSwarmCmdImpl;
 import com.github.dockerjava.core.command.InspectVolumeCmdImpl;
@@ -375,6 +377,11 @@ public InspectImageCmd inspectImageCmd(String imageId) {
         return new InspectImageCmdImpl(getDockerCmdExecFactory().createInspectImageCmdExec(), imageId);
     }
 
+    @Override
+    public ImageHistoryCmd imageHistoryCmd(String imageId) {
+        return new ImageHistoryCmdImpl(getDockerCmdExecFactory().createImageHistoryCmdExec(), imageId);
+    }
+
     /**
      * * CONTAINER API *
      */
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ImageHistoryCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ImageHistoryCmdImpl.java
new file mode 100644
index 000000000..fafbd8da1
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ImageHistoryCmdImpl.java
@@ -0,0 +1,42 @@
+package com.github.dockerjava.core.command;
+
+import java.util.List;
+import java.util.Objects;
+
+import com.github.dockerjava.api.command.ImageHistoryCmd;
+import com.github.dockerjava.api.exception.NotFoundException;
+import com.github.dockerjava.api.model.ImageHistory;
+
+/**
+ * Get the history of an image.
+ */
+public class ImageHistoryCmdImpl extends AbstrDockerCmd<ImageHistoryCmd, List<ImageHistory>> implements
+        ImageHistoryCmd {
+
+    private String imageId;
+
+    public ImageHistoryCmdImpl(ImageHistoryCmd.Exec exec, String imageId) {
+        super(exec);
+        withImageId(imageId);
+    }
+
+    @Override
+    public String getImageId() {
+        return imageId;
+    }
+
+    @Override
+    public ImageHistoryCmd withImageId(String imageId) {
+        this.imageId = Objects.requireNonNull(imageId, "imageId was not specified");
+        return this;
+    }
+
+    /**
+     * @throws NotFoundException
+     *             No such image
+     */
+    @Override
+    public List<ImageHistory> exec() throws NotFoundException {
+        return super.exec();
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ImageHistoryCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ImageHistoryCmdExec.java
new file mode 100644
index 000000000..8ba2a066d
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ImageHistoryCmdExec.java
@@ -0,0 +1,35 @@
+package com.github.dockerjava.core.exec;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.ImageHistoryCmd;
+import com.github.dockerjava.api.model.ImageHistory;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
+
+public class ImageHistoryCmdExec extends AbstrSyncDockerCmdExec<ImageHistoryCmd, List<ImageHistory>> implements
+        ImageHistoryCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ImageHistoryCmdExec.class);
+
+    public ImageHistoryCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected List<ImageHistory> execute(ImageHistoryCmd command) {
+        WebTarget webResource = getBaseResource().path("/images/{id}/history").resolveTemplate("id",
+                command.getImageId());
+
+        LOGGER.trace("GET: {}", webResource);
+
+        return webResource.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<List<ImageHistory>>() {
+        });
+    }
+
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/ImageHistoryTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/ImageHistoryTest.java
new file mode 100644
index 000000000..8f18facf0
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/ImageHistoryTest.java
@@ -0,0 +1,90 @@
+package com.github.dockerjava.api.model;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.test.serdes.JSONSamples;
+import com.github.dockerjava.test.serdes.JSONTestHelper;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static com.github.dockerjava.core.RemoteApiVersion.VERSION_1_22;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+
+public class ImageHistoryTest {
+
+    @Test
+    public void serderJson() throws IOException {
+        final List<ImageHistory> history = JSONTestHelper.getMapper().readValue(
+                JSONSamples.getSampleContent(VERSION_1_22, "images/history/history.json"),
+                new TypeReference<List<ImageHistory>>() {
+                }
+        );
+
+        assertThat(history, notNullValue());
+        assertThat(history, hasSize(3));
+
+        final ImageHistory first = history.get(0);
+        assertThat(first.getId(), is("3db9c44f45209632d6050b35958829c3a2aa256d81b9a7be45b362ff85c54710"));
+        assertThat(first.getCreated(), is(1398108230L));
+        assertThat(first.getCreatedBy(), is("/bin/sh -c #(nop) ADD file:eb15dbd63394e063b805a3c32ca7bf0266ef64676d5a6fab4801f2e81e2a5148 in /"));
+        assertThat(first.getTags(), hasSize(2));
+        assertThat(first.getTags(), contains("ubuntu:lucid", "ubuntu:10.04"));
+        assertThat(first.getSize(), is(182964289L));
+        assertThat(first.getComment(), is(""));
+
+        final ImageHistory second = history.get(1);
+        assertThat(second.getId(), is("6cfa4d1f33fb861d4d114f43b25abd0ac737509268065cdfd69d544a59c85ab8"));
+        assertThat(second.getCreated(), is(1398108222L));
+        assertThat(second.getTags(), empty());
+        assertThat(second.getSize(), is(0L));
+
+        final ImageHistory third = history.get(2);
+        assertThat(third.getId(), is("511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158"));
+        assertThat(third.getCreated(), is(1371157430L));
+        assertThat(third.getCreatedBy(), is(""));
+        assertThat(third.getTags(), contains("scratch12:latest", "scratch:latest"));
+        assertThat(third.getSize(), is(0L));
+        assertThat(third.getComment(), is("Imported from -"));
+
+        // Test round-trip serialization
+        final String serialized = JSONTestHelper.getMapper().writeValueAsString(history);
+        final List<ImageHistory> deserialized = JSONTestHelper.getMapper().readValue(
+                serialized,
+                new TypeReference<List<ImageHistory>>() {
+                }
+        );
+        assertThat(deserialized, hasSize(3));
+        assertThat(deserialized.get(0).getId(), is(first.getId()));
+        assertThat(deserialized.get(0).getCreated(), is(first.getCreated()));
+        assertThat(deserialized.get(0).getCreatedBy(), is(first.getCreatedBy()));
+        assertThat(deserialized.get(0).getTags(), is(first.getTags()));
+        assertThat(deserialized.get(0).getSize(), is(first.getSize()));
+        assertThat(deserialized.get(0).getComment(), is(first.getComment()));
+    }
+
+    @Test
+    public void builderPattern() {
+        final ImageHistory history = new ImageHistory()
+                .withId("abc123")
+                .withCreated(1234567890L)
+                .withCreatedBy("/bin/sh -c echo hello")
+                .withTags(Arrays.asList("myimage:latest"))
+                .withSize(1024L)
+                .withComment("test comment");
+
+        assertThat(history.getId(), is("abc123"));
+        assertThat(history.getCreated(), is(1234567890L));
+        assertThat(history.getCreatedBy(), is("/bin/sh -c echo hello"));
+        assertThat(history.getTags(), contains("myimage:latest"));
+        assertThat(history.getSize(), is(1024L));
+        assertThat(history.getComment(), is("test comment"));
+    }
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ImageHistoryCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ImageHistoryCmdIT.java
new file mode 100644
index 000000000..16ae7e6a2
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ImageHistoryCmdIT.java
@@ -0,0 +1,29 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.model.ImageHistory;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.notNullValue;
+
+public class ImageHistoryCmdIT extends CmdIT {
+
+    @Test
+    public void imageHistory() {
+        List<ImageHistory> history = dockerRule.getClient().imageHistoryCmd("busybox").exec();
+
+        assertThat(history, notNullValue());
+        assertThat(history, hasSize(greaterThan(0)));
+
+        ImageHistory entry = history.get(0);
+        assertThat(entry.getId(), notNullValue());
+        assertThat(entry.getCreated(), notNullValue());
+        assertThat(entry.getCreatedBy(), notNullValue());
+        assertThat(entry.getSize(), notNullValue());
+        assertThat(entry.getComment(), notNullValue());
+    }
+}
diff --git a/docker-java/src/test/resources/samples/1.22/images/history/history.json b/docker-java/src/test/resources/samples/1.22/images/history/history.json
new file mode 100644
index 000000000..a38da2d8f
--- /dev/null
+++ b/docker-java/src/test/resources/samples/1.22/images/history/history.json
@@ -0,0 +1,32 @@
+[
+  {
+    "Id": "3db9c44f45209632d6050b35958829c3a2aa256d81b9a7be45b362ff85c54710",
+    "Created": 1398108230,
+    "CreatedBy": "/bin/sh -c #(nop) ADD file:eb15dbd63394e063b805a3c32ca7bf0266ef64676d5a6fab4801f2e81e2a5148 in /",
+    "Tags": [
+      "ubuntu:lucid",
+      "ubuntu:10.04"
+    ],
+    "Size": 182964289,
+    "Comment": ""
+  },
+  {
+    "Id": "6cfa4d1f33fb861d4d114f43b25abd0ac737509268065cdfd69d544a59c85ab8",
+    "Created": 1398108222,
+    "CreatedBy": "/bin/sh -c #(nop) MAINTAINER Tianon Gravi <admwiggin@gmail.com> - mkimage-debootstrap.sh -i iproute,iputils-ping,ubuntu-minimal -t lucid.tar.xz lucid http://archive.ubuntu.com/ubuntu/",
+    "Tags": [],
+    "Size": 0,
+    "Comment": ""
+  },
+  {
+    "Id": "511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158",
+    "Created": 1371157430,
+    "CreatedBy": "",
+    "Tags": [
+      "scratch12:latest",
+      "scratch:latest"
+    ],
+    "Size": 0,
+    "Comment": "Imported from -"
+  }
+]

From a3cb696a3f9d20a726a777cc3fa817820164e23b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 18 Mar 2026 11:34:45 -0600
Subject: [PATCH 1260/1272] Add support to export container (#2594)

Fixes #2319
---
 .../github/dockerjava/api/DockerClient.java   | 10 ++++
 .../dockerjava/api/DockerClientDelegate.java  |  6 +++
 .../DelegatingDockerCmdExecFactory.java       |  5 ++
 .../api/command/DockerCmdExecFactory.java     |  2 +
 .../api/command/ExportContainerCmd.java       | 31 +++++++++++
 .../core/AbstractDockerCmdExecFactory.java    |  7 +++
 .../dockerjava/core/DockerClientImpl.java     |  7 +++
 .../core/command/ExportContainerCmdImpl.java  | 41 +++++++++++++++
 .../core/exec/ExportContainerCmdExec.java     | 31 +++++++++++
 .../dockerjava/cmd/ExportContainerCmdIT.java  | 52 +++++++++++++++++++
 10 files changed, 192 insertions(+)
 create mode 100644 docker-java-api/src/main/java/com/github/dockerjava/api/command/ExportContainerCmd.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/command/ExportContainerCmdImpl.java
 create mode 100644 docker-java-core/src/main/java/com/github/dockerjava/core/exec/ExportContainerCmdExec.java
 create mode 100644 docker-java/src/test/java/com/github/dockerjava/cmd/ExportContainerCmdIT.java

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
index 441decad3..bf6acdee0 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
@@ -6,6 +6,7 @@
 import com.github.dockerjava.api.command.CommitCmd;
 import com.github.dockerjava.api.command.ConnectToNetworkCmd;
 import com.github.dockerjava.api.command.ContainerDiffCmd;
+import com.github.dockerjava.api.command.ExportContainerCmd;
 import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
 import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
@@ -233,6 +234,15 @@ public interface DockerClient extends Closeable {
 
     ContainerDiffCmd containerDiffCmd(@Nonnull String containerId);
 
+    /**
+     * Export the contents of a container's filesystem as a tar archive.
+     *
+     * @param containerId
+     *            id of the container
+     * @return created command
+     */
+    ExportContainerCmd exportContainerCmd(@Nonnull String containerId);
+
     StopContainerCmd stopContainerCmd(@Nonnull String containerId);
 
     KillContainerCmd killContainerCmd(@Nonnull String containerId);
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java
index fe1f72670..da600bd4d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClientDelegate.java
@@ -6,6 +6,7 @@
 import com.github.dockerjava.api.command.CommitCmd;
 import com.github.dockerjava.api.command.ConnectToNetworkCmd;
 import com.github.dockerjava.api.command.ContainerDiffCmd;
+import com.github.dockerjava.api.command.ExportContainerCmd;
 import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
 import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
@@ -276,6 +277,11 @@ public ContainerDiffCmd containerDiffCmd(@Nonnull String containerId) {
         return getDockerClient().containerDiffCmd(containerId);
     }
 
+    @Override
+    public ExportContainerCmd exportContainerCmd(@Nonnull String containerId) {
+        return getDockerClient().exportContainerCmd(containerId);
+    }
+
     @Override
     public StopContainerCmd stopContainerCmd(@Nonnull String containerId) {
         return getDockerClient().stopContainerCmd(containerId);
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java
index 8f102a10e..d7cdd97a9 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DelegatingDockerCmdExecFactory.java
@@ -180,6 +180,11 @@ public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
         return getDockerCmdExecFactory().createContainerDiffCmdExec();
     }
 
+    @Override
+    public ExportContainerCmd.Exec createExportContainerCmdExec() {
+        return getDockerCmdExecFactory().createExportContainerCmdExec();
+    }
+
     @Override
     public KillContainerCmd.Exec createKillContainerCmdExec() {
         return getDockerCmdExecFactory().createKillContainerCmdExec();
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
index 29c001737..bdf39269d 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
@@ -73,6 +73,8 @@ public interface DockerCmdExecFactory extends Closeable {
 
     ContainerDiffCmd.Exec createContainerDiffCmdExec();
 
+    ExportContainerCmd.Exec createExportContainerCmdExec();
+
     KillContainerCmd.Exec createKillContainerCmdExec();
 
     UpdateContainerCmd.Exec createUpdateContainerCmdExec();
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExportContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExportContainerCmd.java
new file mode 100644
index 000000000..bef73d261
--- /dev/null
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExportContainerCmd.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.api.command;
+
+import java.io.InputStream;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+import com.github.dockerjava.api.exception.NotFoundException;
+
+/**
+ * Export the contents of a container as a tar archive.
+ */
+public interface ExportContainerCmd extends SyncDockerCmd<InputStream> {
+
+    @CheckForNull
+    String getContainerId();
+
+    ExportContainerCmd withContainerId(@Nonnull String containerId);
+
+    /**
+     * Its the responsibility of the caller to consume and/or close the {@link InputStream} to prevent connection leaks.
+     *
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    InputStream exec() throws NotFoundException;
+
+    interface Exec extends DockerCmdSyncExec<ExportContainerCmd, InputStream> {
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
index 5b908dff4..9e1d71020 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/AbstractDockerCmdExecFactory.java
@@ -8,6 +8,7 @@
 import com.github.dockerjava.api.command.CommitCmd;
 import com.github.dockerjava.api.command.ConnectToNetworkCmd;
 import com.github.dockerjava.api.command.ContainerDiffCmd;
+import com.github.dockerjava.api.command.ExportContainerCmd;
 import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
 import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
@@ -89,6 +90,7 @@
 import com.github.dockerjava.core.exec.CommitCmdExec;
 import com.github.dockerjava.core.exec.ConnectToNetworkCmdExec;
 import com.github.dockerjava.core.exec.ContainerDiffCmdExec;
+import com.github.dockerjava.core.exec.ExportContainerCmdExec;
 import com.github.dockerjava.core.exec.CopyArchiveFromContainerCmdExec;
 import com.github.dockerjava.core.exec.CopyArchiveToContainerCmdExec;
 import com.github.dockerjava.core.exec.CopyFileFromContainerCmdExec;
@@ -368,6 +370,11 @@ public ContainerDiffCmd.Exec createContainerDiffCmdExec() {
         return new ContainerDiffCmdExec(getBaseResource(), getDockerClientConfig());
     }
 
+    @Override
+    public ExportContainerCmd.Exec createExportContainerCmdExec() {
+        return new ExportContainerCmdExec(getBaseResource(), getDockerClientConfig());
+    }
+
     @Override
     public KillContainerCmd.Exec createKillContainerCmdExec() {
         return new KillContainerCmdExec(getBaseResource(), getDockerClientConfig());
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index b17c1b481..a1ddc2897 100644
--- a/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -7,6 +7,7 @@
 import com.github.dockerjava.api.command.CommitCmd;
 import com.github.dockerjava.api.command.ConnectToNetworkCmd;
 import com.github.dockerjava.api.command.ContainerDiffCmd;
+import com.github.dockerjava.api.command.ExportContainerCmd;
 import com.github.dockerjava.api.command.CopyArchiveFromContainerCmd;
 import com.github.dockerjava.api.command.CopyArchiveToContainerCmd;
 import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
@@ -93,6 +94,7 @@
 import com.github.dockerjava.core.command.CommitCmdImpl;
 import com.github.dockerjava.core.command.ConnectToNetworkCmdImpl;
 import com.github.dockerjava.core.command.ContainerDiffCmdImpl;
+import com.github.dockerjava.core.command.ExportContainerCmdImpl;
 import com.github.dockerjava.core.command.CopyArchiveFromContainerCmdImpl;
 import com.github.dockerjava.core.command.CopyArchiveToContainerCmdImpl;
 import com.github.dockerjava.core.command.CopyFileFromContainerCmdImpl;
@@ -470,6 +472,11 @@ public ContainerDiffCmd containerDiffCmd(String containerId) {
         return new ContainerDiffCmdImpl(getDockerCmdExecFactory().createContainerDiffCmdExec(), containerId);
     }
 
+    @Override
+    public ExportContainerCmd exportContainerCmd(String containerId) {
+        return new ExportContainerCmdImpl(getDockerCmdExecFactory().createExportContainerCmdExec(), containerId);
+    }
+
     @Override
     public StopContainerCmd stopContainerCmd(String containerId) {
         return new StopContainerCmdImpl(getDockerCmdExecFactory().createStopContainerCmdExec(), containerId);
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExportContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExportContainerCmdImpl.java
new file mode 100644
index 000000000..92070a2e2
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/command/ExportContainerCmdImpl.java
@@ -0,0 +1,41 @@
+package com.github.dockerjava.core.command;
+
+import java.io.InputStream;
+import java.util.Objects;
+
+import com.github.dockerjava.api.command.ExportContainerCmd;
+import com.github.dockerjava.api.exception.NotFoundException;
+
+/**
+ * Export the contents of a container as a tar archive.
+ */
+public class ExportContainerCmdImpl extends AbstrDockerCmd<ExportContainerCmd, InputStream> implements
+        ExportContainerCmd {
+
+    private String containerId;
+
+    public ExportContainerCmdImpl(ExportContainerCmd.Exec exec, String containerId) {
+        super(exec);
+        withContainerId(containerId);
+    }
+
+    @Override
+    public String getContainerId() {
+        return containerId;
+    }
+
+    @Override
+    public ExportContainerCmdImpl withContainerId(String containerId) {
+        this.containerId = Objects.requireNonNull(containerId, "containerId was not specified");
+        return this;
+    }
+
+    /**
+     * @throws NotFoundException
+     *             No such container
+     */
+    @Override
+    public InputStream exec() throws NotFoundException {
+        return super.exec();
+    }
+}
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ExportContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ExportContainerCmdExec.java
new file mode 100644
index 000000000..9dab86f29
--- /dev/null
+++ b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/ExportContainerCmdExec.java
@@ -0,0 +1,31 @@
+package com.github.dockerjava.core.exec;
+
+import java.io.InputStream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.dockerjava.api.command.ExportContainerCmd;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.MediaType;
+import com.github.dockerjava.core.WebTarget;
+
+public class ExportContainerCmdExec extends AbstrSyncDockerCmdExec<ExportContainerCmd, InputStream>
+        implements ExportContainerCmd.Exec {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExportContainerCmdExec.class);
+
+    public ExportContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+        super(baseResource, dockerClientConfig);
+    }
+
+    @Override
+    protected InputStream execute(ExportContainerCmd command) {
+        WebTarget webResource = getBaseResource().path("/containers/{id}/export").resolveTemplate("id",
+                command.getContainerId());
+
+        LOGGER.trace("GET: {}", webResource);
+
+        return webResource.request().accept(MediaType.APPLICATION_X_TAR).get();
+    }
+}
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/ExportContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/ExportContainerCmdIT.java
new file mode 100644
index 000000000..8e4712d84
--- /dev/null
+++ b/docker-java/src/test/java/com/github/dockerjava/cmd/ExportContainerCmdIT.java
@@ -0,0 +1,52 @@
+package com.github.dockerjava.cmd;
+
+import com.github.dockerjava.api.command.CreateContainerResponse;
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.InputStream;
+
+import static com.github.dockerjava.core.DockerRule.DEFAULT_IMAGE;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.emptyString;
+
+public class ExportContainerCmdIT extends CmdIT {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ExportContainerCmdIT.class);
+
+    @Test
+    public void exportContainerHasCreatedFile() throws Exception {
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withCmd("touch", "/myExportedFile")
+                .exec();
+
+        LOG.info("Created container: {}", container.toString());
+        assertThat(container.getId(), not(is(emptyString())));
+
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+
+        int exitCode = dockerRule.getClient().waitContainerCmd(container.getId()).start()
+                .awaitStatusCode();
+        assertThat(exitCode, is(0));
+
+        try (InputStream response = dockerRule.getClient().exportContainerCmd(container.getId()).exec()) {
+            boolean foundFile = false;
+            try (TarArchiveInputStream tarStream = new TarArchiveInputStream(response)) {
+                TarArchiveEntry entry;
+                while ((entry = tarStream.getNextTarEntry()) != null) {
+                    if (entry.getName().contains("myExportedFile")) {
+                        foundFile = true;
+                        break;
+                    }
+                }
+            }
+            assertThat("Exported archive should contain the created file", foundFile, is(true));
+        }
+    }
+
+}

From 0ae6ea05a2813b2c61e78aa44a19f466db783f95 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Mar 2026 12:06:39 -0600
Subject: [PATCH 1261/1272] Bump netty.version from 4.2.7.Final to 4.2.10.Final
 (#2585)

Bumps `netty.version` from 4.2.7.Final to 4.2.10.Final.

Updates `io.netty:netty-codec-http` from 4.2.7.Final to 4.2.10.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.7.Final...netty-4.2.10.Final)

Updates `io.netty:netty-handler` from 4.2.7.Final to 4.2.10.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.7.Final...netty-4.2.10.Final)

Updates `io.netty:netty-handler-proxy` from 4.2.7.Final to 4.2.10.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.7.Final...netty-4.2.10.Final)

Updates `io.netty:netty-transport-native-epoll` from 4.2.7.Final to 4.2.10.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.7.Final...netty-4.2.10.Final)

Updates `io.netty:netty-transport-native-kqueue` from 4.2.7.Final to 4.2.10.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.2.7.Final...netty-4.2.10.Final)

---
updated-dependencies:
- dependency-name: io.netty:netty-codec-http
  dependency-version: 4.2.10.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-handler
  dependency-version: 4.2.10.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-handler-proxy
  dependency-version: 4.2.10.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-transport-native-epoll
  dependency-version: 4.2.10.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-transport-native-kqueue
  dependency-version: 4.2.10.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 72add3980..19347a9ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
 
 		<!-- test dependencies -->
 		<logback.version>1.2.3</logback.version>
-		<netty.version>4.2.7.Final</netty.version>
+		<netty.version>4.2.10.Final</netty.version>
 		<hamcrest.library.version>2.2</hamcrest.library.version>
 		<hamcrest.jpa-matchers>1.8</hamcrest.jpa-matchers>
 		<lambdaj.version>2.3.3</lambdaj.version>

From 6e1c22c7fb28f0cd03e1768f151179bf7ffa71f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Mar 2026 12:06:50 -0600
Subject: [PATCH 1262/1272] Bump org.assertj:assertj-core from 3.27.6 to 3.27.7
 (#2580)

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.6 to 3.27.7.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.6...assertj-build-3.27.7)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-version: 3.27.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-tck/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml
index d7253c786..c7accb95f 100644
--- a/docker-java-transport-tck/pom.xml
+++ b/docker-java-transport-tck/pom.xml
@@ -34,7 +34,7 @@
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<version>3.27.6</version>
+			<version>3.27.7</version>
 		</dependency>
 
 		<dependency>

From 5bb3971c9fafd0336fe32de0ebccdc15493e4757 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Mar 2026 12:07:00 -0600
Subject: [PATCH 1263/1272] Bump com.github.siom79.japicmp:japicmp-maven-plugin
 (#2576)

Bumps [com.github.siom79.japicmp:japicmp-maven-plugin](https://github.com/siom79/japicmp) from 0.24.2 to 0.25.4.
- [Release notes](https://github.com/siom79/japicmp/releases)
- [Changelog](https://github.com/siom79/japicmp/blob/master/release.py)
- [Commits](https://github.com/siom79/japicmp/compare/japicmp-base-0.24.2...japicmp-base-0.25.4)

---
updated-dependencies:
- dependency-name: com.github.siom79.japicmp:japicmp-maven-plugin
  dependency-version: 0.25.4
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 19347a9ac..0189fadf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -242,7 +242,7 @@
 					<!-- use with "mvn -DskipTests clean verify" -->
 					<groupId>com.github.siom79.japicmp</groupId>
 					<artifactId>japicmp-maven-plugin</artifactId>
-					<version>0.24.2</version>
+					<version>0.25.4</version>
 					<configuration>
 						<oldVersion>
 							<dependency>

From f70fb4065003532e0f4190aca200e8e1de97f315 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Mar 2026 12:07:19 -0600
Subject: [PATCH 1264/1272] Bump
 org.sonatype.central:central-publishing-maven-plugin (#2573)

Bumps [org.sonatype.central:central-publishing-maven-plugin](https://github.com/sonatype/central-publishing-maven-plugin) from 0.9.0 to 0.10.0.
- [Commits](https://github.com/sonatype/central-publishing-maven-plugin/commits)

---
updated-dependencies:
- dependency-name: org.sonatype.central:central-publishing-maven-plugin
  dependency-version: 0.10.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0189fadf0..47a578c05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -287,7 +287,7 @@
 				<plugin>
 					<groupId>org.sonatype.central</groupId>
 					<artifactId>central-publishing-maven-plugin</artifactId>
-					<version>0.9.0</version>
+					<version>0.10.0</version>
 					<extensions>true</extensions>
 					<configuration>
 						<publishingServerId>central</publishingServerId>

From 36e5c0f45b6f847c7a811d650656b853795aa76a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Mar 2026 12:07:33 -0600
Subject: [PATCH 1265/1272] Bump org.testcontainers:testcontainers from 2.0.2
 to 2.0.3 (#2564)

Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 2.0.2 to 2.0.3.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/2.0.2...2.0.3)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers
  dependency-version: 2.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-tck/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml
index c7accb95f..8544e8f06 100644
--- a/docker-java-transport-tck/pom.xml
+++ b/docker-java-transport-tck/pom.xml
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>testcontainers</artifactId>
-			<version>2.0.2</version>
+			<version>2.0.3</version>
 		</dependency>
 
 		<dependency>

From 0dde6bc10b88b6d2edbc3dcc49917b8b5582d145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez=20Gonzales?=
 <eddu.melendez@gmail.com>
Date: Wed, 18 Mar 2026 12:26:27 -0600
Subject: [PATCH 1266/1272] Deprecate ListImagesCmd#withImageNameFilter (#2595)

Fixes #2557
---
 .../com/github/dockerjava/api/command/ListImagesCmd.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
index cc60a5bcc..99a9fc200 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
@@ -26,6 +26,11 @@ public interface ListImagesCmd extends SyncDockerCmd<List<Image>> {
      */
     ListImagesCmd withShowAll(Boolean showAll);
 
+    /**
+     * Filter images by name
+     * @deprecated use {@link #withFilter(String, Collection)}
+     */
+    @Deprecated
     ListImagesCmd withImageNameFilter(String imageName);
 
     /**

From 7b7fabd4567573e4957e549365dc0df8c2e54ab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Wed, 18 Mar 2026 12:36:28 -0600
Subject: [PATCH 1267/1272] Update actions/checkout and actions/setup-java

---
 .github/workflows/ci.yml      | 8 ++++----
 .github/workflows/release.yml | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d7b105d1d..5a87a3c3f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,9 +16,9 @@ jobs:
           - { name: "default", javaVersion: 17 }
           - { name: "default", javaVersion: 21 }
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: ${{matrix.javaVersion}}
           distribution: temurin
@@ -36,9 +36,9 @@ jobs:
   tcp:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 8
           distribution: temurin
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 16777daa6..d3ddc4b2e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,9 +10,9 @@ jobs:
   build:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up JDK 8
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 8
           distribution: temurin

From 1cf970e7a68638dda1a60a20d88eafd0b0292f7e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Apr 2026 09:13:37 -0600
Subject: [PATCH 1268/1272] Bump netty.version from 4.2.10.Final to
 4.2.12.Final (#2605)

Bumps `netty.version` from 4.2.10.Final to 4.2.12.Final.

Updates `io.netty:netty-codec-http` from 4.2.10.Final to 4.2.12.Final
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](https://github.com/netty/netty/compare/netty-4.2.10.Final...netty-4.2.12.Final)

Updates `io.netty:netty-handler` from 4.2.10.Final to 4.2.12.Final
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](https://github.com/netty/netty/compare/netty-4.2.10.Final...netty-4.2.12.Final)

Updates `io.netty:netty-handler-proxy` from 4.2.10.Final to 4.2.12.Final
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](https://github.com/netty/netty/compare/netty-4.2.10.Final...netty-4.2.12.Final)

Updates `io.netty:netty-transport-native-epoll` from 4.2.10.Final to 4.2.12.Final
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](https://github.com/netty/netty/compare/netty-4.2.10.Final...netty-4.2.12.Final)

Updates `io.netty:netty-transport-native-kqueue` from 4.2.10.Final to 4.2.12.Final
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](https://github.com/netty/netty/compare/netty-4.2.10.Final...netty-4.2.12.Final)

---
updated-dependencies:
- dependency-name: io.netty:netty-codec-http
  dependency-version: 4.2.12.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-handler
  dependency-version: 4.2.12.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-handler-proxy
  dependency-version: 4.2.12.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-transport-native-epoll
  dependency-version: 4.2.12.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-transport-native-kqueue
  dependency-version: 4.2.12.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 47a578c05..f5f16405c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
 
 		<!-- test dependencies -->
 		<logback.version>1.2.3</logback.version>
-		<netty.version>4.2.10.Final</netty.version>
+		<netty.version>4.2.12.Final</netty.version>
 		<hamcrest.library.version>2.2</hamcrest.library.version>
 		<hamcrest.jpa-matchers>1.8</hamcrest.jpa-matchers>
 		<lambdaj.version>2.3.3</lambdaj.version>

From ceabb3b054e4861a14a30042e539d9c2034e6973 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Apr 2026 09:13:54 -0600
Subject: [PATCH 1269/1272] Bump org.testcontainers:testcontainers from 2.0.3
 to 2.0.4 (#2600)

Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 2.0.3 to 2.0.4.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/2.0.3...2.0.4)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers
  dependency-version: 2.0.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-tck/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml
index 8544e8f06..76ffe1a6b 100644
--- a/docker-java-transport-tck/pom.xml
+++ b/docker-java-transport-tck/pom.xml
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>testcontainers</artifactId>
-			<version>2.0.3</version>
+			<version>2.0.4</version>
 		</dependency>
 
 		<dependency>

From 2b79a6853a3af35adedae2b5786c2a0300ae6a3f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Apr 2026 10:30:24 -0600
Subject: [PATCH 1270/1272] Bump com.github.siom79.japicmp:japicmp-maven-plugin
 (#2615)

Bumps [com.github.siom79.japicmp:japicmp-maven-plugin](https://github.com/siom79/japicmp) from 0.25.4 to 0.25.6.
- [Release notes](https://github.com/siom79/japicmp/releases)
- [Changelog](https://github.com/siom79/japicmp/blob/master/release.py)
- [Commits](https://github.com/siom79/japicmp/compare/japicmp-base-0.25.4...japicmp-base-0.25.6)

---
updated-dependencies:
- dependency-name: com.github.siom79.japicmp:japicmp-maven-plugin
  dependency-version: 0.25.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f5f16405c..51c06e2bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -242,7 +242,7 @@
 					<!-- use with "mvn -DskipTests clean verify" -->
 					<groupId>com.github.siom79.japicmp</groupId>
 					<artifactId>japicmp-maven-plugin</artifactId>
-					<version>0.25.4</version>
+					<version>0.25.6</version>
 					<configuration>
 						<oldVersion>
 							<dependency>

From f904a02286011ce7b57ec0704cc78c6c62d10b2e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Apr 2026 12:57:53 -0600
Subject: [PATCH 1271/1272] Bump org.testcontainers:testcontainers from 2.0.4
 to 2.0.5 (#2620)

Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 2.0.4 to 2.0.5.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/2.0.4...2.0.5)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers
  dependency-version: 2.0.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docker-java-transport-tck/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml
index 76ffe1a6b..99ced1cb4 100644
--- a/docker-java-transport-tck/pom.xml
+++ b/docker-java-transport-tck/pom.xml
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>testcontainers</artifactId>
-			<version>2.0.4</version>
+			<version>2.0.5</version>
 		</dependency>
 
 		<dependency>

From 002b6eb7aa2b892be729c7c2a5e95f782924db38 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jun 2026 08:53:12 -0600
Subject: [PATCH 1272/1272] Bump
 org.sonatype.central:central-publishing-maven-plugin (#2647)

Bumps [org.sonatype.central:central-publishing-maven-plugin](https://github.com/sonatype/central-publishing-maven-plugin) from 0.10.0 to 0.11.0.
- [Commits](https://github.com/sonatype/central-publishing-maven-plugin/commits)

---
updated-dependencies:
- dependency-name: org.sonatype.central:central-publishing-maven-plugin
  dependency-version: 0.11.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 51c06e2bc..1ceed8f23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -287,7 +287,7 @@
 				<plugin>
 					<groupId>org.sonatype.central</groupId>
 					<artifactId>central-publishing-maven-plugin</artifactId>
-					<version>0.10.0</version>
+					<version>0.11.0</version>
 					<extensions>true</extensions>
 					<configuration>
 						<publishingServerId>central</publishingServerId>